From 3bbd273a4f9e85a1d8380cb0924c875683fa3ad1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 16 Dec 2007 23:20:24 +0100 Subject: [PATCH 0001/2970] Initial commit --- .gitignore | 14 + AUTHORS | 8 + COPYING | 504 +++++++++++++++++ ChangeLog | 133 +++++ HACKING | 85 +++ INSTALL | 18 + Makefile.am | 8 + NEWS | 0 README | 20 + TODO | 62 +++ autogen.sh | 6 + configure.in | 101 ++++ midori.desktop | 14 + src/Makefile.am | 17 + src/browser.c | 1384 +++++++++++++++++++++++++++++++++++++++++++++++ src/browser.h | 563 +++++++++++++++++++ src/conf.c | 173 ++++++ src/conf.h | 94 ++++ src/debug.h | 25 + src/global.h | 83 +++ src/helpers.c | 506 +++++++++++++++++ src/helpers.h | 110 ++++ src/main.c | 317 +++++++++++ src/main.h | 15 + src/prefs.c | 669 +++++++++++++++++++++++ src/prefs.h | 42 ++ src/search.c | 209 +++++++ src/search.h | 91 ++++ src/sokoke.c | 381 +++++++++++++ src/sokoke.h | 94 ++++ src/ui.h | 245 +++++++++ src/webSearch.c | 441 +++++++++++++++ src/webSearch.h | 61 +++ src/webView.c | 351 ++++++++++++ src/webView.h | 84 +++ src/xbel.c | 801 +++++++++++++++++++++++++++ src/xbel.h | 154 ++++++ 37 files changed, 7883 insertions(+) create mode 100644 .gitignore create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 HACKING create mode 100644 INSTALL create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 README create mode 100644 TODO create mode 100755 autogen.sh create mode 100644 configure.in create mode 100644 midori.desktop create mode 100644 src/Makefile.am create mode 100644 src/browser.c create mode 100644 src/browser.h create mode 100644 src/conf.c create mode 100644 src/conf.h create mode 100644 src/debug.h create mode 100644 src/global.h create mode 100644 src/helpers.c create mode 100644 src/helpers.h create mode 100755 src/main.c create mode 100644 src/main.h create mode 100644 src/prefs.c create mode 100644 src/prefs.h create mode 100644 src/search.c create mode 100644 src/search.h create mode 100644 src/sokoke.c create mode 100644 src/sokoke.h create mode 100644 src/ui.h create mode 100644 src/webSearch.c create mode 100644 src/webSearch.h create mode 100644 src/webView.c create mode 100644 src/webView.h create mode 100644 src/xbel.c create mode 100644 src/xbel.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..14af9aa6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.o +.deps +aclocal.m4 +autom4te.cache +config.* +configure +depcomp +install-sh +Makefile +Makefile.in +missing +stamp-h1 + +midori diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..30771a0e --- /dev/null +++ b/AUTHORS @@ -0,0 +1,8 @@ +Written by: + Christian Dywan + +Artwork by: + Nancy Runge + +Translations: + de: Christian Dywan \ No newline at end of file diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..5ab7695a --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 00000000..5e591148 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,133 @@ +v0.0.14: + + FIX Reopening a tab from the trash causes a crash + + FIX An untitled website keeps the previous title + + FIX When switching tabs the location/ title isn't updated correctly + + FIX Issues with the preferences dialog + + Disable location completion for now + + Save tabtrash to file + + Restructure some code + + Remove color picker and throbber + + Change the license to LGPL + +v0.0.13: + + Adapt WebKit api change, remove engine wrappers, remove dialog hack + + Improve XBEL loading and saving + + Show dialog and backup files on startup errors + + Rearranged and removed some menus + +v0.0.12: + + FIX Improve flawed window creation + + Build with and eliminate all compiler warnings + + Implement clipboard handling menus + + Allow editing of search engines + + Update search engines properly + + Implement bookmarks saving + + Implement session saving and loading + + Cleaned up and revised most code + + Remove legacy webi code + +v0.0.11: + + FIX Back/ forward and initial check menu item states + + Remove rather useless debugging helpers + + Improvements on the preferences + + First attempt at websearch + + Preserve typed uri on tab switch + + First attempt at bookmarks, readonly for now + + Add an animated throbber + +v0.0.10: + + FIX Can crash on context menu or new protocol + + FIX Location isn't updated on tab switch + + Remember last window position and size + + Implement Open menu item + + Allow using location and web search if hidden + +v0.0.9: + + FIX Close tab not insensitive for only one tab + + FIX Debug output is broken + + Display uri when hovering a link + + Implement link uri related part of context menu + + Implement alt/ middle/ shift click link + + First attempt at external protocol handlers + + Initial download manager integration + + Adapt WebKit api prefix change + + More code reorganization and cleanup + +v0.0.8: + + FIX Crash when invoking document context menu via keyboard + + FIX Can't build with debug = yes on GTK+2.12 + + Changes related to icons in the gui + + Reorganize code by splitting into several files + + Switch from WebkitGdk to WebkitGtk + +v0.0.7: + + FIX Make settings finally work flawlessly + + FIX Can crash when settings are opened + + Handle all panels in a general way + + Install xdg compliant desktop file + + Implement location and web search menu items + + Display a loading icon on tabs again + + Changed the settings dialog again + +v0.0.6: + + FIX Closing an individual tab doesn't work correctly. + + FIX Doesn't build with gtkwebcore. + + Reimplement menus and and navibar with GtkUIManager. + + Improve document handling in general. + + Finished tab trash menu. + + Implement searchbox default text. + + Remove some gtkwebcore code. + + Use Xfce style dialog in Xfce. + + Implement a few settings. + + Change the panel's look. + + Implement a 'pageholder' panel. + +v0.0.5: + + Implement a few more signals for WebkitGdk. + + Add tooltips to navigation toolbar buttons. + + First attempt on a settings dialog. + + Reimplemented color picker. + + Autocompletion for location and searchbox. + + Changed menu items and incremental findbar. + + Implement tab switching via keyboard. + +v0.0.4: + + FIX Midori segfaults when quitting. + + FIX Config loading and saving is broken. + + Switch WebkitGdk to gtk api and make it the build default. + + Register custom stock icons instead of icon theme magic. + + Implement dynamic window menu. + + First attempt on resizable panels. + + Add about dialog. + +v0.0.3: + + FIX Refresh via menu or shortcut crashes the browser. + + FIX Assertions with and visibility of the progressbar. + + FIX Tabs are not reorderable. + + Package versions in ./configure result and --version output. + + Improve view menu and add tools menu. + + Replace deprecated functions and macros. + + Implement settings saving and loading. + + Fill the common context menu with items + + Allow multiple homepages, seperated by '|'. + + Make code typesafe and C++ friendly. + + Initially support WebkitGdk directly. + + Urlify location inputs automatically. + +v0.0.2: + + Dynamic tab trash menu. + + Update UI when page is changed. + + Enhanced WebkitGtk support. + + New function sokoke_dialog_run_modeless. + + Finished on_document_request_script_prompt. + + One name and version, visible in the user agent. + + Changed some accelerators and menu items. + + Create and destroy color picker properly. + + Ctrl + Wheel resets the zoom level. + + Escape in the location entry resets the uri. + + Use gtk-webcore prefix instead of osb now. + + Save keybindings on quit. + + Fancy autotools build setup. + +v0.0.1: + + Initial release diff --git a/HACKING b/HACKING new file mode 100644 index 00000000..22c846aa --- /dev/null +++ b/HACKING @@ -0,0 +1,85 @@ +It is 4 spaces, no tabs, preferrably at 80 columns per line. + +The preferred coding style is explained by example. + +Source file example: + + /* + Copyright + LICENSE TEXT + */ + + #include "foo.h" + + #include "bar.h" + + #include + + void foobar(FooEnum bar, const gchar* foo) + { + if(!foo) + return; + + #ifdef BAR_STRICT + if(bar == FOO_N) + { + g_print("illegal value for 'bar'.\n"); + return; + } + #endif + + // this is an example + gint n; + switch(bar) + { + case FOO_FOO: + n = bar + 1; + break; + case FOO_BAR: + n = bar + 10; + break; + default: + n = 1; + } + + guint i; + for(i = 0; i < n; i++) + { + g_print("%s\n", foo); + } + } + +Header file example: + + /* + Copyright + LICENSE TEXT + */ + + #ifndef __FOO_H__ + #define __FOO_H__ 1 + + #ifdef HAVE_BAR_H + #define BAR_STRICT + #endif + + // -- Types + + typedef enum + { + FOO_FOO, + FOO_BAR, + FOO_N + } FooEnum; + + typedef struct + { + FooEnum fooBar; + } FooStruct; + + // -- Declarations + + void + foobar(FooEnum, const gchar*); + + #endif /* !__FOO_H__ */ diff --git a/INSTALL b/INSTALL new file mode 100644 index 00000000..bab1e0a1 --- /dev/null +++ b/INSTALL @@ -0,0 +1,18 @@ +1. Unpack the archive. + +2. Check build options with + ./configure --help + +3. Prepare for build with + ./configure + +4. Build midori with + make + +5. To install midori run either + (sudo) make install + or + (sudo) checkinstall + +6. For a list of command line options run + midori --help \ No newline at end of file diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..cd36747b --- /dev/null +++ b/Makefile.am @@ -0,0 +1,8 @@ +AUTOMAKE_OPTIONS = gnu + +SUBDIRS = src + +desktopdir = $(datadir)/applications +desktop_DATA = midori.desktop + +EXTRA_DIST = HACKING TODO $(desktop_DATA) diff --git a/NEWS b/NEWS new file mode 100644 index 00000000..e69de29b diff --git a/README b/README new file mode 100644 index 00000000..1dd926ca --- /dev/null +++ b/README @@ -0,0 +1,20 @@ +Midori is a lightweight web browser. + +* Full integration with GTK+2. +* Fast rendering with WebKit. +* Tabs, windows and session management. +* Bookmarks are stored with XBEL. +* Searchbox based on OpenSearch. +* Custom context menu actions. +* User scripts and user styles support. +* Extensible via Lua scripts. + +Requirements: GTK+ 2.6, libsexy, WebkitGtk, libXML2 + +For installation instructions read INSTALL. + +Please report comments, suggestions and bugs to: + Christian Dywan + +Check for new versions at: + http://software.twotoasts.de diff --git a/TODO b/TODO new file mode 100644 index 00000000..9f0a8def --- /dev/null +++ b/TODO @@ -0,0 +1,62 @@ +TODO: + . Save files on change as opposed to on quit + . Position menus properly + . Use an animated throbber + . Add a context menu to the pageholder + . Make tabs autoshrink + . New tabs from a TabNew action should always open in the foreground + . Middle click toolbuttons or menuitems should open new tabs + . Implement userscript support + . Actual multiple window support, some things just ignore this currently + . Custom context menu actions + . custom tab names + . Open an auto-vanishing findbox with '.' + . Support gettext + . Custom panels, loaded from (x)htm(l) files or websites + . Drag tabs onto the panel to have it in the sidebar. + . Save completion stores + . analogus to blocked popups, blocked scripts moving layers on load + . per-site blocking of individual elements on a page + . statusbar icon 'cookies blocked', icon 'popups blocked' + . per-site settings accessible via statusbar icons, ie. cookies, popups, plugins + . cookieSafe like, a list of cookies, with type, block, allow + . support mouse gestures + . optional internal source view using gtksourceview + . automatic update checks (browser, extensions)? + . auto-group tabs by opener, with colors? + . mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page + . have an internal uri scheme, eg. 'res:', to reference eg. themed icons + . 'about:' uris: about, blank, cache, config, plugins + . panel of open tabs (with tree-structure), optional thumbnail-view + . spell check support + . allow full page zoom (how do we incorporate it in the gui?) + . check specific bookmarks for updates automatically (as an extension?) + . mark "new" as well as "actually modified" tabs specially (even over sessions) + . customizable toolbars, custom buttons (uri, title, icon) + . searchEngine: "Show in context menu" + . use libnotify for events, e.g. download finished + . save screenshot of a document + . right-click a textbox in a search form and choose 'add to websearch' + . support extensions written in lua + . the scrollbar must be exactly at the right (left) edge if maximized: fitt's law + . detailed css element view, maybe in 'properties'? + . reuse running instance, probably via libunique + . respect design principle "no warnings but undo of backups"? + . support widgets 1.0 spec in tool windows and standalone + . blank page: several custom links, displayed as thumbnails, like Opera + . handle downloads, optionally in a downloadbar + . Implement userstyle support + . Protected tabs prompt when attempting to close them + . provide a 'sleep mode' after a crash where open documents are loaded manually + . option to run plugins or scripts only on demand, like NoScript, per-site + . optional http redirection manually or on timeout + . style: none, compatible (b/w), default, [styles], "media", ["media" styles], ... + . mouse pointer coordinates in the status bar + . draw rectangle with the mouse, x/y/x2/y2 in the statusbar + . formfill (like Opera's magic wand) + . private browsing mode (no browsing, download or search history) + . shared bookmarks and config + . custom-mode, e.g. hide menubar and use help icon to have a help viewer + . dead tabs: download, aborted page + . on url load, for big files, ask "Open or save?" + . middle-click on selection to open diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..863dee9f --- /dev/null +++ b/autogen.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +aclocal +autoheader +autoconf +automake --add-missing --copy \ No newline at end of file diff --git a/configure.in b/configure.in new file mode 100644 index 00000000..e88f0a5d --- /dev/null +++ b/configure.in @@ -0,0 +1,101 @@ +# Register ourselves to autoconf +AC_INIT([midori], [0.0.14], [christian@twotoasts.de]) +AC_CONFIG_SRCDIR([src/main.h]) +AC_CONFIG_HEADER([config.h]) + +AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) + +# Checks for programs +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_MAKE_SET + +# Checks for header files +AC_HEADER_STDC + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST + +# Checks if we want debugging support +AC_ARG_ENABLE([debug], +AC_HELP_STRING([--enable-debug=@<:@no/simple/yes@:>@] + , [Turn on debugging @<:@default=simple@:>@]) + , [], [enable_debug=simple]) +AC_MSG_CHECKING([whether to enable debugging support]) +AC_MSG_RESULT([$enable_debug]) +if test x"$enable_debug" = x"simple"; then + AC_DEFINE([SOKOKE_DEBUG], 1, [Level of debugging support]) +fi +if test x"$enable_debug" = x"yes"; then + # Check whether the compiler accepts -Wall + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall" + AC_MSG_CHECKING([whether $CC accepts -Wall]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + CFLAGS="$save_CFLAGS" + ]) + AC_DEFINE([SOKOKE_DEBUG], 2, [Level of debugging support]) +fi +AC_DEFINE_UNQUOTED([SOKOKE_DEBUG_], "$enable_debug", [Debugging?]) + +# Checks for GTK+2 +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false) +if test "x${have_gtk}" = "xfalse" ; then + AC_MSG_ERROR([No GTK+2 package information found]) +fi +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) +GTK_VER=`pkg-config --modversion gtk+-2.0` +AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) + +# Checks for WebKitGtk +PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false) +if test "x${have_webkit}" = "xfalse" ; then + AC_MSG_ERROR([No WebKitGtk package information found]) +fi +AC_SUBST(WEBKIT_CFLAGS) +AC_SUBST(WEBKIT_LIBS) +WEBKIT_VER=`pkg-config --modversion WebKitGtk` +AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version]) + +# Checks for libsexy +PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) +if test "x${have_libsexy}" = "xfalse" ; then + AC_MSG_ERROR([No Libsexy package information found]) +fi +AC_SUBST(LIBSEXY_CFLAGS) +AC_SUBST(LIBSEXY_LIBS) +LIBSEXY_VER=`pkg-config --modversion libsexy` +AC_DEFINE_UNQUOTED([LIBSEXY_VER], "$LIBSEXY_VER", [Libsexy version]) + +# Checks for LibXML2 +PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=true, have_libxml=false) +if test "x${have_libxml}" = "xfalse" ; then + AC_MSG_ERROR([No libXML2 package information found]) +fi +AC_SUBST(LIBXML_CFLAGS) +AC_SUBST(LIBXML_LIBS) +LIBXML_VER=`pkg-config --modversion libxml-2.0` +AC_DEFINE_UNQUOTED([LIBXML_VER], "$LIBXML_VER", [libXML2 version]) + +# Here we tell the configure script which files to *create* +AC_CONFIG_FILES([ + Makefile \ + src/Makefile +]) +AC_OUTPUT + +# Show us what we have +echo +echo " GTK+2 $GTK_VER" +echo " WebKit $WEBKIT_VER" +echo " Libsexy $LIBSEXY_VER" +echo " libXML2 $LIBXML_VER" +echo " GetText N/A" +echo +echo " Debugging $enable_debug" +echo +echo " Prefix $prefix" diff --git a/midori.desktop b/midori.desktop new file mode 100644 index 00000000..ba6faf62 --- /dev/null +++ b/midori.desktop @@ -0,0 +1,14 @@ + +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Type=Application +Name=Midori Web Browser +GenericName=Web Browser +Comment=Lightweight web browser +Categories=GTK;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml +Exec=midori %u +Icon=web-browser +Terminal=false +StartupNotify=true diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 00000000..c8db7753 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,17 @@ +INCLUDES = $(GTK_CFLAGS) $(WEBKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBSEXY_CFLAGS) +LDADD = $(GTK_LIBS) $(WEBKIT_LIBS) $(LIBXML_LIBS) $(LIBSEXY_LIBS) + +bin_PROGRAMS = midori +midori_SOURCES = main.c main.h \ + browser.c browser.h \ + prefs.c prefs.h \ + webSearch.c webSearch.h \ + helpers.c helpers.h \ + webView.c webView.h \ + sokoke.c sokoke.h \ + conf.c conf.h \ + search.c search.h \ + xbel.c xbel.h \ + global.h \ + ui.h \ + debug.h diff --git a/src/browser.c b/src/browser.c new file mode 100644 index 00000000..c2c4e05c --- /dev/null +++ b/src/browser.c @@ -0,0 +1,1384 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "browser.h" + +#include "helpers.h" +#include "prefs.h" +#include "sokoke.h" +#include "ui.h" +#include "webView.h" +#include "webSearch.h" +#include "xbel.h" + +#include +#include + +// -- GTK+ signal handlers begin here + +void on_action_window_new_activate(GtkAction* action, CBrowser* browser) +{ + browser_new(NULL); +} + +void on_action_tab_new_activate(GtkAction* action, CBrowser* browser) +{ + browser_new(browser); + update_browser_actions(browser); +} + +void on_action_open_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* dialog = gtk_file_chooser_dialog_new("Open file" + , GTK_WINDOW(browser->window) + , GTK_FILE_CHOOSER_ACTION_OPEN + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_OPEN); + if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + gchar* sFilename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + webView_open(get_nth_webView(-1, browser), sFilename); + g_free(sFilename); + } + gtk_widget_destroy(dialog); +} + +void on_action_tab_close_activate(GtkAction* action, CBrowser* browser) +{ + webView_close(get_nth_webView(-1, browser), browser); +} + +void on_action_window_close_activate(GtkAction* action, CBrowser* browser) +{ + gtk_widget_destroy(browser->window); +} + +void on_action_quit_activate(GtkAction* action, CBrowser* browser) +{ + gtk_main_quit(); +} + +void on_action_edit_activate(GtkAction* action, CBrowser* browser) +{ + update_edit_items(browser); +} + +void on_action_cut_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + g_signal_emit_by_name(widget, "cut-clipboard"); +} + +void on_action_copy_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + g_signal_emit_by_name(widget, "copy-clipboard"); +} + +void on_action_paste_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + g_signal_emit_by_name(widget, "paste-clipboard"); +} + +void on_action_delete_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(WEBKIT_IS_WEB_VIEW(widget)) + ;//webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); + else if(GTK_IS_EDITABLE(widget)) + gtk_editable_delete_selection(GTK_EDITABLE(widget)); +} + +void on_action_selectAll_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(GTK_IS_ENTRY(widget)) + gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); + else + g_signal_emit_by_name(widget, "select-all"); +} + +void on_action_find_activate(GtkAction* action, CBrowser* browser) +{ + if(GTK_WIDGET_VISIBLE(browser->findbox)) + gtk_widget_hide(browser->findbox); + else + { + GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + gtk_widget_show(browser->findbox); + gtk_widget_grab_focus(GTK_WIDGET(browser->findbox_text)); + } +} + +void on_action_find_next_activate(GtkAction* action, CBrowser* browser) +{ + if(!GTK_WIDGET_VISIBLE(browser->findbox)) + ; // FIXME: What if the findbox is hidden? + const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); + const gboolean caseSensitive = gtk_toggle_tool_button_get_active( + GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); + GtkWidget* webView = get_nth_webView(-1, browser); + GtkWidget* icon; + webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); + if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, TRUE, caseSensitive, TRUE)) + icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); + else + icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); + const gboolean highlight = gtk_toggle_tool_button_get_active( + GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); +} + +void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) +{ + if(!GTK_WIDGET_VISIBLE(browser->findbox)) + ; // FIXME: What if the findbox is hidden? + const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); + const gboolean caseSensitive = gtk_toggle_tool_button_get_active( + GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); + GtkWidget* webView = get_nth_webView(-1, browser); + webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); + GtkWidget* icon; + if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, FALSE, caseSensitive, TRUE)) + icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); + else + icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); + const gboolean highlight = gtk_toggle_tool_button_get_active( + GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); +} + +void on_findbox_highlight_toggled(GtkToggleToolButton* toolitem, CBrowser* browser) +{ + GtkWidget* webView = get_nth_webView(-1, browser); + const gboolean highlight = gtk_toggle_tool_button_get_active(toolitem); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); +} + +void on_action_preferences_activate(GtkAction* action, CBrowser* browser) +{ + // Show the preferences dialog. Create it if necessary. + static GtkWidget* dialog; + if(GTK_IS_DIALOG(dialog)) + gtk_window_present(GTK_WINDOW(dialog)); + else + { + dialog = prefs_preferences_dialog_new(browser); + gtk_widget_show(dialog); + } +} + +static void on_toolbar_navigation_notify_style(GObject* object, GParamSpec* arg1 + , CBrowser* browser) +{ + if(config->toolbarStyle == CONFIG_TOOLBAR_DEFAULT) + { + gtk_toolbar_set_style(GTK_TOOLBAR(browser->navibar) + , config_to_toolbarstyle(config->toolbarStyle)); + } +} + +void on_action_toolbar_navigation_activate(GtkToggleAction* action, CBrowser* browser) +{ + config->toolbarNavigation = gtk_toggle_action_get_active(action); + sokoke_widget_set_visible(browser->navibar, config->toolbarNavigation); +} + +void on_action_toolbar_bookmarks_activate(GtkToggleAction* action, CBrowser* browser) +{ + config->toolbarBookmarks = gtk_toggle_action_get_active(action); + sokoke_widget_set_visible(browser->bookmarkbar, config->toolbarBookmarks); +} + +void on_action_toolbar_downloads_activate(GtkToggleAction* action, CBrowser* browser) +{ + /*config->toolbarDownloads = gtk_toggle_action_get_active(action); + sokoke_widget_set_visible(browser->downloadbar, config->toolbarDownloads);*/ +} + +void on_action_toolbar_status_activate(GtkToggleAction* action, CBrowser* browser) +{ + config->toolbarStatus = gtk_toggle_action_get_active(action); + sokoke_widget_set_visible(browser->statusbar, config->toolbarStatus); +} + +void on_action_refresh_activate(GtkAction* action, CBrowser* browser) +{ + /*GdkModifierType state = (GdkModifierType)0; + gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); + gboolean fromCache = state & GDK_SHIFT_MASK;*/ + webkit_web_view_reload(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); +} + +void on_action_refresh_stop_activate(GtkAction* action, CBrowser* browser) +{ + gchar* stockId; g_object_get(action, "stock-id", &stockId, NULL); + // Refresh or stop, depending on the stock id + if(!strcmp(stockId, GTK_STOCK_REFRESH)) + { + /*GdkModifierType state = (GdkModifierType)0; + gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); + gboolean fromCache = state & GDK_SHIFT_MASK;*/ + webkit_web_view_reload(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); + } + else + webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); + g_free(stockId); +} + +void on_action_stop_activate(GtkAction* action, CBrowser* browser) +{ + webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); +} + +void on_action_zoom_in_activate(GtkAction* action, CBrowser* browser) +{ + /*GtkWidget* webView = get_nth_webView(-1, browser); + const gfloat zoom = webkit_web_view_get_text_multiplier(WEBKIT_WEB_VIEW(webView)); + webkit_web_view_set_text_multiplier(WEBKIT_WEB_VIEW(webView), zoom + 0.1);*/ +} + +void on_action_zoom_out_activate(GtkAction* action, CBrowser* browser) +{ + /*GtkWidget* webView = get_nth_webView(-1, browser); + const gfloat zoom = webView_get_text_size(WEBKIT_WEB_VIEW(webView)); + webkit_web_view_set_text_multiplier(WEBKIT_WEB_VIEW(webView), zoom - 0.1);*/ +} + +void on_action_zoom_normal_activate(GtkAction* action, CBrowser* browser) +{ + //webkit_web_view_set_text_multiplier(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser)), 1); +} + +void on_action_source_view_activate(GtkAction* action, CBrowser* browser) +{ + /*GtkWidget* webView = get_nth_webView(-1, browser); + gchar* source = webkit_web_view_copy_source(WEBKIT_WEB_VIEW(webView)); + webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(webView), source, ""); + g_free(source);*/ +} + +void on_action_back_activate(GtkAction* action, CBrowser* browser) +{ + webkit_web_view_go_backward(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); +} + +void on_action_forward_activate(GtkAction* action, CBrowser* browser) +{ + webkit_web_view_go_forward(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); +} + +void on_action_home_activate(GtkAction* action, CBrowser* browser) +{ + webView_open(get_nth_webView(-1, browser), config->homepage); +} + +void on_action_location_activate(GtkAction* action, CBrowser* browser) +{ + if(GTK_WIDGET_VISIBLE(browser->navibar)) + gtk_widget_grab_focus(browser->location); + else + { + // TODO: We should offer all of the toolbar location's features here + GtkWidget* dialog; + dialog = gtk_dialog_new_with_buttons("Open location" + , GTK_WINDOW(browser->window) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , GTK_STOCK_JUMP_TO, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_JUMP_TO); + gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); + GtkWidget* hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic("_Location:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + gtk_entry_set_text(GTK_ENTRY(browser->location) + , gtk_entry_get_text(GTK_ENTRY(entry))); + GdkEventKey event; + event.keyval = GDK_Return; + on_location_key_down(browser->location, &event, browser); + } + gtk_widget_destroy(dialog); + } +} + +void on_action_webSearch_activate(GtkAction* action, CBrowser* browser) +{ + if(GTK_WIDGET_VISIBLE(browser->webSearch) + && GTK_WIDGET_VISIBLE(browser->navibar)) + gtk_widget_grab_focus(browser->webSearch); + else + { + // TODO: We should offer all of the toolbar search's features here + GtkWidget* dialog = gtk_dialog_new_with_buttons("Web search" + , GTK_WINDOW(browser->window) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_FIND); + gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); + GtkWidget* hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic("_Location:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + gtk_entry_set_text(GTK_ENTRY(browser->webSearch) + , gtk_entry_get_text(GTK_ENTRY(entry))); + on_webSearch_activate(browser->webSearch, browser); + } + gtk_widget_destroy(dialog); + } +} + +void on_menu_tabsClosed_activate(GtkWidget* widget, CBrowser* browser) +{ + GtkWidget* menu = gtk_menu_new(); + guint n = xbel_folder_get_n_items(tabtrash); + GtkWidget* menuitem; + guint i; + for(i = 0; i < n; i++) + { + XbelItem* item = xbel_folder_get_nth_item(tabtrash, i); + const gchar* title = xbel_item_get_title(item); + const gchar* uri = xbel_bookmark_get_href(item); + menuitem = gtk_image_menu_item_new_with_label(title ? title : uri); + // FIXME: Get the real icon + GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), icon); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + g_object_set_data(G_OBJECT(menuitem), "XbelItem", item); + g_signal_connect(menuitem, "activate", G_CALLBACK(on_menu_tabsClosed_item_activate), browser); + gtk_widget_show(menuitem); + } + + menuitem = gtk_separator_menu_item_new(); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + GtkAction* action = gtk_action_group_get_action( + browser->actiongroup, "TabsClosedClear"); + menuitem = gtk_action_create_menu_item(action); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + sokoke_widget_popup(widget, GTK_MENU(menu), NULL); +} + +void on_menu_tabsClosed_item_activate(GtkWidget* menuitem, CBrowser* browser) +{ + // Create a new webView with an uri which has been closed before + XbelItem* item = g_object_get_data(G_OBJECT(menuitem), "XbelItem"); + const gchar* uri = xbel_bookmark_get_href(item); + CBrowser* curBrowser = browser_new(browser); + webView_open(curBrowser->webView, uri); + xbel_folder_remove_item(tabtrash, item); + xbel_item_free(item); + update_browser_actions(curBrowser); +} + +void on_action_tabsClosed_undo_activate(GtkAction* action, CBrowser* browser) +{ + // Open the most recent tabtrash item + XbelItem* item = xbel_folder_get_nth_item(tabtrash, 0); + const gchar* uri = xbel_bookmark_get_href(item); + CBrowser* curBrowser = browser_new(browser); + webView_open(curBrowser->webView, uri); + xbel_folder_remove_item(tabtrash, item); + xbel_item_free(item); + update_browser_actions(curBrowser); +} + +void on_action_tabsClosed_clear_activate(GtkAction* action, CBrowser* browser) +{ + // Clear the closed tabs list + xbel_item_free(tabtrash); + tabtrash = xbel_folder_new(); + update_browser_actions(browser); +} + +void on_action_link_tab_new_activate(GtkAction* action, CBrowser* browser) +{ + CBrowser* curBrowser = browser_new(browser); + webView_open(curBrowser->webView, browser->elementUri); +} + +void on_action_link_tab_current_activate(GtkAction* action, CBrowser* browser) +{ + webView_open(get_nth_webView(-1, browser), browser->elementUri); +} + +void on_action_link_window_new_activate(GtkAction* action, CBrowser* browser) +{ + CBrowser* curBrowser = browser_new(NULL); + webView_open(curBrowser->webView, browser->elementUri); +} + +void on_action_link_saveWith_activate(GtkAction* action, CBrowser* browser) +{ + spawn_protocol_command("download", browser->elementUri); +} + +void on_action_link_copy_activate(GtkAction* action, CBrowser* browser) +{ + GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text(clipboard, browser->elementUri, -1); +} + +static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browser) +{ + gboolean newBookmark = !bookmark; + GtkWidget* dialog = gtk_dialog_new_with_buttons( + newBookmark ? "New bookmark" : "Edit bookmark" + , GTK_WINDOW(browser->window) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , newBookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog) + , newBookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); + GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + + if(newBookmark) + bookmark = xbel_bookmark_new(); + + GtkWidget* hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic("_Title:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_title = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_title), TRUE); + if(!newBookmark) + gtk_entry_set_text(GTK_ENTRY(entry_title), xbel_item_get_title(bookmark)); + gtk_box_pack_start(GTK_BOX(hbox), entry_title, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Description:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_desc = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_desc), TRUE); + if(!newBookmark) + gtk_entry_set_text(GTK_ENTRY(entry_desc), xbel_item_get_desc(bookmark)); + gtk_box_pack_start(GTK_BOX(hbox), entry_desc, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Uri:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_uri = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_uri), TRUE); + if(!newBookmark) + gtk_entry_set_text(GTK_ENTRY(entry_uri), xbel_bookmark_get_href(bookmark)); + gtk_box_pack_start(GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + xbel_item_set_title(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_title))); + xbel_item_set_desc(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_desc))); + xbel_bookmark_set_href(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_uri))); + + // FIXME: We want to choose a folder + if(newBookmark) + xbel_folder_append_item(bookmarks, bookmark); + } + gtk_widget_destroy(dialog); +} + +static void create_bookmark_menu(XbelItem*, GtkWidget*, CBrowser*); + +static void on_bookmark_menu_folder_activate(GtkWidget* menuitem, CBrowser* browser) +{ + GtkWidget* menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menuitem)); + gtk_container_foreach(GTK_CONTAINER(menu), (GtkCallback)gtk_widget_destroy, NULL);//... + XbelItem* folder = (XbelItem*)g_object_get_data(G_OBJECT(menuitem), "XbelItem"); + create_bookmark_menu(folder, menu, browser); + // Remove all menuitems when the menu is hidden. + // FIXME: We really *want* the line below, but it won't work like that + //g_signal_connect_after(menu, "hide", G_CALLBACK(gtk_container_foreach), gtk_widget_destroy); + gtk_widget_show(menuitem); +} + +static void on_bookmark_toolbar_folder_activate(GtkToolItem* toolitem, CBrowser* browser) +{ + GtkWidget* menu = gtk_menu_new(); + XbelItem* folder = (XbelItem*)g_object_get_data(G_OBJECT(toolitem), "XbelItem"); + create_bookmark_menu(folder, menu, browser); + // Remove all menuitems when the menu is hidden. + // FIXME: We really *should* run the line below, but it won't work like that + //g_signal_connect(menu, "hide", G_CALLBACK(gtk_container_foreach), gtk_widget_destroy); + sokoke_widget_popup(GTK_WIDGET(toolitem), GTK_MENU(menu), NULL); +} + +void on_menu_bookmarks_item_activate(GtkWidget* widget, CBrowser* browser) +{ + XbelItem* item = (XbelItem*)g_object_get_data(G_OBJECT(widget), "XbelItem"); + webView_open(get_nth_webView(-1, browser), xbel_bookmark_get_href(item)); +} + +static void create_bookmark_menu(XbelItem* folder, GtkWidget* menu, CBrowser* browser) +{ + guint n = xbel_folder_get_n_items(folder); + guint i; + for(i = 0; i < n; i++) + { + XbelItem* item = xbel_folder_get_nth_item(folder, i); + const gchar* title = xbel_item_is_separator(item) ? "" : xbel_item_get_title(item); + //const gchar* desc = xbel_item_is_separator(item) ? "" : xbel_item_get_desc(item); + GtkWidget* menuitem = NULL; + switch(xbel_item_get_kind(item)) + { + case XBEL_ITEM_FOLDER: + // FIXME: what about xbel_folder_is_folded? + menuitem = gtk_image_menu_item_new_with_label(title); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem) + , gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU)); + GtkWidget* _menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), _menu); + g_signal_connect(menuitem, "activate" + , G_CALLBACK(on_bookmark_menu_folder_activate), browser); + g_object_set_data(G_OBJECT(menuitem), "XbelItem", item); + break; + case XBEL_ITEM_BOOKMARK: + menuitem = menu_item_new(title, STOCK_BOOKMARK + , G_CALLBACK(on_menu_bookmarks_item_activate), TRUE, browser); + g_object_set_data(G_OBJECT(menuitem), "XbelItem", item); + break; + case XBEL_ITEM_SEPARATOR: + menuitem = gtk_separator_menu_item_new(); + break; + default: + g_warning("Unknown xbel item kind"); + } + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + } +} + +void on_action_bookmark_new_activate(GtkAction* action, CBrowser* browser) +{ + browser_editBookmark_dialog_new(NULL, browser); +} + +void on_action_manageSearchEngines_activate(GtkAction* action, CBrowser* browser) +{ + // Show the Manage search engines dialog. Create it if necessary. + static GtkWidget* dialog; + if(GTK_IS_DIALOG(dialog)) + gtk_window_present(GTK_WINDOW(dialog)); + else + { + dialog = webSearch_manageSearchEngines_dialog_new(browser); + gtk_widget_show(dialog); + } +} + +void on_action_tab_previous_activate(GtkAction* action, CBrowser* browser) +{ + gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page - 1); +} + +void on_action_tab_next_activate(GtkAction* action, CBrowser* browser) +{ + // Advance one tab or jump to the first one if we are at the last one + gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); + if(page == gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) - 1) + page = -1; + gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page + 1); +} + +void on_window_menu_item_activate(GtkImageMenuItem* widget, CBrowser* browser) +{ + gint page = get_webView_index(browser->webView, browser); + gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page); +} + +void on_action_about_activate(GtkAction* action, CBrowser* browser) +{ + gtk_show_about_dialog(GTK_WINDOW(browser->window) + , "logo-icon-name", gtk_window_get_icon_name(GTK_WINDOW(browser->window)) + , "name", PACKAGE_NAME + , "version", PACKAGE_VERSION + , "comments", "A lightweight web browser." + , "copyright", "Copyright © 2007 Christian Dywan" + , "website", "http://software.twotoasts.de" + , "authors", credits_authors + , "documenters", credits_documenters + , "artists", credits_artists + , "license", license + , "wrap-license", TRUE + //, "translator-credits", _("translator-credits") + , NULL); +} + +gboolean on_location_key_down(GtkWidget* widget, GdkEventKey* event, CBrowser* browser) +{ + switch(event->keyval) + { + case GDK_Return: + { + const gchar* uri = gtk_entry_get_text(GTK_ENTRY(widget)); + if(uri) + { + gchar* newUri = magic_uri(uri, TRUE); + // TODO: Use newUrl intermediately when completion is better + /* TODO Completion should be generated from history, that is + the uri as well as the title. */ + entry_completion_append(GTK_ENTRY(widget), uri); + webView_open(get_nth_webView(-1, browser), newUri); + g_free(newUri); + } + return TRUE; + } + case GDK_Escape: + { + GtkWidget* webView = get_nth_webView(-1, browser); + WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); + const gchar* uri = webkit_web_frame_get_location(frame); + if(uri && *uri) + gtk_entry_set_text(GTK_ENTRY(widget), uri); + return TRUE; + } + } + return FALSE; +} + +void on_location_changed(GtkWidget* widget, CBrowser* browser) +{ + // Preserve changes to the uri + /*const gchar* newUri = gtk_entry_get_text(GTK_ENTRY(widget)); + xbel_bookmark_set_href(browser->sessionItem, newUri);*/ + // FIXME: If we want this feature, this is the wrong approach +} + +void on_action_panels_activate(GtkToggleAction* action, CBrowser* browser) +{ + config->panelShow = gtk_toggle_action_get_active(action); + sokoke_widget_set_visible(browser->panels, config->panelShow); +} + +void on_action_panel_item_activate(GtkRadioAction* action + , GtkRadioAction* currentAction, CBrowser* browser) +{ + g_return_if_fail(GTK_IS_ACTION(action)); + // TODO: Activating again should hide the contents; how? + //gint iValue; gint iCurrentValue; + //g_object_get(G_OBJECT(action), "value", &iValue, NULL); + //g_object_get(G_OBJECT(currentAction), "value", &iCurrentValue, NULL); + //GtkWidget* parent = gtk_widget_get_parent(browser->panels_notebook); + //sokoke_widget_set_visible(parent, iCurrentValue == iValue); + /*gtk_paned_set_position(GTK_PANED(gtk_widget_get_parent(browser->panels)) + , iCurrentValue == iValue ? config->iPanelPos : 0);*/ + config->panelActive = gtk_radio_action_get_current_value(action); + gint page = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(currentAction), "iPage")); + gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->panels_notebook), page); + // This is a special case where activation was not user requested. + if(!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "once-silent"))) + { + config->panelShow = TRUE; + gtk_widget_show(browser->panels); + } + else + g_object_set_data(G_OBJECT(action), "once-silent", NULL); +} + +void on_action_openInPanel_activate(GtkAction* action, CBrowser* browser) +{ + GtkWidget* webView = get_nth_webView(-1, browser); + g_free(config->panelPageholder); + WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); + const gchar* uri = webkit_web_frame_get_location(frame); + config->panelPageholder = g_strdup(uri); + GtkAction* action_pageholder = + gtk_action_group_get_action(browser->actiongroup, "PanelPageholder"); + gint value; g_object_get(G_OBJECT(action_pageholder), "value", &value, NULL); + sokoke_radio_action_set_current_value(GTK_RADIO_ACTION(action_pageholder), value); + gtk_widget_show(browser->panels); + webView_open(browser->panel_pageholder, config->panelPageholder); +} + + +static void on_panels_notify_position(GObject* object, GParamSpec* arg1 + , CBrowser* browser) +{ + config->winPanelPos = gtk_paned_get_position(GTK_PANED(object)); +} + +void on_panels_button_close_clicked(GtkWidget* widget, CBrowser* browser) +{ + config->panelShow = FALSE; + gtk_widget_hide(browser->panels); +} + +gboolean on_notebook_tab_mouse_up(GtkWidget* widget, GdkEventButton* event + , CBrowser* browser) +{ + if(event->button == 1 && event->type == GDK_2BUTTON_PRESS) + { + // Toggle the label visibility on double click + GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget)); + GList* children = gtk_container_get_children(GTK_CONTAINER(child)); + child = (GtkWidget*)g_list_nth_data(children, 1); + gboolean visible = gtk_widget_get_child_visible(GTK_WIDGET(child)); + gtk_widget_set_child_visible(GTK_WIDGET(child), !visible); + gint a, b; sokoke_widget_get_text_size(browser->webView_name, "M", &a, &b); + gtk_widget_set_size_request(child, !visible + ? a * config->tabSize : 0, !visible ? -1 : 0); + g_list_free(children); + return TRUE; + } + else if(event->button == 2) + { + // Close the webView on middle click + webView_close(browser->webView, browser); + return TRUE; + } + + return FALSE; +} + +gboolean on_notebook_tab_close_clicked(GtkWidget* widget, CBrowser* browser) +{ + webView_close(browser->webView, browser); + return TRUE; +} + +void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page + , guint page_num, CBrowser* browser) +{ + GtkWidget* webView = get_nth_webView(page_num, browser); + browser = get_browser_from_webView(webView); + const gchar* uri = xbel_bookmark_get_href(browser->sessionItem); + gtk_entry_set_text(GTK_ENTRY(browser->location), uri); + const gchar* title = xbel_item_get_title(browser->sessionItem); + const gchar* effectiveTitle = title ? title : uri; + gchar* windowTitle = g_strconcat(effectiveTitle, " - ", PACKAGE_NAME, NULL); + gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); + g_free(windowTitle); + update_favicon(browser); + update_security(browser); + update_gui_state(browser); + update_statusbar_text(browser); + update_feeds(browser); + update_search_engines(browser); +} + +void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser) +{ + gtk_widget_hide(browser->findbox); +} + +static gboolean on_window_configure(GtkWidget* widget, GdkEventConfigure* event + , CBrowser* browser) +{ + gtk_window_get_position(GTK_WINDOW(browser->window) + , &config->winLeft, &config->winTop); + return FALSE; +} + +static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation + , CBrowser* browser) +{ + config->winWidth = allocation->width; + config->winHeight = allocation->height; +} + +gboolean on_window_destroy(GtkWidget* widget, GdkEvent* event, CBrowser* browser) +{ + gboolean proceed = TRUE; + // TODO: What if there are multiple windows? + // TODO: Smart dialog, à la 'Session?: Save, Discard, Cancel' + // TODO: Pref startup: session, ask, homepage, blank <-- ask + // TODO: Pref quit: session, ask, none <-- ask + + if(0 /*g_list_length(browser_list) > 1*/) + { + GtkDialog* dialog; + dialog = GTK_DIALOG(gtk_message_dialog_new(GTK_WINDOW(browser->window) + , GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO + , "There is more than one tab open. Do you want to close anyway?")); + gtk_window_set_title(GTK_WINDOW(dialog), PACKAGE_NAME); + gtk_dialog_set_default_response(dialog, GTK_RESPONSE_YES); + proceed = gtk_dialog_run(dialog) == GTK_RESPONSE_YES; + gtk_widget_destroy(GTK_WIDGET(dialog)); + } + return !proceed; +} + +// -- Browser creation begins here + +CBrowser* browser_new(CBrowser* oldBrowser) +{ + CBrowser* browser = g_new0(CBrowser, 1); + browsers = g_list_prepend(browsers, browser); + browser->sessionItem = xbel_bookmark_new(); + xbel_item_set_title(browser->sessionItem, "about:blank"); + xbel_folder_append_item(session, browser->sessionItem); + + GtkWidget* scrolled; + + if(!oldBrowser) + { + + GtkWidget* label; GtkWidget* hbox; + + // Setup the window metrics + browser->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window)); + const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7; + const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7; + if(config->rememberWinMetrics) + { + if(!config->winWidth && !config->winHeight) + { + config->winWidth = defaultWidth; + config->winHeight = defaultWidth; + } + if(config->winLeft && config->winTop) + gtk_window_move(GTK_WINDOW(browser->window) + , config->winLeft, config->winTop); + gtk_window_set_default_size(GTK_WINDOW(browser->window) + , config->winWidth, config->winHeight); + } + else + gtk_window_set_default_size(GTK_WINDOW(browser->window) + , defaultWidth, defaultHeight); + g_signal_connect(browser->window, "configure-event" + , G_CALLBACK(on_window_configure), browser); + g_signal_connect(browser->window, "size-allocate" + , G_CALLBACK(on_window_size_allocate), browser); + // FIXME: Use custom program icon + gtk_window_set_icon_name(GTK_WINDOW(browser->window), "web-browser"); + gtk_window_set_title(GTK_WINDOW(browser->window), g_get_application_name()); + gtk_window_add_accel_group(GTK_WINDOW(browser->window), accel_group); + g_signal_connect(browser->window, "delete-event" + , G_CALLBACK(on_window_destroy), browser); + GtkWidget* vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(browser->window), vbox); + gtk_widget_show(vbox); + + // Let us see some ui manager magic + browser->actiongroup = gtk_action_group_new("Browser"); + gtk_action_group_add_actions(browser->actiongroup, entries, entries_n, browser); + gtk_action_group_add_toggle_actions(browser->actiongroup + , toggle_entries, toggle_entries_n, browser); + gtk_action_group_add_radio_actions(browser->actiongroup + , refreshevery_entries, refreshevery_entries_n + , 300, NULL/*G_CALLBACK(activate_refreshevery_period_action)*/, browser); + gtk_action_group_add_radio_actions(browser->actiongroup + , panel_entries, panel_entries_n, -1 + , G_CALLBACK(on_action_panel_item_activate), browser); + GtkUIManager* ui_manager = gtk_ui_manager_new(); + gtk_ui_manager_insert_action_group(ui_manager, browser->actiongroup, 0); + gtk_window_add_accel_group(GTK_WINDOW(browser->window) + , gtk_ui_manager_get_accel_group(ui_manager)); + + GError* error = NULL; + if(!gtk_ui_manager_add_ui_from_string(ui_manager, ui_markup, -1, &error)) + { + // TODO: Should this be a message dialog? When does this happen? + g_message("User interface couldn't be created: %s", error->message); + g_error_free(error); + } + + GtkAction* action; + // Make all actions except toplevel menus which lack a callback insensitive + // This will vanish once all actions are implemented + guint i; + for(i = 0; i < entries_n; i++) + { + action = gtk_action_group_get_action(browser->actiongroup, entries[i].name); + gtk_action_set_sensitive(action, entries[i].callback || !entries[i].tooltip); + } + for(i = 0; i < toggle_entries_n; i++) + { + action = gtk_action_group_get_action(browser->actiongroup + , toggle_entries[i].name); + gtk_action_set_sensitive(action, toggle_entries[i].callback != NULL); + } + for(i = 0; i < refreshevery_entries_n; i++) + { + action = gtk_action_group_get_action(browser->actiongroup + , refreshevery_entries[i].name); + gtk_action_set_sensitive(action, FALSE); + } + + //action_set_active("ToolbarDownloads", config->bToolbarDownloads, browser); + + // Create the menubar + browser->menubar = gtk_ui_manager_get_widget(ui_manager, "/menubar"); + GtkWidget* menuitem = gtk_menu_item_new(); + gtk_widget_show(menuitem); + browser->throbber = gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + gtk_widget_show(browser->throbber); + gtk_container_add(GTK_CONTAINER(menuitem), browser->throbber); + gtk_widget_set_sensitive(menuitem, FALSE); + gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menuitem), TRUE); + gtk_menu_shell_append(GTK_MENU_SHELL(browser->menubar), menuitem); + gtk_box_pack_start(GTK_BOX(vbox), browser->menubar, FALSE, FALSE, 0); + menuitem = gtk_ui_manager_get_widget(ui_manager, "/menubar/Go/TabsClosed"); + g_signal_connect(menuitem, "activate" + , G_CALLBACK(on_menu_tabsClosed_activate), browser); + browser->menu_bookmarks = gtk_menu_item_get_submenu( + GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, "/menubar/Bookmarks"))); + menuitem = gtk_separator_menu_item_new(); + gtk_widget_show(menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_bookmarks), menuitem); + browser->menu_window = gtk_menu_item_get_submenu( + GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, "/menubar/Window"))); + menuitem = gtk_separator_menu_item_new(); + gtk_widget_show(menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_window), menuitem); + gtk_widget_show(browser->menubar); + action_set_sensitive("PrivateBrowsing", FALSE, browser); //... + action_set_sensitive("WorkOffline", FALSE, browser); //... + browser->popup_webView = gtk_ui_manager_get_widget(ui_manager, "/popup_webView"); + g_object_ref(browser->popup_webView); + browser->popup_element = gtk_ui_manager_get_widget(ui_manager, "/popup_element"); + g_object_ref(browser->popup_element); + browser->popup_editable = gtk_ui_manager_get_widget(ui_manager, "/popup_editable"); + g_object_ref(browser->popup_editable); + + // Create the navigation toolbar + browser->navibar = gtk_ui_manager_get_widget(ui_manager, "/toolbar_navigation"); + gtk_toolbar_set_style(GTK_TOOLBAR(browser->navibar) + , config_to_toolbarstyle(config->toolbarStyle)); + g_signal_connect(gtk_settings_get_default(), "notify::gtk-toolbar-style" + , G_CALLBACK(on_toolbar_navigation_notify_style), browser); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->navibar) + , config_to_toolbariconsize(config->toolbarSmall)); + gtk_toolbar_set_show_arrow(GTK_TOOLBAR(browser->navibar), TRUE); + gtk_box_pack_start(GTK_BOX(vbox), browser->navibar, FALSE, FALSE, 0); + browser->newTab = gtk_ui_manager_get_widget(ui_manager, "/toolbar_navigation/TabNew"); + action = gtk_action_group_get_action(browser->actiongroup, "Back"); + g_object_set(action, "is-important", TRUE, NULL); + + // Location entry + browser->location = sexy_icon_entry_new(); + entry_setup_completion(GTK_ENTRY(browser->location)); + sokoke_entry_set_can_undo(GTK_ENTRY(browser->location), TRUE); + browser->location_icon = gtk_image_new(); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->location) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(browser->location_icon)); + sexy_icon_entry_add_clear_button(SEXY_ICON_ENTRY(browser->location)); + g_signal_connect(browser->location, "key-press-event" + , G_CALLBACK(on_location_key_down), browser); + g_signal_connect(browser->location, "changed" + , G_CALLBACK(on_location_changed), browser); + GtkToolItem* toolitem = gtk_tool_item_new(); + gtk_tool_item_set_expand(GTK_TOOL_ITEM(toolitem), TRUE); + gtk_container_add(GTK_CONTAINER(toolitem), browser->location); + gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar), toolitem, -1); + + // Search entry + browser->webSearch = sexy_icon_entry_new(); + sexy_icon_entry_set_icon_highlight(SEXY_ICON_ENTRY(browser->webSearch) + , SEXY_ICON_ENTRY_PRIMARY, TRUE); + // TODO: Make this actively resizable or enlarge to fit contents? + // FIXME: The interface is somewhat awkward and ought to be rethought + // TODO: Display "show in context menu" search engines as "completion actions" + entry_setup_completion(GTK_ENTRY(browser->webSearch)); + sokoke_entry_set_can_undo(GTK_ENTRY(browser->webSearch), TRUE); + update_searchEngine(config->searchEngine, browser); + g_signal_connect(browser->webSearch, "icon-released" + , G_CALLBACK(on_webSearch_icon_released), browser); + g_signal_connect(browser->webSearch, "key-press-event" + , G_CALLBACK(on_webSearch_key_down), browser); + g_signal_connect(browser->webSearch, "scroll-event" + , G_CALLBACK(on_webSearch_scroll), browser); + g_signal_connect(browser->webSearch, "activate" + , G_CALLBACK(on_webSearch_activate), browser); + toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(toolitem), browser->webSearch); + gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar), toolitem, -1); + action = gtk_action_group_get_action(browser->actiongroup, "TabsClosed"); + browser->closedTabs = gtk_action_create_tool_item(action); + g_signal_connect(browser->closedTabs, "clicked" + , G_CALLBACK(on_menu_tabsClosed_activate), browser); + gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) + , GTK_TOOL_ITEM(browser->closedTabs), -1); + sokoke_container_show_children(GTK_CONTAINER(browser->navibar)); + action_set_active("ToolbarNavigation", config->toolbarNavigation, browser); + + // Bookmarkbar + browser->bookmarkbar = gtk_toolbar_new(); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->bookmarkbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style(GTK_TOOLBAR(browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); + create_bookmark_menu(bookmarks, browser->menu_bookmarks, browser); + for(i = 0; i < xbel_folder_get_n_items(bookmarks); i++) + { + XbelItem* item = xbel_folder_get_nth_item(bookmarks, i); + const gchar* title = xbel_item_is_separator(item) + ? "" : xbel_item_get_title(item); + const gchar* desc = xbel_item_is_separator(item) + ? "" : xbel_item_get_desc(item); + switch(xbel_item_get_kind(item)) + { + case XBEL_ITEM_FOLDER: + toolitem = tool_button_new(title, GTK_STOCK_DIRECTORY, TRUE, TRUE + , G_CALLBACK(on_bookmark_toolbar_folder_activate), desc, browser); + g_object_set_data(G_OBJECT(toolitem), "XbelItem", item); + break; + case XBEL_ITEM_BOOKMARK: + toolitem = tool_button_new(title, STOCK_BOOKMARK, TRUE, TRUE + , G_CALLBACK(on_menu_bookmarks_item_activate), desc, browser); + g_object_set_data(G_OBJECT(toolitem), "XbelItem", item); + break; + case XBEL_ITEM_SEPARATOR: + toolitem = gtk_separator_tool_item_new(); + break; + default: + g_warning("Unknown item kind"); + } + gtk_toolbar_insert(GTK_TOOLBAR(browser->bookmarkbar), toolitem, -1); + } + sokoke_container_show_children(GTK_CONTAINER(browser->bookmarkbar)); + gtk_box_pack_start(GTK_BOX(vbox), browser->bookmarkbar, FALSE, FALSE, 0); + action_set_active("ToolbarBookmarks", config->toolbarBookmarks, browser); + + // Superuser warning + if((hbox = sokoke_superuser_warning_new())) + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + + // Create the panels + GtkWidget* hpaned = gtk_hpaned_new(); + gtk_paned_set_position(GTK_PANED(hpaned), config->winPanelPos); + g_signal_connect(hpaned, "notify::position" + , G_CALLBACK(on_panels_notify_position), browser); + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + browser->panels = gtk_hbox_new(FALSE, 0); + gtk_paned_pack1(GTK_PANED(hpaned), browser->panels, FALSE, FALSE); + sokoke_widget_set_visible(browser->panels, config->panelShow); + + // Create the panel toolbar + GtkWidget* panelbar = gtk_ui_manager_get_widget(ui_manager, "/toolbar_panels"); + gtk_toolbar_set_style(GTK_TOOLBAR(panelbar), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(panelbar), GTK_ICON_SIZE_BUTTON); + gtk_toolbar_set_orientation(GTK_TOOLBAR(panelbar), GTK_ORIENTATION_VERTICAL); + gtk_box_pack_start(GTK_BOX(browser->panels), panelbar, FALSE, FALSE, 0); + action_set_active("Panels", config->panelShow, browser); + g_object_unref(ui_manager); + + GtkWidget* cbox = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(browser->panels), cbox, TRUE, TRUE, 0); + gtk_widget_show(cbox); + + // Panels titlebar + GtkWidget* labelbar = gtk_toolbar_new(); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(labelbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style(GTK_TOOLBAR(labelbar), GTK_TOOLBAR_ICONS); + toolitem = gtk_tool_item_new(); + gtk_tool_item_set_expand(toolitem, TRUE); + label = gtk_label_new_with_mnemonic("_Panels"); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_container_add(GTK_CONTAINER(toolitem), label); + gtk_container_set_border_width(GTK_CONTAINER(toolitem), 6); + gtk_toolbar_insert(GTK_TOOLBAR(labelbar), toolitem, -1); + // TODO: Does 'goto top' actually indicate 'detach'? + toolitem = tool_button_new(NULL, GTK_STOCK_GOTO_TOP, FALSE, TRUE + , NULL/*G_CALLBACK(on_panels_button_float_clicked)*/, "Detach panel", browser); + gtk_toolbar_insert(GTK_TOOLBAR(labelbar), toolitem, -1); + toolitem = tool_button_new(NULL, GTK_STOCK_CLOSE, FALSE, TRUE + , G_CALLBACK(on_panels_button_close_clicked), "Close panel", browser); + gtk_toolbar_insert(GTK_TOOLBAR(labelbar), toolitem, -1); + gtk_box_pack_start(GTK_BOX(cbox), labelbar, FALSE, FALSE, 0); + gtk_widget_show_all(labelbar); + + // Notebook, containing all panels + browser->panels_notebook = gtk_notebook_new(); + gtk_notebook_set_show_border(GTK_NOTEBOOK(browser->panels_notebook), FALSE); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(browser->panels_notebook), FALSE); + gint page; + // Dummy: This is the "fallback" panel for now + page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) + , gtk_label_new("empty"), NULL); + // Pageholder + browser->panel_pageholder = webView_new(&scrolled); + page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) + , scrolled, NULL); + //webView_load_from_uri(browser->panel_pageholder, config->panelPageholder); + action = gtk_action_group_get_action(browser->actiongroup, "PanelPageholder"); + g_object_set_data(G_OBJECT(action), "iPage", GINT_TO_POINTER(page)); + GtkWidget* frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + gtk_container_add(GTK_CONTAINER(frame), browser->panels_notebook); + gtk_box_pack_start(GTK_BOX(cbox), frame, TRUE, TRUE, 0); + gtk_widget_show_all(gtk_widget_get_parent(browser->panels_notebook)); + action = gtk_action_group_get_action(browser->actiongroup, "PanelDownloads"); + g_object_set_data(G_OBJECT(action), "once-silent", GINT_TO_POINTER(1)); + sokoke_radio_action_set_current_value(GTK_RADIO_ACTION(action), config->panelActive); + sokoke_widget_set_visible(browser->panels, config->panelShow); + + // Notebook, containing all webViews + browser->webViews = gtk_notebook_new(); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(browser->webViews), TRUE); + #if GTK_CHECK_VERSION(2, 10, 0) + //gtk_notebook_set_group_id(GTK_NOTEBOOK(browser->webViews), 0); + #endif + gtk_paned_pack2(GTK_PANED(hpaned), browser->webViews, FALSE, FALSE); + gtk_widget_show(browser->webViews); + + // Incremental findbar + browser->findbox = gtk_toolbar_new(); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->findbox), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style(GTK_TOOLBAR(browser->findbox), GTK_TOOLBAR_BOTH_HORIZ); + toolitem = gtk_tool_item_new(); + gtk_container_set_border_width(GTK_CONTAINER(toolitem), 6); + gtk_container_add(GTK_CONTAINER(toolitem) + , gtk_label_new_with_mnemonic("_Inline find:")); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); + browser->findbox_text = sexy_icon_entry_new(); + GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + sexy_icon_entry_add_clear_button(SEXY_ICON_ENTRY(browser->findbox_text)); + sokoke_entry_set_can_undo(GTK_ENTRY(browser->findbox_text), TRUE); + g_signal_connect(browser->findbox_text, "activate" + , G_CALLBACK(on_action_find_next_activate), browser); + toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(toolitem), browser->findbox_text); + gtk_tool_item_set_expand(GTK_TOOL_ITEM(toolitem), TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); + toolitem = tool_button_new(NULL, GTK_STOCK_GO_BACK, TRUE, TRUE + , G_CALLBACK(on_action_find_previous_activate), NULL, browser); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); + toolitem = tool_button_new(NULL, GTK_STOCK_GO_FORWARD, TRUE, TRUE + , G_CALLBACK(on_action_find_next_activate), NULL, browser); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); + browser->findbox_case = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SPELL_CHECK); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(browser->findbox_case), "Match Case"); + gtk_tool_item_set_is_important(GTK_TOOL_ITEM(browser->findbox_case), TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), browser->findbox_case, -1); + browser->findbox_highlight = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SELECT_ALL); + g_signal_connect(browser->findbox_highlight, "toggled" + , G_CALLBACK(on_findbox_highlight_toggled), browser); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(browser->findbox_highlight), "Highlight Matches"); + gtk_tool_item_set_is_important(GTK_TOOL_ITEM(browser->findbox_highlight), TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), browser->findbox_highlight, -1); + toolitem = gtk_separator_tool_item_new(); + gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolitem), FALSE); + gtk_tool_item_set_expand(GTK_TOOL_ITEM(toolitem), TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); + toolitem = tool_button_new(NULL, GTK_STOCK_CLOSE, FALSE, TRUE + , G_CALLBACK(on_findbox_button_close_clicked), "Close Findbar", browser); + gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); + sokoke_container_show_children(GTK_CONTAINER(browser->findbox)); + gtk_box_pack_start(GTK_BOX(vbox), browser->findbox, FALSE, FALSE, 0); + + // Statusbar + // TODO: fix children overlapping statusbar border + browser->statusbar = gtk_statusbar_new(); + gtk_box_pack_start(GTK_BOX(vbox), browser->statusbar, FALSE, FALSE, 0); + browser->progress = gtk_progress_bar_new(); + // Setting the progressbar's height to 1 makes it fit in the statusbar + gtk_widget_set_size_request(browser->progress, -1, 1); + gtk_box_pack_start(GTK_BOX(browser->statusbar), browser->progress + , FALSE, FALSE, 3); + browser->icon_security = gtk_image_new(); + gtk_box_pack_start(GTK_BOX(browser->statusbar) + , browser->icon_security, FALSE, FALSE, 0); + gtk_widget_show(browser->icon_security); + browser->icon_newsfeed = gtk_image_new_from_icon_name(STOCK_NEWSFEED + , GTK_ICON_SIZE_MENU); + gtk_box_pack_start(GTK_BOX(browser->statusbar) + , browser->icon_newsfeed, FALSE, FALSE, 0); + action_set_active("ToolbarStatus", config->toolbarStatus, browser); + + } + else + { + + browser->window = oldBrowser->window; + browser->actiongroup = oldBrowser->actiongroup; + browser->menubar = oldBrowser->menubar; + browser->menu_bookmarks = oldBrowser->menu_bookmarks; + browser->menu_window = oldBrowser->menu_window; + browser->popup_webView = oldBrowser->popup_webView; + browser->popup_element = oldBrowser->popup_element; + browser->popup_editable = oldBrowser->popup_editable; + browser->throbber = oldBrowser->throbber; + browser->navibar = oldBrowser->navibar; + browser->newTab = oldBrowser->newTab; + browser->location_icon = oldBrowser->location_icon; + browser->location = oldBrowser->location; + browser->webSearch = oldBrowser->webSearch; + browser->closedTabs = oldBrowser->closedTabs; + browser->bookmarkbar = oldBrowser->bookmarkbar; + browser->panels = oldBrowser->panels; + browser->panels_notebook = oldBrowser->panels_notebook; + browser->panel_pageholder = oldBrowser->panel_pageholder; + browser->webViews = oldBrowser->webViews; + browser->findbox = oldBrowser->findbox; + browser->findbox_case = oldBrowser->findbox_case; + browser->findbox_highlight = oldBrowser->findbox_highlight; + browser->statusbar = oldBrowser->statusbar; + browser->progress = oldBrowser->progress; + browser->icon_security = oldBrowser->icon_security; + browser->icon_newsfeed = oldBrowser->icon_newsfeed; + + } + + // Define some default values + browser->hasMenubar = TRUE; + browser->hasToolbar = TRUE; + browser->hasLocation = TRUE; + browser->hasStatusbar = TRUE; + browser->elementUri = NULL; + browser->loadedPercent = -1; // initially "not loading" + + // Add a window menu item + // TODO: Menu items should be ordered like the notebook tabs + // TODO: Watch tab reordering in >= gtk 2.10 + browser->webView_menu = menu_item_new("about:blank", GTK_STOCK_FILE + , G_CALLBACK(on_window_menu_item_activate), TRUE, browser); + gtk_widget_show(browser->webView_menu); + gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_window), browser->webView_menu); + + // Create a new tab label + GtkWidget* eventbox = gtk_event_box_new(); + gtk_event_box_set_visible_window(GTK_EVENT_BOX(eventbox), FALSE); + g_signal_connect(eventbox, "button-release-event" + , G_CALLBACK(on_notebook_tab_mouse_up), browser); + GtkWidget* hbox = gtk_hbox_new(FALSE, 1); + gtk_container_add(GTK_CONTAINER(eventbox), GTK_WIDGET(hbox)); + browser->webView_icon = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + gtk_box_pack_start(GTK_BOX(hbox), browser->webView_icon, FALSE, FALSE, 0); + browser->webView_name = gtk_label_new(xbel_item_get_title(browser->sessionItem)); + gtk_misc_set_alignment(GTK_MISC(browser->webView_name), 0.0, 0.5); + // TODO: make the tab initially look "unvisited" until it's focused + // TODO: tabs should shrink when there is not enough space + // TODO: gtk's tab scrolling is weird? + gint w, h; + sokoke_widget_get_text_size(browser->webView_name, "M", &w, &h); + gtk_widget_set_size_request(GTK_WIDGET(browser->webView_name) + , w * config->tabSize, -1); + gtk_label_set_ellipsize(GTK_LABEL(browser->webView_name), PANGO_ELLIPSIZE_END); + gtk_box_pack_start(GTK_BOX(hbox), browser->webView_name, FALSE, FALSE, 0); + browser->webView_close = gtk_button_new(); + gtk_button_set_relief(GTK_BUTTON(browser->webView_close), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click(GTK_BUTTON(browser->webView_close), FALSE); + GtkRcStyle* rcstyle = gtk_rc_style_new(); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style(browser->webView_close, rcstyle); + GtkWidget* image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + gtk_button_set_image(GTK_BUTTON(browser->webView_close), image); + gtk_box_pack_start(GTK_BOX(hbox), browser->webView_close, FALSE, FALSE, 0); + GtkSettings* gtksettings = gtk_settings_get_default(); + gint height; + gtk_icon_size_lookup_for_settings(gtksettings, GTK_ICON_SIZE_BUTTON, 0, &height); + gtk_widget_set_size_request(browser->webView_close, -1, height); + gtk_widget_show_all(GTK_WIDGET(eventbox)); + sokoke_widget_set_visible(browser->webView_close, config->tabClose); + g_signal_connect(browser->webView_close, "clicked" + , G_CALLBACK(on_notebook_tab_close_clicked), browser); + + // Create a webView inside a scrolled window + browser->webView = webView_new(&scrolled); + gtk_widget_show(GTK_WIDGET(scrolled)); + gtk_widget_show(GTK_WIDGET(browser->webView)); + gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); + page = gtk_notebook_insert_page(GTK_NOTEBOOK(browser->webViews) + , scrolled, GTK_WIDGET(eventbox), page + 1); + g_signal_connect_after(GTK_OBJECT(browser->webViews), "switch-page" + , G_CALLBACK(on_notebook_switch_page), browser); + #if GTK_CHECK_VERSION(2, 10, 0) + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(browser->webViews), scrolled, TRUE); + gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(browser->webViews), scrolled, TRUE); + #endif + + // Connect signals + #define DOC_CONNECT(__sig, __func) g_signal_connect \ + (G_OBJECT(browser->webView), __sig, G_CALLBACK(__func), browser); + DOC_CONNECT ("navigation-requested" , on_webView_navigation_requested) + DOC_CONNECT ("title-changed" , on_webView_title_changed) + DOC_CONNECT ("icon-loaded" , on_webView_icon_changed) + DOC_CONNECT ("load-started" , on_webView_load_started) + DOC_CONNECT ("load-progress-changed" , on_webView_load_changed) + DOC_CONNECT ("load-finished" , on_webView_load_finished) + DOC_CONNECT ("status-bar-text-changed" , on_webView_status_message) + DOC_CONNECT ("hovering-over-link" , on_webView_link_hover) + DOC_CONNECT ("console-message" , on_webView_console_message) + + // For now we check for "plugins-enabled", in case this build has no properties + if(g_object_class_find_property(G_OBJECT_GET_CLASS(browser->webView), "plugins-enabled")) + g_object_set(G_OBJECT(browser->webView) + , "loads-images-automatically" , config->loadImagesAutomatically + , "shrinks-standalone-images-to-fit", config->shrinkImagesToFit + , "text-areas-are-resizable" , config->resizableTextAreas + , "java-script-enabled" , config->enableJavaScript + , "plugins-enabled" , config->enablePlugins + , NULL); + + DOC_CONNECT ("button-release-event" , on_webView_button_release) + DOC_CONNECT ("popup-menu" , on_webView_popup); + DOC_CONNECT ("scroll-event" , on_webView_scroll); + DOC_CONNECT ("leave-notify-event" , on_webView_leave) + DOC_CONNECT ("destroy" , on_webView_destroy) + #undef DOC_CONNECT + + // Eventually pack and display everything + sokoke_widget_set_visible(browser->navibar, config->toolbarNavigation); + sokoke_widget_set_visible(browser->newTab, config->toolbarNewTab); + sokoke_widget_set_visible(browser->webSearch, config->toolbarWebSearch); + sokoke_widget_set_visible(browser->closedTabs, config->toolbarClosedTabs); + sokoke_widget_set_visible(browser->bookmarkbar, config->toolbarBookmarks); + sokoke_widget_set_visible(browser->statusbar, config->toolbarStatus); + if(!config->openTabsInTheBackground) + gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page); + + update_browser_actions(browser); + gtk_widget_show(browser->window); + gtk_widget_grab_focus(GTK_WIDGET(browser->location)); + + return browser; +} diff --git a/src/browser.h b/src/browser.h new file mode 100644 index 00000000..161ddc8f --- /dev/null +++ b/src/browser.h @@ -0,0 +1,563 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __BROWSER_H__ +#define __BROWSER_H__ 1 + +#include "global.h" + +#include + +// -- Types + +typedef struct _CBrowser +{ + // shared widgets + GtkWidget* window; + GtkActionGroup* actiongroup; + // menus + GtkWidget* menubar; + GtkWidget* menu_bookmarks; + GtkWidget* menu_window; + GtkWidget* popup_webView; + GtkWidget* popup_element; + GtkWidget* popup_editable; + GtkWidget* throbber; + // navibar + GtkWidget* navibar; + GtkWidget* newTab; + GtkWidget* location_icon; + GtkWidget* location; + GtkWidget* webSearch; + GtkWidget* closedTabs; + GtkWidget* bookmarkbar; + // panels + GtkWidget* panels; + GtkWidget* panels_notebook; + GtkWidget* panel_pageholder; + GtkWidget* webViews; + // findbox + GtkWidget* findbox; + GtkWidget* findbox_text; + GtkToolItem* findbox_case; + GtkToolItem* findbox_highlight; + GtkWidget* statusbar; + GtkWidget* progress; + GtkWidget* icon_security; + GtkWidget* icon_newsfeed; + + // view specific widgets + GtkWidget* webView_menu; + GtkWidget* webView_icon; + GtkWidget* webView_name; + GtkWidget* webView_close; + GtkWidget* webView; + + // view specific values + gboolean hasMenubar; + gboolean hasToolbar; + gboolean hasLocation; + gboolean hasStatusbar; + gchar* elementUri; // the element the mouse is hovering on + gint loadedPercent; // -1 means "not loading" + gint loadedBytes; + gint loadedBytesMax; + //UNDEFINED favicon; + guint security; + gchar* statusMessage; // message from a webView + XbelItem* sessionItem; +} CBrowser; + +enum +{ + SEARCH_COL_ICON, + SEARCH_COL_TEXT, + SEARCH_COL_N +}; + +// -- Declarations + +void +on_action_window_new_activate(GtkAction*, CBrowser*); + +void +on_action_tab_new_activate(GtkAction*, CBrowser*); + +void +on_action_open_activate(GtkAction*, CBrowser*); + +void +on_action_tab_close_activate(GtkAction*, CBrowser*); + +void +on_action_window_close_activate(GtkAction*, CBrowser*); + +void +on_action_quit_activate(GtkAction*, CBrowser*); + +void +on_action_edit_activate(GtkAction*, CBrowser*); + +void +on_action_cut_activate(GtkAction*, CBrowser*); + +void +on_action_copy_activate(GtkAction*, CBrowser*); + +void +on_action_paste_activate(GtkAction*, CBrowser*); + +void +on_action_delete_activate(GtkAction*, CBrowser*); + +void +on_action_selectAll_activate(GtkAction*, CBrowser*); + +void +on_action_find_activate(GtkAction*, CBrowser*); + +void +on_action_find_next_activate(GtkAction*, CBrowser*); + +void +on_action_find_previous_activate(GtkAction*, CBrowser*); + +void +on_action_preferences_activate(GtkAction*, CBrowser*); + +void +on_action_toolbar_navigation_activate(GtkToggleAction*, CBrowser*); + +void +on_action_toolbar_bookmarks_activate(GtkToggleAction*, CBrowser*); + +void +on_action_panels_activate(GtkToggleAction*, CBrowser*); + +void +on_action_toolbar_status_activate(GtkToggleAction*, CBrowser*); + +void +on_action_refresh_stop_activate(GtkAction*, CBrowser*); + +void +on_action_zoom_in_activate(GtkAction*, CBrowser*); + +void +on_action_zoom_out_activate(GtkAction*, CBrowser*); + +void +on_action_zoom_normal_activate(GtkAction*, CBrowser*); + +void +on_action_source_view_activate(GtkAction*, CBrowser*); + +void +on_action_back_activate(GtkAction*, CBrowser*); + +void +on_action_forward_activate(GtkAction*, CBrowser*); + +void +on_action_home_activate(GtkAction*, CBrowser*); + +void +on_action_location_activate(GtkAction*, CBrowser*); + +void +on_action_webSearch_activate(GtkAction*, CBrowser*); + +void +on_action_openInPanel_activate(GtkAction*, CBrowser*); + +void +on_menu_tabsClosed_activate(GtkWidget*, CBrowser*); + +void +on_menu_tabsClosed_item_activate(GtkWidget*, CBrowser*); + +void +on_action_tabsClosed_clear_activate(GtkAction*, CBrowser*); + +void +on_action_tabsClosed_undo_activate(GtkAction*, CBrowser*); + +void +on_action_link_tab_new_activate(GtkAction*, CBrowser*); + +void +on_action_link_tab_current_activate(GtkAction*, CBrowser*); + +void +on_action_link_window_new_activate(GtkAction*, CBrowser*); + +void +on_action_link_saveWith_activate(GtkAction*, CBrowser*); + +void +on_action_link_copy_activate(GtkAction*, CBrowser*); + +void +on_menu_bookmarks_item_activate(GtkWidget*, CBrowser*); + +void +on_action_bookmark_new_activate(GtkAction*, CBrowser*); + +void +on_action_manageSearchEngines_activate(GtkAction*, CBrowser*); + +void +on_action_tab_previous_activate(GtkAction*, CBrowser*); + +void +on_action_tab_next_activate(GtkAction*, CBrowser*); + +void +on_action_about_activate(GtkAction*, CBrowser*); + +gboolean +on_location_key_down(GtkWidget*, GdkEventKey*, CBrowser*); + +CBrowser* +browser_new(CBrowser*); + +// -- Action definitions + +// TODO: Fill in a good description for each 'hm?' +static const GtkActionEntry entries[] = { + { "File", NULL, "_File" }, + { "WindowNew", STOCK_WINDOW_NEW + , NULL, "n" + , "Open a new window", G_CALLBACK(on_action_window_new_activate) }, + { "TabNew", STOCK_TAB_NEW + , NULL, "t" + , "Open a new tab", G_CALLBACK(on_action_tab_new_activate) }, + { "Open", GTK_STOCK_OPEN + , NULL, "o" + , "Open a file", G_CALLBACK(on_action_open_activate) }, + { "SaveAs", GTK_STOCK_SAVE_AS + , NULL, "s" + , "Save to a file", NULL/*G_CALLBACK(on_action_saveas_activate)*/ }, + { "TabClose", STOCK_TAB_CLOSE + , NULL, "w" + , "Close the current tab", G_CALLBACK(on_action_tab_close_activate) }, + { "WindowClose", STOCK_WINDOW_CLOSE + , NULL, "w" + , "Close this window", G_CALLBACK(on_action_window_close_activate) }, + { "PageSetup", GTK_STOCK_PROPERTIES + , "Pa_ge Setup", "" + , "hm?", NULL/*G_CALLBACK(on_action_page_setup_activate)*/ }, + { "PrintPreview", GTK_STOCK_PRINT_PREVIEW + , NULL, "" + , "hm?", NULL/*G_CALLBACK(on_action_print_preview_activate)*/ }, + { "Print", GTK_STOCK_PRINT + , NULL, "p" + , "hm?", NULL/*G_CALLBACK(on_action_print_activate)*/ }, + { "Quit", GTK_STOCK_QUIT + , NULL, "q" + , "Quit the application", G_CALLBACK(on_action_quit_activate) }, + + { "Edit", NULL, "_Edit", NULL, NULL, G_CALLBACK(on_action_edit_activate) }, + { "Undo", GTK_STOCK_UNDO + , NULL, "z" + , "Undo the last modification", NULL/*G_CALLBACK(on_action_undo_activate)*/ }, + { "Redo", GTK_STOCK_REDO + , NULL, "z" + , "Redo the last modification", NULL/*G_CALLBACK(on_action_redo_activate)*/ }, + { "Cut", GTK_STOCK_CUT + , NULL, "x" + , "Cut the selected text", G_CALLBACK(on_action_cut_activate) }, + { "Copy", GTK_STOCK_COPY + , NULL, "c" + , "Copy the selected text", G_CALLBACK(on_action_copy_activate) }, + { "Copy_", GTK_STOCK_COPY + , NULL, "c" + , "Copy the selected text", G_CALLBACK(on_action_copy_activate) }, + { "Paste", GTK_STOCK_PASTE + , NULL, "v" + , "Paste text from the clipboard", G_CALLBACK(on_action_paste_activate) }, + { "Delete", GTK_STOCK_DELETE + , NULL, NULL + , "Delete the selected text", G_CALLBACK(on_action_delete_activate) }, + { "SelectAll", GTK_STOCK_SELECT_ALL + , NULL, "a" + , "Selected all text", G_CALLBACK(on_action_selectAll_activate) }, + { "FormFill", STOCK_FORM_FILL + , NULL, "" + , "hm?", NULL/*G_CALLBACK(on_action_formfill_activate)*/ }, + { "Find", GTK_STOCK_FIND + , NULL, "f" + , "hm?", G_CALLBACK(on_action_find_activate) }, + { "FindNext", GTK_STOCK_GO_FORWARD + , "Find _Next", "g" + , "hm?", G_CALLBACK(on_action_find_next_activate) }, + { "FindPrevious", GTK_STOCK_GO_BACK + , "Find _Previous", "g" + , "hm?", G_CALLBACK(on_action_find_previous_activate) }, + { "FindQuick", GTK_STOCK_FIND + , "_Quick Find", "period" + , "hm?", NULL/*G_CALLBACK(on_action_find_quick_activate)*/ }, + { "ManageSearchEngines", GTK_STOCK_PROPERTIES + , "_Manage Search Engines", "s" + , "hm?", G_CALLBACK(on_action_manageSearchEngines_activate) }, + { "Preferences", GTK_STOCK_PREFERENCES + , NULL, "p" + , "hm?", G_CALLBACK(on_action_preferences_activate) }, + + { "View", NULL, "_View" }, + { "Toolbars", NULL, "_Toolbars" }, + { "Refresh", GTK_STOCK_REFRESH + , NULL, "r" + , "Refresh the current page", G_CALLBACK(on_action_refresh_stop_activate) }, + // TODO: Is appointment-new a good choice? + // TODO: What if it isn't available? + { "RefreshEvery", "appointment-new" + , "Refresh _Every...", "" + , "Refresh the current page", G_CALLBACK(on_action_refresh_stop_activate) }, + { "Stop", GTK_STOCK_STOP + , NULL, "Escape" + , "Stop loading of the current page", G_CALLBACK(on_action_refresh_stop_activate) }, + { "RefreshStop", GTK_STOCK_REFRESH + , NULL, "" + , NULL, G_CALLBACK(on_action_refresh_stop_activate) }, + { "ZoomIn", GTK_STOCK_ZOOM_IN + , NULL, "plus" + , "hm?", G_CALLBACK(on_action_zoom_in_activate) }, + { "ZoomOut", GTK_STOCK_ZOOM_OUT + , NULL, "minus" + , "hm?", G_CALLBACK(on_action_zoom_out_activate) }, + { "ZoomNormal", GTK_STOCK_ZOOM_100 + , NULL, "0" + , "hm?", G_CALLBACK(on_action_zoom_normal_activate) }, + { "BackgroundImage", STOCK_IMAGE + , "_Background Image", "" + , "hm?", NULL/*G_CALLBACK(on_action_background_image_activate)*/ }, + { "SourceView", STOCK_SOURCE_VIEW + , NULL, "" + , "hm?", /*G_CALLBACK(on_action_source_view_activate)*/ }, + { "SelectionSourceView", STOCK_SOURCE_VIEW + , "View Selection Source", "" + , "hm?", NULL/*G_CALLBACK(on_action_selection_source_view_activate)*/ }, + { "Properties", GTK_STOCK_PROPERTIES + , NULL, "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_activate)*/ }, + + { "Go", NULL, "_Go" }, + { "Back", GTK_STOCK_GO_BACK + , NULL, "Left" + , "hm?", G_CALLBACK(on_action_back_activate) }, + { "Forward", GTK_STOCK_GO_FORWARD + , NULL, "Right" + , "hm?", G_CALLBACK(on_action_forward_activate) }, + { "Home", STOCK_HOMEPAGE + , NULL, "Home" + , "hm?", G_CALLBACK(on_action_home_activate) }, + { "Location", GTK_STOCK_JUMP_TO + , "Location...", "l" + , "hm?", G_CALLBACK(on_action_location_activate) }, + { "Websearch", GTK_STOCK_FIND + , "Websearch...", "f" + , "hm?", G_CALLBACK(on_action_webSearch_activate) }, + { "OpenInPageholder", GTK_STOCK_JUMP_TO + , "Open in Page_holder...", "" + , "hm?", G_CALLBACK(on_action_openInPanel_activate) }, + { "TabsClosed", STOCK_USER_TRASH + , "Closed Tabs", "" + , "hm?", NULL }, + { "TabsClosedClear", GTK_STOCK_CLEAR + , "Clear List of Closed Tabs", "" + , "hm?", G_CALLBACK(on_action_tabsClosed_clear_activate) }, + { "UndoTabClose", GTK_STOCK_UNDELETE + , "Undo Close Tab", "" + , "hm?", G_CALLBACK(on_action_tabsClosed_undo_activate) }, + { "LinkTabNew", STOCK_TAB_NEW + , "Open Link in New Tab", "" + , "hm?", G_CALLBACK(on_action_link_tab_new_activate) }, + { "LinkTabCurrent", NULL + , "Open Link in Current Tab", "" + , "hm?", G_CALLBACK(on_action_link_tab_current_activate) }, + { "LinkWindowNew", STOCK_WINDOW_NEW + , "Open Link in New Window", "" + , "hm?", G_CALLBACK(on_action_link_window_new_activate) }, + { "LinkBookmarkNew", STOCK_BOOKMARK_NEW + , NULL, "" + , "Bookmark this link", NULL/*G_CALLBACK(on_action_link_bookmark_activate)*/ }, + { "LinkSaveAs", GTK_STOCK_SAVE + , "Save Destination as...", "" + , "Save destination to a file", NULL/*G_CALLBACK(on_action_link_saveas_activate)*/ }, + { "LinkSaveWith", STOCK_DOWNLOADS + , "Download Destination", "" + , "Save destination with the chosen download manager", G_CALLBACK(on_action_link_saveWith_activate) }, + { "LinkCopy", GTK_STOCK_COPY + , "Copy Link Address", "" + , "Copy the link address to the clipboard", G_CALLBACK(on_action_link_copy_activate) }, + { "SelectionLinksNewTabs", NULL + , "Open Selected Links in Tabs", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "SelectionTextTabNew", STOCK_TAB_NEW + , "Open in New Tab", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "SelectionTextTabCurrent", NULL + , "Open in Current Tab", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "SelectionTextWindowNew", STOCK_WINDOW_NEW + , "Open in New Qindow", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "SelectionSearch", GTK_STOCK_FIND + , "Search for ", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "SelectionSearchWith", GTK_STOCK_FIND + , "Search for with...", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "ImageViewTabNew", STOCK_TAB_NEW + , "View Image in New Tab", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "ImageViewTabCurrent", NULL + , "View image in current tab", "" + , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "ImageSaveAs", GTK_STOCK_SAVE + , "Save Image as...", "" + , "Save image to a file", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "ImageSaveWith", STOCK_DOWNLOADS + , "Download Image", "" + , "Save image with the chosen download manager", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + { "ImageCopy", GTK_STOCK_COPY + , "Copy Image Address", "" + , "Copy the image address to the clipboard", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, + + { "Bookmarks", NULL, "_Bookmarks" }, + { "BookmarkNew", STOCK_BOOKMARK_NEW + , NULL, "d" + , "hm?", NULL/*G_CALLBACK(on_action_bookmark_new_activate)*/ }, + { "BookmarksManage", STOCK_BOOKMARKS + , "_Manage Bookmarks", "b" + , "hm?", NULL/*G_CALLBACK(on_action_bookmarks_manage_activate)*/ }, + + { "Tools", NULL, "_Tools" }, + + { "Window", NULL, "_Window" }, + { "SessionLoad", GTK_STOCK_REVERT_TO_SAVED + , "_Load Session", "" + , "hm?", NULL/*G_CALLBACK(on_action_session_load_activate)*/ }, + { "SessionSave", GTK_STOCK_SAVE_AS + , "_Save Session", "" + , "hm?", NULL/*G_CALLBACK(on_action_session_save_activate)*/ }, + { "TabPrevious", GTK_STOCK_GO_BACK + , "_Previous Tab", "Page_Up" + , "hm?", G_CALLBACK(on_action_tab_previous_activate) }, + { "TabNext", GTK_STOCK_GO_FORWARD + , "_Next Tab", "Page_Down" + , "hm?", G_CALLBACK(on_action_tab_next_activate) }, + { "TabOverview", NULL + , "Tab _Overview", "" + , "hm?", NULL/*G_CALLBACK(on_action_tab_overview_activate)*/ }, + + { "Help", NULL, "_Help" }, + { "HelpContents", GTK_STOCK_HELP + , "_Contents", "F1" + , "hm?", NULL/*G_CALLBACK(on_action_help_contents_activate)*/ }, + { "About", GTK_STOCK_ABOUT + , NULL, "" + , "hm?", G_CALLBACK(on_action_about_activate) }, + }; + static const guint entries_n = G_N_ELEMENTS(entries); + +static const GtkToggleActionEntry toggle_entries[] = { + { "PrivateBrowsing", NULL + , "P_rivate Browsing", "" + , "hm?", NULL/*G_CALLBACK(on_action_private_browsing_activate)*/ + , FALSE }, + { "WorkOffline", GTK_STOCK_DISCONNECT + , "_Work Offline", "" + , "hm?", NULL/*G_CALLBACK(on_action_work_offline_activate)*/ + , FALSE }, + + { "ToolbarNavigation", NULL + , "_Navigationbar", "" + , "hm?", G_CALLBACK(on_action_toolbar_navigation_activate) + , FALSE }, + { "Panels", NULL + , "_Panels", "F9" + , "hm?", G_CALLBACK(on_action_panels_activate) + , FALSE }, + { "ToolbarBookmarks", NULL + , "_Bookmarkbar", "" + , "hm?", G_CALLBACK(on_action_toolbar_bookmarks_activate) + , FALSE }, + { "ToolbarDownloads", NULL + , "_Downloadbar", "" + , "hm?", NULL/*G_CALLBACK(on_action_toolbar_downloads_activate)*/ + , FALSE }, + { "ToolbarStatus", NULL + , "_Statusbar", "" + , "hm?", G_CALLBACK(on_action_toolbar_status_activate) + , FALSE }, + { "RefreshEveryEnable", NULL + , "_Enabled", "" + , "hm?", NULL/*G_CALLBACK(on_action_reloadevery_enable_activate)*/ + , FALSE }, + { "ReloadEveryActive", NULL + , "_Active", "" + , "hm?", NULL/*G_CALLBACK(on_action_reloadevery_active_activate)*/ + , FALSE }, + }; + static const guint toggle_entries_n = G_N_ELEMENTS(toggle_entries); + +static const GtkRadioActionEntry refreshevery_entries[] = { + { "RefreshEvery30", NULL + , "30 seconds", "" + , "Refresh Every _30 Seconds", 30 }, + { "RefreshEvery60", NULL + , "60 seconds", "" + , "Refresh Every _60 Seconds", 60 }, + { "RefreshEvery300", NULL + , "5 minutes", "" + , "Refresh Every _5 Minutes", 300 }, + { "RefreshEvery900", NULL + , "15 minutes", "" + , "Refresh Every _15 Minutes", 900 }, + { "RefreshEvery1800", NULL + , "30 minutes", "" + , "Refresh Every 3_0 Minutes", 1800 }, + { "RefreshEveryCustom", NULL + , "Custom...", "" + , "Refresh by a _Custom Period", 0 }, + }; + static const guint refreshevery_entries_n = G_N_ELEMENTS(refreshevery_entries); + +static const GtkRadioActionEntry panel_entries[] = { + { "PanelDownloads", STOCK_DOWNLOADS + , NULL, "" + , "hm?", 0 }, + { "PanelBookmarks", STOCK_BOOKMARKS + , "_Bookmarks", "" + , "hm?", 1 }, + { "PanelConsole", STOCK_CONSOLE + , NULL, "" + , "hm?", 2 }, + { "PanelExtensions", STOCK_EXTENSIONS + , NULL, "" + , "hm?", 3 }, + { "PanelHistory", STOCK_HISTORY + , "_History", "" + , "hm?", 4 }, + // TODO: We want a better icon here, but which one? + { "PanelTabs", STOCK_TAB_NEW + , "_Tabs", "" + , "hm?", 5 }, + // TODO: We probably want another icon here + { "PanelPageholder", GTK_STOCK_CONVERT + , "_Pageholder", "" + , "hm?", 6 }, + }; + static const guint panel_entries_n = G_N_ELEMENTS(panel_entries); + +#endif /* !__BROWSER_H__ */ diff --git a/src/conf.c b/src/conf.c new file mode 100644 index 00000000..25093d8a --- /dev/null +++ b/src/conf.c @@ -0,0 +1,173 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "conf.h" + +#include "sokoke.h" + +#include +#include +#include + +CConfig* config_new(void) +{ + return g_new0(CConfig, 1); +} + +void config_free(CConfig* config) +{ + g_free(config->homepage); + g_free(config->locationSearch); + g_free(config->panelPageholder); + g_datalist_clear(&config->protocols_commands); + g_ptr_array_free(config->protocols_names, TRUE); + g_free(config); +} + +gboolean config_from_file(CConfig* config, const gchar* filename, GError** error) +{ + GKeyFile* keyFile = g_key_file_new(); + g_key_file_load_from_file(keyFile, filename, G_KEY_FILE_KEEP_COMMENTS, error); + /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL + , G_KEY_FILE_KEEP_COMMENTS, error);*/ + #define GET_INT(var, key, default) \ + var = sokoke_key_file_get_integer_default( \ + keyFile, "browser", key, default, NULL) + #define GET_STR(var, key, default) \ + var = sokoke_key_file_get_string_default( \ + keyFile, "browser", key, default, NULL) + GET_INT(config->startup, "Startup", CONFIG_STARTUP_HOMEPAGE); + GET_STR(config->homepage, "Homepage", "http://www.google.com"); + GET_STR(config->locationSearch, "LocationSearch", "http://www.google.com/search?q=%s"); + GET_INT(config->toolbarNavigation, "ToolbarNavigation", TRUE); + GET_INT(config->toolbarBookmarks, "ToolbarBookmarks", FALSE); + GET_INT(config->toolbarStatus, "ToolbarStatus", TRUE); + //GET_INT(config->toolbarDownloads, "ToolbarDownloads", FALSE); + GET_INT(config->toolbarStyle, "ToolbarStyle", CONFIG_TOOLBAR_DEFAULT); + GET_INT(config->toolbarSmall, "ToolbarSmall", FALSE); + GET_INT(config->toolbarWebSearch, "ToolbarWebSearch", TRUE); + GET_INT(config->toolbarNewTab, "ToolbarNewTab", TRUE); + GET_INT(config->toolbarClosedTabs, "ToolbarClosedTabs", TRUE); + GET_INT(config->panelShow, "PanelShow", FALSE); + GET_INT(config->panelActive, "PanelActive", 0); + GET_STR(config->panelPageholder, "PanelPageholder", "http://www.google.com"); + GET_INT(config->tabSize, "TabSize", 10); + GET_INT(config->tabClose, "TabClose", TRUE); + GET_INT(config->newPages, "NewPages", CONFIG_NEWPAGES_TAB_NEW); + GET_INT(config->openTabsInTheBackground, "OpenTabsInTheBackground", FALSE); + GET_INT(config->openPopupsInTabs, "OpenPopupsInTabs", FALSE); + #undef GET_INT + #undef GET_STR + + #define GET_INT(var, key, default) \ + var = sokoke_key_file_get_integer_default( \ + keyFile, "content", key, default, NULL) + #define GET_STR(var, key, default) \ + var = sokoke_key_file_get_string_default( \ + keyFile, "content", key, default, NULL) + GET_INT(config->loadImagesAutomatically, "LoadImagesAutomatically", TRUE); + GET_INT(config->shrinkImagesToFit, "ShrinkImagesTooFit", TRUE); + GET_INT(config->resizableTextAreas, "ResizableTextAreas", FALSE); + GET_INT(config->enableJavaScript, "EnableJavaScript", TRUE); + GET_INT(config->enablePlugins, "EnablePlugins", TRUE); + #undef GET_INT + #undef GET_STR + + #define GET_INT(var, key, default) \ + var = sokoke_key_file_get_integer_default( \ + keyFile, "session", key, default, NULL) + #define GET_STR(var, key, default) \ + var = sokoke_key_file_get_string_default( \ + keyFile, "session", key, default, NULL) + GET_INT(config->rememberWinMetrics , "RememberWinMetrics", TRUE); + GET_INT(config->winLeft , "WinLeft", 0); + GET_INT(config->winTop , "WinTop", 0); + GET_INT(config->winWidth , "WinWidth", 0); + GET_INT(config->winHeight, "WinHeight", 0); + GET_INT(config->winPanelPos, "WinPanelPos", 0); + GET_INT(config->searchEngine, "SearchEngine", 0); + #undef GET_INT + #undef GET_STR + + config->protocols_names = g_ptr_array_new(); + g_datalist_init(&config->protocols_commands); + gchar** protocols; + if((protocols = g_key_file_get_keys(keyFile, "protocols", NULL, NULL))) + { + guint i; + for(i = 0; protocols[i] != NULL; i++) + { + gchar* sCommand = g_key_file_get_string(keyFile, "protocols" + , protocols[i], NULL); + g_ptr_array_add(config->protocols_names, (gpointer)protocols[i]); + g_datalist_set_data_full(&config->protocols_commands + , protocols[i], sCommand, g_free); + } + g_free(protocols); + } + + g_key_file_free(keyFile); + return !(error && *error); +} + +gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) +{ + GKeyFile* keyFile = g_key_file_new(); + + g_key_file_set_integer(keyFile, "browser", "Startup", config->startup); + g_key_file_set_string (keyFile, "browser", "Homepage", config->homepage); + g_key_file_set_string (keyFile, "browser", "LocationSearch", config->locationSearch); + g_key_file_set_integer(keyFile, "browser", "ToolbarNavigation", config->toolbarNavigation); + g_key_file_set_integer(keyFile, "browser", "ToolbarBookmarks", config->toolbarBookmarks); + //g_key_file_set_integer(keyFile, "browser", "ToolbarDownloads", config->toolbarDownloads); + g_key_file_set_integer(keyFile, "browser", "ToolbarStatus", config->toolbarStatus); + g_key_file_set_integer(keyFile, "browser", "ToolbarStyle", config->toolbarStyle); + g_key_file_set_integer(keyFile, "browser", "ToolbarSmall", config->toolbarSmall); + g_key_file_set_integer(keyFile, "browser", "ToolbarWebSearch", config->toolbarWebSearch); + g_key_file_set_integer(keyFile, "browser", "ToolbarNewTab", config->toolbarNewTab); + g_key_file_set_integer(keyFile, "browser", "ToolbarClosedTabs", config->toolbarClosedTabs); + g_key_file_set_integer(keyFile, "browser", "PanelShow", config->panelShow); + g_key_file_set_integer(keyFile, "browser", "PanelActive", config->panelActive); + g_key_file_set_string (keyFile, "browser", "PanelPageholder", config->panelPageholder); + g_key_file_set_integer(keyFile, "browser", "TabSize", config->tabSize); + g_key_file_set_integer(keyFile, "browser", "TabClose", config->tabClose); + g_key_file_set_integer(keyFile, "browser", "NewPages", config->newPages); + g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground); + g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs); + + g_key_file_set_integer(keyFile, "content", "LoadImagesAutomatically", config->loadImagesAutomatically); + g_key_file_set_integer(keyFile, "content", "ShrinkImagesToFit", config->shrinkImagesToFit); + g_key_file_set_integer(keyFile, "content", "ResizableTextAreas", config->resizableTextAreas); + g_key_file_set_integer(keyFile, "content", "EnableJavaScript", config->enableJavaScript); + g_key_file_set_integer(keyFile, "content", "EnablePlugins", config->enablePlugins); + + g_key_file_set_integer(keyFile, "session", "RememberWinMetrics", config->rememberWinMetrics); + g_key_file_set_integer(keyFile, "session", "WinLeft", config->winLeft); + g_key_file_set_integer(keyFile, "session", "WinTop", config->winTop); + g_key_file_set_integer(keyFile, "session", "WinWidth", config->winWidth); + g_key_file_set_integer(keyFile, "session", "WinHeight", config->winHeight); + g_key_file_set_integer(keyFile, "session", "WinPanelPos", config->winPanelPos); + g_key_file_set_integer(keyFile, "session", "SearchEngine", config->searchEngine); + + guint i; + for(i = 0; i < config->protocols_names->len; i++) + { + gchar* protocol = (gchar*)g_ptr_array_index(config->protocols_names, i); + gchar* command = g_datalist_get_data(&config->protocols_commands, protocol); + g_key_file_set_string(keyFile, "protocols", protocol, command); + g_free(protocol); + } + + gboolean saved = sokoke_key_file_save_to_file(keyFile, filename, error); + g_key_file_free(keyFile); + + return saved; +} diff --git a/src/conf.h b/src/conf.h new file mode 100644 index 00000000..059695be --- /dev/null +++ b/src/conf.h @@ -0,0 +1,94 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __CONF_H__ +#define __CONF_H__ 1 + +#include + +typedef struct _CConfig +{ + guint startup; + gchar* homepage; + gchar* locationSearch; + gboolean toolbarNavigation; + gboolean toolbarBookmarks; + //gboolean toolbarDownloads; + gboolean toolbarStatus; + guint toolbarStyle; + gboolean toolbarSmall; + gboolean panelShow; + guint panelActive; + gchar* panelPageholder; + // TODO: What about this? Support it or fix tab shrinking and drop it? + guint tabSize; // tab size in charcters + gboolean tabClose; + gboolean toolbarWebSearch; + gboolean toolbarNewTab; + gboolean toolbarClosedTabs; + guint newPages; // where to open new pages + gboolean openTabsInTheBackground; + gboolean openPopupsInTabs; + + gboolean loadImagesAutomatically; + gboolean shrinkImagesToFit; + gboolean resizableTextAreas; + gboolean enableJavaScript; + gboolean enablePlugins; + + gboolean rememberWinMetrics; // Restore last state upon startup? + gint winLeft; + gint winTop; + gint winWidth; + gint winHeight; + guint winPanelPos; + guint searchEngine; // last selected search engine + + GPtrArray* protocols_names; + GData* protocols_commands; +} CConfig; + +enum +{ + CONFIG_STARTUP_BLANK, + CONFIG_STARTUP_HOMEPAGE, + CONFIG_STARTUP_SESSION +}; + +enum +{ + CONFIG_TOOLBAR_DEFAULT, + CONFIG_TOOLBAR_ICONS, + CONFIG_TOOLBAR_TEXT, + CONFIG_TOOLBAR_BOTH, + CONFIG_TOOLBAR_BOTH_HORIZ +}; + +enum +{ + CONFIG_NEWPAGES_TAB_NEW, + CONFIG_NEWPAGES_WINDOW_NEW, + CONFIG_NEWPAGES_TAB_CURRENT +}; + +CConfig* +config_new(void); + +void +config_free(CConfig*); + +gboolean +config_from_file(CConfig*, const gchar*, GError**); + +gboolean +config_to_file(CConfig*, const gchar*, GError**); + +#endif /* !__CONF_H__ */ diff --git a/src/debug.h b/src/debug.h new file mode 100644 index 00000000..d44b9657 --- /dev/null +++ b/src/debug.h @@ -0,0 +1,25 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __DEBUG_H__ +#define __DEBUG_H__ 1 + +#include "config.h" + +#include + +#if SOKOKE_DEBUG > 1 + #define UNIMPLEMENTED g_print(" * Unimplemented: %s\n", G_STRFUNC); +#else + #define UNIMPLEMENTED ; +#endif + +#endif /* !__DEBUG_H__ */ diff --git a/src/global.h b/src/global.h new file mode 100644 index 00000000..c893d54d --- /dev/null +++ b/src/global.h @@ -0,0 +1,83 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __GLOBAL_H__ +#define __GLOBAL_H__ 1 + +#include "conf.h" +#include "xbel.h" + +#include + +// -- globals + +CConfig* config; +GList* searchEngines; // Items of type 'SearchEngine' +GList* browsers; // Items of type 'CBrowser' +GtkAccelGroup* accel_group; +XbelItem* bookmarks; +XbelItem* session; +XbelItem* tabtrash; + +// Custom stock items + +// We should distribute these +// Names should match with epiphany and/ or xdg spec +/* NOTE: Those uncommented were replaced with remotely related icons + in order to reduce the amount of warnings :D */ + +#define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" // "bookmark-web" +#define STOCK_BOOKMARKS "bookmark-view" +#define STOCK_DOWNLOADS "package" // "download" +#define STOCK_CONSOLE "terminal" // "console" // MISSING +#define STOCK_EXTENSIONS "extension" // MISSING +#define STOCK_FORM_FILL "insert-text" // "form-fill" // MISSING +#define STOCK_HISTORY "document-open-recent" +#define STOCK_HISTORY_ "history-view" +#define STOCK_LOCATION "location-entry" +#define STOCK_NEWSFEED "gtk-index" // "newsfeed" // MISSING +#define STOCK_PLUGINS "plugin" // MISSING +#define STOCK_POPUPS_BLOCKED "popup-hidden" +#define STOCK_SOURCE_VIEW "stock_view-html-source" // MISSING +#define STOCK_TAB_CLOSE "tab-close" // MISSING +#define STOCK_WINDOW_CLOSE "window-close" // MISSING + +// We can safely use standard icons +// Assuming that we have reliable fallback icons + +#define STOCK_BOOKMARK_NEW "bookmark-new" +#define STOCK_BOOKMARK_NEW_ "stock_add-bookmark" +#define STOCK_HOMEPAGE GTK_STOCK_HOME +#define STOCK_IMAGE "image-x-generic" +#define STOCK_IMAGE_ "gnome-mime-image" +#define STOCK_LOCK_OPEN "stock_lock-open" +#define STOCK_LOCK_SECURE "stock_lock" +#define STOCK_LOCK_BROKEN "stock_lock-broken" +#define STOCK_NETWORK_OFFLINE "connect_no" +#define STOCK_NETWORK_OFFLINE_ "network-offline" +#define STOCK_SCRIPT "stock_script" +#define STOCK_SEND "mail-send" +#define STOCK_SEND_ "stock_mail-send" +#define STOCK_TAB_NEW "tab-new" +#define STOCK_TAB_NEW_ "stock_new-tab" +#define STOCK_THEME "gnome-settings-theme" +#define STOCK_USER_TRASH "user-trash" +#define STOCK_USER_TRASH_ "gnome-stock-trash" +#define STOCK_WINDOW_NEW "window-new" +#define STOCK_WINDOW_NEW_ "stock_new-window" + +// For backwards compatibility + +#if !GTK_CHECK_VERSION(2, 10, 0) +#define GTK_STOCK_SELECT_ALL "gtk-select-all" +#endif + +#endif /* !__GLOBAL_H__ */ diff --git a/src/helpers.c b/src/helpers.c new file mode 100644 index 00000000..6f7b912b --- /dev/null +++ b/src/helpers.c @@ -0,0 +1,506 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "helpers.h" + +#include "search.h" +#include "sokoke.h" + +#include +#include + +GtkIconTheme* get_icon_theme(GtkWidget* widget) +{ + return gtk_icon_theme_get_for_screen(gtk_widget_get_screen(widget)); +} + +GtkWidget* menu_item_new(const gchar* text, const gchar* icon + , GCallback signal, gboolean sensitive, gpointer userdata) +{ + GtkWidget* menuitem; + if(text) + menuitem = gtk_image_menu_item_new_with_mnemonic(text); + else + menuitem = gtk_image_menu_item_new_from_stock(icon, NULL); + if(icon) + { + GtkWidget* image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU); + if(gtk_image_get_storage_type(GTK_IMAGE(image)) == GTK_IMAGE_EMPTY) + image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_MENU); + if(gtk_image_get_storage_type(GTK_IMAGE(image)) != GTK_IMAGE_EMPTY) + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); + else + g_print("Note: The icon %s is not available.", icon); + } + if(signal) + g_signal_connect(menuitem, "activate", signal, userdata); + gtk_widget_set_sensitive(GTK_WIDGET(menuitem), sensitive && signal); + return menuitem; +} + +GtkToolItem* tool_button_new(const gchar* text, const gchar* icon + , gboolean important, gboolean sensitive, GCallback signal + , const gchar* tooltip, gpointer userdata) +{ + GtkToolItem* toolbutton = gtk_tool_button_new(NULL, NULL); + GtkStockItem stockItem; + if(gtk_stock_lookup(icon, &stockItem)) + toolbutton = gtk_tool_button_new_from_stock(icon); + else + { + GtkIconTheme* iconTheme = get_icon_theme(GTK_WIDGET(toolbutton)); + if(gtk_icon_theme_has_icon(iconTheme, icon)) + gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolbutton), icon); + else + gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(toolbutton), GTK_STOCK_MISSING_IMAGE); + } + if(text) + gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolbutton), text); + if(important) + gtk_tool_item_set_is_important(toolbutton, TRUE); + if(signal) + g_signal_connect(toolbutton, "clicked", signal, userdata); + gtk_widget_set_sensitive(GTK_WIDGET(toolbutton), sensitive && signal); + if(tooltip) + sokoke_tool_item_set_tooltip_text(toolbutton, tooltip); + return toolbutton; +} + +GtkWidget* check_menu_item_new(const gchar* text + , GCallback signal, gboolean sensitive, gboolean active, CBrowser* browser) +{ + GtkWidget* menuitem = gtk_check_menu_item_new_with_mnemonic(text); + gtk_widget_set_sensitive(menuitem, sensitive && signal); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); + if(signal) + g_signal_connect(menuitem, "activate", signal, browser); + return menuitem; +} + +GtkWidget* radio_button_new(GtkRadioButton* radio_button, const gchar* label) +{ + return gtk_radio_button_new_with_mnemonic_from_widget(radio_button, label); +} + +void show_error(const gchar* text, const gchar* text2, CBrowser* browser) +{ + GtkWidget* dialog = gtk_message_dialog_new( + browser ? GTK_WINDOW(browser->window) : NULL + , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, text); + if(text2) + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text2); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} + +gboolean spawn_protocol_command(const gchar* protocol, const gchar* res) +{ + const gchar* command = g_datalist_get_data(&config->protocols_commands, protocol); + if(!command) + return FALSE; + + // Create an argument vector + gchar* uriEscaped = g_shell_quote(res); + gchar* commandReady; + if(strstr(command, "%s")) + commandReady = g_strdup_printf(command, uriEscaped); + else + commandReady = g_strconcat(command, " ", uriEscaped, NULL); + gchar** argv; GError* error = NULL; + if(!g_shell_parse_argv(commandReady, NULL, &argv, &error)) + { + // FIXME: Should we have a more specific message? + show_error("Could not run external program.", error->message, NULL); + g_error_free(error); + g_free(commandReady); g_free(uriEscaped); + return FALSE; + } + + // Try to run the command + error = NULL; + gboolean success = g_spawn_async(NULL, argv, NULL + , (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD + , NULL, NULL, NULL, &error); + g_strfreev(argv); + + if(!success) + { + // FIXME: Should we have a more specific message? + show_error("Could not run external program.", error->message, NULL); + g_error_free(error); + } + g_free(commandReady); g_free(uriEscaped); + return TRUE; +} + +GdkPixbuf* load_web_icon(const gchar* icon, GtkIconSize size, GtkWidget* widget) +{ + g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL); + GdkPixbuf* pixbuf = NULL; + if(icon && *icon) + { + // TODO: We want to allow http as well, maybe also base64? + const gchar* iconReady = g_str_has_prefix(icon, "file://") ? &icon[7] : icon; + GtkStockItem stockItem; + if(gtk_stock_lookup(icon, &stockItem)) + pixbuf = gtk_widget_render_icon(widget, iconReady, size, NULL); + else + { + gint width; gint height; + gtk_icon_size_lookup(size, &width, &height); + pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default() + , icon, MAX(width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + } + if(!pixbuf) + pixbuf = gdk_pixbuf_new_from_file_at_size(iconReady, 16, 16, NULL); + } + if(!pixbuf) + pixbuf = gtk_widget_render_icon(widget, GTK_STOCK_FIND, size, NULL); + return pixbuf; +} + +void entry_setup_completion(GtkEntry* entry) +{ + /* TODO: The current behavior works only with the beginning of strings + But we want to match "localhost" with "loc" and "hos" */ + GtkEntryCompletion* completion = gtk_entry_completion_new(); + gtk_entry_completion_set_model(completion + , GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING))); + gtk_entry_completion_set_text_column(completion, 0); + gtk_entry_completion_set_minimum_key_length(completion, 3); + gtk_entry_set_completion(entry, completion); + gtk_entry_completion_set_popup_completion(completion, FALSE); //... +} + +void entry_completion_append(GtkEntry* entry, const gchar* text) +{ + GtkEntryCompletion* completion = gtk_entry_get_completion(entry); + GtkTreeModel* completion_store = gtk_entry_completion_get_model(completion); + GtkTreeIter iter; + gtk_list_store_insert(GTK_LIST_STORE(completion_store), &iter, 0); + gtk_list_store_set(GTK_LIST_STORE(completion_store), &iter, 0, text, -1); +} + +GtkWidget* get_nth_webView(gint n, CBrowser* browser) +{ + if(n < 0) + n = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); + GtkWidget* scrolled = gtk_notebook_get_nth_page(GTK_NOTEBOOK(browser->webViews), n); + return gtk_bin_get_child(GTK_BIN(scrolled)); +} + +gint get_webView_index(GtkWidget* webView, CBrowser* browser) +{ + GtkWidget* scrolled = gtk_widget_get_parent(webView); + return gtk_notebook_page_num(GTK_NOTEBOOK(browser->webViews), scrolled); +} + +CBrowser* get_browser_from_webView(GtkWidget* webView) +{ + // FIXME: g_list_first + CBrowser* browser = NULL; GList* item = g_list_first(browsers); + do + { + browser = (CBrowser*)item->data; + if(browser->webView == webView) + return browser; + } + while((item = g_list_next(item))); + return NULL; +} + +void update_favicon(CBrowser* browser) +{ + if(browser->loadedPercent == -1) + { + if(0) //browser->favicon // Has favicon? + { + // TODO: use custom icon + // gtk_image_set_from_file(GTK_IMAGE(browser->icon_page), "image"); + } + else if(0) // Known mime-type? + { + // TODO: Retrieve mime type and load icon; don't forget ftp listings + } + else + gtk_image_set_from_stock(GTK_IMAGE(browser->webView_icon) + , GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + } + else + { + gtk_image_set_from_stock(GTK_IMAGE(browser->webView_icon) + , GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + } +} + +void update_security(CBrowser* browser) +{ + const gchar* uri = xbel_bookmark_get_href(browser->sessionItem); + // TODO: This check is bogus, until webkit tells us how secure a page is + if(g_str_has_prefix(uri, "https://")) + { + // TODO: highlighted entry indicates security, find an alternative + gtk_widget_modify_base(browser->location, GTK_STATE_NORMAL + , &browser->location->style->base[GTK_STATE_SELECTED]); + gtk_widget_modify_text(browser->location, GTK_STATE_NORMAL + , &browser->location->style->text[GTK_STATE_SELECTED]); + gtk_image_set_from_stock(GTK_IMAGE(browser->icon_security) + , GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_MENU); + } + else + { + gtk_widget_modify_base(browser->location, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_text(browser->location, GTK_STATE_NORMAL, NULL); + gtk_image_set_from_stock(GTK_IMAGE(browser->icon_security) + , GTK_STOCK_INFO, GTK_ICON_SIZE_MENU); + } +} + +void update_visibility(CBrowser* browser, gboolean visibility) +{ + // A tabbed window shouldn't be manipulatable + if(gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) > 1) + return; + + // SHOULD SCRIPTS BE ABLE TO HIDE WINDOWS AT ALL? + if(0 && !visibility) + { + gtk_widget_hide(browser->window); + return; + } + else if(!visibility) + g_print("Window was not hidden.\n"); + + sokoke_widget_set_visible(browser->menubar, browser->hasMenubar); + sokoke_widget_set_visible(browser->navibar, browser->hasToolbar); + sokoke_widget_set_visible(browser->location, browser->hasLocation); + sokoke_widget_set_visible(browser->webSearch, browser->hasLocation); + sokoke_widget_set_visible(browser->statusbar, browser->hasStatusbar); +} + +void action_set_active(const gchar* name, gboolean active, CBrowser* browser) +{ + // This shortcut toggles activity state by an action name + GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); + g_return_if_fail(GTK_IS_ACTION(action)); + gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), active); +} + +void action_set_sensitive(const gchar* name, gboolean sensitive, CBrowser* browser) +{ + // This shortcut toggles sensitivity by an action name + GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); + g_return_if_fail(GTK_IS_ACTION(action)); + gtk_action_set_sensitive(action, sensitive); +} + +void action_set_visible(const gchar* name, gboolean visible, CBrowser* browser) +{ + // This shortcut toggles visibility by an action name + GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); + g_return_if_fail(GTK_IS_ACTION(action)); + gtk_action_set_visible(action, visible); +} + +void update_statusbar_text(CBrowser* browser) +{ + if(browser->statusMessage) + { + gtk_statusbar_pop(GTK_STATUSBAR(browser->statusbar), 1); + gtk_statusbar_push(GTK_STATUSBAR(browser->statusbar), 1 + , browser->statusMessage); + } + else + { + gchar* message; + if(browser->loadedPercent) + message = g_strdup_printf("%d%% loaded, %d/%d bytes" + , browser->loadedPercent, browser->loadedBytes, browser->loadedBytesMax); + else if(browser->loadedBytes) + message = g_strdup_printf("%d bytes", browser->loadedBytes); + else + message = g_strdup(" "); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(browser->progress), message); + g_free(message); + } +} + +void update_edit_items(CBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + gboolean hasSelection = FALSE; + gboolean canCut = FALSE; gboolean canCopy = FALSE; gboolean canPaste = FALSE; + if(widget && (/*WEBKIT_IS_WEB_VIEW(widget) || */GTK_IS_EDITABLE(widget))) + { + hasSelection = /*WEBKIT_IS_WEB_VIEW(widget) + ? webkit_web_view_has_selection(WEBKIT_WEB_VIEW(widget), NULL, NULL) + : */gtk_editable_get_selection_bounds(GTK_EDITABLE(widget), NULL, NULL); + canCut = /*WEBKIT_IS_WEB_VIEW(widget) + ? webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(widget)) + : */hasSelection && gtk_editable_get_editable(GTK_EDITABLE(widget)); + canCopy = /*WEBKIT_IS_WEB_VIEW(widget) + ? webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(widget)) + : */hasSelection; + canPaste = /*WEBKIT_IS_WEB_VIEW(widget) + ? webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(widget)) + : */gtk_editable_get_editable(GTK_EDITABLE(widget)); + } + action_set_sensitive("Cut", canCut, browser); + action_set_sensitive("Copy", canCopy, browser); + action_set_sensitive("Paste", canPaste, browser); + action_set_sensitive("Delete", canCut, browser); + action_set_sensitive("SelectAll", !hasSelection, browser); +} + +void update_gui_state(CBrowser* browser) +{ + GtkWidget* webView = get_nth_webView(-1, browser); + action_set_sensitive("ZoomIn", FALSE, browser);//webkit_web_view_can_increase_text_size(WEBKIT_WEB_VIEW(webView), browser); + action_set_sensitive("ZoomOut", FALSE, browser);//webkit_web_view_can_decrease_text_size(WEBKIT_WEB_VIEW(webView)), browser); + action_set_sensitive("ZoomNormal", FALSE, browser);//webkit_web_view_get_text_size(WEBKIT_WEB_VIEW(webView)) != 1, browser); + action_set_sensitive("Back", webkit_web_view_can_go_backward(WEBKIT_WEB_VIEW(webView)), browser); + action_set_sensitive("Forward", webkit_web_view_can_go_forward(WEBKIT_WEB_VIEW(webView)), browser); + action_set_sensitive("Refresh", browser->loadedPercent == -1, browser); + action_set_sensitive("Stop", browser->loadedPercent != -1, browser); + + GtkAction* action = gtk_action_group_get_action(browser->actiongroup, "RefreshStop"); + if(browser->loadedPercent == -1) + { + gtk_widget_hide(browser->throbber); + g_object_set(action, "stock-id", GTK_STOCK_REFRESH, NULL); + g_object_set(action, "tooltip", "Refresh the current page", NULL); + } + else + { + gtk_widget_show(browser->throbber); + g_object_set(action, "stock-id", GTK_STOCK_STOP, NULL); + g_object_set(action, "tooltip", "Stop loading the current page", NULL); + } + + gtk_image_set_from_stock(GTK_IMAGE(browser->location_icon), GTK_STOCK_FILE + , GTK_ICON_SIZE_MENU); + + if(browser->loadedBytesMax < 1) // Skip null and negative values + { + gtk_progress_bar_pulse(GTK_PROGRESS_BAR(browser->progress)); + update_statusbar_text(browser); + } + else + { + if(browser->loadedBytes > browser->loadedBytesMax) + browser->loadedPercent = 100; + else + browser->loadedPercent + = (browser->loadedBytes * 100) / browser->loadedBytesMax; + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress) + , browser->loadedPercent / 100.0); + update_statusbar_text(browser); + } +} + +void update_feeds(CBrowser* browser) +{ + // TODO: Look for available feeds, requires dom access +} + +void update_search_engines(CBrowser* browser) +{ + // TODO: Look for available search engines, requires dom access +} + +void update_status_message(const gchar* message, CBrowser* browser) +{ + g_free(browser->statusMessage); + browser->statusMessage = g_strdup(message ? message : ""); + update_statusbar_text(browser); +} + +void update_browser_actions(CBrowser* browser) +{ + gboolean active = gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) > 1; + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(browser->webViews), active); + action_set_sensitive("TabClose", active, browser); + guint n = xbel_folder_get_n_items(tabtrash); + action_set_sensitive("UndoTabClose", n, browser); + action_set_sensitive("TabsClosed", n, browser); +} + +gchar* magic_uri(const gchar* uri, gboolean search) +{ + // Add file:// if we have a local path + if(g_path_is_absolute(uri)) + return g_strconcat("file://", uri, NULL); + // Do we need to add a protocol? + if(!strstr(uri, "://")) + { + // Do we have a domain, ip address or localhost? + if(strstr(uri, ".") != NULL || !strcmp(uri, "localhost")) + return g_strconcat("http://", uri, NULL); + // We don't want to search? So return early. + if(!search) + return g_strdup(uri); + gchar search[256]; + const gchar* searchUrl = NULL; + // Do we have a keyword and a string? + gchar** parts = g_strsplit(uri, " ", 2); + if(parts[0] && parts[1]) + { + guint n = g_list_length(searchEngines); + guint i; + for(i = 0; i < n; i++) + { + SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, i); + if(!strcmp(search_engine_get_keyword(searchEngine), parts[0])) + searchUrl = searchEngine->url; + } + if(searchUrl != NULL) + g_snprintf(search, 255, searchUrl, parts[1]); + } + //g_strfreev(sParts); + // We only have a word or there is no matching keyowrd, so search for it + if(searchUrl == NULL) + g_snprintf(search, 255, config->locationSearch, uri); + return g_strdup(search); + } + return g_strdup(uri); +} + +gchar* get_default_font(void) +{ + GtkSettings* gtksettings = gtk_settings_get_default(); + gchar* defaultFont; + g_object_get(gtksettings, "gtk-font-name", &defaultFont, NULL); + return defaultFont; +} + +GtkToolbarStyle config_to_toolbarstyle(guint toolbarStyle) +{ + switch(toolbarStyle) + { + case CONFIG_TOOLBAR_ICONS: + return GTK_TOOLBAR_ICONS; + case CONFIG_TOOLBAR_TEXT: + return GTK_TOOLBAR_TEXT; + case CONFIG_TOOLBAR_BOTH: + return GTK_TOOLBAR_BOTH; + case CONFIG_TOOLBAR_BOTH_HORIZ: + return GTK_TOOLBAR_BOTH_HORIZ; + } + GtkSettings* gtkSettings = gtk_settings_get_default(); + g_object_get(gtkSettings, "gtk-toolbar-style", &toolbarStyle, NULL); + return toolbarStyle; +} + +GtkToolbarStyle config_to_toolbariconsize(gboolean toolbarSmall) +{ + return toolbarSmall ? GTK_ICON_SIZE_SMALL_TOOLBAR + : GTK_ICON_SIZE_LARGE_TOOLBAR; +} diff --git a/src/helpers.h b/src/helpers.h new file mode 100644 index 00000000..bca19764 --- /dev/null +++ b/src/helpers.h @@ -0,0 +1,110 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __HELPERS_H__ +#define __HELPERS_H__ 1 + +#include "browser.h" + +#include + +GtkIconTheme* +get_icon_theme(GtkWidget*); + +GtkWidget* +menu_item_new(const gchar*, const gchar*, GCallback, gboolean, gpointer); + +GtkToolItem* +tool_button_new(const gchar*, const gchar* + , gboolean, gboolean, GCallback, const gchar*, gpointer); + +GtkWidget* +check_menu_item_new(const gchar*, GCallback, gboolean, gboolean, CBrowser*); + +GtkWidget* +radio_button_new(GtkRadioButton*, const gchar*); + +void +show_error(const gchar*, const gchar*, CBrowser*); + +gboolean +spawn_protocol_command(const gchar*, const gchar*); + +GdkPixbuf* +load_web_icon(const gchar*, GtkIconSize, GtkWidget*); + +void +entry_setup_completion(GtkEntry*); + +void +entry_completion_append(GtkEntry*, const gchar*); + +GtkWidget* +get_nth_webView(gint, CBrowser*); + +gint +get_webView_index(GtkWidget*, CBrowser*); + +CBrowser* +get_browser_from_webView(GtkWidget*); + +void +update_favicon(CBrowser*); + +void +update_security(CBrowser*); + +void +update_visibility(CBrowser*, gboolean); + +void +action_set_active(const gchar*, gboolean, CBrowser*); + +void +action_set_sensitive(const gchar*, gboolean, CBrowser*); + +void +action_set_visible(const gchar*, gboolean, CBrowser*); + +void +update_statusbar_text(CBrowser*); + +void +update_edit_items(CBrowser*); + +void +update_gui_state(CBrowser*); + +void +update_feeds(CBrowser*); + +void +update_search_engines(CBrowser*); + +void +update_status_message(const gchar*, CBrowser*); + +void +update_browser_actions(CBrowser*); + +gchar* +magic_uri(const gchar*, gboolean bSearch); + +gchar* +get_default_font(void); + +GtkToolbarStyle +config_to_toolbarstyle(); + +GtkToolbarStyle +config_to_toolbariconsize(gboolean); + +#endif /* !__HELPERS_H__ */ diff --git a/src/main.c b/src/main.c new file mode 100755 index 00000000..4eb8bd09 --- /dev/null +++ b/src/main.c @@ -0,0 +1,317 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "main.h" + +#include "browser.h" +#include "global.h" +#include "helpers.h" +#include "sokoke.h" +#include "search.h" +#include "webView.h" +#include "xbel.h" + +#include +#include + +#include "config.h" + +// -- stock icons + +static void stock_items_init(void) +{ + static GtkStockItem items[] = + { + { STOCK_LOCK_OPEN }, + { STOCK_LOCK_SECURE }, + { STOCK_LOCK_BROKEN }, + { STOCK_SCRIPT }, + { STOCK_THEME }, + { STOCK_USER_TRASH }, + + { STOCK_BOOKMARK, "Bookmark", 0, 0, NULL }, + { STOCK_BOOKMARK_NEW, "New Bookmark", 0, 0, NULL }, + { STOCK_BOOKMARKS, "_Bookmarks", 0, 0, NULL }, + { STOCK_DOWNLOADS, "_Downloads", 0, 0, NULL }, + { STOCK_CONSOLE, "_Console", 0, 0, NULL }, + { STOCK_EXTENSIONS, "_Extensions", 0, 0, NULL }, + { STOCK_FORM_FILL, "_Form Fill", 0, 0, NULL }, + { STOCK_HISTORY, "History", 0, 0, NULL }, + { STOCK_HOMEPAGE, "Homepage", 0, 0, NULL }, + { STOCK_LOCATION, "Location Entry", 0, 0, NULL }, + { STOCK_NEWSFEED, "Newsfeed", 0, 0, NULL }, + { STOCK_PLUGINS, "_Plugins", 0, 0, NULL }, + { STOCK_POPUPS_BLOCKED, "Blocked Popups", 0, 0, NULL }, + { STOCK_SOURCE_VIEW, "View Source", 0, 0, NULL }, + { STOCK_TAB_CLOSE, "C_lose Tab", 0, 0, NULL }, + { STOCK_TAB_NEW, "New _Tab", 0, 0, NULL }, + { STOCK_WINDOW_CLOSE, "_Close Window", 0, 0, NULL }, + { STOCK_WINDOW_NEW, "New _Window", 0, 0, NULL }, + #if !GTK_CHECK_VERSION(2, 10, 0) + { GTK_STOCK_SELECT_ALL, "Select _All", 0, 0, (gchar*)"gtk20" }, + #endif + }; + GtkIconFactory* factory = gtk_icon_factory_new(); + guint i; + for(i = 0; i < (guint)G_N_ELEMENTS(items); i++) + { + GtkIconSource* iconSource = gtk_icon_source_new(); + gtk_icon_source_set_icon_name(iconSource, items[i].stock_id); + GtkIconSet* iconSet = gtk_icon_set_new(); + gtk_icon_set_add_source(iconSet, iconSource); + gtk_icon_source_free(iconSource); + gtk_icon_factory_add(factory, items[i].stock_id, iconSet); + gtk_icon_set_unref(iconSet); + } + gtk_stock_add_static(items, G_N_ELEMENTS(items)); + gtk_icon_factory_add_default(factory); + g_object_unref(factory); +} + +// -- main function + +int main(int argc, char** argv) +{ + g_set_application_name(PACKAGE_NAME); + + // Parse cli options + gint repeats = 2; + gboolean version = FALSE; + GOptionEntry entries[] = + { + { "repeats", 'r', 0, G_OPTION_ARG_INT, &repeats, "An unused value", "N" }, + { "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Display program version", NULL } + }; + + GError* error = NULL; + if(!gtk_init_with_args(&argc, &argv, "[URI]", entries, NULL/*GETTEXT_PACKAGE*/, &error)) + { + g_error_free(error); + return 1; + } + + if(version) + { + g_print(PACKAGE_STRING " - Copyright (c) 2007 Christian Dywan\n\n" + "GTK+2: " GTK_VER "\n" + "WebKit: " WEBKIT_VER "\n" + "Libsexy: " LIBSEXY_VER "\n" + "libXML2: " LIBXML_VER "\n" + "GetText: N/A\n" + "\n" + "Debugging: " SOKOKE_DEBUG_ "\n" + "\n" + "Please report comments, suggestions and bugs to:\n" + "\t" PACKAGE_BUGREPORT "\n" + "Check for new versions at:\n" + "\thttp://software.twotoasts.de\n"); + return 0; + } + + // Load configuration files + GString* errorMessages = g_string_new(NULL); + // TODO: What about default config in a global config folder? + gchar* configPath = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME, NULL); + g_mkdir_with_parents(configPath, 0755); + gchar* configFile = g_build_filename(configPath, "config", NULL); + error = NULL; + config = config_new(); + if(!config_from_file(config, configFile, &error)) + { + if(error->code != G_FILE_ERROR_NOENT) + g_string_append_printf(errorMessages + , "Configuration was not loaded. %s\n", error->message); + g_error_free(error); + } + g_free(configFile); + configFile = g_build_filename(configPath, "accels", NULL); + gtk_accel_map_load(configFile); + g_free(configFile); + configFile = g_build_filename(configPath, "search", NULL); + error = NULL; + searchEngines = search_engines_new(); + if(!search_engines_from_file(&searchEngines, configFile, &error)) + { + // FIXME: We may have a "file empty" error, how do we recognize that? + /*if(error->code != G_FILE_ERROR_NOENT) + g_string_append_printf(errorMessages + , "Notice: No search engines loaded. %s\n", error->message);*/ + g_error_free(error); + } + g_free(configFile); + configFile = g_build_filename(configPath, "bookmarks.xbel", NULL); + bookmarks = xbel_folder_new(); + error = NULL; + if(!xbel_folder_from_file(bookmarks, configFile, &error)) + { + if(error->code != G_FILE_ERROR_NOENT) + g_string_append_printf(errorMessages + , "Bookmarks couldn't be loaded. %s\n", error->message); + g_error_free(error); + } + g_free(configFile); + XbelItem* _session = xbel_folder_new(); + if(config->startup == CONFIG_STARTUP_SESSION) + { + configFile = g_build_filename(configPath, "session.xbel", NULL); + error = NULL; + if(!xbel_folder_from_file(_session, configFile, &error)) + { + if(error->code != G_FILE_ERROR_NOENT) + g_string_append_printf(errorMessages + , "Session couldn't be loaded. %s\n", error->message); + g_error_free(error); + } + g_free(configFile); + } + configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); + tabtrash = xbel_folder_new(); + error = NULL; + if(!xbel_folder_from_file(tabtrash, configFile, &error)) + { + if(error->code != G_FILE_ERROR_NOENT) + g_string_append_printf(errorMessages + , "Tabtrash couldn't be loaded. %s\n", error->message); + g_error_free(error); + } + g_free(configFile); + + // In case of errors + if(errorMessages->len) + { + GtkWidget* dialog = gtk_message_dialog_new(NULL + , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE + , "The following errors occured."); + gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE); + gtk_window_set_title(GTK_WINDOW(dialog), g_get_application_name()); + // FIXME: Use custom program icon + gtk_window_set_icon_name(GTK_WINDOW(dialog), "web-browser"); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog) + , "%s", errorMessages->str); + gtk_dialog_add_buttons(GTK_DIALOG(dialog) + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , "_Ignore", GTK_RESPONSE_ACCEPT + , NULL); + if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) + { + config_free(config); + search_engines_free(searchEngines); + xbel_item_free(bookmarks); + xbel_item_free(_session); + g_string_free(errorMessages, TRUE); + return 0; + } + gtk_widget_destroy(dialog); + /* FIXME: Since we will overwrite files that could not be loaded + , would we want to make backups? */ + } + g_string_free(errorMessages, TRUE); + + if(xbel_folder_is_empty(_session)) + { + XbelItem* item = xbel_bookmark_new(); + if(config->startup == CONFIG_STARTUP_HOMEPAGE) + xbel_bookmark_set_href(item, config->homepage); + else + xbel_bookmark_set_href(item, "about:blank"); + xbel_folder_append_item(_session, item); + } + g_free(configPath); + + accel_group = gtk_accel_group_new(); + stock_items_init(); + browsers = NULL; + + // TODO: Handle any number of separate uris from argv + // Open as many tabs as we have uris, seperated by pipes + gchar* uri = argc > 1 ? strtok(g_strdup(argv[1]), "|") : NULL; + while(uri != NULL) + { + XbelItem* item = xbel_bookmark_new(); + gchar* uriReady = magic_uri(uri, FALSE); + xbel_bookmark_set_href(item, uriReady); + g_free(uriReady); + xbel_folder_append_item(_session, item); + uri = strtok(NULL, "|"); + } + g_free(uri); + + session = xbel_folder_new(); + CBrowser* browser = NULL; + guint n = xbel_folder_get_n_items(_session); + guint i; + for(i = 0; i < n; i++) + { + XbelItem* item = xbel_folder_get_nth_item(_session, i); + browser = browser_new(browser); + webView_open(browser->webView, xbel_bookmark_get_href(item)); + } + xbel_item_free(_session); + + gtk_main(); + + // Save configuration files + configPath = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME, NULL); + g_mkdir_with_parents(configPath, 0755); + configFile = g_build_filename(configPath, "search", NULL); + error = NULL; + if(!search_engines_to_file(searchEngines, configFile, &error)) + { + g_warning("Search engines couldn't be saved. %s", error->message); + g_error_free(error); + } + search_engines_free(searchEngines); + g_free(configFile); + configFile = g_build_filename(configPath, "bookmarks.xbel", NULL); + error = NULL; + if(!xbel_folder_to_file(bookmarks, configFile, &error)) + { + g_warning("Bookmarks couldn't be saved. %s", error->message); + g_error_free(error); + } + xbel_item_free(bookmarks); + g_free(configFile); + configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); + error = NULL; + if(!xbel_folder_to_file(tabtrash, configFile, &error)) + { + g_warning("Tabtrash couldn't be saved. %s", error->message); + g_error_free(error); + } + xbel_item_free(tabtrash); + g_free(configFile); + if(config->startup == CONFIG_STARTUP_SESSION) + { + configFile = g_build_filename(configPath, "session.xbel", NULL); + error = NULL; + if(!xbel_folder_to_file(session, configFile, &error)) + { + g_warning("Session couldn't be saved. %s", error->message); + g_error_free(error); + } + g_free(configFile); + } + xbel_item_free(session); + configFile = g_build_filename(configPath, "config", NULL); + error = NULL; + if(!config_to_file(config, configFile, &error)) + { + g_warning("Configuration couldn't be saved. %s", error->message); + g_error_free(error); + } + config_free(config); + g_free(configFile); + configFile = g_build_filename(configPath, "accels", NULL); + gtk_accel_map_save(configFile); + g_free(configFile); + g_free(configPath); + return 0; +} diff --git a/src/main.h b/src/main.h new file mode 100644 index 00000000..9364748e --- /dev/null +++ b/src/main.h @@ -0,0 +1,15 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_H__ +#define __MIDORI_H__ 1 + +#endif /* !__MIDORI_H__ */ diff --git a/src/prefs.c b/src/prefs.c new file mode 100644 index 00000000..c2b1a5eb --- /dev/null +++ b/src/prefs.c @@ -0,0 +1,669 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "prefs.h" + +#include "helpers.h" +#include "global.h" +#include "sokoke.h" + +#include "string.h" + +static gboolean on_prefs_homepage_focus_out(GtkWidget* widget + , GdkEventFocus event, CPrefs* prefs) +{ + g_free(config->homepage); + config->homepage = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + return FALSE; +} + +static void on_prefs_loadonstartup_changed(GtkWidget* widget, CPrefs* prefs) +{ + config->startup = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); +} + +static void on_prefs_newpages_changed(GtkWidget* widget, CPrefs* prefs) +{ + config->newPages = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); +} + +void on_prefs_openTabsInTheBackground_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->openTabsInTheBackground = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); +} + +static void on_prefs_openPopupsInTabs_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->openPopupsInTabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); +} + +static void on_prefs_loadImagesAutomatically_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->loadImagesAutomatically = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // FIXME: Apply the change to all open webViews + g_object_set(get_nth_webView(-1, prefs->browser) + , "loads-images-automatically", config->loadImagesAutomatically, NULL); +} + +static void on_prefs_shrinkImagesToFit_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->shrinkImagesToFit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // FIXME: Apply the change to all open webViews + g_object_set(get_nth_webView(-1, prefs->browser) + , "shrinks-standalone-images-to-fit", config->shrinkImagesToFit, NULL); +} + +static void on_prefs_resizableTextAreas_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->resizableTextAreas = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // FIXME: Apply the change to all open webViews + g_object_set(get_nth_webView(-1, prefs->browser) + , "text-areas-are-resizable", config->resizableTextAreas, NULL); +} + +static void on_prefs_enableJavaScript_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->enableJavaScript = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // FIXME: Apply the change to all open webViews + g_object_set(get_nth_webView(-1, prefs->browser) + , "java-script-enabled", config->enableJavaScript, NULL); +} + +static void on_prefs_enablePlugins_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->enablePlugins = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // FIXME: Apply the change to all open webViews + g_object_set(get_nth_webView(-1, prefs->browser) + , "plugins-enabled", config->enablePlugins, NULL); +} + +static void on_prefs_toolbarstyle_changed(GtkWidget* widget, CPrefs* prefs) +{ + config->toolbarStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + gtk_toolbar_set_style(GTK_TOOLBAR(prefs->browser->navibar) + , config_to_toolbarstyle(config->toolbarStyle)); +} + +static void on_prefs_toolbarSmall_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->toolbarSmall = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(prefs->browser->navibar) + , config_to_toolbariconsize(config->toolbarSmall)); +} + +static void on_prefs_closeButtonsOnTabs_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->tabClose = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + GList* items = browsers; + do + { + CBrowser* browser = (CBrowser*)items->data; + sokoke_widget_set_visible(browser->webView_close, config->tabClose); + } + while((items = g_list_next(items))); + g_list_free(items); +} + +static void on_prefs_toolbarWebSearch_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->toolbarWebSearch = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + sokoke_widget_set_visible(prefs->browser->webSearch, config->toolbarWebSearch); +} + +static void on_prefs_toolbarNewTab_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->toolbarNewTab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + sokoke_widget_set_visible(prefs->browser->newTab, config->toolbarNewTab); +} + +static void on_prefs_toolbarClosedTabs_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->toolbarClosedTabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + sokoke_widget_set_visible(prefs->browser->closedTabs, config->toolbarClosedTabs); +} + +static gboolean on_prefs_locationsearch_focus_out(GtkWidget* widget + , GdkEventFocus event, CPrefs* prefs) +{ + g_free(config->locationSearch); + config->locationSearch = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + return FALSE; +} + +static void on_prefs_protocols_render_icon(GtkTreeViewColumn* column + , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, CPrefs* prefs) +{ + gchar* command; + gtk_tree_model_get(model, iter, PROTOCOLS_COL_COMMAND, &command, -1); + + // TODO: Would it be better, to not do this on every redraw? + // Determine the actual binary to be able to display an icon + gchar* binary = NULL; + if(command) + binary = strtok(command, " "); + if(binary) + { + gchar* path; + if((path = g_find_program_in_path(binary))) + { + GtkIconTheme* icon_theme = get_icon_theme(prefs->treeview); + if(g_path_is_absolute(binary)) + { + g_free(path); path = g_path_get_basename(binary); + } + // TODO: Is it good to just display nothing if there is no icon? + if(!gtk_icon_theme_has_icon(icon_theme, binary)) + binary = NULL; + #if GTK_CHECK_VERSION(2, 10, 0) + g_object_set(renderer, "icon-name", binary, NULL); + #else + GdkPixbuf* icon = binary != NULL + ? gtk_icon_theme_load_icon(gtk_icon_theme_get_default() + , binary, GTK_ICON_SIZE_MENU, 0, NULL) : NULL; + g_object_set(renderer, "pixbuf", icon, NULL); + if(icon) + g_object_unref(icon); + #endif + g_free(path); + } + else + { + #if GTK_CHECK_VERSION(2, 10, 0) + g_object_set(renderer, "icon-name", NULL, NULL); + #endif + g_object_set(renderer, "stock-id", GTK_STOCK_DIALOG_ERROR, NULL); + } + } + else + { + // We need to reset the icon + #if GTK_CHECK_VERSION(2, 10, 0) + g_object_set(renderer, "icon-name", NULL, NULL); + #else + g_object_set(renderer, "stock-id", NULL, NULL); + #endif + } + g_free(command); +} + +static void on_prefs_protocols_edited(GtkCellRendererText* renderer + , gchar* path, gchar* textNew, CPrefs* prefs) +{ + GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(prefs->treeview)); + GtkTreeIter iter; + gtk_tree_model_get_iter_from_string(model, &iter, path); + gtk_list_store_set(GTK_LIST_STORE(model), &iter + , PROTOCOLS_COL_COMMAND, textNew, -1); + gchar* protocol; + gtk_tree_model_get(model, &iter, PROTOCOLS_COL_NAME, &protocol, -1); + g_datalist_set_data_full(&config->protocols_commands + , protocol, g_strdup(textNew), g_free); +} + +static void on_prefs_protocols_add_clicked(GtkWidget* widget, CPrefs* prefs) +{ + gchar* protocol = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs->combobox)); + GtkTreeModel* liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(prefs->treeview)); + gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, G_MAXINT + , PROTOCOLS_COL_NAME, protocol + , PROTOCOLS_COL_COMMAND, "", -1); + g_ptr_array_add(config->protocols_names, (gpointer)protocol); + g_datalist_set_data_full(&config->protocols_commands + , protocol, g_strdup(""), g_free); + gtk_widget_set_sensitive(prefs->add, FALSE); +} + +static void on_prefs_protocols_combobox_changed(GtkWidget* widget, CPrefs* prefs) +{ + gchar* protocol = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)); + gchar* command = (gchar*)g_datalist_get_data(&config->protocols_commands, protocol); + g_free(protocol); + gtk_widget_set_sensitive(prefs->add, command == NULL); +} + +GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) +{ + gchar* dialogTitle = g_strdup_printf("%s Preferences", g_get_application_name()); + GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle + , GTK_WINDOW(browser->window) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_HELP + , GTK_RESPONSE_HELP + , GTK_STOCK_CLOSE + , GTK_RESPONSE_CLOSE + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PREFERENCES); + // TODO: Implement some kind of help function + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), GTK_RESPONSE_HELP, FALSE); //... + g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); + + CPrefs* prefs = g_new0(CPrefs, 1); + prefs->browser = browser; + //prefs->window = dialog; + g_signal_connect(dialog, "response", G_CALLBACK(g_free), prefs); + + // TODO: Do we want tooltips for explainations or can we omit that? + // TODO: We need mnemonics + // TODO: Take multiple windows into account when applying changes + GtkWidget* xfce_heading; + if((xfce_heading = sokoke_xfce_header_new( + gtk_window_get_icon_name(GTK_WINDOW(browser->window)), dialogTitle))) + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) + , xfce_heading, FALSE, FALSE, 0); + g_free(dialogTitle); + GtkWidget* notebook = gtk_notebook_new(); + gtk_container_set_border_width(GTK_CONTAINER(notebook), 6); + GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + GtkSizeGroup* sizegroup2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + GtkWidget* page; GtkWidget* frame; GtkWidget* table; GtkWidget* align; + GtkWidget* button; GtkWidget* checkbutton; GtkWidget* colorbutton; + GtkWidget* combobox; GtkWidget* entry; GtkWidget* hbox; GtkWidget* spinbutton; + #define PAGE_NEW(__label) page = gtk_vbox_new(FALSE, 0);\ + gtk_container_set_border_width(GTK_CONTAINER(page), 5);\ + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(__label)) + #define FRAME_NEW(__label) frame = sokoke_hig_frame_new(__label);\ + gtk_container_set_border_width(GTK_CONTAINER(frame), 5);\ + gtk_box_pack_start(GTK_BOX(page), frame, FALSE, FALSE, 0); + #define TABLE_NEW(__rows, __cols) table = gtk_table_new(__rows, __cols, FALSE);\ + gtk_container_set_border_width(GTK_CONTAINER(table), 5);\ + gtk_container_add(GTK_CONTAINER(frame), table); + #define WIDGET_ADD(__widget, __left, __right, __top, __bottom)\ + gtk_table_attach(GTK_TABLE(table), __widget\ + , __left, __right, __top, __bottom\ + , 0, GTK_FILL, 8, 2) + #define FILLED_ADD(__widget, __left, __right, __top, __bottom)\ + gtk_table_attach(GTK_TABLE(table), __widget\ + , __left, __right, __top, __bottom\ + , GTK_EXPAND | GTK_FILL, GTK_FILL, 8, 2) + #define INDENTED_ADD(__widget, __left, __right, __top, __bottom)\ + align = gtk_alignment_new(0, 0.5, 0, 0);\ + gtk_container_add(GTK_CONTAINER(align), __widget);\ + gtk_size_group_add_widget(sizegroup, align);\ + WIDGET_ADD(align, __left, __right, __top, __bottom) + #define SEMI_INDENTED_ADD(__widget, __left, __right, __top, __bottom)\ + align = gtk_alignment_new(0, 0.5, 0, 0);\ + gtk_container_add(GTK_CONTAINER(align), __widget);\ + gtk_size_group_add_widget(sizegroup2, align);\ + WIDGET_ADD(align, __left, __right, __top, __bottom) + #define SPANNED_ADD(__widget, __left, __right, __top, __bottom)\ + align = gtk_alignment_new(0, 0.5, 0, 0);\ + gtk_container_add(GTK_CONTAINER(align), __widget);\ + FILLED_ADD(align, __left, __right, __top, __bottom) + // Page "General" + PAGE_NEW("General"); + FRAME_NEW("Startup"); + TABLE_NEW(2, 2); + INDENTED_ADD(gtk_label_new("Load on startup"), 0, 1, 0, 1); + combobox = gtk_combo_box_new_text(); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "Blank page", "Homepage", "Last open pages", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->startup); + g_signal_connect(combobox, "changed" + , G_CALLBACK(on_prefs_loadonstartup_changed), prefs); + FILLED_ADD(combobox, 1, 2, 0, 1); + INDENTED_ADD(gtk_label_new("Homepage"), 0, 1, 1, 2); + entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(entry), config->homepage); + g_signal_connect(entry, "focus-out-event" + , G_CALLBACK(on_prefs_homepage_focus_out), prefs); + FILLED_ADD(entry, 1, 2, 1, 2); + // TODO: We need something like "use current website" + FRAME_NEW("Downloads"); + TABLE_NEW(1, 2); + INDENTED_ADD(gtk_label_new("Download folder"), 0, 1, 0, 1); + GtkWidget* filebutton = gtk_file_chooser_button_new( + "Choose download folder", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + // FIXME: The default should probably be ~/Desktop + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filebutton) + , g_get_home_dir()); //... + gtk_widget_set_sensitive(filebutton, FALSE); //... + FILLED_ADD(filebutton, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic + ("Show a notification window for finished downloads"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 2, 1, 2); + FRAME_NEW("Languages"); + TABLE_NEW(1, 2); + INDENTED_ADD(gtk_label_new("Preferred languages"), 0, 1, 0, 1); + entry = gtk_entry_new(); + // TODO: Make sth like get_browser_languages_default filtering encodings and C out + // TODO: Provide a real ui with real language names (iso-codes) + const gchar* const* sLanguages = g_get_language_names(); + gchar* sLanguagesPreferred = g_strjoinv(",", (gchar**)sLanguages); + gtk_entry_set_text(GTK_ENTRY(entry), sLanguagesPreferred/*config->sLanguagesPreferred*/); + g_free(sLanguagesPreferred); + gtk_widget_set_sensitive(entry, FALSE); //... + FILLED_ADD(entry, 1, 2, 0, 1); + + // Page "Appearance" + PAGE_NEW("Appearance"); + FRAME_NEW("Font settings"); + TABLE_NEW(5, 2); + INDENTED_ADD(gtk_label_new("Standard font"), 0, 1, 0, 1); + button = gtk_font_button_new_with_font("Sans 10"/*config->sFontStandard*/); + gtk_widget_set_sensitive(button, FALSE); //... + FILLED_ADD(button, 1, 2, 0, 1); + INDENTED_ADD(gtk_label_new("Minimum font size"), 0, 1, 1, 2); + hbox = gtk_hbox_new(FALSE, 4); + spinbutton = gtk_spin_button_new_with_range(5, 12, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 5/*config->iFontSizeMin*/); + gtk_widget_set_sensitive(spinbutton, FALSE); //... + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + button = gtk_button_new_with_mnemonic("_Advanced"); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); + FILLED_ADD(hbox, 1, 2, 1, 2); + INDENTED_ADD(gtk_label_new("Default encoding"), 0, 1, 2, 3); + combobox = gtk_combo_box_new_text(); + const gchar* encoding = NULL; g_get_charset(&encoding); + // TODO: Fallback to utf-8 if the encoding is not sane (e.g. when lang=C) + gchar* sEncodingDefault = g_strdup_printf("System (%s)", encoding); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , sEncodingDefault, "Chinese", "Greek", "Japanese (SHIFT_JIS)" + , "Korean", "Russian", "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... + gtk_widget_set_sensitive(combobox, FALSE); //... + FILLED_ADD(combobox, 1, 2, 2, 3); + button = gtk_button_new_with_label("Advanced settings"); + gtk_widget_set_sensitive(button, FALSE); //... + WIDGET_ADD(button, 1, 2, 2, 3); + FRAME_NEW("Default colors"); + TABLE_NEW(2, 4); + SEMI_INDENTED_ADD(gtk_label_new("Text color"), 0, 1, 0, 1); + colorbutton = gtk_color_button_new(); + gtk_widget_set_sensitive(colorbutton, FALSE); //... + WIDGET_ADD(colorbutton, 1, 2, 0, 1); + SEMI_INDENTED_ADD(gtk_label_new("Background color"), 2, 3, 0, 1); + colorbutton = gtk_color_button_new(); + gtk_widget_set_sensitive(colorbutton, FALSE); //... + WIDGET_ADD(colorbutton, 3, 4, 0, 1); + SEMI_INDENTED_ADD(gtk_label_new("Normal link color"), 0, 1, 1, 2); + colorbutton = gtk_color_button_new(); + gtk_widget_set_sensitive(colorbutton, FALSE); //... + WIDGET_ADD(colorbutton, 1, 2, 1, 2); + SEMI_INDENTED_ADD(gtk_label_new("Visited link color"), 2, 3, 1, 2); + colorbutton = gtk_color_button_new(); + gtk_widget_set_sensitive(colorbutton, FALSE); //... + WIDGET_ADD(colorbutton, 3, 4, 1, 2); + + // Page "Behavior" + PAGE_NEW("Behavior"); + FRAME_NEW("Browsing"); + TABLE_NEW(3, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic("Open _new pages in"), 0, 1, 0, 1); + combobox = gtk_combo_box_new_text(); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "New tab", "New window", "Current tab", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages); + g_signal_connect(combobox, "changed" + , G_CALLBACK(on_prefs_newpages_changed), prefs); + gtk_widget_set_sensitive(combobox, FALSE); //... + FILLED_ADD(combobox, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("Open tabs in the _background"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Open _popups in tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_openPopupsInTabs_toggled), prefs); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 2, 2, 3); + FRAME_NEW("Features"); + TABLE_NEW(3, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Load _images automatically"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->loadImagesAutomatically); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->shrinkImagesToFit); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_shrinkImagesToFit_toggled), prefs); + SPANNED_ADD(checkbutton, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_resizableTextAreas_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Enable java_script"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableJavaScript); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); + SPANNED_ADD(checkbutton, 1, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_enablePlugins_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 2, 3); + // For now we check for "plugins-enabled", in case this build has no properties + if(!g_object_class_find_property(G_OBJECT_GET_CLASS(browser->webView), "plugins-enabled")) + gtk_widget_set_sensitive(frame, FALSE); + + // Page "Interface" + PAGE_NEW("Interface"); + FRAME_NEW("Navigationbar"); + TABLE_NEW(3, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic("_Toolbar style"), 0, 1, 0, 1); + combobox = gtk_combo_box_new_text(); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "Default", "Icons", "Text", "Both", "Both horizontal", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->toolbarStyle); + g_signal_connect(combobox, "changed" + , G_CALLBACK(on_prefs_toolbarstyle_changed), prefs); + FILLED_ADD(combobox, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("Show small _icons"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Show web_search"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarWebSearch_toggled), prefs); + SPANNED_ADD(checkbutton, 1, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Show _New Tab Button"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 2, 3); + checkbutton = gtk_check_button_new_with_mnemonic("Show _closed tabs button"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs); + SPANNED_ADD(checkbutton, 1, 2, 2, 3); + FRAME_NEW("Miscellaneous"); + TABLE_NEW(3, 2); + checkbutton = gtk_check_button_new_with_mnemonic + ("Show close _buttons on tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_closeButtonsOnTabs_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 2, 0, 1); + INDENTED_ADD(gtk_label_new_with_mnemonic("Tabbar _placement"), 0, 1, 1, 2); + combobox = gtk_combo_box_new_text(); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "Left", "Top", "Right", "Bottom", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); //... + gtk_widget_set_sensitive(combobox, FALSE); //... + FILLED_ADD(combobox, 1, 2, 1, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 2, 3); + entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch); + g_signal_connect(entry, "focus-out-event" + , G_CALLBACK(on_prefs_locationsearch_focus_out), prefs); + FILLED_ADD(entry, 1, 2, 2, 3); + + // Page "Network" + PAGE_NEW("Network"); + FRAME_NEW("Proxy Server"); + TABLE_NEW(5, 2); + checkbutton = gtk_check_button_new_with_mnemonic("_Custom proxy server"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 2, 0, 1); + hbox = gtk_hbox_new(FALSE, 4); + INDENTED_ADD(gtk_label_new_with_mnemonic("_Host/ Port"), 0, 1, 1, 2); + entry = gtk_entry_new(); + gtk_widget_set_sensitive(entry, FALSE); //... + gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); + spinbutton = gtk_spin_button_new_with_range(0, 65535, 1); + gtk_widget_set_sensitive(spinbutton, FALSE); //... + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + FILLED_ADD(hbox, 1, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic + ("Proxy requires authentication"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + // TODO: The proxy user and pass need to be indented further + SPANNED_ADD(checkbutton, 0, 2, 2, 3); + INDENTED_ADD(gtk_label_new("Username"), 0, 1, 3, 4); + entry = gtk_entry_new(); + gtk_widget_set_sensitive(entry, FALSE); //... + FILLED_ADD(entry, 1, 2, 3, 4); + INDENTED_ADD(gtk_label_new("Password"), 0, 1, 4, 5); + entry = gtk_entry_new(); + gtk_widget_set_sensitive(entry, FALSE); //... + FILLED_ADD(entry, 1, 2, 4, 5); + FRAME_NEW("Cache"); + TABLE_NEW(1, 2); + INDENTED_ADD(gtk_label_new("Cache size"), 0, 1, 0, 1); + hbox = gtk_hbox_new(FALSE, 4); + spinbutton = gtk_spin_button_new_with_range(0, 10000, 10); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 100/*config->iCacheSize*/); + gtk_widget_set_sensitive(spinbutton, FALSE); //... + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("MB"), FALSE, FALSE, 0); + button = gtk_button_new_with_label("Clear cache"); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); + FILLED_ADD(hbox, 1, 2, 0, 1); + + // Page "Privacy" + PAGE_NEW("Privacy"); + FRAME_NEW("Cookies"); + TABLE_NEW(3, 2); + INDENTED_ADD(gtk_label_new("Accept cookies"), 0, 1, 0, 1); + combobox = gtk_combo_box_new_text(); + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "All cookies", "Session cookies", "None", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... + gtk_widget_set_sensitive(combobox, FALSE); //... + FILLED_ADD(combobox, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic + ("Allow cookies from the original website only"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 2, 1, 2); + INDENTED_ADD(gtk_label_new("Maximum cookie age"), 0, 1, 2, 3); + hbox = gtk_hbox_new(FALSE, 4); + spinbutton = gtk_spin_button_new_with_range(0, 360, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 30/*config->iCookieAgeMax*/); + gtk_widget_set_sensitive(spinbutton, FALSE); //... + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("days"), FALSE, FALSE, 0); + button = gtk_button_new_with_label("View cookies"); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); + FILLED_ADD(hbox, 1, 2, 2, 3); + FRAME_NEW("History"); + TABLE_NEW(3, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Remember my visited pages"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 1, 0, 1); + hbox = gtk_hbox_new(FALSE, 4); + spinbutton = gtk_spin_button_new_with_range(0, 360, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 30/*config->iHistoryAgeMax*/); + gtk_widget_set_sensitive(spinbutton, FALSE); //... + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("days"), FALSE, FALSE, 0); + SPANNED_ADD(hbox, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic + ("Remember my form inputs"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic + ("Remember my downloaded files"); + gtk_widget_set_sensitive(checkbutton, FALSE); //... + SPANNED_ADD(checkbutton, 0, 2, 2, 3); + + // Page "Programs" + PAGE_NEW("Programs"); + FRAME_NEW("External programs"); + TABLE_NEW(3, 2); + GtkWidget* treeview; GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; + GtkListStore* liststore = gtk_list_store_new(PROTOCOLS_COL_N + , G_TYPE_STRING, G_TYPE_STRING); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(liststore)); + prefs->treeview = treeview; + renderer_text = gtk_cell_renderer_text_new(); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + "Protocol", renderer_text, "text", PROTOCOLS_COL_NAME, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + column = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(column, "Command"); + gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf + , (GtkTreeCellDataFunc)on_prefs_protocols_render_icon, prefs, NULL); + renderer_text = gtk_cell_renderer_text_new(); + g_object_set(G_OBJECT(renderer_text), "editable", TRUE, NULL); + g_signal_connect(GTK_OBJECT(renderer_text), "edited" + , G_CALLBACK(on_prefs_protocols_edited), prefs); + gtk_tree_view_column_pack_start(column, renderer_text, TRUE); + gtk_tree_view_column_add_attribute(column, renderer_text, "text", PROTOCOLS_COL_COMMAND); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled) + , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(scrolled), treeview); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 5); + guint i; + for(i = 0; i < config->protocols_names->len; i++) + { + gchar* protocol = (gchar*)g_ptr_array_index(config->protocols_names, i); + // TODO: We might want to determine 'default' programs somehow + // TODO: Any way to make it easier to add eg. only a mail client? O_o + const gchar* command = g_datalist_get_data(&config->protocols_commands, protocol); + gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i + , PROTOCOLS_COL_NAME , protocol + , PROTOCOLS_COL_COMMAND, command + , -1); + } + g_object_unref(liststore); + GtkWidget* vbox = gtk_vbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4); + combobox = gtk_combo_box_new_text(); + prefs->combobox = combobox; + sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) + , "download", "ed2k", "feed", "ftp", "irc", "mailto" + , "news", "tel", "torrent", "view-source", NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); + gtk_box_pack_start(GTK_BOX(vbox), combobox, FALSE, FALSE, 0); + button = gtk_button_new_from_stock(GTK_STOCK_ADD); + prefs->add = button; + g_signal_connect(combobox, "changed" + , G_CALLBACK(on_prefs_protocols_combobox_changed), prefs); + g_signal_connect(button, "clicked" + , G_CALLBACK(on_prefs_protocols_add_clicked), prefs); + gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); + button = gtk_label_new(""); // This is an invisible separator + gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 12); + button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); + FILLED_ADD(hbox, 0, 2, 0, 2); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) + , notebook, FALSE, FALSE, 4); + gtk_widget_show_all(GTK_DIALOG(dialog)->vbox); + return dialog; +} diff --git a/src/prefs.h b/src/prefs.h new file mode 100644 index 00000000..7a452742 --- /dev/null +++ b/src/prefs.h @@ -0,0 +1,42 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __PREFS_H__ +#define __PREFS_H__ 1 + +#include "browser.h" + +#include + +// -- Types + +typedef struct +{ + CBrowser* browser; + //GtkWidget* window; + GtkWidget* treeview; + GtkWidget* combobox; + GtkWidget* add; +} CPrefs; + +enum +{ + PROTOCOLS_COL_NAME, + PROTOCOLS_COL_COMMAND, + PROTOCOLS_COL_N +}; + +// -- Declarations + +GtkWidget* +prefs_preferences_dialog_new(CBrowser*); + +#endif /* !__PREFS_H__ */ diff --git a/src/search.c b/src/search.c new file mode 100644 index 00000000..2823add8 --- /dev/null +++ b/src/search.c @@ -0,0 +1,209 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "search.h" + +#include "sokoke.h" + +#include +#include + +GList* search_engines_new(void) +{ + return NULL; +} + +void search_engines_free(GList* searchEngines) +{ + g_list_foreach(searchEngines, (GFunc)search_engine_free, NULL); + g_list_free(searchEngines); +} + +gboolean search_engines_from_file(GList** searchEngines, const gchar* filename + , GError** error) +{ + g_return_val_if_fail(!g_list_nth(*searchEngines, 0), FALSE); + GKeyFile* keyFile = g_key_file_new(); + g_key_file_load_from_file(keyFile, filename, G_KEY_FILE_KEEP_COMMENTS, error); + /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL + , G_KEY_FILE_KEEP_COMMENTS, error);*/ + gchar** engines = g_key_file_get_groups(keyFile, NULL); + guint i; + for(i = 0; engines[i] != NULL; i++) + { + SearchEngine* engine = search_engine_new(); + search_engine_set_short_name(engine, engines[i]); + engine->description = g_key_file_get_string(keyFile, engines[i], "description", NULL); + engine->url = g_key_file_get_string(keyFile, engines[i], "url", NULL); + engine->inputEncoding = g_key_file_get_string(keyFile, engines[i], "input-encoding", NULL); + engine->icon = g_key_file_get_string(keyFile, engines[i], "icon", NULL); + engine->keyword = g_key_file_get_string(keyFile, engines[i], "keyword", NULL); + *searchEngines = g_list_prepend(*searchEngines, engine); + } + *searchEngines = g_list_reverse(*searchEngines); + g_strfreev(engines); + g_key_file_free(keyFile); + return !(error && *error); +} + +static void key_file_set_string(GKeyFile* keyFile, const gchar* group + , const gchar* key, const gchar* string) +{ + g_return_if_fail(group); + if(string) + g_key_file_set_string(keyFile, group, key, string); +} + +gboolean search_engines_to_file(GList* searchEngines, const gchar* filename + , GError** error) +{ + GKeyFile* keyFile = g_key_file_new(); + guint n = g_list_length(searchEngines); + guint i; + for(i = 0; i < n; i++) + { + SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, i); + const gchar* name = search_engine_get_short_name(engine); + key_file_set_string(keyFile, name, "description", engine->description); + key_file_set_string(keyFile, name, "url", engine->url); + key_file_set_string(keyFile, name, "input-encoding", engine->inputEncoding); + key_file_set_string(keyFile, name, "icon", engine->icon); + key_file_set_string(keyFile, name, "keyword", engine->keyword); + } + gboolean bSaved = sokoke_key_file_save_to_file(keyFile, filename, error); + g_key_file_free(keyFile); + + return bSaved; +} + +SearchEngine* search_engine_new() +{ + SearchEngine* engine = g_new(SearchEngine, 1); + engine->shortName = g_strdup(""); + engine->description = NULL; + engine->url = NULL; + engine->inputEncoding = NULL; + engine->icon = NULL; + engine->keyword = NULL; + return engine; +} + +void search_engine_free(SearchEngine* engine) +{ + g_return_if_fail(engine); + g_free(engine->shortName); + g_free(engine->description); + g_free(engine->url); + g_free(engine->inputEncoding); + g_free(engine->icon); + g_free(engine->keyword); + g_free(engine); +} + +SearchEngine* search_engine_copy(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + SearchEngine* copy = search_engine_new(); + search_engine_set_short_name(copy, engine->shortName); + search_engine_set_description(copy, engine->description); + search_engine_set_url(copy, engine->url); + search_engine_set_input_encoding(copy, engine->inputEncoding); + search_engine_set_icon(copy, engine->icon); + search_engine_set_keyword(copy, engine->keyword); + return engine; +} + +GType search_engine_get_type() +{ + static GType type = 0; + if(!type) + type = g_pointer_type_register_static("search_engine"); + return type; +} + +G_CONST_RETURN gchar* search_engine_get_short_name(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + return engine->shortName; +} + +G_CONST_RETURN gchar* search_engine_get_description(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + return engine->description; +} + +G_CONST_RETURN gchar* search_engine_get_url(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + return engine->url; +} + +G_CONST_RETURN gchar* search_engine_get_input_encoding(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + return engine->inputEncoding; +} + +G_CONST_RETURN gchar* search_engine_get_icon(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + return engine->icon; +} + +G_CONST_RETURN gchar* search_engine_get_keyword(SearchEngine* engine) +{ + g_return_val_if_fail(engine, NULL); + return engine->keyword; +} + +void search_engine_set_short_name(SearchEngine* engine, const gchar* shortName) +{ + g_return_if_fail(engine); + g_return_if_fail(shortName); + g_free(engine->shortName); + engine->shortName = g_strdup(shortName); +} + +void search_engine_set_description(SearchEngine* engine, const gchar* description) +{ + g_return_if_fail(engine); + g_free(engine->description); + engine->description = g_strdup(description); +} + +void search_engine_set_url(SearchEngine* engine, const gchar* url) +{ + g_return_if_fail(engine); + g_free(engine->url); + engine->url = g_strdup(url); +} + +void search_engine_set_input_encoding(SearchEngine* engine, const gchar* inputEncoding) +{ + g_return_if_fail(engine); + g_free(engine->inputEncoding); + engine->inputEncoding = g_strdup(inputEncoding); +} + +void search_engine_set_icon(SearchEngine* engine, const gchar* icon) +{ + g_return_if_fail(engine); + g_free(engine->icon); + engine->icon = g_strdup(icon); +} + +void search_engine_set_keyword(SearchEngine* engine, const gchar* keyword) +{ + g_return_if_fail(engine); + g_free(engine->keyword); + engine->keyword = g_strdup(keyword); +} diff --git a/src/search.h b/src/search.h new file mode 100644 index 00000000..c8aa7093 --- /dev/null +++ b/src/search.h @@ -0,0 +1,91 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __SEARCH_H__ +#define __SEARCH_H__ 1 + +#include +#include + +// Note: This structure is entirely private. +typedef struct +{ + gchar* shortName; + gchar* description; + gchar* url; + gchar* inputEncoding; + gchar* icon; + gchar* keyword; +} SearchEngine; + +GList* +search_engines_new(void); + +void +search_engines_free(GList*); + +gboolean +search_engines_from_file(GList**, const gchar*, GError**); + +gboolean +search_engines_to_file(GList*, const gchar*, GError**); + +SearchEngine* +search_engine_new(void); + +void +search_engine_free(SearchEngine*); + +SearchEngine* +search_engine_copy(SearchEngine*); + +GType +search_engine_get_type(); + +#define G_TYPE_SEARCH_ENGINE search_engine_get_type() + +G_CONST_RETURN gchar* +search_engine_get_short_name(SearchEngine*); + +G_CONST_RETURN gchar* +search_engine_get_description(SearchEngine*); + +G_CONST_RETURN gchar* +search_engine_get_url(SearchEngine*); + +G_CONST_RETURN gchar* +search_engine_get_input_encoding(SearchEngine*); + +G_CONST_RETURN gchar* +search_engine_get_icon(SearchEngine*); + +G_CONST_RETURN gchar* +search_engine_get_keyword(SearchEngine*); + +void +search_engine_set_short_name(SearchEngine*, const gchar*); + +void +search_engine_set_description(SearchEngine*, const gchar*); + +void +search_engine_set_url(SearchEngine*, const gchar*); + +void +search_engine_set_input_encoding(SearchEngine*, const gchar*); + +void +search_engine_set_icon(SearchEngine*, const gchar*); + +void +search_engine_set_keyword(SearchEngine*, const gchar*); + +#endif /* !__SEARCH_H__ */ diff --git a/src/sokoke.c b/src/sokoke.c new file mode 100644 index 00000000..8ccec6a7 --- /dev/null +++ b/src/sokoke.c @@ -0,0 +1,381 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "sokoke.h" + +#include "debug.h" + +#include +#ifdef HAVE_UNISTD_H + #include +#endif +#include + +void sokoke_combo_box_add_strings(GtkComboBox* combobox + , const gchar* sLabelFirst, ...) +{ + // Add a number of strings to a combobox, terminated with NULL + // This works only for text comboboxes + va_list args; + va_start(args, sLabelFirst); + + const gchar* sLabel; + for(sLabel = sLabelFirst; sLabel; sLabel = va_arg(args, const gchar*)) + gtk_combo_box_append_text(combobox, sLabel); + + va_end(args); +} + +void sokoke_radio_action_set_current_value(GtkRadioAction* action + , gint current_value) +{ + // Activates the group member with the given value + #if GTK_CHECK_VERSION(2, 10, 0) + gtk_radio_action_set_current_value(action, current_value); + #else + // TODO: Implement this for older gtk + UNIMPLEMENTED + #endif +} + +void sokoke_widget_set_visible(GtkWidget* widget, gboolean bVisibility) +{ + // Show or hide the widget + if(bVisibility) + gtk_widget_show(widget); + else + gtk_widget_hide(widget); +} + +void sokoke_container_show_children(GtkContainer* container) +{ + // Show every child but not the container itself + gtk_container_foreach(container, (GtkCallback)(gtk_widget_show_all), NULL); +} + +void sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* sText) +{ + #if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text(widget, sText); + #else + static GtkTooltips* tooltips; + if(!tooltips) + tooltips = gtk_tooltips_new(); + gtk_tooltips_set_tip(tooltips, widget, sText, NULL); + #endif +} + +void sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* sText) +{ + // TODO: Use 2.12 api if available + GtkTooltips* tooltips = gtk_tooltips_new(); + gtk_tool_item_set_tooltip(toolitem, tooltips, sText, NULL); +} + +void sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu + , GdkEventButton* event) +{ + // TODO: Provide a GtkMenuPositionFunc in case a keyboard invoked this + int button, event_time; + if(event) + { + button = event->button; + event_time = event->time; + } + else + { + button = 0; + event_time = gtk_get_current_event_time(); + } + + if(!gtk_menu_get_attach_widget(menu)) + gtk_menu_attach_to_widget(menu, widget, NULL); + gtk_menu_popup(menu, NULL, NULL, NULL, NULL, button, event_time); +} + +enum +{ + SOKOKE_DESKTOP_UNKNOWN, + SOKOKE_DESKTOP_XFCE +}; + +static guint sokoke_get_desktop(void) +{ + // Are we running in Xfce? + gint iResult; gchar* stdout; gchar* stderr; + gboolean bSuccess = g_spawn_command_line_sync( + "xprop -root _DT_SAVE_MODE | grep -q xfce4" + , &stdout, &stderr, &iResult, NULL); + if(bSuccess && !iResult) + return SOKOKE_DESKTOP_XFCE; + + return SOKOKE_DESKTOP_UNKNOWN; +} + +gpointer sokoke_xfce_header_new(const gchar* sIcon, const gchar* sTitle) +{ + + // Create an xfce header with icon and title + // This returns NULL if the desktop is not xfce + if(sokoke_get_desktop() == SOKOKE_DESKTOP_XFCE) + { + GtkWidget* entry = gtk_entry_new(); + gchar* sMarkup; + GtkWidget* xfce_heading = gtk_event_box_new(); + gtk_widget_modify_bg(xfce_heading, GTK_STATE_NORMAL + , &entry->style->base[GTK_STATE_NORMAL]); + GtkWidget* hbox = gtk_hbox_new(FALSE, 12); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); + GtkWidget* icon = gtk_image_new_from_icon_name(sIcon, GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0); + GtkWidget* label = gtk_label_new(NULL); + gtk_widget_modify_fg(label, GTK_STATE_NORMAL + , &entry->style->text[GTK_STATE_NORMAL]); + sMarkup = g_strdup_printf("%s", sTitle); + gtk_label_set_markup(GTK_LABEL(label), sMarkup); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(xfce_heading), hbox); + g_free(sMarkup); + return xfce_heading; + } + return NULL; +} + +gpointer sokoke_superuser_warning_new(void) +{ + // Create a horizontal bar with a security warning + // This returns NULL if the user is no superuser + #ifdef HAVE_UNISTD_H + if(G_UNLIKELY(!geteuid())) // effective superuser? + { + GtkWidget* hbox = gtk_event_box_new(); + gtk_widget_modify_bg(hbox, GTK_STATE_NORMAL + , &hbox->style->bg[GTK_STATE_SELECTED]); + GtkWidget* label = gtk_label_new("Warning: You are using the superuser account!"); + gtk_misc_set_padding(GTK_MISC(label), 0, 2); + gtk_widget_modify_fg(GTK_WIDGET(label), GTK_STATE_NORMAL + , >K_WIDGET(label)->style->fg[GTK_STATE_SELECTED]); + gtk_container_add(GTK_CONTAINER(hbox), GTK_WIDGET(label)); + return hbox; + } + #endif + return NULL; +} + +GtkWidget* sokoke_hig_frame_new(const gchar* sLabel) +{ + // Create a frame with no actual frame but a bold label and indentation + GtkWidget* frame = gtk_frame_new(NULL); + gchar* sLabelBold = g_strdup_printf("%s", sLabel); + GtkWidget* label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), sLabelBold); + g_free(sLabelBold); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + return frame; +} + +void sokoke_widget_set_pango_font_style(GtkWidget* widget, PangoStyle style) +{ + // Conveniently change the pango font style + // For some reason we need to reset if we actually want the normal style + if(style == PANGO_STYLE_NORMAL) + gtk_widget_modify_font(widget, NULL); + else + { + PangoFontDescription* pangofontdesc = pango_font_description_new(); + pango_font_description_set_style(pangofontdesc, PANGO_STYLE_ITALIC); + gtk_widget_modify_font(widget, pangofontdesc); + pango_font_description_free(pangofontdesc); + } +} + +static gboolean sokoke_on_entry_focus_in_event(GtkEntry* entry, GdkEventFocus *event + , gpointer userdata) +{ + gboolean bDefaultText = (gboolean)g_object_get_data(G_OBJECT(entry) + , "sokoke_bDefaultText"); + if(bDefaultText) + { + gtk_entry_set_text(entry, ""); + g_object_set_data(G_OBJECT(entry), "sokoke_bDefaultText", (gpointer)FALSE); + sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_NORMAL); + } + return FALSE; +} + +static gboolean sokoke_on_entry_focus_out_event(GtkEntry* entry, GdkEventFocus* event + , gpointer userdata) +{ + const gchar* sText = gtk_entry_get_text(entry); + if(sText[0] == '\0') + { + const gchar* sDefaultText = (const gchar*)g_object_get_data( + G_OBJECT(entry), "sokoke_sDefaultText"); + gtk_entry_set_text(entry, sDefaultText); + g_object_set_data(G_OBJECT(entry), "sokoke_bDefaultText", (gpointer)TRUE); + sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_ITALIC); + } + return FALSE; +} + +void sokoke_entry_set_default_text(GtkEntry* entry, const gchar* sDefaultText) +{ + // Note: The default text initially overwrites any previous text + gchar* sOldValue = g_object_get_data(G_OBJECT(entry), "sokoke_sDefaultText"); + if(!sOldValue) + { + g_object_set_data(G_OBJECT(entry), "sokoke_bDefaultText", (gpointer)TRUE); + sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_ITALIC); + gtk_entry_set_text(entry, sDefaultText); + } + g_object_set_data(G_OBJECT(entry), "sokoke_sDefaultText", (gpointer)sDefaultText); + g_signal_connect(entry, "focus-in-event" + , G_CALLBACK(sokoke_on_entry_focus_in_event), NULL); + g_signal_connect(entry, "focus-out-event" + , G_CALLBACK(sokoke_on_entry_focus_out_event), NULL); +} + +gchar* sokoke_key_file_get_string_default(GKeyFile* key_file + , const gchar* group_name, const gchar* key, const gchar* def, GError* *error) +{ + gchar* value = g_key_file_get_string(key_file, group_name, key, error); + return value == NULL ? g_strdup(def) : value; +} + +gint sokoke_key_file_get_integer_default(GKeyFile* key_file + , const gchar* group_name, const gchar* key, const gint def, GError** error) +{ + if(!g_key_file_has_key(key_file, group_name, key, NULL)) + return def; + return g_key_file_get_integer(key_file, group_name, key, error); +} + +gboolean sokoke_key_file_save_to_file(GKeyFile* key_file + , const gchar* sFilename, GError** error) +{ + gchar* sData = g_key_file_to_data(key_file, NULL, error); + if(!sData) + return FALSE; + FILE* fp; + if(!(fp = fopen(sFilename, "w"))) + { + *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_ACCES + , "Writing failed."); + return FALSE; + } + fputs(sData, fp); + fclose(fp); + g_free(sData); + return TRUE; +} + +void sokoke_widget_get_text_size(GtkWidget* widget, const gchar* sText + , gint* w, gint* h) +{ + PangoLayout* layout = gtk_widget_create_pango_layout(widget, sText); + pango_layout_get_pixel_size(layout, w, h); + g_object_unref(layout); +} + +void sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* sPath + , const gchar* sKey, GdkModifierType accel_mods) +{ + if(sPath && *sPath) + { + gchar* path = g_strconcat("<", g_get_prgname(), ">/", sPath, NULL); + gtk_menu_item_set_accel_path(GTK_MENU_ITEM(menuitem), path); + guint keyVal = sKey ? gdk_keyval_from_name(sKey) : 0; + gtk_accel_map_add_entry(path, keyVal, accel_mods); + g_free(path); + } +} + +gboolean sokoke_entry_can_undo(GtkEntry* entry) +{ + // TODO: Can we undo the last input? + return FALSE; +} + +gboolean sokoke_entry_can_redo(GtkEntry* entry) +{ + // TODO: Can we redo the last input? + return FALSE; +} + +void sokoke_entry_undo(GtkEntry* entry) +{ + // TODO: Implement undo + UNIMPLEMENTED +} + +void sokoke_entry_redo(GtkEntry* entry) +{ + // TODO: Implement redo + UNIMPLEMENTED +} + +static gboolean sokoke_on_undo_entry_key_down(GtkEntry* widget, GdkEventKey* event + , gpointer userdata) +{ + switch(event->keyval) + { + case GDK_Undo: + sokoke_entry_undo(widget); + return FALSE; + case GDK_Redo: + sokoke_entry_redo(widget); + return FALSE; + default: + return FALSE; + } +} + +static void sokoke_on_undo_entry_populate_popup(GtkEntry* entry, GtkMenu* menu + , gpointer userdata) +{ + // Enhance the entry's menu with undo and redo items. + GtkWidget* menuitem = gtk_separator_menu_item_new(); + gtk_menu_shell_prepend((GtkMenuShell*)menu, menuitem); + gtk_widget_show(menuitem); + menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_REDO, NULL); + g_signal_connect(menuitem, "activate", G_CALLBACK(sokoke_entry_redo), userdata); + gtk_widget_set_sensitive(menuitem, sokoke_entry_can_redo(entry)); + gtk_menu_shell_prepend((GtkMenuShell*)menu, menuitem); + gtk_widget_show(menuitem); + menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_UNDO, NULL); + g_signal_connect(menuitem, "activate", G_CALLBACK(sokoke_entry_undo), userdata); + gtk_widget_set_sensitive(menuitem, sokoke_entry_can_undo(entry)); + gtk_menu_shell_prepend((GtkMenuShell*)menu, menuitem); + gtk_widget_show(menuitem); +} + +gboolean sokoke_entry_get_can_undo(GtkEntry* entry) +{ + // TODO: Is this entry undo enabled? + return FALSE; +} + +void sokoke_entry_set_can_undo(GtkEntry* entry, gboolean bCanUndo) +{ + if(bCanUndo) + { + g_signal_connect(entry, "key-press-event" + , G_CALLBACK(sokoke_on_undo_entry_key_down), NULL); + g_signal_connect(entry, "populate-popup" + , G_CALLBACK(sokoke_on_undo_entry_populate_popup), NULL); + } + else + { + ; // TODO: disconnect signal + UNIMPLEMENTED + } +} diff --git a/src/sokoke.h b/src/sokoke.h new file mode 100644 index 00000000..80ae085e --- /dev/null +++ b/src/sokoke.h @@ -0,0 +1,94 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __SOKOKE_H__ +#define __SOKOKE_H__ 1 + +#include + +// Many themes need this hack for small toolbars to work +#define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON + +void +sokoke_combo_box_add_strings(GtkComboBox* combobox, const gchar* sLabelFirst, ...); + +void +sokoke_radio_action_set_current_value(GtkRadioAction* action, gint current_value); + +void +sokoke_widget_set_visible(GtkWidget* widget, gboolean bVisibility); + +void +sokoke_container_show_children(GtkContainer* container); + +void +sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* sText); + +void +sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* sText); + +void +sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu, GdkEventButton* event); + +gpointer +sokoke_xfce_header_new(const gchar* sIcon, const gchar* sTitle); + +gpointer +sokoke_superuser_warning_new(void); + +GtkWidget* +sokoke_hig_frame_new(const gchar* sLabel); + +void +sokoke_widget_set_pango_font_style(GtkWidget* widget, PangoStyle style); + +void +sokoke_entry_set_default_text(GtkEntry* entry, const gchar* sDefaultText); + +gchar* +sokoke_key_file_get_string_default(GKeyFile* key_file + , const gchar* group_name, const gchar* key, const gchar* def, GError* *error); + +gint +sokoke_key_file_get_integer_default(GKeyFile* key_file + , const gchar* group_name, const gchar* key, const gint def, GError* *error); + +gboolean +sokoke_key_file_save_to_file(GKeyFile* key_file + , const gchar* file, GError* *error); + +void +sokoke_widget_get_text_size(GtkWidget* widget, const gchar* sText + , gint* w, gint* h); + +void +sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* sPath + , const gchar* sKey, GdkModifierType accel_mods); + +gboolean +sokoke_entry_can_undo(GtkEntry* entry); + +gboolean +sokoke_entry_can_redo(GtkEntry* entry); + +void +sokoke_entry_undo(GtkEntry* entry); + +void +sokoke_entry_redo(GtkEntry* entry); + +gboolean +sokoke_entry_get_can_undo(GtkEntry* entry); + +void +sokoke_entry_set_can_undo(GtkEntry* entry, gboolean bCanUndo); + +#endif /* !__SOKOKE_H__ */ diff --git a/src/ui.h b/src/ui.h new file mode 100644 index 00000000..e57b7139 --- /dev/null +++ b/src/ui.h @@ -0,0 +1,245 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __UI_H__ +#define __UI_H__ 1 + +// -- Credits + +static const gchar* credits_authors[] = { "Christian Dywan ", NULL }; +static const gchar* credits_documenters/*[]*/ = /*{ */NULL/* }*/; +static const gchar* credits_artists[] = { "Nancy Runge ", NULL }; + +// -- Licenses + +static const gchar* license = + "This library is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU Lesser General Public\n" + "License as published by the Free Software Foundation; either\n" + "version 2.1 of the License, or (at your option) any later version.\n"; + +// -- User interface description + +static const gchar* ui_markup = + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + // Closed tabs shall be prepended here + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + // Bookmarks shall be appended here + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + // TODO: Insert widgets and custom tools here + "" + "" + "" + "" + "" + "" + "" + "" + "" + // All open tabs shall be appended here + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + ""; + +#endif /* !__UI_H__ */ diff --git a/src/webSearch.c b/src/webSearch.c new file mode 100644 index 00000000..a3618e25 --- /dev/null +++ b/src/webSearch.c @@ -0,0 +1,441 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "webSearch.h" + +#include "global.h" +#include "helpers.h" +#include "search.h" +#include "sokoke.h" + +#include +#include + +void update_searchEngine(guint index, CBrowser* browser) +{ + guint n = g_list_length(searchEngines); + // Display a default icon in case we have no engines + if(!n) + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->webSearch), SEXY_ICON_ENTRY_PRIMARY + , GTK_IMAGE(gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU))); + // Change the icon and default text according to the chosen engine + else + { + // Reset in case the index is out of range + if(index >= n) + index = 0; + SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, index); + GdkPixbuf* pixbuf = load_web_icon(search_engine_get_icon(engine) + , GTK_ICON_SIZE_MENU, browser->navibar); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->webSearch) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf))); + g_object_unref(pixbuf); + sokoke_entry_set_default_text(GTK_ENTRY(browser->webSearch) + , search_engine_get_short_name(engine)); + config->searchEngine = index; + } +} + +void on_webSearch_engine_activate(GtkWidget* widget, CBrowser* browser) +{ + guint index = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(widget), "engine")); + update_searchEngine(index, browser); +} + +void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos + , gint button, CBrowser* browser) +{ + GtkWidget* menu = gtk_menu_new(); + guint n = g_list_length(searchEngines); + GtkWidget* menuitem; + if(n) + { + guint i; + for(i = 0; i < n; i++) + { + SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, i); + menuitem = gtk_image_menu_item_new_with_label( + search_engine_get_short_name(engine)); + GdkPixbuf* pixbuf = load_web_icon(search_engine_get_icon(engine) + , GTK_ICON_SIZE_MENU, menuitem); + GtkWidget* icon = gtk_image_new_from_pixbuf(pixbuf); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), icon); + g_object_unref(pixbuf); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + g_object_set_data(G_OBJECT(menuitem), "engine", GUINT_TO_POINTER(i)); + g_signal_connect(menuitem, "activate" + , G_CALLBACK(on_webSearch_engine_activate), browser); + gtk_widget_show(menuitem); + } + } + else + { + menuitem = gtk_image_menu_item_new_with_label("Empty"); + gtk_widget_set_sensitive(menuitem, FALSE); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + } + + menuitem = gtk_separator_menu_item_new(); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + GtkAction* action = gtk_action_group_get_action( + browser->actiongroup, "ManageSearchEngines"); + menuitem = gtk_action_create_menu_item(action); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + sokoke_widget_popup(widget, GTK_MENU(menu), NULL); +} + +static void on_webSearch_engines_render_icon(GtkTreeViewColumn* column + , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter + , GtkWidget* treeview) +{ + SearchEngine* searchEngine; + gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &searchEngine, -1); + + // TODO: Would it be better to not do this on every redraw? + const gchar* icon = search_engine_get_icon(searchEngine); + if(icon) + { + GdkPixbuf* pixbuf = load_web_icon(icon, GTK_ICON_SIZE_DND, treeview); + g_object_set(renderer, "pixbuf", pixbuf, NULL); + if(pixbuf) + g_object_unref(pixbuf); + } + else + g_object_set(renderer, "pixbuf", NULL, NULL); +} + +static void on_webSearch_engines_render_text(GtkTreeViewColumn* column + , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter + , GtkWidget* treeview) +{ + SearchEngine* searchEngine; + gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &searchEngine, -1); + const gchar* name = search_engine_get_short_name(searchEngine); + const gchar* description = search_engine_get_description(searchEngine); + gchar* markup = g_strdup_printf("%s\n%s", name, description); + g_object_set(renderer, "markup", markup, NULL); + g_free(markup); +} + +static void webSearch_toggle_edit_buttons(gboolean sensitive, CWebSearch* webSearch) +{ + gtk_widget_set_sensitive(webSearch->edit, sensitive); + gtk_widget_set_sensitive(webSearch->remove, sensitive); +} + +static void on_webSearch_shortName_changed(GtkWidget* widget, GtkWidget* dialog) +{ + const gchar* text = gtk_entry_get_text(GTK_ENTRY(widget)); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) + , GTK_RESPONSE_ACCEPT, text && *text); +} + +const gchar* STR_NON_NULL(const gchar* string) +{ + return string ? string : ""; +} + +static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webSearch) +{ + GtkWidget* dialog = gtk_dialog_new_with_buttons( + newEngine ? "Add search engine" : "Edit search engine" + , GTK_WINDOW(webSearch->window) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , newEngine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog) + , newEngine ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); + GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + + SearchEngine* searchEngine; + GtkTreeModel* liststore; + GtkTreeIter iter; + if(newEngine) + { + searchEngine = search_engine_new(); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) + , GTK_RESPONSE_ACCEPT, FALSE); + } + else + { + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(webSearch->treeview)); + gtk_tree_selection_get_selected(selection, &liststore, &iter); + gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &searchEngine, -1); + } + + GtkWidget* hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic("_Name:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_shortName = gtk_entry_new(); + g_signal_connect(entry_shortName, "changed" + , G_CALLBACK(on_webSearch_shortName_changed), dialog); + gtk_entry_set_activates_default(GTK_ENTRY(entry_shortName), TRUE); + if(!newEngine) + gtk_entry_set_text(GTK_ENTRY(entry_shortName) + , search_engine_get_short_name(searchEngine)); + gtk_box_pack_start(GTK_BOX(hbox), entry_shortName, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Description:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_description = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_description), TRUE); + if(!newEngine) + gtk_entry_set_text(GTK_ENTRY(entry_description) + , STR_NON_NULL(search_engine_get_description(searchEngine))); + gtk_box_pack_start(GTK_BOX(hbox), entry_description, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Url:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_url = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_url), TRUE); + if(!newEngine) + gtk_entry_set_text(GTK_ENTRY(entry_url) + , STR_NON_NULL(search_engine_get_url(searchEngine))); + gtk_box_pack_start(GTK_BOX(hbox), entry_url, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Icon (name or file):"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_icon = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_icon), TRUE); + if(!newEngine) + gtk_entry_set_text(GTK_ENTRY(entry_icon) + , STR_NON_NULL(search_engine_get_icon(searchEngine))); + gtk_box_pack_start(GTK_BOX(hbox), entry_icon, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Keyword:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_keyword = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_keyword), TRUE); + if(!newEngine) + gtk_entry_set_text(GTK_ENTRY(entry_keyword) + , STR_NON_NULL(search_engine_get_keyword(searchEngine))); + gtk_box_pack_start(GTK_BOX(hbox), entry_keyword, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { + search_engine_set_short_name(searchEngine + , gtk_entry_get_text(GTK_ENTRY(entry_shortName))); + search_engine_set_description(searchEngine + , gtk_entry_get_text(GTK_ENTRY(entry_description))); + search_engine_set_url(searchEngine + , gtk_entry_get_text(GTK_ENTRY(entry_url))); + /*search_engine_set_input_encoding(searchEngine + , gtk_entry_get_text(GTK_ENTRY(entry_inputEncoding)));*/ + search_engine_set_icon(searchEngine + , gtk_entry_get_text(GTK_ENTRY(entry_icon))); + search_engine_set_keyword(searchEngine + , gtk_entry_get_text(GTK_ENTRY(entry_keyword))); + + if(newEngine) + { + searchEngines = g_list_append(searchEngines, searchEngine); + liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(webSearch->treeview)); + gtk_list_store_append(GTK_LIST_STORE(liststore), &iter); + } + gtk_list_store_set(GTK_LIST_STORE(liststore), &iter + , ENGINES_COL_ENGINE, searchEngine, -1); + webSearch_toggle_edit_buttons(TRUE, webSearch); + } + gtk_widget_destroy(dialog); +} + +static void on_webSearch_add(GtkWidget* widget, CWebSearch* webSearch) +{ + webSearch_editEngine_dialog_new(TRUE, webSearch); +} + +static void on_webSearch_edit(GtkWidget* widget, CWebSearch* webSearch) +{ + webSearch_editEngine_dialog_new(FALSE, webSearch); +} + +static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(webSearch->treeview)); + GtkTreeModel* liststore; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &liststore, &iter); + SearchEngine* searchEngine; + gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &searchEngine, -1); + gtk_list_store_remove(GTK_LIST_STORE(liststore), &iter); + search_engine_free(searchEngine); + searchEngines = g_list_remove(searchEngines, searchEngine); + update_searchEngine(config->searchEngine, webSearch->browser); + webSearch_toggle_edit_buttons(g_list_nth(searchEngines, 0) != NULL, webSearch); + // FIXME: we want to allow undo of some kind +} + +GtkWidget* webSearch_manageSearchEngines_dialog_new(CBrowser* browser) +{ + const gchar* dialogTitle = "Manage search engines"; + GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle + , GTK_WINDOW(browser->window) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_HELP + , GTK_RESPONSE_HELP + , GTK_STOCK_CLOSE + , GTK_RESPONSE_CLOSE + , NULL); + gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PROPERTIES); + // TODO: Implement some kind of help function + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) + , GTK_RESPONSE_HELP, FALSE); //... + gint iWidth, iHeight; + sokoke_widget_get_text_size(dialog, "M", &iWidth, &iHeight); + gtk_window_set_default_size(GTK_WINDOW(dialog), iWidth * 45, -1); + g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); + // TODO: Do we want tooltips for explainations or can we omit that? + // TODO: We need mnemonics + // TODO: Take multiple windows into account when applying changes + GtkWidget* xfce_heading; + if((xfce_heading = sokoke_xfce_header_new( + gtk_window_get_icon_name(GTK_WINDOW(dialog)), dialogTitle))) + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), xfce_heading, FALSE, FALSE, 0); + GtkWidget* hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 12); + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; + GtkListStore* liststore = gtk_list_store_new(ENGINES_COL_N + , G_TYPE_SEARCH_ENGINE); + GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(liststore)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); + column = gtk_tree_view_column_new(); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf + , (GtkTreeCellDataFunc)on_webSearch_engines_render_icon, treeview, NULL); + renderer_text = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(column, renderer_text, TRUE); + gtk_tree_view_column_set_cell_data_func(column, renderer_text + , (GtkTreeCellDataFunc)on_webSearch_engines_render_text, treeview, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled) + , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(scrolled), treeview); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); + gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 5); + guint n = g_list_length(searchEngines); + guint i; + for(i = 0; i < n; i++) + { + SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, i); + gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i + , ENGINES_COL_ENGINE, searchEngine, -1); + } + g_object_unref(liststore); + CWebSearch* webSearch = g_new0(CWebSearch, 1); + webSearch->browser = browser; + webSearch->window = dialog; + webSearch->treeview = treeview; + g_signal_connect(dialog, "response", G_CALLBACK(g_free), webSearch); + GtkWidget* vbox = gtk_vbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4); + GtkWidget* button = gtk_button_new_from_stock(GTK_STOCK_ADD); + g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_add), webSearch); + gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_from_stock(GTK_STOCK_EDIT); + g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_edit), webSearch); + gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); + webSearch->edit = button; + button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); + g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_remove), webSearch); + gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); + webSearch->remove = button; + button = gtk_label_new(""); // This is an invisible separator + gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 12); + button = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_from_stock(GTK_STOCK_GO_UP); + gtk_widget_set_sensitive(button, FALSE); //... + gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); + webSearch_toggle_edit_buttons(n > 0, webSearch); + gtk_widget_show_all(GTK_DIALOG(dialog)->vbox); + return dialog; +} + +gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, CBrowser* browser) +{ + GdkModifierType state = (GdkModifierType)0; + gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); + if(!(state & GDK_CONTROL_MASK)) + return FALSE; + switch(event->keyval) + { + case GDK_Up: + update_searchEngine(config->searchEngine - 1, browser); + return TRUE; + case GDK_Down: + update_searchEngine(config->searchEngine + 1, browser); + return TRUE; + } + return FALSE; +} + +gboolean on_webSearch_scroll(GtkWidget* webView, GdkEventScroll* event, CBrowser* browser) +{ + if(event->direction == GDK_SCROLL_DOWN) + update_searchEngine(config->searchEngine + 1, browser); + else if(event->direction == GDK_SCROLL_UP) + update_searchEngine(config->searchEngine - 1, browser); + return TRUE; +} + +void on_webSearch_activate(GtkWidget* widget, CBrowser* browser) +{ + const gchar* keywords = gtk_entry_get_text(GTK_ENTRY(widget)); + gchar* url; + SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, config->searchEngine); + if(searchEngine) + url = searchEngine->url; + else // The location search is our fallback + url = config->locationSearch; + gchar* search; + if(strstr(url, "%s")) + search = g_strdup_printf(url, keywords); + else + search = g_strconcat(url, " ", keywords, NULL); + entry_completion_append(GTK_ENTRY(widget), keywords); + webkit_web_view_open(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser)), search); + g_free(search); +} diff --git a/src/webSearch.h b/src/webSearch.h new file mode 100644 index 00000000..09f31222 --- /dev/null +++ b/src/webSearch.h @@ -0,0 +1,61 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __WEBSEARCH_H__ +#define __WEBSEARCH_H__ 1 + +#include "browser.h" + +#include +#include +#include + +// -- Types + +typedef struct +{ + CBrowser* browser; + GtkWidget* window; + GtkWidget* treeview; + GtkWidget* edit; + GtkWidget* remove; +} CWebSearch; + +enum +{ + ENGINES_COL_ENGINE, + ENGINES_COL_N +}; + +// -- Declarations + +void +update_searchEngine(guint, CBrowser*); + +void +on_webSearch_icon_released(GtkWidget*, SexyIconEntryPosition*, gint, CBrowser*); + +void +on_webSearch_engine_activate(GtkWidget*, CBrowser*); + +void +on_webSearch_activate(GtkWidget*, CBrowser*); + +GtkWidget* +webSearch_manageSearchEngines_dialog_new(CBrowser*); + +gboolean +on_webSearch_key_down(GtkWidget*, GdkEventKey*, CBrowser*); + +gboolean +on_webSearch_scroll(GtkWidget*, GdkEventScroll*, CBrowser*); + +#endif /* !__WEBSEARCH_H__ */ diff --git a/src/webView.c b/src/webView.c new file mode 100644 index 00000000..a9bbee90 --- /dev/null +++ b/src/webView.c @@ -0,0 +1,351 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "webView.h" + +#include "helpers.h" +#include "sokoke.h" +#include "xbel.h" + +#include + +WebKitNavigationResponse on_webView_navigation_requested(GtkWidget* webView + , WebKitWebFrame* frame, WebKitNetworkRequest* networkRequest) +{ + WebKitNavigationResponse response = WEBKIT_NAVIGATION_RESPONSE_ACCEPT; + // TODO: Ask webkit wether it knows the protocol for "unknown protcol" + // TODO: This isn't the place for uri scheme handling + const gchar* uri = webkit_network_request_get_uri(networkRequest); + gchar* protocol = strtok(g_strdup(uri), ":"); + if(spawn_protocol_command(protocol, uri)) + response = WEBKIT_NAVIGATION_RESPONSE_IGNORE; + g_free(protocol); + return response; +} + +void on_webView_location_changed(GtkWidget* webView, const gchar* uri +, CBrowser* browser) +{ + gchar* newUri = g_strdup(uri ? uri : ""); + xbel_bookmark_set_href(browser->sessionItem, newUri); + if(webView == get_nth_webView(-1, browser)) + { + gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); + gtk_label_set_text(GTK_LABEL(browser->webView_name), newUri); + update_status_message(NULL, browser); + update_gui_state(browser); + } +} + +void on_webView_title_changed(GtkWidget* webView, const gchar* title + , const gchar* uri, CBrowser* browser) +{ + // TODO: We emulate location_changed here for now + // Shouldn't we have separated title_changed and location_changed signals? + on_webView_location_changed(webView, uri, browser); + gchar* newTitle; + newTitle = g_strdup(title ? title : uri); + xbel_item_set_title(browser->sessionItem, newTitle); + gtk_label_set_text(GTK_LABEL(browser->webView_name), newTitle); + sokoke_widget_set_tooltip_text(gtk_widget_get_parent( + gtk_widget_get_parent(browser->webView_name)), newTitle); + gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN( + browser->webView_menu))), newTitle); + if(webView == get_nth_webView(-1, browser)) + { + gchar* windowTitle = g_strconcat(newTitle, " - ", PACKAGE_NAME, NULL); + gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); + g_free(windowTitle); + } +} + +void on_webView_icon_changed(GtkWidget* webView, WebKitWebFrame* widget + , CBrowser* browser) +{ + // TODO: Implement icon updates; currently this isn't ever called anyway + const gchar* icon = NULL; + UNIMPLEMENTED + if(icon) + { + gtk_label_set_text(GTK_LABEL(browser->webView_name), "icon"); + gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN( + browser->webView_menu))), "icon"); + if(webView == get_nth_webView(-1, browser)) + { + gchar* windowTitle = g_strconcat("icon", " - ", PACKAGE_NAME, NULL); + gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); + g_free(windowTitle); + } + } +} + +void on_webView_load_started(GtkWidget* webView, WebKitWebFrame* widget + , CBrowser* browser) +{ + browser->loadedPercent = 0; + browser->loadedBytes = 0; + browser->loadedBytesMax = 0; + update_favicon(browser); + if(webView == get_nth_webView(-1, browser)) + update_gui_state(browser); + update_statusbar_text(browser); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress), 0.1); + gtk_widget_show(browser->progress); +} + +void on_webView_load_changed(GtkWidget* webView, gint progress, CBrowser* browser) +{ + browser->loadedBytes = progress; + browser->loadedBytes = 100; + if(webView == get_nth_webView(-1, browser)) + update_gui_state(browser); +} + +void on_webView_load_finished(GtkWidget* webView, WebKitWebFrame* widget + , CBrowser* browser) +{ + browser->loadedPercent = -1; + update_favicon(browser); + if(webView == get_nth_webView(-1, browser)) + update_gui_state(browser); + update_statusbar_text(browser); + gtk_widget_hide(browser->progress); +} + +void on_webView_status_message(GtkWidget* webView, const gchar* text, CBrowser* browser) +{ + update_status_message(text, browser); +} + +void on_webView_selection_changed(GtkWidget* webView, CBrowser* browser) +{ + UNIMPLEMENTED +} + +gboolean on_webView_console_message(GtkWidget* webView + , const gchar* message, gint line, const gchar* sourceId, CBrowser* browser) +{ + return FALSE; +} + +void on_webView_link_hover(GtkWidget* webView, const gchar* tooltip + , const gchar* uri, CBrowser* browser) +{ + update_status_message(uri, browser); + g_free(browser->elementUri); + browser->elementUri = g_strdup(uri); +} + +/* +GtkWidget* on_webView_window_open(GtkWidget* webView, const gchar* sUri + , CBrowser* browser) +{ + // A window is created + // TODO: Respect config->iNewPages + // TODO: Find out if this comes from a script or a click + // TODO: Block scripted popups, return NULL and show status icon + CBrowser* newBrowser = browser_new(config->openPopupsInTabs ? browser : NULL); + return newBrowser->webView; +} +*/ + +void webView_popup(GtkWidget* webView, GdkEventButton* event, CBrowser* browser) +{ + gboolean isLink = browser->elementUri != NULL; // Did we right-click a link? + gboolean haveLinks = FALSE; // TODO: Are several links selected? + gboolean isImage = FALSE; // TODO: Did we right-click an image? + gboolean isEditable = FALSE; //webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(webView)); //... + gchar* selection = NULL; //webkit_web_view_get_selected_text(WEBKIT_WEB_VIEW(webView)); + + update_edit_items(browser); + + // Download manager available? + const gchar* downloadManager = g_datalist_get_data(&config->protocols_commands, "download"); + gboolean canDownload = downloadManager && *downloadManager; + + action_set_visible("LinkTabNew", isLink, browser); + action_set_visible("LinkTabCurrent", isLink, browser); + action_set_visible("LinkWindowNew", isLink, browser); + + action_set_visible("LinkSaveAs", isLink, browser); + action_set_visible("LinkSaveWith", isLink && canDownload, browser); + action_set_visible("LinkCopy", isLink, browser); + action_set_visible("LinkBookmarkNew", isLink, browser); + + action_set_visible("SelectionLinksNewTabs", haveLinks && selection && *selection, browser); + action_set_visible("SelectionTextTabNew", haveLinks && selection && *selection, browser); + action_set_visible("SelectionTextTabCurrent", haveLinks && selection && *selection, browser); + action_set_visible("SelectionTextWindowNew", haveLinks && selection && *selection, browser); + + action_set_visible("ImageViewTabNew", isImage, browser); + action_set_visible("ImageViewTabCurrent", isImage, browser); + action_set_visible("ImageSaveAs", isImage, browser); + action_set_visible("ImageSaveWith", isImage && canDownload, browser); + action_set_visible("ImageCopy", isImage, browser); + + action_set_visible("Copy_", (selection && *selection) || isEditable, browser); + action_set_visible("SelectionSearch", selection && *selection, browser); + action_set_visible("SelectionSearchWith", selection && *selection, browser); + action_set_visible("SelectionSourceView", selection && *selection, browser); + + action_set_visible("SourceView", !selection, browser); + + if(isEditable) + sokoke_widget_popup(webView, GTK_MENU(browser->popup_editable), event); + else if(isLink || isImage || (selection && *selection)) + sokoke_widget_popup(webView, GTK_MENU(browser->popup_element), event); + else + sokoke_widget_popup(webView, GTK_MENU(browser->popup_webView), event); +} + +gboolean on_webView_button_release(GtkWidget* webView, GdkEventButton* event + , CBrowser* browser) +{ + GdkModifierType state = (GdkModifierType)0; + gint x, y; + gdk_window_get_pointer(NULL, &x, &y, &state); + switch(event->button) + { + case 1: + if(!browser->elementUri) return FALSE; + if(state & GDK_SHIFT_MASK) + { + // Open link in new window + CBrowser* curBrowser = browser_new(NULL); + webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); + return TRUE; + } + else if(state & GDK_MOD1_MASK) + { + // Open link in new tab + CBrowser* curBrowser = browser_new(browser); + webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); + return TRUE; + } + break; + case 2: + if(state & GDK_CONTROL_MASK) + { + //webkit_web_view_set_text_size(WEBKIT_WEB_VIEW(webView), 1); + return TRUE; + } + else + { + if(!browser->elementUri) return FALSE; + // Open link in new tab + CBrowser* curBrowser = browser_new(browser); + webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); + return TRUE; + } + break; + case 3: + webView_popup(webView, event, browser); + return TRUE; + } + return FALSE; +} + +void on_webView_popup(GtkWidget* webView, CBrowser* browser) +{ + webView_popup(webView, NULL, browser); +} + +gboolean on_webView_scroll(GtkWidget* webView, GdkEventScroll* event + , CBrowser* browser) +{ + GdkModifierType state = (GdkModifierType)0; + gint x, y; + gdk_window_get_pointer(NULL, &x, &y, &state); + if(state & GDK_CONTROL_MASK) + { + /*const gfloat size = webkit_web_view_get_text_size(WEBKIT_WEB_VIEW(webView)); + if(event->direction == GDK_SCROLL_DOWN) + webkit_web_view_set_text_size(WEBKIT_WEB_VIEW(webView), size + 0.1); + else if(event->direction == GDK_SCROLL_UP) + webView_set_text_size(WEBKIT_WEB_VIEW(webView), size - 0.1);*/ + return TRUE; + } + else + return FALSE; +} + +gboolean on_webView_leave(GtkWidget* webView, GdkEventCrossing* event, CBrowser* browser) +{ + update_status_message(NULL, browser); + return TRUE; +} + +void on_webView_destroy(GtkWidget* widget, CBrowser* browser) +{ + // Update browser list, free memory and possibly quit + GList* tmp = g_list_find(browsers, browser); + browsers = g_list_delete_link(browsers, tmp); + g_free(browser->elementUri); + g_free(browser->statusMessage); + if(!g_list_length(browsers)) + { + g_object_unref(browser->actiongroup); + g_object_unref(browser->popup_webView); + g_object_unref(browser->popup_element); + g_object_unref(browser->popup_editable); + gtk_main_quit(); + } +} + +// webView actions begin here + +GtkWidget* webView_new(GtkWidget** scrolled) +{ + *scrolled = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(*scrolled) + , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_WIDGET_SET_FLAGS(*scrolled, GTK_CAN_FOCUS); + GtkWidget* webView = webkit_web_view_new(); + gtk_container_add(GTK_CONTAINER(*scrolled), webView); + return webView; +} + +void webView_open(GtkWidget* webView, const gchar* uri) +{ + webkit_web_view_open(WEBKIT_WEB_VIEW(webView), (gchar*)uri); + // We need to check the browser first + // No browser means this is a panel + CBrowser* browser = get_browser_from_webView(webView); + if(browser) + { + xbel_bookmark_set_href(browser->sessionItem, uri); + xbel_item_set_title(browser->sessionItem, ""); + } +} + +void webView_close(GtkWidget* webView, CBrowser* browser) +{ + browser = get_browser_from_webView(webView); + const gchar* uri = xbel_bookmark_get_href(browser->sessionItem); + xbel_folder_remove_item(session, browser->sessionItem); + if(uri && *uri) + { + xbel_folder_prepend_item(tabtrash, browser->sessionItem); + guint n = xbel_folder_get_n_items(tabtrash); + if(n > 10) + { + XbelItem* item = xbel_folder_get_nth_item(tabtrash, n - 1); + xbel_folder_remove_item(tabtrash, item); + xbel_item_free(item); + } + } + else + xbel_item_free(browser->sessionItem); + gtk_widget_destroy(browser->webView_menu); + gtk_notebook_remove_page(GTK_NOTEBOOK(browser->webViews) + , get_webView_index(webView, browser)); + update_browser_actions(browser); +} diff --git a/src/webView.h b/src/webView.h new file mode 100644 index 00000000..15cde3ca --- /dev/null +++ b/src/webView.h @@ -0,0 +1,84 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __webView_H__ +#define __webView_H__ 1 + +#include +#include "browser.h" +#include "debug.h" + +#include + +WebKitNavigationResponse +on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame + , WebKitNetworkRequest* networkRequest); + +void +on_webView_location_changed(GtkWidget*, const gchar*, CBrowser*); + +void +on_webView_title_changed(GtkWidget*, const gchar*, const gchar*, CBrowser*); + +void +on_webView_icon_changed(GtkWidget*, WebKitWebFrame*, CBrowser*); + +void +on_webView_load_started(GtkWidget* , WebKitWebFrame*, CBrowser*); + +void +on_webView_load_changed(GtkWidget*, gint progress, CBrowser*); + +void +on_webView_load_finished(GtkWidget*, WebKitWebFrame*, CBrowser*); + +void +on_webView_status_message(GtkWidget*, const gchar*, CBrowser*); + +void +on_webView_selection_changed(GtkWidget*, CBrowser*); + +gboolean +on_webView_console_message(GtkWidget*, const gchar*, gint, const gchar*, CBrowser*); + +void +on_webView_link_hover(GtkWidget*, const gchar*, const gchar*, CBrowser*); + +/* +GtkWidget* +on_webView_window_open(GtkWidget*, const gchar*, CBrowser*); +*/ + +gboolean +on_webView_button_release(GtkWidget*, GdkEventButton*, CBrowser*); + +void +on_webView_popup(GtkWidget*, CBrowser*); + +gboolean +on_webView_scroll(GtkWidget*, GdkEventScroll*, CBrowser*); + +gboolean +on_webView_leave(GtkWidget*, GdkEventCrossing*, CBrowser*); + +void +on_webView_destroy(GtkWidget*, CBrowser*); + +GtkWidget* +webView_new(GtkWidget**); + +void +webView_open(GtkWidget*, const gchar*); + +void +webView_close(GtkWidget*, CBrowser*); + +#endif /* !__webView_H__ */ diff --git a/src/xbel.c b/src/xbel.c new file mode 100644 index 00000000..f788e4ca --- /dev/null +++ b/src/xbel.c @@ -0,0 +1,801 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +/** + * This is an implementation of XBEL based on Glib and libXML2. + * + * Design Goals: + * - XbelItem is the only opaque public data structure. + * - The interface should be intuitive and familiar to Glib users. + * - There should be no public exposure of libXML2 specific code. + * - Bookmarks should actually be easily exchangeable between programs. + * + * TODO: + * - Support info > metadata, alias, added, modified, visited + * - Compatibility: The Nokia 770 *requires* metadata and folder + * - Compatibility: Kazehakase's bookmarks + * - Compatibility: Epiphany's bookmarks + * - XML Indentation + * - Export and import to other formats + **/ + +#include "xbel.h" + +#include +#include +#include +#include + +// Private: Create a new item of a certain type +static XbelItem* xbel_item_new(XbelItemKind kind) +{ + XbelItem* item = g_new(XbelItem, 1); + item->parent = NULL; + item->kind = kind; + if(kind == XBEL_ITEM_FOLDER) + { + item->items = NULL; + item->folded = TRUE; + } + if(kind != XBEL_ITEM_SEPARATOR) + { + item->title = NULL; + item->desc = NULL; + } + if(kind == XBEL_ITEM_BOOKMARK) + item->href = g_strdup(""); + return item; +} + +/** + * xbel_bookmark_new: + * + * Create a new empty bookmark. + * + * Return value: a newly allocated bookmark + **/ +XbelItem* xbel_bookmark_new(void) +{ + return xbel_item_new(XBEL_ITEM_BOOKMARK); +} + +static XbelItem* xbel_bookmark_from_xmlNodePtr(xmlNodePtr cur) +{ + g_return_val_if_fail(cur != NULL, NULL); + XbelItem* bookmark = xbel_bookmark_new(); + xmlChar* key = xmlGetProp(cur, (xmlChar*)"href"); + xbel_bookmark_set_href(bookmark, (gchar*)key); + cur = cur->xmlChildrenNode; + while(cur != NULL) + { + if(!xmlStrcmp(cur->name, (const xmlChar*)"title")) + { + xmlChar* key = xmlNodeGetContent(cur); + bookmark->title = (gchar*)g_strstrip((gchar*)key); + } + else if(!xmlStrcmp(cur->name, (const xmlChar*)"desc")) + { + xmlChar* key = xmlNodeGetContent(cur); + bookmark->desc = (gchar*)g_strstrip((gchar*)key); + } + cur = cur->next; + } + return bookmark; +} + +/** + * xbel_separator_new: + * + * Create a new separator. + * + * The returned item must be freed eventually. + * + * Return value: a newly allocated separator. + **/ +XbelItem* xbel_separator_new(void) +{ + return xbel_item_new(XBEL_ITEM_SEPARATOR); +} + +/** + * xbel_folder_new: + * + * Create a new empty folder. + * + * The returned item must be freed eventually. + * + * Return value: a newly allocated folder. + **/ +XbelItem* xbel_folder_new(void) +{ + return xbel_item_new(XBEL_ITEM_FOLDER); +} + +// Private: Create a folder from an xmlNodePtr +static XbelItem* xbel_folder_from_xmlNodePtr(xmlNodePtr cur) +{ + g_return_val_if_fail(cur != NULL, NULL); + XbelItem* folder = xbel_folder_new(); + xmlChar* key = xmlGetProp(cur, (xmlChar*)"folded"); + if(key) + { + if(!g_ascii_strncasecmp((gchar*)key, "yes", 3)) + folder->folded = TRUE; + else if(!g_ascii_strncasecmp((gchar*)key, "no", 2)) + folder->folded = FALSE; + else + g_warning("XBEL: Unknown value for folded."); + xmlFree(key); + } + cur = cur->xmlChildrenNode; + while(cur) + { + if(!xmlStrcmp(cur->name, (const xmlChar*)"title")) + { + xmlChar* key = xmlNodeGetContent(cur); + folder->title = (gchar*)g_strstrip((gchar*)key); + } + else if(!xmlStrcmp(cur->name, (const xmlChar*)"desc")) + { + xmlChar* key = xmlNodeGetContent(cur); + folder->desc = (gchar*)g_strstrip((gchar*)key); + } + else if(!xmlStrcmp(cur->name, (const xmlChar*)"folder")) + { + XbelItem* item = xbel_folder_from_xmlNodePtr(cur); + item->parent = (struct XbelItem*)folder; + folder->items = g_list_prepend(folder->items, item); + } + else if(!xmlStrcmp(cur->name, (const xmlChar*)"bookmark")) + { + XbelItem* item = xbel_bookmark_from_xmlNodePtr(cur); + item->parent = (struct XbelItem*)folder; + folder->items = g_list_prepend(folder->items, item); + } + else if(!xmlStrcmp(cur->name, (const xmlChar*)"separator")) + { + XbelItem* item = xbel_separator_new(); + item->parent = (struct XbelItem*)folder; + folder->items = g_list_prepend(folder->items, item); + } + cur = cur->next; + } + // Prepending and reversing is faster than appending + folder->items = g_list_reverse(folder->items); + return folder; +} + +// Private: Loads the contents from an xmlNodePtr into a folder. +static gboolean xbel_folder_from_xmlDocPtr(XbelItem* folder, xmlDocPtr doc) +{ + g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); + g_return_val_if_fail(doc != NULL, FALSE); + xmlNodePtr cur = xmlDocGetRootElement(doc); + xmlChar* version = xmlGetProp(cur, (xmlChar*)"version"); + if(xmlStrcmp(version, (xmlChar*)"1.0")) + g_warning("XBEL version is not 1.0."); + xmlFree(version); + folder->title = (gchar*)xmlGetProp(cur, (xmlChar*)"title"); + folder->desc = (gchar*)xmlGetProp(cur, (xmlChar*)"desc"); + if((cur = xmlDocGetRootElement(doc)) == NULL) + { + // Empty document + return FALSE; + } + if(xmlStrcmp(cur->name, (const xmlChar*)"xbel")) + { + // Wrong document kind + return FALSE; + } + cur = cur->xmlChildrenNode; + while(cur != NULL) + { + XbelItem* item = NULL; + if(!xmlStrcmp(cur->name, (const xmlChar*)"folder")) + item = xbel_folder_from_xmlNodePtr(cur); + else if(!xmlStrcmp(cur->name, (const xmlChar*)"bookmark")) + item = xbel_bookmark_from_xmlNodePtr(cur); + else if(!xmlStrcmp(cur->name, (const xmlChar*)"separator")) + item = xbel_separator_new(); + /*else if(!xmlStrcmp(cur->name, (const xmlChar*)"info")) + item = xbel_parse_info(xbel, cur);*/ + if(item != NULL) + { + item->parent = (struct XbelItem*)folder; + folder->items = g_list_prepend(folder->items, item); + } + cur = cur->next; + } + // Prepending and reversing is faster than appending + folder->items = g_list_reverse(folder->items); + return TRUE; +} + +/** + * xbel_item_free: + * @item: a valid item + * + * Free an XbelItem. If @item is a folder all of its children will also + * be freed automatically. + * + * The item must not be contained in a folder or attempting to free it will fail. + **/ +void xbel_item_free(XbelItem* item) +{ + g_return_if_fail(item); + g_return_if_fail(!xbel_item_get_parent(item)); + if(xbel_item_is_folder(item)) + { + guint n = xbel_folder_get_n_items(item); + guint i; + for(i = 0; i < n; i++) + { + XbelItem* _item = xbel_folder_get_nth_item(item, i); + _item->parent = NULL; + xbel_item_free(_item); + } + g_list_free(item->items); + } + if(item->kind != XBEL_ITEM_SEPARATOR) + { + g_free(item->title); + g_free(item->desc); + } + if(item->kind == XBEL_ITEM_BOOKMARK) + g_free(item->href); + g_free(item); +} + +/** + * xbel_item_copy: + * @item: the item to copy + * + * Copy an XbelItem. + * + * The returned item must be freed eventually. + * + * Return value: a copy of @item + **/ +XbelItem* xbel_item_copy(XbelItem* item) +{ + g_return_val_if_fail(item, NULL); + XbelItem* copy = xbel_folder_new(); + if(xbel_item_is_folder(item)) + { + guint n = xbel_folder_get_n_items(item); + guint i; + for(i = 0; i < n; i++) + { + XbelItem* _item = xbel_folder_get_nth_item(item, i); + xbel_folder_append_item(copy, xbel_item_copy(_item)); + } + } + if(item->kind != XBEL_ITEM_SEPARATOR) + { + xbel_item_set_title(copy, item->title); + xbel_item_set_desc(copy, item->desc); + } + if(item->kind == XBEL_ITEM_BOOKMARK) + xbel_bookmark_set_href(copy, item->href); + return copy; +} + +GType xbel_item_get_type() +{ + static GType type = 0; + if(!type) + type = g_pointer_type_register_static("xbel_item"); + return type; +} + +/** + * xbel_folder_append_item: + * @folder: a folder + * @item: the item to append + * + * Append the given item to a folder. + * + * The item is actually moved and must not be contained in another folder. + * + **/ +void xbel_folder_append_item(XbelItem* folder, XbelItem* item) +{ + g_return_if_fail(!xbel_item_get_parent(item)); + g_return_if_fail(xbel_item_is_folder(folder)); + item->parent = (struct XbelItem*)folder; + folder->items = g_list_append(folder->items, item); +} + +/** + * xbel_folder_prepend_item: + * @folder: a folder + * @item: the item to prepend + * + * Prepend the given item to a folder. + * + * The item is actually moved and must not be contained in another folder. + * + **/ +void xbel_folder_prepend_item(XbelItem* folder, XbelItem* item) +{ + g_return_if_fail(!xbel_item_get_parent(item)); + g_return_if_fail(xbel_item_is_folder(folder)); + item->parent = (struct XbelItem*)folder; + folder->items = g_list_prepend(folder->items, item); +} + +/** + * xbel_folder_remove_item: + * @folder: a folder + * @item: the item to remove + * + * Remove the given @item from a @folder. + **/ +void xbel_folder_remove_item(XbelItem* folder, XbelItem* item) +{ + g_return_if_fail(item); + g_return_if_fail(xbel_item_get_parent(folder) != item); + item->parent = NULL; + // Fortunately we know that items are unique + folder->items = g_list_remove(folder->items, item); +} + +/** + * xbel_folder_get_n_items: + * @folder: a folder + * + * Retrieve the number of items contained in the given @folder. + * + * Return value: number of items + **/ +guint xbel_folder_get_n_items(XbelItem* folder) +{ + g_return_val_if_fail(xbel_item_is_folder(folder), 0); + return g_list_length(folder->items); +} + +/** + * xbel_folder_get_nth_item: + * @folder: a folder + * @n: the index of an item + * + * Retrieve an item contained in the given @folder by its index. + * + * Return value: the item at the given index or %NULL + **/ +XbelItem* xbel_folder_get_nth_item(XbelItem* folder, guint n) +{ + g_return_val_if_fail(xbel_item_is_folder(folder), NULL); + return (XbelItem*)g_list_nth_data(folder->items, n); +} + +/** + * xbel_folder_is_empty: + * @folder: A folder. + * + * Determines wether or not a folder contains no items. This is significantly + * faster than xbel_folder_get_n_items for this particular purpose. + * + * Return value: Wether the given @folder is folded. + **/ +gboolean xbel_folder_is_empty(XbelItem* folder) +{ + return !xbel_folder_get_nth_item(folder, 0); +} + +/** + * xbel_folder_get_folded: + * @folder: A folder. + * + * Determines wether or not a folder is folded. If a folder is not folded + * it should not be exposed in a user interface. + * + * New folders are folded by default. + * + * Return value: Wether the given @folder is folded. + **/ +gboolean xbel_folder_get_folded(XbelItem* folder) +{ + g_return_val_if_fail(xbel_item_is_folder(folder), TRUE); + return folder->folded; +} + +/** + * xbel_item_get_kind: + * @item: A item. + * + * Determines the kind of an item. + * + * Return value: The kind of the given @item. + **/ +XbelItemKind xbel_item_get_kind(XbelItem* item) +{ + return item->kind; +} + +/** + * xbel_item_get_parent: + * @item: A valid item. + * + * Retrieves the parent folder of an item. + * + * Return value: The parent folder of the given @item or %NULL. + **/ +XbelItem* xbel_item_get_parent(XbelItem* item) +{ + g_return_val_if_fail(item, NULL); + return (XbelItem*)item->parent; +} + +/** + * xbel_item_get_title: + * @item: A valid item. + * + * Retrieves the title of an item. + * + * Return value: The title of the given @item or %NULL. + **/ +G_CONST_RETURN gchar* xbel_item_get_title(XbelItem* item) +{ + g_return_val_if_fail(!xbel_item_is_separator(item), NULL); + return item->title; +} + +/** + * xbel_item_get_desc: + * @item: A valid item. + * + * Retrieves the description of an item. + * + * Return value: The description of the @item or %NULL. + **/ +G_CONST_RETURN gchar* xbel_item_get_desc(XbelItem* item) +{ + g_return_val_if_fail(!xbel_item_is_separator(item), NULL); + return item->desc; +} + +/** + * xbel_bookmark_get_href: + * @bookmark: A bookmark. + * + * Retrieves the uri of a bookmark. The value is guaranteed to not be %NULL. + * + * Return value: The uri of the @bookmark. + **/ +G_CONST_RETURN gchar* xbel_bookmark_get_href(XbelItem* bookmark) +{ + g_return_val_if_fail(xbel_item_is_bookmark(bookmark), NULL); + return bookmark->href; +} + +/** + * xbel_item_is_bookmark: + * @item: A valid item. + * + * Determines wether or not an item is a bookmark. + * + * Return value: %TRUE if the @item is a bookmark. + **/ +gboolean xbel_item_is_bookmark(XbelItem* item) +{ + g_return_val_if_fail(item, FALSE); + return item->kind == XBEL_ITEM_BOOKMARK; +} + +/** + * xbel_item_is_separator: + * @item: A valid item. + * + * Determines wether or not an item is a separator. + * + * Return value: %TRUE if the @item is a separator. + **/ +gboolean xbel_item_is_separator(XbelItem* item) +{ + g_return_val_if_fail(item, FALSE); + return item->kind == XBEL_ITEM_SEPARATOR; +} + +/** + * xbel_item_is_folder: + * @item: A valid item. + * + * Determines wether or not an item is a folder. + * + * Return value: %TRUE if the item is a folder. + **/ +gboolean xbel_item_is_folder(XbelItem* item) +{ + g_return_val_if_fail(item, FALSE); + return item->kind == XBEL_ITEM_FOLDER; +} + +/** + * xbel_folder_set_folded: + * @folder: A folder. + * @folded: TRUE if the folder is folded. + * + * Sets the foldedness of the @folder. + **/ +void xbel_folder_set_folded(XbelItem* folder, gboolean folded) +{ + g_return_if_fail(xbel_item_is_folder(folder)); + folder->folded = folded; +} + +/** + * xbel_item_set_title: + * @item: A valid item. + * @title: A string to use for the title. + * + * Sets the title of the @item. + **/ +void xbel_item_set_title(XbelItem* item, const gchar* title) +{ + g_return_if_fail(!xbel_item_is_separator(item)); + g_free(item->title); + item->title = g_strdup(title); +} + +/** + * xbel_item_set_desc: + * @item: A valid item. + * @title: A string to use for the description. + * + * Sets the description of the @item. + **/ +void xbel_item_set_desc(XbelItem* item, const gchar* desc) +{ + g_return_if_fail(!xbel_item_is_separator(item)); + g_free(item->desc); + item->desc = g_strdup(desc); +} + +/** + * xbel_bookmark_set_href: + * @bookmark: A bookmark. + * @href: A string containing a valid uri. + * + * Sets the uri of the bookmark. + * + * The uri must not be %NULL. + * + * This uri is not currently validated in any way. This may change in the future. + **/ +void xbel_bookmark_set_href(XbelItem* bookmark, const gchar* href) +{ + g_return_if_fail(xbel_item_is_bookmark(bookmark)); + g_return_if_fail(href); + g_free(bookmark->href); + bookmark->href = g_strdup(href); +} + +gboolean xbel_folder_from_data(XbelItem* folder, const gchar* data, GError** error) +{ + g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); + g_return_val_if_fail(data, FALSE); + xmlDocPtr doc; + if((doc = xmlParseMemory(data, strlen(data))) == NULL) + { + // No valid xml or broken encoding + *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ + , "Malformed document."); + return FALSE; + } + if(!xbel_folder_from_xmlDocPtr(folder, doc)) + { + // Parsing failed + xmlFreeDoc(doc); + *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ + , "Malformed document."); + return FALSE; + } + xmlFreeDoc(doc); + return TRUE; +} + +/** + * xbel_folder_from_file: + * @folder: An empty folder. + * @file: A relative path to a file. + * @error: return location for a GError or %NULL + * + * Tries to load @file. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gboolean xbel_folder_from_file(XbelItem* folder, const gchar* file, GError** error) +{ + g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); + g_return_val_if_fail(file, FALSE); + if(!g_file_test(file, G_FILE_TEST_EXISTS)) + { + // File doesn't exist + *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_NOENT + , "File not found."); + return FALSE; + } + xmlDocPtr doc; + if((doc = xmlParseFile(file)) == NULL) + { + // No valid xml or broken encoding + *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ + , "Malformed document."); + return FALSE; + } + if(!xbel_folder_from_xmlDocPtr(folder, doc)) + { + // Parsing failed + xmlFreeDoc(doc); + *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ + , "Malformed document."); + return FALSE; + } + xmlFreeDoc(doc); + return TRUE; +} + +/** + * xbel_folder_from_data_dirs: + * @folder: An empty folder. + * @file: A relative path to a file. + * @full_path: return location for the full path of the file or %NULL + * @error: return location for a GError or %NULL + * + * Tries to load @file from the user data dir or any of the system data dirs. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gboolean xbel_folder_from_data_dirs(XbelItem* folder, const gchar* file + , gchar** full_path, GError** error) +{ + g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); + g_return_val_if_fail(file, FALSE); + // FIXME: Essentially unimplemented + + *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ + , "Malformed document."); + return FALSE; +} + +static gchar* xbel_xml_element(const gchar* name, const gchar* value) +{ + if(!value) + return g_strdup(""); + gchar* valueEscaped = g_markup_escape_text(value, -1); + gchar* XML = g_strdup_printf("<%s>%s\n", name, valueEscaped, name); + g_free(valueEscaped); + return XML; +} + +static gchar* xbel_item_to_data(XbelItem* item) +{ + g_return_val_if_fail(item, NULL); + gchar* XML = NULL; + switch(xbel_item_get_kind(item)) + { + case XBEL_ITEM_FOLDER: + { + GString* _XML = g_string_new(NULL); + guint n = xbel_folder_get_n_items(item); + guint i; + for(i = 0; i < n; i++) + { + XbelItem* _item = xbel_folder_get_nth_item(item, i); + gchar* itemXML = xbel_item_to_data(_item); + g_string_append(_XML, itemXML); + g_free(itemXML); + } + gchar* folded = item->folded ? NULL : g_strdup_printf(" folded=\"no\""); + gchar* title = xbel_xml_element("title", item->title); + gchar* desc = xbel_xml_element("desc", item->desc); + XML = g_strdup_printf("\n%s%s%s\n" + , folded ? folded : "" + , title + , desc + , g_string_free(_XML, FALSE)); + g_free(folded); + g_free(title); + g_free(desc); + break; + } + case XBEL_ITEM_BOOKMARK: + { + gchar* hrefEscaped = g_markup_escape_text(item->href, -1); + gchar* href = g_strdup_printf(" href=\"%s\"", hrefEscaped); + g_free(hrefEscaped); + gchar* title = xbel_xml_element("title", item->title); + gchar* desc = xbel_xml_element("desc", item->desc); + XML = g_strdup_printf("\n%s%s%s\n" + , href + , title + , desc + , ""); + g_free(href); + g_free(title); + g_free(desc); + break; + } + case XBEL_ITEM_SEPARATOR: + XML = g_strdup("\n"); + break; + default: + g_warning("XBEL: Unknown item kind"); + } + return XML; +} + +/** + * xbel_folder_to_data: + * @folder: A folder. + * @length: return location for the length of the created string or %NULL + * @error: return location for a GError or %NULL + * + * Retrieve the contents of @folder as a string. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gchar* xbel_folder_to_data(XbelItem* folder, gsize* length, GError** error) +{ + g_return_val_if_fail(xbel_item_is_folder(folder), FALSE); + // FIXME: length is never filled + GString* innerXML = g_string_new(NULL); + guint n = xbel_folder_get_n_items(folder); + guint i; + for(i = 0; i < n; i++) + { + gchar* sItem = xbel_item_to_data(xbel_folder_get_nth_item(folder, i)); + g_string_append(innerXML, sItem); + g_free(sItem); + } + gchar* title = xbel_xml_element("title", folder->title); + gchar* desc = xbel_xml_element("desc", folder->desc); + gchar* outerXML; + outerXML = g_strdup_printf("%s%s\n%s%s%s\n" + , "\n" + , "\n" + , title + , desc + , g_string_free(innerXML, FALSE)); + g_free(title); + g_free(desc); + return outerXML; +} + +/** + * xbel_folder_to_file: + * @folder: A folder. + * @file: The destination filename. + * @error: return location for a GError or %NULL + * + * Write the contents of @folder to the specified file, creating it if necessary. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gboolean xbel_folder_to_file(XbelItem* folder, const gchar* file, GError** error) +{ + g_return_val_if_fail(file, FALSE); + gchar* data; + if(!(data = xbel_folder_to_data(folder, NULL, error))) + return FALSE; + FILE* fp; + if(!(fp = fopen(file, "w"))) + { + *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_ACCES + , "Writing failed."); + return FALSE; + } + fputs(data, fp); + fclose(fp); + g_free(data); + return TRUE; +} diff --git a/src/xbel.h b/src/xbel.h new file mode 100644 index 00000000..cf593ea0 --- /dev/null +++ b/src/xbel.h @@ -0,0 +1,154 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __XBEL_H__ +#define __XBEL_H__ 1 + +#include +#include + +#define XBEL_ERROR g_quark_from_string("XBEL_ERROR") + +typedef enum +{ + XBEL_ERROR_INVALID_URI, /* Malformed uri */ + XBEL_ERROR_INVALID_VALUE, /* Requested field not found */ + XBEL_ERROR_URI_NOT_FOUND, /* Requested uri not found */ + XBEL_ERROR_READ, /* Malformed document */ + XBEL_ERROR_UNKNOWN_ENCODING, /* Parsed text was in an unknown encoding */ + XBEL_ERROR_WRITE, /* Writing failed. */ +} XBELError; + +typedef enum +{ + XBEL_ITEM_FOLDER, + XBEL_ITEM_BOOKMARK, + XBEL_ITEM_SEPARATOR +} XbelItemKind; + +// Note: This structure is entirely private. +typedef struct +{ + XbelItemKind kind; + struct XbelItem* parent; + + GList* items; // folder + gboolean folded; // foolder + gchar* title; // !separator + gchar* desc; // folder and bookmark + gchar* href; // bookmark + //time_t added; // !separator + //time_t modfied; // bookmark + //time_t visited; // bookmark +} XbelItem; + +XbelItem* +xbel_bookmark_new(void); + +XbelItem* +xbel_separator_new(void); + +XbelItem* +xbel_folder_new(void); + +void +xbel_item_free(XbelItem*); + +XbelItem* +xbel_item_copy(XbelItem*); + +GType +xbel_item_get_type(); + +#define G_TYPE_XBEL_ITEM xbel_item_get_type() + +void +xbel_folder_append_item(XbelItem*, XbelItem*); + +void +xbel_folder_prepend_item(XbelItem*, XbelItem*); + +void +xbel_folder_remove_item(XbelItem*, XbelItem*); + +guint +xbel_folder_get_n_items(XbelItem*); + +XbelItem* +xbel_folder_get_nth_item(XbelItem*, guint); + +gboolean +xbel_folder_is_empty(XbelItem*); + +gboolean +xbel_folder_get_folded(XbelItem*); + +XbelItemKind +xbel_item_get_kind(XbelItem*); + +XbelItem* +xbel_item_get_parent(XbelItem*); + +G_CONST_RETURN gchar* +xbel_item_get_title(XbelItem*); + +G_CONST_RETURN gchar* +xbel_item_get_desc(XbelItem*); + +G_CONST_RETURN gchar* +xbel_bookmark_get_href(XbelItem*); + +/*time_t +xbel_bookmark_get_added(XbelItem*); + +time_t +xbel_bookmark_get_modified(XbelItem*); + +time_t +xbel_bookmark_get_visited(XbelItem*);*/ + +gboolean +xbel_item_is_bookmark(XbelItem*); + +gboolean +xbel_item_is_separator(XbelItem*); + +gboolean +xbel_item_is_folder(XbelItem*); + +void +xbel_folder_set_folded(XbelItem*, gboolean); + +void +xbel_item_set_title(XbelItem*, const gchar*); + +void +xbel_item_set_desc(XbelItem*, const gchar*); + +void +xbel_bookmark_set_href(XbelItem*, const gchar*); + +gboolean +xbel_folder_from_data(XbelItem*, const gchar*, GError**); + +gboolean +xbel_folder_from_file(XbelItem*, const gchar*, GError**); + +gboolean +xbel_folder_from_data_dirs(XbelItem*, const gchar*, gchar**, GError**); + +gchar* +xbel_folder_to_data(XbelItem*, gsize*, GError**); + +gboolean +xbel_folder_to_file(XbelItem*, const gchar*, GError**); + +#endif /* !__XBEL_H__ */ From fb00d180ade114a20168259802dc92df96e58d67 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 17 Dec 2007 13:12:38 +0100 Subject: [PATCH 0002/2970] Build fix: Remove search api Remove the search api that is not in upstream WebKit --- src/browser.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/browser.c b/src/browser.c index c2c4e05c..2f2fec3d 100644 --- a/src/browser.c +++ b/src/browser.c @@ -125,7 +125,7 @@ void on_action_find_activate(GtkAction* action, CBrowser* browser) void on_action_find_next_activate(GtkAction* action, CBrowser* browser) { - if(!GTK_WIDGET_VISIBLE(browser->findbox)) + /*if(!GTK_WIDGET_VISIBLE(browser->findbox)) ; // FIXME: What if the findbox is hidden? const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); const gboolean caseSensitive = gtk_toggle_tool_button_get_active( @@ -142,12 +142,12 @@ void on_action_find_next_activate(GtkAction* action, CBrowser* browser) webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); const gboolean highlight = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight);*/ } void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) { - if(!GTK_WIDGET_VISIBLE(browser->findbox)) + /*if(!GTK_WIDGET_VISIBLE(browser->findbox)) ; // FIXME: What if the findbox is hidden? const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); const gboolean caseSensitive = gtk_toggle_tool_button_get_active( @@ -164,14 +164,14 @@ void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); const gboolean highlight = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight);*/ } void on_findbox_highlight_toggled(GtkToggleToolButton* toolitem, CBrowser* browser) { - GtkWidget* webView = get_nth_webView(-1, browser); + /*GtkWidget* webView = get_nth_webView(-1, browser); const gboolean highlight = gtk_toggle_tool_button_get_active(toolitem); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight);*/ } void on_action_preferences_activate(GtkAction* action, CBrowser* browser) From 118baa716ee4d2bec3b51c1c17686e23c07f8463 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 17 Dec 2007 13:30:45 +0100 Subject: [PATCH 0003/2970] Bump version to 0.0.15 --- ChangeLog | 3 +++ configure.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5e591148..99e275cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +v0.0.15: + + Build fix: Remove search api + v0.0.14: + FIX Reopening a tab from the trash causes a crash + FIX An untitled website keeps the previous title diff --git a/configure.in b/configure.in index e88f0a5d..15bece5c 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.14], [christian@twotoasts.de]) +AC_INIT([midori], [0.0.15], [christian@twotoasts.de]) AC_CONFIG_SRCDIR([src/main.h]) AC_CONFIG_HEADER([config.h]) From 6994580e28d85358a6f4c5f9209e78c75b709d8c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 19 Dec 2007 02:49:23 +0100 Subject: [PATCH 0004/2970] Add Tab Size to preferences dialog --- src/browser.c | 1 - src/conf.h | 1 - src/prefs.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/browser.c b/src/browser.c index 2f2fec3d..b71ab378 100644 --- a/src/browser.c +++ b/src/browser.c @@ -1296,7 +1296,6 @@ CBrowser* browser_new(CBrowser* oldBrowser) browser->webView_name = gtk_label_new(xbel_item_get_title(browser->sessionItem)); gtk_misc_set_alignment(GTK_MISC(browser->webView_name), 0.0, 0.5); // TODO: make the tab initially look "unvisited" until it's focused - // TODO: tabs should shrink when there is not enough space // TODO: gtk's tab scrolling is weird? gint w, h; sokoke_widget_get_text_size(browser->webView_name, "M", &w, &h); diff --git a/src/conf.h b/src/conf.h index 059695be..ef414991 100644 --- a/src/conf.h +++ b/src/conf.h @@ -28,7 +28,6 @@ typedef struct _CConfig gboolean panelShow; guint panelActive; gchar* panelPageholder; - // TODO: What about this? Support it or fix tab shrinking and drop it? guint tabSize; // tab size in charcters gboolean tabClose; gboolean toolbarWebSearch; diff --git a/src/prefs.c b/src/prefs.c index c2b1a5eb..ce557c90 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -99,7 +99,7 @@ static void on_prefs_toolbarSmall_toggled(GtkWidget* widget, CPrefs* prefs) , config_to_toolbariconsize(config->toolbarSmall)); } -static void on_prefs_closeButtonsOnTabs_toggled(GtkWidget* widget, CPrefs* prefs) +static void on_prefs_tabClose_toggled(GtkWidget* widget, CPrefs* prefs) { config->tabClose = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); GList* items = browsers; @@ -112,6 +112,22 @@ static void on_prefs_closeButtonsOnTabs_toggled(GtkWidget* widget, CPrefs* prefs g_list_free(items); } +static void on_prefs_tabSize_changed(GtkWidget* widget, CPrefs* prefs) +{ + config->tabSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); + gint w, h; + sokoke_widget_get_text_size(prefs->browser->webView_name, "M", &w, &h); + GList* items = browsers; + do + { + CBrowser* browser = (CBrowser*)items->data; + gtk_widget_set_size_request(GTK_WIDGET(browser->webView_name) + , w * config->tabSize, -1); + } + while((items = g_list_next(items))); + g_list_free(items); +} + static void on_prefs_toolbarWebSearch_toggled(GtkWidget* widget, CPrefs* prefs) { config->toolbarWebSearch = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -487,8 +503,17 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) ("Show close _buttons on tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_closeButtonsOnTabs_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 2, 0, 1); + , G_CALLBACK(on_prefs_tabClose_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 0, 1); + hbox = gtk_hbox_new(FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox) + , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 0); + spinbutton = gtk_spin_button_new_with_range(0, 36, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize); + g_signal_connect(spinbutton, "changed" + , G_CALLBACK(on_prefs_tabSize_changed), prefs); + gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); + FILLED_ADD(hbox, 1, 2, 0, 1); INDENTED_ADD(gtk_label_new_with_mnemonic("Tabbar _placement"), 0, 1, 1, 2); combobox = gtk_combo_box_new_text(); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) From 5928f8ad88ae98416b7f416cbdf9237b12c3f562 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 19 Dec 2007 22:37:00 +0100 Subject: [PATCH 0005/2970] Build fix: Adapt WebKit api changes --- src/browser.c | 5 +++-- src/webView.c | 43 ++++++++++++++++++++++--------------------- src/webView.h | 8 ++++---- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/browser.c b/src/browser.c index b71ab378..6640cce9 100644 --- a/src/browser.c +++ b/src/browser.c @@ -682,7 +682,7 @@ gboolean on_location_key_down(GtkWidget* widget, GdkEventKey* event, CBrowser* b { GtkWidget* webView = get_nth_webView(-1, browser); WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); - const gchar* uri = webkit_web_frame_get_location(frame); + const gchar* uri = webkit_web_frame_get_uri(frame); if(uri && *uri) gtk_entry_set_text(GTK_ENTRY(widget), uri); return TRUE; @@ -735,7 +735,7 @@ void on_action_openInPanel_activate(GtkAction* action, CBrowser* browser) GtkWidget* webView = get_nth_webView(-1, browser); g_free(config->panelPageholder); WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); - const gchar* uri = webkit_web_frame_get_location(frame); + const gchar* uri = webkit_web_frame_get_uri(frame); config->panelPageholder = g_strdup(uri); GtkAction* action_pageholder = gtk_action_group_get_action(browser->actiongroup, "PanelPageholder"); @@ -1342,6 +1342,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) DOC_CONNECT ("title-changed" , on_webView_title_changed) DOC_CONNECT ("icon-loaded" , on_webView_icon_changed) DOC_CONNECT ("load-started" , on_webView_load_started) + DOC_CONNECT ("load-committed" , on_webView_load_committed) DOC_CONNECT ("load-progress-changed" , on_webView_load_changed) DOC_CONNECT ("load-finished" , on_webView_load_finished) DOC_CONNECT ("status-bar-text-changed" , on_webView_status_message) diff --git a/src/webView.c b/src/webView.c index a9bbee90..4f0f9583 100644 --- a/src/webView.c +++ b/src/webView.c @@ -31,28 +31,14 @@ WebKitNavigationResponse on_webView_navigation_requested(GtkWidget* webView return response; } -void on_webView_location_changed(GtkWidget* webView, const gchar* uri -, CBrowser* browser) +void on_webView_title_changed(GtkWidget* webView, WebKitWebFrame* frame + , const gchar* title, CBrowser* browser) { - gchar* newUri = g_strdup(uri ? uri : ""); - xbel_bookmark_set_href(browser->sessionItem, newUri); - if(webView == get_nth_webView(-1, browser)) - { - gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); - gtk_label_set_text(GTK_LABEL(browser->webView_name), newUri); - update_status_message(NULL, browser); - update_gui_state(browser); - } -} - -void on_webView_title_changed(GtkWidget* webView, const gchar* title - , const gchar* uri, CBrowser* browser) -{ - // TODO: We emulate location_changed here for now - // Shouldn't we have separated title_changed and location_changed signals? - on_webView_location_changed(webView, uri, browser); - gchar* newTitle; - newTitle = g_strdup(title ? title : uri); + const gchar* newTitle; + if(title) + newTitle = title; + else + newTitle = webkit_web_frame_get_uri(frame); xbel_item_set_title(browser->sessionItem, newTitle); gtk_label_set_text(GTK_LABEL(browser->webView_name), newTitle); sokoke_widget_set_tooltip_text(gtk_widget_get_parent( @@ -101,6 +87,21 @@ void on_webView_load_started(GtkWidget* webView, WebKitWebFrame* widget gtk_widget_show(browser->progress); } +void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame + , CBrowser* browser) +{ + const gchar* uri = webkit_web_frame_get_uri(frame); + gchar* newUri = g_strdup(uri ? uri : ""); + xbel_bookmark_set_href(browser->sessionItem, newUri); + if(webView == get_nth_webView(-1, browser)) + { + gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); + gtk_label_set_text(GTK_LABEL(browser->webView_name), newUri); + update_status_message(NULL, browser); + update_gui_state(browser); + } +} + void on_webView_load_changed(GtkWidget* webView, gint progress, CBrowser* browser) { browser->loadedBytes = progress; diff --git a/src/webView.h b/src/webView.h index 15cde3ca..0bac16f5 100644 --- a/src/webView.h +++ b/src/webView.h @@ -23,10 +23,7 @@ on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame , WebKitNetworkRequest* networkRequest); void -on_webView_location_changed(GtkWidget*, const gchar*, CBrowser*); - -void -on_webView_title_changed(GtkWidget*, const gchar*, const gchar*, CBrowser*); +on_webView_title_changed(GtkWidget*, WebKitWebFrame*, const gchar*, CBrowser*); void on_webView_icon_changed(GtkWidget*, WebKitWebFrame*, CBrowser*); @@ -34,6 +31,9 @@ on_webView_icon_changed(GtkWidget*, WebKitWebFrame*, CBrowser*); void on_webView_load_started(GtkWidget* , WebKitWebFrame*, CBrowser*); +void +on_webView_load_committed(GtkWidget* , WebKitWebFrame*, CBrowser*); + void on_webView_load_changed(GtkWidget*, gint progress, CBrowser*); From dcb8b2b8d154fc7d0cd4d74e40a0c93dc498a71f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 Dec 2007 02:07:22 +0100 Subject: [PATCH 0006/2970] Make the progressbar work properly again The code was not updated along with other changes in the past. It was cleaned up to work properly again, particularly the percentage is displayed in text form again. --- src/browser.h | 2 -- src/helpers.c | 36 ++++++++++-------------------------- src/webView.c | 5 +---- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/browser.h b/src/browser.h index 161ddc8f..0d08b352 100644 --- a/src/browser.h +++ b/src/browser.h @@ -68,8 +68,6 @@ typedef struct _CBrowser gboolean hasStatusbar; gchar* elementUri; // the element the mouse is hovering on gint loadedPercent; // -1 means "not loading" - gint loadedBytes; - gint loadedBytesMax; //UNDEFINED favicon; guint security; gchar* statusMessage; // message from a webView diff --git a/src/helpers.c b/src/helpers.c index 6f7b912b..0e895b96 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -318,18 +318,12 @@ void update_statusbar_text(CBrowser* browser) gtk_statusbar_push(GTK_STATUSBAR(browser->statusbar), 1 , browser->statusMessage); } - else + sokoke_widget_set_visible(browser->progress, browser->loadedPercent > -1); + if(browser->loadedPercent > -1) { - gchar* message; - if(browser->loadedPercent) - message = g_strdup_printf("%d%% loaded, %d/%d bytes" - , browser->loadedPercent, browser->loadedBytes, browser->loadedBytesMax); - else if(browser->loadedBytes) - message = g_strdup_printf("%d bytes", browser->loadedBytes); - else - message = g_strdup(" "); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(browser->progress), message); - g_free(message); + gchar* message = g_strdup_printf("%d%% loaded", browser->loadedPercent); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(browser->progress), message); + g_free(message); } } @@ -388,22 +382,12 @@ void update_gui_state(CBrowser* browser) gtk_image_set_from_stock(GTK_IMAGE(browser->location_icon), GTK_STOCK_FILE , GTK_ICON_SIZE_MENU); - if(browser->loadedBytesMax < 1) // Skip null and negative values - { - gtk_progress_bar_pulse(GTK_PROGRESS_BAR(browser->progress)); - update_statusbar_text(browser); - } + if(browser->loadedPercent > -1) + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress) + , browser->loadedPercent ? browser->loadedPercent / 100.0 : 0); else - { - if(browser->loadedBytes > browser->loadedBytesMax) - browser->loadedPercent = 100; - else - browser->loadedPercent - = (browser->loadedBytes * 100) / browser->loadedBytesMax; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress) - , browser->loadedPercent / 100.0); - update_statusbar_text(browser); - } + gtk_progress_bar_pulse(GTK_PROGRESS_BAR(browser->progress)); + update_statusbar_text(browser); } void update_feeds(CBrowser* browser) diff --git a/src/webView.c b/src/webView.c index 4f0f9583..cfc2bb44 100644 --- a/src/webView.c +++ b/src/webView.c @@ -77,8 +77,6 @@ void on_webView_load_started(GtkWidget* webView, WebKitWebFrame* widget , CBrowser* browser) { browser->loadedPercent = 0; - browser->loadedBytes = 0; - browser->loadedBytesMax = 0; update_favicon(browser); if(webView == get_nth_webView(-1, browser)) update_gui_state(browser); @@ -104,8 +102,7 @@ void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame void on_webView_load_changed(GtkWidget* webView, gint progress, CBrowser* browser) { - browser->loadedBytes = progress; - browser->loadedBytes = 100; + browser->loadedPercent = progress; if(webView == get_nth_webView(-1, browser)) update_gui_state(browser); } From cd1dce0e83bfe8f5135c38eae781b2b763dc014d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 Dec 2007 13:53:34 +0100 Subject: [PATCH 0007/2970] Enable inline find for websites The text search and highlight api is now available in WebKit. Therefore inline find for websites is enabled. --- src/browser.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/browser.c b/src/browser.c index 6640cce9..a090af5e 100644 --- a/src/browser.c +++ b/src/browser.c @@ -112,7 +112,14 @@ void on_action_selectAll_activate(GtkAction* action, CBrowser* browser) void on_action_find_activate(GtkAction* action, CBrowser* browser) { if(GTK_WIDGET_VISIBLE(browser->findbox)) + { + GtkWidget* webView = get_nth_webView(-1, browser); + webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); + gtk_entry_set_text(GTK_ENTRY(browser->findbox_text), ""); + gtk_toggle_tool_button_set_active( + GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight), FALSE); gtk_widget_hide(browser->findbox); + } else { GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); @@ -125,15 +132,15 @@ void on_action_find_activate(GtkAction* action, CBrowser* browser) void on_action_find_next_activate(GtkAction* action, CBrowser* browser) { - /*if(!GTK_WIDGET_VISIBLE(browser->findbox)) - ; // FIXME: What if the findbox is hidden? + if(!GTK_WIDGET_VISIBLE(browser->findbox)) + return; const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); const gboolean caseSensitive = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); GtkWidget* webView = get_nth_webView(-1, browser); GtkWidget* icon; webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); - if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, TRUE, caseSensitive, TRUE)) + if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, caseSensitive, TRUE, TRUE)) icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); else icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); @@ -142,20 +149,20 @@ void on_action_find_next_activate(GtkAction* action, CBrowser* browser) webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); const gboolean highlight = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight);*/ + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); } void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) { - /*if(!GTK_WIDGET_VISIBLE(browser->findbox)) - ; // FIXME: What if the findbox is hidden? + if(!GTK_WIDGET_VISIBLE(browser->findbox)) + return; const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); const gboolean caseSensitive = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); GtkWidget* webView = get_nth_webView(-1, browser); webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); GtkWidget* icon; - if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, FALSE, caseSensitive, TRUE)) + if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, caseSensitive, FALSE, TRUE)) icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); else icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); @@ -164,14 +171,14 @@ void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); const gboolean highlight = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight);*/ + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); } void on_findbox_highlight_toggled(GtkToggleToolButton* toolitem, CBrowser* browser) { - /*GtkWidget* webView = get_nth_webView(-1, browser); + GtkWidget* webView = get_nth_webView(-1, browser); const gboolean highlight = gtk_toggle_tool_button_get_active(toolitem); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight);*/ + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); } void on_action_preferences_activate(GtkAction* action, CBrowser* browser) From 84ceb56bf8091878193153d2e030ea3a1027f0f8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 22 Dec 2007 02:15:58 +0100 Subject: [PATCH 0008/2970] More effective status updates and less entry flickering The statusbar and progressbar respectively should not be updated too generously. Optimizing the status updates reduces flickering of entries remarkably. --- src/browser.c | 2 +- src/helpers.c | 43 ++++++++++++++++--------------------------- src/helpers.h | 5 +---- src/webView.c | 26 +++++++++++++++----------- 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/src/browser.c b/src/browser.c index a090af5e..61f82e12 100644 --- a/src/browser.c +++ b/src/browser.c @@ -813,7 +813,7 @@ void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page update_favicon(browser); update_security(browser); update_gui_state(browser); - update_statusbar_text(browser); + update_statusbar(browser); update_feeds(browser); update_search_engines(browser); } diff --git a/src/helpers.c b/src/helpers.c index 0e895b96..914d47b1 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -310,17 +310,18 @@ void action_set_visible(const gchar* name, gboolean visible, CBrowser* browser) gtk_action_set_visible(action, visible); } -void update_statusbar_text(CBrowser* browser) +void update_statusbar(CBrowser* browser) { - if(browser->statusMessage) - { - gtk_statusbar_pop(GTK_STATUSBAR(browser->statusbar), 1); - gtk_statusbar_push(GTK_STATUSBAR(browser->statusbar), 1 - , browser->statusMessage); - } - sokoke_widget_set_visible(browser->progress, browser->loadedPercent > -1); + gtk_statusbar_pop(GTK_STATUSBAR(browser->statusbar), 1); + gtk_statusbar_push(GTK_STATUSBAR(browser->statusbar), 1 + , browser->statusMessage ? browser->statusMessage : ""); if(browser->loadedPercent > -1) { + if(browser->loadedPercent > -1) + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress) + , browser->loadedPercent ? browser->loadedPercent / 100.0 : 0); + else + gtk_progress_bar_pulse(GTK_PROGRESS_BAR(browser->progress)); gchar* message = g_strdup_printf("%d%% loaded", browser->loadedPercent); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(browser->progress), message); g_free(message); @@ -368,26 +369,21 @@ void update_gui_state(CBrowser* browser) GtkAction* action = gtk_action_group_get_action(browser->actiongroup, "RefreshStop"); if(browser->loadedPercent == -1) { - gtk_widget_hide(browser->throbber); + gtk_widget_set_sensitive(browser->throbber, FALSE); g_object_set(action, "stock-id", GTK_STOCK_REFRESH, NULL); g_object_set(action, "tooltip", "Refresh the current page", NULL); + gtk_widget_hide(browser->progress); } else { - gtk_widget_show(browser->throbber); + gtk_widget_set_sensitive(browser->throbber, TRUE); g_object_set(action, "stock-id", GTK_STOCK_STOP, NULL); g_object_set(action, "tooltip", "Stop loading the current page", NULL); + gtk_widget_show(browser->progress); } gtk_image_set_from_stock(GTK_IMAGE(browser->location_icon), GTK_STOCK_FILE , GTK_ICON_SIZE_MENU); - - if(browser->loadedPercent > -1) - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress) - , browser->loadedPercent ? browser->loadedPercent / 100.0 : 0); - else - gtk_progress_bar_pulse(GTK_PROGRESS_BAR(browser->progress)); - update_statusbar_text(browser); } void update_feeds(CBrowser* browser) @@ -400,21 +396,14 @@ void update_search_engines(CBrowser* browser) // TODO: Look for available search engines, requires dom access } -void update_status_message(const gchar* message, CBrowser* browser) -{ - g_free(browser->statusMessage); - browser->statusMessage = g_strdup(message ? message : ""); - update_statusbar_text(browser); -} - void update_browser_actions(CBrowser* browser) { gboolean active = gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) > 1; gtk_notebook_set_show_tabs(GTK_NOTEBOOK(browser->webViews), active); action_set_sensitive("TabClose", active, browser); - guint n = xbel_folder_get_n_items(tabtrash); - action_set_sensitive("UndoTabClose", n, browser); - action_set_sensitive("TabsClosed", n, browser); + gboolean tabtrashEmpty = xbel_folder_is_empty(tabtrash); + action_set_sensitive("UndoTabClose", !tabtrashEmpty, browser); + action_set_sensitive("TabsClosed", !tabtrashEmpty, browser); } gchar* magic_uri(const gchar* uri, gboolean search) diff --git a/src/helpers.h b/src/helpers.h index bca19764..c1812166 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -75,7 +75,7 @@ void action_set_visible(const gchar*, gboolean, CBrowser*); void -update_statusbar_text(CBrowser*); +update_statusbar(CBrowser*); void update_edit_items(CBrowser*); @@ -89,9 +89,6 @@ update_feeds(CBrowser*); void update_search_engines(CBrowser*); -void -update_status_message(const gchar*, CBrowser*); - void update_browser_actions(CBrowser*); diff --git a/src/webView.c b/src/webView.c index cfc2bb44..03845218 100644 --- a/src/webView.c +++ b/src/webView.c @@ -79,10 +79,10 @@ void on_webView_load_started(GtkWidget* webView, WebKitWebFrame* widget browser->loadedPercent = 0; update_favicon(browser); if(webView == get_nth_webView(-1, browser)) + { update_gui_state(browser); - update_statusbar_text(browser); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress), 0.1); - gtk_widget_show(browser->progress); + update_statusbar(browser); + } } void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame @@ -95,8 +95,8 @@ void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame { gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); gtk_label_set_text(GTK_LABEL(browser->webView_name), newUri); - update_status_message(NULL, browser); - update_gui_state(browser); + g_free(browser->statusMessage); + browser->statusMessage = NULL; } } @@ -104,7 +104,7 @@ void on_webView_load_changed(GtkWidget* webView, gint progress, CBrowser* browse { browser->loadedPercent = progress; if(webView == get_nth_webView(-1, browser)) - update_gui_state(browser); + update_statusbar(browser); } void on_webView_load_finished(GtkWidget* webView, WebKitWebFrame* widget @@ -114,13 +114,13 @@ void on_webView_load_finished(GtkWidget* webView, WebKitWebFrame* widget update_favicon(browser); if(webView == get_nth_webView(-1, browser)) update_gui_state(browser); - update_statusbar_text(browser); - gtk_widget_hide(browser->progress); } void on_webView_status_message(GtkWidget* webView, const gchar* text, CBrowser* browser) { - update_status_message(text, browser); + g_free(browser->statusMessage); + browser->statusMessage = g_strdup(text); + update_statusbar(browser); } void on_webView_selection_changed(GtkWidget* webView, CBrowser* browser) @@ -137,7 +137,9 @@ gboolean on_webView_console_message(GtkWidget* webView void on_webView_link_hover(GtkWidget* webView, const gchar* tooltip , const gchar* uri, CBrowser* browser) { - update_status_message(uri, browser); + g_free(browser->statusMessage); + browser->statusMessage = g_strdup(uri); + update_statusbar(browser); g_free(browser->elementUri); browser->elementUri = g_strdup(uri); } @@ -277,7 +279,9 @@ gboolean on_webView_scroll(GtkWidget* webView, GdkEventScroll* event gboolean on_webView_leave(GtkWidget* webView, GdkEventCrossing* event, CBrowser* browser) { - update_status_message(NULL, browser); + g_free(browser->statusMessage); + browser->statusMessage = NULL; + update_statusbar(browser); return TRUE; } From 3f4c2e3c14830eac63f700f5d6d9d7d9c0c79ba6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 27 Dec 2007 00:29:22 +0100 Subject: [PATCH 0009/2970] Command line uris should replace the default page. Don't open a blank page or the homepage respecitvely on startup if an uri is specified in the command line. --- src/main.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.c b/src/main.c index 4eb8bd09..e23eece8 100755 --- a/src/main.c +++ b/src/main.c @@ -215,21 +215,6 @@ int main(int argc, char** argv) } g_string_free(errorMessages, TRUE); - if(xbel_folder_is_empty(_session)) - { - XbelItem* item = xbel_bookmark_new(); - if(config->startup == CONFIG_STARTUP_HOMEPAGE) - xbel_bookmark_set_href(item, config->homepage); - else - xbel_bookmark_set_href(item, "about:blank"); - xbel_folder_append_item(_session, item); - } - g_free(configPath); - - accel_group = gtk_accel_group_new(); - stock_items_init(); - browsers = NULL; - // TODO: Handle any number of separate uris from argv // Open as many tabs as we have uris, seperated by pipes gchar* uri = argc > 1 ? strtok(g_strdup(argv[1]), "|") : NULL; @@ -244,6 +229,21 @@ int main(int argc, char** argv) } g_free(uri); + if(config->startup != CONFIG_STARTUP_SESSION || xbel_folder_is_empty(_session)) + { + XbelItem* item = xbel_bookmark_new(); + if(config->startup == CONFIG_STARTUP_BLANK) + xbel_bookmark_set_href(item, "about:blank"); + else + xbel_bookmark_set_href(item, config->homepage); + xbel_folder_prepend_item(_session, item); + } + g_free(configPath); + + accel_group = gtk_accel_group_new(); + stock_items_init(); + browsers = NULL; + session = xbel_folder_new(); CBrowser* browser = NULL; guint n = xbel_folder_get_n_items(_session); From e3561c71ad9e5289e6726e6f6f6fb9f2df598a6d Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Thu, 27 Dec 2007 01:01:22 +0100 Subject: [PATCH 0010/2970] Don't remember the window position but the size only. It is often useful to have multiple browser windows opening at once, and having them open on top of each other is counterproductive. Most window managers, on the other hand, have code to decide where to place a window so that it is accessible by the user. --- src/browser.c | 15 +-------------- src/conf.c | 10 +++------- src/conf.h | 4 +--- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/browser.c b/src/browser.c index 61f82e12..3840053f 100644 --- a/src/browser.c +++ b/src/browser.c @@ -823,14 +823,6 @@ void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser) gtk_widget_hide(browser->findbox); } -static gboolean on_window_configure(GtkWidget* widget, GdkEventConfigure* event - , CBrowser* browser) -{ - gtk_window_get_position(GTK_WINDOW(browser->window) - , &config->winLeft, &config->winTop); - return FALSE; -} - static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation , CBrowser* browser) { @@ -882,24 +874,19 @@ CBrowser* browser_new(CBrowser* oldBrowser) GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window)); const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7; const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7; - if(config->rememberWinMetrics) + if(config->rememberWinSize) { if(!config->winWidth && !config->winHeight) { config->winWidth = defaultWidth; config->winHeight = defaultWidth; } - if(config->winLeft && config->winTop) - gtk_window_move(GTK_WINDOW(browser->window) - , config->winLeft, config->winTop); gtk_window_set_default_size(GTK_WINDOW(browser->window) , config->winWidth, config->winHeight); } else gtk_window_set_default_size(GTK_WINDOW(browser->window) , defaultWidth, defaultHeight); - g_signal_connect(browser->window, "configure-event" - , G_CALLBACK(on_window_configure), browser); g_signal_connect(browser->window, "size-allocate" , G_CALLBACK(on_window_size_allocate), browser); // FIXME: Use custom program icon diff --git a/src/conf.c b/src/conf.c index 25093d8a..8dccad03 100644 --- a/src/conf.c +++ b/src/conf.c @@ -87,10 +87,8 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error #define GET_STR(var, key, default) \ var = sokoke_key_file_get_string_default( \ keyFile, "session", key, default, NULL) - GET_INT(config->rememberWinMetrics , "RememberWinMetrics", TRUE); - GET_INT(config->winLeft , "WinLeft", 0); - GET_INT(config->winTop , "WinTop", 0); - GET_INT(config->winWidth , "WinWidth", 0); + GET_INT(config->rememberWinSize, "RememberWinSize", TRUE); + GET_INT(config->winWidth, "WinWidth", 0); GET_INT(config->winHeight, "WinHeight", 0); GET_INT(config->winPanelPos, "WinPanelPos", 0); GET_INT(config->searchEngine, "SearchEngine", 0); @@ -149,9 +147,7 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) g_key_file_set_integer(keyFile, "content", "EnableJavaScript", config->enableJavaScript); g_key_file_set_integer(keyFile, "content", "EnablePlugins", config->enablePlugins); - g_key_file_set_integer(keyFile, "session", "RememberWinMetrics", config->rememberWinMetrics); - g_key_file_set_integer(keyFile, "session", "WinLeft", config->winLeft); - g_key_file_set_integer(keyFile, "session", "WinTop", config->winTop); + g_key_file_set_integer(keyFile, "session", "RememberWinSize", config->rememberWinSize); g_key_file_set_integer(keyFile, "session", "WinWidth", config->winWidth); g_key_file_set_integer(keyFile, "session", "WinHeight", config->winHeight); g_key_file_set_integer(keyFile, "session", "WinPanelPos", config->winPanelPos); diff --git a/src/conf.h b/src/conf.h index ef414991..b43b0311 100644 --- a/src/conf.h +++ b/src/conf.h @@ -43,9 +43,7 @@ typedef struct _CConfig gboolean enableJavaScript; gboolean enablePlugins; - gboolean rememberWinMetrics; // Restore last state upon startup? - gint winLeft; - gint winTop; + gboolean rememberWinSize; // Restore window size upon startup? gint winWidth; gint winHeight; guint winPanelPos; From 352e4f7423ca20907870a2e57cbe3b955f88defc Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Thu, 27 Dec 2007 01:22:34 +0100 Subject: [PATCH 0011/2970] Don't update the remembered window size when maximized. If the window is maximized the effective size matches the available screen size, thus after restarting the browser we end up with a window the size of the screen in normal state. --- src/browser.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/browser.c b/src/browser.c index 3840053f..66a29d40 100644 --- a/src/browser.c +++ b/src/browser.c @@ -826,8 +826,14 @@ void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser) static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation , CBrowser* browser) { - config->winWidth = allocation->width; - config->winHeight = allocation->height; + if(!GTK_WIDGET_REALIZED(widget)) + return; + if(!(gdk_window_get_state(widget->window) + & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + { + config->winWidth = allocation->width; + config->winHeight = allocation->height; + } } gboolean on_window_destroy(GtkWidget* widget, GdkEvent* event, CBrowser* browser) From 39dedae0d18796e32e34f2ef58670b9fb5b03a02 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 27 Dec 2007 02:12:26 +0100 Subject: [PATCH 0012/2970] Fix coding style in sokoke.c/ sokoke.h, particularly variable names. --- src/sokoke.c | 167 +++++++++++++++++++++++++-------------------------- src/sokoke.h | 51 ++++++++-------- 2 files changed, 107 insertions(+), 111 deletions(-) diff --git a/src/sokoke.c b/src/sokoke.c index 8ccec6a7..293ce2f6 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -20,36 +20,36 @@ #include void sokoke_combo_box_add_strings(GtkComboBox* combobox - , const gchar* sLabelFirst, ...) + , const gchar* labelFirst, ...) { // Add a number of strings to a combobox, terminated with NULL // This works only for text comboboxes va_list args; - va_start(args, sLabelFirst); + va_start(args, labelFirst); - const gchar* sLabel; - for(sLabel = sLabelFirst; sLabel; sLabel = va_arg(args, const gchar*)) - gtk_combo_box_append_text(combobox, sLabel); + const gchar* label; + for(label = labelFirst; label; label = va_arg(args, const gchar*)) + gtk_combo_box_append_text(combobox, label); va_end(args); } void sokoke_radio_action_set_current_value(GtkRadioAction* action - , gint current_value) + , gint currentValue) { // Activates the group member with the given value #if GTK_CHECK_VERSION(2, 10, 0) - gtk_radio_action_set_current_value(action, current_value); + gtk_radio_action_set_current_value(action, currentValue); #else // TODO: Implement this for older gtk UNIMPLEMENTED #endif } -void sokoke_widget_set_visible(GtkWidget* widget, gboolean bVisibility) +void sokoke_widget_set_visible(GtkWidget* widget, gboolean visible) { // Show or hide the widget - if(bVisibility) + if(visible) gtk_widget_show(widget); else gtk_widget_hide(widget); @@ -61,23 +61,23 @@ void sokoke_container_show_children(GtkContainer* container) gtk_container_foreach(container, (GtkCallback)(gtk_widget_show_all), NULL); } -void sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* sText) +void sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* text) { #if GTK_CHECK_VERSION(2, 12, 0) - gtk_widget_set_tooltip_text(widget, sText); + gtk_widget_set_tooltip_text(widget, text); #else static GtkTooltips* tooltips; if(!tooltips) tooltips = gtk_tooltips_new(); - gtk_tooltips_set_tip(tooltips, widget, sText, NULL); + gtk_tooltips_set_tip(tooltips, widget, text, NULL); #endif } -void sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* sText) +void sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* text) { // TODO: Use 2.12 api if available GtkTooltips* tooltips = gtk_tooltips_new(); - gtk_tool_item_set_tooltip(toolitem, tooltips, sText, NULL); + gtk_tool_item_set_tooltip(toolitem, tooltips, text, NULL); } void sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu @@ -101,49 +101,48 @@ void sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu gtk_menu_popup(menu, NULL, NULL, NULL, NULL, button, event_time); } -enum +typedef enum { SOKOKE_DESKTOP_UNKNOWN, SOKOKE_DESKTOP_XFCE -}; +} SokokeDesktop; -static guint sokoke_get_desktop(void) +static SokokeDesktop sokoke_get_desktop(void) { // Are we running in Xfce? - gint iResult; gchar* stdout; gchar* stderr; - gboolean bSuccess = g_spawn_command_line_sync( + gint result; gchar* stdout; gchar* stderr; + gboolean success = g_spawn_command_line_sync( "xprop -root _DT_SAVE_MODE | grep -q xfce4" - , &stdout, &stderr, &iResult, NULL); - if(bSuccess && !iResult) + , &stdout, &stderr, &result, NULL); + if(success && !result) return SOKOKE_DESKTOP_XFCE; return SOKOKE_DESKTOP_UNKNOWN; } -gpointer sokoke_xfce_header_new(const gchar* sIcon, const gchar* sTitle) +gpointer sokoke_xfce_header_new(const gchar* icon, const gchar* title) { - // Create an xfce header with icon and title // This returns NULL if the desktop is not xfce if(sokoke_get_desktop() == SOKOKE_DESKTOP_XFCE) { GtkWidget* entry = gtk_entry_new(); - gchar* sMarkup; + gchar* markup; GtkWidget* xfce_heading = gtk_event_box_new(); gtk_widget_modify_bg(xfce_heading, GTK_STATE_NORMAL , &entry->style->base[GTK_STATE_NORMAL]); GtkWidget* hbox = gtk_hbox_new(FALSE, 12); gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); - GtkWidget* icon = gtk_image_new_from_icon_name(sIcon, GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0); + GtkWidget* image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); GtkWidget* label = gtk_label_new(NULL); gtk_widget_modify_fg(label, GTK_STATE_NORMAL , &entry->style->text[GTK_STATE_NORMAL]); - sMarkup = g_strdup_printf("%s", sTitle); - gtk_label_set_markup(GTK_LABEL(label), sMarkup); + markup = g_strdup_printf("%s", title); + gtk_label_set_markup(GTK_LABEL(label), markup); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(xfce_heading), hbox); - g_free(sMarkup); + g_free(markup); return xfce_heading; } return NULL; @@ -170,14 +169,14 @@ gpointer sokoke_superuser_warning_new(void) return NULL; } -GtkWidget* sokoke_hig_frame_new(const gchar* sLabel) +GtkWidget* sokoke_hig_frame_new(const gchar* title) { // Create a frame with no actual frame but a bold label and indentation GtkWidget* frame = gtk_frame_new(NULL); - gchar* sLabelBold = g_strdup_printf("%s", sLabel); + gchar* titleBold = g_strdup_printf("%s", title); GtkWidget* label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), sLabelBold); - g_free(sLabelBold); + gtk_label_set_markup(GTK_LABEL(label), titleBold); + g_free(titleBold); gtk_frame_set_label_widget(GTK_FRAME(frame), label); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); return frame; @@ -191,22 +190,22 @@ void sokoke_widget_set_pango_font_style(GtkWidget* widget, PangoStyle style) gtk_widget_modify_font(widget, NULL); else { - PangoFontDescription* pangofontdesc = pango_font_description_new(); - pango_font_description_set_style(pangofontdesc, PANGO_STYLE_ITALIC); - gtk_widget_modify_font(widget, pangofontdesc); - pango_font_description_free(pangofontdesc); + PangoFontDescription* fontDescription = pango_font_description_new(); + pango_font_description_set_style(fontDescription, PANGO_STYLE_ITALIC); + gtk_widget_modify_font(widget, fontDescription); + pango_font_description_free(fontDescription); } } static gboolean sokoke_on_entry_focus_in_event(GtkEntry* entry, GdkEventFocus *event , gpointer userdata) { - gboolean bDefaultText = (gboolean)g_object_get_data(G_OBJECT(entry) - , "sokoke_bDefaultText"); - if(bDefaultText) + gboolean defaultText = (gboolean)g_object_get_data(G_OBJECT(entry) + , "sokoke_hasDefaultText"); + if(defaultText) { gtk_entry_set_text(entry, ""); - g_object_set_data(G_OBJECT(entry), "sokoke_bDefaultText", (gpointer)FALSE); + g_object_set_data(G_OBJECT(entry), "sokoke_hasDefaultText", (gpointer)FALSE); sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_NORMAL); } return FALSE; @@ -215,87 +214,87 @@ static gboolean sokoke_on_entry_focus_in_event(GtkEntry* entry, GdkEventFocus *e static gboolean sokoke_on_entry_focus_out_event(GtkEntry* entry, GdkEventFocus* event , gpointer userdata) { - const gchar* sText = gtk_entry_get_text(entry); - if(sText[0] == '\0') + const gchar* text = gtk_entry_get_text(entry); + if(text && !*text) { - const gchar* sDefaultText = (const gchar*)g_object_get_data( - G_OBJECT(entry), "sokoke_sDefaultText"); - gtk_entry_set_text(entry, sDefaultText); - g_object_set_data(G_OBJECT(entry), "sokoke_bDefaultText", (gpointer)TRUE); + const gchar* defaultText = (const gchar*)g_object_get_data( + G_OBJECT(entry), "sokoke_defaultText"); + gtk_entry_set_text(entry, defaultText); + g_object_set_data(G_OBJECT(entry), "sokoke_hasDefaultText", (gpointer)TRUE); sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_ITALIC); } return FALSE; } -void sokoke_entry_set_default_text(GtkEntry* entry, const gchar* sDefaultText) +void sokoke_entry_set_default_text(GtkEntry* entry, const gchar* defaultText) { // Note: The default text initially overwrites any previous text - gchar* sOldValue = g_object_get_data(G_OBJECT(entry), "sokoke_sDefaultText"); - if(!sOldValue) + gchar* oldValue = g_object_get_data(G_OBJECT(entry), "sokoke_defaultText"); + if(!oldValue) { - g_object_set_data(G_OBJECT(entry), "sokoke_bDefaultText", (gpointer)TRUE); + g_object_set_data(G_OBJECT(entry), "sokoke_hasDefaultText", (gpointer)TRUE); sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_ITALIC); - gtk_entry_set_text(entry, sDefaultText); + gtk_entry_set_text(entry, defaultText); } - g_object_set_data(G_OBJECT(entry), "sokoke_sDefaultText", (gpointer)sDefaultText); + g_object_set_data(G_OBJECT(entry), "sokoke_defaultText", (gpointer)defaultText); g_signal_connect(entry, "focus-in-event" , G_CALLBACK(sokoke_on_entry_focus_in_event), NULL); g_signal_connect(entry, "focus-out-event" , G_CALLBACK(sokoke_on_entry_focus_out_event), NULL); } -gchar* sokoke_key_file_get_string_default(GKeyFile* key_file - , const gchar* group_name, const gchar* key, const gchar* def, GError* *error) +gchar* sokoke_key_file_get_string_default(GKeyFile* keyFile + , const gchar* group, const gchar* key, const gchar* defaultValue, GError** error) { - gchar* value = g_key_file_get_string(key_file, group_name, key, error); - return value == NULL ? g_strdup(def) : value; + gchar* value = g_key_file_get_string(keyFile, group, key, error); + return value == NULL ? g_strdup(defaultValue) : value; } -gint sokoke_key_file_get_integer_default(GKeyFile* key_file - , const gchar* group_name, const gchar* key, const gint def, GError** error) +gint sokoke_key_file_get_integer_default(GKeyFile* keyFile + , const gchar* group, const gchar* key, const gint defaultValue, GError** error) { - if(!g_key_file_has_key(key_file, group_name, key, NULL)) - return def; - return g_key_file_get_integer(key_file, group_name, key, error); + if(!g_key_file_has_key(keyFile, group, key, NULL)) + return defaultValue; + return g_key_file_get_integer(keyFile, group, key, error); } -gboolean sokoke_key_file_save_to_file(GKeyFile* key_file - , const gchar* sFilename, GError** error) +gboolean sokoke_key_file_save_to_file(GKeyFile* keyFile + , const gchar* filename, GError** error) { - gchar* sData = g_key_file_to_data(key_file, NULL, error); - if(!sData) + gchar* data = g_key_file_to_data(keyFile, NULL, error); + if(!data) return FALSE; FILE* fp; - if(!(fp = fopen(sFilename, "w"))) + if(!(fp = fopen(filename, "w"))) { *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_ACCES , "Writing failed."); return FALSE; } - fputs(sData, fp); + fputs(data, fp); fclose(fp); - g_free(sData); + g_free(data); return TRUE; } -void sokoke_widget_get_text_size(GtkWidget* widget, const gchar* sText +void sokoke_widget_get_text_size(GtkWidget* widget, const gchar* text , gint* w, gint* h) { - PangoLayout* layout = gtk_widget_create_pango_layout(widget, sText); + PangoLayout* layout = gtk_widget_create_pango_layout(widget, text); pango_layout_get_pixel_size(layout, w, h); g_object_unref(layout); } -void sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* sPath - , const gchar* sKey, GdkModifierType accel_mods) +void sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* path + , const gchar* key, GdkModifierType modifiers) { - if(sPath && *sPath) + if(path && *path) { - gchar* path = g_strconcat("<", g_get_prgname(), ">/", sPath, NULL); - gtk_menu_item_set_accel_path(GTK_MENU_ITEM(menuitem), path); - guint keyVal = sKey ? gdk_keyval_from_name(sKey) : 0; - gtk_accel_map_add_entry(path, keyVal, accel_mods); - g_free(path); + gchar* accel = g_strconcat("<", g_get_prgname(), ">/", path, NULL); + gtk_menu_item_set_accel_path(GTK_MENU_ITEM(menuitem), accel); + guint keyVal = key ? gdk_keyval_from_name(key) : 0; + gtk_accel_map_add_entry(accel, keyVal, modifiers); + g_free(accel); } } @@ -344,17 +343,17 @@ static void sokoke_on_undo_entry_populate_popup(GtkEntry* entry, GtkMenu* menu { // Enhance the entry's menu with undo and redo items. GtkWidget* menuitem = gtk_separator_menu_item_new(); - gtk_menu_shell_prepend((GtkMenuShell*)menu, menuitem); + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_REDO, NULL); g_signal_connect(menuitem, "activate", G_CALLBACK(sokoke_entry_redo), userdata); gtk_widget_set_sensitive(menuitem, sokoke_entry_can_redo(entry)); - gtk_menu_shell_prepend((GtkMenuShell*)menu, menuitem); + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_UNDO, NULL); g_signal_connect(menuitem, "activate", G_CALLBACK(sokoke_entry_undo), userdata); gtk_widget_set_sensitive(menuitem, sokoke_entry_can_undo(entry)); - gtk_menu_shell_prepend((GtkMenuShell*)menu, menuitem); + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); } @@ -364,9 +363,9 @@ gboolean sokoke_entry_get_can_undo(GtkEntry* entry) return FALSE; } -void sokoke_entry_set_can_undo(GtkEntry* entry, gboolean bCanUndo) +void sokoke_entry_set_can_undo(GtkEntry* entry, gboolean canUndo) { - if(bCanUndo) + if(canUndo) { g_signal_connect(entry, "key-press-event" , G_CALLBACK(sokoke_on_undo_entry_key_down), NULL); diff --git a/src/sokoke.h b/src/sokoke.h index 80ae085e..995e2481 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -18,77 +18,74 @@ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON void -sokoke_combo_box_add_strings(GtkComboBox* combobox, const gchar* sLabelFirst, ...); +sokoke_combo_box_add_strings(GtkComboBox*, const gchar*, ...); void -sokoke_radio_action_set_current_value(GtkRadioAction* action, gint current_value); +sokoke_radio_action_set_current_value(GtkRadioAction*, gint); void -sokoke_widget_set_visible(GtkWidget* widget, gboolean bVisibility); +sokoke_widget_set_visible(GtkWidget*, gboolean); void -sokoke_container_show_children(GtkContainer* container); +sokoke_container_show_children(GtkContainer*); void -sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* sText); +sokoke_widget_set_tooltip_text(GtkWidget*, const gchar*); void -sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* sText); +sokoke_tool_item_set_tooltip_text(GtkToolItem*, const gchar*); void -sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu, GdkEventButton* event); +sokoke_widget_popup(GtkWidget*, GtkMenu*, GdkEventButton*); gpointer -sokoke_xfce_header_new(const gchar* sIcon, const gchar* sTitle); +sokoke_xfce_header_new(const gchar*, const gchar*); gpointer sokoke_superuser_warning_new(void); GtkWidget* -sokoke_hig_frame_new(const gchar* sLabel); +sokoke_hig_frame_new(const gchar*); void -sokoke_widget_set_pango_font_style(GtkWidget* widget, PangoStyle style); +sokoke_widget_set_pango_font_style(GtkWidget*, PangoStyle); void -sokoke_entry_set_default_text(GtkEntry* entry, const gchar* sDefaultText); +sokoke_entry_set_default_text(GtkEntry*, const gchar*); gchar* -sokoke_key_file_get_string_default(GKeyFile* key_file - , const gchar* group_name, const gchar* key, const gchar* def, GError* *error); +sokoke_key_file_get_string_default(GKeyFile*, const gchar*, const gchar* + , const gchar*, GError**); gint -sokoke_key_file_get_integer_default(GKeyFile* key_file - , const gchar* group_name, const gchar* key, const gint def, GError* *error); +sokoke_key_file_get_integer_default(GKeyFile*, const gchar*, const gchar* + , const gint, GError**); gboolean -sokoke_key_file_save_to_file(GKeyFile* key_file - , const gchar* file, GError* *error); +sokoke_key_file_save_to_file(GKeyFile*, const gchar*, GError**); void -sokoke_widget_get_text_size(GtkWidget* widget, const gchar* sText - , gint* w, gint* h); +sokoke_widget_get_text_size(GtkWidget*, const gchar*, gint*, gint*); void -sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* sPath - , const gchar* sKey, GdkModifierType accel_mods); +sokoke_menu_item_set_accel(GtkMenuItem*, const gchar*, const gchar*, GdkModifierType); gboolean -sokoke_entry_can_undo(GtkEntry* entry); +sokoke_entry_can_undo(GtkEntry*); gboolean -sokoke_entry_can_redo(GtkEntry* entry); +sokoke_entry_can_redo(GtkEntry*); void -sokoke_entry_undo(GtkEntry* entry); +sokoke_entry_undo(GtkEntry*); void -sokoke_entry_redo(GtkEntry* entry); +sokoke_entry_redo(GtkEntry*); gboolean -sokoke_entry_get_can_undo(GtkEntry* entry); +sokoke_entry_get_can_undo(GtkEntry*); void -sokoke_entry_set_can_undo(GtkEntry* entry, gboolean bCanUndo); +sokoke_entry_set_can_undo(GtkEntry*, gboolean); #endif /* !__SOKOKE_H__ */ From cd8b1e5b220ddd6225b82b7b145e017765704dac Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Thu, 27 Dec 2007 02:42:11 +0100 Subject: [PATCH 0013/2970] Prevent repeated checks for the desktop environment. It is sufficient to check the desktop environment only once. Also don't shadow 'stdin', 'stdout' and 'stderr'. --- src/sokoke.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/sokoke.c b/src/sokoke.c index 293ce2f6..944dfa8e 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -103,21 +103,28 @@ void sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu typedef enum { - SOKOKE_DESKTOP_UNKNOWN, - SOKOKE_DESKTOP_XFCE + SOKOKE_DESKTOP_UNTESTED, + SOKOKE_DESKTOP_XFCE, + SOKOKE_DESKTOP_UNKNOWN } SokokeDesktop; static SokokeDesktop sokoke_get_desktop(void) { - // Are we running in Xfce? - gint result; gchar* stdout; gchar* stderr; - gboolean success = g_spawn_command_line_sync( - "xprop -root _DT_SAVE_MODE | grep -q xfce4" - , &stdout, &stderr, &result, NULL); - if(success && !result) - return SOKOKE_DESKTOP_XFCE; + static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; + if(G_UNLIKELY(desktop == SOKOKE_DESKTOP_UNTESTED)) + { + // Are we running in Xfce? + gint result; gchar* out; gchar* err; + gboolean success = g_spawn_command_line_sync( + "xprop -root _DT_SAVE_MODE | grep -q xfce4" + , &out, &err, &result, NULL); + if(success && !result) + desktop = SOKOKE_DESKTOP_XFCE; + else + desktop = SOKOKE_DESKTOP_UNKNOWN; + } - return SOKOKE_DESKTOP_UNKNOWN; + return desktop; } gpointer sokoke_xfce_header_new(const gchar* icon, const gchar* title) From b6f248f3440f5e889b5e7910a874a642c9c0f505 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 31 Dec 2007 23:49:22 +0100 Subject: [PATCH 0014/2970] Implement the bookmarks panel with editing capabilities. The bookmarks panel can display a tree of bookmarks and allows editing and deleting of bookmarks via a context menu. The XBEL implementation has been altered to work with a reference count model to allow panels to update on their own. --- src/browser.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++---- src/browser.h | 32 +++++ src/main.c | 12 +- src/ui.h | 8 ++ src/webView.c | 13 ++- src/xbel.c | 40 +++++-- src/xbel.h | 6 +- 7 files changed, 384 insertions(+), 41 deletions(-) diff --git a/src/browser.c b/src/browser.c index 66a29d40..1e0a9d99 100644 --- a/src/browser.c +++ b/src/browser.c @@ -414,8 +414,7 @@ void on_menu_tabsClosed_item_activate(GtkWidget* menuitem, CBrowser* browser) const gchar* uri = xbel_bookmark_get_href(item); CBrowser* curBrowser = browser_new(browser); webView_open(curBrowser->webView, uri); - xbel_folder_remove_item(tabtrash, item); - xbel_item_free(item); + xbel_item_unref(item); update_browser_actions(curBrowser); } @@ -426,15 +425,14 @@ void on_action_tabsClosed_undo_activate(GtkAction* action, CBrowser* browser) const gchar* uri = xbel_bookmark_get_href(item); CBrowser* curBrowser = browser_new(browser); webView_open(curBrowser->webView, uri); - xbel_folder_remove_item(tabtrash, item); - xbel_item_free(item); + xbel_item_unref(item); update_browser_actions(curBrowser); } void on_action_tabsClosed_clear_activate(GtkAction* action, CBrowser* browser) { // Clear the closed tabs list - xbel_item_free(tabtrash); + xbel_item_unref(tabtrash); tabtrash = xbel_folder_new(); update_browser_actions(browser); } @@ -494,11 +492,14 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse GtkWidget* entry_title = gtk_entry_new(); gtk_entry_set_activates_default(GTK_ENTRY(entry_title), TRUE); if(!newBookmark) - gtk_entry_set_text(GTK_ENTRY(entry_title), xbel_item_get_title(bookmark)); + { + const gchar* title = xbel_item_get_title(bookmark); + gtk_entry_set_text(GTK_ENTRY(entry_title), title ? title : ""); + } gtk_box_pack_start(GTK_BOX(hbox), entry_title, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); - + hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); label = gtk_label_new_with_mnemonic("_Description:"); @@ -507,30 +508,38 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse GtkWidget* entry_desc = gtk_entry_new(); gtk_entry_set_activates_default(GTK_ENTRY(entry_desc), TRUE); if(!newBookmark) - gtk_entry_set_text(GTK_ENTRY(entry_desc), xbel_item_get_desc(bookmark)); + { + const gchar* desc = xbel_item_get_desc(bookmark); + gtk_entry_set_text(GTK_ENTRY(entry_desc), desc ? desc : ""); + } gtk_box_pack_start(GTK_BOX(hbox), entry_desc, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); - - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Uri:"); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_uri = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_uri), TRUE); - if(!newBookmark) - gtk_entry_set_text(GTK_ENTRY(entry_uri), xbel_bookmark_get_href(bookmark)); - gtk_box_pack_start(GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); + + GtkWidget* entry_uri = NULL; + if(xbel_item_is_bookmark(bookmark)) + { + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Uri:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + entry_uri = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry_uri), TRUE); + if(!newBookmark) + gtk_entry_set_text(GTK_ENTRY(entry_uri), xbel_bookmark_get_href(bookmark)); + gtk_box_pack_start(GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + } gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { xbel_item_set_title(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_title))); xbel_item_set_desc(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_desc))); - xbel_bookmark_set_href(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_uri))); + if(xbel_item_is_bookmark(bookmark)) + xbel_bookmark_set_href(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_uri))); // FIXME: We want to choose a folder if(newBookmark) @@ -539,6 +548,230 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse gtk_widget_destroy(dialog); } +static void on_panel_bookmarks_row_activated(GtkTreeView* treeview + , GtkTreePath* path, GtkTreeViewColumn* column, CBrowser* browser) +{ + GtkTreeModel* model = gtk_tree_view_get_model(treeview); + GtkTreeIter iter; + if(gtk_tree_model_get_iter(model, &iter, path)) + { + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(xbel_item_is_bookmark(item)) + webView_open(get_nth_webView(-1, browser), xbel_bookmark_get_href(item)); + } +} + +static void panel_bookmarks_popup(GtkWidget* widget, GdkEventButton* event + , XbelItem* item, CBrowser* browser) +{ + gboolean isBookmark = xbel_item_is_bookmark(item); + gboolean isSeparator = xbel_item_is_separator(item); + + action_set_sensitive("BookmarkOpen", isBookmark, browser); + action_set_sensitive("BookmarkOpenTab", isBookmark, browser); + action_set_sensitive("BookmarkOpenWindow", isBookmark, browser); + + action_set_sensitive("BookmarkEdit", !isSeparator, browser); + + sokoke_widget_popup(widget, GTK_MENU(browser->popup_bookmark), event); +} + +static gboolean on_panel_bookmarks_button_release(GtkWidget* widget + , GdkEventButton* event, CBrowser* browser) +{ + if(event->button != 2 && event->button != 3) + return FALSE; + + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(event->button == 2 && xbel_item_is_bookmark(item)) + { + CBrowser* newBrowser = browser_new(browser); + const gchar* uri = xbel_bookmark_get_href(item); + webView_open(newBrowser->webView, uri); + } + else + panel_bookmarks_popup(widget, event, item, browser); + return TRUE; + } + return FALSE; +} + +void on_panel_bookmarks_popup(GtkWidget* widget, CBrowser* browser) +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + panel_bookmarks_popup(widget, NULL, item, browser); + } +} + +void on_action_bookmarkOpen_activate(GtkAction* action, CBrowser* browser) +{ + GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(xbel_item_is_bookmark(item)) + webView_open(get_nth_webView(-1, browser), xbel_bookmark_get_href(item)); + } +} + +void on_action_bookmarkOpenTab_activate(GtkAction* action, CBrowser* browser) +{ + GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(xbel_item_is_bookmark(item)) + { + CBrowser* newBrowser = browser_new(browser); + const gchar* uri = xbel_bookmark_get_href(item); + webView_open(newBrowser->webView, uri); + } + } +} + +void on_action_bookmarkOpenWindow_activate(GtkAction* action, CBrowser* browser) +{ + GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(xbel_item_is_bookmark(item)) + { + CBrowser* newBrowser = browser_new(NULL); + const gchar* uri = xbel_bookmark_get_href(item); + webView_open(newBrowser->webView, uri); + } + } +} + +void on_action_bookmarkEdit_activate(GtkAction* action, CBrowser* browser) +{ + GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(!xbel_item_is_separator(item)) + browser_editBookmark_dialog_new(item, browser); + } +} + +void on_action_bookmarkDelete_activate(GtkAction* action, CBrowser* browser) +{ + GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + gtk_tree_selection_get_selected(selection, &model, &iter); + XbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + XbelItem* parent = xbel_item_get_parent(item); + xbel_folder_remove_item(parent, item); + xbel_item_unref(item); + } +} + +static void tree_store_insert_folder(GtkTreeStore* treestore, GtkTreeIter* parent + , XbelItem* folder) +{ + guint n = xbel_folder_get_n_items(folder); + guint i; + for(i = 0; i < n; i++) + { + XbelItem* item = xbel_folder_get_nth_item(folder, i); + GtkTreeIter iter; + gtk_tree_store_insert_with_values(treestore, &iter, parent, n, 0, item, -1); + xbel_item_ref(item); + if(xbel_item_is_folder(item)) + tree_store_insert_folder(treestore, &iter, item); + } +} + +static void on_bookmarks_item_render_icon(GtkTreeViewColumn* column + , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter + , GtkWidget* treeview) +{ + XbelItem* item; + gtk_tree_model_get(model, iter, 0, &item, -1); + + if(!xbel_item_get_parent(item)) + { + gtk_tree_store_remove(GTK_TREE_STORE(model), iter); + xbel_item_unref(item); + return; + } + + // TODO: Would it be better to not do this on every redraw? + GdkPixbuf* pixbuf = NULL; + if(xbel_item_is_bookmark(item)) + pixbuf = gtk_widget_render_icon(treeview, STOCK_BOOKMARK + , GTK_ICON_SIZE_MENU, NULL); + else if(xbel_item_is_folder(item)) + pixbuf = gtk_widget_render_icon(treeview, GTK_STOCK_DIRECTORY + , GTK_ICON_SIZE_MENU, NULL); + g_object_set(renderer, "pixbuf", pixbuf, NULL); + if(pixbuf) + g_object_unref(pixbuf); +} + +static void on_bookmarks_item_render_text(GtkTreeViewColumn* column + , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter + , GtkWidget* treeview) +{ + XbelItem* item; + gtk_tree_model_get(model, iter, 0, &item, -1); + + if(!xbel_item_get_parent(item)) + { + gtk_tree_store_remove(GTK_TREE_STORE(model), iter); + xbel_item_unref(item); + return; + } + + if(xbel_item_is_separator(item)) + g_object_set(renderer + , "markup", "Separator", NULL); + else + g_object_set(renderer + , "markup", NULL, "text", xbel_item_get_title(item), NULL); +} + static void create_bookmark_menu(XbelItem*, GtkWidget*, CBrowser*); static void on_bookmark_menu_folder_activate(GtkWidget* menuitem, CBrowser* browser) @@ -972,6 +1205,8 @@ CBrowser* browser_new(CBrowser* oldBrowser) menuitem = gtk_separator_menu_item_new(); gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_bookmarks), menuitem); + browser->popup_bookmark = gtk_ui_manager_get_widget(ui_manager, "/popup_bookmark"); + g_object_ref(browser->popup_bookmark); browser->menu_window = gtk_menu_item_get_submenu( GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, "/menubar/Window"))); menuitem = gtk_separator_menu_item_new(); @@ -1142,6 +1377,40 @@ CBrowser* browser_new(CBrowser* oldBrowser) // Dummy: This is the "fallback" panel for now page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) , gtk_label_new("empty"), NULL); + // Bookmarks + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; + GtkTreeStore* treestore = gtk_tree_store_new(1, G_TYPE_XBEL_ITEM); + GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(treestore)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); + column = gtk_tree_view_column_new(); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf + , (GtkTreeCellDataFunc)on_bookmarks_item_render_icon, treeview, NULL); + renderer_text = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func(column, renderer_text + , (GtkTreeCellDataFunc)on_bookmarks_item_render_text, treeview, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled) + , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(scrolled), treeview); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); + tree_store_insert_folder(GTK_TREE_STORE(treestore), NULL, bookmarks); + g_object_unref(treestore); + g_signal_connect(treeview, "row-activated" + , G_CALLBACK(on_panel_bookmarks_row_activated), browser); + g_signal_connect(treeview, "button-release-event" + , G_CALLBACK(on_panel_bookmarks_button_release), browser); + g_signal_connect(treeview, "popup-menu" + , G_CALLBACK(on_panel_bookmarks_popup), browser); + browser->panel_bookmarks = treeview; + page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) + , scrolled, NULL); + action = gtk_action_group_get_action(browser->actiongroup, "PanelBookmarks"); + g_object_set_data(G_OBJECT(action), "iPage", GINT_TO_POINTER(page)); // Pageholder browser->panel_pageholder = webView_new(&scrolled); page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) @@ -1242,6 +1511,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) browser->actiongroup = oldBrowser->actiongroup; browser->menubar = oldBrowser->menubar; browser->menu_bookmarks = oldBrowser->menu_bookmarks; + browser->popup_bookmark = oldBrowser->popup_bookmark; browser->menu_window = oldBrowser->menu_window; browser->popup_webView = oldBrowser->popup_webView; browser->popup_element = oldBrowser->popup_element; diff --git a/src/browser.h b/src/browser.h index 0d08b352..f25cebd2 100644 --- a/src/browser.h +++ b/src/browser.h @@ -26,6 +26,7 @@ typedef struct _CBrowser // menus GtkWidget* menubar; GtkWidget* menu_bookmarks; + GtkWidget* popup_bookmark; GtkWidget* menu_window; GtkWidget* popup_webView; GtkWidget* popup_element; @@ -42,6 +43,7 @@ typedef struct _CBrowser // panels GtkWidget* panels; GtkWidget* panels_notebook; + GtkWidget* panel_bookmarks; GtkWidget* panel_pageholder; GtkWidget* webViews; // findbox @@ -203,6 +205,21 @@ on_action_link_saveWith_activate(GtkAction*, CBrowser*); void on_action_link_copy_activate(GtkAction*, CBrowser*); +void +on_action_bookmarkOpen_activate(GtkAction*, CBrowser*); + +void +on_action_bookmarkOpenTab_activate(GtkAction*, CBrowser*); + +void +on_action_bookmarkOpenWindow_activate(GtkAction*, CBrowser*); + +void +on_action_bookmarkEdit_activate(GtkAction*, CBrowser*); + +void +on_action_bookmarkDelete_activate(GtkAction*, CBrowser*); + void on_menu_bookmarks_item_activate(GtkWidget*, CBrowser*); @@ -438,6 +455,21 @@ static const GtkActionEntry entries[] = { { "BookmarksManage", STOCK_BOOKMARKS , "_Manage Bookmarks", "b" , "hm?", NULL/*G_CALLBACK(on_action_bookmarks_manage_activate)*/ }, + { "BookmarkOpen", GTK_STOCK_OPEN + , NULL, "" + , "hm?", G_CALLBACK(on_action_bookmarkOpen_activate) }, + { "BookmarkOpenTab", STOCK_TAB_NEW + , "Open in New _Tab", "" + , "hm?", G_CALLBACK(on_action_bookmarkOpenTab_activate) }, + { "BookmarkOpenWindow", STOCK_WINDOW_NEW + , "Open in New _Window", "" + , "hm?", G_CALLBACK(on_action_bookmarkOpenWindow_activate) }, + { "BookmarkEdit", GTK_STOCK_EDIT + , NULL, "" + , "hm?", G_CALLBACK(on_action_bookmarkEdit_activate) }, + { "BookmarkDelete", GTK_STOCK_DELETE + , NULL, "" + , "hm?", G_CALLBACK(on_action_bookmarkDelete_activate) }, { "Tools", NULL, "_Tools" }, diff --git a/src/main.c b/src/main.c index e23eece8..1edd038e 100755 --- a/src/main.c +++ b/src/main.c @@ -204,8 +204,8 @@ int main(int argc, char** argv) { config_free(config); search_engines_free(searchEngines); - xbel_item_free(bookmarks); - xbel_item_free(_session); + xbel_item_unref(bookmarks); + xbel_item_unref(_session); g_string_free(errorMessages, TRUE); return 0; } @@ -254,7 +254,7 @@ int main(int argc, char** argv) browser = browser_new(browser); webView_open(browser->webView, xbel_bookmark_get_href(item)); } - xbel_item_free(_session); + xbel_item_unref(_session); gtk_main(); @@ -277,7 +277,7 @@ int main(int argc, char** argv) g_warning("Bookmarks couldn't be saved. %s", error->message); g_error_free(error); } - xbel_item_free(bookmarks); + xbel_item_unref(bookmarks); g_free(configFile); configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); error = NULL; @@ -286,7 +286,7 @@ int main(int argc, char** argv) g_warning("Tabtrash couldn't be saved. %s", error->message); g_error_free(error); } - xbel_item_free(tabtrash); + xbel_item_unref(tabtrash); g_free(configFile); if(config->startup == CONFIG_STARTUP_SESSION) { @@ -299,7 +299,7 @@ int main(int argc, char** argv) } g_free(configFile); } - xbel_item_free(session); + xbel_item_unref(session); configFile = g_build_filename(configPath, "config", NULL); error = NULL; if(!config_to_file(config, configFile, &error)) diff --git a/src/ui.h b/src/ui.h index e57b7139..a5832109 100644 --- a/src/ui.h +++ b/src/ui.h @@ -166,6 +166,14 @@ static const gchar* ui_markup = "" "" "" + "" + "" + "" + "" + "" + "" + "" + "" "" "" "" diff --git a/src/webView.c b/src/webView.c index 03845218..24a2809b 100644 --- a/src/webView.c +++ b/src/webView.c @@ -292,12 +292,18 @@ void on_webView_destroy(GtkWidget* widget, CBrowser* browser) browsers = g_list_delete_link(browsers, tmp); g_free(browser->elementUri); g_free(browser->statusMessage); - if(!g_list_length(browsers)) + // FIXME: Multiple windows are not taken into account + if(!g_list_nth(browsers, 0)) { g_object_unref(browser->actiongroup); + g_object_unref(browser->popup_bookmark); g_object_unref(browser->popup_webView); g_object_unref(browser->popup_element); g_object_unref(browser->popup_editable); + guint i; + guint n = xbel_folder_get_n_items(bookmarks); + for(i = 0; i < n; i++) + xbel_item_unref(xbel_folder_get_nth_item(bookmarks, i)); gtk_main_quit(); } } @@ -340,12 +346,11 @@ void webView_close(GtkWidget* webView, CBrowser* browser) if(n > 10) { XbelItem* item = xbel_folder_get_nth_item(tabtrash, n - 1); - xbel_folder_remove_item(tabtrash, item); - xbel_item_free(item); + xbel_item_unref(item); } } else - xbel_item_free(browser->sessionItem); + xbel_item_unref(browser->sessionItem); gtk_widget_destroy(browser->webView_menu); gtk_notebook_remove_page(GTK_NOTEBOOK(browser->webViews) , get_webView_index(webView, browser)); diff --git a/src/xbel.c b/src/xbel.c index f788e4ca..07b625da 100644 --- a/src/xbel.c +++ b/src/xbel.c @@ -38,6 +38,7 @@ static XbelItem* xbel_item_new(XbelItemKind kind) { XbelItem* item = g_new(XbelItem, 1); + item->refs = 1; item->parent = NULL; item->kind = kind; if(kind == XBEL_ITEM_FOLDER) @@ -220,18 +221,41 @@ static gboolean xbel_folder_from_xmlDocPtr(XbelItem* folder, xmlDocPtr doc) } /** - * xbel_item_free: + * xbel_item_ref: * @item: a valid item * - * Free an XbelItem. If @item is a folder all of its children will also - * be freed automatically. + * Ref an XbelItem. * - * The item must not be contained in a folder or attempting to free it will fail. + * Ref means that the reference count is increased by one. + * + * This has no effect on children of a folder. **/ -void xbel_item_free(XbelItem* item) +void xbel_item_ref(XbelItem* item) { g_return_if_fail(item); - g_return_if_fail(!xbel_item_get_parent(item)); + item->refs++; +} + +/** + * xbel_item_unref: + * @item: a valid item + * + * Unref an XbelItem. If @item is a folder all of its children will also + * be unreffed automatically. + * + * Unref means that the reference count is decreased. If there are no + * references left, the memory will be freed and if needed removed from + * its containing folder. + **/ +void xbel_item_unref(XbelItem* item) +{ + g_return_if_fail(item); + item->refs--; + if(item->refs) + return; + XbelItem* parent = xbel_item_get_parent(item); + if(parent) + xbel_folder_remove_item(parent, item); if(xbel_item_is_folder(item)) { guint n = xbel_folder_get_n_items(item); @@ -240,7 +264,7 @@ void xbel_item_free(XbelItem* item) { XbelItem* _item = xbel_folder_get_nth_item(item, i); _item->parent = NULL; - xbel_item_free(_item); + xbel_item_unref(_item); } g_list_free(item->items); } @@ -260,7 +284,7 @@ void xbel_item_free(XbelItem* item) * * Copy an XbelItem. * - * The returned item must be freed eventually. + * The returned item must be unreffed eventually. * * Return value: a copy of @item **/ diff --git a/src/xbel.h b/src/xbel.h index cf593ea0..2fb6bf40 100644 --- a/src/xbel.h +++ b/src/xbel.h @@ -37,6 +37,7 @@ typedef enum // Note: This structure is entirely private. typedef struct { + guint refs; XbelItemKind kind; struct XbelItem* parent; @@ -60,7 +61,10 @@ XbelItem* xbel_folder_new(void); void -xbel_item_free(XbelItem*); +xbel_item_ref(XbelItem*); + +void +xbel_item_unref(XbelItem*); XbelItem* xbel_item_copy(XbelItem*); From 36a97da3b8612418ff85c01c41109f0e5be6b59c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 1 Jan 2008 00:14:46 +0100 Subject: [PATCH 0015/2970] Implement editing menu items for the web view. Enable edit menu items in the menubar for the web view and show editing related items in the context menu when appropriate. --- src/browser.c | 2 +- src/helpers.c | 20 ++++++++++---------- src/webView.c | 24 ++++++++++++------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/browser.c b/src/browser.c index 1e0a9d99..8f09d623 100644 --- a/src/browser.c +++ b/src/browser.c @@ -95,7 +95,7 @@ void on_action_delete_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); if(WEBKIT_IS_WEB_VIEW(widget)) - ;//webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); + webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); else if(GTK_IS_EDITABLE(widget)) gtk_editable_delete_selection(GTK_EDITABLE(widget)); } diff --git a/src/helpers.c b/src/helpers.c index 914d47b1..9fdaa5b0 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -333,20 +333,20 @@ void update_edit_items(CBrowser* browser) GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); gboolean hasSelection = FALSE; gboolean canCut = FALSE; gboolean canCopy = FALSE; gboolean canPaste = FALSE; - if(widget && (/*WEBKIT_IS_WEB_VIEW(widget) || */GTK_IS_EDITABLE(widget))) + if(widget && (WEBKIT_IS_WEB_VIEW(widget) || GTK_IS_EDITABLE(widget))) { - hasSelection = /*WEBKIT_IS_WEB_VIEW(widget) - ? webkit_web_view_has_selection(WEBKIT_WEB_VIEW(widget), NULL, NULL) - : */gtk_editable_get_selection_bounds(GTK_EDITABLE(widget), NULL, NULL); - canCut = /*WEBKIT_IS_WEB_VIEW(widget) + hasSelection = WEBKIT_IS_WEB_VIEW(widget) + ? webkit_web_view_has_selection(WEBKIT_WEB_VIEW(widget)) + : gtk_editable_get_selection_bounds(GTK_EDITABLE(widget), NULL, NULL); + canCut = WEBKIT_IS_WEB_VIEW(widget) ? webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(widget)) - : */hasSelection && gtk_editable_get_editable(GTK_EDITABLE(widget)); - canCopy = /*WEBKIT_IS_WEB_VIEW(widget) + : hasSelection && gtk_editable_get_editable(GTK_EDITABLE(widget)); + canCopy = WEBKIT_IS_WEB_VIEW(widget) ? webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(widget)) - : */hasSelection; - canPaste = /*WEBKIT_IS_WEB_VIEW(widget) + : hasSelection; + canPaste = WEBKIT_IS_WEB_VIEW(widget) ? webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(widget)) - : */gtk_editable_get_editable(GTK_EDITABLE(widget)); + : gtk_editable_get_editable(GTK_EDITABLE(widget)); } action_set_sensitive("Cut", canCut, browser); action_set_sensitive("Copy", canCopy, browser); diff --git a/src/webView.c b/src/webView.c index 24a2809b..14d8e160 100644 --- a/src/webView.c +++ b/src/webView.c @@ -162,8 +162,8 @@ void webView_popup(GtkWidget* webView, GdkEventButton* event, CBrowser* browser) gboolean isLink = browser->elementUri != NULL; // Did we right-click a link? gboolean haveLinks = FALSE; // TODO: Are several links selected? gboolean isImage = FALSE; // TODO: Did we right-click an image? - gboolean isEditable = FALSE; //webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(webView)); //... - gchar* selection = NULL; //webkit_web_view_get_selected_text(WEBKIT_WEB_VIEW(webView)); + gboolean isEditable = webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(webView)); + gboolean hasSelection = webkit_web_view_has_selection(WEBKIT_WEB_VIEW(webView)); update_edit_items(browser); @@ -180,10 +180,10 @@ void webView_popup(GtkWidget* webView, GdkEventButton* event, CBrowser* browser) action_set_visible("LinkCopy", isLink, browser); action_set_visible("LinkBookmarkNew", isLink, browser); - action_set_visible("SelectionLinksNewTabs", haveLinks && selection && *selection, browser); - action_set_visible("SelectionTextTabNew", haveLinks && selection && *selection, browser); - action_set_visible("SelectionTextTabCurrent", haveLinks && selection && *selection, browser); - action_set_visible("SelectionTextWindowNew", haveLinks && selection && *selection, browser); + action_set_visible("SelectionLinksNewTabs", haveLinks && hasSelection, browser); + action_set_visible("SelectionTextTabNew", haveLinks && hasSelection, browser); + action_set_visible("SelectionTextTabCurrent", haveLinks && hasSelection, browser); + action_set_visible("SelectionTextWindowNew", haveLinks && hasSelection, browser); action_set_visible("ImageViewTabNew", isImage, browser); action_set_visible("ImageViewTabCurrent", isImage, browser); @@ -191,16 +191,16 @@ void webView_popup(GtkWidget* webView, GdkEventButton* event, CBrowser* browser) action_set_visible("ImageSaveWith", isImage && canDownload, browser); action_set_visible("ImageCopy", isImage, browser); - action_set_visible("Copy_", (selection && *selection) || isEditable, browser); - action_set_visible("SelectionSearch", selection && *selection, browser); - action_set_visible("SelectionSearchWith", selection && *selection, browser); - action_set_visible("SelectionSourceView", selection && *selection, browser); + action_set_visible("Copy_", hasSelection || isEditable, browser); + action_set_visible("SelectionSearch", hasSelection, browser); + action_set_visible("SelectionSearchWith", hasSelection, browser); + action_set_visible("SelectionSourceView", hasSelection, browser); - action_set_visible("SourceView", !selection, browser); + action_set_visible("SourceView", !hasSelection, browser); if(isEditable) sokoke_widget_popup(webView, GTK_MENU(browser->popup_editable), event); - else if(isLink || isImage || (selection && *selection)) + else if(isLink || isImage || hasSelection) sokoke_widget_popup(webView, GTK_MENU(browser->popup_element), event); else sokoke_widget_popup(webView, GTK_MENU(browser->popup_webView), event); From 1b0b15f3de0c5f98d2f086db5c213038c4c65a40 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 1 Jan 2008 00:37:10 +0100 Subject: [PATCH 0016/2970] Bump version to 0.0.16 Add Ori Bernstein to AUTHORS. --- AUTHORS | 5 ++++- ChangeLog | 14 ++++++++++++++ configure.in | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 30771a0e..9727b797 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,4 +5,7 @@ Artwork by: Nancy Runge Translations: - de: Christian Dywan \ No newline at end of file + de: Christian Dywan + +Contributors: + Ori Bernstein diff --git a/ChangeLog b/ChangeLog index 99e275cd..af3a70df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +v0.0.16: + + Implement editing menu items for the web view. + + Implement the bookmarks panel with editing capabilities. + + Prevent repeated checks for the desktop environment. + + Fix coding style in sokoke.c/ sokoke.h, particularly variable names. + + Don't update the remembered window size when maximized. + + Don't remember the window position but the size only. + + Command line uris should replace the default page. + + More effective status updates and less entry flickering + + Enable inline find for websites + + Make the progressbar work properly again + + Build fix: Adapt WebKit api changes + + Add Tab Size to preferences dialog + v0.0.15: + Build fix: Remove search api diff --git a/configure.in b/configure.in index 15bece5c..46034966 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.15], [christian@twotoasts.de]) +AC_INIT([midori], [0.0.16], [christian@twotoasts.de]) AC_CONFIG_SRCDIR([src/main.h]) AC_CONFIG_HEADER([config.h]) From 75b0dc673536cde0a9f5d5441d7d2f55e656ac4f Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Wed, 2 Jan 2008 07:34:58 +0100 Subject: [PATCH 0017/2970] Open the default page only if there is no session and no uri on the cli. We only want to open a default homepage or blank page if neither sessions are in use nor any uri is passed on the command line. --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 1edd038e..c5456db8 100755 --- a/src/main.c +++ b/src/main.c @@ -229,7 +229,7 @@ int main(int argc, char** argv) } g_free(uri); - if(config->startup != CONFIG_STARTUP_SESSION || xbel_folder_is_empty(_session)) + if(xbel_folder_is_empty(_session)) { XbelItem* item = xbel_bookmark_new(); if(config->startup == CONFIG_STARTUP_BLANK) From 7c45654993394116d1fe9f7471f7091d6879b1ba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 3 Jan 2008 02:16:06 +0100 Subject: [PATCH 0018/2970] Handle the context menu on button press, not release. As stated in the reference popup menus should be opended from button-press-event instead of button-release-event. --- src/browser.c | 2 +- src/webView.c | 2 +- src/webView.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser.c b/src/browser.c index 8f09d623..f98d4016 100644 --- a/src/browser.c +++ b/src/browser.c @@ -1629,7 +1629,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) , "plugins-enabled" , config->enablePlugins , NULL); - DOC_CONNECT ("button-release-event" , on_webView_button_release) + DOC_CONNECT ("button-press-event" , on_webView_button_press) DOC_CONNECT ("popup-menu" , on_webView_popup); DOC_CONNECT ("scroll-event" , on_webView_scroll); DOC_CONNECT ("leave-notify-event" , on_webView_leave) diff --git a/src/webView.c b/src/webView.c index 14d8e160..3a8e392b 100644 --- a/src/webView.c +++ b/src/webView.c @@ -206,7 +206,7 @@ void webView_popup(GtkWidget* webView, GdkEventButton* event, CBrowser* browser) sokoke_widget_popup(webView, GTK_MENU(browser->popup_webView), event); } -gboolean on_webView_button_release(GtkWidget* webView, GdkEventButton* event +gboolean on_webView_button_press(GtkWidget* webView, GdkEventButton* event , CBrowser* browser) { GdkModifierType state = (GdkModifierType)0; diff --git a/src/webView.h b/src/webView.h index 0bac16f5..325aa4a0 100644 --- a/src/webView.h +++ b/src/webView.h @@ -58,7 +58,7 @@ on_webView_window_open(GtkWidget*, const gchar*, CBrowser*); */ gboolean -on_webView_button_release(GtkWidget*, GdkEventButton*, CBrowser*); +on_webView_button_press(GtkWidget*, GdkEventButton*, CBrowser*); void on_webView_popup(GtkWidget*, CBrowser*); From 3fc2bced1286d8d2adbb93dc4cea49cf8080dbef Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 4 Jan 2008 06:08:42 +0100 Subject: [PATCH 0019/2970] Previous/ next tab menu items should be disabled when not needed. --- src/helpers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/helpers.c b/src/helpers.c index 9fdaa5b0..ed0a5a27 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -401,6 +401,9 @@ void update_browser_actions(CBrowser* browser) gboolean active = gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) > 1; gtk_notebook_set_show_tabs(GTK_NOTEBOOK(browser->webViews), active); action_set_sensitive("TabClose", active, browser); + action_set_sensitive("TabPrevious", active, browser); + action_set_sensitive("TabNext", active, browser); + gboolean tabtrashEmpty = xbel_folder_is_empty(tabtrash); action_set_sensitive("UndoTabClose", !tabtrashEmpty, browser); action_set_sensitive("TabsClosed", !tabtrashEmpty, browser); From 4a8b2bb226a33ebd34e1c1d895eaade2d5568111 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 4 Jan 2008 08:41:20 +0100 Subject: [PATCH 0020/2970] Always enable Select All if an editable widget is focussed. --- src/helpers.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/helpers.c b/src/helpers.c index ed0a5a27..2981931c 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -331,11 +331,10 @@ void update_statusbar(CBrowser* browser) void update_edit_items(CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - gboolean hasSelection = FALSE; gboolean canCut = FALSE; gboolean canCopy = FALSE; gboolean canPaste = FALSE; if(widget && (WEBKIT_IS_WEB_VIEW(widget) || GTK_IS_EDITABLE(widget))) { - hasSelection = WEBKIT_IS_WEB_VIEW(widget) + gboolean hasSelection = WEBKIT_IS_WEB_VIEW(widget) ? webkit_web_view_has_selection(WEBKIT_WEB_VIEW(widget)) : gtk_editable_get_selection_bounds(GTK_EDITABLE(widget), NULL, NULL); canCut = WEBKIT_IS_WEB_VIEW(widget) @@ -347,12 +346,14 @@ void update_edit_items(CBrowser* browser) canPaste = WEBKIT_IS_WEB_VIEW(widget) ? webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(widget)) : gtk_editable_get_editable(GTK_EDITABLE(widget)); + action_set_sensitive("SelectAll", TRUE, browser); } + else + action_set_sensitive("SelectAll", FALSE, browser); action_set_sensitive("Cut", canCut, browser); action_set_sensitive("Copy", canCopy, browser); action_set_sensitive("Paste", canPaste, browser); action_set_sensitive("Delete", canCut, browser); - action_set_sensitive("SelectAll", !hasSelection, browser); } void update_gui_state(CBrowser* browser) From e2328a4bfcd0fd595209d01914c2ee6b6fe6965a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 5 Jan 2008 06:24:38 +0100 Subject: [PATCH 0021/2970] Implement a throbber widget. The throbber is used in the menubar and individual tabs. Clean infrastructure for private G* extensions is added. --- .gitignore | 5 + Makefile.am | 2 +- autogen.sh | 1 + configure.in | 4 +- katze/Makefile.am | 13 + katze/katze-throbber.c | 878 +++++++++++++++++++++++++++++++++++++++++ katze/katze-throbber.h | 119 ++++++ katze/katze-utils.c | 12 + katze/katze-utils.h | 50 +++ katze/katze.h | 18 + src/Makefile.am | 46 ++- src/browser.c | 7 +- src/helpers.c | 14 +- 13 files changed, 1142 insertions(+), 27 deletions(-) create mode 100644 katze/Makefile.am create mode 100644 katze/katze-throbber.c create mode 100644 katze/katze-throbber.h create mode 100644 katze/katze-utils.c create mode 100644 katze/katze-utils.h create mode 100644 katze/katze.h diff --git a/.gitignore b/.gitignore index 14af9aa6..9f8d6522 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,16 @@ +*.la +*.lo *.o .deps +.libs aclocal.m4 autom4te.cache config.* configure depcomp install-sh +libtool +ltmain.sh Makefile Makefile.in missing diff --git a/Makefile.am b/Makefile.am index cd36747b..95418862 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = src +SUBDIRS = katze src desktopdir = $(datadir)/applications desktop_DATA = midori.desktop diff --git a/autogen.sh b/autogen.sh index 863dee9f..739a102c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,6 @@ #!/bin/sh +libtoolize --copy --force aclocal autoheader autoconf diff --git a/configure.in b/configure.in index 46034966..80742357 100644 --- a/configure.in +++ b/configure.in @@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR([src/main.h]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) +AM_PROG_LIBTOOL # Checks for programs AC_PROG_CC @@ -83,7 +84,8 @@ AC_DEFINE_UNQUOTED([LIBXML_VER], "$LIBXML_VER", [libXML2 version]) # Here we tell the configure script which files to *create* AC_CONFIG_FILES([ - Makefile \ + Makefile \ + katze/Makefile \ src/Makefile ]) AC_OUTPUT diff --git a/katze/Makefile.am b/katze/Makefile.am new file mode 100644 index 00000000..f0b2a9fb --- /dev/null +++ b/katze/Makefile.am @@ -0,0 +1,13 @@ +INCLUDES = \ + $(GTK_CFLAGS) + +noinst_LTLIBRARIES = \ + libkatze.la + +libkatze_la_LIBADD = \ + $(GTK_LIBS) + +libkatze_la_SOURCES = \ + katze.h \ + katze-throbber.c katze-throbber.h \ + katze-utils.c katze-utils.h diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c new file mode 100644 index 00000000..fb31912f --- /dev/null +++ b/katze/katze-throbber.c @@ -0,0 +1,878 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-throbber.h" + +#include + +G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC) + +struct _KatzeThrobberPrivate +{ + GtkIconSize icon_size; + gchar* icon_name; + GdkPixbuf* pixbuf; + gchar* stock_id; + gboolean animated; + gchar* static_icon_name; + GdkPixbuf* static_pixbuf; + gchar* static_stock_id; + + gint index; + gint timer_id; + gint width; + gint height; +}; + +#define KATZE_THROBBER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KATZE_TYPE_THROBBER, KatzeThrobberPrivate)) + +enum +{ + PROP_0, + + PROP_ICON_SIZE, + PROP_ICON_NAME, + PROP_PIXBUF, + PROP_ANIMATED, + PROP_STATIC_ICON_NAME, + PROP_STATIC_PIXBUF, + PROP_STATIC_STOCK_ID +}; + +static void +katze_throbber_dispose(GObject* object); + +static void +katze_throbber_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +katze_throbber_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +katze_throbber_destroy (GtkObject* object); + +static void +katze_throbber_realize (GtkWidget* widget); + +static void +katze_throbber_unrealize (GtkWidget* widget); + +static void +katze_throbber_map (GtkWidget* widget); + +static void +katze_throbber_unmap (GtkWidget* widget); + +static void +katze_throbber_style_set (GtkWidget* widget, + GtkStyle* style); + +static void +katze_throbber_screen_changed (GtkWidget* widget, + GdkScreen* screen_prev); + +static void +katze_throbber_size_request (GtkWidget* widget, + GtkRequisition* requisition); + +static gboolean +katze_throbber_expose_event (GtkWidget* widget, + GdkEventExpose* event); + +static void +icon_theme_changed (KatzeThrobber* throbber); + +static gboolean +katze_throbber_timeout (KatzeThrobber* throbber); + +static void +katze_throbber_timeout_destroy (KatzeThrobber* throbber); + +static void +katze_throbber_class_init (KatzeThrobberClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->dispose = katze_throbber_dispose; + gobject_class->set_property = katze_throbber_set_property; + gobject_class->get_property = katze_throbber_get_property; + + GtkObjectClass* object_class = GTK_OBJECT_CLASS (class); + object_class->destroy = katze_throbber_destroy; + + GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (class); + widget_class->realize = katze_throbber_realize; + widget_class->unrealize = katze_throbber_unrealize; + widget_class->map = katze_throbber_map; + widget_class->unmap = katze_throbber_unmap; + widget_class->style_set = katze_throbber_style_set; + widget_class->screen_changed = katze_throbber_screen_changed; + widget_class->size_request = katze_throbber_size_request; + widget_class->expose_event = katze_throbber_expose_event; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_ICON_SIZE, + g_param_spec_int ( + "icon-size", + "Icon size", + "Symbolic size to use for the animation", + 0, G_MAXINT, GTK_ICON_SIZE_MENU, + flags)); + + g_object_class_install_property (gobject_class, + PROP_ICON_NAME, + g_param_spec_string ( + "icon-name", + "Icon Name", + "The name of an icon containing animation frames", + "process-working", + flags)); + + g_object_class_install_property (gobject_class, + PROP_PIXBUF, + g_param_spec_object ( + "pixbuf", + "Pixbuf", + "A GdkPixbuf containing animation frames", + GDK_TYPE_PIXBUF, + flags)); + + g_object_class_install_property (gobject_class, + PROP_ANIMATED, + g_param_spec_boolean ( + "animated", + "Animated", + "Whether the throbber should be animated", + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_STATIC_ICON_NAME, + g_param_spec_string ( + "static-icon-name", + "Static Icon Name", + "The name of an icon to be used as the static image", + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_PIXBUF, + g_param_spec_object ( + "static-pixbuf", + "Static Pixbuf", + "A GdkPixbuf to be used as the static image", + GDK_TYPE_PIXBUF, + flags)); + + g_object_class_install_property (gobject_class, + PROP_STATIC_STOCK_ID, + g_param_spec_string ( + "static-stock-id", + "Static Stock ID", + "The stock ID of an icon to be used as the static image", + NULL, + flags)); + + g_type_class_add_private (object_class, sizeof (KatzeThrobberPrivate)); +} + +static void +katze_throbber_init (KatzeThrobber *throbber) +{ + GTK_WIDGET_SET_FLAGS (throbber, GTK_NO_WINDOW); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + priv->timer_id = -1; +} + +static void +katze_throbber_dispose (GObject *object) +{ + KatzeThrobber* throbber = KATZE_THROBBER (object); + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + if (G_UNLIKELY (priv->timer_id >= 0)) + g_source_remove (priv->timer_id); + + (*G_OBJECT_CLASS (katze_throbber_parent_class)->dispose) (object); +} + +static void +katze_throbber_destroy (GtkObject *object) +{ + KatzeThrobber* throbber = KATZE_THROBBER (object); + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + katze_assign (priv->icon_name, NULL); + if (priv->pixbuf) + katze_object_assign (priv->pixbuf, NULL); + katze_assign (priv->static_icon_name, NULL); + if (priv->static_pixbuf) + katze_object_assign (priv->static_pixbuf, NULL); + katze_assign (priv->static_stock_id, NULL); + + GTK_OBJECT_CLASS (katze_throbber_parent_class)->destroy (object); +} + +static void +katze_throbber_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + KatzeThrobber* throbber = KATZE_THROBBER (object); + + switch (prop_id) + { + case PROP_ICON_SIZE: + katze_throbber_set_icon_size (throbber, g_value_get_int (value)); + break; + case PROP_ICON_NAME: + katze_throbber_set_icon_name (throbber, g_value_get_string (value)); + break; + case PROP_PIXBUF: + katze_throbber_set_pixbuf (throbber, g_value_get_object (value)); + break; + case PROP_ANIMATED: + katze_throbber_set_animated (throbber, g_value_get_boolean (value)); + break; + case PROP_STATIC_ICON_NAME: + katze_throbber_set_static_icon_name (throbber, g_value_get_string (value)); + break; + case PROP_STATIC_PIXBUF: + katze_throbber_set_static_pixbuf (throbber, g_value_get_object (value)); + break; + case PROP_STATIC_STOCK_ID: + katze_throbber_set_static_stock_id (throbber, g_value_get_string (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +katze_throbber_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + KatzeThrobber* throbber = KATZE_THROBBER (object); + + switch (prop_id) + { + case PROP_ICON_SIZE: + g_value_set_int (value, katze_throbber_get_icon_size (throbber)); + break; + case PROP_ICON_NAME: + g_value_set_string (value, katze_throbber_get_icon_name (throbber)); + break; + case PROP_PIXBUF: + g_value_set_object (value, katze_throbber_get_pixbuf (throbber)); + break; + case PROP_ANIMATED: + g_value_set_boolean (value, katze_throbber_get_animated (throbber)); + break; + case PROP_STATIC_ICON_NAME: + g_value_set_string (value, katze_throbber_get_static_icon_name (throbber)); + break; + case PROP_STATIC_PIXBUF: + g_value_set_object (value, katze_throbber_get_static_pixbuf (throbber)); + break; + case PROP_STATIC_STOCK_ID: + g_value_set_string (value, katze_throbber_get_static_stock_id (throbber)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * katze_throbber_new: + * + * Creates a new throbber widget. + * + * Return value: a new #KatzeThrobber + **/ +GtkWidget* +katze_throbber_new (void) +{ + KatzeThrobber* throbber = g_object_new (KATZE_TYPE_THROBBER, + NULL); + + return GTK_WIDGET (throbber); +} + +/** + * katze_throbber_set_icon_size: + * @throbber: a #KatzeThrobber + * @icon_size: the new icon size + * + * Sets the desired size of the throbber image. The animation and static image + * will be displayed in this size. If a pixbuf is used for the animation every + * single frame is assumed to have this size. + **/ +void +katze_throbber_set_icon_size (KatzeThrobber* throbber, + GtkIconSize icon_size) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + g_return_if_fail (gtk_icon_size_lookup (icon_size, + &priv->width, + &priv->height)); + + priv->icon_size = icon_size; + + g_object_notify (G_OBJECT (throbber), "icon-size"); +} + +/** + * katze_throbber_set_icon_name: + * @throbber: a #KatzeThrobber + * @icon_name: an icon name or %NULL + * + * Sets the name of an icon that should provide the animation frames. + * + * The pixbuf is automatically invalidated. + **/ +void +katze_throbber_set_icon_name (KatzeThrobber* throbber, + const gchar* icon_name) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + katze_assign (priv->icon_name, g_strdup (icon_name)); + + if (icon_name) + icon_theme_changed (throbber); + + g_object_notify (G_OBJECT (throbber), "icon-name"); +} + +/** + * katze_throbber_set_pixbuf: + * @throbber: a #KatzeThrobber + * @pixbuf: a #GdkPixbuf or %NULL + * + * Sets the pixbuf that should provide the animation frames. Every frame + * is assumed to have the icon size of the throbber, which can be specified + * with katze_throbber_set_icon_size (). + * + * The icon name is automatically invalidated. + **/ +void +katze_throbber_set_pixbuf (KatzeThrobber* throbber, + GdkPixbuf *pixbuf) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + katze_object_assign (priv->pixbuf, pixbuf); + + if (pixbuf) + { + g_object_ref (pixbuf); + + katze_assign (priv->icon_name, NULL); + } + + gtk_widget_queue_draw (GTK_WIDGET (throbber)); + + g_object_notify (G_OBJECT (throbber), "pixbuf"); +} + +/** + * katze_throbber_set_animated: + * @throbber: a #KatzeThrobber + * @animated: %TRUE to animate the throbber + * + * Sets the animation state of the throbber. + **/ +void +katze_throbber_set_animated (KatzeThrobber* throbber, + gboolean animated) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + if (G_UNLIKELY (priv->animated == animated)) + return; + + priv->animated = animated; + + if (animated && (priv->timer_id < 0)) + priv->timer_id = g_timeout_add_full ( + G_PRIORITY_LOW, 50, + (GSourceFunc)katze_throbber_timeout, + throbber, + (GDestroyNotify)katze_throbber_timeout_destroy); + + gtk_widget_queue_draw (GTK_WIDGET (throbber)); + + g_object_notify (G_OBJECT (throbber), "animated"); +} + +/** + * katze_throbber_set_static_icon_name: + * @throbber: a #KatzeThrobber + * @icon_name: an icon name or %NULL + * + * Sets the name of an icon that should provide the static image. + * + * The static pixbuf and stock ID are automatically invalidated. + **/ +void +katze_throbber_set_static_icon_name (KatzeThrobber* throbber, + const gchar* icon_name) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + katze_assign (priv->static_icon_name, g_strdup (icon_name)); + + if (icon_name) + { + katze_assign (priv->static_stock_id, NULL); + + icon_theme_changed (throbber); + } + + g_object_notify (G_OBJECT (throbber), "static-icon-name"); +} + +/** + * katze_throbber_set_static_pixbuf: + * @throbber: a #KatzeThrobber + * @pixbuf: a #GdkPixbuf or %NULL + * + * Sets the pixbuf that should provide the static image. The pixbuf is + * assumed to have the icon size of the throbber, which can be specified + * with katze_throbber_set_icon_size (). + * + * The static icon name and stock ID are automatically invalidated. + **/ +void +katze_throbber_set_static_pixbuf (KatzeThrobber* throbber, + GdkPixbuf *pixbuf) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + katze_object_assign (priv->static_pixbuf, pixbuf); + + if (pixbuf) + { + g_object_ref (pixbuf); + + katze_assign (priv->static_icon_name, NULL); + katze_assign (priv->static_stock_id, NULL); + } + + g_object_notify (G_OBJECT (throbber), "static-pixbuf"); +} + +/** + * katze_throbber_set_static_stock_id: + * @throbber: a #KatzeThrobber + * @stock_id: a stock ID or %NULL + * + * Sets the stock ID of an icon that should provide the static image. + * + * The statc icon name and pixbuf are automatically invalidated. + **/ +void +katze_throbber_set_static_stock_id (KatzeThrobber* throbber, + const gchar* stock_id) +{ + g_return_if_fail (KATZE_IS_THROBBER (throbber)); + + if (stock_id) + { + GtkStockItem stock_item; + g_return_if_fail (gtk_stock_lookup (stock_id, &stock_item)); + } + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + katze_assign (priv->static_stock_id, g_strdup (stock_id)); + + if (stock_id) + icon_theme_changed (throbber); + + g_object_notify (G_OBJECT (throbber), "static-stock-id"); +} + +/** + * katze_throbber_get_icon_size: + * @throbber: a #KatzeThrobber + * + * Retrieves the size of the throbber. + * + * Return value: the size of the throbber + **/ +GtkIconSize +katze_throbber_get_icon_size (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), GTK_ICON_SIZE_INVALID); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->icon_size; +} + +/** + * katze_throbber_get_icon_name: + * @throbber: a #KatzeThrobber + * + * Retrieves the name of the icon providing the animation frames. + * + * Return value: the name of the icon providing the animation frames, or %NULL + **/ +const gchar* +katze_throbber_get_icon_name (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->icon_name; +} + +/** + * katze_throbber_get_pixbuf: + * @throbber: a #KatzeThrobber + * + * Retrieves the #GdkPixbuf providing the animation frames if an icon name + * or pixbuf is available. The caller of this function does not own a + * reference to the returned pixbuf. + * + * Return value: the pixbuf providing the animation frames, or %NULL + **/ +GdkPixbuf* +katze_throbber_get_pixbuf (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->pixbuf; +} + +/** + * katze_throbber_get_animated: + * @throbber: a #KatzeThrobber + * + * Retrieves the status of the animation, whcih can be animated or static. + * + * Return value: %TRUE if the throbber is animated + **/ +gboolean +katze_throbber_get_animated (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), FALSE); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->animated; +} + +/** + * katze_throbber_get_static_icon_name: + * @throbber: a #KatzeThrobber + * + * Retrieves the name of the icon providing the static image, if an icon name + * for the static image was specified. + * + * Return value: the name of the icon providing the static image, or %NULL + **/ +const gchar* +katze_throbber_get_static_icon_name (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->static_icon_name; +} + +/** + * katze_throbber_get_static pixbuf: + * @throbber: a #KatzeThrobber + * + * Retrieves the #GdkPixbuf providing the static image, if an icon name, a + * pixbuf or a stock ID for the static image was specified. The caller of this + * function does not own a reference to the returned pixbuf. + * + * Return value: the pixbuf providing the static image, or %NULL + **/ +GdkPixbuf* +katze_throbber_get_static_pixbuf (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->static_pixbuf; +} + +/** + * katze_throbber_get_static_stock_id: + * @throbber: a #KatzeThrobber + * + * Retrieves the stock ID of the icon providing the static image, if a + * stock ID for the static image was specified. + * + * Return value: the stock ID of the icon providing the static image, or %NULL + **/ +const gchar* +katze_throbber_get_static_stock_id (KatzeThrobber* throbber) +{ + g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + return priv->static_stock_id; +} + +static void +katze_throbber_realize (GtkWidget* widget) +{ + (*GTK_WIDGET_CLASS (katze_throbber_parent_class)->realize) (widget); + + icon_theme_changed (KATZE_THROBBER (widget)); +} + +static void +katze_throbber_unrealize (GtkWidget* widget) +{ + if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize) + GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize (widget); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (KATZE_THROBBER (widget)); + katze_object_assign (priv->pixbuf, NULL); + katze_object_assign (priv->static_pixbuf, NULL); +} + +static void +pixbuf_assign_icon (GdkPixbuf** pixbuf, + const gchar* icon_name, + KatzeThrobber* throbber) +{ + if (*pixbuf) + g_object_unref (*pixbuf); + + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (throbber)); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + *pixbuf = gtk_icon_theme_load_icon (icon_theme, + icon_name, + MAX (priv->width, priv->height), + (GtkIconLookupFlags) 0, + NULL); +} + +static void +icon_theme_changed (KatzeThrobber* throbber) +{ + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + if (priv->icon_name) + pixbuf_assign_icon (&priv->pixbuf, priv->icon_name, + throbber); + + if (priv->static_icon_name) + pixbuf_assign_icon (&priv->static_pixbuf, priv->static_icon_name, + throbber); + else if (priv->static_stock_id) + { + if (priv->static_pixbuf) + g_object_unref (priv->static_pixbuf); + + priv->static_pixbuf = gtk_widget_render_icon (GTK_WIDGET (throbber), + priv->static_stock_id, + priv->icon_size, + NULL); + } + + gtk_widget_queue_draw (GTK_WIDGET (throbber)); +} + +static void +katze_throbber_map (GtkWidget* widget) +{ + (*GTK_WIDGET_CLASS (katze_throbber_parent_class)->map) (widget); +} + +static void +katze_throbber_unmap (GtkWidget* widget) +{ + if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap) + GTK_WIDGET_CLASS (katze_throbber_parent_class)->unmap (widget); +} + +static gboolean +katze_throbber_timeout (KatzeThrobber* throbber) +{ + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + priv->index++; + gtk_widget_queue_draw (GTK_WIDGET (throbber)); + + return priv->animated; +} + +static void +katze_throbber_timeout_destroy (KatzeThrobber* throbber) +{ + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + priv->index = 0; + priv->timer_id = -1; +} + +static void +katze_throbber_style_set (GtkWidget* widget, + GtkStyle* prev_style) +{ + if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set) + GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set (widget, + prev_style); + + icon_theme_changed (KATZE_THROBBER (widget)); +} + +static void +katze_throbber_screen_changed (GtkWidget* widget, + GdkScreen* prev_screen) +{ + if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed) + GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed ( + widget, + prev_screen); + + icon_theme_changed (KATZE_THROBBER (widget)); +} + +static void +katze_throbber_size_request (GtkWidget* widget, + GtkRequisition* requisition) +{ + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (KATZE_THROBBER (widget)); + + requisition->width = priv->width; + requisition->height = priv->height; + + GTK_WIDGET_CLASS (katze_throbber_parent_class)->size_request (widget, + requisition); +} + +static gboolean +katze_throbber_expose_event (GtkWidget* widget, + GdkEventExpose* event) +{ + KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (KATZE_THROBBER (widget)); + + if (G_UNLIKELY (!priv->width || !priv->height)) + return TRUE; + + if (G_UNLIKELY (!priv->pixbuf && !priv->static_pixbuf)) + if (priv->animated && !priv->pixbuf && !priv->icon_name) + return TRUE; + + if (!priv->animated && + (priv->static_pixbuf || priv->static_icon_name || priv->static_stock_id)) + { + if (G_UNLIKELY (!priv->static_pixbuf && priv->static_icon_name)) + { + icon_theme_changed (KATZE_THROBBER (widget)); + + if (!priv->static_pixbuf) + { + g_warning ("Named icon '%s' couldn't be loaded", + priv->static_icon_name); + katze_assign (priv->static_icon_name, NULL); + return TRUE; + } + } + else if (G_UNLIKELY (!priv->static_pixbuf && priv->static_stock_id)) + { + icon_theme_changed (KATZE_THROBBER (widget)); + + if (!priv->static_pixbuf) + { + g_warning ("Stock icon '%s' couldn't be loaded", + priv->static_stock_id); + katze_assign (priv->static_stock_id, NULL); + return TRUE; + } + } + + gdk_draw_pixbuf (event->window, NULL, priv->static_pixbuf, + 0, 0, + widget->allocation.x, + widget->allocation.y, + priv->width, priv->height, + GDK_RGB_DITHER_NONE, 0, 0); + } + else + { + if (G_UNLIKELY (priv->icon_name && !priv->pixbuf)) + { + icon_theme_changed (KATZE_THROBBER (widget)); + + if (!priv->pixbuf) + { + g_warning ("Icon '%s' couldn't be loaded", priv->icon_name); + katze_assign (priv->icon_name, NULL); + return TRUE; + } + } + + if (G_UNLIKELY (!priv->pixbuf)) + return TRUE; + + gint cols = gdk_pixbuf_get_width (priv->pixbuf) / priv->width; + gint rows = gdk_pixbuf_get_height (priv->pixbuf) / priv->height; + + if (G_LIKELY (cols > 0 && rows > 0)) + { + gint index = priv->index % (cols * rows); + + if (G_LIKELY (priv->timer_id >= 0)) + index = MAX (index, 1); + + guint x = (index % cols) * priv->width; + guint y = (index / cols) * priv->height; + + gdk_draw_pixbuf (event->window, NULL, priv->pixbuf, + x, y, + widget->allocation.x, + widget->allocation.y, + priv->width, priv->height, + GDK_RGB_DITHER_NONE, 0, 0); + } + else + { + g_warning ("Animation frames are broken"); + katze_assign (priv->icon_name, NULL); + katze_object_assign (priv->pixbuf, NULL); + } + } + + return TRUE; +} diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h new file mode 100644 index 00000000..ebd51028 --- /dev/null +++ b/katze/katze-throbber.h @@ -0,0 +1,119 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_THROBBER_H__ +#define __KATZE_THROBBER_H__ + +#include +#include + +#include "katze-utils.h" + +G_BEGIN_DECLS + +#define KATZE_TYPE_THROBBER \ + (katze_throbber_get_type ()) +#define KATZE_THROBBER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_THROBBER, KatzeThrobber)) +#define KATZE_THROBBER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_THROBBER, KatzeThrobberClass)) +#define KATZE_IS_THROBBER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_THROBBER)) +#define KATZE_IS_THROBBER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_THROBBER)) +#define KATZE_THROBBER_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_THROBBER, KatzeThrobberClass)) + +typedef struct _KatzeThrobber KatzeThrobber; +typedef struct _KatzeThrobberPrivate KatzeThrobberPrivate; +typedef struct _KatzeThrobberClass KatzeThrobberClass; + +struct _KatzeThrobber +{ + KatzeThrobberPrivate* priv; + GtkWidget parent_object; + + /* Padding for future expansion */ + void (*_katze_reserved1) (void); + void (*_katze_reserved2) (void); + void (*_katze_reserved3) (void); + void (*_katze_reserved4) (void); +}; + +struct _KatzeThrobberClass +{ + GtkMiscClass parent_class; + + /* Padding for future expansion */ + void (*_katze_reserved1) (void); + void (*_katze_reserved2) (void); + void (*_katze_reserved3) (void); + void (*_katze_reserved4) (void); +}; + +GType +katze_throbber_get_type (void) G_GNUC_CONST; + +GtkWidget* +katze_throbber_new (void); + +void +katze_throbber_set_icon_size (KatzeThrobber* throbber, + GtkIconSize icon_size); + +void +katze_throbber_set_icon_name (KatzeThrobber* throbber, + const gchar* icon_size); + +void +katze_throbber_set_pixbuf (KatzeThrobber* throbber, + GdkPixbuf* pixbuf); + +void +katze_throbber_set_animated (KatzeThrobber* throbber, + gboolean animated); + +void +katze_throbber_set_static_icon_name (KatzeThrobber* throbber, + const gchar* icon_name); + +void +katze_throbber_set_static_pixbuf (KatzeThrobber* throbber, + GdkPixbuf* pixbuf); + +void +katze_throbber_set_static_stock_id (KatzeThrobber* throbber, + const gchar* stock_id); + +GtkIconSize +katze_throbber_get_icon_size (KatzeThrobber* throbber); + +const gchar* +katze_throbber_get_icon_name (KatzeThrobber* throbber); + +GdkPixbuf* +katze_throbber_get_pixbuf (KatzeThrobber* throbber); + +gboolean +katze_throbber_get_animated (KatzeThrobber* throbber); + +const gchar* +katze_throbber_get_static_icon_name (KatzeThrobber *throbber); + +GdkPixbuf* +katze_throbber_get_static_pixbuf (KatzeThrobber* throbber); + +const gchar* +katze_throbber_get_static_stock_id (KatzeThrobber* throbber); + +G_END_DECLS + +#endif /* __KATZE_THROBBER_H__ */ diff --git a/katze/katze-utils.c b/katze/katze-utils.c new file mode 100644 index 00000000..620a5d01 --- /dev/null +++ b/katze/katze-utils.c @@ -0,0 +1,12 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-utils.h" diff --git a/katze/katze-utils.h b/katze/katze-utils.h new file mode 100644 index 00000000..45dda897 --- /dev/null +++ b/katze/katze-utils.h @@ -0,0 +1,50 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_UTILS_H__ +#define __KATZE_UTILS_H__ + +#include + +G_BEGIN_DECLS + +/** + * katze_assign: + * @lvalue: a pointer + * @rvalue: the new value + * + * Frees @lvalue if needed and assigns it the value of @rvalue. + **/ +#define katze_assign(lvalue, rvalue) \ + if (1) \ + { \ + g_free (lvalue); \ + lvalue = rvalue; \ + } + +/** + * katze_object_assign: + * @lvalue: a gobject + * @rvalue: the new value + * + * Unrefs @lvalue if needed and assigns it the value of @rvalue. + **/ +#define katze_object_assign(lvalue, rvalue) \ + if (1) \ + { \ + if (lvalue) \ + g_object_unref (lvalue); \ + lvalue = rvalue; \ + } + +G_END_DECLS + +#endif /* __KATZE_UTILS_H__ */ diff --git a/katze/katze.h b/katze/katze.h new file mode 100644 index 00000000..f401be3c --- /dev/null +++ b/katze/katze.h @@ -0,0 +1,18 @@ +/* + Copyright (C) 2007 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE__ +#define __KATZE__ + +#include "katze-throbber.h" +#include "katze-utils.h" + +#endif /* __KATZE_THROBBER_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index c8db7753..6246932a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,17 +1,31 @@ -INCLUDES = $(GTK_CFLAGS) $(WEBKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBSEXY_CFLAGS) -LDADD = $(GTK_LIBS) $(WEBKIT_LIBS) $(LIBXML_LIBS) $(LIBSEXY_LIBS) +INCLUDES = \ + $(GTK_CFLAGS) \ + $(WEBKIT_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(LIBSEXY_CFLAGS) \ + -I../katze -bin_PROGRAMS = midori -midori_SOURCES = main.c main.h \ - browser.c browser.h \ - prefs.c prefs.h \ - webSearch.c webSearch.h \ - helpers.c helpers.h \ - webView.c webView.h \ - sokoke.c sokoke.h \ - conf.c conf.h \ - search.c search.h \ - xbel.c xbel.h \ - global.h \ - ui.h \ - debug.h +LDADD = \ + $(GTK_LIBS) \ + $(WEBKIT_LIBS) \ + $(LIBXML_LIBS) \ + $(LIBSEXY_LIBS) \ + ../katze/libkatze.la + +bin_PROGRAMS = \ + midori + +midori_SOURCES = \ + main.c main.h \ + browser.c browser.h \ + prefs.c prefs.h \ + webSearch.c webSearch.h \ + helpers.c helpers.h \ + webView.c webView.h \ + sokoke.c sokoke.h \ + conf.c conf.h \ + search.c search.h \ + xbel.c xbel.h \ + global.h \ + ui.h \ + debug.h diff --git a/src/browser.c b/src/browser.c index f98d4016..8dac19a5 100644 --- a/src/browser.c +++ b/src/browser.c @@ -18,6 +18,7 @@ #include "webView.h" #include "webSearch.h" #include "xbel.h" +#include "../katze/katze.h" #include #include @@ -1190,7 +1191,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) browser->menubar = gtk_ui_manager_get_widget(ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new(); gtk_widget_show(menuitem); - browser->throbber = gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + browser->throbber = katze_throbber_new(); gtk_widget_show(browser->throbber); gtk_container_add(GTK_CONTAINER(menuitem), browser->throbber); gtk_widget_set_sensitive(menuitem, FALSE); @@ -1561,7 +1562,9 @@ CBrowser* browser_new(CBrowser* oldBrowser) , G_CALLBACK(on_notebook_tab_mouse_up), browser); GtkWidget* hbox = gtk_hbox_new(FALSE, 1); gtk_container_add(GTK_CONTAINER(eventbox), GTK_WIDGET(hbox)); - browser->webView_icon = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + browser->webView_icon = katze_throbber_new(); + katze_throbber_set_static_stock_id(KATZE_THROBBER(browser->webView_icon) + , GTK_STOCK_FILE); gtk_box_pack_start(GTK_BOX(hbox), browser->webView_icon, FALSE, FALSE, 0); browser->webView_name = gtk_label_new(xbel_item_get_title(browser->sessionItem)); gtk_misc_set_alignment(GTK_MISC(browser->webView_name), 0.0, 0.5); diff --git a/src/helpers.c b/src/helpers.c index 2981931c..74ed68e6 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -13,6 +13,7 @@ #include "search.h" #include "sokoke.h" +#include "../katze/katze.h" #include #include @@ -231,14 +232,11 @@ void update_favicon(CBrowser* browser) // TODO: Retrieve mime type and load icon; don't forget ftp listings } else - gtk_image_set_from_stock(GTK_IMAGE(browser->webView_icon) - , GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); - } - else - { - gtk_image_set_from_stock(GTK_IMAGE(browser->webView_icon) - , GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + katze_throbber_set_static_stock_id(KATZE_THROBBER(browser->webView_icon) + , GTK_STOCK_FILE); } + katze_throbber_set_animated(KATZE_THROBBER(browser->webView_icon) + , browser->loadedPercent != -1); } void update_security(CBrowser* browser) @@ -382,6 +380,8 @@ void update_gui_state(CBrowser* browser) g_object_set(action, "tooltip", "Stop loading the current page", NULL); gtk_widget_show(browser->progress); } + katze_throbber_set_animated(KATZE_THROBBER(browser->throbber) + , browser->loadedPercent != -1); gtk_image_set_from_stock(GTK_IMAGE(browser->location_icon), GTK_STOCK_FILE , GTK_ICON_SIZE_MENU); From d5a4f4cfd71d919b97371b8ccdfae5138f6cb168 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jan 2008 01:44:37 +0100 Subject: [PATCH 0022/2970] Move XBEL implementation to katze. The implementation of XBEL is moved to katze, including the appropriate api prefix and coding style changes. All relevant uses are updated. --- katze/Makefile.am | 9 +- katze/katze-xbel.c | 958 +++++++++++++++++++++++++++++++++++++++++++++ katze/katze-xbel.h | 176 +++++++++ katze/katze.h | 3 +- src/Makefile.am | 3 - src/browser.c | 203 +++++----- src/browser.h | 2 +- src/global.h | 8 +- src/helpers.c | 4 +- src/main.c | 56 +-- src/webView.c | 28 +- src/xbel.c | 825 -------------------------------------- src/xbel.h | 158 -------- 13 files changed, 1292 insertions(+), 1141 deletions(-) create mode 100644 katze/katze-xbel.c create mode 100644 katze/katze-xbel.h delete mode 100644 src/xbel.c delete mode 100644 src/xbel.h diff --git a/katze/Makefile.am b/katze/Makefile.am index f0b2a9fb..fd22b389 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -1,13 +1,16 @@ INCLUDES = \ - $(GTK_CFLAGS) + $(GTK_CFLAGS) \ + $(LIBXML_CFLAGS) noinst_LTLIBRARIES = \ libkatze.la libkatze_la_LIBADD = \ - $(GTK_LIBS) + $(GTK_LIBS) \ + $(LIBXML_LIBS) libkatze_la_SOURCES = \ katze.h \ katze-throbber.c katze-throbber.h \ - katze-utils.c katze-utils.h + katze-utils.c katze-utils.h \ + katze-xbel.c katze-xbel.h diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c new file mode 100644 index 00000000..d6a2402d --- /dev/null +++ b/katze/katze-xbel.c @@ -0,0 +1,958 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +/** + * TODO: + * - Support info > metadata, alias, added, modified, visited + * - Compatibility: The Nokia 770 *requires* metadata and folder + * - Compatibility: Kazehakase's bookmarks + * - Compatibility: Epiphany's bookmarks + * - XML Indentation + **/ + +#include "katze-xbel.h" + +#include +#include +#include +#include + +#include "katze-utils.h" + +struct _KatzeXbelItemPrivate +{ + guint refs; + KatzeXbelItemKind kind; + KatzeXbelItem* parent; + + GList* items; // folder + gboolean folded; // foolder + gchar* title; // !separator + gchar* desc; // folder and bookmark + gchar* href; // bookmark + //time_t added; // !separator + //time_t modfied; // bookmark + //time_t visited; // bookmark +} ; + +#define KATZE_XBEL_ITEM_GET_PRIVATE(item) \ + item->priv + +// Private: Create a new item of a certain type +static KatzeXbelItem* +katze_xbel_item_new (KatzeXbelItemKind kind) +{ + KatzeXbelItem* item = g_new (KatzeXbelItem, 1); + KATZE_XBEL_ITEM_GET_PRIVATE (item) = g_new (KatzeXbelItemPrivate, 1); + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + + priv->refs = 1; + priv->parent = NULL; + priv->kind = kind; + if (kind == KATZE_XBEL_ITEM_KIND_FOLDER) + { + priv->items = NULL; + priv->folded = TRUE; + } + if (kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) + { + priv->title = NULL; + priv->desc = NULL; + } + if (kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) + priv->href = g_strdup (""); + return item; +} + +/** + * katze_xbel_bookmark_new: + * + * Create a new empty bookmark. + * + * Return value: a newly allocated bookmark + **/ +KatzeXbelItem* +katze_xbel_bookmark_new (void) +{ + return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_BOOKMARK); +} + +static KatzeXbelItem* +katze_xbel_bookmark_from_xmlNodePtr (xmlNodePtr cur) +{ + g_return_val_if_fail (cur, NULL); + + KatzeXbelItem* bookmark = katze_xbel_bookmark_new (); + xmlChar* key = xmlGetProp (cur, (xmlChar*)"href"); + katze_xbel_bookmark_set_href (bookmark, (gchar*)key); + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) + { + xmlChar* key = xmlNodeGetContent (cur); + katze_xbel_item_set_title (bookmark, g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) + { + xmlChar* key = xmlNodeGetContent (cur); + katze_xbel_item_set_desc (bookmark, g_strstrip ((gchar*)key)); + } + cur = cur->next; + } + return bookmark; +} + +/** + * katze_katze_xbel_separator_new: + * + * Create a new separator. + * + * The returned item must be freed eventually. + * + * Return value: a newly allocated separator. + **/ +KatzeXbelItem* +katze_xbel_separator_new (void) +{ + return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_SEPARATOR); +} + +/** + * katze_xbel_folder_new: + * + * Create a new empty folder. + * + * The returned item must be freed eventually. + * + * Return value: a newly allocated folder. + **/ +KatzeXbelItem* +katze_xbel_folder_new (void) +{ + return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_FOLDER); +} + +// Private: Create a folder from an xmlNodePtr +static KatzeXbelItem* +katze_xbel_folder_from_xmlNodePtr (xmlNodePtr cur) +{ + g_return_val_if_fail (cur, NULL); + + KatzeXbelItem* folder = katze_xbel_folder_new (); + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + + xmlChar* key = xmlGetProp (cur, (xmlChar*)"folded"); + if (key) + { + if (!g_ascii_strncasecmp ((gchar*)key, "yes", 3)) + priv->folded = TRUE; + else if (!g_ascii_strncasecmp ((gchar*)key, "no", 2)) + priv->folded = FALSE; + else + g_warning ("XBEL: Unknown value for folded."); + xmlFree (key); + } + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) + { + xmlChar* key = xmlNodeGetContent (cur); + katze_assign (priv->title, g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) + { + xmlChar* key = xmlNodeGetContent (cur); + katze_assign (priv->desc, g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + { + KatzeXbelItem* item = katze_xbel_folder_from_xmlNodePtr (cur); + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; + priv->items = g_list_prepend (priv->items, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + { + KatzeXbelItem* item = katze_xbel_bookmark_from_xmlNodePtr (cur); + priv->parent = folder; + priv->items = g_list_prepend (priv->items, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + { + KatzeXbelItem* item = katze_xbel_separator_new (); + priv->parent = folder; + priv->items = g_list_prepend (priv->items, item); + } + cur = cur->next; + } + // Prepending and reversing is faster than appending + priv->items = g_list_reverse (priv->items); + return folder; +} + +// Private: Loads the contents from an xmlNodePtr into a folder. +static gboolean +katze_xbel_folder_from_xmlDocPtr (KatzeXbelItem* folder, + xmlDocPtr doc) +{ + g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); + g_return_val_if_fail (doc, FALSE); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + + xmlNodePtr cur = xmlDocGetRootElement (doc); + xmlChar* version = xmlGetProp (cur, (xmlChar*)"version"); + if (xmlStrcmp (version, (xmlChar*)"1.0")) + g_warning ("XBEL version is not 1.0."); + xmlFree (version); + + katze_assign (priv->title, (gchar*)xmlGetProp (cur, (xmlChar*)"title")); + katze_assign (priv->desc, (gchar*)xmlGetProp (cur, (xmlChar*)"desc")); + if ((cur = xmlDocGetRootElement (doc)) == NULL) + { + // Empty document + return FALSE; + } + if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) + { + // Wrong document kind + return FALSE; + } + cur = cur->xmlChildrenNode; + while (cur) + { + KatzeXbelItem* item = NULL; + if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + item = katze_xbel_folder_from_xmlNodePtr (cur); + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + item = katze_xbel_bookmark_from_xmlNodePtr (cur); + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + item = katze_xbel_separator_new (); + /*else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + item = katze_xbel_parse_info (xbel, cur);*/ + if (item) + { + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; + priv->items = g_list_prepend (priv->items, item); + } + cur = cur->next; + } + // Prepending and reversing is faster than appending + priv->items = g_list_reverse (priv->items); + return TRUE; +} + +/** + * katze_xbel_item_ref: + * @item: a valid item + * + * Ref an KatzeXbelItem. + * + * Ref means that the reference count is increased by one. + * + * This has no effect on children of a folder. + **/ +void +katze_xbel_item_ref (KatzeXbelItem* item) +{ + g_return_if_fail (item); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + priv->refs++; +} + +/** + * katze_xbel_item_unref: + * @item: a valid item + * + * Unref an KatzeXbelItem. If @item is a folder all of its children will also + * be unreffed automatically. + * + * Unref means that the reference count is decreased. If there are no + * references left, the memory will be freed and if needed removed from + * its containing folder. + **/ +void +katze_xbel_item_unref (KatzeXbelItem* item) +{ + g_return_if_fail (item); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + priv->refs--; + if (priv->refs) + return; + + if (priv->parent) + katze_xbel_folder_remove_item (priv->parent, item); + + if (priv->kind == KATZE_XBEL_ITEM_KIND_FOLDER) + { + guint n = katze_xbel_folder_get_n_items (item); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); + KATZE_XBEL_ITEM_GET_PRIVATE (_item)->parent = NULL; + katze_xbel_item_unref (_item); + } + g_list_free (priv->items); + } + if (priv->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) + { + g_free (priv->title); + g_free (priv->desc); + } + if (priv->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) + g_free (priv->href); + g_free (item); +} + +/** + * katze_xbel_item_copy: + * @item: the item to copy + * + * Copy an KatzeXbelItem. + * + * The returned item must be unreffed eventually. + * + * Return value: a copy of @item + **/ +KatzeXbelItem* +katze_xbel_item_copy (KatzeXbelItem* item) +{ + g_return_val_if_fail (item, NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + KatzeXbelItem* copy = katze_xbel_item_new (priv->kind); + + if (katze_xbel_item_is_folder (item)) + { + guint n = katze_xbel_folder_get_n_items (item); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); + katze_xbel_folder_append_item (copy, katze_xbel_item_copy (_item)); + } + } + if (priv->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) + { + katze_xbel_item_set_title (copy, priv->title); + katze_xbel_item_set_desc (copy, priv->desc); + } + if (priv->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) + katze_xbel_bookmark_set_href (copy, priv->href); + return copy; +} + +GType +katze_xbel_item_get_type (void) +{ + static GType type = 0; + if (!type) + type = g_pointer_type_register_static ("katze_xbel_item"); + return type; +} + +/** + * katze_xbel_folder_append_item: + * @folder: a folder + * @item: the item to append + * + * Append the given item to a folder. + * + * The item is actually moved and must not be contained in another folder. + * + **/ +void +katze_xbel_folder_append_item (KatzeXbelItem* folder, + KatzeXbelItem* item) +{ + g_return_if_fail (!katze_xbel_item_get_parent (item)); + g_return_if_fail (katze_xbel_item_is_folder (folder)); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + priv->items = g_list_append (priv->items, item); + + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; +} + +/** + * katze_xbel_folder_prepend_item: + * @folder: a folder + * @item: the item to prepend + * + * Prepend the given item to a folder. + * + * The item is actually moved and must not be contained in another folder. + * + **/ +void +katze_xbel_folder_prepend_item (KatzeXbelItem* folder, + KatzeXbelItem* item) +{ + g_return_if_fail (!katze_xbel_item_get_parent (item)); + g_return_if_fail (katze_xbel_item_is_folder (folder)); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + priv->items = g_list_prepend (priv->items, item); + + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; +} + +/** + * katze_xbel_folder_remove_item: + * @folder: a folder + * @item: the item to remove + * + * Remove the given @item from a @folder. + **/ +void +katze_xbel_folder_remove_item (KatzeXbelItem* folder, + KatzeXbelItem* item) +{ + g_return_if_fail (item); + g_return_if_fail (katze_xbel_item_get_parent(folder) != item); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + // Fortunately we know that items are unique + priv->items = g_list_remove (priv->items, item); + + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = NULL; +} + +/** + * katze_xbel_folder_get_n_items: + * @folder: a folder + * + * Retrieve the number of items contained in the given @folder. + * + * Return value: number of items + **/ +guint +katze_xbel_folder_get_n_items (KatzeXbelItem* folder) +{ + g_return_val_if_fail (katze_xbel_item_is_folder (folder), 0); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + return g_list_length (priv->items); +} + +/** + * katze_xbel_folder_get_nth_item: + * @folder: a folder + * @n: the index of an item + * + * Retrieve an item contained in the given @folder by its index. + * + * Return value: the item at the given index or %NULL + **/ +KatzeXbelItem* +katze_xbel_folder_get_nth_item (KatzeXbelItem* folder, + guint n) +{ + g_return_val_if_fail (katze_xbel_item_is_folder(folder), NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + return (KatzeXbelItem*) g_list_nth_data (priv->items, n); +} + +/** + * katze_xbel_folder_is_empty: + * @folder: A folder. + * + * Determines wether or not a folder contains no items. This is significantly + * faster than katze_xbel_folder_get_n_items for this particular purpose. + * + * Return value: Wether the given @folder is folded. + **/ +gboolean +katze_xbel_folder_is_empty (KatzeXbelItem* folder) +{ + return !katze_xbel_folder_get_nth_item (folder, 0); +} + +/** + * katze_xbel_folder_get_folded: + * @folder: A folder. + * + * Determines wether or not a folder is folded. If a folder is not folded + * it should not be exposed in a user interface. + * + * New folders are folded by default. + * + * Return value: Wether the given @folder is folded. + **/ +gboolean +katze_xbel_folder_get_folded (KatzeXbelItem* folder) +{ + g_return_val_if_fail (katze_xbel_item_is_folder (folder), TRUE); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + return priv->folded; +} + +/** + * katze_xbel_item_get_kind: + * @item: A item. + * + * Determines the kind of an item. + * + * Return value: The kind of the given @item. + **/ +KatzeXbelItemKind +katze_xbel_item_get_kind (KatzeXbelItem* item) +{ + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->kind; +} + +/** + * katze_xbel_item_get_parent: + * @item: A valid item. + * + * Retrieves the parent folder of an item. + * + * Return value: The parent folder of the given @item or %NULL. + **/ +KatzeXbelItem* +katze_xbel_item_get_parent (KatzeXbelItem* item) +{ + g_return_val_if_fail (item, NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->parent; +} + +/** + * katze_xbel_item_get_title: + * @item: A valid item. + * + * Retrieves the title of an item. + * + * Return value: The title of the given @item or %NULL. + **/ +G_CONST_RETURN gchar* +katze_xbel_item_get_title (KatzeXbelItem* item) +{ + g_return_val_if_fail (!katze_xbel_item_is_separator (item), NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->title; +} + +/** + * katze_xbel_item_get_desc: + * @item: A valid item. + * + * Retrieves the description of an item. + * + * Return value: The description of the @item or %NULL. + **/ +G_CONST_RETURN gchar* +katze_xbel_item_get_desc (KatzeXbelItem* item) +{ + g_return_val_if_fail (!katze_xbel_item_is_separator (item), NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->desc; +} + +/** + * katze_xbel_bookmark_get_href: + * @bookmark: A bookmark. + * + * Retrieves the uri of a bookmark. The value is guaranteed to not be %NULL. + * + * Return value: The uri of the @bookmark. + **/ +G_CONST_RETURN gchar* +katze_xbel_bookmark_get_href (KatzeXbelItem* bookmark) +{ + g_return_val_if_fail (katze_xbel_item_is_bookmark (bookmark), NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (bookmark); + return priv->href; +} + +/** + * katze_xbel_item_is_bookmark: + * @item: A valid item. + * + * Determines wether or not an item is a bookmark. + * + * Return value: %TRUE if the @item is a bookmark. + **/ +gboolean +katze_xbel_item_is_bookmark (KatzeXbelItem* item) +{ + g_return_val_if_fail (item, FALSE); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK; +} + +/** + * katze_xbel_item_is_separator: + * @item: A valid item. + * + * Determines wether or not an item is a separator. + * + * Return value: %TRUE if the @item is a separator. + **/ +gboolean katze_xbel_item_is_separator (KatzeXbelItem* item) +{ + g_return_val_if_fail (item, FALSE); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->kind == KATZE_XBEL_ITEM_KIND_SEPARATOR; +} + +/** + * katze_xbel_item_is_folder: + * @item: A valid item. + * + * Determines wether or not an item is a folder. + * + * Return value: %TRUE if the item is a folder. + **/ +gboolean +katze_xbel_item_is_folder (KatzeXbelItem* item) +{ + g_return_val_if_fail (item, FALSE); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + return priv->kind == KATZE_XBEL_ITEM_KIND_FOLDER; +} + +/** + * katze_xbel_folder_set_folded: + * @folder: A folder. + * @folded: TRUE if the folder is folded. + * + * Sets the foldedness of the @folder. + **/ +void +katze_xbel_folder_set_folded (KatzeXbelItem* folder, + gboolean folded) +{ + g_return_if_fail (katze_xbel_item_is_folder (folder)); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + priv->folded = folded; +} + +/** + * katze_xbel_item_set_title: + * @item: A valid item. + * @title: A string to use for the title. + * + * Sets the title of the @item. + **/ +void +katze_xbel_item_set_title (KatzeXbelItem* item, + const gchar* title) +{ + g_return_if_fail (!katze_xbel_item_is_separator (item)); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + katze_assign (priv->title, g_strdup (title)); +} + +/** + * katze_xbel_item_set_desc: + * @item: A valid item. + * @title: A string to use for the description. + * + * Sets the description of the @item. + **/ +void +katze_xbel_item_set_desc (KatzeXbelItem* item, + const gchar* desc) +{ + g_return_if_fail (!katze_xbel_item_is_separator (item)); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + katze_assign (priv->desc, g_strdup (desc)); +} + +/** + * katze_xbel_bookmark_set_href: + * @bookmark: A bookmark. + * @href: A string containing a valid uri. + * + * Sets the uri of the bookmark. + * + * The uri must not be %NULL. + * + * This uri is not currently validated in any way. This may change in the future. + **/ +void +katze_xbel_bookmark_set_href (KatzeXbelItem* bookmark, + const gchar* href) +{ + g_return_if_fail (katze_xbel_item_is_bookmark (bookmark)); + g_return_if_fail (href); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (bookmark); + katze_assign (priv->href, g_strdup (href)); +} + +gboolean +katze_xbel_folder_from_data (KatzeXbelItem* folder, + const gchar* data, + GError** error) +{ + g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); + g_return_val_if_fail (data, FALSE); + xmlDocPtr doc; + if((doc = xmlParseMemory (data, strlen (data))) == NULL) + { + // No valid xml or broken encoding + *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + "Malformed document."); + return FALSE; + } + if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) + { + // Parsing failed + xmlFreeDoc(doc); + *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + "Malformed document."); + return FALSE; + } + xmlFreeDoc(doc); + return TRUE; +} + +/** + * katze_xbel_folder_from_file: + * @folder: An empty folder. + * @file: A relative path to a file. + * @error: return location for a GError or %NULL + * + * Tries to load @file. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gboolean +katze_xbel_folder_from_file (KatzeXbelItem* folder, + const gchar* file, + GError** error) +{ + g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); + g_return_val_if_fail (file, FALSE); + if (!g_file_test (file, G_FILE_TEST_EXISTS)) + { + // File doesn't exist + *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_NOENT, + "File not found."); + return FALSE; + } + xmlDocPtr doc; + if ((doc = xmlParseFile (file)) == NULL) + { + // No valid xml or broken encoding + *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + "Malformed document."); + return FALSE; + } + if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) + { + // Parsing failed + xmlFreeDoc (doc); + *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + "Malformed document."); + return FALSE; + } + xmlFreeDoc (doc); + return TRUE; +} + +/** + * katze_xbel_folder_from_data_dirs: + * @folder: An empty folder. + * @file: A relative path to a file. + * @full_path: return location for the full path of the file or %NULL + * @error: return location for a GError or %NULL + * + * Tries to load @file from the user data dir or any of the system data dirs. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gboolean +katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, + const gchar* file, + gchar** full_path, + GError** error) +{ + g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); + g_return_val_if_fail (file, FALSE); + // FIXME: Essentially unimplemented + + *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + "Malformed document."); + return FALSE; +} + +static gchar* +katze_xbel_xml_element (const gchar* name, + const gchar* value) +{ + if (!value) + return g_strdup (""); + gchar* valueEscaped = g_markup_escape_text (value, -1); + gchar* markup = g_strdup_printf ("<%s>%s\n", + name, valueEscaped, name); + g_free (valueEscaped); + return markup; +} + +static gchar* +katze_xbel_item_to_data (KatzeXbelItem* item) +{ + g_return_val_if_fail (item, NULL); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + + gchar* markup = NULL; + switch (priv->kind) + { + case KATZE_XBEL_ITEM_KIND_FOLDER: + { + GString* _markup = g_string_new (NULL); + guint n = katze_xbel_folder_get_n_items (item); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); + gchar* item_markup = katze_xbel_item_to_data (_item); + g_string_append (_markup, item_markup); + g_free (item_markup); + } + gchar* folded = priv->folded ? NULL : g_strdup_printf (" folded=\"no\""); + gchar* title = katze_xbel_xml_element ("title", priv->title); + gchar* desc = katze_xbel_xml_element ("desc", priv->desc); + markup = g_strdup_printf ("\n%s%s%s\n", + folded ? folded : "", + title, desc, + g_string_free (_markup, FALSE)); + g_free (folded); + g_free (title); + g_free (desc); + break; + } + case KATZE_XBEL_ITEM_KIND_BOOKMARK: + { + gchar* href_escaped = g_markup_escape_text (priv->href, -1); + gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); + g_free (href_escaped); + gchar* title = katze_xbel_xml_element ("title", priv->title); + gchar* desc = katze_xbel_xml_element ("desc", priv->desc); + markup = g_strdup_printf ("\n%s%s%s\n", + href, + title, desc, + ""); + g_free (href); + g_free (title); + g_free (desc); + break; + } + case KATZE_XBEL_ITEM_KIND_SEPARATOR: + markup = g_strdup ("\n"); + break; + default: + g_warning ("XBEL: Unknown item kind"); + } + return markup; +} + +/** + * katze_xbel_folder_to_data: + * @folder: A folder. + * @length: return location for the length of the created string or %NULL + * @error: return location for a GError or %NULL + * + * Retrieve the contents of @folder as a string. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gchar* +katze_xbel_folder_to_data (KatzeXbelItem* folder, + gsize* length, + GError** error) +{ + g_return_val_if_fail (katze_xbel_item_is_folder (folder), FALSE); + + KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); + + GString* inner_markup = g_string_new (NULL); + guint n = katze_xbel_folder_get_n_items (folder); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (folder, i); + gchar* sItem = katze_xbel_item_to_data (item); + g_string_append (inner_markup, sItem); + g_free (sItem); + } + gchar* title = katze_xbel_xml_element ("title", priv->title); + gchar* desc = katze_xbel_xml_element ("desc", priv->desc); + gchar* outer_markup; + outer_markup = g_strdup_printf ( + "%s%s\n%s%s%s\n", + "\n", + "\n", + title, + desc, + g_string_free (inner_markup, FALSE)); + g_free (title); + g_free (desc); + + if (length) + *length = strlen (outer_markup); + return outer_markup; +} + +/** + * katze_xbel_folder_to_file: + * @folder: A folder. + * @file: The destination filename. + * @error: return location for a GError or %NULL + * + * Write the contents of @folder to the specified file, creating it if necessary. + * + * Return value: %TRUE on success or %FALSE when an error occured. + **/ +gboolean +katze_xbel_folder_to_file (KatzeXbelItem* folder, + const gchar* file, + GError** error) +{ + g_return_val_if_fail (file, FALSE); + gchar* data; + if (!(data = katze_xbel_folder_to_data (folder, NULL, error))) + return FALSE; + FILE* fp; + if(!(fp = fopen (file, "w"))) + { + *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES, + "Writing failed."); + return FALSE; + } + fputs (data, fp); + fclose (fp); + g_free (data); + return TRUE; +} diff --git a/katze/katze-xbel.h b/katze/katze-xbel.h new file mode 100644 index 00000000..78a46855 --- /dev/null +++ b/katze/katze-xbel.h @@ -0,0 +1,176 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_XBEL_H__ +#define __KATZE_XBEL_H__ 1 + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_XBEL_ITEM \ + (katze_xbel_item_get_type ()) + +typedef struct _KatzeXbelItem KatzeXbelItem; +typedef struct _KatzeXbelItemPrivate KatzeXbelItemPrivate; + +struct _KatzeXbelItem +{ + KatzeXbelItemPrivate* priv; + + /* Padding for future expansion */ + void (*_katze_reserved1) (void); + void (*_katze_reserved2) (void); + void (*_katze_reserved3) (void); + void (*_katze_reserved4) (void); +}; + +#define KATZE_XBEL_ERROR g_quark_from_string("KATZE_XBEL_ERROR") + +typedef enum +{ + KATZE_XBEL_ERROR_INVALID_URI, /* Malformed uri */ + KATZE_XBEL_ERROR_INVALID_VALUE, /* Requested field not found */ + KATZE_XBEL_ERROR_URI_NOT_FOUND, /* Requested uri not found */ + KATZE_XBEL_ERROR_READ, /* Malformed document */ + KATZE_XBEL_ERROR_UNKNOWN_ENCODING, /* Parsed text was in an unknown encoding */ + KATZE_XBEL_ERROR_WRITE, /* Writing failed. */ +} KatzeXbelError; + +typedef enum +{ + KATZE_XBEL_ITEM_KIND_FOLDER, + KATZE_XBEL_ITEM_KIND_BOOKMARK, + KATZE_XBEL_ITEM_KIND_SEPARATOR +} KatzeXbelItemKind; + +GType +katze_xbel_item_get_type (void) G_GNUC_CONST; + +KatzeXbelItem* +katze_xbel_bookmark_new (void); + +KatzeXbelItem* +katze_xbel_separator_new (void); + +KatzeXbelItem* +katze_xbel_folder_new (void); + +void +katze_xbel_item_ref (KatzeXbelItem* item); + +void +katze_xbel_item_unref (KatzeXbelItem* item); + +KatzeXbelItem* +katze_xbel_item_copy (KatzeXbelItem* item); + +void +katze_xbel_folder_append_item (KatzeXbelItem* folder, + KatzeXbelItem* item); + +void +katze_xbel_folder_prepend_item (KatzeXbelItem* folder, + KatzeXbelItem* item); + +void +katze_xbel_folder_remove_item (KatzeXbelItem* folder, + KatzeXbelItem* item); + +guint +katze_xbel_folder_get_n_items (KatzeXbelItem* folder); + +KatzeXbelItem* +katze_xbel_folder_get_nth_item (KatzeXbelItem* folder, + guint n); + +gboolean +katze_xbel_folder_is_empty (KatzeXbelItem* folder); + +gboolean +katze_xbel_folder_get_folded (KatzeXbelItem* folder); + +KatzeXbelItemKind +katze_xbel_item_get_kind (KatzeXbelItem* item); + +KatzeXbelItem* +katze_xbel_item_get_parent (KatzeXbelItem* item); + +G_CONST_RETURN gchar* +katze_xbel_item_get_title (KatzeXbelItem* item); + +G_CONST_RETURN gchar* +katze_xbel_item_get_desc (KatzeXbelItem* item); + +G_CONST_RETURN gchar* +katze_xbel_bookmark_get_href (KatzeXbelItem* bookmark); + +/*time_t +katze_xbel_bookmark_get_added (KatzeXbelItem* bookmark); + +time_t +katze_xbel_bookmark_get_modified (KatzeXbelItem* bookmark); + +time_t +katze_xbel_bookmark_get_visited (KatzeXbelItem* bookmark);*/ + +gboolean +katze_xbel_item_is_bookmark (KatzeXbelItem* bookmark); + +gboolean +katze_xbel_item_is_separator (KatzeXbelItem* bookmark); + +gboolean +katze_xbel_item_is_folder (KatzeXbelItem* bookmark); + +void +katze_xbel_folder_set_folded (KatzeXbelItem* folder, + gboolean folded); + +void +katze_xbel_item_set_title (KatzeXbelItem* item, + const gchar* title); + +void +katze_xbel_item_set_desc (KatzeXbelItem* item, + const gchar* desc); + +void +katze_xbel_bookmark_set_href (KatzeXbelItem* bookmark, + const gchar* href); + +gboolean +katze_xbel_folder_from_data (KatzeXbelItem* folder, + const gchar* data, + GError** error); + +gboolean +katze_xbel_folder_from_file (KatzeXbelItem* folder, + const gchar* file, + GError** error); + +gboolean +katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, + const gchar* file, + gchar** full_path, + GError** error); + +gchar* +katze_xbel_folder_to_data (KatzeXbelItem* folder, + gsize* length, + GError** error); + +gboolean +katze_xbel_folder_to_file (KatzeXbelItem* folder, + const gchar* file, + GError** error); + +#endif /* !__KATZE_XBEL_H__ */ diff --git a/katze/katze.h b/katze/katze.h index f401be3c..e0e72c9a 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -14,5 +14,6 @@ #include "katze-throbber.h" #include "katze-utils.h" +#include "katze-xbel.h" -#endif /* __KATZE_THROBBER_H__ */ +#endif /* __KATZE_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index 6246932a..2b98976a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,14 +1,12 @@ INCLUDES = \ $(GTK_CFLAGS) \ $(WEBKIT_CFLAGS) \ - $(LIBXML_CFLAGS) \ $(LIBSEXY_CFLAGS) \ -I../katze LDADD = \ $(GTK_LIBS) \ $(WEBKIT_LIBS) \ - $(LIBXML_LIBS) \ $(LIBSEXY_LIBS) \ ../katze/libkatze.la @@ -25,7 +23,6 @@ midori_SOURCES = \ sokoke.c sokoke.h \ conf.c conf.h \ search.c search.h \ - xbel.c xbel.h \ global.h \ ui.h \ debug.h diff --git a/src/browser.c b/src/browser.c index 8dac19a5..f56ed0f5 100644 --- a/src/browser.c +++ b/src/browser.c @@ -17,7 +17,6 @@ #include "ui.h" #include "webView.h" #include "webSearch.h" -#include "xbel.h" #include "../katze/katze.h" #include @@ -379,20 +378,20 @@ void on_action_webSearch_activate(GtkAction* action, CBrowser* browser) void on_menu_tabsClosed_activate(GtkWidget* widget, CBrowser* browser) { GtkWidget* menu = gtk_menu_new(); - guint n = xbel_folder_get_n_items(tabtrash); + guint n = katze_xbel_folder_get_n_items(tabtrash); GtkWidget* menuitem; guint i; for(i = 0; i < n; i++) { - XbelItem* item = xbel_folder_get_nth_item(tabtrash, i); - const gchar* title = xbel_item_get_title(item); - const gchar* uri = xbel_bookmark_get_href(item); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(tabtrash, i); + const gchar* title = katze_xbel_item_get_title(item); + const gchar* uri = katze_xbel_bookmark_get_href(item); menuitem = gtk_image_menu_item_new_with_label(title ? title : uri); // FIXME: Get the real icon GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), icon); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - g_object_set_data(G_OBJECT(menuitem), "XbelItem", item); + g_object_set_data(G_OBJECT(menuitem), "KatzeXbelItem", item); g_signal_connect(menuitem, "activate", G_CALLBACK(on_menu_tabsClosed_item_activate), browser); gtk_widget_show(menuitem); } @@ -411,30 +410,30 @@ void on_menu_tabsClosed_activate(GtkWidget* widget, CBrowser* browser) void on_menu_tabsClosed_item_activate(GtkWidget* menuitem, CBrowser* browser) { // Create a new webView with an uri which has been closed before - XbelItem* item = g_object_get_data(G_OBJECT(menuitem), "XbelItem"); - const gchar* uri = xbel_bookmark_get_href(item); + KatzeXbelItem* item = g_object_get_data(G_OBJECT(menuitem), "KatzeXbelItem"); + const gchar* uri = katze_xbel_bookmark_get_href(item); CBrowser* curBrowser = browser_new(browser); webView_open(curBrowser->webView, uri); - xbel_item_unref(item); + katze_xbel_item_unref(item); update_browser_actions(curBrowser); } void on_action_tabsClosed_undo_activate(GtkAction* action, CBrowser* browser) { // Open the most recent tabtrash item - XbelItem* item = xbel_folder_get_nth_item(tabtrash, 0); - const gchar* uri = xbel_bookmark_get_href(item); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(tabtrash, 0); + const gchar* uri = katze_xbel_bookmark_get_href(item); CBrowser* curBrowser = browser_new(browser); webView_open(curBrowser->webView, uri); - xbel_item_unref(item); + katze_xbel_item_unref(item); update_browser_actions(curBrowser); } void on_action_tabsClosed_clear_activate(GtkAction* action, CBrowser* browser) { // Clear the closed tabs list - xbel_item_unref(tabtrash); - tabtrash = xbel_folder_new(); + katze_xbel_item_unref(tabtrash); + tabtrash = katze_xbel_folder_new(); update_browser_actions(browser); } @@ -466,7 +465,7 @@ void on_action_link_copy_activate(GtkAction* action, CBrowser* browser) gtk_clipboard_set_text(clipboard, browser->elementUri, -1); } -static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browser) +static void browser_editBookmark_dialog_new(KatzeXbelItem* bookmark, CBrowser* browser) { gboolean newBookmark = !bookmark; GtkWidget* dialog = gtk_dialog_new_with_buttons( @@ -483,7 +482,7 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); if(newBookmark) - bookmark = xbel_bookmark_new(); + bookmark = katze_xbel_bookmark_new(); GtkWidget* hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); @@ -494,7 +493,7 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse gtk_entry_set_activates_default(GTK_ENTRY(entry_title), TRUE); if(!newBookmark) { - const gchar* title = xbel_item_get_title(bookmark); + const gchar* title = katze_xbel_item_get_title(bookmark); gtk_entry_set_text(GTK_ENTRY(entry_title), title ? title : ""); } gtk_box_pack_start(GTK_BOX(hbox), entry_title, TRUE, TRUE, 0); @@ -510,7 +509,7 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse gtk_entry_set_activates_default(GTK_ENTRY(entry_desc), TRUE); if(!newBookmark) { - const gchar* desc = xbel_item_get_desc(bookmark); + const gchar* desc = katze_xbel_item_get_desc(bookmark); gtk_entry_set_text(GTK_ENTRY(entry_desc), desc ? desc : ""); } gtk_box_pack_start(GTK_BOX(hbox), entry_desc, TRUE, TRUE, 0); @@ -518,7 +517,7 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse gtk_widget_show_all(hbox); GtkWidget* entry_uri = NULL; - if(xbel_item_is_bookmark(bookmark)) + if(katze_xbel_item_is_bookmark(bookmark)) { hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); @@ -528,7 +527,7 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse entry_uri = gtk_entry_new(); gtk_entry_set_activates_default(GTK_ENTRY(entry_uri), TRUE); if(!newBookmark) - gtk_entry_set_text(GTK_ENTRY(entry_uri), xbel_bookmark_get_href(bookmark)); + gtk_entry_set_text(GTK_ENTRY(entry_uri), katze_xbel_bookmark_get_href(bookmark)); gtk_box_pack_start(GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); @@ -537,14 +536,14 @@ static void browser_editBookmark_dialog_new(XbelItem* bookmark, CBrowser* browse gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - xbel_item_set_title(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_title))); - xbel_item_set_desc(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_desc))); - if(xbel_item_is_bookmark(bookmark)) - xbel_bookmark_set_href(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_uri))); + katze_xbel_item_set_title(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_title))); + katze_xbel_item_set_desc(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_desc))); + if(katze_xbel_item_is_bookmark(bookmark)) + katze_xbel_bookmark_set_href(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_uri))); // FIXME: We want to choose a folder if(newBookmark) - xbel_folder_append_item(bookmarks, bookmark); + katze_xbel_folder_append_item(bookmarks, bookmark); } gtk_widget_destroy(dialog); } @@ -556,18 +555,18 @@ static void on_panel_bookmarks_row_activated(GtkTreeView* treeview GtkTreeIter iter; if(gtk_tree_model_get_iter(model, &iter, path)) { - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - if(xbel_item_is_bookmark(item)) - webView_open(get_nth_webView(-1, browser), xbel_bookmark_get_href(item)); + if(katze_xbel_item_is_bookmark(item)) + webView_open(get_nth_webView(-1, browser), katze_xbel_bookmark_get_href(item)); } } static void panel_bookmarks_popup(GtkWidget* widget, GdkEventButton* event - , XbelItem* item, CBrowser* browser) + , KatzeXbelItem* item, CBrowser* browser) { - gboolean isBookmark = xbel_item_is_bookmark(item); - gboolean isSeparator = xbel_item_is_separator(item); + gboolean isBookmark = katze_xbel_item_is_bookmark(item); + gboolean isSeparator = katze_xbel_item_is_separator(item); action_set_sensitive("BookmarkOpen", isBookmark, browser); action_set_sensitive("BookmarkOpenTab", isBookmark, browser); @@ -590,12 +589,12 @@ static gboolean on_panel_bookmarks_button_release(GtkWidget* widget GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - if(event->button == 2 && xbel_item_is_bookmark(item)) + if(event->button == 2 && katze_xbel_item_is_bookmark(item)) { CBrowser* newBrowser = browser_new(browser); - const gchar* uri = xbel_bookmark_get_href(item); + const gchar* uri = katze_xbel_bookmark_get_href(item); webView_open(newBrowser->webView, uri); } else @@ -613,7 +612,7 @@ void on_panel_bookmarks_popup(GtkWidget* widget, CBrowser* browser) GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); panel_bookmarks_popup(widget, NULL, item, browser); } @@ -628,10 +627,10 @@ void on_action_bookmarkOpen_activate(GtkAction* action, CBrowser* browser) GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - if(xbel_item_is_bookmark(item)) - webView_open(get_nth_webView(-1, browser), xbel_bookmark_get_href(item)); + if(katze_xbel_item_is_bookmark(item)) + webView_open(get_nth_webView(-1, browser), katze_xbel_bookmark_get_href(item)); } } @@ -644,12 +643,12 @@ void on_action_bookmarkOpenTab_activate(GtkAction* action, CBrowser* browser) GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - if(xbel_item_is_bookmark(item)) + if(katze_xbel_item_is_bookmark(item)) { CBrowser* newBrowser = browser_new(browser); - const gchar* uri = xbel_bookmark_get_href(item); + const gchar* uri = katze_xbel_bookmark_get_href(item); webView_open(newBrowser->webView, uri); } } @@ -664,12 +663,12 @@ void on_action_bookmarkOpenWindow_activate(GtkAction* action, CBrowser* browser) GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - if(xbel_item_is_bookmark(item)) + if(katze_xbel_item_is_bookmark(item)) { CBrowser* newBrowser = browser_new(NULL); - const gchar* uri = xbel_bookmark_get_href(item); + const gchar* uri = katze_xbel_bookmark_get_href(item); webView_open(newBrowser->webView, uri); } } @@ -684,9 +683,9 @@ void on_action_bookmarkEdit_activate(GtkAction* action, CBrowser* browser) GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - if(!xbel_item_is_separator(item)) + if(!katze_xbel_item_is_separator(item)) browser_editBookmark_dialog_new(item, browser); } } @@ -700,26 +699,26 @@ void on_action_bookmarkDelete_activate(GtkAction* action, CBrowser* browser) GtkTreeModel* model; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &model, &iter); - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, &iter, 0, &item, -1); - XbelItem* parent = xbel_item_get_parent(item); - xbel_folder_remove_item(parent, item); - xbel_item_unref(item); + KatzeXbelItem* parent = katze_xbel_item_get_parent(item); + katze_xbel_folder_remove_item(parent, item); + katze_xbel_item_unref(item); } } static void tree_store_insert_folder(GtkTreeStore* treestore, GtkTreeIter* parent - , XbelItem* folder) + , KatzeXbelItem* folder) { - guint n = xbel_folder_get_n_items(folder); + guint n = katze_xbel_folder_get_n_items(folder); guint i; for(i = 0; i < n; i++) { - XbelItem* item = xbel_folder_get_nth_item(folder, i); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(folder, i); GtkTreeIter iter; gtk_tree_store_insert_with_values(treestore, &iter, parent, n, 0, item, -1); - xbel_item_ref(item); - if(xbel_item_is_folder(item)) + katze_xbel_item_ref(item); + if(katze_xbel_item_is_folder(item)) tree_store_insert_folder(treestore, &iter, item); } } @@ -728,22 +727,22 @@ static void on_bookmarks_item_render_icon(GtkTreeViewColumn* column , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter , GtkWidget* treeview) { - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, iter, 0, &item, -1); - if(!xbel_item_get_parent(item)) + if(!katze_xbel_item_get_parent(item)) { gtk_tree_store_remove(GTK_TREE_STORE(model), iter); - xbel_item_unref(item); + katze_xbel_item_unref(item); return; } // TODO: Would it be better to not do this on every redraw? GdkPixbuf* pixbuf = NULL; - if(xbel_item_is_bookmark(item)) + if(katze_xbel_item_is_bookmark(item)) pixbuf = gtk_widget_render_icon(treeview, STOCK_BOOKMARK , GTK_ICON_SIZE_MENU, NULL); - else if(xbel_item_is_folder(item)) + else if(katze_xbel_item_is_folder(item)) pixbuf = gtk_widget_render_icon(treeview, GTK_STOCK_DIRECTORY , GTK_ICON_SIZE_MENU, NULL); g_object_set(renderer, "pixbuf", pixbuf, NULL); @@ -755,31 +754,31 @@ static void on_bookmarks_item_render_text(GtkTreeViewColumn* column , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter , GtkWidget* treeview) { - XbelItem* item; + KatzeXbelItem* item; gtk_tree_model_get(model, iter, 0, &item, -1); - if(!xbel_item_get_parent(item)) + if(!katze_xbel_item_get_parent(item)) { gtk_tree_store_remove(GTK_TREE_STORE(model), iter); - xbel_item_unref(item); + katze_xbel_item_unref(item); return; } - if(xbel_item_is_separator(item)) + if(katze_xbel_item_is_separator(item)) g_object_set(renderer , "markup", "Separator", NULL); else g_object_set(renderer - , "markup", NULL, "text", xbel_item_get_title(item), NULL); + , "markup", NULL, "text", katze_xbel_item_get_title(item), NULL); } -static void create_bookmark_menu(XbelItem*, GtkWidget*, CBrowser*); +static void create_bookmark_menu(KatzeXbelItem*, GtkWidget*, CBrowser*); static void on_bookmark_menu_folder_activate(GtkWidget* menuitem, CBrowser* browser) { GtkWidget* menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menuitem)); gtk_container_foreach(GTK_CONTAINER(menu), (GtkCallback)gtk_widget_destroy, NULL);//... - XbelItem* folder = (XbelItem*)g_object_get_data(G_OBJECT(menuitem), "XbelItem"); + KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT(menuitem), "KatzeXbelItem"); create_bookmark_menu(folder, menu, browser); // Remove all menuitems when the menu is hidden. // FIXME: We really *want* the line below, but it won't work like that @@ -790,7 +789,7 @@ static void on_bookmark_menu_folder_activate(GtkWidget* menuitem, CBrowser* brow static void on_bookmark_toolbar_folder_activate(GtkToolItem* toolitem, CBrowser* browser) { GtkWidget* menu = gtk_menu_new(); - XbelItem* folder = (XbelItem*)g_object_get_data(G_OBJECT(toolitem), "XbelItem"); + KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT(toolitem), "KatzeXbelItem"); create_bookmark_menu(folder, menu, browser); // Remove all menuitems when the menu is hidden. // FIXME: We really *should* run the line below, but it won't work like that @@ -800,24 +799,24 @@ static void on_bookmark_toolbar_folder_activate(GtkToolItem* toolitem, CBrowser* void on_menu_bookmarks_item_activate(GtkWidget* widget, CBrowser* browser) { - XbelItem* item = (XbelItem*)g_object_get_data(G_OBJECT(widget), "XbelItem"); - webView_open(get_nth_webView(-1, browser), xbel_bookmark_get_href(item)); + KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data(G_OBJECT(widget), "KatzeXbelItem"); + webView_open(get_nth_webView(-1, browser), katze_xbel_bookmark_get_href(item)); } -static void create_bookmark_menu(XbelItem* folder, GtkWidget* menu, CBrowser* browser) +static void create_bookmark_menu(KatzeXbelItem* folder, GtkWidget* menu, CBrowser* browser) { - guint n = xbel_folder_get_n_items(folder); + guint n = katze_xbel_folder_get_n_items(folder); guint i; for(i = 0; i < n; i++) { - XbelItem* item = xbel_folder_get_nth_item(folder, i); - const gchar* title = xbel_item_is_separator(item) ? "" : xbel_item_get_title(item); - //const gchar* desc = xbel_item_is_separator(item) ? "" : xbel_item_get_desc(item); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(folder, i); + const gchar* title = katze_xbel_item_is_separator(item) ? "" : katze_xbel_item_get_title(item); + //const gchar* desc = katze_xbel_item_is_separator(item) ? "" : katze_xbel_item_get_desc(item); GtkWidget* menuitem = NULL; - switch(xbel_item_get_kind(item)) + switch(katze_xbel_item_get_kind(item)) { - case XBEL_ITEM_FOLDER: - // FIXME: what about xbel_folder_is_folded? + case KATZE_XBEL_ITEM_KIND_FOLDER: + // FIXME: what about katze_xbel_folder_is_folded? menuitem = gtk_image_menu_item_new_with_label(title); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem) , gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU)); @@ -825,14 +824,14 @@ static void create_bookmark_menu(XbelItem* folder, GtkWidget* menu, CBrowser* br gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), _menu); g_signal_connect(menuitem, "activate" , G_CALLBACK(on_bookmark_menu_folder_activate), browser); - g_object_set_data(G_OBJECT(menuitem), "XbelItem", item); + g_object_set_data(G_OBJECT(menuitem), "KatzeXbelItem", item); break; - case XBEL_ITEM_BOOKMARK: + case KATZE_XBEL_ITEM_KIND_BOOKMARK: menuitem = menu_item_new(title, STOCK_BOOKMARK , G_CALLBACK(on_menu_bookmarks_item_activate), TRUE, browser); - g_object_set_data(G_OBJECT(menuitem), "XbelItem", item); + g_object_set_data(G_OBJECT(menuitem), "KatzeXbelItem", item); break; - case XBEL_ITEM_SEPARATOR: + case KATZE_XBEL_ITEM_KIND_SEPARATOR: menuitem = gtk_separator_menu_item_new(); break; default: @@ -936,7 +935,7 @@ void on_location_changed(GtkWidget* widget, CBrowser* browser) { // Preserve changes to the uri /*const gchar* newUri = gtk_entry_get_text(GTK_ENTRY(widget)); - xbel_bookmark_set_href(browser->sessionItem, newUri);*/ + katze_xbel_bookmark_set_href(browser->sessionItem, newUri);*/ // FIXME: If we want this feature, this is the wrong approach } @@ -1037,9 +1036,9 @@ void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page { GtkWidget* webView = get_nth_webView(page_num, browser); browser = get_browser_from_webView(webView); - const gchar* uri = xbel_bookmark_get_href(browser->sessionItem); + const gchar* uri = katze_xbel_bookmark_get_href(browser->sessionItem); gtk_entry_set_text(GTK_ENTRY(browser->location), uri); - const gchar* title = xbel_item_get_title(browser->sessionItem); + const gchar* title = katze_xbel_item_get_title(browser->sessionItem); const gchar* effectiveTitle = title ? title : uri; gchar* windowTitle = g_strconcat(effectiveTitle, " - ", PACKAGE_NAME, NULL); gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); @@ -1098,9 +1097,9 @@ CBrowser* browser_new(CBrowser* oldBrowser) { CBrowser* browser = g_new0(CBrowser, 1); browsers = g_list_prepend(browsers, browser); - browser->sessionItem = xbel_bookmark_new(); - xbel_item_set_title(browser->sessionItem, "about:blank"); - xbel_folder_append_item(session, browser->sessionItem); + browser->sessionItem = katze_xbel_bookmark_new(); + katze_xbel_item_set_title(browser->sessionItem, "about:blank"); + katze_xbel_folder_append_item(session, browser->sessionItem); GtkWidget* scrolled; @@ -1289,26 +1288,26 @@ CBrowser* browser_new(CBrowser* oldBrowser) gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->bookmarkbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style(GTK_TOOLBAR(browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); create_bookmark_menu(bookmarks, browser->menu_bookmarks, browser); - for(i = 0; i < xbel_folder_get_n_items(bookmarks); i++) + for(i = 0; i < katze_xbel_folder_get_n_items(bookmarks); i++) { - XbelItem* item = xbel_folder_get_nth_item(bookmarks, i); - const gchar* title = xbel_item_is_separator(item) - ? "" : xbel_item_get_title(item); - const gchar* desc = xbel_item_is_separator(item) - ? "" : xbel_item_get_desc(item); - switch(xbel_item_get_kind(item)) + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(bookmarks, i); + const gchar* title = katze_xbel_item_is_separator(item) + ? "" : katze_xbel_item_get_title(item); + const gchar* desc = katze_xbel_item_is_separator(item) + ? "" : katze_xbel_item_get_desc(item); + switch(katze_xbel_item_get_kind(item)) { - case XBEL_ITEM_FOLDER: + case KATZE_XBEL_ITEM_KIND_FOLDER: toolitem = tool_button_new(title, GTK_STOCK_DIRECTORY, TRUE, TRUE , G_CALLBACK(on_bookmark_toolbar_folder_activate), desc, browser); - g_object_set_data(G_OBJECT(toolitem), "XbelItem", item); + g_object_set_data(G_OBJECT(toolitem), "KatzeXbelItem", item); break; - case XBEL_ITEM_BOOKMARK: + case KATZE_XBEL_ITEM_KIND_BOOKMARK: toolitem = tool_button_new(title, STOCK_BOOKMARK, TRUE, TRUE , G_CALLBACK(on_menu_bookmarks_item_activate), desc, browser); - g_object_set_data(G_OBJECT(toolitem), "XbelItem", item); + g_object_set_data(G_OBJECT(toolitem), "KatzeXbelItem", item); break; - case XBEL_ITEM_SEPARATOR: + case KATZE_XBEL_ITEM_KIND_SEPARATOR: toolitem = gtk_separator_tool_item_new(); break; default: @@ -1381,7 +1380,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) // Bookmarks GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; - GtkTreeStore* treestore = gtk_tree_store_new(1, G_TYPE_XBEL_ITEM); + GtkTreeStore* treestore = gtk_tree_store_new(1, KATZE_TYPE_XBEL_ITEM); GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(treestore)); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); column = gtk_tree_view_column_new(); @@ -1566,7 +1565,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) katze_throbber_set_static_stock_id(KATZE_THROBBER(browser->webView_icon) , GTK_STOCK_FILE); gtk_box_pack_start(GTK_BOX(hbox), browser->webView_icon, FALSE, FALSE, 0); - browser->webView_name = gtk_label_new(xbel_item_get_title(browser->sessionItem)); + browser->webView_name = gtk_label_new(katze_xbel_item_get_title(browser->sessionItem)); gtk_misc_set_alignment(GTK_MISC(browser->webView_name), 0.0, 0.5); // TODO: make the tab initially look "unvisited" until it's focused // TODO: gtk's tab scrolling is weird? diff --git a/src/browser.h b/src/browser.h index f25cebd2..6448c4e7 100644 --- a/src/browser.h +++ b/src/browser.h @@ -73,7 +73,7 @@ typedef struct _CBrowser //UNDEFINED favicon; guint security; gchar* statusMessage; // message from a webView - XbelItem* sessionItem; + KatzeXbelItem* sessionItem; } CBrowser; enum diff --git a/src/global.h b/src/global.h index c893d54d..19139f3e 100644 --- a/src/global.h +++ b/src/global.h @@ -13,7 +13,7 @@ #define __GLOBAL_H__ 1 #include "conf.h" -#include "xbel.h" +#include "../katze/katze.h" #include @@ -23,9 +23,9 @@ CConfig* config; GList* searchEngines; // Items of type 'SearchEngine' GList* browsers; // Items of type 'CBrowser' GtkAccelGroup* accel_group; -XbelItem* bookmarks; -XbelItem* session; -XbelItem* tabtrash; +KatzeXbelItem* bookmarks; +KatzeXbelItem* session; +KatzeXbelItem* tabtrash; // Custom stock items diff --git a/src/helpers.c b/src/helpers.c index 74ed68e6..792b7101 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -241,7 +241,7 @@ void update_favicon(CBrowser* browser) void update_security(CBrowser* browser) { - const gchar* uri = xbel_bookmark_get_href(browser->sessionItem); + const gchar* uri = katze_xbel_bookmark_get_href(browser->sessionItem); // TODO: This check is bogus, until webkit tells us how secure a page is if(g_str_has_prefix(uri, "https://")) { @@ -405,7 +405,7 @@ void update_browser_actions(CBrowser* browser) action_set_sensitive("TabPrevious", active, browser); action_set_sensitive("TabNext", active, browser); - gboolean tabtrashEmpty = xbel_folder_is_empty(tabtrash); + gboolean tabtrashEmpty = katze_xbel_folder_is_empty(tabtrash); action_set_sensitive("UndoTabClose", !tabtrashEmpty, browser); action_set_sensitive("TabsClosed", !tabtrashEmpty, browser); } diff --git a/src/main.c b/src/main.c index c5456db8..fb79eb97 100755 --- a/src/main.c +++ b/src/main.c @@ -17,7 +17,7 @@ #include "sokoke.h" #include "search.h" #include "webView.h" -#include "xbel.h" +#include "../katze/katze.h" #include #include @@ -148,9 +148,9 @@ int main(int argc, char** argv) } g_free(configFile); configFile = g_build_filename(configPath, "bookmarks.xbel", NULL); - bookmarks = xbel_folder_new(); + bookmarks = katze_xbel_folder_new(); error = NULL; - if(!xbel_folder_from_file(bookmarks, configFile, &error)) + if(!katze_xbel_folder_from_file(bookmarks, configFile, &error)) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages @@ -158,12 +158,12 @@ int main(int argc, char** argv) g_error_free(error); } g_free(configFile); - XbelItem* _session = xbel_folder_new(); + KatzeXbelItem* _session = katze_xbel_folder_new(); if(config->startup == CONFIG_STARTUP_SESSION) { configFile = g_build_filename(configPath, "session.xbel", NULL); error = NULL; - if(!xbel_folder_from_file(_session, configFile, &error)) + if(!katze_xbel_folder_from_file(_session, configFile, &error)) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages @@ -173,9 +173,9 @@ int main(int argc, char** argv) g_free(configFile); } configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); - tabtrash = xbel_folder_new(); + tabtrash = katze_xbel_folder_new(); error = NULL; - if(!xbel_folder_from_file(tabtrash, configFile, &error)) + if(!katze_xbel_folder_from_file(tabtrash, configFile, &error)) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages @@ -204,8 +204,8 @@ int main(int argc, char** argv) { config_free(config); search_engines_free(searchEngines); - xbel_item_unref(bookmarks); - xbel_item_unref(_session); + katze_xbel_item_unref(bookmarks); + katze_xbel_item_unref(_session); g_string_free(errorMessages, TRUE); return 0; } @@ -220,23 +220,23 @@ int main(int argc, char** argv) gchar* uri = argc > 1 ? strtok(g_strdup(argv[1]), "|") : NULL; while(uri != NULL) { - XbelItem* item = xbel_bookmark_new(); + KatzeXbelItem* item = katze_xbel_bookmark_new(); gchar* uriReady = magic_uri(uri, FALSE); - xbel_bookmark_set_href(item, uriReady); + katze_xbel_bookmark_set_href(item, uriReady); g_free(uriReady); - xbel_folder_append_item(_session, item); + katze_xbel_folder_append_item(_session, item); uri = strtok(NULL, "|"); } g_free(uri); - if(xbel_folder_is_empty(_session)) + if(katze_xbel_folder_is_empty(_session)) { - XbelItem* item = xbel_bookmark_new(); + KatzeXbelItem* item = katze_xbel_bookmark_new(); if(config->startup == CONFIG_STARTUP_BLANK) - xbel_bookmark_set_href(item, "about:blank"); + katze_xbel_bookmark_set_href(item, "about:blank"); else - xbel_bookmark_set_href(item, config->homepage); - xbel_folder_prepend_item(_session, item); + katze_xbel_bookmark_set_href(item, config->homepage); + katze_xbel_folder_prepend_item(_session, item); } g_free(configPath); @@ -244,17 +244,17 @@ int main(int argc, char** argv) stock_items_init(); browsers = NULL; - session = xbel_folder_new(); + session = katze_xbel_folder_new(); CBrowser* browser = NULL; - guint n = xbel_folder_get_n_items(_session); + guint n = katze_xbel_folder_get_n_items(_session); guint i; for(i = 0; i < n; i++) { - XbelItem* item = xbel_folder_get_nth_item(_session, i); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(_session, i); browser = browser_new(browser); - webView_open(browser->webView, xbel_bookmark_get_href(item)); + webView_open(browser->webView, katze_xbel_bookmark_get_href(item)); } - xbel_item_unref(_session); + katze_xbel_item_unref(_session); gtk_main(); @@ -272,34 +272,34 @@ int main(int argc, char** argv) g_free(configFile); configFile = g_build_filename(configPath, "bookmarks.xbel", NULL); error = NULL; - if(!xbel_folder_to_file(bookmarks, configFile, &error)) + if(!katze_xbel_folder_to_file(bookmarks, configFile, &error)) { g_warning("Bookmarks couldn't be saved. %s", error->message); g_error_free(error); } - xbel_item_unref(bookmarks); + katze_xbel_item_unref(bookmarks); g_free(configFile); configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); error = NULL; - if(!xbel_folder_to_file(tabtrash, configFile, &error)) + if(!katze_xbel_folder_to_file(tabtrash, configFile, &error)) { g_warning("Tabtrash couldn't be saved. %s", error->message); g_error_free(error); } - xbel_item_unref(tabtrash); + katze_xbel_item_unref(tabtrash); g_free(configFile); if(config->startup == CONFIG_STARTUP_SESSION) { configFile = g_build_filename(configPath, "session.xbel", NULL); error = NULL; - if(!xbel_folder_to_file(session, configFile, &error)) + if(!katze_xbel_folder_to_file(session, configFile, &error)) { g_warning("Session couldn't be saved. %s", error->message); g_error_free(error); } g_free(configFile); } - xbel_item_unref(session); + katze_xbel_item_unref(session); configFile = g_build_filename(configPath, "config", NULL); error = NULL; if(!config_to_file(config, configFile, &error)) diff --git a/src/webView.c b/src/webView.c index 3a8e392b..bef0a0b1 100644 --- a/src/webView.c +++ b/src/webView.c @@ -13,7 +13,7 @@ #include "helpers.h" #include "sokoke.h" -#include "xbel.h" +#include "../katze/katze.h" #include @@ -39,7 +39,7 @@ void on_webView_title_changed(GtkWidget* webView, WebKitWebFrame* frame newTitle = title; else newTitle = webkit_web_frame_get_uri(frame); - xbel_item_set_title(browser->sessionItem, newTitle); + katze_xbel_item_set_title(browser->sessionItem, newTitle); gtk_label_set_text(GTK_LABEL(browser->webView_name), newTitle); sokoke_widget_set_tooltip_text(gtk_widget_get_parent( gtk_widget_get_parent(browser->webView_name)), newTitle); @@ -90,7 +90,7 @@ void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame { const gchar* uri = webkit_web_frame_get_uri(frame); gchar* newUri = g_strdup(uri ? uri : ""); - xbel_bookmark_set_href(browser->sessionItem, newUri); + katze_xbel_bookmark_set_href(browser->sessionItem, newUri); if(webView == get_nth_webView(-1, browser)) { gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); @@ -301,9 +301,9 @@ void on_webView_destroy(GtkWidget* widget, CBrowser* browser) g_object_unref(browser->popup_element); g_object_unref(browser->popup_editable); guint i; - guint n = xbel_folder_get_n_items(bookmarks); + guint n = katze_xbel_folder_get_n_items(bookmarks); for(i = 0; i < n; i++) - xbel_item_unref(xbel_folder_get_nth_item(bookmarks, i)); + katze_xbel_item_unref(katze_xbel_folder_get_nth_item(bookmarks, i)); gtk_main_quit(); } } @@ -329,28 +329,28 @@ void webView_open(GtkWidget* webView, const gchar* uri) CBrowser* browser = get_browser_from_webView(webView); if(browser) { - xbel_bookmark_set_href(browser->sessionItem, uri); - xbel_item_set_title(browser->sessionItem, ""); + katze_xbel_bookmark_set_href(browser->sessionItem, uri); + katze_xbel_item_set_title(browser->sessionItem, ""); } } void webView_close(GtkWidget* webView, CBrowser* browser) { browser = get_browser_from_webView(webView); - const gchar* uri = xbel_bookmark_get_href(browser->sessionItem); - xbel_folder_remove_item(session, browser->sessionItem); + const gchar* uri = katze_xbel_bookmark_get_href(browser->sessionItem); + katze_xbel_folder_remove_item(session, browser->sessionItem); if(uri && *uri) { - xbel_folder_prepend_item(tabtrash, browser->sessionItem); - guint n = xbel_folder_get_n_items(tabtrash); + katze_xbel_folder_prepend_item(tabtrash, browser->sessionItem); + guint n = katze_xbel_folder_get_n_items(tabtrash); if(n > 10) { - XbelItem* item = xbel_folder_get_nth_item(tabtrash, n - 1); - xbel_item_unref(item); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item(tabtrash, n - 1); + katze_xbel_item_unref(item); } } else - xbel_item_unref(browser->sessionItem); + katze_xbel_item_unref(browser->sessionItem); gtk_widget_destroy(browser->webView_menu); gtk_notebook_remove_page(GTK_NOTEBOOK(browser->webViews) , get_webView_index(webView, browser)); diff --git a/src/xbel.c b/src/xbel.c deleted file mode 100644 index 07b625da..00000000 --- a/src/xbel.c +++ /dev/null @@ -1,825 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -/** - * This is an implementation of XBEL based on Glib and libXML2. - * - * Design Goals: - * - XbelItem is the only opaque public data structure. - * - The interface should be intuitive and familiar to Glib users. - * - There should be no public exposure of libXML2 specific code. - * - Bookmarks should actually be easily exchangeable between programs. - * - * TODO: - * - Support info > metadata, alias, added, modified, visited - * - Compatibility: The Nokia 770 *requires* metadata and folder - * - Compatibility: Kazehakase's bookmarks - * - Compatibility: Epiphany's bookmarks - * - XML Indentation - * - Export and import to other formats - **/ - -#include "xbel.h" - -#include -#include -#include -#include - -// Private: Create a new item of a certain type -static XbelItem* xbel_item_new(XbelItemKind kind) -{ - XbelItem* item = g_new(XbelItem, 1); - item->refs = 1; - item->parent = NULL; - item->kind = kind; - if(kind == XBEL_ITEM_FOLDER) - { - item->items = NULL; - item->folded = TRUE; - } - if(kind != XBEL_ITEM_SEPARATOR) - { - item->title = NULL; - item->desc = NULL; - } - if(kind == XBEL_ITEM_BOOKMARK) - item->href = g_strdup(""); - return item; -} - -/** - * xbel_bookmark_new: - * - * Create a new empty bookmark. - * - * Return value: a newly allocated bookmark - **/ -XbelItem* xbel_bookmark_new(void) -{ - return xbel_item_new(XBEL_ITEM_BOOKMARK); -} - -static XbelItem* xbel_bookmark_from_xmlNodePtr(xmlNodePtr cur) -{ - g_return_val_if_fail(cur != NULL, NULL); - XbelItem* bookmark = xbel_bookmark_new(); - xmlChar* key = xmlGetProp(cur, (xmlChar*)"href"); - xbel_bookmark_set_href(bookmark, (gchar*)key); - cur = cur->xmlChildrenNode; - while(cur != NULL) - { - if(!xmlStrcmp(cur->name, (const xmlChar*)"title")) - { - xmlChar* key = xmlNodeGetContent(cur); - bookmark->title = (gchar*)g_strstrip((gchar*)key); - } - else if(!xmlStrcmp(cur->name, (const xmlChar*)"desc")) - { - xmlChar* key = xmlNodeGetContent(cur); - bookmark->desc = (gchar*)g_strstrip((gchar*)key); - } - cur = cur->next; - } - return bookmark; -} - -/** - * xbel_separator_new: - * - * Create a new separator. - * - * The returned item must be freed eventually. - * - * Return value: a newly allocated separator. - **/ -XbelItem* xbel_separator_new(void) -{ - return xbel_item_new(XBEL_ITEM_SEPARATOR); -} - -/** - * xbel_folder_new: - * - * Create a new empty folder. - * - * The returned item must be freed eventually. - * - * Return value: a newly allocated folder. - **/ -XbelItem* xbel_folder_new(void) -{ - return xbel_item_new(XBEL_ITEM_FOLDER); -} - -// Private: Create a folder from an xmlNodePtr -static XbelItem* xbel_folder_from_xmlNodePtr(xmlNodePtr cur) -{ - g_return_val_if_fail(cur != NULL, NULL); - XbelItem* folder = xbel_folder_new(); - xmlChar* key = xmlGetProp(cur, (xmlChar*)"folded"); - if(key) - { - if(!g_ascii_strncasecmp((gchar*)key, "yes", 3)) - folder->folded = TRUE; - else if(!g_ascii_strncasecmp((gchar*)key, "no", 2)) - folder->folded = FALSE; - else - g_warning("XBEL: Unknown value for folded."); - xmlFree(key); - } - cur = cur->xmlChildrenNode; - while(cur) - { - if(!xmlStrcmp(cur->name, (const xmlChar*)"title")) - { - xmlChar* key = xmlNodeGetContent(cur); - folder->title = (gchar*)g_strstrip((gchar*)key); - } - else if(!xmlStrcmp(cur->name, (const xmlChar*)"desc")) - { - xmlChar* key = xmlNodeGetContent(cur); - folder->desc = (gchar*)g_strstrip((gchar*)key); - } - else if(!xmlStrcmp(cur->name, (const xmlChar*)"folder")) - { - XbelItem* item = xbel_folder_from_xmlNodePtr(cur); - item->parent = (struct XbelItem*)folder; - folder->items = g_list_prepend(folder->items, item); - } - else if(!xmlStrcmp(cur->name, (const xmlChar*)"bookmark")) - { - XbelItem* item = xbel_bookmark_from_xmlNodePtr(cur); - item->parent = (struct XbelItem*)folder; - folder->items = g_list_prepend(folder->items, item); - } - else if(!xmlStrcmp(cur->name, (const xmlChar*)"separator")) - { - XbelItem* item = xbel_separator_new(); - item->parent = (struct XbelItem*)folder; - folder->items = g_list_prepend(folder->items, item); - } - cur = cur->next; - } - // Prepending and reversing is faster than appending - folder->items = g_list_reverse(folder->items); - return folder; -} - -// Private: Loads the contents from an xmlNodePtr into a folder. -static gboolean xbel_folder_from_xmlDocPtr(XbelItem* folder, xmlDocPtr doc) -{ - g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); - g_return_val_if_fail(doc != NULL, FALSE); - xmlNodePtr cur = xmlDocGetRootElement(doc); - xmlChar* version = xmlGetProp(cur, (xmlChar*)"version"); - if(xmlStrcmp(version, (xmlChar*)"1.0")) - g_warning("XBEL version is not 1.0."); - xmlFree(version); - folder->title = (gchar*)xmlGetProp(cur, (xmlChar*)"title"); - folder->desc = (gchar*)xmlGetProp(cur, (xmlChar*)"desc"); - if((cur = xmlDocGetRootElement(doc)) == NULL) - { - // Empty document - return FALSE; - } - if(xmlStrcmp(cur->name, (const xmlChar*)"xbel")) - { - // Wrong document kind - return FALSE; - } - cur = cur->xmlChildrenNode; - while(cur != NULL) - { - XbelItem* item = NULL; - if(!xmlStrcmp(cur->name, (const xmlChar*)"folder")) - item = xbel_folder_from_xmlNodePtr(cur); - else if(!xmlStrcmp(cur->name, (const xmlChar*)"bookmark")) - item = xbel_bookmark_from_xmlNodePtr(cur); - else if(!xmlStrcmp(cur->name, (const xmlChar*)"separator")) - item = xbel_separator_new(); - /*else if(!xmlStrcmp(cur->name, (const xmlChar*)"info")) - item = xbel_parse_info(xbel, cur);*/ - if(item != NULL) - { - item->parent = (struct XbelItem*)folder; - folder->items = g_list_prepend(folder->items, item); - } - cur = cur->next; - } - // Prepending and reversing is faster than appending - folder->items = g_list_reverse(folder->items); - return TRUE; -} - -/** - * xbel_item_ref: - * @item: a valid item - * - * Ref an XbelItem. - * - * Ref means that the reference count is increased by one. - * - * This has no effect on children of a folder. - **/ -void xbel_item_ref(XbelItem* item) -{ - g_return_if_fail(item); - item->refs++; -} - -/** - * xbel_item_unref: - * @item: a valid item - * - * Unref an XbelItem. If @item is a folder all of its children will also - * be unreffed automatically. - * - * Unref means that the reference count is decreased. If there are no - * references left, the memory will be freed and if needed removed from - * its containing folder. - **/ -void xbel_item_unref(XbelItem* item) -{ - g_return_if_fail(item); - item->refs--; - if(item->refs) - return; - XbelItem* parent = xbel_item_get_parent(item); - if(parent) - xbel_folder_remove_item(parent, item); - if(xbel_item_is_folder(item)) - { - guint n = xbel_folder_get_n_items(item); - guint i; - for(i = 0; i < n; i++) - { - XbelItem* _item = xbel_folder_get_nth_item(item, i); - _item->parent = NULL; - xbel_item_unref(_item); - } - g_list_free(item->items); - } - if(item->kind != XBEL_ITEM_SEPARATOR) - { - g_free(item->title); - g_free(item->desc); - } - if(item->kind == XBEL_ITEM_BOOKMARK) - g_free(item->href); - g_free(item); -} - -/** - * xbel_item_copy: - * @item: the item to copy - * - * Copy an XbelItem. - * - * The returned item must be unreffed eventually. - * - * Return value: a copy of @item - **/ -XbelItem* xbel_item_copy(XbelItem* item) -{ - g_return_val_if_fail(item, NULL); - XbelItem* copy = xbel_folder_new(); - if(xbel_item_is_folder(item)) - { - guint n = xbel_folder_get_n_items(item); - guint i; - for(i = 0; i < n; i++) - { - XbelItem* _item = xbel_folder_get_nth_item(item, i); - xbel_folder_append_item(copy, xbel_item_copy(_item)); - } - } - if(item->kind != XBEL_ITEM_SEPARATOR) - { - xbel_item_set_title(copy, item->title); - xbel_item_set_desc(copy, item->desc); - } - if(item->kind == XBEL_ITEM_BOOKMARK) - xbel_bookmark_set_href(copy, item->href); - return copy; -} - -GType xbel_item_get_type() -{ - static GType type = 0; - if(!type) - type = g_pointer_type_register_static("xbel_item"); - return type; -} - -/** - * xbel_folder_append_item: - * @folder: a folder - * @item: the item to append - * - * Append the given item to a folder. - * - * The item is actually moved and must not be contained in another folder. - * - **/ -void xbel_folder_append_item(XbelItem* folder, XbelItem* item) -{ - g_return_if_fail(!xbel_item_get_parent(item)); - g_return_if_fail(xbel_item_is_folder(folder)); - item->parent = (struct XbelItem*)folder; - folder->items = g_list_append(folder->items, item); -} - -/** - * xbel_folder_prepend_item: - * @folder: a folder - * @item: the item to prepend - * - * Prepend the given item to a folder. - * - * The item is actually moved and must not be contained in another folder. - * - **/ -void xbel_folder_prepend_item(XbelItem* folder, XbelItem* item) -{ - g_return_if_fail(!xbel_item_get_parent(item)); - g_return_if_fail(xbel_item_is_folder(folder)); - item->parent = (struct XbelItem*)folder; - folder->items = g_list_prepend(folder->items, item); -} - -/** - * xbel_folder_remove_item: - * @folder: a folder - * @item: the item to remove - * - * Remove the given @item from a @folder. - **/ -void xbel_folder_remove_item(XbelItem* folder, XbelItem* item) -{ - g_return_if_fail(item); - g_return_if_fail(xbel_item_get_parent(folder) != item); - item->parent = NULL; - // Fortunately we know that items are unique - folder->items = g_list_remove(folder->items, item); -} - -/** - * xbel_folder_get_n_items: - * @folder: a folder - * - * Retrieve the number of items contained in the given @folder. - * - * Return value: number of items - **/ -guint xbel_folder_get_n_items(XbelItem* folder) -{ - g_return_val_if_fail(xbel_item_is_folder(folder), 0); - return g_list_length(folder->items); -} - -/** - * xbel_folder_get_nth_item: - * @folder: a folder - * @n: the index of an item - * - * Retrieve an item contained in the given @folder by its index. - * - * Return value: the item at the given index or %NULL - **/ -XbelItem* xbel_folder_get_nth_item(XbelItem* folder, guint n) -{ - g_return_val_if_fail(xbel_item_is_folder(folder), NULL); - return (XbelItem*)g_list_nth_data(folder->items, n); -} - -/** - * xbel_folder_is_empty: - * @folder: A folder. - * - * Determines wether or not a folder contains no items. This is significantly - * faster than xbel_folder_get_n_items for this particular purpose. - * - * Return value: Wether the given @folder is folded. - **/ -gboolean xbel_folder_is_empty(XbelItem* folder) -{ - return !xbel_folder_get_nth_item(folder, 0); -} - -/** - * xbel_folder_get_folded: - * @folder: A folder. - * - * Determines wether or not a folder is folded. If a folder is not folded - * it should not be exposed in a user interface. - * - * New folders are folded by default. - * - * Return value: Wether the given @folder is folded. - **/ -gboolean xbel_folder_get_folded(XbelItem* folder) -{ - g_return_val_if_fail(xbel_item_is_folder(folder), TRUE); - return folder->folded; -} - -/** - * xbel_item_get_kind: - * @item: A item. - * - * Determines the kind of an item. - * - * Return value: The kind of the given @item. - **/ -XbelItemKind xbel_item_get_kind(XbelItem* item) -{ - return item->kind; -} - -/** - * xbel_item_get_parent: - * @item: A valid item. - * - * Retrieves the parent folder of an item. - * - * Return value: The parent folder of the given @item or %NULL. - **/ -XbelItem* xbel_item_get_parent(XbelItem* item) -{ - g_return_val_if_fail(item, NULL); - return (XbelItem*)item->parent; -} - -/** - * xbel_item_get_title: - * @item: A valid item. - * - * Retrieves the title of an item. - * - * Return value: The title of the given @item or %NULL. - **/ -G_CONST_RETURN gchar* xbel_item_get_title(XbelItem* item) -{ - g_return_val_if_fail(!xbel_item_is_separator(item), NULL); - return item->title; -} - -/** - * xbel_item_get_desc: - * @item: A valid item. - * - * Retrieves the description of an item. - * - * Return value: The description of the @item or %NULL. - **/ -G_CONST_RETURN gchar* xbel_item_get_desc(XbelItem* item) -{ - g_return_val_if_fail(!xbel_item_is_separator(item), NULL); - return item->desc; -} - -/** - * xbel_bookmark_get_href: - * @bookmark: A bookmark. - * - * Retrieves the uri of a bookmark. The value is guaranteed to not be %NULL. - * - * Return value: The uri of the @bookmark. - **/ -G_CONST_RETURN gchar* xbel_bookmark_get_href(XbelItem* bookmark) -{ - g_return_val_if_fail(xbel_item_is_bookmark(bookmark), NULL); - return bookmark->href; -} - -/** - * xbel_item_is_bookmark: - * @item: A valid item. - * - * Determines wether or not an item is a bookmark. - * - * Return value: %TRUE if the @item is a bookmark. - **/ -gboolean xbel_item_is_bookmark(XbelItem* item) -{ - g_return_val_if_fail(item, FALSE); - return item->kind == XBEL_ITEM_BOOKMARK; -} - -/** - * xbel_item_is_separator: - * @item: A valid item. - * - * Determines wether or not an item is a separator. - * - * Return value: %TRUE if the @item is a separator. - **/ -gboolean xbel_item_is_separator(XbelItem* item) -{ - g_return_val_if_fail(item, FALSE); - return item->kind == XBEL_ITEM_SEPARATOR; -} - -/** - * xbel_item_is_folder: - * @item: A valid item. - * - * Determines wether or not an item is a folder. - * - * Return value: %TRUE if the item is a folder. - **/ -gboolean xbel_item_is_folder(XbelItem* item) -{ - g_return_val_if_fail(item, FALSE); - return item->kind == XBEL_ITEM_FOLDER; -} - -/** - * xbel_folder_set_folded: - * @folder: A folder. - * @folded: TRUE if the folder is folded. - * - * Sets the foldedness of the @folder. - **/ -void xbel_folder_set_folded(XbelItem* folder, gboolean folded) -{ - g_return_if_fail(xbel_item_is_folder(folder)); - folder->folded = folded; -} - -/** - * xbel_item_set_title: - * @item: A valid item. - * @title: A string to use for the title. - * - * Sets the title of the @item. - **/ -void xbel_item_set_title(XbelItem* item, const gchar* title) -{ - g_return_if_fail(!xbel_item_is_separator(item)); - g_free(item->title); - item->title = g_strdup(title); -} - -/** - * xbel_item_set_desc: - * @item: A valid item. - * @title: A string to use for the description. - * - * Sets the description of the @item. - **/ -void xbel_item_set_desc(XbelItem* item, const gchar* desc) -{ - g_return_if_fail(!xbel_item_is_separator(item)); - g_free(item->desc); - item->desc = g_strdup(desc); -} - -/** - * xbel_bookmark_set_href: - * @bookmark: A bookmark. - * @href: A string containing a valid uri. - * - * Sets the uri of the bookmark. - * - * The uri must not be %NULL. - * - * This uri is not currently validated in any way. This may change in the future. - **/ -void xbel_bookmark_set_href(XbelItem* bookmark, const gchar* href) -{ - g_return_if_fail(xbel_item_is_bookmark(bookmark)); - g_return_if_fail(href); - g_free(bookmark->href); - bookmark->href = g_strdup(href); -} - -gboolean xbel_folder_from_data(XbelItem* folder, const gchar* data, GError** error) -{ - g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); - g_return_val_if_fail(data, FALSE); - xmlDocPtr doc; - if((doc = xmlParseMemory(data, strlen(data))) == NULL) - { - // No valid xml or broken encoding - *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ - , "Malformed document."); - return FALSE; - } - if(!xbel_folder_from_xmlDocPtr(folder, doc)) - { - // Parsing failed - xmlFreeDoc(doc); - *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ - , "Malformed document."); - return FALSE; - } - xmlFreeDoc(doc); - return TRUE; -} - -/** - * xbel_folder_from_file: - * @folder: An empty folder. - * @file: A relative path to a file. - * @error: return location for a GError or %NULL - * - * Tries to load @file. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gboolean xbel_folder_from_file(XbelItem* folder, const gchar* file, GError** error) -{ - g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); - g_return_val_if_fail(file, FALSE); - if(!g_file_test(file, G_FILE_TEST_EXISTS)) - { - // File doesn't exist - *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_NOENT - , "File not found."); - return FALSE; - } - xmlDocPtr doc; - if((doc = xmlParseFile(file)) == NULL) - { - // No valid xml or broken encoding - *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ - , "Malformed document."); - return FALSE; - } - if(!xbel_folder_from_xmlDocPtr(folder, doc)) - { - // Parsing failed - xmlFreeDoc(doc); - *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ - , "Malformed document."); - return FALSE; - } - xmlFreeDoc(doc); - return TRUE; -} - -/** - * xbel_folder_from_data_dirs: - * @folder: An empty folder. - * @file: A relative path to a file. - * @full_path: return location for the full path of the file or %NULL - * @error: return location for a GError or %NULL - * - * Tries to load @file from the user data dir or any of the system data dirs. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gboolean xbel_folder_from_data_dirs(XbelItem* folder, const gchar* file - , gchar** full_path, GError** error) -{ - g_return_val_if_fail(xbel_folder_is_empty(folder), FALSE); - g_return_val_if_fail(file, FALSE); - // FIXME: Essentially unimplemented - - *error = g_error_new(XBEL_ERROR, XBEL_ERROR_READ - , "Malformed document."); - return FALSE; -} - -static gchar* xbel_xml_element(const gchar* name, const gchar* value) -{ - if(!value) - return g_strdup(""); - gchar* valueEscaped = g_markup_escape_text(value, -1); - gchar* XML = g_strdup_printf("<%s>%s\n", name, valueEscaped, name); - g_free(valueEscaped); - return XML; -} - -static gchar* xbel_item_to_data(XbelItem* item) -{ - g_return_val_if_fail(item, NULL); - gchar* XML = NULL; - switch(xbel_item_get_kind(item)) - { - case XBEL_ITEM_FOLDER: - { - GString* _XML = g_string_new(NULL); - guint n = xbel_folder_get_n_items(item); - guint i; - for(i = 0; i < n; i++) - { - XbelItem* _item = xbel_folder_get_nth_item(item, i); - gchar* itemXML = xbel_item_to_data(_item); - g_string_append(_XML, itemXML); - g_free(itemXML); - } - gchar* folded = item->folded ? NULL : g_strdup_printf(" folded=\"no\""); - gchar* title = xbel_xml_element("title", item->title); - gchar* desc = xbel_xml_element("desc", item->desc); - XML = g_strdup_printf("\n%s%s%s\n" - , folded ? folded : "" - , title - , desc - , g_string_free(_XML, FALSE)); - g_free(folded); - g_free(title); - g_free(desc); - break; - } - case XBEL_ITEM_BOOKMARK: - { - gchar* hrefEscaped = g_markup_escape_text(item->href, -1); - gchar* href = g_strdup_printf(" href=\"%s\"", hrefEscaped); - g_free(hrefEscaped); - gchar* title = xbel_xml_element("title", item->title); - gchar* desc = xbel_xml_element("desc", item->desc); - XML = g_strdup_printf("\n%s%s%s\n" - , href - , title - , desc - , ""); - g_free(href); - g_free(title); - g_free(desc); - break; - } - case XBEL_ITEM_SEPARATOR: - XML = g_strdup("\n"); - break; - default: - g_warning("XBEL: Unknown item kind"); - } - return XML; -} - -/** - * xbel_folder_to_data: - * @folder: A folder. - * @length: return location for the length of the created string or %NULL - * @error: return location for a GError or %NULL - * - * Retrieve the contents of @folder as a string. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gchar* xbel_folder_to_data(XbelItem* folder, gsize* length, GError** error) -{ - g_return_val_if_fail(xbel_item_is_folder(folder), FALSE); - // FIXME: length is never filled - GString* innerXML = g_string_new(NULL); - guint n = xbel_folder_get_n_items(folder); - guint i; - for(i = 0; i < n; i++) - { - gchar* sItem = xbel_item_to_data(xbel_folder_get_nth_item(folder, i)); - g_string_append(innerXML, sItem); - g_free(sItem); - } - gchar* title = xbel_xml_element("title", folder->title); - gchar* desc = xbel_xml_element("desc", folder->desc); - gchar* outerXML; - outerXML = g_strdup_printf("%s%s\n%s%s%s\n" - , "\n" - , "\n" - , title - , desc - , g_string_free(innerXML, FALSE)); - g_free(title); - g_free(desc); - return outerXML; -} - -/** - * xbel_folder_to_file: - * @folder: A folder. - * @file: The destination filename. - * @error: return location for a GError or %NULL - * - * Write the contents of @folder to the specified file, creating it if necessary. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gboolean xbel_folder_to_file(XbelItem* folder, const gchar* file, GError** error) -{ - g_return_val_if_fail(file, FALSE); - gchar* data; - if(!(data = xbel_folder_to_data(folder, NULL, error))) - return FALSE; - FILE* fp; - if(!(fp = fopen(file, "w"))) - { - *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_ACCES - , "Writing failed."); - return FALSE; - } - fputs(data, fp); - fclose(fp); - g_free(data); - return TRUE; -} diff --git a/src/xbel.h b/src/xbel.h deleted file mode 100644 index 2fb6bf40..00000000 --- a/src/xbel.h +++ /dev/null @@ -1,158 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __XBEL_H__ -#define __XBEL_H__ 1 - -#include -#include - -#define XBEL_ERROR g_quark_from_string("XBEL_ERROR") - -typedef enum -{ - XBEL_ERROR_INVALID_URI, /* Malformed uri */ - XBEL_ERROR_INVALID_VALUE, /* Requested field not found */ - XBEL_ERROR_URI_NOT_FOUND, /* Requested uri not found */ - XBEL_ERROR_READ, /* Malformed document */ - XBEL_ERROR_UNKNOWN_ENCODING, /* Parsed text was in an unknown encoding */ - XBEL_ERROR_WRITE, /* Writing failed. */ -} XBELError; - -typedef enum -{ - XBEL_ITEM_FOLDER, - XBEL_ITEM_BOOKMARK, - XBEL_ITEM_SEPARATOR -} XbelItemKind; - -// Note: This structure is entirely private. -typedef struct -{ - guint refs; - XbelItemKind kind; - struct XbelItem* parent; - - GList* items; // folder - gboolean folded; // foolder - gchar* title; // !separator - gchar* desc; // folder and bookmark - gchar* href; // bookmark - //time_t added; // !separator - //time_t modfied; // bookmark - //time_t visited; // bookmark -} XbelItem; - -XbelItem* -xbel_bookmark_new(void); - -XbelItem* -xbel_separator_new(void); - -XbelItem* -xbel_folder_new(void); - -void -xbel_item_ref(XbelItem*); - -void -xbel_item_unref(XbelItem*); - -XbelItem* -xbel_item_copy(XbelItem*); - -GType -xbel_item_get_type(); - -#define G_TYPE_XBEL_ITEM xbel_item_get_type() - -void -xbel_folder_append_item(XbelItem*, XbelItem*); - -void -xbel_folder_prepend_item(XbelItem*, XbelItem*); - -void -xbel_folder_remove_item(XbelItem*, XbelItem*); - -guint -xbel_folder_get_n_items(XbelItem*); - -XbelItem* -xbel_folder_get_nth_item(XbelItem*, guint); - -gboolean -xbel_folder_is_empty(XbelItem*); - -gboolean -xbel_folder_get_folded(XbelItem*); - -XbelItemKind -xbel_item_get_kind(XbelItem*); - -XbelItem* -xbel_item_get_parent(XbelItem*); - -G_CONST_RETURN gchar* -xbel_item_get_title(XbelItem*); - -G_CONST_RETURN gchar* -xbel_item_get_desc(XbelItem*); - -G_CONST_RETURN gchar* -xbel_bookmark_get_href(XbelItem*); - -/*time_t -xbel_bookmark_get_added(XbelItem*); - -time_t -xbel_bookmark_get_modified(XbelItem*); - -time_t -xbel_bookmark_get_visited(XbelItem*);*/ - -gboolean -xbel_item_is_bookmark(XbelItem*); - -gboolean -xbel_item_is_separator(XbelItem*); - -gboolean -xbel_item_is_folder(XbelItem*); - -void -xbel_folder_set_folded(XbelItem*, gboolean); - -void -xbel_item_set_title(XbelItem*, const gchar*); - -void -xbel_item_set_desc(XbelItem*, const gchar*); - -void -xbel_bookmark_set_href(XbelItem*, const gchar*); - -gboolean -xbel_folder_from_data(XbelItem*, const gchar*, GError**); - -gboolean -xbel_folder_from_file(XbelItem*, const gchar*, GError**); - -gboolean -xbel_folder_from_data_dirs(XbelItem*, const gchar*, gchar**, GError**); - -gchar* -xbel_folder_to_data(XbelItem*, gsize*, GError**); - -gboolean -xbel_folder_to_file(XbelItem*, const gchar*, GError**); - -#endif /* !__XBEL_H__ */ From 2c08ccbef5c97332fe97c39f872b6eb85daa7674 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Mon, 7 Jan 2008 16:06:36 +0100 Subject: [PATCH 0023/2970] Fixed the header of the KatzeThrobber --- katze/katze-throbber.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index ebd51028..17f570b8 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -38,14 +38,8 @@ typedef struct _KatzeThrobberClass KatzeThrobberClass; struct _KatzeThrobber { + GtkMisc parent_object; KatzeThrobberPrivate* priv; - GtkWidget parent_object; - - /* Padding for future expansion */ - void (*_katze_reserved1) (void); - void (*_katze_reserved2) (void); - void (*_katze_reserved3) (void); - void (*_katze_reserved4) (void); }; struct _KatzeThrobberClass @@ -60,7 +54,7 @@ struct _KatzeThrobberClass }; GType -katze_throbber_get_type (void) G_GNUC_CONST; +katze_throbber_get_type (void); GtkWidget* katze_throbber_new (void); From a9236468d94b67d18c815d6b47280a9383059bff Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 9 Jan 2008 07:39:19 +0100 Subject: [PATCH 0024/2970] Allow Find Next and Find Previous when the findbox is hidden. The find text should be preserved after hiding the findbox until it is shown again. Refactor the find code for both directions. --- src/browser.c | 70 +++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/src/browser.c b/src/browser.c index f56ed0f5..ce9f9a44 100644 --- a/src/browser.c +++ b/src/browser.c @@ -115,7 +115,6 @@ void on_action_find_activate(GtkAction* action, CBrowser* browser) { GtkWidget* webView = get_nth_webView(-1, browser); webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); - gtk_entry_set_text(GTK_ENTRY(browser->findbox_text), ""); gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight), FALSE); gtk_widget_hide(browser->findbox); @@ -125,53 +124,46 @@ void on_action_find_activate(GtkAction* action, CBrowser* browser) GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + gtk_entry_set_text(GTK_ENTRY(browser->findbox_text), ""); gtk_widget_show(browser->findbox); gtk_widget_grab_focus(GTK_WIDGET(browser->findbox_text)); } } -void on_action_find_next_activate(GtkAction* action, CBrowser* browser) +static void findbox_find(gboolean forward, CBrowser* browser) { - if(!GTK_WIDGET_VISIBLE(browser->findbox)) - return; const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); const gboolean caseSensitive = gtk_toggle_tool_button_get_active( GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); GtkWidget* webView = get_nth_webView(-1, browser); - GtkWidget* icon; - webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); - if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, caseSensitive, TRUE, TRUE)) - icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - else - icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); - const gboolean highlight = gtk_toggle_tool_button_get_active( - GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); + if(GTK_WIDGET_VISIBLE(browser->findbox)) + webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); + gboolean found = webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView) + , text, caseSensitive, forward, TRUE); + if(GTK_WIDGET_VISIBLE(browser->findbox)) + { + GtkWidget* icon; + if(found) + icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); + else + icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); + const gboolean highlight = gtk_toggle_tool_button_get_active( + GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); + webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); + } +} + +void on_action_find_next_activate(GtkAction* action, CBrowser* browser) +{ + findbox_find(TRUE, browser); } void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) { - if(!GTK_WIDGET_VISIBLE(browser->findbox)) - return; - const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); - const gboolean caseSensitive = gtk_toggle_tool_button_get_active( - GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); - GtkWidget* webView = get_nth_webView(-1, browser); - webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); - GtkWidget* icon; - if(webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView), text, caseSensitive, FALSE, TRUE)) - icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - else - icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); - const gboolean highlight = gtk_toggle_tool_button_get_active( - GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); + findbox_find(FALSE, browser); } void on_findbox_highlight_toggled(GtkToggleToolButton* toolitem, CBrowser* browser) @@ -181,6 +173,11 @@ void on_findbox_highlight_toggled(GtkToggleToolButton* toolitem, CBrowser* brows webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); } +void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser) +{ + gtk_widget_hide(browser->findbox); +} + void on_action_preferences_activate(GtkAction* action, CBrowser* browser) { // Show the preferences dialog. Create it if necessary. @@ -1051,11 +1048,6 @@ void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page update_search_engines(browser); } -void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser) -{ - gtk_widget_hide(browser->findbox); -} - static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation , CBrowser* browser) { From 54e03ab03012f091809ec81e2c52217d0a837a5a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 9 Jan 2008 07:44:56 +0100 Subject: [PATCH 0025/2970] Make sure selection actions have a widget. The return value of gtk_window_get_focus can be NULL. Return early in that case. --- src/browser.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/browser.c b/src/browser.c index ce9f9a44..35d13354 100644 --- a/src/browser.c +++ b/src/browser.c @@ -76,24 +76,32 @@ void on_action_edit_activate(GtkAction* action, CBrowser* browser) void on_action_cut_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(G_UNLIKELY(!widget)) + return; g_signal_emit_by_name(widget, "cut-clipboard"); } void on_action_copy_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(G_UNLIKELY(!widget)) + return; g_signal_emit_by_name(widget, "copy-clipboard"); } void on_action_paste_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(G_UNLIKELY(!widget)) + return; g_signal_emit_by_name(widget, "paste-clipboard"); } void on_action_delete_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(G_UNLIKELY(!widget)) + return; if(WEBKIT_IS_WEB_VIEW(widget)) webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); else if(GTK_IS_EDITABLE(widget)) @@ -103,6 +111,8 @@ void on_action_delete_activate(GtkAction* action, CBrowser* browser) void on_action_selectAll_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); + if(G_UNLIKELY(!widget)) + return; if(GTK_IS_ENTRY(widget)) gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); else From e94d8c74e84fca4e116366dcf23c2edc199ad2b7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Jan 2008 18:05:16 +0100 Subject: [PATCH 0026/2970] Cleanup and WebKit API update --- katze/katze-throbber.c | 58 ++++++++++++++++++++------------------ src/browser.c | 64 +++++++++++++++++++++--------------------- src/helpers.c | 8 ++---- src/prefs.c | 8 ++---- src/search.c | 26 ++++++----------- src/sokoke.c | 6 ++-- src/webView.c | 23 +++++++-------- 7 files changed, 90 insertions(+), 103 deletions(-) diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index fb31912f..fcaae5e6 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -197,7 +197,9 @@ katze_throbber_init (KatzeThrobber *throbber) { GTK_WIDGET_SET_FLAGS (throbber, GTK_NO_WINDOW); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + throbber->priv = KATZE_THROBBER_GET_PRIVATE (throbber); + + KatzeThrobberPrivate* priv = throbber->priv; priv->timer_id = -1; } @@ -205,7 +207,7 @@ static void katze_throbber_dispose (GObject *object) { KatzeThrobber* throbber = KATZE_THROBBER (object); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; if (G_UNLIKELY (priv->timer_id >= 0)) g_source_remove (priv->timer_id); @@ -217,7 +219,7 @@ static void katze_throbber_destroy (GtkObject *object) { KatzeThrobber* throbber = KATZE_THROBBER (object); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; katze_assign (priv->icon_name, NULL); if (priv->pixbuf) @@ -335,7 +337,7 @@ katze_throbber_set_icon_size (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; g_return_if_fail (gtk_icon_size_lookup (icon_size, &priv->width, &priv->height)); @@ -360,7 +362,7 @@ katze_throbber_set_icon_name (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; katze_assign (priv->icon_name, g_strdup (icon_name)); if (icon_name) @@ -382,12 +384,12 @@ katze_throbber_set_icon_name (KatzeThrobber* throbber, **/ void katze_throbber_set_pixbuf (KatzeThrobber* throbber, - GdkPixbuf *pixbuf) + GdkPixbuf* pixbuf) { g_return_if_fail (KATZE_IS_THROBBER (throbber)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; katze_object_assign (priv->pixbuf, pixbuf); if (pixbuf) @@ -415,7 +417,7 @@ katze_throbber_set_animated (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; if (G_UNLIKELY (priv->animated == animated)) return; @@ -448,7 +450,7 @@ katze_throbber_set_static_icon_name (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; katze_assign (priv->static_icon_name, g_strdup (icon_name)); if (icon_name) @@ -474,12 +476,12 @@ katze_throbber_set_static_icon_name (KatzeThrobber* throbber, **/ void katze_throbber_set_static_pixbuf (KatzeThrobber* throbber, - GdkPixbuf *pixbuf) + GdkPixbuf* pixbuf) { g_return_if_fail (KATZE_IS_THROBBER (throbber)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; katze_object_assign (priv->static_pixbuf, pixbuf); if (pixbuf) @@ -514,7 +516,7 @@ katze_throbber_set_static_stock_id (KatzeThrobber* throbber, g_return_if_fail (gtk_stock_lookup (stock_id, &stock_item)); } - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; katze_assign (priv->static_stock_id, g_strdup (stock_id)); if (stock_id) @@ -536,7 +538,7 @@ katze_throbber_get_icon_size (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), GTK_ICON_SIZE_INVALID); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->icon_size; } @@ -553,7 +555,7 @@ katze_throbber_get_icon_name (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->icon_name; } @@ -572,7 +574,7 @@ katze_throbber_get_pixbuf (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->pixbuf; } @@ -589,7 +591,7 @@ katze_throbber_get_animated (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), FALSE); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->animated; } @@ -607,7 +609,7 @@ katze_throbber_get_static_icon_name (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->static_icon_name; } @@ -626,7 +628,7 @@ katze_throbber_get_static_pixbuf (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->static_pixbuf; } @@ -644,7 +646,7 @@ katze_throbber_get_static_stock_id (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; return priv->static_stock_id; } @@ -662,7 +664,7 @@ katze_throbber_unrealize (GtkWidget* widget) if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize) GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize (widget); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (KATZE_THROBBER (widget)); + KatzeThrobberPrivate* priv = KATZE_THROBBER(widget)->priv; katze_object_assign (priv->pixbuf, NULL); katze_object_assign (priv->static_pixbuf, NULL); } @@ -675,7 +677,7 @@ pixbuf_assign_icon (GdkPixbuf** pixbuf, if (*pixbuf) g_object_unref (*pixbuf); - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (throbber)); GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); @@ -689,7 +691,7 @@ pixbuf_assign_icon (GdkPixbuf** pixbuf, static void icon_theme_changed (KatzeThrobber* throbber) { - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; if (priv->icon_name) pixbuf_assign_icon (&priv->pixbuf, priv->icon_name, @@ -728,7 +730,7 @@ katze_throbber_unmap (GtkWidget* widget) static gboolean katze_throbber_timeout (KatzeThrobber* throbber) { - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; priv->index++; gtk_widget_queue_draw (GTK_WIDGET (throbber)); @@ -739,7 +741,7 @@ katze_throbber_timeout (KatzeThrobber* throbber) static void katze_throbber_timeout_destroy (KatzeThrobber* throbber) { - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (throbber); + KatzeThrobberPrivate* priv = throbber->priv; priv->index = 0; priv->timer_id = -1; @@ -747,7 +749,7 @@ katze_throbber_timeout_destroy (KatzeThrobber* throbber) static void katze_throbber_style_set (GtkWidget* widget, - GtkStyle* prev_style) + GtkStyle* prev_style) { if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set) GTK_WIDGET_CLASS (katze_throbber_parent_class)->style_set (widget, @@ -758,7 +760,7 @@ katze_throbber_style_set (GtkWidget* widget, static void katze_throbber_screen_changed (GtkWidget* widget, - GdkScreen* prev_screen) + GdkScreen* prev_screen) { if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed) GTK_WIDGET_CLASS (katze_throbber_parent_class)->screen_changed ( @@ -772,7 +774,7 @@ static void katze_throbber_size_request (GtkWidget* widget, GtkRequisition* requisition) { - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (KATZE_THROBBER (widget)); + KatzeThrobberPrivate* priv = KATZE_THROBBER (widget)->priv; requisition->width = priv->width; requisition->height = priv->height; @@ -785,7 +787,7 @@ static gboolean katze_throbber_expose_event (GtkWidget* widget, GdkEventExpose* event) { - KatzeThrobberPrivate* priv = KATZE_THROBBER_GET_PRIVATE (KATZE_THROBBER (widget)); + KatzeThrobberPrivate* priv = KATZE_THROBBER (widget)->priv; if (G_UNLIKELY (!priv->width || !priv->height)) return TRUE; diff --git a/src/browser.c b/src/browser.c index 35d13354..a61ac2fa 100644 --- a/src/browser.c +++ b/src/browser.c @@ -76,47 +76,46 @@ void on_action_edit_activate(GtkAction* action, CBrowser* browser) void on_action_cut_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_UNLIKELY(!widget)) - return; - g_signal_emit_by_name(widget, "cut-clipboard"); + if(G_LIKELY(widget)) + g_signal_emit_by_name(widget, "cut-clipboard"); } void on_action_copy_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_UNLIKELY(!widget)) - return; - g_signal_emit_by_name(widget, "copy-clipboard"); + if(G_LIKELY(widget)) + g_signal_emit_by_name(widget, "copy-clipboard"); } void on_action_paste_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_UNLIKELY(!widget)) - return; - g_signal_emit_by_name(widget, "paste-clipboard"); + if(G_LIKELY(widget)) + g_signal_emit_by_name(widget, "paste-clipboard"); } void on_action_delete_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_UNLIKELY(!widget)) - return; - if(WEBKIT_IS_WEB_VIEW(widget)) - webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); - else if(GTK_IS_EDITABLE(widget)) - gtk_editable_delete_selection(GTK_EDITABLE(widget)); + if(G_LIKELY(widget)) + { + if(WEBKIT_IS_WEB_VIEW(widget)) + webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); + else if(GTK_IS_EDITABLE(widget)) + gtk_editable_delete_selection(GTK_EDITABLE(widget)); + } } void on_action_selectAll_activate(GtkAction* action, CBrowser* browser) { GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_UNLIKELY(!widget)) - return; - if(GTK_IS_ENTRY(widget)) - gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); - else - g_signal_emit_by_name(widget, "select-all"); + if(G_LIKELY(widget)) + { + if(GTK_IS_ENTRY(widget)) + gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); + else + g_signal_emit_by_name(widget, "select-all"); + } } void on_action_find_activate(GtkAction* action, CBrowser* browser) @@ -293,7 +292,7 @@ void on_action_source_view_activate(GtkAction* action, CBrowser* browser) void on_action_back_activate(GtkAction* action, CBrowser* browser) { - webkit_web_view_go_backward(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); + webkit_web_view_go_back(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); } void on_action_forward_activate(GtkAction* action, CBrowser* browser) @@ -980,13 +979,13 @@ void on_action_panel_item_activate(GtkRadioAction* action void on_action_openInPanel_activate(GtkAction* action, CBrowser* browser) { GtkWidget* webView = get_nth_webView(-1, browser); - g_free(config->panelPageholder); WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); const gchar* uri = webkit_web_frame_get_uri(frame); - config->panelPageholder = g_strdup(uri); + katze_assign(config->panelPageholder, g_strdup(uri)); GtkAction* action_pageholder = gtk_action_group_get_action(browser->actiongroup, "PanelPageholder"); - gint value; g_object_get(G_OBJECT(action_pageholder), "value", &value, NULL); + gint value; + g_object_get(G_OBJECT(action_pageholder), "value", &value, NULL); sokoke_radio_action_set_current_value(GTK_RADIO_ACTION(action_pageholder), value); gtk_widget_show(browser->panels); webView_open(browser->panel_pageholder, config->panelPageholder); @@ -1061,13 +1060,14 @@ void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation , CBrowser* browser) { - if(!GTK_WIDGET_REALIZED(widget)) - return; - if(!(gdk_window_get_state(widget->window) - & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + if(GTK_WIDGET_REALIZED(widget)) { - config->winWidth = allocation->width; - config->winHeight = allocation->height; + if(!(gdk_window_get_state(widget->window) + & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + { + config->winWidth = allocation->width; + config->winHeight = allocation->height; + } } } @@ -1602,7 +1602,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); page = gtk_notebook_insert_page(GTK_NOTEBOOK(browser->webViews) , scrolled, GTK_WIDGET(eventbox), page + 1); - g_signal_connect_after(GTK_OBJECT(browser->webViews), "switch-page" + g_signal_connect_after(browser->webViews, "switch-page" , G_CALLBACK(on_notebook_switch_page), browser); #if GTK_CHECK_VERSION(2, 10, 0) gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(browser->webViews), scrolled, TRUE); diff --git a/src/helpers.c b/src/helpers.c index 792b7101..8a114586 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -138,7 +138,8 @@ gboolean spawn_protocol_command(const gchar* protocol, const gchar* res) show_error("Could not run external program.", error->message, NULL); g_error_free(error); } - g_free(commandReady); g_free(uriEscaped); + g_free(commandReady); + g_free(uriEscaped); return TRUE; } @@ -288,7 +289,6 @@ void action_set_active(const gchar* name, gboolean active, CBrowser* browser) { // This shortcut toggles activity state by an action name GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); - g_return_if_fail(GTK_IS_ACTION(action)); gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), active); } @@ -296,7 +296,6 @@ void action_set_sensitive(const gchar* name, gboolean sensitive, CBrowser* brows { // This shortcut toggles sensitivity by an action name GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); - g_return_if_fail(GTK_IS_ACTION(action)); gtk_action_set_sensitive(action, sensitive); } @@ -304,7 +303,6 @@ void action_set_visible(const gchar* name, gboolean visible, CBrowser* browser) { // This shortcut toggles visibility by an action name GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); - g_return_if_fail(GTK_IS_ACTION(action)); gtk_action_set_visible(action, visible); } @@ -360,7 +358,7 @@ void update_gui_state(CBrowser* browser) action_set_sensitive("ZoomIn", FALSE, browser);//webkit_web_view_can_increase_text_size(WEBKIT_WEB_VIEW(webView), browser); action_set_sensitive("ZoomOut", FALSE, browser);//webkit_web_view_can_decrease_text_size(WEBKIT_WEB_VIEW(webView)), browser); action_set_sensitive("ZoomNormal", FALSE, browser);//webkit_web_view_get_text_size(WEBKIT_WEB_VIEW(webView)) != 1, browser); - action_set_sensitive("Back", webkit_web_view_can_go_backward(WEBKIT_WEB_VIEW(webView)), browser); + action_set_sensitive("Back", webkit_web_view_can_go_back(WEBKIT_WEB_VIEW(webView)), browser); action_set_sensitive("Forward", webkit_web_view_can_go_forward(WEBKIT_WEB_VIEW(webView)), browser); action_set_sensitive("Refresh", browser->loadedPercent == -1, browser); action_set_sensitive("Stop", browser->loadedPercent != -1, browser); diff --git a/src/prefs.c b/src/prefs.c index ce557c90..d77a90fc 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -20,8 +20,7 @@ static gboolean on_prefs_homepage_focus_out(GtkWidget* widget , GdkEventFocus event, CPrefs* prefs) { - g_free(config->homepage); - config->homepage = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + katze_assign(config->homepage, g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)))); return FALSE; } @@ -149,8 +148,7 @@ static void on_prefs_toolbarClosedTabs_toggled(GtkWidget* widget, CPrefs* prefs) static gboolean on_prefs_locationsearch_focus_out(GtkWidget* widget , GdkEventFocus event, CPrefs* prefs) { - g_free(config->locationSearch); - config->locationSearch = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + katze_assign(config->locationSearch, g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)))); return FALSE; } @@ -640,7 +638,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) , (GtkTreeCellDataFunc)on_prefs_protocols_render_icon, prefs, NULL); renderer_text = gtk_cell_renderer_text_new(); g_object_set(G_OBJECT(renderer_text), "editable", TRUE, NULL); - g_signal_connect(GTK_OBJECT(renderer_text), "edited" + g_signal_connect(renderer_text, "edited" , G_CALLBACK(on_prefs_protocols_edited), prefs); gtk_tree_view_column_pack_start(column, renderer_text, TRUE); gtk_tree_view_column_add_attribute(column, renderer_text, "text", PROTOCOLS_COL_COMMAND); diff --git a/src/search.c b/src/search.c index 2823add8..a40a10d3 100644 --- a/src/search.c +++ b/src/search.c @@ -12,6 +12,7 @@ #include "search.h" #include "sokoke.h" +#include "../katze/katze.h" #include #include @@ -86,13 +87,8 @@ gboolean search_engines_to_file(GList* searchEngines, const gchar* filename SearchEngine* search_engine_new() { - SearchEngine* engine = g_new(SearchEngine, 1); + SearchEngine* engine = g_new0(SearchEngine, 1); engine->shortName = g_strdup(""); - engine->description = NULL; - engine->url = NULL; - engine->inputEncoding = NULL; - engine->icon = NULL; - engine->keyword = NULL; return engine; } @@ -169,41 +165,35 @@ void search_engine_set_short_name(SearchEngine* engine, const gchar* shortName) { g_return_if_fail(engine); g_return_if_fail(shortName); - g_free(engine->shortName); - engine->shortName = g_strdup(shortName); + katze_assign(engine->shortName, g_strdup(shortName)); } void search_engine_set_description(SearchEngine* engine, const gchar* description) { g_return_if_fail(engine); - g_free(engine->description); - engine->description = g_strdup(description); + katze_assign(engine->description, g_strdup(description)); } void search_engine_set_url(SearchEngine* engine, const gchar* url) { g_return_if_fail(engine); - g_free(engine->url); - engine->url = g_strdup(url); + katze_assign(engine->url, g_strdup(url)); } void search_engine_set_input_encoding(SearchEngine* engine, const gchar* inputEncoding) { g_return_if_fail(engine); - g_free(engine->inputEncoding); - engine->inputEncoding = g_strdup(inputEncoding); + katze_assign(engine->inputEncoding, g_strdup(inputEncoding)); } void search_engine_set_icon(SearchEngine* engine, const gchar* icon) { g_return_if_fail(engine); - g_free(engine->icon); - engine->icon = g_strdup(icon); + katze_assign(engine->icon, g_strdup(icon)); } void search_engine_set_keyword(SearchEngine* engine, const gchar* keyword) { g_return_if_fail(engine); - g_free(engine->keyword); - engine->keyword = g_strdup(keyword); + katze_assign(engine->keyword, g_strdup(keyword)); } diff --git a/src/sokoke.c b/src/sokoke.c index 944dfa8e..ea0c6f49 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -381,7 +381,9 @@ void sokoke_entry_set_can_undo(GtkEntry* entry, gboolean canUndo) } else { - ; // TODO: disconnect signal - UNIMPLEMENTED + g_signal_handlers_disconnect_by_func(entry + , G_CALLBACK(sokoke_on_undo_entry_key_down), NULL); + g_signal_handlers_disconnect_by_func(entry + , G_CALLBACK(sokoke_on_undo_entry_populate_popup), NULL); } } diff --git a/src/webView.c b/src/webView.c index bef0a0b1..9c3bc29f 100644 --- a/src/webView.c +++ b/src/webView.c @@ -95,8 +95,7 @@ void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame { gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); gtk_label_set_text(GTK_LABEL(browser->webView_name), newUri); - g_free(browser->statusMessage); - browser->statusMessage = NULL; + katze_assign(browser->statusMessage, NULL); } } @@ -118,8 +117,7 @@ void on_webView_load_finished(GtkWidget* webView, WebKitWebFrame* widget void on_webView_status_message(GtkWidget* webView, const gchar* text, CBrowser* browser) { - g_free(browser->statusMessage); - browser->statusMessage = g_strdup(text); + katze_assign(browser->statusMessage, g_strdup(text)); update_statusbar(browser); } @@ -137,11 +135,9 @@ gboolean on_webView_console_message(GtkWidget* webView void on_webView_link_hover(GtkWidget* webView, const gchar* tooltip , const gchar* uri, CBrowser* browser) { - g_free(browser->statusMessage); - browser->statusMessage = g_strdup(uri); + katze_assign(browser->statusMessage, g_strdup(uri)); update_statusbar(browser); - g_free(browser->elementUri); - browser->elementUri = g_strdup(uri); + katze_assign(browser->elementUri, g_strdup(uri)); } /* @@ -215,7 +211,8 @@ gboolean on_webView_button_press(GtkWidget* webView, GdkEventButton* event switch(event->button) { case 1: - if(!browser->elementUri) return FALSE; + if(!browser->elementUri) + return FALSE; if(state & GDK_SHIFT_MASK) { // Open link in new window @@ -239,7 +236,8 @@ gboolean on_webView_button_press(GtkWidget* webView, GdkEventButton* event } else { - if(!browser->elementUri) return FALSE; + if(!browser->elementUri) + return FALSE; // Open link in new tab CBrowser* curBrowser = browser_new(browser); webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); @@ -279,8 +277,7 @@ gboolean on_webView_scroll(GtkWidget* webView, GdkEventScroll* event gboolean on_webView_leave(GtkWidget* webView, GdkEventCrossing* event, CBrowser* browser) { - g_free(browser->statusMessage); - browser->statusMessage = NULL; + katze_assign(browser->statusMessage, NULL); update_statusbar(browser); return TRUE; } @@ -323,7 +320,7 @@ GtkWidget* webView_new(GtkWidget** scrolled) void webView_open(GtkWidget* webView, const gchar* uri) { - webkit_web_view_open(WEBKIT_WEB_VIEW(webView), (gchar*)uri); + webkit_web_view_open(WEBKIT_WEB_VIEW(webView), uri); // We need to check the browser first // No browser means this is a panel CBrowser* browser = get_browser_from_webView(webView); From f614f5874a29a65623f587346d12f700f0e37296 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Jan 2008 18:10:53 +0100 Subject: [PATCH 0027/2970] Escape search engine name and description. --- src/webSearch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webSearch.c b/src/webSearch.c index a3618e25..8390571c 100644 --- a/src/webSearch.c +++ b/src/webSearch.c @@ -123,7 +123,7 @@ static void on_webSearch_engines_render_text(GtkTreeViewColumn* column gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &searchEngine, -1); const gchar* name = search_engine_get_short_name(searchEngine); const gchar* description = search_engine_get_description(searchEngine); - gchar* markup = g_strdup_printf("%s\n%s", name, description); + gchar* markup = g_markup_printf_escaped("%s\n%s", name, description); g_object_set(renderer, "markup", markup, NULL); g_free(markup); } From 22b277d94b588d2ee49e888688a567ab5cd01f50 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Jan 2008 23:05:12 +0100 Subject: [PATCH 0028/2970] Implement Add Bookmark and a small panel toolbar Initially new bookmarks can be added. The panel gains a small toolbar to Add, Edit and Delete items. Besides a serious bug in the XBEL implementation is fixed and a number of error checks is added.. --- katze/katze-xbel.c | 24 +++--- src/browser.c | 182 ++++++++++++++++++++++++++++++++------------- src/browser.h | 2 +- src/ui.h | 5 ++ 4 files changed, 149 insertions(+), 64 deletions(-) diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c index d6a2402d..d1ea4295 100644 --- a/katze/katze-xbel.c +++ b/katze/katze-xbel.c @@ -180,18 +180,18 @@ katze_xbel_folder_from_xmlNodePtr (xmlNodePtr cur) KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; priv->items = g_list_prepend (priv->items, item); } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) - { - KatzeXbelItem* item = katze_xbel_bookmark_from_xmlNodePtr (cur); - priv->parent = folder; - priv->items = g_list_prepend (priv->items, item); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) - { - KatzeXbelItem* item = katze_xbel_separator_new (); - priv->parent = folder; - priv->items = g_list_prepend (priv->items, item); - } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + { + KatzeXbelItem* item = katze_xbel_bookmark_from_xmlNodePtr (cur); + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; + priv->items = g_list_prepend (priv->items, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + { + KatzeXbelItem* item = katze_xbel_separator_new (); + KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; + priv->items = g_list_prepend (priv->items, item); + } cur = cur->next; } // Prepending and reversing is faster than appending diff --git a/src/browser.c b/src/browser.c index a61ac2fa..e121c3fc 100644 --- a/src/browser.c +++ b/src/browser.c @@ -539,6 +539,22 @@ static void browser_editBookmark_dialog_new(KatzeXbelItem* bookmark, CBrowser* b gtk_widget_show_all(hbox); } + GtkWidget* combo_folder = NULL; + if(newBookmark) + { + hbox = gtk_hbox_new(FALSE, 8); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic("_Folder:"); + gtk_size_group_add_widget(sizegroup, label); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + combo_folder = gtk_combo_box_new_text(); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_folder), "Root"); + gtk_widget_set_sensitive(combo_folder, FALSE); + gtk_box_pack_start(GTK_BOX(hbox), combo_folder, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + gtk_widget_show_all(hbox); + } + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { @@ -549,7 +565,18 @@ static void browser_editBookmark_dialog_new(KatzeXbelItem* bookmark, CBrowser* b // FIXME: We want to choose a folder if(newBookmark) + { katze_xbel_folder_append_item(bookmarks, bookmark); + GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); + GtkTreeModel* treemodel = gtk_tree_view_get_model(treeview); + GtkTreeIter iter; + gtk_tree_store_insert_with_values(GTK_TREE_STORE(treemodel) + , &iter, NULL, G_MAXINT, 0, bookmark, -1); + katze_xbel_item_ref(bookmark); + } + + // FIXME: update toolbar + // FIXME: Update panels in other windows } gtk_widget_destroy(dialog); } @@ -568,18 +595,40 @@ static void on_panel_bookmarks_row_activated(GtkTreeView* treeview } } +static void on_panel_bookmarks_cursor_or_row_changed(GtkTreeView* treeview + , CBrowser* browser) +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); + if(selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if(gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + + gboolean isSeparator = katze_xbel_item_is_separator(item); + action_set_sensitive("BookmarkEdit", !isSeparator, browser); + action_set_sensitive("BookmarkDelete", TRUE, browser); + } + else + { + action_set_sensitive("BookmarkEdit", FALSE, browser); + action_set_sensitive("BookmarkDelete", FALSE, browser); + } + } +} + static void panel_bookmarks_popup(GtkWidget* widget, GdkEventButton* event , KatzeXbelItem* item, CBrowser* browser) { gboolean isBookmark = katze_xbel_item_is_bookmark(item); - gboolean isSeparator = katze_xbel_item_is_separator(item); action_set_sensitive("BookmarkOpen", isBookmark, browser); action_set_sensitive("BookmarkOpenTab", isBookmark, browser); action_set_sensitive("BookmarkOpenWindow", isBookmark, browser); - action_set_sensitive("BookmarkEdit", !isSeparator, browser); - sokoke_widget_popup(widget, GTK_MENU(browser->popup_bookmark), event); } @@ -594,18 +643,20 @@ static gboolean on_panel_bookmarks_button_release(GtkWidget* widget { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(event->button == 2 && katze_xbel_item_is_bookmark(item)) + if(gtk_tree_selection_get_selected(selection, &model, &iter)) { - CBrowser* newBrowser = browser_new(browser); - const gchar* uri = katze_xbel_bookmark_get_href(item); - webView_open(newBrowser->webView, uri); + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(event->button == 2 && katze_xbel_item_is_bookmark(item)) + { + CBrowser* newBrowser = browser_new(browser); + const gchar* uri = katze_xbel_bookmark_get_href(item); + webView_open(newBrowser->webView, uri); + } + else + panel_bookmarks_popup(widget, event, item, browser); + return TRUE; } - else - panel_bookmarks_popup(widget, event, item, browser); - return TRUE; } return FALSE; } @@ -617,10 +668,12 @@ void on_panel_bookmarks_popup(GtkWidget* widget, CBrowser* browser) { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - panel_bookmarks_popup(widget, NULL, item, browser); + if(gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + panel_bookmarks_popup(widget, NULL, item, browser); + } } } @@ -632,11 +685,14 @@ void on_action_bookmarkOpen_activate(GtkAction* action, CBrowser* browser) { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) - webView_open(get_nth_webView(-1, browser), katze_xbel_bookmark_get_href(item)); + if(gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(katze_xbel_item_is_bookmark(item)) + webView_open(get_nth_webView(-1, browser) + , katze_xbel_bookmark_get_href(item)); + } } } @@ -648,14 +704,16 @@ void on_action_bookmarkOpenTab_activate(GtkAction* action, CBrowser* browser) { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) + if(gtk_tree_selection_get_selected(selection, &model, &iter)) { - CBrowser* newBrowser = browser_new(browser); - const gchar* uri = katze_xbel_bookmark_get_href(item); - webView_open(newBrowser->webView, uri); + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(katze_xbel_item_is_bookmark(item)) + { + CBrowser* newBrowser = browser_new(browser); + const gchar* uri = katze_xbel_bookmark_get_href(item); + webView_open(newBrowser->webView, uri); + } } } } @@ -668,14 +726,16 @@ void on_action_bookmarkOpenWindow_activate(GtkAction* action, CBrowser* browser) { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) + if(gtk_tree_selection_get_selected(selection, &model, &iter)) { - CBrowser* newBrowser = browser_new(NULL); - const gchar* uri = katze_xbel_bookmark_get_href(item); - webView_open(newBrowser->webView, uri); + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(katze_xbel_item_is_bookmark(item)) + { + CBrowser* newBrowser = browser_new(NULL); + const gchar* uri = katze_xbel_bookmark_get_href(item); + webView_open(newBrowser->webView, uri); + } } } } @@ -688,11 +748,13 @@ void on_action_bookmarkEdit_activate(GtkAction* action, CBrowser* browser) { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(!katze_xbel_item_is_separator(item)) - browser_editBookmark_dialog_new(item, browser); + if(gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if(!katze_xbel_item_is_separator(item)) + browser_editBookmark_dialog_new(item, browser); + } } } @@ -704,12 +766,14 @@ void on_action_bookmarkDelete_activate(GtkAction* action, CBrowser* browser) { GtkTreeModel* model; GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &model, &iter); - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - KatzeXbelItem* parent = katze_xbel_item_get_parent(item); - katze_xbel_folder_remove_item(parent, item); - katze_xbel_item_unref(item); + if(gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + KatzeXbelItem* parent = katze_xbel_item_get_parent(item); + katze_xbel_folder_remove_item(parent, item); + katze_xbel_item_unref(item); + } } } @@ -736,7 +800,9 @@ static void on_bookmarks_item_render_icon(GtkTreeViewColumn* column KatzeXbelItem* item; gtk_tree_model_get(model, iter, 0, &item, -1); - if(!katze_xbel_item_get_parent(item)) + if(G_UNLIKELY(!item)) + return; + if(G_UNLIKELY(!katze_xbel_item_get_parent(item))) { gtk_tree_store_remove(GTK_TREE_STORE(model), iter); katze_xbel_item_unref(item); @@ -763,7 +829,9 @@ static void on_bookmarks_item_render_text(GtkTreeViewColumn* column KatzeXbelItem* item; gtk_tree_model_get(model, iter, 0, &item, -1); - if(!katze_xbel_item_get_parent(item)) + if(G_UNLIKELY(!item)) + return; + if(G_UNLIKELY(!katze_xbel_item_get_parent(item))) { gtk_tree_store_remove(GTK_TREE_STORE(model), iter); katze_xbel_item_unref(item); @@ -1344,7 +1412,6 @@ CBrowser* browser_new(CBrowser* oldBrowser) gtk_toolbar_set_orientation(GTK_TOOLBAR(panelbar), GTK_ORIENTATION_VERTICAL); gtk_box_pack_start(GTK_BOX(browser->panels), panelbar, FALSE, FALSE, 0); action_set_active("Panels", config->panelShow, browser); - g_object_unref(ui_manager); GtkWidget* cbox = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(browser->panels), cbox, TRUE, TRUE, 0); @@ -1380,6 +1447,11 @@ CBrowser* browser_new(CBrowser* oldBrowser) page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) , gtk_label_new("empty"), NULL); // Bookmarks + GtkWidget* box = gtk_vbox_new(FALSE, 0); + GtkWidget* toolbar = gtk_ui_manager_get_widget(ui_manager, "/toolbar_bookmarks"); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); + gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); + gtk_widget_show(toolbar); GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; GtkTreeStore* treestore = gtk_tree_store_new(1, KATZE_TYPE_XBEL_ITEM); @@ -1404,13 +1476,20 @@ CBrowser* browser_new(CBrowser* oldBrowser) g_object_unref(treestore); g_signal_connect(treeview, "row-activated" , G_CALLBACK(on_panel_bookmarks_row_activated), browser); + g_signal_connect(treeview, "cursor-changed" + , G_CALLBACK(on_panel_bookmarks_cursor_or_row_changed), browser); + g_signal_connect(treeview, "columns-changed" + , G_CALLBACK(on_panel_bookmarks_cursor_or_row_changed), browser); + on_panel_bookmarks_cursor_or_row_changed(GTK_TREE_VIEW(treeview), browser); g_signal_connect(treeview, "button-release-event" , G_CALLBACK(on_panel_bookmarks_button_release), browser); g_signal_connect(treeview, "popup-menu" , G_CALLBACK(on_panel_bookmarks_popup), browser); browser->panel_bookmarks = treeview; + gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0); + gtk_widget_show(box); page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) - , scrolled, NULL); + , box, NULL); action = gtk_action_group_get_action(browser->actiongroup, "PanelBookmarks"); g_object_set_data(G_OBJECT(action), "iPage", GINT_TO_POINTER(page)); // Pageholder @@ -1429,6 +1508,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) g_object_set_data(G_OBJECT(action), "once-silent", GINT_TO_POINTER(1)); sokoke_radio_action_set_current_value(GTK_RADIO_ACTION(action), config->panelActive); sokoke_widget_set_visible(browser->panels, config->panelShow); + g_object_unref(ui_manager); // Notebook, containing all webViews browser->webViews = gtk_notebook_new(); diff --git a/src/browser.h b/src/browser.h index 6448c4e7..3f6bc218 100644 --- a/src/browser.h +++ b/src/browser.h @@ -451,7 +451,7 @@ static const GtkActionEntry entries[] = { { "Bookmarks", NULL, "_Bookmarks" }, { "BookmarkNew", STOCK_BOOKMARK_NEW , NULL, "d" - , "hm?", NULL/*G_CALLBACK(on_action_bookmark_new_activate)*/ }, + , "hm?", G_CALLBACK(on_action_bookmark_new_activate) }, { "BookmarksManage", STOCK_BOOKMARKS , "_Manage Bookmarks", "b" , "hm?", NULL/*G_CALLBACK(on_action_bookmarks_manage_activate)*/ }, diff --git a/src/ui.h b/src/ui.h index a5832109..d9d350f6 100644 --- a/src/ui.h +++ b/src/ui.h @@ -166,6 +166,11 @@ static const gchar* ui_markup = "" "" "" + "" + "" + "" + "" + "" "" "" "" From b2c0363cb4c254602ee5438d3b6582c01c061116 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Jan 2008 04:26:13 +0100 Subject: [PATCH 0029/2970] Implement a few preferences with new settings API in WebKit Allow changing a few preferences that WebKit now has API for and clear the way for more to come. --- src/browser.c | 12 ++---------- src/conf.c | 16 +++++++++------ src/conf.h | 9 ++++++--- src/global.h | 2 ++ src/main.c | 11 +++++++++++ src/prefs.c | 54 +++++++++++++++++++++++++-------------------------- 6 files changed, 57 insertions(+), 47 deletions(-) diff --git a/src/browser.c b/src/browser.c index e121c3fc..1f3eb838 100644 --- a/src/browser.c +++ b/src/browser.c @@ -1703,16 +1703,6 @@ CBrowser* browser_new(CBrowser* oldBrowser) DOC_CONNECT ("hovering-over-link" , on_webView_link_hover) DOC_CONNECT ("console-message" , on_webView_console_message) - // For now we check for "plugins-enabled", in case this build has no properties - if(g_object_class_find_property(G_OBJECT_GET_CLASS(browser->webView), "plugins-enabled")) - g_object_set(G_OBJECT(browser->webView) - , "loads-images-automatically" , config->loadImagesAutomatically - , "shrinks-standalone-images-to-fit", config->shrinkImagesToFit - , "text-areas-are-resizable" , config->resizableTextAreas - , "java-script-enabled" , config->enableJavaScript - , "plugins-enabled" , config->enablePlugins - , NULL); - DOC_CONNECT ("button-press-event" , on_webView_button_press) DOC_CONNECT ("popup-menu" , on_webView_popup); DOC_CONNECT ("scroll-event" , on_webView_scroll); @@ -1720,6 +1710,8 @@ CBrowser* browser_new(CBrowser* oldBrowser) DOC_CONNECT ("destroy" , on_webView_destroy) #undef DOC_CONNECT + webkit_web_view_set_settings(WEBKIT_WEB_VIEW(browser->webView), webSettings); + // Eventually pack and display everything sokoke_widget_set_visible(browser->navibar, config->toolbarNavigation); sokoke_widget_set_visible(browser->newTab, config->toolbarNewTab); diff --git a/src/conf.c b/src/conf.c index 8dccad03..53a14dfa 100644 --- a/src/conf.c +++ b/src/conf.c @@ -73,10 +73,12 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error #define GET_STR(var, key, default) \ var = sokoke_key_file_get_string_default( \ keyFile, "content", key, default, NULL) - GET_INT(config->loadImagesAutomatically, "LoadImagesAutomatically", TRUE); - GET_INT(config->shrinkImagesToFit, "ShrinkImagesTooFit", TRUE); + GET_INT(config->autoLoadImages, "AutoLoadImages", TRUE); + GET_INT(config->autoShrinkImages, "AutoShrinkImages", TRUE); + GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE); GET_INT(config->resizableTextAreas, "ResizableTextAreas", FALSE); - GET_INT(config->enableJavaScript, "EnableJavaScript", TRUE); + GET_STR(config->userStylesheetUri, "UserStylesheetUri", ""); + GET_INT(config->enableScripts, "EnableScripts", TRUE); GET_INT(config->enablePlugins, "EnablePlugins", TRUE); #undef GET_INT #undef GET_STR @@ -141,10 +143,12 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground); g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs); - g_key_file_set_integer(keyFile, "content", "LoadImagesAutomatically", config->loadImagesAutomatically); - g_key_file_set_integer(keyFile, "content", "ShrinkImagesToFit", config->shrinkImagesToFit); + g_key_file_set_integer(keyFile, "content", "AutoLoadImages", config->autoLoadImages); + g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages); + g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds); g_key_file_set_integer(keyFile, "content", "ResizableTextAreas", config->resizableTextAreas); - g_key_file_set_integer(keyFile, "content", "EnableJavaScript", config->enableJavaScript); + g_key_file_set_string (keyFile, "content", "UserStylesheetUri", config->userStylesheetUri); + g_key_file_set_integer(keyFile, "content", "EnableScripts", config->enableScripts); g_key_file_set_integer(keyFile, "content", "EnablePlugins", config->enablePlugins); g_key_file_set_integer(keyFile, "session", "RememberWinSize", config->rememberWinSize); diff --git a/src/conf.h b/src/conf.h index b43b0311..a36c6929 100644 --- a/src/conf.h +++ b/src/conf.h @@ -37,10 +37,13 @@ typedef struct _CConfig gboolean openTabsInTheBackground; gboolean openPopupsInTabs; - gboolean loadImagesAutomatically; - gboolean shrinkImagesToFit; + + gboolean autoLoadImages; + gboolean autoShrinkImages; + gboolean printBackgrounds; gboolean resizableTextAreas; - gboolean enableJavaScript; + gchar* userStylesheetUri; + gboolean enableScripts; gboolean enablePlugins; gboolean rememberWinSize; // Restore window size upon startup? diff --git a/src/global.h b/src/global.h index 19139f3e..52f283e6 100644 --- a/src/global.h +++ b/src/global.h @@ -16,12 +16,14 @@ #include "../katze/katze.h" #include +#include // -- globals CConfig* config; GList* searchEngines; // Items of type 'SearchEngine' GList* browsers; // Items of type 'CBrowser' +WebKitWebSettings* webSettings; GtkAccelGroup* accel_group; KatzeXbelItem* bookmarks; KatzeXbelItem* session; diff --git a/src/main.c b/src/main.c index fb79eb97..97951a30 100755 --- a/src/main.c +++ b/src/main.c @@ -244,6 +244,17 @@ int main(int argc, char** argv) stock_items_init(); browsers = NULL; + webSettings = webkit_web_settings_new(); + g_object_set(webSettings + , "auto-load-images" , config->autoLoadImages + , "auto-shrink-images" , config->autoShrinkImages + , "print-backgrounds" , config->printBackgrounds + , "resizable-text-areas", config->resizableTextAreas + , "user-stylesheet-uri" , config->userStylesheetUri + , "enable-scripts" , config->enableScripts + , "enable-plugins" , config->enablePlugins + , NULL); + session = katze_xbel_folder_new(); CBrowser* browser = NULL; guint n = katze_xbel_folder_get_n_items(_session); diff --git a/src/prefs.c b/src/prefs.c index d77a90fc..eaf1d37b 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -46,42 +46,38 @@ static void on_prefs_openPopupsInTabs_toggled(GtkWidget* widget, CPrefs* prefs) static void on_prefs_loadImagesAutomatically_toggled(GtkWidget* widget, CPrefs* prefs) { - config->loadImagesAutomatically = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - // FIXME: Apply the change to all open webViews - g_object_set(get_nth_webView(-1, prefs->browser) - , "loads-images-automatically", config->loadImagesAutomatically, NULL); + config->autoLoadImages = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + g_object_set(webSettings, "auto-load-images", config->autoLoadImages, NULL); } static void on_prefs_shrinkImagesToFit_toggled(GtkWidget* widget, CPrefs* prefs) { - config->shrinkImagesToFit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - // FIXME: Apply the change to all open webViews - g_object_set(get_nth_webView(-1, prefs->browser) - , "shrinks-standalone-images-to-fit", config->shrinkImagesToFit, NULL); + config->autoShrinkImages = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + g_object_set(webSettings, "auto-shrink-images", config->autoShrinkImages, NULL); +} + +static void on_prefs_printBackgrounds_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->printBackgrounds = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + g_object_set(webSettings, "print-backgrounds", config->printBackgrounds, NULL); } static void on_prefs_resizableTextAreas_toggled(GtkWidget* widget, CPrefs* prefs) { config->resizableTextAreas = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - // FIXME: Apply the change to all open webViews - g_object_set(get_nth_webView(-1, prefs->browser) - , "text-areas-are-resizable", config->resizableTextAreas, NULL); + g_object_set(webSettings, "resizable-text-areas", config->resizableTextAreas, NULL); } static void on_prefs_enableJavaScript_toggled(GtkWidget* widget, CPrefs* prefs) { - config->enableJavaScript = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - // FIXME: Apply the change to all open webViews - g_object_set(get_nth_webView(-1, prefs->browser) - , "java-script-enabled", config->enableJavaScript, NULL); + config->enableScripts = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + g_object_set(webSettings, "enable-scripts", config->enableScripts, NULL); } static void on_prefs_enablePlugins_toggled(GtkWidget* widget, CPrefs* prefs) { config->enablePlugins = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - // FIXME: Apply the change to all open webViews - g_object_set(get_nth_webView(-1, prefs->browser) - , "plugins-enabled", config->enablePlugins, NULL); + g_object_set(webSettings, "enable-plugins", config->enablePlugins, NULL); } static void on_prefs_toolbarstyle_changed(GtkWidget* widget, CPrefs* prefs) @@ -435,33 +431,35 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) FRAME_NEW("Features"); TABLE_NEW(3, 2); checkbutton = gtk_check_button_new_with_mnemonic("Load _images automatically"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->loadImagesAutomatically); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); SPANNED_ADD(checkbutton, 0, 1, 0, 1); checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->shrinkImagesToFit); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_shrinkImagesToFit_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("Print _backgrounds"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs); + SPANNED_ADD(checkbutton, 0, 1, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_resizableTextAreas_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Enable java_script"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableJavaScript); + SPANNED_ADD(checkbutton, 1, 2, 1, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Enable _scripts"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 1, 2); + SPANNED_ADD(checkbutton, 0, 1, 2, 3); checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_enablePlugins_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 2, 3); - // For now we check for "plugins-enabled", in case this build has no properties - if(!g_object_class_find_property(G_OBJECT_GET_CLASS(browser->webView), "plugins-enabled")) - gtk_widget_set_sensitive(frame, FALSE); + SPANNED_ADD(checkbutton, 1, 2, 2, 3); // Page "Interface" PAGE_NEW("Interface"); From 6477032a6d2d73aec2485220f108a9246d60513c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Jan 2008 05:27:54 +0100 Subject: [PATCH 0030/2970] Add a preference to choose a user stylesheet. --- src/conf.c | 2 ++ src/conf.h | 1 + src/main.c | 2 +- src/prefs.c | 33 ++++++++++++++++++++++++++++++--- src/prefs.h | 1 + 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/conf.c b/src/conf.c index 53a14dfa..9a1e9ae8 100644 --- a/src/conf.c +++ b/src/conf.c @@ -77,6 +77,7 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error GET_INT(config->autoShrinkImages, "AutoShrinkImages", TRUE); GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE); GET_INT(config->resizableTextAreas, "ResizableTextAreas", FALSE); + GET_INT(config->userStylesheet, "UserStylesheet", FALSE); GET_STR(config->userStylesheetUri, "UserStylesheetUri", ""); GET_INT(config->enableScripts, "EnableScripts", TRUE); GET_INT(config->enablePlugins, "EnablePlugins", TRUE); @@ -147,6 +148,7 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages); g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds); g_key_file_set_integer(keyFile, "content", "ResizableTextAreas", config->resizableTextAreas); + g_key_file_set_integer(keyFile, "content", "UserStylesheet", config->userStylesheet); g_key_file_set_string (keyFile, "content", "UserStylesheetUri", config->userStylesheetUri); g_key_file_set_integer(keyFile, "content", "EnableScripts", config->enableScripts); g_key_file_set_integer(keyFile, "content", "EnablePlugins", config->enablePlugins); diff --git a/src/conf.h b/src/conf.h index a36c6929..0cf12d6b 100644 --- a/src/conf.h +++ b/src/conf.h @@ -42,6 +42,7 @@ typedef struct _CConfig gboolean autoShrinkImages; gboolean printBackgrounds; gboolean resizableTextAreas; + gboolean userStylesheet; gchar* userStylesheetUri; gboolean enableScripts; gboolean enablePlugins; diff --git a/src/main.c b/src/main.c index 97951a30..6c100df0 100755 --- a/src/main.c +++ b/src/main.c @@ -250,7 +250,7 @@ int main(int argc, char** argv) , "auto-shrink-images" , config->autoShrinkImages , "print-backgrounds" , config->printBackgrounds , "resizable-text-areas", config->resizableTextAreas - , "user-stylesheet-uri" , config->userStylesheetUri + , "user-stylesheet-uri" , config->userStylesheet ? config->userStylesheetUri : NULL , "enable-scripts" , config->enableScripts , "enable-plugins" , config->enablePlugins , NULL); diff --git a/src/prefs.c b/src/prefs.c index eaf1d37b..f828ff9f 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -80,6 +80,20 @@ static void on_prefs_enablePlugins_toggled(GtkWidget* widget, CPrefs* prefs) g_object_set(webSettings, "enable-plugins", config->enablePlugins, NULL); } +static void on_prefs_userStylesheet_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->userStylesheet = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + gtk_widget_set_sensitive(prefs->userStylesheetUri, config->userStylesheet); + const gchar* uri = config->userStylesheet ? config->userStylesheetUri : ""; + g_object_set(webSettings, "user-stylesheet-uri", uri, NULL); +} + +static void on_prefs_userStylesheetUri_file_set(GtkWidget* widget, CPrefs* prefs) +{ + katze_assign(config->userStylesheetUri, g_strdup(gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(widget)))); + g_object_set(webSettings, "user-stylesheet-uri", config->userStylesheetUri, NULL); +} + static void on_prefs_toolbarstyle_changed(GtkWidget* widget, CPrefs* prefs) { config->toolbarStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); @@ -422,15 +436,15 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); SPANNED_ADD(checkbutton, 0, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Open _popups in tabs"); + checkbutton = gtk_check_button_new_with_mnemonic("Open popups in _tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_openPopupsInTabs_toggled), prefs); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 2, 3); FRAME_NEW("Features"); - TABLE_NEW(3, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Load _images automatically"); + TABLE_NEW(4, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Load _images"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); @@ -460,6 +474,19 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_enablePlugins_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 2, 3); + checkbutton = gtk_check_button_new_with_mnemonic("_User Stylesheet"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->userStylesheet); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_userStylesheet_toggled), prefs); + INDENTED_ADD(checkbutton, 0, 1, 3, 4); + filebutton = gtk_file_chooser_button_new( + "Choose user stylesheet", GTK_FILE_CHOOSER_ACTION_OPEN); + prefs->userStylesheetUri = filebutton; + gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(filebutton), config->userStylesheetUri); + g_signal_connect(filebutton, "file-set" + , G_CALLBACK(on_prefs_userStylesheetUri_file_set), prefs); + gtk_widget_set_sensitive(filebutton, config->userStylesheet); + FILLED_ADD(filebutton, 1, 2, 3, 4); // Page "Interface" PAGE_NEW("Interface"); diff --git a/src/prefs.h b/src/prefs.h index 7a452742..7576095e 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -22,6 +22,7 @@ typedef struct { CBrowser* browser; //GtkWidget* window; + GtkWidget* userStylesheetUri; GtkWidget* treeview; GtkWidget* combobox; GtkWidget* add; From cd1fe6bac71cfa31e493a879a99ef04f4f8b9d0f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 24 Jan 2008 03:48:29 +0100 Subject: [PATCH 0031/2970] Bump version to 0.0.17 --- ChangeLog | 16 ++++++++++++++++ configure.in | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index af3a70df..ee9e4942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +v0.0.17: + + Add a preference to choose a user stylesheet. + + Implement a few preferences with new settings API in WebKit + + Implement Add Bookmark and a small panel toolbar + + Escape search engine name and description. + + Cleanup and WebKit API update + + Make sure selection actions have a widget. + + Allow Find Next and Find Previous when the findbox is hidden. + + Fixed the header of the KatzeThrobber + + Move XBEL implementation to katze. + + Implement a throbber widget. + + Always enable Select All if an editable widget is focussed. + + Previous/ next tab menu items should be disabled when not needed. + + Handle the context menu on button press, not release. + + Open the default page only if there is no session and no uri on the cli. + v0.0.16: + Implement editing menu items for the web view. + Implement the bookmarks panel with editing capabilities. diff --git a/configure.in b/configure.in index 80742357..913f2b01 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.16], [christian@twotoasts.de]) +AC_INIT([midori], [0.0.17], [christian@twotoasts.de]) AC_CONFIG_SRCDIR([src/main.h]) AC_CONFIG_HEADER([config.h]) From 184b54e311633961f366e17f5390e1d870981a97 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Jan 2008 06:44:28 +0100 Subject: [PATCH 0032/2970] Add more preferences and Middle click goto Add default font name and size, minimum font size and encoding preferences. And implement Middle click goto with a preference. Also the preferences dialog is a bit cleaned up. --- src/browser.c | 8 ++- src/conf.c | 12 ++++- src/conf.h | 8 ++- src/main.c | 10 ++-- src/prefs.c | 143 ++++++++++++++++++++++++++++++++++++-------------- src/webView.c | 24 ++++++++- src/webView.h | 3 ++ 7 files changed, 159 insertions(+), 49 deletions(-) diff --git a/src/browser.c b/src/browser.c index 1f3eb838..03ea2fa3 100644 --- a/src/browser.c +++ b/src/browser.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -1691,7 +1691,9 @@ CBrowser* browser_new(CBrowser* oldBrowser) // Connect signals #define DOC_CONNECT(__sig, __func) g_signal_connect \ - (G_OBJECT(browser->webView), __sig, G_CALLBACK(__func), browser); + (browser->webView, __sig, G_CALLBACK(__func), browser); + #define DOC_CONNECTA(__sig, __func) g_signal_connect_after \ + (browser->webView, __sig, G_CALLBACK(__func), browser); DOC_CONNECT ("navigation-requested" , on_webView_navigation_requested) DOC_CONNECT ("title-changed" , on_webView_title_changed) DOC_CONNECT ("icon-loaded" , on_webView_icon_changed) @@ -1704,11 +1706,13 @@ CBrowser* browser_new(CBrowser* oldBrowser) DOC_CONNECT ("console-message" , on_webView_console_message) DOC_CONNECT ("button-press-event" , on_webView_button_press) + DOC_CONNECTA ("button-press-event" , on_webView_button_press_after) DOC_CONNECT ("popup-menu" , on_webView_popup); DOC_CONNECT ("scroll-event" , on_webView_scroll); DOC_CONNECT ("leave-notify-event" , on_webView_leave) DOC_CONNECT ("destroy" , on_webView_destroy) #undef DOC_CONNECT + #undef DOC_CONNECTA webkit_web_view_set_settings(WEBKIT_WEB_VIEW(browser->webView), webSettings); diff --git a/src/conf.c b/src/conf.c index 9a1e9ae8..454d70ca 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -64,6 +64,7 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error GET_INT(config->newPages, "NewPages", CONFIG_NEWPAGES_TAB_NEW); GET_INT(config->openTabsInTheBackground, "OpenTabsInTheBackground", FALSE); GET_INT(config->openPopupsInTabs, "OpenPopupsInTabs", FALSE); + GET_INT(config->middleClickGoto, "MiddleClickGoto", FALSE); #undef GET_INT #undef GET_STR @@ -73,6 +74,10 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error #define GET_STR(var, key, default) \ var = sokoke_key_file_get_string_default( \ keyFile, "content", key, default, NULL) + GET_STR(config->defaultFontFamily, "DefaultFontFamily", "Sans"); + GET_INT(config->defaultFontSize, "DefaultFontSize", 10); + GET_INT(config->minimumFontSize, "MinimumFontSize", 5); + GET_STR(config->defaultEncoding, "DefaultEncoding", "UTF-8"); GET_INT(config->autoLoadImages, "AutoLoadImages", TRUE); GET_INT(config->autoShrinkImages, "AutoShrinkImages", TRUE); GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE); @@ -143,7 +148,12 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) g_key_file_set_integer(keyFile, "browser", "NewPages", config->newPages); g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground); g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs); + g_key_file_set_integer(keyFile, "browser", "MiddleClickGoto", config->middleClickGoto); + g_key_file_set_string (keyFile, "content", "DefaultFontFamily", config->defaultFontFamily); + g_key_file_set_integer(keyFile, "content", "DefaultFontSize", config->defaultFontSize); + g_key_file_set_integer(keyFile, "content", "MinimumFontSize", config->minimumFontSize); + g_key_file_set_string (keyFile, "content", "DefaultEncoding", config->defaultEncoding); g_key_file_set_integer(keyFile, "content", "AutoLoadImages", config->autoLoadImages); g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages); g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds); diff --git a/src/conf.h b/src/conf.h index 0cf12d6b..17a6b905 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -36,8 +36,12 @@ typedef struct _CConfig guint newPages; // where to open new pages gboolean openTabsInTheBackground; gboolean openPopupsInTabs; + gboolean middleClickGoto; - + gchar* defaultFontFamily; + guint defaultFontSize; + guint minimumFontSize; + gchar* defaultEncoding; gboolean autoLoadImages; gboolean autoShrinkImages; gboolean printBackgrounds; diff --git a/src/main.c b/src/main.c index 6c100df0..c177e1cd 100755 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,7 @@ #include #include +#include #include "config.h" @@ -244,8 +245,11 @@ int main(int argc, char** argv) stock_items_init(); browsers = NULL; - webSettings = webkit_web_settings_new(); - g_object_set(webSettings + webSettings = g_object_new(WEBKIT_TYPE_WEB_SETTINGS + , "default-font-family" , config->defaultFontFamily + , "default-font-size" , config->defaultFontSize + , "minimum-font-size" , config->minimumFontSize + , "default-encoding" , config->defaultEncoding , "auto-load-images" , config->autoLoadImages , "auto-shrink-images" , config->autoShrinkImages , "print-backgrounds" , config->printBackgrounds diff --git a/src/prefs.c b/src/prefs.c index f828ff9f..8e50845e 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,7 +15,8 @@ #include "global.h" #include "sokoke.h" -#include "string.h" +#include +#include static gboolean on_prefs_homepage_focus_out(GtkWidget* widget , GdkEventFocus event, CPrefs* prefs) @@ -29,11 +30,65 @@ static void on_prefs_loadonstartup_changed(GtkWidget* widget, CPrefs* prefs) config->startup = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); } +static void on_prefs_defaultFont_changed(GtkWidget* widget, CPrefs* prefs) +{ + const gchar* font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget)); + gchar** components = g_strsplit(font, " ", 0); + guint i, n = g_strv_length(components) - 1; + GString* fontName = g_string_new(NULL); + for(i = 0; i < n; i++) + g_string_append_printf(fontName, "%s ", components[i]); + katze_assign(config->defaultFontFamily, g_string_free(fontName, FALSE)); + config->defaultFontSize = atoi(components[n]); + g_strfreev(components); + g_object_set(webSettings, "default-font-family", config->defaultFontFamily + , "default-font-size", config->defaultFontSize, NULL); +} + +static void on_prefs_minimumFontSize_changed(GtkWidget* widget, CPrefs* prefs) +{ + config->minimumFontSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); + g_object_set(webSettings, "minimum-font-size", config->minimumFontSize, NULL); +} + +static void on_prefs_defaultEncoding_changed(GtkWidget* widget, CPrefs* prefs) +{ + gchar* encoding; + switch(gtk_combo_box_get_active(GTK_COMBO_BOX(widget))) + { + case 0: + encoding = g_strdup("BIG5"); + break; + case 1: + encoding = g_strdup("SHIFT_JIS"); + break; + case 2: + encoding = g_strdup("KOI8-R"); + break; + case 3: + encoding = g_strdup("UTF-8"); + break; + case 4: + encoding = g_strdup("ISO-8859-1"); + break; + default: + encoding = g_strdup("UTF-8"); + g_warning("Invalid default encoding"); + } + katze_assign(config->defaultEncoding, encoding); + g_object_set(webSettings, "default-encoding", config->defaultEncoding, NULL); +} + static void on_prefs_newpages_changed(GtkWidget* widget, CPrefs* prefs) { config->newPages = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); } +void on_prefs_middleClickGoto_toggled(GtkWidget* widget, CPrefs* prefs) +{ + config->middleClickGoto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); +} + void on_prefs_openTabsInTheBackground_toggled(GtkWidget* widget, CPrefs* prefs) { config->openTabsInTheBackground = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -302,7 +357,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) #define WIDGET_ADD(__widget, __left, __right, __top, __bottom)\ gtk_table_attach(GTK_TABLE(table), __widget\ , __left, __right, __top, __bottom\ - , 0, GTK_FILL, 8, 2) + , GTK_FILL, GTK_FILL, 8, 2) #define FILLED_ADD(__widget, __left, __right, __top, __bottom)\ gtk_table_attach(GTK_TABLE(table), __widget\ , __left, __right, __top, __bottom\ @@ -371,30 +426,42 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) PAGE_NEW("Appearance"); FRAME_NEW("Font settings"); TABLE_NEW(5, 2); - INDENTED_ADD(gtk_label_new("Standard font"), 0, 1, 0, 1); - button = gtk_font_button_new_with_font("Sans 10"/*config->sFontStandard*/); - gtk_widget_set_sensitive(button, FALSE); //... + INDENTED_ADD(gtk_label_new_with_mnemonic("Default _font"), 0, 1, 0, 1); + gchar* defaultFont = g_strdup_printf("%s %d" + , config->defaultFontFamily, config->defaultFontSize); + button = gtk_font_button_new_with_font(defaultFont); + g_free(defaultFont); + g_signal_connect(button, "font-set", G_CALLBACK(on_prefs_defaultFont_changed), prefs); FILLED_ADD(button, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new("Minimum font size"), 0, 1, 1, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic("_Minimum font size"), 0, 1, 1, 2); hbox = gtk_hbox_new(FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(5, 12, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 5/*config->iFontSizeMin*/); - gtk_widget_set_sensitive(spinbutton, FALSE); //... + spinbutton = gtk_spin_button_new_with_range(1, 5, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize); + g_signal_connect(spinbutton, "value-changed" + , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs); gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); button = gtk_button_new_with_mnemonic("_Advanced"); gtk_widget_set_sensitive(button, FALSE); //... gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); FILLED_ADD(hbox, 1, 2, 1, 2); - INDENTED_ADD(gtk_label_new("Default encoding"), 0, 1, 2, 3); + INDENTED_ADD(gtk_label_new_with_mnemonic("Default _encoding"), 0, 1, 2, 3); combobox = gtk_combo_box_new_text(); - const gchar* encoding = NULL; g_get_charset(&encoding); - // TODO: Fallback to utf-8 if the encoding is not sane (e.g. when lang=C) - gchar* sEncodingDefault = g_strdup_printf("System (%s)", encoding); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , sEncodingDefault, "Chinese", "Greek", "Japanese (SHIFT_JIS)" - , "Korean", "Russian", "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... - gtk_widget_set_sensitive(combobox, FALSE); //... + , "Chinese (BIG5)", "Japanese (SHIFT_JIS)", "Russian (KOI8-R)" + , "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); + if(!strcmp(config->defaultEncoding, "BIG5")) + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); + else if(!strcmp(config->defaultEncoding, "SHIFT_JIS")) + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); + else if(!strcmp(config->defaultEncoding, "KOI8-R")) + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 2); + else if(!strcmp(config->defaultEncoding, "UTF-8")) + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 3); + else if(!strcmp(config->defaultEncoding, "ISO-8859-1")) + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 4); + // FIXME: Provide a 'Custom' item + g_signal_connect(combobox, "changed" + , G_CALLBACK(on_prefs_defaultEncoding_changed), prefs); FILLED_ADD(combobox, 1, 2, 2, 3); button = gtk_button_new_with_label("Advanced settings"); gtk_widget_set_sensitive(button, FALSE); //... @@ -427,15 +494,19 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) , "New tab", "New window", "Current tab", NULL); gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages); - g_signal_connect(combobox, "changed" - , G_CALLBACK(on_prefs_newpages_changed), prefs); + g_signal_connect(combobox, "changed", G_CALLBACK(on_prefs_newpages_changed), prefs); gtk_widget_set_sensitive(combobox, FALSE); //... FILLED_ADD(combobox, 1, 2, 0, 1); + checkbutton = gtk_check_button_new_with_mnemonic("_Middle click goto"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->middleClickGoto); + g_signal_connect(checkbutton, "toggled" + , G_CALLBACK(on_prefs_middleClickGoto_toggled), prefs); + INDENTED_ADD(checkbutton, 0, 1, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic("Open tabs in the _background"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 2, 1, 2); + SPANNED_ADD(checkbutton, 1, 2, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic("Open popups in _tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); g_signal_connect(checkbutton, "toggled" @@ -448,7 +519,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 0, 1); + INDENTED_ADD(checkbutton, 0, 1, 0, 1); checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages); g_signal_connect(checkbutton, "toggled" @@ -458,7 +529,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 1, 2); + INDENTED_ADD(checkbutton, 0, 1, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); g_signal_connect(checkbutton, "toggled" @@ -468,7 +539,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 2, 3); + INDENTED_ADD(checkbutton, 0, 1, 2, 3); checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); g_signal_connect(checkbutton, "toggled" @@ -504,7 +575,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 1, 2); + INDENTED_ADD(checkbutton, 0, 1, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic("Show web_search"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch); g_signal_connect(checkbutton, "toggled" @@ -514,42 +585,34 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 2, 3); + INDENTED_ADD(checkbutton, 0, 1, 2, 3); checkbutton = gtk_check_button_new_with_mnemonic("Show _closed tabs button"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 2, 3); FRAME_NEW("Miscellaneous"); - TABLE_NEW(3, 2); - checkbutton = gtk_check_button_new_with_mnemonic - ("Show close _buttons on tabs"); + TABLE_NEW(2, 2); + checkbutton = gtk_check_button_new_with_mnemonic("Close _buttons on tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_tabClose_toggled), prefs); - SPANNED_ADD(checkbutton, 0, 1, 0, 1); + INDENTED_ADD(checkbutton, 0, 1, 0, 1); hbox = gtk_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(hbox) - , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 0); + , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 4); spinbutton = gtk_spin_button_new_with_range(0, 36, 1); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize); g_signal_connect(spinbutton, "changed" , G_CALLBACK(on_prefs_tabSize_changed), prefs); gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); FILLED_ADD(hbox, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new_with_mnemonic("Tabbar _placement"), 0, 1, 1, 2); - combobox = gtk_combo_box_new_text(); - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "Left", "Top", "Right", "Bottom", NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); //... - gtk_widget_set_sensitive(combobox, FALSE); //... - FILLED_ADD(combobox, 1, 2, 1, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 2, 3); + INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 1, 2); entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch); g_signal_connect(entry, "focus-out-event" , G_CALLBACK(on_prefs_locationsearch_focus_out), prefs); - FILLED_ADD(entry, 1, 2, 2, 3); + FILLED_ADD(entry, 1, 2, 1, 2); // Page "Network" PAGE_NEW("Network"); diff --git a/src/webView.c b/src/webView.c index 9c3bc29f..54870fce 100644 --- a/src/webView.c +++ b/src/webView.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -251,6 +251,28 @@ gboolean on_webView_button_press(GtkWidget* webView, GdkEventButton* event return FALSE; } +gboolean on_webView_button_press_after(GtkWidget* webView, GdkEventButton* event + , CBrowser* browser) +{ + if(event->button == 2 && config->middleClickGoto) + { + GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); + gchar* text = gtk_clipboard_wait_for_text(clipboard); + gchar* uri = NULL; + if(text && g_regex_match_simple("^[^ ]*$", text + , G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) + uri = magic_uri(text, FALSE); + g_free(text); + if(uri) + { + webkit_web_view_open(WEBKIT_WEB_VIEW(browser->webView), uri); + g_free(uri); + return TRUE; + } + } + return FALSE; +} + void on_webView_popup(GtkWidget* webView, CBrowser* browser) { webView_popup(webView, NULL, browser); diff --git a/src/webView.h b/src/webView.h index 325aa4a0..262a5e42 100644 --- a/src/webView.h +++ b/src/webView.h @@ -60,6 +60,9 @@ on_webView_window_open(GtkWidget*, const gchar*, CBrowser*); gboolean on_webView_button_press(GtkWidget*, GdkEventButton*, CBrowser*); +gboolean +on_webView_button_press_after(GtkWidget*, GdkEventButton*, CBrowser*); + void on_webView_popup(GtkWidget*, CBrowser*); From 1522f47002cbaae46ab10a400b6da422372f4200 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Jan 2008 08:44:31 +0100 Subject: [PATCH 0033/2970] Implement Fullscreen mode A new menuitem toggles Fullscreen mode, which means that the menubar is hidden, the window is maximized and window manager decoration is removed. A new button appears in the navibar which reverts this process. Fullscreen relies entirely on the window manager, which has the advantage that window manager keybindings have the same effect as activating the Fullscreen menuitem. At the same time this means that Fullscreen won't work at all without it. --- src/browser.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- src/browser.h | 7 +++++++ src/global.h | 4 ++++ src/main.c | 4 ++++ src/ui.h | 3 +-- 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/src/browser.c b/src/browser.c index 03ea2fa3..88044e39 100644 --- a/src/browser.c +++ b/src/browser.c @@ -290,6 +290,15 @@ void on_action_source_view_activate(GtkAction* action, CBrowser* browser) g_free(source);*/ } +void on_action_fullscreen_activate(GtkAction* action, CBrowser* browser) +{ + GdkWindowState state = gdk_window_get_state(browser->window->window); + if(state & GDK_WINDOW_STATE_FULLSCREEN) + gtk_window_unfullscreen(GTK_WINDOW(browser->window)); + else + gtk_window_fullscreen(GTK_WINDOW(browser->window)); +} + void on_action_back_activate(GtkAction* action, CBrowser* browser) { webkit_web_view_go_back(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); @@ -1125,13 +1134,35 @@ void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page update_search_engines(browser); } +static void on_window_state_changed(GtkWidget* widget + , GdkEventWindowState* event, CBrowser* browser) +{ + if(event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) + { + if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) + { + gtk_widget_hide(browser->menubar); + g_object_set(browser->fullscreen, "stock-id" + , GTK_STOCK_LEAVE_FULLSCREEN, NULL); + gtk_widget_show(browser->fullscreen); + } + else + { + gtk_widget_show(browser->menubar); + gtk_widget_hide(browser->fullscreen); + g_object_set(browser->fullscreen, "stock-id" + , GTK_STOCK_FULLSCREEN, NULL); + } + } +} + static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation , CBrowser* browser) { if(GTK_WIDGET_REALIZED(widget)) { - if(!(gdk_window_get_state(widget->window) - & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + GdkWindowState state = gdk_window_get_state(widget->window); + if(!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) { config->winWidth = allocation->width; config->winHeight = allocation->height; @@ -1180,6 +1211,8 @@ CBrowser* browser_new(CBrowser* oldBrowser) // Setup the window metrics browser->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + g_signal_connect(browser->window, "window-state-event" + , G_CALLBACK(on_window_state_changed), browser); GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window)); const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7; const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7; @@ -1351,6 +1384,13 @@ CBrowser* browser_new(CBrowser* oldBrowser) gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) , GTK_TOOL_ITEM(browser->closedTabs), -1); sokoke_container_show_children(GTK_CONTAINER(browser->navibar)); + action = gtk_action_group_get_action(browser->actiongroup, "Fullscreen"); + browser->fullscreen = gtk_action_create_tool_item(action); + gtk_widget_hide(browser->fullscreen); + g_signal_connect(browser->fullscreen, "clicked" + , G_CALLBACK(on_action_fullscreen_activate), browser); + gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) + , GTK_TOOL_ITEM(browser->fullscreen), -1); action_set_active("ToolbarNavigation", config->toolbarNavigation, browser); // Bookmarkbar @@ -1605,6 +1645,7 @@ CBrowser* browser_new(CBrowser* oldBrowser) browser->location = oldBrowser->location; browser->webSearch = oldBrowser->webSearch; browser->closedTabs = oldBrowser->closedTabs; + browser->fullscreen = oldBrowser->fullscreen; browser->bookmarkbar = oldBrowser->bookmarkbar; browser->panels = oldBrowser->panels; browser->panels_notebook = oldBrowser->panels_notebook; diff --git a/src/browser.h b/src/browser.h index 3f6bc218..a3c4f3df 100644 --- a/src/browser.h +++ b/src/browser.h @@ -39,6 +39,7 @@ typedef struct _CBrowser GtkWidget* location; GtkWidget* webSearch; GtkWidget* closedTabs; + GtkWidget* fullscreen; GtkWidget* bookmarkbar; // panels GtkWidget* panels; @@ -160,6 +161,9 @@ on_action_zoom_normal_activate(GtkAction*, CBrowser*); void on_action_source_view_activate(GtkAction*, CBrowser*); +void +on_action_fullscreen_activate(GtkAction*, CBrowser*); + void on_action_back_activate(GtkAction*, CBrowser*); @@ -364,6 +368,9 @@ static const GtkActionEntry entries[] = { { "Properties", GTK_STOCK_PROPERTIES , NULL, "" , "hm?", NULL/*G_CALLBACK(on_action_properties_activate)*/ }, + { "Fullscreen", GTK_STOCK_FULLSCREEN + , NULL, "F11" + , "Toggle fullscreen view", G_CALLBACK(on_action_fullscreen_activate) }, { "Go", NULL, "_Go" }, { "Back", GTK_STOCK_GO_BACK diff --git a/src/global.h b/src/global.h index 52f283e6..de9ea3ef 100644 --- a/src/global.h +++ b/src/global.h @@ -81,5 +81,9 @@ KatzeXbelItem* tabtrash; #if !GTK_CHECK_VERSION(2, 10, 0) #define GTK_STOCK_SELECT_ALL "gtk-select-all" #endif +#if !GTK_CHECK_VERSION(2, 8, 0) +#define GTK_STOCK_FULLSCREEN "gtk-fullscreen" +#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" +#endif #endif /* !__GLOBAL_H__ */ diff --git a/src/main.c b/src/main.c index c177e1cd..7fe43c20 100755 --- a/src/main.c +++ b/src/main.c @@ -59,6 +59,10 @@ static void stock_items_init(void) #if !GTK_CHECK_VERSION(2, 10, 0) { GTK_STOCK_SELECT_ALL, "Select _All", 0, 0, (gchar*)"gtk20" }, #endif + #if !GTK_CHECK_VERSION(2, 8, 0) + { GTK_STOCK_FULLSCREEN, "_Fullscreen", 0, 0, (gchar*)"gtk20" }, + { GTK_STOCK_FULLSCREEN, "_Leave Fullscreen", 0, 0, (gchar*)"gtk20" }, + #endif }; GtkIconFactory* factory = gtk_icon_factory_new(); guint i; diff --git a/src/ui.h b/src/ui.h index d9d350f6..787fdd41 100644 --- a/src/ui.h +++ b/src/ui.h @@ -91,9 +91,8 @@ static const gchar* ui_markup = "" "" "" - "" "" - "" + "" "" "" "" From 65535e1d875d8e7c51f4ec1bec1aa5593c8e2cc5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Jan 2008 15:18:32 +0100 Subject: [PATCH 0034/2970] Build fix: Don't use regular expressions --- src/helpers.c | 2 +- src/webView.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/helpers.c b/src/helpers.c index 8a114586..2b824757 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -417,7 +417,7 @@ gchar* magic_uri(const gchar* uri, gboolean search) if(!strstr(uri, "://")) { // Do we have a domain, ip address or localhost? - if(strstr(uri, ".") != NULL || !strcmp(uri, "localhost")) + if(strchr(uri, '.') != NULL || !strcmp(uri, "localhost")) return g_strconcat("http://", uri, NULL); // We don't want to search? So return early. if(!search) diff --git a/src/webView.c b/src/webView.c index 54870fce..be91e220 100644 --- a/src/webView.c +++ b/src/webView.c @@ -259,8 +259,7 @@ gboolean on_webView_button_press_after(GtkWidget* webView, GdkEventButton* event GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); gchar* text = gtk_clipboard_wait_for_text(clipboard); gchar* uri = NULL; - if(text && g_regex_match_simple("^[^ ]*$", text - , G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) + if(text && strchr(text, '.') && !strchr(text, ' ')) uri = magic_uri(text, FALSE); g_free(text); if(uri) From 25ac3e993227af16cfc868d2de60b824e195dc78 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 Feb 2008 10:51:35 +0100 Subject: [PATCH 0035/2970] Build fix: Webkit's header and pkgconfig name have changed. --- configure.in | 10 +++++----- src/global.h | 2 +- src/helpers.c | 2 +- src/main.c | 2 +- src/webSearch.h | 2 +- src/webView.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index 913f2b01..dc257970 100644 --- a/configure.in +++ b/configure.in @@ -52,15 +52,15 @@ AC_SUBST(GTK_LIBS) GTK_VER=`pkg-config --modversion gtk+-2.0` AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) -# Checks for WebKitGtk -PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false) +# Checks for WebKit +PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) if test "x${have_webkit}" = "xfalse" ; then - AC_MSG_ERROR([No WebKitGtk package information found]) + AC_MSG_ERROR([No WebKit package information found]) fi AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_LIBS) -WEBKIT_VER=`pkg-config --modversion WebKitGtk` -AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version]) +WEBKIT_VER=`pkg-config --modversion webkit-1.0` +AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version]) # Checks for libsexy PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) diff --git a/src/global.h b/src/global.h index de9ea3ef..868ebd68 100644 --- a/src/global.h +++ b/src/global.h @@ -16,7 +16,7 @@ #include "../katze/katze.h" #include -#include +#include // -- globals diff --git a/src/helpers.c b/src/helpers.c index 2b824757..04b66837 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -16,7 +16,7 @@ #include "../katze/katze.h" #include -#include +#include GtkIconTheme* get_icon_theme(GtkWidget* widget) { diff --git a/src/main.c b/src/main.c index 7fe43c20..55e23485 100755 --- a/src/main.c +++ b/src/main.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "config.h" diff --git a/src/webSearch.h b/src/webSearch.h index 09f31222..3cefc395 100644 --- a/src/webSearch.h +++ b/src/webSearch.h @@ -16,7 +16,7 @@ #include #include -#include +#include // -- Types diff --git a/src/webView.h b/src/webView.h index 262a5e42..552b571b 100644 --- a/src/webView.h +++ b/src/webView.h @@ -16,7 +16,7 @@ #include "browser.h" #include "debug.h" -#include +#include WebKitNavigationResponse on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame From fbcd3a968015c3ec4c66ec44eaa3216355f7470d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 4 Feb 2008 22:08:38 +0100 Subject: [PATCH 0036/2970] Append a semicolon to the mime types in the desktop file. According to the spec the list of mime types in a desktop file 'should' end with a trailing semicolon. --- midori.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori.desktop b/midori.desktop index ba6faf62..e8e64488 100644 --- a/midori.desktop +++ b/midori.desktop @@ -7,7 +7,7 @@ Name=Midori Web Browser GenericName=Web Browser Comment=Lightweight web browser Categories=GTK;Network; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml +MimeType=text/html;text/xml;application/xhtml+xml;application/xml; Exec=midori %u Icon=web-browser Terminal=false From 622f8ee4452cc22a2eb68051bb261cf341d6e266 Mon Sep 17 00:00:00 2001 From: "Nicholas E. Manley" Date: Mon, 11 Feb 2008 07:37:29 +0100 Subject: [PATCH 0037/2970] Don't restrict the minimum font size. --- src/prefs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prefs.c b/src/prefs.c index 8e50845e..d5bcc6d7 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -435,7 +435,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) FILLED_ADD(button, 1, 2, 0, 1); INDENTED_ADD(gtk_label_new_with_mnemonic("_Minimum font size"), 0, 1, 1, 2); hbox = gtk_hbox_new(FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(1, 5, 1); + spinbutton = gtk_spin_button_new_with_range(1, G_MAXINT, 1); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize); g_signal_connect(spinbutton, "value-changed" , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs); From e1f62329f1d3ec037b398cf6148695063936f2ea Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Mar 2008 22:26:09 +0100 Subject: [PATCH 0038/2970] Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet. --- HACKING | 20 +- katze/katze-throbber.c | 6 +- katze/katze-throbber.h | 3 +- src/Makefile.am | 7 +- src/browser.c | 1775 ---------------------- src/browser.h | 600 -------- src/global.h | 18 +- src/helpers.c | 287 +--- src/helpers.h | 61 +- src/main.c | 153 +- src/midori-browser.c | 2986 ++++++++++++++++++++++++++++++++++++++ src/midori-browser.h | 90 ++ src/midori-panel.c | 515 +++++++ src/midori-panel.h | 90 ++ src/midori-trash.c | 327 +++++ src/midori-trash.h | 85 ++ src/midori-websettings.c | 200 +++ src/midori-websettings.h | 89 ++ src/midori-webview.c | 1039 +++++++++++++ src/midori-webview.h | 118 ++ src/prefs.c | 53 +- src/prefs.h | 7 +- src/search.c | 2 +- src/sokoke.c | 95 -- src/sokoke.h | 21 - src/ui.h | 242 --- src/webSearch.c | 43 +- src/webSearch.h | 18 +- src/webView.c | 376 ----- src/webView.h | 87 -- 30 files changed, 5740 insertions(+), 3673 deletions(-) delete mode 100644 src/browser.c delete mode 100644 src/browser.h mode change 100755 => 100644 src/main.c create mode 100644 src/midori-browser.c create mode 100644 src/midori-browser.h create mode 100644 src/midori-panel.c create mode 100644 src/midori-panel.h create mode 100644 src/midori-trash.c create mode 100644 src/midori-trash.h create mode 100644 src/midori-websettings.c create mode 100644 src/midori-websettings.h create mode 100644 src/midori-webview.c create mode 100644 src/midori-webview.h delete mode 100644 src/webView.c delete mode 100644 src/webView.h diff --git a/HACKING b/HACKING index 22c846aa..ae54476f 100644 --- a/HACKING +++ b/HACKING @@ -21,16 +21,16 @@ Source file example: return; #ifdef BAR_STRICT - if(bar == FOO_N) + if (bar == FOO_N) { - g_print("illegal value for 'bar'.\n"); + g_print ("illegal value for 'bar'.\n"); return; } #endif // this is an example gint n; - switch(bar) + switch (bar) { case FOO_FOO: n = bar + 1; @@ -43,9 +43,9 @@ Source file example: } guint i; - for(i = 0; i < n; i++) + for (i = 0; i < n; i++) { - g_print("%s\n", foo); + g_print ("%s\n", foo); } } @@ -74,12 +74,18 @@ Header file example: typedef struct { - FooEnum fooBar; + FooEnum foo_bar; } FooStruct; // -- Declarations void - foobar(FooEnum, const gchar*); + foo_bar (FooEnum bar, + const gchar* foo); + + const gchar* + foo_foo (FooStruct foo_struct, + guint number, + gboolean flag); #endif /* !__FOO_H__ */ diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index fcaae5e6..0565f345 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -222,11 +222,9 @@ katze_throbber_destroy (GtkObject *object) KatzeThrobberPrivate* priv = throbber->priv; katze_assign (priv->icon_name, NULL); - if (priv->pixbuf) - katze_object_assign (priv->pixbuf, NULL); + katze_object_assign (priv->pixbuf, NULL); katze_assign (priv->static_icon_name, NULL); - if (priv->static_pixbuf) - katze_object_assign (priv->static_pixbuf, NULL); + katze_object_assign (priv->static_pixbuf, NULL); katze_assign (priv->static_stock_id, NULL); GTK_OBJECT_CLASS (katze_throbber_parent_class)->destroy (object); diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index 17f570b8..6f1be411 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -38,7 +38,8 @@ typedef struct _KatzeThrobberClass KatzeThrobberClass; struct _KatzeThrobber { - GtkMisc parent_object; + GtkMisc parent_instance; + KatzeThrobberPrivate* priv; }; diff --git a/src/Makefile.am b/src/Makefile.am index 2b98976a..82951045 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,11 +15,14 @@ bin_PROGRAMS = \ midori_SOURCES = \ main.c main.h \ - browser.c browser.h \ + midori-browser.c midori-browser.h \ + midori-panel.c midori-panel.h \ + midori-trash.c midori-trash.h \ + midori-webview.c midori-webview.h \ + midori-websettings.c midori-websettings.h \ prefs.c prefs.h \ webSearch.c webSearch.h \ helpers.c helpers.h \ - webView.c webView.h \ sokoke.c sokoke.h \ conf.c conf.h \ search.c search.h \ diff --git a/src/browser.c b/src/browser.c deleted file mode 100644 index 88044e39..00000000 --- a/src/browser.c +++ /dev/null @@ -1,1775 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "browser.h" - -#include "helpers.h" -#include "prefs.h" -#include "sokoke.h" -#include "ui.h" -#include "webView.h" -#include "webSearch.h" -#include "../katze/katze.h" - -#include -#include - -// -- GTK+ signal handlers begin here - -void on_action_window_new_activate(GtkAction* action, CBrowser* browser) -{ - browser_new(NULL); -} - -void on_action_tab_new_activate(GtkAction* action, CBrowser* browser) -{ - browser_new(browser); - update_browser_actions(browser); -} - -void on_action_open_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* dialog = gtk_file_chooser_dialog_new("Open file" - , GTK_WINDOW(browser->window) - , GTK_FILE_CHOOSER_ACTION_OPEN - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_OPEN); - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - gchar* sFilename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - webView_open(get_nth_webView(-1, browser), sFilename); - g_free(sFilename); - } - gtk_widget_destroy(dialog); -} - -void on_action_tab_close_activate(GtkAction* action, CBrowser* browser) -{ - webView_close(get_nth_webView(-1, browser), browser); -} - -void on_action_window_close_activate(GtkAction* action, CBrowser* browser) -{ - gtk_widget_destroy(browser->window); -} - -void on_action_quit_activate(GtkAction* action, CBrowser* browser) -{ - gtk_main_quit(); -} - -void on_action_edit_activate(GtkAction* action, CBrowser* browser) -{ - update_edit_items(browser); -} - -void on_action_cut_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_LIKELY(widget)) - g_signal_emit_by_name(widget, "cut-clipboard"); -} - -void on_action_copy_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_LIKELY(widget)) - g_signal_emit_by_name(widget, "copy-clipboard"); -} - -void on_action_paste_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_LIKELY(widget)) - g_signal_emit_by_name(widget, "paste-clipboard"); -} - -void on_action_delete_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_LIKELY(widget)) - { - if(WEBKIT_IS_WEB_VIEW(widget)) - webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); - else if(GTK_IS_EDITABLE(widget)) - gtk_editable_delete_selection(GTK_EDITABLE(widget)); - } -} - -void on_action_selectAll_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - if(G_LIKELY(widget)) - { - if(GTK_IS_ENTRY(widget)) - gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); - else - g_signal_emit_by_name(widget, "select-all"); - } -} - -void on_action_find_activate(GtkAction* action, CBrowser* browser) -{ - if(GTK_WIDGET_VISIBLE(browser->findbox)) - { - GtkWidget* webView = get_nth_webView(-1, browser); - webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); - gtk_toggle_tool_button_set_active( - GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight), FALSE); - gtk_widget_hide(browser->findbox); - } - else - { - GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - gtk_entry_set_text(GTK_ENTRY(browser->findbox_text), ""); - gtk_widget_show(browser->findbox); - gtk_widget_grab_focus(GTK_WIDGET(browser->findbox_text)); - } -} - -static void findbox_find(gboolean forward, CBrowser* browser) -{ - const gchar* text = gtk_entry_get_text(GTK_ENTRY(browser->findbox_text)); - const gboolean caseSensitive = gtk_toggle_tool_button_get_active( - GTK_TOGGLE_TOOL_BUTTON(browser->findbox_case)); - GtkWidget* webView = get_nth_webView(-1, browser); - if(GTK_WIDGET_VISIBLE(browser->findbox)) - webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(webView)); - gboolean found = webkit_web_view_search_text(WEBKIT_WEB_VIEW(webView) - , text, caseSensitive, forward, TRUE); - if(GTK_WIDGET_VISIBLE(browser->findbox)) - { - GtkWidget* icon; - if(found) - icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - else - icon = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - webkit_web_view_mark_text_matches(WEBKIT_WEB_VIEW(webView), text, caseSensitive, 0); - const gboolean highlight = gtk_toggle_tool_button_get_active( - GTK_TOGGLE_TOOL_BUTTON(browser->findbox_highlight)); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); - } -} - -void on_action_find_next_activate(GtkAction* action, CBrowser* browser) -{ - findbox_find(TRUE, browser); -} - -void on_action_find_previous_activate(GtkAction* action, CBrowser* browser) -{ - findbox_find(FALSE, browser); -} - -void on_findbox_highlight_toggled(GtkToggleToolButton* toolitem, CBrowser* browser) -{ - GtkWidget* webView = get_nth_webView(-1, browser); - const gboolean highlight = gtk_toggle_tool_button_get_active(toolitem); - webkit_web_view_set_highlight_text_matches(WEBKIT_WEB_VIEW(webView), highlight); -} - -void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser) -{ - gtk_widget_hide(browser->findbox); -} - -void on_action_preferences_activate(GtkAction* action, CBrowser* browser) -{ - // Show the preferences dialog. Create it if necessary. - static GtkWidget* dialog; - if(GTK_IS_DIALOG(dialog)) - gtk_window_present(GTK_WINDOW(dialog)); - else - { - dialog = prefs_preferences_dialog_new(browser); - gtk_widget_show(dialog); - } -} - -static void on_toolbar_navigation_notify_style(GObject* object, GParamSpec* arg1 - , CBrowser* browser) -{ - if(config->toolbarStyle == CONFIG_TOOLBAR_DEFAULT) - { - gtk_toolbar_set_style(GTK_TOOLBAR(browser->navibar) - , config_to_toolbarstyle(config->toolbarStyle)); - } -} - -void on_action_toolbar_navigation_activate(GtkToggleAction* action, CBrowser* browser) -{ - config->toolbarNavigation = gtk_toggle_action_get_active(action); - sokoke_widget_set_visible(browser->navibar, config->toolbarNavigation); -} - -void on_action_toolbar_bookmarks_activate(GtkToggleAction* action, CBrowser* browser) -{ - config->toolbarBookmarks = gtk_toggle_action_get_active(action); - sokoke_widget_set_visible(browser->bookmarkbar, config->toolbarBookmarks); -} - -void on_action_toolbar_downloads_activate(GtkToggleAction* action, CBrowser* browser) -{ - /*config->toolbarDownloads = gtk_toggle_action_get_active(action); - sokoke_widget_set_visible(browser->downloadbar, config->toolbarDownloads);*/ -} - -void on_action_toolbar_status_activate(GtkToggleAction* action, CBrowser* browser) -{ - config->toolbarStatus = gtk_toggle_action_get_active(action); - sokoke_widget_set_visible(browser->statusbar, config->toolbarStatus); -} - -void on_action_refresh_activate(GtkAction* action, CBrowser* browser) -{ - /*GdkModifierType state = (GdkModifierType)0; - gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); - gboolean fromCache = state & GDK_SHIFT_MASK;*/ - webkit_web_view_reload(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); -} - -void on_action_refresh_stop_activate(GtkAction* action, CBrowser* browser) -{ - gchar* stockId; g_object_get(action, "stock-id", &stockId, NULL); - // Refresh or stop, depending on the stock id - if(!strcmp(stockId, GTK_STOCK_REFRESH)) - { - /*GdkModifierType state = (GdkModifierType)0; - gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); - gboolean fromCache = state & GDK_SHIFT_MASK;*/ - webkit_web_view_reload(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); - } - else - webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); - g_free(stockId); -} - -void on_action_stop_activate(GtkAction* action, CBrowser* browser) -{ - webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); -} - -void on_action_zoom_in_activate(GtkAction* action, CBrowser* browser) -{ - /*GtkWidget* webView = get_nth_webView(-1, browser); - const gfloat zoom = webkit_web_view_get_text_multiplier(WEBKIT_WEB_VIEW(webView)); - webkit_web_view_set_text_multiplier(WEBKIT_WEB_VIEW(webView), zoom + 0.1);*/ -} - -void on_action_zoom_out_activate(GtkAction* action, CBrowser* browser) -{ - /*GtkWidget* webView = get_nth_webView(-1, browser); - const gfloat zoom = webView_get_text_size(WEBKIT_WEB_VIEW(webView)); - webkit_web_view_set_text_multiplier(WEBKIT_WEB_VIEW(webView), zoom - 0.1);*/ -} - -void on_action_zoom_normal_activate(GtkAction* action, CBrowser* browser) -{ - //webkit_web_view_set_text_multiplier(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser)), 1); -} - -void on_action_source_view_activate(GtkAction* action, CBrowser* browser) -{ - /*GtkWidget* webView = get_nth_webView(-1, browser); - gchar* source = webkit_web_view_copy_source(WEBKIT_WEB_VIEW(webView)); - webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(webView), source, ""); - g_free(source);*/ -} - -void on_action_fullscreen_activate(GtkAction* action, CBrowser* browser) -{ - GdkWindowState state = gdk_window_get_state(browser->window->window); - if(state & GDK_WINDOW_STATE_FULLSCREEN) - gtk_window_unfullscreen(GTK_WINDOW(browser->window)); - else - gtk_window_fullscreen(GTK_WINDOW(browser->window)); -} - -void on_action_back_activate(GtkAction* action, CBrowser* browser) -{ - webkit_web_view_go_back(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); -} - -void on_action_forward_activate(GtkAction* action, CBrowser* browser) -{ - webkit_web_view_go_forward(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser))); -} - -void on_action_home_activate(GtkAction* action, CBrowser* browser) -{ - webView_open(get_nth_webView(-1, browser), config->homepage); -} - -void on_action_location_activate(GtkAction* action, CBrowser* browser) -{ - if(GTK_WIDGET_VISIBLE(browser->navibar)) - gtk_widget_grab_focus(browser->location); - else - { - // TODO: We should offer all of the toolbar location's features here - GtkWidget* dialog; - dialog = gtk_dialog_new_with_buttons("Open location" - , GTK_WINDOW(browser->window) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , GTK_STOCK_JUMP_TO, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_JUMP_TO); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); - GtkWidget* hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic("_Location:"); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - gtk_entry_set_text(GTK_ENTRY(browser->location) - , gtk_entry_get_text(GTK_ENTRY(entry))); - GdkEventKey event; - event.keyval = GDK_Return; - on_location_key_down(browser->location, &event, browser); - } - gtk_widget_destroy(dialog); - } -} - -void on_action_webSearch_activate(GtkAction* action, CBrowser* browser) -{ - if(GTK_WIDGET_VISIBLE(browser->webSearch) - && GTK_WIDGET_VISIBLE(browser->navibar)) - gtk_widget_grab_focus(browser->webSearch); - else - { - // TODO: We should offer all of the toolbar search's features here - GtkWidget* dialog = gtk_dialog_new_with_buttons("Web search" - , GTK_WINDOW(browser->window) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_FIND); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); - GtkWidget* hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic("_Location:"); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - gtk_entry_set_text(GTK_ENTRY(browser->webSearch) - , gtk_entry_get_text(GTK_ENTRY(entry))); - on_webSearch_activate(browser->webSearch, browser); - } - gtk_widget_destroy(dialog); - } -} - -void on_menu_tabsClosed_activate(GtkWidget* widget, CBrowser* browser) -{ - GtkWidget* menu = gtk_menu_new(); - guint n = katze_xbel_folder_get_n_items(tabtrash); - GtkWidget* menuitem; - guint i; - for(i = 0; i < n; i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(tabtrash, i); - const gchar* title = katze_xbel_item_get_title(item); - const gchar* uri = katze_xbel_bookmark_get_href(item); - menuitem = gtk_image_menu_item_new_with_label(title ? title : uri); - // FIXME: Get the real icon - GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), icon); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - g_object_set_data(G_OBJECT(menuitem), "KatzeXbelItem", item); - g_signal_connect(menuitem, "activate", G_CALLBACK(on_menu_tabsClosed_item_activate), browser); - gtk_widget_show(menuitem); - } - - menuitem = gtk_separator_menu_item_new(); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - GtkAction* action = gtk_action_group_get_action( - browser->actiongroup, "TabsClosedClear"); - menuitem = gtk_action_create_menu_item(action); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - sokoke_widget_popup(widget, GTK_MENU(menu), NULL); -} - -void on_menu_tabsClosed_item_activate(GtkWidget* menuitem, CBrowser* browser) -{ - // Create a new webView with an uri which has been closed before - KatzeXbelItem* item = g_object_get_data(G_OBJECT(menuitem), "KatzeXbelItem"); - const gchar* uri = katze_xbel_bookmark_get_href(item); - CBrowser* curBrowser = browser_new(browser); - webView_open(curBrowser->webView, uri); - katze_xbel_item_unref(item); - update_browser_actions(curBrowser); -} - -void on_action_tabsClosed_undo_activate(GtkAction* action, CBrowser* browser) -{ - // Open the most recent tabtrash item - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(tabtrash, 0); - const gchar* uri = katze_xbel_bookmark_get_href(item); - CBrowser* curBrowser = browser_new(browser); - webView_open(curBrowser->webView, uri); - katze_xbel_item_unref(item); - update_browser_actions(curBrowser); -} - -void on_action_tabsClosed_clear_activate(GtkAction* action, CBrowser* browser) -{ - // Clear the closed tabs list - katze_xbel_item_unref(tabtrash); - tabtrash = katze_xbel_folder_new(); - update_browser_actions(browser); -} - -void on_action_link_tab_new_activate(GtkAction* action, CBrowser* browser) -{ - CBrowser* curBrowser = browser_new(browser); - webView_open(curBrowser->webView, browser->elementUri); -} - -void on_action_link_tab_current_activate(GtkAction* action, CBrowser* browser) -{ - webView_open(get_nth_webView(-1, browser), browser->elementUri); -} - -void on_action_link_window_new_activate(GtkAction* action, CBrowser* browser) -{ - CBrowser* curBrowser = browser_new(NULL); - webView_open(curBrowser->webView, browser->elementUri); -} - -void on_action_link_saveWith_activate(GtkAction* action, CBrowser* browser) -{ - spawn_protocol_command("download", browser->elementUri); -} - -void on_action_link_copy_activate(GtkAction* action, CBrowser* browser) -{ - GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text(clipboard, browser->elementUri, -1); -} - -static void browser_editBookmark_dialog_new(KatzeXbelItem* bookmark, CBrowser* browser) -{ - gboolean newBookmark = !bookmark; - GtkWidget* dialog = gtk_dialog_new_with_buttons( - newBookmark ? "New bookmark" : "Edit bookmark" - , GTK_WINDOW(browser->window) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , newBookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog) - , newBookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); - GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - if(newBookmark) - bookmark = katze_xbel_bookmark_new(); - - GtkWidget* hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic("_Title:"); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_title = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_title), TRUE); - if(!newBookmark) - { - const gchar* title = katze_xbel_item_get_title(bookmark); - gtk_entry_set_text(GTK_ENTRY(entry_title), title ? title : ""); - } - gtk_box_pack_start(GTK_BOX(hbox), entry_title, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Description:"); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_desc = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_desc), TRUE); - if(!newBookmark) - { - const gchar* desc = katze_xbel_item_get_desc(bookmark); - gtk_entry_set_text(GTK_ENTRY(entry_desc), desc ? desc : ""); - } - gtk_box_pack_start(GTK_BOX(hbox), entry_desc, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - GtkWidget* entry_uri = NULL; - if(katze_xbel_item_is_bookmark(bookmark)) - { - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Uri:"); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - entry_uri = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_uri), TRUE); - if(!newBookmark) - gtk_entry_set_text(GTK_ENTRY(entry_uri), katze_xbel_bookmark_get_href(bookmark)); - gtk_box_pack_start(GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - } - - GtkWidget* combo_folder = NULL; - if(newBookmark) - { - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Folder:"); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - combo_folder = gtk_combo_box_new_text(); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo_folder), "Root"); - gtk_widget_set_sensitive(combo_folder, FALSE); - gtk_box_pack_start(GTK_BOX(hbox), combo_folder, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - } - - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - katze_xbel_item_set_title(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_title))); - katze_xbel_item_set_desc(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_desc))); - if(katze_xbel_item_is_bookmark(bookmark)) - katze_xbel_bookmark_set_href(bookmark, gtk_entry_get_text(GTK_ENTRY(entry_uri))); - - // FIXME: We want to choose a folder - if(newBookmark) - { - katze_xbel_folder_append_item(bookmarks, bookmark); - GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); - GtkTreeModel* treemodel = gtk_tree_view_get_model(treeview); - GtkTreeIter iter; - gtk_tree_store_insert_with_values(GTK_TREE_STORE(treemodel) - , &iter, NULL, G_MAXINT, 0, bookmark, -1); - katze_xbel_item_ref(bookmark); - } - - // FIXME: update toolbar - // FIXME: Update panels in other windows - } - gtk_widget_destroy(dialog); -} - -static void on_panel_bookmarks_row_activated(GtkTreeView* treeview - , GtkTreePath* path, GtkTreeViewColumn* column, CBrowser* browser) -{ - GtkTreeModel* model = gtk_tree_view_get_model(treeview); - GtkTreeIter iter; - if(gtk_tree_model_get_iter(model, &iter, path)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) - webView_open(get_nth_webView(-1, browser), katze_xbel_bookmark_get_href(item)); - } -} - -static void on_panel_bookmarks_cursor_or_row_changed(GtkTreeView* treeview - , CBrowser* browser) -{ - GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - - gboolean isSeparator = katze_xbel_item_is_separator(item); - action_set_sensitive("BookmarkEdit", !isSeparator, browser); - action_set_sensitive("BookmarkDelete", TRUE, browser); - } - else - { - action_set_sensitive("BookmarkEdit", FALSE, browser); - action_set_sensitive("BookmarkDelete", FALSE, browser); - } - } -} - -static void panel_bookmarks_popup(GtkWidget* widget, GdkEventButton* event - , KatzeXbelItem* item, CBrowser* browser) -{ - gboolean isBookmark = katze_xbel_item_is_bookmark(item); - - action_set_sensitive("BookmarkOpen", isBookmark, browser); - action_set_sensitive("BookmarkOpenTab", isBookmark, browser); - action_set_sensitive("BookmarkOpenWindow", isBookmark, browser); - - sokoke_widget_popup(widget, GTK_MENU(browser->popup_bookmark), event); -} - -static gboolean on_panel_bookmarks_button_release(GtkWidget* widget - , GdkEventButton* event, CBrowser* browser) -{ - if(event->button != 2 && event->button != 3) - return FALSE; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(event->button == 2 && katze_xbel_item_is_bookmark(item)) - { - CBrowser* newBrowser = browser_new(browser); - const gchar* uri = katze_xbel_bookmark_get_href(item); - webView_open(newBrowser->webView, uri); - } - else - panel_bookmarks_popup(widget, event, item, browser); - return TRUE; - } - } - return FALSE; -} - -void on_panel_bookmarks_popup(GtkWidget* widget, CBrowser* browser) -{ - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - panel_bookmarks_popup(widget, NULL, item, browser); - } - } -} - -void on_action_bookmarkOpen_activate(GtkAction* action, CBrowser* browser) -{ - GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) - webView_open(get_nth_webView(-1, browser) - , katze_xbel_bookmark_get_href(item)); - } - } -} - -void on_action_bookmarkOpenTab_activate(GtkAction* action, CBrowser* browser) -{ - GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) - { - CBrowser* newBrowser = browser_new(browser); - const gchar* uri = katze_xbel_bookmark_get_href(item); - webView_open(newBrowser->webView, uri); - } - } - } -} - -void on_action_bookmarkOpenWindow_activate(GtkAction* action, CBrowser* browser) -{ - GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(katze_xbel_item_is_bookmark(item)) - { - CBrowser* newBrowser = browser_new(NULL); - const gchar* uri = katze_xbel_bookmark_get_href(item); - webView_open(newBrowser->webView, uri); - } - } - } -} - -void on_action_bookmarkEdit_activate(GtkAction* action, CBrowser* browser) -{ - GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if(!katze_xbel_item_is_separator(item)) - browser_editBookmark_dialog_new(item, browser); - } - } -} - -void on_action_bookmarkDelete_activate(GtkAction* action, CBrowser* browser) -{ - GtkTreeView* treeview = GTK_TREE_VIEW(browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection(treeview); - if(selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if(gtk_tree_selection_get_selected(selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - KatzeXbelItem* parent = katze_xbel_item_get_parent(item); - katze_xbel_folder_remove_item(parent, item); - katze_xbel_item_unref(item); - } - } -} - -static void tree_store_insert_folder(GtkTreeStore* treestore, GtkTreeIter* parent - , KatzeXbelItem* folder) -{ - guint n = katze_xbel_folder_get_n_items(folder); - guint i; - for(i = 0; i < n; i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(folder, i); - GtkTreeIter iter; - gtk_tree_store_insert_with_values(treestore, &iter, parent, n, 0, item, -1); - katze_xbel_item_ref(item); - if(katze_xbel_item_is_folder(item)) - tree_store_insert_folder(treestore, &iter, item); - } -} - -static void on_bookmarks_item_render_icon(GtkTreeViewColumn* column - , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter - , GtkWidget* treeview) -{ - KatzeXbelItem* item; - gtk_tree_model_get(model, iter, 0, &item, -1); - - if(G_UNLIKELY(!item)) - return; - if(G_UNLIKELY(!katze_xbel_item_get_parent(item))) - { - gtk_tree_store_remove(GTK_TREE_STORE(model), iter); - katze_xbel_item_unref(item); - return; - } - - // TODO: Would it be better to not do this on every redraw? - GdkPixbuf* pixbuf = NULL; - if(katze_xbel_item_is_bookmark(item)) - pixbuf = gtk_widget_render_icon(treeview, STOCK_BOOKMARK - , GTK_ICON_SIZE_MENU, NULL); - else if(katze_xbel_item_is_folder(item)) - pixbuf = gtk_widget_render_icon(treeview, GTK_STOCK_DIRECTORY - , GTK_ICON_SIZE_MENU, NULL); - g_object_set(renderer, "pixbuf", pixbuf, NULL); - if(pixbuf) - g_object_unref(pixbuf); -} - -static void on_bookmarks_item_render_text(GtkTreeViewColumn* column - , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter - , GtkWidget* treeview) -{ - KatzeXbelItem* item; - gtk_tree_model_get(model, iter, 0, &item, -1); - - if(G_UNLIKELY(!item)) - return; - if(G_UNLIKELY(!katze_xbel_item_get_parent(item))) - { - gtk_tree_store_remove(GTK_TREE_STORE(model), iter); - katze_xbel_item_unref(item); - return; - } - - if(katze_xbel_item_is_separator(item)) - g_object_set(renderer - , "markup", "Separator", NULL); - else - g_object_set(renderer - , "markup", NULL, "text", katze_xbel_item_get_title(item), NULL); -} - -static void create_bookmark_menu(KatzeXbelItem*, GtkWidget*, CBrowser*); - -static void on_bookmark_menu_folder_activate(GtkWidget* menuitem, CBrowser* browser) -{ - GtkWidget* menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menuitem)); - gtk_container_foreach(GTK_CONTAINER(menu), (GtkCallback)gtk_widget_destroy, NULL);//... - KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT(menuitem), "KatzeXbelItem"); - create_bookmark_menu(folder, menu, browser); - // Remove all menuitems when the menu is hidden. - // FIXME: We really *want* the line below, but it won't work like that - //g_signal_connect_after(menu, "hide", G_CALLBACK(gtk_container_foreach), gtk_widget_destroy); - gtk_widget_show(menuitem); -} - -static void on_bookmark_toolbar_folder_activate(GtkToolItem* toolitem, CBrowser* browser) -{ - GtkWidget* menu = gtk_menu_new(); - KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT(toolitem), "KatzeXbelItem"); - create_bookmark_menu(folder, menu, browser); - // Remove all menuitems when the menu is hidden. - // FIXME: We really *should* run the line below, but it won't work like that - //g_signal_connect(menu, "hide", G_CALLBACK(gtk_container_foreach), gtk_widget_destroy); - sokoke_widget_popup(GTK_WIDGET(toolitem), GTK_MENU(menu), NULL); -} - -void on_menu_bookmarks_item_activate(GtkWidget* widget, CBrowser* browser) -{ - KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data(G_OBJECT(widget), "KatzeXbelItem"); - webView_open(get_nth_webView(-1, browser), katze_xbel_bookmark_get_href(item)); -} - -static void create_bookmark_menu(KatzeXbelItem* folder, GtkWidget* menu, CBrowser* browser) -{ - guint n = katze_xbel_folder_get_n_items(folder); - guint i; - for(i = 0; i < n; i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(folder, i); - const gchar* title = katze_xbel_item_is_separator(item) ? "" : katze_xbel_item_get_title(item); - //const gchar* desc = katze_xbel_item_is_separator(item) ? "" : katze_xbel_item_get_desc(item); - GtkWidget* menuitem = NULL; - switch(katze_xbel_item_get_kind(item)) - { - case KATZE_XBEL_ITEM_KIND_FOLDER: - // FIXME: what about katze_xbel_folder_is_folded? - menuitem = gtk_image_menu_item_new_with_label(title); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem) - , gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU)); - GtkWidget* _menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), _menu); - g_signal_connect(menuitem, "activate" - , G_CALLBACK(on_bookmark_menu_folder_activate), browser); - g_object_set_data(G_OBJECT(menuitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_BOOKMARK: - menuitem = menu_item_new(title, STOCK_BOOKMARK - , G_CALLBACK(on_menu_bookmarks_item_activate), TRUE, browser); - g_object_set_data(G_OBJECT(menuitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_SEPARATOR: - menuitem = gtk_separator_menu_item_new(); - break; - default: - g_warning("Unknown xbel item kind"); - } - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - } -} - -void on_action_bookmark_new_activate(GtkAction* action, CBrowser* browser) -{ - browser_editBookmark_dialog_new(NULL, browser); -} - -void on_action_manageSearchEngines_activate(GtkAction* action, CBrowser* browser) -{ - // Show the Manage search engines dialog. Create it if necessary. - static GtkWidget* dialog; - if(GTK_IS_DIALOG(dialog)) - gtk_window_present(GTK_WINDOW(dialog)); - else - { - dialog = webSearch_manageSearchEngines_dialog_new(browser); - gtk_widget_show(dialog); - } -} - -void on_action_tab_previous_activate(GtkAction* action, CBrowser* browser) -{ - gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); - gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page - 1); -} - -void on_action_tab_next_activate(GtkAction* action, CBrowser* browser) -{ - // Advance one tab or jump to the first one if we are at the last one - gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); - if(page == gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) - 1) - page = -1; - gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page + 1); -} - -void on_window_menu_item_activate(GtkImageMenuItem* widget, CBrowser* browser) -{ - gint page = get_webView_index(browser->webView, browser); - gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page); -} - -void on_action_about_activate(GtkAction* action, CBrowser* browser) -{ - gtk_show_about_dialog(GTK_WINDOW(browser->window) - , "logo-icon-name", gtk_window_get_icon_name(GTK_WINDOW(browser->window)) - , "name", PACKAGE_NAME - , "version", PACKAGE_VERSION - , "comments", "A lightweight web browser." - , "copyright", "Copyright © 2007 Christian Dywan" - , "website", "http://software.twotoasts.de" - , "authors", credits_authors - , "documenters", credits_documenters - , "artists", credits_artists - , "license", license - , "wrap-license", TRUE - //, "translator-credits", _("translator-credits") - , NULL); -} - -gboolean on_location_key_down(GtkWidget* widget, GdkEventKey* event, CBrowser* browser) -{ - switch(event->keyval) - { - case GDK_Return: - { - const gchar* uri = gtk_entry_get_text(GTK_ENTRY(widget)); - if(uri) - { - gchar* newUri = magic_uri(uri, TRUE); - // TODO: Use newUrl intermediately when completion is better - /* TODO Completion should be generated from history, that is - the uri as well as the title. */ - entry_completion_append(GTK_ENTRY(widget), uri); - webView_open(get_nth_webView(-1, browser), newUri); - g_free(newUri); - } - return TRUE; - } - case GDK_Escape: - { - GtkWidget* webView = get_nth_webView(-1, browser); - WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); - const gchar* uri = webkit_web_frame_get_uri(frame); - if(uri && *uri) - gtk_entry_set_text(GTK_ENTRY(widget), uri); - return TRUE; - } - } - return FALSE; -} - -void on_location_changed(GtkWidget* widget, CBrowser* browser) -{ - // Preserve changes to the uri - /*const gchar* newUri = gtk_entry_get_text(GTK_ENTRY(widget)); - katze_xbel_bookmark_set_href(browser->sessionItem, newUri);*/ - // FIXME: If we want this feature, this is the wrong approach -} - -void on_action_panels_activate(GtkToggleAction* action, CBrowser* browser) -{ - config->panelShow = gtk_toggle_action_get_active(action); - sokoke_widget_set_visible(browser->panels, config->panelShow); -} - -void on_action_panel_item_activate(GtkRadioAction* action - , GtkRadioAction* currentAction, CBrowser* browser) -{ - g_return_if_fail(GTK_IS_ACTION(action)); - // TODO: Activating again should hide the contents; how? - //gint iValue; gint iCurrentValue; - //g_object_get(G_OBJECT(action), "value", &iValue, NULL); - //g_object_get(G_OBJECT(currentAction), "value", &iCurrentValue, NULL); - //GtkWidget* parent = gtk_widget_get_parent(browser->panels_notebook); - //sokoke_widget_set_visible(parent, iCurrentValue == iValue); - /*gtk_paned_set_position(GTK_PANED(gtk_widget_get_parent(browser->panels)) - , iCurrentValue == iValue ? config->iPanelPos : 0);*/ - config->panelActive = gtk_radio_action_get_current_value(action); - gint page = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(currentAction), "iPage")); - gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->panels_notebook), page); - // This is a special case where activation was not user requested. - if(!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "once-silent"))) - { - config->panelShow = TRUE; - gtk_widget_show(browser->panels); - } - else - g_object_set_data(G_OBJECT(action), "once-silent", NULL); -} - -void on_action_openInPanel_activate(GtkAction* action, CBrowser* browser) -{ - GtkWidget* webView = get_nth_webView(-1, browser); - WebKitWebFrame* frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(webView)); - const gchar* uri = webkit_web_frame_get_uri(frame); - katze_assign(config->panelPageholder, g_strdup(uri)); - GtkAction* action_pageholder = - gtk_action_group_get_action(browser->actiongroup, "PanelPageholder"); - gint value; - g_object_get(G_OBJECT(action_pageholder), "value", &value, NULL); - sokoke_radio_action_set_current_value(GTK_RADIO_ACTION(action_pageholder), value); - gtk_widget_show(browser->panels); - webView_open(browser->panel_pageholder, config->panelPageholder); -} - - -static void on_panels_notify_position(GObject* object, GParamSpec* arg1 - , CBrowser* browser) -{ - config->winPanelPos = gtk_paned_get_position(GTK_PANED(object)); -} - -void on_panels_button_close_clicked(GtkWidget* widget, CBrowser* browser) -{ - config->panelShow = FALSE; - gtk_widget_hide(browser->panels); -} - -gboolean on_notebook_tab_mouse_up(GtkWidget* widget, GdkEventButton* event - , CBrowser* browser) -{ - if(event->button == 1 && event->type == GDK_2BUTTON_PRESS) - { - // Toggle the label visibility on double click - GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget)); - GList* children = gtk_container_get_children(GTK_CONTAINER(child)); - child = (GtkWidget*)g_list_nth_data(children, 1); - gboolean visible = gtk_widget_get_child_visible(GTK_WIDGET(child)); - gtk_widget_set_child_visible(GTK_WIDGET(child), !visible); - gint a, b; sokoke_widget_get_text_size(browser->webView_name, "M", &a, &b); - gtk_widget_set_size_request(child, !visible - ? a * config->tabSize : 0, !visible ? -1 : 0); - g_list_free(children); - return TRUE; - } - else if(event->button == 2) - { - // Close the webView on middle click - webView_close(browser->webView, browser); - return TRUE; - } - - return FALSE; -} - -gboolean on_notebook_tab_close_clicked(GtkWidget* widget, CBrowser* browser) -{ - webView_close(browser->webView, browser); - return TRUE; -} - -void on_notebook_switch_page(GtkWidget* widget, GtkNotebookPage* page - , guint page_num, CBrowser* browser) -{ - GtkWidget* webView = get_nth_webView(page_num, browser); - browser = get_browser_from_webView(webView); - const gchar* uri = katze_xbel_bookmark_get_href(browser->sessionItem); - gtk_entry_set_text(GTK_ENTRY(browser->location), uri); - const gchar* title = katze_xbel_item_get_title(browser->sessionItem); - const gchar* effectiveTitle = title ? title : uri; - gchar* windowTitle = g_strconcat(effectiveTitle, " - ", PACKAGE_NAME, NULL); - gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); - g_free(windowTitle); - update_favicon(browser); - update_security(browser); - update_gui_state(browser); - update_statusbar(browser); - update_feeds(browser); - update_search_engines(browser); -} - -static void on_window_state_changed(GtkWidget* widget - , GdkEventWindowState* event, CBrowser* browser) -{ - if(event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) - { - if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) - { - gtk_widget_hide(browser->menubar); - g_object_set(browser->fullscreen, "stock-id" - , GTK_STOCK_LEAVE_FULLSCREEN, NULL); - gtk_widget_show(browser->fullscreen); - } - else - { - gtk_widget_show(browser->menubar); - gtk_widget_hide(browser->fullscreen); - g_object_set(browser->fullscreen, "stock-id" - , GTK_STOCK_FULLSCREEN, NULL); - } - } -} - -static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation - , CBrowser* browser) -{ - if(GTK_WIDGET_REALIZED(widget)) - { - GdkWindowState state = gdk_window_get_state(widget->window); - if(!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) - { - config->winWidth = allocation->width; - config->winHeight = allocation->height; - } - } -} - -gboolean on_window_destroy(GtkWidget* widget, GdkEvent* event, CBrowser* browser) -{ - gboolean proceed = TRUE; - // TODO: What if there are multiple windows? - // TODO: Smart dialog, à la 'Session?: Save, Discard, Cancel' - // TODO: Pref startup: session, ask, homepage, blank <-- ask - // TODO: Pref quit: session, ask, none <-- ask - - if(0 /*g_list_length(browser_list) > 1*/) - { - GtkDialog* dialog; - dialog = GTK_DIALOG(gtk_message_dialog_new(GTK_WINDOW(browser->window) - , GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO - , "There is more than one tab open. Do you want to close anyway?")); - gtk_window_set_title(GTK_WINDOW(dialog), PACKAGE_NAME); - gtk_dialog_set_default_response(dialog, GTK_RESPONSE_YES); - proceed = gtk_dialog_run(dialog) == GTK_RESPONSE_YES; - gtk_widget_destroy(GTK_WIDGET(dialog)); - } - return !proceed; -} - -// -- Browser creation begins here - -CBrowser* browser_new(CBrowser* oldBrowser) -{ - CBrowser* browser = g_new0(CBrowser, 1); - browsers = g_list_prepend(browsers, browser); - browser->sessionItem = katze_xbel_bookmark_new(); - katze_xbel_item_set_title(browser->sessionItem, "about:blank"); - katze_xbel_folder_append_item(session, browser->sessionItem); - - GtkWidget* scrolled; - - if(!oldBrowser) - { - - GtkWidget* label; GtkWidget* hbox; - - // Setup the window metrics - browser->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(browser->window, "window-state-event" - , G_CALLBACK(on_window_state_changed), browser); - GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window)); - const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7; - const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7; - if(config->rememberWinSize) - { - if(!config->winWidth && !config->winHeight) - { - config->winWidth = defaultWidth; - config->winHeight = defaultWidth; - } - gtk_window_set_default_size(GTK_WINDOW(browser->window) - , config->winWidth, config->winHeight); - } - else - gtk_window_set_default_size(GTK_WINDOW(browser->window) - , defaultWidth, defaultHeight); - g_signal_connect(browser->window, "size-allocate" - , G_CALLBACK(on_window_size_allocate), browser); - // FIXME: Use custom program icon - gtk_window_set_icon_name(GTK_WINDOW(browser->window), "web-browser"); - gtk_window_set_title(GTK_WINDOW(browser->window), g_get_application_name()); - gtk_window_add_accel_group(GTK_WINDOW(browser->window), accel_group); - g_signal_connect(browser->window, "delete-event" - , G_CALLBACK(on_window_destroy), browser); - GtkWidget* vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(browser->window), vbox); - gtk_widget_show(vbox); - - // Let us see some ui manager magic - browser->actiongroup = gtk_action_group_new("Browser"); - gtk_action_group_add_actions(browser->actiongroup, entries, entries_n, browser); - gtk_action_group_add_toggle_actions(browser->actiongroup - , toggle_entries, toggle_entries_n, browser); - gtk_action_group_add_radio_actions(browser->actiongroup - , refreshevery_entries, refreshevery_entries_n - , 300, NULL/*G_CALLBACK(activate_refreshevery_period_action)*/, browser); - gtk_action_group_add_radio_actions(browser->actiongroup - , panel_entries, panel_entries_n, -1 - , G_CALLBACK(on_action_panel_item_activate), browser); - GtkUIManager* ui_manager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group(ui_manager, browser->actiongroup, 0); - gtk_window_add_accel_group(GTK_WINDOW(browser->window) - , gtk_ui_manager_get_accel_group(ui_manager)); - - GError* error = NULL; - if(!gtk_ui_manager_add_ui_from_string(ui_manager, ui_markup, -1, &error)) - { - // TODO: Should this be a message dialog? When does this happen? - g_message("User interface couldn't be created: %s", error->message); - g_error_free(error); - } - - GtkAction* action; - // Make all actions except toplevel menus which lack a callback insensitive - // This will vanish once all actions are implemented - guint i; - for(i = 0; i < entries_n; i++) - { - action = gtk_action_group_get_action(browser->actiongroup, entries[i].name); - gtk_action_set_sensitive(action, entries[i].callback || !entries[i].tooltip); - } - for(i = 0; i < toggle_entries_n; i++) - { - action = gtk_action_group_get_action(browser->actiongroup - , toggle_entries[i].name); - gtk_action_set_sensitive(action, toggle_entries[i].callback != NULL); - } - for(i = 0; i < refreshevery_entries_n; i++) - { - action = gtk_action_group_get_action(browser->actiongroup - , refreshevery_entries[i].name); - gtk_action_set_sensitive(action, FALSE); - } - - //action_set_active("ToolbarDownloads", config->bToolbarDownloads, browser); - - // Create the menubar - browser->menubar = gtk_ui_manager_get_widget(ui_manager, "/menubar"); - GtkWidget* menuitem = gtk_menu_item_new(); - gtk_widget_show(menuitem); - browser->throbber = katze_throbber_new(); - gtk_widget_show(browser->throbber); - gtk_container_add(GTK_CONTAINER(menuitem), browser->throbber); - gtk_widget_set_sensitive(menuitem, FALSE); - gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menuitem), TRUE); - gtk_menu_shell_append(GTK_MENU_SHELL(browser->menubar), menuitem); - gtk_box_pack_start(GTK_BOX(vbox), browser->menubar, FALSE, FALSE, 0); - menuitem = gtk_ui_manager_get_widget(ui_manager, "/menubar/Go/TabsClosed"); - g_signal_connect(menuitem, "activate" - , G_CALLBACK(on_menu_tabsClosed_activate), browser); - browser->menu_bookmarks = gtk_menu_item_get_submenu( - GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, "/menubar/Bookmarks"))); - menuitem = gtk_separator_menu_item_new(); - gtk_widget_show(menuitem); - gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_bookmarks), menuitem); - browser->popup_bookmark = gtk_ui_manager_get_widget(ui_manager, "/popup_bookmark"); - g_object_ref(browser->popup_bookmark); - browser->menu_window = gtk_menu_item_get_submenu( - GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, "/menubar/Window"))); - menuitem = gtk_separator_menu_item_new(); - gtk_widget_show(menuitem); - gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_window), menuitem); - gtk_widget_show(browser->menubar); - action_set_sensitive("PrivateBrowsing", FALSE, browser); //... - action_set_sensitive("WorkOffline", FALSE, browser); //... - browser->popup_webView = gtk_ui_manager_get_widget(ui_manager, "/popup_webView"); - g_object_ref(browser->popup_webView); - browser->popup_element = gtk_ui_manager_get_widget(ui_manager, "/popup_element"); - g_object_ref(browser->popup_element); - browser->popup_editable = gtk_ui_manager_get_widget(ui_manager, "/popup_editable"); - g_object_ref(browser->popup_editable); - - // Create the navigation toolbar - browser->navibar = gtk_ui_manager_get_widget(ui_manager, "/toolbar_navigation"); - gtk_toolbar_set_style(GTK_TOOLBAR(browser->navibar) - , config_to_toolbarstyle(config->toolbarStyle)); - g_signal_connect(gtk_settings_get_default(), "notify::gtk-toolbar-style" - , G_CALLBACK(on_toolbar_navigation_notify_style), browser); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->navibar) - , config_to_toolbariconsize(config->toolbarSmall)); - gtk_toolbar_set_show_arrow(GTK_TOOLBAR(browser->navibar), TRUE); - gtk_box_pack_start(GTK_BOX(vbox), browser->navibar, FALSE, FALSE, 0); - browser->newTab = gtk_ui_manager_get_widget(ui_manager, "/toolbar_navigation/TabNew"); - action = gtk_action_group_get_action(browser->actiongroup, "Back"); - g_object_set(action, "is-important", TRUE, NULL); - - // Location entry - browser->location = sexy_icon_entry_new(); - entry_setup_completion(GTK_ENTRY(browser->location)); - sokoke_entry_set_can_undo(GTK_ENTRY(browser->location), TRUE); - browser->location_icon = gtk_image_new(); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->location) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(browser->location_icon)); - sexy_icon_entry_add_clear_button(SEXY_ICON_ENTRY(browser->location)); - g_signal_connect(browser->location, "key-press-event" - , G_CALLBACK(on_location_key_down), browser); - g_signal_connect(browser->location, "changed" - , G_CALLBACK(on_location_changed), browser); - GtkToolItem* toolitem = gtk_tool_item_new(); - gtk_tool_item_set_expand(GTK_TOOL_ITEM(toolitem), TRUE); - gtk_container_add(GTK_CONTAINER(toolitem), browser->location); - gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar), toolitem, -1); - - // Search entry - browser->webSearch = sexy_icon_entry_new(); - sexy_icon_entry_set_icon_highlight(SEXY_ICON_ENTRY(browser->webSearch) - , SEXY_ICON_ENTRY_PRIMARY, TRUE); - // TODO: Make this actively resizable or enlarge to fit contents? - // FIXME: The interface is somewhat awkward and ought to be rethought - // TODO: Display "show in context menu" search engines as "completion actions" - entry_setup_completion(GTK_ENTRY(browser->webSearch)); - sokoke_entry_set_can_undo(GTK_ENTRY(browser->webSearch), TRUE); - update_searchEngine(config->searchEngine, browser); - g_signal_connect(browser->webSearch, "icon-released" - , G_CALLBACK(on_webSearch_icon_released), browser); - g_signal_connect(browser->webSearch, "key-press-event" - , G_CALLBACK(on_webSearch_key_down), browser); - g_signal_connect(browser->webSearch, "scroll-event" - , G_CALLBACK(on_webSearch_scroll), browser); - g_signal_connect(browser->webSearch, "activate" - , G_CALLBACK(on_webSearch_activate), browser); - toolitem = gtk_tool_item_new(); - gtk_container_add(GTK_CONTAINER(toolitem), browser->webSearch); - gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar), toolitem, -1); - action = gtk_action_group_get_action(browser->actiongroup, "TabsClosed"); - browser->closedTabs = gtk_action_create_tool_item(action); - g_signal_connect(browser->closedTabs, "clicked" - , G_CALLBACK(on_menu_tabsClosed_activate), browser); - gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) - , GTK_TOOL_ITEM(browser->closedTabs), -1); - sokoke_container_show_children(GTK_CONTAINER(browser->navibar)); - action = gtk_action_group_get_action(browser->actiongroup, "Fullscreen"); - browser->fullscreen = gtk_action_create_tool_item(action); - gtk_widget_hide(browser->fullscreen); - g_signal_connect(browser->fullscreen, "clicked" - , G_CALLBACK(on_action_fullscreen_activate), browser); - gtk_toolbar_insert(GTK_TOOLBAR(browser->navibar) - , GTK_TOOL_ITEM(browser->fullscreen), -1); - action_set_active("ToolbarNavigation", config->toolbarNavigation, browser); - - // Bookmarkbar - browser->bookmarkbar = gtk_toolbar_new(); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->bookmarkbar), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style(GTK_TOOLBAR(browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); - create_bookmark_menu(bookmarks, browser->menu_bookmarks, browser); - for(i = 0; i < katze_xbel_folder_get_n_items(bookmarks); i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(bookmarks, i); - const gchar* title = katze_xbel_item_is_separator(item) - ? "" : katze_xbel_item_get_title(item); - const gchar* desc = katze_xbel_item_is_separator(item) - ? "" : katze_xbel_item_get_desc(item); - switch(katze_xbel_item_get_kind(item)) - { - case KATZE_XBEL_ITEM_KIND_FOLDER: - toolitem = tool_button_new(title, GTK_STOCK_DIRECTORY, TRUE, TRUE - , G_CALLBACK(on_bookmark_toolbar_folder_activate), desc, browser); - g_object_set_data(G_OBJECT(toolitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_BOOKMARK: - toolitem = tool_button_new(title, STOCK_BOOKMARK, TRUE, TRUE - , G_CALLBACK(on_menu_bookmarks_item_activate), desc, browser); - g_object_set_data(G_OBJECT(toolitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_SEPARATOR: - toolitem = gtk_separator_tool_item_new(); - break; - default: - g_warning("Unknown item kind"); - } - gtk_toolbar_insert(GTK_TOOLBAR(browser->bookmarkbar), toolitem, -1); - } - sokoke_container_show_children(GTK_CONTAINER(browser->bookmarkbar)); - gtk_box_pack_start(GTK_BOX(vbox), browser->bookmarkbar, FALSE, FALSE, 0); - action_set_active("ToolbarBookmarks", config->toolbarBookmarks, browser); - - // Superuser warning - if((hbox = sokoke_superuser_warning_new())) - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - // Create the panels - GtkWidget* hpaned = gtk_hpaned_new(); - gtk_paned_set_position(GTK_PANED(hpaned), config->winPanelPos); - g_signal_connect(hpaned, "notify::position" - , G_CALLBACK(on_panels_notify_position), browser); - gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); - gtk_widget_show(hpaned); - - browser->panels = gtk_hbox_new(FALSE, 0); - gtk_paned_pack1(GTK_PANED(hpaned), browser->panels, FALSE, FALSE); - sokoke_widget_set_visible(browser->panels, config->panelShow); - - // Create the panel toolbar - GtkWidget* panelbar = gtk_ui_manager_get_widget(ui_manager, "/toolbar_panels"); - gtk_toolbar_set_style(GTK_TOOLBAR(panelbar), GTK_TOOLBAR_BOTH); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(panelbar), GTK_ICON_SIZE_BUTTON); - gtk_toolbar_set_orientation(GTK_TOOLBAR(panelbar), GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start(GTK_BOX(browser->panels), panelbar, FALSE, FALSE, 0); - action_set_active("Panels", config->panelShow, browser); - - GtkWidget* cbox = gtk_vbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(browser->panels), cbox, TRUE, TRUE, 0); - gtk_widget_show(cbox); - - // Panels titlebar - GtkWidget* labelbar = gtk_toolbar_new(); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(labelbar), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style(GTK_TOOLBAR(labelbar), GTK_TOOLBAR_ICONS); - toolitem = gtk_tool_item_new(); - gtk_tool_item_set_expand(toolitem, TRUE); - label = gtk_label_new_with_mnemonic("_Panels"); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(toolitem), label); - gtk_container_set_border_width(GTK_CONTAINER(toolitem), 6); - gtk_toolbar_insert(GTK_TOOLBAR(labelbar), toolitem, -1); - // TODO: Does 'goto top' actually indicate 'detach'? - toolitem = tool_button_new(NULL, GTK_STOCK_GOTO_TOP, FALSE, TRUE - , NULL/*G_CALLBACK(on_panels_button_float_clicked)*/, "Detach panel", browser); - gtk_toolbar_insert(GTK_TOOLBAR(labelbar), toolitem, -1); - toolitem = tool_button_new(NULL, GTK_STOCK_CLOSE, FALSE, TRUE - , G_CALLBACK(on_panels_button_close_clicked), "Close panel", browser); - gtk_toolbar_insert(GTK_TOOLBAR(labelbar), toolitem, -1); - gtk_box_pack_start(GTK_BOX(cbox), labelbar, FALSE, FALSE, 0); - gtk_widget_show_all(labelbar); - - // Notebook, containing all panels - browser->panels_notebook = gtk_notebook_new(); - gtk_notebook_set_show_border(GTK_NOTEBOOK(browser->panels_notebook), FALSE); - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(browser->panels_notebook), FALSE); - gint page; - // Dummy: This is the "fallback" panel for now - page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) - , gtk_label_new("empty"), NULL); - // Bookmarks - GtkWidget* box = gtk_vbox_new(FALSE, 0); - GtkWidget* toolbar = gtk_ui_manager_get_widget(ui_manager, "/toolbar_bookmarks"); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); - gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); - gtk_widget_show(toolbar); - GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; - GtkTreeStore* treestore = gtk_tree_store_new(1, KATZE_TYPE_XBEL_ITEM); - GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(treestore)); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); - column = gtk_tree_view_column_new(); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf - , (GtkTreeCellDataFunc)on_bookmarks_item_render_icon, treeview, NULL); - renderer_text = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(column, renderer_text, FALSE); - gtk_tree_view_column_set_cell_data_func(column, renderer_text - , (GtkTreeCellDataFunc)on_bookmarks_item_render_text, treeview, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); - GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled) - , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(scrolled), treeview); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); - tree_store_insert_folder(GTK_TREE_STORE(treestore), NULL, bookmarks); - g_object_unref(treestore); - g_signal_connect(treeview, "row-activated" - , G_CALLBACK(on_panel_bookmarks_row_activated), browser); - g_signal_connect(treeview, "cursor-changed" - , G_CALLBACK(on_panel_bookmarks_cursor_or_row_changed), browser); - g_signal_connect(treeview, "columns-changed" - , G_CALLBACK(on_panel_bookmarks_cursor_or_row_changed), browser); - on_panel_bookmarks_cursor_or_row_changed(GTK_TREE_VIEW(treeview), browser); - g_signal_connect(treeview, "button-release-event" - , G_CALLBACK(on_panel_bookmarks_button_release), browser); - g_signal_connect(treeview, "popup-menu" - , G_CALLBACK(on_panel_bookmarks_popup), browser); - browser->panel_bookmarks = treeview; - gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0); - gtk_widget_show(box); - page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) - , box, NULL); - action = gtk_action_group_get_action(browser->actiongroup, "PanelBookmarks"); - g_object_set_data(G_OBJECT(action), "iPage", GINT_TO_POINTER(page)); - // Pageholder - browser->panel_pageholder = webView_new(&scrolled); - page = gtk_notebook_append_page(GTK_NOTEBOOK(browser->panels_notebook) - , scrolled, NULL); - //webView_load_from_uri(browser->panel_pageholder, config->panelPageholder); - action = gtk_action_group_get_action(browser->actiongroup, "PanelPageholder"); - g_object_set_data(G_OBJECT(action), "iPage", GINT_TO_POINTER(page)); - GtkWidget* frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); - gtk_container_add(GTK_CONTAINER(frame), browser->panels_notebook); - gtk_box_pack_start(GTK_BOX(cbox), frame, TRUE, TRUE, 0); - gtk_widget_show_all(gtk_widget_get_parent(browser->panels_notebook)); - action = gtk_action_group_get_action(browser->actiongroup, "PanelDownloads"); - g_object_set_data(G_OBJECT(action), "once-silent", GINT_TO_POINTER(1)); - sokoke_radio_action_set_current_value(GTK_RADIO_ACTION(action), config->panelActive); - sokoke_widget_set_visible(browser->panels, config->panelShow); - g_object_unref(ui_manager); - - // Notebook, containing all webViews - browser->webViews = gtk_notebook_new(); - gtk_notebook_set_scrollable(GTK_NOTEBOOK(browser->webViews), TRUE); - #if GTK_CHECK_VERSION(2, 10, 0) - //gtk_notebook_set_group_id(GTK_NOTEBOOK(browser->webViews), 0); - #endif - gtk_paned_pack2(GTK_PANED(hpaned), browser->webViews, FALSE, FALSE); - gtk_widget_show(browser->webViews); - - // Incremental findbar - browser->findbox = gtk_toolbar_new(); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(browser->findbox), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style(GTK_TOOLBAR(browser->findbox), GTK_TOOLBAR_BOTH_HORIZ); - toolitem = gtk_tool_item_new(); - gtk_container_set_border_width(GTK_CONTAINER(toolitem), 6); - gtk_container_add(GTK_CONTAINER(toolitem) - , gtk_label_new_with_mnemonic("_Inline find:")); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); - browser->findbox_text = sexy_icon_entry_new(); - GtkWidget* icon = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->findbox_text) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - sexy_icon_entry_add_clear_button(SEXY_ICON_ENTRY(browser->findbox_text)); - sokoke_entry_set_can_undo(GTK_ENTRY(browser->findbox_text), TRUE); - g_signal_connect(browser->findbox_text, "activate" - , G_CALLBACK(on_action_find_next_activate), browser); - toolitem = gtk_tool_item_new(); - gtk_container_add(GTK_CONTAINER(toolitem), browser->findbox_text); - gtk_tool_item_set_expand(GTK_TOOL_ITEM(toolitem), TRUE); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); - toolitem = tool_button_new(NULL, GTK_STOCK_GO_BACK, TRUE, TRUE - , G_CALLBACK(on_action_find_previous_activate), NULL, browser); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); - toolitem = tool_button_new(NULL, GTK_STOCK_GO_FORWARD, TRUE, TRUE - , G_CALLBACK(on_action_find_next_activate), NULL, browser); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); - browser->findbox_case = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SPELL_CHECK); - gtk_tool_button_set_label(GTK_TOOL_BUTTON(browser->findbox_case), "Match Case"); - gtk_tool_item_set_is_important(GTK_TOOL_ITEM(browser->findbox_case), TRUE); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), browser->findbox_case, -1); - browser->findbox_highlight = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SELECT_ALL); - g_signal_connect(browser->findbox_highlight, "toggled" - , G_CALLBACK(on_findbox_highlight_toggled), browser); - gtk_tool_button_set_label(GTK_TOOL_BUTTON(browser->findbox_highlight), "Highlight Matches"); - gtk_tool_item_set_is_important(GTK_TOOL_ITEM(browser->findbox_highlight), TRUE); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), browser->findbox_highlight, -1); - toolitem = gtk_separator_tool_item_new(); - gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolitem), FALSE); - gtk_tool_item_set_expand(GTK_TOOL_ITEM(toolitem), TRUE); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); - toolitem = tool_button_new(NULL, GTK_STOCK_CLOSE, FALSE, TRUE - , G_CALLBACK(on_findbox_button_close_clicked), "Close Findbar", browser); - gtk_toolbar_insert(GTK_TOOLBAR(browser->findbox), toolitem, -1); - sokoke_container_show_children(GTK_CONTAINER(browser->findbox)); - gtk_box_pack_start(GTK_BOX(vbox), browser->findbox, FALSE, FALSE, 0); - - // Statusbar - // TODO: fix children overlapping statusbar border - browser->statusbar = gtk_statusbar_new(); - gtk_box_pack_start(GTK_BOX(vbox), browser->statusbar, FALSE, FALSE, 0); - browser->progress = gtk_progress_bar_new(); - // Setting the progressbar's height to 1 makes it fit in the statusbar - gtk_widget_set_size_request(browser->progress, -1, 1); - gtk_box_pack_start(GTK_BOX(browser->statusbar), browser->progress - , FALSE, FALSE, 3); - browser->icon_security = gtk_image_new(); - gtk_box_pack_start(GTK_BOX(browser->statusbar) - , browser->icon_security, FALSE, FALSE, 0); - gtk_widget_show(browser->icon_security); - browser->icon_newsfeed = gtk_image_new_from_icon_name(STOCK_NEWSFEED - , GTK_ICON_SIZE_MENU); - gtk_box_pack_start(GTK_BOX(browser->statusbar) - , browser->icon_newsfeed, FALSE, FALSE, 0); - action_set_active("ToolbarStatus", config->toolbarStatus, browser); - - } - else - { - - browser->window = oldBrowser->window; - browser->actiongroup = oldBrowser->actiongroup; - browser->menubar = oldBrowser->menubar; - browser->menu_bookmarks = oldBrowser->menu_bookmarks; - browser->popup_bookmark = oldBrowser->popup_bookmark; - browser->menu_window = oldBrowser->menu_window; - browser->popup_webView = oldBrowser->popup_webView; - browser->popup_element = oldBrowser->popup_element; - browser->popup_editable = oldBrowser->popup_editable; - browser->throbber = oldBrowser->throbber; - browser->navibar = oldBrowser->navibar; - browser->newTab = oldBrowser->newTab; - browser->location_icon = oldBrowser->location_icon; - browser->location = oldBrowser->location; - browser->webSearch = oldBrowser->webSearch; - browser->closedTabs = oldBrowser->closedTabs; - browser->fullscreen = oldBrowser->fullscreen; - browser->bookmarkbar = oldBrowser->bookmarkbar; - browser->panels = oldBrowser->panels; - browser->panels_notebook = oldBrowser->panels_notebook; - browser->panel_pageholder = oldBrowser->panel_pageholder; - browser->webViews = oldBrowser->webViews; - browser->findbox = oldBrowser->findbox; - browser->findbox_case = oldBrowser->findbox_case; - browser->findbox_highlight = oldBrowser->findbox_highlight; - browser->statusbar = oldBrowser->statusbar; - browser->progress = oldBrowser->progress; - browser->icon_security = oldBrowser->icon_security; - browser->icon_newsfeed = oldBrowser->icon_newsfeed; - - } - - // Define some default values - browser->hasMenubar = TRUE; - browser->hasToolbar = TRUE; - browser->hasLocation = TRUE; - browser->hasStatusbar = TRUE; - browser->elementUri = NULL; - browser->loadedPercent = -1; // initially "not loading" - - // Add a window menu item - // TODO: Menu items should be ordered like the notebook tabs - // TODO: Watch tab reordering in >= gtk 2.10 - browser->webView_menu = menu_item_new("about:blank", GTK_STOCK_FILE - , G_CALLBACK(on_window_menu_item_activate), TRUE, browser); - gtk_widget_show(browser->webView_menu); - gtk_menu_shell_append(GTK_MENU_SHELL(browser->menu_window), browser->webView_menu); - - // Create a new tab label - GtkWidget* eventbox = gtk_event_box_new(); - gtk_event_box_set_visible_window(GTK_EVENT_BOX(eventbox), FALSE); - g_signal_connect(eventbox, "button-release-event" - , G_CALLBACK(on_notebook_tab_mouse_up), browser); - GtkWidget* hbox = gtk_hbox_new(FALSE, 1); - gtk_container_add(GTK_CONTAINER(eventbox), GTK_WIDGET(hbox)); - browser->webView_icon = katze_throbber_new(); - katze_throbber_set_static_stock_id(KATZE_THROBBER(browser->webView_icon) - , GTK_STOCK_FILE); - gtk_box_pack_start(GTK_BOX(hbox), browser->webView_icon, FALSE, FALSE, 0); - browser->webView_name = gtk_label_new(katze_xbel_item_get_title(browser->sessionItem)); - gtk_misc_set_alignment(GTK_MISC(browser->webView_name), 0.0, 0.5); - // TODO: make the tab initially look "unvisited" until it's focused - // TODO: gtk's tab scrolling is weird? - gint w, h; - sokoke_widget_get_text_size(browser->webView_name, "M", &w, &h); - gtk_widget_set_size_request(GTK_WIDGET(browser->webView_name) - , w * config->tabSize, -1); - gtk_label_set_ellipsize(GTK_LABEL(browser->webView_name), PANGO_ELLIPSIZE_END); - gtk_box_pack_start(GTK_BOX(hbox), browser->webView_name, FALSE, FALSE, 0); - browser->webView_close = gtk_button_new(); - gtk_button_set_relief(GTK_BUTTON(browser->webView_close), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click(GTK_BUTTON(browser->webView_close), FALSE); - GtkRcStyle* rcstyle = gtk_rc_style_new(); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style(browser->webView_close, rcstyle); - GtkWidget* image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); - gtk_button_set_image(GTK_BUTTON(browser->webView_close), image); - gtk_box_pack_start(GTK_BOX(hbox), browser->webView_close, FALSE, FALSE, 0); - GtkSettings* gtksettings = gtk_settings_get_default(); - gint height; - gtk_icon_size_lookup_for_settings(gtksettings, GTK_ICON_SIZE_BUTTON, 0, &height); - gtk_widget_set_size_request(browser->webView_close, -1, height); - gtk_widget_show_all(GTK_WIDGET(eventbox)); - sokoke_widget_set_visible(browser->webView_close, config->tabClose); - g_signal_connect(browser->webView_close, "clicked" - , G_CALLBACK(on_notebook_tab_close_clicked), browser); - - // Create a webView inside a scrolled window - browser->webView = webView_new(&scrolled); - gtk_widget_show(GTK_WIDGET(scrolled)); - gtk_widget_show(GTK_WIDGET(browser->webView)); - gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); - page = gtk_notebook_insert_page(GTK_NOTEBOOK(browser->webViews) - , scrolled, GTK_WIDGET(eventbox), page + 1); - g_signal_connect_after(browser->webViews, "switch-page" - , G_CALLBACK(on_notebook_switch_page), browser); - #if GTK_CHECK_VERSION(2, 10, 0) - gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(browser->webViews), scrolled, TRUE); - gtk_notebook_set_tab_detachable(GTK_NOTEBOOK(browser->webViews), scrolled, TRUE); - #endif - - // Connect signals - #define DOC_CONNECT(__sig, __func) g_signal_connect \ - (browser->webView, __sig, G_CALLBACK(__func), browser); - #define DOC_CONNECTA(__sig, __func) g_signal_connect_after \ - (browser->webView, __sig, G_CALLBACK(__func), browser); - DOC_CONNECT ("navigation-requested" , on_webView_navigation_requested) - DOC_CONNECT ("title-changed" , on_webView_title_changed) - DOC_CONNECT ("icon-loaded" , on_webView_icon_changed) - DOC_CONNECT ("load-started" , on_webView_load_started) - DOC_CONNECT ("load-committed" , on_webView_load_committed) - DOC_CONNECT ("load-progress-changed" , on_webView_load_changed) - DOC_CONNECT ("load-finished" , on_webView_load_finished) - DOC_CONNECT ("status-bar-text-changed" , on_webView_status_message) - DOC_CONNECT ("hovering-over-link" , on_webView_link_hover) - DOC_CONNECT ("console-message" , on_webView_console_message) - - DOC_CONNECT ("button-press-event" , on_webView_button_press) - DOC_CONNECTA ("button-press-event" , on_webView_button_press_after) - DOC_CONNECT ("popup-menu" , on_webView_popup); - DOC_CONNECT ("scroll-event" , on_webView_scroll); - DOC_CONNECT ("leave-notify-event" , on_webView_leave) - DOC_CONNECT ("destroy" , on_webView_destroy) - #undef DOC_CONNECT - #undef DOC_CONNECTA - - webkit_web_view_set_settings(WEBKIT_WEB_VIEW(browser->webView), webSettings); - - // Eventually pack and display everything - sokoke_widget_set_visible(browser->navibar, config->toolbarNavigation); - sokoke_widget_set_visible(browser->newTab, config->toolbarNewTab); - sokoke_widget_set_visible(browser->webSearch, config->toolbarWebSearch); - sokoke_widget_set_visible(browser->closedTabs, config->toolbarClosedTabs); - sokoke_widget_set_visible(browser->bookmarkbar, config->toolbarBookmarks); - sokoke_widget_set_visible(browser->statusbar, config->toolbarStatus); - if(!config->openTabsInTheBackground) - gtk_notebook_set_current_page(GTK_NOTEBOOK(browser->webViews), page); - - update_browser_actions(browser); - gtk_widget_show(browser->window); - gtk_widget_grab_focus(GTK_WIDGET(browser->location)); - - return browser; -} diff --git a/src/browser.h b/src/browser.h deleted file mode 100644 index a3c4f3df..00000000 --- a/src/browser.h +++ /dev/null @@ -1,600 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __BROWSER_H__ -#define __BROWSER_H__ 1 - -#include "global.h" - -#include - -// -- Types - -typedef struct _CBrowser -{ - // shared widgets - GtkWidget* window; - GtkActionGroup* actiongroup; - // menus - GtkWidget* menubar; - GtkWidget* menu_bookmarks; - GtkWidget* popup_bookmark; - GtkWidget* menu_window; - GtkWidget* popup_webView; - GtkWidget* popup_element; - GtkWidget* popup_editable; - GtkWidget* throbber; - // navibar - GtkWidget* navibar; - GtkWidget* newTab; - GtkWidget* location_icon; - GtkWidget* location; - GtkWidget* webSearch; - GtkWidget* closedTabs; - GtkWidget* fullscreen; - GtkWidget* bookmarkbar; - // panels - GtkWidget* panels; - GtkWidget* panels_notebook; - GtkWidget* panel_bookmarks; - GtkWidget* panel_pageholder; - GtkWidget* webViews; - // findbox - GtkWidget* findbox; - GtkWidget* findbox_text; - GtkToolItem* findbox_case; - GtkToolItem* findbox_highlight; - GtkWidget* statusbar; - GtkWidget* progress; - GtkWidget* icon_security; - GtkWidget* icon_newsfeed; - - // view specific widgets - GtkWidget* webView_menu; - GtkWidget* webView_icon; - GtkWidget* webView_name; - GtkWidget* webView_close; - GtkWidget* webView; - - // view specific values - gboolean hasMenubar; - gboolean hasToolbar; - gboolean hasLocation; - gboolean hasStatusbar; - gchar* elementUri; // the element the mouse is hovering on - gint loadedPercent; // -1 means "not loading" - //UNDEFINED favicon; - guint security; - gchar* statusMessage; // message from a webView - KatzeXbelItem* sessionItem; -} CBrowser; - -enum -{ - SEARCH_COL_ICON, - SEARCH_COL_TEXT, - SEARCH_COL_N -}; - -// -- Declarations - -void -on_action_window_new_activate(GtkAction*, CBrowser*); - -void -on_action_tab_new_activate(GtkAction*, CBrowser*); - -void -on_action_open_activate(GtkAction*, CBrowser*); - -void -on_action_tab_close_activate(GtkAction*, CBrowser*); - -void -on_action_window_close_activate(GtkAction*, CBrowser*); - -void -on_action_quit_activate(GtkAction*, CBrowser*); - -void -on_action_edit_activate(GtkAction*, CBrowser*); - -void -on_action_cut_activate(GtkAction*, CBrowser*); - -void -on_action_copy_activate(GtkAction*, CBrowser*); - -void -on_action_paste_activate(GtkAction*, CBrowser*); - -void -on_action_delete_activate(GtkAction*, CBrowser*); - -void -on_action_selectAll_activate(GtkAction*, CBrowser*); - -void -on_action_find_activate(GtkAction*, CBrowser*); - -void -on_action_find_next_activate(GtkAction*, CBrowser*); - -void -on_action_find_previous_activate(GtkAction*, CBrowser*); - -void -on_action_preferences_activate(GtkAction*, CBrowser*); - -void -on_action_toolbar_navigation_activate(GtkToggleAction*, CBrowser*); - -void -on_action_toolbar_bookmarks_activate(GtkToggleAction*, CBrowser*); - -void -on_action_panels_activate(GtkToggleAction*, CBrowser*); - -void -on_action_toolbar_status_activate(GtkToggleAction*, CBrowser*); - -void -on_action_refresh_stop_activate(GtkAction*, CBrowser*); - -void -on_action_zoom_in_activate(GtkAction*, CBrowser*); - -void -on_action_zoom_out_activate(GtkAction*, CBrowser*); - -void -on_action_zoom_normal_activate(GtkAction*, CBrowser*); - -void -on_action_source_view_activate(GtkAction*, CBrowser*); - -void -on_action_fullscreen_activate(GtkAction*, CBrowser*); - -void -on_action_back_activate(GtkAction*, CBrowser*); - -void -on_action_forward_activate(GtkAction*, CBrowser*); - -void -on_action_home_activate(GtkAction*, CBrowser*); - -void -on_action_location_activate(GtkAction*, CBrowser*); - -void -on_action_webSearch_activate(GtkAction*, CBrowser*); - -void -on_action_openInPanel_activate(GtkAction*, CBrowser*); - -void -on_menu_tabsClosed_activate(GtkWidget*, CBrowser*); - -void -on_menu_tabsClosed_item_activate(GtkWidget*, CBrowser*); - -void -on_action_tabsClosed_clear_activate(GtkAction*, CBrowser*); - -void -on_action_tabsClosed_undo_activate(GtkAction*, CBrowser*); - -void -on_action_link_tab_new_activate(GtkAction*, CBrowser*); - -void -on_action_link_tab_current_activate(GtkAction*, CBrowser*); - -void -on_action_link_window_new_activate(GtkAction*, CBrowser*); - -void -on_action_link_saveWith_activate(GtkAction*, CBrowser*); - -void -on_action_link_copy_activate(GtkAction*, CBrowser*); - -void -on_action_bookmarkOpen_activate(GtkAction*, CBrowser*); - -void -on_action_bookmarkOpenTab_activate(GtkAction*, CBrowser*); - -void -on_action_bookmarkOpenWindow_activate(GtkAction*, CBrowser*); - -void -on_action_bookmarkEdit_activate(GtkAction*, CBrowser*); - -void -on_action_bookmarkDelete_activate(GtkAction*, CBrowser*); - -void -on_menu_bookmarks_item_activate(GtkWidget*, CBrowser*); - -void -on_action_bookmark_new_activate(GtkAction*, CBrowser*); - -void -on_action_manageSearchEngines_activate(GtkAction*, CBrowser*); - -void -on_action_tab_previous_activate(GtkAction*, CBrowser*); - -void -on_action_tab_next_activate(GtkAction*, CBrowser*); - -void -on_action_about_activate(GtkAction*, CBrowser*); - -gboolean -on_location_key_down(GtkWidget*, GdkEventKey*, CBrowser*); - -CBrowser* -browser_new(CBrowser*); - -// -- Action definitions - -// TODO: Fill in a good description for each 'hm?' -static const GtkActionEntry entries[] = { - { "File", NULL, "_File" }, - { "WindowNew", STOCK_WINDOW_NEW - , NULL, "n" - , "Open a new window", G_CALLBACK(on_action_window_new_activate) }, - { "TabNew", STOCK_TAB_NEW - , NULL, "t" - , "Open a new tab", G_CALLBACK(on_action_tab_new_activate) }, - { "Open", GTK_STOCK_OPEN - , NULL, "o" - , "Open a file", G_CALLBACK(on_action_open_activate) }, - { "SaveAs", GTK_STOCK_SAVE_AS - , NULL, "s" - , "Save to a file", NULL/*G_CALLBACK(on_action_saveas_activate)*/ }, - { "TabClose", STOCK_TAB_CLOSE - , NULL, "w" - , "Close the current tab", G_CALLBACK(on_action_tab_close_activate) }, - { "WindowClose", STOCK_WINDOW_CLOSE - , NULL, "w" - , "Close this window", G_CALLBACK(on_action_window_close_activate) }, - { "PageSetup", GTK_STOCK_PROPERTIES - , "Pa_ge Setup", "" - , "hm?", NULL/*G_CALLBACK(on_action_page_setup_activate)*/ }, - { "PrintPreview", GTK_STOCK_PRINT_PREVIEW - , NULL, "" - , "hm?", NULL/*G_CALLBACK(on_action_print_preview_activate)*/ }, - { "Print", GTK_STOCK_PRINT - , NULL, "p" - , "hm?", NULL/*G_CALLBACK(on_action_print_activate)*/ }, - { "Quit", GTK_STOCK_QUIT - , NULL, "q" - , "Quit the application", G_CALLBACK(on_action_quit_activate) }, - - { "Edit", NULL, "_Edit", NULL, NULL, G_CALLBACK(on_action_edit_activate) }, - { "Undo", GTK_STOCK_UNDO - , NULL, "z" - , "Undo the last modification", NULL/*G_CALLBACK(on_action_undo_activate)*/ }, - { "Redo", GTK_STOCK_REDO - , NULL, "z" - , "Redo the last modification", NULL/*G_CALLBACK(on_action_redo_activate)*/ }, - { "Cut", GTK_STOCK_CUT - , NULL, "x" - , "Cut the selected text", G_CALLBACK(on_action_cut_activate) }, - { "Copy", GTK_STOCK_COPY - , NULL, "c" - , "Copy the selected text", G_CALLBACK(on_action_copy_activate) }, - { "Copy_", GTK_STOCK_COPY - , NULL, "c" - , "Copy the selected text", G_CALLBACK(on_action_copy_activate) }, - { "Paste", GTK_STOCK_PASTE - , NULL, "v" - , "Paste text from the clipboard", G_CALLBACK(on_action_paste_activate) }, - { "Delete", GTK_STOCK_DELETE - , NULL, NULL - , "Delete the selected text", G_CALLBACK(on_action_delete_activate) }, - { "SelectAll", GTK_STOCK_SELECT_ALL - , NULL, "a" - , "Selected all text", G_CALLBACK(on_action_selectAll_activate) }, - { "FormFill", STOCK_FORM_FILL - , NULL, "" - , "hm?", NULL/*G_CALLBACK(on_action_formfill_activate)*/ }, - { "Find", GTK_STOCK_FIND - , NULL, "f" - , "hm?", G_CALLBACK(on_action_find_activate) }, - { "FindNext", GTK_STOCK_GO_FORWARD - , "Find _Next", "g" - , "hm?", G_CALLBACK(on_action_find_next_activate) }, - { "FindPrevious", GTK_STOCK_GO_BACK - , "Find _Previous", "g" - , "hm?", G_CALLBACK(on_action_find_previous_activate) }, - { "FindQuick", GTK_STOCK_FIND - , "_Quick Find", "period" - , "hm?", NULL/*G_CALLBACK(on_action_find_quick_activate)*/ }, - { "ManageSearchEngines", GTK_STOCK_PROPERTIES - , "_Manage Search Engines", "s" - , "hm?", G_CALLBACK(on_action_manageSearchEngines_activate) }, - { "Preferences", GTK_STOCK_PREFERENCES - , NULL, "p" - , "hm?", G_CALLBACK(on_action_preferences_activate) }, - - { "View", NULL, "_View" }, - { "Toolbars", NULL, "_Toolbars" }, - { "Refresh", GTK_STOCK_REFRESH - , NULL, "r" - , "Refresh the current page", G_CALLBACK(on_action_refresh_stop_activate) }, - // TODO: Is appointment-new a good choice? - // TODO: What if it isn't available? - { "RefreshEvery", "appointment-new" - , "Refresh _Every...", "" - , "Refresh the current page", G_CALLBACK(on_action_refresh_stop_activate) }, - { "Stop", GTK_STOCK_STOP - , NULL, "Escape" - , "Stop loading of the current page", G_CALLBACK(on_action_refresh_stop_activate) }, - { "RefreshStop", GTK_STOCK_REFRESH - , NULL, "" - , NULL, G_CALLBACK(on_action_refresh_stop_activate) }, - { "ZoomIn", GTK_STOCK_ZOOM_IN - , NULL, "plus" - , "hm?", G_CALLBACK(on_action_zoom_in_activate) }, - { "ZoomOut", GTK_STOCK_ZOOM_OUT - , NULL, "minus" - , "hm?", G_CALLBACK(on_action_zoom_out_activate) }, - { "ZoomNormal", GTK_STOCK_ZOOM_100 - , NULL, "0" - , "hm?", G_CALLBACK(on_action_zoom_normal_activate) }, - { "BackgroundImage", STOCK_IMAGE - , "_Background Image", "" - , "hm?", NULL/*G_CALLBACK(on_action_background_image_activate)*/ }, - { "SourceView", STOCK_SOURCE_VIEW - , NULL, "" - , "hm?", /*G_CALLBACK(on_action_source_view_activate)*/ }, - { "SelectionSourceView", STOCK_SOURCE_VIEW - , "View Selection Source", "" - , "hm?", NULL/*G_CALLBACK(on_action_selection_source_view_activate)*/ }, - { "Properties", GTK_STOCK_PROPERTIES - , NULL, "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_activate)*/ }, - { "Fullscreen", GTK_STOCK_FULLSCREEN - , NULL, "F11" - , "Toggle fullscreen view", G_CALLBACK(on_action_fullscreen_activate) }, - - { "Go", NULL, "_Go" }, - { "Back", GTK_STOCK_GO_BACK - , NULL, "Left" - , "hm?", G_CALLBACK(on_action_back_activate) }, - { "Forward", GTK_STOCK_GO_FORWARD - , NULL, "Right" - , "hm?", G_CALLBACK(on_action_forward_activate) }, - { "Home", STOCK_HOMEPAGE - , NULL, "Home" - , "hm?", G_CALLBACK(on_action_home_activate) }, - { "Location", GTK_STOCK_JUMP_TO - , "Location...", "l" - , "hm?", G_CALLBACK(on_action_location_activate) }, - { "Websearch", GTK_STOCK_FIND - , "Websearch...", "f" - , "hm?", G_CALLBACK(on_action_webSearch_activate) }, - { "OpenInPageholder", GTK_STOCK_JUMP_TO - , "Open in Page_holder...", "" - , "hm?", G_CALLBACK(on_action_openInPanel_activate) }, - { "TabsClosed", STOCK_USER_TRASH - , "Closed Tabs", "" - , "hm?", NULL }, - { "TabsClosedClear", GTK_STOCK_CLEAR - , "Clear List of Closed Tabs", "" - , "hm?", G_CALLBACK(on_action_tabsClosed_clear_activate) }, - { "UndoTabClose", GTK_STOCK_UNDELETE - , "Undo Close Tab", "" - , "hm?", G_CALLBACK(on_action_tabsClosed_undo_activate) }, - { "LinkTabNew", STOCK_TAB_NEW - , "Open Link in New Tab", "" - , "hm?", G_CALLBACK(on_action_link_tab_new_activate) }, - { "LinkTabCurrent", NULL - , "Open Link in Current Tab", "" - , "hm?", G_CALLBACK(on_action_link_tab_current_activate) }, - { "LinkWindowNew", STOCK_WINDOW_NEW - , "Open Link in New Window", "" - , "hm?", G_CALLBACK(on_action_link_window_new_activate) }, - { "LinkBookmarkNew", STOCK_BOOKMARK_NEW - , NULL, "" - , "Bookmark this link", NULL/*G_CALLBACK(on_action_link_bookmark_activate)*/ }, - { "LinkSaveAs", GTK_STOCK_SAVE - , "Save Destination as...", "" - , "Save destination to a file", NULL/*G_CALLBACK(on_action_link_saveas_activate)*/ }, - { "LinkSaveWith", STOCK_DOWNLOADS - , "Download Destination", "" - , "Save destination with the chosen download manager", G_CALLBACK(on_action_link_saveWith_activate) }, - { "LinkCopy", GTK_STOCK_COPY - , "Copy Link Address", "" - , "Copy the link address to the clipboard", G_CALLBACK(on_action_link_copy_activate) }, - { "SelectionLinksNewTabs", NULL - , "Open Selected Links in Tabs", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "SelectionTextTabNew", STOCK_TAB_NEW - , "Open in New Tab", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "SelectionTextTabCurrent", NULL - , "Open in Current Tab", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "SelectionTextWindowNew", STOCK_WINDOW_NEW - , "Open in New Qindow", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "SelectionSearch", GTK_STOCK_FIND - , "Search for ", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "SelectionSearchWith", GTK_STOCK_FIND - , "Search for with...", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "ImageViewTabNew", STOCK_TAB_NEW - , "View Image in New Tab", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "ImageViewTabCurrent", NULL - , "View image in current tab", "" - , "hm?", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "ImageSaveAs", GTK_STOCK_SAVE - , "Save Image as...", "" - , "Save image to a file", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "ImageSaveWith", STOCK_DOWNLOADS - , "Download Image", "" - , "Save image with the chosen download manager", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - { "ImageCopy", GTK_STOCK_COPY - , "Copy Image Address", "" - , "Copy the image address to the clipboard", NULL/*G_CALLBACK(on_action_properties_selection_activate)*/ }, - - { "Bookmarks", NULL, "_Bookmarks" }, - { "BookmarkNew", STOCK_BOOKMARK_NEW - , NULL, "d" - , "hm?", G_CALLBACK(on_action_bookmark_new_activate) }, - { "BookmarksManage", STOCK_BOOKMARKS - , "_Manage Bookmarks", "b" - , "hm?", NULL/*G_CALLBACK(on_action_bookmarks_manage_activate)*/ }, - { "BookmarkOpen", GTK_STOCK_OPEN - , NULL, "" - , "hm?", G_CALLBACK(on_action_bookmarkOpen_activate) }, - { "BookmarkOpenTab", STOCK_TAB_NEW - , "Open in New _Tab", "" - , "hm?", G_CALLBACK(on_action_bookmarkOpenTab_activate) }, - { "BookmarkOpenWindow", STOCK_WINDOW_NEW - , "Open in New _Window", "" - , "hm?", G_CALLBACK(on_action_bookmarkOpenWindow_activate) }, - { "BookmarkEdit", GTK_STOCK_EDIT - , NULL, "" - , "hm?", G_CALLBACK(on_action_bookmarkEdit_activate) }, - { "BookmarkDelete", GTK_STOCK_DELETE - , NULL, "" - , "hm?", G_CALLBACK(on_action_bookmarkDelete_activate) }, - - { "Tools", NULL, "_Tools" }, - - { "Window", NULL, "_Window" }, - { "SessionLoad", GTK_STOCK_REVERT_TO_SAVED - , "_Load Session", "" - , "hm?", NULL/*G_CALLBACK(on_action_session_load_activate)*/ }, - { "SessionSave", GTK_STOCK_SAVE_AS - , "_Save Session", "" - , "hm?", NULL/*G_CALLBACK(on_action_session_save_activate)*/ }, - { "TabPrevious", GTK_STOCK_GO_BACK - , "_Previous Tab", "Page_Up" - , "hm?", G_CALLBACK(on_action_tab_previous_activate) }, - { "TabNext", GTK_STOCK_GO_FORWARD - , "_Next Tab", "Page_Down" - , "hm?", G_CALLBACK(on_action_tab_next_activate) }, - { "TabOverview", NULL - , "Tab _Overview", "" - , "hm?", NULL/*G_CALLBACK(on_action_tab_overview_activate)*/ }, - - { "Help", NULL, "_Help" }, - { "HelpContents", GTK_STOCK_HELP - , "_Contents", "F1" - , "hm?", NULL/*G_CALLBACK(on_action_help_contents_activate)*/ }, - { "About", GTK_STOCK_ABOUT - , NULL, "" - , "hm?", G_CALLBACK(on_action_about_activate) }, - }; - static const guint entries_n = G_N_ELEMENTS(entries); - -static const GtkToggleActionEntry toggle_entries[] = { - { "PrivateBrowsing", NULL - , "P_rivate Browsing", "" - , "hm?", NULL/*G_CALLBACK(on_action_private_browsing_activate)*/ - , FALSE }, - { "WorkOffline", GTK_STOCK_DISCONNECT - , "_Work Offline", "" - , "hm?", NULL/*G_CALLBACK(on_action_work_offline_activate)*/ - , FALSE }, - - { "ToolbarNavigation", NULL - , "_Navigationbar", "" - , "hm?", G_CALLBACK(on_action_toolbar_navigation_activate) - , FALSE }, - { "Panels", NULL - , "_Panels", "F9" - , "hm?", G_CALLBACK(on_action_panels_activate) - , FALSE }, - { "ToolbarBookmarks", NULL - , "_Bookmarkbar", "" - , "hm?", G_CALLBACK(on_action_toolbar_bookmarks_activate) - , FALSE }, - { "ToolbarDownloads", NULL - , "_Downloadbar", "" - , "hm?", NULL/*G_CALLBACK(on_action_toolbar_downloads_activate)*/ - , FALSE }, - { "ToolbarStatus", NULL - , "_Statusbar", "" - , "hm?", G_CALLBACK(on_action_toolbar_status_activate) - , FALSE }, - { "RefreshEveryEnable", NULL - , "_Enabled", "" - , "hm?", NULL/*G_CALLBACK(on_action_reloadevery_enable_activate)*/ - , FALSE }, - { "ReloadEveryActive", NULL - , "_Active", "" - , "hm?", NULL/*G_CALLBACK(on_action_reloadevery_active_activate)*/ - , FALSE }, - }; - static const guint toggle_entries_n = G_N_ELEMENTS(toggle_entries); - -static const GtkRadioActionEntry refreshevery_entries[] = { - { "RefreshEvery30", NULL - , "30 seconds", "" - , "Refresh Every _30 Seconds", 30 }, - { "RefreshEvery60", NULL - , "60 seconds", "" - , "Refresh Every _60 Seconds", 60 }, - { "RefreshEvery300", NULL - , "5 minutes", "" - , "Refresh Every _5 Minutes", 300 }, - { "RefreshEvery900", NULL - , "15 minutes", "" - , "Refresh Every _15 Minutes", 900 }, - { "RefreshEvery1800", NULL - , "30 minutes", "" - , "Refresh Every 3_0 Minutes", 1800 }, - { "RefreshEveryCustom", NULL - , "Custom...", "" - , "Refresh by a _Custom Period", 0 }, - }; - static const guint refreshevery_entries_n = G_N_ELEMENTS(refreshevery_entries); - -static const GtkRadioActionEntry panel_entries[] = { - { "PanelDownloads", STOCK_DOWNLOADS - , NULL, "" - , "hm?", 0 }, - { "PanelBookmarks", STOCK_BOOKMARKS - , "_Bookmarks", "" - , "hm?", 1 }, - { "PanelConsole", STOCK_CONSOLE - , NULL, "" - , "hm?", 2 }, - { "PanelExtensions", STOCK_EXTENSIONS - , NULL, "" - , "hm?", 3 }, - { "PanelHistory", STOCK_HISTORY - , "_History", "" - , "hm?", 4 }, - // TODO: We want a better icon here, but which one? - { "PanelTabs", STOCK_TAB_NEW - , "_Tabs", "" - , "hm?", 5 }, - // TODO: We probably want another icon here - { "PanelPageholder", GTK_STOCK_CONVERT - , "_Pageholder", "" - , "hm?", 6 }, - }; - static const guint panel_entries_n = G_N_ELEMENTS(panel_entries); - -#endif /* !__BROWSER_H__ */ diff --git a/src/global.h b/src/global.h index 868ebd68..e27125c9 100644 --- a/src/global.h +++ b/src/global.h @@ -13,21 +13,19 @@ #define __GLOBAL_H__ 1 #include "conf.h" + +#include "midori-websettings.h" #include "../katze/katze.h" #include #include -// -- globals +// FIXME: Remove these globals -CConfig* config; GList* searchEngines; // Items of type 'SearchEngine' -GList* browsers; // Items of type 'CBrowser' -WebKitWebSettings* webSettings; -GtkAccelGroup* accel_group; KatzeXbelItem* bookmarks; -KatzeXbelItem* session; -KatzeXbelItem* tabtrash; +CConfig* config; +MidoriWebSettings* webSettings; // Custom stock items @@ -37,13 +35,7 @@ KatzeXbelItem* tabtrash; in order to reduce the amount of warnings :D */ #define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" // "bookmark-web" -#define STOCK_BOOKMARKS "bookmark-view" -#define STOCK_DOWNLOADS "package" // "download" -#define STOCK_CONSOLE "terminal" // "console" // MISSING -#define STOCK_EXTENSIONS "extension" // MISSING #define STOCK_FORM_FILL "insert-text" // "form-fill" // MISSING -#define STOCK_HISTORY "document-open-recent" -#define STOCK_HISTORY_ "history-view" #define STOCK_LOCATION "location-entry" #define STOCK_NEWSFEED "gtk-index" // "newsfeed" // MISSING #define STOCK_PLUGINS "plugin" // MISSING diff --git a/src/helpers.c b/src/helpers.c index 04b66837..489b8d7e 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -11,78 +11,24 @@ #include "helpers.h" +#include "global.h" #include "search.h" #include "sokoke.h" -#include "../katze/katze.h" + +#include "midori-webview.h" +#include #include #include -GtkIconTheme* get_icon_theme(GtkWidget* widget) -{ - return gtk_icon_theme_get_for_screen(gtk_widget_get_screen(widget)); -} - -GtkWidget* menu_item_new(const gchar* text, const gchar* icon - , GCallback signal, gboolean sensitive, gpointer userdata) -{ - GtkWidget* menuitem; - if(text) - menuitem = gtk_image_menu_item_new_with_mnemonic(text); - else - menuitem = gtk_image_menu_item_new_from_stock(icon, NULL); - if(icon) - { - GtkWidget* image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU); - if(gtk_image_get_storage_type(GTK_IMAGE(image)) == GTK_IMAGE_EMPTY) - image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_MENU); - if(gtk_image_get_storage_type(GTK_IMAGE(image)) != GTK_IMAGE_EMPTY) - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); - else - g_print("Note: The icon %s is not available.", icon); - } - if(signal) - g_signal_connect(menuitem, "activate", signal, userdata); - gtk_widget_set_sensitive(GTK_WIDGET(menuitem), sensitive && signal); - return menuitem; -} - -GtkToolItem* tool_button_new(const gchar* text, const gchar* icon - , gboolean important, gboolean sensitive, GCallback signal - , const gchar* tooltip, gpointer userdata) -{ - GtkToolItem* toolbutton = gtk_tool_button_new(NULL, NULL); - GtkStockItem stockItem; - if(gtk_stock_lookup(icon, &stockItem)) - toolbutton = gtk_tool_button_new_from_stock(icon); - else - { - GtkIconTheme* iconTheme = get_icon_theme(GTK_WIDGET(toolbutton)); - if(gtk_icon_theme_has_icon(iconTheme, icon)) - gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolbutton), icon); - else - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(toolbutton), GTK_STOCK_MISSING_IMAGE); - } - if(text) - gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolbutton), text); - if(important) - gtk_tool_item_set_is_important(toolbutton, TRUE); - if(signal) - g_signal_connect(toolbutton, "clicked", signal, userdata); - gtk_widget_set_sensitive(GTK_WIDGET(toolbutton), sensitive && signal); - if(tooltip) - sokoke_tool_item_set_tooltip_text(toolbutton, tooltip); - return toolbutton; -} - GtkWidget* check_menu_item_new(const gchar* text - , GCallback signal, gboolean sensitive, gboolean active, CBrowser* browser) + , GCallback signal, gboolean sensitive, gboolean active, gpointer userdata) { GtkWidget* menuitem = gtk_check_menu_item_new_with_mnemonic(text); gtk_widget_set_sensitive(menuitem, sensitive && signal); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); if(signal) - g_signal_connect(menuitem, "activate", signal, browser); + g_signal_connect(menuitem, "activate", signal, userdata); return menuitem; } @@ -91,10 +37,10 @@ GtkWidget* radio_button_new(GtkRadioButton* radio_button, const gchar* label) return gtk_radio_button_new_with_mnemonic_from_widget(radio_button, label); } -void show_error(const gchar* text, const gchar* text2, CBrowser* browser) +void show_error(const gchar* text, const gchar* text2, MidoriBrowser* browser) { GtkWidget* dialog = gtk_message_dialog_new( - browser ? GTK_WINDOW(browser->window) : NULL + browser ? GTK_WINDOW(browser) : NULL , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, text); if(text2) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text2); @@ -191,223 +137,6 @@ void entry_completion_append(GtkEntry* entry, const gchar* text) gtk_list_store_set(GTK_LIST_STORE(completion_store), &iter, 0, text, -1); } -GtkWidget* get_nth_webView(gint n, CBrowser* browser) -{ - if(n < 0) - n = gtk_notebook_get_current_page(GTK_NOTEBOOK(browser->webViews)); - GtkWidget* scrolled = gtk_notebook_get_nth_page(GTK_NOTEBOOK(browser->webViews), n); - return gtk_bin_get_child(GTK_BIN(scrolled)); -} - -gint get_webView_index(GtkWidget* webView, CBrowser* browser) -{ - GtkWidget* scrolled = gtk_widget_get_parent(webView); - return gtk_notebook_page_num(GTK_NOTEBOOK(browser->webViews), scrolled); -} - -CBrowser* get_browser_from_webView(GtkWidget* webView) -{ - // FIXME: g_list_first - CBrowser* browser = NULL; GList* item = g_list_first(browsers); - do - { - browser = (CBrowser*)item->data; - if(browser->webView == webView) - return browser; - } - while((item = g_list_next(item))); - return NULL; -} - -void update_favicon(CBrowser* browser) -{ - if(browser->loadedPercent == -1) - { - if(0) //browser->favicon // Has favicon? - { - // TODO: use custom icon - // gtk_image_set_from_file(GTK_IMAGE(browser->icon_page), "image"); - } - else if(0) // Known mime-type? - { - // TODO: Retrieve mime type and load icon; don't forget ftp listings - } - else - katze_throbber_set_static_stock_id(KATZE_THROBBER(browser->webView_icon) - , GTK_STOCK_FILE); - } - katze_throbber_set_animated(KATZE_THROBBER(browser->webView_icon) - , browser->loadedPercent != -1); -} - -void update_security(CBrowser* browser) -{ - const gchar* uri = katze_xbel_bookmark_get_href(browser->sessionItem); - // TODO: This check is bogus, until webkit tells us how secure a page is - if(g_str_has_prefix(uri, "https://")) - { - // TODO: highlighted entry indicates security, find an alternative - gtk_widget_modify_base(browser->location, GTK_STATE_NORMAL - , &browser->location->style->base[GTK_STATE_SELECTED]); - gtk_widget_modify_text(browser->location, GTK_STATE_NORMAL - , &browser->location->style->text[GTK_STATE_SELECTED]); - gtk_image_set_from_stock(GTK_IMAGE(browser->icon_security) - , GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_MENU); - } - else - { - gtk_widget_modify_base(browser->location, GTK_STATE_NORMAL, NULL); - gtk_widget_modify_text(browser->location, GTK_STATE_NORMAL, NULL); - gtk_image_set_from_stock(GTK_IMAGE(browser->icon_security) - , GTK_STOCK_INFO, GTK_ICON_SIZE_MENU); - } -} - -void update_visibility(CBrowser* browser, gboolean visibility) -{ - // A tabbed window shouldn't be manipulatable - if(gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) > 1) - return; - - // SHOULD SCRIPTS BE ABLE TO HIDE WINDOWS AT ALL? - if(0 && !visibility) - { - gtk_widget_hide(browser->window); - return; - } - else if(!visibility) - g_print("Window was not hidden.\n"); - - sokoke_widget_set_visible(browser->menubar, browser->hasMenubar); - sokoke_widget_set_visible(browser->navibar, browser->hasToolbar); - sokoke_widget_set_visible(browser->location, browser->hasLocation); - sokoke_widget_set_visible(browser->webSearch, browser->hasLocation); - sokoke_widget_set_visible(browser->statusbar, browser->hasStatusbar); -} - -void action_set_active(const gchar* name, gboolean active, CBrowser* browser) -{ - // This shortcut toggles activity state by an action name - GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); - gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), active); -} - -void action_set_sensitive(const gchar* name, gboolean sensitive, CBrowser* browser) -{ - // This shortcut toggles sensitivity by an action name - GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); - gtk_action_set_sensitive(action, sensitive); -} - -void action_set_visible(const gchar* name, gboolean visible, CBrowser* browser) -{ - // This shortcut toggles visibility by an action name - GtkAction* action = gtk_action_group_get_action(browser->actiongroup, name); - gtk_action_set_visible(action, visible); -} - -void update_statusbar(CBrowser* browser) -{ - gtk_statusbar_pop(GTK_STATUSBAR(browser->statusbar), 1); - gtk_statusbar_push(GTK_STATUSBAR(browser->statusbar), 1 - , browser->statusMessage ? browser->statusMessage : ""); - if(browser->loadedPercent > -1) - { - if(browser->loadedPercent > -1) - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browser->progress) - , browser->loadedPercent ? browser->loadedPercent / 100.0 : 0); - else - gtk_progress_bar_pulse(GTK_PROGRESS_BAR(browser->progress)); - gchar* message = g_strdup_printf("%d%% loaded", browser->loadedPercent); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(browser->progress), message); - g_free(message); - } -} - -void update_edit_items(CBrowser* browser) -{ - GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); - gboolean canCut = FALSE; gboolean canCopy = FALSE; gboolean canPaste = FALSE; - if(widget && (WEBKIT_IS_WEB_VIEW(widget) || GTK_IS_EDITABLE(widget))) - { - gboolean hasSelection = WEBKIT_IS_WEB_VIEW(widget) - ? webkit_web_view_has_selection(WEBKIT_WEB_VIEW(widget)) - : gtk_editable_get_selection_bounds(GTK_EDITABLE(widget), NULL, NULL); - canCut = WEBKIT_IS_WEB_VIEW(widget) - ? webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(widget)) - : hasSelection && gtk_editable_get_editable(GTK_EDITABLE(widget)); - canCopy = WEBKIT_IS_WEB_VIEW(widget) - ? webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(widget)) - : hasSelection; - canPaste = WEBKIT_IS_WEB_VIEW(widget) - ? webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(widget)) - : gtk_editable_get_editable(GTK_EDITABLE(widget)); - action_set_sensitive("SelectAll", TRUE, browser); - } - else - action_set_sensitive("SelectAll", FALSE, browser); - action_set_sensitive("Cut", canCut, browser); - action_set_sensitive("Copy", canCopy, browser); - action_set_sensitive("Paste", canPaste, browser); - action_set_sensitive("Delete", canCut, browser); -} - -void update_gui_state(CBrowser* browser) -{ - GtkWidget* webView = get_nth_webView(-1, browser); - action_set_sensitive("ZoomIn", FALSE, browser);//webkit_web_view_can_increase_text_size(WEBKIT_WEB_VIEW(webView), browser); - action_set_sensitive("ZoomOut", FALSE, browser);//webkit_web_view_can_decrease_text_size(WEBKIT_WEB_VIEW(webView)), browser); - action_set_sensitive("ZoomNormal", FALSE, browser);//webkit_web_view_get_text_size(WEBKIT_WEB_VIEW(webView)) != 1, browser); - action_set_sensitive("Back", webkit_web_view_can_go_back(WEBKIT_WEB_VIEW(webView)), browser); - action_set_sensitive("Forward", webkit_web_view_can_go_forward(WEBKIT_WEB_VIEW(webView)), browser); - action_set_sensitive("Refresh", browser->loadedPercent == -1, browser); - action_set_sensitive("Stop", browser->loadedPercent != -1, browser); - - GtkAction* action = gtk_action_group_get_action(browser->actiongroup, "RefreshStop"); - if(browser->loadedPercent == -1) - { - gtk_widget_set_sensitive(browser->throbber, FALSE); - g_object_set(action, "stock-id", GTK_STOCK_REFRESH, NULL); - g_object_set(action, "tooltip", "Refresh the current page", NULL); - gtk_widget_hide(browser->progress); - } - else - { - gtk_widget_set_sensitive(browser->throbber, TRUE); - g_object_set(action, "stock-id", GTK_STOCK_STOP, NULL); - g_object_set(action, "tooltip", "Stop loading the current page", NULL); - gtk_widget_show(browser->progress); - } - katze_throbber_set_animated(KATZE_THROBBER(browser->throbber) - , browser->loadedPercent != -1); - - gtk_image_set_from_stock(GTK_IMAGE(browser->location_icon), GTK_STOCK_FILE - , GTK_ICON_SIZE_MENU); -} - -void update_feeds(CBrowser* browser) -{ - // TODO: Look for available feeds, requires dom access -} - -void update_search_engines(CBrowser* browser) -{ - // TODO: Look for available search engines, requires dom access -} - -void update_browser_actions(CBrowser* browser) -{ - gboolean active = gtk_notebook_get_n_pages(GTK_NOTEBOOK(browser->webViews)) > 1; - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(browser->webViews), active); - action_set_sensitive("TabClose", active, browser); - action_set_sensitive("TabPrevious", active, browser); - action_set_sensitive("TabNext", active, browser); - - gboolean tabtrashEmpty = katze_xbel_folder_is_empty(tabtrash); - action_set_sensitive("UndoTabClose", !tabtrashEmpty, browser); - action_set_sensitive("TabsClosed", !tabtrashEmpty, browser); -} - gchar* magic_uri(const gchar* uri, gboolean search) { // Add file:// if we have a local path diff --git a/src/helpers.h b/src/helpers.h index c1812166..0db7400f 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -12,28 +12,18 @@ #ifndef __HELPERS_H__ #define __HELPERS_H__ 1 -#include "browser.h" - #include -GtkIconTheme* -get_icon_theme(GtkWidget*); +#include "midori-browser.h" GtkWidget* -menu_item_new(const gchar*, const gchar*, GCallback, gboolean, gpointer); - -GtkToolItem* -tool_button_new(const gchar*, const gchar* - , gboolean, gboolean, GCallback, const gchar*, gpointer); - -GtkWidget* -check_menu_item_new(const gchar*, GCallback, gboolean, gboolean, CBrowser*); +check_menu_item_new(const gchar*, GCallback, gboolean, gboolean, gpointer); GtkWidget* radio_button_new(GtkRadioButton*, const gchar*); void -show_error(const gchar*, const gchar*, CBrowser*); +show_error(const gchar*, const gchar*, MidoriBrowser*); gboolean spawn_protocol_command(const gchar*, const gchar*); @@ -47,51 +37,6 @@ entry_setup_completion(GtkEntry*); void entry_completion_append(GtkEntry*, const gchar*); -GtkWidget* -get_nth_webView(gint, CBrowser*); - -gint -get_webView_index(GtkWidget*, CBrowser*); - -CBrowser* -get_browser_from_webView(GtkWidget*); - -void -update_favicon(CBrowser*); - -void -update_security(CBrowser*); - -void -update_visibility(CBrowser*, gboolean); - -void -action_set_active(const gchar*, gboolean, CBrowser*); - -void -action_set_sensitive(const gchar*, gboolean, CBrowser*); - -void -action_set_visible(const gchar*, gboolean, CBrowser*); - -void -update_statusbar(CBrowser*); - -void -update_edit_items(CBrowser*); - -void -update_gui_state(CBrowser*); - -void -update_feeds(CBrowser*); - -void -update_search_engines(CBrowser*); - -void -update_browser_actions(CBrowser*); - gchar* magic_uri(const gchar*, gboolean bSearch); diff --git a/src/main.c b/src/main.c old mode 100755 new mode 100644 index 55e23485..2fdf1854 --- a/src/main.c +++ b/src/main.c @@ -11,17 +11,18 @@ #include "main.h" -#include "browser.h" #include "global.h" #include "helpers.h" #include "sokoke.h" #include "search.h" -#include "webView.h" -#include "../katze/katze.h" + +#include "midori-websettings.h" +#include "midori-trash.h" +#include "midori-browser.h" +#include #include #include -#include #include "config.h" @@ -40,12 +41,7 @@ static void stock_items_init(void) { STOCK_BOOKMARK, "Bookmark", 0, 0, NULL }, { STOCK_BOOKMARK_NEW, "New Bookmark", 0, 0, NULL }, - { STOCK_BOOKMARKS, "_Bookmarks", 0, 0, NULL }, - { STOCK_DOWNLOADS, "_Downloads", 0, 0, NULL }, - { STOCK_CONSOLE, "_Console", 0, 0, NULL }, - { STOCK_EXTENSIONS, "_Extensions", 0, 0, NULL }, { STOCK_FORM_FILL, "_Form Fill", 0, 0, NULL }, - { STOCK_HISTORY, "History", 0, 0, NULL }, { STOCK_HOMEPAGE, "Homepage", 0, 0, NULL }, { STOCK_LOCATION, "Location Entry", 0, 0, NULL }, { STOCK_NEWSFEED, "Newsfeed", 0, 0, NULL }, @@ -81,7 +77,46 @@ static void stock_items_init(void) g_object_unref(factory); } -// -- main function +static gboolean +midori_browser_delete_event_cb (MidoriBrowser* browser, + GdkEvent* event, + GList* browsers) +{ + browsers = g_list_remove (browsers, browser); + if (g_list_nth (browsers, 0)) + return FALSE; + gtk_main_quit (); + return TRUE; +} + +static void +midori_browser_quit_cb (MidoriBrowser* browser, + GdkEvent* event, + GList* browsers) +{ + gtk_main_quit (); +} + +static void +midori_browser_new_window_cb (MidoriBrowser* browser, + const gchar* uri, + GList* browsers) +{ + MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, + // "settings", settings, + // "trash", trash, + NULL); + // gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group); + g_object_connect (new_browser, + "signal::new-window", midori_browser_new_window_cb, browsers, + "signal::delete-event", midori_browser_delete_event_cb, browsers, + "signal::quit", midori_browser_quit_cb, browsers, + NULL); + browsers = g_list_prepend(browsers, new_browser); + gtk_widget_show (GTK_WIDGET (new_browser)); + + midori_browser_append_uri (new_browser, uri); +} int main(int argc, char** argv) { @@ -105,7 +140,7 @@ int main(int argc, char** argv) if(version) { - g_print(PACKAGE_STRING " - Copyright (c) 2007 Christian Dywan\n\n" + g_print(PACKAGE_STRING " - Copyright (c) 2007-2008 Christian Dywan\n\n" "GTK+2: " GTK_VER "\n" "WebKit: " WEBKIT_VER "\n" "Libsexy: " LIBSEXY_VER "\n" @@ -128,7 +163,7 @@ int main(int argc, char** argv) g_mkdir_with_parents(configPath, 0755); gchar* configFile = g_build_filename(configPath, "config", NULL); error = NULL; - config = config_new(); + /*CConfig* */config = config_new(); if(!config_from_file(config, configFile, &error)) { if(error->code != G_FILE_ERROR_NOENT) @@ -178,9 +213,9 @@ int main(int argc, char** argv) g_free(configFile); } configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); - tabtrash = katze_xbel_folder_new(); + KatzeXbelItem* xbel_trash = katze_xbel_folder_new(); error = NULL; - if(!katze_xbel_folder_from_file(tabtrash, configFile, &error)) + if(!katze_xbel_folder_from_file(xbel_trash, configFile, &error)) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages @@ -211,6 +246,7 @@ int main(int argc, char** argv) search_engines_free(searchEngines); katze_xbel_item_unref(bookmarks); katze_xbel_item_unref(_session); + katze_xbel_item_unref(xbel_trash); g_string_free(errorMessages, TRUE); return 0; } @@ -245,37 +281,68 @@ int main(int argc, char** argv) } g_free(configPath); - accel_group = gtk_accel_group_new(); stock_items_init(); - browsers = NULL; - webSettings = g_object_new(WEBKIT_TYPE_WEB_SETTINGS - , "default-font-family" , config->defaultFontFamily - , "default-font-size" , config->defaultFontSize - , "minimum-font-size" , config->minimumFontSize - , "default-encoding" , config->defaultEncoding - , "auto-load-images" , config->autoLoadImages - , "auto-shrink-images" , config->autoShrinkImages - , "print-backgrounds" , config->printBackgrounds - , "resizable-text-areas", config->resizableTextAreas - , "user-stylesheet-uri" , config->userStylesheet ? config->userStylesheetUri : NULL - , "enable-scripts" , config->enableScripts - , "enable-plugins" , config->enablePlugins - , NULL); + MidoriWebSettings* settings; + settings = g_object_new (MIDORI_TYPE_WEB_SETTINGS, + "default-font-family", config->defaultFontFamily, + "default-font-size", config->defaultFontSize, + "minimum-font-size", config->minimumFontSize, + "default-encoding", config->defaultEncoding, + "auto-load-images", config->autoLoadImages, + "auto-shrink-images", config->autoShrinkImages, + "print-backgrounds", config->printBackgrounds, + "resizable-text-areas", config->resizableTextAreas, + "user-stylesheet-uri", + config->userStylesheet ? + config->userStylesheetUri : NULL, + "enable-scripts", config->enableScripts, + "enable-plugins", config->enablePlugins, + "tab-label-size", config->tabSize, + "close-button", config->tabClose, + "middle-click-goto", config->middleClickGoto, + NULL); + webSettings = settings; - session = katze_xbel_folder_new(); - CBrowser* browser = NULL; - guint n = katze_xbel_folder_get_n_items(_session); + MidoriTrash* trash = g_object_new (MIDORI_TYPE_TRASH, + "limit", 10, + NULL); guint i; - for(i = 0; i < n; i++) + guint n = katze_xbel_folder_get_n_items (xbel_trash); + for (i = 0; i < n; i++) { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(_session, i); - browser = browser_new(browser); - webView_open(browser->webView, katze_xbel_bookmark_get_href(item)); + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); + midori_trash_prepend_xbel_item (trash, item); } - katze_xbel_item_unref(_session); - gtk_main(); + GtkAccelGroup* accel_group = gtk_accel_group_new(); + GList* browsers = NULL; + + MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, + "settings", settings, + "trash", trash, + NULL); + gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group); + g_object_connect (browser, + "signal::new-window", midori_browser_new_window_cb, browsers, + "signal::delete-event", midori_browser_delete_event_cb, browsers, + "signal::quit", midori_browser_quit_cb, browsers, + NULL); + browsers = g_list_prepend(browsers, browser); + gtk_widget_show (GTK_WIDGET (browser)); + + KatzeXbelItem* session = katze_xbel_folder_new (); + n = katze_xbel_folder_get_n_items (_session); + for (i = 0; i < n; i++) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, i); + midori_browser_append_xbel_item (browser, item); + } + katze_xbel_item_unref (_session); + + gtk_main (); + + g_object_unref (accel_group); // Save configuration files configPath = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME, NULL); @@ -300,13 +367,13 @@ int main(int argc, char** argv) g_free(configFile); configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); error = NULL; - if(!katze_xbel_folder_to_file(tabtrash, configFile, &error)) + if (!katze_xbel_folder_to_file (xbel_trash, configFile, &error)) { - g_warning("Tabtrash couldn't be saved. %s", error->message); - g_error_free(error); + g_warning ("Tabtrash couldn't be saved. %s", error->message); + g_error_free (error); } - katze_xbel_item_unref(tabtrash); - g_free(configFile); + katze_xbel_item_unref (xbel_trash); + g_free (configFile); if(config->startup == CONFIG_STARTUP_SESSION) { configFile = g_build_filename(configPath, "session.xbel", NULL); diff --git a/src/midori-browser.c b/src/midori-browser.c new file mode 100644 index 00000000..21e54763 --- /dev/null +++ b/src/midori-browser.c @@ -0,0 +1,2986 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "config.h" + +#include "midori-browser.h" + +#include "global.h" +#include "conf.h" +#include "helpers.h" +#include "webSearch.h" +#include "prefs.h" + +#include "sokoke.h" +#include "midori-webview.h" +#include "midori-panel.h" +#include "midori-trash.h" + +#include +#include +#include +#include + +G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) + +struct _MidoriBrowserPrivate +{ + GtkActionGroup* action_group; + GtkWidget* menubar; + GtkWidget* menu_bookmarks; + GtkWidget* menu_tools; + GtkWidget* menu_window; + GtkWidget* popup_bookmark; + GtkWidget* throbber; + GtkWidget* navigationbar; + GtkWidget* button_tab_new; + GtkWidget* location_icon; + GtkWidget* location; + GtkWidget* search; + GtkWidget* button_trash; + GtkWidget* button_fullscreen; + GtkWidget* bookmarkbar; + + GtkWidget* panel; + GtkWidget* panel_bookmarks; + GtkWidget* panel_pageholder; + GtkWidget* notebook; + + GtkWidget* find; + GtkWidget* find_text; + GtkToolItem* find_case; + GtkToolItem* find_highlight; + + GtkWidget* statusbar; + GtkWidget* progressbar; + + gchar* uri; + gchar* title; + gchar* statusbar_text; + MidoriWebSettings* settings; + + KatzeXbelItem* proxy_xbel_folder; + MidoriTrash* trash; +}; + +#define MIDORI_BROWSER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_BROWSER, MidoriBrowserPrivate)) + +enum +{ + PROP_0, + + PROP_SETTINGS, + PROP_STATUSBAR_TEXT, + PROP_TRASH +}; + +enum { + NEW_WINDOW, + STATUSBAR_TEXT_CHANGED, + ELEMENT_MOTION, + QUIT, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_browser_finalize (GObject* object); + +static void +midori_browser_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_browser_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static GtkAction* +_action_by_name (MidoriBrowser* browser, + const gchar* name) +{ + MidoriBrowserPrivate* priv = browser->priv; + + return gtk_action_group_get_action (priv->action_group, name); +} + +static void +_action_set_sensitive (MidoriBrowser* browser, + const gchar* name, + gboolean sensitive) +{ + gtk_action_set_sensitive (_action_by_name (browser, name), sensitive); +} + +static void +_action_set_active (MidoriBrowser* browser, + const gchar* name, + gboolean active) +{ + GtkAction* action = _action_by_name (browser, name); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); +} + +static void +_midori_browser_update_actions (MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + guint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), n > 1); + _action_set_sensitive (browser, "TabClose", n > 1); + _action_set_sensitive (browser, "TabPrevious", n > 1); + _action_set_sensitive (browser, "TabNext", n > 1); + + if (priv->trash) + { + gboolean trash_empty = midori_trash_is_empty (priv->trash); + _action_set_sensitive (browser, "UndoTabClose", !trash_empty); + _action_set_sensitive (browser, "Trash", !trash_empty); + } +} + +static void +_midori_browser_update_interface (MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + gboolean loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); + /*_action_set_sensitive (browser, "ZoomIn", + webkit_web_view_can_increase_text_size (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "ZoomOut", + webkit_web_view_can_decrease_text_size (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "ZoomNormal", + webkit_web_view_get_text_size (WEBKIT_WEB_VIEW (web_view)) != 1);*/ + _action_set_sensitive (browser, "Back", + webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "Back", + webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "Reload", loading); + _action_set_sensitive (browser, "Stop", !loading); + + GtkAction* action = gtk_action_group_get_action (priv->action_group, + "ReloadStop"); + if (!loading) + { + gtk_widget_set_sensitive (priv->throbber, FALSE); + g_object_set (action, + "stock-id", GTK_STOCK_REFRESH, + "tooltip", "Reload the current page", NULL); + gtk_widget_hide (priv->progressbar); + } + else + { + gtk_widget_set_sensitive (priv->throbber, TRUE); + g_object_set (action, + "stock-id", GTK_STOCK_STOP, + "tooltip", "Stop loading the current page", NULL); + gtk_widget_show (priv->progressbar); + } + katze_throbber_set_animated (KATZE_THROBBER (priv->throbber), loading); + gtk_image_set_from_stock (GTK_IMAGE (priv->location_icon), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); +} + +static GtkWidget* +_midori_browser_scrolled_for_child (MidoriBrowser* panel, + GtkWidget* child) +{ + GtkWidget* scrolled = gtk_widget_get_parent (child); + if (GTK_IS_VIEWPORT (scrolled)) + scrolled = gtk_widget_get_parent (scrolled); + return scrolled; +} + +static GtkWidget* +_midori_browser_child_for_scrolled (MidoriBrowser* panel, + GtkWidget* scrolled) +{ + GtkWidget* child = gtk_bin_get_child (GTK_BIN (scrolled)); + if (GTK_IS_VIEWPORT (child)) + child = gtk_bin_get_child (GTK_BIN (child)); + return child; +} + +static WebKitNavigationResponse +midori_web_view_navigation_requested_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + WebKitNetworkRequest* request) +{ + WebKitNavigationResponse response = WEBKIT_NAVIGATION_RESPONSE_ACCEPT; + // FIXME: This isn't the place for uri scheme handling + const gchar* uri = webkit_network_request_get_uri (request); + gchar* protocol = strtok (g_strdup (uri), ":"); + if (spawn_protocol_command (protocol, uri)) + response = WEBKIT_NAVIGATION_RESPONSE_IGNORE; + g_free (protocol); + return response; +} + +static void +_midori_browser_set_statusbar_text (MidoriBrowser* browser, + const gchar* text) +{ + MidoriBrowserPrivate* priv = browser->priv; + + katze_assign (priv->statusbar_text, g_strdup (text)); + gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar), 1); + gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar), 1, + priv->statusbar_text ? priv->statusbar_text : ""); +} + +static void +_midori_browser_update_progress (MidoriBrowser* browser, + gint progress) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (progress > -1) + { + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progressbar), + progress ? progress / 100.0 : 0); + gchar* message = g_strdup_printf ("%d%% loaded", progress); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progressbar), + message); + g_free (message); + } + else + { + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progressbar)); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progressbar), + NULL); + } +} + +static void +midori_web_view_load_started_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + { + _midori_browser_update_interface (browser); + _midori_browser_set_statusbar_text (browser, NULL); + } +} + +static void +midori_web_view_progress_started_cb (GtkWidget* web_view, + guint progress, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + _midori_browser_update_progress (browser, progress); +} + +static void +midori_web_view_progress_changed_cb (GtkWidget* web_view, + guint progress, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + _midori_browser_update_progress (browser, progress); +} + +static void +midori_web_view_progress_done_cb (GtkWidget* web_view, + guint progress, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + _midori_browser_update_progress (browser, progress); +} + +static void +midori_web_view_load_done_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + { + _midori_browser_update_interface (browser); + _midori_browser_set_statusbar_text (browser, NULL); + } +} + +static void +midori_web_view_title_changed_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + const gchar* title, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + { + const gchar* title = midori_web_view_get_display_title ( + MIDORI_WEB_VIEW (web_view)); + gchar* window_title = g_strconcat (title, " - ", + g_get_application_name (), NULL); + gtk_window_set_title (GTK_WINDOW (browser), window_title); + g_free (window_title); + } +} + +static void +midori_web_view_statusbar_text_changed_cb (MidoriWebView* web_view, + const gchar* text, + MidoriBrowser* browser) +{ + _midori_browser_set_statusbar_text (browser, text); +} + +static void +midori_web_view_element_motion_cb (MidoriWebView* web_View, + const gchar* link_uri, + MidoriBrowser* browser) +{ + _midori_browser_set_statusbar_text (browser, link_uri); +} + +static void +midori_web_view_load_committed_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (web_view == midori_browser_get_current_web_view (browser)) + { + const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + gtk_entry_set_text (GTK_ENTRY (priv->location), uri); + _midori_browser_set_statusbar_text (browser, NULL); + } +} + +static gboolean +midori_web_view_console_message_cb (GtkWidget* web_view, + const gchar* message, + gint line, + const gchar* sourceId, + MidoriBrowser* browser) +{ + // FIXME: We want this to appear in a panel + return FALSE; +} + +static void +midori_web_view_populate_popup_cb (GtkWidget* web_view, + GtkWidget* menu, + MidoriBrowser* browser) +{ + const gchar* uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); + if (uri) + { + // TODO: bookmark link + } + + if (webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + { + // TODO: view selection source + } + + if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + { + // TODO: menu items + // undo close tab + // sep + // BookmarkNew + // SaveAs + // SourceView + // Print + } +} + +static gboolean +midori_web_view_leave_notify_event_cb (GtkWidget* web_view, + GdkEventCrossing* event, + MidoriBrowser* browser) +{ + _midori_browser_set_statusbar_text (browser, NULL); + return TRUE; +} + +static void +midori_web_view_new_tab_cb (GtkWidget* web_view, + const gchar* uri, + MidoriBrowser* browser) +{ + midori_browser_append_uri (browser, uri); +} + +static void +midori_web_view_new_window_cb (GtkWidget* web_view, + const gchar* uri, + MidoriBrowser* browser) +{ + g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); +} + +static void +midori_web_view_close_cb (GtkWidget* web_view, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (priv->proxy_xbel_folder) + { + KatzeXbelItem* xbel_item = midori_web_view_get_proxy_xbel_item ( + MIDORI_WEB_VIEW (web_view)); + const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); + if (priv->trash && uri && *uri) + midori_trash_prepend_xbel_item (priv->trash, xbel_item); + katze_xbel_folder_remove_item (priv->proxy_xbel_folder, xbel_item); + katze_xbel_item_unref (xbel_item); + } + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); + guint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), n); + + _midori_browser_update_actions (browser); +} + +static gboolean +midori_web_view_destroy_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + _midori_browser_update_actions (browser); + return FALSE; +} + +static void +midori_browser_class_init (MidoriBrowserClass* class) +{ + + signals[QUIT] = g_signal_new( + "quit", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[NEW_WINDOW] = g_signal_new( + "new-window", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, new_window), + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_browser_finalize; + gobject_class->set_property = midori_browser_set_property; + gobject_class->get_property = midori_browser_get_property; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + /** + * MidoriBrowser::settings + * + * An associated settings instance that is shared among all web views. + * + * Setting this value is propagated to every present web view. Also + * every newly created web view will use this instance automatically. + */ + g_object_class_install_property (gobject_class, + PROP_SETTINGS, + g_param_spec_object ( + "settings", + "Settings", + "The associated settings", + MIDORI_TYPE_WEB_SETTINGS, + G_PARAM_READWRITE)); + + /** + * MidoriBrowser::statusbar-text + * + * The text that is displayed in the statusbar. + * + * This value reflects changes to the text visible in the statusbar, such + * as the uri of a hyperlink the mouse hovers over or the description of + * a menuitem. + * + * Setting this value changes the displayed text until the next change. + */ + g_object_class_install_property (gobject_class, + PROP_STATUSBAR_TEXT, + g_param_spec_string ( + "statusbar-text", + "Statusbar Text", + "The text that is displayed in the statusbar", + "", + flags)); + + /** + * MidoriBrowser::trash + * + * The trash, that collects all closed tabs and windows. + * + * This is actually a reference to a trash instance, so if a trash should + * be used it must be initially set. + * + * Note: In the future the trash might collect other types of items. + */ + g_object_class_install_property (gobject_class, + PROP_TRASH, + g_param_spec_object ( + "trash", + "Trash", + "The trash, collecting recently closed tabs and windows", + MIDORI_TYPE_TRASH, + G_PARAM_READWRITE)); + + g_type_class_add_private (class, sizeof (MidoriBrowserPrivate)); +} + +static void +_action_window_new_activate (GtkAction* action, + MidoriBrowser* browser) +{ + g_signal_emit (browser, signals[NEW_WINDOW], 0, "about:blank"); +} + +static void +_action_tab_new_activate (GtkAction* action, + MidoriBrowser* browser) +{ + midori_browser_append_uri (browser, "about:blank"); +} + +static void +_action_open_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* dialog = gtk_file_chooser_dialog_new ( + "Open file", GTK_WINDOW (browser), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + g_object_set (web_view, "uri", uri, NULL); + g_free (uri); + } + gtk_widget_destroy (dialog); +} + +static void +_action_tab_close_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + gtk_widget_destroy (web_view); +} + +static void +_action_window_close_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gtk_widget_destroy (GTK_WIDGET (browser)); +} + +static void +_action_quit_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gtk_main_quit (); +} + +static void +_action_edit_activate(GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE; + gboolean has_selection; + + if (WEBKIT_IS_WEB_VIEW (widget)) + { + WebKitWebView* web_view = WEBKIT_WEB_VIEW (widget); + can_cut = webkit_web_view_can_cut_clipboard (web_view); + can_copy = webkit_web_view_can_copy_clipboard (web_view); + can_paste = webkit_web_view_can_paste_clipboard (web_view); + } + else if (GTK_IS_EDITABLE (widget)) + { + GtkEditable* editable = GTK_EDITABLE (widget); + has_selection = gtk_editable_get_selection_bounds (editable, NULL, NULL); + can_cut = has_selection && gtk_editable_get_editable (editable); + can_copy = has_selection; + can_paste = gtk_editable_get_editable (editable); + } + + _action_set_sensitive (browser, "Cut", can_cut); + _action_set_sensitive (browser, "Copy", can_copy); + _action_set_sensitive (browser, "Paste", can_paste); + _action_set_sensitive (browser, "Delete", can_cut); + _action_set_sensitive (browser, "SelectAll", FALSE); +} + +static void +_action_cut_activate(GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + if (G_LIKELY (widget)) + g_signal_emit_by_name (widget, "cut-clipboard"); +} + +static void +_action_copy_activate(GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + if (G_LIKELY (widget)) + g_signal_emit_by_name (widget, "copy-clipboard"); +} + +static void +_action_paste_activate(GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + if (G_LIKELY (widget)) + g_signal_emit_by_name (widget, "paste-clipboard"); +} + +static void +_action_delete_activate(GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + if (G_LIKELY (widget)) + { + if (WEBKIT_IS_WEB_VIEW (widget)) + webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget)); + else if (GTK_IS_EDITABLE(widget)) + gtk_editable_delete_selection (GTK_EDITABLE (widget)); + } +} + +static void +_action_select_all_activate(GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); + if (G_LIKELY (widget)) + { + if (GTK_IS_ENTRY (widget)) + gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); + else + g_signal_emit_by_name (widget, "select-all"); + } +} + +static void +_action_find_activate(GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (GTK_WIDGET_VISIBLE (priv->find)) + { + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (web_view)); + gtk_toggle_tool_button_set_active ( + GTK_TOGGLE_TOOL_BUTTON (priv->find_highlight), FALSE); + gtk_widget_hide (priv->find); + } + else + { + GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, + GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->find_text), + SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); + gtk_entry_set_text (GTK_ENTRY (priv->find_text), ""); + gtk_widget_show (priv->find); + gtk_widget_grab_focus (GTK_WIDGET (priv->find_text)); + } +} + +static void +_midori_browser_find (MidoriBrowser* browser, + gboolean forward) +{ + MidoriBrowserPrivate* priv = browser->priv; + + const gchar* text = gtk_entry_get_text (GTK_ENTRY (priv->find_text)); + const gboolean case_sensitive = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON(priv->find_case)); + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + if (GTK_WIDGET_VISIBLE (priv->find)) + webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (web_view)); + gboolean found = webkit_web_view_search_text (WEBKIT_WEB_VIEW (web_view), + text, case_sensitive, forward, TRUE); + if (GTK_WIDGET_VISIBLE (priv->find)) + { + GtkWidget* icon; + if (found) + icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); + else + icon = gtk_image_new_from_stock (GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->find_text), + SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (web_view), text, + case_sensitive, 0); + const gboolean highlight = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (priv->find_highlight)); + webkit_web_view_set_highlight_text_matches (WEBKIT_WEB_VIEW (web_view), + highlight); + } +} + +static void +_action_find_next_activate (GtkAction* action, + MidoriBrowser* browser) +{ + _midori_browser_find (browser, TRUE); +} + +static void +_action_find_previous_activate (GtkAction* action, + MidoriBrowser* browser) +{ + _midori_browser_find (browser, FALSE); +} + +static void +_find_highlight_toggled (GtkToggleToolButton* toolitem, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gboolean highlight = gtk_toggle_tool_button_get_active (toolitem); + webkit_web_view_set_highlight_text_matches (WEBKIT_WEB_VIEW (web_view), + highlight); +} + +static void +midori_browser_find_button_close_clicked_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gtk_widget_hide (priv->find); +} + +static void +midori_browser_navigationbar_notify_style_cb (GObject* object, + GParamSpec* arg1, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (config->toolbarStyle == CONFIG_TOOLBAR_DEFAULT) + { + gtk_toolbar_set_style (GTK_TOOLBAR(priv->navigationbar), + config_to_toolbarstyle (config->toolbarStyle)); + } +} + +static void +midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + // Create a new web view with an uri which has been closed before + KatzeXbelItem* item = g_object_get_data (G_OBJECT (menuitem), + "KatzeXbelItem"); + const gchar* uri = katze_xbel_bookmark_get_href (item); + midori_browser_append_uri (browser, uri); + katze_xbel_item_unref (item); +} + +static void +midori_browser_menu_trash_activate_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* menu = gtk_menu_new (); + guint n = midori_trash_get_n_items (priv->trash); + GtkWidget* menuitem; + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, i); + const gchar* title = katze_xbel_item_get_title (item); + const gchar* uri = katze_xbel_bookmark_get_href (item); + menuitem = gtk_image_menu_item_new_with_label (title ? title : uri); + // FIXME: Get the real icon + GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_append(GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_menu_trash_item_activate_cb), browser); + gtk_widget_show (menuitem); + } + + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + GtkAction* action = gtk_action_group_get_action (priv->action_group, + "TrashEmpty"); + menuitem = gtk_action_create_menu_item (action); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + sokoke_widget_popup (widget, GTK_MENU (menu), NULL); +} + +static void +_action_preferences_activate (GtkAction* action, + MidoriBrowser* browser) +{ + // Show the preferences dialog. Create it if necessary. + static GtkWidget* dialog = NULL; + if (GTK_IS_DIALOG (dialog)) + gtk_window_present (GTK_WINDOW (dialog)); + else + { + dialog = prefs_preferences_dialog_new (browser); + gtk_widget_show (dialog); + } +} + +static void +_action_navigationbar_activate (GtkToggleAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + config->toolbarNavigation = gtk_toggle_action_get_active (action); + sokoke_widget_set_visible (priv->navigationbar, config->toolbarNavigation); +} + +static void +_action_bookmarkbar_activate (GtkToggleAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + config->toolbarBookmarks = gtk_toggle_action_get_active (action); + sokoke_widget_set_visible (priv->bookmarkbar, config->toolbarBookmarks); +} + +static void +_action_statusbar_activate (GtkToggleAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + config->toolbarStatus = gtk_toggle_action_get_active (action); + sokoke_widget_set_visible (priv->statusbar, config->toolbarStatus); +} + +static void +_action_reload_stop_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gchar* stock_id; + g_object_get (action, "stock-id", &stock_id, NULL); + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + // Refresh or stop, depending on the stock id + if (!strcmp (stock_id, GTK_STOCK_REFRESH)) + { + /*GdkModifierType state = (GdkModifierType)0; + gint x, y; + gdk_window_get_pointer (NULL, &x, &y, &state); + gboolean from_cache = state & GDK_SHIFT_MASK;*/ + webkit_web_view_reload (WEBKIT_WEB_VIEW (web_view)); + } + else + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (web_view)); + g_free (stock_id); +} + +/*static void +_action_zoom_in_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gfloat zoom = webkit_web_view_get_text_multiplier ( + WEBKIT_WEB_VIEW (web_view)); + webkit_web_view_set_text_multiplier (WEBKIT_WEB_VIEW (web_view), zoom + 0.1); +}*/ + +/*static void +_action_zoom_out_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gfloat zoom = webkit_web_view_get_text_multiplier ( + WEBKIT_WEB_VIEW (web_view)); + webkit_web_view_set_text_multiplier (WEBKIT_WEB_VIEW (web_view), zoom - 0.1); +}*/ + +/*static void +_action_zoom_normal_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + webkit_web_view_set_text_multiplier (WEBKIT_WEB_VIEW (web_View, 1)); +}*/ + +/*static void +_action_source_view_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + gchar* source = webkit_web_view_copy_source (WEBKIT_WEB_VIEW (web_view)); + webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (web_view), source, ""); + g_free (source); +}*/ + +static void +_action_fullscreen_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GdkWindowState state = gdk_window_get_state (GTK_WIDGET (browser)->window); + if (state & GDK_WINDOW_STATE_FULLSCREEN) + gtk_window_unfullscreen (GTK_WINDOW (browser)); + else + gtk_window_fullscreen (GTK_WINDOW (browser)); +} + +static void +_action_back_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + webkit_web_view_go_back (WEBKIT_WEB_VIEW (web_view)); +} + +static void +_action_forward_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + webkit_web_view_go_forward (WEBKIT_WEB_VIEW (web_view)); +} + +static void +_action_home_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + g_object_set (web_view, "uri", config->homepage, NULL); +} + +static gboolean +midori_browser_location_key_press_event_cb (GtkWidget* widget, + GdkEventKey* event, + MidoriBrowser* browser) +{ + switch (event->keyval) + { + case GDK_Return: + { + const gchar* uri = gtk_entry_get_text (GTK_ENTRY (widget)); + if (uri) + { + gchar* new_uri = magic_uri (uri, TRUE); + // TODO: Use new_uri intermediately when completion is better + /* TODO Completion should be generated from history, that is + the uri as well as the title. */ + entry_completion_append (GTK_ENTRY (widget), uri); + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + g_object_set (web_view, "uri", new_uri, NULL); + g_free (new_uri); + } + return TRUE; + } + case GDK_Escape: + { + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gchar* uri = midori_web_view_get_display_uri ( + MIDORI_WEB_VIEW (web_view)); + gtk_entry_set_text (GTK_ENTRY (widget), uri); + return TRUE; + } + } + return FALSE; +} + +static void +_action_location_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (GTK_WIDGET_VISIBLE (priv->navigationbar)) + gtk_widget_grab_focus (priv->location); + else + { + // TODO: We should offer all of the location's features here + GtkWidget* dialog; + dialog = gtk_dialog_new_with_buttons ("Open location" + , GTK_WINDOW (browser) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , GTK_STOCK_JUMP_TO, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_JUMP_TO); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width ( + GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + GtkWidget* hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic ("_Location:"); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + GtkWidget* entry = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all( hbox); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + gtk_entry_set_text (GTK_ENTRY (priv->location) + , gtk_entry_get_text (GTK_ENTRY (entry))); + GdkEventKey event; + event.keyval = GDK_Return; + midori_browser_location_key_press_event_cb (priv->location, + &event, browser); + } + gtk_widget_destroy (dialog); + } +} + +static void +_action_search_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (GTK_WIDGET_VISIBLE (priv->search) + && GTK_WIDGET_VISIBLE (priv->navigationbar)) + gtk_widget_grab_focus (priv->search); + else + { + // TODO: We should offer all of the search's features here + GtkWidget* dialog = gtk_dialog_new_with_buttons ("Web search" + , GTK_WINDOW (browser) + , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR + , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL + , GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT + , NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_FIND); + gtk_container_set_border_width(GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width ( + GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + GtkWidget* hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic ("_Location:"); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + GtkWidget* entry = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + gtk_entry_set_text (GTK_ENTRY (priv->search) + , gtk_entry_get_text (GTK_ENTRY (entry))); + on_webSearch_activate (priv->search, browser); + } + gtk_widget_destroy (dialog); + } +} + +static void +midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, + KatzeXbelItem* bookmark) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean new_bookmark = !bookmark; + GtkWidget* dialog = gtk_dialog_new_with_buttons ( + new_bookmark ? "New bookmark" : "Edit bookmark", + GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), + new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + if (new_bookmark) + bookmark = katze_xbel_bookmark_new (); + + GtkWidget* hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic ("_Title:"); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_title = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); + if (!new_bookmark) + { + const gchar* title = katze_xbel_item_get_title (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_title), title ? title : ""); + } + gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic ("_Description:"); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_desc = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_desc), TRUE); + if (!new_bookmark) + { + const gchar* desc = katze_xbel_item_get_desc (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_desc), desc ? desc : ""); + } + gtk_box_pack_start (GTK_BOX (hbox), entry_desc, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + GtkWidget* entry_uri = NULL; + if (katze_xbel_item_is_bookmark (bookmark)) + { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic ("_Uri:"); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_uri = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); + if (!new_bookmark) + gtk_entry_set_text (GTK_ENTRY (entry_uri), + katze_xbel_bookmark_get_href (bookmark)); + gtk_box_pack_start (GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + } + + GtkWidget* combo_folder = NULL; + if (new_bookmark) + { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic ("_Folder:"); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + combo_folder = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), "Root"); + gtk_widget_set_sensitive (combo_folder, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + } + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + katze_xbel_item_set_title (bookmark, + gtk_entry_get_text (GTK_ENTRY (entry_title))); + katze_xbel_item_set_desc (bookmark, + gtk_entry_get_text(GTK_ENTRY(entry_desc))); + if (katze_xbel_item_is_bookmark (bookmark)) + katze_xbel_bookmark_set_href (bookmark, + gtk_entry_get_text (GTK_ENTRY (entry_uri))); + + // FIXME: We want to choose a folder + if (new_bookmark) + { + katze_xbel_folder_append_item (bookmarks, bookmark); + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), + &iter, NULL, G_MAXINT, 0, bookmark, -1); + katze_xbel_item_ref (bookmark); + } + + // FIXME: update navigationbar + // FIXME: Update panel in other windows + } + gtk_widget_destroy (dialog); +} + +static void +midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriBrowser* browser) +{ + GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + if (gtk_tree_model_get_iter (model, &iter, path)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) + { + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gchar* uri = katze_xbel_bookmark_get_href (item); + g_object_set (web_view, "uri", uri, NULL); + } + } +} + +static void +midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, + MidoriBrowser* browser) +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + + gboolean is_separator = katze_xbel_item_is_separator (item); + _action_set_sensitive (browser, "BookmarkEdit", !is_separator); + _action_set_sensitive (browser, "BookmarkDelete", TRUE); + } + else + { + _action_set_sensitive (browser, "BookmarkEdit", FALSE); + _action_set_sensitive (browser, "BookmarkDelete", FALSE); + } + } +} + +static void +_midori_panel_bookmarks_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeXbelItem* item, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean is_bookmark = katze_xbel_item_is_bookmark (item); + + _action_set_sensitive (browser, "BookmarkOpen", is_bookmark); + _action_set_sensitive (browser, "BookmarkOpenTab", is_bookmark); + _action_set_sensitive (browser, "BookmarkOpenWindow", is_bookmark); + + sokoke_widget_popup (widget, GTK_MENU (priv->popup_bookmark), event); +} + +static gboolean +midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriBrowser* browser) +{ + if (event->button != 2 && event->button != 3) + return FALSE; + + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + if (event->button == 2 && katze_xbel_item_is_bookmark(item)) + { + const gchar* uri = katze_xbel_bookmark_get_href(item); + midori_browser_append_uri (browser, uri); + } + else + _midori_panel_bookmarks_popup(widget, event, item, browser); + return TRUE; + } + } + return FALSE; +} + +static void +midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get(model, &iter, 0, &item, -1); + _midori_panel_bookmarks_popup(widget, NULL, item, browser); + } + } +} + +static void +_tree_store_insert_folder (GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeXbelItem* folder) +{ + guint n = katze_xbel_folder_get_n_items (folder); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (folder, i); + GtkTreeIter iter; + gtk_tree_store_insert_with_values (treestore, &iter, parent, n, + 0, item, -1); + katze_xbel_item_ref (item); + if (katze_xbel_item_is_folder (item)) + _tree_store_insert_folder (treestore, &iter, item); + } +} + +static void +midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeXbelItem* item; + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (G_UNLIKELY (!item)) + return; + if (G_UNLIKELY (!katze_xbel_item_get_parent (item))) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); + katze_xbel_item_unref (item); + return; + } + + // TODO: Would it be better to not do this on every redraw? + GdkPixbuf* pixbuf = NULL; + if (katze_xbel_item_is_bookmark (item)) + pixbuf = gtk_widget_render_icon (treeview, STOCK_BOOKMARK, + GTK_ICON_SIZE_MENU, NULL); + else if (katze_xbel_item_is_folder (item)) + pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, + GTK_ICON_SIZE_MENU, NULL); + g_object_set (renderer, "pixbuf", pixbuf, NULL); + if (pixbuf) + g_object_unref (pixbuf); +} + +static void +midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeXbelItem* item; + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (G_UNLIKELY (!item)) + return; + if (G_UNLIKELY (!katze_xbel_item_get_parent (item))) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); + katze_xbel_item_unref (item); + return; + } + + if (katze_xbel_item_is_separator (item)) + g_object_set (renderer, "markup", "Separator", NULL); + else + g_object_set (renderer, "markup", NULL, + "text", katze_xbel_item_get_title(item), NULL); +} + +static void +_midori_browser_create_bookmark_menu (MidoriBrowser* browser, + KatzeXbelItem* folder, + GtkWidget* menu); + +static void +midori_browser_bookmark_menu_folder_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + GtkWidget* menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)); + gtk_container_foreach(GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL);//... + KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT (menuitem), "KatzeXbelItem"); + _midori_browser_create_bookmark_menu (browser, folder, menu); + // Remove all menuitems when the menu is hidden. + // FIXME: We really *want* the line below, but it won't work like that + //g_signal_connect_after (menu, "hide", G_CALLBACK (gtk_container_foreach), gtk_widget_destroy); + gtk_widget_show (menuitem); +} + +static void +midori_browser_bookmarkbar_folder_activate_cb (GtkToolItem* toolitem, + MidoriBrowser* browser) +{ + GtkWidget* menu = gtk_menu_new(); + KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data ( + G_OBJECT (toolitem), "KatzeXbelItem"); + _midori_browser_create_bookmark_menu (browser, folder, menu); + // Remove all menuitems when the menu is hidden. + // FIXME: We really *should* run the line below, but it won't work like that + /*g_signal_connect (menu, "hide", G_CALLBACK (gtk_container_foreach), + gtk_widget_destroy);*/ + sokoke_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), NULL); +} + +static void +midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data(G_OBJECT(widget), "KatzeXbelItem"); + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + g_object_set (web_view, "uri", katze_xbel_bookmark_get_href (item), NULL); +} + +static void +_midori_browser_create_bookmark_menu (MidoriBrowser* browser, + KatzeXbelItem* folder, + GtkWidget* menu) +{ + guint n = katze_xbel_folder_get_n_items (folder); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (folder, i); + const gchar* title = katze_xbel_item_is_separator (item) + ? "" : katze_xbel_item_get_title (item); + /* const gchar* desc = katze_xbel_item_is_separator (item) + ? "" : katze_xbel_item_get_desc (item); */ + GtkWidget* menuitem = NULL; + switch (katze_xbel_item_get_kind (item)) + { + case KATZE_XBEL_ITEM_KIND_FOLDER: + // FIXME: what about katze_xbel_folder_is_folded? + menuitem = gtk_image_menu_item_new_with_label (title); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, + GTK_ICON_SIZE_MENU)); + GtkWidget* _menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), _menu); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_bookmark_menu_folder_activate_cb), + browser); + g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); + break; + case KATZE_XBEL_ITEM_KIND_BOOKMARK: + menuitem = gtk_image_menu_item_new_with_label (title); + GtkWidget* image = gtk_image_new_from_stock (STOCK_BOOKMARK, + GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + image); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), + browser); + g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); + break; + case KATZE_XBEL_ITEM_KIND_SEPARATOR: + menuitem = gtk_separator_menu_item_new (); + break; + default: + g_warning ("Unknown xbel item kind"); + } + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } +} + +static void +_action_bookmark_new_activate (GtkAction* action, + MidoriBrowser* browser) +{ + midori_browser_edit_bookmark_dialog_new (browser, NULL); +} + +static void +_action_manage_search_engines_activate (GtkAction* action, + MidoriBrowser* browser) +{ + // Show the Manage search engines dialog. Create it if necessary. + static GtkWidget* dialog; + if (GTK_IS_DIALOG (dialog)) + gtk_window_present (GTK_WINDOW (dialog)); + else + { + dialog = webSearch_manageSearchEngines_dialog_new (browser); + gtk_widget_show (dialog); + } +} + +static void +_action_tab_previous_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n - 1); +} + +static void +_action_tab_next_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + // Advance one tab or jump to the first one if we are at the last one + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) - 1) + n = -1; + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n + 1); +} + +static void +midori_browser_window_menu_item_activate_cb (GtkWidget* widget, + GtkWidget* web_view) +{ + MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (web_view)); + if (!browser) + { + g_warning ("Orphaned web view"); + return; + } + + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); + guint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); +} + +static const gchar* credits_authors[] = { + "Christian Dywan ", NULL }; +static const gchar* credits_documenters/*[]*/ = /*{ + */NULL/* }*/; +static const gchar* credits_artists[] = { + "Nancy Runge ", NULL }; + +static const gchar* license = + "This library is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU Lesser General Public\n" + "License as published by the Free Software Foundation; either\n" + "version 2.1 of the License, or (at your option) any later version.\n"; + +static void +_action_about_activate (GtkAction* action, + MidoriBrowser* browser) +{ + gtk_show_about_dialog (GTK_WINDOW (browser), + "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)), + "name", PACKAGE_NAME, + "version", PACKAGE_VERSION, + "comments", "A lightweight web browser.", + "copyright", "Copyright © 2007-2008 Christian Dywan", + "website", "http://software.twotoasts.de", + "authors", credits_authors, + "documenters", credits_documenters, + "artists", credits_artists, + "license", license, + "wrap-license", TRUE, + // "translator-credits", _("translator-credits"), + NULL); +} + +static void +midori_browser_location_changed_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + // Preserve changes to the uri + /*const gchar* newUri = gtk_entry_get_text(GTK_ENTRY(widget)); + katze_xbel_bookmark_set_href(browser->sessionItem, newUri);*/ + // FIXME: If we want this feature, this is the wrong approach +} + +static void +_action_panel_activate (GtkToggleAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + config->panelShow = gtk_toggle_action_get_active (action); + sokoke_widget_set_visible (priv->panel, config->panelShow); +} + +static void +_action_open_in_panel_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + katze_assign (config->panelPageholder, g_strdup (uri)); + gint n = midori_panel_page_num (MIDORI_PANEL (priv->panel), + priv->panel_pageholder); + midori_panel_set_current_page (MIDORI_PANEL (priv->panel), n); + gtk_widget_show (priv->panel); + g_object_set (priv->panel_pageholder, "uri", config->panelPageholder, NULL); +} + + +static void +midori_panel_notify_position_cb (GObject* object, + GParamSpec* arg1, + MidoriBrowser* browser) +{ + config->winPanelPos = gtk_paned_get_position (GTK_PANED (object)); +} + +static gboolean +midori_panel_close_cb (MidoriPanel* panel, + MidoriBrowser* browser) +{ + config->panelShow = FALSE; + return FALSE; +} + +static void +gtk_notebook_switch_page_cb (GtkWidget* widget, + GtkNotebookPage* page, + guint page_num, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + gtk_entry_set_text (GTK_ENTRY (priv->location), uri); + const gchar* title = midori_web_view_get_display_title ( + MIDORI_WEB_VIEW (web_view)); + gchar* window_title = g_strconcat (title, " - ", + g_get_application_name (), NULL); + gtk_window_set_title (GTK_WINDOW (browser), window_title); + g_free (window_title); + _midori_browser_set_statusbar_text (browser, NULL); + _midori_browser_update_interface (browser); +} + +static void +_action_bookmark_open_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) + g_object_set(midori_browser_get_current_web_view (browser), + "uri", katze_xbel_bookmark_get_href(item), NULL); + } + } +} + +static void +_action_bookmark_open_tab_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) + midori_browser_append_xbel_item (browser, item); + } + } +} + +static void +_action_bookmark_open_window_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) + midori_browser_append_xbel_item (browser, item); + } + } +} + +static void +_action_bookmark_edit_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (!katze_xbel_item_is_separator (item)) + midori_browser_edit_bookmark_dialog_new (browser, item); + } + } +} + +static void +_action_trash_undo_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + // Reopen the most recent trash item + KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, 0); + midori_browser_append_xbel_item (browser, item); + midori_trash_remove_nth_item (priv->trash, 0); + _midori_browser_update_actions (browser); +} + +static void +_action_trash_empty_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + midori_trash_empty (priv->trash); + _midori_browser_update_actions (browser); +} + +static void +_action_bookmark_delete_activate (GtkAction* action, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); + if (selection) + { + GtkTreeModel* model; + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + KatzeXbelItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); + KatzeXbelItem* parent = katze_xbel_item_get_parent (item); + katze_xbel_folder_remove_item (parent, item); + katze_xbel_item_unref (item); + } + } +} + +// FIXME: Fill in a good description for each 'hm?' +static const GtkActionEntry entries[] = { + { "File", NULL, "_File" }, + { "WindowNew", STOCK_WINDOW_NEW, + NULL, "n", + "Open a new window", G_CALLBACK (_action_window_new_activate) }, + { "TabNew", STOCK_TAB_NEW, + NULL, "t", + "Open a new tab", G_CALLBACK (_action_tab_new_activate) }, + { "Open", GTK_STOCK_OPEN, + NULL, "o", + "Open a file", G_CALLBACK (_action_open_activate) }, + { "SaveAs", GTK_STOCK_SAVE_AS, + NULL, "s", + "Save to a file", NULL/*G_CALLBACK (_action_saveas_activate)*/ }, + { "TabClose", STOCK_TAB_CLOSE, + NULL, "w", + "Close the current tab", G_CALLBACK (_action_tab_close_activate) }, + { "WindowClose", STOCK_WINDOW_CLOSE, + NULL, "w", + "Close this window", G_CALLBACK (_action_window_close_activate) }, + { "PageSetup", GTK_STOCK_PROPERTIES, + "Pa_ge Setup", "", + "hm?", NULL/*G_CALLBACK (_action_page_setup_activate)*/ }, + { "PrintPreview", GTK_STOCK_PRINT_PREVIEW, + NULL, "", + "hm?", NULL/*G_CALLBACK (_action_print_preview_activate)*/ }, + { "Print", GTK_STOCK_PRINT, + NULL, "p", + "hm?", NULL/*G_CALLBACK (_action_print_activate)*/ }, + { "Quit", GTK_STOCK_QUIT, + NULL, "q", + "Quit the application", G_CALLBACK (_action_quit_activate) }, + + { "Edit", NULL, "_Edit", NULL, NULL, G_CALLBACK (_action_edit_activate) }, + { "Undo", GTK_STOCK_UNDO, + NULL, "z", + "Undo the last modification", NULL/*G_CALLBACK (_action_undo_activate)*/ }, + { "Redo", GTK_STOCK_REDO, + NULL, "z", + "Redo the last modification", NULL/*G_CALLBACK (_action_redo_activate)*/ }, + { "Cut", GTK_STOCK_CUT, + NULL, "x", + "Cut the selected text", G_CALLBACK (_action_cut_activate) }, + { "Copy", GTK_STOCK_COPY, + NULL, "c", + "Copy the selected text", G_CALLBACK (_action_copy_activate) }, + { "Copy_", GTK_STOCK_COPY, + NULL, "c", + "Copy the selected text", G_CALLBACK (_action_copy_activate) }, + { "Paste", GTK_STOCK_PASTE, + NULL, "v", + "Paste text from the clipboard", G_CALLBACK (_action_paste_activate) }, + { "Delete", GTK_STOCK_DELETE, + NULL, NULL, + "Delete the selected text", G_CALLBACK (_action_delete_activate) }, + { "SelectAll", GTK_STOCK_SELECT_ALL, + NULL, "a", + "Selected all text", G_CALLBACK (_action_select_all_activate) }, + { "FormFill", STOCK_FORM_FILL, + NULL, "", + "hm?", NULL/*G_CALLBACK (_action_form_fill_activate)*/ }, + { "Find", GTK_STOCK_FIND, + NULL, "f", + "hm?", G_CALLBACK (_action_find_activate) }, + { "FindNext", GTK_STOCK_GO_FORWARD, + "Find _Next", "g", + "hm?", G_CALLBACK (_action_find_next_activate) }, + { "FindPrevious", GTK_STOCK_GO_BACK, + "Find _Previous", "g", + "hm?", G_CALLBACK (_action_find_previous_activate) }, + { "FindQuick", GTK_STOCK_FIND, + "_Quick Find", "period", + "hm?", NULL/*G_CALLBACK (_action_find_quick_activate)*/ }, + { "Preferences", GTK_STOCK_PREFERENCES, + NULL, "p", + "hm?", G_CALLBACK (_action_preferences_activate) }, + + { "View", NULL, "_View" }, + { "Toolbars", NULL, "_Toolbars" }, + { "Reload", GTK_STOCK_REFRESH, + NULL, "r", + "Reload the current page", G_CALLBACK (_action_reload_stop_activate) }, + { "Stop", GTK_STOCK_REFRESH, + NULL, "r", + "Stop loading the current page", G_CALLBACK (_action_reload_stop_activate) }, + { "ReloadStop", GTK_STOCK_STOP, + NULL, "r", + "Reload the current page", G_CALLBACK (_action_reload_stop_activate) }, + { "ZoomIn", GTK_STOCK_ZOOM_IN, + NULL, "plus", + "hm?", NULL/*G_CALLBACK (_action_zoom_in_activate)*/ }, + { "ZoomOut", GTK_STOCK_ZOOM_OUT, + NULL, "minus", + "hm?", NULL/*G_CALLBACK (_action_zoom_out_activate)*/ }, + { "ZoomNormal", GTK_STOCK_ZOOM_100, + NULL, "0", + "hm?", NULL/*G_CALLBACK (_action_zoom_normal_activate)*/ }, + { "SourceView", STOCK_SOURCE_VIEW, + NULL, "", + "hm?", /*G_CALLBACK (_action_source_view_activate)*/ }, + { "SelectionSourceView", STOCK_SOURCE_VIEW, + "View Selection Source", "", + "hm?", NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, + { "Fullscreen", GTK_STOCK_FULLSCREEN, + NULL, "F11", + "Toggle fullscreen view", G_CALLBACK (_action_fullscreen_activate) }, + + { "Go", NULL, "_Go" }, + { "Back", GTK_STOCK_GO_BACK, + NULL, "Left", + "hm?", G_CALLBACK (_action_back_activate) }, + { "Forward", GTK_STOCK_GO_FORWARD, + NULL, "Right", + "hm?", G_CALLBACK (_action_forward_activate) }, + { "Home", STOCK_HOMEPAGE, + NULL, "Home", + "hm?", G_CALLBACK (_action_home_activate) }, + { "Location", GTK_STOCK_JUMP_TO, + "Location...", "l", + "hm?", G_CALLBACK (_action_location_activate) }, + { "Search", GTK_STOCK_FIND, + "Web Search...", "f", + "hm?", G_CALLBACK (_action_search_activate) }, + { "OpenInPageholder", GTK_STOCK_JUMP_TO, + "Open in Page_holder...", "", + "hm?", G_CALLBACK (_action_open_in_panel_activate) }, + { "Trash", STOCK_USER_TRASH, + "Closed Tabs and Windows", "", + "Reopen a previously closed tab or window", NULL }, + { "TrashEmpty", GTK_STOCK_CLEAR, + "Empty Trash", "", + "hm?", G_CALLBACK (_action_trash_empty_activate) }, + + { "Bookmarks", NULL, "_Bookmarks" }, + { "BookmarkNew", STOCK_BOOKMARK_NEW, + NULL, "d", + "hm?", G_CALLBACK (_action_bookmark_new_activate) }, + { "BookmarksManage", NULL, + "_Manage Bookmarks", "b", + "hm?", NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, + { "BookmarkOpen", GTK_STOCK_OPEN, + NULL, "", + "hm?", G_CALLBACK (_action_bookmark_open_activate) }, + { "BookmarkOpenTab", STOCK_TAB_NEW, + "Open in New _Tab", "", + "hm?", G_CALLBACK (_action_bookmark_open_tab_activate) }, + { "BookmarkOpenWindow", STOCK_WINDOW_NEW, + "Open in New _Window", "", + "hm?", G_CALLBACK (_action_bookmark_open_window_activate) }, + { "BookmarkEdit", GTK_STOCK_EDIT, + NULL, "", + "hm?", G_CALLBACK (_action_bookmark_edit_activate) }, + { "BookmarkDelete", GTK_STOCK_DELETE, + NULL, "", + "hm?", G_CALLBACK (_action_bookmark_delete_activate) }, + + { "Tools", NULL, "_Tools" }, + { "ManageSearchEngines", GTK_STOCK_PROPERTIES, + "_Manage Search Engines", "s", + "Add, edit and remove search engines...", + G_CALLBACK (_action_manage_search_engines_activate) }, + + { "Window", NULL, "_Window" }, + { "TabPrevious", GTK_STOCK_GO_BACK, + "_Previous Tab", "Page_Up", + "hm?", G_CALLBACK (_action_tab_previous_activate) }, + { "TabNext", GTK_STOCK_GO_FORWARD, + "_Next Tab", "Page_Down", + "hm?", G_CALLBACK (_action_tab_next_activate) }, + { "TabOverview", NULL, + "Tab _Overview", "", + "hm?", NULL/*G_CALLBACK (_action_tab_overview_activate)*/ }, + + { "Help", NULL, "_Help" }, + { "HelpContents", GTK_STOCK_HELP, + "_Contents", "F1", + "hm?", NULL/*G_CALLBACK (_action_help_contents_activate)*/ }, + { "About", GTK_STOCK_ABOUT, + NULL, "", + "hm?", G_CALLBACK (_action_about_activate) }, + }; + static const guint entries_n = G_N_ELEMENTS(entries); + +static const GtkToggleActionEntry toggle_entries[] = { + { "PrivateBrowsing", NULL, + "P_rivate Browsing", "", + "hm?", NULL/*G_CALLBACK (_action_private_browsing_activate)*/, + FALSE }, + { "WorkOffline", GTK_STOCK_DISCONNECT, + "_Work Offline", "", + "hm?", NULL/*G_CALLBACK (_action_work_offline_activate)*/, + FALSE }, + + { "Navigationbar", NULL, + "_Navigationbar", "", + "hm?", G_CALLBACK (_action_navigationbar_activate), + FALSE }, + { "Panel", NULL, + "_Panel", "F9", + "hm?", G_CALLBACK (_action_panel_activate), + FALSE }, + { "Bookmarkbar", NULL, + "_Bookmarkbar", "", + "hm?", G_CALLBACK (_action_bookmarkbar_activate), + FALSE }, + { "Downloadbar", NULL, + "_Downloadbar", "", + "hm?", NULL/*G_CALLBACK (_action_downloadbar_activate)*/, + FALSE }, + { "Statusbar", NULL, + "_Statusbar", "", + "hm?", G_CALLBACK (_action_statusbar_activate), + FALSE }, + }; + static const guint toggle_entries_n = G_N_ELEMENTS(toggle_entries); + +static void +midori_browser_window_state_event_cb (MidoriBrowser* browser, + GdkEventWindowState* event) +{ + MidoriBrowserPrivate* priv = browser->priv; + + if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) + { + if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) + { + gtk_widget_hide (priv->menubar); + g_object_set (priv->button_fullscreen, + "stock-id", GTK_STOCK_LEAVE_FULLSCREEN, NULL); + gtk_widget_show (priv->button_fullscreen); + } + else + { + gtk_widget_show (priv->menubar); + gtk_widget_hide (priv->button_fullscreen); + g_object_set (priv->button_fullscreen, + "stock-id", GTK_STOCK_FULLSCREEN, NULL); + } + } +} + +static void +midori_browser_size_allocate_cb (MidoriBrowser* browser, + GtkAllocation* allocation) +{ + GtkWidget* widget = GTK_WIDGET (browser); + + if (GTK_WIDGET_REALIZED (widget)) + { + GdkWindowState state = gdk_window_get_state (widget->window); + if (!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + { + config->winWidth = allocation->width; + config->winHeight = allocation->height; + } + } +} + +static const gchar* ui_markup = + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + // Closed tabs shall be prepended here + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + // Bookmarks shall be appended here + "" + "" + "" + // Panel items shall be appended here + "" + "" + "" + "" + "" + "" + // All open tabs shall be appended here + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + ""; + +static void +midori_browser_init (MidoriBrowser* browser) +{ + browser->priv = MIDORI_BROWSER_GET_PRIVATE (browser); + + MidoriBrowserPrivate* priv = browser->priv; + + // Setup the window metrics + g_signal_connect (browser, "window-state-event", + G_CALLBACK (midori_browser_window_state_event_cb), NULL); + GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (browser)); + const gint default_width = (gint)gdk_screen_get_width (screen) / 1.7; + const gint default_height = (gint)gdk_screen_get_height (screen) / 1.7; + if (config->rememberWinSize) + { + if (!config->winWidth && !config->winHeight) + { + config->winWidth = default_width; + config->winHeight = default_width; + } + gtk_window_set_default_size (GTK_WINDOW (browser), + config->winWidth, config->winHeight); + } + else + gtk_window_set_default_size (GTK_WINDOW(browser), + default_width, default_height); + g_signal_connect (browser, "size-allocate", + G_CALLBACK (midori_browser_size_allocate_cb), NULL); + // FIXME: Use custom program icon + gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); + gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ()); + GtkWidget* vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (browser), vbox); + gtk_widget_show (vbox); + + // Let us see some ui manager magic + priv->action_group = gtk_action_group_new ("Browser"); + gtk_action_group_add_actions (priv->action_group, + entries, entries_n, browser); + gtk_action_group_add_toggle_actions (priv->action_group, + toggle_entries, toggle_entries_n, browser); + GtkUIManager* ui_manager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (ui_manager, priv->action_group, 0); + gtk_window_add_accel_group (GTK_WINDOW (browser), + gtk_ui_manager_get_accel_group (ui_manager)); + + GError* error = NULL; + if (!gtk_ui_manager_add_ui_from_string(ui_manager, ui_markup, -1, &error)) + { + // TODO: Should this be a message dialog? When does this happen? + g_message ("User interface couldn't be created: %s", error->message); + g_error_free (error); + } + + GtkAction* action; + // Make all actions except toplevel menus which lack a callback insensitive + // This will vanish once all actions are implemented + guint i; + for (i = 0; i < entries_n; i++) + { + action = gtk_action_group_get_action(priv->action_group, + entries[i].name); + gtk_action_set_sensitive (action, + entries[i].callback || !entries[i].tooltip); + } + for (i = 0; i < toggle_entries_n; i++) + { + action = gtk_action_group_get_action (priv->action_group, + toggle_entries[i].name); + gtk_action_set_sensitive (action, toggle_entries[i].callback != NULL); + } + + //_action_set_active(browser, "Downloadbar", config->toolbarDownloads); + + // Create the menubar + priv->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); + GtkWidget* menuitem = gtk_menu_item_new(); + gtk_widget_show (menuitem); + priv->throbber = katze_throbber_new(); + gtk_widget_show(priv->throbber); + gtk_container_add (GTK_CONTAINER (menuitem), priv->throbber); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menubar), menuitem); + gtk_box_pack_start (GTK_BOX (vbox), priv->menubar, FALSE, FALSE, 0); + menuitem = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Trash"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_menu_trash_activate_cb), + browser); + priv->menu_bookmarks = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( + gtk_ui_manager_get_widget (ui_manager, "/menubar/Bookmarks"))); + menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_bookmarks), menuitem); + priv->popup_bookmark = gtk_ui_manager_get_widget ( + ui_manager, "/popup_bookmark"); + g_object_ref (priv->popup_bookmark); + priv->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( + gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); + menuitem = gtk_separator_menu_item_new(); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_tools), menuitem); + priv->menu_window = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( + gtk_ui_manager_get_widget (ui_manager, "/menubar/Window"))); + menuitem = gtk_separator_menu_item_new(); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); + gtk_widget_show (priv->menubar); + _action_set_sensitive (browser, "PrivateBrowsing", FALSE); + _action_set_sensitive (browser, "WorkOffline", FALSE); + + // Create the navigationbar + priv->navigationbar = gtk_ui_manager_get_widget ( + ui_manager, "/toolbar_navigation"); + gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), + config_to_toolbarstyle (config->toolbarStyle)); + GtkSettings* gtk_settings = gtk_widget_get_settings (priv->navigationbar); + g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", + G_CALLBACK (midori_browser_navigationbar_notify_style_cb), + browser); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), + config_to_toolbariconsize (config->toolbarSmall)); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (priv->navigationbar), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), priv->navigationbar, FALSE, FALSE, 0); + priv->button_tab_new = gtk_ui_manager_get_widget ( + ui_manager, "/toolbar_navigation/TabNew"); + g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); + + // Location + priv->location = sexy_icon_entry_new(); + entry_setup_completion (GTK_ENTRY (priv->location)); + priv->location_icon = gtk_image_new (); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->location) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (priv->location_icon)); + sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (priv->location)); + g_signal_connect (priv->location, "key-press-event", + G_CALLBACK (midori_browser_location_key_press_event_cb), + browser); + g_signal_connect (priv->location, "changed", + G_CALLBACK (midori_browser_location_changed_cb), browser); + GtkToolItem* toolitem = gtk_tool_item_new (); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + gtk_container_add (GTK_CONTAINER(toolitem), priv->location); + gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); + + // Search + priv->search = sexy_icon_entry_new (); + sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (priv->search), + SEXY_ICON_ENTRY_PRIMARY, TRUE); + // TODO: Make this actively resizable or enlarge to fit contents? + // FIXME: The interface is somewhat awkward and ought to be rethought + // TODO: Display "show in context menu" search engines as "completion actions" + entry_setup_completion (GTK_ENTRY (priv->search)); + update_searchEngine (config->searchEngine, priv->search); + g_object_connect (priv->search, + "signal::icon-released", + on_webSearch_icon_released, browser, + "signal::key-press-event", + on_webSearch_key_down, browser, + "signal::scroll-event", + on_webSearch_scroll, browser, + "signal::activate", + on_webSearch_activate, browser, + NULL); + toolitem = gtk_tool_item_new (); + gtk_container_add (GTK_CONTAINER (toolitem), priv->search); + gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); + action = gtk_action_group_get_action (priv->action_group, "Trash"); + priv->button_trash = gtk_action_create_tool_item (action); + g_signal_connect (priv->button_trash, "clicked", + G_CALLBACK (midori_browser_menu_trash_activate_cb), browser); + gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), + GTK_TOOL_ITEM (priv->button_trash), -1); + sokoke_container_show_children (GTK_CONTAINER (priv->navigationbar)); + action = gtk_action_group_get_action (priv->action_group, "Fullscreen"); + priv->button_fullscreen = gtk_action_create_tool_item (action); + gtk_widget_hide (priv->button_fullscreen); + g_signal_connect (priv->button_fullscreen, "clicked", + G_CALLBACK (_action_fullscreen_activate), browser); + gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), + GTK_TOOL_ITEM (priv->button_fullscreen), -1); + _action_set_active (browser, "Navigationbar", config->toolbarNavigation); + + // Bookmarkbar + priv->bookmarkbar = gtk_toolbar_new (); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->bookmarkbar), + GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style (GTK_TOOLBAR(priv->bookmarkbar), + GTK_TOOLBAR_BOTH_HORIZ); + _midori_browser_create_bookmark_menu (browser, bookmarks, + priv->menu_bookmarks); + for (i = 0; i < katze_xbel_folder_get_n_items (bookmarks); i++) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (bookmarks, i); + const gchar* title = katze_xbel_item_is_separator (item) + ? "" : katze_xbel_item_get_title (item); + const gchar* desc = katze_xbel_item_is_separator (item) + ? "" : katze_xbel_item_get_desc (item); + switch (katze_xbel_item_get_kind (item)) + { + case KATZE_XBEL_ITEM_KIND_FOLDER: + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + gtk_tool_item_set_is_important(toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb), + browser); + sokoke_tool_item_set_tooltip_text(toolitem, desc); + g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); + break; + case KATZE_XBEL_ITEM_KIND_BOOKMARK: + toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + gtk_tool_item_set_is_important(toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), + browser); + sokoke_tool_item_set_tooltip_text(toolitem, desc); + g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); + break; + case KATZE_XBEL_ITEM_KIND_SEPARATOR: + toolitem = gtk_separator_tool_item_new (); + break; + default: + g_warning ("Unknown item kind"); + } + gtk_toolbar_insert (GTK_TOOLBAR (priv->bookmarkbar), toolitem, -1); + } + sokoke_container_show_children (GTK_CONTAINER (priv->bookmarkbar)); + gtk_box_pack_start (GTK_BOX (vbox), priv->bookmarkbar, FALSE, FALSE, 0); + _action_set_active (browser, "Bookmarkbar", config->toolbarBookmarks); + + // Superuser warning + GtkWidget* hbox; + if ((hbox = sokoke_superuser_warning_new ())) + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + + // Create the panel + GtkWidget* hpaned = gtk_hpaned_new (); + gtk_paned_set_position (GTK_PANED (hpaned), config->winPanelPos); + g_signal_connect (hpaned, "notify::position", + G_CALLBACK (midori_panel_notify_position_cb), + browser); + gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show (hpaned); + priv->panel = g_object_new (MIDORI_TYPE_PANEL, + "shadow-type", GTK_SHADOW_IN, + "menu", priv->menu_tools, + NULL); + g_signal_connect (priv->panel, "close", + G_CALLBACK (midori_panel_close_cb), browser); + gtk_paned_pack1 (GTK_PANED (hpaned), priv->panel, FALSE, FALSE); + sokoke_widget_set_visible (priv->panel, config->panelShow); + _action_set_active (browser, "Panel", config->panelShow); + + // Bookmarks + GtkWidget* box = gtk_vbox_new (FALSE, 0); + GtkWidget* toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_bookmarks"); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); + gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkTreeStore* treestore = gtk_tree_store_new (1, KATZE_TYPE_XBEL_ITEM); + GtkWidget* treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_browser_bookmarks_item_render_icon_cb, + treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_browser_bookmarks_item_render_text_cb, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + _tree_store_insert_folder (GTK_TREE_STORE (treestore), NULL, bookmarks); + g_object_unref (treestore); + g_object_connect (treeview, + "signal::row-activated", + midori_panel_bookmarks_row_activated_cb, browser, + "signal::cursor-changed", + midori_panel_bookmarks_cursor_or_row_changed_cb, browser, + "signal::columns-changed", + midori_panel_bookmarks_cursor_or_row_changed_cb, browser, + "signal::button-release-event", + midori_panel_bookmarks_button_release_event_cb, browser, + "signal::popup-menu", + midori_panel_bookmarks_popup_menu_cb, browser, + NULL); + midori_panel_bookmarks_cursor_or_row_changed_cb (GTK_TREE_VIEW (treeview), + browser); + gtk_box_pack_start (GTK_BOX (box), treeview, FALSE, FALSE, 0); + priv->panel_bookmarks = treeview; + gtk_widget_show_all (box); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + box, "vcard", "Bookmarks"); + action = _action_by_name (browser, "PanelBookmarks"); + + // Downloads + priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", "about:blank", + NULL); + gtk_widget_show (priv->panel_pageholder); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + priv->panel_pageholder, + "package", "Downloads"); + + // Console + priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", "about:blank", + NULL); + gtk_widget_show (priv->panel_pageholder); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + priv->panel_pageholder, + "terminal", "Console"); + + // History + priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", "about:blank", + NULL); + gtk_widget_show (priv->panel_pageholder); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + priv->panel_pageholder, + "document-open-recent", "History"); + + // Pageholder + priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", config->panelPageholder, + NULL); + gtk_widget_show (priv->panel_pageholder); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + priv->panel_pageholder, + GTK_STOCK_CONVERT, "Pageholder"); + + midori_panel_set_current_page (MIDORI_PANEL (priv->panel), + config->panelActive); + sokoke_widget_set_visible (priv->panel, config->panelShow); + + // Notebook, containing all web_views + priv->notebook = gtk_notebook_new (); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); + gtk_paned_pack2 (GTK_PANED (hpaned), priv->notebook, FALSE, FALSE); + g_signal_connect_after (priv->notebook, "switch-page", + G_CALLBACK (gtk_notebook_switch_page_cb), + browser); + gtk_widget_show (priv->notebook); + + // Incremental findbar + priv->find = gtk_toolbar_new (); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->find), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style (GTK_TOOLBAR (priv->find), GTK_TOOLBAR_BOTH_HORIZ); + toolitem = gtk_tool_item_new (); + gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); + gtk_container_add (GTK_CONTAINER (toolitem), + gtk_label_new_with_mnemonic ("_Inline find:")); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + priv->find_text = sexy_icon_entry_new (); + GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, + GTK_ICON_SIZE_MENU); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY(priv->find_text), + SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY(priv->find_text)); + g_signal_connect (priv->find_text, "activate", + G_CALLBACK (_action_find_next_activate), browser); + toolitem = gtk_tool_item_new (); + gtk_container_add (GTK_CONTAINER (toolitem), priv->find_text); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR(priv->find), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (_action_find_previous_activate), browser); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (_action_find_next_activate), browser); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + priv->find_case = gtk_toggle_tool_button_new_from_stock ( + GTK_STOCK_SPELL_CHECK); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->find_case), "Match Case"); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->find_case), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), priv->find_case, -1); + priv->find_highlight = gtk_toggle_tool_button_new_from_stock ( + GTK_STOCK_SELECT_ALL); + g_signal_connect (priv->find_highlight, "toggled", + G_CALLBACK (_find_highlight_toggled), browser); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->find_highlight), + "Highlight Matches"); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->find_highlight), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), priv->find_highlight, -1); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw ( + GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), "Close Findbar"); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); + gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + sokoke_container_show_children (GTK_CONTAINER (priv->find)); + gtk_box_pack_start (GTK_BOX (vbox), priv->find, FALSE, FALSE, 0); + + // Statusbar + // TODO: fix children overlapping statusbar border + priv->statusbar = gtk_statusbar_new (); + gtk_box_pack_start (GTK_BOX (vbox), priv->statusbar, FALSE, FALSE, 0); + priv->progressbar = gtk_progress_bar_new (); + // Setting the progressbar's height to 1 makes it fit in the statusbar + gtk_widget_set_size_request (priv->progressbar, -1, 1); + gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar, + FALSE, FALSE, 3); + _action_set_active (browser, "Statusbar", config->toolbarStatus); + + g_object_unref (ui_manager); + + sokoke_widget_set_visible (priv->button_tab_new, config->toolbarNewTab); + sokoke_widget_set_visible (priv->search, config->toolbarWebSearch); + sokoke_widget_set_visible (priv->button_trash, config->toolbarClosedTabs); +} + +static void +midori_browser_finalize (GObject* object) +{ + MidoriBrowser* browser = MIDORI_BROWSER (object); + MidoriBrowserPrivate* priv = browser->priv; + + g_free (priv->uri); + g_free (priv->title); + g_free (priv->statusbar_text); + + if (priv->proxy_xbel_folder) + katze_xbel_item_unref (priv->proxy_xbel_folder); + + if (priv->settings) + g_object_unref (priv->settings); + if (priv->trash) + g_object_unref (priv->trash); + + G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); +} + +static void +midori_browser_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriBrowser* browser = MIDORI_BROWSER (object); + MidoriBrowserPrivate* priv = browser->priv; + + switch (prop_id) + { + case PROP_STATUSBAR_TEXT: + _midori_browser_set_statusbar_text (browser, g_value_get_string (value)); + break; + case PROP_SETTINGS: + katze_object_assign (priv->settings, g_value_get_object (value)); + g_object_ref (priv->settings); + // FIXME: Assign settings to each web view + break; + case PROP_TRASH: + ; // FIXME: Disconnect handlers + katze_object_assign (priv->trash, g_value_get_object (value)); + g_object_ref (priv->trash); + // FIXME: Connect to updates + _midori_browser_update_actions (browser); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_browser_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriBrowser* browser = MIDORI_BROWSER (object); + MidoriBrowserPrivate* priv = browser->priv; + + switch (prop_id) + { + case PROP_STATUSBAR_TEXT: + g_value_set_string (value, priv->statusbar_text); + break; + case PROP_SETTINGS: + g_value_set_object (value, priv->settings); + break; + case PROP_TRASH: + g_value_set_object (value, priv->trash); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_browser_new: + * + * Creates a new browser widget. + * + * A browser is a window with toolbars and one or multiple web views. + * + * Return value: a new #MidoriBrowser + **/ +GtkWidget* +midori_browser_new (void) +{ + MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, + NULL); + + return GTK_WIDGET (browser); +} + +/** + * midori_browser_append_tab: + * @browser: a #MidoriBrowser + * @widget: a tab + * + * Appends an arbitrary widget in the form of a new tab and creates an + * according item in the Window menu. + * + * Return value: the index of the new tab, or -1 in case of an error + **/ +gint +midori_browser_append_tab (MidoriBrowser* browser, + GtkWidget* widget) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), -1); + + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + GtkWidget* child; + GObjectClass* gobject_class = G_OBJECT_GET_CLASS (widget); + if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) + child = widget; + else + { + child = gtk_viewport_new (NULL, NULL); + gtk_widget_show (child); + gtk_container_add (GTK_CONTAINER (child), widget); + } + gtk_container_add (GTK_CONTAINER (scrolled), child); + gtk_widget_show (scrolled); + + GtkWidget* label = NULL; + GtkWidget* menuitem = NULL; + + if (MIDORI_IS_WEB_VIEW (widget)) + { + label = midori_web_view_get_proxy_tab_label (MIDORI_WEB_VIEW (widget)); + + menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); + + if (priv->proxy_xbel_folder) + { + KatzeXbelItem* xbel_item = midori_web_view_get_proxy_xbel_item ( + MIDORI_WEB_VIEW (widget)); + katze_xbel_item_ref (xbel_item); + katze_xbel_folder_append_item (priv->proxy_xbel_folder, xbel_item); + } + + g_object_connect (widget, + "signal::navigation-requested", + midori_web_view_navigation_requested_cb, browser, + "signal::load-started", + midori_web_view_load_started_cb, browser, + "signal::load-committed", + midori_web_view_load_committed_cb, browser, + "signal::progress-started", + midori_web_view_progress_started_cb, browser, + "signal::progress-changed", + midori_web_view_progress_changed_cb, browser, + "signal::progress-done", + midori_web_view_progress_done_cb, browser, + "signal::load-done", + midori_web_view_load_done_cb, browser, + "signal::title-changed", + midori_web_view_title_changed_cb, browser, + "signal::status-bar-text-changed", + midori_web_view_statusbar_text_changed_cb, browser, + "signal::element-motion", + midori_web_view_element_motion_cb, browser, + "signal::console-message", + midori_web_view_console_message_cb, browser, + "signal::close", + midori_web_view_close_cb, browser, + "signal::new-tab", + midori_web_view_new_tab_cb, browser, + "signal::new-window", + midori_web_view_new_window_cb, browser, + "signal::populate-popup", + midori_web_view_populate_popup_cb, browser, + "signal::leave-notify-event", + midori_web_view_leave_notify_event_cb, browser, + "signal::destroy", + midori_web_view_destroy_cb, browser, + NULL); + } + + if (menuitem) + { + gtk_widget_show (menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_window_menu_item_activate_cb), browser); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); + } + + guint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), scrolled, + label, n + 1); + #if GTK_CHECK_VERSION(2, 10, 0) + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), + scrolled, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), + scrolled, TRUE); + #endif + _midori_browser_update_actions (browser); + + n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + if (!config->openTabsInTheBackground) + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + return n; +} + +/** + * midori_browser_remove_tab: + * @browser: a #MidoriBrowser + * @widget: a tab + * + * Removes an existing tab from the browser, including an associated menu item. + **/ +void +midori_browser_remove_tab (MidoriBrowser* browser, + GtkWidget* widget) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); + gtk_container_remove (GTK_CONTAINER (priv->notebook), scrolled); + + // FIXME: Remove the menuitem if this is a web view +} + +/** + * midori_browser_append_xbel_item: + * @browser: a #MidoriBrowser + * @xbel_item: a bookmark + * + * Appends a #KatzeXbelItem in the form of a new tab. + * + * Return value: the index of the new tab, or -1 in case of an error + **/ +gint +midori_browser_append_xbel_item (MidoriBrowser* browser, + KatzeXbelItem* xbel_item) +{ + MidoriBrowserPrivate* priv = browser->priv; + + g_return_val_if_fail (katze_xbel_item_is_bookmark (xbel_item), -1); + + const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); + const gchar* title = katze_xbel_item_get_title (xbel_item); + GtkWidget* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", uri, + "title", title, + "settings", priv->settings, + NULL); + gtk_widget_show (web_view); + + return midori_browser_append_tab (browser, web_view); +} + +/** + * midori_browser_append_uri: + * + * Appends an uri in the form of a new tab. + * + * Return value: the index of the new tab, or -1 + **/ +gint +midori_browser_append_uri (MidoriBrowser* browser, + const gchar* uri) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", uri, + "settings", priv->settings, + NULL); + gtk_widget_show (web_view); + + return midori_browser_append_tab (browser, web_view); +} + +/** + * midori_browser_get_current_page: + * @browser: a #MidoriBrowser + * + * Determines the currently selected page. + * + * If there is no page present at all, %NULL is returned. + * + * Return value: the selected page, or %NULL + **/ +GtkWidget* +midori_browser_get_current_page (MidoriBrowser* browser) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + MidoriBrowserPrivate* priv = browser->priv; + + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + GtkWidget* widget = _midori_browser_child_for_scrolled (browser, + gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n)); + return widget; +} + +/** + * midori_browser_get_current_web_view: + * @browser: a #MidoriBrowser + * + * Determines the currently selected web view. + * + * If there is no web view selected or if there is no tab present + * at all, %NULL is returned. + * + * See also midori_browser_get_current_page + * + * Return value: the selected web view, or %NULL + **/ +GtkWidget* +midori_browser_get_current_web_view (MidoriBrowser* browser) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + GtkWidget* web_view = midori_browser_get_current_page (browser); + return MIDORI_IS_WEB_VIEW (web_view) ? web_view : NULL; +} + +/** + * midori_browser_get_proxy_xbel_folder: + * @browser: a #MidoriBrowser + * + * Retrieves a proxy xbel folder representing the respective proxy xbel items + * of the present web views that can be used for session management. + * + * The folder is created on the first call and will be updated to reflect + * changes to all items automatically. + * + * Note that this implicitly creates proxy xbel items of all web views. + * + * Return value: the proxy #KatzeXbelItem + **/ +KatzeXbelItem* +midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + MidoriBrowserPrivate* priv = browser->priv; + + if (!priv->proxy_xbel_folder) + { + priv->proxy_xbel_folder = katze_xbel_folder_new (); + // FIXME: Fill in xbel items of all present web views + } + return priv->proxy_xbel_folder; +} diff --git a/src/midori-browser.h b/src/midori-browser.h new file mode 100644 index 00000000..1853563c --- /dev/null +++ b/src/midori-browser.h @@ -0,0 +1,90 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_BROWSER_H__ +#define __MIDORI_BROWSER_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_BROWSER \ + (midori_browser_get_type ()) +#define MIDORI_BROWSER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_BROWSER, MidoriBrowser)) +#define MIDORI_BROWSER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_BROWSER, MidoriBrowserClass)) +#define MIDORI_IS_BROWSER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_BROWSER)) +#define MIDORI_IS_BROWSER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_BROWSER)) +#define MIDORI_BROWSER_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_BROWSER, MidoriBrowserClass)) + +typedef struct _MidoriBrowser MidoriBrowser; +typedef struct _MidoriBrowserPrivate MidoriBrowserPrivate; +typedef struct _MidoriBrowserClass MidoriBrowserClass; + +struct _MidoriBrowser +{ + GtkWindow parent_instance; + + MidoriBrowserPrivate* priv; +}; + +struct _MidoriBrowserClass +{ + GtkWindowClass parent_class; + + /* Signals */ + void + (*quit) (MidoriBrowser* browser); + void + (*new_window) (MidoriBrowser* browser, + const gchar* uri); +}; + +GType +midori_browser_get_type (void); + +GtkWidget* +midori_browser_new (void); + +gint +midori_browser_append_tab (MidoriBrowser* browser, + GtkWidget* widget); + +void +midori_browser_remove_tab (MidoriBrowser* browser, + GtkWidget* widget); + +gint +midori_browser_append_xbel_item (MidoriBrowser* browser, + KatzeXbelItem* xbel_item); + +gint +midori_browser_append_uri (MidoriBrowser* browser, + const gchar* uri); + +GtkWidget* +midori_browser_get_current_page (MidoriBrowser* browser); + +GtkWidget* +midori_browser_get_current_web_view (MidoriBrowser* browser); + +KatzeXbelItem* +midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser); + +G_END_DECLS + +#endif /* __MIDORI_BROWSER_H__ */ diff --git a/src/midori-panel.c b/src/midori-panel.c new file mode 100644 index 00000000..4ff42779 --- /dev/null +++ b/src/midori-panel.c @@ -0,0 +1,515 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-panel.h" + +#include "sokoke.h" + +G_DEFINE_TYPE (MidoriPanel, midori_panel, GTK_TYPE_HBOX) + +struct _MidoriPanelPrivate +{ + GtkWidget* toolbar; + GtkWidget* toolbar_label; + GtkWidget* frame; + GtkWidget* notebook; + GSList* group; + GtkMenu* menu; +}; + +#define MIDORI_PANEL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_PANEL, MidoriPanelPrivate)) + +enum +{ + PROP_0, + + PROP_SHADOW_TYPE, + PROP_MENU, + PROP_PAGE +}; + +enum { + CLOSE, + SWITCH_PAGE, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_panel_finalize (GObject* object); + +static void +midori_panel_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_panel_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static gboolean +midori_panel_close_cb (MidoriPanel* panel) +{ + gtk_widget_hide (GTK_WIDGET (panel)); + return FALSE; +} + +static void +midori_cclosure_marshal_BOOLEAN__VOID (GClosure* closure, GValue* return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) +{ + typedef gboolean(*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, + gpointer data2); + register GMarshalFunc_BOOLEAN__VOID callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + gboolean v_return; + + g_return_if_fail(return_value != NULL); + g_return_if_fail(n_param_values == 1); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer(param_values + 0); + } + else + { + data1 = g_value_peek_pointer(param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback); + v_return = callback(data1, data2); + g_value_set_boolean (return_value, v_return); +} + +static void +midori_panel_class_init (MidoriPanelClass* class) +{ + + signals[CLOSE] = g_signal_new ( + "close", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriPanelClass, close), + g_signal_accumulator_true_handled, + NULL, + midori_cclosure_marshal_BOOLEAN__VOID, + G_TYPE_BOOLEAN, 0); + + signals[SWITCH_PAGE] = g_signal_new ( + "switch-page", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriPanelClass, switch_page), + 0, + NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); + + class->close = midori_panel_close_cb; + + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_panel_finalize; + gobject_class->set_property = midori_panel_set_property; + gobject_class->get_property = midori_panel_get_property; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_SHADOW_TYPE, + g_param_spec_enum ( + "shadow-type", + "Shadow Type", + "Appearance of the shadow around each panel", + GTK_TYPE_SHADOW_TYPE, + GTK_SHADOW_NONE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_MENU, + g_param_spec_object ( + "menu", + "Menu", + "Menu to hold panel items", + GTK_TYPE_MENU, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_PAGE, + g_param_spec_int ( + "page", + "Page", + "The index of the current page", + -1, G_MAXINT, -1, + flags)); + + g_type_class_add_private (class, sizeof (MidoriPanelPrivate)); +} + +static void +midori_panel_button_close_clicked_cb (MidoriPanel* panel) +{ + g_signal_emit (panel, signals[CLOSE], 0); +} + +static void +midori_panel_init (MidoriPanel* panel) +{ + panel->priv = MIDORI_PANEL_GET_PRIVATE (panel); + + MidoriPanelPrivate* priv = panel->priv; + + // Create the sidebar + priv->toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (priv->toolbar), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->toolbar), + GTK_ICON_SIZE_BUTTON); + gtk_toolbar_set_orientation (GTK_TOOLBAR (priv->toolbar), + GTK_ORIENTATION_VERTICAL); + gtk_box_pack_start (GTK_BOX (panel), priv->toolbar, FALSE, FALSE, 0); + gtk_widget_show_all (priv->toolbar); + GtkWidget* vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (panel), vbox, TRUE, TRUE, 0); + + // Create the titlebar + GtkWidget* labelbar = gtk_toolbar_new (); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (labelbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style (GTK_TOOLBAR (labelbar), GTK_TOOLBAR_ICONS); + GtkToolItem* toolitem = gtk_tool_item_new (); + gtk_tool_item_set_expand (toolitem, TRUE); + priv->toolbar_label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (priv->toolbar_label), 0, 0.5); + gtk_container_add (GTK_CONTAINER (toolitem), priv->toolbar_label); + gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), "Close panel"); + sokoke_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), "Close panel"); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_panel_button_close_clicked_cb), panel); + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + gtk_box_pack_start (GTK_BOX (vbox), labelbar, FALSE, FALSE, 0); + gtk_widget_show_all (vbox); + + // Create the notebook + priv->notebook = gtk_notebook_new (); + gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE); + priv->frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (priv->frame), priv->notebook); + gtk_box_pack_start (GTK_BOX (vbox), priv->frame, TRUE, TRUE, 0); + gtk_widget_show_all (priv->frame); +} + +static void +midori_panel_finalize (GObject* object) +{ + MidoriPanel* panel = MIDORI_PANEL (object); + MidoriPanelPrivate* priv = panel->priv; + + if (priv->menu) + { + // FIXME: Remove all menu items + } + + G_OBJECT_CLASS (midori_panel_parent_class)->finalize (object); +} + +static void +midori_panel_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriPanel* panel = MIDORI_PANEL (object); + MidoriPanelPrivate* priv = panel->priv; + + switch (prop_id) + { + case PROP_SHADOW_TYPE: + gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), + g_value_get_enum (value)); + break; + case PROP_MENU: + katze_object_assign (priv->menu, g_value_get_object (value)); + // FIXME: Move existing items to the new menu + break; + case PROP_PAGE: + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), + g_value_get_int (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_panel_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriPanel* panel = MIDORI_PANEL (object); + MidoriPanelPrivate* priv = panel->priv; + + switch (prop_id) + { + case PROP_SHADOW_TYPE: + g_value_set_enum (value, + gtk_frame_get_shadow_type (GTK_FRAME (priv->frame))); + break; + case PROP_MENU: + g_value_set_object (value, priv->menu); + break; + case PROP_PAGE: + g_value_set_int (value, + gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook))); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_panel_new: + * + * Creates a new empty panel. + * + * Return value: a new #MidoriPanel + **/ +GtkWidget* +midori_panel_new (void) +{ + MidoriPanel* panel = g_object_new (MIDORI_TYPE_PANEL, + NULL); + + return GTK_WIDGET (panel); +} + +static void +midori_panel_menu_item_activate_cb (GtkWidget* widget, + MidoriPanel* panel) +{ + GtkWidget* child = g_object_get_data (G_OBJECT (widget), "page"); + guint n = midori_panel_page_num (panel, child); + midori_panel_set_current_page (panel, n); + g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); +} + +/** + * midori_panel_append_page: + * @panel: a #MidoriPanel + * @child: the child widget + * @icon: a stock ID or icon name, or %NULL + * @label: a string to use as the label, or %NULL + * + * Appends a new page to the panel. + * + * If @icon is an icon name, the according image is used as an + * icon for this page. + * + * If @label is given, it is used as the label of this page. + * + * In the case of an error, -1 is returned. + * + * Return value: the index of the new page, or -1 + **/ +gint +midori_panel_append_page (MidoriPanel* panel, + GtkWidget* child, + const gchar* icon, + const gchar* label) +{ + g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); + g_return_val_if_fail (GTK_IS_WIDGET (child), -1); + + MidoriPanelPrivate* priv = panel->priv; + + GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gtk_widget_show (scrolled); + GtkWidget* widget; + GObjectClass* gobject_class = G_OBJECT_GET_CLASS (child); + if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) + widget = child; + else + { + widget = gtk_viewport_new (NULL, NULL); + gtk_widget_show (widget); + gtk_container_add (GTK_CONTAINER (widget), child); + } + gtk_container_add (GTK_CONTAINER (scrolled), widget); + gtk_container_add (GTK_CONTAINER (priv->notebook), scrolled); + + guint n = midori_panel_page_num (panel, child); + + const gchar* text = label ? label : "Untitled"; + + GtkWidget* image; + GtkToolItem* toolitem = gtk_radio_tool_button_new (priv->group); + priv->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( + toolitem)); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), text); + if (icon) + { + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_BUTTON); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + } + g_object_set_data (G_OBJECT (toolitem), "page", child); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_panel_menu_item_activate_cb), panel); + gtk_widget_show_all (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (priv->toolbar), toolitem, -1); + + if (priv->menu) + { + GtkWidget* menuitem = gtk_image_menu_item_new_with_label (text); + if (icon) + { + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + image); + } + gtk_widget_show_all (menuitem); + g_object_set_data (G_OBJECT (menuitem), "page", child); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_panel_menu_item_activate_cb), + panel); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menuitem); + } + + return n; +} + +/** + * midori_panel_get_current_page: + * @panel: a #MidoriPanel + * + * Retrieves the index of the currently selected page. + * + * If @panel has no children, -1 is returned. + * + * Return value: the index of the current page, or -1 + **/ +gint +midori_panel_get_current_page (MidoriPanel* panel) +{ + g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); + + MidoriPanelPrivate* priv = panel->priv; + + return gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); +} + +/** + * midori_panel_get_nth_page: + * @panel: a #MidoriPanel + * + * Retrieves the child widget of the nth page. + * + * If @panel has no children, -1 is returned. + * + * Return value: the child widget of the new page, or -1 + **/ +GtkWidget* +midori_panel_get_nth_page (MidoriPanel* panel, + guint page_num) +{ + g_return_val_if_fail (MIDORI_IS_PANEL (panel), NULL); + + MidoriPanelPrivate* priv = panel->priv; + + return gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), page_num); +} + +/** + * midori_panel_get_n_pages: + * @panel: a #MidoriPanel + * + * Retrieves the number of pages contained in the panel. + * + * Return value: the number of pages + **/ +guint +midori_panel_get_n_pages (MidoriPanel* panel) +{ + g_return_val_if_fail (MIDORI_IS_PANEL (panel), 0); + + MidoriPanelPrivate* priv = panel->priv; + + return gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); +} + +static GtkWidget* +_midori_panel_scrolled_for_child (MidoriPanel* panel, + GtkWidget* child) +{ + GtkWidget* scrolled = gtk_widget_get_parent (GTK_WIDGET (child)); + if (GTK_IS_VIEWPORT (scrolled)) + scrolled = gtk_widget_get_parent (scrolled); + return scrolled; +} + +/** + * midori_panel_page_num: + * @panel: a #MidoriPanel + * + * Retrieves the index of the page associated to @widget. + * + * If @panel has no children, -1 is returned. + * + * Return value: the index of page associated to @widget, or -1 + **/ +gint +midori_panel_page_num (MidoriPanel* panel, + GtkWidget* child) +{ + g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); + + MidoriPanelPrivate* priv = panel->priv; + + GtkWidget* scrolled = _midori_panel_scrolled_for_child (panel, child); + return gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); +} + +/** + * midori_panel_set_current_page: + * @panel: a #MidoriPanel + * @n: index of the page to switch to, or -1 to mean the last page + * + * Switches to the page with the given index. + * + * The child must be visible, otherwise the underlying GtkNotebook will + * silently ignore the attempt to switch the page. + **/ +void +midori_panel_set_current_page (MidoriPanel* panel, + gint n) +{ + g_return_if_fail (MIDORI_IS_PANEL (panel)); + + MidoriPanelPrivate* priv = panel->priv; + + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); +} diff --git a/src/midori-panel.h b/src/midori-panel.h new file mode 100644 index 00000000..c4772039 --- /dev/null +++ b/src/midori-panel.h @@ -0,0 +1,90 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_PANEL_H__ +#define __MIDORI_PANEL_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_PANEL \ + (midori_panel_get_type ()) +#define MIDORI_PANEL(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PANEL, MidoriPanel)) +#define MIDORI_PANEL_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_PANEL, MidoriPanelClass)) +#define MIDORI_IS_PANEL(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PANEL)) +#define MIDORI_IS_PANEL_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_PANEL)) +#define MIDORI_PANEL_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PANEL, MidoriPanelClass)) + +typedef struct _MidoriPanel MidoriPanel; +typedef struct _MidoriPanelPrivate MidoriPanelPrivate; +typedef struct _MidoriPanelClass MidoriPanelClass; + +struct _MidoriPanel +{ + GtkFrame parent_instance; + + MidoriPanelPrivate* priv; +}; + +struct _MidoriPanelClass +{ + GtkFrameClass parent_class; + + /* Signals */ + gboolean + (*close) (MidoriPanel* panel); + + void + (*switch_page) (MidoriPanel* panel, + gint page); +}; + +GType +midori_panel_get_type (void); + +GtkWidget* +midori_panel_new (void); + +gint +midori_panel_append_page (MidoriPanel* panel, + GtkWidget* child, + const gchar* icon, + const gchar* label); + +gint +midori_panel_get_current_page (MidoriPanel* panel); + +GtkWidget* +midori_panel_get_nth_page (MidoriPanel* panel, + guint page_num); + +guint +midori_panel_get_n_pages (MidoriPanel* panel); + +gint +midori_panel_page_num (MidoriPanel* panel, + GtkWidget* child); + +void +midori_panel_set_current_page (MidoriPanel* panel, + gint n); + +G_END_DECLS + +#endif /* __MIDORI_PANEL_H__ */ diff --git a/src/midori-trash.c b/src/midori-trash.c new file mode 100644 index 00000000..d3f8f6a6 --- /dev/null +++ b/src/midori-trash.c @@ -0,0 +1,327 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-trash.h" + +#include "sokoke.h" + +G_DEFINE_TYPE (MidoriTrash, midori_trash, G_TYPE_OBJECT) + +struct _MidoriTrashPrivate +{ + guint limit; + KatzeXbelItem* xbel_folder; +}; + +#define MIDORI_TRASH_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_TRASH, MidoriTrashPrivate)) + +enum +{ + PROP_0, + + PROP_LIMIT +}; + +enum { + INSERTED, + REMOVED, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_trash_finalize (GObject* object); + +static void +midori_trash_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_trash_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_trash_class_init (MidoriTrashClass* class) +{ + signals[INSERTED] = g_signal_new( + "inserted", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriTrashClass, inserted), + 0, + NULL, + g_cclosure_marshal_VOID__UINT, + G_TYPE_NONE, 1, + G_TYPE_UINT); + + signals[REMOVED] = g_signal_new( + "removed", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriTrashClass, removed), + 0, + NULL, + g_cclosure_marshal_VOID__UINT, + G_TYPE_NONE, 1, + G_TYPE_UINT); + + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_trash_finalize; + gobject_class->set_property = midori_trash_set_property; + gobject_class->get_property = midori_trash_get_property; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_LIMIT, + g_param_spec_uint ( + "limit", + "Limit", + "The maximum number of items", + 0, G_MAXUINT, 10, + flags)); + + g_type_class_add_private (class, sizeof (MidoriTrashPrivate)); +} + + + +static void +midori_trash_init (MidoriTrash* trash) +{ + trash->priv = MIDORI_TRASH_GET_PRIVATE (trash); + + MidoriTrashPrivate* priv = trash->priv; + + priv->xbel_folder = katze_xbel_folder_new (); +} + +static void +midori_trash_finalize (GObject* object) +{ + MidoriTrash* trash = MIDORI_TRASH (object); + MidoriTrashPrivate* priv = trash->priv; + + katze_xbel_item_unref (priv->xbel_folder); + + G_OBJECT_CLASS (midori_trash_parent_class)->finalize (object); +} + +static void +midori_trash_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriTrash* trash = MIDORI_TRASH (object); + MidoriTrashPrivate* priv = trash->priv; + + switch (prop_id) + { + case PROP_LIMIT: + priv->limit = g_value_get_uint (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_trash_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriTrash* trash = MIDORI_TRASH (object); + MidoriTrashPrivate* priv = trash->priv; + + switch (prop_id) + { + case PROP_LIMIT: + g_value_set_uint (value, priv->limit); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_trash_new: + * @limit: the maximum number of items + * + * Creates a new #MidoriTrash that can contain a specified number of items, + * meaning that each additional item will replace the oldest existing item. + * + * The value 0 for @limit actually means that there is no limit. + * + * You will typically want to assign this to a #MidoriBrowser. + * + * Return value: a new #MidoriTrash + **/ +MidoriTrash* +midori_trash_new (guint limit) +{ + MidoriTrash* trash = g_object_new (MIDORI_TYPE_TRASH, + "limit", limit, + NULL); + + return trash; +} + +/** + * midori_trash_is_empty: + * @trash: a #MidoriTrash + * + * Determines whether the @trash contains no items. + * + * Return value: %TRUE if there are no items, %FALSE otherwise + **/ +gboolean +midori_trash_is_empty (MidoriTrash* trash) +{ + g_return_val_if_fail (MIDORI_IS_TRASH (trash), FALSE); + + MidoriTrashPrivate* priv = trash->priv; + + return katze_xbel_folder_is_empty (priv->xbel_folder); +} + +/** + * midori_trash_get_n_items: + * @trash: a #MidoriTrash + * + * Determines the number of items in @trash. + * + * Return value: the current number of items + **/ +guint +midori_trash_get_n_items (MidoriTrash* trash) +{ + g_return_val_if_fail (MIDORI_IS_TRASH (trash), 0); + + MidoriTrashPrivate* priv = trash->priv; + + return katze_xbel_folder_get_n_items (priv->xbel_folder); +} + +/** + * midori_trash_get_nth_xbel_item: + * @trash: a #MidoriTrash + * @n: the index of an item + * + * Retrieve an item contained in @trash by its index. + * + * Note that you mustn't unref this item. + * + * Return value: the index at the given index or %NULL + **/ +KatzeXbelItem* +midori_trash_get_nth_xbel_item (MidoriTrash* trash, + guint n) +{ + g_return_val_if_fail (MIDORI_IS_TRASH (trash), 0); + + MidoriTrashPrivate* priv = trash->priv; + + return katze_xbel_folder_get_nth_item (priv->xbel_folder, n); +} + +/** + * midori_trash_prepend_xbel_item: + * @trash: a #MidoriTrash + * @xbel_item: a #KatzeXbelItem + * + * Prepends a #KatzeXbelItem to @trash. + * + * The item is copied. If there is a limit set, the oldest item is + * removed automatically. + * + * Return value: %TRUE if there are no items, %FALSE otherwise + **/ +void +midori_trash_prepend_xbel_item (MidoriTrash* trash, + KatzeXbelItem* xbel_item) +{ + g_return_if_fail (MIDORI_IS_TRASH (trash)); + + MidoriTrashPrivate* priv = trash->priv; + + KatzeXbelItem* copy = katze_xbel_item_copy (xbel_item); + katze_xbel_folder_prepend_item (priv->xbel_folder, copy); + g_signal_emit (trash, signals[INSERTED], 0, 0); + guint n = katze_xbel_folder_get_n_items (priv->xbel_folder); + if (n > 10) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (priv->xbel_folder, + n - 1); + g_signal_emit (trash, signals[REMOVED], 0, n - 1); + katze_xbel_item_unref (item); + } +} + +/** + * midori_trash_remove_nth_item: + * @trash: a #MidoriTrash + * @n: the index of an item + * + * Removes the item at the specified position from @trash. + * + * Nothing happens if the function fails. + **/ +void +midori_trash_remove_nth_item (MidoriTrash* trash, + guint n) +{ + g_return_if_fail (MIDORI_IS_TRASH (trash)); + + MidoriTrashPrivate* priv = trash->priv; + + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (priv->xbel_folder, n); + if (!n) + return; + katze_xbel_folder_remove_item (priv->xbel_folder, item); + g_signal_emit (trash, signals[REMOVED], 0, n); + katze_xbel_item_unref (item); +} + +/** + * midori_trash_empty: + * @trash: a #MidoriTrash + * + * Deletes all items currently contained in @trash. + **/ +void +midori_trash_empty (MidoriTrash* trash) +{ + g_return_if_fail (MIDORI_IS_TRASH (trash)); + + MidoriTrashPrivate* priv = trash->priv; + + guint n = katze_xbel_folder_get_n_items (priv->xbel_folder); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (priv->xbel_folder, + i); + g_signal_emit (trash, signals[REMOVED], 0, i); + katze_xbel_item_unref (item); + } +} diff --git a/src/midori-trash.h b/src/midori-trash.h new file mode 100644 index 00000000..bc711792 --- /dev/null +++ b/src/midori-trash.h @@ -0,0 +1,85 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_TRASH_H__ +#define __MIDORI_TRASH_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_TRASH \ + (midori_trash_get_type ()) +#define MIDORI_TRASH(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_TRASH, MidoriTrash)) +#define MIDORI_TRASH_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_TRASH, MidoriTrashClass)) +#define MIDORI_IS_TRASH(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_TRASH)) +#define MIDORI_IS_TRASH_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_TRASH)) +#define MIDORI_TRASH_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_TRASH, MidoriTrashClass)) + +typedef struct _MidoriTrash MidoriTrash; +typedef struct _MidoriTrashPrivate MidoriTrashPrivate; +typedef struct _MidoriTrashClass MidoriTrashClass; + +struct _MidoriTrash +{ + GObject parent_instance; + + MidoriTrashPrivate* priv; +}; + +struct _MidoriTrashClass +{ + GObjectClass parent_class; + + /* Signals */ + void + (*inserted) (MidoriTrash* trash, + guint n); + void + (*removed) (MidoriTrash* trash, + guint n); +}; + +GType +midori_trash_get_type (void); + +MidoriTrash* +midori_trash_new (guint limit); + +gboolean +midori_trash_is_empty (MidoriTrash* trash); + +guint +midori_trash_get_n_items (MidoriTrash* trash); + +KatzeXbelItem* +midori_trash_get_nth_xbel_item (MidoriTrash* trash, + guint n); + +void +midori_trash_prepend_xbel_item (MidoriTrash* trash, + KatzeXbelItem* xbel_item); + +void +midori_trash_remove_nth_item (MidoriTrash* trash, + guint n); + +void +midori_trash_empty (MidoriTrash* trash); + +G_END_DECLS + +#endif /* __MIDORI_TRASH_H__ */ diff --git a/src/midori-websettings.c b/src/midori-websettings.c new file mode 100644 index 00000000..0fd34ebd --- /dev/null +++ b/src/midori-websettings.c @@ -0,0 +1,200 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-webview.h" + +#include "sokoke.h" + +G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) + +struct _MidoriWebSettingsPrivate +{ + gint tab_label_size; + gboolean close_button; + gboolean middle_click_goto; +}; + +#define MIDORI_WEB_SETTINGS_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_WEB_SETTINGS, MidoriWebSettingsPrivate)) + +enum +{ + PROP_0, + + PROP_TAB_LABEL_SIZE, + PROP_CLOSE_BUTTON, + PROP_MIDDLE_CLICK_GOTO +}; + +static void +midori_web_settings_finalize (GObject* object); + +static void +midori_web_settings_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_web_settings_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_web_settings_class_init (MidoriWebSettingsClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_web_settings_finalize; + gobject_class->set_property = midori_web_settings_set_property; + gobject_class->get_property = midori_web_settings_get_property; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_TAB_LABEL_SIZE, + g_param_spec_int ( + "tab-label-size", + "Tab Label Size", + "The desired tab label size", + 0, G_MAXINT, 10, + flags)); + + g_object_class_install_property (gobject_class, + PROP_CLOSE_BUTTON, + g_param_spec_boolean ( + "close-button", + "Close Button", + "Whether the associated tab has a close button", + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_MIDDLE_CLICK_GOTO, + g_param_spec_boolean ( + "middle-click-goto", + "Middle Click Goto", + "Load an uri from the selection via middle click", + FALSE, + flags)); + + g_type_class_add_private (class, sizeof (MidoriWebSettingsPrivate)); +} + + + +static void +midori_web_settings_init (MidoriWebSettings* web_settings) +{ + web_settings->priv = MIDORI_WEB_SETTINGS_GET_PRIVATE (web_settings); +} + +static void +midori_web_settings_finalize (GObject* object) +{ + G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); +} + +static void +midori_web_settings_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); + MidoriWebSettingsPrivate* priv = web_settings->priv; + + switch (prop_id) + { + case PROP_TAB_LABEL_SIZE: + priv->tab_label_size = g_value_get_int (value); + break; + case PROP_CLOSE_BUTTON: + priv->close_button = g_value_get_boolean (value); + break; + case PROP_MIDDLE_CLICK_GOTO: + priv->middle_click_goto = g_value_get_boolean (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_web_settings_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); + MidoriWebSettingsPrivate* priv = web_settings->priv; + + switch (prop_id) + { + case PROP_TAB_LABEL_SIZE: + g_value_set_int (value, priv->tab_label_size); + break; + case PROP_CLOSE_BUTTON: + g_value_set_boolean (value, priv->close_button); + break; + case PROP_MIDDLE_CLICK_GOTO: + g_value_set_boolean (value, priv->middle_click_goto); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_web_settings_new: + * + * Creates a new #MidoriWebSettings instance with default values. + * + * You will typically want to assign this to a #MidoriWebView or #MidoriBrowser. + * + * Return value: a new #MidoriWebSettings + **/ +MidoriWebSettings* +midori_web_settings_new (void) +{ + MidoriWebSettings* web_settings = g_object_new (MIDORI_TYPE_WEB_SETTINGS, + NULL); + + return web_settings; +} + +/** + * midori_web_settings_copy: + * + * Copies an existing #MidoriWebSettings instance. + * + * Return value: a new #MidoriWebSettings + **/ +MidoriWebSettings* +midori_web_settings_copy (MidoriWebSettings* web_settings) +{ + g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (web_settings), NULL); + + MidoriWebSettingsPrivate* priv = web_settings->priv; + + MidoriWebSettings* copy; + copy = MIDORI_WEB_SETTINGS (webkit_web_settings_copy (WEBKIT_WEB_SETTINGS (web_settings))); + g_object_set (copy, + "tab-label-size", priv->tab_label_size, + "close-button", priv->close_button, + "middle-click-goto", priv->middle_click_goto, + NULL); + + return copy; +} diff --git a/src/midori-websettings.h b/src/midori-websettings.h new file mode 100644 index 00000000..8ea40206 --- /dev/null +++ b/src/midori-websettings.h @@ -0,0 +1,89 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_WEB_SETTINGS_H__ +#define __MIDORI_WEB_SETTINGS_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_WEB_SETTINGS \ + (midori_web_settings_get_type ()) +#define MIDORI_WEB_SETTINGS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_SETTINGS, MidoriWebSettings)) +#define MIDORI_WEB_SETTINGS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_SETTINGS, MidoriWebSettingsClass)) +#define MIDORI_IS_WEB_SETTINGS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_SETTINGS)) +#define MIDORI_IS_WEB_SETTINGS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_SETTINGS)) +#define MIDORI_WEB_SETTINGS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_SETTINGS, MidoriWebSettingsClass)) + +typedef struct _MidoriWebSettings MidoriWebSettings; +typedef struct _MidoriWebSettingsPrivate MidoriWebSettingsPrivate; +typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass; + +struct _MidoriWebSettings +{ + WebKitWebSettings parent_instance; + + MidoriWebSettingsPrivate* priv; +}; + +struct _MidoriWebSettingsClass +{ + WebKitWebSettingsClass parent_class; + + /* Signals */ + void + (*progress_started) (MidoriWebSettings* web_settings, + guint progress); + void + (*progress_changed) (MidoriWebSettings* web_settings, + guint progress); + void + (*progress_done) (MidoriWebSettings* web_settings, + guint progress); + void + (*load_done) (MidoriWebSettings* web_settings, + WebKitWebFrame* frame); + void + (*statusbar_text_changed) (MidoriWebSettings* web_settings, + const gchar* text); + void + (*element_motion) (MidoriWebSettings* web_settings, + const gchar* link_uri); + void + (*close) (MidoriWebSettings* web_settings); + void + (*new_tab) (MidoriWebSettings* web_settings, + const gchar* uri); + void + (*new_window) (MidoriWebSettings* web_settings, + const gchar* uri); +}; + +GType +midori_web_settings_get_type (void); + +MidoriWebSettings* +midori_web_settings_new (void); + +MidoriWebSettings* +midori_web_settings_copy (MidoriWebSettings* web_settings); + +G_END_DECLS + +#endif /* __MIDORI_WEB_SETTINGS_H__ */ diff --git a/src/midori-webview.c b/src/midori-webview.c new file mode 100644 index 00000000..60f33492 --- /dev/null +++ b/src/midori-webview.c @@ -0,0 +1,1039 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-webview.h" + +#include "sokoke.h" + +#include +#include + +G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) + +struct _MidoriWebViewPrivate +{ + GtkWidget* tab_icon; + GtkWidget* tab_label; + GtkWidget* tab_close; + GdkPixbuf* icon; + gchar* uri; + gchar* title; + gboolean is_loading; + gint progress; + gchar* statusbar_text; + gchar* link_uri; + + gint tab_label_size; + gboolean close_button; + gboolean middle_click_goto; + MidoriWebSettings* settings; + + GtkWidget* proxy_menu_item; + GtkWidget* proxy_tab_label; + KatzeXbelItem* proxy_xbel_item; +}; + +#define MIDORI_WEB_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_WEB_VIEW, MidoriWebViewPrivate)) + +enum +{ + PROP_0, + + PROP_ICON, + PROP_URI, + PROP_TITLE, + PROP_STATUSBAR_TEXT, + PROP_SETTINGS +}; + +enum { + LOAD_STARTED, + PROGRESS_STARTED, + PROGRESS_CHANGED, + PROGRESS_DONE, + LOAD_DONE, + ELEMENT_MOTION, + CLOSE, + NEW_TAB, + NEW_WINDOW, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_web_view_finalize (GObject* object); + +static void +midori_web_view_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_web_view_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +/*static WebKitWebView* +midori_web_view_create_web_view (WebKitWebView* web_view) +{ + MidoriWebView* new_web_view = NULL; + g_signal_emit (web_view, signals[NEW_WINDOW], 0, &new_web_view); + if (new_web_view) + return WEBKIT_WEB_VIEW (new_web_view); + return WEBKIT_WEB_VIEW (midori_web_view_new ()); +}*/ + +static void +midori_web_view_class_init (MidoriWebViewClass* class) +{ + signals[PROGRESS_STARTED] = g_signal_new ( + "progress-started", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, progress_started), + 0, + NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); + + signals[PROGRESS_CHANGED] = g_signal_new ( + "progress-changed", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, progress_changed), + 0, + NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); + + signals[PROGRESS_DONE] = g_signal_new ( + "progress-done", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, progress_done), + 0, + NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); + + signals[LOAD_DONE] = g_signal_new ( + "load-done", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, load_done), + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + WEBKIT_TYPE_WEB_FRAME); + + signals[ELEMENT_MOTION] = g_signal_new( + "element-motion", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, element_motion), + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + signals[CLOSE] = g_signal_new( + "close", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, close), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[NEW_TAB] = g_signal_new( + "new-tab", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, new_tab), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[NEW_WINDOW] = g_signal_new( + "new-window", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebViewClass, new_window), + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + /*WEBKIT_WEB_VIEW_CLASS (class)->create_web_view = g_signal_new ("create-web-view", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET(MidoriWebViewClass, create_web_view), + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + MIDORI_TYPE_WEB_VIEW);*/ + + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_web_view_finalize; + gobject_class->set_property = midori_web_view_set_property; + gobject_class->get_property = midori_web_view_get_property; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_ICON, + g_param_spec_object ( + "icon", + "Icon", + "The icon of the loaded page", + GDK_TYPE_PIXBUF, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_URI, + g_param_spec_string ( + "uri", + "Uri", + "The current uri of the loaded page", + "about:blank", + flags)); + + g_object_class_install_property (gobject_class, + PROP_TITLE, + g_param_spec_string ( + "title", + "Title", + "The current title of the loaded page", + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_STATUSBAR_TEXT, + g_param_spec_string ( + "statusbar-text", + "Statusbar Text", + "The text that is displayed in the statusbar", + "", + flags)); + + g_object_class_install_property (gobject_class, + PROP_SETTINGS, + g_param_spec_object ( + "settings", + "Settings", + "The associated settings", + MIDORI_TYPE_WEB_SETTINGS, + G_PARAM_READWRITE)); + + g_type_class_add_private (class, sizeof (MidoriWebViewPrivate)); +} + +/*static void +webkit_web_view_load_started (MidoriWebView* web_view, + WebKitWebFrame* web_frame) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + priv->is_loading = TRUE; + priv->progress = -1; + katze_throbber_set_animated(KATZE_THROBBER(priv->tab_icon), TRUE); +}*/ + +static void +_midori_web_view_set_uri (MidoriWebView* web_view, + const gchar* uri) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + katze_assign (priv->uri, g_strdup (uri)); + if (priv->proxy_xbel_item) + { + const gchar* uri = midori_web_view_get_display_uri (web_view); + katze_xbel_bookmark_set_href (priv->proxy_xbel_item, uri); + } + g_object_set (web_view, "title", NULL, NULL); +} + +static void +webkit_web_view_load_committed (MidoriWebView* web_view, + WebKitWebFrame* web_frame) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + priv->progress = 0; + const gchar* uri = webkit_web_frame_get_uri (web_frame); + _midori_web_view_set_uri (web_view, uri); +} + +static void +webkit_web_view_load_started (MidoriWebView* web_view, + WebKitWebFrame* web_frame) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + // FIXME: This is a hack, until signals are fixed upstream + priv->is_loading = TRUE; + if (priv->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), TRUE); + + priv->progress = 0; + g_signal_emit (web_view, signals[PROGRESS_STARTED], 0, priv->progress); +} + +static void +webkit_web_view_progress_changed (MidoriWebView* web_view, gint progress) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + priv->progress = progress; + g_signal_emit (web_view, signals[PROGRESS_CHANGED], 0, priv->progress); +} + +static void +webkit_web_view_load_finished (MidoriWebView* web_view) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + priv->progress = 100; + g_signal_emit (web_view, signals[PROGRESS_DONE], 0, priv->progress); +} + +static void +webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, + MidoriWebView* web_view) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + priv->is_loading = FALSE; + priv->progress = -1; + if (priv->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), FALSE); + g_signal_emit (web_view, signals[LOAD_DONE], 0, web_frame); +} + +static void +webkit_web_view_title_changed (MidoriWebView* web_view, + WebKitWebFrame* web_frame, const gchar* title) +{ + g_object_set (web_view, "title", title, NULL); +} + +static void +webkit_web_view_statusbar_text_changed (MidoriWebView* web_view, + const gchar* text) +{ + g_object_set (web_view, "statusbar-text", text, NULL); +} + +static void +webkit_web_view_hovering_over_link (MidoriWebView* web_view, + const gchar* tooltip, + const gchar* link_uri) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + katze_assign (priv->link_uri, g_strdup (link_uri)); + g_signal_emit (web_view, signals[ELEMENT_MOTION], 0, link_uri); +} + +static gboolean +gtk_widget_button_press_event (MidoriWebView* web_view, + GdkEventButton* event) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + GdkModifierType state = (GdkModifierType)0; + gint x, y; + gdk_window_get_pointer (NULL, &x, &y, &state); + switch (event->button) + { + case 1: + if (!priv->link_uri) + return FALSE; + if (state & GDK_SHIFT_MASK) + { + // Open link in new window + g_signal_emit (web_view, signals[NEW_WINDOW], 0, priv->link_uri); + return TRUE; + } + else if(state & GDK_MOD1_MASK) + { + // Open link in new tab + g_signal_emit (web_view, signals[NEW_TAB], 0, priv->link_uri); + return TRUE; + } + break; + case 2: + if (state & GDK_CONTROL_MASK) + { + // FIXME: Reset font multiplier or zoom level + return TRUE; + } + else + { + if (!priv->link_uri) + return FALSE; + // Open link in new tab + g_signal_emit (web_view, signals[NEW_TAB], 0, priv->link_uri); + return TRUE; + } + break; + case 3: + return FALSE; + } + return FALSE; +} + +static gboolean +gtk_widget_button_press_event_after (MidoriWebView* web_view, + GdkEventButton* event) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + if (event->button == 2 && priv->middle_click_goto) + { + GtkClipboard* clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + gchar* uri = gtk_clipboard_wait_for_text (clipboard); + if (uri && strchr (uri, '.') && !strchr (uri, ' ')) + { + g_object_set (web_view, "uri", uri, NULL); + g_free (uri); + return TRUE; + } + } + return FALSE; +} + +static gboolean +gtk_widget_scroll_event (MidoriWebView* web_view, + GdkEventScroll* event) +{ + GdkModifierType state = (GdkModifierType)0; + gint x, y; + gdk_window_get_pointer (NULL, &x, &y, &state); + if (state & GDK_CONTROL_MASK) + { + // FIXME: Increase or decrease the font multiplier or zoom level + if (event->direction == GDK_SCROLL_DOWN) + ; + else if(event->direction == GDK_SCROLL_UP) + ; + return TRUE; + } + else + return FALSE; +} + +static void +midori_web_view_menu_new_tab_activate (GtkWidget* action, + MidoriBrowser* browser) +{ + // FIXME: Open a new tab and load the uri +} + +static void +webkit_web_view_populate_popup_cb (GtkWidget* web_view, + GtkWidget* menu) +{ + const gchar* uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); + if (uri) + { + // new tab + } + + if (webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + { + // selected uri in tab + } +} + +static void +_midori_web_view_update_tab_label_size (MidoriWebView* web_view) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + if (priv->tab_label) + { + if (priv->tab_label_size > -1) + { + gint width, height; + sokoke_widget_get_text_size (priv->tab_label, "M", + &width, &height); + gtk_widget_set_size_request (priv->tab_label, + width * priv->tab_label_size, -1); + gtk_label_set_ellipsize (GTK_LABEL (priv->tab_label), + PANGO_ELLIPSIZE_END); + } + else + { + gtk_widget_set_size_request (priv->tab_label, -1, -1); + gtk_label_set_ellipsize (GTK_LABEL (priv->tab_label), + PANGO_ELLIPSIZE_NONE); + } + } +} + +static void +_midori_web_view_update_settings (MidoriWebView* web_view) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + g_object_get (G_OBJECT (priv->settings), + "tab-label-size", &priv->tab_label_size, + "close-button", &priv->close_button, + "middle-click-goto", &priv->middle_click_goto, + NULL); +} + +static void +midori_web_view_settings_notify (MidoriWebSettings* web_settings, + GParamSpec* pspec, + MidoriWebView* web_view) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + const gchar* name = g_intern_string (pspec->name); + GValue value = {0, }; + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (priv->settings), name, &value); + + if (name == g_intern_string ("tab-label-size")) + { + priv->tab_label_size = g_value_get_int (&value); + _midori_web_view_update_tab_label_size (web_view); + } + else if (name == g_intern_string ("close-button")) + { + priv->close_button = g_value_get_boolean (&value); + if (priv->tab_close) + sokoke_widget_set_visible (priv->tab_close, priv->close_button); + } + else if (name == g_intern_string ("middle-click-goto")) + priv->middle_click_goto = g_value_get_boolean (&value); + else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), + name)) + g_warning("Unexpected setting '%s'", name); + g_value_unset(&value); +} + +static void +midori_web_view_init (MidoriWebView* web_view) +{ + web_view->priv = MIDORI_WEB_VIEW_GET_PRIVATE (web_view); + + MidoriWebViewPrivate* priv = web_view->priv; + priv->is_loading = FALSE; + priv->progress = -1; + + priv->settings = midori_web_settings_new (); + _midori_web_view_update_settings (web_view); + g_signal_connect (priv->settings, "notify", + G_CALLBACK(midori_web_view_settings_notify), web_view); + + WebKitWebFrame* web_frame; + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + + g_object_connect (web_view, + //"signal::load-started", + //webkit_web_view_load_started, NULL, + "signal::load-committed", + webkit_web_view_load_committed, NULL, + "signal::load-started", + webkit_web_view_load_started, NULL, + "signal::load-progress-changed", + webkit_web_view_progress_changed, NULL, + "signal::load-finished", + webkit_web_view_load_finished, NULL, + //"signal::load-done", + //webkit_web_view_load_done, NULL, + "signal::title-changed", + webkit_web_view_title_changed, NULL, + "signal::status-bar-text-changed", + webkit_web_view_statusbar_text_changed, NULL, + "signal::hovering-over-link", + webkit_web_view_hovering_over_link, NULL, + "signal::button-press-event", + gtk_widget_button_press_event, NULL, + "signal_after::button-press-event", + gtk_widget_button_press_event_after, NULL, + "signal::scroll-event", + gtk_widget_scroll_event, NULL, + "signal::populate-popup", + webkit_web_view_populate_popup_cb, browser, + NULL); + g_object_connect (web_frame, + "signal::load-done", + webkit_web_frame_load_done, web_view, + NULL); +} + +static void +midori_web_view_finalize (GObject* object) +{ + MidoriWebView* web_view = MIDORI_WEB_VIEW (object); + MidoriWebViewPrivate* priv = web_view->priv; + + if (priv->icon) + g_object_unref (priv->icon); + g_free (priv->uri); + g_free (priv->title); + g_free (priv->statusbar_text); + g_free (priv->link_uri); + + if (priv->proxy_menu_item) + gtk_widget_destroy (priv->proxy_menu_item); + if (priv->proxy_xbel_item) + katze_xbel_item_unref (priv->proxy_xbel_item); + + if (priv->settings) + g_object_unref (priv->settings); + + G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); +} + +static void +midori_web_view_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriWebView* web_view = MIDORI_WEB_VIEW (object); + MidoriWebViewPrivate* priv = web_view->priv; + + switch (prop_id) + { + case PROP_ICON: + katze_object_assign (priv->icon, g_value_get_object (value)); + g_object_ref (priv->icon); + if (priv->tab_icon) + katze_throbber_set_static_pixbuf (KATZE_THROBBER (priv->tab_icon), + priv->icon); + break; + case PROP_URI: + // FIXME: Autocomplete the uri + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), + g_value_get_string (value)); + break; + case PROP_TITLE: + katze_assign (priv->title, g_value_dup_string (value)); + const gchar* title = midori_web_view_get_display_title (web_view); + if (priv->tab_label) + { + gtk_label_set_text (GTK_LABEL (priv->tab_label), title); + sokoke_widget_set_tooltip_text (priv->tab_label, title); + } + if (priv->proxy_menu_item) + gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( + priv->proxy_menu_item))), title); + if (priv->proxy_xbel_item) + katze_xbel_item_set_title (priv->proxy_xbel_item, title); + break; + case PROP_STATUSBAR_TEXT: + katze_assign (priv->statusbar_text, g_value_dup_string (value)); + break; + case PROP_SETTINGS: + g_signal_handlers_disconnect_by_func (priv->settings, + midori_web_view_settings_notify, + web_view); + katze_object_assign (priv->settings, g_value_get_object (value)); + g_object_ref (priv->settings); + _midori_web_view_update_settings (web_view); + g_signal_connect (priv->settings, "notify", + G_CALLBACK (midori_web_view_settings_notify), web_view); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_web_view_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriWebView* web_view = MIDORI_WEB_VIEW (object); + MidoriWebViewPrivate* priv = web_view->priv; + + switch (prop_id) + { + case PROP_ICON: + g_value_set_object (value, priv->icon); + break; + case PROP_URI: + g_value_set_string (value, priv->uri); + break; + case PROP_TITLE: + g_value_set_string (value, priv->title); + break; + case PROP_STATUSBAR_TEXT: + g_value_set_string (value, priv->statusbar_text); + break; + case PROP_SETTINGS: + g_value_set_object (value, priv->settings); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_web_view_new: + * + * Creates a new web view widget. + * + * Return value: a new #MidoriWebView + **/ +GtkWidget* +midori_web_view_new (void) +{ + MidoriWebView* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, + NULL); + + return GTK_WIDGET (web_view); +} + +/** + * midori_web_view_get_proxy_menu_item: + * @web_view: a #MidoriWebView + * + * Retrieves a proxy menu item that is typically added to a Window menu + * and which on activation switches to the right window/ tab. + * + * The item is created on the first call and will be updated to reflect + * changes to the icon and title automatically. + * + * Note: The item is only valid as the web view is embedded in a #GtkNotebook. + * + * Return value: the proxy #GtkMenuItem or %NULL + **/ +GtkWidget* +midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); + + MidoriWebViewPrivate* priv = web_view->priv; + + if (!priv->proxy_menu_item) + { + const gchar* title = midori_web_view_get_display_title (web_view); + GtkWidget* menu_item = gtk_image_menu_item_new_with_label (title); + GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), icon); + + priv->proxy_menu_item = menu_item; + } + return priv->proxy_menu_item; +} + +/** + * midori_web_view_get_proxy_tab_icon: + * @web_view: a #MidoriWebView + * + * Retrieves a proxy tab icon that is typically used in a tab label. + * + * The icon is created on the first call and will be updated to reflect + * loading progress and changes of the actual icon. + * + * Note: If a proxy tab label has been created before, this represents + * the existing icon used in the label. + * + * Return value: the proxy #GtkImage + **/ +GtkWidget* +midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + + MidoriWebViewPrivate* priv = web_view->priv; + + if (!priv->tab_icon) + { + priv->tab_icon = katze_throbber_new (); + katze_throbber_set_pixbuf (KATZE_THROBBER(priv->tab_icon), priv->icon); + } + return priv->tab_icon; +} + +static gboolean +midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, + GdkEventButton* event, + MidoriWebView* web_view) +{ + MidoriWebViewPrivate* priv = web_view->priv; + + if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) + { + // Toggle the label visibility on double click + GtkWidget* child = gtk_bin_get_child (GTK_BIN (tab_label)); + GList* children = gtk_container_get_children (GTK_CONTAINER (child)); + child = (GtkWidget*)g_list_nth_data (children, 1); + gboolean visible = gtk_widget_get_child_visible (GTK_WIDGET (child)); + gtk_widget_set_child_visible (GTK_WIDGET (child), !visible); + gint width, height; + sokoke_widget_get_text_size(tab_label, "M", &width, &height); + gtk_widget_set_size_request (child, !visible + ? width * priv->tab_label_size : 0, !visible ? -1 : 0); + g_list_free (children); + return TRUE; + } + else if (event->button == 2) + { + // Close the web view on middle click + g_signal_emit (web_view, signals[CLOSE], 0); + return TRUE; + } + + return FALSE; +} + +static void +midori_web_view_tab_close_style_set (GtkWidget* tab_close, + GtkStyle* previous_style, + MidoriWebView* web_view) +{ + GtkSettings* gtk_settings = gtk_widget_get_settings (tab_close); + gint width, height; + gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_BUTTON, + &width, &height); + gtk_widget_set_size_request (tab_close, width + 2, height + 2); +} + +static void +midori_web_view_tab_close_clicked (GtkWidget* tab_close, + MidoriWebView* web_view) +{ + g_signal_emit (web_view, signals[CLOSE], 0); +} + +/** + * midori_web_view_get_proxy_tab_label: + * @web_view: a #MidoriWebView + * + * Retrieves a proxy tab label that is typically used as the label of + * a #GtkNotebook page. + * + * The label is created on the first call and will be updated to reflect + * changes to the icon and title automatically. + * + * The icon embedded in the label will reflect the loading status of the + * web view. + * + * Note: This fails if a proxy tab icon has been created already. + * + * Return value: the proxy #GtkEventBox + **/ +GtkWidget* +midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + + MidoriWebViewPrivate* priv = web_view->priv; + + GtkWidget* proxy_tab_icon = priv->tab_icon; + g_return_val_if_fail (!proxy_tab_icon, NULL); + + if (!priv->proxy_tab_label) + { + priv->tab_icon = katze_throbber_new (); + katze_throbber_set_pixbuf (KATZE_THROBBER(priv->tab_icon), priv->icon); + + GtkWidget* event_box = gtk_event_box_new (); + gtk_event_box_set_visible_window(GTK_EVENT_BOX (event_box), FALSE); + GtkWidget* hbox = gtk_hbox_new (FALSE, 1); + gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); + gtk_box_pack_start (GTK_BOX (hbox), priv->tab_icon, FALSE, FALSE, 0); + const gchar* title = midori_web_view_get_display_title (web_view); + priv->tab_label = gtk_label_new (title); + gtk_misc_set_alignment (GTK_MISC (priv->tab_label), 0.0, 0.5); + // TODO: make the tab initially look "unvisited" until it's focused + gtk_box_pack_start (GTK_BOX (hbox), priv->tab_label, FALSE, FALSE, 0); + priv->proxy_tab_label = event_box; + _midori_web_view_update_tab_label_size (web_view); + + GtkWidget* close_button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); + GtkRcStyle* rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style(close_button, rcstyle); + GtkWidget* image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, + GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON(close_button), image); + gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_WIDGET (event_box)); + if (!priv->close_button) + gtk_widget_hide (close_button); + priv->tab_close = close_button; + + g_signal_connect(priv->proxy_tab_label, "button-release-event", + G_CALLBACK(midori_web_view_tab_label_button_release_event), + web_view); + g_signal_connect(priv->tab_close, "style-set", + G_CALLBACK(midori_web_view_tab_close_style_set), + web_view); + g_signal_connect(priv->tab_close, "clicked", + G_CALLBACK(midori_web_view_tab_close_clicked), + web_view); + } + return priv->proxy_tab_label; +} + +/** + * midori_web_view_get_proxy_xbel_item: + * @web_view: a #MidoriWebView + * + * Retrieves a proxy xbel item that can be used for bookmark storage as + * well as session management. + * + * The item is created on the first call and will be updated to reflect + * changes to the title and href automatically. + * + * Note: Currently the item is always a bookmark, but this might change + * in the future. + * + * Return value: the proxy #KatzeXbelItem + **/ +KatzeXbelItem* +midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + + MidoriWebViewPrivate* priv = web_view->priv; + + if (!priv->proxy_xbel_item) + { + priv->proxy_xbel_item = katze_xbel_bookmark_new (); + const gchar* uri = midori_web_view_get_display_uri (web_view); + katze_xbel_bookmark_set_href (priv->proxy_xbel_item, uri); + const gchar* title = midori_web_view_get_display_title (web_view); + katze_xbel_item_set_title (priv->proxy_xbel_item, title); + } + return priv->proxy_xbel_item; +} + +/** + * midori_web_view_is_loading: + * @web_view: a #MidoriWebView + * + * Determines whether currently a page is being loaded or not. + * + * Return value: %TRUE if a page is being loaded, %FALSE otherwise + **/ +gint +midori_web_view_is_loading (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), -1); + + MidoriWebViewPrivate* priv = web_view->priv; + return priv->is_loading; +} + +/** + * midori_web_view_get_progress: + * @web_view: a #MidoriWebView + * + * Retrieves the current loading progress in percent or -1 if no data + * has been loaded so far. + * + * The value is undefined if no loading is in progress. + * + * Return value: the current loading progress or -1 + **/ +gint +midori_web_view_get_progress (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), -1); + + MidoriWebViewPrivate* priv = web_view->priv; + return priv->progress; +} + +/** + * midori_web_view_get_uri: + * @web_view: a #MidoriWebView + * + * Retrieves a string that is suitable for displaying, particularly an + * empty uri is represented as "about:blank". + * + * You can assume that the string is not %NULL. + * + * Return value: an uri string + **/ +const gchar* +midori_web_view_get_display_uri (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), "about:blank"); + + MidoriWebViewPrivate* priv = web_view->priv; + return priv->uri ? priv->uri : "about:blank"; +} + +/** + * midori_web_view_get_display_title: + * @web_view: a #MidoriWebView + * + * Retrieves a string that is suitable for displaying as a title. Most of the + * time this will be the title or the current uri. + * + * You can assume that the string is not %NULL. + * + * Return value: a title string + **/ +const gchar* +midori_web_view_get_display_title (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), "about:blank"); + + MidoriWebViewPrivate* priv = web_view->priv; + + if (priv->title) + return priv->title; + if (priv->uri) + return priv->uri; + return "about:blank"; +} + +/** + * midori_web_view_get_link_uri: + * @web_view: a #MidoriWebView + * + * Retrieves the uri of the currently focused link, particularly while the + * mouse hovers a link or a context menu is being opened. + * + * Return value: an uri string, or %NULL if there is no link focussed + **/ +const gchar* +midori_web_view_get_link_uri (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + + MidoriWebViewPrivate* priv = web_view->priv; + return priv->link_uri; +} diff --git a/src/midori-webview.h b/src/midori-webview.h new file mode 100644 index 00000000..5b506218 --- /dev/null +++ b/src/midori-webview.h @@ -0,0 +1,118 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_WEB_VIEW_H__ +#define __MIDORI_WEB_VIEW_H__ + +#include + +#include +#include "midori-websettings.h" + +G_BEGIN_DECLS + +#define MIDORI_TYPE_WEB_VIEW \ + (midori_web_view_get_type ()) +#define MIDORI_WEB_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_VIEW, MidoriWebView)) +#define MIDORI_WEB_VIEW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_VIEW, MidoriWebViewClass)) +#define MIDORI_IS_WEB_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_VIEW)) +#define MIDORI_IS_WEB_VIEW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_VIEW)) +#define MIDORI_WEB_VIEW_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_VIEW, MidoriWebViewClass)) + +typedef struct _MidoriWebView MidoriWebView; +typedef struct _MidoriWebViewPrivate MidoriWebViewPrivate; +typedef struct _MidoriWebViewClass MidoriWebViewClass; + +struct _MidoriWebView +{ + WebKitWebView parent_instance; + + MidoriWebViewPrivate* priv; +}; + +struct _MidoriWebViewClass +{ + WebKitWebViewClass parent_class; + + /* Signals */ + void + (*progress_started) (MidoriWebView* web_view, + guint progress); + void + (*progress_changed) (MidoriWebView* web_view, + guint progress); + void + (*progress_done) (MidoriWebView* web_view, + guint progress); + void + (*load_done) (MidoriWebView* web_view, + WebKitWebFrame* frame); + void + (*statusbar_text_changed) (MidoriWebView* web_view, + const gchar* text); + void + (*element_motion) (MidoriWebView* web_view, + const gchar* link_uri); + void + (*close) (MidoriWebView* web_view); + void + (*new_tab) (MidoriWebView* web_view, + const gchar* uri); + void + (*new_window) (MidoriWebView* web_view, + const gchar* uri); + void + (*create_web_view) (MidoriWebView* web_view, + MidoriWebView* new_web_view); +}; + +GType +midori_web_view_get_type (void); + +GtkWidget* +midori_web_view_new (void); + +void +midori_web_view_set_settings (MidoriWebView* web_view, + MidoriWebSettings* web_settings); + +GtkWidget* +midori_web_view_get_proxy_menu_item (MidoriWebView* web_view); + +GtkWidget* +midori_web_view_get_proxy_tab_label (MidoriWebView* web_view); + +KatzeXbelItem* +midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view); + +gboolean +midori_web_view_is_loading (MidoriWebView* web_view); + +gint +midori_web_view_get_progress (MidoriWebView* web_view); + +const gchar* +midori_web_view_get_display_uri (MidoriWebView* web_view); + +const gchar* +midori_web_view_get_display_title (MidoriWebView* web_view); + +const gchar* +midori_web_view_get_link_uri (MidoriWebView* web_view); + +G_END_DECLS + +#endif /* __MIDORI_WEB_VIEW_H__ */ diff --git a/src/prefs.c b/src/prefs.c index d5bcc6d7..e4cd0836 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -152,62 +152,45 @@ static void on_prefs_userStylesheetUri_file_set(GtkWidget* widget, CPrefs* prefs static void on_prefs_toolbarstyle_changed(GtkWidget* widget, CPrefs* prefs) { config->toolbarStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - gtk_toolbar_set_style(GTK_TOOLBAR(prefs->browser->navibar) - , config_to_toolbarstyle(config->toolbarStyle)); + /*gtk_toolbar_set_style(GTK_TOOLBAR(prefs->browser->navibar) + , config_to_toolbarstyle(config->toolbarStyle));*/ } static void on_prefs_toolbarSmall_toggled(GtkWidget* widget, CPrefs* prefs) { config->toolbarSmall = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(prefs->browser->navibar) - , config_to_toolbariconsize(config->toolbarSmall)); + /*gtk_toolbar_set_icon_size(GTK_TOOLBAR(prefs->browser->navibar) + , config_to_toolbariconsize(config->toolbarSmall));*/ } static void on_prefs_tabClose_toggled(GtkWidget* widget, CPrefs* prefs) { config->tabClose = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - GList* items = browsers; - do - { - CBrowser* browser = (CBrowser*)items->data; - sokoke_widget_set_visible(browser->webView_close, config->tabClose); - } - while((items = g_list_next(items))); - g_list_free(items); + g_object_set(webSettings, "close-button", config->tabClose, NULL); } static void on_prefs_tabSize_changed(GtkWidget* widget, CPrefs* prefs) { config->tabSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); - gint w, h; - sokoke_widget_get_text_size(prefs->browser->webView_name, "M", &w, &h); - GList* items = browsers; - do - { - CBrowser* browser = (CBrowser*)items->data; - gtk_widget_set_size_request(GTK_WIDGET(browser->webView_name) - , w * config->tabSize, -1); - } - while((items = g_list_next(items))); - g_list_free(items); + g_object_set(webSettings, "tab-label-size", config->tabSize, NULL); } static void on_prefs_toolbarWebSearch_toggled(GtkWidget* widget, CPrefs* prefs) { config->toolbarWebSearch = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - sokoke_widget_set_visible(prefs->browser->webSearch, config->toolbarWebSearch); + //sokoke_widget_set_visible(prefs->browser->webSearch, config->toolbarWebSearch); } static void on_prefs_toolbarNewTab_toggled(GtkWidget* widget, CPrefs* prefs) { config->toolbarNewTab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - sokoke_widget_set_visible(prefs->browser->newTab, config->toolbarNewTab); + //sokoke_widget_set_visible(prefs->browser->newTab, config->toolbarNewTab); } static void on_prefs_toolbarClosedTabs_toggled(GtkWidget* widget, CPrefs* prefs) { config->toolbarClosedTabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - sokoke_widget_set_visible(prefs->browser->closedTabs, config->toolbarClosedTabs); + //sokoke_widget_set_visible(prefs->browser->closedTabs, config->toolbarClosedTabs); } static gboolean on_prefs_locationsearch_focus_out(GtkWidget* widget @@ -233,7 +216,10 @@ static void on_prefs_protocols_render_icon(GtkTreeViewColumn* column gchar* path; if((path = g_find_program_in_path(binary))) { - GtkIconTheme* icon_theme = get_icon_theme(prefs->treeview); + GdkScreen* screen = gtk_widget_get_screen(prefs->treeview); + if(!screen) + screen = gdk_screen_get_default(); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen(screen); if(g_path_is_absolute(binary)) { g_free(path); path = g_path_get_basename(binary); @@ -308,16 +294,14 @@ static void on_prefs_protocols_combobox_changed(GtkWidget* widget, CPrefs* prefs gtk_widget_set_sensitive(prefs->add, command == NULL); } -GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) +GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) { gchar* dialogTitle = g_strdup_printf("%s Preferences", g_get_application_name()); GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle - , GTK_WINDOW(browser->window) + , GTK_WINDOW(browser) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_HELP - , GTK_RESPONSE_HELP - , GTK_STOCK_CLOSE - , GTK_RESPONSE_CLOSE + , GTK_STOCK_HELP, GTK_RESPONSE_HELP + , GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE , NULL); gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PREFERENCES); // TODO: Implement some kind of help function @@ -326,7 +310,6 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) CPrefs* prefs = g_new0(CPrefs, 1); prefs->browser = browser; - //prefs->window = dialog; g_signal_connect(dialog, "response", G_CALLBACK(g_free), prefs); // TODO: Do we want tooltips for explainations or can we omit that? @@ -334,7 +317,7 @@ GtkWidget* prefs_preferences_dialog_new(CBrowser* browser) // TODO: Take multiple windows into account when applying changes GtkWidget* xfce_heading; if((xfce_heading = sokoke_xfce_header_new( - gtk_window_get_icon_name(GTK_WINDOW(browser->window)), dialogTitle))) + gtk_window_get_icon_name(GTK_WINDOW(browser)), dialogTitle))) gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) , xfce_heading, FALSE, FALSE, 0); g_free(dialogTitle); diff --git a/src/prefs.h b/src/prefs.h index 7576095e..e56d2087 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -12,7 +12,7 @@ #ifndef __PREFS_H__ #define __PREFS_H__ 1 -#include "browser.h" +#include "midori-browser.h" #include @@ -20,8 +20,7 @@ typedef struct { - CBrowser* browser; - //GtkWidget* window; + MidoriBrowser* browser; GtkWidget* userStylesheetUri; GtkWidget* treeview; GtkWidget* combobox; @@ -38,6 +37,6 @@ enum // -- Declarations GtkWidget* -prefs_preferences_dialog_new(CBrowser*); +prefs_preferences_dialog_new(MidoriBrowser*); #endif /* !__PREFS_H__ */ diff --git a/src/search.c b/src/search.c index a40a10d3..26afcb5e 100644 --- a/src/search.c +++ b/src/search.c @@ -12,7 +12,7 @@ #include "search.h" #include "sokoke.h" -#include "../katze/katze.h" +#include #include #include diff --git a/src/sokoke.c b/src/sokoke.c index ea0c6f49..8bcca67f 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -34,18 +34,6 @@ void sokoke_combo_box_add_strings(GtkComboBox* combobox va_end(args); } -void sokoke_radio_action_set_current_value(GtkRadioAction* action - , gint currentValue) -{ - // Activates the group member with the given value - #if GTK_CHECK_VERSION(2, 10, 0) - gtk_radio_action_set_current_value(action, currentValue); - #else - // TODO: Implement this for older gtk - UNIMPLEMENTED - #endif -} - void sokoke_widget_set_visible(GtkWidget* widget, gboolean visible) { // Show or hide the widget @@ -304,86 +292,3 @@ void sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* path g_free(accel); } } - -gboolean sokoke_entry_can_undo(GtkEntry* entry) -{ - // TODO: Can we undo the last input? - return FALSE; -} - -gboolean sokoke_entry_can_redo(GtkEntry* entry) -{ - // TODO: Can we redo the last input? - return FALSE; -} - -void sokoke_entry_undo(GtkEntry* entry) -{ - // TODO: Implement undo - UNIMPLEMENTED -} - -void sokoke_entry_redo(GtkEntry* entry) -{ - // TODO: Implement redo - UNIMPLEMENTED -} - -static gboolean sokoke_on_undo_entry_key_down(GtkEntry* widget, GdkEventKey* event - , gpointer userdata) -{ - switch(event->keyval) - { - case GDK_Undo: - sokoke_entry_undo(widget); - return FALSE; - case GDK_Redo: - sokoke_entry_redo(widget); - return FALSE; - default: - return FALSE; - } -} - -static void sokoke_on_undo_entry_populate_popup(GtkEntry* entry, GtkMenu* menu - , gpointer userdata) -{ - // Enhance the entry's menu with undo and redo items. - GtkWidget* menuitem = gtk_separator_menu_item_new(); - gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_REDO, NULL); - g_signal_connect(menuitem, "activate", G_CALLBACK(sokoke_entry_redo), userdata); - gtk_widget_set_sensitive(menuitem, sokoke_entry_can_redo(entry)); - gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_UNDO, NULL); - g_signal_connect(menuitem, "activate", G_CALLBACK(sokoke_entry_undo), userdata); - gtk_widget_set_sensitive(menuitem, sokoke_entry_can_undo(entry)); - gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); -} - -gboolean sokoke_entry_get_can_undo(GtkEntry* entry) -{ - // TODO: Is this entry undo enabled? - return FALSE; -} - -void sokoke_entry_set_can_undo(GtkEntry* entry, gboolean canUndo) -{ - if(canUndo) - { - g_signal_connect(entry, "key-press-event" - , G_CALLBACK(sokoke_on_undo_entry_key_down), NULL); - g_signal_connect(entry, "populate-popup" - , G_CALLBACK(sokoke_on_undo_entry_populate_popup), NULL); - } - else - { - g_signal_handlers_disconnect_by_func(entry - , G_CALLBACK(sokoke_on_undo_entry_key_down), NULL); - g_signal_handlers_disconnect_by_func(entry - , G_CALLBACK(sokoke_on_undo_entry_populate_popup), NULL); - } -} diff --git a/src/sokoke.h b/src/sokoke.h index 995e2481..74e751be 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -20,9 +20,6 @@ void sokoke_combo_box_add_strings(GtkComboBox*, const gchar*, ...); -void -sokoke_radio_action_set_current_value(GtkRadioAction*, gint); - void sokoke_widget_set_visible(GtkWidget*, gboolean); @@ -70,22 +67,4 @@ sokoke_widget_get_text_size(GtkWidget*, const gchar*, gint*, gint*); void sokoke_menu_item_set_accel(GtkMenuItem*, const gchar*, const gchar*, GdkModifierType); -gboolean -sokoke_entry_can_undo(GtkEntry*); - -gboolean -sokoke_entry_can_redo(GtkEntry*); - -void -sokoke_entry_undo(GtkEntry*); - -void -sokoke_entry_redo(GtkEntry*); - -gboolean -sokoke_entry_get_can_undo(GtkEntry*); - -void -sokoke_entry_set_can_undo(GtkEntry*, gboolean); - #endif /* !__SOKOKE_H__ */ diff --git a/src/ui.h b/src/ui.h index 787fdd41..bc5d6a8b 100644 --- a/src/ui.h +++ b/src/ui.h @@ -12,246 +12,4 @@ #ifndef __UI_H__ #define __UI_H__ 1 -// -- Credits - -static const gchar* credits_authors[] = { "Christian Dywan ", NULL }; -static const gchar* credits_documenters/*[]*/ = /*{ */NULL/* }*/; -static const gchar* credits_artists[] = { "Nancy Runge ", NULL }; - -// -- Licenses - -static const gchar* license = - "This library is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU Lesser General Public\n" - "License as published by the Free Software Foundation; either\n" - "version 2.1 of the License, or (at your option) any later version.\n"; - -// -- User interface description - -static const gchar* ui_markup = - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - // Closed tabs shall be prepended here - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - // Bookmarks shall be appended here - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - // TODO: Insert widgets and custom tools here - "" - "" - "" - "" - "" - "" - "" - "" - "" - // All open tabs shall be appended here - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - ""; - #endif /* !__UI_H__ */ diff --git a/src/webSearch.c b/src/webSearch.c index 8390571c..a7a4d6ae 100644 --- a/src/webSearch.c +++ b/src/webSearch.c @@ -19,12 +19,12 @@ #include #include -void update_searchEngine(guint index, CBrowser* browser) +void update_searchEngine(guint index, GtkWidget* search) { guint n = g_list_length(searchEngines); // Display a default icon in case we have no engines if(!n) - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->webSearch), SEXY_ICON_ENTRY_PRIMARY + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU))); // Change the icon and default text according to the chosen engine else @@ -34,24 +34,24 @@ void update_searchEngine(guint index, CBrowser* browser) index = 0; SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, index); GdkPixbuf* pixbuf = load_web_icon(search_engine_get_icon(engine) - , GTK_ICON_SIZE_MENU, browser->navibar); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(browser->webSearch) + , GTK_ICON_SIZE_MENU, search); + sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search) , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf))); g_object_unref(pixbuf); - sokoke_entry_set_default_text(GTK_ENTRY(browser->webSearch) + sokoke_entry_set_default_text(GTK_ENTRY(search) , search_engine_get_short_name(engine)); config->searchEngine = index; } } -void on_webSearch_engine_activate(GtkWidget* widget, CBrowser* browser) +void on_webSearch_engine_activate(GtkWidget* widget, MidoriBrowser* browser) { guint index = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(widget), "engine")); - update_searchEngine(index, browser); + update_searchEngine(index, widget); } void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos - , gint button, CBrowser* browser) + , gint button, MidoriBrowser* browser) { GtkWidget* menu = gtk_menu_new(); guint n = g_list_length(searchEngines); @@ -84,14 +84,14 @@ void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos gtk_widget_show(menuitem); } - menuitem = gtk_separator_menu_item_new(); + /*menuitem = gtk_separator_menu_item_new(); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); GtkAction* action = gtk_action_group_get_action( browser->actiongroup, "ManageSearchEngines"); menuitem = gtk_action_create_menu_item(action); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); + gtk_widget_show(menuitem);*/ sokoke_widget_popup(widget, GTK_MENU(menu), NULL); } @@ -299,16 +299,16 @@ static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) gtk_list_store_remove(GTK_LIST_STORE(liststore), &iter); search_engine_free(searchEngine); searchEngines = g_list_remove(searchEngines, searchEngine); - update_searchEngine(config->searchEngine, webSearch->browser); + //update_searchEngine(config->searchEngine, webSearch->browser); webSearch_toggle_edit_buttons(g_list_nth(searchEngines, 0) != NULL, webSearch); // FIXME: we want to allow undo of some kind } -GtkWidget* webSearch_manageSearchEngines_dialog_new(CBrowser* browser) +GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) { const gchar* dialogTitle = "Manage search engines"; GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle - , GTK_WINDOW(browser->window) + , GTK_WINDOW(browser) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR , GTK_STOCK_HELP , GTK_RESPONSE_HELP @@ -394,7 +394,7 @@ GtkWidget* webSearch_manageSearchEngines_dialog_new(CBrowser* browser) return dialog; } -gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, CBrowser* browser) +gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, MidoriBrowser* browser) { GdkModifierType state = (GdkModifierType)0; gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); @@ -403,25 +403,25 @@ gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, CBrowser* switch(event->keyval) { case GDK_Up: - update_searchEngine(config->searchEngine - 1, browser); + //update_searchEngine(config->searchEngine - 1, browser); return TRUE; case GDK_Down: - update_searchEngine(config->searchEngine + 1, browser); + //update_searchEngine(config->searchEngine + 1, browser); return TRUE; } return FALSE; } -gboolean on_webSearch_scroll(GtkWidget* webView, GdkEventScroll* event, CBrowser* browser) +gboolean on_webSearch_scroll(GtkWidget* webView, GdkEventScroll* event, MidoriBrowser* browser) { if(event->direction == GDK_SCROLL_DOWN) - update_searchEngine(config->searchEngine + 1, browser); + ;//update_searchEngine(config->searchEngine + 1, browser); else if(event->direction == GDK_SCROLL_UP) - update_searchEngine(config->searchEngine - 1, browser); + ;//update_searchEngine(config->searchEngine - 1, browser); return TRUE; } -void on_webSearch_activate(GtkWidget* widget, CBrowser* browser) +void on_webSearch_activate(GtkWidget* widget, MidoriBrowser* browser) { const gchar* keywords = gtk_entry_get_text(GTK_ENTRY(widget)); gchar* url; @@ -436,6 +436,7 @@ void on_webSearch_activate(GtkWidget* widget, CBrowser* browser) else search = g_strconcat(url, " ", keywords, NULL); entry_completion_append(GTK_ENTRY(widget), keywords); - webkit_web_view_open(WEBKIT_WEB_VIEW(get_nth_webView(-1, browser)), search); + GtkWidget* webView = midori_browser_get_current_web_view(browser); + webkit_web_view_open(WEBKIT_WEB_VIEW(webView), search); g_free(search); } diff --git a/src/webSearch.h b/src/webSearch.h index 3cefc395..cefa89be 100644 --- a/src/webSearch.h +++ b/src/webSearch.h @@ -12,7 +12,7 @@ #ifndef __WEBSEARCH_H__ #define __WEBSEARCH_H__ 1 -#include "browser.h" +#include "midori-browser.h" #include #include @@ -22,7 +22,7 @@ typedef struct { - CBrowser* browser; + MidoriBrowser* browser; GtkWidget* window; GtkWidget* treeview; GtkWidget* edit; @@ -38,24 +38,24 @@ enum // -- Declarations void -update_searchEngine(guint, CBrowser*); +update_searchEngine(guint, GtkWidget*); void -on_webSearch_icon_released(GtkWidget*, SexyIconEntryPosition*, gint, CBrowser*); +on_webSearch_icon_released(GtkWidget*, SexyIconEntryPosition*, gint, MidoriBrowser*); void -on_webSearch_engine_activate(GtkWidget*, CBrowser*); +on_webSearch_engine_activate(GtkWidget*, MidoriBrowser*); void -on_webSearch_activate(GtkWidget*, CBrowser*); +on_webSearch_activate(GtkWidget*, MidoriBrowser*); GtkWidget* -webSearch_manageSearchEngines_dialog_new(CBrowser*); +webSearch_manageSearchEngines_dialog_new(MidoriBrowser*); gboolean -on_webSearch_key_down(GtkWidget*, GdkEventKey*, CBrowser*); +on_webSearch_key_down(GtkWidget*, GdkEventKey*, MidoriBrowser*); gboolean -on_webSearch_scroll(GtkWidget*, GdkEventScroll*, CBrowser*); +on_webSearch_scroll(GtkWidget*, GdkEventScroll*, MidoriBrowser*); #endif /* !__WEBSEARCH_H__ */ diff --git a/src/webView.c b/src/webView.c deleted file mode 100644 index be91e220..00000000 --- a/src/webView.c +++ /dev/null @@ -1,376 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "webView.h" - -#include "helpers.h" -#include "sokoke.h" -#include "../katze/katze.h" - -#include - -WebKitNavigationResponse on_webView_navigation_requested(GtkWidget* webView - , WebKitWebFrame* frame, WebKitNetworkRequest* networkRequest) -{ - WebKitNavigationResponse response = WEBKIT_NAVIGATION_RESPONSE_ACCEPT; - // TODO: Ask webkit wether it knows the protocol for "unknown protcol" - // TODO: This isn't the place for uri scheme handling - const gchar* uri = webkit_network_request_get_uri(networkRequest); - gchar* protocol = strtok(g_strdup(uri), ":"); - if(spawn_protocol_command(protocol, uri)) - response = WEBKIT_NAVIGATION_RESPONSE_IGNORE; - g_free(protocol); - return response; -} - -void on_webView_title_changed(GtkWidget* webView, WebKitWebFrame* frame - , const gchar* title, CBrowser* browser) -{ - const gchar* newTitle; - if(title) - newTitle = title; - else - newTitle = webkit_web_frame_get_uri(frame); - katze_xbel_item_set_title(browser->sessionItem, newTitle); - gtk_label_set_text(GTK_LABEL(browser->webView_name), newTitle); - sokoke_widget_set_tooltip_text(gtk_widget_get_parent( - gtk_widget_get_parent(browser->webView_name)), newTitle); - gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN( - browser->webView_menu))), newTitle); - if(webView == get_nth_webView(-1, browser)) - { - gchar* windowTitle = g_strconcat(newTitle, " - ", PACKAGE_NAME, NULL); - gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); - g_free(windowTitle); - } -} - -void on_webView_icon_changed(GtkWidget* webView, WebKitWebFrame* widget - , CBrowser* browser) -{ - // TODO: Implement icon updates; currently this isn't ever called anyway - const gchar* icon = NULL; - UNIMPLEMENTED - if(icon) - { - gtk_label_set_text(GTK_LABEL(browser->webView_name), "icon"); - gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN( - browser->webView_menu))), "icon"); - if(webView == get_nth_webView(-1, browser)) - { - gchar* windowTitle = g_strconcat("icon", " - ", PACKAGE_NAME, NULL); - gtk_window_set_title(GTK_WINDOW(browser->window), windowTitle); - g_free(windowTitle); - } - } -} - -void on_webView_load_started(GtkWidget* webView, WebKitWebFrame* widget - , CBrowser* browser) -{ - browser->loadedPercent = 0; - update_favicon(browser); - if(webView == get_nth_webView(-1, browser)) - { - update_gui_state(browser); - update_statusbar(browser); - } -} - -void on_webView_load_committed(GtkWidget* webView, WebKitWebFrame* frame - , CBrowser* browser) -{ - const gchar* uri = webkit_web_frame_get_uri(frame); - gchar* newUri = g_strdup(uri ? uri : ""); - katze_xbel_bookmark_set_href(browser->sessionItem, newUri); - if(webView == get_nth_webView(-1, browser)) - { - gtk_entry_set_text(GTK_ENTRY(browser->location), newUri); - gtk_label_set_text(GTK_LABEL(browser->webView_name), newUri); - katze_assign(browser->statusMessage, NULL); - } -} - -void on_webView_load_changed(GtkWidget* webView, gint progress, CBrowser* browser) -{ - browser->loadedPercent = progress; - if(webView == get_nth_webView(-1, browser)) - update_statusbar(browser); -} - -void on_webView_load_finished(GtkWidget* webView, WebKitWebFrame* widget - , CBrowser* browser) -{ - browser->loadedPercent = -1; - update_favicon(browser); - if(webView == get_nth_webView(-1, browser)) - update_gui_state(browser); -} - -void on_webView_status_message(GtkWidget* webView, const gchar* text, CBrowser* browser) -{ - katze_assign(browser->statusMessage, g_strdup(text)); - update_statusbar(browser); -} - -void on_webView_selection_changed(GtkWidget* webView, CBrowser* browser) -{ - UNIMPLEMENTED -} - -gboolean on_webView_console_message(GtkWidget* webView - , const gchar* message, gint line, const gchar* sourceId, CBrowser* browser) -{ - return FALSE; -} - -void on_webView_link_hover(GtkWidget* webView, const gchar* tooltip - , const gchar* uri, CBrowser* browser) -{ - katze_assign(browser->statusMessage, g_strdup(uri)); - update_statusbar(browser); - katze_assign(browser->elementUri, g_strdup(uri)); -} - -/* -GtkWidget* on_webView_window_open(GtkWidget* webView, const gchar* sUri - , CBrowser* browser) -{ - // A window is created - // TODO: Respect config->iNewPages - // TODO: Find out if this comes from a script or a click - // TODO: Block scripted popups, return NULL and show status icon - CBrowser* newBrowser = browser_new(config->openPopupsInTabs ? browser : NULL); - return newBrowser->webView; -} -*/ - -void webView_popup(GtkWidget* webView, GdkEventButton* event, CBrowser* browser) -{ - gboolean isLink = browser->elementUri != NULL; // Did we right-click a link? - gboolean haveLinks = FALSE; // TODO: Are several links selected? - gboolean isImage = FALSE; // TODO: Did we right-click an image? - gboolean isEditable = webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(webView)); - gboolean hasSelection = webkit_web_view_has_selection(WEBKIT_WEB_VIEW(webView)); - - update_edit_items(browser); - - // Download manager available? - const gchar* downloadManager = g_datalist_get_data(&config->protocols_commands, "download"); - gboolean canDownload = downloadManager && *downloadManager; - - action_set_visible("LinkTabNew", isLink, browser); - action_set_visible("LinkTabCurrent", isLink, browser); - action_set_visible("LinkWindowNew", isLink, browser); - - action_set_visible("LinkSaveAs", isLink, browser); - action_set_visible("LinkSaveWith", isLink && canDownload, browser); - action_set_visible("LinkCopy", isLink, browser); - action_set_visible("LinkBookmarkNew", isLink, browser); - - action_set_visible("SelectionLinksNewTabs", haveLinks && hasSelection, browser); - action_set_visible("SelectionTextTabNew", haveLinks && hasSelection, browser); - action_set_visible("SelectionTextTabCurrent", haveLinks && hasSelection, browser); - action_set_visible("SelectionTextWindowNew", haveLinks && hasSelection, browser); - - action_set_visible("ImageViewTabNew", isImage, browser); - action_set_visible("ImageViewTabCurrent", isImage, browser); - action_set_visible("ImageSaveAs", isImage, browser); - action_set_visible("ImageSaveWith", isImage && canDownload, browser); - action_set_visible("ImageCopy", isImage, browser); - - action_set_visible("Copy_", hasSelection || isEditable, browser); - action_set_visible("SelectionSearch", hasSelection, browser); - action_set_visible("SelectionSearchWith", hasSelection, browser); - action_set_visible("SelectionSourceView", hasSelection, browser); - - action_set_visible("SourceView", !hasSelection, browser); - - if(isEditable) - sokoke_widget_popup(webView, GTK_MENU(browser->popup_editable), event); - else if(isLink || isImage || hasSelection) - sokoke_widget_popup(webView, GTK_MENU(browser->popup_element), event); - else - sokoke_widget_popup(webView, GTK_MENU(browser->popup_webView), event); -} - -gboolean on_webView_button_press(GtkWidget* webView, GdkEventButton* event - , CBrowser* browser) -{ - GdkModifierType state = (GdkModifierType)0; - gint x, y; - gdk_window_get_pointer(NULL, &x, &y, &state); - switch(event->button) - { - case 1: - if(!browser->elementUri) - return FALSE; - if(state & GDK_SHIFT_MASK) - { - // Open link in new window - CBrowser* curBrowser = browser_new(NULL); - webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); - return TRUE; - } - else if(state & GDK_MOD1_MASK) - { - // Open link in new tab - CBrowser* curBrowser = browser_new(browser); - webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); - return TRUE; - } - break; - case 2: - if(state & GDK_CONTROL_MASK) - { - //webkit_web_view_set_text_size(WEBKIT_WEB_VIEW(webView), 1); - return TRUE; - } - else - { - if(!browser->elementUri) - return FALSE; - // Open link in new tab - CBrowser* curBrowser = browser_new(browser); - webkit_web_view_open(WEBKIT_WEB_VIEW(curBrowser->webView), browser->elementUri); - return TRUE; - } - break; - case 3: - webView_popup(webView, event, browser); - return TRUE; - } - return FALSE; -} - -gboolean on_webView_button_press_after(GtkWidget* webView, GdkEventButton* event - , CBrowser* browser) -{ - if(event->button == 2 && config->middleClickGoto) - { - GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); - gchar* text = gtk_clipboard_wait_for_text(clipboard); - gchar* uri = NULL; - if(text && strchr(text, '.') && !strchr(text, ' ')) - uri = magic_uri(text, FALSE); - g_free(text); - if(uri) - { - webkit_web_view_open(WEBKIT_WEB_VIEW(browser->webView), uri); - g_free(uri); - return TRUE; - } - } - return FALSE; -} - -void on_webView_popup(GtkWidget* webView, CBrowser* browser) -{ - webView_popup(webView, NULL, browser); -} - -gboolean on_webView_scroll(GtkWidget* webView, GdkEventScroll* event - , CBrowser* browser) -{ - GdkModifierType state = (GdkModifierType)0; - gint x, y; - gdk_window_get_pointer(NULL, &x, &y, &state); - if(state & GDK_CONTROL_MASK) - { - /*const gfloat size = webkit_web_view_get_text_size(WEBKIT_WEB_VIEW(webView)); - if(event->direction == GDK_SCROLL_DOWN) - webkit_web_view_set_text_size(WEBKIT_WEB_VIEW(webView), size + 0.1); - else if(event->direction == GDK_SCROLL_UP) - webView_set_text_size(WEBKIT_WEB_VIEW(webView), size - 0.1);*/ - return TRUE; - } - else - return FALSE; -} - -gboolean on_webView_leave(GtkWidget* webView, GdkEventCrossing* event, CBrowser* browser) -{ - katze_assign(browser->statusMessage, NULL); - update_statusbar(browser); - return TRUE; -} - -void on_webView_destroy(GtkWidget* widget, CBrowser* browser) -{ - // Update browser list, free memory and possibly quit - GList* tmp = g_list_find(browsers, browser); - browsers = g_list_delete_link(browsers, tmp); - g_free(browser->elementUri); - g_free(browser->statusMessage); - // FIXME: Multiple windows are not taken into account - if(!g_list_nth(browsers, 0)) - { - g_object_unref(browser->actiongroup); - g_object_unref(browser->popup_bookmark); - g_object_unref(browser->popup_webView); - g_object_unref(browser->popup_element); - g_object_unref(browser->popup_editable); - guint i; - guint n = katze_xbel_folder_get_n_items(bookmarks); - for(i = 0; i < n; i++) - katze_xbel_item_unref(katze_xbel_folder_get_nth_item(bookmarks, i)); - gtk_main_quit(); - } -} - -// webView actions begin here - -GtkWidget* webView_new(GtkWidget** scrolled) -{ - *scrolled = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(*scrolled) - , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - GTK_WIDGET_SET_FLAGS(*scrolled, GTK_CAN_FOCUS); - GtkWidget* webView = webkit_web_view_new(); - gtk_container_add(GTK_CONTAINER(*scrolled), webView); - return webView; -} - -void webView_open(GtkWidget* webView, const gchar* uri) -{ - webkit_web_view_open(WEBKIT_WEB_VIEW(webView), uri); - // We need to check the browser first - // No browser means this is a panel - CBrowser* browser = get_browser_from_webView(webView); - if(browser) - { - katze_xbel_bookmark_set_href(browser->sessionItem, uri); - katze_xbel_item_set_title(browser->sessionItem, ""); - } -} - -void webView_close(GtkWidget* webView, CBrowser* browser) -{ - browser = get_browser_from_webView(webView); - const gchar* uri = katze_xbel_bookmark_get_href(browser->sessionItem); - katze_xbel_folder_remove_item(session, browser->sessionItem); - if(uri && *uri) - { - katze_xbel_folder_prepend_item(tabtrash, browser->sessionItem); - guint n = katze_xbel_folder_get_n_items(tabtrash); - if(n > 10) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item(tabtrash, n - 1); - katze_xbel_item_unref(item); - } - } - else - katze_xbel_item_unref(browser->sessionItem); - gtk_widget_destroy(browser->webView_menu); - gtk_notebook_remove_page(GTK_NOTEBOOK(browser->webViews) - , get_webView_index(webView, browser)); - update_browser_actions(browser); -} diff --git a/src/webView.h b/src/webView.h deleted file mode 100644 index 552b571b..00000000 --- a/src/webView.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __webView_H__ -#define __webView_H__ 1 - -#include -#include "browser.h" -#include "debug.h" - -#include - -WebKitNavigationResponse -on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame - , WebKitNetworkRequest* networkRequest); - -void -on_webView_title_changed(GtkWidget*, WebKitWebFrame*, const gchar*, CBrowser*); - -void -on_webView_icon_changed(GtkWidget*, WebKitWebFrame*, CBrowser*); - -void -on_webView_load_started(GtkWidget* , WebKitWebFrame*, CBrowser*); - -void -on_webView_load_committed(GtkWidget* , WebKitWebFrame*, CBrowser*); - -void -on_webView_load_changed(GtkWidget*, gint progress, CBrowser*); - -void -on_webView_load_finished(GtkWidget*, WebKitWebFrame*, CBrowser*); - -void -on_webView_status_message(GtkWidget*, const gchar*, CBrowser*); - -void -on_webView_selection_changed(GtkWidget*, CBrowser*); - -gboolean -on_webView_console_message(GtkWidget*, const gchar*, gint, const gchar*, CBrowser*); - -void -on_webView_link_hover(GtkWidget*, const gchar*, const gchar*, CBrowser*); - -/* -GtkWidget* -on_webView_window_open(GtkWidget*, const gchar*, CBrowser*); -*/ - -gboolean -on_webView_button_press(GtkWidget*, GdkEventButton*, CBrowser*); - -gboolean -on_webView_button_press_after(GtkWidget*, GdkEventButton*, CBrowser*); - -void -on_webView_popup(GtkWidget*, CBrowser*); - -gboolean -on_webView_scroll(GtkWidget*, GdkEventScroll*, CBrowser*); - -gboolean -on_webView_leave(GtkWidget*, GdkEventCrossing*, CBrowser*); - -void -on_webView_destroy(GtkWidget*, CBrowser*); - -GtkWidget* -webView_new(GtkWidget**); - -void -webView_open(GtkWidget*, const gchar*); - -void -webView_close(GtkWidget*, CBrowser*); - -#endif /* !__webView_H__ */ From 9abae486dd2162266b41cc27fb2dac3b50ff2585 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Mar 2008 22:48:12 +0100 Subject: [PATCH 0039/2970] Build fix: Accidentally removed the wrong action. --- src/midori-browser.c | 11 +++++++---- src/midori-webview.c | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 21e54763..b59e409d 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -371,7 +371,7 @@ static gboolean midori_web_view_console_message_cb (GtkWidget* web_view, const gchar* message, gint line, - const gchar* sourceId, + const gchar* source_id, MidoriBrowser* browser) { // FIXME: We want this to appear in a panel @@ -397,7 +397,7 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) { // TODO: menu items - // undo close tab + // UndoTabClose // sep // BookmarkNew // SaveAs @@ -1777,8 +1777,8 @@ _action_bookmark_edit_activate (GtkAction* action, } static void -_action_trash_undo_activate (GtkAction* action, - MidoriBrowser* browser) +_action_undo_tab_close_activate (GtkAction* action, + MidoriBrowser* browser) { MidoriBrowserPrivate* priv = browser->priv; @@ -1955,6 +1955,9 @@ static const GtkActionEntry entries[] = { { "TrashEmpty", GTK_STOCK_CLEAR, "Empty Trash", "", "hm?", G_CALLBACK (_action_trash_empty_activate) }, + { "UndoTabClose", GTK_STOCK_UNDELETE, + "Undo Close Tab", "", + "hm?", G_CALLBACK (_action_undo_tab_close_activate) }, { "Bookmarks", NULL, "_Bookmarks" }, { "BookmarkNew", STOCK_BOOKMARK_NEW, diff --git a/src/midori-webview.c b/src/midori-webview.c index 60f33492..54c5256b 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -447,12 +447,12 @@ gtk_widget_scroll_event (MidoriWebView* web_view, return FALSE; } -static void -midori_web_view_menu_new_tab_activate (GtkWidget* action, - MidoriBrowser* browser) +/*static void +midori_web_view_menu_new_tab_activate (GtkWidget* widget, + MidoriWebView* web_view) { // FIXME: Open a new tab and load the uri -} +}*/ static void webkit_web_view_populate_popup_cb (GtkWidget* web_view, @@ -582,7 +582,7 @@ midori_web_view_init (MidoriWebView* web_view) "signal::scroll-event", gtk_widget_scroll_event, NULL, "signal::populate-popup", - webkit_web_view_populate_popup_cb, browser, + webkit_web_view_populate_popup_cb, NULL, NULL); g_object_connect (web_frame, "signal::load-done", From 4a1e0ab67b712e7c5eedc607e7dc3ce7c598d9ea Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 11 Mar 2008 20:27:23 +0100 Subject: [PATCH 0040/2970] Fix Back button and opening new tabs. --- src/midori-browser.c | 2 +- src/midori-webview.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index b59e409d..fafc3acb 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -170,7 +170,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) webkit_web_view_get_text_size (WEBKIT_WEB_VIEW (web_view)) != 1);*/ _action_set_sensitive (browser, "Back", webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Back", + _action_set_sensitive (browser, "Forward", webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); _action_set_sensitive (browser, "Reload", loading); _action_set_sensitive (browser, "Stop", !loading); diff --git a/src/midori-webview.c b/src/midori-webview.c index 54c5256b..8459317d 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -172,8 +172,9 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_STRUCT_OFFSET (MidoriWebViewClass, new_tab), 0, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); signals[NEW_WINDOW] = g_signal_new( "new-window", From 02d7848c5ddab57941999e5a59e6ad52d48e36d7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 13 Mar 2008 01:21:59 +0100 Subject: [PATCH 0041/2970] Add Open Link in New Tab and Open URL in New Tab. Enhance the context menu to allow opening of links in a new tab as well as any selected text that looks like an URL. --- src/global.h | 42 +++++++++++++++-------------------- src/midori-webview.c | 52 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 33 deletions(-) diff --git a/src/global.h b/src/global.h index e27125c9..e81bc630 100644 --- a/src/global.h +++ b/src/global.h @@ -15,7 +15,7 @@ #include "conf.h" #include "midori-websettings.h" -#include "../katze/katze.h" +#include #include #include @@ -34,39 +34,31 @@ MidoriWebSettings* webSettings; /* NOTE: Those uncommented were replaced with remotely related icons in order to reduce the amount of warnings :D */ -#define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" // "bookmark-web" -#define STOCK_FORM_FILL "insert-text" // "form-fill" // MISSING -#define STOCK_LOCATION "location-entry" -#define STOCK_NEWSFEED "gtk-index" // "newsfeed" // MISSING -#define STOCK_PLUGINS "plugin" // MISSING +#define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" "bookmark-web" +#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL // "insert-text" "form-fill" +#define STOCK_LOCATION GTK_STOCK_BOLD // "location-entry" +#define STOCK_NEWSFEED "gtk-index" // "newsfeed" +#define STOCK_PLUGINS GTK_STOCK_CONVERT // "plugin" #define STOCK_POPUPS_BLOCKED "popup-hidden" -#define STOCK_SOURCE_VIEW "stock_view-html-source" // MISSING -#define STOCK_TAB_CLOSE "tab-close" // MISSING -#define STOCK_WINDOW_CLOSE "window-close" // MISSING +#define STOCK_SOURCE_VIEW "stock_view-html-source" // "view-source" +#define STOCK_TAB_CLOSE GTK_STOCK_CLOSE // "tab-close" +#define STOCK_WINDOW_CLOSE GTK_STOCK_CLOSE // "window-close" -// We can safely use standard icons -// Assuming that we have reliable fallback icons +// We assume that these legacy icon names are usually present -#define STOCK_BOOKMARK_NEW "bookmark-new" -#define STOCK_BOOKMARK_NEW_ "stock_add-bookmark" +#define STOCK_BOOKMARK_NEW "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME -#define STOCK_IMAGE "image-x-generic" -#define STOCK_IMAGE_ "gnome-mime-image" +#define STOCK_IMAGE "gnome-mime-image" #define STOCK_LOCK_OPEN "stock_lock-open" #define STOCK_LOCK_SECURE "stock_lock" #define STOCK_LOCK_BROKEN "stock_lock-broken" -#define STOCK_NETWORK_OFFLINE "connect_no" -#define STOCK_NETWORK_OFFLINE_ "network-offline" +#define STOCK_NETWORK_OFFLINE "network-offline" #define STOCK_SCRIPT "stock_script" -#define STOCK_SEND "mail-send" -#define STOCK_SEND_ "stock_mail-send" -#define STOCK_TAB_NEW "tab-new" -#define STOCK_TAB_NEW_ "stock_new-tab" +#define STOCK_SEND "stock_mail-send" +#define STOCK_TAB_NEW "stock_new-tab" #define STOCK_THEME "gnome-settings-theme" -#define STOCK_USER_TRASH "user-trash" -#define STOCK_USER_TRASH_ "gnome-stock-trash" -#define STOCK_WINDOW_NEW "window-new" -#define STOCK_WINDOW_NEW_ "stock_new-window" +#define STOCK_USER_TRASH "gnome-stock-trash" +#define STOCK_WINDOW_NEW "stock_new-window" // For backwards compatibility diff --git a/src/midori-webview.c b/src/midori-webview.c index 8459317d..4b2e250c 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -11,11 +11,16 @@ #include "midori-webview.h" +#include "global.h" #include "sokoke.h" #include #include +// This is unstable API, so we need to declare it +gchar* +webkit_web_view_get_selected_text (WebKitWebView* web_view); + G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) struct _MidoriWebViewPrivate @@ -448,12 +453,14 @@ gtk_widget_scroll_event (MidoriWebView* web_view, return FALSE; } -/*static void -midori_web_view_menu_new_tab_activate (GtkWidget* widget, - MidoriWebView* web_view) +static void +midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, + MidoriWebView* web_view) { - // FIXME: Open a new tab and load the uri -}*/ + const gchar* uri = g_object_get_data (G_OBJECT (widget), "uri"); + g_print ("selected: %s\n", uri); + g_signal_emit (web_view, signals[NEW_TAB], 0, uri); +} static void webkit_web_view_populate_popup_cb (GtkWidget* web_view, @@ -462,12 +469,41 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, const gchar* uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) { - // new tab + GtkWidget* menuitem = gtk_image_menu_item_new_with_mnemonic ( + "Open Link in New _Tab"); + GdkScreen* screen = gtk_widget_get_screen (web_view); + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, STOCK_TAB_NEW)) + { + GtkWidget* icon = gtk_image_new_from_stock (STOCK_TAB_NEW, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + } + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 1); + g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); + gtk_widget_show (menuitem); } - if (webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + if (!uri && webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) { - // selected uri in tab + gchar* text = webkit_web_view_get_selected_text ( + WEBKIT_WEB_VIEW (web_view)); + if (text && strchr (text, '.') && !strchr (text, ' ')) + { + GtkWidget* menuitem = gtk_image_menu_item_new_with_mnemonic ( + "Open URL in New _Tab"); + GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, -1); + g_object_set_data (G_OBJECT (menuitem), "uri", text); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); + gtk_widget_show (menuitem); + } + // FIXME: We are leaking 'text' which is not const be should be. } } From 44bc12c305e7137e3b10f7ba86b383e249022a43 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 19 Mar 2008 14:46:08 +0100 Subject: [PATCH 0042/2970] Add common context menu items and cleanup. Add the actions UndoTabClose, BookmarkNew, SaveAs, SourceView and Print to the context menu. Also add UndoTabClose to the Go menu, remove STOCK_SOURCE_VIEW and remove ui.h which is obsolete. --- src/global.h | 1 - src/main.c | 1 - src/midori-browser.c | 36 +++++++++++++++++++++++++----------- src/midori-webview.c | 17 +++++++++++++++-- src/ui.h | 15 --------------- 5 files changed, 40 insertions(+), 30 deletions(-) delete mode 100644 src/ui.h diff --git a/src/global.h b/src/global.h index e81bc630..971f2651 100644 --- a/src/global.h +++ b/src/global.h @@ -40,7 +40,6 @@ MidoriWebSettings* webSettings; #define STOCK_NEWSFEED "gtk-index" // "newsfeed" #define STOCK_PLUGINS GTK_STOCK_CONVERT // "plugin" #define STOCK_POPUPS_BLOCKED "popup-hidden" -#define STOCK_SOURCE_VIEW "stock_view-html-source" // "view-source" #define STOCK_TAB_CLOSE GTK_STOCK_CLOSE // "tab-close" #define STOCK_WINDOW_CLOSE GTK_STOCK_CLOSE // "window-close" diff --git a/src/main.c b/src/main.c index 2fdf1854..ff7f45ed 100644 --- a/src/main.c +++ b/src/main.c @@ -47,7 +47,6 @@ static void stock_items_init(void) { STOCK_NEWSFEED, "Newsfeed", 0, 0, NULL }, { STOCK_PLUGINS, "_Plugins", 0, 0, NULL }, { STOCK_POPUPS_BLOCKED, "Blocked Popups", 0, 0, NULL }, - { STOCK_SOURCE_VIEW, "View Source", 0, 0, NULL }, { STOCK_TAB_CLOSE, "C_lose Tab", 0, 0, NULL }, { STOCK_TAB_NEW, "New _Tab", 0, 0, NULL }, { STOCK_WINDOW_CLOSE, "_Close Window", 0, 0, NULL }, diff --git a/src/midori-browser.c b/src/midori-browser.c index fafc3acb..71ca4749 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -396,13 +396,24 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) { - // TODO: menu items - // UndoTabClose - // sep - // BookmarkNew - // SaveAs - // SourceView - // Print + GtkAction* action = _action_by_name (browser, "UndoTabClose"); + GtkWidget* menuitem = gtk_action_create_menu_item (action); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + action = _action_by_name (browser, "BookmarkNew"); + menuitem = gtk_action_create_menu_item (action); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + action = _action_by_name (browser, "SaveAs"); + menuitem = gtk_action_create_menu_item (action); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + action = _action_by_name (browser, "SourceView"); + menuitem = gtk_action_create_menu_item (action); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + action = _action_by_name (browser, "Print"); + menuitem = gtk_action_create_menu_item (action); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } } @@ -1920,10 +1931,10 @@ static const GtkActionEntry entries[] = { { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", "hm?", NULL/*G_CALLBACK (_action_zoom_normal_activate)*/ }, - { "SourceView", STOCK_SOURCE_VIEW, - NULL, "", + { "SourceView", NULL, + "View Source", "", "hm?", /*G_CALLBACK (_action_source_view_activate)*/ }, - { "SelectionSourceView", STOCK_SOURCE_VIEW, + { "SelectionSourceView", NULL, "View Selection Source", "", "hm?", NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, { "Fullscreen", GTK_STOCK_FULLSCREEN, @@ -2151,6 +2162,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -2669,7 +2681,9 @@ midori_browser_set_property (GObject* object, case PROP_SETTINGS: katze_object_assign (priv->settings, g_value_get_object (value)); g_object_ref (priv->settings); - // FIXME: Assign settings to each web view + gtk_container_foreach (GTK_CONTAINER (priv->notebook), + (GtkCallback*) midori_web_view_set_settings, + priv->settings); break; case PROP_TRASH: ; // FIXME: Disconnect handlers diff --git a/src/midori-webview.c b/src/midori-webview.c index 4b2e250c..c61ad92c 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -458,7 +458,6 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, MidoriWebView* web_view) { const gchar* uri = g_object_get_data (G_OBJECT (widget), "uri"); - g_print ("selected: %s\n", uri); g_signal_emit (web_view, signals[NEW_TAB], 0, uri); } @@ -503,7 +502,7 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); gtk_widget_show (menuitem); } - // FIXME: We are leaking 'text' which is not const be should be. + // FIXME: We are leaking 'text' which is not const but should be. } } @@ -755,6 +754,20 @@ midori_web_view_new (void) return GTK_WIDGET (web_view); } +/** + * midori_web_view_set_settings: + * @web_view: a #MidoriWebView + * @web_settings: a #MidoriWebSettings + * + * Assigns a settings instance to the web view. + **/ +void +midori_web_view_set_settings (MidoriWebView* web_view, + MidoriWebSettings* web_settings) +{ + g_object_set (web_view, "settings", web_settings, NULL); +} + /** * midori_web_view_get_proxy_menu_item: * @web_view: a #MidoriWebView diff --git a/src/ui.h b/src/ui.h deleted file mode 100644 index bc5d6a8b..00000000 --- a/src/ui.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __UI_H__ -#define __UI_H__ 1 - -#endif /* !__UI_H__ */ From bf8061865856030f6fa273768d8fb6a0036818db Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 19 Mar 2008 15:14:44 +0100 Subject: [PATCH 0043/2970] Update the TODO file. --- TODO | 99 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/TODO b/TODO index 9f0a8def..8f8b8a98 100644 --- a/TODO +++ b/TODO @@ -1,62 +1,61 @@ TODO: + . Import and export of the bookmarks file, or using one from a specific path . Save files on change as opposed to on quit - . Position menus properly - . Use an animated throbber - . Add a context menu to the pageholder - . Make tabs autoshrink + . Position context menus properly . New tabs from a TabNew action should always open in the foreground . Middle click toolbuttons or menuitems should open new tabs - . Implement userscript support + . Implement support for (multiple) userscripts/ userstyles . Actual multiple window support, some things just ignore this currently . Custom context menu actions - . custom tab names + . Create proper submenus in the window's menu instead of popups + . Custom tab names + . Identify and fix Gtk2.6 compatibility problems . Open an auto-vanishing findbox with '.' . Support gettext + . Implement custom actions, like in Thunar or Epiphany . Custom panels, loaded from (x)htm(l) files or websites - . Drag tabs onto the panel to have it in the sidebar. + . Drag tabs onto the panel to add them to the sidebar . Save completion stores - . analogus to blocked popups, blocked scripts moving layers on load - . per-site blocking of individual elements on a page - . statusbar icon 'cookies blocked', icon 'popups blocked' - . per-site settings accessible via statusbar icons, ie. cookies, popups, plugins - . cookieSafe like, a list of cookies, with type, block, allow - . support mouse gestures - . optional internal source view using gtksourceview - . automatic update checks (browser, extensions)? - . auto-group tabs by opener, with colors? - . mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page - . have an internal uri scheme, eg. 'res:', to reference eg. themed icons + . Analogus to blocked popups, blocked scripts moving layers on load (extension) + . Per-site blocking of individual elements on a page + . Statusbar icon 'cookies blocked', icon 'popups blocked' + . Per-site settings accessible via statusbar icons, ie. cookies, popups, plugins + . CookieSafe like, a list of cookies, with type, block, allow + . Support mouse gestures (extension) + . Optional internal source view using gtksourceview? + . Automatic update checks (browser, extensions)? + . Auto-group tabs by opener, with colors? + . Mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page + . Have an internal uri scheme, eg. 'res:', to reference eg. themed icons . 'about:' uris: about, blank, cache, config, plugins - . panel of open tabs (with tree-structure), optional thumbnail-view - . spell check support - . allow full page zoom (how do we incorporate it in the gui?) - . check specific bookmarks for updates automatically (as an extension?) - . mark "new" as well as "actually modified" tabs specially (even over sessions) - . customizable toolbars, custom buttons (uri, title, icon) - . searchEngine: "Show in context menu" - . use libnotify for events, e.g. download finished - . save screenshot of a document - . right-click a textbox in a search form and choose 'add to websearch' - . support extensions written in lua - . the scrollbar must be exactly at the right (left) edge if maximized: fitt's law - . detailed css element view, maybe in 'properties'? - . reuse running instance, probably via libunique - . respect design principle "no warnings but undo of backups"? - . support widgets 1.0 spec in tool windows and standalone - . blank page: several custom links, displayed as thumbnails, like Opera - . handle downloads, optionally in a downloadbar - . Implement userstyle support + . Panel of open tabs (with tree-structure), optional thumbnail-view + . Spell check support + . Allow text and full page zoom (how do we incorporate it in the gui?) + . Check specific bookmarks for updates automatically (extension) + . Mark "new" as well as "actually modified" tabs specially (even over sessions) + . Customizable toolbars, custom buttons (uri, title, icon)? + . SearchEngine: "Show in context menu" + . Use libnotify for events, e.g. download finished + . Save screenshot of a document? + . Right-click a textbox in a search form and choose 'add to websearch' + . Support extensions written in lua, possibly also Python? + . Reuse running instance, probably via libunique + . Honor design principle "no warnings but undo of backups"? + . Support widgets 1.0 spec in tool windows and standalone? + . Blank page: several custom links, displayed as thumbnails, like Opera? + . Handle downloads, optionally in a downloadbar . Protected tabs prompt when attempting to close them - . provide a 'sleep mode' after a crash where open documents are loaded manually - . option to run plugins or scripts only on demand, like NoScript, per-site - . optional http redirection manually or on timeout - . style: none, compatible (b/w), default, [styles], "media", ["media" styles], ... - . mouse pointer coordinates in the status bar - . draw rectangle with the mouse, x/y/x2/y2 in the statusbar - . formfill (like Opera's magic wand) - . private browsing mode (no browsing, download or search history) - . shared bookmarks and config - . custom-mode, e.g. hide menubar and use help icon to have a help viewer - . dead tabs: download, aborted page - . on url load, for big files, ask "Open or save?" - . middle-click on selection to open + . Provide a 'sleep mode' after a crash where open documents are loaded manually + . Option to run plugins or scripts only on demand, like NoScript, per-site + . Optional http redirection manually or on timeout + . Style: none, compatible (b/w), default, [styles], "media", ["media" styles], ... + . Mouse pointer coordinates in the status bar (extension) + . Draw rectangle with the mouse, x/y/x2/y2 in the statusbar (extension) + . Formfill (like Opera's magic wand) + . Private browsing mode (no browsing, download or search history) + . Shared bookmarks and config + . Custom-mode, e.g. hide menubar and use help icon to have a help viewer + . Prevent dead tabs: download, aborted page + . On url load, for big files, ask "Open or save?" + . Always display the tabbar (extension) + . An option to not reuse the current tab when entering an url or searching From be89221aea13aa092f64d2133fd5bed5c23f4972 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 22 Mar 2008 03:38:23 +0100 Subject: [PATCH 0044/2970] Implement localization via Gettext. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on the implementation of localization via Gettext contributed by Enrico Tröger, a few adjustments were made to allow Midori to be properly localized. Initially German is fully supported. --- Makefile.am | 20 +- autogen.sh | 4 +- configure.in | 19 +- katze/Makefile.am | 3 +- katze/katze-throbber.c | 15 +- katze/katze-xbel.c | 15 +- midori.desktop => midori.desktop.in | 6 +- po/LINGUAS | 2 + po/Makefile.in.in | 218 +++++++ po/POTFILES.in | 18 + po/POTFILES.skip | 1 + po/de.po | 956 ++++++++++++++++++++++++++++ src/Makefile.am | 3 + src/conf.c | 4 +- src/global.h | 9 +- src/helpers.c | 4 +- src/main.c | 111 ++-- src/midori-browser.c | 191 +++--- src/midori-panel.c | 13 +- src/midori-trash.c | 3 +- src/midori-websettings.c | 7 +- src/midori-webview.c | 14 +- src/prefs.c | 164 ++--- src/sokoke.c | 5 +- src/webSearch.c | 17 +- 25 files changed, 1540 insertions(+), 282 deletions(-) rename midori.desktop => midori.desktop.in (72%) create mode 100644 po/LINGUAS create mode 100644 po/Makefile.in.in create mode 100644 po/POTFILES.in create mode 100644 po/POTFILES.skip create mode 100644 po/de.po diff --git a/Makefile.am b/Makefile.am index 95418862..3f505e28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,22 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = katze src +SUBDIRS = katze src po desktopdir = $(datadir)/applications -desktop_DATA = midori.desktop +desktop_in_files = midori.desktop +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ -EXTRA_DIST = HACKING TODO $(desktop_DATA) +DISTCLEANFILES = \ + midori.desktop \ + intltool-extract \ + intltool-merge \ + intltool-update + +EXTRA_DIST = \ + HACKING \ + TODO \ + midori.desktop.in \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in diff --git a/autogen.sh b/autogen.sh index 739a102c..b17da47e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,9 @@ #!/bin/sh +echo "no" | glib-gettextize --force --copy +intltoolize --copy --force --automake libtoolize --copy --force aclocal autoheader autoconf -automake --add-missing --copy \ No newline at end of file +automake --add-missing --copy diff --git a/configure.in b/configure.in index dc257970..b495ffd4 100644 --- a/configure.in +++ b/configure.in @@ -10,6 +10,7 @@ AM_PROG_LIBTOOL AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET +AC_PROG_INTLTOOL # Checks for header files AC_HEADER_STDC @@ -82,11 +83,26 @@ AC_SUBST(LIBXML_LIBS) LIBXML_VER=`pkg-config --modversion libxml-2.0` AC_DEFINE_UNQUOTED([LIBXML_VER], "$LIBXML_VER", [libXML2 version]) +# i18n +GETTEXT_PACKAGE=midori +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) + +ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS + +AM_GLIB_GNU_GETTEXT +# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) +if test "x$MSGFMT" = "xno"; then + AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) +fi + + # Here we tell the configure script which files to *create* AC_CONFIG_FILES([ Makefile \ katze/Makefile \ - src/Makefile + src/Makefile \ + po/Makefile.in ]) AC_OUTPUT @@ -96,7 +112,6 @@ echo " GTK+2 $GTK_VER" echo " WebKit $WEBKIT_VER" echo " Libsexy $LIBSEXY_VER" echo " libXML2 $LIBXML_VER" -echo " GetText N/A" echo echo " Debugging $enable_debug" echo diff --git a/katze/Makefile.am b/katze/Makefile.am index fd22b389..ba058a4f 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -6,7 +6,8 @@ noinst_LTLIBRARIES = \ libkatze.la libkatze_la_LIBADD = \ - $(GTK_LIBS) \ + $(GTK_LIBS) \ + $(INTLLIBS) \ $(LIBXML_LIBS) libkatze_la_SOURCES = \ diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 0565f345..069e6603 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -12,6 +12,7 @@ #include "katze-throbber.h" #include +#include G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC) @@ -131,7 +132,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_int ( "icon-size", "Icon size", - "Symbolic size to use for the animation", + _("Symbolic size to use for the animation"), 0, G_MAXINT, GTK_ICON_SIZE_MENU, flags)); @@ -140,7 +141,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_string ( "icon-name", "Icon Name", - "The name of an icon containing animation frames", + _("The name of an icon containing animation frames"), "process-working", flags)); @@ -149,7 +150,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_object ( "pixbuf", "Pixbuf", - "A GdkPixbuf containing animation frames", + _("A GdkPixbuf containing animation frames"), GDK_TYPE_PIXBUF, flags)); @@ -158,7 +159,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_boolean ( "animated", "Animated", - "Whether the throbber should be animated", + _("Whether the throbber should be animated"), FALSE, flags)); @@ -167,7 +168,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_string ( "static-icon-name", "Static Icon Name", - "The name of an icon to be used as the static image", + _("The name of an icon to be used as the static image"), NULL, flags)); @@ -176,7 +177,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_object ( "static-pixbuf", "Static Pixbuf", - "A GdkPixbuf to be used as the static image", + _("A GdkPixbuf to be used as the static image"), GDK_TYPE_PIXBUF, flags)); @@ -185,7 +186,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) g_param_spec_string ( "static-stock-id", "Static Stock ID", - "The stock ID of an icon to be used as the static image", + _("The stock ID of an icon to be used as the static image"), NULL, flags)); diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c index d1ea4295..f797de10 100644 --- a/katze/katze-xbel.c +++ b/katze/katze-xbel.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "katze-utils.h" @@ -719,7 +720,7 @@ katze_xbel_folder_from_data (KatzeXbelItem* folder, { // No valid xml or broken encoding *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - "Malformed document."); + _("Malformed document.")); return FALSE; } if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) @@ -727,7 +728,7 @@ katze_xbel_folder_from_data (KatzeXbelItem* folder, // Parsing failed xmlFreeDoc(doc); *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - "Malformed document."); + _("Malformed document.")); return FALSE; } xmlFreeDoc(doc); @@ -755,7 +756,7 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, { // File doesn't exist *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_NOENT, - "File not found."); + _("File not found.")); return FALSE; } xmlDocPtr doc; @@ -763,7 +764,7 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, { // No valid xml or broken encoding *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - "Malformed document."); + _("Malformed document.")); return FALSE; } if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) @@ -771,7 +772,7 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, // Parsing failed xmlFreeDoc (doc); *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - "Malformed document."); + _("Malformed document.")); return FALSE; } xmlFreeDoc (doc); @@ -800,7 +801,7 @@ katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, // FIXME: Essentially unimplemented *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - "Malformed document."); + _("Malformed document.")); return FALSE; } @@ -948,7 +949,7 @@ katze_xbel_folder_to_file (KatzeXbelItem* folder, if(!(fp = fopen (file, "w"))) { *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES, - "Writing failed."); + _("Writing failed.")); return FALSE; } fputs (data, fp); diff --git a/midori.desktop b/midori.desktop.in similarity index 72% rename from midori.desktop rename to midori.desktop.in index e8e64488..a4bf004e 100644 --- a/midori.desktop +++ b/midori.desktop.in @@ -3,9 +3,9 @@ Version=1.0 Encoding=UTF-8 Type=Application -Name=Midori Web Browser -GenericName=Web Browser -Comment=Lightweight web browser +_Name=Midori Web Browser +_GenericName=Web Browser +_Comment=Lightweight web browser Categories=GTK;Network; MimeType=text/html;text/xml;application/xhtml+xml;application/xml; Exec=midori %u diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 00000000..378dbde1 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,2 @@ +# set of available languages (in alphabetic order) +de diff --git a/po/Makefile.in.in b/po/Makefile.in.in new file mode 100644 index 00000000..6891e8f7 --- /dev/null +++ b/po/Makefile.in.in @@ -0,0 +1,218 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# Copyright (C) 2004-2008 Rodney Dawes +# +# This file may be copied and used freely without restrictions. It may +# be used in projects which are not available under a GNU Public License, +# but which still want to provide support for the GNU gettext functionality. +# +# - Modified by Owen Taylor to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize +# +# - Modified by Rodney Dawes for use with intltool +# +# We have the following line for use by intltoolize: +# INTLTOOL_MAKEFILE + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +datarootdir = @datarootdir@ +libdir = @libdir@ +DATADIRNAME = @DATADIRNAME@ +itlocaledir = $(prefix)/$(DATADIRNAME)/locale +subdir = po +install_sh = @install_sh@ +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ + +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = @XGETTEXT@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + +ALL_LINGUAS = @ALL_LINGUAS@ + +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) + +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) + +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) + +POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) + +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS + +POTFILES = \ +# This comment gets stripped out + +CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) + +.SUFFIXES: +.SUFFIXES: .po .pox .gmo .mo .msg .cat + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && gencat $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(GENPOT) + +install: install-data +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + $(mkdir_p) $(DESTDIR)$(itlocaledir) + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $$dir; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$lang.gmo as" \ + "$$dir/$(GETTEXT_PACKAGE).mo"; \ + fi; \ + if test -r $$lang.gmo.m; then \ + $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + if test -r $(srcdir)/$$lang.gmo.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ + $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $(srcdir)/$$lang.gmo.m as" \ + "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + true; \ + fi; \ + fi; \ + done + +# Empty stubs to satisfy archaic automake needs +dvi info tags TAGS ID: + +# Define this as empty until I found a useful application. +install-exec installcheck: + +uninstall: + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + +check: all $(GETTEXT_PACKAGE).pot + rm -f missing notexist + srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m + if [ -r missing -o -r notexist ]; then \ + exit 1; \ + fi + +mostlyclean: + rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f .intltool-merge-cache + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES stamp-it + rm -f *.mo *.msg *.cat *.cat.m *.gmo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f Makefile.in.in + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: $(DISTFILES) + dists="$(DISTFILES)"; \ + extra_dists="$(EXTRA_DISTFILES)"; \ + for file in $$extra_dists; do \ + test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ + done; \ + for file in $$dists; do \ + test -f $$file || file="$(srcdir)/$$file"; \ + ln $$file $(distdir) 2> /dev/null \ + || cp -p $$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + echo "$$lang:"; \ + result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ + if $$result; then \ + if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.gmo failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +Makefile POTFILES: stamp-it + @if test ! -f $@; then \ + rm -f stamp-it; \ + $(MAKE) stamp-it; \ + fi + +stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ + $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 00000000..c6203f0b --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,18 @@ +# List of source files containing translatable strings. + +midori.desktop.in +src/conf.c +src/helpers.c +src/main.c +src/midori-browser.c +src/midori-panel.c +src/midori-trash.c +src/midori-websettings.c +src/midori-webview.c +src/prefs.c +src/search.c +src/sokoke.c +src/webSearch.c +katze/katze-throbber.c +katze/katze-utils.c +katze/katze-xbel.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip new file mode 100644 index 00000000..810789ee --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1 @@ +# List of source files containing translatable strings but should be ignored. diff --git a/po/de.po b/po/de.po new file mode 100644 index 00000000..92ed1189 --- /dev/null +++ b/po/de.po @@ -0,0 +1,956 @@ +# German translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Enrico Tröger 2008 +# Christian Dywan 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.17\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-03-22 03:05+0100\n" +"PO-Revision-Date: 2008-03-20 13:21+0100\n" +"Last-Translator: Christian Dywan \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Kleiner Navigator" + +#: ../midori.desktop.in.h:2 +msgid "Midori Web Browser" +msgstr "Midori Navigator" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Navigator" + +#. FIXME: Should we have a more specific message? +#: ../src/helpers.c:68 ../src/helpers.c:84 +msgid "Could not run external program." +msgstr "Externes Programm konnte nicht gestartet werden" + +#: ../src/main.c:49 +msgid "Bookmark" +msgstr "Lesezeichen" + +#: ../src/main.c:50 +msgid "New Bookmark" +msgstr "Neues Lesezeichen" + +#: ../src/main.c:51 +msgid "_Form Fill" +msgstr "_Formulare ausfüllen" + +#: ../src/main.c:52 ../src/prefs.c:369 ../src/prefs.c:374 +msgid "Homepage" +msgstr "Startseite" + +#: ../src/main.c:53 +msgid "New _Tab" +msgstr "Neuer _Reiter" + +#: ../src/main.c:54 +msgid "New _Window" +msgstr "Neues _Fenster" + +#: ../src/main.c:59 +msgid "_Fullscreen" +msgstr "_Vollbild" + +#: ../src/main.c:60 +msgid "_Leave Fullscreen" +msgstr "Vollbild _verlassen" + +#: ../src/main.c:139 ../src/main.c:171 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:146 +msgid "Display program version" +msgstr "Programmversion anzeigen" + +#: ../src/main.c:150 +msgid "[URL]" +msgstr "[URL]" + +#: ../src/main.c:173 +msgid "Debugging" +msgstr "Fehlerbehebung" + +#: ../src/main.c:174 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" + +#: ../src/main.c:176 +msgid "Check for new versions at:" +msgstr "Informieren Sie sich über neue Versionen unter:" + +#: ../src/main.c:193 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" + +#: ../src/main.c:219 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" + +#: ../src/main.c:232 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Die Sitzung konnte nicht geladen werden. %s\n" + +#: ../src/main.c:244 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" + +#: ../src/main.c:254 +msgid "The following errors occured:" +msgstr "Folgende Fehler sind aufgetreten:" + +#: ../src/main.c:56 +msgid "Select _All" +msgstr "A_lles markieren" + +#: ../src/midori-browser.c:185 ../src/midori-browser.c:1918 +#: ../src/midori-browser.c:1924 +msgid "Reload the current page" +msgstr "Diese Seite neu laden" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:1921 +msgid "Stop loading the current page" +msgstr "Laden dieser Seite abbrechen" + +#: ../src/midori-browser.c:258 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% geladen" + +#: ../src/midori-browser.c:521 ../src/midori-webview.c:253 +msgid "The associated settings" +msgstr "Die zugewiesenen Einstellungen" + +#: ../src/midori-browser.c:541 ../src/midori-webview.c:244 +msgid "The text that is displayed in the statusbar" +msgstr "Der Text, der in der Statusleiste angezeigt wird" + +#: ../src/midori-browser.c:560 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" + +#: ../src/midori-browser.c:1051 +msgid "Open location" +msgstr "Adresse öffnen" + +#: ../src/midori-browser.c:1063 ../src/midori-browser.c:1109 +msgid "_Location:" +msgstr "_Ort:" + +#. TODO: We should offer all of the search's features here +#: ../src/midori-browser.c:1097 +msgid "Web search" +msgstr "Netzsuche" + +#: ../src/midori-browser.c:1136 +msgid "New bookmark" +msgstr "Neues Lesezeichen" + +#: ../src/midori-browser.c:1136 +msgid "Edit bookmark" +msgstr "Lesezeichen bearbeiten" + +#: ../src/midori-browser.c:1153 +msgid "_Title:" +msgstr "_Titel:" + +#: ../src/midori-browser.c:1169 ../src/webSearch.c:199 +msgid "_Description:" +msgstr "_Beschreibung" + +#: ../src/midori-browser.c:1188 ../src/webSearch.c:213 +msgid "_URL:" +msgstr "_URL:" + +#: ../src/midori-browser.c:1206 +msgid "_Folder:" +msgstr "_Ordner:" + +#: ../src/midori-browser.c:1210 +msgid "Root" +msgstr "Wurzel" + +#: ../src/midori-browser.c:1429 +msgid "Separator" +msgstr "Trennlinie" + +#: ../src/midori-browser.c:1615 +msgid "A lightweight web browser." +msgstr "Ein kleiner Navigator." + +#: ../src/midori-browser.c:1623 +msgid "translator-credits" +msgstr "" +"Enrico Tröger \n" +"Christian Dywan " + +#: ../src/midori-browser.c:1838 +msgid "_File" +msgstr "_Datei" + +#: ../src/midori-browser.c:1841 +msgid "Open a new window" +msgstr "Ein neues Fenster öffnen" + +#: ../src/midori-browser.c:1844 +msgid "Open a new tab" +msgstr "Einen neuen Reiter öffnen" + +#: ../src/midori-browser.c:1847 +msgid "Open a file" +msgstr "Eine Datei öffnen" + +#: ../src/midori-browser.c:1850 +msgid "Save to a file" +msgstr "In Datei speichern" + +#: ../src/midori-browser.c:1852 +msgid "_Close Tab" +msgstr "Reiter sch_ließen" + +#: ../src/midori-browser.c:1853 +msgid "Close the current tab" +msgstr "Den aktuellen Reiter schließen" + +#: ../src/midori-browser.c:1855 +msgid "C_lose Window" +msgstr "_Fenster schließen" + +#: ../src/midori-browser.c:1856 +msgid "Close this window" +msgstr "Dieses Fenster schließen" + +#: ../src/midori-browser.c:1858 +msgid "Pa_ge Setup" +msgstr "Seite _einrichten" + +#: ../src/midori-browser.c:1868 +msgid "Quit the application" +msgstr "Programm beenden" + +#: ../src/midori-browser.c:1870 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: ../src/midori-browser.c:1873 +msgid "Undo the last modification" +msgstr "Die letzte Änderung wiederrufen" + +#: ../src/midori-browser.c:1876 +msgid "Redo the last modification" +msgstr "Die letzte Änderung wiederholen" + +#: ../src/midori-browser.c:1882 ../src/midori-browser.c:1885 +msgid "Copy the selected text" +msgstr "MArkierten Text kopieren" + +#: ../src/midori-browser.c:1888 +msgid "Paste text from the clipboard" +msgstr "Text aus der Zwischenablage einfügen" + +#: ../src/midori-browser.c:1891 +msgid "Delete the selected text" +msgstr "Marlkierten Text löschen" + +#: ../src/midori-browser.c:1894 +msgid "Select all text" +msgstr "Gesamten Text auswählen" + +#: ../src/midori-browser.c:1902 +msgid "Find _Next" +msgstr "_Nächstes" + +#: ../src/midori-browser.c:1905 +msgid "Find _Previous" +msgstr "_Vorheriges" + +#: ../src/midori-browser.c:1908 +msgid "_Quick Find" +msgstr "_Schnellsuche" + +#: ../src/midori-browser.c:1914 +msgid "_View" +msgstr "_Ansicht" + +#: ../src/midori-browser.c:1915 +msgid "_Toolbars" +msgstr "_Werkzeugleisten" + +#: ../src/midori-browser.c:1935 +msgid "View Source" +msgstr "Quelltext anzeigen" + +#: ../src/midori-browser.c:1938 +msgid "View Selection Source" +msgstr "Quelltext der Markierung anzeigen" + +#: ../src/midori-browser.c:1942 +msgid "Toggle fullscreen view" +msgstr "Vollbildmodus ein-/ ausschalten" + +#: ../src/midori-browser.c:1944 +msgid "_Go" +msgstr "_Gehe zu" + +#: ../src/midori-browser.c:1955 +msgid "Location..." +msgstr "Ort..." + +#: ../src/midori-browser.c:1958 +msgid "Web Search..." +msgstr "Netzsuche..." + +#: ../src/midori-browser.c:1961 +msgid "Open in Page_holder..." +msgstr "In Seiten_halter öffnen..." + +#: ../src/midori-browser.c:1964 +msgid "Closed Tabs and Windows" +msgstr "Geschlossene Reiter und Fenster" + +#: ../src/midori-browser.c:1965 +msgid "Reopen a previously closed tab or window" +msgstr "Reiter oder Fenster zurückholen" + +#: ../src/midori-browser.c:1967 +msgid "Empty Trash" +msgstr "Papierkorb leeren" + +#: ../src/midori-browser.c:1970 +msgid "Undo Close Tab" +msgstr "Reiter zurückholen" + +#: ../src/midori-browser.c:1973 +msgid "_Bookmarks" +msgstr "_Lesezeichen" + +#: ../src/midori-browser.c:1978 +msgid "_Manage Bookmarks" +msgstr "Lesezeichen _verwalten" + +#: ../src/midori-browser.c:1984 +msgid "Open in New _Tab" +msgstr "In einem neuen _Reiter öffnen" + +#: ../src/midori-browser.c:1987 +msgid "Open in New _Window" +msgstr "In einem neuen _Fenster öffnen" + +#: ../src/midori-browser.c:1996 +msgid "_Tools" +msgstr "_Extras" + +#: ../src/midori-browser.c:1998 +msgid "_Manage Search Engines" +msgstr "Suchmaschinen verwalten" + +#: ../src/midori-browser.c:1999 +msgid "Add, edit and remove search engines..." +msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." + +#: ../src/midori-browser.c:2002 +msgid "_Window" +msgstr "_Fenster" + +#: ../src/midori-browser.c:2004 +msgid "_Previous Tab" +msgstr "_Vorheriger Reiter" + +#: ../src/midori-browser.c:2007 +msgid "_Next Tab" +msgstr "_Nächster Reiter" + +#: ../src/midori-browser.c:2010 +msgid "Tab _Overview" +msgstr "Reiterüber_sicht" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../src/midori-browser.c:2013 +msgid "_Help" +msgstr "_Hilfe" + +#: ../src/midori-browser.c:2015 +msgid "_Contents" +msgstr "_Inhalt" + +#: ../src/midori-browser.c:2025 +msgid "P_rivate Browsing" +msgstr "_Privat navigieren" + +#: ../src/midori-browser.c:2029 +msgid "_Work Offline" +msgstr "_Ohne Verbindung arbeiten" + +#: ../src/midori-browser.c:2034 +msgid "_Navigationbar" +msgstr "Navigationsleiste" + +#: ../src/midori-browser.c:2038 +msgid "Side_panel" +msgstr "Seitenleiste" + +#: ../src/midori-browser.c:2042 +msgid "_Bookmarkbar" +msgstr "_Lesezeichenleiste" + +#: ../src/midori-browser.c:2046 +msgid "_Transferbar" +msgstr "_Übertragungsleiste" + +#: ../src/midori-browser.c:2050 +msgid "_Statusbar" +msgstr "_Statusleiste" + +#: ../src/midori-browser.c:2520 +msgid "Bookmarks" +msgstr "Lesezeichen" + +#. TODO: We need something like "use current website" +#: ../src/midori-browser.c:2530 ../src/prefs.c:381 +msgid "Transfers" +msgstr "Übertragungen" + +#: ../src/midori-browser.c:2539 +msgid "Console" +msgstr "Konsole" + +#: ../src/midori-browser.c:2548 ../src/prefs.c:669 +msgid "History" +msgstr "Verlauf" + +#: ../src/midori-browser.c:2557 +msgid "Pageholder" +msgstr "Seitenhalter" + +#: ../src/midori-browser.c:2579 +msgid "_Inline find:" +msgstr "Inkrementelle suche:" + +#: ../src/midori-browser.c:2605 +msgid "Match Case" +msgstr "Groß-/ Kleinschreibung beachten" + +#: ../src/midori-browser.c:2622 +msgid "Close Findbar" +msgstr "Suchleiste schließen" + +#: ../src/midori-panel.c:140 +msgid "Appearance of the shadow around each panel" +msgstr "Erscheinungsbild des Schattens um jede Leiste" + +#: ../src/midori-panel.c:150 +msgid "Menu to hold panel items" +msgstr "Menü für Leistenelemente" + +#: ../src/midori-panel.c:159 +msgid "The index of the current page" +msgstr "Der Index der aktiven Seite" + +#: ../src/midori-panel.c:203 ../src/midori-panel.c:204 +msgid "Close panel" +msgstr "Leiste schließen" + +#: ../src/midori-panel.c:368 +msgid "Untitled" +msgstr "Unbenannt" + +#: ../src/midori-trash.c:97 +msgid "The maximum number of items" +msgstr "Die maximale Anzahl an Elementen" + +#: ../src/midori-websettings.c:69 +msgid "The desired tab label size" +msgstr "Die gewünschte Größe der Reiterbeschriftung" + +#: ../src/midori-websettings.c:78 +msgid "Whether tabs have close buttons" +msgstr "Ob Reiter Schließenknöpfe haben" + +#: ../src/midori-websettings.c:87 +msgid "Load an URL from the selection via middle click" +msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" + +#: ../src/midori-webview.c:217 +msgid "The icon of the currently loaded page" +msgstr "Das Symbol der aktuellen Seite" + +#: ../src/midori-webview.c:226 +msgid "The URI of the currently loaded page" +msgstr "Die URI der aktuellen Seite" + +#: ../src/midori-webview.c:235 +msgid "The title of the currently loaded page" +msgstr "Der Titel der aktuellen Seite" + +#: ../src/midori-webview.c:472 +msgid "Open Link in New _Tab" +msgstr "Verweis in einem neuen _Reiter öffnen" + +#: ../src/midori-webview.c:495 +msgid "Open URL in New _Tab" +msgstr "_URL in einem neuen Reiter öffnen" + +#: ../src/prefs.c:299 +#, c-format +msgid "%s Preferences" +msgstr "%s Einstellungen" + +#. Page "General" +#: ../src/prefs.c:363 +msgid "General" +msgstr "Allgemein" + +#: ../src/prefs.c:364 +msgid "Startup" +msgstr "Programmstart" + +#: ../src/prefs.c:366 +msgid "Load on startup" +msgstr "Beim Programmstart öffnen" + +#: ../src/prefs.c:369 +msgid "Blank page" +msgstr "Leere Seite" + +#: ../src/prefs.c:369 +msgid "Last open pages" +msgstr "Zuletzt geöffnete Seiten" + +#: ../src/prefs.c:383 +msgid "Download folder" +msgstr "Dateispeicherordner" + +#: ../src/prefs.c:385 +msgid "Choose downloaded files folder" +msgstr "Ordner für heruntergeladene Dateien auswählen" + +#: ../src/prefs.c:392 +msgid "Show a notification window for finished transfers" +msgstr "Zeige ein Hinweisfenster für abgeschlossene Übertragungen" + +#: ../src/prefs.c:395 +msgid "Languages" +msgstr "Sprachen" + +#: ../src/prefs.c:397 +msgid "Preferred languages" +msgstr "Bevorzugte Sprachen" + +#. Page "Appearance" +#: ../src/prefs.c:409 +msgid "Appearance" +msgstr "Anzeige" + +#: ../src/prefs.c:410 +msgid "Font settings" +msgstr "Schrifteinstellungen" + +#: ../src/prefs.c:412 +msgid "Default _font" +msgstr "Standard_schrift" + +#: ../src/prefs.c:419 +msgid "_Minimum font size" +msgstr "_Minimale Schriftgröße" + +#: ../src/prefs.c:426 +msgid "_Advanced" +msgstr "_Erweitert" + +#: ../src/prefs.c:430 +msgid "Default _encoding" +msgstr "Standard_kodierung" + +#: ../src/prefs.c:433 +msgid "Chinese (BIG5)" +msgstr "Traditionelles Chinesisch (Big5)" + +#: ../src/prefs.c:433 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanisch (Shift_JIS)" + +#: ../src/prefs.c:433 +msgid "Russian (KOI8-R)" +msgstr "Russisch (KOI8-R)" + +#: ../src/prefs.c:434 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../src/prefs.c:434 +msgid "Western (ISO-8859-1)" +msgstr "Westlich (ISO-8859-1)" + +#: ../src/prefs.c:449 +msgid "Advanced settings" +msgstr "Erweiterte Einstellungen" + +#: ../src/prefs.c:452 +msgid "Default colors" +msgstr "Standardfarben" + +#: ../src/prefs.c:454 +msgid "Text color" +msgstr "Textfarbe" + +#: ../src/prefs.c:458 +msgid "Background color" +msgstr "Hintergrundfarbe" + +#: ../src/prefs.c:462 +msgid "Link color" +msgstr "Verweisfarbe" + +#: ../src/prefs.c:466 +msgid "Visited link color" +msgstr "Besuchte Verweisfarbe" + +#. Page "Behavior" +#: ../src/prefs.c:472 +msgid "Behavior" +msgstr "Verhalten" + +#: ../src/prefs.c:473 +msgid "Browsing" +msgstr "Navigation" + +#: ../src/prefs.c:475 +msgid "Open _new pages in" +msgstr "_Neue Seiten öffnen in" + +#: ../src/prefs.c:478 +msgid "New tab" +msgstr "Neuer Reiter" + +#: ../src/prefs.c:478 +msgid "New window" +msgstr "Neues Fenster" + +#: ../src/prefs.c:478 +msgid "Current tab" +msgstr "Aktuelle Reiter" + +#: ../src/prefs.c:483 +msgid "_Middle click opens selection" +msgstr "_Mittelklick öffnet Markierung" + +#: ../src/prefs.c:488 +msgid "Open tabs in the _background" +msgstr "Reiter im _Hintergrund öffnen" + +#: ../src/prefs.c:493 +msgid "Open popups in _tabs" +msgstr "Aufklappfenster in _Reitern öffnen" + +#: ../src/prefs.c:499 +msgid "Features" +msgstr "Inhalte" + +#: ../src/prefs.c:501 +msgid "Load _images" +msgstr "_Bilder laden" + +#: ../src/prefs.c:506 +msgid "_Shrink images to fit" +msgstr "Bilder automatisch ver_kleinern" + +#: ../src/prefs.c:511 +msgid "Print _backgrounds" +msgstr "Hintergründe _drucken" + +#: ../src/prefs.c:516 +msgid "_Resizable textareas" +msgstr "_Vergrößerbare Textfelder" + +#: ../src/prefs.c:521 +msgid "Enable _scripts" +msgstr "_Skripte aktiveren" + +#: ../src/prefs.c:526 +msgid "Enable _plugins" +msgstr "_Zusatzmodule aktivieren" + +#: ../src/prefs.c:531 +msgid "_User Stylesheet" +msgstr "Be_nutzerstilvorlage" + +#: ../src/prefs.c:537 +msgid "Choose user stylesheet" +msgstr "Stilvorlage auswählen" + +#. Page "Interface" +#: ../src/prefs.c:546 +msgid "Interface" +msgstr "Oberfläche" + +#: ../src/prefs.c:547 +msgid "Navigationbar" +msgstr "Navigationsleiste" + +#: ../src/prefs.c:549 +msgid "_Toolbar style" +msgstr "Werkzeugleistenstil" + +#: ../src/prefs.c:552 +msgid "Default" +msgstr "Standard" + +#: ../src/prefs.c:552 +msgid "Icons" +msgstr "Symbole" + +#: ../src/prefs.c:552 +msgid "Text" +msgstr "Text" + +#: ../src/prefs.c:552 +msgid "Both" +msgstr "Beides" + +#: ../src/prefs.c:552 +msgid "Both horizontal" +msgstr "Beides horizontal" + +#: ../src/prefs.c:557 +msgid "Show small _icons" +msgstr "Zeige _kleine Symbole" + +#: ../src/prefs.c:562 +msgid "Show Web_search" +msgstr "Zeige Netz_suche" + +#: ../src/prefs.c:567 +msgid "Show _New Tab" +msgstr "Zeige _Neuer Reiter" + +#: ../src/prefs.c:572 +msgid "Show _Trash" +msgstr "Zeige _Papierkorb" + +#: ../src/prefs.c:577 +msgid "Miscellaneous" +msgstr "Verschiedenes" + +#: ../src/prefs.c:579 +msgid "Close _buttons on tabs" +msgstr "Schließen_knöpfe auf Reitern" + +#: ../src/prefs.c:586 +msgid "Tab Si_ze" +msgstr "Reiter_größe" + +#: ../src/prefs.c:593 +msgid "_Location search engine" +msgstr "Adressfeldsuchmaschine" + +#. Page "Network" +#: ../src/prefs.c:601 +msgid "Network" +msgstr "Netzwerk" + +#: ../src/prefs.c:602 +msgid "Proxy Server" +msgstr "Zwischenrechner" + +#: ../src/prefs.c:604 +msgid "_Custom proxy server" +msgstr "_Benutzerdefinierter Zwischenrechner" + +#: ../src/prefs.c:608 +msgid "_Host/ Port" +msgstr "_Leitrechner/ Anschluss" + +#: ../src/prefs.c:617 +msgid "Proxy requires authentication" +msgstr "Zwischenrechner erfordert Authentifizierung" + +#: ../src/prefs.c:621 +msgid "Username" +msgstr "Benutzername" + +#: ../src/prefs.c:625 +msgid "Password" +msgstr "Kennwort" + +#: ../src/prefs.c:629 +msgid "Cache" +msgstr "Zwischenspeicher" + +#: ../src/prefs.c:631 +msgid "Cache size" +msgstr "Zwischenspeichergröße" + +#: ../src/prefs.c:637 +msgid "MB" +msgstr "MB" + +#: ../src/prefs.c:638 +msgid "Clear cache" +msgstr "Leere Zwischenspeicher" + +#. Page "Privacy" +#: ../src/prefs.c:644 +msgid "Privacy" +msgstr "Privatsphäre" + +#: ../src/prefs.c:645 +msgid "Cookies" +msgstr "Kekse" + +#: ../src/prefs.c:647 +msgid "Accept cookies" +msgstr "Kekse annehmen" + +#: ../src/prefs.c:650 +msgid "All cookies" +msgstr "Alle Kekse" + +#: ../src/prefs.c:650 +msgid "Session cookies" +msgstr "Sitzungskekse" + +#: ../src/prefs.c:650 +msgid "None" +msgstr "Keine" + +#: ../src/prefs.c:655 +msgid "Allow cookies from the original website only" +msgstr "Nur Kekse von der ursprünglichen Internetseite annehmen" + +#: ../src/prefs.c:658 +msgid "Maximum cookie age" +msgstr "Maximales Keksalter" + +#: ../src/prefs.c:664 ../src/prefs.c:679 +msgid "days" +msgstr "Tage" + +#: ../src/prefs.c:665 +msgid "View cookies" +msgstr "Kekse anzeigen" + +#: ../src/prefs.c:671 +msgid "Remember my visited pages" +msgstr "Besuchte Seiten merken" + +#: ../src/prefs.c:682 +msgid "Remember my form inputs" +msgstr "Eingegebene Formulare merken" + +#: ../src/prefs.c:686 +msgid "Remember my downloaded files" +msgstr "Heruntergeladene Dateien merken" + +#. Page "Programs" +#: ../src/prefs.c:691 +msgid "Programs" +msgstr "Programme" + +#: ../src/prefs.c:692 +msgid "External programs" +msgstr "Externe Programme" + +#: ../src/prefs.c:703 +msgid "Protocol" +msgstr "Protokoll" + +#: ../src/prefs.c:706 +msgid "Command" +msgstr "Befehl" + +#: ../src/sokoke.c:157 +msgid "Warning: You are using a superuser account!" +msgstr "Warnung: Sie benutzen ein Administratorkonto!" + +#: ../src/sokoke.c:267 ../katze/katze-xbel.c:952 +#, c-format +msgid "Writing failed." +msgstr "Schreiben fehlgeschlagen." + +#: ../src/webSearch.c:82 +msgid "Empty" +msgstr "Leer" + +#: ../src/webSearch.c:153 +msgid "Add search engine" +msgstr "Suchmaschine hinzufügen" + +#: ../src/webSearch.c:153 +msgid "Edit search engine" +msgstr "Suchmaschine bearbeiten" + +#: ../src/webSearch.c:183 +msgid "_Name:" +msgstr "_Name:" + +#: ../src/webSearch.c:227 +msgid "_Icon (name or file):" +msgstr "_Symbol (Name oder Datei):" + +#: ../src/webSearch.c:241 +msgid "_Keyword:" +msgstr "_Schlüsselwort:" + +#: ../src/webSearch.c:310 +msgid "Manage search engines" +msgstr "Suchmaschinen verwalten" + +#: ../katze/katze-throbber.c:135 +msgid "Symbolic size to use for the animation" +msgstr "Größenkonstante für die Animation" + +#: ../katze/katze-throbber.c:144 +msgid "The name of an icon containing animation frames" +msgstr "Der Name eines Symbols, welches Animationsbilder enthält" + +#: ../katze/katze-throbber.c:153 +msgid "A GdkPixbuf containing animation frames" +msgstr "Ein GdkPixbuf, welcher Animationsbilder enthält" + +#: ../katze/katze-throbber.c:162 +msgid "Whether the throbber should be animated" +msgstr "Ob das Aktivitätssymbol animiert sein soll" + +#: ../katze/katze-throbber.c:171 +msgid "The name of an icon to be used as the static image" +msgstr "Der Name eines Symbols, das als statisches Bild verwendet werden soll" + +#: ../katze/katze-throbber.c:180 +msgid "A GdkPixbuf to be used as the static image" +msgstr "Ein GdkPixbuf, welcher als statisches Bild verwendet werden soll" + +#: ../katze/katze-throbber.c:189 +msgid "The stock ID of an icon to be used as the static image" +msgstr "" +"Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " +"soll" + +#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 +#: ../katze/katze-xbel.c:804 +#, c-format +msgid "Malformed document." +msgstr "Fehlerhaftes Dokument" + +#: ../katze/katze-xbel.c:759 +#, c-format +msgid "File not found." +msgstr "Datei nicht gefunden." + +#~ msgid "Location Entry" +#~ msgstr "Adresseingabefeld" diff --git a/src/Makefile.am b/src/Makefile.am index 82951045..04dccba1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,10 +4,13 @@ INCLUDES = \ $(LIBSEXY_CFLAGS) \ -I../katze +AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" + LDADD = \ $(GTK_LIBS) \ $(WEBKIT_LIBS) \ $(LIBSEXY_LIBS) \ + $(INTLLIBS) \ ../katze/libkatze.la bin_PROGRAMS = \ diff --git a/src/conf.c b/src/conf.c index 454d70ca..f8ba22bb 100644 --- a/src/conf.c +++ b/src/conf.c @@ -50,7 +50,7 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error GET_INT(config->toolbarNavigation, "ToolbarNavigation", TRUE); GET_INT(config->toolbarBookmarks, "ToolbarBookmarks", FALSE); GET_INT(config->toolbarStatus, "ToolbarStatus", TRUE); - //GET_INT(config->toolbarDownloads, "ToolbarDownloads", FALSE); + //GET_INT(config->toolbarTransfer, "ToolbarTransfer", FALSE); GET_INT(config->toolbarStyle, "ToolbarStyle", CONFIG_TOOLBAR_DEFAULT); GET_INT(config->toolbarSmall, "ToolbarSmall", FALSE); GET_INT(config->toolbarWebSearch, "ToolbarWebSearch", TRUE); @@ -133,7 +133,7 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) g_key_file_set_string (keyFile, "browser", "LocationSearch", config->locationSearch); g_key_file_set_integer(keyFile, "browser", "ToolbarNavigation", config->toolbarNavigation); g_key_file_set_integer(keyFile, "browser", "ToolbarBookmarks", config->toolbarBookmarks); - //g_key_file_set_integer(keyFile, "browser", "ToolbarDownloads", config->toolbarDownloads); + //g_key_file_set_integer(keyFile, "browser", "ToolbarTransfers", config->toolbarTransfers); g_key_file_set_integer(keyFile, "browser", "ToolbarStatus", config->toolbarStatus); g_key_file_set_integer(keyFile, "browser", "ToolbarStyle", config->toolbarStyle); g_key_file_set_integer(keyFile, "browser", "ToolbarSmall", config->toolbarSmall); diff --git a/src/global.h b/src/global.h index 971f2651..497ca7f6 100644 --- a/src/global.h +++ b/src/global.h @@ -20,6 +20,8 @@ #include #include +#include + // FIXME: Remove these globals GList* searchEngines; // Items of type 'SearchEngine' @@ -36,12 +38,7 @@ MidoriWebSettings* webSettings; #define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" "bookmark-web" #define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL // "insert-text" "form-fill" -#define STOCK_LOCATION GTK_STOCK_BOLD // "location-entry" -#define STOCK_NEWSFEED "gtk-index" // "newsfeed" -#define STOCK_PLUGINS GTK_STOCK_CONVERT // "plugin" -#define STOCK_POPUPS_BLOCKED "popup-hidden" -#define STOCK_TAB_CLOSE GTK_STOCK_CLOSE // "tab-close" -#define STOCK_WINDOW_CLOSE GTK_STOCK_CLOSE // "window-close" +#define STOCK_NEWSFEED GTK_STOCK_INDEX // We assume that these legacy icon names are usually present diff --git a/src/helpers.c b/src/helpers.c index 489b8d7e..c826f26f 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -65,7 +65,7 @@ gboolean spawn_protocol_command(const gchar* protocol, const gchar* res) if(!g_shell_parse_argv(commandReady, NULL, &argv, &error)) { // FIXME: Should we have a more specific message? - show_error("Could not run external program.", error->message, NULL); + show_error(_("Could not run external program."), error->message, NULL); g_error_free(error); g_free(commandReady); g_free(uriEscaped); return FALSE; @@ -81,7 +81,7 @@ gboolean spawn_protocol_command(const gchar* protocol, const gchar* res) if(!success) { // FIXME: Should we have a more specific message? - show_error("Could not run external program.", error->message, NULL); + show_error(_("Could not run external program."), error->message, NULL); g_error_free(error); } g_free(commandReady); diff --git a/src/main.c b/src/main.c index ff7f45ed..2ff07401 100644 --- a/src/main.c +++ b/src/main.c @@ -26,6 +26,13 @@ #include "config.h" +#ifdef ENABLE_NLS +# include +# if HAVE_LOCALE_H +# include +# endif +#endif + // -- stock icons static void stock_items_init(void) @@ -39,24 +46,18 @@ static void stock_items_init(void) { STOCK_THEME }, { STOCK_USER_TRASH }, - { STOCK_BOOKMARK, "Bookmark", 0, 0, NULL }, - { STOCK_BOOKMARK_NEW, "New Bookmark", 0, 0, NULL }, - { STOCK_FORM_FILL, "_Form Fill", 0, 0, NULL }, - { STOCK_HOMEPAGE, "Homepage", 0, 0, NULL }, - { STOCK_LOCATION, "Location Entry", 0, 0, NULL }, - { STOCK_NEWSFEED, "Newsfeed", 0, 0, NULL }, - { STOCK_PLUGINS, "_Plugins", 0, 0, NULL }, - { STOCK_POPUPS_BLOCKED, "Blocked Popups", 0, 0, NULL }, - { STOCK_TAB_CLOSE, "C_lose Tab", 0, 0, NULL }, - { STOCK_TAB_NEW, "New _Tab", 0, 0, NULL }, - { STOCK_WINDOW_CLOSE, "_Close Window", 0, 0, NULL }, - { STOCK_WINDOW_NEW, "New _Window", 0, 0, NULL }, + { STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, + { STOCK_BOOKMARK_NEW, N_("New Bookmark"), 0, 0, NULL }, + { STOCK_FORM_FILL, N_("_Form Fill"), 0, 0, NULL }, + { STOCK_HOMEPAGE, N_("Homepage"), 0, 0, NULL }, + { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, NULL }, + { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, NULL }, #if !GTK_CHECK_VERSION(2, 10, 0) - { GTK_STOCK_SELECT_ALL, "Select _All", 0, 0, (gchar*)"gtk20" }, + { GTK_STOCK_SELECT_ALL, N_("Select _All", 0, 0, NULL }, #endif #if !GTK_CHECK_VERSION(2, 8, 0) - { GTK_STOCK_FULLSCREEN, "_Fullscreen", 0, 0, (gchar*)"gtk20" }, - { GTK_STOCK_FULLSCREEN, "_Leave Fullscreen", 0, 0, (gchar*)"gtk20" }, + { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL }, + { GTK_STOCK_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, #endif }; GtkIconFactory* factory = gtk_icon_factory_new(); @@ -117,21 +118,36 @@ midori_browser_new_window_cb (MidoriBrowser* browser, midori_browser_append_uri (new_browser, uri); } +static void +locale_init (void) +{ +#ifdef ENABLE_NLS + +#if HAVE_LOCALE_H + setlocale (LC_ALL, ""); +#endif + + bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); +#endif +} + int main(int argc, char** argv) { - g_set_application_name(PACKAGE_NAME); + locale_init(); + g_set_application_name(_("midori")); // Parse cli options gint repeats = 2; gboolean version = FALSE; GOptionEntry entries[] = { - { "repeats", 'r', 0, G_OPTION_ARG_INT, &repeats, "An unused value", "N" }, - { "version", 'v', 0, G_OPTION_ARG_NONE, &version, "Display program version", NULL } + { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL } }; GError* error = NULL; - if(!gtk_init_with_args(&argc, &argv, "[URI]", entries, NULL/*GETTEXT_PACKAGE*/, &error)) + if(!gtk_init_with_args(&argc, &argv, _("[URL]"), entries, GETTEXT_PACKAGE, &error)) { g_error_free(error); return 1; @@ -139,19 +155,26 @@ int main(int argc, char** argv) if(version) { - g_print(PACKAGE_STRING " - Copyright (c) 2007-2008 Christian Dywan\n\n" - "GTK+2: " GTK_VER "\n" - "WebKit: " WEBKIT_VER "\n" - "Libsexy: " LIBSEXY_VER "\n" - "libXML2: " LIBXML_VER "\n" - "GetText: N/A\n" - "\n" - "Debugging: " SOKOKE_DEBUG_ "\n" - "\n" - "Please report comments, suggestions and bugs to:\n" - "\t" PACKAGE_BUGREPORT "\n" - "Check for new versions at:\n" - "\thttp://software.twotoasts.de\n"); + g_print( + "%s %s - Copyright (c) 2007-2008 Christian Dywan\n\n" + "GTK+2: \t\t%s\n" + "WebKit: \t\t%s\n" + "Libsexy:\t\t%s\n" + "libXML2:\t\t%s\n" + "\n" + "%s:\t\t%s\n" + "\n" + "%s\n" + "\t%s\n" + "%s\n" + "\thttp://software.twotoasts.de\n", + _("midori"), PACKAGE_VERSION, + GTK_VER, WEBKIT_VER, LIBSEXY_VER, LIBXML_VER, + _("Debugging"), SOKOKE_DEBUG_, + _("Please report comments, suggestions and bugs to:"), + PACKAGE_BUGREPORT, + _("Check for new versions at:") + ); return 0; } @@ -167,7 +190,7 @@ int main(int argc, char** argv) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages - , "Configuration was not loaded. %s\n", error->message); + , _("The configuration couldn't be loaded. %s\n"), error->message); g_error_free(error); } g_free(configFile); @@ -182,7 +205,7 @@ int main(int argc, char** argv) // FIXME: We may have a "file empty" error, how do we recognize that? /*if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages - , "Notice: No search engines loaded. %s\n", error->message);*/ + , _("The search engines couldn't be loaded. %s\n"), error->message);*/ g_error_free(error); } g_free(configFile); @@ -193,7 +216,7 @@ int main(int argc, char** argv) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages - , "Bookmarks couldn't be loaded. %s\n", error->message); + , _("The bookmarks couldn't be loaded. %s\n"), error->message); g_error_free(error); } g_free(configFile); @@ -206,7 +229,7 @@ int main(int argc, char** argv) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages - , "Session couldn't be loaded. %s\n", error->message); + , _("The session couldn't be loaded. %s\n"), error->message); g_error_free(error); } g_free(configFile); @@ -218,7 +241,7 @@ int main(int argc, char** argv) { if(error->code != G_FILE_ERROR_NOENT) g_string_append_printf(errorMessages - , "Tabtrash couldn't be loaded. %s\n", error->message); + , _("The trash couldn't be loaded. %s\n"), error->message); g_error_free(error); } g_free(configFile); @@ -228,7 +251,7 @@ int main(int argc, char** argv) { GtkWidget* dialog = gtk_message_dialog_new(NULL , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE - , "The following errors occured."); + , _("The following errors occured:")); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE); gtk_window_set_title(GTK_WINDOW(dialog), g_get_application_name()); // FIXME: Use custom program icon @@ -255,7 +278,7 @@ int main(int argc, char** argv) } g_string_free(errorMessages, TRUE); - // TODO: Handle any number of separate uris from argv + // TODO: Handle any number of separate uris from argv // Open as many tabs as we have uris, seperated by pipes gchar* uri = argc > 1 ? strtok(g_strdup(argv[1]), "|") : NULL; while(uri != NULL) @@ -350,7 +373,7 @@ int main(int argc, char** argv) error = NULL; if(!search_engines_to_file(searchEngines, configFile, &error)) { - g_warning("Search engines couldn't be saved. %s", error->message); + g_warning("The search engines couldn't be saved. %s", error->message); g_error_free(error); } search_engines_free(searchEngines); @@ -359,7 +382,7 @@ int main(int argc, char** argv) error = NULL; if(!katze_xbel_folder_to_file(bookmarks, configFile, &error)) { - g_warning("Bookmarks couldn't be saved. %s", error->message); + g_warning("The bookmarks couldn't be saved. %s", error->message); g_error_free(error); } katze_xbel_item_unref(bookmarks); @@ -368,7 +391,7 @@ int main(int argc, char** argv) error = NULL; if (!katze_xbel_folder_to_file (xbel_trash, configFile, &error)) { - g_warning ("Tabtrash couldn't be saved. %s", error->message); + g_warning ("The trash couldn't be saved. %s", error->message); g_error_free (error); } katze_xbel_item_unref (xbel_trash); @@ -379,7 +402,7 @@ int main(int argc, char** argv) error = NULL; if(!katze_xbel_folder_to_file(session, configFile, &error)) { - g_warning("Session couldn't be saved. %s", error->message); + g_warning("The session couldn't be saved. %s", error->message); g_error_free(error); } g_free(configFile); @@ -389,7 +412,7 @@ int main(int argc, char** argv) error = NULL; if(!config_to_file(config, configFile, &error)) { - g_warning("Configuration couldn't be saved. %s", error->message); + g_warning("The configuration couldn't be saved. %s", error->message); g_error_free(error); } config_free(config); diff --git a/src/midori-browser.c b/src/midori-browser.c index 71ca4749..97d36e95 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -182,7 +182,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_set_sensitive (priv->throbber, FALSE); g_object_set (action, "stock-id", GTK_STOCK_REFRESH, - "tooltip", "Reload the current page", NULL); + "tooltip", _("Reload the current page"), NULL); gtk_widget_hide (priv->progressbar); } else @@ -190,7 +190,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_set_sensitive (priv->throbber, TRUE); g_object_set (action, "stock-id", GTK_STOCK_STOP, - "tooltip", "Stop loading the current page", NULL); + "tooltip", _("Stop loading the current page"), NULL); gtk_widget_show (priv->progressbar); } katze_throbber_set_animated (KATZE_THROBBER (priv->throbber), loading); @@ -255,7 +255,7 @@ _midori_browser_update_progress (MidoriBrowser* browser, { gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progressbar), progress ? progress / 100.0 : 0); - gchar* message = g_strdup_printf ("%d%% loaded", progress); + gchar* message = g_strdup_printf (_("%d%% loaded"), progress); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progressbar), message); g_free (message); @@ -518,7 +518,7 @@ midori_browser_class_init (MidoriBrowserClass* class) g_param_spec_object ( "settings", "Settings", - "The associated settings", + _("The associated settings"), MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -538,7 +538,7 @@ midori_browser_class_init (MidoriBrowserClass* class) g_param_spec_string ( "statusbar-text", "Statusbar Text", - "The text that is displayed in the statusbar", + _("The text that is displayed in the statusbar"), "", flags)); @@ -557,7 +557,7 @@ midori_browser_class_init (MidoriBrowserClass* class) g_param_spec_object ( "trash", "Trash", - "The trash, collecting recently closed tabs and windows", + _("The trash, collecting recently closed tabs and windows"), MIDORI_TYPE_TRASH, G_PARAM_READWRITE)); @@ -583,7 +583,7 @@ _action_open_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* dialog = gtk_file_chooser_dialog_new ( - "Open file", GTK_WINDOW (browser), + ("Open file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -1048,7 +1048,7 @@ _action_location_activate (GtkAction* action, { // TODO: We should offer all of the location's features here GtkWidget* dialog; - dialog = gtk_dialog_new_with_buttons ("Open location" + dialog = gtk_dialog_new_with_buttons (_("Open location") , GTK_WINDOW (browser) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL @@ -1060,7 +1060,7 @@ _action_location_activate (GtkAction* action, GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); GtkWidget* hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic ("_Location:"); + GtkWidget* label = gtk_label_new_with_mnemonic (_("_Location:")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); GtkWidget* entry = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); @@ -1094,7 +1094,7 @@ _action_search_activate (GtkAction* action, else { // TODO: We should offer all of the search's features here - GtkWidget* dialog = gtk_dialog_new_with_buttons ("Web search" + GtkWidget* dialog = gtk_dialog_new_with_buttons (_("Web search") , GTK_WINDOW (browser) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL @@ -1106,7 +1106,7 @@ _action_search_activate (GtkAction* action, GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); GtkWidget* hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic ("_Location:"); + GtkWidget* label = gtk_label_new_with_mnemonic (_("_Location:")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); GtkWidget* entry = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); @@ -1133,7 +1133,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gboolean new_bookmark = !bookmark; GtkWidget* dialog = gtk_dialog_new_with_buttons ( - new_bookmark ? "New bookmark" : "Edit bookmark", + new_bookmark ? _("New bookmark") : _("Edit bookmark"), GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -1150,7 +1150,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic ("_Title:"); + GtkWidget* label = gtk_label_new_with_mnemonic (_("_Title:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); GtkWidget* entry_title = gtk_entry_new (); @@ -1166,7 +1166,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic ("_Description:"); + label = gtk_label_new_with_mnemonic (_("_Description:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); GtkWidget* entry_desc = gtk_entry_new (); @@ -1185,7 +1185,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic ("_Uri:"); + label = gtk_label_new_with_mnemonic (_("_URL:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = gtk_entry_new (); @@ -1203,11 +1203,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic ("_Folder:"); + label = gtk_label_new_with_mnemonic (_("_Folder:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); combo_folder = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), "Root"); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Root")); gtk_widget_set_sensitive (combo_folder, FALSE); gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); @@ -1426,7 +1426,7 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, } if (katze_xbel_item_is_separator (item)) - g_object_set (renderer, "markup", "Separator", NULL); + g_object_set (renderer, "markup", _("Separator"), NULL); else g_object_set (renderer, "markup", NULL, "text", katze_xbel_item_get_title(item), NULL); @@ -1612,7 +1612,7 @@ _action_about_activate (GtkAction* action, "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)), "name", PACKAGE_NAME, "version", PACKAGE_VERSION, - "comments", "A lightweight web browser.", + "comments", _("A lightweight web browser."), "copyright", "Copyright © 2007-2008 Christian Dywan", "website", "http://software.twotoasts.de", "authors", credits_authors, @@ -1620,7 +1620,7 @@ _action_about_activate (GtkAction* action, "artists", credits_artists, "license", license, "wrap-license", TRUE, - // "translator-credits", _("translator-credits"), + "translator-credits", _("translator-credits"), NULL); } @@ -1835,27 +1835,27 @@ _action_bookmark_delete_activate (GtkAction* action, // FIXME: Fill in a good description for each 'hm?' static const GtkActionEntry entries[] = { - { "File", NULL, "_File" }, + { "File", NULL, N_("_File") }, { "WindowNew", STOCK_WINDOW_NEW, NULL, "n", - "Open a new window", G_CALLBACK (_action_window_new_activate) }, + N_("Open a new window"), G_CALLBACK (_action_window_new_activate) }, { "TabNew", STOCK_TAB_NEW, NULL, "t", - "Open a new tab", G_CALLBACK (_action_tab_new_activate) }, + N_("Open a new tab"), G_CALLBACK (_action_tab_new_activate) }, { "Open", GTK_STOCK_OPEN, NULL, "o", - "Open a file", G_CALLBACK (_action_open_activate) }, + N_("Open a file"), G_CALLBACK (_action_open_activate) }, { "SaveAs", GTK_STOCK_SAVE_AS, NULL, "s", - "Save to a file", NULL/*G_CALLBACK (_action_saveas_activate)*/ }, - { "TabClose", STOCK_TAB_CLOSE, - NULL, "w", - "Close the current tab", G_CALLBACK (_action_tab_close_activate) }, - { "WindowClose", STOCK_WINDOW_CLOSE, - NULL, "w", - "Close this window", G_CALLBACK (_action_window_close_activate) }, + N_("Save to a file"), NULL/*G_CALLBACK (_action_saveas_activate)*/ }, + { "TabClose", NULL, + N_("_Close Tab"), "w", + N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, + { "WindowClose", NULL, + N_("C_lose Window"), "w", + N_("Close this window"), G_CALLBACK (_action_window_close_activate) }, { "PageSetup", GTK_STOCK_PROPERTIES, - "Pa_ge Setup", "", + N_("Pa_ge Setup"), "", "hm?", NULL/*G_CALLBACK (_action_page_setup_activate)*/ }, { "PrintPreview", GTK_STOCK_PRINT_PREVIEW, NULL, "", @@ -1865,33 +1865,33 @@ static const GtkActionEntry entries[] = { "hm?", NULL/*G_CALLBACK (_action_print_activate)*/ }, { "Quit", GTK_STOCK_QUIT, NULL, "q", - "Quit the application", G_CALLBACK (_action_quit_activate) }, + N_("Quit the application"), G_CALLBACK (_action_quit_activate) }, - { "Edit", NULL, "_Edit", NULL, NULL, G_CALLBACK (_action_edit_activate) }, + { "Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK (_action_edit_activate) }, { "Undo", GTK_STOCK_UNDO, NULL, "z", - "Undo the last modification", NULL/*G_CALLBACK (_action_undo_activate)*/ }, + N_("Undo the last modification"), NULL/*G_CALLBACK (_action_undo_activate)*/ }, { "Redo", GTK_STOCK_REDO, NULL, "z", - "Redo the last modification", NULL/*G_CALLBACK (_action_redo_activate)*/ }, + N_("Redo the last modification"), NULL/*G_CALLBACK (_action_redo_activate)*/ }, { "Cut", GTK_STOCK_CUT, NULL, "x", "Cut the selected text", G_CALLBACK (_action_cut_activate) }, { "Copy", GTK_STOCK_COPY, NULL, "c", - "Copy the selected text", G_CALLBACK (_action_copy_activate) }, + N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) }, { "Copy_", GTK_STOCK_COPY, NULL, "c", - "Copy the selected text", G_CALLBACK (_action_copy_activate) }, + N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) }, { "Paste", GTK_STOCK_PASTE, NULL, "v", - "Paste text from the clipboard", G_CALLBACK (_action_paste_activate) }, + N_("Paste text from the clipboard"), G_CALLBACK (_action_paste_activate) }, { "Delete", GTK_STOCK_DELETE, NULL, NULL, - "Delete the selected text", G_CALLBACK (_action_delete_activate) }, + N_("Delete the selected text"), G_CALLBACK (_action_delete_activate) }, { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "a", - "Selected all text", G_CALLBACK (_action_select_all_activate) }, + N_("Select all text"), G_CALLBACK (_action_select_all_activate) }, { "FormFill", STOCK_FORM_FILL, NULL, "", "hm?", NULL/*G_CALLBACK (_action_form_fill_activate)*/ }, @@ -1899,29 +1899,29 @@ static const GtkActionEntry entries[] = { NULL, "f", "hm?", G_CALLBACK (_action_find_activate) }, { "FindNext", GTK_STOCK_GO_FORWARD, - "Find _Next", "g", + N_("Find _Next"), "g", "hm?", G_CALLBACK (_action_find_next_activate) }, { "FindPrevious", GTK_STOCK_GO_BACK, - "Find _Previous", "g", + N_("Find _Previous"), "g", "hm?", G_CALLBACK (_action_find_previous_activate) }, { "FindQuick", GTK_STOCK_FIND, - "_Quick Find", "period", + N_("_Quick Find"), "period", "hm?", NULL/*G_CALLBACK (_action_find_quick_activate)*/ }, { "Preferences", GTK_STOCK_PREFERENCES, NULL, "p", "hm?", G_CALLBACK (_action_preferences_activate) }, - { "View", NULL, "_View" }, - { "Toolbars", NULL, "_Toolbars" }, + { "View", NULL, N_("_View") }, + { "Toolbars", NULL, N_("_Toolbars") }, { "Reload", GTK_STOCK_REFRESH, NULL, "r", - "Reload the current page", G_CALLBACK (_action_reload_stop_activate) }, + N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "Stop", GTK_STOCK_REFRESH, NULL, "r", - "Stop loading the current page", G_CALLBACK (_action_reload_stop_activate) }, + N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ReloadStop", GTK_STOCK_STOP, NULL, "r", - "Reload the current page", G_CALLBACK (_action_reload_stop_activate) }, + N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", "hm?", NULL/*G_CALLBACK (_action_zoom_in_activate)*/ }, @@ -1932,16 +1932,16 @@ static const GtkActionEntry entries[] = { NULL, "0", "hm?", NULL/*G_CALLBACK (_action_zoom_normal_activate)*/ }, { "SourceView", NULL, - "View Source", "", - "hm?", /*G_CALLBACK (_action_source_view_activate)*/ }, + N_("View Source"), "", + "hm?", /*G_CALLBACK (_action_source_view_activate)*/ }, { "SelectionSourceView", NULL, - "View Selection Source", "", - "hm?", NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, + N_("View Selection Source"), "", + "hm?", NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, { "Fullscreen", GTK_STOCK_FULLSCREEN, NULL, "F11", - "Toggle fullscreen view", G_CALLBACK (_action_fullscreen_activate) }, + N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) }, - { "Go", NULL, "_Go" }, + { "Go", NULL, N_("_Go") }, { "Back", GTK_STOCK_GO_BACK, NULL, "Left", "hm?", G_CALLBACK (_action_back_activate) }, @@ -1952,39 +1952,39 @@ static const GtkActionEntry entries[] = { NULL, "Home", "hm?", G_CALLBACK (_action_home_activate) }, { "Location", GTK_STOCK_JUMP_TO, - "Location...", "l", + N_("Location..."), "l", "hm?", G_CALLBACK (_action_location_activate) }, { "Search", GTK_STOCK_FIND, - "Web Search...", "f", + N_("Web Search..."), "f", "hm?", G_CALLBACK (_action_search_activate) }, { "OpenInPageholder", GTK_STOCK_JUMP_TO, - "Open in Page_holder...", "", + N_("Open in Page_holder..."), "", "hm?", G_CALLBACK (_action_open_in_panel_activate) }, { "Trash", STOCK_USER_TRASH, - "Closed Tabs and Windows", "", - "Reopen a previously closed tab or window", NULL }, + N_("Closed Tabs and Windows"), "", + N_("Reopen a previously closed tab or window"), NULL }, { "TrashEmpty", GTK_STOCK_CLEAR, - "Empty Trash", "", + N_("Empty Trash"), "", "hm?", G_CALLBACK (_action_trash_empty_activate) }, { "UndoTabClose", GTK_STOCK_UNDELETE, - "Undo Close Tab", "", + N_("Undo Close Tab"), "", "hm?", G_CALLBACK (_action_undo_tab_close_activate) }, - { "Bookmarks", NULL, "_Bookmarks" }, + { "Bookmarks", NULL, N_("_Bookmarks") }, { "BookmarkNew", STOCK_BOOKMARK_NEW, NULL, "d", "hm?", G_CALLBACK (_action_bookmark_new_activate) }, { "BookmarksManage", NULL, - "_Manage Bookmarks", "b", + N_("_Manage Bookmarks"), "b", "hm?", NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, { "BookmarkOpen", GTK_STOCK_OPEN, NULL, "", "hm?", G_CALLBACK (_action_bookmark_open_activate) }, { "BookmarkOpenTab", STOCK_TAB_NEW, - "Open in New _Tab", "", + N_("Open in New _Tab"), "", "hm?", G_CALLBACK (_action_bookmark_open_tab_activate) }, { "BookmarkOpenWindow", STOCK_WINDOW_NEW, - "Open in New _Window", "", + N_("Open in New _Window"), "", "hm?", G_CALLBACK (_action_bookmark_open_window_activate) }, { "BookmarkEdit", GTK_STOCK_EDIT, NULL, "", @@ -1993,26 +1993,26 @@ static const GtkActionEntry entries[] = { NULL, "", "hm?", G_CALLBACK (_action_bookmark_delete_activate) }, - { "Tools", NULL, "_Tools" }, + { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, - "_Manage Search Engines", "s", - "Add, edit and remove search engines...", + N_("_Manage Search Engines"), "s", + N_("Add, edit and remove search engines..."), G_CALLBACK (_action_manage_search_engines_activate) }, - { "Window", NULL, "_Window" }, + { "Window", NULL, N_("_Window") }, { "TabPrevious", GTK_STOCK_GO_BACK, - "_Previous Tab", "Page_Up", + N_("_Previous Tab"), "Page_Up", "hm?", G_CALLBACK (_action_tab_previous_activate) }, { "TabNext", GTK_STOCK_GO_FORWARD, - "_Next Tab", "Page_Down", + N_("_Next Tab"), "Page_Down", "hm?", G_CALLBACK (_action_tab_next_activate) }, { "TabOverview", NULL, - "Tab _Overview", "", + N_("Tab _Overview"), "", "hm?", NULL/*G_CALLBACK (_action_tab_overview_activate)*/ }, - { "Help", NULL, "_Help" }, + { "Help", NULL, N_("_Help") }, { "HelpContents", GTK_STOCK_HELP, - "_Contents", "F1", + N_("_Contents"), "F1", "hm?", NULL/*G_CALLBACK (_action_help_contents_activate)*/ }, { "About", GTK_STOCK_ABOUT, NULL, "", @@ -2022,32 +2022,32 @@ static const GtkActionEntry entries[] = { static const GtkToggleActionEntry toggle_entries[] = { { "PrivateBrowsing", NULL, - "P_rivate Browsing", "", + N_("P_rivate Browsing"), "", "hm?", NULL/*G_CALLBACK (_action_private_browsing_activate)*/, FALSE }, { "WorkOffline", GTK_STOCK_DISCONNECT, - "_Work Offline", "", + N_("_Work Offline"), "", "hm?", NULL/*G_CALLBACK (_action_work_offline_activate)*/, FALSE }, { "Navigationbar", NULL, - "_Navigationbar", "", + N_("_Navigationbar"), "", "hm?", G_CALLBACK (_action_navigationbar_activate), FALSE }, { "Panel", NULL, - "_Panel", "F9", + N_("Side_panel"), "F9", "hm?", G_CALLBACK (_action_panel_activate), FALSE }, { "Bookmarkbar", NULL, - "_Bookmarkbar", "", + N_("_Bookmarkbar"), "", "hm?", G_CALLBACK (_action_bookmarkbar_activate), FALSE }, - { "Downloadbar", NULL, - "_Downloadbar", "", - "hm?", NULL/*G_CALLBACK (_action_downloadbar_activate)*/, + { "Transferbar", NULL, + N_("_Transferbar"), "", + "hm?", NULL/*G_CALLBACK (_action_transferbar_activate)*/, FALSE }, { "Statusbar", NULL, - "_Statusbar", "", + N_("_Statusbar"), "", "hm?", G_CALLBACK (_action_statusbar_activate), FALSE }, }; @@ -2135,7 +2135,7 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" "" "" @@ -2255,6 +2255,7 @@ midori_browser_init (MidoriBrowser* browser) // Let us see some ui manager magic priv->action_group = gtk_action_group_new ("Browser"); + gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions (priv->action_group, entries, entries_n, browser); gtk_action_group_add_toggle_actions (priv->action_group, @@ -2290,7 +2291,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_action_set_sensitive (action, toggle_entries[i].callback != NULL); } - //_action_set_active(browser, "Downloadbar", config->toolbarDownloads); + //_action_set_active(browser, "Transferbar", config->toolbarTransfers); // Create the menubar priv->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); @@ -2516,17 +2517,17 @@ midori_browser_init (MidoriBrowser* browser) priv->panel_bookmarks = treeview; gtk_widget_show_all (box); midori_panel_append_page (MIDORI_PANEL (priv->panel), - box, "vcard", "Bookmarks"); + box, "vcard", _("Bookmarks")); action = _action_by_name (browser, "PanelBookmarks"); - // Downloads + // Transfers priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, "uri", "about:blank", NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), priv->panel_pageholder, - "package", "Downloads"); + "package", _("Transfers")); // Console priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, @@ -2535,7 +2536,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), priv->panel_pageholder, - "terminal", "Console"); + "terminal", _("Console")); // History priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, @@ -2544,7 +2545,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), priv->panel_pageholder, - "document-open-recent", "History"); + "document-open-recent", _("History")); // Pageholder priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, @@ -2553,7 +2554,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), priv->panel_pageholder, - GTK_STOCK_CONVERT, "Pageholder"); + GTK_STOCK_CONVERT, _("Pageholder")); midori_panel_set_current_page (MIDORI_PANEL (priv->panel), config->panelActive); @@ -2575,7 +2576,7 @@ midori_browser_init (MidoriBrowser* browser) toolitem = gtk_tool_item_new (); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_add (GTK_CONTAINER (toolitem), - gtk_label_new_with_mnemonic ("_Inline find:")); + gtk_label_new_with_mnemonic (_("_Inline find:"))); gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); priv->find_text = sexy_icon_entry_new (); GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, @@ -2601,7 +2602,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); priv->find_case = gtk_toggle_tool_button_new_from_stock ( GTK_STOCK_SPELL_CHECK); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->find_case), "Match Case"); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->find_case), _("Match Case")); gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->find_case), TRUE); gtk_toolbar_insert (GTK_TOOLBAR (priv->find), priv->find_case, -1); priv->find_highlight = gtk_toggle_tool_button_new_from_stock ( @@ -2618,7 +2619,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), "Close Findbar"); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close Findbar")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); diff --git a/src/midori-panel.c b/src/midori-panel.c index 4ff42779..d58ad323 100644 --- a/src/midori-panel.c +++ b/src/midori-panel.c @@ -12,6 +12,7 @@ #include "midori-panel.h" #include "sokoke.h" +#include G_DEFINE_TYPE (MidoriPanel, midori_panel, GTK_TYPE_HBOX) @@ -136,7 +137,7 @@ midori_panel_class_init (MidoriPanelClass* class) g_param_spec_enum ( "shadow-type", "Shadow Type", - "Appearance of the shadow around each panel", + _("Appearance of the shadow around each panel"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_NONE, flags)); @@ -146,7 +147,7 @@ midori_panel_class_init (MidoriPanelClass* class) g_param_spec_object ( "menu", "Menu", - "Menu to hold panel items", + _("Menu to hold panel items"), GTK_TYPE_MENU, G_PARAM_READWRITE)); @@ -155,7 +156,7 @@ midori_panel_class_init (MidoriPanelClass* class) g_param_spec_int ( "page", "Page", - "The index of the current page", + _("The index of the current page"), -1, G_MAXINT, -1, flags)); @@ -199,8 +200,8 @@ midori_panel_init (MidoriPanel* panel) gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), "Close panel"); - sokoke_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), "Close panel"); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close panel")); + sokoke_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Close panel")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_button_close_clicked_cb), panel); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); @@ -364,7 +365,7 @@ midori_panel_append_page (MidoriPanel* panel, guint n = midori_panel_page_num (panel, child); - const gchar* text = label ? label : "Untitled"; + const gchar* text = label ? label : _("Untitled"); GtkWidget* image; GtkToolItem* toolitem = gtk_radio_tool_button_new (priv->group); diff --git a/src/midori-trash.c b/src/midori-trash.c index d3f8f6a6..26573fa2 100644 --- a/src/midori-trash.c +++ b/src/midori-trash.c @@ -12,6 +12,7 @@ #include "midori-trash.h" #include "sokoke.h" +#include G_DEFINE_TYPE (MidoriTrash, midori_trash, G_TYPE_OBJECT) @@ -93,7 +94,7 @@ midori_trash_class_init (MidoriTrashClass* class) g_param_spec_uint ( "limit", "Limit", - "The maximum number of items", + _("The maximum number of items"), 0, G_MAXUINT, 10, flags)); diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 0fd34ebd..d1a408c6 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -12,6 +12,7 @@ #include "midori-webview.h" #include "sokoke.h" +#include G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) @@ -65,7 +66,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_int ( "tab-label-size", "Tab Label Size", - "The desired tab label size", + _("The desired tab label size"), 0, G_MAXINT, 10, flags)); @@ -74,7 +75,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_boolean ( "close-button", "Close Button", - "Whether the associated tab has a close button", + _("Whether tabs have close buttons"), FALSE, flags)); @@ -83,7 +84,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_boolean ( "middle-click-goto", "Middle Click Goto", - "Load an uri from the selection via middle click", + _("Load an URL from the selection via middle click"), FALSE, flags)); diff --git a/src/midori-webview.c b/src/midori-webview.c index c61ad92c..2e1d299f 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -214,7 +214,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_param_spec_object ( "icon", "Icon", - "The icon of the loaded page", + _("The icon of the currently loaded page"), GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -223,7 +223,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_param_spec_string ( "uri", "Uri", - "The current uri of the loaded page", + _("The URI of the currently loaded page"), "about:blank", flags)); @@ -232,7 +232,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_param_spec_string ( "title", "Title", - "The current title of the loaded page", + _("The title of the currently loaded page"), NULL, flags)); @@ -241,7 +241,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_param_spec_string ( "statusbar-text", "Statusbar Text", - "The text that is displayed in the statusbar", + _("The text that is displayed in the statusbar"), "", flags)); @@ -250,7 +250,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_param_spec_object ( "settings", "Settings", - "The associated settings", + _("The associated settings"), MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -469,7 +469,7 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, if (uri) { GtkWidget* menuitem = gtk_image_menu_item_new_with_mnemonic ( - "Open Link in New _Tab"); + _("Open Link in New _Tab")); GdkScreen* screen = gtk_widget_get_screen (web_view); GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); if (gtk_icon_theme_has_icon (icon_theme, STOCK_TAB_NEW)) @@ -492,7 +492,7 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, if (text && strchr (text, '.') && !strchr (text, ' ')) { GtkWidget* menuitem = gtk_image_menu_item_new_with_mnemonic ( - "Open URL in New _Tab"); + _("Open URL in New _Tab")); GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); diff --git a/src/prefs.c b/src/prefs.c index e4cd0836..ce5a9425 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -296,7 +296,7 @@ static void on_prefs_protocols_combobox_changed(GtkWidget* widget, CPrefs* prefs GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) { - gchar* dialogTitle = g_strdup_printf("%s Preferences", g_get_application_name()); + gchar* dialogTitle = g_strdup_printf(_("%s Preferences"), g_get_application_name()); GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle , GTK_WINDOW(browser) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR @@ -360,41 +360,41 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) gtk_container_add(GTK_CONTAINER(align), __widget);\ FILLED_ADD(align, __left, __right, __top, __bottom) // Page "General" - PAGE_NEW("General"); - FRAME_NEW("Startup"); + PAGE_NEW(_("General")); + FRAME_NEW(_("Startup")); TABLE_NEW(2, 2); - INDENTED_ADD(gtk_label_new("Load on startup"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new(_("Load on startup")), 0, 1, 0, 1); combobox = gtk_combo_box_new_text(); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "Blank page", "Homepage", "Last open pages", NULL); + , _("Blank page"), _("Homepage"), _("Last open pages"), NULL); gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->startup); g_signal_connect(combobox, "changed" , G_CALLBACK(on_prefs_loadonstartup_changed), prefs); FILLED_ADD(combobox, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new("Homepage"), 0, 1, 1, 2); + INDENTED_ADD(gtk_label_new(_("Homepage")), 0, 1, 1, 2); entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(entry), config->homepage); g_signal_connect(entry, "focus-out-event" , G_CALLBACK(on_prefs_homepage_focus_out), prefs); FILLED_ADD(entry, 1, 2, 1, 2); // TODO: We need something like "use current website" - FRAME_NEW("Downloads"); + FRAME_NEW(_("Transfers")); TABLE_NEW(1, 2); - INDENTED_ADD(gtk_label_new("Download folder"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new(_("Download folder")), 0, 1, 0, 1); GtkWidget* filebutton = gtk_file_chooser_button_new( - "Choose download folder", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + _("Choose downloaded files folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); // FIXME: The default should probably be ~/Desktop gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filebutton) , g_get_home_dir()); //... gtk_widget_set_sensitive(filebutton, FALSE); //... FILLED_ADD(filebutton, 1, 2, 0, 1); checkbutton = gtk_check_button_new_with_mnemonic - ("Show a notification window for finished downloads"); + (_("Show a notification window for finished transfers")); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 1, 2); - FRAME_NEW("Languages"); + FRAME_NEW(_("Languages")); TABLE_NEW(1, 2); - INDENTED_ADD(gtk_label_new("Preferred languages"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new(_("Preferred languages")), 0, 1, 0, 1); entry = gtk_entry_new(); // TODO: Make sth like get_browser_languages_default filtering encodings and C out // TODO: Provide a real ui with real language names (iso-codes) @@ -406,32 +406,32 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) FILLED_ADD(entry, 1, 2, 0, 1); // Page "Appearance" - PAGE_NEW("Appearance"); - FRAME_NEW("Font settings"); + PAGE_NEW(_("Appearance")); + FRAME_NEW(_("Font settings")); TABLE_NEW(5, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic("Default _font"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("Default _font")), 0, 1, 0, 1); gchar* defaultFont = g_strdup_printf("%s %d" , config->defaultFontFamily, config->defaultFontSize); button = gtk_font_button_new_with_font(defaultFont); g_free(defaultFont); g_signal_connect(button, "font-set", G_CALLBACK(on_prefs_defaultFont_changed), prefs); FILLED_ADD(button, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new_with_mnemonic("_Minimum font size"), 0, 1, 1, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Minimum font size")), 0, 1, 1, 2); hbox = gtk_hbox_new(FALSE, 4); spinbutton = gtk_spin_button_new_with_range(1, G_MAXINT, 1); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize); g_signal_connect(spinbutton, "value-changed" , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs); gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - button = gtk_button_new_with_mnemonic("_Advanced"); + button = gtk_button_new_with_mnemonic(_("_Advanced")); gtk_widget_set_sensitive(button, FALSE); //... gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); FILLED_ADD(hbox, 1, 2, 1, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic("Default _encoding"), 0, 1, 2, 3); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("Default _encoding")), 0, 1, 2, 3); combobox = gtk_combo_box_new_text(); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "Chinese (BIG5)", "Japanese (SHIFT_JIS)", "Russian (KOI8-R)" - , "Unicode (UTF-8)", "Western (ISO-8859-1)", NULL); + , _("Chinese (BIG5)"), _("Japanese (SHIFT_JIS)"), _("Russian (KOI8-R)") + , _("Unicode (UTF-8)"), _("Western (ISO-8859-1)"), NULL); if(!strcmp(config->defaultEncoding, "BIG5")) gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); else if(!strcmp(config->defaultEncoding, "SHIFT_JIS")) @@ -446,95 +446,95 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) g_signal_connect(combobox, "changed" , G_CALLBACK(on_prefs_defaultEncoding_changed), prefs); FILLED_ADD(combobox, 1, 2, 2, 3); - button = gtk_button_new_with_label("Advanced settings"); + button = gtk_button_new_with_label(_("Advanced settings")); gtk_widget_set_sensitive(button, FALSE); //... WIDGET_ADD(button, 1, 2, 2, 3); - FRAME_NEW("Default colors"); + FRAME_NEW(_("Default colors")); TABLE_NEW(2, 4); - SEMI_INDENTED_ADD(gtk_label_new("Text color"), 0, 1, 0, 1); + SEMI_INDENTED_ADD(gtk_label_new(_("Text color")), 0, 1, 0, 1); colorbutton = gtk_color_button_new(); gtk_widget_set_sensitive(colorbutton, FALSE); //... WIDGET_ADD(colorbutton, 1, 2, 0, 1); - SEMI_INDENTED_ADD(gtk_label_new("Background color"), 2, 3, 0, 1); + SEMI_INDENTED_ADD(gtk_label_new(_("Background color")), 2, 3, 0, 1); colorbutton = gtk_color_button_new(); gtk_widget_set_sensitive(colorbutton, FALSE); //... WIDGET_ADD(colorbutton, 3, 4, 0, 1); - SEMI_INDENTED_ADD(gtk_label_new("Normal link color"), 0, 1, 1, 2); + SEMI_INDENTED_ADD(gtk_label_new(_("Link color")), 0, 1, 1, 2); colorbutton = gtk_color_button_new(); gtk_widget_set_sensitive(colorbutton, FALSE); //... WIDGET_ADD(colorbutton, 1, 2, 1, 2); - SEMI_INDENTED_ADD(gtk_label_new("Visited link color"), 2, 3, 1, 2); + SEMI_INDENTED_ADD(gtk_label_new(_("Visited link color")), 2, 3, 1, 2); colorbutton = gtk_color_button_new(); gtk_widget_set_sensitive(colorbutton, FALSE); //... WIDGET_ADD(colorbutton, 3, 4, 1, 2); // Page "Behavior" - PAGE_NEW("Behavior"); - FRAME_NEW("Browsing"); + PAGE_NEW(_("Behavior")); + FRAME_NEW(_("Browsing")); TABLE_NEW(3, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic("Open _new pages in"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("Open _new pages in")), 0, 1, 0, 1); combobox = gtk_combo_box_new_text(); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "New tab", "New window", "Current tab", NULL); + , _("New tab"), _("New window"), _("Current tab"), NULL); gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages); g_signal_connect(combobox, "changed", G_CALLBACK(on_prefs_newpages_changed), prefs); gtk_widget_set_sensitive(combobox, FALSE); //... FILLED_ADD(combobox, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic("_Middle click goto"); + checkbutton = gtk_check_button_new_with_mnemonic(_("_Middle click opens selection")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->middleClickGoto); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_middleClickGoto_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Open tabs in the _background"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Open tabs in the _background")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Open popups in _tabs"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Open popups in _tabs")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_openPopupsInTabs_toggled), prefs); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 2, 3); - FRAME_NEW("Features"); + FRAME_NEW(_("Features")); TABLE_NEW(4, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Load _images"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Load _images")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic("_Shrink images to fit"); + checkbutton = gtk_check_button_new_with_mnemonic(_("_Shrink images to fit")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_shrinkImagesToFit_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic("Print _backgrounds"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Print _backgrounds")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("_Resizable textareas"); + checkbutton = gtk_check_button_new_with_mnemonic(_("_Resizable textareas")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_resizableTextAreas_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Enable _scripts"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Enable _scripts")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 2, 3); - checkbutton = gtk_check_button_new_with_mnemonic("Enable _plugins"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Enable _plugins")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_enablePlugins_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 2, 3); - checkbutton = gtk_check_button_new_with_mnemonic("_User Stylesheet"); + checkbutton = gtk_check_button_new_with_mnemonic(_("_User Stylesheet")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->userStylesheet); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_userStylesheet_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 3, 4); filebutton = gtk_file_chooser_button_new( - "Choose user stylesheet", GTK_FILE_CHOOSER_ACTION_OPEN); + _("Choose user stylesheet"), GTK_FILE_CHOOSER_ACTION_OPEN); prefs->userStylesheetUri = filebutton; gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(filebutton), config->userStylesheetUri); g_signal_connect(filebutton, "file-set" @@ -543,54 +543,54 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) FILLED_ADD(filebutton, 1, 2, 3, 4); // Page "Interface" - PAGE_NEW("Interface"); - FRAME_NEW("Navigationbar"); + PAGE_NEW(_("Interface")); + FRAME_NEW(_("Navigationbar")); TABLE_NEW(3, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic("_Toolbar style"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Toolbar style")), 0, 1, 0, 1); combobox = gtk_combo_box_new_text(); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "Default", "Icons", "Text", "Both", "Both horizontal", NULL); + , _("Default"), _("Icons"), _("Text"), _("Both"), _("Both horizontal"), NULL); gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->toolbarStyle); g_signal_connect(combobox, "changed" , G_CALLBACK(on_prefs_toolbarstyle_changed), prefs); FILLED_ADD(combobox, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic("Show small _icons"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Show small _icons")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Show web_search"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Show Web_search")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarWebSearch_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Show _New Tab Button"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Show _New Tab")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 2, 3); - checkbutton = gtk_check_button_new_with_mnemonic("Show _closed tabs button"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Show _Trash")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs); SPANNED_ADD(checkbutton, 1, 2, 2, 3); - FRAME_NEW("Miscellaneous"); + FRAME_NEW(_("Miscellaneous")); TABLE_NEW(2, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Close _buttons on tabs"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Close _buttons on tabs")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); g_signal_connect(checkbutton, "toggled" , G_CALLBACK(on_prefs_tabClose_toggled), prefs); INDENTED_ADD(checkbutton, 0, 1, 0, 1); hbox = gtk_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(hbox) - , gtk_label_new_with_mnemonic("Tab Si_ze"), FALSE, FALSE, 4); + , gtk_label_new_with_mnemonic(_("Tab Si_ze")), FALSE, FALSE, 4); spinbutton = gtk_spin_button_new_with_range(0, 36, 1); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize); g_signal_connect(spinbutton, "changed" , G_CALLBACK(on_prefs_tabSize_changed), prefs); gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); FILLED_ADD(hbox, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new_with_mnemonic("_Location search engine"), 0, 1, 1, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Location search engine")), 0, 1, 1, 2); entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch); g_signal_connect(entry, "focus-out-event" @@ -598,14 +598,14 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) FILLED_ADD(entry, 1, 2, 1, 2); // Page "Network" - PAGE_NEW("Network"); - FRAME_NEW("Proxy Server"); + PAGE_NEW(_("Network")); + FRAME_NEW(_("Proxy Server")); TABLE_NEW(5, 2); - checkbutton = gtk_check_button_new_with_mnemonic("_Custom proxy server"); + checkbutton = gtk_check_button_new_with_mnemonic(_("_Custom proxy server")); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 0, 1); hbox = gtk_hbox_new(FALSE, 4); - INDENTED_ADD(gtk_label_new_with_mnemonic("_Host/ Port"), 0, 1, 1, 2); + INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Host/ Port")), 0, 1, 1, 2); entry = gtk_entry_new(); gtk_widget_set_sensitive(entry, FALSE); //... gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); @@ -614,61 +614,61 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); FILLED_ADD(hbox, 1, 2, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic - ("Proxy requires authentication"); + (_("Proxy requires authentication")); gtk_widget_set_sensitive(checkbutton, FALSE); //... // TODO: The proxy user and pass need to be indented further SPANNED_ADD(checkbutton, 0, 2, 2, 3); - INDENTED_ADD(gtk_label_new("Username"), 0, 1, 3, 4); + INDENTED_ADD(gtk_label_new(_("Username")), 0, 1, 3, 4); entry = gtk_entry_new(); gtk_widget_set_sensitive(entry, FALSE); //... FILLED_ADD(entry, 1, 2, 3, 4); - INDENTED_ADD(gtk_label_new("Password"), 0, 1, 4, 5); + INDENTED_ADD(gtk_label_new(_("Password")), 0, 1, 4, 5); entry = gtk_entry_new(); gtk_widget_set_sensitive(entry, FALSE); //... FILLED_ADD(entry, 1, 2, 4, 5); - FRAME_NEW("Cache"); + FRAME_NEW(_("Cache")); TABLE_NEW(1, 2); - INDENTED_ADD(gtk_label_new("Cache size"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new(_("Cache size")), 0, 1, 0, 1); hbox = gtk_hbox_new(FALSE, 4); spinbutton = gtk_spin_button_new_with_range(0, 10000, 10); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 100/*config->iCacheSize*/); gtk_widget_set_sensitive(spinbutton, FALSE); //... gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("MB"), FALSE, FALSE, 0); - button = gtk_button_new_with_label("Clear cache"); + gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("MB")), FALSE, FALSE, 0); + button = gtk_button_new_with_label(_("Clear cache")); gtk_widget_set_sensitive(button, FALSE); //... gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); FILLED_ADD(hbox, 1, 2, 0, 1); // Page "Privacy" - PAGE_NEW("Privacy"); - FRAME_NEW("Cookies"); + PAGE_NEW(_("Privacy")); + FRAME_NEW(_("Cookies")); TABLE_NEW(3, 2); - INDENTED_ADD(gtk_label_new("Accept cookies"), 0, 1, 0, 1); + INDENTED_ADD(gtk_label_new(_("Accept cookies")), 0, 1, 0, 1); combobox = gtk_combo_box_new_text(); sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "All cookies", "Session cookies", "None", NULL); + , _("All cookies"), _("Session cookies"), _("None"), NULL); gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... gtk_widget_set_sensitive(combobox, FALSE); //... FILLED_ADD(combobox, 1, 2, 0, 1); checkbutton = gtk_check_button_new_with_mnemonic - ("Allow cookies from the original website only"); + (_("Allow cookies from the original website only")); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 1, 2); - INDENTED_ADD(gtk_label_new("Maximum cookie age"), 0, 1, 2, 3); + INDENTED_ADD(gtk_label_new(_("Maximum cookie age")), 0, 1, 2, 3); hbox = gtk_hbox_new(FALSE, 4); spinbutton = gtk_spin_button_new_with_range(0, 360, 1); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 30/*config->iCookieAgeMax*/); gtk_widget_set_sensitive(spinbutton, FALSE); //... gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("days"), FALSE, FALSE, 0); - button = gtk_button_new_with_label("View cookies"); + gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("days")), FALSE, FALSE, 0); + button = gtk_button_new_with_label(_("View cookies")); gtk_widget_set_sensitive(button, FALSE); //... gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); FILLED_ADD(hbox, 1, 2, 2, 3); - FRAME_NEW("History"); + FRAME_NEW(_("History")); TABLE_NEW(3, 2); - checkbutton = gtk_check_button_new_with_mnemonic("Remember my visited pages"); + checkbutton = gtk_check_button_new_with_mnemonic(_("Remember my visited pages")); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 1, 0, 1); hbox = gtk_hbox_new(FALSE, 4); @@ -676,20 +676,20 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 30/*config->iHistoryAgeMax*/); gtk_widget_set_sensitive(spinbutton, FALSE); //... gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("days"), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("days")), FALSE, FALSE, 0); SPANNED_ADD(hbox, 1, 2, 0, 1); checkbutton = gtk_check_button_new_with_mnemonic - ("Remember my form inputs"); + (_("Remember my form inputs")); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 1, 2); checkbutton = gtk_check_button_new_with_mnemonic - ("Remember my downloaded files"); + (_("Remember my downloaded files")); gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 2, 3); // Page "Programs" - PAGE_NEW("Programs"); - FRAME_NEW("External programs"); + PAGE_NEW(_("Programs")); + FRAME_NEW(_("External programs")); TABLE_NEW(3, 2); GtkWidget* treeview; GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; @@ -700,10 +700,10 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) renderer_text = gtk_cell_renderer_text_new(); renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); column = gtk_tree_view_column_new_with_attributes( - "Protocol", renderer_text, "text", PROTOCOLS_COL_NAME, NULL); + _("Protocol"), renderer_text, "text", PROTOCOLS_COL_NAME, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); column = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(column, "Command"); + gtk_tree_view_column_set_title(column, _("Command")); gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf , (GtkTreeCellDataFunc)on_prefs_protocols_render_icon, prefs, NULL); diff --git a/src/sokoke.c b/src/sokoke.c index 8bcca67f..7f681996 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -18,6 +18,7 @@ #include #endif #include +#include void sokoke_combo_box_add_strings(GtkComboBox* combobox , const gchar* labelFirst, ...) @@ -153,7 +154,7 @@ gpointer sokoke_superuser_warning_new(void) GtkWidget* hbox = gtk_event_box_new(); gtk_widget_modify_bg(hbox, GTK_STATE_NORMAL , &hbox->style->bg[GTK_STATE_SELECTED]); - GtkWidget* label = gtk_label_new("Warning: You are using the superuser account!"); + GtkWidget* label = gtk_label_new(_("Warning: You are using a superuser account!")); gtk_misc_set_padding(GTK_MISC(label), 0, 2); gtk_widget_modify_fg(GTK_WIDGET(label), GTK_STATE_NORMAL , >K_WIDGET(label)->style->fg[GTK_STATE_SELECTED]); @@ -263,7 +264,7 @@ gboolean sokoke_key_file_save_to_file(GKeyFile* keyFile if(!(fp = fopen(filename, "w"))) { *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_ACCES - , "Writing failed."); + , _("Writing failed.")); return FALSE; } fputs(data, fp); diff --git a/src/webSearch.c b/src/webSearch.c index a7a4d6ae..1f4d4f48 100644 --- a/src/webSearch.c +++ b/src/webSearch.c @@ -18,6 +18,7 @@ #include #include +#include void update_searchEngine(guint index, GtkWidget* search) { @@ -78,7 +79,7 @@ void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos } else { - menuitem = gtk_image_menu_item_new_with_label("Empty"); + menuitem = gtk_image_menu_item_new_with_label(_("Empty")); gtk_widget_set_sensitive(menuitem, FALSE); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem); @@ -149,7 +150,7 @@ const gchar* STR_NON_NULL(const gchar* string) static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webSearch) { GtkWidget* dialog = gtk_dialog_new_with_buttons( - newEngine ? "Add search engine" : "Edit search engine" + newEngine ? _("Add search engine") : _("Edit search engine") , GTK_WINDOW(webSearch->window) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL @@ -179,7 +180,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS GtkWidget* hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic("_Name:"); + GtkWidget* label = gtk_label_new_with_mnemonic(_("_Name:")); gtk_size_group_add_widget(sizegroup, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); GtkWidget* entry_shortName = gtk_entry_new(); @@ -195,7 +196,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Description:"); + label = gtk_label_new_with_mnemonic(_("_Description:")); gtk_size_group_add_widget(sizegroup, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); GtkWidget* entry_description = gtk_entry_new(); @@ -209,7 +210,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Url:"); + label = gtk_label_new_with_mnemonic(_("_URL:")); gtk_size_group_add_widget(sizegroup, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); GtkWidget* entry_url = gtk_entry_new(); @@ -223,7 +224,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Icon (name or file):"); + label = gtk_label_new_with_mnemonic(_("_Icon (name or file):")); gtk_size_group_add_widget(sizegroup, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); GtkWidget* entry_icon = gtk_entry_new(); @@ -237,7 +238,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS hbox = gtk_hbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic("_Keyword:"); + label = gtk_label_new_with_mnemonic(_("_Keyword:")); gtk_size_group_add_widget(sizegroup, label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); GtkWidget* entry_keyword = gtk_entry_new(); @@ -306,7 +307,7 @@ static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) { - const gchar* dialogTitle = "Manage search engines"; + const gchar* dialogTitle = _("Manage search engines"); GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle , GTK_WINDOW(browser) , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR From e9710d3b3be74f50c97a8f059150ae99fa4579cc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 22 Mar 2008 23:20:22 +0100 Subject: [PATCH 0045/2970] Destroy the tab, not only the web view --- src/midori-browser.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 97d36e95..ea7652b2 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -603,8 +603,9 @@ static void _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - gtk_widget_destroy (web_view); + GtkWidget* widget = midori_browser_get_current_page (browser); + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); + gtk_widget_destroy (scrolled); } static void @@ -2683,7 +2684,7 @@ midori_browser_set_property (GObject* object, katze_object_assign (priv->settings, g_value_get_object (value)); g_object_ref (priv->settings); gtk_container_foreach (GTK_CONTAINER (priv->notebook), - (GtkCallback*) midori_web_view_set_settings, + (GtkCallback) midori_web_view_set_settings, priv->settings); break; case PROP_TRASH: From b8ac63e60a2c3370ee8851f3891d1484659d35b1 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 23 Mar 2008 21:43:12 +0100 Subject: [PATCH 0046/2970] Add swedish translation. --- po/LINGUAS | 2 +- po/sv.po | 948 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 949 insertions(+), 1 deletion(-) create mode 100644 po/sv.po diff --git a/po/LINGUAS b/po/LINGUAS index 378dbde1..92e98dae 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de +de sv diff --git a/po/sv.po b/po/sv.po new file mode 100644 index 00000000..bd04c6e1 --- /dev/null +++ b/po/sv.po @@ -0,0 +1,948 @@ +# Swedish translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Mikael Magnusson , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.17\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-03-23 21:04+0100\n" +"PO-Revision-Date: 2008-03-23 21:05+0100\n" +"Last-Translator: Mikael Magnusson \n" +"Language-Team: Swedish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Liten webbläsare" + +#: ../midori.desktop.in.h:2 +msgid "Midori Web Browser" +msgstr "Midori Webbläsare" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Webbläsare" + +#. FIXME: Should we have a more specific message? +#: ../src/helpers.c:68 ../src/helpers.c:84 +msgid "Could not run external program." +msgstr "Kunde inte starta externt program." + +#: ../src/main.c:49 +msgid "Bookmark" +msgstr "Bokmärke" + +#: ../src/main.c:50 +msgid "New Bookmark" +msgstr "Nytt Bokmärke" + +#: ../src/main.c:51 +msgid "_Form Fill" +msgstr "Fyll i _formulär" + +#: ../src/main.c:52 ../src/prefs.c:369 ../src/prefs.c:374 +msgid "Homepage" +msgstr "Hemsida" + +#: ../src/main.c:53 +msgid "New _Tab" +msgstr "Ny _tabb" + +#: ../src/main.c:54 +msgid "New _Window" +msgstr "Nytt _fönster" + +#: ../src/main.c:59 +msgid "_Fullscreen" +msgstr "_Fullskärm" + +#: ../src/main.c:60 +msgid "_Leave Fullscreen" +msgstr "_Lämna fullskärm" + +#: ../src/main.c:139 ../src/main.c:171 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:146 +msgid "Display program version" +msgstr "Visa programversion" + +#: ../src/main.c:150 +msgid "[URL]" +msgstr "[URL]" + +#: ../src/main.c:173 +msgid "Debugging" +msgstr "Felsökning" + +#: ../src/main.c:174 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" + +#: ../src/main.c:176 +msgid "Check for new versions at:" +msgstr "Leta efter nya verioner på:" + +#: ../src/main.c:193 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Konfigurationsfilen kunde inte laddas. %s\n" + +#: ../src/main.c:219 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Bokmärkena kunde inte laddas. %s\n" + +#: ../src/main.c:232 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Sessionen kunde inte laddas. %s\n" + +#: ../src/main.c:244 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Papperskorgen kunde inte laddas. %s\n" + +#: ../src/main.c:254 +msgid "The following errors occured:" +msgstr "Följande fel inträffade:" + +#: ../src/main.c:56 +msgid "Select _All" +msgstr "Välj _alla" + +#: ../src/midori-browser.c:185 ../src/midori-browser.c:1919 +#: ../src/midori-browser.c:1925 +msgid "Reload the current page" +msgstr "Ladda om sidan" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:1922 +msgid "Stop loading the current page" +msgstr "Sluta ladda sidan" + +#: ../src/midori-browser.c:258 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% laddat" + +#: ../src/midori-browser.c:521 ../src/midori-webview.c:253 +msgid "The associated settings" +msgstr "De associerade inställningarna" + +#: ../src/midori-browser.c:541 ../src/midori-webview.c:244 +msgid "The text that is displayed in the statusbar" +msgstr "Texten som visas i statusraden" + +#: ../src/midori-browser.c:560 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Soptunnan, samlar senast stängda tabbar och fönster" + +#: ../src/midori-browser.c:1052 +msgid "Open location" +msgstr "Öppna plats" + +#: ../src/midori-browser.c:1064 ../src/midori-browser.c:1110 +msgid "_Location:" +msgstr "_Plats:" + +#. TODO: We should offer all of the search's features here +#: ../src/midori-browser.c:1098 +msgid "Web search" +msgstr "Webbsökning" + +#: ../src/midori-browser.c:1137 +msgid "New bookmark" +msgstr "Nytt bokmärke" + +#: ../src/midori-browser.c:1137 +msgid "Edit bookmark" +msgstr "Redigera bokmärke" + +#: ../src/midori-browser.c:1154 +msgid "_Title:" +msgstr "_Titel:" + +#: ../src/midori-browser.c:1170 ../src/webSearch.c:199 +msgid "_Description:" +msgstr "_Beskrivning" + +#: ../src/midori-browser.c:1189 ../src/webSearch.c:213 +msgid "_URL:" +msgstr "_URL:" + +#: ../src/midori-browser.c:1207 +msgid "_Folder:" +msgstr "_Mapp:" + +#: ../src/midori-browser.c:1211 +msgid "Root" +msgstr "Rot" + +#: ../src/midori-browser.c:1430 +msgid "Separator" +msgstr "Avskiljare" + +#: ../src/midori-browser.c:1616 +msgid "A lightweight web browser." +msgstr "En liten webbläsare." + +#: ../src/midori-browser.c:1624 +msgid "translator-credits" +msgstr "Mikael Magnusson " + +#: ../src/midori-browser.c:1839 +msgid "_File" +msgstr "_Fil" + +#: ../src/midori-browser.c:1842 +msgid "Open a new window" +msgstr "Öppna i nytt fönster" + +#: ../src/midori-browser.c:1845 +msgid "Open a new tab" +msgstr "Öppna i ny tabb" + +#: ../src/midori-browser.c:1848 +msgid "Open a file" +msgstr "Öppna en fil" + +#: ../src/midori-browser.c:1851 +msgid "Save to a file" +msgstr "Spara till fil" + +#: ../src/midori-browser.c:1853 +msgid "_Close Tab" +msgstr "_Stäng tabb" + +#: ../src/midori-browser.c:1854 +msgid "Close the current tab" +msgstr "Stäng den här tabben" + +#: ../src/midori-browser.c:1856 +msgid "C_lose Window" +msgstr "S_täng fönster" + +#: ../src/midori-browser.c:1857 +msgid "Close this window" +msgstr "Stäng det här fönstret" + +#: ../src/midori-browser.c:1859 +msgid "Pa_ge Setup" +msgstr "_Sidinställningar" + +#: ../src/midori-browser.c:1869 +msgid "Quit the application" +msgstr "Avsluta programmet" + +#: ../src/midori-browser.c:1871 +msgid "_Edit" +msgstr "_Redigera" + +#: ../src/midori-browser.c:1874 +msgid "Undo the last modification" +msgstr "Ångra senaste ändringen" + +#: ../src/midori-browser.c:1877 +msgid "Redo the last modification" +msgstr "Gör om senaste ändringen" + +#: ../src/midori-browser.c:1883 ../src/midori-browser.c:1886 +msgid "Copy the selected text" +msgstr "Kopiera markerad text" + +#: ../src/midori-browser.c:1889 +msgid "Paste text from the clipboard" +msgstr "Klistra in text från klippbordet" + +#: ../src/midori-browser.c:1892 +msgid "Delete the selected text" +msgstr "Ta bort markerad text" + +#: ../src/midori-browser.c:1895 +msgid "Select all text" +msgstr "Markera all text" + +#: ../src/midori-browser.c:1903 +msgid "Find _Next" +msgstr "Hitta _nästa" + +#: ../src/midori-browser.c:1906 +msgid "Find _Previous" +msgstr "Hitta _förra" + +#: ../src/midori-browser.c:1909 +msgid "_Quick Find" +msgstr "_Snabbsök" + +#: ../src/midori-browser.c:1915 +msgid "_View" +msgstr "_Visa" + +#: ../src/midori-browser.c:1916 +msgid "_Toolbars" +msgstr "_Verktygsfält" + +#: ../src/midori-browser.c:1936 +msgid "View Source" +msgstr "Visa källkod" + +#: ../src/midori-browser.c:1939 +msgid "View Selection Source" +msgstr "Visa källkod för markering" + +#: ../src/midori-browser.c:1943 +msgid "Toggle fullscreen view" +msgstr "Växla fullskärmsläge" + +#: ../src/midori-browser.c:1945 +msgid "_Go" +msgstr "_Gå" + +#: ../src/midori-browser.c:1956 +msgid "Location..." +msgstr "Plats..." + +#: ../src/midori-browser.c:1959 +msgid "Web Search..." +msgstr "Webbsökning..." + +#: ../src/midori-browser.c:1962 +msgid "Open in Page_holder..." +msgstr "Visa i sid_hållare..." + +#: ../src/midori-browser.c:1965 +msgid "Closed Tabs and Windows" +msgstr "Stängda tabbar och fönster" + +#: ../src/midori-browser.c:1966 +msgid "Reopen a previously closed tab or window" +msgstr "Öppna en tidigare stängd tabb eller fönster" + +#: ../src/midori-browser.c:1968 +msgid "Empty Trash" +msgstr "Töm papperskorgen" + +#: ../src/midori-browser.c:1971 +msgid "Undo Close Tab" +msgstr "Ångra stäng tabb" + +#: ../src/midori-browser.c:1974 +msgid "_Bookmarks" +msgstr "_Bokmärken" + +#: ../src/midori-browser.c:1979 +msgid "_Manage Bookmarks" +msgstr "_Hantera bokmärken" + +#: ../src/midori-browser.c:1985 +msgid "Open in New _Tab" +msgstr "Öppna i ny _tabb" + +#: ../src/midori-browser.c:1988 +msgid "Open in New _Window" +msgstr "Öppna i nytt _fönster" + +#: ../src/midori-browser.c:1997 +msgid "_Tools" +msgstr "_Verktyg" + +#: ../src/midori-browser.c:1999 +msgid "_Manage Search Engines" +msgstr "_Hantera sökmotorer" + +#: ../src/midori-browser.c:2000 +msgid "Add, edit and remove search engines..." +msgstr "Lägg till, ändra och ta bort sökmotorer..." + +#: ../src/midori-browser.c:2003 +msgid "_Window" +msgstr "_Fönster" + +#: ../src/midori-browser.c:2005 +msgid "_Previous Tab" +msgstr "_Föregående tabb" + +#: ../src/midori-browser.c:2008 +msgid "_Next Tab" +msgstr "_Nästa tabb" + +#: ../src/midori-browser.c:2011 +msgid "Tab _Overview" +msgstr "Tabbö_versikt" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../src/midori-browser.c:2014 +msgid "_Help" +msgstr "_Hjälp" + +#: ../src/midori-browser.c:2016 +msgid "_Contents" +msgstr "_Innehåll" + +#: ../src/midori-browser.c:2026 +msgid "P_rivate Browsing" +msgstr "P_rivat läge" + +#: ../src/midori-browser.c:2030 +msgid "_Work Offline" +msgstr "_Arbeta offline" + +#: ../src/midori-browser.c:2035 +msgid "_Navigationbar" +msgstr "_Navigationsfält" + +#: ../src/midori-browser.c:2039 +msgid "Side_panel" +msgstr "Sido_panel" + +#: ../src/midori-browser.c:2043 +msgid "_Bookmarkbar" +msgstr "_Bokmärkesfält" + +#: ../src/midori-browser.c:2047 +msgid "_Transferbar" +msgstr "Ö_verföringsfält" + +#: ../src/midori-browser.c:2051 +msgid "_Statusbar" +msgstr "_Statusrad" + +#: ../src/midori-browser.c:2521 +msgid "Bookmarks" +msgstr "Bokmärken" + +#. TODO: We need something like "use current website" +#: ../src/midori-browser.c:2531 ../src/prefs.c:381 +msgid "Transfers" +msgstr "Överföringar" + +#: ../src/midori-browser.c:2540 +msgid "Console" +msgstr "Konsol" + +#: ../src/midori-browser.c:2549 ../src/prefs.c:669 +msgid "History" +msgstr "Historia" + +#: ../src/midori-browser.c:2558 +msgid "Pageholder" +msgstr "Sidhållare" + +#: ../src/midori-browser.c:2580 +msgid "_Inline find:" +msgstr "_Snabbsökning:" + +#: ../src/midori-browser.c:2606 +msgid "Match Case" +msgstr "_Gör skillnad på skiftläge" + +#: ../src/midori-browser.c:2623 +msgid "Close Findbar" +msgstr "Stäng sökfältet" + +#: ../src/midori-panel.c:140 +msgid "Appearance of the shadow around each panel" +msgstr "Utseende på skuggan runt varje panel" + +#: ../src/midori-panel.c:150 +msgid "Menu to hold panel items" +msgstr "Meny för att visa panelföremål" + +#: ../src/midori-panel.c:159 +msgid "The index of the current page" +msgstr "Indexet för nuvarande sida" + +#: ../src/midori-panel.c:203 ../src/midori-panel.c:204 +msgid "Close panel" +msgstr "Stäng panel" + +#: ../src/midori-panel.c:368 +msgid "Untitled" +msgstr "Namnlös" + +#: ../src/midori-trash.c:97 +msgid "The maximum number of items" +msgstr "Maximalt antal föremål" + +#: ../src/midori-websettings.c:69 +msgid "The desired tab label size" +msgstr "Önskad storlek på tabbetikett" + +#: ../src/midori-websettings.c:78 +msgid "Whether tabs have close buttons" +msgstr "Ifall tabbar har stängknappar" + +#: ../src/midori-websettings.c:87 +msgid "Load an URL from the selection via middle click" +msgstr "Ladda en URL från markeringen via mittenklick" + +#: ../src/midori-webview.c:217 +msgid "The icon of the currently loaded page" +msgstr "Ikonen för den laddade sidan" + +#: ../src/midori-webview.c:226 +msgid "The URI of the currently loaded page" +msgstr "URIn för den laddade sidan" + +#: ../src/midori-webview.c:235 +msgid "The title of the currently loaded page" +msgstr "Titeln för den laddade sidan" + +#: ../src/midori-webview.c:472 +msgid "Open Link in New _Tab" +msgstr "Öppna länk i ny _tabb" + +#: ../src/midori-webview.c:495 +msgid "Open URL in New _Tab" +msgstr "Öppna URL i ny _tabb" + +#: ../src/prefs.c:299 +#, c-format +msgid "%s Preferences" +msgstr "%s inställningar" + +#. Page "General" +#: ../src/prefs.c:363 +msgid "General" +msgstr "Allmänt" + +#: ../src/prefs.c:364 +msgid "Startup" +msgstr "Uppstart" + +#: ../src/prefs.c:366 +msgid "Load on startup" +msgstr "Ladda vid uppstart" + +#: ../src/prefs.c:369 +msgid "Blank page" +msgstr "Tom sida" + +#: ../src/prefs.c:369 +msgid "Last open pages" +msgstr "Senaste öppna sidor" + +#: ../src/prefs.c:383 +msgid "Download folder" +msgstr "Nedladdningsmapp" + +#: ../src/prefs.c:385 +msgid "Choose downloaded files folder" +msgstr "Välj nedladdningsmapp" + +#: ../src/prefs.c:392 +msgid "Show a notification window for finished transfers" +msgstr "Visa ett notifieringsfönster för avslutade överföringar" + +#: ../src/prefs.c:395 +msgid "Languages" +msgstr "Språk" + +#: ../src/prefs.c:397 +msgid "Preferred languages" +msgstr "Föredragna språk" + +#. Page "Appearance" +#: ../src/prefs.c:409 +msgid "Appearance" +msgstr "Utseende" + +#: ../src/prefs.c:410 +msgid "Font settings" +msgstr "Typsnittinställningar" + +#: ../src/prefs.c:412 +msgid "Default _font" +msgstr "Standard_typsnitt" + +#: ../src/prefs.c:419 +msgid "_Minimum font size" +msgstr "_Minimal typsnittstorlek" + +#: ../src/prefs.c:426 +msgid "_Advanced" +msgstr "_Avancerat" + +#: ../src/prefs.c:430 +msgid "Default _encoding" +msgstr "Standard_kodning" + +#: ../src/prefs.c:433 +msgid "Chinese (BIG5)" +msgstr "Kinesiska (BIG5)" + +#: ../src/prefs.c:433 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanska (SHIFT_JIS)" + +#: ../src/prefs.c:433 +msgid "Russian (KOI8-R)" +msgstr "Ryska (KOI8-R)" + +#: ../src/prefs.c:434 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../src/prefs.c:434 +msgid "Western (ISO-8859-1)" +msgstr "Västerländsk (ISO-8859-1)" + +#: ../src/prefs.c:449 +msgid "Advanced settings" +msgstr "Avancerade inställningar" + +#: ../src/prefs.c:452 +msgid "Default colors" +msgstr "Standardfärger" + +#: ../src/prefs.c:454 +msgid "Text color" +msgstr "Textfärger" + +#: ../src/prefs.c:458 +msgid "Background color" +msgstr "Bakgrundsfärg" + +#: ../src/prefs.c:462 +msgid "Link color" +msgstr "Länkfärg" + +#: ../src/prefs.c:466 +msgid "Visited link color" +msgstr "Färg för besökta länkar" + +#. Page "Behavior" +#: ../src/prefs.c:472 +msgid "Behavior" +msgstr "Beteende" + +#: ../src/prefs.c:473 +msgid "Browsing" +msgstr "Bläddring" + +#: ../src/prefs.c:475 +msgid "Open _new pages in" +msgstr "Öppna _nya sidor i" + +#: ../src/prefs.c:478 +msgid "New tab" +msgstr "Ny tabb" + +#: ../src/prefs.c:478 +msgid "New window" +msgstr "Nytt fönster" + +#: ../src/prefs.c:478 +msgid "Current tab" +msgstr "Nuvarande tabb" + +#: ../src/prefs.c:483 +msgid "_Middle click opens selection" +msgstr "_Mittenklick öppnar markering" + +#: ../src/prefs.c:488 +msgid "Open tabs in the _background" +msgstr "Öppna tabbar i _bakgrunden" + +#: ../src/prefs.c:493 +msgid "Open popups in _tabs" +msgstr "Öppna popups i _tabbar" + +#: ../src/prefs.c:499 +msgid "Features" +msgstr "Funktioner" + +#: ../src/prefs.c:501 +msgid "Load _images" +msgstr "Ladda b_ilder" + +#: ../src/prefs.c:506 +msgid "_Shrink images to fit" +msgstr "Min_ska bilder för att få plats" + +#: ../src/prefs.c:511 +msgid "Print _backgrounds" +msgstr "Skriv ut _bakgrunder" + +#: ../src/prefs.c:516 +msgid "_Resizable textareas" +msgstr "Sto_rleken går att ändra på textrutor" + +#: ../src/prefs.c:521 +msgid "Enable _scripts" +msgstr "Aktivera _skript" + +#: ../src/prefs.c:526 +msgid "Enable _plugins" +msgstr "Aktivera _insticksmoduler" + +#: ../src/prefs.c:531 +msgid "_User Stylesheet" +msgstr "Användarformatmall" + +#: ../src/prefs.c:537 +msgid "Choose user stylesheet" +msgstr "Välj användarformatmall" + +#. Page "Interface" +#: ../src/prefs.c:546 +msgid "Interface" +msgstr "Gränssnitt" + +#: ../src/prefs.c:547 +msgid "Navigationbar" +msgstr "Navigeringsfält" + +#: ../src/prefs.c:549 +msgid "_Toolbar style" +msgstr "S_til för verktygsfält" + +#: ../src/prefs.c:552 +msgid "Default" +msgstr "Standard" + +#: ../src/prefs.c:552 +msgid "Icons" +msgstr "Ikoner" + +#: ../src/prefs.c:552 +msgid "Text" +msgstr "Text" + +#: ../src/prefs.c:552 +msgid "Both" +msgstr "Både och" + +#: ../src/prefs.c:552 +msgid "Both horizontal" +msgstr "Båda horisontellt" + +#: ../src/prefs.c:557 +msgid "Show small _icons" +msgstr "Visa små _ikoner" + +#: ../src/prefs.c:562 +msgid "Show Web_search" +msgstr "Visa webb_sökning" + +#: ../src/prefs.c:567 +msgid "Show _New Tab" +msgstr "Visa _ny tabb" + +#: ../src/prefs.c:572 +msgid "Show _Trash" +msgstr "Visa _papperskorgen" + +#: ../src/prefs.c:577 +msgid "Miscellaneous" +msgstr "Diverse" + +#: ../src/prefs.c:579 +msgid "Close _buttons on tabs" +msgstr "Stäng_knappar på tabbar" + +#: ../src/prefs.c:586 +msgid "Tab Si_ze" +msgstr "Ta_bbstorlek" + +#: ../src/prefs.c:593 +msgid "_Location search engine" +msgstr "Sökmotor för _addressfältet" + +#. Page "Network" +#: ../src/prefs.c:601 +msgid "Network" +msgstr "Nätverk" + +#: ../src/prefs.c:602 +msgid "Proxy Server" +msgstr "Proxyserver" + +#: ../src/prefs.c:604 +msgid "_Custom proxy server" +msgstr "_Anpassad proxyserver" + +#: ../src/prefs.c:608 +msgid "_Host/ Port" +msgstr "_Server/ Port" + +#: ../src/prefs.c:617 +msgid "Proxy requires authentication" +msgstr "Proxy kräver autentisering" + +#: ../src/prefs.c:621 +msgid "Username" +msgstr "Användarnamn" + +#: ../src/prefs.c:625 +msgid "Password" +msgstr "Lösenord" + +#: ../src/prefs.c:629 +msgid "Cache" +msgstr "Cache" + +#: ../src/prefs.c:631 +msgid "Cache size" +msgstr "Cache-storlek" + +#: ../src/prefs.c:637 +msgid "MB" +msgstr "MB" + +#: ../src/prefs.c:638 +msgid "Clear cache" +msgstr "Rensa cache" + +#. Page "Privacy" +#: ../src/prefs.c:644 +msgid "Privacy" +msgstr "Sekretess" + +#: ../src/prefs.c:645 +msgid "Cookies" +msgstr "Kakor" + +#: ../src/prefs.c:647 +msgid "Accept cookies" +msgstr "Acceptera kakor" + +#: ../src/prefs.c:650 +msgid "All cookies" +msgstr "Alla kakor" + +#: ../src/prefs.c:650 +msgid "Session cookies" +msgstr "Sessionskakor" + +#: ../src/prefs.c:650 +msgid "None" +msgstr "Inga" + +#: ../src/prefs.c:655 +msgid "Allow cookies from the original website only" +msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" + +#: ../src/prefs.c:658 +msgid "Maximum cookie age" +msgstr "Maximal kakålder" + +#: ../src/prefs.c:664 ../src/prefs.c:679 +msgid "days" +msgstr "dagar" + +#: ../src/prefs.c:665 +msgid "View cookies" +msgstr "Visa kakor" + +#: ../src/prefs.c:671 +msgid "Remember my visited pages" +msgstr "Kom ihåg mina besökta sidor" + +#: ../src/prefs.c:682 +msgid "Remember my form inputs" +msgstr "Kom ihåg vad jag fyllt i fält med" + +#: ../src/prefs.c:686 +msgid "Remember my downloaded files" +msgstr "Kom ihåg mina nerladdade filer" + +#. Page "Programs" +#: ../src/prefs.c:691 +msgid "Programs" +msgstr "Program" + +#: ../src/prefs.c:692 +msgid "External programs" +msgstr "Externa program" + +#: ../src/prefs.c:703 +msgid "Protocol" +msgstr "Protokoll" + +#: ../src/prefs.c:706 +msgid "Command" +msgstr "Kommando" + +#: ../src/sokoke.c:157 +msgid "Warning: You are using a superuser account!" +msgstr "Varning: Du använder ett administratörskonto!" + +#: ../src/sokoke.c:267 ../katze/katze-xbel.c:952 +#, c-format +msgid "Writing failed." +msgstr "Kunde inte skriva." + +#: ../src/webSearch.c:82 +msgid "Empty" +msgstr "Tom" + +#: ../src/webSearch.c:153 +msgid "Add search engine" +msgstr "Lägg till sökmotor" + +#: ../src/webSearch.c:153 +msgid "Edit search engine" +msgstr "Redigera sökmotor" + +#: ../src/webSearch.c:183 +msgid "_Name:" +msgstr "_Namn:" + +#: ../src/webSearch.c:227 +msgid "_Icon (name or file):" +msgstr "_Ikon (namn eller fil):" + +#: ../src/webSearch.c:241 +msgid "_Keyword:" +msgstr "_Nyckelord:" + +#: ../src/webSearch.c:310 +msgid "Manage search engines" +msgstr "Hantera sökmotorer" + +#: ../katze/katze-throbber.c:135 +msgid "Symbolic size to use for the animation" +msgstr "Symbolisk storlek för animeringen" + +#: ../katze/katze-throbber.c:144 +msgid "The name of an icon containing animation frames" +msgstr "Namn på en ikon som innehåller animeringsbilder" + +#: ../katze/katze-throbber.c:153 +msgid "A GdkPixbuf containing animation frames" +msgstr "En GdkPixbuf som innehåller animeringbilder" + +#: ../katze/katze-throbber.c:162 +msgid "Whether the throbber should be animated" +msgstr "Ifall aktivitetssymbolen ska animeras" + +#: ../katze/katze-throbber.c:171 +msgid "The name of an icon to be used as the static image" +msgstr "Namn på ikon att använda som statisk bild" + +#: ../katze/katze-throbber.c:180 +msgid "A GdkPixbuf to be used as the static image" +msgstr "En GdkPixbuf att använda som statisk bild" + +#: ../katze/katze-throbber.c:189 +msgid "The stock ID of an icon to be used as the static image" +msgstr "Katalog-ID för en ikon att använda som statisk bild" + +#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 +#: ../katze/katze-xbel.c:804 +#, c-format +msgid "Malformed document." +msgstr "Felaktigt dokument." + +#: ../katze/katze-xbel.c:759 +#, c-format +msgid "File not found." +msgstr "Fil saknas." From fea97e80c3a6c77b6e2b8951fcc3bc17874e6526 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 24 Mar 2008 14:12:00 +0100 Subject: [PATCH 0047/2970] Update .gitignore and remove po/Makefile.in.in --- .gitignore | 17 ++++ po/Makefile.in.in | 218 ---------------------------------------------- 2 files changed, 17 insertions(+), 218 deletions(-) delete mode 100644 po/Makefile.in.in diff --git a/.gitignore b/.gitignore index 9f8d6522..e9e4d199 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,24 @@ libtool ltmain.sh Makefile Makefile.in +Makefile.in.in missing +mkinstalldirs stamp-h1 +intltool-extract.in +intltool-extract +intltool-merge.in +intltool-merge +intltool-update.in +intltool-update + +po/.intltool-merge-cache +po/POTFILES +po/midori.pot +po/stamp-it +po/*.gmo + midori +midori.desktop + diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index 6891e8f7..00000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,218 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -# Copyright (C) 2004-2008 Rodney Dawes -# -# This file may be copied and used freely without restrictions. It may -# be used in projects which are not available under a GNU Public License, -# but which still want to provide support for the GNU gettext functionality. -# -# - Modified by Owen Taylor to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) - -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) - -POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS - -POTFILES = \ -# This comment gets stripped out - -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ - fi; \ - fi; \ - done - -# Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ - fi - -mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ - for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: From c8332ddf548fd11b899247b0321b0daf571f7bba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 24 Mar 2008 14:15:23 +0100 Subject: [PATCH 0048/2970] Fix panel close button. --- src/midori-browser.c | 16 ++++++++-------- src/midori-panel.c | 22 ++++++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index ea7652b2..afb2acd6 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -477,9 +477,9 @@ static void midori_browser_class_init (MidoriBrowserClass* class) { - signals[QUIT] = g_signal_new( + signals[QUIT] = g_signal_new ( "quit", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 0, 0, @@ -487,9 +487,9 @@ midori_browser_class_init (MidoriBrowserClass* class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[NEW_WINDOW] = g_signal_new( + signals[NEW_WINDOW] = g_signal_new ( "new-window", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriBrowserClass, new_window), 0, @@ -1716,8 +1716,8 @@ _action_bookmark_open_activate (GtkAction* action, KatzeXbelItem* item; gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) - g_object_set(midori_browser_get_current_web_view (browser), - "uri", katze_xbel_bookmark_get_href(item), NULL); + g_object_set (midori_browser_get_current_web_view (browser), + "uri", katze_xbel_bookmark_get_href(item), NULL); } } } @@ -2019,7 +2019,7 @@ static const GtkActionEntry entries[] = { NULL, "", "hm?", G_CALLBACK (_action_about_activate) }, }; - static const guint entries_n = G_N_ELEMENTS(entries); + static const guint entries_n = G_N_ELEMENTS (entries); static const GtkToggleActionEntry toggle_entries[] = { { "PrivateBrowsing", NULL, @@ -2052,7 +2052,7 @@ static const GtkToggleActionEntry toggle_entries[] = { "hm?", G_CALLBACK (_action_statusbar_activate), FALSE }, }; - static const guint toggle_entries_n = G_N_ELEMENTS(toggle_entries); + static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries); static void midori_browser_window_state_event_cb (MidoriBrowser* browser, diff --git a/src/midori-panel.c b/src/midori-panel.c index d58ad323..7c6860ba 100644 --- a/src/midori-panel.c +++ b/src/midori-panel.c @@ -71,30 +71,35 @@ midori_panel_close_cb (MidoriPanel* panel) } static void -midori_cclosure_marshal_BOOLEAN__VOID (GClosure* closure, GValue* return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) +midori_cclosure_marshal_BOOLEAN__VOID (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) { typedef gboolean(*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, - gpointer data2); + gpointer data2); register GMarshalFunc_BOOLEAN__VOID callback; register GCClosure* cc = (GCClosure*) closure; register gpointer data1, data2; gboolean v_return; - g_return_if_fail(return_value != NULL); - g_return_if_fail(n_param_values == 1); + g_return_if_fail (return_value != NULL); + g_return_if_fail (n_param_values == 1); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; - data2 = g_value_peek_pointer(param_values + 0); + data2 = g_value_peek_pointer (param_values + 0); } else { - data1 = g_value_peek_pointer(param_values + 0); + data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback); - v_return = callback(data1, data2); + v_return = callback (data1, data2); g_value_set_boolean (return_value, v_return); } @@ -164,7 +169,8 @@ midori_panel_class_init (MidoriPanelClass* class) } static void -midori_panel_button_close_clicked_cb (MidoriPanel* panel) +midori_panel_button_close_clicked_cb (GtkWidget* toolitem, + MidoriPanel* panel) { g_signal_emit (panel, signals[CLOSE], 0); } From 2bb99e0030155ceafd8ae6e83a4349fd6b690c86 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 27 Mar 2008 00:55:09 +0100 Subject: [PATCH 0049/2970] Show the panel's name in the toolbar. --- src/midori-panel.c | 48 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/src/midori-panel.c b/src/midori-panel.c index 7c6860ba..139e03bf 100644 --- a/src/midori-panel.c +++ b/src/midori-panel.c @@ -52,15 +52,15 @@ static void midori_panel_finalize (GObject* object); static void -midori_panel_set_property (GObject* object, - guint prop_id, +midori_panel_set_property (GObject* object, + guint prop_id, const GValue* value, - GParamSpec* pspec); + GParamSpec* pspec); static void -midori_panel_get_property (GObject* object, - guint prop_id, - GValue* value, +midori_panel_get_property (GObject* object, + guint prop_id, + GValue* value, GParamSpec* pspec); static gboolean @@ -98,7 +98,8 @@ midori_cclosure_marshal_BOOLEAN__VOID (GClosure* closure, data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } - callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback); + callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data + ? marshal_data : cc->callback); v_return = callback (data1, data2); g_value_set_boolean (return_value, v_return); } @@ -258,8 +259,7 @@ midori_panel_set_property (GObject* object, // FIXME: Move existing items to the new menu break; case PROP_PAGE: - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), - g_value_get_int (value)); + midori_panel_set_current_page (panel, g_value_get_int (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -286,8 +286,7 @@ midori_panel_get_property (GObject* object, g_value_set_object (value, priv->menu); break; case PROP_PAGE: - g_value_set_int (value, - gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook))); + g_value_set_int (value, midori_panel_get_current_page (panel)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -372,6 +371,7 @@ midori_panel_append_page (MidoriPanel* panel, guint n = midori_panel_page_num (panel, child); const gchar* text = label ? label : _("Untitled"); + g_object_set_data (G_OBJECT (child), "label", (gchar*)text); GtkWidget* image; GtkToolItem* toolitem = gtk_radio_tool_button_new (priv->group); @@ -429,15 +429,25 @@ midori_panel_get_current_page (MidoriPanel* panel) return gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); } +static GtkWidget* +_midori_panel_child_for_scrolled (MidoriPanel* panel, + GtkWidget* scrolled) +{ + GtkWidget* child = gtk_bin_get_child (GTK_BIN (scrolled)); + if (GTK_IS_VIEWPORT (child)) + child = gtk_bin_get_child (GTK_BIN (child)); + return child; +} + /** * midori_panel_get_nth_page: * @panel: a #MidoriPanel * * Retrieves the child widget of the nth page. * - * If @panel has no children, -1 is returned. + * If @panel has no children, %NULL is returned. * - * Return value: the child widget of the new page, or -1 + * Return value: the child widget of the new page, or %NULL **/ GtkWidget* midori_panel_get_nth_page (MidoriPanel* panel, @@ -447,7 +457,11 @@ midori_panel_get_nth_page (MidoriPanel* panel, MidoriPanelPrivate* priv = panel->priv; - return gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), page_num); + GtkWidget* scrolled = gtk_notebook_get_nth_page ( + GTK_NOTEBOOK (priv->notebook), page_num); + if (scrolled) + return _midori_panel_child_for_scrolled (panel, scrolled); + return NULL; } /** @@ -519,4 +533,10 @@ midori_panel_set_current_page (MidoriPanel* panel, MidoriPanelPrivate* priv = panel->priv; gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + GtkWidget* child = midori_panel_get_nth_page (panel, n); + if (child) + { + const gchar* label = g_object_get_data (G_OBJECT (child), "label"); + g_object_set (priv->toolbar_label, "label", label, NULL); + } } From 00976c05363a131be2c0658ba019c8dcb66c0986 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 27 Mar 2008 01:21:29 +0100 Subject: [PATCH 0050/2970] Implement the Console panel for script messages. --- src/Makefile.am | 1 + src/midori-browser.c | 98 +++++++++++----------- src/midori-console.c | 192 +++++++++++++++++++++++++++++++++++++++++++ src/midori-console.h | 64 +++++++++++++++ 4 files changed, 309 insertions(+), 46 deletions(-) create mode 100644 src/midori-console.c create mode 100644 src/midori-console.h diff --git a/src/Makefile.am b/src/Makefile.am index 04dccba1..93d0f86e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,7 @@ midori_SOURCES = \ main.c main.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ + midori-console.c midori-console.h \ midori-trash.c midori-trash.h \ midori-webview.c midori-webview.h \ midori-websettings.c midori-websettings.h \ diff --git a/src/midori-browser.c b/src/midori-browser.c index afb2acd6..fd35e658 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -22,6 +22,7 @@ #include "sokoke.h" #include "midori-webview.h" #include "midori-panel.h" +#include "midori-console.h" #include "midori-trash.h" #include @@ -51,6 +52,7 @@ struct _MidoriBrowserPrivate GtkWidget* panel; GtkWidget* panel_bookmarks; + GtkWidget* panel_console; GtkWidget* panel_pageholder; GtkWidget* notebook; @@ -99,15 +101,15 @@ static void midori_browser_finalize (GObject* object); static void -midori_browser_set_property (GObject* object, - guint prop_id, +midori_browser_set_property (GObject* object, + guint prop_id, const GValue* value, - GParamSpec* pspec); + GParamSpec* pspec); static void -midori_browser_get_property (GObject* object, - guint prop_id, - GValue* value, +midori_browser_get_property (GObject* object, + guint prop_id, + GValue* value, GParamSpec* pspec); static GtkAction* @@ -199,7 +201,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) } static GtkWidget* -_midori_browser_scrolled_for_child (MidoriBrowser* panel, +_midori_browser_scrolled_for_child (MidoriBrowser* browser, GtkWidget* child) { GtkWidget* scrolled = gtk_widget_get_parent (child); @@ -209,7 +211,7 @@ _midori_browser_scrolled_for_child (MidoriBrowser* panel, } static GtkWidget* -_midori_browser_child_for_scrolled (MidoriBrowser* panel, +_midori_browser_child_for_scrolled (MidoriBrowser* browser, GtkWidget* scrolled) { GtkWidget* child = gtk_bin_get_child (GTK_BIN (scrolled)); @@ -374,8 +376,11 @@ midori_web_view_console_message_cb (GtkWidget* web_view, const gchar* source_id, MidoriBrowser* browser) { - // FIXME: We want this to appear in a panel - return FALSE; + MidoriBrowserPrivate* priv = browser->priv; + + midori_console_add (MIDORI_CONSOLE (priv->panel_console), + message, line, source_id); + return TRUE; } static void @@ -623,8 +628,8 @@ _action_quit_activate (GtkAction* action, } static void -_action_edit_activate(GtkAction* action, - MidoriBrowser* browser) +_action_edit_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE; @@ -654,8 +659,8 @@ _action_edit_activate(GtkAction* action, } static void -_action_cut_activate(GtkAction* action, - MidoriBrowser* browser) +_action_cut_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); if (G_LIKELY (widget)) @@ -663,8 +668,8 @@ _action_cut_activate(GtkAction* action, } static void -_action_copy_activate(GtkAction* action, - MidoriBrowser* browser) +_action_copy_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); if (G_LIKELY (widget)) @@ -672,8 +677,8 @@ _action_copy_activate(GtkAction* action, } static void -_action_paste_activate(GtkAction* action, - MidoriBrowser* browser) +_action_paste_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); if (G_LIKELY (widget)) @@ -681,8 +686,8 @@ _action_paste_activate(GtkAction* action, } static void -_action_delete_activate(GtkAction* action, - MidoriBrowser* browser) +_action_delete_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); if (G_LIKELY (widget)) @@ -695,13 +700,13 @@ _action_delete_activate(GtkAction* action, } static void -_action_select_all_activate(GtkAction* action, - MidoriBrowser* browser) +_action_select_all_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); if (G_LIKELY (widget)) { - if (GTK_IS_ENTRY (widget)) + if (GTK_IS_EDITABLE (widget)) gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); else g_signal_emit_by_name (widget, "select-all"); @@ -1316,22 +1321,23 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, if (event->button != 2 && event->button != 3) return FALSE; - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + GtkTreeSelection* selection = gtk_tree_view_get_selection ( + GTK_TREE_VIEW (widget)); if (selection) { GtkTreeModel* model; GtkTreeIter iter; - if (gtk_tree_selection_get_selected(selection, &model, &iter)) + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - if (event->button == 2 && katze_xbel_item_is_bookmark(item)) + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (event->button == 2 && katze_xbel_item_is_bookmark (item)) { - const gchar* uri = katze_xbel_bookmark_get_href(item); + const gchar* uri = katze_xbel_bookmark_get_href (item); midori_browser_append_uri (browser, uri); } else - _midori_panel_bookmarks_popup(widget, event, item, browser); + _midori_panel_bookmarks_popup (widget, event, item, browser); return TRUE; } } @@ -1342,23 +1348,24 @@ static void midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, MidoriBrowser* browser) { - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + GtkTreeSelection* selection = gtk_tree_view_get_selection ( + GTK_TREE_VIEW (widget)); if (selection) { GtkTreeModel* model; GtkTreeIter iter; - if (gtk_tree_selection_get_selected(selection, &model, &iter)) + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { KatzeXbelItem* item; - gtk_tree_model_get(model, &iter, 0, &item, -1); - _midori_panel_bookmarks_popup(widget, NULL, item, browser); + gtk_tree_model_get (model, &iter, 0, &item, -1); + _midori_panel_bookmarks_popup (widget, NULL, item, browser); } } } static void -_tree_store_insert_folder (GtkTreeStore* treestore, - GtkTreeIter* parent, +_tree_store_insert_folder (GtkTreeStore* treestore, + GtkTreeIter* parent, KatzeXbelItem* folder) { guint n = katze_xbel_folder_get_n_items (folder); @@ -1430,7 +1437,7 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, g_object_set (renderer, "markup", _("Separator"), NULL); else g_object_set (renderer, "markup", NULL, - "text", katze_xbel_item_get_title(item), NULL); + "text", katze_xbel_item_get_title (item), NULL); } static void @@ -1443,7 +1450,7 @@ midori_browser_bookmark_menu_folder_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { GtkWidget* menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)); - gtk_container_foreach(GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL);//... + gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL);//... KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT (menuitem), "KatzeXbelItem"); _midori_browser_create_bookmark_menu (browser, folder, menu); // Remove all menuitems when the menu is hidden. @@ -1456,7 +1463,7 @@ static void midori_browser_bookmarkbar_folder_activate_cb (GtkToolItem* toolitem, MidoriBrowser* browser) { - GtkWidget* menu = gtk_menu_new(); + GtkWidget* menu = gtk_menu_new (); KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data ( G_OBJECT (toolitem), "KatzeXbelItem"); _midori_browser_create_bookmark_menu (browser, folder, menu); @@ -1471,7 +1478,8 @@ static void midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { - KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data(G_OBJECT(widget), "KatzeXbelItem"); + KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data (G_OBJECT (widget), + "KatzeXbelItem"); GtkWidget* web_view = midori_browser_get_current_web_view (browser); g_object_set (web_view, "uri", katze_xbel_bookmark_get_href (item), NULL); } @@ -1813,7 +1821,7 @@ _action_trash_empty_activate (GtkAction* action, static void _action_bookmark_delete_activate (GtkAction* action, - MidoriBrowser* browser) + MidoriBrowser* browser) { MidoriBrowserPrivate* priv = browser->priv; @@ -2514,7 +2522,7 @@ midori_browser_init (MidoriBrowser* browser) NULL); midori_panel_bookmarks_cursor_or_row_changed_cb (GTK_TREE_VIEW (treeview), browser); - gtk_box_pack_start (GTK_BOX (box), treeview, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); priv->panel_bookmarks = treeview; gtk_widget_show_all (box); midori_panel_append_page (MIDORI_PANEL (priv->panel), @@ -2531,12 +2539,10 @@ midori_browser_init (MidoriBrowser* browser) "package", _("Transfers")); // Console - priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", "about:blank", - NULL); - gtk_widget_show (priv->panel_pageholder); + priv->panel_console = midori_console_new (); + gtk_widget_show (priv->panel_console); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, + priv->panel_console, "terminal", _("Console")); // History diff --git a/src/midori-console.c b/src/midori-console.c new file mode 100644 index 00000000..95189219 --- /dev/null +++ b/src/midori-console.c @@ -0,0 +1,192 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-console.h" + +#include "sokoke.h" +#include + +G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX) + +struct _MidoriConsolePrivate +{ + GtkWidget* treeview; +}; + +#define MIDORI_CONSOLE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_CONSOLE, MidoriConsolePrivate)) + +static void +midori_console_class_init (MidoriConsoleClass* class) +{ + g_type_class_add_private (class, sizeof (MidoriConsolePrivate)); +} + +static void +midori_console_button_clear_clicked_cb (GtkToolItem* toolitem, + MidoriConsole* console) +{ + MidoriConsolePrivate* priv = console->priv; + + GtkTreeModel* model = gtk_tree_view_get_model ( + GTK_TREE_VIEW (priv->treeview)); + gtk_tree_store_clear (GTK_TREE_STORE (model)); +} + +static void +midori_console_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + // gchar* source_id; + // gtk_tree_model_get (model, iter, 2, &source_id, -1); + + g_object_set (renderer, "stock-id", GTK_STOCK_DIALOG_WARNING, NULL); + + // g_free (source_id); +} + +static void +midori_console_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + gchar* message; + gint line; + gchar* source_id; + gtk_tree_model_get (model, iter, 0, &message, 1, &line, 2, &source_id, -1); + + gchar* text = g_strdup_printf ("%d @ %s\n%s", line, source_id, message); + g_object_set (renderer, "text", text, NULL); + g_free (text); + + g_free (message); + g_free (source_id); +} + +static void +midori_console_treeview_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriConsole* console) +{ + /*GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gchar* source_id; + gtk_tree_model_get (model, &iter, 2, &source_id, -1); + g_free (source_id); + }*/ +} + +static void +midori_console_init (MidoriConsole* console) +{ + console->priv = MIDORI_CONSOLE_GET_PRIVATE (console); + + MidoriConsolePrivate* priv = console->priv; + + // Create the toolbar + GtkWidget* toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + GtkToolItem* toolitem = gtk_tool_item_new (); + // TODO: What about a find entry here that filters e.g. by url? + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), + FALSE); + gtk_tool_item_set_expand (toolitem, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_console_button_clear_clicked_cb), console); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show_all (toolbar); + gtk_box_pack_start (GTK_BOX (console), toolbar, FALSE, FALSE, 0); + + // Create the treeview + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkTreeStore* treestore = gtk_tree_store_new (3, G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING); + priv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_console_treeview_render_icon_cb, + priv->treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_console_treeview_render_text_cb, + priv->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column); + g_object_unref (treestore); + g_signal_connect (priv->treeview, "row-activated", + G_CALLBACK (midori_console_treeview_row_activated_cb), + console); + gtk_widget_show (priv->treeview); + gtk_box_pack_start (GTK_BOX (console), priv->treeview, TRUE, TRUE, 0); +} + +/** + * midori_console_new: + * + * Creates a new empty console. + * + * Return value: a new #MidoriConsole + **/ +GtkWidget* +midori_console_new (void) +{ + MidoriConsole* console = g_object_new (MIDORI_TYPE_CONSOLE, + NULL); + + return GTK_WIDGET (console); +} + +/** + * midori_console_add: + * @console: a #MidoriConsole + * @message: a descriptive message + * @line: the line in the source file + * @source_id: the source + * + * Adds a new message to the console. + **/ +void +midori_console_add (MidoriConsole* console, + const gchar* message, + gint line, + const gchar* source_id) +{ + g_return_if_fail (MIDORI_IS_CONSOLE (console)); + + MidoriConsolePrivate* priv = console->priv; + + GtkTreeView* treeview = GTK_TREE_VIEW (priv->treeview); + GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), + NULL, NULL, G_MAXINT, + 0, message, 1, line, 2, source_id, -1); +} diff --git a/src/midori-console.h b/src/midori-console.h new file mode 100644 index 00000000..91898b95 --- /dev/null +++ b/src/midori-console.h @@ -0,0 +1,64 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_CONSOLE_H__ +#define __MIDORI_CONSOLE_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_CONSOLE \ + (midori_console_get_type ()) +#define MIDORI_CONSOLE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_CONSOLE, MidoriConsole)) +#define MIDORI_CONSOLE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_CONSOLE, MidoriConsoleClass)) +#define MIDORI_IS_CONSOLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_CONSOLE)) +#define MIDORI_IS_CONSOLE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_CONSOLE)) +#define MIDORI_CONSOLE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_CONSOLE, MidoriConsoleClass)) + +typedef struct _MidoriConsole MidoriConsole; +typedef struct _MidoriConsolePrivate MidoriConsolePrivate; +typedef struct _MidoriConsoleClass MidoriConsoleClass; + +struct _MidoriConsole +{ + GtkVBox parent_instance; + + MidoriConsolePrivate* priv; +}; + +struct _MidoriConsoleClass +{ + GtkVBoxClass parent_class; +}; + +GType +midori_console_get_type (void); + +GtkWidget* +midori_console_new (void); + +void +midori_console_add (MidoriConsole* panel, + const gchar* message, + gint line, + const gchar* source_id); + +G_END_DECLS + +#endif /* __MIDORI_CONSOLE_H__ */ From 173b05dd78119942f8ef3bf10c2ac216633ac243 Mon Sep 17 00:00:00 2001 From: Przemek Sitek Date: Sat, 29 Mar 2008 22:05:26 +0100 Subject: [PATCH 0051/2970] Add Polish translation. --- po/LINGUAS | 2 +- po/pl.po | 964 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 965 insertions(+), 1 deletion(-) create mode 100644 po/pl.po diff --git a/po/LINGUAS b/po/LINGUAS index 92e98dae..c4fd210d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de sv +de pl sv diff --git a/po/pl.po b/po/pl.po new file mode 100644 index 00000000..dcb343d3 --- /dev/null +++ b/po/pl.po @@ -0,0 +1,964 @@ +# Polish translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Przemysław Sitek , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.17\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-03-29 12:23+0100\n" +"PO-Revision-Date: 2008-03-29 13:40+0100\n" +"Last-Translator: Przemysław Sitek \n" +"Language-Team: pl \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Lekka przeglądarka internetowa" + +#: ../midori.desktop.in.h:2 +msgid "Midori Web Browser" +msgstr "Przeglądarka Internetowa Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Przeglądarka Internetowa" + +#. FIXME: Should we have a more specific message? +#: ../src/helpers.c:68 +#: ../src/helpers.c:84 +msgid "Could not run external program." +msgstr "Nie można uruchomić programu." + +#: ../src/main.c:49 +msgid "Bookmark" +msgstr "Zakładka" + +#: ../src/main.c:50 +msgid "New Bookmark" +msgstr "Nowa zakładka" + +#: ../src/main.c:51 +msgid "_Form Fill" +msgstr "Wypełnij _formularz" + +#: ../src/main.c:52 +#: ../src/prefs.c:369 +#: ../src/prefs.c:374 +msgid "Homepage" +msgstr "Strona startowa" + +#: ../src/main.c:53 +msgid "New _Tab" +msgstr "Nowa kar_ta" + +#: ../src/main.c:54 +msgid "New _Window" +msgstr "Nowe _okno" + +#: ../src/main.c:59 +msgid "_Fullscreen" +msgstr "Tryb _pełnoekranowy" + +#: ../src/main.c:60 +msgid "_Leave Fullscreen" +msgstr "_Opuść tryb pełnoekranowy" + +#: ../src/main.c:139 +#: ../src/main.c:171 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:146 +msgid "Display program version" +msgstr "Wyświetl wersję programu" + +#: ../src/main.c:150 +msgid "[URL]" +msgstr "" + +#: ../src/main.c:173 +msgid "Debugging" +msgstr "" + +#: ../src/main.c:174 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../src/main.c:176 +msgid "Check for new versions at:" +msgstr "" + +#: ../src/main.c:193 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Ustawienia nie mogą być załadowane. %s\n" + +#: ../src/main.c:219 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Zakładki nie mogą być załadowane. %s\n" + +#: ../src/main.c:232 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Sesja nie może być załadowana. %s\n" + +#: ../src/main.c:244 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "" + +#: ../src/main.c:254 +msgid "The following errors occured:" +msgstr "Nastąpiły następujące błędy:" + +#: ../src/main.c:56 +msgid "Select _All" +msgstr "Z_aznacz wszystko" + +#: ../src/midori-browser.c:187 +#: ../src/midori-browser.c:1927 +#: ../src/midori-browser.c:1933 +msgid "Reload the current page" +msgstr "Odśwież bieżącą stronę" + +#: ../src/midori-browser.c:195 +#: ../src/midori-browser.c:1930 +msgid "Stop loading the current page" +msgstr "Zatrzymaj wczytywanie bieżącej strony" + +#: ../src/midori-browser.c:260 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% załadowano" + +#: ../src/midori-browser.c:526 +#: ../src/midori-webview.c:253 +msgid "The associated settings" +msgstr "" + +#: ../src/midori-browser.c:546 +#: ../src/midori-webview.c:244 +msgid "The text that is displayed in the statusbar" +msgstr "Tekst wyświetlany na pasku stanu" + +#: ../src/midori-browser.c:565 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "" + +#: ../src/midori-browser.c:1057 +msgid "Open location" +msgstr "Otwórz adres" + +#: ../src/midori-browser.c:1069 +#: ../src/midori-browser.c:1115 +msgid "_Location:" +msgstr "Adres:" + +#. TODO: We should offer all of the search's features here +#: ../src/midori-browser.c:1103 +msgid "Web search" +msgstr "" + +#: ../src/midori-browser.c:1142 +msgid "New bookmark" +msgstr "Nowa zakładka" + +#: ../src/midori-browser.c:1142 +msgid "Edit bookmark" +msgstr "Edytuj zakładkę" + +#: ../src/midori-browser.c:1159 +msgid "_Title:" +msgstr "_Tytuł:" + +#: ../src/midori-browser.c:1175 +#: ../src/webSearch.c:199 +msgid "_Description:" +msgstr "_Opis:" + +#: ../src/midori-browser.c:1194 +#: ../src/webSearch.c:213 +msgid "_URL:" +msgstr "_URL:" + +#: ../src/midori-browser.c:1212 +msgid "_Folder:" +msgstr "_Folder:" + +#: ../src/midori-browser.c:1216 +msgid "Root" +msgstr "Korzeń" + +#: ../src/midori-browser.c:1437 +msgid "Separator" +msgstr "Separator" + +#: ../src/midori-browser.c:1624 +msgid "A lightweight web browser." +msgstr "Lekka przeglądarka internetowa" + +#: ../src/midori-browser.c:1632 +msgid "translator-credits" +msgstr "Przemysław Sitek " + +#: ../src/midori-browser.c:1847 +msgid "_File" +msgstr "_Plik" + +#: ../src/midori-browser.c:1850 +msgid "Open a new window" +msgstr "_Nowe okno" + +#: ../src/midori-browser.c:1853 +msgid "Open a new tab" +msgstr "Nowa kar_ta" + +#: ../src/midori-browser.c:1856 +msgid "Open a file" +msgstr "_Otwórz plik" + +#: ../src/midori-browser.c:1859 +msgid "Save to a file" +msgstr "Zapi_sz stronę jako" + +#: ../src/midori-browser.c:1861 +msgid "_Close Tab" +msgstr "_Zamknij kartę" + +#: ../src/midori-browser.c:1862 +msgid "Close the current tab" +msgstr "Zamknij bieżącą kartę" + +#: ../src/midori-browser.c:1864 +msgid "C_lose Window" +msgstr "Zamknij okno" + +#: ../src/midori-browser.c:1865 +msgid "Close this window" +msgstr "Zamknij okno" + +#: ../src/midori-browser.c:1867 +msgid "Pa_ge Setup" +msgstr "_Ustawienia strony" + +#: ../src/midori-browser.c:1877 +msgid "Quit the application" +msgstr "Za_kończ" + +#: ../src/midori-browser.c:1879 +msgid "_Edit" +msgstr "_Edycja" + +#: ../src/midori-browser.c:1882 +msgid "Undo the last modification" +msgstr "Cofnij" + +#: ../src/midori-browser.c:1885 +msgid "Redo the last modification" +msgstr "Przywróć" + +#: ../src/midori-browser.c:1891 +#: ../src/midori-browser.c:1894 +msgid "Copy the selected text" +msgstr "Skopiuj" + +#: ../src/midori-browser.c:1897 +msgid "Paste text from the clipboard" +msgstr "Wklej" + +#: ../src/midori-browser.c:1900 +msgid "Delete the selected text" +msgstr "" + +#: ../src/midori-browser.c:1903 +msgid "Select all text" +msgstr "Zaznacz w_szystko" + +#: ../src/midori-browser.c:1911 +msgid "Find _Next" +msgstr "Znajdź poprzednie" + +#: ../src/midori-browser.c:1914 +msgid "Find _Previous" +msgstr "Znajdź następne" + +#: ../src/midori-browser.c:1917 +msgid "_Quick Find" +msgstr "Szybkie wyszukiwanie" + +#: ../src/midori-browser.c:1923 +msgid "_View" +msgstr "_Widok" + +#: ../src/midori-browser.c:1924 +msgid "_Toolbars" +msgstr "Paski _narzędziowe" + +#: ../src/midori-browser.c:1944 +msgid "View Source" +msgstr "Ź_ródło strony" + +#: ../src/midori-browser.c:1947 +msgid "View Selection Source" +msgstr "Pokaż źródło zaznaczenia" + +#: ../src/midori-browser.c:1951 +msgid "Toggle fullscreen view" +msgstr "Tryb pełnoekranowy" + +#: ../src/midori-browser.c:1953 +msgid "_Go" +msgstr "P_rzejdź" + +#: ../src/midori-browser.c:1964 +msgid "Location..." +msgstr "_Położenie..." + +#: ../src/midori-browser.c:1967 +msgid "Web Search..." +msgstr "Wyszukiwarki internetowe..." + +#: ../src/midori-browser.c:1970 +msgid "Open in Page_holder..." +msgstr "" + +#: ../src/midori-browser.c:1973 +msgid "Closed Tabs and Windows" +msgstr "Zamknięte karty i okna" + +#: ../src/midori-browser.c:1974 +msgid "Reopen a previously closed tab or window" +msgstr "Otwórz wcześniej zamkniętą kartę lub okno" + +#: ../src/midori-browser.c:1976 +msgid "Empty Trash" +msgstr "Opróżnij kosz" + +#: ../src/midori-browser.c:1979 +msgid "Undo Close Tab" +msgstr "Cofnij zamknięcie karty" + +#: ../src/midori-browser.c:1982 +msgid "_Bookmarks" +msgstr "_Zakładki" + +#: ../src/midori-browser.c:1987 +msgid "_Manage Bookmarks" +msgstr "_Modyfikuj zakładki" + +#: ../src/midori-browser.c:1993 +msgid "Open in New _Tab" +msgstr "Otwórz odnośnik w nowej _karcie" + +#: ../src/midori-browser.c:1996 +msgid "Open in New _Window" +msgstr "Otwórz odnośnik w _nowym oknie" + +#: ../src/midori-browser.c:2005 +msgid "_Tools" +msgstr "_Narzędzia" + +#: ../src/midori-browser.c:2007 +msgid "_Manage Search Engines" +msgstr "_Zarządzaj wyszukiwarkami" + +#: ../src/midori-browser.c:2008 +msgid "Add, edit and remove search engines..." +msgstr "" + +#: ../src/midori-browser.c:2011 +msgid "_Window" +msgstr "_Okno" + +#: ../src/midori-browser.c:2013 +msgid "_Previous Tab" +msgstr "_Poprzednia karta" + +#: ../src/midori-browser.c:2016 +msgid "_Next Tab" +msgstr "_Następna karta" + +#: ../src/midori-browser.c:2019 +msgid "Tab _Overview" +msgstr "" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../src/midori-browser.c:2022 +msgid "_Help" +msgstr "Pomo_c" + +#: ../src/midori-browser.c:2024 +msgid "_Contents" +msgstr "_Zawartość" + +#: ../src/midori-browser.c:2034 +msgid "P_rivate Browsing" +msgstr "P_rywatne przeglądanie" + +#: ../src/midori-browser.c:2038 +msgid "_Work Offline" +msgstr "Pracuj bez podłączenia" + +#: ../src/midori-browser.c:2043 +msgid "_Navigationbar" +msgstr "Pasek _narzędzi nawigacyjnych" + +#: ../src/midori-browser.c:2047 +msgid "Side_panel" +msgstr "Panel _boczny" + +#: ../src/midori-browser.c:2051 +msgid "_Bookmarkbar" +msgstr "Pasek _zakładek" + +#: ../src/midori-browser.c:2055 +msgid "_Transferbar" +msgstr "_Pasek pobierania plików" + +#: ../src/midori-browser.c:2059 +msgid "_Statusbar" +msgstr "Pasek stanu" + +#: ../src/midori-browser.c:2529 +msgid "Bookmarks" +msgstr "Zakładki" + +#. TODO: We need something like "use current website" +#: ../src/midori-browser.c:2539 +#: ../src/prefs.c:381 +msgid "Transfers" +msgstr "Pobierania plików" + +#: ../src/midori-browser.c:2546 +msgid "Console" +msgstr "Konsola" + +#: ../src/midori-browser.c:2555 +#: ../src/prefs.c:669 +msgid "History" +msgstr "Historia" + +#: ../src/midori-browser.c:2564 +msgid "Pageholder" +msgstr "" + +#: ../src/midori-browser.c:2586 +msgid "_Inline find:" +msgstr "Wyszukaj:" + +#: ../src/midori-browser.c:2612 +msgid "Match Case" +msgstr "Uwzg_lędniaj wielkość liter" + +#: ../src/midori-browser.c:2629 +msgid "Close Findbar" +msgstr "Zamknij" + +#: ../src/midori-panel.c:146 +msgid "Appearance of the shadow around each panel" +msgstr "" + +#: ../src/midori-panel.c:156 +msgid "Menu to hold panel items" +msgstr "" + +#: ../src/midori-panel.c:165 +msgid "The index of the current page" +msgstr "" + +#: ../src/midori-panel.c:210 +#: ../src/midori-panel.c:211 +msgid "Close panel" +msgstr "" + +#: ../src/midori-panel.c:373 +msgid "Untitled" +msgstr "Bez tytułu" + +#: ../src/midori-trash.c:97 +msgid "The maximum number of items" +msgstr "" + +#: ../src/midori-websettings.c:69 +msgid "The desired tab label size" +msgstr "" + +#: ../src/midori-websettings.c:78 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../src/midori-websettings.c:87 +msgid "Load an URL from the selection via middle click" +msgstr "" + +#: ../src/midori-webview.c:217 +msgid "The icon of the currently loaded page" +msgstr "" + +#: ../src/midori-webview.c:226 +msgid "The URI of the currently loaded page" +msgstr "" + +#: ../src/midori-webview.c:235 +msgid "The title of the currently loaded page" +msgstr "" + +#: ../src/midori-webview.c:472 +msgid "Open Link in New _Tab" +msgstr "Otwórz odnośnik w nowej karcie" + +#: ../src/midori-webview.c:495 +msgid "Open URL in New _Tab" +msgstr "Otwórz URL w nowej karcie" + +#: ../src/prefs.c:299 +#, c-format +msgid "%s Preferences" +msgstr "Preferencje %s" + +#. Page "General" +#: ../src/prefs.c:363 +msgid "General" +msgstr "Ogólne" + +#: ../src/prefs.c:364 +msgid "Startup" +msgstr "Uruhomienie" + +#: ../src/prefs.c:366 +msgid "Load on startup" +msgstr "Pokaż przy uruchomieniu" + +#: ../src/prefs.c:369 +msgid "Blank page" +msgstr "Pusta strona" + +#: ../src/prefs.c:369 +msgid "Last open pages" +msgstr "Ostatnio otwarte strony" + +#: ../src/prefs.c:383 +msgid "Download folder" +msgstr "Katalog pobierania plików" + +#: ../src/prefs.c:385 +msgid "Choose downloaded files folder" +msgstr "Wybiera katalog pobierania plików" + +#: ../src/prefs.c:392 +msgid "Show a notification window for finished transfers" +msgstr "" + +#: ../src/prefs.c:395 +msgid "Languages" +msgstr "Języki" + +#: ../src/prefs.c:397 +msgid "Preferred languages" +msgstr "Preferowane języki" + +#. Page "Appearance" +#: ../src/prefs.c:409 +msgid "Appearance" +msgstr "Wygląd" + +#: ../src/prefs.c:410 +msgid "Font settings" +msgstr "Ustawienia czcionek" + +#: ../src/prefs.c:412 +msgid "Default _font" +msgstr "Domyślna _czcionka" + +#: ../src/prefs.c:419 +msgid "_Minimum font size" +msgstr "_Minimalny rozmiar" + +#: ../src/prefs.c:426 +msgid "_Advanced" +msgstr "_Zaawansowane" + +#: ../src/prefs.c:430 +msgid "Default _encoding" +msgstr "Domyślne _kodowanie znaków" + +#: ../src/prefs.c:433 +msgid "Chinese (BIG5)" +msgstr "" + +#: ../src/prefs.c:433 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../src/prefs.c:433 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../src/prefs.c:434 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../src/prefs.c:434 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../src/prefs.c:449 +msgid "Advanced settings" +msgstr "Zaawansowane ustawienia" + +#: ../src/prefs.c:452 +msgid "Default colors" +msgstr "Domyślne kolory" + +#: ../src/prefs.c:454 +msgid "Text color" +msgstr "Tekst:" + +#: ../src/prefs.c:458 +msgid "Background color" +msgstr "Tło:" + +#: ../src/prefs.c:462 +msgid "Link color" +msgstr "Nieodwiedzone odnośniki:" + +#: ../src/prefs.c:466 +msgid "Visited link color" +msgstr "Odwiedzone odnośniki:" + +#. Page "Behavior" +#: ../src/prefs.c:472 +msgid "Behavior" +msgstr "Zachowanie" + +#: ../src/prefs.c:473 +msgid "Browsing" +msgstr "Przeglądanie" + +#: ../src/prefs.c:475 +msgid "Open _new pages in" +msgstr "Otwieraj nowe strony w" + +#: ../src/prefs.c:478 +msgid "New tab" +msgstr "nowej karcie" + +#: ../src/prefs.c:478 +msgid "New window" +msgstr "nowym oknie" + +#: ../src/prefs.c:478 +msgid "Current tab" +msgstr "bieżącej karcie" + +#: ../src/prefs.c:483 +msgid "_Middle click opens selection" +msgstr "_Środkowy przycisk myszy otwiera zaznaczoną stronę" + +#: ../src/prefs.c:488 +msgid "Open tabs in the _background" +msgstr "Otwieraj nowe karty w tle" + +#: ../src/prefs.c:493 +msgid "Open popups in _tabs" +msgstr "Otwieraj wyskakujące okienka jako karty" + +#: ../src/prefs.c:499 +msgid "Features" +msgstr "Treść" + +#: ../src/prefs.c:501 +msgid "Load _images" +msgstr "P_obieraj obrazki automatycznie" + +#: ../src/prefs.c:506 +msgid "_Shrink images to fit" +msgstr "Dopasuj rozmiar obrazków" + +#: ../src/prefs.c:511 +msgid "Print _backgrounds" +msgstr "Drukuj tło strony" + +#: ../src/prefs.c:516 +msgid "_Resizable textareas" +msgstr "Pozwól zmieniać rozmiar pól tekstowych" + +#: ../src/prefs.c:521 +msgid "Enable _scripts" +msgstr "Włącz obsługę języków skryptowych" + +#: ../src/prefs.c:526 +msgid "Enable _plugins" +msgstr "Włącz obsługę wtyczek" + +#: ../src/prefs.c:531 +msgid "_User Stylesheet" +msgstr "Własny arkusz _stylu" + +#: ../src/prefs.c:537 +msgid "Choose user stylesheet" +msgstr "Wybierz własny arkusz stylu" + +#. Page "Interface" +#: ../src/prefs.c:546 +msgid "Interface" +msgstr "Interfejs" + +#: ../src/prefs.c:547 +msgid "Navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../src/prefs.c:549 +msgid "_Toolbar style" +msgstr "Etykiety przycisków paska narzędziowego" + +#: ../src/prefs.c:552 +msgid "Default" +msgstr "Domyślnie" + +#: ../src/prefs.c:552 +msgid "Icons" +msgstr "Tylko ikony" + +#: ../src/prefs.c:552 +msgid "Text" +msgstr "Tylko tekst" + +#: ../src/prefs.c:552 +msgid "Both" +msgstr "Tekst pod ikonami" + +#: ../src/prefs.c:552 +msgid "Both horizontal" +msgstr "Tekst obok ikon" + +#: ../src/prefs.c:557 +msgid "Show small _icons" +msgstr "Pokazuj małe ikony" + +#: ../src/prefs.c:562 +msgid "Show Web_search" +msgstr "Pokazuj wyszukiwarki internetowe" + +#: ../src/prefs.c:567 +msgid "Show _New Tab" +msgstr "Pokazuj przycisk \"Nowa karta\"" + +#: ../src/prefs.c:572 +msgid "Show _Trash" +msgstr "Pokazuj śmietnik" + +#: ../src/prefs.c:577 +msgid "Miscellaneous" +msgstr "" + +#: ../src/prefs.c:579 +msgid "Close _buttons on tabs" +msgstr "Pokazuj przyciski zamykania kart" + +#: ../src/prefs.c:586 +msgid "Tab Si_ze" +msgstr "Rozmiar karty" + +#: ../src/prefs.c:593 +msgid "_Location search engine" +msgstr "Adres wyszukiwarki internetowej" + +#. Page "Network" +#: ../src/prefs.c:601 +msgid "Network" +msgstr "Sieć" + +#: ../src/prefs.c:602 +msgid "Proxy Server" +msgstr "Serwer proxy" + +#: ../src/prefs.c:604 +msgid "_Custom proxy server" +msgstr "Ręczna konfiguracja serwera proxy" + +#: ../src/prefs.c:608 +msgid "_Host/ Port" +msgstr "_Host/Port" + +#: ../src/prefs.c:617 +msgid "Proxy requires authentication" +msgstr "Serwer proxy wymaga uwierzytelniania" + +#: ../src/prefs.c:621 +msgid "Username" +msgstr "Nazwa użytkownika" + +#: ../src/prefs.c:625 +msgid "Password" +msgstr "Hasło" + +#: ../src/prefs.c:629 +msgid "Cache" +msgstr "Pamięć podręczna" + +#: ../src/prefs.c:631 +msgid "Cache size" +msgstr "Rozmiar pamięci podręcznej" + +#: ../src/prefs.c:637 +msgid "MB" +msgstr "MB" + +#: ../src/prefs.c:638 +msgid "Clear cache" +msgstr "Wyczyść teraz" + +#. Page "Privacy" +#: ../src/prefs.c:644 +msgid "Privacy" +msgstr "Prywatność" + +#: ../src/prefs.c:645 +msgid "Cookies" +msgstr "Ciasteczka" + +#: ../src/prefs.c:647 +msgid "Accept cookies" +msgstr "Akceptuj ciasteczka" + +#: ../src/prefs.c:650 +msgid "All cookies" +msgstr "Wszystkie ciasteczka" + +#: ../src/prefs.c:650 +msgid "Session cookies" +msgstr "Ciasteczka sesji" + +#: ../src/prefs.c:650 +msgid "None" +msgstr "Żadne" + +#: ../src/prefs.c:655 +msgid "Allow cookies from the original website only" +msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" + +#: ../src/prefs.c:658 +msgid "Maximum cookie age" +msgstr "Przechowuj ciasteczka przez:" + +#: ../src/prefs.c:664 +#: ../src/prefs.c:679 +msgid "days" +msgstr "dni" + +#: ../src/prefs.c:665 +msgid "View cookies" +msgstr "Pokaż ciasteczka" + +#: ../src/prefs.c:671 +msgid "Remember my visited pages" +msgstr "Przechowuj adresy odwiedzonych stron" + +#: ../src/prefs.c:682 +msgid "Remember my form inputs" +msgstr "Przechowuj dane z formularzy" + +#: ../src/prefs.c:686 +msgid "Remember my downloaded files" +msgstr "Przechowuj informację o pobranych plikach" + +#. Page "Programs" +#: ../src/prefs.c:691 +msgid "Programs" +msgstr "Programy" + +#: ../src/prefs.c:692 +msgid "External programs" +msgstr "Zewnętrzne programy" + +#: ../src/prefs.c:703 +msgid "Protocol" +msgstr "Protokół" + +#: ../src/prefs.c:706 +msgid "Command" +msgstr "Polecenie" + +#: ../src/sokoke.c:157 +msgid "Warning: You are using a superuser account!" +msgstr "Uwaga: Używasz konta administratora!" + +#: ../src/sokoke.c:267 +#: ../katze/katze-xbel.c:952 +msgid "Writing failed." +msgstr "Zapis nie powiódł się" + +#: ../src/webSearch.c:82 +msgid "Empty" +msgstr "Puste" + +#: ../src/webSearch.c:153 +msgid "Add search engine" +msgstr "Dodaj wyszukiwarkę internetową" + +#: ../src/webSearch.c:153 +msgid "Edit search engine" +msgstr "Modyfikuj przeglądarkę internetową" + +#: ../src/webSearch.c:183 +msgid "_Name:" +msgstr "_Nazwa:" + +#: ../src/webSearch.c:227 +msgid "_Icon (name or file):" +msgstr "_Ikona (nazwa albo plik):" + +#: ../src/webSearch.c:241 +msgid "_Keyword:" +msgstr "_Słowo kluczowe:" + +#: ../src/webSearch.c:310 +msgid "Manage search engines" +msgstr "_Zarządzaj wyszukiwarkami" + +#: ../katze/katze-throbber.c:135 +msgid "Symbolic size to use for the animation" +msgstr "" + +#: ../katze/katze-throbber.c:144 +msgid "The name of an icon containing animation frames" +msgstr "" + +#: ../katze/katze-throbber.c:153 +msgid "A GdkPixbuf containing animation frames" +msgstr "" + +#: ../katze/katze-throbber.c:162 +msgid "Whether the throbber should be animated" +msgstr "" + +#: ../katze/katze-throbber.c:171 +msgid "The name of an icon to be used as the static image" +msgstr "" + +#: ../katze/katze-throbber.c:180 +msgid "A GdkPixbuf to be used as the static image" +msgstr "" + +#: ../katze/katze-throbber.c:189 +msgid "The stock ID of an icon to be used as the static image" +msgstr "" + +#: ../katze/katze-xbel.c:723 +#: ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 +#: ../katze/katze-xbel.c:775 +#: ../katze/katze-xbel.c:804 +msgid "Malformed document." +msgstr "" + +#: ../katze/katze-xbel.c:759 +msgid "File not found." +msgstr "Nie znaleziono dokumentu" + From b01eb78c9d4be7a598ef6070a2100c059f21e1f6 Mon Sep 17 00:00:00 2001 From: Przemek Sitek Date: Sat, 29 Mar 2008 22:38:59 +0100 Subject: [PATCH 0052/2970] Implement proper menu positioning. Menu position is computed according to the widget position and size as well as a hint indicating alignment to the mouse pointer, left or right. --- src/midori-browser.c | 9 +++-- src/midori-webview.c | 4 +-- src/sokoke.c | 86 +++++++++++++++++++++++++++++++++++++------- src/sokoke.h | 10 ++++-- src/webSearch.c | 3 +- 5 files changed, 92 insertions(+), 20 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index fd35e658..2aa20f57 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -865,7 +865,8 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, menuitem = gtk_action_create_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - sokoke_widget_popup (widget, GTK_MENU (menu), NULL); + sokoke_widget_popup (widget, GTK_MENU (menu), NULL, + SOKOKE_MENU_POSITION_RIGHT); } static void @@ -1310,7 +1311,8 @@ _midori_panel_bookmarks_popup (GtkWidget* widget, _action_set_sensitive (browser, "BookmarkOpenTab", is_bookmark); _action_set_sensitive (browser, "BookmarkOpenWindow", is_bookmark); - sokoke_widget_popup (widget, GTK_MENU (priv->popup_bookmark), event); + sokoke_widget_popup (widget, GTK_MENU (priv->popup_bookmark), + event, SOKOKE_MENU_POSITION_CURSOR); } static gboolean @@ -1471,7 +1473,8 @@ midori_browser_bookmarkbar_folder_activate_cb (GtkToolItem* toolitem, // FIXME: We really *should* run the line below, but it won't work like that /*g_signal_connect (menu, "hide", G_CALLBACK (gtk_container_foreach), gtk_widget_destroy);*/ - sokoke_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), NULL); + sokoke_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), + NULL, SOKOKE_MENU_POSITION_LEFT); } static void diff --git a/src/midori-webview.c b/src/midori-webview.c index 2e1d299f..14fcec62 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -923,7 +923,7 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) priv->tab_label = gtk_label_new (title); gtk_misc_set_alignment (GTK_MISC (priv->tab_label), 0.0, 0.5); // TODO: make the tab initially look "unvisited" until it's focused - gtk_box_pack_start (GTK_BOX (hbox), priv->tab_label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->tab_label, FALSE, TRUE, 0); priv->proxy_tab_label = event_box; _midori_web_view_update_tab_label_size (web_view); @@ -936,7 +936,7 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) GtkWidget* image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON(close_button), image); - gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); gtk_widget_show_all (GTK_WIDGET (event_box)); if (!priv->close_button) gtk_widget_hide (close_button); diff --git a/src/sokoke.c b/src/sokoke.c index 7f681996..41272465 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -69,12 +69,65 @@ void sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* text) gtk_tool_item_set_tooltip(toolitem, tooltips, text, NULL); } -void sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu - , GdkEventButton* event) +typedef struct +{ + GtkWidget* widget; + SokokeMenuPos position; +} SokokePopupInfo; + +static void +sokoke_widget_popup_position_menu (GtkMenu* menu, + gint* x, + gint* y, + gboolean* push_in, + gpointer user_data) +{ + gint wx, wy; + gint menu_width; + GtkRequisition menu_req; + GtkRequisition widget_req; + SokokePopupInfo* info = user_data; + GtkWidget* widget = info->widget; + + // Retrieve size and position of both widget and menu + if (GTK_WIDGET_NO_WINDOW (widget)) + { + gdk_window_get_position (widget->window, &wx, &wy); + wx += widget->allocation.x; + wy += widget->allocation.y; + } + else + gdk_window_get_origin (widget->window, &wx, &wy); + gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); + gtk_widget_size_request (widget, &widget_req); + menu_width = menu_req.width; + gint widget_height = widget_req.height; // Better than allocation.height + + // Calculate menu position + if (info->position == SOKOKE_MENU_POSITION_CURSOR) + ; // Do nothing? + else if (info->position == SOKOKE_MENU_POSITION_RIGHT) + { + *x = wx + widget->allocation.width - menu_width; + *y = wy + widget_height; + } else if (info->position == SOKOKE_MENU_POSITION_LEFT) + { + *x = wx; + *y = wy + widget_height; + } + + *push_in = TRUE; +} + + +void +sokoke_widget_popup (GtkWidget* widget, + GtkMenu* menu, + GdkEventButton* event, + SokokeMenuPos pos) { - // TODO: Provide a GtkMenuPositionFunc in case a keyboard invoked this int button, event_time; - if(event) + if (event) { button = event->button; event_time = event->time; @@ -82,19 +135,28 @@ void sokoke_widget_popup(GtkWidget* widget, GtkMenu* menu else { button = 0; - event_time = gtk_get_current_event_time(); + event_time = gtk_get_current_event_time (); } - if(!gtk_menu_get_attach_widget(menu)) - gtk_menu_attach_to_widget(menu, widget, NULL); - gtk_menu_popup(menu, NULL, NULL, NULL, NULL, button, event_time); + if (!gtk_menu_get_attach_widget(menu)) + gtk_menu_attach_to_widget (menu, widget, NULL); + + if (widget) + { + SokokePopupInfo info = { widget, pos }; + gtk_menu_popup (menu, NULL, NULL, + sokoke_widget_popup_position_menu, &info, + button, event_time); + } + else + gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, event_time); } typedef enum { - SOKOKE_DESKTOP_UNTESTED, - SOKOKE_DESKTOP_XFCE, - SOKOKE_DESKTOP_UNKNOWN + SOKOKE_DESKTOP_UNTESTED, + SOKOKE_DESKTOP_XFCE, + SOKOKE_DESKTOP_UNKNOWN } SokokeDesktop; static SokokeDesktop sokoke_get_desktop(void) diff --git a/src/sokoke.h b/src/sokoke.h index 74e751be..4424ea40 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,6 +17,12 @@ // Many themes need this hack for small toolbars to work #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON +typedef enum { + SOKOKE_MENU_POSITION_CURSOR = 0, + SOKOKE_MENU_POSITION_LEFT, + SOKOKE_MENU_POSITION_RIGHT +} SokokeMenuPos; + void sokoke_combo_box_add_strings(GtkComboBox*, const gchar*, ...); @@ -33,7 +39,7 @@ void sokoke_tool_item_set_tooltip_text(GtkToolItem*, const gchar*); void -sokoke_widget_popup(GtkWidget*, GtkMenu*, GdkEventButton*); +sokoke_widget_popup(GtkWidget*, GtkMenu*, GdkEventButton*, SokokeMenuPos pos); gpointer sokoke_xfce_header_new(const gchar*, const gchar*); diff --git a/src/webSearch.c b/src/webSearch.c index 1f4d4f48..c918953c 100644 --- a/src/webSearch.c +++ b/src/webSearch.c @@ -93,7 +93,8 @@ void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos menuitem = gtk_action_create_menu_item(action); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_widget_show(menuitem);*/ - sokoke_widget_popup(widget, GTK_MENU(menu), NULL); + sokoke_widget_popup(widget, GTK_MENU(menu), + NULL, SOKOKE_MENU_POSITION_LEFT); } static void on_webSearch_engines_render_icon(GtkTreeViewColumn* column From ccba177ecbcef8be9e067e4af8436fc38c6c7484 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Mar 2008 16:55:46 +0200 Subject: [PATCH 0053/2970] The location is empty and focused by default When a new tab is opened it won't default to about:blank but be empty and also gain focus automatically. --- src/midori-browser.c | 7 +++++-- src/midori-webview.c | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 2aa20f57..5c0da7ff 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -573,14 +573,14 @@ static void _action_window_new_activate (GtkAction* action, MidoriBrowser* browser) { - g_signal_emit (browser, signals[NEW_WINDOW], 0, "about:blank"); + g_signal_emit (browser, signals[NEW_WINDOW], 0, ""); } static void _action_tab_new_activate (GtkAction* action, MidoriBrowser* browser) { - midori_browser_append_uri (browser, "about:blank"); + midori_browser_append_uri (browser, ""); } static void @@ -2865,7 +2865,10 @@ midori_browser_append_tab (MidoriBrowser* browser, n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); if (!config->openTabsInTheBackground) + { gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + gtk_window_set_focus (GTK_WINDOW (browser), priv->location); + } return n; } diff --git a/src/midori-webview.c b/src/midori-webview.c index 14fcec62..944934e2 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -224,7 +224,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) "uri", "Uri", _("The URI of the currently loaded page"), - "about:blank", + "", flags)); g_object_class_install_property (gobject_class, @@ -669,9 +669,12 @@ midori_web_view_set_property (GObject* object, priv->icon); break; case PROP_URI: - // FIXME: Autocomplete the uri - webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), - g_value_get_string (value)); + if (priv->uri && *priv->uri) + { + // FIXME: Autocomplete the uri + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), + g_value_get_string (value)); + } break; case PROP_TITLE: katze_assign (priv->title, g_value_dup_string (value)); @@ -1030,19 +1033,19 @@ midori_web_view_get_progress (MidoriWebView* web_view) * @web_view: a #MidoriWebView * * Retrieves a string that is suitable for displaying, particularly an - * empty uri is represented as "about:blank". + * empty URI is represented as "". * * You can assume that the string is not %NULL. * - * Return value: an uri string + * Return value: an URI string **/ const gchar* midori_web_view_get_display_uri (MidoriWebView* web_view) { - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), "about:blank"); + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), ""); MidoriWebViewPrivate* priv = web_view->priv; - return priv->uri ? priv->uri : "about:blank"; + return priv->uri ? priv->uri : ""; } /** @@ -1050,7 +1053,7 @@ midori_web_view_get_display_uri (MidoriWebView* web_view) * @web_view: a #MidoriWebView * * Retrieves a string that is suitable for displaying as a title. Most of the - * time this will be the title or the current uri. + * time this will be the title or the current URI. * * You can assume that the string is not %NULL. * @@ -1077,7 +1080,7 @@ midori_web_view_get_display_title (MidoriWebView* web_view) * Retrieves the uri of the currently focused link, particularly while the * mouse hovers a link or a context menu is being opened. * - * Return value: an uri string, or %NULL if there is no link focussed + * Return value: an URI string, or %NULL if there is no link focussed **/ const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view) From a482dc36a82494cf52eecd8c2b729389460720e5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Mar 2008 17:07:56 +0200 Subject: [PATCH 0054/2970] Quick fix: Open URIs again. --- src/midori-webview.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/midori-webview.c b/src/midori-webview.c index 944934e2..b5c2e25b 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -669,13 +669,15 @@ midori_web_view_set_property (GObject* object, priv->icon); break; case PROP_URI: - if (priv->uri && *priv->uri) + { + const gchar* uri = g_value_get_string (value); + if (uri && *uri) { // FIXME: Autocomplete the uri - webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), - g_value_get_string (value)); + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), uri); } break; + } case PROP_TITLE: katze_assign (priv->title, g_value_dup_string (value)); const gchar* title = midori_web_view_get_display_title (web_view); From f4abaeb00f7694970d55411768618461941e1db8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Mar 2008 20:32:01 +0200 Subject: [PATCH 0055/2970] Recognize the Enter key in the location entry. --- src/midori-browser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/midori-browser.c b/src/midori-browser.c index 5c0da7ff..245e2d87 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -1015,6 +1015,8 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, { switch (event->keyval) { + case GDK_ISO_Enter: + case GDK_KP_Enter: case GDK_Return: { const gchar* uri = gtk_entry_get_text (GTK_ENTRY (widget)); From 793b030d3a7781f3ad7f45312e0257105f68fb54 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 3 Apr 2008 23:33:32 +0200 Subject: [PATCH 0056/2970] Fix Reload/ Stop menu items. The menu items were sensitive in reversed logic and the Stop item had the icon and accelerator of the Reload item. Now the sensitivity is fixed and the Stop item is Stop again. --- src/midori-browser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 245e2d87..9395a531 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -174,8 +174,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); _action_set_sensitive (browser, "Forward", webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Reload", loading); - _action_set_sensitive (browser, "Stop", !loading); + _action_set_sensitive (browser, "Reload", !loading); + _action_set_sensitive (browser, "Stop", loading); GtkAction* action = gtk_action_group_get_action (priv->action_group, "ReloadStop"); @@ -1930,8 +1930,8 @@ static const GtkActionEntry entries[] = { { "Reload", GTK_STOCK_REFRESH, NULL, "r", N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, - { "Stop", GTK_STOCK_REFRESH, - NULL, "r", + { "Stop", GTK_STOCK_STOP, + NULL, "Escape", N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ReloadStop", GTK_STOCK_STOP, NULL, "r", From f261464c90bfd72699d86aeac57c4c08134f8e2e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 5 Apr 2008 15:33:54 +0200 Subject: [PATCH 0057/2970] Use an empty URI if Load on Startup is Blank page. --- src/main.c | 2 +- src/midori-browser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 2ff07401..f0df9060 100644 --- a/src/main.c +++ b/src/main.c @@ -296,7 +296,7 @@ int main(int argc, char** argv) { KatzeXbelItem* item = katze_xbel_bookmark_new(); if(config->startup == CONFIG_STARTUP_BLANK) - katze_xbel_bookmark_set_href(item, "about:blank"); + katze_xbel_bookmark_set_href(item, ""); else katze_xbel_bookmark_set_href(item, config->homepage); katze_xbel_folder_prepend_item(_session, item); diff --git a/src/midori-browser.c b/src/midori-browser.c index 9395a531..fb084494 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -2536,7 +2536,7 @@ midori_browser_init (MidoriBrowser* browser) // Transfers priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", "about:blank", + "uri", "", NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), @@ -2552,7 +2552,7 @@ midori_browser_init (MidoriBrowser* browser) // History priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", "about:blank", + "uri", "", NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), From 00df47913d9454230f29f28f57b8d5e82534f448 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 5 Apr 2008 16:22:02 +0200 Subject: [PATCH 0058/2970] Use a default tab icon. --- src/midori-webview.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/midori-webview.c b/src/midori-webview.c index b5c2e25b..224c4ccc 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -831,7 +831,12 @@ midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) if (!priv->tab_icon) { priv->tab_icon = katze_throbber_new (); - katze_throbber_set_pixbuf (KATZE_THROBBER(priv->tab_icon), priv->icon); + if (priv->icon) + katze_throbber_set_static_pixbuf (KATZE_THROBBER(priv->tab_icon), + priv->icon); + else + katze_throbber_set_static_stock_id (KATZE_THROBBER(priv->tab_icon), + GTK_STOCK_FILE); } return priv->tab_icon; } @@ -916,8 +921,7 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) if (!priv->proxy_tab_label) { - priv->tab_icon = katze_throbber_new (); - katze_throbber_set_pixbuf (KATZE_THROBBER(priv->tab_icon), priv->icon); + priv->tab_icon = midori_web_view_get_proxy_tab_icon (web_view); GtkWidget* event_box = gtk_event_box_new (); gtk_event_box_set_visible_window(GTK_EVENT_BOX (event_box), FALSE); From e70925d064124798a9df643ba68a3df2da2eb9eb Mon Sep 17 00:00:00 2001 From: Przemek Sitek Date: Mon, 7 Apr 2008 01:15:09 +0200 Subject: [PATCH 0059/2970] Append the closed tabs items as a proper submenu. --- src/midori-browser.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index fb084494..3c6ad406 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -865,8 +865,11 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, menuitem = gtk_action_create_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - sokoke_widget_popup (widget, GTK_MENU (menu), NULL, - SOKOKE_MENU_POSITION_RIGHT); + if (GTK_IS_MENU_ITEM (widget)) + gtk_menu_item_set_submenu (GTK_MENU_ITEM (widget), menu); + else + sokoke_widget_popup (widget, GTK_MENU (menu), NULL, + SOKOKE_MENU_POSITION_RIGHT); } static void @@ -1687,7 +1690,7 @@ static gboolean midori_panel_close_cb (MidoriPanel* panel, MidoriBrowser* browser) { - config->panelShow = FALSE; + _action_set_active (browser, "Panel", FALSE); return FALSE; } From ef7113caca7598f28a60f93598d84adbb510a0b9 Mon Sep 17 00:00:00 2001 From: Przemek Sitek Date: Mon, 7 Apr 2008 01:17:17 +0200 Subject: [PATCH 0060/2970] Save the return value of the panel's 'close' signal. --- src/midori-panel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/midori-panel.c b/src/midori-panel.c index 139e03bf..8c4856d3 100644 --- a/src/midori-panel.c +++ b/src/midori-panel.c @@ -173,7 +173,8 @@ static void midori_panel_button_close_clicked_cb (GtkWidget* toolitem, MidoriPanel* panel) { - g_signal_emit (panel, signals[CLOSE], 0); + gboolean return_value; + g_signal_emit (panel, signals[CLOSE], 0, &return_value); } static void From 616b43004c5a29ddf950a28f5ff66faecbd30e1e Mon Sep 17 00:00:00 2001 From: Przemek Sitek Date: Mon, 7 Apr 2008 06:54:02 +0200 Subject: [PATCH 0061/2970] Open selection in new tab via Control. --- src/midori-webview.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/midori-webview.c b/src/midori-webview.c index 224c4ccc..d7958c83 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -396,7 +396,7 @@ gtk_widget_button_press_event (MidoriWebView* web_view, if (state & GDK_CONTROL_MASK) { // FIXME: Reset font multiplier or zoom level - return TRUE; + return FALSE; // Allow Ctrl + Middle click } else { @@ -421,11 +421,15 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, if (event->button == 2 && priv->middle_click_goto) { + GdkModifierType state = (GdkModifierType) event->state; GtkClipboard* clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); gchar* uri = gtk_clipboard_wait_for_text (clipboard); if (uri && strchr (uri, '.') && !strchr (uri, ' ')) { - g_object_set (web_view, "uri", uri, NULL); + if (state & GDK_CONTROL_MASK) + g_signal_emit (web_view, signals[NEW_TAB], 0, uri); + else + g_object_set (web_view, "uri", uri, NULL); g_free (uri); return TRUE; } From 39bf5927721f7606ca3120ef4c49f5c3eb0c2525 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 12 Apr 2008 15:48:33 +0200 Subject: [PATCH 0062/2970] Remove 'External programs' logic --- src/conf.c | 28 ------------ src/conf.h | 3 -- src/helpers.c | 41 ----------------- src/helpers.h | 3 -- src/midori-browser.c | 17 ------- src/prefs.c | 104 ------------------------------------------- 6 files changed, 196 deletions(-) diff --git a/src/conf.c b/src/conf.c index f8ba22bb..91d12d29 100644 --- a/src/conf.c +++ b/src/conf.c @@ -27,8 +27,6 @@ void config_free(CConfig* config) g_free(config->homepage); g_free(config->locationSearch); g_free(config->panelPageholder); - g_datalist_clear(&config->protocols_commands); - g_ptr_array_free(config->protocols_names, TRUE); g_free(config); } @@ -103,23 +101,6 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error #undef GET_INT #undef GET_STR - config->protocols_names = g_ptr_array_new(); - g_datalist_init(&config->protocols_commands); - gchar** protocols; - if((protocols = g_key_file_get_keys(keyFile, "protocols", NULL, NULL))) - { - guint i; - for(i = 0; protocols[i] != NULL; i++) - { - gchar* sCommand = g_key_file_get_string(keyFile, "protocols" - , protocols[i], NULL); - g_ptr_array_add(config->protocols_names, (gpointer)protocols[i]); - g_datalist_set_data_full(&config->protocols_commands - , protocols[i], sCommand, g_free); - } - g_free(protocols); - } - g_key_file_free(keyFile); return !(error && *error); } @@ -169,15 +150,6 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) g_key_file_set_integer(keyFile, "session", "WinPanelPos", config->winPanelPos); g_key_file_set_integer(keyFile, "session", "SearchEngine", config->searchEngine); - guint i; - for(i = 0; i < config->protocols_names->len; i++) - { - gchar* protocol = (gchar*)g_ptr_array_index(config->protocols_names, i); - gchar* command = g_datalist_get_data(&config->protocols_commands, protocol); - g_key_file_set_string(keyFile, "protocols", protocol, command); - g_free(protocol); - } - gboolean saved = sokoke_key_file_save_to_file(keyFile, filename, error); g_key_file_free(keyFile); diff --git a/src/conf.h b/src/conf.h index 17a6b905..9a846079 100644 --- a/src/conf.h +++ b/src/conf.h @@ -56,9 +56,6 @@ typedef struct _CConfig gint winHeight; guint winPanelPos; guint searchEngine; // last selected search engine - - GPtrArray* protocols_names; - GData* protocols_commands; } CConfig; enum diff --git a/src/helpers.c b/src/helpers.c index c826f26f..851263bb 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -48,47 +48,6 @@ void show_error(const gchar* text, const gchar* text2, MidoriBrowser* browser) gtk_widget_destroy(dialog); } -gboolean spawn_protocol_command(const gchar* protocol, const gchar* res) -{ - const gchar* command = g_datalist_get_data(&config->protocols_commands, protocol); - if(!command) - return FALSE; - - // Create an argument vector - gchar* uriEscaped = g_shell_quote(res); - gchar* commandReady; - if(strstr(command, "%s")) - commandReady = g_strdup_printf(command, uriEscaped); - else - commandReady = g_strconcat(command, " ", uriEscaped, NULL); - gchar** argv; GError* error = NULL; - if(!g_shell_parse_argv(commandReady, NULL, &argv, &error)) - { - // FIXME: Should we have a more specific message? - show_error(_("Could not run external program."), error->message, NULL); - g_error_free(error); - g_free(commandReady); g_free(uriEscaped); - return FALSE; - } - - // Try to run the command - error = NULL; - gboolean success = g_spawn_async(NULL, argv, NULL - , (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD - , NULL, NULL, NULL, &error); - g_strfreev(argv); - - if(!success) - { - // FIXME: Should we have a more specific message? - show_error(_("Could not run external program."), error->message, NULL); - g_error_free(error); - } - g_free(commandReady); - g_free(uriEscaped); - return TRUE; -} - GdkPixbuf* load_web_icon(const gchar* icon, GtkIconSize size, GtkWidget* widget) { g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL); diff --git a/src/helpers.h b/src/helpers.h index 0db7400f..92d0a6ab 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -25,9 +25,6 @@ radio_button_new(GtkRadioButton*, const gchar*); void show_error(const gchar*, const gchar*, MidoriBrowser*); -gboolean -spawn_protocol_command(const gchar*, const gchar*); - GdkPixbuf* load_web_icon(const gchar*, GtkIconSize, GtkWidget*); diff --git a/src/midori-browser.c b/src/midori-browser.c index 3c6ad406..62f98b5b 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -220,21 +220,6 @@ _midori_browser_child_for_scrolled (MidoriBrowser* browser, return child; } -static WebKitNavigationResponse -midori_web_view_navigation_requested_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - WebKitNetworkRequest* request) -{ - WebKitNavigationResponse response = WEBKIT_NAVIGATION_RESPONSE_ACCEPT; - // FIXME: This isn't the place for uri scheme handling - const gchar* uri = webkit_network_request_get_uri (request); - gchar* protocol = strtok (g_strdup (uri), ":"); - if (spawn_protocol_command (protocol, uri)) - response = WEBKIT_NAVIGATION_RESPONSE_IGNORE; - g_free (protocol); - return response; -} - static void _midori_browser_set_statusbar_text (MidoriBrowser* browser, const gchar* text) @@ -2812,8 +2797,6 @@ midori_browser_append_tab (MidoriBrowser* browser, } g_object_connect (widget, - "signal::navigation-requested", - midori_web_view_navigation_requested_cb, browser, "signal::load-started", midori_web_view_load_started_cb, browser, "signal::load-committed", diff --git a/src/prefs.c b/src/prefs.c index ce5a9425..1dea73ed 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -259,41 +259,6 @@ static void on_prefs_protocols_render_icon(GtkTreeViewColumn* column g_free(command); } -static void on_prefs_protocols_edited(GtkCellRendererText* renderer - , gchar* path, gchar* textNew, CPrefs* prefs) -{ - GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(prefs->treeview)); - GtkTreeIter iter; - gtk_tree_model_get_iter_from_string(model, &iter, path); - gtk_list_store_set(GTK_LIST_STORE(model), &iter - , PROTOCOLS_COL_COMMAND, textNew, -1); - gchar* protocol; - gtk_tree_model_get(model, &iter, PROTOCOLS_COL_NAME, &protocol, -1); - g_datalist_set_data_full(&config->protocols_commands - , protocol, g_strdup(textNew), g_free); -} - -static void on_prefs_protocols_add_clicked(GtkWidget* widget, CPrefs* prefs) -{ - gchar* protocol = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs->combobox)); - GtkTreeModel* liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(prefs->treeview)); - gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, G_MAXINT - , PROTOCOLS_COL_NAME, protocol - , PROTOCOLS_COL_COMMAND, "", -1); - g_ptr_array_add(config->protocols_names, (gpointer)protocol); - g_datalist_set_data_full(&config->protocols_commands - , protocol, g_strdup(""), g_free); - gtk_widget_set_sensitive(prefs->add, FALSE); -} - -static void on_prefs_protocols_combobox_changed(GtkWidget* widget, CPrefs* prefs) -{ - gchar* protocol = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)); - gchar* command = (gchar*)g_datalist_get_data(&config->protocols_commands, protocol); - g_free(protocol); - gtk_widget_set_sensitive(prefs->add, command == NULL); -} - GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) { gchar* dialogTitle = g_strdup_printf(_("%s Preferences"), g_get_application_name()); @@ -687,75 +652,6 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) gtk_widget_set_sensitive(checkbutton, FALSE); //... SPANNED_ADD(checkbutton, 0, 2, 2, 3); - // Page "Programs" - PAGE_NEW(_("Programs")); - FRAME_NEW(_("External programs")); - TABLE_NEW(3, 2); - GtkWidget* treeview; GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; - GtkListStore* liststore = gtk_list_store_new(PROTOCOLS_COL_N - , G_TYPE_STRING, G_TYPE_STRING); - treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(liststore)); - prefs->treeview = treeview; - renderer_text = gtk_cell_renderer_text_new(); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); - column = gtk_tree_view_column_new_with_attributes( - _("Protocol"), renderer_text, "text", PROTOCOLS_COL_NAME, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); - column = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(column, _("Command")); - gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf - , (GtkTreeCellDataFunc)on_prefs_protocols_render_icon, prefs, NULL); - renderer_text = gtk_cell_renderer_text_new(); - g_object_set(G_OBJECT(renderer_text), "editable", TRUE, NULL); - g_signal_connect(renderer_text, "edited" - , G_CALLBACK(on_prefs_protocols_edited), prefs); - gtk_tree_view_column_pack_start(column, renderer_text, TRUE); - gtk_tree_view_column_add_attribute(column, renderer_text, "text", PROTOCOLS_COL_COMMAND); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); - GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled) - , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(scrolled), treeview); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 5); - guint i; - for(i = 0; i < config->protocols_names->len; i++) - { - gchar* protocol = (gchar*)g_ptr_array_index(config->protocols_names, i); - // TODO: We might want to determine 'default' programs somehow - // TODO: Any way to make it easier to add eg. only a mail client? O_o - const gchar* command = g_datalist_get_data(&config->protocols_commands, protocol); - gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i - , PROTOCOLS_COL_NAME , protocol - , PROTOCOLS_COL_COMMAND, command - , -1); - } - g_object_unref(liststore); - GtkWidget* vbox = gtk_vbox_new(FALSE, 4); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4); - combobox = gtk_combo_box_new_text(); - prefs->combobox = combobox; - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , "download", "ed2k", "feed", "ftp", "irc", "mailto" - , "news", "tel", "torrent", "view-source", NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); - gtk_box_pack_start(GTK_BOX(vbox), combobox, FALSE, FALSE, 0); - button = gtk_button_new_from_stock(GTK_STOCK_ADD); - prefs->add = button; - g_signal_connect(combobox, "changed" - , G_CALLBACK(on_prefs_protocols_combobox_changed), prefs); - g_signal_connect(button, "clicked" - , G_CALLBACK(on_prefs_protocols_add_clicked), prefs); - gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - button = gtk_label_new(""); // This is an invisible separator - gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 12); - button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); - gtk_widget_set_sensitive(button, FALSE); //... - gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); - FILLED_ADD(hbox, 0, 2, 0, 2); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) , notebook, FALSE, FALSE, 4); gtk_widget_show_all(GTK_DIALOG(dialog)->vbox); From e91d077a842a4e77d466aa626fa0451d9d37b6b8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Apr 2008 11:29:21 +0200 Subject: [PATCH 0063/2970] Enhance Web Settings greatly with new properties. A lot of new properties are added, which are going to be the basis of the coming configuration replacement. Also a little cleanup is done in a few places. --- katze/katze-throbber.c | 8 +- katze/katze-throbber.h | 2 +- katze/katze-xbel.c | 30 +- src/main.c | 4 +- src/midori-websettings.c | 655 +++++++++++++++++++++++++++++++++++++-- src/midori-websettings.h | 70 +++++ src/midori-webview.c | 8 +- 7 files changed, 720 insertions(+), 57 deletions(-) diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 069e6603..5c66b000 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -152,7 +152,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) "Pixbuf", _("A GdkPixbuf containing animation frames"), GDK_TYPE_PIXBUF, - flags)); + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_ANIMATED, @@ -179,7 +179,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) "Static Pixbuf", _("A GdkPixbuf to be used as the static image"), GDK_TYPE_PIXBUF, - flags)); + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_STATIC_STOCK_ID, @@ -205,7 +205,7 @@ katze_throbber_init (KatzeThrobber *throbber) } static void -katze_throbber_dispose (GObject *object) +katze_throbber_dispose (GObject* object) { KatzeThrobber* throbber = KATZE_THROBBER (object); KatzeThrobberPrivate* priv = throbber->priv; @@ -217,7 +217,7 @@ katze_throbber_dispose (GObject *object) } static void -katze_throbber_destroy (GtkObject *object) +katze_throbber_destroy (GtkObject* object) { KatzeThrobber* throbber = KATZE_THROBBER (object); KatzeThrobberPrivate* priv = throbber->priv; diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index 6f1be411..db4c5370 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -13,7 +13,7 @@ #define __KATZE_THROBBER_H__ #include -#include +#include #include "katze-utils.h" diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c index f797de10..5c7c7667 100644 --- a/katze/katze-xbel.c +++ b/katze/katze-xbel.c @@ -719,16 +719,16 @@ katze_xbel_folder_from_data (KatzeXbelItem* folder, if((doc = xmlParseMemory (data, strlen (data))) == NULL) { // No valid xml or broken encoding - *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); + *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + _("Malformed document.")); return FALSE; } if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) { // Parsing failed xmlFreeDoc(doc); - *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); + *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + _("Malformed document.")); return FALSE; } xmlFreeDoc(doc); @@ -755,24 +755,24 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, if (!g_file_test (file, G_FILE_TEST_EXISTS)) { // File doesn't exist - *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_NOENT, - _("File not found.")); + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_NOENT, + _("File not found.")); return FALSE; } xmlDocPtr doc; if ((doc = xmlParseFile (file)) == NULL) { // No valid xml or broken encoding - *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); + *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + _("Malformed document.")); return FALSE; } if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) { // Parsing failed xmlFreeDoc (doc); - *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); + *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + _("Malformed document.")); return FALSE; } xmlFreeDoc (doc); @@ -800,8 +800,8 @@ katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, g_return_val_if_fail (file, FALSE); // FIXME: Essentially unimplemented - *error = g_error_new (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); + *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, + _("Malformed document.")); return FALSE; } @@ -946,10 +946,10 @@ katze_xbel_folder_to_file (KatzeXbelItem* folder, if (!(data = katze_xbel_folder_to_data (folder, NULL, error))) return FALSE; FILE* fp; - if(!(fp = fopen (file, "w"))) + if (!(fp = fopen (file, "w"))) { - *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES, - _("Writing failed.")); + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_ACCES, + _("Writing failed.")); return FALSE; } fputs (data, fp); diff --git a/src/main.c b/src/main.c index f0df9060..061501f6 100644 --- a/src/main.c +++ b/src/main.c @@ -321,8 +321,8 @@ int main(int argc, char** argv) "enable-scripts", config->enableScripts, "enable-plugins", config->enablePlugins, "tab-label-size", config->tabSize, - "close-button", config->tabClose, - "middle-click-goto", config->middleClickGoto, + "close-buttons-on-tabs", config->tabClose, + "middle-click-opens-selection", config->middleClickGoto, NULL); webSettings = settings; diff --git a/src/midori-websettings.c b/src/midori-websettings.c index d1a408c6..08dba7f6 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -9,18 +9,48 @@ See the file COPYING for the full license text. */ -#include "midori-webview.h" +#include "midori-websettings.h" #include "sokoke.h" + #include +#include G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) struct _MidoriWebSettingsPrivate { + MidoriStartup load_on_startup; + gchar* homepage; + gchar* download_folder; + gboolean show_download_notification; + gchar* location_entry_search; + MidoriPreferredEncoding preferred_encoding; + + MidoriToolbarStyle toolbar_style; + gboolean small_toolbar; + gboolean show_web_search; + gboolean show_new_tab; + gboolean show_trash; + gint tab_label_size; - gboolean close_button; - gboolean middle_click_goto; + gboolean close_buttons_on_tabs; + MidoriNewPage open_new_pages_in; + gboolean middle_click_opens_selection; + gboolean open_tabs_in_the_background; + gboolean open_popups_in_tabs; + + MidoriAcceptCookies accept_cookies; + gboolean original_cookies_only; + gint maximum_cookie_age; + + gboolean remember_last_visited_pages; + gint maximum_history_age; + gboolean remember_last_form_inputs; + gboolean remember_last_downloaded_files; + + gchar* http_proxy; + gint cache_size; }; #define MIDORI_WEB_SETTINGS_GET_PRIVATE(obj) \ @@ -31,24 +61,142 @@ enum { PROP_0, + PROP_LOAD_ON_STARTUP, + PROP_HOMEPAGE, + PROP_DOWNLOAD_FOLDER, + PROP_SHOW_DOWNLOAD_NOTIFICATION, + PROP_LOCATION_ENTRY_SEARCH, + PROP_PREFERRED_ENCODING, + + PROP_TOOLBAR_STYLE, + PROP_SMALL_TOOLBAR, + PROP_SHOW_NEW_TAB, + PROP_SHOW_WEB_SEARCH, + PROP_SHOW_TRASH, + PROP_TAB_LABEL_SIZE, - PROP_CLOSE_BUTTON, - PROP_MIDDLE_CLICK_GOTO + PROP_CLOSE_BUTTONS_ON_TABS, + PROP_OPEN_NEW_PAGES_IN, + PROP_MIDDLE_CLICK_OPENS_SELECTION, + PROP_OPEN_TABS_IN_THE_BACKGROUND, + PROP_OPEN_POPUPS_IN_TABS, + + PROP_ACCEPT_COOKIES, + PROP_ORIGINAL_COOKIES_ONLY, + PROP_MAXIMUM_COOKIE_AGE, + + PROP_REMEMBER_LAST_VISITED_PAGES, + PROP_MAXIMUM_HISTORY_AGE, + PROP_REMEMBER_LAST_FORM_INPUTS, + PROP_REMEMBER_LAST_DOWNLOADED_FILES, + + PROP_HTTP_PROXY, + PROP_CACHE_SIZE }; +GType +midori_startup_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_STARTUP_BLANK, "MIDORI_STARTUP_BLANK", "Blank" }, + { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", "Homepage" }, + { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", "Last open pages" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriStartup", values); + } + return type; +} + +GType +midori_preferred_encoding_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", "Chinese (BIG5)" }, + { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", "Japanese (SHIFT_JIS)" }, + { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", "Russian (KOI8-R)" }, + { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", "Unicode (UTF-8)" }, + { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", "Western (ISO-8859-1)" }, + { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_CUSTOM", "Custom..." }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriPreferredEncoding", values); + } + return type; +} + +GType +midori_new_page_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_NEW_PAGE_TAB, "MIDORI_NEW_PAGE_TAB", "New tab" }, + { MIDORI_NEW_PAGE_WINDOW, "MIDORI_NEW_PAGE_WINDOW", "New window" }, + { MIDORI_NEW_PAGE_CURRENT, "MIDORI_NEW_PAGE_CURRENT", "Current tab" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriNewPage", values); + } + return type; +} + +GType +midori_toolbar_style_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", "Default" }, + { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", "Icons" }, + { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", "Text" }, + { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", "Both" }, + { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", "Both horizontal" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriToolbarStyle", values); + } + return type; +} + +GType +midori_accept_cookies_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_ACCEPT_COOKIES_ALL, "MIDORI_ACCEPT_COOKIES_ALL", "All cookies" }, + { MIDORI_ACCEPT_COOKIES_SESSION, "MIDORI_ACCEPT_COOKIES_SESSION", "Session cookies" }, + { MIDORI_ACCEPT_COOKIES_NONE, "MIDORI_ACCEPT_COOKIES_NONE", "None" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriAcceptCookies", values); + } + return type; +} + static void midori_web_settings_finalize (GObject* object); static void -midori_web_settings_set_property (GObject* object, - guint prop_id, +midori_web_settings_set_property (GObject* object, + guint prop_id, const GValue* value, - GParamSpec* pspec); + GParamSpec* pspec); static void -midori_web_settings_get_property (GObject* object, - guint prop_id, - GValue* value, +midori_web_settings_get_property (GObject* object, + guint prop_id, + GValue* value, GParamSpec* pspec); static void @@ -61,42 +209,289 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + g_object_class_install_property (gobject_class, + PROP_LOAD_ON_STARTUP, + g_param_spec_enum ( + "load-on-startup", + _("Load on Startup"), + _("What to load on startup"), + MIDORI_TYPE_STARTUP, + MIDORI_STARTUP_HOMEPAGE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_HOMEPAGE, + g_param_spec_string ( + "homepage", + _("Homepage"), + _("The homepage"), + "http://www.google.com", + flags)); + + g_object_class_install_property (gobject_class, + PROP_DOWNLOAD_FOLDER, + g_param_spec_string ( + "download-folder", + _("Download Folder"), + _("The folder downloaded files are saved to"), + g_get_home_dir (), + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_DOWNLOAD_NOTIFICATION, + g_param_spec_boolean ( + "show-download-notification", + _("Show Download Notification"), + _("Show a notification window for finished downloads"), + TRUE, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_LOCATION_ENTRY_SEARCH, + g_param_spec_string ( + "location-entry-search", + _("Location entry Search"), + _("The search to perform inside the location entry"), + "http://www.google.com/search/?q=%s", + flags)); + + g_object_class_install_property (gobject_class, + PROP_PREFERRED_ENCODING, + g_param_spec_enum ( + "preferred-encoding", + _("Preferred Encoding"), + _("The preferred character encoding"), + MIDORI_TYPE_PREFERRED_ENCODING, + MIDORI_ENCODING_WESTERN, + flags)); + + + + g_object_class_install_property (gobject_class, + PROP_TOOLBAR_STYLE, + g_param_spec_enum ( + "toolbar-style", + _("Toolbar Style"), + _("The style of the toolbar"), + MIDORI_TYPE_TOOLBAR_STYLE, + MIDORI_TOOLBAR_DEFAULT, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SMALL_TOOLBAR, + g_param_spec_boolean ( + "small-toolbar", + _("Small toolbar"), + _("Use small toolbar icons"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_NEW_TAB, + g_param_spec_boolean ( + "show-new-tab", + _("Show New Tab"), + _("Show the New Tab button in the toolbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_WEB_SEARCH, + g_param_spec_boolean ( + "show-web-search", + _("Show Web search"), + _("Show the Web search entry in the toolbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_TRASH, + g_param_spec_boolean ( + "show-trash", + _("Show Trash"), + _("Show the Trash button in the toolbar"), + TRUE, + flags)); + + + g_object_class_install_property (gobject_class, PROP_TAB_LABEL_SIZE, g_param_spec_int ( "tab-label-size", - "Tab Label Size", + _("Tab Label Size"), _("The desired tab label size"), 0, G_MAXINT, 10, flags)); g_object_class_install_property (gobject_class, - PROP_CLOSE_BUTTON, + PROP_CLOSE_BUTTONS_ON_TABS, g_param_spec_boolean ( - "close-button", - "Close Button", + "close-buttons-on-tabs", + _("Close Buttons on Tabs"), _("Whether tabs have close buttons"), FALSE, flags)); g_object_class_install_property (gobject_class, - PROP_MIDDLE_CLICK_GOTO, + PROP_OPEN_NEW_PAGES_IN, + g_param_spec_enum ( + "open-new-pages-in", + _("Open new pages in"), + _("Where to open new pages"), + MIDORI_TYPE_NEW_PAGE, + MIDORI_NEW_PAGE_TAB, + flags)); + + g_object_class_install_property (gobject_class, + PROP_MIDDLE_CLICK_OPENS_SELECTION, g_param_spec_boolean ( - "middle-click-goto", - "Middle Click Goto", + "middle-click-opens-selection", + _("Middle click opens Selection"), _("Load an URL from the selection via middle click"), FALSE, flags)); + g_object_class_install_property (gobject_class, + PROP_OPEN_TABS_IN_THE_BACKGROUND, + g_param_spec_boolean ( + "open-tabs-in-the-background", + _("Open tabs in the background"), + _("Whether to open new tabs in the background"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_OPEN_POPUPS_IN_TABS, + g_param_spec_boolean ( + "open-popups-in-tabs", + _("Open popups in tabs"), + _("Whether to open popup windows in tabs"), + TRUE, + flags)); + + + + g_object_class_install_property (gobject_class, + PROP_ACCEPT_COOKIES, + g_param_spec_enum ( + "accept-cookies", + _("Accept cookies"), + _("What type of cookies to accept"), + MIDORI_TYPE_ACCEPT_COOKIES, + MIDORI_ACCEPT_COOKIES_ALL, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_ORIGINAL_COOKIES_ONLY, + g_param_spec_boolean ( + "original-cookies-only", + _("Original cookies only"), + _("Accept cookies from the original website only"), + FALSE, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_MAXIMUM_COOKIE_AGE, + g_param_spec_int ( + "maximum-cookie-age", + _("Maximum cookie age"), + _("The maximum number of days to save cookies for"), + 0, G_MAXINT, 30, + G_PARAM_READABLE)); + + + + g_object_class_install_property (gobject_class, + PROP_REMEMBER_LAST_VISITED_PAGES, + g_param_spec_boolean ( + "remember-last-visited-pages", + _("Remember last visited pages"), + _("Whether the last visited pages are saved"), + TRUE, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_MAXIMUM_HISTORY_AGE, + g_param_spec_int ( + "maximum-history-age", + _("Maximum history age"), + _("The maximum number of days to save the history for"), + 0, G_MAXINT, 30, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_REMEMBER_LAST_FORM_INPUTS, + g_param_spec_boolean ( + "remember-last-form-inputs", + _("Remember last form inputs"), + _("Whether the last form inputs are saved"), + TRUE, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_REMEMBER_LAST_DOWNLOADED_FILES, + g_param_spec_boolean ( + "remember-last-downloaded-files", + _("Remember last downloaded files"), + _("Whether the last downloaded files are saved"), + TRUE, + G_PARAM_READABLE)); + + + + g_object_class_install_property (gobject_class, + PROP_HTTP_PROXY, + g_param_spec_string ( + "http-proxy", + _("HTTP Proxy"), + _("The proxy used for HTTP connections"), + g_getenv ("http_proxy"), + flags)); + + g_object_class_install_property (gobject_class, + PROP_CACHE_SIZE, + g_param_spec_int ( + "cache-size", + _("Cache size"), + _("The allowed size of the cache"), + 0, G_MAXINT, 100, + G_PARAM_READABLE)); + g_type_class_add_private (class, sizeof (MidoriWebSettingsPrivate)); } +static void +notify_default_encoding_cb (GObject* object, GParamSpec* pspec) +{ + MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); + MidoriWebSettingsPrivate* priv = web_settings->priv; + const gchar* string; + g_object_get (object, "default-encoding", &string, NULL); + const gchar* encoding = string ? string : ""; + if (!strcmp (encoding, "BIG5")) + priv->preferred_encoding = MIDORI_ENCODING_CHINESE; + else if (!strcmp (encoding, "SHIFT_JIS")) + priv->preferred_encoding = MIDORI_ENCODING_JAPANESE; + else if (!strcmp (encoding, "KOI8-R")) + priv->preferred_encoding = MIDORI_ENCODING_RUSSIAN; + else if (!strcmp (encoding, "UTF-8")) + priv->preferred_encoding = MIDORI_ENCODING_UNICODE; + else if (!strcmp (encoding, "ISO-8859-1")) + priv->preferred_encoding = MIDORI_ENCODING_WESTERN; + else + priv->preferred_encoding = MIDORI_ENCODING_CUSTOM; + g_object_notify (object, "preferred-encoding"); +} static void midori_web_settings_init (MidoriWebSettings* web_settings) { web_settings->priv = MIDORI_WEB_SETTINGS_GET_PRIVATE (web_settings); + + g_signal_connect (web_settings, "notify::default-encoding", + G_CALLBACK (notify_default_encoding_cb), NULL); } static void @@ -116,14 +511,109 @@ midori_web_settings_set_property (GObject* object, switch (prop_id) { + case PROP_LOAD_ON_STARTUP: + priv->load_on_startup = g_value_get_enum (value); + break; + case PROP_HOMEPAGE: + katze_assign (priv->homepage, g_value_dup_string (value)); + break; + case PROP_DOWNLOAD_FOLDER: + katze_assign (priv->download_folder, g_value_dup_string (value)); + break; + case PROP_SHOW_DOWNLOAD_NOTIFICATION: + priv->show_download_notification = g_value_get_boolean (value); + break; + case PROP_LOCATION_ENTRY_SEARCH: + katze_assign (priv->location_entry_search, g_value_dup_string (value)); + break; + case PROP_PREFERRED_ENCODING: + priv->preferred_encoding = g_value_get_enum (value); + switch (priv->preferred_encoding) + { + case MIDORI_ENCODING_CHINESE: + g_object_set (object, "default-encoding", "BIG5", NULL); + break; + case MIDORI_ENCODING_JAPANESE: + g_object_set (object, "default-encoding", "SHIFT_JIS", NULL); + break; + case MIDORI_ENCODING_RUSSIAN: + g_object_set (object, "default-encoding", "KOI8-R", NULL); + break; + case MIDORI_ENCODING_UNICODE: + g_object_set (object, "default-encoding", "UTF-8", NULL); + break; + case MIDORI_ENCODING_WESTERN: + g_object_set (object, "default-encoding", "ISO-8859-1", NULL); + break; + case MIDORI_ENCODING_CUSTOM: + g_object_set (object, "default-encoding", "", NULL); + } + break; + + case PROP_TOOLBAR_STYLE: + priv->toolbar_style = g_value_get_enum (value); + break; + case PROP_SMALL_TOOLBAR: + priv->small_toolbar = g_value_get_boolean (value); + break; + case PROP_SHOW_NEW_TAB: + priv->show_new_tab = g_value_get_boolean (value); + break; + case PROP_SHOW_WEB_SEARCH: + priv->show_web_search = g_value_get_boolean (value); + break; + case PROP_SHOW_TRASH: + priv->show_trash = g_value_get_boolean (value); + break; + case PROP_TAB_LABEL_SIZE: priv->tab_label_size = g_value_get_int (value); break; - case PROP_CLOSE_BUTTON: - priv->close_button = g_value_get_boolean (value); + case PROP_CLOSE_BUTTONS_ON_TABS: + priv->close_buttons_on_tabs = g_value_get_boolean (value); break; - case PROP_MIDDLE_CLICK_GOTO: - priv->middle_click_goto = g_value_get_boolean (value); + case PROP_OPEN_NEW_PAGES_IN: + priv->open_new_pages_in = g_value_get_enum (value); + break; + case PROP_MIDDLE_CLICK_OPENS_SELECTION: + priv->middle_click_opens_selection = g_value_get_boolean (value); + break; + case PROP_OPEN_TABS_IN_THE_BACKGROUND: + priv->open_tabs_in_the_background = g_value_get_boolean (value); + break; + case PROP_OPEN_POPUPS_IN_TABS: + priv->open_popups_in_tabs = g_value_get_boolean (value); + break; + + case PROP_ACCEPT_COOKIES: + priv->accept_cookies = g_value_get_enum (value); + break; + case PROP_ORIGINAL_COOKIES_ONLY: + priv->original_cookies_only = g_value_get_boolean (value); + break; + case PROP_MAXIMUM_COOKIE_AGE: + priv->maximum_cookie_age = g_value_get_int (value); + break; + + case PROP_REMEMBER_LAST_VISITED_PAGES: + priv->remember_last_visited_pages = g_value_get_boolean (value); + break; + case PROP_MAXIMUM_HISTORY_AGE: + priv->maximum_history_age = g_value_get_int (value); + break; + case PROP_REMEMBER_LAST_FORM_INPUTS: + priv->remember_last_form_inputs = g_value_get_boolean (value); + break; + case PROP_REMEMBER_LAST_DOWNLOADED_FILES: + priv->remember_last_downloaded_files = g_value_get_boolean (value); + break; + + case PROP_HTTP_PROXY: + katze_assign (priv->http_proxy, g_value_dup_string (value)); + g_setenv ("http_proxy", priv->http_proxy ? priv->http_proxy : "", TRUE); + break; + case PROP_CACHE_SIZE: + priv->cache_size = g_value_get_int (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -142,14 +632,88 @@ midori_web_settings_get_property (GObject* object, switch (prop_id) { + case PROP_LOAD_ON_STARTUP: + g_value_set_enum (value, priv->load_on_startup); + break; + case PROP_HOMEPAGE: + g_value_set_string (value, priv->homepage); + break; + case PROP_DOWNLOAD_FOLDER: + g_value_set_string (value, priv->download_folder); + break; + case PROP_SHOW_DOWNLOAD_NOTIFICATION: + g_value_set_boolean (value, priv->show_download_notification); + break; + case PROP_LOCATION_ENTRY_SEARCH: + g_value_set_string (value, priv->location_entry_search); + break; + case PROP_PREFERRED_ENCODING: + g_value_set_enum (value, priv->preferred_encoding); + break; + + case PROP_TOOLBAR_STYLE: + g_value_set_enum (value, priv->toolbar_style); + break; + case PROP_SMALL_TOOLBAR: + g_value_set_boolean (value, priv->small_toolbar); + break; + case PROP_SHOW_NEW_TAB: + g_value_set_boolean (value, priv->show_new_tab); + break; + case PROP_SHOW_WEB_SEARCH: + g_value_set_boolean (value, priv->show_web_search); + break; + case PROP_SHOW_TRASH: + g_value_set_boolean (value, priv->show_trash); + break; + case PROP_TAB_LABEL_SIZE: g_value_set_int (value, priv->tab_label_size); break; - case PROP_CLOSE_BUTTON: - g_value_set_boolean (value, priv->close_button); + case PROP_CLOSE_BUTTONS_ON_TABS: + g_value_set_boolean (value, priv->close_buttons_on_tabs); break; - case PROP_MIDDLE_CLICK_GOTO: - g_value_set_boolean (value, priv->middle_click_goto); + case PROP_OPEN_NEW_PAGES_IN: + g_value_set_enum (value, priv->open_new_pages_in); + break; + case PROP_MIDDLE_CLICK_OPENS_SELECTION: + g_value_set_boolean (value, priv->middle_click_opens_selection); + break; + case PROP_OPEN_TABS_IN_THE_BACKGROUND: + g_value_set_boolean (value, priv->open_tabs_in_the_background); + break; + case PROP_OPEN_POPUPS_IN_TABS: + g_value_set_boolean (value, priv->open_popups_in_tabs); + break; + + case PROP_ACCEPT_COOKIES: + g_value_set_enum (value, priv->accept_cookies); + break; + case PROP_ORIGINAL_COOKIES_ONLY: + g_value_set_boolean (value, priv->original_cookies_only); + break; + case PROP_MAXIMUM_COOKIE_AGE: + g_value_set_int (value, priv->maximum_cookie_age); + break; + + case PROP_REMEMBER_LAST_VISITED_PAGES: + g_value_set_boolean (value, priv->remember_last_visited_pages); + break; + case PROP_MAXIMUM_HISTORY_AGE: + g_value_set_int (value, priv->maximum_history_age); + break; + case PROP_REMEMBER_LAST_FORM_INPUTS: + g_value_set_boolean (value, priv->remember_last_form_inputs); + break; + case PROP_REMEMBER_LAST_DOWNLOADED_FILES: + g_value_set_boolean (value, priv->remember_last_downloaded_files); + break; + + case PROP_HTTP_PROXY: + g_value_set_string (value, priv->http_proxy); + break; + case PROP_CACHE_SIZE: + g_value_set_int (value, priv->cache_size); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -190,12 +754,41 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) MidoriWebSettingsPrivate* priv = web_settings->priv; MidoriWebSettings* copy; - copy = MIDORI_WEB_SETTINGS (webkit_web_settings_copy (WEBKIT_WEB_SETTINGS (web_settings))); + copy = MIDORI_WEB_SETTINGS (webkit_web_settings_copy ( + WEBKIT_WEB_SETTINGS (web_settings))); g_object_set (copy, - "tab-label-size", priv->tab_label_size, - "close-button", priv->close_button, - "middle-click-goto", priv->middle_click_goto, - NULL); + "load-on-startup", priv->load_on_startup, + "homepage", priv->homepage, + "download-folder", priv->download_folder, + "show-download-notification", priv->show_download_notification, + "location-entry-search", priv->location_entry_search, + "preferred-encoding", priv->preferred_encoding, + + "toolbar-style", priv->toolbar_style, + "small-toolbar", priv->small_toolbar, + "show-web-search", priv->show_web_search, + "show-new-tab", priv->show_new_tab, + "show-trash", priv->show_trash, + + "tab-label-size", priv->tab_label_size, + "close-buttons-on-tabs", priv->close_buttons_on_tabs, + "open-new-pages-in", priv->open_new_pages_in, + "middle-click-opens-selection", priv->middle_click_opens_selection, + "open-tabs-in-the-background", priv->open_tabs_in_the_background, + "open-popups-in-tabs", priv->open_popups_in_tabs, + + "accept-cookies", priv->accept_cookies, + "original-cookies-only", priv->original_cookies_only, + "maximum-cookie-age", priv->maximum_cookie_age, + + "remember-last-visited-pages", priv->remember_last_visited_pages, + "maximum-history-age", priv->maximum_history_age, + "remember-last-form-inputs", priv->remember_last_form_inputs, + "remember-last-downloaded-files", priv->remember_last_downloaded_files, + + "http-proxy", priv->http_proxy, + "cache-size", priv->cache_size, + NULL); return copy; } diff --git a/src/midori-websettings.h b/src/midori-websettings.h index 8ea40206..d08fafed 100644 --- a/src/midori-websettings.h +++ b/src/midori-websettings.h @@ -42,6 +42,76 @@ struct _MidoriWebSettings MidoriWebSettingsPrivate* priv; }; +typedef enum +{ + MIDORI_STARTUP_BLANK, + MIDORI_STARTUP_HOMEPAGE, + MIDORI_STARTUP_LAST_OPEN_PAGES +} MidoriStartup; + +GType +midori_startup_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_STARTUP \ + (midori_startup_get_type ()) + +typedef enum +{ + MIDORI_ENCODING_CHINESE, + MIDORI_ENCODING_JAPANESE, + MIDORI_ENCODING_RUSSIAN, + MIDORI_ENCODING_UNICODE, + MIDORI_ENCODING_WESTERN, + MIDORI_ENCODING_CUSTOM +} MidoriPreferredEncoding; + +GType +midori_preferred_encoding_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_PREFERRED_ENCODING \ + (midori_preferred_encoding_get_type ()) + +typedef enum +{ + MIDORI_NEW_PAGE_TAB, + MIDORI_NEW_PAGE_WINDOW, + MIDORI_NEW_PAGE_CURRENT +} MidoriNewPage; + +GType +midori_new_page_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_NEW_PAGE \ + (midori_new_page_get_type ()) + +typedef enum +{ + MIDORI_TOOLBAR_DEFAULT, + MIDORI_TOOLBAR_ICONS, + MIDORI_TOOLBAR_TEXT, + MIDORI_TOOLBAR_BOTH, + MIDORI_TOOLBAR_BOTH_HORIZ +} MidoriToolbarStyle; + +GType +midori_toolbar_style_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_TOOLBAR_STYLE \ + (midori_toolbar_style_get_type ()) + +typedef enum +{ + MIDORI_ACCEPT_COOKIES_ALL, + MIDORI_ACCEPT_COOKIES_SESSION, + MIDORI_ACCEPT_COOKIES_NONE +} MidoriAcceptCookies; + +GType +midori_accept_cookies_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_ACCEPT_COOKIES \ + (midori_accept_cookies_get_type ()) + struct _MidoriWebSettingsClass { WebKitWebSettingsClass parent_class; diff --git a/src/midori-webview.c b/src/midori-webview.c index d7958c83..9466d8d2 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -543,8 +543,8 @@ _midori_web_view_update_settings (MidoriWebView* web_view) g_object_get (G_OBJECT (priv->settings), "tab-label-size", &priv->tab_label_size, - "close-button", &priv->close_button, - "middle-click-goto", &priv->middle_click_goto, + "close-buttons-on-tabs", &priv->close_button, + "middle-click-opens-selection", &priv->middle_click_goto, NULL); } @@ -565,13 +565,13 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, priv->tab_label_size = g_value_get_int (&value); _midori_web_view_update_tab_label_size (web_view); } - else if (name == g_intern_string ("close-button")) + else if (name == g_intern_string ("close-buttons-on-tabs")) { priv->close_button = g_value_get_boolean (&value); if (priv->tab_close) sokoke_widget_set_visible (priv->tab_close, priv->close_button); } - else if (name == g_intern_string ("middle-click-goto")) + else if (name == g_intern_string ("middle-click-opens-selection")) priv->middle_click_goto = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) From f11b76b6efd20f520d26c7d5b7d616a2eea302f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Apr 2008 11:40:27 +0200 Subject: [PATCH 0064/2970] Remove unused signal pointers from settings. --- src/midori-websettings.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/midori-websettings.h b/src/midori-websettings.h index d08fafed..e322b4e3 100644 --- a/src/midori-websettings.h +++ b/src/midori-websettings.h @@ -118,31 +118,7 @@ struct _MidoriWebSettingsClass /* Signals */ void - (*progress_started) (MidoriWebSettings* web_settings, - guint progress); - void - (*progress_changed) (MidoriWebSettings* web_settings, - guint progress); - void - (*progress_done) (MidoriWebSettings* web_settings, - guint progress); - void - (*load_done) (MidoriWebSettings* web_settings, - WebKitWebFrame* frame); - void - (*statusbar_text_changed) (MidoriWebSettings* web_settings, - const gchar* text); - void - (*element_motion) (MidoriWebSettings* web_settings, - const gchar* link_uri); - void - (*close) (MidoriWebSettings* web_settings); - void - (*new_tab) (MidoriWebSettings* web_settings, - const gchar* uri); - void - (*new_window) (MidoriWebSettings* web_settings, - const gchar* uri); + (*dummy) (MidoriWebSettings* web_settings); }; GType From a9eb81a016adaddbd70e1a902f301df7c010ebb3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Apr 2008 21:21:39 +0200 Subject: [PATCH 0065/2970] Implement property proxy widget creation. The functions katze_property_proxy and katze_propery_label can intelligently create widgets that represent properties of a particular object. This allows for building up a configuration interface with few to no code dealing with specific settings. --- katze/katze-utils.c | 236 +++++++++++++++++++++++++++++++++++++++++++- katze/katze-utils.h | 13 ++- 2 files changed, 246 insertions(+), 3 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 620a5d01..ee8d41fd 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -10,3 +10,237 @@ */ #include "katze-utils.h" + +#include + +static void +proxy_toggle_button_toggled_cb (GtkToggleButton* button, GObject* object) +{ + gboolean toggled = gtk_toggle_button_get_active (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, toggled, NULL); +} + +static void +proxy_file_file_set_cb (GtkFileChooser* button, + GObject* object) +{ + const gchar* file = gtk_file_chooser_get_filename (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, file, NULL); +} + +static void +proxy_folder_file_set_cb (GtkFileChooser* button, + GObject* object) +{ + const gchar* file = gtk_file_chooser_get_current_folder (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, file, NULL); +} + +static void +proxy_uri_file_set_cb (GtkFileChooser* button, + GObject* object) +{ + const gchar* file = gtk_file_chooser_get_uri (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, file, NULL); +} + +static gboolean +proxy_entry_focus_out_event_cb (GtkEntry* entry, + GdkEventFocus* event, + GObject* object) +{ + const gchar* text = gtk_entry_get_text (entry); + const gchar* property = g_object_get_data (G_OBJECT (entry), "property"); + g_object_set (object, property, text, NULL); + return FALSE; +} + +static gboolean +proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) +{ + gdouble value = gtk_spin_button_get_value (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, value, NULL); + return FALSE; +} + +static gchar* +proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) +{ + gint value = gtk_combo_box_get_active (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, value, NULL); + return FALSE; +} + +/** + * katze_property_proxy: + * @object: a #GObject + * @property: the name of a property + * @hint: a special hint + * + * Create a widget of an appropriate type to represent the specified + * object's property. If the property is writable changes of the value + * through the widget will be reflected in the value of the property. + * + * Supported values for @hint are as follows: + * "blurb": the blurb of the property will be used to provide a kind + * of label, instead of the name. + * "file": the widget created will be particularly suitable for + * choosing an existing filename. + * "folder": the widget created will be particularly suitable for + * choosing an existing folder. + * "uri": the widget created will be particularly suitable for + * choosing an existing filename, encoded as an URI. + * + * Any other values for @hint are silently ignored. + * + * Return value: a new widget + **/ +GtkWidget* +katze_property_proxy (gpointer object, + const gchar* property, + const gchar* hint) +{ + g_return_val_if_fail (G_IS_OBJECT (object), NULL); + GObjectClass* class = G_OBJECT_GET_CLASS (object); + GParamSpec* pspec = g_object_class_find_property (class, property); + if (!pspec) + { + g_warning ("Property '%s' is invalid for %s", + property, G_OBJECT_CLASS_NAME (class)); + return gtk_label_new (property); + } + GType type = G_PARAM_SPEC_TYPE (pspec); + const gchar* nick = g_param_spec_get_nick (pspec); + const gchar* _hint = g_intern_string (hint); + if (_hint == g_intern_string ("blurb")) + nick = g_param_spec_get_blurb (pspec); + GtkWidget* widget; + const gchar* string; + if (type == G_TYPE_PARAM_BOOLEAN) + { + widget = gtk_check_button_new_with_label (nick); + gboolean toggled; + g_object_get (object, property, &toggled, NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); + g_signal_connect (widget, "toggled", + G_CALLBACK (proxy_toggle_button_toggled_cb), object); + } + else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) + { + widget = gtk_file_chooser_button_new (_("Choose file"), + GTK_FILE_CHOOSER_ACTION_OPEN); + g_object_get (object, property, &string, NULL); + if (!string) + string = G_PARAM_SPEC_STRING (pspec)->default_value; + gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), + string ? string : ""); + g_signal_connect (widget, "file-set", + G_CALLBACK (proxy_file_file_set_cb), object); + } + else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("folder")) + { + widget = gtk_file_chooser_button_new (_("Choose folder"), + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + g_object_get (object, property, &string, NULL); + if (!string) + string = G_PARAM_SPEC_STRING (pspec)->default_value; + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), + string ? string : ""); + g_signal_connect (widget, "file-set", + G_CALLBACK (proxy_folder_file_set_cb), object); + } + else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("uri")) + { + widget = gtk_file_chooser_button_new (_("Choose file"), + GTK_FILE_CHOOSER_ACTION_OPEN); + g_object_get (object, property, &string, NULL); + if (!string) + string = G_PARAM_SPEC_STRING (pspec)->default_value; + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (widget), + string ? string : ""); + g_signal_connect (widget, "file-set", + G_CALLBACK (proxy_uri_file_set_cb), object); + } + else if (type == G_TYPE_PARAM_STRING) + { + widget = gtk_entry_new (); + g_object_get (object, property, &string, NULL); + if (!string) + string = G_PARAM_SPEC_STRING (pspec)->default_value; + gtk_entry_set_text (GTK_ENTRY (widget), string ? string : ""); + g_signal_connect (widget, "focus-out-event", + G_CALLBACK (proxy_entry_focus_out_event_cb), object); + } + else if (type == G_TYPE_PARAM_INT) + { + widget = gtk_spin_button_new_with_range ( + G_PARAM_SPEC_INT (pspec)->minimum, + G_PARAM_SPEC_INT (pspec)->maximum, 1); + gdouble value; + g_object_get (object, property, &value, NULL); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); + g_signal_connect (widget, "changed", + G_CALLBACK (proxy_spin_button_changed_cb), object); + } + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS ( + g_type_class_ref (pspec->value_type)); + widget = gtk_combo_box_new_text (); + gint i = 0; + while (i < enum_class->n_values) + { + const gchar* label = enum_class->values[i].value_nick; + gtk_combo_box_append_text (GTK_COMBO_BOX (widget), label); + i++; + } + gint value; + g_object_get (object, property, &value, NULL); + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), value); + g_signal_connect (widget, "changed", + G_CALLBACK (proxy_combo_box_changed_cb), object); + g_type_class_unref (enum_class); + } + else + widget = gtk_label_new (nick); + + gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); + + g_object_set_data (G_OBJECT (widget), "property", (gchar*)property); + + return widget; +} + +/** + * katze_property_label: + * @object: a #GObject + * @property: the name of a property + * + * Create a label widget displaying the name of the specified object's property. + * + * Return value: a new label widget + **/ +GtkWidget* +katze_property_label (gpointer object, + const gchar* property) +{ + g_return_val_if_fail (G_IS_OBJECT (object), NULL); + GObjectClass* class = G_OBJECT_GET_CLASS (object); + GParamSpec* pspec = g_object_class_find_property (class, property); + if (!pspec) + { + g_warning ("Property '%s' is invalid for %s", + property, G_OBJECT_CLASS_NAME (class)); + return gtk_label_new (property); + } + const gchar* nick = g_param_spec_get_nick (pspec); + GtkWidget* widget = gtk_label_new (nick); + + return widget; +} diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 45dda897..c42267d6 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ #ifndef __KATZE_UTILS_H__ #define __KATZE_UTILS_H__ -#include +#include G_BEGIN_DECLS @@ -45,6 +45,15 @@ G_BEGIN_DECLS lvalue = rvalue; \ } +GtkWidget* +katze_property_proxy (gpointer object, + const gchar* property, + const gchar* hint); + +GtkWidget* +katze_property_label (gpointer object, + const gchar* property); + G_END_DECLS #endif /* __KATZE_UTILS_H__ */ From cdde1293ab559cb7067eea1ccead91d4666881fa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Apr 2008 21:51:43 +0200 Subject: [PATCH 0066/2970] Switch configuration to MidoriWebSettings. Switch configuration logic from a custom structure to fully rely on MidoriWebSettings. This includes revamping the preferences dialog. The old logic is not yet replaced completely, this will follow soon, thus several settings will have no effect right now. --- po/POTFILES.in | 1 + src/conf.c | 87 ------ src/main.c | 302 ++++++++++++------ src/midori-browser.c | 5 +- src/midori-trash.c | 22 +- src/midori-webview.c | 12 +- src/prefs.c | 722 ++++++++++--------------------------------- src/prefs.h | 7 +- src/sokoke.c | 12 + src/sokoke.h | 7 + 10 files changed, 399 insertions(+), 778 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index c6203f0b..acd019fe 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,6 +4,7 @@ midori.desktop.in src/conf.c src/helpers.c src/main.c +src/midori-console.c src/midori-browser.c src/midori-panel.c src/midori-trash.c diff --git a/src/conf.c b/src/conf.c index 91d12d29..d77a7323 100644 --- a/src/conf.c +++ b/src/conf.c @@ -34,58 +34,6 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error { GKeyFile* keyFile = g_key_file_new(); g_key_file_load_from_file(keyFile, filename, G_KEY_FILE_KEEP_COMMENTS, error); - /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL - , G_KEY_FILE_KEEP_COMMENTS, error);*/ - #define GET_INT(var, key, default) \ - var = sokoke_key_file_get_integer_default( \ - keyFile, "browser", key, default, NULL) - #define GET_STR(var, key, default) \ - var = sokoke_key_file_get_string_default( \ - keyFile, "browser", key, default, NULL) - GET_INT(config->startup, "Startup", CONFIG_STARTUP_HOMEPAGE); - GET_STR(config->homepage, "Homepage", "http://www.google.com"); - GET_STR(config->locationSearch, "LocationSearch", "http://www.google.com/search?q=%s"); - GET_INT(config->toolbarNavigation, "ToolbarNavigation", TRUE); - GET_INT(config->toolbarBookmarks, "ToolbarBookmarks", FALSE); - GET_INT(config->toolbarStatus, "ToolbarStatus", TRUE); - //GET_INT(config->toolbarTransfer, "ToolbarTransfer", FALSE); - GET_INT(config->toolbarStyle, "ToolbarStyle", CONFIG_TOOLBAR_DEFAULT); - GET_INT(config->toolbarSmall, "ToolbarSmall", FALSE); - GET_INT(config->toolbarWebSearch, "ToolbarWebSearch", TRUE); - GET_INT(config->toolbarNewTab, "ToolbarNewTab", TRUE); - GET_INT(config->toolbarClosedTabs, "ToolbarClosedTabs", TRUE); - GET_INT(config->panelShow, "PanelShow", FALSE); - GET_INT(config->panelActive, "PanelActive", 0); - GET_STR(config->panelPageholder, "PanelPageholder", "http://www.google.com"); - GET_INT(config->tabSize, "TabSize", 10); - GET_INT(config->tabClose, "TabClose", TRUE); - GET_INT(config->newPages, "NewPages", CONFIG_NEWPAGES_TAB_NEW); - GET_INT(config->openTabsInTheBackground, "OpenTabsInTheBackground", FALSE); - GET_INT(config->openPopupsInTabs, "OpenPopupsInTabs", FALSE); - GET_INT(config->middleClickGoto, "MiddleClickGoto", FALSE); - #undef GET_INT - #undef GET_STR - - #define GET_INT(var, key, default) \ - var = sokoke_key_file_get_integer_default( \ - keyFile, "content", key, default, NULL) - #define GET_STR(var, key, default) \ - var = sokoke_key_file_get_string_default( \ - keyFile, "content", key, default, NULL) - GET_STR(config->defaultFontFamily, "DefaultFontFamily", "Sans"); - GET_INT(config->defaultFontSize, "DefaultFontSize", 10); - GET_INT(config->minimumFontSize, "MinimumFontSize", 5); - GET_STR(config->defaultEncoding, "DefaultEncoding", "UTF-8"); - GET_INT(config->autoLoadImages, "AutoLoadImages", TRUE); - GET_INT(config->autoShrinkImages, "AutoShrinkImages", TRUE); - GET_INT(config->printBackgrounds, "PrintBackgrounds", FALSE); - GET_INT(config->resizableTextAreas, "ResizableTextAreas", FALSE); - GET_INT(config->userStylesheet, "UserStylesheet", FALSE); - GET_STR(config->userStylesheetUri, "UserStylesheetUri", ""); - GET_INT(config->enableScripts, "EnableScripts", TRUE); - GET_INT(config->enablePlugins, "EnablePlugins", TRUE); - #undef GET_INT - #undef GET_STR #define GET_INT(var, key, default) \ var = sokoke_key_file_get_integer_default( \ @@ -109,41 +57,6 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) { GKeyFile* keyFile = g_key_file_new(); - g_key_file_set_integer(keyFile, "browser", "Startup", config->startup); - g_key_file_set_string (keyFile, "browser", "Homepage", config->homepage); - g_key_file_set_string (keyFile, "browser", "LocationSearch", config->locationSearch); - g_key_file_set_integer(keyFile, "browser", "ToolbarNavigation", config->toolbarNavigation); - g_key_file_set_integer(keyFile, "browser", "ToolbarBookmarks", config->toolbarBookmarks); - //g_key_file_set_integer(keyFile, "browser", "ToolbarTransfers", config->toolbarTransfers); - g_key_file_set_integer(keyFile, "browser", "ToolbarStatus", config->toolbarStatus); - g_key_file_set_integer(keyFile, "browser", "ToolbarStyle", config->toolbarStyle); - g_key_file_set_integer(keyFile, "browser", "ToolbarSmall", config->toolbarSmall); - g_key_file_set_integer(keyFile, "browser", "ToolbarWebSearch", config->toolbarWebSearch); - g_key_file_set_integer(keyFile, "browser", "ToolbarNewTab", config->toolbarNewTab); - g_key_file_set_integer(keyFile, "browser", "ToolbarClosedTabs", config->toolbarClosedTabs); - g_key_file_set_integer(keyFile, "browser", "PanelShow", config->panelShow); - g_key_file_set_integer(keyFile, "browser", "PanelActive", config->panelActive); - g_key_file_set_string (keyFile, "browser", "PanelPageholder", config->panelPageholder); - g_key_file_set_integer(keyFile, "browser", "TabSize", config->tabSize); - g_key_file_set_integer(keyFile, "browser", "TabClose", config->tabClose); - g_key_file_set_integer(keyFile, "browser", "NewPages", config->newPages); - g_key_file_set_integer(keyFile, "browser", "OpenTabsInTheBackground", config->openTabsInTheBackground); - g_key_file_set_integer(keyFile, "browser", "OpenPopupsInTabs", config->openPopupsInTabs); - g_key_file_set_integer(keyFile, "browser", "MiddleClickGoto", config->middleClickGoto); - - g_key_file_set_string (keyFile, "content", "DefaultFontFamily", config->defaultFontFamily); - g_key_file_set_integer(keyFile, "content", "DefaultFontSize", config->defaultFontSize); - g_key_file_set_integer(keyFile, "content", "MinimumFontSize", config->minimumFontSize); - g_key_file_set_string (keyFile, "content", "DefaultEncoding", config->defaultEncoding); - g_key_file_set_integer(keyFile, "content", "AutoLoadImages", config->autoLoadImages); - g_key_file_set_integer(keyFile, "content", "AutoShrinkImages", config->autoShrinkImages); - g_key_file_set_integer(keyFile, "content", "PrintBackgrounds", config->printBackgrounds); - g_key_file_set_integer(keyFile, "content", "ResizableTextAreas", config->resizableTextAreas); - g_key_file_set_integer(keyFile, "content", "UserStylesheet", config->userStylesheet); - g_key_file_set_string (keyFile, "content", "UserStylesheetUri", config->userStylesheetUri); - g_key_file_set_integer(keyFile, "content", "EnableScripts", config->enableScripts); - g_key_file_set_integer(keyFile, "content", "EnablePlugins", config->enablePlugins); - g_key_file_set_integer(keyFile, "session", "RememberWinSize", config->rememberWinSize); g_key_file_set_integer(keyFile, "session", "WinWidth", config->winWidth); g_key_file_set_integer(keyFile, "session", "WinHeight", config->winHeight); diff --git a/src/main.c b/src/main.c index 061501f6..1ea8fdb6 100644 --- a/src/main.c +++ b/src/main.c @@ -133,17 +133,141 @@ locale_init (void) #endif } +static MidoriWebSettings* +settings_new_from_file (const gchar* filename) +{ + MidoriWebSettings* settings = midori_web_settings_new (); + GKeyFile* key_file = g_key_file_new (); + GError* error = NULL; + if (!g_key_file_load_from_file (key_file, filename, + G_KEY_FILE_KEEP_COMMENTS, &error)) + { + if (error->code != G_FILE_ERROR_NOENT) + printf (_("The configuration couldn't be loaded. %s\n"), + error->message); + g_error_free (error); + } + GObjectClass* class = G_OBJECT_GET_CLASS (settings); + guint i, n_properties; + GParamSpec** pspecs = g_object_class_list_properties (class, &n_properties); + for (i = 0; i < n_properties; i++) + { + GParamSpec* pspec = pspecs[i]; + if (!(pspec->flags & G_PARAM_WRITABLE)) + continue; + GType type = G_PARAM_SPEC_TYPE (pspec); + const gchar* property = g_param_spec_get_name (pspec); + if (type == G_TYPE_PARAM_STRING) + { + gchar* string = sokoke_key_file_get_string_default (key_file, + "settings", property, + G_PARAM_SPEC_STRING (pspec)->default_value, NULL); + g_object_set (settings, property, string, NULL); + g_free (string); + } + else if (type == G_TYPE_PARAM_INT) + { + guint integer = sokoke_key_file_get_integer_default (key_file, + "settings", property, + G_PARAM_SPEC_INT (pspec)->default_value, NULL); + g_object_set (settings, property, integer, NULL); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean boolean = sokoke_key_file_get_boolean_default (key_file, + "settings", property, + G_PARAM_SPEC_BOOLEAN (pspec)->default_value, NULL); + g_object_set (settings, property, boolean, NULL); + } + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS ( + g_type_class_ref (pspec->value_type)); + GEnumValue* enum_value = g_enum_get_value (enum_class, + G_PARAM_SPEC_ENUM (pspec)->default_value); + gchar* string = sokoke_key_file_get_string_default (key_file, + "settings", property, + enum_value->value_name, NULL); + enum_value = g_enum_get_value_by_name (enum_class, string); + g_object_set (settings, property, enum_value->value, NULL); + g_free (string); + g_type_class_unref (enum_class); + } + else + g_warning ("Unhandled settings property '%s'", property); + } + return settings; +} + +static gboolean +settings_save_to_file (MidoriWebSettings* settings, + const gchar* filename, + GError** error) +{ + GKeyFile* key_file = g_key_file_new (); + GObjectClass* class = G_OBJECT_GET_CLASS (settings); + guint i, n_properties; + GParamSpec** pspecs = g_object_class_list_properties (class, &n_properties); + for (i = 0; i < n_properties; i++) + { + GParamSpec* pspec = pspecs[i]; + GType type = G_PARAM_SPEC_TYPE (pspec); + const gchar* property = g_param_spec_get_name (pspec); + if (!(pspec->flags & G_PARAM_WRITABLE)) + { + gchar* comment = g_strdup_printf ("# %s", property); + g_key_file_set_string (key_file, "settings", comment, ""); + g_free (comment); + continue; + } + if (type == G_TYPE_PARAM_STRING) + { + const gchar* string; + g_object_get (settings, property, &string, NULL); + g_key_file_set_string (key_file, "settings", property, + string ? string : ""); + } + else if (type == G_TYPE_PARAM_INT) + { + gint integer; + g_object_get (settings, property, &integer, NULL); + g_key_file_set_integer (key_file, "settings", property, integer); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean boolean; + g_object_get (settings, property, &boolean, NULL); + g_key_file_set_boolean (key_file, "settings", property, boolean); + } + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS ( + g_type_class_ref (pspec->value_type)); + gint integer; + g_object_get (settings, property, &integer, NULL); + GEnumValue* enum_value = g_enum_get_value (enum_class, integer); + g_key_file_set_string (key_file, "settings", property, + enum_value->value_name); + } + else + g_warning ("Unhandled settings property '%s'", property); + } + gboolean saved = sokoke_key_file_save_to_file (key_file, filename, error); + g_key_file_free (key_file); + return saved; +} + int main(int argc, char** argv) { locale_init(); g_set_application_name(_("midori")); // Parse cli options - gint repeats = 2; gboolean version = FALSE; GOptionEntry entries[] = { - { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL } + { "version", 'v', 0, G_OPTION_ARG_NONE, &version, + N_("Display program version"), NULL } }; GError* error = NULL; @@ -179,75 +303,69 @@ int main(int argc, char** argv) } // Load configuration files - GString* errorMessages = g_string_new(NULL); - // TODO: What about default config in a global config folder? - gchar* configPath = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME, NULL); - g_mkdir_with_parents(configPath, 0755); - gchar* configFile = g_build_filename(configPath, "config", NULL); + GString* error_messages = g_string_new (NULL); + gchar* config_path = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, NULL); + g_mkdir_with_parents (config_path, 0755); + gchar* config_file = g_build_filename (config_path, "config", NULL); error = NULL; - /*CConfig* */config = config_new(); - if(!config_from_file(config, configFile, &error)) - { - if(error->code != G_FILE_ERROR_NOENT) - g_string_append_printf(errorMessages - , _("The configuration couldn't be loaded. %s\n"), error->message); - g_error_free(error); - } - g_free(configFile); - configFile = g_build_filename(configPath, "accels", NULL); - gtk_accel_map_load(configFile); - g_free(configFile); - configFile = g_build_filename(configPath, "search", NULL); + MidoriWebSettings* settings = settings_new_from_file (config_file); + webSettings = settings; + katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); + gtk_accel_map_load (config_file); + katze_assign (config_file, g_build_filename (config_path, "search", NULL)); error = NULL; - searchEngines = search_engines_new(); - if(!search_engines_from_file(&searchEngines, configFile, &error)) + searchEngines = search_engines_new (); + if (!search_engines_from_file (&searchEngines, config_file, &error)) { // FIXME: We may have a "file empty" error, how do we recognize that? - /*if(error->code != G_FILE_ERROR_NOENT) - g_string_append_printf(errorMessages - , _("The search engines couldn't be loaded. %s\n"), error->message);*/ - g_error_free(error); + /*if (error->code != G_FILE_ERROR_NOENT) + g_string_append_printf (error_messages, + _("The search engines couldn't be loaded. %s\n"), + error->message);*/ + g_error_free (error); } - g_free(configFile); - configFile = g_build_filename(configPath, "bookmarks.xbel", NULL); + katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel", + NULL)); bookmarks = katze_xbel_folder_new(); error = NULL; - if(!katze_xbel_folder_from_file(bookmarks, configFile, &error)) + if (!katze_xbel_folder_from_file (bookmarks, config_file, &error)) { - if(error->code != G_FILE_ERROR_NOENT) - g_string_append_printf(errorMessages - , _("The bookmarks couldn't be loaded. %s\n"), error->message); - g_error_free(error); + if (error->code != G_FILE_ERROR_NOENT) + g_string_append_printf (error_messages, + _("The bookmarks couldn't be loaded. %s\n"), error->message); + g_error_free (error); } - g_free(configFile); + g_free (config_file); KatzeXbelItem* _session = katze_xbel_folder_new(); + config = config_new (); if(config->startup == CONFIG_STARTUP_SESSION) { - configFile = g_build_filename(configPath, "session.xbel", NULL); + config_file = g_build_filename (config_path, "session.xbel", NULL); error = NULL; - if(!katze_xbel_folder_from_file(_session, configFile, &error)) + if (!katze_xbel_folder_from_file (_session, config_file, &error)) { - if(error->code != G_FILE_ERROR_NOENT) - g_string_append_printf(errorMessages - , _("The session couldn't be loaded. %s\n"), error->message); - g_error_free(error); + if (error->code != G_FILE_ERROR_NOENT) + g_string_append_printf (error_messages, + _("The session couldn't be loaded. %s\n"), error->message); + g_error_free (error); } - g_free(configFile); + g_free (config_file); } - configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); - KatzeXbelItem* xbel_trash = katze_xbel_folder_new(); + config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); + KatzeXbelItem* xbel_trash = katze_xbel_folder_new (); error = NULL; - if(!katze_xbel_folder_from_file(xbel_trash, configFile, &error)) + if (!katze_xbel_folder_from_file (xbel_trash, config_file, &error)) { - if(error->code != G_FILE_ERROR_NOENT) - g_string_append_printf(errorMessages - , _("The trash couldn't be loaded. %s\n"), error->message); - g_error_free(error); + if (error->code != G_FILE_ERROR_NOENT) + g_string_append_printf(error_messages, + _("The trash couldn't be loaded. %s\n"), error->message); + g_error_free (error); } - g_free(configFile); + g_free (config_file); // In case of errors - if(errorMessages->len) + if (error_messages->len) { GtkWidget* dialog = gtk_message_dialog_new(NULL , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE @@ -257,7 +375,7 @@ int main(int argc, char** argv) // FIXME: Use custom program icon gtk_window_set_icon_name(GTK_WINDOW(dialog), "web-browser"); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog) - , "%s", errorMessages->str); + , "%s", error_messages->str); gtk_dialog_add_buttons(GTK_DIALOG(dialog) , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL , "_Ignore", GTK_RESPONSE_ACCEPT @@ -269,14 +387,14 @@ int main(int argc, char** argv) katze_xbel_item_unref(bookmarks); katze_xbel_item_unref(_session); katze_xbel_item_unref(xbel_trash); - g_string_free(errorMessages, TRUE); + g_string_free(error_messages, TRUE); return 0; } gtk_widget_destroy(dialog); /* FIXME: Since we will overwrite files that could not be loaded , would we want to make backups? */ } - g_string_free(errorMessages, TRUE); + g_string_free (error_messages, TRUE); // TODO: Handle any number of separate uris from argv // Open as many tabs as we have uris, seperated by pipes @@ -301,36 +419,15 @@ int main(int argc, char** argv) katze_xbel_bookmark_set_href(item, config->homepage); katze_xbel_folder_prepend_item(_session, item); } - g_free(configPath); + g_free (config_path); stock_items_init(); - MidoriWebSettings* settings; - settings = g_object_new (MIDORI_TYPE_WEB_SETTINGS, - "default-font-family", config->defaultFontFamily, - "default-font-size", config->defaultFontSize, - "minimum-font-size", config->minimumFontSize, - "default-encoding", config->defaultEncoding, - "auto-load-images", config->autoLoadImages, - "auto-shrink-images", config->autoShrinkImages, - "print-backgrounds", config->printBackgrounds, - "resizable-text-areas", config->resizableTextAreas, - "user-stylesheet-uri", - config->userStylesheet ? - config->userStylesheetUri : NULL, - "enable-scripts", config->enableScripts, - "enable-plugins", config->enablePlugins, - "tab-label-size", config->tabSize, - "close-buttons-on-tabs", config->tabClose, - "middle-click-opens-selection", config->middleClickGoto, - NULL); - webSettings = settings; - MidoriTrash* trash = g_object_new (MIDORI_TYPE_TRASH, "limit", 10, NULL); - guint i; guint n = katze_xbel_folder_get_n_items (xbel_trash); + guint i; for (i = 0; i < n; i++) { KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); @@ -367,59 +464,58 @@ int main(int argc, char** argv) g_object_unref (accel_group); // Save configuration files - configPath = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME, NULL); - g_mkdir_with_parents(configPath, 0755); - configFile = g_build_filename(configPath, "search", NULL); + config_path = g_build_filename (g_get_user_config_dir(), PACKAGE_NAME, + NULL); + g_mkdir_with_parents (config_path, 0755); + config_file = g_build_filename (config_path, "search", NULL); error = NULL; - if(!search_engines_to_file(searchEngines, configFile, &error)) + if (!search_engines_to_file (searchEngines, config_file, &error)) { g_warning("The search engines couldn't be saved. %s", error->message); g_error_free(error); } search_engines_free(searchEngines); - g_free(configFile); - configFile = g_build_filename(configPath, "bookmarks.xbel", NULL); + g_free (config_file); + config_file = g_build_filename (config_path, "bookmarks.xbel", NULL); error = NULL; - if(!katze_xbel_folder_to_file(bookmarks, configFile, &error)) + if (!katze_xbel_folder_to_file (bookmarks, config_file, &error)) { g_warning("The bookmarks couldn't be saved. %s", error->message); g_error_free(error); } katze_xbel_item_unref(bookmarks); - g_free(configFile); - configFile = g_build_filename(configPath, "tabtrash.xbel", NULL); + g_free (config_file); + config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); error = NULL; - if (!katze_xbel_folder_to_file (xbel_trash, configFile, &error)) + if (!katze_xbel_folder_to_file (xbel_trash, config_file, &error)) { g_warning ("The trash couldn't be saved. %s", error->message); g_error_free (error); } katze_xbel_item_unref (xbel_trash); - g_free (configFile); if(config->startup == CONFIG_STARTUP_SESSION) { - configFile = g_build_filename(configPath, "session.xbel", NULL); + katze_assign (config_file, g_build_filename (config_path, + "session.xbel", NULL)); error = NULL; - if(!katze_xbel_folder_to_file(session, configFile, &error)) + if (!katze_xbel_folder_to_file (session, config_file, &error)) { - g_warning("The session couldn't be saved. %s", error->message); - g_error_free(error); + g_warning ("The session couldn't be saved. %s", error->message); + g_error_free (error); } - g_free(configFile); } - katze_xbel_item_unref(session); - configFile = g_build_filename(configPath, "config", NULL); + katze_xbel_item_unref (session); + katze_assign (config_file, g_build_filename (config_path, "config", NULL)); error = NULL; - if(!config_to_file(config, configFile, &error)) + if (!settings_save_to_file (settings, config_file, &error)) { - g_warning("The configuration couldn't be saved. %s", error->message); - g_error_free(error); + g_warning ("The configuration couldn't be saved. %s", error->message); + g_error_free (error); } - config_free(config); - g_free(configFile); - configFile = g_build_filename(configPath, "accels", NULL); - gtk_accel_map_save(configFile); - g_free(configFile); - g_free(configPath); + config_free (config); + katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); + gtk_accel_map_save (config_file); + g_free (config_file); + g_free (config_path); return 0; } diff --git a/src/midori-browser.c b/src/midori-browser.c index 62f98b5b..57fac4e8 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -867,7 +867,10 @@ _action_preferences_activate (GtkAction* action, gtk_window_present (GTK_WINDOW (dialog)); else { - dialog = prefs_preferences_dialog_new (browser); + MidoriBrowserPrivate* priv = browser->priv; + + dialog = prefs_preferences_dialog_new (GTK_WINDOW (browser), + priv->settings); gtk_widget_show (dialog); } } diff --git a/src/midori-trash.c b/src/midori-trash.c index 26573fa2..efc2d312 100644 --- a/src/midori-trash.c +++ b/src/midori-trash.c @@ -46,21 +46,21 @@ static void midori_trash_finalize (GObject* object); static void -midori_trash_set_property (GObject* object, - guint prop_id, +midori_trash_set_property (GObject* object, + guint prop_id, const GValue* value, - GParamSpec* pspec); + GParamSpec* pspec); static void -midori_trash_get_property (GObject* object, - guint prop_id, - GValue* value, +midori_trash_get_property (GObject* object, + guint prop_id, + GValue* value, GParamSpec* pspec); static void midori_trash_class_init (MidoriTrashClass* class) { - signals[INSERTED] = g_signal_new( + signals[INSERTED] = g_signal_new ( "inserted", G_TYPE_FROM_CLASS(class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), @@ -71,7 +71,7 @@ midori_trash_class_init (MidoriTrashClass* class) G_TYPE_NONE, 1, G_TYPE_UINT); - signals[REMOVED] = g_signal_new( + signals[REMOVED] = g_signal_new ( "removed", G_TYPE_FROM_CLASS(class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), @@ -288,8 +288,8 @@ midori_trash_prepend_xbel_item (MidoriTrash* trash, * Nothing happens if the function fails. **/ void -midori_trash_remove_nth_item (MidoriTrash* trash, - guint n) +midori_trash_remove_nth_item (MidoriTrash* trash, + guint n) { g_return_if_fail (MIDORI_IS_TRASH (trash)); @@ -310,7 +310,7 @@ midori_trash_remove_nth_item (MidoriTrash* trash, * Deletes all items currently contained in @trash. **/ void -midori_trash_empty (MidoriTrash* trash) +midori_trash_empty (MidoriTrash* trash) { g_return_if_fail (MIDORI_IS_TRASH (trash)); diff --git a/src/midori-webview.c b/src/midori-webview.c index 9466d8d2..77f319c3 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -14,7 +14,7 @@ #include "global.h" #include "sokoke.h" -#include +#include #include // This is unstable API, so we need to declare it @@ -38,7 +38,7 @@ struct _MidoriWebViewPrivate gint tab_label_size; gboolean close_button; - gboolean middle_click_goto; + gboolean middle_click_opens_selection; MidoriWebSettings* settings; GtkWidget* proxy_menu_item; @@ -419,7 +419,7 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, { MidoriWebViewPrivate* priv = web_view->priv; - if (event->button == 2 && priv->middle_click_goto) + if (event->button == 2 && priv->middle_click_opens_selection) { GdkModifierType state = (GdkModifierType) event->state; GtkClipboard* clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); @@ -544,7 +544,7 @@ _midori_web_view_update_settings (MidoriWebView* web_view) g_object_get (G_OBJECT (priv->settings), "tab-label-size", &priv->tab_label_size, "close-buttons-on-tabs", &priv->close_button, - "middle-click-opens-selection", &priv->middle_click_goto, + "middle-click-opens-selection", &priv->middle_click_opens_selection, NULL); } @@ -572,7 +572,7 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, sokoke_widget_set_visible (priv->tab_close, priv->close_button); } else if (name == g_intern_string ("middle-click-opens-selection")) - priv->middle_click_goto = g_value_get_boolean (&value); + priv->middle_click_opens_selection = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning("Unexpected setting '%s'", name); @@ -591,7 +591,7 @@ midori_web_view_init (MidoriWebView* web_view) priv->settings = midori_web_settings_new (); _midori_web_view_update_settings (web_view); g_signal_connect (priv->settings, "notify", - G_CALLBACK(midori_web_view_settings_notify), web_view); + G_CALLBACK (midori_web_view_settings_notify), web_view); WebKitWebFrame* web_frame; web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); diff --git a/src/prefs.c b/src/prefs.c index 1dea73ed..ffdee1fe 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -12,258 +12,26 @@ #include "prefs.h" #include "helpers.h" -#include "global.h" #include "sokoke.h" +#include #include #include -static gboolean on_prefs_homepage_focus_out(GtkWidget* widget - , GdkEventFocus event, CPrefs* prefs) +static void +clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser) { - katze_assign(config->homepage, g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)))); - return FALSE; + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_chooser), ""); + // Emit "file-set" manually for Gtk doesn't emit it otherwise + g_signal_emit_by_name (file_chooser, "file-set"); } -static void on_prefs_loadonstartup_changed(GtkWidget* widget, CPrefs* prefs) -{ - config->startup = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); -} - -static void on_prefs_defaultFont_changed(GtkWidget* widget, CPrefs* prefs) -{ - const gchar* font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget)); - gchar** components = g_strsplit(font, " ", 0); - guint i, n = g_strv_length(components) - 1; - GString* fontName = g_string_new(NULL); - for(i = 0; i < n; i++) - g_string_append_printf(fontName, "%s ", components[i]); - katze_assign(config->defaultFontFamily, g_string_free(fontName, FALSE)); - config->defaultFontSize = atoi(components[n]); - g_strfreev(components); - g_object_set(webSettings, "default-font-family", config->defaultFontFamily - , "default-font-size", config->defaultFontSize, NULL); -} - -static void on_prefs_minimumFontSize_changed(GtkWidget* widget, CPrefs* prefs) -{ - config->minimumFontSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); - g_object_set(webSettings, "minimum-font-size", config->minimumFontSize, NULL); -} - -static void on_prefs_defaultEncoding_changed(GtkWidget* widget, CPrefs* prefs) -{ - gchar* encoding; - switch(gtk_combo_box_get_active(GTK_COMBO_BOX(widget))) - { - case 0: - encoding = g_strdup("BIG5"); - break; - case 1: - encoding = g_strdup("SHIFT_JIS"); - break; - case 2: - encoding = g_strdup("KOI8-R"); - break; - case 3: - encoding = g_strdup("UTF-8"); - break; - case 4: - encoding = g_strdup("ISO-8859-1"); - break; - default: - encoding = g_strdup("UTF-8"); - g_warning("Invalid default encoding"); - } - katze_assign(config->defaultEncoding, encoding); - g_object_set(webSettings, "default-encoding", config->defaultEncoding, NULL); -} - -static void on_prefs_newpages_changed(GtkWidget* widget, CPrefs* prefs) -{ - config->newPages = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); -} - -void on_prefs_middleClickGoto_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->middleClickGoto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); -} - -void on_prefs_openTabsInTheBackground_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->openTabsInTheBackground = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); -} - -static void on_prefs_openPopupsInTabs_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->openPopupsInTabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); -} - -static void on_prefs_loadImagesAutomatically_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->autoLoadImages = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "auto-load-images", config->autoLoadImages, NULL); -} - -static void on_prefs_shrinkImagesToFit_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->autoShrinkImages = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "auto-shrink-images", config->autoShrinkImages, NULL); -} - -static void on_prefs_printBackgrounds_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->printBackgrounds = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "print-backgrounds", config->printBackgrounds, NULL); -} - -static void on_prefs_resizableTextAreas_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->resizableTextAreas = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "resizable-text-areas", config->resizableTextAreas, NULL); -} - -static void on_prefs_enableJavaScript_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->enableScripts = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "enable-scripts", config->enableScripts, NULL); -} - -static void on_prefs_enablePlugins_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->enablePlugins = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "enable-plugins", config->enablePlugins, NULL); -} - -static void on_prefs_userStylesheet_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->userStylesheet = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - gtk_widget_set_sensitive(prefs->userStylesheetUri, config->userStylesheet); - const gchar* uri = config->userStylesheet ? config->userStylesheetUri : ""; - g_object_set(webSettings, "user-stylesheet-uri", uri, NULL); -} - -static void on_prefs_userStylesheetUri_file_set(GtkWidget* widget, CPrefs* prefs) -{ - katze_assign(config->userStylesheetUri, g_strdup(gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(widget)))); - g_object_set(webSettings, "user-stylesheet-uri", config->userStylesheetUri, NULL); -} - -static void on_prefs_toolbarstyle_changed(GtkWidget* widget, CPrefs* prefs) -{ - config->toolbarStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - /*gtk_toolbar_set_style(GTK_TOOLBAR(prefs->browser->navibar) - , config_to_toolbarstyle(config->toolbarStyle));*/ -} - -static void on_prefs_toolbarSmall_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->toolbarSmall = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - /*gtk_toolbar_set_icon_size(GTK_TOOLBAR(prefs->browser->navibar) - , config_to_toolbariconsize(config->toolbarSmall));*/ -} - -static void on_prefs_tabClose_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->tabClose = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - g_object_set(webSettings, "close-button", config->tabClose, NULL); -} - -static void on_prefs_tabSize_changed(GtkWidget* widget, CPrefs* prefs) -{ - config->tabSize = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); - g_object_set(webSettings, "tab-label-size", config->tabSize, NULL); -} - -static void on_prefs_toolbarWebSearch_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->toolbarWebSearch = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - //sokoke_widget_set_visible(prefs->browser->webSearch, config->toolbarWebSearch); -} - -static void on_prefs_toolbarNewTab_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->toolbarNewTab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - //sokoke_widget_set_visible(prefs->browser->newTab, config->toolbarNewTab); -} - -static void on_prefs_toolbarClosedTabs_toggled(GtkWidget* widget, CPrefs* prefs) -{ - config->toolbarClosedTabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - //sokoke_widget_set_visible(prefs->browser->closedTabs, config->toolbarClosedTabs); -} - -static gboolean on_prefs_locationsearch_focus_out(GtkWidget* widget - , GdkEventFocus event, CPrefs* prefs) -{ - katze_assign(config->locationSearch, g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)))); - return FALSE; -} - -static void on_prefs_protocols_render_icon(GtkTreeViewColumn* column - , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, CPrefs* prefs) -{ - gchar* command; - gtk_tree_model_get(model, iter, PROTOCOLS_COL_COMMAND, &command, -1); - - // TODO: Would it be better, to not do this on every redraw? - // Determine the actual binary to be able to display an icon - gchar* binary = NULL; - if(command) - binary = strtok(command, " "); - if(binary) - { - gchar* path; - if((path = g_find_program_in_path(binary))) - { - GdkScreen* screen = gtk_widget_get_screen(prefs->treeview); - if(!screen) - screen = gdk_screen_get_default(); - GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen(screen); - if(g_path_is_absolute(binary)) - { - g_free(path); path = g_path_get_basename(binary); - } - // TODO: Is it good to just display nothing if there is no icon? - if(!gtk_icon_theme_has_icon(icon_theme, binary)) - binary = NULL; - #if GTK_CHECK_VERSION(2, 10, 0) - g_object_set(renderer, "icon-name", binary, NULL); - #else - GdkPixbuf* icon = binary != NULL - ? gtk_icon_theme_load_icon(gtk_icon_theme_get_default() - , binary, GTK_ICON_SIZE_MENU, 0, NULL) : NULL; - g_object_set(renderer, "pixbuf", icon, NULL); - if(icon) - g_object_unref(icon); - #endif - g_free(path); - } - else - { - #if GTK_CHECK_VERSION(2, 10, 0) - g_object_set(renderer, "icon-name", NULL, NULL); - #endif - g_object_set(renderer, "stock-id", GTK_STOCK_DIALOG_ERROR, NULL); - } - } - else - { - // We need to reset the icon - #if GTK_CHECK_VERSION(2, 10, 0) - g_object_set(renderer, "icon-name", NULL, NULL); - #else - g_object_set(renderer, "stock-id", NULL, NULL); - #endif - } - g_free(command); -} - -GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) +GtkWidget* prefs_preferences_dialog_new (GtkWindow* window, + MidoriWebSettings* settings) { gchar* dialogTitle = g_strdup_printf(_("%s Preferences"), g_get_application_name()); GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle - , GTK_WINDOW(browser) + , window , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR , GTK_STOCK_HELP, GTK_RESPONSE_HELP , GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE @@ -274,7 +42,6 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); CPrefs* prefs = g_new0(CPrefs, 1); - prefs->browser = browser; g_signal_connect(dialog, "response", G_CALLBACK(g_free), prefs); // TODO: Do we want tooltips for explainations or can we omit that? @@ -282,17 +49,16 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) // TODO: Take multiple windows into account when applying changes GtkWidget* xfce_heading; if((xfce_heading = sokoke_xfce_header_new( - gtk_window_get_icon_name(GTK_WINDOW(browser)), dialogTitle))) + gtk_window_get_icon_name(window), dialogTitle))) gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) , xfce_heading, FALSE, FALSE, 0); g_free(dialogTitle); GtkWidget* notebook = gtk_notebook_new(); gtk_container_set_border_width(GTK_CONTAINER(notebook), 6); GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - GtkSizeGroup* sizegroup2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); GtkWidget* page; GtkWidget* frame; GtkWidget* table; GtkWidget* align; - GtkWidget* button; GtkWidget* checkbutton; GtkWidget* colorbutton; - GtkWidget* combobox; GtkWidget* entry; GtkWidget* hbox; GtkWidget* spinbutton; + GtkWidget* label; GtkWidget* button; + GtkWidget* entry; GtkWidget* hbox; #define PAGE_NEW(__label) page = gtk_vbox_new(FALSE, 0);\ gtk_container_set_border_width(GTK_CONTAINER(page), 5);\ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(__label)) @@ -315,342 +81,166 @@ GtkWidget* prefs_preferences_dialog_new(MidoriBrowser* browser) gtk_container_add(GTK_CONTAINER(align), __widget);\ gtk_size_group_add_widget(sizegroup, align);\ WIDGET_ADD(align, __left, __right, __top, __bottom) - #define SEMI_INDENTED_ADD(__widget, __left, __right, __top, __bottom)\ - align = gtk_alignment_new(0, 0.5, 0, 0);\ - gtk_container_add(GTK_CONTAINER(align), __widget);\ - gtk_size_group_add_widget(sizegroup2, align);\ - WIDGET_ADD(align, __left, __right, __top, __bottom) #define SPANNED_ADD(__widget, __left, __right, __top, __bottom)\ align = gtk_alignment_new(0, 0.5, 0, 0);\ gtk_container_add(GTK_CONTAINER(align), __widget);\ FILLED_ADD(align, __left, __right, __top, __bottom) // Page "General" - PAGE_NEW(_("General")); - FRAME_NEW(_("Startup")); - TABLE_NEW(2, 2); - INDENTED_ADD(gtk_label_new(_("Load on startup")), 0, 1, 0, 1); - combobox = gtk_combo_box_new_text(); - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , _("Blank page"), _("Homepage"), _("Last open pages"), NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->startup); - g_signal_connect(combobox, "changed" - , G_CALLBACK(on_prefs_loadonstartup_changed), prefs); - FILLED_ADD(combobox, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new(_("Homepage")), 0, 1, 1, 2); - entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry), config->homepage); - g_signal_connect(entry, "focus-out-event" - , G_CALLBACK(on_prefs_homepage_focus_out), prefs); - FILLED_ADD(entry, 1, 2, 1, 2); + PAGE_NEW (_("General")); + FRAME_NEW (_("Startup")); + TABLE_NEW (2, 2); + label = katze_property_label (settings, "load-on-startup"); + INDENTED_ADD (label, 0, 1, 0, 1); + button = katze_property_proxy (settings, "load-on-startup", NULL); + FILLED_ADD (button, 1, 2, 0, 1); + label = katze_property_label (settings, "homepage"); + INDENTED_ADD (label, 0, 1, 1, 2); + entry = katze_property_proxy (settings, "homepage", NULL); + FILLED_ADD (entry, 1, 2, 1, 2); // TODO: We need something like "use current website" - FRAME_NEW(_("Transfers")); - TABLE_NEW(1, 2); - INDENTED_ADD(gtk_label_new(_("Download folder")), 0, 1, 0, 1); - GtkWidget* filebutton = gtk_file_chooser_button_new( - _("Choose downloaded files folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); - // FIXME: The default should probably be ~/Desktop - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filebutton) - , g_get_home_dir()); //... - gtk_widget_set_sensitive(filebutton, FALSE); //... - FILLED_ADD(filebutton, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic - (_("Show a notification window for finished transfers")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 2, 1, 2); - FRAME_NEW(_("Languages")); - TABLE_NEW(1, 2); - INDENTED_ADD(gtk_label_new(_("Preferred languages")), 0, 1, 0, 1); - entry = gtk_entry_new(); - // TODO: Make sth like get_browser_languages_default filtering encodings and C out - // TODO: Provide a real ui with real language names (iso-codes) - const gchar* const* sLanguages = g_get_language_names(); - gchar* sLanguagesPreferred = g_strjoinv(",", (gchar**)sLanguages); - gtk_entry_set_text(GTK_ENTRY(entry), sLanguagesPreferred/*config->sLanguagesPreferred*/); - g_free(sLanguagesPreferred); - gtk_widget_set_sensitive(entry, FALSE); //... - FILLED_ADD(entry, 1, 2, 0, 1); + FRAME_NEW (_("Transfers")); + TABLE_NEW (1, 2); + label = katze_property_label (settings, "download-folder"); + INDENTED_ADD (label, 0, 1, 0, 1); + button = katze_property_proxy (settings, "download-folder", "folder"); + FILLED_ADD (button, 1, 2, 0, 1); + button = katze_property_proxy (settings, "show-download-notification", "blurb"); + SPANNED_ADD (button, 0, 2, 1, 2); // Page "Appearance" - PAGE_NEW(_("Appearance")); - FRAME_NEW(_("Font settings")); - TABLE_NEW(5, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("Default _font")), 0, 1, 0, 1); - gchar* defaultFont = g_strdup_printf("%s %d" - , config->defaultFontFamily, config->defaultFontSize); - button = gtk_font_button_new_with_font(defaultFont); - g_free(defaultFont); - g_signal_connect(button, "font-set", G_CALLBACK(on_prefs_defaultFont_changed), prefs); - FILLED_ADD(button, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Minimum font size")), 0, 1, 1, 2); - hbox = gtk_hbox_new(FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(1, G_MAXINT, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->minimumFontSize); - g_signal_connect(spinbutton, "value-changed" - , G_CALLBACK(on_prefs_minimumFontSize_changed), prefs); - gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - button = gtk_button_new_with_mnemonic(_("_Advanced")); - gtk_widget_set_sensitive(button, FALSE); //... - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); - FILLED_ADD(hbox, 1, 2, 1, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("Default _encoding")), 0, 1, 2, 3); - combobox = gtk_combo_box_new_text(); - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , _("Chinese (BIG5)"), _("Japanese (SHIFT_JIS)"), _("Russian (KOI8-R)") - , _("Unicode (UTF-8)"), _("Western (ISO-8859-1)"), NULL); - if(!strcmp(config->defaultEncoding, "BIG5")) - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); - else if(!strcmp(config->defaultEncoding, "SHIFT_JIS")) - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); - else if(!strcmp(config->defaultEncoding, "KOI8-R")) - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 2); - else if(!strcmp(config->defaultEncoding, "UTF-8")) - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 3); - else if(!strcmp(config->defaultEncoding, "ISO-8859-1")) - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 4); - // FIXME: Provide a 'Custom' item - g_signal_connect(combobox, "changed" - , G_CALLBACK(on_prefs_defaultEncoding_changed), prefs); - FILLED_ADD(combobox, 1, 2, 2, 3); - button = gtk_button_new_with_label(_("Advanced settings")); - gtk_widget_set_sensitive(button, FALSE); //... - WIDGET_ADD(button, 1, 2, 2, 3); - FRAME_NEW(_("Default colors")); - TABLE_NEW(2, 4); - SEMI_INDENTED_ADD(gtk_label_new(_("Text color")), 0, 1, 0, 1); - colorbutton = gtk_color_button_new(); - gtk_widget_set_sensitive(colorbutton, FALSE); //... - WIDGET_ADD(colorbutton, 1, 2, 0, 1); - SEMI_INDENTED_ADD(gtk_label_new(_("Background color")), 2, 3, 0, 1); - colorbutton = gtk_color_button_new(); - gtk_widget_set_sensitive(colorbutton, FALSE); //... - WIDGET_ADD(colorbutton, 3, 4, 0, 1); - SEMI_INDENTED_ADD(gtk_label_new(_("Link color")), 0, 1, 1, 2); - colorbutton = gtk_color_button_new(); - gtk_widget_set_sensitive(colorbutton, FALSE); //... - WIDGET_ADD(colorbutton, 1, 2, 1, 2); - SEMI_INDENTED_ADD(gtk_label_new(_("Visited link color")), 2, 3, 1, 2); - colorbutton = gtk_color_button_new(); - gtk_widget_set_sensitive(colorbutton, FALSE); //... - WIDGET_ADD(colorbutton, 3, 4, 1, 2); + PAGE_NEW (_("Appearance")); + FRAME_NEW (_("Font settings")); + TABLE_NEW (5, 2); + label = katze_property_label (settings, "default-font-family"); + INDENTED_ADD (label, 0, 1, 0, 1); + hbox = gtk_hbox_new (FALSE, 4); + button = katze_property_proxy (settings, "default-font-family", NULL); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); + entry = katze_property_proxy (settings, "default-font-size", NULL); + gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); + FILLED_ADD (hbox, 1, 2, 0, 1); + label = katze_property_label (settings, "minimum-font-size"); + INDENTED_ADD (label, 0, 1, 1, 2); + hbox = gtk_hbox_new (FALSE, 4); + entry = katze_property_proxy (settings, "minimum-font-size", NULL); + INDENTED_ADD (entry, 1, 2, 1, 2); + label = katze_property_label (settings, "preferred-encoding"); + INDENTED_ADD (label, 0, 1, 2, 3); + button = katze_property_proxy (settings, "preferred-encoding", NULL); + FILLED_ADD (button, 1, 2, 2, 3); // Page "Behavior" - PAGE_NEW(_("Behavior")); - FRAME_NEW(_("Browsing")); - TABLE_NEW(3, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("Open _new pages in")), 0, 1, 0, 1); - combobox = gtk_combo_box_new_text(); - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , _("New tab"), _("New window"), _("Current tab"), NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->newPages); - g_signal_connect(combobox, "changed", G_CALLBACK(on_prefs_newpages_changed), prefs); - gtk_widget_set_sensitive(combobox, FALSE); //... - FILLED_ADD(combobox, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic(_("_Middle click opens selection")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->middleClickGoto); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_middleClickGoto_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Open tabs in the _background")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openTabsInTheBackground); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_openTabsInTheBackground_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Open popups in _tabs")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->openPopupsInTabs); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_openPopupsInTabs_toggled), prefs); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 2, 2, 3); - FRAME_NEW(_("Features")); - TABLE_NEW(4, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Load _images")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoLoadImages); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_loadImagesAutomatically_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic(_("_Shrink images to fit")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->autoShrinkImages); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_shrinkImagesToFit_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic(_("Print _backgrounds")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->printBackgrounds); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_printBackgrounds_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("_Resizable textareas")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->resizableTextAreas); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_resizableTextAreas_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Enable _scripts")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enableScripts); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_enableJavaScript_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 2, 3); - checkbutton = gtk_check_button_new_with_mnemonic(_("Enable _plugins")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->enablePlugins); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_enablePlugins_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 2, 3); - checkbutton = gtk_check_button_new_with_mnemonic(_("_User Stylesheet")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->userStylesheet); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_userStylesheet_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 3, 4); - filebutton = gtk_file_chooser_button_new( - _("Choose user stylesheet"), GTK_FILE_CHOOSER_ACTION_OPEN); - prefs->userStylesheetUri = filebutton; - gtk_file_chooser_set_uri(GTK_FILE_CHOOSER(filebutton), config->userStylesheetUri); - g_signal_connect(filebutton, "file-set" - , G_CALLBACK(on_prefs_userStylesheetUri_file_set), prefs); - gtk_widget_set_sensitive(filebutton, config->userStylesheet); - FILLED_ADD(filebutton, 1, 2, 3, 4); + PAGE_NEW (_("Behavior")); + FRAME_NEW (_("Features")); + TABLE_NEW (5, 2); + button = katze_property_proxy (settings, "auto-load-images", NULL); + INDENTED_ADD (button, 0, 1, 0, 1); + button = katze_property_proxy (settings, "auto-shrink-images", NULL); + SPANNED_ADD (button, 1, 2, 0, 1); + button = katze_property_proxy (settings, "print-backgrounds", NULL); + INDENTED_ADD (button, 0, 1, 1, 2); + button = katze_property_proxy (settings, "resizable-text-areas", NULL); + SPANNED_ADD (button, 1, 2, 1, 2); + button = katze_property_proxy (settings, "enable-scripts", NULL); + INDENTED_ADD (button, 0, 1, 2, 3); + button = katze_property_proxy (settings, "enable-plugins", NULL); + SPANNED_ADD(button, 1, 2, 2, 3); + label = katze_property_label (settings, "user-stylesheet-uri"); + INDENTED_ADD (label, 0, 1, 3, 4); + hbox = gtk_hbox_new (FALSE, 4); + entry = katze_property_proxy (settings, "user-stylesheet-uri", "uri"); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + button = gtk_button_new (); + gtk_container_add (GTK_CONTAINER (button), + gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU)); + g_signal_connect (button, "clicked", + G_CALLBACK (clear_button_clicked_cb), entry); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); + FILLED_ADD (hbox, 1, 2, 3, 4); + label = katze_property_label (settings, "location-entry-search"); + INDENTED_ADD (label, 0, 1, 4, 5); + entry = katze_property_proxy (settings, "location-entry-search", NULL); + FILLED_ADD (entry, 1, 2, 4, 5); // Page "Interface" - PAGE_NEW(_("Interface")); - FRAME_NEW(_("Navigationbar")); - TABLE_NEW(3, 2); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Toolbar style")), 0, 1, 0, 1); - combobox = gtk_combo_box_new_text(); - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , _("Default"), _("Icons"), _("Text"), _("Both"), _("Both horizontal"), NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), config->toolbarStyle); - g_signal_connect(combobox, "changed" - , G_CALLBACK(on_prefs_toolbarstyle_changed), prefs); - FILLED_ADD(combobox, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic(_("Show small _icons")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarSmall); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_toolbarSmall_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Show Web_search")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarWebSearch); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_toolbarWebSearch_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Show _New Tab")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarNewTab); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_toolbarNewTab_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 2, 3); - checkbutton = gtk_check_button_new_with_mnemonic(_("Show _Trash")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->toolbarClosedTabs); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_toolbarClosedTabs_toggled), prefs); - SPANNED_ADD(checkbutton, 1, 2, 2, 3); - FRAME_NEW(_("Miscellaneous")); - TABLE_NEW(2, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Close _buttons on tabs")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), config->tabClose); - g_signal_connect(checkbutton, "toggled" - , G_CALLBACK(on_prefs_tabClose_toggled), prefs); - INDENTED_ADD(checkbutton, 0, 1, 0, 1); - hbox = gtk_hbox_new(FALSE, 4); - gtk_box_pack_start(GTK_BOX(hbox) - , gtk_label_new_with_mnemonic(_("Tab Si_ze")), FALSE, FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(0, 36, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), config->tabSize); - g_signal_connect(spinbutton, "changed" - , G_CALLBACK(on_prefs_tabSize_changed), prefs); - gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - FILLED_ADD(hbox, 1, 2, 0, 1); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Location search engine")), 0, 1, 1, 2); - entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(entry), config->locationSearch); - g_signal_connect(entry, "focus-out-event" - , G_CALLBACK(on_prefs_locationsearch_focus_out), prefs); - FILLED_ADD(entry, 1, 2, 1, 2); + PAGE_NEW (_("Interface")); + FRAME_NEW (_("Navigationbar")); + TABLE_NEW (3, 2); + INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); + button = katze_property_proxy (settings, "toolbar-style", NULL); + FILLED_ADD(button, 1, 2, 0, 1); + button = katze_property_proxy (settings, "small-toolbar", NULL); + INDENTED_ADD (button, 0, 1, 1, 2); + button = katze_property_proxy (settings, "show-web-search", NULL); + SPANNED_ADD (button, 1, 2, 1, 2); + button = katze_property_proxy (settings, "show-new-tab", NULL); + INDENTED_ADD (button, 0, 1, 2, 3); + button = katze_property_proxy (settings, "show-trash", NULL); + SPANNED_ADD (button, 1, 2, 2, 3); + FRAME_NEW(_("Browsing")); + TABLE_NEW (3, 2); + label = katze_property_label (settings, "open-new-pages-in"); + INDENTED_ADD (label, 0, 1, 0, 1); + button = katze_property_proxy (settings, "open-new-pages-in", NULL); + FILLED_ADD (button, 1, 2, 0, 1); + button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); + INDENTED_ADD (button, 0, 1, 1, 2); + button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); + SPANNED_ADD (button, 1, 2, 1, 2); + button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); + SPANNED_ADD (button, 0, 1, 2, 3); + button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); + SPANNED_ADD (button, 1, 2, 2, 3); // Page "Network" - PAGE_NEW(_("Network")); - FRAME_NEW(_("Proxy Server")); - TABLE_NEW(5, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("_Custom proxy server")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 2, 0, 1); - hbox = gtk_hbox_new(FALSE, 4); - INDENTED_ADD(gtk_label_new_with_mnemonic(_("_Host/ Port")), 0, 1, 1, 2); - entry = gtk_entry_new(); - gtk_widget_set_sensitive(entry, FALSE); //... - gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - spinbutton = gtk_spin_button_new_with_range(0, 65535, 1); - gtk_widget_set_sensitive(spinbutton, FALSE); //... - gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - FILLED_ADD(hbox, 1, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic - (_("Proxy requires authentication")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - // TODO: The proxy user and pass need to be indented further - SPANNED_ADD(checkbutton, 0, 2, 2, 3); - INDENTED_ADD(gtk_label_new(_("Username")), 0, 1, 3, 4); - entry = gtk_entry_new(); - gtk_widget_set_sensitive(entry, FALSE); //... - FILLED_ADD(entry, 1, 2, 3, 4); - INDENTED_ADD(gtk_label_new(_("Password")), 0, 1, 4, 5); - entry = gtk_entry_new(); - gtk_widget_set_sensitive(entry, FALSE); //... - FILLED_ADD(entry, 1, 2, 4, 5); - FRAME_NEW(_("Cache")); - TABLE_NEW(1, 2); - INDENTED_ADD(gtk_label_new(_("Cache size")), 0, 1, 0, 1); - hbox = gtk_hbox_new(FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(0, 10000, 10); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 100/*config->iCacheSize*/); - gtk_widget_set_sensitive(spinbutton, FALSE); //... - gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("MB")), FALSE, FALSE, 0); - button = gtk_button_new_with_label(_("Clear cache")); - gtk_widget_set_sensitive(button, FALSE); //... - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); - FILLED_ADD(hbox, 1, 2, 0, 1); + PAGE_NEW (_("Network")); + FRAME_NEW (_("Network")); + TABLE_NEW (2, 2); + label = katze_property_label (settings, "http-proxy"); + INDENTED_ADD (label, 0, 1, 0, 1); + button = katze_property_proxy (settings, "http-proxy", NULL); + FILLED_ADD (button, 1, 2, 0, 1); + label = katze_property_label (settings, "cache-size"); + INDENTED_ADD (label, 0, 1, 1, 2); + hbox = gtk_hbox_new (FALSE, 4); + entry = katze_property_proxy (settings, "cache-size", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), + FALSE, FALSE, 0); + FILLED_ADD (hbox, 1, 2, 1, 2); // Page "Privacy" - PAGE_NEW(_("Privacy")); - FRAME_NEW(_("Cookies")); - TABLE_NEW(3, 2); - INDENTED_ADD(gtk_label_new(_("Accept cookies")), 0, 1, 0, 1); - combobox = gtk_combo_box_new_text(); - sokoke_combo_box_add_strings(GTK_COMBO_BOX(combobox) - , _("All cookies"), _("Session cookies"), _("None"), NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0); //... - gtk_widget_set_sensitive(combobox, FALSE); //... - FILLED_ADD(combobox, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic - (_("Allow cookies from the original website only")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 2, 1, 2); - INDENTED_ADD(gtk_label_new(_("Maximum cookie age")), 0, 1, 2, 3); - hbox = gtk_hbox_new(FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(0, 360, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 30/*config->iCookieAgeMax*/); - gtk_widget_set_sensitive(spinbutton, FALSE); //... - gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("days")), FALSE, FALSE, 0); - button = gtk_button_new_with_label(_("View cookies")); - gtk_widget_set_sensitive(button, FALSE); //... - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 4); - FILLED_ADD(hbox, 1, 2, 2, 3); - FRAME_NEW(_("History")); - TABLE_NEW(3, 2); - checkbutton = gtk_check_button_new_with_mnemonic(_("Remember my visited pages")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 1, 0, 1); - hbox = gtk_hbox_new(FALSE, 4); - spinbutton = gtk_spin_button_new_with_range(0, 360, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), 30/*config->iHistoryAgeMax*/); - gtk_widget_set_sensitive(spinbutton, FALSE); //... - gtk_box_pack_start(GTK_BOX(hbox), spinbutton, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("days")), FALSE, FALSE, 0); - SPANNED_ADD(hbox, 1, 2, 0, 1); - checkbutton = gtk_check_button_new_with_mnemonic - (_("Remember my form inputs")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 2, 1, 2); - checkbutton = gtk_check_button_new_with_mnemonic - (_("Remember my downloaded files")); - gtk_widget_set_sensitive(checkbutton, FALSE); //... - SPANNED_ADD(checkbutton, 0, 2, 2, 3); + PAGE_NEW (_("Privacy")); + FRAME_NEW (_("Cookies")); + TABLE_NEW (3, 2); + label = katze_property_label (settings, "accept-cookies"); + INDENTED_ADD (label, 0, 1, 0, 1); + button = katze_property_proxy (settings, "accept-cookies", NULL); + FILLED_ADD (button, 1, 2, 0, 1); + button = katze_property_proxy (settings, "original-cookies-only", "blurb"); + SPANNED_ADD (button, 0, 2, 1, 2); + label = katze_property_label (settings, "maximum-cookie-age"); + INDENTED_ADD (label, 0, 1, 2, 3); + hbox = gtk_hbox_new (FALSE, 4); + entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), + FALSE, FALSE, 0); + FILLED_ADD (hbox, 1, 2, 2, 3); + FRAME_NEW (_("History")); + TABLE_NEW (3, 2); + button = katze_property_proxy (settings, "remember-last-visited-pages", NULL); + SPANNED_ADD (button, 0, 1, 0, 1); + hbox = gtk_hbox_new (FALSE, 4); + button = katze_property_proxy (settings, "maximum-history-age", NULL); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), + FALSE, FALSE, 0); + SPANNED_ADD (hbox, 1, 2, 0, 1); + button = katze_property_proxy (settings, "remember-last-form-inputs", NULL); + SPANNED_ADD (button, 0, 2, 1, 2); + button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); + SPANNED_ADD (button, 0, 2, 2, 3); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) , notebook, FALSE, FALSE, 4); diff --git a/src/prefs.h b/src/prefs.h index e56d2087..990def93 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -12,15 +12,14 @@ #ifndef __PREFS_H__ #define __PREFS_H__ 1 -#include "midori-browser.h" - #include +#include "midori-websettings.h" + // -- Types typedef struct { - MidoriBrowser* browser; GtkWidget* userStylesheetUri; GtkWidget* treeview; GtkWidget* combobox; @@ -37,6 +36,6 @@ enum // -- Declarations GtkWidget* -prefs_preferences_dialog_new(MidoriBrowser*); +prefs_preferences_dialog_new(GtkWindow*, MidoriWebSettings*); #endif /* !__PREFS_H__ */ diff --git a/src/sokoke.c b/src/sokoke.c index 41272465..bda6479b 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -316,6 +316,18 @@ gint sokoke_key_file_get_integer_default(GKeyFile* keyFile return g_key_file_get_integer(keyFile, group, key, error); } +gboolean +sokoke_key_file_get_boolean_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gboolean default_value, + GError** error) +{ + if (!g_key_file_has_key (key_file, group, key, NULL)) + return default_value; + return g_key_file_get_boolean (key_file, group, key, error); +} + gboolean sokoke_key_file_save_to_file(GKeyFile* keyFile , const gchar* filename, GError** error) { diff --git a/src/sokoke.h b/src/sokoke.h index 4424ea40..bbb5e7a2 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -64,6 +64,13 @@ gint sokoke_key_file_get_integer_default(GKeyFile*, const gchar*, const gchar* , const gint, GError**); +gboolean +sokoke_key_file_get_boolean_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gboolean default_value, + GError** error); + gboolean sokoke_key_file_save_to_file(GKeyFile*, const gchar*, GError**); From 169973f3fe3494f6a04a2722a022ae0638c599c2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Apr 2008 01:38:22 +0200 Subject: [PATCH 0067/2970] Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished. --- po/POTFILES.in | 1 - src/Makefile.am | 1 - src/conf.c | 70 ------- src/conf.h | 96 ---------- src/global.h | 4 - src/helpers.c | 26 +-- src/helpers.h | 6 - src/main.c | 34 ++-- src/midori-browser.c | 203 +++++++++++++++------ src/midori-websettings.c | 382 +++++++++++++++++++++++++++++---------- src/webSearch.c | 6 +- 11 files changed, 458 insertions(+), 371 deletions(-) delete mode 100644 src/conf.c delete mode 100644 src/conf.h diff --git a/po/POTFILES.in b/po/POTFILES.in index acd019fe..f5f1651b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,6 @@ # List of source files containing translatable strings. midori.desktop.in -src/conf.c src/helpers.c src/main.c src/midori-console.c diff --git a/src/Makefile.am b/src/Makefile.am index 93d0f86e..1b927068 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,6 @@ midori_SOURCES = \ webSearch.c webSearch.h \ helpers.c helpers.h \ sokoke.c sokoke.h \ - conf.c conf.h \ search.c search.h \ global.h \ ui.h \ diff --git a/src/conf.c b/src/conf.c deleted file mode 100644 index d77a7323..00000000 --- a/src/conf.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "conf.h" - -#include "sokoke.h" - -#include -#include -#include - -CConfig* config_new(void) -{ - return g_new0(CConfig, 1); -} - -void config_free(CConfig* config) -{ - g_free(config->homepage); - g_free(config->locationSearch); - g_free(config->panelPageholder); - g_free(config); -} - -gboolean config_from_file(CConfig* config, const gchar* filename, GError** error) -{ - GKeyFile* keyFile = g_key_file_new(); - g_key_file_load_from_file(keyFile, filename, G_KEY_FILE_KEEP_COMMENTS, error); - - #define GET_INT(var, key, default) \ - var = sokoke_key_file_get_integer_default( \ - keyFile, "session", key, default, NULL) - #define GET_STR(var, key, default) \ - var = sokoke_key_file_get_string_default( \ - keyFile, "session", key, default, NULL) - GET_INT(config->rememberWinSize, "RememberWinSize", TRUE); - GET_INT(config->winWidth, "WinWidth", 0); - GET_INT(config->winHeight, "WinHeight", 0); - GET_INT(config->winPanelPos, "WinPanelPos", 0); - GET_INT(config->searchEngine, "SearchEngine", 0); - #undef GET_INT - #undef GET_STR - - g_key_file_free(keyFile); - return !(error && *error); -} - -gboolean config_to_file(CConfig* config, const gchar* filename, GError** error) -{ - GKeyFile* keyFile = g_key_file_new(); - - g_key_file_set_integer(keyFile, "session", "RememberWinSize", config->rememberWinSize); - g_key_file_set_integer(keyFile, "session", "WinWidth", config->winWidth); - g_key_file_set_integer(keyFile, "session", "WinHeight", config->winHeight); - g_key_file_set_integer(keyFile, "session", "WinPanelPos", config->winPanelPos); - g_key_file_set_integer(keyFile, "session", "SearchEngine", config->searchEngine); - - gboolean saved = sokoke_key_file_save_to_file(keyFile, filename, error); - g_key_file_free(keyFile); - - return saved; -} diff --git a/src/conf.h b/src/conf.h deleted file mode 100644 index 9a846079..00000000 --- a/src/conf.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __CONF_H__ -#define __CONF_H__ 1 - -#include - -typedef struct _CConfig -{ - guint startup; - gchar* homepage; - gchar* locationSearch; - gboolean toolbarNavigation; - gboolean toolbarBookmarks; - //gboolean toolbarDownloads; - gboolean toolbarStatus; - guint toolbarStyle; - gboolean toolbarSmall; - gboolean panelShow; - guint panelActive; - gchar* panelPageholder; - guint tabSize; // tab size in charcters - gboolean tabClose; - gboolean toolbarWebSearch; - gboolean toolbarNewTab; - gboolean toolbarClosedTabs; - guint newPages; // where to open new pages - gboolean openTabsInTheBackground; - gboolean openPopupsInTabs; - gboolean middleClickGoto; - - gchar* defaultFontFamily; - guint defaultFontSize; - guint minimumFontSize; - gchar* defaultEncoding; - gboolean autoLoadImages; - gboolean autoShrinkImages; - gboolean printBackgrounds; - gboolean resizableTextAreas; - gboolean userStylesheet; - gchar* userStylesheetUri; - gboolean enableScripts; - gboolean enablePlugins; - - gboolean rememberWinSize; // Restore window size upon startup? - gint winWidth; - gint winHeight; - guint winPanelPos; - guint searchEngine; // last selected search engine -} CConfig; - -enum -{ - CONFIG_STARTUP_BLANK, - CONFIG_STARTUP_HOMEPAGE, - CONFIG_STARTUP_SESSION -}; - -enum -{ - CONFIG_TOOLBAR_DEFAULT, - CONFIG_TOOLBAR_ICONS, - CONFIG_TOOLBAR_TEXT, - CONFIG_TOOLBAR_BOTH, - CONFIG_TOOLBAR_BOTH_HORIZ -}; - -enum -{ - CONFIG_NEWPAGES_TAB_NEW, - CONFIG_NEWPAGES_WINDOW_NEW, - CONFIG_NEWPAGES_TAB_CURRENT -}; - -CConfig* -config_new(void); - -void -config_free(CConfig*); - -gboolean -config_from_file(CConfig*, const gchar*, GError**); - -gboolean -config_to_file(CConfig*, const gchar*, GError**); - -#endif /* !__CONF_H__ */ diff --git a/src/global.h b/src/global.h index 497ca7f6..40f003c4 100644 --- a/src/global.h +++ b/src/global.h @@ -12,8 +12,6 @@ #ifndef __GLOBAL_H__ #define __GLOBAL_H__ 1 -#include "conf.h" - #include "midori-websettings.h" #include @@ -26,8 +24,6 @@ GList* searchEngines; // Items of type 'SearchEngine' KatzeXbelItem* bookmarks; -CConfig* config; -MidoriWebSettings* webSettings; // Custom stock items diff --git a/src/helpers.c b/src/helpers.c index 851263bb..cae95325 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -130,7 +130,7 @@ gchar* magic_uri(const gchar* uri, gboolean search) //g_strfreev(sParts); // We only have a word or there is no matching keyowrd, so search for it if(searchUrl == NULL) - g_snprintf(search, 255, config->locationSearch, uri); + g_snprintf(search, 255, ""/*config->locationSearch*/, uri); return g_strdup(search); } return g_strdup(uri); @@ -143,27 +143,3 @@ gchar* get_default_font(void) g_object_get(gtksettings, "gtk-font-name", &defaultFont, NULL); return defaultFont; } - -GtkToolbarStyle config_to_toolbarstyle(guint toolbarStyle) -{ - switch(toolbarStyle) - { - case CONFIG_TOOLBAR_ICONS: - return GTK_TOOLBAR_ICONS; - case CONFIG_TOOLBAR_TEXT: - return GTK_TOOLBAR_TEXT; - case CONFIG_TOOLBAR_BOTH: - return GTK_TOOLBAR_BOTH; - case CONFIG_TOOLBAR_BOTH_HORIZ: - return GTK_TOOLBAR_BOTH_HORIZ; - } - GtkSettings* gtkSettings = gtk_settings_get_default(); - g_object_get(gtkSettings, "gtk-toolbar-style", &toolbarStyle, NULL); - return toolbarStyle; -} - -GtkToolbarStyle config_to_toolbariconsize(gboolean toolbarSmall) -{ - return toolbarSmall ? GTK_ICON_SIZE_SMALL_TOOLBAR - : GTK_ICON_SIZE_LARGE_TOOLBAR; -} diff --git a/src/helpers.h b/src/helpers.h index 92d0a6ab..dde12642 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -40,10 +40,4 @@ magic_uri(const gchar*, gboolean bSearch); gchar* get_default_font(void); -GtkToolbarStyle -config_to_toolbarstyle(); - -GtkToolbarStyle -config_to_toolbariconsize(gboolean); - #endif /* !__HELPERS_H__ */ diff --git a/src/main.c b/src/main.c index 1ea8fdb6..0df50448 100644 --- a/src/main.c +++ b/src/main.c @@ -259,6 +259,9 @@ settings_save_to_file (MidoriWebSettings* settings, int main(int argc, char** argv) { + MidoriStartup load_on_startup; + gchar* homepage; + locale_init(); g_set_application_name(_("midori")); @@ -267,7 +270,8 @@ int main(int argc, char** argv) GOptionEntry entries[] = { { "version", 'v', 0, G_OPTION_ARG_NONE, &version, - N_("Display program version"), NULL } + N_("Display program version"), NULL }, + { NULL } }; GError* error = NULL; @@ -310,7 +314,6 @@ int main(int argc, char** argv) gchar* config_file = g_build_filename (config_path, "config", NULL); error = NULL; MidoriWebSettings* settings = settings_new_from_file (config_file); - webSettings = settings; katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); gtk_accel_map_load (config_file); katze_assign (config_file, g_build_filename (config_path, "search", NULL)); @@ -337,9 +340,9 @@ int main(int argc, char** argv) g_error_free (error); } g_free (config_file); - KatzeXbelItem* _session = katze_xbel_folder_new(); - config = config_new (); - if(config->startup == CONFIG_STARTUP_SESSION) + KatzeXbelItem* _session = katze_xbel_folder_new (); + g_object_get (settings, "load-on-startup", &load_on_startup, NULL); + if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { config_file = g_build_filename (config_path, "session.xbel", NULL); error = NULL; @@ -382,7 +385,6 @@ int main(int argc, char** argv) , NULL); if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { - config_free(config); search_engines_free(searchEngines); katze_xbel_item_unref(bookmarks); katze_xbel_item_unref(_session); @@ -410,14 +412,18 @@ int main(int argc, char** argv) } g_free(uri); - if(katze_xbel_folder_is_empty(_session)) + if (katze_xbel_folder_is_empty (_session)) { - KatzeXbelItem* item = katze_xbel_bookmark_new(); - if(config->startup == CONFIG_STARTUP_BLANK) - katze_xbel_bookmark_set_href(item, ""); + KatzeXbelItem* item = katze_xbel_bookmark_new (); + if (load_on_startup == MIDORI_STARTUP_BLANK) + katze_xbel_bookmark_set_href (item, ""); else - katze_xbel_bookmark_set_href(item, config->homepage); - katze_xbel_folder_prepend_item(_session, item); + { + g_object_get (settings, "homepage", &homepage, NULL); + katze_xbel_bookmark_set_href (item, homepage); + g_free (homepage); + } + katze_xbel_folder_prepend_item (_session, item); } g_free (config_path); @@ -493,7 +499,8 @@ int main(int argc, char** argv) g_error_free (error); } katze_xbel_item_unref (xbel_trash); - if(config->startup == CONFIG_STARTUP_SESSION) + g_object_get (settings, "load-on-startup", &load_on_startup, NULL); + if(load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { katze_assign (config_file, g_build_filename (config_path, "session.xbel", NULL)); @@ -512,7 +519,6 @@ int main(int argc, char** argv) g_warning ("The configuration couldn't be saved. %s", error->message); g_error_free (error); } - config_free (config); katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); gtk_accel_map_save (config_file); g_free (config_file); diff --git a/src/midori-browser.c b/src/midori-browser.c index 57fac4e8..5bf771d3 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -14,7 +14,6 @@ #include "midori-browser.h" #include "global.h" -#include "conf.h" #include "helpers.h" #include "webSearch.h" #include "prefs.h" @@ -25,6 +24,7 @@ #include "midori-console.h" #include "midori-trash.h" +#include #include #include #include @@ -796,10 +796,16 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, { MidoriBrowserPrivate* priv = browser->priv; - if (config->toolbarStyle == CONFIG_TOOLBAR_DEFAULT) + MidoriToolbarStyle toolbar_style; + GtkToolbarStyle gtk_toolbar_style; + + g_object_get (priv->settings, "toolbar-style", &toolbar_style, NULL); + if (toolbar_style == MIDORI_TOOLBAR_DEFAULT) { - gtk_toolbar_set_style (GTK_TOOLBAR(priv->navigationbar), - config_to_toolbarstyle (config->toolbarStyle)); + g_object_get (priv->settings, + "gtk-toolbar-style", >k_toolbar_style, NULL); + gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_style); } } @@ -881,8 +887,9 @@ _action_navigationbar_activate (GtkToggleAction* action, { MidoriBrowserPrivate* priv = browser->priv; - config->toolbarNavigation = gtk_toggle_action_get_active (action); - sokoke_widget_set_visible (priv->navigationbar, config->toolbarNavigation); + gboolean active = gtk_toggle_action_get_active (action); + g_object_set (priv->settings, "show-navigationbar", active, NULL); + sokoke_widget_set_visible (priv->navigationbar, active); } static void @@ -891,8 +898,9 @@ _action_bookmarkbar_activate (GtkToggleAction* action, { MidoriBrowserPrivate* priv = browser->priv; - config->toolbarBookmarks = gtk_toggle_action_get_active (action); - sokoke_widget_set_visible (priv->bookmarkbar, config->toolbarBookmarks); + gboolean active = gtk_toggle_action_get_active (action); + g_object_set (priv->settings, "show-bookmarkbar", active, NULL); + sokoke_widget_set_visible (priv->bookmarkbar, active); } static void @@ -901,8 +909,9 @@ _action_statusbar_activate (GtkToggleAction* action, { MidoriBrowserPrivate* priv = browser->priv; - config->toolbarStatus = gtk_toggle_action_get_active (action); - sokoke_widget_set_visible (priv->statusbar, config->toolbarStatus); + gboolean active = gtk_toggle_action_get_active (action); + g_object_set (priv->settings, "show-statusbar", active, NULL); + sokoke_widget_set_visible (priv->statusbar, active); } static void @@ -995,8 +1004,14 @@ static void _action_home_activate (GtkAction* action, MidoriBrowser* browser) { + MidoriBrowserPrivate* priv = browser->priv; + + gchar* homepage; + GtkWidget* web_view = midori_browser_get_current_web_view (browser); - g_object_set (web_view, "uri", config->homepage, NULL); + g_object_get (priv->settings, "homepage", &homepage, NULL); + g_object_set (web_view, "uri", homepage, NULL); + g_free (homepage); } static gboolean @@ -1645,8 +1660,9 @@ _action_panel_activate (GtkToggleAction* action, { MidoriBrowserPrivate* priv = browser->priv; - config->panelShow = gtk_toggle_action_get_active (action); - sokoke_widget_set_visible (priv->panel, config->panelShow); + gboolean active = gtk_toggle_action_get_active (action); + g_object_set (priv->settings, "show-panel", active, NULL); + sokoke_widget_set_visible (priv->panel, active); } static void @@ -1657,12 +1673,13 @@ _action_open_in_panel_activate (GtkAction* action, GtkWidget* web_view = midori_browser_get_current_web_view (browser); const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - katze_assign (config->panelPageholder, g_strdup (uri)); + // FIXME: Don't assign the uri here, update it properly while navigating + g_object_set (priv->settings, "last-pageholder-uri", uri, NULL); gint n = midori_panel_page_num (MIDORI_PANEL (priv->panel), priv->panel_pageholder); midori_panel_set_current_page (MIDORI_PANEL (priv->panel), n); gtk_widget_show (priv->panel); - g_object_set (priv->panel_pageholder, "uri", config->panelPageholder, NULL); + g_object_set (priv->panel_pageholder, "uri", uri, NULL); } @@ -1671,7 +1688,10 @@ midori_panel_notify_position_cb (GObject* object, GParamSpec* arg1, MidoriBrowser* browser) { - config->winPanelPos = gtk_paned_get_position (GTK_PANED (object)); + MidoriBrowserPrivate* priv = browser->priv; + + gboolean position = gtk_paned_get_position (GTK_PANED (object)); + g_object_set (priv->settings, "last-panel-position", position, NULL); } static gboolean @@ -2087,6 +2107,7 @@ static void midori_browser_size_allocate_cb (MidoriBrowser* browser, GtkAllocation* allocation) { + MidoriBrowserPrivate* priv = browser->priv; GtkWidget* widget = GTK_WIDGET (browser); if (GTK_WIDGET_REALIZED (widget)) @@ -2094,8 +2115,9 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, GdkWindowState state = gdk_window_get_state (widget->window); if (!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) { - config->winWidth = allocation->width; - config->winHeight = allocation->height; + g_object_set (priv->settings, + "last-window-width", allocation->width, + "last-window-height", allocation->height, NULL); } } } @@ -2233,22 +2255,6 @@ midori_browser_init (MidoriBrowser* browser) // Setup the window metrics g_signal_connect (browser, "window-state-event", G_CALLBACK (midori_browser_window_state_event_cb), NULL); - GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (browser)); - const gint default_width = (gint)gdk_screen_get_width (screen) / 1.7; - const gint default_height = (gint)gdk_screen_get_height (screen) / 1.7; - if (config->rememberWinSize) - { - if (!config->winWidth && !config->winHeight) - { - config->winWidth = default_width; - config->winHeight = default_width; - } - gtk_window_set_default_size (GTK_WINDOW (browser), - config->winWidth, config->winHeight); - } - else - gtk_window_set_default_size (GTK_WINDOW(browser), - default_width, default_height); g_signal_connect (browser, "size-allocate", G_CALLBACK (midori_browser_size_allocate_cb), NULL); // FIXME: Use custom program icon @@ -2338,14 +2344,11 @@ midori_browser_init (MidoriBrowser* browser) // Create the navigationbar priv->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); - gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), - config_to_toolbarstyle (config->toolbarStyle)); - GtkSettings* gtk_settings = gtk_widget_get_settings (priv->navigationbar); - g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", - G_CALLBACK (midori_browser_navigationbar_notify_style_cb), - browser); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), - config_to_toolbariconsize (config->toolbarSmall)); + // FIXME: settings should be connected with screen changes + GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); + if (gtk_settings) + g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", + G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (priv->navigationbar), TRUE); gtk_box_pack_start (GTK_BOX (vbox), priv->navigationbar, FALSE, FALSE, 0); priv->button_tab_new = gtk_ui_manager_get_widget ( @@ -2377,7 +2380,6 @@ midori_browser_init (MidoriBrowser* browser) // FIXME: The interface is somewhat awkward and ought to be rethought // TODO: Display "show in context menu" search engines as "completion actions" entry_setup_completion (GTK_ENTRY (priv->search)); - update_searchEngine (config->searchEngine, priv->search); g_object_connect (priv->search, "signal::icon-released", on_webSearch_icon_released, browser, @@ -2405,7 +2407,6 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (_action_fullscreen_activate), browser); gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), GTK_TOOL_ITEM (priv->button_fullscreen), -1); - _action_set_active (browser, "Navigationbar", config->toolbarNavigation); // Bookmarkbar priv->bookmarkbar = gtk_toolbar_new (); @@ -2454,7 +2455,6 @@ midori_browser_init (MidoriBrowser* browser) } sokoke_container_show_children (GTK_CONTAINER (priv->bookmarkbar)); gtk_box_pack_start (GTK_BOX (vbox), priv->bookmarkbar, FALSE, FALSE, 0); - _action_set_active (browser, "Bookmarkbar", config->toolbarBookmarks); // Superuser warning GtkWidget* hbox; @@ -2463,7 +2463,6 @@ midori_browser_init (MidoriBrowser* browser) // Create the panel GtkWidget* hpaned = gtk_hpaned_new (); - gtk_paned_set_position (GTK_PANED (hpaned), config->winPanelPos); g_signal_connect (hpaned, "notify::position", G_CALLBACK (midori_panel_notify_position_cb), browser); @@ -2476,8 +2475,6 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (priv->panel, "close", G_CALLBACK (midori_panel_close_cb), browser); gtk_paned_pack1 (GTK_PANED (hpaned), priv->panel, FALSE, FALSE); - sokoke_widget_set_visible (priv->panel, config->panelShow); - _action_set_active (browser, "Panel", config->panelShow); // Bookmarks GtkWidget* box = gtk_vbox_new (FALSE, 0); @@ -2552,17 +2549,13 @@ midori_browser_init (MidoriBrowser* browser) // Pageholder priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", config->panelPageholder, + "uri", "", NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), priv->panel_pageholder, GTK_STOCK_CONVERT, _("Pageholder")); - midori_panel_set_current_page (MIDORI_PANEL (priv->panel), - config->panelActive); - sokoke_widget_set_visible (priv->panel, config->panelShow); - // Notebook, containing all web_views priv->notebook = gtk_notebook_new (); gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); @@ -2638,13 +2631,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_set_size_request (priv->progressbar, -1, 1); gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar, FALSE, FALSE, 3); - _action_set_active (browser, "Statusbar", config->toolbarStatus); g_object_unref (ui_manager); - - sokoke_widget_set_visible (priv->button_tab_new, config->toolbarNewTab); - sokoke_widget_set_visible (priv->search, config->toolbarWebSearch); - sokoke_widget_set_visible (priv->button_trash, config->toolbarClosedTabs); } static void @@ -2668,6 +2656,99 @@ midori_browser_finalize (GObject* object) G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } +static void +_midori_browser_update_settings (MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean remember_last_window_size; + gint last_window_width, last_window_height; + gint last_panel_position, last_panel_page; + gboolean show_navigationbar, show_bookmarkbar, show_panel, show_statusbar; + gboolean small_toolbar, show_new_tab, show_web_search, show_trash; + MidoriToolbarStyle toolbar_style; + gint last_web_search; + gchar* last_pageholder_uri; + g_object_get (priv->settings, + "remember-last-window-size", &remember_last_window_size, + "last-window-width", &last_window_width, + "last-window-height", &last_window_height, + "last-panel-position", &last_panel_position, + "last-panel-page", &last_panel_page, + "show-navigationbar", &show_navigationbar, + "show-bookmarkbar", &show_bookmarkbar, + "show-panel", &show_panel, + "show-statusbar", &show_statusbar, + "small-toolbar", &small_toolbar, + "show-new-tab", &show_new_tab, + "show-web-search", &show_web_search, + "show-trash", &show_trash, + "toolbar-style", &toolbar_style, + "last-web-search", &last_web_search, + "last-pageholder-uri", &last_pageholder_uri, + NULL); + + GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (browser)); + const gint default_width = (gint)gdk_screen_get_width (screen) / 1.7; + const gint default_height = (gint)gdk_screen_get_height (screen) / 1.7; + + if (remember_last_window_size) + { + if (last_window_width && last_window_height) + gtk_window_set_default_size (GTK_WINDOW (browser), + last_window_width, last_window_height); + else + gtk_window_set_default_size (GTK_WINDOW (browser), + default_width, default_height); + } + + GtkToolbarStyle gtk_toolbar_style; + GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); + if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) + g_object_get (gtk_settings, "gtk-toolbar-style", >k_toolbar_style, NULL); + else + { + switch (toolbar_style) + { + case MIDORI_TOOLBAR_ICONS: + gtk_toolbar_style = GTK_TOOLBAR_ICONS; + break; + case MIDORI_TOOLBAR_TEXT: + gtk_toolbar_style = GTK_TOOLBAR_TEXT; + break; + case MIDORI_TOOLBAR_BOTH: + gtk_toolbar_style = GTK_TOOLBAR_BOTH; + break; + case MIDORI_TOOLBAR_BOTH_HORIZ: + case MIDORI_TOOLBAR_DEFAULT: + gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ; + } + } + gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_style); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), + small_toolbar ? GTK_ICON_SIZE_SMALL_TOOLBAR + : GTK_ICON_SIZE_LARGE_TOOLBAR); + + update_searchEngine (last_web_search, priv->search); + + gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (priv->panel)), + last_panel_position); + midori_panel_set_current_page (MIDORI_PANEL (priv->panel), last_panel_page); + g_object_set (priv->panel_pageholder, "uri", last_pageholder_uri, NULL); + + _action_set_active (browser, "Navigationbar", show_navigationbar); + _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); + _action_set_active (browser, "Panel", show_panel); + _action_set_active (browser, "Statusbar", show_statusbar); + + sokoke_widget_set_visible (priv->button_tab_new, show_new_tab); + sokoke_widget_set_visible (priv->search, show_web_search); + sokoke_widget_set_visible (priv->button_trash, show_trash); + + g_free (last_pageholder_uri); +} + static void midori_browser_set_property (GObject* object, guint prop_id, @@ -2685,6 +2766,7 @@ midori_browser_set_property (GObject* object, case PROP_SETTINGS: katze_object_assign (priv->settings, g_value_get_object (value)); g_object_ref (priv->settings); + _midori_browser_update_settings (browser); gtk_container_foreach (GTK_CONTAINER (priv->notebook), (GtkCallback) midori_web_view_set_settings, priv->settings); @@ -2855,7 +2937,10 @@ midori_browser_append_tab (MidoriBrowser* browser, _midori_browser_update_actions (browser); n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - if (!config->openTabsInTheBackground) + gboolean open_tabs_in_the_background; + g_object_get (priv->settings, "open-tabs-in-the-background", + &open_tabs_in_the_background, NULL); + if (open_tabs_in_the_background) { gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); gtk_window_set_focus (GTK_WINDOW (browser), priv->location); diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 08dba7f6..c89f0613 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -20,12 +20,18 @@ G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) struct _MidoriWebSettingsPrivate { - MidoriStartup load_on_startup; - gchar* homepage; - gchar* download_folder; - gboolean show_download_notification; - gchar* location_entry_search; - MidoriPreferredEncoding preferred_encoding; + gboolean remember_last_window_size; + gint last_window_width; + gint last_window_height; + gint last_panel_position; + gint last_panel_page; + gint last_web_search; + gchar* last_pageholder_uri; + + gboolean show_navigationbar; + gboolean show_bookmarkbar; + gboolean show_panel; + gboolean show_statusbar; MidoriToolbarStyle toolbar_style; gboolean small_toolbar; @@ -33,6 +39,13 @@ struct _MidoriWebSettingsPrivate gboolean show_new_tab; gboolean show_trash; + MidoriStartup load_on_startup; + gchar* homepage; + gchar* download_folder; + gboolean show_download_notification; + gchar* location_entry_search; + MidoriPreferredEncoding preferred_encoding; + gint tab_label_size; gboolean close_buttons_on_tabs; MidoriNewPage open_new_pages_in; @@ -61,12 +74,18 @@ enum { PROP_0, - PROP_LOAD_ON_STARTUP, - PROP_HOMEPAGE, - PROP_DOWNLOAD_FOLDER, - PROP_SHOW_DOWNLOAD_NOTIFICATION, - PROP_LOCATION_ENTRY_SEARCH, - PROP_PREFERRED_ENCODING, + PROP_REMEMBER_LAST_WINDOW_SIZE, + PROP_LAST_WINDOW_WIDTH, + PROP_LAST_WINDOW_HEIGHT, + PROP_LAST_PANEL_POSITION, + PROP_LAST_PANEL_PAGE, + PROP_LAST_WEB_SEARCH, + PROP_LAST_PAGEHOLDER_URI, + + PROP_SHOW_NAVIGATIONBAR, + PROP_SHOW_BOOKMARKBAR, + PROP_SHOW_PANEL, + PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, PROP_SMALL_TOOLBAR, @@ -74,6 +93,13 @@ enum PROP_SHOW_WEB_SEARCH, PROP_SHOW_TRASH, + PROP_LOAD_ON_STARTUP, + PROP_HOMEPAGE, + PROP_DOWNLOAD_FOLDER, + PROP_SHOW_DOWNLOAD_NOTIFICATION, + PROP_LOCATION_ENTRY_SEARCH, + PROP_PREFERRED_ENCODING, + PROP_TAB_LABEL_SIZE, PROP_CLOSE_BUTTONS_ON_TABS, PROP_OPEN_NEW_PAGES_IN, @@ -209,6 +235,156 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + g_object_class_install_property (gobject_class, + PROP_REMEMBER_LAST_WINDOW_SIZE, + g_param_spec_boolean ( + "remember-last-window-size", + _("Remember last window size"), + _("Whether to save the last window size"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_WINDOW_WIDTH, + g_param_spec_int ( + "last-window-width", + _("Last window width"), + _("The last saved window width"), + 0, G_MAXINT, 0, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_WINDOW_HEIGHT, + g_param_spec_int ( + "last-window-height", + _("Last window height"), + _("The last saved window height"), + 0, G_MAXINT, 0, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_PANEL_POSITION, + g_param_spec_int ( + "last-panel-position", + _("Last panel position"), + _("The last saved panel position"), + 0, G_MAXINT, 0, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_PANEL_PAGE, + g_param_spec_int ( + "last-panel-page", + _("Last panel page"), + _("The last saved panel page"), + 0, G_MAXINT, 0, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_WEB_SEARCH, + g_param_spec_int ( + "last-web-search", + _("Last Web search"), + _("The last saved Web search"), + 0, G_MAXINT, 0, + flags)); + + g_object_class_install_property (gobject_class, + PROP_LAST_PAGEHOLDER_URI, + g_param_spec_string ( + "last-pageholder-uri", + _("Last pageholder URI"), + _("The URI last opened in the pageholder"), + "", + flags)); + + + + g_object_class_install_property (gobject_class, + PROP_SHOW_NAVIGATIONBAR, + g_param_spec_boolean ( + "show-navigationbar", + _("Show Navigationbar"), + _("Whether to show the navigationbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_BOOKMARKBAR, + g_param_spec_boolean ( + "show-bookmarkbar", + _("Show Bookmarkbar"), + _("Whether to show the bookmarkbar"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_PANEL, + g_param_spec_boolean ( + "show-panel", + _("Show Panel"), + _("Whether to show the panel"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_STATUSBAR, + g_param_spec_boolean ( + "show-statusbar", + _("Show Statusbar"), + _("Whether to show the statusbar"), + TRUE, + flags)); + + + g_object_class_install_property (gobject_class, + PROP_TOOLBAR_STYLE, + g_param_spec_enum ( + "toolbar-style", + _("Toolbar Style"), + _("The style of the toolbar"), + MIDORI_TYPE_TOOLBAR_STYLE, + MIDORI_TOOLBAR_DEFAULT, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SMALL_TOOLBAR, + g_param_spec_boolean ( + "small-toolbar", + _("Small toolbar"), + _("Use small toolbar icons"), + FALSE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_NEW_TAB, + g_param_spec_boolean ( + "show-new-tab", + _("Show New Tab"), + _("Show the New Tab button in the toolbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_WEB_SEARCH, + g_param_spec_boolean ( + "show-web-search", + _("Show Web search"), + _("Show the Web search entry in the toolbar"), + TRUE, + flags)); + + g_object_class_install_property (gobject_class, + PROP_SHOW_TRASH, + g_param_spec_boolean ( + "show-trash", + _("Show Trash"), + _("Show the Trash button in the toolbar"), + TRUE, + flags)); + + + g_object_class_install_property (gobject_class, PROP_LOAD_ON_STARTUP, g_param_spec_enum ( @@ -267,54 +443,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) - g_object_class_install_property (gobject_class, - PROP_TOOLBAR_STYLE, - g_param_spec_enum ( - "toolbar-style", - _("Toolbar Style"), - _("The style of the toolbar"), - MIDORI_TYPE_TOOLBAR_STYLE, - MIDORI_TOOLBAR_DEFAULT, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SMALL_TOOLBAR, - g_param_spec_boolean ( - "small-toolbar", - _("Small toolbar"), - _("Use small toolbar icons"), - FALSE, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SHOW_NEW_TAB, - g_param_spec_boolean ( - "show-new-tab", - _("Show New Tab"), - _("Show the New Tab button in the toolbar"), - TRUE, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SHOW_WEB_SEARCH, - g_param_spec_boolean ( - "show-web-search", - _("Show Web search"), - _("Show the Web search entry in the toolbar"), - TRUE, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SHOW_TRASH, - g_param_spec_boolean ( - "show-trash", - _("Show Trash"), - _("Show the Trash button in the toolbar"), - TRUE, - flags)); - - - g_object_class_install_property (gobject_class, PROP_TAB_LABEL_SIZE, g_param_spec_int ( @@ -511,6 +639,57 @@ midori_web_settings_set_property (GObject* object, switch (prop_id) { + case PROP_REMEMBER_LAST_WINDOW_SIZE: + priv->remember_last_window_size = g_value_get_boolean (value); + break; + case PROP_LAST_WINDOW_WIDTH: + priv->last_window_width = g_value_get_int (value); + break; + case PROP_LAST_WINDOW_HEIGHT: + priv->last_window_height = g_value_get_int (value); + break; + case PROP_LAST_PANEL_POSITION: + priv->last_panel_position = g_value_get_int (value); + break; + case PROP_LAST_PANEL_PAGE: + priv->last_panel_page = g_value_get_int (value); + break; + case PROP_LAST_WEB_SEARCH: + priv->last_web_search = g_value_get_int (value); + break; + case PROP_LAST_PAGEHOLDER_URI: + katze_assign (priv->last_pageholder_uri, g_value_dup_string (value)); + break; + + case PROP_SHOW_NAVIGATIONBAR: + priv->show_navigationbar = g_value_get_boolean (value); + break; + case PROP_SHOW_BOOKMARKBAR: + priv->show_bookmarkbar = g_value_get_boolean (value); + break; + case PROP_SHOW_PANEL: + priv->show_panel = g_value_get_boolean (value); + break; + case PROP_SHOW_STATUSBAR: + priv->show_statusbar = g_value_get_boolean (value); + break; + + case PROP_TOOLBAR_STYLE: + priv->toolbar_style = g_value_get_enum (value); + break; + case PROP_SMALL_TOOLBAR: + priv->small_toolbar = g_value_get_boolean (value); + break; + case PROP_SHOW_NEW_TAB: + priv->show_new_tab = g_value_get_boolean (value); + break; + case PROP_SHOW_WEB_SEARCH: + priv->show_web_search = g_value_get_boolean (value); + break; + case PROP_SHOW_TRASH: + priv->show_trash = g_value_get_boolean (value); + break; + case PROP_LOAD_ON_STARTUP: priv->load_on_startup = g_value_get_enum (value); break; @@ -550,22 +729,6 @@ midori_web_settings_set_property (GObject* object, } break; - case PROP_TOOLBAR_STYLE: - priv->toolbar_style = g_value_get_enum (value); - break; - case PROP_SMALL_TOOLBAR: - priv->small_toolbar = g_value_get_boolean (value); - break; - case PROP_SHOW_NEW_TAB: - priv->show_new_tab = g_value_get_boolean (value); - break; - case PROP_SHOW_WEB_SEARCH: - priv->show_web_search = g_value_get_boolean (value); - break; - case PROP_SHOW_TRASH: - priv->show_trash = g_value_get_boolean (value); - break; - case PROP_TAB_LABEL_SIZE: priv->tab_label_size = g_value_get_int (value); break; @@ -632,6 +795,57 @@ midori_web_settings_get_property (GObject* object, switch (prop_id) { + case PROP_REMEMBER_LAST_WINDOW_SIZE: + g_value_set_boolean (value, priv->remember_last_window_size); + break; + case PROP_LAST_WINDOW_WIDTH: + g_value_set_int (value, priv->last_window_width); + break; + case PROP_LAST_WINDOW_HEIGHT: + g_value_set_int (value, priv->last_window_height); + break; + case PROP_LAST_PANEL_POSITION: + g_value_set_int (value, priv->last_panel_position); + break; + case PROP_LAST_PANEL_PAGE: + g_value_set_int (value, priv->last_panel_page); + break; + case PROP_LAST_WEB_SEARCH: + g_value_set_int (value, priv->last_web_search); + break; + case PROP_LAST_PAGEHOLDER_URI: + g_value_set_string (value, priv->last_pageholder_uri); + break; + + case PROP_SHOW_NAVIGATIONBAR: + g_value_set_boolean (value, priv->show_navigationbar); + break; + case PROP_SHOW_BOOKMARKBAR: + g_value_set_boolean (value, priv->show_bookmarkbar); + break; + case PROP_SHOW_PANEL: + g_value_set_boolean (value, priv->show_panel); + break; + case PROP_SHOW_STATUSBAR: + g_value_set_boolean (value, priv->show_statusbar); + break; + + case PROP_TOOLBAR_STYLE: + g_value_set_enum (value, priv->toolbar_style); + break; + case PROP_SMALL_TOOLBAR: + g_value_set_boolean (value, priv->small_toolbar); + break; + case PROP_SHOW_NEW_TAB: + g_value_set_boolean (value, priv->show_new_tab); + break; + case PROP_SHOW_WEB_SEARCH: + g_value_set_boolean (value, priv->show_web_search); + break; + case PROP_SHOW_TRASH: + g_value_set_boolean (value, priv->show_trash); + break; + case PROP_LOAD_ON_STARTUP: g_value_set_enum (value, priv->load_on_startup); break; @@ -651,22 +865,6 @@ midori_web_settings_get_property (GObject* object, g_value_set_enum (value, priv->preferred_encoding); break; - case PROP_TOOLBAR_STYLE: - g_value_set_enum (value, priv->toolbar_style); - break; - case PROP_SMALL_TOOLBAR: - g_value_set_boolean (value, priv->small_toolbar); - break; - case PROP_SHOW_NEW_TAB: - g_value_set_boolean (value, priv->show_new_tab); - break; - case PROP_SHOW_WEB_SEARCH: - g_value_set_boolean (value, priv->show_web_search); - break; - case PROP_SHOW_TRASH: - g_value_set_boolean (value, priv->show_trash); - break; - case PROP_TAB_LABEL_SIZE: g_value_set_int (value, priv->tab_label_size); break; diff --git a/src/webSearch.c b/src/webSearch.c index c918953c..d8040577 100644 --- a/src/webSearch.c +++ b/src/webSearch.c @@ -41,7 +41,7 @@ void update_searchEngine(guint index, GtkWidget* search) g_object_unref(pixbuf); sokoke_entry_set_default_text(GTK_ENTRY(search) , search_engine_get_short_name(engine)); - config->searchEngine = index; + // config->searchEngine = index; } } @@ -427,11 +427,11 @@ void on_webSearch_activate(GtkWidget* widget, MidoriBrowser* browser) { const gchar* keywords = gtk_entry_get_text(GTK_ENTRY(widget)); gchar* url; - SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, config->searchEngine); + SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, 0/*config->searchEngine*/); if(searchEngine) url = searchEngine->url; else // The location search is our fallback - url = config->locationSearch; + url = "";//config->locationSearch; gchar* search; if(strstr(url, "%s")) search = g_strdup_printf(url, keywords); From 74b300ef3377c7f06f864310939b102e08e28ed8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Apr 2008 01:39:07 +0200 Subject: [PATCH 0068/2970] Correct the example of a function definition --- HACKING | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HACKING b/HACKING index ae54476f..c6248360 100644 --- a/HACKING +++ b/HACKING @@ -15,7 +15,8 @@ Source file example: #include - void foobar(FooEnum bar, const gchar* foo) + void + foobar (FooEnum bar, const gchar* foo) { if(!foo) return; From a2aa2e4973cb5cce830c3b81fb08c1aae63edfc1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Apr 2008 01:40:15 +0200 Subject: [PATCH 0069/2970] Mention libtool and autogen.sh in INSTALL --- INSTALL | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/INSTALL b/INSTALL index bab1e0a1..11828ac4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,16 @@ +If you checked out from the repository, make sure +you have *libtool* installed, then run + +1. ./autogen.sh + +2. ./configure --enable-debug=yes + +3. make + +If you obtained midori in the form of a release tarball, +you need to perform the following steps in order to +build and install the program. + 1. Unpack the archive. 2. Check build options with From fae6058c262a4051fb9db5ffb00a4e7fb7c71d5c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Apr 2008 01:58:02 +0200 Subject: [PATCH 0070/2970] Focus the web view when opening an URL via the location --- katze/katze-utils.c | 3 ++- src/midori-browser.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index ee8d41fd..ec8c5fc7 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -121,7 +121,7 @@ katze_property_proxy (gpointer object, if (_hint == g_intern_string ("blurb")) nick = g_param_spec_get_blurb (pspec); GtkWidget* widget; - const gchar* string; + gchar* string = NULL; if (type == G_TYPE_PARAM_BOOLEAN) { widget = gtk_check_button_new_with_label (nick); @@ -209,6 +209,7 @@ katze_property_proxy (gpointer object, } else widget = gtk_label_new (nick); + g_free (string); gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); diff --git a/src/midori-browser.c b/src/midori-browser.c index 5bf771d3..fcb27dec 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -1036,6 +1036,7 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, GtkWidget* web_view = midori_browser_get_current_web_view (browser); g_object_set (web_view, "uri", new_uri, NULL); g_free (new_uri); + gtk_widget_grab_focus (web_view); } return TRUE; } From f98b6529967e6dbdb753d4e791cec90d6bd59194 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 18 Apr 2008 02:40:53 +0200 Subject: [PATCH 0071/2970] Fix background tabs, strings and new tab focus. --- katze/katze-utils.c | 10 +++++----- src/midori-browser.c | 7 +++++-- src/midori-websettings.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index ec8c5fc7..da7f089d 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -111,7 +111,7 @@ katze_property_proxy (gpointer object, GParamSpec* pspec = g_object_class_find_property (class, property); if (!pspec) { - g_warning ("Property '%s' is invalid for %s", + g_warning (_("Property '%s' is invalid for %s"), property, G_OBJECT_CLASS_NAME (class)); return gtk_label_new (property); } @@ -124,7 +124,7 @@ katze_property_proxy (gpointer object, gchar* string = NULL; if (type == G_TYPE_PARAM_BOOLEAN) { - widget = gtk_check_button_new_with_label (nick); + widget = gtk_check_button_new_with_label (gettext (nick)); gboolean toggled; g_object_get (object, property, &toggled, NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); @@ -196,7 +196,7 @@ katze_property_proxy (gpointer object, gint i = 0; while (i < enum_class->n_values) { - const gchar* label = enum_class->values[i].value_nick; + const gchar* label = gettext (enum_class->values[i].value_nick); gtk_combo_box_append_text (GTK_COMBO_BOX (widget), label); i++; } @@ -208,7 +208,7 @@ katze_property_proxy (gpointer object, g_type_class_unref (enum_class); } else - widget = gtk_label_new (nick); + widget = gtk_label_new (gettext (nick)); g_free (string); gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); @@ -236,7 +236,7 @@ katze_property_label (gpointer object, GParamSpec* pspec = g_object_class_find_property (class, property); if (!pspec) { - g_warning ("Property '%s' is invalid for %s", + g_warning (_("Property '%s' is invalid for %s"), property, G_OBJECT_CLASS_NAME (class)); return gtk_label_new (property); } diff --git a/src/midori-browser.c b/src/midori-browser.c index fcb27dec..b8428508 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -422,6 +422,7 @@ midori_web_view_new_tab_cb (GtkWidget* web_view, MidoriBrowser* browser) { midori_browser_append_uri (browser, uri); + gtk_widget_grab_focus (web_view); } static void @@ -2941,10 +2942,10 @@ midori_browser_append_tab (MidoriBrowser* browser, gboolean open_tabs_in_the_background; g_object_get (priv->settings, "open-tabs-in-the-background", &open_tabs_in_the_background, NULL); - if (open_tabs_in_the_background) + if (!open_tabs_in_the_background) { gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); - gtk_window_set_focus (GTK_WINDOW (browser), priv->location); + gtk_widget_grab_focus (priv->location); } return n; } @@ -2999,6 +3000,8 @@ midori_browser_append_xbel_item (MidoriBrowser* browser, /** * midori_browser_append_uri: + * @browser: a #MidoriBrowser + * @uri: an URI * * Appends an uri in the form of a new tab. * diff --git a/src/midori-websettings.c b/src/midori-websettings.c index c89f0613..3c3c2b75 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -127,9 +127,9 @@ midori_startup_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_STARTUP_BLANK, "MIDORI_STARTUP_BLANK", "Blank" }, - { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", "Homepage" }, - { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", "Last open pages" }, + { MIDORI_STARTUP_BLANK, "MIDORI_STARTUP_BLANK", N_("Blank") }, + { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Homepage") }, + { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Last open pages") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriStartup", values); @@ -144,12 +144,12 @@ midori_preferred_encoding_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", "Chinese (BIG5)" }, - { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", "Japanese (SHIFT_JIS)" }, - { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", "Russian (KOI8-R)" }, - { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", "Unicode (UTF-8)" }, - { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", "Western (ISO-8859-1)" }, - { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_CUSTOM", "Custom..." }, + { MIDORI_ENCODING_CHINESE, "MIDORI_ENCODING_CHINESE", N_("Chinese (BIG5)") }, + { MIDORI_ENCODING_JAPANESE, "MIDORI_ENCODING_JAPANESE", N_("Japanese (SHIFT_JIS)") }, + { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, + { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") }, + { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") }, + { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_CUSTOM", N_("Custom...") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriPreferredEncoding", values); @@ -164,9 +164,9 @@ midori_new_page_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_NEW_PAGE_TAB, "MIDORI_NEW_PAGE_TAB", "New tab" }, - { MIDORI_NEW_PAGE_WINDOW, "MIDORI_NEW_PAGE_WINDOW", "New window" }, - { MIDORI_NEW_PAGE_CURRENT, "MIDORI_NEW_PAGE_CURRENT", "Current tab" }, + { MIDORI_NEW_PAGE_TAB, "MIDORI_NEW_PAGE_TAB", N_("New tab") }, + { MIDORI_NEW_PAGE_WINDOW, "MIDORI_NEW_PAGE_WINDOW", N_("New window") }, + { MIDORI_NEW_PAGE_CURRENT, "MIDORI_NEW_PAGE_CURRENT", N_("Current tab") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriNewPage", values); @@ -181,11 +181,11 @@ midori_toolbar_style_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", "Default" }, - { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", "Icons" }, - { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", "Text" }, - { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", "Both" }, - { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", "Both horizontal" }, + { MIDORI_TOOLBAR_DEFAULT, "MIDORI_TOOLBAR_DEFAULT", N_("Default") }, + { MIDORI_TOOLBAR_ICONS, "MIDORI_TOOLBAR_ICONS", N_("Icons") }, + { MIDORI_TOOLBAR_TEXT, "MIDORI_TOOLBAR_TEXT", N_("Text") }, + { MIDORI_TOOLBAR_BOTH, "MIDORI_TOOLBAR_BOTH", N_("Both") }, + { MIDORI_TOOLBAR_BOTH_HORIZ, "MIDORI_TOOLBAR_BOTH_HORIZ", N_("Both horizontal") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriToolbarStyle", values); @@ -200,9 +200,9 @@ midori_accept_cookies_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_ACCEPT_COOKIES_ALL, "MIDORI_ACCEPT_COOKIES_ALL", "All cookies" }, - { MIDORI_ACCEPT_COOKIES_SESSION, "MIDORI_ACCEPT_COOKIES_SESSION", "Session cookies" }, - { MIDORI_ACCEPT_COOKIES_NONE, "MIDORI_ACCEPT_COOKIES_NONE", "None" }, + { MIDORI_ACCEPT_COOKIES_ALL, "MIDORI_ACCEPT_COOKIES_ALL", N_("All cookies") }, + { MIDORI_ACCEPT_COOKIES_SESSION, "MIDORI_ACCEPT_COOKIES_SESSION", N_("Session cookies") }, + { MIDORI_ACCEPT_COOKIES_NONE, "MIDORI_ACCEPT_COOKIES_NONE", N_("None") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriAcceptCookies", values); From d1b085f61a7f20c8361c534a9d904b137f929670 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Apr 2008 14:19:37 +0200 Subject: [PATCH 0072/2970] Update German localisation plus a tiny string fix. --- po/de.po | 1003 ++++++++++++++++++++------------------ src/main.c | 2 +- src/midori-websettings.c | 2 +- src/midori-websettings.h | 2 +- 4 files changed, 534 insertions(+), 475 deletions(-) diff --git a/po/de.po b/po/de.po index 92ed1189..990322a4 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-22 03:05+0100\n" +"POT-Creation-Date: 2008-04-19 12:56+0200\n" "PO-Revision-Date: 2008-03-20 13:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -19,20 +19,15 @@ msgstr "" #: ../midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Kleiner Navigator" +msgstr "Kleiner Netznavigator" #: ../midori.desktop.in.h:2 msgid "Midori Web Browser" -msgstr "Midori Navigator" +msgstr "Midori Netznavigator" #: ../midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Navigator" - -#. FIXME: Should we have a more specific message? -#: ../src/helpers.c:68 ../src/helpers.c:84 -msgid "Could not run external program." -msgstr "Externes Programm konnte nicht gestartet werden" +msgstr "Netznavigator" #: ../src/main.c:49 msgid "Bookmark" @@ -46,7 +41,8 @@ msgstr "Neues Lesezeichen" msgid "_Form Fill" msgstr "_Formulare ausfüllen" -#: ../src/main.c:52 ../src/prefs.c:369 ../src/prefs.c:374 +#: ../src/main.c:52 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:402 msgid "Homepage" msgstr "Startseite" @@ -66,51 +62,51 @@ msgstr "_Vollbild" msgid "_Leave Fullscreen" msgstr "Vollbild _verlassen" -#: ../src/main.c:139 ../src/main.c:171 -msgid "midori" -msgstr "midori" - #: ../src/main.c:146 -msgid "Display program version" -msgstr "Programmversion anzeigen" - -#: ../src/main.c:150 -msgid "[URL]" -msgstr "[URL]" - -#: ../src/main.c:173 -msgid "Debugging" -msgstr "Fehlerbehebung" - -#: ../src/main.c:174 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" - -#: ../src/main.c:176 -msgid "Check for new versions at:" -msgstr "Informieren Sie sich über neue Versionen unter:" - -#: ../src/main.c:193 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" -#: ../src/main.c:219 +#: ../src/main.c:266 ../src/main.c:299 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:273 +msgid "Display program version" +msgstr "Programmversion anzeigen" + +#: ../src/main.c:278 +msgid "[URL]" +msgstr "[URL]" + +#: ../src/main.c:301 +msgid "Debugging" +msgstr "Fehlerbehebung" + +#: ../src/main.c:302 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" + +#: ../src/main.c:304 +msgid "Check for new versions at:" +msgstr "Informieren Sie sich über neue Versionen unter:" + +#: ../src/main.c:339 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" -#: ../src/main.c:232 +#: ../src/main.c:353 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Die Sitzung konnte nicht geladen werden. %s\n" -#: ../src/main.c:244 +#: ../src/main.c:365 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" -#: ../src/main.c:254 +#: ../src/main.c:375 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" @@ -118,354 +114,354 @@ msgstr "Folgende Fehler sind aufgetreten:" msgid "Select _All" msgstr "A_lles markieren" -#: ../src/midori-browser.c:185 ../src/midori-browser.c:1918 -#: ../src/midori-browser.c:1924 +#: ../src/midori-browser.c:187 ../src/midori-browser.c:1945 +#: ../src/midori-browser.c:1951 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:1921 +#: ../src/midori-browser.c:195 ../src/midori-browser.c:1948 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../src/midori-browser.c:258 +#: ../src/midori-browser.c:245 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../src/midori-browser.c:521 ../src/midori-webview.c:253 +#: ../src/midori-browser.c:512 ../src/midori-webview.c:253 msgid "The associated settings" msgstr "Die zugewiesenen Einstellungen" -#: ../src/midori-browser.c:541 ../src/midori-webview.c:244 +#: ../src/midori-browser.c:532 ../src/midori-webview.c:244 msgid "The text that is displayed in the statusbar" msgstr "Der Text, der in der Statusleiste angezeigt wird" -#: ../src/midori-browser.c:560 +#: ../src/midori-browser.c:551 msgid "The trash, collecting recently closed tabs and windows" msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" -#: ../src/midori-browser.c:1051 +#: ../src/midori-browser.c:1068 msgid "Open location" msgstr "Adresse öffnen" -#: ../src/midori-browser.c:1063 ../src/midori-browser.c:1109 +#: ../src/midori-browser.c:1080 ../src/midori-browser.c:1126 msgid "_Location:" msgstr "_Ort:" #. TODO: We should offer all of the search's features here -#: ../src/midori-browser.c:1097 +#: ../src/midori-browser.c:1114 msgid "Web search" msgstr "Netzsuche" -#: ../src/midori-browser.c:1136 +#: ../src/midori-browser.c:1153 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../src/midori-browser.c:1136 +#: ../src/midori-browser.c:1153 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../src/midori-browser.c:1153 +#: ../src/midori-browser.c:1170 msgid "_Title:" msgstr "_Titel:" -#: ../src/midori-browser.c:1169 ../src/webSearch.c:199 +#: ../src/midori-browser.c:1186 ../src/webSearch.c:200 msgid "_Description:" msgstr "_Beschreibung" -#: ../src/midori-browser.c:1188 ../src/webSearch.c:213 +#: ../src/midori-browser.c:1205 ../src/webSearch.c:214 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1206 +#: ../src/midori-browser.c:1223 msgid "_Folder:" msgstr "_Ordner:" -#: ../src/midori-browser.c:1210 +#: ../src/midori-browser.c:1227 msgid "Root" msgstr "Wurzel" -#: ../src/midori-browser.c:1429 +#: ../src/midori-browser.c:1449 msgid "Separator" msgstr "Trennlinie" -#: ../src/midori-browser.c:1615 +#: ../src/midori-browser.c:1637 msgid "A lightweight web browser." -msgstr "Ein kleiner Navigator." +msgstr "Ein kleiner Netznavigator." -#: ../src/midori-browser.c:1623 +#: ../src/midori-browser.c:1645 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../src/midori-browser.c:1838 +#: ../src/midori-browser.c:1865 msgid "_File" msgstr "_Datei" -#: ../src/midori-browser.c:1841 +#: ../src/midori-browser.c:1868 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../src/midori-browser.c:1844 +#: ../src/midori-browser.c:1871 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../src/midori-browser.c:1847 +#: ../src/midori-browser.c:1874 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../src/midori-browser.c:1850 +#: ../src/midori-browser.c:1877 msgid "Save to a file" msgstr "In Datei speichern" -#: ../src/midori-browser.c:1852 +#: ../src/midori-browser.c:1879 msgid "_Close Tab" msgstr "Reiter sch_ließen" -#: ../src/midori-browser.c:1853 +#: ../src/midori-browser.c:1880 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../src/midori-browser.c:1855 +#: ../src/midori-browser.c:1882 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../src/midori-browser.c:1856 +#: ../src/midori-browser.c:1883 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../src/midori-browser.c:1858 +#: ../src/midori-browser.c:1885 msgid "Pa_ge Setup" msgstr "Seite _einrichten" -#: ../src/midori-browser.c:1868 +#: ../src/midori-browser.c:1895 msgid "Quit the application" msgstr "Programm beenden" -#: ../src/midori-browser.c:1870 +#: ../src/midori-browser.c:1897 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/midori-browser.c:1873 +#: ../src/midori-browser.c:1900 msgid "Undo the last modification" msgstr "Die letzte Änderung wiederrufen" -#: ../src/midori-browser.c:1876 +#: ../src/midori-browser.c:1903 msgid "Redo the last modification" msgstr "Die letzte Änderung wiederholen" -#: ../src/midori-browser.c:1882 ../src/midori-browser.c:1885 +#: ../src/midori-browser.c:1909 ../src/midori-browser.c:1912 msgid "Copy the selected text" -msgstr "MArkierten Text kopieren" +msgstr "Markierten Text kopieren" -#: ../src/midori-browser.c:1888 +#: ../src/midori-browser.c:1915 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../src/midori-browser.c:1891 +#: ../src/midori-browser.c:1918 msgid "Delete the selected text" -msgstr "Marlkierten Text löschen" +msgstr "Markierten Text löschen" -#: ../src/midori-browser.c:1894 +#: ../src/midori-browser.c:1921 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../src/midori-browser.c:1902 +#: ../src/midori-browser.c:1929 msgid "Find _Next" -msgstr "_Nächstes" +msgstr "_Nächstes suchen" -#: ../src/midori-browser.c:1905 +#: ../src/midori-browser.c:1932 msgid "Find _Previous" -msgstr "_Vorheriges" +msgstr "_Vorheriges suchen" -#: ../src/midori-browser.c:1908 +#: ../src/midori-browser.c:1935 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../src/midori-browser.c:1914 +#: ../src/midori-browser.c:1941 msgid "_View" msgstr "_Ansicht" -#: ../src/midori-browser.c:1915 +#: ../src/midori-browser.c:1942 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../src/midori-browser.c:1935 +#: ../src/midori-browser.c:1962 msgid "View Source" msgstr "Quelltext anzeigen" -#: ../src/midori-browser.c:1938 +#: ../src/midori-browser.c:1965 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../src/midori-browser.c:1942 +#: ../src/midori-browser.c:1969 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../src/midori-browser.c:1944 +#: ../src/midori-browser.c:1971 msgid "_Go" msgstr "_Gehe zu" -#: ../src/midori-browser.c:1955 +#: ../src/midori-browser.c:1982 msgid "Location..." msgstr "Ort..." -#: ../src/midori-browser.c:1958 +#: ../src/midori-browser.c:1985 msgid "Web Search..." msgstr "Netzsuche..." -#: ../src/midori-browser.c:1961 +#: ../src/midori-browser.c:1988 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen..." -#: ../src/midori-browser.c:1964 +#: ../src/midori-browser.c:1991 msgid "Closed Tabs and Windows" msgstr "Geschlossene Reiter und Fenster" -#: ../src/midori-browser.c:1965 +#: ../src/midori-browser.c:1992 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../src/midori-browser.c:1967 +#: ../src/midori-browser.c:1994 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../src/midori-browser.c:1970 +#: ../src/midori-browser.c:1997 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../src/midori-browser.c:1973 +#: ../src/midori-browser.c:2000 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../src/midori-browser.c:1978 +#: ../src/midori-browser.c:2005 msgid "_Manage Bookmarks" msgstr "Lesezeichen _verwalten" -#: ../src/midori-browser.c:1984 +#: ../src/midori-browser.c:2011 msgid "Open in New _Tab" msgstr "In einem neuen _Reiter öffnen" -#: ../src/midori-browser.c:1987 +#: ../src/midori-browser.c:2014 msgid "Open in New _Window" msgstr "In einem neuen _Fenster öffnen" -#: ../src/midori-browser.c:1996 +#: ../src/midori-browser.c:2023 msgid "_Tools" msgstr "_Extras" -#: ../src/midori-browser.c:1998 +#: ../src/midori-browser.c:2025 msgid "_Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../src/midori-browser.c:1999 +#: ../src/midori-browser.c:2026 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." -#: ../src/midori-browser.c:2002 +#: ../src/midori-browser.c:2029 msgid "_Window" msgstr "_Fenster" -#: ../src/midori-browser.c:2004 +#: ../src/midori-browser.c:2031 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../src/midori-browser.c:2007 +#: ../src/midori-browser.c:2034 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../src/midori-browser.c:2010 +#: ../src/midori-browser.c:2037 msgid "Tab _Overview" msgstr "Reiterüber_sicht" #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2013 +#: ../src/midori-browser.c:2040 msgid "_Help" msgstr "_Hilfe" -#: ../src/midori-browser.c:2015 +#: ../src/midori-browser.c:2042 msgid "_Contents" msgstr "_Inhalt" -#: ../src/midori-browser.c:2025 +#: ../src/midori-browser.c:2052 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../src/midori-browser.c:2029 +#: ../src/midori-browser.c:2056 msgid "_Work Offline" msgstr "_Ohne Verbindung arbeiten" -#: ../src/midori-browser.c:2034 +#: ../src/midori-browser.c:2061 msgid "_Navigationbar" -msgstr "Navigationsleiste" +msgstr "_Navigationsleiste" -#: ../src/midori-browser.c:2038 +#: ../src/midori-browser.c:2065 msgid "Side_panel" -msgstr "Seitenleiste" +msgstr "Seiten_leiste" -#: ../src/midori-browser.c:2042 +#: ../src/midori-browser.c:2069 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../src/midori-browser.c:2046 +#: ../src/midori-browser.c:2073 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../src/midori-browser.c:2050 +#: ../src/midori-browser.c:2077 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../src/midori-browser.c:2520 +#: ../src/midori-browser.c:2524 msgid "Bookmarks" msgstr "Lesezeichen" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2530 ../src/prefs.c:381 +#: ../src/midori-browser.c:2534 ../src/prefs.c:101 msgid "Transfers" msgstr "Übertragungen" -#: ../src/midori-browser.c:2539 +#: ../src/midori-browser.c:2541 msgid "Console" msgstr "Konsole" -#: ../src/midori-browser.c:2548 ../src/prefs.c:669 +#: ../src/midori-browser.c:2550 ../src/prefs.c:230 msgid "History" msgstr "Verlauf" -#: ../src/midori-browser.c:2557 +#: ../src/midori-browser.c:2559 msgid "Pageholder" msgstr "Seitenhalter" -#: ../src/midori-browser.c:2579 +#: ../src/midori-browser.c:2577 msgid "_Inline find:" -msgstr "Inkrementelle suche:" +msgstr "_Inkrementelle suche:" -#: ../src/midori-browser.c:2605 +#: ../src/midori-browser.c:2603 msgid "Match Case" msgstr "Groß-/ Kleinschreibung beachten" -#: ../src/midori-browser.c:2622 +#: ../src/midori-browser.c:2620 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../src/midori-panel.c:140 +#: ../src/midori-panel.c:146 msgid "Appearance of the shadow around each panel" msgstr "Erscheinungsbild des Schattens um jede Leiste" -#: ../src/midori-panel.c:150 +#: ../src/midori-panel.c:156 msgid "Menu to hold panel items" msgstr "Menü für Leistenelemente" -#: ../src/midori-panel.c:159 +#: ../src/midori-panel.c:165 msgid "The index of the current page" msgstr "Der Index der aktiven Seite" -#: ../src/midori-panel.c:203 ../src/midori-panel.c:204 +#: ../src/midori-panel.c:211 ../src/midori-panel.c:212 msgid "Close panel" msgstr "Leiste schließen" -#: ../src/midori-panel.c:368 +#: ../src/midori-panel.c:374 msgid "Untitled" msgstr "Unbenannt" @@ -473,18 +469,374 @@ msgstr "Unbenannt" msgid "The maximum number of items" msgstr "Die maximale Anzahl an Elementen" -#: ../src/midori-websettings.c:69 +#: ../src/midori-websettings.c:130 +msgid "Blank page" +msgstr "Leere Seite" + +#: ../src/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Zuletzt geöffnete Seiten" + +#: ../src/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Chinesisch (BIG5)" + +#: ../src/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanisch (SHIFT_JIS)" + +#: ../src/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Russisch (KOI8-r)" + +#: ../src/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../src/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Westlich (ISO-8859-1)" + +#: ../src/midori-websettings.c:152 +msgid "Custom..." +msgstr "Benutzerdefinidert..." + +#: ../src/midori-websettings.c:167 +msgid "New tab" +msgstr "Neuer Reiter" + +#: ../src/midori-websettings.c:168 +msgid "New window" +msgstr "Neues Fenster" + +#: ../src/midori-websettings.c:169 +msgid "Current tab" +msgstr "Aktueller Reiter" + +#: ../src/midori-websettings.c:184 +msgid "Default" +msgstr "Standard" + +#: ../src/midori-websettings.c:185 +msgid "Icons" +msgstr "Symbole" + +#: ../src/midori-websettings.c:186 +msgid "Text" +msgstr "Text" + +#: ../src/midori-websettings.c:187 +msgid "Both" +msgstr "Beides" + +#: ../src/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Beides horizontal" + +#: ../src/midori-websettings.c:203 +msgid "All cookies" +msgstr "Alle Kekse" + +#: ../src/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Sitzungskekse" + +#: ../src/midori-websettings.c:205 +msgid "None" +msgstr "Keine" + +#: ../src/midori-websettings.c:242 +msgid "Remember last window size" +msgstr "Letzte Fenstergröße merken" + +#: ../src/midori-websettings.c:243 +msgid "Whether to save the last window size" +msgstr "Die letzte Fenstergröße speichern oder nicht" + +#: ../src/midori-websettings.c:251 +msgid "Last window width" +msgstr "Letzte Fensterbreite" + +#: ../src/midori-websettings.c:252 +msgid "The last saved window width" +msgstr "Die zuletzt gespeicherte Fensterbreite" + +#: ../src/midori-websettings.c:260 +msgid "Last window height" +msgstr "Letzte Fensterhöhe" + +#: ../src/midori-websettings.c:261 +msgid "The last saved window height" +msgstr "Die zuletzt gespeicherte Fensterhöhe" + +#: ../src/midori-websettings.c:269 +msgid "Last panel position" +msgstr "Letzte Leistenposition" + +#: ../src/midori-websettings.c:270 +msgid "The last saved panel position" +msgstr "Die zuletzt gespeicherte Leistenposition" + +#: ../src/midori-websettings.c:278 +msgid "Last panel page" +msgstr "Letzte Leistenseite" + +#: ../src/midori-websettings.c:279 +msgid "The last saved panel page" +msgstr "Die zuletzt gespeicherte Leistenseite" + +#: ../src/midori-websettings.c:287 +msgid "Last Web search" +msgstr "Letzte Netzsuche" + +#: ../src/midori-websettings.c:288 +msgid "The last saved Web search" +msgstr "Die zuletzt gespeicherte Netzsuche" + +#: ../src/midori-websettings.c:296 +msgid "Last pageholder URI" +msgstr "Letzte URI im Seitenhalter" + +#: ../src/midori-websettings.c:297 +msgid "The URI last opened in the pageholder" +msgstr "Die letzte im Seitenhalter geöffnete URI" + +#: ../src/midori-websettings.c:307 +msgid "Show Navigationbar" +msgstr "Navigationsleiste anzeigen" + +#: ../src/midori-websettings.c:308 +msgid "Whether to show the navigationbar" +msgstr "Die Navigationsleiste anzeigen oder verbergen" + +#: ../src/midori-websettings.c:316 +msgid "Show Bookmarkbar" +msgstr "Lesezeichenleiste anzeigen" + +#: ../src/midori-websettings.c:317 +msgid "Whether to show the bookmarkbar" +msgstr "Die Lesezeichenleiste anzeigen oder verbergen" + +#: ../src/midori-websettings.c:325 +msgid "Show Panel" +msgstr "Leiste anzeigen" + +#: ../src/midori-websettings.c:326 +msgid "Whether to show the panel" +msgstr "Die Leiste anzeigen oder verbergen" + +#: ../src/midori-websettings.c:334 +msgid "Show Statusbar" +msgstr "Statusleiste anzeigen" + +#: ../src/midori-websettings.c:335 +msgid "Whether to show the statusbar" +msgstr "Die Statusleiste anzeigen oder verbergen" + +#: ../src/midori-websettings.c:344 +msgid "Toolbar Style" +msgstr "Werkzeugleistenstil" + +#: ../src/midori-websettings.c:345 +msgid "The style of the toolbar" +msgstr "Der Stil der Werkzeugleiste" + +#: ../src/midori-websettings.c:354 +msgid "Small toolbar" +msgstr "Kleine Werkzeugleiste" + +#: ../src/midori-websettings.c:355 +msgid "Use small toolbar icons" +msgstr "Kleine Symbole benutzen" + +#: ../src/midori-websettings.c:363 +msgid "Show New Tab" +msgstr "Zeige Neuer Reiter" + +#: ../src/midori-websettings.c:364 +msgid "Show the New Tab button in the toolbar" +msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" + +#: ../src/midori-websettings.c:372 +msgid "Show Web search" +msgstr "Zeige Netzsuche" + +#: ../src/midori-websettings.c:373 +msgid "Show the Web search entry in the toolbar" +msgstr "Netzsuchfeld in der Werkzeugleiste anzeigen" + +#: ../src/midori-websettings.c:381 +msgid "Show Trash" +msgstr "Zeige Papierkorb" + +#: ../src/midori-websettings.c:382 +msgid "Show the Trash button in the toolbar" +msgstr "Papierkorb-Knopf in der Werkzeugleiste anzeigen" + +#: ../src/midori-websettings.c:392 +msgid "Load on Startup" +msgstr "Beim Programmstart öffnen" + +#: ../src/midori-websettings.c:393 +msgid "What to load on startup" +msgstr "Was beim Programmstart geöffnet werden soll" + +#: ../src/midori-websettings.c:403 +msgid "The homepage" +msgstr "Die Startseite" + +#: ../src/midori-websettings.c:411 +msgid "Download Folder" +msgstr "Dateispeicherordner" + +#: ../src/midori-websettings.c:412 +msgid "The folder downloaded files are saved to" +msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" + +#: ../src/midori-websettings.c:420 +msgid "Show Download Notification" +msgstr "Übertragungsbenachrichtigung anzeigen" + +#: ../src/midori-websettings.c:421 +msgid "Show a notification window for finished downloads" +msgstr "Zeige ein Hinweisfenster für abgeschlossene Übertragungen" + +#: ../src/midori-websettings.c:429 +msgid "Location entry Search" +msgstr "Adressfeldsuche" + +#: ../src/midori-websettings.c:430 +msgid "The search to perform inside the location entry" +msgstr "Die Suche, die über das Adressfeld ausgeführt wird" + +#: ../src/midori-websettings.c:438 +msgid "Preferred Encoding" +msgstr "Bevorzugte Kodierung" + +#: ../src/midori-websettings.c:439 +msgid "The preferred character encoding" +msgstr "Die bevorzugte Zeichenkodierung" + +#: ../src/midori-websettings.c:450 +msgid "Tab Label Size" +msgstr "Reitergröße" + +#: ../src/midori-websettings.c:451 msgid "The desired tab label size" msgstr "Die gewünschte Größe der Reiterbeschriftung" -#: ../src/midori-websettings.c:78 -msgid "Whether tabs have close buttons" -msgstr "Ob Reiter Schließenknöpfe haben" +#: ../src/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "Schließenknöpfe auf Reitern" -#: ../src/midori-websettings.c:87 +#: ../src/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" + +#: ../src/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "Öffne neue Seiten in" + +#: ../src/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "Wo neue Seiten geöffnet werden sollen" + +#: ../src/midori-websettings.c:478 +msgid "Middle click opens Selection" +msgstr "Mittelklick öffnet Markierung" + +#: ../src/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" +#: ../src/midori-websettings.c:487 +msgid "Open tabs in the background" +msgstr "Reiter im Hintergrund öffnen" + +#: ../src/midori-websettings.c:488 +msgid "Whether to open new tabs in the background" +msgstr "Neue Reiter im Hintergrund öffnen" + +#: ../src/midori-websettings.c:496 +msgid "Open popups in tabs" +msgstr "Aufklappfenster in Reitern öffnen" + +#: ../src/midori-websettings.c:497 +msgid "Whether to open popup windows in tabs" +msgstr "Aufklappfenster in neuen Reitern öffnen" + +#: ../src/midori-websettings.c:507 +msgid "Accept cookies" +msgstr "Kekse annehmen" + +#: ../src/midori-websettings.c:508 +msgid "What type of cookies to accept" +msgstr "Welche Art von Keksen akzeptiert werden" + +#: ../src/midori-websettings.c:517 +msgid "Original cookies only" +msgstr "Nur ursprüngliche Kekse" + +#: ../src/midori-websettings.c:518 +msgid "Accept cookies from the original website only" +msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" + +#: ../src/midori-websettings.c:526 +msgid "Maximum cookie age" +msgstr "Maximales Keksalter" + +#: ../src/midori-websettings.c:527 +msgid "The maximum number of days to save cookies for" +msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" + +#: ../src/midori-websettings.c:537 +msgid "Remember last visited pages" +msgstr "Zuletzt besuchte Seiten merken" + +#: ../src/midori-websettings.c:538 +msgid "Whether the last visited pages are saved" +msgstr "Die zuletzt besuchten Seiten speichern" + +#: ../src/midori-websettings.c:546 +msgid "Maximum history age" +msgstr "Maximales Verlaufsalter" + +#: ../src/midori-websettings.c:547 +msgid "The maximum number of days to save the history for" +msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" + +#: ../src/midori-websettings.c:555 +msgid "Remember last form inputs" +msgstr "Zuletzt eingegebene Formulareingaben merken" + +#: ../src/midori-websettings.c:556 +msgid "Whether the last form inputs are saved" +msgstr "Die letzten Formulareingaben speichern" + +#: ../src/midori-websettings.c:564 +msgid "Remember last downloaded files" +msgstr "Zuletzt heruntergeladene Dateien merken" + +#: ../src/midori-websettings.c:565 +msgid "Whether the last downloaded files are saved" +msgstr "Die zuletzt heruntegeladenen Dateien speichern" + +#: ../src/midori-websettings.c:575 +msgid "HTTP Proxy" +msgstr "HTTP-Zwischenrechner" + +#: ../src/midori-websettings.c:576 +msgid "The proxy used for HTTP connections" +msgstr "Der Zwischenrechner für HTTP-Verbindungen" + +#: ../src/midori-websettings.c:584 +msgid "Cache size" +msgstr "Zwischenspeichergröße" + +#: ../src/midori-websettings.c:585 +msgid "The allowed size of the cache" +msgstr "Die erlaubte Zwischenspeichergröße" + #: ../src/midori-webview.c:217 msgid "The icon of the currently loaded page" msgstr "Das Symbol der aktuellen Seite" @@ -497,387 +849,86 @@ msgstr "Die URI der aktuellen Seite" msgid "The title of the currently loaded page" msgstr "Der Titel der aktuellen Seite" -#: ../src/midori-webview.c:472 +#: ../src/midori-webview.c:476 msgid "Open Link in New _Tab" msgstr "Verweis in einem neuen _Reiter öffnen" -#: ../src/midori-webview.c:495 +#: ../src/midori-webview.c:499 msgid "Open URL in New _Tab" msgstr "_URL in einem neuen Reiter öffnen" -#: ../src/prefs.c:299 +#: ../src/prefs.c:32 #, c-format msgid "%s Preferences" msgstr "%s Einstellungen" #. Page "General" -#: ../src/prefs.c:363 +#: ../src/prefs.c:89 msgid "General" msgstr "Allgemein" -#: ../src/prefs.c:364 +#: ../src/prefs.c:90 msgid "Startup" msgstr "Programmstart" -#: ../src/prefs.c:366 -msgid "Load on startup" -msgstr "Beim Programmstart öffnen" - -#: ../src/prefs.c:369 -msgid "Blank page" -msgstr "Leere Seite" - -#: ../src/prefs.c:369 -msgid "Last open pages" -msgstr "Zuletzt geöffnete Seiten" - -#: ../src/prefs.c:383 -msgid "Download folder" -msgstr "Dateispeicherordner" - -#: ../src/prefs.c:385 -msgid "Choose downloaded files folder" -msgstr "Ordner für heruntergeladene Dateien auswählen" - -#: ../src/prefs.c:392 -msgid "Show a notification window for finished transfers" -msgstr "Zeige ein Hinweisfenster für abgeschlossene Übertragungen" - -#: ../src/prefs.c:395 -msgid "Languages" -msgstr "Sprachen" - -#: ../src/prefs.c:397 -msgid "Preferred languages" -msgstr "Bevorzugte Sprachen" - #. Page "Appearance" -#: ../src/prefs.c:409 +#: ../src/prefs.c:111 msgid "Appearance" -msgstr "Anzeige" +msgstr "Erscheinungsbild" -#: ../src/prefs.c:410 +#: ../src/prefs.c:112 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../src/prefs.c:412 -msgid "Default _font" -msgstr "Standard_schrift" - -#: ../src/prefs.c:419 -msgid "_Minimum font size" -msgstr "_Minimale Schriftgröße" - -#: ../src/prefs.c:426 -msgid "_Advanced" -msgstr "_Erweitert" - -#: ../src/prefs.c:430 -msgid "Default _encoding" -msgstr "Standard_kodierung" - -#: ../src/prefs.c:433 -msgid "Chinese (BIG5)" -msgstr "Traditionelles Chinesisch (Big5)" - -#: ../src/prefs.c:433 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japanisch (Shift_JIS)" - -#: ../src/prefs.c:433 -msgid "Russian (KOI8-R)" -msgstr "Russisch (KOI8-R)" - -#: ../src/prefs.c:434 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../src/prefs.c:434 -msgid "Western (ISO-8859-1)" -msgstr "Westlich (ISO-8859-1)" - -#: ../src/prefs.c:449 -msgid "Advanced settings" -msgstr "Erweiterte Einstellungen" - -#: ../src/prefs.c:452 -msgid "Default colors" -msgstr "Standardfarben" - -#: ../src/prefs.c:454 -msgid "Text color" -msgstr "Textfarbe" - -#: ../src/prefs.c:458 -msgid "Background color" -msgstr "Hintergrundfarbe" - -#: ../src/prefs.c:462 -msgid "Link color" -msgstr "Verweisfarbe" - -#: ../src/prefs.c:466 -msgid "Visited link color" -msgstr "Besuchte Verweisfarbe" - #. Page "Behavior" -#: ../src/prefs.c:472 +#: ../src/prefs.c:133 msgid "Behavior" msgstr "Verhalten" -#: ../src/prefs.c:473 -msgid "Browsing" -msgstr "Navigation" - -#: ../src/prefs.c:475 -msgid "Open _new pages in" -msgstr "_Neue Seiten öffnen in" - -#: ../src/prefs.c:478 -msgid "New tab" -msgstr "Neuer Reiter" - -#: ../src/prefs.c:478 -msgid "New window" -msgstr "Neues Fenster" - -#: ../src/prefs.c:478 -msgid "Current tab" -msgstr "Aktuelle Reiter" - -#: ../src/prefs.c:483 -msgid "_Middle click opens selection" -msgstr "_Mittelklick öffnet Markierung" - -#: ../src/prefs.c:488 -msgid "Open tabs in the _background" -msgstr "Reiter im _Hintergrund öffnen" - -#: ../src/prefs.c:493 -msgid "Open popups in _tabs" -msgstr "Aufklappfenster in _Reitern öffnen" - -#: ../src/prefs.c:499 +#: ../src/prefs.c:134 msgid "Features" msgstr "Inhalte" -#: ../src/prefs.c:501 -msgid "Load _images" -msgstr "_Bilder laden" - -#: ../src/prefs.c:506 -msgid "_Shrink images to fit" -msgstr "Bilder automatisch ver_kleinern" - -#: ../src/prefs.c:511 -msgid "Print _backgrounds" -msgstr "Hintergründe _drucken" - -#: ../src/prefs.c:516 -msgid "_Resizable textareas" -msgstr "_Vergrößerbare Textfelder" - -#: ../src/prefs.c:521 -msgid "Enable _scripts" -msgstr "_Skripte aktiveren" - -#: ../src/prefs.c:526 -msgid "Enable _plugins" -msgstr "_Zusatzmodule aktivieren" - -#: ../src/prefs.c:531 -msgid "_User Stylesheet" -msgstr "Be_nutzerstilvorlage" - -#: ../src/prefs.c:537 -msgid "Choose user stylesheet" -msgstr "Stilvorlage auswählen" - #. Page "Interface" -#: ../src/prefs.c:546 +#: ../src/prefs.c:166 msgid "Interface" msgstr "Oberfläche" -#: ../src/prefs.c:547 +#: ../src/prefs.c:167 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../src/prefs.c:549 -msgid "_Toolbar style" -msgstr "Werkzeugleistenstil" - -#: ../src/prefs.c:552 -msgid "Default" -msgstr "Standard" - -#: ../src/prefs.c:552 -msgid "Icons" -msgstr "Symbole" - -#: ../src/prefs.c:552 -msgid "Text" -msgstr "Text" - -#: ../src/prefs.c:552 -msgid "Both" -msgstr "Beides" - -#: ../src/prefs.c:552 -msgid "Both horizontal" -msgstr "Beides horizontal" - -#: ../src/prefs.c:557 -msgid "Show small _icons" -msgstr "Zeige _kleine Symbole" - -#: ../src/prefs.c:562 -msgid "Show Web_search" -msgstr "Zeige Netz_suche" - -#: ../src/prefs.c:567 -msgid "Show _New Tab" -msgstr "Zeige _Neuer Reiter" - -#: ../src/prefs.c:572 -msgid "Show _Trash" -msgstr "Zeige _Papierkorb" - -#: ../src/prefs.c:577 -msgid "Miscellaneous" -msgstr "Verschiedenes" - -#: ../src/prefs.c:579 -msgid "Close _buttons on tabs" -msgstr "Schließen_knöpfe auf Reitern" - -#: ../src/prefs.c:586 -msgid "Tab Si_ze" -msgstr "Reiter_größe" - -#: ../src/prefs.c:593 -msgid "_Location search engine" -msgstr "Adressfeldsuchmaschine" +#: ../src/prefs.c:180 +msgid "Browsing" +msgstr "Navigation" #. Page "Network" -#: ../src/prefs.c:601 +#: ../src/prefs.c:196 ../src/prefs.c:197 msgid "Network" msgstr "Netzwerk" -#: ../src/prefs.c:602 -msgid "Proxy Server" -msgstr "Zwischenrechner" - -#: ../src/prefs.c:604 -msgid "_Custom proxy server" -msgstr "_Benutzerdefinierter Zwischenrechner" - -#: ../src/prefs.c:608 -msgid "_Host/ Port" -msgstr "_Leitrechner/ Anschluss" - -#: ../src/prefs.c:617 -msgid "Proxy requires authentication" -msgstr "Zwischenrechner erfordert Authentifizierung" - -#: ../src/prefs.c:621 -msgid "Username" -msgstr "Benutzername" - -#: ../src/prefs.c:625 -msgid "Password" -msgstr "Kennwort" - -#: ../src/prefs.c:629 -msgid "Cache" -msgstr "Zwischenspeicher" - -#: ../src/prefs.c:631 -msgid "Cache size" -msgstr "Zwischenspeichergröße" - -#: ../src/prefs.c:637 +#: ../src/prefs.c:208 msgid "MB" msgstr "MB" -#: ../src/prefs.c:638 -msgid "Clear cache" -msgstr "Leere Zwischenspeicher" - #. Page "Privacy" -#: ../src/prefs.c:644 +#: ../src/prefs.c:213 msgid "Privacy" msgstr "Privatsphäre" -#: ../src/prefs.c:645 +#: ../src/prefs.c:214 msgid "Cookies" msgstr "Kekse" -#: ../src/prefs.c:647 -msgid "Accept cookies" -msgstr "Kekse annehmen" - -#: ../src/prefs.c:650 -msgid "All cookies" -msgstr "Alle Kekse" - -#: ../src/prefs.c:650 -msgid "Session cookies" -msgstr "Sitzungskekse" - -#: ../src/prefs.c:650 -msgid "None" -msgstr "Keine" - -#: ../src/prefs.c:655 -msgid "Allow cookies from the original website only" -msgstr "Nur Kekse von der ursprünglichen Internetseite annehmen" - -#: ../src/prefs.c:658 -msgid "Maximum cookie age" -msgstr "Maximales Keksalter" - -#: ../src/prefs.c:664 ../src/prefs.c:679 +#: ../src/prefs.c:227 ../src/prefs.c:237 msgid "days" msgstr "Tage" -#: ../src/prefs.c:665 -msgid "View cookies" -msgstr "Kekse anzeigen" - -#: ../src/prefs.c:671 -msgid "Remember my visited pages" -msgstr "Besuchte Seiten merken" - -#: ../src/prefs.c:682 -msgid "Remember my form inputs" -msgstr "Eingegebene Formulare merken" - -#: ../src/prefs.c:686 -msgid "Remember my downloaded files" -msgstr "Heruntergeladene Dateien merken" - -#. Page "Programs" -#: ../src/prefs.c:691 -msgid "Programs" -msgstr "Programme" - -#: ../src/prefs.c:692 -msgid "External programs" -msgstr "Externe Programme" - -#: ../src/prefs.c:703 -msgid "Protocol" -msgstr "Protokoll" - -#: ../src/prefs.c:706 -msgid "Command" -msgstr "Befehl" - -#: ../src/sokoke.c:157 +#: ../src/sokoke.c:219 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../src/sokoke.c:267 ../katze/katze-xbel.c:952 +#: ../src/sokoke.c:341 ../katze/katze-xbel.c:952 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." @@ -886,27 +937,27 @@ msgstr "Schreiben fehlgeschlagen." msgid "Empty" msgstr "Leer" -#: ../src/webSearch.c:153 +#: ../src/webSearch.c:154 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../src/webSearch.c:153 +#: ../src/webSearch.c:154 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../src/webSearch.c:183 +#: ../src/webSearch.c:184 msgid "_Name:" msgstr "_Name:" -#: ../src/webSearch.c:227 +#: ../src/webSearch.c:228 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../src/webSearch.c:241 +#: ../src/webSearch.c:242 msgid "_Keyword:" msgstr "_Schlüsselwort:" -#: ../src/webSearch.c:310 +#: ../src/webSearch.c:311 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" @@ -940,17 +991,25 @@ msgstr "" "Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " "soll" +#: ../katze/katze-utils.c:114 ../katze/katze-utils.c:239 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Eigenschaft '%s' ist ungültig für %s" + +#: ../katze/katze-utils.c:136 ../katze/katze-utils.c:160 +msgid "Choose file" +msgstr "Datei wählen" + +#: ../katze/katze-utils.c:148 +msgid "Choose folder" +msgstr "Dateispeicherordner auswählen" + #: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 #: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 #: ../katze/katze-xbel.c:804 -#, c-format msgid "Malformed document." msgstr "Fehlerhaftes Dokument" #: ../katze/katze-xbel.c:759 -#, c-format msgid "File not found." msgstr "Datei nicht gefunden." - -#~ msgid "Location Entry" -#~ msgstr "Adresseingabefeld" diff --git a/src/main.c b/src/main.c index 0df50448..55f77559 100644 --- a/src/main.c +++ b/src/main.c @@ -415,7 +415,7 @@ int main(int argc, char** argv) if (katze_xbel_folder_is_empty (_session)) { KatzeXbelItem* item = katze_xbel_bookmark_new (); - if (load_on_startup == MIDORI_STARTUP_BLANK) + if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) katze_xbel_bookmark_set_href (item, ""); else { diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 3c3c2b75..c3e0ce8a 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -127,7 +127,7 @@ midori_startup_get_type (void) if (!type) { static const GEnumValue values[] = { - { MIDORI_STARTUP_BLANK, "MIDORI_STARTUP_BLANK", N_("Blank") }, + { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Blank page") }, { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Homepage") }, { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Last open pages") }, { 0, NULL, NULL } diff --git a/src/midori-websettings.h b/src/midori-websettings.h index e322b4e3..ceb8c380 100644 --- a/src/midori-websettings.h +++ b/src/midori-websettings.h @@ -44,7 +44,7 @@ struct _MidoriWebSettings typedef enum { - MIDORI_STARTUP_BLANK, + MIDORI_STARTUP_BLANK_PAGE, MIDORI_STARTUP_HOMEPAGE, MIDORI_STARTUP_LAST_OPEN_PAGES } MidoriStartup; From 457b01224001565ade22f25b5adca4d6a38cbbd6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Apr 2008 14:21:08 +0200 Subject: [PATCH 0073/2970] Add French translation, not quite complete yet --- po/LINGUAS | 2 +- po/fr.po | 1029 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1030 insertions(+), 1 deletion(-) create mode 100644 po/fr.po diff --git a/po/LINGUAS b/po/LINGUAS index c4fd210d..79367714 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de pl sv +de fr pl sv diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 00000000..f216bea4 --- /dev/null +++ b/po/fr.po @@ -0,0 +1,1029 @@ +# French translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Christian Dywan 2008 +# Adrien Nader 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.17\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-04-19 12:56+0200\n" +"PO-Revision-Date: 2008-03-31 17:37+0100\n" +"Last-Translator: Adrien Nader \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Petit navigateur" + +#: ../midori.desktop.in.h:2 +msgid "Midori Web Browser" +msgstr "Navigateur Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Navigateur" + +#: ../src/main.c:49 +msgid "Bookmark" +msgstr "Signet" + +#: ../src/main.c:50 +msgid "New Bookmark" +msgstr "Nouveau Signet" + +#: ../src/main.c:51 +msgid "_Form Fill" +msgstr "Remplissage de _forumlaire" + +#: ../src/main.c:52 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:402 +msgid "Homepage" +msgstr "Page d'accueil" + +#: ../src/main.c:53 +msgid "New _Tab" +msgstr "Nouvel _Onglet" + +#: ../src/main.c:54 +msgid "New _Window" +msgstr "Nouvelle _Fenêtre" + +#: ../src/main.c:59 +msgid "_Fullscreen" +msgstr "_Plein écran" + +#: ../src/main.c:60 +msgid "_Leave Fullscreen" +msgstr "_Quitter le plein écran" + +#: ../src/main.c:146 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "La configuration n'a pu être chargée. %s\n" + +#: ../src/main.c:266 ../src/main.c:299 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:273 +msgid "Display program version" +msgstr "Afficher la version du programme" + +#: ../src/main.c:278 +msgid "[URL]" +msgstr "[URL]" + +#: ../src/main.c:301 +msgid "Debugging" +msgstr "Débogage" + +#: ../src/main.c:302 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Merci d'envoyer vos commentaires, suggestions et problèmes :" + +#: ../src/main.c:304 +msgid "Check for new versions at:" +msgstr "Vérifier l'existence de nouvelles versions sur:" + +#: ../src/main.c:339 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Les signets n'ont pu être chargés. %s\n" + +#: ../src/main.c:353 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "La session n'a pu être chargée. %s\n" + +# pas très content +#: ../src/main.c:365 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "La corbeille n'a pu être chargée. %s\n" + +#: ../src/main.c:375 +msgid "The following errors occured:" +msgstr "Les erreurs suivantes ont eu lieu:" + +#: ../src/main.c:56 +msgid "Select _All" +msgstr "_Tout sélectionner" + +#: ../src/midori-browser.c:187 ../src/midori-browser.c:1945 +#: ../src/midori-browser.c:1951 +msgid "Reload the current page" +msgstr "Recharger la page" + +#: ../src/midori-browser.c:195 ../src/midori-browser.c:1948 +msgid "Stop loading the current page" +msgstr "Arrêter le chargement de la page" + +#: ../src/midori-browser.c:245 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% chargés" + +#: ../src/midori-browser.c:512 ../src/midori-webview.c:253 +msgid "The associated settings" +msgstr "Les réglages associés" + +#: ../src/midori-browser.c:532 ../src/midori-webview.c:244 +msgid "The text that is displayed in the statusbar" +msgstr "Le texte affiché dans la barre d'êtat" + +#: ../src/midori-browser.c:551 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" + +# Vérifier que ce n'est pas 'ouvrir *un* emplacement' +#: ../src/midori-browser.c:1068 +msgid "Open location" +msgstr "Ouvrir l'emplacement" + +#: ../src/midori-browser.c:1080 ../src/midori-browser.c:1126 +msgid "_Location:" +msgstr "_Emplacement" + +#. TODO: We should offer all of the search's features here +#: ../src/midori-browser.c:1114 +msgid "Web search" +msgstr "Recherche toile" + +#: ../src/midori-browser.c:1153 +msgid "New bookmark" +msgstr "Nouveau signet" + +#: ../src/midori-browser.c:1153 +msgid "Edit bookmark" +msgstr "Éditer le Signet" + +#: ../src/midori-browser.c:1170 +msgid "_Title:" +msgstr "_Titre:" + +#: ../src/midori-browser.c:1186 ../src/webSearch.c:200 +msgid "_Description:" +msgstr "_Description" + +#: ../src/midori-browser.c:1205 ../src/webSearch.c:214 +msgid "_URL:" +msgstr "_URL:" + +# manque un raccourcis Alt+X +#: ../src/midori-browser.c:1223 +msgid "_Folder:" +msgstr "Dossier" + +# racine ? +#: ../src/midori-browser.c:1227 +msgid "Root" +msgstr "Racine" + +#: ../src/midori-browser.c:1449 +msgid "Separator" +msgstr "Séparateur" + +#: ../src/midori-browser.c:1637 +msgid "A lightweight web browser." +msgstr "Un navigateur toile léger" + +#: ../src/midori-browser.c:1645 +msgid "translator-credits" +msgstr "" +"Christian Dywan \n" +"Adrien Nader " + +#: ../src/midori-browser.c:1865 +msgid "_File" +msgstr "_Fichier" + +#: ../src/midori-browser.c:1868 +msgid "Open a new window" +msgstr "Ouvrir une nouvelle fenêtre" + +#: ../src/midori-browser.c:1871 +msgid "Open a new tab" +msgstr "Ouvrir un nouvel onglet" + +#: ../src/midori-browser.c:1874 +msgid "Open a file" +msgstr "Ouvrir un fichier" + +# un, le ; enregistrer sous ? +#: ../src/midori-browser.c:1877 +msgid "Save to a file" +msgstr "Enregistrer dans un fichier" + +#: ../src/midori-browser.c:1879 +msgid "_Close Tab" +msgstr "Fe_rmer l'onglet" + +#: ../src/midori-browser.c:1880 +msgid "Close the current tab" +msgstr "Fermer l'onglet actuel" + +#: ../src/midori-browser.c:1882 +msgid "C_lose Window" +msgstr "_Fermer la fenêtre" + +#: ../src/midori-browser.c:1883 +msgid "Close this window" +msgstr "Fermer cette fenêtre" + +# setup : organisation ? +#: ../src/midori-browser.c:1885 +msgid "Pa_ge Setup" +msgstr "Organisation de la page" + +#: ../src/midori-browser.c:1895 +msgid "Quit the application" +msgstr "Quitter le programme" + +#: ../src/midori-browser.c:1897 +msgid "_Edit" +msgstr "Édit_er" + +#: ../src/midori-browser.c:1900 +msgid "Undo the last modification" +msgstr "Annuler la dernière modification" + +#: ../src/midori-browser.c:1903 +msgid "Redo the last modification" +msgstr "Répéter la dernière modification" + +#: ../src/midori-browser.c:1909 ../src/midori-browser.c:1912 +msgid "Copy the selected text" +msgstr "Copier le texte sélectionné" + +#: ../src/midori-browser.c:1915 +msgid "Paste text from the clipboard" +msgstr "Coller le texte à partir du presse-papiers" + +#: ../src/midori-browser.c:1918 +msgid "Delete the selected text" +msgstr "Supprimer le texte sélectionné" + +#: ../src/midori-browser.c:1921 +msgid "Select all text" +msgstr "Sélectionner tout le texte" + +#: ../src/midori-browser.c:1929 +msgid "Find _Next" +msgstr "Rechercher le _suivant" + +#: ../src/midori-browser.c:1932 +msgid "Find _Previous" +msgstr "Réchercher le _précédant" + +#: ../src/midori-browser.c:1935 +msgid "_Quick Find" +msgstr "Recherche rapide" + +#: ../src/midori-browser.c:1941 +msgid "_View" +msgstr "_Vue" + +#: ../src/midori-browser.c:1942 +msgid "_Toolbars" +msgstr "_Barre d'outils" + +#: ../src/midori-browser.c:1962 +msgid "View Source" +msgstr "Afficher la source" + +#: ../src/midori-browser.c:1965 +msgid "View Selection Source" +msgstr "Afficher la source de la sélection" + +# pas de traduction de toggle ? +#: ../src/midori-browser.c:1969 +msgid "Toggle fullscreen view" +msgstr "Activer/Désactiver le plein écran" + +#: ../src/midori-browser.c:1971 +msgid "_Go" +msgstr "A_ller" + +#: ../src/midori-browser.c:1982 +msgid "Location..." +msgstr "Emplacement..." + +#: ../src/midori-browser.c:1985 +msgid "Web Search..." +msgstr "Recherche Toile..." + +# C'est quoi le page holder ? +#: ../src/midori-browser.c:1988 +msgid "Open in Page_holder..." +msgstr "" + +#: ../src/midori-browser.c:1991 +msgid "Closed Tabs and Windows" +msgstr "Onglets et fenêtres fermés" + +#: ../src/midori-browser.c:1992 +msgid "Reopen a previously closed tab or window" +msgstr "Réouvre un onglet ou une fenêtre fermé auparavant" + +#: ../src/midori-browser.c:1994 +msgid "Empty Trash" +msgstr "Vider la corbeille" + +#: ../src/midori-browser.c:1997 +msgid "Undo Close Tab" +msgstr "Annuler la fermeture de l'onglet" + +#: ../src/midori-browser.c:2000 +msgid "_Bookmarks" +msgstr "_Signets" + +#: ../src/midori-browser.c:2005 +msgid "_Manage Bookmarks" +msgstr "_Gérer les Signets" + +#: ../src/midori-browser.c:2011 +msgid "Open in New _Tab" +msgstr "Ouvrir dans un nouvel _onglet" + +#: ../src/midori-browser.c:2014 +msgid "Open in New _Window" +msgstr "Ouvrir dans une nouvelle _Fenêtre" + +#: ../src/midori-browser.c:2023 +msgid "_Tools" +msgstr "_Outils" + +#: ../src/midori-browser.c:2025 +msgid "_Manage Search Engines" +msgstr "_Gérer moteurs de recherche" + +#: ../src/midori-browser.c:2026 +msgid "Add, edit and remove search engines..." +msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." + +#: ../src/midori-browser.c:2029 +msgid "_Window" +msgstr "_Fenêtre" + +#: ../src/midori-browser.c:2031 +msgid "_Previous Tab" +msgstr "Onglet _précedant" + +#: ../src/midori-browser.c:2034 +msgid "_Next Tab" +msgstr "Onglet _suivant" + +# fonctionnalité à tester +#: ../src/midori-browser.c:2037 +msgid "Tab _Overview" +msgstr "Aperçu des onglets" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../src/midori-browser.c:2040 +msgid "_Help" +msgstr "_Aide" + +# contenu ? +#: ../src/midori-browser.c:2042 +msgid "_Contents" +msgstr "_Contenu" + +#: ../src/midori-browser.c:2052 +msgid "P_rivate Browsing" +msgstr "Navigation en _privé" + +#: ../src/midori-browser.c:2056 +msgid "_Work Offline" +msgstr "Travailler hors ligne" + +#: ../src/midori-browser.c:2061 +msgid "_Navigationbar" +msgstr "Barre de _navigation" + +# 'barre' c'est pas gégé ; paneau ? +#: ../src/midori-browser.c:2065 +msgid "Side_panel" +msgstr "_Barre latérale" + +#: ../src/midori-browser.c:2069 +msgid "_Bookmarkbar" +msgstr "Barre des _signets" + +#: ../src/midori-browser.c:2073 +msgid "_Transferbar" +msgstr "Barre des _transferts" + +#: ../src/midori-browser.c:2077 +msgid "_Statusbar" +msgstr "Barre d'_état" + +#: ../src/midori-browser.c:2524 +msgid "Bookmarks" +msgstr "Signets" + +#. TODO: We need something like "use current website" +#: ../src/midori-browser.c:2534 ../src/prefs.c:101 +msgid "Transfers" +msgstr "Transferts" + +#: ../src/midori-browser.c:2541 +msgid "Console" +msgstr "Console" + +#: ../src/midori-browser.c:2550 ../src/prefs.c:230 +msgid "History" +msgstr "Historique" + +#: ../src/midori-browser.c:2559 +msgid "Pageholder" +msgstr "" + +#: ../src/midori-browser.c:2577 +msgid "_Inline find:" +msgstr "Recherche rapide:" + +#: ../src/midori-browser.c:2603 +msgid "Match Case" +msgstr "Sensible à la casse" + +#: ../src/midori-browser.c:2620 +msgid "Close Findbar" +msgstr "Fermer la barre de recherche" + +# paneau ? +#: ../src/midori-panel.c:146 +msgid "Appearance of the shadow around each panel" +msgstr "Aspect des ombres autour de chaque paneau" + +# mouai +#: ../src/midori-panel.c:156 +msgid "Menu to hold panel items" +msgstr "Menu pour contenir les éléments des paneaux" + +# index == numéro ? +#: ../src/midori-panel.c:165 +msgid "The index of the current page" +msgstr "Le numéro de la page actuelle" + +#: ../src/midori-panel.c:211 ../src/midori-panel.c:212 +msgid "Close panel" +msgstr "Fermer la barre" + +#: ../src/midori-panel.c:374 +msgid "Untitled" +msgstr "Sans titre" + +#: ../src/midori-trash.c:97 +msgid "The maximum number of items" +msgstr "Le nombre maximal d'éléments" + +#: ../src/midori-websettings.c:130 +msgid "Blank page" +msgstr "Page vierge" + +#: ../src/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Page récemment ouvertes" + +#: ../src/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Chinois (BIG5)" + +#: ../src/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonais (SHIFT_JIS)" + +#: ../src/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Russe (KOI8-R)" + +#: ../src/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../src/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Occidental (ISO-8859-1)" + +#: ../src/midori-websettings.c:152 +msgid "Custom..." +msgstr "" + +#: ../src/midori-websettings.c:167 +msgid "New tab" +msgstr "Nouvel onglet" + +#: ../src/midori-websettings.c:168 +msgid "New window" +msgstr "Nouvelle fenêtre" + +#: ../src/midori-websettings.c:169 +msgid "Current tab" +msgstr "Onglet actuel" + +#: ../src/midori-websettings.c:184 +msgid "Default" +msgstr "Défaut" + +#: ../src/midori-websettings.c:185 +msgid "Icons" +msgstr "Icônes" + +#: ../src/midori-websettings.c:186 +msgid "Text" +msgstr "Texte" + +#: ../src/midori-websettings.c:187 +msgid "Both" +msgstr "" + +#: ../src/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "" + +#: ../src/midori-websettings.c:203 +msgid "All cookies" +msgstr "Tous les cookies" + +#: ../src/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Cookies de session" + +#: ../src/midori-websettings.c:205 +msgid "None" +msgstr "Aucun" + +#: ../src/midori-websettings.c:242 +msgid "Remember last window size" +msgstr "Se rappeler de la taille du fenêtre" + +#: ../src/midori-websettings.c:243 +msgid "Whether to save the last window size" +msgstr "" + +#: ../src/midori-websettings.c:251 +msgid "Last window width" +msgstr "Dernier largeur de fenêtre" + +#: ../src/midori-websettings.c:252 +msgid "The last saved window width" +msgstr "" + +#: ../src/midori-websettings.c:260 +msgid "Last window height" +msgstr "Dernier hauteur de fenêtre" + +#: ../src/midori-websettings.c:261 +msgid "The last saved window height" +msgstr "" + +#: ../src/midori-websettings.c:269 +msgid "Last panel position" +msgstr "" + +#: ../src/midori-websettings.c:270 +msgid "The last saved panel position" +msgstr "" + +#: ../src/midori-websettings.c:278 +msgid "Last panel page" +msgstr "Dernier page de paneau" + +#: ../src/midori-websettings.c:279 +msgid "The last saved panel page" +msgstr "" + +#: ../src/midori-websettings.c:287 +msgid "Last Web search" +msgstr "Dernier recherche toile" + +#: ../src/midori-websettings.c:288 +msgid "The last saved Web search" +msgstr "La dernier recherche toile guardé" + +#: ../src/midori-websettings.c:296 +msgid "Last pageholder URI" +msgstr "" + +#: ../src/midori-websettings.c:297 +msgid "The URI last opened in the pageholder" +msgstr "" + +#: ../src/midori-websettings.c:307 +msgid "Show Navigationbar" +msgstr "Afficher Barre de navigation" + +#: ../src/midori-websettings.c:308 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../src/midori-websettings.c:316 +msgid "Show Bookmarkbar" +msgstr "Afficher Barre des _signets" + +#: ../src/midori-websettings.c:317 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../src/midori-websettings.c:325 +msgid "Show Panel" +msgstr "" + +#: ../src/midori-websettings.c:326 +msgid "Whether to show the panel" +msgstr "" + +#: ../src/midori-websettings.c:334 +msgid "Show Statusbar" +msgstr "Afficher Barre d'état" + +#: ../src/midori-websettings.c:335 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../src/midori-websettings.c:344 +msgid "Toolbar Style" +msgstr "Style de barre d'outils" + +#: ../src/midori-websettings.c:345 +msgid "The style of the toolbar" +msgstr "Le style de la barre d'outils" + +#: ../src/midori-websettings.c:354 +msgid "Small toolbar" +msgstr "Petit barre d'outils" + +#: ../src/midori-websettings.c:355 +msgid "Use small toolbar icons" +msgstr "Afficher de petites icônes de la barre d'outils" + +#: ../src/midori-websettings.c:363 +msgid "Show New Tab" +msgstr "Nouvel Onglet" + +#: ../src/midori-websettings.c:364 +msgid "Show the New Tab button in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:372 +msgid "Show Web search" +msgstr "Afficher Recherche toile" + +#: ../src/midori-websettings.c:373 +msgid "Show the Web search entry in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:381 +msgid "Show Trash" +msgstr "Afficher Corbeille" + +#: ../src/midori-websettings.c:382 +msgid "Show the Trash button in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:392 +msgid "Load on Startup" +msgstr "Charger au démarrage" + +#: ../src/midori-websettings.c:393 +msgid "What to load on startup" +msgstr "Quoi de charger au démarrage" + +#: ../src/midori-websettings.c:403 +msgid "The homepage" +msgstr "La page d'accueil" + +#: ../src/midori-websettings.c:411 +msgid "Download Folder" +msgstr "Répertoire de téléchargement" + +# downloaded files folder vs. download folder précédent ? +#: ../src/midori-websettings.c:412 +msgid "The folder downloaded files are saved to" +msgstr "Le répertoire pour guarder des téléchargement" + +#: ../src/midori-websettings.c:420 +msgid "Show Download Notification" +msgstr "" + +#: ../src/midori-websettings.c:421 +msgid "Show a notification window for finished downloads" +msgstr "Afficher une fenêtre de notification à la fin des téléchargements" + +#: ../src/midori-websettings.c:429 +msgid "Location entry Search" +msgstr "" + +#: ../src/midori-websettings.c:430 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../src/midori-websettings.c:438 +msgid "Preferred Encoding" +msgstr "Encodage préferé" + +#: ../src/midori-websettings.c:439 +msgid "The preferred character encoding" +msgstr "Encodage des charactères préferé" + +#: ../src/midori-websettings.c:450 +msgid "Tab Label Size" +msgstr "Taille des onglets" + +#: ../src/midori-websettings.c:451 +msgid "The desired tab label size" +msgstr "La taille désirée du libellé d'onglet" + +#: ../src/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "Bouton fermer sur les onglets" + +#: ../src/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "Les onglets ont-ils des boutons de fermeture" + +#: ../src/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "Ouvrir les nouvelles pages dans" + +#: ../src/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "Óu d'ouvrir les nouvelles pages" + +#: ../src/midori-websettings.c:478 +msgid "Middle click opens Selection" +msgstr "Molette clic charge sélection" + +#: ../src/midori-websettings.c:479 +msgid "Load an URL from the selection via middle click" +msgstr "Charger une URL sélectionnée avec le bouton central de la souris" + +#: ../src/midori-websettings.c:487 +msgid "Open tabs in the background" +msgstr "Ouvrir les onglets en arrière-plan" + +#: ../src/midori-websettings.c:488 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../src/midori-websettings.c:496 +msgid "Open popups in tabs" +msgstr "" + +#: ../src/midori-websettings.c:497 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../src/midori-websettings.c:507 +msgid "Accept cookies" +msgstr "Accepter les témoins" + +#: ../src/midori-websettings.c:508 +msgid "What type of cookies to accept" +msgstr "" + +#: ../src/midori-websettings.c:517 +msgid "Original cookies only" +msgstr "Seulement des témoins originales" + +#: ../src/midori-websettings.c:518 +msgid "Accept cookies from the original website only" +msgstr "Accepter les témoins du site d'origine uniquement" + +#: ../src/midori-websettings.c:526 +msgid "Maximum cookie age" +msgstr "Âge maximal des témoins" + +#: ../src/midori-websettings.c:527 +msgid "The maximum number of days to save cookies for" +msgstr "Le nombre maximal de jours de guarder des témoins" + +#: ../src/midori-websettings.c:537 +msgid "Remember last visited pages" +msgstr "Se rappeler des pages visitées" + +#: ../src/midori-websettings.c:538 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../src/midori-websettings.c:546 +msgid "Maximum history age" +msgstr "Âge maximal de l'histoire" + +#: ../src/midori-websettings.c:547 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../src/midori-websettings.c:555 +msgid "Remember last form inputs" +msgstr "Se rappeler des derniers saisies de formulaires" + +#: ../src/midori-websettings.c:556 +msgid "Whether the last form inputs are saved" +msgstr "" + +#: ../src/midori-websettings.c:564 +msgid "Remember last downloaded files" +msgstr "Se rappeler des derniers fichiers téléchargés" + +#: ../src/midori-websettings.c:565 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../src/midori-websettings.c:575 +msgid "HTTP Proxy" +msgstr "" + +#: ../src/midori-websettings.c:576 +msgid "The proxy used for HTTP connections" +msgstr "" + +#: ../src/midori-websettings.c:584 +msgid "Cache size" +msgstr "Taille du mémoire intermédiaire" + +#: ../src/midori-websettings.c:585 +msgid "The allowed size of the cache" +msgstr "" + +#: ../src/midori-webview.c:217 +msgid "The icon of the currently loaded page" +msgstr "L'icône de la page actuellement chargée" + +#: ../src/midori-webview.c:226 +msgid "The URI of the currently loaded page" +msgstr "L'URI de la page actuellement chargée" + +#: ../src/midori-webview.c:235 +msgid "The title of the currently loaded page" +msgstr "Le titre de la page actuellement chargée" + +#: ../src/midori-webview.c:476 +msgid "Open Link in New _Tab" +msgstr "Ouvrir le lien dans un nouvel _onglet" + +#: ../src/midori-webview.c:499 +msgid "Open URL in New _Tab" +msgstr "Ouvrir l'URL dans un nouvel _onglet" + +#: ../src/prefs.c:32 +#, c-format +msgid "%s Preferences" +msgstr "%s Préferences" + +#. Page "General" +#: ../src/prefs.c:89 +msgid "General" +msgstr "Général" + +#: ../src/prefs.c:90 +msgid "Startup" +msgstr "Démarrage" + +#. Page "Appearance" +#: ../src/prefs.c:111 +msgid "Appearance" +msgstr "Aspect" + +#: ../src/prefs.c:112 +msgid "Font settings" +msgstr "Réglages des polices" + +#. Page "Behavior" +#: ../src/prefs.c:133 +msgid "Behavior" +msgstr "Comportement" + +#: ../src/prefs.c:134 +msgid "Features" +msgstr "Fonctionnalités" + +#. Page "Interface" +#: ../src/prefs.c:166 +msgid "Interface" +msgstr "Interface" + +#: ../src/prefs.c:167 +msgid "Navigationbar" +msgstr "Barre de navigation" + +#: ../src/prefs.c:180 +msgid "Browsing" +msgstr "Navigation" + +#. Page "Network" +#: ../src/prefs.c:196 ../src/prefs.c:197 +msgid "Network" +msgstr "Réseau" + +#: ../src/prefs.c:208 +msgid "MB" +msgstr "Mo" + +#. Page "Privacy" +#: ../src/prefs.c:213 +msgid "Privacy" +msgstr "Confidentialité" + +#: ../src/prefs.c:214 +msgid "Cookies" +msgstr "Cookies" + +#: ../src/prefs.c:227 ../src/prefs.c:237 +msgid "days" +msgstr "jours" + +#: ../src/sokoke.c:219 +msgid "Warning: You are using a superuser account!" +msgstr "Attention: Vous êtes connecté en tant que super-utilisateur!" + +#: ../src/sokoke.c:341 ../katze/katze-xbel.c:952 +#, c-format +msgid "Writing failed." +msgstr "Échec de l'écriture." + +#: ../src/webSearch.c:82 +msgid "Empty" +msgstr "Vide" + +#: ../src/webSearch.c:154 +msgid "Add search engine" +msgstr "Ajouter un moteur de recherche" + +#: ../src/webSearch.c:154 +msgid "Edit search engine" +msgstr "Éditer le moteur de recherche" + +#: ../src/webSearch.c:184 +msgid "_Name:" +msgstr "_Nom:" + +#: ../src/webSearch.c:228 +msgid "_Icon (name or file):" +msgstr "_Icône (nom ou fichier):" + +#: ../src/webSearch.c:242 +msgid "_Keyword:" +msgstr "Mot-clé:" + +#: ../src/webSearch.c:311 +msgid "Manage search engines" +msgstr "Gérer les moteurs de recherche" + +# symbolic ? +#: ../katze/katze-throbber.c:135 +msgid "Symbolic size to use for the animation" +msgstr "" + +#: ../katze/katze-throbber.c:144 +msgid "The name of an icon containing animation frames" +msgstr "" + +#: ../katze/katze-throbber.c:153 +msgid "A GdkPixbuf containing animation frames" +msgstr "" + +#: ../katze/katze-throbber.c:162 +msgid "Whether the throbber should be animated" +msgstr "" + +#: ../katze/katze-throbber.c:171 +msgid "The name of an icon to be used as the static image" +msgstr "" + +#: ../katze/katze-throbber.c:180 +msgid "A GdkPixbuf to be used as the static image" +msgstr "" + +#: ../katze/katze-throbber.c:189 +msgid "The stock ID of an icon to be used as the static image" +msgstr "" + +#: ../katze/katze-utils.c:114 ../katze/katze-utils.c:239 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:136 ../katze/katze-utils.c:160 +msgid "Choose file" +msgstr "Choisissez fiche" + +#: ../katze/katze-utils.c:148 +msgid "Choose folder" +msgstr "Choisissez répertoire" + +#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 +#: ../katze/katze-xbel.c:804 +msgid "Malformed document." +msgstr "Document malformé" + +#: ../katze/katze-xbel.c:759 +msgid "File not found." +msgstr "Fichier non trouvé." From 50ab1e8bc7a68fddf4d20dc9467ab34076ff509f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Apr 2008 03:30:24 +0200 Subject: [PATCH 0074/2970] Turn prefs into MidoriPreferences --- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/midori-browser.c | 6 +- src/midori-panel.h | 4 +- src/{prefs.c => midori-preferences.c} | 263 ++++++++++++++++++++------ src/midori-preferences.h | 65 +++++++ src/prefs.h | 41 ---- 7 files changed, 278 insertions(+), 105 deletions(-) rename src/{prefs.c => midori-preferences.c} (54%) create mode 100644 src/midori-preferences.h delete mode 100644 src/prefs.h diff --git a/po/POTFILES.in b/po/POTFILES.in index f5f1651b..d597db36 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,7 +9,7 @@ src/midori-panel.c src/midori-trash.c src/midori-websettings.c src/midori-webview.c -src/prefs.c +src/midori-preferences.c src/search.c src/sokoke.c src/webSearch.c diff --git a/src/Makefile.am b/src/Makefile.am index 1b927068..b712c206 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ midori_SOURCES = \ midori-trash.c midori-trash.h \ midori-webview.c midori-webview.h \ midori-websettings.c midori-websettings.h \ - prefs.c prefs.h \ + midori-preferences.c midori-preferences.h \ webSearch.c webSearch.h \ helpers.c helpers.h \ sokoke.c sokoke.h \ diff --git a/src/midori-browser.c b/src/midori-browser.c index b8428508..576e230c 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -16,10 +16,10 @@ #include "global.h" #include "helpers.h" #include "webSearch.h" -#include "prefs.h" #include "sokoke.h" #include "midori-webview.h" +#include "midori-preferences.h" #include "midori-panel.h" #include "midori-console.h" #include "midori-trash.h" @@ -876,8 +876,8 @@ _action_preferences_activate (GtkAction* action, { MidoriBrowserPrivate* priv = browser->priv; - dialog = prefs_preferences_dialog_new (GTK_WINDOW (browser), - priv->settings); + dialog = midori_preferences_new (GTK_WINDOW (browser), + priv->settings); gtk_widget_show (dialog); } } diff --git a/src/midori-panel.h b/src/midori-panel.h index c4772039..d10a4aa6 100644 --- a/src/midori-panel.h +++ b/src/midori-panel.h @@ -37,14 +37,14 @@ typedef struct _MidoriPanelClass MidoriPanelClass; struct _MidoriPanel { - GtkFrame parent_instance; + GtkHBox parent_instance; MidoriPanelPrivate* priv; }; struct _MidoriPanelClass { - GtkFrameClass parent_class; + GtkHBoxClass parent_class; /* Signals */ gboolean diff --git a/src/prefs.c b/src/midori-preferences.c similarity index 54% rename from src/prefs.c rename to src/midori-preferences.c index ffdee1fe..e623453a 100644 --- a/src/prefs.c +++ b/src/midori-preferences.c @@ -9,14 +9,64 @@ See the file COPYING for the full license text. */ -#include "prefs.h" +#include "midori-preferences.h" -#include "helpers.h" #include "sokoke.h" #include -#include -#include + +G_DEFINE_TYPE (MidoriPreferences, midori_preferences, GTK_TYPE_DIALOG) + +struct _MidoriPreferencesPrivate +{ + GtkWidget* notebook; +}; + +#define MIDORI_PREFERENCES_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_PREFERENCES, MidoriPreferencesPrivate)) + +enum +{ + PROP_0, + + PROP_SETTINGS +}; + +static void +midori_preferences_finalize (GObject* object); + +static void +midori_preferences_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_preferences_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_preferences_class_init (MidoriPreferencesClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_preferences_finalize; + gobject_class->set_property = midori_preferences_set_property; + gobject_class->get_property = midori_preferences_get_property; + + g_object_class_install_property (gobject_class, + PROP_SETTINGS, + g_param_spec_object ( + "settings", + "Settings", + _("Settings instance to provide properties"), + MIDORI_TYPE_WEB_SETTINGS, + G_PARAM_WRITABLE)); + + g_type_class_add_private (class, sizeof (MidoriPreferencesPrivate)); +} static void clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser) @@ -26,65 +76,165 @@ clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser) g_signal_emit_by_name (file_chooser, "file-set"); } -GtkWidget* prefs_preferences_dialog_new (GtkWindow* window, - MidoriWebSettings* settings) +static void +midori_preferences_init (MidoriPreferences* preferences) { - gchar* dialogTitle = g_strdup_printf(_("%s Preferences"), g_get_application_name()); - GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle - , window - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_HELP, GTK_RESPONSE_HELP - , GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PREFERENCES); - // TODO: Implement some kind of help function - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), GTK_RESPONSE_HELP, FALSE); //... - g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); + preferences->priv = MIDORI_PREFERENCES_GET_PRIVATE (preferences); + MidoriPreferencesPrivate* priv = preferences->priv; - CPrefs* prefs = g_new0(CPrefs, 1); - g_signal_connect(dialog, "response", G_CALLBACK(g_free), prefs); + priv->notebook = NULL; + + gchar* dialog_title = g_strdup_printf (_("%s Preferences"), + g_get_application_name ()); + g_object_set (preferences, + "icon-name", GTK_STOCK_PREFERENCES, + "title", dialog_title, + "has-separator", FALSE, + NULL); + gtk_dialog_add_buttons (GTK_DIALOG (preferences), + GTK_STOCK_HELP, GTK_RESPONSE_HELP, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + NULL); + // TODO: Implement some kind of help function + gtk_dialog_set_response_sensitive (GTK_DIALOG (preferences), + GTK_RESPONSE_HELP, FALSE); //... + g_signal_connect (preferences, "response", + G_CALLBACK (gtk_widget_destroy), preferences); // TODO: Do we want tooltips for explainations or can we omit that? - // TODO: We need mnemonics - // TODO: Take multiple windows into account when applying changes - GtkWidget* xfce_heading; - if((xfce_heading = sokoke_xfce_header_new( - gtk_window_get_icon_name(window), dialogTitle))) - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) - , xfce_heading, FALSE, FALSE, 0); - g_free(dialogTitle); - GtkWidget* notebook = gtk_notebook_new(); - gtk_container_set_border_width(GTK_CONTAINER(notebook), 6); - GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + g_free (dialog_title); +} + +static void +midori_preferences_finalize (GObject* object) +{ + G_OBJECT_CLASS (midori_preferences_parent_class)->finalize (object); +} + +static void +midori_preferences_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriPreferences* preferences = MIDORI_PREFERENCES (object); + + switch (prop_id) + { + case PROP_SETTINGS: + { + GtkWidget* xfce_heading; + GtkWindow* parent; + g_object_get (object, "transient-for", &parent, NULL); + if ((xfce_heading = sokoke_xfce_header_new ( + gtk_window_get_icon_name (parent), + gtk_window_get_title (GTK_WINDOW (object))))) + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), + xfce_heading, FALSE, FALSE, 0); + midori_preferences_set_settings (preferences, + g_value_get_object (value)); + break; + } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_preferences_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriPreferences* preferences = MIDORI_PREFERENCES (object); + MidoriPreferencesPrivate* priv = preferences->priv; + + switch (prop_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_preferences_new: + * @parent: the parent window + * @settings: the settings + * + * Creates a new preferences dialog. + * + * Return value: a new #MidoriPreferences + **/ +GtkWidget* +midori_preferences_new (GtkWindow* parent, + MidoriWebSettings* settings) +{ + g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); + g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (settings), NULL); + + MidoriPreferences* preferences = g_object_new (MIDORI_TYPE_PREFERENCES, + "transient-for", parent, + "settings", settings, + NULL); + + return GTK_WIDGET (preferences); +} + +/** + * midori_preferences_set_settings: + * @settings: the settings + * + * Assigns a settings instance to a preferences dialog. + * + * Note: This must not be called more than once. + **/ +void +midori_preferences_set_settings (MidoriPreferences* preferences, + MidoriWebSettings* settings) +{ + g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); + g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); + + MidoriPreferencesPrivate* priv = preferences->priv; + + g_return_if_fail (!priv->notebook); + + priv->notebook = gtk_notebook_new (); + gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6); + GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); GtkWidget* page; GtkWidget* frame; GtkWidget* table; GtkWidget* align; GtkWidget* label; GtkWidget* button; GtkWidget* entry; GtkWidget* hbox; - #define PAGE_NEW(__label) page = gtk_vbox_new(FALSE, 0);\ - gtk_container_set_border_width(GTK_CONTAINER(page), 5);\ - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(__label)) - #define FRAME_NEW(__label) frame = sokoke_hig_frame_new(__label);\ - gtk_container_set_border_width(GTK_CONTAINER(frame), 5);\ - gtk_box_pack_start(GTK_BOX(page), frame, FALSE, FALSE, 0); - #define TABLE_NEW(__rows, __cols) table = gtk_table_new(__rows, __cols, FALSE);\ - gtk_container_set_border_width(GTK_CONTAINER(table), 5);\ - gtk_container_add(GTK_CONTAINER(frame), table); - #define WIDGET_ADD(__widget, __left, __right, __top, __bottom)\ - gtk_table_attach(GTK_TABLE(table), __widget\ - , __left, __right, __top, __bottom\ + #define PAGE_NEW(__label) page = gtk_vbox_new (FALSE, 0); \ + gtk_container_set_border_width (GTK_CONTAINER (page), 5); \ + gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page, \ + gtk_label_new (__label)) + #define FRAME_NEW(__label) frame = sokoke_hig_frame_new (__label); \ + gtk_container_set_border_width (GTK_CONTAINER (frame), 5); \ + gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0); + #define TABLE_NEW(__rows, __cols) table = gtk_table_new ( \ + __rows, __cols, FALSE); \ + gtk_container_set_border_width (GTK_CONTAINER (table), 5); \ + gtk_container_add (GTK_CONTAINER (frame), table); + #define WIDGET_ADD(__widget, __left, __right, __top, __bottom) \ + gtk_table_attach (GTK_TABLE (table), __widget \ + , __left, __right, __top, __bottom \ , GTK_FILL, GTK_FILL, 8, 2) - #define FILLED_ADD(__widget, __left, __right, __top, __bottom)\ - gtk_table_attach(GTK_TABLE(table), __widget\ + #define FILLED_ADD(__widget, __left, __right, __top, __bottom) \ + gtk_table_attach (GTK_TABLE (table), __widget \ , __left, __right, __top, __bottom\ , GTK_EXPAND | GTK_FILL, GTK_FILL, 8, 2) - #define INDENTED_ADD(__widget, __left, __right, __top, __bottom)\ - align = gtk_alignment_new(0, 0.5, 0, 0);\ - gtk_container_add(GTK_CONTAINER(align), __widget);\ - gtk_size_group_add_widget(sizegroup, align);\ - WIDGET_ADD(align, __left, __right, __top, __bottom) - #define SPANNED_ADD(__widget, __left, __right, __top, __bottom)\ - align = gtk_alignment_new(0, 0.5, 0, 0);\ - gtk_container_add(GTK_CONTAINER(align), __widget);\ - FILLED_ADD(align, __left, __right, __top, __bottom) + #define INDENTED_ADD(__widget, __left, __right, __top, __bottom) \ + align = gtk_alignment_new (0, 0.5, 0, 0); \ + gtk_container_add (GTK_CONTAINER (align), __widget); \ + gtk_size_group_add_widget (sizegroup, align); \ + WIDGET_ADD (align, __left, __right, __top, __bottom) + #define SPANNED_ADD(__widget, __left, __right, __top, __bottom) \ + align = gtk_alignment_new (0, 0.5, 0, 0); \ + gtk_container_add (GTK_CONTAINER (align), __widget); \ + FILLED_ADD (align, __left, __right, __top, __bottom) // Page "General" PAGE_NEW (_("General")); FRAME_NEW (_("Startup")); @@ -242,8 +392,7 @@ GtkWidget* prefs_preferences_dialog_new (GtkWindow* window, button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); SPANNED_ADD (button, 0, 2, 2, 3); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox) - , notebook, FALSE, FALSE, 4); - gtk_widget_show_all(GTK_DIALOG(dialog)->vbox); - return dialog; + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), + priv->notebook, FALSE, FALSE, 4); + gtk_widget_show_all (GTK_DIALOG (preferences)->vbox); } diff --git a/src/midori-preferences.h b/src/midori-preferences.h new file mode 100644 index 00000000..e47d843c --- /dev/null +++ b/src/midori-preferences.h @@ -0,0 +1,65 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_PREFERENCES_H__ +#define __MIDORI_PREFERENCES_H__ + +#include "midori-websettings.h" + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_PREFERENCES \ + (midori_preferences_get_type ()) +#define MIDORI_PREFERENCES(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PREFERENCES, MidoriPreferences)) +#define MIDORI_PREFERENCES_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_PREFERENCES, MidoriPreferencesClass)) +#define MIDORI_IS_PREFERENCES(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PREFERENCES)) +#define MIDORI_IS_PREFERENCES_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_PREFERENCES)) +#define MIDORI_PREFERENCES_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PREFERENCES, MidoriPreferencesClass)) + +typedef struct _MidoriPreferences MidoriPreferences; +typedef struct _MidoriPreferencesPrivate MidoriPreferencesPrivate; +typedef struct _MidoriPreferencesClass MidoriPreferencesClass; + +struct _MidoriPreferences +{ + GtkDialog parent_instance; + + MidoriPreferencesPrivate* priv; +}; + +struct _MidoriPreferencesClass +{ + GtkDialogClass parent_class; +}; + +GType +midori_preferences_get_type (void); + +GtkWidget* +midori_preferences_new (GtkWindow* parent, + MidoriWebSettings* settings); + +void +midori_preferences_set_settings (MidoriPreferences* preferences, + MidoriWebSettings* settings); + +G_END_DECLS + +#endif /* __MIDORI_PREFERENCES_H__ */ diff --git a/src/prefs.h b/src/prefs.h deleted file mode 100644 index 990def93..00000000 --- a/src/prefs.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __PREFS_H__ -#define __PREFS_H__ 1 - -#include - -#include "midori-websettings.h" - -// -- Types - -typedef struct -{ - GtkWidget* userStylesheetUri; - GtkWidget* treeview; - GtkWidget* combobox; - GtkWidget* add; -} CPrefs; - -enum -{ - PROTOCOLS_COL_NAME, - PROTOCOLS_COL_COMMAND, - PROTOCOLS_COL_N -}; - -// -- Declarations - -GtkWidget* -prefs_preferences_dialog_new(GtkWindow*, MidoriWebSettings*); - -#endif /* !__PREFS_H__ */ From 181734acb3f93df57e48bb98e72cdd99c1b91cdc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Apr 2008 03:31:22 +0200 Subject: [PATCH 0075/2970] Update French translation --- po/fr.po | 120 ++++++++++++++++++++++++++----------------------------- 1 file changed, 56 insertions(+), 64 deletions(-) diff --git a/po/fr.po b/po/fr.po index f216bea4..94794060 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-19 12:56+0200\n" +"POT-Creation-Date: 2008-04-20 03:00+0200\n" "PO-Revision-Date: 2008-03-31 17:37+0100\n" "Last-Translator: Adrien Nader \n" "Language-Team: French \n" @@ -180,7 +180,6 @@ msgstr "_URL:" msgid "_Folder:" msgstr "Dossier" -# racine ? #: ../src/midori-browser.c:1227 msgid "Root" msgstr "Racine" @@ -215,7 +214,6 @@ msgstr "Ouvrir un nouvel onglet" msgid "Open a file" msgstr "Ouvrir un fichier" -# un, le ; enregistrer sous ? #: ../src/midori-browser.c:1877 msgid "Save to a file" msgstr "Enregistrer dans un fichier" @@ -230,16 +228,15 @@ msgstr "Fermer l'onglet actuel" #: ../src/midori-browser.c:1882 msgid "C_lose Window" -msgstr "_Fermer la fenêtre" +msgstr "_Fermer la fenêtre" #: ../src/midori-browser.c:1883 msgid "Close this window" msgstr "Fermer cette fenêtre" -# setup : organisation ? #: ../src/midori-browser.c:1885 msgid "Pa_ge Setup" -msgstr "Organisation de la page" +msgstr "Gestion de page" #: ../src/midori-browser.c:1895 msgid "Quit the application" @@ -301,10 +298,9 @@ msgstr "Afficher la source" msgid "View Selection Source" msgstr "Afficher la source de la sélection" -# pas de traduction de toggle ? #: ../src/midori-browser.c:1969 msgid "Toggle fullscreen view" -msgstr "Activer/Désactiver le plein écran" +msgstr "Activer/ Désactiver le plein écran" #: ../src/midori-browser.c:1971 msgid "_Go" @@ -318,10 +314,9 @@ msgstr "Emplacement..." msgid "Web Search..." msgstr "Recherche Toile..." -# C'est quoi le page holder ? #: ../src/midori-browser.c:1988 msgid "Open in Page_holder..." -msgstr "" +msgstr "Ouvrir dans le _cadre de pages..." #: ../src/midori-browser.c:1991 msgid "Closed Tabs and Windows" @@ -353,7 +348,7 @@ msgstr "Ouvrir dans un nouvel _onglet" #: ../src/midori-browser.c:2014 msgid "Open in New _Window" -msgstr "Ouvrir dans une nouvelle _Fenêtre" +msgstr "Ouvrir dans une nouvelle _fenêtre" #: ../src/midori-browser.c:2023 msgid "_Tools" @@ -361,7 +356,7 @@ msgstr "_Outils" #: ../src/midori-browser.c:2025 msgid "_Manage Search Engines" -msgstr "_Gérer moteurs de recherche" +msgstr "_Gérer moteurs de recherche" #: ../src/midori-browser.c:2026 msgid "Add, edit and remove search engines..." @@ -382,14 +377,13 @@ msgstr "Onglet _suivant" # fonctionnalité à tester #: ../src/midori-browser.c:2037 msgid "Tab _Overview" -msgstr "Aperçu des onglets" +msgstr "_Aperçu des onglets" #. G_CALLBACK (_action_tab_overview_activate) #: ../src/midori-browser.c:2040 msgid "_Help" msgstr "_Aide" -# contenu ? #: ../src/midori-browser.c:2042 msgid "_Contents" msgstr "_Contenu" @@ -406,10 +400,9 @@ msgstr "Travailler hors ligne" msgid "_Navigationbar" msgstr "Barre de _navigation" -# 'barre' c'est pas gégé ; paneau ? #: ../src/midori-browser.c:2065 msgid "Side_panel" -msgstr "_Barre latérale" +msgstr "_Panneau latérale" #: ../src/midori-browser.c:2069 msgid "_Bookmarkbar" @@ -421,14 +414,14 @@ msgstr "Barre des _transferts" #: ../src/midori-browser.c:2077 msgid "_Statusbar" -msgstr "Barre d'_état" +msgstr "Barre d'é_tat" #: ../src/midori-browser.c:2524 msgid "Bookmarks" msgstr "Signets" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2534 ../src/prefs.c:101 +#: ../src/midori-browser.c:2534 ../src/midori-preferences.c:242 msgid "Transfers" msgstr "Transferts" @@ -436,13 +429,13 @@ msgstr "Transferts" msgid "Console" msgstr "Console" -#: ../src/midori-browser.c:2550 ../src/prefs.c:230 +#: ../src/midori-browser.c:2550 ../src/midori-preferences.c:371 msgid "History" msgstr "Historique" #: ../src/midori-browser.c:2559 msgid "Pageholder" -msgstr "" +msgstr "Cadre de pages" #: ../src/midori-browser.c:2577 msgid "_Inline find:" @@ -456,24 +449,21 @@ msgstr "Sensible à la casse" msgid "Close Findbar" msgstr "Fermer la barre de recherche" -# paneau ? #: ../src/midori-panel.c:146 msgid "Appearance of the shadow around each panel" -msgstr "Aspect des ombres autour de chaque paneau" +msgstr "Aspect des ombres autour de chaque panneau" -# mouai #: ../src/midori-panel.c:156 msgid "Menu to hold panel items" -msgstr "Menu pour contenir les éléments des paneaux" +msgstr "Menu pour contenir les éléments des panneaux" -# index == numéro ? #: ../src/midori-panel.c:165 msgid "The index of the current page" msgstr "Le numéro de la page actuelle" #: ../src/midori-panel.c:211 ../src/midori-panel.c:212 msgid "Close panel" -msgstr "Fermer la barre" +msgstr "Fermer le panneau" #: ../src/midori-panel.c:374 msgid "Untitled" @@ -541,19 +531,19 @@ msgstr "Texte" #: ../src/midori-websettings.c:187 msgid "Both" -msgstr "" +msgstr "Les deux" #: ../src/midori-websettings.c:188 msgid "Both horizontal" -msgstr "" +msgstr "Les deux horizontalement" #: ../src/midori-websettings.c:203 msgid "All cookies" -msgstr "Tous les cookies" +msgstr "Tous les témoins" #: ../src/midori-websettings.c:204 msgid "Session cookies" -msgstr "Cookies de session" +msgstr "Témoins de session" #: ../src/midori-websettings.c:205 msgid "None" @@ -585,35 +575,35 @@ msgstr "" #: ../src/midori-websettings.c:269 msgid "Last panel position" -msgstr "" +msgstr "Dernière position du panneau" #: ../src/midori-websettings.c:270 msgid "The last saved panel position" -msgstr "" +msgstr "La dernière position du panneau guardé" #: ../src/midori-websettings.c:278 msgid "Last panel page" -msgstr "Dernier page de paneau" +msgstr "Dernière page de panneau" #: ../src/midori-websettings.c:279 msgid "The last saved panel page" -msgstr "" +msgstr "La dernière page du panneau guardé" #: ../src/midori-websettings.c:287 msgid "Last Web search" -msgstr "Dernier recherche toile" +msgstr "Dernière recherche toile" #: ../src/midori-websettings.c:288 msgid "The last saved Web search" -msgstr "La dernier recherche toile guardé" +msgstr "La dernière recherche toile guardé" #: ../src/midori-websettings.c:296 msgid "Last pageholder URI" -msgstr "" +msgstr "Dernier URI dans le cadre de pages" #: ../src/midori-websettings.c:297 msgid "The URI last opened in the pageholder" -msgstr "" +msgstr "L'URI ouvrit récemment dans le cadre de pages" #: ../src/midori-websettings.c:307 msgid "Show Navigationbar" @@ -633,7 +623,7 @@ msgstr "" #: ../src/midori-websettings.c:325 msgid "Show Panel" -msgstr "" +msgstr "Afficher Panneau" #: ../src/midori-websettings.c:326 msgid "Whether to show the panel" @@ -669,7 +659,7 @@ msgstr "Nouvel Onglet" #: ../src/midori-websettings.c:364 msgid "Show the New Tab button in the toolbar" -msgstr "" +msgstr "Afficher le bouton Nouveau onglet dans la barre d'outils" #: ../src/midori-websettings.c:372 msgid "Show Web search" @@ -685,7 +675,7 @@ msgstr "Afficher Corbeille" #: ../src/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" -msgstr "" +msgstr "Afficher la bouton Corbeille dans la barre d'outils" #: ../src/midori-websettings.c:392 msgid "Load on Startup" @@ -703,14 +693,13 @@ msgstr "La page d'accueil" msgid "Download Folder" msgstr "Répertoire de téléchargement" -# downloaded files folder vs. download folder précédent ? #: ../src/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "Le répertoire pour guarder des téléchargement" #: ../src/midori-websettings.c:420 msgid "Show Download Notification" -msgstr "" +msgstr "Afficher notification de téléchargement" #: ../src/midori-websettings.c:421 msgid "Show a notification window for finished downloads" @@ -814,7 +803,7 @@ msgstr "" #: ../src/midori-websettings.c:546 msgid "Maximum history age" -msgstr "Âge maximal de l'histoire" +msgstr "Âge maximal de l'histoique" #: ../src/midori-websettings.c:547 msgid "The maximum number of days to save the history for" @@ -872,70 +861,74 @@ msgstr "Ouvrir le lien dans un nouvel _onglet" msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" -#: ../src/prefs.c:32 +#: ../src/midori-preferences.c:64 +msgid "Settings instance to provide properties" +msgstr "" + +#: ../src/midori-preferences.c:84 #, c-format msgid "%s Preferences" -msgstr "%s Préferences" +msgstr "%s Préferences" #. Page "General" -#: ../src/prefs.c:89 +#: ../src/midori-preferences.c:230 msgid "General" msgstr "Général" -#: ../src/prefs.c:90 +#: ../src/midori-preferences.c:231 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../src/prefs.c:111 +#: ../src/midori-preferences.c:252 msgid "Appearance" msgstr "Aspect" -#: ../src/prefs.c:112 +#: ../src/midori-preferences.c:253 msgid "Font settings" msgstr "Réglages des polices" #. Page "Behavior" -#: ../src/prefs.c:133 +#: ../src/midori-preferences.c:274 msgid "Behavior" msgstr "Comportement" -#: ../src/prefs.c:134 +#: ../src/midori-preferences.c:275 msgid "Features" msgstr "Fonctionnalités" #. Page "Interface" -#: ../src/prefs.c:166 +#: ../src/midori-preferences.c:307 msgid "Interface" msgstr "Interface" -#: ../src/prefs.c:167 +#: ../src/midori-preferences.c:308 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../src/prefs.c:180 +#: ../src/midori-preferences.c:321 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../src/prefs.c:196 ../src/prefs.c:197 +#: ../src/midori-preferences.c:337 ../src/midori-preferences.c:338 msgid "Network" msgstr "Réseau" -#: ../src/prefs.c:208 +#: ../src/midori-preferences.c:349 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../src/prefs.c:213 +#: ../src/midori-preferences.c:354 msgid "Privacy" msgstr "Confidentialité" -#: ../src/prefs.c:214 +#: ../src/midori-preferences.c:355 msgid "Cookies" -msgstr "Cookies" +msgstr "Témoins" -#: ../src/prefs.c:227 ../src/prefs.c:237 +#: ../src/midori-preferences.c:368 ../src/midori-preferences.c:378 msgid "days" msgstr "jours" @@ -970,16 +963,15 @@ msgstr "_Icône (nom ou fichier):" #: ../src/webSearch.c:242 msgid "_Keyword:" -msgstr "Mot-clé:" +msgstr "_Mot-clé:" #: ../src/webSearch.c:311 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" -# symbolic ? #: ../katze/katze-throbber.c:135 msgid "Symbolic size to use for the animation" -msgstr "" +msgstr "Taille symbolique d'utiliser pour l'animation" #: ../katze/katze-throbber.c:144 msgid "The name of an icon containing animation frames" From ecae9e1e492ee0d36837301b0b74134aef6023ab Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Apr 2008 03:31:55 +0200 Subject: [PATCH 0076/2970] Mention intltool in INSTALL. --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 11828ac4..cf9d62d9 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ If you checked out from the repository, make sure -you have *libtool* installed, then run +you have *libtool* and *intltool* installed, then run 1. ./autogen.sh From 4d11cf3555d32d367dcf8859080d9245f3e99915 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Apr 2008 06:41:26 +0200 Subject: [PATCH 0077/2970] Move UNIMPLEMENTED macro to sokoke. --- src/Makefile.am | 3 +-- src/debug.h | 25 ------------------------- src/sokoke.c | 9 ++++++++- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 src/debug.h diff --git a/src/Makefile.am b/src/Makefile.am index b712c206..8202314b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,5 +30,4 @@ midori_SOURCES = \ sokoke.c sokoke.h \ search.c search.h \ global.h \ - ui.h \ - debug.h + ui.h diff --git a/src/debug.h b/src/debug.h deleted file mode 100644 index d44b9657..00000000 --- a/src/debug.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __DEBUG_H__ -#define __DEBUG_H__ 1 - -#include "config.h" - -#include - -#if SOKOKE_DEBUG > 1 - #define UNIMPLEMENTED g_print(" * Unimplemented: %s\n", G_STRFUNC); -#else - #define UNIMPLEMENTED ; -#endif - -#endif /* !__DEBUG_H__ */ diff --git a/src/sokoke.c b/src/sokoke.c index bda6479b..bb38b30d 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -11,7 +11,7 @@ #include "sokoke.h" -#include "debug.h" +#include "config.h" #include #ifdef HAVE_UNISTD_H @@ -19,6 +19,13 @@ #endif #include #include +#include + +#if SOKOKE_DEBUG > 1 + #define UNIMPLEMENTED g_print(" * Unimplemented: %s\n", G_STRFUNC); +#else + #define UNIMPLEMENTED ; +#endif void sokoke_combo_box_add_strings(GtkComboBox* combobox , const gchar* labelFirst, ...) From 1264eb0667cb0756cbbf224b2031153aea58d55c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Apr 2008 18:12:39 +0200 Subject: [PATCH 0078/2970] Implement a font combobox and use it for Default Font Family. --- katze/katze-utils.c | 36 ++++++++++++++++++++++++++++++++++-- src/main.c | 2 +- src/midori-preferences.c | 2 +- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index da7f089d..8f9e8c80 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -48,6 +48,15 @@ proxy_uri_file_set_cb (GtkFileChooser* button, g_object_set (object, property, file, NULL); } +static gchar* +proxy_combo_box_text_changed_cb (GtkComboBox* button, GObject* object) +{ + gchar* text = gtk_combo_box_get_active_text (button); + const gchar* property = g_object_get_data (G_OBJECT (button), "property"); + g_object_set (object, property, text, NULL); + return FALSE; +} + static gboolean proxy_entry_focus_out_event_cb (GtkEntry* entry, GdkEventFocus* event, @@ -62,7 +71,7 @@ proxy_entry_focus_out_event_cb (GtkEntry* entry, static gboolean proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) { - gdouble value = gtk_spin_button_get_value (button); + gint value = gtk_spin_button_get_value_as_int (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); g_object_set (object, property, value, NULL); return FALSE; @@ -96,6 +105,8 @@ proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) * choosing an existing folder. * "uri": the widget created will be particularly suitable for * choosing an existing filename, encoded as an URI. + * "font": the widget created will be particularly suitable for + * choosing a font from installed fonts. * * Any other values for @hint are silently ignored. * @@ -167,6 +178,27 @@ katze_property_proxy (gpointer object, g_signal_connect (widget, "file-set", G_CALLBACK (proxy_uri_file_set_cb), object); } + else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("font")) + { + widget = gtk_combo_box_new_text (); + PangoContext* context = gtk_widget_get_pango_context (widget); + PangoFontFamily** families; + int n_families; + pango_context_list_families (context, &families, &n_families); + g_object_get (object, property, &string, NULL); + gint i = 0; + while (i < n_families) + { + const gchar* font = pango_font_family_get_name (families[i]); + gtk_combo_box_append_text (GTK_COMBO_BOX (widget), font); + if (string && !strcmp (font, string)) + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), i); + i++; + } + g_signal_connect (widget, "changed", + G_CALLBACK (proxy_combo_box_text_changed_cb), object); + g_free (families); + } else if (type == G_TYPE_PARAM_STRING) { widget = gtk_entry_new (); @@ -182,7 +214,7 @@ katze_property_proxy (gpointer object, widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_INT (pspec)->minimum, G_PARAM_SPEC_INT (pspec)->maximum, 1); - gdouble value; + gint value; g_object_get (object, property, &value, NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); g_signal_connect (widget, "changed", diff --git a/src/main.c b/src/main.c index 55f77559..a4b0715d 100644 --- a/src/main.c +++ b/src/main.c @@ -53,7 +53,7 @@ static void stock_items_init(void) { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, NULL }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, NULL }, #if !GTK_CHECK_VERSION(2, 10, 0) - { GTK_STOCK_SELECT_ALL, N_("Select _All", 0, 0, NULL }, + { GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, NULL }, #endif #if !GTK_CHECK_VERSION(2, 8, 0) { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL }, diff --git a/src/midori-preferences.c b/src/midori-preferences.c index e623453a..1fd72966 100644 --- a/src/midori-preferences.c +++ b/src/midori-preferences.c @@ -264,7 +264,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, label = katze_property_label (settings, "default-font-family"); INDENTED_ADD (label, 0, 1, 0, 1); hbox = gtk_hbox_new (FALSE, 4); - button = katze_property_proxy (settings, "default-font-family", NULL); + button = katze_property_proxy (settings, "default-font-family", "font"); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); entry = katze_property_proxy (settings, "default-font-size", NULL); gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); From 38115497918ad09e7d342254bf8b71939f3eb8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 20 Apr 2008 18:28:55 +0200 Subject: [PATCH 0079/2970] Fix crash on startup caused by invalid settings. --- src/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index a4b0715d..1c3a86f7 100644 --- a/src/main.c +++ b/src/main.c @@ -189,12 +189,17 @@ settings_new_from_file (const gchar* filename) "settings", property, enum_value->value_name, NULL); enum_value = g_enum_get_value_by_name (enum_class, string); - g_object_set (settings, property, enum_value->value, NULL); + if (enum_value) + g_object_set (settings, property, enum_value->value, NULL); + else + g_warning (_("Value '%s' is invalid for %s"), + string, property); + g_free (string); g_type_class_unref (enum_class); } else - g_warning ("Unhandled settings property '%s'", property); + g_warning (_("Unhandled settings property '%s'"), property); } return settings; } From 68e0e521f4f9e0a08b4288376a0a9842d0ee974d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Apr 2008 21:44:56 +0200 Subject: [PATCH 0080/2970] Resolve helpers and globals into sokoke. --- src/Makefile.am | 5 +- src/global.h | 65 ------------------- src/helpers.c | 145 ------------------------------------------- src/helpers.h | 43 ------------- src/main.c | 4 +- src/main.h | 58 +++++++++++++++-- src/midori-browser.c | 17 +++-- src/midori-webview.c | 13 ++-- src/sokoke.c | 69 ++++++++++++++++++++ src/sokoke.h | 11 ++++ src/webSearch.c | 39 +++++++++++- 11 files changed, 187 insertions(+), 282 deletions(-) delete mode 100644 src/global.h delete mode 100644 src/helpers.c delete mode 100644 src/helpers.h diff --git a/src/Makefile.am b/src/Makefile.am index 8202314b..042ef9be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,8 +26,5 @@ midori_SOURCES = \ midori-websettings.c midori-websettings.h \ midori-preferences.c midori-preferences.h \ webSearch.c webSearch.h \ - helpers.c helpers.h \ sokoke.c sokoke.h \ - search.c search.h \ - global.h \ - ui.h + search.c search.h diff --git a/src/global.h b/src/global.h deleted file mode 100644 index 40f003c4..00000000 --- a/src/global.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __GLOBAL_H__ -#define __GLOBAL_H__ 1 - -#include "midori-websettings.h" -#include - -#include -#include - -#include - -// FIXME: Remove these globals - -GList* searchEngines; // Items of type 'SearchEngine' -KatzeXbelItem* bookmarks; - -// Custom stock items - -// We should distribute these -// Names should match with epiphany and/ or xdg spec -/* NOTE: Those uncommented were replaced with remotely related icons - in order to reduce the amount of warnings :D */ - -#define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" "bookmark-web" -#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL // "insert-text" "form-fill" -#define STOCK_NEWSFEED GTK_STOCK_INDEX - -// We assume that these legacy icon names are usually present - -#define STOCK_BOOKMARK_NEW "stock_add-bookmark" -#define STOCK_HOMEPAGE GTK_STOCK_HOME -#define STOCK_IMAGE "gnome-mime-image" -#define STOCK_LOCK_OPEN "stock_lock-open" -#define STOCK_LOCK_SECURE "stock_lock" -#define STOCK_LOCK_BROKEN "stock_lock-broken" -#define STOCK_NETWORK_OFFLINE "network-offline" -#define STOCK_SCRIPT "stock_script" -#define STOCK_SEND "stock_mail-send" -#define STOCK_TAB_NEW "stock_new-tab" -#define STOCK_THEME "gnome-settings-theme" -#define STOCK_USER_TRASH "gnome-stock-trash" -#define STOCK_WINDOW_NEW "stock_new-window" - -// For backwards compatibility - -#if !GTK_CHECK_VERSION(2, 10, 0) -#define GTK_STOCK_SELECT_ALL "gtk-select-all" -#endif -#if !GTK_CHECK_VERSION(2, 8, 0) -#define GTK_STOCK_FULLSCREEN "gtk-fullscreen" -#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" -#endif - -#endif /* !__GLOBAL_H__ */ diff --git a/src/helpers.c b/src/helpers.c deleted file mode 100644 index cae95325..00000000 --- a/src/helpers.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "helpers.h" - -#include "global.h" -#include "search.h" -#include "sokoke.h" - -#include "midori-webview.h" -#include - -#include -#include - -GtkWidget* check_menu_item_new(const gchar* text - , GCallback signal, gboolean sensitive, gboolean active, gpointer userdata) -{ - GtkWidget* menuitem = gtk_check_menu_item_new_with_mnemonic(text); - gtk_widget_set_sensitive(menuitem, sensitive && signal); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); - if(signal) - g_signal_connect(menuitem, "activate", signal, userdata); - return menuitem; -} - -GtkWidget* radio_button_new(GtkRadioButton* radio_button, const gchar* label) -{ - return gtk_radio_button_new_with_mnemonic_from_widget(radio_button, label); -} - -void show_error(const gchar* text, const gchar* text2, MidoriBrowser* browser) -{ - GtkWidget* dialog = gtk_message_dialog_new( - browser ? GTK_WINDOW(browser) : NULL - , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, text); - if(text2) - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text2); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -} - -GdkPixbuf* load_web_icon(const gchar* icon, GtkIconSize size, GtkWidget* widget) -{ - g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL); - GdkPixbuf* pixbuf = NULL; - if(icon && *icon) - { - // TODO: We want to allow http as well, maybe also base64? - const gchar* iconReady = g_str_has_prefix(icon, "file://") ? &icon[7] : icon; - GtkStockItem stockItem; - if(gtk_stock_lookup(icon, &stockItem)) - pixbuf = gtk_widget_render_icon(widget, iconReady, size, NULL); - else - { - gint width; gint height; - gtk_icon_size_lookup(size, &width, &height); - pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default() - , icon, MAX(width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); - } - if(!pixbuf) - pixbuf = gdk_pixbuf_new_from_file_at_size(iconReady, 16, 16, NULL); - } - if(!pixbuf) - pixbuf = gtk_widget_render_icon(widget, GTK_STOCK_FIND, size, NULL); - return pixbuf; -} - -void entry_setup_completion(GtkEntry* entry) -{ - /* TODO: The current behavior works only with the beginning of strings - But we want to match "localhost" with "loc" and "hos" */ - GtkEntryCompletion* completion = gtk_entry_completion_new(); - gtk_entry_completion_set_model(completion - , GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING))); - gtk_entry_completion_set_text_column(completion, 0); - gtk_entry_completion_set_minimum_key_length(completion, 3); - gtk_entry_set_completion(entry, completion); - gtk_entry_completion_set_popup_completion(completion, FALSE); //... -} - -void entry_completion_append(GtkEntry* entry, const gchar* text) -{ - GtkEntryCompletion* completion = gtk_entry_get_completion(entry); - GtkTreeModel* completion_store = gtk_entry_completion_get_model(completion); - GtkTreeIter iter; - gtk_list_store_insert(GTK_LIST_STORE(completion_store), &iter, 0); - gtk_list_store_set(GTK_LIST_STORE(completion_store), &iter, 0, text, -1); -} - -gchar* magic_uri(const gchar* uri, gboolean search) -{ - // Add file:// if we have a local path - if(g_path_is_absolute(uri)) - return g_strconcat("file://", uri, NULL); - // Do we need to add a protocol? - if(!strstr(uri, "://")) - { - // Do we have a domain, ip address or localhost? - if(strchr(uri, '.') != NULL || !strcmp(uri, "localhost")) - return g_strconcat("http://", uri, NULL); - // We don't want to search? So return early. - if(!search) - return g_strdup(uri); - gchar search[256]; - const gchar* searchUrl = NULL; - // Do we have a keyword and a string? - gchar** parts = g_strsplit(uri, " ", 2); - if(parts[0] && parts[1]) - { - guint n = g_list_length(searchEngines); - guint i; - for(i = 0; i < n; i++) - { - SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, i); - if(!strcmp(search_engine_get_keyword(searchEngine), parts[0])) - searchUrl = searchEngine->url; - } - if(searchUrl != NULL) - g_snprintf(search, 255, searchUrl, parts[1]); - } - //g_strfreev(sParts); - // We only have a word or there is no matching keyowrd, so search for it - if(searchUrl == NULL) - g_snprintf(search, 255, ""/*config->locationSearch*/, uri); - return g_strdup(search); - } - return g_strdup(uri); -} - -gchar* get_default_font(void) -{ - GtkSettings* gtksettings = gtk_settings_get_default(); - gchar* defaultFont; - g_object_get(gtksettings, "gtk-font-name", &defaultFont, NULL); - return defaultFont; -} diff --git a/src/helpers.h b/src/helpers.h deleted file mode 100644 index dde12642..00000000 --- a/src/helpers.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __HELPERS_H__ -#define __HELPERS_H__ 1 - -#include - -#include "midori-browser.h" - -GtkWidget* -check_menu_item_new(const gchar*, GCallback, gboolean, gboolean, gpointer); - -GtkWidget* -radio_button_new(GtkRadioButton*, const gchar*); - -void -show_error(const gchar*, const gchar*, MidoriBrowser*); - -GdkPixbuf* -load_web_icon(const gchar*, GtkIconSize, GtkWidget*); - -void -entry_setup_completion(GtkEntry*); - -void -entry_completion_append(GtkEntry*, const gchar*); - -gchar* -magic_uri(const gchar*, gboolean bSearch); - -gchar* -get_default_font(void); - -#endif /* !__HELPERS_H__ */ diff --git a/src/main.c b/src/main.c index 1c3a86f7..2fabe7cd 100644 --- a/src/main.c +++ b/src/main.c @@ -11,8 +11,6 @@ #include "main.h" -#include "global.h" -#include "helpers.h" #include "sokoke.h" #include "search.h" @@ -409,7 +407,7 @@ int main(int argc, char** argv) while(uri != NULL) { KatzeXbelItem* item = katze_xbel_bookmark_new(); - gchar* uriReady = magic_uri(uri, FALSE); + gchar* uriReady = sokoke_magic_uri (uri, NULL); katze_xbel_bookmark_set_href(item, uriReady); g_free(uriReady); katze_xbel_folder_append_item(_session, item); diff --git a/src/main.h b/src/main.h index 9364748e..6e603014 100644 --- a/src/main.h +++ b/src/main.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -9,7 +9,57 @@ See the file COPYING for the full license text. */ -#ifndef __MIDORI_H__ -#define __MIDORI_H__ 1 +#ifndef __MAIN_H__ +#define __MAIN_H__ 1 -#endif /* !__MIDORI_H__ */ +#include "midori-websettings.h" +#include + +#include +#include + +#include + +// FIXME: Remove these globals + +GList* searchEngines; // Items of type 'SearchEngine' +KatzeXbelItem* bookmarks; + +// Custom stock items + +// We should distribute these +// Names should match with epiphany and/ or xdg spec +/* NOTE: Those uncommented were replaced with remotely related icons + in order to reduce the amount of warnings :D */ + +#define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" "bookmark-web" +#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL // "insert-text" "form-fill" +#define STOCK_NEWSFEED GTK_STOCK_INDEX + +// We assume that these legacy icon names are usually present + +#define STOCK_BOOKMARK_NEW "stock_add-bookmark" +#define STOCK_HOMEPAGE GTK_STOCK_HOME +#define STOCK_IMAGE "gnome-mime-image" +#define STOCK_LOCK_OPEN "stock_lock-open" +#define STOCK_LOCK_SECURE "stock_lock" +#define STOCK_LOCK_BROKEN "stock_lock-broken" +#define STOCK_NETWORK_OFFLINE "network-offline" +#define STOCK_SCRIPT "stock_script" +#define STOCK_SEND "stock_mail-send" +#define STOCK_TAB_NEW "stock_new-tab" +#define STOCK_THEME "gnome-settings-theme" +#define STOCK_USER_TRASH "gnome-stock-trash" +#define STOCK_WINDOW_NEW "stock_new-window" + +// For backwards compatibility + +#if !GTK_CHECK_VERSION(2, 10, 0) +#define GTK_STOCK_SELECT_ALL "gtk-select-all" +#endif +#if !GTK_CHECK_VERSION(2, 8, 0) +#define GTK_STOCK_FULLSCREEN "gtk-fullscreen" +#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" +#endif + +#endif /* !__MAIN_H__ */ diff --git a/src/midori-browser.c b/src/midori-browser.c index 576e230c..cbb86920 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -13,10 +13,9 @@ #include "midori-browser.h" -#include "global.h" -#include "helpers.h" #include "webSearch.h" +#include "main.h" #include "sokoke.h" #include "midori-webview.h" #include "midori-preferences.h" @@ -1020,6 +1019,9 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, GdkEventKey* event, MidoriBrowser* browser) { + MidoriBrowserPrivate* priv = browser->priv; + gchar* location_entry_search; + switch (event->keyval) { case GDK_ISO_Enter: @@ -1029,11 +1031,14 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, const gchar* uri = gtk_entry_get_text (GTK_ENTRY (widget)); if (uri) { - gchar* new_uri = magic_uri (uri, TRUE); + g_object_get (priv->settings, "location-entry-search", + &location_entry_search, NULL); + gchar* new_uri = sokoke_magic_uri (uri, location_entry_search); + g_free (location_entry_search); // TODO: Use new_uri intermediately when completion is better /* TODO Completion should be generated from history, that is the uri as well as the title. */ - entry_completion_append (GTK_ENTRY (widget), uri); + sokoke_entry_append_completion (GTK_ENTRY (widget), uri); GtkWidget* web_view = midori_browser_get_current_web_view (browser); g_object_set (web_view, "uri", new_uri, NULL); g_free (new_uri); @@ -2359,7 +2364,7 @@ midori_browser_init (MidoriBrowser* browser) // Location priv->location = sexy_icon_entry_new(); - entry_setup_completion (GTK_ENTRY (priv->location)); + sokoke_entry_setup_completion (GTK_ENTRY (priv->location)); priv->location_icon = gtk_image_new (); sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->location) , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (priv->location_icon)); @@ -2381,7 +2386,7 @@ midori_browser_init (MidoriBrowser* browser) // TODO: Make this actively resizable or enlarge to fit contents? // FIXME: The interface is somewhat awkward and ought to be rethought // TODO: Display "show in context menu" search engines as "completion actions" - entry_setup_completion (GTK_ENTRY (priv->search)); + sokoke_entry_setup_completion (GTK_ENTRY (priv->search)); g_object_connect (priv->search, "signal::icon-released", on_webSearch_icon_released, browser, diff --git a/src/midori-webview.c b/src/midori-webview.c index 77f319c3..591b46c2 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -11,7 +11,7 @@ #include "midori-webview.h" -#include "global.h" +#include "main.h" #include "sokoke.h" #include @@ -245,14 +245,9 @@ midori_web_view_class_init (MidoriWebViewClass* class) "", flags)); - g_object_class_install_property (gobject_class, - PROP_SETTINGS, - g_param_spec_object ( - "settings", - "Settings", - _("The associated settings"), - MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_READWRITE)); + g_object_class_override_property (gobject_class, + PROP_SETTINGS, + "settings"); g_type_class_add_private (class, sizeof (MidoriWebViewPrivate)); } diff --git a/src/sokoke.c b/src/sokoke.c index bb38b30d..403dae6b 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -11,7 +11,10 @@ #include "sokoke.h" +#include "search.h" + #include "config.h" +#include "main.h" #include #ifdef HAVE_UNISTD_H @@ -21,6 +24,72 @@ #include #include +gchar* +sokoke_magic_uri (const gchar* uri, const gchar* default_search_uri) +{ + // Add file:// if we have a local path + if (g_path_is_absolute (uri)) + return g_strconcat ("file://", uri, NULL); + // Do we need to add a protocol? + if (!strstr (uri, "://")) + { + // Do we have a domain, ip address or localhost? + if (strchr (uri, '.') != NULL || !strcmp (uri, "localhost")) + return g_strconcat ("http://", uri, NULL); + // We don't want to search? So return early. + if (!default_search_uri) + return g_strdup (uri); + gchar* search; + const gchar* search_uri = NULL; + // Do we have a keyword and a string? + gchar** parts = g_strsplit (uri, " ", 2); + if (parts[0] && parts[1]) + { + guint n = g_list_length (searchEngines); + guint i; + for (i = 0; i < n; i++) + { + SearchEngine* search_engine = (SearchEngine*)g_list_nth_data ( + searchEngines, i); + if (!strcmp (search_engine_get_keyword (search_engine), + parts[0])) + search_uri = search_engine->url; + } + if (search_uri) + search = g_strdup_printf (search_uri, parts[1]); + } + // We only have a word or there is no matching keyword, so search for it + if (!search_uri) + search = g_strdup_printf (default_search_uri, uri); + return search; + } + return g_strdup (uri); +} + +void +sokoke_entry_setup_completion (GtkEntry* entry) +{ + /* TODO: The current behavior works only with the beginning of strings + But we want to match "localhost" with "loc" and "hos" */ + GtkEntryCompletion* completion = gtk_entry_completion_new (); + gtk_entry_completion_set_model (completion, + GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING))); + gtk_entry_completion_set_text_column (completion, 0); + gtk_entry_completion_set_minimum_key_length (completion, 3); + gtk_entry_set_completion (entry, completion); + gtk_entry_completion_set_popup_completion (completion, FALSE); //... +} + +void +sokoke_entry_append_completion (GtkEntry* entry, const gchar* text) +{ + GtkEntryCompletion* completion = gtk_entry_get_completion (entry); + GtkTreeModel* completion_store = gtk_entry_completion_get_model (completion); + GtkTreeIter iter; + gtk_list_store_insert (GTK_LIST_STORE (completion_store), &iter, 0); + gtk_list_store_set (GTK_LIST_STORE (completion_store), &iter, 0, text, -1); +} + #if SOKOKE_DEBUG > 1 #define UNIMPLEMENTED g_print(" * Unimplemented: %s\n", G_STRFUNC); #else diff --git a/src/sokoke.h b/src/sokoke.h index bbb5e7a2..3a89f4b2 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -17,6 +17,17 @@ // Many themes need this hack for small toolbars to work #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON +gchar* +sokoke_magic_uri (const gchar* uri, + const gchar* search); + +void +sokoke_entry_setup_completion (GtkEntry* entry); + +void +sokoke_entry_append_completion (GtkEntry* entry, + const gchar* text); + typedef enum { SOKOKE_MENU_POSITION_CURSOR = 0, SOKOKE_MENU_POSITION_LEFT, diff --git a/src/webSearch.c b/src/webSearch.c index d8040577..000c66ed 100644 --- a/src/webSearch.c +++ b/src/webSearch.c @@ -11,15 +11,48 @@ #include "webSearch.h" -#include "global.h" -#include "helpers.h" #include "search.h" + +#include "main.h" #include "sokoke.h" #include #include #include +static GdkPixbuf* +load_web_icon (const gchar* icon, GtkIconSize size, GtkWidget* widget) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); + GdkPixbuf* pixbuf = NULL; + if (icon && *icon) + { + // TODO: We want to allow http as well, maybe also base64? + const gchar* icon_ready = g_str_has_prefix (icon, "file://") + ? &icon[7] : icon; + GtkStockItem stock_id; + if (gtk_stock_lookup (icon, &stock_id)) + pixbuf = gtk_widget_render_icon (widget, icon_ready, size, NULL); + else + { + gint width, height; + gtk_icon_size_lookup (size, &width, &height); + if (gtk_widget_has_screen (widget)) + { + GdkScreen* screen = gtk_widget_get_screen (widget); + pixbuf = gtk_icon_theme_load_icon ( + gtk_icon_theme_get_for_screen (screen), icon, + MAX (width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + } + } + if (!pixbuf) + pixbuf = gdk_pixbuf_new_from_file_at_size (icon_ready, 16, 16, NULL); + } + if (!pixbuf) + pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FIND, size, NULL); + return pixbuf; +} + void update_searchEngine(guint index, GtkWidget* search) { guint n = g_list_length(searchEngines); @@ -437,7 +470,7 @@ void on_webSearch_activate(GtkWidget* widget, MidoriBrowser* browser) search = g_strdup_printf(url, keywords); else search = g_strconcat(url, " ", keywords, NULL); - entry_completion_append(GTK_ENTRY(widget), keywords); + sokoke_entry_append_completion(GTK_ENTRY(widget), keywords); GtkWidget* webView = midori_browser_get_current_web_view(browser); webkit_web_view_open(WEBKIT_WEB_VIEW(webView), search); g_free(search); From d9f7abc5c76d2547b91ee74ea1ec6f7fee5c2bd1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Apr 2008 22:19:24 +0200 Subject: [PATCH 0081/2970] Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change. --- src/midori-browser.c | 99 ++++++++++++++++++++++++++++++---------- src/midori-websettings.c | 12 +++++ src/midori-webview.c | 8 ++-- 3 files changed, 91 insertions(+), 28 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index cbb86920..d6c995ce 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -2664,7 +2664,39 @@ midori_browser_finalize (GObject* object) } static void -_midori_browser_update_settings (MidoriBrowser* browser) +_midori_browser_set_toolbar_style (MidoriBrowser* browser, + MidoriToolbarStyle toolbar_style) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkToolbarStyle gtk_toolbar_style; + GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); + if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) + g_object_get (gtk_settings, "gtk-toolbar-style", >k_toolbar_style, NULL); + else + { + switch (toolbar_style) + { + case MIDORI_TOOLBAR_ICONS: + gtk_toolbar_style = GTK_TOOLBAR_ICONS; + break; + case MIDORI_TOOLBAR_TEXT: + gtk_toolbar_style = GTK_TOOLBAR_TEXT; + break; + case MIDORI_TOOLBAR_BOTH: + gtk_toolbar_style = GTK_TOOLBAR_BOTH; + break; + case MIDORI_TOOLBAR_BOTH_HORIZ: + case MIDORI_TOOLBAR_DEFAULT: + gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ; + } + } + gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_style); +} + +static void +_midori_browser_update_settings (MidoriBrowser* browser) { MidoriBrowserPrivate* priv = browser->priv; @@ -2709,30 +2741,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) default_width, default_height); } - GtkToolbarStyle gtk_toolbar_style; - GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); - if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) - g_object_get (gtk_settings, "gtk-toolbar-style", >k_toolbar_style, NULL); - else - { - switch (toolbar_style) - { - case MIDORI_TOOLBAR_ICONS: - gtk_toolbar_style = GTK_TOOLBAR_ICONS; - break; - case MIDORI_TOOLBAR_TEXT: - gtk_toolbar_style = GTK_TOOLBAR_TEXT; - break; - case MIDORI_TOOLBAR_BOTH: - gtk_toolbar_style = GTK_TOOLBAR_BOTH; - break; - case MIDORI_TOOLBAR_BOTH_HORIZ: - case MIDORI_TOOLBAR_DEFAULT: - gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ; - } - } - gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), - gtk_toolbar_style); + _midori_browser_set_toolbar_style (browser, toolbar_style); gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), small_toolbar ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR); @@ -2756,6 +2765,40 @@ _midori_browser_update_settings (MidoriBrowser* browser) g_free (last_pageholder_uri); } +static void +midori_browser_settings_notify (MidoriWebSettings* web_settings, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + const gchar* name = g_intern_string (pspec->name); + GValue value = {0, }; + + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (priv->settings), name, &value); + + if (name == g_intern_string ("toolbar-style")) + _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); + else if (name == g_intern_string ("small-toolbar")) + gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), + g_value_get_boolean (&value) ? GTK_ICON_SIZE_SMALL_TOOLBAR + : GTK_ICON_SIZE_LARGE_TOOLBAR); + else if (name == g_intern_string ("show-new-tab")) + sokoke_widget_set_visible (priv->button_tab_new, + g_value_get_boolean (&value)); + else if (name == g_intern_string ("show-web-search")) + sokoke_widget_set_visible (priv->search, + g_value_get_boolean (&value)); + else if (name == g_intern_string ("show-trash")) + sokoke_widget_set_visible (priv->button_trash, + g_value_get_boolean (&value)); + else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), + name)) + g_warning("Unexpected setting '%s'", name); + g_value_unset (&value); +} + static void midori_browser_set_property (GObject* object, guint prop_id, @@ -2771,9 +2814,15 @@ midori_browser_set_property (GObject* object, _midori_browser_set_statusbar_text (browser, g_value_get_string (value)); break; case PROP_SETTINGS: + if (priv->settings) + g_signal_handlers_disconnect_by_func (priv->settings, + midori_browser_settings_notify, + browser); katze_object_assign (priv->settings, g_value_get_object (value)); g_object_ref (priv->settings); _midori_browser_update_settings (browser); + g_signal_connect (priv->settings, "notify", + G_CALLBACK (midori_browser_settings_notify), browser); gtk_container_foreach (GTK_CONTAINER (priv->notebook), (GtkCallback) midori_web_view_set_settings, priv->settings); diff --git a/src/midori-websettings.c b/src/midori-websettings.c index c3e0ce8a..6f6ba7b3 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -225,6 +225,10 @@ midori_web_settings_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static void +midori_web_settings_notify (GObject* object, + GParamSpec* pspec); + static void midori_web_settings_class_init (MidoriWebSettingsClass* class) { @@ -232,6 +236,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) gobject_class->finalize = midori_web_settings_finalize; gobject_class->set_property = midori_web_settings_set_property; gobject_class->get_property = midori_web_settings_get_property; + gobject_class->notify = midori_web_settings_notify; GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; @@ -919,6 +924,13 @@ midori_web_settings_get_property (GObject* object, } } +static void +midori_web_settings_notify (GObject* object, + GParamSpec* pspec) +{ + +} + /** * midori_web_settings_new: * diff --git a/src/midori-webview.c b/src/midori-webview.c index 591b46c2..399a6d58 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -569,9 +569,9 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, else if (name == g_intern_string ("middle-click-opens-selection")) priv->middle_click_opens_selection = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), - name)) - g_warning("Unexpected setting '%s'", name); - g_value_unset(&value); + name)) + g_warning("Unexpected setting '%s'", name); + g_value_unset (&value); } static void @@ -585,6 +585,7 @@ midori_web_view_init (MidoriWebView* web_view) priv->settings = midori_web_settings_new (); _midori_web_view_update_settings (web_view); + g_object_set (web_view, "WebKitWebView::settings", priv->settings, NULL); g_signal_connect (priv->settings, "notify", G_CALLBACK (midori_web_view_settings_notify), web_view); @@ -701,6 +702,7 @@ midori_web_view_set_property (GObject* object, katze_object_assign (priv->settings, g_value_get_object (value)); g_object_ref (priv->settings); _midori_web_view_update_settings (web_view); + g_object_set (object, "WebKitWebView::settings", priv->settings, NULL); g_signal_connect (priv->settings, "notify", G_CALLBACK (midori_web_view_settings_notify), web_view); break; From 7a7499d8db01d1add46cd80ecce37e84e69927aa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Apr 2008 23:36:37 +0200 Subject: [PATCH 0082/2970] Show hidden location/ web search temporarily when needed. If the location or web search was hidden, and one attempted to use the menus or shortcuts for Location or Web search, an appropriate dialog with an entry was shown. Now we show the according widget temporarily and hide it again once it loses focus. --- src/midori-browser.c | 132 ++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 78 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index d6c995ce..a7c5f20f 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -1064,44 +1064,25 @@ _action_location_activate (GtkAction* action, { MidoriBrowserPrivate* priv = browser->priv; - if (GTK_WIDGET_VISIBLE (priv->navigationbar)) - gtk_widget_grab_focus (priv->location); - else - { - // TODO: We should offer all of the location's features here - GtkWidget* dialog; - dialog = gtk_dialog_new_with_buttons (_("Open location") - , GTK_WINDOW (browser) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , GTK_STOCK_JUMP_TO, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_JUMP_TO); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width ( - GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); - GtkWidget* hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic (_("_Location:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - GtkWidget* entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all( hbox); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - gtk_entry_set_text (GTK_ENTRY (priv->location) - , gtk_entry_get_text (GTK_ENTRY (entry))); - GdkEventKey event; - event.keyval = GDK_Return; - midori_browser_location_key_press_event_cb (priv->location, - &event, browser); - } - gtk_widget_destroy (dialog); - } + if (!GTK_WIDGET_VISIBLE (priv->navigationbar)) + gtk_widget_show (priv->navigationbar); + gtk_widget_grab_focus (priv->location); +} + +static gboolean +midori_browser_location_focus_out_event_cb (GtkWidget* widget, + GdkEventFocus* event, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean show_navigationbar; + g_object_get (priv->settings, + "show-navigationbar", &show_navigationbar, + NULL); + if (!show_navigationbar) + gtk_widget_hide (priv->navigationbar); + return FALSE; } static void @@ -1110,41 +1091,31 @@ _action_search_activate (GtkAction* action, { MidoriBrowserPrivate* priv = browser->priv; - if (GTK_WIDGET_VISIBLE (priv->search) - && GTK_WIDGET_VISIBLE (priv->navigationbar)) - gtk_widget_grab_focus (priv->search); - else - { - // TODO: We should offer all of the search's features here - GtkWidget* dialog = gtk_dialog_new_with_buttons (_("Web search") - , GTK_WINDOW (browser) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_FIND); - gtk_container_set_border_width(GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width ( - GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); - GtkWidget* hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic (_("_Location:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - GtkWidget* entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - gtk_entry_set_text (GTK_ENTRY (priv->search) - , gtk_entry_get_text (GTK_ENTRY (entry))); - on_webSearch_activate (priv->search, browser); - } - gtk_widget_destroy (dialog); - } + if (!GTK_WIDGET_VISIBLE (priv->search)) + gtk_widget_show (priv->search); + if (!GTK_WIDGET_VISIBLE (priv->navigationbar)) + gtk_widget_show (priv->navigationbar); + gtk_widget_grab_focus (priv->search); +} + +static gboolean +midori_browser_search_focus_out_event_cb (GtkWidget* widget, + GdkEventFocus* event, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean show_navigationbar; + gboolean show_web_search; + g_object_get (priv->settings, + "show-navigationbar", &show_navigationbar, + "show-web-search", &show_web_search, + NULL); + if (!show_navigationbar) + gtk_widget_hide (priv->navigationbar); + if (!show_web_search) + gtk_widget_hide (priv->search); + return FALSE; } static void @@ -2369,11 +2340,14 @@ midori_browser_init (MidoriBrowser* browser) sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->location) , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (priv->location_icon)); sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (priv->location)); - g_signal_connect (priv->location, "key-press-event", - G_CALLBACK (midori_browser_location_key_press_event_cb), - browser); - g_signal_connect (priv->location, "changed", - G_CALLBACK (midori_browser_location_changed_cb), browser); + g_object_connect (priv->location, + "signal::key-press-event", + midori_browser_location_key_press_event_cb, browser, + "signal::focus-out-event", + midori_browser_location_focus_out_event_cb, browser, + "signal::changed", + midori_browser_location_changed_cb, browser, + NULL); GtkToolItem* toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); gtk_container_add (GTK_CONTAINER(toolitem), priv->location); @@ -2396,6 +2370,8 @@ midori_browser_init (MidoriBrowser* browser) on_webSearch_scroll, browser, "signal::activate", on_webSearch_activate, browser, + "signal::focus-out-event", + midori_browser_search_focus_out_event_cb, browser, NULL); toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), priv->search); From a2aa7376775fecc82eac8992732e2769f4fbce2e Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Thu, 24 Apr 2008 00:42:41 +0200 Subject: [PATCH 0083/2970] Add string allocations to avoid freeing of constant strings. --- katze/katze-utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 8f9e8c80..4ccdce1f 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -148,7 +148,7 @@ katze_property_proxy (gpointer object, GTK_FILE_CHOOSER_ACTION_OPEN); g_object_get (object, property, &string, NULL); if (!string) - string = G_PARAM_SPEC_STRING (pspec)->default_value; + string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), string ? string : ""); g_signal_connect (widget, "file-set", @@ -160,7 +160,7 @@ katze_property_proxy (gpointer object, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); g_object_get (object, property, &string, NULL); if (!string) - string = G_PARAM_SPEC_STRING (pspec)->default_value; + string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), string ? string : ""); g_signal_connect (widget, "file-set", @@ -172,7 +172,7 @@ katze_property_proxy (gpointer object, GTK_FILE_CHOOSER_ACTION_OPEN); g_object_get (object, property, &string, NULL); if (!string) - string = G_PARAM_SPEC_STRING (pspec)->default_value; + string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (widget), string ? string : ""); g_signal_connect (widget, "file-set", @@ -204,7 +204,7 @@ katze_property_proxy (gpointer object, widget = gtk_entry_new (); g_object_get (object, property, &string, NULL); if (!string) - string = G_PARAM_SPEC_STRING (pspec)->default_value; + string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_entry_set_text (GTK_ENTRY (widget), string ? string : ""); g_signal_connect (widget, "focus-out-event", G_CALLBACK (proxy_entry_focus_out_event_cb), object); From 62cbafe12a99587f33acd8031c1618d80cb4f4f0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 25 Apr 2008 00:20:43 +0200 Subject: [PATCH 0084/2970] Attempt to fix handling of background and foreground tabs. --- TODO | 7 +---- katze/katze-utils.c | 4 +++ src/midori-browser.c | 73 +++++++++++++++++++++++++++++++++----------- src/midori-browser.h | 4 +++ 4 files changed, 65 insertions(+), 23 deletions(-) diff --git a/TODO b/TODO index 8f8b8a98..0b2685a7 100644 --- a/TODO +++ b/TODO @@ -1,18 +1,13 @@ TODO: . Import and export of the bookmarks file, or using one from a specific path . Save files on change as opposed to on quit - . Position context menus properly - . New tabs from a TabNew action should always open in the foreground . Middle click toolbuttons or menuitems should open new tabs . Implement support for (multiple) userscripts/ userstyles . Actual multiple window support, some things just ignore this currently - . Custom context menu actions - . Create proper submenus in the window's menu instead of popups + . Custom context menu actions, like in Thunar or Epiphany . Custom tab names . Identify and fix Gtk2.6 compatibility problems . Open an auto-vanishing findbox with '.' - . Support gettext - . Implement custom actions, like in Thunar or Epiphany . Custom panels, loaded from (x)htm(l) files or websites . Drag tabs onto the panel to add them to the sidebar . Save completion stores diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 4ccdce1f..fb3f6c3f 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -13,6 +13,8 @@ #include +#include + static void proxy_toggle_button_toggled_cb (GtkToggleButton* button, GObject* object) { @@ -186,6 +188,8 @@ katze_property_proxy (gpointer object, int n_families; pango_context_list_families (context, &families, &n_families); g_object_get (object, property, &string, NULL); + if (!string) + string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gint i = 0; while (i < n_families) { diff --git a/src/midori-browser.c b/src/midori-browser.c index a7c5f20f..b19460c2 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -231,6 +231,19 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, priv->statusbar_text ? priv->statusbar_text : ""); } +static void +_midori_browser_set_current_page_smartly (MidoriBrowser* browser, + gint n) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean open_tabs_in_the_background; + g_object_get (priv->settings, "open-tabs-in-the-background", + &open_tabs_in_the_background, NULL); + if (!open_tabs_in_the_background) + midori_browser_set_current_page (browser, n); +} + static void _midori_browser_update_progress (MidoriBrowser* browser, gint progress) @@ -420,8 +433,8 @@ midori_web_view_new_tab_cb (GtkWidget* web_view, const gchar* uri, MidoriBrowser* browser) { - midori_browser_append_uri (browser, uri); - gtk_widget_grab_focus (web_view); + gint n = midori_browser_append_uri (browser, uri); + _midori_browser_set_current_page_smartly (browser, n); } static void @@ -565,7 +578,11 @@ static void _action_tab_new_activate (GtkAction* action, MidoriBrowser* browser) { - midori_browser_append_uri (browser, ""); + MidoriBrowserPrivate* priv = browser->priv; + + gint n = midori_browser_append_uri (browser, ""); + midori_browser_set_current_page (browser, n); + gtk_widget_grab_focus (priv->location); } static void @@ -817,7 +834,8 @@ midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, KatzeXbelItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeXbelItem"); const gchar* uri = katze_xbel_bookmark_get_href (item); - midori_browser_append_uri (browser, uri); + gint n = midori_browser_append_uri (browser, uri); + midori_browser_set_current_page (browser, n); katze_xbel_item_unref (item); } @@ -1322,7 +1340,8 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, if (event->button == 2 && katze_xbel_item_is_bookmark (item)) { const gchar* uri = katze_xbel_bookmark_get_href (item); - midori_browser_append_uri (browser, uri); + gint n = midori_browser_append_uri (browser, uri); + midori_browser_set_current_page (browser, n); } else _midori_panel_bookmarks_popup (widget, event, item, browser); @@ -1741,7 +1760,10 @@ _action_bookmark_open_tab_activate (GtkAction* action, KatzeXbelItem* item; gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) - midori_browser_append_xbel_item (browser, item); + { + gint n = midori_browser_append_xbel_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); + } } } } @@ -1763,7 +1785,10 @@ _action_bookmark_open_window_activate (GtkAction* action, KatzeXbelItem* item; gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) - midori_browser_append_xbel_item (browser, item); + { + gint n = midori_browser_append_xbel_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); + } } } } @@ -1798,7 +1823,8 @@ _action_undo_tab_close_activate (GtkAction* action, // Reopen the most recent trash item KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, 0); - midori_browser_append_xbel_item (browser, item); + gint n = midori_browser_append_xbel_item (browser, item); + midori_browser_set_current_page (browser, n); midori_trash_remove_nth_item (priv->trash, 0); _midori_browser_update_actions (browser); } @@ -2953,7 +2979,7 @@ midori_browser_append_tab (MidoriBrowser* browser, { gtk_widget_show (menuitem); g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_window_menu_item_activate_cb), browser); + G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); } @@ -2969,14 +2995,6 @@ midori_browser_append_tab (MidoriBrowser* browser, _midori_browser_update_actions (browser); n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - gboolean open_tabs_in_the_background; - g_object_get (priv->settings, "open-tabs-in-the-background", - &open_tabs_in_the_background, NULL); - if (!open_tabs_in_the_background) - { - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); - gtk_widget_grab_focus (priv->location); - } return n; } @@ -3052,6 +3070,27 @@ midori_browser_append_uri (MidoriBrowser* browser, return midori_browser_append_tab (browser, web_view); } +/** + * midori_browser_set_current_page: + * @browser: a #MidoriBrowser + * @n: the index of a page + * + * Switches to the page with the index @n. + * + * The widget will also grab the focus automatically. + **/ +void +midori_browser_set_current_page (MidoriBrowser* browser, + gint n) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + GtkWidget* widget = midori_browser_get_current_page (browser); + if (widget) + gtk_widget_grab_focus (widget); +} + /** * midori_browser_get_current_page: * @browser: a #MidoriBrowser diff --git a/src/midori-browser.h b/src/midori-browser.h index 1853563c..f0b8e0a4 100644 --- a/src/midori-browser.h +++ b/src/midori-browser.h @@ -76,6 +76,10 @@ gint midori_browser_append_uri (MidoriBrowser* browser, const gchar* uri); +void +midori_browser_set_current_page (MidoriBrowser* browser, + gint n); + GtkWidget* midori_browser_get_current_page (MidoriBrowser* browser); From a580cf281bca86d34758bb3f8e643203248996db Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 25 Apr 2008 21:31:57 +0200 Subject: [PATCH 0085/2970] Fix focus in location if starting up with a Blank page At the point of loading the first page the web view hasn't loaded anything, so we need to manually focus the Location if the page is blank. Incidentally midori_browser_activate_action can activate any action, so it will probably be much more useful in the future. --- src/main.c | 6 +++++- src/midori-browser.c | 32 +++++++++++++++++++++++++++++--- src/midori-browser.h | 4 ++++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 2fabe7cd..1933c254 100644 --- a/src/main.c +++ b/src/main.c @@ -456,7 +456,7 @@ int main(int argc, char** argv) "signal::delete-event", midori_browser_delete_event_cb, browsers, "signal::quit", midori_browser_quit_cb, browsers, NULL); - browsers = g_list_prepend(browsers, browser); + browsers = g_list_prepend (browsers, browser); gtk_widget_show (GTK_WIDGET (browser)); KatzeXbelItem* session = katze_xbel_folder_new (); @@ -466,6 +466,10 @@ int main(int argc, char** argv) KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, i); midori_browser_append_xbel_item (browser, item); } + // FIXME: Switch to the last active page + KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, 0); + if (!strcmp (katze_xbel_bookmark_get_href (item), "")) + midori_browser_activate_action (browser, "Location"); katze_xbel_item_unref (_session); gtk_main (); diff --git a/src/midori-browser.c b/src/midori-browser.c index b19460c2..fadf1fcd 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -2797,7 +2797,7 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_get_boolean (&value)); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) - g_warning("Unexpected setting '%s'", name); + g_warning (_("Unexpected setting '%s'"), name); g_value_unset (&value); } @@ -3070,6 +3070,26 @@ midori_browser_append_uri (MidoriBrowser* browser, return midori_browser_append_tab (browser, web_view); } +/** + * midori_browser_activate_action: + * @browser: a #MidoriBrowser + * @name: name of the action + * + * Activates the specified action. + **/ +void +midori_browser_activate_action (MidoriBrowser* browser, + const gchar* name) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkAction* action = _action_by_name (browser, name); + if (action) + gtk_action_activate (action); + else + g_warning (_("Unexpected action '%s'."), name); +} + /** * midori_browser_set_current_page: * @browser: a #MidoriBrowser @@ -3086,8 +3106,14 @@ midori_browser_set_current_page (MidoriBrowser* browser, MidoriBrowserPrivate* priv = browser->priv; gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); - GtkWidget* widget = midori_browser_get_current_page (browser); - if (widget) + GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n); + GtkWidget* widget = _midori_browser_child_for_scrolled (browser, scrolled); + printf ("_nth_page: %s\n", G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (widget))); + if (widget && MIDORI_IS_WEB_VIEW (widget) + && !strcmp (midori_web_view_get_display_uri ( + MIDORI_WEB_VIEW (widget)), "")) + gtk_widget_grab_focus (priv->location); + else gtk_widget_grab_focus (widget); } diff --git a/src/midori-browser.h b/src/midori-browser.h index f0b8e0a4..a6a797d8 100644 --- a/src/midori-browser.h +++ b/src/midori-browser.h @@ -76,6 +76,10 @@ gint midori_browser_append_uri (MidoriBrowser* browser, const gchar* uri); +void +midori_browser_activate_action (MidoriBrowser* browser, + const gchar* name); + void midori_browser_set_current_page (MidoriBrowser* browser, gint n); From 2e580f050353944f9e3bc04a2146d838df66731b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Apr 2008 02:43:32 +0200 Subject: [PATCH 0086/2970] Integrate panel toolbars properly outside scrolled areas. --- src/midori-browser.c | 26 +++++++++--------- src/midori-console.c | 63 ++++++++++++++++++++++++++++++-------------- src/midori-console.h | 5 +++- src/midori-panel.c | 20 +++++++++++++- src/midori-panel.h | 1 + src/midori-webview.c | 4 +-- 6 files changed, 83 insertions(+), 36 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index fadf1fcd..f6e825cc 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -85,7 +85,8 @@ enum PROP_TRASH }; -enum { +enum +{ NEW_WINDOW, STATUSBAR_TEXT_CHANGED, ELEMENT_MOTION, @@ -2487,9 +2488,6 @@ midori_browser_init (MidoriBrowser* browser) // Bookmarks GtkWidget* box = gtk_vbox_new (FALSE, 0); - GtkWidget* toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_bookmarks"); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); - gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; @@ -2527,9 +2525,13 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); priv->panel_bookmarks = treeview; gtk_widget_show_all (box); + GtkWidget* toolbar = gtk_ui_manager_get_widget (ui_manager, + "/toolbar_bookmarks"); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); + gtk_widget_show_all (toolbar); midori_panel_append_page (MIDORI_PANEL (priv->panel), - box, "vcard", _("Bookmarks")); - action = _action_by_name (browser, "PanelBookmarks"); + box, toolbar, + "vcard", _("Bookmarks")); // Transfers priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, @@ -2537,14 +2539,16 @@ midori_browser_init (MidoriBrowser* browser) NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, + priv->panel_pageholder, NULL, "package", _("Transfers")); // Console priv->panel_console = midori_console_new (); gtk_widget_show (priv->panel_console); + toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (priv->panel_console)); + gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_console, + priv->panel_console, toolbar, "terminal", _("Console")); // History @@ -2553,7 +2557,7 @@ midori_browser_init (MidoriBrowser* browser) NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, + priv->panel_pageholder, NULL, "document-open-recent", _("History")); // Pageholder @@ -2562,7 +2566,7 @@ midori_browser_init (MidoriBrowser* browser) NULL); gtk_widget_show (priv->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, + priv->panel_pageholder, NULL, GTK_STOCK_CONVERT, _("Pageholder")); // Notebook, containing all web_views @@ -3081,8 +3085,6 @@ void midori_browser_activate_action (MidoriBrowser* browser, const gchar* name) { - MidoriBrowserPrivate* priv = browser->priv; - GtkAction* action = _action_by_name (browser, name); if (action) gtk_action_activate (action); diff --git a/src/midori-console.c b/src/midori-console.c index 95189219..5eb191de 100644 --- a/src/midori-console.c +++ b/src/midori-console.c @@ -100,26 +100,6 @@ midori_console_init (MidoriConsole* console) MidoriConsolePrivate* priv = console->priv; - // Create the toolbar - GtkWidget* toolbar = gtk_toolbar_new (); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - GtkToolItem* toolitem = gtk_tool_item_new (); - // TODO: What about a find entry here that filters e.g. by url? - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - toolitem = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), - FALSE); - gtk_tool_item_set_expand (toolitem, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_console_button_clear_clicked_cb), console); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show_all (toolbar); - gtk_box_pack_start (GTK_BOX (console), toolbar, FALSE, FALSE, 0); - // Create the treeview GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; @@ -165,6 +145,49 @@ midori_console_new (void) return GTK_WIDGET (console); } +/** + * midori_console_get_toolbar: + * + * Retrieves the toolbar of the console. A new widget is created on + * the first call of this function. + * + * Return value: a new #MidoriConsole + **/ +GtkWidget* +midori_console_get_toolbar (MidoriConsole* console) +{ + g_return_if_fail (MIDORI_IS_CONSOLE (console)); + + MidoriConsolePrivate* priv = console->priv; + + static GtkWidget* toolbar = NULL; + + if (!toolbar) + { + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + GtkToolItem* toolitem = gtk_tool_item_new (); + // TODO: What about a find entry here that filters e.g. by url? + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (toolitem); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), + FALSE); + gtk_tool_item_set_expand (toolitem, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (toolitem); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_console_button_clear_clicked_cb), console); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (toolitem); + } + + return toolbar; +} + /** * midori_console_add: * @console: a #MidoriConsole diff --git a/src/midori-console.h b/src/midori-console.h index 91898b95..884c2b2b 100644 --- a/src/midori-console.h +++ b/src/midori-console.h @@ -53,8 +53,11 @@ midori_console_get_type (void); GtkWidget* midori_console_new (void); +GtkWidget* +midori_console_get_toolbar (MidoriConsole* console); + void -midori_console_add (MidoriConsole* panel, +midori_console_add (MidoriConsole* console, const gchar* message, gint line, const gchar* source_id); diff --git a/src/midori-panel.c b/src/midori-panel.c index 8c4856d3..128d8e0c 100644 --- a/src/midori-panel.c +++ b/src/midori-panel.c @@ -21,6 +21,7 @@ struct _MidoriPanelPrivate GtkWidget* toolbar; GtkWidget* toolbar_label; GtkWidget* frame; + GtkWidget* toolbook; GtkWidget* notebook; GSList* group; GtkMenu* menu; @@ -216,6 +217,13 @@ midori_panel_init (MidoriPanel* panel) gtk_box_pack_start (GTK_BOX (vbox), labelbar, FALSE, FALSE, 0); gtk_widget_show_all (vbox); + // Create the toolbook + priv->toolbook = gtk_notebook_new (); + gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->toolbook), FALSE); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->toolbook), FALSE); + gtk_box_pack_start (GTK_BOX (vbox), priv->toolbook, FALSE, FALSE, 0); + gtk_widget_show (priv->toolbook); + // Create the notebook priv->notebook = gtk_notebook_new (); gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); @@ -325,10 +333,12 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, * midori_panel_append_page: * @panel: a #MidoriPanel * @child: the child widget + * @toolbar: a toolbar widget, or %NULL * @icon: a stock ID or icon name, or %NULL * @label: a string to use as the label, or %NULL * - * Appends a new page to the panel. + * Appends a new page to the panel. If @toolbar is specified it will + * be packaged above @child. * * If @icon is an icon name, the according image is used as an * icon for this page. @@ -342,11 +352,13 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, gint midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, + GtkWidget* toolbar, const gchar* icon, const gchar* label) { g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); g_return_val_if_fail (GTK_IS_WIDGET (child), -1); + g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); MidoriPanelPrivate* priv = panel->priv; @@ -369,6 +381,11 @@ midori_panel_append_page (MidoriPanel* panel, gtk_container_add (GTK_CONTAINER (scrolled), widget); gtk_container_add (GTK_CONTAINER (priv->notebook), scrolled); + if (!toolbar) + toolbar = gtk_event_box_new (); + gtk_widget_show (toolbar); + gtk_container_add (GTK_CONTAINER (priv->toolbook), toolbar); + guint n = midori_panel_page_num (panel, child); const gchar* text = label ? label : _("Untitled"); @@ -533,6 +550,7 @@ midori_panel_set_current_page (MidoriPanel* panel, MidoriPanelPrivate* priv = panel->priv; + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->toolbook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); GtkWidget* child = midori_panel_get_nth_page (panel, n); if (child) diff --git a/src/midori-panel.h b/src/midori-panel.h index d10a4aa6..eb3908bc 100644 --- a/src/midori-panel.h +++ b/src/midori-panel.h @@ -64,6 +64,7 @@ midori_panel_new (void); gint midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, + GtkWidget* toolbar, const gchar* icon, const gchar* label); diff --git a/src/midori-webview.c b/src/midori-webview.c index 399a6d58..d1a126d0 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -570,7 +570,7 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, priv->middle_click_opens_selection = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) - g_warning("Unexpected setting '%s'", name); + g_warning (_("Unexpected setting '%s'"), name); g_value_unset (&value); } @@ -1036,7 +1036,7 @@ midori_web_view_get_progress (MidoriWebView* web_view) } /** - * midori_web_view_get_uri: + * midori_web_view_get_display_uri: * @web_view: a #MidoriWebView * * Retrieves a string that is suitable for displaying, particularly an From 133cd688b96642e935ed060d9a6febb87ad48c2d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 28 Apr 2008 22:38:57 +0200 Subject: [PATCH 0087/2970] Initial addon panel feature, only userscripts for now. --- katze/katze-utils.h | 9 + src/Makefile.am | 3 +- src/main.c | 50 ++--- src/midori-addons.c | 500 +++++++++++++++++++++++++++++++++++++++++++ src/midori-addons.h | 75 +++++++ src/midori-browser.c | 129 ++++++++++- src/midori-browser.h | 11 + src/midori-console.c | 18 +- 8 files changed, 750 insertions(+), 45 deletions(-) create mode 100644 src/midori-addons.c create mode 100644 src/midori-addons.h diff --git a/katze/katze-utils.h b/katze/katze-utils.h index c42267d6..6ff7b863 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -16,6 +16,15 @@ G_BEGIN_DECLS +/** + * KATZE_OBJECT_NAME: + * @object: an object + * + * Return the name of an object's class structure's type. + **/ +#define KATZE_OBJECT_NAME(object) \ + G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) + /** * katze_assign: * @lvalue: a pointer diff --git a/src/Makefile.am b/src/Makefile.am index 042ef9be..82208d26 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,9 +17,10 @@ bin_PROGRAMS = \ midori midori_SOURCES = \ - main.c main.h \ + main.c main.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ + midori-addons.c midori-addons.h \ midori-console.c midori-console.h \ midori-trash.c midori-trash.h \ midori-webview.c midori-webview.h \ diff --git a/src/main.c b/src/main.c index 1933c254..884e30ab 100644 --- a/src/main.c +++ b/src/main.c @@ -253,20 +253,21 @@ settings_save_to_file (MidoriWebSettings* settings, enum_value->value_name); } else - g_warning ("Unhandled settings property '%s'", property); + g_warning (_("Unhandled settings property '%s'"), property); } gboolean saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); return saved; } -int main(int argc, char** argv) +int +main (int argc, char** argv) { MidoriStartup load_on_startup; gchar* homepage; - locale_init(); - g_set_application_name(_("midori")); + locale_init (); + g_set_application_name (_("midori")); // Parse cli options gboolean version = FALSE; @@ -278,15 +279,16 @@ int main(int argc, char** argv) }; GError* error = NULL; - if(!gtk_init_with_args(&argc, &argv, _("[URL]"), entries, GETTEXT_PACKAGE, &error)) + if (!gtk_init_with_args (&argc, &argv, _("[URL]"), entries, + GETTEXT_PACKAGE, &error)) { - g_error_free(error); + g_error_free (error); return 1; } - if(version) + if (version) { - g_print( + g_print ( "%s %s - Copyright (c) 2007-2008 Christian Dywan\n\n" "GTK+2: \t\t%s\n" "WebKit: \t\t%s\n" @@ -403,17 +405,17 @@ int main(int argc, char** argv) // TODO: Handle any number of separate uris from argv // Open as many tabs as we have uris, seperated by pipes - gchar* uri = argc > 1 ? strtok(g_strdup(argv[1]), "|") : NULL; - while(uri != NULL) + gchar* uri = argc > 1 ? strtok (g_strdup(argv[1]), "|") : NULL; + while (uri != NULL) { - KatzeXbelItem* item = katze_xbel_bookmark_new(); - gchar* uriReady = sokoke_magic_uri (uri, NULL); - katze_xbel_bookmark_set_href(item, uriReady); - g_free(uriReady); - katze_xbel_folder_append_item(_session, item); - uri = strtok(NULL, "|"); + KatzeXbelItem* item = katze_xbel_bookmark_new (); + gchar* uri_ready = sokoke_magic_uri (uri, NULL); + katze_xbel_bookmark_set_href (item, uri_ready); + g_free (uri_ready); + katze_xbel_folder_append_item (_session, item); + uri = strtok (NULL, "|"); } - g_free(uri); + g_free (uri); if (katze_xbel_folder_is_empty (_session)) { @@ -484,8 +486,8 @@ int main(int argc, char** argv) error = NULL; if (!search_engines_to_file (searchEngines, config_file, &error)) { - g_warning("The search engines couldn't be saved. %s", error->message); - g_error_free(error); + g_warning (_("The search engines couldn't be saved. %s"), error->message); + g_error_free (error); } search_engines_free(searchEngines); g_free (config_file); @@ -493,8 +495,8 @@ int main(int argc, char** argv) error = NULL; if (!katze_xbel_folder_to_file (bookmarks, config_file, &error)) { - g_warning("The bookmarks couldn't be saved. %s", error->message); - g_error_free(error); + g_warning (_("The bookmarks couldn't be saved. %s"), error->message); + g_error_free (error); } katze_xbel_item_unref(bookmarks); g_free (config_file); @@ -502,7 +504,7 @@ int main(int argc, char** argv) error = NULL; if (!katze_xbel_folder_to_file (xbel_trash, config_file, &error)) { - g_warning ("The trash couldn't be saved. %s", error->message); + g_warning (_("The trash couldn't be saved. %s"), error->message); g_error_free (error); } katze_xbel_item_unref (xbel_trash); @@ -514,7 +516,7 @@ int main(int argc, char** argv) error = NULL; if (!katze_xbel_folder_to_file (session, config_file, &error)) { - g_warning ("The session couldn't be saved. %s", error->message); + g_warning (_("The session couldn't be saved. %s"), error->message); g_error_free (error); } } @@ -523,7 +525,7 @@ int main(int argc, char** argv) error = NULL; if (!settings_save_to_file (settings, config_file, &error)) { - g_warning ("The configuration couldn't be saved. %s", error->message); + g_warning (_("The configuration couldn't be saved. %s"), error->message); g_error_free (error); } katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); diff --git a/src/midori-addons.c b/src/midori-addons.c new file mode 100644 index 00000000..0dd013f0 --- /dev/null +++ b/src/midori-addons.c @@ -0,0 +1,500 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "config.h" + +#include "midori-addons.h" + +#include "sokoke.h" +#include +#include +#include + +G_DEFINE_TYPE (MidoriAddons, midori_addons, GTK_TYPE_VBOX) + +struct _MidoriAddonsPrivate +{ + MidoriAddonKind kind; + GtkWidget* toolbar; + GtkWidget* treeview; +}; + +#define MIDORI_ADDONS_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_ADDONS, MidoriAddonsPrivate)) + +GType +midori_addon_kind_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_ADDON_EXTENSIONS, "MIDORI_ADDON_EXTENSIONS", N_("Extensions") }, + { MIDORI_ADDON_USER_SCRIPTS, "MIDORI_USER_SCRIPTS", N_("Userscripts") }, + { MIDORI_ADDON_USER_STYLES, "MIDORI_USER_STYLES", N_("Userstyles") }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriAddonKind", values); + } + return type; +} + +static void +midori_addons_class_init (MidoriAddonsClass* class) +{ + g_type_class_add_private (class, sizeof (MidoriAddonsPrivate)); +} + +static void +midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, + MidoriAddons* addons) +{ + GtkWidget* dialog = gtk_message_dialog_new ( + gtk_widget_get_toplevel (GTK_WIDGET (addons)), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, + "Put scripts in the folder ~/.local/share/midori/scripts"); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +static void +midori_addons_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + // gchar* source_id; + // gtk_tree_model_get (model, iter, 2, &source_id, -1); + + g_object_set (renderer, "stock-id", GTK_STOCK_FILE, NULL); + + // g_free (source_id); +} + +static void +midori_addons_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + gchar* filename; + gint a; + gchar* b; + gtk_tree_model_get (model, iter, 0, &filename, 1, &a, 2, &b, -1); + + // FIXME: Convert filename to UTF8 + gchar* text = g_strdup_printf ("%s", filename); + g_object_set (renderer, "text", text, NULL); + g_free (text); + + g_free (filename); + g_free (b); +} + +static void +midori_addons_treeview_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriAddons* addons) +{ + /*GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gchar* b; + gtk_tree_model_get (model, &iter, 2, &b, -1); + g_free (b); + }*/ +} + +static void +midori_addons_init (MidoriAddons* addons) +{ + addons->priv = MIDORI_ADDONS_GET_PRIVATE (addons); + + MidoriAddonsPrivate* priv = addons->priv; + + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + priv->treeview = gtk_tree_view_new (); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_addons_treeview_render_icon_cb, + priv->treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_addons_treeview_render_text_cb, + priv->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column); + g_signal_connect (priv->treeview, "row-activated", + G_CALLBACK (midori_addons_treeview_row_activated_cb), + addons); + gtk_widget_show (priv->treeview); + gtk_box_pack_start (GTK_BOX (addons), priv->treeview, TRUE, TRUE, 0); +} + +static gchar* +_js_string_utf8 (JSStringRef js_string) +{ + size_t size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); + gchar* string_utf8 = (gchar*)g_malloc (size_utf8); + JSStringGetUTF8CString (js_string, string_utf8, size_utf8); + return string_utf8; +} + +static bool +_js_class_has_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property) +{ + GObject* object = JSObjectGetPrivate (js_object); + bool result = false; + if (object) + { + gchar* property = _js_string_utf8 (js_property); + if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), + property)) + result = true; + g_free (property); + } + return result; +} + +static JSValueRef +_js_class_get_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_object); + JSValueRef js_result = NULL; + if (object) + { + gchar* property = _js_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) + { + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + gchar* value; + g_object_get (object, property, &value, NULL); + JSStringRef js_string = JSStringCreateWithUTF8CString (value); + js_result = JSValueMakeString (js_context, js_string); + } + else + { + gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + g_free (property); + } + return js_result; +} + +static bool +_js_class_set_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef js_value, + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_object); + bool result = false; + if (object) + { + gchar* property = _js_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) + { + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + if (!(pspec->flags & G_PARAM_WRITABLE)) + { + g_free (property); + return false; + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + JSStringRef js_string = JSValueToStringCopy (js_context, js_value, + js_exception); + if (js_string) + { + gchar* string = _js_string_utf8 (js_string); + g_object_set (object, property, string, NULL); + g_free (string); + } + } + else + { + gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + g_free (property); + } + return result; +} + +static JSObjectRef +_js_object_new (JSContextRef js_context, + GObject* object) +{ + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (KATZE_OBJECT_NAME (object)); + js_class_def.hasProperty = _js_class_has_property_cb; + js_class_def.getProperty = _js_class_get_property_cb; + js_class_def.setProperty = _js_class_set_property_cb; + // js_class_def.staticFunctions = JSStaticFunction*; + JSClassRef js_class = JSClassCreate (&js_class_def); + return JSObjectMake (js_context, js_class, object); +} + +static void +_js_object_set_property (JSContextRef js_context, + JSObjectRef js_object, + const gchar* name, + JSValueRef js_value) +{ + JSStringRef js_name = JSStringCreateWithUTF8CString (name); + JSObjectSetProperty(js_context, js_object, js_name, js_value, + kJSPropertyAttributeNone, NULL); + JSStringRelease (js_name); +} + +static JSValueRef +_js_eval (JSContextRef js_context, + const gchar* script, + gchar** exception) +{ + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSValueRef js_exception; + JSValueRef js_value = JSEvaluateScript (js_context, js_script, + JSContextGetGlobalObject (js_context), + NULL, 0, &js_exception); + if (!js_value && exception) + { + JSStringRef js_message = JSValueToStringCopy (js_context, + js_exception, NULL); + *exception = _js_string_utf8 (js_message); + JSStringRelease (js_message); + } + JSStringRelease (js_script); + return js_value; +} + +static gboolean +_js_document_load_script_file (JSContextRef js_context, + const gchar* filename, + gchar** exception) +{ + gboolean result = FALSE; + gchar* script; + GError* error = NULL; + if (g_file_get_contents (filename, &script, NULL, &error)) + { + if (_js_eval (js_context, script, exception)) + result = TRUE; + g_free (script); + } + else + { + *exception = g_strdup (error->message); + g_error_free (error); + } + return result; +} + +static const gchar* _folder_for_kind (MidoriAddonKind kind) +{ + switch (kind) + { + case MIDORI_ADDON_EXTENSIONS: + return "extensions"; + case MIDORI_ADDON_USER_SCRIPTS: + return "scripts"; + case MIDORI_ADDON_USER_STYLES: + return "styles"; + default: + return NULL; + } +} + +static void +midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, + WebKitWebFrame* web_frame, + JSGlobalContextRef js_context, + JSObjectRef js_window, + MidoriAddons* addons) +{ + MidoriAddonsPrivate* priv = addons->priv; + + GObject* settings; + g_object_get (web_widget, "settings", &settings, NULL); + JSObjectRef js_settings = _js_object_new (js_context, settings); + _js_object_set_property (js_context, + JSContextGetGlobalObject (js_context), + KATZE_OBJECT_NAME (settings), js_settings); + + // FIXME: We want to honor system installed addons as well + gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, + _folder_for_kind (priv->kind), NULL); + GDir* addon_dir = g_dir_open (addon_path, 0, NULL); + if (addon_dir) + { + const gchar* filename; + while ((filename = g_dir_read_name (addon_dir))) + { + gchar* fullname = g_build_filename (addon_path, filename, NULL); + gchar* exception; + if (!_js_document_load_script_file (js_context, fullname, + &exception)) + { + gchar* message = g_strdup_printf ("console.error ('%s');", + exception); + _js_eval (js_context, message, NULL); + g_free (message); + g_free (exception); + } + g_free (fullname); + } + g_dir_close (addon_dir); + } +} + +/** + * midori_addons_new: + * @web_widget: a web widget + * @kind: the kind of addon + * @extension: a file extension mask + * + * Creates a new addons widget. + * + * @web_widget can be one of the following: + * %MidoriBrowser, %MidoriWebView, %WebKitWebView + * + * Note: Currently @extension has no effect. + * + * Return value: a new #MidoriAddons + **/ +GtkWidget* +midori_addons_new (GtkWidget* web_widget, + MidoriAddonKind kind) +{ + g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL); + + MidoriAddons* addons = g_object_new (MIDORI_TYPE_ADDONS, + // "kind", kind, + NULL); + + MidoriAddonsPrivate* priv = addons->priv; + priv->kind = kind; + + if (kind == MIDORI_ADDON_USER_SCRIPTS) + g_signal_connect (web_widget, "window-object-cleared", + G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); + + GtkListStore* liststore = gtk_list_store_new (3, G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING); + // FIXME: We want to honor system installed addons as well + gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, + _folder_for_kind (priv->kind), NULL); + GDir* addon_dir = g_dir_open (addon_path, 0, NULL); + if (addon_dir) + { + const gchar* filename; + while ((filename = g_dir_read_name (addon_dir))) + { + GtkTreeIter iter; + gtk_list_store_append (liststore, &iter); + gtk_list_store_set (liststore, &iter, + 0, filename, 1, 0, 2, "", -1); + } + g_dir_close (addon_dir); + } + gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview), + GTK_TREE_MODEL (liststore)); + + return GTK_WIDGET (addons); +} + +/** + * midori_addons_get_toolbar: + * + * Retrieves the toolbar of the addons. A new widget is created on + * the first call of this function. + * + * Return value: a new #MidoriAddons + **/ +GtkWidget* +midori_addons_get_toolbar (MidoriAddons* addons) +{ + MidoriAddonsPrivate* priv = addons->priv; + + g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL); + + if (!priv->toolbar) + { + GtkWidget* toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + GtkToolItem* toolitem = gtk_tool_item_new (); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), + FALSE); + gtk_tool_item_set_expand (toolitem, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_addons_button_add_clicked_cb), addons); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + priv->toolbar = toolbar; + } + + return priv->toolbar; +} diff --git a/src/midori-addons.h b/src/midori-addons.h new file mode 100644 index 00000000..940ff73c --- /dev/null +++ b/src/midori-addons.h @@ -0,0 +1,75 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_ADDONS_H__ +#define __MIDORI_ADDONS_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_ADDONS \ + (midori_addons_get_type ()) +#define MIDORI_ADDONS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_ADDONS, MidoriAddons)) +#define MIDORI_ADDONS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_ADDONS, MidoriAddonsClass)) +#define MIDORI_IS_ADDONS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_ADDONS)) +#define MIDORI_IS_ADDONS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_ADDONS)) +#define MIDORI_ADDONS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_ADDONS, MidoriAddonsClass)) + +typedef struct _MidoriAddons MidoriAddons; +typedef struct _MidoriAddonsPrivate MidoriAddonsPrivate; +typedef struct _MidoriAddonsClass MidoriAddonsClass; + +struct _MidoriAddons +{ + GtkVBox parent_instance; + + MidoriAddonsPrivate* priv; +}; + +struct _MidoriAddonsClass +{ + GtkVBoxClass parent_class; +}; + +typedef enum +{ + MIDORI_ADDON_EXTENSIONS, + MIDORI_ADDON_USER_SCRIPTS, + MIDORI_ADDON_USER_STYLES +} MidoriAddonKind; + +GType +midori_addon_kind_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_ADDON_KIND \ + (midori_addon_kind_get_type ()) + +GType +midori_addons_get_type (void); + +GtkWidget* +midori_addons_new (GtkWidget* web_widget, + MidoriAddonKind kind); + +GtkWidget* +midori_addons_get_toolbar (MidoriAddons* console); + +G_END_DECLS + +#endif /* __MIDORI_ADDONS_H__ */ diff --git a/src/midori-browser.c b/src/midori-browser.c index f6e825cc..e1b52f49 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -20,6 +20,7 @@ #include "midori-webview.h" #include "midori-preferences.h" #include "midori-panel.h" +#include "midori-addons.h" #include "midori-console.h" #include "midori-trash.h" @@ -87,10 +88,11 @@ enum enum { - NEW_WINDOW, + WINDOW_OBJECT_CLEARED, STATUSBAR_TEXT_CHANGED, ELEMENT_MOTION, QUIT, + NEW_WINDOW, LAST_SIGNAL }; @@ -268,6 +270,17 @@ _midori_browser_update_progress (MidoriBrowser* browser, } } +static void +midori_web_view_window_object_cleared_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + JSGlobalContextRef js_context, + JSObjectRef js_window, + MidoriBrowser* browser) +{ + g_signal_emit (browser, signals[WINDOW_OBJECT_CLEARED], 0, + web_frame, js_context, js_window); +} + static void midori_web_view_load_started_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, @@ -477,9 +490,82 @@ midori_web_view_destroy_cb (GtkWidget* widget, return FALSE; } +static void +midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef gboolean(*GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer arg_3, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_POINTER_POINTER callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 4); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (marshal_data + ? marshal_data : cc->callback); + + callback (data1, + g_value_get_object (param_values + 1), + g_value_get_pointer (param_values + 2), + g_value_get_pointer (param_values + 3), + data2); +} + static void midori_browser_class_init (MidoriBrowserClass* class) { + signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( + "window-object-cleared", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, window_object_cleared), + 0, + NULL, + midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER, + G_TYPE_NONE, 3, + WEBKIT_TYPE_WEB_FRAME, + G_TYPE_POINTER, + G_TYPE_POINTER); + + signals[STATUSBAR_TEXT_CHANGED] = g_signal_new ( + "statusbar-text-changed", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, statusbar_text_changed), + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + signals[ELEMENT_MOTION] = g_signal_new ( + "element-motion", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, new_window), + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); signals[QUIT] = g_signal_new ( "quit", @@ -2534,12 +2620,10 @@ midori_browser_init (MidoriBrowser* browser) "vcard", _("Bookmarks")); // Transfers - priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", "", - NULL); - gtk_widget_show (priv->panel_pageholder); + GtkWidget* panel = midori_web_view_new (); + gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, NULL, + panel, NULL, "package", _("Transfers")); // Console @@ -2552,12 +2636,10 @@ midori_browser_init (MidoriBrowser* browser) "terminal", _("Console")); // History - priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", "", - NULL); - gtk_widget_show (priv->panel_pageholder); + panel = midori_web_view_new (); + gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, NULL, + panel, NULL, "document-open-recent", _("History")); // Pageholder @@ -2569,6 +2651,29 @@ midori_browser_init (MidoriBrowser* browser) priv->panel_pageholder, NULL, GTK_STOCK_CONVERT, _("Pageholder")); + // Addons + /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); + gtk_widget_show (panel); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + panel, toolbar, + "", _("Extensions"));*/ + panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); + gtk_widget_show (panel); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + panel, toolbar, + "", _("Userscripts")); + /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); + gtk_widget_show (panel); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + panel, toolbar, + "", _("Userstyles"));*/ + // Notebook, containing all web_views priv->notebook = gtk_notebook_new (); gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); @@ -2944,6 +3049,8 @@ midori_browser_append_tab (MidoriBrowser* browser, } g_object_connect (widget, + "signal::window-object-cleared", + midori_web_view_window_object_cleared_cb, browser, "signal::load-started", midori_web_view_load_started_cb, browser, "signal::load-committed", diff --git a/src/midori-browser.h b/src/midori-browser.h index a6a797d8..e7194235 100644 --- a/src/midori-browser.h +++ b/src/midori-browser.h @@ -48,6 +48,17 @@ struct _MidoriBrowserClass /* Signals */ void + (*window_object_cleared) (MidoriBrowser* browser, + WebKitWebFrame* web_frame, + JSContextRef* context, + JSObjectRef* window_object); + void + (*statusbar_text_changed) (MidoriBrowser* browser, + const gchar* text); + void + (*element_motion) (MidoriBrowser* browser, + const gchar* link_uri); + void (*quit) (MidoriBrowser* browser); void (*new_window) (MidoriBrowser* browser, diff --git a/src/midori-console.c b/src/midori-console.c index 5eb191de..693608da 100644 --- a/src/midori-console.c +++ b/src/midori-console.c @@ -18,6 +18,7 @@ G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX) struct _MidoriConsolePrivate { + GtkWidget* toolbar; GtkWidget* treeview; }; @@ -156,36 +157,35 @@ midori_console_new (void) GtkWidget* midori_console_get_toolbar (MidoriConsole* console) { - g_return_if_fail (MIDORI_IS_CONSOLE (console)); + g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL); MidoriConsolePrivate* priv = console->priv; - static GtkWidget* toolbar = NULL; - - if (!toolbar) + if (!priv->toolbar) { - toolbar = gtk_toolbar_new (); + GtkWidget* toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); GtkToolItem* toolitem = gtk_tool_item_new (); // TODO: What about a find entry here that filters e.g. by url? gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (toolitem); + gtk_widget_show (GTK_WIDGET (toolitem)); toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); gtk_tool_item_set_expand (toolitem, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (toolitem); + gtk_widget_show (GTK_WIDGET (toolitem)); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_console_button_clear_clicked_cb), console); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (toolitem); + gtk_widget_show (GTK_WIDGET (toolitem)); + priv->toolbar = toolbar; } - return toolbar; + return priv->toolbar; } /** From b354aed64068dabe2881a1456c0781ea1ba00cb3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 29 Apr 2008 00:12:23 +0200 Subject: [PATCH 0088/2970] Enumerate script object property names. --- src/midori-addons.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/midori-addons.c b/src/midori-addons.c index 0dd013f0..f2f38d22 100644 --- a/src/midori-addons.c +++ b/src/midori-addons.c @@ -59,7 +59,7 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) { GtkWidget* dialog = gtk_message_dialog_new ( - gtk_widget_get_toplevel (GTK_WIDGET (addons)), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "Put scripts in the folder ~/.local/share/midori/scripts"); @@ -159,6 +159,29 @@ _js_string_utf8 (JSStringRef js_string) return string_utf8; } +static void +_js_class_get_property_names_cb (JSContextRef js_context, + JSObjectRef js_object, + JSPropertyNameAccumulatorRef js_properties) +{ + GObject* object = JSObjectGetPrivate (js_object); + if (object) + { + guint n_properties; + GParamSpec** pspecs = g_object_class_list_properties ( + G_OBJECT_GET_CLASS (object), &n_properties); + gint i; + for (i = 0; i < n_properties; i++) + { + GType type = G_PARAM_SPEC_TYPE (pspecs[i]); + const gchar* property = g_param_spec_get_name (pspecs[i]); + JSStringRef js_property = JSStringCreateWithUTF8CString (property); + JSPropertyNameAccumulatorAddName (js_properties, js_property); + JSStringRelease (js_property); + } + } +} + static bool _js_class_has_property_cb (JSContextRef js_context, JSObjectRef js_object, @@ -281,6 +304,7 @@ _js_object_new (JSContextRef js_context, { JSClassDefinition js_class_def = kJSClassDefinitionEmpty; js_class_def.className = g_strdup (KATZE_OBJECT_NAME (object)); + js_class_def.getPropertyNames = _js_class_get_property_names_cb; js_class_def.hasProperty = _js_class_has_property_cb; js_class_def.getProperty = _js_class_get_property_cb; js_class_def.setProperty = _js_class_set_property_cb; From 7039d48e480e84bcb272457101d30beee86b24e5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 2 May 2008 22:30:26 +0200 Subject: [PATCH 0089/2970] First attempt at an extension interface. --- src/midori-addons.c | 719 ++++++++++++++++++++++++++------------- src/midori-browser.c | 166 +++++++-- src/midori-browser.h | 9 +- src/midori-websettings.c | 2 +- 4 files changed, 647 insertions(+), 249 deletions(-) diff --git a/src/midori-addons.c b/src/midori-addons.c index f2f38d22..c5cbe6e1 100644 --- a/src/midori-addons.c +++ b/src/midori-addons.c @@ -54,15 +54,34 @@ midori_addons_class_init (MidoriAddonsClass* class) g_type_class_add_private (class, sizeof (MidoriAddonsPrivate)); } +static const +gchar* _folder_for_kind (MidoriAddonKind kind) +{ + switch (kind) + { + case MIDORI_ADDON_EXTENSIONS: + return "extensions"; + case MIDORI_ADDON_USER_SCRIPTS: + return "scripts"; + case MIDORI_ADDON_USER_STYLES: + return "styles"; + default: + return NULL; + } +} + static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) { + MidoriAddonsPrivate* priv = addons->priv; + GtkWidget* dialog = gtk_message_dialog_new ( GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, - "Put scripts in the folder ~/.local/share/midori/scripts"); + "Put scripts in the folder ~/.local/share/midori/%s", + _folder_for_kind (priv->kind)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -119,6 +138,401 @@ midori_addons_treeview_row_activated_cb (GtkTreeView* treeview, }*/ } +static gchar* +_js_string_utf8 (JSStringRef js_string) +{ + size_t size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); + gchar* string_utf8 = (gchar*)g_malloc (size_utf8); + JSStringGetUTF8CString (js_string, string_utf8, size_utf8); + return string_utf8; +} + +static void +_js_class_get_property_names_cb (JSContextRef js_context, + JSObjectRef js_object, + JSPropertyNameAccumulatorRef js_properties) +{ + GObject* object = JSObjectGetPrivate (js_object); + if (object) + { + guint n_properties; + GParamSpec** pspecs = g_object_class_list_properties ( + G_OBJECT_GET_CLASS (object), &n_properties); + gint i; + for (i = 0; i < n_properties; i++) + { + const gchar* property = g_param_spec_get_name (pspecs[i]); + JSStringRef js_property = JSStringCreateWithUTF8CString (property); + JSPropertyNameAccumulatorAddName (js_properties, js_property); + JSStringRelease (js_property); + } + } +} + +static bool +_js_class_has_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property) +{ + bool result = false; + gchar* property = _js_string_utf8 (js_property); + GObject* object = JSObjectGetPrivate (js_object); + if (object) + { + if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), + property)) + result = true; + } + else if (js_object == JSContextGetGlobalObject (js_context)) + { + gchar* property = _js_string_utf8 (js_property); + GType type = g_type_from_name (property); + result = type ? type : false; + } + g_free (property); + return result; +} + +static JSObjectRef +_js_object_new (JSContextRef js_context, + gpointer object); + +static void +_js_object_set_property (JSContextRef js_context, + JSObjectRef js_object, + const gchar* name, + JSValueRef js_value) +{ + JSStringRef js_name = JSStringCreateWithUTF8CString (name); + JSObjectSetProperty(js_context, js_object, js_name, js_value, + kJSPropertyAttributeNone, NULL); + JSStringRelease (js_name); +} + +static JSObjectRef +_js_object_call_as_constructor_cb (JSContextRef js_context, + JSObjectRef js_object, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) +{ + gchar* type_name = JSObjectGetPrivate (js_object); + if (type_name) + { + GType type = g_type_from_name (type_name); + if (type) + { + GObject* object = g_object_new (type, NULL); + JSObjectRef js_object = _js_object_new (js_context, object); + return js_object; + } + } + return JSValueMakeNull (js_context); +} + +static JSValueRef +_js_class_get_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef* js_exception) +{ + if (js_object == JSContextGetGlobalObject (js_context)) + { + gchar* property = _js_string_utf8 (js_property); + GType type = g_type_from_name (property); + if (type) + { + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (property); + js_class_def.callAsConstructor = _js_object_call_as_constructor_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + return JSObjectMake (js_context, js_class, property); + } + g_free (property); + return JSValueMakeNull (js_context); + } + GObject* object = JSObjectGetPrivate (js_object); + JSValueRef js_result = NULL; + if (object) + { + gchar* property = _js_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) + { + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + g_free (property); + return JSValueMakeNull (js_context); + } + if (!(pspec->flags & G_PARAM_READABLE)) + { + g_free (property); + return JSValueMakeUndefined (js_context); + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + gchar* value; + g_object_get (object, property, &value, NULL); + if (value) + { + JSStringRef js_string = JSStringCreateWithUTF8CString (value); + js_result = JSValueMakeString (js_context, js_string); + } + } + else if (type == G_TYPE_PARAM_INT + || type == G_TYPE_PARAM_UINT) + { + gint value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeNumber (js_context, value); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeBoolean (js_context, value ? true : false); + } + else if (type == G_TYPE_PARAM_OBJECT) + { + GObject* value; + g_object_get (object, property, &value, NULL); + if (value) + js_result = _js_object_new (js_context, value); + } + else if (type == G_TYPE_PARAM_ENUM) + { + gint value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeNumber (js_context, value); + } + else + js_result = JSValueMakeUndefined (js_context); + g_free (property); + } + return js_result ? js_result : JSValueMakeNull (js_context); +} + +static bool +_js_class_set_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef js_value, + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_object); + bool result = false; + if (object) + { + gchar* property = _js_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) + { + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + g_free (property); + return false; + } + if (!(pspec->flags & G_PARAM_WRITABLE)) + { + g_free (property); + return false; + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + JSStringRef js_string_value = JSValueToStringCopy (js_context, + js_value, js_exception); + if (js_string_value) + { + gchar* string_value = _js_string_utf8 (js_string_value); + g_object_set (object, property, string_value, NULL); + g_free (string_value); + } + } + else if (type == G_TYPE_PARAM_INT + || type == G_TYPE_PARAM_UINT) + { + int value = JSValueToNumber (js_context, js_value, + js_exception); + g_object_set (object, property, value, NULL); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + bool value = JSValueToBoolean (js_context, js_value); + g_object_set (object, property, value ? TRUE : FALSE, NULL); + } + else if (type == G_TYPE_PARAM_OBJECT) + { + JSObjectRef js_object_value = JSValueToObject ( + js_context, js_value, NULL); + GObject* object_value = JSObjectGetPrivate (js_object_value); + if (object_value) + g_object_set (object, property, object_value, NULL); + else + { + gchar* message = g_strdup_printf (_("%s cannot be assigned to %s.%s"), + "[object]", KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + } + else + { + gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), + KATZE_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + g_free (property); + } + return result; +} + +static JSValueRef +_js_foo_call_as_function_cb (JSContextRef js_context, + JSObjectRef js_function, + JSObjectRef js_this, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_this); + if (object) + { + if (!n_arguments) + { + gtk_widget_show (GTK_WIDGET (object)); + } + else if (n_arguments == 1) + { + JSObjectRef js_arg1 = JSValueToObject ( + js_context, js_arguments[0], NULL); + GObject* arg1 = JSObjectGetPrivate (js_arg1); + if (arg1) + gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); + } + } + + return JSValueMakeUndefined (js_context); +} + +static void +_js_foo_add_function (JSContextRef js_context, + JSObjectRef js_object, + const gchar* func) +{ + JSStringRef js_func = JSStringCreateWithUTF8CString (func); + JSObjectRef js_function = JSObjectMakeFunctionWithCallback ( + js_context, js_func, _js_foo_call_as_function_cb); + JSStringRelease (js_func); + _js_object_set_property (js_context, js_object, func, js_function); +} + +static JSObjectRef +_js_object_new (JSContextRef js_context, + gpointer object) +{ + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (KATZE_OBJECT_NAME (object)); + js_class_def.getPropertyNames = _js_class_get_property_names_cb; + js_class_def.hasProperty = _js_class_has_property_cb; + js_class_def.getProperty = _js_class_get_property_cb; + js_class_def.setProperty = _js_class_set_property_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + JSObjectRef js_object = JSObjectMake (js_context, js_class, object); + if (GTK_IS_WIDGET (object)) + { + _js_foo_add_function (js_context, js_object, "show"); + } + if (GTK_IS_CONTAINER (object)) + { + _js_foo_add_function (js_context, js_object, "add"); + } + return js_object; +} + +static JSValueRef +_js_eval (JSContextRef js_context, + const gchar* script, + gchar** exception) +{ + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSValueRef js_exception = NULL; + JSValueRef js_value = JSEvaluateScript (js_context, js_script, + JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); + if (!js_value && exception) + { + JSStringRef js_message = JSValueToStringCopy (js_context, + js_exception, NULL); + *exception = _js_string_utf8 (js_message); + JSStringRelease (js_message); + js_value = JSValueMakeNull (js_context); + } + JSStringRelease (js_script); + return js_value; +} + +static bool +_js_check_syntax (JSContextRef js_context, + const gchar* script, + const gchar* source_id, + int line, + gchar** exception) +{ + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSStringRef js_source_id = JSStringCreateWithUTF8CString (source_id); + JSValueRef js_exception = NULL; + bool result = JSCheckScriptSyntax (js_context, js_script, js_source_id, + line, &js_exception); + if (!result && exception) + { + JSStringRef js_message = JSValueToStringCopy (js_context, + js_exception, NULL); + *exception = _js_string_utf8 (js_message); + JSStringRelease (js_message); + } + JSStringRelease (js_source_id); + JSStringRelease (js_script); + return result; +} + +static gboolean +_js_document_load_script_file (JSContextRef js_context, + const gchar* filename, + gchar** exception) +{ + gboolean result = FALSE; + gchar* script; + GError* error = NULL; + if (g_file_get_contents (filename, &script, NULL, &error)) + { + if (_js_eval (js_context, script, exception)) + result = TRUE; + g_free (script); + } + else + { + *exception = g_strdup (error->message); + g_error_free (error); + } + return result; +} + static void midori_addons_init (MidoriAddons* addons) { @@ -150,237 +564,91 @@ midori_addons_init (MidoriAddons* addons) gtk_box_pack_start (GTK_BOX (addons), priv->treeview, TRUE, TRUE, 0); } -static gchar* -_js_string_utf8 (JSStringRef js_string) +static JSValueRef +_js_info_call_as_function_cb (JSContextRef js_context, + JSObjectRef js_function, + JSObjectRef js_this, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) { - size_t size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); - gchar* string_utf8 = (gchar*)g_malloc (size_utf8); - JSStringGetUTF8CString (js_string, string_utf8, size_utf8); - return string_utf8; + if (n_arguments > 0) { + JSStringRef js_string = JSValueToStringCopy ( + js_context, js_arguments[0], NULL); + gchar* string = _js_string_utf8 (js_string); + // FIXME: Do we want to print this somewhere else? + printf ("console.info: %s\n", string); + g_free (string); + JSStringRelease (js_string); + } + + return JSValueMakeUndefined (js_context); } static void -_js_class_get_property_names_cb (JSContextRef js_context, - JSObjectRef js_object, - JSPropertyNameAccumulatorRef js_properties) +_midori_addons_extensions_main (MidoriAddons* addons, + GtkWidget* web_widget) { - GObject* object = JSObjectGetPrivate (js_object); - if (object) - { - guint n_properties; - GParamSpec** pspecs = g_object_class_list_properties ( - G_OBJECT_GET_CLASS (object), &n_properties); - gint i; - for (i = 0; i < n_properties; i++) - { - GType type = G_PARAM_SPEC_TYPE (pspecs[i]); - const gchar* property = g_param_spec_get_name (pspecs[i]); - JSStringRef js_property = JSStringCreateWithUTF8CString (property); - JSPropertyNameAccumulatorAddName (js_properties, js_property); - JSStringRelease (js_property); - } - } -} + MidoriAddonsPrivate* priv = addons->priv; -static bool -_js_class_has_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property) -{ - GObject* object = JSObjectGetPrivate (js_object); - bool result = false; - if (object) - { - gchar* property = _js_string_utf8 (js_property); - if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), - property)) - result = true; - g_free (property); - } - return result; -} - -static JSValueRef -_js_class_get_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_object); - JSValueRef js_result = NULL; - if (object) - { - gchar* property = _js_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - gchar* value; - g_object_get (object, property, &value, NULL); - JSStringRef js_string = JSStringCreateWithUTF8CString (value); - js_result = JSValueMakeString (js_context, js_string); - } - else - { - gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - g_free (property); - } - return js_result; -} - -static bool -_js_class_set_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef js_value, - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_object); - bool result = false; - if (object) - { - gchar* property = _js_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - if (!(pspec->flags & G_PARAM_WRITABLE)) - { - g_free (property); - return false; - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - JSStringRef js_string = JSValueToStringCopy (js_context, js_value, - js_exception); - if (js_string) - { - gchar* string = _js_string_utf8 (js_string); - g_object_set (object, property, string, NULL); - g_free (string); - } - } - else - { - gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - g_free (property); - } - return result; -} - -static JSObjectRef -_js_object_new (JSContextRef js_context, - GObject* object) -{ + JSClassDefinition js_global_def = kJSClassDefinitionEmpty; + js_global_def.getPropertyNames = _js_class_get_property_names_cb; + js_global_def.hasProperty = _js_class_has_property_cb; + js_global_def.getProperty = _js_class_get_property_cb; + JSClassRef js_global_class = JSClassCreate (&js_global_def); + JSGlobalContextRef js_context = JSGlobalContextCreate (js_global_class); JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (KATZE_OBJECT_NAME (object)); - js_class_def.getPropertyNames = _js_class_get_property_names_cb; - js_class_def.hasProperty = _js_class_has_property_cb; - js_class_def.getProperty = _js_class_get_property_cb; - js_class_def.setProperty = _js_class_set_property_cb; - // js_class_def.staticFunctions = JSStaticFunction*; + js_class_def.className = g_strdup ("console"); JSClassRef js_class = JSClassCreate (&js_class_def); - return JSObjectMake (js_context, js_class, object); -} + JSObjectRef js_console = JSObjectMake (js_context, js_class, NULL); + JSStringRef js_info = JSStringCreateWithUTF8CString ("info"); + JSObjectRef js_info_function = JSObjectMakeFunctionWithCallback ( + js_context, js_info, _js_info_call_as_function_cb); + JSObjectSetProperty (js_context, js_console, js_info, js_info_function, + kJSPropertyAttributeNone, NULL); + JSStringRelease (js_info); + _js_object_set_property (js_context, + JSContextGetGlobalObject (js_context), + "console", js_console); -static void -_js_object_set_property (JSContextRef js_context, - JSObjectRef js_object, - const gchar* name, - JSValueRef js_value) -{ - JSStringRef js_name = JSStringCreateWithUTF8CString (name); - JSObjectSetProperty(js_context, js_object, js_name, js_value, - kJSPropertyAttributeNone, NULL); - JSStringRelease (js_name); -} + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (web_widget)); + if (GTK_WIDGET_TOPLEVEL (browser)) + { + // FIXME: Midori should be backed up by a real GObject + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup ("Midori"); + JSClassRef js_class = JSClassCreate (&js_class_def); + JSObjectRef js_midori = JSObjectMake (js_context, js_class, NULL); + _js_object_set_property (js_context, + JSContextGetGlobalObject (js_context), + "midori", js_midori); + JSObjectRef js_browser = _js_object_new (js_context, browser); + _js_object_set_property (js_context, + js_midori, + "browser", js_browser); + } -static JSValueRef -_js_eval (JSContextRef js_context, - const gchar* script, - gchar** exception) -{ - JSStringRef js_script = JSStringCreateWithUTF8CString (script); - JSValueRef js_exception; - JSValueRef js_value = JSEvaluateScript (js_context, js_script, - JSContextGetGlobalObject (js_context), - NULL, 0, &js_exception); - if (!js_value && exception) + // FIXME: We want to honor system installed addons as well + gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, + _folder_for_kind (priv->kind), NULL); + GDir* addon_dir = g_dir_open (addon_path, 0, NULL); + if (addon_dir) { - JSStringRef js_message = JSValueToStringCopy (js_context, - js_exception, NULL); - *exception = _js_string_utf8 (js_message); - JSStringRelease (js_message); - } - JSStringRelease (js_script); - return js_value; -} - -static gboolean -_js_document_load_script_file (JSContextRef js_context, - const gchar* filename, - gchar** exception) -{ - gboolean result = FALSE; - gchar* script; - GError* error = NULL; - if (g_file_get_contents (filename, &script, NULL, &error)) - { - if (_js_eval (js_context, script, exception)) - result = TRUE; - g_free (script); - } - else - { - *exception = g_strdup (error->message); - g_error_free (error); - } - return result; -} - -static const gchar* _folder_for_kind (MidoriAddonKind kind) -{ - switch (kind) - { - case MIDORI_ADDON_EXTENSIONS: - return "extensions"; - case MIDORI_ADDON_USER_SCRIPTS: - return "scripts"; - case MIDORI_ADDON_USER_STYLES: - return "styles"; - default: - return NULL; + const gchar* filename; + while ((filename = g_dir_read_name (addon_dir))) + { + gchar* fullname = g_build_filename (addon_path, filename, NULL); + gchar* exception = NULL; + _js_document_load_script_file (js_context, fullname, &exception); + if (exception) + // FIXME: Do we want to print this somewhere else? + // FIXME Convert the filename to UTF8 + printf ("%s - Exception: %s\n", filename, exception); + g_free (fullname); + } + g_dir_close (addon_dir); } + JSGlobalContextRelease (js_context); } static void @@ -392,13 +660,6 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, { MidoriAddonsPrivate* priv = addons->priv; - GObject* settings; - g_object_get (web_widget, "settings", &settings, NULL); - JSObjectRef js_settings = _js_object_new (js_context, settings); - _js_object_set_property (js_context, - JSContextGetGlobalObject (js_context), - KATZE_OBJECT_NAME (settings), js_settings); - // FIXME: We want to honor system installed addons as well gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, _folder_for_kind (priv->kind), NULL); @@ -453,7 +714,9 @@ midori_addons_new (GtkWidget* web_widget, MidoriAddonsPrivate* priv = addons->priv; priv->kind = kind; - if (kind == MIDORI_ADDON_USER_SCRIPTS) + if (kind == MIDORI_ADDON_EXTENSIONS) + _midori_addons_extensions_main (addons, web_widget); + else if (kind == MIDORI_ADDON_USER_SCRIPTS) g_signal_connect (web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); diff --git a/src/midori-browser.c b/src/midori-browser.c index e1b52f49..a8889a93 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -81,6 +81,10 @@ enum { PROP_0, + PROP_MENUBAR, + PROP_NAVIGATIONBAR, + PROP_TAB, + PROP_STATUSBAR, PROP_SETTINGS, PROP_STATUSBAR_TEXT, PROP_TRASH @@ -595,6 +599,62 @@ midori_browser_class_init (MidoriBrowserClass* class) GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + /** + * MidoriBrowser::menubar + * + * The menubar. + */ + g_object_class_install_property (gobject_class, + PROP_MENUBAR, + g_param_spec_object ( + "menubar", + _("Menubar"), + _("The menubar"), + GTK_TYPE_MENU_BAR, + G_PARAM_READABLE)); + + /** + * MidoriBrowser::navigationbar + * + * The navigationbar. + */ + g_object_class_install_property (gobject_class, + PROP_NAVIGATIONBAR, + g_param_spec_object ( + "navigationbar", + _("Navigationbar"), + _("The navigationbar"), + GTK_TYPE_TOOLBAR, + G_PARAM_READABLE)); + + /** + * MidoriBrowser::tab + * + * The current tab. + */ + g_object_class_install_property (gobject_class, + PROP_TAB, + g_param_spec_object ( + "tab", + _("Tab"), + _("The current tab"), + GTK_TYPE_WIDGET, + G_PARAM_READWRITE)); + + /** + * MidoriBrowser::statusbar + * + * The statusbar. + */ + g_object_class_install_property (gobject_class, + PROP_STATUSBAR, + g_param_spec_object ( + "statusbar", + _("Statusbar"), + _("The statusbar"), + GTK_TYPE_STATUSBAR, + G_PARAM_READABLE)); + /** * MidoriBrowser::settings * @@ -607,7 +667,7 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - "Settings", + _("Settings"), _("The associated settings"), MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -627,7 +687,7 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_STATUSBAR_TEXT, g_param_spec_string ( "statusbar-text", - "Statusbar Text", + _("Statusbar Text"), _("The text that is displayed in the statusbar"), "", flags)); @@ -646,7 +706,7 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_TRASH, g_param_spec_object ( "trash", - "Trash", + _("Trash"), _("The trash, collecting recently closed tabs and windows"), MIDORI_TYPE_TRASH, G_PARAM_READWRITE)); @@ -697,7 +757,7 @@ static void _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* widget = midori_browser_get_current_page (browser); + GtkWidget* widget = midori_browser_get_current_tab (browser); GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); gtk_widget_destroy (scrolled); } @@ -2651,14 +2711,7 @@ midori_browser_init (MidoriBrowser* browser) priv->panel_pageholder, NULL, GTK_STOCK_CONVERT, _("Pageholder")); - // Addons - /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); - gtk_widget_show (panel); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (priv->panel), - panel, toolbar, - "", _("Extensions"));*/ + // Userscripts panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); @@ -2666,6 +2719,7 @@ midori_browser_init (MidoriBrowser* browser) midori_panel_append_page (MIDORI_PANEL (priv->panel), panel, toolbar, "", _("Userscripts")); + // Userstyles /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); @@ -2750,6 +2804,15 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar, FALSE, FALSE, 3); + // Extensions + panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); + gtk_widget_show (panel); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (priv->panel), + panel, toolbar, + "", _("Extensions")); + g_object_unref (ui_manager); } @@ -2921,6 +2984,9 @@ midori_browser_set_property (GObject* object, switch (prop_id) { + case PROP_TAB: + midori_browser_set_current_tab (browser, g_value_get_object (value)); + break; case PROP_STATUSBAR_TEXT: _midori_browser_set_statusbar_text (browser, g_value_get_string (value)); break; @@ -2962,6 +3028,18 @@ midori_browser_get_property (GObject* object, switch (prop_id) { + case PROP_MENUBAR: + g_value_set_object (value, priv->menubar); + break; + case PROP_NAVIGATIONBAR: + g_value_set_object (value, priv->navigationbar); + break; + case PROP_TAB: + g_value_set_object (value, midori_browser_get_current_tab (browser)); + break; + case PROP_STATUSBAR: + g_value_set_object (value, priv->statusbar); + break; case PROP_STATUSBAR_TEXT: g_value_set_string (value, priv->statusbar_text); break; @@ -3217,7 +3295,6 @@ midori_browser_set_current_page (MidoriBrowser* browser, gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n); GtkWidget* widget = _midori_browser_child_for_scrolled (browser, scrolled); - printf ("_nth_page: %s\n", G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (widget))); if (widget && MIDORI_IS_WEB_VIEW (widget) && !strcmp (midori_web_view_get_display_uri ( MIDORI_WEB_VIEW (widget)), "")) @@ -3234,19 +3311,70 @@ midori_browser_set_current_page (MidoriBrowser* browser, * * If there is no page present at all, %NULL is returned. * - * Return value: the selected page, or %NULL + * Return value: the selected page, or -1 + **/ +gint +midori_browser_get_current_page (MidoriBrowser* browser) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); + + MidoriBrowserPrivate* priv = browser->priv; + + return gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); +} + +/** + * midori_browser_set_current_tab: + * @browser: a #MidoriBrowser + * @widget: a #GtkWidget + * + * Switches to the page containing @widget. + * + * The widget will also grab the focus automatically. + **/ +void +midori_browser_set_current_tab (MidoriBrowser* browser, + GtkWidget* widget) +{ + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); + gint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + if (widget && MIDORI_IS_WEB_VIEW (widget) + && !strcmp (midori_web_view_get_display_uri ( + MIDORI_WEB_VIEW (widget)), "")) + gtk_widget_grab_focus (priv->location); + else + gtk_widget_grab_focus (widget); +} + +/** + * midori_browser_get_current_tab: + * @browser: a #MidoriBrowser + * + * Retrieves the currently selected tab. + * + * If there is no tab present at all, %NULL is returned. + * + * Return value: the selected tab, or %NULL **/ GtkWidget* -midori_browser_get_current_page (MidoriBrowser* browser) +midori_browser_get_current_tab (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); MidoriBrowserPrivate* priv = browser->priv; gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); - GtkWidget* widget = _midori_browser_child_for_scrolled (browser, - gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n)); - return widget; + if (n >= 0) + { + GtkWidget* widget = _midori_browser_child_for_scrolled (browser, + gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n)); + return widget; + } + else + return NULL; } /** @@ -3267,7 +3395,7 @@ midori_browser_get_current_web_view (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - GtkWidget* web_view = midori_browser_get_current_page (browser); + GtkWidget* web_view = midori_browser_get_current_tab (browser); return MIDORI_IS_WEB_VIEW (web_view) ? web_view : NULL; } diff --git a/src/midori-browser.h b/src/midori-browser.h index e7194235..6dda0b43 100644 --- a/src/midori-browser.h +++ b/src/midori-browser.h @@ -95,9 +95,16 @@ void midori_browser_set_current_page (MidoriBrowser* browser, gint n); -GtkWidget* +gint midori_browser_get_current_page (MidoriBrowser* browser); +void +midori_browser_set_current_tab (MidoriBrowser* browser, + GtkWidget* widget); + +GtkWidget* +midori_browser_get_current_tab (MidoriBrowser* browser); + GtkWidget* midori_browser_get_current_web_view (MidoriBrowser* browser); diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 6f6ba7b3..4b1fdf4d 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -463,7 +463,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "close-buttons-on-tabs", _("Close Buttons on Tabs"), _("Whether tabs have close buttons"), - FALSE, + TRUE, flags)); g_object_class_install_property (gobject_class, From e45fe65278cfc6366faaeca2986f275e181d21ac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 3 May 2008 23:32:05 +0200 Subject: [PATCH 0090/2970] Focus the web view when loading bookmarks. --- src/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/midori-browser.c b/src/midori-browser.c index a8889a93..3d38029e 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -1637,6 +1637,7 @@ midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, "KatzeXbelItem"); GtkWidget* web_view = midori_browser_get_current_web_view (browser); g_object_set (web_view, "uri", katze_xbel_bookmark_get_href (item), NULL); + gtk_widget_grab_focus (web_view); } static void From 5b731c45ba4f48b7ddb05ee2111de973b8b2d11d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 May 2008 01:34:39 +0200 Subject: [PATCH 0091/2970] Wrap userscripts in an anonymous function. --- src/midori-addons.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/midori-addons.c b/src/midori-addons.c index c5cbe6e1..552f7972 100644 --- a/src/midori-addons.c +++ b/src/midori-addons.c @@ -521,8 +521,11 @@ _js_document_load_script_file (JSContextRef js_context, GError* error = NULL; if (g_file_get_contents (filename, &script, NULL, &error)) { - if (_js_eval (js_context, script, exception)) + gchar* wrapped_script = g_strdup_printf ( + "var wrapped = function () { %s }; wrapped ();", script); + if (_js_eval (js_context, wrapped_script, exception)) result = TRUE; + g_free (wrapped_script); g_free (script); } else From 626586a5a1f23da83efa3851550a03f8815f5427 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 May 2008 19:13:02 +0200 Subject: [PATCH 0092/2970] Update AUTHORS, README and TODO files. --- AUTHORS | 6 ++++++ README | 6 +++--- TODO | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9727b797..2899f226 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,7 +5,13 @@ Artwork by: Nancy Runge Translations: + de: Enrico Tröger de: Christian Dywan + fr: Christian Dywan + fr: Adrien Nader + pl: Przemysław Sitek + sv: Mikael Magnusson Contributors: Ori Bernstein + Przemek Sitek diff --git a/README b/README index 1dd926ca..6a32c278 100644 --- a/README +++ b/README @@ -3,11 +3,11 @@ Midori is a lightweight web browser. * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. -* Bookmarks are stored with XBEL. -* Searchbox based on OpenSearch. +* Bookmarks with XBEL and keyword support. +* Flexibly configurable Web Searchbox. * Custom context menu actions. * User scripts and user styles support. -* Extensible via Lua scripts. +* Extensible via Javascript. Requirements: GTK+ 2.6, libsexy, WebkitGtk, libXML2 diff --git a/TODO b/TODO index 0b2685a7..dd6fda22 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,7 @@ TODO: . Import and export of the bookmarks file, or using one from a specific path . Save files on change as opposed to on quit . Middle click toolbuttons or menuitems should open new tabs - . Implement support for (multiple) userscripts/ userstyles + . Implement support for userstyles . Actual multiple window support, some things just ignore this currently . Custom context menu actions, like in Thunar or Epiphany . Custom tab names @@ -52,5 +52,4 @@ TODO: . Custom-mode, e.g. hide menubar and use help icon to have a help viewer . Prevent dead tabs: download, aborted page . On url load, for big files, ask "Open or save?" - . Always display the tabbar (extension) . An option to not reuse the current tab when entering an url or searching From 156aa1fd0a091937f58513f651570f8600837c0a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 May 2008 19:14:48 +0200 Subject: [PATCH 0093/2970] Change 'Cookies' to 'Web Cookies' and fix POTFILES.in. --- po/POTFILES.in | 1 - src/midori-preferences.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index d597db36..4a6722c2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,6 @@ # List of source files containing translatable strings. midori.desktop.in -src/helpers.c src/main.c src/midori-console.c src/midori-browser.c diff --git a/src/midori-preferences.c b/src/midori-preferences.c index 1fd72966..16d15c2e 100644 --- a/src/midori-preferences.c +++ b/src/midori-preferences.c @@ -361,7 +361,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, // Page "Privacy" PAGE_NEW (_("Privacy")); - FRAME_NEW (_("Cookies")); + FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); INDENTED_ADD (label, 0, 1, 0, 1); From aa21bc30f9e3dbb1969bcd8b61a1b741bb6b7609 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 May 2008 19:15:28 +0200 Subject: [PATCH 0094/2970] Update translations. --- po/de.po | 553 ++++++++++++++----------- po/fr.po | 687 +++++++++++++++++-------------- po/pl.po | 1177 +++++++++++++++++++++++++++++++----------------------- po/sv.po | 1159 +++++++++++++++++++++++++++++++---------------------- 4 files changed, 2065 insertions(+), 1511 deletions(-) diff --git a/po/de.po b/po/de.po index 990322a4..b9d3bda7 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-19 12:56+0200\n" +"POT-Creation-Date: 2008-05-04 16:06+0200\n" "PO-Revision-Date: 2008-03-20 13:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -29,439 +29,523 @@ msgstr "Midori Netznavigator" msgid "Web Browser" msgstr "Netznavigator" -#: ../src/main.c:49 +#: ../src/main.c:47 msgid "Bookmark" msgstr "Lesezeichen" -#: ../src/main.c:50 +#: ../src/main.c:48 msgid "New Bookmark" msgstr "Neues Lesezeichen" -#: ../src/main.c:51 +#: ../src/main.c:49 msgid "_Form Fill" msgstr "_Formulare ausfüllen" -#: ../src/main.c:52 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:402 +#: ../src/main.c:50 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:407 msgid "Homepage" msgstr "Startseite" -#: ../src/main.c:53 +#: ../src/main.c:51 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../src/main.c:54 +#: ../src/main.c:52 msgid "New _Window" msgstr "Neues _Fenster" -#: ../src/main.c:59 +#: ../src/main.c:54 +msgid "Select _All" +msgstr "A_lles markieren" + +#: ../src/main.c:57 msgid "_Fullscreen" msgstr "_Vollbild" -#: ../src/main.c:60 +#: ../src/main.c:58 msgid "_Leave Fullscreen" msgstr "Vollbild _verlassen" -#: ../src/main.c:146 +#: ../src/main.c:144 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" -#: ../src/main.c:266 ../src/main.c:299 +#: ../src/main.c:193 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Wert '%s' ist ungültig für %s" + +#: ../src/main.c:200 ../src/main.c:256 +#, c-format +msgid "Unhandled settings property '%s'" +msgstr "Unbehandelte Einstellungseigenschaft" + +#: ../src/main.c:270 ../src/main.c:304 msgid "midori" msgstr "midori" -#: ../src/main.c:273 +#: ../src/main.c:277 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../src/main.c:278 +#: ../src/main.c:282 msgid "[URL]" msgstr "[URL]" -#: ../src/main.c:301 +#: ../src/main.c:306 msgid "Debugging" msgstr "Fehlerbehebung" -#: ../src/main.c:302 +#: ../src/main.c:307 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../src/main.c:304 +#: ../src/main.c:309 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../src/main.c:339 +#: ../src/main.c:344 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" -#: ../src/main.c:353 +#: ../src/main.c:358 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Die Sitzung konnte nicht geladen werden. %s\n" -#: ../src/main.c:365 +#: ../src/main.c:370 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" -#: ../src/main.c:375 +#: ../src/main.c:380 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../src/main.c:56 -msgid "Select _All" -msgstr "A_lles markieren" +#: ../src/main.c:489 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../src/midori-browser.c:187 ../src/midori-browser.c:1945 -#: ../src/midori-browser.c:1951 +#: ../src/main.c:498 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Die Lesezeichen konnten nicht geladen werden. %s" + +#: ../src/main.c:507 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Der Papierkorb konnte nicht geladen werden. %s" + +#: ../src/main.c:519 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Die Sitzung konnte nicht geladen werden. %s" + +#: ../src/main.c:528 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Die Konfiguration konnte nicht geladen werden. %s" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 +#: ../src/midori-browser.c:2101 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../src/midori-browser.c:195 ../src/midori-browser.c:1948 +#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../src/midori-browser.c:245 +#: ../src/midori-browser.c:264 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../src/midori-browser.c:512 ../src/midori-webview.c:253 +#: ../src/midori-browser.c:611 +msgid "Menubar" +msgstr "Menüleiste" + +#: ../src/midori-browser.c:612 +msgid "The menubar" +msgstr "Die Menüleiste" + +#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +msgid "Navigationbar" +msgstr "Navigationsleiste" + +#: ../src/midori-browser.c:626 +msgid "The navigationbar" +msgstr "Die Navigationsleiste" + +#: ../src/midori-browser.c:639 +msgid "Tab" +msgstr "Reiter" + +#: ../src/midori-browser.c:640 +msgid "The current tab" +msgstr "Der aktuelle Reiter" + +#: ../src/midori-browser.c:653 +msgid "Statusbar" +msgstr "Statusleiste" + +#: ../src/midori-browser.c:654 +msgid "The statusbar" +msgstr "Die Statusleiste" + +#: ../src/midori-browser.c:670 +msgid "Settings" +msgstr "Einstellungen" + +#: ../src/midori-browser.c:671 msgid "The associated settings" msgstr "Die zugewiesenen Einstellungen" -#: ../src/midori-browser.c:532 ../src/midori-webview.c:244 +#: ../src/midori-browser.c:690 +msgid "Statusbar Text" +msgstr "Statusleistenbeschriftung" + +#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 msgid "The text that is displayed in the statusbar" msgstr "Der Text, der in der Statusleiste angezeigt wird" -#: ../src/midori-browser.c:551 +#: ../src/midori-browser.c:709 +msgid "Trash" +msgstr "Papierkorb" + +#: ../src/midori-browser.c:710 msgid "The trash, collecting recently closed tabs and windows" msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" -#: ../src/midori-browser.c:1068 -msgid "Open location" -msgstr "Adresse öffnen" - -#: ../src/midori-browser.c:1080 ../src/midori-browser.c:1126 -msgid "_Location:" -msgstr "_Ort:" - -#. TODO: We should offer all of the search's features here -#: ../src/midori-browser.c:1114 -msgid "Web search" -msgstr "Netzsuche" - -#: ../src/midori-browser.c:1153 +#: ../src/midori-browser.c:1294 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../src/midori-browser.c:1153 +#: ../src/midori-browser.c:1294 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../src/midori-browser.c:1170 +#: ../src/midori-browser.c:1311 msgid "_Title:" msgstr "_Titel:" -#: ../src/midori-browser.c:1186 ../src/webSearch.c:200 +#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 msgid "_Description:" msgstr "_Beschreibung" -#: ../src/midori-browser.c:1205 ../src/webSearch.c:214 +#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1223 +#: ../src/midori-browser.c:1364 msgid "_Folder:" msgstr "_Ordner:" -#: ../src/midori-browser.c:1227 +#: ../src/midori-browser.c:1368 msgid "Root" msgstr "Wurzel" -#: ../src/midori-browser.c:1449 +#: ../src/midori-browser.c:1591 msgid "Separator" msgstr "Trennlinie" -#: ../src/midori-browser.c:1637 +#: ../src/midori-browser.c:1780 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../src/midori-browser.c:1645 +#: ../src/midori-browser.c:1788 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../src/midori-browser.c:1865 +#: ../src/midori-browser.c:2015 msgid "_File" msgstr "_Datei" -#: ../src/midori-browser.c:1868 +#: ../src/midori-browser.c:2018 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../src/midori-browser.c:1871 +#: ../src/midori-browser.c:2021 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../src/midori-browser.c:1874 +#: ../src/midori-browser.c:2024 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../src/midori-browser.c:1877 +#: ../src/midori-browser.c:2027 msgid "Save to a file" msgstr "In Datei speichern" -#: ../src/midori-browser.c:1879 +#: ../src/midori-browser.c:2029 msgid "_Close Tab" msgstr "Reiter sch_ließen" -#: ../src/midori-browser.c:1880 +#: ../src/midori-browser.c:2030 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../src/midori-browser.c:1882 +#: ../src/midori-browser.c:2032 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../src/midori-browser.c:1883 +#: ../src/midori-browser.c:2033 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../src/midori-browser.c:1885 +#: ../src/midori-browser.c:2035 msgid "Pa_ge Setup" msgstr "Seite _einrichten" -#: ../src/midori-browser.c:1895 +#: ../src/midori-browser.c:2045 msgid "Quit the application" msgstr "Programm beenden" -#: ../src/midori-browser.c:1897 +#: ../src/midori-browser.c:2047 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/midori-browser.c:1900 +#: ../src/midori-browser.c:2050 msgid "Undo the last modification" msgstr "Die letzte Änderung wiederrufen" -#: ../src/midori-browser.c:1903 +#: ../src/midori-browser.c:2053 msgid "Redo the last modification" msgstr "Die letzte Änderung wiederholen" -#: ../src/midori-browser.c:1909 ../src/midori-browser.c:1912 +#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../src/midori-browser.c:1915 +#: ../src/midori-browser.c:2065 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../src/midori-browser.c:1918 +#: ../src/midori-browser.c:2068 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../src/midori-browser.c:1921 +#: ../src/midori-browser.c:2071 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../src/midori-browser.c:1929 +#: ../src/midori-browser.c:2079 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../src/midori-browser.c:1932 +#: ../src/midori-browser.c:2082 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../src/midori-browser.c:1935 +#: ../src/midori-browser.c:2085 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../src/midori-browser.c:1941 +#: ../src/midori-browser.c:2091 msgid "_View" msgstr "_Ansicht" -#: ../src/midori-browser.c:1942 +#: ../src/midori-browser.c:2092 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../src/midori-browser.c:1962 +#: ../src/midori-browser.c:2112 msgid "View Source" msgstr "Quelltext anzeigen" -#: ../src/midori-browser.c:1965 +#: ../src/midori-browser.c:2115 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../src/midori-browser.c:1969 +#: ../src/midori-browser.c:2119 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../src/midori-browser.c:1971 +#: ../src/midori-browser.c:2121 msgid "_Go" msgstr "_Gehe zu" -#: ../src/midori-browser.c:1982 +#: ../src/midori-browser.c:2132 msgid "Location..." msgstr "Ort..." -#: ../src/midori-browser.c:1985 +#: ../src/midori-browser.c:2135 msgid "Web Search..." msgstr "Netzsuche..." -#: ../src/midori-browser.c:1988 +#: ../src/midori-browser.c:2138 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen..." -#: ../src/midori-browser.c:1991 +#: ../src/midori-browser.c:2141 msgid "Closed Tabs and Windows" msgstr "Geschlossene Reiter und Fenster" -#: ../src/midori-browser.c:1992 +#: ../src/midori-browser.c:2142 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../src/midori-browser.c:1994 +#: ../src/midori-browser.c:2144 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../src/midori-browser.c:1997 +#: ../src/midori-browser.c:2147 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../src/midori-browser.c:2000 +#: ../src/midori-browser.c:2150 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../src/midori-browser.c:2005 +#: ../src/midori-browser.c:2155 msgid "_Manage Bookmarks" msgstr "Lesezeichen _verwalten" -#: ../src/midori-browser.c:2011 +#: ../src/midori-browser.c:2161 msgid "Open in New _Tab" msgstr "In einem neuen _Reiter öffnen" -#: ../src/midori-browser.c:2014 +#: ../src/midori-browser.c:2164 msgid "Open in New _Window" msgstr "In einem neuen _Fenster öffnen" -#: ../src/midori-browser.c:2023 +#: ../src/midori-browser.c:2173 msgid "_Tools" msgstr "_Extras" -#: ../src/midori-browser.c:2025 +#: ../src/midori-browser.c:2175 msgid "_Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../src/midori-browser.c:2026 +#: ../src/midori-browser.c:2176 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." -#: ../src/midori-browser.c:2029 +#: ../src/midori-browser.c:2179 msgid "_Window" msgstr "_Fenster" -#: ../src/midori-browser.c:2031 +#: ../src/midori-browser.c:2181 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../src/midori-browser.c:2034 +#: ../src/midori-browser.c:2184 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../src/midori-browser.c:2037 +#: ../src/midori-browser.c:2187 msgid "Tab _Overview" msgstr "Reiterüber_sicht" #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2040 +#: ../src/midori-browser.c:2190 msgid "_Help" msgstr "_Hilfe" -#: ../src/midori-browser.c:2042 +#: ../src/midori-browser.c:2192 msgid "_Contents" msgstr "_Inhalt" -#: ../src/midori-browser.c:2052 +#: ../src/midori-browser.c:2202 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../src/midori-browser.c:2056 +#: ../src/midori-browser.c:2206 msgid "_Work Offline" msgstr "_Ohne Verbindung arbeiten" -#: ../src/midori-browser.c:2061 +#: ../src/midori-browser.c:2211 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../src/midori-browser.c:2065 +#: ../src/midori-browser.c:2215 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../src/midori-browser.c:2069 +#: ../src/midori-browser.c:2219 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../src/midori-browser.c:2073 +#: ../src/midori-browser.c:2223 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../src/midori-browser.c:2077 +#: ../src/midori-browser.c:2227 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../src/midori-browser.c:2524 +#: ../src/midori-browser.c:2681 msgid "Bookmarks" msgstr "Lesezeichen" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2534 ../src/prefs.c:101 +#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 msgid "Transfers" msgstr "Übertragungen" -#: ../src/midori-browser.c:2541 +#: ../src/midori-browser.c:2697 msgid "Console" msgstr "Konsole" -#: ../src/midori-browser.c:2550 ../src/prefs.c:230 +#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 msgid "History" msgstr "Verlauf" -#: ../src/midori-browser.c:2559 +#: ../src/midori-browser.c:2713 msgid "Pageholder" msgstr "Seitenhalter" -#: ../src/midori-browser.c:2577 +#: ../src/midori-browser.c:2722 +msgid "Userscripts" +msgstr "Benutzerskripte" + +#: ../src/midori-browser.c:2748 msgid "_Inline find:" msgstr "_Inkrementelle suche:" -#: ../src/midori-browser.c:2603 +#: ../src/midori-browser.c:2774 msgid "Match Case" msgstr "Groß-/ Kleinschreibung beachten" -#: ../src/midori-browser.c:2620 +#: ../src/midori-browser.c:2791 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../src/midori-panel.c:146 +#: ../src/midori-browser.c:2815 +msgid "Extensions" +msgstr "Erweiterungen" + +#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Unerwartete Einstellung '%s'" + +#: ../src/midori-browser.c:3278 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Unerwartete Aktion '%s'." + +#: ../src/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Erscheinungsbild des Schattens um jede Leiste" -#: ../src/midori-panel.c:156 +#: ../src/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menü für Leistenelemente" -#: ../src/midori-panel.c:165 +#: ../src/midori-panel.c:166 msgid "The index of the current page" msgstr "Der Index der aktiven Seite" -#: ../src/midori-panel.c:211 ../src/midori-panel.c:212 +#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 msgid "Close panel" msgstr "Leiste schließen" -#: ../src/midori-panel.c:374 +#: ../src/midori-panel.c:391 msgid "Untitled" msgstr "Unbenannt" @@ -545,295 +629,295 @@ msgstr "Sitzungskekse" msgid "None" msgstr "Keine" -#: ../src/midori-websettings.c:242 +#: ../src/midori-websettings.c:247 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../src/midori-websettings.c:243 +#: ../src/midori-websettings.c:248 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../src/midori-websettings.c:251 +#: ../src/midori-websettings.c:256 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../src/midori-websettings.c:252 +#: ../src/midori-websettings.c:257 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../src/midori-websettings.c:260 +#: ../src/midori-websettings.c:265 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../src/midori-websettings.c:261 +#: ../src/midori-websettings.c:266 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../src/midori-websettings.c:269 +#: ../src/midori-websettings.c:274 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../src/midori-websettings.c:270 +#: ../src/midori-websettings.c:275 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" -#: ../src/midori-websettings.c:278 +#: ../src/midori-websettings.c:283 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../src/midori-websettings.c:279 +#: ../src/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../src/midori-websettings.c:287 +#: ../src/midori-websettings.c:292 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../src/midori-websettings.c:288 +#: ../src/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../src/midori-websettings.c:296 +#: ../src/midori-websettings.c:301 msgid "Last pageholder URI" msgstr "Letzte URI im Seitenhalter" -#: ../src/midori-websettings.c:297 +#: ../src/midori-websettings.c:302 msgid "The URI last opened in the pageholder" msgstr "Die letzte im Seitenhalter geöffnete URI" -#: ../src/midori-websettings.c:307 +#: ../src/midori-websettings.c:312 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../src/midori-websettings.c:308 +#: ../src/midori-websettings.c:313 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:316 +#: ../src/midori-websettings.c:321 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../src/midori-websettings.c:317 +#: ../src/midori-websettings.c:322 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:325 +#: ../src/midori-websettings.c:330 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../src/midori-websettings.c:326 +#: ../src/midori-websettings.c:331 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:334 +#: ../src/midori-websettings.c:339 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../src/midori-websettings.c:335 +#: ../src/midori-websettings.c:340 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:344 +#: ../src/midori-websettings.c:349 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../src/midori-websettings.c:345 +#: ../src/midori-websettings.c:350 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../src/midori-websettings.c:354 +#: ../src/midori-websettings.c:359 msgid "Small toolbar" msgstr "Kleine Werkzeugleiste" -#: ../src/midori-websettings.c:355 +#: ../src/midori-websettings.c:360 msgid "Use small toolbar icons" msgstr "Kleine Symbole benutzen" -#: ../src/midori-websettings.c:363 +#: ../src/midori-websettings.c:368 msgid "Show New Tab" msgstr "Zeige Neuer Reiter" -#: ../src/midori-websettings.c:364 +#: ../src/midori-websettings.c:369 msgid "Show the New Tab button in the toolbar" msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" -#: ../src/midori-websettings.c:372 +#: ../src/midori-websettings.c:377 msgid "Show Web search" msgstr "Zeige Netzsuche" -#: ../src/midori-websettings.c:373 +#: ../src/midori-websettings.c:378 msgid "Show the Web search entry in the toolbar" msgstr "Netzsuchfeld in der Werkzeugleiste anzeigen" -#: ../src/midori-websettings.c:381 +#: ../src/midori-websettings.c:386 msgid "Show Trash" msgstr "Zeige Papierkorb" -#: ../src/midori-websettings.c:382 +#: ../src/midori-websettings.c:387 msgid "Show the Trash button in the toolbar" msgstr "Papierkorb-Knopf in der Werkzeugleiste anzeigen" -#: ../src/midori-websettings.c:392 +#: ../src/midori-websettings.c:397 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../src/midori-websettings.c:393 +#: ../src/midori-websettings.c:398 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../src/midori-websettings.c:403 +#: ../src/midori-websettings.c:408 msgid "The homepage" msgstr "Die Startseite" -#: ../src/midori-websettings.c:411 +#: ../src/midori-websettings.c:416 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../src/midori-websettings.c:412 +#: ../src/midori-websettings.c:417 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../src/midori-websettings.c:420 +#: ../src/midori-websettings.c:425 msgid "Show Download Notification" msgstr "Übertragungsbenachrichtigung anzeigen" -#: ../src/midori-websettings.c:421 +#: ../src/midori-websettings.c:426 msgid "Show a notification window for finished downloads" msgstr "Zeige ein Hinweisfenster für abgeschlossene Übertragungen" -#: ../src/midori-websettings.c:429 +#: ../src/midori-websettings.c:434 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../src/midori-websettings.c:430 +#: ../src/midori-websettings.c:435 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../src/midori-websettings.c:438 +#: ../src/midori-websettings.c:443 msgid "Preferred Encoding" -msgstr "Bevorzugte Kodierung" +msgstr "Bevorzugter Zeichensatz" -#: ../src/midori-websettings.c:439 +#: ../src/midori-websettings.c:444 msgid "The preferred character encoding" -msgstr "Die bevorzugte Zeichenkodierung" +msgstr "Der bevorzugte Zeichensatz" -#: ../src/midori-websettings.c:450 +#: ../src/midori-websettings.c:455 msgid "Tab Label Size" msgstr "Reitergröße" -#: ../src/midori-websettings.c:451 +#: ../src/midori-websettings.c:456 msgid "The desired tab label size" msgstr "Die gewünschte Größe der Reiterbeschriftung" -#: ../src/midori-websettings.c:459 +#: ../src/midori-websettings.c:464 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../src/midori-websettings.c:460 +#: ../src/midori-websettings.c:465 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../src/midori-websettings.c:468 +#: ../src/midori-websettings.c:473 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../src/midori-websettings.c:469 +#: ../src/midori-websettings.c:474 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../src/midori-websettings.c:478 +#: ../src/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../src/midori-websettings.c:479 +#: ../src/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../src/midori-websettings.c:487 +#: ../src/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../src/midori-websettings.c:488 +#: ../src/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../src/midori-websettings.c:496 +#: ../src/midori-websettings.c:501 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../src/midori-websettings.c:497 +#: ../src/midori-websettings.c:502 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../src/midori-websettings.c:507 +#: ../src/midori-websettings.c:512 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../src/midori-websettings.c:508 +#: ../src/midori-websettings.c:513 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../src/midori-websettings.c:517 +#: ../src/midori-websettings.c:522 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../src/midori-websettings.c:518 +#: ../src/midori-websettings.c:523 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../src/midori-websettings.c:526 +#: ../src/midori-websettings.c:531 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../src/midori-websettings.c:527 +#: ../src/midori-websettings.c:532 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../src/midori-websettings.c:537 +#: ../src/midori-websettings.c:542 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../src/midori-websettings.c:538 +#: ../src/midori-websettings.c:543 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../src/midori-websettings.c:546 +#: ../src/midori-websettings.c:551 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../src/midori-websettings.c:547 +#: ../src/midori-websettings.c:552 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../src/midori-websettings.c:555 +#: ../src/midori-websettings.c:560 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../src/midori-websettings.c:556 +#: ../src/midori-websettings.c:561 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../src/midori-websettings.c:564 +#: ../src/midori-websettings.c:569 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../src/midori-websettings.c:565 +#: ../src/midori-websettings.c:570 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../src/midori-websettings.c:575 +#: ../src/midori-websettings.c:580 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../src/midori-websettings.c:576 +#: ../src/midori-websettings.c:581 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../src/midori-websettings.c:584 +#: ../src/midori-websettings.c:589 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../src/midori-websettings.c:585 +#: ../src/midori-websettings.c:590 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" @@ -849,115 +933,115 @@ msgstr "Die URI der aktuellen Seite" msgid "The title of the currently loaded page" msgstr "Der Titel der aktuellen Seite" -#: ../src/midori-webview.c:476 +#: ../src/midori-webview.c:471 msgid "Open Link in New _Tab" msgstr "Verweis in einem neuen _Reiter öffnen" -#: ../src/midori-webview.c:499 +#: ../src/midori-webview.c:494 msgid "Open URL in New _Tab" msgstr "_URL in einem neuen Reiter öffnen" -#: ../src/prefs.c:32 +#: ../src/midori-preferences.c:64 +msgid "Settings instance to provide properties" +msgstr "" + +#: ../src/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "%s Einstellungen" #. Page "General" -#: ../src/prefs.c:89 +#: ../src/midori-preferences.c:239 msgid "General" msgstr "Allgemein" -#: ../src/prefs.c:90 +#: ../src/midori-preferences.c:240 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../src/prefs.c:111 +#: ../src/midori-preferences.c:261 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../src/prefs.c:112 +#: ../src/midori-preferences.c:262 msgid "Font settings" msgstr "Schrifteinstellungen" #. Page "Behavior" -#: ../src/prefs.c:133 +#: ../src/midori-preferences.c:283 msgid "Behavior" msgstr "Verhalten" -#: ../src/prefs.c:134 +#: ../src/midori-preferences.c:284 msgid "Features" msgstr "Inhalte" #. Page "Interface" -#: ../src/prefs.c:166 +#: ../src/midori-preferences.c:316 msgid "Interface" msgstr "Oberfläche" -#: ../src/prefs.c:167 -msgid "Navigationbar" -msgstr "Navigationsleiste" - -#: ../src/prefs.c:180 +#: ../src/midori-preferences.c:330 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../src/prefs.c:196 ../src/prefs.c:197 +#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 msgid "Network" msgstr "Netzwerk" -#: ../src/prefs.c:208 +#: ../src/midori-preferences.c:358 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../src/prefs.c:213 +#: ../src/midori-preferences.c:363 msgid "Privacy" msgstr "Privatsphäre" -#: ../src/prefs.c:214 -msgid "Cookies" -msgstr "Kekse" +#: ../src/midori-preferences.c:364 +msgid "Web Cookies" +msgstr "Verbindungskekse" -#: ../src/prefs.c:227 ../src/prefs.c:237 +#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 msgid "days" msgstr "Tage" -#: ../src/sokoke.c:219 +#: ../src/sokoke.c:295 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../src/sokoke.c:341 ../katze/katze-xbel.c:952 +#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../src/webSearch.c:82 +#: ../src/webSearch.c:115 msgid "Empty" msgstr "Leer" -#: ../src/webSearch.c:154 +#: ../src/webSearch.c:187 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../src/webSearch.c:154 +#: ../src/webSearch.c:187 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../src/webSearch.c:184 +#: ../src/webSearch.c:217 msgid "_Name:" msgstr "_Name:" -#: ../src/webSearch.c:228 +#: ../src/webSearch.c:261 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../src/webSearch.c:242 +#: ../src/webSearch.c:275 msgid "_Keyword:" msgstr "_Schlüsselwort:" -#: ../src/webSearch.c:311 +#: ../src/webSearch.c:344 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" @@ -991,16 +1075,16 @@ msgstr "" "Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " "soll" -#: ../katze/katze-utils.c:114 ../katze/katze-utils.c:239 +#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft '%s' ist ungültig für %s" -#: ../katze/katze-utils.c:136 ../katze/katze-utils.c:160 +#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:148 +#: ../katze/katze-utils.c:161 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -1013,3 +1097,12 @@ msgstr "Fehlerhaftes Dokument" #: ../katze/katze-xbel.c:759 msgid "File not found." msgstr "Datei nicht gefunden." + +#~ msgid "Open location" +#~ msgstr "Adresse öffnen" + +#~ msgid "_Location:" +#~ msgstr "_Ort:" + +#~ msgid "Web search" +#~ msgstr "Netzsuche" diff --git a/po/fr.po b/po/fr.po index 94794060..63da63c8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-20 03:00+0200\n" +"POT-Creation-Date: 2008-05-04 16:06+0200\n" "PO-Revision-Date: 2008-03-31 17:37+0100\n" "Last-Translator: Adrien Nader \n" "Language-Team: French \n" @@ -29,443 +29,535 @@ msgstr "Navigateur Midori" msgid "Web Browser" msgstr "Navigateur" -#: ../src/main.c:49 +#: ../src/main.c:47 msgid "Bookmark" msgstr "Signet" -#: ../src/main.c:50 +#: ../src/main.c:48 msgid "New Bookmark" msgstr "Nouveau Signet" -#: ../src/main.c:51 +#: ../src/main.c:49 msgid "_Form Fill" -msgstr "Remplissage de _forumlaire" +msgstr "Remplissage de _formulaire" -#: ../src/main.c:52 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:402 +#: ../src/main.c:50 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:407 msgid "Homepage" msgstr "Page d'accueil" -#: ../src/main.c:53 +#: ../src/main.c:51 msgid "New _Tab" msgstr "Nouvel _Onglet" -#: ../src/main.c:54 +#: ../src/main.c:52 msgid "New _Window" msgstr "Nouvelle _Fenêtre" -#: ../src/main.c:59 +#: ../src/main.c:54 +msgid "Select _All" +msgstr "_Tout sélectionner" + +#: ../src/main.c:57 msgid "_Fullscreen" msgstr "_Plein écran" -#: ../src/main.c:60 +#: ../src/main.c:58 msgid "_Leave Fullscreen" msgstr "_Quitter le plein écran" -#: ../src/main.c:146 +#: ../src/main.c:144 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "La configuration n'a pu être chargée. %s\n" -#: ../src/main.c:266 ../src/main.c:299 +#: ../src/main.c:193 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "La valeur '%s' n'est pas valide pour %s" + +#: ../src/main.c:200 ../src/main.c:256 +#, c-format +msgid "Unhandled settings property '%s'" +msgstr "Réglage non pris en charge '%s'" + +#: ../src/main.c:270 ../src/main.c:304 msgid "midori" msgstr "midori" -#: ../src/main.c:273 +#: ../src/main.c:277 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../src/main.c:278 +#: ../src/main.c:282 msgid "[URL]" msgstr "[URL]" -#: ../src/main.c:301 +#: ../src/main.c:306 msgid "Debugging" msgstr "Débogage" -#: ../src/main.c:302 +#: ../src/main.c:307 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et problèmes :" -#: ../src/main.c:304 +#: ../src/main.c:309 msgid "Check for new versions at:" -msgstr "Vérifier l'existence de nouvelles versions sur:" +msgstr "Vérifier l'existence de nouvelles versions sur :" -#: ../src/main.c:339 +#: ../src/main.c:344 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Les signets n'ont pu être chargés. %s\n" -#: ../src/main.c:353 +#: ../src/main.c:358 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "La session n'a pu être chargée. %s\n" # pas très content -#: ../src/main.c:365 +#: ../src/main.c:370 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "La corbeille n'a pu être chargée. %s\n" -#: ../src/main.c:375 +#: ../src/main.c:380 msgid "The following errors occured:" -msgstr "Les erreurs suivantes ont eu lieu:" +msgstr "Les erreurs suivantes ont eu lieu :" -#: ../src/main.c:56 -msgid "Select _All" -msgstr "_Tout sélectionner" +#: ../src/main.c:489 +#, fuzzy, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "La session n'a pu être chargée. %s\n" -#: ../src/midori-browser.c:187 ../src/midori-browser.c:1945 -#: ../src/midori-browser.c:1951 +#: ../src/main.c:498 +#, fuzzy, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Les signets n'ont pu être chargés. %s\n" + +# pas très content +#: ../src/main.c:507 +#, fuzzy, c-format +msgid "The trash couldn't be saved. %s" +msgstr "La corbeille n'a pu être chargée. %s\n" + +#: ../src/main.c:519 +#, fuzzy, c-format +msgid "The session couldn't be saved. %s" +msgstr "La session n'a pu être chargée. %s\n" + +#: ../src/main.c:528 +#, fuzzy, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "La configuration n'a pu être chargée. %s\n" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 +#: ../src/midori-browser.c:2101 msgid "Reload the current page" msgstr "Recharger la page" -#: ../src/midori-browser.c:195 ../src/midori-browser.c:1948 +#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../src/midori-browser.c:245 +#: ../src/midori-browser.c:264 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../src/midori-browser.c:512 ../src/midori-webview.c:253 +#: ../src/midori-browser.c:611 +msgid "Menubar" +msgstr "Barre de menu" + +#: ../src/midori-browser.c:612 +#, fuzzy +msgid "The menubar" +msgstr "La page d'accueil" + +#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +msgid "Navigationbar" +msgstr "Barre de navigation" + +#: ../src/midori-browser.c:626 +#, fuzzy +msgid "The navigationbar" +msgstr "Afficher la barre de navigation" + +#: ../src/midori-browser.c:639 +msgid "Tab" +msgstr "Onglet" + +#: ../src/midori-browser.c:640 +#, fuzzy +msgid "The current tab" +msgstr "Fermer l'onglet actuel" + +#: ../src/midori-browser.c:653 +#, fuzzy +msgid "Statusbar" +msgstr "Barre d'é_tat" + +#: ../src/midori-browser.c:654 +#, fuzzy +msgid "The statusbar" +msgstr "Afficher la barre d'état" + +#: ../src/midori-browser.c:670 +#, fuzzy +msgid "Settings" +msgstr "Réglages des polices" + +#: ../src/midori-browser.c:671 msgid "The associated settings" msgstr "Les réglages associés" -#: ../src/midori-browser.c:532 ../src/midori-webview.c:244 +#: ../src/midori-browser.c:690 +#, fuzzy +msgid "Statusbar Text" +msgstr "Barre d'é_tat" + +#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 msgid "The text that is displayed in the statusbar" msgstr "Le texte affiché dans la barre d'êtat" -#: ../src/midori-browser.c:551 +#: ../src/midori-browser.c:709 +#, fuzzy +msgid "Trash" +msgstr "Afficher la corbeille" + +#: ../src/midori-browser.c:710 msgid "The trash, collecting recently closed tabs and windows" msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" -# Vérifier que ce n'est pas 'ouvrir *un* emplacement' -#: ../src/midori-browser.c:1068 -msgid "Open location" -msgstr "Ouvrir l'emplacement" - -#: ../src/midori-browser.c:1080 ../src/midori-browser.c:1126 -msgid "_Location:" -msgstr "_Emplacement" - -#. TODO: We should offer all of the search's features here -#: ../src/midori-browser.c:1114 -msgid "Web search" -msgstr "Recherche toile" - -#: ../src/midori-browser.c:1153 +#: ../src/midori-browser.c:1294 msgid "New bookmark" msgstr "Nouveau signet" -#: ../src/midori-browser.c:1153 +#: ../src/midori-browser.c:1294 msgid "Edit bookmark" -msgstr "Éditer le Signet" +msgstr "Éditer le signet" -#: ../src/midori-browser.c:1170 +#: ../src/midori-browser.c:1311 msgid "_Title:" -msgstr "_Titre:" +msgstr "_Titre :" -#: ../src/midori-browser.c:1186 ../src/webSearch.c:200 +#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 msgid "_Description:" msgstr "_Description" -#: ../src/midori-browser.c:1205 ../src/webSearch.c:214 +#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 msgid "_URL:" msgstr "_URL:" # manque un raccourcis Alt+X -#: ../src/midori-browser.c:1223 +#: ../src/midori-browser.c:1364 msgid "_Folder:" -msgstr "Dossier" +msgstr "Dossier :" -#: ../src/midori-browser.c:1227 +#: ../src/midori-browser.c:1368 msgid "Root" msgstr "Racine" -#: ../src/midori-browser.c:1449 +#: ../src/midori-browser.c:1591 msgid "Separator" msgstr "Séparateur" -#: ../src/midori-browser.c:1637 +#: ../src/midori-browser.c:1780 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../src/midori-browser.c:1645 +#: ../src/midori-browser.c:1788 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader " -#: ../src/midori-browser.c:1865 +#: ../src/midori-browser.c:2015 msgid "_File" msgstr "_Fichier" -#: ../src/midori-browser.c:1868 +#: ../src/midori-browser.c:2018 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../src/midori-browser.c:1871 +#: ../src/midori-browser.c:2021 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../src/midori-browser.c:1874 +#: ../src/midori-browser.c:2024 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../src/midori-browser.c:1877 +#: ../src/midori-browser.c:2027 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../src/midori-browser.c:1879 +#: ../src/midori-browser.c:2029 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../src/midori-browser.c:1880 +#: ../src/midori-browser.c:2030 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../src/midori-browser.c:1882 +#: ../src/midori-browser.c:2032 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../src/midori-browser.c:1883 +#: ../src/midori-browser.c:2033 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../src/midori-browser.c:1885 +#: ../src/midori-browser.c:2035 msgid "Pa_ge Setup" msgstr "Gestion de page" -#: ../src/midori-browser.c:1895 +#: ../src/midori-browser.c:2045 msgid "Quit the application" msgstr "Quitter le programme" -#: ../src/midori-browser.c:1897 +#: ../src/midori-browser.c:2047 msgid "_Edit" msgstr "Édit_er" -#: ../src/midori-browser.c:1900 +#: ../src/midori-browser.c:2050 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../src/midori-browser.c:1903 +#: ../src/midori-browser.c:2053 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../src/midori-browser.c:1909 ../src/midori-browser.c:1912 +#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../src/midori-browser.c:1915 +#: ../src/midori-browser.c:2065 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../src/midori-browser.c:1918 +#: ../src/midori-browser.c:2068 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../src/midori-browser.c:1921 +#: ../src/midori-browser.c:2071 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../src/midori-browser.c:1929 +#: ../src/midori-browser.c:2079 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../src/midori-browser.c:1932 +#: ../src/midori-browser.c:2082 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../src/midori-browser.c:1935 +#: ../src/midori-browser.c:2085 msgid "_Quick Find" msgstr "Recherche rapide" -#: ../src/midori-browser.c:1941 +#: ../src/midori-browser.c:2091 msgid "_View" msgstr "_Vue" -#: ../src/midori-browser.c:1942 +#: ../src/midori-browser.c:2092 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../src/midori-browser.c:1962 +#: ../src/midori-browser.c:2112 msgid "View Source" msgstr "Afficher la source" -#: ../src/midori-browser.c:1965 +#: ../src/midori-browser.c:2115 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../src/midori-browser.c:1969 +#: ../src/midori-browser.c:2119 msgid "Toggle fullscreen view" -msgstr "Activer/ Désactiver le plein écran" +msgstr "Activer/Désactiver le plein écran" -#: ../src/midori-browser.c:1971 +#: ../src/midori-browser.c:2121 msgid "_Go" msgstr "A_ller" -#: ../src/midori-browser.c:1982 +#: ../src/midori-browser.c:2132 msgid "Location..." msgstr "Emplacement..." -#: ../src/midori-browser.c:1985 +#: ../src/midori-browser.c:2135 msgid "Web Search..." -msgstr "Recherche Toile..." +msgstr "Recherche toile..." -#: ../src/midori-browser.c:1988 +#: ../src/midori-browser.c:2138 msgid "Open in Page_holder..." msgstr "Ouvrir dans le _cadre de pages..." -#: ../src/midori-browser.c:1991 +#: ../src/midori-browser.c:2141 msgid "Closed Tabs and Windows" msgstr "Onglets et fenêtres fermés" -#: ../src/midori-browser.c:1992 +#: ../src/midori-browser.c:2142 msgid "Reopen a previously closed tab or window" -msgstr "Réouvre un onglet ou une fenêtre fermé auparavant" +msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../src/midori-browser.c:1994 +#: ../src/midori-browser.c:2144 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../src/midori-browser.c:1997 +#: ../src/midori-browser.c:2147 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../src/midori-browser.c:2000 +#: ../src/midori-browser.c:2150 msgid "_Bookmarks" msgstr "_Signets" -#: ../src/midori-browser.c:2005 +#: ../src/midori-browser.c:2155 msgid "_Manage Bookmarks" -msgstr "_Gérer les Signets" +msgstr "_Gérer les signets" -#: ../src/midori-browser.c:2011 +#: ../src/midori-browser.c:2161 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../src/midori-browser.c:2014 +#: ../src/midori-browser.c:2164 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../src/midori-browser.c:2023 +#: ../src/midori-browser.c:2173 msgid "_Tools" msgstr "_Outils" -#: ../src/midori-browser.c:2025 +#: ../src/midori-browser.c:2175 msgid "_Manage Search Engines" -msgstr "_Gérer moteurs de recherche" +msgstr "_Gérer les moteurs de recherche" -#: ../src/midori-browser.c:2026 +#: ../src/midori-browser.c:2176 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../src/midori-browser.c:2029 +#: ../src/midori-browser.c:2179 msgid "_Window" msgstr "_Fenêtre" -#: ../src/midori-browser.c:2031 +#: ../src/midori-browser.c:2181 msgid "_Previous Tab" -msgstr "Onglet _précedant" +msgstr "Onglet _précedent" -#: ../src/midori-browser.c:2034 +#: ../src/midori-browser.c:2184 msgid "_Next Tab" msgstr "Onglet _suivant" # fonctionnalité à tester -#: ../src/midori-browser.c:2037 +#: ../src/midori-browser.c:2187 msgid "Tab _Overview" msgstr "_Aperçu des onglets" #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2040 +#: ../src/midori-browser.c:2190 msgid "_Help" msgstr "_Aide" -#: ../src/midori-browser.c:2042 +#: ../src/midori-browser.c:2192 msgid "_Contents" msgstr "_Contenu" -#: ../src/midori-browser.c:2052 +#: ../src/midori-browser.c:2202 msgid "P_rivate Browsing" msgstr "Navigation en _privé" -#: ../src/midori-browser.c:2056 +#: ../src/midori-browser.c:2206 msgid "_Work Offline" msgstr "Travailler hors ligne" -#: ../src/midori-browser.c:2061 +#: ../src/midori-browser.c:2211 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../src/midori-browser.c:2065 +#: ../src/midori-browser.c:2215 msgid "Side_panel" -msgstr "_Panneau latérale" +msgstr "_Panneau latéral" -#: ../src/midori-browser.c:2069 +#: ../src/midori-browser.c:2219 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../src/midori-browser.c:2073 +#: ../src/midori-browser.c:2223 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../src/midori-browser.c:2077 +#: ../src/midori-browser.c:2227 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../src/midori-browser.c:2524 +#: ../src/midori-browser.c:2681 msgid "Bookmarks" msgstr "Signets" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2534 ../src/midori-preferences.c:242 +#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 msgid "Transfers" msgstr "Transferts" -#: ../src/midori-browser.c:2541 +#: ../src/midori-browser.c:2697 msgid "Console" msgstr "Console" -#: ../src/midori-browser.c:2550 ../src/midori-preferences.c:371 +#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 msgid "History" msgstr "Historique" -#: ../src/midori-browser.c:2559 +#: ../src/midori-browser.c:2713 msgid "Pageholder" msgstr "Cadre de pages" -#: ../src/midori-browser.c:2577 +#: ../src/midori-browser.c:2722 +msgid "Userscripts" +msgstr "Scripts utilisateur" + +#: ../src/midori-browser.c:2748 msgid "_Inline find:" msgstr "Recherche rapide:" -#: ../src/midori-browser.c:2603 +#: ../src/midori-browser.c:2774 msgid "Match Case" msgstr "Sensible à la casse" -#: ../src/midori-browser.c:2620 +#: ../src/midori-browser.c:2791 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../src/midori-panel.c:146 +#: ../src/midori-browser.c:2815 +msgid "Extensions" +msgstr "Extensions" + +#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Réglages des polices" + +#: ../src/midori-browser.c:3278 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Action inattendue '%s'" + +#: ../src/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Aspect des ombres autour de chaque panneau" -#: ../src/midori-panel.c:156 +#: ../src/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menu pour contenir les éléments des panneaux" -#: ../src/midori-panel.c:165 +#: ../src/midori-panel.c:166 msgid "The index of the current page" msgstr "Le numéro de la page actuelle" -#: ../src/midori-panel.c:211 ../src/midori-panel.c:212 +#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 msgid "Close panel" msgstr "Fermer le panneau" -#: ../src/midori-panel.c:374 +#: ../src/midori-panel.c:391 msgid "Untitled" msgstr "Sans titre" @@ -503,7 +595,7 @@ msgstr "Occidental (ISO-8859-1)" #: ../src/midori-websettings.c:152 msgid "Custom..." -msgstr "" +msgstr "Personnalisé..." #: ../src/midori-websettings.c:167 msgid "New tab" @@ -517,6 +609,7 @@ msgstr "Nouvelle fenêtre" msgid "Current tab" msgstr "Onglet actuel" +# # Défaut n'est pas vraiment français, "par défaut" l'est #: ../src/midori-websettings.c:184 msgid "Default" msgstr "Défaut" @@ -549,297 +642,297 @@ msgstr "Témoins de session" msgid "None" msgstr "Aucun" -#: ../src/midori-websettings.c:242 +#: ../src/midori-websettings.c:247 msgid "Remember last window size" -msgstr "Se rappeler de la taille du fenêtre" +msgstr "Se rappeler de la taille de la fenêtre" -#: ../src/midori-websettings.c:243 +#: ../src/midori-websettings.c:248 msgid "Whether to save the last window size" -msgstr "" +msgstr "Enregistrer ou non la dernière taille de la fenêtre" -#: ../src/midori-websettings.c:251 +#: ../src/midori-websettings.c:256 msgid "Last window width" -msgstr "Dernier largeur de fenêtre" +msgstr "Dernière largeur de la fenêtre" -#: ../src/midori-websettings.c:252 +#: ../src/midori-websettings.c:257 msgid "The last saved window width" -msgstr "" +msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../src/midori-websettings.c:260 +#: ../src/midori-websettings.c:265 msgid "Last window height" -msgstr "Dernier hauteur de fenêtre" +msgstr "Dernière hauteur de la fenêtre" -#: ../src/midori-websettings.c:261 +#: ../src/midori-websettings.c:266 msgid "The last saved window height" -msgstr "" +msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../src/midori-websettings.c:269 +#: ../src/midori-websettings.c:274 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../src/midori-websettings.c:270 +#: ../src/midori-websettings.c:275 msgid "The last saved panel position" -msgstr "La dernière position du panneau guardé" +msgstr "La dernière position enregistrée du panneau" -#: ../src/midori-websettings.c:278 +#: ../src/midori-websettings.c:283 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../src/midori-websettings.c:279 +#: ../src/midori-websettings.c:284 msgid "The last saved panel page" -msgstr "La dernière page du panneau guardé" +msgstr "La dernière page enregistrée du panneau" -#: ../src/midori-websettings.c:287 +#: ../src/midori-websettings.c:292 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../src/midori-websettings.c:288 +#: ../src/midori-websettings.c:293 msgid "The last saved Web search" -msgstr "La dernière recherche toile guardé" +msgstr "La dernière recherche toile enregistrée" -#: ../src/midori-websettings.c:296 +#: ../src/midori-websettings.c:301 msgid "Last pageholder URI" -msgstr "Dernier URI dans le cadre de pages" +msgstr "Dernière URI du cadre de pages" -#: ../src/midori-websettings.c:297 +#: ../src/midori-websettings.c:302 msgid "The URI last opened in the pageholder" -msgstr "L'URI ouvrit récemment dans le cadre de pages" +msgstr "L'URI ouverte le plus récemment dans le cadre de pages" -#: ../src/midori-websettings.c:307 +#: ../src/midori-websettings.c:312 msgid "Show Navigationbar" -msgstr "Afficher Barre de navigation" +msgstr "Afficher la barre de navigation" -#: ../src/midori-websettings.c:308 +#: ../src/midori-websettings.c:313 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "Afficher ou non la barre de navigation" -#: ../src/midori-websettings.c:316 +#: ../src/midori-websettings.c:321 msgid "Show Bookmarkbar" -msgstr "Afficher Barre des _signets" +msgstr "Afficher la barre des _signets" -#: ../src/midori-websettings.c:317 +#: ../src/midori-websettings.c:322 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "Afficher ou non la barre des signets" -#: ../src/midori-websettings.c:325 +#: ../src/midori-websettings.c:330 msgid "Show Panel" -msgstr "Afficher Panneau" +msgstr "Afficher le panneau" -#: ../src/midori-websettings.c:326 +#: ../src/midori-websettings.c:331 msgid "Whether to show the panel" -msgstr "" +msgstr "Afficher ou non le panneau" -#: ../src/midori-websettings.c:334 +#: ../src/midori-websettings.c:339 msgid "Show Statusbar" -msgstr "Afficher Barre d'état" +msgstr "Afficher la barre d'état" -#: ../src/midori-websettings.c:335 +#: ../src/midori-websettings.c:340 msgid "Whether to show the statusbar" -msgstr "" +msgstr "Afficher ou non la barre d'état" -#: ../src/midori-websettings.c:344 +#: ../src/midori-websettings.c:349 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../src/midori-websettings.c:345 +#: ../src/midori-websettings.c:350 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../src/midori-websettings.c:354 +#: ../src/midori-websettings.c:359 msgid "Small toolbar" msgstr "Petit barre d'outils" -#: ../src/midori-websettings.c:355 +#: ../src/midori-websettings.c:360 msgid "Use small toolbar icons" msgstr "Afficher de petites icônes de la barre d'outils" -#: ../src/midori-websettings.c:363 +#: ../src/midori-websettings.c:368 msgid "Show New Tab" -msgstr "Nouvel Onglet" +msgstr "Nouvel onglet" -#: ../src/midori-websettings.c:364 +#: ../src/midori-websettings.c:369 msgid "Show the New Tab button in the toolbar" -msgstr "Afficher le bouton Nouveau onglet dans la barre d'outils" +msgstr "Afficher le bouton de nouvel onglet dans la barre d'outils" -#: ../src/midori-websettings.c:372 +#: ../src/midori-websettings.c:377 msgid "Show Web search" -msgstr "Afficher Recherche toile" +msgstr "Afficher la recherche toile" -#: ../src/midori-websettings.c:373 +#: ../src/midori-websettings.c:378 msgid "Show the Web search entry in the toolbar" -msgstr "" +msgstr "Afficher le champ de recherche toile dans la barre d'outils" -#: ../src/midori-websettings.c:381 +#: ../src/midori-websettings.c:386 msgid "Show Trash" -msgstr "Afficher Corbeille" +msgstr "Afficher la corbeille" -#: ../src/midori-websettings.c:382 +#: ../src/midori-websettings.c:387 msgid "Show the Trash button in the toolbar" -msgstr "Afficher la bouton Corbeille dans la barre d'outils" +msgstr "Afficher le bouton de la corbeille dans la barre d'outils" -#: ../src/midori-websettings.c:392 +#: ../src/midori-websettings.c:397 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../src/midori-websettings.c:393 +#: ../src/midori-websettings.c:398 msgid "What to load on startup" -msgstr "Quoi de charger au démarrage" +msgstr "Que charger au démarrage" -#: ../src/midori-websettings.c:403 +#: ../src/midori-websettings.c:408 msgid "The homepage" msgstr "La page d'accueil" -#: ../src/midori-websettings.c:411 +#: ../src/midori-websettings.c:416 msgid "Download Folder" msgstr "Répertoire de téléchargement" -#: ../src/midori-websettings.c:412 +#: ../src/midori-websettings.c:417 msgid "The folder downloaded files are saved to" -msgstr "Le répertoire pour guarder des téléchargement" +msgstr "Le répertoire pour guarder les téléchargements" -#: ../src/midori-websettings.c:420 +#: ../src/midori-websettings.c:425 msgid "Show Download Notification" -msgstr "Afficher notification de téléchargement" +msgstr "Afficher la notification de téléchargement" -#: ../src/midori-websettings.c:421 +#: ../src/midori-websettings.c:426 msgid "Show a notification window for finished downloads" msgstr "Afficher une fenêtre de notification à la fin des téléchargements" -#: ../src/midori-websettings.c:429 +#: ../src/midori-websettings.c:434 msgid "Location entry Search" -msgstr "" +msgstr "Recherche de barre d'adresse" -#: ../src/midori-websettings.c:430 +#: ../src/midori-websettings.c:435 msgid "The search to perform inside the location entry" -msgstr "" +msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../src/midori-websettings.c:438 +#: ../src/midori-websettings.c:443 msgid "Preferred Encoding" msgstr "Encodage préferé" -#: ../src/midori-websettings.c:439 +#: ../src/midori-websettings.c:444 msgid "The preferred character encoding" -msgstr "Encodage des charactères préferé" +msgstr "Encodage préféré des charactères" -#: ../src/midori-websettings.c:450 +#: ../src/midori-websettings.c:455 msgid "Tab Label Size" msgstr "Taille des onglets" -#: ../src/midori-websettings.c:451 +#: ../src/midori-websettings.c:456 msgid "The desired tab label size" -msgstr "La taille désirée du libellé d'onglet" +msgstr "La taille désirée du libellé des onglets" -#: ../src/midori-websettings.c:459 +#: ../src/midori-websettings.c:464 msgid "Close Buttons on Tabs" msgstr "Bouton fermer sur les onglets" -#: ../src/midori-websettings.c:460 +#: ../src/midori-websettings.c:465 msgid "Whether tabs have close buttons" msgstr "Les onglets ont-ils des boutons de fermeture" -#: ../src/midori-websettings.c:468 +#: ../src/midori-websettings.c:473 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../src/midori-websettings.c:469 +#: ../src/midori-websettings.c:474 msgid "Where to open new pages" -msgstr "Óu d'ouvrir les nouvelles pages" +msgstr "Où ouvrir les nouvelles pages" -#: ../src/midori-websettings.c:478 +#: ../src/midori-websettings.c:483 msgid "Middle click opens Selection" -msgstr "Molette clic charge sélection" +msgstr "Clic molette charge la sélection" -#: ../src/midori-websettings.c:479 +#: ../src/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" -msgstr "Charger une URL sélectionnée avec le bouton central de la souris" +msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../src/midori-websettings.c:487 +#: ../src/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../src/midori-websettings.c:488 +#: ../src/midori-websettings.c:493 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "Ouvrir ou non les nouveaux onglets en arrière-plan" -#: ../src/midori-websettings.c:496 +#: ../src/midori-websettings.c:501 msgid "Open popups in tabs" -msgstr "" +msgstr "Ouvrir les fenêtres intempestives" -#: ../src/midori-websettings.c:497 +#: ../src/midori-websettings.c:502 msgid "Whether to open popup windows in tabs" -msgstr "" +msgstr "Ouvrir ou non les popups dans des onglets" -#: ../src/midori-websettings.c:507 +#: ../src/midori-websettings.c:512 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../src/midori-websettings.c:508 +#: ../src/midori-websettings.c:513 msgid "What type of cookies to accept" -msgstr "" +msgstr "Quel type de témoins accepter" -#: ../src/midori-websettings.c:517 +#: ../src/midori-websettings.c:522 msgid "Original cookies only" -msgstr "Seulement des témoins originales" +msgstr "Uniquement les témoins d'origine" -#: ../src/midori-websettings.c:518 +#: ../src/midori-websettings.c:523 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../src/midori-websettings.c:526 +#: ../src/midori-websettings.c:531 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../src/midori-websettings.c:527 +#: ../src/midori-websettings.c:532 msgid "The maximum number of days to save cookies for" -msgstr "Le nombre maximal de jours de guarder des témoins" +msgstr "Le nombre maximal de jours durant lesquels guarder les témoins" -#: ../src/midori-websettings.c:537 +#: ../src/midori-websettings.c:542 msgid "Remember last visited pages" -msgstr "Se rappeler des pages visitées" +msgstr "Se rappeler des pages visitées récemment" -#: ../src/midori-websettings.c:538 +#: ../src/midori-websettings.c:543 msgid "Whether the last visited pages are saved" -msgstr "" +msgstr "Enregistrer ou non les pages visitées" -#: ../src/midori-websettings.c:546 +#: ../src/midori-websettings.c:551 msgid "Maximum history age" -msgstr "Âge maximal de l'histoique" +msgstr "Âge maximal de l'historique" -#: ../src/midori-websettings.c:547 +#: ../src/midori-websettings.c:552 msgid "The maximum number of days to save the history for" -msgstr "" +msgstr "Le nombre maximal de jours durant lesquels garder l'historique" -#: ../src/midori-websettings.c:555 +#: ../src/midori-websettings.c:560 msgid "Remember last form inputs" -msgstr "Se rappeler des derniers saisies de formulaires" +msgstr "Se rappeler des dernières saisies de formulaires" -#: ../src/midori-websettings.c:556 +#: ../src/midori-websettings.c:561 msgid "Whether the last form inputs are saved" -msgstr "" +msgstr "Enregistrer ou non les saisies de formulaires" -#: ../src/midori-websettings.c:564 +#: ../src/midori-websettings.c:569 msgid "Remember last downloaded files" msgstr "Se rappeler des derniers fichiers téléchargés" -#: ../src/midori-websettings.c:565 +#: ../src/midori-websettings.c:570 msgid "Whether the last downloaded files are saved" -msgstr "" +msgstr "Enregistrer ou non la liste des fichiers téléchargés" -#: ../src/midori-websettings.c:575 +#: ../src/midori-websettings.c:580 msgid "HTTP Proxy" -msgstr "" +msgstr "Serveur mandataire HTTP" -#: ../src/midori-websettings.c:576 +#: ../src/midori-websettings.c:581 msgid "The proxy used for HTTP connections" -msgstr "" +msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../src/midori-websettings.c:584 +#: ../src/midori-websettings.c:589 msgid "Cache size" -msgstr "Taille du mémoire intermédiaire" +msgstr "Taille de l'antémémoire (cache)" -#: ../src/midori-websettings.c:585 +#: ../src/midori-websettings.c:590 msgid "The allowed size of the cache" -msgstr "" +msgstr "La taille acceptée de l'antémémoire" #: ../src/midori-webview.c:217 msgid "The icon of the currently loaded page" @@ -853,11 +946,11 @@ msgstr "L'URI de la page actuellement chargée" msgid "The title of the currently loaded page" msgstr "Le titre de la page actuellement chargée" -#: ../src/midori-webview.c:476 +#: ../src/midori-webview.c:471 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../src/midori-webview.c:499 +#: ../src/midori-webview.c:494 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" @@ -865,113 +958,109 @@ msgstr "Ouvrir l'URL dans un nouvel _onglet" msgid "Settings instance to provide properties" msgstr "" -#: ../src/midori-preferences.c:84 +#: ../src/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "%s Préferences" #. Page "General" -#: ../src/midori-preferences.c:230 +#: ../src/midori-preferences.c:239 msgid "General" msgstr "Général" -#: ../src/midori-preferences.c:231 +#: ../src/midori-preferences.c:240 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../src/midori-preferences.c:252 +#: ../src/midori-preferences.c:261 msgid "Appearance" msgstr "Aspect" -#: ../src/midori-preferences.c:253 +#: ../src/midori-preferences.c:262 msgid "Font settings" msgstr "Réglages des polices" #. Page "Behavior" -#: ../src/midori-preferences.c:274 +#: ../src/midori-preferences.c:283 msgid "Behavior" msgstr "Comportement" -#: ../src/midori-preferences.c:275 +#: ../src/midori-preferences.c:284 msgid "Features" msgstr "Fonctionnalités" #. Page "Interface" -#: ../src/midori-preferences.c:307 +#: ../src/midori-preferences.c:316 msgid "Interface" msgstr "Interface" -#: ../src/midori-preferences.c:308 -msgid "Navigationbar" -msgstr "Barre de navigation" - -#: ../src/midori-preferences.c:321 +#: ../src/midori-preferences.c:330 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../src/midori-preferences.c:337 ../src/midori-preferences.c:338 +#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 msgid "Network" msgstr "Réseau" -#: ../src/midori-preferences.c:349 +#: ../src/midori-preferences.c:358 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../src/midori-preferences.c:354 +#: ../src/midori-preferences.c:363 msgid "Privacy" msgstr "Confidentialité" -#: ../src/midori-preferences.c:355 -msgid "Cookies" -msgstr "Témoins" +#: ../src/midori-preferences.c:364 +msgid "Web Cookies" +msgstr "Témoins de connexion" -#: ../src/midori-preferences.c:368 ../src/midori-preferences.c:378 +#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 msgid "days" msgstr "jours" -#: ../src/sokoke.c:219 +#: ../src/sokoke.c:295 msgid "Warning: You are using a superuser account!" msgstr "Attention: Vous êtes connecté en tant que super-utilisateur!" -#: ../src/sokoke.c:341 ../katze/katze-xbel.c:952 +#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 #, c-format msgid "Writing failed." msgstr "Échec de l'écriture." -#: ../src/webSearch.c:82 +#: ../src/webSearch.c:115 msgid "Empty" msgstr "Vide" -#: ../src/webSearch.c:154 +#: ../src/webSearch.c:187 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../src/webSearch.c:154 +#: ../src/webSearch.c:187 msgid "Edit search engine" msgstr "Éditer le moteur de recherche" -#: ../src/webSearch.c:184 +#: ../src/webSearch.c:217 msgid "_Name:" msgstr "_Nom:" -#: ../src/webSearch.c:228 +#: ../src/webSearch.c:261 msgid "_Icon (name or file):" msgstr "_Icône (nom ou fichier):" -#: ../src/webSearch.c:242 +#: ../src/webSearch.c:275 msgid "_Keyword:" msgstr "_Mot-clé:" -#: ../src/webSearch.c:311 +#: ../src/webSearch.c:344 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" #: ../katze/katze-throbber.c:135 msgid "Symbolic size to use for the animation" -msgstr "Taille symbolique d'utiliser pour l'animation" +msgstr "Taille symbolique à utiliser pour l'animation" #: ../katze/katze-throbber.c:144 msgid "The name of an icon containing animation frames" @@ -997,18 +1086,18 @@ msgstr "" msgid "The stock ID of an icon to be used as the static image" msgstr "" -#: ../katze/katze-utils.c:114 ../katze/katze-utils.c:239 +#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "" +msgstr "La propriété '%s' n'est pas valide pour %s" -#: ../katze/katze-utils.c:136 ../katze/katze-utils.c:160 +#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 msgid "Choose file" -msgstr "Choisissez fiche" +msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:148 +#: ../katze/katze-utils.c:161 msgid "Choose folder" -msgstr "Choisissez répertoire" +msgstr "Choisissez un répertoire" #: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 #: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 diff --git a/po/pl.po b/po/pl.po index dcb343d3..7cc30210 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-29 12:23+0100\n" +"POT-Creation-Date: 2008-05-04 16:06+0200\n" "PO-Revision-Date: 2008-03-29 13:40+0100\n" "Last-Translator: Przemysław Sitek \n" "Language-Team: pl \n" @@ -27,456 +27,530 @@ msgstr "Przeglądarka Internetowa Midori" msgid "Web Browser" msgstr "Przeglądarka Internetowa" -#. FIXME: Should we have a more specific message? -#: ../src/helpers.c:68 -#: ../src/helpers.c:84 -msgid "Could not run external program." -msgstr "Nie można uruchomić programu." - -#: ../src/main.c:49 +#: ../src/main.c:47 msgid "Bookmark" msgstr "Zakładka" -#: ../src/main.c:50 +#: ../src/main.c:48 msgid "New Bookmark" msgstr "Nowa zakładka" -#: ../src/main.c:51 +#: ../src/main.c:49 msgid "_Form Fill" msgstr "Wypełnij _formularz" -#: ../src/main.c:52 -#: ../src/prefs.c:369 -#: ../src/prefs.c:374 +#: ../src/main.c:50 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:407 msgid "Homepage" msgstr "Strona startowa" -#: ../src/main.c:53 +#: ../src/main.c:51 msgid "New _Tab" msgstr "Nowa kar_ta" -#: ../src/main.c:54 +#: ../src/main.c:52 msgid "New _Window" msgstr "Nowe _okno" -#: ../src/main.c:59 +#: ../src/main.c:54 +msgid "Select _All" +msgstr "Z_aznacz wszystko" + +#: ../src/main.c:57 msgid "_Fullscreen" msgstr "Tryb _pełnoekranowy" -#: ../src/main.c:60 +#: ../src/main.c:58 msgid "_Leave Fullscreen" msgstr "_Opuść tryb pełnoekranowy" -#: ../src/main.c:139 -#: ../src/main.c:171 -msgid "midori" -msgstr "midori" - -#: ../src/main.c:146 -msgid "Display program version" -msgstr "Wyświetl wersję programu" - -#: ../src/main.c:150 -msgid "[URL]" -msgstr "" - -#: ../src/main.c:173 -msgid "Debugging" -msgstr "" - -#: ../src/main.c:174 -msgid "Please report comments, suggestions and bugs to:" -msgstr "" - -#: ../src/main.c:176 -msgid "Check for new versions at:" -msgstr "" - -#: ../src/main.c:193 +#: ../src/main.c:144 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Ustawienia nie mogą być załadowane. %s\n" -#: ../src/main.c:219 +#: ../src/main.c:193 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../src/main.c:200 ../src/main.c:256 +#, c-format +msgid "Unhandled settings property '%s'" +msgstr "" + +#: ../src/main.c:270 ../src/main.c:304 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:277 +msgid "Display program version" +msgstr "Wyświetl wersję programu" + +#: ../src/main.c:282 +msgid "[URL]" +msgstr "" + +#: ../src/main.c:306 +msgid "Debugging" +msgstr "" + +#: ../src/main.c:307 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../src/main.c:309 +msgid "Check for new versions at:" +msgstr "" + +#: ../src/main.c:344 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Zakładki nie mogą być załadowane. %s\n" -#: ../src/main.c:232 +#: ../src/main.c:358 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Sesja nie może być załadowana. %s\n" -#: ../src/main.c:244 +#: ../src/main.c:370 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "" -#: ../src/main.c:254 +#: ../src/main.c:380 msgid "The following errors occured:" msgstr "Nastąpiły następujące błędy:" -#: ../src/main.c:56 -msgid "Select _All" -msgstr "Z_aznacz wszystko" +#: ../src/main.c:489 +#, fuzzy, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Sesja nie może być załadowana. %s\n" -#: ../src/midori-browser.c:187 -#: ../src/midori-browser.c:1927 -#: ../src/midori-browser.c:1933 +#: ../src/main.c:498 +#, fuzzy, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Zakładki nie mogą być załadowane. %s\n" + +#: ../src/main.c:507 +#, fuzzy, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Zakładki nie mogą być załadowane. %s\n" + +#: ../src/main.c:519 +#, fuzzy, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sesja nie może być załadowana. %s\n" + +#: ../src/main.c:528 +#, fuzzy, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Ustawienia nie mogą być załadowane. %s\n" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 +#: ../src/midori-browser.c:2101 msgid "Reload the current page" msgstr "Odśwież bieżącą stronę" -#: ../src/midori-browser.c:195 -#: ../src/midori-browser.c:1930 +#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 msgid "Stop loading the current page" msgstr "Zatrzymaj wczytywanie bieżącej strony" -#: ../src/midori-browser.c:260 +#: ../src/midori-browser.c:264 #, c-format msgid "%d%% loaded" msgstr "%d%% załadowano" -#: ../src/midori-browser.c:526 -#: ../src/midori-webview.c:253 +#: ../src/midori-browser.c:611 +msgid "Menubar" +msgstr "" + +#: ../src/midori-browser.c:612 +#, fuzzy +msgid "The menubar" +msgstr "Strona startowa" + +#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +msgid "Navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../src/midori-browser.c:626 +#, fuzzy +msgid "The navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../src/midori-browser.c:639 +msgid "Tab" +msgstr "" + +#: ../src/midori-browser.c:640 +#, fuzzy +msgid "The current tab" +msgstr "Zamknij bieżącą kartę" + +#: ../src/midori-browser.c:653 +#, fuzzy +msgid "Statusbar" +msgstr "Pasek stanu" + +#: ../src/midori-browser.c:654 +#, fuzzy +msgid "The statusbar" +msgstr "Pasek stanu" + +#: ../src/midori-browser.c:670 +#, fuzzy +msgid "Settings" +msgstr "Ustawienia czcionek" + +#: ../src/midori-browser.c:671 msgid "The associated settings" msgstr "" -#: ../src/midori-browser.c:546 -#: ../src/midori-webview.c:244 +#: ../src/midori-browser.c:690 +#, fuzzy +msgid "Statusbar Text" +msgstr "Pasek stanu" + +#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 msgid "The text that is displayed in the statusbar" msgstr "Tekst wyświetlany na pasku stanu" -#: ../src/midori-browser.c:565 +#: ../src/midori-browser.c:709 +#, fuzzy +msgid "Trash" +msgstr "Pokazuj śmietnik" + +#: ../src/midori-browser.c:710 msgid "The trash, collecting recently closed tabs and windows" msgstr "" -#: ../src/midori-browser.c:1057 -msgid "Open location" -msgstr "Otwórz adres" - -#: ../src/midori-browser.c:1069 -#: ../src/midori-browser.c:1115 -msgid "_Location:" -msgstr "Adres:" - -#. TODO: We should offer all of the search's features here -#: ../src/midori-browser.c:1103 -msgid "Web search" -msgstr "" - -#: ../src/midori-browser.c:1142 +#: ../src/midori-browser.c:1294 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../src/midori-browser.c:1142 +#: ../src/midori-browser.c:1294 msgid "Edit bookmark" msgstr "Edytuj zakładkę" -#: ../src/midori-browser.c:1159 +#: ../src/midori-browser.c:1311 msgid "_Title:" msgstr "_Tytuł:" -#: ../src/midori-browser.c:1175 -#: ../src/webSearch.c:199 +#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 msgid "_Description:" msgstr "_Opis:" -#: ../src/midori-browser.c:1194 -#: ../src/webSearch.c:213 +#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1212 +#: ../src/midori-browser.c:1364 msgid "_Folder:" msgstr "_Folder:" -#: ../src/midori-browser.c:1216 +#: ../src/midori-browser.c:1368 msgid "Root" msgstr "Korzeń" -#: ../src/midori-browser.c:1437 +#: ../src/midori-browser.c:1591 msgid "Separator" msgstr "Separator" -#: ../src/midori-browser.c:1624 +#: ../src/midori-browser.c:1780 msgid "A lightweight web browser." msgstr "Lekka przeglądarka internetowa" -#: ../src/midori-browser.c:1632 +#: ../src/midori-browser.c:1788 msgid "translator-credits" msgstr "Przemysław Sitek " -#: ../src/midori-browser.c:1847 +#: ../src/midori-browser.c:2015 msgid "_File" msgstr "_Plik" -#: ../src/midori-browser.c:1850 +#: ../src/midori-browser.c:2018 msgid "Open a new window" msgstr "_Nowe okno" -#: ../src/midori-browser.c:1853 +#: ../src/midori-browser.c:2021 msgid "Open a new tab" msgstr "Nowa kar_ta" -#: ../src/midori-browser.c:1856 +#: ../src/midori-browser.c:2024 msgid "Open a file" msgstr "_Otwórz plik" -#: ../src/midori-browser.c:1859 +#: ../src/midori-browser.c:2027 msgid "Save to a file" msgstr "Zapi_sz stronę jako" -#: ../src/midori-browser.c:1861 +#: ../src/midori-browser.c:2029 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../src/midori-browser.c:1862 +#: ../src/midori-browser.c:2030 msgid "Close the current tab" msgstr "Zamknij bieżącą kartę" -#: ../src/midori-browser.c:1864 +#: ../src/midori-browser.c:2032 msgid "C_lose Window" msgstr "Zamknij okno" -#: ../src/midori-browser.c:1865 +#: ../src/midori-browser.c:2033 msgid "Close this window" msgstr "Zamknij okno" -#: ../src/midori-browser.c:1867 +#: ../src/midori-browser.c:2035 msgid "Pa_ge Setup" msgstr "_Ustawienia strony" -#: ../src/midori-browser.c:1877 +#: ../src/midori-browser.c:2045 msgid "Quit the application" msgstr "Za_kończ" -#: ../src/midori-browser.c:1879 +#: ../src/midori-browser.c:2047 msgid "_Edit" msgstr "_Edycja" -#: ../src/midori-browser.c:1882 +#: ../src/midori-browser.c:2050 msgid "Undo the last modification" msgstr "Cofnij" -#: ../src/midori-browser.c:1885 +#: ../src/midori-browser.c:2053 msgid "Redo the last modification" msgstr "Przywróć" -#: ../src/midori-browser.c:1891 -#: ../src/midori-browser.c:1894 +#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 msgid "Copy the selected text" msgstr "Skopiuj" -#: ../src/midori-browser.c:1897 +#: ../src/midori-browser.c:2065 msgid "Paste text from the clipboard" msgstr "Wklej" -#: ../src/midori-browser.c:1900 +#: ../src/midori-browser.c:2068 msgid "Delete the selected text" msgstr "" -#: ../src/midori-browser.c:1903 +#: ../src/midori-browser.c:2071 msgid "Select all text" msgstr "Zaznacz w_szystko" -#: ../src/midori-browser.c:1911 +#: ../src/midori-browser.c:2079 msgid "Find _Next" msgstr "Znajdź poprzednie" -#: ../src/midori-browser.c:1914 +#: ../src/midori-browser.c:2082 msgid "Find _Previous" msgstr "Znajdź następne" -#: ../src/midori-browser.c:1917 +#: ../src/midori-browser.c:2085 msgid "_Quick Find" msgstr "Szybkie wyszukiwanie" -#: ../src/midori-browser.c:1923 +#: ../src/midori-browser.c:2091 msgid "_View" msgstr "_Widok" -#: ../src/midori-browser.c:1924 +#: ../src/midori-browser.c:2092 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../src/midori-browser.c:1944 +#: ../src/midori-browser.c:2112 msgid "View Source" msgstr "Ź_ródło strony" -#: ../src/midori-browser.c:1947 +#: ../src/midori-browser.c:2115 msgid "View Selection Source" msgstr "Pokaż źródło zaznaczenia" -#: ../src/midori-browser.c:1951 +#: ../src/midori-browser.c:2119 msgid "Toggle fullscreen view" msgstr "Tryb pełnoekranowy" -#: ../src/midori-browser.c:1953 +#: ../src/midori-browser.c:2121 msgid "_Go" msgstr "P_rzejdź" -#: ../src/midori-browser.c:1964 +#: ../src/midori-browser.c:2132 msgid "Location..." msgstr "_Położenie..." -#: ../src/midori-browser.c:1967 +#: ../src/midori-browser.c:2135 msgid "Web Search..." msgstr "Wyszukiwarki internetowe..." -#: ../src/midori-browser.c:1970 +#: ../src/midori-browser.c:2138 msgid "Open in Page_holder..." msgstr "" -#: ../src/midori-browser.c:1973 +#: ../src/midori-browser.c:2141 msgid "Closed Tabs and Windows" msgstr "Zamknięte karty i okna" -#: ../src/midori-browser.c:1974 +#: ../src/midori-browser.c:2142 msgid "Reopen a previously closed tab or window" msgstr "Otwórz wcześniej zamkniętą kartę lub okno" -#: ../src/midori-browser.c:1976 +#: ../src/midori-browser.c:2144 msgid "Empty Trash" msgstr "Opróżnij kosz" -#: ../src/midori-browser.c:1979 +#: ../src/midori-browser.c:2147 msgid "Undo Close Tab" msgstr "Cofnij zamknięcie karty" -#: ../src/midori-browser.c:1982 +#: ../src/midori-browser.c:2150 msgid "_Bookmarks" msgstr "_Zakładki" -#: ../src/midori-browser.c:1987 +#: ../src/midori-browser.c:2155 msgid "_Manage Bookmarks" msgstr "_Modyfikuj zakładki" -#: ../src/midori-browser.c:1993 +#: ../src/midori-browser.c:2161 msgid "Open in New _Tab" msgstr "Otwórz odnośnik w nowej _karcie" -#: ../src/midori-browser.c:1996 +#: ../src/midori-browser.c:2164 msgid "Open in New _Window" msgstr "Otwórz odnośnik w _nowym oknie" -#: ../src/midori-browser.c:2005 +#: ../src/midori-browser.c:2173 msgid "_Tools" msgstr "_Narzędzia" -#: ../src/midori-browser.c:2007 +#: ../src/midori-browser.c:2175 msgid "_Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami" -#: ../src/midori-browser.c:2008 +#: ../src/midori-browser.c:2176 msgid "Add, edit and remove search engines..." msgstr "" -#: ../src/midori-browser.c:2011 +#: ../src/midori-browser.c:2179 msgid "_Window" msgstr "_Okno" -#: ../src/midori-browser.c:2013 +#: ../src/midori-browser.c:2181 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../src/midori-browser.c:2016 +#: ../src/midori-browser.c:2184 msgid "_Next Tab" msgstr "_Następna karta" -#: ../src/midori-browser.c:2019 +#: ../src/midori-browser.c:2187 msgid "Tab _Overview" msgstr "" #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2022 +#: ../src/midori-browser.c:2190 msgid "_Help" msgstr "Pomo_c" -#: ../src/midori-browser.c:2024 +#: ../src/midori-browser.c:2192 msgid "_Contents" msgstr "_Zawartość" -#: ../src/midori-browser.c:2034 +#: ../src/midori-browser.c:2202 msgid "P_rivate Browsing" msgstr "P_rywatne przeglądanie" -#: ../src/midori-browser.c:2038 +#: ../src/midori-browser.c:2206 msgid "_Work Offline" msgstr "Pracuj bez podłączenia" -#: ../src/midori-browser.c:2043 +#: ../src/midori-browser.c:2211 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../src/midori-browser.c:2047 +#: ../src/midori-browser.c:2215 msgid "Side_panel" msgstr "Panel _boczny" -#: ../src/midori-browser.c:2051 +#: ../src/midori-browser.c:2219 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../src/midori-browser.c:2055 +#: ../src/midori-browser.c:2223 msgid "_Transferbar" msgstr "_Pasek pobierania plików" -#: ../src/midori-browser.c:2059 +#: ../src/midori-browser.c:2227 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../src/midori-browser.c:2529 +#: ../src/midori-browser.c:2681 msgid "Bookmarks" msgstr "Zakładki" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2539 -#: ../src/prefs.c:381 +#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 msgid "Transfers" msgstr "Pobierania plików" -#: ../src/midori-browser.c:2546 +#: ../src/midori-browser.c:2697 msgid "Console" msgstr "Konsola" -#: ../src/midori-browser.c:2555 -#: ../src/prefs.c:669 +#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 msgid "History" msgstr "Historia" -#: ../src/midori-browser.c:2564 +#: ../src/midori-browser.c:2713 msgid "Pageholder" msgstr "" -#: ../src/midori-browser.c:2586 +#: ../src/midori-browser.c:2722 +#, fuzzy +msgid "Userscripts" +msgstr "Włącz obsługę języków skryptowych" + +#: ../src/midori-browser.c:2748 msgid "_Inline find:" msgstr "Wyszukaj:" -#: ../src/midori-browser.c:2612 +#: ../src/midori-browser.c:2774 msgid "Match Case" msgstr "Uwzg_lędniaj wielkość liter" -#: ../src/midori-browser.c:2629 +#: ../src/midori-browser.c:2791 msgid "Close Findbar" msgstr "Zamknij" -#: ../src/midori-panel.c:146 +#: ../src/midori-browser.c:2815 +msgid "Extensions" +msgstr "" + +#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#, fuzzy, c-format +msgid "Unexpected setting '%s'" +msgstr "Zaawansowane ustawienia" + +#: ../src/midori-browser.c:3278 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../src/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "" -#: ../src/midori-panel.c:156 +#: ../src/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "" -#: ../src/midori-panel.c:165 +#: ../src/midori-panel.c:166 msgid "The index of the current page" msgstr "" -#: ../src/midori-panel.c:210 -#: ../src/midori-panel.c:211 +#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 msgid "Close panel" msgstr "" -#: ../src/midori-panel.c:373 +#: ../src/midori-panel.c:391 msgid "Untitled" msgstr "Bez tytułu" @@ -484,18 +558,409 @@ msgstr "Bez tytułu" msgid "The maximum number of items" msgstr "" -#: ../src/midori-websettings.c:69 +#: ../src/midori-websettings.c:130 +#, fuzzy +msgid "Blank page" +msgstr "Pusta strona" + +#: ../src/midori-websettings.c:132 +#, fuzzy +msgid "Last open pages" +msgstr "Ostatnio otwarte strony" + +#: ../src/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "" + +#: ../src/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../src/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../src/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../src/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../src/midori-websettings.c:152 +msgid "Custom..." +msgstr "" + +#: ../src/midori-websettings.c:167 +msgid "New tab" +msgstr "nowej karcie" + +#: ../src/midori-websettings.c:168 +msgid "New window" +msgstr "nowym oknie" + +#: ../src/midori-websettings.c:169 +msgid "Current tab" +msgstr "bieżącej karcie" + +#: ../src/midori-websettings.c:184 +msgid "Default" +msgstr "Domyślnie" + +#: ../src/midori-websettings.c:185 +msgid "Icons" +msgstr "Tylko ikony" + +#: ../src/midori-websettings.c:186 +msgid "Text" +msgstr "Tylko tekst" + +#: ../src/midori-websettings.c:187 +msgid "Both" +msgstr "Tekst pod ikonami" + +#: ../src/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Tekst obok ikon" + +#: ../src/midori-websettings.c:203 +msgid "All cookies" +msgstr "Wszystkie ciasteczka" + +#: ../src/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Ciasteczka sesji" + +#: ../src/midori-websettings.c:205 +msgid "None" +msgstr "Żadne" + +#: ../src/midori-websettings.c:247 +#, fuzzy +msgid "Remember last window size" +msgstr "Przechowuj informację o pobranych plikach" + +#: ../src/midori-websettings.c:248 +msgid "Whether to save the last window size" +msgstr "" + +#: ../src/midori-websettings.c:256 +msgid "Last window width" +msgstr "" + +#: ../src/midori-websettings.c:257 +msgid "The last saved window width" +msgstr "" + +#: ../src/midori-websettings.c:265 +msgid "Last window height" +msgstr "" + +#: ../src/midori-websettings.c:266 +msgid "The last saved window height" +msgstr "" + +#: ../src/midori-websettings.c:274 +msgid "Last panel position" +msgstr "" + +#: ../src/midori-websettings.c:275 +msgid "The last saved panel position" +msgstr "" + +#: ../src/midori-websettings.c:283 +#, fuzzy +msgid "Last panel page" +msgstr "Ostatnio otwarte strony" + +#: ../src/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "" + +#: ../src/midori-websettings.c:292 +#, fuzzy +msgid "Last Web search" +msgstr "Pokazuj wyszukiwarki internetowe" + +#: ../src/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "" + +#: ../src/midori-websettings.c:301 +msgid "Last pageholder URI" +msgstr "" + +#: ../src/midori-websettings.c:302 +msgid "The URI last opened in the pageholder" +msgstr "" + +#: ../src/midori-websettings.c:312 +#, fuzzy +msgid "Show Navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../src/midori-websettings.c:313 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../src/midori-websettings.c:321 +#, fuzzy +msgid "Show Bookmarkbar" +msgstr "Pasek _zakładek" + +#: ../src/midori-websettings.c:322 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../src/midori-websettings.c:330 +msgid "Show Panel" +msgstr "" + +#: ../src/midori-websettings.c:331 +msgid "Whether to show the panel" +msgstr "" + +#: ../src/midori-websettings.c:339 +#, fuzzy +msgid "Show Statusbar" +msgstr "Pasek stanu" + +#: ../src/midori-websettings.c:340 +#, fuzzy +msgid "Whether to show the statusbar" +msgstr "Tekst wyświetlany na pasku stanu" + +#: ../src/midori-websettings.c:349 +#, fuzzy +msgid "Toolbar Style" +msgstr "Etykiety przycisków paska narzędziowego" + +#: ../src/midori-websettings.c:350 +msgid "The style of the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:359 +msgid "Small toolbar" +msgstr "" + +#: ../src/midori-websettings.c:360 +#, fuzzy +msgid "Use small toolbar icons" +msgstr "Pokazuj małe ikony" + +#: ../src/midori-websettings.c:368 +#, fuzzy +msgid "Show New Tab" +msgstr "Pokazuj przycisk \"Nowa karta\"" + +#: ../src/midori-websettings.c:369 +msgid "Show the New Tab button in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:377 +#, fuzzy +msgid "Show Web search" +msgstr "Pokazuj wyszukiwarki internetowe" + +#: ../src/midori-websettings.c:378 +msgid "Show the Web search entry in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:386 +#, fuzzy +msgid "Show Trash" +msgstr "Pokazuj śmietnik" + +#: ../src/midori-websettings.c:387 +msgid "Show the Trash button in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:397 +#, fuzzy +msgid "Load on Startup" +msgstr "Pokaż przy uruchomieniu" + +#: ../src/midori-websettings.c:398 +#, fuzzy +msgid "What to load on startup" +msgstr "Pokaż przy uruchomieniu" + +#: ../src/midori-websettings.c:408 +#, fuzzy +msgid "The homepage" +msgstr "Strona startowa" + +#: ../src/midori-websettings.c:416 +#, fuzzy +msgid "Download Folder" +msgstr "Katalog pobierania plików" + +#: ../src/midori-websettings.c:417 +#, fuzzy +msgid "The folder downloaded files are saved to" +msgstr "Wybiera katalog pobierania plików" + +#: ../src/midori-websettings.c:425 +msgid "Show Download Notification" +msgstr "" + +#: ../src/midori-websettings.c:426 +msgid "Show a notification window for finished downloads" +msgstr "" + +#: ../src/midori-websettings.c:434 +#, fuzzy +msgid "Location entry Search" +msgstr "Adres wyszukiwarki internetowej" + +#: ../src/midori-websettings.c:435 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../src/midori-websettings.c:443 +#, fuzzy +msgid "Preferred Encoding" +msgstr "Preferowane języki" + +#: ../src/midori-websettings.c:444 +msgid "The preferred character encoding" +msgstr "" + +#: ../src/midori-websettings.c:455 +#, fuzzy +msgid "Tab Label Size" +msgstr "Rozmiar karty" + +#: ../src/midori-websettings.c:456 msgid "The desired tab label size" msgstr "" -#: ../src/midori-websettings.c:78 +#: ../src/midori-websettings.c:464 +#, fuzzy +msgid "Close Buttons on Tabs" +msgstr "Pokazuj przyciski zamykania kart" + +#: ../src/midori-websettings.c:465 msgid "Whether tabs have close buttons" msgstr "" -#: ../src/midori-websettings.c:87 +#: ../src/midori-websettings.c:473 +#, fuzzy +msgid "Open new pages in" +msgstr "Otwieraj nowe strony w" + +#: ../src/midori-websettings.c:474 +#, fuzzy +msgid "Where to open new pages" +msgstr "Otwieraj nowe strony w" + +#: ../src/midori-websettings.c:483 +#, fuzzy +msgid "Middle click opens Selection" +msgstr "_Środkowy przycisk myszy otwiera zaznaczoną stronę" + +#: ../src/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "" +#: ../src/midori-websettings.c:492 +#, fuzzy +msgid "Open tabs in the background" +msgstr "Otwieraj nowe karty w tle" + +#: ../src/midori-websettings.c:493 +#, fuzzy +msgid "Whether to open new tabs in the background" +msgstr "Otwieraj nowe karty w tle" + +#: ../src/midori-websettings.c:501 +#, fuzzy +msgid "Open popups in tabs" +msgstr "Otwieraj wyskakujące okienka jako karty" + +#: ../src/midori-websettings.c:502 +#, fuzzy +msgid "Whether to open popup windows in tabs" +msgstr "Otwieraj wyskakujące okienka jako karty" + +#: ../src/midori-websettings.c:512 +msgid "Accept cookies" +msgstr "Akceptuj ciasteczka" + +#: ../src/midori-websettings.c:513 +msgid "What type of cookies to accept" +msgstr "" + +#: ../src/midori-websettings.c:522 +msgid "Original cookies only" +msgstr "" + +#: ../src/midori-websettings.c:523 +#, fuzzy +msgid "Accept cookies from the original website only" +msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" + +#: ../src/midori-websettings.c:531 +msgid "Maximum cookie age" +msgstr "Przechowuj ciasteczka przez:" + +#: ../src/midori-websettings.c:532 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../src/midori-websettings.c:542 +#, fuzzy +msgid "Remember last visited pages" +msgstr "Przechowuj adresy odwiedzonych stron" + +#: ../src/midori-websettings.c:543 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../src/midori-websettings.c:551 +#, fuzzy +msgid "Maximum history age" +msgstr "Przechowuj ciasteczka przez:" + +#: ../src/midori-websettings.c:552 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../src/midori-websettings.c:560 +#, fuzzy +msgid "Remember last form inputs" +msgstr "Przechowuj dane z formularzy" + +#: ../src/midori-websettings.c:561 +msgid "Whether the last form inputs are saved" +msgstr "" + +#: ../src/midori-websettings.c:569 +#, fuzzy +msgid "Remember last downloaded files" +msgstr "Przechowuj informację o pobranych plikach" + +#: ../src/midori-websettings.c:570 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../src/midori-websettings.c:580 +msgid "HTTP Proxy" +msgstr "" + +#: ../src/midori-websettings.c:581 +msgid "The proxy used for HTTP connections" +msgstr "" + +#: ../src/midori-websettings.c:589 +msgid "Cache size" +msgstr "Rozmiar pamięci podręcznej" + +#: ../src/midori-websettings.c:590 +msgid "The allowed size of the cache" +msgstr "" + #: ../src/midori-webview.c:217 msgid "The icon of the currently loaded page" msgstr "" @@ -508,417 +973,116 @@ msgstr "" msgid "The title of the currently loaded page" msgstr "" -#: ../src/midori-webview.c:472 +#: ../src/midori-webview.c:471 msgid "Open Link in New _Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../src/midori-webview.c:495 +#: ../src/midori-webview.c:494 msgid "Open URL in New _Tab" msgstr "Otwórz URL w nowej karcie" -#: ../src/prefs.c:299 +#: ../src/midori-preferences.c:64 +msgid "Settings instance to provide properties" +msgstr "" + +#: ../src/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "Preferencje %s" #. Page "General" -#: ../src/prefs.c:363 +#: ../src/midori-preferences.c:239 msgid "General" msgstr "Ogólne" -#: ../src/prefs.c:364 +#: ../src/midori-preferences.c:240 msgid "Startup" msgstr "Uruhomienie" -#: ../src/prefs.c:366 -msgid "Load on startup" -msgstr "Pokaż przy uruchomieniu" - -#: ../src/prefs.c:369 -msgid "Blank page" -msgstr "Pusta strona" - -#: ../src/prefs.c:369 -msgid "Last open pages" -msgstr "Ostatnio otwarte strony" - -#: ../src/prefs.c:383 -msgid "Download folder" -msgstr "Katalog pobierania plików" - -#: ../src/prefs.c:385 -msgid "Choose downloaded files folder" -msgstr "Wybiera katalog pobierania plików" - -#: ../src/prefs.c:392 -msgid "Show a notification window for finished transfers" -msgstr "" - -#: ../src/prefs.c:395 -msgid "Languages" -msgstr "Języki" - -#: ../src/prefs.c:397 -msgid "Preferred languages" -msgstr "Preferowane języki" - #. Page "Appearance" -#: ../src/prefs.c:409 +#: ../src/midori-preferences.c:261 msgid "Appearance" msgstr "Wygląd" -#: ../src/prefs.c:410 +#: ../src/midori-preferences.c:262 msgid "Font settings" msgstr "Ustawienia czcionek" -#: ../src/prefs.c:412 -msgid "Default _font" -msgstr "Domyślna _czcionka" - -#: ../src/prefs.c:419 -msgid "_Minimum font size" -msgstr "_Minimalny rozmiar" - -#: ../src/prefs.c:426 -msgid "_Advanced" -msgstr "_Zaawansowane" - -#: ../src/prefs.c:430 -msgid "Default _encoding" -msgstr "Domyślne _kodowanie znaków" - -#: ../src/prefs.c:433 -msgid "Chinese (BIG5)" -msgstr "" - -#: ../src/prefs.c:433 -msgid "Japanese (SHIFT_JIS)" -msgstr "" - -#: ../src/prefs.c:433 -msgid "Russian (KOI8-R)" -msgstr "" - -#: ../src/prefs.c:434 -msgid "Unicode (UTF-8)" -msgstr "" - -#: ../src/prefs.c:434 -msgid "Western (ISO-8859-1)" -msgstr "" - -#: ../src/prefs.c:449 -msgid "Advanced settings" -msgstr "Zaawansowane ustawienia" - -#: ../src/prefs.c:452 -msgid "Default colors" -msgstr "Domyślne kolory" - -#: ../src/prefs.c:454 -msgid "Text color" -msgstr "Tekst:" - -#: ../src/prefs.c:458 -msgid "Background color" -msgstr "Tło:" - -#: ../src/prefs.c:462 -msgid "Link color" -msgstr "Nieodwiedzone odnośniki:" - -#: ../src/prefs.c:466 -msgid "Visited link color" -msgstr "Odwiedzone odnośniki:" - #. Page "Behavior" -#: ../src/prefs.c:472 +#: ../src/midori-preferences.c:283 msgid "Behavior" msgstr "Zachowanie" -#: ../src/prefs.c:473 -msgid "Browsing" -msgstr "Przeglądanie" - -#: ../src/prefs.c:475 -msgid "Open _new pages in" -msgstr "Otwieraj nowe strony w" - -#: ../src/prefs.c:478 -msgid "New tab" -msgstr "nowej karcie" - -#: ../src/prefs.c:478 -msgid "New window" -msgstr "nowym oknie" - -#: ../src/prefs.c:478 -msgid "Current tab" -msgstr "bieżącej karcie" - -#: ../src/prefs.c:483 -msgid "_Middle click opens selection" -msgstr "_Środkowy przycisk myszy otwiera zaznaczoną stronę" - -#: ../src/prefs.c:488 -msgid "Open tabs in the _background" -msgstr "Otwieraj nowe karty w tle" - -#: ../src/prefs.c:493 -msgid "Open popups in _tabs" -msgstr "Otwieraj wyskakujące okienka jako karty" - -#: ../src/prefs.c:499 +#: ../src/midori-preferences.c:284 msgid "Features" msgstr "Treść" -#: ../src/prefs.c:501 -msgid "Load _images" -msgstr "P_obieraj obrazki automatycznie" - -#: ../src/prefs.c:506 -msgid "_Shrink images to fit" -msgstr "Dopasuj rozmiar obrazków" - -#: ../src/prefs.c:511 -msgid "Print _backgrounds" -msgstr "Drukuj tło strony" - -#: ../src/prefs.c:516 -msgid "_Resizable textareas" -msgstr "Pozwól zmieniać rozmiar pól tekstowych" - -#: ../src/prefs.c:521 -msgid "Enable _scripts" -msgstr "Włącz obsługę języków skryptowych" - -#: ../src/prefs.c:526 -msgid "Enable _plugins" -msgstr "Włącz obsługę wtyczek" - -#: ../src/prefs.c:531 -msgid "_User Stylesheet" -msgstr "Własny arkusz _stylu" - -#: ../src/prefs.c:537 -msgid "Choose user stylesheet" -msgstr "Wybierz własny arkusz stylu" - #. Page "Interface" -#: ../src/prefs.c:546 +#: ../src/midori-preferences.c:316 msgid "Interface" msgstr "Interfejs" -#: ../src/prefs.c:547 -msgid "Navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" - -#: ../src/prefs.c:549 -msgid "_Toolbar style" -msgstr "Etykiety przycisków paska narzędziowego" - -#: ../src/prefs.c:552 -msgid "Default" -msgstr "Domyślnie" - -#: ../src/prefs.c:552 -msgid "Icons" -msgstr "Tylko ikony" - -#: ../src/prefs.c:552 -msgid "Text" -msgstr "Tylko tekst" - -#: ../src/prefs.c:552 -msgid "Both" -msgstr "Tekst pod ikonami" - -#: ../src/prefs.c:552 -msgid "Both horizontal" -msgstr "Tekst obok ikon" - -#: ../src/prefs.c:557 -msgid "Show small _icons" -msgstr "Pokazuj małe ikony" - -#: ../src/prefs.c:562 -msgid "Show Web_search" -msgstr "Pokazuj wyszukiwarki internetowe" - -#: ../src/prefs.c:567 -msgid "Show _New Tab" -msgstr "Pokazuj przycisk \"Nowa karta\"" - -#: ../src/prefs.c:572 -msgid "Show _Trash" -msgstr "Pokazuj śmietnik" - -#: ../src/prefs.c:577 -msgid "Miscellaneous" -msgstr "" - -#: ../src/prefs.c:579 -msgid "Close _buttons on tabs" -msgstr "Pokazuj przyciski zamykania kart" - -#: ../src/prefs.c:586 -msgid "Tab Si_ze" -msgstr "Rozmiar karty" - -#: ../src/prefs.c:593 -msgid "_Location search engine" -msgstr "Adres wyszukiwarki internetowej" +#: ../src/midori-preferences.c:330 +msgid "Browsing" +msgstr "Przeglądanie" #. Page "Network" -#: ../src/prefs.c:601 +#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 msgid "Network" msgstr "Sieć" -#: ../src/prefs.c:602 -msgid "Proxy Server" -msgstr "Serwer proxy" - -#: ../src/prefs.c:604 -msgid "_Custom proxy server" -msgstr "Ręczna konfiguracja serwera proxy" - -#: ../src/prefs.c:608 -msgid "_Host/ Port" -msgstr "_Host/Port" - -#: ../src/prefs.c:617 -msgid "Proxy requires authentication" -msgstr "Serwer proxy wymaga uwierzytelniania" - -#: ../src/prefs.c:621 -msgid "Username" -msgstr "Nazwa użytkownika" - -#: ../src/prefs.c:625 -msgid "Password" -msgstr "Hasło" - -#: ../src/prefs.c:629 -msgid "Cache" -msgstr "Pamięć podręczna" - -#: ../src/prefs.c:631 -msgid "Cache size" -msgstr "Rozmiar pamięci podręcznej" - -#: ../src/prefs.c:637 +#: ../src/midori-preferences.c:358 msgid "MB" msgstr "MB" -#: ../src/prefs.c:638 -msgid "Clear cache" -msgstr "Wyczyść teraz" - #. Page "Privacy" -#: ../src/prefs.c:644 +#: ../src/midori-preferences.c:363 msgid "Privacy" msgstr "Prywatność" -#: ../src/prefs.c:645 -msgid "Cookies" +#: ../src/midori-preferences.c:364 +#, fuzzy +msgid "Web Cookies" msgstr "Ciasteczka" -#: ../src/prefs.c:647 -msgid "Accept cookies" -msgstr "Akceptuj ciasteczka" - -#: ../src/prefs.c:650 -msgid "All cookies" -msgstr "Wszystkie ciasteczka" - -#: ../src/prefs.c:650 -msgid "Session cookies" -msgstr "Ciasteczka sesji" - -#: ../src/prefs.c:650 -msgid "None" -msgstr "Żadne" - -#: ../src/prefs.c:655 -msgid "Allow cookies from the original website only" -msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" - -#: ../src/prefs.c:658 -msgid "Maximum cookie age" -msgstr "Przechowuj ciasteczka przez:" - -#: ../src/prefs.c:664 -#: ../src/prefs.c:679 +#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 msgid "days" msgstr "dni" -#: ../src/prefs.c:665 -msgid "View cookies" -msgstr "Pokaż ciasteczka" - -#: ../src/prefs.c:671 -msgid "Remember my visited pages" -msgstr "Przechowuj adresy odwiedzonych stron" - -#: ../src/prefs.c:682 -msgid "Remember my form inputs" -msgstr "Przechowuj dane z formularzy" - -#: ../src/prefs.c:686 -msgid "Remember my downloaded files" -msgstr "Przechowuj informację o pobranych plikach" - -#. Page "Programs" -#: ../src/prefs.c:691 -msgid "Programs" -msgstr "Programy" - -#: ../src/prefs.c:692 -msgid "External programs" -msgstr "Zewnętrzne programy" - -#: ../src/prefs.c:703 -msgid "Protocol" -msgstr "Protokół" - -#: ../src/prefs.c:706 -msgid "Command" -msgstr "Polecenie" - -#: ../src/sokoke.c:157 +#: ../src/sokoke.c:295 msgid "Warning: You are using a superuser account!" msgstr "Uwaga: Używasz konta administratora!" -#: ../src/sokoke.c:267 -#: ../katze/katze-xbel.c:952 +#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 +#, c-format msgid "Writing failed." msgstr "Zapis nie powiódł się" -#: ../src/webSearch.c:82 +#: ../src/webSearch.c:115 msgid "Empty" msgstr "Puste" -#: ../src/webSearch.c:153 +#: ../src/webSearch.c:187 msgid "Add search engine" msgstr "Dodaj wyszukiwarkę internetową" -#: ../src/webSearch.c:153 +#: ../src/webSearch.c:187 msgid "Edit search engine" msgstr "Modyfikuj przeglądarkę internetową" -#: ../src/webSearch.c:183 +#: ../src/webSearch.c:217 msgid "_Name:" msgstr "_Nazwa:" -#: ../src/webSearch.c:227 +#: ../src/webSearch.c:261 msgid "_Icon (name or file):" msgstr "_Ikona (nazwa albo plik):" -#: ../src/webSearch.c:241 +#: ../src/webSearch.c:275 msgid "_Keyword:" msgstr "_Słowo kluczowe:" -#: ../src/webSearch.c:310 +#: ../src/webSearch.c:344 msgid "Manage search engines" msgstr "_Zarządzaj wyszukiwarkami" @@ -950,10 +1114,22 @@ msgstr "" msgid "The stock ID of an icon to be used as the static image" msgstr "" -#: ../katze/katze-xbel.c:723 -#: ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 -#: ../katze/katze-xbel.c:775 +#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:161 +#, fuzzy +msgid "Choose folder" +msgstr "Katalog pobierania plików" + +#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 #: ../katze/katze-xbel.c:804 msgid "Malformed document." msgstr "" @@ -961,4 +1137,3 @@ msgstr "" #: ../katze/katze-xbel.c:759 msgid "File not found." msgstr "Nie znaleziono dokumentu" - diff --git a/po/sv.po b/po/sv.po index bd04c6e1..bea20500 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-23 21:04+0100\n" +"POT-Creation-Date: 2008-05-04 16:06+0200\n" "PO-Revision-Date: 2008-03-23 21:05+0100\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: Swedish\n" @@ -28,441 +28,530 @@ msgstr "Midori Webbläsare" msgid "Web Browser" msgstr "Webbläsare" -#. FIXME: Should we have a more specific message? -#: ../src/helpers.c:68 ../src/helpers.c:84 -msgid "Could not run external program." -msgstr "Kunde inte starta externt program." - -#: ../src/main.c:49 +#: ../src/main.c:47 msgid "Bookmark" msgstr "Bokmärke" -#: ../src/main.c:50 +#: ../src/main.c:48 msgid "New Bookmark" msgstr "Nytt Bokmärke" -#: ../src/main.c:51 +#: ../src/main.c:49 msgid "_Form Fill" msgstr "Fyll i _formulär" -#: ../src/main.c:52 ../src/prefs.c:369 ../src/prefs.c:374 +#: ../src/main.c:50 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:407 msgid "Homepage" msgstr "Hemsida" -#: ../src/main.c:53 +#: ../src/main.c:51 msgid "New _Tab" msgstr "Ny _tabb" -#: ../src/main.c:54 +#: ../src/main.c:52 msgid "New _Window" msgstr "Nytt _fönster" -#: ../src/main.c:59 +#: ../src/main.c:54 +msgid "Select _All" +msgstr "Välj _alla" + +#: ../src/main.c:57 msgid "_Fullscreen" msgstr "_Fullskärm" -#: ../src/main.c:60 +#: ../src/main.c:58 msgid "_Leave Fullscreen" msgstr "_Lämna fullskärm" -#: ../src/main.c:139 ../src/main.c:171 -msgid "midori" -msgstr "midori" - -#: ../src/main.c:146 -msgid "Display program version" -msgstr "Visa programversion" - -#: ../src/main.c:150 -msgid "[URL]" -msgstr "[URL]" - -#: ../src/main.c:173 -msgid "Debugging" -msgstr "Felsökning" - -#: ../src/main.c:174 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" - -#: ../src/main.c:176 -msgid "Check for new versions at:" -msgstr "Leta efter nya verioner på:" - -#: ../src/main.c:193 +#: ../src/main.c:144 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Konfigurationsfilen kunde inte laddas. %s\n" -#: ../src/main.c:219 +#: ../src/main.c:193 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../src/main.c:200 ../src/main.c:256 +#, c-format +msgid "Unhandled settings property '%s'" +msgstr "" + +#: ../src/main.c:270 ../src/main.c:304 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:277 +msgid "Display program version" +msgstr "Visa programversion" + +#: ../src/main.c:282 +msgid "[URL]" +msgstr "[URL]" + +#: ../src/main.c:306 +msgid "Debugging" +msgstr "Felsökning" + +#: ../src/main.c:307 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" + +#: ../src/main.c:309 +msgid "Check for new versions at:" +msgstr "Leta efter nya verioner på:" + +#: ../src/main.c:344 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Bokmärkena kunde inte laddas. %s\n" -#: ../src/main.c:232 +#: ../src/main.c:358 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Sessionen kunde inte laddas. %s\n" -#: ../src/main.c:244 +#: ../src/main.c:370 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Papperskorgen kunde inte laddas. %s\n" -#: ../src/main.c:254 +#: ../src/main.c:380 msgid "The following errors occured:" msgstr "Följande fel inträffade:" -#: ../src/main.c:56 -msgid "Select _All" -msgstr "Välj _alla" +#: ../src/main.c:489 +#, fuzzy, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Sessionen kunde inte laddas. %s\n" -#: ../src/midori-browser.c:185 ../src/midori-browser.c:1919 -#: ../src/midori-browser.c:1925 +#: ../src/main.c:498 +#, fuzzy, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bokmärkena kunde inte laddas. %s\n" + +#: ../src/main.c:507 +#, fuzzy, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Papperskorgen kunde inte laddas. %s\n" + +#: ../src/main.c:519 +#, fuzzy, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sessionen kunde inte laddas. %s\n" + +#: ../src/main.c:528 +#, fuzzy, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Konfigurationsfilen kunde inte laddas. %s\n" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 +#: ../src/midori-browser.c:2101 msgid "Reload the current page" msgstr "Ladda om sidan" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:1922 +#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 msgid "Stop loading the current page" msgstr "Sluta ladda sidan" -#: ../src/midori-browser.c:258 +#: ../src/midori-browser.c:264 #, c-format msgid "%d%% loaded" msgstr "%d%% laddat" -#: ../src/midori-browser.c:521 ../src/midori-webview.c:253 +#: ../src/midori-browser.c:611 +msgid "Menubar" +msgstr "" + +#: ../src/midori-browser.c:612 +#, fuzzy +msgid "The menubar" +msgstr "Hemsida" + +#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +msgid "Navigationbar" +msgstr "Navigeringsfält" + +#: ../src/midori-browser.c:626 +#, fuzzy +msgid "The navigationbar" +msgstr "Navigeringsfält" + +#: ../src/midori-browser.c:639 +msgid "Tab" +msgstr "" + +#: ../src/midori-browser.c:640 +#, fuzzy +msgid "The current tab" +msgstr "Stäng den här tabben" + +#: ../src/midori-browser.c:653 +#, fuzzy +msgid "Statusbar" +msgstr "_Statusrad" + +#: ../src/midori-browser.c:654 +#, fuzzy +msgid "The statusbar" +msgstr "_Statusrad" + +#: ../src/midori-browser.c:670 +#, fuzzy +msgid "Settings" +msgstr "Typsnittinställningar" + +#: ../src/midori-browser.c:671 msgid "The associated settings" msgstr "De associerade inställningarna" -#: ../src/midori-browser.c:541 ../src/midori-webview.c:244 +#: ../src/midori-browser.c:690 +#, fuzzy +msgid "Statusbar Text" +msgstr "_Statusrad" + +#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 msgid "The text that is displayed in the statusbar" msgstr "Texten som visas i statusraden" -#: ../src/midori-browser.c:560 +#: ../src/midori-browser.c:709 +#, fuzzy +msgid "Trash" +msgstr "Visa _papperskorgen" + +#: ../src/midori-browser.c:710 msgid "The trash, collecting recently closed tabs and windows" msgstr "Soptunnan, samlar senast stängda tabbar och fönster" -#: ../src/midori-browser.c:1052 -msgid "Open location" -msgstr "Öppna plats" - -#: ../src/midori-browser.c:1064 ../src/midori-browser.c:1110 -msgid "_Location:" -msgstr "_Plats:" - -#. TODO: We should offer all of the search's features here -#: ../src/midori-browser.c:1098 -msgid "Web search" -msgstr "Webbsökning" - -#: ../src/midori-browser.c:1137 +#: ../src/midori-browser.c:1294 msgid "New bookmark" msgstr "Nytt bokmärke" -#: ../src/midori-browser.c:1137 +#: ../src/midori-browser.c:1294 msgid "Edit bookmark" msgstr "Redigera bokmärke" -#: ../src/midori-browser.c:1154 +#: ../src/midori-browser.c:1311 msgid "_Title:" msgstr "_Titel:" -#: ../src/midori-browser.c:1170 ../src/webSearch.c:199 +#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 msgid "_Description:" msgstr "_Beskrivning" -#: ../src/midori-browser.c:1189 ../src/webSearch.c:213 +#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1207 +#: ../src/midori-browser.c:1364 msgid "_Folder:" msgstr "_Mapp:" -#: ../src/midori-browser.c:1211 +#: ../src/midori-browser.c:1368 msgid "Root" msgstr "Rot" -#: ../src/midori-browser.c:1430 +#: ../src/midori-browser.c:1591 msgid "Separator" msgstr "Avskiljare" -#: ../src/midori-browser.c:1616 +#: ../src/midori-browser.c:1780 msgid "A lightweight web browser." msgstr "En liten webbläsare." -#: ../src/midori-browser.c:1624 +#: ../src/midori-browser.c:1788 msgid "translator-credits" msgstr "Mikael Magnusson " -#: ../src/midori-browser.c:1839 +#: ../src/midori-browser.c:2015 msgid "_File" msgstr "_Fil" -#: ../src/midori-browser.c:1842 +#: ../src/midori-browser.c:2018 msgid "Open a new window" msgstr "Öppna i nytt fönster" -#: ../src/midori-browser.c:1845 +#: ../src/midori-browser.c:2021 msgid "Open a new tab" msgstr "Öppna i ny tabb" -#: ../src/midori-browser.c:1848 +#: ../src/midori-browser.c:2024 msgid "Open a file" msgstr "Öppna en fil" -#: ../src/midori-browser.c:1851 +#: ../src/midori-browser.c:2027 msgid "Save to a file" msgstr "Spara till fil" -#: ../src/midori-browser.c:1853 +#: ../src/midori-browser.c:2029 msgid "_Close Tab" msgstr "_Stäng tabb" -#: ../src/midori-browser.c:1854 +#: ../src/midori-browser.c:2030 msgid "Close the current tab" msgstr "Stäng den här tabben" -#: ../src/midori-browser.c:1856 +#: ../src/midori-browser.c:2032 msgid "C_lose Window" msgstr "S_täng fönster" -#: ../src/midori-browser.c:1857 +#: ../src/midori-browser.c:2033 msgid "Close this window" msgstr "Stäng det här fönstret" -#: ../src/midori-browser.c:1859 +#: ../src/midori-browser.c:2035 msgid "Pa_ge Setup" msgstr "_Sidinställningar" -#: ../src/midori-browser.c:1869 +#: ../src/midori-browser.c:2045 msgid "Quit the application" msgstr "Avsluta programmet" -#: ../src/midori-browser.c:1871 +#: ../src/midori-browser.c:2047 msgid "_Edit" msgstr "_Redigera" -#: ../src/midori-browser.c:1874 +#: ../src/midori-browser.c:2050 msgid "Undo the last modification" msgstr "Ångra senaste ändringen" -#: ../src/midori-browser.c:1877 +#: ../src/midori-browser.c:2053 msgid "Redo the last modification" msgstr "Gör om senaste ändringen" -#: ../src/midori-browser.c:1883 ../src/midori-browser.c:1886 +#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 msgid "Copy the selected text" msgstr "Kopiera markerad text" -#: ../src/midori-browser.c:1889 +#: ../src/midori-browser.c:2065 msgid "Paste text from the clipboard" msgstr "Klistra in text från klippbordet" -#: ../src/midori-browser.c:1892 +#: ../src/midori-browser.c:2068 msgid "Delete the selected text" msgstr "Ta bort markerad text" -#: ../src/midori-browser.c:1895 +#: ../src/midori-browser.c:2071 msgid "Select all text" msgstr "Markera all text" -#: ../src/midori-browser.c:1903 +#: ../src/midori-browser.c:2079 msgid "Find _Next" msgstr "Hitta _nästa" -#: ../src/midori-browser.c:1906 +#: ../src/midori-browser.c:2082 msgid "Find _Previous" msgstr "Hitta _förra" -#: ../src/midori-browser.c:1909 +#: ../src/midori-browser.c:2085 msgid "_Quick Find" msgstr "_Snabbsök" -#: ../src/midori-browser.c:1915 +#: ../src/midori-browser.c:2091 msgid "_View" msgstr "_Visa" -#: ../src/midori-browser.c:1916 +#: ../src/midori-browser.c:2092 msgid "_Toolbars" msgstr "_Verktygsfält" -#: ../src/midori-browser.c:1936 +#: ../src/midori-browser.c:2112 msgid "View Source" msgstr "Visa källkod" -#: ../src/midori-browser.c:1939 +#: ../src/midori-browser.c:2115 msgid "View Selection Source" msgstr "Visa källkod för markering" -#: ../src/midori-browser.c:1943 +#: ../src/midori-browser.c:2119 msgid "Toggle fullscreen view" msgstr "Växla fullskärmsläge" -#: ../src/midori-browser.c:1945 +#: ../src/midori-browser.c:2121 msgid "_Go" msgstr "_Gå" -#: ../src/midori-browser.c:1956 +#: ../src/midori-browser.c:2132 msgid "Location..." msgstr "Plats..." -#: ../src/midori-browser.c:1959 +#: ../src/midori-browser.c:2135 msgid "Web Search..." msgstr "Webbsökning..." -#: ../src/midori-browser.c:1962 +#: ../src/midori-browser.c:2138 msgid "Open in Page_holder..." msgstr "Visa i sid_hållare..." -#: ../src/midori-browser.c:1965 +#: ../src/midori-browser.c:2141 msgid "Closed Tabs and Windows" msgstr "Stängda tabbar och fönster" -#: ../src/midori-browser.c:1966 +#: ../src/midori-browser.c:2142 msgid "Reopen a previously closed tab or window" msgstr "Öppna en tidigare stängd tabb eller fönster" -#: ../src/midori-browser.c:1968 +#: ../src/midori-browser.c:2144 msgid "Empty Trash" msgstr "Töm papperskorgen" -#: ../src/midori-browser.c:1971 +#: ../src/midori-browser.c:2147 msgid "Undo Close Tab" msgstr "Ångra stäng tabb" -#: ../src/midori-browser.c:1974 +#: ../src/midori-browser.c:2150 msgid "_Bookmarks" msgstr "_Bokmärken" -#: ../src/midori-browser.c:1979 +#: ../src/midori-browser.c:2155 msgid "_Manage Bookmarks" msgstr "_Hantera bokmärken" -#: ../src/midori-browser.c:1985 +#: ../src/midori-browser.c:2161 msgid "Open in New _Tab" msgstr "Öppna i ny _tabb" -#: ../src/midori-browser.c:1988 +#: ../src/midori-browser.c:2164 msgid "Open in New _Window" msgstr "Öppna i nytt _fönster" -#: ../src/midori-browser.c:1997 +#: ../src/midori-browser.c:2173 msgid "_Tools" msgstr "_Verktyg" -#: ../src/midori-browser.c:1999 +#: ../src/midori-browser.c:2175 msgid "_Manage Search Engines" msgstr "_Hantera sökmotorer" -#: ../src/midori-browser.c:2000 +#: ../src/midori-browser.c:2176 msgid "Add, edit and remove search engines..." msgstr "Lägg till, ändra och ta bort sökmotorer..." -#: ../src/midori-browser.c:2003 +#: ../src/midori-browser.c:2179 msgid "_Window" msgstr "_Fönster" -#: ../src/midori-browser.c:2005 +#: ../src/midori-browser.c:2181 msgid "_Previous Tab" msgstr "_Föregående tabb" -#: ../src/midori-browser.c:2008 +#: ../src/midori-browser.c:2184 msgid "_Next Tab" msgstr "_Nästa tabb" -#: ../src/midori-browser.c:2011 +#: ../src/midori-browser.c:2187 msgid "Tab _Overview" msgstr "Tabbö_versikt" #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2014 +#: ../src/midori-browser.c:2190 msgid "_Help" msgstr "_Hjälp" -#: ../src/midori-browser.c:2016 +#: ../src/midori-browser.c:2192 msgid "_Contents" msgstr "_Innehåll" -#: ../src/midori-browser.c:2026 +#: ../src/midori-browser.c:2202 msgid "P_rivate Browsing" msgstr "P_rivat läge" -#: ../src/midori-browser.c:2030 +#: ../src/midori-browser.c:2206 msgid "_Work Offline" msgstr "_Arbeta offline" -#: ../src/midori-browser.c:2035 +#: ../src/midori-browser.c:2211 msgid "_Navigationbar" msgstr "_Navigationsfält" -#: ../src/midori-browser.c:2039 +#: ../src/midori-browser.c:2215 msgid "Side_panel" msgstr "Sido_panel" -#: ../src/midori-browser.c:2043 +#: ../src/midori-browser.c:2219 msgid "_Bookmarkbar" msgstr "_Bokmärkesfält" -#: ../src/midori-browser.c:2047 +#: ../src/midori-browser.c:2223 msgid "_Transferbar" msgstr "Ö_verföringsfält" -#: ../src/midori-browser.c:2051 +#: ../src/midori-browser.c:2227 msgid "_Statusbar" msgstr "_Statusrad" -#: ../src/midori-browser.c:2521 +#: ../src/midori-browser.c:2681 msgid "Bookmarks" msgstr "Bokmärken" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2531 ../src/prefs.c:381 +#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 msgid "Transfers" msgstr "Överföringar" -#: ../src/midori-browser.c:2540 +#: ../src/midori-browser.c:2697 msgid "Console" msgstr "Konsol" -#: ../src/midori-browser.c:2549 ../src/prefs.c:669 +#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 msgid "History" msgstr "Historia" -#: ../src/midori-browser.c:2558 +#: ../src/midori-browser.c:2713 msgid "Pageholder" msgstr "Sidhållare" -#: ../src/midori-browser.c:2580 +#: ../src/midori-browser.c:2722 +#, fuzzy +msgid "Userscripts" +msgstr "Aktivera _skript" + +#: ../src/midori-browser.c:2748 msgid "_Inline find:" msgstr "_Snabbsökning:" -#: ../src/midori-browser.c:2606 +#: ../src/midori-browser.c:2774 msgid "Match Case" msgstr "_Gör skillnad på skiftläge" -#: ../src/midori-browser.c:2623 +#: ../src/midori-browser.c:2791 msgid "Close Findbar" msgstr "Stäng sökfältet" -#: ../src/midori-panel.c:140 +#: ../src/midori-browser.c:2815 +msgid "Extensions" +msgstr "" + +#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#, fuzzy, c-format +msgid "Unexpected setting '%s'" +msgstr "Avancerade inställningar" + +#: ../src/midori-browser.c:3278 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../src/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Utseende på skuggan runt varje panel" -#: ../src/midori-panel.c:150 +#: ../src/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Meny för att visa panelföremål" -#: ../src/midori-panel.c:159 +#: ../src/midori-panel.c:166 msgid "The index of the current page" msgstr "Indexet för nuvarande sida" -#: ../src/midori-panel.c:203 ../src/midori-panel.c:204 +#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 msgid "Close panel" msgstr "Stäng panel" -#: ../src/midori-panel.c:368 +#: ../src/midori-panel.c:391 msgid "Untitled" msgstr "Namnlös" @@ -470,18 +559,414 @@ msgstr "Namnlös" msgid "The maximum number of items" msgstr "Maximalt antal föremål" -#: ../src/midori-websettings.c:69 +#: ../src/midori-websettings.c:130 +#, fuzzy +msgid "Blank page" +msgstr "Tom sida" + +#: ../src/midori-websettings.c:132 +#, fuzzy +msgid "Last open pages" +msgstr "Senaste öppna sidor" + +#: ../src/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Kinesiska (BIG5)" + +#: ../src/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanska (SHIFT_JIS)" + +#: ../src/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Ryska (KOI8-R)" + +#: ../src/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../src/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Västerländsk (ISO-8859-1)" + +#: ../src/midori-websettings.c:152 +msgid "Custom..." +msgstr "" + +#: ../src/midori-websettings.c:167 +msgid "New tab" +msgstr "Ny tabb" + +#: ../src/midori-websettings.c:168 +msgid "New window" +msgstr "Nytt fönster" + +#: ../src/midori-websettings.c:169 +msgid "Current tab" +msgstr "Nuvarande tabb" + +#: ../src/midori-websettings.c:184 +msgid "Default" +msgstr "Standard" + +#: ../src/midori-websettings.c:185 +msgid "Icons" +msgstr "Ikoner" + +#: ../src/midori-websettings.c:186 +msgid "Text" +msgstr "Text" + +#: ../src/midori-websettings.c:187 +msgid "Both" +msgstr "Både och" + +#: ../src/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Båda horisontellt" + +#: ../src/midori-websettings.c:203 +msgid "All cookies" +msgstr "Alla kakor" + +#: ../src/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Sessionskakor" + +#: ../src/midori-websettings.c:205 +msgid "None" +msgstr "Inga" + +#: ../src/midori-websettings.c:247 +#, fuzzy +msgid "Remember last window size" +msgstr "Kom ihåg mina nerladdade filer" + +#: ../src/midori-websettings.c:248 +msgid "Whether to save the last window size" +msgstr "" + +#: ../src/midori-websettings.c:256 +msgid "Last window width" +msgstr "" + +#: ../src/midori-websettings.c:257 +msgid "The last saved window width" +msgstr "" + +#: ../src/midori-websettings.c:265 +msgid "Last window height" +msgstr "" + +#: ../src/midori-websettings.c:266 +msgid "The last saved window height" +msgstr "" + +#: ../src/midori-websettings.c:274 +msgid "Last panel position" +msgstr "" + +#: ../src/midori-websettings.c:275 +msgid "The last saved panel position" +msgstr "" + +#: ../src/midori-websettings.c:283 +#, fuzzy +msgid "Last panel page" +msgstr "Senaste öppna sidor" + +#: ../src/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "" + +#: ../src/midori-websettings.c:292 +#, fuzzy +msgid "Last Web search" +msgstr "Webbsökning" + +#: ../src/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "" + +#: ../src/midori-websettings.c:301 +#, fuzzy +msgid "Last pageholder URI" +msgstr "Sidhållare" + +#: ../src/midori-websettings.c:302 +msgid "The URI last opened in the pageholder" +msgstr "" + +#: ../src/midori-websettings.c:312 +#, fuzzy +msgid "Show Navigationbar" +msgstr "Navigeringsfält" + +#: ../src/midori-websettings.c:313 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../src/midori-websettings.c:321 +#, fuzzy +msgid "Show Bookmarkbar" +msgstr "_Bokmärkesfält" + +#: ../src/midori-websettings.c:322 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../src/midori-websettings.c:330 +msgid "Show Panel" +msgstr "" + +#: ../src/midori-websettings.c:331 +#, fuzzy +msgid "Whether to show the panel" +msgstr "Ifall aktivitetssymbolen ska animeras" + +#: ../src/midori-websettings.c:339 +#, fuzzy +msgid "Show Statusbar" +msgstr "_Statusrad" + +#: ../src/midori-websettings.c:340 +#, fuzzy +msgid "Whether to show the statusbar" +msgstr "Texten som visas i statusraden" + +#: ../src/midori-websettings.c:349 +#, fuzzy +msgid "Toolbar Style" +msgstr "S_til för verktygsfält" + +#: ../src/midori-websettings.c:350 +msgid "The style of the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:359 +msgid "Small toolbar" +msgstr "" + +#: ../src/midori-websettings.c:360 +#, fuzzy +msgid "Use small toolbar icons" +msgstr "Visa små _ikoner" + +#: ../src/midori-websettings.c:368 +#, fuzzy +msgid "Show New Tab" +msgstr "Visa _ny tabb" + +#: ../src/midori-websettings.c:369 +msgid "Show the New Tab button in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:377 +#, fuzzy +msgid "Show Web search" +msgstr "Visa webb_sökning" + +#: ../src/midori-websettings.c:378 +msgid "Show the Web search entry in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:386 +#, fuzzy +msgid "Show Trash" +msgstr "Visa _papperskorgen" + +#: ../src/midori-websettings.c:387 +msgid "Show the Trash button in the toolbar" +msgstr "" + +#: ../src/midori-websettings.c:397 +#, fuzzy +msgid "Load on Startup" +msgstr "Ladda vid uppstart" + +#: ../src/midori-websettings.c:398 +#, fuzzy +msgid "What to load on startup" +msgstr "Ladda vid uppstart" + +#: ../src/midori-websettings.c:408 +#, fuzzy +msgid "The homepage" +msgstr "Hemsida" + +#: ../src/midori-websettings.c:416 +#, fuzzy +msgid "Download Folder" +msgstr "Nedladdningsmapp" + +#: ../src/midori-websettings.c:417 +#, fuzzy +msgid "The folder downloaded files are saved to" +msgstr "Välj nedladdningsmapp" + +#: ../src/midori-websettings.c:425 +msgid "Show Download Notification" +msgstr "" + +#: ../src/midori-websettings.c:426 +#, fuzzy +msgid "Show a notification window for finished downloads" +msgstr "Visa ett notifieringsfönster för avslutade överföringar" + +#: ../src/midori-websettings.c:434 +#, fuzzy +msgid "Location entry Search" +msgstr "Sökmotor för _addressfältet" + +#: ../src/midori-websettings.c:435 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../src/midori-websettings.c:443 +#, fuzzy +msgid "Preferred Encoding" +msgstr "Föredragna språk" + +#: ../src/midori-websettings.c:444 +msgid "The preferred character encoding" +msgstr "" + +#: ../src/midori-websettings.c:455 +#, fuzzy +msgid "Tab Label Size" +msgstr "Ta_bbstorlek" + +#: ../src/midori-websettings.c:456 msgid "The desired tab label size" msgstr "Önskad storlek på tabbetikett" -#: ../src/midori-websettings.c:78 +#: ../src/midori-websettings.c:464 +#, fuzzy +msgid "Close Buttons on Tabs" +msgstr "Stäng_knappar på tabbar" + +#: ../src/midori-websettings.c:465 msgid "Whether tabs have close buttons" msgstr "Ifall tabbar har stängknappar" -#: ../src/midori-websettings.c:87 +#: ../src/midori-websettings.c:473 +#, fuzzy +msgid "Open new pages in" +msgstr "Öppna _nya sidor i" + +#: ../src/midori-websettings.c:474 +#, fuzzy +msgid "Where to open new pages" +msgstr "Öppna _nya sidor i" + +#: ../src/midori-websettings.c:483 +#, fuzzy +msgid "Middle click opens Selection" +msgstr "_Mittenklick öppnar markering" + +#: ../src/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Ladda en URL från markeringen via mittenklick" +#: ../src/midori-websettings.c:492 +#, fuzzy +msgid "Open tabs in the background" +msgstr "Öppna tabbar i _bakgrunden" + +#: ../src/midori-websettings.c:493 +#, fuzzy +msgid "Whether to open new tabs in the background" +msgstr "Öppna tabbar i _bakgrunden" + +#: ../src/midori-websettings.c:501 +#, fuzzy +msgid "Open popups in tabs" +msgstr "Öppna popups i _tabbar" + +#: ../src/midori-websettings.c:502 +#, fuzzy +msgid "Whether to open popup windows in tabs" +msgstr "Öppna popups i _tabbar" + +#: ../src/midori-websettings.c:512 +msgid "Accept cookies" +msgstr "Acceptera kakor" + +#: ../src/midori-websettings.c:513 +msgid "What type of cookies to accept" +msgstr "" + +#: ../src/midori-websettings.c:522 +msgid "Original cookies only" +msgstr "" + +#: ../src/midori-websettings.c:523 +#, fuzzy +msgid "Accept cookies from the original website only" +msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" + +#: ../src/midori-websettings.c:531 +msgid "Maximum cookie age" +msgstr "Maximal kakålder" + +#: ../src/midori-websettings.c:532 +#, fuzzy +msgid "The maximum number of days to save cookies for" +msgstr "Maximalt antal föremål" + +#: ../src/midori-websettings.c:542 +#, fuzzy +msgid "Remember last visited pages" +msgstr "Kom ihåg mina besökta sidor" + +#: ../src/midori-websettings.c:543 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../src/midori-websettings.c:551 +#, fuzzy +msgid "Maximum history age" +msgstr "Maximal kakålder" + +#: ../src/midori-websettings.c:552 +#, fuzzy +msgid "The maximum number of days to save the history for" +msgstr "Maximalt antal föremål" + +#: ../src/midori-websettings.c:560 +#, fuzzy +msgid "Remember last form inputs" +msgstr "Kom ihåg vad jag fyllt i fält med" + +#: ../src/midori-websettings.c:561 +msgid "Whether the last form inputs are saved" +msgstr "" + +#: ../src/midori-websettings.c:569 +#, fuzzy +msgid "Remember last downloaded files" +msgstr "Kom ihåg mina nerladdade filer" + +#: ../src/midori-websettings.c:570 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../src/midori-websettings.c:580 +msgid "HTTP Proxy" +msgstr "" + +#: ../src/midori-websettings.c:581 +msgid "The proxy used for HTTP connections" +msgstr "" + +#: ../src/midori-websettings.c:589 +msgid "Cache size" +msgstr "Cache-storlek" + +#: ../src/midori-websettings.c:590 +msgid "The allowed size of the cache" +msgstr "" + #: ../src/midori-webview.c:217 msgid "The icon of the currently loaded page" msgstr "Ikonen för den laddade sidan" @@ -494,416 +979,116 @@ msgstr "URIn för den laddade sidan" msgid "The title of the currently loaded page" msgstr "Titeln för den laddade sidan" -#: ../src/midori-webview.c:472 +#: ../src/midori-webview.c:471 msgid "Open Link in New _Tab" msgstr "Öppna länk i ny _tabb" -#: ../src/midori-webview.c:495 +#: ../src/midori-webview.c:494 msgid "Open URL in New _Tab" msgstr "Öppna URL i ny _tabb" -#: ../src/prefs.c:299 +#: ../src/midori-preferences.c:64 +msgid "Settings instance to provide properties" +msgstr "" + +#: ../src/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "%s inställningar" #. Page "General" -#: ../src/prefs.c:363 +#: ../src/midori-preferences.c:239 msgid "General" msgstr "Allmänt" -#: ../src/prefs.c:364 +#: ../src/midori-preferences.c:240 msgid "Startup" msgstr "Uppstart" -#: ../src/prefs.c:366 -msgid "Load on startup" -msgstr "Ladda vid uppstart" - -#: ../src/prefs.c:369 -msgid "Blank page" -msgstr "Tom sida" - -#: ../src/prefs.c:369 -msgid "Last open pages" -msgstr "Senaste öppna sidor" - -#: ../src/prefs.c:383 -msgid "Download folder" -msgstr "Nedladdningsmapp" - -#: ../src/prefs.c:385 -msgid "Choose downloaded files folder" -msgstr "Välj nedladdningsmapp" - -#: ../src/prefs.c:392 -msgid "Show a notification window for finished transfers" -msgstr "Visa ett notifieringsfönster för avslutade överföringar" - -#: ../src/prefs.c:395 -msgid "Languages" -msgstr "Språk" - -#: ../src/prefs.c:397 -msgid "Preferred languages" -msgstr "Föredragna språk" - #. Page "Appearance" -#: ../src/prefs.c:409 +#: ../src/midori-preferences.c:261 msgid "Appearance" msgstr "Utseende" -#: ../src/prefs.c:410 +#: ../src/midori-preferences.c:262 msgid "Font settings" msgstr "Typsnittinställningar" -#: ../src/prefs.c:412 -msgid "Default _font" -msgstr "Standard_typsnitt" - -#: ../src/prefs.c:419 -msgid "_Minimum font size" -msgstr "_Minimal typsnittstorlek" - -#: ../src/prefs.c:426 -msgid "_Advanced" -msgstr "_Avancerat" - -#: ../src/prefs.c:430 -msgid "Default _encoding" -msgstr "Standard_kodning" - -#: ../src/prefs.c:433 -msgid "Chinese (BIG5)" -msgstr "Kinesiska (BIG5)" - -#: ../src/prefs.c:433 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japanska (SHIFT_JIS)" - -#: ../src/prefs.c:433 -msgid "Russian (KOI8-R)" -msgstr "Ryska (KOI8-R)" - -#: ../src/prefs.c:434 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../src/prefs.c:434 -msgid "Western (ISO-8859-1)" -msgstr "Västerländsk (ISO-8859-1)" - -#: ../src/prefs.c:449 -msgid "Advanced settings" -msgstr "Avancerade inställningar" - -#: ../src/prefs.c:452 -msgid "Default colors" -msgstr "Standardfärger" - -#: ../src/prefs.c:454 -msgid "Text color" -msgstr "Textfärger" - -#: ../src/prefs.c:458 -msgid "Background color" -msgstr "Bakgrundsfärg" - -#: ../src/prefs.c:462 -msgid "Link color" -msgstr "Länkfärg" - -#: ../src/prefs.c:466 -msgid "Visited link color" -msgstr "Färg för besökta länkar" - #. Page "Behavior" -#: ../src/prefs.c:472 +#: ../src/midori-preferences.c:283 msgid "Behavior" msgstr "Beteende" -#: ../src/prefs.c:473 -msgid "Browsing" -msgstr "Bläddring" - -#: ../src/prefs.c:475 -msgid "Open _new pages in" -msgstr "Öppna _nya sidor i" - -#: ../src/prefs.c:478 -msgid "New tab" -msgstr "Ny tabb" - -#: ../src/prefs.c:478 -msgid "New window" -msgstr "Nytt fönster" - -#: ../src/prefs.c:478 -msgid "Current tab" -msgstr "Nuvarande tabb" - -#: ../src/prefs.c:483 -msgid "_Middle click opens selection" -msgstr "_Mittenklick öppnar markering" - -#: ../src/prefs.c:488 -msgid "Open tabs in the _background" -msgstr "Öppna tabbar i _bakgrunden" - -#: ../src/prefs.c:493 -msgid "Open popups in _tabs" -msgstr "Öppna popups i _tabbar" - -#: ../src/prefs.c:499 +#: ../src/midori-preferences.c:284 msgid "Features" msgstr "Funktioner" -#: ../src/prefs.c:501 -msgid "Load _images" -msgstr "Ladda b_ilder" - -#: ../src/prefs.c:506 -msgid "_Shrink images to fit" -msgstr "Min_ska bilder för att få plats" - -#: ../src/prefs.c:511 -msgid "Print _backgrounds" -msgstr "Skriv ut _bakgrunder" - -#: ../src/prefs.c:516 -msgid "_Resizable textareas" -msgstr "Sto_rleken går att ändra på textrutor" - -#: ../src/prefs.c:521 -msgid "Enable _scripts" -msgstr "Aktivera _skript" - -#: ../src/prefs.c:526 -msgid "Enable _plugins" -msgstr "Aktivera _insticksmoduler" - -#: ../src/prefs.c:531 -msgid "_User Stylesheet" -msgstr "Användarformatmall" - -#: ../src/prefs.c:537 -msgid "Choose user stylesheet" -msgstr "Välj användarformatmall" - #. Page "Interface" -#: ../src/prefs.c:546 +#: ../src/midori-preferences.c:316 msgid "Interface" msgstr "Gränssnitt" -#: ../src/prefs.c:547 -msgid "Navigationbar" -msgstr "Navigeringsfält" - -#: ../src/prefs.c:549 -msgid "_Toolbar style" -msgstr "S_til för verktygsfält" - -#: ../src/prefs.c:552 -msgid "Default" -msgstr "Standard" - -#: ../src/prefs.c:552 -msgid "Icons" -msgstr "Ikoner" - -#: ../src/prefs.c:552 -msgid "Text" -msgstr "Text" - -#: ../src/prefs.c:552 -msgid "Both" -msgstr "Både och" - -#: ../src/prefs.c:552 -msgid "Both horizontal" -msgstr "Båda horisontellt" - -#: ../src/prefs.c:557 -msgid "Show small _icons" -msgstr "Visa små _ikoner" - -#: ../src/prefs.c:562 -msgid "Show Web_search" -msgstr "Visa webb_sökning" - -#: ../src/prefs.c:567 -msgid "Show _New Tab" -msgstr "Visa _ny tabb" - -#: ../src/prefs.c:572 -msgid "Show _Trash" -msgstr "Visa _papperskorgen" - -#: ../src/prefs.c:577 -msgid "Miscellaneous" -msgstr "Diverse" - -#: ../src/prefs.c:579 -msgid "Close _buttons on tabs" -msgstr "Stäng_knappar på tabbar" - -#: ../src/prefs.c:586 -msgid "Tab Si_ze" -msgstr "Ta_bbstorlek" - -#: ../src/prefs.c:593 -msgid "_Location search engine" -msgstr "Sökmotor för _addressfältet" +#: ../src/midori-preferences.c:330 +msgid "Browsing" +msgstr "Bläddring" #. Page "Network" -#: ../src/prefs.c:601 +#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 msgid "Network" msgstr "Nätverk" -#: ../src/prefs.c:602 -msgid "Proxy Server" -msgstr "Proxyserver" - -#: ../src/prefs.c:604 -msgid "_Custom proxy server" -msgstr "_Anpassad proxyserver" - -#: ../src/prefs.c:608 -msgid "_Host/ Port" -msgstr "_Server/ Port" - -#: ../src/prefs.c:617 -msgid "Proxy requires authentication" -msgstr "Proxy kräver autentisering" - -#: ../src/prefs.c:621 -msgid "Username" -msgstr "Användarnamn" - -#: ../src/prefs.c:625 -msgid "Password" -msgstr "Lösenord" - -#: ../src/prefs.c:629 -msgid "Cache" -msgstr "Cache" - -#: ../src/prefs.c:631 -msgid "Cache size" -msgstr "Cache-storlek" - -#: ../src/prefs.c:637 +#: ../src/midori-preferences.c:358 msgid "MB" msgstr "MB" -#: ../src/prefs.c:638 -msgid "Clear cache" -msgstr "Rensa cache" - #. Page "Privacy" -#: ../src/prefs.c:644 +#: ../src/midori-preferences.c:363 msgid "Privacy" msgstr "Sekretess" -#: ../src/prefs.c:645 -msgid "Cookies" +#: ../src/midori-preferences.c:364 +#, fuzzy +msgid "Web Cookies" msgstr "Kakor" -#: ../src/prefs.c:647 -msgid "Accept cookies" -msgstr "Acceptera kakor" - -#: ../src/prefs.c:650 -msgid "All cookies" -msgstr "Alla kakor" - -#: ../src/prefs.c:650 -msgid "Session cookies" -msgstr "Sessionskakor" - -#: ../src/prefs.c:650 -msgid "None" -msgstr "Inga" - -#: ../src/prefs.c:655 -msgid "Allow cookies from the original website only" -msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" - -#: ../src/prefs.c:658 -msgid "Maximum cookie age" -msgstr "Maximal kakålder" - -#: ../src/prefs.c:664 ../src/prefs.c:679 +#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 msgid "days" msgstr "dagar" -#: ../src/prefs.c:665 -msgid "View cookies" -msgstr "Visa kakor" - -#: ../src/prefs.c:671 -msgid "Remember my visited pages" -msgstr "Kom ihåg mina besökta sidor" - -#: ../src/prefs.c:682 -msgid "Remember my form inputs" -msgstr "Kom ihåg vad jag fyllt i fält med" - -#: ../src/prefs.c:686 -msgid "Remember my downloaded files" -msgstr "Kom ihåg mina nerladdade filer" - -#. Page "Programs" -#: ../src/prefs.c:691 -msgid "Programs" -msgstr "Program" - -#: ../src/prefs.c:692 -msgid "External programs" -msgstr "Externa program" - -#: ../src/prefs.c:703 -msgid "Protocol" -msgstr "Protokoll" - -#: ../src/prefs.c:706 -msgid "Command" -msgstr "Kommando" - -#: ../src/sokoke.c:157 +#: ../src/sokoke.c:295 msgid "Warning: You are using a superuser account!" msgstr "Varning: Du använder ett administratörskonto!" -#: ../src/sokoke.c:267 ../katze/katze-xbel.c:952 +#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 #, c-format msgid "Writing failed." msgstr "Kunde inte skriva." -#: ../src/webSearch.c:82 +#: ../src/webSearch.c:115 msgid "Empty" msgstr "Tom" -#: ../src/webSearch.c:153 +#: ../src/webSearch.c:187 msgid "Add search engine" msgstr "Lägg till sökmotor" -#: ../src/webSearch.c:153 +#: ../src/webSearch.c:187 msgid "Edit search engine" msgstr "Redigera sökmotor" -#: ../src/webSearch.c:183 +#: ../src/webSearch.c:217 msgid "_Name:" msgstr "_Namn:" -#: ../src/webSearch.c:227 +#: ../src/webSearch.c:261 msgid "_Icon (name or file):" msgstr "_Ikon (namn eller fil):" -#: ../src/webSearch.c:241 +#: ../src/webSearch.c:275 msgid "_Keyword:" msgstr "_Nyckelord:" -#: ../src/webSearch.c:310 +#: ../src/webSearch.c:344 msgid "Manage search engines" msgstr "Hantera sökmotorer" @@ -935,14 +1120,26 @@ msgstr "En GdkPixbuf att använda som statisk bild" msgid "The stock ID of an icon to be used as the static image" msgstr "Katalog-ID för en ikon att använda som statisk bild" +#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:161 +#, fuzzy +msgid "Choose folder" +msgstr "Nedladdningsmapp" + #: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 #: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 #: ../katze/katze-xbel.c:804 -#, c-format msgid "Malformed document." msgstr "Felaktigt dokument." #: ../katze/katze-xbel.c:759 -#, c-format msgid "File not found." msgstr "Fil saknas." From 750d9d5b017ad00d22d125e09a1b7d86e23f0e4c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 May 2008 19:31:44 +0200 Subject: [PATCH 0095/2970] Bump version to 0.0.18 --- ChangeLog | 16 ++++++++++++++++ configure.in | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee9e4942..379655e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +v0.0.18: + + First attempt at userscripts and extensions. + + Show hidden location/ web search temporarily when needed. + + Turn prefs into MidoriPreferences + + Fix background tabs, strings and new tab focus. + + Switch configuration to MidoriWebSettings. + + Remove 'External programs' logic + + Append the closed tabs items as a proper submenu. + + The location is empty and focused by default + + Implement proper menu positioning. + + Implement the Console panel for script messages. + + Implement localization via Gettext. + + Initial refactoring work, regressions expected + + Build fix: Webkit's header and pkgconfig name have changed. + + Implement Fullscreen mode + v0.0.17: + Add a preference to choose a user stylesheet. + Implement a few preferences with new settings API in WebKit diff --git a/configure.in b/configure.in index b495ffd4..c21df45a 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.17], [christian@twotoasts.de]) +AC_INIT([midori], [0.0.18], [christian@twotoasts.de]) AC_CONFIG_SRCDIR([src/main.h]) AC_CONFIG_HEADER([config.h]) From 4a829b0ab0bc2c825b74582d27bc92b6b628a486 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 6 May 2008 00:51:04 +0200 Subject: [PATCH 0096/2970] Make javascript gobject bindings independant. Moving the bindings into a single file makes them independant of addons and midori, requiring only JavaScriptCore and GObject. This allows for standalone scripts to run independant from Midori itself. Also extensions will run independant from a browser instance. This change removes the 'midori' object. --- src/Makefile.am | 1 + src/gjs.c | 399 ++++++++++++++++++++++++++++++++++ src/gjs.h | 47 ++++ src/main.c | 38 ++++ src/midori-addons.c | 506 ++------------------------------------------ 5 files changed, 507 insertions(+), 484 deletions(-) create mode 100644 src/gjs.c create mode 100644 src/gjs.h diff --git a/src/Makefile.am b/src/Makefile.am index 82208d26..dee2ba7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,5 +27,6 @@ midori_SOURCES = \ midori-websettings.c midori-websettings.h \ midori-preferences.c midori-preferences.h \ webSearch.c webSearch.h \ + gjs.c gjs.h \ sokoke.c sokoke.h \ search.c search.h diff --git a/src/gjs.c b/src/gjs.c new file mode 100644 index 00000000..f7e2320e --- /dev/null +++ b/src/gjs.c @@ -0,0 +1,399 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "gjs.h" + +#include + +#define G_OBJECT_NAME(object) G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) + +// FIXME: Return a GValue +JSValueRef +gjs_script_eval (JSContextRef js_context, + const gchar* script, + gchar** exception) +{ + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSValueRef js_exception = NULL; + JSValueRef js_value = JSEvaluateScript (js_context, js_script, + JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); + if (!js_value && exception) + { + JSStringRef js_message = JSValueToStringCopy (js_context, + js_exception, NULL); + *exception = gjs_string_utf8 (js_message); + JSStringRelease (js_message); + js_value = JSValueMakeNull (js_context); + } + JSStringRelease (js_script); + return js_value; +} + +gboolean +gjs_script_check_syntax (JSContextRef js_context, + const gchar* script, + gchar** exception) +{ + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSValueRef js_exception = NULL; + bool result = JSCheckScriptSyntax (js_context, js_script, NULL, + 0, &js_exception); + if (!result && exception) + { + JSStringRef js_message = JSValueToStringCopy (js_context, + js_exception, NULL); + *exception = gjs_string_utf8 (js_message); + JSStringRelease (js_message); + } + JSStringRelease (js_script); + return result ? TRUE : FALSE; +} + +gboolean +gjs_script_from_file (JSContextRef js_context, + const gchar* filename, + gchar** exception) +{ + gboolean result = FALSE; + gchar* script; + GError* error = NULL; + if (g_file_get_contents (filename, &script, NULL, &error)) + { + if (gjs_script_eval (js_context, script, exception)) + result = TRUE; + g_free (script); + } + else + { + *exception = g_strdup (error->message); + g_error_free (error); + } + return result; +} + +gchar* +gjs_string_utf8 (JSStringRef js_string) +{ + size_t size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); + gchar* string_utf8 = g_new (gchar, size_utf8); + JSStringGetUTF8CString (js_string, string_utf8, size_utf8); + return string_utf8; +} + +static void +_js_class_get_property_names_cb (JSContextRef js_context, + JSObjectRef js_object, + JSPropertyNameAccumulatorRef js_properties) +{ + GObject* object = JSObjectGetPrivate (js_object); + if (object) + { + guint n_properties; + GParamSpec** pspecs = g_object_class_list_properties ( + G_OBJECT_GET_CLASS (object), &n_properties); + gint i; + for (i = 0; i < n_properties; i++) + { + const gchar* property = g_param_spec_get_name (pspecs[i]); + JSStringRef js_property = JSStringCreateWithUTF8CString (property); + JSPropertyNameAccumulatorAddName (js_properties, js_property); + JSStringRelease (js_property); + } + } +} + +static bool +_js_class_has_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property) +{ + bool result = false; + gchar* property = gjs_string_utf8 (js_property); + GObject* object = JSObjectGetPrivate (js_object); + if (object) + { + if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), + property)) + result = true; + } + else if (js_object == JSContextGetGlobalObject (js_context)) + { + GType type = g_type_from_name (property); + result = type ? type : false; + } + g_free (property); + return result; +} + +static void +_js_object_set_property (JSContextRef js_context, + JSObjectRef js_object, + const gchar* name, + JSValueRef js_value) +{ + JSStringRef js_name = JSStringCreateWithUTF8CString (name); + JSObjectSetProperty(js_context, js_object, js_name, js_value, + kJSPropertyAttributeNone, NULL); + JSStringRelease (js_name); +} + +static JSObjectRef +_js_object_call_as_constructor_cb (JSContextRef js_context, + JSObjectRef js_object, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) +{ + gchar* type_name = JSObjectGetPrivate (js_object); + if (type_name) + { + GType type = g_type_from_name (type_name); + if (type) + return gjs_object_new (js_context, g_object_new (type, NULL)); + } + return JSValueMakeNull (js_context); +} + +static JSValueRef +_js_class_get_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef* js_exception) +{ + if (js_object == JSContextGetGlobalObject (js_context)) + { + gchar* property = gjs_string_utf8 (js_property); + GType type = g_type_from_name (property); + if (type) + { + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (property); + js_class_def.callAsConstructor = _js_object_call_as_constructor_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + return JSObjectMake (js_context, js_class, property); + } + g_free (property); + return JSValueMakeNull (js_context); + } + GObject* object = JSObjectGetPrivate (js_object); + JSValueRef js_result = NULL; + if (object) + { + gchar* property = gjs_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) + { + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + g_free (property); + return JSValueMakeNull (js_context); + } + if (!(pspec->flags & G_PARAM_READABLE)) + { + g_free (property); + return JSValueMakeUndefined (js_context); + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + gchar* value; + g_object_get (object, property, &value, NULL); + if (value) + { + JSStringRef js_string = JSStringCreateWithUTF8CString (value); + js_result = JSValueMakeString (js_context, js_string); + } + } + else if (type == G_TYPE_PARAM_INT + || type == G_TYPE_PARAM_UINT) + { + gint value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeNumber (js_context, value); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeBoolean (js_context, value ? true : false); + } + else if (type == G_TYPE_PARAM_OBJECT) + { + GObject* value; + g_object_get (object, property, &value, NULL); + if (value) + js_result = gjs_object_new (js_context, value); + } + else if (type == G_TYPE_PARAM_ENUM) + { + gint value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeNumber (js_context, value); + } + else + js_result = JSValueMakeUndefined (js_context); + g_free (property); + } + return js_result ? js_result : JSValueMakeNull (js_context); +} + +static bool +_js_class_set_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef js_value, + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_object); + bool result = false; + if (object) + { + gchar* property = gjs_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) + { + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + g_free (property); + return false; + } + if (!(pspec->flags & G_PARAM_WRITABLE)) + { + g_free (property); + return false; + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + JSStringRef js_string_value = JSValueToStringCopy (js_context, + js_value, js_exception); + if (js_string_value) + { + gchar* string_value = gjs_string_utf8 (js_string_value); + g_object_set (object, property, string_value, NULL); + g_free (string_value); + } + } + else if (type == G_TYPE_PARAM_INT + || type == G_TYPE_PARAM_UINT) + { + int value = JSValueToNumber (js_context, js_value, + js_exception); + g_object_set (object, property, value, NULL); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + bool value = JSValueToBoolean (js_context, js_value); + g_object_set (object, property, value ? TRUE : FALSE, NULL); + } + else if (type == G_TYPE_PARAM_OBJECT) + { + JSObjectRef js_object_value = JSValueToObject ( + js_context, js_value, NULL); + GObject* object_value = JSObjectGetPrivate (js_object_value); + if (object_value) + g_object_set (object, property, object_value, NULL); + else + { + gchar* message = g_strdup_printf (_("%s cannot be assigned to %s.%s"), + "[object]", G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + } + else + { + gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), + G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + g_free (property); + } + return result; +} + +static JSValueRef +_js_object_call_as_function_cb (JSContextRef js_context, + JSObjectRef js_function, + JSObjectRef js_this, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_this); + if (object) + { + if (!n_arguments) + { + gtk_widget_show (GTK_WIDGET (object)); + } + else if (n_arguments == 1) + { + JSObjectRef js_arg1 = JSValueToObject ( + js_context, js_arguments[0], NULL); + GObject* arg1 = JSObjectGetPrivate (js_arg1); + if (arg1) + gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); + } + } + + return JSValueMakeUndefined (js_context); +} + +static void +_js_object_add_function (JSContextRef js_context, + JSObjectRef js_object, + const gchar* func) +{ + JSStringRef js_func = JSStringCreateWithUTF8CString (func); + JSObjectRef js_function = JSObjectMakeFunctionWithCallback ( + js_context, js_func, _js_object_call_as_function_cb); + JSStringRelease (js_func); + _js_object_set_property (js_context, js_object, func, js_function); +} + +JSObjectRef +gjs_object_new (JSContextRef js_context, + gpointer instance) +{ + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (G_OBJECT_NAME (instance)); + js_class_def.getPropertyNames = _js_class_get_property_names_cb; + js_class_def.hasProperty = _js_class_has_property_cb; + js_class_def.getProperty = _js_class_get_property_cb; + js_class_def.setProperty = _js_class_set_property_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + JSObjectRef js_object = JSObjectMake (js_context, js_class, instance); + if (instance && G_IS_OBJECT (instance)) + { + // TODO: Add functions dynamically + /*if (GTK_IS_WIDGET (instance)) + { + _js_object_add_function (js_context, js_object, "show"); + }*/ + } + return js_object; +} diff --git a/src/gjs.h b/src/gjs.h new file mode 100644 index 00000000..75d846c1 --- /dev/null +++ b/src/gjs.h @@ -0,0 +1,47 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __GJS_H__ +#define __GJS_H__ + +#include +#include + +G_BEGIN_DECLS + +JSValueRef +gjs_script_eval (JSContextRef js_context, + const gchar* script, + gchar** exception); + +gboolean +gjs_script_check_syntax (JSContextRef js_context, + const gchar* script, + gchar** exception); + +gboolean +gjs_script_from_file (JSContextRef js_context, + const gchar* filename, + gchar** exception); + +gchar* +gjs_string_utf8 (JSStringRef js_string); + +JSObjectRef +gjs_object_new (JSContextRef context, + gpointer instance); + +gchar* +gjs_string_utf8 (JSStringRef js_string); + +G_END_DECLS + +#endif /* __GJS_H__ */ diff --git a/src/main.c b/src/main.c index 884e30ab..f319c3d1 100644 --- a/src/main.c +++ b/src/main.c @@ -18,6 +18,7 @@ #include "midori-trash.h" #include "midori-browser.h" #include +#include "gjs.h" #include #include @@ -311,6 +312,19 @@ main (int argc, char** argv) return 0; } + // Standalone gjs support + if (argc > 1 && argv[1] && g_str_has_suffix (argv[1], ".js")) + { + JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); + gchar* exception = NULL; + gjs_script_from_file (js_context, argv[1], &exception); + JSGlobalContextRelease (js_context); + if (!exception) + return ; + printf ("%s - Exception: %s\n", argv[1], exception); + return 1; + } + // Load configuration files GString* error_messages = g_string_new (NULL); gchar* config_path = g_build_filename (g_get_user_config_dir (), @@ -474,8 +488,32 @@ main (int argc, char** argv) midori_browser_activate_action (browser, "Location"); katze_xbel_item_unref (_session); + // Load extensions + JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); + // FIXME: We want to honor system installed addons as well + gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, + "extensions", NULL); + GDir* addon_dir = g_dir_open (addon_path, 0, NULL); + if (addon_dir) + { + const gchar* filename; + while ((filename = g_dir_read_name (addon_dir))) + { + gchar* fullname = g_build_filename (addon_path, filename, NULL); + gchar* exception = NULL; + gjs_script_from_file (js_context, fullname, &exception); + if (exception) + // FIXME: Do we want to print this somewhere else? + // FIXME Convert the filename to UTF8 + printf ("%s - Exception: %s\n", filename, exception); + g_free (fullname); + } + g_dir_close (addon_dir); + } + gtk_main (); + JSGlobalContextRelease (js_context); g_object_unref (accel_group); // Save configuration files diff --git a/src/midori-addons.c b/src/midori-addons.c index 552f7972..b83f7c7c 100644 --- a/src/midori-addons.c +++ b/src/midori-addons.c @@ -138,404 +138,6 @@ midori_addons_treeview_row_activated_cb (GtkTreeView* treeview, }*/ } -static gchar* -_js_string_utf8 (JSStringRef js_string) -{ - size_t size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); - gchar* string_utf8 = (gchar*)g_malloc (size_utf8); - JSStringGetUTF8CString (js_string, string_utf8, size_utf8); - return string_utf8; -} - -static void -_js_class_get_property_names_cb (JSContextRef js_context, - JSObjectRef js_object, - JSPropertyNameAccumulatorRef js_properties) -{ - GObject* object = JSObjectGetPrivate (js_object); - if (object) - { - guint n_properties; - GParamSpec** pspecs = g_object_class_list_properties ( - G_OBJECT_GET_CLASS (object), &n_properties); - gint i; - for (i = 0; i < n_properties; i++) - { - const gchar* property = g_param_spec_get_name (pspecs[i]); - JSStringRef js_property = JSStringCreateWithUTF8CString (property); - JSPropertyNameAccumulatorAddName (js_properties, js_property); - JSStringRelease (js_property); - } - } -} - -static bool -_js_class_has_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property) -{ - bool result = false; - gchar* property = _js_string_utf8 (js_property); - GObject* object = JSObjectGetPrivate (js_object); - if (object) - { - if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), - property)) - result = true; - } - else if (js_object == JSContextGetGlobalObject (js_context)) - { - gchar* property = _js_string_utf8 (js_property); - GType type = g_type_from_name (property); - result = type ? type : false; - } - g_free (property); - return result; -} - -static JSObjectRef -_js_object_new (JSContextRef js_context, - gpointer object); - -static void -_js_object_set_property (JSContextRef js_context, - JSObjectRef js_object, - const gchar* name, - JSValueRef js_value) -{ - JSStringRef js_name = JSStringCreateWithUTF8CString (name); - JSObjectSetProperty(js_context, js_object, js_name, js_value, - kJSPropertyAttributeNone, NULL); - JSStringRelease (js_name); -} - -static JSObjectRef -_js_object_call_as_constructor_cb (JSContextRef js_context, - JSObjectRef js_object, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) -{ - gchar* type_name = JSObjectGetPrivate (js_object); - if (type_name) - { - GType type = g_type_from_name (type_name); - if (type) - { - GObject* object = g_object_new (type, NULL); - JSObjectRef js_object = _js_object_new (js_context, object); - return js_object; - } - } - return JSValueMakeNull (js_context); -} - -static JSValueRef -_js_class_get_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef* js_exception) -{ - if (js_object == JSContextGetGlobalObject (js_context)) - { - gchar* property = _js_string_utf8 (js_property); - GType type = g_type_from_name (property); - if (type) - { - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (property); - js_class_def.callAsConstructor = _js_object_call_as_constructor_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - return JSObjectMake (js_context, js_class, property); - } - g_free (property); - return JSValueMakeNull (js_context); - } - GObject* object = JSObjectGetPrivate (js_object); - JSValueRef js_result = NULL; - if (object) - { - gchar* property = _js_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - g_free (property); - return JSValueMakeNull (js_context); - } - if (!(pspec->flags & G_PARAM_READABLE)) - { - g_free (property); - return JSValueMakeUndefined (js_context); - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - gchar* value; - g_object_get (object, property, &value, NULL); - if (value) - { - JSStringRef js_string = JSStringCreateWithUTF8CString (value); - js_result = JSValueMakeString (js_context, js_string); - } - } - else if (type == G_TYPE_PARAM_INT - || type == G_TYPE_PARAM_UINT) - { - gint value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeNumber (js_context, value); - } - else if (type == G_TYPE_PARAM_BOOLEAN) - { - gboolean value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeBoolean (js_context, value ? true : false); - } - else if (type == G_TYPE_PARAM_OBJECT) - { - GObject* value; - g_object_get (object, property, &value, NULL); - if (value) - js_result = _js_object_new (js_context, value); - } - else if (type == G_TYPE_PARAM_ENUM) - { - gint value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeNumber (js_context, value); - } - else - js_result = JSValueMakeUndefined (js_context); - g_free (property); - } - return js_result ? js_result : JSValueMakeNull (js_context); -} - -static bool -_js_class_set_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef js_value, - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_object); - bool result = false; - if (object) - { - gchar* property = _js_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - g_free (property); - return false; - } - if (!(pspec->flags & G_PARAM_WRITABLE)) - { - g_free (property); - return false; - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - JSStringRef js_string_value = JSValueToStringCopy (js_context, - js_value, js_exception); - if (js_string_value) - { - gchar* string_value = _js_string_utf8 (js_string_value); - g_object_set (object, property, string_value, NULL); - g_free (string_value); - } - } - else if (type == G_TYPE_PARAM_INT - || type == G_TYPE_PARAM_UINT) - { - int value = JSValueToNumber (js_context, js_value, - js_exception); - g_object_set (object, property, value, NULL); - } - else if (type == G_TYPE_PARAM_BOOLEAN) - { - bool value = JSValueToBoolean (js_context, js_value); - g_object_set (object, property, value ? TRUE : FALSE, NULL); - } - else if (type == G_TYPE_PARAM_OBJECT) - { - JSObjectRef js_object_value = JSValueToObject ( - js_context, js_value, NULL); - GObject* object_value = JSObjectGetPrivate (js_object_value); - if (object_value) - g_object_set (object, property, object_value, NULL); - else - { - gchar* message = g_strdup_printf (_("%s cannot be assigned to %s.%s"), - "[object]", KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - } - else - { - gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), - KATZE_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - g_free (property); - } - return result; -} - -static JSValueRef -_js_foo_call_as_function_cb (JSContextRef js_context, - JSObjectRef js_function, - JSObjectRef js_this, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_this); - if (object) - { - if (!n_arguments) - { - gtk_widget_show (GTK_WIDGET (object)); - } - else if (n_arguments == 1) - { - JSObjectRef js_arg1 = JSValueToObject ( - js_context, js_arguments[0], NULL); - GObject* arg1 = JSObjectGetPrivate (js_arg1); - if (arg1) - gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); - } - } - - return JSValueMakeUndefined (js_context); -} - -static void -_js_foo_add_function (JSContextRef js_context, - JSObjectRef js_object, - const gchar* func) -{ - JSStringRef js_func = JSStringCreateWithUTF8CString (func); - JSObjectRef js_function = JSObjectMakeFunctionWithCallback ( - js_context, js_func, _js_foo_call_as_function_cb); - JSStringRelease (js_func); - _js_object_set_property (js_context, js_object, func, js_function); -} - -static JSObjectRef -_js_object_new (JSContextRef js_context, - gpointer object) -{ - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (KATZE_OBJECT_NAME (object)); - js_class_def.getPropertyNames = _js_class_get_property_names_cb; - js_class_def.hasProperty = _js_class_has_property_cb; - js_class_def.getProperty = _js_class_get_property_cb; - js_class_def.setProperty = _js_class_set_property_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_object = JSObjectMake (js_context, js_class, object); - if (GTK_IS_WIDGET (object)) - { - _js_foo_add_function (js_context, js_object, "show"); - } - if (GTK_IS_CONTAINER (object)) - { - _js_foo_add_function (js_context, js_object, "add"); - } - return js_object; -} - -static JSValueRef -_js_eval (JSContextRef js_context, - const gchar* script, - gchar** exception) -{ - JSStringRef js_script = JSStringCreateWithUTF8CString (script); - JSValueRef js_exception = NULL; - JSValueRef js_value = JSEvaluateScript (js_context, js_script, - JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); - if (!js_value && exception) - { - JSStringRef js_message = JSValueToStringCopy (js_context, - js_exception, NULL); - *exception = _js_string_utf8 (js_message); - JSStringRelease (js_message); - js_value = JSValueMakeNull (js_context); - } - JSStringRelease (js_script); - return js_value; -} - -static bool -_js_check_syntax (JSContextRef js_context, - const gchar* script, - const gchar* source_id, - int line, - gchar** exception) -{ - JSStringRef js_script = JSStringCreateWithUTF8CString (script); - JSStringRef js_source_id = JSStringCreateWithUTF8CString (source_id); - JSValueRef js_exception = NULL; - bool result = JSCheckScriptSyntax (js_context, js_script, js_source_id, - line, &js_exception); - if (!result && exception) - { - JSStringRef js_message = JSValueToStringCopy (js_context, - js_exception, NULL); - *exception = _js_string_utf8 (js_message); - JSStringRelease (js_message); - } - JSStringRelease (js_source_id); - JSStringRelease (js_script); - return result; -} - -static gboolean -_js_document_load_script_file (JSContextRef js_context, - const gchar* filename, - gchar** exception) -{ - gboolean result = FALSE; - gchar* script; - GError* error = NULL; - if (g_file_get_contents (filename, &script, NULL, &error)) - { - gchar* wrapped_script = g_strdup_printf ( - "var wrapped = function () { %s }; wrapped ();", script); - if (_js_eval (js_context, wrapped_script, exception)) - result = TRUE; - g_free (wrapped_script); - g_free (script); - } - else - { - *exception = g_strdup (error->message); - g_error_free (error); - } - return result; -} - static void midori_addons_init (MidoriAddons* addons) { @@ -567,91 +169,30 @@ midori_addons_init (MidoriAddons* addons) gtk_box_pack_start (GTK_BOX (addons), priv->treeview, TRUE, TRUE, 0); } -static JSValueRef -_js_info_call_as_function_cb (JSContextRef js_context, - JSObjectRef js_function, - JSObjectRef js_this, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) +static gboolean +_js_script_from_file (JSContextRef js_context, + const gchar* filename, + gchar** exception) { - if (n_arguments > 0) { - JSStringRef js_string = JSValueToStringCopy ( - js_context, js_arguments[0], NULL); - gchar* string = _js_string_utf8 (js_string); - // FIXME: Do we want to print this somewhere else? - printf ("console.info: %s\n", string); - g_free (string); - JSStringRelease (js_string); - } - - return JSValueMakeUndefined (js_context); -} - -static void -_midori_addons_extensions_main (MidoriAddons* addons, - GtkWidget* web_widget) -{ - MidoriAddonsPrivate* priv = addons->priv; - - JSClassDefinition js_global_def = kJSClassDefinitionEmpty; - js_global_def.getPropertyNames = _js_class_get_property_names_cb; - js_global_def.hasProperty = _js_class_has_property_cb; - js_global_def.getProperty = _js_class_get_property_cb; - JSClassRef js_global_class = JSClassCreate (&js_global_def); - JSGlobalContextRef js_context = JSGlobalContextCreate (js_global_class); - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup ("console"); - JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_console = JSObjectMake (js_context, js_class, NULL); - JSStringRef js_info = JSStringCreateWithUTF8CString ("info"); - JSObjectRef js_info_function = JSObjectMakeFunctionWithCallback ( - js_context, js_info, _js_info_call_as_function_cb); - JSObjectSetProperty (js_context, js_console, js_info, js_info_function, - kJSPropertyAttributeNone, NULL); - JSStringRelease (js_info); - _js_object_set_property (js_context, - JSContextGetGlobalObject (js_context), - "console", js_console); - - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (web_widget)); - if (GTK_WIDGET_TOPLEVEL (browser)) + gboolean result = FALSE; + gchar* script; + GError* error = NULL; + if (g_file_get_contents (filename, &script, NULL, &error)) { - // FIXME: Midori should be backed up by a real GObject - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup ("Midori"); - JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_midori = JSObjectMake (js_context, js_class, NULL); - _js_object_set_property (js_context, - JSContextGetGlobalObject (js_context), - "midori", js_midori); - JSObjectRef js_browser = _js_object_new (js_context, browser); - _js_object_set_property (js_context, - js_midori, - "browser", js_browser); + // Wrap the script to prevent global variables + gchar* wrapped_script = g_strdup_printf ( + "var wrapped = function () { %s }; wrapped ();", script); + if (gjs_script_eval (js_context, wrapped_script, exception)) + result = TRUE; + g_free (wrapped_script); + g_free (script); } - - // FIXME: We want to honor system installed addons as well - gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _folder_for_kind (priv->kind), NULL); - GDir* addon_dir = g_dir_open (addon_path, 0, NULL); - if (addon_dir) + else { - const gchar* filename; - while ((filename = g_dir_read_name (addon_dir))) - { - gchar* fullname = g_build_filename (addon_path, filename, NULL); - gchar* exception = NULL; - _js_document_load_script_file (js_context, fullname, &exception); - if (exception) - // FIXME: Do we want to print this somewhere else? - // FIXME Convert the filename to UTF8 - printf ("%s - Exception: %s\n", filename, exception); - g_free (fullname); - } - g_dir_close (addon_dir); + *exception = g_strdup (error->message); + g_error_free (error); } - JSGlobalContextRelease (js_context); + return result; } static void @@ -674,12 +215,11 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, { gchar* fullname = g_build_filename (addon_path, filename, NULL); gchar* exception; - if (!_js_document_load_script_file (js_context, fullname, - &exception)) + if (!_js_script_from_file (js_context, fullname, &exception)) { gchar* message = g_strdup_printf ("console.error ('%s');", exception); - _js_eval (js_context, message, NULL); + gjs_script_eval (js_context, message, NULL); g_free (message); g_free (exception); } @@ -717,9 +257,7 @@ midori_addons_new (GtkWidget* web_widget, MidoriAddonsPrivate* priv = addons->priv; priv->kind = kind; - if (kind == MIDORI_ADDON_EXTENSIONS) - _midori_addons_extensions_main (addons, web_widget); - else if (kind == MIDORI_ADDON_USER_SCRIPTS) + if (kind == MIDORI_ADDON_USER_SCRIPTS) g_signal_connect (web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); From 7474e41abd7d79827048c0c36fa349ef4630bccf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 7 May 2008 03:05:22 +0200 Subject: [PATCH 0097/2970] Provide a javascript style Gtk.binding and add g_return_if_fail --- src/gjs.c | 430 ++++++++++++++++++++++++++++++++--------------------- src/gjs.h | 5 +- src/main.c | 4 +- 3 files changed, 269 insertions(+), 170 deletions(-) diff --git a/src/gjs.c b/src/gjs.c index f7e2320e..36dd45a7 100644 --- a/src/gjs.c +++ b/src/gjs.c @@ -11,6 +11,7 @@ #include "gjs.h" +#include #include #define G_OBJECT_NAME(object) G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) @@ -21,6 +22,9 @@ gjs_script_eval (JSContextRef js_context, const gchar* script, gchar** exception) { + g_return_val_if_fail (js_context, FALSE); + g_return_val_if_fail (script, FALSE); + JSStringRef js_script = JSStringCreateWithUTF8CString (script); JSValueRef js_exception = NULL; JSValueRef js_value = JSEvaluateScript (js_context, js_script, @@ -42,6 +46,9 @@ gjs_script_check_syntax (JSContextRef js_context, const gchar* script, gchar** exception) { + g_return_val_if_fail (js_context, FALSE); + g_return_val_if_fail (script, FALSE); + JSStringRef js_script = JSStringCreateWithUTF8CString (script); JSValueRef js_exception = NULL; bool result = JSCheckScriptSyntax (js_context, js_script, NULL, @@ -62,6 +69,9 @@ gjs_script_from_file (JSContextRef js_context, const gchar* filename, gchar** exception) { + g_return_val_if_fail (js_context, FALSE); + g_return_val_if_fail (filename, FALSE); + gboolean result = FALSE; gchar* script; GError* error = NULL; @@ -71,7 +81,7 @@ gjs_script_from_file (JSContextRef js_context, result = TRUE; g_free (script); } - else + else if (error) { *exception = g_strdup (error->message); g_error_free (error); @@ -145,108 +155,76 @@ _js_object_set_property (JSContextRef js_context, JSStringRelease (js_name); } -static JSObjectRef -_js_object_call_as_constructor_cb (JSContextRef js_context, - JSObjectRef js_object, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) -{ - gchar* type_name = JSObjectGetPrivate (js_object); - if (type_name) - { - GType type = g_type_from_name (type_name); - if (type) - return gjs_object_new (js_context, g_object_new (type, NULL)); - } - return JSValueMakeNull (js_context); -} - static JSValueRef _js_class_get_property_cb (JSContextRef js_context, JSObjectRef js_object, JSStringRef js_property, JSValueRef* js_exception) { - if (js_object == JSContextGetGlobalObject (js_context)) + GObject* object = JSObjectGetPrivate (js_object); + + g_return_val_if_fail (object, JSValueMakeNull (js_context)); + + JSValueRef js_result = NULL; + gchar* property = gjs_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) { - gchar* property = gjs_string_utf8 (js_property); - GType type = g_type_from_name (property); - if (type) - { - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (property); - js_class_def.callAsConstructor = _js_object_call_as_constructor_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - return JSObjectMake (js_context, js_class, property); - } + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); g_free (property); return JSValueMakeNull (js_context); } - GObject* object = JSObjectGetPrivate (js_object); - JSValueRef js_result = NULL; - if (object) + if (!(pspec->flags & G_PARAM_READABLE)) { - gchar* property = gjs_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - g_free (property); - return JSValueMakeNull (js_context); - } - if (!(pspec->flags & G_PARAM_READABLE)) - { - g_free (property); - return JSValueMakeUndefined (js_context); - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - gchar* value; - g_object_get (object, property, &value, NULL); - if (value) - { - JSStringRef js_string = JSStringCreateWithUTF8CString (value); - js_result = JSValueMakeString (js_context, js_string); - } - } - else if (type == G_TYPE_PARAM_INT - || type == G_TYPE_PARAM_UINT) - { - gint value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeNumber (js_context, value); - } - else if (type == G_TYPE_PARAM_BOOLEAN) - { - gboolean value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeBoolean (js_context, value ? true : false); - } - else if (type == G_TYPE_PARAM_OBJECT) - { - GObject* value; - g_object_get (object, property, &value, NULL); - if (value) - js_result = gjs_object_new (js_context, value); - } - else if (type == G_TYPE_PARAM_ENUM) - { - gint value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeNumber (js_context, value); - } - else - js_result = JSValueMakeUndefined (js_context); g_free (property); + return JSValueMakeUndefined (js_context); } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + gchar* value; + g_object_get (object, property, &value, NULL); + if (value) + { + JSStringRef js_string = JSStringCreateWithUTF8CString (value); + js_result = JSValueMakeString (js_context, js_string); + } + } + else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT) + { + gint value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeNumber (js_context, value); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeBoolean (js_context, value ? true : false); + } + else if (type == G_TYPE_PARAM_OBJECT) + { + GObject* value; + g_object_get (object, property, &value, NULL); + if (value) + js_result = gjs_object_new (js_context, + G_OBJECT_NAME (value), value); + } + else if (type == G_TYPE_PARAM_ENUM) + { + gint value; + g_object_get (object, property, &value, NULL); + js_result = JSValueMakeNumber (js_context, value); + } + else + js_result = JSValueMakeUndefined (js_context); + g_free (property); return js_result ? js_result : JSValueMakeNull (js_context); } @@ -258,80 +236,79 @@ _js_class_set_property_cb (JSContextRef js_context, JSValueRef* js_exception) { GObject* object = JSObjectGetPrivate (js_object); + + g_return_val_if_fail (object, false); + bool result = false; - if (object) + gchar* property = gjs_string_utf8 (js_property); + GParamSpec* pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property); + if (!pspec) { - gchar* property = gjs_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) + gchar* message = g_strdup_printf (_("%s has no property '%s'"), + G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + g_free (property); + return false; + } + if (!(pspec->flags & G_PARAM_WRITABLE)) + { + g_free (property); + return false; + } + GType type = G_PARAM_SPEC_TYPE (pspec); + if (type == G_TYPE_PARAM_STRING) + { + JSStringRef js_string_value = JSValueToStringCopy (js_context, + js_value, js_exception); + if (js_string_value) { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - g_free (property); - return false; - } - if (!(pspec->flags & G_PARAM_WRITABLE)) - { - g_free (property); - return false; - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - JSStringRef js_string_value = JSValueToStringCopy (js_context, - js_value, js_exception); - if (js_string_value) - { - gchar* string_value = gjs_string_utf8 (js_string_value); - g_object_set (object, property, string_value, NULL); - g_free (string_value); - } - } - else if (type == G_TYPE_PARAM_INT - || type == G_TYPE_PARAM_UINT) - { - int value = JSValueToNumber (js_context, js_value, - js_exception); - g_object_set (object, property, value, NULL); - } - else if (type == G_TYPE_PARAM_BOOLEAN) - { - bool value = JSValueToBoolean (js_context, js_value); - g_object_set (object, property, value ? TRUE : FALSE, NULL); - } - else if (type == G_TYPE_PARAM_OBJECT) - { - JSObjectRef js_object_value = JSValueToObject ( - js_context, js_value, NULL); - GObject* object_value = JSObjectGetPrivate (js_object_value); - if (object_value) - g_object_set (object, property, object_value, NULL); - else - { - gchar* message = g_strdup_printf (_("%s cannot be assigned to %s.%s"), - "[object]", G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } + gchar* string_value = gjs_string_utf8 (js_string_value); + g_object_set (object, property, string_value, NULL); + g_free (string_value); } + } + else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT) + { + int value = JSValueToNumber (js_context, js_value, + js_exception); + g_object_set (object, property, value, NULL); + } + else if (type == G_TYPE_PARAM_BOOLEAN) + { + bool value = JSValueToBoolean (js_context, js_value); + g_object_set (object, property, value ? TRUE : FALSE, NULL); + } + else if (type == G_TYPE_PARAM_OBJECT) + { + JSObjectRef js_object_value = JSValueToObject ( + js_context, js_value, NULL); + GObject* object_value = JSObjectGetPrivate (js_object_value); + if (object_value) + g_object_set (object, property, object_value, NULL); else { - gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), - G_OBJECT_NAME (object), property); + gchar* message = g_strdup_printf (_("%s cannot be assigned to %s.%s"), + "[object]", G_OBJECT_NAME (object), property); JSStringRef js_message = JSStringCreateWithUTF8CString (message); *js_exception = JSValueMakeString (js_context, js_message); JSStringRelease (js_message); g_free (message); } - g_free (property); } + else + { + gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), + G_OBJECT_NAME (object), property); + JSStringRef js_message = JSStringCreateWithUTF8CString (message); + *js_exception = JSValueMakeString (js_context, js_message); + JSStringRelease (js_message); + g_free (message); + } + g_free (property); return result; } @@ -344,20 +321,20 @@ _js_object_call_as_function_cb (JSContextRef js_context, JSValueRef* js_exception) { GObject* object = JSObjectGetPrivate (js_this); - if (object) + + g_return_val_if_fail (object, JSValueMakeNull (js_context)); + + if (!n_arguments) { - if (!n_arguments) - { - gtk_widget_show (GTK_WIDGET (object)); - } - else if (n_arguments == 1) - { - JSObjectRef js_arg1 = JSValueToObject ( - js_context, js_arguments[0], NULL); - GObject* arg1 = JSObjectGetPrivate (js_arg1); - if (arg1) - gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); - } + gtk_widget_show (GTK_WIDGET (object)); + } + else if (n_arguments == 1) + { + JSObjectRef js_arg1 = JSValueToObject ( + js_context, js_arguments[0], NULL); + GObject* arg1 = JSObjectGetPrivate (js_arg1); + if (arg1) + gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); } return JSValueMakeUndefined (js_context); @@ -377,10 +354,14 @@ _js_object_add_function (JSContextRef js_context, JSObjectRef gjs_object_new (JSContextRef js_context, + const gchar* name, gpointer instance) { + g_return_val_if_fail (js_context, NULL); + g_return_val_if_fail (name, NULL); + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (G_OBJECT_NAME (instance)); + js_class_def.className = g_strdup (name); js_class_def.getPropertyNames = _js_class_get_property_names_cb; js_class_def.hasProperty = _js_class_has_property_cb; js_class_def.getProperty = _js_class_get_property_cb; @@ -397,3 +378,120 @@ gjs_object_new (JSContextRef js_context, } return js_object; } + +static JSObjectRef +_js_object_call_as_constructor_cb (JSContextRef js_context, + JSObjectRef js_object, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) +{ + const gchar* type_name = JSObjectGetPrivate (js_object); + + g_return_val_if_fail (type_name, NULL); + + GType type = g_type_from_name (type_name); + if (type) + return gjs_object_new (js_context, type_name, g_object_new (type, NULL)); + return NULL; +} + +static bool +_js_module_has_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property) +{ + const gchar* namespace = JSObjectGetPrivate (js_object); + + g_return_val_if_fail (namespace, false); + + gchar* property = gjs_string_utf8 (js_property); + gchar* type_name = g_strdup_printf ("%s%s", namespace, property); + + GType type = g_type_from_name (type_name); + if (!type) + { + GModule* module = g_module_open (NULL, + G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + typedef GType (*gjs_get_type_func)(void); + // FIXME: Insert a space between each capital letter + gchar* type_func_name = g_strdup_printf ("%s_%s_get_type", + namespace, property); + gchar* type_func_name_small = g_utf8_strdown (type_func_name, -1); + gjs_get_type_func type_func; + if (g_module_symbol (module, + (const gchar*)type_func_name_small, &type_func)) + { + type = type_func (); + g_type_class_peek (type); + } + g_free (type_func_name_small); + g_free (type_func_name); + g_module_close (module); + } + bool result = type ? true : false; + g_free (type_name); + g_free (property); + return result; +} + +static JSValueRef +_js_module_get_property_cb (JSContextRef js_context, + JSObjectRef js_object, + JSStringRef js_property, + JSValueRef* js_exception) +{ + const gchar* namespace = JSObjectGetPrivate (js_object); + + g_return_val_if_fail (namespace, JSValueMakeNull (js_context)); + + gchar* property = gjs_string_utf8 (js_property); + gchar* type_name = g_strdup_printf ("%s%s", namespace, property); + GType type = g_type_from_name (type_name); + JSValueRef result; + if (type) + { + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (type_name); + js_class_def.callAsConstructor = _js_object_call_as_constructor_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + result = JSObjectMake (js_context, js_class, type_name); + } + else + { + result = JSValueMakeNull (js_context); + g_free (type_name); + } + g_free (property); + return result; +} + +JSObjectRef +gjs_module_new (JSContextRef js_context, + const gchar* namespace) +{ + g_return_val_if_fail (js_context, NULL); + g_return_val_if_fail (namespace, NULL); + + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (namespace); + js_class_def.hasProperty = _js_module_has_property_cb; + js_class_def.getProperty = _js_module_get_property_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + JSObjectRef js_module = JSObjectMake (js_context, js_class, namespace); + return js_module; +} + +JSGlobalContextRef +gjs_global_context_new (void) +{ + JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); + JSObjectRef js_gjs = gjs_object_new (js_context, "GJS", NULL); + _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), + "gjs", js_gjs); + + JSObjectRef js_gtk = gjs_module_new (js_context, "Gtk"); + _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), + "Gtk", js_gtk); + return js_context; +} diff --git a/src/gjs.h b/src/gjs.h index 75d846c1..47e9fced 100644 --- a/src/gjs.h +++ b/src/gjs.h @@ -37,10 +37,11 @@ gjs_string_utf8 (JSStringRef js_string); JSObjectRef gjs_object_new (JSContextRef context, + const gchar* name, gpointer instance); -gchar* -gjs_string_utf8 (JSStringRef js_string); +JSGlobalContextRef +gjs_global_context_new (void); G_END_DECLS diff --git a/src/main.c b/src/main.c index f319c3d1..f0949748 100644 --- a/src/main.c +++ b/src/main.c @@ -315,7 +315,7 @@ main (int argc, char** argv) // Standalone gjs support if (argc > 1 && argv[1] && g_str_has_suffix (argv[1], ".js")) { - JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); + JSGlobalContextRef js_context = gjs_global_context_new (); gchar* exception = NULL; gjs_script_from_file (js_context, argv[1], &exception); JSGlobalContextRelease (js_context); @@ -489,7 +489,7 @@ main (int argc, char** argv) katze_xbel_item_unref (_session); // Load extensions - JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); + JSGlobalContextRef js_context = gjs_global_context_new (); // FIXME: We want to honor system installed addons as well gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, "extensions", NULL); From 1a1cb73ca33fcc9b8ec792d21c584aa3b1bb60cd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 7 May 2008 16:40:53 +0200 Subject: [PATCH 0098/2970] Fix the default location-entry-search value --- src/midori-websettings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 4b1fdf4d..90a8cc02 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -433,7 +433,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "location-entry-search", _("Location entry Search"), _("The search to perform inside the location entry"), - "http://www.google.com/search/?q=%s", + "http://www.google.com/search?q=%s", flags)); g_object_class_install_property (gobject_class, From 944defafeb11e17b1412dbdcabe9c36828dc124d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 7 May 2008 19:25:43 +0200 Subject: [PATCH 0099/2970] Use value-changed instead of changed for spin buttons --- katze/katze-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index fb3f6c3f..9b958911 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -221,7 +221,7 @@ katze_property_proxy (gpointer object, gint value; g_object_get (object, property, &value, NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); - g_signal_connect (widget, "changed", + g_signal_connect (widget, "value-changed", G_CALLBACK (proxy_spin_button_changed_cb), object); } else if (type == G_TYPE_PARAM_ENUM) From 773f5d8d35feb254b859dde41dfd72aa2e14bd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SZERV=C3=81C=20Attila?= Date: Mon, 12 May 2008 01:26:25 +0200 Subject: [PATCH 0100/2970] Add Hungarian translation. --- po/LINGUAS | 2 +- po/hu.po | 1094 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1095 insertions(+), 1 deletion(-) create mode 100644 po/hu.po diff --git a/po/LINGUAS b/po/LINGUAS index 79367714..87d5da78 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de fr pl sv +de fr hu pl sv diff --git a/po/hu.po b/po/hu.po new file mode 100644 index 00000000..79478656 --- /dev/null +++ b/po/hu.po @@ -0,0 +1,1094 @@ +# Hungarian translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# SZERVÁC Attila 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-05-12 01:17+0200\n" +"PO-Revision-Date: 2008-05-10 19:33+0100\n" +"Last-Translator: SZERVÁC Attila \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Pehelysúlyú webböngésző" + +#: ../midori.desktop.in.h:2 +msgid "Midori Web Browser" +msgstr "Midori webböngésző" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Webböngésző" + +#: ../src/main.c:48 +msgid "Bookmark" +msgstr "Könyvjelző" + +#: ../src/main.c:49 +msgid "New Bookmark" +msgstr "Új könyvjelző" + +#: ../src/main.c:50 +msgid "_Form Fill" +msgstr "Űrlap kitöltés" + +#: ../src/main.c:51 ../src/midori-websettings.c:131 +#: ../src/midori-websettings.c:407 +msgid "Homepage" +msgstr "Honlap" + +#: ../src/main.c:52 +msgid "New _Tab" +msgstr "Új _lap" + +#: ../src/main.c:53 +msgid "New _Window" +msgstr "Új _ablak" + +#: ../src/main.c:55 +msgid "Select _All" +msgstr "Mindent ki_jelöl" + +#: ../src/main.c:58 +msgid "_Fullscreen" +msgstr "_Teljes képernyő" + +#: ../src/main.c:59 +msgid "_Leave Fullscreen" +msgstr "Teljes képernyő elhagyása" + +#: ../src/main.c:145 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "A beállítást nem sikerült betölteni. %s\n" + +#: ../src/main.c:194 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "'%s' érték érvénytelen ehhez: %s" + +#: ../src/main.c:201 ../src/main.c:257 +#, c-format +msgid "Unhandled settings property '%s'" +msgstr "" + +#: ../src/main.c:271 ../src/main.c:305 +msgid "midori" +msgstr "midori" + +#: ../src/main.c:278 +msgid "Display program version" +msgstr "Program verzió kiírása" + +#: ../src/main.c:283 +msgid "[URL]" +msgstr "[URL]" + +#: ../src/main.c:307 +msgid "Debugging" +msgstr "Hibakeresés" + +#: ../src/main.c:308 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Véleményeket, javaslatokat és hibákat ide:" + +#: ../src/main.c:310 +msgid "Check for new versions at:" +msgstr "Új verziók keresése itt:" + +#: ../src/main.c:358 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "A könyvjelzőket nem tudtam betölteni. %s\n" + +#: ../src/main.c:372 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "A folyamatot nem tudtam betölteni. %s\n" + +#: ../src/main.c:384 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "A kukát nem tudtam betölteni. %s\n" + +#: ../src/main.c:394 +msgid "The following errors occured:" +msgstr "Az alábbi hibák történtek:" + +#: ../src/main.c:527 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "A keresőmotorokat nem tudtam elmenteni. %s" + +#: ../src/main.c:536 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "A könyvjelzőket nem tudtam elmenteni. %s" + +#: ../src/main.c:545 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "A kukát nem tudtam elmenteni. %s" + +#: ../src/main.c:557 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "A folyamatot nem tudtam elmenteni. %s" + +#: ../src/main.c:566 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A beállítást nem tudtam elmenteni. %s" + +#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 +#: ../src/midori-browser.c:2101 +msgid "Reload the current page" +msgstr "Oldal újratöltése" + +#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 +msgid "Stop loading the current page" +msgstr "Betöltés leállítása" + +#: ../src/midori-browser.c:264 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% betöltve" + +#: ../src/midori-browser.c:611 +msgid "Menubar" +msgstr "Menüsáv" + +#: ../src/midori-browser.c:612 +msgid "The menubar" +msgstr "A menüsáv" + +#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +msgid "Navigationbar" +msgstr "Címsáv" + +#: ../src/midori-browser.c:626 +msgid "The navigationbar" +msgstr "A címsáv" + +#: ../src/midori-browser.c:639 +msgid "Tab" +msgstr "Lap" + +#: ../src/midori-browser.c:640 +msgid "The current tab" +msgstr "Jelenlegi lap" + +#: ../src/midori-browser.c:653 +msgid "Statusbar" +msgstr "Állapotsáv" + +#: ../src/midori-browser.c:654 +msgid "The statusbar" +msgstr "Az állapotsáv" + +#: ../src/midori-browser.c:670 +msgid "Settings" +msgstr "Beállítások" + +#: ../src/midori-browser.c:671 +msgid "The associated settings" +msgstr "Társított beállítások" + +#: ../src/midori-browser.c:690 +msgid "Statusbar Text" +msgstr "Állapotsáv szöveg" + +#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 +msgid "The text that is displayed in the statusbar" +msgstr "Az állapotsávra írt szöveg" + +#: ../src/midori-browser.c:709 +msgid "Trash" +msgstr "Kuka" + +#: ../src/midori-browser.c:710 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "A legutóbb bezárt lapokat és ablakokat gyűjtő kuka." + +#: ../src/midori-browser.c:1294 +msgid "New bookmark" +msgstr "Új könyvjelző" + +#: ../src/midori-browser.c:1294 +msgid "Edit bookmark" +msgstr "Könyvjelző szerkesztése" + +#: ../src/midori-browser.c:1311 +msgid "_Title:" +msgstr "_Cím:" + +#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 +msgid "_Description:" +msgstr "_Leírás:" + +#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 +msgid "_URL:" +msgstr "_URL:" + +#: ../src/midori-browser.c:1364 +msgid "_Folder:" +msgstr "_Mappa:" + +#: ../src/midori-browser.c:1368 +msgid "Root" +msgstr "Gyökér" + +#: ../src/midori-browser.c:1591 +msgid "Separator" +msgstr "Elválasztó" + +#: ../src/midori-browser.c:1780 +msgid "A lightweight web browser." +msgstr "Egy pehelysúlyú webböngésző" + +#: ../src/midori-browser.c:1788 +msgid "translator-credits" +msgstr "SZERVÁC Attila " + +#: ../src/midori-browser.c:2015 +msgid "_File" +msgstr "_Fájl" + +#: ../src/midori-browser.c:2018 +msgid "Open a new window" +msgstr "Új ablak megnyitása" + +#: ../src/midori-browser.c:2021 +msgid "Open a new tab" +msgstr "Új lap megnyitása" + +#: ../src/midori-browser.c:2024 +msgid "Open a file" +msgstr "Fájl megnyitása" + +#: ../src/midori-browser.c:2027 +msgid "Save to a file" +msgstr "Mentés fájlba" + +#: ../src/midori-browser.c:2029 +msgid "_Close Tab" +msgstr "_Lap bezárása" + +#: ../src/midori-browser.c:2030 +msgid "Close the current tab" +msgstr "A jelenlegi lap bezárása" + +#: ../src/midori-browser.c:2032 +msgid "C_lose Window" +msgstr "_Ablak bezárása" + +#: ../src/midori-browser.c:2033 +msgid "Close this window" +msgstr "A jelenlegi ablak bezárása" + +#: ../src/midori-browser.c:2035 +msgid "Pa_ge Setup" +msgstr "_Oldal beállítása" + +#: ../src/midori-browser.c:2045 +msgid "Quit the application" +msgstr "Kilépés a programból" + +#: ../src/midori-browser.c:2047 +msgid "_Edit" +msgstr "Sz_erkesztés" + +#: ../src/midori-browser.c:2050 +msgid "Undo the last modification" +msgstr "Utolsó módosítás visszavonása" + +#: ../src/midori-browser.c:2053 +msgid "Redo the last modification" +msgstr "Utolsó módosítás ismétlése" + +#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 +msgid "Copy the selected text" +msgstr "A kijelölt szöveg másolása" + +#: ../src/midori-browser.c:2065 +msgid "Paste text from the clipboard" +msgstr "Szöveg beillesztése a vágólapról" + +#: ../src/midori-browser.c:2068 +msgid "Delete the selected text" +msgstr "A kijelölt szöveg törlése" + +#: ../src/midori-browser.c:2071 +msgid "Select all text" +msgstr "Minden szöveg kijelölése" + +#: ../src/midori-browser.c:2079 +msgid "Find _Next" +msgstr "_Következő" + +#: ../src/midori-browser.c:2082 +msgid "Find _Previous" +msgstr "_Előző" + +#: ../src/midori-browser.c:2085 +msgid "_Quick Find" +msgstr "_Gyors keresés" + +#: ../src/midori-browser.c:2091 +msgid "_View" +msgstr "_Nézet" + +#: ../src/midori-browser.c:2092 +msgid "_Toolbars" +msgstr "Eszköz_sávok" + +#: ../src/midori-browser.c:2112 +msgid "View Source" +msgstr "Forrás megtekintése" + +#: ../src/midori-browser.c:2115 +msgid "View Selection Source" +msgstr "Kijelölés forrásnak megtekintése" + +#: ../src/midori-browser.c:2119 +msgid "Toggle fullscreen view" +msgstr "Teljes képernyős váltás" + +#: ../src/midori-browser.c:2121 +msgid "_Go" +msgstr "_Ugrás" + +#: ../src/midori-browser.c:2132 +msgid "Location..." +msgstr "Hely..." + +#: ../src/midori-browser.c:2135 +msgid "Web Search..." +msgstr "Web-keresés..." + +#: ../src/midori-browser.c:2138 +msgid "Open in Page_holder..." +msgstr "" + +#: ../src/midori-browser.c:2141 +msgid "Closed Tabs and Windows" +msgstr "Bezárt lapok és ablakok" + +#: ../src/midori-browser.c:2142 +msgid "Reopen a previously closed tab or window" +msgstr "Egy korábban bezárt lap vagy ablak megnyitása" + +#: ../src/midori-browser.c:2144 +msgid "Empty Trash" +msgstr "Üres kuka" + +#: ../src/midori-browser.c:2147 +msgid "Undo Close Tab" +msgstr "Lap bezárásának visszavonása" + +#: ../src/midori-browser.c:2150 +msgid "_Bookmarks" +msgstr "Könyv_jelzők" + +#: ../src/midori-browser.c:2155 +msgid "_Manage Bookmarks" +msgstr "Könyvjelzők _kezelése" + +#: ../src/midori-browser.c:2161 +msgid "Open in New _Tab" +msgstr "Megnyitás új _lapon" + +#: ../src/midori-browser.c:2164 +msgid "Open in New _Window" +msgstr "Megnyitás új _ablakban" + +#: ../src/midori-browser.c:2173 +msgid "_Tools" +msgstr "Esz_közök" + +#: ../src/midori-browser.c:2175 +msgid "_Manage Search Engines" +msgstr "Kereső-motorok kezelése" + +#: ../src/midori-browser.c:2176 +msgid "Add, edit and remove search engines..." +msgstr "Kereső-motorok hozzáadása, szerkesztése és eltávolítása..." + +#: ../src/midori-browser.c:2179 +msgid "_Window" +msgstr "_Ablak" + +#: ../src/midori-browser.c:2181 +msgid "_Previous Tab" +msgstr "_Előző lap" + +#: ../src/midori-browser.c:2184 +msgid "_Next Tab" +msgstr "_Következő lap" + +#: ../src/midori-browser.c:2187 +msgid "Tab _Overview" +msgstr "Lapok át_tekintése" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../src/midori-browser.c:2190 +msgid "_Help" +msgstr "_Súgó" + +#: ../src/midori-browser.c:2192 +msgid "_Contents" +msgstr "_Tartalom" + +#: ../src/midori-browser.c:2202 +msgid "P_rivate Browsing" +msgstr "_Személyes böngészés" + +#: ../src/midori-browser.c:2206 +msgid "_Work Offline" +msgstr "_Kapcsolat nélküli munka" + +#: ../src/midori-browser.c:2211 +msgid "_Navigationbar" +msgstr "_Címsáv" + +#: ../src/midori-browser.c:2215 +msgid "Side_panel" +msgstr "Oldal_panel" + +#: ../src/midori-browser.c:2219 +msgid "_Bookmarkbar" +msgstr "_Könyvjelzősáv" + +#: ../src/midori-browser.c:2223 +msgid "_Transferbar" +msgstr "_Letöltési sáv" + +#: ../src/midori-browser.c:2227 +msgid "_Statusbar" +msgstr "_Állapotsáv" + +#: ../src/midori-browser.c:2681 +msgid "Bookmarks" +msgstr "Könyvjelzők" + +#. TODO: We need something like "use current website" +#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 +msgid "Transfers" +msgstr "Letöltések" + +#: ../src/midori-browser.c:2697 +msgid "Console" +msgstr "Konzol" + +#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 +msgid "History" +msgstr "Történet" + +#: ../src/midori-browser.c:2713 +msgid "Pageholder" +msgstr "" + +#: ../src/midori-browser.c:2722 +msgid "Userscripts" +msgstr "" + +#: ../src/midori-browser.c:2748 +msgid "_Inline find:" +msgstr "" + +#: ../src/midori-browser.c:2774 +msgid "Match Case" +msgstr "Nagybetű-érzékeny" + +#: ../src/midori-browser.c:2791 +msgid "Close Findbar" +msgstr "Keresősáv bezárása" + +#: ../src/midori-browser.c:2815 +msgid "Extensions" +msgstr "Kiterjesztések" + +#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Ismeretlen '%s' beállítás" + +#: ../src/midori-browser.c:3278 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ismeretlen '%s' művelet" + +#: ../src/midori-panel.c:147 +msgid "Appearance of the shadow around each panel" +msgstr "Panelek körüli árnyékok megjelenése" + +#: ../src/midori-panel.c:157 +msgid "Menu to hold panel items" +msgstr "Panel-elemek menüje" + +#: ../src/midori-panel.c:166 +msgid "The index of the current page" +msgstr "" + +#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 +msgid "Close panel" +msgstr "Panel bezárása" + +#: ../src/midori-panel.c:391 +msgid "Untitled" +msgstr "Névtelen" + +#: ../src/midori-trash.c:97 +msgid "The maximum number of items" +msgstr "Az elemek maximális száma" + +#: ../src/midori-websettings.c:130 +msgid "Blank page" +msgstr "Üres lap" + +#: ../src/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Legutóbb megnyitott lapok" + +#: ../src/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Kínai (BIG5)" + +#: ../src/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japán (SHIFT_JIS)" + +#: ../src/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Orosz (KOI8-r)" + +#: ../src/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../src/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Nyugati (ISO-8859-1)" + +#: ../src/midori-websettings.c:152 +msgid "Custom..." +msgstr "Egyéni..." + +#: ../src/midori-websettings.c:167 +msgid "New tab" +msgstr "Új lap" + +#: ../src/midori-websettings.c:168 +msgid "New window" +msgstr "Új ablak" + +#: ../src/midori-websettings.c:169 +msgid "Current tab" +msgstr "Jelenlegi lap" + +#: ../src/midori-websettings.c:184 +msgid "Default" +msgstr "Alap" + +#: ../src/midori-websettings.c:185 +msgid "Icons" +msgstr "Ikonok" + +#: ../src/midori-websettings.c:186 +msgid "Text" +msgstr "Szöveg" + +#: ../src/midori-websettings.c:187 +msgid "Both" +msgstr "Mindkettő" + +#: ../src/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Mindkettő vízszintesen" + +#: ../src/midori-websettings.c:203 +msgid "All cookies" +msgstr "Minden süti" + +#: ../src/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Munkafolyamat sütik" + +#: ../src/midori-websettings.c:205 +msgid "None" +msgstr "Semmi" + +#: ../src/midori-websettings.c:247 +msgid "Remember last window size" +msgstr "Legutóbbi ablak méretének megjegyzése" + +#: ../src/midori-websettings.c:248 +msgid "Whether to save the last window size" +msgstr "Mentésre kerüljön-e a legutóbbi ablak mérete" + +#: ../src/midori-websettings.c:256 +msgid "Last window width" +msgstr "Legutóbbi ablak szélessége" + +#: ../src/midori-websettings.c:257 +msgid "The last saved window width" +msgstr "A legutóbb elmentett ablak-szélesség" + +#: ../src/midori-websettings.c:265 +msgid "Last window height" +msgstr "Legutóbbi ablak magassága" + +#: ../src/midori-websettings.c:266 +msgid "The last saved window height" +msgstr "A legutóbb mentett ablak-magasság" + +#: ../src/midori-websettings.c:274 +msgid "Last panel position" +msgstr "A panel helyzete" + +#: ../src/midori-websettings.c:275 +msgid "The last saved panel position" +msgstr "A legutóbb mentett panel-helyzet" + +#: ../src/midori-websettings.c:283 +msgid "Last panel page" +msgstr "Legutóbbi panel-lap" + +#: ../src/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "A legutóbb mentett panel-lap" + +#: ../src/midori-websettings.c:292 +msgid "Last Web search" +msgstr "Legutóbbi web-keresés" + +#: ../src/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "A legutóbb mentett web-keresés" + +#: ../src/midori-websettings.c:301 +msgid "Last pageholder URI" +msgstr "" + +#: ../src/midori-websettings.c:302 +msgid "The URI last opened in the pageholder" +msgstr "" + +#: ../src/midori-websettings.c:312 +msgid "Show Navigationbar" +msgstr "Címsáv mutatása" + +#: ../src/midori-websettings.c:313 +msgid "Whether to show the navigationbar" +msgstr "Megjelenjen-e a címsáv" + +#: ../src/midori-websettings.c:321 +msgid "Show Bookmarkbar" +msgstr "Könyvjelzősáv mutatása" + +#: ../src/midori-websettings.c:322 +msgid "Whether to show the bookmarkbar" +msgstr "Megjelenjen-e a könyvjelzősáv" + +#: ../src/midori-websettings.c:330 +msgid "Show Panel" +msgstr "Panel mutatása" + +#: ../src/midori-websettings.c:331 +msgid "Whether to show the panel" +msgstr "Megjelenjen-e a panel" + +#: ../src/midori-websettings.c:339 +msgid "Show Statusbar" +msgstr "Állapotsáv mutatása" + +#: ../src/midori-websettings.c:340 +msgid "Whether to show the statusbar" +msgstr "Megjelenjen-e az állapotsáv" + +#: ../src/midori-websettings.c:349 +msgid "Toolbar Style" +msgstr "Eszközsáv stílus" + +#: ../src/midori-websettings.c:350 +msgid "The style of the toolbar" +msgstr "Az eszközsáv stílusa" + +#: ../src/midori-websettings.c:359 +msgid "Small toolbar" +msgstr "Kis eszközsáv" + +#: ../src/midori-websettings.c:360 +msgid "Use small toolbar icons" +msgstr "Kis eszközsáv-ikonok használata" + +#: ../src/midori-websettings.c:368 +msgid "Show New Tab" +msgstr "Új lap mutatása" + +#: ../src/midori-websettings.c:369 +msgid "Show the New Tab button in the toolbar" +msgstr "Új lap gomb mutatása az eszközsávon" + +#: ../src/midori-websettings.c:377 +msgid "Show Web search" +msgstr "Web-keresés mutatása" + +#: ../src/midori-websettings.c:378 +msgid "Show the Web search entry in the toolbar" +msgstr "A Web-kereső mező mutatása az eszközsávon" + +#: ../src/midori-websettings.c:386 +msgid "Show Trash" +msgstr "Kuka mutatása" + +#: ../src/midori-websettings.c:387 +msgid "Show the Trash button in the toolbar" +msgstr "A kuka gomb mutatása az eszközsávon" + +#: ../src/midori-websettings.c:397 +msgid "Load on Startup" +msgstr "Betöltés induláskor" + +#: ../src/midori-websettings.c:398 +msgid "What to load on startup" +msgstr "Az induláskor betöltendő" + +#: ../src/midori-websettings.c:408 +msgid "The homepage" +msgstr "A honlap" + +#: ../src/midori-websettings.c:416 +msgid "Download Folder" +msgstr "Letöltő mappa" + +#: ../src/midori-websettings.c:417 +msgid "The folder downloaded files are saved to" +msgstr "A fájlok alapértelmezett letöltési mappája" + +#: ../src/midori-websettings.c:425 +msgid "Show Download Notification" +msgstr "Letöltés-értesítő mutatása" + +#: ../src/midori-websettings.c:426 +msgid "Show a notification window for finished downloads" +msgstr "Egy értesítő ablakot mutat az elvégzett letöltésekről" + +#: ../src/midori-websettings.c:434 +msgid "Location entry Search" +msgstr "A hely-beviteli Kereső" + +#: ../src/midori-websettings.c:435 +msgid "The search to perform inside the location entry" +msgstr "A keresés a hely-beviteli mezőben" + +#: ../src/midori-websettings.c:443 +msgid "Preferred Encoding" +msgstr "Alapértelmezett kódolás" + +#: ../src/midori-websettings.c:444 +msgid "The preferred character encoding" +msgstr "Az alapértelmezett karakter-kódolás" + +#: ../src/midori-websettings.c:455 +msgid "Tab Label Size" +msgstr "A címke mérete" + +#: ../src/midori-websettings.c:456 +msgid "The desired tab label size" +msgstr "A lapok címkéinek kívánt mérete" + +#: ../src/midori-websettings.c:464 +msgid "Close Buttons on Tabs" +msgstr "Bezáró gombok a lapokon" + +#: ../src/midori-websettings.c:465 +msgid "Whether tabs have close buttons" +msgstr "Legyenek-e bezáró gombok a lapokon" + +#: ../src/midori-websettings.c:473 +msgid "Open new pages in" +msgstr "Új lapok megnyitása itt:" + +#: ../src/midori-websettings.c:474 +msgid "Where to open new pages" +msgstr "Hol nyíljanak az új lapok" + +#: ../src/midori-websettings.c:483 +msgid "Middle click opens Selection" +msgstr "Középső gombra megnyitás" + +#: ../src/midori-websettings.c:484 +msgid "Load an URL from the selection via middle click" +msgstr "URL betöltése a kijelölésből középső gombbal" + +#: ../src/midori-websettings.c:492 +msgid "Open tabs in the background" +msgstr "Lapok megnyitása a háttérben" + +#: ../src/midori-websettings.c:493 +msgid "Whether to open new tabs in the background" +msgstr "Az új lapok a háttérben nyíljanak-e" + +#: ../src/midori-websettings.c:501 +msgid "Open popups in tabs" +msgstr "Felugrók megnyitása lapokon" + +#: ../src/midori-websettings.c:502 +msgid "Whether to open popup windows in tabs" +msgstr "Megnyíljanak-e a felugró ablakok lapokon" + +#: ../src/midori-websettings.c:512 +msgid "Accept cookies" +msgstr "Sütik fogadása" + +#: ../src/midori-websettings.c:513 +msgid "What type of cookies to accept" +msgstr "Milyen sütiket fogadjunk el" + +#: ../src/midori-websettings.c:522 +msgid "Original cookies only" +msgstr "Csak eredeti sütiket" + +#: ../src/midori-websettings.c:523 +msgid "Accept cookies from the original website only" +msgstr "Csak az eredeti lapról való sütiket fogadjuk el" + +#: ../src/midori-websettings.c:531 +msgid "Maximum cookie age" +msgstr "Sütik maximális kora" + +#: ../src/midori-websettings.c:532 +msgid "The maximum number of days to save cookies for" +msgstr "A napok száma, melyre a sütiket legfeljebb elmentsük" + +#: ../src/midori-websettings.c:542 +msgid "Remember last visited pages" +msgstr "Legutóbbi lapok megjegyzése" + +#: ../src/midori-websettings.c:543 +msgid "Whether the last visited pages are saved" +msgstr "Mentsük-e a legutóbb meglátogatott lapokat" + +#: ../src/midori-websettings.c:551 +msgid "Maximum history age" +msgstr "Történet maximális kora" + +#: ../src/midori-websettings.c:552 +msgid "The maximum number of days to save the history for" +msgstr "A legtöbb nap, melyre a történetet elmentsük" + +#: ../src/midori-websettings.c:560 +msgid "Remember last form inputs" +msgstr "Űrlapok megjegyzése" + +#: ../src/midori-websettings.c:561 +msgid "Whether the last form inputs are saved" +msgstr "Mentsük-e az űrlapokba bevitt adatokat" + +#: ../src/midori-websettings.c:569 +msgid "Remember last downloaded files" +msgstr "Legutóbbi letöltések megjegyzése" + +#: ../src/midori-websettings.c:570 +msgid "Whether the last downloaded files are saved" +msgstr "Jegyezzük-e a legutóbbi letöltéseket" + +#: ../src/midori-websettings.c:580 +msgid "HTTP Proxy" +msgstr "HTTP Proxy" + +#: ../src/midori-websettings.c:581 +msgid "The proxy used for HTTP connections" +msgstr "A HTTP-kapcsolatok proxy kiszolgálója" + +#: ../src/midori-websettings.c:589 +msgid "Cache size" +msgstr "Gyorstár mérete" + +#: ../src/midori-websettings.c:590 +msgid "The allowed size of the cache" +msgstr "Az engedélyezett gyorstár-méret" + +#: ../src/midori-webview.c:217 +msgid "The icon of the currently loaded page" +msgstr "A jelenlegi lap ikonja" + +#: ../src/midori-webview.c:226 +msgid "The URI of the currently loaded page" +msgstr "A jelenlegi lap URI-ja" + +#: ../src/midori-webview.c:235 +msgid "The title of the currently loaded page" +msgstr "A jelenlegi lap címe" + +#: ../src/midori-webview.c:471 +msgid "Open Link in New _Tab" +msgstr "Hivatkozás megnyitása új _lapon" + +#: ../src/midori-webview.c:494 +msgid "Open URL in New _Tab" +msgstr "URL megnyitása új _lapon" + +#: ../src/midori-preferences.c:64 +msgid "Settings instance to provide properties" +msgstr "" + +#: ../src/midori-preferences.c:87 +#, c-format +msgid "%s Preferences" +msgstr "%s beállításai" + +#. Page "General" +#: ../src/midori-preferences.c:239 +msgid "General" +msgstr "Általános" + +#: ../src/midori-preferences.c:240 +msgid "Startup" +msgstr "Indulás" + +#. Page "Appearance" +#: ../src/midori-preferences.c:261 +msgid "Appearance" +msgstr "Megjelenés" + +#: ../src/midori-preferences.c:262 +msgid "Font settings" +msgstr "Betű beállítások" + +#. Page "Behavior" +#: ../src/midori-preferences.c:283 +msgid "Behavior" +msgstr "Viselkedés" + +#: ../src/midori-preferences.c:284 +msgid "Features" +msgstr "Képességek" + +#. Page "Interface" +#: ../src/midori-preferences.c:316 +msgid "Interface" +msgstr "Felület" + +#: ../src/midori-preferences.c:330 +msgid "Browsing" +msgstr "Böngészés" + +#. Page "Network" +#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 +msgid "Network" +msgstr "Hálózat" + +#: ../src/midori-preferences.c:358 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../src/midori-preferences.c:363 +msgid "Privacy" +msgstr "Adatvédelem" + +#: ../src/midori-preferences.c:364 +msgid "Web Cookies" +msgstr "Webes sütik" + +#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 +msgid "days" +msgstr "nap" + +#: ../src/sokoke.c:286 +msgid "Warning: You are using a superuser account!" +msgstr "VESZÉLY! Rendszergazda hozzáférést használsz!" + +#: ../src/sokoke.c:408 ../katze/katze-xbel.c:952 +#, c-format +msgid "Writing failed." +msgstr "Az írás meghiúsult." + +#: ../src/webSearch.c:115 +msgid "Empty" +msgstr "Üres" + +#: ../src/webSearch.c:187 +msgid "Add search engine" +msgstr "Kereső-motor hozzáadása" + +#: ../src/webSearch.c:187 +msgid "Edit search engine" +msgstr "Kereső-motor szerkesztése" + +#: ../src/webSearch.c:217 +msgid "_Name:" +msgstr "_Név:" + +#: ../src/webSearch.c:261 +msgid "_Icon (name or file):" +msgstr "_Ikon (Név vagy fájl):" + +#: ../src/webSearch.c:275 +msgid "_Keyword:" +msgstr "_Kulcsszó:" + +#: ../src/webSearch.c:344 +msgid "Manage search engines" +msgstr "Kereső-motorok kezelése" + +#: ../katze/katze-throbber.c:135 +msgid "Symbolic size to use for the animation" +msgstr "Az animációra használt jelképes méret" + +#: ../katze/katze-throbber.c:144 +msgid "The name of an icon containing animation frames" +msgstr "Egy animációs kereteket tartalmazó ikon neve" + +#: ../katze/katze-throbber.c:153 +msgid "A GdkPixbuf containing animation frames" +msgstr "Egy animációs kereteket tartalmazó GdkPixbuf" + +#: ../katze/katze-throbber.c:162 +msgid "Whether the throbber should be animated" +msgstr "A betöltés-jelző animált legyen-e" + +#: ../katze/katze-throbber.c:171 +msgid "The name of an icon to be used as the static image" +msgstr "Egy állóképként használandó ikon neve" + +#: ../katze/katze-throbber.c:180 +msgid "A GdkPixbuf to be used as the static image" +msgstr "Egy állóképként használandó GdkPixbuf" + +#: ../katze/katze-throbber.c:189 +msgid "The stock ID of an icon to be used as the static image" +msgstr "" + +#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Érvénytelen '%s' tulajdonság ehhez: %s" + +#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +msgid "Choose file" +msgstr "Válassz fájlt" + +#: ../katze/katze-utils.c:161 +msgid "Choose folder" +msgstr "Válassz mappát" + +#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 +#: ../katze/katze-xbel.c:804 +msgid "Malformed document." +msgstr "Hibás dokumentum." + +#: ../katze/katze-xbel.c:759 +msgid "File not found." +msgstr "A fájl nem található." From ebdedf6f31f172b7865704b21f1ee5496a8a190e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 20 May 2008 03:01:54 +0200 Subject: [PATCH 0101/2970] Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient. --- src/midori-browser.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 3d38029e..77ddae78 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -736,6 +736,9 @@ static void _action_open_activate (GtkAction* action, MidoriBrowser* browser) { + static gchar* last_dir = NULL; + gchar* uri = NULL; + gboolean folder_set = FALSE; GtkWidget* dialog = gtk_file_chooser_dialog_new ( ("Open file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN, @@ -743,11 +746,41 @@ _action_open_activate (GtkAction* action, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + + // base the start folder on the current web view's uri if it is local + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + if (web_view) + g_object_get (web_view, "uri", &uri, NULL); + if (uri) + { + gchar* filename = g_filename_from_uri (uri, NULL, NULL); + if (filename) + { + gchar* dirname = g_path_get_dirname (filename); + if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) + { + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); + folder_set = TRUE; + } + + g_free (dirname); + g_free (filename); + } + g_free (uri); + } + + if (!folder_set && last_dir && *last_dir) + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - GtkWidget* web_view = midori_browser_get_current_web_view (browser); + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + gchar* folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); g_object_set (web_view, "uri", uri, NULL); + + g_free (last_dir); + last_dir = folder; g_free (uri); } gtk_widget_destroy (dialog); From 6bc5150ea2d6747da11e6b08dd771232e5d79aaf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 20 May 2008 03:21:11 +0200 Subject: [PATCH 0102/2970] Add Show Homepage option, remove Form Fill and Small Toolbar --- src/midori-browser.c | 29 ++++++++++++++++------------- src/midori-preferences.c | 4 ++-- src/midori-websettings.c | 19 ++++++++++++++++++- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 77ddae78..cd1a2227 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -43,6 +43,7 @@ struct _MidoriBrowserPrivate GtkWidget* throbber; GtkWidget* navigationbar; GtkWidget* button_tab_new; + GtkWidget* button_homepage; GtkWidget* location_icon; GtkWidget* location; GtkWidget* search; @@ -1199,8 +1200,8 @@ _action_forward_activate (GtkAction* action, } static void -_action_home_activate (GtkAction* action, - MidoriBrowser* browser) +_action_homepage_activate (GtkAction* action, + MidoriBrowser* browser) { MidoriBrowserPrivate* priv = browser->priv; @@ -2102,9 +2103,6 @@ static const GtkActionEntry entries[] = { { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "a", N_("Select all text"), G_CALLBACK (_action_select_all_activate) }, - { "FormFill", STOCK_FORM_FILL, - NULL, "", - "hm?", NULL/*G_CALLBACK (_action_form_fill_activate)*/ }, { "Find", GTK_STOCK_FIND, NULL, "f", "hm?", G_CALLBACK (_action_find_activate) }, @@ -2158,9 +2156,9 @@ static const GtkActionEntry entries[] = { { "Forward", GTK_STOCK_GO_FORWARD, NULL, "Right", "hm?", G_CALLBACK (_action_forward_activate) }, - { "Home", STOCK_HOMEPAGE, + { "Homepage", STOCK_HOMEPAGE, NULL, "Home", - "hm?", G_CALLBACK (_action_home_activate) }, + "hm?", G_CALLBACK (_action_homepage_activate) }, { "Location", GTK_STOCK_JUMP_TO, N_("Location..."), "l", "hm?", G_CALLBACK (_action_location_activate) }, @@ -2365,7 +2363,7 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" "" "" @@ -2379,8 +2377,6 @@ static const gchar* ui_markup = "" "" "" - "" - "" "" "" "" @@ -2409,8 +2405,7 @@ static const gchar* ui_markup = "" "" "" - "" - "" + "" "" "" "" @@ -2539,6 +2534,8 @@ midori_browser_init (MidoriBrowser* browser) priv->button_tab_new = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/TabNew"); g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); + priv->button_homepage = gtk_ui_manager_get_widget ( + ui_manager, "/toolbar_navigation/Homepage"); // Location priv->location = sexy_icon_entry_new(); @@ -2912,7 +2909,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint last_window_width, last_window_height; gint last_panel_position, last_panel_page; gboolean show_navigationbar, show_bookmarkbar, show_panel, show_statusbar; - gboolean small_toolbar, show_new_tab, show_web_search, show_trash; + gboolean small_toolbar, show_new_tab, show_homepage, + show_web_search, show_trash; MidoriToolbarStyle toolbar_style; gint last_web_search; gchar* last_pageholder_uri; @@ -2928,6 +2926,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-statusbar", &show_statusbar, "small-toolbar", &small_toolbar, "show-new-tab", &show_new_tab, + "show-homepage", &show_homepage, "show-web-search", &show_web_search, "show-trash", &show_trash, "toolbar-style", &toolbar_style, @@ -2967,6 +2966,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Statusbar", show_statusbar); sokoke_widget_set_visible (priv->button_tab_new, show_new_tab); + sokoke_widget_set_visible (priv->button_homepage, show_homepage); sokoke_widget_set_visible (priv->search, show_web_search); sokoke_widget_set_visible (priv->button_trash, show_trash); @@ -2995,6 +2995,9 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, else if (name == g_intern_string ("show-new-tab")) sokoke_widget_set_visible (priv->button_tab_new, g_value_get_boolean (&value)); + else if (name == g_intern_string ("show-homepage")) + sokoke_widget_set_visible (priv->button_homepage, + g_value_get_boolean (&value)); else if (name == g_intern_string ("show-web-search")) sokoke_widget_set_visible (priv->search, g_value_get_boolean (&value)); diff --git a/src/midori-preferences.c b/src/midori-preferences.c index 16d15c2e..6a4c7d73 100644 --- a/src/midori-preferences.c +++ b/src/midori-preferences.c @@ -319,11 +319,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD(button, 1, 2, 0, 1); - button = katze_property_proxy (settings, "small-toolbar", NULL); + button = katze_property_proxy (settings, "show-new-tab", NULL); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "show-web-search", NULL); SPANNED_ADD (button, 1, 2, 1, 2); - button = katze_property_proxy (settings, "show-new-tab", NULL); + button = katze_property_proxy (settings, "show-homepage", NULL); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "show-trash", NULL); SPANNED_ADD (button, 1, 2, 2, 3); diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 90a8cc02..4304bb89 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -35,8 +35,9 @@ struct _MidoriWebSettingsPrivate MidoriToolbarStyle toolbar_style; gboolean small_toolbar; - gboolean show_web_search; gboolean show_new_tab; + gboolean show_homepage; + gboolean show_web_search; gboolean show_trash; MidoriStartup load_on_startup; @@ -90,6 +91,7 @@ enum PROP_TOOLBAR_STYLE, PROP_SMALL_TOOLBAR, PROP_SHOW_NEW_TAB, + PROP_SHOW_HOMEPAGE, PROP_SHOW_WEB_SEARCH, PROP_SHOW_TRASH, @@ -370,6 +372,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) TRUE, flags)); + g_object_class_install_property (gobject_class, + PROP_SHOW_HOMEPAGE, + g_param_spec_boolean ( + "show-homepage", + _("Show Homepage"), + _("Show the Homepage button in the toolbar"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_SHOW_WEB_SEARCH, g_param_spec_boolean ( @@ -688,6 +699,9 @@ midori_web_settings_set_property (GObject* object, case PROP_SHOW_NEW_TAB: priv->show_new_tab = g_value_get_boolean (value); break; + case PROP_SHOW_HOMEPAGE: + priv->show_homepage = g_value_get_boolean (value); + break; case PROP_SHOW_WEB_SEARCH: priv->show_web_search = g_value_get_boolean (value); break; @@ -844,6 +858,9 @@ midori_web_settings_get_property (GObject* object, case PROP_SHOW_NEW_TAB: g_value_set_boolean (value, priv->show_new_tab); break; + case PROP_SHOW_HOMEPAGE: + g_value_set_boolean (value, priv->show_homepage); + break; case PROP_SHOW_WEB_SEARCH: g_value_set_boolean (value, priv->show_web_search); break; From 6982b226b88da5a18f4fcca36166b62ce502aba3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 May 2008 14:30:52 +0200 Subject: [PATCH 0103/2970] Do not call setlocale, let gtk handle this. --- src/main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main.c b/src/main.c index f0949748..ede00a17 100644 --- a/src/main.c +++ b/src/main.c @@ -121,11 +121,6 @@ static void locale_init (void) { #ifdef ENABLE_NLS - -#if HAVE_LOCALE_H - setlocale (LC_ALL, ""); -#endif - bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -320,7 +315,7 @@ main (int argc, char** argv) gjs_script_from_file (js_context, argv[1], &exception); JSGlobalContextRelease (js_context); if (!exception) - return ; + return 0; printf ("%s - Exception: %s\n", argv[1], exception); return 1; } From 61d26feae870b0c59f59507fce5bdecf321e1e91 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 May 2008 14:32:54 +0200 Subject: [PATCH 0104/2970] Apply a few small corrections. --- src/gjs.c | 6 +----- src/midori-addons.c | 1 + src/midori-browser.c | 2 +- src/midori-websettings.c | 2 +- src/sokoke.c | 9 --------- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/gjs.c b/src/gjs.c index 36dd45a7..7074f939 100644 --- a/src/gjs.c +++ b/src/gjs.c @@ -326,15 +326,11 @@ _js_object_call_as_function_cb (JSContextRef js_context, if (!n_arguments) { - gtk_widget_show (GTK_WIDGET (object)); } else if (n_arguments == 1) { JSObjectRef js_arg1 = JSValueToObject ( js_context, js_arguments[0], NULL); - GObject* arg1 = JSObjectGetPrivate (js_arg1); - if (arg1) - gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); } return JSValueMakeUndefined (js_context); @@ -478,7 +474,7 @@ gjs_module_new (JSContextRef js_context, js_class_def.hasProperty = _js_module_has_property_cb; js_class_def.getProperty = _js_module_get_property_cb; JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_module = JSObjectMake (js_context, js_class, namespace); + JSObjectRef js_module = JSObjectMake (js_context, js_class, (gpointer)namespace); return js_module; } diff --git a/src/midori-addons.c b/src/midori-addons.c index b83f7c7c..a5a2985b 100644 --- a/src/midori-addons.c +++ b/src/midori-addons.c @@ -14,6 +14,7 @@ #include "midori-addons.h" #include "sokoke.h" +#include "gjs.h" #include #include #include diff --git a/src/midori-browser.c b/src/midori-browser.c index cd1a2227..3bf8d6d5 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -565,7 +565,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "element-motion", G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriBrowserClass, new_window), + G_STRUCT_OFFSET (MidoriBrowserClass, element_motion), 0, NULL, g_cclosure_marshal_VOID__STRING, diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 4304bb89..20bbcc01 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -485,7 +485,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open new pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, - flags)); + G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_MIDDLE_CLICK_OPENS_SELECTION, diff --git a/src/sokoke.c b/src/sokoke.c index 403dae6b..17bbc8cc 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -17,9 +17,6 @@ #include "main.h" #include -#ifdef HAVE_UNISTD_H - #include -#endif #include #include #include @@ -90,12 +87,6 @@ sokoke_entry_append_completion (GtkEntry* entry, const gchar* text) gtk_list_store_set (GTK_LIST_STORE (completion_store), &iter, 0, text, -1); } -#if SOKOKE_DEBUG > 1 - #define UNIMPLEMENTED g_print(" * Unimplemented: %s\n", G_STRFUNC); -#else - #define UNIMPLEMENTED ; -#endif - void sokoke_combo_box_add_strings(GtkComboBox* combobox , const gchar* labelFirst, ...) { From 4a488da7b165787dca56dbd87bcea8f718b40045 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 May 2008 00:17:10 +0200 Subject: [PATCH 0105/2970] Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser. --- src/Makefile.am | 1 + src/main.c | 71 ++------ src/main.h | 1 - src/midori-app.c | 385 +++++++++++++++++++++++++++++++++++++++++++ src/midori-app.h | 73 ++++++++ src/midori-browser.c | 31 +++- src/midori-browser.h | 2 +- src/midori-panel.c | 2 +- src/midori-trash.c | 4 +- src/midori-webview.c | 12 +- 10 files changed, 502 insertions(+), 80 deletions(-) create mode 100644 src/midori-app.c create mode 100644 src/midori-app.h diff --git a/src/Makefile.am b/src/Makefile.am index dee2ba7e..bda06d22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,6 +18,7 @@ bin_PROGRAMS = \ midori_SOURCES = \ main.c main.h \ + midori-app.c midori-app.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ midori-addons.c midori-addons.h \ diff --git a/src/main.c b/src/main.c index ede00a17..7f11b5ac 100644 --- a/src/main.c +++ b/src/main.c @@ -14,22 +14,20 @@ #include "sokoke.h" #include "search.h" +#include "midori-app.h" #include "midori-websettings.h" #include "midori-trash.h" #include "midori-browser.h" -#include #include "gjs.h" +#include #include #include #include "config.h" #ifdef ENABLE_NLS -# include -# if HAVE_LOCALE_H -# include -# endif + #include #endif // -- stock icons @@ -76,47 +74,6 @@ static void stock_items_init(void) g_object_unref(factory); } -static gboolean -midori_browser_delete_event_cb (MidoriBrowser* browser, - GdkEvent* event, - GList* browsers) -{ - browsers = g_list_remove (browsers, browser); - if (g_list_nth (browsers, 0)) - return FALSE; - gtk_main_quit (); - return TRUE; -} - -static void -midori_browser_quit_cb (MidoriBrowser* browser, - GdkEvent* event, - GList* browsers) -{ - gtk_main_quit (); -} - -static void -midori_browser_new_window_cb (MidoriBrowser* browser, - const gchar* uri, - GList* browsers) -{ - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, - // "settings", settings, - // "trash", trash, - NULL); - // gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group); - g_object_connect (new_browser, - "signal::new-window", midori_browser_new_window_cb, browsers, - "signal::delete-event", midori_browser_delete_event_cb, browsers, - "signal::quit", midori_browser_quit_cb, browsers, - NULL); - browsers = g_list_prepend(browsers, new_browser); - gtk_widget_show (GTK_WIDGET (new_browser)); - - midori_browser_append_uri (new_browser, uri); -} - static void locale_init (void) { @@ -441,11 +398,12 @@ main (int argc, char** argv) } g_free (config_path); - stock_items_init(); + stock_items_init (); - MidoriTrash* trash = g_object_new (MIDORI_TYPE_TRASH, - "limit", 10, - NULL); + MidoriApp* app = midori_app_new (); + g_object_set (app, "settings", settings, NULL); + + MidoriTrash* trash = midori_app_get_trash (app); guint n = katze_xbel_folder_get_n_items (xbel_trash); guint i; for (i = 0; i < n; i++) @@ -454,20 +412,12 @@ main (int argc, char** argv) midori_trash_prepend_xbel_item (trash, item); } - GtkAccelGroup* accel_group = gtk_accel_group_new(); - GList* browsers = NULL; - MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", settings, "trash", trash, NULL); - gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group); - g_object_connect (browser, - "signal::new-window", midori_browser_new_window_cb, browsers, - "signal::delete-event", midori_browser_delete_event_cb, browsers, - "signal::quit", midori_browser_quit_cb, browsers, - NULL); - browsers = g_list_prepend (browsers, browser); + g_signal_emit_by_name (app, "add-browser", browser); + gtk_widget_show (GTK_WIDGET (browser)); KatzeXbelItem* session = katze_xbel_folder_new (); @@ -509,7 +459,6 @@ main (int argc, char** argv) gtk_main (); JSGlobalContextRelease (js_context); - g_object_unref (accel_group); // Save configuration files config_path = g_build_filename (g_get_user_config_dir(), PACKAGE_NAME, diff --git a/src/main.h b/src/main.h index 6e603014..c820fe5b 100644 --- a/src/main.h +++ b/src/main.h @@ -12,7 +12,6 @@ #ifndef __MAIN_H__ #define __MAIN_H__ 1 -#include "midori-websettings.h" #include #include diff --git a/src/midori-app.c b/src/midori-app.c new file mode 100644 index 00000000..afbc60b5 --- /dev/null +++ b/src/midori-app.c @@ -0,0 +1,385 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-app.h" + +#include +#include + +G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) + +static MidoriApp* _midori_app_singleton = NULL; + +struct _MidoriAppPrivate +{ + GList* browsers; + MidoriBrowser* browser; + GtkAccelGroup* accel_group; + + MidoriWebSettings* settings; + MidoriTrash* trash; +}; + +#define MIDORI_APP_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + MIDORI_TYPE_APP, MidoriAppPrivate)) + +enum +{ + PROP_0, + + PROP_SETTINGS, + PROP_TRASH, + PROP_BROWSER, + PROP_BROWSER_COUNT +}; + +enum { + ADD_BROWSER, + QUIT, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static GObject* +midori_app_constructor (GType type, + guint n_construct_properties, + GObjectConstructParam* construct_properties); + +static void +midori_app_finalize (GObject* object); + +static void +midori_app_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_app_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_app_add_browser (MidoriApp* app, + MidoriBrowser* browser); + +static void +midori_app_quit (MidoriApp* app); + +static void +midori_app_class_init (MidoriAppClass* class) +{ + signals[ADD_BROWSER] = g_signal_new ( + "add-browser", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriAppClass, add_browser), + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + MIDORI_TYPE_BROWSER); + + signals[QUIT] = g_signal_new ( + "quit", + G_TYPE_FROM_CLASS(class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriAppClass, quit), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->constructor = midori_app_constructor; + gobject_class->finalize = midori_app_finalize; + gobject_class->set_property = midori_app_set_property; + gobject_class->get_property = midori_app_get_property; + + MidoriAppClass* midoriapp_class = MIDORI_APP_CLASS (class); + midoriapp_class->add_browser = midori_app_add_browser; + midoriapp_class->quit = midori_app_quit; + + g_object_class_install_property (gobject_class, + PROP_SETTINGS, + g_param_spec_object ( + "settings", + _("Settings"), + _("The associated settings"), + MIDORI_TYPE_WEB_SETTINGS, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_TRASH, + g_param_spec_object ( + "trash", + _("Trash"), + _("The trash, collecting recently closed tabs and windows"), + MIDORI_TYPE_TRASH, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_BROWSER, + g_param_spec_object ( + "browser", + _("Browser"), + _("The current browser"), + MIDORI_TYPE_BROWSER, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_BROWSER_COUNT, + g_param_spec_uint ( + "browser-count", + _("Browser Count"), + _("The current number of browsers"), + 0, G_MAXUINT, 0, + G_PARAM_READABLE)); + + g_type_class_add_private (class, sizeof (MidoriAppPrivate)); +} + +static GObject* +midori_app_constructor (GType type, + guint n_construct_properties, + GObjectConstructParam* construct_properties) +{ + if (_midori_app_singleton) + return g_object_ref (_midori_app_singleton); + else + return G_OBJECT_CLASS (midori_app_parent_class)->constructor ( + type, n_construct_properties, construct_properties); +} + +static void +midori_app_init (MidoriApp* app) +{ + g_assert (!_midori_app_singleton); + + _midori_app_singleton = app; + + app->priv = MIDORI_APP_GET_PRIVATE (app); + + MidoriAppPrivate* priv = app->priv; + + priv->accel_group = gtk_accel_group_new (); + + priv->settings = midori_web_settings_new (); + priv->trash = midori_trash_new (10); +} + +static void +midori_app_finalize (GObject* object) +{ + MidoriApp* app = MIDORI_APP (object); + MidoriAppPrivate* priv = app->priv; + + g_list_free (priv->browsers); + g_object_unref (priv->accel_group); + + g_object_unref (priv->settings); + g_object_unref (priv->trash); + + G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); +} + +static void +midori_app_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriApp* app = MIDORI_APP (object); + MidoriAppPrivate* priv = app->priv; + + switch (prop_id) + { + case PROP_SETTINGS: + katze_object_assign (priv->settings, g_value_get_object (value)); + g_object_ref (priv->settings); + // FIXME: Propagate settings to all browsers + break; + case PROP_TRASH: + katze_object_assign (priv->trash, g_value_get_object (value)); + g_object_ref (priv->trash); + // FIXME: Propagate trash to all browsers + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_app_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriApp* app = MIDORI_APP (object); + MidoriAppPrivate* priv = app->priv; + + switch (prop_id) + { + case PROP_SETTINGS: + g_value_set_object (value, priv->settings); + break; + case PROP_TRASH: + g_value_set_object (value, priv->trash); + break; + case PROP_BROWSER: + g_value_set_object (value, priv->browser); + break; + case PROP_BROWSER_COUNT: + g_value_set_uint (value, g_list_length (priv->browsers)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_browser_focus_in_event_cb (MidoriBrowser* browser, + GdkEventFocus* event, + MidoriApp* app) +{ + MidoriAppPrivate* priv = app->priv; + + priv->browser = browser; +} + +static void +midori_browser_new_window_cb (MidoriBrowser* browser, + const gchar* uri, + MidoriApp* app) +{ + MidoriAppPrivate* priv = app->priv; + + MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, + "settings", priv->settings, + "trash", priv->trash, + NULL); + midori_browser_append_uri (new_browser, uri); + gtk_widget_show (GTK_WIDGET (new_browser)); + + g_signal_emit (app, signals[ADD_BROWSER], 0, new_browser); +} + +static gboolean +midori_browser_delete_event_cb (MidoriBrowser* browser, + GdkEvent* event, + MidoriApp* app) +{ + return FALSE; +} + +static gboolean +midori_browser_destroy_cb (MidoriBrowser* browser, + MidoriApp* app) +{ + MidoriAppPrivate* priv = app->priv; + + priv->browsers = g_list_remove (priv->browsers, browser); + if (g_list_nth (priv->browsers, 0)) + return FALSE; + g_signal_emit (app, signals[QUIT], 0); + return TRUE; +} + +static void +midori_browser_quit_cb (MidoriBrowser* browser, + MidoriApp* app) +{ + g_signal_emit (app, signals[QUIT], 0); +} + +static void +midori_app_add_browser (MidoriApp* app, + MidoriBrowser* browser) +{ + MidoriAppPrivate* priv = app->priv; + + gtk_window_add_accel_group (GTK_WINDOW (browser), priv->accel_group); + g_object_connect (browser, + "signal::focus-in-event", midori_browser_focus_in_event_cb, app, + "signal::new-window", midori_browser_new_window_cb, app, + "signal::delete-event", midori_browser_delete_event_cb, app, + "signal::destroy", midori_browser_destroy_cb, app, + "signal::quit", midori_browser_quit_cb, app, + NULL); + + priv->browsers = g_list_prepend (priv->browsers, browser); +} + +static void +midori_app_quit (MidoriApp* app) +{ + gtk_main_quit (); +} + +/** + * midori_app_new: + * + * Instantiates a new #MidoriApp singleton. + * + * Subsequent calls will ref the initial instance. + * + * Return value: a new #MidoriApp + **/ +MidoriApp* +midori_app_new (void) +{ + MidoriApp* app = g_object_new (MIDORI_TYPE_APP, + NULL); + + return app; +} + +/** + * midori_app_get_settings: + * @app: a #MidoriApp + * + * Retrieves the #MidoriWebSettings of the app. + * + * Return value: the assigned #MidoriWebSettings + **/ +MidoriWebSettings* +midori_app_get_settings (MidoriApp* app) +{ + g_return_val_if_fail (MIDORI_IS_APP (app), NULL); + + MidoriAppPrivate* priv = app->priv; + + return priv->settings; +} + +/** + * midori_app_get_trash: + * @app: a #MidoriApp + * + * Retrieves the #MidoriTrash of the app. + * + * Return value: the assigned #MidoriTrash + **/ +MidoriTrash* +midori_app_get_trash (MidoriApp* app) +{ + g_return_val_if_fail (MIDORI_IS_APP (app), NULL); + + MidoriAppPrivate* priv = app->priv; + + return priv->trash; +} diff --git a/src/midori-app.h b/src/midori-app.h new file mode 100644 index 00000000..b5aaa45c --- /dev/null +++ b/src/midori-app.h @@ -0,0 +1,73 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_APP_H__ +#define __MIDORI_APP_H__ + +#include + +#include "midori-browser.h" +#include "midori-websettings.h" +#include "midori-trash.h" + +G_BEGIN_DECLS + +#define MIDORI_TYPE_APP \ + (midori_app_get_type ()) +#define MIDORI_APP(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_APP, MidoriApp)) +#define MIDORI_APP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_APP, MidoriAppClass)) +#define MIDORI_IS_APP(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_APP)) +#define MIDORI_IS_APP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_APP)) +#define MIDORI_APP_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_APP, MidoriAppClass)) + +typedef struct _MidoriApp MidoriApp; +typedef struct _MidoriAppPrivate MidoriAppPrivate; +typedef struct _MidoriAppClass MidoriAppClass; + +struct _MidoriApp +{ + GObject parent_instance; + + MidoriAppPrivate* priv; +}; + +struct _MidoriAppClass +{ + GObjectClass parent_class; + + /* Signals */ + void + (*add_browser) (MidoriApp* app, + MidoriBrowser* browser); + void + (*quit) (MidoriApp* app); +}; + +GType +midori_app_get_type (void); + +MidoriApp* +midori_app_new (void); + +MidoriWebSettings* +midori_app_get_web_settings (MidoriApp* app); + +MidoriTrash* +midori_app_get_trash (MidoriApp* app); + +G_END_DECLS + +#endif /* __MIDORI_APP_H__ */ diff --git a/src/midori-browser.c b/src/midori-browser.c index 3bf8d6d5..eef95662 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -540,7 +540,7 @@ midori_browser_class_init (MidoriBrowserClass* class) signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( "window-object-cleared", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriBrowserClass, window_object_cleared), 0, NULL, @@ -553,7 +553,7 @@ midori_browser_class_init (MidoriBrowserClass* class) signals[STATUSBAR_TEXT_CHANGED] = g_signal_new ( "statusbar-text-changed", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriBrowserClass, statusbar_text_changed), 0, NULL, @@ -564,7 +564,7 @@ midori_browser_class_init (MidoriBrowserClass* class) signals[ELEMENT_MOTION] = g_signal_new ( "element-motion", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriBrowserClass, element_motion), 0, NULL, @@ -585,7 +585,7 @@ midori_browser_class_init (MidoriBrowserClass* class) signals[NEW_WINDOW] = g_signal_new ( "new-window", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriBrowserClass, new_window), 0, NULL, @@ -807,7 +807,7 @@ static void _action_quit_activate (GtkAction* action, MidoriBrowser* browser) { - gtk_main_quit (); + g_signal_emit (browser, signals[QUIT], 0); } static void @@ -2305,6 +2305,16 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, } } +static void +midori_browser_destroy_cb (MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv = browser->priv; + + // Destroy tabs first, so widgets can still see window elements on destroy + gtk_container_foreach (GTK_CONTAINER (priv->notebook), + G_CALLBACK (gtk_widget_destroy), NULL); +} + static const gchar* ui_markup = "" "" @@ -2437,6 +2447,8 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_window_state_event_cb), NULL); g_signal_connect (browser, "size-allocate", G_CALLBACK (midori_browser_size_allocate_cb), NULL); + g_signal_connect (browser, "destroy", + G_CALLBACK (midori_browser_destroy_cb), NULL); // FIXME: Use custom program icon gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ()); @@ -3037,6 +3049,8 @@ midori_browser_set_property (GObject* object, _midori_browser_update_settings (browser); g_signal_connect (priv->settings, "notify", G_CALLBACK (midori_browser_settings_notify), browser); + // FIXME: Assigning settings must be conditional, if web view or not + // FIXME: Assign settings only if the same settings object was used gtk_container_foreach (GTK_CONTAINER (priv->notebook), (GtkCallback) midori_web_view_set_settings, priv->settings); @@ -3097,17 +3111,18 @@ midori_browser_get_property (GObject* object, * * Creates a new browser widget. * - * A browser is a window with toolbars and one or multiple web views. + * A browser is a window with a menubar, toolbars, a notebook, panels + * and a statusbar. You should mostly treat it as an opaque widget. * * Return value: a new #MidoriBrowser **/ -GtkWidget* +MidoriBrowser* midori_browser_new (void) { MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, NULL); - return GTK_WIDGET (browser); + return browser; } /** diff --git a/src/midori-browser.h b/src/midori-browser.h index 6dda0b43..a0af0a8b 100644 --- a/src/midori-browser.h +++ b/src/midori-browser.h @@ -68,7 +68,7 @@ struct _MidoriBrowserClass GType midori_browser_get_type (void); -GtkWidget* +MidoriBrowser* midori_browser_new (void); gint diff --git a/src/midori-panel.c b/src/midori-panel.c index 128d8e0c..9c321d1e 100644 --- a/src/midori-panel.c +++ b/src/midori-panel.c @@ -122,7 +122,7 @@ midori_panel_class_init (MidoriPanelClass* class) signals[SWITCH_PAGE] = g_signal_new ( "switch-page", G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriPanelClass, switch_page), 0, NULL, diff --git a/src/midori-trash.c b/src/midori-trash.c index efc2d312..10dce2c8 100644 --- a/src/midori-trash.c +++ b/src/midori-trash.c @@ -63,7 +63,7 @@ midori_trash_class_init (MidoriTrashClass* class) signals[INSERTED] = g_signal_new ( "inserted", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriTrashClass, inserted), 0, NULL, @@ -74,7 +74,7 @@ midori_trash_class_init (MidoriTrashClass* class) signals[REMOVED] = g_signal_new ( "removed", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriTrashClass, removed), 0, NULL, diff --git a/src/midori-webview.c b/src/midori-webview.c index d1a126d0..f3810c72 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -108,7 +108,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[PROGRESS_STARTED] = g_signal_new ( "progress-started", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, progress_started), 0, NULL, @@ -119,7 +119,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[PROGRESS_CHANGED] = g_signal_new ( "progress-changed", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, progress_changed), 0, NULL, @@ -130,7 +130,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[PROGRESS_DONE] = g_signal_new ( "progress-done", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, progress_done), 0, NULL, @@ -141,7 +141,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[LOAD_DONE] = g_signal_new ( "load-done", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, load_done), 0, NULL, @@ -152,7 +152,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[ELEMENT_MOTION] = g_signal_new( "element-motion", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, element_motion), 0, NULL, @@ -184,7 +184,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[NEW_WINDOW] = g_signal_new( "new-window", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, new_window), 0, NULL, From a6aa3453164542303dc2d3d725f53d491d023a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 23 May 2008 01:58:44 +0200 Subject: [PATCH 0106/2970] Do not set a tooltip on tool items if the text is empty --- src/sokoke.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/sokoke.c b/src/sokoke.c index 17bbc8cc..48ab43df 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -129,11 +129,17 @@ void sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* text) #endif } -void sokoke_tool_item_set_tooltip_text(GtkToolItem* toolitem, const gchar* text) +void +sokoke_tool_item_set_tooltip_text (GtkToolItem* toolitem, const gchar* text) { // TODO: Use 2.12 api if available - GtkTooltips* tooltips = gtk_tooltips_new(); - gtk_tool_item_set_tooltip(toolitem, tooltips, text, NULL); + static GtkTooltips* tooltips = NULL; + + if (G_UNLIKELY (!tooltips)) + tooltips = gtk_tooltips_new(); + + if (text && *text) + gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); } typedef struct From 29e87133aebe9d3048522bbf3fd10b7a7904b902 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 May 2008 02:02:21 +0200 Subject: [PATCH 0107/2970] Updated AUTHORS file. --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 2899f226..2ac5cbab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,9 +9,11 @@ Translations: de: Christian Dywan fr: Christian Dywan fr: Adrien Nader + hu: SZERVÁC Attila pl: Przemysław Sitek sv: Mikael Magnusson Contributors: Ori Bernstein Przemek Sitek + Enrico Tröger From 95cbba25485b5897165ee0b82d189e42749c9a68 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 May 2008 11:55:54 +0200 Subject: [PATCH 0108/2970] First attempt at a waf build system --- .gitignore | 5 +- katze/wscript_build | 12 ++++ po/wscript_build | 5 ++ src/wscript_build | 9 +++ waf | 143 ++++++++++++++++++++++++++++++++++++++++++++ wscript | 84 ++++++++++++++++++++++++++ 6 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 katze/wscript_build create mode 100644 po/wscript_build create mode 100644 src/wscript_build create mode 100755 waf create mode 100644 wscript diff --git a/.gitignore b/.gitignore index e9e4d199..a43b4405 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,10 @@ missing mkinstalldirs stamp-h1 +.waf-* +.lock-wscript +_build_ + intltool-extract.in intltool-extract intltool-merge.in @@ -33,4 +37,3 @@ po/*.gmo midori midori.desktop - diff --git a/katze/wscript_build b/katze/wscript_build new file mode 100644 index 00000000..efa43b5e --- /dev/null +++ b/katze/wscript_build @@ -0,0 +1,12 @@ +#! /usr/bin/env python +# WAF build script for midori + +obj = bld.create_obj ('cc', 'staticlib') +obj.name = 'katze' +obj.target = 'katze' +obj.includes = '.' +obj.find_sources_in_dirs ('.') +obj.uselib = 'GTK LIBXML' +obj.inst_var = 0 + +# FIXME: Do not install this static lib diff --git a/po/wscript_build b/po/wscript_build new file mode 100644 index 00000000..3a1dce71 --- /dev/null +++ b/po/wscript_build @@ -0,0 +1,5 @@ +#! /usr/bin/env python +# WAF build script for midori + +obj = bld.create_obj ('intltool_po') +obj.appname = 'midori' diff --git a/src/wscript_build b/src/wscript_build new file mode 100644 index 00000000..df741850 --- /dev/null +++ b/src/wscript_build @@ -0,0 +1,9 @@ +#! /usr/bin/env python +# WAF build script for midori + +obj = bld.create_obj ('cc', 'program') +obj.target = 'midori' +obj.includes = '.. ../katze' +obj.find_sources_in_dirs ('.') +obj.uselib = 'GTK WEBKIT LIBXML LIBSEXY' +obj.uselib_local = 'katze' diff --git a/waf b/waf new file mode 100755 index 00000000..e87084ae --- /dev/null +++ b/waf @@ -0,0 +1,143 @@ +#! /usr/bin/env python +# encoding: utf-8 +# Thomas Nagy, 2005-2008 + +""" +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +""" + +import os, sys +if sys.hexversion<0x203000f: raise "Waf requires Python >= 2.3" + +if 'PSYCOWAF' in os.environ: + try:import psyco;psyco.full() + except:pass + +VERSION="1.4.0" +REVISION="259060ce045468a92526b39054bb6964" +INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' +cwd = os.getcwd() +join = os.path.join + +def decode(s): + p1 = len(s) + s += '!!!!!' + w1 = [256**(3-u) for u in xrange(4)] + w2 = [(u, 85**(4-u)) for u in xrange(5)] + tot = [sum([(ord(s[i+m])-33) * n for (m, n) in w2]) for i in xrange(0, p1, 5)] + return ''.join([chr((y/x) & 255) for y in tot for x in w1]) + +def err(m): + print '\033[91mError: %s\033[0m' % m + sys.exit(1) + +def unpack_wafdir(dir): + f = open(sys.argv[0],'rb') + c = "corrupted waf (%d)" + while 1: + line = f.readline() + if not line: err("run waf-light from a folder containing wafadmin") + if line == '#==>\n': + txt = f.readline() + if not txt: err(c % 1) + if f.readline()!='#<==\n': err(c % 2) + break + if not txt: err(c % 3) + try: txt = decode(txt[1:-1].replace('z', '!!!!!')) + except: err(c % 4) + + import shutil, tarfile + try: shutil.rmtree(dir) + except OSError: pass + try: os.makedirs(join(dir, 'wafadmin', 'Tools')) + except OSError: err("Cannot unpack waf-local into %s Install waf system-wide or move waf into a writeable directory"%dir) + + os.chdir(dir) + tmp = 't.tbz2' + t = open(tmp,'wb') + t.write(txt) + t.close() + + t = tarfile.open(tmp) + for x in t: t.extract(x) + t.close() + + os.unlink(tmp) + os.chdir(cwd) + +def test(dir): + try: os.stat(join(dir, 'wafadmin')); return os.path.abspath(dir) + except OSError: pass + +def find_lib(): + name = sys.argv[0] + base = os.path.dirname(os.path.abspath(name)) + + #devs use $WAFDIR + w=test(os.environ.get('WAFDIR', '')) + if w: return w + + #waf-light + if name.endswith('waf-light'): + w = test(base) + if w: return w + err("waf-light requires wafadmin -> export WAFDIR=/folder") + + dir = "/lib/waf-%s-%s/" % (VERSION, REVISION) + for i in [INSTALL,'/usr','/usr/local','/opt']: + w = test(i+dir) + if w: return w + + #waf-local + s = '.waf-%s-%s' + if sys.platform == 'win32': s = s[1:] + dir = join(base, s % (VERSION, REVISION)) + w = test(dir) + if w: return w + + #unpack + unpack_wafdir(dir) + return dir + +wafdir = find_lib() +if "-vv" in sys.argv: print "wafdir is %s" % wafdir + +w = join(wafdir, 'wafadmin') +t = join(w, 'Tools') +sys.path = [w, t] + sys.path + +import Scripting, Params +Params.g_tooldir = [t] +Params.g_cwd_launch = cwd + +if Params.g_version != VERSION: + err('Version mismatch: waf %s <> wafadmin %s (wafdir %s)' % (VERSION, Params.g_version, wafdir)) +Scripting.prepare() + +#==> +#6<\%_0gSqh;d!5CiqWY(>lXj(Z;EriFChSIA.!o!:mML2IoQZR?5FRIt%J0'K=!D4C5JH=sO#Hp%'og64i-1,WZY@aVW^_5O"qgJ'8Ddh!2fml2>Q$+'R<=krk.Zsc[MQ08@W_fJopUR^B#G=/^>jlh(H0E]Ego.pSm`&3FBiK_5D7qHo%kH51G5Cl5^?nA`GGcL+YIED!mW4]MTGPS6]>"*mgABo8LW/(LX*6LC^2CPqQepNgf_]FMq0dQg[I2?/QaY)jp=6j9,X"*=1c\a[hR>C$^3/:KGV"9g\[8uX%dnJ7hKukSlLf8\pNp3?IHpRTm^_*-mVnNQ$9e'X4snM:IDO\II>^6bG"S"[l2?t\#ebX'CWZ%ASV#+YHLd\!U"YP!PNp=DnWk<2k/[m4+6YE^AGV8lobY4mr[kZ^$f5Xl\>;n\OcOa7ZY4gTUEI"f\^RQgK/TDqqjQoF76SEh?3%Yf6/\!hei&#c)G&WH0KI@#X1n=VVc_:HMU)m]%q"]p"oFi](tf%Dc=sRp@l$lQcD;ICMDnl_s.@-<7LZt3aHW'I8@%p?[9+nBJ4_h8$2LTLYVHIk?+4\n#(BcNUReW;gRl/Cj3=Yla%S@q`Wp,HfjL.\%A6FgO7(*g[6H@G:Kc_kGn5rpc"f@_#(P2!Nu;"d$rX2hVLEO^7Oes]63:gYAg$f/BgVID5LNHf"L'f^%5Yn%Is1^@(;VfPPIPb$)\e!Megq@IJMi)t"TPm,$F>gsb_?o0)TVf?;\@md8DsJ-;IC8J*ZYA0uj]8aTGj1K2_JRV:'h1^t@LRK*E5)ZJD;#O>Jn:[aOLmpuqW[1dYKo/Z@mc+speGb'+R+_Yh#/u)q0Z./2#PtY*=BBU*`,WebiZO8LE5W0Nei#HlA`3sT8]0=_ntQ]c5kBc!QYW=)Bk!aT$-#JUACKE3XaiR-!O(X$\mPNV0eo]*XX-uKJNT7PL*9LnTu_L5E:]e;7:AV%k0f=Ob/9;^*s'`(FjCVT^eo&ZF/,"&h+t`2m?<72_IJOVU;RK4[\)Bh_bf/BA6_7"@,rdNK%(@n'C5["9&sZF8,3AelgddZ\-D8s7FURj?"qZ(VTYN<2g./CnF$'2"629d*(;/I!=p$!>HJ1atnWUnn`$(.f'2Ak"&N18uK@dhXYb'3[sOV@\J,9SnlM.4$mlKf5Z>)c8CF,#kA4'+p?Q,>?''Qjh'`/;2GJW)8EuOXQ%5Q=QAMUkE2NdZ[$38o2lZN7&l5@`6DWBS`u?Z#,\(RnVL'`ls:4:c:jR8Ab=es^^Uf(f?)H0bZb%AOH7$uF]-tJ^M1E/U.23M+.RT(\/dYSS:0VD!L9Oc!fOc5.&MG+I%VAVrDe:k24!b>,lN&F"=@1f<&VP^+ZBLm`kTeW4gOI6QR#m:Pk)&AB#9Zm^k'Jbe#CnW/];[YBh9X(c:MbJr/,$%=b1_Ej4RKGgDMFqPOa]V?*VIE8a=>D_@RBV:"W1o0,82=*g@?jB\%7tB!;$)q^@ZsAQN,(8lZr2K[%()]sU5Ml;@qmpAZ<0MJMMb)0Mag7eOf\dU8Q`6#)J]qdP%lj"c!WHOXA]9\b#kU,`MlDI1=CnN@`UkfL1\AfAXX`P/7MaKQm.L;,aq7N!0$s_N_15\C++XEJX6=Vl%+N$&`9e?s]'4YRO%21F\\]G.l[#iF)R+dI36R6Lf7\na4P9QH".&NgXB!G6GB#KZa`_7eX@j]q=1R>I`F-=F,rM5@1E'/WT:(*qQN;.tqU>8UbV)_j+m)^^at@b@GdTpR8J,h-N[-(1u,`_E8))&l#>;OTA(XOC_%0pE,9KOY=oN5c-*gC0ifV6Q/b)UYMs/J0H8JPiZ;uoX/4`?:-"@C=8iDl)1=VSj8S]O'9/LKW@ka]hV5DLq$'I0'adKGC'oOjo0t'cq=Z27;7$QFQQu''qacZglAX6$pbdB3cVM9o(Rn?6tBr9Yn;Z2Wb*-L(70nm&*aOnLl)GG"-&ZQ3p.7W#a6HruhK-F5NP@i'56H(^cLf'.gQAZ07X!TNn>)b5iNJ+_lMLs5f)4$\-=P?\aMV)IG>&%hTa]g*kA[X(OZq6"pZrW?afIG?%D'lW(VNBB'`[t@Dg/Di7R@u'kC/##'>7m<'RSuY\)4"i.18Ig8[&,QiCeZJp0s_:"UrJ@hR?gR3Q'ta:ULh'pLBZgkY&RNM@^Iu2.m6u(:Tloc8d$u#X\h3Ui(_l*AE1iN>@ji0m-lZJY;S%Sc"ip]m@D$d'Ar-Q=u"p8OOo#+<;4(nK$9Q7oH1Tn*;nVRM[GCDWhe+T7k\P$dM+8Xs;1:5;NQFYD>#1on\d7ig/kkgj/baWP@+M'q_N5[cfpQ$N*cP\8O[jC,jYfCcq[X;Kmd.B%M==ch-3%=.5-#:!\t+ji`o"b7R=/sr`B#t4)JF.:Pj79GQC&`0Q.?in]]"_`(s0cs?a_B*bui[X1qhKj7-8F^r%rDl_2UDR+oYr;UlV8->R'r#ZJ\UX/\PJed\#KYnV&ZChR1=O-,&2_8j?7CQ!rZ-6lplX5aDH'8gR&1iV1-k=%?F\XYGfgNPd,j%%h-"@t)K'K8bI0LD7Z4&1!S-\sj@n/KhEi_B4q0BhY'0mQspOl"B"9Moed@Ou`t2G!r%u[J,.K%@,mnG6/"J#m^!XN;jZp\MrD<\r32,tT8Q.SR%92L3$-o%#^nhkq5HD@uK0S/GRKEg$rBMbHAT][gmVdl("^r`2f,jK1mEmAsBF?%qp]bUlQ+2ARfS[N[C5U@q9*#bA8CN9<42IUBibB.$:ftDFAnJ-JRdLZ4WW@7:NuJ7*sJ(]>X8L%<8t!!:'I]n(3!QmCqC)UdF!*"?SY1q;pQA#9eRR);\E_B[`(-WUfjL"kNukP\">f?s724AP\X$)UaeWe+UnEc;TZEHlQg9cNWLP)U3)i-PddupZ"`+#1\_(kVMZ&>Jo9L9CZ^iA/!sL3]OLcVDp8bSuG-q6Qm]ZJ!\H^Ct"@q&oXof4GQMjX:o6epo.-q*%+ju&A/=ZG@78Q?RJ$nOW6@DORWk07YWaT??MW,Nk[JqVu/@uL/)C9F1r@U4KKKa./lFU+aPr1?J4S&[.MeAnn/?:dU\B;d,ucdADZTm$WQhOYiRac5gAnkdmg*LitgEde2t)3f\,DR_kb"pDcWnER&?25a2C4GP[eY8_^'Bgrr0JeeGg&-qFihBQ]E7T_Z-^1[i#J`q:La-O]Em)6=If2WJHs'I8d,KN;DZlo()MLneY;+"tP*8G(5\7AFBPDeMUtr0i6pFFb(SM@iY=?sS$!:PP)Qp[tocLUWX5N_\l+c_.]34CMAG_CVS=BdAkPLm2nm;tF=gA@H`1CMK;&/nH"sg%"E:H'@C>:tM"^%qC&N1`F"HK:4m\5XMI1_dS*,D#A'Qd4mIFVFI9cU6^:e.4g.7PM`<7a_IVLCUZu7n?BMGcjY2Ad*B@5t:H,Jc[1;OLeG\(;T;qV=:E*T?85malQ3F#WdGd/^d4pE>1=-\4(/27-6>;iPYm##SRF8iS]g$WQM>):08]>mb\s#@)0!_2V'pBkd(U$^PID9u#:]RGC4qM-fS;Q+#f&aP*S@OZP=ZoE7Y`!0P.b9/acP`2]C(H$)tJD9(#q`95$$;n>^7+r1T%\NR]g7DM9!L1+E0c&*!%iDVoDk%hMS(&H`D^lj[d$JfA5fYH"T,n->E(F>fZ*YlA"hi)#md8XT(PH^E!P;_J9"U\TOmLSM+<0%l/#Y3sOd0D(2Jg9>p7T,UDCn`^ARJTU_r$RH+);[s`Nk#K>_lnM56qq!Y?$nfUf\;]l<9S?8MQ8.K*#4RR5eLNA*a`+sh#%[`u*P@^5kXuqJ_=Zj@g6X=b4;-t`:ds?eQbJD4@$I!Yt6WcH?iC%g=qhYO:(lJKd/j0&Ob8YABC"$fjD"sMO9ZrHlI^#%tLEL\cZ`HrUfRI%f5PUf#0`Dls,!.&Yg/d"#=$M@5h%Xs,FbI7;e$Z">Qd1BB2gdWBgkTNrEce5U>Fc+E.UCDH*cBc`,FQ0#ONsO3aZ0VSLIr4Xf=+=Xf%l5grGcu6,)kWjcoVIW9bH1@kEeDI?o[g!IRpK8Bm/PpU.h9h42mu(Jb@7p8JN7S[KY99QWdQLF`,OSN'"tNjbJV#2cLt`kY42X350Q!sa2=`9+A>'S5qS.MXr=lJe-2ian4fk.KIZQm,KUH4Q&B"24lPn$CU78l-MVD!e4UIZ?&sm[\G:G?i8LY^FcM/3Ki"d->@Oh-Yc`YNZk];F:!hJ^-:]7`f0T3PB>A7fRGH;K>:LBI3@KSr1!J\r$R584Tj;MY8W2e6D/[sr(_W'(E#noh!J2Ct2Si!,F%"r;%gDW7C%l';)?Q9XHNA7>ia6\$[#^(e^l3&7bQ'fH3PRq7/Oa6,q(YLNT@<9j\*BYrHKlOi356T8OE9BY;9AVTNh@S)[k1%k\[6U^7Lcn35E0*Z06&$8t:e!u1l.s6m!$.0(B_t+$WEL'_?)sGU^oa\+hOkE*P!WT?)"jdn9Q*_d[3@6i\(Khra[[.\&?(rdLH^KdVn@+5CN&R7_Iq]YfDZ/gdcQ'mffKTl,PoWF&;3EU)4M.Qjf[i7^WkPFhsjPO)a<[A5!Qj[Q3Babk8U\`=K]<=s3(2Iu?Mf-=2S&oqR1F89,6QA'GU@-uKXgZ9O+Jas@OcDo?r`LUu8l*]Z3)7+7[J?_tIerOU.Fip:7T\`ZLqL/`H/l\b](UX7[.jKl5^I7le+:@p[5YWdH*(V-SGB*\MQt@Dh0;>W#l*9;W_?)2+*O]:KEcZ,:27["WJJIXnB76bt1":+Ac#H+7U3Njp5?j+iOY)jB]Z;,9ZShFEQiM?r7ue%`3\7gaV-k$Js_EaWsJ>S9T&I:DLsf?UPBnTrkQ+&socR$B83LBE'#Cit0P7GlLMWt6o&r8>-kT>ip?rJP-(mSU^h1j@?hcnRd%VFcGl+Y$%-5W,\e9Qi%N;Y(i#q/"o)BCk1bXNM)Yp=l>P28eR@+HCS$gRc_dr1%\JFm7YYG#(Y"1,:PA+XA=r/t0Q>_n=#1Q9B^Ya+\fp>0-u,I6mKZ0HZfmq'3l4kXF#Omb1lJq;d.:EOi2$U?49R*OeXf@Ff(A:6iuUi59'-oA:M#Zda1h*a:K\/0H%cL@ZR@\H05AWA%oh,6^":=kPOoa-Hl_7?J+MTA*?VgObc/6Aj&G+YFlYJ)TG#2YhWCmb+PJ"NC1MG[hC6/daLbU^TV$Je^@"#:m9$`\Xf'?JIPX^sf"P0=opu40RZVLYIi[H?EFHBtIESgM?>kK1Gbsj@lNJB0tIo]H1kRRK_d=k1Ju4,<[WCoip-4P?F>M+m_6J`Sg+a(a`t-G=5D9K9#eSj)%pM$kJVVf\cZVF]i#ZZhd2'gDDoontq2[IkUA7UTUl^8$48#el[5BbHV93g>e-RGVP`d$[+FBYVe+0^lhibk,?WCa/->IY=%2Rpg:&Bb;?7qP,N6m:Jb5DY/6jR0E*cpSt/%_aMaLF&pJQ/HP=q2luBqBf#YY&5!+6Qk.4pWIFZ9cN(ns%Lq@d>mQ62(4=M7p4b4a'=n2hd^M^TgIZVJ*J?`Zq2#lW_Xj5_\>6LM49^FgGWjR62k@tV5\?)K@BH4`Mc(4\qqIH/iI!@okaN4AC!'')=5'?oe5Ra&;93moL`!!khBA^7hdS?<:F_5\:QHD62#??EZic)0;>@@No9MJJfS9mCrPXR>TYLpT`:Jo5pRoP!DmHAK2(htIR1?U*R?kNL$UJ6Hn84<3]-G2`VMj*kTkk4oDIc$B$DjG'k1_@kXq3,1=,VDc/7+SJpWTL9iqTI=Qr?$WueZ8WA@c-7RH=@lhop[T7%^4(FhK.;?^=thUANG?P1c'-B!_?!-8L0CNb(LZ]8s#b4f35B(W`Z(e/"Mn'>jO4GMWj3o9G`"_Y;hg7K]NTuusj'V1$a4_9cKn!EVIP,1q^9^3Y"-<0%k?f\!+ujh[1n!^Z\5V*8GZCFg/f.TJ.Y5IA3I7O?V\&0ATH7fAEZhTW\CDurtl?JW]d!!QcJ7JEUMY)Tct*TCbH_C@QKpUY5EJ?.4KhLBD.RMJOOp[@A0_oCC!h7K?Tin9Qk.BQn'$'J$Z?$T:ZtPm6g))f$+fK38i=!R\ds]G(H6Ea+T+$9[(dL5*,+*lB9s=(GNSB'+P];A`,^:r`m!,HS]gSW8H[D_L,f@T*;0_LHS-ng-LL`(K\)#9]7U\^#M?LWo>Pg\[eRCFcmcDlZi/\0Q*FEb4j;;^P6G?H=U`5r&\"Y$feTX@qC7R)fS0O\(7<[IDl6a6"!'LkkRSBVITj(pBQ>l8hc9al/mB>\'UQTd1]8iAZ'n)2?mlU[>'k",Ru6+k4=0X=(rW.Wb*H!HuWYolABZX-n-lLC@n*8NJgp=U(?5@.EkA(h>5+^c9'NY\?pI!YC=CLr,NRmmM9pCNQdbO`@_abMT\m"(WNn_a*V[0=rfW9rY#]>t..M+]B#IIQ45cMrh,s02259q&cM1I/l10_8sfgELL#05IZWQQa*u'F303@hU_A/5$[D7Z=F;VL1jt53>oi"g^UN#*#]"BK91s3q]TJH4g!%5SG8XpQ.]F7++[,Nku4'^=-P_'9$6kfb8[T4=]-V#W=m&&I9"(+k`7oPl6V60MAOZcf3_T,`a,n!atf[%niEg-D0rhN(cQTT3T$gkcgGN,qiALNF[k1/1#.@B%WYmiIILpl\!nrA0&_rR\?X!>g(Mg$II^htPEFEVD=o&Eh)]3fN)fA@1r=(2E\Z+Q7"Z2"GH,*aK/R^/k>Pea?k&SJN8Y#NLlF\PfSiY^oE%fW1q%!3Aa<4";js8F`eQT69^+EdVeJD=F7B!nKGXe_",G_XY_R9S#*Q`j%2$`//mA\pj>#ri;6On[:uG%+S_CWsF\a.=il;A+Unhcos0(m6Sac*@c):AH)S4=gY`%#hL,GB^GmaV*%11Pj6=q(OYe,uABs19S6^5UaP?V0!**2-f,(Ph(eb;\P8+2*Q=(Hp)(>RqR#,c8&T[7kk'JJm/1$@GQ:a"f9`&%G-NKCK+ofR<8_rc;AdqlAr=c<":MV*%h@sQ._Q^L\qUk"U*ln!-C-AA@md-ZBUX`%-C_s*mI2pmj+-mlUspXu/6fn6ESE(LciJuLZPf=`f),i:Jec(_D",%qJ=&6**Igd$0r8CIQPg\JUJ=F5-oB!ua7!a"1'#BVB^Wb"(%04c.C?IXetn8$jR_`N]/7T+q"),P8U>;=:5Ro8.]9F#C84K8V7+APBl9ES\[!+)^E^+4W4JLYE/5V"7EhO?d]X#;hN7[%YUPMq?Bu__@W=VRK,[:lH-l@CWViO=AB5\K;7*WO;5?l7hVf6VX&Ho)[[PhKkN3O"P"EiW>(T'SXse9q5::\&^3[t.(.L$t)r;[BT>T5sL6ur[2Ij^ir(QGB0q6,=R=7>G%B.NsWtd2Mpcg.ef;j7$aT2Vd"eOH&ZX:*"Wr6&`*nZbpN$L+5=R^.C\>/H#eHfK7Eh5ZcVOje_h6f?8'3N!2Bj[B`:(f-0E/YUtDL`)cDACBSG)ZU^bum]1LK6Q?=_d9WXun:l$!A_H&e1%TkuSd_Me#5_BVZI@Q*j8k3`65K1oq4&.eW>fZ^PhHfj*4l7bTZ%QaZ>d%[\@8;_11'X\EYjKIKVGL^QQX6S&c]\iQLt^+Knfd^4@tr_V078ZHHUFWr]"fqJ-&H\]J880mG)_QMmp)/i)gk^4Rtj`D1r^nAfRg2#jIQBh$2kMS&P]/;#oMFXC)6DmN%p=.]MH:Ho"DCiJ9T;d-M1qZV3>jCjLi5[li;AimFqkK(cPEhEAW@XW=gQd]B,q'-oBBid]J]ZA*JT')B-mTM[6-`C37`eY=1A"^(VZp-ZT6kf,3.'s2:p>-BemB*W7)/3;5H.S8GA7Rj"DJc_b\r"7]J]NSO\MP<8SM]Jl@oLj3`qe!k/eeb.BL=gnVPFBL'&\*Gd@%Je7(l&N0e*n0`_]#TP6DJ,Z!n6lldEi+^]mhDEN&SJ-"HXEpuAX`)QhB[2.lB,)?2F\5GN&[BQ/h&JT_q-&Y?b$q6RJg;+7L_fr@m?)?+hA3K8/@-UrSR29$UmUQ%/q\gS>CkA-Iu&Oo]gZhkdmVi!qFFPFj$g(YGm@)=DI5@iZY3;/0nZe7-ej[5e8=h";5*%"0AVRk[YSYA1(jS/p4^XZ84cbPZ`G8M;9MBo7Ud]c?^R?.DHXLRjoN-Oc$Zl,>Dt@h$\(S)o82/FYhueB6bpb`]^F\a(t-5AaO,#WM.#_m=Au.rbihU57d5DBY@;oOk!57U0OB;N/+>^`/,Ic#;8qbP8DW"ALm-16PO8*hr>Bt5-ee#CuA3a656.$!^)[RDKW/M_[nZ'o=X[I*,iG>jg/be_iX@i1r)]Au`8[%]2Q#n2Ej,g!pp,3)9)C!M_oY`^1g5LV$ZR)Qrlfom9&E.iXV@mXVI'ZW-UZ)NN1MBc)f-M#.16Q$j<0Om#fR'.#-4L+_G\`""ehkKD$%N8Tf_7H"i1H7cl-$6&!tU3+IF;QHPGG*qN&*%F%>eSl?qq_OnTk=:go_-6MG-K#C-fn'ED\]7LV@(Tmjbe\l'8^nc_KL`i=>fF/!PqX/!Mdd)K9Bd4(78Y=7(LLlohS_W]&50CeL7q9RSgIG'00t't]t.@El6Bh.ec7cK4fgriBhQC7n#q.=GOU;Nm]H>j1+D#LKb:T2fk\V+ii_6%cQi;0c]JZg'5s%[oodYBg,>c];Ss%Uu,#*$GEO&^CrAi8i2U#C"fTPLWq7rO_>Le)?X*h`jk\@G5hJT6qT;#a;OS2eerlIja\o%+-(!-3KUsrsuT9RA=Fa`kYomo_e[BqCCip>f]Q1qic739I5%pR5WG5i)_@`YK+rV,iCA?E'r1B,KT87ngI3soB>/p8GV/=F;Fp8l.>>%mr)MQat]T&6hgKFkMu>_Nnc!`YGrW^Mp-Hoe!BWM^=%@Vb-OgmjdYc'T?G*HZCl+M:qt_l@3b8XfA>*:r<0i`V=E'ml?G2]t?!b`>H#)r4V*W'e<\nqRC!L\Gl0\?tO*'s`rg]J&rEhCVe;\%N[,%m4#DZ(]3j3.Za0VZCK31"FCbA3bQh4j:bB`T4h3QoX`KPXbMOaN_8M/@ep@S@i2r%'o]:7luqmpdcs,l8hFahHoY^[(2$?UpmgrPFqDNgKIp*%J#C;0I7;cAG^?G?++;CB,GC.alD;b;RuL,s\iM#,q#+Gi-/IGWLi[@tdA!#GctW%4WrlTk4Ef45QI!nGZW:\&SU[=21qCIV8O9.:S+j">PE9NgSIjBY(b]5eip9E*Aom?6,G^Ibe,?aa_5YLVTa._.-S'J0H\F@S`Yeq:`(%h8g]RfRYch^BKa.MK)clS8ArRhG<%3:tJSVU*;>O6Ab>2/NA(ERITQ4au#kNH9najQap3ZaLV5qch6&]1$"4rm#^R@UTWHZFil-7PpDkN(3:X*a$S\IR1la'q-g?cVMM*TUk')"N6*>a-RVlMJOVT\u)Y3u=l[[35es4?XIJoqkuS$?Zq$GX`?bNFLWdN"pAqXbY_Ul;pD0Y=YnLKUMgOKa#+J65FjlTb'Bs/dU='HQj+%J&0:4/&,qHFo(Jd(rJ_sOo@SWN0D+!6*NR$TPQ)0L_,r)FXQ(;chJUQlMSBQ\N[ZA[=Ijk*4gEJXSMZ5QBe#s(7cU9;U>LP>Sa/*^'jR^EF2]_gqgB<'5l8RlG1t!>(;;t;ePp@PeRl2nLMQ\U@$U%/Eei+?I=nEB\L^gRGu.+f1a_][&GUuYq-n,3^up\gOqIR%0V#YMK))02M'/IZMbN5'iPU,YD7#^Q/Jd`;(&!Ze*Id73fNdhoo#Rs$aESb5QD:bP;(^Dl4gJnJ6jh^"0-3"/aD67Qg*)_B>$ZWdioC1.9#-pYI]F1sdghLR-mBL!l\+i\"39"K?uh9OJ;=.`""[_Q4UX6:@#O/-^XB#aN9ZRR:Oo!:(B07Q!j/L,<#VO=NXY0gVVh$8_c&]Q`-8U2=U,C'AgeS0\O-rtq38OACl_l\JhCkd]!)l6McYinLjJMEr[=sTY5ml25q)C=^9,FGSE6G\Tb2c)4CF0;O@-lKT8B(5]tLP+r/WM=uM;07Ni]OS278eDT.s.dd#gSF[$O594#54I;;FZF]9kn#IuH]D?2gcdh:ShhG/,X`,tLDOuVU0DcheYbm8OK6Hhr'`3/:;s(tZcM1<&[\XMj\_;4dPO86I@N9i[#4Rp1M$KVj]Lt+eO:G`*0a1RVA(^n=YiU"5%?D9GWNX@o#ApEj$BOG_`jr@p$JrrK_7204U?VV>rBK43T#AW3u@+\-oRUaLA0i0CuiPIrhs0&8&sjVn#,TLQgMP_BeW;O,7$d:=+JnZ5$,4AisTL+3sFC`-'W%*6Gn&;#]9fcIA/[@WCf@?Mh=+X%kg`o*nTOhd9n;'^"c1!#0[PD>4`Fm$p?j4\S%k;eHrEu0H.KJ>c.;7CXF[_dtKkfZOCaVbZ_E4a0.o8aQ`loP]:1HKflc:F!tD@>([qB'bGkr.thqpG'JqTDbTcqn4\8<0(17uSC$A0Al3[Oh_ihROim#5C`HH^L)UTp$"c!_"l?2$.tqMVPG5B7j'jQmki;;,n`'p*`fMNZ,.qp/-JG!'rQilAfubVV5[uK)hVD/+ToZ.nXGsoT[Q@9.,mdT]-/OkV,M8t1t#m_V(3J8.Qt>%E6Yu3.-71f/<.)$-&UhF6%Y-F'fBG/)GppWSUW#<-:j5cGHqe-eJja"ql51@p)N2@E7OlfmS%@6>T`V:9G06!F#45K(_rt`N$Rp\(*=\K7!j]"R!`)N3\ia1q./'o=Pc$3Cmon1M9J>arOG"B@d)j2OE%Z^3>PZ#&qJ11[cRb=G>5f9dDN\eA9'qXPm.d;Y4ZXBLW":DKFYo/U>5T@S@V6\;FT?EMY-ptUB[/H?-THq@l\(+9oZG.4s)Gi(D1q,aMJL@/U%C`b9r;u0Rls5O@s=p@KWep/qQX5MYiD>%*DF0&4BIHEglcO\(>t#MGf9CkH=?#h/_deqDQB>LlE7.]qT&d;\#I7`/^WK/":%AN"Io$5&?LR_^QiP&kQK?LcKY(B*OZBS\ka:mThI6?$KdcfPc?\dKjpSOb@3TXUd2W&H[3i(YSsW8sIe9Z^dqMaYMP&NBjr+@h7T\^50;@^)Pm.du,.aKTPGh(q$'X.C),`7'Kcb[,?jA_N,L'+/U*fcuL:l16r^'PnW)qR(LEVR!qVq'+/UZ/IjHfRgg)ca?$p2M33q#F7\TOWEQVSCe+ff[%.eSi[bTkqjdZe"22l-h7k<\R4JNS)VOM^uDXY#KP2het.f+;KgN1q)hi:ZVdF2s1HJP9Y:E61l;'aGCJPne&[4f>MHa!%=b.BuaPk_.(%=oNiSntC,:J6%T;f&_i25U_`Hfd;C=Y,EFql!ILOYa&=R\4V^1Mt'SgM%npX/3OoS),)H$P+(Z/A,hdnW.MGQAF[9Ls;^4n>kcLWmB8kn6l6chKM&\3q7,6dB9HoTJZ;Jc<1@2Sgq8K?9DZfE-cJNa>VZt8L0$Y/R,6QF0[0VVLqFGjZ3Z_.+U3csH#Iu1;WRUk:]'hUlUB_!SE4\t4=I_PfM%mE]MYTIZhi!pqmo"LZEe#(<8Mj_rs^"KhuKVW)XN/r>;p3cSIs"2Ga;BUM0$5*t<&nE8N9)U\,g0Q.J,qP/@F725hD959="\864X$iF!24!K+mk$I0+-6%HFBF1kGCpl$Y(2sZRij`87adJGdkI],eGuNf=%^BM`es3IN4)8n`fouLS@VtTprRk(DU-6q.U1M!L7u*/EqJ;KLmVOc%>[-N`#J&^pCu]sYYR:5^MC*qbL!4sdumEs!R,esQG@9-t6fOUB,@d@r'mll;@XVu2EX\7G%pj`([HP3>[0afg+0DtWI>P30[Ot>o8c0!=FJS;dRf2Ll+4?0b`VA?b8mgXC'Sdhlg@X82@-#F,@%&Nqu,qTHqHnV?3XV#_l@qi'O[pFN>?<"ZG<$?0pC1"SX\@^<9<(o?oN+@7eSSl])q)dDh#U?[NBEApkG+!*t-48dQd[K'?7oRccI-0L+"3eb*_i>HkBkSOJ3@6C\S&RWn]pn%4EK+^7RpmIjbjDcM?e7!OZZ(4;E]Pjk+.hr)_+$i#aAQR^),m,fN)\DBD3:'L)85;oocAo`Q#F$1Sg"iZGE1H[/PQ_uFgYgQA9EaBT/gpSIP3+jP0<\fLiW%\G(%#5'XjO/]CO/upgneYls%>D&g:uSf]=&'h+9!R]b;HRB9ta'A=9t0IA)MU`g0=?&2A02$*^c'K]s_%<]jR47`j_R/`%Z2:!6MEmE*t!D>k3?KFZ4cNn?bt56KkZ5gLHh"IrS;ltAlGa7"MRL]^Y%M/sE/Sc[0hGj;?_6EA`N2[?9dN2!)2,GMGD5&H7'][CJR3pbq9D.9*5(9)i4qZ^t<3+L$6rPaIJB\(-X*,LV4dOlP+<;51t2L`/cBa_+_3:1Zc]adj`39a2,3ksZt"Yo'DjY1UOI0VBDH??Ob2Y=?7EoA#3UR*#a//=etE?)>X(?6jRsWjJQN.#)I;"CXlJ?*B^CTqCu6>KR%"+##\:0%?>9o2!E[1ZH]Q(gEU$iBW#bbZI#E,A=\.VQs$eN\m]IhG:$[=$]=PH*\r=CDN/be,+mim[E:Kg>nqG(IT):I+$4MikG7&RC.$F88"O$uZTU16FkJjj3`kRHF_lgs?;X&`qS-mG?9*F^W/gaj?L<5k;].:(e,+ZC/D5hD_/"p1SqNW_d5CZ+%=T"!9X(2:cj]l`Th(\8=#>LIJ(60Ag-?\',1Ub]Jdj)!n+/bAX-;QapQQ2+S['[DKq%H=R+WZ4uJ^/\OG:JU2r5i[7N2^4<+I&?V#BILU^;(BE:=rs\`:lAfPP$967a0'['J!Ve7A':E5;_P^la#YPhk0`d$]CXbtFafNj\_n^YQ4A%*n9IUb)Qri[I=.BbcD,B.eXA:'8U8nBr!/8[?UWW$Hu#M/3^)0o1CB&Me878CT'5Rr-L7,Q35`-ZQ<%tsS_QAB4@`0W7t4"CHb<9HmJF:`dbJedZu!(_fO6_=H.J-H`i!%*W->9:07/@g@H5frg.TKC%c&W:_QJ3Ul$@]UUC)\pmRm+uS,3*d`>q\ET0E4>Gen"=Co.Xj4*0+YlJF#?%2,7T=2B3$/[$*$f1N#PD=oGsSZ8\HG\7k0f2\r]L8q6h'l&HNfWADT%6L>Uf@p^Mf4O;=F=P\@GM`blAdXc(3mKjM,ms7M"[*RiS'ZL^4d*3HSs8@lLN>i&]<<5hl/0?S'CD`Vb^[I"IN4l3?6"SYWL%\O'D#J0SNWZJ=_7]?\miUKTudd]$A.L>-8eeLq4F[!LVXg+^Cm!62g7UHW_c[:hV_pNAoF]9L7-P:eti44D/e`6a*U&UmoIhP8<`L)4+In%1ZZ1q:#m:"<(S0GItcVmCeP7RP"#X'^OaH"2.\GrL+PVd.?9&Y5`1VoM2D;KdWWnPA?pa'>H/..'%\dOd6%ed)klgNO34p(#"agZS[TrTeZ=@e;\6*b+n(W4pIeeW[X4*:2OqWP+$Nh<%t2Ekk5if;0'SR5Fm**h*iTHiF;_B5O)/rDBI"(:"*_g&&\AQ4KK:jXEqEBdBFG)c\FK$\PC@^iN\1'O`cf1FRBDe)h&Xh#o?M4p,jO=7L@SBPM\@'kGtbR3f1k_U7O`\XFn9siH)LaD@9<'RbX!\OH>!;`-^LsnmCV"pUJlA648%$!jcJbZ'*h>IIRR-;Eh;([E\?%t;QQ=TQ\^tqE>VoHO\Yquq^oBiYY,/OE/]=4Y`,S6:=0dciGM_k(8:Ko3`=XW&Kedp*H?R)qMY5$fouaT5/JWoOgC%+oAj@YOTur1An.!]DQ<0"Hm-JL3r>.L[rNk?TN_:CgPs"scSYN%Z9Y@;!?Dk&(hj+,9jm5fY=);X'12?aGY,rm[RM%@$]'0k-/Iq$L9L:*)8)-t6fmVHm/m:IMcf66s-J_gk4eeE6PhN(g[nTn3-pWdqCUOU(=%+ENj2\KR14a6*PSB*,#qUUIUYkq"G:2$Im!)h67qnE6^?Y+M;K?EZ,$\JdqleMg#^Pct1$,(%DRjL1c"Phk9-NpDO^f\(\=[IlnK@K%mMtirl?8<4\KE+Zf=sPtFp*VRks>,b!-HdX0BbWV\Z(S[]h[+36<(TJQ$8*6M4Ng6q+@^mT71I4Qf0-OU#A4]4MP(,^>u!Jn8X(.HO2CdPERiakD/Q1A%C%;$(>kO?-,V5fYETZ4hp+WOZG2KSEuOa*88Mqls#'FD[+6h:kk3"pp,SZW1.KrH^0R^P1OD%NQYBjfg:jn-G^I;&#mRBMmiAsr0BP%@X2%Ynr&X"8Lmb*s&aW5T)T2cT/eKg3&eW);(-V0tr=3G:X=o50922;ia#)pO-s%8!Gu?*9/_;<^8N$m$8?$OGHknf3!lY?)ML?b6Le1WEO@;&37XBDcV9NiHklIOjCMFc"BuYmD`;;mF>V$Xd`Po/*63EZ(3=SmP@IDP)[YiIZ][B[Q&Xa8tXD+-d*'dCuNbB/$u6uXI&e8"%#=Tgc8:M@0dq7N@>_fl5'O3Q9`ik&:67Q[q"CUl07CalV.slem9e4W=kE6nrH&MUhX)5ICfqP5IQ7tWX7VgLJ2.![tS^I#IjP,(jto%FK54!I&G9t:DK'"To8Zq[cWV\2#=%[DD_l7:b3gJd&gstNjWVA*?1HF:PImoMH5P1Je0f`-a#f-S@=bT%[OC\gZRqXkIf4^VaYp`/hE@mC@e^eti%p_p:qh?-3*-0lGIL$("F+Drn/TN5)=&\5rk5Mg1eqp+C:?kXl';?W*FG%3`;66kND.R>%a<\a6#?%?u!]3Za=dhi-&Feg/#F2(:\F3Jk<\=#PD)i9#&7L4qHeJS1@A.tWrM:#W`]oKjsR#K4p1DkN)bs48GR$tY\>&CX]V\gPGZlnPaCu8XgKI14T^F%B=Wt-H!U6p=35:(cP_A!975f+7TXnA?fMj)NKXE0cVBX*9Hpmb,9;d/S=X@H:_cO'/-M5<=qI-gM:A'g[e:BIM/RJHjN&4l[eFO-uc'E"Ee"4tOl]'INo"4Y5-58O90((;-M(r+rm64hmm$X?#Bds-dGgfRg$URk1eAo-(&*!M'<\i0:0Q#fSE&W)'L(cI+0Jg,t=*,of$dDiK*S*;7aAb:TkU.?pp9*80@a23TLFIX2j`l=GZc`-l&&b2s@+b"*FdV)Y+^!M(OU-]4[PkTtF5X7fXhk#:#.:BKqR>@tf,?dlAHRQMFqac,oR2:F].u6Le-lNXFZOhu?1>Wki[7;2C^hQ@'FjP"ho^UrpXCFd+:$aM9GE,#&_pbN:TKY>lVE7-k5]_RDC_=,N50?-T`uXj3ikmr4basg"X6YFgTDGHGr\\Wlu7^l#/hG^]X&`]A4d-2.(8j8jgM2/d%K9:(lg*Zf4VcF7gYN$AhS2qlCHQo<1nk04j'(XK2I1o&*Dr7RY7iIsE;f>e-l"lJE2V=aS5=*@+0VMOfG.A_59iSq=ETR0Aab+9Ck&&Zb/p%>"(N1$*8[oCfc^O2bbKHs;/3(8&,gp?rWDtd+cG8W*Jc[.$QHD4,"CZ9BG)IMsQb*d9FKpS7Ns!6[OFIOLWfH;0ks,i@?-IN^!7^KOEIJJW\FD-,BJIm'3?eT/>\S6GM+6;-f=,2E][8j'IO5Omi7n/_Ohi(eY--:D)3P"f#V\YF+KJ\OnT/HlIM/P!l2Z&.-9rFS-WdN^$SXkudfkQl71a(Qo?!`\@c4Q'[OgKokr)GJAhq;5mbSSeVJ%-?Fr9Kb++,jMqLA],HCL+l=M02mgGGfi:+PcsCQhKPOG2#pWotBU;'@g5iPl+#\4l&uo8klsm#0_['5h9p.,&jB[?kEGSC4G%:k*7QKGjlb:"&?u"W]&%I>!#1>bbOJ72AlA[gGG3IH0p\NRf^)$s(EPW++*jsCtV4!)A'l^kd*dMAiM@q*8Etsu;K94LA8U%A_=>E\inN=A]2Q@$$JOGgg0-440d.6jK>^8Q+T\Y;*lB<'RhH5iq%MGS+'U2O#N9qBAD-L@\OMF_A2+R"GaUh4Wt-#6-c:#??Ih`KmNI\[#ch@`sn2EjM$sf:WLM8MlNsWS=OilR,%;"M6E(%aZPgT;P'6,NTu'i),:d;=To^0>[lrOGAd8eql#lMtU=Y[!9"Y].D.sfqQ_,8][889+[%$Sb.ReK?bV.!=mbQZ&Q<1R)hu6O>Y.fF^dY2k9q":>jm_kgN:quL.FRkbYiZ!%&"_B1/Cr<68npc.Ap_H7__EP32`)Ofc8.`N>GtOlkA[Uh[QPneP!aGET19mT7W$UXDfC6D,n2pQFZn&*`0r!N%'.i4nQ]EtRZWlGC;UBfA)4$J/3a&Pe=1WT?AtkKS3&_OYrXerU-,Q[$W/P*Klr]EcC'Xq3`WI%il?pkR0`1KLrds<3us.D0D9VN70Zn"D!X-NfeDV$N+p=k&fn#9BC'.8QY+G6nBb_HAN*6-RJR:Y2.`P_aL,&+m:"*CBiAW;OiE>n&M,KQ/\o@L#!mSa>Mn5]eg>Ar+`_-WK9>!-BMRV`d`A(mg;2EnjEA!%qWJ\";\Th.j)fK]KH7VmGXX^G`0:DEg;".(RsB\ZnoUaG.*tZ96D(,=g=.OdoAUdjd<@s9mDJSq\SGaK6iIYKJ!Wj9qom[?^G;s[5jl2njAs^eXoiaU)8-Cgol.Sk#pMaf1U":g0Da>!X9qP8.rdf:`m09H&YHLfK<]-;[@;5&meBN]3gDdJmrK2^nE\f;[uSV;if8lSV*UoL?HR6F.73fIu+(>B;#!RkbfLlgn`f08)c-(7[.pO)7q_e,Xb>N+Z%B_TFkZthEU5@7%_'$)@<)Y.V(`XC5i$^O8,?shI2G:f+Wei:?BHdU?+$LR"As/$%j,lI)@>#H'ns\VPOS2O\#P)>X?NL^pK>\#m09-NaQk&01Q#r^Qm$YgqjQGGu=NT0W5jK\3:S+Ff/mUTZAuJ!&r(jlu297[8\%V'p-?K2j=Po[n&ot[VCO7qFD]E/NoWT3!^dupY+1f&!cNN(OqITB'n=qiQX$t#nB<+11?_/JWB-E[c2?1_)@MY_SEK=1T&56a>*PpZ)e-VUaPiV+Ck"_dSd4&P2>_>4Mu(j%4XdRe#W_:S-HNCK:$K?+2>2/Bq]Q.K^l":,/EKUHk.P3^E-#>Kr[bB\Vh5%D<%E,H,&6hGKih8*.29KRG54$kVbR8!F-:#,ouo&Ln#)*"Ybn>Rg3:(o>%P$]?8UOPLOG;,f&>'O4$BWW>3)GRSe,UJ_eogGjG`QdDo5K8rFJ2m]/3:2qPC`aP(-H"U_]o4b'9V'V:f-dle2HZ-Z4j,r?:lO/T?o5bk25Ej@SC8./@+H]Z_:S[(gADIppqPM;P]c;Fd$7(QXS6\X/:si,b!K[Ho_Z_Rp*Q;ubqFa:%(O2H/0K;c.41LOpn)bKJR,s(&8@L;>G*bkP,WLOJ)>(4f[UtKn#hcH3+BLW7,XpFf7*.,0f6u2RY,Kb.`c5Y'i_Es=mU_TLj4goi+R%W:#>$UGP7a9qk>q`E4]-H$SWJJk@qiiUJ\GpSbURVQ0?eb,WCVoq^g*a1:kf3oNd^HoO=4oMu:iRiZ;,!Cg)NFEN78jA)GAUB*d,XK:dfg]\X(-/a"r2qk:\.X:dY\38qrmt;iDo=6rFX&0HZQJ"#`E#c)V:Xi,;R];Bk-U@feG"@=jJCDca(]PKt/=Ib7FqknJ!4AN>a`(m`HibGE)=Wng`0T39^r;G"n^9'72?09D>+2i?9FT("i!(Z86a,,l1?W$(E'75[iIm.#]jh"Q%%0hZ'+_`JZ*ZYQ/P*Hs2ZlHNNiNG'*bc%/.JbBCDUjH`8Wo%u5egE\qF*oYkOWK[g9;7R`fb)eVY?%EE%jW;L'R[lGnFFaZm>88hZJL7*f.A?rco#M5-Hq.a#+*,FrV@P+le:Dj;_Aj5k)Emd1`LPh]D"ML=._;gd>:SK&Y"^MePoX/*3q;KM(-6]tY:olkdS_KppM]IMLsm=(!-DqiZ*SecTmN)Rje]=QlQYgKn99MtVinB-_@1;bt^@.,Joabc%^Arf],J1^m@Kg$_!b_uUZQb2r=]ucpZ>KJ9J@.cr)$0,A[RL[rO,9V,DCESni=qW)1KkhiHZm"`K\+$+#PDjsG":u'VEO6@46;T`$qVRV-KQsD1XZ5Ca^Oa`I!U3\XCjsUr6T+5C$T_iJp<*]QM'B;o0pS+jZnPaDstJN,Wk4lECB.:BrB_ZofFqp.Vh3ao_O4CNTE0<.3H.H2mE?2M#80eLAcqN6B:4`+2m5]'K*>c7OjsB6e^aNZi-s&R/B@/.p(rgh#NBi_Ou4=3)IW[TkFC/$gNIDRn[ciWb.Dkkfrq@`iYUGcG,[@M>9L&3DXpe^PV7SFGDP:U#d%K[89JZ')'50QYZ%Ld'VH8ZTUNY;hj7T&6j-@dg48#GZEJZ7`GCPK7!Mfn=c^?8m(A/o"t1DJpC!!_1dn@L7^Y,jY*)`#h-D%Fmlj-tqs-\1:TNh]K*%*Sm3't.Hodp$eN.4)KJZ(S,>:hmin_m?Vn;UBk8*.U/$XbNotpTnfT3GQbj=5W(?]J-d==g$?o:G5PK3Wok^&Trol8?#RG:m-%m][9rg][rE-0hq2[%\``h8J;8XQ&dhT#ha8K)EsIB.%%;#h,/rdI%Lpm9G'F6nCL=)COHr-LaKh'NaI?p]_n9YbR*M%9ORF9G[sF*hL+'I:m"P;@hOZn,q;I=on'CU]*QI']=;H5#meHMiW>P+5C*0'S1>\LQ=$0qNij.%BjE`.CTjI[m*ZT'#'^((G@^m1=Fk$KCgR1PP^7ZSJZM#in.4pDnnR40l.1F'%db7aQsp]K,>Y)]-*HWu+SXl:*=r%@[q&&0*cc`]@7T.S?(U;,')hE.kJgV`hM,sa9\kM?;;Vn%c)`kLHfaZ>T:Q'Bb)k(BU`th6q8g<6*f`m`'c3dG+&V@k4?U1[7dHEj7:Kn.?H\;>fE=@31Jtl(S[Ma[n4L3CU.9oNt.],s,7uSFN$2jPRolQY5[d]@#\sUD.K^Cp]O'K$@Q=dU'eHFTji-'&:`#o4+%K[c4;Wa63!#?Q`Yc]uUj67Y=dPI^Ac2ea\,<31%gMfI`g)j(=R@'=lh"g\cAXuiIpZ?Y^eF1)dS\"CNER"<#)3PU8L6N?C`>FNrMd._/0+n$T(n9WH&pP$r\Vn/AmIKRagBYb0<7O(`X8JTHPIgf-%-Yt'Y!Bh.=AnZ8IU2r.4pj)uId)foCoj(rmUg(H4\,B*Nd:<[V1m'D\V,'YNf`2#,b)Kr0EFIa:+[,so#61u`\DuRbJnQ.A-)aSIn*kG$i,khXlXTHS=7@nV8lR330h@0\3(o#ijedb[/WU%^W^p"o&sQ_O8*.GP>3o@NW3VTp"ri=\XnY<9r$,YopaH,n>pGZ1m8XI]>YsT^[\aTJb!:C0:*lTDC=PoA+iJjZl>-@k22G-j:j6>,?)R;B1/MP_AAH^si'GT@/5$]2ks7/1uKHgA%IBXE7lbP\t]qnoar2I#K''0(emKC)'-_CAo!M<=^fV:V3I]6V3'B3X@.9b-.+:dAR?c?/7G?^5J&rRLDH]UY!ciX2fh?Dnlc+"sOO)6m$p0+%"T>/:>KBF,:u@6RdlrdW\B$J^$HiBBZe#c*b=M=lhsH\n8oHaQ&C52BO'Dgb$bg'T(uDYn2t`?#`6m#Q72e$Y$C>KlVW!M8R-`j6l&L.h2<`[G?l\]SuV=7RG>q;UGfa(MW'BnMAhTl@X,@t\kn^kZ.3N[BM"IQ+[l:..('/S]NtPa1jjjMj@.fFT3#ZlalAB?kg=Y2+ABd1HKu2VGni*U%s:R(Q9NlNO(pOpH;0".l&57QPL/TQt-'f)3u8ik$CTY!5SH[$b#/E'/cq1>c^jlEn'S[[1m+^p#.b#1;uFgoN6(h(t`OgHm'Od(-$:NFe(?+rQI$C@'gH/2ImB"."1l<,@,nP-iVuJ".%hZ8#DibCB'A=V'*Q`,Ot+s]dk8\SBrq:ls%gi9:FkL<@m+gtK*aa3/3&Z^HC!R**m[%n-6[#kqAg'uf.?N@7KE/BE>sa\qu31hSA"rHd:'BM4u9iAFM.QW:`c3f[1oj4!D!$V5`V,4Q2.mHKgH+I:mgZI%Kh2$2Bt\6lG66[B2S--#-6!o;]HYpaOEIolJOohe6+$n>]ujmmR+HH)Ad2#9ol6s23h.JCcs8QGn-S<.8?+!G$qlIoaQFZ&a)J,6XP>2WpS(In@AD(BRpa4fMj'kp/5fB3"Iubao%apd;#6[Rf_'gu+J]nm<=b%MZZ%8s8YBKj.ip]@QnK@;)hh5rkchj_[ijjR`.YaLC$0Tnd+[GaDgNk0Y9oSZY\MnW!E\p=!*200Ki"ZbagnrFc@pdX-j_JM+#F2'+GculgkJ`E5f\S[a91^f"Z\M3$dR!FgUkh@a&r%Sd:9ARV(*sL6OFbinq&j3n2gWhquRsC'e4-'[.E&qR<1>S>."VSs5n)fB:MSm/8C*mGBk0:W0Pe-5FG<-;i[Z?`a/#,NK31G@6&L?a;WXH9O:g/I()Nih)Z.gVq5;hS*]*;_S=Gp%:%b,2IQ2aq_Ca>0YGF\+D"(oW]=c\Dkh$hL)+O/VmdhsgRhI3"jV!pCBkn@G7NX])@Bs<-dVqt?IMY68_K!uE"2IPX?rskY%Ap(5aP0`1dF"K%;%]HbUe:_!W7X@08=oPK*B;=^%Ft?#jM>L7X]!oI(m`5D-3)`%k"h$]#%kqg>@Slgt_qMopoD6s0N_E&qsJMpM1ditag,>rA#cOqh#;REbHC?N"c6gqn5m5Zq;4H4'kfZ-"If/?m@<)4`Q'?pH^LAmFi(fcb0m/e/c=ppn31h=e;*0>8A#g(HI&'%\E9aRYh>\gf7g9t)kF02>dEX)G=SF7kp;biF-@3:=FdSY7__t=hg`Oj#4F`ue2d@[VdIjE_1TppbM]c-ULJ<"OAk'#$mpu]_ff`*Vm\32;3qLS?&aP5SLIS.m=KB1>BDai/,.qu`Q+`>?J)/7$G_,YY?Crn(q)90:eOI\L>a_(m*HaU_f>*or;6/\.SNuA^3n=NFrA#jG<0>G\.A)5FqF2UhSQ$\]neA`<.+k%l-VK@o_I+#fbhO,cF"j,C@JD;*Q(`HtMs%MDnc13?@?#YcKc2-AY1i7S_pD.qh+^#:9G27H0^r;GKei.Ai2lVF1!A-?.@8$/O2*uArc9]r%o($X64rjZtk5f;UZ'@mpd-[-.e&I&bYqj2Aao?'rg_gC#`^;fDP7:eY*s>0>X$1.%V-S*h3GA.dB8CkQHWb%6:]9uFfs&,P?q-Ld^Yp$Fp*i7G%P@i!O;Z?Er!Cu4dCBOf)K/]o+IDeIN3bo1GP;bR\V`)g4GHId6LD.F1Li7_'a"SO.X[$i$=9QN'#u4aJ$Y^pqs%%?8RqMX"$_u)$ml)MIU_\/dm'Wu,o7!)63$*`bNFB"3J!Ai!l8?k'7W%,f1LYGd4@ICq+(cCEFA3nNr0*ZJ67tK$2M*un-Zl"soL/0<=fR!QXob.^j4cQR8Xr6e#oADWE"@?DnKP,]ks14lpfuuA5WFOr-b[m_0a-i$He-W7L1qo5Vo:F/7EKcI!nI[nhp4Ah.6r+PdV)38j5&,F^U&$7rV&g$3LMma/jF+0@S_$""MU*D5)h[uq=\)jjSOqp[>>G4X2@Tnp,@'eaRp90D5[I!>l<>B(R'7:fRDkmu0LR53*c=f1IB9tCB5PtGjB%S['7t/"*1#F8DLCR=-!MD$.$6%fQKSWYEgm'7CX0S/cp&jeXG"CPn['@sOu9qU-_s>bH2J$q65OiYhhMW;m"jTioI$(]Go.lC^7Ppq[I)fK4FFiB-l]\%WAldT#/7C+>+F3IKJ_UqA_1T&illI9ZoSggNXt[j8dJ,eX%huj^9L>/c@(oqQQOCn=HZ3;r1+HUP=687BT="g47S$(q)N:49SUcfmMq'cj@,d_,I--^@.#N3N?ie+c^<]^d"$1W=n[8TQqAQ:TogceFDbloe]ZsVY6Vk;fq+Z_*0r0jbB41?F-Dko1OTH'Vc+Ki]6j&#VT7nd25c9]*iEU%n`i&)auLX=]c;kNRW$;6SCd,qcX+s^UckUs:JRi1P,]V3!GA,I3>%4I@JNE:WD0*+KrELFJKoA!Il`i'jfQEtmUoCW2r)=s4*Z0u@I]7@#,ljrPFu1r`\q`dV+_ASsSV>E*OY?+cl"6r.hVl/53`0:`@$?%Kknf\@Gr/>1uu))2^B^.<@7r5]NYB*qe.R>^7DrHfo"SUW]:aM?ub02?r%l-d7"_tGGsME6Sco#?Z7@TuBe-;m1C[ai&'WN`J+C:)M$pgLP8"nR9\#c&BFb`CC\L'-&Dd%?Xa68k1G+@>t_H.b@/TGs^[#(.W>!;OBuDS5g]HKd!4a8UL4HfKWb[n=V^($'(@g..F6UqSLUk)`"<\:m7IP3%!@(=P(\Rd$Y4Mgkpc>WQ1H@K7DH-MaXG3H9cepEoqXl5.ne4bl"s1Ku?#FlTBZ(Wj/ftl0L>CLN]h?5oHm_nMGVR(5p,7$_o;$!AG;?D"W/JSS`qee.-&$R]V+Ur$QEHXo`+q4[CI)X]nq25Yk^0/[LLP$[/(B'!e>riYV+NGa-\i,fQJ%>AXDu,6.50"0i7/0.'GciZ>.PR>[UapPqM]QWF\3t#Ib<8N:1JeufdV!6,';BZ%nGP.[gR0j9>`mnDa/W%e!V86rkri:"!A,=3md6aC3&h+>n"i/hflLkTq+Q-)e">U?CM88Zf`A!ZN,7RpTE+5ia!'X_.pMpm89qSqkcr;nT"uq=]=m\4PEC=rInIXYA/PNTj&3:kkac_N3O,aVc4",(KFZ8KqQk*'@d2@7d,%H2!_`C[-3mq?R"JG_:-)1R7Ut3hOO'rk1-^*enJSe6kV*Yjq0QmYFGFWN2nS_ES%7+B+5#>;oI9D-_]]>JKLj`^J=1E'9g'F<,4%n640!9a5F39Z3mXA/tmEX]05rJJ==6hfGMEO#;Xi*s&Q;Ke'e0EMf]HaHkK,Kr2j2!tq2"&c:f2R8`"WNtHi5l$:#u]jHu2kF]oq5LBC;!!!+<[bH:Pf%]ipra*G!nCiS&Uk;na70jA8ADVM)Np_P;A/W]'N4l?]^R!1p&n*$XU"UQql1fb97+T?naX5Rb1F>SQ3/1#%JH(2=psf%&[kr.NlWIpPV3T.NgpA\=lLD-F/JU1_,#,XQgLY&29gubZ5<'H(BHrY$IAn`Za>',o9oRs6Ha)cn2R%Fc,C7+2Wd5,'O%jkGVlT2KfR2s1hK\o;Nj#Bs$6?O$;EVJcIQ"9C;\B0OP6\I!S]NYg+YXt76&iu0Hs&cDicI]>A$s0NR5?sM)CEE,6O.dUP&!?SXI4X4G1L8#Np'G'>)8%^q:>B@*-&I`rOQcl9:PmfWPc'K4/W*?&o]t0o_)tk*fA$*qW@GeY*,1/&iSK\P\$WK)+mIQH>?!,-=aW33[R/+&i>i@Jd9kK\:.G5jcb.sbitY\:C-#)d-!3"OGmd[9PnO61Y?CN511JB^#DClAP:B+4V55Pn\)IUR6m3k"E"p&JiB!D6smh,0h5B"?DhZ=@\:WWLtqd$,sE_^]ALPO?\6g.;El4MAg#m5JV%FcLg@g;Q2op[m6>t9mfao(>(p;.ghfNnFOLq>ANT-E'HX0kB&BHh5L0?sQ`7'R3Y("]GEM'sC8PM+hhc.,oLcP:=Irau';Io5Ijh&qjl"1B?sZ2rf@q?n3K,LP,4LVqJl,2fmc->EAW%842f1,!7ICah],0;8N'?aZ)]gs29O`XH=1hbO3LQp$fY%ht],N$7u5lW&@=j3`e(pE!as=&BYu0gIUE6;=7,TE?Odj48P7n]X38TC-pj-WtOFHMq?aYn*It=.KE44MtEG%IH^nR9]"4_:dP5V,upV)bDCJ&hs6/O,oLji2&,h;hLk+r%^s1(gr6j*P7K$J.);BDm*:hPGsTo;;^Qt+)'QP_1-Oj,*ap6IhTUa5"P<7%/O\%_*'kNH!g]pF)(qNKSC%W#4VTkL()d78&K+eT5:;Ig%HLKS3:1Y.0>am9<&6KKMSim>[[sS]"9cMBshTKLur3bKGB&j2/'$X![8lB=C0XO.,jAO/i%Ii3+dHEFsATE\Vdt,5`!hE0AYfrA6WZNuU-YIZX?;15g)P^jiTa:OG1opg[_6FYsfa]H2K-bo.T0)=,q#,\YMYbp+^0\D?^7<6_`5A?d:$?-O?jG19$Lg?7JE5a+omR@Y4;-L=Cr*L5BoH]CU=CH,TV1>`ljj?63U/cgbrj`!K()4=2UDV:Z3:+9ZO2o2EIc\"%>3LY_9%[30Tlm"Y[bmH65q_jJF;HX3:F<8SQbF0K(1iIo)toBje:YM-0TQAog`K(b5f"/HOOKd?;Z\h>8Ju2`9fa,V0YTp-4QLA#@fBIPPI(-=;[3gq?ap8[N)\FR)_480RcqVV+9A;%pf5l4WcHGmnf,9g^kgN.;5FF"r_2$Sp>TK=':'S=?muo$7Mf;UGG'jId[B"+Q8`m=K=p@T[QYo\!`Bb&i![*K-&44/e'K`ZnsYuR_l<'LOYu'ZeThNmFf#[fPfu?AM$1m&r1"*cTj+#t9JKr6>X\`^-rCiD1CXMsJ_]@c7=E6BK-LIrC>#N@?,m;*6QNq:QiPnR$n8@H8l1)/mra&NIQ!e!C=)Xh\0%@,LXB'm,5P_eC)6s0&f*Dt:o`J,92[.'31d'qkFW#JeNdLoJ::hhl`Sa+k)q0i7]`&;V++@BHZnPSo%WV5?Fr:Ah(2[\WqG@i4L:E=WuTYu#cT!\!'lAa+NT:EBr1efK@fGP(Rk;nBeB`;rK%3Ai[Uf[hT47SR#BJ6>t::ZT4R@&o*WZS=U7>^OHJuBfDob&e1OQSPESOEVK9qAA>TPur?FbHK%.#'e`_&q#Q%!dnV+$\sP\3$#_\sn#B5migbX"#5<(IJcR1F7"bmq8quc&-o:NOT="FbA,F=JV&b-\gsBO?HC>eIGROHnfKp:QI2\TB[/n?dW41\093#+t#S#rCNhQ_X1%K#6,0qV%+lP@.&Or'7(sd4W2]`1I*SV`!KBudSf'Bf[p@:\/(k(7g\aeQ+esU.7D9D1ffBN245OWVrU1p&F+W)mpIUgU#rrMosN!(AEEcij[&M9b`VFJGnH[>;,T8Rh.QaN+;!g*o%+9jZt0.&8,&mBB,6Qe3>Gq`p/7&)8g@Na+uSLgg#;PFa1LjS?unhhM;gmSfNKRlXsJPd[Cp;S46TUR3Q)[kbR)ND!-FnrQ>oiK)#&=JY#g@'S>BH$@64e]:3e3cUp4\KG/qP+()KKZbWY5Kt%*WTCLg%VI,t%i[+'9TABkD^T7RufFlpTWA\9ba(eW6#kg%90/PC".!giK6B_'/(E&:fa'L'[6V_Y5CgY/H81Y<[r;)hD6H<'P_@QM[<*i300Q[h/(9^8bA6&?'N-GoD`f%>NN_X#bQ:'d4$2g;`RnKBbh#6o@C27bb*P&W`Z1mX%>)!od,kSiFWlmRO"d6YM>4R3"A&/=5nBKof9`6:@`^rbUAEJh[Q4Z_8I\;(DGYm6Kjh=N;=XHTE\k^*@@r/f9+!1bR5$i0cO*<91u7L!_SEPNKq)PdMW#oa11HSopTkX&Q&\bFp*&E0gW3u#NTM&^Wa$mlsT'M14_J]&42PS9U.^V$sQBpjV,`E;o%5r^i6HP36/cUc;cR?RaMhT$d.^,*R%.R4*6UB5`TZmfB]#(X9U)2IS@Q)I8^kfcM*n7%afle0N,PGm2$$\F>,909%;TfM^3rI,Wl2&W`Wn5KlF;*j-NtO$Og$&?$=5E28SS0NJN4cI\6NZ`VjAGDg+9gKc%(1<^"b\/e"5ZKoYDUA=mlo]UB^2=\iFZq1dXWV2,7WfJ=!l3S/Rj6VUnT<9irJ.A5q4$RHX>j$_*r_<5c#pdb!*l:;%b+kL#4K>P0&q+UH5&i%b!'!k1_%A.G[OPMnOTq0rE3^lk'&]W>ON+DZ.dl]-;Rro9WN.JHU\1E6J5hUs8IX8bPqj5R1BCM[CBf;g?kd8r&/5s9jLt6bBD=[NKQ3mn)9U2=C77&"G"T-L0QCq6VPULT+E$OTbS:`A3'2uB)+6Zn!lD7aLP98nMbT,tBn$NKLd0>F(1mbP1`;`?\Zb<#IlP_KH2"ZCRIbY%p<-1a2c&m!ghE&l`"2L',j@r`_M[tDg[CC(dmHPjU^dY5+Rp$CQ*>$7X7a;g4']=XYI).I!=_aa1FXYnTt*=;J0r;'#)L:ffPC4"^M25E6'GH%4qIrT\n2RCjAjHGo7dlui0NA8QD)_)M>ICY5`9.Mo66Vd1a[nJc,[0b^SbD2".fe>MNE>heM[g=cq"Z?G.`@Ger9OU/sn:5msJ7/bL$hNUDQiFHD?PI89E0=hn;d!hPHiq9(JTXuR%j7&2(RL5i1HZQq9YT]p>%eP9=\1,X=f]S=9P;.MU,R@TUMXQWsoD%RAT`,[[GkC*>cOXt]fHaq`(BtEUXTLh'X*:/]qia=II"q7c)P`T\i7J"h*GNZL5@b@+6W@YLgR:Id*.=l.TibOMWM+l#-i0Su1k:PPZN+-b^WO.!^G1cB%PsT$8.#]f@PUo7Pp&Q)XB$TRiT8C>KkoW'+ln>@b`&k7/k)mke6lI9FJ(21tUEK!qgaIkV4=!fF`>cT,fa-=VcVd@AX4sWlTEJUi2K06SiL-MtpK4C?r?Q("/eM3Vi?=(gHOOdB3LIlCRJ(0$f=&s0qb;DWL9aofZlsS3AkfJlHpT38$l)d#pt8rk:m0m,Oi)I']m7&=R-!gWt+ZrgDr>f(C;#VC-$2SA*'OD;mT$O5CPH2.8gJhm-.mlT+IhS4*N_WSVqe6H`"nAM43HeQG!>=J]Q:ld7YgGO31![;cRmg;P?qN+E1>)%1>5JuX[sd[WIT,29A[J`k@!/JiJZMl&+dN>=4M(:d)9g^PXI[JnA^7]?qkHVO,&_WK(fA<*^3)hOFHooL9Es*1FMs^p?+GAC`i?S5URa/6lND!Wk,=a.1M,%MZ7O&N.B$o[/^0/#jI1H>+o!,-HBCA5Fh$Dm1,'$(XgHC&cD\2L>.GDSgsJH*#YZJJC-G1Ig1t\#W,#bJ"I*Hp-smHUUaBWAmTDj0]i0\uOIR6;VR''9fs--FCnl<`i@(As0?1YE+sl1akYF@'R$aQ0N]Xf@TWP&q[_`AtkKNAB739kdi9d6a@A[COZ@=J5K(KBI-%J`BikDOnNErOb@[h41%ic7R-2":"O=S>(-gV>6h,3[Y4Kr-`]^Eug@A2ei>V-4L2UG?LK$DTnW9CfaeQY`kep++bFW'h!1f1kHP,&9)Ils0V!B45f/V-;EJ=EQ$/G\5m)l984eR5*V`T<5`#?2OOkVW*EKs:,1j+2`1L!\M>=-L`K7jVIu\g7;.T\.[([r(4]1Ld5Df2c;niihhq?oLpK[+AlM+-E'.?"'mMA/;L9sf>?V*W6pj[n`+h6M*7.g@:N0$4E]gq550P''Xk*&`&j1@c9@o6=P0W?iL-hW+]S%lYhNN$f?rlc.-R_RN:BL"QrLEgjn"%lLNUQQWX8^2gc\/_Q$E(1b#VW^T+M'8O>=EEPPdR4PO19"MF7%^5:'WS.'Joj8,q_Q4jq*S2%K]e&CP=T@F91bLg/'Tj1InKqPmP.Hf9b"O%5jZoC_]N8*"(:O,4'Q2bBZJJ)3&2d[@;%BVn:F5-@;>]\lT(,&8<8$%g!HH-fUf^FL0:^*6+kg:4U>mbLSo(9EB+IC]U#cl\C\G8gl<"*G<(e['fWrp=:#?@4M:TtHt2Bb>!:?kdnKN`HcmA2[sNm`_ncUchb4FYJhiTTTglUGTL5AoCI_9cV.-i&*Y`=IJ=[P[8*SksM7p8*9r:dU;R9K5&cQeP.7fGj\.f)`MD5NRK,I-#jgkL=L^!^T.NuV`gn17n+Q45E1])B'=GQ6mM#ATPli?;k`b/fs'OR]+\VMZXYD\M%3KT67Yh'9g=D>gIMfC^IHkqgXc\?U-(#'D73]4\*3Mhp-k)N9hqR'![f9Sm0pOT4[L$Q95K9_Q+3E(E,HK4a3XTUBR'aqTbnSGd%pi'_Gh/KCFVLi7Q(>e9jgpgNgtL'K]'pY#!s?O[n/ui!;&Rbdb7fhRN##JdH0E-lSu4d*N$X6f+(ftgp_rHB#8d\,T-`ZR*`IsCT4=Eb&JRN@!N&R,`E/-eEe_;mlRjN0s/h4ZhW"/rWc8XJ\e:ZLm5jG0QD*L8T68[:Bg2RT$(=JdO(AL\MAqi5EVQVO(k,=_(d]dUQ080p%S<$WkIi#pWi[)`YRgWR=f@U#l=g^$>JmCZ?]R)R??dGT!`cbGW5rK]4VN*oc?eeP#W#TLNmam/d/K`)nBO70Q/nDTG]jie2W31JlC+7M:>*r88E6hY%hX7g;65Xmg^^/78le->oB*MdGuRE"%lE@%PB8m8-5.Xd*VtPB]=8q@\<)88U>$E(C=b5%+_21T[b_[\)K2$3HO;=\/?>eQgVf7GU$.n>kJ6R"&3r4s/*j"rE4o"6OHP2#HZIRQc8'C[*!L:+L9dsVb@Af)ZQS0nU$1G"10lJ?a"k_$J]o*qa?d7'?lT8<]uP]/Ul^a0S!.JQl-tBJJ<;+u8Fu,ufCo+j^CKRVqX_21Je6fGWS=5TCmT/tFY61M",iP_it1Erm*_9[2j&3>!WTlj"f4a=@H(fQk:!AV`.AnhglY8IRUT5&S7)jEEVnMV8?F,6f;cr:Zr/3@@@1mc;`?Cl:>o$>-peV2LT8c@>"TkHr__UQ8@apAnZY`L5aY2&RHdnk@%"AY_2>OV9O_28L)^Qn1s]09L0A#?<=.hc123j.V\t="S<2A_2t>P,&n7>XbCN"dK./W63>F)E3'*hdbqY29^eGLo#jrBJ%h?F7Zc\0"?p.0hF>cBAPC+S_GK,:cXV&ee*]^4JkW8n62B2d+"$.!fK>;.dMHj1N(PK"P67&9h(X2-1^NhEumb>h@cEoYF+U,Np4B06]"Q[Jjl*37+[9T.+=5lnP3MGkP3+EfLCF.gL$Vj:'h%5f!'XN!qCFPsg&fm()/3=!V[k&-p,MEiJ#lambmm:F6!b=AQTH:qFE'kls`9laNXMX,_Z*E2skc1l?\@;C.jHIMVLL[n\a?(3#DaQB"cnNr\d.!e0&W=hFYK8m5f&j8BQSc(dRS>pD8u$>>)l=uUoUu%:mFSrWmFa7+G9L5=U*/AEBoHOF#Wpe7)Ch2^Tb2,=%f1!H,i#sq*UQjPo\ZsZ7bE?r699A3`$2OQm.mM^02!fu,t/^e\co4MI3M[pll2no<:7j0-lii$lh?/<.`,1e@uf1fGk^kbjVopS^m@FIG`.@"^Kh5-1(m(JJ7MB/jS%\2O*EkLWQ#0cl*0j/``)L'+8LmHUH6I7+)4SPB%-oc#\275Q7RU!_%k,%,;#/_0]PA(^Hli'())F]8PX0t5#oF7"@h:9o@++Aueu0PI2K\aDAb\@!V\>GLE=S&2G&2LE6T:n*]jHQc3_%gbO7&eA?g@XFdH3UT^uuHi_H95;9Ah:_!uj,4X8L_!?EV6PLh8/,bB[muTo'n:K5Bc0%;sZ#MD@4*E8/jSRmui^UG+aR@!P0#2ukM\OSe37K3Ra6;tQ$),(ZjtVQ/r=eCdp<^%#*P.YbFO#aeF7UcU?CaP\s%Rg-et8L,EDl?nKt]rWlb%gO?pn5_+4+9c7(-tE>S#O>drs5JWS0a]3m;"a!AL?\2,TVt"MM5Uf\T;W?!OR;SM;>#r%JF=Ruckca\e2L5Q.l(^mYUkN(7Ia\;sX/#duLVY`P8Gb"C*P`'TD2@CD`"jJ6eWHkZ2LJ2?DBTk*T)h@6XAOLm5cVEu34a[4(I22m8/B0R=\7>=Lg6$V0PPD2"8!t7a\s$%JNQm_:$_Q:]K>sN7fcl]+h/>55m)u8^:ju`rdpej6mAEu^N_L6";o3*!YQ,j],'d3#2_6o7JuZZN"@6d;+ARV.,#UIP>*TD@\ZbO;\9[[BXWg<<3m@F)J*U9W[hgA;,OG6Z*YH@XU,\M"W^!!8;RBE76atnE.Q&K%HeXW()7$tMXJCi)`Tg4Y#&,*>/_"XG>te3oajeD(?HC@Ir^[6,JmpeB_.joR^0!;?l+co)qrph:i,o$286m\eq0i_,!2!>qF1!c%caRh%%"/B?pZ+MpRF$M)l?N`1q=p`VY_5*&&&#EE*e[EW!^m8;-dD_uJWL06afQI>X7K>??1QLhRSt(Z,NAFe+S1NrQ(rgNi>i-D*qDOmEH&KGF$R4@fs:rGX6)Osrp5b=#nj7hOZ_V`$9EbFbT,fTkN-'>F=3LCo&P(3I7Km0fLGc5!?e0<=2W[);B`)GJO@efOs5;E!ec0'T#Z%@lNGA.ZC`B7,1qB(>.PeO(18O9KMm0NN"')-gAnu7+3,+G!hpQa=76">CP,4j,_F&"TI!2Q7Oldl)#u'-nRW,\=aTBsqd5"Lo%@2(99"3p4#m0=d1>jCEVOtNVs43\kiVm>LVI*pGfS)0]a$i'0Bo3Qd@:Q(=W1B[5s;8"VMD#LiB"U64K_r`W>qRPKKt`+?dq[l/7'`%SrunppIsMpdbg\URl[5Nn?['bm.Rn;M_n;A-(1EKkX.l"\;3Q)5Go1E_RTKegV:jKA_Nt<07de!]7h$HR42$#5C'gj_];X'r'Rd5?_C%cX*etD*g[SJE)J"MLqjq8[Bf/'8a_[dVL_JUmeg/k>:hY^`PCQHC)Fj&FF6*,Pl\N73"C#mk\Cm/E,!;=fd^0:Q*_[O[N_*\!^!&LV@rJJb:]ofOi+$B0\N5^TWS.2I$c&ErhF,Q9Ng"G#>8-m&f#Z>_>T5E4e.:P1Z#fbCF)cpj/FcL["Kklo$Q".Il0hh+XKf@#.W=kK?L1+k*a$Y'"W.Yar@TO994r,6PP/<8.8F"AMlsD%?kspi>\e,40q=K`$ltclK-3TD7dCIlSdPcX.6Yl(KF;A1()qnhuc!\i-n"ci!:RDK*3A`_70W*OFiEn)?XT5-7%rr6c)N);!9$7#A!ur.s[!mILS`2I61eJmap9`j^fZ9T#6lO].It9M\WUpUutgP!Sn@nQUtFQ'pJH2K5f=H8q2m9'9*;A[8fpin7FYCIa8Kb(c-BL*\;sQr&&7:lBrF][BOQ0%^g1j\.B0(28%eRq>M-!^IQuN$jWZ.7X6E_H(BKqVmO&6_d2aSA]B?S?:j+AJY5%S*Sh.j,f3WpZ%#c]Sid+*_%cb/`:V"O8u``0,Q\*?,0$Qa$EB%_JdbsT5%;]kJOLA+65=WNJIB&p5tiIi:lt#D[ZT[mSgS2[*]jomK-6En8r@h-VVq:58O;V9m2>\!OWkkTa?J#;nSujrAg$I9eL3rHiL,;M*h%s_9E89A(5TK3F$TPOZ,J"L4m(JH!)@#L1i3X=H1MD#&WB$-($81UjA&h5%@&c%Er&LR^s(dTZJ'EQ&7I<%N[B=^\hK=#\mI`p8Y4M2&9A'5;TXg9,/h]%1uq;5"r0:0lLD*uCm@rP^k2h#+;jrq3ANY8TN.UIrVBTuk@oQf#;C[iRpl-]?\X&--4!"qRlXm184":8A*>7rW,X>_ikme=l*Dj_*+mF!d(J=KcmbXiL_D?tVjA/^RZNoGN^6mLAd(oVU)9pFZmnDr)BfFN7G\ga*.6fr)o!#F\nfdL.K6N;dN!ec.A*6f)Lu'T6/W$-7;im0pBfT*BiC0NI&*s2/VlKNNTC=0D\++d4oLD#[^lu24.)iuDiQBT',DFCfJ4_)$mN[s88^8o.,NlQ:uSj6YkV18XQoM_R)hW]+cGVF['4o"Vc[Sf0:r+:p!X`^`=lRkSD4tfBHnpAghhj@_Z.8GJ/n4H-r6>P$;,A*^-6`?XE]W,MtcNee!F-Etc6Nhkf-EthkgNYJ9G.'#)IL][C>3T;GYNPS'PJ^QCY22%Z>2_r/-e2u1bZltL7KX>K?XK?D*1@=P?Je!,Ug0n0Z>(gFRZ))/]=HCuZ*nI\X*7%<.0^q?"td[2qR$;A*@S!mZEG4Wa)]NVEaeC\IJjg60a@ccUi"q?WoFiTIS-TYK0j7GZ!b7._*&"SlSEp`@2=+;j+aTY]\ZrRs^W%nVZ\[BB'@0pPe;Ge$pDVI(eMU6^ARB>_XABg/,Q>m&_2$fn@]6;@coTE,O/V'>qWS2pLFhH:R&NOEYcK'0+Pt\!\"mJ4Dt*9kVQmnQXdB[A>%4,88d$6I_T4cD%krXY64mVG`+O;H*B<&'V6tj\$J,T$`7mWrcotb>9P?HPErc"W;&CXkajHh7_\h(cPM;b*BpraU7+fWKUh8PG&+!`kkI2Hh'67Ma1*X-q*"6saM4[#r#eaC!h`HRPE_UEuZG/opYe@/IXDU*s*2+;4:?L$\B)e,ml.*8J%NojiUO)0N+p8>B_<1rN,eW^A5*8kItlahY:f1K9]$+)9+B8nnq>a<,Eit5l9Lj-M,.hl#q@MR,odu!'+',KkQ"W9Zaa4@IZ-YqnR1Jh@1_=d59hOS`ac@ZiOS.di-oa@3+;51knU.lbH9pEXHR,"4aj2f69aQ[5V9$O1:hO3"o1q3c"!@&)2rG9JL@6L`BQ7g5)V#s9V8Q/grj-:O&p9Zm+%ZH=NgXp.FrBu^\lsnDl9Q>AO:#!Q0Ci@ZqF`TVcO6LO;R/MqGZT>n;]E7_o*mF![ZUCjllV:b7?,+5Q:$r!r`JRiD@a;!hJJKHGo2J[sZhKEks9*JqKtLQToH6.#0GQthZAa>oP%=HI'T,".:/."n<38BB_'3=lO7.:\._;9.S'IKL]8n=?9C_SP#Y65^t8i,h;W:RgQ>eARH?!=_HL+t8,]Vfq*00-]penln2L2aH0>WOhhJ@Dg/72U]E#"([eC21UQ>"c6f^V@._seQE$o?qO\mN**G?DXWO:#`t!u8AHY94smK^5+]G,i;benFi!^cha8ON+ZT@;]WAK&=]9GJ"9N0X0o7.^"G30e4k5]8NqUcr'_2^Z.Ob'0p?i/QGDA+QWTo8s64ct6Hcf[V,'N7F7.[55=##1q&eS6/$67Yj.T4G)(?K=4k-VIE@k,-+W7r7kj'-3!]"7,35WFfe%aBfDgJa<:Z^-_a8tP7fe0I[2*mdIl&MXX.<^UVS-jin'B.2=5X5JenM#7n/gJn"\R#T0D*hhS@QaP/MkaN+D6n/6`+;,h?64($?`)1'q%CB9P?+OJp9N%[S0c$(D;Q<0\=OP$?,sjCCUfcAFM5d@`RRnn@$*rH<=%(LH.$QQQ&YYsGXBSAQWJqLaU0&\h.SXI#!_TFI@#\&\#7p9Z!._M&*Q]/;GB;G-=OasMPXm1D`'feMag/o,6@?jSk2Gi^oPjHhLF_#G@qi'bQ1,XJ2(er=gg6Br/#&cZ5m7Me_BB!VZK(&6CSlF>+<FhYLcpLD%j@s-#-lG"-AGn+-W6ZT(ZOk-76!.NLK?\B6VBC&^:=qX)N8[*_F,_H_H>t2/$kZ@;PLRqKa+n#n(R<>Uf8)"o\YK'1OE&fmb1`iO6'PWRT-HQV1+o"TH.%")*_tH=Fht-^bTh7K']e91hCrR]78?(iJKN0?ms'oF\4B1'I//8<1LYF+E\H;=*I.E=Xe7WPTJ?sYbW-bH&6m#j-Fq*pc!-a-b)^Sj2rZLgPtp:NMCNRYBn!l*P3?4=Ra41$r[.oM#s27k-btcd%^h\-\PVCIJMB^VcB]&%AD2d#<]OW0FX*mRd1"h!UinK;Hn?cFmQh8_KGEei;gcsCl2Gb:;A6_O'>?Lmr-RmcWRGOV&5[3R?'AtUT93_,YBrF+fZLN0emikCQ\Z]r'bQUb@2Jb"WY1rj_5.C#U0KMiXh`\]THj(fK#R0;;d+^.)n.AhpHGeDCj`IqJ[*OC]3l7o6UR%1"HJ)NiClPLMoCf%GqcEm,md`N/c:tru[VOKE\hDkOm>.QM+9Zaa2N/ggH/CkE@*iS3]Og;WFf33%c_WaEIS7Y8B]_9V5#1On?$"Cj/,kuS<]>A;5&K@$o_J,bP$@,/._mN]RhZO-T0G.u/_@g;TSrnqU.S4]N&%[l^,g8U8087.ll1iuWN194ACg?YT['N[`g6?P>BmXs:\>)oS37ZT?2bj]EB7?J5LO1.H-P$"'0j1?`AVh.!OIZV6Xu%"`cD)cf^Ci]-.3Y'8@'XnL8+AebrpG3/@p,pYPnMso%gHZ#n#fhp"2FkJ-c6-XT(deZ0Th:i;Q"u)SV>-45OL=(Yd%-s%DN,3QK.IfE)Ak*%'G6F(VOmr4);*GY2s<1E)b";AQ4Yp/GX665F,8K^R33,X6,k)Ob:/o/hb$J1S76f!MWACSRPR'pN&8!+&Ls!6UDS''d#&D<\>dSN71V&menH9b,7%*Yjc$L5_(lXg_KLZ;0e?#[T5>;tg4PX]3Bem$/=>Mr3:G.64PV#_OW+Do05[<**1rZR,V(uoh3&]km46(lXM:m5=u(K1'J2cMS%F'3q?>=]3_7O@Jr8P0i]0"FQOhO@Oh#XZO5W)&[FG(PSj23!WDi0$fFfpb_L;n8'NN'7@fURp*`SXGVG,`2gP-)4BX[amW6.VJ7Q-[5^a5h7=X_H*VN6?Q%UE;T6h!lI[sFQ5f83`>:=2%oH3nbUT,p>`ksSOU-^Q*IP8f1_'ucq;"80(n324lbDN&72oNqfRl.=;#Qk:M_Ch.rVM9Xu\\qQ)&Wo/B8P\f^(fBIK'UYa*G&+;BIm@C-%HT**One/9'E!A!=/p%0FeNk#6E_bD`HVtQ6@9VJs/=i\"uZ7[Fc*L-CR]qAn2Mt\m#V/a:)RpqaR6lUMRlrVAcKF!bl&u!Tk2d-GOKTYp$o?$Lsqg%HWVq^O301ZV2K-,>*+D%(uUUn%>GABPbCtQ]DBb$Pr4WmsF504."RA`U^e8]$F-:*cIgTcL8U^Sa3_e_H40*@;h@Q9\d8L[#GL.SUh;ndu/(T:GI1cDiM,XfNW<82-uR[m;7'8*s>+ep09,KRpcE?5QXLOFA;Jo&fN0sNqX\4%+-C&d/8p_M\)3W8p08F!\p%ab%Qn!)r=Q7TsAY2X<)COgJbV<\N&Fa&(f+63"5*3,&IfV%$>F1&@*lUXbMH6_O1+bimDd3I8JI;I7]_9=&e[XL#[,tp3MDH>2hpsZ9oP!\C`a5TF`?:rAP(5X\]I;SE/.LllGZko]#&9P&W*_ha>;6oCbSdjJKl;i-*6/MG2rshpaetR8pIj=$WM,YKT^u/2`=a4'9Q\`iT-uPM(giON>+eA+u*#X`;m+`@Gl]+JHZ]lVjVa$Z'"cE$65UY"+T,NAFCJW5UdqAZ^33\UWH-<"lAN)8O$5mJp8Vk$(Wt;^3./1cLRal]],^-mD;r^=O(`<4e%eh+qEb^JKURV!fPS!$oO+UKFV-dSBu)lI4*)^#E**D\Z./JAH4hBut41aW416jN9:![L#<+P?oeV#u=5@7+Lc%>Hl)@-0H:mMBm21Y\ej;NtllM&;`IP`pe8YVchb5dJrCpPk:IUa9'j(UD&UU+V_??%@pThD--k)"#G9-.D8V?M`&\:es++6%L4Yt`f7cC6klHljror05U[Tu&4P1RN"hBd,S=Q)"PsXL78+aj%`8;Lqd4`C`J:4XQk-aY=,FRnfUpOoXs;L5PUFaEYVg(u$n\\pZsYb2EKUPhHe[o$+2bdT&(MP1E.6t/^+M#Lo:l._Ocl8Wcmjpu,Xa$$Qk.kA"]i8Z.md$mU(c6V(%92%YLHq=W.n7[n+8;6iq`WZc`@J#$6!-,a/c@@6l@$alb2\D-[#0S,G`n3#3;M5@Weq7fK7!33%Fb(.Q0"sDBHdA#E:.clB<8OC2.*nsPb3i67?te).J:PddpQ]JLdQtk!$M=bCs\Fo[s^X.1KA"BJroeFCb0bW1LqM/p\a7b[,Xe:VAYSS]$$./ok,+[_,Q@"\jN(CQ$,Sn."d_G@+ngqPA&PkhJWpjDA[n.ls1l7#6$O>_([[80O,+7Cb*NZ=>G8Q(5od;_Sd@*>._jhFGu/6l3!/KS;h_+rtaQ:LTAXAjl6CS!=6&lF[FrS#N*tYs'="QoQbZEN\cTf7'?IIdF$'I,;%$l[6A1B??O3GRA&3lGdP>=!i!d3M`A/,gKSBjp/[XPh";rGBF0).QdF/&e[AB>`ht]TLJoPUEGAaO<7fh2QcUq^6A"4Re/^cgJVa1Lm6n`k_;UF#VDHmD[:WI2KMsl'0mbVgB/*5^UjD\4kh**bE<:(KF[/Yr+Lb'TXe3&eR3Z;%l4^.6'Yk\^m^@Bk$HaBS0l=JCn'.c,>N[n<'#V':4X1a+rVIh%)Z?ift%RI2-K98>nG@eLXa#-d>72Ft-(0+@E.S\eT7K6"g;M48)MsA7,k!B.T#q/gb.:1Ykg(Ir!0%JbE]%qYo]N*-N*?]q[8lj:K&-B*P&47:mqiadaC@^4aW\R1`ZJ/!W>6GXr_$1=1A;ZHk&GGhr*q4JoT=oV((8GQnN?fDgqd7O\n!IX4Fql.NVVhUlc]&hdF9D`(;?D^R=4E7t7#Y+:4]E&lZ5kI'9SeT4hs$^5e9`>2lYp&Ajg!#\*NE'JU^j`&"*+N5H4`,\aLqLO8TKZ,,T:6-d/=%(:_IHerD$RpaM?9#6!7Ra6:S6!kMlri&T.%@di4J>F'Q!fLRsNU7F-^DIA_T@0A&7kmnU%Z/*GTfS&&Z@df<[r`LB@jX[P%p9@QPSZ*kQ_b$b+[R$qO;&W'JC[?ed3\X_RdnUuYdBr$-eoL(':3qs>S">@T4?^JWUB3VG)q9j>GHL#u87=>7YAc\a+FnrIX%\\BZ>!j=W_?9*H<4XoQC;M]D7oJd'dR=A<`q>ZW`GrjP.l-D[_#a"8A`VdBrNOmCG-]5l>%T?Y$.u&9%FqU[(EC!$BkLH@SO9UQXBD=l.OASDNX[`Q39n[%4,1=p]L*%49>pQ0Tn9nN_/A2bE#-L?G!D#!*!6$+q]LsTV4:#G1=A"_n%ef539PP8;=eaN3,Am$b3A]5$)t[X$E2's;Tg1;MEEV#(kopq.M72GM],a"epXrL[9#m:>1ouXD,aNENVXRM.B&6'>+8]RC0#%*)^[+LP7l-9gEi/%9sIBcZ51EX[@8r$XDHUsD;s)o%'+WPAT&=d`"("<5dEGdYah:Yp(qH+Dk/A%70#;:P*X$:HG,n5bm/!I>=U=]K-VV4Qc2QpLIE7V\B_e`A1-G^@-8\N15\aTY]0^ghPGR79+c%9b9+kF.dh^FWYnW4eSa^&hQTcl0^hE7He`5*AACnkfP?NF#C[[lLu6L>8?jMM4P,V4]tOZ&3M](A=PJlZDi#Zg@BREpaiaFJX?iWTjV]g$n#%r-[VU8DDB?Vis%(j&>d4V$1lZ9IWiZB#5agWn4S+@7J&:JsEB[6bUS-AMK1L4W6Y=8M#)!Z_>.prkEQ'#s8Rb,_plN=B^PsJ5Q<3_SYtn/bFZn#FQ<^[GE+(`5Z'8H@:81#Z-TRXiq/[Y@rG4C6hqG*WS;VimU;V(9(&c<+15"Bmm.XMmOe`&PI$o>2Hej\*=3JhlO&JPDKZkdXY^=-ZR0b::NS6',We&6O0*8Rk%?MjHL^U(YA>MF,,er<1>r:)o6W*6Q?e.HMJWN8,'p7Z8'kbC&Mop#]HZ1O[)k2P?X\ra7,6YRO?7;/NqXD!'`94Dk)u+EY:e9e%%*-`F[S=4+]o2P+])2ZP1T<7?RJj:EakKFVjJFndV"Tf3tA?CsAljA!7hpF^,b'nnq.[+L]T&6sK(>8D4WUHu@d8/TselaTl?p:C"*XNOq(i@LP020`t8Z(:TQFOLSBs*SWXaFNVAjF2)BjiC57<*m'&t1&df3VUf,?PFa(^s.[FpKZtZm^#pMV@"aUD[RlH0f#pc]TO,Uu]oL/lF=4aJIlHqJgo1ekh^7AMcNID*!bsUU(m^fQ`%^*Bd^%TiS3"drnKeZR3dnF[oVJ\&$#^78QR]k#=au!n:f/Gc^pWd>k"*dHgpC>aB:=H^)jV0\BFaQZK-Vi(NQQ)ic?PAb=E\QF-0a$Uq)=g/,".M8R+"ccAuOUd;_?j1bBP5mFI4rq%3^a6W6,Z%)?PeX)RVo#6ehrMA&EMl4^5CM9B'*`\)k59]hnua4lZF]?'g#SZ:Q=)8L17n#HCFt4GK!SUYR7G&sM-blQZ,>K2&VX_t;\a8IQMuii7Rc#its3U$Fd>ffZED"g4bEm/$%"t%BPQ7U%LLhI+^L>E@G0nFs`@1WPE^rkDS&`ZCB1_I+1d".*[[8:>K,329s*f"WNE5;Yd\1pee\"Xk%T>IB_Pg19NK2r3AJT48m"+u5)!14]-^4/?N1o;\F..X\[nOG-(kEidqX$=lDj#IQhhA\)L>"q\CNWIpS:%p7/ZG39ng>uSMU=IOgTgF"t/RA!`/g#(U4mlnGiKi(=T##no$GnGu\-uPp_JNo./aF.aI5Y=S/":jI7NlWYt3<=_\A"UZ)3L64S0u/qb+K!eEMN?6nB>iJp1BQ&M%CS0#0JjVIY%e]Yk)f%Y59CpohKDmUpX9`E)JN.R:qQBicg8fo.Y?28"uI/Ms5#5r2>;VS]PtASKec,>p=KT[W,H@KRLF(T+=sM+6@f>f=e(MN)pc\VjNApifA@(%/5.2.s[+[;M9g1h1kaF'`0qD<')69H+0mLLSLG;">ur[)Wo6:>RS_]l-%'DKg)VhPFL9`i78Ko@KJR[9g-j)P^eJ.[+aRNCD,i\Z"5q27aOagS4tajkFh=]h;j(]@V+1RsZZ-&XkYk\W,ijd^q@sBiteNa#_eHdp&sX!uY:FA6#Z'juJBZ.u]*a@DbX_`mS]gO(aG(Y!O#1R?WI)R&fM%&Y[V--G\hr%OD/oA:FNN0\6*oYE@Ilp_63=UgsOYNis%#,tV1(mTDF!H0&qM5bc,XK7G@CrC)9OO\aO5\&IroQEF22!"sW'gnXf3oIUmF+TVlMPA3#)AQ_X(Lt&8p'd>ob/dqNt!.fiTD*eB"QT"A>=Nn5DeTFtoGh]:>D7R3bZu+gQF&q(T@s6P20JX":.90ga_,f3f+@1h2nSt"ZJB4HKn9$7Y3qM7\T`($=(dZt4qn.I?qFD3=&9WC!+Sa,p<$JUk;$mEJ:_MtA+W1;EoouEpX/G@Z=l`QuZ>%ock`'MmiR3Qp'0o+hg*m,X#iFugXn7'>Jb+j!:P3n;:IfYKf^hVp'L*iFOTIp$^4:IIN't/j)M6I(iWNQO/g:o1-6fW+ei$!b#Sb:OOC/e+C'p%FT9`N?-pbcUTVNcr:-5g7W\q((ZSdO]fMRUm/V5+F?q--4M/j2/aQ/@*=Muu5*'aUfAC*6j`-:9=63K-)(aoA,J4Yn"i#p",(tl-)U2GundnpA%eK*9_%KfWu:^9D^VQ5[WWXTf\(`ue)--2n@udE`Mjbq&D'[2?04r?356gd_nias,5EY"U7,Yf3QsaN-q#m^p&)F;g#fCEc6lZ5P$PAAV`@WU_\nCPG1a2!9^kW+4)`?JFP?%gZ#mSulP*AGrto4453HIU`9B=Ks9m[7-4^k&=h=FO?jMim9TFCD1aB%Om.nd_uQJ31=?:`A`plDhroQ4Msjd0hb$#Vh.isH%9FDVFVOJ&^bh-7o)_3hMl5?L9DW5h+'P08%"'OKCBo:K0-AJ'KlUchm;L3!J0"OfLn+]/ra0;KIX(:b!D\N4M@I(c]XQC3&-($Vngc5W/Th>m/L'md@<@rCDM?,$u,gEJ`]`gdn%%UqRF?UZAL$>1#lppFm-TICN;KWG3g,2aee_>"cY,f`r1o2nFZ;!c@aG*-[/.5L?Q)""des9$APqm'Zg6#:<9.;VsZAl,J`g[m3P=Di]Ris)Z[+*ftBsq"uf!\4fR1f(oNVu$>5D<(0&E`^OPKb<`h7HJuWQ[_EL7nHt#o:W`Ut2u3ek3B1<2RJK$HOA4`:O55\KJ.G4+R3!PRl,V"7@?]<)b>(6tf%1&@(m+5#8%r7g(tGHPrcFZthE:)$>@njiZY%f@l%H*<>!tk6i:/"/Bl3\`h_&tff)IiY?8-QTegnd@AJ^+%k*u_3H18545/bM"YB\;YSI`$IO".7_[_Jh:dEQY(P:BP),l27"knH@6_M4S@1l`J`De^5fI`/7@q"!J!_Nt`Z6'D\:>?AQ1_Puj`oP:Sl;gaW(P$7g7cGkY&\'A!U5Z.upLn1"3^Q!BP_rr>E]a9>;i;4RiA6seu].`bajr'h7S&s8)&0ZXoA=[(?']bmrSSB-DGaaV7#Z9"t38>b\8*Ucu`'fJ1T1(gUeF1D5=GEfk<$j`52igLq^qViXA?iJqW;qAPs32Kpkr1D?^b"_Ks$-.g1sURp3ijFi3TcC6HP$Pshoi?.]?p0L')ajap9[buj,-^je^Cd[nkH4:;cJoRBL9PF0^V(FeZ7Zc:WQt!rZ,%5ZG[1!s*-,AcbKrL4q9o;_V=D\h&c;d%ucd3(6S2Q(6W,1IdkX)Ej'sD$,4h8ZTK_U2XC\H$1!#7S)+UHdAGY4LrKi*tSD)jb0$2a3-";N]FQ"r`^IKP0RD$IikB\`^#uH5YhNhgLNZ/?YG4+S.c+W<@SJVQ!]q8cf..&Zk2QZ_j:lW&2M&5$3\(qUBj-E\Z*^d!P8e@3j`rk1S`@b.i+ngW($B:bih6)q16IGKNf!-^KTQg:JBHaUFRk^1A`ToF]Pi>mT`eATX+H%N&CaX5&N^OP1_I"b2[q(,_"K0FFrD3^Xb3>O&?$"RN51[D_(H*)8*)/3arLae+ON)R^_-D?dZs%-0PQ.WbfphfAZQf>h:neChVTu\)7!OQKcpK.69aE$2!C+T>9_t&GA;KB-:"RB:)#Q($a=@87;o\c:FQEr;G][,Rp4,r!s_Z?eZRL?f3P9&o<']@=8&@NGM(h:=AVYjnZQXnEh'-)`P?qHB7.1F)Yjl4#EHgIM%XbcRa.8td6E4eXOLdhM6!(cSbfX,WUM4ZeKF-nu*f<6_?(H,cci5gB/0GrL_C@ui)IMe-fYX-KRa>Mh,eYOImGWe9?i@S"W4M;TqRGVoh.NL->Q<)'`/fjFO=Ep;SlRnAHKCWOu8mYEOr/Ff7EK"NcH^UWb()F=Z=.7mn"@n0=)L:r6hp9J=T(-:ueCP)hnEXb=[/Ob%$l2P\1S+#I]mFsE4AnDh\*"[+9qIH]_kI*$lmcfp5o:G!spn*uK&$l2M?VV8D.N:K1E:/9Q?uZJdY>G?(#TBNG?r2#ZIjt>$6'7eX**r"gJaI3YLbMj$]ZeeS_j))Y.&a4@BY)A,BJC:'&W,d;LrZ)>jaqdoR,_?'I,7#B`[15"VhDH"N_b*^e"+WF[gA0nF5XjaYVKP(Y>psJui3-?WpljouENA6/`5O:%5h??9]3=34djl_gVX(q)DT1C@>KU^=nTQlLg@gua94$(a&djl>-qFN('D801,*u8j/;9l;rEW_7-[ubF:#Hr6qK]qh7"g-=<8*UE1*8h-ccdcO0HdWJH+CSsjk:@_j&fq4HZ;>ba*SA1$JhN!UVBuoBqnm!a&No'.jp#%/;k95__/^G[=^E?I`[Ys_BBa,gd66%M>/`3':.fVQm^cQm?MdVUa(2HO-d6H(cG@k4YWPKNmMV'ARAS%q2o1L&_;%U(YURq_%"XDPZ%kpP%9M2mDdY*20PDSi9,ciTb8k%?4Y!B&hMcWdrZ5Ncb93TbgloHs8[P"fG$BB))X=AH:0D,6.lG%'1.:khH4.tShK)M[,dfuT[1`pA=e1l\YiYt5W*GTR8T<0,]CY6nEK_X$chAi&W.&1JqKMSAi](Sd1ItSb-:U@C=MdjD]^A"3mpQ*_A8_3iml-Wn@E3O=&'''CF,_=X#G!iF8?7rV$K.\t%#-c1@L(3]eAeA8S_=Rk@'C,fVc"P@R]T&VMWau=g>q&/QKhs\]:]P6m!5q:C'mr4AfDld3%Y5>cK#!35Jif)N"Et@&)Uh8M0I4TTKO:LaG"6lm"9mMaZ.1o_diu[M2AGI=#M2C($u:%n:Vuq4Nj0S;hCWg;]4?-kbC]ApP""sR$O%$Dk/N-,64ZYXX#n8:f,sI+iNSME7K4Hi\0VRJS)"pS9Td.\K/N'ItM?+`rW+Hd$J(QGJk=VIt:^5bq4iR\bNQ'VO:ePn6.F'kl`>N=5i*W<4K.)@@-sXccAt,shTp+p*#.U@*qnPh(6/p3iM+h64D_EiU+0IDg,77&\1t3?C5fbL0rU-/L#j2*=u:37o;i7=FB@eA;r>Zm=[BNLh.Sd^7hnPZe.;9J^:$SF"N(nBIUE,!m(7f3)C'CGasWBbDf`A+\C1D1>8eqksrQVRkUk$sV%1Q\/GZH17$-!*ABf,r?R,_T$E&c,a!g3^3]3):ES4$tZDJrLmR>c`*1(bq^Z'J":+Fh:3]l-[]j3!tuhY-Q#)@\oJDPr_>8K/*LGX.1th;^rD2."\A<1)XVbu0]#hGX2mqN0mbYgjS5bHPTs6L-UaFL6DbmRM4F6RsMD.((Y,hXNIjm_ckp)K/b`EKUEpj!J&0.6fu@bTZ5`\US"K<@Oaon6q.Io?sBd7L)LpDGk'_EX%P!U%44Bq8B?o3a#)iqlVh^R?7AgcSo#ge@a06lX1*9Cnue.D/(NFqWOliN8`q#J*k\[.f8cnfc'(iMNOUgg>+f+G0P3Hb&Ha^S9M22A';'"0+GA@GL)@`qWk$SJ$P%M\c_-gL]/-aQH.?6OEUaD=PbCF14qaaTs@$#LrMJ9*0)&soqK+J%$H-_h$>^cV.=&i8/>=]So1QBL9"Q8Hj[UlGn;%V!FdnQQl\\a?$b'NEAeo;;kDf?;s.)_gq#RjC9#l*1bA"m)0UP5"63_VA@/qi\_>'`kE_C5bX`^rYb0KSQtKt:*@HhU4`6e1Eq)D6Fpd'GRr86QTl@AJ0TZIOb08XKa4>Xk,b_OD>UN"JfM54DsF9VE8RT`n0ng+c&Z#*?]QLT3%\/YR5@XqP?+Y%W^57F2hoAe<"^AG&3@a.jIk+'/;,(bE6codYTcDQRkiX)AO@p^OcsQc1:W^lAV--7MGa13S*S;t@7dam^%'Mj?5We0Q(0.T:#iDQ1+,e%29_\jmW:MJQAKFk`Tf15qWLS[XO%Xn'[%[`PmBTFr`*.).%_Z$/s%T(+!:'5mYJ.j@OES@NXa[lTV^f1WRaaXG0>Kr=;OK_h?e]08#UiJq1Bm=E/XVJ^.6Pm:tMUiL\-d3Mj17R:LfA(U,KI@-"NJ.)]],4#quN)0kkTYLV[_$V>!Tj&atKEgd2@Oham5[ZHpF\uo?e[q*tlCp2+b4-CI)r""hnPa"(f%r=A5`eGI.KDg'^arlO,DUYY$BldcMPUkC)GM9U$)QI/0H,Jj?+"ZgTHiGcbZ.pfg4j*3.7"Xd@[+Z!1g=[-5S8rk;1o2X8ccZc8?!nmih64:fY?-*1)b#$2Th#kG4r7O`gNp)J3Rj(O3UUg&;UH*U0Ih_"=0q*ZHQj8ZB^VO;RF:mMV5'+g:lt9T"8-PLJg.KTG^0='oc>$0T$K6_E]7G8WsEH9J\]`rI/63Z@0o>Y@P/4:J\#R'UW'D5fu!6#7K`L>$,]cCr=07T^4HDES\](!J(u;*Q/iMBSEVHSQ5KSY4B1NP1t#c]=BDag,>u!kh7UiC2I6VVhU:ja>+u-(768>n(Zg*XgKFV:u.^p:=2.<>ROMi13Z,N:)u[/^?&:(7^:YrDo=2%^X),a=+)gXo80P@XQ)jk=%sX)rT23fr#q[9d(d_8lk2\89oAbUFr!L*[I8n1?Re5'enn_HPb6GR4XU5j_Km/;\&ksK':eY"-DLo$]jYr]jf4OVNOJV_C[Y<<.^)Q]j@6Ou=3!s;pM0@q;,A_DPm+-3PQq:Q,%omMoTCBhkXXUshe#\Pi?T/":^p"a%_.pSea.j+0oH\J2BhK*ehd\]hfK;`7^DHtO=CH,3o_OihSBVn=9+jV7M#RL=>7T26laEA6D?C/)Rq(<73LF5b$dRYaK_OUI5A2QK+l@49b;Tn6`BOC^fm,&A[S/4^'K.rGrWFqGQ*Tp@ftMaj['8.?n4)As8!7*7Hj/jc:1g@q#D7[$\_;5+JV:dPMEh1NE)/(;u?Hf0%.9nWUJ4HE)UlL+G%Wg:W>5h4Ym_!DC3%)A9:**Rm7&.gT^rjmB&o+/Wg'8EojRZ)("#D?Qs;/K1qsNL6(2@c=C16sp)OQ=^1DiNUa:g+0$nX!AT55u(20TR!/$i<[2Q*M1C^bom>fC/ktTN@[VX\oHZ#IH7R8tdM+_M\W"`chIn*jO"G,5qM=\[j-q"&c"9BYK;?Rj;KMb;](_5[$8&6[Dk.tDq>#U^OHG(rcV<>#Q#Rk+p:<56*>)"a@L.)939,?*k&[`ohp!k!]n5lJcdq""B'MoDcWRcST1BeIQ7K`u5SQlb:">L(2E4a%b1PcYD'q%rDL/j&H'WE7;$;dIsLnl65M2[CSc_)?@("PW6\tk`Ol[)6*W[]*LLoF3JO]H*?Y>P+F,h>aU_QSr#f<+hm>,lD@W![9VBscR!YYAk9CAa>Tm:uM0bX;-=9?1065^8*""0rmJ66`4g&dtcCmBraA$/g<"jlerT2ukoCZ3]G>O4^0p^m6D8!=?3DcRb%\c7k-n/A$6-SCPj6lJ(u=nX>Q%%ujYpW>kZ#Ws\)(.hcS@TW$eo3/DNnD5f0V=Fb$OY8l2k8(::$"\F>#%ui;%9bYJQ'3EZ7er0?@'*YKH"0)in(D3fb'OWp$Llitgm+agiJV.cQCCankN572beG'(c":im[OrR"=I#ubT[YWHR+GCFnrd(7t`<)\NZ_U9'_-p1QOY16K&7e&+V:G]P7;3@X9P-@g9mU)OlL/q8DUid@gN-1DND_9P_\mqUo_r\b]iSmKJf"ds2FOso@TA8K8o&95Kgp`gSS\E`/cK/[p$b(n+@!CJh>n^*32u<41bb_(Psp/uX>lPKJu`WUl*>Hl4J^+Fcc]%q@Z'bWeU2D&V\Z#7+A$jjB$[Q4Y="@)t&7NKs46X-OL6\B^N$DNc#+.3>Qd1@T"oq4K?B+Bk4N$[n79'M\\Z^(P\t>]1rkIj)4b%KO@)>>/_.cHA64"0(@/[>''/j&seS>r-CJhKT2JUI8ooVG)_"eQXs"Ge0RN=t%<=]U8]i_95pZ(c$S-YUFRWb4te"ulhi?X'uGqD2CJ^"?/M&ZR4$D3gcnbNq)mt%gCjsrrI8muCDU$\!`\@YSGH`,!pRM8h69X;9;7.PaF9LfNA+sRZ>]Fhu4^s6X!JCu$_dTQB&&FBJ&rJDplr@pOMhEa'.1QU>5:(h8%4Dt/>AcT@ILAKKlU1Oj$5Tr'')TjPldr`Y5l\Q4"d(DgbiO6`h1$fC)l.S/_lin`O&[0R?baG;PhP#H12[`s9S5%ni>U0p%QbF]rq6J]!;oT8e,jcR2am*dY;N!/^Z(noh_]<24Jqk@;Wr%.:F8*N/-:\1W'0;X?f.;Ol`72/S3m"e:^dD#\g](]]UkZh/MK$_oF10@ikO^E`-4SCa"S*De!tN62tsi?TJJS%#*:@gni[q>W8Y[ktOa,k+&G7tY8/UO5lH_a'ZVl'T`dcD\pON5_OtL+t+BiR20]gS3>TR.EHTlG=^-.SPK#;$Au$k/&kC3c\l^@Cncsgm\PA%"h;%dqL8>LTo<>:LC8E,uIXr4tX6\D7NdW%`X4:9^o^.rj]0p?#,<5NsQuoh@\d!j^S&:0(Q.`;T%kn/2L%_;A-,8C/gE`Mce_Ois]iJ17bBHS]2r/qcBs,3(chK7DnT[HVBAMikGIupM&Wg,"IPFeo#cSKYJ!jbk,LRs*7Z%TO$m(4nKiQBR#BTs-BIhiXL3OI)l%@4Fi^g>BNW!bs&8,O*ETXMO]'coD\H1c;j$pt$nhYItomjlO0kT-AH;4d6)u'uRg1o&\Zs1l*-lU-TLnOCt?Op^e!N(Y=fKUWEI6Duh;ALWbN.cFdg,Lku";I%7=OjcOCp5E+N%c:%j;H&BoY5OsV-0lmZVZ;PM4q/3MJK1E\qP*G.M?LIS9ocR3S$s.QqN5;J;5U3@VJl,SicHt4<00$L_&BRV=GJD\e.,Qs#MqM)QC,5$Jb_gG'H-4<0AhI,2X%b#^qmN)9f$)rCE8IXdEIOXX.i^j"1E?E[_TdCm*;'b%*5,q9h&e3S1_t3?'MRURM&,)Dq1?j:a]XohpJHOg(^k9,0UXbQ3V9K$]G+k&>QT/>erEp1k5mo>F:nerL[l7U2dmPE!ehN2i47Kcg[R;s>2SI6W%T!GI6k4`ZluhI'*^arO:$"uq^5IL@Va&e)3/lOkSY!/N_bX6"F13TS*EQR/Z)#8))-_rDm#jtRS#M"r#T8UP<6%"n-I^bAWS&KI+@AV47h!6)3$6RMK/#r_>-5RqO=QaN.>Gr16O"rH&===h,:qJY,=Y?FP-[iN#Z-JDi7YL(oDfc%#3#br5k9SYIa,,VK_e/>pO1nP3<[Us,<0S:!W%DCmAG&T;keC45B2&?,a&)Z)fL\q^bMUqo&S[d'<3Lm".>3[kG6>7r=-W[F1)Mp(EOBL'D*%N*EOfs.j8aYE3QW'$l]CT/=6]0=N2YH",4lG\1qJE)$Pq%K[eS?1t_Il%\kHFWMAj2=HJp?tprrju*ql!$HNNfr#=6W^7`>Kpk8gE@XXO8&e*1*et*03^OBl=;_]O,SH-#"XY^h,TRJ=nt'&T.D'2pddifqeLY=3#f6Ub7Y03::%AsmVP.j#&XP*bQ'IJnD3@L'YdC5G(l&$9i-*rU$pk!u+@UfE.[2>Y&64a-e>K8.K_3pk5g*gbnhfs<8DD$34X\DPg'3VMFe9&p(8eH1,Ru76oSfn9p3*GPZB36VR3bDmcN;qf-9C"md#]9*(H`_#Y'G)Kd6LA$1L6;Z`&b>3!4uh2-8!U>P6t3",Jh9B6ih_&'ZT)-n<8bZ'N!1BYKKVX_)J`UOXU-*si`/%i6bsin,!_#P5W$4ZdNkQmR5EPh8>M-]Lr^=H2oYZfOhB$_<5*gP`b9#f"&/l:T2._kIes4lgg8P9;M]$9We`IIC/sZf-?api:(&VDfJ:?%HZZ`batj;2Jbujn=hmCTOF[TcDNKt8DH*m#0K9k.JIoGULbYP>_6aF>[1CbjnaQ>b=k)Zl_@+Rja]U6Z,eaY1a4W58$_Zo\"2J2?+@O_G!RgKe^`G;fY&1m#-`lOdnYngkbjc-O&d&NiEqPS5Yal$PSR/2+]PR_fVHD'G]b8>)=oJ6N1XJPI?WZM:4N:f5]63S+OUD*Tc2"3^aIJptNG62X.OJIZ'uqh6HWh>eSpV;=Qdn3`FN"p@bb0Z79Sdd^>Fbn)T4&7bb\U1>'ZX&,J6$V1mC!@3A&N3ra5hQ?'ZP%\CMR'0T>oj5<&?SKD`o)\p3.\iTQD[n'[a"]e=oa!11j9'?@BEuF3dT'2p*asRU5`h*d;5(UCXT28ko`uYp`CHO>e&s+Cp+RjeeJpX^l:7UWJD-o-"B*TRfesNqRkTs5Qr?jVJQSC2esK?IUF=iZgDa?cAV41-;%F7Qu#hF_4:J,Q%4n_HTWTP]V]FWp<>XnP'Y5>:34eq#+cm0"JeRO7nld-frnQ.Pj.@L0/]3k7#uGE'I-_P.[p<6RL2ehC5O\EkQ9ADS)..2p\->(^m)$V*:+`)UG9idG34tJ5Zmt-*GGqe/L6=JiO+XR3B]FMtCFtrP^]coSN6)76bNO\lqjP&W&db&')S:o1a0lD]9Lt\GhFI_FZNMOUKNm:9'l&k0?->%,qLh86&q2gM&SDoQM*_"5ff6iRCd&nQ`kKR!,%^pOe[+]=#7Y^E60b;Hm>q`@Mg58)Q0HOBZFMUPYi/U&nc\dPt>J_l[dXcdnFO9?S]QhbVo&n0j!\/$eE>QS$;P9IAXiZd^Ot92H.aZ>bB6F7=X#/<9.:f!mmc,F`@#EZ*(haXtME400X0GW:pO/EJW>7EHkQ-54.(`]_@c2eVnsJ`3p-B3V$J.dfu)]F*A\MaUH4N]";7.N`9BU6/>Q&nh&W`Sa2gN>"I=8isWp,WLr#[M9MIor;aJDFDL^]%>),UEI/:bHDkpaLS++q/OC#6U^1i,>CSE#+,_,+CV,l,hF?p=lVuk?#s)505chbF+6aD[<,?r%.UrqS5P?LkuS*RR:TqV"eo,H%4l3h+Md%T2`?YrGYIPYpUi+c%?t7*Wh>U-YjJM36`aS;`[Rshe5KF[Kcas:7"U02_XCpHbU_u[LmMA<$f$RVPBtCFYS`[Te$3:t\R_B4qRg^6"nn"fB8g0h[7(%I>kt+W]P#"Mq>44SNo:n#WB2c_ahOh!FI]q/,i\6aM9hN_h`&-O3grM9.5M3]2e_EB17eEa6Oq(3pETiadB00k$NKaba"ZCoNjO+@nq!6UG:9Fsp&'n&g4K6LNKFpJqRU%a1>cC6*Zp-8o9kG0YG!6@pF5@uE,GJe(>i*PF;X=ghVQ739R<..8k(mMJZQjB&#?AS*uVLUiHCY,hl.KFm!+oBe&)4)MQUqe8EZ;&@!N1SHu%D>InfOMncoRM4@Kh42S[t"pJf;E#b6`^:CZ>Oe9i?7JWR6^&S+;gQb-Q-&t&E[c.NY@_$BII^gJJ96%E%$UV/n7'!2rSDG``R>%#;Q]+hfaYZCYnL22D(!e=%kI:IsuA5*Wb]edDfNk9.)ff'E/<]ue8s-'PjhW9d23U8*=JtGD@F]cPgR7oOFK>"n*f#l.^=O?+'5S[tjLO[^"e/VK^a=H1*DD'g*p^/?2[E%juJ]X?;(=7fD,7OR7a:_8@d>^*`eUY*u6l;UKn\+]FS?)9l^8T)BA4?_[>@0L)+tQOSU6eP@Zk/F!_&b+62c\MfDdrTD-fE+$0brMFrH_UUN)P9M?DEV0*hg9?m9"ja1<50r".k=CaBJ`&=2r\>#E4*9FG]D)OM4%7i(]9i.IW%,ROc6_TZ7ZlJbHE0E#8%>f*F;MuTrP?3o6jYfPa1-Dng$TQ)5jACZKM;Ej;OHO$0M9%fH%qOE=S'%Y^9(M%CeQDT)'Z*PbIBLi\p#%e\f^hIN!s/M_%u\e/SjWiXR0Z`%#Yg3a&'aij:<2jG%S;C&,0i@$Ka1M.!/$9!WZ6B/X8s1]4f,XP9o#ArE#@Gr?Y8b0$ZMr,Y`QX71Kd;pe:G6U\;tD@06:?me`2uRd9H*lAnZ6*3F`%-:o:tH'VAf>$11hWEL7(W#@gL[s.]d71\\sZqERVE0[PqBkDE?NZ>$kP9-oaRe%;BUj]\<%uo?T>gb;1%n-*112Uos/U2O;L">HUrZ]5(_2ff%6bb>GBAc)l1!WZ[T/V1M'_!PdoG&!)>^oa:Xo>685L:"U5/.KIdLmt4G#d/r?JW*F"n":3"[2o@-(-M:tEd_Q-Hg%eds#0jE91E95*Oq`RH75m62BQb4j*("I\FEj`N2RtcC@HPTc&B"^mPI?8he6h&dca'lDTLaV,7UDK9((-JY7;mm1Pq*'Yd57)s"JB5G,c=qV6>BK8S8VWnbY>=cgZGTKP9+46VhsPN@XRQ0Tu>$.1t,-\NKQ`XWuU50>ACZjMbc)@-ttu,>=gh+UI7gERBDY."'2-u9cLHclF0(a6F$,W(?'m[W8P#m(6Lp7Gk#<]ZVIg9%uiiX'T0HP"R$hj"'V*]ZrE?_JVB:c?7iHPY\-FHEgf^#`JU$^6O5#0J.;PB`#0jG`uc."4H_e^e.F>Z<#\r/Pl>]lEH-WXYS@iMj8OrECND'Lmb[+.l?UC'.R-a(@0JLt.E(h.>5%BZFGf5GX[1I2JS@i5OjlagE2QFK0M:(hqq!bs8[)rj@DYW80ncr/R6e[S-X%4+3T[R[mO0`j]`tOPb_4Y;!*T%hT)#-iEI2Hr08ZXW5#aj%$Cg$ge$o@t2M"Dh,Tq[%!Qi4I?Y%VPFos.\pp#[u*=fZ*E!>&"6l?jD&7GbQY/O>u\o[sJ`Xla'DE6W8!Q#cU`57=%L?-2Z#-jt>E+@8Bhl+f.8-O/:*o>*`36:FLBVI-[LI_G:Kng?b0r1j%8565G/_RO5%?]-P%n:tSO3jJG3W(Z@!g40!S@Qik!Dh161'dHD2!rg=ns])F]neOLkLTc5Ga!*iWhiBhQ*%MBYfORj^IBPCao5=9p)S.pVh/[VXVTkDM)XHA$^O@k>G!+neF<-rArD?*4kU*9GNU]*7gB9U&Lj?[hiQa474lheOVG!FDUUfUVn*R0">*Wn]_jlRPX5`$$2X9h9,plGMB9N=J'"GGB-8iIA=]-c4(h;I_$JE9,KI*73b)V?+`BPA"[$-Il_,3rm^iL88^/3rXcIGSi7HNVrnZ(^/)(Nd?Pg3tuI9B]Op;munU1jRnW]aS;?#njXVXBuqsJdEE+Qn45`r?PFrM3#E[*Lg?t[e>4hU*:-I`nONuLfGZPbC3UoYiaAkGaZqgF_,.=M*b.!A$gh11N00dM0.h(jEKm.YQ3a3a5WmMYs!i6I.'rNj1js0ZRfs(q!dZ2dJ2JVeLTkc\\2i:pk^B.R;nh]P1Hl>6"0*KFr"kJZ,%FlpuG[l^SLDE'Z:"%[A3fDCdm]QtO"7FW684VqcH0HbaHTTf3K'5(r^."[@"+HH2LUiod'uZ,TsPN'QYP:1kr-_r_h3fW*[c)iKSLf>IAm_`PpGsm(4+neck<06d5o4$j,?DqO$A(=R^ZRai^&>CVZtW"^D:HU[PZd!cJ0W[IQ0i,aJ&6Gj61c_\NFX:Ha_(q%50`pANNG,kk)C-OSnInqA7E(u&!\'sI,`UhO5W7"8;8?ANPpX"k1.K\q*c%4>gue-8`.499H-0QN>;'+^e#dg4rcYS&%3]QX$a'bc8D?[k'G)`]nV9&j_#q[8LV'Y>>rbpX^p`uH_3H]iD2n3Tp;6-gWQPKj8R6`];o(>ZdU+u`QbEs?S*_6[g.@t@+s@Mu(t.p[%RF3/$)Y%I3c>IBh/r%sLFm=FbsP-"P;r"?H,PPO)AQ^pL38+`GSLB0S"Sjt@VN9W6K$]0J]e4uK@"_5kZh?!3Mn"d^F@$i8gr*=C)N*j/u\K-@"t2/TeU_4Jq?EI-u]]WUY&Et)[1a/C)gkW.D.OT108Ai/s.$/EALIVf1=lTV6r5!=#u-Z#L2_?A5UhT1<&-T!#&1ok7"A6KgJZ$#>WqjK^CKODm>h[f2&P@Ojm:uC*\u2JKWV)f)r[K`SI9EG&n;Teh,Mjpa_r!^sc7)%CoV`s&8[[i#X1UrKL"M9-0uF"EJe9n;H8Sb:7Umdl\?7'njRK*g$NQ$+c;;1a#I'&9W&#)G;F-Xs$MUo7l\$WGe\3P\1J_Fu1NHVT=&5:k'=OYG55aGgPQ.&QXSYsU\_dBIsQSrFiG/2Z#c_hP,c6P;];k>sI"YBbdR.>LaN`74'_'^\G!A-5Yk2M3G#Jk$:g&GO)*KG2.O2O4q/VP^;V`EK8-/8B$YF+R]'Q&eDb.pO.#&t>V93Pbj0Rc)hj@%.=q@!ikO^]rKsdC.jWKA7aia>qM%^t1smeo8d?1(Acn=e-6tS_FIC'jDV@1SkE1E8FEsDlZ7,-FG%\/OccjnqP8SVQ#A0OJ&>*"!3-7OuSon;Ut)P*fY9H9`ts679D[pYD>_+;(Gg..OW5JhdA]N"LZl1l`n&ASRT%3Z"K*&"<3\'g!B\dEBMECA+,4N\LnnfkSBM>Kjc33.o&HPLRohD?Ps:&[^FKi\L*Bcu@Bu0nX-__4<9R_Tg2?r;I>[D!nAtA!lA2KDB,q/Mmq>Yn.DpjCjXkcXb_Y-q[)?Og$qgba*>rTaTobo!=0O8d53[?k\(*@<\GTJ.:!!.+>`(FP,*V!"(jqJb`p,a`H[:@_*SWfl>/)(&HAS?+OCX@n+`[rgs6gm&?$al+eZq['#:r]+!A]1)Z5$W2g0nsTW#ZE4.,gp5Uioi@$KY/DC`\p!XToL(ahmoc1m0jJ\g"PT5:>(&3_mVe-EXnX>r/G]?='9/9=pEnc0g[F=eNaZ8,AMc8!I_P94(>Ak4;t3Q%tREE^31?#5oS.AtDqnKT5%qLqg#B%,VL:$4Gp82i%^*>$s/McjI>tEZdu8^akH3#l:Uf0N/]dL\f+OO'h`WXBct4t$oe'0HFf/S^+KHUJ9W*gC`%O#:![&XO!me:&hZ3t`+Li&fEF,V"d1X\SOnNg%el"dDW$)B)2P/sIgB9;CF`oMt#&2#R/@#*O[Go.(-^#,Cf)'gIQ2dU8@=p4r-5sne35TdIRH_mKSkc#L"7h)>3Bsq@d*Wq>EHiWG!ZfBPc'K$BE'nEec)PE=M199Boi(5+(N'#>u(3Xk-B2`AIi7CNMUJ\"j;d$.:er?^.Au(P4"^FBoKlIYN$31k$L'TC;!([/.@'O*jE)=l-5tf-.nVWs:a4N#J:XnrDb;s>AXR>dC"XiJ#%/"a$'J^&!Am*),Z3$7?U46R;LiSfhnk>gIgC]5!g&3[B1J#Hcnrk,le7o+38ioeg\V:&+Ws6og16Lt0_\_;:@_(\<"Rha^)+-M4.WF+h6GRSago!+XL592[-lB./Q5s*[<7XU90u078sCVjc(leBN@OuWN^Wtc_%;\.O.LSruE33Rn7F\8!`uEQ0Zs%Yj?%gZij!\ShV&%WI!_6s"=NeAMX,nB>+HZ"VD?J2A9ZRNmY4m$57/\o;1VA5adfQcGH8Ig2QhLGkbu3j+$ekYhak(_)ie)0olT]ga2Wel=oDOFtf&`J/@b"Pp.APB\E04@p456`-!?b_&fdd>jtVXf^9X3dGKiOt4$4bQSDNWHL-Ie;mCt`RL[:2fY$Y:a?P@J*_':SQq?&W-it'23_[E$BFC#+W45o<-2,3'fjQC_lc.+]"q#\=eW1%F.A-0?P4dn,Z'B%R2nP,"2Cn@+rY?lJB.cFVaEd"\6r:G(.E*W&k)qSh9P"I:KgrZIVp\`?*VY)+_LCg`(Q?Xn3OoYK\C3k6R>V@lt6"LC5u7p7D0+WHLe_OPXTEVX*$:D4DW'[J>6s:jHPfsUCK)cU=.PG8BQHUB8G7nU!V%`8M7DQVK'>iXpf$ujG7UpWH0I1-W,\@"Z56rl)b,GR>4X<:SnPY,Y/K"CTHB:&UYNjA'l74(gMntLWPL$&&U:8W1`/pb+USj=(b6>pO[%*i#J9=0Mc)a/;$oCLXCWPrQu5u=QuBEke)*,[q`>"^cA&7<(.(_BaYU\-ZsjN8c)9piZW15Yb7ZL\:hY,FtB"]4(4=I']aoj^hlCE/tXd8?80O:=r3EjEf.]`Wi]*J81/-!Bdo@NF`gsj##*Z6:jO\%rrE6I6jNLKjMB7F(j*$_ifX"b%LQD"iVs[J*<(GV*AKnmb+6?$7DgqQ`!Pm\(6D+r6akEOkO^)bC.*+q;"-PF>LK>m.cF3&XM3TF45;h9Fm^h6o7[5g9>B=ME/N^4hTIF@O2PhL0&i'%dU[e3Oh6Yk>l-$RI1U["5!_qtPECZQ9n\R[#&:l),OTmK`^d^_"^_1)El0SZ8!Oos<2jNYZ8h"Ms'84GanH]*q]+fN%6al7rO&&NW9#Z;_,9;Q/j<0\6HM\Ep\`oKIbBW=OoX1OLnr#]Wbh[/\%p;Eu:XHS;=6:(oCb_c1R$m>K_Y4,3eL[?JB(k'e6TJV0t]OV:8k@S7:HAs*:VTg;F".3Q!W)[d5l/-86^fbG@?>`5$%R2AnU&El+=o(HiR/=/$!c4@,'X.[Y>R?\2,d^^2_N.UuI)j/t\&W@FZ84!EA&<78/01h\IUAZ8#BJ26k;o-Z4iIbRmkD3ZB3B[sM:X_^sR7Tf_M7PG,_A3gJ%d,)>+cej1n>aDt)nBX'"G/+AMTi"^Ho`o;P`J,KXA&c\'oY_`%e.aK7'b[=6\D4J\UMBT_]h@87D\5FND6AK4&chla']LPIjQD3$%&9f6D*DK/,R?g@PQMPh%q/CK?l30Q`JWAVHZrPA@#12P@V"'=^jpbVUB6Rg.J3SptMfCD^$Q:ii.LMHkeR'Dm)j.P0*5?1ik"e6t,'d,U#W*_=rOb#VRQ%dqQnEa>&EEm7B1EC89d:Ggh'oamQ5C8>gSuP"d'9C2_'e\Q&nt:g/FLdLuco\1pj6DbO$d)T"eJVO+:4q5F8DD(^Tfj?QkGi*c[t+,U@fB^9(eIr8N`dm"tV+MjBOFV^/.4S(SG,NSQP3`(\#s?tQ_Aaqs6+Dq4O'1%Z*65gYJ0>uQapkm*]R<1URs7Y3AqBPM$QDH\)X.O'52F`CT@S!-'/hl5:HGo3gK`tq1"3)W'qgMT?n,o^d"17o+8&8[1$]5J_h<"]b)nk(-H.\TEX7`o\ip/?epTYcrI$m6.JW_!CZZ3)9Z+qP:0l:=G-LG]l\2)ISRnqLIVp5E70c.h0';DL!EadAt(QWs(_l,##<"=-9p04I5iQX^_P8#2!t%#FYV%s`!_1`H9^TR%O;K\Y.B;QFQ0is>SU/\:(Wni+b#LlQ^uAJijHqK[[:p;.&8#N/qnc5\]Wf\G&(q;r];3>W0]o;N0W#%n;R\mr+8Kn5`N+@)j5*EdGE1iX_#/c>V55?3t5L-;F<3^Qh"NJ@;G1PrNKAU/#HCPZrkb04WR`Mp-gba<+'2(e%%FH1V(`IVh6>&PTHb.m-=mr/0>L\QAVo^dKA*s3YlDc;J(oJ/s*rr+hu5j_hB2Lla-X^Dp]%GpIM@7:7LAjYqcWY8ekp)LPgtln7V]pi$U:idX8'WH;:G9"Rp29/,`)G4p;cjC&6UVA<\'_giqS5au[;$Sfb0kr1pBoQ2M2f#OSO`c2A/jMQT$;CqSQ\rECOd/E*$MW(B>]n"q+eQq0h_V?tu58IjY*X9OEEoAch"B`[*kNVC4R/R-#+$S"3KjTV,CuuV0PjAH%s/7Uk-RYh0C>#eu)KD<+6cqq*O_(boNF:.;;UP:mXh*&CLnj@to5hj"blf[6&u\,rKV04rLe,mJQ_2KP(%].qOqR*E+B/k#qd;c5l@RD/<#+#$9/i:NL"(9i:Y06EP:s#ZYaoT4*NZP"XG`W_YgGY5MR$`q8:b6>D^HIB,%hdeW)TK=9I;ji3&-5;I3FT6H!r,*rQ'%3KMA:".);^A%RFZs7I>>0Rs1.cql]NDu.f\-u>Ik"$at=$a6G*'"<9f'rn+5/nd/Rg0a$((7]A*>1aVFj#o*O$[0of`C5F1^EQ1hZLW.AD(Pt`o826,o*+F3MKY;`BkO)+1%X81E>+:j;EV?nH'Jh)VYfn2+:4%iH=M/WF51H:q,]0/Nm]D`a6_qY2eprFS>6(QW=:]D9J68IeHs2:9&35rYq<'T=#UJc"PKAM"G+`7V^Z2`B@[gkW(f/Md*fm6B',G^$[Cp=J:qYRc8RBRg0`X0Z8"Zg1dZJTTq]C"P@XGs\$!aHm%WYIfgCrZ.s*GiP][^LBOP);0Ph\bfMdLnl?P!MTr\HLZ^b&u7j&#$5S8ot$#OI79*p"73sY?0[K6iZ\#,ZBC'"cRm`O8 +#<== diff --git a/wscript b/wscript new file mode 100644 index 00000000..777f174b --- /dev/null +++ b/wscript @@ -0,0 +1,84 @@ +#! /usr/bin/env python +# WAF build script for midori + +import Params +import subprocess + +APPNAME = 'midori' +VERSION = '0.0.18' + +try: + git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], + stdout=subprocess.PIPE) + if not git.wait (): + VERSION = (VERSION + '-' + git.stdout.read ()).strip () +except: + pass + +srcdir = '.' +blddir = '_build_' + +def configure (conf): + conf.check_tool ('compiler_cc') + if not Params.g_options.disable_nls: + conf.check_tool ('intltool') + # FIXME if we have intltool but not msgfmt the build breaks + if conf.env['INTLTOOL']: + nls = 'yes' + conf.define ('ENABLE_NLS', 1) + conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) + else: + nls = 'not available' + else: + nls = 'no' + conf.check_message_custom ('localization', 'support', nls) + + conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0') + conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1') + conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6') + conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1') + + if conf.find_program ('convert', var='CONVERT'): + icons = 'yes' + else: + icons = 'no' + conf.check_message_custom ('icon optimization', 'support', icons) + + # FIXME we need numbers + conf.define ('GTK_VER', '-') + conf.define ('WEBKIT_VER', '-') + conf.define ('LIBXML_VER', '-') + conf.define ('LIBSEXY_VER', '-') + + conf.define ('PACKAGE_VERSION', VERSION) + conf.define ('PACKAGE_NAME', APPNAME) + conf.define ('PACKAGE_BUGREPORT', 'christian@twotoasts.de') + conf.define ('GETTEXT_PACKAGE', APPNAME) + + conf.define ('SOKOKE_DEBUG_', '-') + conf.write_config_header ('config.h') + +def set_options(opt): + opt.tool_options ('compiler_cc') + opt.tool_options ('intltool') + + opt.add_option ('--disable-nls', action='store_true', default=False, + help='Disables native language support', dest='disable_nls') + +def build (bld): + bld.add_subdirs ('katze src') + + if bld.env ()['INTLTOOL']: + bld.add_subdirs ('po') + + if bld.env ()['INTLTOOL']: + obj = bld.create_obj ('intltool_in') + obj.source = 'midori.desktop.in' + obj.destvar = 'PREFIX' + obj.subdir = 'share/applications' + obj.flags = '-d' + else: + # FIXME: process desktop.in without intltool + Params.pprint ('BLUE', "File midori.desktop not generated") + if bld.env ()['INTLTOOL']: + install_files ('DATADIR', 'applications', 'midori.desktop') From 2f93031755225078e227893d15c8035b10f66b88 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 May 2008 12:14:15 +0200 Subject: [PATCH 0109/2970] Add svg icon and according waf logic --- data/midori.svg | 230 +++++++++++++++++++++++++++++++++++++++++++++ data/wscript_build | 34 +++++++ wscript | 2 +- 3 files changed, 265 insertions(+), 1 deletion(-) create mode 100644 data/midori.svg create mode 100644 data/wscript_build diff --git a/data/midori.svg b/data/midori.svg new file mode 100644 index 00000000..5d1b98b8 --- /dev/null +++ b/data/midori.svg @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/wscript_build b/data/wscript_build new file mode 100644 index 00000000..b8545f82 --- /dev/null +++ b/data/wscript_build @@ -0,0 +1,34 @@ +#! /usr/bin/env python +# WAF build script for midori + +import os +import subprocess + +srcdir = os.getcwd () +blddir = bld.m_bdir + +install_files ('DATADIR', 'icons/hicolor/scalable/apps', 'midori.svg') + +if bld.env ()['CONVERT']: + def mkdir (path): + if not os.access (path, os.F_OK): + os.mkdir (path) + + mkdir (blddir + '/icons') + + for size in [16, 24, 32, 48]: + format = str (size) + 'x' + str (size) + if size < 32: + small = str ((size / 3)) + 'x' + str ((size / 3.5)) + else: + small = '0x0' + + mkdir (blddir + '/icons/' + format) + convert = subprocess.Popen (['convert', '-adaptive-sharpen', small, + '-background', 'transparent', + '-geometry', format, '-extent', format, + srcdir + '/data/midori.svg', + blddir + '/icons/' + format + '/midori.png']) + if not convert.wait (): + install_files ('DATADIR', 'icons/hicolor/' + format + '/apps', + blddir + '/icons/' + format + '/midori.png') diff --git a/wscript b/wscript index 777f174b..6a5db1ab 100644 --- a/wscript +++ b/wscript @@ -66,7 +66,7 @@ def set_options(opt): help='Disables native language support', dest='disable_nls') def build (bld): - bld.add_subdirs ('katze src') + bld.add_subdirs ('katze src data') if bld.env ()['INTLTOOL']: bld.add_subdirs ('po') From 4f0b7bea63ea0bf70880dd9c82cef8345aa336c8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 May 2008 12:43:37 +0200 Subject: [PATCH 0110/2970] Mark required packages as 'mandatory' in waf --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 6a5db1ab..2b1b66c8 100644 --- a/wscript +++ b/wscript @@ -33,10 +33,10 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) - conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0') - conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1') - conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6') - conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1') + conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) + conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) + conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) + conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1', mandatory=True) if conf.find_program ('convert', var='CONVERT'): icons = 'yes' From 3ea30bfd4eff9e80d2fb98fa6fa89af0f877430d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 May 2008 13:51:03 +0200 Subject: [PATCH 0111/2970] Use 'pproc' in waf in place of subprocess --- data/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/wscript_build b/data/wscript_build index b8545f82..eca29903 100644 --- a/data/wscript_build +++ b/data/wscript_build @@ -2,7 +2,7 @@ # WAF build script for midori import os -import subprocess +import pproc as subprocess srcdir = os.getcwd () blddir = bld.m_bdir From f00522ac27902b76c6d1ec30ac2e26a374d69564 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 May 2008 14:20:36 +0200 Subject: [PATCH 0112/2970] Use 'midori' icon and update icon cache in waf --- midori.desktop.in | 5 ++--- src/midori-browser.c | 19 +++++++++++++++++-- wscript | 16 ++++++++++++++-- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/midori.desktop.in b/midori.desktop.in index a4bf004e..ad78064a 100644 --- a/midori.desktop.in +++ b/midori.desktop.in @@ -1,14 +1,13 @@ - [Desktop Entry] Version=1.0 Encoding=UTF-8 Type=Application -_Name=Midori Web Browser +_Name=Midori _GenericName=Web Browser _Comment=Lightweight web browser Categories=GTK;Network; MimeType=text/html;text/xml;application/xhtml+xml;application/xml; Exec=midori %u -Icon=web-browser +Icon=midori Terminal=false StartupNotify=true diff --git a/src/midori-browser.c b/src/midori-browser.c index eef95662..b3f2c2f6 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -2312,7 +2312,7 @@ midori_browser_destroy_cb (MidoriBrowser* browser) // Destroy tabs first, so widgets can still see window elements on destroy gtk_container_foreach (GTK_CONTAINER (priv->notebook), - G_CALLBACK (gtk_widget_destroy), NULL); + (GtkCallback) gtk_widget_destroy, NULL); } static const gchar* ui_markup = @@ -2435,6 +2435,20 @@ static const gchar* ui_markup = "" ""; +static void +midori_browser_realize_cb (GtkStyle* style, MidoriBrowser* browser) +{ + GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (browser)); + if (screen) + { + GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, "midori")) + gtk_window_set_icon_name (GTK_WINDOW (browser), "midori"); + else + gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); + } +} + static void midori_browser_init (MidoriBrowser* browser) { @@ -2443,13 +2457,14 @@ midori_browser_init (MidoriBrowser* browser) MidoriBrowserPrivate* priv = browser->priv; // Setup the window metrics + g_signal_connect (browser, "realize", + G_CALLBACK (midori_browser_realize_cb), browser); g_signal_connect (browser, "window-state-event", G_CALLBACK (midori_browser_window_state_event_cb), NULL); g_signal_connect (browser, "size-allocate", G_CALLBACK (midori_browser_size_allocate_cb), NULL); g_signal_connect (browser, "destroy", G_CALLBACK (midori_browser_destroy_cb), NULL); - // FIXME: Use custom program icon gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ()); GtkWidget* vbox = gtk_vbox_new (FALSE, 0); diff --git a/wscript b/wscript index 2b1b66c8..0d1eec38 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,8 @@ # WAF build script for midori import Params -import subprocess +import pproc as subprocess +import Common APPNAME = 'midori' VERSION = '0.0.18' @@ -58,7 +59,7 @@ def configure (conf): conf.define ('SOKOKE_DEBUG_', '-') conf.write_config_header ('config.h') -def set_options(opt): +def set_options (opt): opt.tool_options ('compiler_cc') opt.tool_options ('intltool') @@ -82,3 +83,14 @@ def build (bld): Params.pprint ('BLUE', "File midori.desktop not generated") if bld.env ()['INTLTOOL']: install_files ('DATADIR', 'applications', 'midori.desktop') + +def shutdown (): + dir = Common.path_install('DATADIR', 'icons/hicolor') + if Params.g_commands['install']: + if not Params.g_options.destdir: + # update the pixmap cache directory + Params.pprint('YELLOW', "Updating Gtk icon cache.") + subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) + else: + Params.pprint('YELLOW', "Icon cache not updated. After install, run this:") + Params.pprint('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) From 54ea63f1611810182d299b6c1edfa331d320895c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 May 2008 14:56:33 +0200 Subject: [PATCH 0113/2970] Update icon cache on uninstall, catch missing gtk-update-icon-cache --- wscript | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/wscript b/wscript index 0d1eec38..8783dcbb 100644 --- a/wscript +++ b/wscript @@ -85,12 +85,16 @@ def build (bld): install_files ('DATADIR', 'applications', 'midori.desktop') def shutdown (): - dir = Common.path_install('DATADIR', 'icons/hicolor') - if Params.g_commands['install']: - if not Params.g_options.destdir: - # update the pixmap cache directory - Params.pprint('YELLOW', "Updating Gtk icon cache.") + dir = Common.path_install ('DATADIR', 'icons/hicolor') + icon_cache_updated = False + if not Params.g_options.destdir: + # update the pixmap cache directory + try: subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) - else: - Params.pprint('YELLOW', "Icon cache not updated. After install, run this:") - Params.pprint('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) + Params.pprint ('YELLOW', "Updated Gtk icon cache.") + icon_cache_updated = True + except: + Params.pprint ('RED', "Failed to update icon cache.") + if not icon_cache_updated: + Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") + Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) From 8e494ba206f49d457a2d7ce2634cc1fcb3ad6a43 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 00:21:08 +0200 Subject: [PATCH 0114/2970] Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals. --- src/gjs.c | 216 ++++++++++++++++++++++++++++----------- src/main.c | 2 +- src/midori-app.c | 2 +- src/midori-browser.c | 214 ++++++++++++++++++++++++++++---------- src/midori-browser.h | 23 ++++- src/midori-preferences.c | 3 - src/sokoke.c | 70 ++++++++----- 7 files changed, 381 insertions(+), 149 deletions(-) diff --git a/src/gjs.c b/src/gjs.c index 7074f939..29148bbd 100644 --- a/src/gjs.c +++ b/src/gjs.c @@ -86,6 +86,8 @@ gjs_script_from_file (JSContextRef js_context, *exception = g_strdup (error->message); g_error_free (error); } + else + *exception = g_strdup (_("An unknown error occured.")); return result; } @@ -106,17 +108,31 @@ _js_class_get_property_names_cb (JSContextRef js_context, GObject* object = JSObjectGetPrivate (js_object); if (object) { - guint n_properties; + guint n; GParamSpec** pspecs = g_object_class_list_properties ( - G_OBJECT_GET_CLASS (object), &n_properties); + G_OBJECT_GET_CLASS (object), &n); gint i; - for (i = 0; i < n_properties; i++) + for (i = 0; i < n; i++) { const gchar* property = g_param_spec_get_name (pspecs[i]); JSStringRef js_property = JSStringCreateWithUTF8CString (property); JSPropertyNameAccumulatorAddName (js_properties, js_property); JSStringRelease (js_property); } + GType type = G_OBJECT_TYPE (object); + do + { + guint* signals = g_signal_list_ids (type, &n); + for (i = 0; i < n; i++) + { + const gchar* signal = g_signal_name (signals[i]); + JSStringRef js_signal = JSStringCreateWithUTF8CString (signal); + JSPropertyNameAccumulatorAddName (js_properties, js_signal); + JSStringRelease (js_signal); + } + type = g_type_parent (type); + } + while (type); } } @@ -130,8 +146,8 @@ _js_class_has_property_cb (JSContextRef js_context, GObject* object = JSObjectGetPrivate (js_object); if (object) { - if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), - property)) + if (g_signal_lookup (property, G_OBJECT_TYPE (object)) || + g_object_class_find_property (G_OBJECT_GET_CLASS (object), property)) result = true; } else if (js_object == JSContextGetGlobalObject (js_context)) @@ -155,6 +171,107 @@ _js_object_set_property (JSContextRef js_context, JSStringRelease (js_name); } +static JSValueRef +_js_object_call_as_function_cb (JSContextRef js_context, + JSObjectRef js_function, + JSObjectRef js_this, + size_t n_arguments, + const JSValueRef js_arguments[], + JSValueRef* js_exception) +{ + GObject* object = JSObjectGetPrivate (js_this); + const gchar* function = JSObjectGetPrivate (js_function); + + g_return_val_if_fail (G_IS_OBJECT (object), JSValueMakeNull (js_context)); + g_return_val_if_fail (function, JSValueMakeNull (js_context)); + + guint signal_id = g_signal_lookup (function, G_OBJECT_TYPE (object)); + GSignalQuery query; + g_signal_query (signal_id, &query); + GValue* values = g_new0 (GValue, n_arguments + 1); + g_value_init (&values[0], G_OBJECT_TYPE (object)); + g_value_set_instance (&values[0], object); + gint i; + for (i = 0; i < n_arguments; i++) + { + GValue value = {0, }; + GType gtype; + switch (JSValueGetType (js_context, js_arguments[i])) + { + case kJSTypeBoolean: + gtype = G_TYPE_BOOLEAN; + g_value_init (&value, gtype); + g_value_set_boolean (&value, + JSValueToBoolean (js_context, js_arguments[i]) ? TRUE : FALSE); + break; + case kJSTypeNumber: + gtype = G_TYPE_DOUBLE; + g_value_init (&value, gtype); + g_value_set_double (&value, + JSValueToNumber (js_context, js_arguments[i], NULL)); + break; + case kJSTypeString: + gtype = G_TYPE_STRING; + g_value_init (&value, gtype); + JSStringRef js_string = JSValueToStringCopy (js_context, + js_arguments[i], NULL); + gchar* string = gjs_string_utf8 (js_string); + g_value_set_string (&value, string); + g_free (string); + JSStringRelease (js_string); + break; + case kJSTypeObject: + gtype = G_TYPE_OBJECT; + g_value_init (&value, gtype); + JSObjectRef js_object = JSValueToObject (js_context, + js_arguments[i], NULL); + GObject* object_value = JSObjectGetPrivate (js_object); + g_value_set_object (&value, object_value); + break; + case kJSTypeUndefined: + case kJSTypeNull: + default: + gtype = G_TYPE_NONE; + g_value_init (&value, gtype); + } + g_value_init (&values[i + 1], gtype); + if (query.n_params >= i + && g_value_type_compatible (gtype, query.param_types[i])) + // && g_value_type_transformable (gtype, query.param_types[i]) + g_value_copy (&value, &values[i + 1]); + // g_value_transform (&value, &values[i + 1]); + else + { + gchar* value_type = g_strdup_value_contents (&value); + // FIXME: exception + printf ("wrong value, expected %s\n", value_type); + g_free (value_type); + } + g_value_unset (&value); + } + GValue return_value = {0, }; + if (query.return_type != G_TYPE_NONE) + g_value_init (&return_value, query.return_type); + g_signal_emitv (values, signal_id, 0, &return_value); + + for (i = 0; i < n_arguments; i++) + g_value_unset (&values[i]); + // FIXME: return value + return JSValueMakeUndefined (js_context); +} + +static void +_js_object_add_function (JSContextRef js_context, + JSObjectRef js_object, + const gchar* func) +{ + JSStringRef js_func = JSStringCreateWithUTF8CString (func); + JSObjectRef js_function = JSObjectMakeFunctionWithCallback ( + js_context, js_func, _js_object_call_as_function_cb); + JSStringRelease (js_func); + _js_object_set_property (js_context, js_object, func, js_function); +} + static JSValueRef _js_class_get_property_cb (JSContextRef js_context, JSObjectRef js_object, @@ -163,13 +280,32 @@ _js_class_get_property_cb (JSContextRef js_context, { GObject* object = JSObjectGetPrivate (js_object); - g_return_val_if_fail (object, JSValueMakeNull (js_context)); + g_return_val_if_fail (G_IS_OBJECT (object), JSValueMakeNull (js_context)); JSValueRef js_result = NULL; gchar* property = gjs_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) + guint signal_id; + GParamSpec* pspec; + if ((signal_id = g_signal_lookup (property, G_OBJECT_TYPE (object)))) + { + GSignalQuery query; + g_signal_query (signal_id, &query); + if (query.signal_flags & G_SIGNAL_ACTION) + { + // We can't use JSObjectMakeFunctionWithCallback + // because it doesn't allocate private data + JSClassDefinition js_class_def = kJSClassDefinitionEmpty; + js_class_def.className = g_strdup (property); + js_class_def.callAsFunction = _js_object_call_as_function_cb; + JSClassRef js_class = JSClassCreate (&js_class_def); + JSObjectRef js_function = JSObjectMake (js_context, js_class, property); + return js_function; + } + g_free (property); + return JSValueMakeUndefined (js_context); + } + else if (!(pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property))) { gchar* message = g_strdup_printf (_("%s has no property '%s'"), G_OBJECT_NAME (object), property); @@ -237,7 +373,7 @@ _js_class_set_property_cb (JSContextRef js_context, { GObject* object = JSObjectGetPrivate (js_object); - g_return_val_if_fail (object, false); + g_return_val_if_fail (G_IS_OBJECT (object), false); bool result = false; gchar* property = gjs_string_utf8 (js_property); @@ -287,7 +423,7 @@ _js_class_set_property_cb (JSContextRef js_context, JSObjectRef js_object_value = JSValueToObject ( js_context, js_value, NULL); GObject* object_value = JSObjectGetPrivate (js_object_value); - if (object_value) + if (G_IS_OBJECT (object_value)) g_object_set (object, property, object_value, NULL); else { @@ -312,42 +448,6 @@ _js_class_set_property_cb (JSContextRef js_context, return result; } -static JSValueRef -_js_object_call_as_function_cb (JSContextRef js_context, - JSObjectRef js_function, - JSObjectRef js_this, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_this); - - g_return_val_if_fail (object, JSValueMakeNull (js_context)); - - if (!n_arguments) - { - } - else if (n_arguments == 1) - { - JSObjectRef js_arg1 = JSValueToObject ( - js_context, js_arguments[0], NULL); - } - - return JSValueMakeUndefined (js_context); -} - -static void -_js_object_add_function (JSContextRef js_context, - JSObjectRef js_object, - const gchar* func) -{ - JSStringRef js_func = JSStringCreateWithUTF8CString (func); - JSObjectRef js_function = JSObjectMakeFunctionWithCallback ( - js_context, js_func, _js_object_call_as_function_cb); - JSStringRelease (js_func); - _js_object_set_property (js_context, js_object, func, js_function); -} - JSObjectRef gjs_object_new (JSContextRef js_context, const gchar* name, @@ -364,14 +464,6 @@ gjs_object_new (JSContextRef js_context, js_class_def.setProperty = _js_class_set_property_cb; JSClassRef js_class = JSClassCreate (&js_class_def); JSObjectRef js_object = JSObjectMake (js_context, js_class, instance); - if (instance && G_IS_OBJECT (instance)) - { - // TODO: Add functions dynamically - /*if (GTK_IS_WIDGET (instance)) - { - _js_object_add_function (js_context, js_object, "show"); - }*/ - } return js_object; } @@ -482,12 +574,18 @@ JSGlobalContextRef gjs_global_context_new (void) { JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); - JSObjectRef js_gjs = gjs_object_new (js_context, "GJS", NULL); + JSObjectRef js_object = gjs_object_new (js_context, "GJS", NULL); _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), - "gjs", js_gjs); + "gjs", js_object); - JSObjectRef js_gtk = gjs_module_new (js_context, "Gtk"); + js_object = gjs_module_new (js_context, "Gtk"); _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), - "Gtk", js_gtk); + "Gtk", js_object); + js_object = gjs_module_new (js_context, "WebKit"); + _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), + "WebKit", js_object); + js_object = gjs_module_new (js_context, "Midori"); + _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), + "Midori", js_object); return js_context; } diff --git a/src/main.c b/src/main.c index 7f11b5ac..07d3c987 100644 --- a/src/main.c +++ b/src/main.c @@ -425,7 +425,7 @@ main (int argc, char** argv) for (i = 0; i < n; i++) { KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, i); - midori_browser_append_xbel_item (browser, item); + midori_browser_add_xbel_item (browser, item); } // FIXME: Switch to the last active page KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, 0); diff --git a/src/midori-app.c b/src/midori-app.c index afbc60b5..5d41e255 100644 --- a/src/midori-app.c +++ b/src/midori-app.c @@ -272,7 +272,7 @@ midori_browser_new_window_cb (MidoriBrowser* browser, "settings", priv->settings, "trash", priv->trash, NULL); - midori_browser_append_uri (new_browser, uri); + midori_browser_add_uri (new_browser, uri); gtk_widget_show (GTK_WIDGET (new_browser)); g_signal_emit (app, signals[ADD_BROWSER], 0, new_browser); diff --git a/src/midori-browser.c b/src/midori-browser.c index b3f2c2f6..453acd0a 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -96,9 +96,13 @@ enum WINDOW_OBJECT_CLEARED, STATUSBAR_TEXT_CHANGED, ELEMENT_MOTION, - QUIT, NEW_WINDOW, + ADD_TAB, + ADD_URI, + ACTIVATE_ACTION, + QUIT, + LAST_SIGNAL }; @@ -452,7 +456,7 @@ midori_web_view_new_tab_cb (GtkWidget* web_view, const gchar* uri, MidoriBrowser* browser) { - gint n = midori_browser_append_uri (browser, uri); + gint n = midori_browser_add_uri (browser, uri); _midori_browser_set_current_page_smartly (browser, n); } @@ -534,6 +538,80 @@ midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, data2); } +static void +midori_cclosure_marshal_INT__OBJECT (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef gint(*GMarshalFunc_INT__OBJECT) (gpointer data1, + gpointer arg_1, + gpointer data2); + register GMarshalFunc_INT__OBJECT callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + gint v_return; + + g_return_if_fail (return_value != NULL); + g_return_if_fail (n_param_values == 2); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_INT__OBJECT) (marshal_data + ? marshal_data : cc->callback); + v_return = callback (data1, + g_value_get_object (param_values + 1), + data2); + g_value_set_int (return_value, v_return); +} + +static void +midori_cclosure_marshal_INT__STRING (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef gint(*GMarshalFunc_INT__STRING) (gpointer data1, + const gchar* arg_1, + gpointer data2); + register GMarshalFunc_INT__STRING callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + gint v_return; + + g_return_if_fail (return_value != NULL); + g_return_if_fail (n_param_values == 2); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_INT__STRING) (marshal_data + ? marshal_data : cc->callback); + v_return = callback (data1, + g_value_get_string (param_values + 1), + data2); + g_value_set_int (return_value, v_return); +} + static void midori_browser_class_init (MidoriBrowserClass* class) { @@ -572,16 +650,6 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); - signals[QUIT] = g_signal_new ( - "quit", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - 0, - 0, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[NEW_WINDOW] = g_signal_new ( "new-window", G_TYPE_FROM_CLASS (class), @@ -593,6 +661,54 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + signals[ADD_TAB] = g_signal_new ( + "add-tab", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, add_tab), + 0, + NULL, + midori_cclosure_marshal_INT__OBJECT, + G_TYPE_INT, 1, + GTK_TYPE_WIDGET); + + signals[ADD_URI] = g_signal_new ( + "add-uri", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, add_uri), + 0, + NULL, + midori_cclosure_marshal_INT__STRING, + G_TYPE_INT, 1, + G_TYPE_STRING); + + signals[ACTIVATE_ACTION] = g_signal_new ( + "activate-action", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, activate_action), + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + signals[QUIT] = g_signal_new ( + "quit", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriBrowserClass, quit), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + class->add_tab = midori_browser_add_tab; + class->add_uri = midori_browser_add_uri; + class->activate_action = midori_browser_activate_action; + class->quit = midori_browser_quit; + GObjectClass* gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_browser_finalize; gobject_class->set_property = midori_browser_set_property; @@ -600,11 +716,6 @@ midori_browser_class_init (MidoriBrowserClass* class) GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - /** - * MidoriBrowser::menubar - * - * The menubar. - */ g_object_class_install_property (gobject_class, PROP_MENUBAR, g_param_spec_object ( @@ -614,11 +725,6 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_MENU_BAR, G_PARAM_READABLE)); - /** - * MidoriBrowser::navigationbar - * - * The navigationbar. - */ g_object_class_install_property (gobject_class, PROP_NAVIGATIONBAR, g_param_spec_object ( @@ -628,11 +734,6 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_TOOLBAR, G_PARAM_READABLE)); - /** - * MidoriBrowser::tab - * - * The current tab. - */ g_object_class_install_property (gobject_class, PROP_TAB, g_param_spec_object ( @@ -642,11 +743,6 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_WIDGET, G_PARAM_READWRITE)); - /** - * MidoriBrowser::statusbar - * - * The statusbar. - */ g_object_class_install_property (gobject_class, PROP_STATUSBAR, g_param_spec_object ( @@ -657,7 +753,7 @@ midori_browser_class_init (MidoriBrowserClass* class) G_PARAM_READABLE)); /** - * MidoriBrowser::settings + * MidoriBrowser:settings: * * An associated settings instance that is shared among all web views. * @@ -674,7 +770,7 @@ midori_browser_class_init (MidoriBrowserClass* class) G_PARAM_READWRITE)); /** - * MidoriBrowser::statusbar-text + * MidoriBrowser:statusbar-text: * * The text that is displayed in the statusbar. * @@ -694,7 +790,7 @@ midori_browser_class_init (MidoriBrowserClass* class) flags)); /** - * MidoriBrowser::trash + * MidoriBrowser:trash: * * The trash, that collects all closed tabs and windows. * @@ -728,7 +824,7 @@ _action_tab_new_activate (GtkAction* action, { MidoriBrowserPrivate* priv = browser->priv; - gint n = midori_browser_append_uri (browser, ""); + gint n = midori_browser_add_uri (browser, ""); midori_browser_set_current_page (browser, n); gtk_widget_grab_focus (priv->location); } @@ -1015,7 +1111,7 @@ midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, KatzeXbelItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeXbelItem"); const gchar* uri = katze_xbel_bookmark_get_href (item); - gint n = midori_browser_append_uri (browser, uri); + gint n = midori_browser_add_uri (browser, uri); midori_browser_set_current_page (browser, n); katze_xbel_item_unref (item); } @@ -1521,7 +1617,7 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, if (event->button == 2 && katze_xbel_item_is_bookmark (item)) { const gchar* uri = katze_xbel_bookmark_get_href (item); - gint n = midori_browser_append_uri (browser, uri); + gint n = midori_browser_add_uri (browser, uri); midori_browser_set_current_page (browser, n); } else @@ -1943,7 +2039,7 @@ _action_bookmark_open_tab_activate (GtkAction* action, gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) { - gint n = midori_browser_append_xbel_item (browser, item); + gint n = midori_browser_add_xbel_item (browser, item); _midori_browser_set_current_page_smartly (browser, n); } } @@ -1968,7 +2064,7 @@ _action_bookmark_open_window_activate (GtkAction* action, gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) { - gint n = midori_browser_append_xbel_item (browser, item); + gint n = midori_browser_add_xbel_item (browser, item); _midori_browser_set_current_page_smartly (browser, n); } } @@ -2005,7 +2101,7 @@ _action_undo_tab_close_activate (GtkAction* action, // Reopen the most recent trash item KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, 0); - gint n = midori_browser_append_xbel_item (browser, item); + gint n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); midori_trash_remove_nth_item (priv->trash, 0); _midori_browser_update_actions (browser); @@ -3141,7 +3237,7 @@ midori_browser_new (void) } /** - * midori_browser_append_tab: + * midori_browser_add_tab: * @browser: a #MidoriBrowser * @widget: a tab * @@ -3151,8 +3247,8 @@ midori_browser_new (void) * Return value: the index of the new tab, or -1 in case of an error **/ gint -midori_browser_append_tab (MidoriBrowser* browser, - GtkWidget* widget) +midori_browser_add_tab (MidoriBrowser* browser, + GtkWidget* widget) { g_return_val_if_fail (GTK_IS_WIDGET (widget), -1); @@ -3274,7 +3370,7 @@ midori_browser_remove_tab (MidoriBrowser* browser, } /** - * midori_browser_append_xbel_item: + * midori_browser_add_xbel_item: * @browser: a #MidoriBrowser * @xbel_item: a bookmark * @@ -3283,8 +3379,8 @@ midori_browser_remove_tab (MidoriBrowser* browser, * Return value: the index of the new tab, or -1 in case of an error **/ gint -midori_browser_append_xbel_item (MidoriBrowser* browser, - KatzeXbelItem* xbel_item) +midori_browser_add_xbel_item (MidoriBrowser* browser, + KatzeXbelItem* xbel_item) { MidoriBrowserPrivate* priv = browser->priv; @@ -3299,11 +3395,11 @@ midori_browser_append_xbel_item (MidoriBrowser* browser, NULL); gtk_widget_show (web_view); - return midori_browser_append_tab (browser, web_view); + return midori_browser_add_tab (browser, web_view); } /** - * midori_browser_append_uri: + * midori_browser_add_uri: * @browser: a #MidoriBrowser * @uri: an URI * @@ -3312,8 +3408,8 @@ midori_browser_append_xbel_item (MidoriBrowser* browser, * Return value: the index of the new tab, or -1 **/ gint -midori_browser_append_uri (MidoriBrowser* browser, - const gchar* uri) +midori_browser_add_uri (MidoriBrowser* browser, + const gchar* uri) { MidoriBrowserPrivate* priv = browser->priv; @@ -3323,7 +3419,7 @@ midori_browser_append_uri (MidoriBrowser* browser, NULL); gtk_widget_show (web_view); - return midori_browser_append_tab (browser, web_view); + return midori_browser_add_tab (browser, web_view); } /** @@ -3494,3 +3590,17 @@ midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser) } return priv->proxy_xbel_folder; } + +/** + * midori_browser_quit: + * @browser: a #MidoriBrowser + * + * Quits the browser, including any other browser windows. + **/ +void +midori_browser_quit (MidoriBrowser* browser) +{ + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + + g_signal_emit (browser, signals[QUIT], 0); +} diff --git a/src/midori-browser.h b/src/midori-browser.h index a0af0a8b..d029e6a1 100644 --- a/src/midori-browser.h +++ b/src/midori-browser.h @@ -59,10 +59,20 @@ struct _MidoriBrowserClass (*element_motion) (MidoriBrowser* browser, const gchar* link_uri); void - (*quit) (MidoriBrowser* browser); - void (*new_window) (MidoriBrowser* browser, const gchar* uri); + + void + (*add_tab) (MidoriBrowser* browser, + GtkWidget* widget); + void + (*add_uri) (MidoriBrowser* browser, + const gchar* uri); + void + (*activate_action) (MidoriBrowser* browser, + const gchar* name); + void + (*quit) (MidoriBrowser* browser); }; GType @@ -72,7 +82,7 @@ MidoriBrowser* midori_browser_new (void); gint -midori_browser_append_tab (MidoriBrowser* browser, +midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* widget); void @@ -80,11 +90,11 @@ midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* widget); gint -midori_browser_append_xbel_item (MidoriBrowser* browser, +midori_browser_add_xbel_item (MidoriBrowser* browser, KatzeXbelItem* xbel_item); gint -midori_browser_append_uri (MidoriBrowser* browser, +midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri); void @@ -111,6 +121,9 @@ midori_browser_get_current_web_view (MidoriBrowser* browser); KatzeXbelItem* midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser); +void +midori_browser_quit (MidoriBrowser* browser); + G_END_DECLS #endif /* __MIDORI_BROWSER_H__ */ diff --git a/src/midori-preferences.c b/src/midori-preferences.c index 6a4c7d73..b3ddc9e7 100644 --- a/src/midori-preferences.c +++ b/src/midori-preferences.c @@ -147,9 +147,6 @@ midori_preferences_get_property (GObject* object, GValue* value, GParamSpec* pspec) { - MidoriPreferences* preferences = MIDORI_PREFERENCES (object); - MidoriPreferencesPrivate* priv = preferences->priv; - switch (prop_id) { default: diff --git a/src/sokoke.c b/src/sokoke.c index 48ab43df..72706bc7 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -328,50 +328,64 @@ void sokoke_widget_set_pango_font_style(GtkWidget* widget, PangoStyle style) } } -static gboolean sokoke_on_entry_focus_in_event(GtkEntry* entry, GdkEventFocus *event - , gpointer userdata) +static gboolean +sokoke_on_entry_focus_in_event (GtkEntry* entry, + GdkEventFocus* event, + gpointer userdata) { - gboolean defaultText = (gboolean)g_object_get_data(G_OBJECT(entry) - , "sokoke_hasDefaultText"); - if(defaultText) + gint default_text = GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); + if (default_text) { - gtk_entry_set_text(entry, ""); - g_object_set_data(G_OBJECT(entry), "sokoke_hasDefaultText", (gpointer)FALSE); - sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_NORMAL); + gtk_entry_set_text (entry, ""); + g_object_set_data (G_OBJECT(entry), "sokoke_has_default", + GINT_TO_POINTER (0)); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_NORMAL); } return FALSE; } -static gboolean sokoke_on_entry_focus_out_event(GtkEntry* entry, GdkEventFocus* event - , gpointer userdata) +static gboolean +sokoke_on_entry_focus_out_event (GtkEntry* entry, + GdkEventFocus* event, + gpointer userdata) { - const gchar* text = gtk_entry_get_text(entry); - if(text && !*text) + const gchar* text = gtk_entry_get_text (entry); + if (text && !*text) { - const gchar* defaultText = (const gchar*)g_object_get_data( - G_OBJECT(entry), "sokoke_defaultText"); - gtk_entry_set_text(entry, defaultText); - g_object_set_data(G_OBJECT(entry), "sokoke_hasDefaultText", (gpointer)TRUE); - sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_ITALIC); + const gchar* defaultText = (const gchar*)g_object_get_data ( + G_OBJECT (entry), "sokoke_default_text"); + gtk_entry_set_text (entry, defaultText); + g_object_set_data (G_OBJECT(entry), + "sokoke_has_default", GINT_TO_POINTER (1)); + sokoke_widget_set_pango_font_style (GTK_WIDGET(entry), + PANGO_STYLE_ITALIC); } return FALSE; } -void sokoke_entry_set_default_text(GtkEntry* entry, const gchar* defaultText) +void +sokoke_entry_set_default_text (GtkEntry* entry, + const gchar* default_text) { // Note: The default text initially overwrites any previous text - gchar* oldValue = g_object_get_data(G_OBJECT(entry), "sokoke_defaultText"); - if(!oldValue) + gchar* old_value = g_object_get_data (G_OBJECT (entry), + "sokoke_default_text"); + if (!old_value) { - g_object_set_data(G_OBJECT(entry), "sokoke_hasDefaultText", (gpointer)TRUE); - sokoke_widget_set_pango_font_style(GTK_WIDGET(entry), PANGO_STYLE_ITALIC); - gtk_entry_set_text(entry, defaultText); + g_object_set_data (G_OBJECT (entry), "sokoke_has_default", + GINT_TO_POINTER (1)); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_ITALIC); + gtk_entry_set_text (entry, default_text); } - g_object_set_data(G_OBJECT(entry), "sokoke_defaultText", (gpointer)defaultText); - g_signal_connect(entry, "focus-in-event" - , G_CALLBACK(sokoke_on_entry_focus_in_event), NULL); - g_signal_connect(entry, "focus-out-event" - , G_CALLBACK(sokoke_on_entry_focus_out_event), NULL); + g_object_set_data (G_OBJECT (entry), "sokoke_default_text", + (gpointer)default_text); + g_signal_connect (entry, "focus-in-event", + G_CALLBACK (sokoke_on_entry_focus_in_event), NULL); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (sokoke_on_entry_focus_out_event), NULL); } gchar* sokoke_key_file_get_string_default(GKeyFile* keyFile From a61568c16a11c3314bb457a099350b8aabf3c418 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 11:26:10 +0200 Subject: [PATCH 0115/2970] Add zoom functionality, if webkit supports it --- src/main.c | 15 +++++++- src/midori-browser.c | 86 +++++++++++++++++++++++++++----------------- src/midori-webview.c | 23 ++++++++++++ src/midori-webview.h | 3 ++ src/sokoke.c | 12 +++++++ src/sokoke.h | 7 ++++ 6 files changed, 113 insertions(+), 33 deletions(-) diff --git a/src/main.c b/src/main.c index 07d3c987..93724d10 100644 --- a/src/main.c +++ b/src/main.c @@ -118,11 +118,18 @@ settings_new_from_file (const gchar* filename) } else if (type == G_TYPE_PARAM_INT) { - guint integer = sokoke_key_file_get_integer_default (key_file, + gint integer = sokoke_key_file_get_integer_default (key_file, "settings", property, G_PARAM_SPEC_INT (pspec)->default_value, NULL); g_object_set (settings, property, integer, NULL); } + else if (type == G_TYPE_PARAM_FLOAT) + { + gdouble number = sokoke_key_file_get_double_default (key_file, + "settings", property, + G_PARAM_SPEC_FLOAT (pspec)->default_value, NULL); + g_object_set (settings, property, number, NULL); + } else if (type == G_TYPE_PARAM_BOOLEAN) { gboolean boolean = sokoke_key_file_get_boolean_default (key_file, @@ -189,6 +196,12 @@ settings_save_to_file (MidoriWebSettings* settings, g_object_get (settings, property, &integer, NULL); g_key_file_set_integer (key_file, "settings", property, integer); } + else if (type == G_TYPE_PARAM_FLOAT) + { + gdouble number; + g_object_get (settings, property, &number, NULL); + g_key_file_set_double (key_file, "settings", property, number); + } else if (type == G_TYPE_PARAM_BOOLEAN) { gboolean boolean; diff --git a/src/midori-browser.c b/src/midori-browser.c index 453acd0a..61f3c7df 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -173,20 +173,26 @@ _midori_browser_update_interface (MidoriBrowser* browser) { MidoriBrowserPrivate* priv = browser->priv; + gboolean loading = FALSE; GtkWidget* web_view = midori_browser_get_current_web_view (browser); - gboolean loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); - /*_action_set_sensitive (browser, "ZoomIn", - webkit_web_view_can_increase_text_size (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "ZoomOut", - webkit_web_view_can_decrease_text_size (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "ZoomNormal", - webkit_web_view_get_text_size (WEBKIT_WEB_VIEW (web_view)) != 1);*/ - _action_set_sensitive (browser, "Back", - webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Forward", - webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Reload", !loading); - _action_set_sensitive (browser, "Stop", loading); + if (web_view) + { + loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); + _action_set_sensitive (browser, "ZoomNormal", + midori_web_view_get_zoom_level (MIDORI_WEB_VIEW (web_view)) != 1.0); + if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), + "zoom-level")) + { + _action_set_sensitive (browser, "ZoomIn", FALSE); + _action_set_sensitive (browser, "ZoomOut", FALSE); + } + _action_set_sensitive (browser, "Back", + webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "Forward", + webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "Reload", !loading); + _action_set_sensitive (browser, "Stop", loading); + } GtkAction* action = gtk_action_group_get_action (priv->action_group, "ReloadStop"); @@ -1230,33 +1236,49 @@ _action_reload_stop_activate (GtkAction* action, g_free (stock_id); } -/*static void +static void _action_zoom_in_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); - const gfloat zoom = webkit_web_view_get_text_multiplier ( - WEBKIT_WEB_VIEW (web_view)); - webkit_web_view_set_text_multiplier (WEBKIT_WEB_VIEW (web_view), zoom + 0.1); -}*/ + if (web_view && g_object_class_find_property ( + G_OBJECT_GET_CLASS (web_view), "zoom-level")) + { + MidoriBrowserPrivate* priv = browser->priv; -/*static void + gfloat zoom_level, zoom_step; + g_object_get (web_view, "zoom-level", &zoom_level, NULL); + g_object_get (priv->settings, "zoom-step", &zoom_step, NULL); + g_object_set (web_view, "zoom-level", zoom_level + zoom_step, NULL); + } +} + +static void _action_zoom_out_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); - const gfloat zoom = webkit_web_view_get_text_multiplier ( - WEBKIT_WEB_VIEW (web_view)); - webkit_web_view_set_text_multiplier (WEBKIT_WEB_VIEW (web_view), zoom - 0.1); -}*/ + if (web_view && g_object_class_find_property ( + G_OBJECT_GET_CLASS (web_view), "zoom-level")) + { + MidoriBrowserPrivate* priv = browser->priv; -/*static void + gfloat zoom_level, zoom_step; + g_object_get (web_view, "zoom-level", &zoom_level, NULL); + g_object_get (priv->settings, "zoom-step", &zoom_step, NULL); + g_object_set (web_view, "zoom-level", zoom_level - zoom_step, NULL); + } +} + +static void _action_zoom_normal_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); - webkit_web_view_set_text_multiplier (WEBKIT_WEB_VIEW (web_View, 1)); -}*/ + if (web_view && g_object_class_find_property ( + G_OBJECT_GET_CLASS (web_view), "zoom-level")) + g_object_set (web_view, "zoom-level", 1.0, NULL); +} /*static void _action_source_view_activate (GtkAction* action, @@ -2228,13 +2250,13 @@ static const GtkActionEntry entries[] = { N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", - "hm?", NULL/*G_CALLBACK (_action_zoom_in_activate)*/ }, + "hm?", G_CALLBACK (_action_zoom_in_activate) }, { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", - "hm?", NULL/*G_CALLBACK (_action_zoom_out_activate)*/ }, + "hm?", G_CALLBACK (_action_zoom_out_activate) }, { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", - "hm?", NULL/*G_CALLBACK (_action_zoom_normal_activate)*/ }, + "hm?", G_CALLBACK (_action_zoom_normal_activate) }, { "SourceView", NULL, N_("View Source"), "", "hm?", /*G_CALLBACK (_action_source_view_activate)*/ }, @@ -2609,7 +2631,7 @@ midori_browser_init (MidoriBrowser* browser) // Create the menubar priv->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); - GtkWidget* menuitem = gtk_menu_item_new(); + GtkWidget* menuitem = gtk_menu_item_new (); gtk_widget_show (menuitem); priv->throbber = katze_throbber_new(); gtk_widget_show(priv->throbber); @@ -2661,7 +2683,7 @@ midori_browser_init (MidoriBrowser* browser) ui_manager, "/toolbar_navigation/Homepage"); // Location - priv->location = sexy_icon_entry_new(); + priv->location = sexy_icon_entry_new (); sokoke_entry_setup_completion (GTK_ENTRY (priv->location)); priv->location_icon = gtk_image_new (); sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->location) @@ -2722,7 +2744,7 @@ midori_browser_init (MidoriBrowser* browser) priv->bookmarkbar = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->bookmarkbar), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style (GTK_TOOLBAR(priv->bookmarkbar), + gtk_toolbar_set_style (GTK_TOOLBAR (priv->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); _midori_browser_create_bookmark_menu (browser, bookmarks, priv->menu_bookmarks); diff --git a/src/midori-webview.c b/src/midori-webview.c index f3810c72..b5e0f080 100644 --- a/src/midori-webview.c +++ b/src/midori-webview.c @@ -1097,3 +1097,26 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) MidoriWebViewPrivate* priv = web_view->priv; return priv->link_uri; } + +/** + * midori_web_view_get_zoom_level: + * @web_view: a #MidoriWebView + * + * Retrieves the current zoom level. + * + * Return value: the zoom level, always 1 if not supported + **/ +gfloat +midori_web_view_get_zoom_level (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), 1); + + if (g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), + "zoom-level")) + { + gfloat zoom_level; + g_object_get (web_view, "zoom-level", &zoom_level, NULL); + return zoom_level; + } + return 1; +} diff --git a/src/midori-webview.h b/src/midori-webview.h index 5b506218..71cab23f 100644 --- a/src/midori-webview.h +++ b/src/midori-webview.h @@ -113,6 +113,9 @@ midori_web_view_get_display_title (MidoriWebView* web_view); const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view); +gfloat +midori_web_view_get_zoom_level (MidoriWebView* web_view); + G_END_DECLS #endif /* __MIDORI_WEB_VIEW_H__ */ diff --git a/src/sokoke.c b/src/sokoke.c index 72706bc7..df78e412 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -403,6 +403,18 @@ gint sokoke_key_file_get_integer_default(GKeyFile* keyFile return g_key_file_get_integer(keyFile, group, key, error); } +gdouble +sokoke_key_file_get_double_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gdouble default_value, + GError** error) +{ + if (!g_key_file_has_key (key_file, group, key, NULL)) + return default_value; + return g_key_file_get_double (key_file, group, key, error); +} + gboolean sokoke_key_file_get_boolean_default (GKeyFile* key_file, const gchar* group, diff --git a/src/sokoke.h b/src/sokoke.h index 3a89f4b2..26a504db 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -75,6 +75,13 @@ gint sokoke_key_file_get_integer_default(GKeyFile*, const gchar*, const gchar* , const gint, GError**); +gdouble +sokoke_key_file_get_double_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gdouble default_value, + GError** error); + gboolean sokoke_key_file_get_boolean_default (GKeyFile* key_file, const gchar* group, From 714f7c65f60e2841617cec8405e18b090ebe7cdc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 11:43:55 +0200 Subject: [PATCH 0116/2970] Add print support via javascript --- src/midori-browser.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index 61f3c7df..a7084dcd 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -192,7 +192,10 @@ _midori_browser_update_interface (MidoriBrowser* browser) webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); _action_set_sensitive (browser, "Reload", !loading); _action_set_sensitive (browser, "Stop", loading); + _action_set_sensitive (browser, "Print", TRUE); } + else + _action_set_sensitive (browser, "Print", FALSE); GtkAction* action = gtk_action_group_get_action (priv->action_group, "ReloadStop"); @@ -905,6 +908,15 @@ _action_window_close_activate (GtkAction* action, gtk_widget_destroy (GTK_WIDGET (browser)); } +static void +_action_print_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* web_view = midori_browser_get_current_tab (browser); + if (web_view) + webkit_web_view_execute_script (WEBKIT_WEB_VIEW (web_view), "print ();"); +} + static void _action_quit_activate (GtkAction* action, MidoriBrowser* browser) @@ -2191,7 +2203,7 @@ static const GtkActionEntry entries[] = { "hm?", NULL/*G_CALLBACK (_action_print_preview_activate)*/ }, { "Print", GTK_STOCK_PRINT, NULL, "p", - "hm?", NULL/*G_CALLBACK (_action_print_activate)*/ }, + "hm?", G_CALLBACK (_action_print_activate) }, { "Quit", GTK_STOCK_QUIT, NULL, "q", N_("Quit the application"), G_CALLBACK (_action_quit_activate) }, From aa6c1ccec4014985e69ede274cff877c431679fb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 14:08:48 +0200 Subject: [PATCH 0117/2970] Fill in discriptions for tooltips --- src/midori-browser.c | 83 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/src/midori-browser.c b/src/midori-browser.c index a7084dcd..ee242312 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -2174,7 +2174,6 @@ _action_bookmark_delete_activate (GtkAction* action, } } -// FIXME: Fill in a good description for each 'hm?' static const GtkActionEntry entries[] = { { "File", NULL, N_("_File") }, { "WindowNew", STOCK_WINDOW_NEW, @@ -2197,13 +2196,13 @@ static const GtkActionEntry entries[] = { N_("Close this window"), G_CALLBACK (_action_window_close_activate) }, { "PageSetup", GTK_STOCK_PROPERTIES, N_("Pa_ge Setup"), "", - "hm?", NULL/*G_CALLBACK (_action_page_setup_activate)*/ }, + "Configure your print settings", NULL/*G_CALLBACK (_action_page_setup_activate)*/ }, { "PrintPreview", GTK_STOCK_PRINT_PREVIEW, NULL, "", - "hm?", NULL/*G_CALLBACK (_action_print_preview_activate)*/ }, + N_("Show a preview of the printed page"), NULL/*G_CALLBACK (_action_print_preview_activate)*/ }, { "Print", GTK_STOCK_PRINT, NULL, "p", - "hm?", G_CALLBACK (_action_print_activate) }, + N_("Print the current page"), G_CALLBACK (_action_print_activate) }, { "Quit", GTK_STOCK_QUIT, NULL, "q", N_("Quit the application"), G_CALLBACK (_action_quit_activate) }, @@ -2217,7 +2216,7 @@ static const GtkActionEntry entries[] = { N_("Redo the last modification"), NULL/*G_CALLBACK (_action_redo_activate)*/ }, { "Cut", GTK_STOCK_CUT, NULL, "x", - "Cut the selected text", G_CALLBACK (_action_cut_activate) }, + N_("Cut the selected text"), G_CALLBACK (_action_cut_activate) }, { "Copy", GTK_STOCK_COPY, NULL, "c", N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) }, @@ -2235,19 +2234,19 @@ static const GtkActionEntry entries[] = { N_("Select all text"), G_CALLBACK (_action_select_all_activate) }, { "Find", GTK_STOCK_FIND, NULL, "f", - "hm?", G_CALLBACK (_action_find_activate) }, + N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) }, { "FindNext", GTK_STOCK_GO_FORWARD, N_("Find _Next"), "g", - "hm?", G_CALLBACK (_action_find_next_activate) }, + N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) }, { "FindPrevious", GTK_STOCK_GO_BACK, N_("Find _Previous"), "g", - "hm?", G_CALLBACK (_action_find_previous_activate) }, + N_("Find the previous occurrence of a word or phrase"), G_CALLBACK (_action_find_previous_activate) }, { "FindQuick", GTK_STOCK_FIND, N_("_Quick Find"), "period", - "hm?", NULL/*G_CALLBACK (_action_find_quick_activate)*/ }, + N_("Quickly jump to a word or phrase"), NULL/*G_CALLBACK (_action_find_quick_activate)*/ }, { "Preferences", GTK_STOCK_PREFERENCES, NULL, "p", - "hm?", G_CALLBACK (_action_preferences_activate) }, + N_("Configure the application preferences"), G_CALLBACK (_action_preferences_activate) }, { "View", NULL, N_("_View") }, { "Toolbars", NULL, N_("_Toolbars") }, @@ -2262,19 +2261,19 @@ static const GtkActionEntry entries[] = { N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", - "hm?", G_CALLBACK (_action_zoom_in_activate) }, + N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) }, { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", - "hm?", G_CALLBACK (_action_zoom_out_activate) }, + N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) }, { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", - "hm?", G_CALLBACK (_action_zoom_normal_activate) }, + N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) }, { "SourceView", NULL, N_("View Source"), "", - "hm?", /*G_CALLBACK (_action_source_view_activate)*/ }, + N_("View the source code of the page"), /*G_CALLBACK (_action_source_view_activate)*/ }, { "SelectionSourceView", NULL, N_("View Selection Source"), "", - "hm?", NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, + N_("View the source code of the selection"), NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, { "Fullscreen", GTK_STOCK_FULLSCREEN, NULL, "F11", N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) }, @@ -2282,54 +2281,54 @@ static const GtkActionEntry entries[] = { { "Go", NULL, N_("_Go") }, { "Back", GTK_STOCK_GO_BACK, NULL, "Left", - "hm?", G_CALLBACK (_action_back_activate) }, + N_("Go back to the previous page"), G_CALLBACK (_action_back_activate) }, { "Forward", GTK_STOCK_GO_FORWARD, NULL, "Right", - "hm?", G_CALLBACK (_action_forward_activate) }, + N_("Go forward to the next page"), G_CALLBACK (_action_forward_activate) }, { "Homepage", STOCK_HOMEPAGE, NULL, "Home", - "hm?", G_CALLBACK (_action_homepage_activate) }, + N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, { "Location", GTK_STOCK_JUMP_TO, N_("Location..."), "l", - "hm?", G_CALLBACK (_action_location_activate) }, + N_("Open a particular location"), G_CALLBACK (_action_location_activate) }, { "Search", GTK_STOCK_FIND, N_("Web Search..."), "f", - "hm?", G_CALLBACK (_action_search_activate) }, + N_("Run a web search"), G_CALLBACK (_action_search_activate) }, { "OpenInPageholder", GTK_STOCK_JUMP_TO, N_("Open in Page_holder..."), "", - "hm?", G_CALLBACK (_action_open_in_panel_activate) }, + N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) }, { "Trash", STOCK_USER_TRASH, N_("Closed Tabs and Windows"), "", N_("Reopen a previously closed tab or window"), NULL }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", - "hm?", G_CALLBACK (_action_trash_empty_activate) }, + N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, { "UndoTabClose", GTK_STOCK_UNDELETE, N_("Undo Close Tab"), "", - "hm?", G_CALLBACK (_action_undo_tab_close_activate) }, + N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, { "Bookmarks", NULL, N_("_Bookmarks") }, { "BookmarkNew", STOCK_BOOKMARK_NEW, NULL, "d", - "hm?", G_CALLBACK (_action_bookmark_new_activate) }, + N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_new_activate) }, { "BookmarksManage", NULL, N_("_Manage Bookmarks"), "b", - "hm?", NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, + N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, { "BookmarkOpen", GTK_STOCK_OPEN, NULL, "", - "hm?", G_CALLBACK (_action_bookmark_open_activate) }, + N_("Open the selected bookmark"), G_CALLBACK (_action_bookmark_open_activate) }, { "BookmarkOpenTab", STOCK_TAB_NEW, N_("Open in New _Tab"), "", - "hm?", G_CALLBACK (_action_bookmark_open_tab_activate) }, + N_("Open the selected bookmark in a new tab"), G_CALLBACK (_action_bookmark_open_tab_activate) }, { "BookmarkOpenWindow", STOCK_WINDOW_NEW, N_("Open in New _Window"), "", - "hm?", G_CALLBACK (_action_bookmark_open_window_activate) }, + N_("Open the selected bookmark in a new window"), G_CALLBACK (_action_bookmark_open_window_activate) }, { "BookmarkEdit", GTK_STOCK_EDIT, NULL, "", - "hm?", G_CALLBACK (_action_bookmark_edit_activate) }, + N_("Edit the selected bookmark"), G_CALLBACK (_action_bookmark_edit_activate) }, { "BookmarkDelete", GTK_STOCK_DELETE, NULL, "", - "hm?", G_CALLBACK (_action_bookmark_delete_activate) }, + N_("Delete the selected bookmark"), G_CALLBACK (_action_bookmark_delete_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, @@ -2340,53 +2339,53 @@ static const GtkActionEntry entries[] = { { "Window", NULL, N_("_Window") }, { "TabPrevious", GTK_STOCK_GO_BACK, N_("_Previous Tab"), "Page_Up", - "hm?", G_CALLBACK (_action_tab_previous_activate) }, + N_("Switch to the previous tab"), G_CALLBACK (_action_tab_previous_activate) }, { "TabNext", GTK_STOCK_GO_FORWARD, N_("_Next Tab"), "Page_Down", - "hm?", G_CALLBACK (_action_tab_next_activate) }, + N_("Switch to the next tab"), G_CALLBACK (_action_tab_next_activate) }, { "TabOverview", NULL, N_("Tab _Overview"), "", - "hm?", NULL/*G_CALLBACK (_action_tab_overview_activate)*/ }, + N_("Show an overview of all open tabs"), NULL/*G_CALLBACK (_action_tab_overview_activate)*/ }, { "Help", NULL, N_("_Help") }, { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", - "hm?", NULL/*G_CALLBACK (_action_help_contents_activate)*/ }, + N_("Show the documentation"), NULL/*G_CALLBACK (_action_help_contents_activate)*/ }, { "About", GTK_STOCK_ABOUT, NULL, "", - "hm?", G_CALLBACK (_action_about_activate) }, + N_("Show information about the program"), G_CALLBACK (_action_about_activate) }, }; static const guint entries_n = G_N_ELEMENTS (entries); static const GtkToggleActionEntry toggle_entries[] = { { "PrivateBrowsing", NULL, N_("P_rivate Browsing"), "", - "hm?", NULL/*G_CALLBACK (_action_private_browsing_activate)*/, + N_("Don't save any private data while browsing"), NULL/*G_CALLBACK (_action_private_browsing_activate)*/, FALSE }, { "WorkOffline", GTK_STOCK_DISCONNECT, N_("_Work Offline"), "", - "hm?", NULL/*G_CALLBACK (_action_work_offline_activate)*/, + N_("Work without a network connection"), NULL/*G_CALLBACK (_action_work_offline_activate)*/, FALSE }, { "Navigationbar", NULL, N_("_Navigationbar"), "", - "hm?", G_CALLBACK (_action_navigationbar_activate), + N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate), FALSE }, { "Panel", NULL, N_("Side_panel"), "F9", - "hm?", G_CALLBACK (_action_panel_activate), + N_("Show sidepanel"), G_CALLBACK (_action_panel_activate), FALSE }, { "Bookmarkbar", NULL, N_("_Bookmarkbar"), "", - "hm?", G_CALLBACK (_action_bookmarkbar_activate), + N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate), FALSE }, { "Transferbar", NULL, N_("_Transferbar"), "", - "hm?", NULL/*G_CALLBACK (_action_transferbar_activate)*/, + N_("Show transferbar"), NULL/*G_CALLBACK (_action_transferbar_activate)*/, FALSE }, { "Statusbar", NULL, N_("_Statusbar"), "", - "hm?", G_CALLBACK (_action_statusbar_activate), + N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate), FALSE }, }; static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries); From 8495ffa5716d8cf48642fff1ac30d82d51c0ea93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 1 Jun 2008 15:15:38 +0200 Subject: [PATCH 0118/2970] Fix superuser warning bar --- src/sokoke.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/sokoke.c b/src/sokoke.c index df78e412..49d836b6 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -16,6 +16,9 @@ #include "config.h" #include "main.h" +#ifdef HAVE_UNISTD_H + #include +#endif #include #include #include @@ -279,21 +282,25 @@ gpointer sokoke_xfce_header_new(const gchar* icon, const gchar* title) return NULL; } -gpointer sokoke_superuser_warning_new(void) +gpointer +sokoke_superuser_warning_new (void) { // Create a horizontal bar with a security warning // This returns NULL if the user is no superuser #ifdef HAVE_UNISTD_H - if(G_UNLIKELY(!geteuid())) // effective superuser? + if (G_UNLIKELY (!geteuid ())) // effective superuser? { - GtkWidget* hbox = gtk_event_box_new(); - gtk_widget_modify_bg(hbox, GTK_STATE_NORMAL - , &hbox->style->bg[GTK_STATE_SELECTED]); - GtkWidget* label = gtk_label_new(_("Warning: You are using a superuser account!")); - gtk_misc_set_padding(GTK_MISC(label), 0, 2); - gtk_widget_modify_fg(GTK_WIDGET(label), GTK_STATE_NORMAL - , >K_WIDGET(label)->style->fg[GTK_STATE_SELECTED]); - gtk_container_add(GTK_CONTAINER(hbox), GTK_WIDGET(label)); + GtkWidget* hbox = gtk_event_box_new (); + gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL, + &hbox->style->bg[GTK_STATE_SELECTED]); + GtkWidget* label = gtk_label_new ( + _("Warning: You are using a superuser account!")); + gtk_misc_set_padding (GTK_MISC (label), 0, 2); + gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, + >K_WIDGET (label)->style->fg[GTK_STATE_SELECTED]); + gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER(hbox), GTK_WIDGET (label)); + gtk_widget_show (hbox); return hbox; } #endif From 4e5afd5041bf1fc77f3f6a39b483c87f3a7ddbea Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 15:16:40 +0200 Subject: [PATCH 0119/2970] Check for unistd.h in waf, update cache on (un)install only --- wscript | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/wscript b/wscript index 8783dcbb..6f4b9562 100644 --- a/wscript +++ b/wscript @@ -39,6 +39,8 @@ def configure (conf): conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1', mandatory=True) + conf.check_header ('unistd.h', 'HAVE_UNISTD_H') + if conf.find_program ('convert', var='CONVERT'): icons = 'yes' else: @@ -85,16 +87,17 @@ def build (bld): install_files ('DATADIR', 'applications', 'midori.desktop') def shutdown (): - dir = Common.path_install ('DATADIR', 'icons/hicolor') - icon_cache_updated = False - if not Params.g_options.destdir: - # update the pixmap cache directory - try: - subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) - Params.pprint ('YELLOW', "Updated Gtk icon cache.") - icon_cache_updated = True - except: - Params.pprint ('RED', "Failed to update icon cache.") - if not icon_cache_updated: - Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") - Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) + if Params.g_commands['install'] or Params.g_commands['uninstall']: + dir = Common.path_install ('DATADIR', 'icons/hicolor') + icon_cache_updated = False + if not Params.g_options.destdir: + # update the pixmap cache directory + try: + subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) + Params.pprint ('YELLOW', "Updated Gtk icon cache.") + icon_cache_updated = True + except: + Params.pprint ('RED', "Failed to update icon cache.") + if not icon_cache_updated: + Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") + Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) From f79806bb27894f8103ab51e0a49652cec42160fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 1 Jun 2008 15:24:55 +0200 Subject: [PATCH 0120/2970] Fix opening files from command line with a relative path --- src/sokoke.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/sokoke.c b/src/sokoke.c index 49d836b6..d22c1371 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -30,6 +30,14 @@ sokoke_magic_uri (const gchar* uri, const gchar* default_search_uri) // Add file:// if we have a local path if (g_path_is_absolute (uri)) return g_strconcat ("file://", uri, NULL); + // Construct an absolute path if the file is relative + if (g_file_test (uri, G_FILE_TEST_EXISTS) && g_file_test (uri, G_FILE_TEST_IS_REGULAR)) + { + gchar* current_dir = g_get_current_dir (); + gchar* result = g_strconcat ("file://", current_dir, G_DIR_SEPARATOR_S, uri, NULL); + g_free (current_dir); + return result; + } // Do we need to add a protocol? if (!strstr (uri, "://")) { From 84036dc39e1e73fdc1af5b31052c33d7658907a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 16:40:44 +0200 Subject: [PATCH 0121/2970] Change a few strings, particularly New Bookmark => Add Bookmark --- src/main.c | 8 ++++---- src/main.h | 2 +- src/midori-browser.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main.c b/src/main.c index 93724d10..6d4f03e8 100644 --- a/src/main.c +++ b/src/main.c @@ -44,9 +44,9 @@ static void stock_items_init(void) { STOCK_USER_TRASH }, { STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, - { STOCK_BOOKMARK_NEW, N_("New Bookmark"), 0, 0, NULL }, + { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, NULL }, { STOCK_FORM_FILL, N_("_Form Fill"), 0, 0, NULL }, - { STOCK_HOMEPAGE, N_("Homepage"), 0, 0, NULL }, + { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, NULL }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, NULL }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, NULL }, #if !GTK_CHECK_VERSION(2, 10, 0) @@ -54,7 +54,7 @@ static void stock_items_init(void) #endif #if !GTK_CHECK_VERSION(2, 8, 0) { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL }, - { GTK_STOCK_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, + { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, #endif }; GtkIconFactory* factory = gtk_icon_factory_new(); @@ -157,7 +157,7 @@ settings_new_from_file (const gchar* filename) g_type_class_unref (enum_class); } else - g_warning (_("Unhandled settings property '%s'"), property); + g_warning (_("Unhandled settings value '%s'"), property); } return settings; } diff --git a/src/main.h b/src/main.h index c820fe5b..3eab9b70 100644 --- a/src/main.h +++ b/src/main.h @@ -37,7 +37,7 @@ KatzeXbelItem* bookmarks; // We assume that these legacy icon names are usually present -#define STOCK_BOOKMARK_NEW "stock_add-bookmark" +#define STOCK_BOOKMARK_ADD "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME #define STOCK_IMAGE "gnome-mime-image" #define STOCK_LOCK_OPEN "stock_lock-open" diff --git a/src/midori-browser.c b/src/midori-browser.c index ee242312..459818f5 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -436,7 +436,7 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - action = _action_by_name (browser, "BookmarkNew"); + action = _action_by_name (browser, "BookmarkAdd"); menuitem = gtk_action_create_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); action = _action_by_name (browser, "SaveAs"); @@ -1858,7 +1858,7 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, } static void -_action_bookmark_new_activate (GtkAction* action, +_action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) { midori_browser_edit_bookmark_dialog_new (browser, NULL); @@ -2308,9 +2308,9 @@ static const GtkActionEntry entries[] = { N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, { "Bookmarks", NULL, N_("_Bookmarks") }, - { "BookmarkNew", STOCK_BOOKMARK_NEW, + { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", - N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_new_activate) }, + N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, { "BookmarksManage", NULL, N_("_Manage Bookmarks"), "b", N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, @@ -2518,7 +2518,7 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" "" // Bookmarks shall be appended here @@ -2550,7 +2550,7 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" "" "" From 5fcb26b123f2079c807faf3e0d4ca47f525d25e7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 17:39:57 +0200 Subject: [PATCH 0122/2970] Cleanup sokoke --- src/sokoke.c | 215 +++++++++++++++++++++++++++------------------------ src/sokoke.h | 65 ++++++++++------ 2 files changed, 156 insertions(+), 124 deletions(-) diff --git a/src/sokoke.c b/src/sokoke.c index d22c1371..157252d5 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -98,59 +98,66 @@ sokoke_entry_append_completion (GtkEntry* entry, const gchar* text) gtk_list_store_set (GTK_LIST_STORE (completion_store), &iter, 0, text, -1); } -void sokoke_combo_box_add_strings(GtkComboBox* combobox - , const gchar* labelFirst, ...) +void +sokoke_combo_box_add_strings (GtkComboBox* combobox, + const gchar* label_first, ...) { // Add a number of strings to a combobox, terminated with NULL // This works only for text comboboxes va_list args; - va_start(args, labelFirst); + va_start (args, label_first); const gchar* label; - for(label = labelFirst; label; label = va_arg(args, const gchar*)) - gtk_combo_box_append_text(combobox, label); + for (label = label_first; label; label = va_arg (args, const gchar*)) + gtk_combo_box_append_text (combobox, label); - va_end(args); + va_end (args); } -void sokoke_widget_set_visible(GtkWidget* widget, gboolean visible) +void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible) { // Show or hide the widget - if(visible) - gtk_widget_show(widget); + if (visible) + gtk_widget_show (widget); else - gtk_widget_hide(widget); + gtk_widget_hide (widget); } -void sokoke_container_show_children(GtkContainer* container) +void +sokoke_container_show_children (GtkContainer* container) { // Show every child but not the container itself - gtk_container_foreach(container, (GtkCallback)(gtk_widget_show_all), NULL); + gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); } -void sokoke_widget_set_tooltip_text(GtkWidget* widget, const gchar* text) +void +sokoke_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) { #if GTK_CHECK_VERSION(2, 12, 0) - gtk_widget_set_tooltip_text(widget, text); + gtk_widget_set_tooltip_text (widget, text); #else static GtkTooltips* tooltips; - if(!tooltips) - tooltips = gtk_tooltips_new(); - gtk_tooltips_set_tip(tooltips, widget, text, NULL); + if (!tooltips) + tooltips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tooltips, widget, text, NULL); #endif } void sokoke_tool_item_set_tooltip_text (GtkToolItem* toolitem, const gchar* text) { - // TODO: Use 2.12 api if available - static GtkTooltips* tooltips = NULL; - - if (G_UNLIKELY (!tooltips)) - tooltips = gtk_tooltips_new(); - if (text && *text) + { + #if GTK_CHECK_VERSION(2, 12, 0) + gtk_tool_item_set_tooltip_text (toolitem, text); + #else + static GtkTooltips* tooltips = NULL; + if (G_UNLIKELY (!tooltips)) + tooltips = gtk_tooltips_new(); + gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); + #endif + } } typedef struct @@ -243,17 +250,18 @@ typedef enum SOKOKE_DESKTOP_UNKNOWN } SokokeDesktop; -static SokokeDesktop sokoke_get_desktop(void) +static SokokeDesktop +sokoke_get_desktop (void) { static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; - if(G_UNLIKELY(desktop == SOKOKE_DESKTOP_UNTESTED)) + if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) { // Are we running in Xfce? gint result; gchar* out; gchar* err; - gboolean success = g_spawn_command_line_sync( - "xprop -root _DT_SAVE_MODE | grep -q xfce4" - , &out, &err, &result, NULL); - if(success && !result) + gboolean success = g_spawn_command_line_sync ( + "xprop -root _DT_SAVE_MODE | grep -q xfce4", + &out, &err, &result, NULL); + if (success && !result) desktop = SOKOKE_DESKTOP_XFCE; else desktop = SOKOKE_DESKTOP_UNKNOWN; @@ -262,35 +270,39 @@ static SokokeDesktop sokoke_get_desktop(void) return desktop; } -gpointer sokoke_xfce_header_new(const gchar* icon, const gchar* title) +GtkWidget* +sokoke_xfce_header_new (const gchar* icon, + const gchar* title) { // Create an xfce header with icon and title // This returns NULL if the desktop is not xfce - if(sokoke_get_desktop() == SOKOKE_DESKTOP_XFCE) + if (sokoke_get_desktop () == SOKOKE_DESKTOP_XFCE) { - GtkWidget* entry = gtk_entry_new(); + GtkWidget* entry = gtk_entry_new (); gchar* markup; - GtkWidget* xfce_heading = gtk_event_box_new(); - gtk_widget_modify_bg(xfce_heading, GTK_STATE_NORMAL - , &entry->style->base[GTK_STATE_NORMAL]); - GtkWidget* hbox = gtk_hbox_new(FALSE, 12); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 6); - GtkWidget* image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); - GtkWidget* label = gtk_label_new(NULL); - gtk_widget_modify_fg(label, GTK_STATE_NORMAL + GtkWidget* xfce_heading = gtk_event_box_new (); + gtk_widget_modify_bg (xfce_heading, GTK_STATE_NORMAL, + &entry->style->base[GTK_STATE_NORMAL]); + GtkWidget* hbox = gtk_hbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); + GtkWidget* image = gtk_image_new_from_icon_name (icon, + GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + GtkWidget* label = gtk_label_new (NULL); + gtk_widget_modify_fg (label, GTK_STATE_NORMAL , &entry->style->text[GTK_STATE_NORMAL]); - markup = g_strdup_printf("%s", title); - gtk_label_set_markup(GTK_LABEL(label), markup); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(xfce_heading), hbox); - g_free(markup); + markup = g_strdup_printf ("%s", + title); + gtk_label_set_markup (GTK_LABEL (label), markup); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (xfce_heading), hbox); + g_free (markup); return xfce_heading; } return NULL; } -gpointer +GtkWidget* sokoke_superuser_warning_new (void) { // Create a horizontal bar with a security warning @@ -315,31 +327,34 @@ sokoke_superuser_warning_new (void) return NULL; } -GtkWidget* sokoke_hig_frame_new(const gchar* title) +GtkWidget* +sokoke_hig_frame_new (const gchar* title) { // Create a frame with no actual frame but a bold label and indentation - GtkWidget* frame = gtk_frame_new(NULL); - gchar* titleBold = g_strdup_printf("%s", title); - GtkWidget* label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), titleBold); - g_free(titleBold); - gtk_frame_set_label_widget(GTK_FRAME(frame), label); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + GtkWidget* frame = gtk_frame_new (NULL); + gchar* title_bold = g_strdup_printf ("%s", title); + GtkWidget* label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), title_bold); + g_free (title_bold); + gtk_frame_set_label_widget (GTK_FRAME (frame), label); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); return frame; } -void sokoke_widget_set_pango_font_style(GtkWidget* widget, PangoStyle style) +void +sokoke_widget_set_pango_font_style (GtkWidget* widget, + PangoStyle style) { // Conveniently change the pango font style // For some reason we need to reset if we actually want the normal style - if(style == PANGO_STYLE_NORMAL) - gtk_widget_modify_font(widget, NULL); + if (style == PANGO_STYLE_NORMAL) + gtk_widget_modify_font (widget, NULL); else { - PangoFontDescription* fontDescription = pango_font_description_new(); - pango_font_description_set_style(fontDescription, PANGO_STYLE_ITALIC); - gtk_widget_modify_font(widget, fontDescription); - pango_font_description_free(fontDescription); + PangoFontDescription* font_description = pango_font_description_new (); + pango_font_description_set_style (font_description, PANGO_STYLE_ITALIC); + gtk_widget_modify_font (widget, font_description); + pango_font_description_free (font_description); } } @@ -374,7 +389,7 @@ sokoke_on_entry_focus_out_event (GtkEntry* entry, gtk_entry_set_text (entry, defaultText); g_object_set_data (G_OBJECT(entry), "sokoke_has_default", GINT_TO_POINTER (1)); - sokoke_widget_set_pango_font_style (GTK_WIDGET(entry), + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC); } return FALSE; @@ -403,19 +418,27 @@ sokoke_entry_set_default_text (GtkEntry* entry, G_CALLBACK (sokoke_on_entry_focus_out_event), NULL); } -gchar* sokoke_key_file_get_string_default(GKeyFile* keyFile - , const gchar* group, const gchar* key, const gchar* defaultValue, GError** error) +gchar* +sokoke_key_file_get_string_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gchar* default_value, + GError** error) { - gchar* value = g_key_file_get_string(keyFile, group, key, error); - return value == NULL ? g_strdup(defaultValue) : value; + gchar* value = g_key_file_get_string (key_file, group, key, error); + return value == NULL ? g_strdup (default_value) : value; } -gint sokoke_key_file_get_integer_default(GKeyFile* keyFile - , const gchar* group, const gchar* key, const gint defaultValue, GError** error) +gint +sokoke_key_file_get_integer_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gint default_value, + GError** error) { - if(!g_key_file_has_key(keyFile, group, key, NULL)) - return defaultValue; - return g_key_file_get_integer(keyFile, group, key, error); + if (!g_key_file_has_key (key_file, group, key, NULL)) + return default_value; + return g_key_file_get_integer (key_file, group, key, error); } gdouble @@ -442,42 +465,34 @@ sokoke_key_file_get_boolean_default (GKeyFile* key_file, return g_key_file_get_boolean (key_file, group, key, error); } -gboolean sokoke_key_file_save_to_file(GKeyFile* keyFile - , const gchar* filename, GError** error) +gboolean +sokoke_key_file_save_to_file (GKeyFile* key_file, + const gchar* filename, + GError** error) { - gchar* data = g_key_file_to_data(keyFile, NULL, error); - if(!data) + gchar* data = g_key_file_to_data (key_file, NULL, error); + if (!data) return FALSE; FILE* fp; - if(!(fp = fopen(filename, "w"))) + if (!(fp = fopen (filename, "w"))) { - *error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_ACCES - , _("Writing failed.")); + *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES, + _("Writing failed.")); return FALSE; } - fputs(data, fp); - fclose(fp); - g_free(data); + fputs (data, fp); + fclose (fp); + g_free (data); return TRUE; } -void sokoke_widget_get_text_size(GtkWidget* widget, const gchar* text - , gint* w, gint* h) +void +sokoke_widget_get_text_size (GtkWidget* widget, + const gchar* text, + gint* width, + gint* height) { - PangoLayout* layout = gtk_widget_create_pango_layout(widget, text); - pango_layout_get_pixel_size(layout, w, h); - g_object_unref(layout); -} - -void sokoke_menu_item_set_accel(GtkMenuItem* menuitem, const gchar* path - , const gchar* key, GdkModifierType modifiers) -{ - if(path && *path) - { - gchar* accel = g_strconcat("<", g_get_prgname(), ">/", path, NULL); - gtk_menu_item_set_accel_path(GTK_MENU_ITEM(menuitem), accel); - guint keyVal = key ? gdk_keyval_from_name(key) : 0; - gtk_accel_map_add_entry(accel, keyVal, modifiers); - g_free(accel); - } + PangoLayout* layout = gtk_widget_create_pango_layout (widget, text); + pango_layout_get_pixel_size (layout, width, height); + g_object_unref (layout); } diff --git a/src/sokoke.h b/src/sokoke.h index 26a504db..89e3ba2e 100644 --- a/src/sokoke.h +++ b/src/sokoke.h @@ -25,7 +25,7 @@ void sokoke_entry_setup_completion (GtkEntry* entry); void -sokoke_entry_append_completion (GtkEntry* entry, +sokoke_entry_append_completion (GtkEntry* entry, const gchar* text); typedef enum { @@ -35,45 +35,60 @@ typedef enum { } SokokeMenuPos; void -sokoke_combo_box_add_strings(GtkComboBox*, const gchar*, ...); +sokoke_combo_box_add_strings (GtkComboBox* combobox, + const gchar* label_first, ...); void -sokoke_widget_set_visible(GtkWidget*, gboolean); +sokoke_widget_set_visible (GtkWidget* widget, + gboolean visible); void -sokoke_container_show_children(GtkContainer*); +sokoke_container_show_children (GtkContainer* container); void -sokoke_widget_set_tooltip_text(GtkWidget*, const gchar*); +sokoke_widget_set_tooltip_text (GtkWidget* widget, + const gchar* text); void -sokoke_tool_item_set_tooltip_text(GtkToolItem*, const gchar*); +sokoke_tool_item_set_tooltip_text (GtkToolItem* toolitem, + const gchar* text); void -sokoke_widget_popup(GtkWidget*, GtkMenu*, GdkEventButton*, SokokeMenuPos pos); - -gpointer -sokoke_xfce_header_new(const gchar*, const gchar*); - -gpointer -sokoke_superuser_warning_new(void); +sokoke_widget_popup (GtkWidget* widget, + GtkMenu* menu, + GdkEventButton* event, + SokokeMenuPos pos); GtkWidget* -sokoke_hig_frame_new(const gchar*); +sokoke_xfce_header_new (const gchar* icon, + const gchar* title); + +GtkWidget* +sokoke_superuser_warning_new (void); + +GtkWidget* +sokoke_hig_frame_new (const gchar* title); void -sokoke_widget_set_pango_font_style(GtkWidget*, PangoStyle); +sokoke_widget_set_pango_font_style (GtkWidget* widget, + PangoStyle style); void sokoke_entry_set_default_text(GtkEntry*, const gchar*); gchar* -sokoke_key_file_get_string_default(GKeyFile*, const gchar*, const gchar* - , const gchar*, GError**); +sokoke_key_file_get_string_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gchar* default_value, + GError** error); gint -sokoke_key_file_get_integer_default(GKeyFile*, const gchar*, const gchar* - , const gint, GError**); +sokoke_key_file_get_integer_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gint default_value, + GError** error); gdouble sokoke_key_file_get_double_default (GKeyFile* key_file, @@ -90,12 +105,14 @@ sokoke_key_file_get_boolean_default (GKeyFile* key_file, GError** error); gboolean -sokoke_key_file_save_to_file(GKeyFile*, const gchar*, GError**); +sokoke_key_file_save_to_file (GKeyFile* key_file, + const gchar* filename, + GError** error); void -sokoke_widget_get_text_size(GtkWidget*, const gchar*, gint*, gint*); - -void -sokoke_menu_item_set_accel(GtkMenuItem*, const gchar*, const gchar*, GdkModifierType); +sokoke_widget_get_text_size (GtkWidget* widget, + const gchar* text, + gint* width, + gint* height); #endif /* !__SOKOKE_H__ */ From ad44a9435459189ec7ba573de317f3738033ddd0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 21:57:27 +0200 Subject: [PATCH 0123/2970] Install scalable icon with autotools --- Makefile.am | 2 +- configure.in | 3 ++- data/Makefile.am | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 data/Makefile.am diff --git a/Makefile.am b/Makefile.am index 3f505e28..d8b5d3a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = katze src po +SUBDIRS = katze src po data desktopdir = $(datadir)/applications desktop_in_files = midori.desktop diff --git a/configure.in b/configure.in index c21df45a..784509be 100644 --- a/configure.in +++ b/configure.in @@ -102,7 +102,8 @@ AC_CONFIG_FILES([ Makefile \ katze/Makefile \ src/Makefile \ - po/Makefile.in + po/Makefile.in \ + data/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 00000000..6341bfc8 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,17 @@ +iconsdir = $(datadir)/icons/hicolor/scalable/apps +icons_DATA = midori.svg + +EXTRA_DIST = $(icons_DATA) + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi From b511f12b9b4b063610161f2229b94a24a86be0fc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 23:47:27 +0200 Subject: [PATCH 0124/2970] Rename folder 'src' to 'midori' --- Makefile.am | 2 +- configure.in | 15 ++------------- {src => midori}/Makefile.am | 0 {src => midori}/gjs.c | 0 {src => midori}/gjs.h | 0 {src => midori}/main.c | 0 {src => midori}/main.h | 0 {src => midori}/midori-addons.c | 0 {src => midori}/midori-addons.h | 0 {src => midori}/midori-app.c | 0 {src => midori}/midori-app.h | 0 {src => midori}/midori-browser.c | 0 {src => midori}/midori-browser.h | 0 {src => midori}/midori-console.c | 0 {src => midori}/midori-console.h | 0 {src => midori}/midori-panel.c | 0 {src => midori}/midori-panel.h | 0 {src => midori}/midori-preferences.c | 0 {src => midori}/midori-preferences.h | 0 {src => midori}/midori-trash.c | 0 {src => midori}/midori-trash.h | 0 {src => midori}/midori-websettings.c | 0 {src => midori}/midori-websettings.h | 0 {src => midori}/midori-webview.c | 0 {src => midori}/midori-webview.h | 0 {src => midori}/search.c | 0 {src => midori}/search.h | 0 {src => midori}/sokoke.c | 0 {src => midori}/sokoke.h | 0 {src => midori}/webSearch.c | 0 {src => midori}/webSearch.h | 0 {src => midori}/wscript_build | 0 wscript | 5 ++--- 33 files changed, 5 insertions(+), 17 deletions(-) rename {src => midori}/Makefile.am (100%) rename {src => midori}/gjs.c (100%) rename {src => midori}/gjs.h (100%) rename {src => midori}/main.c (100%) rename {src => midori}/main.h (100%) rename {src => midori}/midori-addons.c (100%) rename {src => midori}/midori-addons.h (100%) rename {src => midori}/midori-app.c (100%) rename {src => midori}/midori-app.h (100%) rename {src => midori}/midori-browser.c (100%) rename {src => midori}/midori-browser.h (100%) rename {src => midori}/midori-console.c (100%) rename {src => midori}/midori-console.h (100%) rename {src => midori}/midori-panel.c (100%) rename {src => midori}/midori-panel.h (100%) rename {src => midori}/midori-preferences.c (100%) rename {src => midori}/midori-preferences.h (100%) rename {src => midori}/midori-trash.c (100%) rename {src => midori}/midori-trash.h (100%) rename {src => midori}/midori-websettings.c (100%) rename {src => midori}/midori-websettings.h (100%) rename {src => midori}/midori-webview.c (100%) rename {src => midori}/midori-webview.h (100%) rename {src => midori}/search.c (100%) rename {src => midori}/search.h (100%) rename {src => midori}/sokoke.c (100%) rename {src => midori}/sokoke.h (100%) rename {src => midori}/webSearch.c (100%) rename {src => midori}/webSearch.h (100%) rename {src => midori}/wscript_build (100%) diff --git a/Makefile.am b/Makefile.am index d8b5d3a9..5270e0d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = katze src po data +SUBDIRS = katze midori po data desktopdir = $(datadir)/applications desktop_in_files = midori.desktop diff --git a/configure.in b/configure.in index 784509be..72c121e5 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # Register ourselves to autoconf AC_INIT([midori], [0.0.18], [christian@twotoasts.de]) -AC_CONFIG_SRCDIR([src/main.h]) +AC_CONFIG_SRCDIR([midori/main.h]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) @@ -101,19 +101,8 @@ fi AC_CONFIG_FILES([ Makefile \ katze/Makefile \ - src/Makefile \ + midori/Makefile \ po/Makefile.in \ data/Makefile ]) AC_OUTPUT - -# Show us what we have -echo -echo " GTK+2 $GTK_VER" -echo " WebKit $WEBKIT_VER" -echo " Libsexy $LIBSEXY_VER" -echo " libXML2 $LIBXML_VER" -echo -echo " Debugging $enable_debug" -echo -echo " Prefix $prefix" diff --git a/src/Makefile.am b/midori/Makefile.am similarity index 100% rename from src/Makefile.am rename to midori/Makefile.am diff --git a/src/gjs.c b/midori/gjs.c similarity index 100% rename from src/gjs.c rename to midori/gjs.c diff --git a/src/gjs.h b/midori/gjs.h similarity index 100% rename from src/gjs.h rename to midori/gjs.h diff --git a/src/main.c b/midori/main.c similarity index 100% rename from src/main.c rename to midori/main.c diff --git a/src/main.h b/midori/main.h similarity index 100% rename from src/main.h rename to midori/main.h diff --git a/src/midori-addons.c b/midori/midori-addons.c similarity index 100% rename from src/midori-addons.c rename to midori/midori-addons.c diff --git a/src/midori-addons.h b/midori/midori-addons.h similarity index 100% rename from src/midori-addons.h rename to midori/midori-addons.h diff --git a/src/midori-app.c b/midori/midori-app.c similarity index 100% rename from src/midori-app.c rename to midori/midori-app.c diff --git a/src/midori-app.h b/midori/midori-app.h similarity index 100% rename from src/midori-app.h rename to midori/midori-app.h diff --git a/src/midori-browser.c b/midori/midori-browser.c similarity index 100% rename from src/midori-browser.c rename to midori/midori-browser.c diff --git a/src/midori-browser.h b/midori/midori-browser.h similarity index 100% rename from src/midori-browser.h rename to midori/midori-browser.h diff --git a/src/midori-console.c b/midori/midori-console.c similarity index 100% rename from src/midori-console.c rename to midori/midori-console.c diff --git a/src/midori-console.h b/midori/midori-console.h similarity index 100% rename from src/midori-console.h rename to midori/midori-console.h diff --git a/src/midori-panel.c b/midori/midori-panel.c similarity index 100% rename from src/midori-panel.c rename to midori/midori-panel.c diff --git a/src/midori-panel.h b/midori/midori-panel.h similarity index 100% rename from src/midori-panel.h rename to midori/midori-panel.h diff --git a/src/midori-preferences.c b/midori/midori-preferences.c similarity index 100% rename from src/midori-preferences.c rename to midori/midori-preferences.c diff --git a/src/midori-preferences.h b/midori/midori-preferences.h similarity index 100% rename from src/midori-preferences.h rename to midori/midori-preferences.h diff --git a/src/midori-trash.c b/midori/midori-trash.c similarity index 100% rename from src/midori-trash.c rename to midori/midori-trash.c diff --git a/src/midori-trash.h b/midori/midori-trash.h similarity index 100% rename from src/midori-trash.h rename to midori/midori-trash.h diff --git a/src/midori-websettings.c b/midori/midori-websettings.c similarity index 100% rename from src/midori-websettings.c rename to midori/midori-websettings.c diff --git a/src/midori-websettings.h b/midori/midori-websettings.h similarity index 100% rename from src/midori-websettings.h rename to midori/midori-websettings.h diff --git a/src/midori-webview.c b/midori/midori-webview.c similarity index 100% rename from src/midori-webview.c rename to midori/midori-webview.c diff --git a/src/midori-webview.h b/midori/midori-webview.h similarity index 100% rename from src/midori-webview.h rename to midori/midori-webview.h diff --git a/src/search.c b/midori/search.c similarity index 100% rename from src/search.c rename to midori/search.c diff --git a/src/search.h b/midori/search.h similarity index 100% rename from src/search.h rename to midori/search.h diff --git a/src/sokoke.c b/midori/sokoke.c similarity index 100% rename from src/sokoke.c rename to midori/sokoke.c diff --git a/src/sokoke.h b/midori/sokoke.h similarity index 100% rename from src/sokoke.h rename to midori/sokoke.h diff --git a/src/webSearch.c b/midori/webSearch.c similarity index 100% rename from src/webSearch.c rename to midori/webSearch.c diff --git a/src/webSearch.h b/midori/webSearch.h similarity index 100% rename from src/webSearch.h rename to midori/webSearch.h diff --git a/src/wscript_build b/midori/wscript_build similarity index 100% rename from src/wscript_build rename to midori/wscript_build diff --git a/wscript b/wscript index 6f4b9562..862d587f 100644 --- a/wscript +++ b/wscript @@ -23,8 +23,7 @@ def configure (conf): conf.check_tool ('compiler_cc') if not Params.g_options.disable_nls: conf.check_tool ('intltool') - # FIXME if we have intltool but not msgfmt the build breaks - if conf.env['INTLTOOL']: + if conf.env['INTLTOOL'] and conf.env['POCOM']: nls = 'yes' conf.define ('ENABLE_NLS', 1) conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) @@ -69,7 +68,7 @@ def set_options (opt): help='Disables native language support', dest='disable_nls') def build (bld): - bld.add_subdirs ('katze src data') + bld.add_subdirs ('katze midori data') if bld.env ()['INTLTOOL']: bld.add_subdirs ('po') From a97264a090ae0af43a4c16503a5fd2bc7df28568 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Jun 2008 23:58:00 +0200 Subject: [PATCH 0125/2970] Fix 'missing cursor' in entries --- midori/midori-app.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 5d41e255..a9a8309d 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -251,7 +251,7 @@ midori_app_get_property (GObject* object, } } -static void +static gboolean midori_browser_focus_in_event_cb (MidoriBrowser* browser, GdkEventFocus* event, MidoriApp* app) @@ -259,6 +259,7 @@ midori_browser_focus_in_event_cb (MidoriBrowser* browser, MidoriAppPrivate* priv = app->priv; priv->browser = browser; + return FALSE; } static void From c7626bfda247cb5c1aee30e79f52ba903731bc93 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 2 Jun 2008 01:54:38 +0200 Subject: [PATCH 0126/2970] Fix and update translation template handling --- po/POTFILES.in | 22 +++++++++++----------- po/wscript_build | 26 ++++++++++++++++++++++++++ wscript | 1 + 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4a6722c2..2cdc211f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,17 +1,17 @@ # List of source files containing translatable strings. midori.desktop.in -src/main.c -src/midori-console.c -src/midori-browser.c -src/midori-panel.c -src/midori-trash.c -src/midori-websettings.c -src/midori-webview.c -src/midori-preferences.c -src/search.c -src/sokoke.c -src/webSearch.c +midori/main.c +midori/midori-console.c +midori/midori-browser.c +midori/midori-panel.c +midori/midori-trash.c +midori/midori-websettings.c +midori/midori-webview.c +midori/midori-preferences.c +midori/search.c +midori/sokoke.c +midori/webSearch.c katze/katze-throbber.c katze/katze-utils.c katze/katze-xbel.c diff --git a/po/wscript_build b/po/wscript_build index 3a1dce71..149046b6 100644 --- a/po/wscript_build +++ b/po/wscript_build @@ -1,5 +1,31 @@ #! /usr/bin/env python # WAF build script for midori +import Params +import pproc as subprocess +import os + +if bld.env ()['INTLTOOL_UPDATE']: + os.chdir ('./po') + try: + try: + size_old = os.stat ('midori.pot').st_size + except: + size_old = 0 + subprocess.call (['intltool-update', '--pot']) + size_new = os.stat ('midori.pot').st_size + if size_new <> size_old: + Params.pprint ('YELLOW', "Updated po template.") + try: + intltool_update = subprocess.Popen (['intltool-update', '-r'], + stderr=subprocess.PIPE) + intltool_update.wait () + Params.pprint ('YELLOW', "Updated translations.") + except: + Params.pprint ('RED', "Failed to update translations.") + except: + Params.pprint ('RED', "Failed to generate po template.") + os.chdir ('..') + obj = bld.create_obj ('intltool_po') obj.appname = 'midori' diff --git a/wscript b/wscript index 862d587f..0a364190 100644 --- a/wscript +++ b/wscript @@ -24,6 +24,7 @@ def configure (conf): if not Params.g_options.disable_nls: conf.check_tool ('intltool') if conf.env['INTLTOOL'] and conf.env['POCOM']: + conf.find_program ('intltool-update', var='INTLTOOL_UPDATE') nls = 'yes' conf.define ('ENABLE_NLS', 1) conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) From 3af84ebfd68c18adaf2c7d701439e8247191bb04 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 2 Jun 2008 23:57:53 +0200 Subject: [PATCH 0127/2970] Default to current URI and page for Bookmark Add --- midori/midori-browser.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 459818f5..6b639ccd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1468,7 +1468,17 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); if (new_bookmark) + { + GtkWidget* web_view = midori_browser_get_current_web_view (browser); bookmark = katze_xbel_bookmark_new (); + if (MIDORI_IS_WEB_VIEW (web_view)) + { + katze_xbel_item_set_title (bookmark, + midori_web_view_get_display_title (MIDORI_WEB_VIEW (web_view))); + katze_xbel_bookmark_set_href (bookmark, + midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view))); + } + } GtkWidget* hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); @@ -1477,11 +1487,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); GtkWidget* entry_title = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); - if (!new_bookmark) - { - const gchar* title = katze_xbel_item_get_title (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_title), title ? title : ""); - } + const gchar* title = katze_xbel_item_get_title (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_title), title ? title : ""); gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -1512,9 +1519,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); - if (!new_bookmark) - gtk_entry_set_text (GTK_ENTRY (entry_uri), - katze_xbel_bookmark_get_href (bookmark)); + gtk_entry_set_text (GTK_ENTRY (entry_uri), + katze_xbel_bookmark_get_href (bookmark)); gtk_box_pack_start (GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); From c1573fd10eb8529d8ef9e666aec9eedef4ed3cc8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 3 Jun 2008 23:10:46 +0200 Subject: [PATCH 0128/2970] Update waf to 1.4.2 from svn including po fix --- waf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/waf b/waf index e87084ae..59869322 100755 --- a/waf +++ b/waf @@ -37,8 +37,8 @@ if 'PSYCOWAF' in os.environ: try:import psyco;psyco.full() except:pass -VERSION="1.4.0" -REVISION="259060ce045468a92526b39054bb6964" +VERSION="1.4.2" +REVISION="052bab0c35dd0fc6015e412d863fb679" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' cwd = os.getcwd() join = os.path.join @@ -74,7 +74,7 @@ def unpack_wafdir(dir): try: shutil.rmtree(dir) except OSError: pass try: os.makedirs(join(dir, 'wafadmin', 'Tools')) - except OSError: err("Cannot unpack waf-local into %s Install waf system-wide or move waf into a writeable directory"%dir) + except OSError: err("Cannot unpack waf lib into %s\nMove waf into a writeable directory" % dir) os.chdir(dir) tmp = 't.tbz2' @@ -86,6 +86,8 @@ def unpack_wafdir(dir): for x in t: t.extract(x) t.close() + os.chmod(join('wafadmin','Tools'), 0755) + os.unlink(tmp) os.chdir(cwd) @@ -139,5 +141,5 @@ if Params.g_version != VERSION: Scripting.prepare() #==> -#6<\%_0gSqh;d!5CiqWY(>lXj(Z;EriFChSIA.!o!:mML2IoQZR?5FRIt%J0'K=!D4C5JH=sO#Hp%'og64i-1,WZY@aVW^_5O"qgJ'8Ddh!2fml2>Q$+'R<=krk.Zsc[MQ08@W_fJopUR^B#G=/^>jlh(H0E]Ego.pSm`&3FBiK_5D7qHo%kH51G5Cl5^?nA`GGcL+YIED!mW4]MTGPS6]>"*mgABo8LW/(LX*6LC^2CPqQepNgf_]FMq0dQg[I2?/QaY)jp=6j9,X"*=1c\a[hR>C$^3/:KGV"9g\[8uX%dnJ7hKukSlLf8\pNp3?IHpRTm^_*-mVnNQ$9e'X4snM:IDO\II>^6bG"S"[l2?t\#ebX'CWZ%ASV#+YHLd\!U"YP!PNp=DnWk<2k/[m4+6YE^AGV8lobY4mr[kZ^$f5Xl\>;n\OcOa7ZY4gTUEI"f\^RQgK/TDqqjQoF76SEh?3%Yf6/\!hei&#c)G&WH0KI@#X1n=VVc_:HMU)m]%q"]p"oFi](tf%Dc=sRp@l$lQcD;ICMDnl_s.@-<7LZt3aHW'I8@%p?[9+nBJ4_h8$2LTLYVHIk?+4\n#(BcNUReW;gRl/Cj3=Yla%S@q`Wp,HfjL.\%A6FgO7(*g[6H@G:Kc_kGn5rpc"f@_#(P2!Nu;"d$rX2hVLEO^7Oes]63:gYAg$f/BgVID5LNHf"L'f^%5Yn%Is1^@(;VfPPIPb$)\e!Megq@IJMi)t"TPm,$F>gsb_?o0)TVf?;\@md8DsJ-;IC8J*ZYA0uj]8aTGj1K2_JRV:'h1^t@LRK*E5)ZJD;#O>Jn:[aOLmpuqW[1dYKo/Z@mc+speGb'+R+_Yh#/u)q0Z./2#PtY*=BBU*`,WebiZO8LE5W0Nei#HlA`3sT8]0=_ntQ]c5kBc!QYW=)Bk!aT$-#JUACKE3XaiR-!O(X$\mPNV0eo]*XX-uKJNT7PL*9LnTu_L5E:]e;7:AV%k0f=Ob/9;^*s'`(FjCVT^eo&ZF/,"&h+t`2m?<72_IJOVU;RK4[\)Bh_bf/BA6_7"@,rdNK%(@n'C5["9&sZF8,3AelgddZ\-D8s7FURj?"qZ(VTYN<2g./CnF$'2"629d*(;/I!=p$!>HJ1atnWUnn`$(.f'2Ak"&N18uK@dhXYb'3[sOV@\J,9SnlM.4$mlKf5Z>)c8CF,#kA4'+p?Q,>?''Qjh'`/;2GJW)8EuOXQ%5Q=QAMUkE2NdZ[$38o2lZN7&l5@`6DWBS`u?Z#,\(RnVL'`ls:4:c:jR8Ab=es^^Uf(f?)H0bZb%AOH7$uF]-tJ^M1E/U.23M+.RT(\/dYSS:0VD!L9Oc!fOc5.&MG+I%VAVrDe:k24!b>,lN&F"=@1f<&VP^+ZBLm`kTeW4gOI6QR#m:Pk)&AB#9Zm^k'Jbe#CnW/];[YBh9X(c:MbJr/,$%=b1_Ej4RKGgDMFqPOa]V?*VIE8a=>D_@RBV:"W1o0,82=*g@?jB\%7tB!;$)q^@ZsAQN,(8lZr2K[%()]sU5Ml;@qmpAZ<0MJMMb)0Mag7eOf\dU8Q`6#)J]qdP%lj"c!WHOXA]9\b#kU,`MlDI1=CnN@`UkfL1\AfAXX`P/7MaKQm.L;,aq7N!0$s_N_15\C++XEJX6=Vl%+N$&`9e?s]'4YRO%21F\\]G.l[#iF)R+dI36R6Lf7\na4P9QH".&NgXB!G6GB#KZa`_7eX@j]q=1R>I`F-=F,rM5@1E'/WT:(*qQN;.tqU>8UbV)_j+m)^^at@b@GdTpR8J,h-N[-(1u,`_E8))&l#>;OTA(XOC_%0pE,9KOY=oN5c-*gC0ifV6Q/b)UYMs/J0H8JPiZ;uoX/4`?:-"@C=8iDl)1=VSj8S]O'9/LKW@ka]hV5DLq$'I0'adKGC'oOjo0t'cq=Z27;7$QFQQu''qacZglAX6$pbdB3cVM9o(Rn?6tBr9Yn;Z2Wb*-L(70nm&*aOnLl)GG"-&ZQ3p.7W#a6HruhK-F5NP@i'56H(^cLf'.gQAZ07X!TNn>)b5iNJ+_lMLs5f)4$\-=P?\aMV)IG>&%hTa]g*kA[X(OZq6"pZrW?afIG?%D'lW(VNBB'`[t@Dg/Di7R@u'kC/##'>7m<'RSuY\)4"i.18Ig8[&,QiCeZJp0s_:"UrJ@hR?gR3Q'ta:ULh'pLBZgkY&RNM@^Iu2.m6u(:Tloc8d$u#X\h3Ui(_l*AE1iN>@ji0m-lZJY;S%Sc"ip]m@D$d'Ar-Q=u"p8OOo#+<;4(nK$9Q7oH1Tn*;nVRM[GCDWhe+T7k\P$dM+8Xs;1:5;NQFYD>#1on\d7ig/kkgj/baWP@+M'q_N5[cfpQ$N*cP\8O[jC,jYfCcq[X;Kmd.B%M==ch-3%=.5-#:!\t+ji`o"b7R=/sr`B#t4)JF.:Pj79GQC&`0Q.?in]]"_`(s0cs?a_B*bui[X1qhKj7-8F^r%rDl_2UDR+oYr;UlV8->R'r#ZJ\UX/\PJed\#KYnV&ZChR1=O-,&2_8j?7CQ!rZ-6lplX5aDH'8gR&1iV1-k=%?F\XYGfgNPd,j%%h-"@t)K'K8bI0LD7Z4&1!S-\sj@n/KhEi_B4q0BhY'0mQspOl"B"9Moed@Ou`t2G!r%u[J,.K%@,mnG6/"J#m^!XN;jZp\MrD<\r32,tT8Q.SR%92L3$-o%#^nhkq5HD@uK0S/GRKEg$rBMbHAT][gmVdl("^r`2f,jK1mEmAsBF?%qp]bUlQ+2ARfS[N[C5U@q9*#bA8CN9<42IUBibB.$:ftDFAnJ-JRdLZ4WW@7:NuJ7*sJ(]>X8L%<8t!!:'I]n(3!QmCqC)UdF!*"?SY1q;pQA#9eRR);\E_B[`(-WUfjL"kNukP\">f?s724AP\X$)UaeWe+UnEc;TZEHlQg9cNWLP)U3)i-PddupZ"`+#1\_(kVMZ&>Jo9L9CZ^iA/!sL3]OLcVDp8bSuG-q6Qm]ZJ!\H^Ct"@q&oXof4GQMjX:o6epo.-q*%+ju&A/=ZG@78Q?RJ$nOW6@DORWk07YWaT??MW,Nk[JqVu/@uL/)C9F1r@U4KKKa./lFU+aPr1?J4S&[.MeAnn/?:dU\B;d,ucdADZTm$WQhOYiRac5gAnkdmg*LitgEde2t)3f\,DR_kb"pDcWnER&?25a2C4GP[eY8_^'Bgrr0JeeGg&-qFihBQ]E7T_Z-^1[i#J`q:La-O]Em)6=If2WJHs'I8d,KN;DZlo()MLneY;+"tP*8G(5\7AFBPDeMUtr0i6pFFb(SM@iY=?sS$!:PP)Qp[tocLUWX5N_\l+c_.]34CMAG_CVS=BdAkPLm2nm;tF=gA@H`1CMK;&/nH"sg%"E:H'@C>:tM"^%qC&N1`F"HK:4m\5XMI1_dS*,D#A'Qd4mIFVFI9cU6^:e.4g.7PM`<7a_IVLCUZu7n?BMGcjY2Ad*B@5t:H,Jc[1;OLeG\(;T;qV=:E*T?85malQ3F#WdGd/^d4pE>1=-\4(/27-6>;iPYm##SRF8iS]g$WQM>):08]>mb\s#@)0!_2V'pBkd(U$^PID9u#:]RGC4qM-fS;Q+#f&aP*S@OZP=ZoE7Y`!0P.b9/acP`2]C(H$)tJD9(#q`95$$;n>^7+r1T%\NR]g7DM9!L1+E0c&*!%iDVoDk%hMS(&H`D^lj[d$JfA5fYH"T,n->E(F>fZ*YlA"hi)#md8XT(PH^E!P;_J9"U\TOmLSM+<0%l/#Y3sOd0D(2Jg9>p7T,UDCn`^ARJTU_r$RH+);[s`Nk#K>_lnM56qq!Y?$nfUf\;]l<9S?8MQ8.K*#4RR5eLNA*a`+sh#%[`u*P@^5kXuqJ_=Zj@g6X=b4;-t`:ds?eQbJD4@$I!Yt6WcH?iC%g=qhYO:(lJKd/j0&Ob8YABC"$fjD"sMO9ZrHlI^#%tLEL\cZ`HrUfRI%f5PUf#0`Dls,!.&Yg/d"#=$M@5h%Xs,FbI7;e$Z">Qd1BB2gdWBgkTNrEce5U>Fc+E.UCDH*cBc`,FQ0#ONsO3aZ0VSLIr4Xf=+=Xf%l5grGcu6,)kWjcoVIW9bH1@kEeDI?o[g!IRpK8Bm/PpU.h9h42mu(Jb@7p8JN7S[KY99QWdQLF`,OSN'"tNjbJV#2cLt`kY42X350Q!sa2=`9+A>'S5qS.MXr=lJe-2ian4fk.KIZQm,KUH4Q&B"24lPn$CU78l-MVD!e4UIZ?&sm[\G:G?i8LY^FcM/3Ki"d->@Oh-Yc`YNZk];F:!hJ^-:]7`f0T3PB>A7fRGH;K>:LBI3@KSr1!J\r$R584Tj;MY8W2e6D/[sr(_W'(E#noh!J2Ct2Si!,F%"r;%gDW7C%l';)?Q9XHNA7>ia6\$[#^(e^l3&7bQ'fH3PRq7/Oa6,q(YLNT@<9j\*BYrHKlOi356T8OE9BY;9AVTNh@S)[k1%k\[6U^7Lcn35E0*Z06&$8t:e!u1l.s6m!$.0(B_t+$WEL'_?)sGU^oa\+hOkE*P!WT?)"jdn9Q*_d[3@6i\(Khra[[.\&?(rdLH^KdVn@+5CN&R7_Iq]YfDZ/gdcQ'mffKTl,PoWF&;3EU)4M.Qjf[i7^WkPFhsjPO)a<[A5!Qj[Q3Babk8U\`=K]<=s3(2Iu?Mf-=2S&oqR1F89,6QA'GU@-uKXgZ9O+Jas@OcDo?r`LUu8l*]Z3)7+7[J?_tIerOU.Fip:7T\`ZLqL/`H/l\b](UX7[.jKl5^I7le+:@p[5YWdH*(V-SGB*\MQt@Dh0;>W#l*9;W_?)2+*O]:KEcZ,:27["WJJIXnB76bt1":+Ac#H+7U3Njp5?j+iOY)jB]Z;,9ZShFEQiM?r7ue%`3\7gaV-k$Js_EaWsJ>S9T&I:DLsf?UPBnTrkQ+&socR$B83LBE'#Cit0P7GlLMWt6o&r8>-kT>ip?rJP-(mSU^h1j@?hcnRd%VFcGl+Y$%-5W,\e9Qi%N;Y(i#q/"o)BCk1bXNM)Yp=l>P28eR@+HCS$gRc_dr1%\JFm7YYG#(Y"1,:PA+XA=r/t0Q>_n=#1Q9B^Ya+\fp>0-u,I6mKZ0HZfmq'3l4kXF#Omb1lJq;d.:EOi2$U?49R*OeXf@Ff(A:6iuUi59'-oA:M#Zda1h*a:K\/0H%cL@ZR@\H05AWA%oh,6^":=kPOoa-Hl_7?J+MTA*?VgObc/6Aj&G+YFlYJ)TG#2YhWCmb+PJ"NC1MG[hC6/daLbU^TV$Je^@"#:m9$`\Xf'?JIPX^sf"P0=opu40RZVLYIi[H?EFHBtIESgM?>kK1Gbsj@lNJB0tIo]H1kRRK_d=k1Ju4,<[WCoip-4P?F>M+m_6J`Sg+a(a`t-G=5D9K9#eSj)%pM$kJVVf\cZVF]i#ZZhd2'gDDoontq2[IkUA7UTUl^8$48#el[5BbHV93g>e-RGVP`d$[+FBYVe+0^lhibk,?WCa/->IY=%2Rpg:&Bb;?7qP,N6m:Jb5DY/6jR0E*cpSt/%_aMaLF&pJQ/HP=q2luBqBf#YY&5!+6Qk.4pWIFZ9cN(ns%Lq@d>mQ62(4=M7p4b4a'=n2hd^M^TgIZVJ*J?`Zq2#lW_Xj5_\>6LM49^FgGWjR62k@tV5\?)K@BH4`Mc(4\qqIH/iI!@okaN4AC!'')=5'?oe5Ra&;93moL`!!khBA^7hdS?<:F_5\:QHD62#??EZic)0;>@@No9MJJfS9mCrPXR>TYLpT`:Jo5pRoP!DmHAK2(htIR1?U*R?kNL$UJ6Hn84<3]-G2`VMj*kTkk4oDIc$B$DjG'k1_@kXq3,1=,VDc/7+SJpWTL9iqTI=Qr?$WueZ8WA@c-7RH=@lhop[T7%^4(FhK.;?^=thUANG?P1c'-B!_?!-8L0CNb(LZ]8s#b4f35B(W`Z(e/"Mn'>jO4GMWj3o9G`"_Y;hg7K]NTuusj'V1$a4_9cKn!EVIP,1q^9^3Y"-<0%k?f\!+ujh[1n!^Z\5V*8GZCFg/f.TJ.Y5IA3I7O?V\&0ATH7fAEZhTW\CDurtl?JW]d!!QcJ7JEUMY)Tct*TCbH_C@QKpUY5EJ?.4KhLBD.RMJOOp[@A0_oCC!h7K?Tin9Qk.BQn'$'J$Z?$T:ZtPm6g))f$+fK38i=!R\ds]G(H6Ea+T+$9[(dL5*,+*lB9s=(GNSB'+P];A`,^:r`m!,HS]gSW8H[D_L,f@T*;0_LHS-ng-LL`(K\)#9]7U\^#M?LWo>Pg\[eRCFcmcDlZi/\0Q*FEb4j;;^P6G?H=U`5r&\"Y$feTX@qC7R)fS0O\(7<[IDl6a6"!'LkkRSBVITj(pBQ>l8hc9al/mB>\'UQTd1]8iAZ'n)2?mlU[>'k",Ru6+k4=0X=(rW.Wb*H!HuWYolABZX-n-lLC@n*8NJgp=U(?5@.EkA(h>5+^c9'NY\?pI!YC=CLr,NRmmM9pCNQdbO`@_abMT\m"(WNn_a*V[0=rfW9rY#]>t..M+]B#IIQ45cMrh,s02259q&cM1I/l10_8sfgELL#05IZWQQa*u'F303@hU_A/5$[D7Z=F;VL1jt53>oi"g^UN#*#]"BK91s3q]TJH4g!%5SG8XpQ.]F7++[,Nku4'^=-P_'9$6kfb8[T4=]-V#W=m&&I9"(+k`7oPl6V60MAOZcf3_T,`a,n!atf[%niEg-D0rhN(cQTT3T$gkcgGN,qiALNF[k1/1#.@B%WYmiIILpl\!nrA0&_rR\?X!>g(Mg$II^htPEFEVD=o&Eh)]3fN)fA@1r=(2E\Z+Q7"Z2"GH,*aK/R^/k>Pea?k&SJN8Y#NLlF\PfSiY^oE%fW1q%!3Aa<4";js8F`eQT69^+EdVeJD=F7B!nKGXe_",G_XY_R9S#*Q`j%2$`//mA\pj>#ri;6On[:uG%+S_CWsF\a.=il;A+Unhcos0(m6Sac*@c):AH)S4=gY`%#hL,GB^GmaV*%11Pj6=q(OYe,uABs19S6^5UaP?V0!**2-f,(Ph(eb;\P8+2*Q=(Hp)(>RqR#,c8&T[7kk'JJm/1$@GQ:a"f9`&%G-NKCK+ofR<8_rc;AdqlAr=c<":MV*%h@sQ._Q^L\qUk"U*ln!-C-AA@md-ZBUX`%-C_s*mI2pmj+-mlUspXu/6fn6ESE(LciJuLZPf=`f),i:Jec(_D",%qJ=&6**Igd$0r8CIQPg\JUJ=F5-oB!ua7!a"1'#BVB^Wb"(%04c.C?IXetn8$jR_`N]/7T+q"),P8U>;=:5Ro8.]9F#C84K8V7+APBl9ES\[!+)^E^+4W4JLYE/5V"7EhO?d]X#;hN7[%YUPMq?Bu__@W=VRK,[:lH-l@CWViO=AB5\K;7*WO;5?l7hVf6VX&Ho)[[PhKkN3O"P"EiW>(T'SXse9q5::\&^3[t.(.L$t)r;[BT>T5sL6ur[2Ij^ir(QGB0q6,=R=7>G%B.NsWtd2Mpcg.ef;j7$aT2Vd"eOH&ZX:*"Wr6&`*nZbpN$L+5=R^.C\>/H#eHfK7Eh5ZcVOje_h6f?8'3N!2Bj[B`:(f-0E/YUtDL`)cDACBSG)ZU^bum]1LK6Q?=_d9WXun:l$!A_H&e1%TkuSd_Me#5_BVZI@Q*j8k3`65K1oq4&.eW>fZ^PhHfj*4l7bTZ%QaZ>d%[\@8;_11'X\EYjKIKVGL^QQX6S&c]\iQLt^+Knfd^4@tr_V078ZHHUFWr]"fqJ-&H\]J880mG)_QMmp)/i)gk^4Rtj`D1r^nAfRg2#jIQBh$2kMS&P]/;#oMFXC)6DmN%p=.]MH:Ho"DCiJ9T;d-M1qZV3>jCjLi5[li;AimFqkK(cPEhEAW@XW=gQd]B,q'-oBBid]J]ZA*JT')B-mTM[6-`C37`eY=1A"^(VZp-ZT6kf,3.'s2:p>-BemB*W7)/3;5H.S8GA7Rj"DJc_b\r"7]J]NSO\MP<8SM]Jl@oLj3`qe!k/eeb.BL=gnVPFBL'&\*Gd@%Je7(l&N0e*n0`_]#TP6DJ,Z!n6lldEi+^]mhDEN&SJ-"HXEpuAX`)QhB[2.lB,)?2F\5GN&[BQ/h&JT_q-&Y?b$q6RJg;+7L_fr@m?)?+hA3K8/@-UrSR29$UmUQ%/q\gS>CkA-Iu&Oo]gZhkdmVi!qFFPFj$g(YGm@)=DI5@iZY3;/0nZe7-ej[5e8=h";5*%"0AVRk[YSYA1(jS/p4^XZ84cbPZ`G8M;9MBo7Ud]c?^R?.DHXLRjoN-Oc$Zl,>Dt@h$\(S)o82/FYhueB6bpb`]^F\a(t-5AaO,#WM.#_m=Au.rbihU57d5DBY@;oOk!57U0OB;N/+>^`/,Ic#;8qbP8DW"ALm-16PO8*hr>Bt5-ee#CuA3a656.$!^)[RDKW/M_[nZ'o=X[I*,iG>jg/be_iX@i1r)]Au`8[%]2Q#n2Ej,g!pp,3)9)C!M_oY`^1g5LV$ZR)Qrlfom9&E.iXV@mXVI'ZW-UZ)NN1MBc)f-M#.16Q$j<0Om#fR'.#-4L+_G\`""ehkKD$%N8Tf_7H"i1H7cl-$6&!tU3+IF;QHPGG*qN&*%F%>eSl?qq_OnTk=:go_-6MG-K#C-fn'ED\]7LV@(Tmjbe\l'8^nc_KL`i=>fF/!PqX/!Mdd)K9Bd4(78Y=7(LLlohS_W]&50CeL7q9RSgIG'00t't]t.@El6Bh.ec7cK4fgriBhQC7n#q.=GOU;Nm]H>j1+D#LKb:T2fk\V+ii_6%cQi;0c]JZg'5s%[oodYBg,>c];Ss%Uu,#*$GEO&^CrAi8i2U#C"fTPLWq7rO_>Le)?X*h`jk\@G5hJT6qT;#a;OS2eerlIja\o%+-(!-3KUsrsuT9RA=Fa`kYomo_e[BqCCip>f]Q1qic739I5%pR5WG5i)_@`YK+rV,iCA?E'r1B,KT87ngI3soB>/p8GV/=F;Fp8l.>>%mr)MQat]T&6hgKFkMu>_Nnc!`YGrW^Mp-Hoe!BWM^=%@Vb-OgmjdYc'T?G*HZCl+M:qt_l@3b8XfA>*:r<0i`V=E'ml?G2]t?!b`>H#)r4V*W'e<\nqRC!L\Gl0\?tO*'s`rg]J&rEhCVe;\%N[,%m4#DZ(]3j3.Za0VZCK31"FCbA3bQh4j:bB`T4h3QoX`KPXbMOaN_8M/@ep@S@i2r%'o]:7luqmpdcs,l8hFahHoY^[(2$?UpmgrPFqDNgKIp*%J#C;0I7;cAG^?G?++;CB,GC.alD;b;RuL,s\iM#,q#+Gi-/IGWLi[@tdA!#GctW%4WrlTk4Ef45QI!nGZW:\&SU[=21qCIV8O9.:S+j">PE9NgSIjBY(b]5eip9E*Aom?6,G^Ibe,?aa_5YLVTa._.-S'J0H\F@S`Yeq:`(%h8g]RfRYch^BKa.MK)clS8ArRhG<%3:tJSVU*;>O6Ab>2/NA(ERITQ4au#kNH9najQap3ZaLV5qch6&]1$"4rm#^R@UTWHZFil-7PpDkN(3:X*a$S\IR1la'q-g?cVMM*TUk')"N6*>a-RVlMJOVT\u)Y3u=l[[35es4?XIJoqkuS$?Zq$GX`?bNFLWdN"pAqXbY_Ul;pD0Y=YnLKUMgOKa#+J65FjlTb'Bs/dU='HQj+%J&0:4/&,qHFo(Jd(rJ_sOo@SWN0D+!6*NR$TPQ)0L_,r)FXQ(;chJUQlMSBQ\N[ZA[=Ijk*4gEJXSMZ5QBe#s(7cU9;U>LP>Sa/*^'jR^EF2]_gqgB<'5l8RlG1t!>(;;t;ePp@PeRl2nLMQ\U@$U%/Eei+?I=nEB\L^gRGu.+f1a_][&GUuYq-n,3^up\gOqIR%0V#YMK))02M'/IZMbN5'iPU,YD7#^Q/Jd`;(&!Ze*Id73fNdhoo#Rs$aESb5QD:bP;(^Dl4gJnJ6jh^"0-3"/aD67Qg*)_B>$ZWdioC1.9#-pYI]F1sdghLR-mBL!l\+i\"39"K?uh9OJ;=.`""[_Q4UX6:@#O/-^XB#aN9ZRR:Oo!:(B07Q!j/L,<#VO=NXY0gVVh$8_c&]Q`-8U2=U,C'AgeS0\O-rtq38OACl_l\JhCkd]!)l6McYinLjJMEr[=sTY5ml25q)C=^9,FGSE6G\Tb2c)4CF0;O@-lKT8B(5]tLP+r/WM=uM;07Ni]OS278eDT.s.dd#gSF[$O594#54I;;FZF]9kn#IuH]D?2gcdh:ShhG/,X`,tLDOuVU0DcheYbm8OK6Hhr'`3/:;s(tZcM1<&[\XMj\_;4dPO86I@N9i[#4Rp1M$KVj]Lt+eO:G`*0a1RVA(^n=YiU"5%?D9GWNX@o#ApEj$BOG_`jr@p$JrrK_7204U?VV>rBK43T#AW3u@+\-oRUaLA0i0CuiPIrhs0&8&sjVn#,TLQgMP_BeW;O,7$d:=+JnZ5$,4AisTL+3sFC`-'W%*6Gn&;#]9fcIA/[@WCf@?Mh=+X%kg`o*nTOhd9n;'^"c1!#0[PD>4`Fm$p?j4\S%k;eHrEu0H.KJ>c.;7CXF[_dtKkfZOCaVbZ_E4a0.o8aQ`loP]:1HKflc:F!tD@>([qB'bGkr.thqpG'JqTDbTcqn4\8<0(17uSC$A0Al3[Oh_ihROim#5C`HH^L)UTp$"c!_"l?2$.tqMVPG5B7j'jQmki;;,n`'p*`fMNZ,.qp/-JG!'rQilAfubVV5[uK)hVD/+ToZ.nXGsoT[Q@9.,mdT]-/OkV,M8t1t#m_V(3J8.Qt>%E6Yu3.-71f/<.)$-&UhF6%Y-F'fBG/)GppWSUW#<-:j5cGHqe-eJja"ql51@p)N2@E7OlfmS%@6>T`V:9G06!F#45K(_rt`N$Rp\(*=\K7!j]"R!`)N3\ia1q./'o=Pc$3Cmon1M9J>arOG"B@d)j2OE%Z^3>PZ#&qJ11[cRb=G>5f9dDN\eA9'qXPm.d;Y4ZXBLW":DKFYo/U>5T@S@V6\;FT?EMY-ptUB[/H?-THq@l\(+9oZG.4s)Gi(D1q,aMJL@/U%C`b9r;u0Rls5O@s=p@KWep/qQX5MYiD>%*DF0&4BIHEglcO\(>t#MGf9CkH=?#h/_deqDQB>LlE7.]qT&d;\#I7`/^WK/":%AN"Io$5&?LR_^QiP&kQK?LcKY(B*OZBS\ka:mThI6?$KdcfPc?\dKjpSOb@3TXUd2W&H[3i(YSsW8sIe9Z^dqMaYMP&NBjr+@h7T\^50;@^)Pm.du,.aKTPGh(q$'X.C),`7'Kcb[,?jA_N,L'+/U*fcuL:l16r^'PnW)qR(LEVR!qVq'+/UZ/IjHfRgg)ca?$p2M33q#F7\TOWEQVSCe+ff[%.eSi[bTkqjdZe"22l-h7k<\R4JNS)VOM^uDXY#KP2het.f+;KgN1q)hi:ZVdF2s1HJP9Y:E61l;'aGCJPne&[4f>MHa!%=b.BuaPk_.(%=oNiSntC,:J6%T;f&_i25U_`Hfd;C=Y,EFql!ILOYa&=R\4V^1Mt'SgM%npX/3OoS),)H$P+(Z/A,hdnW.MGQAF[9Ls;^4n>kcLWmB8kn6l6chKM&\3q7,6dB9HoTJZ;Jc<1@2Sgq8K?9DZfE-cJNa>VZt8L0$Y/R,6QF0[0VVLqFGjZ3Z_.+U3csH#Iu1;WRUk:]'hUlUB_!SE4\t4=I_PfM%mE]MYTIZhi!pqmo"LZEe#(<8Mj_rs^"KhuKVW)XN/r>;p3cSIs"2Ga;BUM0$5*t<&nE8N9)U\,g0Q.J,qP/@F725hD959="\864X$iF!24!K+mk$I0+-6%HFBF1kGCpl$Y(2sZRij`87adJGdkI],eGuNf=%^BM`es3IN4)8n`fouLS@VtTprRk(DU-6q.U1M!L7u*/EqJ;KLmVOc%>[-N`#J&^pCu]sYYR:5^MC*qbL!4sdumEs!R,esQG@9-t6fOUB,@d@r'mll;@XVu2EX\7G%pj`([HP3>[0afg+0DtWI>P30[Ot>o8c0!=FJS;dRf2Ll+4?0b`VA?b8mgXC'Sdhlg@X82@-#F,@%&Nqu,qTHqHnV?3XV#_l@qi'O[pFN>?<"ZG<$?0pC1"SX\@^<9<(o?oN+@7eSSl])q)dDh#U?[NBEApkG+!*t-48dQd[K'?7oRccI-0L+"3eb*_i>HkBkSOJ3@6C\S&RWn]pn%4EK+^7RpmIjbjDcM?e7!OZZ(4;E]Pjk+.hr)_+$i#aAQR^),m,fN)\DBD3:'L)85;oocAo`Q#F$1Sg"iZGE1H[/PQ_uFgYgQA9EaBT/gpSIP3+jP0<\fLiW%\G(%#5'XjO/]CO/upgneYls%>D&g:uSf]=&'h+9!R]b;HRB9ta'A=9t0IA)MU`g0=?&2A02$*^c'K]s_%<]jR47`j_R/`%Z2:!6MEmE*t!D>k3?KFZ4cNn?bt56KkZ5gLHh"IrS;ltAlGa7"MRL]^Y%M/sE/Sc[0hGj;?_6EA`N2[?9dN2!)2,GMGD5&H7'][CJR3pbq9D.9*5(9)i4qZ^t<3+L$6rPaIJB\(-X*,LV4dOlP+<;51t2L`/cBa_+_3:1Zc]adj`39a2,3ksZt"Yo'DjY1UOI0VBDH??Ob2Y=?7EoA#3UR*#a//=etE?)>X(?6jRsWjJQN.#)I;"CXlJ?*B^CTqCu6>KR%"+##\:0%?>9o2!E[1ZH]Q(gEU$iBW#bbZI#E,A=\.VQs$eN\m]IhG:$[=$]=PH*\r=CDN/be,+mim[E:Kg>nqG(IT):I+$4MikG7&RC.$F88"O$uZTU16FkJjj3`kRHF_lgs?;X&`qS-mG?9*F^W/gaj?L<5k;].:(e,+ZC/D5hD_/"p1SqNW_d5CZ+%=T"!9X(2:cj]l`Th(\8=#>LIJ(60Ag-?\',1Ub]Jdj)!n+/bAX-;QapQQ2+S['[DKq%H=R+WZ4uJ^/\OG:JU2r5i[7N2^4<+I&?V#BILU^;(BE:=rs\`:lAfPP$967a0'['J!Ve7A':E5;_P^la#YPhk0`d$]CXbtFafNj\_n^YQ4A%*n9IUb)Qri[I=.BbcD,B.eXA:'8U8nBr!/8[?UWW$Hu#M/3^)0o1CB&Me878CT'5Rr-L7,Q35`-ZQ<%tsS_QAB4@`0W7t4"CHb<9HmJF:`dbJedZu!(_fO6_=H.J-H`i!%*W->9:07/@g@H5frg.TKC%c&W:_QJ3Ul$@]UUC)\pmRm+uS,3*d`>q\ET0E4>Gen"=Co.Xj4*0+YlJF#?%2,7T=2B3$/[$*$f1N#PD=oGsSZ8\HG\7k0f2\r]L8q6h'l&HNfWADT%6L>Uf@p^Mf4O;=F=P\@GM`blAdXc(3mKjM,ms7M"[*RiS'ZL^4d*3HSs8@lLN>i&]<<5hl/0?S'CD`Vb^[I"IN4l3?6"SYWL%\O'D#J0SNWZJ=_7]?\miUKTudd]$A.L>-8eeLq4F[!LVXg+^Cm!62g7UHW_c[:hV_pNAoF]9L7-P:eti44D/e`6a*U&UmoIhP8<`L)4+In%1ZZ1q:#m:"<(S0GItcVmCeP7RP"#X'^OaH"2.\GrL+PVd.?9&Y5`1VoM2D;KdWWnPA?pa'>H/..'%\dOd6%ed)klgNO34p(#"agZS[TrTeZ=@e;\6*b+n(W4pIeeW[X4*:2OqWP+$Nh<%t2Ekk5if;0'SR5Fm**h*iTHiF;_B5O)/rDBI"(:"*_g&&\AQ4KK:jXEqEBdBFG)c\FK$\PC@^iN\1'O`cf1FRBDe)h&Xh#o?M4p,jO=7L@SBPM\@'kGtbR3f1k_U7O`\XFn9siH)LaD@9<'RbX!\OH>!;`-^LsnmCV"pUJlA648%$!jcJbZ'*h>IIRR-;Eh;([E\?%t;QQ=TQ\^tqE>VoHO\Yquq^oBiYY,/OE/]=4Y`,S6:=0dciGM_k(8:Ko3`=XW&Kedp*H?R)qMY5$fouaT5/JWoOgC%+oAj@YOTur1An.!]DQ<0"Hm-JL3r>.L[rNk?TN_:CgPs"scSYN%Z9Y@;!?Dk&(hj+,9jm5fY=);X'12?aGY,rm[RM%@$]'0k-/Iq$L9L:*)8)-t6fmVHm/m:IMcf66s-J_gk4eeE6PhN(g[nTn3-pWdqCUOU(=%+ENj2\KR14a6*PSB*,#qUUIUYkq"G:2$Im!)h67qnE6^?Y+M;K?EZ,$\JdqleMg#^Pct1$,(%DRjL1c"Phk9-NpDO^f\(\=[IlnK@K%mMtirl?8<4\KE+Zf=sPtFp*VRks>,b!-HdX0BbWV\Z(S[]h[+36<(TJQ$8*6M4Ng6q+@^mT71I4Qf0-OU#A4]4MP(,^>u!Jn8X(.HO2CdPERiakD/Q1A%C%;$(>kO?-,V5fYETZ4hp+WOZG2KSEuOa*88Mqls#'FD[+6h:kk3"pp,SZW1.KrH^0R^P1OD%NQYBjfg:jn-G^I;&#mRBMmiAsr0BP%@X2%Ynr&X"8Lmb*s&aW5T)T2cT/eKg3&eW);(-V0tr=3G:X=o50922;ia#)pO-s%8!Gu?*9/_;<^8N$m$8?$OGHknf3!lY?)ML?b6Le1WEO@;&37XBDcV9NiHklIOjCMFc"BuYmD`;;mF>V$Xd`Po/*63EZ(3=SmP@IDP)[YiIZ][B[Q&Xa8tXD+-d*'dCuNbB/$u6uXI&e8"%#=Tgc8:M@0dq7N@>_fl5'O3Q9`ik&:67Q[q"CUl07CalV.slem9e4W=kE6nrH&MUhX)5ICfqP5IQ7tWX7VgLJ2.![tS^I#IjP,(jto%FK54!I&G9t:DK'"To8Zq[cWV\2#=%[DD_l7:b3gJd&gstNjWVA*?1HF:PImoMH5P1Je0f`-a#f-S@=bT%[OC\gZRqXkIf4^VaYp`/hE@mC@e^eti%p_p:qh?-3*-0lGIL$("F+Drn/TN5)=&\5rk5Mg1eqp+C:?kXl';?W*FG%3`;66kND.R>%a<\a6#?%?u!]3Za=dhi-&Feg/#F2(:\F3Jk<\=#PD)i9#&7L4qHeJS1@A.tWrM:#W`]oKjsR#K4p1DkN)bs48GR$tY\>&CX]V\gPGZlnPaCu8XgKI14T^F%B=Wt-H!U6p=35:(cP_A!975f+7TXnA?fMj)NKXE0cVBX*9Hpmb,9;d/S=X@H:_cO'/-M5<=qI-gM:A'g[e:BIM/RJHjN&4l[eFO-uc'E"Ee"4tOl]'INo"4Y5-58O90((;-M(r+rm64hmm$X?#Bds-dGgfRg$URk1eAo-(&*!M'<\i0:0Q#fSE&W)'L(cI+0Jg,t=*,of$dDiK*S*;7aAb:TkU.?pp9*80@a23TLFIX2j`l=GZc`-l&&b2s@+b"*FdV)Y+^!M(OU-]4[PkTtF5X7fXhk#:#.:BKqR>@tf,?dlAHRQMFqac,oR2:F].u6Le-lNXFZOhu?1>Wki[7;2C^hQ@'FjP"ho^UrpXCFd+:$aM9GE,#&_pbN:TKY>lVE7-k5]_RDC_=,N50?-T`uXj3ikmr4basg"X6YFgTDGHGr\\Wlu7^l#/hG^]X&`]A4d-2.(8j8jgM2/d%K9:(lg*Zf4VcF7gYN$AhS2qlCHQo<1nk04j'(XK2I1o&*Dr7RY7iIsE;f>e-l"lJE2V=aS5=*@+0VMOfG.A_59iSq=ETR0Aab+9Ck&&Zb/p%>"(N1$*8[oCfc^O2bbKHs;/3(8&,gp?rWDtd+cG8W*Jc[.$QHD4,"CZ9BG)IMsQb*d9FKpS7Ns!6[OFIOLWfH;0ks,i@?-IN^!7^KOEIJJW\FD-,BJIm'3?eT/>\S6GM+6;-f=,2E][8j'IO5Omi7n/_Ohi(eY--:D)3P"f#V\YF+KJ\OnT/HlIM/P!l2Z&.-9rFS-WdN^$SXkudfkQl71a(Qo?!`\@c4Q'[OgKokr)GJAhq;5mbSSeVJ%-?Fr9Kb++,jMqLA],HCL+l=M02mgGGfi:+PcsCQhKPOG2#pWotBU;'@g5iPl+#\4l&uo8klsm#0_['5h9p.,&jB[?kEGSC4G%:k*7QKGjlb:"&?u"W]&%I>!#1>bbOJ72AlA[gGG3IH0p\NRf^)$s(EPW++*jsCtV4!)A'l^kd*dMAiM@q*8Etsu;K94LA8U%A_=>E\inN=A]2Q@$$JOGgg0-440d.6jK>^8Q+T\Y;*lB<'RhH5iq%MGS+'U2O#N9qBAD-L@\OMF_A2+R"GaUh4Wt-#6-c:#??Ih`KmNI\[#ch@`sn2EjM$sf:WLM8MlNsWS=OilR,%;"M6E(%aZPgT;P'6,NTu'i),:d;=To^0>[lrOGAd8eql#lMtU=Y[!9"Y].D.sfqQ_,8][889+[%$Sb.ReK?bV.!=mbQZ&Q<1R)hu6O>Y.fF^dY2k9q":>jm_kgN:quL.FRkbYiZ!%&"_B1/Cr<68npc.Ap_H7__EP32`)Ofc8.`N>GtOlkA[Uh[QPneP!aGET19mT7W$UXDfC6D,n2pQFZn&*`0r!N%'.i4nQ]EtRZWlGC;UBfA)4$J/3a&Pe=1WT?AtkKS3&_OYrXerU-,Q[$W/P*Klr]EcC'Xq3`WI%il?pkR0`1KLrds<3us.D0D9VN70Zn"D!X-NfeDV$N+p=k&fn#9BC'.8QY+G6nBb_HAN*6-RJR:Y2.`P_aL,&+m:"*CBiAW;OiE>n&M,KQ/\o@L#!mSa>Mn5]eg>Ar+`_-WK9>!-BMRV`d`A(mg;2EnjEA!%qWJ\";\Th.j)fK]KH7VmGXX^G`0:DEg;".(RsB\ZnoUaG.*tZ96D(,=g=.OdoAUdjd<@s9mDJSq\SGaK6iIYKJ!Wj9qom[?^G;s[5jl2njAs^eXoiaU)8-Cgol.Sk#pMaf1U":g0Da>!X9qP8.rdf:`m09H&YHLfK<]-;[@;5&meBN]3gDdJmrK2^nE\f;[uSV;if8lSV*UoL?HR6F.73fIu+(>B;#!RkbfLlgn`f08)c-(7[.pO)7q_e,Xb>N+Z%B_TFkZthEU5@7%_'$)@<)Y.V(`XC5i$^O8,?shI2G:f+Wei:?BHdU?+$LR"As/$%j,lI)@>#H'ns\VPOS2O\#P)>X?NL^pK>\#m09-NaQk&01Q#r^Qm$YgqjQGGu=NT0W5jK\3:S+Ff/mUTZAuJ!&r(jlu297[8\%V'p-?K2j=Po[n&ot[VCO7qFD]E/NoWT3!^dupY+1f&!cNN(OqITB'n=qiQX$t#nB<+11?_/JWB-E[c2?1_)@MY_SEK=1T&56a>*PpZ)e-VUaPiV+Ck"_dSd4&P2>_>4Mu(j%4XdRe#W_:S-HNCK:$K?+2>2/Bq]Q.K^l":,/EKUHk.P3^E-#>Kr[bB\Vh5%D<%E,H,&6hGKih8*.29KRG54$kVbR8!F-:#,ouo&Ln#)*"Ybn>Rg3:(o>%P$]?8UOPLOG;,f&>'O4$BWW>3)GRSe,UJ_eogGjG`QdDo5K8rFJ2m]/3:2qPC`aP(-H"U_]o4b'9V'V:f-dle2HZ-Z4j,r?:lO/T?o5bk25Ej@SC8./@+H]Z_:S[(gADIppqPM;P]c;Fd$7(QXS6\X/:si,b!K[Ho_Z_Rp*Q;ubqFa:%(O2H/0K;c.41LOpn)bKJR,s(&8@L;>G*bkP,WLOJ)>(4f[UtKn#hcH3+BLW7,XpFf7*.,0f6u2RY,Kb.`c5Y'i_Es=mU_TLj4goi+R%W:#>$UGP7a9qk>q`E4]-H$SWJJk@qiiUJ\GpSbURVQ0?eb,WCVoq^g*a1:kf3oNd^HoO=4oMu:iRiZ;,!Cg)NFEN78jA)GAUB*d,XK:dfg]\X(-/a"r2qk:\.X:dY\38qrmt;iDo=6rFX&0HZQJ"#`E#c)V:Xi,;R];Bk-U@feG"@=jJCDca(]PKt/=Ib7FqknJ!4AN>a`(m`HibGE)=Wng`0T39^r;G"n^9'72?09D>+2i?9FT("i!(Z86a,,l1?W$(E'75[iIm.#]jh"Q%%0hZ'+_`JZ*ZYQ/P*Hs2ZlHNNiNG'*bc%/.JbBCDUjH`8Wo%u5egE\qF*oYkOWK[g9;7R`fb)eVY?%EE%jW;L'R[lGnFFaZm>88hZJL7*f.A?rco#M5-Hq.a#+*,FrV@P+le:Dj;_Aj5k)Emd1`LPh]D"ML=._;gd>:SK&Y"^MePoX/*3q;KM(-6]tY:olkdS_KppM]IMLsm=(!-DqiZ*SecTmN)Rje]=QlQYgKn99MtVinB-_@1;bt^@.,Joabc%^Arf],J1^m@Kg$_!b_uUZQb2r=]ucpZ>KJ9J@.cr)$0,A[RL[rO,9V,DCESni=qW)1KkhiHZm"`K\+$+#PDjsG":u'VEO6@46;T`$qVRV-KQsD1XZ5Ca^Oa`I!U3\XCjsUr6T+5C$T_iJp<*]QM'B;o0pS+jZnPaDstJN,Wk4lECB.:BrB_ZofFqp.Vh3ao_O4CNTE0<.3H.H2mE?2M#80eLAcqN6B:4`+2m5]'K*>c7OjsB6e^aNZi-s&R/B@/.p(rgh#NBi_Ou4=3)IW[TkFC/$gNIDRn[ciWb.Dkkfrq@`iYUGcG,[@M>9L&3DXpe^PV7SFGDP:U#d%K[89JZ')'50QYZ%Ld'VH8ZTUNY;hj7T&6j-@dg48#GZEJZ7`GCPK7!Mfn=c^?8m(A/o"t1DJpC!!_1dn@L7^Y,jY*)`#h-D%Fmlj-tqs-\1:TNh]K*%*Sm3't.Hodp$eN.4)KJZ(S,>:hmin_m?Vn;UBk8*.U/$XbNotpTnfT3GQbj=5W(?]J-d==g$?o:G5PK3Wok^&Trol8?#RG:m-%m][9rg][rE-0hq2[%\``h8J;8XQ&dhT#ha8K)EsIB.%%;#h,/rdI%Lpm9G'F6nCL=)COHr-LaKh'NaI?p]_n9YbR*M%9ORF9G[sF*hL+'I:m"P;@hOZn,q;I=on'CU]*QI']=;H5#meHMiW>P+5C*0'S1>\LQ=$0qNij.%BjE`.CTjI[m*ZT'#'^((G@^m1=Fk$KCgR1PP^7ZSJZM#in.4pDnnR40l.1F'%db7aQsp]K,>Y)]-*HWu+SXl:*=r%@[q&&0*cc`]@7T.S?(U;,')hE.kJgV`hM,sa9\kM?;;Vn%c)`kLHfaZ>T:Q'Bb)k(BU`th6q8g<6*f`m`'c3dG+&V@k4?U1[7dHEj7:Kn.?H\;>fE=@31Jtl(S[Ma[n4L3CU.9oNt.],s,7uSFN$2jPRolQY5[d]@#\sUD.K^Cp]O'K$@Q=dU'eHFTji-'&:`#o4+%K[c4;Wa63!#?Q`Yc]uUj67Y=dPI^Ac2ea\,<31%gMfI`g)j(=R@'=lh"g\cAXuiIpZ?Y^eF1)dS\"CNER"<#)3PU8L6N?C`>FNrMd._/0+n$T(n9WH&pP$r\Vn/AmIKRagBYb0<7O(`X8JTHPIgf-%-Yt'Y!Bh.=AnZ8IU2r.4pj)uId)foCoj(rmUg(H4\,B*Nd:<[V1m'D\V,'YNf`2#,b)Kr0EFIa:+[,so#61u`\DuRbJnQ.A-)aSIn*kG$i,khXlXTHS=7@nV8lR330h@0\3(o#ijedb[/WU%^W^p"o&sQ_O8*.GP>3o@NW3VTp"ri=\XnY<9r$,YopaH,n>pGZ1m8XI]>YsT^[\aTJb!:C0:*lTDC=PoA+iJjZl>-@k22G-j:j6>,?)R;B1/MP_AAH^si'GT@/5$]2ks7/1uKHgA%IBXE7lbP\t]qnoar2I#K''0(emKC)'-_CAo!M<=^fV:V3I]6V3'B3X@.9b-.+:dAR?c?/7G?^5J&rRLDH]UY!ciX2fh?Dnlc+"sOO)6m$p0+%"T>/:>KBF,:u@6RdlrdW\B$J^$HiBBZe#c*b=M=lhsH\n8oHaQ&C52BO'Dgb$bg'T(uDYn2t`?#`6m#Q72e$Y$C>KlVW!M8R-`j6l&L.h2<`[G?l\]SuV=7RG>q;UGfa(MW'BnMAhTl@X,@t\kn^kZ.3N[BM"IQ+[l:..('/S]NtPa1jjjMj@.fFT3#ZlalAB?kg=Y2+ABd1HKu2VGni*U%s:R(Q9NlNO(pOpH;0".l&57QPL/TQt-'f)3u8ik$CTY!5SH[$b#/E'/cq1>c^jlEn'S[[1m+^p#.b#1;uFgoN6(h(t`OgHm'Od(-$:NFe(?+rQI$C@'gH/2ImB"."1l<,@,nP-iVuJ".%hZ8#DibCB'A=V'*Q`,Ot+s]dk8\SBrq:ls%gi9:FkL<@m+gtK*aa3/3&Z^HC!R**m[%n-6[#kqAg'uf.?N@7KE/BE>sa\qu31hSA"rHd:'BM4u9iAFM.QW:`c3f[1oj4!D!$V5`V,4Q2.mHKgH+I:mgZI%Kh2$2Bt\6lG66[B2S--#-6!o;]HYpaOEIolJOohe6+$n>]ujmmR+HH)Ad2#9ol6s23h.JCcs8QGn-S<.8?+!G$qlIoaQFZ&a)J,6XP>2WpS(In@AD(BRpa4fMj'kp/5fB3"Iubao%apd;#6[Rf_'gu+J]nm<=b%MZZ%8s8YBKj.ip]@QnK@;)hh5rkchj_[ijjR`.YaLC$0Tnd+[GaDgNk0Y9oSZY\MnW!E\p=!*200Ki"ZbagnrFc@pdX-j_JM+#F2'+GculgkJ`E5f\S[a91^f"Z\M3$dR!FgUkh@a&r%Sd:9ARV(*sL6OFbinq&j3n2gWhquRsC'e4-'[.E&qR<1>S>."VSs5n)fB:MSm/8C*mGBk0:W0Pe-5FG<-;i[Z?`a/#,NK31G@6&L?a;WXH9O:g/I()Nih)Z.gVq5;hS*]*;_S=Gp%:%b,2IQ2aq_Ca>0YGF\+D"(oW]=c\Dkh$hL)+O/VmdhsgRhI3"jV!pCBkn@G7NX])@Bs<-dVqt?IMY68_K!uE"2IPX?rskY%Ap(5aP0`1dF"K%;%]HbUe:_!W7X@08=oPK*B;=^%Ft?#jM>L7X]!oI(m`5D-3)`%k"h$]#%kqg>@Slgt_qMopoD6s0N_E&qsJMpM1ditag,>rA#cOqh#;REbHC?N"c6gqn5m5Zq;4H4'kfZ-"If/?m@<)4`Q'?pH^LAmFi(fcb0m/e/c=ppn31h=e;*0>8A#g(HI&'%\E9aRYh>\gf7g9t)kF02>dEX)G=SF7kp;biF-@3:=FdSY7__t=hg`Oj#4F`ue2d@[VdIjE_1TppbM]c-ULJ<"OAk'#$mpu]_ff`*Vm\32;3qLS?&aP5SLIS.m=KB1>BDai/,.qu`Q+`>?J)/7$G_,YY?Crn(q)90:eOI\L>a_(m*HaU_f>*or;6/\.SNuA^3n=NFrA#jG<0>G\.A)5FqF2UhSQ$\]neA`<.+k%l-VK@o_I+#fbhO,cF"j,C@JD;*Q(`HtMs%MDnc13?@?#YcKc2-AY1i7S_pD.qh+^#:9G27H0^r;GKei.Ai2lVF1!A-?.@8$/O2*uArc9]r%o($X64rjZtk5f;UZ'@mpd-[-.e&I&bYqj2Aao?'rg_gC#`^;fDP7:eY*s>0>X$1.%V-S*h3GA.dB8CkQHWb%6:]9uFfs&,P?q-Ld^Yp$Fp*i7G%P@i!O;Z?Er!Cu4dCBOf)K/]o+IDeIN3bo1GP;bR\V`)g4GHId6LD.F1Li7_'a"SO.X[$i$=9QN'#u4aJ$Y^pqs%%?8RqMX"$_u)$ml)MIU_\/dm'Wu,o7!)63$*`bNFB"3J!Ai!l8?k'7W%,f1LYGd4@ICq+(cCEFA3nNr0*ZJ67tK$2M*un-Zl"soL/0<=fR!QXob.^j4cQR8Xr6e#oADWE"@?DnKP,]ks14lpfuuA5WFOr-b[m_0a-i$He-W7L1qo5Vo:F/7EKcI!nI[nhp4Ah.6r+PdV)38j5&,F^U&$7rV&g$3LMma/jF+0@S_$""MU*D5)h[uq=\)jjSOqp[>>G4X2@Tnp,@'eaRp90D5[I!>l<>B(R'7:fRDkmu0LR53*c=f1IB9tCB5PtGjB%S['7t/"*1#F8DLCR=-!MD$.$6%fQKSWYEgm'7CX0S/cp&jeXG"CPn['@sOu9qU-_s>bH2J$q65OiYhhMW;m"jTioI$(]Go.lC^7Ppq[I)fK4FFiB-l]\%WAldT#/7C+>+F3IKJ_UqA_1T&illI9ZoSggNXt[j8dJ,eX%huj^9L>/c@(oqQQOCn=HZ3;r1+HUP=687BT="g47S$(q)N:49SUcfmMq'cj@,d_,I--^@.#N3N?ie+c^<]^d"$1W=n[8TQqAQ:TogceFDbloe]ZsVY6Vk;fq+Z_*0r0jbB41?F-Dko1OTH'Vc+Ki]6j&#VT7nd25c9]*iEU%n`i&)auLX=]c;kNRW$;6SCd,qcX+s^UckUs:JRi1P,]V3!GA,I3>%4I@JNE:WD0*+KrELFJKoA!Il`i'jfQEtmUoCW2r)=s4*Z0u@I]7@#,ljrPFu1r`\q`dV+_ASsSV>E*OY?+cl"6r.hVl/53`0:`@$?%Kknf\@Gr/>1uu))2^B^.<@7r5]NYB*qe.R>^7DrHfo"SUW]:aM?ub02?r%l-d7"_tGGsME6Sco#?Z7@TuBe-;m1C[ai&'WN`J+C:)M$pgLP8"nR9\#c&BFb`CC\L'-&Dd%?Xa68k1G+@>t_H.b@/TGs^[#(.W>!;OBuDS5g]HKd!4a8UL4HfKWb[n=V^($'(@g..F6UqSLUk)`"<\:m7IP3%!@(=P(\Rd$Y4Mgkpc>WQ1H@K7DH-MaXG3H9cepEoqXl5.ne4bl"s1Ku?#FlTBZ(Wj/ftl0L>CLN]h?5oHm_nMGVR(5p,7$_o;$!AG;?D"W/JSS`qee.-&$R]V+Ur$QEHXo`+q4[CI)X]nq25Yk^0/[LLP$[/(B'!e>riYV+NGa-\i,fQJ%>AXDu,6.50"0i7/0.'GciZ>.PR>[UapPqM]QWF\3t#Ib<8N:1JeufdV!6,';BZ%nGP.[gR0j9>`mnDa/W%e!V86rkri:"!A,=3md6aC3&h+>n"i/hflLkTq+Q-)e">U?CM88Zf`A!ZN,7RpTE+5ia!'X_.pMpm89qSqkcr;nT"uq=]=m\4PEC=rInIXYA/PNTj&3:kkac_N3O,aVc4",(KFZ8KqQk*'@d2@7d,%H2!_`C[-3mq?R"JG_:-)1R7Ut3hOO'rk1-^*enJSe6kV*Yjq0QmYFGFWN2nS_ES%7+B+5#>;oI9D-_]]>JKLj`^J=1E'9g'F<,4%n640!9a5F39Z3mXA/tmEX]05rJJ==6hfGMEO#;Xi*s&Q;Ke'e0EMf]HaHkK,Kr2j2!tq2"&c:f2R8`"WNtHi5l$:#u]jHu2kF]oq5LBC;!!!+<[bH:Pf%]ipra*G!nCiS&Uk;na70jA8ADVM)Np_P;A/W]'N4l?]^R!1p&n*$XU"UQql1fb97+T?naX5Rb1F>SQ3/1#%JH(2=psf%&[kr.NlWIpPV3T.NgpA\=lLD-F/JU1_,#,XQgLY&29gubZ5<'H(BHrY$IAn`Za>',o9oRs6Ha)cn2R%Fc,C7+2Wd5,'O%jkGVlT2KfR2s1hK\o;Nj#Bs$6?O$;EVJcIQ"9C;\B0OP6\I!S]NYg+YXt76&iu0Hs&cDicI]>A$s0NR5?sM)CEE,6O.dUP&!?SXI4X4G1L8#Np'G'>)8%^q:>B@*-&I`rOQcl9:PmfWPc'K4/W*?&o]t0o_)tk*fA$*qW@GeY*,1/&iSK\P\$WK)+mIQH>?!,-=aW33[R/+&i>i@Jd9kK\:.G5jcb.sbitY\:C-#)d-!3"OGmd[9PnO61Y?CN511JB^#DClAP:B+4V55Pn\)IUR6m3k"E"p&JiB!D6smh,0h5B"?DhZ=@\:WWLtqd$,sE_^]ALPO?\6g.;El4MAg#m5JV%FcLg@g;Q2op[m6>t9mfao(>(p;.ghfNnFOLq>ANT-E'HX0kB&BHh5L0?sQ`7'R3Y("]GEM'sC8PM+hhc.,oLcP:=Irau';Io5Ijh&qjl"1B?sZ2rf@q?n3K,LP,4LVqJl,2fmc->EAW%842f1,!7ICah],0;8N'?aZ)]gs29O`XH=1hbO3LQp$fY%ht],N$7u5lW&@=j3`e(pE!as=&BYu0gIUE6;=7,TE?Odj48P7n]X38TC-pj-WtOFHMq?aYn*It=.KE44MtEG%IH^nR9]"4_:dP5V,upV)bDCJ&hs6/O,oLji2&,h;hLk+r%^s1(gr6j*P7K$J.);BDm*:hPGsTo;;^Qt+)'QP_1-Oj,*ap6IhTUa5"P<7%/O\%_*'kNH!g]pF)(qNKSC%W#4VTkL()d78&K+eT5:;Ig%HLKS3:1Y.0>am9<&6KKMSim>[[sS]"9cMBshTKLur3bKGB&j2/'$X![8lB=C0XO.,jAO/i%Ii3+dHEFsATE\Vdt,5`!hE0AYfrA6WZNuU-YIZX?;15g)P^jiTa:OG1opg[_6FYsfa]H2K-bo.T0)=,q#,\YMYbp+^0\D?^7<6_`5A?d:$?-O?jG19$Lg?7JE5a+omR@Y4;-L=Cr*L5BoH]CU=CH,TV1>`ljj?63U/cgbrj`!K()4=2UDV:Z3:+9ZO2o2EIc\"%>3LY_9%[30Tlm"Y[bmH65q_jJF;HX3:F<8SQbF0K(1iIo)toBje:YM-0TQAog`K(b5f"/HOOKd?;Z\h>8Ju2`9fa,V0YTp-4QLA#@fBIPPI(-=;[3gq?ap8[N)\FR)_480RcqVV+9A;%pf5l4WcHGmnf,9g^kgN.;5FF"r_2$Sp>TK=':'S=?muo$7Mf;UGG'jId[B"+Q8`m=K=p@T[QYo\!`Bb&i![*K-&44/e'K`ZnsYuR_l<'LOYu'ZeThNmFf#[fPfu?AM$1m&r1"*cTj+#t9JKr6>X\`^-rCiD1CXMsJ_]@c7=E6BK-LIrC>#N@?,m;*6QNq:QiPnR$n8@H8l1)/mra&NIQ!e!C=)Xh\0%@,LXB'm,5P_eC)6s0&f*Dt:o`J,92[.'31d'qkFW#JeNdLoJ::hhl`Sa+k)q0i7]`&;V++@BHZnPSo%WV5?Fr:Ah(2[\WqG@i4L:E=WuTYu#cT!\!'lAa+NT:EBr1efK@fGP(Rk;nBeB`;rK%3Ai[Uf[hT47SR#BJ6>t::ZT4R@&o*WZS=U7>^OHJuBfDob&e1OQSPESOEVK9qAA>TPur?FbHK%.#'e`_&q#Q%!dnV+$\sP\3$#_\sn#B5migbX"#5<(IJcR1F7"bmq8quc&-o:NOT="FbA,F=JV&b-\gsBO?HC>eIGROHnfKp:QI2\TB[/n?dW41\093#+t#S#rCNhQ_X1%K#6,0qV%+lP@.&Or'7(sd4W2]`1I*SV`!KBudSf'Bf[p@:\/(k(7g\aeQ+esU.7D9D1ffBN245OWVrU1p&F+W)mpIUgU#rrMosN!(AEEcij[&M9b`VFJGnH[>;,T8Rh.QaN+;!g*o%+9jZt0.&8,&mBB,6Qe3>Gq`p/7&)8g@Na+uSLgg#;PFa1LjS?unhhM;gmSfNKRlXsJPd[Cp;S46TUR3Q)[kbR)ND!-FnrQ>oiK)#&=JY#g@'S>BH$@64e]:3e3cUp4\KG/qP+()KKZbWY5Kt%*WTCLg%VI,t%i[+'9TABkD^T7RufFlpTWA\9ba(eW6#kg%90/PC".!giK6B_'/(E&:fa'L'[6V_Y5CgY/H81Y<[r;)hD6H<'P_@QM[<*i300Q[h/(9^8bA6&?'N-GoD`f%>NN_X#bQ:'d4$2g;`RnKBbh#6o@C27bb*P&W`Z1mX%>)!od,kSiFWlmRO"d6YM>4R3"A&/=5nBKof9`6:@`^rbUAEJh[Q4Z_8I\;(DGYm6Kjh=N;=XHTE\k^*@@r/f9+!1bR5$i0cO*<91u7L!_SEPNKq)PdMW#oa11HSopTkX&Q&\bFp*&E0gW3u#NTM&^Wa$mlsT'M14_J]&42PS9U.^V$sQBpjV,`E;o%5r^i6HP36/cUc;cR?RaMhT$d.^,*R%.R4*6UB5`TZmfB]#(X9U)2IS@Q)I8^kfcM*n7%afle0N,PGm2$$\F>,909%;TfM^3rI,Wl2&W`Wn5KlF;*j-NtO$Og$&?$=5E28SS0NJN4cI\6NZ`VjAGDg+9gKc%(1<^"b\/e"5ZKoYDUA=mlo]UB^2=\iFZq1dXWV2,7WfJ=!l3S/Rj6VUnT<9irJ.A5q4$RHX>j$_*r_<5c#pdb!*l:;%b+kL#4K>P0&q+UH5&i%b!'!k1_%A.G[OPMnOTq0rE3^lk'&]W>ON+DZ.dl]-;Rro9WN.JHU\1E6J5hUs8IX8bPqj5R1BCM[CBf;g?kd8r&/5s9jLt6bBD=[NKQ3mn)9U2=C77&"G"T-L0QCq6VPULT+E$OTbS:`A3'2uB)+6Zn!lD7aLP98nMbT,tBn$NKLd0>F(1mbP1`;`?\Zb<#IlP_KH2"ZCRIbY%p<-1a2c&m!ghE&l`"2L',j@r`_M[tDg[CC(dmHPjU^dY5+Rp$CQ*>$7X7a;g4']=XYI).I!=_aa1FXYnTt*=;J0r;'#)L:ffPC4"^M25E6'GH%4qIrT\n2RCjAjHGo7dlui0NA8QD)_)M>ICY5`9.Mo66Vd1a[nJc,[0b^SbD2".fe>MNE>heM[g=cq"Z?G.`@Ger9OU/sn:5msJ7/bL$hNUDQiFHD?PI89E0=hn;d!hPHiq9(JTXuR%j7&2(RL5i1HZQq9YT]p>%eP9=\1,X=f]S=9P;.MU,R@TUMXQWsoD%RAT`,[[GkC*>cOXt]fHaq`(BtEUXTLh'X*:/]qia=II"q7c)P`T\i7J"h*GNZL5@b@+6W@YLgR:Id*.=l.TibOMWM+l#-i0Su1k:PPZN+-b^WO.!^G1cB%PsT$8.#]f@PUo7Pp&Q)XB$TRiT8C>KkoW'+ln>@b`&k7/k)mke6lI9FJ(21tUEK!qgaIkV4=!fF`>cT,fa-=VcVd@AX4sWlTEJUi2K06SiL-MtpK4C?r?Q("/eM3Vi?=(gHOOdB3LIlCRJ(0$f=&s0qb;DWL9aofZlsS3AkfJlHpT38$l)d#pt8rk:m0m,Oi)I']m7&=R-!gWt+ZrgDr>f(C;#VC-$2SA*'OD;mT$O5CPH2.8gJhm-.mlT+IhS4*N_WSVqe6H`"nAM43HeQG!>=J]Q:ld7YgGO31![;cRmg;P?qN+E1>)%1>5JuX[sd[WIT,29A[J`k@!/JiJZMl&+dN>=4M(:d)9g^PXI[JnA^7]?qkHVO,&_WK(fA<*^3)hOFHooL9Es*1FMs^p?+GAC`i?S5URa/6lND!Wk,=a.1M,%MZ7O&N.B$o[/^0/#jI1H>+o!,-HBCA5Fh$Dm1,'$(XgHC&cD\2L>.GDSgsJH*#YZJJC-G1Ig1t\#W,#bJ"I*Hp-smHUUaBWAmTDj0]i0\uOIR6;VR''9fs--FCnl<`i@(As0?1YE+sl1akYF@'R$aQ0N]Xf@TWP&q[_`AtkKNAB739kdi9d6a@A[COZ@=J5K(KBI-%J`BikDOnNErOb@[h41%ic7R-2":"O=S>(-gV>6h,3[Y4Kr-`]^Eug@A2ei>V-4L2UG?LK$DTnW9CfaeQY`kep++bFW'h!1f1kHP,&9)Ils0V!B45f/V-;EJ=EQ$/G\5m)l984eR5*V`T<5`#?2OOkVW*EKs:,1j+2`1L!\M>=-L`K7jVIu\g7;.T\.[([r(4]1Ld5Df2c;niihhq?oLpK[+AlM+-E'.?"'mMA/;L9sf>?V*W6pj[n`+h6M*7.g@:N0$4E]gq550P''Xk*&`&j1@c9@o6=P0W?iL-hW+]S%lYhNN$f?rlc.-R_RN:BL"QrLEgjn"%lLNUQQWX8^2gc\/_Q$E(1b#VW^T+M'8O>=EEPPdR4PO19"MF7%^5:'WS.'Joj8,q_Q4jq*S2%K]e&CP=T@F91bLg/'Tj1InKqPmP.Hf9b"O%5jZoC_]N8*"(:O,4'Q2bBZJJ)3&2d[@;%BVn:F5-@;>]\lT(,&8<8$%g!HH-fUf^FL0:^*6+kg:4U>mbLSo(9EB+IC]U#cl\C\G8gl<"*G<(e['fWrp=:#?@4M:TtHt2Bb>!:?kdnKN`HcmA2[sNm`_ncUchb4FYJhiTTTglUGTL5AoCI_9cV.-i&*Y`=IJ=[P[8*SksM7p8*9r:dU;R9K5&cQeP.7fGj\.f)`MD5NRK,I-#jgkL=L^!^T.NuV`gn17n+Q45E1])B'=GQ6mM#ATPli?;k`b/fs'OR]+\VMZXYD\M%3KT67Yh'9g=D>gIMfC^IHkqgXc\?U-(#'D73]4\*3Mhp-k)N9hqR'![f9Sm0pOT4[L$Q95K9_Q+3E(E,HK4a3XTUBR'aqTbnSGd%pi'_Gh/KCFVLi7Q(>e9jgpgNgtL'K]'pY#!s?O[n/ui!;&Rbdb7fhRN##JdH0E-lSu4d*N$X6f+(ftgp_rHB#8d\,T-`ZR*`IsCT4=Eb&JRN@!N&R,`E/-eEe_;mlRjN0s/h4ZhW"/rWc8XJ\e:ZLm5jG0QD*L8T68[:Bg2RT$(=JdO(AL\MAqi5EVQVO(k,=_(d]dUQ080p%S<$WkIi#pWi[)`YRgWR=f@U#l=g^$>JmCZ?]R)R??dGT!`cbGW5rK]4VN*oc?eeP#W#TLNmam/d/K`)nBO70Q/nDTG]jie2W31JlC+7M:>*r88E6hY%hX7g;65Xmg^^/78le->oB*MdGuRE"%lE@%PB8m8-5.Xd*VtPB]=8q@\<)88U>$E(C=b5%+_21T[b_[\)K2$3HO;=\/?>eQgVf7GU$.n>kJ6R"&3r4s/*j"rE4o"6OHP2#HZIRQc8'C[*!L:+L9dsVb@Af)ZQS0nU$1G"10lJ?a"k_$J]o*qa?d7'?lT8<]uP]/Ul^a0S!.JQl-tBJJ<;+u8Fu,ufCo+j^CKRVqX_21Je6fGWS=5TCmT/tFY61M",iP_it1Erm*_9[2j&3>!WTlj"f4a=@H(fQk:!AV`.AnhglY8IRUT5&S7)jEEVnMV8?F,6f;cr:Zr/3@@@1mc;`?Cl:>o$>-peV2LT8c@>"TkHr__UQ8@apAnZY`L5aY2&RHdnk@%"AY_2>OV9O_28L)^Qn1s]09L0A#?<=.hc123j.V\t="S<2A_2t>P,&n7>XbCN"dK./W63>F)E3'*hdbqY29^eGLo#jrBJ%h?F7Zc\0"?p.0hF>cBAPC+S_GK,:cXV&ee*]^4JkW8n62B2d+"$.!fK>;.dMHj1N(PK"P67&9h(X2-1^NhEumb>h@cEoYF+U,Np4B06]"Q[Jjl*37+[9T.+=5lnP3MGkP3+EfLCF.gL$Vj:'h%5f!'XN!qCFPsg&fm()/3=!V[k&-p,MEiJ#lambmm:F6!b=AQTH:qFE'kls`9laNXMX,_Z*E2skc1l?\@;C.jHIMVLL[n\a?(3#DaQB"cnNr\d.!e0&W=hFYK8m5f&j8BQSc(dRS>pD8u$>>)l=uUoUu%:mFSrWmFa7+G9L5=U*/AEBoHOF#Wpe7)Ch2^Tb2,=%f1!H,i#sq*UQjPo\ZsZ7bE?r699A3`$2OQm.mM^02!fu,t/^e\co4MI3M[pll2no<:7j0-lii$lh?/<.`,1e@uf1fGk^kbjVopS^m@FIG`.@"^Kh5-1(m(JJ7MB/jS%\2O*EkLWQ#0cl*0j/``)L'+8LmHUH6I7+)4SPB%-oc#\275Q7RU!_%k,%,;#/_0]PA(^Hli'())F]8PX0t5#oF7"@h:9o@++Aueu0PI2K\aDAb\@!V\>GLE=S&2G&2LE6T:n*]jHQc3_%gbO7&eA?g@XFdH3UT^uuHi_H95;9Ah:_!uj,4X8L_!?EV6PLh8/,bB[muTo'n:K5Bc0%;sZ#MD@4*E8/jSRmui^UG+aR@!P0#2ukM\OSe37K3Ra6;tQ$),(ZjtVQ/r=eCdp<^%#*P.YbFO#aeF7UcU?CaP\s%Rg-et8L,EDl?nKt]rWlb%gO?pn5_+4+9c7(-tE>S#O>drs5JWS0a]3m;"a!AL?\2,TVt"MM5Uf\T;W?!OR;SM;>#r%JF=Ruckca\e2L5Q.l(^mYUkN(7Ia\;sX/#duLVY`P8Gb"C*P`'TD2@CD`"jJ6eWHkZ2LJ2?DBTk*T)h@6XAOLm5cVEu34a[4(I22m8/B0R=\7>=Lg6$V0PPD2"8!t7a\s$%JNQm_:$_Q:]K>sN7fcl]+h/>55m)u8^:ju`rdpej6mAEu^N_L6";o3*!YQ,j],'d3#2_6o7JuZZN"@6d;+ARV.,#UIP>*TD@\ZbO;\9[[BXWg<<3m@F)J*U9W[hgA;,OG6Z*YH@XU,\M"W^!!8;RBE76atnE.Q&K%HeXW()7$tMXJCi)`Tg4Y#&,*>/_"XG>te3oajeD(?HC@Ir^[6,JmpeB_.joR^0!;?l+co)qrph:i,o$286m\eq0i_,!2!>qF1!c%caRh%%"/B?pZ+MpRF$M)l?N`1q=p`VY_5*&&&#EE*e[EW!^m8;-dD_uJWL06afQI>X7K>??1QLhRSt(Z,NAFe+S1NrQ(rgNi>i-D*qDOmEH&KGF$R4@fs:rGX6)Osrp5b=#nj7hOZ_V`$9EbFbT,fTkN-'>F=3LCo&P(3I7Km0fLGc5!?e0<=2W[);B`)GJO@efOs5;E!ec0'T#Z%@lNGA.ZC`B7,1qB(>.PeO(18O9KMm0NN"')-gAnu7+3,+G!hpQa=76">CP,4j,_F&"TI!2Q7Oldl)#u'-nRW,\=aTBsqd5"Lo%@2(99"3p4#m0=d1>jCEVOtNVs43\kiVm>LVI*pGfS)0]a$i'0Bo3Qd@:Q(=W1B[5s;8"VMD#LiB"U64K_r`W>qRPKKt`+?dq[l/7'`%SrunppIsMpdbg\URl[5Nn?['bm.Rn;M_n;A-(1EKkX.l"\;3Q)5Go1E_RTKegV:jKA_Nt<07de!]7h$HR42$#5C'gj_];X'r'Rd5?_C%cX*etD*g[SJE)J"MLqjq8[Bf/'8a_[dVL_JUmeg/k>:hY^`PCQHC)Fj&FF6*,Pl\N73"C#mk\Cm/E,!;=fd^0:Q*_[O[N_*\!^!&LV@rJJb:]ofOi+$B0\N5^TWS.2I$c&ErhF,Q9Ng"G#>8-m&f#Z>_>T5E4e.:P1Z#fbCF)cpj/FcL["Kklo$Q".Il0hh+XKf@#.W=kK?L1+k*a$Y'"W.Yar@TO994r,6PP/<8.8F"AMlsD%?kspi>\e,40q=K`$ltclK-3TD7dCIlSdPcX.6Yl(KF;A1()qnhuc!\i-n"ci!:RDK*3A`_70W*OFiEn)?XT5-7%rr6c)N);!9$7#A!ur.s[!mILS`2I61eJmap9`j^fZ9T#6lO].It9M\WUpUutgP!Sn@nQUtFQ'pJH2K5f=H8q2m9'9*;A[8fpin7FYCIa8Kb(c-BL*\;sQr&&7:lBrF][BOQ0%^g1j\.B0(28%eRq>M-!^IQuN$jWZ.7X6E_H(BKqVmO&6_d2aSA]B?S?:j+AJY5%S*Sh.j,f3WpZ%#c]Sid+*_%cb/`:V"O8u``0,Q\*?,0$Qa$EB%_JdbsT5%;]kJOLA+65=WNJIB&p5tiIi:lt#D[ZT[mSgS2[*]jomK-6En8r@h-VVq:58O;V9m2>\!OWkkTa?J#;nSujrAg$I9eL3rHiL,;M*h%s_9E89A(5TK3F$TPOZ,J"L4m(JH!)@#L1i3X=H1MD#&WB$-($81UjA&h5%@&c%Er&LR^s(dTZJ'EQ&7I<%N[B=^\hK=#\mI`p8Y4M2&9A'5;TXg9,/h]%1uq;5"r0:0lLD*uCm@rP^k2h#+;jrq3ANY8TN.UIrVBTuk@oQf#;C[iRpl-]?\X&--4!"qRlXm184":8A*>7rW,X>_ikme=l*Dj_*+mF!d(J=KcmbXiL_D?tVjA/^RZNoGN^6mLAd(oVU)9pFZmnDr)BfFN7G\ga*.6fr)o!#F\nfdL.K6N;dN!ec.A*6f)Lu'T6/W$-7;im0pBfT*BiC0NI&*s2/VlKNNTC=0D\++d4oLD#[^lu24.)iuDiQBT',DFCfJ4_)$mN[s88^8o.,NlQ:uSj6YkV18XQoM_R)hW]+cGVF['4o"Vc[Sf0:r+:p!X`^`=lRkSD4tfBHnpAghhj@_Z.8GJ/n4H-r6>P$;,A*^-6`?XE]W,MtcNee!F-Etc6Nhkf-EthkgNYJ9G.'#)IL][C>3T;GYNPS'PJ^QCY22%Z>2_r/-e2u1bZltL7KX>K?XK?D*1@=P?Je!,Ug0n0Z>(gFRZ))/]=HCuZ*nI\X*7%<.0^q?"td[2qR$;A*@S!mZEG4Wa)]NVEaeC\IJjg60a@ccUi"q?WoFiTIS-TYK0j7GZ!b7._*&"SlSEp`@2=+;j+aTY]\ZrRs^W%nVZ\[BB'@0pPe;Ge$pDVI(eMU6^ARB>_XABg/,Q>m&_2$fn@]6;@coTE,O/V'>qWS2pLFhH:R&NOEYcK'0+Pt\!\"mJ4Dt*9kVQmnQXdB[A>%4,88d$6I_T4cD%krXY64mVG`+O;H*B<&'V6tj\$J,T$`7mWrcotb>9P?HPErc"W;&CXkajHh7_\h(cPM;b*BpraU7+fWKUh8PG&+!`kkI2Hh'67Ma1*X-q*"6saM4[#r#eaC!h`HRPE_UEuZG/opYe@/IXDU*s*2+;4:?L$\B)e,ml.*8J%NojiUO)0N+p8>B_<1rN,eW^A5*8kItlahY:f1K9]$+)9+B8nnq>a<,Eit5l9Lj-M,.hl#q@MR,odu!'+',KkQ"W9Zaa4@IZ-YqnR1Jh@1_=d59hOS`ac@ZiOS.di-oa@3+;51knU.lbH9pEXHR,"4aj2f69aQ[5V9$O1:hO3"o1q3c"!@&)2rG9JL@6L`BQ7g5)V#s9V8Q/grj-:O&p9Zm+%ZH=NgXp.FrBu^\lsnDl9Q>AO:#!Q0Ci@ZqF`TVcO6LO;R/MqGZT>n;]E7_o*mF![ZUCjllV:b7?,+5Q:$r!r`JRiD@a;!hJJKHGo2J[sZhKEks9*JqKtLQToH6.#0GQthZAa>oP%=HI'T,".:/."n<38BB_'3=lO7.:\._;9.S'IKL]8n=?9C_SP#Y65^t8i,h;W:RgQ>eARH?!=_HL+t8,]Vfq*00-]penln2L2aH0>WOhhJ@Dg/72U]E#"([eC21UQ>"c6f^V@._seQE$o?qO\mN**G?DXWO:#`t!u8AHY94smK^5+]G,i;benFi!^cha8ON+ZT@;]WAK&=]9GJ"9N0X0o7.^"G30e4k5]8NqUcr'_2^Z.Ob'0p?i/QGDA+QWTo8s64ct6Hcf[V,'N7F7.[55=##1q&eS6/$67Yj.T4G)(?K=4k-VIE@k,-+W7r7kj'-3!]"7,35WFfe%aBfDgJa<:Z^-_a8tP7fe0I[2*mdIl&MXX.<^UVS-jin'B.2=5X5JenM#7n/gJn"\R#T0D*hhS@QaP/MkaN+D6n/6`+;,h?64($?`)1'q%CB9P?+OJp9N%[S0c$(D;Q<0\=OP$?,sjCCUfcAFM5d@`RRnn@$*rH<=%(LH.$QQQ&YYsGXBSAQWJqLaU0&\h.SXI#!_TFI@#\&\#7p9Z!._M&*Q]/;GB;G-=OasMPXm1D`'feMag/o,6@?jSk2Gi^oPjHhLF_#G@qi'bQ1,XJ2(er=gg6Br/#&cZ5m7Me_BB!VZK(&6CSlF>+<FhYLcpLD%j@s-#-lG"-AGn+-W6ZT(ZOk-76!.NLK?\B6VBC&^:=qX)N8[*_F,_H_H>t2/$kZ@;PLRqKa+n#n(R<>Uf8)"o\YK'1OE&fmb1`iO6'PWRT-HQV1+o"TH.%")*_tH=Fht-^bTh7K']e91hCrR]78?(iJKN0?ms'oF\4B1'I//8<1LYF+E\H;=*I.E=Xe7WPTJ?sYbW-bH&6m#j-Fq*pc!-a-b)^Sj2rZLgPtp:NMCNRYBn!l*P3?4=Ra41$r[.oM#s27k-btcd%^h\-\PVCIJMB^VcB]&%AD2d#<]OW0FX*mRd1"h!UinK;Hn?cFmQh8_KGEei;gcsCl2Gb:;A6_O'>?Lmr-RmcWRGOV&5[3R?'AtUT93_,YBrF+fZLN0emikCQ\Z]r'bQUb@2Jb"WY1rj_5.C#U0KMiXh`\]THj(fK#R0;;d+^.)n.AhpHGeDCj`IqJ[*OC]3l7o6UR%1"HJ)NiClPLMoCf%GqcEm,md`N/c:tru[VOKE\hDkOm>.QM+9Zaa2N/ggH/CkE@*iS3]Og;WFf33%c_WaEIS7Y8B]_9V5#1On?$"Cj/,kuS<]>A;5&K@$o_J,bP$@,/._mN]RhZO-T0G.u/_@g;TSrnqU.S4]N&%[l^,g8U8087.ll1iuWN194ACg?YT['N[`g6?P>BmXs:\>)oS37ZT?2bj]EB7?J5LO1.H-P$"'0j1?`AVh.!OIZV6Xu%"`cD)cf^Ci]-.3Y'8@'XnL8+AebrpG3/@p,pYPnMso%gHZ#n#fhp"2FkJ-c6-XT(deZ0Th:i;Q"u)SV>-45OL=(Yd%-s%DN,3QK.IfE)Ak*%'G6F(VOmr4);*GY2s<1E)b";AQ4Yp/GX665F,8K^R33,X6,k)Ob:/o/hb$J1S76f!MWACSRPR'pN&8!+&Ls!6UDS''d#&D<\>dSN71V&menH9b,7%*Yjc$L5_(lXg_KLZ;0e?#[T5>;tg4PX]3Bem$/=>Mr3:G.64PV#_OW+Do05[<**1rZR,V(uoh3&]km46(lXM:m5=u(K1'J2cMS%F'3q?>=]3_7O@Jr8P0i]0"FQOhO@Oh#XZO5W)&[FG(PSj23!WDi0$fFfpb_L;n8'NN'7@fURp*`SXGVG,`2gP-)4BX[amW6.VJ7Q-[5^a5h7=X_H*VN6?Q%UE;T6h!lI[sFQ5f83`>:=2%oH3nbUT,p>`ksSOU-^Q*IP8f1_'ucq;"80(n324lbDN&72oNqfRl.=;#Qk:M_Ch.rVM9Xu\\qQ)&Wo/B8P\f^(fBIK'UYa*G&+;BIm@C-%HT**One/9'E!A!=/p%0FeNk#6E_bD`HVtQ6@9VJs/=i\"uZ7[Fc*L-CR]qAn2Mt\m#V/a:)RpqaR6lUMRlrVAcKF!bl&u!Tk2d-GOKTYp$o?$Lsqg%HWVq^O301ZV2K-,>*+D%(uUUn%>GABPbCtQ]DBb$Pr4WmsF504."RA`U^e8]$F-:*cIgTcL8U^Sa3_e_H40*@;h@Q9\d8L[#GL.SUh;ndu/(T:GI1cDiM,XfNW<82-uR[m;7'8*s>+ep09,KRpcE?5QXLOFA;Jo&fN0sNqX\4%+-C&d/8p_M\)3W8p08F!\p%ab%Qn!)r=Q7TsAY2X<)COgJbV<\N&Fa&(f+63"5*3,&IfV%$>F1&@*lUXbMH6_O1+bimDd3I8JI;I7]_9=&e[XL#[,tp3MDH>2hpsZ9oP!\C`a5TF`?:rAP(5X\]I;SE/.LllGZko]#&9P&W*_ha>;6oCbSdjJKl;i-*6/MG2rshpaetR8pIj=$WM,YKT^u/2`=a4'9Q\`iT-uPM(giON>+eA+u*#X`;m+`@Gl]+JHZ]lVjVa$Z'"cE$65UY"+T,NAFCJW5UdqAZ^33\UWH-<"lAN)8O$5mJp8Vk$(Wt;^3./1cLRal]],^-mD;r^=O(`<4e%eh+qEb^JKURV!fPS!$oO+UKFV-dSBu)lI4*)^#E**D\Z./JAH4hBut41aW416jN9:![L#<+P?oeV#u=5@7+Lc%>Hl)@-0H:mMBm21Y\ej;NtllM&;`IP`pe8YVchb5dJrCpPk:IUa9'j(UD&UU+V_??%@pThD--k)"#G9-.D8V?M`&\:es++6%L4Yt`f7cC6klHljror05U[Tu&4P1RN"hBd,S=Q)"PsXL78+aj%`8;Lqd4`C`J:4XQk-aY=,FRnfUpOoXs;L5PUFaEYVg(u$n\\pZsYb2EKUPhHe[o$+2bdT&(MP1E.6t/^+M#Lo:l._Ocl8Wcmjpu,Xa$$Qk.kA"]i8Z.md$mU(c6V(%92%YLHq=W.n7[n+8;6iq`WZc`@J#$6!-,a/c@@6l@$alb2\D-[#0S,G`n3#3;M5@Weq7fK7!33%Fb(.Q0"sDBHdA#E:.clB<8OC2.*nsPb3i67?te).J:PddpQ]JLdQtk!$M=bCs\Fo[s^X.1KA"BJroeFCb0bW1LqM/p\a7b[,Xe:VAYSS]$$./ok,+[_,Q@"\jN(CQ$,Sn."d_G@+ngqPA&PkhJWpjDA[n.ls1l7#6$O>_([[80O,+7Cb*NZ=>G8Q(5od;_Sd@*>._jhFGu/6l3!/KS;h_+rtaQ:LTAXAjl6CS!=6&lF[FrS#N*tYs'="QoQbZEN\cTf7'?IIdF$'I,;%$l[6A1B??O3GRA&3lGdP>=!i!d3M`A/,gKSBjp/[XPh";rGBF0).QdF/&e[AB>`ht]TLJoPUEGAaO<7fh2QcUq^6A"4Re/^cgJVa1Lm6n`k_;UF#VDHmD[:WI2KMsl'0mbVgB/*5^UjD\4kh**bE<:(KF[/Yr+Lb'TXe3&eR3Z;%l4^.6'Yk\^m^@Bk$HaBS0l=JCn'.c,>N[n<'#V':4X1a+rVIh%)Z?ift%RI2-K98>nG@eLXa#-d>72Ft-(0+@E.S\eT7K6"g;M48)MsA7,k!B.T#q/gb.:1Ykg(Ir!0%JbE]%qYo]N*-N*?]q[8lj:K&-B*P&47:mqiadaC@^4aW\R1`ZJ/!W>6GXr_$1=1A;ZHk&GGhr*q4JoT=oV((8GQnN?fDgqd7O\n!IX4Fql.NVVhUlc]&hdF9D`(;?D^R=4E7t7#Y+:4]E&lZ5kI'9SeT4hs$^5e9`>2lYp&Ajg!#\*NE'JU^j`&"*+N5H4`,\aLqLO8TKZ,,T:6-d/=%(:_IHerD$RpaM?9#6!7Ra6:S6!kMlri&T.%@di4J>F'Q!fLRsNU7F-^DIA_T@0A&7kmnU%Z/*GTfS&&Z@df<[r`LB@jX[P%p9@QPSZ*kQ_b$b+[R$qO;&W'JC[?ed3\X_RdnUuYdBr$-eoL(':3qs>S">@T4?^JWUB3VG)q9j>GHL#u87=>7YAc\a+FnrIX%\\BZ>!j=W_?9*H<4XoQC;M]D7oJd'dR=A<`q>ZW`GrjP.l-D[_#a"8A`VdBrNOmCG-]5l>%T?Y$.u&9%FqU[(EC!$BkLH@SO9UQXBD=l.OASDNX[`Q39n[%4,1=p]L*%49>pQ0Tn9nN_/A2bE#-L?G!D#!*!6$+q]LsTV4:#G1=A"_n%ef539PP8;=eaN3,Am$b3A]5$)t[X$E2's;Tg1;MEEV#(kopq.M72GM],a"epXrL[9#m:>1ouXD,aNENVXRM.B&6'>+8]RC0#%*)^[+LP7l-9gEi/%9sIBcZ51EX[@8r$XDHUsD;s)o%'+WPAT&=d`"("<5dEGdYah:Yp(qH+Dk/A%70#;:P*X$:HG,n5bm/!I>=U=]K-VV4Qc2QpLIE7V\B_e`A1-G^@-8\N15\aTY]0^ghPGR79+c%9b9+kF.dh^FWYnW4eSa^&hQTcl0^hE7He`5*AACnkfP?NF#C[[lLu6L>8?jMM4P,V4]tOZ&3M](A=PJlZDi#Zg@BREpaiaFJX?iWTjV]g$n#%r-[VU8DDB?Vis%(j&>d4V$1lZ9IWiZB#5agWn4S+@7J&:JsEB[6bUS-AMK1L4W6Y=8M#)!Z_>.prkEQ'#s8Rb,_plN=B^PsJ5Q<3_SYtn/bFZn#FQ<^[GE+(`5Z'8H@:81#Z-TRXiq/[Y@rG4C6hqG*WS;VimU;V(9(&c<+15"Bmm.XMmOe`&PI$o>2Hej\*=3JhlO&JPDKZkdXY^=-ZR0b::NS6',We&6O0*8Rk%?MjHL^U(YA>MF,,er<1>r:)o6W*6Q?e.HMJWN8,'p7Z8'kbC&Mop#]HZ1O[)k2P?X\ra7,6YRO?7;/NqXD!'`94Dk)u+EY:e9e%%*-`F[S=4+]o2P+])2ZP1T<7?RJj:EakKFVjJFndV"Tf3tA?CsAljA!7hpF^,b'nnq.[+L]T&6sK(>8D4WUHu@d8/TselaTl?p:C"*XNOq(i@LP020`t8Z(:TQFOLSBs*SWXaFNVAjF2)BjiC57<*m'&t1&df3VUf,?PFa(^s.[FpKZtZm^#pMV@"aUD[RlH0f#pc]TO,Uu]oL/lF=4aJIlHqJgo1ekh^7AMcNID*!bsUU(m^fQ`%^*Bd^%TiS3"drnKeZR3dnF[oVJ\&$#^78QR]k#=au!n:f/Gc^pWd>k"*dHgpC>aB:=H^)jV0\BFaQZK-Vi(NQQ)ic?PAb=E\QF-0a$Uq)=g/,".M8R+"ccAuOUd;_?j1bBP5mFI4rq%3^a6W6,Z%)?PeX)RVo#6ehrMA&EMl4^5CM9B'*`\)k59]hnua4lZF]?'g#SZ:Q=)8L17n#HCFt4GK!SUYR7G&sM-blQZ,>K2&VX_t;\a8IQMuii7Rc#its3U$Fd>ffZED"g4bEm/$%"t%BPQ7U%LLhI+^L>E@G0nFs`@1WPE^rkDS&`ZCB1_I+1d".*[[8:>K,329s*f"WNE5;Yd\1pee\"Xk%T>IB_Pg19NK2r3AJT48m"+u5)!14]-^4/?N1o;\F..X\[nOG-(kEidqX$=lDj#IQhhA\)L>"q\CNWIpS:%p7/ZG39ng>uSMU=IOgTgF"t/RA!`/g#(U4mlnGiKi(=T##no$GnGu\-uPp_JNo./aF.aI5Y=S/":jI7NlWYt3<=_\A"UZ)3L64S0u/qb+K!eEMN?6nB>iJp1BQ&M%CS0#0JjVIY%e]Yk)f%Y59CpohKDmUpX9`E)JN.R:qQBicg8fo.Y?28"uI/Ms5#5r2>;VS]PtASKec,>p=KT[W,H@KRLF(T+=sM+6@f>f=e(MN)pc\VjNApifA@(%/5.2.s[+[;M9g1h1kaF'`0qD<')69H+0mLLSLG;">ur[)Wo6:>RS_]l-%'DKg)VhPFL9`i78Ko@KJR[9g-j)P^eJ.[+aRNCD,i\Z"5q27aOagS4tajkFh=]h;j(]@V+1RsZZ-&XkYk\W,ijd^q@sBiteNa#_eHdp&sX!uY:FA6#Z'juJBZ.u]*a@DbX_`mS]gO(aG(Y!O#1R?WI)R&fM%&Y[V--G\hr%OD/oA:FNN0\6*oYE@Ilp_63=UgsOYNis%#,tV1(mTDF!H0&qM5bc,XK7G@CrC)9OO\aO5\&IroQEF22!"sW'gnXf3oIUmF+TVlMPA3#)AQ_X(Lt&8p'd>ob/dqNt!.fiTD*eB"QT"A>=Nn5DeTFtoGh]:>D7R3bZu+gQF&q(T@s6P20JX":.90ga_,f3f+@1h2nSt"ZJB4HKn9$7Y3qM7\T`($=(dZt4qn.I?qFD3=&9WC!+Sa,p<$JUk;$mEJ:_MtA+W1;EoouEpX/G@Z=l`QuZ>%ock`'MmiR3Qp'0o+hg*m,X#iFugXn7'>Jb+j!:P3n;:IfYKf^hVp'L*iFOTIp$^4:IIN't/j)M6I(iWNQO/g:o1-6fW+ei$!b#Sb:OOC/e+C'p%FT9`N?-pbcUTVNcr:-5g7W\q((ZSdO]fMRUm/V5+F?q--4M/j2/aQ/@*=Muu5*'aUfAC*6j`-:9=63K-)(aoA,J4Yn"i#p",(tl-)U2GundnpA%eK*9_%KfWu:^9D^VQ5[WWXTf\(`ue)--2n@udE`Mjbq&D'[2?04r?356gd_nias,5EY"U7,Yf3QsaN-q#m^p&)F;g#fCEc6lZ5P$PAAV`@WU_\nCPG1a2!9^kW+4)`?JFP?%gZ#mSulP*AGrto4453HIU`9B=Ks9m[7-4^k&=h=FO?jMim9TFCD1aB%Om.nd_uQJ31=?:`A`plDhroQ4Msjd0hb$#Vh.isH%9FDVFVOJ&^bh-7o)_3hMl5?L9DW5h+'P08%"'OKCBo:K0-AJ'KlUchm;L3!J0"OfLn+]/ra0;KIX(:b!D\N4M@I(c]XQC3&-($Vngc5W/Th>m/L'md@<@rCDM?,$u,gEJ`]`gdn%%UqRF?UZAL$>1#lppFm-TICN;KWG3g,2aee_>"cY,f`r1o2nFZ;!c@aG*-[/.5L?Q)""des9$APqm'Zg6#:<9.;VsZAl,J`g[m3P=Di]Ris)Z[+*ftBsq"uf!\4fR1f(oNVu$>5D<(0&E`^OPKb<`h7HJuWQ[_EL7nHt#o:W`Ut2u3ek3B1<2RJK$HOA4`:O55\KJ.G4+R3!PRl,V"7@?]<)b>(6tf%1&@(m+5#8%r7g(tGHPrcFZthE:)$>@njiZY%f@l%H*<>!tk6i:/"/Bl3\`h_&tff)IiY?8-QTegnd@AJ^+%k*u_3H18545/bM"YB\;YSI`$IO".7_[_Jh:dEQY(P:BP),l27"knH@6_M4S@1l`J`De^5fI`/7@q"!J!_Nt`Z6'D\:>?AQ1_Puj`oP:Sl;gaW(P$7g7cGkY&\'A!U5Z.upLn1"3^Q!BP_rr>E]a9>;i;4RiA6seu].`bajr'h7S&s8)&0ZXoA=[(?']bmrSSB-DGaaV7#Z9"t38>b\8*Ucu`'fJ1T1(gUeF1D5=GEfk<$j`52igLq^qViXA?iJqW;qAPs32Kpkr1D?^b"_Ks$-.g1sURp3ijFi3TcC6HP$Pshoi?.]?p0L')ajap9[buj,-^je^Cd[nkH4:;cJoRBL9PF0^V(FeZ7Zc:WQt!rZ,%5ZG[1!s*-,AcbKrL4q9o;_V=D\h&c;d%ucd3(6S2Q(6W,1IdkX)Ej'sD$,4h8ZTK_U2XC\H$1!#7S)+UHdAGY4LrKi*tSD)jb0$2a3-";N]FQ"r`^IKP0RD$IikB\`^#uH5YhNhgLNZ/?YG4+S.c+W<@SJVQ!]q8cf..&Zk2QZ_j:lW&2M&5$3\(qUBj-E\Z*^d!P8e@3j`rk1S`@b.i+ngW($B:bih6)q16IGKNf!-^KTQg:JBHaUFRk^1A`ToF]Pi>mT`eATX+H%N&CaX5&N^OP1_I"b2[q(,_"K0FFrD3^Xb3>O&?$"RN51[D_(H*)8*)/3arLae+ON)R^_-D?dZs%-0PQ.WbfphfAZQf>h:neChVTu\)7!OQKcpK.69aE$2!C+T>9_t&GA;KB-:"RB:)#Q($a=@87;o\c:FQEr;G][,Rp4,r!s_Z?eZRL?f3P9&o<']@=8&@NGM(h:=AVYjnZQXnEh'-)`P?qHB7.1F)Yjl4#EHgIM%XbcRa.8td6E4eXOLdhM6!(cSbfX,WUM4ZeKF-nu*f<6_?(H,cci5gB/0GrL_C@ui)IMe-fYX-KRa>Mh,eYOImGWe9?i@S"W4M;TqRGVoh.NL->Q<)'`/fjFO=Ep;SlRnAHKCWOu8mYEOr/Ff7EK"NcH^UWb()F=Z=.7mn"@n0=)L:r6hp9J=T(-:ueCP)hnEXb=[/Ob%$l2P\1S+#I]mFsE4AnDh\*"[+9qIH]_kI*$lmcfp5o:G!spn*uK&$l2M?VV8D.N:K1E:/9Q?uZJdY>G?(#TBNG?r2#ZIjt>$6'7eX**r"gJaI3YLbMj$]ZeeS_j))Y.&a4@BY)A,BJC:'&W,d;LrZ)>jaqdoR,_?'I,7#B`[15"VhDH"N_b*^e"+WF[gA0nF5XjaYVKP(Y>psJui3-?WpljouENA6/`5O:%5h??9]3=34djl_gVX(q)DT1C@>KU^=nTQlLg@gua94$(a&djl>-qFN('D801,*u8j/;9l;rEW_7-[ubF:#Hr6qK]qh7"g-=<8*UE1*8h-ccdcO0HdWJH+CSsjk:@_j&fq4HZ;>ba*SA1$JhN!UVBuoBqnm!a&No'.jp#%/;k95__/^G[=^E?I`[Ys_BBa,gd66%M>/`3':.fVQm^cQm?MdVUa(2HO-d6H(cG@k4YWPKNmMV'ARAS%q2o1L&_;%U(YURq_%"XDPZ%kpP%9M2mDdY*20PDSi9,ciTb8k%?4Y!B&hMcWdrZ5Ncb93TbgloHs8[P"fG$BB))X=AH:0D,6.lG%'1.:khH4.tShK)M[,dfuT[1`pA=e1l\YiYt5W*GTR8T<0,]CY6nEK_X$chAi&W.&1JqKMSAi](Sd1ItSb-:U@C=MdjD]^A"3mpQ*_A8_3iml-Wn@E3O=&'''CF,_=X#G!iF8?7rV$K.\t%#-c1@L(3]eAeA8S_=Rk@'C,fVc"P@R]T&VMWau=g>q&/QKhs\]:]P6m!5q:C'mr4AfDld3%Y5>cK#!35Jif)N"Et@&)Uh8M0I4TTKO:LaG"6lm"9mMaZ.1o_diu[M2AGI=#M2C($u:%n:Vuq4Nj0S;hCWg;]4?-kbC]ApP""sR$O%$Dk/N-,64ZYXX#n8:f,sI+iNSME7K4Hi\0VRJS)"pS9Td.\K/N'ItM?+`rW+Hd$J(QGJk=VIt:^5bq4iR\bNQ'VO:ePn6.F'kl`>N=5i*W<4K.)@@-sXccAt,shTp+p*#.U@*qnPh(6/p3iM+h64D_EiU+0IDg,77&\1t3?C5fbL0rU-/L#j2*=u:37o;i7=FB@eA;r>Zm=[BNLh.Sd^7hnPZe.;9J^:$SF"N(nBIUE,!m(7f3)C'CGasWBbDf`A+\C1D1>8eqksrQVRkUk$sV%1Q\/GZH17$-!*ABf,r?R,_T$E&c,a!g3^3]3):ES4$tZDJrLmR>c`*1(bq^Z'J":+Fh:3]l-[]j3!tuhY-Q#)@\oJDPr_>8K/*LGX.1th;^rD2."\A<1)XVbu0]#hGX2mqN0mbYgjS5bHPTs6L-UaFL6DbmRM4F6RsMD.((Y,hXNIjm_ckp)K/b`EKUEpj!J&0.6fu@bTZ5`\US"K<@Oaon6q.Io?sBd7L)LpDGk'_EX%P!U%44Bq8B?o3a#)iqlVh^R?7AgcSo#ge@a06lX1*9Cnue.D/(NFqWOliN8`q#J*k\[.f8cnfc'(iMNOUgg>+f+G0P3Hb&Ha^S9M22A';'"0+GA@GL)@`qWk$SJ$P%M\c_-gL]/-aQH.?6OEUaD=PbCF14qaaTs@$#LrMJ9*0)&soqK+J%$H-_h$>^cV.=&i8/>=]So1QBL9"Q8Hj[UlGn;%V!FdnQQl\\a?$b'NEAeo;;kDf?;s.)_gq#RjC9#l*1bA"m)0UP5"63_VA@/qi\_>'`kE_C5bX`^rYb0KSQtKt:*@HhU4`6e1Eq)D6Fpd'GRr86QTl@AJ0TZIOb08XKa4>Xk,b_OD>UN"JfM54DsF9VE8RT`n0ng+c&Z#*?]QLT3%\/YR5@XqP?+Y%W^57F2hoAe<"^AG&3@a.jIk+'/;,(bE6codYTcDQRkiX)AO@p^OcsQc1:W^lAV--7MGa13S*S;t@7dam^%'Mj?5We0Q(0.T:#iDQ1+,e%29_\jmW:MJQAKFk`Tf15qWLS[XO%Xn'[%[`PmBTFr`*.).%_Z$/s%T(+!:'5mYJ.j@OES@NXa[lTV^f1WRaaXG0>Kr=;OK_h?e]08#UiJq1Bm=E/XVJ^.6Pm:tMUiL\-d3Mj17R:LfA(U,KI@-"NJ.)]],4#quN)0kkTYLV[_$V>!Tj&atKEgd2@Oham5[ZHpF\uo?e[q*tlCp2+b4-CI)r""hnPa"(f%r=A5`eGI.KDg'^arlO,DUYY$BldcMPUkC)GM9U$)QI/0H,Jj?+"ZgTHiGcbZ.pfg4j*3.7"Xd@[+Z!1g=[-5S8rk;1o2X8ccZc8?!nmih64:fY?-*1)b#$2Th#kG4r7O`gNp)J3Rj(O3UUg&;UH*U0Ih_"=0q*ZHQj8ZB^VO;RF:mMV5'+g:lt9T"8-PLJg.KTG^0='oc>$0T$K6_E]7G8WsEH9J\]`rI/63Z@0o>Y@P/4:J\#R'UW'D5fu!6#7K`L>$,]cCr=07T^4HDES\](!J(u;*Q/iMBSEVHSQ5KSY4B1NP1t#c]=BDag,>u!kh7UiC2I6VVhU:ja>+u-(768>n(Zg*XgKFV:u.^p:=2.<>ROMi13Z,N:)u[/^?&:(7^:YrDo=2%^X),a=+)gXo80P@XQ)jk=%sX)rT23fr#q[9d(d_8lk2\89oAbUFr!L*[I8n1?Re5'enn_HPb6GR4XU5j_Km/;\&ksK':eY"-DLo$]jYr]jf4OVNOJV_C[Y<<.^)Q]j@6Ou=3!s;pM0@q;,A_DPm+-3PQq:Q,%omMoTCBhkXXUshe#\Pi?T/":^p"a%_.pSea.j+0oH\J2BhK*ehd\]hfK;`7^DHtO=CH,3o_OihSBVn=9+jV7M#RL=>7T26laEA6D?C/)Rq(<73LF5b$dRYaK_OUI5A2QK+l@49b;Tn6`BOC^fm,&A[S/4^'K.rGrWFqGQ*Tp@ftMaj['8.?n4)As8!7*7Hj/jc:1g@q#D7[$\_;5+JV:dPMEh1NE)/(;u?Hf0%.9nWUJ4HE)UlL+G%Wg:W>5h4Ym_!DC3%)A9:**Rm7&.gT^rjmB&o+/Wg'8EojRZ)("#D?Qs;/K1qsNL6(2@c=C16sp)OQ=^1DiNUa:g+0$nX!AT55u(20TR!/$i<[2Q*M1C^bom>fC/ktTN@[VX\oHZ#IH7R8tdM+_M\W"`chIn*jO"G,5qM=\[j-q"&c"9BYK;?Rj;KMb;](_5[$8&6[Dk.tDq>#U^OHG(rcV<>#Q#Rk+p:<56*>)"a@L.)939,?*k&[`ohp!k!]n5lJcdq""B'MoDcWRcST1BeIQ7K`u5SQlb:">L(2E4a%b1PcYD'q%rDL/j&H'WE7;$;dIsLnl65M2[CSc_)?@("PW6\tk`Ol[)6*W[]*LLoF3JO]H*?Y>P+F,h>aU_QSr#f<+hm>,lD@W![9VBscR!YYAk9CAa>Tm:uM0bX;-=9?1065^8*""0rmJ66`4g&dtcCmBraA$/g<"jlerT2ukoCZ3]G>O4^0p^m6D8!=?3DcRb%\c7k-n/A$6-SCPj6lJ(u=nX>Q%%ujYpW>kZ#Ws\)(.hcS@TW$eo3/DNnD5f0V=Fb$OY8l2k8(::$"\F>#%ui;%9bYJQ'3EZ7er0?@'*YKH"0)in(D3fb'OWp$Llitgm+agiJV.cQCCankN572beG'(c":im[OrR"=I#ubT[YWHR+GCFnrd(7t`<)\NZ_U9'_-p1QOY16K&7e&+V:G]P7;3@X9P-@g9mU)OlL/q8DUid@gN-1DND_9P_\mqUo_r\b]iSmKJf"ds2FOso@TA8K8o&95Kgp`gSS\E`/cK/[p$b(n+@!CJh>n^*32u<41bb_(Psp/uX>lPKJu`WUl*>Hl4J^+Fcc]%q@Z'bWeU2D&V\Z#7+A$jjB$[Q4Y="@)t&7NKs46X-OL6\B^N$DNc#+.3>Qd1@T"oq4K?B+Bk4N$[n79'M\\Z^(P\t>]1rkIj)4b%KO@)>>/_.cHA64"0(@/[>''/j&seS>r-CJhKT2JUI8ooVG)_"eQXs"Ge0RN=t%<=]U8]i_95pZ(c$S-YUFRWb4te"ulhi?X'uGqD2CJ^"?/M&ZR4$D3gcnbNq)mt%gCjsrrI8muCDU$\!`\@YSGH`,!pRM8h69X;9;7.PaF9LfNA+sRZ>]Fhu4^s6X!JCu$_dTQB&&FBJ&rJDplr@pOMhEa'.1QU>5:(h8%4Dt/>AcT@ILAKKlU1Oj$5Tr'')TjPldr`Y5l\Q4"d(DgbiO6`h1$fC)l.S/_lin`O&[0R?baG;PhP#H12[`s9S5%ni>U0p%QbF]rq6J]!;oT8e,jcR2am*dY;N!/^Z(noh_]<24Jqk@;Wr%.:F8*N/-:\1W'0;X?f.;Ol`72/S3m"e:^dD#\g](]]UkZh/MK$_oF10@ikO^E`-4SCa"S*De!tN62tsi?TJJS%#*:@gni[q>W8Y[ktOa,k+&G7tY8/UO5lH_a'ZVl'T`dcD\pON5_OtL+t+BiR20]gS3>TR.EHTlG=^-.SPK#;$Au$k/&kC3c\l^@Cncsgm\PA%"h;%dqL8>LTo<>:LC8E,uIXr4tX6\D7NdW%`X4:9^o^.rj]0p?#,<5NsQuoh@\d!j^S&:0(Q.`;T%kn/2L%_;A-,8C/gE`Mce_Ois]iJ17bBHS]2r/qcBs,3(chK7DnT[HVBAMikGIupM&Wg,"IPFeo#cSKYJ!jbk,LRs*7Z%TO$m(4nKiQBR#BTs-BIhiXL3OI)l%@4Fi^g>BNW!bs&8,O*ETXMO]'coD\H1c;j$pt$nhYItomjlO0kT-AH;4d6)u'uRg1o&\Zs1l*-lU-TLnOCt?Op^e!N(Y=fKUWEI6Duh;ALWbN.cFdg,Lku";I%7=OjcOCp5E+N%c:%j;H&BoY5OsV-0lmZVZ;PM4q/3MJK1E\qP*G.M?LIS9ocR3S$s.QqN5;J;5U3@VJl,SicHt4<00$L_&BRV=GJD\e.,Qs#MqM)QC,5$Jb_gG'H-4<0AhI,2X%b#^qmN)9f$)rCE8IXdEIOXX.i^j"1E?E[_TdCm*;'b%*5,q9h&e3S1_t3?'MRURM&,)Dq1?j:a]XohpJHOg(^k9,0UXbQ3V9K$]G+k&>QT/>erEp1k5mo>F:nerL[l7U2dmPE!ehN2i47Kcg[R;s>2SI6W%T!GI6k4`ZluhI'*^arO:$"uq^5IL@Va&e)3/lOkSY!/N_bX6"F13TS*EQR/Z)#8))-_rDm#jtRS#M"r#T8UP<6%"n-I^bAWS&KI+@AV47h!6)3$6RMK/#r_>-5RqO=QaN.>Gr16O"rH&===h,:qJY,=Y?FP-[iN#Z-JDi7YL(oDfc%#3#br5k9SYIa,,VK_e/>pO1nP3<[Us,<0S:!W%DCmAG&T;keC45B2&?,a&)Z)fL\q^bMUqo&S[d'<3Lm".>3[kG6>7r=-W[F1)Mp(EOBL'D*%N*EOfs.j8aYE3QW'$l]CT/=6]0=N2YH",4lG\1qJE)$Pq%K[eS?1t_Il%\kHFWMAj2=HJp?tprrju*ql!$HNNfr#=6W^7`>Kpk8gE@XXO8&e*1*et*03^OBl=;_]O,SH-#"XY^h,TRJ=nt'&T.D'2pddifqeLY=3#f6Ub7Y03::%AsmVP.j#&XP*bQ'IJnD3@L'YdC5G(l&$9i-*rU$pk!u+@UfE.[2>Y&64a-e>K8.K_3pk5g*gbnhfs<8DD$34X\DPg'3VMFe9&p(8eH1,Ru76oSfn9p3*GPZB36VR3bDmcN;qf-9C"md#]9*(H`_#Y'G)Kd6LA$1L6;Z`&b>3!4uh2-8!U>P6t3",Jh9B6ih_&'ZT)-n<8bZ'N!1BYKKVX_)J`UOXU-*si`/%i6bsin,!_#P5W$4ZdNkQmR5EPh8>M-]Lr^=H2oYZfOhB$_<5*gP`b9#f"&/l:T2._kIes4lgg8P9;M]$9We`IIC/sZf-?api:(&VDfJ:?%HZZ`batj;2Jbujn=hmCTOF[TcDNKt8DH*m#0K9k.JIoGULbYP>_6aF>[1CbjnaQ>b=k)Zl_@+Rja]U6Z,eaY1a4W58$_Zo\"2J2?+@O_G!RgKe^`G;fY&1m#-`lOdnYngkbjc-O&d&NiEqPS5Yal$PSR/2+]PR_fVHD'G]b8>)=oJ6N1XJPI?WZM:4N:f5]63S+OUD*Tc2"3^aIJptNG62X.OJIZ'uqh6HWh>eSpV;=Qdn3`FN"p@bb0Z79Sdd^>Fbn)T4&7bb\U1>'ZX&,J6$V1mC!@3A&N3ra5hQ?'ZP%\CMR'0T>oj5<&?SKD`o)\p3.\iTQD[n'[a"]e=oa!11j9'?@BEuF3dT'2p*asRU5`h*d;5(UCXT28ko`uYp`CHO>e&s+Cp+RjeeJpX^l:7UWJD-o-"B*TRfesNqRkTs5Qr?jVJQSC2esK?IUF=iZgDa?cAV41-;%F7Qu#hF_4:J,Q%4n_HTWTP]V]FWp<>XnP'Y5>:34eq#+cm0"JeRO7nld-frnQ.Pj.@L0/]3k7#uGE'I-_P.[p<6RL2ehC5O\EkQ9ADS)..2p\->(^m)$V*:+`)UG9idG34tJ5Zmt-*GGqe/L6=JiO+XR3B]FMtCFtrP^]coSN6)76bNO\lqjP&W&db&')S:o1a0lD]9Lt\GhFI_FZNMOUKNm:9'l&k0?->%,qLh86&q2gM&SDoQM*_"5ff6iRCd&nQ`kKR!,%^pOe[+]=#7Y^E60b;Hm>q`@Mg58)Q0HOBZFMUPYi/U&nc\dPt>J_l[dXcdnFO9?S]QhbVo&n0j!\/$eE>QS$;P9IAXiZd^Ot92H.aZ>bB6F7=X#/<9.:f!mmc,F`@#EZ*(haXtME400X0GW:pO/EJW>7EHkQ-54.(`]_@c2eVnsJ`3p-B3V$J.dfu)]F*A\MaUH4N]";7.N`9BU6/>Q&nh&W`Sa2gN>"I=8isWp,WLr#[M9MIor;aJDFDL^]%>),UEI/:bHDkpaLS++q/OC#6U^1i,>CSE#+,_,+CV,l,hF?p=lVuk?#s)505chbF+6aD[<,?r%.UrqS5P?LkuS*RR:TqV"eo,H%4l3h+Md%T2`?YrGYIPYpUi+c%?t7*Wh>U-YjJM36`aS;`[Rshe5KF[Kcas:7"U02_XCpHbU_u[LmMA<$f$RVPBtCFYS`[Te$3:t\R_B4qRg^6"nn"fB8g0h[7(%I>kt+W]P#"Mq>44SNo:n#WB2c_ahOh!FI]q/,i\6aM9hN_h`&-O3grM9.5M3]2e_EB17eEa6Oq(3pETiadB00k$NKaba"ZCoNjO+@nq!6UG:9Fsp&'n&g4K6LNKFpJqRU%a1>cC6*Zp-8o9kG0YG!6@pF5@uE,GJe(>i*PF;X=ghVQ739R<..8k(mMJZQjB&#?AS*uVLUiHCY,hl.KFm!+oBe&)4)MQUqe8EZ;&@!N1SHu%D>InfOMncoRM4@Kh42S[t"pJf;E#b6`^:CZ>Oe9i?7JWR6^&S+;gQb-Q-&t&E[c.NY@_$BII^gJJ96%E%$UV/n7'!2rSDG``R>%#;Q]+hfaYZCYnL22D(!e=%kI:IsuA5*Wb]edDfNk9.)ff'E/<]ue8s-'PjhW9d23U8*=JtGD@F]cPgR7oOFK>"n*f#l.^=O?+'5S[tjLO[^"e/VK^a=H1*DD'g*p^/?2[E%juJ]X?;(=7fD,7OR7a:_8@d>^*`eUY*u6l;UKn\+]FS?)9l^8T)BA4?_[>@0L)+tQOSU6eP@Zk/F!_&b+62c\MfDdrTD-fE+$0brMFrH_UUN)P9M?DEV0*hg9?m9"ja1<50r".k=CaBJ`&=2r\>#E4*9FG]D)OM4%7i(]9i.IW%,ROc6_TZ7ZlJbHE0E#8%>f*F;MuTrP?3o6jYfPa1-Dng$TQ)5jACZKM;Ej;OHO$0M9%fH%qOE=S'%Y^9(M%CeQDT)'Z*PbIBLi\p#%e\f^hIN!s/M_%u\e/SjWiXR0Z`%#Yg3a&'aij:<2jG%S;C&,0i@$Ka1M.!/$9!WZ6B/X8s1]4f,XP9o#ArE#@Gr?Y8b0$ZMr,Y`QX71Kd;pe:G6U\;tD@06:?me`2uRd9H*lAnZ6*3F`%-:o:tH'VAf>$11hWEL7(W#@gL[s.]d71\\sZqERVE0[PqBkDE?NZ>$kP9-oaRe%;BUj]\<%uo?T>gb;1%n-*112Uos/U2O;L">HUrZ]5(_2ff%6bb>GBAc)l1!WZ[T/V1M'_!PdoG&!)>^oa:Xo>685L:"U5/.KIdLmt4G#d/r?JW*F"n":3"[2o@-(-M:tEd_Q-Hg%eds#0jE91E95*Oq`RH75m62BQb4j*("I\FEj`N2RtcC@HPTc&B"^mPI?8he6h&dca'lDTLaV,7UDK9((-JY7;mm1Pq*'Yd57)s"JB5G,c=qV6>BK8S8VWnbY>=cgZGTKP9+46VhsPN@XRQ0Tu>$.1t,-\NKQ`XWuU50>ACZjMbc)@-ttu,>=gh+UI7gERBDY."'2-u9cLHclF0(a6F$,W(?'m[W8P#m(6Lp7Gk#<]ZVIg9%uiiX'T0HP"R$hj"'V*]ZrE?_JVB:c?7iHPY\-FHEgf^#`JU$^6O5#0J.;PB`#0jG`uc."4H_e^e.F>Z<#\r/Pl>]lEH-WXYS@iMj8OrECND'Lmb[+.l?UC'.R-a(@0JLt.E(h.>5%BZFGf5GX[1I2JS@i5OjlagE2QFK0M:(hqq!bs8[)rj@DYW80ncr/R6e[S-X%4+3T[R[mO0`j]`tOPb_4Y;!*T%hT)#-iEI2Hr08ZXW5#aj%$Cg$ge$o@t2M"Dh,Tq[%!Qi4I?Y%VPFos.\pp#[u*=fZ*E!>&"6l?jD&7GbQY/O>u\o[sJ`Xla'DE6W8!Q#cU`57=%L?-2Z#-jt>E+@8Bhl+f.8-O/:*o>*`36:FLBVI-[LI_G:Kng?b0r1j%8565G/_RO5%?]-P%n:tSO3jJG3W(Z@!g40!S@Qik!Dh161'dHD2!rg=ns])F]neOLkLTc5Ga!*iWhiBhQ*%MBYfORj^IBPCao5=9p)S.pVh/[VXVTkDM)XHA$^O@k>G!+neF<-rArD?*4kU*9GNU]*7gB9U&Lj?[hiQa474lheOVG!FDUUfUVn*R0">*Wn]_jlRPX5`$$2X9h9,plGMB9N=J'"GGB-8iIA=]-c4(h;I_$JE9,KI*73b)V?+`BPA"[$-Il_,3rm^iL88^/3rXcIGSi7HNVrnZ(^/)(Nd?Pg3tuI9B]Op;munU1jRnW]aS;?#njXVXBuqsJdEE+Qn45`r?PFrM3#E[*Lg?t[e>4hU*:-I`nONuLfGZPbC3UoYiaAkGaZqgF_,.=M*b.!A$gh11N00dM0.h(jEKm.YQ3a3a5WmMYs!i6I.'rNj1js0ZRfs(q!dZ2dJ2JVeLTkc\\2i:pk^B.R;nh]P1Hl>6"0*KFr"kJZ,%FlpuG[l^SLDE'Z:"%[A3fDCdm]QtO"7FW684VqcH0HbaHTTf3K'5(r^."[@"+HH2LUiod'uZ,TsPN'QYP:1kr-_r_h3fW*[c)iKSLf>IAm_`PpGsm(4+neck<06d5o4$j,?DqO$A(=R^ZRai^&>CVZtW"^D:HU[PZd!cJ0W[IQ0i,aJ&6Gj61c_\NFX:Ha_(q%50`pANNG,kk)C-OSnInqA7E(u&!\'sI,`UhO5W7"8;8?ANPpX"k1.K\q*c%4>gue-8`.499H-0QN>;'+^e#dg4rcYS&%3]QX$a'bc8D?[k'G)`]nV9&j_#q[8LV'Y>>rbpX^p`uH_3H]iD2n3Tp;6-gWQPKj8R6`];o(>ZdU+u`QbEs?S*_6[g.@t@+s@Mu(t.p[%RF3/$)Y%I3c>IBh/r%sLFm=FbsP-"P;r"?H,PPO)AQ^pL38+`GSLB0S"Sjt@VN9W6K$]0J]e4uK@"_5kZh?!3Mn"d^F@$i8gr*=C)N*j/u\K-@"t2/TeU_4Jq?EI-u]]WUY&Et)[1a/C)gkW.D.OT108Ai/s.$/EALIVf1=lTV6r5!=#u-Z#L2_?A5UhT1<&-T!#&1ok7"A6KgJZ$#>WqjK^CKODm>h[f2&P@Ojm:uC*\u2JKWV)f)r[K`SI9EG&n;Teh,Mjpa_r!^sc7)%CoV`s&8[[i#X1UrKL"M9-0uF"EJe9n;H8Sb:7Umdl\?7'njRK*g$NQ$+c;;1a#I'&9W&#)G;F-Xs$MUo7l\$WGe\3P\1J_Fu1NHVT=&5:k'=OYG55aGgPQ.&QXSYsU\_dBIsQSrFiG/2Z#c_hP,c6P;];k>sI"YBbdR.>LaN`74'_'^\G!A-5Yk2M3G#Jk$:g&GO)*KG2.O2O4q/VP^;V`EK8-/8B$YF+R]'Q&eDb.pO.#&t>V93Pbj0Rc)hj@%.=q@!ikO^]rKsdC.jWKA7aia>qM%^t1smeo8d?1(Acn=e-6tS_FIC'jDV@1SkE1E8FEsDlZ7,-FG%\/OccjnqP8SVQ#A0OJ&>*"!3-7OuSon;Ut)P*fY9H9`ts679D[pYD>_+;(Gg..OW5JhdA]N"LZl1l`n&ASRT%3Z"K*&"<3\'g!B\dEBMECA+,4N\LnnfkSBM>Kjc33.o&HPLRohD?Ps:&[^FKi\L*Bcu@Bu0nX-__4<9R_Tg2?r;I>[D!nAtA!lA2KDB,q/Mmq>Yn.DpjCjXkcXb_Y-q[)?Og$qgba*>rTaTobo!=0O8d53[?k\(*@<\GTJ.:!!.+>`(FP,*V!"(jqJb`p,a`H[:@_*SWfl>/)(&HAS?+OCX@n+`[rgs6gm&?$al+eZq['#:r]+!A]1)Z5$W2g0nsTW#ZE4.,gp5Uioi@$KY/DC`\p!XToL(ahmoc1m0jJ\g"PT5:>(&3_mVe-EXnX>r/G]?='9/9=pEnc0g[F=eNaZ8,AMc8!I_P94(>Ak4;t3Q%tREE^31?#5oS.AtDqnKT5%qLqg#B%,VL:$4Gp82i%^*>$s/McjI>tEZdu8^akH3#l:Uf0N/]dL\f+OO'h`WXBct4t$oe'0HFf/S^+KHUJ9W*gC`%O#:![&XO!me:&hZ3t`+Li&fEF,V"d1X\SOnNg%el"dDW$)B)2P/sIgB9;CF`oMt#&2#R/@#*O[Go.(-^#,Cf)'gIQ2dU8@=p4r-5sne35TdIRH_mKSkc#L"7h)>3Bsq@d*Wq>EHiWG!ZfBPc'K$BE'nEec)PE=M199Boi(5+(N'#>u(3Xk-B2`AIi7CNMUJ\"j;d$.:er?^.Au(P4"^FBoKlIYN$31k$L'TC;!([/.@'O*jE)=l-5tf-.nVWs:a4N#J:XnrDb;s>AXR>dC"XiJ#%/"a$'J^&!Am*),Z3$7?U46R;LiSfhnk>gIgC]5!g&3[B1J#Hcnrk,le7o+38ioeg\V:&+Ws6og16Lt0_\_;:@_(\<"Rha^)+-M4.WF+h6GRSago!+XL592[-lB./Q5s*[<7XU90u078sCVjc(leBN@OuWN^Wtc_%;\.O.LSruE33Rn7F\8!`uEQ0Zs%Yj?%gZij!\ShV&%WI!_6s"=NeAMX,nB>+HZ"VD?J2A9ZRNmY4m$57/\o;1VA5adfQcGH8Ig2QhLGkbu3j+$ekYhak(_)ie)0olT]ga2Wel=oDOFtf&`J/@b"Pp.APB\E04@p456`-!?b_&fdd>jtVXf^9X3dGKiOt4$4bQSDNWHL-Ie;mCt`RL[:2fY$Y:a?P@J*_':SQq?&W-it'23_[E$BFC#+W45o<-2,3'fjQC_lc.+]"q#\=eW1%F.A-0?P4dn,Z'B%R2nP,"2Cn@+rY?lJB.cFVaEd"\6r:G(.E*W&k)qSh9P"I:KgrZIVp\`?*VY)+_LCg`(Q?Xn3OoYK\C3k6R>V@lt6"LC5u7p7D0+WHLe_OPXTEVX*$:D4DW'[J>6s:jHPfsUCK)cU=.PG8BQHUB8G7nU!V%`8M7DQVK'>iXpf$ujG7UpWH0I1-W,\@"Z56rl)b,GR>4X<:SnPY,Y/K"CTHB:&UYNjA'l74(gMntLWPL$&&U:8W1`/pb+USj=(b6>pO[%*i#J9=0Mc)a/;$oCLXCWPrQu5u=QuBEke)*,[q`>"^cA&7<(.(_BaYU\-ZsjN8c)9piZW15Yb7ZL\:hY,FtB"]4(4=I']aoj^hlCE/tXd8?80O:=r3EjEf.]`Wi]*J81/-!Bdo@NF`gsj##*Z6:jO\%rrE6I6jNLKjMB7F(j*$_ifX"b%LQD"iVs[J*<(GV*AKnmb+6?$7DgqQ`!Pm\(6D+r6akEOkO^)bC.*+q;"-PF>LK>m.cF3&XM3TF45;h9Fm^h6o7[5g9>B=ME/N^4hTIF@O2PhL0&i'%dU[e3Oh6Yk>l-$RI1U["5!_qtPECZQ9n\R[#&:l),OTmK`^d^_"^_1)El0SZ8!Oos<2jNYZ8h"Ms'84GanH]*q]+fN%6al7rO&&NW9#Z;_,9;Q/j<0\6HM\Ep\`oKIbBW=OoX1OLnr#]Wbh[/\%p;Eu:XHS;=6:(oCb_c1R$m>K_Y4,3eL[?JB(k'e6TJV0t]OV:8k@S7:HAs*:VTg;F".3Q!W)[d5l/-86^fbG@?>`5$%R2AnU&El+=o(HiR/=/$!c4@,'X.[Y>R?\2,d^^2_N.UuI)j/t\&W@FZ84!EA&<78/01h\IUAZ8#BJ26k;o-Z4iIbRmkD3ZB3B[sM:X_^sR7Tf_M7PG,_A3gJ%d,)>+cej1n>aDt)nBX'"G/+AMTi"^Ho`o;P`J,KXA&c\'oY_`%e.aK7'b[=6\D4J\UMBT_]h@87D\5FND6AK4&chla']LPIjQD3$%&9f6D*DK/,R?g@PQMPh%q/CK?l30Q`JWAVHZrPA@#12P@V"'=^jpbVUB6Rg.J3SptMfCD^$Q:ii.LMHkeR'Dm)j.P0*5?1ik"e6t,'d,U#W*_=rOb#VRQ%dqQnEa>&EEm7B1EC89d:Ggh'oamQ5C8>gSuP"d'9C2_'e\Q&nt:g/FLdLuco\1pj6DbO$d)T"eJVO+:4q5F8DD(^Tfj?QkGi*c[t+,U@fB^9(eIr8N`dm"tV+MjBOFV^/.4S(SG,NSQP3`(\#s?tQ_Aaqs6+Dq4O'1%Z*65gYJ0>uQapkm*]R<1URs7Y3AqBPM$QDH\)X.O'52F`CT@S!-'/hl5:HGo3gK`tq1"3)W'qgMT?n,o^d"17o+8&8[1$]5J_h<"]b)nk(-H.\TEX7`o\ip/?epTYcrI$m6.JW_!CZZ3)9Z+qP:0l:=G-LG]l\2)ISRnqLIVp5E70c.h0';DL!EadAt(QWs(_l,##<"=-9p04I5iQX^_P8#2!t%#FYV%s`!_1`H9^TR%O;K\Y.B;QFQ0is>SU/\:(Wni+b#LlQ^uAJijHqK[[:p;.&8#N/qnc5\]Wf\G&(q;r];3>W0]o;N0W#%n;R\mr+8Kn5`N+@)j5*EdGE1iX_#/c>V55?3t5L-;F<3^Qh"NJ@;G1PrNKAU/#HCPZrkb04WR`Mp-gba<+'2(e%%FH1V(`IVh6>&PTHb.m-=mr/0>L\QAVo^dKA*s3YlDc;J(oJ/s*rr+hu5j_hB2Lla-X^Dp]%GpIM@7:7LAjYqcWY8ekp)LPgtln7V]pi$U:idX8'WH;:G9"Rp29/,`)G4p;cjC&6UVA<\'_giqS5au[;$Sfb0kr1pBoQ2M2f#OSO`c2A/jMQT$;CqSQ\rECOd/E*$MW(B>]n"q+eQq0h_V?tu58IjY*X9OEEoAch"B`[*kNVC4R/R-#+$S"3KjTV,CuuV0PjAH%s/7Uk-RYh0C>#eu)KD<+6cqq*O_(boNF:.;;UP:mXh*&CLnj@to5hj"blf[6&u\,rKV04rLe,mJQ_2KP(%].qOqR*E+B/k#qd;c5l@RD/<#+#$9/i:NL"(9i:Y06EP:s#ZYaoT4*NZP"XG`W_YgGY5MR$`q8:b6>D^HIB,%hdeW)TK=9I;ji3&-5;I3FT6H!r,*rQ'%3KMA:".);^A%RFZs7I>>0Rs1.cql]NDu.f\-u>Ik"$at=$a6G*'"<9f'rn+5/nd/Rg0a$((7]A*>1aVFj#o*O$[0of`C5F1^EQ1hZLW.AD(Pt`o826,o*+F3MKY;`BkO)+1%X81E>+:j;EV?nH'Jh)VYfn2+:4%iH=M/WF51H:q,]0/Nm]D`a6_qY2eprFS>6(QW=:]D9J68IeHs2:9&35rYq<'T=#UJc"PKAM"G+`7V^Z2`B@[gkW(f/Md*fm6B',G^$[Cp=J:qYRc8RBRg0`X0Z8"Zg1dZJTTq]C"P@XGs\$!aHm%WYIfgCrZ.s*GiP][^LBOP);0Ph\bfMdLnl?P!MTr\HLZ^b&u7j&#$5S8ot$#OI79*p"73sY?0[K6iZ\#,ZBC'"cRm`O8 +#6<\%_0gSqh;d"-6rAt(Y.KBGJ[/f.bs8W-!s8W-!s8W*t!!8"A!WX)!(0:cX5*GUh9W;*zzz!!!!.kFb$9&&!_dHcAS&q?Nau[[,0FDRrB-.jY0q;lA6F28-ENQRbdHeZOW;?E#3QhMO;noQBbLC%p8N24()OmQL#\SpP_d"l%Jff5Ek1$2(WO^>\aqp?WOfhHL)kD?+f?B70-hgfeW5_9(<+pYDG8!'Yo5!"IthB*2NAmK0H'k<8:<%RZn;hfZ!3M#fjAY!',XcokF:B\%\6#-!^V^dM$t6BtLM:f9[g>8dZB8?8/edK"C:55)O6e_W@:VlX3rZL#T-doAt@>AMQ/d.k3JV:Wb7CK]?HVqY:eIGRAQ\$b$&ZQFNg^!?<>I>>K.h]DOHmr*;FY]$Yj4THqs#msM%!)Vs7He3KIJjnnqE+NVoOtOWR(PR]3"]UXb'e6WsQ`WUI^#i(,>;r%1l`fiiHfI2X]Bdtq6WCO-Mqb_+>i&Z]=l,.0G>$^M^$]C"gUgM[4mdSS]48"3S_[pBcZ@jCG/o[J$98dICHYohfea[pq>"%43&B%[b4rjGAN:E]:SWMQG&eA>C4*TmpCInql@?L\)-k%h^qf1pYP0#i43-OgPssW^@%9D4,r^#mCfq5>HaT`gV%KMn0MR]mr%a/aNJ5&NkOl;L$lq8qL.LMgL"7Sqg`"jL$b);H$XAKgr9BX55@5%FSE7X+'Z<[mcKT.2gU8#EfNF"aYDn^i,qc)a*a7F$#>X?#"ib)(>FH5tEl4'/OQc`>ku'NL#)Fk*G/*28%/OGe^i%B%OT4l=2jl%;dS8G:@mGuhY+WXo6&)*md.V>[p+3E=foD?oC'9FdVI&-oah*F:F[;=9kCsqHtURq4$d4cII>kVX0[6CI*Zm;]5c_0GM_ahc@u@%mAG#3p"19JCPUQS]mW*@II?4QmF/2sp3"C.mlc]d4O8@tgU3I8i6T-H^bg?;"$d[KE8!qmZ^pd\DS5WFF.0=S%+3n[iB&JqCfaR:P\Kl'C]NZ>R@RpSqrrIo!MBHc!CYabj6aP@%I[N_l+B4I#L<(1T$GZ-4*S6lmcLo7-#&Mjbo7R9P@i&ROS?B'hWr2X[^kYPp,ZL&\Ou;PHf!W8+"p]YHTC\(PfMB]mJ!*igNpIcE7slZ]raKihS%t\VnVo\7h:#3pX>a4.H':(;b.H#!%'rX9Roe[TG($mSRMoU)WL@R8o[7FF5R`C%J,fQL!0bq^8ZAIVLhW,49r=eOb%ZYMHA6r*#)7aq!,)?4!!!!#,YDMH%0[e"5QoG07*/4O$9!b"0W1ku2%<>LoKYQ/Ja+-RdnJ/f,"+]t)?BnK-4-Ke9pG0D8C?NU1]V%d!MBDm!!",?p^bc\WbpYKl&E6T>3=AZKOX!ST)LT+,6Qc$fh1^/hlh6lf6q^$R[dY`c3J>ha`d-1Lq(G>=_*XR/uZKe[8MG`YD4UWe>1ft[ZaN<+q)&;6q(Vu+sIjnKbrV\5lHg62&K2a;>%aD'EdaaWs/\4W'lGVB$519TE5/TJhF.CPbr!/As=_U^rW6b-=ruIWZ#SCRA*(rYu:e&;e0SH2OQ!gQtgH)a\51!9V<#mAZ2PnN"VhO16E>N:g#PGPbkK#(.\js7#2;,farn('#[n?U=.Hq)-5"a@2YGKQ;TQ]Yq%+lZV:YG0kAq`KWuEuRV3I;;ONAQM^D.A'2(WIBRn*t2NZR*7[%708OTKb&g0Od8RQ/973jcZBJ_&0Q7\1bZO">YN?hFH/8UJaN=&jGA6OhX5`&C,LeLZ:N/]SA1BEm^-(%8cZm`m+.2%S.7[=ZF'UDH%Ak:@5$:P)o1eSBn1Em.(b#3hNP"hf#`A;9Ve=*0BPYE)F-s.34M30'_XMQJ+.q+NAZ*J,()+%gNOJ:Bn/PV0XUIH*L=er9r,pQ!M=u9/-Jqd,Xdkm1U.Bu/o9N]N6BM>j*Bh_3!.$Gp^M&@]M#R5i+R5'mp,f#j*N&FNN+cVVj,:P+j(?sTN?hU=+L%:J)GQA.0\Ij"&1"P!P1(Z['4>:r=D!YoZQpfr77nJdYYo(eMDT"raqD'tP&6D"1Ld[nY[k$gP/\-'&W:3OdAE:obnUPJBkoM5"VXa%'blcEPfVKOY_m*O-*g*3#*WgZ;,K_k=f+ofL1*!X/LdG59dCZT7^afdA?_jTCf4-3OgJsj<*;);;-=f@Lt5-UMal>+Ut$0bd8DE&U/Mi)O[^4&Z8,mI+XhtZ`=k-TR`#VgN(R!8/='g<1_<=])BpmJ@mX^j0nUbp>+4-HAk3P;QrsR.R=q;f&CHT&6:N7?77#_O]U9hcBJ6ka+a-j%Knat7\3BM-FkAs6&kKJGtc2M/q_=Z219A/V5LVP];QMN]hS#+8sJTgf\5.SYU6`?JGB#11_[R?kr=9gkB!N7'9*>>$E,bsOCG!89:uRT8fCo%)Ja*>8np9C1X+a:n#1/6'86Y@qfM3;JOF]A=-1d'M-0=Q7RW=#0*TQ'q%^),?c[u'$7)/W5sm.UrcMNM\0'N)$V$,ZsoD)6;#o_$SYt_Z>?".^\8MT2qiPhRX`%@0p1.3]]Zb"4:[VJSk$=eS,U2O)%sjI9dqF2;_2KQ;O!9/R/p8a7M:OKoJSIm2b06"WM-126JgN7)LnUP#7SShLg<$%p;A**^KS!-)efuW4Bp3)&(i#j9R+Te47?\L^7Oj$h16cWd[MEX)Ba.%pKp#ACPYDl)$*;,b`Bm8"=Cdl%R*_]>ZtY5-_J$;V(4sqF1sKW4XDJn1WgPEhR[1B6Z)Uok;6"3,11@Jh)P^2rR$ss3B""MhM_s)p=t1asU8l@NaX'X-PU%01`$LjV'Pu3nd[E$:R:]FI.RqBL6s5ukPc1"-Qt%]p1h@rVZ>?>jRT>TGW(fb7AZJI@.T0DCUo]=$Pg^na1GY-IP"T=R9oBe?&JK#X.8t".WYEu^<\eJ+ZQ]jB0T&T'W3f*iCE$/?,V.uER%fDR)'fOr-2C'kX09lUVp!]`-JgQ,?!uN[rIs0!&+2[%C:1mK#Pb.qDG^\NiDQZ8$[,#Q+8)7=rhJ'_@N,)mZ"dbBrs-7#(L2$t9\Yue>Q2AnZU;r=7Namo`CONt'E0VYL*[r:.Gtj`T"R';lOW`oXSFYW=?g#4nF8@ajYI7j'oL)M]DSg!;6;5ofBZtc"ZpAp"#5c#EapU3PE#qaN!;%)CJP8.Q_>d[e.lC-#>9Efpu\#i:U?I*;*N2c9KK!lYGIU1$f)0(f/+leJE&k;$!t(&.`ObR^I=e@pYRX"SSi`5N4]jdg*Of)?F!'.Hl6emhXoKn&S>rN)e`B8TMePa)D7YUH-%6%j[N1FWRccbIcT#XlTaF&'>geR'$_O`$`Mrm'ALOS"oIKH1K3Md&I<1$9!.9BcPW0j+drQD4H?23[/L\s1Y'Si"P_VPWa%)>btaf$gO!BhKhnmQsm#?GD]miSQ*j`W*Z%Pf#W;q42hJ2VDC_4N"I+W4Co@*HqL3-jN*Yn@*%7:/C%OiX3t@RYp8X5a7L:+6a]0Aq3ia]nP`\A5Edbdt5APKq&9_oG4%c&g3DbW#-0L:MPI2q1ug)O8h8p[G6;N)"rb_1gRpW`Tm"iF!TP"?OK]%rJ_/)^V;[Rnn?pLH?e2_1BMSMCTS4d\&,dRGgbSY/h9$=Ke^^;KB,l.0A,q80,<^+?S!W`7\sc_&M-?8X67QC'A(DIEm(rG?&anIM6r1fgK6;PR4IQ#'&<3Tfa9#-V@54(SXKSTo-p[^,=$I6-L.c:k\C]Q*H'+0Q#*p%mHV`L2T"$=9@/rL*)d]s]V)qS&Ah)4>Q6P;`RkG)CYcM@V.F"^sgUaJeks3n%pr"n[bV+]3JXm$L'FdZ$IjbghKg(cbkd$L;gRj*iDPA*bu_9PnOjkj`Yp@IG<(kDrnsDbPF`0CjR9gs+gC^o<.9V4!(8;6bI?4pGu.R$%8MO2it:dYH^r'[t^\*rY\ToHc\,@l.QK-@/BWd4jl\/336EYLN;!+?r6t)$/`"'=>:JI(!KY7\N=V([A[a]J4(NQQ=is=8Zj"m&\+:23.Za,_f6&3+%#lXUa6[$WMu6DlsnKPp)R:peY*'[&'\7?Zs7'#9EDX[p3RDVB><=%g7:Y??iDe2q/=!JaiGrj>N?E)Flrk]VLrnL(D6cm!LEjYtpQ^i.etF`;9.Hj56?b%k57+q!h,=G]cn[bC&9mZ$=0a-S4PPlPLemiLAD'Nr+HCUR*=*%u!U(O-kY'oWo:AcG&(EooARn3tb(N/:=3md'3AkR5g(N0gVpPqS'm'Z:EFnj%r-PlBh79bSMRBZgE>*h=\kC/pmN!^OM&X8\lg#I68Z$D'Mp?76dTdfY-55"XVUQk5G7c_47o[E:p\R5KS!#p6QrHVf]Rmqj-@Q&ZB>>-]/Aa*=hSF?NUc,eo$m?LSZsp/rMpU+%YoGSeB0;@7VO7l?6n;I4qJhIA4I%g)g=gZ2SC'gO;f;*`l#]UtA1Dr4tq4[rd;:d>d/*g;Wn^a?Gg\I)Zu=h-)oh9V>6`SS+hriDA.K<9X24W%^5[ZP]'%U*Ig*gs]:g+$#+nT-!3nXhM+f;8J#j1&L[Vl#;ROIg,@0fp@lJ)+"fQjr5fk^Yh:7GQ'_h]#od<"UN.qM)Q!_(M^%P=)to@UnJKqq`@hHjbX2's)oB:Cq8SSbu%gN]/8)?$XNZdEd(EM&We.;(7E9o2%/(t0B9[rm(;i4(*FR5j*&s#*[)PbB^*0FDA9]8KFW[#4.N04Cc`dK,Z=8iBH?s[p?sUZ_m"nj:h`FlVg'T0I"*/P(_Fc(;magLV3da;`&YN]a)199)qSdO(iT1AQG]rpi18"(q`0=`74R+`e&C@$N&Rc$CRqcF7Oj4GYt0gNWVLo`*H+HrSsU7E-+*-]m+i?KqU=28*h-hHQ@#t3_!!p$Fm[l8JeCTdDY]=?4WM&cZJM?>@&.sN4T@aBS5U"8m2n9]-,K]BP&74QAPjPDo:E#%0<(&rBkYjWd*;>nWc>Z'+I95h,]:=,lNu$;;8gM@Y/i9j>h.mtnbqjil];Bi:9r`["INN8ju+UsYM`oli3J2WhX%>7-@;GeJ*UY*lTcJ:g^h[AY7efXD*@'ZJ,#9fZdG4_V\D+XIJpiORJm6qQ0KG[G:.Zd_S.%mF]Ad%LqsPG*5KpRXCHoGjRN=bL=["H/G\5@/!?Hc\YN\Y!eur1.U!2.@Y25"L=d1Cfiojhj-g*-9",s(D!*hHW-k>Ln)24>^8f9X[4..aXLO8IU/-qF0P'KAD=6lh^@(RnO/6tG@7WE/=4ol59lELFVtSN!ib]pk=.;A*sZ>e.ek$pHYhLC!/Bg5+$2`6b"5WBKm!INf`c#fIn"`"$laaT-73[b;u_JEht:q__WFG1k*Y!`O\f,+mjHo!!WmC"a6Y`E;,)<.?9n\)lKdJE_h$EKsErlP\F+FY!/ksh2Db$MH#&`UXFB^k239ZKoROX/CZ\*^Ve[P#Bo32SX'7kR4D'd?X<]U(#-gU)@-]I\3f+XB,12jAT-,VK`.'1?R>b&)@iCjs9(qg:QO+lC.>_b2X^O2juDlg'##XWTtS,,o4&RUU08m:.4]-Am[/R-Rojem\DJ&sdg$O#6OdM3gR,'U8TGcI[gV4TX4m/o[lODh`:rsDEF2P#h(D7_pOpRi$"QCV\eg-%ghh6Er*"np-Zqc67?NN*uW&#P*O)r'[`tHq0bj=Q_Z%2FbEj5sSnE_dR+.qlUlg9@C,fV:shTImj6eFbb3)\?o4aYuK%Z!VG4/%qkIHoReTanS>o[1rM58O0=f"1%kVl1sQ;oV/(.OVVfHnu39G`?q=SG)KN"ior$*1-,1&6$iWpQmi._:KGJ#mi*taC4c%Ui'Hac*qSneb7dDlL8A",&O7%[,M8^ZX603ffb`QC7Ja[,"AIH\4;Cgtl#rb8O]XT?+/5W0>6hO6TTVg4G6qHPeq#_9gUf]+8:lKNhf9S>tds[BaP.Y(c#]pl)eUXcbJ*"15Y\I/;`ghk<&&s7+WX'o"lm%jjWha.&G/I[a41[X@DmM1IHk)7hGr5B6=>l9LiOia6!(SboCoXFD>Cfo1L"9%b:bd$QuY+St;KqJQl6:04`o]V=p\3A0BI<29ol/Pc]-)@iVOKh&Vh@>1FRgIlqdR,DqOTZ%>M6#mgd6Cre_G+q9bk7Vhq+^7JP7ZPQU"!HGtTUa-f[A5TrnoGSf6aN>N0g+b'DXl"/n+fZ8Bi:#s5o242"UA]:<7Q_^"j7QVC\[CP>I,eSBKFq9[h"HXr3)T6Df0:eSAdf4CD:Q-4ac/Dm9T50]>7g)'"I'fGD-JSL2I_2q\1Cp:/-,bQQ05j@f9QZ$"*4HK68r/'>'dpHRB(!\s*.YNTiM@-MPrlfn#[7K!P[Mi$:md#$R(p$F_)\\$dqsT^G@T(:Ma4,ab%]Mf*+R5S9/#l8M"Y#ij3''C!=UQ`?+c)iUjTc>hKG2IUI#DSiuO5+\ReoGC\YaYhl!L_VRg3e6't4NX83q=D/dt7/O=)]jf=k)M5B!,8ajN6AqqDCj]NX]8OYctQuV]'j\tG@q;X\V5'-[bWgY`nq0;Q.07kcOVI!j(Lo2R)0/j$C.Q;U`b\,e9rL=_roAc)63@M>Df-na0Y-FOb`TMTaXYaYg35&g_fadfILDW2Kn1%5'K@lV+Z8e3i)]-dJCA:_oK=A\7BIA^I_*LpO8(G`RIjkkc4"^3j^2N\hiofO]@C`CnV^iI%_k3s`FCW>#BD#&)*nedWQ"d_n_Q@i=nbM4k2<1m+%eq<.N$?>7(d]IU(;sc.epucSHZK([WrA[uf+P/hsJ"PsV?sjPigZ>9&OaJAc)ZdTP)Bd(NXp^5b28XkcM6/C[p*-k"8X1Rk[o-2p)/lIP:8;ak+FY7T&?4>ri,QMTm,L_pMq="3*"?(YR9F49d#tQe0uF`.9f?#+AWi(3CPWW%E5"*&mafA-XB\'T^@]dbSXeOu`/)`TA_sr(Gp]jIS`kKnZ1`rd&_-o"F!#+9^4,kV;oX0eVc2hg2(ejLTdl@kVL=Q`2Pge]NUh<\NUcl8V!:rk$KOV08J1?$J#4d/&8jY636;DP):,suh//Tn^t5>>$L\=bcrJ6+Lh.Ir[jbBp[DNqfb8*IA3\@.gTYmB:kKdQo$n_)]g3dg=n7A;e,HIkB)0=dTabb:`bGJ*HEGKJiEHGU^eF)UZDt<\*sZNn"h:Y1P5DXje)g&dQ]@^6BMSF&q*;jGBKK@I39@A_V*I/c#;[>=Bg\63radYpV6>fbFW'H#lc!_1S>!4O6($uBp7SWS5[ajW+f\NWk8rMcAbl?*q"=R.fBBTAo$cLc?*\[qdp^I8t;E,\6t>.ASAs$)n:C:JY3>o=\e4PPq?)_3@(ml_3?q(YOoR54t5F@=abH_Je]H@Kg[.7`fC8cj3IqgaSo"Nd]gJd_qQs.o4_pD<=7Y[9$DtP:[G)8U@nMdb>a>NS4ME1]qC'Sa-jtSC89aE@T*;>hG2H$@mh4+-eTA3ROrDIQ8W"-=q%HuSn'HOTk`rU$g:kWc?$L8f-;W)ph6+=7s&7U/&^c>?G1g2WR=(C842sGI["t2j`omAmO]?&oI`k8Kst[sF]JC:H"-"sS^2=qeVrbnQWlT6q7;#@D:fk5B`Ic"X*I(p_lmBi8!2r.(5g3:%mLk4GiS5%7N=$(]hD6Y8oBms\jCJ]k45rpc>*MeC8Du.^?WrtTZP6#b8]lL*t,htfjqH95ZY^fj.YiV>>F(YHVc]%l7-\*%ZjbUjtG(rCm.]J:2T%V!e8<)%3Fs+o9=q9.UV_**!m'ue^R]sd%\:93ZlTHR>,U=aMDE8F?-K1MpLF&*Gc\^C>Ecp3%XW\/&:[t'L4OXSCIq3\;;LJ\B8&fkBlp5;-B-"oW'P"OBU8YapH"_Bm.@\rmT>beQl9Y%$f?@48ntT2q8Cme8I\34hQ!TbLk]RJ`N*nSET-k5$-&lDlJep<7K1nYTHS/QN_afHq8Hi8rsm2)i?Y>)e!s)pK,g0RF,>.lT4gMkJB5O]O-SFgNFsOI82a;p[-[Zi3QNUbu+/.=?DS>Xokqd2.8tsO<=`XNeEkfZ,I\4MhFWH-k!,JA?Tn=FDm?!O!fc?eRZNgtE'&_EC$Ur%$(EbE_T#s+r3H[*5::=P%ROtkG?[mor1e6=KQP<6-4rr9'Dh`Vp$Oo,kPY3-8A4Ah]q/2N\!S/b&J-=7KM%VF@.$t"II^6VO%[b_"VG0ogm$'^e'![Cho(V@ik?@]CiAM$Gr]Ah3kOS<;_K>Dd3Qo6F8FD'R-Q[6\#Znl3F1g2,?VsH`a@JXoJaOo_B@-ZpKPY2KHu__i45[/b,RR"^?DVB^)+Ahpe^"%CE8jY\@\8$0mJY=KOGKH@tiS?6:L"bgf?cRicWQ*P*iL.TRke'nj5m/KAg.C9N[hehmC]:).sMkAj"B.iX^NGBP;XQ4=@Il)MP!PAf[;WcZgQ^bZ[n&'2SSq_Ws8#VpJt]s)oM8]bp]7/C`U4249VR$Od.c6T5RtL3700N;321#De;fN9Y7--[;pa&O8oEqS)b;Y^([/KBhfbGpR=qf=R#Mk\Y9T/>G$@6CJT)is$s=:%XMi]2S_H`M)H`W)_AkkGN-4I*\>^XlZ3<9OGuG.q>O!d=F"l-Z(';fgZgG$&a:#ONQ6L"=D0i:61eU`",jim9,6`\q_h7Q?;qaZp6/(IpU7jB2CXRkosr.nb%3CjjB*F+UBoD$bZ2Y\H"21OV#4&3bG2P$*8nnU(Rq[Di!-J[$b,qgh!%a9g6uG&UqDAeY0]')m7!4L",fM/(_'UUXCHE8ik>T-1a9MKJ1R`"46?BX=&)HO.fFJ6F4fLWQ=3]C+J<1]/U=.uY!CgD"fRdHMJ=usNSc\/-$2cJ*ABIEtYD+r6"H(#35DK`t*d$p$c+;oFQT8&q+Gg*>/g\e>QjZ#D,U+]2dMRn0J,j`Vj!F^Y%ahC]6Lm*#Ltf.QHF3[BoXN8,$WST@/Ul2!KX2>,GZ/Q:;T+Zh_`-h2ifNt5nSio0>$I/cd*G5"">rsLL=4oW'u4@L.+qmTF)Td)08&WfO>CLqV2jI"cf.W;(*,4,PolPlU3aDogd]X3`I9+4'V)7m,qY9J=*fqK:f*@KK.2Ykd2f9O[2']:d0_`BdNKgM)`"c>H;8n8-BBU+t+.>1;cFYK=?)KeeGbE/_O2_rsmgrondWe`ATE,7#BU*M14F)l%'Q6];6W^`4B1fTXhS@bgW]PZ7ik?0=HmR8tn,$e^dYhbt2'Hr&NQ>TN8OG%$(!G"u\32s)r9kK2fBL?50cHInMF/uH2e5^0b!^he%p*hhA!]FlLVpg[^G]1c"``SEk-)t-GYqnEI'fuu=?"D:.+/gS-+Ne*bG9Htup0`'l#UWqrq[qehW@k]U=;m1LHZ>DuLVV7Du'TbIDfhnK\lVl[K/#P')6Vf.plJXRIVIE/B%/]/=FCRG'R^=SSi"#sN#V,>k+&=5ng+#IKoYmt]A"g)/ID@/SdhRY8$R:C_j6-trIh8&.1\6a7Jf(r_F@kImX@,04F[lh#<9MYuD1\UGh#H)2$cuosCh,96LGY1G_7L-A!qJj<@N+*t8.9Sm,XD,Y(m;bR;HY8n_Q2mZH;QcBukrX!=iY[\!.'+UGdS5>=bgIXmQq?`BHk[.-HmS**P5q'fKL2iY,%^Ql\@uXq.`Rgo&j[=^g5quYg_d8=fs#Y4!I1Kp]NZYj8Bl`YeFYg33dU_\TSfr4qensoJ@-\UU$\UR3'1>MZSWFsI/oSFM>:43B?r;82>2%"_ODI!lg1.V:UTB>N41_LRB,#7!\#U,h8YMH6>HZQ_*#&eChJ"6fh\JL^k'%&c?Lp]!Um;A'%aHTUD-nd9pYq\<l;lQBXOe(Q;gH%3g&9be[BJ4.J]d$Mt:k,bS`^fdqeZ8!8DN^b4\YV[sRZ87u#Vq9^4`b^%7FrYcT]TdP_]'-J4n<(sBVu.2U]3?=aB:EEV^j^lHT_UP4,Mq;T=gspL^%&%61t&5X,&ktV]DV7dA$GAHR5d3PEd,14Q']am+`.T$:Yg%bSMH.bFOSbjZt3rDqIbK66p.9XDg.W%_PtW^)PgR\O+j,]q\aoKkfa'1h]1D8McKPt>[>:;"6f%nC$`W`N^a:.B-5cahUIO"#N%1IOZAd@A'I]_%igss3s,'o-C[!N6)Z$f:[jkfX(21">p3#'Z\m];k8QS16`WN&n5$2mRS74$9B`5N+lebXl"3u+2Pih5o1^VKJAXq:CIh4T5Q`tdm#0Y0P>A<*s=cE)953n\U^Z"mM*fY]1PlkdSpOiPpI>LM7@."E4I1.'T$8(O>;XF+!c-u%.,HudHdTEKEk.58;HUo,1eZ4E'7h>3V"[h!Q"hg0aL;P\$nZ]6aMb$cNH%_,.kroh`kfa;)nprn&47q76f7Y#I$9AU(Cq>PFF/9CZPU\N?YCB9(#e3bbXdHRLf31][(]`>=(g#LcLZFP[t#W5hc6X]T::'>u-m;Z5ELYnkH>Z`B@'"]V5/g/^B5C$mW"qZ??LS.Z+0B^No#*r_ab#!jH>/\@t\OL1ZLTIQFVl=bV%e.;ZT0:9!e/RENdZ9(i3uEC9''ERXWhn7]",Q2/qDO3\?eoq(q`=1V@'e<"?C;]"`r^[9`FX"8:=529jVIF6VXSEP3/VcV"+Xs#b#B[SS1J^L+i6T@'93YIu#8E;jXhpA6[n8Xs@jjYD5hGA/'R[qU(.+7:CpgcF13g[9Qppua.MA_I1iG6iii"EXbiGW@Rr0R67<4hhJF]Yd6WcVIRU)"VIZ%dNfCkO(E01g0H"GS&%gPZ$,D,^o>2-`&_Y1DhO<4*I5ORn!BaoN3ZcU]V+'C+\*3)*u[J%raqgOJm"D(_V9l#r0&flUF!?8RX**/o?d!gX5IZ#lQ;jL/53dLQ`P=:D=8D'S3o-sfY,A1cSa=N,ca18+ClacR@'-=ZE\(rPa/2L&>13&T3q,\Rum(b5m6r[57R8YL1)RQdZHeuVHJIB](nOe][r/-b1t!k'4jK36%qd>."k&XQq.o0UrE]_FWTX69EUoPkc>HuWjh2]'[/Mo/QO!oM:2_Fh(F@BBW\MX0,RQkX4B]!ajcmG=RDbC='lf&%S]p%X?a67L.VaX/c3GfCIA%k@H3E(rJfWcrmV,#nj)iC@l97p!^)?m)(L#>k0/2`A0&kd>r4l)aPb6X`3hHpZY\#0WFdWaT6?c/XA=+3B2SD=$[biX;$p+E:m5Mrq%oY5W?X!*Rm4lXgM:0(:_OU9Ga>/3D`P15S+&)R5O6F>YHt?[+W24P0>oli,lNq(_3R,C1jf=mm)$l4_;G%6!:7b@/,c/HSrI9EQ/tRmp5,h2P?%3;%?P7M5%s3a-Ef?HYVncF1#,_eUMoDmm$.pKNP?Y5?(D-1RC*M>,P/+^o>F-7TLk>%W>;-iEG7M%7](]sPPJ="Ph/]I+Fkqg7+S:ZLb_=do.l\)P9)8gq>\r,i\@lkjl+HgVDJC4&)lg:PGRTs$6MCC[8)0hSd3:2[#IMf*EI1LptlkYp&!UeP/F?la/r9U[tQuPO6e1F%9ZKQqZ7#d/h.k2J`(bgh>:a7?2A0sM+KSD*MgCk$VH&IiZ%o)p%9Ai&Z-*_!59#*7iqN>4CZLKfC8GL(Fq8!VR78E!;Rd2^jBCngq]63V&2f*hA,&6$^'4/4=I`I4UkLJ%Bg%G%&qRWiMIdP1imc1j$]C;up4O$;IS9]qJW:&8b)LDC:o>`>X&IUBnj'=joaW-iU*h23$lL5l(u[&.[[=&=qG>6_N/E6(R21#W8)"37A3oC[0J+%IR(ddQG/'#(3U5L&9:.9ef=hH]<22q;R!/LnT^87suU_6at#:m'+V*LP("CMW^Sma'Q<&?F,i9ZW\EQp(=FcQ2N1GAu"PN:u.m?=1EbgTU3q+0W*L5I='UKiKMb,@_%&gLXh'NjAZ\+3gV>n6hDX;_ecKQnTr2V?19sP;(*G"!o`1:@P5DiPTQoR=TiKX.YRX3R2>H+SBCS;l1U,O+h_f)#ljRJIH/1I%[j6=@;+.N!r0T0J6+63b2H:h0G5D=ic6n1icauTBINX<#qPENf[tbi-HR=+iuBS6DTrYNXDVA/l`Ze($GIB?Q\.Xb25//D`oJQm?]O$Ph\%^q9[`(/$Qn>RR3I0#ZN2p+h1QU73Qk-RjccR]88Nb0KZiDYQ>j&DL.&PoL.iPIfJ]Wn]0qel]DG\%8dh4H0LY1Of'1c0@T`t`gT$_oNs79B![/2oO5ADNo*:?eL$U^=0=E$RqRe$aQG*sg+KI:d]H#"%k[\)pNm3'%H>=4_QJ;/=4cX6P4h1\VI"&P$79Sb\hNf)qEHm9kl.UWp"@Zma&TfS#lZ\D"@=+T%X+Q7rSGjjnFQX?]Cu/;>ssf(CH!1q]cIEh/Xnn1Wk(]fhar)Rpc6+:D;Sc^4S[nt\VE-2jn8B@)X4)6Apq(rWi'I4g1]pOgpQq)F;0F0+PSR>'c:411B2pTlGJRBk:f!_QHb/)@0?@"gllDV&;ikd$XmSa,)2eT7ZaAf<_8t"1t'L7Al4Xf+qU_pbr5eD:&OXM;f)qO%k/pJTOZL`$:1JX",0r4gO29c=#l\,qTB:)%BIdA7/ssD2&,matNrd9Ya;(dj>LSC,E10bR9N/V]_ucXE4sL"8NsAeITXotH3X%H)>5pY=,tg;>?@R7';/a9]]jqG[rtdfO<8ZrEZQpHN`f9sP00G]9e+B7s5(\s+B\[W7t7f"L6WcRa]@W)nt3@U>BN&kP@\cSE8D?+V>6_TZFp,F>5qILjOJcJ%d:2m8d7h>l&.drOLp0fbpD5HG'9IZOCqYiH'RI'Ra7(`\:'Z5+b\OW0'Xu4*_;Iq`$W8jb@uMdΌftZd[-\e[ID:b1[Tf>8f(/^1>ImBOQCZIbl7HmSn6];9TbNRV4.jI*WQFIWiMC0CQ9TQ]9srq>O,"['30mIa@lLIYWl8!`KM)VQf*'<8[*=3W4!E1=i\M&K^+F6oGOBJn'j,UT6ZRq)UR>pnQba:gTsB&Y;aKJ"dZ96l?QiJRf`?c8eS.dAa"VR1_mC;+J.8!HPU*9mQK+YW^pTQSB/>93<7[/b[.Bq3R'*_(f;%C1DK/k:\\XAjVTs5r#N(BrYV%"gi>ZJYJ"NF[X>$49dr\#Ui>T$(#R*N]/sm13Sr42[8D9E&,rU*W`T(gJ\[e)Xa\7_emg>,18gTq#/YBQ9uoiXuCf8OhF9"\u1)KHOce63,_D+0^i]6:K51Bmo(\kfBCM7(fB5#PF2oX-+7F,_PS\E8Gm^PfJPC)p\Pp`T=DE0.8GR:FL3<\"lbNW0!4+0Gm?SbM:>`NY!kl5VK8#mNd^G+IW?,NL[n91t15ADaH'=p)Uc9#O>iT#R!I*_VaZpI+o\!;/tcXp6(pIde<(0+nrXn!?`p\VaItb-@#c)MiJFO#[fA^6D@gZ]7"P.32Z:@AU):>e;035o5N`:*:H(1i.ZlW#Lr`Ep6S>Vb"/nYQ1+]##sr,2a^h@s)-B]U;A)C5,;2]S`Zk!&ObCeAQFhbknDs6(K*V.r/:q)(o+8q56r5tV)Ho9t%PhaQ5[>XDLWitX42^4Xl;f+MN(%4j=*$)Od\1'>q)pYgqKX`tmH:"0St:?fK+3PX%O?/taJq`#&SLWsS$V7nV.F)"%dg(;P/6WB'.9-T[5]tOd2k32=^i9/R*0b)edt3*"5n4"7NgRa,)6K+5.!Gq`'bS-R*gt3Or=]sWj:(%B:.6sY=-[`6orEj;_\HQVG=#U/g6oSLie\jDNc@_Z:We1YGNmHDY;Y,gD8?k1G"3XRhl;qMs4u*YW9LjMU.#nqT^"pK$01tZpisuN>/P&5KfFiHhQF>6_8hNL;Cfq$H_W*:IQu/]o>WFt,8<7#e&T;BLt4:_^I9kT9^eK=@4mW(M7G&sZt=2)C2q9Lmd?Z@is*&9e]-X;U!"OnguhUlda9'gV@<*UB"7QhE4)2tmkma+o?qQMrHi[)2k/i?4ZU1`ICS4GhDd)c,5LOO.O5gG])&LOkukigK7%F"KgIoI`phe5[?lk?&YP6DMHa!%=b.Bu^ntQo[iNOPhkGp(G.o?KmN&aJC=TpX[/F-#A/1(A3r#'g-<7[0UoWV$2^s+2,i;[PT\*+?Z575GX(m\XrkH3qSo%dr+&rc?ZV2>2T(*!rpl1TN;DHYe(hB(A8?p;?0mmW$rCER2E2:*"2m)bb,-6m4rP&H%C.W`gLLhIc608%`+7&i#6:Y?7]+u'S"X@In'L=:3hDC]M+Y>,L`?_j'E&8a;$_[$l`#r3f773^+fau(`@F3d.pFS_!C4e8>Y,]n"1#G)cbNL[]$3DbotU]*=b9K`#P4k?55_jT,]gsM[j#I]"sf@KNNa.Q#94hp>\R4^%@k`%kQZDcBt\ln/2jM!J1cj5[:(LhUVKh^oUDLaSM,1(5+>>dd5kO`_08OlfDEQI,G#Nls0^1r6\?5J1`/4h(''$`=NV8s*m8%EY8nt/pm_hi,se>lpM>uf0X_!Y2+N%Qlh6)Uu45]nmog@D(X7D"pJ7Bm^?605@,c),/>Hh2'=`'[fA##R\i,hq#Ad:,>"H$u6bENF_*E^#CiOm?h@(Q\-%A%4-1)*ac*(_"\[Nc6Y<-@h)U`1Hq!L?7]nbfV/TG41C81P_t$rGP6J]:us!.*'!h2-BdQq:&cEZFO6jp`e<_h`-P]Z+HkNKQKHhLA_ZUY(\\dH)$R$7C;]=V4Gns%)Z?!C/6mmbRiOKd4,3c*u+:7]PEIn7JD*"jitohSF<;$@Cm>.k(32XKa2/cISmXOL.?-lk)fPh*8/W7p=eU_]TgM0Q9+9JfVdaE)14#91bjU",RTb?8RaquCII8>hZ+`"P;H%@]0'";V!d7jK1?9NNffTrF7W`&Ng&e3MdLe+aUQ`5nI/YM>q+kb="s9T_OsI/fQQucCGc%$3uXf5^K26CcZ@^SS7rq-%hS9.k>\q1:"tLX`Ufe@WZ<6N3:+1]"\+]c7f+>q:+*rgCIVA(cb]Uc=P"?gf,'EYh1ee3CNRkIN)GTB7^CChoK&'Q&4$>N/\3;ocO^f9pu4GO-Vb5/3\h_Jj#GAO7Np.t-Cs0c^2o7$.3d(Gn2(";@T.U6iO2gS)"[@>GFi'QbG=Bn%r]30:e?Zg7h]!NDcn-n6V^jrV?V?p++:3t?""jO?rU`pXoj(lNcY^3b89?Ck^AO^%'k"7HTL%8A.;R`PA_HJ#fk+RC@neu;sAXL+#;?V7%V?XS9ShSXkp:tcK1Me,Dn(@oZfp\uV[F""C/Ib[9RW\G-0t1po$S\?d,3rW?AYO:(d.[nanYXKF>&#\hn*[nsGqCVu;RW+HarIX62J9#88]EI:S>Dc1oIP'Rqc;H7e$crR845Kqn[OMJ<.nGfn*Ad)fj/slYj7e@_Aj8]7&ol(+0%4K(oj*AAkG72cMA$POHJR5;"(M#/_V59/um^Ohqdl%i$HqH;CJS8rr'kloM&6?QA7DWuES]k7tC1.c;I\Br]8YX)Q7jKFhIRC99@TVb>CU[*ntW8@>];6K*$>/g.r8X*@S^#Ya>2T[>#f#K?pCr*.0mok_jpM,ti\`EJD9rE-if>G#1ms\_H`I:SW*tYW_S6MaXo+UMk-;)iR))9g8.hO=J[9D=/`M#.Z:P@[G?;[=mbHuNC.[r3hq!mh)c$%&G_6kt2:L(e$%lhTNFZ7<_m_>)U*B1=!qpXZl\P'*+9%H!nYEtd"^TP-?_<7>HSGU>am'p;=S9/Y7H>kUQ\S%_83,QQU[17n:.\4)d\ec$NpcI`,'MW!T0t.llpa>9iM-bLhn\mkP@i>:_h"7YgGbYK2;GD_V_k+:]'"sOSaqHZse3/9]VE.^8R*N.F)N`ct5pJ3m%TPjMPnO2cNabJfQf/_R?F2YL5CT1>(9Q:n_+)\#WR-ej]=#gnmb2QX`hL;?&J+d`N:H2rhF)-7#%m*B%#!BQg?F@pX$<6KTjD=Lii>BG%oqE.KnD9V.Non2.?Tk!MFel:nY*jLGJTgh5j!0SdG/&`r`b-:TL_Gqp:M^$45^c=bU2.WqMQbulE?]bO`hiT7D.//hf4]?Ji;VbOEP"fBk0H1^-SVAgtW]g'Q)*SBb<;G!%911dYQl]iqASs+^`\r'nYU7>@Rd9Xd@J]?/+l76>KYhnHlc#HS+l6J0pp6FX3@KuKY(3@iC+f&<-ejl!aWLINHL+:4(QZCCP#K4U17>sn3(FWI@qp.$2mrG5DL*-=#;Jk,P/nQ[f,*l-TE?#U-2nJ,j4&^2s]3#rR5A_I,ZrP61A!]/,6lD!BL%ebIctc_RG#B5Fh_VClqI;e:]pBA"2B9oRW(-\3OT^Ju%aJbF01Z,(pME1O1%5l`Rb>YAR,TmE,-6Y:W7Qa3jU'hbO2Y(3ckuT4mHtrO@Z5K_T6mSeG$Ne#&-QchD`biAD5CEAmg(d*GE5m&<:LG"V+SU`JC;H7-Iip@,nQktLl]fq!MlWZS#Kl*:qTG::rRD`S.noE7-ck2\uL1>9$YS/X)d8Bo[',q;XQQHk+K`O!EmP3V])^m]>j7esQ,"'2p50e&#[WO*nF[-5]kL#h48Yce3S`NTK#>^6`UW6-nT#3q;%qUiJA>8:&+*b581deg`^2kDF)3S$bEb>MD`&3FN4d"3.5iBGBG<[h.?re\F?Bp?$4OrFn>Coa!8I!^ncm64g_Mt#+UXOLQIfm_Fio,\F7Zk71kX[R6@Po=57(#1O6*K[_V%UDV4udfiDRYUB#MQEGGuD1'5&Vq]DgZbB)Y^;ZD5!O?2p8.,K86I!mQBgX,]cNqJ*_GM7D3RG.MpgqT-'Fh#Jo**]m4,ToRfISspoT[E/j<4V8FpsX\@]BZuikdNs,I6=;\OR8UTr^e9<]),.c3'u@oPVGd_eC_pC=E(.>E5CM9F+HC98sW*/=_m9k_HUd*bI84"8!cUWV91I>riA]\OE!.)GE)fnV(*>[A#ab:n/jnVnO=KIr,7ZA@`)Q^^E3PqZ9&r;9n*;9_]X`u?/kj%G2$6'fEsH/s.#P15^5"AFh<)/EoQaqd(USEgJhBt`;m^LhWFKg';Yk)!7MHHhL0Y%FG_A[@%L3&rd8@6U?]nmdrX$<.)cR"Z]!`3o"?)O#;t=%.p8(Y$XR*(gDVX/[pJY2Ul9@P?M7f]OVV$=i"j>/f%r0!,4RB+SPd0M$po-QX4$@X54Ro4iCO2g\'.$^CGgQ+fIC#OlgBTk^[a*H86c=RHWg;@d#I>pZVRCjUD%H[^NZY5f&-7n@'ecOVY&e:btO'9KVBXeI<-SKO9FoDBc&C4!&V>PZK1:r!QFIgD'o\/Z8QsA2aDbqNlS5`*(/M%[+9P_M7q0*j4@@:4gFhB3'j`a*25QK3^5,b01YW%$eCH&-GO4FGl2RPinr;`+GqnrM$feVVoO#Y1U_7B]aD`EZ'f5q,h>G)9t+3$"/A?_/7[UquV75-Vl;DR`7aTh@55P*2td#j[M0l$oM2U.t!=#Fib00&6>0qk;>+i/ZpF.@i87:,&U)#?8M`qPQV.#L'a61ZsTh:*!KjrkL`@t*$6cXHt0m$N9Xq!"ub*P+,6B`dH>4eEDrGe4<(%fKEGMlHnFQ>+cs>@o6F!Y[V0a+P8eFjh:8>B!Zp7h2b+F.C=-r\Y.FELo'aK>'Jpr%&'tNrIC\^3'"JtOXX/2iB;Jps/kZ&JM*#LTpeGdnfBrdXU,8-]AU%81g=>7oHPcM1S;0IBKGUr#^Mi7[a[&U\T$+W@+V1F;5l])^n*m\&[1i+Ua)j*].cpm=JKOdVj-0qL4I<<3YDMj?IYA$=t?7V.P1AnEamf:'Q.c&:XE4h0mhh/SKNE'ZEr6-lpk^;8V29ZTeS`mf9lF5%+&=+ZTDi6h:#k[t/t+u'0*V780`kblKW[FEsKdhSBbcXmd]G-^+&c$k9_V2.`P"`q3:FFq!):@0m[lX?cQ>k#P2tOE[/i@NVe^?UN_2UYVXjnL^DF@dQR2h5gMDhDI.!1&+%P[g\dE$J/s;BlQU4tUcW#d_?`7bBFNgC7G]SHfAf]P3s5Q^;)U1=^jaMX`po6$if4F@JaZZ6HZ=!Iq@t]N9uF1>s/"YAT^J.#[#u*lGPXR'-L6R6Qd2.i[W76:TaO5W"aL+P(FC'?*;H[DW,rX@t.4]6K(^(UYJsjr7P5Om4-34l@al4OQD[iU[CWMRa3oU_Mf]LaZ&6jpR!Yh<#1cV2%#Pf[NPchej&>mfj1],`QJ$!Pt0U]/#?.a0o7hEriYUKnk8i*8SMNU?srjOHb7/e[%c5W:@rek*GQ0j$p$JCbq8+9"=$P>>B\]dZ(T!UB1_Al&;5r+P(X+E#e'u8nWSAnO\UX)/08r3)B:5f`f8)op(?$n1dC6RKgK'Ni,kSE'iOq(;5i=?\g1;#2jnOXItunZA5Qts:-U*s@L8k-dJL>[)XVjO9p@-iR*VDu,?NM\;IJ6nCq2C/K*Ig+L3mHqr`1,ahtnbLLE9Bl,oE3.*g#\;Q)Hf,DJUV^h$7IR*Wf%AC-+Et[*umd_S[=%bKH:1qegVCq93WbA$fmkH']s,[i@s^iSbE4DoJs<`DTTD%WtUA7sUPHF\"AsJ_C:b8O],T5AmbtPe1*)"R!VHd%+Eaof;02nTZb3^AO%01'h:f!XIi.VPL;L?R$D>21:G<=RMb^kXi:S("i@]Ms!YLssJYPr;SG3gs/jgM:Uc:!18A1m#Nk,Acaaj`1Qu]Ts'5(>.euhNq-Jj0q'3@:Xq?o^oju76)glV]$%bGr";Pk0U0iF+j',O]!ehlDCB:m?S%roU;t#7CkG@Ca"(V\78^4lCC!C80X/s#^"oB\b=3^(mGWAcB4f5pocij&^KR;D\bdf%0eR@QO\6GpDQ[c8:>"(1bbI6^(OJbD"espQqi4QTk.QK$4[QnN]J_OV\AqhK5jWQJ:NclI3=Ubdih4TV9:F@1=5]N=u5KeHJZ3nd8:4(=G`M"pUh%DS5*m9X*;`VL.7Rl*.8!ZIM]F97l5>LA/HoNUc,k#7)n%`G(Mp3/3pc'sdB9(P^$c71RfomaLjsh`2c-^!jfP+Da9%"81guLd\!XoqG)s7G@,\g,rRUp>q]grk.RB`5E&,,Cj7\)X+lD=\MhW[t3b_3b]W\CgoJ7];Br8#)f"E:5iB>!Z:Y!\sdD$Xk7_B8KjIuf]($a*]:6!?Dp1K!HK[?[Wu1>ZdYgQC$!U5Of_F.VYb+@jOOldnD5J840CYSIks!iO+D40lu[mK6p^1oM8%bK_2HJD_fECZpl+E1-oU./6L='=Y5[RCqu&1*F=DHb4O?>/OuQ#h1NNFri>RDTkpPjV#hjSu8R$oc`?bm8apjdYXZ"]Pg9QH;hhhOJa^d+303X,P,S-VY9AN3l]Qt.FTE??9_\5FI=2=."-]AjY$OqTGO=s:dn@j8iKM]/\PGmL,R/KL,CMcF7ref/VD<7o&]/WBlL@C&@f%%9uI?UiOC7]-ZNs!1-8T"&71CJi'61NfRB\OBq4XL4h;BuLkfn2]LmD"bpn9!l+4'3^;ir14r#G.I2^f57-!\shiYH-VP[gFo7g:KcGlBFS4>T(-"V\9e$=a-V8!>ZCMGI9)#F9(IlJ"[YD?MD2ru[/#-jm:^n\eOXd"D\=AkHN_T"LfWu;>tgIcs8^Z#=3`AD7*s.00FpO5s5qdrI/^4_R<:`kno6:i$!+V6W"nX`,(X!nl[SS;PKr]Xj)8$c?jrBbADQAa?[Qb^IR;12e3e9_kiER[6l-DE+XW1,%DddDdLk.d^8H2k2p.C(>n=+\O9oY:*sl.`*We'J<=?'aYP.(LD8](22dQN%/lJZ9c`R6$<>]'[/r6VakY*q!$Ot<\fEn$eD?Ltudeja?LN*D-JKtP555gsYI_P1X;TlKYE_.^@Jd31S8UA0HnB^8RfV^iq>URmig1YN?<4o[7O9AaKL]\?us!M"&XY%@b7c3Siei(U$P97\<.VmC^/fg;&-AoM?9NgoZjXf,T2Ycq)0&k@\Pcs:cgsZ*WI5'];6m!-!hZQ`k-oX)5@9?=-#m!F'tM%"L`:DB&a-nM5r_T44_>.cOj.0,3cFag_rIl)u6EqI`:8EE,!KQiRX+I1/sJ9h2^dh@-("2)YG!N8^Q)/MLYW@U(C867TKs%e>/@B\UljWe%l%7o[EcebKQ#?Y(.2e[E9/73p3=JQWV3?SOtb7^W*"GcqN8F\DG(LGm@\40Zf*8M!YE:$K1;T%NUa*W$:nqc]$\XBC5T&AG`*=I=7Y%15s.GJs$K:N,la4f5>LHV,cZJuajVNAOG#.i?1I3.hqLMhum/KWI>$@:MC6FqqL+6ctFq&A;jb0n"+:B)9[5WP-\#C(E&rk597]&1#)Zj-XftP(Ir,/88VDlkuQ0[5o)(;0ecbqu>"mcAh-[H3F/BpeT75$mFHm^Uq$PPkET@N>1pI9\4\u_e1]769u;$6`J]A4Ku[fN;KMB7)Fnke3&Cj+d2?K*98%B%Wa-D@Yu2L1r6,\GA;>WlI])(dor'NJ:*RMdicuGq+Te7qVYP+#69VkGSdILi:.:fbOhamcCdZ&DZ'4;=OE+qO.F3J+XN.=C\d4&m4qh?M7`brZ8;:WYUC8Yg#O`lC#MFN`,slSPN$9`&3&QK9Qpg9]7Jia,Ma&(#a5uV[HL1oh>UEo.TLH$)E`JEnpX``fCg)qNP%B&N+lF5t$n-r-#!h,4-AW5Q77CA.#)+Xl1b_`76icEn:BKA$*Vh,5KdLug*YqZLQ.mGAM6p"DnHKscDb12/0]53!/5#cn-3*^-Q.?%s\Rrk39@[.bA;"+\6VoR+8\,F&J69&XeL=(HsF23CoVEo-rcV_=[7EE4)Y`CG3.gs'u(+g!GbIN)1M&k3P[0&UX2TK4bE'i<+.B%d9J\;#2@]++"K3MLQ8@t]-$*F.9FU&>(eNg*;e/^-2&B?8T8`t"4!UK=PE$OZnp@I\A^N2h=`beM0G&4A4U3nNTb@O&Km(OP^@pfLRfo/8iMj5VP?GB+U$U.n[1>6`Fhe7u9564K`XJ7W$l)*R6\m9)j")JGeW=;M6c608_L#1o8R;>GO&%QVC(QM[mC6mHKb=ETj;\)!JE6%3$R$^V5%hY[kIY'qLIaO:U$dI*CP.h/3E)I@al/X.[qGueGkCJc-6:1*-cROLYW37^[uO$GI0>B,mpmck)E4./2JRWN(7>h;I5>@D\3`o/M4[>^mNTp`3mYES:d`U*XR2u@=Am/_Ffg7RfNm/(5GMrG2k=eD%j3l>47b$!V6r\JRLnGF;j*.X?8D^[8+-\MI>kL1iA>Xh@d.na*88C(4H8."1%][>!$j1V,6]`h!t6&87@(1X#&/0oZ&p)P41UikXAFPX)@;?8f&_K:]QU%YK([IONpsBN^2BYcnK*&I40=F:;35jYZnREm(FTn"`u,ZE%@6aME][`]VcFfqMrpHAW#:WZo(TbGHnP&6h9a]8<'Q_6&bIfkeOsd($(7M(g#^VHk-Opnl:us+l(Hh"g%*P76)HF]VFjcIQE_:C4:W2?BAd.'EQhL?Jk(q!(j>3D(SI6?.`-F%('9Z8=?u'Ze)l>#ZmE>4E>g,CD0fKVVSf9`CXXo-#7D&5niN5l@8qWUICoZ&G&S^`n\!`<-(U%&Z\/fc3(4;;?>73CYctr3=f/Q_(=J]2/*,RiT#@c1ja8[2qT6:_X-[S=(0ORU`+Zf-(=mC6Fe'S!\a$\9C&#-('&AG(!EbE:j.ThZNS`)R@P_Bot[pubc9mdGdInq<`jcTH*Ym8/%4RmuoGsmK7bY^+7@WA!3^)=##rLVhOW7DC@VB;69Y:i$BbE[YuM/R!;*gjHgS>[">VtXRCQq%r4Ylc_f6l;u\maft8@-YYH(3THL_1:pES!8/#8ZZ:Y_:nG(5Vsu.V`6:)_e;>*n!<5crc1E:O)q(qEgeeR?gf'WF;tPkP2&Ag=0Z++$]#^p3iQ2TG[UtW`k8bh$kL&Mt]9gRRc!d*c(9i!0.pTp$V!k2e$OIR0QCPr<[,KOG&alXb7I8h<&j)?ftl!1%G?EH.RLqQDXBHbgXiukCiIpkk/0kLr-HqScD0P49YNpjO;L]0t3WF@Sm#3\#fa73T#3b!4$hkiFl$_+HF\,^p:9r,FWXi?5NHSJ&)_OSZ!hb<]-$&.N2<(lB*Xn$nPp#rACGpo&$W-g,"A40>32KU,Oplk*$?drUZ+pEruG_.!J`7nN8qh>T&SA"%)Xd!+$Vg\,?7dH=DDCN[8L<$u3b%dfhT]D2WGm)'G`-;(`k4[oB'HB\mTbJ%M5.!I``dh:5jPPJ\?9Gg'nBAK&2\0<$V1QpHm'&gZok6mc.t5EC@:rpNl)q9M'&FemKrp-I5O8iWFbR]AV`p;3t8<+Tb'kSXnA_@+<-KW\&VF.`n9[Pg):oCd=skNdmsH(J;>KOG]aHh_Gr^Er_=On:eU2*b]#gqTXqMN]t$SNP@A.=csR2o#igWuHOGk&Hmq=1WPtQln.0R`$l5akO;H'SYiA_6[':"fKF,QJHME:Q\dc[h51C3Kmd=flX*K>bl\ed>0gE.m%UsF>9ML@7;IHAm-:p3>F*X8/oLfn=V/kGkV'C#ID\/b\HQh?jN?*oti0U=70Vs5o@jWVc:>;eU70krqXD)ms0AEbT^X^%t8qBQ`Z"u]A"d)5cqUYrB*^KSp4MQhGRpZ[WA.k!YFYh4E.`G0/<*Tq4&8NCcg7Z%dq,rBOj*J5)+lC.K31;m\HL2YE^NTb.Tk1"Jp"O$o)_=\O7/jBJk5:k>aj-q-[iu)oNXjt6]PYBlEk`c+9L%D_`IaM/DPeB?m7>GkDe_GW6f&m3<(Fdm>_j8b.lTba;A>(b#t_-o9aE5J(4mds]&0iee'54@IV$mG+0[,g\FhU?1XJ]W]e?3L;V*qQP+P\dqaU\iK.ULrNcr;)2+\Y&]Y6+srbAN.2Zc(ZK(V+AU$sY<lAkg'cW/+u:Z7m09e^&B]K*o(rs/+Mm>/L&`8!RWZh_?KV13P?"TrUQDc[c\@]LJ:R@18Go(s4R2YqghV/]@fX<%i6puToP`hRG2Q,9*OAu7#FJ2fP<7Pe=kWTX1bqgJN$0@i3>Er)b5d8#=X^#.p8;X*7D$%!faK/%u[650/hZj)](#^??CVolH9?5H+9aUK+R%-Odlp7YT6Q9j%o(;B&ch5!e,dD^5HK9uJqL&$`Id]&7X5QAOeZMW>lglM;aG1^MXp3W+Pg,Ed,QK'l9T.sft7sI-c*Ql$"R$[$7K!FNumnie?ofN0gSo9Y>`"2^Dq:i7jqPiX5r[rGc((X@8JuI^&L;SAC)&cgngjGr9d/3;P>_`EJNgRa$4$"_bdL[)72\]M4`4qcjj8dW:poFp-Ta*tk3nQ+hf0#m2[Rd%jjkp?SX`!Bc:lGUiZ[:7,P=o&"[e^N:Gq4)1nf4WRqhSXhlGu$&<^^NDM!HB-D#:V50qZcWLs,$?_,2.3QE-J^"C#^3pJn9:Du#uWL8"/MqbR$<#C\=!_!Sl_^EV7Ic%%_.t]OLn=M*mECh]e&O,K$f_C`N@k6TKpQ>7=n\[rh:l40='Rj:Nop`-Q6sY7;?Q/GefLaQ^%_;0P"#)-tl=J[/&Fo=PZKkJGF=b!uZLG93lVgCDDWQOe%'!&EK:Ka[11Vf"6'sK[O"N^@A)G5#0`A+\UNR'L*+ups-D?`;*1\&Jgsaia1G\(fbfYiUm&]Kss#p.ZV2Zr-uY%LEQ&jj%Ke&d4bKbHlW$biJ3hEeBXQoO3>>"lSTXgNb%!UdXH9!b&/:C;dY&K'd_3RsYnE_EBPbkIO`#0pighTtT#]5:__+nnf$u-"FI_-#GX]HYf38^?>$a))XsI(eQ=YuP/i@:i!-3s9MRl(T1!=2K'.=K1MRqX<@d0F54n>>88L:b;8/$SA*[uGDFn"Y["^YB*CsZpsbcB"\!s.i8ni%M#lL4TIrOgqa+#i*LqeEq/r"!f*,Kh`1:I8L(*PBo:Ya>GZ&,5BV5a-Ae[o0t*1KIHtTN!6tW!=G0-T'KDB[4:i9%_RH`rWI:>YmS>3APK:C*5T]nK8l&/b-WQMh'0EsH42\J9olA1Z!b:MpG:!]kof,%T_DH6"o&UJ20?[GOCoBL%Vs[mmk3&lTV:Z-G=,(fL;+^WcVX>Ve<,aW='^#H>#=kWT4d`>J3$h7rIAJ#i2$+.<)R';u]gV>TeX>%XNB6t!FF7jr)]%W:Smj]ZF)C`TX!9DN=d7SA50"33dsoAL-Ve15iKl(OG,e&_]M='5'.#oZs&relT.oXfE_,ODX[i]POiKg1<:6:\rNU`K4sh`61Lpmjq8gpkchFWE6n1?"Y(7f1<);5\nc3.tU7k7U8U\m5`XjF>$dkI3ghi.0@$2;UtQL#gEJ%aa+MR:K-`ZufCe`8Fic<-8Yo46PDf*mWZErdI@T["j2Gb_I$Xkt[q:b29Q'lm.a/GTBR%'5#=m=c[MZ\el7Y_7'/E4`["h2:W(=UQtD6s-KLqc'Jp`r\_k\F9%s,-Qo05O_@3X`&4&"&r>=\>Cr`kJfi&f8/]r)aeTnh_kD*D/hb9.m--6L),uAR@]"_#JdoCX>j8BU'D,mtUiXT!65s`/fr$W.1M:0QW%!GMc2A\dqZa"l)p<#uJOD;jl9"KKM'OjL3_5CG\HNTLlcJoXf,b0m*"4mm9#oX+eqhV]@Cl,b?%af9^h'1Us%*$42`4*2o:P^8Eh:Y.GWZ@%`\4*f-:G.g1`?1Z913PlgJ)%?`o3<7&m72%I+s3E",D>0aCHY2;6RQ@?DGQ:/\S+E"oI/N&._g)a^Ns]).`mHhJIKGa$Ct&;:(03ercR&RL.73dGX#N87%OQ6!p[Z6^VuCRrDR\MK'1D)_+t#-g5A!!ahk_]\MFP/6P%U!"QOVBcD1+U6/1odR^.O655PLBu=.G)6Q2JP'2Am/5Tb0L*nCrErjBk;iK5F\@@8TSBJPsr"1LAb)!?4rP8K&)o'U09?n0T?reVs2SU6b0IA:5X3^Q^2mtn4T5LH"jhqlT:Q7m57kiPug+pAWk/@Q/bK&YX,dd2-A*u>0V4SLm);Fhl4V=]O\ojq"3^=dt4J=eC'"=5%W]CB5TMPZV>=$0n4oHH(b:TG7mL=m+S/.71:+<<^rg4JL'O+pr!uuGF%nc5:)*RAX:=PSGLY0:T!D,#hW\t$Z]i1S[Y>+,Bh'aW/p;KJS?M20mIarT=YlVNh4De#6MJ4Gpl!trV&-\7Li=b(5;)Jp@#0hR,\sYE$J4rZ^bW'`B+,kOkkO-&-\-`DkjAbn[>WhrNGp[T+Y'%5DKU!R)mAr9ggd&fRe0.@Y$?WmcWEpJm5pVa5Q_mp]lpoUg`-eWY%uAo`%*[^T@nXpj(?.SFsA9,tP5Y.#acD26iG/:d8tfq@hC??fRN"-_D,G+JIPNT5#h0np:L.:'j$3Q!!qiI(cM1Z!;Ok&Nj"bA@&'q3Z/M8*P15E\/EJrF=/]p;AqASW``:oZDS+&P;&"h#dM*2g%V+I0Y!n1g1*E2I:H!BgFHCs#cNulZ@jIiiMmW]]SsiF=\j$mcfY#W_Y.-tMncTfAM?W[JUUW6,8@NWOKRmfml[7ZZ-"qt>Zg(+N)\:FA(\df>4i"[@Ptam8)@_nqbNTs*,+[9mHY?I#PP1CHCX=KOIS,YhE@44K.[>$W:V72,0oXDrOkn2M9n\4ac7U1e4p.)'UH=Ck44?YS?9"b??2C&IESMX-=eMG$ims`,L,8Io?5Zm5lQSQRA,;4*Ht?Q#(_i;'J^_iA<,HVSFS>:0LOc*bMm6:<-KmGXJ[#qt&u_ppJ_KlT;rGe[=7/kTO>_P+P7SN+bZ,KC^maZgSB]AmXn(P4P/V;_[>-7Ph=>s2:`\6V$&p+r8LEioNSN!#<#%mWCW-ZVV2:6RIJWR=\p\#D]"cPb6UC$2Gh+4i3YkG][^4t#3TU#eq2'\C%qkLXWcO5H\5aWqli*>EB>8E1*#HI&[Gc2NaV00Sm:X*@([/Kd3_mQK'C!Bq^Y<4`kRC(S\TJI?p1;1585":,V;a-EuOEATP-#+Ols+AGMZD>2K_2Hnc/fG^l$S:\Ls%:F0`R[11HSY]cQ^k(hsnHQ8U"*`,NJc$iuE6slG"oU9egNE0]1G1YH53pL-s"c^F*4kT2N7VUU=h1t.I[W3W"lE9(aT/PT,"/^4[;aFk6iCue;RbDCkf?/W+#-Cj^lYWf"S3q\p3K9Uh-N?k$2i#3:O_m#C8<+b4FIN.H"N$S$M_["Eil6u-J-f'))l\RLhG@XRG8Ki4:7k^*%Eb0QlBVd7p;*PNkQM)sXHK^U+&q_U;B*JE>b.U2aekH&]cWU(K\a@cUFUB5Nj/&B?Fqcc`S7CRABJ2]tiG!abTRBLR=r!$-_gs%DEimjI]D%?Y4L&C`Y+s:mp1rSU_fo+TjOIYe$_?=g<#G9F$`XcCFj&h/4`"-ncppuB*Tp\P6hJiXTllr)8=f=4.6*#pk:1R>15EX?()&M>RIuq8_]Wf!4aOmdXJkPL7+engS95>VgUrlU`-c;rO\[nZeE4+@j7425Fl)uX>G8*:*S%HRNObU,PAq/g`1q1CqA5EWGjrZoRWU&;m(U48AMU+*>Vr6Q*i5bG*0CY>a7$jP^n&H"B=RF1o!.)Z2V#nuRG6S^gJ\jJ'phi[m6aR^YNQnCE?3ql2K\MjfDUq,%)GZV7$S;89hK4q`DkMc**hf;K[md?T?n&V24%cd821(f<'.T$INUM^eW637&b.!Q:S#GE)M80>8>5((#`F."Vd>H;H94^A)qI67UObA[Kp#]69..$WX$1*A;2dhBl:&OUp@:Jk-/otH\KL^2]?\:26Rq`;\i4G2s?2U6['MqVZ%5\bN0Lq9iH<]#]7tKpsq!=)DDSVSlAp:b2d:\Yi5Gi?8f)B:LUc02XW'*`%6Vb+oVPJ,8/An2$lf]TVM5f,(]Vb#tg9Kq0Y#gk/re7I!-=!:`$Z3"s:W%Xh0_o"cR!:!CUE3@T7!p^FM8mTK&iH3Hq,6*W$R5].[1f(F(dX4VU@*997iDlS9S>AuWZ684'pKb6ooG7YG#Y\9t/pY+D5@>Z,e33X'c&;-G\R!(:J@*AsLP#@tXJkV-X$q/u=EL_8H9Zaei=Iu7@6m2e/Jc*Eeu`(?GBqs3_MEj7?WQU0\sEAUIS*lGg6H`NgL_J]L/Y5)QrNs`M/6#h9srrO4aW]ACVICO.;OC4>2D@,\-ffp:k`VAVLmXpPa92Pr-GPUGWjlPn:LCm*;8))`q3eNmP++CA1i(noUi=\[(mhfhKc)c2HG&n\1#a%Z)5V*,hHi1hK@!8]n)Kb1eC;21*oX+I+)Vco<'*GHYG#V'g3+Fg]ht)*#;37@=W-65mem9MB#mj(3%AQCj&CRoc&DlJ@mj;K$+(loQMfMu3q$qVd%*V(_*nh`S4Ldu0"eD4V:i\5)2fVf-g/UL'$?%o[2D05D),WnYZ@*Y9l4CU4Xe'nQh8ZB6/%hCnL0$g+FrES.a_@#44GUV""X03;3G*f5RG1g,a<+p4ea?K>f.05i#C(?C"]CCIf+QE*jX)qmS2G#Y]nBgHokJU=NK#:ouLq)*I/bBE7dkT[JZ!]),0kJ9QJK-[t9KS-7h_*]aR!J;GNs*^;b+BTWs,Z0.`Tj84!HPRODi'a56`cs+0P.*ZO%_G]i5sF):IGKNLeDLj&'D9@NLUk>@Lu8u.YP8b7+%S!1").dHHrHc1s<@>Md_pB;"tU;3JY=3-Nejls_DmV>;*0gIP2#BF_SHUYsLaE^>FN,'+bOB6fr&34f'5*Aofh9VslO.Uh_`0eWQ3dNrkN!b;XAokP!5tK.1ZRr9&SnZ/2V5T3E?`L7br42!?jna/OnLehWlViROAp8Ga2rdNg*ugh*V`K'3;OR.5\S'6O?!T$^<4F8_pC5"JDK!VYn85aC3&jEJ,pTum8XLWKB1nTU=FQYtmd8NkSEEZR]L/C:$S"Ig?T]lS2J98B)L\KK^h/sR9J82XHM[NPdl6p1&;287+V3=rKOp-A!'V!O3D+9SLTilC2S/SW2KZBt9?3G=YEp`&@P4\Jsd7HD8"oM7*K"^&"0p%7Er4p"bCo&l:[e-_n866E&4+?"u%=MRO=GDrQ+mj5JnS+Hd=DF:q"K#:k;L>132:h0Gk=hhWOK7DWeP9[k'Ys+BCWGQu&PpM3%lGRG(g./,t0lh3)S%ug>FUTT!#AbuLlKO>\K!G91>lQ>W[%5tsCdbrPQ>55EiB+*f(<6c40AFh\_9BnV).%ZbntaZ[!XKa(Y:]sf@FL^!cY\'qFA8]8YU.-^*X*iRt?-25*9,?%JBp^TQX2#/B?'f>R7-\?]_f=Zm2E"fmZe3eJd,!a?oGO,/("R1q0SW.u_qg,AuZdPa5h\\bD3B;;/Z'U8hq22?7&"YB<7U,6(3J*+O4+.S?S-;jR\fT)3JMKN!6%&TZOTFG5S`\WbK,A!C/tigHeZPJ=f:o_s4"uts;P>O2TK3kl)KI99RI$is(@^;4:IIbMSl%l0iV'WfcZH1d4a/VDl;,7$LQtEC')=?doF-EA=s7Q;o<^`OoW"Z,,jT8-1g%j:66:i@Co1&q6,UY+*UdCtW:hQPh"aVQ_01oF>7`CreMW2&_.t^J?ka:h*jkbS+nh]G&Gse`+oGc]&\K3Z"1sRQj1i>U3j\RoOXl/2OC?hJEG$kZQ]cG.n4,gVb6MrJhPnd#D_k,N:ZGpX%G;die+PF[a/suhDapGQXjPGk)GqeW`(;[Q:$j:FP>X:@@2H"Tl6pFVS%n2K]`*B60GY]N[Gg..r6do'#!aO=.;5F/mIPsBc&sC-=(3JgLccQ:J8rE@*-']JEeQ6R(P0Vs3O:W%'klBe)JR`FlXYYT%PuQ>0pU1R1JA-n%1RP/YcL"hZd)_,mQ*Ar[e:*UIV/Ot_Z[CT5nXMV=c.XH/4S/jOG+:)4@9Jc-XXT9'TCkoT@247p+@2-@Wb4\Za7.]ceb=AtCZDSd]D=OfEX7CckB8+^-pZNE]"Xf62Oe]e6dGhlIQru;,uGqGj@iu\&B"`+1-+qKGk,YK.PP=BVd1-9bm!Eb?]XH&bJec?mlGlX"!__-(U_+UCW%"CX@sIXciuK69BAg#8*9#&'#^YUi5T&b9TQ[=el'cK6-Um:'D-9HgGG-WG<@QpNM/%A@]1R:'Fj#T@EVckg]t5@h\=prAFB1U02n5.cPhMf*Y>]T;@c')]eX+&D&\n1=!0/#g"N`i)e.cA/a%,NPAThF6uR`G&QX#(;+*iM:f/sP$;qU$cFSZRrKE?>+$M4dd"iTOZb/H12&O5KL5)@m6N9)d+UV5_mZ34b\t9h$ICc&h6_u[,2A^'+Ap_1K48)J0nFjuAotH)CF-rX7fnbqF'Jm3dKF%[1-cM#feG5X*DoraM*Fa_t73:C48^;.*csVug!@/"0H[@brW@FcU,QQ?GIJ`PPrSO2CBjcFI-W>OkX$Hh*&]cc2n-i6Mo&3FA1^,Sl&Aj/;$(GW2:b$*Ic6e']^qrL4_$>)'@C2:SY[fbJ-hfOC/;T5o8:MOj?(?AAEbQ&S80?;nUX2su7&W`TGdJQ_c&hbRj4ug15Xi,T%_hp*I?j=LKI14VUH_WZP%@VL<0B]=3;9$%+.+-&Qa(a)nQ7*lCYXoN$#oPChjMu9(T[V\C*Ne#fbfq$/Y-88.naI$'[>p8%ujt+j'kU32eU:3*:?Pa)JRt1)[J0[0#(asS?C+P"n!"Scej?j&GZAM=J,`,B8psPQG',W>1#\tj0)U2fJ7WNE`@'U.@KP):GfM$s4;`VqK*=Du19K(e+[u^i4!<]5A0bZ4fT;^_ch%BkR!t&jUl1%Mc#C&]'knT:.?3\d#c_,SXJ^eXo&@%#+="mj60pbFVnbAQ?/7FqTbZY2oGXNt"kQ)M%6Bcp?)e>/%].O7Eb"H+PXN:`i\D;+eiGkUj3N#LY#&H,8B!/^F!59fFE_%R2ZdAQGY./qPXuQ("S-];a83Xd(^LH)W[3`Q*\-5/u.f1<"H'l!k__"5oAqpCe5?0[VT;YH(i-IL)lSb"_ihYHE!.l8eoISX):I"HO>8f9_g,Fn,!d"p4U^R_V#]Ahhj"At*?LHb/gtgT#K[im=&Sp8Q^eVb"Cpf@_,iOu$Na?.lVu$#7Y^`C&$e4c!"56XNX333DIb"TWMFuV;`e!4unUn?jJdic\CbXX3RZ)&Kk&c"K-sJ,W`ocSI4b3im5\MY[%[>@0kkooYLN%A:PW95-.KSo.4lGi(q;_tm,X"iJId]Loq@JubaRWBVBT!c);2GqE0tJLQ6+F0E1P0[Pk[B4s-7Lj%PGmJC[t-oK?;*_FW&VfJJB8FWLgIdRS'L([cu]nm'6k:8170UK$,OCm=@/R]X>rJJW5tQ:5A+q0<5#.rEB[4,mMlu\L:m8!FTmZ=(2nVlRG$[#XHF:_W%ilRX4[u?OIJ>_iXl8Pbl5!)^(TBamsO0;WQn'6ZgL*0+,fmNRp[[mB\r0/8?e.F5o,9p^5n%.d8Ec?YP*WX,"N9!6B#HQ*$07ncFB-$@Gr[:l@A[.-aC#=a\,TU;j[W$8p@P];&R(6GtZhLM#l/4i!leA:D25fXH+.g*.kDdeZ_2=.-q'1(ckGM28V`*d.r@!,ZlfI.rIU9Kl*XtaM%'=+r`L^JuVh4]-n#H8!No-:[mK$4H8[[g0'*Rq2.rN:#@V!0K)6/9>NMXpN-Q+9kSYR:48li"#75CU.+pLQoAR$Hd$4s!/8dQR2qL00+4r1bm&],)GHj/VDgM5qErH]ee4=>f)HFM3\SsOSg&S,6ML#6s'I&!s/sYSnC,88'oNSRf^=^!'dO"H6=-dc]pTU,_r/:4]1rR7qg7g"G"4k\2-Z@&-b;/B-"F2FT\o%qp4B:mpF>S;?8,,C1!A"qMVP4+!$+sWj:6_&k"(++MMNS#m;?)<2)ooLm8\;"E"K9$VXC,=VN=lE#,/VJh2R!RBDpQ%L?PM*!?OGr;-R!$E-6lX:i=>oGq@$AH*C?%7&K8:16C19FG_HiWLeCg:uH._iiZ`:'MVML79r3C3*U;R_^H#%8BK'Cd?h/`L&,"Y&JG*c5@<[fHJ&ciIJE,gnhnF:3SP0NUT=XltjC(@)c6C6(+K`Rm,aMq*hPh8O2B!:@8$EW*^>E&rru:K;Q+mI)3iPkMAp'0T;iDSc;nh*h3[&0NJA-'7p^T`k'ER$+%E3Gi5LB&?)5pdhL>W7\Gi8kf6T`P=b@61Zt'%fAMSi1n&b+Ua()\n>NkjSj>&/OmE7I)"r]O;@.P>uO>uOM@4/C'b)u;>bNGN!/Q1X+&h`H:rmdYo#'\uVd.fAQ.h!Y_L^,n^61^R&1BOlj(T?1oYh<)%jrm5;@R(@:d:b?!8P(*:Os=7I)in"6PfrNY`)$Qr4^iTc_*C_\V:;M;4p2dn3';'e>\jC7^-eG5n9kNUfFl((m@KS7eu28o:%5JK?o27er*;\QY8GijKl@sunSI[Se;b-^EF$<`>e/T]Rf$,G>PX_FLHjd(]kl%CHm0C!d^Q%iGkmq1g2Wf8Z#BP8V_/59k6=f>:OOG35%02_1aA=SV@nS%E99(ZoU=);rOC+=qU2Vm_@iJB/leRX?N%_UoH6ZRj7B#`YcWP>?%nhG3L:*2E,E&.D0A44h8RTF/MMpB+q._pX'BB7,&IrWm96Q+*Nf^#ZMSj>SRoYRT^8apI]U_cVnTT&(l`c12r4>g&dFc(_n1J==>XS!\f(9p@+:=G=T:F.0q+3IPWO1,gm>]:%t^H3*2@'f8r`:BiA0D[oD"\#AddF]im+SD0Ggk0?24LI9`ZRjdX4P.d'35+QHl3*Z_oBM+_]b7b\2$<.`pm0's@O[?/XY@*sVHl5!1,Hu7ERarr7`4h$iplpMG5P!ar%1=2iJ.+c&/gR?mF'idT6#+96YGkYd_FEC22QD;&m'ib4c9-"l&j.i-?NpU&b-i.n6Fo?]Yg@1X]WF&s@H_EOZF;G[?TS:t50e@57)Uk:N+^9)&6bJ<;XJm3B0IV.`_j&+>Y8(#L*J!n:D@@EsW4ROV,iF(D^E20eW:!_!b)p-;(9LT0=&YljXdSS+LW#FVn)4?G*]p+R3M-Bls\#IlF@J7s(2nDd!VZC_C`_TrcJ>e)snm/c@ELGFl(I1'p!$+/=,#"YJ)#''*$8XjQt9Y["TKm&8D%9!s39ZCk?,=r>`E#0\5F'54I=Ptph^.]'^(L5n1M>JUK1po6YHIYt;q%Cq3#nm$c\4W>kSH$EcS_6N@m6l@\m[*F4&OUn<269$C8dMF&epV)nQDEQ>')5K>Xp%Dk*nd!nJ\tZ#_*6_m_1mmpRaq%PobKd"Yh/?;oBpJ;rD-o6c:hV#(diX0Og2m!('P7lBnG+saG&?s2C,NNK<9#!5enOla%1M>/pK4%Br1QTTA+Vh'g(rk4ps<1C.fYHLd"$*n%OU=E"%Z@LUQHBsQ-=i6?s<72_(mDQ#XK_44\R(`V\2B,e2"".6:@H\SdLp"dMZZtrEB^#J&5%4S09oO@:[e)%?f.O)p7bG\]L+?@%:=>n"*qhQR3;.,'aEU<"r5Li;&$(1QbQA^-%1Pq_/98rmn+DVka7!\"$Ib@6S-IKUTF/%L3U`_oPr+s#*&+4n%;AYc@+0%Ua>4^S]MN3-%Ci_9DQkoNE40KOSLgL:dn1EB9E^sEGM@o4_s`646/7s)(j.Ot/u6$u?KL%gjV2(LAci#I-7lTE$R<6%!fb*BjPX0A[nYUTWqCHN#+[aY$MjOaCE9J.P$M;X^qbAe+-&">p:85WRWK;%pN7?V6jS^"[TD=^VVimH%H@gR&+<`BC"RO-_.+b,0"j>NlhRUQD-rsdIR;#3BH!?Yf[Zn^dtl+LD+M%8R*;P2[Pjkp53gadQYY1NQ:;5^1]#TA0N`QA\Zl4K=Sp/q@]cumPW'!mM>)i7E!KM4%E4'&rFYjaLftR[l(P&k(/-A]*AYpdi$=D:-KP,06`_u\g^CZ8RZ%>A*D^tL:LMZS#:#F-U2C(c]^SK**mk:9in0-I;IP*m.Gfk(cN7M%9H+OQ0/i%`U*Ds\K\8+(bodpr#=Q&2G`C!fW?Ep2]L_#6%O8OrcoD).ZnZ):m+)hdJ_7]sk9_u%[Z0#m1+e.`/Ln!tN@^fr3sKpH'KtC^8/b.j<(1.i6g@>glT'E>R;d3`$Z[$GAnG7dbfkgh6j00K8lJ<4G6Zf@"bt3M5G5[e`m7S#gZP"7N3YcAs.^tgdiEb600J:W6!s-XQ(=es,:S*TC"=[X[PL+&gZrT1WKX:'?TfaX-WD(J=R)pa?=s"BDHLQTs,=RJ)&0$&(92WaE40edtdq^!+!ee4c77hi9<6/4-(fZIaIE0-6e4bT^G7L##ei`K@Q4%]-5M<*O]W,\HVSbN&"6m$*)KJH:C;N*/8pmaNhIOg,PLoRRE-%tepaA^[@_mkQ#;"%)OgR$.1NC("36XjM9f313"o\Z_4mDc1$\Z=aQEQ:(E-PBqr-p#)?3kN1L'\7$Rcu5r,['#]J@+'Ze`I0JH*?D[&;6*tuH>llk.)b6ScijkU4UTkkm$6_h9*_Idk([B"VY>1"0Xh#c\[%].L"&*bhWjBLZ&_1l?u!I$H9G1f@7F*[_IJnbi91d^r3e/pqMEIKe*'KWC@f0d#lA0&gSPIh72aoebQ0?^AP!jhMdh&cQ'!Ume_.KE>lSqeq.)`OdK'e1?Xbp"(@5/[?T'Ul>'j/t/hKN29`)7?f")JT5"&P4YB%]V,'NfN?gn\2+7`"92hR'"Q2m)E8bVuUC.\:rtj.cbEWNPtN@Vi@?/ErW4:ECFDXO.M,+p:\T.5]OC43:5tVA10N=?'7)/#KT7)4,9+FF\)4'M\Kh2Na7bs$;L\aj;;>C^/m\-Psf7Di:I,I,gB9F_ctf^KCBF0J=1"YT6I-kIOX%Y;iD`2T/]@W)e'Y/m-h.B\;V$(YU^=I`iTM]\HN>c7p2cLD`(\=NUr5Tqd`Jdsk!F1/Xs>9iT,b(F+qU#OjpEnF2b]5BdY!E;jZP?Bkdu$Yg1,AHYWIRj6psF5/[11n*6C^hnZ.=:,hRl^+pSqG$rO(lX,o^'?UiYZ?SBro=KqLAPGHYVJd%uOL84+'[ThYu:g''5?N7Y'?_(t&Rl1$Q-iZ_ErAVY%>u(34N$#S0jE7GT>qVGS>W__VlY2L6%iA;SYe5n4jfd3/QG>T?Z5B2(X;qpj%VkP!28MP,BFf%Ntq*)AT2;NT8e`LrL*\%;,ZR5(?s0>?Oj;V\Q9rbtVK.3uab;88_fHi6rf,OJ%6PE2O7J0MIE:lbec<]dP&J^^e[C_e0YQDZ.:iV:k3SE7L6%T,1?].jkH:[`&_B[pEP=Vg03sh!]B0#7NQmo7fe(o[fE7P$QN2+I8UkNAOnRDK1i.&k`Y':7QE&cDf@VS?J6^74G7ngX3N=N(K7hWPf6@0$PA2N?&(#[rPSk<@i?`HFjA]'Q8(&k%P6U">a!9odC":c/_77U!dm&#?kN("u^@>WR;Mhc2nmF;.9=1=S;1dTbI_G"SK#7i2%ncd15:F1BXB$kjKYU*q-XL5;\6_Pis=pci%`%Jh=_S"b_XfF\*jF,M2EQ=QCTiUjoE6Z9.E]Ak5d\;fP15/qt'#h_ue&C@"&-=j"%N_TrX/@iiq--VGd7b%RYPH0H,];V.OjRCh`OMLne-TKDRsM:N]oG7^=(_)R5H`6L,J0%R.oD6I]l&*SL^gXDe,>g\I?LUgR1KgjNhjO9uot?]$K>f*:NL$h6C_I^.m#)+P_nTS@OQ#Q$SFD3*a,e5Ni5tYPRX&%o1hj[6i?]q%GA.]qQ=:d??'Te98kK5\N@=O:DDgW*sm9#nS?nKLl=m(pIKc,Th.ll.?7$Ln57gpM3(i,SLcE`)Q&(Z&2BO*@(n.#AT+([R!4kG)jG!j&)hR&L-Y44ZWVup!=2OQ/Bb`ILmi^$_J>-Ad.2#SM)^3e3%q?7Qe8cCVDTVVbE;P"iG-bP7&O.,WqQ[4Wa>hM*re2:4YiG6;)J0&7mQ>B-n%kJm2_%?u^al"ose3_nX\7@@CV]BU5egbs4-+sh"ofX+]%Ci-G:Mc"6?2Q4!"UMYoW<^gP&agTsPr3s3L'a[ejr"9P-tBsEHFJ7uUbp@f3#A.hrH+mQj(qnSr3d>l0`G&$QmBM536S\l/E>&m#=8c4&L.?4&.ES.)!.P5#Z:mXjSsbJ$Ui>bg#_9M9I:W'Ddqm(pbl4YBOA4J\J@['tL'n\iiQIZI^RS>&>La3\n7PVsr91Yf>(lcJV)>laWWSHmU)/ZgVU:-%#D75Fud=`Z"KI:&L3YVhAM&IN3m)5tCp`.@Xflh;H-%E28'&"1IaP?*(@K>]t'"=(:-;&Y>5Z7&.B.2UrVLP?A\2AJ@^F8';XPWO[,5Tpu,@Y(9MJ?IfNZ+7A\YJ\<@nCRY8Qq';J5]QCn>oC^=e?[i)I-4MKOT9@JrnqlAcKbK_SP8(.^7\U(g6:;MdnSP;SHfN`>U4:0/+$:geQOfa)=Sk9t\r-45+I@00eI^FOmq4S>/@%r#aq[FN.=tif.X[h7+XpgldRZ&hjT?lGjHnltNMMKYgGTI*08nlPOE*\gjBtY,mUkB"d0b8`IM!K]1Csj@:)1[8@$'u[On!\JT6Dc\3ICA;iE/B9GQsdYu5S)it+HR]kOWksPRH#&;%VICoftUFeKb3D*lV0_0-9aADkpYb2CU]"38nS18r*!OMc(=OI<8$?W?narMS85qE`fBtrRYtE=C0&\"Boba&-Vrg&qYaYHQ!%rN?1B'f*o1[c@#>e6V!!4S6/WS[>*ft)#4(p79tDKTHE,h%`MB"g'CRYjQHL+&'JLBO-WILFpZsCJ#"+'`s2q&LZKWI>?G'O=*CWMD#-cF9S>BbT=gL%*GB"*JDJ)e!0>u;c!p2RX+3dFskS7+QjF@,$>'Om>&@0j&MqCFUlfnLo8a-RVU6J_\$LJMp$^6=KtEcg,n3#p7XMg"r#/Afl>0(#I>p[MMQqPC4?+^l67">50GX2>OMQDOuE!P<1if&d\RU4/!!VC%9r$&\LV9I`"JYSeZ+U58kAT-Dhb8=>VI`)bE)SZII?2ElkRQ'X"2b[BO/7]6o_H,1+3uc5VT149J[,k&%-j+R^!7cOf(#6]jg7Lld+=h<%LKIcD4k>ttCfkDt+BY&l\$liN5Brk,/Tg]7lY$T^*YDnLaVCdTULQ2.]]\]gX.i;p%I:Ti$T3o3oJ]oR`[M!j,u9\X;%k.RWAV;UGS_87AYpA,&'\-WmfEpG]ru0H^:JQ5>I0XY^D2R#=7WNX,]D=hFb,(N^I/[B*q>?Qdu!,-2SBF!qjXX=F*6uW8@k$Z"2O>d0`<+P2Yr_a`pE5tlU"t7pq"c?j[n"&:A,tf=>>n('/E0(]`_PqUfaaq,ptC[8uDBF4M6R7+BG9)=[B,F(M]S:+:cVP+f/14e`=qnP'u1,3LDUH]cJ_X9`+Ku-L.!7p9h,mMQ9;T=V@ag=\#llBZC?#bF4WU1dTo;IT_'oF=!7oV+MXt&l((GA(c9CNptoB)"#Ik*>3CP#oPq(rppOi!2VEe!aN8;!bP[Q88KE=+J,5A'J)@/$06;b:j@1.E.]9u&P@lQePgF"VKA4::VVUpqt$M++^327qHpFc'_f_Wg%j4Rk$1+M'N^9dZcL`r-jM;oc3`?,KV7B@cgbs/48XRreJ05Q=TF*]&eG=<6m3AuKa%52U[pK\(X_IW;E>g#r)8c=J9OM<=C`+u>0I[SjJQu>EOqpaQ!N48bn<)41O9VV$b4!j7ZIPrOf>ob7.YuTGD?rW*aO>ZKV@bD,B$f*,\K$Gi[H<4g=5*lT\O9b0j)@rR>M-hg^9]A,L&DiW+pEZR!h%=BS-Qqm.EMNRaX;&KC@F>HkF3Mf0OSTJ-OJ]es_B.-N>*7^N2GDPZWgbhYGZS+i0e'mh8AU2Z9,p78GL\AF$M3JsdBC8JL\)bfj1?`!X?6ru:^l7e)TInrcu>OW8BP9J]iRV^.L&2i`e=C^R^%/4?u=N1Pl^W8k7=,A$ZbDpr#6r29AiIop[m67J,_l371C=-7D76W4RU7-V:??)'RF4q)BjZOl'5!Y"3(p^HQ(i96S3OJgc'[&OAsX#oJa<_4WJZY2DiIiKh8q4)-]CS/u'!`^1RU$t""nV1[o13l='GeAiS):OOsJD)+h3Fl_R<">iq$fZ/!:i^91/i4Qb>6)-ETn/2BiR5BXCkT3`*hnt4anTk1E(d0;o[B45so'32P-4&Y60'AY_TQ3'0&]_Q&9g_iP=2/@-`9aNIsOVjOA@/-l6k]*?a)B`;iZd_$D8dXAVYSdrr)dF<2]qNX-K<$Xl.:jf%@N=I'-d7:ne[LBRa%e+ul=&UR;L(K*c\gU=@Tui3A2/0>"s>;(Ajh&^BgrC\]"!l`n=3>34=M-M*!5eS;1?b[<'66](T#pDS3=LHs,9@aP*V+le>mMRH33R"A1U8=Sf;T0-ar-6*Q2>K1@/JN.9(EQZKF=4m1+fH1cqm%^9ZG#Q5nN'.,34gA+EEFlnkSda_c6<8A<_"*A0ZJ]1I&=O;t2,]$me#&Jl[QafWa+&Ge6oRaeP?*tUQoL`#B4f*\bVgG@%,nsaf"$1I>?L.QMoI;oJ^=`KKkbUtUD.NP`,aK.pP3AZre3(8ALJUd;[:Zc`;LNM2UUra1EFpL$2<.`$D%SX;`4S2%?gtorqLUo^V;-cKbI^#97NuNaX[Pl@<0aLc>MRPL(ps^H`?A'T]+dPh[I^oV4`%@=ZU@5@#0nl-AForGeTO]Bb/#S:tZN1h^lGqVP9[ZAq'Z471>tRL'UlHQRFnVp[N`>aXDQrf=r<1D>^rGc<6,(_U-lSUS]$'`#Z0QjQ]Se:ul0RLqhjB6&8*j-oMorUf9E@,!g[%bfm"LB8!lg!]%0KO>?iO^E/ULo$IHRJ`-poK,m3e#RV.&'pscf"`Z_\Fo%[6E-&/:B8"/R4-)r"T6a(\&BPTm47)r_W-:Dk-6YLC.!]1S\`KT_\)?!:h+\ZL6b[MN@l>`6E:Q)g'B1aibYa.kV_ia$d*5McY=#1hGJ$k6R*sS63eMqMPaauX"N3\FB=Ha7kX2XDktH`:&nqGQg7bcF`s#;$ZZIq'MB1Jm>%SeRBG,Ve;AQQO1uK@j@NK%U=ZPW4oc*`hU`t11loE3"c8pe3B5!ct!(^kXlEG.AN_o,LI`1pB?oQsPF=(u6gUQbW`!Bg#^E=K[8&:R=m3[UoD`':(U?b3FBa.NuO?DN`@;bns]sdO&=@!8O_c,W<-N1Ab)==A]#OIZH`XQ?:.rkj.21Ugi@./(P[kC20>3L>oJi$o)6UI;>F",B9(`X!_ZO.mbdJWs_n$1d1I7=,3K-2:rM3#-!820:YMBk*J%"o'm'g%V6J]6\kh4WtWON]Q^gj"Su_T()aM\6%(BNhiA/;=cm3*)69KA&X-QqLQHI)R)=g\B]R,7MGEEcqd@+W0cF&jW2O+iJIhSkdV2-UU80=T*2-C#T;J65C/pFAq)Un\+iccieW\MRT&B(d%MK=ck\I%QJFt#meUD-oTN'2ZmU<;;dOY+ASgDT*.(K[<_G3'3[H7/Xq37"q`!r#a'X/TM4tn0K=AA>:a0B$%UgYf*B\*I1:bW6?2uGSK6!&:!JXCW-b0K(^skF!^Rs,A05R:%g1\An%he-i:3P&@m9>QF>nG)O0S&,`#o->pduV#+l0/P'@)e\>g)\?R\bpWk.5*JV(-.Z7Au"E:_G:KjaN.$12LGsMLgEGP[`UtM3dACpTck=La5Po>^'fBHe]kLteJTo;Ak"!KP,T5ETtVT(1.=cl<16]N(7(CfO-ID)IZ5bM56fo1gnjkZS@qIM\r^tR$g?mM?5&^;1a>%33Th5e)Bp`/O!gH0(mXk+ooJ8!2nkkRgdSjr+L@6C]9)"9K%Xk7r)+)0dmtFL'+:.9uUOO868r(P6&%[DNs-V8J39fcTj@LKTg>B"YQ!EF(#nS,cPaO2XM(=7g$"Nd7H1g,ajDn+tAkCl+G2=5m`7BnXsN81*8e*NNC*O#8@FM"dBr-(q$K+BXSW_k:7+4=3qF("CtfD:02"ZfjVVT9kfM@+67*'+BNL1lS-pap!uAiqI-8pX?uf3!@Y/*LT5`G*0%7'U(N8<@Kn7)b%!.^/nN'(J-^We#Sp*"#(EW>8g\:b`[&GWaBD<0&&Y9mKhd:Fh$AioQ[d^%:IkVFot-KgAYQY^@&Jh;&[Gl[0*"/d>/4uYd>%qh/RHVflCaA'##iccT!SMZCNckqlhF?9kHn).=2X"ZgV]2I'E10H10aI&6'2Wb^^(7/-I"i]C3A=DNH*3Em*/qSUP"K@Xa(Hbg)X:'Q@#!7R$)NVFPf)Wfl9T^TeDF8t6fpYfQUZ:6+^I]46$^AhT?E[+N1QW`5oO&&DB('fh(4]=cRq^R\HD3%pK8hbu-9?o?:[M90'HnY$e/;\_N!!bp\JON@W`4$ti57X(i8.!WLj:-?@dUi48I:MKsJXXFB3_](q?aH\IiShG/ef(62f*QM>qQ&)a'%e/%U'2BW<6TGlqS@%@k'I:Fe\HuDm/V_q4=@a-i,U@unWjHJP$qZdI0`3@od5+,P:PGs4SOZE'@,k7eXU`nCP>]Y!#-^+bd"&N;@C2HO1M8g<`($o!oZW+^6*s16:'IOhB.hoL\DEL#d]RSoAD4/"Vqp)k@Y;ep"aH@0_YLtZW0Eh]9p@T/re&M`tAS^Ud%>_B4Fl/&C]8+YP*+A^_9d=$_mF3qsTn/?JuN5Qas)(C.kn#go)c&>n!"-e"JeO2>9>Q`pGTQ`mC_VOgH?_E%Of8L]ucg>V1`YL*6@6/!PhcUD:,HIOX`5G'O.Q#r3OMVf'Uf)j^%&*LOPGFu@u.Ui4\':-#uj*C8>ikkJl&,k%[)K6j+c4?lZr%G,kG#4JK2`p)Bmnfo?R;\%.(T2&(blLZ@D[!*1TOr,DKb>JV.VIj-aoHZ=4ni]6#1)/m3R!8[o7Yi`k$A%JFA7:S^''0H7^'*QfYj::mR;snfC_dl2Pdt@^m?\CLeFad>Q&?M&U`EOd(qTb'kSWLJ2m9>3L,)2Zd$*k^=n4>P!Z*je*F1pddf@h*IHmqhgQ;][-P)SUu.]=6##1"#h\Vrt2;EOKQ'jBMi\[DrkkcFY#+]XigGsYS@R3jNd5KM/i\SqE9PV1_9lmeE@gLmgf:$pgN5(0o\a@#N&*>2=mDRS-Gc,OO^(XqnZjAR,2Wu+C#>aE5;Los#XT:^`Bnr`lqYu3@pNSsY7O8PZ>9t08P]n.UM40#9ULI8n4C'_:i/10PgJ4D[[,1,d)I`&3ROj5Ro9U72OOrKZur)uR'og=N9>u!gG:j-<%R"Rftr&rfdP:1_#D%D4;ShTf[G4*[LTpg27-KBDa-A[*GHKa>!Rc)oXiQrqA8jen$:UnR"]4A3&$UtCFT.`fG+sg0N/m;q[N&chPhPDQQkba9\Eb?;!AR$25fI>4TP<$jh1?5ROn!]A+WEhm@m+D]as(G1jhQ*-S'F"7A8#lW_)0Hb*kB3mYq?L[e=3O!XQDFSaG,Km*hb7j1h3eJ[\>RUTbW6RhI<9REL4V**dZJo+-!b\CX`"OcUj8g*C*DTjkrQb$cMXLp`ge%rnC::>p]N4>(Pbhk$PFWf9Fo53LgE.M;4XO*t)0O<0`/9F'V)B;\L`$Tq8*O9/K,9/`TkO[S@5s8E[(,hCGP8k/P0T/dY;(1db!L:%BQ5o%uGpSo6K,@UE-d'opPkYP!6-%_UA?;a=IA8s.,[>c2s4s0\PD-5r,l-B/Jr"G2k:h).SW.fft/ReR"6@*o5Cm<&;oW!Q_Un;hQdMk\a#]<6CN?Y;"DrRjcAT(7>))%OrlfhdV7@.$R$'-n@nB_NR8a@ZV%R3BNnr3:H;@EURu(BtCYt1)j1:7OLg$AEuZ8%#du[dpOkk%LQ%N+n]UaS/pZ*FpNQ>A[r\?"jn!'GTY7_'L/ur[RG6Q5TpCu#ZVhT`*K(?E#loYMIW2.lZ55sp?P+`#!TH4hsGYE9t5>`)btnB&:S8.>HaMB6%K7a:.a%30s4(ON"uE>1]U0!7%tA^Q(_$6UJ#.!A*)2W+r2J/=]/+[`0@P/G#Mtj8d^G`eBNebTL4YG9-%-A@Nf2HOFmti$-rDSE:8D((j`^4eL?=rDI]$_j$:*_8-58'g3gIY@E>i^Xm*DtgYB0\=PHDN`W?\dOCSR*;o"!AB:/k$J:[TH3BqeEG.h:3JZu#t^.RS8QY08opR"tQa$Ci"hVI:ed+.'f&H1CV*F),[3$hAmYiUd]Z6e"+'q,;%K1S)O.L!5+5Zq5=Z3YdQ99O1f4Vp=,XW+)U+h!a,XN!j^@0b_n;;4=@82=&>BgNs*YC1-'A$8lGUi/IX.:n6X\Xa@]T8?8l*\G=tHH'%G(@K:>(T3GF1?6;&g`IJ:gFU@7!FQ_D4_^._&dch8Ki@],B8QAH%=CK*.A?kQe1Q)tODc#IWDjAT@k=;1t-,XQ8HpW-j#!RuTNA4ES5K<.C]7"2VAogO2_^*N2Io1dd%-9?h=fpLH"O`?\Gs!nF/,A)QL#o.E'E#o[)'H4M;,qtnI/4bMa)H7:6g.3[bh]k`.nahj;i)b4aSFdmC1^7T^V6S%Cui6WK[@djquC@e5ed`:n#Y9W]u9\d.Sfhg-C-4bB-!.O]cCjN^G.[ZnaOVnBZ+ODbWKi:YbI)UF?CG4Bt`on/U*t$)4g9Q]$]0AWn^o\7NL/Ip,WIG677;P,%u/MYd5Q:E3LL`1d,m^KbVb:$5j^laq&':4X3Nt5L/<7(2\H\\MmohV[sn>4M]6drF1?I\+H0eOiA7.A,`:dCGu&8HMWg7M#2U/.OBSiO6RZ%6l!iGJ52p9MC&Ze7!M(jOiYD>&R!:dd8"gO6XmcF5Sb@p5:f3A@4\'JpGrTV^7<-cCoKE/MLV/YKGXQpp^,"09L&)JX//%OMG9?l,>$r#haXPC)tD4jr\,)V<"GA_VCQW?=K%#U9q[)'?'N-t=_^]3GC^%qfZkW<5e(PlS$&!\ltC/.+*#0E@iK"plKj1%GQWkS>=uc;4V1>$s`X7+ogQOu3AEG*OG>Q'e?u9D:tpRgk(FR=;bo92^QI/-R4/5nISZ`'f225nL:o!nPJ&b%=!Y0uS[u6t$HJL._e/YRF'6/D2NC'D4AN]%TfcN(rlH&^;dVkP1^\/^;T#iF^75jIu0le(.(-dB'C/02OU%E&a\k(;B>'coo9H_atd)C2j][#-Xj3'SP1$rm!(NcgN#<>H,&pMi0@^0nXh,a34NFIq-E`!V)O/<5>_VHF!='ZL;a=bVt;3ADeUYS7e0"NkJ)l(.T%7fuH[H9uV$_8H3:C-=H$+5+YF5;`>sB7Bfj4Ti:O&D]1Llbpop@EF7,C)_hh0SgR)H:,[L9Qp#>3Y7dO$bdS`rN\``jnDFGHI"*11/?gu%87?jj]90U-!(_8dT/_B<7rX2$UX](_gL$+@unA4Ni>mtL+d=4l6rMf`eO!#6%MSIW'b,ee>HkoR8&i8C0*/#g"m7=,QnXh!5SrZ#M8)tcT1;)=9]$>&e]3Gm>RB5?U*VD>W;.#$mYi^7E5p^<7^]1dVBV1XH8b%HQ>RoB6LC48o80SA=At=DRW>7RVedfdOK+=.D?PLP;9LZCt&nPBdm1gR+oSb/XoroDdM`E2,+a!p??at6dr0L-!7T"[Oca9-sHN8[r6W$ejZ$D;U&?&P,heBMVHOj&diAfB$*$gH0:?dN?fBCZ*(BLW3i[".SBIg[C3ZS1IN0>WMMpZbAA21O%47394Tq`CRV;f;V&df[[/pSUop[p_FQ/o_iOU@p-6+@kFJMq=5Na.Ko,[t'NnE&iP6W?5<98dau&VTVKUc7.r(_8ZLlmd":3!)Bt8K]Pa826tmbo4bNVD9`Mo5p7/k*EQXfr!L>Xa&F.<=&p4*\]L(@Nm.95W>T7#`5hYTiJ??%cIs]@M]abW(&&%;6cseB%6V@mAj;Z)-+"FXOa>ND\qXRnnaQ?7:o_l[2Wjt'1nk&(,Q_p).q<6R?hS,8OglKLF]/aCBbjJueP8Au<4*MX,5@m^cH+]#r]Un,I"._83F9Y#MU(`8C9jNOH)'DKbJbdS:qfu(ggODj!<"!RPa]?n-&\-kcVFmOl5G8um%<]PHOLYa49@AY*;l#M3ii'LMr8pd(WNSiel^[_k$*T3TK=YfQNn[:fF9=3g)$WP\GVF`d0S.MCQ7ri*4SudQiY;stTcO_,Q<5TgVLkjLWQfWYdjgjj"qX5C$9CeEa9qU5B-9IGZH>\nVH?A4,gYCXtO!8:leGVt%:iP"2gRiUbcWE_).8hX,PHc.^h7FTMG-'hgj0W5e?;F.[KHr)7=0:f2S'4@:H0W2oSW@>`:*pQ`_tF;_9^fY(H/))kQM+e!1.%,n7'tsR>1?ao@8?&bB:!V/S8`l@f<876@Be(OKp!k>X-_M[%F]6dgHPmf@=Z;oOAhkMNO=t%/+%,u1`\KL&<^Qr*<\XpcihtP[.0,5T[PK\bqP0nljigu)7cL`TVAg;C=0"7(Q:VY"nQu+%j#T.(M]s4Cgpb2$t_@>7(#QX_GL]gea%>Oe(^qTQSaA&,(d<+e$uM'G:H.!e;F+Zrc,uf7CPBU^A,Z6<^DK6kGAFe]-7M*oT&PK`9uXAr-'_ZTERZ\q;!b7jIAm'?$Osufhi3qg#HmXpLEUY?Pq`:!)\J+^;M^6:7_]FrHd(d_rCSud*KZi!F1Z'o7c9e_AaOgPlmO:g"4fhB<3m!M1uUi)hrkM&Dln:s]__,k:Y8_Dj0t3.LC23.$#\+1"L(5@9rl$4YS2j2^SAKq=PDEUu+^$ApA]JuW<:LjG:'4T37UXFSF-dmN)2[*,]^I$I,4Ws1iK[>0L7#I>5WN]ccZ.,5)0i;t02SW.ciRYj(!7rGR6j:NJO.5AFMh;7//RbC'ob1>CUbU=OH56ce2b5&?YrBec4*?.'H%Tn7\pk9N<+\>kMho!YtCDq%rcm2U%:A[p]prpX9VZJVIIJhZS(Z$!\DugnCktj&ia#ThouK*I:+j^`59L'm+Fd+[9CIsi8V]'$.prUlFfUuRs-=2Qs&C>1&TIN6!)"mjt^fK^Y=2;qN=4joCKSXa4hGBg/Zq(/>&_>oT/>oH\)9!LDlg:,J=cl%Mf5q6FCK(Sm[Zl4d?$-'6LA_T"&sH!f:iY1*=Ir(Kj%^,S=Pk5Vl+g3m+"lY&pMtCM7:NG^9kL_jqAYbs\L-0^/WEW7OY"*lS/3)+!.LjeL9JM5d1`F#C$CFDLX*Bnm'lb]2qqT`Oq[6a%GGk>mo$mu!T6\?*9E7rV#.&l]W-em`s0aKe#Ce&Yg,>t+[+I03je]F>:eApPi;igA>-9nNJDL/h@#'(5(3dTuL63=7\lH!TOE]:!PgQCQ`NY*Pq(RQX2\Wo`G.+rE7-0b[Cj)W"K"6K)7c"kZ7%j1Dq!@N,W!1Tj,]Xgk6:b:fHbGB\7TES]IMbJBWE9mTj+L;n1?m%NJ9]Bf^*+X!HiD(SmbY-.JFf\*B9fX!?OLdb^)MS;HqDHqPk[slqQ-"#(`VB/NTp<='.+iQ39O^i(V#9;e$o=$1=N"O@'(1)-(ZK.'0AZDmLk?;ZbN_^:50;qOnQri(:=#;AaZB1"G+KL8GbshO32Vp`$Hcn20a$q/)g4TG_Zjgo"aE"oFs%2sge-@P&CjXg@lb:+^OL.Tk'_:QTH.$QF&ZM%.Qc8*j@eODCM'Wt1'b_QS\`>#lE+'4+#a]W`6W=Lp,pIrFM/B]35bX!:"c4):cTIM'GXCM6REe`*PJ$:7(_%$M7KH)70f!:^$"YCV!0e6bgVS7=X(LnDHqQC?(X^!;^dL_FFH%$\$c]N3i+X;1bO`*fIWC84+"a;LWtjWXFOS@.CVJJd7RP40oF,?-Kb!>h`5GCmJAY)e,;KV.F^j-*>IhA@-/Wj'(QLX`IR8G-lVTR&@$,)$#Ucd"/"i@73qF!D%l0=TW?A9E;`!QI"4+kFHV*@][J>8)I`TSf+K4M%k-"/D[`j@)<`I9@_E4#f+7b:QT)eU_#^@8d?3,JK#7)A;Ae(o-pL:7\N>KR(%r2`7B@/L+>=bEYRP:,WJGCn[c,B1<;H?*lf!(L'QXq_T8QCU.?_56R"@[5E?&^3(TL&&Y@LGqJdp/\ErT:Dc<<5^tNDS]e&)Tl0#ph)[(3ga<0a['c95aegqX>>+)U5nE9RZY5ClC>7e:pZCPHGcBa]n&7H_-6;eht9p;)2hPerAerLjXUH):&@RO0OC;<,M)2N$p&O*NR>!5fg#W8_mOHO.=#Fn+H#PS#pHMQ.rlbi=J)dsPLOP_i@hs5LLbDV-qh%p[SX-[':N(._.-3/<Tr/1T=Ha&iU,hO7G)\fXM4i$6H4c?SkPH1Xk#Z.-8V0HL@NTa@F+RI"#k\HDhg$+L(2G4ZY@+C7V7'274n]L<@Xe4,Z0;UMclHi$HcIB+nhLd5!VXV\eB'kfE4`rD\PT$?n[lQL^3@"MF%:Y,XjC27nL*7=0Z.\63i>OiIgR,_P#Qob`IPi:c1!>TR*/-k]Z?CN$MqGh67_aOq<`UlS>&qj?4=4^Sq'N7:b6fQjM!E6C)^U4bXmO_s3uURea4'A`Hb9mBTMd`;Mmr:AjpTF>.,KSYZmJ-::C>*b$2)!d2oriZ%O+8i``Zl#7SY3dGDbH9rJU!_G)TVdW-[Ts0kmdT'-FOG.q^Ei*"$Q$=;K'ab]+#3h:6TGE;T=2njnE(Q8oKL.A@EUsH(5W+o,")u1C%'pZYZAL6$;T6QKjo.:X*#/hMG_%`;YdTRn!AHfJ*GU`Ub).LNg1r>FPO[po:.([8pQoMrV2T$^G#fo"mUe>4*@Q%d7K6%?&O!\F0>dCG5ZV*PO!Fue2l*XfZUM;DcRqnkCd8XB4)jZJC[u4N!o'Ohi@7lhXQ0LYu+Me[r[>(nJK.&.QN5C9]6<5YUP)QY#P3-209UtRl3Qgl_@m[u\1!=-Gd)KSEFh;?BWCCl^^YB>6LkNcCc.&(]6=n)O.UsAM%h+Gg]dnkaQk%Y;[f!G1gdQG/e)pNj[!2Kia:NgW*K\X_)>csX"C#SoZX,pX-46?*8PYi3rV4ni&Pkb*_ZL/U]0"<\*%5K:c3B'lt)e4d_3%Ecc?*ps-U.ClC!l%?q?Tqf.B!VChnbl[WTGs-69m_K?l(%RZ^bX;qVqkE]#Wf3XG%`'D;4"?BrHbQc0`2lt5lV(r@D,8%o#ijc\KJ8;_3ZK2]!g&/(ofqJ#BTJ?ukaTGPc68"2?*b1h`G)+c6-;3n)-aGsNo6>%U5sW$UPuLkuit#Wj'dB4%[_&@>ie5bCQ!e=KuIC:AkO7f'<%l_qKq,plP2[=TX2er1!QdbpL^AF)8Af`&kdT%Ke[5*e*m>V474eL\S_?,n881L7QkGb#C.Ojo"i/Z\_lIB!UARr]SElh[)<:@B\R+S2%!qT\.P"@s@:5->f9j:"t!s#=qP1.6[tU3_"@/ft$PrlDdSJ/$+:iKHR(BZ&YC>20oP?+Gq9r?;T+s1>fL_;3K\@k1C3Jaq?4+R/5PV:0r"7%':<;RdEEO$er(5ScJnV*%WqS'/A:OFi_LjVl2&lr2[KZoU!1dcb9FE4p!R\E(<7j*S3=Qf78CB#TX?_,"8fKp;*@&*A6l@:-0,:'WI9=9@>G0mV3IL\]1H9U/1\=>Adoi/iE5km`V!l]d,;L(g/:c\k9*jfn.PPgj^5hKI@:]s0K",^7H$NX"!<1ac1lT5F);BDrJ5_gq-LI+rs`e/in2OdQNZ04>7'?E.khp?i$mDr(l!ViJdNr%SK\i22OJXEYES'fm&:pCU=Y]I"b^!:0dk=VG3@r5th/OcipDl'-nEBJq;25jmmHl`$'?63P+Fte.`9!'Os"TZJ=.q5C/#aC25_qk:!F2>]b("D2/@.X-iRHc+fkR5#.rOb4U0b1O@3og>FE)TGoX6f"EK_Qos_3i'D!EOf+US//5`fBMh@kjj6L.M.@6a9W8M:p+MY]Dg7+gha-EE'I>b2X/:$Wn4'6+2V8e]L07D,u][LZ=8#Xoo04nCD%9YEk'.Qm<82UR`$]i+Cn.BS\CAWWIBaq";D`#n*H\CkS&%=O5po&RW%;X_0,)9md9!+&tfZc6;[kre;OrK,SZC8cR?A9JTGe3VB)?l2U0[fQZ8R6*M"hl.Wd9WmA?eYG0U#46hFrPg)UHEdAkT`R>&X!_A[eerVreP:'R\s2?%1L7)iRoedkktlqHZ@4bBkP@1G".I:k5iOlC<)L*t_D)ahWEgn%.FlrlcKHr4_Za9o`@AjIBRnH9M?f>TN06&'IghaF/+]-;C:A?1F%1N\UM(S'\KXC6J)FGs,_\O+='*)Pk_U;['U,85d4\cRqo@3)gdBj1;67P@G+K;+!BsJccR.T_a.I"uGlj<(klu;jb5Lt@_Ud-(B6apsmb*0OnW\lE@ZWR%r2LP]5qQO!'78q9cQ:hQ6QL6_4enrs&]6-%!_%JUL&1Kei/;"X$2$.V+tm>ThD(GJP=Di^YPQuNI@E+7=fgu;R>msihX_lu"<.:f'ULtggi5,%1G^:PQ0[!g#:;]\hn9c2)=>E0f69oVQ`F1Rg\9$.lOQVa&UX#:70L?m=s:]a[JPS18W@d&-4lQ9a+0Fc;n:u7rj2N-6(sH-XPg`_9n<$kLp.TF;<4EjMMf:eb+&)-D0EV+@LA%+CaEUa,Gcms+d#JKr@i[LQ$gqF=sJMUF0i:i%,@j8pf<7?%2!_iNu$VkQj'^p`,VPF8Y5j"2j57_KKB?e)"V11Y-59^=uHMDL>:UH\g2\9<9`(b)1'#-&mgq`J2f[.>@q''(Rh/';M0hWpV4]96N,V"cP,7'*2ALkiULa=Gu-3?fPU$=O$2nDD6Lp9F#_:!-q/,2+Cig$80EA>Sb^iL,KS.:D[48oO5?\&2DMFd?"q!ZopYY5a:LZSVUWZbPX+Uq6HP5%,.ERL]EOECX_fpp;E/W40GTdi>"L]i+YDlOgqo1HCo"&4l;98\A2ZAbs0hSR7+Joa\cF-[ZO4)G9&@_/WI7;)ro?`>=P@+++*8rJjG4!7Ic5MJK[_C0bV>8j[#:BB5+u7DD[(:`O:Q)cZV>!0kml6P%9M2mH!(^BCEF"nDNJm;UC7p!T9oP.m&G(K4',C@oq>noO]u!*uHC=._*UDNUAPP9uS!B5-`ET+==DW&>38a@9XpJ*Odoql+6D$!?VJ])c9=%ep9&$=Y&O=(qpW\LAdoS^$7N$507d%ObG_,[HGu;KX&/IQ3LLLI`C$;:0o,AM[T8FrOL.Sr5M^Q*Qin?UYg$^"1K*F'A4:_8]'sfnW$HKWHgq$fPiYbFh#j9#TZg1i3`+]GT/Y+S\;6LR`%`.?8*19-=Dm2)3Zh,=VFdJTq*/!4[h'tVJ.,,'0`Q\C2)nRaM=_%_]W9_C#XH"$7Y.tJniRj&td>diuVTrnFdn4h_j.5Qq]$a=(PAp^nH=SAGG);6Y_-]]N7bW,%58ZmIIti;ap^>VR[u]l'poSTM1Ki7RgVG4Zf60M)*rl9M,eRq$S2B+$1G=3-T*W\9>ZVj\=ROP%3WJr,C&5i*1G7f#EA_+CJ'Z7nfF,D"=6=^8I_2T[!s@cR*RbI2dQ^^/dTn.PK6V;@Q#@Hm'\ZM6Z5$2%Y@#P^tuB>P9(f8JHgc`Dq$EI9!bE.B(uI[]LKZg=Y.iCO"U2k..ISJ5Hkm$AH7qW!O<\!eK)?a9b-DkLo%UhL'utK%\fCh+^:!W*L(FH:61"Zh8Fpi`7UQj5JQ$_%[ke$8\.as[,g.>ZU'9>rAJ>@Y.H=+,Sh8$t;1!g.G0"t0'.^:h(8GW6>X%1uJ::I;iPfQ3;B?G(4&<^K.Mp%kuISJ^iQGktapHg,5[6k.*_1P&Qn8n'>\!R`$E_"RK7:t:,IJ3lW3=NEC!TQ\[BJSLT`5%8#!!gEk_AsNge6A=?3"@LZa!%?oV-B3r9uL3h_3C/mM2n]8^8mgCTB$@]]:TA@knL^gX%JAc$)_3Pj:"XmDRFu;?>LeDDi7lm+t&+m*)EN=EJ)R2.N#"5;9+QOtS:G]ALbA;pHJdP)806%J']A:VaPd^dhMCs#_>?+jP+V1ujT@7f]V-HpN35hf*;&sTW49Znj3-'M;F-IY[./CCG_1/fX-1t!)g?+T<':0hN_l,uqYFQ9!?)9En'^O21*PP#+h$@W;J]b$7""(ncCB264JhY1m.$Egc#"h_0!2:US6XaaH7T*_'OAQrr,o:?J6KK>B&RnIB=ghOCugok-?2$SP,uBXr8&a]%_p\Jf!.W>/-jERn.%3Cr,>#1"rZ?3GS7&/-&L(XG@=:]EoEtS?.6-E_iUs#+Ve0\Z%at+RF4XYn]ODk`l)dfF!ASh->bXp=GBq/5mCjG2,8PQ_V!G)lRj?8$i-(l@RPh_ittPhFg5R)OD,8`+;p5[qgH.(Er(%FSEE!m*TDq=[_,9RJl6fJda&jmBVo>EOEj9L:U3n&KCRo?SL"*bnrWW#3amjk4"4W,65?'c;%^l<_dbDMQS(qnl&63lcB,PZcJF_!(=L,h[fsiY%m:Or,2dE^l4Fkh),.ujE7+L2(?:,/2Pq%9'.jS^$+.*J'[Z(In$KnV9-I Ju@5!s[[*0S6aM_O3P%Q:Ml5#IlfU#XfOa%%;R;Tg[9I"%H[p]E#hsQruM=.\\ZHq?T-4kSQ(05*C=::P>h+0K=Q0^Ik,aA`$k;mkqIhR\-Y$`rLH`ns?1(T$\r2igYV*X?UdkH[ff>S3DOPPJQs09%8Qg:McBn4Ua$mrI:`5`SjdS0/kS743d`:gMi1R1@9aZHZbjS>I]T8Fbc_j"?B(W-4f#1LYXmTbPj\6*40ZJGG!='n"M\RuE`'2(@Tkr.\_8gUYcNE.5^>XJF]aunL\WL4Q+W#lO,aa'ki_C6b%h:a^cR4=M0oJB5#@+qYsSXbA/U=B(#%,euZR0Vj;`(,1p$ZBqX*a]u8\F]V_AO_4M'GuD+hEnQUP(8PC1DmjeMfP5CPb_%Sdr2pHhfoouZl*iHmZ=aV'V$'b-"YHFEZJ%s.![@snZ&L?80IWTE7'Kn_,`7aeV?3E_"u\-p+;kGR@<'suC?k3Q[+O)2=\D@j"7q6ZqT:S1&.jH=M/WYf&<`b;Q=?#6@O7IRC8OJN'/M);RPJTYPbaUWWZrDg!2Z!dN>QKRR'Nh5;&Y\M9hAo1J[R(@YKGGaD'YOCD)sfi[*]mLC'K3HWe>-P/83ai77g%=8iC:&S,)gt$H`#od+?M)0p*,%'"ibc+TbIA0M+XsCA\>I>K8b$)@o1,GXU`I5S8P^J=a\N4`(b+"4@0p`!S%EKN-L/mF#%0dB-J/2-[I?\uSUAG,D5sAui#fZYIi-\)W&8FHb-6@j;9RAj+s:[*li)JNG;4hZW](6&M%!9;\#J.$P#?Wue6LFUj0XVBUX:U?b43#]f@8O9gaU/:gqA&;SgX5I@&NXD!KIVkFP`PeY+tE$`))^('b)ZZ;o`KV65E^NsK_P\jus,sSSr>G@cQn>Fpg0G]5=Rp\q*fJujmfd&q/rOu4%pS`Q=INIK`T(^Wb/LKWl`5=]@&`Q.$%*l9bH`GO9/`Csa$k3A##o.NWUc7qu$n(E'aT/1r1_^07cE%mp58Qi6$RjsAq%]9@%$(-&!t:`>mDSU70u[0bc>6Wt-j+tmC3poKUf+B)Id#ZY3MXa2oX]PhQ=jgM]3Wf=/bp??>K7,(eCWZj;8W?\DNJ`X2d:Cs^oOEbOcmd]=L;"m3]+M_Me!l?"W?qp:/+ef/P&`F99,S?1DaVZ:+V!u5@FV1``TpAOd-SR5bis%9#S=r5R6GX9c%NMeWKom!7LDCN^'#IPf9ZdHHXU:2",aXod'+3G1;NgHI`Bs`,7regeA^ka2"bal.Z#ucc0aiQ_<$aUX%Z"B\hZ.j_%>Xsh[(OD2)X?U'lldJS8Qmu^rf5MPdjTbQQU1Hr_0%uRuj7Bk<@$sNuT]#s"P6Br5>5m:;LW2\<^#L*H(8.k44e6")#n%.'G`;oJeT,:)D45uY%I$Wb@MSGlGG^ga#<)a-;=_E03a&8DG/fm6uT1P`]Ld%'!AYi&0Shp>[%\Lh]chg+_Z26-A[-!NNBgL5=c/bat8`-ce5(>h<1"1GLXN?26,X4bj_b2bGg7\)$'Mr"_>5r9^KeOVnF5oNo0m:T:@%WA(#^n7&A4A*]ISWL\P"%fm]RIQ4aTuB#[q?$e>]LEi\]d\%%2"eBM7rIBX:R'XSTU-<)c,J])3rjE)4R_PN+eLfoVcmAYS"![RcNOB6WdkqAl5Th/HH.G=0`hkK9?KqX&C$-`XaE[l#hT.f:ThjKs,,)C?C$'eo(_@N]12@b"LpERphklmgWO9>_'.g=K]\QXE-&n&p'a!,Z!4+.X!jFAT-"Ue6gU=KSh5[VXW8,slNADiWV6:`i9tAK;XAY?]ZYX?QB!$*bBWoY&hFhc:Q;&YSlLZGJSif.;+bSJcYD'=?L,"eC<@2m\^2$NJbT7!J+ZHXk4tJ1="cNa5'd3k%HMpB3!A>]dlQA`N."X^G9lQ4DD$$6CUJ^@TSXkuX#@CfnIH>6VW`O@DdUB.?.\bu=]]A-#H@/0RZ"a9X&M'ZPl?in+L@5RjM&iDc!f]^Nj<*H2Vf_uq!9/:rQ#8R0JVW&SVg?L127,nm3D`ekeUo6p5\oh&[]#J--r>,*QcG@1TgT;@S:'6q$T0;t^(Ei.Ql2P^T8Y+p.d8'S)Q;_$9%6(g&spVI`,;VFc=PT+0Y'!)d"'oY^Bc?rA)qDsf*=58.WPNYXtp/.1=Faut4#=t^.R'SI"tGFMLj`,U=I;7o:n#+)^9p>s_U4#=9*1:J+FVC%P!c\iP.XIR+)$+o.-_3`H@TJ`&cIQfQhaq0AbE'bC#l^h6\>.L/L3*183S+V^=/A4[t#"h%1Y8WoFW9oO?bQn9R_ACRI_d"bh;hQ7o0(t>W:6:F,8*F#15db)_2_>^.JBV*(MOQ@o6;55:;+ma'a2f$rD`=]LLD'cSFhMTh&9n5Vf8rBDag>OmM3p6*1:E0Z$'=f03lo*eKEEFI#a%_ZfJK/hiIoPJg5Zh,+E^F;R'O*tX!GA8p,9kaH,@LX6oUT=(52_1*#Hj-j?mH"CkLmtU7RdF(U6"&dY95$FE)em6%Wd$dL>]A?.3^$i?.<6'4h&c[Ds4%$/u&Q^'kFnM#+7mFUa^&(ip!is&3",AiBU!JgMhf8iQ;TRgtT,TR)_o;LH\a"6Uj[++P#@:46c>pr]O[Hs:_^e,@$%pp#pJ_"')_O>MHJf7P$sau>_6OPXD3O"^QOJ-X:d%!]`)!i`A6IT8i5JDJoE.mW)jT+oe`1/dhf$gj9q(Ak+-A0RU;?c@e+AkD+_[eWd^m5]lS80caYITS#9#)=5Mc_u4eQ\e6!qP[qD4M0f?nT2d$!C/7-mCDUYMg6[UaTO6F\e*QT;,pUDKaR8mB+(5?of%aW8)"4pft&C7Tb)r"*+q(ClpH1^6@/XB3Y>$P*5XX!qK0MeFW=e&]Dac3Ia:6pe93R>X(:5(,NaPfPgUX/6^-YkpHM::PJ8P6DVjI;sWbisY72DG5g#9)t1[3X09-cM45CR&)K!1J&M%E&n4j<)17?4'%KJ"Zre^`.%jTEn9,ke[_HYV)uMpTE*&=[arQY=`/i%b16#_g2"9_K>mY6#qn8TkZQ3-gRh4*aHdXbm,^,8!&;.&s/$IP"Z_Lj,6,PLbGaq>Y4$/UC2_b<7B/pC`$44\16G7Lj2L0E[s\"qkMJ-qroi0e_,rUD0AM?T.$Y$t,@.*Z(n'`C%+W*"mWCEgOW![t'9C.OpD[Jl?2:+jfMlDgBUmeqW74=A%]\&b,rgmBQ#)%@JY03TacIIr"Wp93:^Y\>m"NVaI0!f[u6Hhm\h/=-!j>K@/0#4-;<2..iiUmX&F2G4uX!Q61mi5rqad+_%h>':"EmP;.+omO]`.LV=*JjOK5rHhph^^GYm<,J-N(ipr!ICK"hfp]&6NGis0ckk"Z7Fq]5k_cH-4Lb/BJ/]$C$/#FP3SNJQ'CB'pIiY[NLlM6sMZ*"t"bnKDh\eYMcC>Jm=7.%7d$J7cO,C#I4_!1_?WK=QVXdrs2ZL^[^SOH8#L]U-a-5XM9dG1pXihSV\YOjnSV6><3U)^B[kq&G?)bjIY?#RLNT0L0oe&seHO$B$!fYk'BrR?/Vd%^R6PLFg5BG,dY'6U:j&V&lg(&NS,=kLn>#Sam:DY0B=67Rr<]@NKcf+=()3J7jkaLBrD2%M:)k-4<0Qi*bJ]%ufFo]>otm6lsSN8u^).1[^%^O-GNN`;,Al4>NYr!*1W>Ip_QHfW#g%62iZKfs6=+O,0;i+d!KH7DW%?d#*G5>RAne!\[+]m*WmD:YVl+kN[^25O\PEhleZ)'i(XYKODJIitc.1'&MZl!ZZ"BBJ3o_Ua;<[Z#U*o3t[MbBf)=].9e._d-g@!QgY=edKHjp:3Lu$Tt,frB3,$&-Y)dObe00I#.qa"Nf9mj`V\?IM@1N6;!pk=;LHUC;(BrAKEMS!@#euIr419VjEaF^pB6jl-=DK47PW"+a8"gVU;YZ?>-Z*tZS+#?-gW2k`mg+B%VNcQ/Z+r'D-q@%PdF>o:7]cZ*3A\gf+*Jq9NKV57sV1Hi*7DX+QVU.PHggT!YIH]DApI.IVoof-u+GOH;oq\a[nOtS#$^f0hmS8\u,"G6`0V>P&t'G5F4/cDrfi\mZ^X!IlZmk4!IL4'iU>(UlI9qmEY]AmK\.O,WH]?1u!onXbuTM%9SMulP5JX4bc:t3KSa[)a,(m#@D"!e=,fM[i$9U[6%;b0Oa,fB9ObN`FnfrDaI!8KhuL`S73%O[,/lIe$0hHu&)SAqdd65aW2&CRZ,V*O\WVhLNLY-ki<-VqDKSq`s^Lkll;L_Mh3eRtgbg4hYtD&Ji`ST.BN*:.oriKgfAJ?/lTTgNVBn^e^1XEGRp+?O'n\6b6Ro)1`gkgn%JT?hqE&g4X=[k9YY5q(4C42UG4Q+#GE8T44DI<=D7d'BsHL2n1ZCXkFqQ6g$Xi+?INL[`.p7NhnDA@Hb._V$?1a;Duj0JNWb.l:o>.:KpCAI&T'5m4qkgs*4l)AOZf1R"k-,$PId@58tZ.?*=?*e5*bfl80F"l&3^pE"sWB(U>Sqh\Y"J"rgSq@NgjKT`<%$j6o+bLJc0I?t>fSJK'_Zg0FRtRU(fr:L/AAKW?k:k2&3DkY^o*PspCP:Um!Yc"gACV?=6.Mm_B1PaX$,Y[nXFc"S%>070R8>jg(->tJ9et[i"8Yk;kFeR8"6`/8#eD;)lMUd?I@6R:Hn`@J7-K8YD2SbrSB]]"E$R\s$RGfRl%L8Q%U$B%fopH/Tot:K>`A7A?==Y0ZZB_X7&?Y4:AN)X&BY>$L#IcA7c_LF]4#$7$t5Wm>?Se+_@s3(],fhJd2?MZRZ*YJVc$(R-MgE3811:?Lp=@a\Bn:$2#nbDPi1/GRl)CcO*H(Zq+p)&?sh8=\P?;:8!QCbX2B3!Fh1W8m!!)$>;/Qi$!n*Z9]=a%4s[D:Vcp)_+3hbac;0%QP1#G&uAT$D?Wk\0Yn?!HY5Y!EW*fW8:r%a,";kO&;!%pPUKB3&:C)cH2R%pSfO*29SIVEGO.S:H%GD^gY\qT?qDIPLqnWe6jY'QP"lCE9=d5hf8_m*9fI$6&X2g9Uf(D5rDDD6U1r+K'"f%M5V9ZR8;+W1:'CEm"e7^8]=PV"D![Z!eW<'^Xu-`tK!K`3QbpQ1nt8[EN(Be*35W?E)o&bZV[S[Ff_f&3"-QEWl+#+lP#E"@d-D!K\#N$@"Os"h8QiLc_%Y'H@m5C7#kAk>GiJ_00c-@2$E-?u^a:?M8Zc6Ugq4D_bBs"9_[(*#Y4#Y:aVSrdEQKZ:O#`"!I-fLSp5Fts7GJ0G=@L^+FH_OnWfFn#;Dp&!_)aoL<$PIe7XC;nLLYM\k1ToT[QI2r"7F$d=qmqcH]^F"WpK-pSlQfT`A\C0bUNG*[0r1sV7C[(kX)#28DGKT%;&`o<)A>];(A2R6Mof_p:JWW$ir*VpUVY'*'ndLY?7%FK.>WhhbmQ*fnc6kp:s&GH]u:R`N'k*5[:0u7O$#!hDA0N661O*eC-pH/;6\,b;'JY8ENY6W+^6IPbd&(h;Z6mu`55Un`a!"K:/'ZE.0J+X&QjT")@-jg$=snc+:_jU1bZ&o18749oVG]a9Eb#@]V8/53'-I]CN.f$W^g5Z2K*4Qg";-Rr(.$6ar("R7$p)<9?u_hZK85,UKlp$0V1:B]-tJ*-,pqrQ@W0/k"B+pgeIUbL,L)5tjiQ0RC^JP_7h4$/D`3C\Wce!/KrDbX!=9miZO%2='\$Qq.hcUNBn[mK1DQ_97b_U08?3"`#G6HIV/R?+=Tl/L/Lq7Q!ECG>6kpKAXGDB_c'#t@V(UlL`6&A0[7kIM$RS`Y(:+Q):b#/_Pa4YiAkJj9X9&qQ=>ZfX+J],qJ0GS!/$l-27*5Ur!K98nW/3(jgpF&d/p77m9FePFT9qgI@OWbQMRi_%?:l*QYJpq4ca"/PU@I_'9&XB/LBLh'n8N?SLG5\^sG4E>2d\l^&8DeYhN-uK/_:/2;1B]0o?__ee=md8@dl;JJ^bH6o9#L*StQL]X[:@?H4GfQV$d`q;T?oSTD#,F%6<8A3B:OD_MV3\M]3Dl(,1_A`qfc*=qG.1>p!%S^Whguk#`<4\eUdruC*g&h,+lHCs,gbd0Y->ET0,Gr^k;q[mMaRV9NmkaHNN%)'e*8P(m1)Fbs4'Rqq1RE\.hP:?YXP;?><@'h]B=M!F>BCSd'c,f'&gV15;b&"TJoYncOPWlTu9StFU=U?eg/I3NK"%ln21SDq[c$E:=bsXIV=`9'jd>39Sb\k$[f4\fW*4.]%)in65'qGij_aT2UfaM\_SYf%IIG0a%EFlVZ%S;M'SRsu\WG`S@R3pdE9-FeLqh)9B9>gkp-j\P/fF@[guE,Q2e4Q5<%m!+W>@gP;#`W(j?U@3[6J'XkL;)+.s?3h=0*APoh*[g!G6W+))EZl60mR"Tb(b_8g@VG^Kc9KVY2pB8m>e(OG[O39^=a4=PHTp*-=JW>gP671"M3R$Q@IlM(oG0F-ZJ`)7.Alsf?k'9)s.6;rPcjT4tVi)1f(#93Q"g$XVfZ4R_pR*4oETrRe+kbG!h2P(f$i'#1%[f&#DV?-1HlO&o:"'aR?m\Y$\b2WH3kX8DPrMDkcm1dZ4(WPB4V8kbndh@\jk.T2G->?6n_j!]H?n(7VkGud.3U]`'"?-c5(Y=?:DJ>1M\cuJXYIHDlRF38!FJokMCr(!8/8U,fnr\-HW,T#[a03ZdXNTGq)T#kr?:7H7E:^L@t:f8d+(:=`GU\mdHL)'dK$7M0pS^F&O7HYE,LPlEWoJ6.6="mT3:6QSPHp&)GqU<:6V,h;;rWZfMs!r$K:KkBn]QgZ")gQRQeDWI&4>:IesY(*9.U0TM`"e+F`cMCllqh90.^2ZDTeW,8=*\am/;O2Yl+WO6)ahhDI++j`pHE91KQ^afbR.`t7:k<:\Db-tmf;_<"YF>iXSec?%g[<0,%f(cC?`1^2V[]G*7X_jkiQ:197hE9\GPALn6/.egP@=d"0*642_[WXioR"H[N\^u3u3/V"F@]M/dU^PL8t-H,J#_c\c^8h;thqOrWR@.aP(8?!6EsP9!78>g&oq%&3AWD)="X=in,8EFE7LT8MmW'Q9)Q+P`-i&H!d1-PMK1>kmG\VXf`:j3)3A=2tsJ6,I>?e7.3moa?V:LQZs2Zm?E9'\APefK3.W1ENb>8B9ieQc/4Q@Ir9s_c]iHCk9c?l2-Fg3amMES)52XPp3=.=F+nqZ5LN+D).$%i&X@ogBKBc(btB=]2fklO\7brm5]p5+/DS-'=,SH)jOO*%'q*&_J9h+MP@c13QHAZq<r_.r@sh2W=Eqkn6m2WXS&U_CZSmCR_#mf$j!=(slg'\*Gq2SrWY^$AHEm-m1&dOINZJT';HL(R]I8-BL$7e49>G__ptjUJWU;CnhWl$<^r,X5bVEb%ZPkVE+`bdb9,lhS7kA8Yd.(o7k.ECD9HU+?1GS\;+`-n;&+mkrGMdb6E7VT3aYN7T@i7rmHr0eS*B+Tn8jcHg)^CeTgQ):,#X.Tr@kpuLHFQu;QjPB3(3FiHK`f88Ojo<PS'j2aQct6Am]hH8p5FmXjbD(bNFFgP^Lo6drNpM%lZ@C6VIW(-=Gt.p4UIdV:l^gXgA2@>3)3HZ,Ph&ejGu?cg>[UgYjTA579b+(!*VsmNACGc;klaU!MHF;@%_XsA4YmMdO8=(2*rOCP1TNJiFQ%uWB8b."!t4,L`$.kZq`>,NH!SqHud3tF2KYh:PC7lq#_+\VZV('Q'!c0rEHt[Kc=_J:ET"(;(@VIoPT3X$@S2fTOZmiAUVYK53=/q4IpV-[Ok6Ga2:8G1ec5Y*cH9F2$DO)a*q7M5KD[@mglL$dRaFpLTh"2!-#-7cK&ogN)!45DqE&"IkdH+;i!HL2Sq_@#XO%[0\*W)A*(s#.6E(e)NKhfV?=11#]BdZRIK^($0:&:UGWA0FWLrS]gV*Q$`S>8#C!Y#'Fd2g,Ip3W#C'Y4ncUUL]k[@#.q<+l92e8*WjkS/0i9DU$3joN%fH2&msC:Hr;J^2n0h[>>fIG7JaHpF5`gpM,`/>I-8_0*W(P%.,ghLKV.A4M%44a\8LA8mL(qdFL;pM9/X^EHW_65]>!Z_1UKGo8>"sl4gEi;*)N'_m25I$AJu*aV_H8:25hu)T]8)4#rSdC$YUjkAD/!,JH#UE6GnE1*)o7O+]P=BaAfM-!,b6=FQqs_X_'(I/@`.b3Bm!SLBWQaKJK`:kUH$X7#k4'JVHC,@#!aGg4qC092I=PkMO[QnOs,H:B?0E4d-pE6JIDrD*Q+e-bHIu4'&c[F4*;nuU)^bR6N).sr1X,sN/4+C1h^o'(r=&`ee1O[S/RsiNNb?S$a']b2lLeR^*r+J>l97Rh&L+M$*BrQAu]Z\f$=DOUd?UV$5+UL+k=[Qr7$o,G)\a3pe0VmqP)P$+80=fX`$jp]gd>Jo9,'ZQr7F9jjiV.0!f+!f8]`-@un,$R[lfFX?n`ds:,Ie48I&;'%8'd$&U>C_pE'Y#?D'-A%M6XWkoD#Gt[@kA)Td)JXJAMqI-0cE-HoiR32Or/s.,=+_U^d4aOYtLho!,-QI"M8\Nr4Z#S@Z7Js.mHK94/($UDD5]c5W"G4afShujLTnnoIUeRO:a7(1IQS%1&U/<^/NR"%)9d=c!:4U1(bJ.;f@3X`:i;9'IZT4Q"At86/kjn6Y.hs(c+?1/7Uq998.%k,#Y1p_66-;X%hB7c%K,k0kgg[^Z[Y?Y58BQ/UrH'uE9PcM*73b)V?+`BRH7PBDc7=:%T#/J']lBCStEOe4jZS0$8:rR!jY73.D.f>*e[I?9G!J,"J*`"RX%4AWi9qGM\">Y=Hb"sB#S'8U2<3`apAm;=6P>ml@oP)1)FE81=H+s^HCurg3P"Ip$N8,^`&dmBkXH+.$>PT#A+cZdV[h3`pZk\-2r7`c!&5%_so,Y0,pZ*-cPcOs(Ra.3XQa&JrMrUt@^WVXUV79paU)[T\[mWd\_n>f!@oGA=Go1p7Am#!r,IJd!.LKr8R*g'!!*9V8faHPUqFLu=;upZ,Rkhj!WT<5_&P]dZ*&o*:gQ"H\RN4*>cK3aQZo2-$rj4^D#iAEDpb;Buhjr%I2E8?c2oahu5fWc-Crh7Xuat4g!SX3@VIu[E8_`BO?W7e=c[d=HNJ9Lo@TAn;&Mlq'LY!Y-&ShAd]Z_rX!];gb%a!'ecbH>n-c1/mC>i5>QBFE)J7T_l\AX(>C"FM*Cn#Q^Z#q5<`]a#2F`#3&Iun?mnnR"`$("BTUZ!Mc)u75LE#2^i]GZ\/PjQRg/.N.#)1M>JU:TR0\C1H_d=R1,?ZUO?(rl8JmO7;_L=X/cjChd&)OY'F+Wt6\\;fL!L47Ki1/i&M>M:-6Xqk^OA0`g)P-Q'"M4)4FlFu;/C5[@GDJ.BOXJ4#'[C+Otn;W%kt<'UuYiuDCIj^?,Qukh?="?P]NlJH%I%I:;etL/\$&t-0,c^%0b<3NG($`ZH]JkW_+cXM':YLQu(_P5dKrgGV*3/Op](\.qBHb(jOdEAY(:[P%G(6F`>X+j"iCO*S=n?Y-F:9/hEQ#ioHF-\P3P`f6-J_o;_onWnpZF'i_BO9!f$u11)$"<+n4>N=0GSVWerBl.km[iLJ-RoBXpS1G708F,4NX*fTgb9#SnH1b">^5jHZ8l`oAfGH;#-VQ=5:nkRK?/=m\=L-d>@U=($EipkK=;fIsg7p\#.OK@ZUjW:4"6&i2o&pgkoZ="N4C!=BZ*k_neK"tbF-ZbB>3i;_HT'HCfE>PM$YqciFRW/m>SN4YYBNL6#;`%a-8kL1_ukJ0-6U!\IREUPBnlaGRU)@VMdGr_>_c=r)Vc<%.E4o*l*cJGaMPC4q@K<6_.6a^!P6F<7H>]qsdYSaDX"G18lB_lm7et4I,s'QU5qPU(j=R#+I#Y&u9npU:H81<[J,k9ZLum?ulWbMtl"f>skfJ^ED)3mPl;>Vu3J%];QR3YI6(@4B2^!9/sBd`NsY%L3gr%]H)(fZhO'4Hf)0-?LXA3$KN`jNls3T\+?rAV7j2_!E"&NQXT4+_A9f=AMS*1`hK:%ZVJm!Vo`hC=>c%(Y/EdcP79;YhZ1/aCPZ[3CBRl-Jt`=o]O%P3-S5Nf*"*B/3fsu$pi\MJDn+m0FCa8U-d+2:cZ2'#P!7N&Vs\\3iOh#8EURL5.>i!02rUi#;hMTKkV5S4]$/;-]C&TT%]iJi4C#EJjhFaW]:F?sa/%F\+fY6!e]Yf(Mp,iU5TX7XI%0Fl0Wtto=L,*_F`DJoM=pW;)7gKha'Y1V\[Nrrmm7Uc@1X[iN+Ea5kW`%:^Ou/OKYikn]:[;<;M;%N#*C5+kg0bm1'nB#@msRZ?jX$Pk7%TE\g>D33t@8P75CN:P8J'EH9Qs65f03Me\;*MCO6LghLW1T,8H`Neu++.*GM6*FM%dk]rLc^W*PB2O8YhWFjQe(`d@EqF"1enM?E5pd)%&[O_ji9p-?u'(g-rhb;*a;4"B:-]`Pbl'T/Pe;HTfCj,(eKOf-a(KQK2X;?uf33'&iDs)I>==X"U3r=XLRS$8(72@YmTtN5B&JbgF/#7L4E8/01Q+@!e\)8AU,#@O.+OMT]VKH!Slg,8:;k/Y`uqL!*>J1^[d8DX(@OQ&8Y.Bj3B9j^#7H'J1F-;.F4E+TitocP5]u'_3=RPV1iun"o-U]kV-n`\4@UD^NRnBOk9b,_HdT"?:N)mHX$'ILMmGo\$6_j1gCcbV&l:.;BTqG,\@7O'.X>Q!7>CIp'`(Gb(A@UgNg3I0h)7S2PUiuajGbZ#cp*pAWTF+FWj,J)%_@=Dmfq#UFG>54NlMDG[tu_)&X;4f93JlYb66*.5)N7&*N3CX>:#`E+!>Q8dudJA;0K0QjHPfpjqR_YNOu>'FIh;1qS]D=_K\uQpTD6^%ne88:@,*E?WW+H35.N+&+"TjU$'*K*S6fS2^+spDC67Usr)kG4W$-Vq:?UuVQ*^RCL2Mo(Z^JY!TTL:!A1BtRQ]dV'N0ui"dB%'f6YsSq&J3tIt(dSGG)&>J3qKd3F?PquN4R=fY7\IN9+T_Y>,,a5[E;@0L9UT*)fZ\MuKtO_X&kms($'gDm6?BFmTg4c*6$EC+4MZO$a8'Rc;%fZRCttMM=WM?bV9[\8Q>*57[TXuXS#mJbC1Z*\<5;K^c4gZn,l9t#SX[uX+s[5>;bpnP,Vqk@8!1aCGBq:38NBcRB>>oMhafPK:CeEd1t^F3gbI7>T!of"t]iB9JMs`GXQNs41@L'#]d1b+u1T^cqEipq^;&XR#_gHg[p8dcnZB%0SL_PZT+Y3J=P5ONrA5t'-q],b3.:C$*O&^c6^\/fWam?gmH=S,[-@r/es&EPibBD#I*N;RN2)-&osGOVV_aj4qaFn;GQ`fOkcbZ/17@Ake4!=&2k>C:YC0m9JHF7!8?d&$)+ld/"sh[gnLZu-q96/D[&d(5O<1.AKKRhEuB)CDkOUF@dW9PmCk(,Wc_&k#k+U*0-3j-Z%Ncbu$+R;:/Wf6'>q1I1X.="OY_3n;#TJSWWN$\ge!Ni$@M?2SJFFi+/&;8ug,g3p)'5bBjul5t\*ol^V,4L7D!>j"*^Osc)#KMi.G!8;i,kQ^N?*e'dohjjmJ5n@LR)C1F>!/5D$&.dWbOpX8!%MQ%V/fDH+aL,ee^eD%[\frHCF4^peAFDEB5">@FCt_+:DghM,1L$?/&E2DIk*R#7Jrl6':dDG,$m,!H.SUY7]XJ8cAOFK5QqgC[.T?TD\Xhn1%Ye_m8Th&P1QD/JeeFNrASL3p+i:)"VLYd<+j:YLN74XU=Fb':4gY^;K+jdI3-`UVWj%Rf),!]E6Qs:-e,e'$A1#*KpN"Z:1X>_\O^s:M&7t`g'CRU>=ZRT=FJbFoacfNEM"!WP1'qeS368D(>cNlEo[[r$VK^C@"@S*WT$n#i'^)Z$=ZrZRDMW5k`?i^%W.[Fuh`TuXg/cpGSB;=ilmZHnMR3Bi&;"idB0"2PMb72&+UK@aWY7XkIGkb9cl]Et"7uG=XPA$VmQi^t,T`'r9^#'2!SVSC;o(7,dbg76T^(=CRdBY2rnRto_qq8O9,'G.?Z"M"?@pENlH'A)'8Nt8H&tbbi_lQ>MtA8)\"d8]Jo"[\O9ioTXU<-WQ!0?I/[gJO[\c``11d,`'U_ND`X4GNN/Si9h9t`&hA$J;9/=Ikg(MB"KPKYX]X$8dD:d^71&93op\Zf(\(@tJbMr]KHr%C7P&LE_cAs`am*Sd9:tW02Ct@7==oqAN^W56u$fD#s,U"-38HqKo%:9(`OP;>i(6)$[C6h??&uNijRFStqCg!2F!p"q2BTTUa_.=H_OiT6jB6bWNoO?EZcL,HcP*#+cltUQ%V7Cbb]2pEClYRtJTZj'(aJ#OT$r)6l^0_PO+V2k\3PcO0H2M8n+$C[/6O=5=C6Jle/p)EU^D+:/=Npk3"lI[bJtbeJ3j^"?pV,Aj6dq_0m_p)on7.8M*5d"I6*P+_S-5[oWI3,gSMD&g8Gmt1DSWj8^iX9(^T#?,"PkU8-Cnl!*MH3,/9H;PjN&I>>B%_KPK]iQe-^#!q/C*^%a^gMa:!mDr:Rb1%S/@3jITS[2'T:-*!Jqc_JG:=quQbhg@C#"I%d*Dq'(%3CV7=1[37M-jf^G1K(GDS^t"ZI&*MjUe02tOkFk0j*_5)c;+/K`[pO5'tap=]cNAH9'D&g&$?U'-,jg7f`0SB?[FVG*4BjkE6sQtY"r?\GUF\fi:dc%r+W->f'3RitK[883!@,/E.*T_#!9L=WL;7+Vro^#9>B`S@CC1Du6j8`BVQ=W<]e-XLNMrj,A2/ub/:o#V3ZH[7\bl-_7EK>7r^lh)&H(_n18RPPhskEJF>^o&crD+66:sl@[u5i5tGHMXH\N?M#`"1MK'?%[Sl:AV$r1=ZHH%;!Qc0H*>k\*PQeHq_Vh5:`q>9"Qj;%S?r=fuk8%9#m]EpAU(B_k9QS^]Y6k0i4VDQVhP!Rb,,>]@6`L%6gc1$7o0ZU]1'5TD)uMB4Gfa@.;+'AURjsA!mmWWG+L%9E,f1.J6^]da<+7T=(B?1?mR`$T72Umh$tZpX0WUM%79=\K]=!O'doI8A@#12P@Uu#ZG_kO9r-@)g.e>8H0qZ495bS=l#u_>;Q++#@>!tXA^g'j7np).AcAAsF%,mt4gbKsTiCNhtWT'o]iht1GdUFRkR&7TUPV(pb#N]gf)X6PFI:O^WPPX\G8L'/"4OucI[M(h9"&m%LL1pg*>-d;42AUb('cKKJ$`!)TY6'*EZqTqgjNu$0L^0'XhXBpbVn@B_e&FpnfbFZ=#`X!0CH);2io2MUu^fr(VVG#)i$!dq0_:nYcMAEMo'*UnC7%ud'$E.AZ.Z6QN\'0K?oLg?&1e^0[&9U\p)"/6bS36oH5!cqJe)NniGA:),9&[EYSc1d7e4TpFKI)Mcg@;8[k)2/7HbkAA2=+RATg'e7?%Y.0g"!h"JBV7[8!;o#[KQs*25DRFs#$^XE1dL8NU#tj<9$,"1Qcsg)2&\q@K2CX2i;):'1EO2qd'Qm3mfgpU7/UhTc!U$q,t62gTHFn%&Pl_YSY1nCf(&MFCFmI0O\s$]b5A=l0Y679R9*/%K)B;[pUk!pGQ#J?-@;pc)F[CS2;#\H3rNEJ/nikIkd;j3]pR>l#VpOdmQ-?)\aNnUhjBPU.[Eoi!DfJNsqYp]"U`s#9WN?i3,qpc^8o+3!4<^\@c?o7++Hn&,0$o)DM_omaI$^\tprrnm&@^R'0;J)C:Hp4$`KIJ&)s8B!e$?\+i&raLdM8PN=rQ2E1,(4VD9#\3P,0Rd;WPcFm'Wm`:]HXOV(rn)\066deqb$YLUB-!Gbo*nDdN.[2pi6U&jZ2h@`FXQBF;Q(c[/9^Clk:2;'OBE\ofEUs.]mc_`+7[Gb#[iFj]`&,=MUg]%5HQSsANMDV\!?7W1uI_Fll7Pj3R?gAZ[*KNq&j.i*iPH/&3^r073H$naJ+Ccg,lM@9_6GBcnMl'AB-H0D6g-p$n.BbG/HF%H2I-lh8$aW,0.a=V:`Y!V1sJcB`>Q>?ceLm#XBODm:d+Bd-eU1pBXcnZiJ'm&VP"J5m_Q2Zi+p,cs"UL@]R(^UgsAkUp1ab\l-HWUs9<2gc4)_n"hG(+5-F-j74=sSTS('^$S2DR@\NB]s2['Q6/OSXp\V4ap8F6+[.po(pZS9Y/R,ei!Se`I3c?@t36bV#XsXOsa:cA=Q)R9Snu#e.KQU"pI(+0?R/7!qpEi_![I[U*1NPQ(J^,BU/aV+#1Oe&a(KM?f(Tla9C"@f@7!=Pgr%$i+)pV9W,m[k1mp8fO!-k.%j"afB*JGJEIpn6`5bFfI3PJVV`u8\/*1S!]Ph_^&sG(AZ-mEBG';G.Q=4;3nRK(M:-jHcbWS^+`m,JoP!I7CZ&jJ?fV'Kqpf57("=*uWTi"a9&NI`g&PQPb[kf:kBoQQ^Q6dEZ"C1Y@('HZq,t7g026Wso;Ob[p$ltqUhZ*KKs6&hMa$bLc"<$$C,ld^N"UN:UTCeNr\rd$XGsr'"M%*P0WGI1 Date: Sat, 7 Jun 2008 11:54:40 +0200 Subject: [PATCH 0129/2970] Fix desktop file install, use DATADIR properly --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 0a364190..ffd222f0 100644 --- a/wscript +++ b/wscript @@ -76,10 +76,10 @@ def build (bld): if bld.env ()['INTLTOOL']: obj = bld.create_obj ('intltool_in') - obj.source = 'midori.desktop.in' - obj.destvar = 'PREFIX' - obj.subdir = 'share/applications' - obj.flags = '-d' + obj.source = 'midori.desktop.in' + obj.inst_var = 'DATADIR' + obj.inst_dir = 'applications' + obj.flags = '-d' else: # FIXME: process desktop.in without intltool Params.pprint ('BLUE', "File midori.desktop not generated") From bbd404eba57d9f4b1519b3175d54bcd629d4d5cf Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Sat, 7 Jun 2008 12:32:03 +0200 Subject: [PATCH 0130/2970] Run 'configure' implicitly from autogen.sh --- autogen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autogen.sh b/autogen.sh index b17da47e..2d0c0882 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,3 +7,6 @@ aclocal autoheader autoconf automake --add-missing --copy + +echo "Now running the configure script" +./configure $* From f1166afa0a595d723abc04dfb7227d147fbb4bea Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 7 Jun 2008 13:02:18 +0200 Subject: [PATCH 0131/2970] Remove version strings from build and --version output --- configure.in | 21 ++++----------------- wscript | 9 +-------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/configure.in b/configure.in index 72c121e5..b95e8b71 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.18], [christian@twotoasts.de]) +AC_INIT([midori], [0.0.18], [http://software.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/main.h]) AC_CONFIG_HEADER([config.h]) @@ -20,14 +20,11 @@ AC_C_CONST # Checks if we want debugging support AC_ARG_ENABLE([debug], -AC_HELP_STRING([--enable-debug=@<:@no/simple/yes@:>@] - , [Turn on debugging @<:@default=simple@:>@]) - , [], [enable_debug=simple]) +AC_HELP_STRING([--enable-debug=@<:@no/yes@:>@] + , [Enable debugging @<:@default=yes@:>@]) + , [], [enable_debug=yes]) AC_MSG_CHECKING([whether to enable debugging support]) AC_MSG_RESULT([$enable_debug]) -if test x"$enable_debug" = x"simple"; then - AC_DEFINE([SOKOKE_DEBUG], 1, [Level of debugging support]) -fi if test x"$enable_debug" = x"yes"; then # Check whether the compiler accepts -Wall save_CFLAGS="$CFLAGS" @@ -39,9 +36,7 @@ if test x"$enable_debug" = x"yes"; then AC_MSG_RESULT([no]) CFLAGS="$save_CFLAGS" ]) - AC_DEFINE([SOKOKE_DEBUG], 2, [Level of debugging support]) fi -AC_DEFINE_UNQUOTED([SOKOKE_DEBUG_], "$enable_debug", [Debugging?]) # Checks for GTK+2 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false) @@ -50,8 +45,6 @@ if test "x${have_gtk}" = "xfalse" ; then fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -GTK_VER=`pkg-config --modversion gtk+-2.0` -AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) # Checks for WebKit PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) @@ -60,8 +53,6 @@ if test "x${have_webkit}" = "xfalse" ; then fi AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_LIBS) -WEBKIT_VER=`pkg-config --modversion webkit-1.0` -AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version]) # Checks for libsexy PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) @@ -70,8 +61,6 @@ if test "x${have_libsexy}" = "xfalse" ; then fi AC_SUBST(LIBSEXY_CFLAGS) AC_SUBST(LIBSEXY_LIBS) -LIBSEXY_VER=`pkg-config --modversion libsexy` -AC_DEFINE_UNQUOTED([LIBSEXY_VER], "$LIBSEXY_VER", [Libsexy version]) # Checks for LibXML2 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=true, have_libxml=false) @@ -80,8 +69,6 @@ if test "x${have_libxml}" = "xfalse" ; then fi AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) -LIBXML_VER=`pkg-config --modversion libxml-2.0` -AC_DEFINE_UNQUOTED([LIBXML_VER], "$LIBXML_VER", [libXML2 version]) # i18n GETTEXT_PACKAGE=midori diff --git a/wscript b/wscript index ffd222f0..c3070c86 100644 --- a/wscript +++ b/wscript @@ -47,18 +47,11 @@ def configure (conf): icons = 'no' conf.check_message_custom ('icon optimization', 'support', icons) - # FIXME we need numbers - conf.define ('GTK_VER', '-') - conf.define ('WEBKIT_VER', '-') - conf.define ('LIBXML_VER', '-') - conf.define ('LIBSEXY_VER', '-') - conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) - conf.define ('PACKAGE_BUGREPORT', 'christian@twotoasts.de') + conf.define ('PACKAGE_BUGREPORT', 'http://software.twotoasts.de/bugs') conf.define ('GETTEXT_PACKAGE', APPNAME) - conf.define ('SOKOKE_DEBUG_', '-') conf.write_config_header ('config.h') def set_options (opt): From 674b237f9702a2ce4839d217dab2b89ebdf4dfb2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 01:16:06 +0200 Subject: [PATCH 0132/2970] Fix last commit, one file was not updated. --- midori/main.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/midori/main.c b/midori/main.c index 6d4f03e8..a39ea286 100644 --- a/midori/main.c +++ b/midori/main.c @@ -219,7 +219,7 @@ settings_save_to_file (MidoriWebSettings* settings, enum_value->value_name); } else - g_warning (_("Unhandled settings property '%s'"), property); + g_warning (_("Unhandled settings value '%s'"), property); } gboolean saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); @@ -255,21 +255,13 @@ main (int argc, char** argv) if (version) { g_print ( - "%s %s - Copyright (c) 2007-2008 Christian Dywan\n\n" - "GTK+2: \t\t%s\n" - "WebKit: \t\t%s\n" - "Libsexy:\t\t%s\n" - "libXML2:\t\t%s\n" - "\n" - "%s:\t\t%s\n" - "\n" + "%s %s\n\n" + "Copyright (c) 2007-2008 Christian Dywan\n\n" "%s\n" - "\t%s\n" + "\t%s\n\n" "%s\n" "\thttp://software.twotoasts.de\n", _("midori"), PACKAGE_VERSION, - GTK_VER, WEBKIT_VER, LIBSEXY_VER, LIBXML_VER, - _("Debugging"), SOKOKE_DEBUG_, _("Please report comments, suggestions and bugs to:"), PACKAGE_BUGREPORT, _("Check for new versions at:") From 6d35511604ae4a2ffe0eb73c09ce1fdd772bae17 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 01:25:57 +0200 Subject: [PATCH 0133/2970] Fix segfault on quit, improve app and browser interface --- midori/main.c | 5 +- midori/midori-app.c | 101 ++++++++++++++++++++++++++-------------- midori/midori-app.h | 13 +++++- midori/midori-browser.c | 12 +++-- midori/midori-browser.h | 4 +- 5 files changed, 91 insertions(+), 44 deletions(-) diff --git a/midori/main.c b/midori/main.c index a39ea286..9907e740 100644 --- a/midori/main.c +++ b/midori/main.c @@ -406,7 +406,7 @@ main (int argc, char** argv) stock_items_init (); MidoriApp* app = midori_app_new (); - g_object_set (app, "settings", settings, NULL); + midori_app_set_settings (app, settings); MidoriTrash* trash = midori_app_get_trash (app); guint n = katze_xbel_folder_get_n_items (xbel_trash); @@ -421,8 +421,7 @@ main (int argc, char** argv) "settings", settings, "trash", trash, NULL); - g_signal_emit_by_name (app, "add-browser", browser); - + midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); KatzeXbelItem* session = katze_xbel_folder_new (); diff --git a/midori/midori-app.c b/midori/midori-app.c index a9a8309d..ae36b150 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -71,19 +71,12 @@ midori_app_get_property (GObject* object, GValue* value, GParamSpec* pspec); -static void -midori_app_add_browser (MidoriApp* app, - MidoriBrowser* browser); - -static void -midori_app_quit (MidoriApp* app); - static void midori_app_class_init (MidoriAppClass* class) { signals[ADD_BROWSER] = g_signal_new ( "add-browser", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriAppClass, add_browser), 0, @@ -94,7 +87,7 @@ midori_app_class_init (MidoriAppClass* class) signals[QUIT] = g_signal_new ( "quit", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriAppClass, quit), 0, @@ -296,7 +289,7 @@ midori_browser_destroy_cb (MidoriBrowser* browser, priv->browsers = g_list_remove (priv->browsers, browser); if (g_list_nth (priv->browsers, 0)) return FALSE; - g_signal_emit (app, signals[QUIT], 0); + midori_app_quit (app); return TRUE; } @@ -304,31 +297,7 @@ static void midori_browser_quit_cb (MidoriBrowser* browser, MidoriApp* app) { - g_signal_emit (app, signals[QUIT], 0); -} - -static void -midori_app_add_browser (MidoriApp* app, - MidoriBrowser* browser) -{ - MidoriAppPrivate* priv = app->priv; - - gtk_window_add_accel_group (GTK_WINDOW (browser), priv->accel_group); - g_object_connect (browser, - "signal::focus-in-event", midori_browser_focus_in_event_cb, app, - "signal::new-window", midori_browser_new_window_cb, app, - "signal::delete-event", midori_browser_delete_event_cb, app, - "signal::destroy", midori_browser_destroy_cb, app, - "signal::quit", midori_browser_quit_cb, app, - NULL); - - priv->browsers = g_list_prepend (priv->browsers, browser); -} - -static void -midori_app_quit (MidoriApp* app) -{ - gtk_main_quit (); + midori_app_quit (app); } /** @@ -349,6 +318,35 @@ midori_app_new (void) return app; } +/** + * midori_app_add_browser: + * + * Adds a #MidoriBrowser to the #MidoriApp singleton. + * + * The app will take care of the browser's new-window and quit signals, as well + * as watch window closing so that the last closed window quits the app. + * Also the app watches focus changes to indicate the 'current' browser. + * + * Return value: a new #MidoriApp + **/ +void +midori_app_add_browser (MidoriApp* app, + MidoriBrowser* browser) +{ + MidoriAppPrivate* priv = app->priv; + + gtk_window_add_accel_group (GTK_WINDOW (browser), priv->accel_group); + g_object_connect (browser, + "signal::focus-in-event", midori_browser_focus_in_event_cb, app, + "signal::new-window", midori_browser_new_window_cb, app, + "signal::delete-event", midori_browser_delete_event_cb, app, + "signal::destroy", midori_browser_destroy_cb, app, + "signal::quit", midori_browser_quit_cb, app, + NULL); + + priv->browsers = g_list_prepend (priv->browsers, browser); +} + /** * midori_app_get_settings: * @app: a #MidoriApp @@ -367,6 +365,25 @@ midori_app_get_settings (MidoriApp* app) return priv->settings; } +/** + * midori_app_set_settings: + * @app: a #MidoriApp + * + * Assigns the #MidoriWebSettings to the app. + * + * Return value: the assigned #MidoriWebSettings + **/ +void +midori_app_set_settings (MidoriApp* app, + MidoriWebSettings* settings) +{ + g_return_if_fail (MIDORI_IS_APP (app)); + + MidoriAppPrivate* priv = app->priv; + + g_object_set (app, "settings", settings, NULL); +} + /** * midori_app_get_trash: * @app: a #MidoriApp @@ -384,3 +401,17 @@ midori_app_get_trash (MidoriApp* app) return priv->trash; } + +/** + * midori_app_quit: + * @app: a #MidoriApp + * + * Quits the #MidoriApp singleton. + **/ +void +midori_app_quit (MidoriApp* app) +{ + g_return_if_fail (MIDORI_IS_APP (app)); + + gtk_main_quit (); +} diff --git a/midori/midori-app.h b/midori/midori-app.h index b5aaa45c..284f359f 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -62,12 +62,23 @@ midori_app_get_type (void); MidoriApp* midori_app_new (void); +void +midori_app_add_browser (MidoriApp* app, + MidoriBrowser* browser); + MidoriWebSettings* -midori_app_get_web_settings (MidoriApp* app); +midori_app_get_settings (MidoriApp* app); + +void +midori_app_set_settings (MidoriApp* app, + MidoriWebSettings* settings); MidoriTrash* midori_app_get_trash (MidoriApp* app); +void +midori_app_quit (MidoriApp* app); + G_END_DECLS #endif /* __MIDORI_APP_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6b639ccd..8eeed5ea 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -401,7 +401,7 @@ midori_web_view_load_committed_cb (GtkWidget* web_view, static gboolean midori_web_view_console_message_cb (GtkWidget* web_view, const gchar* message, - gint line, + guint line, const gchar* source_id, MidoriBrowser* browser) { @@ -508,6 +508,12 @@ midori_web_view_destroy_cb (GtkWidget* widget, return FALSE; } +static void +_midori_browser_will_quit (MidoriBrowser* browser) +{ + // Nothing to do +} + static void midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, GValue* return_value, @@ -716,7 +722,7 @@ midori_browser_class_init (MidoriBrowserClass* class) class->add_tab = midori_browser_add_tab; class->add_uri = midori_browser_add_uri; class->activate_action = midori_browser_activate_action; - class->quit = midori_browser_quit; + class->quit = _midori_browser_will_quit; GObjectClass* gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_browser_finalize; @@ -1058,7 +1064,7 @@ _midori_browser_find (MidoriBrowser* browser, else icon = gtk_image_new_from_stock (GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->find_text), - SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); + SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (web_view), text, case_sensitive, 0); const gboolean highlight = gtk_toggle_tool_button_get_active ( diff --git a/midori/midori-browser.h b/midori/midori-browser.h index d029e6a1..8a5235a8 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -62,10 +62,10 @@ struct _MidoriBrowserClass (*new_window) (MidoriBrowser* browser, const gchar* uri); - void + gint (*add_tab) (MidoriBrowser* browser, GtkWidget* widget); - void + gint (*add_uri) (MidoriBrowser* browser, const gchar* uri); void From cdadca0d0c5b9d858278794a16371ebd151f8c9f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 16:58:03 +0200 Subject: [PATCH 0134/2970] Cleanup and fix a race condition causing an ugly warning. --- midori/midori-browser.c | 11 -------- midori/midori-webview.c | 59 +++++++++++++++-------------------------- midori/midori-webview.h | 6 ----- 3 files changed, 21 insertions(+), 55 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8eeed5ea..bd055d83 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -643,17 +643,6 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_POINTER, G_TYPE_POINTER); - signals[STATUSBAR_TEXT_CHANGED] = g_signal_new ( - "statusbar-text-changed", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriBrowserClass, statusbar_text_changed), - 0, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); - signals[ELEMENT_MOTION] = g_signal_new ( "element-motion", G_TYPE_FROM_CLASS (class), diff --git a/midori/midori-webview.c b/midori/midori-webview.c index b5e0f080..ec015ea1 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -92,16 +92,6 @@ midori_web_view_get_property (GObject* object, GValue* value, GParamSpec* pspec); -/*static WebKitWebView* -midori_web_view_create_web_view (WebKitWebView* web_view) -{ - MidoriWebView* new_web_view = NULL; - g_signal_emit (web_view, signals[NEW_WINDOW], 0, &new_web_view); - if (new_web_view) - return WEBKIT_WEB_VIEW (new_web_view); - return WEBKIT_WEB_VIEW (midori_web_view_new ()); -}*/ - static void midori_web_view_class_init (MidoriWebViewClass* class) { @@ -192,16 +182,6 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); - /*WEBKIT_WEB_VIEW_CLASS (class)->create_web_view = g_signal_new ("create-web-view", - G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET(MidoriWebViewClass, create_web_view), - 0, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - MIDORI_TYPE_WEB_VIEW);*/ - GObjectClass* gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_web_view_finalize; gobject_class->set_property = midori_web_view_set_property; @@ -243,7 +223,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) "Statusbar Text", _("The text that is displayed in the statusbar"), "", - flags)); + G_PARAM_READABLE)); g_object_class_override_property (gobject_class, PROP_SETTINGS, @@ -260,7 +240,7 @@ webkit_web_view_load_started (MidoriWebView* web_view, priv->is_loading = TRUE; priv->progress = -1; - katze_throbber_set_animated(KATZE_THROBBER(priv->tab_icon), TRUE); + katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), TRUE); }*/ static void @@ -346,7 +326,10 @@ static void webkit_web_view_statusbar_text_changed (MidoriWebView* web_view, const gchar* text) { - g_object_set (web_view, "statusbar-text", text, NULL); + MidoriWebViewPrivate* priv = web_view->priv; + + katze_assign (priv->statusbar_text, g_strdup (text)); + g_object_notify (G_OBJECT (web_view), "statusbar-text"); } static void @@ -692,9 +675,6 @@ midori_web_view_set_property (GObject* object, if (priv->proxy_xbel_item) katze_xbel_item_set_title (priv->proxy_xbel_item, title); break; - case PROP_STATUSBAR_TEXT: - katze_assign (priv->statusbar_text, g_value_dup_string (value)); - break; case PROP_SETTINGS: g_signal_handlers_disconnect_by_func (priv->settings, midori_web_view_settings_notify, @@ -833,10 +813,10 @@ midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) { priv->tab_icon = katze_throbber_new (); if (priv->icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER(priv->tab_icon), + katze_throbber_set_static_pixbuf (KATZE_THROBBER (priv->tab_icon), priv->icon); else - katze_throbber_set_static_stock_id (KATZE_THROBBER(priv->tab_icon), + katze_throbber_set_static_stock_id (KATZE_THROBBER (priv->tab_icon), GTK_STOCK_FILE); } return priv->tab_icon; @@ -925,7 +905,7 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) priv->tab_icon = midori_web_view_get_proxy_tab_icon (web_view); GtkWidget* event_box = gtk_event_box_new (); - gtk_event_box_set_visible_window(GTK_EVENT_BOX (event_box), FALSE); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); GtkWidget* hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); gtk_box_pack_start (GTK_BOX (hbox), priv->tab_icon, FALSE, FALSE, 0); @@ -952,15 +932,18 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) gtk_widget_hide (close_button); priv->tab_close = close_button; - g_signal_connect(priv->proxy_tab_label, "button-release-event", - G_CALLBACK(midori_web_view_tab_label_button_release_event), - web_view); - g_signal_connect(priv->tab_close, "style-set", - G_CALLBACK(midori_web_view_tab_close_style_set), - web_view); - g_signal_connect(priv->tab_close, "clicked", - G_CALLBACK(midori_web_view_tab_close_clicked), - web_view); + g_signal_connect (priv->proxy_tab_label, "button-release-event", + G_CALLBACK (midori_web_view_tab_label_button_release_event), + web_view); + g_signal_connect (priv->tab_icon, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &priv->tab_icon); + g_signal_connect (priv->tab_close, "style-set", + G_CALLBACK (midori_web_view_tab_close_style_set), + web_view); + g_signal_connect (priv->tab_close, "clicked", + G_CALLBACK (midori_web_view_tab_close_clicked), + web_view); } return priv->proxy_tab_label; } diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 71cab23f..6117ccc9 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -61,9 +61,6 @@ struct _MidoriWebViewClass (*load_done) (MidoriWebView* web_view, WebKitWebFrame* frame); void - (*statusbar_text_changed) (MidoriWebView* web_view, - const gchar* text); - void (*element_motion) (MidoriWebView* web_view, const gchar* link_uri); void @@ -74,9 +71,6 @@ struct _MidoriWebViewClass void (*new_window) (MidoriWebView* web_view, const gchar* uri); - void - (*create_web_view) (MidoriWebView* web_view, - MidoriWebView* new_web_view); }; GType From 65c01955019cc9110756297b41e697048de4ae81 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 17:46:24 +0200 Subject: [PATCH 0135/2970] Introduce compat.h which provides new api for old libraries --- midori/Makefile.am | 3 +- midori/compat.c | 102 ++++++++++++++++++++++++++++++++++++++++ midori/compat.h | 37 +++++++++++++++ midori/midori-app.c | 2 - midori/midori-browser.c | 31 +++--------- midori/midori-webview.c | 23 --------- midori/midori-webview.h | 3 -- 7 files changed, 148 insertions(+), 53 deletions(-) create mode 100644 midori/compat.c create mode 100644 midori/compat.h diff --git a/midori/Makefile.am b/midori/Makefile.am index bda06d22..5f72dc2f 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -30,4 +30,5 @@ midori_SOURCES = \ webSearch.c webSearch.h \ gjs.c gjs.h \ sokoke.c sokoke.h \ - search.c search.h + search.c search.h \ + compat.c compat.h diff --git a/midori/compat.c b/midori/compat.c new file mode 100644 index 00000000..d9ff8bb7 --- /dev/null +++ b/midori/compat.c @@ -0,0 +1,102 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "compat.h" + +#ifndef WEBKIT_CHECK_VERSION + +/** + * webkit_web_view_get_zoom_level: + * @web_view: a #WebKitWebView + * + * Retrieves the current zoom level. + * + * Return value: the zoom level, always 1.0 if not supported + **/ +gfloat +webkit_web_view_get_zoom_level (WebKitWebView* web_view) +{ + g_return_val_if_fail (WEBKIT_IS_WEB_VIEW (web_view), 1.0); + + if (g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), + "zoom-level")) + { + gfloat zoom_level; + g_object_get (web_view, "zoom-level", &zoom_level, NULL); + return zoom_level; + } + return 1.0; +} + +/** + * webkit_web_view_set_zoom_level: + * @web_view: a #WebKitWebView + * + * Sets the current zoom level. + * + * Does nothing if not supported. + **/ +void +webkit_web_view_set_zoom_level (WebKitWebView* web_view, + gfloat zoom_level) +{ + g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); + + if (g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), + "zoom-level")) + g_object_set (web_view, "zoom-level", zoom_level, NULL); +} + +/** + * webkit_web_view_zoom_in: + * @web_view: a #WebKitWebView + * + * Increases the current zoom level. + * + * Does nothing if not supported. + **/ +void +webkit_web_view_zoom_in (WebKitWebView* web_view) +{ + g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); + + gfloat zoom_level = webkit_web_view_get_zoom_level (web_view); + WebKitWebSettings* settings = webkit_web_view_get_settings (web_view); + gfloat zoom_step; + g_object_get (settings, "zoom-step", &zoom_step, NULL); + webkit_web_view_set_zoom_level (web_view, zoom_level + zoom_step); +} + +/** + * webkit_web_view_zoom_out: + * @web_view: a #WebKitWebView + * + * Decreases the current zoom level. + * + * Does nothing if not supported. + **/ +void +webkit_web_view_zoom_out (WebKitWebView* web_view) +{ + g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); + + gfloat zoom_level = webkit_web_view_get_zoom_level (web_view); + WebKitWebSettings* settings = webkit_web_view_get_settings (web_view); + if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), + "zoom-step")) + { + gfloat zoom_step; + g_object_get (settings, "zoom-step", &zoom_step, NULL); + webkit_web_view_set_zoom_level (web_view, zoom_level - zoom_step); + } +} + +#endif diff --git a/midori/compat.h b/midori/compat.h new file mode 100644 index 00000000..1547b11d --- /dev/null +++ b/midori/compat.h @@ -0,0 +1,37 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __COMPAT_H__ +#define __COMPAT_H__ + +#include + +G_BEGIN_DECLS + +#ifndef WEBKIT_CHECK_VERSION + +gfloat +webkit_web_view_get_zoom_level (WebKitWebView* web_view); + +void +webkit_web_view_set_zoom_level (WebKitWebView* web_view); + +void +webkit_web_view_zoom_in (WebKitWebView* web_view); + +void +webkit_web_view_zoom_out (WebKitWebView* web_view); + +#endif + +G_END_DECLS + +#endif /* __COMPAT_H__ */ diff --git a/midori/midori-app.c b/midori/midori-app.c index ae36b150..a77fd630 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -379,8 +379,6 @@ midori_app_set_settings (MidoriApp* app, { g_return_if_fail (MIDORI_IS_APP (app)); - MidoriAppPrivate* priv = app->priv; - g_object_set (app, "settings", settings, NULL); } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index bd055d83..2fa5c5eb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -179,7 +179,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) { loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); _action_set_sensitive (browser, "ZoomNormal", - midori_web_view_get_zoom_level (MIDORI_WEB_VIEW (web_view)) != 1.0); + webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), "zoom-level")) { @@ -1248,16 +1248,8 @@ _action_zoom_in_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view && g_object_class_find_property ( - G_OBJECT_GET_CLASS (web_view), "zoom-level")) - { - MidoriBrowserPrivate* priv = browser->priv; - - gfloat zoom_level, zoom_step; - g_object_get (web_view, "zoom-level", &zoom_level, NULL); - g_object_get (priv->settings, "zoom-step", &zoom_step, NULL); - g_object_set (web_view, "zoom-level", zoom_level + zoom_step, NULL); - } + if (web_view) + webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); } static void @@ -1265,16 +1257,8 @@ _action_zoom_out_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view && g_object_class_find_property ( - G_OBJECT_GET_CLASS (web_view), "zoom-level")) - { - MidoriBrowserPrivate* priv = browser->priv; - - gfloat zoom_level, zoom_step; - g_object_get (web_view, "zoom-level", &zoom_level, NULL); - g_object_get (priv->settings, "zoom-step", &zoom_step, NULL); - g_object_set (web_view, "zoom-level", zoom_level - zoom_step, NULL); - } + if (web_view) + webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); } static void @@ -1282,9 +1266,8 @@ _action_zoom_normal_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view && g_object_class_find_property ( - G_OBJECT_GET_CLASS (web_view), "zoom-level")) - g_object_set (web_view, "zoom-level", 1.0, NULL); + if (web_view) + webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); } /*static void diff --git a/midori/midori-webview.c b/midori/midori-webview.c index ec015ea1..0c68b26b 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -1080,26 +1080,3 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) MidoriWebViewPrivate* priv = web_view->priv; return priv->link_uri; } - -/** - * midori_web_view_get_zoom_level: - * @web_view: a #MidoriWebView - * - * Retrieves the current zoom level. - * - * Return value: the zoom level, always 1 if not supported - **/ -gfloat -midori_web_view_get_zoom_level (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), 1); - - if (g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), - "zoom-level")) - { - gfloat zoom_level; - g_object_get (web_view, "zoom-level", &zoom_level, NULL); - return zoom_level; - } - return 1; -} diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 6117ccc9..0905ce68 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -107,9 +107,6 @@ midori_web_view_get_display_title (MidoriWebView* web_view); const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view); -gfloat -midori_web_view_get_zoom_level (MidoriWebView* web_view); - G_END_DECLS #endif /* __MIDORI_WEB_VIEW_H__ */ From 7e46d4e880473e30870b73aa0e2c563df971e8f6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 17:47:06 +0200 Subject: [PATCH 0136/2970] Remove 'midori' from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a43b4405..a033ed6b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,5 +35,4 @@ po/midori.pot po/stamp-it po/*.gmo -midori midori.desktop From 066c5a11c78fbbba30ca9ae294c7901b4286f8c9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 17:49:59 +0200 Subject: [PATCH 0137/2970] Enable mouse wheel zoom bindings. --- midori/midori-webview.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 0c68b26b..827c601c 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -373,7 +373,7 @@ gtk_widget_button_press_event (MidoriWebView* web_view, case 2: if (state & GDK_CONTROL_MASK) { - // FIXME: Reset font multiplier or zoom level + webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); return FALSE; // Allow Ctrl + Middle click } else @@ -424,11 +424,10 @@ gtk_widget_scroll_event (MidoriWebView* web_view, gdk_window_get_pointer (NULL, &x, &y, &state); if (state & GDK_CONTROL_MASK) { - // FIXME: Increase or decrease the font multiplier or zoom level if (event->direction == GDK_SCROLL_DOWN) - ; + webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); else if(event->direction == GDK_SCROLL_UP) - ; + webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); return TRUE; } else From 13f8171e24cb39c1c8a26370e93bf24c8adc164b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 18:42:39 +0200 Subject: [PATCH 0138/2970] Add Zoom Stepping Value to Preferences --- katze/katze-utils.c | 26 ++++++++++++++++++++++++-- midori/main.c | 4 ++-- midori/midori-preferences.c | 24 +++++++++++++++++++++--- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 9b958911..1353fa1b 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -73,9 +73,19 @@ proxy_entry_focus_out_event_cb (GtkEntry* entry, static gboolean proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) { - gint value = gtk_spin_button_get_value_as_int (button); + GObjectClass* class = G_OBJECT_GET_CLASS (object); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); - g_object_set (object, property, value, NULL); + GParamSpec* pspec = g_object_class_find_property (class, property); + if (G_PARAM_SPEC_TYPE (pspec) == G_TYPE_PARAM_INT) + { + gint value = gtk_spin_button_get_value_as_int (button); + g_object_set (object, property, value, NULL); + } + else + { + gdouble value = gtk_spin_button_get_value (button); + g_object_set (object, property, value, NULL); + } return FALSE; } @@ -213,6 +223,18 @@ katze_property_proxy (gpointer object, g_signal_connect (widget, "focus-out-event", G_CALLBACK (proxy_entry_focus_out_event_cb), object); } + else if (type == G_TYPE_PARAM_FLOAT) + { + widget = gtk_spin_button_new_with_range ( + G_PARAM_SPEC_FLOAT (pspec)->minimum, + G_PARAM_SPEC_FLOAT (pspec)->maximum, 1); + gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), 2); + gfloat value; + g_object_get (object, property, &value, NULL); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); + g_signal_connect (widget, "value-changed", + G_CALLBACK (proxy_spin_button_changed_cb), object); + } else if (type == G_TYPE_PARAM_INT) { widget = gtk_spin_button_new_with_range ( diff --git a/midori/main.c b/midori/main.c index 9907e740..f88d0b15 100644 --- a/midori/main.c +++ b/midori/main.c @@ -125,7 +125,7 @@ settings_new_from_file (const gchar* filename) } else if (type == G_TYPE_PARAM_FLOAT) { - gdouble number = sokoke_key_file_get_double_default (key_file, + gfloat number = sokoke_key_file_get_double_default (key_file, "settings", property, G_PARAM_SPEC_FLOAT (pspec)->default_value, NULL); g_object_set (settings, property, number, NULL); @@ -198,7 +198,7 @@ settings_save_to_file (MidoriWebSettings* settings, } else if (type == G_TYPE_PARAM_FLOAT) { - gdouble number; + gfloat number; g_object_get (settings, property, &number, NULL); g_key_file_set_double (key_file, "settings", property, number); } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index b3ddc9e7..aa2017a5 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -279,7 +279,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, // Page "Behavior" PAGE_NEW (_("Behavior")); FRAME_NEW (_("Features")); - TABLE_NEW (5, 2); + TABLE_NEW (6, 2); button = katze_property_proxy (settings, "auto-load-images", NULL); INDENTED_ADD (button, 0, 1, 0, 1); button = katze_property_proxy (settings, "auto-shrink-images", NULL); @@ -304,10 +304,28 @@ midori_preferences_set_settings (MidoriPreferences* preferences, G_CALLBACK (clear_button_clicked_cb), entry); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); FILLED_ADD (hbox, 1, 2, 3, 4); + if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), "zoom-step")) + { + label = katze_property_label (settings, "zoom-step"); + INDENTED_ADD (label, 0, 1, 4, 5); + hbox = gtk_hbox_new (FALSE, 4); + entry = katze_property_proxy (settings, "zoom-step", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + FILLED_ADD (hbox, 1, 2, 4, 5); + } + else + { + label = gtk_label_new ("Zoom Stepping Value"); + INDENTED_ADD (label, 0, 1, 4, 5); + hbox = gtk_hbox_new (FALSE, 4); + entry = gtk_label_new ("Not available in this WebKit version"); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + FILLED_ADD (hbox, 1, 2, 4, 5); + } label = katze_property_label (settings, "location-entry-search"); - INDENTED_ADD (label, 0, 1, 4, 5); + INDENTED_ADD (label, 0, 1, 5, 6); entry = katze_property_proxy (settings, "location-entry-search", NULL); - FILLED_ADD (entry, 1, 2, 4, 5); + FILLED_ADD (entry, 1, 2, 5, 6); // Page "Interface" PAGE_NEW (_("Interface")); From 0cf86e0ee0ccbce6264471855987328fcb2c137c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 8 Jun 2008 19:45:33 +0200 Subject: [PATCH 0139/2970] Move tooltip API from sokoke to compat --- midori/compat.c | 27 +++++++++++++++++++++++++++ midori/compat.h | 12 ++++++++++++ midori/midori-browser.c | 4 ++-- midori/midori-panel.c | 2 +- midori/midori-webview.c | 2 +- midori/sokoke.c | 30 ------------------------------ midori/sokoke.h | 8 -------- 7 files changed, 43 insertions(+), 42 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index d9ff8bb7..5ebbfa39 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -11,6 +11,33 @@ #include "compat.h" +#if !GTK_CHECK_VERSION(2, 12, 0) + +void +sokoke_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) +{ + static GtkTooltips* tooltips; + if (!tooltips) + tooltips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tooltips, widget, text, NULL); +} + +void +gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, + const gchar* text) +{ + if (text && *text) + { + static GtkTooltips* tooltips = NULL; + if (G_UNLIKELY (!tooltips)) + tooltips = gtk_tooltips_new(); + + gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); + } +} + +#endif + #ifndef WEBKIT_CHECK_VERSION /** diff --git a/midori/compat.h b/midori/compat.h index 1547b11d..a539ed5f 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -16,6 +16,18 @@ G_BEGIN_DECLS +#if !GTK_CHECK_VERSION(2, 12, 0) + +void +gtk_widget_set_tooltip_text (GtkWidget* widget, + const gchar* text); + +void +gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, + const gchar* text); + +#endif + #ifndef WEBKIT_CHECK_VERSION gfloat diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2fa5c5eb..d68ad086 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2759,7 +2759,7 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb), browser); - sokoke_tool_item_set_tooltip_text(toolitem, desc); + gtk_tool_item_set_tooltip_text (toolitem, desc); g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); break; case KATZE_XBEL_ITEM_KIND_BOOKMARK: @@ -2769,7 +2769,7 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), browser); - sokoke_tool_item_set_tooltip_text(toolitem, desc); + gtk_tool_item_set_tooltip_text (toolitem, desc); g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); break; case KATZE_XBEL_ITEM_KIND_SEPARATOR: diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 9c321d1e..5bf45178 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -210,7 +210,7 @@ midori_panel_init (MidoriPanel* panel) gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close panel")); - sokoke_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Close panel")); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Close panel")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_button_close_clicked_cb), panel); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 827c601c..f2b8e0dd 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -666,7 +666,7 @@ midori_web_view_set_property (GObject* object, if (priv->tab_label) { gtk_label_set_text (GTK_LABEL (priv->tab_label), title); - sokoke_widget_set_tooltip_text (priv->tab_label, title); + gtk_widget_set_tooltip_text (priv->tab_label, title); } if (priv->proxy_menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( diff --git a/midori/sokoke.c b/midori/sokoke.c index 157252d5..20dc48e0 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -130,36 +130,6 @@ sokoke_container_show_children (GtkContainer* container) gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); } -void -sokoke_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) -{ - #if GTK_CHECK_VERSION(2, 12, 0) - gtk_widget_set_tooltip_text (widget, text); - #else - static GtkTooltips* tooltips; - if (!tooltips) - tooltips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tooltips, widget, text, NULL); - #endif -} - -void -sokoke_tool_item_set_tooltip_text (GtkToolItem* toolitem, const gchar* text) -{ - if (text && *text) - { - #if GTK_CHECK_VERSION(2, 12, 0) - gtk_tool_item_set_tooltip_text (toolitem, text); - #else - static GtkTooltips* tooltips = NULL; - if (G_UNLIKELY (!tooltips)) - tooltips = gtk_tooltips_new(); - - gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); - #endif - } -} - typedef struct { GtkWidget* widget; diff --git a/midori/sokoke.h b/midori/sokoke.h index 89e3ba2e..af12b399 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -45,14 +45,6 @@ sokoke_widget_set_visible (GtkWidget* widget, void sokoke_container_show_children (GtkContainer* container); -void -sokoke_widget_set_tooltip_text (GtkWidget* widget, - const gchar* text); - -void -sokoke_tool_item_set_tooltip_text (GtkToolItem* toolitem, - const gchar* text); - void sokoke_widget_popup (GtkWidget* widget, GtkMenu* menu, From 8e8e9f36635d334af812ddcf9165c6256c4b4109 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 9 Jun 2008 03:13:08 +0200 Subject: [PATCH 0140/2970] Remove zoom compatibility, use new API or fall through --- midori/compat.c | 59 ----------------------------------------- midori/compat.h | 3 ++- midori/midori-browser.c | 11 ++++---- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index 5ebbfa39..7dff901f 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -40,90 +40,31 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, #ifndef WEBKIT_CHECK_VERSION -/** - * webkit_web_view_get_zoom_level: - * @web_view: a #WebKitWebView - * - * Retrieves the current zoom level. - * - * Return value: the zoom level, always 1.0 if not supported - **/ gfloat webkit_web_view_get_zoom_level (WebKitWebView* web_view) { g_return_val_if_fail (WEBKIT_IS_WEB_VIEW (web_view), 1.0); - if (g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), - "zoom-level")) - { - gfloat zoom_level; - g_object_get (web_view, "zoom-level", &zoom_level, NULL); - return zoom_level; - } return 1.0; } -/** - * webkit_web_view_set_zoom_level: - * @web_view: a #WebKitWebView - * - * Sets the current zoom level. - * - * Does nothing if not supported. - **/ void webkit_web_view_set_zoom_level (WebKitWebView* web_view, gfloat zoom_level) { g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); - - if (g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), - "zoom-level")) - g_object_set (web_view, "zoom-level", zoom_level, NULL); } -/** - * webkit_web_view_zoom_in: - * @web_view: a #WebKitWebView - * - * Increases the current zoom level. - * - * Does nothing if not supported. - **/ void webkit_web_view_zoom_in (WebKitWebView* web_view) { g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); - - gfloat zoom_level = webkit_web_view_get_zoom_level (web_view); - WebKitWebSettings* settings = webkit_web_view_get_settings (web_view); - gfloat zoom_step; - g_object_get (settings, "zoom-step", &zoom_step, NULL); - webkit_web_view_set_zoom_level (web_view, zoom_level + zoom_step); } -/** - * webkit_web_view_zoom_out: - * @web_view: a #WebKitWebView - * - * Decreases the current zoom level. - * - * Does nothing if not supported. - **/ void webkit_web_view_zoom_out (WebKitWebView* web_view) { g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); - - gfloat zoom_level = webkit_web_view_get_zoom_level (web_view); - WebKitWebSettings* settings = webkit_web_view_get_settings (web_view); - if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), - "zoom-step")) - { - gfloat zoom_step; - g_object_get (settings, "zoom-step", &zoom_step, NULL); - webkit_web_view_set_zoom_level (web_view, zoom_level - zoom_step); - } } #endif diff --git a/midori/compat.h b/midori/compat.h index a539ed5f..c0818d8c 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -34,7 +34,8 @@ gfloat webkit_web_view_get_zoom_level (WebKitWebView* web_view); void -webkit_web_view_set_zoom_level (WebKitWebView* web_view); +webkit_web_view_set_zoom_level (WebKitWebView* web_view, + gfloat zoom_level); void webkit_web_view_zoom_in (WebKitWebView* web_view); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d68ad086..1a99d61f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -180,12 +180,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); _action_set_sensitive (browser, "ZoomNormal", webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); - if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_view), - "zoom-level")) - { - _action_set_sensitive (browser, "ZoomIn", FALSE); - _action_set_sensitive (browser, "ZoomOut", FALSE); - } _action_set_sensitive (browser, "Back", webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); _action_set_sensitive (browser, "Forward", @@ -2985,6 +2979,11 @@ midori_browser_init (MidoriBrowser* browser) "", _("Extensions")); g_object_unref (ui_manager); + + #ifndef WEBKIT_CHECK_VERSION + _action_set_sensitive (browser, "ZoomIn", FALSE); + _action_set_sensitive (browser, "ZoomOut", FALSE); + #endif } static void From f2aff5f290dc72b57f05ce7c3e1276149332d119 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 9 Jun 2008 03:17:01 +0200 Subject: [PATCH 0141/2970] Introduce WebItem, first step of refactoring web search --- midori/Makefile.am | 1 + midori/midori-trash.c | 6 +- midori/midori-webitem.c | 367 ++++++++++++++++++++++++++++++++++++++++ midori/midori-webitem.h | 83 +++++++++ midori/search.c | 164 ++++-------------- midori/search.h | 61 ------- midori/sokoke.c | 9 +- midori/webSearch.c | 92 +++++----- 8 files changed, 535 insertions(+), 248 deletions(-) create mode 100644 midori/midori-webitem.c create mode 100644 midori/midori-webitem.h diff --git a/midori/Makefile.am b/midori/Makefile.am index 5f72dc2f..61146edc 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -18,6 +18,7 @@ bin_PROGRAMS = \ midori_SOURCES = \ main.c main.h \ + midori-item.c midori-item.h \ midori-app.c midori-app.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ diff --git a/midori/midori-trash.c b/midori/midori-trash.c index 10dce2c8..b546e121 100644 --- a/midori/midori-trash.c +++ b/midori/midori-trash.c @@ -62,7 +62,7 @@ midori_trash_class_init (MidoriTrashClass* class) { signals[INSERTED] = g_signal_new ( "inserted", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriTrashClass, inserted), 0, @@ -73,7 +73,7 @@ midori_trash_class_init (MidoriTrashClass* class) signals[REMOVED] = g_signal_new ( "removed", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriTrashClass, removed), 0, @@ -93,7 +93,7 @@ midori_trash_class_init (MidoriTrashClass* class) PROP_LIMIT, g_param_spec_uint ( "limit", - "Limit", + _("Limit"), _("The maximum number of items"), 0, G_MAXUINT, 10, flags)); diff --git a/midori/midori-webitem.c b/midori/midori-webitem.c new file mode 100644 index 00000000..bf74aff3 --- /dev/null +++ b/midori/midori-webitem.c @@ -0,0 +1,367 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-webitem.h" + +#include +#include + +struct _MidoriWebItem +{ + GObject parent_instance; + + gchar* name; + gchar* description; + gchar* uri; + gchar* icon; + gchar* token; +}; + +G_DEFINE_TYPE (MidoriWebItem, midori_web_item, G_TYPE_OBJECT) + +enum +{ + PROP_0, + + PROP_NAME, + PROP_DESCRIPTION, + PROP_URI, + PROP_ICON, + PROP_TOKEN +}; + +static void +midori_web_item_finalize (GObject* object); + +static void +midori_web_item_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_web_item_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_web_item_class_init (MidoriWebItemClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_web_item_finalize; + gobject_class->set_property = midori_web_item_set_property; + gobject_class->get_property = midori_web_item_get_property; + + GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_NAME, + g_param_spec_string ( + "name", + _("Name"), + _("The name of the web item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_DESCRIPTION, + g_param_spec_string ( + "description", + _("Description"), + _("The description of the web item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_URI, + g_param_spec_string ( + "uri", + _("URI"), + _("The URI of the web item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_ICON, + g_param_spec_string ( + "icon", + _("Icon"), + _("The icon of the web item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_TOKEN, + g_param_spec_string ( + "token", + _("Token"), + _("The token of the web item"), + NULL, + flags)); +} + + + +static void +midori_web_item_init (MidoriWebItem* web_item) +{ + // Nothing to do here +} + +static void +midori_web_item_finalize (GObject* object) +{ + G_OBJECT_CLASS (midori_web_item_parent_class)->finalize (object); +} + +static void +midori_web_item_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriWebItem* web_item = MIDORI_WEB_ITEM (object); + + switch (prop_id) + { + case PROP_NAME: + web_item->name = g_value_dup_string (value); + break; + case PROP_DESCRIPTION: + web_item->description = g_value_dup_string (value); + break; + case PROP_URI: + web_item->uri = g_value_dup_string (value); + break; + case PROP_ICON: + web_item->icon = g_value_dup_string (value); + break; + case PROP_TOKEN: + web_item->token = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_web_item_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriWebItem* web_item = MIDORI_WEB_ITEM (object); + + switch (prop_id) + { + case PROP_NAME: + g_value_set_string (value, web_item->name); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, web_item->description); + break; + case PROP_URI: + g_value_set_string (value, web_item->uri); + break; + case PROP_ICON: + g_value_set_string (value, web_item->icon); + break; + case PROP_TOKEN: + g_value_set_string (value, web_item->token); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_web_item_new: + * + * Creates a new #MidoriWebItem. + * + * Return value: a new #MidoriWebItem + **/ +MidoriWebItem* +midori_web_item_new (void) +{ + MidoriWebItem* web_item = g_object_new (MIDORI_TYPE_WEB_ITEM, + NULL); + + return web_item; +} + +/** + * midori_web_item_get_name: + * @web_item: a #MidoriWebItem + * + * Retrieves the name of @web_item. + * + * Return value: the name of the web item + **/ +const gchar* +midori_web_item_get_name (MidoriWebItem* web_item) +{ + g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); + + return web_item->name; +} + +/** + * midori_web_item_set_name: + * @web_item: a #MidoriWebItem + * @name: a string + * + * Sets the name of @web_item. + **/ +void +midori_web_item_set_name (MidoriWebItem* web_item, + const gchar* name) +{ + g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + + katze_assign (web_item->name, g_strdup (name)); + g_object_notify (G_OBJECT (web_item), "name"); +} + +/** + * midori_web_item_get_description: + * @web_item: a #MidoriWebItem + * + * Retrieves the description of @web_item. + * + * Return value: the description of the web item + **/ +const gchar* +midori_web_item_get_description (MidoriWebItem* web_item) +{ + g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); + + return web_item->description; +} + +/** + * midori_web_item_set_description: + * @web_item: a #MidoriWebItem + * @description: a string + * + * Sets the description of @web_item. + **/ +void +midori_web_item_set_description (MidoriWebItem* web_item, + const gchar* description) +{ + g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + + katze_assign (web_item->description, g_strdup (description)); + g_object_notify (G_OBJECT (web_item), "description"); +} + +/** + * midori_web_item_get_uri: + * @web_item: a #MidoriWebItem + * + * Retrieves the URI of @web_item. + * + * Return value: the URI of the web item + **/ +const gchar* +midori_web_item_get_uri (MidoriWebItem* web_item) +{ + g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); + + return web_item->uri; +} + +/** + * midori_web_item_set_uri: + * @web_item: a #MidoriWebItem + * @uri: a string + * + * Sets the URI of @web_item. + **/ +void +midori_web_item_set_uri (MidoriWebItem* web_item, + const gchar* uri) +{ + g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + + katze_assign (web_item->uri, g_strdup (uri)); + g_object_notify (G_OBJECT (web_item), "uri"); +} + +/** + * midori_web_item_get_icon: + * @web_item: a #MidoriWebItem + * + * Retrieves the icon of @web_item. + * + * Return value: the icon of the web item + **/ +const gchar* +midori_web_item_get_icon (MidoriWebItem* web_item) +{ + g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); + + return web_item->icon; +} + +/** + * midori_web_item_set_icon: + * @web_item: a #MidoriWebItem + * @icon: a string + * + * Sets the icon of @web_item. + **/ +void +midori_web_item_set_icon (MidoriWebItem* web_item, + const gchar* icon) +{ + g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + + katze_assign (web_item->icon, g_strdup (icon)); + g_object_notify (G_OBJECT (web_item), "icon"); +} + +/** + * midori_web_item_get_token: + * @web_item: a #MidoriWebItem + * + * Retrieves the token of @web_item. + * + * Return value: the token of the web item + **/ +const gchar* +midori_web_item_get_token (MidoriWebItem* web_item) +{ + g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); + + return web_item->token; +} + +/** + * midori_web_item_set_token: + * @web_item: a #MidoriWebItem + * @token: a string + * + * Sets the token of @web_item. + **/ +void +midori_web_item_set_token (MidoriWebItem* web_item, + const gchar* token) +{ + g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + + katze_assign (web_item->token, g_strdup (token)); + g_object_notify (G_OBJECT (web_item), "token"); +} diff --git a/midori/midori-webitem.h b/midori/midori-webitem.h new file mode 100644 index 00000000..c1276ab3 --- /dev/null +++ b/midori/midori-webitem.h @@ -0,0 +1,83 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_WEB_ITEM_H__ +#define __MIDORI_WEB_ITEM_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_WEB_ITEM \ + (midori_web_item_get_type ()) +#define MIDORI_WEB_ITEM(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_ITEM, MidoriWebItem)) +#define MIDORI_WEB_ITEM_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_ITEM, MidoriWebItemClass)) +#define MIDORI_IS_WEB_ITEM(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_ITEM)) +#define MIDORI_IS_WEB_ITEM_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_ITEM)) +#define MIDORI_WEB_ITEM_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_ITEM, MidoriWebItemClass)) + +typedef struct _MidoriWebItem MidoriWebItem; +typedef struct _MidoriWebItemClass MidoriWebItemClass; + +struct _MidoriWebItemClass +{ + GObjectClass parent_class; +}; + +GType +midori_web_item_get_type (void); + +MidoriWebItem* +midori_web_item_new (void); + +const gchar* +midori_web_item_get_name (MidoriWebItem* web_item); + +void +midori_web_item_set_name (MidoriWebItem* web_item, + const gchar* name); + +const gchar* +midori_web_item_get_description (MidoriWebItem* web_item); + +void +midori_web_item_set_description (MidoriWebItem* web_item, + const gchar* description); + +const gchar* +midori_web_item_get_uri (MidoriWebItem* web_item); + +void +midori_web_item_set_uri (MidoriWebItem* web_item, + const gchar* uri); + +const gchar* +midori_web_item_get_icon (MidoriWebItem* web_item); + +void +midori_web_item_set_icon (MidoriWebItem* web_item, + const gchar* icon); + +const gchar* +midori_web_item_get_token (MidoriWebItem* web_item); + +void +midori_web_item_set_token (MidoriWebItem* web_item, + const gchar* token); + +G_END_DECLS + +#endif /* __MIDORI_WEB_ITEM_H__ */ diff --git a/midori/search.c b/midori/search.c index 26afcb5e..1577b9c8 100644 --- a/midori/search.c +++ b/midori/search.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -11,11 +11,9 @@ #include "search.h" -#include "sokoke.h" -#include +#include "midori-webitem.h" -#include -#include +#include "sokoke.h" GList* search_engines_new(void) { @@ -24,7 +22,7 @@ GList* search_engines_new(void) void search_engines_free(GList* searchEngines) { - g_list_foreach(searchEngines, (GFunc)search_engine_free, NULL); + g_list_foreach(searchEngines, (GFunc)g_object_unref, NULL); g_list_free(searchEngines); } @@ -40,14 +38,19 @@ gboolean search_engines_from_file(GList** searchEngines, const gchar* filename guint i; for(i = 0; engines[i] != NULL; i++) { - SearchEngine* engine = search_engine_new(); - search_engine_set_short_name(engine, engines[i]); - engine->description = g_key_file_get_string(keyFile, engines[i], "description", NULL); - engine->url = g_key_file_get_string(keyFile, engines[i], "url", NULL); - engine->inputEncoding = g_key_file_get_string(keyFile, engines[i], "input-encoding", NULL); - engine->icon = g_key_file_get_string(keyFile, engines[i], "icon", NULL); - engine->keyword = g_key_file_get_string(keyFile, engines[i], "keyword", NULL); - *searchEngines = g_list_prepend(*searchEngines, engine); + MidoriWebItem* web_item = midori_web_item_new (); + guint j, n_properties; + GParamSpec** pspecs = g_object_class_list_properties ( + G_OBJECT_GET_CLASS (web_item), &n_properties); + for (j = 0; j < n_properties; j++) + { + const gchar* property = g_param_spec_get_name (pspecs[j]); + gchar* value = g_key_file_get_string (keyFile, engines[i], + property, NULL); + g_object_set (web_item, property, value, NULL); + g_free (value); + } + *searchEngines = g_list_prepend(*searchEngines, web_item); } *searchEngines = g_list_reverse(*searchEngines); g_strfreev(engines); @@ -71,129 +74,22 @@ gboolean search_engines_to_file(GList* searchEngines, const gchar* filename guint i; for(i = 0; i < n; i++) { - SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, i); - const gchar* name = search_engine_get_short_name(engine); - key_file_set_string(keyFile, name, "description", engine->description); - key_file_set_string(keyFile, name, "url", engine->url); - key_file_set_string(keyFile, name, "input-encoding", engine->inputEncoding); - key_file_set_string(keyFile, name, "icon", engine->icon); - key_file_set_string(keyFile, name, "keyword", engine->keyword); + MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data(searchEngines, i); + const gchar* name = midori_web_item_get_name (web_item); + guint j, n_properties; + GParamSpec** pspecs = g_object_class_list_properties ( + G_OBJECT_GET_CLASS (web_item), &n_properties); + for (j = 0; j < n_properties; j++) + { + const gchar* property = g_param_spec_get_name (pspecs[j]); + gchar* value; + g_object_get (web_item, property, &value, NULL); + key_file_set_string (keyFile, name, property, value); + g_free (value); + } } gboolean bSaved = sokoke_key_file_save_to_file(keyFile, filename, error); g_key_file_free(keyFile); return bSaved; } - -SearchEngine* search_engine_new() -{ - SearchEngine* engine = g_new0(SearchEngine, 1); - engine->shortName = g_strdup(""); - return engine; -} - -void search_engine_free(SearchEngine* engine) -{ - g_return_if_fail(engine); - g_free(engine->shortName); - g_free(engine->description); - g_free(engine->url); - g_free(engine->inputEncoding); - g_free(engine->icon); - g_free(engine->keyword); - g_free(engine); -} - -SearchEngine* search_engine_copy(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - SearchEngine* copy = search_engine_new(); - search_engine_set_short_name(copy, engine->shortName); - search_engine_set_description(copy, engine->description); - search_engine_set_url(copy, engine->url); - search_engine_set_input_encoding(copy, engine->inputEncoding); - search_engine_set_icon(copy, engine->icon); - search_engine_set_keyword(copy, engine->keyword); - return engine; -} - -GType search_engine_get_type() -{ - static GType type = 0; - if(!type) - type = g_pointer_type_register_static("search_engine"); - return type; -} - -G_CONST_RETURN gchar* search_engine_get_short_name(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - return engine->shortName; -} - -G_CONST_RETURN gchar* search_engine_get_description(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - return engine->description; -} - -G_CONST_RETURN gchar* search_engine_get_url(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - return engine->url; -} - -G_CONST_RETURN gchar* search_engine_get_input_encoding(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - return engine->inputEncoding; -} - -G_CONST_RETURN gchar* search_engine_get_icon(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - return engine->icon; -} - -G_CONST_RETURN gchar* search_engine_get_keyword(SearchEngine* engine) -{ - g_return_val_if_fail(engine, NULL); - return engine->keyword; -} - -void search_engine_set_short_name(SearchEngine* engine, const gchar* shortName) -{ - g_return_if_fail(engine); - g_return_if_fail(shortName); - katze_assign(engine->shortName, g_strdup(shortName)); -} - -void search_engine_set_description(SearchEngine* engine, const gchar* description) -{ - g_return_if_fail(engine); - katze_assign(engine->description, g_strdup(description)); -} - -void search_engine_set_url(SearchEngine* engine, const gchar* url) -{ - g_return_if_fail(engine); - katze_assign(engine->url, g_strdup(url)); -} - -void search_engine_set_input_encoding(SearchEngine* engine, const gchar* inputEncoding) -{ - g_return_if_fail(engine); - katze_assign(engine->inputEncoding, g_strdup(inputEncoding)); -} - -void search_engine_set_icon(SearchEngine* engine, const gchar* icon) -{ - g_return_if_fail(engine); - katze_assign(engine->icon, g_strdup(icon)); -} - -void search_engine_set_keyword(SearchEngine* engine, const gchar* keyword) -{ - g_return_if_fail(engine); - katze_assign(engine->keyword, g_strdup(keyword)); -} diff --git a/midori/search.h b/midori/search.h index c8aa7093..7ca92912 100644 --- a/midori/search.h +++ b/midori/search.h @@ -15,17 +15,6 @@ #include #include -// Note: This structure is entirely private. -typedef struct -{ - gchar* shortName; - gchar* description; - gchar* url; - gchar* inputEncoding; - gchar* icon; - gchar* keyword; -} SearchEngine; - GList* search_engines_new(void); @@ -38,54 +27,4 @@ search_engines_from_file(GList**, const gchar*, GError**); gboolean search_engines_to_file(GList*, const gchar*, GError**); -SearchEngine* -search_engine_new(void); - -void -search_engine_free(SearchEngine*); - -SearchEngine* -search_engine_copy(SearchEngine*); - -GType -search_engine_get_type(); - -#define G_TYPE_SEARCH_ENGINE search_engine_get_type() - -G_CONST_RETURN gchar* -search_engine_get_short_name(SearchEngine*); - -G_CONST_RETURN gchar* -search_engine_get_description(SearchEngine*); - -G_CONST_RETURN gchar* -search_engine_get_url(SearchEngine*); - -G_CONST_RETURN gchar* -search_engine_get_input_encoding(SearchEngine*); - -G_CONST_RETURN gchar* -search_engine_get_icon(SearchEngine*); - -G_CONST_RETURN gchar* -search_engine_get_keyword(SearchEngine*); - -void -search_engine_set_short_name(SearchEngine*, const gchar*); - -void -search_engine_set_description(SearchEngine*, const gchar*); - -void -search_engine_set_url(SearchEngine*, const gchar*); - -void -search_engine_set_input_encoding(SearchEngine*, const gchar*); - -void -search_engine_set_icon(SearchEngine*, const gchar*); - -void -search_engine_set_keyword(SearchEngine*, const gchar*); - #endif /* !__SEARCH_H__ */ diff --git a/midori/sokoke.c b/midori/sokoke.c index 20dc48e0..6130ffa0 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -11,7 +11,7 @@ #include "sokoke.h" -#include "search.h" +#include "midori-webitem.h" #include "config.h" #include "main.h" @@ -57,11 +57,10 @@ sokoke_magic_uri (const gchar* uri, const gchar* default_search_uri) guint i; for (i = 0; i < n; i++) { - SearchEngine* search_engine = (SearchEngine*)g_list_nth_data ( + MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data ( searchEngines, i); - if (!strcmp (search_engine_get_keyword (search_engine), - parts[0])) - search_uri = search_engine->url; + if (!strcmp (midori_web_item_get_token (web_item), parts[0])) + search_uri = midori_web_item_get_uri (web_item); } if (search_uri) search = g_strdup_printf (search_uri, parts[1]); diff --git a/midori/webSearch.c b/midori/webSearch.c index 000c66ed..427608df 100644 --- a/midori/webSearch.c +++ b/midori/webSearch.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,8 @@ #include "main.h" #include "sokoke.h" +#include "midori-webitem.h" + #include #include #include @@ -66,14 +68,14 @@ void update_searchEngine(guint index, GtkWidget* search) // Reset in case the index is out of range if(index >= n) index = 0; - SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, index); - GdkPixbuf* pixbuf = load_web_icon(search_engine_get_icon(engine) - , GTK_ICON_SIZE_MENU, search); + MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, index); + GdkPixbuf* pixbuf = load_web_icon (midori_web_item_get_icon (web_item), + GTK_ICON_SIZE_MENU, search); sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search) , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf))); g_object_unref(pixbuf); - sokoke_entry_set_default_text(GTK_ENTRY(search) - , search_engine_get_short_name(engine)); + sokoke_entry_set_default_text (GTK_ENTRY (search), + midori_web_item_get_name (web_item)); // config->searchEngine = index; } } @@ -95,11 +97,11 @@ void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos guint i; for(i = 0; i < n; i++) { - SearchEngine* engine = (SearchEngine*)g_list_nth_data(searchEngines, i); - menuitem = gtk_image_menu_item_new_with_label( - search_engine_get_short_name(engine)); - GdkPixbuf* pixbuf = load_web_icon(search_engine_get_icon(engine) - , GTK_ICON_SIZE_MENU, menuitem); + MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, i); + menuitem = gtk_image_menu_item_new_with_label ( + midori_web_item_get_name (web_item)); + GdkPixbuf* pixbuf = load_web_icon (midori_web_item_get_icon (web_item), + GTK_ICON_SIZE_MENU, menuitem); GtkWidget* icon = gtk_image_new_from_pixbuf(pixbuf); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), icon); g_object_unref(pixbuf); @@ -134,12 +136,12 @@ static void on_webSearch_engines_render_icon(GtkTreeViewColumn* column , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter , GtkWidget* treeview) { - SearchEngine* searchEngine; - gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &searchEngine, -1); + MidoriWebItem* web_item; + gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &web_item, -1); // TODO: Would it be better to not do this on every redraw? - const gchar* icon = search_engine_get_icon(searchEngine); - if(icon) + const gchar* icon = midori_web_item_get_icon (web_item); + if (icon) { GdkPixbuf* pixbuf = load_web_icon(icon, GTK_ICON_SIZE_DND, treeview); g_object_set(renderer, "pixbuf", pixbuf, NULL); @@ -154,10 +156,10 @@ static void on_webSearch_engines_render_text(GtkTreeViewColumn* column , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter , GtkWidget* treeview) { - SearchEngine* searchEngine; - gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &searchEngine, -1); - const gchar* name = search_engine_get_short_name(searchEngine); - const gchar* description = search_engine_get_description(searchEngine); + MidoriWebItem* web_item; + gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &web_item, -1); + const gchar* name = midori_web_item_get_name (web_item); + const gchar* description = midori_web_item_get_description (web_item); gchar* markup = g_markup_printf_escaped("%s\n%s", name, description); g_object_set(renderer, "markup", markup, NULL); g_free(markup); @@ -196,12 +198,12 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - SearchEngine* searchEngine; + MidoriWebItem* web_item; GtkTreeModel* liststore; GtkTreeIter iter; if(newEngine) { - searchEngine = search_engine_new(); + web_item = midori_web_item_new (); gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) , GTK_RESPONSE_ACCEPT, FALSE); } @@ -209,7 +211,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS { GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(webSearch->treeview)); gtk_tree_selection_get_selected(selection, &liststore, &iter); - gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &searchEngine, -1); + gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &web_item, -1); } GtkWidget* hbox = gtk_hbox_new(FALSE, 8); @@ -223,7 +225,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_entry_set_activates_default(GTK_ENTRY(entry_shortName), TRUE); if(!newEngine) gtk_entry_set_text(GTK_ENTRY(entry_shortName) - , search_engine_get_short_name(searchEngine)); + , STR_NON_NULL (midori_web_item_get_name (web_item))); gtk_box_pack_start(GTK_BOX(hbox), entry_shortName, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); @@ -237,7 +239,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_entry_set_activates_default(GTK_ENTRY(entry_description), TRUE); if(!newEngine) gtk_entry_set_text(GTK_ENTRY(entry_description) - , STR_NON_NULL(search_engine_get_description(searchEngine))); + , STR_NON_NULL (midori_web_item_get_description (web_item))); gtk_box_pack_start(GTK_BOX(hbox), entry_description, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); @@ -251,7 +253,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_entry_set_activates_default(GTK_ENTRY(entry_url), TRUE); if(!newEngine) gtk_entry_set_text(GTK_ENTRY(entry_url) - , STR_NON_NULL(search_engine_get_url(searchEngine))); + , STR_NON_NULL (midori_web_item_get_uri (web_item))); gtk_box_pack_start(GTK_BOX(hbox), entry_url, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); @@ -265,7 +267,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_entry_set_activates_default(GTK_ENTRY(entry_icon), TRUE); if(!newEngine) gtk_entry_set_text(GTK_ENTRY(entry_icon) - , STR_NON_NULL(search_engine_get_icon(searchEngine))); + , STR_NON_NULL (midori_web_item_get_icon (web_item))); gtk_box_pack_start(GTK_BOX(hbox), entry_icon, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); @@ -279,7 +281,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_entry_set_activates_default(GTK_ENTRY(entry_keyword), TRUE); if(!newEngine) gtk_entry_set_text(GTK_ENTRY(entry_keyword) - , STR_NON_NULL(search_engine_get_keyword(searchEngine))); + , STR_NON_NULL(midori_web_item_get_token (web_item))); gtk_box_pack_start(GTK_BOX(hbox), entry_keyword, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); gtk_widget_show_all(hbox); @@ -287,27 +289,27 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - search_engine_set_short_name(searchEngine + midori_web_item_set_name (web_item , gtk_entry_get_text(GTK_ENTRY(entry_shortName))); - search_engine_set_description(searchEngine + midori_web_item_set_description (web_item , gtk_entry_get_text(GTK_ENTRY(entry_description))); - search_engine_set_url(searchEngine + midori_web_item_set_uri (web_item , gtk_entry_get_text(GTK_ENTRY(entry_url))); /*search_engine_set_input_encoding(searchEngine , gtk_entry_get_text(GTK_ENTRY(entry_inputEncoding)));*/ - search_engine_set_icon(searchEngine + midori_web_item_set_icon (web_item , gtk_entry_get_text(GTK_ENTRY(entry_icon))); - search_engine_set_keyword(searchEngine + midori_web_item_set_token (web_item , gtk_entry_get_text(GTK_ENTRY(entry_keyword))); if(newEngine) { - searchEngines = g_list_append(searchEngines, searchEngine); + searchEngines = g_list_append(searchEngines, web_item); liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(webSearch->treeview)); gtk_list_store_append(GTK_LIST_STORE(liststore), &iter); } gtk_list_store_set(GTK_LIST_STORE(liststore), &iter - , ENGINES_COL_ENGINE, searchEngine, -1); + , ENGINES_COL_ENGINE, web_item, -1); webSearch_toggle_edit_buttons(TRUE, webSearch); } gtk_widget_destroy(dialog); @@ -329,11 +331,11 @@ static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) GtkTreeModel* liststore; GtkTreeIter iter; gtk_tree_selection_get_selected(selection, &liststore, &iter); - SearchEngine* searchEngine; - gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &searchEngine, -1); + MidoriWebItem* web_item; + gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &web_item, -1); gtk_list_store_remove(GTK_LIST_STORE(liststore), &iter); - search_engine_free(searchEngine); - searchEngines = g_list_remove(searchEngines, searchEngine); + g_object_unref (web_item); + searchEngines = g_list_remove (searchEngines, web_item); //update_searchEngine(config->searchEngine, webSearch->browser); webSearch_toggle_edit_buttons(g_list_nth(searchEngines, 0) != NULL, webSearch); // FIXME: we want to allow undo of some kind @@ -370,7 +372,7 @@ GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; GtkListStore* liststore = gtk_list_store_new(ENGINES_COL_N - , G_TYPE_SEARCH_ENGINE); + , MIDORI_TYPE_WEB_ITEM); GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(liststore)); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); column = gtk_tree_view_column_new(); @@ -393,9 +395,9 @@ GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) guint i; for(i = 0; i < n; i++) { - SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, i); + MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, i); gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i - , ENGINES_COL_ENGINE, searchEngine, -1); + , ENGINES_COL_ENGINE, web_item, -1); } g_object_unref(liststore); CWebSearch* webSearch = g_new0(CWebSearch, 1); @@ -459,10 +461,10 @@ gboolean on_webSearch_scroll(GtkWidget* webView, GdkEventScroll* event, MidoriBr void on_webSearch_activate(GtkWidget* widget, MidoriBrowser* browser) { const gchar* keywords = gtk_entry_get_text(GTK_ENTRY(widget)); - gchar* url; - SearchEngine* searchEngine = (SearchEngine*)g_list_nth_data(searchEngines, 0/*config->searchEngine*/); - if(searchEngine) - url = searchEngine->url; + const gchar* url; + MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, 0/*config->searchEngine*/); + if (web_item) + url = midori_web_item_get_uri (web_item); else // The location search is our fallback url = "";//config->locationSearch; gchar* search; From 074d239b3c908235e1f49a47e5436dc699b24270 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 9 Jun 2008 19:32:55 +0200 Subject: [PATCH 0142/2970] Fix autotools build. --- midori/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/Makefile.am b/midori/Makefile.am index 61146edc..8d037626 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -18,7 +18,7 @@ bin_PROGRAMS = \ midori_SOURCES = \ main.c main.h \ - midori-item.c midori-item.h \ + midori-webitem.c midori-webitem.h \ midori-app.c midori-app.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ From 2aeca51fbed4e7abe98f5930a2ab1863e7419c4a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Jun 2008 16:20:02 +0200 Subject: [PATCH 0143/2970] Print an error message if midori fails to run --- midori/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/main.c b/midori/main.c index f88d0b15..9726f009 100644 --- a/midori/main.c +++ b/midori/main.c @@ -248,6 +248,10 @@ main (int argc, char** argv) if (!gtk_init_with_args (&argc, &argv, _("[URL]"), entries, GETTEXT_PACKAGE, &error)) { + if (error->code == G_OPTION_ERROR_UNKNOWN_OPTION) + g_print ("%s - %s\n", _("midori"), _("Unknown argument.")); + else + g_print ("%s - %s", _("midori"), _("Failed to setup interface.")); g_error_free (error); return 1; } From 06d6aa46af32a917bf3bbe5b75f4115339233f5f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Jun 2008 22:18:09 +0200 Subject: [PATCH 0144/2970] Update German translation. --- po/de.po | 725 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 454 insertions(+), 271 deletions(-) diff --git a/po/de.po b/po/de.po index b9d3bda7..a5789076 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 16:06+0200\n" +"POT-Creation-Date: 2008-06-10 16:18+0200\n" "PO-Revision-Date: 2008-03-20 13:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -22,1026 +22,1206 @@ msgid "Lightweight web browser" msgstr "Kleiner Netznavigator" #: ../midori.desktop.in.h:2 -msgid "Midori Web Browser" -msgstr "Midori Netznavigator" +msgid "Midori" +msgstr "Midori" #: ../midori.desktop.in.h:3 msgid "Web Browser" msgstr "Netznavigator" -#: ../src/main.c:47 +#: ../midori/main.c:46 msgid "Bookmark" msgstr "Lesezeichen" -#: ../src/main.c:48 -msgid "New Bookmark" -msgstr "Neues Lesezeichen" +#: ../midori/main.c:47 +msgid "_Add Bookmark" +msgstr "Lesezeichen _hinzufügen" -#: ../src/main.c:49 +#: ../midori/main.c:48 msgid "_Form Fill" msgstr "_Formulare ausfüllen" -#: ../src/main.c:50 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:407 -msgid "Homepage" -msgstr "Startseite" +#: ../midori/main.c:49 +msgid "_Homepage" +msgstr "_Startseite" -#: ../src/main.c:51 +#: ../midori/main.c:50 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../src/main.c:52 +#: ../midori/main.c:51 msgid "New _Window" msgstr "Neues _Fenster" -#: ../src/main.c:54 +#: ../midori/main.c:53 msgid "Select _All" msgstr "A_lles markieren" -#: ../src/main.c:57 +#: ../midori/main.c:56 msgid "_Fullscreen" msgstr "_Vollbild" -#: ../src/main.c:58 +#: ../midori/main.c:57 msgid "_Leave Fullscreen" msgstr "Vollbild _verlassen" -#: ../src/main.c:144 +#: ../midori/main.c:97 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" -#: ../src/main.c:193 +#: ../midori/main.c:153 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert '%s' ist ungültig für %s" -#: ../src/main.c:200 ../src/main.c:256 +#: ../midori/main.c:160 ../midori/main.c:222 #, c-format -msgid "Unhandled settings property '%s'" -msgstr "Unbehandelte Einstellungseigenschaft" +msgid "Unhandled settings value '%s'" +msgstr "Unbehandelter Einstellungswert '%s'" -#: ../src/main.c:270 ../src/main.c:304 +#: ../midori/main.c:236 ../midori/main.c:252 ../midori/main.c:254 +#: ../midori/main.c:268 msgid "midori" msgstr "midori" -#: ../src/main.c:277 +#: ../midori/main.c:243 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../src/main.c:282 +#: ../midori/main.c:248 msgid "[URL]" msgstr "[URL]" -#: ../src/main.c:306 -msgid "Debugging" -msgstr "Fehlerbehebung" +#: ../midori/main.c:252 +msgid "Unknown argument." +msgstr "Unbekanntes Argument." -#: ../src/main.c:307 +#: ../midori/main.c:254 +msgid "Failed to setup interface." +msgstr "Oberfläche konnte nicht eingerichtet werden." + +#: ../midori/main.c:269 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../src/main.c:309 +#: ../midori/main.c:271 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../src/main.c:344 +#: ../midori/main.c:319 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" -#: ../src/main.c:358 +#: ../midori/main.c:333 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Die Sitzung konnte nicht geladen werden. %s\n" -#: ../src/main.c:370 +#: ../midori/main.c:345 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" -#: ../src/main.c:380 +#: ../midori/main.c:355 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../src/main.c:489 +#: ../midori/main.c:479 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../src/main.c:498 +#: ../midori/main.c:488 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../src/main.c:507 +#: ../midori/main.c:497 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht geladen werden. %s" -#: ../src/main.c:519 +#: ../midori/main.c:509 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../src/main.c:528 +#: ../midori/main.c:518 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 -#: ../src/midori-browser.c:2101 +#: ../midori/midori-browser.c:201 ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2239 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 +#: ../midori/midori-browser.c:209 ../midori/midori-browser.c:2236 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../src/midori-browser.c:264 +#: ../midori/midori-browser.c:272 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../src/midori-browser.c:611 +#: ../midori/midori-browser.c:721 msgid "Menubar" msgstr "Menüleiste" -#: ../src/midori-browser.c:612 +#: ../midori/midori-browser.c:722 msgid "The menubar" msgstr "Die Menüleiste" -#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +#: ../midori/midori-browser.c:730 ../midori/midori-preferences.c:332 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../src/midori-browser.c:626 +#: ../midori/midori-browser.c:731 msgid "The navigationbar" msgstr "Die Navigationsleiste" -#: ../src/midori-browser.c:639 +#: ../midori/midori-browser.c:739 msgid "Tab" msgstr "Reiter" -#: ../src/midori-browser.c:640 +#: ../midori/midori-browser.c:740 msgid "The current tab" msgstr "Der aktuelle Reiter" -#: ../src/midori-browser.c:653 +#: ../midori/midori-browser.c:748 msgid "Statusbar" msgstr "Statusleiste" -#: ../src/midori-browser.c:654 +#: ../midori/midori-browser.c:749 msgid "The statusbar" msgstr "Die Statusleiste" -#: ../src/midori-browser.c:670 +#: ../midori/midori-browser.c:765 msgid "Settings" msgstr "Einstellungen" -#: ../src/midori-browser.c:671 +#: ../midori/midori-browser.c:766 msgid "The associated settings" msgstr "Die zugewiesenen Einstellungen" -#: ../src/midori-browser.c:690 +#: ../midori/midori-browser.c:785 msgid "Statusbar Text" msgstr "Statusleistenbeschriftung" -#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 +#: ../midori/midori-browser.c:786 ../midori/midori-webview.c:224 msgid "The text that is displayed in the statusbar" msgstr "Der Text, der in der Statusleiste angezeigt wird" -#: ../src/midori-browser.c:709 +#: ../midori/midori-browser.c:804 msgid "Trash" msgstr "Papierkorb" -#: ../src/midori-browser.c:710 +#: ../midori/midori-browser.c:805 msgid "The trash, collecting recently closed tabs and windows" msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:1430 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:1430 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../src/midori-browser.c:1311 +#: ../midori/midori-browser.c:1457 msgid "_Title:" msgstr "_Titel:" -#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 +#: ../midori/midori-browser.c:1470 ../midori/webSearch.c:235 msgid "_Description:" msgstr "_Beschreibung" -#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 +#: ../midori/midori-browser.c:1489 ../midori/webSearch.c:249 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1364 +#: ../midori/midori-browser.c:1506 msgid "_Folder:" msgstr "_Ordner:" -#: ../src/midori-browser.c:1368 +#: ../midori/midori-browser.c:1510 msgid "Root" msgstr "Wurzel" -#: ../src/midori-browser.c:1591 +#: ../midori/midori-browser.c:1733 msgid "Separator" msgstr "Trennlinie" -#: ../src/midori-browser.c:1780 +#: ../midori/midori-browser.c:1922 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../src/midori-browser.c:1788 +#: ../midori/midori-browser.c:1930 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../src/midori-browser.c:2015 +#: ../midori/midori-browser.c:2156 msgid "_File" msgstr "_Datei" -#: ../src/midori-browser.c:2018 +#: ../midori/midori-browser.c:2159 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../src/midori-browser.c:2021 +#: ../midori/midori-browser.c:2162 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../src/midori-browser.c:2024 +#: ../midori/midori-browser.c:2165 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../src/midori-browser.c:2027 +#: ../midori/midori-browser.c:2168 msgid "Save to a file" msgstr "In Datei speichern" -#: ../src/midori-browser.c:2029 +#: ../midori/midori-browser.c:2170 msgid "_Close Tab" msgstr "Reiter sch_ließen" -#: ../src/midori-browser.c:2030 +#: ../midori/midori-browser.c:2171 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../src/midori-browser.c:2032 +#: ../midori/midori-browser.c:2173 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../src/midori-browser.c:2033 +#: ../midori/midori-browser.c:2174 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../src/midori-browser.c:2035 +#: ../midori/midori-browser.c:2176 msgid "Pa_ge Setup" msgstr "Seite _einrichten" -#: ../src/midori-browser.c:2045 +#: ../midori/midori-browser.c:2180 +msgid "Show a preview of the printed page" +msgstr "Eine Vorschau auf die gedruckte Seite anzeigen" + +#: ../midori/midori-browser.c:2183 +msgid "Print the current page" +msgstr "Aktuelle Seite ausdrucken" + +#: ../midori/midori-browser.c:2186 msgid "Quit the application" msgstr "Programm beenden" -#: ../src/midori-browser.c:2047 +#: ../midori/midori-browser.c:2188 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/midori-browser.c:2050 +#: ../midori/midori-browser.c:2191 msgid "Undo the last modification" msgstr "Die letzte Änderung wiederrufen" -#: ../src/midori-browser.c:2053 +#: ../midori/midori-browser.c:2194 msgid "Redo the last modification" msgstr "Die letzte Änderung wiederholen" -#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 +#: ../midori/midori-browser.c:2197 +msgid "Cut the selected text" +msgstr "Markierten Text ausschneiden" + +#: ../midori/midori-browser.c:2200 ../midori/midori-browser.c:2203 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../src/midori-browser.c:2065 +#: ../midori/midori-browser.c:2206 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../src/midori-browser.c:2068 +#: ../midori/midori-browser.c:2209 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../src/midori-browser.c:2071 +#: ../midori/midori-browser.c:2212 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../src/midori-browser.c:2079 +#: ../midori/midori-browser.c:2215 +msgid "Find a word or phrase in the page" +msgstr "Finde ein Wort oder einen Satz auf der Seite" + +#: ../midori/midori-browser.c:2217 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../src/midori-browser.c:2082 +#: ../midori/midori-browser.c:2218 +msgid "Find the next occurrence of a word or phrase" +msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" + +#: ../midori/midori-browser.c:2220 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../src/midori-browser.c:2085 +#: ../midori/midori-browser.c:2221 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" + +#: ../midori/midori-browser.c:2223 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../src/midori-browser.c:2091 +#: ../midori/midori-browser.c:2224 +msgid "Quickly jump to a word or phrase" +msgstr "Schnell zu einem Wort oder Satz springen" + +#: ../midori/midori-browser.c:2227 +msgid "Configure the application preferences" +msgstr "Anwedungseinstellungen anpassen" + +#: ../midori/midori-browser.c:2229 msgid "_View" msgstr "_Ansicht" -#: ../src/midori-browser.c:2092 +#: ../midori/midori-browser.c:2230 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../src/midori-browser.c:2112 +#: ../midori/midori-browser.c:2242 +msgid "Increase the zoom level" +msgstr "Erhöhe die Vergrößerungsstufe" + +#: ../midori/midori-browser.c:2245 +msgid "Decrease the zoom level" +msgstr "Verringere die Vergrößerungsstufe" + +#: ../midori/midori-browser.c:2248 +msgid "Reset the zoom level" +msgstr "Setzte die Vergrößerungsstufe zurück" + +#: ../midori/midori-browser.c:2250 msgid "View Source" msgstr "Quelltext anzeigen" -#: ../src/midori-browser.c:2115 +#: ../midori/midori-browser.c:2251 +msgid "View the source code of the page" +msgstr "Zeige den Quelltext der Seite an" + +#: ../midori/midori-browser.c:2253 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../src/midori-browser.c:2119 +#: ../midori/midori-browser.c:2254 +msgid "View the source code of the selection" +msgstr "Zeige den Quelltext der Markierung an" + +#: ../midori/midori-browser.c:2257 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../src/midori-browser.c:2121 +#: ../midori/midori-browser.c:2259 msgid "_Go" msgstr "_Gehe zu" -#: ../src/midori-browser.c:2132 +#: ../midori/midori-browser.c:2262 +msgid "Go back to the previous page" +msgstr "Gehe zur voherigen Seite zurück" + +#: ../midori/midori-browser.c:2265 +msgid "Go forward to the next page" +msgstr "Gehe weiter zur nächsten Seite" + +#: ../midori/midori-browser.c:2268 +msgid "Go to your homepage" +msgstr "Gehe zu Deiner Startseite" + +#: ../midori/midori-browser.c:2270 msgid "Location..." msgstr "Ort..." -#: ../src/midori-browser.c:2135 +#: ../midori/midori-browser.c:2271 +msgid "Open a particular location" +msgstr "Öffne einen bestimmten Ort" + +#: ../midori/midori-browser.c:2273 msgid "Web Search..." msgstr "Netzsuche..." -#: ../src/midori-browser.c:2138 +#: ../midori/midori-browser.c:2274 +msgid "Run a web search" +msgstr "Starte eine Netzsuche" + +#: ../midori/midori-browser.c:2276 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen..." -#: ../src/midori-browser.c:2141 +#: ../midori/midori-browser.c:2277 +msgid "Open the current page in the pageholder" +msgstr "Die aktuelle Seite im Seitenhalter öffnen" + +#: ../midori/midori-browser.c:2279 msgid "Closed Tabs and Windows" msgstr "Geschlossene Reiter und Fenster" -#: ../src/midori-browser.c:2142 +#: ../midori/midori-browser.c:2280 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../src/midori-browser.c:2144 +#: ../midori/midori-browser.c:2282 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../src/midori-browser.c:2147 +#: ../midori/midori-browser.c:2283 +msgid "Delete the contents of the trash" +msgstr "Inhalt des Mülls löschen" + +#: ../midori/midori-browser.c:2285 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../src/midori-browser.c:2150 +#: ../midori/midori-browser.c:2286 +msgid "Open the last closed tab" +msgstr "Zuletzt geschlossenen Reiter öffnen" + +#: ../midori/midori-browser.c:2288 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../src/midori-browser.c:2155 +#: ../midori/midori-browser.c:2291 +msgid "Add a new bookmark" +msgstr "Ein neues Lesezeichen hinzufügen" + +#: ../midori/midori-browser.c:2293 msgid "_Manage Bookmarks" msgstr "Lesezeichen _verwalten" -#: ../src/midori-browser.c:2161 +#: ../midori/midori-browser.c:2294 +msgid "Add, edit and remove bookmarks..." +msgstr "Lesezeichen hinzufügen, bearbeiten und löschen..." + +#: ../midori/midori-browser.c:2297 +msgid "Open the selected bookmark" +msgstr "Markiertes Lesezeichen kopieren" + +#: ../midori/midori-browser.c:2299 msgid "Open in New _Tab" msgstr "In einem neuen _Reiter öffnen" -#: ../src/midori-browser.c:2164 +#: ../midori/midori-browser.c:2300 +msgid "Open the selected bookmark in a new tab" +msgstr "Öffne das markierte Lesezeichen in einem neuen Reiter" + +#: ../midori/midori-browser.c:2302 msgid "Open in New _Window" msgstr "In einem neuen _Fenster öffnen" -#: ../src/midori-browser.c:2173 +#: ../midori/midori-browser.c:2303 +msgid "Open the selected bookmark in a new window" +msgstr "Markiertes Lesezeichen in neuem Fenster öffnen" + +#: ../midori/midori-browser.c:2306 +msgid "Edit the selected bookmark" +msgstr "Markiertes Lesezeichen bearbeiten" + +#: ../midori/midori-browser.c:2309 +msgid "Delete the selected bookmark" +msgstr "Markiertes Lesezeichen löschen" + +#: ../midori/midori-browser.c:2311 msgid "_Tools" msgstr "_Extras" -#: ../src/midori-browser.c:2175 +#: ../midori/midori-browser.c:2313 msgid "_Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../src/midori-browser.c:2176 +#: ../midori/midori-browser.c:2314 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." -#: ../src/midori-browser.c:2179 +#: ../midori/midori-browser.c:2317 msgid "_Window" msgstr "_Fenster" -#: ../src/midori-browser.c:2181 +#: ../midori/midori-browser.c:2319 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../src/midori-browser.c:2184 +#: ../midori/midori-browser.c:2320 +msgid "Switch to the previous tab" +msgstr "Zum voherigen Reiter wechseln" + +#: ../midori/midori-browser.c:2322 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../src/midori-browser.c:2187 +#: ../midori/midori-browser.c:2323 +msgid "Switch to the next tab" +msgstr "Zum nächsten Reiter wechseln" + +#: ../midori/midori-browser.c:2325 msgid "Tab _Overview" msgstr "Reiterüber_sicht" +#: ../midori/midori-browser.c:2326 +msgid "Show an overview of all open tabs" +msgstr "Zeige eine Übersicht über alle offenen Reiter" + #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2190 +#: ../midori/midori-browser.c:2328 msgid "_Help" msgstr "_Hilfe" -#: ../src/midori-browser.c:2192 +#: ../midori/midori-browser.c:2330 msgid "_Contents" msgstr "_Inhalt" -#: ../src/midori-browser.c:2202 +#: ../midori/midori-browser.c:2331 +msgid "Show the documentation" +msgstr "Zeige die Dokumentation" + +#: ../midori/midori-browser.c:2334 +msgid "Show information about the program" +msgstr "Zeige Informationen über das Programm" + +#: ../midori/midori-browser.c:2340 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../src/midori-browser.c:2206 +#: ../midori/midori-browser.c:2341 +msgid "Don't save any private data while browsing" +msgstr "Keinerlei private Daten während des Navigierens speichern" + +#: ../midori/midori-browser.c:2344 msgid "_Work Offline" msgstr "_Ohne Verbindung arbeiten" -#: ../src/midori-browser.c:2211 +#: ../midori/midori-browser.c:2345 +msgid "Work without a network connection" +msgstr "Ohne Netzwerkverbindung arbeiten" + +#: ../midori/midori-browser.c:2349 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../src/midori-browser.c:2215 +#: ../midori/midori-browser.c:2350 +msgid "Show navigationbar" +msgstr "Navigationsleiste anzeigen" + +#: ../midori/midori-browser.c:2353 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../src/midori-browser.c:2219 +#: ../midori/midori-browser.c:2354 +msgid "Show sidepanel" +msgstr "Seitenleiste anzeigen" + +#: ../midori/midori-browser.c:2357 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../src/midori-browser.c:2223 +#: ../midori/midori-browser.c:2358 +msgid "Show bookmarkbar" +msgstr "Lesezeichenleiste anzeigen" + +#: ../midori/midori-browser.c:2361 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../src/midori-browser.c:2227 +#: ../midori/midori-browser.c:2362 +msgid "Show transferbar" +msgstr "Übertragungsleiste anzeigen" + +#: ../midori/midori-browser.c:2365 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../src/midori-browser.c:2681 +#: ../midori/midori-browser.c:2366 +msgid "Show statusbar" +msgstr "Statusleiste anzeigen" + +#: ../midori/midori-browser.c:2845 msgid "Bookmarks" msgstr "Lesezeichen" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 +#: ../midori/midori-browser.c:2852 ../midori/midori-preferences.c:248 msgid "Transfers" msgstr "Übertragungen" -#: ../src/midori-browser.c:2697 +#: ../midori/midori-browser.c:2861 msgid "Console" msgstr "Konsole" -#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 +#: ../midori/midori-browser.c:2868 ../midori/midori-preferences.c:395 msgid "History" msgstr "Verlauf" -#: ../src/midori-browser.c:2713 +#: ../midori/midori-browser.c:2877 msgid "Pageholder" msgstr "Seitenhalter" -#: ../src/midori-browser.c:2722 +#: ../midori/midori-browser.c:2886 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../src/midori-browser.c:2748 +#: ../midori/midori-browser.c:2912 msgid "_Inline find:" -msgstr "_Inkrementelle suche:" +msgstr "_Inkrementelle Suche:" -#: ../src/midori-browser.c:2774 +#: ../midori/midori-browser.c:2938 msgid "Match Case" msgstr "Groß-/ Kleinschreibung beachten" -#: ../src/midori-browser.c:2791 +#: ../midori/midori-browser.c:2955 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../src/midori-browser.c:2815 +#: ../midori/midori-browser.c:2979 msgid "Extensions" msgstr "Erweiterungen" -#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#: ../midori/midori-browser.c:3148 ../midori/midori-webview.c:555 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung '%s'" -#: ../src/midori-browser.c:3278 +#: ../midori/midori-browser.c:3456 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion '%s'." -#: ../src/midori-panel.c:147 +#: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Erscheinungsbild des Schattens um jede Leiste" -#: ../src/midori-panel.c:157 +#: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menü für Leistenelemente" -#: ../src/midori-panel.c:166 +#: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Der Index der aktiven Seite" -#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 +#: ../midori/midori-panel.c:212 ../midori/midori-panel.c:213 msgid "Close panel" msgstr "Leiste schließen" -#: ../src/midori-panel.c:391 +#: ../midori/midori-panel.c:391 msgid "Untitled" msgstr "Unbenannt" -#: ../src/midori-trash.c:97 +#: ../midori/midori-trash.c:96 +msgid "Limit" +msgstr "Obergrenze" + +#: ../midori/midori-trash.c:97 msgid "The maximum number of items" msgstr "Die maximale Anzahl an Elementen" -#: ../src/midori-websettings.c:130 +#: ../midori/midori-websettings.c:132 msgid "Blank page" msgstr "Leere Seite" -#: ../src/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:418 +msgid "Homepage" +msgstr "Startseite" + +#: ../midori/midori-websettings.c:134 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../src/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../src/midori-websettings.c:148 +#: ../midori/midori-websettings.c:150 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../src/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-r)" -#: ../src/midori-websettings.c:150 +#: ../midori/midori-websettings.c:152 msgid "Unicode (UTF-8)" msgstr "" -#: ../src/midori-websettings.c:151 +#: ../midori/midori-websettings.c:153 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../src/midori-websettings.c:152 +#: ../midori/midori-websettings.c:154 msgid "Custom..." msgstr "Benutzerdefinidert..." -#: ../src/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "New tab" msgstr "Neuer Reiter" -#: ../src/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "New window" msgstr "Neues Fenster" -#: ../src/midori-websettings.c:169 +#: ../midori/midori-websettings.c:171 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../src/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Default" msgstr "Standard" -#: ../src/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Icons" msgstr "Symbole" -#: ../src/midori-websettings.c:186 +#: ../midori/midori-websettings.c:188 msgid "Text" msgstr "Text" -#: ../src/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Both" msgstr "Beides" -#: ../src/midori-websettings.c:188 +#: ../midori/midori-websettings.c:190 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../src/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "All cookies" msgstr "Alle Kekse" -#: ../src/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Session cookies" msgstr "Sitzungskekse" -#: ../src/midori-websettings.c:205 +#: ../midori/midori-websettings.c:207 msgid "None" msgstr "Keine" -#: ../src/midori-websettings.c:247 +#: ../midori/midori-websettings.c:249 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../src/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../src/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../src/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../src/midori-websettings.c:265 +#: ../midori/midori-websettings.c:267 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../src/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../src/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../src/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" -#: ../src/midori-websettings.c:283 +#: ../midori/midori-websettings.c:285 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../src/midori-websettings.c:284 +#: ../midori/midori-websettings.c:286 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../src/midori-websettings.c:292 +#: ../midori/midori-websettings.c:294 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../src/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../src/midori-websettings.c:301 +#: ../midori/midori-websettings.c:303 msgid "Last pageholder URI" msgstr "Letzte URI im Seitenhalter" -#: ../src/midori-websettings.c:302 +#: ../midori/midori-websettings.c:304 msgid "The URI last opened in the pageholder" msgstr "Die letzte im Seitenhalter geöffnete URI" -#: ../src/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../src/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:321 +#: ../midori/midori-websettings.c:323 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../src/midori-websettings.c:322 +#: ../midori/midori-websettings.c:324 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../src/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../src/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../src/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../src/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../src/midori-websettings.c:359 +#: ../midori/midori-websettings.c:361 msgid "Small toolbar" msgstr "Kleine Werkzeugleiste" -#: ../src/midori-websettings.c:360 +#: ../midori/midori-websettings.c:362 msgid "Use small toolbar icons" msgstr "Kleine Symbole benutzen" -#: ../src/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Show New Tab" msgstr "Zeige Neuer Reiter" -#: ../src/midori-websettings.c:369 +#: ../midori/midori-websettings.c:371 msgid "Show the New Tab button in the toolbar" msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" -#: ../src/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 +msgid "Show Homepage" +msgstr "Startseite anzeigen" + +#: ../midori/midori-websettings.c:380 +msgid "Show the Homepage button in the toolbar" +msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" + +#: ../midori/midori-websettings.c:388 msgid "Show Web search" msgstr "Zeige Netzsuche" -#: ../src/midori-websettings.c:378 +#: ../midori/midori-websettings.c:389 msgid "Show the Web search entry in the toolbar" msgstr "Netzsuchfeld in der Werkzeugleiste anzeigen" -#: ../src/midori-websettings.c:386 +#: ../midori/midori-websettings.c:397 msgid "Show Trash" msgstr "Zeige Papierkorb" -#: ../src/midori-websettings.c:387 +#: ../midori/midori-websettings.c:398 msgid "Show the Trash button in the toolbar" msgstr "Papierkorb-Knopf in der Werkzeugleiste anzeigen" -#: ../src/midori-websettings.c:397 +#: ../midori/midori-websettings.c:408 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../src/midori-websettings.c:398 +#: ../midori/midori-websettings.c:409 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../src/midori-websettings.c:408 +#: ../midori/midori-websettings.c:419 msgid "The homepage" msgstr "Die Startseite" -#: ../src/midori-websettings.c:416 +#: ../midori/midori-websettings.c:427 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../src/midori-websettings.c:417 +#: ../midori/midori-websettings.c:428 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../src/midori-websettings.c:425 +#: ../midori/midori-websettings.c:436 msgid "Show Download Notification" msgstr "Übertragungsbenachrichtigung anzeigen" -#: ../src/midori-websettings.c:426 +#: ../midori/midori-websettings.c:437 msgid "Show a notification window for finished downloads" msgstr "Zeige ein Hinweisfenster für abgeschlossene Übertragungen" -#: ../src/midori-websettings.c:434 +#: ../midori/midori-websettings.c:445 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../src/midori-websettings.c:435 +#: ../midori/midori-websettings.c:446 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../src/midori-websettings.c:443 +#: ../midori/midori-websettings.c:454 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../src/midori-websettings.c:444 +#: ../midori/midori-websettings.c:455 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../src/midori-websettings.c:455 +#: ../midori/midori-websettings.c:466 msgid "Tab Label Size" msgstr "Reitergröße" -#: ../src/midori-websettings.c:456 +#: ../midori/midori-websettings.c:467 msgid "The desired tab label size" msgstr "Die gewünschte Größe der Reiterbeschriftung" -#: ../src/midori-websettings.c:464 +#: ../midori/midori-websettings.c:475 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../src/midori-websettings.c:465 +#: ../midori/midori-websettings.c:476 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../src/midori-websettings.c:473 +#: ../midori/midori-websettings.c:484 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../src/midori-websettings.c:474 +#: ../midori/midori-websettings.c:485 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../src/midori-websettings.c:483 +#: ../midori/midori-websettings.c:494 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../src/midori-websettings.c:484 +#: ../midori/midori-websettings.c:495 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../src/midori-websettings.c:492 +#: ../midori/midori-websettings.c:503 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../src/midori-websettings.c:493 +#: ../midori/midori-websettings.c:504 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../src/midori-websettings.c:501 +#: ../midori/midori-websettings.c:512 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../src/midori-websettings.c:502 +#: ../midori/midori-websettings.c:513 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../src/midori-websettings.c:512 +#: ../midori/midori-websettings.c:523 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../src/midori-websettings.c:513 +#: ../midori/midori-websettings.c:524 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../src/midori-websettings.c:522 +#: ../midori/midori-websettings.c:533 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../src/midori-websettings.c:523 +#: ../midori/midori-websettings.c:534 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../src/midori-websettings.c:531 +#: ../midori/midori-websettings.c:542 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../src/midori-websettings.c:532 +#: ../midori/midori-websettings.c:543 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../src/midori-websettings.c:542 +#: ../midori/midori-websettings.c:553 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../src/midori-websettings.c:543 +#: ../midori/midori-websettings.c:554 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../src/midori-websettings.c:551 +#: ../midori/midori-websettings.c:562 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../src/midori-websettings.c:552 +#: ../midori/midori-websettings.c:563 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../src/midori-websettings.c:560 +#: ../midori/midori-websettings.c:571 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../src/midori-websettings.c:561 +#: ../midori/midori-websettings.c:572 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../src/midori-websettings.c:569 +#: ../midori/midori-websettings.c:580 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../src/midori-websettings.c:570 +#: ../midori/midori-websettings.c:581 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../src/midori-websettings.c:580 +#: ../midori/midori-websettings.c:591 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../src/midori-websettings.c:581 +#: ../midori/midori-websettings.c:592 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../src/midori-websettings.c:589 +#: ../midori/midori-websettings.c:600 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../src/midori-websettings.c:590 +#: ../midori/midori-websettings.c:601 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../src/midori-webview.c:217 +#: ../midori/midori-webview.c:197 msgid "The icon of the currently loaded page" msgstr "Das Symbol der aktuellen Seite" -#: ../src/midori-webview.c:226 +#: ../midori/midori-webview.c:206 msgid "The URI of the currently loaded page" msgstr "Die URI der aktuellen Seite" -#: ../src/midori-webview.c:235 +#: ../midori/midori-webview.c:215 msgid "The title of the currently loaded page" msgstr "Der Titel der aktuellen Seite" -#: ../src/midori-webview.c:471 +#: ../midori/midori-webview.c:453 msgid "Open Link in New _Tab" msgstr "Verweis in einem neuen _Reiter öffnen" -#: ../src/midori-webview.c:494 +#: ../midori/midori-webview.c:476 msgid "Open URL in New _Tab" msgstr "_URL in einem neuen Reiter öffnen" -#: ../src/midori-preferences.c:64 +#: ../midori/midori-preferences.c:64 msgid "Settings instance to provide properties" -msgstr "" +msgstr "Einstellungsinstanz mit erforderlichen Eigenschaften" -#: ../src/midori-preferences.c:87 +#: ../midori/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "%s Einstellungen" #. Page "General" -#: ../src/midori-preferences.c:239 +#: ../midori/midori-preferences.c:236 msgid "General" msgstr "Allgemein" -#: ../src/midori-preferences.c:240 +#: ../midori/midori-preferences.c:237 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../src/midori-preferences.c:261 +#: ../midori/midori-preferences.c:258 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../src/midori-preferences.c:262 +#: ../midori/midori-preferences.c:259 msgid "Font settings" msgstr "Schrifteinstellungen" #. Page "Behavior" -#: ../src/midori-preferences.c:283 +#: ../midori/midori-preferences.c:280 msgid "Behavior" msgstr "Verhalten" -#: ../src/midori-preferences.c:284 +#: ../midori/midori-preferences.c:281 msgid "Features" msgstr "Inhalte" #. Page "Interface" -#: ../src/midori-preferences.c:316 +#: ../midori/midori-preferences.c:331 msgid "Interface" msgstr "Oberfläche" -#: ../src/midori-preferences.c:330 +#: ../midori/midori-preferences.c:345 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 +#: ../midori/midori-preferences.c:361 ../midori/midori-preferences.c:362 msgid "Network" msgstr "Netzwerk" -#: ../src/midori-preferences.c:358 +#: ../midori/midori-preferences.c:373 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../src/midori-preferences.c:363 +#: ../midori/midori-preferences.c:378 msgid "Privacy" msgstr "Privatsphäre" -#: ../src/midori-preferences.c:364 +#: ../midori/midori-preferences.c:379 msgid "Web Cookies" msgstr "Verbindungskekse" -#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 +#: ../midori/midori-preferences.c:392 ../midori/midori-preferences.c:402 msgid "days" msgstr "Tage" -#: ../src/sokoke.c:295 +#: ../midori/sokoke.c:286 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 +#: ../midori/sokoke.c:449 ../katze/katze-xbel.c:952 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../src/webSearch.c:115 +#: ../midori/webSearch.c:117 msgid "Empty" msgstr "Leer" -#: ../src/webSearch.c:187 +#: ../midori/webSearch.c:189 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../src/webSearch.c:187 +#: ../midori/webSearch.c:189 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../src/webSearch.c:217 +#: ../midori/webSearch.c:219 msgid "_Name:" msgstr "_Name:" -#: ../src/webSearch.c:261 +#: ../midori/webSearch.c:263 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../src/webSearch.c:275 +#: ../midori/webSearch.c:277 msgid "_Keyword:" msgstr "_Schlüsselwort:" -#: ../src/webSearch.c:344 +#: ../midori/webSearch.c:346 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" @@ -1075,16 +1255,16 @@ msgstr "" "Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " "soll" -#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:300 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft '%s' ist ungültig für %s" -#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:185 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:161 +#: ../katze/katze-utils.c:172 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -1098,11 +1278,14 @@ msgstr "Fehlerhaftes Dokument" msgid "File not found." msgstr "Datei nicht gefunden." -#~ msgid "Open location" -#~ msgstr "Adresse öffnen" +#~ msgid "Debugging" +#~ msgstr "Fehlerbehebung" -#~ msgid "_Location:" -#~ msgstr "_Ort:" +#~ msgid "Unhandled settings property '%s'" +#~ msgstr "Unbehandelte Einstellungseigenschaft '%s'" -#~ msgid "Web search" -#~ msgstr "Netzsuche" +#~ msgid "Midori Web Browser" +#~ msgstr "Midori Netznavigator" + +#~ msgid "New Bookmark" +#~ msgstr "Neues Lesezeichen" From 276309f481d7f6d9ba71def30abbb05b626626ee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Jun 2008 22:58:33 +0200 Subject: [PATCH 0145/2970] Update French translation. --- po/fr.po | 766 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 475 insertions(+), 291 deletions(-) diff --git a/po/fr.po b/po/fr.po index 63da63c8..835dae3d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 16:06+0200\n" +"POT-Creation-Date: 2008-06-10 16:18+0200\n" "PO-Revision-Date: 2008-03-31 17:37+0100\n" "Last-Translator: Adrien Nader \n" "Language-Team: French \n" @@ -22,1039 +22,1211 @@ msgid "Lightweight web browser" msgstr "Petit navigateur" #: ../midori.desktop.in.h:2 -msgid "Midori Web Browser" -msgstr "Navigateur Midori" +msgid "Midori" +msgstr "Midori" #: ../midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navigateur" -#: ../src/main.c:47 +#: ../midori/main.c:46 msgid "Bookmark" msgstr "Signet" -#: ../src/main.c:48 -msgid "New Bookmark" -msgstr "Nouveau Signet" +#: ../midori/main.c:47 +msgid "_Add Bookmark" +msgstr "_Ajouter signet" -#: ../src/main.c:49 +#: ../midori/main.c:48 msgid "_Form Fill" msgstr "Remplissage de _formulaire" -#: ../src/main.c:50 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:407 -msgid "Homepage" -msgstr "Page d'accueil" +#: ../midori/main.c:49 +msgid "_Homepage" +msgstr "_Page d'accueil" -#: ../src/main.c:51 +#: ../midori/main.c:50 msgid "New _Tab" msgstr "Nouvel _Onglet" -#: ../src/main.c:52 +#: ../midori/main.c:51 msgid "New _Window" msgstr "Nouvelle _Fenêtre" -#: ../src/main.c:54 +#: ../midori/main.c:53 msgid "Select _All" msgstr "_Tout sélectionner" -#: ../src/main.c:57 +#: ../midori/main.c:56 msgid "_Fullscreen" msgstr "_Plein écran" -#: ../src/main.c:58 +#: ../midori/main.c:57 msgid "_Leave Fullscreen" msgstr "_Quitter le plein écran" -#: ../src/main.c:144 +#: ../midori/main.c:97 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "La configuration n'a pu être chargée. %s\n" -#: ../src/main.c:193 +#: ../midori/main.c:153 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur '%s' n'est pas valide pour %s" -#: ../src/main.c:200 ../src/main.c:256 +#: ../midori/main.c:160 ../midori/main.c:222 #, c-format -msgid "Unhandled settings property '%s'" +msgid "Unhandled settings value '%s'" msgstr "Réglage non pris en charge '%s'" -#: ../src/main.c:270 ../src/main.c:304 +#: ../midori/main.c:236 ../midori/main.c:252 ../midori/main.c:254 +#: ../midori/main.c:268 msgid "midori" msgstr "midori" -#: ../src/main.c:277 +#: ../midori/main.c:243 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../src/main.c:282 +#: ../midori/main.c:248 msgid "[URL]" msgstr "[URL]" -#: ../src/main.c:306 -msgid "Debugging" -msgstr "Débogage" +#: ../midori/main.c:252 +msgid "Unknown argument." +msgstr "" -#: ../src/main.c:307 +#: ../midori/main.c:254 +msgid "Failed to setup interface." +msgstr "" + +#: ../midori/main.c:269 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et problèmes :" -#: ../src/main.c:309 +#: ../midori/main.c:271 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions sur :" -#: ../src/main.c:344 +#: ../midori/main.c:319 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Les signets n'ont pu être chargés. %s\n" -#: ../src/main.c:358 +#: ../midori/main.c:333 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "La session n'a pu être chargée. %s\n" # pas très content -#: ../src/main.c:370 +#: ../midori/main.c:345 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "La corbeille n'a pu être chargée. %s\n" -#: ../src/main.c:380 +#: ../midori/main.c:355 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../src/main.c:489 -#, fuzzy, c-format +#: ../midori/main.c:479 +#, c-format msgid "The search engines couldn't be saved. %s" -msgstr "La session n'a pu être chargée. %s\n" +msgstr "Les moteurs de recherche n'ont pu être sauveguardés. %s" -#: ../src/main.c:498 -#, fuzzy, c-format +#: ../midori/main.c:488 +#, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Les signets n'ont pu être chargés. %s\n" +msgstr "Les signets n'ont pu être sauveguardés. %s" # pas très content -#: ../src/main.c:507 -#, fuzzy, c-format +#: ../midori/main.c:497 +#, c-format msgid "The trash couldn't be saved. %s" -msgstr "La corbeille n'a pu être chargée. %s\n" +msgstr "La corbeille n'a pu être sauveguardé. %s" -#: ../src/main.c:519 -#, fuzzy, c-format +#: ../midori/main.c:509 +#, c-format msgid "The session couldn't be saved. %s" -msgstr "La session n'a pu être chargée. %s\n" +msgstr "La session n'a pu être sauveguardé. %s" -#: ../src/main.c:528 -#, fuzzy, c-format +#: ../midori/main.c:518 +#, c-format msgid "The configuration couldn't be saved. %s" -msgstr "La configuration n'a pu être chargée. %s\n" +msgstr "La configuration n'a pu être sauveguardé. %s" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 -#: ../src/midori-browser.c:2101 +#: ../midori/midori-browser.c:201 ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2239 msgid "Reload the current page" msgstr "Recharger la page" -#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 +#: ../midori/midori-browser.c:209 ../midori/midori-browser.c:2236 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../src/midori-browser.c:264 +#: ../midori/midori-browser.c:272 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../src/midori-browser.c:611 +#: ../midori/midori-browser.c:721 msgid "Menubar" msgstr "Barre de menu" -#: ../src/midori-browser.c:612 -#, fuzzy +#: ../midori/midori-browser.c:722 msgid "The menubar" -msgstr "La page d'accueil" +msgstr "La barre de menu" -#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 +#: ../midori/midori-browser.c:730 ../midori/midori-preferences.c:332 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../src/midori-browser.c:626 -#, fuzzy +#: ../midori/midori-browser.c:731 msgid "The navigationbar" -msgstr "Afficher la barre de navigation" +msgstr "La barre de navigation" -#: ../src/midori-browser.c:639 +#: ../midori/midori-browser.c:739 msgid "Tab" msgstr "Onglet" -#: ../src/midori-browser.c:640 -#, fuzzy +#: ../midori/midori-browser.c:740 msgid "The current tab" -msgstr "Fermer l'onglet actuel" +msgstr "L'onglet actuel" -#: ../src/midori-browser.c:653 -#, fuzzy +#: ../midori/midori-browser.c:748 msgid "Statusbar" -msgstr "Barre d'é_tat" +msgstr "Barre d'état" -#: ../src/midori-browser.c:654 -#, fuzzy +#: ../midori/midori-browser.c:749 msgid "The statusbar" -msgstr "Afficher la barre d'état" +msgstr "La barre d'état" -#: ../src/midori-browser.c:670 -#, fuzzy +#: ../midori/midori-browser.c:765 msgid "Settings" -msgstr "Réglages des polices" +msgstr "Réglages" -#: ../src/midori-browser.c:671 +#: ../midori/midori-browser.c:766 msgid "The associated settings" msgstr "Les réglages associés" -#: ../src/midori-browser.c:690 -#, fuzzy +#: ../midori/midori-browser.c:785 msgid "Statusbar Text" -msgstr "Barre d'é_tat" +msgstr "Texte de la barre d'état" -#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 +#: ../midori/midori-browser.c:786 ../midori/midori-webview.c:224 msgid "The text that is displayed in the statusbar" msgstr "Le texte affiché dans la barre d'êtat" -#: ../src/midori-browser.c:709 -#, fuzzy +#: ../midori/midori-browser.c:804 msgid "Trash" -msgstr "Afficher la corbeille" +msgstr "Corbeille" -#: ../src/midori-browser.c:710 +#: ../midori/midori-browser.c:805 msgid "The trash, collecting recently closed tabs and windows" msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:1430 msgid "New bookmark" msgstr "Nouveau signet" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:1430 msgid "Edit bookmark" msgstr "Éditer le signet" -#: ../src/midori-browser.c:1311 +#: ../midori/midori-browser.c:1457 msgid "_Title:" msgstr "_Titre :" -#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 +#: ../midori/midori-browser.c:1470 ../midori/webSearch.c:235 msgid "_Description:" -msgstr "_Description" +msgstr "_Description :" -#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 +#: ../midori/midori-browser.c:1489 ../midori/webSearch.c:249 msgid "_URL:" -msgstr "_URL:" +msgstr "_URL :" # manque un raccourcis Alt+X -#: ../src/midori-browser.c:1364 +#: ../midori/midori-browser.c:1506 msgid "_Folder:" -msgstr "Dossier :" +msgstr "_Dossier :" -#: ../src/midori-browser.c:1368 +#: ../midori/midori-browser.c:1510 msgid "Root" msgstr "Racine" -#: ../src/midori-browser.c:1591 +#: ../midori/midori-browser.c:1733 msgid "Separator" msgstr "Séparateur" -#: ../src/midori-browser.c:1780 +#: ../midori/midori-browser.c:1922 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../src/midori-browser.c:1788 +#: ../midori/midori-browser.c:1930 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader " -#: ../src/midori-browser.c:2015 +#: ../midori/midori-browser.c:2156 msgid "_File" msgstr "_Fichier" -#: ../src/midori-browser.c:2018 +#: ../midori/midori-browser.c:2159 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../src/midori-browser.c:2021 +#: ../midori/midori-browser.c:2162 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../src/midori-browser.c:2024 +#: ../midori/midori-browser.c:2165 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../src/midori-browser.c:2027 +#: ../midori/midori-browser.c:2168 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../src/midori-browser.c:2029 +#: ../midori/midori-browser.c:2170 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../src/midori-browser.c:2030 +#: ../midori/midori-browser.c:2171 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../src/midori-browser.c:2032 +#: ../midori/midori-browser.c:2173 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../src/midori-browser.c:2033 +#: ../midori/midori-browser.c:2174 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../src/midori-browser.c:2035 +#: ../midori/midori-browser.c:2176 msgid "Pa_ge Setup" msgstr "Gestion de page" -#: ../src/midori-browser.c:2045 +#: ../midori/midori-browser.c:2180 +msgid "Show a preview of the printed page" +msgstr "" + +#: ../midori/midori-browser.c:2183 +msgid "Print the current page" +msgstr "Imprimer la page actuel" + +#: ../midori/midori-browser.c:2186 msgid "Quit the application" msgstr "Quitter le programme" -#: ../src/midori-browser.c:2047 +#: ../midori/midori-browser.c:2188 msgid "_Edit" msgstr "Édit_er" -#: ../src/midori-browser.c:2050 +#: ../midori/midori-browser.c:2191 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../src/midori-browser.c:2053 +#: ../midori/midori-browser.c:2194 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 +#: ../midori/midori-browser.c:2197 +msgid "Cut the selected text" +msgstr "Couper le texte sélectionné" + +#: ../midori/midori-browser.c:2200 ../midori/midori-browser.c:2203 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../src/midori-browser.c:2065 +#: ../midori/midori-browser.c:2206 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../src/midori-browser.c:2068 +#: ../midori/midori-browser.c:2209 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../src/midori-browser.c:2071 +#: ../midori/midori-browser.c:2212 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../src/midori-browser.c:2079 +#: ../midori/midori-browser.c:2215 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:2217 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../src/midori-browser.c:2082 +#: ../midori/midori-browser.c:2218 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2220 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../src/midori-browser.c:2085 +#: ../midori/midori-browser.c:2221 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2223 msgid "_Quick Find" msgstr "Recherche rapide" -#: ../src/midori-browser.c:2091 +#: ../midori/midori-browser.c:2224 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2227 +msgid "Configure the application preferences" +msgstr "Configurer les préferences de l'application" + +#: ../midori/midori-browser.c:2229 msgid "_View" msgstr "_Vue" -#: ../src/midori-browser.c:2092 +#: ../midori/midori-browser.c:2230 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../src/midori-browser.c:2112 +#: ../midori/midori-browser.c:2242 +msgid "Increase the zoom level" +msgstr "Augmenter le niveau d'agrandissement" + +#: ../midori/midori-browser.c:2245 +msgid "Decrease the zoom level" +msgstr "Diminuer le niveau d'agrandissement" + +#: ../midori/midori-browser.c:2248 +msgid "Reset the zoom level" +msgstr "Remettre le niveau d'agrandissement" + +#: ../midori/midori-browser.c:2250 msgid "View Source" msgstr "Afficher la source" -#: ../src/midori-browser.c:2115 +#: ../midori/midori-browser.c:2251 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:2253 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../src/midori-browser.c:2119 +#: ../midori/midori-browser.c:2254 +msgid "View the source code of the selection" +msgstr "Afficher le code source de la sélection" + +#: ../midori/midori-browser.c:2257 msgid "Toggle fullscreen view" msgstr "Activer/Désactiver le plein écran" -#: ../src/midori-browser.c:2121 +#: ../midori/midori-browser.c:2259 msgid "_Go" msgstr "A_ller" -#: ../src/midori-browser.c:2132 +#: ../midori/midori-browser.c:2262 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:2265 +msgid "Go forward to the next page" +msgstr "Arrêter le chargement de la page" + +#: ../midori/midori-browser.c:2268 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:2270 msgid "Location..." msgstr "Emplacement..." -#: ../src/midori-browser.c:2135 +#: ../midori/midori-browser.c:2271 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:2273 msgid "Web Search..." msgstr "Recherche toile..." -#: ../src/midori-browser.c:2138 +#: ../midori/midori-browser.c:2274 +msgid "Run a web search" +msgstr "Démarrer une recherche toile" + +#: ../midori/midori-browser.c:2276 msgid "Open in Page_holder..." msgstr "Ouvrir dans le _cadre de pages..." -#: ../src/midori-browser.c:2141 +#: ../midori/midori-browser.c:2277 +msgid "Open the current page in the pageholder" +msgstr "Ouvrir la page actuel dans le cadre de pages" + +#: ../midori/midori-browser.c:2279 msgid "Closed Tabs and Windows" msgstr "Onglets et fenêtres fermés" -#: ../src/midori-browser.c:2142 +#: ../midori/midori-browser.c:2280 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../src/midori-browser.c:2144 +#: ../midori/midori-browser.c:2282 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../src/midori-browser.c:2147 +#: ../midori/midori-browser.c:2283 +msgid "Delete the contents of the trash" +msgstr "Supprimer le contenu de la corbeille" + +#: ../midori/midori-browser.c:2285 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../src/midori-browser.c:2150 +#: ../midori/midori-browser.c:2286 +msgid "Open the last closed tab" +msgstr "Ouvrir l'onglet plus récemment fermé" + +#: ../midori/midori-browser.c:2288 msgid "_Bookmarks" msgstr "_Signets" -#: ../src/midori-browser.c:2155 +#: ../midori/midori-browser.c:2291 +msgid "Add a new bookmark" +msgstr "Ajouter un nouveau signet" + +#: ../midori/midori-browser.c:2293 msgid "_Manage Bookmarks" msgstr "_Gérer les signets" -#: ../src/midori-browser.c:2161 +#: ../midori/midori-browser.c:2294 +msgid "Add, edit and remove bookmarks..." +msgstr "Ajouter, modifier et supprimer des signets..." + +#: ../midori/midori-browser.c:2297 +msgid "Open the selected bookmark" +msgstr "Ouvrir le signet sélectionné" + +#: ../midori/midori-browser.c:2299 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../src/midori-browser.c:2164 +#: ../midori/midori-browser.c:2300 +msgid "Open the selected bookmark in a new tab" +msgstr "Ouvrir le signet sélectionné dans un nouvel onglet" + +#: ../midori/midori-browser.c:2302 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../src/midori-browser.c:2173 +#: ../midori/midori-browser.c:2303 +msgid "Open the selected bookmark in a new window" +msgstr "Ouvrir le signet sélectionné dans un nouvel fenêtre" + +#: ../midori/midori-browser.c:2306 +msgid "Edit the selected bookmark" +msgstr "Éditer le signet sélectionné" + +#: ../midori/midori-browser.c:2309 +msgid "Delete the selected bookmark" +msgstr "Supprimer le signet sélectionné" + +#: ../midori/midori-browser.c:2311 msgid "_Tools" msgstr "_Outils" -#: ../src/midori-browser.c:2175 +#: ../midori/midori-browser.c:2313 msgid "_Manage Search Engines" msgstr "_Gérer les moteurs de recherche" -#: ../src/midori-browser.c:2176 +#: ../midori/midori-browser.c:2314 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../src/midori-browser.c:2179 +#: ../midori/midori-browser.c:2317 msgid "_Window" msgstr "_Fenêtre" -#: ../src/midori-browser.c:2181 +#: ../midori/midori-browser.c:2319 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../src/midori-browser.c:2184 +#: ../midori/midori-browser.c:2320 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:2322 msgid "_Next Tab" msgstr "Onglet _suivant" +#: ../midori/midori-browser.c:2323 +msgid "Switch to the next tab" +msgstr "" + # fonctionnalité à tester -#: ../src/midori-browser.c:2187 +#: ../midori/midori-browser.c:2325 msgid "Tab _Overview" msgstr "_Aperçu des onglets" +#: ../midori/midori-browser.c:2326 +msgid "Show an overview of all open tabs" +msgstr "" + #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2190 +#: ../midori/midori-browser.c:2328 msgid "_Help" msgstr "_Aide" -#: ../src/midori-browser.c:2192 +#: ../midori/midori-browser.c:2330 msgid "_Contents" msgstr "_Contenu" -#: ../src/midori-browser.c:2202 +#: ../midori/midori-browser.c:2331 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:2334 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:2340 msgid "P_rivate Browsing" msgstr "Navigation en _privé" -#: ../src/midori-browser.c:2206 +#: ../midori/midori-browser.c:2341 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:2344 msgid "_Work Offline" msgstr "Travailler hors ligne" -#: ../src/midori-browser.c:2211 +#: ../midori/midori-browser.c:2345 +msgid "Work without a network connection" +msgstr "" + +#: ../midori/midori-browser.c:2349 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../src/midori-browser.c:2215 +#: ../midori/midori-browser.c:2350 +msgid "Show navigationbar" +msgstr "Afficher la barre de navigation" + +#: ../midori/midori-browser.c:2353 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../src/midori-browser.c:2219 +#: ../midori/midori-browser.c:2354 +msgid "Show sidepanel" +msgstr "Afficher panneau latéral" + +#: ../midori/midori-browser.c:2357 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../src/midori-browser.c:2223 +#: ../midori/midori-browser.c:2358 +msgid "Show bookmarkbar" +msgstr "Afficher la barre des signets" + +#: ../midori/midori-browser.c:2361 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../src/midori-browser.c:2227 +#: ../midori/midori-browser.c:2362 +msgid "Show transferbar" +msgstr "Afficher la barre des transferts" + +#: ../midori/midori-browser.c:2365 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../src/midori-browser.c:2681 +#: ../midori/midori-browser.c:2366 +msgid "Show statusbar" +msgstr "Afficher la barre d'état" + +#: ../midori/midori-browser.c:2845 msgid "Bookmarks" msgstr "Signets" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 +#: ../midori/midori-browser.c:2852 ../midori/midori-preferences.c:248 msgid "Transfers" msgstr "Transferts" -#: ../src/midori-browser.c:2697 +#: ../midori/midori-browser.c:2861 msgid "Console" msgstr "Console" -#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 +#: ../midori/midori-browser.c:2868 ../midori/midori-preferences.c:395 msgid "History" msgstr "Historique" -#: ../src/midori-browser.c:2713 +#: ../midori/midori-browser.c:2877 msgid "Pageholder" msgstr "Cadre de pages" -#: ../src/midori-browser.c:2722 +#: ../midori/midori-browser.c:2886 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../src/midori-browser.c:2748 +#: ../midori/midori-browser.c:2912 msgid "_Inline find:" msgstr "Recherche rapide:" -#: ../src/midori-browser.c:2774 +#: ../midori/midori-browser.c:2938 msgid "Match Case" msgstr "Sensible à la casse" -#: ../src/midori-browser.c:2791 +#: ../midori/midori-browser.c:2955 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../src/midori-browser.c:2815 +#: ../midori/midori-browser.c:2979 msgid "Extensions" msgstr "Extensions" -#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 +#: ../midori/midori-browser.c:3148 ../midori/midori-webview.c:555 #, c-format msgid "Unexpected setting '%s'" msgstr "Réglages des polices" -#: ../src/midori-browser.c:3278 +#: ../midori/midori-browser.c:3456 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue '%s'" -#: ../src/midori-panel.c:147 +#: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Aspect des ombres autour de chaque panneau" -#: ../src/midori-panel.c:157 +#: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menu pour contenir les éléments des panneaux" -#: ../src/midori-panel.c:166 +#: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Le numéro de la page actuelle" -#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 +#: ../midori/midori-panel.c:212 ../midori/midori-panel.c:213 msgid "Close panel" msgstr "Fermer le panneau" -#: ../src/midori-panel.c:391 +#: ../midori/midori-panel.c:391 msgid "Untitled" msgstr "Sans titre" -#: ../src/midori-trash.c:97 +#: ../midori/midori-trash.c:96 +msgid "Limit" +msgstr "Plafond" + +#: ../midori/midori-trash.c:97 msgid "The maximum number of items" msgstr "Le nombre maximal d'éléments" -#: ../src/midori-websettings.c:130 +#: ../midori/midori-websettings.c:132 msgid "Blank page" msgstr "Page vierge" -#: ../src/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:418 +msgid "Homepage" +msgstr "Page d'accueil" + +#: ../midori/midori-websettings.c:134 msgid "Last open pages" msgstr "Page récemment ouvertes" -#: ../src/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../src/midori-websettings.c:148 +#: ../midori/midori-websettings.c:150 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../src/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../src/midori-websettings.c:150 +#: ../midori/midori-websettings.c:152 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../src/midori-websettings.c:151 +#: ../midori/midori-websettings.c:153 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../src/midori-websettings.c:152 +#: ../midori/midori-websettings.c:154 msgid "Custom..." msgstr "Personnalisé..." -#: ../src/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "New tab" msgstr "Nouvel onglet" -#: ../src/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../src/midori-websettings.c:169 +#: ../midori/midori-websettings.c:171 msgid "Current tab" msgstr "Onglet actuel" # # Défaut n'est pas vraiment français, "par défaut" l'est -#: ../src/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Default" msgstr "Défaut" -#: ../src/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Icons" msgstr "Icônes" -#: ../src/midori-websettings.c:186 +#: ../midori/midori-websettings.c:188 msgid "Text" msgstr "Texte" -#: ../src/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Both" msgstr "Les deux" -#: ../src/midori-websettings.c:188 +#: ../midori/midori-websettings.c:190 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../src/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "All cookies" msgstr "Tous les témoins" -#: ../src/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Session cookies" msgstr "Témoins de session" -#: ../src/midori-websettings.c:205 +#: ../midori/midori-websettings.c:207 msgid "None" msgstr "Aucun" -#: ../src/midori-websettings.c:247 +#: ../midori/midori-websettings.c:249 msgid "Remember last window size" msgstr "Se rappeler de la taille de la fenêtre" -#: ../src/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "Whether to save the last window size" msgstr "Enregistrer ou non la dernière taille de la fenêtre" -#: ../src/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../src/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../src/midori-websettings.c:265 +#: ../midori/midori-websettings.c:267 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../src/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../src/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../src/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" -#: ../src/midori-websettings.c:283 +#: ../midori/midori-websettings.c:285 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../src/midori-websettings.c:284 +#: ../midori/midori-websettings.c:286 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../src/midori-websettings.c:292 +#: ../midori/midori-websettings.c:294 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../src/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../src/midori-websettings.c:301 +#: ../midori/midori-websettings.c:303 msgid "Last pageholder URI" msgstr "Dernière URI du cadre de pages" -#: ../src/midori-websettings.c:302 +#: ../midori/midori-websettings.c:304 msgid "The URI last opened in the pageholder" msgstr "L'URI ouverte le plus récemment dans le cadre de pages" -#: ../src/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../src/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Whether to show the navigationbar" msgstr "Afficher ou non la barre de navigation" -#: ../src/midori-websettings.c:321 +#: ../midori/midori-websettings.c:323 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../src/midori-websettings.c:322 +#: ../midori/midori-websettings.c:324 msgid "Whether to show the bookmarkbar" msgstr "Afficher ou non la barre des signets" -#: ../src/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../src/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Whether to show the panel" msgstr "Afficher ou non le panneau" -#: ../src/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../src/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Whether to show the statusbar" msgstr "Afficher ou non la barre d'état" -#: ../src/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../src/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../src/midori-websettings.c:359 +#: ../midori/midori-websettings.c:361 msgid "Small toolbar" msgstr "Petit barre d'outils" -#: ../src/midori-websettings.c:360 +#: ../midori/midori-websettings.c:362 msgid "Use small toolbar icons" msgstr "Afficher de petites icônes de la barre d'outils" -#: ../src/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Show New Tab" msgstr "Nouvel onglet" -#: ../src/midori-websettings.c:369 +#: ../midori/midori-websettings.c:371 msgid "Show the New Tab button in the toolbar" msgstr "Afficher le bouton de nouvel onglet dans la barre d'outils" -#: ../src/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 +msgid "Show Homepage" +msgstr "Afficher la page d'accueil" + +#: ../midori/midori-websettings.c:380 +msgid "Show the Homepage button in the toolbar" +msgstr "Afficher le bouton de page d'accueil dans la barre d'outils" + +#: ../midori/midori-websettings.c:388 msgid "Show Web search" msgstr "Afficher la recherche toile" -#: ../src/midori-websettings.c:378 +#: ../midori/midori-websettings.c:389 msgid "Show the Web search entry in the toolbar" msgstr "Afficher le champ de recherche toile dans la barre d'outils" -#: ../src/midori-websettings.c:386 +#: ../midori/midori-websettings.c:397 msgid "Show Trash" msgstr "Afficher la corbeille" -#: ../src/midori-websettings.c:387 +#: ../midori/midori-websettings.c:398 msgid "Show the Trash button in the toolbar" msgstr "Afficher le bouton de la corbeille dans la barre d'outils" -#: ../src/midori-websettings.c:397 +#: ../midori/midori-websettings.c:408 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../src/midori-websettings.c:398 +#: ../midori/midori-websettings.c:409 msgid "What to load on startup" msgstr "Que charger au démarrage" -#: ../src/midori-websettings.c:408 +#: ../midori/midori-websettings.c:419 msgid "The homepage" msgstr "La page d'accueil" -#: ../src/midori-websettings.c:416 +#: ../midori/midori-websettings.c:427 msgid "Download Folder" msgstr "Répertoire de téléchargement" -#: ../src/midori-websettings.c:417 +#: ../midori/midori-websettings.c:428 msgid "The folder downloaded files are saved to" msgstr "Le répertoire pour guarder les téléchargements" -#: ../src/midori-websettings.c:425 +#: ../midori/midori-websettings.c:436 msgid "Show Download Notification" msgstr "Afficher la notification de téléchargement" -#: ../src/midori-websettings.c:426 +#: ../midori/midori-websettings.c:437 msgid "Show a notification window for finished downloads" msgstr "Afficher une fenêtre de notification à la fin des téléchargements" -#: ../src/midori-websettings.c:434 +#: ../midori/midori-websettings.c:445 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../src/midori-websettings.c:435 +#: ../midori/midori-websettings.c:446 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../src/midori-websettings.c:443 +#: ../midori/midori-websettings.c:454 msgid "Preferred Encoding" msgstr "Encodage préferé" -#: ../src/midori-websettings.c:444 +#: ../midori/midori-websettings.c:455 msgid "The preferred character encoding" msgstr "Encodage préféré des charactères" -#: ../src/midori-websettings.c:455 +#: ../midori/midori-websettings.c:466 msgid "Tab Label Size" msgstr "Taille des onglets" -#: ../src/midori-websettings.c:456 +#: ../midori/midori-websettings.c:467 msgid "The desired tab label size" msgstr "La taille désirée du libellé des onglets" -#: ../src/midori-websettings.c:464 +#: ../midori/midori-websettings.c:475 msgid "Close Buttons on Tabs" msgstr "Bouton fermer sur les onglets" -#: ../src/midori-websettings.c:465 +#: ../midori/midori-websettings.c:476 msgid "Whether tabs have close buttons" msgstr "Les onglets ont-ils des boutons de fermeture" -#: ../src/midori-websettings.c:473 +#: ../midori/midori-websettings.c:484 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../src/midori-websettings.c:474 +#: ../midori/midori-websettings.c:485 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../src/midori-websettings.c:483 +#: ../midori/midori-websettings.c:494 msgid "Middle click opens Selection" msgstr "Clic molette charge la sélection" -#: ../src/midori-websettings.c:484 +#: ../midori/midori-websettings.c:495 msgid "Load an URL from the selection via middle click" msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../src/midori-websettings.c:492 +#: ../midori/midori-websettings.c:503 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../src/midori-websettings.c:493 +#: ../midori/midori-websettings.c:504 msgid "Whether to open new tabs in the background" msgstr "Ouvrir ou non les nouveaux onglets en arrière-plan" -#: ../src/midori-websettings.c:501 +#: ../midori/midori-websettings.c:512 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres intempestives" -#: ../src/midori-websettings.c:502 +#: ../midori/midori-websettings.c:513 msgid "Whether to open popup windows in tabs" msgstr "Ouvrir ou non les popups dans des onglets" -#: ../src/midori-websettings.c:512 +#: ../midori/midori-websettings.c:523 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../src/midori-websettings.c:513 +#: ../midori/midori-websettings.c:524 msgid "What type of cookies to accept" msgstr "Quel type de témoins accepter" -#: ../src/midori-websettings.c:522 +#: ../midori/midori-websettings.c:533 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../src/midori-websettings.c:523 +#: ../midori/midori-websettings.c:534 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../src/midori-websettings.c:531 +#: ../midori/midori-websettings.c:542 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../src/midori-websettings.c:532 +#: ../midori/midori-websettings.c:543 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels guarder les témoins" -#: ../src/midori-websettings.c:542 +#: ../midori/midori-websettings.c:553 msgid "Remember last visited pages" msgstr "Se rappeler des pages visitées récemment" -#: ../src/midori-websettings.c:543 +#: ../midori/midori-websettings.c:554 msgid "Whether the last visited pages are saved" msgstr "Enregistrer ou non les pages visitées" -#: ../src/midori-websettings.c:551 +#: ../midori/midori-websettings.c:562 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../src/midori-websettings.c:552 +#: ../midori/midori-websettings.c:563 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels garder l'historique" -#: ../src/midori-websettings.c:560 +#: ../midori/midori-websettings.c:571 msgid "Remember last form inputs" msgstr "Se rappeler des dernières saisies de formulaires" -#: ../src/midori-websettings.c:561 +#: ../midori/midori-websettings.c:572 msgid "Whether the last form inputs are saved" msgstr "Enregistrer ou non les saisies de formulaires" -#: ../src/midori-websettings.c:569 +#: ../midori/midori-websettings.c:580 msgid "Remember last downloaded files" msgstr "Se rappeler des derniers fichiers téléchargés" -#: ../src/midori-websettings.c:570 +#: ../midori/midori-websettings.c:581 msgid "Whether the last downloaded files are saved" msgstr "Enregistrer ou non la liste des fichiers téléchargés" -#: ../src/midori-websettings.c:580 +#: ../midori/midori-websettings.c:591 msgid "HTTP Proxy" msgstr "Serveur mandataire HTTP" -#: ../src/midori-websettings.c:581 +#: ../midori/midori-websettings.c:592 msgid "The proxy used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../src/midori-websettings.c:589 +#: ../midori/midori-websettings.c:600 msgid "Cache size" msgstr "Taille de l'antémémoire (cache)" -#: ../src/midori-websettings.c:590 +#: ../midori/midori-websettings.c:601 msgid "The allowed size of the cache" msgstr "La taille acceptée de l'antémémoire" -#: ../src/midori-webview.c:217 +#: ../midori/midori-webview.c:197 msgid "The icon of the currently loaded page" msgstr "L'icône de la page actuellement chargée" -#: ../src/midori-webview.c:226 +#: ../midori/midori-webview.c:206 msgid "The URI of the currently loaded page" msgstr "L'URI de la page actuellement chargée" -#: ../src/midori-webview.c:235 +#: ../midori/midori-webview.c:215 msgid "The title of the currently loaded page" msgstr "Le titre de la page actuellement chargée" -#: ../src/midori-webview.c:471 +#: ../midori/midori-webview.c:453 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../src/midori-webview.c:494 +#: ../midori/midori-webview.c:476 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" -#: ../src/midori-preferences.c:64 +#: ../midori/midori-preferences.c:64 msgid "Settings instance to provide properties" msgstr "" -#: ../src/midori-preferences.c:87 +#: ../midori/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "%s Préferences" #. Page "General" -#: ../src/midori-preferences.c:239 +#: ../midori/midori-preferences.c:236 msgid "General" msgstr "Général" -#: ../src/midori-preferences.c:240 +#: ../midori/midori-preferences.c:237 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../src/midori-preferences.c:261 +#: ../midori/midori-preferences.c:258 msgid "Appearance" msgstr "Aspect" -#: ../src/midori-preferences.c:262 +#: ../midori/midori-preferences.c:259 msgid "Font settings" msgstr "Réglages des polices" #. Page "Behavior" -#: ../src/midori-preferences.c:283 +#: ../midori/midori-preferences.c:280 msgid "Behavior" msgstr "Comportement" -#: ../src/midori-preferences.c:284 +#: ../midori/midori-preferences.c:281 msgid "Features" msgstr "Fonctionnalités" #. Page "Interface" -#: ../src/midori-preferences.c:316 +#: ../midori/midori-preferences.c:331 msgid "Interface" msgstr "Interface" -#: ../src/midori-preferences.c:330 +#: ../midori/midori-preferences.c:345 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 +#: ../midori/midori-preferences.c:361 ../midori/midori-preferences.c:362 msgid "Network" msgstr "Réseau" -#: ../src/midori-preferences.c:358 +#: ../midori/midori-preferences.c:373 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../src/midori-preferences.c:363 +#: ../midori/midori-preferences.c:378 msgid "Privacy" msgstr "Confidentialité" -#: ../src/midori-preferences.c:364 +#: ../midori/midori-preferences.c:379 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 +#: ../midori/midori-preferences.c:392 ../midori/midori-preferences.c:402 msgid "days" msgstr "jours" -#: ../src/sokoke.c:295 +#: ../midori/sokoke.c:286 msgid "Warning: You are using a superuser account!" msgstr "Attention: Vous êtes connecté en tant que super-utilisateur!" -#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 +#: ../midori/sokoke.c:449 ../katze/katze-xbel.c:952 #, c-format msgid "Writing failed." msgstr "Échec de l'écriture." -#: ../src/webSearch.c:115 +#: ../midori/webSearch.c:117 msgid "Empty" msgstr "Vide" -#: ../src/webSearch.c:187 +#: ../midori/webSearch.c:189 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../src/webSearch.c:187 +#: ../midori/webSearch.c:189 msgid "Edit search engine" msgstr "Éditer le moteur de recherche" -#: ../src/webSearch.c:217 +#: ../midori/webSearch.c:219 msgid "_Name:" msgstr "_Nom:" -#: ../src/webSearch.c:261 +#: ../midori/webSearch.c:263 msgid "_Icon (name or file):" msgstr "_Icône (nom ou fichier):" -#: ../src/webSearch.c:275 +#: ../midori/webSearch.c:277 msgid "_Keyword:" msgstr "_Mot-clé:" -#: ../src/webSearch.c:344 +#: ../midori/webSearch.c:346 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" @@ -1086,16 +1258,16 @@ msgstr "" msgid "The stock ID of an icon to be used as the static image" msgstr "" -#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:300 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété '%s' n'est pas valide pour %s" -#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:185 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:161 +#: ../katze/katze-utils.c:172 msgid "Choose folder" msgstr "Choisissez un répertoire" @@ -1108,3 +1280,15 @@ msgstr "Document malformé" #: ../katze/katze-xbel.c:759 msgid "File not found." msgstr "Fichier non trouvé." + +#~ msgid "Debugging" +#~ msgstr "Débogage" + +#~ msgid "Unhandled settings property '%s'" +#~ msgstr "Réglage non pris en charge '%s'" + +#~ msgid "Midori Web Browser" +#~ msgstr "Navigateur Midori" + +#~ msgid "New Bookmark" +#~ msgstr "Nouveau Signet" From f9fdf1af63a226f020fe07063fb109ae0e013527 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 12 Jun 2008 23:44:34 +0200 Subject: [PATCH 0146/2970] Merge KatzeThrobberPrivate with KatzeThrobber and hide it --- katze/katze-throbber.c | 206 ++++++++++++++++++----------------------- katze/katze-throbber.h | 7 -- 2 files changed, 88 insertions(+), 125 deletions(-) diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 5c66b000..835d53d3 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -14,10 +14,10 @@ #include #include -G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC) - -struct _KatzeThrobberPrivate +struct _KatzeThrobber { + GtkMisc parent_instance; + GtkIconSize icon_size; gchar* icon_name; GdkPixbuf* pixbuf; @@ -33,8 +33,7 @@ struct _KatzeThrobberPrivate gint height; }; -#define KATZE_THROBBER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KATZE_TYPE_THROBBER, KatzeThrobberPrivate)) +G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC) enum { @@ -189,8 +188,6 @@ katze_throbber_class_init (KatzeThrobberClass* class) _("The stock ID of an icon to be used as the static image"), NULL, flags)); - - g_type_class_add_private (object_class, sizeof (KatzeThrobberPrivate)); } static void @@ -198,20 +195,16 @@ katze_throbber_init (KatzeThrobber *throbber) { GTK_WIDGET_SET_FLAGS (throbber, GTK_NO_WINDOW); - throbber->priv = KATZE_THROBBER_GET_PRIVATE (throbber); - - KatzeThrobberPrivate* priv = throbber->priv; - priv->timer_id = -1; + throbber->timer_id = -1; } static void katze_throbber_dispose (GObject* object) { KatzeThrobber* throbber = KATZE_THROBBER (object); - KatzeThrobberPrivate* priv = throbber->priv; - if (G_UNLIKELY (priv->timer_id >= 0)) - g_source_remove (priv->timer_id); + if (G_UNLIKELY (throbber->timer_id >= 0)) + g_source_remove (throbber->timer_id); (*G_OBJECT_CLASS (katze_throbber_parent_class)->dispose) (object); } @@ -220,13 +213,12 @@ static void katze_throbber_destroy (GtkObject* object) { KatzeThrobber* throbber = KATZE_THROBBER (object); - KatzeThrobberPrivate* priv = throbber->priv; - katze_assign (priv->icon_name, NULL); - katze_object_assign (priv->pixbuf, NULL); - katze_assign (priv->static_icon_name, NULL); - katze_object_assign (priv->static_pixbuf, NULL); - katze_assign (priv->static_stock_id, NULL); + katze_assign (throbber->icon_name, NULL); + katze_object_assign (throbber->pixbuf, NULL); + katze_assign (throbber->static_icon_name, NULL); + katze_object_assign (throbber->static_pixbuf, NULL); + katze_assign (throbber->static_stock_id, NULL); GTK_OBJECT_CLASS (katze_throbber_parent_class)->destroy (object); } @@ -335,13 +327,11 @@ katze_throbber_set_icon_size (KatzeThrobber* throbber, GtkIconSize icon_size) { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - - KatzeThrobberPrivate* priv = throbber->priv; g_return_if_fail (gtk_icon_size_lookup (icon_size, - &priv->width, - &priv->height)); + &throbber->width, + &throbber->height)); - priv->icon_size = icon_size; + throbber->icon_size = icon_size; g_object_notify (G_OBJECT (throbber), "icon-size"); } @@ -361,8 +351,7 @@ katze_throbber_set_icon_name (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = throbber->priv; - katze_assign (priv->icon_name, g_strdup (icon_name)); + katze_assign (throbber->icon_name, g_strdup (icon_name)); if (icon_name) icon_theme_changed (throbber); @@ -388,14 +377,13 @@ katze_throbber_set_pixbuf (KatzeThrobber* throbber, g_return_if_fail (KATZE_IS_THROBBER (throbber)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); - KatzeThrobberPrivate* priv = throbber->priv; - katze_object_assign (priv->pixbuf, pixbuf); + katze_object_assign (throbber->pixbuf, pixbuf); if (pixbuf) { g_object_ref (pixbuf); - katze_assign (priv->icon_name, NULL); + katze_assign (throbber->icon_name, NULL); } gtk_widget_queue_draw (GTK_WIDGET (throbber)); @@ -416,14 +404,13 @@ katze_throbber_set_animated (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = throbber->priv; - if (G_UNLIKELY (priv->animated == animated)) + if (G_UNLIKELY (throbber->animated == animated)) return; - priv->animated = animated; + throbber->animated = animated; - if (animated && (priv->timer_id < 0)) - priv->timer_id = g_timeout_add_full ( + if (animated && (throbber->timer_id < 0)) + throbber->timer_id = g_timeout_add_full ( G_PRIORITY_LOW, 50, (GSourceFunc)katze_throbber_timeout, throbber, @@ -449,12 +436,11 @@ katze_throbber_set_static_icon_name (KatzeThrobber* throbber, { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - KatzeThrobberPrivate* priv = throbber->priv; - katze_assign (priv->static_icon_name, g_strdup (icon_name)); + katze_assign (throbber->static_icon_name, g_strdup (icon_name)); if (icon_name) { - katze_assign (priv->static_stock_id, NULL); + katze_assign (throbber->static_stock_id, NULL); icon_theme_changed (throbber); } @@ -480,15 +466,14 @@ katze_throbber_set_static_pixbuf (KatzeThrobber* throbber, g_return_if_fail (KATZE_IS_THROBBER (throbber)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); - KatzeThrobberPrivate* priv = throbber->priv; - katze_object_assign (priv->static_pixbuf, pixbuf); + katze_object_assign (throbber->static_pixbuf, pixbuf); if (pixbuf) { g_object_ref (pixbuf); - katze_assign (priv->static_icon_name, NULL); - katze_assign (priv->static_stock_id, NULL); + katze_assign (throbber->static_icon_name, NULL); + katze_assign (throbber->static_stock_id, NULL); } g_object_notify (G_OBJECT (throbber), "static-pixbuf"); @@ -515,8 +500,7 @@ katze_throbber_set_static_stock_id (KatzeThrobber* throbber, g_return_if_fail (gtk_stock_lookup (stock_id, &stock_item)); } - KatzeThrobberPrivate* priv = throbber->priv; - katze_assign (priv->static_stock_id, g_strdup (stock_id)); + katze_assign (throbber->static_stock_id, g_strdup (stock_id)); if (stock_id) icon_theme_changed (throbber); @@ -537,8 +521,7 @@ katze_throbber_get_icon_size (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), GTK_ICON_SIZE_INVALID); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->icon_size; + return throbber->icon_size; } /** @@ -554,8 +537,7 @@ katze_throbber_get_icon_name (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->icon_name; + return throbber->icon_name; } /** @@ -573,8 +555,7 @@ katze_throbber_get_pixbuf (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->pixbuf; + return throbber->pixbuf; } /** @@ -590,8 +571,7 @@ katze_throbber_get_animated (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), FALSE); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->animated; + return throbber->animated; } /** @@ -608,8 +588,7 @@ katze_throbber_get_static_icon_name (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->static_icon_name; + return throbber->static_icon_name; } /** @@ -627,8 +606,7 @@ katze_throbber_get_static_pixbuf (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->static_pixbuf; + return throbber->static_pixbuf; } /** @@ -645,8 +623,7 @@ katze_throbber_get_static_stock_id (KatzeThrobber* throbber) { g_return_val_if_fail (KATZE_IS_THROBBER (throbber), NULL); - KatzeThrobberPrivate* priv = throbber->priv; - return priv->static_stock_id; + return throbber->static_stock_id; } static void @@ -660,12 +637,13 @@ katze_throbber_realize (GtkWidget* widget) static void katze_throbber_unrealize (GtkWidget* widget) { + KatzeThrobber* throbber = KATZE_THROBBER (widget); + if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize) GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize (widget); - KatzeThrobberPrivate* priv = KATZE_THROBBER(widget)->priv; - katze_object_assign (priv->pixbuf, NULL); - katze_object_assign (priv->static_pixbuf, NULL); + katze_object_assign (throbber->pixbuf, NULL); + katze_object_assign (throbber->static_pixbuf, NULL); } static void @@ -676,13 +654,11 @@ pixbuf_assign_icon (GdkPixbuf** pixbuf, if (*pixbuf) g_object_unref (*pixbuf); - KatzeThrobberPrivate* priv = throbber->priv; - GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (throbber)); GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); *pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, - MAX (priv->width, priv->height), + MAX (throbber->width, throbber->height), (GtkIconLookupFlags) 0, NULL); } @@ -690,23 +666,21 @@ pixbuf_assign_icon (GdkPixbuf** pixbuf, static void icon_theme_changed (KatzeThrobber* throbber) { - KatzeThrobberPrivate* priv = throbber->priv; - - if (priv->icon_name) - pixbuf_assign_icon (&priv->pixbuf, priv->icon_name, + if (throbber->icon_name) + pixbuf_assign_icon (&throbber->pixbuf, throbber->icon_name, throbber); - if (priv->static_icon_name) - pixbuf_assign_icon (&priv->static_pixbuf, priv->static_icon_name, + if (throbber->static_icon_name) + pixbuf_assign_icon (&throbber->static_pixbuf, throbber->static_icon_name, throbber); - else if (priv->static_stock_id) + else if (throbber->static_stock_id) { - if (priv->static_pixbuf) - g_object_unref (priv->static_pixbuf); + if (throbber->static_pixbuf) + g_object_unref (throbber->static_pixbuf); - priv->static_pixbuf = gtk_widget_render_icon (GTK_WIDGET (throbber), - priv->static_stock_id, - priv->icon_size, + throbber->static_pixbuf = gtk_widget_render_icon (GTK_WIDGET (throbber), + throbber->static_stock_id, + throbber->icon_size, NULL); } @@ -729,21 +703,17 @@ katze_throbber_unmap (GtkWidget* widget) static gboolean katze_throbber_timeout (KatzeThrobber* throbber) { - KatzeThrobberPrivate* priv = throbber->priv; - - priv->index++; + throbber->index++; gtk_widget_queue_draw (GTK_WIDGET (throbber)); - return priv->animated; + return throbber->animated; } static void katze_throbber_timeout_destroy (KatzeThrobber* throbber) { - KatzeThrobberPrivate* priv = throbber->priv; - - priv->index = 0; - priv->timer_id = -1; + throbber->index = 0; + throbber->timer_id = -1; } static void @@ -773,10 +743,10 @@ static void katze_throbber_size_request (GtkWidget* widget, GtkRequisition* requisition) { - KatzeThrobberPrivate* priv = KATZE_THROBBER (widget)->priv; + KatzeThrobber* throbber = KATZE_THROBBER (widget); - requisition->width = priv->width; - requisition->height = priv->height; + requisition->width = throbber->width; + requisition->height = throbber->height; GTK_WIDGET_CLASS (katze_throbber_parent_class)->size_request (widget, requisition); @@ -786,92 +756,92 @@ static gboolean katze_throbber_expose_event (GtkWidget* widget, GdkEventExpose* event) { - KatzeThrobberPrivate* priv = KATZE_THROBBER (widget)->priv; + KatzeThrobber* throbber = KATZE_THROBBER (widget); - if (G_UNLIKELY (!priv->width || !priv->height)) + if (G_UNLIKELY (!throbber->width || !throbber->height)) return TRUE; - if (G_UNLIKELY (!priv->pixbuf && !priv->static_pixbuf)) - if (priv->animated && !priv->pixbuf && !priv->icon_name) + if (G_UNLIKELY (!throbber->pixbuf && !throbber->static_pixbuf)) + if (throbber->animated && !throbber->pixbuf && !throbber->icon_name) return TRUE; - if (!priv->animated && - (priv->static_pixbuf || priv->static_icon_name || priv->static_stock_id)) + if (!throbber->animated && + (throbber->static_pixbuf || throbber->static_icon_name || throbber->static_stock_id)) { - if (G_UNLIKELY (!priv->static_pixbuf && priv->static_icon_name)) + if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name)) { icon_theme_changed (KATZE_THROBBER (widget)); - if (!priv->static_pixbuf) + if (!throbber->static_pixbuf) { g_warning ("Named icon '%s' couldn't be loaded", - priv->static_icon_name); - katze_assign (priv->static_icon_name, NULL); + throbber->static_icon_name); + katze_assign (throbber->static_icon_name, NULL); return TRUE; } } - else if (G_UNLIKELY (!priv->static_pixbuf && priv->static_stock_id)) + else if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_stock_id)) { icon_theme_changed (KATZE_THROBBER (widget)); - if (!priv->static_pixbuf) + if (!throbber->static_pixbuf) { g_warning ("Stock icon '%s' couldn't be loaded", - priv->static_stock_id); - katze_assign (priv->static_stock_id, NULL); + throbber->static_stock_id); + katze_assign (throbber->static_stock_id, NULL); return TRUE; } } - gdk_draw_pixbuf (event->window, NULL, priv->static_pixbuf, + gdk_draw_pixbuf (event->window, NULL, throbber->static_pixbuf, 0, 0, widget->allocation.x, widget->allocation.y, - priv->width, priv->height, + throbber->width, throbber->height, GDK_RGB_DITHER_NONE, 0, 0); } else { - if (G_UNLIKELY (priv->icon_name && !priv->pixbuf)) + if (G_UNLIKELY (throbber->icon_name && !throbber->pixbuf)) { icon_theme_changed (KATZE_THROBBER (widget)); - if (!priv->pixbuf) + if (!throbber->pixbuf) { - g_warning ("Icon '%s' couldn't be loaded", priv->icon_name); - katze_assign (priv->icon_name, NULL); + g_warning ("Icon '%s' couldn't be loaded", throbber->icon_name); + katze_assign (throbber->icon_name, NULL); return TRUE; } } - if (G_UNLIKELY (!priv->pixbuf)) + if (G_UNLIKELY (!throbber->pixbuf)) return TRUE; - gint cols = gdk_pixbuf_get_width (priv->pixbuf) / priv->width; - gint rows = gdk_pixbuf_get_height (priv->pixbuf) / priv->height; + gint cols = gdk_pixbuf_get_width (throbber->pixbuf) / throbber->width; + gint rows = gdk_pixbuf_get_height (throbber->pixbuf) / throbber->height; if (G_LIKELY (cols > 0 && rows > 0)) { - gint index = priv->index % (cols * rows); + gint index = throbber->index % (cols * rows); - if (G_LIKELY (priv->timer_id >= 0)) + if (G_LIKELY (throbber->timer_id >= 0)) index = MAX (index, 1); - guint x = (index % cols) * priv->width; - guint y = (index / cols) * priv->height; + guint x = (index % cols) * throbber->width; + guint y = (index / cols) * throbber->height; - gdk_draw_pixbuf (event->window, NULL, priv->pixbuf, + gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf, x, y, widget->allocation.x, widget->allocation.y, - priv->width, priv->height, + throbber->width, throbber->height, GDK_RGB_DITHER_NONE, 0, 0); } else { g_warning ("Animation frames are broken"); - katze_assign (priv->icon_name, NULL); - katze_object_assign (priv->pixbuf, NULL); + katze_assign (throbber->icon_name, NULL); + katze_object_assign (throbber->pixbuf, NULL); } } diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index db4c5370..7a459129 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -36,13 +36,6 @@ typedef struct _KatzeThrobber KatzeThrobber; typedef struct _KatzeThrobberPrivate KatzeThrobberPrivate; typedef struct _KatzeThrobberClass KatzeThrobberClass; -struct _KatzeThrobber -{ - GtkMisc parent_instance; - - KatzeThrobberPrivate* priv; -}; - struct _KatzeThrobberClass { GtkMiscClass parent_class; From 1ffbfaded988cf1e529a49eb7d2353c2554d5086 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 12 Jun 2008 23:46:08 +0200 Subject: [PATCH 0147/2970] Merge MidoriAppPrivate with MidoriApp and hide it --- midori/midori-app.c | 87 +++++++++++++++++---------------------------- midori/midori-app.h | 7 ---- 2 files changed, 32 insertions(+), 62 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index a77fd630..df406911 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -14,12 +14,10 @@ #include #include -G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) - -static MidoriApp* _midori_app_singleton = NULL; - -struct _MidoriAppPrivate +struct _MidoriApp { + GObject parent_instance; + GList* browsers; MidoriBrowser* browser; GtkAccelGroup* accel_group; @@ -28,9 +26,9 @@ struct _MidoriAppPrivate MidoriTrash* trash; }; -#define MIDORI_APP_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_APP, MidoriAppPrivate)) +G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) + +static MidoriApp* _midori_app_singleton = NULL; enum { @@ -140,8 +138,6 @@ midori_app_class_init (MidoriAppClass* class) _("The current number of browsers"), 0, G_MAXUINT, 0, G_PARAM_READABLE)); - - g_type_class_add_private (class, sizeof (MidoriAppPrivate)); } static GObject* @@ -163,27 +159,22 @@ midori_app_init (MidoriApp* app) _midori_app_singleton = app; - app->priv = MIDORI_APP_GET_PRIVATE (app); + app->accel_group = gtk_accel_group_new (); - MidoriAppPrivate* priv = app->priv; - - priv->accel_group = gtk_accel_group_new (); - - priv->settings = midori_web_settings_new (); - priv->trash = midori_trash_new (10); + app->settings = midori_web_settings_new (); + app->trash = midori_trash_new (10); } static void midori_app_finalize (GObject* object) { MidoriApp* app = MIDORI_APP (object); - MidoriAppPrivate* priv = app->priv; - g_list_free (priv->browsers); - g_object_unref (priv->accel_group); + g_list_free (app->browsers); + g_object_unref (app->accel_group); - g_object_unref (priv->settings); - g_object_unref (priv->trash); + g_object_unref (app->settings); + g_object_unref (app->trash); G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); } @@ -195,19 +186,18 @@ midori_app_set_property (GObject* object, GParamSpec* pspec) { MidoriApp* app = MIDORI_APP (object); - MidoriAppPrivate* priv = app->priv; switch (prop_id) { case PROP_SETTINGS: - katze_object_assign (priv->settings, g_value_get_object (value)); - g_object_ref (priv->settings); - // FIXME: Propagate settings to all browsers + katze_object_assign (app->settings, g_value_get_object (value)); + g_object_ref (app->settings); + /* FIXME: Propagate settings to all browsers */ break; case PROP_TRASH: - katze_object_assign (priv->trash, g_value_get_object (value)); - g_object_ref (priv->trash); - // FIXME: Propagate trash to all browsers + katze_object_assign (app->trash, g_value_get_object (value)); + g_object_ref (app->trash); + /* FIXME: Propagate trash to all browsers */ break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -222,21 +212,20 @@ midori_app_get_property (GObject* object, GParamSpec* pspec) { MidoriApp* app = MIDORI_APP (object); - MidoriAppPrivate* priv = app->priv; switch (prop_id) { case PROP_SETTINGS: - g_value_set_object (value, priv->settings); + g_value_set_object (value, app->settings); break; case PROP_TRASH: - g_value_set_object (value, priv->trash); + g_value_set_object (value, app->trash); break; case PROP_BROWSER: - g_value_set_object (value, priv->browser); + g_value_set_object (value, app->browser); break; case PROP_BROWSER_COUNT: - g_value_set_uint (value, g_list_length (priv->browsers)); + g_value_set_uint (value, g_list_length (app->browsers)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -249,9 +238,7 @@ midori_browser_focus_in_event_cb (MidoriBrowser* browser, GdkEventFocus* event, MidoriApp* app) { - MidoriAppPrivate* priv = app->priv; - - priv->browser = browser; + app->browser = browser; return FALSE; } @@ -260,11 +247,9 @@ midori_browser_new_window_cb (MidoriBrowser* browser, const gchar* uri, MidoriApp* app) { - MidoriAppPrivate* priv = app->priv; - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", priv->settings, - "trash", priv->trash, + "settings", app->settings, + "trash", app->trash, NULL); midori_browser_add_uri (new_browser, uri); gtk_widget_show (GTK_WIDGET (new_browser)); @@ -284,10 +269,8 @@ static gboolean midori_browser_destroy_cb (MidoriBrowser* browser, MidoriApp* app) { - MidoriAppPrivate* priv = app->priv; - - priv->browsers = g_list_remove (priv->browsers, browser); - if (g_list_nth (priv->browsers, 0)) + app->browsers = g_list_remove (app->browsers, browser); + if (g_list_nth (app->browsers, 0)) return FALSE; midori_app_quit (app); return TRUE; @@ -333,9 +316,7 @@ void midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser) { - MidoriAppPrivate* priv = app->priv; - - gtk_window_add_accel_group (GTK_WINDOW (browser), priv->accel_group); + gtk_window_add_accel_group (GTK_WINDOW (browser), app->accel_group); g_object_connect (browser, "signal::focus-in-event", midori_browser_focus_in_event_cb, app, "signal::new-window", midori_browser_new_window_cb, app, @@ -344,7 +325,7 @@ midori_app_add_browser (MidoriApp* app, "signal::quit", midori_browser_quit_cb, app, NULL); - priv->browsers = g_list_prepend (priv->browsers, browser); + app->browsers = g_list_prepend (app->browsers, browser); } /** @@ -360,9 +341,7 @@ midori_app_get_settings (MidoriApp* app) { g_return_val_if_fail (MIDORI_IS_APP (app), NULL); - MidoriAppPrivate* priv = app->priv; - - return priv->settings; + return app->settings; } /** @@ -395,9 +374,7 @@ midori_app_get_trash (MidoriApp* app) { g_return_val_if_fail (MIDORI_IS_APP (app), NULL); - MidoriAppPrivate* priv = app->priv; - - return priv->trash; + return app->trash; } /** diff --git a/midori/midori-app.h b/midori/midori-app.h index 284f359f..8de03fe0 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -37,13 +37,6 @@ typedef struct _MidoriApp MidoriApp; typedef struct _MidoriAppPrivate MidoriAppPrivate; typedef struct _MidoriAppClass MidoriAppClass; -struct _MidoriApp -{ - GObject parent_instance; - - MidoriAppPrivate* priv; -}; - struct _MidoriAppClass { GObjectClass parent_class; From 86129a03da6390b0b81ab107d2223679f0a31861 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 12 Jun 2008 23:58:08 +0200 Subject: [PATCH 0148/2970] Merge MidoriAddonsPrivate with MidoriAddons and hide it --- midori/midori-addons.c | 74 ++++++++++++++++++------------------------ midori/midori-addons.h | 7 ---- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index a5a2985b..1a21dd27 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -19,18 +19,16 @@ #include #include -G_DEFINE_TYPE (MidoriAddons, midori_addons, GTK_TYPE_VBOX) - -struct _MidoriAddonsPrivate +struct _MidoriAddons { + GtkVBox parent_instance; + MidoriAddonKind kind; GtkWidget* toolbar; GtkWidget* treeview; }; -#define MIDORI_ADDONS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_ADDONS, MidoriAddonsPrivate)) +G_DEFINE_TYPE (MidoriAddons, midori_addons, GTK_TYPE_VBOX) GType midori_addon_kind_get_type (void) @@ -52,7 +50,7 @@ midori_addon_kind_get_type (void) static void midori_addons_class_init (MidoriAddonsClass* class) { - g_type_class_add_private (class, sizeof (MidoriAddonsPrivate)); + /* Nothing to do */ } static const @@ -75,14 +73,12 @@ static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) { - MidoriAddonsPrivate* priv = addons->priv; - GtkWidget* dialog = gtk_message_dialog_new ( GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "Put scripts in the folder ~/.local/share/midori/%s", - _folder_for_kind (priv->kind)); + _folder_for_kind (addons->kind)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -94,12 +90,12 @@ midori_addons_treeview_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - // gchar* source_id; - // gtk_tree_model_get (model, iter, 2, &source_id, -1); + /* gchar* source_id; + gtk_tree_model_get (model, iter, 2, &source_id, -1); */ g_object_set (renderer, "stock-id", GTK_STOCK_FILE, NULL); - // g_free (source_id); + /* g_free (source_id); */ } static void @@ -114,7 +110,7 @@ midori_addons_treeview_render_text_cb (GtkTreeViewColumn* column, gchar* b; gtk_tree_model_get (model, iter, 0, &filename, 1, &a, 2, &b, -1); - // FIXME: Convert filename to UTF8 + /* FIXME: Convert filename to UTF8 */ gchar* text = g_strdup_printf ("%s", filename); g_object_set (renderer, "text", text, NULL); g_free (text); @@ -142,32 +138,29 @@ midori_addons_treeview_row_activated_cb (GtkTreeView* treeview, static void midori_addons_init (MidoriAddons* addons) { - addons->priv = MIDORI_ADDONS_GET_PRIVATE (addons); - - MidoriAddonsPrivate* priv = addons->priv; - GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; - priv->treeview = gtk_tree_view_new (); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE); + + addons->treeview = gtk_tree_view_new (); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (addons->treeview), FALSE); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, (GtkTreeCellDataFunc)midori_addons_treeview_render_icon_cb, - priv->treeview, NULL); + addons->treeview, NULL); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_addons_treeview_render_text_cb, - priv->treeview, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column); - g_signal_connect (priv->treeview, "row-activated", + addons->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column); + g_signal_connect (addons->treeview, "row-activated", G_CALLBACK (midori_addons_treeview_row_activated_cb), addons); - gtk_widget_show (priv->treeview); - gtk_box_pack_start (GTK_BOX (addons), priv->treeview, TRUE, TRUE, 0); + gtk_widget_show (addons->treeview); + gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0); } static gboolean @@ -178,9 +171,10 @@ _js_script_from_file (JSContextRef js_context, gboolean result = FALSE; gchar* script; GError* error = NULL; + if (g_file_get_contents (filename, &script, NULL, &error)) { - // Wrap the script to prevent global variables + /* Wrap the script to prevent global variables */ gchar* wrapped_script = g_strdup_printf ( "var wrapped = function () { %s }; wrapped ();", script); if (gjs_script_eval (js_context, wrapped_script, exception)) @@ -203,11 +197,9 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, JSObjectRef js_window, MidoriAddons* addons) { - MidoriAddonsPrivate* priv = addons->priv; - - // FIXME: We want to honor system installed addons as well + /* FIXME: We want to honor system installed addons as well */ gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _folder_for_kind (priv->kind), NULL); + _folder_for_kind (addons->kind), NULL); GDir* addon_dir = g_dir_open (addon_path, 0, NULL); if (addon_dir) { @@ -252,12 +244,10 @@ midori_addons_new (GtkWidget* web_widget, g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL); MidoriAddons* addons = g_object_new (MIDORI_TYPE_ADDONS, - // "kind", kind, + /* "kind", kind, */ NULL); - MidoriAddonsPrivate* priv = addons->priv; - priv->kind = kind; - + addons->kind = kind; if (kind == MIDORI_ADDON_USER_SCRIPTS) g_signal_connect (web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); @@ -265,9 +255,9 @@ midori_addons_new (GtkWidget* web_widget, GtkListStore* liststore = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING); - // FIXME: We want to honor system installed addons as well + /* FIXME: We want to honor system installed addons as well */ gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _folder_for_kind (priv->kind), NULL); + _folder_for_kind (addons->kind), NULL); GDir* addon_dir = g_dir_open (addon_path, 0, NULL); if (addon_dir) { @@ -281,7 +271,7 @@ midori_addons_new (GtkWidget* web_widget, } g_dir_close (addon_dir); } - gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview), + gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), GTK_TREE_MODEL (liststore)); return GTK_WIDGET (addons); @@ -298,11 +288,9 @@ midori_addons_new (GtkWidget* web_widget, GtkWidget* midori_addons_get_toolbar (MidoriAddons* addons) { - MidoriAddonsPrivate* priv = addons->priv; - g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL); - if (!priv->toolbar) + if (!addons->toolbar) { GtkWidget* toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); @@ -322,8 +310,8 @@ midori_addons_get_toolbar (MidoriAddons* addons) G_CALLBACK (midori_addons_button_add_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - priv->toolbar = toolbar; + addons->toolbar = toolbar; } - return priv->toolbar; + return addons->toolbar; } diff --git a/midori/midori-addons.h b/midori/midori-addons.h index 940ff73c..9bdb12d7 100644 --- a/midori/midori-addons.h +++ b/midori/midori-addons.h @@ -35,13 +35,6 @@ typedef struct _MidoriAddons MidoriAddons; typedef struct _MidoriAddonsPrivate MidoriAddonsPrivate; typedef struct _MidoriAddonsClass MidoriAddonsClass; -struct _MidoriAddons -{ - GtkVBox parent_instance; - - MidoriAddonsPrivate* priv; -}; - struct _MidoriAddonsClass { GtkVBoxClass parent_class; From 3ac8bdb4387ac7938f307819f0d76c27b91a37f1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Jun 2008 02:23:33 +0200 Subject: [PATCH 0149/2970] Introduce MidoriWebList, second step of refactoring web search --- data/wscript_build | 6 +- midori/Makefile.am | 2 +- midori/main.c | 269 +++++++++++++++++++++++++++------------- midori/main.h | 21 ++-- midori/midori-browser.c | 150 +++++++++++----------- midori/midori-weblist.c | 194 +++++++++++++++++++++++++++++ midori/midori-weblist.h | 75 +++++++++++ midori/search.c | 95 -------------- midori/search.h | 30 ----- midori/sokoke.c | 100 ++++++++------- midori/sokoke.h | 8 +- midori/webSearch.c | 72 ++++++----- midori/webSearch.h | 4 - po/POTFILES.in | 6 +- wscript | 2 + 15 files changed, 652 insertions(+), 382 deletions(-) create mode 100644 midori/midori-weblist.c create mode 100644 midori/midori-weblist.h delete mode 100644 midori/search.c delete mode 100644 midori/search.h diff --git a/data/wscript_build b/data/wscript_build index eca29903..83fcaa08 100644 --- a/data/wscript_build +++ b/data/wscript_build @@ -28,7 +28,11 @@ if bld.env ()['CONVERT']: '-background', 'transparent', '-geometry', format, '-extent', format, srcdir + '/data/midori.svg', - blddir + '/icons/' + format + '/midori.png']) + blddir + '/icons/' + format + '/midori.png'], + stderr=subprocess.PIPE) if not convert.wait (): install_files ('DATADIR', 'icons/hicolor/' + format + '/apps', blddir + '/icons/' + format + '/midori.png') + else: + Params.pprint ('BLUE', "Optimized icons could not be created.") + break diff --git a/midori/Makefile.am b/midori/Makefile.am index 8d037626..55db4c0c 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -19,6 +19,7 @@ bin_PROGRAMS = \ midori_SOURCES = \ main.c main.h \ midori-webitem.c midori-webitem.h \ + midori-weblist.c midori-weblist.h \ midori-app.c midori-app.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ @@ -31,5 +32,4 @@ midori_SOURCES = \ webSearch.c webSearch.h \ gjs.c gjs.h \ sokoke.c sokoke.h \ - search.c search.h \ compat.c compat.h diff --git a/midori/main.c b/midori/main.c index 9726f009..de04460a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -12,26 +12,25 @@ #include "main.h" #include "sokoke.h" -#include "search.h" #include "midori-app.h" #include "midori-websettings.h" #include "midori-trash.h" #include "midori-browser.h" +#include "midori-weblist.h" #include "gjs.h" -#include #include #include -#include "config.h" +#if HAVE_CONFIG_H + #include "config.h" +#endif #ifdef ENABLE_NLS #include #endif -// -- stock icons - static void stock_items_init(void) { static GtkStockItem items[] = @@ -57,21 +56,24 @@ static void stock_items_init(void) { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, #endif }; - GtkIconFactory* factory = gtk_icon_factory_new(); + GtkIconSource* icon_source; + GtkIconSet* icon_set; + GtkIconFactory* factory = gtk_icon_factory_new (); guint i; - for(i = 0; i < (guint)G_N_ELEMENTS(items); i++) + + for (i = 0; i < (guint)G_N_ELEMENTS (items); i++) { - GtkIconSource* iconSource = gtk_icon_source_new(); - gtk_icon_source_set_icon_name(iconSource, items[i].stock_id); - GtkIconSet* iconSet = gtk_icon_set_new(); - gtk_icon_set_add_source(iconSet, iconSource); - gtk_icon_source_free(iconSource); - gtk_icon_factory_add(factory, items[i].stock_id, iconSet); - gtk_icon_set_unref(iconSet); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); + icon_set = gtk_icon_set_new (); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, items[i].stock_id, icon_set); + gtk_icon_set_unref (icon_set); } - gtk_stock_add_static(items, G_N_ELEMENTS(items)); - gtk_icon_factory_add_default(factory); - g_object_unref(factory); + gtk_stock_add_static (items, G_N_ELEMENTS (items)); + gtk_icon_factory_add_default (factory); + g_object_unref (factory); } static void @@ -90,6 +92,17 @@ settings_new_from_file (const gchar* filename) MidoriWebSettings* settings = midori_web_settings_new (); GKeyFile* key_file = g_key_file_new (); GError* error = NULL; + GObjectClass* class; + guint i, n_properties; + GParamSpec** pspecs; + GParamSpec* pspec; + GType type; + const gchar* property; + gchar* string; + gint integer; + gfloat number; + gboolean boolean; + if (!g_key_file_load_from_file (key_file, filename, G_KEY_FILE_KEEP_COMMENTS, &error)) { @@ -98,19 +111,18 @@ settings_new_from_file (const gchar* filename) error->message); g_error_free (error); } - GObjectClass* class = G_OBJECT_GET_CLASS (settings); - guint i, n_properties; - GParamSpec** pspecs = g_object_class_list_properties (class, &n_properties); + class = G_OBJECT_GET_CLASS (settings); + pspecs = g_object_class_list_properties (class, &n_properties); for (i = 0; i < n_properties; i++) { - GParamSpec* pspec = pspecs[i]; + pspec = pspecs[i]; if (!(pspec->flags & G_PARAM_WRITABLE)) continue; - GType type = G_PARAM_SPEC_TYPE (pspec); - const gchar* property = g_param_spec_get_name (pspec); + type = G_PARAM_SPEC_TYPE (pspec); + property = g_param_spec_get_name (pspec); if (type == G_TYPE_PARAM_STRING) { - gchar* string = sokoke_key_file_get_string_default (key_file, + string = sokoke_key_file_get_string_default (key_file, "settings", property, G_PARAM_SPEC_STRING (pspec)->default_value, NULL); g_object_set (settings, property, string, NULL); @@ -118,21 +130,21 @@ settings_new_from_file (const gchar* filename) } else if (type == G_TYPE_PARAM_INT) { - gint integer = sokoke_key_file_get_integer_default (key_file, + integer = sokoke_key_file_get_integer_default (key_file, "settings", property, G_PARAM_SPEC_INT (pspec)->default_value, NULL); g_object_set (settings, property, integer, NULL); } else if (type == G_TYPE_PARAM_FLOAT) { - gfloat number = sokoke_key_file_get_double_default (key_file, + number = sokoke_key_file_get_double_default (key_file, "settings", property, G_PARAM_SPEC_FLOAT (pspec)->default_value, NULL); g_object_set (settings, property, number, NULL); } else if (type == G_TYPE_PARAM_BOOLEAN) { - gboolean boolean = sokoke_key_file_get_boolean_default (key_file, + boolean = sokoke_key_file_get_boolean_default (key_file, "settings", property, G_PARAM_SPEC_BOOLEAN (pspec)->default_value, NULL); g_object_set (settings, property, boolean, NULL); @@ -167,15 +179,22 @@ settings_save_to_file (MidoriWebSettings* settings, const gchar* filename, GError** error) { - GKeyFile* key_file = g_key_file_new (); - GObjectClass* class = G_OBJECT_GET_CLASS (settings); + GKeyFile* key_file; + GObjectClass* class; guint i, n_properties; - GParamSpec** pspecs = g_object_class_list_properties (class, &n_properties); + GParamSpec** pspecs; + GParamSpec* pspec; + GType type; + const gchar* property; + + key_file = g_key_file_new (); + class = G_OBJECT_GET_CLASS (settings); + pspecs = g_object_class_list_properties (class, &n_properties); for (i = 0; i < n_properties; i++) { - GParamSpec* pspec = pspecs[i]; - GType type = G_PARAM_SPEC_TYPE (pspec); - const gchar* property = g_param_spec_get_name (pspec); + pspec = pspecs[i]; + type = G_PARAM_SPEC_TYPE (pspec); + property = g_param_spec_get_name (pspec); if (!(pspec->flags & G_PARAM_WRITABLE)) { gchar* comment = g_strdup_printf ("# %s", property); @@ -226,25 +245,105 @@ settings_save_to_file (MidoriWebSettings* settings, return saved; } -int -main (int argc, char** argv) +static MidoriWebList* +search_engines_new_from_file (const gchar* filename, + GError** error) { - MidoriStartup load_on_startup; - gchar* homepage; + MidoriWebList* search_engines; + GKeyFile* key_file; + gchar** engines; + guint i, j, n_properties; + MidoriWebItem* web_item; + GParamSpec** pspecs; + const gchar* property; + gchar* value; - locale_init (); - g_set_application_name (_("midori")); + search_engines = midori_web_list_new (); + key_file = g_key_file_new (); + g_key_file_load_from_file (key_file, filename, + G_KEY_FILE_KEEP_COMMENTS, error); + /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL + , G_KEY_FILE_KEEP_COMMENTS, error);*/ + engines = g_key_file_get_groups (key_file, NULL); + for (i = 0; engines[i] != NULL; i++) + { + web_item = midori_web_item_new (); + pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (web_item), + &n_properties); + for (j = 0; j < n_properties; j++) + { + property = g_param_spec_get_name (pspecs[j]); + value = g_key_file_get_string (key_file, engines[i], + property, NULL); + g_object_set (web_item, property, value, NULL); + g_free (value); + } + midori_web_list_add_item (search_engines, web_item); + } + g_strfreev (engines); + g_key_file_free (key_file); + return search_engines; +} - // Parse cli options - gboolean version = FALSE; +static gboolean +search_engines_save_to_file (MidoriWebList* search_engines, + const gchar* filename, + GError** error) +{ + GKeyFile* key_file; + guint n, i, j, n_properties; + MidoriWebItem* web_item; + const gchar* name; + GParamSpec** pspecs; + const gchar* property; + gchar* value; + gboolean saved; + + key_file = g_key_file_new (); + n = midori_web_list_get_length (search_engines); + for (i = 0; i < n; i++) + { + web_item = midori_web_list_get_nth_item (search_engines, i); + name = midori_web_item_get_name (web_item); + pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (web_item), + &n_properties); + for (j = 0; j < n_properties; j++) + { + property = g_param_spec_get_name (pspecs[j]); + g_object_get (web_item, property, &value, NULL); + if (value) + g_key_file_set_string (key_file, name, property, value); + g_free (value); + } + } + saved = sokoke_key_file_save_to_file (key_file, filename, error); + g_key_file_free (key_file); + + return saved; +} + +int +main (int argc, + char** argv) +{ + gboolean version; + GError* error; GOptionEntry entries[] = { { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { NULL } }; + MidoriStartup load_on_startup; + gchar* homepage; + MidoriWebList* search_engines; - GError* error = NULL; + locale_init (); + g_set_application_name (_("midori")); + + /* Parse cli options */ + version = FALSE; + error = NULL; if (!gtk_init_with_args (&argc, &argv, _("[URL]"), entries, GETTEXT_PACKAGE, &error)) { @@ -273,7 +372,7 @@ main (int argc, char** argv) return 0; } - // Standalone gjs support + /* Standalone gjs support */ if (argc > 1 && argv[1] && g_str_has_suffix (argv[1], ".js")) { JSGlobalContextRef js_context = gjs_global_context_new (); @@ -286,7 +385,7 @@ main (int argc, char** argv) return 1; } - // Load configuration files + /* Load configuration files */ GString* error_messages = g_string_new (NULL); gchar* config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); @@ -298,19 +397,19 @@ main (int argc, char** argv) gtk_accel_map_load (config_file); katze_assign (config_file, g_build_filename (config_path, "search", NULL)); error = NULL; - searchEngines = search_engines_new (); - if (!search_engines_from_file (&searchEngines, config_file, &error)) + search_engines = search_engines_new_from_file (config_file, &error); + if (error) { - // FIXME: We may have a "file empty" error, how do we recognize that? - /*if (error->code != G_FILE_ERROR_NOENT) + /* FIXME: We may have a "file empty" error, how do we recognize that? + if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, _("The search engines couldn't be loaded. %s\n"), - error->message);*/ + error->message); */ g_error_free (error); } katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel", NULL)); - bookmarks = katze_xbel_folder_new(); + bookmarks = katze_xbel_folder_new (); error = NULL; if (!katze_xbel_folder_from_file (bookmarks, config_file, &error)) { @@ -347,40 +446,41 @@ main (int argc, char** argv) } g_free (config_file); - // In case of errors + /* In case of errors */ if (error_messages->len) { - GtkWidget* dialog = gtk_message_dialog_new(NULL - , 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE - , _("The following errors occured:")); - gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE); - gtk_window_set_title(GTK_WINDOW(dialog), g_get_application_name()); - // FIXME: Use custom program icon - gtk_window_set_icon_name(GTK_WINDOW(dialog), "web-browser"); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog) - , "%s", error_messages->str); - gtk_dialog_add_buttons(GTK_DIALOG(dialog) - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , "_Ignore", GTK_RESPONSE_ACCEPT - , NULL); - if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) + GtkWidget* dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, + _("The following errors occured:")); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); + /* FIXME: Use custom program icon */ + gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (dialog), "%s", error_messages->str); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + "_Ignore", GTK_RESPONSE_ACCEPT, + NULL); + if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT) { - search_engines_free(searchEngines); - katze_xbel_item_unref(bookmarks); - katze_xbel_item_unref(_session); - katze_xbel_item_unref(xbel_trash); - g_string_free(error_messages, TRUE); + g_object_unref (settings); + g_object_unref (search_engines); + katze_xbel_item_unref (bookmarks); + katze_xbel_item_unref (_session); + katze_xbel_item_unref (xbel_trash); + g_string_free (error_messages, TRUE); return 0; } - gtk_widget_destroy(dialog); + gtk_widget_destroy (dialog); /* FIXME: Since we will overwrite files that could not be loaded , would we want to make backups? */ } g_string_free (error_messages, TRUE); - // TODO: Handle any number of separate uris from argv - // Open as many tabs as we have uris, seperated by pipes - gchar* uri = argc > 1 ? strtok (g_strdup(argv[1]), "|") : NULL; + /* TODO: Handle any number of separate uris from argv + Open as many tabs as we have uris, seperated by pipes */ + gchar* uri = argc > 1 ? strtok (g_strdup (argv[1]), "|") : NULL; while (uri != NULL) { KatzeXbelItem* item = katze_xbel_bookmark_new (); @@ -435,15 +535,15 @@ main (int argc, char** argv) KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, i); midori_browser_add_xbel_item (browser, item); } - // FIXME: Switch to the last active page + /* FIXME: Switch to the last active page */ KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, 0); if (!strcmp (katze_xbel_bookmark_get_href (item), "")) midori_browser_activate_action (browser, "Location"); katze_xbel_item_unref (_session); - // Load extensions + /* Load extensions */ JSGlobalContextRef js_context = gjs_global_context_new (); - // FIXME: We want to honor system installed addons as well + /* FIXME: We want to honor system installed addons as well */ gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, "extensions", NULL); GDir* addon_dir = g_dir_open (addon_path, 0, NULL); @@ -456,8 +556,8 @@ main (int argc, char** argv) gchar* exception = NULL; gjs_script_from_file (js_context, fullname, &exception); if (exception) - // FIXME: Do we want to print this somewhere else? - // FIXME Convert the filename to UTF8 + /* FIXME: Do we want to print this somewhere else? */ + /* FIXME Convert the filename to UTF8 */ printf ("%s - Exception: %s\n", filename, exception); g_free (fullname); } @@ -468,18 +568,19 @@ main (int argc, char** argv) JSGlobalContextRelease (js_context); - // Save configuration files + /* Save configuration files */ config_path = g_build_filename (g_get_user_config_dir(), PACKAGE_NAME, NULL); g_mkdir_with_parents (config_path, 0755); config_file = g_build_filename (config_path, "search", NULL); error = NULL; - if (!search_engines_to_file (searchEngines, config_file, &error)) + if (!search_engines_save_to_file (search_engines, config_file, &error)) { - g_warning (_("The search engines couldn't be saved. %s"), error->message); + g_warning (_("The search engines couldn't be saved. %s"), + error->message); g_error_free (error); } - search_engines_free(searchEngines); + g_object_unref (search_engines); g_free (config_file); config_file = g_build_filename (config_path, "bookmarks.xbel", NULL); error = NULL; @@ -499,7 +600,7 @@ main (int argc, char** argv) } katze_xbel_item_unref (xbel_trash); g_object_get (settings, "load-on-startup", &load_on_startup, NULL); - if(load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) + if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { katze_assign (config_file, g_build_filename (config_path, "session.xbel", NULL)); diff --git a/midori/main.h b/midori/main.h index 3eab9b70..829c76d9 100644 --- a/midori/main.h +++ b/midori/main.h @@ -19,23 +19,22 @@ #include -// FIXME: Remove these globals +/* FIXME: Remove these globals */ -GList* searchEngines; // Items of type 'SearchEngine' KatzeXbelItem* bookmarks; -// Custom stock items +/* Custom stock items -// We should distribute these -// Names should match with epiphany and/ or xdg spec -/* NOTE: Those uncommented were replaced with remotely related icons - in order to reduce the amount of warnings :D */ + We should distribute these + Names should match with epiphany and/ or xdg spec + NOTE: Those uncommented were replaced with remotely related icons + in order to reduce the amount of warnings */ -#define STOCK_BOOKMARK GTK_STOCK_FILE // "stock_bookmark" "bookmark-web" -#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL // "insert-text" "form-fill" +#define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ +#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */ #define STOCK_NEWSFEED GTK_STOCK_INDEX -// We assume that these legacy icon names are usually present +/* We assume that these legacy icon names are usually present */ #define STOCK_BOOKMARK_ADD "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME @@ -51,7 +50,7 @@ KatzeXbelItem* bookmarks; #define STOCK_USER_TRASH "gnome-stock-trash" #define STOCK_WINDOW_NEW "stock_new-window" -// For backwards compatibility +/* For backwards compatibility */ #if !GTK_CHECK_VERSION(2, 10, 0) #define GTK_STOCK_SELECT_ALL "gtk-select-all" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1a99d61f..5ef05de8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -414,12 +414,12 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, const gchar* uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) { - // TODO: bookmark link + /* TODO: bookmark link */ } if (webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) { - // TODO: view selection source + /* TODO: view selection source */ } if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) @@ -505,7 +505,7 @@ midori_web_view_destroy_cb (GtkWidget* widget, static void _midori_browser_will_quit (MidoriBrowser* browser) { - // Nothing to do + /* Nothing to do */ } static void @@ -843,7 +843,7 @@ _action_open_activate (GtkAction* action, gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); - // base the start folder on the current web view's uri if it is local + /* base the start folder on the current web view's uri if it is local */ GtkWidget* web_view = midori_browser_get_current_web_view (browser); if (web_view) g_object_get (web_view, "uri", &uri, NULL); @@ -1114,7 +1114,7 @@ static void midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - // Create a new web view with an uri which has been closed before + /* Create a new web view with an uri which has been closed before */ KatzeXbelItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeXbelItem"); const gchar* uri = katze_xbel_bookmark_get_href (item); @@ -1139,7 +1139,7 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, const gchar* title = katze_xbel_item_get_title (item); const gchar* uri = katze_xbel_bookmark_get_href (item); menuitem = gtk_image_menu_item_new_with_label (title ? title : uri); - // FIXME: Get the real icon + /* FIXME: Get the real icon */ GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); @@ -1169,7 +1169,7 @@ static void _action_preferences_activate (GtkAction* action, MidoriBrowser* browser) { - // Show the preferences dialog. Create it if necessary. + /* Show the preferences dialog. Create it if necessary. */ static GtkWidget* dialog = NULL; if (GTK_IS_DIALOG (dialog)) gtk_window_present (GTK_WINDOW (dialog)); @@ -1223,7 +1223,7 @@ _action_reload_stop_activate (GtkAction* action, gchar* stock_id; g_object_get (action, "stock-id", &stock_id, NULL); GtkWidget* web_view = midori_browser_get_current_web_view (browser); - // Refresh or stop, depending on the stock id + /* Refresh or stop, depending on the stock id */ if (!strcmp (stock_id, GTK_STOCK_REFRESH)) { /*GdkModifierType state = (GdkModifierType)0; @@ -1334,11 +1334,13 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, { g_object_get (priv->settings, "location-entry-search", &location_entry_search, NULL); - gchar* new_uri = sokoke_magic_uri (uri, location_entry_search); + gchar* new_uri = sokoke_magic_uri (uri, NULL/*search_engines*/); + if (!new_uri) + new_uri = g_strdup (location_entry_search); g_free (location_entry_search); - // TODO: Use new_uri intermediately when completion is better - /* TODO Completion should be generated from history, that is - the uri as well as the title. */ + /* TODO: Use new_uri intermediately when completion is better + Completion should be generated from history, that is + the uri as well as the title. */ sokoke_entry_append_completion (GTK_ENTRY (widget), uri); GtkWidget* web_view = midori_browser_get_current_web_view (browser); g_object_set (web_view, "uri", new_uri, NULL); @@ -1525,7 +1527,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, katze_xbel_bookmark_set_href (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); - // FIXME: We want to choose a folder + /* FIXME: We want to choose a folder */ if (new_bookmark) { katze_xbel_folder_append_item (bookmarks, bookmark); @@ -1537,8 +1539,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, katze_xbel_item_ref (bookmark); } - // FIXME: update navigationbar - // FIXME: Update panel in other windows + /* FIXME: update navigationbar */ + /* FIXME: Update panel in other windows */ } gtk_widget_destroy (dialog); } @@ -1697,7 +1699,7 @@ midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, return; } - // TODO: Would it be better to not do this on every redraw? + /* TODO: Would it be better to not do this on every redraw? */ GdkPixbuf* pixbuf = NULL; if (katze_xbel_item_is_bookmark (item)) pixbuf = gtk_widget_render_icon (treeview, STOCK_BOOKMARK, @@ -1746,12 +1748,12 @@ midori_browser_bookmark_menu_folder_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { GtkWidget* menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)); - gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL);//... + gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL); KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT (menuitem), "KatzeXbelItem"); _midori_browser_create_bookmark_menu (browser, folder, menu); - // Remove all menuitems when the menu is hidden. - // FIXME: We really *want* the line below, but it won't work like that - //g_signal_connect_after (menu, "hide", G_CALLBACK (gtk_container_foreach), gtk_widget_destroy); + /* Remove all menuitems when the menu is hidden. + FIXME: We really *want* the line below, but it won't work like that + g_signal_connect_after (menu, "hide", G_CALLBACK (gtk_container_foreach), gtk_widget_destroy); */ gtk_widget_show (menuitem); } @@ -1763,10 +1765,10 @@ midori_browser_bookmarkbar_folder_activate_cb (GtkToolItem* toolitem, KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data ( G_OBJECT (toolitem), "KatzeXbelItem"); _midori_browser_create_bookmark_menu (browser, folder, menu); - // Remove all menuitems when the menu is hidden. - // FIXME: We really *should* run the line below, but it won't work like that - /*g_signal_connect (menu, "hide", G_CALLBACK (gtk_container_foreach), - gtk_widget_destroy);*/ + /* Remove all menuitems when the menu is hidden. + FIXME: We really *should* run the line below, but it won't work like that + g_signal_connect (menu, "hide", G_CALLBACK (gtk_container_foreach), + gtk_widget_destroy); */ sokoke_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), NULL, SOKOKE_MENU_POSITION_LEFT); } @@ -1800,7 +1802,7 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, switch (katze_xbel_item_get_kind (item)) { case KATZE_XBEL_ITEM_KIND_FOLDER: - // FIXME: what about katze_xbel_folder_is_folded? + /* FIXME: what about katze_xbel_folder_is_folded? */ menuitem = gtk_image_menu_item_new_with_label (title); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, @@ -1846,7 +1848,7 @@ static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) { - // Show the Manage search engines dialog. Create it if necessary. + /* Show the Manage search engines dialog. Create it if necessary. */ static GtkWidget* dialog; if (GTK_IS_DIALOG (dialog)) gtk_window_present (GTK_WINDOW (dialog)); @@ -1873,7 +1875,7 @@ _action_tab_next_activate (GtkAction* action, { MidoriBrowserPrivate* priv = browser->priv; - // Advance one tab or jump to the first one if we are at the last one + /* Advance one tab or jump to the first one if we are at the last one */ gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) - 1) n = -1; @@ -1935,10 +1937,10 @@ static void midori_browser_location_changed_cb (GtkWidget* widget, MidoriBrowser* browser) { - // Preserve changes to the uri - /*const gchar* newUri = gtk_entry_get_text(GTK_ENTRY(widget)); - katze_xbel_bookmark_set_href(browser->sessionItem, newUri);*/ - // FIXME: If we want this feature, this is the wrong approach + /* Preserve changes to the uri + const gchar* new_uri = gtk_entry_get_text (GTK_ENTRY (widget)); + katze_xbel_bookmark_set_href(browser->sessionItem, new_uri); + FIXME: If we want this feature, this is the wrong approach */ } static void @@ -1960,7 +1962,7 @@ _action_open_in_panel_activate (GtkAction* action, GtkWidget* web_view = midori_browser_get_current_web_view (browser); const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - // FIXME: Don't assign the uri here, update it properly while navigating + /* FIXME: Don't assign the uri here, update it properly while navigating */ g_object_set (priv->settings, "last-pageholder-uri", uri, NULL); gint n = midori_panel_page_num (MIDORI_PANEL (priv->panel), priv->panel_pageholder); @@ -2111,7 +2113,7 @@ _action_undo_tab_close_activate (GtkAction* action, { MidoriBrowserPrivate* priv = browser->priv; - // Reopen the most recent trash item + /* Reopen the most recent trash item */ KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, 0); gint n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); @@ -2417,7 +2419,7 @@ midori_browser_destroy_cb (MidoriBrowser* browser) { MidoriBrowserPrivate* priv = browser->priv; - // Destroy tabs first, so widgets can still see window elements on destroy + /* Destroy tabs first, so widgets can still see window elements on destroy */ gtk_container_foreach (GTK_CONTAINER (priv->notebook), (GtkCallback) gtk_widget_destroy, NULL); } @@ -2485,7 +2487,7 @@ static const gchar* ui_markup = "" "" "" - // Closed tabs shall be prepended here + /* Closed tabs shall be prepended here */ "" "" "" @@ -2499,18 +2501,18 @@ static const gchar* ui_markup = "" "" "" - // Bookmarks shall be appended here + /* Bookmarks shall be appended here */ "" "" "" - // Panel items shall be appended here + /* Panel items shall be appended here */ "" "" "" "" "" "" - // All open tabs shall be appended here + /* All open tabs shall be appended here */ "" "" "" @@ -2563,7 +2565,7 @@ midori_browser_init (MidoriBrowser* browser) MidoriBrowserPrivate* priv = browser->priv; - // Setup the window metrics + /* Setup the window metrics */ g_signal_connect (browser, "realize", G_CALLBACK (midori_browser_realize_cb), browser); g_signal_connect (browser, "window-state-event", @@ -2578,7 +2580,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_container_add (GTK_CONTAINER (browser), vbox); gtk_widget_show (vbox); - // Let us see some ui manager magic + /* Let us see some ui manager magic */ priv->action_group = gtk_action_group_new ("Browser"); gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions (priv->action_group, @@ -2593,14 +2595,14 @@ midori_browser_init (MidoriBrowser* browser) GError* error = NULL; if (!gtk_ui_manager_add_ui_from_string(ui_manager, ui_markup, -1, &error)) { - // TODO: Should this be a message dialog? When does this happen? + /* TODO: Should this be a message dialog? When does this happen? */ g_message ("User interface couldn't be created: %s", error->message); g_error_free (error); } GtkAction* action; - // Make all actions except toplevel menus which lack a callback insensitive - // This will vanish once all actions are implemented + /* Make all actions except toplevel menus which lack a callback insensitive + This will vanish once all actions are implemented */ guint i; for (i = 0; i < entries_n; i++) { @@ -2616,9 +2618,9 @@ midori_browser_init (MidoriBrowser* browser) gtk_action_set_sensitive (action, toggle_entries[i].callback != NULL); } - //_action_set_active(browser, "Transferbar", config->toolbarTransfers); + /* _action_set_active(browser, "Transferbar", config->toolbarTransfers); */ - // Create the menubar + /* Create the menubar */ priv->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new (); gtk_widget_show (menuitem); @@ -2655,10 +2657,10 @@ midori_browser_init (MidoriBrowser* browser) _action_set_sensitive (browser, "PrivateBrowsing", FALSE); _action_set_sensitive (browser, "WorkOffline", FALSE); - // Create the navigationbar + /* Create the navigationbar */ priv->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); - // FIXME: settings should be connected with screen changes + /* FIXME: settings should be connected with screen changes */ GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (gtk_settings) g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", @@ -2671,7 +2673,7 @@ midori_browser_init (MidoriBrowser* browser) priv->button_homepage = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/Homepage"); - // Location + /* Location */ priv->location = sexy_icon_entry_new (); sokoke_entry_setup_completion (GTK_ENTRY (priv->location)); priv->location_icon = gtk_image_new (); @@ -2691,13 +2693,13 @@ midori_browser_init (MidoriBrowser* browser) gtk_container_add (GTK_CONTAINER(toolitem), priv->location); gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); - // Search + /* Search */ priv->search = sexy_icon_entry_new (); sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (priv->search), SEXY_ICON_ENTRY_PRIMARY, TRUE); - // TODO: Make this actively resizable or enlarge to fit contents? - // FIXME: The interface is somewhat awkward and ought to be rethought - // TODO: Display "show in context menu" search engines as "completion actions" + /* TODO: Make this actively resizable or enlarge to fit contents? + The interface is somewhat awkward and ought to be rethought + Display "show in context menu" search engines as "completion actions" */ sokoke_entry_setup_completion (GTK_ENTRY (priv->search)); g_object_connect (priv->search, "signal::icon-released", @@ -2729,7 +2731,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), GTK_TOOL_ITEM (priv->button_fullscreen), -1); - // Bookmarkbar + /* Bookmarkbar */ priv->bookmarkbar = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->bookmarkbar), GTK_ICON_SIZE_MENU); @@ -2777,12 +2779,12 @@ midori_browser_init (MidoriBrowser* browser) sokoke_container_show_children (GTK_CONTAINER (priv->bookmarkbar)); gtk_box_pack_start (GTK_BOX (vbox), priv->bookmarkbar, FALSE, FALSE, 0); - // Superuser warning + /* Superuser warning */ GtkWidget* hbox; if ((hbox = sokoke_superuser_warning_new ())) gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - // Create the panel + /* Create the panel */ GtkWidget* hpaned = gtk_hpaned_new (); g_signal_connect (hpaned, "notify::position", G_CALLBACK (midori_panel_notify_position_cb), @@ -2797,7 +2799,7 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_panel_close_cb), browser); gtk_paned_pack1 (GTK_PANED (hpaned), priv->panel, FALSE, FALSE); - // Bookmarks + /* Bookmarks */ GtkWidget* box = gtk_vbox_new (FALSE, 0); GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; @@ -2844,14 +2846,14 @@ midori_browser_init (MidoriBrowser* browser) box, toolbar, "vcard", _("Bookmarks")); - // Transfers + /* Transfers */ GtkWidget* panel = midori_web_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (priv->panel), panel, NULL, "package", _("Transfers")); - // Console + /* Console */ priv->panel_console = midori_console_new (); gtk_widget_show (priv->panel_console); toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (priv->panel_console)); @@ -2860,14 +2862,14 @@ midori_browser_init (MidoriBrowser* browser) priv->panel_console, toolbar, "terminal", _("Console")); - // History + /* History */ panel = midori_web_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (priv->panel), panel, NULL, "document-open-recent", _("History")); - // Pageholder + /* Pageholder */ priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, "uri", "", NULL); @@ -2876,7 +2878,7 @@ midori_browser_init (MidoriBrowser* browser) priv->panel_pageholder, NULL, GTK_STOCK_CONVERT, _("Pageholder")); - // Userscripts + /* Userscripts */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); @@ -2884,7 +2886,7 @@ midori_browser_init (MidoriBrowser* browser) midori_panel_append_page (MIDORI_PANEL (priv->panel), panel, toolbar, "", _("Userscripts")); - // Userstyles + /* Userstyles */ /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); @@ -2893,7 +2895,7 @@ midori_browser_init (MidoriBrowser* browser) panel, toolbar, "", _("Userstyles"));*/ - // Notebook, containing all web_views + /* Notebook, containing all web_views */ priv->notebook = gtk_notebook_new (); gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), priv->notebook, FALSE, FALSE); @@ -2902,7 +2904,7 @@ midori_browser_init (MidoriBrowser* browser) browser); gtk_widget_show (priv->notebook); - // Incremental findbar + /* Incremental findbar */ priv->find = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->find), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (priv->find), GTK_TOOLBAR_BOTH_HORIZ); @@ -2959,17 +2961,17 @@ midori_browser_init (MidoriBrowser* browser) sokoke_container_show_children (GTK_CONTAINER (priv->find)); gtk_box_pack_start (GTK_BOX (vbox), priv->find, FALSE, FALSE, 0); - // Statusbar - // TODO: fix children overlapping statusbar border + /* Statusbar */ + /* FIXME: children are overlapping the statusbar border */ priv->statusbar = gtk_statusbar_new (); gtk_box_pack_start (GTK_BOX (vbox), priv->statusbar, FALSE, FALSE, 0); priv->progressbar = gtk_progress_bar_new (); - // Setting the progressbar's height to 1 makes it fit in the statusbar + /* Setting the progressbar's height to 1 makes it fit in the statusbar */ gtk_widget_set_size_request (priv->progressbar, -1, 1); gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar, FALSE, FALSE, 3); - // Extensions + /* Extensions */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); @@ -3176,17 +3178,17 @@ midori_browser_set_property (GObject* object, _midori_browser_update_settings (browser); g_signal_connect (priv->settings, "notify", G_CALLBACK (midori_browser_settings_notify), browser); - // FIXME: Assigning settings must be conditional, if web view or not - // FIXME: Assign settings only if the same settings object was used + /* FIXME: Assigning settings must be conditional, if web view or not */ + /* FIXME: Assign settings only if the same settings object was used */ gtk_container_foreach (GTK_CONTAINER (priv->notebook), (GtkCallback) midori_web_view_set_settings, priv->settings); break; case PROP_TRASH: - ; // FIXME: Disconnect handlers + ; /* FIXME: Disconnect handlers */ katze_object_assign (priv->trash, g_value_get_object (value)); g_object_ref (priv->trash); - // FIXME: Connect to updates + /* FIXME: Connect to updates */ _midori_browser_update_actions (browser); break; default: @@ -3382,7 +3384,7 @@ midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); gtk_container_remove (GTK_CONTAINER (priv->notebook), scrolled); - // FIXME: Remove the menuitem if this is a web view + /* FIXME: Remove the menuitem if this is a web view */ } /** @@ -3602,7 +3604,7 @@ midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser) if (!priv->proxy_xbel_folder) { priv->proxy_xbel_folder = katze_xbel_folder_new (); - // FIXME: Fill in xbel items of all present web views + /* FIXME: Fill in xbel items of all present web views */ } return priv->proxy_xbel_folder; } diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c new file mode 100644 index 00000000..6976204d --- /dev/null +++ b/midori/midori-weblist.c @@ -0,0 +1,194 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-weblist.h" + +#include +#include + +struct _MidoriWebList +{ + GObject parent_instance; + + GList* items; +}; + +G_DEFINE_TYPE (MidoriWebList, midori_web_list, G_TYPE_OBJECT) + +enum { + ADD_ITEM, + REMOVE_ITEM, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_web_list_finalize (GObject* object); + +static void +midori_web_list_class_init (MidoriWebListClass* class) +{ + signals[ADD_ITEM] = g_signal_new ( + "add-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebListClass, add_item), + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + MIDORI_TYPE_WEB_ITEM); + + signals[REMOVE_ITEM] = g_signal_new ( + "remove-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (MidoriWebListClass, remove_item), + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + MIDORI_TYPE_WEB_ITEM); + + class->add_item = midori_web_list_add_item; + class->remove_item = midori_web_list_remove_item; + + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_web_list_finalize; +} + +static void +midori_web_list_init (MidoriWebList* web_list) +{ + web_list->items = NULL; +} + +static void +midori_web_list_finalize (GObject* object) +{ + MidoriWebList* web_list = MIDORI_WEB_LIST (object); + + g_list_foreach (web_list->items, (GFunc)g_object_unref, NULL); + g_list_free (web_list->items); + + G_OBJECT_CLASS (midori_web_list_parent_class)->finalize (object); +} + +/** + * midori_web_list_new: + * + * Creates a new #MidoriWebList. + * + * Return value: a new #MidoriWebList + **/ +MidoriWebList* +midori_web_list_new (void) +{ + MidoriWebList* web_list = g_object_new (MIDORI_TYPE_WEB_LIST, + NULL); + + return web_list; +} + +/** + * midori_web_list_add_item: + * @web_list: a #MidoriWebList + * @web_item: a #MidoriWebItem + * + * Adds an item to the list. + **/ +void +midori_web_list_add_item (MidoriWebList* web_list, + MidoriWebItem* web_item) +{ + g_object_ref (web_item); + web_list->items = g_list_append (web_list->items, web_item); +} + +/** + * midori_web_list_add_item: + * @web_list: a #MidoriWebList + * @web_item: a #MidoriWebItem + * + * Removes an item from the list. + **/ +void +midori_web_list_remove_item (MidoriWebList* web_list, + MidoriWebItem* web_item) +{ + web_list->items = g_list_remove (web_list->items, web_item); +} + +/** + * midori_web_list_get_nth_item: + * @web_list: a #MidoriWebList + * @n: an index in the list + * + * Retrieves the item in @web_list at the index @n. + * + * Return value: an item, or %NULL + **/ +MidoriWebItem* +midori_web_list_get_nth_item (MidoriWebList* web_list, + guint n) +{ + g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), 0); + + return g_list_nth_data (web_list->items, n); +} + +/** + * midori_web_list_find_token: + * @web_list: a #MidoriWebList + * @token: a token string + * + * Looks up an item in the list which has the specified token. + * + * Note that @token is by definition unique to one item. + * + * Return value: an item, or %NULL + **/ +MidoriWebItem* +midori_web_list_find_token (MidoriWebList* web_list, + const gchar* token) +{ + guint n, i; + MidoriWebItem* web_item; + + g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), NULL); + + n = g_list_length (web_list->items); + for (i = 0; i < n; i++) + { + web_item = (MidoriWebItem*)g_list_nth_data (web_list->items, i); + if (!strcmp (midori_web_item_get_token (web_item), token)) + return web_item; + } + return NULL; +} + +/** + * midori_web_list_get_length: + * @web_list: a #MidoriWebList + * + * Retrieves the number of items in @web_list. + * + * Return value: the length of the list + **/ +guint +midori_web_list_get_length (MidoriWebList* web_list) +{ + g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), 0); + + return g_list_length (web_list->items); +} diff --git a/midori/midori-weblist.h b/midori/midori-weblist.h new file mode 100644 index 00000000..86660fb3 --- /dev/null +++ b/midori/midori-weblist.h @@ -0,0 +1,75 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_WEB_LIST_H__ +#define __MIDORI_WEB_LIST_H__ + +#include "midori-webitem.h" + +G_BEGIN_DECLS + +#define MIDORI_TYPE_WEB_LIST \ + (midori_web_list_get_type ()) +#define MIDORI_WEB_LIST(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_LIST, MidoriWebList)) +#define MIDORI_WEB_LIST_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_LIST, MidoriWebListClass)) +#define MIDORI_IS_WEB_LIST(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_LIST)) +#define MIDORI_IS_WEB_LIST_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_LIST)) +#define MIDORI_WEB_LIST_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_LIST, MidoriWebListClass)) + +typedef struct _MidoriWebList MidoriWebList; +typedef struct _MidoriWebListClass MidoriWebListClass; + +struct _MidoriWebListClass +{ + GObjectClass parent_class; + + /* Signals */ + void + (*add_item) (MidoriWebList* web_list, + MidoriWebItem* web_item); + void + (*remove_item) (MidoriWebList* web_list, + MidoriWebItem* web_item); +}; + +GType +midori_web_list_get_type (void); + +MidoriWebList* +midori_web_list_new (void); + +void +midori_web_list_add_item (MidoriWebList* web_list, + MidoriWebItem* web_item); + +void +midori_web_list_remove_item (MidoriWebList* web_list, + MidoriWebItem* web_item); + +MidoriWebItem* +midori_web_list_get_nth_item (MidoriWebList* web_list, + guint n); + +MidoriWebItem* +midori_web_list_find_token (MidoriWebList* web_list, + const gchar* token); + +guint +midori_web_list_get_length (MidoriWebList* web_list); + +G_END_DECLS + +#endif /* __MIDORI_WEB_LIST_H__ */ diff --git a/midori/search.c b/midori/search.c deleted file mode 100644 index 1577b9c8..00000000 --- a/midori/search.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "search.h" - -#include "midori-webitem.h" - -#include "sokoke.h" - -GList* search_engines_new(void) -{ - return NULL; -} - -void search_engines_free(GList* searchEngines) -{ - g_list_foreach(searchEngines, (GFunc)g_object_unref, NULL); - g_list_free(searchEngines); -} - -gboolean search_engines_from_file(GList** searchEngines, const gchar* filename - , GError** error) -{ - g_return_val_if_fail(!g_list_nth(*searchEngines, 0), FALSE); - GKeyFile* keyFile = g_key_file_new(); - g_key_file_load_from_file(keyFile, filename, G_KEY_FILE_KEEP_COMMENTS, error); - /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL - , G_KEY_FILE_KEEP_COMMENTS, error);*/ - gchar** engines = g_key_file_get_groups(keyFile, NULL); - guint i; - for(i = 0; engines[i] != NULL; i++) - { - MidoriWebItem* web_item = midori_web_item_new (); - guint j, n_properties; - GParamSpec** pspecs = g_object_class_list_properties ( - G_OBJECT_GET_CLASS (web_item), &n_properties); - for (j = 0; j < n_properties; j++) - { - const gchar* property = g_param_spec_get_name (pspecs[j]); - gchar* value = g_key_file_get_string (keyFile, engines[i], - property, NULL); - g_object_set (web_item, property, value, NULL); - g_free (value); - } - *searchEngines = g_list_prepend(*searchEngines, web_item); - } - *searchEngines = g_list_reverse(*searchEngines); - g_strfreev(engines); - g_key_file_free(keyFile); - return !(error && *error); -} - -static void key_file_set_string(GKeyFile* keyFile, const gchar* group - , const gchar* key, const gchar* string) -{ - g_return_if_fail(group); - if(string) - g_key_file_set_string(keyFile, group, key, string); -} - -gboolean search_engines_to_file(GList* searchEngines, const gchar* filename - , GError** error) -{ - GKeyFile* keyFile = g_key_file_new(); - guint n = g_list_length(searchEngines); - guint i; - for(i = 0; i < n; i++) - { - MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data(searchEngines, i); - const gchar* name = midori_web_item_get_name (web_item); - guint j, n_properties; - GParamSpec** pspecs = g_object_class_list_properties ( - G_OBJECT_GET_CLASS (web_item), &n_properties); - for (j = 0; j < n_properties; j++) - { - const gchar* property = g_param_spec_get_name (pspecs[j]); - gchar* value; - g_object_get (web_item, property, &value, NULL); - key_file_set_string (keyFile, name, property, value); - g_free (value); - } - } - gboolean bSaved = sokoke_key_file_save_to_file(keyFile, filename, error); - g_key_file_free(keyFile); - - return bSaved; -} diff --git a/midori/search.h b/midori/search.h deleted file mode 100644 index 7ca92912..00000000 --- a/midori/search.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __SEARCH_H__ -#define __SEARCH_H__ 1 - -#include -#include - -GList* -search_engines_new(void); - -void -search_engines_free(GList*); - -gboolean -search_engines_from_file(GList**, const gchar*, GError**); - -gboolean -search_engines_to_file(GList*, const gchar*, GError**); - -#endif /* !__SEARCH_H__ */ diff --git a/midori/sokoke.c b/midori/sokoke.c index 6130ffa0..3f5afeca 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -25,49 +25,56 @@ #include gchar* -sokoke_magic_uri (const gchar* uri, const gchar* default_search_uri) +sokoke_magic_uri (const gchar* uri, + MidoriWebList* search_engines) { - // Add file:// if we have a local path + g_return_val_if_fail (uri, NULL); + if (search_engines) + { + g_return_val_if_fail (MIDORI_IS_WEB_LIST (search_engines), NULL); + } + + gchar* current_dir; + gchar* result; + gchar* search; + const gchar* search_uri; + gchar** parts; + MidoriWebItem* web_item; + + /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) return g_strconcat ("file://", uri, NULL); - // Construct an absolute path if the file is relative - if (g_file_test (uri, G_FILE_TEST_EXISTS) && g_file_test (uri, G_FILE_TEST_IS_REGULAR)) + /* Construct an absolute path if the file is relative */ + if (g_file_test (uri, G_FILE_TEST_EXISTS) + && g_file_test (uri, G_FILE_TEST_IS_REGULAR)) { - gchar* current_dir = g_get_current_dir (); - gchar* result = g_strconcat ("file://", current_dir, G_DIR_SEPARATOR_S, uri, NULL); + current_dir = g_get_current_dir (); + result = g_strconcat ("file://", current_dir, + G_DIR_SEPARATOR_S, uri, NULL); g_free (current_dir); return result; } - // Do we need to add a protocol? + /* Do we need to add a protocol? */ if (!strstr (uri, "://")) { - // Do we have a domain, ip address or localhost? + /* Do we have a domain, ip address or localhost? */ if (strchr (uri, '.') != NULL || !strcmp (uri, "localhost")) return g_strconcat ("http://", uri, NULL); - // We don't want to search? So return early. - if (!default_search_uri) + /* We don't want to search? So return early. */ + if (!search_engines) return g_strdup (uri); - gchar* search; - const gchar* search_uri = NULL; - // Do we have a keyword and a string? - gchar** parts = g_strsplit (uri, " ", 2); + search = NULL; + search_uri = NULL; + /* Do we have a keyword and a string? */ + parts = g_strsplit (uri, " ", 2); if (parts[0] && parts[1]) { - guint n = g_list_length (searchEngines); - guint i; - for (i = 0; i < n; i++) - { - MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data ( - searchEngines, i); - if (!strcmp (midori_web_item_get_token (web_item), parts[0])) - search_uri = midori_web_item_get_uri (web_item); - } + web_item = midori_web_list_find_token (search_engines, parts[0]); + if (web_item) + search_uri = midori_web_item_get_uri (web_item); + } if (search_uri) search = g_strdup_printf (search_uri, parts[1]); - } - // We only have a word or there is no matching keyword, so search for it - if (!search_uri) - search = g_strdup_printf (default_search_uri, uri); return search; } return g_strdup (uri); @@ -84,7 +91,8 @@ sokoke_entry_setup_completion (GtkEntry* entry) gtk_entry_completion_set_text_column (completion, 0); gtk_entry_completion_set_minimum_key_length (completion, 3); gtk_entry_set_completion (entry, completion); - gtk_entry_completion_set_popup_completion (completion, FALSE); //... + /* FIXME: Completion doesn't work well, so it's disabled */ + gtk_entry_completion_set_popup_completion (completion, FALSE); } void @@ -101,8 +109,8 @@ void sokoke_combo_box_add_strings (GtkComboBox* combobox, const gchar* label_first, ...) { - // Add a number of strings to a combobox, terminated with NULL - // This works only for text comboboxes + /* Add a number of strings to a combobox, terminated with NULL + This works only for text comboboxes */ va_list args; va_start (args, label_first); @@ -115,7 +123,7 @@ sokoke_combo_box_add_strings (GtkComboBox* combobox, void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible) { - // Show or hide the widget + /* Show or hide the widget */ if (visible) gtk_widget_show (widget); else @@ -125,7 +133,7 @@ void sokoke_widget_set_visible (GtkWidget* widget, gboolean visible) void sokoke_container_show_children (GtkContainer* container) { - // Show every child but not the container itself + /* Show every child but not the container itself */ gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); } @@ -149,7 +157,7 @@ sokoke_widget_popup_position_menu (GtkMenu* menu, SokokePopupInfo* info = user_data; GtkWidget* widget = info->widget; - // Retrieve size and position of both widget and menu + /* Retrieve size and position of both widget and menu */ if (GTK_WIDGET_NO_WINDOW (widget)) { gdk_window_get_position (widget->window, &wx, &wy); @@ -161,11 +169,11 @@ sokoke_widget_popup_position_menu (GtkMenu* menu, gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); gtk_widget_size_request (widget, &widget_req); menu_width = menu_req.width; - gint widget_height = widget_req.height; // Better than allocation.height + gint widget_height = widget_req.height; /* Better than allocation.height */ - // Calculate menu position + /* Calculate menu position */ if (info->position == SOKOKE_MENU_POSITION_CURSOR) - ; // Do nothing? + ; /* Do nothing? */ else if (info->position == SOKOKE_MENU_POSITION_RIGHT) { *x = wx + widget->allocation.width - menu_width; @@ -225,7 +233,7 @@ sokoke_get_desktop (void) static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) { - // Are we running in Xfce? + /* Are we running in Xfce? */ gint result; gchar* out; gchar* err; gboolean success = g_spawn_command_line_sync ( "xprop -root _DT_SAVE_MODE | grep -q xfce4", @@ -243,8 +251,8 @@ GtkWidget* sokoke_xfce_header_new (const gchar* icon, const gchar* title) { - // Create an xfce header with icon and title - // This returns NULL if the desktop is not xfce + /* Create an xfce header with icon and title + This returns NULL if the desktop is not xfce */ if (sokoke_get_desktop () == SOKOKE_DESKTOP_XFCE) { GtkWidget* entry = gtk_entry_new (); @@ -274,10 +282,10 @@ sokoke_xfce_header_new (const gchar* icon, GtkWidget* sokoke_superuser_warning_new (void) { - // Create a horizontal bar with a security warning - // This returns NULL if the user is no superuser + /* Create a horizontal bar with a security warning + This returns NULL if the user is no superuser */ #ifdef HAVE_UNISTD_H - if (G_UNLIKELY (!geteuid ())) // effective superuser? + if (G_UNLIKELY (!geteuid ())) /* effective superuser? */ { GtkWidget* hbox = gtk_event_box_new (); gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL, @@ -299,7 +307,7 @@ sokoke_superuser_warning_new (void) GtkWidget* sokoke_hig_frame_new (const gchar* title) { - // Create a frame with no actual frame but a bold label and indentation + /* Create a frame with no actual frame but a bold label and indentation */ GtkWidget* frame = gtk_frame_new (NULL); gchar* title_bold = g_strdup_printf ("%s", title); GtkWidget* label = gtk_label_new (NULL); @@ -314,8 +322,8 @@ void sokoke_widget_set_pango_font_style (GtkWidget* widget, PangoStyle style) { - // Conveniently change the pango font style - // For some reason we need to reset if we actually want the normal style + /* Conveniently change the pango font style + For some reason we need to reset if we actually want the normal style */ if (style == PANGO_STYLE_NORMAL) gtk_widget_modify_font (widget, NULL); else @@ -368,7 +376,7 @@ void sokoke_entry_set_default_text (GtkEntry* entry, const gchar* default_text) { - // Note: The default text initially overwrites any previous text + /* Note: The default text initially overwrites any previous text */ gchar* old_value = g_object_get_data (G_OBJECT (entry), "sokoke_default_text"); if (!old_value) diff --git a/midori/sokoke.h b/midori/sokoke.h index af12b399..2fa36bf0 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -12,14 +12,16 @@ #ifndef __SOKOKE_H__ #define __SOKOKE_H__ 1 +#include "midori-weblist.h" + #include -// Many themes need this hack for small toolbars to work +/* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON gchar* -sokoke_magic_uri (const gchar* uri, - const gchar* search); +sokoke_magic_uri (const gchar* uri, + MidoriWebList* search_engines); void sokoke_entry_setup_completion (GtkEntry* entry); diff --git a/midori/webSearch.c b/midori/webSearch.c index 427608df..36b2d226 100644 --- a/midori/webSearch.c +++ b/midori/webSearch.c @@ -29,7 +29,7 @@ load_web_icon (const gchar* icon, GtkIconSize size, GtkWidget* widget) GdkPixbuf* pixbuf = NULL; if (icon && *icon) { - // TODO: We want to allow http as well, maybe also base64? + /* TODO: We want to allow http as well, maybe also base64? */ const gchar* icon_ready = g_str_has_prefix (icon, "file://") ? &icon[7] : icon; GtkStockItem stock_id; @@ -57,18 +57,20 @@ load_web_icon (const gchar* icon, GtkIconSize size, GtkWidget* widget) void update_searchEngine(guint index, GtkWidget* search) { - guint n = g_list_length(searchEngines); - // Display a default icon in case we have no engines + MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ + guint n = midori_web_list_get_length (search_engines); + MidoriWebItem* web_item; + /* Display a default icon in case we have no engines */ if(!n) sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search), SEXY_ICON_ENTRY_PRIMARY , GTK_IMAGE(gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU))); - // Change the icon and default text according to the chosen engine + /* Change the icon and default text according to the chosen engine */ else { - // Reset in case the index is out of range + /* Reset in case the index is out of range */ if(index >= n) index = 0; - MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, index); + web_item = midori_web_list_get_nth_item (search_engines, index); GdkPixbuf* pixbuf = load_web_icon (midori_web_item_get_icon (web_item), GTK_ICON_SIZE_MENU, search); sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search) @@ -76,7 +78,7 @@ void update_searchEngine(guint index, GtkWidget* search) g_object_unref(pixbuf); sokoke_entry_set_default_text (GTK_ENTRY (search), midori_web_item_get_name (web_item)); - // config->searchEngine = index; + /* config->searchEngine = index; */ } } @@ -89,15 +91,17 @@ void on_webSearch_engine_activate(GtkWidget* widget, MidoriBrowser* browser) void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos , gint button, MidoriBrowser* browser) { + MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ GtkWidget* menu = gtk_menu_new(); - guint n = g_list_length(searchEngines); + guint n = midori_web_list_get_length (search_engines); GtkWidget* menuitem; + MidoriWebItem* web_item; if(n) { guint i; for(i = 0; i < n; i++) { - MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, i); + web_item = midori_web_list_get_nth_item (search_engines, i); menuitem = gtk_image_menu_item_new_with_label ( midori_web_item_get_name (web_item)); GdkPixbuf* pixbuf = load_web_icon (midori_web_item_get_icon (web_item), @@ -139,7 +143,7 @@ static void on_webSearch_engines_render_icon(GtkTreeViewColumn* column MidoriWebItem* web_item; gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &web_item, -1); - // TODO: Would it be better to not do this on every redraw? + /* TODO: Would it be better to not do this on every redraw? */ const gchar* icon = midori_web_item_get_icon (web_item); if (icon) { @@ -185,6 +189,7 @@ const gchar* STR_NON_NULL(const gchar* string) static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webSearch) { + MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ GtkWidget* dialog = gtk_dialog_new_with_buttons( newEngine ? _("Add search engine") : _("Edit search engine") , GTK_WINDOW(webSearch->window) @@ -304,7 +309,7 @@ static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webS if(newEngine) { - searchEngines = g_list_append(searchEngines, web_item); + midori_web_list_add_item (search_engines, web_item); liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(webSearch->treeview)); gtk_list_store_append(GTK_LIST_STORE(liststore), &iter); } @@ -327,6 +332,7 @@ static void on_webSearch_edit(GtkWidget* widget, CWebSearch* webSearch) static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) { + MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(webSearch->treeview)); GtkTreeModel* liststore; GtkTreeIter iter; @@ -335,14 +341,15 @@ static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &web_item, -1); gtk_list_store_remove(GTK_LIST_STORE(liststore), &iter); g_object_unref (web_item); - searchEngines = g_list_remove (searchEngines, web_item); - //update_searchEngine(config->searchEngine, webSearch->browser); - webSearch_toggle_edit_buttons(g_list_nth(searchEngines, 0) != NULL, webSearch); - // FIXME: we want to allow undo of some kind + midori_web_list_remove_item (search_engines, web_item); + /*update_searchEngine(config->searchEngine, webSearch->browser); */ + webSearch_toggle_edit_buttons(midori_web_list_get_length(search_engines), webSearch); + /* FIXME: we want to allow undo of some kind */ } GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) { + MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ const gchar* dialogTitle = _("Manage search engines"); GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle , GTK_WINDOW(browser) @@ -353,16 +360,16 @@ GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) , GTK_RESPONSE_CLOSE , NULL); gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PROPERTIES); - // TODO: Implement some kind of help function + /* TODO: Implement some kind of help function */ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) - , GTK_RESPONSE_HELP, FALSE); //... + , GTK_RESPONSE_HELP, FALSE); gint iWidth, iHeight; sokoke_widget_get_text_size(dialog, "M", &iWidth, &iHeight); gtk_window_set_default_size(GTK_WINDOW(dialog), iWidth * 45, -1); g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); - // TODO: Do we want tooltips for explainations or can we omit that? - // TODO: We need mnemonics - // TODO: Take multiple windows into account when applying changes + /* TODO: Do we want tooltips for explainations or can we omit that? + We need mnemonics + Take multiple windows into account when applying changes */ GtkWidget* xfce_heading; if((xfce_heading = sokoke_xfce_header_new( gtk_window_get_icon_name(GTK_WINDOW(dialog)), dialogTitle))) @@ -391,11 +398,11 @@ GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) gtk_container_add(GTK_CONTAINER(scrolled), treeview); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 5); - guint n = g_list_length(searchEngines); + guint n = midori_web_list_get_length (search_engines); guint i; for(i = 0; i < n; i++) { - MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, i); + MidoriWebItem* web_item = midori_web_list_get_nth_item (search_engines, i); gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i , ENGINES_COL_ENGINE, web_item, -1); } @@ -418,13 +425,13 @@ GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_remove), webSearch); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); webSearch->remove = button; - button = gtk_label_new(""); // This is an invisible separator + button = gtk_label_new(""); /* This is an invisible separator */ gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 12); button = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); - gtk_widget_set_sensitive(button, FALSE); //... + gtk_widget_set_sensitive(button, FALSE); gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); button = gtk_button_new_from_stock(GTK_STOCK_GO_UP); - gtk_widget_set_sensitive(button, FALSE); //... + gtk_widget_set_sensitive(button, FALSE); gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); webSearch_toggle_edit_buttons(n > 0, webSearch); gtk_widget_show_all(GTK_DIALOG(dialog)->vbox); @@ -440,10 +447,10 @@ gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, MidoriBrow switch(event->keyval) { case GDK_Up: - //update_searchEngine(config->searchEngine - 1, browser); + /* update_searchEngine(config->searchEngine - 1, browser); */ return TRUE; case GDK_Down: - //update_searchEngine(config->searchEngine + 1, browser); + /* update_searchEngine(config->searchEngine + 1, browser); */ return TRUE; } return FALSE; @@ -452,21 +459,22 @@ gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, MidoriBrow gboolean on_webSearch_scroll(GtkWidget* webView, GdkEventScroll* event, MidoriBrowser* browser) { if(event->direction == GDK_SCROLL_DOWN) - ;//update_searchEngine(config->searchEngine + 1, browser); + ; /* update_searchEngine(config->searchEngine + 1, browser); */ else if(event->direction == GDK_SCROLL_UP) - ;//update_searchEngine(config->searchEngine - 1, browser); + ; /* update_searchEngine(config->searchEngine - 1, browser); */ return TRUE; } void on_webSearch_activate(GtkWidget* widget, MidoriBrowser* browser) { + MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ const gchar* keywords = gtk_entry_get_text(GTK_ENTRY(widget)); const gchar* url; - MidoriWebItem* web_item = (MidoriWebItem*)g_list_nth_data (searchEngines, 0/*config->searchEngine*/); + MidoriWebItem* web_item = midori_web_list_get_nth_item (search_engines, 0/*config->searchEngine*/); if (web_item) url = midori_web_item_get_uri (web_item); - else // The location search is our fallback - url = "";//config->locationSearch; + else /* The location search is our fallback */ + url = ""; /* config->locationSearch; */ gchar* search; if(strstr(url, "%s")) search = g_strdup_printf(url, keywords); diff --git a/midori/webSearch.h b/midori/webSearch.h index cefa89be..01e8df93 100644 --- a/midori/webSearch.h +++ b/midori/webSearch.h @@ -18,8 +18,6 @@ #include #include -// -- Types - typedef struct { MidoriBrowser* browser; @@ -35,8 +33,6 @@ enum ENGINES_COL_N }; -// -- Declarations - void update_searchEngine(guint, GtkWidget*); diff --git a/po/POTFILES.in b/po/POTFILES.in index 2cdc211f..24033dc6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,8 @@ midori.desktop.in midori/main.c +midori/midori-app.c +midori/midori-addons.c midori/midori-console.c midori/midori-browser.c midori/midori-panel.c @@ -9,9 +11,11 @@ midori/midori-trash.c midori/midori-websettings.c midori/midori-webview.c midori/midori-preferences.c -midori/search.c +midori/midori-webitem.c +midori/midori-weblist.c midori/sokoke.c midori/webSearch.c +midori/gjs.c katze/katze-throbber.c katze/katze-utils.c katze/katze-xbel.c diff --git a/wscript b/wscript index c3070c86..eaaa9fdf 100644 --- a/wscript +++ b/wscript @@ -21,6 +21,7 @@ blddir = '_build_' def configure (conf): conf.check_tool ('compiler_cc') + if not Params.g_options.disable_nls: conf.check_tool ('intltool') if conf.env['INTLTOOL'] and conf.env['POCOM']: @@ -53,6 +54,7 @@ def configure (conf): conf.define ('GETTEXT_PACKAGE', APPNAME) conf.write_config_header ('config.h') + conf.env['CCFLAGS'] += ['-DHAVE_CONFIG_H'] def set_options (opt): opt.tool_options ('compiler_cc') From 7df5d483f93560b4b64ea1f05bb6b7a505b6ba31 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 15 Jun 2008 04:02:56 +0200 Subject: [PATCH 0150/2970] Complete move of webSearch, third step of refactoring web search --- midori/Makefile.am | 2 +- midori/main.c | 12 +- midori/midori-app.c | 24 +- midori/midori-browser.c | 425 +++++++++++++-------- midori/midori-searchentry.c | 735 ++++++++++++++++++++++++++++++++++++ midori/midori-searchentry.h | 61 +++ midori/midori-webitem.c | 10 +- midori/midori-weblist.c | 24 +- midori/sokoke.c | 36 ++ midori/sokoke.h | 5 + midori/webSearch.c | 487 ------------------------ midori/webSearch.h | 57 --- po/POTFILES.in | 2 +- 13 files changed, 1166 insertions(+), 714 deletions(-) create mode 100644 midori/midori-searchentry.c create mode 100644 midori/midori-searchentry.h delete mode 100644 midori/webSearch.c delete mode 100644 midori/webSearch.h diff --git a/midori/Makefile.am b/midori/Makefile.am index 55db4c0c..fe0c9e5a 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -29,7 +29,7 @@ midori_SOURCES = \ midori-webview.c midori-webview.h \ midori-websettings.c midori-websettings.h \ midori-preferences.c midori-preferences.h \ - webSearch.c webSearch.h \ + midori-searchentry.c midori-searchentry.h \ gjs.c gjs.h \ sokoke.c sokoke.h \ compat.c compat.h diff --git a/midori/main.c b/midori/main.c index de04460a..ee78f140 100644 --- a/midori/main.c +++ b/midori/main.c @@ -509,10 +509,7 @@ main (int argc, stock_items_init (); - MidoriApp* app = midori_app_new (); - midori_app_set_settings (app, settings); - - MidoriTrash* trash = midori_app_get_trash (app); + MidoriTrash* trash = midori_trash_new (10); guint n = katze_xbel_folder_get_n_items (xbel_trash); guint i; for (i = 0; i < n; i++) @@ -521,9 +518,16 @@ main (int argc, midori_trash_prepend_xbel_item (trash, item); } + MidoriApp* app = g_object_new (MIDORI_TYPE_APP, + "settings", settings, + "trash", trash, + "search-engines", search_engines, + NULL); + MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", settings, "trash", trash, + "search-engines", search_engines, NULL); midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); diff --git a/midori/midori-app.c b/midori/midori-app.c index df406911..6cab3403 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -11,6 +11,8 @@ #include "midori-app.h" +#include "midori-weblist.h" + #include #include @@ -24,6 +26,7 @@ struct _MidoriApp MidoriWebSettings* settings; MidoriTrash* trash; + MidoriWebList* search_engines; }; G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) @@ -37,7 +40,8 @@ enum PROP_SETTINGS, PROP_TRASH, PROP_BROWSER, - PROP_BROWSER_COUNT + PROP_BROWSER_COUNT, + PROP_SEARCH_ENGINES }; enum { @@ -138,6 +142,15 @@ midori_app_class_init (MidoriAppClass* class) _("The current number of browsers"), 0, G_MAXUINT, 0, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_SEARCH_ENGINES, + g_param_spec_object ( + "search-engines", + _("Search Engines"), + _("The list of search engines"), + MIDORI_TYPE_WEB_LIST, + G_PARAM_READWRITE)); } static GObject* @@ -163,6 +176,7 @@ midori_app_init (MidoriApp* app) app->settings = midori_web_settings_new (); app->trash = midori_trash_new (10); + app->search_engines = midori_web_list_new (); } static void @@ -199,6 +213,11 @@ midori_app_set_property (GObject* object, g_object_ref (app->trash); /* FIXME: Propagate trash to all browsers */ break; + case PROP_SEARCH_ENGINES: + katze_object_assign (app->search_engines, g_value_get_object (value)); + g_object_ref (app->search_engines); + /* FIXME: Propagate search engines to all browsers */ + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -227,6 +246,9 @@ midori_app_get_property (GObject* object, case PROP_BROWSER_COUNT: g_value_set_uint (value, g_list_length (app->browsers)); break; + case PROP_SEARCH_ENGINES: + g_value_set_object (value, app->search_engines); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5ef05de8..5947520f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -13,8 +13,6 @@ #include "midori-browser.h" -#include "webSearch.h" - #include "main.h" #include "sokoke.h" #include "midori-webview.h" @@ -23,6 +21,7 @@ #include "midori-addons.h" #include "midori-console.h" #include "midori-trash.h" +#include "midori-searchentry.h" #include #include @@ -72,6 +71,7 @@ struct _MidoriBrowserPrivate KatzeXbelItem* proxy_xbel_folder; MidoriTrash* trash; + MidoriWebList* search_engines; }; #define MIDORI_BROWSER_GET_PRIVATE(obj) \ @@ -88,7 +88,8 @@ enum PROP_STATUSBAR, PROP_SETTINGS, PROP_STATUSBAR_TEXT, - PROP_TRASH + PROP_TRASH, + PROP_SEARCH_ENGINES }; enum @@ -503,7 +504,160 @@ midori_web_view_destroy_cb (GtkWidget* widget, } static void -_midori_browser_will_quit (MidoriBrowser* browser) +midori_browser_window_menu_item_activate_cb (GtkWidget* widget, + GtkWidget* web_view) +{ + MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (web_view)); + if (!browser) + { + g_warning ("Orphaned web view"); + return; + } + + MidoriBrowserPrivate* priv = browser->priv; + + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); + guint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); +} + +static gint +_midori_browser_add_tab (MidoriBrowser* browser, + GtkWidget* widget) +{ + MidoriBrowserPrivate* priv; + GtkWidget* scrolled; + GtkWidget* child; + GObjectClass* gobject_class; + GtkWidget* label; + GtkWidget* menuitem; + KatzeXbelItem* xbel_item; + guint n; + + priv = browser->priv; + scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gobject_class = G_OBJECT_GET_CLASS (widget); + if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) + child = widget; + else + { + child = gtk_viewport_new (NULL, NULL); + gtk_widget_show (child); + gtk_container_add (GTK_CONTAINER (child), widget); + } + gtk_container_add (GTK_CONTAINER (scrolled), child); + gtk_widget_show (scrolled); + + label = NULL; + menuitem = NULL; + if (MIDORI_IS_WEB_VIEW (widget)) + { + label = midori_web_view_get_proxy_tab_label (MIDORI_WEB_VIEW (widget)); + menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); + + if (priv->proxy_xbel_folder) + { + xbel_item = midori_web_view_get_proxy_xbel_item ( + MIDORI_WEB_VIEW (widget)); + katze_xbel_item_ref (xbel_item); + katze_xbel_folder_append_item (priv->proxy_xbel_folder, xbel_item); + } + + g_object_connect (widget, + "signal::window-object-cleared", + midori_web_view_window_object_cleared_cb, browser, + "signal::load-started", + midori_web_view_load_started_cb, browser, + "signal::load-committed", + midori_web_view_load_committed_cb, browser, + "signal::progress-started", + midori_web_view_progress_started_cb, browser, + "signal::progress-changed", + midori_web_view_progress_changed_cb, browser, + "signal::progress-done", + midori_web_view_progress_done_cb, browser, + "signal::load-done", + midori_web_view_load_done_cb, browser, + "signal::title-changed", + midori_web_view_title_changed_cb, browser, + "signal::status-bar-text-changed", + midori_web_view_statusbar_text_changed_cb, browser, + "signal::element-motion", + midori_web_view_element_motion_cb, browser, + "signal::console-message", + midori_web_view_console_message_cb, browser, + "signal::close", + midori_web_view_close_cb, browser, + "signal::new-tab", + midori_web_view_new_tab_cb, browser, + "signal::new-window", + midori_web_view_new_window_cb, browser, + "signal::populate-popup", + midori_web_view_populate_popup_cb, browser, + "signal::leave-notify-event", + midori_web_view_leave_notify_event_cb, browser, + "signal::destroy", + midori_web_view_destroy_cb, browser, + NULL); + } + + if (menuitem) + { + gtk_widget_show (menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); + } + + n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), scrolled, + label, n + 1); + #if GTK_CHECK_VERSION(2, 10, 0) + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), + scrolled, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), + scrolled, TRUE); + #endif + _midori_browser_update_actions (browser); + + n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + return n; +} + +static gint +_midori_browser_add_uri (MidoriBrowser* browser, + const gchar* uri) +{ + MidoriBrowserPrivate* priv; + GtkWidget* web_view; + + priv = browser->priv; + web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", uri, + "settings", priv->settings, + NULL); + gtk_widget_show (web_view); + + return midori_browser_add_tab (browser, web_view); +} + +static void +_midori_browser_activate_action (MidoriBrowser* browser, + const gchar* name) +{ + GtkAction* action = _action_by_name (browser, name); + if (action) + gtk_action_activate (action); + else + g_warning (_("Unexpected action '%s'."), name); +} + +static void +_midori_browser_quit (MidoriBrowser* browser) { /* Nothing to do */ } @@ -702,10 +856,10 @@ midori_browser_class_init (MidoriBrowserClass* class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - class->add_tab = midori_browser_add_tab; - class->add_uri = midori_browser_add_uri; - class->activate_action = midori_browser_activate_action; - class->quit = _midori_browser_will_quit; + class->add_tab = _midori_browser_add_tab; + class->add_uri = _midori_browser_add_uri; + class->activate_action = _midori_browser_activate_action; + class->quit = _midori_browser_quit; GObjectClass* gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_browser_finalize; @@ -806,6 +960,20 @@ midori_browser_class_init (MidoriBrowserClass* class) MIDORI_TYPE_TRASH, G_PARAM_READWRITE)); + /** + * MidoriBrowser:search-engines: + * + * The list of search engines to be used for web search. + */ + g_object_class_install_property (gobject_class, + PROP_SEARCH_ENGINES, + g_param_spec_object ( + "search-engines", + _("Search Engines"), + _("The list of search engines to be used for web search"), + MIDORI_TYPE_WEB_LIST, + G_PARAM_READWRITE)); + g_type_class_add_private (class, sizeof (MidoriBrowserPrivate)); } @@ -1334,7 +1502,7 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, { g_object_get (priv->settings, "location-entry-search", &location_entry_search, NULL); - gchar* new_uri = sokoke_magic_uri (uri, NULL/*search_engines*/); + gchar* new_uri = sokoke_magic_uri (uri, priv->search_engines); if (!new_uri) new_uri = g_strdup (location_entry_search); g_free (location_entry_search); @@ -1848,13 +2016,19 @@ static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) { + MidoriBrowserPrivate* priv; + static GtkWidget* dialog = NULL; + /* Show the Manage search engines dialog. Create it if necessary. */ - static GtkWidget* dialog; - if (GTK_IS_DIALOG (dialog)) + if (dialog) gtk_window_present (GTK_WINDOW (dialog)); else { - dialog = webSearch_manageSearchEngines_dialog_new (browser); + priv = browser->priv; + dialog = midori_search_entry_get_dialog ( + MIDORI_SEARCH_ENTRY (priv->search)); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_widget_show (dialog); } } @@ -1882,24 +2056,6 @@ _action_tab_next_activate (GtkAction* action, gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n + 1); } -static void -midori_browser_window_menu_item_activate_cb (GtkWidget* widget, - GtkWidget* web_view) -{ - MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (web_view)); - if (!browser) - { - g_warning ("Orphaned web view"); - return; - } - - MidoriBrowserPrivate* priv = browser->priv; - - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); - guint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); -} - static const gchar* credits_authors[] = { "Christian Dywan ", NULL }; static const gchar* credits_documenters/*[]*/ = /*{ @@ -2558,6 +2714,46 @@ midori_browser_realize_cb (GtkStyle* style, MidoriBrowser* browser) } } +static void +midori_browser_search_activate (GtkWidget* widget, + MidoriBrowser* browser) +{ + MidoriBrowserPrivate* priv; + MidoriWebList* search_engines; + const gchar* keywords; + guint last_web_search; + MidoriWebItem* web_item; + const gchar* url; + gchar* location_entry_search; + + priv = browser->priv; + search_engines = priv->search_engines; + keywords = gtk_entry_get_text (GTK_ENTRY (widget)); + g_object_get (priv->settings, "last-web-search", &last_web_search, NULL); + web_item = midori_web_list_get_nth_item (search_engines, last_web_search); + if (web_item) + { + location_entry_search = NULL; + url = midori_web_item_get_uri (web_item); + } + else /* The location entry search is our fallback */ + { + g_object_get (priv->settings, "location-entry-search", + &location_entry_search, NULL); + url = location_entry_search; + } + gchar* search; + if (strstr (url, "%s")) + search = g_strdup_printf (url, keywords); + else + search = g_strconcat (url, " ", keywords, NULL); + sokoke_entry_append_completion (GTK_ENTRY (widget), keywords); + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), search); + g_free (search); + g_free (location_entry_search); +} + static void midori_browser_init (MidoriBrowser* browser) { @@ -2694,25 +2890,15 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); /* Search */ - priv->search = sexy_icon_entry_new (); - sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (priv->search), - SEXY_ICON_ENTRY_PRIMARY, TRUE); + priv->search = midori_search_entry_new (); /* TODO: Make this actively resizable or enlarge to fit contents? The interface is somewhat awkward and ought to be rethought Display "show in context menu" search engines as "completion actions" */ sokoke_entry_setup_completion (GTK_ENTRY (priv->search)); - g_object_connect (priv->search, - "signal::icon-released", - on_webSearch_icon_released, browser, - "signal::key-press-event", - on_webSearch_key_down, browser, - "signal::scroll-event", - on_webSearch_scroll, browser, - "signal::activate", - on_webSearch_activate, browser, - "signal::focus-out-event", - midori_browser_search_focus_out_event_cb, browser, - NULL); + g_signal_connect (priv->search, "activate", + G_CALLBACK (midori_browser_search_activate), browser); + g_signal_connect (priv->search, "focus-out-event", + G_CALLBACK (midori_browser_search_focus_out_event_cb), browser); toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), priv->search); gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); @@ -3005,6 +3191,8 @@ midori_browser_finalize (GObject* object) g_object_unref (priv->settings); if (priv->trash) g_object_unref (priv->trash); + if (priv->search_engines) + g_object_unref (priv->search_engines); G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } @@ -3044,7 +3232,8 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, static void _midori_browser_update_settings (MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; + MidoriBrowserPrivate* priv; + MidoriWebItem* web_item; gboolean remember_last_window_size; gint last_window_width, last_window_height; @@ -3055,6 +3244,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) MidoriToolbarStyle toolbar_style; gint last_web_search; gchar* last_pageholder_uri; + + priv = browser->priv; g_object_get (priv->settings, "remember-last-window-size", &remember_last_window_size, "last-window-width", &last_window_width, @@ -3094,7 +3285,14 @@ _midori_browser_update_settings (MidoriBrowser* browser) small_toolbar ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR); - update_searchEngine (last_web_search, priv->search); + if (priv->search_engines) + { + web_item = midori_web_list_get_nth_item (priv->search_engines, + last_web_search); + if (web_item) + midori_search_entry_set_current_item (MIDORI_SEARCH_ENTRY (priv->search), + web_item); + } gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (priv->panel)), last_panel_position); @@ -3191,6 +3389,15 @@ midori_browser_set_property (GObject* object, /* FIXME: Connect to updates */ _midori_browser_update_actions (browser); break; + case PROP_SEARCH_ENGINES: + ; /* FIXME: Disconnect handlers */ + katze_object_assign (priv->search_engines, g_value_get_object (value)); + g_object_ref (priv->search_engines); + g_object_set (priv->search, "search-engines", + priv->search_engines, NULL); + /* FIXME: Connect to updates */ + _midori_browser_update_actions (browser); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -3229,6 +3436,9 @@ midori_browser_get_property (GObject* object, case PROP_TRASH: g_value_set_object (value, priv->trash); break; + case PROP_SEARCH_ENGINES: + g_value_set_object (value, priv->search_engines); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -3268,104 +3478,10 @@ gint midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* widget) { - g_return_val_if_fail (GTK_IS_WIDGET (widget), -1); + gint index; - MidoriBrowserPrivate* priv = browser->priv; - - GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); - GtkWidget* child; - GObjectClass* gobject_class = G_OBJECT_GET_CLASS (widget); - if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) - child = widget; - else - { - child = gtk_viewport_new (NULL, NULL); - gtk_widget_show (child); - gtk_container_add (GTK_CONTAINER (child), widget); - } - gtk_container_add (GTK_CONTAINER (scrolled), child); - gtk_widget_show (scrolled); - - GtkWidget* label = NULL; - GtkWidget* menuitem = NULL; - - if (MIDORI_IS_WEB_VIEW (widget)) - { - label = midori_web_view_get_proxy_tab_label (MIDORI_WEB_VIEW (widget)); - - menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); - - if (priv->proxy_xbel_folder) - { - KatzeXbelItem* xbel_item = midori_web_view_get_proxy_xbel_item ( - MIDORI_WEB_VIEW (widget)); - katze_xbel_item_ref (xbel_item); - katze_xbel_folder_append_item (priv->proxy_xbel_folder, xbel_item); - } - - g_object_connect (widget, - "signal::window-object-cleared", - midori_web_view_window_object_cleared_cb, browser, - "signal::load-started", - midori_web_view_load_started_cb, browser, - "signal::load-committed", - midori_web_view_load_committed_cb, browser, - "signal::progress-started", - midori_web_view_progress_started_cb, browser, - "signal::progress-changed", - midori_web_view_progress_changed_cb, browser, - "signal::progress-done", - midori_web_view_progress_done_cb, browser, - "signal::load-done", - midori_web_view_load_done_cb, browser, - "signal::title-changed", - midori_web_view_title_changed_cb, browser, - "signal::status-bar-text-changed", - midori_web_view_statusbar_text_changed_cb, browser, - "signal::element-motion", - midori_web_view_element_motion_cb, browser, - "signal::console-message", - midori_web_view_console_message_cb, browser, - "signal::close", - midori_web_view_close_cb, browser, - "signal::new-tab", - midori_web_view_new_tab_cb, browser, - "signal::new-window", - midori_web_view_new_window_cb, browser, - "signal::populate-popup", - midori_web_view_populate_popup_cb, browser, - "signal::leave-notify-event", - midori_web_view_leave_notify_event_cb, browser, - "signal::destroy", - midori_web_view_destroy_cb, browser, - NULL); - } - - if (menuitem) - { - gtk_widget_show (menuitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); - } - - guint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); - gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), scrolled, - label, n + 1); - #if GTK_CHECK_VERSION(2, 10, 0) - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), - scrolled, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), - scrolled, TRUE); - #endif - _midori_browser_update_actions (browser); - - n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - return n; + g_signal_emit (browser, signals[ADD_TAB], 0, widget, &index); + return index; } /** @@ -3429,15 +3545,10 @@ gint midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri) { - MidoriBrowserPrivate* priv = browser->priv; + gint index; - GtkWidget* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", uri, - "settings", priv->settings, - NULL); - gtk_widget_show (web_view); - - return midori_browser_add_tab (browser, web_view); + g_signal_emit (browser, signals[ADD_URI], 0, uri, &index); + return index; } /** @@ -3451,11 +3562,7 @@ void midori_browser_activate_action (MidoriBrowser* browser, const gchar* name) { - GtkAction* action = _action_by_name (browser, name); - if (action) - gtk_action_activate (action); - else - g_warning (_("Unexpected action '%s'."), name); + g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name); } /** @@ -3614,6 +3721,10 @@ midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser) * @browser: a #MidoriBrowser * * Quits the browser, including any other browser windows. + * + * This function relys on the application implementing + * the MidoriBrowser::quit signal. If the browser was added + * to the MidoriApp, this is handled automatically. **/ void midori_browser_quit (MidoriBrowser* browser) diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c new file mode 100644 index 00000000..e3c30566 --- /dev/null +++ b/midori/midori-searchentry.c @@ -0,0 +1,735 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-searchentry.h" + +#include "sokoke.h" + +#include +#include +#include + +struct _MidoriSearchEntry +{ + SexyIconEntry parent_instance; + + GtkWidget* dialog; + GtkWidget* treeview; + GtkWidget* edit_button; + GtkWidget* remove_button; + + MidoriWebList* search_engines; + MidoriWebItem* current_item; +}; + +G_DEFINE_TYPE (MidoriSearchEntry, midori_search_entry, SEXY_TYPE_ICON_ENTRY) + +enum +{ + PROP_0, + + PROP_SEARCH_ENGINES, + PROP_CURRENT_ITEM, + PROP_DIALOG +}; + +static void +midori_search_entry_finalize (GObject* object); + +static void +midori_search_entry_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_search_entry_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_search_entry_class_init (MidoriSearchEntryClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_search_entry_finalize; + gobject_class->set_property = midori_search_entry_set_property; + gobject_class->get_property = midori_search_entry_get_property; + + g_object_class_install_property (gobject_class, + PROP_SEARCH_ENGINES, + g_param_spec_object ( + "search-engines", + _("Search Engines"), + _("The list of search engines"), + MIDORI_TYPE_WEB_LIST, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_CURRENT_ITEM, + g_param_spec_object ( + "current-item", + _("Current Item"), + _("The currently selected item"), + MIDORI_TYPE_WEB_ITEM, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_DIALOG, + g_param_spec_object ( + "dialog", + _("Dialog"), + _("A dialog to manage search engines"), + GTK_TYPE_DIALOG, + G_PARAM_READABLE)); +} + +static void +midori_search_entry_engine_activate_cb (GtkWidget* widget, + MidoriSearchEntry* search_entry) +{ + MidoriWebItem* web_item; + + web_item = (MidoriWebItem*)g_object_get_data (G_OBJECT (widget), "engine"); + midori_search_entry_set_current_item (search_entry, web_item); +} + +static void +midori_search_entry_icon_released_cb (GtkWidget* widget, + SexyIconEntryPosition* pos, + gint button) +{ + MidoriSearchEntry* search_entry; + MidoriWebList* search_engines; + GtkWidget* menu; + guint n, i; + GtkWidget* menuitem; + MidoriWebItem* web_item; + GdkPixbuf* pixbuf; + GtkWidget* icon; + + search_entry = MIDORI_SEARCH_ENTRY (widget); + search_engines = search_entry->search_engines; + menu = gtk_menu_new (); + n = midori_web_list_get_length (search_engines); + if (n) + { + for (i = 0; i < n; i++) + { + web_item = midori_web_list_get_nth_item (search_engines, i); + menuitem = gtk_image_menu_item_new_with_label ( + midori_web_item_get_name (web_item)); + pixbuf = sokoke_web_icon (midori_web_item_get_icon (web_item), + GTK_ICON_SIZE_MENU, menuitem); + icon = gtk_image_new_from_pixbuf (pixbuf); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + g_object_unref (pixbuf); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "engine", web_item); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_search_entry_engine_activate_cb), widget); + gtk_widget_show (menuitem); + } + } + else + { + menuitem = gtk_image_menu_item_new_with_label (_("Empty")); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } + + /*menuitem = gtk_separator_menu_item_new(); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); + GtkAction* action = gtk_action_group_get_action( + browser->actiongroup, "ManageSearchEngines"); + menuitem = gtk_action_create_menu_item(action); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem);*/ + sokoke_widget_popup (widget, GTK_MENU (menu), + NULL, SOKOKE_MENU_POSITION_LEFT); +} + +static gboolean +midori_search_entry_key_press_event_cb (GtkWidget* widget, + GdkEventKey* event) +{ + GdkModifierType state; + gint x, y; + + gdk_window_get_pointer (NULL, &x, &y, &state); + if (!(state & GDK_CONTROL_MASK)) + return FALSE; + switch (event->keyval) + { + case GDK_Up: + /* update_searchEngine(config->searchEngine - 1, browser); */ + return TRUE; + case GDK_Down: + /* update_searchEngine(config->searchEngine + 1, browser); */ + return TRUE; + } + return FALSE; +} + +static gboolean +midori_search_entry_scroll_event_cb (GtkWidget* widget, + GdkEventScroll* event) +{ + if (event->direction == GDK_SCROLL_DOWN) + ; /* update_searchEngine(config->searchEngine + 1, browser); */ + else if (event->direction == GDK_SCROLL_UP) + ; /* update_searchEngine(config->searchEngine - 1, browser); */ + return TRUE; +} + +static void +midori_search_entry_init (MidoriSearchEntry* search_entry) +{ + search_entry->dialog = NULL; + + search_entry->search_engines = midori_web_list_new (); + search_entry->current_item = NULL; + + sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (search_entry), + SEXY_ICON_ENTRY_PRIMARY, TRUE); + g_object_connect (search_entry, + "signal::icon-released", + midori_search_entry_icon_released_cb, NULL, + "signal::key-press-event", + midori_search_entry_key_press_event_cb, NULL, + "signal::scroll-event", + midori_search_entry_scroll_event_cb, NULL, + NULL); +} + +static void +midori_search_entry_finalize (GObject* object) +{ + MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); + + g_object_unref (search_entry->search_engines); + + G_OBJECT_CLASS (midori_search_entry_parent_class)->finalize (object); +} + +static void +midori_search_entry_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); + + switch (prop_id) + { + case PROP_SEARCH_ENGINES: + search_entry->search_engines = g_value_get_object (value); + break; + case PROP_CURRENT_ITEM: + search_entry->current_item = g_value_get_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_search_entry_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); + + switch (prop_id) + { + case PROP_SEARCH_ENGINES: + g_value_set_object (value, search_entry->search_engines); + break; + case PROP_CURRENT_ITEM: + g_value_set_object (value, search_entry->current_item); + break; + case PROP_DIALOG: + g_value_set_object (value, midori_search_entry_get_dialog (search_entry)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_search_entry_new: + * + * Creates a new #MidoriSearchEntry. + * + * Return value: a new #MidoriSearchEntry + **/ +GtkWidget* +midori_search_entry_new (void) +{ + GtkWidget* search_entry = g_object_new (MIDORI_TYPE_SEARCH_ENTRY, NULL); + + return search_entry; +} + +/** + * midori_search_entry_get_search_engines: + * @search_entry: a #MidoriSearchEntry + * + * Retrieves the list of search engines. + * + * Return value: the list of search engines + **/ +MidoriWebList* +midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry) +{ + g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); + + return search_entry->search_engines; +} + +/** + * midori_search_entry_set_search_engines: + * @search_entry: a #MidoriSearchEntry + * @search_engines: a list of search engines + * + * Sets the list of search engines. + **/ +void +midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, + MidoriWebList* search_engines) +{ + g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); + + g_object_ref (search_engines); + katze_object_assign (search_entry->search_engines, search_engines); + g_object_notify (G_OBJECT (search_entry), "search-engines"); +} + +/** + * midori_search_entry_set_current_item: + * @search_entry: a #MidoriSearchEntry + * @item: a #MidoriWebItem + * + * Looks up the specified item in the list of search engines and makes + * it the currently selected item. + * + * This function fails if @item is not in the current list. + **/ +void +midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, + MidoriWebItem* web_item) +{ + GdkPixbuf* pixbuf; + + g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); + g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + + pixbuf = sokoke_web_icon (midori_web_item_get_icon (web_item), + GTK_ICON_SIZE_MENU, GTK_WIDGET (search_entry)); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (search_entry), + SEXY_ICON_ENTRY_PRIMARY, + GTK_IMAGE (gtk_image_new_from_pixbuf (pixbuf))); + g_object_unref (pixbuf); + sokoke_entry_set_default_text (GTK_ENTRY (search_entry), + midori_web_item_get_name (web_item)); + search_entry->current_item = web_item; + g_object_notify (G_OBJECT (search_entry), "current-item"); +} + +/** + * midori_search_entry_get_current_item: + * @search_entry: a #MidoriSearchEntry + * + * Retrieves the currently selected item. + * + * Return value: the selected web item, or %NULL + **/ +MidoriWebItem* +midori_search_entry_get_current_item (MidoriSearchEntry* search_entry) +{ + g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); + + return search_entry->current_item; +} + +static void +midori_search_entry_dialog_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriWebItem* web_item; + const gchar* icon; + GdkPixbuf* pixbuf; + + gtk_tree_model_get (model, iter, 0, &web_item, -1); + + icon = midori_web_item_get_icon (web_item); + if (icon) + { + pixbuf = sokoke_web_icon (icon, GTK_ICON_SIZE_DND, treeview); + g_object_set (renderer, "pixbuf", pixbuf, NULL); + if (pixbuf) + g_object_unref (pixbuf); + } + else + g_object_set (renderer, "pixbuf", NULL, NULL); +} + +static void +midori_search_entry_dialog_render_text (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriWebItem* web_item; + const gchar* name; + const gchar* description; + gchar* markup; + + gtk_tree_model_get (model, iter, 0, &web_item, -1); + name = midori_web_item_get_name (web_item); + description = midori_web_item_get_description (web_item); + markup = g_markup_printf_escaped ("%s\n%s", name, description); + g_object_set (renderer, "markup", markup, NULL); + g_free (markup); +} + +static void +midori_search_entry_editor_name_changed_cb (GtkWidget* widget, + GtkWidget* dialog) +{ + const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget)); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, text && *text); +} + +const gchar* +STR_NON_NULL (const gchar* string) +{ + return string ? string : ""; +} + +static void +midori_search_entry_get_editor (MidoriSearchEntry* search_entry, + gboolean new_engine, + GtkWindow* transient_for) +{ + MidoriWebList* search_engines; + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + MidoriWebItem* web_item; + GtkWidget* hbox; + GtkWidget* label; + GtkTreeModel* liststore; + GtkTreeIter iter; + GtkWidget* treeview; + GtkTreeSelection* selection; + GtkWidget* entry_name; + GtkWidget* entry_description; + GtkWidget* entry_uri; + GtkWidget* entry_icon; + GtkWidget* entry_token; + + search_engines = search_entry->search_engines; + treeview = search_entry->treeview; + + dialog = gtk_dialog_new_with_buttons ( + new_engine ? _("Add search engine") : _("Edit search engine"), + transient_for ? GTK_WINDOW (transient_for) : NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + new_engine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), + new_engine ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + if (new_engine) + { + web_item = midori_web_item_new (); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, FALSE); + } + else + { + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + gtk_tree_selection_get_selected (selection, &liststore, &iter); + gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); + } + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Name:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_name = gtk_entry_new (); + g_signal_connect (entry_name, "changed", + G_CALLBACK (midori_search_entry_editor_name_changed_cb), dialog); + gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_name), + STR_NON_NULL (midori_web_item_get_name (web_item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Description:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_description = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_description) + , STR_NON_NULL (midori_web_item_get_description (web_item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_URL:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_uri = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_uri) + , STR_NON_NULL (midori_web_item_get_uri (web_item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Icon (name or file):")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_icon = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_icon) + , STR_NON_NULL (midori_web_item_get_icon (web_item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER(hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Token:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_token = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_token) + , STR_NON_NULL (midori_web_item_get_token (web_item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + g_object_set (web_item, + "name", gtk_entry_get_text (GTK_ENTRY (entry_name)), + "description", gtk_entry_get_text (GTK_ENTRY (entry_description)), + "uri", gtk_entry_get_text (GTK_ENTRY (entry_uri)), + "icon", gtk_entry_get_text (GTK_ENTRY (entry_icon)), + "token", gtk_entry_get_text (GTK_ENTRY (entry_token)), + NULL); + + if (new_engine) + { + midori_web_list_add_item (search_engines, web_item); + liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + gtk_list_store_append (GTK_LIST_STORE (liststore), &iter); + } + gtk_list_store_set (GTK_LIST_STORE (liststore), &iter, + 0, web_item, -1); + } + gtk_widget_destroy (dialog); +} + +static void +midori_search_entry_dialog_add_cb (GtkWidget* widget, + MidoriSearchEntry* search_entry) +{ + midori_search_entry_get_editor (search_entry, TRUE, + GTK_WINDOW (search_entry->dialog)); +} + +static void +midori_search_entry_dialog_edit_cb (GtkWidget* widget, + MidoriSearchEntry* search_entry) +{ + midori_search_entry_get_editor (search_entry, FALSE, + GTK_WINDOW (search_entry->dialog)); +} + +static void +midori_search_entry_dialog_remove_cb (GtkWidget* widget, + MidoriSearchEntry* search_entry) +{ + GtkWidget* treeview; + GtkTreeSelection* selection; + GtkTreeModel* liststore; + GtkTreeIter iter; + MidoriWebItem* web_item; + MidoriWebList* search_engines; + + treeview = search_entry->treeview; + search_engines = search_entry->search_engines; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + gtk_tree_selection_get_selected (selection, &liststore, &iter); + gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); + gtk_list_store_remove (GTK_LIST_STORE (liststore), &iter); + g_object_unref (web_item); + midori_web_list_remove_item (search_engines, web_item); + /* FIXME: we want to allow undo of some kind */ +} + +/** + * midori_search_entry_get_dialog: + * @search_entry: a #MidoriSearchEntry + * + * Obtains a dialog that provides an interface for managing + * the list of search engines. + * + * A new dialog is created each time, so it may be a good idea + * to store the pointer for the life time of the dialog. + * + * Return value: a dialog + **/ +GtkWidget* +midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) +{ + const gchar* dialog_title; + GtkWidget* toplevel; + GtkWidget* dialog; + gint width, height; + GtkWidget* xfce_heading; + GtkWidget* hbox; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkListStore* liststore; + GtkWidget* treeview; + GtkWidget* scrolled; + guint n, i; + MidoriWebItem* web_item; + GtkWidget* vbox; + GtkWidget* button; + + g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); + + dialog_title = _("Manage search engines"); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (search_entry)); + dialog = gtk_dialog_new_with_buttons (dialog_title, + toplevel ? GTK_WINDOW (toplevel) : NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_HELP, GTK_RESPONSE_HELP, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + NULL); + search_entry->dialog = dialog; + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); + /* TODO: Implement some kind of help function */ + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_HELP, FALSE); + sokoke_widget_get_text_size (dialog, "M", &width, &height); + gtk_window_set_default_size (GTK_WINDOW (dialog), width * 45, -1); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + /* TODO: Do we want tooltips for explainations or can we omit that? + We need mnemonics */ + if ((xfce_heading = sokoke_xfce_header_new ( + gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + xfce_heading, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + TRUE, TRUE, 12); + liststore = gtk_list_store_new (1, MIDORI_TYPE_WEB_ITEM); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + search_entry->treeview = treeview; + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_search_entry_dialog_render_icon_cb, + treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_search_entry_dialog_render_text, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scrolled), treeview); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), + GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); + n = midori_web_list_get_length (search_entry->search_engines); + for (i = 0; i < n; i++) + { + web_item = midori_web_list_get_nth_item (search_entry->search_engines, i); + gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), + NULL, i, 0, web_item, -1); + } + g_object_unref (liststore); + vbox = gtk_vbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); + button = gtk_button_new_from_stock (GTK_STOCK_ADD); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_entry_dialog_add_cb), search_entry); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_from_stock (GTK_STOCK_EDIT); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_entry_dialog_edit_cb), search_entry); + gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0); + search_entry->edit_button = button; + if (!n) + gtk_widget_set_sensitive (button, FALSE); + button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_entry_dialog_remove_cb), search_entry); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + if (!n) + gtk_widget_set_sensitive (button, FALSE); + search_entry->remove_button = button; + button = gtk_label_new (""); /* This is an invisible separator */ + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); + button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); + gtk_widget_set_sensitive (button, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_from_stock (GTK_STOCK_GO_UP); + gtk_widget_set_sensitive (button, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + + /* TODO: Connect to MidoriWebList::add_item and ::remove_item */ + + return dialog; +} diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h new file mode 100644 index 00000000..f9295085 --- /dev/null +++ b/midori/midori-searchentry.h @@ -0,0 +1,61 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_SEARCH_ENTRY_H__ +#define __MIDORI_SEARCH_ENTRY_H__ + +#include "midori-weblist.h" + +#include +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_SEARCH_ENTRY \ + (midori_search_entry_get_type ()) +#define MIDORI_SEARCH_ENTRY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_SEARCH_ENTRY, MidoriSearchEntry)) +#define MIDORI_SEARCH_ENTRY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_SEARCH_ENTRY, MidoriSearchEntryClass)) +#define MIDORI_IS_SEARCH_ENTRY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_SEARCH_ENTRY)) +#define MIDORI_IS_SEARCH_ENTRY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_SEARCH_ENTRY)) +#define MIDORI_SEARCH_ENTRY_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_SEARCH_ENTRY, MidoriSearchEntryClass)) + +typedef struct _MidoriSearchEntry MidoriSearchEntry; +typedef struct _MidoriSearchEntryClass MidoriSearchEntryClass; + +struct _MidoriSearchEntryClass +{ + SexyIconEntryClass parent_class; +}; + +GType +midori_search_entry_get_type (void); + +GtkWidget* +midori_search_entry_new (void); + +MidoriWebItem* +midori_search_entry_get_current_item (MidoriSearchEntry* search_entry); + +void +midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, + MidoriWebItem* name); + +GtkWidget* +midori_search_entry_get_dialog (MidoriSearchEntry* search_entry); + +G_END_DECLS + +#endif /* __MIDORI_SEARCH_ENTRY_H__ */ diff --git a/midori/midori-webitem.c b/midori/midori-webitem.c index bf74aff3..b74bbff1 100644 --- a/midori/midori-webitem.c +++ b/midori/midori-webitem.c @@ -114,12 +114,20 @@ midori_web_item_class_init (MidoriWebItemClass* class) static void midori_web_item_init (MidoriWebItem* web_item) { - // Nothing to do here + /* Nothing to do here */ } static void midori_web_item_finalize (GObject* object) { + MidoriWebItem* web_item = MIDORI_WEB_ITEM (object); + + g_free (web_item->name); + g_free (web_item->description); + g_free (web_item->uri); + g_free (web_item->icon); + g_free (web_item->token); + G_OBJECT_CLASS (midori_web_item_parent_class)->finalize (object); } diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c index 6976204d..6d1f9a26 100644 --- a/midori/midori-weblist.c +++ b/midori/midori-weblist.c @@ -35,6 +35,21 @@ static guint signals[LAST_SIGNAL]; static void midori_web_list_finalize (GObject* object); +static void +_midori_web_list_add_item (MidoriWebList* web_list, + MidoriWebItem* web_item) +{ + g_object_ref (web_item); + web_list->items = g_list_append (web_list->items, web_item); +} + +static void +_midori_web_list_remove_item (MidoriWebList* web_list, + MidoriWebItem* web_item) +{ + web_list->items = g_list_remove (web_list->items, web_item); +} + static void midori_web_list_class_init (MidoriWebListClass* class) { @@ -60,8 +75,8 @@ midori_web_list_class_init (MidoriWebListClass* class) G_TYPE_NONE, 1, MIDORI_TYPE_WEB_ITEM); - class->add_item = midori_web_list_add_item; - class->remove_item = midori_web_list_remove_item; + class->add_item = _midori_web_list_add_item; + class->remove_item = _midori_web_list_remove_item; GObjectClass* gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_web_list_finalize; @@ -111,8 +126,7 @@ void midori_web_list_add_item (MidoriWebList* web_list, MidoriWebItem* web_item) { - g_object_ref (web_item); - web_list->items = g_list_append (web_list->items, web_item); + g_signal_emit (web_list, signals[ADD_ITEM], 0, web_item); } /** @@ -126,7 +140,7 @@ void midori_web_list_remove_item (MidoriWebList* web_list, MidoriWebItem* web_item) { - web_list->items = g_list_remove (web_list->items, web_item); + g_signal_emit (web_list, signals[REMOVE_ITEM], 0, web_item); } /** diff --git a/midori/sokoke.c b/midori/sokoke.c index 3f5afeca..b7024e91 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -473,3 +473,39 @@ sokoke_widget_get_text_size (GtkWidget* widget, pango_layout_get_pixel_size (layout, width, height); g_object_unref (layout); } + +GdkPixbuf* +sokoke_web_icon (const gchar* icon, + GtkIconSize size, + GtkWidget* widget) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); + + GdkPixbuf* pixbuf = NULL; + if (icon && *icon) + { + /* TODO: We want to allow http as well, maybe also base64? */ + const gchar* icon_ready = g_str_has_prefix (icon, "file://") + ? &icon[7] : icon; + GtkStockItem stock_id; + if (gtk_stock_lookup (icon, &stock_id)) + pixbuf = gtk_widget_render_icon (widget, icon_ready, size, NULL); + else + { + gint width, height; + gtk_icon_size_lookup (size, &width, &height); + if (gtk_widget_has_screen (widget)) + { + GdkScreen* screen = gtk_widget_get_screen (widget); + pixbuf = gtk_icon_theme_load_icon ( + gtk_icon_theme_get_for_screen (screen), icon, + MAX (width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + } + } + if (!pixbuf) + pixbuf = gdk_pixbuf_new_from_file_at_size (icon_ready, 16, 16, NULL); + } + if (!pixbuf) + pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FIND, size, NULL); + return pixbuf; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 2fa36bf0..a2b14afc 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -109,4 +109,9 @@ sokoke_widget_get_text_size (GtkWidget* widget, gint* width, gint* height); +GdkPixbuf* +sokoke_web_icon (const gchar* icon, + GtkIconSize size, + GtkWidget* widget); + #endif /* !__SOKOKE_H__ */ diff --git a/midori/webSearch.c b/midori/webSearch.c deleted file mode 100644 index 36b2d226..00000000 --- a/midori/webSearch.c +++ /dev/null @@ -1,487 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "webSearch.h" - -#include "search.h" - -#include "main.h" -#include "sokoke.h" - -#include "midori-webitem.h" - -#include -#include -#include - -static GdkPixbuf* -load_web_icon (const gchar* icon, GtkIconSize size, GtkWidget* widget) -{ - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - GdkPixbuf* pixbuf = NULL; - if (icon && *icon) - { - /* TODO: We want to allow http as well, maybe also base64? */ - const gchar* icon_ready = g_str_has_prefix (icon, "file://") - ? &icon[7] : icon; - GtkStockItem stock_id; - if (gtk_stock_lookup (icon, &stock_id)) - pixbuf = gtk_widget_render_icon (widget, icon_ready, size, NULL); - else - { - gint width, height; - gtk_icon_size_lookup (size, &width, &height); - if (gtk_widget_has_screen (widget)) - { - GdkScreen* screen = gtk_widget_get_screen (widget); - pixbuf = gtk_icon_theme_load_icon ( - gtk_icon_theme_get_for_screen (screen), icon, - MAX (width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); - } - } - if (!pixbuf) - pixbuf = gdk_pixbuf_new_from_file_at_size (icon_ready, 16, 16, NULL); - } - if (!pixbuf) - pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FIND, size, NULL); - return pixbuf; -} - -void update_searchEngine(guint index, GtkWidget* search) -{ - MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ - guint n = midori_web_list_get_length (search_engines); - MidoriWebItem* web_item; - /* Display a default icon in case we have no engines */ - if(!n) - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search), SEXY_ICON_ENTRY_PRIMARY - , GTK_IMAGE(gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU))); - /* Change the icon and default text according to the chosen engine */ - else - { - /* Reset in case the index is out of range */ - if(index >= n) - index = 0; - web_item = midori_web_list_get_nth_item (search_engines, index); - GdkPixbuf* pixbuf = load_web_icon (midori_web_item_get_icon (web_item), - GTK_ICON_SIZE_MENU, search); - sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(search) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf))); - g_object_unref(pixbuf); - sokoke_entry_set_default_text (GTK_ENTRY (search), - midori_web_item_get_name (web_item)); - /* config->searchEngine = index; */ - } -} - -void on_webSearch_engine_activate(GtkWidget* widget, MidoriBrowser* browser) -{ - guint index = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(widget), "engine")); - update_searchEngine(index, widget); -} - -void on_webSearch_icon_released(GtkWidget* widget, SexyIconEntryPosition* pos - , gint button, MidoriBrowser* browser) -{ - MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ - GtkWidget* menu = gtk_menu_new(); - guint n = midori_web_list_get_length (search_engines); - GtkWidget* menuitem; - MidoriWebItem* web_item; - if(n) - { - guint i; - for(i = 0; i < n; i++) - { - web_item = midori_web_list_get_nth_item (search_engines, i); - menuitem = gtk_image_menu_item_new_with_label ( - midori_web_item_get_name (web_item)); - GdkPixbuf* pixbuf = load_web_icon (midori_web_item_get_icon (web_item), - GTK_ICON_SIZE_MENU, menuitem); - GtkWidget* icon = gtk_image_new_from_pixbuf(pixbuf); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), icon); - g_object_unref(pixbuf); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - g_object_set_data(G_OBJECT(menuitem), "engine", GUINT_TO_POINTER(i)); - g_signal_connect(menuitem, "activate" - , G_CALLBACK(on_webSearch_engine_activate), browser); - gtk_widget_show(menuitem); - } - } - else - { - menuitem = gtk_image_menu_item_new_with_label(_("Empty")); - gtk_widget_set_sensitive(menuitem, FALSE); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - } - - /*menuitem = gtk_separator_menu_item_new(); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - GtkAction* action = gtk_action_group_get_action( - browser->actiongroup, "ManageSearchEngines"); - menuitem = gtk_action_create_menu_item(action); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem);*/ - sokoke_widget_popup(widget, GTK_MENU(menu), - NULL, SOKOKE_MENU_POSITION_LEFT); -} - -static void on_webSearch_engines_render_icon(GtkTreeViewColumn* column - , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter - , GtkWidget* treeview) -{ - MidoriWebItem* web_item; - gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &web_item, -1); - - /* TODO: Would it be better to not do this on every redraw? */ - const gchar* icon = midori_web_item_get_icon (web_item); - if (icon) - { - GdkPixbuf* pixbuf = load_web_icon(icon, GTK_ICON_SIZE_DND, treeview); - g_object_set(renderer, "pixbuf", pixbuf, NULL); - if(pixbuf) - g_object_unref(pixbuf); - } - else - g_object_set(renderer, "pixbuf", NULL, NULL); -} - -static void on_webSearch_engines_render_text(GtkTreeViewColumn* column - , GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter - , GtkWidget* treeview) -{ - MidoriWebItem* web_item; - gtk_tree_model_get(model, iter, ENGINES_COL_ENGINE, &web_item, -1); - const gchar* name = midori_web_item_get_name (web_item); - const gchar* description = midori_web_item_get_description (web_item); - gchar* markup = g_markup_printf_escaped("%s\n%s", name, description); - g_object_set(renderer, "markup", markup, NULL); - g_free(markup); -} - -static void webSearch_toggle_edit_buttons(gboolean sensitive, CWebSearch* webSearch) -{ - gtk_widget_set_sensitive(webSearch->edit, sensitive); - gtk_widget_set_sensitive(webSearch->remove, sensitive); -} - -static void on_webSearch_shortName_changed(GtkWidget* widget, GtkWidget* dialog) -{ - const gchar* text = gtk_entry_get_text(GTK_ENTRY(widget)); - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) - , GTK_RESPONSE_ACCEPT, text && *text); -} - -const gchar* STR_NON_NULL(const gchar* string) -{ - return string ? string : ""; -} - -static void webSearch_editEngine_dialog_new(gboolean newEngine, CWebSearch* webSearch) -{ - MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ - GtkWidget* dialog = gtk_dialog_new_with_buttons( - newEngine ? _("Add search engine") : _("Edit search engine") - , GTK_WINDOW(webSearch->window) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL - , newEngine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog) - , newEngine ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); - gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 5); - GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - MidoriWebItem* web_item; - GtkTreeModel* liststore; - GtkTreeIter iter; - if(newEngine) - { - web_item = midori_web_item_new (); - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) - , GTK_RESPONSE_ACCEPT, FALSE); - } - else - { - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(webSearch->treeview)); - gtk_tree_selection_get_selected(selection, &liststore, &iter); - gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &web_item, -1); - } - - GtkWidget* hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic(_("_Name:")); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_shortName = gtk_entry_new(); - g_signal_connect(entry_shortName, "changed" - , G_CALLBACK(on_webSearch_shortName_changed), dialog); - gtk_entry_set_activates_default(GTK_ENTRY(entry_shortName), TRUE); - if(!newEngine) - gtk_entry_set_text(GTK_ENTRY(entry_shortName) - , STR_NON_NULL (midori_web_item_get_name (web_item))); - gtk_box_pack_start(GTK_BOX(hbox), entry_shortName, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic(_("_Description:")); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_description = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_description), TRUE); - if(!newEngine) - gtk_entry_set_text(GTK_ENTRY(entry_description) - , STR_NON_NULL (midori_web_item_get_description (web_item))); - gtk_box_pack_start(GTK_BOX(hbox), entry_description, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic(_("_URL:")); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_url = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_url), TRUE); - if(!newEngine) - gtk_entry_set_text(GTK_ENTRY(entry_url) - , STR_NON_NULL (midori_web_item_get_uri (web_item))); - gtk_box_pack_start(GTK_BOX(hbox), entry_url, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic(_("_Icon (name or file):")); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_icon = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_icon), TRUE); - if(!newEngine) - gtk_entry_set_text(GTK_ENTRY(entry_icon) - , STR_NON_NULL (midori_web_item_get_icon (web_item))); - gtk_box_pack_start(GTK_BOX(hbox), entry_icon, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - hbox = gtk_hbox_new(FALSE, 8); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); - label = gtk_label_new_with_mnemonic(_("_Keyword:")); - gtk_size_group_add_widget(sizegroup, label); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_keyword = gtk_entry_new(); - gtk_entry_set_activates_default(GTK_ENTRY(entry_keyword), TRUE); - if(!newEngine) - gtk_entry_set_text(GTK_ENTRY(entry_keyword) - , STR_NON_NULL(midori_web_item_get_token (web_item))); - gtk_box_pack_start(GTK_BOX(hbox), entry_keyword, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - gtk_widget_show_all(hbox); - - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - midori_web_item_set_name (web_item - , gtk_entry_get_text(GTK_ENTRY(entry_shortName))); - midori_web_item_set_description (web_item - , gtk_entry_get_text(GTK_ENTRY(entry_description))); - midori_web_item_set_uri (web_item - , gtk_entry_get_text(GTK_ENTRY(entry_url))); - /*search_engine_set_input_encoding(searchEngine - , gtk_entry_get_text(GTK_ENTRY(entry_inputEncoding)));*/ - midori_web_item_set_icon (web_item - , gtk_entry_get_text(GTK_ENTRY(entry_icon))); - midori_web_item_set_token (web_item - , gtk_entry_get_text(GTK_ENTRY(entry_keyword))); - - if(newEngine) - { - midori_web_list_add_item (search_engines, web_item); - liststore = gtk_tree_view_get_model(GTK_TREE_VIEW(webSearch->treeview)); - gtk_list_store_append(GTK_LIST_STORE(liststore), &iter); - } - gtk_list_store_set(GTK_LIST_STORE(liststore), &iter - , ENGINES_COL_ENGINE, web_item, -1); - webSearch_toggle_edit_buttons(TRUE, webSearch); - } - gtk_widget_destroy(dialog); -} - -static void on_webSearch_add(GtkWidget* widget, CWebSearch* webSearch) -{ - webSearch_editEngine_dialog_new(TRUE, webSearch); -} - -static void on_webSearch_edit(GtkWidget* widget, CWebSearch* webSearch) -{ - webSearch_editEngine_dialog_new(FALSE, webSearch); -} - -static void on_webSearch_remove(GtkWidget* widget, CWebSearch* webSearch) -{ - MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(webSearch->treeview)); - GtkTreeModel* liststore; - GtkTreeIter iter; - gtk_tree_selection_get_selected(selection, &liststore, &iter); - MidoriWebItem* web_item; - gtk_tree_model_get(liststore, &iter, ENGINES_COL_ENGINE, &web_item, -1); - gtk_list_store_remove(GTK_LIST_STORE(liststore), &iter); - g_object_unref (web_item); - midori_web_list_remove_item (search_engines, web_item); - /*update_searchEngine(config->searchEngine, webSearch->browser); */ - webSearch_toggle_edit_buttons(midori_web_list_get_length(search_engines), webSearch); - /* FIXME: we want to allow undo of some kind */ -} - -GtkWidget* webSearch_manageSearchEngines_dialog_new(MidoriBrowser* browser) -{ - MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ - const gchar* dialogTitle = _("Manage search engines"); - GtkWidget* dialog = gtk_dialog_new_with_buttons(dialogTitle - , GTK_WINDOW(browser) - , GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR - , GTK_STOCK_HELP - , GTK_RESPONSE_HELP - , GTK_STOCK_CLOSE - , GTK_RESPONSE_CLOSE - , NULL); - gtk_window_set_icon_name(GTK_WINDOW(dialog), GTK_STOCK_PROPERTIES); - /* TODO: Implement some kind of help function */ - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog) - , GTK_RESPONSE_HELP, FALSE); - gint iWidth, iHeight; - sokoke_widget_get_text_size(dialog, "M", &iWidth, &iHeight); - gtk_window_set_default_size(GTK_WINDOW(dialog), iWidth * 45, -1); - g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); - /* TODO: Do we want tooltips for explainations or can we omit that? - We need mnemonics - Take multiple windows into account when applying changes */ - GtkWidget* xfce_heading; - if((xfce_heading = sokoke_xfce_header_new( - gtk_window_get_icon_name(GTK_WINDOW(dialog)), dialogTitle))) - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), xfce_heading, FALSE, FALSE, 0); - GtkWidget* hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 12); - GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; - GtkListStore* liststore = gtk_list_store_new(ENGINES_COL_N - , MIDORI_TYPE_WEB_ITEM); - GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(liststore)); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); - column = gtk_tree_view_column_new(); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_pack_start(column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func(column, renderer_pixbuf - , (GtkTreeCellDataFunc)on_webSearch_engines_render_icon, treeview, NULL); - renderer_text = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(column, renderer_text, TRUE); - gtk_tree_view_column_set_cell_data_func(column, renderer_text - , (GtkTreeCellDataFunc)on_webSearch_engines_render_text, treeview, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); - GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled) - , GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(scrolled), treeview); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); - gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 5); - guint n = midori_web_list_get_length (search_engines); - guint i; - for(i = 0; i < n; i++) - { - MidoriWebItem* web_item = midori_web_list_get_nth_item (search_engines, i); - gtk_list_store_insert_with_values(GTK_LIST_STORE(liststore), NULL, i - , ENGINES_COL_ENGINE, web_item, -1); - } - g_object_unref(liststore); - CWebSearch* webSearch = g_new0(CWebSearch, 1); - webSearch->browser = browser; - webSearch->window = dialog; - webSearch->treeview = treeview; - g_signal_connect(dialog, "response", G_CALLBACK(g_free), webSearch); - GtkWidget* vbox = gtk_vbox_new(FALSE, 4); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4); - GtkWidget* button = gtk_button_new_from_stock(GTK_STOCK_ADD); - g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_add), webSearch); - gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - button = gtk_button_new_from_stock(GTK_STOCK_EDIT); - g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_edit), webSearch); - gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - webSearch->edit = button; - button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); - g_signal_connect(button, "clicked", G_CALLBACK(on_webSearch_remove), webSearch); - gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - webSearch->remove = button; - button = gtk_label_new(""); /* This is an invisible separator */ - gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 12); - button = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); - gtk_widget_set_sensitive(button, FALSE); - gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); - button = gtk_button_new_from_stock(GTK_STOCK_GO_UP); - gtk_widget_set_sensitive(button, FALSE); - gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0); - webSearch_toggle_edit_buttons(n > 0, webSearch); - gtk_widget_show_all(GTK_DIALOG(dialog)->vbox); - return dialog; -} - -gboolean on_webSearch_key_down(GtkWidget* widget, GdkEventKey* event, MidoriBrowser* browser) -{ - GdkModifierType state = (GdkModifierType)0; - gint x, y; gdk_window_get_pointer(NULL, &x, &y, &state); - if(!(state & GDK_CONTROL_MASK)) - return FALSE; - switch(event->keyval) - { - case GDK_Up: - /* update_searchEngine(config->searchEngine - 1, browser); */ - return TRUE; - case GDK_Down: - /* update_searchEngine(config->searchEngine + 1, browser); */ - return TRUE; - } - return FALSE; -} - -gboolean on_webSearch_scroll(GtkWidget* webView, GdkEventScroll* event, MidoriBrowser* browser) -{ - if(event->direction == GDK_SCROLL_DOWN) - ; /* update_searchEngine(config->searchEngine + 1, browser); */ - else if(event->direction == GDK_SCROLL_UP) - ; /* update_searchEngine(config->searchEngine - 1, browser); */ - return TRUE; -} - -void on_webSearch_activate(GtkWidget* widget, MidoriBrowser* browser) -{ - MidoriWebList* search_engines = midori_web_list_new (); /* FIXME */ - const gchar* keywords = gtk_entry_get_text(GTK_ENTRY(widget)); - const gchar* url; - MidoriWebItem* web_item = midori_web_list_get_nth_item (search_engines, 0/*config->searchEngine*/); - if (web_item) - url = midori_web_item_get_uri (web_item); - else /* The location search is our fallback */ - url = ""; /* config->locationSearch; */ - gchar* search; - if(strstr(url, "%s")) - search = g_strdup_printf(url, keywords); - else - search = g_strconcat(url, " ", keywords, NULL); - sokoke_entry_append_completion(GTK_ENTRY(widget), keywords); - GtkWidget* webView = midori_browser_get_current_web_view(browser); - webkit_web_view_open(WEBKIT_WEB_VIEW(webView), search); - g_free(search); -} diff --git a/midori/webSearch.h b/midori/webSearch.h deleted file mode 100644 index 01e8df93..00000000 --- a/midori/webSearch.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - Copyright (C) 2007 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __WEBSEARCH_H__ -#define __WEBSEARCH_H__ 1 - -#include "midori-browser.h" - -#include -#include -#include - -typedef struct -{ - MidoriBrowser* browser; - GtkWidget* window; - GtkWidget* treeview; - GtkWidget* edit; - GtkWidget* remove; -} CWebSearch; - -enum -{ - ENGINES_COL_ENGINE, - ENGINES_COL_N -}; - -void -update_searchEngine(guint, GtkWidget*); - -void -on_webSearch_icon_released(GtkWidget*, SexyIconEntryPosition*, gint, MidoriBrowser*); - -void -on_webSearch_engine_activate(GtkWidget*, MidoriBrowser*); - -void -on_webSearch_activate(GtkWidget*, MidoriBrowser*); - -GtkWidget* -webSearch_manageSearchEngines_dialog_new(MidoriBrowser*); - -gboolean -on_webSearch_key_down(GtkWidget*, GdkEventKey*, MidoriBrowser*); - -gboolean -on_webSearch_scroll(GtkWidget*, GdkEventScroll*, MidoriBrowser*); - -#endif /* !__WEBSEARCH_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 24033dc6..bb0358a2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,8 +13,8 @@ midori/midori-webview.c midori/midori-preferences.c midori/midori-webitem.c midori/midori-weblist.c +midori/midori-searchentry.c midori/sokoke.c -midori/webSearch.c midori/gjs.c katze/katze-throbber.c katze/katze-utils.c From 4e39a4feef192b78c1480766538c879c12e5a703 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 15 Jun 2008 12:02:01 +0200 Subject: [PATCH 0151/2970] Include compat.h to build with Gtk+ 2.10 again --- midori/midori-webview.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index f2b8e0dd..cec42909 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -13,11 +13,12 @@ #include "main.h" #include "sokoke.h" +#include "compat.h" #include #include -// This is unstable API, so we need to declare it +/* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); @@ -275,7 +276,7 @@ webkit_web_view_load_started (MidoriWebView* web_view, { MidoriWebViewPrivate* priv = web_view->priv; - // FIXME: This is a hack, until signals are fixed upstream + /* FIXME: This is a hack, until signals are fixed upstream */ priv->is_loading = TRUE; if (priv->tab_icon) katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), TRUE); @@ -359,13 +360,13 @@ gtk_widget_button_press_event (MidoriWebView* web_view, return FALSE; if (state & GDK_SHIFT_MASK) { - // Open link in new window + /* Open link in new window */ g_signal_emit (web_view, signals[NEW_WINDOW], 0, priv->link_uri); return TRUE; } else if(state & GDK_MOD1_MASK) { - // Open link in new tab + /* Open link in new tab */ g_signal_emit (web_view, signals[NEW_TAB], 0, priv->link_uri); return TRUE; } @@ -374,13 +375,13 @@ gtk_widget_button_press_event (MidoriWebView* web_view, if (state & GDK_CONTROL_MASK) { webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); - return FALSE; // Allow Ctrl + Middle click + return FALSE; /* Allow Ctrl + Middle click */ } else { if (!priv->link_uri) return FALSE; - // Open link in new tab + /* Open link in new tab */ g_signal_emit (web_view, signals[NEW_TAB], 0, priv->link_uri); return TRUE; } @@ -483,7 +484,7 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); gtk_widget_show (menuitem); } - // FIXME: We are leaking 'text' which is not const but should be. + /* FIXME: We are leaking 'text' which is not const but should be. */ } } @@ -575,8 +576,8 @@ midori_web_view_init (MidoriWebView* web_view) web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); g_object_connect (web_view, - //"signal::load-started", - //webkit_web_view_load_started, NULL, + /* "signal::load-started", + webkit_web_view_load_started, NULL, */ "signal::load-committed", webkit_web_view_load_committed, NULL, "signal::load-started", @@ -585,8 +586,8 @@ midori_web_view_init (MidoriWebView* web_view) webkit_web_view_progress_changed, NULL, "signal::load-finished", webkit_web_view_load_finished, NULL, - //"signal::load-done", - //webkit_web_view_load_done, NULL, + /* "signal::load-done", + webkit_web_view_load_done, NULL, */ "signal::title-changed", webkit_web_view_title_changed, NULL, "signal::status-bar-text-changed", @@ -655,7 +656,7 @@ midori_web_view_set_property (GObject* object, const gchar* uri = g_value_get_string (value); if (uri && *uri) { - // FIXME: Autocomplete the uri + /* FIXME: Autocomplete the uri */ webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), uri); } break; @@ -830,7 +831,7 @@ midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) { - // Toggle the label visibility on double click + /* Toggle the label visibility on double click */ GtkWidget* child = gtk_bin_get_child (GTK_BIN (tab_label)); GList* children = gtk_container_get_children (GTK_CONTAINER (child)); child = (GtkWidget*)g_list_nth_data (children, 1); @@ -845,7 +846,7 @@ midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, } else if (event->button == 2) { - // Close the web view on middle click + /* Close the web view on middle click */ g_signal_emit (web_view, signals[CLOSE], 0); return TRUE; } @@ -911,7 +912,7 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) const gchar* title = midori_web_view_get_display_title (web_view); priv->tab_label = gtk_label_new (title); gtk_misc_set_alignment (GTK_MISC (priv->tab_label), 0.0, 0.5); - // TODO: make the tab initially look "unvisited" until it's focused + /* TODO: make the tab initially look "unvisited" until it's focused */ gtk_box_pack_start (GTK_BOX (hbox), priv->tab_label, FALSE, TRUE, 0); priv->proxy_tab_label = event_box; _midori_web_view_update_tab_label_size (web_view); From f628b7dc5f1fa3314e5d9ba79a9feb5599304070 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 15 Jun 2008 13:29:30 +0200 Subject: [PATCH 0152/2970] Add a Bookmark Add item to the link context menu. --- midori/midori-browser.c | 290 ++++++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 128 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5947520f..83c94933 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -407,15 +407,173 @@ midori_web_view_console_message_cb (GtkWidget* web_view, return TRUE; } +static void +midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, + KatzeXbelItem* bookmark) +{ + MidoriBrowserPrivate* priv = browser->priv; + + gboolean new_bookmark = !bookmark; + GtkWidget* dialog = gtk_dialog_new_with_buttons ( + new_bookmark ? _("New bookmark") : _("Edit bookmark"), + GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), + new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + if (new_bookmark) + { + GtkWidget* web_view = midori_browser_get_current_web_view (browser); + bookmark = katze_xbel_bookmark_new (); + if (MIDORI_IS_WEB_VIEW (web_view)) + { + katze_xbel_item_set_title (bookmark, + midori_web_view_get_display_title (MIDORI_WEB_VIEW (web_view))); + katze_xbel_bookmark_set_href (bookmark, + midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view))); + } + } + + GtkWidget* hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + GtkWidget* label = gtk_label_new_with_mnemonic (_("_Title:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_title = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); + const gchar* title = katze_xbel_item_get_title (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_title), title ? title : ""); + gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Description:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + GtkWidget* entry_desc = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_desc), TRUE); + if (!new_bookmark) + { + const gchar* desc = katze_xbel_item_get_desc (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_desc), desc ? desc : ""); + } + gtk_box_pack_start (GTK_BOX (hbox), entry_desc, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + GtkWidget* entry_uri = NULL; + if (katze_xbel_item_is_bookmark (bookmark)) + { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_URL:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_uri = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); + gtk_entry_set_text (GTK_ENTRY (entry_uri), + katze_xbel_bookmark_get_href (bookmark)); + gtk_box_pack_start (GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + } + + GtkWidget* combo_folder = NULL; + if (new_bookmark) + { + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Folder:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + combo_folder = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Root")); + gtk_widget_set_sensitive (combo_folder, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + } + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + katze_xbel_item_set_title (bookmark, + gtk_entry_get_text (GTK_ENTRY (entry_title))); + katze_xbel_item_set_desc (bookmark, + gtk_entry_get_text(GTK_ENTRY(entry_desc))); + if (katze_xbel_item_is_bookmark (bookmark)) + katze_xbel_bookmark_set_href (bookmark, + gtk_entry_get_text (GTK_ENTRY (entry_uri))); + + /* FIXME: We want to choose a folder */ + if (new_bookmark) + { + katze_xbel_folder_append_item (bookmarks, bookmark); + GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), + &iter, NULL, G_MAXINT, 0, bookmark, -1); + katze_xbel_item_ref (bookmark); + } + + /* FIXME: update navigationbar */ + /* FIXME: Update panel in other windows */ + } + gtk_widget_destroy (dialog); +} + +static void +midori_web_view_bookmark_add_cb (GtkWidget* menuitem, + GtkWidget* web_view) +{ + const gchar* uri; + KatzeXbelItem* xbel_item; + MidoriBrowser* browser; + + uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); + xbel_item = katze_xbel_bookmark_new (); + katze_xbel_bookmark_set_href (xbel_item, uri); + browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); + midori_browser_edit_bookmark_dialog_new (browser, xbel_item); +} + static void midori_web_view_populate_popup_cb (GtkWidget* web_view, GtkWidget* menu, MidoriBrowser* browser) { - const gchar* uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); + const gchar* uri; + GtkAction* action; + GtkWidget* menuitem; + gchar* stock_id; + GtkStockItem stockitem; + GtkWidget* image; + + uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) { - /* TODO: bookmark link */ + /* Create the menuitem manually instead of from the action + because otherwise the menuitem has an accelerator label. */ + action = _action_by_name (browser, "BookmarkAdd"); + g_object_get (action, "stock-id", &stock_id, NULL); + gtk_stock_lookup (stock_id, &stockitem); + menuitem = gtk_image_menu_item_new_with_mnemonic (stockitem.label); + image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + g_free (stock_id); + gtk_widget_show (menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_bookmark_add_cb), web_view); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } if (webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) @@ -425,8 +583,8 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) { - GtkAction* action = _action_by_name (browser, "UndoTabClose"); - GtkWidget* menuitem = gtk_action_create_menu_item (action); + action = _action_by_name (browser, "UndoTabClose"); + menuitem = gtk_action_create_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); @@ -1589,130 +1747,6 @@ midori_browser_search_focus_out_event_cb (GtkWidget* widget, return FALSE; } -static void -midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, - KatzeXbelItem* bookmark) -{ - MidoriBrowserPrivate* priv = browser->priv; - - gboolean new_bookmark = !bookmark; - GtkWidget* dialog = gtk_dialog_new_with_buttons ( - new_bookmark ? _("New bookmark") : _("Edit bookmark"), - GTK_WINDOW (browser), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), - new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); - GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - if (new_bookmark) - { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - bookmark = katze_xbel_bookmark_new (); - if (MIDORI_IS_WEB_VIEW (web_view)) - { - katze_xbel_item_set_title (bookmark, - midori_web_view_get_display_title (MIDORI_WEB_VIEW (web_view))); - katze_xbel_bookmark_set_href (bookmark, - midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view))); - } - } - - GtkWidget* hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic (_("_Title:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_title = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); - const gchar* title = katze_xbel_item_get_title (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_title), title ? title : ""); - gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Description:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_desc = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_desc), TRUE); - if (!new_bookmark) - { - const gchar* desc = katze_xbel_item_get_desc (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_desc), desc ? desc : ""); - } - gtk_box_pack_start (GTK_BOX (hbox), entry_desc, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - GtkWidget* entry_uri = NULL; - if (katze_xbel_item_is_bookmark (bookmark)) - { - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_URL:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry_uri = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); - gtk_entry_set_text (GTK_ENTRY (entry_uri), - katze_xbel_bookmark_get_href (bookmark)); - gtk_box_pack_start (GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - } - - GtkWidget* combo_folder = NULL; - if (new_bookmark) - { - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Folder:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - combo_folder = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Root")); - gtk_widget_set_sensitive (combo_folder, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - } - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - katze_xbel_item_set_title (bookmark, - gtk_entry_get_text (GTK_ENTRY (entry_title))); - katze_xbel_item_set_desc (bookmark, - gtk_entry_get_text(GTK_ENTRY(entry_desc))); - if (katze_xbel_item_is_bookmark (bookmark)) - katze_xbel_bookmark_set_href (bookmark, - gtk_entry_get_text (GTK_ENTRY (entry_uri))); - - /* FIXME: We want to choose a folder */ - if (new_bookmark) - { - katze_xbel_folder_append_item (bookmarks, bookmark); - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); - GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), - &iter, NULL, G_MAXINT, 0, bookmark, -1); - katze_xbel_item_ref (bookmark); - } - - /* FIXME: update navigationbar */ - /* FIXME: Update panel in other windows */ - } - gtk_widget_destroy (dialog); -} - static void midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, GtkTreePath* path, From 38c48dd9f60590d07bebc0506abf6ae16e00f93a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Jun 2008 01:13:27 +0200 Subject: [PATCH 0153/2970] Finish missing web search functionality --- midori/midori-browser.c | 11 +++- midori/midori-searchentry.c | 108 ++++++++++++++++++++++++++++++++---- midori/midori-searchentry.h | 7 +++ midori/midori-weblist.c | 22 +++++++- midori/midori-weblist.h | 4 ++ midori/sokoke.c | 21 +++++-- 6 files changed, 155 insertions(+), 18 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 83c94933..48638eb4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3391,6 +3391,8 @@ midori_browser_set_property (GObject* object, { MidoriBrowser* browser = MIDORI_BROWSER (object); MidoriBrowserPrivate* priv = browser->priv; + guint last_web_search; + MidoriWebItem* web_item; switch (prop_id) { @@ -3430,7 +3432,14 @@ midori_browser_set_property (GObject* object, g_object_set (priv->search, "search-engines", priv->search_engines, NULL); /* FIXME: Connect to updates */ - _midori_browser_update_actions (browser); + if (priv->settings) + { + g_object_get (priv->settings, "last-web-search", + &last_web_search, NULL); + web_item = midori_web_list_get_nth_item (priv->search_engines, + last_web_search); + g_object_set (priv->search, "current-item", web_item, NULL); + } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index e3c30566..5d23bf38 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -159,9 +159,24 @@ midori_search_entry_icon_released_cb (GtkWidget* widget, NULL, SOKOKE_MENU_POSITION_LEFT); } +static void +_midori_search_entry_move_index (MidoriSearchEntry* search_entry, + guint n) +{ + gint i; + MidoriWebItem* web_item; + + i = midori_web_list_get_item_index (search_entry->search_engines, + search_entry->current_item); + web_item = midori_web_list_get_nth_item (search_entry->search_engines, + i + n); + if (web_item) + midori_search_entry_set_current_item (search_entry, web_item); +} + static gboolean -midori_search_entry_key_press_event_cb (GtkWidget* widget, - GdkEventKey* event) +midori_search_entry_key_press_event_cb (MidoriSearchEntry* search_entry, + GdkEventKey* event) { GdkModifierType state; gint x, y; @@ -172,26 +187,59 @@ midori_search_entry_key_press_event_cb (GtkWidget* widget, switch (event->keyval) { case GDK_Up: - /* update_searchEngine(config->searchEngine - 1, browser); */ + _midori_search_entry_move_index (search_entry, - 1); return TRUE; case GDK_Down: - /* update_searchEngine(config->searchEngine + 1, browser); */ + _midori_search_entry_move_index (search_entry, + 1); return TRUE; } return FALSE; } static gboolean -midori_search_entry_scroll_event_cb (GtkWidget* widget, - GdkEventScroll* event) +midori_search_entry_scroll_event_cb (MidoriSearchEntry* search_entry, + GdkEventScroll* event) { if (event->direction == GDK_SCROLL_DOWN) - ; /* update_searchEngine(config->searchEngine + 1, browser); */ + _midori_search_entry_move_index (search_entry, + 1); else if (event->direction == GDK_SCROLL_UP) - ; /* update_searchEngine(config->searchEngine - 1, browser); */ + _midori_search_entry_move_index (search_entry, - 1); return TRUE; } +static void +midori_search_entry_engines_add_item_cb (MidoriWebList* web_list, + MidoriWebItem* item, + MidoriSearchEntry* search_entry) +{ + if (!search_entry->current_item) + midori_search_entry_set_current_item (search_entry, item); +} + +static void +midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, + MidoriWebItem* item, + MidoriSearchEntry* search_entry) +{ + MidoriWebItem* web_item; + + if (search_entry->current_item == item) + { + web_item = midori_web_list_get_nth_item (web_list, 0); + if (web_item) + midori_search_entry_set_current_item (search_entry, web_item); + else + { + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (search_entry), + SEXY_ICON_ENTRY_PRIMARY, NULL); + sokoke_entry_set_default_text (GTK_ENTRY (search_entry), ""); + + katze_object_assign (search_entry->current_item, NULL); + g_object_notify (G_OBJECT (search_entry), "current-item"); + } + } +} + static void midori_search_entry_init (MidoriSearchEntry* search_entry) { @@ -210,6 +258,13 @@ midori_search_entry_init (MidoriSearchEntry* search_entry) "signal::scroll-event", midori_search_entry_scroll_event_cb, NULL, NULL); + + g_object_connect (search_entry->search_engines, + "signal-after::add-item", + midori_search_entry_engines_add_item_cb, search_entry, + "signal-after::remove-item", + midori_search_entry_engines_remove_item_cb, search_entry, + NULL); } static void @@ -218,6 +273,7 @@ midori_search_entry_finalize (GObject* object) MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); g_object_unref (search_entry->search_engines); + g_object_unref (search_entry->current_item); G_OBJECT_CLASS (midori_search_entry_parent_class)->finalize (object); } @@ -233,10 +289,12 @@ midori_search_entry_set_property (GObject* object, switch (prop_id) { case PROP_SEARCH_ENGINES: - search_entry->search_engines = g_value_get_object (value); + midori_search_entry_set_search_engines (search_entry, + g_value_get_object (value)); break; case PROP_CURRENT_ITEM: - search_entry->current_item = g_value_get_object (value); + midori_search_entry_set_current_item (search_entry, + g_value_get_object (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -316,6 +374,13 @@ midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, g_object_ref (search_engines); katze_object_assign (search_entry->search_engines, search_engines); g_object_notify (G_OBJECT (search_entry), "search-engines"); + + g_object_connect (search_engines, + "signal-after::add-item", + midori_search_entry_engines_add_item_cb, search_entry, + "signal-after::remove-item", + midori_search_entry_engines_remove_item_cb, search_entry, + NULL); } /** @@ -345,7 +410,9 @@ midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, g_object_unref (pixbuf); sokoke_entry_set_default_text (GTK_ENTRY (search_entry), midori_web_item_get_name (web_item)); - search_entry->current_item = web_item; + + g_object_ref (web_item); + katze_object_assign (search_entry->current_item, web_item); g_object_notify (G_OBJECT (search_entry), "current-item"); } @@ -608,6 +675,20 @@ midori_search_entry_dialog_remove_cb (GtkWidget* widget, /* FIXME: we want to allow undo of some kind */ } +static void +midori_search_entry_treeview_selection_cb (GtkWidget* treeview, + MidoriSearchEntry* search_entry) +{ + GtkTreeSelection* selection; + gboolean selected; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (search_entry->treeview)); + selected = gtk_tree_selection_get_selected (selection, NULL, NULL); + + gtk_widget_set_sensitive (search_entry->edit_button, selected); + gtk_widget_set_sensitive (search_entry->remove_button, selected); +} + /** * midori_search_entry_get_dialog: * @search_entry: a #MidoriSearchEntry @@ -670,6 +751,11 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) TRUE, TRUE, 12); liststore = gtk_list_store_new (1, MIDORI_TYPE_WEB_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + /*g_signal_connect (treeview, "cursor-changed", + G_CALLBACK (midori_search_entry_treeview_selection_cb), search_entry);*/ + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), + "changed", G_CALLBACK (midori_search_entry_treeview_selection_cb), + search_entry); search_entry->treeview = treeview; gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h index f9295085..588277d6 100644 --- a/midori/midori-searchentry.h +++ b/midori/midori-searchentry.h @@ -46,6 +46,13 @@ midori_search_entry_get_type (void); GtkWidget* midori_search_entry_new (void); +MidoriWebList* +midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry); + +void +midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, + MidoriWebList* name); + MidoriWebItem* midori_search_entry_get_current_item (MidoriSearchEntry* search_entry); diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c index 6d1f9a26..daf2c3b1 100644 --- a/midori/midori-weblist.c +++ b/midori/midori-weblist.c @@ -48,6 +48,7 @@ _midori_web_list_remove_item (MidoriWebList* web_list, MidoriWebItem* web_item) { web_list->items = g_list_remove (web_list->items, web_item); + g_object_unref (web_item); } static void @@ -148,7 +149,7 @@ midori_web_list_remove_item (MidoriWebList* web_list, * @web_list: a #MidoriWebList * @n: an index in the list * - * Retrieves the item in @web_list at the index @n. + * Retrieves the item in @web_list at the position @n. * * Return value: an item, or %NULL **/ @@ -161,6 +162,25 @@ midori_web_list_get_nth_item (MidoriWebList* web_list, return g_list_nth_data (web_list->items, n); } +/** + * midori_web_list_get_item_position: + * @web_list: a #MidoriWebList + * @item: an item in the list + * + * Retrieves the index of the item in @web_list. + * + * Return value: an item, or -1 + **/ +gint +midori_web_list_get_item_index (MidoriWebList* web_list, + MidoriWebItem* web_item) +{ + g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), -1); + g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), -1); + + return g_list_index (web_list->items, web_item); +} + /** * midori_web_list_find_token: * @web_list: a #MidoriWebList diff --git a/midori/midori-weblist.h b/midori/midori-weblist.h index 86660fb3..64f9866c 100644 --- a/midori/midori-weblist.h +++ b/midori/midori-weblist.h @@ -63,6 +63,10 @@ MidoriWebItem* midori_web_list_get_nth_item (MidoriWebList* web_list, guint n); +gint +midori_web_list_get_item_index (MidoriWebList* web_list, + MidoriWebItem* web_item); + MidoriWebItem* midori_web_list_find_token (MidoriWebList* web_list, const gchar* token); diff --git a/midori/sokoke.c b/midori/sokoke.c index b7024e91..277ee718 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -340,9 +340,9 @@ sokoke_on_entry_focus_in_event (GtkEntry* entry, GdkEventFocus* event, gpointer userdata) { - gint default_text = GPOINTER_TO_INT ( + gint has_default = GPOINTER_TO_INT ( g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); - if (default_text) + if (has_default) { gtk_entry_set_text (entry, ""); g_object_set_data (G_OBJECT(entry), "sokoke_has_default", @@ -361,9 +361,9 @@ sokoke_on_entry_focus_out_event (GtkEntry* entry, const gchar* text = gtk_entry_get_text (entry); if (text && !*text) { - const gchar* defaultText = (const gchar*)g_object_get_data ( - G_OBJECT (entry), "sokoke_default_text"); - gtk_entry_set_text (entry, defaultText); + const gchar* default_text = (const gchar*)g_object_get_data ( + G_OBJECT (entry), "sokoke_default_text"); + gtk_entry_set_text (entry, default_text); g_object_set_data (G_OBJECT(entry), "sokoke_has_default", GINT_TO_POINTER (1)); sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), @@ -387,6 +387,17 @@ sokoke_entry_set_default_text (GtkEntry* entry, PANGO_STYLE_ITALIC); gtk_entry_set_text (entry, default_text); } + else if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry))) + { + gint has_default = GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (entry), "sokoke_has_default")); + if (has_default) + { + gtk_entry_set_text (entry, default_text); + sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), + PANGO_STYLE_ITALIC); + } + } g_object_set_data (G_OBJECT (entry), "sokoke_default_text", (gpointer)default_text); g_signal_connect (entry, "focus-in-event", From 3fceedcaa5f7ecb5b66b28415f4a8e0f9aa761ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Sitek?= Date: Tue, 17 Jun 2008 19:15:48 +0200 Subject: [PATCH 0154/2970] Updated Polish translation --- po/pl.po | 1125 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 699 insertions(+), 426 deletions(-) diff --git a/po/pl.po b/po/pl.po index 7cc30210..921ab922 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-05-04 16:06+0200\n" -"PO-Revision-Date: 2008-03-29 13:40+0100\n" +"PO-Revision-Date: 2008-06-17 17:08+0100\n" "Last-Translator: Przemysław Sitek \n" "Language-Team: pl \n" "MIME-Version: 1.0\n" @@ -20,1116 +20,1388 @@ msgid "Lightweight web browser" msgstr "Lekka przeglądarka internetowa" #: ../midori.desktop.in.h:2 -msgid "Midori Web Browser" -msgstr "Przeglądarka Internetowa Midori" +msgid "Midori" +msgstr "" #: ../midori.desktop.in.h:3 msgid "Web Browser" msgstr "Przeglądarka Internetowa" -#: ../src/main.c:47 +#: ../midori/main.c:45 msgid "Bookmark" msgstr "Zakładka" -#: ../src/main.c:48 -msgid "New Bookmark" -msgstr "Nowa zakładka" +#: ../midori/main.c:46 +msgid "_Add Bookmark" +msgstr "_Dodaj zakładkę" -#: ../src/main.c:49 +#: ../midori/main.c:47 msgid "_Form Fill" msgstr "Wypełnij _formularz" -#: ../src/main.c:50 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:407 -msgid "Homepage" -msgstr "Strona startowa" +#: ../midori/main.c:48 +msgid "_Homepage" +msgstr "_Strona startowa" -#: ../src/main.c:51 +#: ../midori/main.c:49 msgid "New _Tab" msgstr "Nowa kar_ta" -#: ../src/main.c:52 +#: ../midori/main.c:50 msgid "New _Window" -msgstr "Nowe _okno" +msgstr "_Nowe okno" -#: ../src/main.c:54 +#: ../midori/main.c:52 msgid "Select _All" msgstr "Z_aznacz wszystko" -#: ../src/main.c:57 +#: ../midori/main.c:55 msgid "_Fullscreen" msgstr "Tryb _pełnoekranowy" -#: ../src/main.c:58 +#: ../midori/main.c:56 msgid "_Leave Fullscreen" msgstr "_Opuść tryb pełnoekranowy" -#: ../src/main.c:144 +#: ../midori/main.c:110 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Ustawienia nie mogą być załadowane. %s\n" -#: ../src/main.c:193 +#: ../midori/main.c:165 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "" +msgstr "Wartość '%s' nie jest poprawna dla %s" -#: ../src/main.c:200 ../src/main.c:256 +#: ../midori/main.c:172 +#: ../midori/main.c:241 #, c-format -msgid "Unhandled settings property '%s'" +msgid "Unhandled settings value '%s'" msgstr "" -#: ../src/main.c:270 ../src/main.c:304 -msgid "midori" -msgstr "midori" - -#: ../src/main.c:277 +#: ../midori/main.c:334 msgid "Display program version" msgstr "Wyświetl wersję programu" -#: ../src/main.c:282 +#: ../midori/main.c:342 +#: ../midori/main.c:351 +#: ../midori/main.c:353 +#: ../midori/main.c:367 +msgid "midori" +msgstr "midori" + +#: ../midori/main.c:347 msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:351 +msgid "Unknown argument." msgstr "" -#: ../src/main.c:306 -msgid "Debugging" +#: ../midori/main.c:353 +msgid "Failed to setup interface." msgstr "" -#: ../src/main.c:307 +#: ../midori/main.c:368 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../src/main.c:309 +#: ../midori/main.c:370 msgid "Check for new versions at:" msgstr "" -#: ../src/main.c:344 +#: ../midori/main.c:418 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Zakładki nie mogą być załadowane. %s\n" -#: ../src/main.c:358 +#: ../midori/main.c:432 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Sesja nie może być załadowana. %s\n" -#: ../src/main.c:370 +#: ../midori/main.c:444 #, c-format msgid "The trash couldn't be loaded. %s\n" -msgstr "" +msgstr "Nie można załadować śmietnika. %s\n" -#: ../src/main.c:380 +#: ../midori/main.c:454 msgid "The following errors occured:" msgstr "Nastąpiły następujące błędy:" -#: ../src/main.c:489 -#, fuzzy, c-format +#: ../midori/main.c:583 +#, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Sesja nie może być załadowana. %s\n" +msgstr "Wyszukiwarki internetowe nie mogą być zapisane. %s" -#: ../src/main.c:498 -#, fuzzy, c-format +#: ../midori/main.c:593 +#, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Zakładki nie mogą być załadowane. %s\n" +msgstr "Zakładki nie mogą zostać zapisane. %s" -#: ../src/main.c:507 -#, fuzzy, c-format +#: ../midori/main.c:602 +#, c-format msgid "The trash couldn't be saved. %s" -msgstr "Zakładki nie mogą być załadowane. %s\n" +msgstr "Kosz nie może zostać zapisany. %s" -#: ../src/main.c:519 -#, fuzzy, c-format +#: ../midori/main.c:614 +#, c-format msgid "The session couldn't be saved. %s" -msgstr "Sesja nie może być załadowana. %s\n" +msgstr "Sesja nie może zostać zapisana. %s" -#: ../src/main.c:528 -#, fuzzy, c-format +#: ../midori/main.c:623 +#, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Ustawienia nie mogą być załadowane. %s\n" +msgstr "Ustawienia nie mogą zostać zapisane. %s" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 -#: ../src/midori-browser.c:2101 +#: ../midori/midori-app.c:114 +#: ../midori/midori-browser.c:1077 +msgid "Settings" +msgstr "Ustawienia" + +#: ../midori/midori-app.c:115 +#: ../midori/midori-browser.c:1078 +msgid "The associated settings" +msgstr "" + +#: ../midori/midori-app.c:123 +#: ../midori/midori-browser.c:1116 +msgid "Trash" +msgstr "Kosz" + +#: ../midori/midori-app.c:124 +#: ../midori/midori-browser.c:1117 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "" + +#: ../midori/midori-app.c:132 +msgid "Browser" +msgstr "" + +#: ../midori/midori-app.c:133 +msgid "The current browser" +msgstr "" + +#: ../midori/midori-app.c:141 +msgid "Browser Count" +msgstr "" + +#: ../midori/midori-app.c:142 +msgid "The current number of browsers" +msgstr "" + +#: ../midori/midori-app.c:150 +#: ../midori/midori-browser.c:1130 +#: ../midori/midori-searchentry.c:71 +msgid "Search Engines" +msgstr "" + +#: ../midori/midori-app.c:151 +#: ../midori/midori-searchentry.c:72 +msgid "The list of search engines" +msgstr "" + +#: ../midori/midori-addons.c:40 +#: ../midori/midori-browser.c:3201 +msgid "Extensions" +msgstr "Rozszerzenia" + +#: ../midori/midori-addons.c:41 +#: ../midori/midori-browser.c:3108 +msgid "Userscripts" +msgstr "Skrypty użytkownika" + +#: ../midori/midori-addons.c:42 +msgid "Userstyles" +msgstr "" + +#: ../midori/midori-browser.c:202 +#: ../midori/midori-browser.c:2425 +#: ../midori/midori-browser.c:2431 msgid "Reload the current page" msgstr "Odśwież bieżącą stronę" -#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 +#: ../midori/midori-browser.c:210 +#: ../midori/midori-browser.c:2428 msgid "Stop loading the current page" msgstr "Zatrzymaj wczytywanie bieżącej strony" -#: ../src/midori-browser.c:264 +#: ../midori/midori-browser.c:273 #, c-format msgid "%d%% loaded" msgstr "%d%% załadowano" -#: ../src/midori-browser.c:611 -msgid "Menubar" -msgstr "" - -#: ../src/midori-browser.c:612 -#, fuzzy -msgid "The menubar" -msgstr "Strona startowa" - -#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 -msgid "Navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" - -#: ../src/midori-browser.c:626 -#, fuzzy -msgid "The navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" - -#: ../src/midori-browser.c:639 -msgid "Tab" -msgstr "" - -#: ../src/midori-browser.c:640 -#, fuzzy -msgid "The current tab" -msgstr "Zamknij bieżącą kartę" - -#: ../src/midori-browser.c:653 -#, fuzzy -msgid "Statusbar" -msgstr "Pasek stanu" - -#: ../src/midori-browser.c:654 -#, fuzzy -msgid "The statusbar" -msgstr "Pasek stanu" - -#: ../src/midori-browser.c:670 -#, fuzzy -msgid "Settings" -msgstr "Ustawienia czcionek" - -#: ../src/midori-browser.c:671 -msgid "The associated settings" -msgstr "" - -#: ../src/midori-browser.c:690 -#, fuzzy -msgid "Statusbar Text" -msgstr "Pasek stanu" - -#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 -msgid "The text that is displayed in the statusbar" -msgstr "Tekst wyświetlany na pasku stanu" - -#: ../src/midori-browser.c:709 -#, fuzzy -msgid "Trash" -msgstr "Pokazuj śmietnik" - -#: ../src/midori-browser.c:710 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "" - -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:418 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:418 msgid "Edit bookmark" msgstr "Edytuj zakładkę" -#: ../src/midori-browser.c:1311 +#: ../midori/midori-browser.c:445 msgid "_Title:" msgstr "_Tytuł:" -#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 +#: ../midori/midori-browser.c:458 +#: ../midori/midori-searchentry.c:563 msgid "_Description:" msgstr "_Opis:" -#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 +#: ../midori/midori-browser.c:477 +#: ../midori/midori-searchentry.c:577 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1364 +#: ../midori/midori-browser.c:494 msgid "_Folder:" msgstr "_Folder:" -#: ../src/midori-browser.c:1368 +#: ../midori/midori-browser.c:498 msgid "Root" msgstr "Korzeń" -#: ../src/midori-browser.c:1591 +#: ../midori/midori-browser.c:814 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Niespodziewana akcja '%s'." + +#: ../midori/midori-browser.c:1033 +msgid "Menubar" +msgstr "Pasek menu" + +#: ../midori/midori-browser.c:1034 +msgid "The menubar" +msgstr "Pasek menu" + +#: ../midori/midori-browser.c:1042 +#: ../midori/midori-preferences.c:332 +msgid "Navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../midori/midori-browser.c:1043 +msgid "The navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../midori/midori-browser.c:1051 +msgid "Tab" +msgstr "Karta" + +#: ../midori/midori-browser.c:1052 +msgid "The current tab" +msgstr "Bieżącą karta" + +#: ../midori/midori-browser.c:1060 +msgid "Statusbar" +msgstr "Pasek stanu" + +#: ../midori/midori-browser.c:1061 +msgid "The statusbar" +msgstr "Pasek stanu" + +#: ../midori/midori-browser.c:1097 +msgid "Statusbar Text" +msgstr "Tekst paska stanu" + +#: ../midori/midori-browser.c:1098 +#: ../midori/midori-webview.c:225 +msgid "The text that is displayed in the statusbar" +msgstr "Tekst wyświetlany na pasku stanu" + +#: ../midori/midori-browser.c:1131 +msgid "The list of search engines to be used for web search" +msgstr "" + +#: ../midori/midori-browser.c:1937 msgid "Separator" msgstr "Separator" -#: ../src/midori-browser.c:1780 +#: ../midori/midori-browser.c:2114 msgid "A lightweight web browser." msgstr "Lekka przeglądarka internetowa" -#: ../src/midori-browser.c:1788 +#: ../midori/midori-browser.c:2122 msgid "translator-credits" msgstr "Przemysław Sitek " -#: ../src/midori-browser.c:2015 +#: ../midori/midori-browser.c:2348 msgid "_File" msgstr "_Plik" -#: ../src/midori-browser.c:2018 +#: ../midori/midori-browser.c:2351 msgid "Open a new window" msgstr "_Nowe okno" -#: ../src/midori-browser.c:2021 +#: ../midori/midori-browser.c:2354 msgid "Open a new tab" msgstr "Nowa kar_ta" -#: ../src/midori-browser.c:2024 +#: ../midori/midori-browser.c:2357 msgid "Open a file" msgstr "_Otwórz plik" -#: ../src/midori-browser.c:2027 +#: ../midori/midori-browser.c:2360 msgid "Save to a file" msgstr "Zapi_sz stronę jako" -#: ../src/midori-browser.c:2029 +#: ../midori/midori-browser.c:2362 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../src/midori-browser.c:2030 +#: ../midori/midori-browser.c:2363 msgid "Close the current tab" msgstr "Zamknij bieżącą kartę" -#: ../src/midori-browser.c:2032 +#: ../midori/midori-browser.c:2365 msgid "C_lose Window" msgstr "Zamknij okno" -#: ../src/midori-browser.c:2033 +#: ../midori/midori-browser.c:2366 msgid "Close this window" msgstr "Zamknij okno" -#: ../src/midori-browser.c:2035 +#: ../midori/midori-browser.c:2368 msgid "Pa_ge Setup" msgstr "_Ustawienia strony" -#: ../src/midori-browser.c:2045 +#: ../midori/midori-browser.c:2372 +msgid "Show a preview of the printed page" +msgstr "" + +#: ../midori/midori-browser.c:2375 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:2378 msgid "Quit the application" msgstr "Za_kończ" -#: ../src/midori-browser.c:2047 +#: ../midori/midori-browser.c:2380 msgid "_Edit" msgstr "_Edycja" -#: ../src/midori-browser.c:2050 +#: ../midori/midori-browser.c:2383 msgid "Undo the last modification" msgstr "Cofnij" -#: ../src/midori-browser.c:2053 +#: ../midori/midori-browser.c:2386 msgid "Redo the last modification" msgstr "Przywróć" -#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 +#: ../midori/midori-browser.c:2389 +msgid "Cut the selected text" +msgstr "" + +#: ../midori/midori-browser.c:2392 +#: ../midori/midori-browser.c:2395 msgid "Copy the selected text" msgstr "Skopiuj" -#: ../src/midori-browser.c:2065 +#: ../midori/midori-browser.c:2398 msgid "Paste text from the clipboard" msgstr "Wklej" -#: ../src/midori-browser.c:2068 +#: ../midori/midori-browser.c:2401 msgid "Delete the selected text" -msgstr "" +msgstr "Usuń zaznaczony tekst" -#: ../src/midori-browser.c:2071 +#: ../midori/midori-browser.c:2404 msgid "Select all text" msgstr "Zaznacz w_szystko" -#: ../src/midori-browser.c:2079 +#: ../midori/midori-browser.c:2407 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:2409 msgid "Find _Next" msgstr "Znajdź poprzednie" -#: ../src/midori-browser.c:2082 +#: ../midori/midori-browser.c:2410 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2412 msgid "Find _Previous" msgstr "Znajdź następne" -#: ../src/midori-browser.c:2085 +#: ../midori/midori-browser.c:2413 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2415 msgid "_Quick Find" msgstr "Szybkie wyszukiwanie" -#: ../src/midori-browser.c:2091 +#: ../midori/midori-browser.c:2416 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2419 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:2421 msgid "_View" msgstr "_Widok" -#: ../src/midori-browser.c:2092 +#: ../midori/midori-browser.c:2422 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../src/midori-browser.c:2112 +#: ../midori/midori-browser.c:2434 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2437 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2440 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2442 msgid "View Source" msgstr "Ź_ródło strony" -#: ../src/midori-browser.c:2115 +#: ../midori/midori-browser.c:2443 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:2445 msgid "View Selection Source" msgstr "Pokaż źródło zaznaczenia" -#: ../src/midori-browser.c:2119 +#: ../midori/midori-browser.c:2446 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:2449 msgid "Toggle fullscreen view" msgstr "Tryb pełnoekranowy" -#: ../src/midori-browser.c:2121 +#: ../midori/midori-browser.c:2451 msgid "_Go" msgstr "P_rzejdź" -#: ../src/midori-browser.c:2132 +#: ../midori/midori-browser.c:2454 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:2457 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:2460 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:2462 msgid "Location..." msgstr "_Położenie..." -#: ../src/midori-browser.c:2135 -msgid "Web Search..." -msgstr "Wyszukiwarki internetowe..." +#: ../midori/midori-browser.c:2463 +msgid "Open a particular location" +msgstr "" -#: ../src/midori-browser.c:2138 +#: ../midori/midori-browser.c:2465 +msgid "Web Search..." +msgstr "Znajdź w Internecie..." + +#: ../midori/midori-browser.c:2466 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:2468 msgid "Open in Page_holder..." msgstr "" -#: ../src/midori-browser.c:2141 +#: ../midori/midori-browser.c:2469 +msgid "Open the current page in the pageholder" +msgstr "" + +#: ../midori/midori-browser.c:2471 msgid "Closed Tabs and Windows" msgstr "Zamknięte karty i okna" -#: ../src/midori-browser.c:2142 +#: ../midori/midori-browser.c:2472 msgid "Reopen a previously closed tab or window" msgstr "Otwórz wcześniej zamkniętą kartę lub okno" -#: ../src/midori-browser.c:2144 +#: ../midori/midori-browser.c:2474 msgid "Empty Trash" msgstr "Opróżnij kosz" -#: ../src/midori-browser.c:2147 +#: ../midori/midori-browser.c:2475 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:2477 msgid "Undo Close Tab" msgstr "Cofnij zamknięcie karty" -#: ../src/midori-browser.c:2150 +#: ../midori/midori-browser.c:2478 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:2480 msgid "_Bookmarks" msgstr "_Zakładki" -#: ../src/midori-browser.c:2155 +#: ../midori/midori-browser.c:2483 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2485 msgid "_Manage Bookmarks" msgstr "_Modyfikuj zakładki" -#: ../src/midori-browser.c:2161 +#: ../midori/midori-browser.c:2486 +msgid "Add, edit and remove bookmarks..." +msgstr "" + +#: ../midori/midori-browser.c:2489 +msgid "Open the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2491 msgid "Open in New _Tab" msgstr "Otwórz odnośnik w nowej _karcie" -#: ../src/midori-browser.c:2164 +#: ../midori/midori-browser.c:2492 +msgid "Open the selected bookmark in a new tab" +msgstr "" + +#: ../midori/midori-browser.c:2494 msgid "Open in New _Window" msgstr "Otwórz odnośnik w _nowym oknie" -#: ../src/midori-browser.c:2173 +#: ../midori/midori-browser.c:2495 +msgid "Open the selected bookmark in a new window" +msgstr "" + +#: ../midori/midori-browser.c:2498 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2501 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2503 msgid "_Tools" msgstr "_Narzędzia" -#: ../src/midori-browser.c:2175 +#: ../midori/midori-browser.c:2505 msgid "_Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami" -#: ../src/midori-browser.c:2176 +#: ../midori/midori-browser.c:2506 msgid "Add, edit and remove search engines..." -msgstr "" +msgstr "Zarządzaj wyszukiwarkami internetowymi..." -#: ../src/midori-browser.c:2179 +#: ../midori/midori-browser.c:2509 msgid "_Window" msgstr "_Okno" -#: ../src/midori-browser.c:2181 +#: ../midori/midori-browser.c:2511 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../src/midori-browser.c:2184 +#: ../midori/midori-browser.c:2512 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:2514 msgid "_Next Tab" msgstr "_Następna karta" -#: ../src/midori-browser.c:2187 +#: ../midori/midori-browser.c:2515 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:2517 msgid "Tab _Overview" +msgstr "P_odgląd kart" + +#: ../midori/midori-browser.c:2518 +msgid "Show an overview of all open tabs" msgstr "" #. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2190 +#: ../midori/midori-browser.c:2520 msgid "_Help" msgstr "Pomo_c" -#: ../src/midori-browser.c:2192 +#: ../midori/midori-browser.c:2522 msgid "_Contents" msgstr "_Zawartość" -#: ../src/midori-browser.c:2202 +#: ../midori/midori-browser.c:2523 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:2526 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:2532 msgid "P_rivate Browsing" msgstr "P_rywatne przeglądanie" -#: ../src/midori-browser.c:2206 +#: ../midori/midori-browser.c:2533 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:2536 msgid "_Work Offline" msgstr "Pracuj bez podłączenia" -#: ../src/midori-browser.c:2211 +#: ../midori/midori-browser.c:2537 +msgid "Work without a network connection" +msgstr "" + +#: ../midori/midori-browser.c:2541 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../src/midori-browser.c:2215 +#: ../midori/midori-browser.c:2542 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:2545 msgid "Side_panel" msgstr "Panel _boczny" -#: ../src/midori-browser.c:2219 +#: ../midori/midori-browser.c:2546 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:2549 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../src/midori-browser.c:2223 +#: ../midori/midori-browser.c:2550 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:2553 msgid "_Transferbar" msgstr "_Pasek pobierania plików" -#: ../src/midori-browser.c:2227 +#: ../midori/midori-browser.c:2554 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:2557 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../src/midori-browser.c:2681 +#: ../midori/midori-browser.c:2558 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:3067 msgid "Bookmarks" msgstr "Zakładki" #. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 +#: ../midori/midori-browser.c:3074 +#: ../midori/midori-preferences.c:248 msgid "Transfers" msgstr "Pobierania plików" -#: ../src/midori-browser.c:2697 +#: ../midori/midori-browser.c:3083 msgid "Console" msgstr "Konsola" -#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 +#: ../midori/midori-browser.c:3090 +#: ../midori/midori-preferences.c:395 msgid "History" msgstr "Historia" -#: ../src/midori-browser.c:2713 +#: ../midori/midori-browser.c:3099 msgid "Pageholder" msgstr "" -#: ../src/midori-browser.c:2722 -#, fuzzy -msgid "Userscripts" -msgstr "Włącz obsługę języków skryptowych" - -#: ../src/midori-browser.c:2748 +#: ../midori/midori-browser.c:3134 msgid "_Inline find:" msgstr "Wyszukaj:" -#: ../src/midori-browser.c:2774 +#: ../midori/midori-browser.c:3160 msgid "Match Case" msgstr "Uwzg_lędniaj wielkość liter" -#: ../src/midori-browser.c:2791 +#: ../midori/midori-browser.c:3177 msgid "Close Findbar" msgstr "Zamknij" -#: ../src/midori-browser.c:2815 -msgid "Extensions" -msgstr "" - -#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 -#, fuzzy, c-format -msgid "Unexpected setting '%s'" -msgstr "Zaawansowane ustawienia" - -#: ../src/midori-browser.c:3278 +#: ../midori/midori-browser.c:3382 +#: ../midori/midori-webview.c:556 #, c-format -msgid "Unexpected action '%s'." -msgstr "" +msgid "Unexpected setting '%s'" +msgstr "Niespodziewane ustawienie '%s'" -#: ../src/midori-panel.c:147 +#: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "" -#: ../src/midori-panel.c:157 +#: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "" -#: ../src/midori-panel.c:166 +#: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "" -#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 +#: ../midori/midori-panel.c:212 +#: ../midori/midori-panel.c:213 msgid "Close panel" msgstr "" -#: ../src/midori-panel.c:391 +#: ../midori/midori-panel.c:391 msgid "Untitled" msgstr "Bez tytułu" -#: ../src/midori-trash.c:97 +#: ../midori/midori-trash.c:96 +msgid "Limit" +msgstr "" + +#: ../midori/midori-trash.c:97 msgid "The maximum number of items" msgstr "" -#: ../src/midori-websettings.c:130 -#, fuzzy +#: ../midori/midori-websettings.c:132 msgid "Blank page" msgstr "Pusta strona" -#: ../src/midori-websettings.c:132 -#, fuzzy +#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:418 +msgid "Homepage" +msgstr "Strona startowa" + +#: ../midori/midori-websettings.c:134 msgid "Last open pages" msgstr "Ostatnio otwarte strony" -#: ../src/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Chinese (BIG5)" -msgstr "" +msgstr "Chiński tradycyjny (BIG5)" -#: ../src/midori-websettings.c:148 +#: ../midori/midori-websettings.c:150 msgid "Japanese (SHIFT_JIS)" -msgstr "" +msgstr "Japoński (SHIFT_JIS)" -#: ../src/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Russian (KOI8-R)" -msgstr "" +msgstr "Rosyjski (KOI8-R)" -#: ../src/midori-websettings.c:150 +#: ../midori/midori-websettings.c:152 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "Unicode (UTF-8)" -#: ../src/midori-websettings.c:151 +#: ../midori/midori-websettings.c:153 msgid "Western (ISO-8859-1)" -msgstr "" +msgstr "Zachodni (ISO-8859-1)" -#: ../src/midori-websettings.c:152 +#: ../midori/midori-websettings.c:154 msgid "Custom..." -msgstr "" +msgstr "Dostosuj..." -#: ../src/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "New tab" msgstr "nowej karcie" -#: ../src/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "New window" msgstr "nowym oknie" -#: ../src/midori-websettings.c:169 +#: ../midori/midori-websettings.c:171 msgid "Current tab" msgstr "bieżącej karcie" -#: ../src/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Default" msgstr "Domyślnie" -#: ../src/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Icons" msgstr "Tylko ikony" -#: ../src/midori-websettings.c:186 +#: ../midori/midori-websettings.c:188 msgid "Text" msgstr "Tylko tekst" -#: ../src/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Both" msgstr "Tekst pod ikonami" -#: ../src/midori-websettings.c:188 +#: ../midori/midori-websettings.c:190 msgid "Both horizontal" msgstr "Tekst obok ikon" -#: ../src/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "All cookies" msgstr "Wszystkie ciasteczka" -#: ../src/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Session cookies" msgstr "Ciasteczka sesji" -#: ../src/midori-websettings.c:205 +#: ../midori/midori-websettings.c:207 msgid "None" msgstr "Żadne" -#: ../src/midori-websettings.c:247 -#, fuzzy +#: ../midori/midori-websettings.c:249 msgid "Remember last window size" -msgstr "Przechowuj informację o pobranych plikach" +msgstr "" -#: ../src/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "Whether to save the last window size" msgstr "" -#: ../src/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Last window width" msgstr "" -#: ../src/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "The last saved window width" msgstr "" -#: ../src/midori-websettings.c:265 +#: ../midori/midori-websettings.c:267 msgid "Last window height" msgstr "" -#: ../src/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "The last saved window height" msgstr "" -#: ../src/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Last panel position" msgstr "" -#: ../src/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "The last saved panel position" msgstr "" -#: ../src/midori-websettings.c:283 -#, fuzzy +#: ../midori/midori-websettings.c:285 msgid "Last panel page" -msgstr "Ostatnio otwarte strony" +msgstr "" -#: ../src/midori-websettings.c:284 +#: ../midori/midori-websettings.c:286 msgid "The last saved panel page" msgstr "" -#: ../src/midori-websettings.c:292 -#, fuzzy +#: ../midori/midori-websettings.c:294 msgid "Last Web search" -msgstr "Pokazuj wyszukiwarki internetowe" +msgstr "" -#: ../src/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "The last saved Web search" msgstr "" -#: ../src/midori-websettings.c:301 +#: ../midori/midori-websettings.c:303 msgid "Last pageholder URI" msgstr "" -#: ../src/midori-websettings.c:302 +#: ../midori/midori-websettings.c:304 msgid "The URI last opened in the pageholder" msgstr "" -#: ../src/midori-websettings.c:312 -#, fuzzy +#: ../midori/midori-websettings.c:314 msgid "Show Navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" +msgstr "" -#: ../src/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Whether to show the navigationbar" msgstr "" -#: ../src/midori-websettings.c:321 -#, fuzzy +#: ../midori/midori-websettings.c:323 msgid "Show Bookmarkbar" -msgstr "Pasek _zakładek" +msgstr "" -#: ../src/midori-websettings.c:322 +#: ../midori/midori-websettings.c:324 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../src/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Show Panel" msgstr "" -#: ../src/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Whether to show the panel" msgstr "" -#: ../src/midori-websettings.c:339 -#, fuzzy +#: ../midori/midori-websettings.c:341 msgid "Show Statusbar" -msgstr "Pasek stanu" +msgstr "Pasek _stanu" -#: ../src/midori-websettings.c:340 -#, fuzzy +#: ../midori/midori-websettings.c:342 msgid "Whether to show the statusbar" -msgstr "Tekst wyświetlany na pasku stanu" +msgstr "" -#: ../src/midori-websettings.c:349 -#, fuzzy +#: ../midori/midori-websettings.c:351 msgid "Toolbar Style" -msgstr "Etykiety przycisków paska narzędziowego" +msgstr "" -#: ../src/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The style of the toolbar" msgstr "" -#: ../src/midori-websettings.c:359 +#: ../midori/midori-websettings.c:361 msgid "Small toolbar" msgstr "" -#: ../src/midori-websettings.c:360 -#, fuzzy +#: ../midori/midori-websettings.c:362 msgid "Use small toolbar icons" -msgstr "Pokazuj małe ikony" +msgstr "" -#: ../src/midori-websettings.c:368 -#, fuzzy +#: ../midori/midori-websettings.c:370 msgid "Show New Tab" msgstr "Pokazuj przycisk \"Nowa karta\"" -#: ../src/midori-websettings.c:369 +#: ../midori/midori-websettings.c:371 msgid "Show the New Tab button in the toolbar" msgstr "" -#: ../src/midori-websettings.c:377 -#, fuzzy +#: ../midori/midori-websettings.c:379 +msgid "Show Homepage" +msgstr "Pokazuj stronę startową" + +#: ../midori/midori-websettings.c:380 +msgid "Show the Homepage button in the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:388 msgid "Show Web search" msgstr "Pokazuj wyszukiwarki internetowe" -#: ../src/midori-websettings.c:378 +#: ../midori/midori-websettings.c:389 msgid "Show the Web search entry in the toolbar" msgstr "" -#: ../src/midori-websettings.c:386 -#, fuzzy +#: ../midori/midori-websettings.c:397 msgid "Show Trash" -msgstr "Pokazuj śmietnik" +msgstr "Pokazuj kosz" -#: ../src/midori-websettings.c:387 +#: ../midori/midori-websettings.c:398 msgid "Show the Trash button in the toolbar" msgstr "" -#: ../src/midori-websettings.c:397 -#, fuzzy +#: ../midori/midori-websettings.c:408 msgid "Load on Startup" msgstr "Pokaż przy uruchomieniu" -#: ../src/midori-websettings.c:398 -#, fuzzy +#: ../midori/midori-websettings.c:409 msgid "What to load on startup" msgstr "Pokaż przy uruchomieniu" -#: ../src/midori-websettings.c:408 -#, fuzzy +#: ../midori/midori-websettings.c:419 msgid "The homepage" msgstr "Strona startowa" -#: ../src/midori-websettings.c:416 -#, fuzzy +#: ../midori/midori-websettings.c:427 msgid "Download Folder" msgstr "Katalog pobierania plików" -#: ../src/midori-websettings.c:417 -#, fuzzy +#: ../midori/midori-websettings.c:428 msgid "The folder downloaded files are saved to" -msgstr "Wybiera katalog pobierania plików" +msgstr "" -#: ../src/midori-websettings.c:425 +#: ../midori/midori-websettings.c:436 msgid "Show Download Notification" msgstr "" -#: ../src/midori-websettings.c:426 +#: ../midori/midori-websettings.c:437 msgid "Show a notification window for finished downloads" -msgstr "" +msgstr "Pokazuj powiadomienie dla zakończonych pobierań" -#: ../src/midori-websettings.c:434 -#, fuzzy +#: ../midori/midori-websettings.c:445 msgid "Location entry Search" -msgstr "Adres wyszukiwarki internetowej" +msgstr "Adres domyślnej wyszukiwarki internetowej" -#: ../src/midori-websettings.c:435 +#: ../midori/midori-websettings.c:446 msgid "The search to perform inside the location entry" msgstr "" -#: ../src/midori-websettings.c:443 -#, fuzzy +#: ../midori/midori-websettings.c:454 msgid "Preferred Encoding" -msgstr "Preferowane języki" +msgstr "Preferowane kodowanie znaków" -#: ../src/midori-websettings.c:444 +#: ../midori/midori-websettings.c:455 msgid "The preferred character encoding" msgstr "" -#: ../src/midori-websettings.c:455 -#, fuzzy +#: ../midori/midori-websettings.c:466 msgid "Tab Label Size" -msgstr "Rozmiar karty" +msgstr "" -#: ../src/midori-websettings.c:456 +#: ../midori/midori-websettings.c:467 msgid "The desired tab label size" msgstr "" -#: ../src/midori-websettings.c:464 -#, fuzzy +#: ../midori/midori-websettings.c:475 msgid "Close Buttons on Tabs" msgstr "Pokazuj przyciski zamykania kart" -#: ../src/midori-websettings.c:465 +#: ../midori/midori-websettings.c:476 msgid "Whether tabs have close buttons" msgstr "" -#: ../src/midori-websettings.c:473 -#, fuzzy +#: ../midori/midori-websettings.c:484 msgid "Open new pages in" msgstr "Otwieraj nowe strony w" -#: ../src/midori-websettings.c:474 -#, fuzzy +#: ../midori/midori-websettings.c:485 msgid "Where to open new pages" msgstr "Otwieraj nowe strony w" -#: ../src/midori-websettings.c:483 -#, fuzzy +#: ../midori/midori-websettings.c:494 msgid "Middle click opens Selection" -msgstr "_Środkowy przycisk myszy otwiera zaznaczoną stronę" +msgstr "Środkowy przycisk myszy otwiera zaznaczoną stronę" -#: ../src/midori-websettings.c:484 +#: ../midori/midori-websettings.c:495 msgid "Load an URL from the selection via middle click" msgstr "" -#: ../src/midori-websettings.c:492 -#, fuzzy +#: ../midori/midori-websettings.c:503 msgid "Open tabs in the background" msgstr "Otwieraj nowe karty w tle" -#: ../src/midori-websettings.c:493 -#, fuzzy +#: ../midori/midori-websettings.c:504 msgid "Whether to open new tabs in the background" msgstr "Otwieraj nowe karty w tle" -#: ../src/midori-websettings.c:501 -#, fuzzy +#: ../midori/midori-websettings.c:512 msgid "Open popups in tabs" msgstr "Otwieraj wyskakujące okienka jako karty" -#: ../src/midori-websettings.c:502 -#, fuzzy +#: ../midori/midori-websettings.c:513 msgid "Whether to open popup windows in tabs" -msgstr "Otwieraj wyskakujące okienka jako karty" +msgstr "Czy otwierać wyskakujące okienka jako karty" -#: ../src/midori-websettings.c:512 +#: ../midori/midori-websettings.c:523 msgid "Accept cookies" msgstr "Akceptuj ciasteczka" -#: ../src/midori-websettings.c:513 +#: ../midori/midori-websettings.c:524 msgid "What type of cookies to accept" msgstr "" -#: ../src/midori-websettings.c:522 +#: ../midori/midori-websettings.c:533 msgid "Original cookies only" msgstr "" -#: ../src/midori-websettings.c:523 -#, fuzzy +#: ../midori/midori-websettings.c:534 msgid "Accept cookies from the original website only" msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" -#: ../src/midori-websettings.c:531 +#: ../midori/midori-websettings.c:542 msgid "Maximum cookie age" msgstr "Przechowuj ciasteczka przez:" -#: ../src/midori-websettings.c:532 +#: ../midori/midori-websettings.c:543 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../src/midori-websettings.c:542 -#, fuzzy +#: ../midori/midori-websettings.c:553 msgid "Remember last visited pages" -msgstr "Przechowuj adresy odwiedzonych stron" +msgstr "Przechowuj adresy ostatnio odwiedzonych stron" -#: ../src/midori-websettings.c:543 +#: ../midori/midori-websettings.c:554 msgid "Whether the last visited pages are saved" msgstr "" -#: ../src/midori-websettings.c:551 -#, fuzzy +#: ../midori/midori-websettings.c:562 msgid "Maximum history age" -msgstr "Przechowuj ciasteczka przez:" +msgstr "" -#: ../src/midori-websettings.c:552 +#: ../midori/midori-websettings.c:563 msgid "The maximum number of days to save the history for" msgstr "" -#: ../src/midori-websettings.c:560 -#, fuzzy +#: ../midori/midori-websettings.c:571 msgid "Remember last form inputs" msgstr "Przechowuj dane z formularzy" -#: ../src/midori-websettings.c:561 +#: ../midori/midori-websettings.c:572 msgid "Whether the last form inputs are saved" msgstr "" -#: ../src/midori-websettings.c:569 -#, fuzzy +#: ../midori/midori-websettings.c:580 msgid "Remember last downloaded files" -msgstr "Przechowuj informację o pobranych plikach" +msgstr "Przechowuj informację o ostatnio pobranych plikach" -#: ../src/midori-websettings.c:570 +#: ../midori/midori-websettings.c:581 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../src/midori-websettings.c:580 +#: ../midori/midori-websettings.c:591 msgid "HTTP Proxy" -msgstr "" +msgstr "Serwer proxy HTTP" -#: ../src/midori-websettings.c:581 +#: ../midori/midori-websettings.c:592 msgid "The proxy used for HTTP connections" msgstr "" -#: ../src/midori-websettings.c:589 +#: ../midori/midori-websettings.c:600 msgid "Cache size" msgstr "Rozmiar pamięci podręcznej" -#: ../src/midori-websettings.c:590 +#: ../midori/midori-websettings.c:601 msgid "The allowed size of the cache" msgstr "" -#: ../src/midori-webview.c:217 +#: ../midori/midori-webview.c:198 msgid "The icon of the currently loaded page" msgstr "" -#: ../src/midori-webview.c:226 +#: ../midori/midori-webview.c:207 msgid "The URI of the currently loaded page" msgstr "" -#: ../src/midori-webview.c:235 +#: ../midori/midori-webview.c:216 msgid "The title of the currently loaded page" msgstr "" -#: ../src/midori-webview.c:471 +#: ../midori/midori-webview.c:454 msgid "Open Link in New _Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../src/midori-webview.c:494 +#: ../midori/midori-webview.c:477 msgid "Open URL in New _Tab" msgstr "Otwórz URL w nowej karcie" -#: ../src/midori-preferences.c:64 +#: ../midori/midori-preferences.c:64 msgid "Settings instance to provide properties" msgstr "" -#: ../src/midori-preferences.c:87 +#: ../midori/midori-preferences.c:87 #, c-format msgid "%s Preferences" msgstr "Preferencje %s" #. Page "General" -#: ../src/midori-preferences.c:239 +#: ../midori/midori-preferences.c:236 msgid "General" msgstr "Ogólne" -#: ../src/midori-preferences.c:240 +#: ../midori/midori-preferences.c:237 msgid "Startup" -msgstr "Uruhomienie" +msgstr "Uruchomienie" #. Page "Appearance" -#: ../src/midori-preferences.c:261 +#: ../midori/midori-preferences.c:258 msgid "Appearance" msgstr "Wygląd" -#: ../src/midori-preferences.c:262 +#: ../midori/midori-preferences.c:259 msgid "Font settings" msgstr "Ustawienia czcionek" #. Page "Behavior" -#: ../src/midori-preferences.c:283 +#: ../midori/midori-preferences.c:280 msgid "Behavior" msgstr "Zachowanie" -#: ../src/midori-preferences.c:284 +#: ../midori/midori-preferences.c:281 msgid "Features" msgstr "Treść" #. Page "Interface" -#: ../src/midori-preferences.c:316 +#: ../midori/midori-preferences.c:331 msgid "Interface" msgstr "Interfejs" -#: ../src/midori-preferences.c:330 +#: ../midori/midori-preferences.c:345 msgid "Browsing" msgstr "Przeglądanie" #. Page "Network" -#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 +#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:362 msgid "Network" msgstr "Sieć" -#: ../src/midori-preferences.c:358 +#: ../midori/midori-preferences.c:373 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../src/midori-preferences.c:363 +#: ../midori/midori-preferences.c:378 msgid "Privacy" msgstr "Prywatność" -#: ../src/midori-preferences.c:364 -#, fuzzy +#: ../midori/midori-preferences.c:379 msgid "Web Cookies" msgstr "Ciasteczka" -#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 +#: ../midori/midori-preferences.c:392 +#: ../midori/midori-preferences.c:402 msgid "days" msgstr "dni" -#: ../src/sokoke.c:295 -msgid "Warning: You are using a superuser account!" -msgstr "Uwaga: Używasz konta administratora!" +#: ../midori/midori-webitem.c:70 +msgid "Name" +msgstr "Nazwa:" -#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 -#, c-format -msgid "Writing failed." -msgstr "Zapis nie powiódł się" +#: ../midori/midori-webitem.c:71 +msgid "The name of the web item" +msgstr "" -#: ../src/webSearch.c:115 +#: ../midori/midori-webitem.c:79 +msgid "Description" +msgstr "Opis:" + +#: ../midori/midori-webitem.c:80 +msgid "The description of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:88 +msgid "URI" +msgstr "" + +#: ../midori/midori-webitem.c:89 +msgid "The URI of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:97 +msgid "Icon" +msgstr "" + +#: ../midori/midori-webitem.c:98 +msgid "The icon of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:106 +msgid "Token" +msgstr "" + +#: ../midori/midori-webitem.c:107 +msgid "The token of the web item" +msgstr "" + +#: ../midori/midori-searchentry.c:80 +msgid "Current Item" +msgstr "" + +#: ../midori/midori-searchentry.c:81 +msgid "The currently selected item" +msgstr "" + +#: ../midori/midori-searchentry.c:89 +msgid "Dialog" +msgstr "" + +#: ../midori/midori-searchentry.c:90 +msgid "A dialog to manage search engines" +msgstr "" + +#: ../midori/midori-searchentry.c:144 msgid "Empty" msgstr "Puste" -#: ../src/webSearch.c:187 +#: ../midori/midori-searchentry.c:520 msgid "Add search engine" msgstr "Dodaj wyszukiwarkę internetową" -#: ../src/webSearch.c:187 +#: ../midori/midori-searchentry.c:520 msgid "Edit search engine" msgstr "Modyfikuj przeglądarkę internetową" -#: ../src/webSearch.c:217 +#: ../midori/midori-searchentry.c:547 msgid "_Name:" msgstr "_Nazwa:" -#: ../src/webSearch.c:261 +#: ../midori/midori-searchentry.c:591 msgid "_Icon (name or file):" msgstr "_Ikona (nazwa albo plik):" -#: ../src/webSearch.c:275 -msgid "_Keyword:" -msgstr "_Słowo kluczowe:" +#: ../midori/midori-searchentry.c:605 +msgid "_Token:" +msgstr "" -#: ../src/webSearch.c:344 +#: ../midori/midori-searchentry.c:726 msgid "Manage search engines" msgstr "_Zarządzaj wyszukiwarkami" -#: ../katze/katze-throbber.c:135 +#: ../midori/sokoke.c:294 +msgid "Warning: You are using a superuser account!" +msgstr "Uwaga: Używasz konta administratora!" + +#: ../midori/sokoke.c:468 +#: ../katze/katze-xbel.c:952 +msgid "Writing failed." +msgstr "Zapis nie powiódł się" + +#: ../midori/gjs.c:90 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/gjs.c:310 +#: ../midori/gjs.c:384 +#, c-format +msgid "%s has no property '%s'" +msgstr "" + +#: ../midori/gjs.c:430 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" + +#: ../midori/gjs.c:440 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" + +#: ../katze/katze-throbber.c:134 msgid "Symbolic size to use for the animation" msgstr "" -#: ../katze/katze-throbber.c:144 +#: ../katze/katze-throbber.c:143 msgid "The name of an icon containing animation frames" msgstr "" -#: ../katze/katze-throbber.c:153 +#: ../katze/katze-throbber.c:152 msgid "A GdkPixbuf containing animation frames" msgstr "" -#: ../katze/katze-throbber.c:162 +#: ../katze/katze-throbber.c:161 msgid "Whether the throbber should be animated" msgstr "" -#: ../katze/katze-throbber.c:171 +#: ../katze/katze-throbber.c:170 msgid "The name of an icon to be used as the static image" msgstr "" -#: ../katze/katze-throbber.c:180 +#: ../katze/katze-throbber.c:179 msgid "A GdkPixbuf to be used as the static image" msgstr "" -#: ../katze/katze-throbber.c:189 +#: ../katze/katze-throbber.c:188 msgid "The stock ID of an icon to be used as the static image" msgstr "" -#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#: ../katze/katze-utils.c:137 +#: ../katze/katze-utils.c:297 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +#: ../katze/katze-utils.c:159 +#: ../katze/katze-utils.c:183 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:161 -#, fuzzy +#: ../katze/katze-utils.c:171 msgid "Choose folder" -msgstr "Katalog pobierania plików" +msgstr "Wybór katalogu" -#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 +#: ../katze/katze-xbel.c:723 +#: ../katze/katze-xbel.c:731 +#: ../katze/katze-xbel.c:767 +#: ../katze/katze-xbel.c:775 #: ../katze/katze-xbel.c:804 msgid "Malformed document." msgstr "" @@ -1137,3 +1409,4 @@ msgstr "" #: ../katze/katze-xbel.c:759 msgid "File not found." msgstr "Nie znaleziono dokumentu" + From dd03a8cbe5d5325641c9a8c6c3fc30a4efab170e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 17 Jun 2008 19:20:53 +0200 Subject: [PATCH 0155/2970] Updated German translation --- po/de.po | 664 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 386 insertions(+), 278 deletions(-) diff --git a/po/de.po b/po/de.po index a5789076..68342dd6 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-10 16:18+0200\n" +"POT-Creation-Date: 2008-06-15 13:22+0200\n" "PO-Revision-Date: 2008-03-20 13:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -29,670 +29,703 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:46 +#: ../midori/main.c:45 msgid "Bookmark" msgstr "Lesezeichen" -#: ../midori/main.c:47 +#: ../midori/main.c:46 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:48 +#: ../midori/main.c:47 msgid "_Form Fill" msgstr "_Formulare ausfüllen" -#: ../midori/main.c:49 +#: ../midori/main.c:48 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:50 +#: ../midori/main.c:49 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:51 +#: ../midori/main.c:50 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:53 +#: ../midori/main.c:52 msgid "Select _All" msgstr "A_lles markieren" -#: ../midori/main.c:56 +#: ../midori/main.c:55 msgid "_Fullscreen" msgstr "_Vollbild" -#: ../midori/main.c:57 +#: ../midori/main.c:56 msgid "_Leave Fullscreen" msgstr "Vollbild _verlassen" -#: ../midori/main.c:97 +#: ../midori/main.c:110 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" -#: ../midori/main.c:153 +#: ../midori/main.c:165 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert '%s' ist ungültig für %s" -#: ../midori/main.c:160 ../midori/main.c:222 +#: ../midori/main.c:172 ../midori/main.c:241 #, c-format msgid "Unhandled settings value '%s'" msgstr "Unbehandelter Einstellungswert '%s'" -#: ../midori/main.c:236 ../midori/main.c:252 ../midori/main.c:254 -#: ../midori/main.c:268 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:243 +#: ../midori/main.c:334 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:248 +#: ../midori/main.c:342 ../midori/main.c:351 ../midori/main.c:353 +#: ../midori/main.c:367 +msgid "midori" +msgstr "midori" + +#: ../midori/main.c:347 msgid "[URL]" msgstr "[URL]" -#: ../midori/main.c:252 +#: ../midori/main.c:351 msgid "Unknown argument." msgstr "Unbekanntes Argument." -#: ../midori/main.c:254 +#: ../midori/main.c:353 msgid "Failed to setup interface." msgstr "Oberfläche konnte nicht eingerichtet werden." -#: ../midori/main.c:269 +#: ../midori/main.c:368 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:271 +#: ../midori/main.c:370 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:319 +#: ../midori/main.c:418 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:333 +#: ../midori/main.c:432 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Die Sitzung konnte nicht geladen werden. %s\n" -#: ../midori/main.c:345 +#: ../midori/main.c:444 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" -#: ../midori/main.c:355 +#: ../midori/main.c:454 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:479 +#: ../midori/main.c:583 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:488 +#: ../midori/main.c:593 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../midori/main.c:497 +#: ../midori/main.c:602 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht geladen werden. %s" -#: ../midori/main.c:509 +#: ../midori/main.c:614 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:518 +#: ../midori/main.c:623 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-browser.c:201 ../midori/midori-browser.c:2233 -#: ../midori/midori-browser.c:2239 +#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1075 +msgid "Settings" +msgstr "Einstellungen" + +#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1076 +msgid "The associated settings" +msgstr "Die zugewiesenen Einstellungen" + +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1114 +msgid "Trash" +msgstr "Papierkorb" + +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1115 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" + +#: ../midori/midori-app.c:132 +msgid "Browser" +msgstr "Navigator" + +#: ../midori/midori-app.c:133 +msgid "The current browser" +msgstr "Der aktuelle Navigator" + +#: ../midori/midori-app.c:141 +msgid "Browser Count" +msgstr "" + +#: ../midori/midori-app.c:142 +msgid "The current number of browsers" +msgstr "Die maximale Anzahl an Navigatoren" + +#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1128 +#: ../midori/midori-searchentry.c:71 +msgid "Search Engines" +msgstr "Suchmaschinen" + +#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:72 +msgid "The list of search engines" +msgstr "Die Liste der Suchmaschine" + +#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3199 +msgid "Extensions" +msgstr "Erweiterungen" + +#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3106 +msgid "Userscripts" +msgstr "Benutzerskripte" + +#: ../midori/midori-addons.c:42 +msgid "Userstyles" +msgstr "Benutzerstile" + +#: ../midori/midori-browser.c:202 ../midori/midori-browser.c:2423 +#: ../midori/midori-browser.c:2429 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:209 ../midori/midori-browser.c:2236 +#: ../midori/midori-browser.c:210 ../midori/midori-browser.c:2426 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:272 +#: ../midori/midori-browser.c:273 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:721 -msgid "Menubar" -msgstr "Menüleiste" - -#: ../midori/midori-browser.c:722 -msgid "The menubar" -msgstr "Die Menüleiste" - -#: ../midori/midori-browser.c:730 ../midori/midori-preferences.c:332 -msgid "Navigationbar" -msgstr "Navigationsleiste" - -#: ../midori/midori-browser.c:731 -msgid "The navigationbar" -msgstr "Die Navigationsleiste" - -#: ../midori/midori-browser.c:739 -msgid "Tab" -msgstr "Reiter" - -#: ../midori/midori-browser.c:740 -msgid "The current tab" -msgstr "Der aktuelle Reiter" - -#: ../midori/midori-browser.c:748 -msgid "Statusbar" -msgstr "Statusleiste" - -#: ../midori/midori-browser.c:749 -msgid "The statusbar" -msgstr "Die Statusleiste" - -#: ../midori/midori-browser.c:765 -msgid "Settings" -msgstr "Einstellungen" - -#: ../midori/midori-browser.c:766 -msgid "The associated settings" -msgstr "Die zugewiesenen Einstellungen" - -#: ../midori/midori-browser.c:785 -msgid "Statusbar Text" -msgstr "Statusleistenbeschriftung" - -#: ../midori/midori-browser.c:786 ../midori/midori-webview.c:224 -msgid "The text that is displayed in the statusbar" -msgstr "Der Text, der in der Statusleiste angezeigt wird" - -#: ../midori/midori-browser.c:804 -msgid "Trash" -msgstr "Papierkorb" - -#: ../midori/midori-browser.c:805 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" - -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:418 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:418 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:1457 +#: ../midori/midori-browser.c:445 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:1470 ../midori/webSearch.c:235 +#: ../midori/midori-browser.c:458 ../midori/midori-searchentry.c:501 msgid "_Description:" msgstr "_Beschreibung" -#: ../midori/midori-browser.c:1489 ../midori/webSearch.c:249 +#: ../midori/midori-browser.c:477 ../midori/midori-searchentry.c:515 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:1506 +#: ../midori/midori-browser.c:494 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:1510 +#: ../midori/midori-browser.c:498 msgid "Root" msgstr "Wurzel" -#: ../midori/midori-browser.c:1733 +#: ../midori/midori-browser.c:812 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Unerwartete Aktion '%s'." + +#: ../midori/midori-browser.c:1031 +msgid "Menubar" +msgstr "Menüleiste" + +#: ../midori/midori-browser.c:1032 +msgid "The menubar" +msgstr "Die Menüleiste" + +#: ../midori/midori-browser.c:1040 ../midori/midori-preferences.c:333 +msgid "Navigationbar" +msgstr "Navigationsleiste" + +#: ../midori/midori-browser.c:1041 +msgid "The navigationbar" +msgstr "Die Navigationsleiste" + +#: ../midori/midori-browser.c:1049 +msgid "Tab" +msgstr "Reiter" + +#: ../midori/midori-browser.c:1050 +msgid "The current tab" +msgstr "Der aktuelle Reiter" + +#: ../midori/midori-browser.c:1058 +msgid "Statusbar" +msgstr "Statusleiste" + +#: ../midori/midori-browser.c:1059 +msgid "The statusbar" +msgstr "Die Statusleiste" + +#: ../midori/midori-browser.c:1095 +msgid "Statusbar Text" +msgstr "Statusleistenbeschriftung" + +#: ../midori/midori-browser.c:1096 ../midori/midori-webview.c:225 +msgid "The text that is displayed in the statusbar" +msgstr "Der Text, der in der Statusleiste angezeigt wird" + +#: ../midori/midori-browser.c:1129 +msgid "The list of search engines to be used for web search" +msgstr "Die Liste der Suchmaschinen, die für die Netzsuche genutzt werden" + +#: ../midori/midori-browser.c:1935 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:1922 +#: ../midori/midori-browser.c:2112 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:1930 +#: ../midori/midori-browser.c:2120 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2156 +#: ../midori/midori-browser.c:2346 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:2159 +#: ../midori/midori-browser.c:2349 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:2162 +#: ../midori/midori-browser.c:2352 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:2165 +#: ../midori/midori-browser.c:2355 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:2168 +#: ../midori/midori-browser.c:2358 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:2170 +#: ../midori/midori-browser.c:2360 msgid "_Close Tab" msgstr "Reiter sch_ließen" -#: ../midori/midori-browser.c:2171 +#: ../midori/midori-browser.c:2361 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:2173 +#: ../midori/midori-browser.c:2363 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:2174 +#: ../midori/midori-browser.c:2364 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:2176 +#: ../midori/midori-browser.c:2366 msgid "Pa_ge Setup" msgstr "Seite _einrichten" -#: ../midori/midori-browser.c:2180 +#: ../midori/midori-browser.c:2370 msgid "Show a preview of the printed page" msgstr "Eine Vorschau auf die gedruckte Seite anzeigen" -#: ../midori/midori-browser.c:2183 +#: ../midori/midori-browser.c:2373 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:2186 +#: ../midori/midori-browser.c:2376 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:2188 +#: ../midori/midori-browser.c:2378 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:2191 +#: ../midori/midori-browser.c:2381 msgid "Undo the last modification" msgstr "Die letzte Änderung wiederrufen" -#: ../midori/midori-browser.c:2194 +#: ../midori/midori-browser.c:2384 msgid "Redo the last modification" msgstr "Die letzte Änderung wiederholen" -#: ../midori/midori-browser.c:2197 +#: ../midori/midori-browser.c:2387 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:2200 ../midori/midori-browser.c:2203 +#: ../midori/midori-browser.c:2390 ../midori/midori-browser.c:2393 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:2206 +#: ../midori/midori-browser.c:2396 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:2209 +#: ../midori/midori-browser.c:2399 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:2212 +#: ../midori/midori-browser.c:2402 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:2215 +#: ../midori/midori-browser.c:2405 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:2217 +#: ../midori/midori-browser.c:2407 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:2218 +#: ../midori/midori-browser.c:2408 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2220 +#: ../midori/midori-browser.c:2410 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:2221 +#: ../midori/midori-browser.c:2411 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2223 +#: ../midori/midori-browser.c:2413 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:2224 +#: ../midori/midori-browser.c:2414 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2417 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:2229 +#: ../midori/midori-browser.c:2419 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2420 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:2242 +#: ../midori/midori-browser.c:2432 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2245 +#: ../midori/midori-browser.c:2435 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2248 +#: ../midori/midori-browser.c:2438 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:2250 +#: ../midori/midori-browser.c:2440 msgid "View Source" msgstr "Quelltext anzeigen" -#: ../midori/midori-browser.c:2251 +#: ../midori/midori-browser.c:2441 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:2253 +#: ../midori/midori-browser.c:2443 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:2254 +#: ../midori/midori-browser.c:2444 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:2257 +#: ../midori/midori-browser.c:2447 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:2259 +#: ../midori/midori-browser.c:2449 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:2262 +#: ../midori/midori-browser.c:2452 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:2265 +#: ../midori/midori-browser.c:2455 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:2268 +#: ../midori/midori-browser.c:2458 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:2270 +#: ../midori/midori-browser.c:2460 msgid "Location..." msgstr "Ort..." -#: ../midori/midori-browser.c:2271 +#: ../midori/midori-browser.c:2461 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:2273 +#: ../midori/midori-browser.c:2463 msgid "Web Search..." msgstr "Netzsuche..." -#: ../midori/midori-browser.c:2274 +#: ../midori/midori-browser.c:2464 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:2276 +#: ../midori/midori-browser.c:2466 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen..." -#: ../midori/midori-browser.c:2277 +#: ../midori/midori-browser.c:2467 msgid "Open the current page in the pageholder" msgstr "Die aktuelle Seite im Seitenhalter öffnen" -#: ../midori/midori-browser.c:2279 +#: ../midori/midori-browser.c:2469 msgid "Closed Tabs and Windows" msgstr "Geschlossene Reiter und Fenster" -#: ../midori/midori-browser.c:2280 +#: ../midori/midori-browser.c:2470 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:2282 +#: ../midori/midori-browser.c:2472 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:2283 +#: ../midori/midori-browser.c:2473 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:2285 +#: ../midori/midori-browser.c:2475 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:2286 +#: ../midori/midori-browser.c:2476 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:2288 +#: ../midori/midori-browser.c:2478 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:2291 +#: ../midori/midori-browser.c:2481 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2293 +#: ../midori/midori-browser.c:2483 msgid "_Manage Bookmarks" msgstr "Lesezeichen _verwalten" -#: ../midori/midori-browser.c:2294 +#: ../midori/midori-browser.c:2484 msgid "Add, edit and remove bookmarks..." msgstr "Lesezeichen hinzufügen, bearbeiten und löschen..." -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:2487 msgid "Open the selected bookmark" msgstr "Markiertes Lesezeichen kopieren" -#: ../midori/midori-browser.c:2299 +#: ../midori/midori-browser.c:2489 msgid "Open in New _Tab" msgstr "In einem neuen _Reiter öffnen" -#: ../midori/midori-browser.c:2300 +#: ../midori/midori-browser.c:2490 msgid "Open the selected bookmark in a new tab" msgstr "Öffne das markierte Lesezeichen in einem neuen Reiter" -#: ../midori/midori-browser.c:2302 +#: ../midori/midori-browser.c:2492 msgid "Open in New _Window" msgstr "In einem neuen _Fenster öffnen" -#: ../midori/midori-browser.c:2303 +#: ../midori/midori-browser.c:2493 msgid "Open the selected bookmark in a new window" msgstr "Markiertes Lesezeichen in neuem Fenster öffnen" -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2496 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:2309 +#: ../midori/midori-browser.c:2499 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:2311 +#: ../midori/midori-browser.c:2501 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:2313 +#: ../midori/midori-browser.c:2503 msgid "_Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/midori-browser.c:2314 +#: ../midori/midori-browser.c:2504 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." -#: ../midori/midori-browser.c:2317 +#: ../midori/midori-browser.c:2507 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:2319 +#: ../midori/midori-browser.c:2509 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:2320 +#: ../midori/midori-browser.c:2510 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:2512 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:2323 +#: ../midori/midori-browser.c:2513 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:2325 +#: ../midori/midori-browser.c:2515 msgid "Tab _Overview" msgstr "Reiterüber_sicht" -#: ../midori/midori-browser.c:2326 +#: ../midori/midori-browser.c:2516 msgid "Show an overview of all open tabs" msgstr "Zeige eine Übersicht über alle offenen Reiter" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2518 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2520 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:2331 +#: ../midori/midori-browser.c:2521 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:2334 +#: ../midori/midori-browser.c:2524 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:2340 +#: ../midori/midori-browser.c:2530 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:2341 +#: ../midori/midori-browser.c:2531 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:2344 +#: ../midori/midori-browser.c:2534 msgid "_Work Offline" msgstr "_Ohne Verbindung arbeiten" -#: ../midori/midori-browser.c:2345 +#: ../midori/midori-browser.c:2535 msgid "Work without a network connection" msgstr "Ohne Netzwerkverbindung arbeiten" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:2539 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:2350 +#: ../midori/midori-browser.c:2540 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:2353 +#: ../midori/midori-browser.c:2543 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:2354 +#: ../midori/midori-browser.c:2544 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:2357 +#: ../midori/midori-browser.c:2547 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:2358 +#: ../midori/midori-browser.c:2548 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:2361 +#: ../midori/midori-browser.c:2551 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:2362 +#: ../midori/midori-browser.c:2552 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:2365 +#: ../midori/midori-browser.c:2555 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:2366 +#: ../midori/midori-browser.c:2556 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:2845 +#: ../midori/midori-browser.c:3065 msgid "Bookmarks" msgstr "Lesezeichen" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:2852 ../midori/midori-preferences.c:248 +#: ../midori/midori-browser.c:3072 ../midori/midori-preferences.c:249 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:3081 msgid "Console" msgstr "Konsole" -#: ../midori/midori-browser.c:2868 ../midori/midori-preferences.c:395 +#: ../midori/midori-browser.c:3088 ../midori/midori-preferences.c:396 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3097 msgid "Pageholder" msgstr "Seitenhalter" -#: ../midori/midori-browser.c:2886 -msgid "Userscripts" -msgstr "Benutzerskripte" - -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3132 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:2938 +#: ../midori/midori-browser.c:3158 msgid "Match Case" msgstr "Groß-/ Kleinschreibung beachten" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3175 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:2979 -msgid "Extensions" -msgstr "Erweiterungen" - -#: ../midori/midori-browser.c:3148 ../midori/midori-webview.c:555 +#: ../midori/midori-browser.c:3380 ../midori/midori-webview.c:556 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung '%s'" -#: ../midori/midori-browser.c:3456 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Unerwartete Aktion '%s'." - #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Erscheinungsbild des Schattens um jede Leiste" @@ -1101,23 +1134,23 @@ msgstr "Zwischenspeichergröße" msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-webview.c:197 +#: ../midori/midori-webview.c:198 msgid "The icon of the currently loaded page" msgstr "Das Symbol der aktuellen Seite" -#: ../midori/midori-webview.c:206 +#: ../midori/midori-webview.c:207 msgid "The URI of the currently loaded page" msgstr "Die URI der aktuellen Seite" -#: ../midori/midori-webview.c:215 +#: ../midori/midori-webview.c:216 msgid "The title of the currently loaded page" msgstr "Der Titel der aktuellen Seite" -#: ../midori/midori-webview.c:453 +#: ../midori/midori-webview.c:454 msgid "Open Link in New _Tab" msgstr "Verweis in einem neuen _Reiter öffnen" -#: ../midori/midori-webview.c:476 +#: ../midori/midori-webview.c:477 msgid "Open URL in New _Tab" msgstr "_URL in einem neuen Reiter öffnen" @@ -1125,131 +1158,206 @@ msgstr "_URL in einem neuen Reiter öffnen" msgid "Settings instance to provide properties" msgstr "Einstellungsinstanz mit erforderlichen Eigenschaften" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:88 #, c-format msgid "%s Preferences" msgstr "%s Einstellungen" #. Page "General" -#: ../midori/midori-preferences.c:236 +#: ../midori/midori-preferences.c:237 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:237 +#: ../midori/midori-preferences.c:238 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../midori/midori-preferences.c:258 +#: ../midori/midori-preferences.c:259 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:259 +#: ../midori/midori-preferences.c:260 msgid "Font settings" msgstr "Schrifteinstellungen" #. Page "Behavior" -#: ../midori/midori-preferences.c:280 +#: ../midori/midori-preferences.c:281 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:281 +#: ../midori/midori-preferences.c:282 msgid "Features" msgstr "Inhalte" #. Page "Interface" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:332 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:346 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:361 ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:362 ../midori/midori-preferences.c:363 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:374 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:378 +#: ../midori/midori-preferences.c:379 msgid "Privacy" msgstr "Privatsphäre" -#: ../midori/midori-preferences.c:379 +#: ../midori/midori-preferences.c:380 msgid "Web Cookies" msgstr "Verbindungskekse" -#: ../midori/midori-preferences.c:392 ../midori/midori-preferences.c:402 +#: ../midori/midori-preferences.c:393 ../midori/midori-preferences.c:403 msgid "days" msgstr "Tage" -#: ../midori/sokoke.c:286 +#: ../midori/midori-webitem.c:70 +msgid "Name" +msgstr "Name" + +#: ../midori/midori-webitem.c:71 +msgid "The name of the web item" +msgstr "Der Index des aktiven Elements" + +#: ../midori/midori-webitem.c:79 +msgid "Description" +msgstr "Beschreibung" + +#: ../midori/midori-webitem.c:80 +msgid "The description of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:88 +msgid "URI" +msgstr "" + +#: ../midori/midori-webitem.c:89 +msgid "The URI of the web item" +msgstr "Die URI des aktuellen Elements" + +#: ../midori/midori-webitem.c:97 +msgid "Icon" +msgstr "Symbol" + +#: ../midori/midori-webitem.c:98 +msgid "The icon of the web item" +msgstr "Der Index des aktiven Elements" + +#: ../midori/midori-webitem.c:106 +msgid "Token" +msgstr "" + +#: ../midori/midori-webitem.c:107 +msgid "The token of the web item" +msgstr "Das Kürzel des Netzelements" + +#: ../midori/midori-searchentry.c:80 +msgid "Current Item" +msgstr "Aktuelles Element" + +#: ../midori/midori-searchentry.c:81 +msgid "The currently selected item" +msgstr "Das aktuell ausgewählte Element" + +#: ../midori/midori-searchentry.c:89 +msgid "Dialog" +msgstr "Dialog" + +#: ../midori/midori-searchentry.c:90 +msgid "A dialog to manage search engines" +msgstr "Ein Dialog zum verwalten von Suchmaschinen" + +#: ../midori/midori-searchentry.c:144 +msgid "Empty" +msgstr "Leer" + +#: ../midori/midori-searchentry.c:458 +msgid "Add search engine" +msgstr "Suchmaschine hinzufügen" + +#: ../midori/midori-searchentry.c:458 +msgid "Edit search engine" +msgstr "Suchmaschine bearbeiten" + +#: ../midori/midori-searchentry.c:485 +msgid "_Name:" +msgstr "_Name:" + +#: ../midori/midori-searchentry.c:529 +msgid "_Icon (name or file):" +msgstr "_Symbol (Name oder Datei):" + +#: ../midori/midori-searchentry.c:543 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchentry.c:650 +msgid "Manage search engines" +msgstr "Suchmaschinen verwalten" + +#: ../midori/sokoke.c:294 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:449 ../katze/katze-xbel.c:952 +#: ../midori/sokoke.c:457 ../katze/katze-xbel.c:953 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/webSearch.c:117 -msgid "Empty" -msgstr "Leer" +#: ../midori/gjs.c:89 +msgid "An unknown error occured." +msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/webSearch.c:189 -msgid "Add search engine" -msgstr "Suchmaschine hinzufügen" +#: ../midori/gjs.c:309 ../midori/gjs.c:401 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s hat keine Eigenschaft '%s'" -#: ../midori/webSearch.c:189 -msgid "Edit search engine" -msgstr "Suchmaschine bearbeiten" +#: ../midori/gjs.c:447 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" -#: ../midori/webSearch.c:219 -msgid "_Name:" -msgstr "_Name:" +#: ../midori/gjs.c:457 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" -#: ../midori/webSearch.c:263 -msgid "_Icon (name or file):" -msgstr "_Symbol (Name oder Datei):" - -#: ../midori/webSearch.c:277 -msgid "_Keyword:" -msgstr "_Schlüsselwort:" - -#: ../midori/webSearch.c:346 -msgid "Manage search engines" -msgstr "Suchmaschinen verwalten" - -#: ../katze/katze-throbber.c:135 +#: ../katze/katze-throbber.c:134 msgid "Symbolic size to use for the animation" msgstr "Größenkonstante für die Animation" -#: ../katze/katze-throbber.c:144 +#: ../katze/katze-throbber.c:143 msgid "The name of an icon containing animation frames" msgstr "Der Name eines Symbols, welches Animationsbilder enthält" -#: ../katze/katze-throbber.c:153 +#: ../katze/katze-throbber.c:152 msgid "A GdkPixbuf containing animation frames" msgstr "Ein GdkPixbuf, welcher Animationsbilder enthält" -#: ../katze/katze-throbber.c:162 +#: ../katze/katze-throbber.c:161 msgid "Whether the throbber should be animated" msgstr "Ob das Aktivitätssymbol animiert sein soll" -#: ../katze/katze-throbber.c:171 +#: ../katze/katze-throbber.c:170 msgid "The name of an icon to be used as the static image" msgstr "Der Name eines Symbols, das als statisches Bild verwendet werden soll" -#: ../katze/katze-throbber.c:180 +#: ../katze/katze-throbber.c:179 msgid "A GdkPixbuf to be used as the static image" msgstr "Ein GdkPixbuf, welcher als statisches Bild verwendet werden soll" -#: ../katze/katze-throbber.c:189 +#: ../katze/katze-throbber.c:188 msgid "The stock ID of an icon to be used as the static image" msgstr "" "Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " @@ -1268,22 +1376,22 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 -#: ../katze/katze-xbel.c:804 +#: ../katze/katze-xbel.c:724 ../katze/katze-xbel.c:732 +#: ../katze/katze-xbel.c:768 ../katze/katze-xbel.c:776 +#: ../katze/katze-xbel.c:805 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../katze/katze-xbel.c:759 +#: ../katze/katze-xbel.c:760 msgid "File not found." msgstr "Datei nicht gefunden." +#~ msgid "_Keyword:" +#~ msgstr "_Schlüsselwort:" + #~ msgid "Debugging" #~ msgstr "Fehlerbehebung" -#~ msgid "Unhandled settings property '%s'" -#~ msgstr "Unbehandelte Einstellungseigenschaft '%s'" - #~ msgid "Midori Web Browser" #~ msgstr "Midori Netznavigator" From a7ebd75387d59ae2ca61126e6d50bd2828cedccc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 20:39:00 +0200 Subject: [PATCH 0156/2970] Simplify MidoriBrowser, remove Private --- midori/midori-browser.c | 745 +++++++++++++++++----------------------- midori/midori-browser.h | 8 - 2 files changed, 310 insertions(+), 443 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 48638eb4..660412c2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -29,10 +29,10 @@ #include #include -G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) - -struct _MidoriBrowserPrivate +struct _MidoriBrowser { + GtkWindow parent_instance; + GtkActionGroup* action_group; GtkWidget* menubar; GtkWidget* menu_bookmarks; @@ -74,9 +74,7 @@ struct _MidoriBrowserPrivate MidoriWebList* search_engines; }; -#define MIDORI_BROWSER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_BROWSER, MidoriBrowserPrivate)) +G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) enum { @@ -128,9 +126,7 @@ static GtkAction* _action_by_name (MidoriBrowser* browser, const gchar* name) { - MidoriBrowserPrivate* priv = browser->priv; - - return gtk_action_group_get_action (priv->action_group, name); + return gtk_action_group_get_action (browser->action_group, name); } static void @@ -153,17 +149,15 @@ _action_set_active (MidoriBrowser* browser, static void _midori_browser_update_actions (MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - guint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), n > 1); + guint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); _action_set_sensitive (browser, "TabClose", n > 1); _action_set_sensitive (browser, "TabPrevious", n > 1); _action_set_sensitive (browser, "TabNext", n > 1); - if (priv->trash) + if (browser->trash) { - gboolean trash_empty = midori_trash_is_empty (priv->trash); + gboolean trash_empty = midori_trash_is_empty (browser->trash); _action_set_sensitive (browser, "UndoTabClose", !trash_empty); _action_set_sensitive (browser, "Trash", !trash_empty); } @@ -172,8 +166,6 @@ _midori_browser_update_actions (MidoriBrowser* browser) static void _midori_browser_update_interface (MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean loading = FALSE; GtkWidget* web_view = midori_browser_get_current_web_view (browser); if (web_view) @@ -192,26 +184,26 @@ _midori_browser_update_interface (MidoriBrowser* browser) else _action_set_sensitive (browser, "Print", FALSE); - GtkAction* action = gtk_action_group_get_action (priv->action_group, + GtkAction* action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); if (!loading) { - gtk_widget_set_sensitive (priv->throbber, FALSE); + gtk_widget_set_sensitive (browser->throbber, FALSE); g_object_set (action, "stock-id", GTK_STOCK_REFRESH, "tooltip", _("Reload the current page"), NULL); - gtk_widget_hide (priv->progressbar); + gtk_widget_hide (browser->progressbar); } else { - gtk_widget_set_sensitive (priv->throbber, TRUE); + gtk_widget_set_sensitive (browser->throbber, TRUE); g_object_set (action, "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); - gtk_widget_show (priv->progressbar); + gtk_widget_show (browser->progressbar); } - katze_throbber_set_animated (KATZE_THROBBER (priv->throbber), loading); - gtk_image_set_from_stock (GTK_IMAGE (priv->location_icon), + katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); + gtk_image_set_from_stock (GTK_IMAGE (browser->location_icon), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); } @@ -239,22 +231,18 @@ static void _midori_browser_set_statusbar_text (MidoriBrowser* browser, const gchar* text) { - MidoriBrowserPrivate* priv = browser->priv; - - katze_assign (priv->statusbar_text, g_strdup (text)); - gtk_statusbar_pop (GTK_STATUSBAR (priv->statusbar), 1); - gtk_statusbar_push (GTK_STATUSBAR (priv->statusbar), 1, - priv->statusbar_text ? priv->statusbar_text : ""); + katze_assign (browser->statusbar_text, g_strdup (text)); + gtk_statusbar_pop (GTK_STATUSBAR (browser->statusbar), 1); + gtk_statusbar_push (GTK_STATUSBAR (browser->statusbar), 1, + browser->statusbar_text ? browser->statusbar_text : ""); } static void _midori_browser_set_current_page_smartly (MidoriBrowser* browser, gint n) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean open_tabs_in_the_background; - g_object_get (priv->settings, "open-tabs-in-the-background", + g_object_get (browser->settings, "open-tabs-in-the-background", &open_tabs_in_the_background, NULL); if (!open_tabs_in_the_background) midori_browser_set_current_page (browser, n); @@ -264,21 +252,19 @@ static void _midori_browser_update_progress (MidoriBrowser* browser, gint progress) { - MidoriBrowserPrivate* priv = browser->priv; - if (progress > -1) { - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progressbar), + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (browser->progressbar), progress ? progress / 100.0 : 0); gchar* message = g_strdup_printf (_("%d%% loaded"), progress); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progressbar), + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), message); g_free (message); } else { - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progressbar)); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progressbar), + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (browser->progressbar)); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), NULL); } } @@ -383,12 +369,10 @@ midori_web_view_load_committed_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - if (web_view == midori_browser_get_current_web_view (browser)) { const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - gtk_entry_set_text (GTK_ENTRY (priv->location), uri); + gtk_entry_set_text (GTK_ENTRY (browser->location), uri); _midori_browser_set_statusbar_text (browser, NULL); } } @@ -400,9 +384,7 @@ midori_web_view_console_message_cb (GtkWidget* web_view, const gchar* source_id, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - midori_console_add (MIDORI_CONSOLE (priv->panel_console), + midori_console_add (MIDORI_CONSOLE (browser->panel_console), message, line, source_id); return TRUE; } @@ -411,8 +393,6 @@ static void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeXbelItem* bookmark) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean new_bookmark = !bookmark; GtkWidget* dialog = gtk_dialog_new_with_buttons ( new_bookmark ? _("New bookmark") : _("Edit bookmark"), @@ -517,7 +497,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (new_bookmark) { katze_xbel_folder_append_item (bookmarks, bookmark); - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); GtkTreeIter iter; gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), @@ -634,21 +614,19 @@ static void midori_web_view_close_cb (GtkWidget* web_view, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - if (priv->proxy_xbel_folder) + if (browser->proxy_xbel_folder) { KatzeXbelItem* xbel_item = midori_web_view_get_proxy_xbel_item ( MIDORI_WEB_VIEW (web_view)); const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); - if (priv->trash && uri && *uri) - midori_trash_prepend_xbel_item (priv->trash, xbel_item); - katze_xbel_folder_remove_item (priv->proxy_xbel_folder, xbel_item); + if (browser->trash && uri && *uri) + midori_trash_prepend_xbel_item (browser->trash, xbel_item); + katze_xbel_folder_remove_item (browser->proxy_xbel_folder, xbel_item); katze_xbel_item_unref (xbel_item); } GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); - guint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), n); + guint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); + gtk_notebook_remove_page (GTK_NOTEBOOK (browser->notebook), n); _midori_browser_update_actions (browser); } @@ -672,18 +650,15 @@ midori_browser_window_menu_item_activate_cb (GtkWidget* widget, return; } - MidoriBrowserPrivate* priv = browser->priv; - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); - guint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + guint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); } static gint _midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* widget) { - MidoriBrowserPrivate* priv; GtkWidget* scrolled; GtkWidget* child; GObjectClass* gobject_class; @@ -692,7 +667,6 @@ _midori_browser_add_tab (MidoriBrowser* browser, KatzeXbelItem* xbel_item; guint n; - priv = browser->priv; scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, @@ -717,12 +691,12 @@ _midori_browser_add_tab (MidoriBrowser* browser, label = midori_web_view_get_proxy_tab_label (MIDORI_WEB_VIEW (widget)); menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); - if (priv->proxy_xbel_folder) + if (browser->proxy_xbel_folder) { xbel_item = midori_web_view_get_proxy_xbel_item ( MIDORI_WEB_VIEW (widget)); katze_xbel_item_ref (xbel_item); - katze_xbel_folder_append_item (priv->proxy_xbel_folder, xbel_item); + katze_xbel_folder_append_item (browser->proxy_xbel_folder, xbel_item); } g_object_connect (widget, @@ -768,21 +742,21 @@ _midori_browser_add_tab (MidoriBrowser* browser, gtk_widget_show (menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); } - n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); - gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), scrolled, + n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), scrolled, label, n + 1); #if GTK_CHECK_VERSION(2, 10, 0) - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook), scrolled, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (browser->notebook), scrolled, TRUE); #endif _midori_browser_update_actions (browser); - n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); return n; } @@ -790,13 +764,11 @@ static gint _midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri) { - MidoriBrowserPrivate* priv; GtkWidget* web_view; - priv = browser->priv; web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, "uri", uri, - "settings", priv->settings, + "settings", browser->settings, NULL); gtk_widget_show (web_view); @@ -1131,8 +1103,6 @@ midori_browser_class_init (MidoriBrowserClass* class) _("The list of search engines to be used for web search"), MIDORI_TYPE_WEB_LIST, G_PARAM_READWRITE)); - - g_type_class_add_private (class, sizeof (MidoriBrowserPrivate)); } static void @@ -1146,11 +1116,9 @@ static void _action_tab_new_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gint n = midori_browser_add_uri (browser, ""); midori_browser_set_current_page (browser, n); - gtk_widget_grab_focus (priv->location); + gtk_widget_grab_focus (browser->location); } static void @@ -1329,25 +1297,23 @@ static void _action_find_activate(GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - if (GTK_WIDGET_VISIBLE (priv->find)) + if (GTK_WIDGET_VISIBLE (browser->find)) { GtkWidget* web_view = midori_browser_get_current_web_view (browser); webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (web_view)); gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->find_highlight), FALSE); - gtk_widget_hide (priv->find); + GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight), FALSE); + gtk_widget_hide (browser->find); } else { GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->find_text), + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->find_text), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); - gtk_entry_set_text (GTK_ENTRY (priv->find_text), ""); - gtk_widget_show (priv->find); - gtk_widget_grab_focus (GTK_WIDGET (priv->find_text)); + gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); + gtk_widget_show (browser->find); + gtk_widget_grab_focus (GTK_WIDGET (browser->find_text)); } } @@ -1355,29 +1321,27 @@ static void _midori_browser_find (MidoriBrowser* browser, gboolean forward) { - MidoriBrowserPrivate* priv = browser->priv; - - const gchar* text = gtk_entry_get_text (GTK_ENTRY (priv->find_text)); + const gchar* text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); const gboolean case_sensitive = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON(priv->find_case)); + GTK_TOGGLE_TOOL_BUTTON(browser->find_case)); GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (GTK_WIDGET_VISIBLE (priv->find)) + if (GTK_WIDGET_VISIBLE (browser->find)) webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (web_view)); gboolean found = webkit_web_view_search_text (WEBKIT_WEB_VIEW (web_view), text, case_sensitive, forward, TRUE); - if (GTK_WIDGET_VISIBLE (priv->find)) + if (GTK_WIDGET_VISIBLE (browser->find)) { GtkWidget* icon; if (found) icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); else icon = gtk_image_new_from_stock (GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->find_text), + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->find_text), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (web_view), text, case_sensitive, 0); const gboolean highlight = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->find_highlight)); + GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight)); webkit_web_view_set_highlight_text_matches (WEBKIT_WEB_VIEW (web_view), highlight); } @@ -1411,9 +1375,7 @@ static void midori_browser_find_button_close_clicked_cb (GtkWidget* widget, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - gtk_widget_hide (priv->find); + gtk_widget_hide (browser->find); } static void @@ -1421,17 +1383,15 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, GParamSpec* arg1, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - MidoriToolbarStyle toolbar_style; GtkToolbarStyle gtk_toolbar_style; - g_object_get (priv->settings, "toolbar-style", &toolbar_style, NULL); + g_object_get (browser->settings, "toolbar-style", &toolbar_style, NULL); if (toolbar_style == MIDORI_TOOLBAR_DEFAULT) { - g_object_get (priv->settings, + g_object_get (browser->settings, "gtk-toolbar-style", >k_toolbar_style, NULL); - gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar), gtk_toolbar_style); } } @@ -1453,15 +1413,13 @@ static void midori_browser_menu_trash_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - GtkWidget* menu = gtk_menu_new (); - guint n = midori_trash_get_n_items (priv->trash); + guint n = midori_trash_get_n_items (browser->trash); GtkWidget* menuitem; guint i; for (i = 0; i < n; i++) { - KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, i); + KatzeXbelItem* item = midori_trash_get_nth_xbel_item (browser->trash, i); const gchar* title = katze_xbel_item_get_title (item); const gchar* uri = katze_xbel_bookmark_get_href (item); menuitem = gtk_image_menu_item_new_with_label (title ? title : uri); @@ -1479,7 +1437,7 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - GtkAction* action = gtk_action_group_get_action (priv->action_group, + GtkAction* action = gtk_action_group_get_action (browser->action_group, "TrashEmpty"); menuitem = gtk_action_create_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -1501,10 +1459,8 @@ _action_preferences_activate (GtkAction* action, gtk_window_present (GTK_WINDOW (dialog)); else { - MidoriBrowserPrivate* priv = browser->priv; - dialog = midori_preferences_new (GTK_WINDOW (browser), - priv->settings); + browser->settings); gtk_widget_show (dialog); } } @@ -1513,33 +1469,27 @@ static void _action_navigationbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean active = gtk_toggle_action_get_active (action); - g_object_set (priv->settings, "show-navigationbar", active, NULL); - sokoke_widget_set_visible (priv->navigationbar, active); + g_object_set (browser->settings, "show-navigationbar", active, NULL); + sokoke_widget_set_visible (browser->navigationbar, active); } static void _action_bookmarkbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean active = gtk_toggle_action_get_active (action); - g_object_set (priv->settings, "show-bookmarkbar", active, NULL); - sokoke_widget_set_visible (priv->bookmarkbar, active); + g_object_set (browser->settings, "show-bookmarkbar", active, NULL); + sokoke_widget_set_visible (browser->bookmarkbar, active); } static void _action_statusbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean active = gtk_toggle_action_get_active (action); - g_object_set (priv->settings, "show-statusbar", active, NULL); - sokoke_widget_set_visible (priv->statusbar, active); + g_object_set (browser->settings, "show-statusbar", active, NULL); + sokoke_widget_set_visible (browser->statusbar, active); } static void @@ -1631,12 +1581,10 @@ static void _action_homepage_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gchar* homepage; GtkWidget* web_view = midori_browser_get_current_web_view (browser); - g_object_get (priv->settings, "homepage", &homepage, NULL); + g_object_get (browser->settings, "homepage", &homepage, NULL); g_object_set (web_view, "uri", homepage, NULL); g_free (homepage); } @@ -1646,7 +1594,6 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, GdkEventKey* event, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; gchar* location_entry_search; switch (event->keyval) @@ -1658,9 +1605,9 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, const gchar* uri = gtk_entry_get_text (GTK_ENTRY (widget)); if (uri) { - g_object_get (priv->settings, "location-entry-search", + g_object_get (browser->settings, "location-entry-search", &location_entry_search, NULL); - gchar* new_uri = sokoke_magic_uri (uri, priv->search_engines); + gchar* new_uri = sokoke_magic_uri (uri, browser->search_engines); if (!new_uri) new_uri = g_strdup (location_entry_search); g_free (location_entry_search); @@ -1691,11 +1638,9 @@ static void _action_location_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - if (!GTK_WIDGET_VISIBLE (priv->navigationbar)) - gtk_widget_show (priv->navigationbar); - gtk_widget_grab_focus (priv->location); + if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->navigationbar); + gtk_widget_grab_focus (browser->location); } static gboolean @@ -1703,14 +1648,12 @@ midori_browser_location_focus_out_event_cb (GtkWidget* widget, GdkEventFocus* event, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean show_navigationbar; - g_object_get (priv->settings, + g_object_get (browser->settings, "show-navigationbar", &show_navigationbar, NULL); if (!show_navigationbar) - gtk_widget_hide (priv->navigationbar); + gtk_widget_hide (browser->navigationbar); return FALSE; } @@ -1718,13 +1661,11 @@ static void _action_search_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - if (!GTK_WIDGET_VISIBLE (priv->search)) - gtk_widget_show (priv->search); - if (!GTK_WIDGET_VISIBLE (priv->navigationbar)) - gtk_widget_show (priv->navigationbar); - gtk_widget_grab_focus (priv->search); + if (!GTK_WIDGET_VISIBLE (browser->search)) + gtk_widget_show (browser->search); + if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->navigationbar); + gtk_widget_grab_focus (browser->search); } static gboolean @@ -1732,18 +1673,16 @@ midori_browser_search_focus_out_event_cb (GtkWidget* widget, GdkEventFocus* event, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean show_navigationbar; gboolean show_web_search; - g_object_get (priv->settings, + g_object_get (browser->settings, "show-navigationbar", &show_navigationbar, "show-web-search", &show_web_search, NULL); if (!show_navigationbar) - gtk_widget_hide (priv->navigationbar); + gtk_widget_hide (browser->navigationbar); if (!show_web_search) - gtk_widget_hide (priv->search); + gtk_widget_hide (browser->search); return FALSE; } @@ -1800,16 +1739,14 @@ _midori_panel_bookmarks_popup (GtkWidget* widget, KatzeXbelItem* item, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean is_bookmark = katze_xbel_item_is_bookmark (item); _action_set_sensitive (browser, "BookmarkOpen", is_bookmark); _action_set_sensitive (browser, "BookmarkOpenTab", is_bookmark); _action_set_sensitive (browser, "BookmarkOpenWindow", is_bookmark); - sokoke_widget_popup (widget, GTK_MENU (priv->popup_bookmark), - event, SOKOKE_MENU_POSITION_CURSOR); + sokoke_widget_popup (widget, GTK_MENU (browser->popup_bookmark), + event, SOKOKE_MENU_POSITION_CURSOR); } static gboolean @@ -2050,7 +1987,6 @@ static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv; static GtkWidget* dialog = NULL; /* Show the Manage search engines dialog. Create it if necessary. */ @@ -2058,9 +1994,8 @@ _action_manage_search_engines_activate (GtkAction* action, gtk_window_present (GTK_WINDOW (dialog)); else { - priv = browser->priv; dialog = midori_search_entry_get_dialog ( - MIDORI_SEARCH_ENTRY (priv->search)); + MIDORI_SEARCH_ENTRY (browser->search)); g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_widget_show (dialog); @@ -2071,23 +2006,19 @@ static void _action_tab_previous_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n - 1); + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n - 1); } static void _action_tab_next_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - /* Advance one tab or jump to the first one if we are at the last one */ - gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); - if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)) - 1) + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1) n = -1; - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n + 1); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n + 1); } static const gchar* credits_authors[] = { @@ -2137,28 +2068,24 @@ static void _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean active = gtk_toggle_action_get_active (action); - g_object_set (priv->settings, "show-panel", active, NULL); - sokoke_widget_set_visible (priv->panel, active); + g_object_set (browser->settings, "show-panel", active, NULL); + sokoke_widget_set_visible (browser->panel, active); } static void _action_open_in_panel_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - GtkWidget* web_view = midori_browser_get_current_web_view (browser); const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); /* FIXME: Don't assign the uri here, update it properly while navigating */ - g_object_set (priv->settings, "last-pageholder-uri", uri, NULL); - gint n = midori_panel_page_num (MIDORI_PANEL (priv->panel), - priv->panel_pageholder); - midori_panel_set_current_page (MIDORI_PANEL (priv->panel), n); - gtk_widget_show (priv->panel); - g_object_set (priv->panel_pageholder, "uri", uri, NULL); + g_object_set (browser->settings, "last-pageholder-uri", uri, NULL); + gint n = midori_panel_page_num (MIDORI_PANEL (browser->panel), + browser->panel_pageholder); + midori_panel_set_current_page (MIDORI_PANEL (browser->panel), n); + gtk_widget_show (browser->panel); + g_object_set (browser->panel_pageholder, "uri", uri, NULL); } @@ -2167,10 +2094,8 @@ midori_panel_notify_position_cb (GObject* object, GParamSpec* arg1, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - gboolean position = gtk_paned_get_position (GTK_PANED (object)); - g_object_set (priv->settings, "last-panel-position", position, NULL); + g_object_set (browser->settings, "last-panel-position", position, NULL); } static gboolean @@ -2187,11 +2112,9 @@ gtk_notebook_switch_page_cb (GtkWidget* widget, guint page_num, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - GtkWidget* web_view = midori_browser_get_current_web_view (browser); const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - gtk_entry_set_text (GTK_ENTRY (priv->location), uri); + gtk_entry_set_text (GTK_ENTRY (browser->location), uri); const gchar* title = midori_web_view_get_display_title ( MIDORI_WEB_VIEW (web_view)); gchar* window_title = g_strconcat (title, " - ", @@ -2206,9 +2129,7 @@ static void _action_bookmark_open_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); if (selection) { @@ -2229,9 +2150,7 @@ static void _action_bookmark_open_tab_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); if (selection) { @@ -2254,9 +2173,7 @@ static void _action_bookmark_open_window_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); if (selection) { @@ -2279,9 +2196,7 @@ static void _action_bookmark_edit_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); if (selection) { @@ -2301,13 +2216,11 @@ static void _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - /* Reopen the most recent trash item */ - KatzeXbelItem* item = midori_trash_get_nth_xbel_item (priv->trash, 0); + KatzeXbelItem* item = midori_trash_get_nth_xbel_item (browser->trash, 0); gint n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); - midori_trash_remove_nth_item (priv->trash, 0); + midori_trash_remove_nth_item (browser->trash, 0); _midori_browser_update_actions (browser); } @@ -2315,9 +2228,7 @@ static void _action_trash_empty_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - midori_trash_empty (priv->trash); + midori_trash_empty (browser->trash); _midori_browser_update_actions (browser); } @@ -2325,9 +2236,7 @@ static void _action_bookmark_delete_activate (GtkAction* action, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - - GtkTreeView* treeview = GTK_TREE_VIEW (priv->panel_bookmarks); + GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); if (selection) { @@ -2564,22 +2473,20 @@ static void midori_browser_window_state_event_cb (MidoriBrowser* browser, GdkEventWindowState* event) { - MidoriBrowserPrivate* priv = browser->priv; - if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) { if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) { - gtk_widget_hide (priv->menubar); - g_object_set (priv->button_fullscreen, + gtk_widget_hide (browser->menubar); + g_object_set (browser->button_fullscreen, "stock-id", GTK_STOCK_LEAVE_FULLSCREEN, NULL); - gtk_widget_show (priv->button_fullscreen); + gtk_widget_show (browser->button_fullscreen); } else { - gtk_widget_show (priv->menubar); - gtk_widget_hide (priv->button_fullscreen); - g_object_set (priv->button_fullscreen, + gtk_widget_show (browser->menubar); + gtk_widget_hide (browser->button_fullscreen); + g_object_set (browser->button_fullscreen, "stock-id", GTK_STOCK_FULLSCREEN, NULL); } } @@ -2589,7 +2496,6 @@ static void midori_browser_size_allocate_cb (MidoriBrowser* browser, GtkAllocation* allocation) { - MidoriBrowserPrivate* priv = browser->priv; GtkWidget* widget = GTK_WIDGET (browser); if (GTK_WIDGET_REALIZED (widget)) @@ -2597,7 +2503,7 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, GdkWindowState state = gdk_window_get_state (widget->window); if (!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) { - g_object_set (priv->settings, + g_object_set (browser->settings, "last-window-width", allocation->width, "last-window-height", allocation->height, NULL); } @@ -2607,10 +2513,8 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, static void midori_browser_destroy_cb (MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - /* Destroy tabs first, so widgets can still see window elements on destroy */ - gtk_container_foreach (GTK_CONTAINER (priv->notebook), + gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) gtk_widget_destroy, NULL); } @@ -2752,7 +2656,6 @@ static void midori_browser_search_activate (GtkWidget* widget, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv; MidoriWebList* search_engines; const gchar* keywords; guint last_web_search; @@ -2760,10 +2663,9 @@ midori_browser_search_activate (GtkWidget* widget, const gchar* url; gchar* location_entry_search; - priv = browser->priv; - search_engines = priv->search_engines; + search_engines = browser->search_engines; keywords = gtk_entry_get_text (GTK_ENTRY (widget)); - g_object_get (priv->settings, "last-web-search", &last_web_search, NULL); + g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); web_item = midori_web_list_get_nth_item (search_engines, last_web_search); if (web_item) { @@ -2772,7 +2674,7 @@ midori_browser_search_activate (GtkWidget* widget, } else /* The location entry search is our fallback */ { - g_object_get (priv->settings, "location-entry-search", + g_object_get (browser->settings, "location-entry-search", &location_entry_search, NULL); url = location_entry_search; } @@ -2791,10 +2693,6 @@ midori_browser_search_activate (GtkWidget* widget, static void midori_browser_init (MidoriBrowser* browser) { - browser->priv = MIDORI_BROWSER_GET_PRIVATE (browser); - - MidoriBrowserPrivate* priv = browser->priv; - /* Setup the window metrics */ g_signal_connect (browser, "realize", G_CALLBACK (midori_browser_realize_cb), browser); @@ -2811,14 +2709,14 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (vbox); /* Let us see some ui manager magic */ - priv->action_group = gtk_action_group_new ("Browser"); - gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions (priv->action_group, + browser->action_group = gtk_action_group_new ("Browser"); + gtk_action_group_set_translation_domain (browser->action_group, GETTEXT_PACKAGE); + gtk_action_group_add_actions (browser->action_group, entries, entries_n, browser); - gtk_action_group_add_toggle_actions (priv->action_group, + gtk_action_group_add_toggle_actions (browser->action_group, toggle_entries, toggle_entries_n, browser); GtkUIManager* ui_manager = gtk_ui_manager_new (); - gtk_ui_manager_insert_action_group (ui_manager, priv->action_group, 0); + gtk_ui_manager_insert_action_group (ui_manager, browser->action_group, 0); gtk_window_add_accel_group (GTK_WINDOW (browser), gtk_ui_manager_get_accel_group (ui_manager)); @@ -2836,14 +2734,14 @@ midori_browser_init (MidoriBrowser* browser) guint i; for (i = 0; i < entries_n; i++) { - action = gtk_action_group_get_action(priv->action_group, + action = gtk_action_group_get_action(browser->action_group, entries[i].name); gtk_action_set_sensitive (action, entries[i].callback || !entries[i].tooltip); } for (i = 0; i < toggle_entries_n; i++) { - action = gtk_action_group_get_action (priv->action_group, + action = gtk_action_group_get_action (browser->action_group, toggle_entries[i].name); gtk_action_set_sensitive (action, toggle_entries[i].callback != NULL); } @@ -2851,66 +2749,66 @@ midori_browser_init (MidoriBrowser* browser) /* _action_set_active(browser, "Transferbar", config->toolbarTransfers); */ /* Create the menubar */ - priv->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); + browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new (); gtk_widget_show (menuitem); - priv->throbber = katze_throbber_new(); - gtk_widget_show(priv->throbber); - gtk_container_add (GTK_CONTAINER (menuitem), priv->throbber); + browser->throbber = katze_throbber_new(); + gtk_widget_show(browser->throbber); + gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber); gtk_widget_set_sensitive (menuitem, FALSE); gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menubar), menuitem); - gtk_box_pack_start (GTK_BOX (vbox), priv->menubar, FALSE, FALSE, 0); + gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem); + gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); menuitem = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Trash"); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_trash_activate_cb), browser); - priv->menu_bookmarks = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( + browser->menu_bookmarks = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Bookmarks"))); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_bookmarks), menuitem); - priv->popup_bookmark = gtk_ui_manager_get_widget ( + gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_bookmarks), menuitem); + browser->popup_bookmark = gtk_ui_manager_get_widget ( ui_manager, "/popup_bookmark"); - g_object_ref (priv->popup_bookmark); - priv->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( + g_object_ref (browser->popup_bookmark); + browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); menuitem = gtk_separator_menu_item_new(); gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_tools), menuitem); - priv->menu_window = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( + gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); + browser->menu_window = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Window"))); menuitem = gtk_separator_menu_item_new(); gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu_window), menuitem); - gtk_widget_show (priv->menubar); + gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); + gtk_widget_show (browser->menubar); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); _action_set_sensitive (browser, "WorkOffline", FALSE); /* Create the navigationbar */ - priv->navigationbar = gtk_ui_manager_get_widget ( + browser->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); /* FIXME: settings should be connected with screen changes */ GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (gtk_settings) g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser); - gtk_toolbar_set_show_arrow (GTK_TOOLBAR (priv->navigationbar), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), priv->navigationbar, FALSE, FALSE, 0); - priv->button_tab_new = gtk_ui_manager_get_widget ( + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->navigationbar), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0); + browser->button_tab_new = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/TabNew"); g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); - priv->button_homepage = gtk_ui_manager_get_widget ( + browser->button_homepage = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/Homepage"); /* Location */ - priv->location = sexy_icon_entry_new (); - sokoke_entry_setup_completion (GTK_ENTRY (priv->location)); - priv->location_icon = gtk_image_new (); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (priv->location) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (priv->location_icon)); - sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (priv->location)); - g_object_connect (priv->location, + browser->location = sexy_icon_entry_new (); + sokoke_entry_setup_completion (GTK_ENTRY (browser->location)); + browser->location_icon = gtk_image_new (); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->location) + , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (browser->location_icon)); + sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (browser->location)); + g_object_connect (browser->location, "signal::key-press-event", midori_browser_location_key_press_event_cb, browser, "signal::focus-out-event", @@ -2920,45 +2818,45 @@ midori_browser_init (MidoriBrowser* browser) NULL); GtkToolItem* toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_container_add (GTK_CONTAINER(toolitem), priv->location); - gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); + gtk_container_add (GTK_CONTAINER(toolitem), browser->location); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), toolitem, -1); /* Search */ - priv->search = midori_search_entry_new (); + browser->search = midori_search_entry_new (); /* TODO: Make this actively resizable or enlarge to fit contents? The interface is somewhat awkward and ought to be rethought Display "show in context menu" search engines as "completion actions" */ - sokoke_entry_setup_completion (GTK_ENTRY (priv->search)); - g_signal_connect (priv->search, "activate", + sokoke_entry_setup_completion (GTK_ENTRY (browser->search)); + g_signal_connect (browser->search, "activate", G_CALLBACK (midori_browser_search_activate), browser); - g_signal_connect (priv->search, "focus-out-event", + g_signal_connect (browser->search, "focus-out-event", G_CALLBACK (midori_browser_search_focus_out_event_cb), browser); toolitem = gtk_tool_item_new (); - gtk_container_add (GTK_CONTAINER (toolitem), priv->search); - gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), toolitem, -1); - action = gtk_action_group_get_action (priv->action_group, "Trash"); - priv->button_trash = gtk_action_create_tool_item (action); - g_signal_connect (priv->button_trash, "clicked", + gtk_container_add (GTK_CONTAINER (toolitem), browser->search); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), toolitem, -1); + action = gtk_action_group_get_action (browser->action_group, "Trash"); + browser->button_trash = gtk_action_create_tool_item (action); + g_signal_connect (browser->button_trash, "clicked", G_CALLBACK (midori_browser_menu_trash_activate_cb), browser); - gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), - GTK_TOOL_ITEM (priv->button_trash), -1); - sokoke_container_show_children (GTK_CONTAINER (priv->navigationbar)); - action = gtk_action_group_get_action (priv->action_group, "Fullscreen"); - priv->button_fullscreen = gtk_action_create_tool_item (action); - gtk_widget_hide (priv->button_fullscreen); - g_signal_connect (priv->button_fullscreen, "clicked", + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (browser->button_trash), -1); + sokoke_container_show_children (GTK_CONTAINER (browser->navigationbar)); + action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); + browser->button_fullscreen = gtk_action_create_tool_item (action); + gtk_widget_hide (browser->button_fullscreen); + g_signal_connect (browser->button_fullscreen, "clicked", G_CALLBACK (_action_fullscreen_activate), browser); - gtk_toolbar_insert (GTK_TOOLBAR (priv->navigationbar), - GTK_TOOL_ITEM (priv->button_fullscreen), -1); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (browser->button_fullscreen), -1); /* Bookmarkbar */ - priv->bookmarkbar = gtk_toolbar_new (); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->bookmarkbar), + browser->bookmarkbar = gtk_toolbar_new (); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style (GTK_TOOLBAR (priv->bookmarkbar), + gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); _midori_browser_create_bookmark_menu (browser, bookmarks, - priv->menu_bookmarks); + browser->menu_bookmarks); for (i = 0; i < katze_xbel_folder_get_n_items (bookmarks); i++) { KatzeXbelItem* item = katze_xbel_folder_get_nth_item (bookmarks, i); @@ -2994,10 +2892,10 @@ midori_browser_init (MidoriBrowser* browser) default: g_warning ("Unknown item kind"); } - gtk_toolbar_insert (GTK_TOOLBAR (priv->bookmarkbar), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); } - sokoke_container_show_children (GTK_CONTAINER (priv->bookmarkbar)); - gtk_box_pack_start (GTK_BOX (vbox), priv->bookmarkbar, FALSE, FALSE, 0); + sokoke_container_show_children (GTK_CONTAINER (browser->bookmarkbar)); + gtk_box_pack_start (GTK_BOX (vbox), browser->bookmarkbar, FALSE, FALSE, 0); /* Superuser warning */ GtkWidget* hbox; @@ -3011,13 +2909,13 @@ midori_browser_init (MidoriBrowser* browser) browser); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); - priv->panel = g_object_new (MIDORI_TYPE_PANEL, + browser->panel = g_object_new (MIDORI_TYPE_PANEL, "shadow-type", GTK_SHADOW_IN, - "menu", priv->menu_tools, + "menu", browser->menu_tools, NULL); - g_signal_connect (priv->panel, "close", + g_signal_connect (browser->panel, "close", G_CALLBACK (midori_panel_close_cb), browser); - gtk_paned_pack1 (GTK_PANED (hpaned), priv->panel, FALSE, FALSE); + gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); /* Bookmarks */ GtkWidget* box = gtk_vbox_new (FALSE, 0); @@ -3056,46 +2954,46 @@ midori_browser_init (MidoriBrowser* browser) midori_panel_bookmarks_cursor_or_row_changed_cb (GTK_TREE_VIEW (treeview), browser); gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); - priv->panel_bookmarks = treeview; + browser->panel_bookmarks = treeview; gtk_widget_show_all (box); GtkWidget* toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_bookmarks"); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); gtk_widget_show_all (toolbar); - midori_panel_append_page (MIDORI_PANEL (priv->panel), + midori_panel_append_page (MIDORI_PANEL (browser->panel), box, toolbar, "vcard", _("Bookmarks")); /* Transfers */ GtkWidget* panel = midori_web_view_new (); gtk_widget_show (panel); - midori_panel_append_page (MIDORI_PANEL (priv->panel), + midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, "package", _("Transfers")); /* Console */ - priv->panel_console = midori_console_new (); - gtk_widget_show (priv->panel_console); - toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (priv->panel_console)); + browser->panel_console = midori_console_new (); + gtk_widget_show (browser->panel_console); + toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (browser->panel_console)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_console, toolbar, + midori_panel_append_page (MIDORI_PANEL (browser->panel), + browser->panel_console, toolbar, "terminal", _("Console")); /* History */ panel = midori_web_view_new (); gtk_widget_show (panel); - midori_panel_append_page (MIDORI_PANEL (priv->panel), + midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, "document-open-recent", _("History")); /* Pageholder */ - priv->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, + browser->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, "uri", "", NULL); - gtk_widget_show (priv->panel_pageholder); - midori_panel_append_page (MIDORI_PANEL (priv->panel), - priv->panel_pageholder, NULL, + gtk_widget_show (browser->panel_pageholder); + midori_panel_append_page (MIDORI_PANEL (browser->panel), + browser->panel_pageholder, NULL, GTK_STOCK_CONVERT, _("Pageholder")); /* Userscripts */ @@ -3103,7 +3001,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (priv->panel), + midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, "", _("Userscripts")); /* Userstyles */ @@ -3111,84 +3009,84 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (priv->panel), + midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, "", _("Userstyles"));*/ /* Notebook, containing all web_views */ - priv->notebook = gtk_notebook_new (); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); - gtk_paned_pack2 (GTK_PANED (hpaned), priv->notebook, FALSE, FALSE); - g_signal_connect_after (priv->notebook, "switch-page", + browser->notebook = gtk_notebook_new (); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); + gtk_paned_pack2 (GTK_PANED (hpaned), browser->notebook, FALSE, FALSE); + g_signal_connect_after (browser->notebook, "switch-page", G_CALLBACK (gtk_notebook_switch_page_cb), browser); - gtk_widget_show (priv->notebook); + gtk_widget_show (browser->notebook); /* Incremental findbar */ - priv->find = gtk_toolbar_new (); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->find), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style (GTK_TOOLBAR (priv->find), GTK_TOOLBAR_BOTH_HORIZ); + browser->find = gtk_toolbar_new (); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ); toolitem = gtk_tool_item_new (); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_add (GTK_CONTAINER (toolitem), gtk_label_new_with_mnemonic (_("_Inline find:"))); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); - priv->find_text = sexy_icon_entry_new (); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); + browser->find_text = sexy_icon_entry_new (); GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY(priv->find_text), + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY(browser->find_text), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY(priv->find_text)); - g_signal_connect (priv->find_text, "activate", + sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY(browser->find_text)); + g_signal_connect (browser->find_text, "activate", G_CALLBACK (_action_find_next_activate), browser); toolitem = gtk_tool_item_new (); - gtk_container_add (GTK_CONTAINER (toolitem), priv->find_text); + gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR(priv->find), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR(browser->find), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (_action_find_previous_activate), browser); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (_action_find_next_activate), browser); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); - priv->find_case = gtk_toggle_tool_button_new_from_stock ( + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); + browser->find_case = gtk_toggle_tool_button_new_from_stock ( GTK_STOCK_SPELL_CHECK); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->find_case), _("Match Case")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->find_case), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), priv->find_case, -1); - priv->find_highlight = gtk_toggle_tool_button_new_from_stock ( + gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_case), _("Match Case")); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (browser->find_case), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_case, -1); + browser->find_highlight = gtk_toggle_tool_button_new_from_stock ( GTK_STOCK_SELECT_ALL); - g_signal_connect (priv->find_highlight, "toggled", + g_signal_connect (browser->find_highlight, "toggled", G_CALLBACK (_find_highlight_toggled), browser); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->find_highlight), + gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_highlight), "Highlight Matches"); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->find_highlight), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), priv->find_highlight, -1); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (browser->find_highlight), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_highlight, -1); toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw ( GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close Findbar")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); - gtk_toolbar_insert (GTK_TOOLBAR (priv->find), toolitem, -1); - sokoke_container_show_children (GTK_CONTAINER (priv->find)); - gtk_box_pack_start (GTK_BOX (vbox), priv->find, FALSE, FALSE, 0); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); + sokoke_container_show_children (GTK_CONTAINER (browser->find)); + gtk_box_pack_start (GTK_BOX (vbox), browser->find, FALSE, FALSE, 0); /* Statusbar */ /* FIXME: children are overlapping the statusbar border */ - priv->statusbar = gtk_statusbar_new (); - gtk_box_pack_start (GTK_BOX (vbox), priv->statusbar, FALSE, FALSE, 0); - priv->progressbar = gtk_progress_bar_new (); + browser->statusbar = gtk_statusbar_new (); + gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); + browser->progressbar = gtk_progress_bar_new (); /* Setting the progressbar's height to 1 makes it fit in the statusbar */ - gtk_widget_set_size_request (priv->progressbar, -1, 1); - gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar, + gtk_widget_set_size_request (browser->progressbar, -1, 1); + gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar, FALSE, FALSE, 3); /* Extensions */ @@ -3196,7 +3094,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (priv->panel), + midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, "", _("Extensions")); @@ -3212,21 +3110,20 @@ static void midori_browser_finalize (GObject* object) { MidoriBrowser* browser = MIDORI_BROWSER (object); - MidoriBrowserPrivate* priv = browser->priv; - g_free (priv->uri); - g_free (priv->title); - g_free (priv->statusbar_text); + g_free (browser->uri); + g_free (browser->title); + g_free (browser->statusbar_text); - if (priv->proxy_xbel_folder) - katze_xbel_item_unref (priv->proxy_xbel_folder); + if (browser->proxy_xbel_folder) + katze_xbel_item_unref (browser->proxy_xbel_folder); - if (priv->settings) - g_object_unref (priv->settings); - if (priv->trash) - g_object_unref (priv->trash); - if (priv->search_engines) - g_object_unref (priv->search_engines); + if (browser->settings) + g_object_unref (browser->settings); + if (browser->trash) + g_object_unref (browser->trash); + if (browser->search_engines) + g_object_unref (browser->search_engines); G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } @@ -3235,8 +3132,6 @@ static void _midori_browser_set_toolbar_style (MidoriBrowser* browser, MidoriToolbarStyle toolbar_style) { - MidoriBrowserPrivate* priv = browser->priv; - GtkToolbarStyle gtk_toolbar_style; GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) @@ -3259,14 +3154,13 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ; } } - gtk_toolbar_set_style (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar), gtk_toolbar_style); } static void _midori_browser_update_settings (MidoriBrowser* browser) { - MidoriBrowserPrivate* priv; MidoriWebItem* web_item; gboolean remember_last_window_size; @@ -3279,8 +3173,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint last_web_search; gchar* last_pageholder_uri; - priv = browser->priv; - g_object_get (priv->settings, + g_object_get (browser->settings, "remember-last-window-size", &remember_last_window_size, "last-window-width", &last_window_width, "last-window-height", &last_window_height, @@ -3315,33 +3208,33 @@ _midori_browser_update_settings (MidoriBrowser* browser) } _midori_browser_set_toolbar_style (browser, toolbar_style); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), small_toolbar ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR); - if (priv->search_engines) + if (browser->search_engines) { - web_item = midori_web_list_get_nth_item (priv->search_engines, + web_item = midori_web_list_get_nth_item (browser->search_engines, last_web_search); if (web_item) - midori_search_entry_set_current_item (MIDORI_SEARCH_ENTRY (priv->search), + midori_search_entry_set_current_item (MIDORI_SEARCH_ENTRY (browser->search), web_item); } - gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (priv->panel)), + gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); - midori_panel_set_current_page (MIDORI_PANEL (priv->panel), last_panel_page); - g_object_set (priv->panel_pageholder, "uri", last_pageholder_uri, NULL); + midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); + g_object_set (browser->panel_pageholder, "uri", last_pageholder_uri, NULL); _action_set_active (browser, "Navigationbar", show_navigationbar); _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); _action_set_active (browser, "Panel", show_panel); _action_set_active (browser, "Statusbar", show_statusbar); - sokoke_widget_set_visible (priv->button_tab_new, show_new_tab); - sokoke_widget_set_visible (priv->button_homepage, show_homepage); - sokoke_widget_set_visible (priv->search, show_web_search); - sokoke_widget_set_visible (priv->button_trash, show_trash); + sokoke_widget_set_visible (browser->button_tab_new, show_new_tab); + sokoke_widget_set_visible (browser->button_homepage, show_homepage); + sokoke_widget_set_visible (browser->search, show_web_search); + sokoke_widget_set_visible (browser->button_trash, show_trash); g_free (last_pageholder_uri); } @@ -3351,31 +3244,29 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, GParamSpec* pspec, MidoriBrowser* browser) { - MidoriBrowserPrivate* priv = browser->priv; - const gchar* name = g_intern_string (pspec->name); GValue value = {0, }; g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (priv->settings), name, &value); + g_object_get_property (G_OBJECT (browser->settings), name, &value); if (name == g_intern_string ("toolbar-style")) _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); else if (name == g_intern_string ("small-toolbar")) - gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->navigationbar), + gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), g_value_get_boolean (&value) ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR); else if (name == g_intern_string ("show-new-tab")) - sokoke_widget_set_visible (priv->button_tab_new, + sokoke_widget_set_visible (browser->button_tab_new, g_value_get_boolean (&value)); else if (name == g_intern_string ("show-homepage")) - sokoke_widget_set_visible (priv->button_homepage, + sokoke_widget_set_visible (browser->button_homepage, g_value_get_boolean (&value)); else if (name == g_intern_string ("show-web-search")) - sokoke_widget_set_visible (priv->search, + sokoke_widget_set_visible (browser->search, g_value_get_boolean (&value)); else if (name == g_intern_string ("show-trash")) - sokoke_widget_set_visible (priv->button_trash, + sokoke_widget_set_visible (browser->button_trash, g_value_get_boolean (&value)); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) @@ -3390,7 +3281,6 @@ midori_browser_set_property (GObject* object, GParamSpec* pspec) { MidoriBrowser* browser = MIDORI_BROWSER (object); - MidoriBrowserPrivate* priv = browser->priv; guint last_web_search; MidoriWebItem* web_item; @@ -3403,42 +3293,42 @@ midori_browser_set_property (GObject* object, _midori_browser_set_statusbar_text (browser, g_value_get_string (value)); break; case PROP_SETTINGS: - if (priv->settings) - g_signal_handlers_disconnect_by_func (priv->settings, + if (browser->settings) + g_signal_handlers_disconnect_by_func (browser->settings, midori_browser_settings_notify, browser); - katze_object_assign (priv->settings, g_value_get_object (value)); - g_object_ref (priv->settings); + katze_object_assign (browser->settings, g_value_get_object (value)); + g_object_ref (browser->settings); _midori_browser_update_settings (browser); - g_signal_connect (priv->settings, "notify", + g_signal_connect (browser->settings, "notify", G_CALLBACK (midori_browser_settings_notify), browser); /* FIXME: Assigning settings must be conditional, if web view or not */ /* FIXME: Assign settings only if the same settings object was used */ - gtk_container_foreach (GTK_CONTAINER (priv->notebook), + gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) midori_web_view_set_settings, - priv->settings); + browser->settings); break; case PROP_TRASH: ; /* FIXME: Disconnect handlers */ - katze_object_assign (priv->trash, g_value_get_object (value)); - g_object_ref (priv->trash); + katze_object_assign (browser->trash, g_value_get_object (value)); + g_object_ref (browser->trash); /* FIXME: Connect to updates */ _midori_browser_update_actions (browser); break; case PROP_SEARCH_ENGINES: ; /* FIXME: Disconnect handlers */ - katze_object_assign (priv->search_engines, g_value_get_object (value)); - g_object_ref (priv->search_engines); - g_object_set (priv->search, "search-engines", - priv->search_engines, NULL); + katze_object_assign (browser->search_engines, g_value_get_object (value)); + g_object_ref (browser->search_engines); + g_object_set (browser->search, "search-engines", + browser->search_engines, NULL); /* FIXME: Connect to updates */ - if (priv->settings) + if (browser->settings) { - g_object_get (priv->settings, "last-web-search", + g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - web_item = midori_web_list_get_nth_item (priv->search_engines, + web_item = midori_web_list_get_nth_item (browser->search_engines, last_web_search); - g_object_set (priv->search, "current-item", web_item, NULL); + g_object_set (browser->search, "current-item", web_item, NULL); } break; default: @@ -3454,33 +3344,32 @@ midori_browser_get_property (GObject* object, GParamSpec* pspec) { MidoriBrowser* browser = MIDORI_BROWSER (object); - MidoriBrowserPrivate* priv = browser->priv; switch (prop_id) { case PROP_MENUBAR: - g_value_set_object (value, priv->menubar); + g_value_set_object (value, browser->menubar); break; case PROP_NAVIGATIONBAR: - g_value_set_object (value, priv->navigationbar); + g_value_set_object (value, browser->navigationbar); break; case PROP_TAB: g_value_set_object (value, midori_browser_get_current_tab (browser)); break; case PROP_STATUSBAR: - g_value_set_object (value, priv->statusbar); + g_value_set_object (value, browser->statusbar); break; case PROP_STATUSBAR_TEXT: - g_value_set_string (value, priv->statusbar_text); + g_value_set_string (value, browser->statusbar_text); break; case PROP_SETTINGS: - g_value_set_object (value, priv->settings); + g_value_set_object (value, browser->settings); break; case PROP_TRASH: - g_value_set_object (value, priv->trash); + g_value_set_object (value, browser->trash); break; case PROP_SEARCH_ENGINES: - g_value_set_object (value, priv->search_engines); + g_value_set_object (value, browser->search_engines); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -3538,10 +3427,8 @@ void midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* widget) { - MidoriBrowserPrivate* priv = browser->priv; - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); - gtk_container_remove (GTK_CONTAINER (priv->notebook), scrolled); + gtk_container_remove (GTK_CONTAINER (browser->notebook), scrolled); /* FIXME: Remove the menuitem if this is a web view */ } @@ -3559,8 +3446,6 @@ gint midori_browser_add_xbel_item (MidoriBrowser* browser, KatzeXbelItem* xbel_item) { - MidoriBrowserPrivate* priv = browser->priv; - g_return_val_if_fail (katze_xbel_item_is_bookmark (xbel_item), -1); const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); @@ -3568,7 +3453,7 @@ midori_browser_add_xbel_item (MidoriBrowser* browser, GtkWidget* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, "uri", uri, "title", title, - "settings", priv->settings, + "settings", browser->settings, NULL); gtk_widget_show (web_view); @@ -3621,15 +3506,13 @@ void midori_browser_set_current_page (MidoriBrowser* browser, gint n) { - MidoriBrowserPrivate* priv = browser->priv; - - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); - GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); + GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); GtkWidget* widget = _midori_browser_child_for_scrolled (browser, scrolled); if (widget && MIDORI_IS_WEB_VIEW (widget) && !strcmp (midori_web_view_get_display_uri ( MIDORI_WEB_VIEW (widget)), "")) - gtk_widget_grab_focus (priv->location); + gtk_widget_grab_focus (browser->location); else gtk_widget_grab_focus (widget); } @@ -3649,9 +3532,7 @@ midori_browser_get_current_page (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); - MidoriBrowserPrivate* priv = browser->priv; - - return gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + return gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); } /** @@ -3667,15 +3548,13 @@ void midori_browser_set_current_tab (MidoriBrowser* browser, GtkWidget* widget) { - MidoriBrowserPrivate* priv = browser->priv; - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); - gint n = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + gint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); if (widget && MIDORI_IS_WEB_VIEW (widget) && !strcmp (midori_web_view_get_display_uri ( MIDORI_WEB_VIEW (widget)), "")) - gtk_widget_grab_focus (priv->location); + gtk_widget_grab_focus (browser->location); else gtk_widget_grab_focus (widget); } @@ -3695,13 +3574,11 @@ midori_browser_get_current_tab (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - MidoriBrowserPrivate* priv = browser->priv; - - gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); if (n >= 0) { GtkWidget* widget = _midori_browser_child_for_scrolled (browser, - gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n)); + gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n)); return widget; } else @@ -3749,14 +3626,12 @@ midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - MidoriBrowserPrivate* priv = browser->priv; - - if (!priv->proxy_xbel_folder) + if (!browser->proxy_xbel_folder) { - priv->proxy_xbel_folder = katze_xbel_folder_new (); + browser->proxy_xbel_folder = katze_xbel_folder_new (); /* FIXME: Fill in xbel items of all present web views */ } - return priv->proxy_xbel_folder; + return browser->proxy_xbel_folder; } /** diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 8a5235a8..83876435 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -32,16 +32,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_BROWSER, MidoriBrowserClass)) typedef struct _MidoriBrowser MidoriBrowser; -typedef struct _MidoriBrowserPrivate MidoriBrowserPrivate; typedef struct _MidoriBrowserClass MidoriBrowserClass; -struct _MidoriBrowser -{ - GtkWindow parent_instance; - - MidoriBrowserPrivate* priv; -}; - struct _MidoriBrowserClass { GtkWindowClass parent_class; From 585977cb0213b829aa04ee23cb7ca4b45bdc2f73 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 20:40:01 +0200 Subject: [PATCH 0157/2970] Simplify MidoriConsole, remove Private --- midori/midori-console.c | 58 ++++++++++++++++------------------------- midori/midori-console.h | 8 ------ 2 files changed, 23 insertions(+), 43 deletions(-) diff --git a/midori/midori-console.c b/midori/midori-console.c index 693608da..2a4df539 100644 --- a/midori/midori-console.c +++ b/midori/midori-console.c @@ -14,32 +14,28 @@ #include "sokoke.h" #include -G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX) - -struct _MidoriConsolePrivate +struct _MidoriConsole { + GtkVBox parent_instance; + GtkWidget* toolbar; GtkWidget* treeview; }; -#define MIDORI_CONSOLE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_CONSOLE, MidoriConsolePrivate)) +G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX) static void midori_console_class_init (MidoriConsoleClass* class) { - g_type_class_add_private (class, sizeof (MidoriConsolePrivate)); + /* Nothing to do */ } static void midori_console_button_clear_clicked_cb (GtkToolItem* toolitem, MidoriConsole* console) { - MidoriConsolePrivate* priv = console->priv; - GtkTreeModel* model = gtk_tree_view_get_model ( - GTK_TREE_VIEW (priv->treeview)); + GTK_TREE_VIEW (console->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); } @@ -50,12 +46,12 @@ midori_console_treeview_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - // gchar* source_id; - // gtk_tree_model_get (model, iter, 2, &source_id, -1); + /* gchar* source_id; + gtk_tree_model_get (model, iter, 2, &source_id, -1); */ g_object_set (renderer, "stock-id", GTK_STOCK_DIALOG_WARNING, NULL); - // g_free (source_id); + /* g_free (source_id); */ } static void @@ -97,37 +93,33 @@ midori_console_treeview_row_activated_cb (GtkTreeView* treeview, static void midori_console_init (MidoriConsole* console) { - console->priv = MIDORI_CONSOLE_GET_PRIVATE (console); - - MidoriConsolePrivate* priv = console->priv; - - // Create the treeview + /* Create the treeview */ GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; GtkTreeStore* treestore = gtk_tree_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING); - priv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE); + console->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (console->treeview), FALSE); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, (GtkTreeCellDataFunc)midori_console_treeview_render_icon_cb, - priv->treeview, NULL); + console->treeview, NULL); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_console_treeview_render_text_cb, - priv->treeview, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column); + console->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (console->treeview), column); g_object_unref (treestore); - g_signal_connect (priv->treeview, "row-activated", + g_signal_connect (console->treeview, "row-activated", G_CALLBACK (midori_console_treeview_row_activated_cb), console); - gtk_widget_show (priv->treeview); - gtk_box_pack_start (GTK_BOX (console), priv->treeview, TRUE, TRUE, 0); + gtk_widget_show (console->treeview); + gtk_box_pack_start (GTK_BOX (console), console->treeview, TRUE, TRUE, 0); } /** @@ -159,15 +151,13 @@ midori_console_get_toolbar (MidoriConsole* console) { g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL); - MidoriConsolePrivate* priv = console->priv; - - if (!priv->toolbar) + if (!console->toolbar) { GtkWidget* toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); GtkToolItem* toolitem = gtk_tool_item_new (); - // TODO: What about a find entry here that filters e.g. by url? + /* TODO: What about a find entry here that filters e.g. by url? */ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); toolitem = gtk_separator_tool_item_new (); @@ -182,10 +172,10 @@ midori_console_get_toolbar (MidoriConsole* console) G_CALLBACK (midori_console_button_clear_clicked_cb), console); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - priv->toolbar = toolbar; + console->toolbar = toolbar; } - return priv->toolbar; + return console->toolbar; } /** @@ -205,9 +195,7 @@ midori_console_add (MidoriConsole* console, { g_return_if_fail (MIDORI_IS_CONSOLE (console)); - MidoriConsolePrivate* priv = console->priv; - - GtkTreeView* treeview = GTK_TREE_VIEW (priv->treeview); + GtkTreeView* treeview = GTK_TREE_VIEW (console->treeview); GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), NULL, NULL, G_MAXINT, diff --git a/midori/midori-console.h b/midori/midori-console.h index 884c2b2b..b4c096cf 100644 --- a/midori/midori-console.h +++ b/midori/midori-console.h @@ -32,16 +32,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_CONSOLE, MidoriConsoleClass)) typedef struct _MidoriConsole MidoriConsole; -typedef struct _MidoriConsolePrivate MidoriConsolePrivate; typedef struct _MidoriConsoleClass MidoriConsoleClass; -struct _MidoriConsole -{ - GtkVBox parent_instance; - - MidoriConsolePrivate* priv; -}; - struct _MidoriConsoleClass { GtkVBoxClass parent_class; From 673856ab81bca1d6a4bb732dcc0903e4c09b8f10 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 20:40:37 +0200 Subject: [PATCH 0158/2970] Simplify MidoriPanel, remove Private --- midori/midori-panel.c | 123 +++++++++++++++++------------------------- midori/midori-panel.h | 8 --- 2 files changed, 50 insertions(+), 81 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 5bf45178..4eacb994 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -14,10 +14,10 @@ #include "sokoke.h" #include -G_DEFINE_TYPE (MidoriPanel, midori_panel, GTK_TYPE_HBOX) - -struct _MidoriPanelPrivate +struct _MidoriPanel { + GtkHBox parent_instance; + GtkWidget* toolbar; GtkWidget* toolbar_label; GtkWidget* frame; @@ -27,9 +27,7 @@ struct _MidoriPanelPrivate GtkMenu* menu; }; -#define MIDORI_PANEL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_PANEL, MidoriPanelPrivate)) +G_DEFINE_TYPE (MidoriPanel, midori_panel, GTK_TYPE_HBOX) enum { @@ -166,8 +164,6 @@ midori_panel_class_init (MidoriPanelClass* class) _("The index of the current page"), -1, G_MAXINT, -1, flags)); - - g_type_class_add_private (class, sizeof (MidoriPanelPrivate)); } static void @@ -181,31 +177,27 @@ midori_panel_button_close_clicked_cb (GtkWidget* toolitem, static void midori_panel_init (MidoriPanel* panel) { - panel->priv = MIDORI_PANEL_GET_PRIVATE (panel); - - MidoriPanelPrivate* priv = panel->priv; - - // Create the sidebar - priv->toolbar = gtk_toolbar_new (); - gtk_toolbar_set_style (GTK_TOOLBAR (priv->toolbar), GTK_TOOLBAR_BOTH); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (priv->toolbar), + /* Create the sidebar */ + panel->toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (panel->toolbar), GTK_ICON_SIZE_BUTTON); - gtk_toolbar_set_orientation (GTK_TOOLBAR (priv->toolbar), + gtk_toolbar_set_orientation (GTK_TOOLBAR (panel->toolbar), GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX (panel), priv->toolbar, FALSE, FALSE, 0); - gtk_widget_show_all (priv->toolbar); + gtk_box_pack_start (GTK_BOX (panel), panel->toolbar, FALSE, FALSE, 0); + gtk_widget_show_all (panel->toolbar); GtkWidget* vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (panel), vbox, TRUE, TRUE, 0); - // Create the titlebar + /* Create the titlebar */ GtkWidget* labelbar = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (labelbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (labelbar), GTK_TOOLBAR_ICONS); GtkToolItem* toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (toolitem, TRUE); - priv->toolbar_label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (priv->toolbar_label), 0, 0.5); - gtk_container_add (GTK_CONTAINER (toolitem), priv->toolbar_label); + panel->toolbar_label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (panel->toolbar_label), 0, 0.5); + gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); @@ -217,32 +209,31 @@ midori_panel_init (MidoriPanel* panel) gtk_box_pack_start (GTK_BOX (vbox), labelbar, FALSE, FALSE, 0); gtk_widget_show_all (vbox); - // Create the toolbook - priv->toolbook = gtk_notebook_new (); - gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->toolbook), FALSE); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->toolbook), FALSE); - gtk_box_pack_start (GTK_BOX (vbox), priv->toolbook, FALSE, FALSE, 0); - gtk_widget_show (priv->toolbook); + /* Create the toolbook */ + panel->toolbook = gtk_notebook_new (); + gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->toolbook), FALSE); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->toolbook), FALSE); + gtk_box_pack_start (GTK_BOX (vbox), panel->toolbook, FALSE, FALSE, 0); + gtk_widget_show (panel->toolbook); - // Create the notebook - priv->notebook = gtk_notebook_new (); - gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE); - priv->frame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (priv->frame), priv->notebook); - gtk_box_pack_start (GTK_BOX (vbox), priv->frame, TRUE, TRUE, 0); - gtk_widget_show_all (priv->frame); + /* Create the notebook */ + panel->notebook = gtk_notebook_new (); + gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->notebook), FALSE); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->notebook), FALSE); + panel->frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (panel->frame), panel->notebook); + gtk_box_pack_start (GTK_BOX (vbox), panel->frame, TRUE, TRUE, 0); + gtk_widget_show_all (panel->frame); } static void midori_panel_finalize (GObject* object) { MidoriPanel* panel = MIDORI_PANEL (object); - MidoriPanelPrivate* priv = panel->priv; - if (priv->menu) + if (panel->menu) { - // FIXME: Remove all menu items + /* FIXME: Remove all menu items */ } G_OBJECT_CLASS (midori_panel_parent_class)->finalize (object); @@ -255,17 +246,16 @@ midori_panel_set_property (GObject* object, GParamSpec* pspec) { MidoriPanel* panel = MIDORI_PANEL (object); - MidoriPanelPrivate* priv = panel->priv; switch (prop_id) { case PROP_SHADOW_TYPE: - gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), + gtk_frame_set_shadow_type (GTK_FRAME (panel->frame), g_value_get_enum (value)); break; case PROP_MENU: - katze_object_assign (priv->menu, g_value_get_object (value)); - // FIXME: Move existing items to the new menu + katze_object_assign (panel->menu, g_value_get_object (value)); + /* FIXME: Move existing items to the new menu */ break; case PROP_PAGE: midori_panel_set_current_page (panel, g_value_get_int (value)); @@ -283,16 +273,15 @@ midori_panel_get_property (GObject* object, GParamSpec* pspec) { MidoriPanel* panel = MIDORI_PANEL (object); - MidoriPanelPrivate* priv = panel->priv; switch (prop_id) { case PROP_SHADOW_TYPE: g_value_set_enum (value, - gtk_frame_get_shadow_type (GTK_FRAME (priv->frame))); + gtk_frame_get_shadow_type (GTK_FRAME (panel->frame))); break; case PROP_MENU: - g_value_set_object (value, priv->menu); + g_value_set_object (value, panel->menu); break; case PROP_PAGE: g_value_set_int (value, midori_panel_get_current_page (panel)); @@ -360,8 +349,6 @@ midori_panel_append_page (MidoriPanel* panel, g_return_val_if_fail (GTK_IS_WIDGET (child), -1); g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); - MidoriPanelPrivate* priv = panel->priv; - GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, @@ -379,12 +366,12 @@ midori_panel_append_page (MidoriPanel* panel, gtk_container_add (GTK_CONTAINER (widget), child); } gtk_container_add (GTK_CONTAINER (scrolled), widget); - gtk_container_add (GTK_CONTAINER (priv->notebook), scrolled); + gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); if (!toolbar) toolbar = gtk_event_box_new (); gtk_widget_show (toolbar); - gtk_container_add (GTK_CONTAINER (priv->toolbook), toolbar); + gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); guint n = midori_panel_page_num (panel, child); @@ -392,8 +379,8 @@ midori_panel_append_page (MidoriPanel* panel, g_object_set_data (G_OBJECT (child), "label", (gchar*)text); GtkWidget* image; - GtkToolItem* toolitem = gtk_radio_tool_button_new (priv->group); - priv->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( + GtkToolItem* toolitem = gtk_radio_tool_button_new (panel->group); + panel->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( toolitem)); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), text); if (icon) @@ -405,9 +392,9 @@ midori_panel_append_page (MidoriPanel* panel, g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); gtk_widget_show_all (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (priv->toolbar), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), toolitem, -1); - if (priv->menu) + if (panel->menu) { GtkWidget* menuitem = gtk_image_menu_item_new_with_label (text); if (icon) @@ -421,7 +408,7 @@ midori_panel_append_page (MidoriPanel* panel, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->menu), menuitem); } return n; @@ -442,9 +429,7 @@ midori_panel_get_current_page (MidoriPanel* panel) { g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); - MidoriPanelPrivate* priv = panel->priv; - - return gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + return gtk_notebook_get_current_page (GTK_NOTEBOOK (panel->notebook)); } static GtkWidget* @@ -473,10 +458,8 @@ midori_panel_get_nth_page (MidoriPanel* panel, { g_return_val_if_fail (MIDORI_IS_PANEL (panel), NULL); - MidoriPanelPrivate* priv = panel->priv; - GtkWidget* scrolled = gtk_notebook_get_nth_page ( - GTK_NOTEBOOK (priv->notebook), page_num); + GTK_NOTEBOOK (panel->notebook), page_num); if (scrolled) return _midori_panel_child_for_scrolled (panel, scrolled); return NULL; @@ -495,9 +478,7 @@ midori_panel_get_n_pages (MidoriPanel* panel) { g_return_val_if_fail (MIDORI_IS_PANEL (panel), 0); - MidoriPanelPrivate* priv = panel->priv; - - return gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); + return gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook)); } static GtkWidget* @@ -526,10 +507,8 @@ midori_panel_page_num (MidoriPanel* panel, { g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); - MidoriPanelPrivate* priv = panel->priv; - GtkWidget* scrolled = _midori_panel_scrolled_for_child (panel, child); - return gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), scrolled); + return gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), scrolled); } /** @@ -548,14 +527,12 @@ midori_panel_set_current_page (MidoriPanel* panel, { g_return_if_fail (MIDORI_IS_PANEL (panel)); - MidoriPanelPrivate* priv = panel->priv; - - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->toolbook), n); - gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), n); + gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); + gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); GtkWidget* child = midori_panel_get_nth_page (panel, n); if (child) { const gchar* label = g_object_get_data (G_OBJECT (child), "label"); - g_object_set (priv->toolbar_label, "label", label, NULL); + g_object_set (panel->toolbar_label, "label", label, NULL); } } diff --git a/midori/midori-panel.h b/midori/midori-panel.h index eb3908bc..66b05434 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -32,16 +32,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PANEL, MidoriPanelClass)) typedef struct _MidoriPanel MidoriPanel; -typedef struct _MidoriPanelPrivate MidoriPanelPrivate; typedef struct _MidoriPanelClass MidoriPanelClass; -struct _MidoriPanel -{ - GtkHBox parent_instance; - - MidoriPanelPrivate* priv; -}; - struct _MidoriPanelClass { GtkHBoxClass parent_class; From f10ca318276a9cdc62048317ca6bd88b70e6dbe2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 20:41:05 +0200 Subject: [PATCH 0159/2970] Simplify MidoriPreferences, remove Private --- midori/midori-preferences.c | 52 ++++++++++++++++--------------------- midori/midori-preferences.h | 8 ------ 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index aa2017a5..dfa3328a 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -15,16 +15,14 @@ #include -G_DEFINE_TYPE (MidoriPreferences, midori_preferences, GTK_TYPE_DIALOG) - -struct _MidoriPreferencesPrivate +struct _MidoriPreferences { + GtkDialog parent_instance; + GtkWidget* notebook; }; -#define MIDORI_PREFERENCES_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_PREFERENCES, MidoriPreferencesPrivate)) +G_DEFINE_TYPE (MidoriPreferences, midori_preferences, GTK_TYPE_DIALOG) enum { @@ -64,25 +62,21 @@ midori_preferences_class_init (MidoriPreferencesClass* class) _("Settings instance to provide properties"), MIDORI_TYPE_WEB_SETTINGS, G_PARAM_WRITABLE)); - - g_type_class_add_private (class, sizeof (MidoriPreferencesPrivate)); } static void clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser) { gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_chooser), ""); - // Emit "file-set" manually for Gtk doesn't emit it otherwise + /* Emit "file-set" manually for Gtk doesn't emit it otherwise + FIXME: file-set is Gtk+ >= 2.12 */ g_signal_emit_by_name (file_chooser, "file-set"); } static void midori_preferences_init (MidoriPreferences* preferences) { - preferences->priv = MIDORI_PREFERENCES_GET_PRIVATE (preferences); - MidoriPreferencesPrivate* priv = preferences->priv; - - priv->notebook = NULL; + preferences->notebook = NULL; gchar* dialog_title = g_strdup_printf (_("%s Preferences"), g_get_application_name ()); @@ -95,13 +89,13 @@ midori_preferences_init (MidoriPreferences* preferences) GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - // TODO: Implement some kind of help function + /* TODO: Implement some kind of help function */ gtk_dialog_set_response_sensitive (GTK_DIALOG (preferences), - GTK_RESPONSE_HELP, FALSE); //... + GTK_RESPONSE_HELP, FALSE); g_signal_connect (preferences, "response", G_CALLBACK (gtk_widget_destroy), preferences); - // TODO: Do we want tooltips for explainations or can we omit that? + /* TODO: Do we want tooltips for explainations or can we omit that? */ g_free (dialog_title); } @@ -194,19 +188,17 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); - MidoriPreferencesPrivate* priv = preferences->priv; + g_return_if_fail (!preferences->notebook); - g_return_if_fail (!priv->notebook); - - priv->notebook = gtk_notebook_new (); - gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6); + preferences->notebook = gtk_notebook_new (); + gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); GtkWidget* page; GtkWidget* frame; GtkWidget* table; GtkWidget* align; GtkWidget* label; GtkWidget* button; GtkWidget* entry; GtkWidget* hbox; #define PAGE_NEW(__label) page = gtk_vbox_new (FALSE, 0); \ gtk_container_set_border_width (GTK_CONTAINER (page), 5); \ - gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), page, \ + gtk_notebook_append_page (GTK_NOTEBOOK (preferences->notebook), page, \ gtk_label_new (__label)) #define FRAME_NEW(__label) frame = sokoke_hig_frame_new (__label); \ gtk_container_set_border_width (GTK_CONTAINER (frame), 5); \ @@ -232,7 +224,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, align = gtk_alignment_new (0, 0.5, 0, 0); \ gtk_container_add (GTK_CONTAINER (align), __widget); \ FILLED_ADD (align, __left, __right, __top, __bottom) - // Page "General" + /* Page "General" */ PAGE_NEW (_("General")); FRAME_NEW (_("Startup")); TABLE_NEW (2, 2); @@ -244,7 +236,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 1, 2); entry = katze_property_proxy (settings, "homepage", NULL); FILLED_ADD (entry, 1, 2, 1, 2); - // TODO: We need something like "use current website" + /* TODO: We need something like "use current website" */ FRAME_NEW (_("Transfers")); TABLE_NEW (1, 2); label = katze_property_label (settings, "download-folder"); @@ -254,7 +246,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "show-download-notification", "blurb"); SPANNED_ADD (button, 0, 2, 1, 2); - // Page "Appearance" + /* Page "Appearance" */ PAGE_NEW (_("Appearance")); FRAME_NEW (_("Font settings")); TABLE_NEW (5, 2); @@ -276,7 +268,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "preferred-encoding", NULL); FILLED_ADD (button, 1, 2, 2, 3); - // Page "Behavior" + /* Page "Behavior" */ PAGE_NEW (_("Behavior")); FRAME_NEW (_("Features")); TABLE_NEW (6, 2); @@ -327,7 +319,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, entry = katze_property_proxy (settings, "location-entry-search", NULL); FILLED_ADD (entry, 1, 2, 5, 6); - // Page "Interface" + /* Page "Interface" */ PAGE_NEW (_("Interface")); FRAME_NEW (_("Navigationbar")); TABLE_NEW (3, 2); @@ -357,7 +349,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); SPANNED_ADD (button, 1, 2, 2, 3); - // Page "Network" + /* Page "Network" */ PAGE_NEW (_("Network")); FRAME_NEW (_("Network")); TABLE_NEW (2, 2); @@ -374,7 +366,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 1, 2); - // Page "Privacy" + /* Page "Privacy" */ PAGE_NEW (_("Privacy")); FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); @@ -408,6 +400,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button, 0, 2, 2, 3); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), - priv->notebook, FALSE, FALSE, 4); + preferences->notebook, FALSE, FALSE, 4); gtk_widget_show_all (GTK_DIALOG (preferences)->vbox); } diff --git a/midori/midori-preferences.h b/midori/midori-preferences.h index e47d843c..9015d952 100644 --- a/midori/midori-preferences.h +++ b/midori/midori-preferences.h @@ -34,16 +34,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PREFERENCES, MidoriPreferencesClass)) typedef struct _MidoriPreferences MidoriPreferences; -typedef struct _MidoriPreferencesPrivate MidoriPreferencesPrivate; typedef struct _MidoriPreferencesClass MidoriPreferencesClass; -struct _MidoriPreferences -{ - GtkDialog parent_instance; - - MidoriPreferencesPrivate* priv; -}; - struct _MidoriPreferencesClass { GtkDialogClass parent_class; From b196dc5b57e145529e0fedfe1e6547fe81204c65 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 20:41:43 +0200 Subject: [PATCH 0160/2970] Simplify MidoriWebSettings, remove Private --- midori/midori-websettings.c | 251 ++++++++++++++++-------------------- midori/midori-websettings.h | 8 -- 2 files changed, 114 insertions(+), 145 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 20bbcc01..02625460 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -16,10 +16,10 @@ #include #include -G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) - -struct _MidoriWebSettingsPrivate +struct _MidoriWebSettings { + WebKitWebSettings parent_instance; + gboolean remember_last_window_size; gint last_window_width; gint last_window_height; @@ -67,9 +67,7 @@ struct _MidoriWebSettingsPrivate gint cache_size; }; -#define MIDORI_WEB_SETTINGS_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_WEB_SETTINGS, MidoriWebSettingsPrivate)) +G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) enum { @@ -227,10 +225,6 @@ midori_web_settings_get_property (GObject* object, GValue* value, GParamSpec* pspec); -static void -midori_web_settings_notify (GObject* object, - GParamSpec* pspec); - static void midori_web_settings_class_init (MidoriWebSettingsClass* class) { @@ -238,7 +232,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) gobject_class->finalize = midori_web_settings_finalize; gobject_class->set_property = midori_web_settings_set_property; gobject_class->get_property = midori_web_settings_get_property; - gobject_class->notify = midori_web_settings_notify; GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; @@ -601,39 +594,34 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("The allowed size of the cache"), 0, G_MAXINT, 100, G_PARAM_READABLE)); - - g_type_class_add_private (class, sizeof (MidoriWebSettingsPrivate)); } static void notify_default_encoding_cb (GObject* object, GParamSpec* pspec) { MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); - MidoriWebSettingsPrivate* priv = web_settings->priv; const gchar* string; g_object_get (object, "default-encoding", &string, NULL); const gchar* encoding = string ? string : ""; if (!strcmp (encoding, "BIG5")) - priv->preferred_encoding = MIDORI_ENCODING_CHINESE; + web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE; else if (!strcmp (encoding, "SHIFT_JIS")) - priv->preferred_encoding = MIDORI_ENCODING_JAPANESE; + web_settings->preferred_encoding = MIDORI_ENCODING_JAPANESE; else if (!strcmp (encoding, "KOI8-R")) - priv->preferred_encoding = MIDORI_ENCODING_RUSSIAN; + web_settings->preferred_encoding = MIDORI_ENCODING_RUSSIAN; else if (!strcmp (encoding, "UTF-8")) - priv->preferred_encoding = MIDORI_ENCODING_UNICODE; + web_settings->preferred_encoding = MIDORI_ENCODING_UNICODE; else if (!strcmp (encoding, "ISO-8859-1")) - priv->preferred_encoding = MIDORI_ENCODING_WESTERN; + web_settings->preferred_encoding = MIDORI_ENCODING_WESTERN; else - priv->preferred_encoding = MIDORI_ENCODING_CUSTOM; + web_settings->preferred_encoding = MIDORI_ENCODING_CUSTOM; g_object_notify (object, "preferred-encoding"); } static void midori_web_settings_init (MidoriWebSettings* web_settings) { - web_settings->priv = MIDORI_WEB_SETTINGS_GET_PRIVATE (web_settings); - g_signal_connect (web_settings, "notify::default-encoding", G_CALLBACK (notify_default_encoding_cb), NULL); } @@ -651,82 +639,81 @@ midori_web_settings_set_property (GObject* object, GParamSpec* pspec) { MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); - MidoriWebSettingsPrivate* priv = web_settings->priv; switch (prop_id) { case PROP_REMEMBER_LAST_WINDOW_SIZE: - priv->remember_last_window_size = g_value_get_boolean (value); + web_settings->remember_last_window_size = g_value_get_boolean (value); break; case PROP_LAST_WINDOW_WIDTH: - priv->last_window_width = g_value_get_int (value); + web_settings->last_window_width = g_value_get_int (value); break; case PROP_LAST_WINDOW_HEIGHT: - priv->last_window_height = g_value_get_int (value); + web_settings->last_window_height = g_value_get_int (value); break; case PROP_LAST_PANEL_POSITION: - priv->last_panel_position = g_value_get_int (value); + web_settings->last_panel_position = g_value_get_int (value); break; case PROP_LAST_PANEL_PAGE: - priv->last_panel_page = g_value_get_int (value); + web_settings->last_panel_page = g_value_get_int (value); break; case PROP_LAST_WEB_SEARCH: - priv->last_web_search = g_value_get_int (value); + web_settings->last_web_search = g_value_get_int (value); break; case PROP_LAST_PAGEHOLDER_URI: - katze_assign (priv->last_pageholder_uri, g_value_dup_string (value)); + katze_assign (web_settings->last_pageholder_uri, g_value_dup_string (value)); break; case PROP_SHOW_NAVIGATIONBAR: - priv->show_navigationbar = g_value_get_boolean (value); + web_settings->show_navigationbar = g_value_get_boolean (value); break; case PROP_SHOW_BOOKMARKBAR: - priv->show_bookmarkbar = g_value_get_boolean (value); + web_settings->show_bookmarkbar = g_value_get_boolean (value); break; case PROP_SHOW_PANEL: - priv->show_panel = g_value_get_boolean (value); + web_settings->show_panel = g_value_get_boolean (value); break; case PROP_SHOW_STATUSBAR: - priv->show_statusbar = g_value_get_boolean (value); + web_settings->show_statusbar = g_value_get_boolean (value); break; case PROP_TOOLBAR_STYLE: - priv->toolbar_style = g_value_get_enum (value); + web_settings->toolbar_style = g_value_get_enum (value); break; case PROP_SMALL_TOOLBAR: - priv->small_toolbar = g_value_get_boolean (value); + web_settings->small_toolbar = g_value_get_boolean (value); break; case PROP_SHOW_NEW_TAB: - priv->show_new_tab = g_value_get_boolean (value); + web_settings->show_new_tab = g_value_get_boolean (value); break; case PROP_SHOW_HOMEPAGE: - priv->show_homepage = g_value_get_boolean (value); + web_settings->show_homepage = g_value_get_boolean (value); break; case PROP_SHOW_WEB_SEARCH: - priv->show_web_search = g_value_get_boolean (value); + web_settings->show_web_search = g_value_get_boolean (value); break; case PROP_SHOW_TRASH: - priv->show_trash = g_value_get_boolean (value); + web_settings->show_trash = g_value_get_boolean (value); break; case PROP_LOAD_ON_STARTUP: - priv->load_on_startup = g_value_get_enum (value); + web_settings->load_on_startup = g_value_get_enum (value); break; case PROP_HOMEPAGE: - katze_assign (priv->homepage, g_value_dup_string (value)); + katze_assign (web_settings->homepage, g_value_dup_string (value)); break; case PROP_DOWNLOAD_FOLDER: - katze_assign (priv->download_folder, g_value_dup_string (value)); + katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; case PROP_SHOW_DOWNLOAD_NOTIFICATION: - priv->show_download_notification = g_value_get_boolean (value); + web_settings->show_download_notification = g_value_get_boolean (value); break; case PROP_LOCATION_ENTRY_SEARCH: - katze_assign (priv->location_entry_search, g_value_dup_string (value)); + katze_assign (web_settings->location_entry_search, g_value_dup_string (value)); break; case PROP_PREFERRED_ENCODING: - priv->preferred_encoding = g_value_get_enum (value); - switch (priv->preferred_encoding) + web_settings->preferred_encoding = g_value_get_enum (value); + switch (web_settings->preferred_encoding) { case MIDORI_ENCODING_CHINESE: g_object_set (object, "default-encoding", "BIG5", NULL); @@ -749,53 +736,53 @@ midori_web_settings_set_property (GObject* object, break; case PROP_TAB_LABEL_SIZE: - priv->tab_label_size = g_value_get_int (value); + web_settings->tab_label_size = g_value_get_int (value); break; case PROP_CLOSE_BUTTONS_ON_TABS: - priv->close_buttons_on_tabs = g_value_get_boolean (value); + web_settings->close_buttons_on_tabs = g_value_get_boolean (value); break; case PROP_OPEN_NEW_PAGES_IN: - priv->open_new_pages_in = g_value_get_enum (value); + web_settings->open_new_pages_in = g_value_get_enum (value); break; case PROP_MIDDLE_CLICK_OPENS_SELECTION: - priv->middle_click_opens_selection = g_value_get_boolean (value); + web_settings->middle_click_opens_selection = g_value_get_boolean (value); break; case PROP_OPEN_TABS_IN_THE_BACKGROUND: - priv->open_tabs_in_the_background = g_value_get_boolean (value); + web_settings->open_tabs_in_the_background = g_value_get_boolean (value); break; case PROP_OPEN_POPUPS_IN_TABS: - priv->open_popups_in_tabs = g_value_get_boolean (value); + web_settings->open_popups_in_tabs = g_value_get_boolean (value); break; case PROP_ACCEPT_COOKIES: - priv->accept_cookies = g_value_get_enum (value); + web_settings->accept_cookies = g_value_get_enum (value); break; case PROP_ORIGINAL_COOKIES_ONLY: - priv->original_cookies_only = g_value_get_boolean (value); + web_settings->original_cookies_only = g_value_get_boolean (value); break; case PROP_MAXIMUM_COOKIE_AGE: - priv->maximum_cookie_age = g_value_get_int (value); + web_settings->maximum_cookie_age = g_value_get_int (value); break; case PROP_REMEMBER_LAST_VISITED_PAGES: - priv->remember_last_visited_pages = g_value_get_boolean (value); + web_settings->remember_last_visited_pages = g_value_get_boolean (value); break; case PROP_MAXIMUM_HISTORY_AGE: - priv->maximum_history_age = g_value_get_int (value); + web_settings->maximum_history_age = g_value_get_int (value); break; case PROP_REMEMBER_LAST_FORM_INPUTS: - priv->remember_last_form_inputs = g_value_get_boolean (value); + web_settings->remember_last_form_inputs = g_value_get_boolean (value); break; case PROP_REMEMBER_LAST_DOWNLOADED_FILES: - priv->remember_last_downloaded_files = g_value_get_boolean (value); + web_settings->remember_last_downloaded_files = g_value_get_boolean (value); break; case PROP_HTTP_PROXY: - katze_assign (priv->http_proxy, g_value_dup_string (value)); - g_setenv ("http_proxy", priv->http_proxy ? priv->http_proxy : "", TRUE); + katze_assign (web_settings->http_proxy, g_value_dup_string (value)); + g_setenv ("http_proxy", web_settings->http_proxy ? web_settings->http_proxy : "", TRUE); break; case PROP_CACHE_SIZE: - priv->cache_size = g_value_get_int (value); + web_settings->cache_size = g_value_get_int (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -810,130 +797,129 @@ midori_web_settings_get_property (GObject* object, GParamSpec* pspec) { MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); - MidoriWebSettingsPrivate* priv = web_settings->priv; switch (prop_id) { case PROP_REMEMBER_LAST_WINDOW_SIZE: - g_value_set_boolean (value, priv->remember_last_window_size); + g_value_set_boolean (value, web_settings->remember_last_window_size); break; case PROP_LAST_WINDOW_WIDTH: - g_value_set_int (value, priv->last_window_width); + g_value_set_int (value, web_settings->last_window_width); break; case PROP_LAST_WINDOW_HEIGHT: - g_value_set_int (value, priv->last_window_height); + g_value_set_int (value, web_settings->last_window_height); break; case PROP_LAST_PANEL_POSITION: - g_value_set_int (value, priv->last_panel_position); + g_value_set_int (value, web_settings->last_panel_position); break; case PROP_LAST_PANEL_PAGE: - g_value_set_int (value, priv->last_panel_page); + g_value_set_int (value, web_settings->last_panel_page); break; case PROP_LAST_WEB_SEARCH: - g_value_set_int (value, priv->last_web_search); + g_value_set_int (value, web_settings->last_web_search); break; case PROP_LAST_PAGEHOLDER_URI: - g_value_set_string (value, priv->last_pageholder_uri); + g_value_set_string (value, web_settings->last_pageholder_uri); break; case PROP_SHOW_NAVIGATIONBAR: - g_value_set_boolean (value, priv->show_navigationbar); + g_value_set_boolean (value, web_settings->show_navigationbar); break; case PROP_SHOW_BOOKMARKBAR: - g_value_set_boolean (value, priv->show_bookmarkbar); + g_value_set_boolean (value, web_settings->show_bookmarkbar); break; case PROP_SHOW_PANEL: - g_value_set_boolean (value, priv->show_panel); + g_value_set_boolean (value, web_settings->show_panel); break; case PROP_SHOW_STATUSBAR: - g_value_set_boolean (value, priv->show_statusbar); + g_value_set_boolean (value, web_settings->show_statusbar); break; case PROP_TOOLBAR_STYLE: - g_value_set_enum (value, priv->toolbar_style); + g_value_set_enum (value, web_settings->toolbar_style); break; case PROP_SMALL_TOOLBAR: - g_value_set_boolean (value, priv->small_toolbar); + g_value_set_boolean (value, web_settings->small_toolbar); break; case PROP_SHOW_NEW_TAB: - g_value_set_boolean (value, priv->show_new_tab); + g_value_set_boolean (value, web_settings->show_new_tab); break; case PROP_SHOW_HOMEPAGE: - g_value_set_boolean (value, priv->show_homepage); + g_value_set_boolean (value, web_settings->show_homepage); break; case PROP_SHOW_WEB_SEARCH: - g_value_set_boolean (value, priv->show_web_search); + g_value_set_boolean (value, web_settings->show_web_search); break; case PROP_SHOW_TRASH: - g_value_set_boolean (value, priv->show_trash); + g_value_set_boolean (value, web_settings->show_trash); break; case PROP_LOAD_ON_STARTUP: - g_value_set_enum (value, priv->load_on_startup); + g_value_set_enum (value, web_settings->load_on_startup); break; case PROP_HOMEPAGE: - g_value_set_string (value, priv->homepage); + g_value_set_string (value, web_settings->homepage); break; case PROP_DOWNLOAD_FOLDER: - g_value_set_string (value, priv->download_folder); + g_value_set_string (value, web_settings->download_folder); break; case PROP_SHOW_DOWNLOAD_NOTIFICATION: - g_value_set_boolean (value, priv->show_download_notification); + g_value_set_boolean (value, web_settings->show_download_notification); break; case PROP_LOCATION_ENTRY_SEARCH: - g_value_set_string (value, priv->location_entry_search); + g_value_set_string (value, web_settings->location_entry_search); break; case PROP_PREFERRED_ENCODING: - g_value_set_enum (value, priv->preferred_encoding); + g_value_set_enum (value, web_settings->preferred_encoding); break; case PROP_TAB_LABEL_SIZE: - g_value_set_int (value, priv->tab_label_size); + g_value_set_int (value, web_settings->tab_label_size); break; case PROP_CLOSE_BUTTONS_ON_TABS: - g_value_set_boolean (value, priv->close_buttons_on_tabs); + g_value_set_boolean (value, web_settings->close_buttons_on_tabs); break; case PROP_OPEN_NEW_PAGES_IN: - g_value_set_enum (value, priv->open_new_pages_in); + g_value_set_enum (value, web_settings->open_new_pages_in); break; case PROP_MIDDLE_CLICK_OPENS_SELECTION: - g_value_set_boolean (value, priv->middle_click_opens_selection); + g_value_set_boolean (value, web_settings->middle_click_opens_selection); break; case PROP_OPEN_TABS_IN_THE_BACKGROUND: - g_value_set_boolean (value, priv->open_tabs_in_the_background); + g_value_set_boolean (value, web_settings->open_tabs_in_the_background); break; case PROP_OPEN_POPUPS_IN_TABS: - g_value_set_boolean (value, priv->open_popups_in_tabs); + g_value_set_boolean (value, web_settings->open_popups_in_tabs); break; case PROP_ACCEPT_COOKIES: - g_value_set_enum (value, priv->accept_cookies); + g_value_set_enum (value, web_settings->accept_cookies); break; case PROP_ORIGINAL_COOKIES_ONLY: - g_value_set_boolean (value, priv->original_cookies_only); + g_value_set_boolean (value, web_settings->original_cookies_only); break; case PROP_MAXIMUM_COOKIE_AGE: - g_value_set_int (value, priv->maximum_cookie_age); + g_value_set_int (value, web_settings->maximum_cookie_age); break; case PROP_REMEMBER_LAST_VISITED_PAGES: - g_value_set_boolean (value, priv->remember_last_visited_pages); + g_value_set_boolean (value, web_settings->remember_last_visited_pages); break; case PROP_MAXIMUM_HISTORY_AGE: - g_value_set_int (value, priv->maximum_history_age); + g_value_set_int (value, web_settings->maximum_history_age); break; case PROP_REMEMBER_LAST_FORM_INPUTS: - g_value_set_boolean (value, priv->remember_last_form_inputs); + g_value_set_boolean (value, web_settings->remember_last_form_inputs); break; case PROP_REMEMBER_LAST_DOWNLOADED_FILES: - g_value_set_boolean (value, priv->remember_last_downloaded_files); + g_value_set_boolean (value, web_settings->remember_last_downloaded_files); break; case PROP_HTTP_PROXY: - g_value_set_string (value, priv->http_proxy); + g_value_set_string (value, web_settings->http_proxy); break; case PROP_CACHE_SIZE: - g_value_set_int (value, priv->cache_size); + g_value_set_int (value, web_settings->cache_size); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -941,13 +927,6 @@ midori_web_settings_get_property (GObject* object, } } -static void -midori_web_settings_notify (GObject* object, - GParamSpec* pspec) -{ - -} - /** * midori_web_settings_new: * @@ -978,43 +957,41 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) { g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (web_settings), NULL); - MidoriWebSettingsPrivate* priv = web_settings->priv; - MidoriWebSettings* copy; copy = MIDORI_WEB_SETTINGS (webkit_web_settings_copy ( WEBKIT_WEB_SETTINGS (web_settings))); g_object_set (copy, - "load-on-startup", priv->load_on_startup, - "homepage", priv->homepage, - "download-folder", priv->download_folder, - "show-download-notification", priv->show_download_notification, - "location-entry-search", priv->location_entry_search, - "preferred-encoding", priv->preferred_encoding, + "load-on-startup", web_settings->load_on_startup, + "homepage", web_settings->homepage, + "download-folder", web_settings->download_folder, + "show-download-notification", web_settings->show_download_notification, + "location-entry-search", web_settings->location_entry_search, + "preferred-encoding", web_settings->preferred_encoding, - "toolbar-style", priv->toolbar_style, - "small-toolbar", priv->small_toolbar, - "show-web-search", priv->show_web_search, - "show-new-tab", priv->show_new_tab, - "show-trash", priv->show_trash, + "toolbar-style", web_settings->toolbar_style, + "small-toolbar", web_settings->small_toolbar, + "show-web-search", web_settings->show_web_search, + "show-new-tab", web_settings->show_new_tab, + "show-trash", web_settings->show_trash, - "tab-label-size", priv->tab_label_size, - "close-buttons-on-tabs", priv->close_buttons_on_tabs, - "open-new-pages-in", priv->open_new_pages_in, - "middle-click-opens-selection", priv->middle_click_opens_selection, - "open-tabs-in-the-background", priv->open_tabs_in_the_background, - "open-popups-in-tabs", priv->open_popups_in_tabs, + "tab-label-size", web_settings->tab_label_size, + "close-buttons-on-tabs", web_settings->close_buttons_on_tabs, + "open-new-pages-in", web_settings->open_new_pages_in, + "middle-click-opens-selection", web_settings->middle_click_opens_selection, + "open-tabs-in-the-background", web_settings->open_tabs_in_the_background, + "open-popups-in-tabs", web_settings->open_popups_in_tabs, - "accept-cookies", priv->accept_cookies, - "original-cookies-only", priv->original_cookies_only, - "maximum-cookie-age", priv->maximum_cookie_age, + "accept-cookies", web_settings->accept_cookies, + "original-cookies-only", web_settings->original_cookies_only, + "maximum-cookie-age", web_settings->maximum_cookie_age, - "remember-last-visited-pages", priv->remember_last_visited_pages, - "maximum-history-age", priv->maximum_history_age, - "remember-last-form-inputs", priv->remember_last_form_inputs, - "remember-last-downloaded-files", priv->remember_last_downloaded_files, + "remember-last-visited-pages", web_settings->remember_last_visited_pages, + "maximum-history-age", web_settings->maximum_history_age, + "remember-last-form-inputs", web_settings->remember_last_form_inputs, + "remember-last-downloaded-files", web_settings->remember_last_downloaded_files, - "http-proxy", priv->http_proxy, - "cache-size", priv->cache_size, + "http-proxy", web_settings->http_proxy, + "cache-size", web_settings->cache_size, NULL); return copy; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index ceb8c380..35405ad3 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -32,16 +32,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_SETTINGS, MidoriWebSettingsClass)) typedef struct _MidoriWebSettings MidoriWebSettings; -typedef struct _MidoriWebSettingsPrivate MidoriWebSettingsPrivate; typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass; -struct _MidoriWebSettings -{ - WebKitWebSettings parent_instance; - - MidoriWebSettingsPrivate* priv; -}; - typedef enum { MIDORI_STARTUP_BLANK_PAGE, From 778faa834639ed0e4b680d52e2982397c62275c2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 20:42:16 +0200 Subject: [PATCH 0161/2970] Simplify MidoriWebView, remove Private --- midori/midori-webview.c | 314 +++++++++++++++++----------------------- midori/midori-webview.h | 8 - 2 files changed, 130 insertions(+), 192 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index cec42909..5b92cd72 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -22,10 +22,10 @@ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); -G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) - -struct _MidoriWebViewPrivate +struct _MidoriWebView { + WebKitWebView parent_instance; + GtkWidget* tab_icon; GtkWidget* tab_label; GtkWidget* tab_close; @@ -47,9 +47,7 @@ struct _MidoriWebViewPrivate KatzeXbelItem* proxy_xbel_item; }; -#define MIDORI_WEB_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_WEB_VIEW, MidoriWebViewPrivate)) +G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) enum { @@ -229,32 +227,26 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_object_class_override_property (gobject_class, PROP_SETTINGS, "settings"); - - g_type_class_add_private (class, sizeof (MidoriWebViewPrivate)); } /*static void webkit_web_view_load_started (MidoriWebView* web_view, WebKitWebFrame* web_frame) { - MidoriWebViewPrivate* priv = web_view->priv; - - priv->is_loading = TRUE; - priv->progress = -1; - katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), TRUE); + web_view->is_loading = TRUE; + web_view->progress = -1; + katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), TRUE); }*/ static void _midori_web_view_set_uri (MidoriWebView* web_view, const gchar* uri) { - MidoriWebViewPrivate* priv = web_view->priv; - - katze_assign (priv->uri, g_strdup (uri)); - if (priv->proxy_xbel_item) + katze_assign (web_view->uri, g_strdup (uri)); + if (web_view->proxy_xbel_item) { const gchar* uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (priv->proxy_xbel_item, uri); + katze_xbel_bookmark_set_href (web_view->proxy_xbel_item, uri); } g_object_set (web_view, "title", NULL, NULL); } @@ -263,9 +255,7 @@ static void webkit_web_view_load_committed (MidoriWebView* web_view, WebKitWebFrame* web_frame) { - MidoriWebViewPrivate* priv = web_view->priv; - - priv->progress = 0; + web_view->progress = 0; const gchar* uri = webkit_web_frame_get_uri (web_frame); _midori_web_view_set_uri (web_view, uri); } @@ -274,45 +264,37 @@ static void webkit_web_view_load_started (MidoriWebView* web_view, WebKitWebFrame* web_frame) { - MidoriWebViewPrivate* priv = web_view->priv; - /* FIXME: This is a hack, until signals are fixed upstream */ - priv->is_loading = TRUE; - if (priv->tab_icon) - katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), TRUE); + web_view->is_loading = TRUE; + if (web_view->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), TRUE); - priv->progress = 0; - g_signal_emit (web_view, signals[PROGRESS_STARTED], 0, priv->progress); + web_view->progress = 0; + g_signal_emit (web_view, signals[PROGRESS_STARTED], 0, web_view->progress); } static void webkit_web_view_progress_changed (MidoriWebView* web_view, gint progress) { - MidoriWebViewPrivate* priv = web_view->priv; - - priv->progress = progress; - g_signal_emit (web_view, signals[PROGRESS_CHANGED], 0, priv->progress); + web_view->progress = progress; + g_signal_emit (web_view, signals[PROGRESS_CHANGED], 0, web_view->progress); } static void webkit_web_view_load_finished (MidoriWebView* web_view) { - MidoriWebViewPrivate* priv = web_view->priv; - - priv->progress = 100; - g_signal_emit (web_view, signals[PROGRESS_DONE], 0, priv->progress); + web_view->progress = 100; + g_signal_emit (web_view, signals[PROGRESS_DONE], 0, web_view->progress); } static void webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, MidoriWebView* web_view) { - MidoriWebViewPrivate* priv = web_view->priv; - - priv->is_loading = FALSE; - priv->progress = -1; - if (priv->tab_icon) - katze_throbber_set_animated (KATZE_THROBBER (priv->tab_icon), FALSE); + web_view->is_loading = FALSE; + web_view->progress = -1; + if (web_view->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), FALSE); g_signal_emit (web_view, signals[LOAD_DONE], 0, web_frame); } @@ -327,9 +309,7 @@ static void webkit_web_view_statusbar_text_changed (MidoriWebView* web_view, const gchar* text) { - MidoriWebViewPrivate* priv = web_view->priv; - - katze_assign (priv->statusbar_text, g_strdup (text)); + katze_assign (web_view->statusbar_text, g_strdup (text)); g_object_notify (G_OBJECT (web_view), "statusbar-text"); } @@ -338,9 +318,7 @@ webkit_web_view_hovering_over_link (MidoriWebView* web_view, const gchar* tooltip, const gchar* link_uri) { - MidoriWebViewPrivate* priv = web_view->priv; - - katze_assign (priv->link_uri, g_strdup (link_uri)); + katze_assign (web_view->link_uri, g_strdup (link_uri)); g_signal_emit (web_view, signals[ELEMENT_MOTION], 0, link_uri); } @@ -348,26 +326,24 @@ static gboolean gtk_widget_button_press_event (MidoriWebView* web_view, GdkEventButton* event) { - MidoriWebViewPrivate* priv = web_view->priv; - GdkModifierType state = (GdkModifierType)0; gint x, y; gdk_window_get_pointer (NULL, &x, &y, &state); switch (event->button) { case 1: - if (!priv->link_uri) + if (!web_view->link_uri) return FALSE; if (state & GDK_SHIFT_MASK) { /* Open link in new window */ - g_signal_emit (web_view, signals[NEW_WINDOW], 0, priv->link_uri); + g_signal_emit (web_view, signals[NEW_WINDOW], 0, web_view->link_uri); return TRUE; } else if(state & GDK_MOD1_MASK) { /* Open link in new tab */ - g_signal_emit (web_view, signals[NEW_TAB], 0, priv->link_uri); + g_signal_emit (web_view, signals[NEW_TAB], 0, web_view->link_uri); return TRUE; } break; @@ -379,10 +355,10 @@ gtk_widget_button_press_event (MidoriWebView* web_view, } else { - if (!priv->link_uri) + if (!web_view->link_uri) return FALSE; /* Open link in new tab */ - g_signal_emit (web_view, signals[NEW_TAB], 0, priv->link_uri); + g_signal_emit (web_view, signals[NEW_TAB], 0, web_view->link_uri); return TRUE; } break; @@ -396,9 +372,7 @@ static gboolean gtk_widget_button_press_event_after (MidoriWebView* web_view, GdkEventButton* event) { - MidoriWebViewPrivate* priv = web_view->priv; - - if (event->button == 2 && priv->middle_click_opens_selection) + if (event->button == 2 && web_view->middle_click_opens_selection) { GdkModifierType state = (GdkModifierType) event->state; GtkClipboard* clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); @@ -491,24 +465,22 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, static void _midori_web_view_update_tab_label_size (MidoriWebView* web_view) { - MidoriWebViewPrivate* priv = web_view->priv; - - if (priv->tab_label) + if (web_view->tab_label) { - if (priv->tab_label_size > -1) + if (web_view->tab_label_size > -1) { gint width, height; - sokoke_widget_get_text_size (priv->tab_label, "M", + sokoke_widget_get_text_size (web_view->tab_label, "M", &width, &height); - gtk_widget_set_size_request (priv->tab_label, - width * priv->tab_label_size, -1); - gtk_label_set_ellipsize (GTK_LABEL (priv->tab_label), + gtk_widget_set_size_request (web_view->tab_label, + width * web_view->tab_label_size, -1); + gtk_label_set_ellipsize (GTK_LABEL (web_view->tab_label), PANGO_ELLIPSIZE_END); } else { - gtk_widget_set_size_request (priv->tab_label, -1, -1); - gtk_label_set_ellipsize (GTK_LABEL (priv->tab_label), + gtk_widget_set_size_request (web_view->tab_label, -1, -1); + gtk_label_set_ellipsize (GTK_LABEL (web_view->tab_label), PANGO_ELLIPSIZE_NONE); } } @@ -517,12 +489,10 @@ _midori_web_view_update_tab_label_size (MidoriWebView* web_view) static void _midori_web_view_update_settings (MidoriWebView* web_view) { - MidoriWebViewPrivate* priv = web_view->priv; - - g_object_get (G_OBJECT (priv->settings), - "tab-label-size", &priv->tab_label_size, - "close-buttons-on-tabs", &priv->close_button, - "middle-click-opens-selection", &priv->middle_click_opens_selection, + g_object_get (G_OBJECT (web_view->settings), + "tab-label-size", &web_view->tab_label_size, + "close-buttons-on-tabs", &web_view->close_button, + "middle-click-opens-selection", &web_view->middle_click_opens_selection, NULL); } @@ -531,26 +501,24 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, GParamSpec* pspec, MidoriWebView* web_view) { - MidoriWebViewPrivate* priv = web_view->priv; - const gchar* name = g_intern_string (pspec->name); GValue value = {0, }; g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (priv->settings), name, &value); + g_object_get_property (G_OBJECT (web_view->settings), name, &value); if (name == g_intern_string ("tab-label-size")) { - priv->tab_label_size = g_value_get_int (&value); + web_view->tab_label_size = g_value_get_int (&value); _midori_web_view_update_tab_label_size (web_view); } else if (name == g_intern_string ("close-buttons-on-tabs")) { - priv->close_button = g_value_get_boolean (&value); - if (priv->tab_close) - sokoke_widget_set_visible (priv->tab_close, priv->close_button); + web_view->close_button = g_value_get_boolean (&value); + if (web_view->tab_close) + sokoke_widget_set_visible (web_view->tab_close, web_view->close_button); } else if (name == g_intern_string ("middle-click-opens-selection")) - priv->middle_click_opens_selection = g_value_get_boolean (&value); + web_view->middle_click_opens_selection = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); @@ -560,16 +528,13 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, static void midori_web_view_init (MidoriWebView* web_view) { - web_view->priv = MIDORI_WEB_VIEW_GET_PRIVATE (web_view); + web_view->is_loading = FALSE; + web_view->progress = -1; - MidoriWebViewPrivate* priv = web_view->priv; - priv->is_loading = FALSE; - priv->progress = -1; - - priv->settings = midori_web_settings_new (); + web_view->settings = midori_web_settings_new (); _midori_web_view_update_settings (web_view); - g_object_set (web_view, "WebKitWebView::settings", priv->settings, NULL); - g_signal_connect (priv->settings, "notify", + g_object_set (web_view, "WebKitWebView::settings", web_view->settings, NULL); + g_signal_connect (web_view->settings, "notify", G_CALLBACK (midori_web_view_settings_notify), web_view); WebKitWebFrame* web_frame; @@ -613,22 +578,21 @@ static void midori_web_view_finalize (GObject* object) { MidoriWebView* web_view = MIDORI_WEB_VIEW (object); - MidoriWebViewPrivate* priv = web_view->priv; - if (priv->icon) - g_object_unref (priv->icon); - g_free (priv->uri); - g_free (priv->title); - g_free (priv->statusbar_text); - g_free (priv->link_uri); + if (web_view->icon) + g_object_unref (web_view->icon); + g_free (web_view->uri); + g_free (web_view->title); + g_free (web_view->statusbar_text); + g_free (web_view->link_uri); - if (priv->proxy_menu_item) - gtk_widget_destroy (priv->proxy_menu_item); - if (priv->proxy_xbel_item) - katze_xbel_item_unref (priv->proxy_xbel_item); + if (web_view->proxy_menu_item) + gtk_widget_destroy (web_view->proxy_menu_item); + if (web_view->proxy_xbel_item) + katze_xbel_item_unref (web_view->proxy_xbel_item); - if (priv->settings) - g_object_unref (priv->settings); + if (web_view->settings) + g_object_unref (web_view->settings); G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); } @@ -640,16 +604,15 @@ midori_web_view_set_property (GObject* object, GParamSpec* pspec) { MidoriWebView* web_view = MIDORI_WEB_VIEW (object); - MidoriWebViewPrivate* priv = web_view->priv; switch (prop_id) { case PROP_ICON: - katze_object_assign (priv->icon, g_value_get_object (value)); - g_object_ref (priv->icon); - if (priv->tab_icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER (priv->tab_icon), - priv->icon); + katze_object_assign (web_view->icon, g_value_get_object (value)); + g_object_ref (web_view->icon); + if (web_view->tab_icon) + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + web_view->icon); break; case PROP_URI: { @@ -662,28 +625,28 @@ midori_web_view_set_property (GObject* object, break; } case PROP_TITLE: - katze_assign (priv->title, g_value_dup_string (value)); + katze_assign (web_view->title, g_value_dup_string (value)); const gchar* title = midori_web_view_get_display_title (web_view); - if (priv->tab_label) + if (web_view->tab_label) { - gtk_label_set_text (GTK_LABEL (priv->tab_label), title); - gtk_widget_set_tooltip_text (priv->tab_label, title); + gtk_label_set_text (GTK_LABEL (web_view->tab_label), title); + gtk_widget_set_tooltip_text (web_view->tab_label, title); } - if (priv->proxy_menu_item) + if (web_view->proxy_menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( - priv->proxy_menu_item))), title); - if (priv->proxy_xbel_item) - katze_xbel_item_set_title (priv->proxy_xbel_item, title); + web_view->proxy_menu_item))), title); + if (web_view->proxy_xbel_item) + katze_xbel_item_set_title (web_view->proxy_xbel_item, title); break; case PROP_SETTINGS: - g_signal_handlers_disconnect_by_func (priv->settings, + g_signal_handlers_disconnect_by_func (web_view->settings, midori_web_view_settings_notify, web_view); - katze_object_assign (priv->settings, g_value_get_object (value)); - g_object_ref (priv->settings); + katze_object_assign (web_view->settings, g_value_get_object (value)); + g_object_ref (web_view->settings); _midori_web_view_update_settings (web_view); - g_object_set (object, "WebKitWebView::settings", priv->settings, NULL); - g_signal_connect (priv->settings, "notify", + g_object_set (object, "WebKitWebView::settings", web_view->settings, NULL); + g_signal_connect (web_view->settings, "notify", G_CALLBACK (midori_web_view_settings_notify), web_view); break; default: @@ -699,24 +662,23 @@ midori_web_view_get_property (GObject* object, GParamSpec* pspec) { MidoriWebView* web_view = MIDORI_WEB_VIEW (object); - MidoriWebViewPrivate* priv = web_view->priv; switch (prop_id) { case PROP_ICON: - g_value_set_object (value, priv->icon); + g_value_set_object (value, web_view->icon); break; case PROP_URI: - g_value_set_string (value, priv->uri); + g_value_set_string (value, web_view->uri); break; case PROP_TITLE: - g_value_set_string (value, priv->title); + g_value_set_string (value, web_view->title); break; case PROP_STATUSBAR_TEXT: - g_value_set_string (value, priv->statusbar_text); + g_value_set_string (value, web_view->statusbar_text); break; case PROP_SETTINGS: - g_value_set_object (value, priv->settings); + g_value_set_object (value, web_view->settings); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -773,9 +735,7 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); - MidoriWebViewPrivate* priv = web_view->priv; - - if (!priv->proxy_menu_item) + if (!web_view->proxy_menu_item) { const gchar* title = midori_web_view_get_display_title (web_view); GtkWidget* menu_item = gtk_image_menu_item_new_with_label (title); @@ -783,9 +743,9 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), icon); - priv->proxy_menu_item = menu_item; + web_view->proxy_menu_item = menu_item; } - return priv->proxy_menu_item; + return web_view->proxy_menu_item; } /** @@ -807,19 +767,17 @@ midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - MidoriWebViewPrivate* priv = web_view->priv; - - if (!priv->tab_icon) + if (!web_view->tab_icon) { - priv->tab_icon = katze_throbber_new (); - if (priv->icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER (priv->tab_icon), - priv->icon); + web_view->tab_icon = katze_throbber_new (); + if (web_view->icon) + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + web_view->icon); else - katze_throbber_set_static_stock_id (KATZE_THROBBER (priv->tab_icon), + katze_throbber_set_static_stock_id (KATZE_THROBBER (web_view->tab_icon), GTK_STOCK_FILE); } - return priv->tab_icon; + return web_view->tab_icon; } static gboolean @@ -827,8 +785,6 @@ midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, GdkEventButton* event, MidoriWebView* web_view) { - MidoriWebViewPrivate* priv = web_view->priv; - if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) { /* Toggle the label visibility on double click */ @@ -840,7 +796,7 @@ midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, gint width, height; sokoke_widget_get_text_size(tab_label, "M", &width, &height); gtk_widget_set_size_request (child, !visible - ? width * priv->tab_label_size : 0, !visible ? -1 : 0); + ? width * web_view->tab_label_size : 0, !visible ? -1 : 0); g_list_free (children); return TRUE; } @@ -895,26 +851,24 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - MidoriWebViewPrivate* priv = web_view->priv; - - GtkWidget* proxy_tab_icon = priv->tab_icon; + GtkWidget* proxy_tab_icon = web_view->tab_icon; g_return_val_if_fail (!proxy_tab_icon, NULL); - if (!priv->proxy_tab_label) + if (!web_view->proxy_tab_label) { - priv->tab_icon = midori_web_view_get_proxy_tab_icon (web_view); + web_view->tab_icon = midori_web_view_get_proxy_tab_icon (web_view); GtkWidget* event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); GtkWidget* hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - gtk_box_pack_start (GTK_BOX (hbox), priv->tab_icon, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), web_view->tab_icon, FALSE, FALSE, 0); const gchar* title = midori_web_view_get_display_title (web_view); - priv->tab_label = gtk_label_new (title); - gtk_misc_set_alignment (GTK_MISC (priv->tab_label), 0.0, 0.5); + web_view->tab_label = gtk_label_new (title); + gtk_misc_set_alignment (GTK_MISC (web_view->tab_label), 0.0, 0.5); /* TODO: make the tab initially look "unvisited" until it's focused */ - gtk_box_pack_start (GTK_BOX (hbox), priv->tab_label, FALSE, TRUE, 0); - priv->proxy_tab_label = event_box; + gtk_box_pack_start (GTK_BOX (hbox), web_view->tab_label, FALSE, TRUE, 0); + web_view->proxy_tab_label = event_box; _midori_web_view_update_tab_label_size (web_view); GtkWidget* close_button = gtk_button_new (); @@ -928,24 +882,24 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) gtk_button_set_image (GTK_BUTTON(close_button), image); gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); gtk_widget_show_all (GTK_WIDGET (event_box)); - if (!priv->close_button) + if (!web_view->close_button) gtk_widget_hide (close_button); - priv->tab_close = close_button; + web_view->tab_close = close_button; - g_signal_connect (priv->proxy_tab_label, "button-release-event", + g_signal_connect (web_view->proxy_tab_label, "button-release-event", G_CALLBACK (midori_web_view_tab_label_button_release_event), web_view); - g_signal_connect (priv->tab_icon, "destroy", + g_signal_connect (web_view->tab_icon, "destroy", G_CALLBACK (gtk_widget_destroyed), - &priv->tab_icon); - g_signal_connect (priv->tab_close, "style-set", + &web_view->tab_icon); + g_signal_connect (web_view->tab_close, "style-set", G_CALLBACK (midori_web_view_tab_close_style_set), web_view); - g_signal_connect (priv->tab_close, "clicked", + g_signal_connect (web_view->tab_close, "clicked", G_CALLBACK (midori_web_view_tab_close_clicked), web_view); } - return priv->proxy_tab_label; + return web_view->proxy_tab_label; } /** @@ -968,17 +922,15 @@ midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - MidoriWebViewPrivate* priv = web_view->priv; - - if (!priv->proxy_xbel_item) + if (!web_view->proxy_xbel_item) { - priv->proxy_xbel_item = katze_xbel_bookmark_new (); + web_view->proxy_xbel_item = katze_xbel_bookmark_new (); const gchar* uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (priv->proxy_xbel_item, uri); + katze_xbel_bookmark_set_href (web_view->proxy_xbel_item, uri); const gchar* title = midori_web_view_get_display_title (web_view); - katze_xbel_item_set_title (priv->proxy_xbel_item, title); + katze_xbel_item_set_title (web_view->proxy_xbel_item, title); } - return priv->proxy_xbel_item; + return web_view->proxy_xbel_item; } /** @@ -994,8 +946,7 @@ midori_web_view_is_loading (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), -1); - MidoriWebViewPrivate* priv = web_view->priv; - return priv->is_loading; + return web_view->is_loading; } /** @@ -1014,8 +965,7 @@ midori_web_view_get_progress (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), -1); - MidoriWebViewPrivate* priv = web_view->priv; - return priv->progress; + return web_view->progress; } /** @@ -1034,8 +984,7 @@ midori_web_view_get_display_uri (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), ""); - MidoriWebViewPrivate* priv = web_view->priv; - return priv->uri ? priv->uri : ""; + return web_view->uri ? web_view->uri : ""; } /** @@ -1054,12 +1003,10 @@ midori_web_view_get_display_title (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), "about:blank"); - MidoriWebViewPrivate* priv = web_view->priv; - - if (priv->title) - return priv->title; - if (priv->uri) - return priv->uri; + if (web_view->title) + return web_view->title; + if (web_view->uri) + return web_view->uri; return "about:blank"; } @@ -1077,6 +1024,5 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - MidoriWebViewPrivate* priv = web_view->priv; - return priv->link_uri; + return web_view->link_uri; } diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 0905ce68..431e1bef 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -33,16 +33,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_VIEW, MidoriWebViewClass)) typedef struct _MidoriWebView MidoriWebView; -typedef struct _MidoriWebViewPrivate MidoriWebViewPrivate; typedef struct _MidoriWebViewClass MidoriWebViewClass; -struct _MidoriWebView -{ - WebKitWebView parent_instance; - - MidoriWebViewPrivate* priv; -}; - struct _MidoriWebViewClass { WebKitWebViewClass parent_class; From 3537ef3e8da504815a08412a51035e307a6b75fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Jun 2008 21:00:32 +0200 Subject: [PATCH 0162/2970] Listen properly to switching the search engine --- midori/midori-browser.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 660412c2..e0b62ca3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2653,8 +2653,8 @@ midori_browser_realize_cb (GtkStyle* style, MidoriBrowser* browser) } static void -midori_browser_search_activate (GtkWidget* widget, - MidoriBrowser* browser) +midori_browser_search_activate_cb (GtkWidget* widget, + MidoriBrowser* browser) { MidoriWebList* search_engines; const gchar* keywords; @@ -2690,6 +2690,26 @@ midori_browser_search_activate (GtkWidget* widget, g_free (location_entry_search); } +static void +midori_browser_search_notify_current_item_cb (GObject *gobject, + GParamSpec *arg1, + MidoriBrowser* browser) +{ + MidoriSearchEntry* search_entry; + MidoriWebItem* web_item; + guint index; + + search_entry = MIDORI_SEARCH_ENTRY (browser->search); + web_item = midori_search_entry_get_current_item (search_entry); + if (web_item) + index = midori_web_list_get_item_index (browser->search_engines, + web_item); + else + index = 0; + + g_object_set (browser->settings, "last-web-search", index, NULL); +} + static void midori_browser_init (MidoriBrowser* browser) { @@ -2827,10 +2847,14 @@ midori_browser_init (MidoriBrowser* browser) The interface is somewhat awkward and ought to be rethought Display "show in context menu" search engines as "completion actions" */ sokoke_entry_setup_completion (GTK_ENTRY (browser->search)); - g_signal_connect (browser->search, "activate", - G_CALLBACK (midori_browser_search_activate), browser); - g_signal_connect (browser->search, "focus-out-event", - G_CALLBACK (midori_browser_search_focus_out_event_cb), browser); + g_object_connect (browser->search, + "signal::activate", + midori_browser_search_activate_cb, browser, + "signal::focus-out-event", + midori_browser_search_focus_out_event_cb, browser, + "signal::notify::current-item", + midori_browser_search_notify_current_item_cb, browser, + NULL); toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), browser->search); gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), toolitem, -1); From 3535ed6e48af5298aa2e26cc731db8cedb3732ec Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Jun 2008 00:06:12 +0200 Subject: [PATCH 0163/2970] Fix search from location bar --- midori/midori-browser.c | 4 +++- midori/sokoke.c | 11 +++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e0b62ca3..2f1b702b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1608,7 +1608,9 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, g_object_get (browser->settings, "location-entry-search", &location_entry_search, NULL); gchar* new_uri = sokoke_magic_uri (uri, browser->search_engines); - if (!new_uri) + if (!new_uri && strstr (location_entry_search, "%s")) + new_uri = g_strdup_printf (location_entry_search, uri); + else if (!new_uri) new_uri = g_strdup (location_entry_search); g_free (location_entry_search); /* TODO: Use new_uri intermediately when completion is better diff --git a/midori/sokoke.c b/midori/sokoke.c index 277ee718..49896e2a 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -28,12 +28,6 @@ gchar* sokoke_magic_uri (const gchar* uri, MidoriWebList* search_engines) { - g_return_val_if_fail (uri, NULL); - if (search_engines) - { - g_return_val_if_fail (MIDORI_IS_WEB_LIST (search_engines), NULL); - } - gchar* current_dir; gchar* result; gchar* search; @@ -41,6 +35,10 @@ sokoke_magic_uri (const gchar* uri, gchar** parts; MidoriWebItem* web_item; + g_return_val_if_fail (uri, NULL); + if (search_engines) + g_return_val_if_fail (MIDORI_IS_WEB_LIST (search_engines), NULL); + /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) return g_strconcat ("file://", uri, NULL); @@ -73,6 +71,7 @@ sokoke_magic_uri (const gchar* uri, if (web_item) search_uri = midori_web_item_get_uri (web_item); } + g_free (parts); if (search_uri) search = g_strdup_printf (search_uri, parts[1]); return search; From 9ab74673a8dc4ab1a8429041937983ce76c86b5c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Jun 2008 00:11:54 +0200 Subject: [PATCH 0164/2970] Web Search should be Ctrl+K instead of Ctrl+Shift+F --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2f1b702b..9d96b4bf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2373,7 +2373,7 @@ static const GtkActionEntry entries[] = { N_("Location..."), "l", N_("Open a particular location"), G_CALLBACK (_action_location_activate) }, { "Search", GTK_STOCK_FIND, - N_("Web Search..."), "f", + N_("Web Search..."), "k", N_("Run a web search"), G_CALLBACK (_action_search_activate) }, { "OpenInPageholder", GTK_STOCK_JUMP_TO, N_("Open in Page_holder..."), "", From b8c222d793afb97a6d7afc749bd938fcd46f40c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 20 Jun 2008 00:28:33 +0200 Subject: [PATCH 0165/2970] Fix CCFLAGS in wscript --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index eaaa9fdf..17fa3af1 100644 --- a/wscript +++ b/wscript @@ -54,7 +54,7 @@ def configure (conf): conf.define ('GETTEXT_PACKAGE', APPNAME) conf.write_config_header ('config.h') - conf.env['CCFLAGS'] += ['-DHAVE_CONFIG_H'] + conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') def set_options (opt): opt.tool_options ('compiler_cc') From e74dc621c821a594b34c408b4f03e29585493873 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Jun 2008 23:57:20 +0200 Subject: [PATCH 0166/2970] Improve SearchEntry and add Manage Search Engines to popup --- midori/midori-browser.c | 13 +-- midori/midori-searchentry.c | 192 +++++++++++++++++++++++------------- 2 files changed, 128 insertions(+), 77 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9d96b4bf..edc4c63f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1989,19 +1989,14 @@ static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) { - static GtkWidget* dialog = NULL; + GtkWidget* dialog; - /* Show the Manage search engines dialog. Create it if necessary. */ - if (dialog) + dialog = midori_search_entry_get_dialog ( + MIDORI_SEARCH_ENTRY (browser->search)); + if (GTK_WIDGET_VISIBLE (dialog)) gtk_window_present (GTK_WINDOW (dialog)); else - { - dialog = midori_search_entry_get_dialog ( - MIDORI_SEARCH_ENTRY (browser->search)); - g_signal_connect (dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_widget_show (dialog); - } } static void diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index 5d23bf38..a8b37cfe 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -21,11 +21,6 @@ struct _MidoriSearchEntry { SexyIconEntry parent_instance; - GtkWidget* dialog; - GtkWidget* treeview; - GtkWidget* edit_button; - GtkWidget* remove_button; - MidoriWebList* search_engines; MidoriWebItem* current_item; }; @@ -102,6 +97,19 @@ midori_search_entry_engine_activate_cb (GtkWidget* widget, midori_search_entry_set_current_item (search_entry, web_item); } +static void +midori_search_entry_manage_activate_cb (GtkWidget* menuitem, + MidoriSearchEntry* search_entry) +{ + GtkWidget* dialog; + + dialog = midori_search_entry_get_dialog (search_entry); + if (GTK_WIDGET_VISIBLE (dialog)) + gtk_window_present (GTK_WINDOW (dialog)); + else + gtk_widget_show (dialog); +} + static void midori_search_entry_icon_released_cb (GtkWidget* widget, SexyIconEntryPosition* pos, @@ -147,14 +155,16 @@ midori_search_entry_icon_released_cb (GtkWidget* widget, gtk_widget_show (menuitem); } - /*menuitem = gtk_separator_menu_item_new(); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem); - GtkAction* action = gtk_action_group_get_action( - browser->actiongroup, "ManageSearchEngines"); - menuitem = gtk_action_create_menu_item(action); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show(menuitem);*/ + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Manage Search Engines")); + icon = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_search_entry_manage_activate_cb), widget); + gtk_widget_show (menuitem); sokoke_widget_popup (widget, GTK_MENU (menu), NULL, SOKOKE_MENU_POSITION_LEFT); } @@ -243,8 +253,6 @@ midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, static void midori_search_entry_init (MidoriSearchEntry* search_entry) { - search_entry->dialog = NULL; - search_entry->search_engines = midori_web_list_new (); search_entry->current_item = NULL; @@ -493,11 +501,10 @@ STR_NON_NULL (const gchar* string) } static void -midori_search_entry_get_editor (MidoriSearchEntry* search_entry, - gboolean new_engine, - GtkWindow* transient_for) +midori_search_entry_get_editor (GtkWidget* treeview, + gboolean new_engine) { - MidoriWebList* search_engines; + MidoriSearchEntry* search_entry; GtkWidget* dialog; GtkSizeGroup* sizegroup; MidoriWebItem* web_item; @@ -505,7 +512,6 @@ midori_search_entry_get_editor (MidoriSearchEntry* search_entry, GtkWidget* label; GtkTreeModel* liststore; GtkTreeIter iter; - GtkWidget* treeview; GtkTreeSelection* selection; GtkWidget* entry_name; GtkWidget* entry_description; @@ -513,12 +519,10 @@ midori_search_entry_get_editor (MidoriSearchEntry* search_entry, GtkWidget* entry_icon; GtkWidget* entry_token; - search_engines = search_entry->search_engines; - treeview = search_entry->treeview; - + GtkWidget* toplevel = gtk_widget_get_toplevel (treeview); dialog = gtk_dialog_new_with_buttons ( new_engine ? _("Add search engine") : _("Edit search engine"), - transient_for ? GTK_WINDOW (transient_for) : NULL, + toplevel ? GTK_WINDOW (toplevel) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, new_engine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, @@ -625,68 +629,112 @@ midori_search_entry_get_editor (MidoriSearchEntry* search_entry, "token", gtk_entry_get_text (GTK_ENTRY (entry_token)), NULL); + search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); if (new_engine) - { - midori_web_list_add_item (search_engines, web_item); - liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - gtk_list_store_append (GTK_LIST_STORE (liststore), &iter); - } - gtk_list_store_set (GTK_LIST_STORE (liststore), &iter, - 0, web_item, -1); + midori_web_list_add_item (search_entry->search_engines, web_item); } gtk_widget_destroy (dialog); } static void -midori_search_entry_dialog_add_cb (GtkWidget* widget, - MidoriSearchEntry* search_entry) +midori_search_entry_dialog_add_cb (GtkWidget* widget, + GtkWidget* treeview) { - midori_search_entry_get_editor (search_entry, TRUE, - GTK_WINDOW (search_entry->dialog)); + MidoriSearchEntry* search_entry; + + search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); + midori_search_entry_get_editor (treeview, TRUE); } static void -midori_search_entry_dialog_edit_cb (GtkWidget* widget, - MidoriSearchEntry* search_entry) +midori_search_entry_dialog_edit_cb (GtkWidget* widget, + GtkWidget* treeview) { - midori_search_entry_get_editor (search_entry, FALSE, - GTK_WINDOW (search_entry->dialog)); + MidoriSearchEntry* search_entry; + GtkTreeSelection* selection; + + search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (gtk_tree_selection_get_selected (selection, NULL, NULL)) + midori_search_entry_get_editor (treeview, FALSE); } static void -midori_search_entry_dialog_remove_cb (GtkWidget* widget, - MidoriSearchEntry* search_entry) +midori_search_entry_dialog_remove_cb (GtkWidget* widget, + GtkWidget* treeview) { - GtkWidget* treeview; + MidoriSearchEntry* search_entry; GtkTreeSelection* selection; GtkTreeModel* liststore; GtkTreeIter iter; MidoriWebItem* web_item; MidoriWebList* search_engines; - treeview = search_entry->treeview; + search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); search_engines = search_entry->search_engines; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - gtk_tree_selection_get_selected (selection, &liststore, &iter); - gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); - gtk_list_store_remove (GTK_LIST_STORE (liststore), &iter); - g_object_unref (web_item); - midori_web_list_remove_item (search_engines, web_item); - /* FIXME: we want to allow undo of some kind */ + if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) + { + gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); + midori_web_list_remove_item (search_engines, web_item); + g_object_unref (web_item); + /* FIXME: we want to allow undo of some kind */ + } } static void -midori_search_entry_treeview_selection_cb (GtkWidget* treeview, - MidoriSearchEntry* search_entry) +midori_search_entry_treeview_selection_cb (GtkTreeSelection* selection, + GtkWidget* treeview) { - GtkTreeSelection* selection; gboolean selected; + GtkWidget* edit_button; + GtkWidget* remove_button; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (search_entry->treeview)); selected = gtk_tree_selection_get_selected (selection, NULL, NULL); - gtk_widget_set_sensitive (search_entry->edit_button, selected); - gtk_widget_set_sensitive (search_entry->remove_button, selected); + edit_button = g_object_get_data (G_OBJECT (treeview), "edit-button"); + remove_button = g_object_get_data (G_OBJECT (treeview), "remove-button"); + + gtk_widget_set_sensitive (edit_button, selected); + gtk_widget_set_sensitive (remove_button, selected); +} + +static void +midori_search_entry_dialog_engines_add_item_cb (MidoriWebList* web_list, + MidoriWebItem* item, + GtkWidget* treeview) +{ + GtkTreeModel* liststore; + GtkTreeIter iter; + + liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + gtk_list_store_append (GTK_LIST_STORE (liststore), &iter); + gtk_list_store_set (GTK_LIST_STORE (liststore), &iter, 0, item, -1); +} + +static void +midori_search_entry_dialog_engines_remove_item_cb (MidoriWebList* web_list, + MidoriWebItem* item, + GtkWidget* treeview) +{ + GtkTreeModel* liststore; + GtkTreeIter iter; + gboolean valid; + MidoriWebItem* web_item; + + liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + valid = gtk_tree_model_get_iter_first (liststore, &iter); + while (valid) + { + gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); + if (web_item == item) + { + gtk_list_store_remove (GTK_LIST_STORE (liststore), &iter); + valid = FALSE; + } + else + valid = gtk_tree_model_iter_next (liststore, &iter); + } } /** @@ -704,9 +752,9 @@ midori_search_entry_treeview_selection_cb (GtkWidget* treeview, GtkWidget* midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) { + static GtkWidget* dialog = NULL; const gchar* dialog_title; GtkWidget* toplevel; - GtkWidget* dialog; gint width, height; GtkWidget* xfce_heading; GtkWidget* hbox; @@ -723,6 +771,10 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); + /* If there is a dialog, use that. We want only one. */ + if (dialog) + return dialog; + dialog_title = _("Manage search engines"); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (search_entry)); dialog = gtk_dialog_new_with_buttons (dialog_title, @@ -731,7 +783,8 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - search_entry->dialog = dialog; + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); /* TODO: Implement some kind of help function */ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), @@ -751,12 +804,10 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) TRUE, TRUE, 12); liststore = gtk_list_store_new (1, MIDORI_TYPE_WEB_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); - /*g_signal_connect (treeview, "cursor-changed", - G_CALLBACK (midori_search_entry_treeview_selection_cb), search_entry);*/ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), "changed", G_CALLBACK (midori_search_entry_treeview_selection_cb), - search_entry); - search_entry->treeview = treeview; + treeview); + g_object_set_data (G_OBJECT (treeview), "search-entry", search_entry); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); @@ -789,22 +840,22 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); button = gtk_button_new_from_stock (GTK_STOCK_ADD); g_signal_connect (button, "clicked", - G_CALLBACK (midori_search_entry_dialog_add_cb), search_entry); + G_CALLBACK (midori_search_entry_dialog_add_cb), treeview); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); button = gtk_button_new_from_stock (GTK_STOCK_EDIT); g_signal_connect (button, "clicked", - G_CALLBACK (midori_search_entry_dialog_edit_cb), search_entry); - gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0); - search_entry->edit_button = button; + G_CALLBACK (midori_search_entry_dialog_edit_cb), treeview); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + g_object_set_data (G_OBJECT (treeview), "edit-button", button); if (!n) gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); g_signal_connect (button, "clicked", - G_CALLBACK (midori_search_entry_dialog_remove_cb), search_entry); + G_CALLBACK (midori_search_entry_dialog_remove_cb), treeview); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); if (!n) gtk_widget_set_sensitive (button, FALSE); - search_entry->remove_button = button; + g_object_set_data (G_OBJECT (treeview), "remove-button", button); button = gtk_label_new (""); /* This is an invisible separator */ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); @@ -815,7 +866,12 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - /* TODO: Connect to MidoriWebList::add_item and ::remove_item */ + g_object_connect (search_entry->search_engines, + "signal-after::add-item", + midori_search_entry_dialog_engines_add_item_cb, treeview, + "signal-after::remove-item", + midori_search_entry_dialog_engines_remove_item_cb, treeview, + NULL); return dialog; } From bec502534ca70d46765b2c7ca765e0ab4b524919 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Jun 2008 23:59:41 +0200 Subject: [PATCH 0167/2970] Fix compat.c s/sokoke/gtk/_widget_set_tooltip_text --- midori/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/compat.c b/midori/compat.c index 7dff901f..4f8a7401 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -14,7 +14,7 @@ #if !GTK_CHECK_VERSION(2, 12, 0) void -sokoke_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) +gtk_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) { static GtkTooltips* tooltips; if (!tooltips) From 282368ff8122a2957510a196976280ad8a47db1f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Jun 2008 12:44:31 +0200 Subject: [PATCH 0168/2970] Fix a warning on startup when no search engine is available --- midori/midori-browser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index edc4c63f..29e9ea78 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3349,7 +3349,8 @@ midori_browser_set_property (GObject* object, &last_web_search, NULL); web_item = midori_web_list_get_nth_item (browser->search_engines, last_web_search); - g_object_set (browser->search, "current-item", web_item, NULL); + if (web_item) + g_object_set (browser->search, "current-item", web_item, NULL); } break; default: From 8600c2591d77b5d461083b81a22853b88d50ac4f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Jun 2008 21:47:41 +0200 Subject: [PATCH 0169/2970] Turn KatzeXbelItem into a gobject --- katze/katze-xbel.c | 309 +++++++++++++++++++++------------------------ katze/katze-xbel.h | 16 +-- 2 files changed, 153 insertions(+), 172 deletions(-) diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c index 5c7c7667..be70a185 100644 --- a/katze/katze-xbel.c +++ b/katze/katze-xbel.c @@ -28,48 +28,90 @@ #include "katze-utils.h" -struct _KatzeXbelItemPrivate +struct _KatzeXbelItem { + GObject parent_instance; + guint refs; KatzeXbelItemKind kind; KatzeXbelItem* parent; - GList* items; // folder - gboolean folded; // foolder - gchar* title; // !separator - gchar* desc; // folder and bookmark - gchar* href; // bookmark - //time_t added; // !separator - //time_t modfied; // bookmark - //time_t visited; // bookmark -} ; + GList* items; + gboolean folded; + gchar* title; + gchar* desc; + gchar* href; +}; -#define KATZE_XBEL_ITEM_GET_PRIVATE(item) \ - item->priv +G_DEFINE_TYPE (KatzeXbelItem, katze_xbel_item, G_TYPE_OBJECT) -// Private: Create a new item of a certain type +static void +katze_xbel_item_finalize (GObject* object); + +static void +katze_xbel_item_class_init (KatzeXbelItemClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_xbel_item_finalize; +} + +static void +katze_xbel_item_init (KatzeXbelItem* item) +{ + item->parent = NULL; +} + +static void +katze_xbel_item_finalize (GObject* object) +{ + KatzeXbelItem* item = KATZE_XBEL_ITEM (object); + + if (item->parent) + katze_xbel_folder_remove_item (item->parent, item); + + if (item->kind == KATZE_XBEL_ITEM_KIND_FOLDER) + { + guint n = katze_xbel_folder_get_n_items (item); + guint i; + for (i = 0; i < n; i++) + { + KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); + _item->parent = NULL; + katze_xbel_item_unref (_item); + } + g_list_free (item->items); + } + if (item->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) + { + g_free (item->title); + g_free (item->desc); + } + if (item->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) + g_free (item->href); + + G_OBJECT_CLASS (katze_xbel_item_parent_class)->finalize (object); +} + +/* Create a new item of a certain type */ static KatzeXbelItem* katze_xbel_item_new (KatzeXbelItemKind kind) { - KatzeXbelItem* item = g_new (KatzeXbelItem, 1); - KATZE_XBEL_ITEM_GET_PRIVATE (item) = g_new (KatzeXbelItemPrivate, 1); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + KatzeXbelItem* item = g_object_new (KATZE_TYPE_XBEL_ITEM, NULL); + + item->kind = kind; - priv->refs = 1; - priv->parent = NULL; - priv->kind = kind; if (kind == KATZE_XBEL_ITEM_KIND_FOLDER) { - priv->items = NULL; - priv->folded = TRUE; + item->items = NULL; + item->folded = TRUE; } if (kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) { - priv->title = NULL; - priv->desc = NULL; + item->title = NULL; + item->desc = NULL; } if (kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) - priv->href = g_strdup (""); + item->href = g_strdup (""); return item; } @@ -142,22 +184,21 @@ katze_xbel_folder_new (void) return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_FOLDER); } -// Private: Create a folder from an xmlNodePtr +/* Create a folder from an xmlNodePtr */ static KatzeXbelItem* katze_xbel_folder_from_xmlNodePtr (xmlNodePtr cur) { g_return_val_if_fail (cur, NULL); KatzeXbelItem* folder = katze_xbel_folder_new (); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); xmlChar* key = xmlGetProp (cur, (xmlChar*)"folded"); if (key) { if (!g_ascii_strncasecmp ((gchar*)key, "yes", 3)) - priv->folded = TRUE; + folder->folded = TRUE; else if (!g_ascii_strncasecmp ((gchar*)key, "no", 2)) - priv->folded = FALSE; + folder->folded = FALSE; else g_warning ("XBEL: Unknown value for folded."); xmlFree (key); @@ -168,39 +209,39 @@ katze_xbel_folder_from_xmlNodePtr (xmlNodePtr cur) if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) { xmlChar* key = xmlNodeGetContent (cur); - katze_assign (priv->title, g_strstrip ((gchar*)key)); + katze_assign (folder->title, g_strstrip ((gchar*)key)); } else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) { xmlChar* key = xmlNodeGetContent (cur); - katze_assign (priv->desc, g_strstrip ((gchar*)key)); + katze_assign (folder->desc, g_strstrip ((gchar*)key)); } else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) { KatzeXbelItem* item = katze_xbel_folder_from_xmlNodePtr (cur); - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; - priv->items = g_list_prepend (priv->items, item); + item->parent = folder; + folder->items = g_list_prepend (folder->items, item); } else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) { KatzeXbelItem* item = katze_xbel_bookmark_from_xmlNodePtr (cur); - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; - priv->items = g_list_prepend (priv->items, item); + item->parent = folder; + folder->items = g_list_prepend (folder->items, item); } else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) { KatzeXbelItem* item = katze_xbel_separator_new (); - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; - priv->items = g_list_prepend (priv->items, item); + item->parent = folder; + folder->items = g_list_prepend (folder->items, item); } cur = cur->next; } - // Prepending and reversing is faster than appending - priv->items = g_list_reverse (priv->items); + /* Prepending and reversing is faster than appending */ + folder->items = g_list_reverse (folder->items); return folder; } -// Private: Loads the contents from an xmlNodePtr into a folder. +/* Loads the contents from an xmlNodePtr into a folder. */ static gboolean katze_xbel_folder_from_xmlDocPtr (KatzeXbelItem* folder, xmlDocPtr doc) @@ -208,24 +249,22 @@ katze_xbel_folder_from_xmlDocPtr (KatzeXbelItem* folder, g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); g_return_val_if_fail (doc, FALSE); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - xmlNodePtr cur = xmlDocGetRootElement (doc); xmlChar* version = xmlGetProp (cur, (xmlChar*)"version"); if (xmlStrcmp (version, (xmlChar*)"1.0")) g_warning ("XBEL version is not 1.0."); xmlFree (version); - katze_assign (priv->title, (gchar*)xmlGetProp (cur, (xmlChar*)"title")); - katze_assign (priv->desc, (gchar*)xmlGetProp (cur, (xmlChar*)"desc")); + katze_assign (folder->title, (gchar*)xmlGetProp (cur, (xmlChar*)"title")); + katze_assign (folder->desc, (gchar*)xmlGetProp (cur, (xmlChar*)"desc")); if ((cur = xmlDocGetRootElement (doc)) == NULL) { - // Empty document + /* Empty document */ return FALSE; } if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) { - // Wrong document kind + /* Wrong document kind */ return FALSE; } cur = cur->xmlChildrenNode; @@ -242,13 +281,13 @@ katze_xbel_folder_from_xmlDocPtr (KatzeXbelItem* folder, item = katze_xbel_parse_info (xbel, cur);*/ if (item) { - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; - priv->items = g_list_prepend (priv->items, item); + item->parent = folder; + folder->items = g_list_prepend (folder->items, item); } cur = cur->next; } - // Prepending and reversing is faster than appending - priv->items = g_list_reverse (priv->items); + /* Prepending and reversing is faster than appending */ + folder->items = g_list_reverse (folder->items); return TRUE; } @@ -265,10 +304,9 @@ katze_xbel_folder_from_xmlDocPtr (KatzeXbelItem* folder, void katze_xbel_item_ref (KatzeXbelItem* item) { - g_return_if_fail (item); + g_return_if_fail (KATZE_IS_XBEL_ITEM (item)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - priv->refs++; + g_object_ref (item); } /** @@ -285,36 +323,9 @@ katze_xbel_item_ref (KatzeXbelItem* item) void katze_xbel_item_unref (KatzeXbelItem* item) { - g_return_if_fail (item); + g_return_if_fail (KATZE_IS_XBEL_ITEM (item)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - priv->refs--; - if (priv->refs) - return; - - if (priv->parent) - katze_xbel_folder_remove_item (priv->parent, item); - - if (priv->kind == KATZE_XBEL_ITEM_KIND_FOLDER) - { - guint n = katze_xbel_folder_get_n_items (item); - guint i; - for (i = 0; i < n; i++) - { - KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); - KATZE_XBEL_ITEM_GET_PRIVATE (_item)->parent = NULL; - katze_xbel_item_unref (_item); - } - g_list_free (priv->items); - } - if (priv->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) - { - g_free (priv->title); - g_free (priv->desc); - } - if (priv->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) - g_free (priv->href); - g_free (item); + g_object_unref (item); } /** @@ -330,10 +341,9 @@ katze_xbel_item_unref (KatzeXbelItem* item) KatzeXbelItem* katze_xbel_item_copy (KatzeXbelItem* item) { - g_return_val_if_fail (item, NULL); + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - KatzeXbelItem* copy = katze_xbel_item_new (priv->kind); + KatzeXbelItem* copy = katze_xbel_item_new (item->kind); if (katze_xbel_item_is_folder (item)) { @@ -345,25 +355,16 @@ katze_xbel_item_copy (KatzeXbelItem* item) katze_xbel_folder_append_item (copy, katze_xbel_item_copy (_item)); } } - if (priv->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) + if (item->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) { - katze_xbel_item_set_title (copy, priv->title); - katze_xbel_item_set_desc (copy, priv->desc); + katze_xbel_item_set_title (copy, item->title); + katze_xbel_item_set_desc (copy, item->desc); } - if (priv->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) - katze_xbel_bookmark_set_href (copy, priv->href); + if (item->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) + katze_xbel_bookmark_set_href (copy, item->href); return copy; } -GType -katze_xbel_item_get_type (void) -{ - static GType type = 0; - if (!type) - type = g_pointer_type_register_static ("katze_xbel_item"); - return type; -} - /** * katze_xbel_folder_append_item: * @folder: a folder @@ -381,10 +382,9 @@ katze_xbel_folder_append_item (KatzeXbelItem* folder, g_return_if_fail (!katze_xbel_item_get_parent (item)); g_return_if_fail (katze_xbel_item_is_folder (folder)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - priv->items = g_list_append (priv->items, item); + folder->items = g_list_append (folder->items, item); - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; + item->parent = folder; } /** @@ -404,10 +404,9 @@ katze_xbel_folder_prepend_item (KatzeXbelItem* folder, g_return_if_fail (!katze_xbel_item_get_parent (item)); g_return_if_fail (katze_xbel_item_is_folder (folder)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - priv->items = g_list_prepend (priv->items, item); + folder->items = g_list_prepend (folder->items, item); - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = folder; + item->parent = folder; } /** @@ -421,14 +420,13 @@ void katze_xbel_folder_remove_item (KatzeXbelItem* folder, KatzeXbelItem* item) { - g_return_if_fail (item); + g_return_if_fail (KATZE_IS_XBEL_ITEM (item)); g_return_if_fail (katze_xbel_item_get_parent(folder) != item); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - // Fortunately we know that items are unique - priv->items = g_list_remove (priv->items, item); + /* Fortunately we know that items are unique */ + folder->items = g_list_remove (folder->items, item); - KATZE_XBEL_ITEM_GET_PRIVATE (item)->parent = NULL; + item->parent = NULL; } /** @@ -444,8 +442,7 @@ katze_xbel_folder_get_n_items (KatzeXbelItem* folder) { g_return_val_if_fail (katze_xbel_item_is_folder (folder), 0); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - return g_list_length (priv->items); + return g_list_length (folder->items); } /** @@ -463,8 +460,7 @@ katze_xbel_folder_get_nth_item (KatzeXbelItem* folder, { g_return_val_if_fail (katze_xbel_item_is_folder(folder), NULL); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - return (KatzeXbelItem*) g_list_nth_data (priv->items, n); + return (KatzeXbelItem*) g_list_nth_data (folder->items, n); } /** @@ -498,8 +494,7 @@ katze_xbel_folder_get_folded (KatzeXbelItem* folder) { g_return_val_if_fail (katze_xbel_item_is_folder (folder), TRUE); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - return priv->folded; + return folder->folded; } /** @@ -513,8 +508,9 @@ katze_xbel_folder_get_folded (KatzeXbelItem* folder) KatzeXbelItemKind katze_xbel_item_get_kind (KatzeXbelItem* item) { - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->kind; + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), KATZE_XBEL_ITEM_KIND_BOOKMARK); + + return item->kind; } /** @@ -528,10 +524,9 @@ katze_xbel_item_get_kind (KatzeXbelItem* item) KatzeXbelItem* katze_xbel_item_get_parent (KatzeXbelItem* item) { - g_return_val_if_fail (item, NULL); + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->parent; + return item->parent; } /** @@ -547,8 +542,7 @@ katze_xbel_item_get_title (KatzeXbelItem* item) { g_return_val_if_fail (!katze_xbel_item_is_separator (item), NULL); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->title; + return item->title; } /** @@ -564,8 +558,7 @@ katze_xbel_item_get_desc (KatzeXbelItem* item) { g_return_val_if_fail (!katze_xbel_item_is_separator (item), NULL); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->desc; + return item->desc; } /** @@ -581,8 +574,7 @@ katze_xbel_bookmark_get_href (KatzeXbelItem* bookmark) { g_return_val_if_fail (katze_xbel_item_is_bookmark (bookmark), NULL); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (bookmark); - return priv->href; + return bookmark->href; } /** @@ -596,10 +588,9 @@ katze_xbel_bookmark_get_href (KatzeXbelItem* bookmark) gboolean katze_xbel_item_is_bookmark (KatzeXbelItem* item) { - g_return_val_if_fail (item, FALSE); + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), FALSE); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK; + return item->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK; } /** @@ -612,10 +603,9 @@ katze_xbel_item_is_bookmark (KatzeXbelItem* item) **/ gboolean katze_xbel_item_is_separator (KatzeXbelItem* item) { - g_return_val_if_fail (item, FALSE); + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), FALSE); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->kind == KATZE_XBEL_ITEM_KIND_SEPARATOR; + return item->kind == KATZE_XBEL_ITEM_KIND_SEPARATOR; } /** @@ -629,10 +619,9 @@ gboolean katze_xbel_item_is_separator (KatzeXbelItem* item) gboolean katze_xbel_item_is_folder (KatzeXbelItem* item) { - g_return_val_if_fail (item, FALSE); + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), FALSE); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - return priv->kind == KATZE_XBEL_ITEM_KIND_FOLDER; + return item->kind == KATZE_XBEL_ITEM_KIND_FOLDER; } /** @@ -648,8 +637,7 @@ katze_xbel_folder_set_folded (KatzeXbelItem* folder, { g_return_if_fail (katze_xbel_item_is_folder (folder)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - priv->folded = folded; + folder->folded = folded; } /** @@ -665,8 +653,7 @@ katze_xbel_item_set_title (KatzeXbelItem* item, { g_return_if_fail (!katze_xbel_item_is_separator (item)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - katze_assign (priv->title, g_strdup (title)); + katze_assign (item->title, g_strdup (title)); } /** @@ -682,8 +669,7 @@ katze_xbel_item_set_desc (KatzeXbelItem* item, { g_return_if_fail (!katze_xbel_item_is_separator (item)); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); - katze_assign (priv->desc, g_strdup (desc)); + katze_assign (item->desc, g_strdup (desc)); } /** @@ -704,8 +690,7 @@ katze_xbel_bookmark_set_href (KatzeXbelItem* bookmark, g_return_if_fail (katze_xbel_item_is_bookmark (bookmark)); g_return_if_fail (href); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (bookmark); - katze_assign (priv->href, g_strdup (href)); + katze_assign (bookmark->href, g_strdup (href)); } gboolean @@ -718,14 +703,14 @@ katze_xbel_folder_from_data (KatzeXbelItem* folder, xmlDocPtr doc; if((doc = xmlParseMemory (data, strlen (data))) == NULL) { - // No valid xml or broken encoding + /* No valid xml or broken encoding */ *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, _("Malformed document.")); return FALSE; } if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) { - // Parsing failed + /* Parsing failed */ xmlFreeDoc(doc); *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, _("Malformed document.")); @@ -754,7 +739,7 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, g_return_val_if_fail (file, FALSE); if (!g_file_test (file, G_FILE_TEST_EXISTS)) { - // File doesn't exist + /* File doesn't exist */ *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_NOENT, _("File not found.")); return FALSE; @@ -762,14 +747,14 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, xmlDocPtr doc; if ((doc = xmlParseFile (file)) == NULL) { - // No valid xml or broken encoding + /* No valid xml or broken encoding */ *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, _("Malformed document.")); return FALSE; } if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) { - // Parsing failed + /* Parsing failed */ xmlFreeDoc (doc); *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, _("Malformed document.")); @@ -798,7 +783,7 @@ katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, { g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); g_return_val_if_fail (file, FALSE); - // FIXME: Essentially unimplemented + /* FIXME: Essentially unimplemented */ *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, _("Malformed document.")); @@ -821,12 +806,10 @@ katze_xbel_xml_element (const gchar* name, static gchar* katze_xbel_item_to_data (KatzeXbelItem* item) { - g_return_val_if_fail (item, NULL); - - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (item); + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); gchar* markup = NULL; - switch (priv->kind) + switch (item->kind) { case KATZE_XBEL_ITEM_KIND_FOLDER: { @@ -840,9 +823,9 @@ katze_xbel_item_to_data (KatzeXbelItem* item) g_string_append (_markup, item_markup); g_free (item_markup); } - gchar* folded = priv->folded ? NULL : g_strdup_printf (" folded=\"no\""); - gchar* title = katze_xbel_xml_element ("title", priv->title); - gchar* desc = katze_xbel_xml_element ("desc", priv->desc); + gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); + gchar* title = katze_xbel_xml_element ("title", item->title); + gchar* desc = katze_xbel_xml_element ("desc", item->desc); markup = g_strdup_printf ("\n%s%s%s\n", folded ? folded : "", title, desc, @@ -854,11 +837,11 @@ katze_xbel_item_to_data (KatzeXbelItem* item) } case KATZE_XBEL_ITEM_KIND_BOOKMARK: { - gchar* href_escaped = g_markup_escape_text (priv->href, -1); + gchar* href_escaped = g_markup_escape_text (item->href, -1); gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); g_free (href_escaped); - gchar* title = katze_xbel_xml_element ("title", priv->title); - gchar* desc = katze_xbel_xml_element ("desc", priv->desc); + gchar* title = katze_xbel_xml_element ("title", item->title); + gchar* desc = katze_xbel_xml_element ("desc", item->desc); markup = g_strdup_printf ("\n%s%s%s\n", href, title, desc, @@ -894,8 +877,6 @@ katze_xbel_folder_to_data (KatzeXbelItem* folder, { g_return_val_if_fail (katze_xbel_item_is_folder (folder), FALSE); - KatzeXbelItemPrivate* priv = KATZE_XBEL_ITEM_GET_PRIVATE (folder); - GString* inner_markup = g_string_new (NULL); guint n = katze_xbel_folder_get_n_items (folder); guint i; @@ -906,8 +887,8 @@ katze_xbel_folder_to_data (KatzeXbelItem* folder, g_string_append (inner_markup, sItem); g_free (sItem); } - gchar* title = katze_xbel_xml_element ("title", priv->title); - gchar* desc = katze_xbel_xml_element ("desc", priv->desc); + gchar* title = katze_xbel_xml_element ("title", folder->title); + gchar* desc = katze_xbel_xml_element ("desc", folder->desc); gchar* outer_markup; outer_markup = g_strdup_printf ( "%s%s\n%s%s%s\n", @@ -941,7 +922,9 @@ katze_xbel_folder_to_file (KatzeXbelItem* folder, const gchar* file, GError** error) { + g_return_val_if_fail (KATZE_IS_XBEL_ITEM (folder), FALSE); g_return_val_if_fail (file, FALSE); + gchar* data; if (!(data = katze_xbel_folder_to_data (folder, NULL, error))) return FALSE; diff --git a/katze/katze-xbel.h b/katze/katze-xbel.h index 78a46855..359aada6 100644 --- a/katze/katze-xbel.h +++ b/katze/katze-xbel.h @@ -18,19 +18,17 @@ G_BEGIN_DECLS #define KATZE_TYPE_XBEL_ITEM \ (katze_xbel_item_get_type ()) +#define KATZE_XBEL_ITEM(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_XBEL_ITEM, KatzeXbelItem)) +#define KATZE_IS_XBEL_ITEM(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_XBEL_ITEM)) typedef struct _KatzeXbelItem KatzeXbelItem; -typedef struct _KatzeXbelItemPrivate KatzeXbelItemPrivate; +typedef struct _KatzeXbelItemClass KatzeXbelItemClass; -struct _KatzeXbelItem +struct _KatzeXbelItemClass { - KatzeXbelItemPrivate* priv; - - /* Padding for future expansion */ - void (*_katze_reserved1) (void); - void (*_katze_reserved2) (void); - void (*_katze_reserved3) (void); - void (*_katze_reserved4) (void); + GObjectClass parent_class; }; #define KATZE_XBEL_ERROR g_quark_from_string("KATZE_XBEL_ERROR") From 04d3ae65068ba209c6c3bdc2a283351e4e94c5af Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Jun 2008 21:54:01 +0200 Subject: [PATCH 0170/2970] Make WebList more flexible so it can replace Trash --- midori/Makefile.am | 1 - midori/main.c | 6 +- midori/main.h | 1 - midori/midori-app.c | 10 +- midori/midori-app.h | 15 +- midori/midori-browser.c | 22 +-- midori/midori-trash.c | 328 ---------------------------------------- midori/midori-trash.h | 85 ----------- midori/midori-weblist.c | 100 +++++++++--- midori/midori-weblist.h | 20 ++- po/POTFILES.in | 1 - 11 files changed, 116 insertions(+), 473 deletions(-) delete mode 100644 midori/midori-trash.c delete mode 100644 midori/midori-trash.h diff --git a/midori/Makefile.am b/midori/Makefile.am index fe0c9e5a..91fa7b89 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -25,7 +25,6 @@ midori_SOURCES = \ midori-panel.c midori-panel.h \ midori-addons.c midori-addons.h \ midori-console.c midori-console.h \ - midori-trash.c midori-trash.h \ midori-webview.c midori-webview.h \ midori-websettings.c midori-websettings.h \ midori-preferences.c midori-preferences.h \ diff --git a/midori/main.c b/midori/main.c index ee78f140..4bd1f460 100644 --- a/midori/main.c +++ b/midori/main.c @@ -15,7 +15,6 @@ #include "midori-app.h" #include "midori-websettings.h" -#include "midori-trash.h" #include "midori-browser.h" #include "midori-weblist.h" #include "gjs.h" @@ -509,13 +508,14 @@ main (int argc, stock_items_init (); - MidoriTrash* trash = midori_trash_new (10); + // FIXME: Implement 10 item limit for trash + MidoriWebList* trash = midori_web_list_new (); guint n = katze_xbel_folder_get_n_items (xbel_trash); guint i; for (i = 0; i < n; i++) { KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); - midori_trash_prepend_xbel_item (trash, item); + midori_web_list_add_item (trash, item); } MidoriApp* app = g_object_new (MIDORI_TYPE_APP, diff --git a/midori/main.h b/midori/main.h index 829c76d9..f9fcf4df 100644 --- a/midori/main.h +++ b/midori/main.h @@ -16,7 +16,6 @@ #include #include - #include /* FIXME: Remove these globals */ diff --git a/midori/midori-app.c b/midori/midori-app.c index 6cab3403..fab0b780 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -25,7 +25,7 @@ struct _MidoriApp GtkAccelGroup* accel_group; MidoriWebSettings* settings; - MidoriTrash* trash; + MidoriWebList* trash; MidoriWebList* search_engines; }; @@ -122,7 +122,7 @@ midori_app_class_init (MidoriAppClass* class) "trash", _("Trash"), _("The trash, collecting recently closed tabs and windows"), - MIDORI_TYPE_TRASH, + MIDORI_TYPE_WEB_LIST, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -175,7 +175,7 @@ midori_app_init (MidoriApp* app) app->accel_group = gtk_accel_group_new (); app->settings = midori_web_settings_new (); - app->trash = midori_trash_new (10); + app->trash = midori_web_list_new (); app->search_engines = midori_web_list_new (); } @@ -387,11 +387,11 @@ midori_app_set_settings (MidoriApp* app, * midori_app_get_trash: * @app: a #MidoriApp * - * Retrieves the #MidoriTrash of the app. + * Retrieves the trash of the app. * * Return value: the assigned #MidoriTrash **/ -MidoriTrash* +MidoriWebList* midori_app_get_trash (MidoriApp* app) { g_return_val_if_fail (MIDORI_IS_APP (app), NULL); diff --git a/midori/midori-app.h b/midori/midori-app.h index 8de03fe0..9372d7e5 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -16,7 +16,7 @@ #include "midori-browser.h" #include "midori-websettings.h" -#include "midori-trash.h" +#include "midori-weblist.h" G_BEGIN_DECLS @@ -34,7 +34,6 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_APP, MidoriAppClass)) typedef struct _MidoriApp MidoriApp; -typedef struct _MidoriAppPrivate MidoriAppPrivate; typedef struct _MidoriAppClass MidoriAppClass; struct _MidoriAppClass @@ -56,21 +55,21 @@ MidoriApp* midori_app_new (void); void -midori_app_add_browser (MidoriApp* app, - MidoriBrowser* browser); +midori_app_add_browser (MidoriApp* app, + MidoriBrowser* browser); MidoriWebSettings* -midori_app_get_settings (MidoriApp* app); +midori_app_get_settings (MidoriApp* app); void midori_app_set_settings (MidoriApp* app, MidoriWebSettings* settings); -MidoriTrash* -midori_app_get_trash (MidoriApp* app); +MidoriWebList* +midori_app_get_trash (MidoriApp* app); void -midori_app_quit (MidoriApp* app); +midori_app_quit (MidoriApp* app); G_END_DECLS diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 29e9ea78..a0e09573 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -20,7 +20,6 @@ #include "midori-panel.h" #include "midori-addons.h" #include "midori-console.h" -#include "midori-trash.h" #include "midori-searchentry.h" #include @@ -70,7 +69,7 @@ struct _MidoriBrowser MidoriWebSettings* settings; KatzeXbelItem* proxy_xbel_folder; - MidoriTrash* trash; + MidoriWebList* trash; MidoriWebList* search_engines; }; @@ -157,7 +156,7 @@ _midori_browser_update_actions (MidoriBrowser* browser) if (browser->trash) { - gboolean trash_empty = midori_trash_is_empty (browser->trash); + gboolean trash_empty = midori_web_list_is_empty (browser->trash); _action_set_sensitive (browser, "UndoTabClose", !trash_empty); _action_set_sensitive (browser, "Trash", !trash_empty); } @@ -620,7 +619,7 @@ midori_web_view_close_cb (GtkWidget* web_view, MIDORI_WEB_VIEW (web_view)); const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); if (browser->trash && uri && *uri) - midori_trash_prepend_xbel_item (browser->trash, xbel_item); + midori_web_list_add_item (browser->trash, xbel_item); katze_xbel_folder_remove_item (browser->proxy_xbel_folder, xbel_item); katze_xbel_item_unref (xbel_item); } @@ -1087,7 +1086,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "trash", _("Trash"), _("The trash, collecting recently closed tabs and windows"), - MIDORI_TYPE_TRASH, + MIDORI_TYPE_WEB_LIST, G_PARAM_READWRITE)); /** @@ -1414,12 +1413,12 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { GtkWidget* menu = gtk_menu_new (); - guint n = midori_trash_get_n_items (browser->trash); + guint n = midori_web_list_get_length (browser->trash); GtkWidget* menuitem; guint i; for (i = 0; i < n; i++) { - KatzeXbelItem* item = midori_trash_get_nth_xbel_item (browser->trash, i); + KatzeXbelItem* item = midori_web_list_get_nth_item (browser->trash, i); const gchar* title = katze_xbel_item_get_title (item); const gchar* uri = katze_xbel_bookmark_get_href (item); menuitem = gtk_image_menu_item_new_with_label (title ? title : uri); @@ -2214,10 +2213,11 @@ _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { /* Reopen the most recent trash item */ - KatzeXbelItem* item = midori_trash_get_nth_xbel_item (browser->trash, 0); + guint length = midori_web_list_get_length (browser->trash); + KatzeXbelItem* item = midori_web_list_get_nth_item (browser->trash, length); gint n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); - midori_trash_remove_nth_item (browser->trash, 0); + midori_web_list_remove_item (browser->trash, item); _midori_browser_update_actions (browser); } @@ -2225,12 +2225,12 @@ static void _action_trash_empty_activate (GtkAction* action, MidoriBrowser* browser) { - midori_trash_empty (browser->trash); + midori_web_list_clear (browser->trash); _midori_browser_update_actions (browser); } static void -_action_bookmark_delete_activate (GtkAction* action, +_action_bookmark_delete_activate (GtkAction* action, MidoriBrowser* browser) { GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); diff --git a/midori/midori-trash.c b/midori/midori-trash.c deleted file mode 100644 index b546e121..00000000 --- a/midori/midori-trash.c +++ /dev/null @@ -1,328 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "midori-trash.h" - -#include "sokoke.h" -#include - -G_DEFINE_TYPE (MidoriTrash, midori_trash, G_TYPE_OBJECT) - -struct _MidoriTrashPrivate -{ - guint limit; - KatzeXbelItem* xbel_folder; -}; - -#define MIDORI_TRASH_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - MIDORI_TYPE_TRASH, MidoriTrashPrivate)) - -enum -{ - PROP_0, - - PROP_LIMIT -}; - -enum { - INSERTED, - REMOVED, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -static void -midori_trash_finalize (GObject* object); - -static void -midori_trash_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec); - -static void -midori_trash_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec); - -static void -midori_trash_class_init (MidoriTrashClass* class) -{ - signals[INSERTED] = g_signal_new ( - "inserted", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriTrashClass, inserted), - 0, - NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, 1, - G_TYPE_UINT); - - signals[REMOVED] = g_signal_new ( - "removed", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriTrashClass, removed), - 0, - NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, 1, - G_TYPE_UINT); - - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_trash_finalize; - gobject_class->set_property = midori_trash_set_property; - gobject_class->get_property = midori_trash_get_property; - - GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - - g_object_class_install_property (gobject_class, - PROP_LIMIT, - g_param_spec_uint ( - "limit", - _("Limit"), - _("The maximum number of items"), - 0, G_MAXUINT, 10, - flags)); - - g_type_class_add_private (class, sizeof (MidoriTrashPrivate)); -} - - - -static void -midori_trash_init (MidoriTrash* trash) -{ - trash->priv = MIDORI_TRASH_GET_PRIVATE (trash); - - MidoriTrashPrivate* priv = trash->priv; - - priv->xbel_folder = katze_xbel_folder_new (); -} - -static void -midori_trash_finalize (GObject* object) -{ - MidoriTrash* trash = MIDORI_TRASH (object); - MidoriTrashPrivate* priv = trash->priv; - - katze_xbel_item_unref (priv->xbel_folder); - - G_OBJECT_CLASS (midori_trash_parent_class)->finalize (object); -} - -static void -midori_trash_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec) -{ - MidoriTrash* trash = MIDORI_TRASH (object); - MidoriTrashPrivate* priv = trash->priv; - - switch (prop_id) - { - case PROP_LIMIT: - priv->limit = g_value_get_uint (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -midori_trash_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) -{ - MidoriTrash* trash = MIDORI_TRASH (object); - MidoriTrashPrivate* priv = trash->priv; - - switch (prop_id) - { - case PROP_LIMIT: - g_value_set_uint (value, priv->limit); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/** - * midori_trash_new: - * @limit: the maximum number of items - * - * Creates a new #MidoriTrash that can contain a specified number of items, - * meaning that each additional item will replace the oldest existing item. - * - * The value 0 for @limit actually means that there is no limit. - * - * You will typically want to assign this to a #MidoriBrowser. - * - * Return value: a new #MidoriTrash - **/ -MidoriTrash* -midori_trash_new (guint limit) -{ - MidoriTrash* trash = g_object_new (MIDORI_TYPE_TRASH, - "limit", limit, - NULL); - - return trash; -} - -/** - * midori_trash_is_empty: - * @trash: a #MidoriTrash - * - * Determines whether the @trash contains no items. - * - * Return value: %TRUE if there are no items, %FALSE otherwise - **/ -gboolean -midori_trash_is_empty (MidoriTrash* trash) -{ - g_return_val_if_fail (MIDORI_IS_TRASH (trash), FALSE); - - MidoriTrashPrivate* priv = trash->priv; - - return katze_xbel_folder_is_empty (priv->xbel_folder); -} - -/** - * midori_trash_get_n_items: - * @trash: a #MidoriTrash - * - * Determines the number of items in @trash. - * - * Return value: the current number of items - **/ -guint -midori_trash_get_n_items (MidoriTrash* trash) -{ - g_return_val_if_fail (MIDORI_IS_TRASH (trash), 0); - - MidoriTrashPrivate* priv = trash->priv; - - return katze_xbel_folder_get_n_items (priv->xbel_folder); -} - -/** - * midori_trash_get_nth_xbel_item: - * @trash: a #MidoriTrash - * @n: the index of an item - * - * Retrieve an item contained in @trash by its index. - * - * Note that you mustn't unref this item. - * - * Return value: the index at the given index or %NULL - **/ -KatzeXbelItem* -midori_trash_get_nth_xbel_item (MidoriTrash* trash, - guint n) -{ - g_return_val_if_fail (MIDORI_IS_TRASH (trash), 0); - - MidoriTrashPrivate* priv = trash->priv; - - return katze_xbel_folder_get_nth_item (priv->xbel_folder, n); -} - -/** - * midori_trash_prepend_xbel_item: - * @trash: a #MidoriTrash - * @xbel_item: a #KatzeXbelItem - * - * Prepends a #KatzeXbelItem to @trash. - * - * The item is copied. If there is a limit set, the oldest item is - * removed automatically. - * - * Return value: %TRUE if there are no items, %FALSE otherwise - **/ -void -midori_trash_prepend_xbel_item (MidoriTrash* trash, - KatzeXbelItem* xbel_item) -{ - g_return_if_fail (MIDORI_IS_TRASH (trash)); - - MidoriTrashPrivate* priv = trash->priv; - - KatzeXbelItem* copy = katze_xbel_item_copy (xbel_item); - katze_xbel_folder_prepend_item (priv->xbel_folder, copy); - g_signal_emit (trash, signals[INSERTED], 0, 0); - guint n = katze_xbel_folder_get_n_items (priv->xbel_folder); - if (n > 10) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (priv->xbel_folder, - n - 1); - g_signal_emit (trash, signals[REMOVED], 0, n - 1); - katze_xbel_item_unref (item); - } -} - -/** - * midori_trash_remove_nth_item: - * @trash: a #MidoriTrash - * @n: the index of an item - * - * Removes the item at the specified position from @trash. - * - * Nothing happens if the function fails. - **/ -void -midori_trash_remove_nth_item (MidoriTrash* trash, - guint n) -{ - g_return_if_fail (MIDORI_IS_TRASH (trash)); - - MidoriTrashPrivate* priv = trash->priv; - - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (priv->xbel_folder, n); - if (!n) - return; - katze_xbel_folder_remove_item (priv->xbel_folder, item); - g_signal_emit (trash, signals[REMOVED], 0, n); - katze_xbel_item_unref (item); -} - -/** - * midori_trash_empty: - * @trash: a #MidoriTrash - * - * Deletes all items currently contained in @trash. - **/ -void -midori_trash_empty (MidoriTrash* trash) -{ - g_return_if_fail (MIDORI_IS_TRASH (trash)); - - MidoriTrashPrivate* priv = trash->priv; - - guint n = katze_xbel_folder_get_n_items (priv->xbel_folder); - guint i; - for (i = 0; i < n; i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (priv->xbel_folder, - i); - g_signal_emit (trash, signals[REMOVED], 0, i); - katze_xbel_item_unref (item); - } -} diff --git a/midori/midori-trash.h b/midori/midori-trash.h deleted file mode 100644 index bc711792..00000000 --- a/midori/midori-trash.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_TRASH_H__ -#define __MIDORI_TRASH_H__ - -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_TRASH \ - (midori_trash_get_type ()) -#define MIDORI_TRASH(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_TRASH, MidoriTrash)) -#define MIDORI_TRASH_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_TRASH, MidoriTrashClass)) -#define MIDORI_IS_TRASH(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_TRASH)) -#define MIDORI_IS_TRASH_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_TRASH)) -#define MIDORI_TRASH_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_TRASH, MidoriTrashClass)) - -typedef struct _MidoriTrash MidoriTrash; -typedef struct _MidoriTrashPrivate MidoriTrashPrivate; -typedef struct _MidoriTrashClass MidoriTrashClass; - -struct _MidoriTrash -{ - GObject parent_instance; - - MidoriTrashPrivate* priv; -}; - -struct _MidoriTrashClass -{ - GObjectClass parent_class; - - /* Signals */ - void - (*inserted) (MidoriTrash* trash, - guint n); - void - (*removed) (MidoriTrash* trash, - guint n); -}; - -GType -midori_trash_get_type (void); - -MidoriTrash* -midori_trash_new (guint limit); - -gboolean -midori_trash_is_empty (MidoriTrash* trash); - -guint -midori_trash_get_n_items (MidoriTrash* trash); - -KatzeXbelItem* -midori_trash_get_nth_xbel_item (MidoriTrash* trash, - guint n); - -void -midori_trash_prepend_xbel_item (MidoriTrash* trash, - KatzeXbelItem* xbel_item); - -void -midori_trash_remove_nth_item (MidoriTrash* trash, - guint n); - -void -midori_trash_empty (MidoriTrash* trash); - -G_END_DECLS - -#endif /* __MIDORI_TRASH_H__ */ diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c index daf2c3b1..fb301819 100644 --- a/midori/midori-weblist.c +++ b/midori/midori-weblist.c @@ -14,6 +14,15 @@ #include #include +/** + * SECTION:midori-weblist + * @short_description: A versatile object container + * @see_also: #MidoriWebItem + * + * #MidoriWebList is a versatile container for objects with + * explicit support for #MidoriWebList and #MidoriWebItem children. + */ + struct _MidoriWebList { GObject parent_instance; @@ -37,18 +46,17 @@ midori_web_list_finalize (GObject* object); static void _midori_web_list_add_item (MidoriWebList* web_list, - MidoriWebItem* web_item) + GObject* item) { - g_object_ref (web_item); - web_list->items = g_list_append (web_list->items, web_item); + web_list->items = g_list_append (web_list->items, item); } static void _midori_web_list_remove_item (MidoriWebList* web_list, - MidoriWebItem* web_item) + GObject* item) { - web_list->items = g_list_remove (web_list->items, web_item); - g_object_unref (web_item); + web_list->items = g_list_remove (web_list->items, item); + g_object_unref (item); } static void @@ -63,7 +71,7 @@ midori_web_list_class_init (MidoriWebListClass* class) NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - MIDORI_TYPE_WEB_ITEM); + G_TYPE_OBJECT); signals[REMOVE_ITEM] = g_signal_new ( "remove-item", @@ -74,7 +82,7 @@ midori_web_list_class_init (MidoriWebListClass* class) NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, - MIDORI_TYPE_WEB_ITEM); + G_TYPE_OBJECT); class->add_item = _midori_web_list_add_item; class->remove_item = _midori_web_list_remove_item; @@ -94,7 +102,7 @@ midori_web_list_finalize (GObject* object) { MidoriWebList* web_list = MIDORI_WEB_LIST (object); - g_list_foreach (web_list->items, (GFunc)g_object_unref, NULL); + midori_web_list_clear (web_list); g_list_free (web_list->items); G_OBJECT_CLASS (midori_web_list_parent_class)->finalize (object); @@ -119,29 +127,33 @@ midori_web_list_new (void) /** * midori_web_list_add_item: * @web_list: a #MidoriWebList - * @web_item: a #MidoriWebItem + * @item: a #GObject * * Adds an item to the list. **/ void midori_web_list_add_item (MidoriWebList* web_list, - MidoriWebItem* web_item) + gpointer item) { - g_signal_emit (web_list, signals[ADD_ITEM], 0, web_item); + g_return_if_fail (G_IS_OBJECT (item)); + + g_signal_emit (web_list, signals[ADD_ITEM], 0, item); } /** * midori_web_list_add_item: * @web_list: a #MidoriWebList - * @web_item: a #MidoriWebItem + * @item: a #GObject * * Removes an item from the list. **/ void midori_web_list_remove_item (MidoriWebList* web_list, - MidoriWebItem* web_item) + gpointer item) { - g_signal_emit (web_list, signals[REMOVE_ITEM], 0, web_item); + g_return_if_fail (G_IS_OBJECT (item)); + + g_signal_emit (web_list, signals[REMOVE_ITEM], 0, item); } /** @@ -153,15 +165,31 @@ midori_web_list_remove_item (MidoriWebList* web_list, * * Return value: an item, or %NULL **/ -MidoriWebItem* +gpointer midori_web_list_get_nth_item (MidoriWebList* web_list, guint n) { - g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), 0); + g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), NULL); return g_list_nth_data (web_list->items, n); } +/** + * midori_web_list_is_empty: + * @web_list: a #MidoriWebList + * + * Determines if @web_list is empty. + * + * Return value: an item, or %NULL + **/ +gboolean +midori_web_list_is_empty (MidoriWebList* web_list) +{ + g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), TRUE); + + return !g_list_nth_data (web_list->items, 0); +} + /** * midori_web_list_get_item_position: * @web_list: a #MidoriWebList @@ -173,12 +201,12 @@ midori_web_list_get_nth_item (MidoriWebList* web_list, **/ gint midori_web_list_get_item_index (MidoriWebList* web_list, - MidoriWebItem* web_item) + gpointer item) { g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), -1); - g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), -1); + g_return_val_if_fail (G_IS_OBJECT (item), -1); - return g_list_index (web_list->items, web_item); + return g_list_index (web_list->items, item); } /** @@ -188,15 +216,18 @@ midori_web_list_get_item_index (MidoriWebList* web_list, * * Looks up an item in the list which has the specified token. * + * Supported is #MidoriWebItem. + * * Note that @token is by definition unique to one item. * * Return value: an item, or %NULL **/ -MidoriWebItem* +gpointer midori_web_list_find_token (MidoriWebList* web_list, const gchar* token) { guint n, i; + GObject* item; MidoriWebItem* web_item; g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), NULL); @@ -204,9 +235,12 @@ midori_web_list_find_token (MidoriWebList* web_list, n = g_list_length (web_list->items); for (i = 0; i < n; i++) { - web_item = (MidoriWebItem*)g_list_nth_data (web_list->items, i); + item = (GObject*)g_list_nth_data (web_list->items, i); + if (!MIDORI_IS_WEB_ITEM (item)) + continue; + web_item = (MidoriWebItem*)item; if (!strcmp (midori_web_item_get_token (web_item), token)) - return web_item; + return item; } return NULL; } @@ -226,3 +260,23 @@ midori_web_list_get_length (MidoriWebList* web_list) return g_list_length (web_list->items); } + +/** + * midori_web_list_clear: + * @web_list: a #MidoriWebList + * + * Deletes all items currently contained in @web_list. + **/ +void +midori_web_list_clear (MidoriWebList* web_list) +{ + g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); + + guint n = g_list_length (web_list->items); + guint i; + for (i = 0; i < n; i++) + { + GObject* item = g_list_nth_data (web_list->items, i); + midori_web_list_remove_item (web_list, item); + } +} diff --git a/midori/midori-weblist.h b/midori/midori-weblist.h index 64f9866c..e051cbc5 100644 --- a/midori/midori-weblist.h +++ b/midori/midori-weblist.h @@ -39,10 +39,10 @@ struct _MidoriWebListClass /* Signals */ void (*add_item) (MidoriWebList* web_list, - MidoriWebItem* web_item); + GObject* item); void (*remove_item) (MidoriWebList* web_list, - MidoriWebItem* web_item); + GObject* item); }; GType @@ -53,27 +53,33 @@ midori_web_list_new (void); void midori_web_list_add_item (MidoriWebList* web_list, - MidoriWebItem* web_item); + gpointer item); void midori_web_list_remove_item (MidoriWebList* web_list, - MidoriWebItem* web_item); + gpointer item); -MidoriWebItem* +gpointer midori_web_list_get_nth_item (MidoriWebList* web_list, guint n); +gboolean +midori_web_list_is_empty (MidoriWebList* web_list); + gint midori_web_list_get_item_index (MidoriWebList* web_list, - MidoriWebItem* web_item); + gpointer item); -MidoriWebItem* +gpointer midori_web_list_find_token (MidoriWebList* web_list, const gchar* token); guint midori_web_list_get_length (MidoriWebList* web_list); +void +midori_web_list_clear (MidoriWebList* web_list); + G_END_DECLS #endif /* __MIDORI_WEB_LIST_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index bb0358a2..df1c867e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,6 @@ midori/midori-addons.c midori/midori-console.c midori/midori-browser.c midori/midori-panel.c -midori/midori-trash.c midori/midori-websettings.c midori/midori-webview.c midori/midori-preferences.c From 9391b0fe21d120b186d2ef4a09b1125c5058ae95 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sun, 29 Jun 2008 16:10:56 +0200 Subject: [PATCH 0171/2970] Disconnect midori_web_view_settings_notify on finalize --- midori/midori-webview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 5b92cd72..0570a291 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -592,7 +592,12 @@ midori_web_view_finalize (GObject* object) katze_xbel_item_unref (web_view->proxy_xbel_item); if (web_view->settings) + { + g_signal_handlers_disconnect_by_func (web_view->settings, + midori_web_view_settings_notify, + web_view); g_object_unref (web_view->settings); + } G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); } From e6eaab55a12a828a81762647d585b70f05bc43fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jul 2008 16:12:27 +0200 Subject: [PATCH 0172/2970] Basic favicon support through GIO --- midori/compat.c | 85 ++++++++++++++++++++++++++- midori/compat.h | 13 +++++ midori/midori-browser.c | 19 ++++-- midori/midori-webview.c | 126 ++++++++++++++++++++++++++++------------ midori/midori-webview.h | 3 + 5 files changed, 203 insertions(+), 43 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index 4f8a7401..5bd73b70 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -11,10 +11,93 @@ #include "compat.h" +#if !GTK_CHECK_VERSION(2, 14, 0) + +#if GLIB_CHECK_VERSION(2, 16, 0) + +/* GTK+/ GdkPixbuf internal helper function + Copyright (C) 2008 Matthias Clasen + Copied from Gtk+ 2.13, coding style adjusted */ + +static GdkPixbuf* +load_from_stream (GdkPixbufLoader* loader, + GInputStream* stream, + GCancellable* cancellable, + GError** error) +{ + GdkPixbuf* pixbuf; + gssize n_read; + guchar buffer[65536]; + gboolean res; + + res = TRUE; + while (1) + { + n_read = g_input_stream_read (stream, buffer, sizeof (buffer), + cancellable, error); + if (n_read < 0) + { + res = FALSE; + error = NULL; /* Ignore further errors */ + break; + } + + if (!n_read) + break; + + if (!gdk_pixbuf_loader_write (loader, buffer, n_read, + error)) + { + res = FALSE; + error = NULL; + break; + } + } + + if (!gdk_pixbuf_loader_close (loader, error)) + { + res = FALSE; + error = NULL; + } + + pixbuf = NULL; + if (res) + { + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + if (pixbuf) + g_object_ref (pixbuf); + } + + return pixbuf; +} + +/* GTK+/ GdkPixbuf stream loading function + Copyright (C) 2008 Matthias Clasen + Copied from Gtk+ 2.13, coding style adjusted */ +GdkPixbuf* +gdk_pixbuf_new_from_stream (GInputStream* stream, + GCancellable* cancellable, + GError** error) +{ + GdkPixbuf* pixbuf; + GdkPixbufLoader* loader; + + loader = gdk_pixbuf_loader_new (); + pixbuf = load_from_stream (loader, stream, cancellable, error); + g_object_unref (loader); + + return pixbuf; +} + +#endif + +#endif + #if !GTK_CHECK_VERSION(2, 12, 0) void -gtk_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) +gtk_widget_set_tooltip_text (GtkWidget* widget, + const gchar* text) { static GtkTooltips* tooltips; if (!tooltips) diff --git a/midori/compat.h b/midori/compat.h index c0818d8c..de818e8a 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -12,10 +12,23 @@ #ifndef __COMPAT_H__ #define __COMPAT_H__ +#include "glib.h" +#if GLIB_CHECK_VERSION(2, 16, 0) +#include +#endif #include G_BEGIN_DECLS +#if !GTK_CHECK_VERSION(2, 14, 0) + +GdkPixbuf* +gdk_pixbuf_new_from_stream (GInputStream* stream, + GCancellable* cancellable, + GError** error); + +#endif + #if !GTK_CHECK_VERSION(2, 12, 0) void diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a0e09573..265d297f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -165,8 +165,12 @@ _midori_browser_update_actions (MidoriBrowser* browser) static void _midori_browser_update_interface (MidoriBrowser* browser) { - gboolean loading = FALSE; - GtkWidget* web_view = midori_browser_get_current_web_view (browser); + gboolean loading; + GtkWidget* web_view; + GdkPixbuf* pixbuf; + + loading = FALSE; + web_view = midori_browser_get_current_web_view (browser); if (web_view) { loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); @@ -202,8 +206,15 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_show (browser->progressbar); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); - gtk_image_set_from_stock (GTK_IMAGE (browser->location_icon), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + if (web_view && MIDORI_IS_WEB_VIEW (web_view)) + { + pixbuf = midori_web_view_get_icon (MIDORI_WEB_VIEW (web_view)); + gtk_image_set_from_pixbuf (GTK_IMAGE (browser->location_icon), pixbuf); + g_object_unref (pixbuf); + } + else + gtk_image_set_from_stock (GTK_IMAGE (browser->location_icon), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); } static GtkWidget* diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 0570a291..2733bdb8 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -15,6 +15,9 @@ #include "sokoke.h" #include "compat.h" +#if GLIB_CHECK_VERSION (2, 16, 0) +#include +#endif #include #include @@ -29,7 +32,6 @@ struct _MidoriWebView GtkWidget* tab_icon; GtkWidget* tab_label; GtkWidget* tab_close; - GdkPixbuf* icon; gchar* uri; gchar* title; gboolean is_loading; @@ -53,7 +55,6 @@ enum { PROP_0, - PROP_ICON, PROP_URI, PROP_TITLE, PROP_STATUSBAR_TEXT, @@ -173,7 +174,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[NEW_WINDOW] = g_signal_new( "new-window", G_TYPE_FROM_CLASS(class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriWebViewClass, new_window), 0, NULL, @@ -188,15 +189,6 @@ midori_web_view_class_init (MidoriWebViewClass* class) GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - g_object_class_install_property (gobject_class, - PROP_ICON, - g_param_spec_object ( - "icon", - "Icon", - _("The icon of the currently loaded page"), - GDK_TYPE_PIXBUF, - G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, PROP_URI, g_param_spec_string ( @@ -255,9 +247,16 @@ static void webkit_web_view_load_committed (MidoriWebView* web_view, WebKitWebFrame* web_frame) { + const gchar* uri; + GdkPixbuf* icon; + web_view->progress = 0; - const gchar* uri = webkit_web_frame_get_uri (web_frame); + uri = webkit_web_frame_get_uri (web_frame); _midori_web_view_set_uri (web_view, uri); + icon = midori_web_view_get_icon (web_view); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + icon); + g_object_unref (icon); } static void @@ -291,10 +290,18 @@ static void webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, MidoriWebView* web_view) { + GdkPixbuf* icon; + web_view->is_loading = FALSE; web_view->progress = -1; if (web_view->tab_icon) + { katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), FALSE); + icon = midori_web_view_get_icon (web_view); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + icon); + g_object_unref (icon); + } g_signal_emit (web_view, signals[LOAD_DONE], 0, web_frame); } @@ -372,10 +379,15 @@ static gboolean gtk_widget_button_press_event_after (MidoriWebView* web_view, GdkEventButton* event) { + GdkModifierType state; + GtkClipboard* clipboard; + if (event->button == 2 && web_view->middle_click_opens_selection) { - GdkModifierType state = (GdkModifierType) event->state; - GtkClipboard* clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); + state = (GdkModifierType) event->state; + clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (GTK_WIDGET (web_view)), + GDK_SELECTION_PRIMARY); gchar* uri = gtk_clipboard_wait_for_text (clipboard); if (uri && strchr (uri, '.') && !strchr (uri, ' ')) { @@ -579,8 +591,6 @@ midori_web_view_finalize (GObject* object) { MidoriWebView* web_view = MIDORI_WEB_VIEW (object); - if (web_view->icon) - g_object_unref (web_view->icon); g_free (web_view->uri); g_free (web_view->title); g_free (web_view->statusbar_text); @@ -612,13 +622,6 @@ midori_web_view_set_property (GObject* object, switch (prop_id) { - case PROP_ICON: - katze_object_assign (web_view->icon, g_value_get_object (value)); - g_object_ref (web_view->icon); - if (web_view->tab_icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - web_view->icon); - break; case PROP_URI: { const gchar* uri = g_value_get_string (value); @@ -670,9 +673,6 @@ midori_web_view_get_property (GObject* object, switch (prop_id) { - case PROP_ICON: - g_value_set_object (value, web_view->icon); - break; case PROP_URI: g_value_set_string (value, web_view->uri); break; @@ -738,15 +738,20 @@ midori_web_view_set_settings (MidoriWebView* web_view, GtkWidget* midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) { + const gchar* title; + GtkWidget* menu_item; + GdkPixbuf* icon; + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); if (!web_view->proxy_menu_item) { - const gchar* title = midori_web_view_get_display_title (web_view); - GtkWidget* menu_item = gtk_image_menu_item_new_with_label (title); - GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), icon); + title = midori_web_view_get_display_title (web_view); + menu_item = gtk_image_menu_item_new_with_label (title); + icon = midori_web_view_get_icon (web_view); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), + gtk_image_new_from_pixbuf (icon)); + g_object_unref (icon); web_view->proxy_menu_item = menu_item; } @@ -770,17 +775,17 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) GtkWidget* midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) { + GdkPixbuf* icon; + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); if (!web_view->tab_icon) { web_view->tab_icon = katze_throbber_new (); - if (web_view->icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - web_view->icon); - else - katze_throbber_set_static_stock_id (KATZE_THROBBER (web_view->tab_icon), - GTK_STOCK_FILE); + icon = midori_web_view_get_icon (web_view); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + icon); + g_object_unref (icon); } return web_view->tab_icon; } @@ -1031,3 +1036,48 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) return web_view->link_uri; } + +/** + * midori_web_view_get_icon: + * @web_view: a #MidoriWebView + * + * Retrieves an icon associated with the currently loaded URI. If no + * icon is available a default icon is used. + * + * Return value: a #GdkPixbuf + **/ +GdkPixbuf* +midori_web_view_get_icon (MidoriWebView* web_view) +{ + GFile* file; + GFile* icon_file; + GIcon* icon; + GInputStream* stream; + GdkPixbuf* pixbuf; + + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + + #if GLIB_CHECK_VERSION (2, 16, 0) + file = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); + icon_file = g_file_get_child (file, "favicon.ico"); + icon = g_file_icon_new (icon_file); + if (icon) + stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), + GTK_ICON_SIZE_MENU, + NULL, NULL, NULL); + else + stream = NULL; + if (stream) + { + pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); + g_object_unref (stream); + } + g_object_unref (icon); + g_object_unref (icon_file); + g_object_unref (file); + if (!stream) + #endif + pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + return pixbuf; +} diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 431e1bef..91491a89 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -99,6 +99,9 @@ midori_web_view_get_display_title (MidoriWebView* web_view); const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view); +GdkPixbuf* +midori_web_view_get_icon (MidoriWebView* web_view); + G_END_DECLS #endif /* __MIDORI_WEB_VIEW_H__ */ From 24a9f1dd42923442c7a769c0b201c412f7c90528 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jul 2008 16:13:42 +0200 Subject: [PATCH 0173/2970] Limit trash to contain 10 items --- midori/main.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/midori/main.c b/midori/main.c index 4bd1f460..1f941893 100644 --- a/midori/main.c +++ b/midori/main.c @@ -30,7 +30,8 @@ #include #endif -static void stock_items_init(void) +static void +stock_items_init (void) { static GtkStockItem items[] = { @@ -321,6 +322,18 @@ search_engines_save_to_file (MidoriWebList* search_engines, return saved; } +static void +midori_web_list_add_item_cb (MidoriWebList* trash, + GObject* item) +{ + guint n = midori_web_list_get_length (trash); + if (n > 10) + { + GObject* obsolete_item = midori_web_list_get_nth_item (trash, 0); + g_object_unref (obsolete_item); + } +} + int main (int argc, char** argv) @@ -439,7 +452,7 @@ main (int argc, if (!katze_xbel_folder_from_file (xbel_trash, config_file, &error)) { if (error->code != G_FILE_ERROR_NOENT) - g_string_append_printf(error_messages, + g_string_append_printf (error_messages, _("The trash couldn't be loaded. %s\n"), error->message); g_error_free (error); } @@ -448,13 +461,22 @@ main (int argc, /* In case of errors */ if (error_messages->len) { + GdkScreen* screen; + GtkIconTheme* icon_theme; GtkWidget* dialog = gtk_message_dialog_new ( NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, _("The following errors occured:")); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); - /* FIXME: Use custom program icon */ - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + screen = gtk_widget_get_screen (dialog); + if (screen) + { + icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, "midori")) + gtk_window_set_icon_name (GTK_WINDOW (dialog), "midori"); + else + gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + } gtk_message_dialog_format_secondary_text ( GTK_MESSAGE_DIALOG (dialog), "%s", error_messages->str); gtk_dialog_add_buttons (GTK_DIALOG (dialog), @@ -508,7 +530,6 @@ main (int argc, stock_items_init (); - // FIXME: Implement 10 item limit for trash MidoriWebList* trash = midori_web_list_new (); guint n = katze_xbel_folder_get_n_items (xbel_trash); guint i; @@ -517,6 +538,8 @@ main (int argc, KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); midori_web_list_add_item (trash, item); } + g_signal_connect_after (trash, "add-item", + G_CALLBACK (midori_web_list_add_item_cb), NULL); MidoriApp* app = g_object_new (MIDORI_TYPE_APP, "settings", settings, From c796974152b517e1164127029f55655e91b84d6e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jul 2008 16:28:01 +0200 Subject: [PATCH 0174/2970] Remove remnants of tab iconification, fixes swalloed clicks. --- midori/midori-webview.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 2733bdb8..1b87c7ed 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -795,22 +795,7 @@ midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, GdkEventButton* event, MidoriWebView* web_view) { - if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) - { - /* Toggle the label visibility on double click */ - GtkWidget* child = gtk_bin_get_child (GTK_BIN (tab_label)); - GList* children = gtk_container_get_children (GTK_CONTAINER (child)); - child = (GtkWidget*)g_list_nth_data (children, 1); - gboolean visible = gtk_widget_get_child_visible (GTK_WIDGET (child)); - gtk_widget_set_child_visible (GTK_WIDGET (child), !visible); - gint width, height; - sokoke_widget_get_text_size(tab_label, "M", &width, &height); - gtk_widget_set_size_request (child, !visible - ? width * web_view->tab_label_size : 0, !visible ? -1 : 0); - g_list_free (children); - return TRUE; - } - else if (event->button == 2) + if (event->button == 2) { /* Close the web view on middle click */ g_signal_emit (web_view, signals[CLOSE], 0); From 25edd5e13b730530fcf18e20bb95713ffe112671 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jul 2008 23:47:40 +0200 Subject: [PATCH 0175/2970] Fix Gtk+ < 2.13 and GIO build --- configure.in | 8 ++++++++ midori/Makefile.am | 2 ++ midori/compat.h | 6 +++++- midori/wscript_build | 2 +- wscript | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index b95e8b71..17ad974c 100644 --- a/configure.in +++ b/configure.in @@ -38,6 +38,14 @@ if test x"$enable_debug" = x"yes"; then ]) fi +# Checks for GIO2 +PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=true, have_gio=false) +if test "x${have_gio}" = "xfalse" ; then + AC_MSG_ERROR([No GIO2 package information found]) +fi +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) + # Checks for GTK+2 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false) if test "x${have_gtk}" = "xfalse" ; then diff --git a/midori/Makefile.am b/midori/Makefile.am index 91fa7b89..69c8d133 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = \ + $(GIO_CFLAGS) \ $(GTK_CFLAGS) \ $(WEBKIT_CFLAGS) \ $(LIBSEXY_CFLAGS) \ @@ -7,6 +8,7 @@ INCLUDES = \ AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" LDADD = \ + $(GIO_LIBS) \ $(GTK_LIBS) \ $(WEBKIT_LIBS) \ $(LIBSEXY_LIBS) \ diff --git a/midori/compat.h b/midori/compat.h index de818e8a..415b6b74 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -12,7 +12,7 @@ #ifndef __COMPAT_H__ #define __COMPAT_H__ -#include "glib.h" +#include #if GLIB_CHECK_VERSION(2, 16, 0) #include #endif @@ -22,6 +22,8 @@ G_BEGIN_DECLS #if !GTK_CHECK_VERSION(2, 14, 0) +#if GLIB_CHECK_VERSION(2,16, 0) + GdkPixbuf* gdk_pixbuf_new_from_stream (GInputStream* stream, GCancellable* cancellable, @@ -29,6 +31,8 @@ gdk_pixbuf_new_from_stream (GInputStream* stream, #endif +#endif + #if !GTK_CHECK_VERSION(2, 12, 0) void diff --git a/midori/wscript_build b/midori/wscript_build index df741850..228342de 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '.. ../katze' obj.find_sources_in_dirs ('.') -obj.uselib = 'GTK WEBKIT LIBXML LIBSEXY' +obj.uselib = 'GIO GTK WEBKIT LIBXML LIBSEXY' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 17fa3af1..45380fe7 100644 --- a/wscript +++ b/wscript @@ -35,6 +35,7 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) + conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) From 30c6102763a8740b4267f85d449ef52a139d7c70 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Jul 2008 16:20:27 +0200 Subject: [PATCH 0176/2970] Hack to implement New Window menuitem --- midori/midori-webview.c | 114 +++++++++++++++++++++++++--------------- 1 file changed, 73 insertions(+), 41 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 1b87c7ed..cb56c3d5 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -81,15 +81,15 @@ static void midori_web_view_finalize (GObject* object); static void -midori_web_view_set_property (GObject* object, - guint prop_id, +midori_web_view_set_property (GObject* object, + guint prop_id, const GValue* value, - GParamSpec* pspec); + GParamSpec* pspec); static void -midori_web_view_get_property (GObject* object, - guint prop_id, - GValue* value, +midori_web_view_get_property (GObject* object, + guint prop_id, + GValue* value, GParamSpec* pspec); static void @@ -97,7 +97,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) { signals[PROGRESS_STARTED] = g_signal_new ( "progress-started", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, progress_started), 0, @@ -108,7 +108,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[PROGRESS_CHANGED] = g_signal_new ( "progress-changed", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, progress_changed), 0, @@ -119,7 +119,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[PROGRESS_DONE] = g_signal_new ( "progress-done", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, progress_done), 0, @@ -130,7 +130,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) signals[LOAD_DONE] = g_signal_new ( "load-done", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, load_done), 0, @@ -139,9 +139,9 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_NONE, 1, WEBKIT_TYPE_WEB_FRAME); - signals[ELEMENT_MOTION] = g_signal_new( + signals[ELEMENT_MOTION] = g_signal_new ( "element-motion", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (MidoriWebViewClass, element_motion), 0, @@ -150,9 +150,9 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); - signals[CLOSE] = g_signal_new( + signals[CLOSE] = g_signal_new ( "close", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriWebViewClass, close), 0, @@ -160,9 +160,9 @@ midori_web_view_class_init (MidoriWebViewClass* class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[NEW_TAB] = g_signal_new( + signals[NEW_TAB] = g_signal_new ( "new-tab", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriWebViewClass, new_tab), 0, @@ -171,9 +171,9 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); - signals[NEW_WINDOW] = g_signal_new( + signals[NEW_WINDOW] = g_signal_new ( "new-window", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET (MidoriWebViewClass, new_window), 0, @@ -253,10 +253,13 @@ webkit_web_view_load_committed (MidoriWebView* web_view, web_view->progress = 0; uri = webkit_web_frame_get_uri (web_frame); _midori_web_view_set_uri (web_view, uri); - icon = midori_web_view_get_icon (web_view); - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - icon); - g_object_unref (icon); + if (web_view->tab_icon) + { + icon = midori_web_view_get_icon (web_view); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + icon); + g_object_unref (icon); + } } static void @@ -381,6 +384,7 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, { GdkModifierType state; GtkClipboard* clipboard; + gchar* uri; if (event->button == 2 && web_view->middle_click_opens_selection) { @@ -388,7 +392,7 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, clipboard = gtk_clipboard_get_for_display ( gtk_widget_get_display (GTK_WIDGET (web_view)), GDK_SELECTION_PRIMARY); - gchar* uri = gtk_clipboard_wait_for_text (clipboard); + uri = gtk_clipboard_wait_for_text (clipboard); if (uri && strchr (uri, '.') && !strchr (uri, ' ')) { if (state & GDK_CONTROL_MASK) @@ -408,6 +412,7 @@ gtk_widget_scroll_event (MidoriWebView* web_view, { GdkModifierType state = (GdkModifierType)0; gint x, y; + gdk_window_get_pointer (NULL, &x, &y, &state); if (state & GDK_CONTROL_MASK) { @@ -429,21 +434,36 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, g_signal_emit (web_view, signals[NEW_TAB], 0, uri); } +static void +midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, + MidoriWebView* web_view) +{ + const gchar* uri = g_object_get_data (G_OBJECT (widget), "uri"); + g_signal_emit (web_view, signals[NEW_WINDOW], 0, uri); +} + static void webkit_web_view_populate_popup_cb (GtkWidget* web_view, GtkWidget* menu) { - const gchar* uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); + const gchar* uri; + GtkWidget* menuitem; + GdkScreen* screen; + GtkIconTheme* icon_theme; + GtkWidget* icon; + gchar* text; + GList* items; + + uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) { - GtkWidget* menuitem = gtk_image_menu_item_new_with_mnemonic ( + menuitem = gtk_image_menu_item_new_with_mnemonic ( _("Open Link in New _Tab")); - GdkScreen* screen = gtk_widget_get_screen (web_view); - GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + screen = gtk_widget_get_screen (web_view); + icon_theme = gtk_icon_theme_get_for_screen (screen); if (gtk_icon_theme_has_icon (icon_theme, STOCK_TAB_NEW)) { - GtkWidget* icon = gtk_image_new_from_stock (STOCK_TAB_NEW, - GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_stock (STOCK_TAB_NEW, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); } gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 1); @@ -451,18 +471,27 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); gtk_widget_show (menuitem); + /* hack to implement New Window */ + items = gtk_container_get_children (GTK_CONTAINER (menu)); + menuitem = (GtkWidget*)g_list_nth_data (items, 2); + g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_new_window_activate_cb), web_view); + menuitem = (GtkWidget*)g_list_nth_data (items, 3); + /* hack to disable non-functional Download File */ + gtk_widget_set_sensitive (menuitem, FALSE); + g_list_free (items); } if (!uri && webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) { - gchar* text = webkit_web_view_get_selected_text ( - WEBKIT_WEB_VIEW (web_view)); + text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); if (text && strchr (text, '.') && !strchr (text, ' ')) { - GtkWidget* menuitem = gtk_image_menu_item_new_with_mnemonic ( + menuitem = gtk_image_menu_item_new_with_mnemonic ( _("Open URL in New _Tab")); - GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, - GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, + GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, -1); g_object_set_data (G_OBJECT (menuitem), "uri", text); @@ -470,7 +499,8 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); gtk_widget_show (menuitem); } - /* FIXME: We are leaking 'text' which is not const but should be. */ + /* text should be const, but it is allocated, so we must free it */ + g_free (text); } } @@ -828,14 +858,14 @@ midori_web_view_tab_close_clicked (GtkWidget* tab_close, * midori_web_view_get_proxy_tab_label: * @web_view: a #MidoriWebView * - * Retrieves a proxy tab label that is typically used as the label of - * a #GtkNotebook page. + * Retrieves a proxy tab label that is typically used as the label + * of a #GtkNotebook page. * - * The label is created on the first call and will be updated to reflect - * changes to the icon and title automatically. + * The label is created on the first call and will be updated to + * reflect changes to the icon and title automatically. * - * The icon embedded in the label will reflect the loading status of the - * web view. + * The icon embedded in the label will reflect the loading status + * of the web view. * * Note: This fails if a proxy tab icon has been created already. * @@ -1029,6 +1059,8 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) * Retrieves an icon associated with the currently loaded URI. If no * icon is available a default icon is used. * + * The pixbuf is newly allocated and should be unreffed after use. + * * Return value: a #GdkPixbuf **/ GdkPixbuf* From 96fef89ece95ad4fa2dd03bf0918c75ae47fec2b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Jul 2008 21:49:57 +0200 Subject: [PATCH 0177/2970] Actually handle non web view tabs, and a View Source tab --- midori/midori-browser.c | 618 ++++++++++++++++++++++++++++++---------- midori/midori-webview.c | 217 +++----------- midori/midori-webview.h | 5 +- midori/sokoke.c | 32 ++- midori/sokoke.h | 112 ++++---- 5 files changed, 608 insertions(+), 376 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 265d297f..7cddb06c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -63,10 +63,10 @@ struct _MidoriBrowser GtkWidget* statusbar; GtkWidget* progressbar; - gchar* uri; - gchar* title; gchar* statusbar_text; MidoriWebSettings* settings; + GList* tab_titles; + GList* close_buttons; KatzeXbelItem* proxy_xbel_folder; MidoriWebList* trash; @@ -145,10 +145,84 @@ _action_set_active (MidoriBrowser* browser, gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); } +static const gchar* +_midori_browser_get_tab_uri (MidoriBrowser* browser, + GtkWidget* widget) +{ + const gchar* uri; + + if (MIDORI_IS_WEB_VIEW (widget)) + return midori_web_view_get_display_uri (MIDORI_WEB_VIEW (widget)); + + uri = g_object_get_data (G_OBJECT (widget), "browser-tab-uri"); + return uri ? uri : "file://"; +} + +/* Note: The return value is valid only + until the next call to this function */ +static const gchar* +_midori_browser_get_tab_title (MidoriBrowser* browser, + GtkWidget* widget) +{ + const gchar* uri; + static gchar* title = NULL; + + if (MIDORI_IS_WEB_VIEW (widget)) + return midori_web_view_get_display_title (MIDORI_WEB_VIEW (widget)); + + uri = g_object_get_data (G_OBJECT (widget), "browser-tab-uri"); + if (g_str_has_prefix (uri, "view-source:")) + { + g_free (title); + title = g_strconcat (_("Source"), ": ", uri, NULL); + return title; + } + return "untitled"; +} + +static GdkPixbuf* +_midori_browser_get_tab_icon (MidoriBrowser* browser, + GtkWidget* widget) +{ + const gchar* uri; + GdkPixbuf* icon; + + if (MIDORI_IS_WEB_VIEW (widget)) + return midori_web_view_get_icon (MIDORI_WEB_VIEW (widget)); + + uri = g_object_get_data (G_OBJECT (widget), "browser-tab-uri"); + if (g_str_has_prefix (uri, "view-source:")) + icon = gtk_widget_render_icon (widget, GTK_STOCK_EDIT, + GTK_ICON_SIZE_MENU, NULL); + else + icon = gtk_widget_render_icon (widget, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); + return icon; +} + +static void +_midori_browser_open_uri (MidoriBrowser* browser, + const gchar* uri) +{ + GtkWidget* web_view; + gint n; + + web_view = midori_browser_get_current_web_view (browser); + if (web_view) + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), uri); + else + { + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); + } +} + static void _midori_browser_update_actions (MidoriBrowser* browser) { - guint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); + guint n; + + n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); _action_set_sensitive (browser, "TabClose", n > 1); _action_set_sensitive (browser, "TabPrevious", n > 1); @@ -166,26 +240,31 @@ static void _midori_browser_update_interface (MidoriBrowser* browser) { gboolean loading; + GtkWidget* widget; GtkWidget* web_view; - GdkPixbuf* pixbuf; + GdkPixbuf* icon; - loading = FALSE; - web_view = midori_browser_get_current_web_view (browser); - if (web_view) - { - loading = midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); - _action_set_sensitive (browser, "ZoomNormal", - webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); - _action_set_sensitive (browser, "Back", - webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Forward", - webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Reload", !loading); - _action_set_sensitive (browser, "Stop", loading); - _action_set_sensitive (browser, "Print", TRUE); - } - else - _action_set_sensitive (browser, "Print", FALSE); + widget = midori_browser_get_current_tab (browser); + web_view = widget && MIDORI_IS_WEB_VIEW (widget) ? widget : NULL; + loading = web_view != NULL + && midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); + + _action_set_sensitive (browser, "Reload", web_view != NULL && !loading); + _action_set_sensitive (browser, "Stop", web_view != NULL && loading); + _action_set_sensitive (browser, "Back", web_view != NULL + && webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "Forward", web_view != NULL + && webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); + + _action_set_sensitive (browser, "Print", web_view != NULL); + _action_set_sensitive (browser, "ZoomIn", web_view != NULL); + _action_set_sensitive (browser, "ZoomOut", web_view != NULL); + _action_set_sensitive (browser, "ZoomNormal", web_view != NULL + && webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); + _action_set_sensitive (browser, "SourceView", web_view != NULL); + _action_set_sensitive (browser, "FindNext", web_view != NULL); + _action_set_sensitive (browser, "FindPrevious", web_view != NULL); + /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ GtkAction* action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); @@ -196,6 +275,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) "stock-id", GTK_STOCK_REFRESH, "tooltip", _("Reload the current page"), NULL); gtk_widget_hide (browser->progressbar); + gtk_action_set_sensitive (action, web_view != NULL); } else { @@ -206,15 +286,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_show (browser->progressbar); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); - if (web_view && MIDORI_IS_WEB_VIEW (web_view)) - { - pixbuf = midori_web_view_get_icon (MIDORI_WEB_VIEW (web_view)); - gtk_image_set_from_pixbuf (GTK_IMAGE (browser->location_icon), pixbuf); - g_object_unref (pixbuf); - } - else - gtk_image_set_from_stock (GTK_IMAGE (browser->location_icon), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + icon = _midori_browser_get_tab_icon (browser, widget); + gtk_image_set_from_pixbuf (GTK_IMAGE (browser->location_icon), icon); + g_object_unref (icon); } static GtkWidget* @@ -419,15 +493,12 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (new_bookmark) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); + GtkWidget* widget = midori_browser_get_current_tab (browser); bookmark = katze_xbel_bookmark_new (); - if (MIDORI_IS_WEB_VIEW (web_view)) - { - katze_xbel_item_set_title (bookmark, - midori_web_view_get_display_title (MIDORI_WEB_VIEW (web_view))); - katze_xbel_bookmark_set_href (bookmark, - midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view))); - } + katze_xbel_item_set_title (bookmark, + _midori_browser_get_tab_title (browser, widget)); + katze_xbel_bookmark_set_href (bookmark, + _midori_browser_get_tab_uri (browser, widget)); } GtkWidget* hbox = gtk_hbox_new (FALSE, 8); @@ -595,9 +666,9 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, } static gboolean -midori_web_view_leave_notify_event_cb (GtkWidget* web_view, - GdkEventCrossing* event, - MidoriBrowser* browser) +midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, + GdkEventCrossing* event, + MidoriBrowser* browser) { _midori_browser_set_statusbar_text (browser, NULL); return TRUE; @@ -620,49 +691,101 @@ midori_web_view_new_window_cb (GtkWidget* web_view, g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); } -static void -midori_web_view_close_cb (GtkWidget* web_view, - MidoriBrowser* browser) +static gboolean +midori_browser_tab_destroy_cb (GtkWidget* widget, + MidoriBrowser* browser) { - if (browser->proxy_xbel_folder) + KatzeXbelItem* xbel_item; + const gchar* uri; + + if (browser->proxy_xbel_folder && MIDORI_IS_WEB_VIEW (widget)) { - KatzeXbelItem* xbel_item = midori_web_view_get_proxy_xbel_item ( - MIDORI_WEB_VIEW (web_view)); - const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); + xbel_item = midori_web_view_get_proxy_xbel_item ( + MIDORI_WEB_VIEW (widget)); + uri = katze_xbel_bookmark_get_href (xbel_item); if (browser->trash && uri && *uri) midori_web_list_add_item (browser->trash, xbel_item); katze_xbel_folder_remove_item (browser->proxy_xbel_folder, xbel_item); katze_xbel_item_unref (xbel_item); } - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); + GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); guint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); gtk_notebook_remove_page (GTK_NOTEBOOK (browser->notebook), n); _midori_browser_update_actions (browser); -} - -static gboolean -midori_web_view_destroy_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - _midori_browser_update_actions (browser); return FALSE; } static void -midori_browser_window_menu_item_activate_cb (GtkWidget* widget, - GtkWidget* web_view) +midori_browser_window_menu_item_activate_cb (GtkWidget* menuitem, + GtkWidget* widget) { - MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (web_view)); - if (!browser) + MidoriBrowser* browser; + GtkWidget* scrolled; + guint n; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + + browser = MIDORI_BROWSER (gtk_widget_get_toplevel (widget)); + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + + scrolled = _midori_browser_scrolled_for_child (browser, widget); + n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); +} + +static void +_update_label_size (GtkWidget* label, + gint size) +{ + gint width, height; + + if (size > -1) { - g_warning ("Orphaned web view"); - return; + sokoke_widget_get_text_size (label, "M", &width, &height); + gtk_widget_set_size_request (label, width * size, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + } + else + { + gtk_widget_set_size_request (label, -1, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); + } +} + +static gboolean +midori_browser_tab_label_button_release_event (GtkWidget* tab_label, + GdkEventButton* event, + GtkWidget* widget) +{ + if (event->button == 2) + { + /* Close the widget on middle click */ + gtk_widget_destroy (widget); + return TRUE; } - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, web_view); - guint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); - gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); + return FALSE; +} + +static void +midori_browser_tab_close_style_set (GtkWidget* tab_close, + GtkStyle* previous_style) +{ + GtkSettings* gtk_settings; + gint width, height; + + gtk_settings = gtk_widget_get_settings (tab_close); + gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_BUTTON, + &width, &height); + gtk_widget_set_size_request (tab_close, width + 2, height + 2); +} + +static void +midori_browser_tab_close_clicked (GtkWidget* tab_close, + GtkWidget* widget) +{ + gtk_widget_destroy (widget); } static gint @@ -672,9 +795,17 @@ _midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* scrolled; GtkWidget* child; GObjectClass* gobject_class; - GtkWidget* label; + GdkPixbuf* icon; + GtkWidget* tab_icon; + const gchar* title; + GtkWidget* tab_title; GtkWidget* menuitem; KatzeXbelItem* xbel_item; + GtkWidget* event_box; + GtkWidget* hbox; + GtkWidget* close_button; + GtkRcStyle* rcstyle; + GtkWidget* image; guint n; scrolled = gtk_scrolled_window_new (NULL, NULL); @@ -694,11 +825,10 @@ _midori_browser_add_tab (MidoriBrowser* browser, gtk_container_add (GTK_CONTAINER (scrolled), child); gtk_widget_show (scrolled); - label = NULL; - menuitem = NULL; if (MIDORI_IS_WEB_VIEW (widget)) { - label = midori_web_view_get_proxy_tab_label (MIDORI_WEB_VIEW (widget)); + tab_icon = midori_web_view_get_proxy_tab_icon (MIDORI_WEB_VIEW (widget)); + tab_title = midori_web_view_get_proxy_tab_title (MIDORI_WEB_VIEW (widget)); menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); if (browser->proxy_xbel_folder) @@ -732,38 +862,93 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_web_view_element_motion_cb, browser, "signal::console-message", midori_web_view_console_message_cb, browser, - "signal::close", - midori_web_view_close_cb, browser, "signal::new-tab", midori_web_view_new_tab_cb, browser, "signal::new-window", midori_web_view_new_window_cb, browser, "signal::populate-popup", midori_web_view_populate_popup_cb, browser, - "signal::leave-notify-event", - midori_web_view_leave_notify_event_cb, browser, - "signal::destroy", - midori_web_view_destroy_cb, browser, NULL); } - - if (menuitem) + else { - gtk_widget_show (menuitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); - gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); + icon = _midori_browser_get_tab_icon (browser, widget); + tab_icon = gtk_image_new_from_pixbuf (icon); + title = _midori_browser_get_tab_title (browser, widget); + tab_title = gtk_label_new (title); + menuitem = gtk_image_menu_item_new_with_label (title); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_new_from_pixbuf (icon)); + g_object_unref (icon); + + if (browser->proxy_xbel_folder) + { + xbel_item = katze_xbel_bookmark_new (); + katze_xbel_item_set_title (xbel_item, title); + katze_xbel_bookmark_set_href (xbel_item, + _midori_browser_get_tab_uri (browser, widget)); + katze_xbel_folder_append_item (browser->proxy_xbel_folder, + xbel_item); + } } + browser->tab_titles = g_list_prepend (browser->tab_titles, tab_title); + + g_signal_connect (widget, "leave-notify-event", + G_CALLBACK (midori_browser_tab_leave_notify_event_cb), browser); + + event_box = gtk_event_box_new (); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); + hbox = gtk_hbox_new (FALSE, 1); + gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); + gtk_box_pack_start (GTK_BOX (hbox), tab_icon, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (tab_title), 0.0, 0.5); + /* TODO: make the tab initially look "unvisited" until it's focused */ + gtk_box_pack_start (GTK_BOX (hbox), tab_title, FALSE, TRUE, 0); + _update_label_size (tab_title, + sokoke_object_get_int (browser->settings, "tab-label-size")); + + close_button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style(close_button, rcstyle); + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (close_button), image); + gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_WIDGET (event_box)); + if (!sokoke_object_get_boolean (browser->settings, "close-buttons-on-tabs")) + gtk_widget_hide (close_button); + browser->close_buttons = g_list_prepend (browser->close_buttons, close_button); + + g_signal_connect (event_box, "button-release-event", + G_CALLBACK (midori_browser_tab_label_button_release_event), widget); + g_signal_connect (close_button, "style-set", + G_CALLBACK (midori_browser_tab_close_style_set), NULL); + g_signal_connect (close_button, "clicked", + G_CALLBACK (midori_browser_tab_close_clicked), widget); n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), scrolled, - label, n + 1); + event_box, n + 1); #if GTK_CHECK_VERSION(2, 10, 0) gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook), scrolled, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (browser->notebook), scrolled, TRUE); #endif + + gtk_widget_show (menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); + gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); + + /* We want the tab to be removed if the widget is destroyed */ + g_signal_connect_swapped (widget, "destroy", + G_CALLBACK (gtk_widget_destroy), menuitem); + g_signal_connect (widget, "destroy", + G_CALLBACK (midori_browser_tab_destroy_cb), browser); + _midori_browser_update_actions (browser); n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); @@ -1138,7 +1323,9 @@ _action_open_activate (GtkAction* action, static gchar* last_dir = NULL; gchar* uri = NULL; gboolean folder_set = FALSE; - GtkWidget* dialog = gtk_file_chooser_dialog_new ( + GtkWidget* dialog; + + dialog = gtk_file_chooser_dialog_new ( ("Open file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -1148,10 +1335,8 @@ _action_open_activate (GtkAction* action, gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); /* base the start folder on the current web view's uri if it is local */ - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view) - g_object_get (web_view, "uri", &uri, NULL); - if (uri) + GtkWidget* widget = midori_browser_get_current_tab (browser); + if ((uri = (gchar*)_midori_browser_get_tab_uri (browser, widget))) { gchar* filename = g_filename_from_uri (uri, NULL, NULL); if (filename) @@ -1166,7 +1351,6 @@ _action_open_activate (GtkAction* action, g_free (dirname); g_free (filename); } - g_free (uri); } if (!folder_set && last_dir && *last_dir) @@ -1176,7 +1360,7 @@ _action_open_activate (GtkAction* action, { uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); gchar* folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); - g_object_set (web_view, "uri", uri, NULL); + _midori_browser_open_uri (browser, uri); g_free (last_dir); last_dir = folder; @@ -1190,8 +1374,7 @@ _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* widget = midori_browser_get_current_tab (browser); - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); - gtk_widget_destroy (scrolled); + gtk_widget_destroy (widget); } static void @@ -1223,7 +1406,7 @@ _action_edit_activate (GtkAction* action, { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE; - gboolean has_selection; + gboolean has_selection, can_select_all = FALSE; if (WEBKIT_IS_WEB_VIEW (widget)) { @@ -1231,6 +1414,7 @@ _action_edit_activate (GtkAction* action, can_cut = webkit_web_view_can_cut_clipboard (web_view); can_copy = webkit_web_view_can_copy_clipboard (web_view); can_paste = webkit_web_view_can_paste_clipboard (web_view); + can_select_all = TRUE; } else if (GTK_IS_EDITABLE (widget)) { @@ -1239,13 +1423,24 @@ _action_edit_activate (GtkAction* action, can_cut = has_selection && gtk_editable_get_editable (editable); can_copy = has_selection; can_paste = gtk_editable_get_editable (editable); + can_select_all = TRUE; + } + else if (GTK_IS_TEXT_VIEW (widget)) + { + GtkTextView* text_view = GTK_TEXT_VIEW (widget); + GtkTextBuffer* buffer = gtk_text_view_get_buffer (text_view); + has_selection = gtk_text_buffer_get_has_selection (buffer); + can_cut = gtk_text_view_get_editable (text_view); + can_copy = has_selection; + can_paste = gtk_text_view_get_editable (text_view) && has_selection; + can_select_all = TRUE; } _action_set_sensitive (browser, "Cut", can_cut); _action_set_sensitive (browser, "Copy", can_copy); _action_set_sensitive (browser, "Paste", can_paste); _action_set_sensitive (browser, "Delete", can_cut); - _action_set_sensitive (browser, "SelectAll", FALSE); + _action_set_sensitive (browser, "SelectAll", can_select_all); } static void @@ -1284,8 +1479,11 @@ _action_delete_activate (GtkAction* action, { if (WEBKIT_IS_WEB_VIEW (widget)) webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget)); - else if (GTK_IS_EDITABLE(widget)) + else if (GTK_IS_EDITABLE (widget)) gtk_editable_delete_selection (GTK_EDITABLE (widget)); + else if (GTK_IS_TEXT_VIEW (widget)) + gtk_text_buffer_delete_selection ( + gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), TRUE, FALSE); } } @@ -1299,18 +1497,60 @@ _action_select_all_activate (GtkAction* action, if (GTK_IS_EDITABLE (widget)) gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); else - g_signal_emit_by_name (widget, "select-all"); + g_signal_emit_by_name (widget, "select-all", TRUE); } } +static void +_midori_browser_tab_unmark_text_matches (MidoriBrowser* browser, + GtkWidget* widget) +{ + if (WEBKIT_IS_WEB_VIEW (widget)) + webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (widget)); +} + +static gboolean +_midori_browser_tab_search_text (MidoriBrowser* browser, + GtkWidget* widget, + const gchar* text, + gboolean case_sensitive, + gboolean forward) +{ + if (WEBKIT_IS_WEB_VIEW (widget)) + return webkit_web_view_search_text (WEBKIT_WEB_VIEW (widget), + text, case_sensitive, forward, TRUE); + return FALSE; +} + +static void +_midori_browser_tab_mark_text_matches (MidoriBrowser* browser, + GtkWidget* widget, + const gchar* text, + gboolean case_sensitive) +{ + if (WEBKIT_IS_WEB_VIEW (widget)) + webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (widget), + text, case_sensitive, 0); +} + +static void +_midori_browser_tab_set_highlight_text_matches (MidoriBrowser* browser, + GtkWidget* widget, + gboolean highlight) +{ + if (WEBKIT_IS_WEB_VIEW (widget)) + webkit_web_view_set_highlight_text_matches ( + WEBKIT_WEB_VIEW (widget), highlight); +} + static void _action_find_activate(GtkAction* action, MidoriBrowser* browser) { if (GTK_WIDGET_VISIBLE (browser->find)) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (web_view)); + GtkWidget* widget = midori_browser_get_current_tab (browser); + _midori_browser_tab_unmark_text_matches (browser, widget); gtk_toggle_tool_button_set_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight), FALSE); gtk_widget_hide (browser->find); @@ -1334,11 +1574,11 @@ _midori_browser_find (MidoriBrowser* browser, const gchar* text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); const gboolean case_sensitive = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON(browser->find_case)); - GtkWidget* web_view = midori_browser_get_current_web_view (browser); + GtkWidget* widget = midori_browser_get_current_tab (browser); if (GTK_WIDGET_VISIBLE (browser->find)) - webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (web_view)); - gboolean found = webkit_web_view_search_text (WEBKIT_WEB_VIEW (web_view), - text, case_sensitive, forward, TRUE); + _midori_browser_tab_unmark_text_matches (browser, widget); + gboolean found = _midori_browser_tab_search_text (browser, widget, + text, case_sensitive, forward); if (GTK_WIDGET_VISIBLE (browser->find)) { GtkWidget* icon; @@ -1348,12 +1588,12 @@ _midori_browser_find (MidoriBrowser* browser, icon = gtk_image_new_from_stock (GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->find_text), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); - webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (web_view), text, - case_sensitive, 0); + _midori_browser_tab_mark_text_matches (browser, widget, + text, case_sensitive); const gboolean highlight = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight)); - webkit_web_view_set_highlight_text_matches (WEBKIT_WEB_VIEW (web_view), - highlight); + _midori_browser_tab_set_highlight_text_matches (browser, widget, + highlight); } } @@ -1375,10 +1615,10 @@ static void _find_highlight_toggled (GtkToggleToolButton* toolitem, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); + GtkWidget* widget = midori_browser_get_current_tab (browser); const gboolean highlight = gtk_toggle_tool_button_get_active (toolitem); - webkit_web_view_set_highlight_text_matches (WEBKIT_WEB_VIEW (web_view), - highlight); + _midori_browser_tab_set_highlight_text_matches (browser, widget, + highlight); } static void @@ -1550,15 +1790,53 @@ _action_zoom_normal_activate (GtkAction* action, webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); } -/*static void +static void _action_source_view_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - gchar* source = webkit_web_view_copy_source (WEBKIT_WEB_VIEW (web_view)); - webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (web_view), source, ""); - g_free (source); -}*/ + GtkWidget* web_view; + const gchar* uri; + GFile* file; + gchar* contents; + gchar* tag; + gchar* contents_utf8; + GtkTextBuffer* buffer; + GtkWidget* text_view; + gint n; + + web_view = midori_browser_get_current_web_view (browser); + if (!(web_view && MIDORI_IS_WEB_VIEW (web_view))) + return; + + uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + file = g_file_new_for_uri (uri); + contents = NULL; + g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL); + g_object_unref (file); + if (contents && !g_utf8_validate (contents, -1, NULL)) + { + contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", + NULL, NULL, NULL); + g_free (contents); + } + else + contents_utf8 = contents; + + buffer = gtk_text_buffer_new (NULL); + if (contents_utf8) + gtk_text_buffer_set_text (buffer, contents_utf8, -1); + text_view = gtk_text_view_new_with_buffer (buffer); + gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE); + g_object_set_data (G_OBJECT (text_view), "browser-tab-uri", + g_strconcat ("view-source:", uri, NULL)); + gtk_widget_show (text_view); + n = midori_browser_add_tab (browser, text_view); + midori_browser_set_current_page (browser, n); + + g_object_unref (buffer); + g_free (contents_utf8); + g_free (tag); +} static void _action_fullscreen_activate (GtkAction* action, @@ -1593,9 +1871,8 @@ _action_homepage_activate (GtkAction* action, { gchar* homepage; - GtkWidget* web_view = midori_browser_get_current_web_view (browser); g_object_get (browser->settings, "homepage", &homepage, NULL); - g_object_set (web_view, "uri", homepage, NULL); + _midori_browser_open_uri (browser, homepage); g_free (homepage); } @@ -1627,18 +1904,16 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, Completion should be generated from history, that is the uri as well as the title. */ sokoke_entry_append_completion (GTK_ENTRY (widget), uri); - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - g_object_set (web_view, "uri", new_uri, NULL); + _midori_browser_open_uri (browser, new_uri); g_free (new_uri); - gtk_widget_grab_focus (web_view); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } return TRUE; } case GDK_Escape: { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - const gchar* uri = midori_web_view_get_display_uri ( - MIDORI_WEB_VIEW (web_view)); + const gchar* uri = _midori_browser_get_tab_uri ( + browser, midori_browser_get_current_tab (browser)); gtk_entry_set_text (GTK_ENTRY (widget), uri); return TRUE; } @@ -1712,9 +1987,8 @@ midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); const gchar* uri = katze_xbel_bookmark_get_href (item); - g_object_set (web_view, "uri", uri, NULL); + _midori_browser_open_uri (browser, uri); } } } @@ -1930,9 +2204,8 @@ midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, { KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data (G_OBJECT (widget), "KatzeXbelItem"); - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - g_object_set (web_view, "uri", katze_xbel_bookmark_get_href (item), NULL); - gtk_widget_grab_focus (web_view); + _midori_browser_open_uri (browser, katze_xbel_bookmark_get_href (item)); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } static void @@ -2084,8 +2357,8 @@ static void _action_open_in_panel_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + GtkWidget* widget = midori_browser_get_current_tab (browser); + const gchar* uri = _midori_browser_get_tab_uri (browser, widget); /* FIXME: Don't assign the uri here, update it properly while navigating */ g_object_set (browser->settings, "last-pageholder-uri", uri, NULL); gint n = midori_panel_page_num (MIDORI_PANEL (browser->panel), @@ -2114,18 +2387,22 @@ midori_panel_close_cb (MidoriPanel* panel, } static void -gtk_notebook_switch_page_cb (GtkWidget* widget, +gtk_notebook_switch_page_cb (GtkWidget* notebook, GtkNotebookPage* page, guint page_num, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + GtkWidget* widget; + const gchar* uri; + const gchar* title; + gchar* window_title; + + widget = midori_browser_get_current_tab (browser); + uri = _midori_browser_get_tab_uri (browser, widget); gtk_entry_set_text (GTK_ENTRY (browser->location), uri); - const gchar* title = midori_web_view_get_display_title ( - MIDORI_WEB_VIEW (web_view)); - gchar* window_title = g_strconcat (title, " - ", - g_get_application_name (), NULL); + title = _midori_browser_get_tab_title (browser, widget); + window_title = g_strconcat (title, " - ", + g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); _midori_browser_set_statusbar_text (browser, NULL); @@ -2356,8 +2633,8 @@ static const GtkActionEntry entries[] = { NULL, "0", N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) }, { "SourceView", NULL, - N_("View Source"), "", - N_("View the source code of the page"), /*G_CALLBACK (_action_source_view_activate)*/ }, + N_("View _Source"), "", + N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, { "SelectionSourceView", NULL, N_("View Selection Source"), "", N_("View the source code of the selection"), NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, @@ -2692,8 +2969,7 @@ midori_browser_search_activate_cb (GtkWidget* widget, else search = g_strconcat (url, " ", keywords, NULL); sokoke_entry_append_completion (GTK_ENTRY (widget), keywords); - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), search); + _midori_browser_open_uri (browser, search); g_free (search); g_free (location_entry_search); } @@ -3067,20 +3343,24 @@ midori_browser_init (MidoriBrowser* browser) GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); sexy_icon_entry_set_icon (SEXY_ICON_ENTRY(browser->find_text), - SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE(icon)); - sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY(browser->find_text)); + SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); + sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (browser->find_text)); g_signal_connect (browser->find_text, "activate", G_CALLBACK (_action_find_next_activate), browser); toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); gtk_toolbar_insert (GTK_TOOLBAR(browser->find), toolitem, -1); - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK); + toolitem = (GtkToolItem*)gtk_action_create_tool_item + (_action_by_name (browser, "FindPrevious")); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (_action_find_previous_activate), browser); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); + toolitem = (GtkToolItem*)gtk_action_create_tool_item + (_action_by_name (browser, "FindNext")); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (_action_find_next_activate), browser); @@ -3136,6 +3416,9 @@ midori_browser_init (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomIn", FALSE); _action_set_sensitive (browser, "ZoomOut", FALSE); #endif + + browser->tab_titles = NULL; + browser->close_buttons = NULL; } static void @@ -3143,9 +3426,9 @@ midori_browser_finalize (GObject* object) { MidoriBrowser* browser = MIDORI_BROWSER (object); - g_free (browser->uri); - g_free (browser->title); g_free (browser->statusbar_text); + g_list_free (browser->tab_titles); + g_list_free (browser->close_buttons); if (browser->proxy_xbel_folder) katze_xbel_item_unref (browser->proxy_xbel_folder); @@ -3204,6 +3487,10 @@ _midori_browser_update_settings (MidoriBrowser* browser) MidoriToolbarStyle toolbar_style; gint last_web_search; gchar* last_pageholder_uri; + gint tab_label_size; + gboolean close_buttons_on_tabs; + + guint i, n; g_object_get (browser->settings, "remember-last-window-size", &remember_last_window_size, @@ -3223,6 +3510,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) "toolbar-style", &toolbar_style, "last-web-search", &last_web_search, "last-pageholder-uri", &last_pageholder_uri, + "tab-label-size", &tab_label_size, + "close-buttons-on-tabs", &close_buttons_on_tabs, NULL); GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (browser)); @@ -3268,6 +3557,16 @@ _midori_browser_update_settings (MidoriBrowser* browser) sokoke_widget_set_visible (browser->search, show_web_search); sokoke_widget_set_visible (browser->button_trash, show_trash); + /* We assume that tab_titles has the same length as close_buttons */ + n = g_list_length (browser->tab_titles); + for (i = 0; i < n; i++) + { + _update_label_size (g_list_nth_data (browser->tab_titles, i), + tab_label_size); + sokoke_widget_set_visible (g_list_nth_data (browser->close_buttons, i), + close_buttons_on_tabs); + } + g_free (last_pageholder_uri); } @@ -3276,9 +3575,12 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, GParamSpec* pspec, MidoriBrowser* browser) { - const gchar* name = g_intern_string (pspec->name); + const gchar* name; GValue value = {0, }; + guint i; + guint n; + name = g_intern_string (pspec->name); g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (browser->settings), name, &value); @@ -3300,6 +3602,20 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, else if (name == g_intern_string ("show-trash")) sokoke_widget_set_visible (browser->button_trash, g_value_get_boolean (&value)); + else if (name == g_intern_string ("tab-label-size")) + { + n = g_list_length (browser->tab_titles); + for (i = 0; i < n; i++) + _update_label_size (g_list_nth_data (browser->tab_titles, i), + g_value_get_int (&value)); + } + else if (name == g_intern_string ("close-buttons-on-tabs")) + { + n = g_list_length (browser->close_buttons); + for (i = 0; i < n; i++) + sokoke_widget_set_visible (g_list_nth_data (browser->close_buttons, i), + g_value_get_boolean (&value)); + } else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); @@ -3542,9 +3858,7 @@ midori_browser_set_current_page (MidoriBrowser* browser, gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); GtkWidget* widget = _midori_browser_child_for_scrolled (browser, scrolled); - if (widget && MIDORI_IS_WEB_VIEW (widget) - && !strcmp (midori_web_view_get_display_uri ( - MIDORI_WEB_VIEW (widget)), "")) + if (widget && !strcmp (_midori_browser_get_tab_uri (browser, widget), "")) gtk_widget_grab_focus (browser->location); else gtk_widget_grab_focus (widget); @@ -3584,9 +3898,7 @@ midori_browser_set_current_tab (MidoriBrowser* browser, GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); gint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); - if (widget && MIDORI_IS_WEB_VIEW (widget) - && !strcmp (midori_web_view_get_display_uri ( - MIDORI_WEB_VIEW (widget)), "")) + if (widget && !strcmp (_midori_browser_get_tab_uri (browser, widget), "")) gtk_widget_grab_focus (browser->location); else gtk_widget_grab_focus (widget); diff --git a/midori/midori-webview.c b/midori/midori-webview.c index cb56c3d5..b99d4e36 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -29,9 +29,6 @@ struct _MidoriWebView { WebKitWebView parent_instance; - GtkWidget* tab_icon; - GtkWidget* tab_label; - GtkWidget* tab_close; gchar* uri; gchar* title; gboolean is_loading; @@ -39,14 +36,13 @@ struct _MidoriWebView gchar* statusbar_text; gchar* link_uri; - gint tab_label_size; - gboolean close_button; gboolean middle_click_opens_selection; MidoriWebSettings* settings; - GtkWidget* proxy_menu_item; - GtkWidget* proxy_tab_label; - KatzeXbelItem* proxy_xbel_item; + GtkWidget* menu_item; + GtkWidget* tab_icon; + GtkWidget* tab_title; + KatzeXbelItem* xbel_item; }; G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) @@ -68,7 +64,6 @@ enum { PROGRESS_DONE, LOAD_DONE, ELEMENT_MOTION, - CLOSE, NEW_TAB, NEW_WINDOW, @@ -150,16 +145,6 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); - signals[CLOSE] = g_signal_new ( - "close", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriWebViewClass, close), - 0, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[NEW_TAB] = g_signal_new ( "new-tab", G_TYPE_FROM_CLASS (class), @@ -235,10 +220,10 @@ _midori_web_view_set_uri (MidoriWebView* web_view, const gchar* uri) { katze_assign (web_view->uri, g_strdup (uri)); - if (web_view->proxy_xbel_item) + if (web_view->xbel_item) { const gchar* uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (web_view->proxy_xbel_item, uri); + katze_xbel_bookmark_set_href (web_view->xbel_item, uri); } g_object_set (web_view, "title", NULL, NULL); } @@ -504,36 +489,10 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, } } -static void -_midori_web_view_update_tab_label_size (MidoriWebView* web_view) -{ - if (web_view->tab_label) - { - if (web_view->tab_label_size > -1) - { - gint width, height; - sokoke_widget_get_text_size (web_view->tab_label, "M", - &width, &height); - gtk_widget_set_size_request (web_view->tab_label, - width * web_view->tab_label_size, -1); - gtk_label_set_ellipsize (GTK_LABEL (web_view->tab_label), - PANGO_ELLIPSIZE_END); - } - else - { - gtk_widget_set_size_request (web_view->tab_label, -1, -1); - gtk_label_set_ellipsize (GTK_LABEL (web_view->tab_label), - PANGO_ELLIPSIZE_NONE); - } - } -} - static void _midori_web_view_update_settings (MidoriWebView* web_view) { g_object_get (G_OBJECT (web_view->settings), - "tab-label-size", &web_view->tab_label_size, - "close-buttons-on-tabs", &web_view->close_button, "middle-click-opens-selection", &web_view->middle_click_opens_selection, NULL); } @@ -548,18 +507,7 @@ midori_web_view_settings_notify (MidoriWebSettings* web_settings, g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (web_view->settings), name, &value); - if (name == g_intern_string ("tab-label-size")) - { - web_view->tab_label_size = g_value_get_int (&value); - _midori_web_view_update_tab_label_size (web_view); - } - else if (name == g_intern_string ("close-buttons-on-tabs")) - { - web_view->close_button = g_value_get_boolean (&value); - if (web_view->tab_close) - sokoke_widget_set_visible (web_view->tab_close, web_view->close_button); - } - else if (name == g_intern_string ("middle-click-opens-selection")) + if (name == g_intern_string ("middle-click-opens-selection")) web_view->middle_click_opens_selection = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) @@ -626,10 +574,8 @@ midori_web_view_finalize (GObject* object) g_free (web_view->statusbar_text); g_free (web_view->link_uri); - if (web_view->proxy_menu_item) - gtk_widget_destroy (web_view->proxy_menu_item); - if (web_view->proxy_xbel_item) - katze_xbel_item_unref (web_view->proxy_xbel_item); + if (web_view->xbel_item) + katze_xbel_item_unref (web_view->xbel_item); if (web_view->settings) { @@ -665,16 +611,16 @@ midori_web_view_set_property (GObject* object, case PROP_TITLE: katze_assign (web_view->title, g_value_dup_string (value)); const gchar* title = midori_web_view_get_display_title (web_view); - if (web_view->tab_label) + if (web_view->tab_title) { - gtk_label_set_text (GTK_LABEL (web_view->tab_label), title); - gtk_widget_set_tooltip_text (web_view->tab_label, title); + gtk_label_set_text (GTK_LABEL (web_view->tab_title), title); + gtk_widget_set_tooltip_text (web_view->tab_title, title); } - if (web_view->proxy_menu_item) + if (web_view->menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( - web_view->proxy_menu_item))), title); - if (web_view->proxy_xbel_item) - katze_xbel_item_set_title (web_view->proxy_xbel_item, title); + web_view->menu_item))), title); + if (web_view->xbel_item) + katze_xbel_item_set_title (web_view->xbel_item, title); break; case PROP_SETTINGS: g_signal_handlers_disconnect_by_func (web_view->settings, @@ -774,7 +720,7 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); - if (!web_view->proxy_menu_item) + if (!web_view->menu_item) { title = midori_web_view_get_display_title (web_view); menu_item = gtk_image_menu_item_new_with_label (title); @@ -783,9 +729,9 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) gtk_image_new_from_pixbuf (icon)); g_object_unref (icon); - web_view->proxy_menu_item = menu_item; + web_view->menu_item = menu_item; } - return web_view->proxy_menu_item; + return web_view->menu_item; } /** @@ -816,115 +762,43 @@ midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), icon); g_object_unref (icon); + + g_signal_connect (web_view->tab_icon, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &web_view->tab_icon); } return web_view->tab_icon; } -static gboolean -midori_web_view_tab_label_button_release_event (GtkWidget* tab_label, - GdkEventButton* event, - MidoriWebView* web_view) -{ - if (event->button == 2) - { - /* Close the web view on middle click */ - g_signal_emit (web_view, signals[CLOSE], 0); - return TRUE; - } - - return FALSE; -} - -static void -midori_web_view_tab_close_style_set (GtkWidget* tab_close, - GtkStyle* previous_style, - MidoriWebView* web_view) -{ - GtkSettings* gtk_settings = gtk_widget_get_settings (tab_close); - gint width, height; - gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_BUTTON, - &width, &height); - gtk_widget_set_size_request (tab_close, width + 2, height + 2); -} - -static void -midori_web_view_tab_close_clicked (GtkWidget* tab_close, - MidoriWebView* web_view) -{ - g_signal_emit (web_view, signals[CLOSE], 0); -} - /** - * midori_web_view_get_proxy_tab_label: + * midori_web_view_get_proxy_tab_title: * @web_view: a #MidoriWebView * - * Retrieves a proxy tab label that is typically used as the label + * Retrieves a proxy tab title that is typically used as the label * of a #GtkNotebook page. * - * The label is created on the first call and will be updated to - * reflect changes to the icon and title automatically. + * The title is created on the first call and will be updated to + * reflect changes automatically. * - * The icon embedded in the label will reflect the loading status - * of the web view. - * - * Note: This fails if a proxy tab icon has been created already. - * - * Return value: the proxy #GtkEventBox + * Return value: the proxy #GtkLabel **/ GtkWidget* -midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) +midori_web_view_get_proxy_tab_title (MidoriWebView* web_view) { + const gchar* title; + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - GtkWidget* proxy_tab_icon = web_view->tab_icon; - g_return_val_if_fail (!proxy_tab_icon, NULL); - - if (!web_view->proxy_tab_label) + if (!web_view->tab_title) { - web_view->tab_icon = midori_web_view_get_proxy_tab_icon (web_view); + title = midori_web_view_get_display_title (web_view); + web_view->tab_title = gtk_label_new (title); - GtkWidget* event_box = gtk_event_box_new (); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); - GtkWidget* hbox = gtk_hbox_new (FALSE, 1); - gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - gtk_box_pack_start (GTK_BOX (hbox), web_view->tab_icon, FALSE, FALSE, 0); - const gchar* title = midori_web_view_get_display_title (web_view); - web_view->tab_label = gtk_label_new (title); - gtk_misc_set_alignment (GTK_MISC (web_view->tab_label), 0.0, 0.5); - /* TODO: make the tab initially look "unvisited" until it's focused */ - gtk_box_pack_start (GTK_BOX (hbox), web_view->tab_label, FALSE, TRUE, 0); - web_view->proxy_tab_label = event_box; - _midori_web_view_update_tab_label_size (web_view); - - GtkWidget* close_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); - GtkRcStyle* rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style(close_button, rcstyle); - GtkWidget* image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, - GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON(close_button), image); - gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); - gtk_widget_show_all (GTK_WIDGET (event_box)); - if (!web_view->close_button) - gtk_widget_hide (close_button); - web_view->tab_close = close_button; - - g_signal_connect (web_view->proxy_tab_label, "button-release-event", - G_CALLBACK (midori_web_view_tab_label_button_release_event), - web_view); - g_signal_connect (web_view->tab_icon, "destroy", + g_signal_connect (web_view->tab_title, "destroy", G_CALLBACK (gtk_widget_destroyed), - &web_view->tab_icon); - g_signal_connect (web_view->tab_close, "style-set", - G_CALLBACK (midori_web_view_tab_close_style_set), - web_view); - g_signal_connect (web_view->tab_close, "clicked", - G_CALLBACK (midori_web_view_tab_close_clicked), - web_view); + &web_view->tab_title); } - return web_view->proxy_tab_label; + return web_view->tab_title; } /** @@ -945,17 +819,20 @@ midori_web_view_get_proxy_tab_label (MidoriWebView* web_view) KatzeXbelItem* midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view) { + const gchar* uri; + const gchar* title; + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - if (!web_view->proxy_xbel_item) + if (!web_view->xbel_item) { - web_view->proxy_xbel_item = katze_xbel_bookmark_new (); - const gchar* uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (web_view->proxy_xbel_item, uri); - const gchar* title = midori_web_view_get_display_title (web_view); - katze_xbel_item_set_title (web_view->proxy_xbel_item, title); + web_view->xbel_item = katze_xbel_bookmark_new (); + uri = midori_web_view_get_display_uri (web_view); + katze_xbel_bookmark_set_href (web_view->xbel_item, uri); + title = midori_web_view_get_display_title (web_view); + katze_xbel_item_set_title (web_view->xbel_item, title); } - return web_view->proxy_xbel_item; + return web_view->xbel_item; } /** diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 91491a89..52e32dde 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -79,7 +79,10 @@ GtkWidget* midori_web_view_get_proxy_menu_item (MidoriWebView* web_view); GtkWidget* -midori_web_view_get_proxy_tab_label (MidoriWebView* web_view); +midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view); + +GtkWidget* +midori_web_view_get_proxy_tab_title (MidoriWebView* web_view); KatzeXbelItem* midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view); diff --git a/midori/sokoke.c b/midori/sokoke.c index 49896e2a..e267eed1 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -503,10 +503,12 @@ sokoke_web_icon (const gchar* icon, else { gint width, height; - gtk_icon_size_lookup (size, &width, &height); if (gtk_widget_has_screen (widget)) { GdkScreen* screen = gtk_widget_get_screen (widget); + gtk_icon_size_lookup_for_settings ( + gtk_settings_get_for_screen (screen), + size, &width, &height); pixbuf = gtk_icon_theme_load_icon ( gtk_icon_theme_get_for_screen (screen), icon, MAX (width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); @@ -519,3 +521,31 @@ sokoke_web_icon (const gchar* icon, pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FIND, size, NULL); return pixbuf; } + +gint +sokoke_object_get_int (gpointer object, + const gchar* property) +{ + gint value; + + g_return_val_if_fail (object != NULL, FALSE); + g_return_val_if_fail (G_IS_OBJECT (object), FALSE); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} + +gboolean +sokoke_object_get_boolean (gpointer object, + const gchar* property) +{ + gboolean value; + + g_return_val_if_fail (object != NULL, FALSE); + g_return_val_if_fail (G_IS_OBJECT (object), FALSE); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index a2b14afc..c4cbbce0 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -20,15 +20,15 @@ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON gchar* -sokoke_magic_uri (const gchar* uri, - MidoriWebList* search_engines); +sokoke_magic_uri (const gchar* uri, + MidoriWebList* search_engines); void -sokoke_entry_setup_completion (GtkEntry* entry); +sokoke_entry_setup_completion (GtkEntry* entry); void -sokoke_entry_append_completion (GtkEntry* entry, - const gchar* text); +sokoke_entry_append_completion (GtkEntry* entry, + const gchar* text); typedef enum { SOKOKE_MENU_POSITION_CURSOR = 0, @@ -37,81 +37,91 @@ typedef enum { } SokokeMenuPos; void -sokoke_combo_box_add_strings (GtkComboBox* combobox, - const gchar* label_first, ...); +sokoke_combo_box_add_strings (GtkComboBox* combobox, + const gchar* label_first, + ...); void -sokoke_widget_set_visible (GtkWidget* widget, - gboolean visible); +sokoke_widget_set_visible (GtkWidget* widget, + gboolean visible); void -sokoke_container_show_children (GtkContainer* container); +sokoke_container_show_children (GtkContainer* container); void -sokoke_widget_popup (GtkWidget* widget, - GtkMenu* menu, - GdkEventButton* event, - SokokeMenuPos pos); +sokoke_widget_popup (GtkWidget* widget, + GtkMenu* menu, + GdkEventButton* event, + SokokeMenuPos pos); GtkWidget* -sokoke_xfce_header_new (const gchar* icon, - const gchar* title); +sokoke_xfce_header_new (const gchar* icon, + const gchar* title); GtkWidget* -sokoke_superuser_warning_new (void); +sokoke_superuser_warning_new (void); GtkWidget* -sokoke_hig_frame_new (const gchar* title); +sokoke_hig_frame_new (const gchar* title); void -sokoke_widget_set_pango_font_style (GtkWidget* widget, - PangoStyle style); +sokoke_widget_set_pango_font_style (GtkWidget* widget, + PangoStyle style); void -sokoke_entry_set_default_text(GtkEntry*, const gchar*); +sokoke_entry_set_default_text (GtkEntry* entry, + const gchar* default_text); gchar* -sokoke_key_file_get_string_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - const gchar* default_value, - GError** error); +sokoke_key_file_get_string_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gchar* default_value, + GError** error); gint -sokoke_key_file_get_integer_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - const gint default_value, - GError** error); +sokoke_key_file_get_integer_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gint default_value, + GError** error); gdouble -sokoke_key_file_get_double_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - gdouble default_value, - GError** error); +sokoke_key_file_get_double_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gdouble default_value, + GError** error); gboolean -sokoke_key_file_get_boolean_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - gboolean default_value, - GError** error); +sokoke_key_file_get_boolean_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gboolean default_value, + GError** error); gboolean -sokoke_key_file_save_to_file (GKeyFile* key_file, - const gchar* filename, - GError** error); +sokoke_key_file_save_to_file (GKeyFile* key_file, + const gchar* filename, + GError** error); void -sokoke_widget_get_text_size (GtkWidget* widget, - const gchar* text, - gint* width, - gint* height); +sokoke_widget_get_text_size (GtkWidget* widget, + const gchar* text, + gint* width, + gint* height); GdkPixbuf* -sokoke_web_icon (const gchar* icon, - GtkIconSize size, - GtkWidget* widget); +sokoke_web_icon (const gchar* icon, + GtkIconSize size, + GtkWidget* widget); + +gint +sokoke_object_get_int (gpointer object, + const gchar* property); + +gboolean +sokoke_object_get_boolean (gpointer object, + const gchar* property); #endif /* !__SOKOKE_H__ */ From a249a6d6f771937e5aff842813bf7cb9918ec2b6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Jul 2008 22:09:52 +0200 Subject: [PATCH 0178/2970] Conditionalize SourceView for older Glib --- midori/midori-browser.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7cddb06c..9d587389 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -22,6 +22,9 @@ #include "midori-console.h" #include "midori-searchentry.h" +#if GLIB_CHECK_VERSION (2, 16, 0) +#include +#endif #include #include #include @@ -261,7 +264,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomOut", web_view != NULL); _action_set_sensitive (browser, "ZoomNormal", web_view != NULL && webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); + #if GLIB_CHECK_VERSION (2, 16, 0) _action_set_sensitive (browser, "SourceView", web_view != NULL); + #endif _action_set_sensitive (browser, "FindNext", web_view != NULL); _action_set_sensitive (browser, "FindPrevious", web_view != NULL); /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ @@ -1796,9 +1801,11 @@ _action_source_view_activate (GtkAction* action, { GtkWidget* web_view; const gchar* uri; + #if GLIB_CHECK_VERSION (2, 16, 0) GFile* file; - gchar* contents; gchar* tag; + #endif + gchar* contents; gchar* contents_utf8; GtkTextBuffer* buffer; GtkWidget* text_view; @@ -1809,6 +1816,9 @@ _action_source_view_activate (GtkAction* action, return; uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + contents = NULL; + + #if GLIB_CHECK_VERSION (2, 16, 0) file = g_file_new_for_uri (uri); contents = NULL; g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL); @@ -1820,6 +1830,7 @@ _action_source_view_activate (GtkAction* action, g_free (contents); } else + #endif contents_utf8 = contents; buffer = gtk_text_buffer_new (NULL); @@ -1835,7 +1846,9 @@ _action_source_view_activate (GtkAction* action, g_object_unref (buffer); g_free (contents_utf8); + #if GLIB_CHECK_VERSION (2, 16, 0) g_free (tag); + #endif } static void @@ -3412,6 +3425,9 @@ midori_browser_init (MidoriBrowser* browser) g_object_unref (ui_manager); + #if !GLIB_CHECK_VERSION (2, 16, 0) + _action_set_sensitive (browser, "SourceView", FALSE); + #endif #ifndef WEBKIT_CHECK_VERSION _action_set_sensitive (browser, "ZoomIn", FALSE); _action_set_sensitive (browser, "ZoomOut", FALSE); From 103df3d8cc1a57e604752aa232a52b0510c51fc7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 13 Jul 2008 23:21:46 +0200 Subject: [PATCH 0179/2970] Use GtkSourceView2 if available --- configure.in | 24 +++++++++--------- midori/Makefile.am | 12 +++++---- midori/midori-browser.c | 55 ++++++++++++++++++++++++++++++++++++++++- midori/wscript_build | 2 +- wscript | 3 ++- 5 files changed, 77 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 17ad974c..b00a35ad 100644 --- a/configure.in +++ b/configure.in @@ -40,9 +40,6 @@ fi # Checks for GIO2 PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=true, have_gio=false) -if test "x${have_gio}" = "xfalse" ; then - AC_MSG_ERROR([No GIO2 package information found]) -fi AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) @@ -54,14 +51,6 @@ fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -# Checks for WebKit -PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) -if test "x${have_webkit}" = "xfalse" ; then - AC_MSG_ERROR([No WebKit package information found]) -fi -AC_SUBST(WEBKIT_CFLAGS) -AC_SUBST(WEBKIT_LIBS) - # Checks for libsexy PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) if test "x${have_libsexy}" = "xfalse" ; then @@ -70,6 +59,19 @@ fi AC_SUBST(LIBSEXY_CFLAGS) AC_SUBST(LIBSEXY_LIBS) +# Checks for gtksourceview +PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview, have_gtksourceview=true, have_gtksourceview=false) +AC_SUBST(GTKSOURCEVIEW_CFLAGS) +AC_SUBST(GTKSOURCEVIEW_LIBS) + +# Checks for WebKit +PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) +if test "x${have_webkit}" = "xfalse" ; then + AC_MSG_ERROR([No WebKit package information found]) +fi +AC_SUBST(WEBKIT_CFLAGS) +AC_SUBST(WEBKIT_LIBS) + # Checks for LibXML2 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=true, have_libxml=false) if test "x${have_libxml}" = "xfalse" ; then diff --git a/midori/Makefile.am b/midori/Makefile.am index 69c8d133..13b237bd 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -1,8 +1,9 @@ INCLUDES = \ - $(GIO_CFLAGS) \ - $(GTK_CFLAGS) \ - $(WEBKIT_CFLAGS) \ - $(LIBSEXY_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSEXY_CFLAGS) \ + $(GTKSOURCEVIEW_CFLAGS) \ + $(WEBKIT_CFLAGS) \ -I../katze AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" @@ -10,8 +11,9 @@ AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" LDADD = \ $(GIO_LIBS) \ $(GTK_LIBS) \ - $(WEBKIT_LIBS) \ $(LIBSEXY_LIBS) \ + $(GTKSOURCEVIEW_LIBS)\ + $(WEBKIT_LIBS) \ $(INTLLIBS) \ ../katze/libkatze.la diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9d587389..5965cbe2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -29,6 +29,10 @@ #include #include #include +#if HAVE_GTKSOURCEVIEW +#include +#include +#endif #include struct _MidoriBrowser @@ -1804,10 +1808,22 @@ _action_source_view_activate (GtkAction* action, #if GLIB_CHECK_VERSION (2, 16, 0) GFile* file; gchar* tag; + #ifdef HAVE_GTKSOURCEVIEW + GFileInfo* info; + const gchar* content_type; + #endif #endif gchar* contents; gchar* contents_utf8; + #ifdef HAVE_GTKSOURCEVIEW + GtkSourceBuffer* buffer; + #if GLIB_CHECK_VERSION (2, 16, 0) + GtkSourceLanguageManager* language_manager; + GtkSourceLanguage* language; + #endif + #else GtkTextBuffer* buffer; + #endif GtkWidget* text_view; gint n; @@ -1822,6 +1838,11 @@ _action_source_view_activate (GtkAction* action, file = g_file_new_for_uri (uri); contents = NULL; g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL); + #ifdef HAVE_GTKSOURCEVIEW + info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, NULL, NULL); + content_type = info ? g_file_info_get_content_type (info) : NULL; + #endif g_object_unref (file); if (contents && !g_utf8_validate (contents, -1, NULL)) { @@ -1833,10 +1854,42 @@ _action_source_view_activate (GtkAction* action, #endif contents_utf8 = contents; + #ifdef HAVE_GTKSOURCEVIEW + buffer = gtk_source_buffer_new (NULL); + gtk_source_buffer_set_highlight_syntax (buffer, TRUE); + if (content_type) + { + language_manager = gtk_source_language_manager_get_default (); + if (!strcmp (content_type, "text/html")) + { + language = gtk_source_language_manager_get_language ( + language_manager, "html"); + gtk_source_buffer_set_language (buffer, language); + } + else if (!strcmp (content_type, "text/css")) + { + language = gtk_source_language_manager_get_language ( + language_manager, "css"); + gtk_source_buffer_set_language (buffer, language); + } + else if (!strcmp (content_type, "text/javascript")) + { + language = gtk_source_language_manager_get_language ( + language_manager, "js"); + gtk_source_buffer_set_language (buffer, language); + } + } + #else buffer = gtk_text_buffer_new (NULL); + #endif if (contents_utf8) - gtk_text_buffer_set_text (buffer, contents_utf8, -1); + gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1); + #ifdef HAVE_GTKSOURCEVIEW + text_view = gtk_source_view_new_with_buffer (buffer); + gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (text_view), TRUE); + #else text_view = gtk_text_view_new_with_buffer (buffer); + #endif gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE); g_object_set_data (G_OBJECT (text_view), "browser-tab-uri", g_strconcat ("view-source:", uri, NULL)); diff --git a/midori/wscript_build b/midori/wscript_build index 228342de..9a70f59a 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '.. ../katze' obj.find_sources_in_dirs ('.') -obj.uselib = 'GIO GTK WEBKIT LIBXML LIBSEXY' +obj.uselib = 'GIO GTK LIBSEXY GTKSOURCEVIEW WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 45380fe7..7fe577af 100644 --- a/wscript +++ b/wscript @@ -37,9 +37,10 @@ def configure (conf): conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) + conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1', mandatory=True) + conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) - conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1', mandatory=True) conf.check_header ('unistd.h', 'HAVE_UNISTD_H') From 17b8738be187b41004a3f82dc11a59108284e235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 13 Jul 2008 23:34:25 +0200 Subject: [PATCH 0180/2970] Fix regression, no empty tooltips in bookmark bar --- midori/midori-browser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5965cbe2..44a55717 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3247,7 +3247,8 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb), browser); - gtk_tool_item_set_tooltip_text (toolitem, desc); + if (desc && *desc) + gtk_tool_item_set_tooltip_text (toolitem, desc); g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); break; case KATZE_XBEL_ITEM_KIND_BOOKMARK: @@ -3257,7 +3258,8 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), browser); - gtk_tool_item_set_tooltip_text (toolitem, desc); + if (desc && *desc) + gtk_tool_item_set_tooltip_text (toolitem, desc); g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); break; case KATZE_XBEL_ITEM_KIND_SEPARATOR: From aecac9b7484a4d39284fa6655b246283eb6dfdaf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 14 Jul 2008 21:14:57 +0200 Subject: [PATCH 0181/2970] Fix tab closing for good --- midori/midori-browser.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 44a55717..d420ada5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -717,9 +717,6 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, katze_xbel_folder_remove_item (browser->proxy_xbel_folder, xbel_item); katze_xbel_item_unref (xbel_item); } - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); - guint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); - gtk_notebook_remove_page (GTK_NOTEBOOK (browser->notebook), n); _midori_browser_update_actions (browser); return FALSE; @@ -730,17 +727,13 @@ midori_browser_window_menu_item_activate_cb (GtkWidget* menuitem, GtkWidget* widget) { MidoriBrowser* browser; - GtkWidget* scrolled; - guint n; g_return_if_fail (GTK_IS_WIDGET (widget)); browser = MIDORI_BROWSER (gtk_widget_get_toplevel (widget)); - g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (browser); - scrolled = _midori_browser_scrolled_for_child (browser, widget); - n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); - gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); + midori_browser_set_current_tab (browser, widget); } static void @@ -955,6 +948,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, /* We want the tab to be removed if the widget is destroyed */ g_signal_connect_swapped (widget, "destroy", G_CALLBACK (gtk_widget_destroy), menuitem); + g_signal_connect_swapped (widget, "destroy", + G_CALLBACK (gtk_widget_destroy), scrolled); g_signal_connect (widget, "destroy", G_CALLBACK (midori_browser_tab_destroy_cb), browser); @@ -2179,6 +2174,7 @@ midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { KatzeXbelItem* item; + gtk_tree_model_get (model, iter, 0, &item, -1); if (G_UNLIKELY (!item)) @@ -2211,6 +2207,7 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { KatzeXbelItem* item; + gtk_tree_model_get (model, iter, 0, &item, -1); if (G_UNLIKELY (!item)) From 762babfeeeb9f82c7d2b68be6dd0da9b3551be12 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 14 Jul 2008 21:15:33 +0200 Subject: [PATCH 0182/2970] Fix favicon support properly --- midori/midori-webview.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index b99d4e36..9843636a 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -943,10 +943,12 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) GdkPixbuf* midori_web_view_get_icon (MidoriWebView* web_view) { + #if GLIB_CHECK_VERSION (2, 16, 0) GFile* file; GFile* icon_file; GIcon* icon; GInputStream* stream; + #endif GdkPixbuf* pixbuf; g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); @@ -955,23 +957,22 @@ midori_web_view_get_icon (MidoriWebView* web_view) file = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); icon_file = g_file_get_child (file, "favicon.ico"); icon = g_file_icon_new (icon_file); - if (icon) - stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), - GTK_ICON_SIZE_MENU, - NULL, NULL, NULL); - else - stream = NULL; - if (stream) + if (icon && (stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), + GTK_ICON_SIZE_MENU, + NULL, NULL, NULL))) { pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); g_object_unref (stream); } - g_object_unref (icon); - g_object_unref (icon_file); - g_object_unref (file); - if (!stream) + else #endif pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + #if GLIB_CHECK_VERSION (2, 16, 0) + if (icon) + g_object_unref (icon); + g_object_unref (icon_file); + g_object_unref (file); + #endif return pixbuf; } From 87f5ce1c55b1e7747a29758d62913047be1b30bb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 15 Jul 2008 00:36:26 +0200 Subject: [PATCH 0183/2970] Ensure SourceView really works with a valid file. --- midori/midori-browser.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d420ada5..44324231 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1827,18 +1827,24 @@ _action_source_view_activate (GtkAction* action, return; uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + contents = NULL; + tag = NULL; #if GLIB_CHECK_VERSION (2, 16, 0) file = g_file_new_for_uri (uri); - contents = NULL; - g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL); #ifdef HAVE_GTKSOURCEVIEW - info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, NULL, NULL); - content_type = info ? g_file_info_get_content_type (info) : NULL; + content_type = NULL; #endif - g_object_unref (file); + if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL)) + { + #ifdef HAVE_GTKSOURCEVIEW + info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, NULL, NULL); + content_type = g_file_info_get_content_type (info); + #endif + g_object_unref (file); + } if (contents && !g_utf8_validate (contents, -1, NULL)) { contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", From 0c52a484e91ab1c31d3987338ff86fbb8c277499 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 15 Jul 2008 01:57:07 +0200 Subject: [PATCH 0184/2970] Look for favicons in all parent folders --- midori/midori-webview.c | 43 ++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 9843636a..e0a5358e 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -282,12 +282,23 @@ webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, web_view->is_loading = FALSE; web_view->progress = -1; - if (web_view->tab_icon) + if (web_view->tab_icon || web_view->menu_item) { - katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), FALSE); icon = midori_web_view_get_icon (web_view); - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - icon); + + if (web_view->tab_icon) + { + katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), + FALSE); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + icon); + } + + if (web_view->menu_item) + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (web_view->menu_item), + gtk_image_new_from_pixbuf (icon)); + g_object_unref (icon); } g_signal_emit (web_view, signals[LOAD_DONE], 0, web_frame); @@ -945,7 +956,10 @@ midori_web_view_get_icon (MidoriWebView* web_view) { #if GLIB_CHECK_VERSION (2, 16, 0) GFile* file; + GFile* parent; GFile* icon_file; + GFileInfo* info; + const gchar* content_type; GIcon* icon; GInputStream* stream; #endif @@ -954,9 +968,24 @@ midori_web_view_get_icon (MidoriWebView* web_view) g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); #if GLIB_CHECK_VERSION (2, 16, 0) - file = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); - icon_file = g_file_get_child (file, "favicon.ico"); - icon = g_file_icon_new (icon_file); + parent = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); + do + { + file = parent; + icon_file = g_file_get_child (file, "favicon.ico"); + info = g_file_query_info (icon_file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, NULL, NULL); + if (info) + { + content_type = g_file_info_get_content_type (info); + icon = !strcmp (content_type, "image/x-icon") + ? g_file_icon_new (icon_file) : NULL; + } + + parent = g_file_get_parent (file); + } + while (!icon && parent); + if (icon && (stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), GTK_ICON_SIZE_MENU, NULL, NULL, NULL))) From 834e69cf64ad6c22c0a6cefc01c860e842be86e7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 15 Jul 2008 17:40:55 +0200 Subject: [PATCH 0185/2970] Make sure icon is initiallized as NULL --- midori/midori-webview.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index e0a5358e..5e12a44c 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -969,6 +969,7 @@ midori_web_view_get_icon (MidoriWebView* web_view) #if GLIB_CHECK_VERSION (2, 16, 0) parent = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); + icon = NULL; do { file = parent; @@ -987,8 +988,8 @@ midori_web_view_get_icon (MidoriWebView* web_view) while (!icon && parent); if (icon && (stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), - GTK_ICON_SIZE_MENU, - NULL, NULL, NULL))) + GTK_ICON_SIZE_MENU, + NULL, NULL, NULL))) { pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); g_object_unref (stream); From 0b5dcbfe10d63cfb0bb6e2d9457536fae83d55ae Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 15 Jul 2008 17:54:18 +0200 Subject: [PATCH 0186/2970] Recognize image/x-ico favicons as well --- midori/midori-webview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 5e12a44c..4a5a5e37 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -979,7 +979,8 @@ midori_web_view_get_icon (MidoriWebView* web_view) if (info) { content_type = g_file_info_get_content_type (info); - icon = !strcmp (content_type, "image/x-icon") + /* favicon.ico can be image/x-ico or image/x-icon */ + icon = !strcmp (content_type, "image/x-ico") ? g_file_icon_new (icon_file) : NULL; } From 74dcc3c4dbf1aa167f0e0adaf49ec0471479f4bb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 15 Jul 2008 20:01:46 +0200 Subject: [PATCH 0187/2970] Fix file choosers for GTk+ < 2.12 --- katze/katze-utils.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 1353fa1b..8af1bbdd 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -163,8 +163,14 @@ katze_property_proxy (gpointer object, string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), string ? string : ""); + #if GTK_CHECK_VERSION (2, 12, 0) g_signal_connect (widget, "file-set", G_CALLBACK (proxy_file_file_set_cb), object); + #else + if (pspec->flags & G_PARAM_WRITABLE) + g_signal_connect (widget, "selection-changed", + G_CALLBACK (proxy_file_file_set_cb), object); + #endif } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("folder")) { @@ -175,8 +181,14 @@ katze_property_proxy (gpointer object, string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), string ? string : ""); + #if GTK_CHECK_VERSION (2, 12, 0) g_signal_connect (widget, "file-set", G_CALLBACK (proxy_folder_file_set_cb), object); + #else + if (pspec->flags & G_PARAM_WRITABLE) + g_signal_connect (widget, "selection-changed", + G_CALLBACK (proxy_folder_file_set_cb), object); + #endif } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("uri")) { @@ -187,8 +199,14 @@ katze_property_proxy (gpointer object, string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (widget), string ? string : ""); + #if GTK_CHECK_VERSION (2, 12, 0) g_signal_connect (widget, "file-set", G_CALLBACK (proxy_uri_file_set_cb), object); + #else + if (pspec->flags & G_PARAM_WRITABLE) + g_signal_connect (widget, "selection-changed", + G_CALLBACK (proxy_uri_file_set_cb), object); + #endif } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("font")) { From 052bd7eeda5c68def04f841af55db038c70cb505 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 15 Jul 2008 20:37:52 +0200 Subject: [PATCH 0188/2970] Some work towards signal support in gjs --- midori/gjs.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/midori/gjs.c b/midori/gjs.c index 29148bbd..b30a006b 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -16,7 +16,6 @@ #define G_OBJECT_NAME(object) G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) -// FIXME: Return a GValue JSValueRef gjs_script_eval (JSContextRef js_context, const gchar* script, @@ -237,14 +236,14 @@ _js_object_call_as_function_cb (JSContextRef js_context, g_value_init (&values[i + 1], gtype); if (query.n_params >= i && g_value_type_compatible (gtype, query.param_types[i])) - // && g_value_type_transformable (gtype, query.param_types[i]) + /* && g_value_type_transformable (gtype, query.param_types[i]) */ g_value_copy (&value, &values[i + 1]); - // g_value_transform (&value, &values[i + 1]); + /* g_value_transform (&value, &values[i + 1]); */ else { gchar* value_type = g_strdup_value_contents (&value); - // FIXME: exception - printf ("wrong value, expected %s\n", value_type); + /* FIXME: exception */ + g_print ("wrong value, expected %s\n", value_type); g_free (value_type); } g_value_unset (&value); @@ -256,11 +255,11 @@ _js_object_call_as_function_cb (JSContextRef js_context, for (i = 0; i < n_arguments; i++) g_value_unset (&values[i]); - // FIXME: return value + /* FIXME: return value */ return JSValueMakeUndefined (js_context); } -static void +/*static void _js_object_add_function (JSContextRef js_context, JSObjectRef js_object, const gchar* func) @@ -270,7 +269,7 @@ _js_object_add_function (JSContextRef js_context, js_context, js_func, _js_object_call_as_function_cb); JSStringRelease (js_func); _js_object_set_property (js_context, js_object, func, js_function); -} +}*/ static JSValueRef _js_class_get_property_cb (JSContextRef js_context, @@ -292,8 +291,8 @@ _js_class_get_property_cb (JSContextRef js_context, g_signal_query (signal_id, &query); if (query.signal_flags & G_SIGNAL_ACTION) { - // We can't use JSObjectMakeFunctionWithCallback - // because it doesn't allocate private data + /* We can't use JSObjectMakeFunctionWithCallback + because it doesn't allocate private data */ JSClassDefinition js_class_def = kJSClassDefinitionEmpty; js_class_def.className = g_strdup (property); js_class_def.callAsFunction = _js_object_call_as_function_cb; @@ -302,7 +301,7 @@ _js_class_get_property_cb (JSContextRef js_context, return js_function; } g_free (property); - return JSValueMakeUndefined (js_context); + return JSValueMakeNull (js_context); } else if (!(pspec = g_object_class_find_property ( G_OBJECT_GET_CLASS (object), property))) @@ -364,6 +363,14 @@ _js_class_get_property_cb (JSContextRef js_context, return js_result ? js_result : JSValueMakeNull (js_context); } +static void +_js_class_signal_callback (GObject* object, ...) +{ + /* FIXME: Support arbitrary signatures */ + + /* FIXME: Support arbitrary return values */ +} + static bool _js_class_set_property_cb (JSContextRef js_context, JSObjectRef js_object, @@ -377,9 +384,17 @@ _js_class_set_property_cb (JSContextRef js_context, bool result = false; gchar* property = gjs_string_utf8 (js_property); - GParamSpec* pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property); - if (!pspec) + guint signal_id; + GParamSpec* pspec; + if ((signal_id = g_signal_lookup (property, G_OBJECT_TYPE (object)))) + { + g_signal_connect (object, property, + G_CALLBACK (_js_class_signal_callback), (gpointer)js_value); + g_free (property); + return true; + } + else if (!(pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object), property))) { gchar* message = g_strdup_printf (_("%s has no property '%s'"), G_OBJECT_NAME (object), property); @@ -502,13 +517,13 @@ _js_module_has_property_cb (JSContextRef js_context, GModule* module = g_module_open (NULL, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); typedef GType (*gjs_get_type_func)(void); - // FIXME: Insert a space between each capital letter + /* FIXME: Insert a space between each capital letter */ gchar* type_func_name = g_strdup_printf ("%s_%s_get_type", namespace, property); gchar* type_func_name_small = g_utf8_strdown (type_func_name, -1); gjs_get_type_func type_func; if (g_module_symbol (module, - (const gchar*)type_func_name_small, &type_func)) + (const gchar*)type_func_name_small, (gpointer*)&type_func)) { type = type_func (); g_type_class_peek (type); From 31fa4004ae08afeff6ee6bd1bdafe52e21d85396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Wed, 16 Jul 2008 14:24:30 +0200 Subject: [PATCH 0189/2970] Preliminary fix for crash after removing a bookmark --- midori/midori-browser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 44324231..50a1c20a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -21,6 +21,7 @@ #include "midori-addons.h" #include "midori-console.h" #include "midori-searchentry.h" +#include "compat.h" #if GLIB_CHECK_VERSION (2, 16, 0) #include @@ -2602,6 +2603,8 @@ _action_bookmark_delete_activate (GtkAction* action, gtk_tree_model_get (model, &iter, 0, &item, -1); KatzeXbelItem* parent = katze_xbel_item_get_parent (item); katze_xbel_folder_remove_item (parent, item); + /* This is a preliminary hack, until we fix it properly again */ + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); katze_xbel_item_unref (item); } } From 7f0da8ac84ca468cd5b90de2402591e67a639c04 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 16 Jul 2008 16:02:29 +0200 Subject: [PATCH 0190/2970] Emulate primary clipboard and fix Middle click opens selection --- midori/midori-webview.c | 73 +++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 47 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 4a5a5e37..c54ec5c1 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -36,7 +36,6 @@ struct _MidoriWebView gchar* statusbar_text; gchar* link_uri; - gboolean middle_click_opens_selection; MidoriWebSettings* settings; GtkWidget* menu_item; @@ -381,8 +380,10 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, GdkModifierType state; GtkClipboard* clipboard; gchar* uri; + gchar* new_uri; - if (event->button == 2 && web_view->middle_click_opens_selection) + if (event->button == 2 && sokoke_object_get_boolean + (web_view->settings, "middle-click-opens-selection")) { state = (GdkModifierType) event->state; clipboard = gtk_clipboard_get_for_display ( @@ -391,10 +392,13 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, uri = gtk_clipboard_wait_for_text (clipboard); if (uri && strchr (uri, '.') && !strchr (uri, ' ')) { + g_print ("gtk_widget_button_press_event_after, sokoke_magic_uri\n"); + new_uri = sokoke_magic_uri (uri, NULL); if (state & GDK_CONTROL_MASK) - g_signal_emit (web_view, signals[NEW_TAB], 0, uri); + g_signal_emit (web_view, signals[NEW_TAB], 0, new_uri); else - g_object_set (web_view, "uri", uri, NULL); + g_object_set (web_view, "uri", new_uri, NULL); + g_free (new_uri); g_free (uri); return TRUE; } @@ -402,6 +406,22 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, return FALSE; } +static gboolean +gtk_widget_button_release_event (MidoriWebView* web_view, + GdkEventButton* event) +{ + GtkClipboard* clipboard; + gchar* text; + + /* Emulate the primary clipboard, which WebKit doesn't support */ + text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); + clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (GTK_WIDGET (web_view)), GDK_SELECTION_PRIMARY); + gtk_clipboard_set_text (clipboard, text, -1); + g_free (text); + return FALSE; +} + static gboolean gtk_widget_scroll_event (MidoriWebView* web_view, GdkEventScroll* event) @@ -500,32 +520,6 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, } } -static void -_midori_web_view_update_settings (MidoriWebView* web_view) -{ - g_object_get (G_OBJECT (web_view->settings), - "middle-click-opens-selection", &web_view->middle_click_opens_selection, - NULL); -} - -static void -midori_web_view_settings_notify (MidoriWebSettings* web_settings, - GParamSpec* pspec, - MidoriWebView* web_view) -{ - const gchar* name = g_intern_string (pspec->name); - GValue value = {0, }; - g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (web_view->settings), name, &value); - - if (name == g_intern_string ("middle-click-opens-selection")) - web_view->middle_click_opens_selection = g_value_get_boolean (&value); - else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), - name)) - g_warning (_("Unexpected setting '%s'"), name); - g_value_unset (&value); -} - static void midori_web_view_init (MidoriWebView* web_view) { @@ -533,10 +527,7 @@ midori_web_view_init (MidoriWebView* web_view) web_view->progress = -1; web_view->settings = midori_web_settings_new (); - _midori_web_view_update_settings (web_view); g_object_set (web_view, "WebKitWebView::settings", web_view->settings, NULL); - g_signal_connect (web_view->settings, "notify", - G_CALLBACK (midori_web_view_settings_notify), web_view); WebKitWebFrame* web_frame; web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); @@ -564,6 +555,8 @@ midori_web_view_init (MidoriWebView* web_view) gtk_widget_button_press_event, NULL, "signal_after::button-press-event", gtk_widget_button_press_event_after, NULL, + "signal::button-release-event", + gtk_widget_button_release_event, NULL, "signal::scroll-event", gtk_widget_scroll_event, NULL, "signal::populate-popup", @@ -589,12 +582,7 @@ midori_web_view_finalize (GObject* object) katze_xbel_item_unref (web_view->xbel_item); if (web_view->settings) - { - g_signal_handlers_disconnect_by_func (web_view->settings, - midori_web_view_settings_notify, - web_view); g_object_unref (web_view->settings); - } G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); } @@ -613,10 +601,7 @@ midori_web_view_set_property (GObject* object, { const gchar* uri = g_value_get_string (value); if (uri && *uri) - { - /* FIXME: Autocomplete the uri */ webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), uri); - } break; } case PROP_TITLE: @@ -634,15 +619,9 @@ midori_web_view_set_property (GObject* object, katze_xbel_item_set_title (web_view->xbel_item, title); break; case PROP_SETTINGS: - g_signal_handlers_disconnect_by_func (web_view->settings, - midori_web_view_settings_notify, - web_view); katze_object_assign (web_view->settings, g_value_get_object (value)); g_object_ref (web_view->settings); - _midori_web_view_update_settings (web_view); g_object_set (object, "WebKitWebView::settings", web_view->settings, NULL); - g_signal_connect (web_view->settings, "notify", - G_CALLBACK (midori_web_view_settings_notify), web_view); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); From 05426deadb32b994df1705df6ac85881571eaae3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 16 Jul 2008 18:08:47 +0200 Subject: [PATCH 0191/2970] Reverse Open tabs in the background with Ctrl --- midori/midori-browser.c | 71 ++++++++++++++++++++++++++++++++++++++--- midori/midori-webview.c | 49 ---------------------------- 2 files changed, 67 insertions(+), 53 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 50a1c20a..ffdc8693 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -335,10 +335,8 @@ static void _midori_browser_set_current_page_smartly (MidoriBrowser* browser, gint n) { - gboolean open_tabs_in_the_background; - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_tabs_in_the_background, NULL); - if (!open_tabs_in_the_background) + if (!sokoke_object_get_boolean (browser->settings, + "open-tabs-in-the-background")) midori_browser_set_current_page (browser, n); } @@ -483,6 +481,69 @@ midori_web_view_console_message_cb (GtkWidget* web_view, return TRUE; } +static gboolean +midori_web_view_button_press_event_cb (MidoriWebView* web_view, + GdkEventButton* event, + MidoriBrowser* browser) +{ + GdkModifierType state = (GdkModifierType)0; + gint x, y; + const gchar* link_uri; + guint n; + gboolean background; + + gdk_window_get_pointer (NULL, &x, &y, &state); + link_uri = midori_web_view_get_link_uri (web_view); + + switch (event->button) + { + case 1: + if (!link_uri) + return FALSE; + if (state & GDK_SHIFT_MASK) + { + /* Open link in new window */ + g_signal_emit (browser, signals[NEW_WINDOW], 0, link_uri); + return TRUE; + } + else if (state & GDK_MOD1_MASK) + { + /* Open link in new tab */ + n = midori_browser_add_uri (browser, link_uri); + background = sokoke_object_get_boolean (browser->settings, + "open-tabs-in-the-background"); + if (state & GDK_CONTROL_MASK) + background = !background; + if (!background) + midori_browser_set_current_page (browser, n); + return TRUE; + } + break; + case 2: + if (link_uri) + { + /* Open link in new tab */ + n = midori_browser_add_uri (browser, link_uri); + background = sokoke_object_get_boolean (browser->settings, + "open-tabs-in-the-background"); + if (state & GDK_CONTROL_MASK) + background = !background; + if (!background) + midori_browser_set_current_page (browser, n); + return TRUE; + } + else if (state & GDK_CONTROL_MASK) + { + webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); + return FALSE; /* Allow Ctrl + Middle click */ + } + break; + case 3: + return FALSE; + } + return FALSE; +} + static void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeXbelItem* bookmark) @@ -869,6 +930,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_web_view_new_tab_cb, browser, "signal::new-window", midori_web_view_new_window_cb, browser, + "signal::button-press-event", + midori_web_view_button_press_event_cb, browser, "signal::populate-popup", midori_web_view_populate_popup_cb, browser, NULL); diff --git a/midori/midori-webview.c b/midori/midori-webview.c index c54ec5c1..18ef6a87 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -327,52 +327,6 @@ webkit_web_view_hovering_over_link (MidoriWebView* web_view, g_signal_emit (web_view, signals[ELEMENT_MOTION], 0, link_uri); } -static gboolean -gtk_widget_button_press_event (MidoriWebView* web_view, - GdkEventButton* event) -{ - GdkModifierType state = (GdkModifierType)0; - gint x, y; - gdk_window_get_pointer (NULL, &x, &y, &state); - switch (event->button) - { - case 1: - if (!web_view->link_uri) - return FALSE; - if (state & GDK_SHIFT_MASK) - { - /* Open link in new window */ - g_signal_emit (web_view, signals[NEW_WINDOW], 0, web_view->link_uri); - return TRUE; - } - else if(state & GDK_MOD1_MASK) - { - /* Open link in new tab */ - g_signal_emit (web_view, signals[NEW_TAB], 0, web_view->link_uri); - return TRUE; - } - break; - case 2: - if (state & GDK_CONTROL_MASK) - { - webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); - return FALSE; /* Allow Ctrl + Middle click */ - } - else - { - if (!web_view->link_uri) - return FALSE; - /* Open link in new tab */ - g_signal_emit (web_view, signals[NEW_TAB], 0, web_view->link_uri); - return TRUE; - } - break; - case 3: - return FALSE; - } - return FALSE; -} - static gboolean gtk_widget_button_press_event_after (MidoriWebView* web_view, GdkEventButton* event) @@ -392,7 +346,6 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, uri = gtk_clipboard_wait_for_text (clipboard); if (uri && strchr (uri, '.') && !strchr (uri, ' ')) { - g_print ("gtk_widget_button_press_event_after, sokoke_magic_uri\n"); new_uri = sokoke_magic_uri (uri, NULL); if (state & GDK_CONTROL_MASK) g_signal_emit (web_view, signals[NEW_TAB], 0, new_uri); @@ -552,8 +505,6 @@ midori_web_view_init (MidoriWebView* web_view) "signal::hovering-over-link", webkit_web_view_hovering_over_link, NULL, "signal::button-press-event", - gtk_widget_button_press_event, NULL, - "signal_after::button-press-event", gtk_widget_button_press_event_after, NULL, "signal::button-release-event", gtk_widget_button_release_event, NULL, From 7f388237dcb657405c4c1e66f924f2495c0880e2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 16 Jul 2008 22:32:37 +0200 Subject: [PATCH 0192/2970] Reintroduce Download Manager preference --- midori/midori-preferences.c | 68 ++++++++++++++++++++++++++++++++----- midori/midori-websettings.c | 28 +++++++-------- midori/midori-websettings.h | 4 --- midori/midori-webview.c | 29 ++++++++++++++++ midori/sokoke.c | 55 ++++++++++++++++++++++++++++++ midori/sokoke.h | 4 +++ 6 files changed, 161 insertions(+), 27 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index dfa3328a..5b86cd99 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -68,9 +68,12 @@ static void clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser) { gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_chooser), ""); - /* Emit "file-set" manually for Gtk doesn't emit it otherwise - FIXME: file-set is Gtk+ >= 2.12 */ + /* Emit signal manually for Gtk doesn't emit it otherwise */ + #if GTK_CHECK_VERSION (2, 12, 0) g_signal_emit_by_name (file_chooser, "file-set"); + #else + g_signal_emit_by_name (file_chooser, "selection-changed"); + #endif } static void @@ -173,6 +176,34 @@ midori_preferences_new (GtkWindow* parent, return GTK_WIDGET (preferences); } +static gboolean +proxy_download_manager_icon_cb (GtkWidget* entry, + GdkEventFocus* event, + GtkImage* icon) +{ + const gchar* program; + gchar* path; + + program = gtk_entry_get_text (GTK_ENTRY (entry)); + path = g_find_program_in_path (program); + + if (path) + { + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_for_screen ( + gtk_widget_get_screen (entry)), program)) + gtk_image_set_from_icon_name (icon, program, GTK_ICON_SIZE_MENU); + else + gtk_image_set_from_stock (icon, GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + g_free (path); + } + else if (program && *program) + gtk_image_set_from_stock (icon, GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + else + gtk_image_clear (icon); + + return FALSE; +} + /** * midori_preferences_set_settings: * @settings: the settings @@ -185,6 +216,17 @@ void midori_preferences_set_settings (MidoriPreferences* preferences, MidoriWebSettings* settings) { + GtkSizeGroup* sizegroup; + GtkWidget* page; + GtkWidget* frame; + GtkWidget* table; + GtkWidget* align; + GtkWidget* label; + GtkWidget* button; + GtkWidget* entry; + GtkWidget* hbox; + gint icon_width, icon_height; + g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -192,10 +234,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, preferences->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); - GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - GtkWidget* page; GtkWidget* frame; GtkWidget* table; GtkWidget* align; - GtkWidget* label; GtkWidget* button; - GtkWidget* entry; GtkWidget* hbox; + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); #define PAGE_NEW(__label) page = gtk_vbox_new (FALSE, 0); \ gtk_container_set_border_width (GTK_CONTAINER (page), 5); \ gtk_notebook_append_page (GTK_NOTEBOOK (preferences->notebook), page, \ @@ -243,8 +282,20 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "download-folder", "folder"); FILLED_ADD (button, 1, 2, 0, 1); - button = katze_property_proxy (settings, "show-download-notification", "blurb"); - SPANNED_ADD (button, 0, 2, 1, 2); + label = katze_property_label (settings, "download-manager"); + INDENTED_ADD (label, 0, 1, 1, 2); + hbox = gtk_hbox_new (FALSE, 4); + button = gtk_image_new (); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + gtk_widget_set_size_request (button, icon_width, icon_height); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); + entry = katze_property_proxy (settings, "download-manager", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_download_manager_icon_cb), button); + FILLED_ADD (hbox, 1, 2, 1, 2); /* Page "Appearance" */ PAGE_NEW (_("Appearance")); @@ -260,7 +311,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 0, 1); label = katze_property_label (settings, "minimum-font-size"); INDENTED_ADD (label, 0, 1, 1, 2); - hbox = gtk_hbox_new (FALSE, 4); entry = katze_property_proxy (settings, "minimum-font-size", NULL); INDENTED_ADD (entry, 1, 2, 1, 2); label = katze_property_label (settings, "preferred-encoding"); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 02625460..d87b8db2 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -43,7 +43,7 @@ struct _MidoriWebSettings MidoriStartup load_on_startup; gchar* homepage; gchar* download_folder; - gboolean show_download_notification; + gchar* download_manager; gchar* location_entry_search; MidoriPreferredEncoding preferred_encoding; @@ -96,7 +96,7 @@ enum PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, PROP_DOWNLOAD_FOLDER, - PROP_SHOW_DOWNLOAD_NOTIFICATION, + PROP_DOWNLOAD_MANAGER, PROP_LOCATION_ENTRY_SEARCH, PROP_PREFERRED_ENCODING, @@ -423,13 +423,13 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE)); g_object_class_install_property (gobject_class, - PROP_SHOW_DOWNLOAD_NOTIFICATION, - g_param_spec_boolean ( - "show-download-notification", - _("Show Download Notification"), - _("Show a notification window for finished downloads"), - TRUE, - G_PARAM_READABLE)); + PROP_DOWNLOAD_MANAGER, + g_param_spec_string ( + "download-manager", + _("Download Manager"), + _("An external download manager"), + NULL, + flags)); g_object_class_install_property (gobject_class, PROP_LOCATION_ENTRY_SEARCH, @@ -705,8 +705,8 @@ midori_web_settings_set_property (GObject* object, case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; - case PROP_SHOW_DOWNLOAD_NOTIFICATION: - web_settings->show_download_notification = g_value_get_boolean (value); + case PROP_DOWNLOAD_MANAGER: + katze_assign (web_settings->download_manager, g_value_dup_string (value)); break; case PROP_LOCATION_ENTRY_SEARCH: katze_assign (web_settings->location_entry_search, g_value_dup_string (value)); @@ -863,8 +863,8 @@ midori_web_settings_get_property (GObject* object, case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); break; - case PROP_SHOW_DOWNLOAD_NOTIFICATION: - g_value_set_boolean (value, web_settings->show_download_notification); + case PROP_DOWNLOAD_MANAGER: + g_value_set_string (value, web_settings->download_manager); break; case PROP_LOCATION_ENTRY_SEARCH: g_value_set_string (value, web_settings->location_entry_search); @@ -964,7 +964,7 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) "load-on-startup", web_settings->load_on_startup, "homepage", web_settings->homepage, "download-folder", web_settings->download_folder, - "show-download-notification", web_settings->show_download_notification, + "download-manager", web_settings->download_manager, "location-entry-search", web_settings->location_entry_search, "preferred-encoding", web_settings->preferred_encoding, diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 35405ad3..cecab796 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -107,10 +107,6 @@ midori_accept_cookies_get_type (void) G_GNUC_CONST; struct _MidoriWebSettingsClass { WebKitWebSettingsClass parent_class; - - /* Signals */ - void - (*dummy) (MidoriWebSettings* web_settings); }; GType diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 18ef6a87..3ed6cc0b 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -411,6 +411,19 @@ midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, g_signal_emit (web_view, signals[NEW_WINDOW], 0, uri); } +static void +midori_web_view_menu_download_activate_cb (GtkWidget* widget, + MidoriWebView* web_view) +{ + gchar* program; + const gchar* uri; + + g_object_get (web_view->settings, "download-manager", &program, NULL); + uri = g_object_get_data (G_OBJECT (widget), "uri"); + sokoke_spawn_program (program, uri); + g_free (program); +} + static void webkit_web_view_populate_popup_cb (GtkWidget* web_view, GtkWidget* menu) @@ -422,6 +435,7 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, GtkWidget* icon; gchar* text; GList* items; + gchar* program; uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) @@ -450,6 +464,21 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, /* hack to disable non-functional Download File */ gtk_widget_set_sensitive (menuitem, FALSE); g_list_free (items); + g_object_get (MIDORI_WEB_VIEW (web_view)->settings, + "download-manager", &program, NULL); + if (program && *program) + { + menuitem = gtk_image_menu_item_new_with_mnemonic ( + _("Download Link with Download _Manager")); + icon = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 4); + g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_download_activate_cb), web_view); + gtk_widget_show (menuitem); + } } if (!uri && webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) diff --git a/midori/sokoke.c b/midori/sokoke.c index e267eed1..49eeaa3d 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -24,6 +24,61 @@ #include #include +static void +error_dialog (const gchar* short_message, + const gchar* detailed_message) +{ + GtkWidget* dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, short_message); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", detailed_message); + gtk_widget_show (dialog); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + + +} + +gboolean +sokoke_spawn_program (const gchar* command, + const gchar* argument) +{ + gchar* argument_escaped; + gchar* command_ready; + gchar** argv; + GError* error; + + argument_escaped = g_shell_quote (argument); + if (strstr (command, "%s")) + command_ready = g_strdup_printf (command, argument_escaped); + else + command_ready = g_strconcat (command, " ", argument_escaped, NULL); + + error = NULL; + if (!g_shell_parse_argv (command_ready, NULL, &argv, &error)) + { + error_dialog (_("Could not run external program."), error->message); + g_error_free (error); + g_free (command_ready); + g_free (argument_escaped); + return FALSE; + } + + error = NULL; + if (!g_spawn_async (NULL, argv, NULL, + (GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, NULL, &error)) + { + error_dialog (_("Could not run external program."), error->message); + g_error_free (error); + } + + g_strfreev (argv); + g_free (command_ready); + g_free (argument_escaped); + return TRUE; +} + gchar* sokoke_magic_uri (const gchar* uri, MidoriWebList* search_engines) diff --git a/midori/sokoke.h b/midori/sokoke.h index c4cbbce0..172b19b4 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -19,6 +19,10 @@ /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON +gboolean +sokoke_spawn_program (const gchar* command, + const gchar* argument); + gchar* sokoke_magic_uri (const gchar* uri, MidoriWebList* search_engines); From 4ac54eec03cc8ef17c1652c9cceb145936715a53 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Thu, 17 Jul 2008 09:58:08 +0200 Subject: [PATCH 0193/2970] Workaround a GIO bug that causes an infinite loop --- midori/midori-webview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 3ed6cc0b..aa0721c4 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -945,7 +945,8 @@ midori_web_view_get_icon (MidoriWebView* web_view) parent = g_file_get_parent (file); } - while (!icon && parent); + while (!icon && parent && !g_file_equal (file, parent)); + /* We need to check if file equals the parent due to a GIO bug */ if (icon && (stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), GTK_ICON_SIZE_MENU, From 657cbbb60eda4a796d48e0e071e9e9a5cb3f3520 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Jul 2008 10:12:34 +0200 Subject: [PATCH 0194/2970] Fav favicon mime comparison again --- midori/midori-webview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index aa0721c4..2748efc6 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -938,8 +938,8 @@ midori_web_view_get_icon (MidoriWebView* web_view) if (info) { content_type = g_file_info_get_content_type (info); - /* favicon.ico can be image/x-ico or image/x-icon */ - icon = !strcmp (content_type, "image/x-ico") + icon = (!strcmp (content_type, "image/x-icon") + || !strcmp (content_type, "image/x-ico")) ? g_file_icon_new (icon_file) : NULL; } From 272046d94adbe8f17fccbbbbe09c327a5209c23d Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Thu, 17 Jul 2008 12:34:34 +0200 Subject: [PATCH 0195/2970] Add image/vnd.microsoft.icon to favicon support --- midori/midori-webview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 2748efc6..3201607e 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -939,7 +939,8 @@ midori_web_view_get_icon (MidoriWebView* web_view) { content_type = g_file_info_get_content_type (info); icon = (!strcmp (content_type, "image/x-icon") - || !strcmp (content_type, "image/x-ico")) + || !strcmp (content_type, "image/x-ico") + || !strcmp (content_type, "image/vnd.microsoft.icon")) ? g_file_icon_new (icon_file) : NULL; } From 9ba55139349e1e8cfa70fc37ae851ccd43ce0040 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Jul 2008 19:15:36 +0200 Subject: [PATCH 0196/2970] Avoid loading favicons unless we need to --- midori/midori-browser.c | 32 +++++++++----------------------- midori/midori-webview.c | 15 +++++++++++++-- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ffdc8693..d8542690 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -188,26 +188,6 @@ _midori_browser_get_tab_title (MidoriBrowser* browser, return "untitled"; } -static GdkPixbuf* -_midori_browser_get_tab_icon (MidoriBrowser* browser, - GtkWidget* widget) -{ - const gchar* uri; - GdkPixbuf* icon; - - if (MIDORI_IS_WEB_VIEW (widget)) - return midori_web_view_get_icon (MIDORI_WEB_VIEW (widget)); - - uri = g_object_get_data (G_OBJECT (widget), "browser-tab-uri"); - if (g_str_has_prefix (uri, "view-source:")) - icon = gtk_widget_render_icon (widget, GTK_STOCK_EDIT, - GTK_ICON_SIZE_MENU, NULL); - else - icon = gtk_widget_render_icon (widget, GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); - return icon; -} - static void _midori_browser_open_uri (MidoriBrowser* browser, const gchar* uri) @@ -296,9 +276,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_show (browser->progressbar); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); - icon = _midori_browser_get_tab_icon (browser, widget); + icon = katze_throbber_get_static_pixbuf (KATZE_THROBBER ( + g_object_get_data (G_OBJECT (widget), "browser-tab-icon"))); gtk_image_set_from_pixbuf (GTK_IMAGE (browser->location_icon), icon); - g_object_unref (icon); } static GtkWidget* @@ -938,7 +918,12 @@ _midori_browser_add_tab (MidoriBrowser* browser, } else { - icon = _midori_browser_get_tab_icon (browser, widget); + if (GTK_IS_TEXT_VIEW (widget)) + icon = gtk_widget_render_icon (widget, GTK_STOCK_EDIT, + GTK_ICON_SIZE_MENU, NULL); + else + icon = gtk_widget_render_icon (widget, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); tab_icon = gtk_image_new_from_pixbuf (icon); title = _midori_browser_get_tab_title (browser, widget); tab_title = gtk_label_new (title); @@ -957,6 +942,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, xbel_item); } } + g_object_set_data (G_OBJECT (widget), "browser-tab-icon", tab_icon); browser->tab_titles = g_list_prepend (browser->tab_titles, tab_title); g_signal_connect (widget, "leave-notify-event", diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 3201607e..19e0f813 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -29,6 +29,7 @@ struct _MidoriWebView { WebKitWebView parent_instance; + GdkPixbuf* icon; gchar* uri; gchar* title; gboolean is_loading; @@ -239,7 +240,8 @@ webkit_web_view_load_committed (MidoriWebView* web_view, _midori_web_view_set_uri (web_view, uri); if (web_view->tab_icon) { - icon = midori_web_view_get_icon (web_view); + icon = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), icon); g_object_unref (icon); @@ -281,6 +283,8 @@ webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, web_view->is_loading = FALSE; web_view->progress = -1; + katze_object_assign (web_view->icon, NULL); + if (web_view->tab_icon || web_view->menu_item) { icon = midori_web_view_get_icon (web_view); @@ -553,6 +557,8 @@ midori_web_view_finalize (GObject* object) { MidoriWebView* web_view = MIDORI_WEB_VIEW (object); + if (web_view->icon) + g_object_unref (web_view->icon); g_free (web_view->uri); g_free (web_view->title); g_free (web_view->statusbar_text); @@ -926,6 +932,9 @@ midori_web_view_get_icon (MidoriWebView* web_view) g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + if (web_view->icon) + return g_object_ref (web_view->icon); + #if GLIB_CHECK_VERSION (2, 16, 0) parent = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); icon = NULL; @@ -966,5 +975,7 @@ midori_web_view_get_icon (MidoriWebView* web_view) g_object_unref (icon_file); g_object_unref (file); #endif - return pixbuf; + + web_view->icon = pixbuf; + return g_object_ref (web_view->icon); } From efb148f58ec7760e36c7f63e1a1ae993e42b0195 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Thu, 17 Jul 2008 21:02:14 +0200 Subject: [PATCH 0197/2970] Introduce MidoriLocationEntry and GtkIconEntry --- README | 2 +- configure.in | 8 - midori/Makefile.am | 28 +- midori/gtkiconentry.c | 1601 +++++++++++++++++++++++++++++++++ midori/gtkiconentry.h | 119 +++ midori/midori-browser.c | 114 ++- midori/midori-locationentry.c | 384 ++++++++ midori/midori-locationentry.h | 77 ++ midori/midori-searchentry.c | 20 +- midori/midori-searchentry.h | 4 +- wscript | 1 - 11 files changed, 2292 insertions(+), 66 deletions(-) create mode 100644 midori/gtkiconentry.c create mode 100644 midori/gtkiconentry.h create mode 100644 midori/midori-locationentry.c create mode 100644 midori/midori-locationentry.h diff --git a/README b/README index 6a32c278..2537f5c3 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ Midori is a lightweight web browser. * User scripts and user styles support. * Extensible via Javascript. -Requirements: GTK+ 2.6, libsexy, WebkitGtk, libXML2 +Requirements: GTK+ 2.6, WebkitGtk, libXML2 For installation instructions read INSTALL. diff --git a/configure.in b/configure.in index b00a35ad..097f30ba 100644 --- a/configure.in +++ b/configure.in @@ -51,14 +51,6 @@ fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -# Checks for libsexy -PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) -if test "x${have_libsexy}" = "xfalse" ; then - AC_MSG_ERROR([No Libsexy package information found]) -fi -AC_SUBST(LIBSEXY_CFLAGS) -AC_SUBST(LIBSEXY_LIBS) - # Checks for gtksourceview PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview, have_gtksourceview=true, have_gtksourceview=false) AC_SUBST(GTKSOURCEVIEW_CFLAGS) diff --git a/midori/Makefile.am b/midori/Makefile.am index 13b237bd..71629568 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ $(GIO_CFLAGS) \ $(GTK_CFLAGS) \ - $(LIBSEXY_CFLAGS) \ $(GTKSOURCEVIEW_CFLAGS) \ $(WEBKIT_CFLAGS) \ -I../katze @@ -11,7 +10,6 @@ AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" LDADD = \ $(GIO_LIBS) \ $(GTK_LIBS) \ - $(LIBSEXY_LIBS) \ $(GTKSOURCEVIEW_LIBS)\ $(WEBKIT_LIBS) \ $(INTLLIBS) \ @@ -21,18 +19,20 @@ bin_PROGRAMS = \ midori midori_SOURCES = \ - main.c main.h \ - midori-webitem.c midori-webitem.h \ - midori-weblist.c midori-weblist.h \ - midori-app.c midori-app.h \ - midori-browser.c midori-browser.h \ - midori-panel.c midori-panel.h \ - midori-addons.c midori-addons.h \ - midori-console.c midori-console.h \ - midori-webview.c midori-webview.h \ - midori-websettings.c midori-websettings.h \ - midori-preferences.c midori-preferences.h \ - midori-searchentry.c midori-searchentry.h \ + main.c main.h \ + gtkiconentry.c gtkiconentry.h \ + midori-webitem.c midori-webitem.h \ + midori-weblist.c midori-weblist.h \ + midori-app.c midori-app.h \ + midori-browser.c midori-browser.h \ + midori-panel.c midori-panel.h \ + midori-addons.c midori-addons.h \ + midori-console.c midori-console.h \ + midori-webview.c midori-webview.h \ + midori-websettings.c midori-websettings.h \ + midori-preferences.c midori-preferences.h \ + midori-searchentry.c midori-searchentry.h \ + midori-locationentry.c midori-locationentry.h \ gjs.c gjs.h \ sokoke.c sokoke.h \ compat.c compat.h diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c new file mode 100644 index 00000000..0745d5ba --- /dev/null +++ b/midori/gtkiconentry.c @@ -0,0 +1,1601 @@ +/* + * Copyright (C) 2004-2006 Christian Hammond. + * Copyright (C) 2008 Cody Russell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include + +#ifndef GTK_IMAGE_GICON +#define GTK_IMAGE_GICON 8 +#endif + +#ifndef GTK_PARAM_READABLE +#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#endif + +#ifndef GTK_PARAM_WRITABLE +#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#endif + +#ifndef GTK_PARAM_READWRITE +#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#endif + +#define P_(s) (s) + +#include "gtkiconentry.h" + +#define ICON_MARGIN 2 +#define MAX_ICONS 2 + +#define IS_VALID_ICON_ENTRY_POSITION(pos) \ + ((pos) == GTK_ICON_ENTRY_PRIMARY || \ + (pos) == GTK_ICON_ENTRY_SECONDARY) + +#define GTK_ICON_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ICON_ENTRY, GtkIconEntryPrivate)) + +typedef struct +{ + GdkPixbuf *pixbuf; + gboolean highlight; + gboolean hovered; + GdkWindow *window; + gchar *tooltip_text; + GdkCursorType cursor_type; + gboolean custom_cursor; + GtkImageType storage_type; + #if GLIB_CHECK_VERSION (2, 16, 0) + GIcon *gicon; + #endif + gchar *icon_name; + gboolean insensitive; +} EntryIconInfo; + +typedef struct _GtkIconEntryPrivate +{ + EntryIconInfo icons[MAX_ICONS]; + + gulong icon_released_id; +} GtkIconEntryPrivate; + +enum +{ + ICON_PRESSED, + ICON_RELEASED, + LAST_SIGNAL +}; + +enum +{ + PROP_0, + PROP_PIXBUF_PRIMARY, + PROP_PIXBUF_SECONDARY, + PROP_STOCK_PRIMARY, + PROP_STOCK_SECONDARY, + PROP_ICON_NAME_PRIMARY, + PROP_ICON_NAME_SECONDARY, + PROP_GICON_PRIMARY, + PROP_GICON_SECONDARY, + PROP_SENSITIVITY_PRIMARY, + PROP_SENSITIVITY_SECONDARY +}; + +static void gtk_icon_entry_class_init (GtkIconEntryClass *klass); +static void gtk_icon_entry_editable_init (GtkEditableClass *iface); +static void gtk_icon_entry_init (GtkIconEntry *entry); +static void gtk_icon_entry_finalize (GObject *obj); +static void gtk_icon_entry_dispose (GObject *obj); +static void gtk_icon_entry_map (GtkWidget *widget); +static void gtk_icon_entry_unmap (GtkWidget *widget); +static void gtk_icon_entry_realize (GtkWidget *widget); +static void gtk_icon_entry_unrealize (GtkWidget *widget); +static void gtk_icon_entry_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gtk_icon_entry_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static gint gtk_icon_entry_expose (GtkWidget *widget, + GdkEventExpose *event); +static gint gtk_icon_entry_enter_notify (GtkWidget *widget, + GdkEventCrossing *event); +static gint gtk_icon_entry_leave_notify (GtkWidget *widget, + GdkEventCrossing *event); +static gint gtk_icon_entry_button_press (GtkWidget *widget, + GdkEventButton *event); +static gint gtk_icon_entry_button_release (GtkWidget *widget, + GdkEventButton *event); +static void gtk_icon_entry_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_icon_entry_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void gtk_icon_entry_style_set (GtkWidget *widget, + GtkStyle *prev_style); +static void gtk_icon_entry_set_icon_internal (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf); +static void icon_theme_changed (GtkIconEntry *entry); + + +static GtkEntryClass *parent_class = NULL; +static guint signals[LAST_SIGNAL] = {0}; + +G_DEFINE_TYPE_EXTENDED (GtkIconEntry, gtk_icon_entry, GTK_TYPE_ENTRY, + 0, + G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, + gtk_icon_entry_editable_init)); + +static void +gtk_icon_entry_class_init (GtkIconEntryClass *klass) +{ + GObjectClass *gobject_class; + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkEntryClass *entry_class; + + parent_class = g_type_class_peek_parent(klass); + + gobject_class = G_OBJECT_CLASS(klass); + object_class = GTK_OBJECT_CLASS(klass); + widget_class = GTK_WIDGET_CLASS(klass); + entry_class = GTK_ENTRY_CLASS(klass); + + gobject_class->finalize = gtk_icon_entry_finalize; + gobject_class->dispose = gtk_icon_entry_dispose; + gobject_class->set_property = gtk_icon_entry_set_property; + gobject_class->get_property = gtk_icon_entry_get_property; + + widget_class->map = gtk_icon_entry_map; + widget_class->unmap = gtk_icon_entry_unmap; + widget_class->realize = gtk_icon_entry_realize; + widget_class->unrealize = gtk_icon_entry_unrealize; + widget_class->size_request = gtk_icon_entry_size_request; + widget_class->size_allocate = gtk_icon_entry_size_allocate; + widget_class->expose_event = gtk_icon_entry_expose; + widget_class->enter_notify_event = gtk_icon_entry_enter_notify; + widget_class->leave_notify_event = gtk_icon_entry_leave_notify; + widget_class->button_press_event = gtk_icon_entry_button_press; + widget_class->button_release_event = gtk_icon_entry_button_release; + widget_class->style_set = gtk_icon_entry_style_set; + + /** + * GtkIconEntry::icon-pressed: + * @entry: The entry on which the signal is emitted. + * @icon_pos: The position of the clicked icon. + * @button: The mouse button clicked. + * + * The ::icon-pressed signal is emitted when an icon is clicked. + */ + signals[ICON_PRESSED] = + g_signal_new ("icon_pressed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkIconEntryClass, icon_pressed), + NULL, NULL, + gtk_marshal_VOID__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); + + /** + * GtkIconEntry::icon-released: + * @entry: The entry on which the signal is emitted. + * @icon_pos: The position of the clicked icon. + * @button: The mouse button clicked. + * + * The ::icon-released signal is emitted on the button release from a + * mouse click. + */ + signals[ICON_RELEASED] = + g_signal_new ("icon_released", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkIconEntryClass, icon_released), + NULL, NULL, + gtk_marshal_VOID__INT_INT, + G_TYPE_NONE, 2, + G_TYPE_INT, + G_TYPE_INT); + + /** + * GtkIconEntry:pixbuf-primary: + * + * An image to use as the primary icon for the entry. + */ + g_object_class_install_property (gobject_class, + PROP_PIXBUF_PRIMARY, + g_param_spec_object ("pixbuf-primary", + P_("Primary pixbuf"), + P_("Primary pixbuf for the entry"), + GDK_TYPE_PIXBUF, + GTK_PARAM_READWRITE)); + + /** + * GtkIconEntry:pixbuf-secondary: + * + * An image to use as the secondary icon for the entry. + */ + g_object_class_install_property (gobject_class, + PROP_PIXBUF_SECONDARY, + g_param_spec_object ("pixbuf-secondary", + P_("Secondary pixbuf"), + P_("Secondary pixbuf for the entry"), + GDK_TYPE_PIXBUF, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_STOCK_PRIMARY, + g_param_spec_string ("stock-primary", + P_("Primary stock ID"), + P_("Stock ID for primary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_STOCK_SECONDARY, + g_param_spec_string ("stock-secondary", + P_("Secondary stock ID"), + P_("Stock ID for secondary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_ICON_NAME_PRIMARY, + g_param_spec_string ("icon-name-primary", + P_("Primary icon name"), + P_("Icon name for primary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + g_object_class_install_property (gobject_class, + PROP_ICON_NAME_SECONDARY, + g_param_spec_string ("icon-name-secondary", + P_("Secondary icon name"), + P_("Icon name for secondary icon"), + NULL, + GTK_PARAM_WRITABLE)); + + #if GLIB_CHECK_VERSION (2, 16, 0) + g_object_class_install_property (gobject_class, + PROP_GICON_PRIMARY, + g_param_spec_object ("gicon-primary", + P_("Primary GIcon"), + P_("GIcon for primary icon"), + G_TYPE_ICON, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_GICON_SECONDARY, + g_param_spec_object ("gicon-secondary", + P_("Secondary GIcon"), + P_("GIcon for secondary icon"), + G_TYPE_ICON, + GTK_PARAM_READWRITE)); + #endif + + g_type_class_add_private (klass, sizeof (GtkIconEntryPrivate)); +} + +static void +gtk_icon_entry_editable_init (GtkEditableClass *iface) +{ +}; + +static void +gtk_icon_entry_init (GtkIconEntry *entry) +{ +} + +static void +gtk_icon_entry_finalize (GObject *obj) +{ + GtkIconEntry *entry; + + g_return_if_fail (obj != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY(obj)); + + entry = GTK_ICON_ENTRY (obj); + + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +static void +gtk_icon_entry_dispose (GObject *obj) +{ + GtkIconEntry *entry; + + entry = GTK_ICON_ENTRY (obj); + + gtk_icon_entry_set_icon_from_pixbuf (entry, GTK_ICON_ENTRY_PRIMARY, NULL); + gtk_icon_entry_set_icon_from_pixbuf (entry, GTK_ICON_ENTRY_SECONDARY, NULL); + + G_OBJECT_CLASS (parent_class)->dispose (obj); +} + +static void +gtk_icon_entry_map (GtkWidget *widget) +{ + GtkIconEntryPrivate *priv; + GdkCursor *cursor; + + if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget)) + { + int i; + + GTK_WIDGET_CLASS (parent_class)->map (widget); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (widget); + + for (i = 0; i < MAX_ICONS; i++) + { + if (priv->icons[i].pixbuf != NULL) + gdk_window_show (priv->icons[i].window); + + if (priv->icons[i].custom_cursor == TRUE && !priv->icons[i].insensitive) + { + cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), + priv->icons[i].cursor_type); + + gdk_window_set_cursor (priv->icons[i].window, cursor); + gdk_cursor_unref (cursor); + } + } + + GTK_WIDGET_CLASS (parent_class)->map (widget); + } +} + +static void +gtk_icon_entry_unmap (GtkWidget *widget) +{ + GtkIconEntryPrivate *priv; + + if (GTK_WIDGET_MAPPED (widget)) + { + int i; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (widget); + + for (i = 0; i < MAX_ICONS; i++) + { + if (priv->icons[i].pixbuf != NULL) + { + gdk_window_hide (priv->icons[i].window); + } + } + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); + } +} + +static void +gtk_icon_entry_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GtkIconEntry *entry = GTK_ICON_ENTRY (object); + + switch (prop_id) + { + case PROP_PIXBUF_PRIMARY: + gtk_icon_entry_set_icon_from_pixbuf (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_object (value)); + break; + + case PROP_PIXBUF_SECONDARY: + gtk_icon_entry_set_icon_from_pixbuf (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_object (value)); + break; + + case PROP_STOCK_PRIMARY: + gtk_icon_entry_set_icon_from_stock (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_string (value)); + break; + + case PROP_STOCK_SECONDARY: + gtk_icon_entry_set_icon_from_stock (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_string (value)); + break; + + case PROP_ICON_NAME_PRIMARY: + gtk_icon_entry_set_icon_from_icon_name (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_string (value)); + break; + + case PROP_ICON_NAME_SECONDARY: + gtk_icon_entry_set_icon_from_icon_name (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_string (value)); + break; + + #if GLIB_CHECK_VERSION (2, 16, 0) + case PROP_GICON_PRIMARY: + gtk_icon_entry_set_icon_from_gicon (entry, + GTK_ICON_ENTRY_PRIMARY, + g_value_get_object (value)); + break; + + case PROP_GICON_SECONDARY: + gtk_icon_entry_set_icon_from_gicon (entry, + GTK_ICON_ENTRY_SECONDARY, + g_value_get_object (value)); + break; + #endif + } +} + +static void +gtk_icon_entry_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GtkIconEntry *entry = GTK_ICON_ENTRY (object); + + switch (prop_id) + { + case PROP_PIXBUF_PRIMARY: + g_value_set_object (value, + gtk_icon_entry_get_pixbuf (entry, + GTK_ICON_ENTRY_PRIMARY)); + break; + + case PROP_PIXBUF_SECONDARY: + g_value_set_object (value, + gtk_icon_entry_get_pixbuf (entry, + GTK_ICON_ENTRY_SECONDARY)); + break; + + #if GLIB_CHECK_VERSION (2, 16, 0) + case PROP_GICON_PRIMARY: + g_value_set_object (value, + gtk_icon_entry_get_gicon (entry, + GTK_ICON_ENTRY_PRIMARY)); + break; + + case PROP_GICON_SECONDARY: + g_value_set_object (value, + gtk_icon_entry_get_gicon (entry, + GTK_ICON_ENTRY_SECONDARY)); + #endif + } +} + +static gint +get_icon_width (GtkIconEntry *entry, GtkIconEntryPosition icon_pos) +{ + gint menu_icon_width; + gint width; + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + if (icon_info->pixbuf == NULL) + return 0; + + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &menu_icon_width, NULL); + + width = MAX (gdk_pixbuf_get_width (icon_info->pixbuf), menu_icon_width); + + return width; +} + +static void +get_borders (GtkIconEntry *entry, gint *xborder, gint *yborder) +{ + GtkWidget *widget = GTK_WIDGET (entry); + gint focus_width; + gboolean interior_focus; + + gtk_widget_style_get (widget, + "interior-focus", &interior_focus, + "focus-line-width", &focus_width, + NULL); + + if (gtk_entry_get_has_frame (GTK_ENTRY (entry))) + { + *xborder = widget->style->xthickness; + *yborder = widget->style->ythickness; + } + else + { + *xborder = 0; + *yborder = 0; + } + + if (!interior_focus) + { + *xborder += focus_width; + *yborder += focus_width; + } +} + +static void +get_text_area_size (GtkIconEntry *entry, GtkAllocation *alloc) +{ + GtkWidget *widget = GTK_WIDGET (entry); + GtkRequisition requisition; + gint xborder, yborder; + + gtk_widget_get_child_requisition (widget, &requisition); + get_borders (entry, &xborder, &yborder); + + alloc->x = xborder; + alloc->y = yborder; + alloc->width = widget->allocation.width - xborder * 2; + alloc->height = requisition.height - yborder * 2; +} + +static void +get_icon_allocation (GtkIconEntry *icon_entry, + gboolean left, + GtkAllocation *widget_alloc, + GtkAllocation *text_area_alloc, + GtkAllocation *allocation, + GtkIconEntryPosition *icon_pos) +{ + gboolean rtl; + + rtl = (gtk_widget_get_direction (GTK_WIDGET (icon_entry)) == + GTK_TEXT_DIR_RTL); + + if (left) + *icon_pos = (rtl ? GTK_ICON_ENTRY_SECONDARY : GTK_ICON_ENTRY_PRIMARY); + else + *icon_pos = (rtl ? GTK_ICON_ENTRY_PRIMARY : GTK_ICON_ENTRY_SECONDARY); + + allocation->y = text_area_alloc->y; + allocation->width = get_icon_width(icon_entry, *icon_pos); + allocation->height = text_area_alloc->height; + + if (left) + { + allocation->x = text_area_alloc->x + ICON_MARGIN; + } + else + { + allocation->x = text_area_alloc->x + text_area_alloc->width - + allocation->width - ICON_MARGIN; + } +} + +static void +gtk_icon_entry_realize (GtkWidget *widget) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + GdkWindowAttr attributes; + gint attributes_mask; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + GTK_WIDGET_CLASS (parent_class)->realize (widget); + + attributes.x = 0; + attributes.y = 0; + attributes.width = 1; + attributes.height = 1; + attributes.window_type = GDK_WINDOW_CHILD; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.colormap = gtk_widget_get_colormap (widget); + attributes.event_mask = gtk_widget_get_events (widget); + attributes.event_mask |= + (GDK_EXPOSURE_MASK + | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + for (i = 0; i < MAX_ICONS; i++) + { + EntryIconInfo *icon_info; + + icon_info = &priv->icons[i]; + icon_info->window = gdk_window_new (widget->window, &attributes, + attributes_mask); + gdk_window_set_user_data (icon_info->window, widget); + + gdk_window_set_background (icon_info->window, + &widget->style->base[GTK_WIDGET_STATE(widget)]); + } + + gtk_widget_queue_resize (widget); +} + +static void +gtk_icon_entry_unrealize (GtkWidget *widget) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + GTK_WIDGET_CLASS (parent_class)->unrealize (widget); + + for (i = 0; i < MAX_ICONS; i++) + { + EntryIconInfo *icon_info = &priv->icons[i]; + + gdk_window_destroy (icon_info->window); + icon_info->window = NULL; + } +} + +static void +gtk_icon_entry_size_request (GtkWidget *widget, GtkRequisition *requisition) +{ + GtkEntry *gtkentry; + GtkIconEntry *entry; + gint icon_widths = 0; + int i; + + gtkentry = GTK_ENTRY(widget); + entry = GTK_ICON_ENTRY(widget); + + for (i = 0; i < MAX_ICONS; i++) + { + int icon_width = get_icon_width (entry, i); + + if (icon_width > 0) + { + icon_widths += icon_width + ICON_MARGIN; + } + } + + GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); + + if (icon_widths > requisition->width) + requisition->width += icon_widths; +} + +static void +place_windows (GtkIconEntry *icon_entry, GtkAllocation *widget_alloc) +{ + GtkIconEntryPosition left_icon_pos; + GtkIconEntryPosition right_icon_pos; + GtkAllocation left_icon_alloc; + GtkAllocation right_icon_alloc; + GtkAllocation text_area_alloc; + GtkIconEntryPrivate *priv; + gint y; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (icon_entry); + + get_text_area_size (icon_entry, &text_area_alloc); + + /* DJW center text/icon + * TODO flicker needs to be eliminated + */ + gdk_window_get_geometry (GTK_ENTRY (icon_entry)->text_area, NULL, &y, NULL, NULL, NULL); + text_area_alloc.y = y; + + get_icon_allocation (icon_entry, TRUE, widget_alloc, &text_area_alloc, + &left_icon_alloc, &left_icon_pos); + get_icon_allocation (icon_entry, FALSE, widget_alloc, &text_area_alloc, + &right_icon_alloc, &right_icon_pos); + + if (left_icon_alloc.width > 0) + { + text_area_alloc.x = left_icon_alloc.x + left_icon_alloc.width + ICON_MARGIN; + } + + if (right_icon_alloc.width > 0) + { + text_area_alloc.width -= right_icon_alloc.width + ICON_MARGIN; + } + + text_area_alloc.width -= text_area_alloc.x; + + gdk_window_move_resize (priv->icons[left_icon_pos].window, + left_icon_alloc.x, left_icon_alloc.y, + left_icon_alloc.width, left_icon_alloc.height); + + gdk_window_move_resize (priv->icons[right_icon_pos].window, + right_icon_alloc.x, right_icon_alloc.y, + right_icon_alloc.width, right_icon_alloc.height); + + gdk_window_move_resize (GTK_ENTRY (icon_entry)->text_area, + text_area_alloc.x, text_area_alloc.y, + text_area_alloc.width, text_area_alloc.height); +} + +static void +gtk_icon_entry_size_allocate (GtkWidget *widget, GtkAllocation *allocation) +{ + g_return_if_fail (GTK_IS_ICON_ENTRY(widget)); + g_return_if_fail (allocation != NULL); + + widget->allocation = *allocation; + + GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); + + if (GTK_WIDGET_REALIZED (widget)) + place_windows (GTK_ICON_ENTRY (widget), allocation); +} + +static GdkPixbuf * +get_pixbuf_from_icon (GtkIconEntry *entry, GtkIconEntryPosition icon_pos) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + g_object_ref (icon_info->pixbuf); + + return icon_info->pixbuf; +} + +/* Kudos to the gnome-panel guys. */ +static void +colorshift_pixbuf (GdkPixbuf *dest, GdkPixbuf *src, int shift) +{ + gint i, j; + gint width, height, has_alpha, src_rowstride, dest_rowstride; + guchar *target_pixels; + guchar *original_pixels; + guchar *pix_src; + guchar *pix_dest; + int val; + guchar r, g, b; + + has_alpha = gdk_pixbuf_get_has_alpha (src); + width = gdk_pixbuf_get_width (src); + height = gdk_pixbuf_get_height (src); + src_rowstride = gdk_pixbuf_get_rowstride (src); + dest_rowstride = gdk_pixbuf_get_rowstride (dest); + original_pixels = gdk_pixbuf_get_pixels (src); + target_pixels = gdk_pixbuf_get_pixels (dest); + + for (i = 0; i < height; i++) + { + pix_dest = target_pixels + i * dest_rowstride; + pix_src = original_pixels + i * src_rowstride; + + for (j = 0; j < width; j++) + { + r = *(pix_src++); + g = *(pix_src++); + b = *(pix_src++); + + val = r + shift; + *(pix_dest++) = CLAMP(val, 0, 255); + + val = g + shift; + *(pix_dest++) = CLAMP(val, 0, 255); + + val = b + shift; + *(pix_dest++) = CLAMP(val, 0, 255); + + if (has_alpha) + *(pix_dest++) = *(pix_src++); + } + } +} + +static void +draw_icon (GtkWidget *widget, GtkIconEntryPosition icon_pos) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + GdkPixbuf *pixbuf; + gint x, y, width, height; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + if (icon_info->pixbuf == NULL || !GTK_WIDGET_REALIZED (widget)) + return; + + if ((pixbuf = get_pixbuf_from_icon (entry, icon_pos)) == NULL) + return; + + gdk_drawable_get_size (icon_info->window, &width, &height); + + if (width == 1 || height == 1) + { + /* + * size_allocate hasn't been called yet. These are the default values. + */ + return; + } + + if (gdk_pixbuf_get_height (pixbuf) > height) + { + GdkPixbuf *temp_pixbuf; + int scale; + + scale = height - (2 * ICON_MARGIN); + + temp_pixbuf = gdk_pixbuf_scale_simple (pixbuf, scale, scale, + GDK_INTERP_BILINEAR); + + g_object_unref (pixbuf); + + pixbuf = temp_pixbuf; + } + + x = (width - gdk_pixbuf_get_width(pixbuf)) / 2; + y = (height - gdk_pixbuf_get_height(pixbuf)) / 2; + + if (icon_info->insensitive) + { + GdkPixbuf *temp_pixbuf; + + temp_pixbuf = gdk_pixbuf_copy (pixbuf); + + gdk_pixbuf_saturate_and_pixelate (pixbuf, + temp_pixbuf, + 0.8f, + TRUE); + g_object_unref (pixbuf); + pixbuf = temp_pixbuf; + } + else if (icon_info->hovered) + { + GdkPixbuf *temp_pixbuf; + + temp_pixbuf = gdk_pixbuf_copy (pixbuf); + + colorshift_pixbuf (temp_pixbuf, pixbuf, 30); + + g_object_unref (pixbuf); + + pixbuf = temp_pixbuf; + } + + gdk_draw_pixbuf (icon_info->window, widget->style->black_gc, pixbuf, + 0, 0, x, y, -1, -1, + GDK_RGB_DITHER_NORMAL, 0, 0); + + g_object_unref (pixbuf); +} + +static gint +gtk_icon_entry_expose (GtkWidget *widget, GdkEventExpose *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + + g_return_val_if_fail (GTK_IS_ICON_ENTRY (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + if (GTK_WIDGET_DRAWABLE (widget)) + { + gboolean found = FALSE; + int i; + + for (i = 0; i < MAX_ICONS && !found; i++) + { + EntryIconInfo *icon_info = &priv->icons[i]; + + if (event->window == icon_info->window) + { + gint width; + GtkAllocation text_area_alloc; + + get_text_area_size (entry, &text_area_alloc); + gdk_drawable_get_size (icon_info->window, &width, NULL); + + gtk_paint_flat_box (widget->style, icon_info->window, + GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE, + NULL, widget, "entry_bg", + 0, 0, width, text_area_alloc.height); + + draw_icon (widget, i); + + found = TRUE; + } + } + + if (!found) + GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); + } + + return FALSE; +} + +static gint +gtk_icon_entry_enter_notify (GtkWidget *widget, GdkEventCrossing *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + for (i = 0; i < MAX_ICONS; i++) + { + if (event->window == priv->icons[i].window) + { + if (gtk_icon_entry_get_icon_highlight (entry, i)) + { + priv->icons[i].hovered = TRUE; + + if (priv->icons[i].tooltip_text != NULL) + { + gtk_widget_set_tooltip_text (widget, + priv->icons[i].tooltip_text); + gtk_widget_set_has_tooltip (widget, TRUE); + } else { + gtk_widget_set_has_tooltip (widget, FALSE); + } + + gtk_widget_queue_draw (widget); + + break; + } + } + } + + return FALSE; +} + +static gint +gtk_icon_entry_leave_notify (GtkWidget *widget, GdkEventCrossing *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + for (i = 0; i < MAX_ICONS; i++) + { + if (event->window == priv->icons[i].window) + { + if (gtk_icon_entry_get_icon_highlight (entry, i)) + { + priv->icons[i].hovered = FALSE; + + gtk_widget_set_has_tooltip (widget, FALSE); + gtk_widget_queue_draw (widget); + + break; + } + } + } + + return FALSE; +} + +static gint +gtk_icon_entry_button_press (GtkWidget *widget, GdkEventButton *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + for (i = 0; i < MAX_ICONS; i++) + { + if (event->window == priv->icons[i].window) + { + if (event->button == 1 && gtk_icon_entry_get_icon_highlight (entry, i)) + { + priv->icons[i].hovered = FALSE; + + gtk_widget_queue_draw (widget); + } + + g_signal_emit (entry, signals[ICON_PRESSED], 0, i, event->button); + + return TRUE; + } + } + + if (GTK_WIDGET_CLASS (parent_class)->button_press_event) + return GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event); + + return FALSE; +} + +static gint +gtk_icon_entry_button_release (GtkWidget *widget, GdkEventButton *event) +{ + GtkIconEntry *entry; + GtkIconEntryPrivate *priv; + int i; + + entry = GTK_ICON_ENTRY (widget); + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + for (i = 0; i < MAX_ICONS; i++) + { + GdkWindow *icon_window = priv->icons[i].window; + + if (event->window == icon_window) + { + int width, height; + gdk_drawable_get_size (icon_window, &width, &height); + + if (event->button == 1 && + gtk_icon_entry_get_icon_highlight (entry, i) && + event->x >= 0 && event->y >= 0 && + event->x <= width && event->y <= height) + { + priv->icons[i].hovered = TRUE; + + gtk_widget_queue_draw (widget); + } + + g_signal_emit (entry, signals[ICON_RELEASED], 0, i, event->button); + + return TRUE; + } + } + + if (GTK_WIDGET_CLASS (parent_class)->button_release_event) + return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); + + return FALSE; +} + +static void +gtk_icon_entry_style_set (GtkWidget *widget, GtkStyle *prev_style) +{ + GtkIconEntry *icon_entry; + + icon_entry = GTK_ICON_ENTRY (widget); + + if (GTK_WIDGET_CLASS (gtk_icon_entry_parent_class)->style_set) + GTK_WIDGET_CLASS (gtk_icon_entry_parent_class)->style_set (widget, prev_style); + + icon_theme_changed (icon_entry); +} + +static void +icon_theme_changed (GtkIconEntry *entry) +{ + GtkIconEntryPrivate *priv; + int i; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + for (i = 0; i < MAX_ICONS; i++) + { + if (priv->icons[i].storage_type == GTK_IMAGE_ICON_NAME) + { + g_object_unref (priv->icons[i].pixbuf); + priv->icons[i].pixbuf = NULL; + + gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name); + } + + #if GLIB_CHECK_VERSION (2, 16, 0) + else if (priv->icons[i].storage_type == GTK_IMAGE_GICON) + { + g_object_unref (priv->icons[i].pixbuf); + priv->icons[i].pixbuf = NULL; + + gtk_icon_entry_set_icon_from_gicon (entry, i, priv->icons[i].gicon); + } + #endif + } + + gtk_widget_queue_draw (GTK_WIDGET (entry)); +} + +static void +gtk_icon_entry_set_icon_internal (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + if (pixbuf == icon_info->pixbuf) + return; + + if (icon_pos == GTK_ICON_ENTRY_SECONDARY && + priv->icon_released_id != 0) + { + g_signal_handler_disconnect (entry, priv->icon_released_id); + priv->icon_released_id = 0; + } + + if (pixbuf == NULL) + { + if (icon_info->pixbuf != NULL) + { + g_object_unref (icon_info->pixbuf); + icon_info->pixbuf = NULL; + + /* Explicitly check, as the pointer may become invalidated + * during destruction. + */ + if (icon_info->window != NULL && GDK_IS_WINDOW (icon_info->window)) + gdk_window_hide (icon_info->window); + } + } + else + { + if (icon_info->window != NULL && icon_info->pixbuf == NULL) + gdk_window_show (icon_info->window); + + icon_info->pixbuf = pixbuf; + g_object_ref (pixbuf); + } + + gtk_widget_queue_draw (GTK_WIDGET (entry)); +} + +/** + * gtk_icon_entry_new + * + * Creates a new GtkIconEntry widget. + * + * Returns a new #GtkIconEntry. + */ +GtkWidget * +gtk_icon_entry_new (void) +{ + return GTK_WIDGET (g_object_new (GTK_TYPE_ICON_ENTRY, NULL)); +} + +/** + * gtk_icon_entry_set_icon_from_pixbuf + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @pixbuf: A #GdkPixbuf. + * + * Sets the icon shown in the specified position using a pixbuf. + */ +void +gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + if (pixbuf == icon_info->pixbuf) + return; + + if (icon_pos == GTK_ICON_ENTRY_SECONDARY && + priv->icon_released_id != 0) + { + g_signal_handler_disconnect (entry, priv->icon_released_id); + priv->icon_released_id = 0; + } + + if (pixbuf == NULL) + { + if (icon_info->pixbuf != NULL) + { + g_object_unref (icon_info->pixbuf); + icon_info->pixbuf = NULL; + + /* Explicitly check, as the pointer may become invalidated + * during destruction. + */ + if (icon_info->window != NULL && GDK_IS_WINDOW (icon_info->window)) + gdk_window_hide (icon_info->window); + } + } + else + { + if (icon_info->window != NULL && icon_info->pixbuf == NULL) + gdk_window_show (icon_info->window); + + icon_info->pixbuf = pixbuf; + g_object_ref (pixbuf); + } + + gtk_widget_queue_draw (GTK_WIDGET (entry)); +} + +/** + * gtk_icon_entry_set_icon_from_stock + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @stock_id: The name of the stock item. + * + * Sets the icon shown in the entry at the specified position from a stock image. + */ +void +gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *stock_id) +{ + GdkPixbuf *pixbuf; + + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), + stock_id, + GTK_ICON_SIZE_MENU, + NULL); + + gtk_icon_entry_set_icon_internal (entry, + icon_pos, + pixbuf); +} + +/** + * gtk_icon_entry_set_icon_from_icon_name + * @entry: A #GtkIconEntry; + * @icon_pos: The position at which to set the icon + * @icon_name: An icon name + * + * Sets the icon shown in the entry at the specified position from the current + * icon theme. If the icon name isn't known, a "broken image" icon will be + * displayed instead. If the current icon theme is changed, the icon will be + * updated appropriately. + */ +void +gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *icon_name) +{ + GdkPixbuf *pixbuf = NULL; + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + GdkScreen *screen; + GtkIconTheme *icon_theme; + GtkSettings *settings; + gint width, height; + GError *error = NULL; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + screen = gtk_widget_get_screen (GTK_WIDGET (entry)); + icon_theme = gtk_icon_theme_get_for_screen (screen); + settings = gtk_settings_get_for_screen (screen); + + if (icon_name != NULL) + { + gtk_icon_size_lookup_for_settings (settings, + GTK_ICON_SIZE_MENU, + &width, &height); + + pixbuf = gtk_icon_theme_load_icon (icon_theme, + icon_name, + MIN (width, height), 0, &error); + + if (pixbuf == NULL) + { + g_error_free (error); + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), + GTK_STOCK_MISSING_IMAGE, + GTK_ICON_SIZE_MENU, + NULL); + } + } + + gtk_icon_entry_set_icon_internal (entry, + icon_pos, + pixbuf); +} + +/** + * gtk_icon_entry_set_icon_from_gicon + * @entry: A #GtkIconEntry; + * @icon_pos: The position at which to set the icon + * @icon: The icon to set + * + * Sets the icon shown in the entry at the specified position from the current + * icon theme. If the icon isn't known, a "broken image" icon will be displayed + * instead. If the current icon theme is changed, the icon will be updated + * appropriately. + */ + +#if GLIB_CHECK_VERSION (2, 16, 0) +void +gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GIcon *icon) +{ + GdkPixbuf *pixbuf = NULL; + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + GdkScreen *screen; + GtkIconTheme *icon_theme; + GtkSettings *settings; + gint width, height; + GError *error = NULL; + GtkIconInfo *info; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + screen = gtk_widget_get_screen (GTK_WIDGET (entry)); + icon_theme = gtk_icon_theme_get_for_screen (screen); + settings = gtk_settings_get_for_screen (screen); + + if (icon != NULL) + { + gtk_icon_size_lookup_for_settings (settings, + GTK_ICON_SIZE_MENU, + &width, &height); + + #if #GTK_CHECK_VERSION (2, 14, 0) + info = gtk_icon_theme_lookup_by_gicon (icon_theme, + icon, + MIN (width, height), 0); + #else + info = NULL; + #endif + pixbuf = gtk_icon_info_load_icon (info, &error); + if (pixbuf == NULL) + { + g_error_free (error); + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), + GTK_STOCK_MISSING_IMAGE, + GTK_ICON_SIZE_MENU, + NULL); + } + } + + gtk_icon_entry_set_icon_internal ((GtkIconEntry*)entry, + icon_pos, + pixbuf); +} +#endif + +/** + * gtk_icon_entry_set_cursor + * @entry: A #GtkIconEntry; + * @icon_pos: The position at which to set the cursor + * @cursor_type: A #GdkCursorType; describing the cursor to set + * + * Sets an alternate mouse cursor used for the specified icon. + */ +void +gtk_icon_entry_set_cursor (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkCursorType cursor_type) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + GdkCursor *cursor; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + icon_info->cursor_type = cursor_type; + icon_info->custom_cursor = TRUE; + + if (GTK_WIDGET_REALIZED (GTK_WIDGET (entry))) + { + cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (entry)), + cursor_type); + + gdk_window_set_cursor (icon_info->window, cursor); + gdk_cursor_unref (cursor); + } +} + +/** + * gtk_icon_entry_set_icon_highlight + * @entry: A #GtkIconEntry; + * @position: Icon position. + * @highlight: TRUE if the icon should highlight on mouse-over + * + * Determines whether the icon will highlight on mouse-over. + */ +void +gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + gboolean highlight) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + icon_info = &priv->icons[icon_pos]; + + if (icon_info->highlight == highlight) + return; + + icon_info->highlight = highlight; +} + +/** + * gtk_icon_entry_get_pixbuf + * @entry: A #GtkIconEntry. + * @position: Icon position. + * + * Retrieves the image used for the icon. Unlike the other methods of setting + * and getting icon data, this method will work regardless of whether the icon + * was set using a #GdkPixbuf, a #GIcon, a stock item, or an icon name. + * + * Returns: A #GdkPixbuf, or NULL if no icon is set for this position. + */ +GdkPixbuf * +gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos) +{ + GtkIconEntryPrivate *priv; + + g_return_val_if_fail (entry != NULL, NULL); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL); + g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + return priv->icons[icon_pos].pixbuf; +} + +/** + * gtk_icon_entry_get_gicon + * @entry: A #GtkIconEntry + * @position: Icon position. + * + * Retrieves the GIcon used for the icon, or NULL if there is no icon or if + * the icon was set by some other method (e.g., by stock, pixbuf, or icon name). + * + * Returns: A #GIcon, or NULL if no icon is set or if the icon is not a GIcon. + */ + + +#if GLIB_CHECK_VERSION (2, 16, 0) +GIcon * +gtk_icon_entry_get_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos) +{ + GtkIconEntryPrivate *priv; + EntryIconInfo *icon_info; + + g_return_val_if_fail (entry != NULL, NULL); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL); + g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), NULL); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + icon_info = &priv->icons[icon_pos]; + + return icon_info->storage_type == GTK_IMAGE_GICON ? icon_info->gicon : NULL; +} +#endif + +/** + * gtk_icon_entry_get_icon_highlight + * @entry: A #GtkIconEntry. + * @position: Icon position. + * + * Retrieves whether entry will highlight the icon on mouseover. + * + * Returns: TRUE if icon highlights. + */ +gboolean +gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos) +{ + GtkIconEntryPrivate *priv; + + g_return_val_if_fail (entry != NULL, FALSE); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), FALSE); + g_return_val_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos), FALSE); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + return priv->icons[icon_pos].highlight; +} + +/** + * gtk_icon_entry_set_tooltip + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @text: The text to be used for the tooltip. + * + * Sets the tooltip text used for the specified icon. + */ +void +gtk_icon_entry_set_tooltip (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *text) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + gchar *new_tooltip; + + g_return_if_fail (entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); + + icon_info = &priv->icons[icon_pos]; + + new_tooltip = g_strdup (text); + if (icon_info->tooltip_text != NULL) + g_free (icon_info->tooltip_text); + icon_info->tooltip_text = new_tooltip; +} + +/** + * gtk_icon_entry_set_icon_sensitive + * @entry: A #GtkIconEntry. + * @position: Icon position. + * @sensitive: Specifies whether the icon should appear sensitive or insensitive. + * + * Sets the sensitivity for the specified icon. + */ +void +gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + gboolean sensitive) +{ + EntryIconInfo *icon_info; + GtkIconEntryPrivate *priv; + + g_return_if_fail (icon_entry != NULL); + g_return_if_fail (GTK_IS_ICON_ENTRY (icon_entry)); + g_return_if_fail (IS_VALID_ICON_ENTRY_POSITION (icon_pos)); + + priv = GTK_ICON_ENTRY_GET_PRIVATE (icon_entry); + + icon_info = &priv->icons[icon_pos]; + + icon_info->insensitive = !sensitive; + + if (icon_info->custom_cursor == TRUE && GTK_WIDGET_REALIZED (GTK_WIDGET (icon_entry))) + { + GdkCursor *cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (icon_entry)), + sensitive ? icon_info->cursor_type : GDK_ARROW); + gdk_window_set_cursor (icon_info->window, cursor); + gdk_cursor_unref (cursor); + } +} diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h new file mode 100644 index 00000000..314eccb6 --- /dev/null +++ b/midori/gtkiconentry.h @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2004-2006 Christian Hammond. + * Copyright (C) 2008 Cody Russell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GTK_ICON_ENTRY_H__ +#define __GTK_ICON_ENTRY_H__ + + +#include +#if GLIB_CHECK_VERSION (2, 16, 0) +#include +#endif +#include + +G_BEGIN_DECLS + +#define GTK_TYPE_ICON_ENTRY (gtk_icon_entry_get_type()) +#define GTK_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntry)) +#define GTK_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass)) +#define GTK_IS_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_ICON_ENTRY)) +#define GTK_IS_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_ICON_ENTRY)) +#define GTK_ICON_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass)) + +typedef enum +{ + GTK_ICON_ENTRY_PRIMARY, + GTK_ICON_ENTRY_SECONDARY +} GtkIconEntryPosition; + +typedef struct _GtkIconEntry GtkIconEntry; +typedef struct _GtkIconEntryClass GtkIconEntryClass; + +struct _GtkIconEntry +{ + GtkEntry parent_object; +}; + +struct _GtkIconEntryClass +{ + GtkEntryClass parent_class; + + /* Signals */ + void (*icon_pressed) (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + int button); + void (*icon_released) (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + int button); + + void (*gtk_reserved1) (void); + void (*gtk_reserved2) (void); + void (*gtk_reserved3) (void); + void (*gtk_reserved4) (void); +}; + +GType gtk_icon_entry_get_type (void) G_GNUC_CONST; + +GtkWidget* gtk_icon_entry_new (void); + +void gtk_icon_entry_set_icon_from_pixbuf (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GdkPixbuf *pixbuf); +void gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *stock_id); +void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + const gchar *icon_name); + +#if GLIB_CHECK_VERSION (2, 16, 0) +void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + GIcon *icon); +#endif +GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos); +#if GLIB_CHECK_VERSION (2, 16, 0) +GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos); +#endif + +void gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos, + gboolean highlight); + +gboolean gtk_icon_entry_get_icon_highlight (const GtkIconEntry *entry, + GtkIconEntryPosition icon_pos); + +void gtk_icon_entry_set_cursor (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + GdkCursorType cursor_type); + +void gtk_icon_entry_set_tooltip (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + const gchar *text); + +void gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry, + GtkIconEntryPosition icon_pos, + gboolean sensitive); + +G_END_DECLS + +#endif /* __GTK_ICON_ENTRY_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d8542690..10b1e974 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -14,6 +14,7 @@ #include "midori-browser.h" #include "main.h" +#include "gtkiconentry.h" #include "sokoke.h" #include "midori-webview.h" #include "midori-preferences.h" @@ -21,6 +22,7 @@ #include "midori-addons.h" #include "midori-console.h" #include "midori-searchentry.h" +#include "midori-locationentry.h" #include "compat.h" #if GLIB_CHECK_VERSION (2, 16, 0) @@ -29,7 +31,6 @@ #include #include #include -#include #if HAVE_GTKSOURCEVIEW #include #include @@ -50,7 +51,6 @@ struct _MidoriBrowser GtkWidget* navigationbar; GtkWidget* button_tab_new; GtkWidget* button_homepage; - GtkWidget* location_icon; GtkWidget* location; GtkWidget* search; GtkWidget* button_trash; @@ -123,12 +123,19 @@ midori_browser_set_property (GObject* object, const GValue* value, GParamSpec* pspec); +static void +midori_browser_location_active_changed_cb (MidoriLocationEntry* location_entry, + gint index, + MidoriBrowser* browser); + static void midori_browser_get_property (GObject* object, guint prop_id, GValue* value, GParamSpec* pspec); + + static GtkAction* _action_by_name (MidoriBrowser* browser, const gchar* name) @@ -278,7 +285,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); icon = katze_throbber_get_static_pixbuf (KATZE_THROBBER ( g_object_get_data (G_OBJECT (widget), "browser-tab-icon"))); - gtk_image_set_from_pixbuf (GTK_IMAGE (browser->location_icon), icon); } static GtkWidget* @@ -411,12 +417,29 @@ midori_web_view_title_changed_cb (GtkWidget* web_view, { if (web_view == midori_browser_get_current_web_view (browser)) { + MidoriLocationEntryItem item; + const gchar* title = midori_web_view_get_display_title ( MIDORI_WEB_VIEW (web_view)); gchar* window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); + + item.favicon = midori_web_view_get_icon (MIDORI_WEB_VIEW (web_view)); + item.uri = midori_location_entry_get_text ( + MIDORI_LOCATION_ENTRY (browser->location)); + item.title = title; + + g_signal_handlers_block_by_func (browser->location, + midori_browser_location_active_changed_cb, browser); + + midori_location_entry_add_item (MIDORI_LOCATION_ENTRY + (browser->location), &item); + + g_signal_handlers_unblock_by_func (browser->location, + midori_browser_location_active_changed_cb, browser); + g_object_unref (item.favicon); } } @@ -444,7 +467,7 @@ midori_web_view_load_committed_cb (GtkWidget* web_view, if (web_view == midori_browser_get_current_web_view (browser)) { const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - gtk_entry_set_text (GTK_ENTRY (browser->location), uri); + midori_location_entry_set_text (MIDORI_LOCATION_ENTRY (browser->location), uri); _midori_browser_set_statusbar_text (browser, NULL); } } @@ -1611,10 +1634,8 @@ _action_find_activate(GtkAction* action, } else { - GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, - GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->find_text), - SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); gtk_widget_show (browser->find); gtk_widget_grab_focus (GTK_WIDGET (browser->find_text)); @@ -1635,13 +1656,9 @@ _midori_browser_find (MidoriBrowser* browser, text, case_sensitive, forward); if (GTK_WIDGET_VISIBLE (browser->find)) { - GtkWidget* icon; - if (found) - icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - else - icon = gtk_image_new_from_stock (GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->find_text), - SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), + GTK_ICON_ENTRY_PRIMARY, + (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); _midori_browser_tab_mark_text_matches (browser, widget, text, case_sensitive); const gboolean highlight = gtk_toggle_tool_button_get_active ( @@ -1993,6 +2010,22 @@ _action_homepage_activate (GtkAction* action, g_free (homepage); } +/* catch the active-changed signal so that we can display the pack + when selected from the list */ +static void +midori_browser_location_active_changed_cb (MidoriLocationEntry* location_entry, + gint index, + MidoriBrowser* browser) +{ + const gchar* uri; + + if (index > -1) + { + uri = midori_location_entry_get_text (location_entry); + _midori_browser_open_uri (browser, uri); + } +} + static gboolean midori_browser_location_key_press_event_cb (GtkWidget* widget, GdkEventKey* event, @@ -2020,7 +2053,7 @@ midori_browser_location_key_press_event_cb (GtkWidget* widget, /* TODO: Use new_uri intermediately when completion is better Completion should be generated from history, that is the uri as well as the title. */ - sokoke_entry_append_completion (GTK_ENTRY (widget), uri); + /* sokoke_entry_append_completion (GTK_ENTRY (widget), uri); */ _midori_browser_open_uri (browser, new_uri); g_free (new_uri); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); @@ -2518,7 +2551,14 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, widget = midori_browser_get_current_tab (browser); uri = _midori_browser_get_tab_uri (browser, widget); - gtk_entry_set_text (GTK_ENTRY (browser->location), uri); + + g_signal_handlers_block_by_func (browser->location, + midori_browser_location_active_changed_cb, browser); + midori_location_entry_set_item_from_uri (MIDORI_LOCATION_ENTRY + (browser->location), uri); + g_signal_handlers_unblock_by_func (browser->location, + midori_browser_location_active_changed_cb, browser); + title = _midori_browser_get_tab_title (browser, widget); window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); @@ -3095,6 +3135,16 @@ midori_browser_search_activate_cb (GtkWidget* widget, g_free (location_entry_search); } +static void +midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, + gint icon_pos, + gint button, + gpointer user_data) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text (GTK_ENTRY (entry), ""); +} + static void midori_browser_search_notify_current_item_cb (GObject *gobject, GParamSpec *arg1, @@ -3227,13 +3277,12 @@ midori_browser_init (MidoriBrowser* browser) ui_manager, "/toolbar_navigation/Homepage"); /* Location */ - browser->location = sexy_icon_entry_new (); - sokoke_entry_setup_completion (GTK_ENTRY (browser->location)); - browser->location_icon = gtk_image_new (); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (browser->location) - , SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (browser->location_icon)); - sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (browser->location)); + browser->location = midori_location_entry_new (); + /* FIXME: sokoke_entry_setup_completion (GTK_ENTRY (browser->location)); */ g_object_connect (browser->location, + "signal::active-changed", + midori_browser_location_active_changed_cb, browser, NULL); + g_object_connect (gtk_bin_get_child (GTK_BIN (browser->location)), "signal::key-press-event", midori_browser_location_key_press_event_cb, browser, "signal::focus-out-event", @@ -3243,7 +3292,9 @@ midori_browser_init (MidoriBrowser* browser) NULL); GtkToolItem* toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_container_add (GTK_CONTAINER(toolitem), browser->location); + GtkWidget* align = gtk_alignment_new (0, 0.5, 1, 0.1); + gtk_container_add (GTK_CONTAINER (align), browser->location); + gtk_container_add (GTK_CONTAINER(toolitem), align); gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), toolitem, -1); /* Search */ @@ -3462,12 +3513,15 @@ midori_browser_init (MidoriBrowser* browser) gtk_container_add (GTK_CONTAINER (toolitem), gtk_label_new_with_mnemonic (_("_Inline find:"))); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - browser->find_text = sexy_icon_entry_new (); - GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FIND, - GTK_ICON_SIZE_MENU); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY(browser->find_text), - SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon)); - sexy_icon_entry_add_clear_button (SEXY_ICON_ENTRY (browser->find_text)); + browser->find_text = gtk_icon_entry_new (); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY(browser->find_text), + GTK_ICON_ENTRY_PRIMARY, + GTK_STOCK_FIND); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), + GTK_ICON_ENTRY_SECONDARY, + GTK_STOCK_CLEAR); + g_signal_connect (browser->find_text, "icon_released", + G_CALLBACK (midori_browser_entry_clear_icon_released_cb), NULL); g_signal_connect (browser->find_text, "activate", G_CALLBACK (_action_find_next_activate), browser); toolitem = gtk_tool_item_new (); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c new file mode 100644 index 00000000..3e9c8728 --- /dev/null +++ b/midori/midori-locationentry.c @@ -0,0 +1,384 @@ +/* + Copyright (C) 2008 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-locationentry.h" +#include "gtkiconentry.h" +#include "sokoke.h" + +#include + +#define DEFAULT_ICON GTK_STOCK_FILE + +G_DEFINE_TYPE (MidoriLocationEntry, midori_location_entry, GTK_TYPE_COMBO_BOX_ENTRY) + +enum +{ + FAVICON_COL, + URI_COL, + TITLE_COL, + N_COLS +}; + +enum +{ + ACTIVE_CHANGED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + + +static void +entry_icon_released (GtkIconEntry* entry, + gint icon_pos, + gint button, + gpointer user_data); + +static gboolean +entry_key_press_event (GtkWidget* widget, + GdkEventKey* event, + MidoriLocationEntry* location_entry); + +static void +midori_location_entry_active_changed (GtkComboBox* combo_box, + gpointer user_data); + +static void +midori_location_entry_class_init (MidoriLocationEntryClass* class) +{ + signals[ACTIVE_CHANGED] = g_signal_new ("active-changed", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); +} + +static void +midori_location_entry_init (MidoriLocationEntry* location_entry) +{ + GtkWidget* entry; + GtkListStore* store; + GtkCellRenderer* renderer; + + /* we want the widget to have appears-as-list applied */ + gtk_rc_parse_string ("style \"midori-location-entry-style\" {\n" + " GtkComboBox::appears-as-list = 1\n }\n" + "widget_class \"*MidoriLocationEntry\" " + "style \"midori-location-entry-style\"\n"); + + entry = gtk_icon_entry_new (); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, TRUE); + g_signal_connect (entry, "icon_released", G_CALLBACK (entry_icon_released), NULL); + g_signal_connect (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); + + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (location_entry), entry); + + store = gtk_list_store_new (N_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); + g_object_set (G_OBJECT (location_entry), "model", GTK_TREE_MODEL (store), NULL); + g_object_unref(store); + + gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (location_entry), URI_COL); + gtk_cell_layout_clear (GTK_CELL_LAYOUT (location_entry)); + + /* setup the renderer for the favicon */ + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), renderer, "pixbuf", FAVICON_COL, NULL); + g_object_set (G_OBJECT (renderer), "xpad", 5, "ypad", 5, "yalign", 0.0, NULL); + + /* setup the renderer for the uri/title */ + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), renderer, "markup", TITLE_COL, NULL); + g_object_set (G_OBJECT (renderer), "xpad", 5, "ypad", 5, NULL); + g_object_set (G_OBJECT (renderer), "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + + gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), -1); + + g_signal_connect (location_entry, "changed", G_CALLBACK (midori_location_entry_active_changed), NULL); +} + +static gboolean +entry_key_press_event (GtkWidget* widget, + GdkEventKey* event, + MidoriLocationEntry* location_entry) +{ + switch (event->keyval) + { + case GDK_Down: + case GDK_Up: + { + if (!sokoke_object_get_boolean (location_entry, "popup-shown")) + gtk_combo_box_popup (GTK_COMBO_BOX (location_entry)); + return TRUE; + } + } + + return FALSE; +} + +static void +entry_icon_released (GtkIconEntry* entry, + gint icon_pos, + gint button, + gpointer user_data) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text (GTK_ENTRY (entry), ""); +} + +static void +midori_location_entry_active_changed (GtkComboBox* combo_box, + gpointer user_data) +{ + GtkTreeIter iter; + GtkIconEntry* entry; + GtkTreeModel* model; + GdkPixbuf* pixbuf; + + if (gtk_combo_box_get_active_iter (combo_box, &iter)) + { + entry = GTK_ICON_ENTRY (GTK_BIN (combo_box)->child); + + if (entry) + { + pixbuf = NULL; + + model = gtk_combo_box_get_model (combo_box); + gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, -1); + + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, pixbuf); + g_object_unref (pixbuf); + + g_signal_emit (MIDORI_LOCATION_ENTRY (combo_box), + signals[ACTIVE_CHANGED], 0, gtk_combo_box_get_active (combo_box)); + } + } +} + +static void +midori_location_entry_set_item (GtkTreeModel* model, + GtkTreeIter* iter, + MidoriLocationEntryItem* item) +{ + gchar* desc = NULL; + + if (item->title) + desc = g_strdup_printf ("%s - %s", item->uri, item->title); + else + desc = g_strdup_printf ("%s", item->uri); + + gtk_list_store_set (GTK_LIST_STORE (model), iter, + FAVICON_COL, item->favicon, URI_COL, item->uri, TITLE_COL, desc, -1); + + g_free (desc); +} + +/** + * midori_location_entry_new: + * + * Creates a new #MidoriLocationEntry. + * + * Return value: a new #MidoriLocationEntry + **/ +GtkWidget* +midori_location_entry_new (void) +{ + return (g_object_new (MIDORI_TYPE_LOCATION_ENTRY, NULL)); +} + +/** + * midori_location_entry_item_index: + * @location_entry: a #MidoriLocationEntry + * @uri: a string + * + * Gets the index of the item matching @uri. + * + * Return value: an integer + **/ +gint +midori_location_entry_item_index (MidoriLocationEntry* location_entry, + const gchar* uri) +{ + GtkTreeModel* model; + GtkTreeIter iter; + gint index; + gchar* tmpuri; + gint tmpindex; + + g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), -1); + g_return_val_if_fail (uri != NULL, -1); + + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + + index = -1; + if (gtk_tree_model_get_iter_first (model, &iter)) + { + tmpuri = NULL; + tmpindex = 0; + do + { + gtk_tree_model_get (model, &iter, URI_COL, &tmpuri, -1); + if (g_ascii_strcasecmp (uri, tmpuri) == 0) + { + g_free (tmpuri); + index = tmpindex; + break; + } + g_free (tmpuri); + tmpindex++; + } + while (gtk_tree_model_iter_next (model, &iter)); + } + return index; +} + +/** + * midori_location_entry_get_text: + * @location_entry: a #MidoriLocationEntry + * + * Gets the entry text. + * + * Return value: a string + **/ +const gchar* +midori_location_entry_get_text (MidoriLocationEntry* location_entry) +{ + GtkWidget* entry; + + g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), NULL); + + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL); + + return gtk_entry_get_text (GTK_ENTRY (entry)); +} + +/** + * midori_location_entry_set_text: + * @location_entry: a #MidoriLocationEntry + * @text: a string + * + * Sets the entry text to @text. + **/ +void +midori_location_entry_set_text (MidoriLocationEntry* location_entry, + const gchar* text) +{ + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + + gtk_entry_set_text (GTK_ENTRY (entry), text); +} + +/** + * midori_location_entry_clear: + * @location_entry: a #MidoriLocationEntry + * + * Clears the entry text and resets the entry favicon. + **/ +void +midori_location_entry_clear (MidoriLocationEntry* location_entry) +{ + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + + gtk_entry_set_text (GTK_ENTRY (entry), ""); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); +} + +/** + * midori_location_entry_set_item_from_uri: + * @location_entry: a #MidoriLocationEntry + * @uri: a string + * + * Finds the item from the list matching @uri and sets it as the active item. + * If @uri is not found it clears the active item. + **/ +void +midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, + const gchar* uri) +{ + gint index; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + + index = midori_location_entry_item_index ( + MIDORI_LOCATION_ENTRY (location_entry), uri); + gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), index); + + if(index == -1) + midori_location_entry_clear (location_entry); +} + +/** + * midori_location_entry_add_item: + * @location_entry: a #MidoriLocationEntry + * @item: a MidoriLocationItem + * + * Adds @item if it is not already in the list. + * Sets @item to be active. + **/ +void +midori_location_entry_add_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item) +{ + GtkTreeModel* model; + GtkTreeIter iter; + gboolean item_exists = FALSE; + gchar* uri; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + g_return_if_fail (item->uri != NULL); + g_return_if_fail (item->favicon != NULL); + + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + if (gtk_tree_model_get_iter_first (model, &iter)) + { + uri = NULL; + do + { + gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); + if (g_ascii_strcasecmp (item->uri, uri) == 0) + { + item_exists = TRUE; + g_free (uri); + break; + } + g_free (uri); + } + while (gtk_tree_model_iter_next (model, &iter)); + } + + if (!item_exists) + gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); + + midori_location_entry_set_item (model, &iter, item); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), &iter); +} + diff --git a/midori/midori-locationentry.h b/midori/midori-locationentry.h new file mode 100644 index 00000000..02a00e1d --- /dev/null +++ b/midori/midori-locationentry.h @@ -0,0 +1,77 @@ +/* + Copyright (C) 2008 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_LOCATION_ENTRY_H__ +#define __MIDORI_LOCATION_ENTRY_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_LOCATION_ENTRY (midori_location_entry_get_type ()) +#define MIDORI_LOCATION_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_LOCATION_ENTRY, MidoriLocationEntry)) +#define MIDORI_LOCATION_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_LOCATION_ENTRY, MidoriLocationEntryClass)) +#define MIDORI_IS_LOCATION_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_LOCATION_ENTRY)) +#define MIDORI_IS_LOCATION_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_LOCATION_ENTRY)) +#define MIDORI_LOCATION_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_LOCATION_ENTRY, MidoriLocationEntryClass)) + +typedef struct _MidoriLocationEntry MidoriLocationEntry; +typedef struct _MidoriLocationEntryClass MidoriLocationEntryClass; +typedef struct _MidoriLocationEntryItem MidoriLocationEntryItem; + +struct _MidoriLocationEntry +{ + GtkComboBoxEntry parent_instance; +}; + +struct _MidoriLocationEntryClass +{ + GtkComboBoxEntryClass parent_class; +}; + +struct _MidoriLocationEntryItem +{ + GdkPixbuf* favicon; + const gchar* uri; + const gchar* title; +}; + +GType +midori_location_entry_get_type (void); + +GtkWidget* +midori_location_entry_new (void); + +gint +midori_location_entry_item_index (MidoriLocationEntry* location_entry, + const gchar* uri); + +const gchar* +midori_location_entry_get_text (MidoriLocationEntry* location_entry); + +void +midori_location_entry_set_text (MidoriLocationEntry* location_entry, + const gchar* text); + +void +midori_location_entry_clear (MidoriLocationEntry* location_entry); + +void +midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, + const gchar* uri); + +void +midori_location_entry_add_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item); + +G_END_DECLS + +#endif /* __MIDORI_LOCATION_ENTRY_H__ */ diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index a8b37cfe..cb8680e8 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -19,13 +19,13 @@ struct _MidoriSearchEntry { - SexyIconEntry parent_instance; + GtkIconEntry parent_instance; MidoriWebList* search_engines; MidoriWebItem* current_item; }; -G_DEFINE_TYPE (MidoriSearchEntry, midori_search_entry, SEXY_TYPE_ICON_ENTRY) +G_DEFINE_TYPE (MidoriSearchEntry, midori_search_entry, GTK_TYPE_ICON_ENTRY) enum { @@ -112,7 +112,7 @@ midori_search_entry_manage_activate_cb (GtkWidget* menuitem, static void midori_search_entry_icon_released_cb (GtkWidget* widget, - SexyIconEntryPosition* pos, + GtkIconEntryPosition* pos, gint button) { MidoriSearchEntry* search_entry; @@ -240,8 +240,8 @@ midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, midori_search_entry_set_current_item (search_entry, web_item); else { - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (search_entry), - SEXY_ICON_ENTRY_PRIMARY, NULL); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), + GTK_ICON_ENTRY_PRIMARY, NULL); sokoke_entry_set_default_text (GTK_ENTRY (search_entry), ""); katze_object_assign (search_entry->current_item, NULL); @@ -256,8 +256,8 @@ midori_search_entry_init (MidoriSearchEntry* search_entry) search_entry->search_engines = midori_web_list_new (); search_entry->current_item = NULL; - sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (search_entry), - SEXY_ICON_ENTRY_PRIMARY, TRUE); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (search_entry), + GTK_ICON_ENTRY_PRIMARY, TRUE); g_object_connect (search_entry, "signal::icon-released", midori_search_entry_icon_released_cb, NULL, @@ -412,9 +412,9 @@ midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, pixbuf = sokoke_web_icon (midori_web_item_get_icon (web_item), GTK_ICON_SIZE_MENU, GTK_WIDGET (search_entry)); - sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (search_entry), - SEXY_ICON_ENTRY_PRIMARY, - GTK_IMAGE (gtk_image_new_from_pixbuf (pixbuf))); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), + GTK_ICON_ENTRY_PRIMARY, + pixbuf); g_object_unref (pixbuf); sokoke_entry_set_default_text (GTK_ENTRY (search_entry), midori_web_item_get_name (web_item)); diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h index 588277d6..ec379dd9 100644 --- a/midori/midori-searchentry.h +++ b/midori/midori-searchentry.h @@ -13,9 +13,9 @@ #define __MIDORI_SEARCH_ENTRY_H__ #include "midori-weblist.h" +#include "gtkiconentry.h" #include -#include G_BEGIN_DECLS @@ -37,7 +37,7 @@ typedef struct _MidoriSearchEntryClass MidoriSearchEntryClass; struct _MidoriSearchEntryClass { - SexyIconEntryClass parent_class; + GtkIconEntryClass parent_class; }; GType diff --git a/wscript b/wscript index 7fe577af..c42e0dca 100644 --- a/wscript +++ b/wscript @@ -37,7 +37,6 @@ def configure (conf): conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) - conf.check_pkg ('libsexy', destvar='LIBSEXY', vnum='0.1', mandatory=True) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) From 4f0f228dc4d79cf6977fed23e963b177be087045 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 04:06:10 +0200 Subject: [PATCH 0198/2970] Load favicons asynchronously --- midori/midori-browser.c | 40 +++--- midori/midori-webview.c | 287 ++++++++++++++++++++++++---------------- midori/midori-webview.h | 10 +- 3 files changed, 198 insertions(+), 139 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 10b1e974..924d4426 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -417,29 +417,12 @@ midori_web_view_title_changed_cb (GtkWidget* web_view, { if (web_view == midori_browser_get_current_web_view (browser)) { - MidoriLocationEntryItem item; - const gchar* title = midori_web_view_get_display_title ( MIDORI_WEB_VIEW (web_view)); gchar* window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); - - item.favicon = midori_web_view_get_icon (MIDORI_WEB_VIEW (web_view)); - item.uri = midori_location_entry_get_text ( - MIDORI_LOCATION_ENTRY (browser->location)); - item.title = title; - - g_signal_handlers_block_by_func (browser->location, - midori_browser_location_active_changed_cb, browser); - - midori_location_entry_add_item (MIDORI_LOCATION_ENTRY - (browser->location), &item); - - g_signal_handlers_unblock_by_func (browser->location, - midori_browser_location_active_changed_cb, browser); - g_object_unref (item.favicon); } } @@ -459,6 +442,27 @@ midori_web_view_element_motion_cb (MidoriWebView* web_View, _midori_browser_set_statusbar_text (browser, link_uri); } +static void +midori_web_view_icon_ready_cb (MidoriWebView* web_view, + GdkPixbuf* icon, + MidoriBrowser* browser) +{ + MidoriLocationEntryItem item; + + item.favicon = icon; + item.uri = midori_web_view_get_display_uri (web_view); + item.title = midori_web_view_get_display_title (web_view); + + g_signal_handlers_block_by_func (browser->location, + midori_browser_location_active_changed_cb, browser); + + midori_location_entry_add_item (MIDORI_LOCATION_ENTRY + (browser->location), &item); + + g_signal_handlers_unblock_by_func (browser->location, + midori_browser_location_active_changed_cb, browser); +} + static void midori_web_view_load_committed_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, @@ -913,6 +917,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_web_view_load_started_cb, browser, "signal::load-committed", midori_web_view_load_committed_cb, browser, + "signal::icon-ready", + midori_web_view_icon_ready_cb, browser, "signal::progress-started", midori_web_view_progress_started_cb, browser, "signal::progress-changed", diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 19e0f813..792e66bb 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -58,7 +58,7 @@ enum }; enum { - LOAD_STARTED, + ICON_READY, PROGRESS_STARTED, PROGRESS_CHANGED, PROGRESS_DONE, @@ -90,6 +90,17 @@ midori_web_view_get_property (GObject* object, static void midori_web_view_class_init (MidoriWebViewClass* class) { + signals[ICON_READY] = g_signal_new ( + "icon-ready", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + G_STRUCT_OFFSET (MidoriWebViewClass, icon_ready), + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GDK_TYPE_PIXBUF); + signals[PROGRESS_STARTED] = g_signal_new ( "progress-started", G_TYPE_FROM_CLASS (class), @@ -228,6 +239,124 @@ _midori_web_view_set_uri (MidoriWebView* web_view, g_object_set (web_view, "title", NULL, NULL); } +#if GLIB_CHECK_VERSION (2, 16, 0) +void +loadable_icon_finish_cb (GdkPixbuf* icon, + GAsyncResult* res, + MidoriWebView* web_view) +{ + GInputStream* stream; + GdkPixbuf* pixbuf; + GdkPixbuf* pixbuf_scaled; + gint icon_width, icon_height; + + pixbuf = NULL; + stream = g_loadable_icon_load_finish (G_LOADABLE_ICON (icon), + res, NULL, NULL); + if (stream) + { + pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); + g_object_unref (stream); + } + if (!pixbuf) + pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + web_view->icon = pixbuf_scaled; + g_signal_emit (web_view, signals[ICON_READY], 0, web_view->icon); +} + +void +file_info_finish_cb (GFile* icon_file, + GAsyncResult* res, + MidoriWebView* web_view) +{ + GFileInfo* info; + const gchar* content_type; + GIcon* icon; + GFile* parent; + GFile* file; + GdkPixbuf* pixbuf; + gint icon_width, icon_height; + GdkPixbuf* pixbuf_scaled; + + info = g_file_query_info_finish (G_FILE (icon_file), res, NULL); + if (info) + { + content_type = g_file_info_get_content_type (info); + if (g_str_has_prefix (content_type, "image/")) + { + icon = g_file_icon_new (icon_file); + g_loadable_icon_load_async (G_LOADABLE_ICON (icon), + 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); + return; + } + } + + file = g_file_get_parent (icon_file); + parent = g_file_get_parent (file); + /* We need to check if file equals the parent due to a GIO bug */ + if (parent && !g_file_equal (file, parent)) + { + icon_file = g_file_get_child (parent, "favicon.ico"); + g_file_query_info_async (icon_file, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, 0, NULL, + (GAsyncReadyCallback)file_info_finish_cb, web_view); + return; + } + + pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + + web_view->icon = pixbuf_scaled; + g_signal_emit (web_view, signals[ICON_READY], 0, web_view->icon); +} +#endif + +static void +_midori_web_view_load_icon (MidoriWebView* web_view) +{ + #if GLIB_CHECK_VERSION (2, 16, 0) + GFile* file; + GFile* icon_file; + #endif + GdkPixbuf* pixbuf; + gint icon_width, icon_height; + GdkPixbuf* pixbuf_scaled; + + #if GLIB_CHECK_VERSION (2, 16, 0) + if (web_view->uri) + { + file = g_file_new_for_uri (web_view->uri); + icon_file = g_file_get_child (file, "favicon.ico"); + g_file_query_info_async (icon_file, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, 0, NULL, + (GAsyncReadyCallback)file_info_finish_cb, web_view); + return; + } + #endif + + pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + + web_view->icon = pixbuf_scaled; + g_signal_emit (web_view, signals[ICON_READY], 0, web_view->icon); +} + static void webkit_web_view_load_committed (MidoriWebView* web_view, WebKitWebFrame* web_frame) @@ -238,14 +367,33 @@ webkit_web_view_load_committed (MidoriWebView* web_view, web_view->progress = 0; uri = webkit_web_frame_get_uri (web_frame); _midori_web_view_set_uri (web_view, uri); + + icon = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + katze_object_assign (web_view->icon, icon); + _midori_web_view_load_icon (web_view); + if (web_view->tab_icon) - { - icon = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), icon); - g_object_unref (icon); - } + + if (web_view->menu_item) + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (web_view->menu_item), + gtk_image_new_from_pixbuf (icon)); +} + +static void +webkit_web_view_icon_ready (MidoriWebView* web_view, + GdkPixbuf* icon) +{ + if (web_view->tab_icon) + katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), + icon); + if (web_view->menu_item) + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (web_view->menu_item), + gtk_image_new_from_pixbuf (icon)); } static void @@ -276,34 +424,16 @@ webkit_web_view_load_finished (MidoriWebView* web_view) } static void -webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, +webkit_web_frame_load_done (WebKitWebFrame* web_frame, + gboolean success, MidoriWebView* web_view) { - GdkPixbuf* icon; - web_view->is_loading = FALSE; web_view->progress = -1; - katze_object_assign (web_view->icon, NULL); - if (web_view->tab_icon || web_view->menu_item) - { - icon = midori_web_view_get_icon (web_view); - - if (web_view->tab_icon) - { - katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), - FALSE); - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - icon); - } - - if (web_view->menu_item) - gtk_image_menu_item_set_image ( - GTK_IMAGE_MENU_ITEM (web_view->menu_item), - gtk_image_new_from_pixbuf (icon)); - - g_object_unref (icon); - } + if (web_view->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), + FALSE); g_signal_emit (web_view, signals[LOAD_DONE], 0, web_frame); } @@ -509,6 +639,8 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, static void midori_web_view_init (MidoriWebView* web_view) { + web_view->icon = gtk_widget_render_icon (GTK_WIDGET (web_view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); web_view->is_loading = FALSE; web_view->progress = -1; @@ -523,6 +655,8 @@ midori_web_view_init (MidoriWebView* web_view) webkit_web_view_load_started, NULL, */ "signal::load-committed", webkit_web_view_load_committed, NULL, + "signal::icon-ready", + webkit_web_view_icon_ready, NULL, "signal::load-started", webkit_web_view_load_started, NULL, "signal::load-progress-changed", @@ -691,21 +825,19 @@ GtkWidget* midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) { const gchar* title; - GtkWidget* menu_item; - GdkPixbuf* icon; g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); if (!web_view->menu_item) { title = midori_web_view_get_display_title (web_view); - menu_item = gtk_image_menu_item_new_with_label (title); - icon = midori_web_view_get_icon (web_view); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), - gtk_image_new_from_pixbuf (icon)); - g_object_unref (icon); + web_view->menu_item = gtk_image_menu_item_new_with_label (title); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (web_view->menu_item), + gtk_image_new_from_pixbuf (web_view->icon)); - web_view->menu_item = menu_item; + g_signal_connect (web_view->menu_item, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &web_view->menu_item); } return web_view->menu_item; } @@ -727,17 +859,13 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) GtkWidget* midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) { - GdkPixbuf* icon; - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); if (!web_view->tab_icon) { web_view->tab_icon = katze_throbber_new (); - icon = midori_web_view_get_icon (web_view); katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - icon); - g_object_unref (icon); + web_view->icon); g_signal_connect (web_view->tab_icon, "destroy", G_CALLBACK (gtk_widget_destroyed), @@ -904,78 +1032,3 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) return web_view->link_uri; } - -/** - * midori_web_view_get_icon: - * @web_view: a #MidoriWebView - * - * Retrieves an icon associated with the currently loaded URI. If no - * icon is available a default icon is used. - * - * The pixbuf is newly allocated and should be unreffed after use. - * - * Return value: a #GdkPixbuf - **/ -GdkPixbuf* -midori_web_view_get_icon (MidoriWebView* web_view) -{ - #if GLIB_CHECK_VERSION (2, 16, 0) - GFile* file; - GFile* parent; - GFile* icon_file; - GFileInfo* info; - const gchar* content_type; - GIcon* icon; - GInputStream* stream; - #endif - GdkPixbuf* pixbuf; - - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - - if (web_view->icon) - return g_object_ref (web_view->icon); - - #if GLIB_CHECK_VERSION (2, 16, 0) - parent = g_file_new_for_uri (web_view->uri ? web_view->uri : ""); - icon = NULL; - do - { - file = parent; - icon_file = g_file_get_child (file, "favicon.ico"); - info = g_file_query_info (icon_file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, NULL, NULL); - if (info) - { - content_type = g_file_info_get_content_type (info); - icon = (!strcmp (content_type, "image/x-icon") - || !strcmp (content_type, "image/x-ico") - || !strcmp (content_type, "image/vnd.microsoft.icon")) - ? g_file_icon_new (icon_file) : NULL; - } - - parent = g_file_get_parent (file); - } - while (!icon && parent && !g_file_equal (file, parent)); - /* We need to check if file equals the parent due to a GIO bug */ - - if (icon && (stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), - GTK_ICON_SIZE_MENU, - NULL, NULL, NULL))) - { - pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); - g_object_unref (stream); - } - else - #endif - pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - #if GLIB_CHECK_VERSION (2, 16, 0) - if (icon) - g_object_unref (icon); - g_object_unref (icon_file); - g_object_unref (file); - #endif - - web_view->icon = pixbuf; - return g_object_ref (web_view->icon); -} diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 52e32dde..4cf8838b 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -12,10 +12,10 @@ #ifndef __MIDORI_WEB_VIEW_H__ #define __MIDORI_WEB_VIEW_H__ -#include +#include "midori-websettings.h" #include -#include "midori-websettings.h" +#include G_BEGIN_DECLS @@ -41,6 +41,9 @@ struct _MidoriWebViewClass /* Signals */ void + (*icon_ready) (MidoriWebView* web_view, + GdkPixbuf* icon); + void (*progress_started) (MidoriWebView* web_view, guint progress); void @@ -102,9 +105,6 @@ midori_web_view_get_display_title (MidoriWebView* web_view); const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view); -GdkPixbuf* -midori_web_view_get_icon (MidoriWebView* web_view); - G_END_DECLS #endif /* __MIDORI_WEB_VIEW_H__ */ From d06daa12f06223fd3c1e04412d31f6b572e7cec5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 04:07:34 +0200 Subject: [PATCH 0199/2970] Attempt to fix a build issue with GtkIconEntry --- midori/gtkiconentry.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 0745d5ba..6faa9845 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -18,10 +18,14 @@ * Boston, MA 02111-1307, USA. */ +#include "gtkiconentry.h" + #include -#ifndef GTK_IMAGE_GICON -#define GTK_IMAGE_GICON 8 +#if GTK_CHECK_VERSION (2, 14, 0) +#define _GTK_IMAGE_GICON GTK_IMAGE_GICON +#else +#define _GTK_IMAGE_GICON 8 #endif #ifndef GTK_PARAM_READABLE @@ -38,8 +42,6 @@ #define P_(s) (s) -#include "gtkiconentry.h" - #define ICON_MARGIN 2 #define MAX_ICONS 2 @@ -1103,7 +1105,7 @@ icon_theme_changed (GtkIconEntry *entry) } #if GLIB_CHECK_VERSION (2, 16, 0) - else if (priv->icons[i].storage_type == GTK_IMAGE_GICON) + else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) { g_object_unref (priv->icons[i].pixbuf); priv->icons[i].pixbuf = NULL; @@ -1506,7 +1508,7 @@ gtk_icon_entry_get_gicon (const GtkIconEntry *entry, priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); icon_info = &priv->icons[icon_pos]; - return icon_info->storage_type == GTK_IMAGE_GICON ? icon_info->gicon : NULL; + return icon_info->storage_type == _GTK_IMAGE_GICON ? icon_info->gicon : NULL; } #endif From cd930fcfa86470f5c72c5874b63cf9df34255829 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 05:05:21 +0200 Subject: [PATCH 0200/2970] Show the panel when it is opened from the menu --- midori/midori-panel.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 4eacb994..22e153c4 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -12,6 +12,8 @@ #include "midori-panel.h" #include "sokoke.h" +#include "compat.h" + #include struct _MidoriPanel @@ -312,10 +314,22 @@ static void midori_panel_menu_item_activate_cb (GtkWidget* widget, MidoriPanel* panel) { - GtkWidget* child = g_object_get_data (G_OBJECT (widget), "page"); - guint n = midori_panel_page_num (panel, child); - midori_panel_set_current_page (panel, n); - g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); + GtkWidget* child; + GtkToolItem* toolitem; + guint n; + + child = g_object_get_data (G_OBJECT (widget), "page"); + toolitem = g_object_get_data (G_OBJECT (widget), "toolitem"); + + if (toolitem) + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); + else + { + n = midori_panel_page_num (panel, child); + midori_panel_set_current_page (panel, n); + g_signal_emit (panel, signals[SWITCH_PAGE], 0, n); + gtk_widget_show (GTK_WIDGET (panel)); + } } /** @@ -405,6 +419,7 @@ midori_panel_append_page (MidoriPanel* panel, } gtk_widget_show_all (menuitem); g_object_set_data (G_OBJECT (menuitem), "page", child); + g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); From 2f7570cfbdab2ce5d4fe960feee6bb4eacf06001 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sat, 19 Jul 2008 05:58:32 +0200 Subject: [PATCH 0201/2970] Disconnect handlers when destroying the treeview --- midori/midori-searchentry.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index cb8680e8..de498d29 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -737,6 +737,18 @@ midori_search_entry_dialog_engines_remove_item_cb (MidoriWebList* web_list, } } +static void +midori_search_entry_treeview_destroy_cb (GtkWidget* treeview, + GtkWidget* search_entry) +{ + g_signal_handlers_disconnect_by_func ( + MIDORI_SEARCH_ENTRY (search_entry)->search_engines, + midori_search_entry_dialog_engines_add_item_cb, treeview); + g_signal_handlers_disconnect_by_func ( + MIDORI_SEARCH_ENTRY (search_entry)->search_engines, + midori_search_entry_dialog_engines_remove_item_cb, treeview); +} + /** * midori_search_entry_get_dialog: * @search_entry: a #MidoriSearchEntry @@ -836,6 +848,8 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) NULL, i, 0, web_item, -1); } g_object_unref (liststore); + g_signal_connect (treeview, "destroy", + G_CALLBACK (midori_search_entry_treeview_destroy_cb), search_entry); vbox = gtk_vbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); button = gtk_button_new_from_stock (GTK_STOCK_ADD); From 970be0bc83bcc18ef412e4b60f34523e9e03994c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 06:15:47 +0200 Subject: [PATCH 0202/2970] Sort the font combo by font name --- katze/katze-utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 8af1bbdd..adb300d9 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -227,6 +227,9 @@ katze_property_proxy (gpointer object, gtk_combo_box_set_active (GTK_COMBO_BOX (widget), i); i++; } + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE ( + gtk_combo_box_get_model (GTK_COMBO_BOX (widget))), + 0, GTK_SORT_ASCENDING); g_signal_connect (widget, "changed", G_CALLBACK (proxy_combo_box_text_changed_cb), object); g_free (families); From 002035e389753ce3f73a78e32426c265c7ee57e5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 16:18:41 +0200 Subject: [PATCH 0203/2970] Capitalize Midori in the window title --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index 1f941893..d672038c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -351,7 +351,7 @@ main (int argc, MidoriWebList* search_engines; locale_init (); - g_set_application_name (_("midori")); + g_set_application_name (_("Midori")); /* Parse cli options */ version = FALSE; From 27a7eae93400e0a8d9de2a1a6c4a3cb5b70cd16e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 16:21:10 +0200 Subject: [PATCH 0204/2970] Add Spanish translation --- po/LINGUAS | 2 +- po/es.po | 1385 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1386 insertions(+), 1 deletion(-) create mode 100644 po/es.po diff --git a/po/LINGUAS b/po/LINGUAS index 87d5da78..72877481 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de fr hu pl sv +de es fr hu pl sv diff --git a/po/es.po b/po/es.po new file mode 100644 index 00000000..cb60581e --- /dev/null +++ b/po/es.po @@ -0,0 +1,1385 @@ +# Spanish translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Miguel Anxo Bouzada 2008 +# Christian Dywan 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori-0.0.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-19 16:00+0200\n" +"PO-Revision-Date: 2008-07-14 22:07+0100\n" +"Last-Translator: Christian Dywan 2008\n" +"Language-Team: GALPon MiniNo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Navegador ligero" + +#: ../midori.desktop.in.h:2 ../midori/main.c:354 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Navegador" + +#: ../midori/main.c:45 +msgid "Bookmark" +msgstr "Marcador" + +#: ../midori/main.c:46 +msgid "_Add Bookmark" +msgstr "_Añadir Marcador" + +#: ../midori/main.c:47 +msgid "_Form Fill" +msgstr "Rellenar _formulario" + +#: ../midori/main.c:48 +msgid "_Homepage" +msgstr "Página de _inicio" + +#: ../midori/main.c:49 +msgid "New _Tab" +msgstr "Nueva pes_taña" + +#: ../midori/main.c:50 +msgid "New _Window" +msgstr "Nueva _ventana" + +#: ../midori/main.c:52 +msgid "Select _All" +msgstr "Seleccion_ar todo" + +#: ../midori/main.c:55 +msgid "_Fullscreen" +msgstr "_Pantalla completa" + +#: ../midori/main.c:56 +msgid "_Leave Fullscreen" +msgstr "_Salir de pantalla completa" + +#: ../midori/main.c:110 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "No se pudo cargar la configuración. %s\n" + +#: ../midori/main.c:165 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "El valor «%s» no es válido para %s" + +#: ../midori/main.c:172 ../midori/main.c:241 +#, c-format +msgid "Unhandled settings value '%s'" +msgstr "" + +#: ../midori/main.c:346 +msgid "Display program version" +msgstr "Mostrar la versión del programa" + +#: ../midori/main.c:359 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 +msgid "midori" +msgstr "midori" + +#: ../midori/main.c:363 +msgid "Unknown argument." +msgstr "" + +#: ../midori/main.c:365 +msgid "Failed to setup interface." +msgstr "" + +#: ../midori/main.c:380 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" + +#: ../midori/main.c:382 +msgid "Check for new versions at:" +msgstr "Comprobar si existen nuevas versiones en:" + +#: ../midori/main.c:430 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Los marcadores no pudieron ser cargados. %s\n" + +#: ../midori/main.c:444 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "No se pudo cargar la sesión. %s\n" + +#: ../midori/main.c:456 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "No se pudo cargar la papelera. %s\n" + +#: ../midori/main.c:468 +msgid "The following errors occured:" +msgstr "Se produjeron los siguientes errores:" + +#: ../midori/main.c:606 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "No se pudo guardar el motor de busqueda. %s" + +#: ../midori/main.c:616 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "No se pudieron guardar los marcadores. %s" + +#: ../midori/main.c:625 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "No se pudo guardar la papelera. %s" + +#: ../midori/main.c:637 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "No se pudo guardar la sesión. %s" + +#: ../midori/main.c:646 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "No se pudo guardar la configuración. %s" + +#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +msgid "Settings" +msgstr "Configuración" + +#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +msgid "The associated settings" +msgstr "Ajustes asociados" + +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +msgid "Trash" +msgstr "Papelera" + +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Papelera, recogido recientemente cerrando pestañas y ventanas" + +#: ../midori/midori-app.c:132 +msgid "Browser" +msgstr "Navegador" + +#: ../midori/midori-app.c:133 +msgid "The current browser" +msgstr "El navegador actual" + +#: ../midori/midori-app.c:141 +msgid "Browser Count" +msgstr "Número de navegadores" + +#: ../midori/midori-app.c:142 +msgid "The current number of browsers" +msgstr "Número de navegadores actual de elementos" + +#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 +#: ../midori/midori-searchentry.c:66 +msgid "Search Engines" +msgstr "Motores de busqueda" + +#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +msgid "The list of search engines" +msgstr "La lista de motores de busqueda" + +#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +msgid "Extensions" +msgstr "Extensiones" + +#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +msgid "Userscripts" +msgstr "Scripts de usuario" + +#: ../midori/midori-addons.c:42 +msgid "Userstyles" +msgstr "Estilos de usuario" + +#: ../midori/midori-browser.c:192 +msgid "Source" +msgstr "Código fuente" + +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 +#: ../midori/midori-browser.c:2792 +msgid "Reload the current page" +msgstr "Cargar nuevamente la página actual" + +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 +msgid "Stop loading the current page" +msgstr "Detener la carga de la página" + +#: ../midori/midori-browser.c:337 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% cargada" + +#: ../midori/midori-browser.c:560 +msgid "New bookmark" +msgstr "Nuevo marcador" + +#: ../midori/midori-browser.c:560 +msgid "Edit bookmark" +msgstr "Editar marcador" + +#: ../midori/midori-browser.c:584 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 +msgid "_Description:" +msgstr "_Descripción" + +#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:633 +msgid "_Folder:" +msgstr "_Carpeta:" + +#: ../midori/midori-browser.c:637 +msgid "Root" +msgstr "Raíz" + +#: ../midori/midori-browser.c:1064 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acción no esperada «%s»" + +#: ../midori/midori-browser.c:1283 +msgid "Menubar" +msgstr "Barra del menú" + +#: ../midori/midori-browser.c:1284 +msgid "The menubar" +msgstr "Barra del menu" + +#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +msgid "Navigationbar" +msgstr "Barra de navegación" + +#: ../midori/midori-browser.c:1293 +msgid "The navigationbar" +msgstr "Barra de navegación" + +#: ../midori/midori-browser.c:1301 +msgid "Tab" +msgstr "Pestaña" + +#: ../midori/midori-browser.c:1302 +msgid "The current tab" +msgstr "Pestaña actual" + +#: ../midori/midori-browser.c:1310 +msgid "Statusbar" +msgstr "Barra de estado" + +#: ../midori/midori-browser.c:1311 +msgid "The statusbar" +msgstr "Barra de estado" + +#: ../midori/midori-browser.c:1347 +msgid "Statusbar Text" +msgstr "Texto de la barra de estado" + +#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +msgid "The text that is displayed in the statusbar" +msgstr "El texto se muestra en la barra de estado" + +#: ../midori/midori-browser.c:1381 +msgid "The list of search engines to be used for web search" +msgstr "" + +#: ../midori/midori-browser.c:2318 +msgid "Separator" +msgstr "Separador" + +#: ../midori/midori-browser.c:2483 +msgid "A lightweight web browser." +msgstr "Un navegador muy ligero" + +#: ../midori/midori-browser.c:2491 +msgid "translator-credits" +msgstr "" +"Miguel Anxo Bouzada\n" +"Antonio Sanchez" + +#: ../midori/midori-browser.c:2709 +msgid "_File" +msgstr "_Fichero" + +#: ../midori/midori-browser.c:2712 +msgid "Open a new window" +msgstr "Abrir una nueva ventana" + +#: ../midori/midori-browser.c:2715 +msgid "Open a new tab" +msgstr "Abrir unha nueva pestaña" + +#: ../midori/midori-browser.c:2718 +msgid "Open a file" +msgstr "Abrir un archivo" + +#: ../midori/midori-browser.c:2721 +msgid "Save to a file" +msgstr "Guardar en un archivo" + +#: ../midori/midori-browser.c:2723 +msgid "_Close Tab" +msgstr "Cerrar _pestaña" + +#: ../midori/midori-browser.c:2724 +msgid "Close the current tab" +msgstr "Cerrar la pestaña actual" + +#: ../midori/midori-browser.c:2726 +msgid "C_lose Window" +msgstr "_Cerrar la ventana" + +#: ../midori/midori-browser.c:2727 +msgid "Close this window" +msgstr "Cerrar esta ventana" + +#: ../midori/midori-browser.c:2729 +msgid "Pa_ge Setup" +msgstr "Configuración de la página" + +#: ../midori/midori-browser.c:2733 +msgid "Show a preview of the printed page" +msgstr "Mostrar una vista de la página imprimido" + +#: ../midori/midori-browser.c:2736 +msgid "Print the current page" +msgstr "Imprimir la página actual" + +#: ../midori/midori-browser.c:2739 +msgid "Quit the application" +msgstr "Salir de la aplicación" + +#: ../midori/midori-browser.c:2741 +msgid "_Edit" +msgstr "_Editar" + +#: ../midori/midori-browser.c:2744 +msgid "Undo the last modification" +msgstr "Deshacer la última modificación" + +#: ../midori/midori-browser.c:2747 +msgid "Redo the last modification" +msgstr "Rehacer la última modificación" + +#: ../midori/midori-browser.c:2750 +msgid "Cut the selected text" +msgstr "Cortar el texto seleccionado" + +#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 +msgid "Copy the selected text" +msgstr "Copiar el texto seleccionado" + +#: ../midori/midori-browser.c:2759 +msgid "Paste text from the clipboard" +msgstr "Pegar el texto seleccionado al portapapeles" + +#: ../midori/midori-browser.c:2762 +msgid "Delete the selected text" +msgstr "Borrar el texto seleccionado" + +#: ../midori/midori-browser.c:2765 +msgid "Select all text" +msgstr "Seleccionar todo el texto" + +#: ../midori/midori-browser.c:2768 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:2770 +msgid "Find _Next" +msgstr "Buscar _siguiente" + +#: ../midori/midori-browser.c:2771 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2773 +msgid "Find _Previous" +msgstr "Buscar _anterior" + +#: ../midori/midori-browser.c:2774 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2776 +msgid "_Quick Find" +msgstr "Búsqueda _rápida" + +#: ../midori/midori-browser.c:2777 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2780 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:2782 +msgid "_View" +msgstr "_Ver" + +#: ../midori/midori-browser.c:2783 +msgid "_Toolbars" +msgstr "_Barra de herramientas" + +#: ../midori/midori-browser.c:2795 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2798 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2801 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2803 +msgid "View _Source" +msgstr "Mostrar _código fuente" + +#: ../midori/midori-browser.c:2804 +msgid "View the source code of the page" +msgstr "Mostrar el código fuente de la página" + +#: ../midori/midori-browser.c:2806 +msgid "View Selection Source" +msgstr "Mostrar código fuente de la seleccionada" + +#: ../midori/midori-browser.c:2807 +msgid "View the source code of the selection" +msgstr "Mostrar el código fuente de la seleccionada" + +#: ../midori/midori-browser.c:2810 +msgid "Toggle fullscreen view" +msgstr "Activar/desactivar pantalla completa" + +#: ../midori/midori-browser.c:2812 +msgid "_Go" +msgstr "_Ir" + +#: ../midori/midori-browser.c:2815 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:2818 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:2821 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:2823 +msgid "Location..." +msgstr "Ubicación..." + +#: ../midori/midori-browser.c:2824 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:2826 +msgid "Web Search..." +msgstr "Buscar en la red..." + +#: ../midori/midori-browser.c:2827 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:2829 +msgid "Open in Page_holder..." +msgstr "Abrir en el cuadro de páginas..." + +#: ../midori/midori-browser.c:2830 +msgid "Open the current page in the pageholder" +msgstr "Última la página actual en el cuadro de páginas" + +#: ../midori/midori-browser.c:2832 +msgid "Closed Tabs and Windows" +msgstr "Cerrar ventanas y pestañas" + +#: ../midori/midori-browser.c:2833 +msgid "Reopen a previously closed tab or window" +msgstr "Volver a abrir ventanas o pestañas cerradas" + +#: ../midori/midori-browser.c:2835 +msgid "Empty Trash" +msgstr "Vaciar la papelera" + +#: ../midori/midori-browser.c:2836 +msgid "Delete the contents of the trash" +msgstr "Borrar el conenido de la papelera" + +#: ../midori/midori-browser.c:2838 +msgid "Undo Close Tab" +msgstr "Deshacer el cierre de pestaña" + +#: ../midori/midori-browser.c:2839 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:2841 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/midori-browser.c:2844 +msgid "Add a new bookmark" +msgstr "Añadir un nuevo marcador" + +#: ../midori/midori-browser.c:2846 +msgid "_Manage Bookmarks" +msgstr "_Gestionar marcadores" + +#: ../midori/midori-browser.c:2847 +msgid "Add, edit and remove bookmarks..." +msgstr "Añadir, editar o eliminar marcadores..." + +#: ../midori/midori-browser.c:2850 +msgid "Open the selected bookmark" +msgstr "Abrir el marcador seleccionado" + +#: ../midori/midori-browser.c:2852 +msgid "Open in New _Tab" +msgstr "Abrir en una nueva _pestaña " + +#: ../midori/midori-browser.c:2853 +msgid "Open the selected bookmark in a new tab" +msgstr "Abrir el marcador seleccionado en una neuva pestaña" + +#: ../midori/midori-browser.c:2855 +msgid "Open in New _Window" +msgstr "Abrir en una nueva _ventana" + +#: ../midori/midori-browser.c:2856 +msgid "Open the selected bookmark in a new window" +msgstr "Abrir el marcador seleccionado en una neuva ventana" + +#: ../midori/midori-browser.c:2859 +msgid "Edit the selected bookmark" +msgstr "Editar el marcador seleccionado" + +#: ../midori/midori-browser.c:2862 +msgid "Delete the selected bookmark" +msgstr "Borrar el marcador seleccionado" + +#: ../midori/midori-browser.c:2864 +msgid "_Tools" +msgstr "_Herramientas" + +#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 +msgid "_Manage Search Engines" +msgstr "_Gestionar los motores de busqueda" + +#: ../midori/midori-browser.c:2867 +msgid "Add, edit and remove search engines..." +msgstr "Añadir, editar o eliminar motores de busqueda..." + +#: ../midori/midori-browser.c:2870 +msgid "_Window" +msgstr "_Ventana" + +#: ../midori/midori-browser.c:2872 +msgid "_Previous Tab" +msgstr "Pestaña _anterior" + +#: ../midori/midori-browser.c:2873 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:2875 +msgid "_Next Tab" +msgstr "Pestaña _siguiente" + +#: ../midori/midori-browser.c:2876 +msgid "Switch to the next tab" +msgstr "Cambiar a la pestaña siguiente" + +#: ../midori/midori-browser.c:2878 +msgid "Tab _Overview" +msgstr "_Visión general de pestañas" + +#: ../midori/midori-browser.c:2879 +msgid "Show an overview of all open tabs" +msgstr "Mostrar una visión general de todas las pesañas abiertas" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../midori/midori-browser.c:2881 +msgid "_Help" +msgstr "_Ayuda" + +#: ../midori/midori-browser.c:2883 +msgid "_Contents" +msgstr "_Contenido" + +#: ../midori/midori-browser.c:2884 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:2887 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:2893 +msgid "P_rivate Browsing" +msgstr "Navegación p_rivada" + +#: ../midori/midori-browser.c:2894 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:2897 +msgid "_Work Offline" +msgstr "Trabajar desconectado" + +#: ../midori/midori-browser.c:2898 +msgid "Work without a network connection" +msgstr "" + +#: ../midori/midori-browser.c:2902 +msgid "_Navigationbar" +msgstr "Barra de _navegación" + +#: ../midori/midori-browser.c:2903 +msgid "Show navigationbar" +msgstr "Mostrar la barra de navegación" + +#: ../midori/midori-browser.c:2906 +msgid "Side_panel" +msgstr "_Panel lateral" + +#: ../midori/midori-browser.c:2907 +msgid "Show sidepanel" +msgstr "Mostrar el panel lateral" + +#: ../midori/midori-browser.c:2910 +msgid "_Bookmarkbar" +msgstr "Barra de _marcadores" + +#: ../midori/midori-browser.c:2911 +msgid "Show bookmarkbar" +msgstr "Mostrar la barra de marcadores" + +#: ../midori/midori-browser.c:2914 +msgid "_Transferbar" +msgstr "Barra de _transferencias" + +#: ../midori/midori-browser.c:2915 +msgid "Show transferbar" +msgstr "Mostrar la barra de transferencias" + +#: ../midori/midori-browser.c:2918 +msgid "_Statusbar" +msgstr "Barra de es_tado" + +#: ../midori/midori-browser.c:2919 +msgid "Show statusbar" +msgstr "Mostrar la barra de estado" + +#: ../midori/midori-browser.c:3453 +msgid "Bookmarks" +msgstr "Marcadores" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 +msgid "Transfers" +msgstr "Transferencias" + +#: ../midori/midori-browser.c:3469 +msgid "Console" +msgstr "Consola" + +#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 +msgid "History" +msgstr "Histórico" + +#: ../midori/midori-browser.c:3485 +msgid "Pageholder" +msgstr "Cuadro de páginas" + +#: ../midori/midori-browser.c:3520 +msgid "_Inline find:" +msgstr "_Búsqueda en línea:" + +#: ../midori/midori-browser.c:3553 +msgid "Match Case" +msgstr "Sensible a mayúsculas" + +#: ../midori/midori-browser.c:3570 +msgid "Close Findbar" +msgstr "Cerrar barra de busquedas" + +#: ../midori/midori-browser.c:3807 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Ajuste no esperado «%s»" + +#: ../midori/midori-panel.c:147 +msgid "Appearance of the shadow around each panel" +msgstr "Aspecto de las sombras alrededor de cada panel" + +#: ../midori/midori-panel.c:157 +msgid "Menu to hold panel items" +msgstr "Menú para contener los elementos de los paneles" + +#: ../midori/midori-panel.c:166 +msgid "The index of the current page" +msgstr "Índice de la página actual" + +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +msgid "Close panel" +msgstr "Cerrar el panel" + +#: ../midori/midori-panel.c:392 +msgid "Untitled" +msgstr "Sin título" + +#: ../midori/midori-websettings.c:130 +msgid "Blank page" +msgstr "Página vacía" + +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +msgid "Homepage" +msgstr "Página de inicio" + +#: ../midori/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Páginas abiertas recientemente" + +#: ../midori/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Chino (BIG5)" + +#: ../midori/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonés (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Ruso (KOI8-R)" + +#: ../midori/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Occidental (ISO-8859-1)" + +#: ../midori/midori-websettings.c:152 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-websettings.c:167 +msgid "New tab" +msgstr "Nueva pestaña" + +#: ../midori/midori-websettings.c:168 +msgid "New window" +msgstr "Nueva ventana" + +#: ../midori/midori-websettings.c:169 +msgid "Current tab" +msgstr "Pestaña actual" + +#: ../midori/midori-websettings.c:184 +msgid "Default" +msgstr "Predeterminada" + +#: ../midori/midori-websettings.c:185 +msgid "Icons" +msgstr "Iconos" + +#: ../midori/midori-websettings.c:186 +msgid "Text" +msgstr "Texto" + +#: ../midori/midori-websettings.c:187 +msgid "Both" +msgstr "Ambos" + +#: ../midori/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Ambos en horizontal" + +#: ../midori/midori-websettings.c:203 +msgid "All cookies" +msgstr "Todas las galletas" + +#: ../midori/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Las galletas de esta sesión" + +#: ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Ninguna" + +#: ../midori/midori-websettings.c:242 +msgid "Remember last window size" +msgstr "Recordar último tamaño de ventana" + +#: ../midori/midori-websettings.c:243 +msgid "Whether to save the last window size" +msgstr "Guardar (o no) el último tamaño de ventana" + +#: ../midori/midori-websettings.c:251 +msgid "Last window width" +msgstr "Última anchura de la ventana" + +#: ../midori/midori-websettings.c:252 +msgid "The last saved window width" +msgstr "Última anchura de la ventana guardada" + +#: ../midori/midori-websettings.c:260 +msgid "Last window height" +msgstr "Última altura de la ventana" + +#: ../midori/midori-websettings.c:261 +msgid "The last saved window height" +msgstr "Última altura de la ventana guardada" + +#: ../midori/midori-websettings.c:269 +msgid "Last panel position" +msgstr "Última posición del panel" + +#: ../midori/midori-websettings.c:270 +msgid "The last saved panel position" +msgstr "Ultima posición guardada del panel" + +#: ../midori/midori-websettings.c:278 +msgid "Last panel page" +msgstr "Última página del panel" + +#: ../midori/midori-websettings.c:279 +msgid "The last saved panel page" +msgstr "Última página guardada del panel" + +#: ../midori/midori-websettings.c:287 +msgid "Last Web search" +msgstr "Última busqueda en la red" + +#: ../midori/midori-websettings.c:288 +msgid "The last saved Web search" +msgstr "Última busqueda en la red guardada" + +#: ../midori/midori-websettings.c:296 +msgid "Last pageholder URI" +msgstr "Última URI del cuadro de páginas" + +#: ../midori/midori-websettings.c:297 +msgid "The URI last opened in the pageholder" +msgstr "Última URI abierta en el cuadro de páginas" + +#: ../midori/midori-websettings.c:307 +msgid "Show Navigationbar" +msgstr "Mostrar la barra de navegación" + +#: ../midori/midori-websettings.c:308 +msgid "Whether to show the navigationbar" +msgstr "Mostrar (o no) la barra de navegación" + +#: ../midori/midori-websettings.c:316 +msgid "Show Bookmarkbar" +msgstr "Mostrar la barra de marcadores" + +#: ../midori/midori-websettings.c:317 +msgid "Whether to show the bookmarkbar" +msgstr "Mostrar (o no) la barra de marcadores" + +#: ../midori/midori-websettings.c:325 +msgid "Show Panel" +msgstr "Mostrar el panel" + +#: ../midori/midori-websettings.c:326 +msgid "Whether to show the panel" +msgstr "Mostrar (o no) el panel" + +#: ../midori/midori-websettings.c:334 +msgid "Show Statusbar" +msgstr "Mostrar la barra de estado" + +#: ../midori/midori-websettings.c:335 +msgid "Whether to show the statusbar" +msgstr "Mostrar (o no) la barra de estado" + +#: ../midori/midori-websettings.c:344 +msgid "Toolbar Style" +msgstr "Estilo de la barra de herramientas" + +#: ../midori/midori-websettings.c:345 +msgid "The style of the toolbar" +msgstr "El estilo de la barra de herramientas" + +#: ../midori/midori-websettings.c:354 +msgid "Small toolbar" +msgstr "Barra de herramientas pequeña" + +#: ../midori/midori-websettings.c:355 +msgid "Use small toolbar icons" +msgstr "Mostrar iconos pequeños en la barra de herramientas" + +#: ../midori/midori-websettings.c:363 +msgid "Show New Tab" +msgstr "Mostrar «Nueva pestaña»" + +#: ../midori/midori-websettings.c:364 +msgid "Show the New Tab button in the toolbar" +msgstr "Mostrar el botón de «Nueva pestaña» en la barra de herramientas" + +#: ../midori/midori-websettings.c:372 +msgid "Show Homepage" +msgstr "Mostrar «Página de inicio»" + +#: ../midori/midori-websettings.c:373 +msgid "Show the Homepage button in the toolbar" +msgstr "Mostrar el botón de «Pagina inicial» en la barra de herramientas" + +#: ../midori/midori-websettings.c:381 +msgid "Show Web search" +msgstr "Mostrar «Buscador red»" + +#: ../midori/midori-websettings.c:382 +msgid "Show the Web search entry in the toolbar" +msgstr "Mostrar la caja de busquedas en la red en la barra de herramientas" + +#: ../midori/midori-websettings.c:390 +msgid "Show Trash" +msgstr "Mostrar «Papelera»" + +#: ../midori/midori-websettings.c:391 +msgid "Show the Trash button in the toolbar" +msgstr "Mostrar el botón «Papelera» en la barra de herramientas" + +#: ../midori/midori-websettings.c:401 +msgid "Load on Startup" +msgstr "Cargar al inicio" + +#: ../midori/midori-websettings.c:402 +msgid "What to load on startup" +msgstr "Qué cargar en el inicio" + +#: ../midori/midori-websettings.c:412 +msgid "The homepage" +msgstr "La página de inicio" + +#: ../midori/midori-websettings.c:420 +msgid "Download Folder" +msgstr "Carpeta de descargas" + +#: ../midori/midori-websettings.c:421 +msgid "The folder downloaded files are saved to" +msgstr "La carpeta de descargas fue guardada en" + +#: ../midori/midori-websettings.c:429 +msgid "Download Manager" +msgstr "Gestor de descargas" + +#: ../midori/midori-websettings.c:430 +msgid "An external download manager" +msgstr "Un gestor de descargas externo" + +#: ../midori/midori-websettings.c:438 +msgid "Location entry Search" +msgstr "Búsqueda en la barra" + +#: ../midori/midori-websettings.c:439 +msgid "The search to perform inside the location entry" +msgstr "Hacer una busqueda a partir del contenido de la barra de direcciones" + +#: ../midori/midori-websettings.c:447 +msgid "Preferred Encoding" +msgstr "Codificación preferida" + +#: ../midori/midori-websettings.c:448 +msgid "The preferred character encoding" +msgstr "Codificación de caracteres preferida" + +#: ../midori/midori-websettings.c:459 +msgid "Tab Label Size" +msgstr "Tamaño de la etiqueta de pestañas" + +#: ../midori/midori-websettings.c:460 +msgid "The desired tab label size" +msgstr "Tamaño deseado de la etiqueta de las pestañas" + +#: ../midori/midori-websettings.c:468 +msgid "Close Buttons on Tabs" +msgstr "Botón de cerrar en las pestañas" + +#: ../midori/midori-websettings.c:469 +msgid "Whether tabs have close buttons" +msgstr "Cada una de las pestañas tendrá su botón para cerrarla" + +#: ../midori/midori-websettings.c:477 +msgid "Open new pages in" +msgstr "Abrir las páginas nuevas en" + +#: ../midori/midori-websettings.c:478 +msgid "Where to open new pages" +msgstr "Donde se van a abrir las páginas nuevas" + +#: ../midori/midori-websettings.c:487 +msgid "Middle click opens Selection" +msgstr "Clic medio abre la selección" + +#: ../midori/midori-websettings.c:488 +msgid "Load an URL from the selection via middle click" +msgstr "Cargar una URL en la selección empleando el botón del medio del ratón" + +#: ../midori/midori-websettings.c:496 +msgid "Open tabs in the background" +msgstr "Abrir pestañas en segundo plano" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs in the background" +msgstr "Abrir (o no) las pestañas nuevas en segundo plano" + +#: ../midori/midori-websettings.c:505 +msgid "Open popups in tabs" +msgstr "Abrir emergentes en pestañas" + +#: ../midori/midori-websettings.c:506 +msgid "Whether to open popup windows in tabs" +msgstr "Abrir (o no) las ventanas emergentes en pestañas" + +#: ../midori/midori-websettings.c:516 +msgid "Accept cookies" +msgstr "Aceptar las galletas" + +#: ../midori/midori-websettings.c:517 +msgid "What type of cookies to accept" +msgstr "Qué tipos de galletas van a ser aceptadas" + +#: ../midori/midori-websettings.c:526 +msgid "Original cookies only" +msgstr "Solo las galletas del sitio original" + +#: ../midori/midori-websettings.c:527 +msgid "Accept cookies from the original website only" +msgstr "Solo se aceptan las galletas del sitio de origen" + +#: ../midori/midori-websettings.c:535 +msgid "Maximum cookie age" +msgstr "Persistencia máxima de las galletas" + +#: ../midori/midori-websettings.c:536 +msgid "The maximum number of days to save cookies for" +msgstr "Tiempo máximo, en días, durante los que se guardaran las galletas" + +#: ../midori/midori-websettings.c:546 +msgid "Remember last visited pages" +msgstr "Recordar las últimas páginas visitadas" + +#: ../midori/midori-websettings.c:547 +msgid "Whether the last visited pages are saved" +msgstr "Recordar (o no) las últimas páginas que fueron visitadas" + +#: ../midori/midori-websettings.c:555 +msgid "Maximum history age" +msgstr "Persistencia máxima del histórico" + +#: ../midori/midori-websettings.c:556 +msgid "The maximum number of days to save the history for" +msgstr "" +"Tiempo máximo, en días, durante los que se guardará un dato del histórico" + +#: ../midori/midori-websettings.c:564 +msgid "Remember last form inputs" +msgstr "Recordar las últimas sesiones de formularios" + +#: ../midori/midori-websettings.c:565 +msgid "Whether the last form inputs are saved" +msgstr "Recordar (o no) las últimas sesiones con sus datos de formularios" + +#: ../midori/midori-websettings.c:573 +msgid "Remember last downloaded files" +msgstr "Recordar últimos ficheros descargados" + +#: ../midori/midori-websettings.c:574 +msgid "Whether the last downloaded files are saved" +msgstr "" +"Recordar (o no) la lista de descargas de ficheros realizadas últimamente" + +#: ../midori/midori-websettings.c:584 +msgid "HTTP Proxy" +msgstr "Servidor proxy HTTP" + +#: ../midori/midori-websettings.c:585 +msgid "The proxy used for HTTP connections" +msgstr "Servidor proxy para conexiones HTTP" + +#: ../midori/midori-websettings.c:593 +msgid "Cache size" +msgstr "Tamaño de la caché" + +#: ../midori/midori-websettings.c:594 +msgid "The allowed size of the cache" +msgstr "Tamaño asignado a la memoria caché" + +#: ../midori/midori-webview.c:193 +msgid "The URI of the currently loaded page" +msgstr "URI de la página actualmente cargada" + +#: ../midori/midori-webview.c:202 +msgid "The title of the currently loaded page" +msgstr "Título de la página actualmente cargada" + +#: ../midori/midori-webview.c:578 +msgid "Open Link in New _Tab" +msgstr "Abrir el enlace en una pestaña _nueva" + +#: ../midori/midori-webview.c:606 +msgid "Download Link with Download _Manager" +msgstr "Descargar el enlace con el Gestor de descargas" + +#: ../midori/midori-webview.c:624 +msgid "Open URL in New _Tab" +msgstr "Abrir la URL en una pestaña _nueva" + +#: ../midori/midori-preferences.c:62 +msgid "Settings instance to provide properties" +msgstr "Configuración de ejemplo para proporcionar propiedades" + +#: ../midori/midori-preferences.c:84 +#, c-format +msgid "%s Preferences" +msgstr "%s Preferencias" + +#. Page "General" +#: ../midori/midori-preferences.c:267 +msgid "General" +msgstr "General" + +#: ../midori/midori-preferences.c:268 +msgid "Startup" +msgstr "Inicio" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:301 +msgid "Appearance" +msgstr "Apariencia" + +#: ../midori/midori-preferences.c:302 +msgid "Font settings" +msgstr "Ajustes de las fuentes" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:322 +msgid "Behavior" +msgstr "Comportamiento" + +#: ../midori/midori-preferences.c:323 +msgid "Features" +msgstr "Funcionalidades" + +#. Page "Interface" +#: ../midori/midori-preferences.c:373 +msgid "Interface" +msgstr "Interfaz" + +#: ../midori/midori-preferences.c:387 +msgid "Browsing" +msgstr "Navegación" + +#. Page "Network" +#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 +msgid "Network" +msgstr "Red" + +#: ../midori/midori-preferences.c:415 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:420 +msgid "Privacy" +msgstr "Privacidad" + +#: ../midori/midori-preferences.c:421 +msgid "Web Cookies" +msgstr "Galletas de conexión" + +#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 +msgid "days" +msgstr "días" + +#: ../midori/midori-webitem.c:70 +msgid "Name" +msgstr "Nombre" + +#: ../midori/midori-webitem.c:71 +msgid "The name of the web item" +msgstr "Nombre del elemento red" + +#: ../midori/midori-webitem.c:79 +msgid "Description" +msgstr "Descripción" + +#: ../midori/midori-webitem.c:80 +msgid "The description of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:88 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-webitem.c:89 +msgid "The URI of the web item" +msgstr "El URI del elemento red" + +#: ../midori/midori-webitem.c:97 +msgid "Icon" +msgstr "Icono" + +#: ../midori/midori-webitem.c:98 +msgid "The icon of the web item" +msgstr "El icono del elemento red" + +#: ../midori/midori-webitem.c:106 +msgid "Token" +msgstr "Abreviatura" + +#: ../midori/midori-webitem.c:107 +msgid "The token of the web item" +msgstr "La abreviatura del elemento red" + +#: ../midori/midori-searchentry.c:75 +msgid "Current Item" +msgstr "Elemento actual" + +#: ../midori/midori-searchentry.c:76 +msgid "The currently selected item" +msgstr "El elemento actualmente seleccionado" + +#: ../midori/midori-searchentry.c:84 +msgid "Dialog" +msgstr "Diálogo" + +#: ../midori/midori-searchentry.c:85 +msgid "A dialog to manage search engines" +msgstr "Un diálogo a gestionar los motores de busqueda" + +#: ../midori/midori-searchentry.c:152 +msgid "Empty" +msgstr "Vacío" + +#: ../midori/midori-searchentry.c:524 +msgid "Add search engine" +msgstr "Añadir un motor de búsqueda" + +#: ../midori/midori-searchentry.c:524 +msgid "Edit search engine" +msgstr "Editar motor de búsqueda" + +#: ../midori/midori-searchentry.c:551 +msgid "_Name:" +msgstr "_Nombre:" + +#: ../midori/midori-searchentry.c:595 +msgid "_Icon (name or file):" +msgstr "_Icono (nombre o fichero):" + +#: ../midori/midori-searchentry.c:609 +msgid "_Token:" +msgstr "_Abreviatura" + +#: ../midori/midori-searchentry.c:790 +msgid "Manage search engines" +msgstr "Gestionar los motores de busqueda" + +#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:348 +msgid "Warning: You are using a superuser account!" +msgstr "Aviso: Estás conectado como super usuario!" + +#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 +#, c-format +msgid "Writing failed." +msgstr "Falló la escritura." + +#: ../midori/gjs.c:89 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#, c-format +msgid "%s has no property '%s'" +msgstr "" + +#: ../midori/gjs.c:445 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" + +#: ../midori/gjs.c:455 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" + +#: ../katze/katze-throbber.c:134 +msgid "Symbolic size to use for the animation" +msgstr "Tamaño simbólico a usar para animaciónes" + +#: ../katze/katze-throbber.c:143 +msgid "The name of an icon containing animation frames" +msgstr "El nombre del icono contiene cuadros animados" + +#: ../katze/katze-throbber.c:152 +msgid "A GdkPixbuf containing animation frames" +msgstr "El GdkPixbuf contiene cuadros de animación" + +#: ../katze/katze-throbber.c:161 +msgid "Whether the throbber should be animated" +msgstr "Animar (o no) el icono" + +#: ../katze/katze-throbber.c:170 +msgid "The name of an icon to be used as the static image" +msgstr "Nombre a usar para el icono no animado" + +#: ../katze/katze-throbber.c:179 +msgid "A GdkPixbuf to be used as the static image" +msgstr "El GdkPixbuf va a ser usado como imagen estática" + +#: ../katze/katze-throbber.c:188 +msgid "The stock ID of an icon to be used as the static image" +msgstr "ID del icono que va a usarse como imagen estática" + +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "La propiedad «%s» no es válida para %s" + +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +msgid "Choose file" +msgstr "Escoger un fichero" + +#: ../katze/katze-utils.c:177 +msgid "Choose folder" +msgstr "Escoger una carpeta" + +#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:789 +msgid "Malformed document." +msgstr "Documento defectuoso" + +#: ../katze/katze-xbel.c:744 +msgid "File not found." +msgstr "No se encuentra el archivo." From e43b71a29cf417d31e3c40aafb466c02e3eaa479 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 16:21:57 +0200 Subject: [PATCH 0205/2970] Update French translation --- po/fr.po | 909 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 502 insertions(+), 407 deletions(-) diff --git a/po/fr.po b/po/fr.po index 835dae3d..e51fc457 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.17\n" +"Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-10 16:18+0200\n" +"POT-Creation-Date: 2008-07-19 16:00+0200\n" "PO-Revision-Date: 2008-03-31 17:37+0100\n" "Last-Translator: Adrien Nader \n" "Language-Team: French \n" @@ -21,7 +21,7 @@ msgstr "" msgid "Lightweight web browser" msgstr "Petit navigateur" -#: ../midori.desktop.in.h:2 +#: ../midori.desktop.in.h:2 ../midori/main.c:354 msgid "Midori" msgstr "Midori" @@ -29,674 +29,710 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur" -#: ../midori/main.c:46 +#: ../midori/main.c:45 msgid "Bookmark" msgstr "Signet" -#: ../midori/main.c:47 +#: ../midori/main.c:46 msgid "_Add Bookmark" msgstr "_Ajouter signet" -#: ../midori/main.c:48 +#: ../midori/main.c:47 msgid "_Form Fill" msgstr "Remplissage de _formulaire" -#: ../midori/main.c:49 +#: ../midori/main.c:48 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:50 +#: ../midori/main.c:49 msgid "New _Tab" msgstr "Nouvel _Onglet" -#: ../midori/main.c:51 +#: ../midori/main.c:50 msgid "New _Window" msgstr "Nouvelle _Fenêtre" -#: ../midori/main.c:53 +#: ../midori/main.c:52 msgid "Select _All" msgstr "_Tout sélectionner" -#: ../midori/main.c:56 +#: ../midori/main.c:55 msgid "_Fullscreen" msgstr "_Plein écran" -#: ../midori/main.c:57 +#: ../midori/main.c:56 msgid "_Leave Fullscreen" msgstr "_Quitter le plein écran" -#: ../midori/main.c:97 +#: ../midori/main.c:110 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "La configuration n'a pu être chargée. %s\n" -#: ../midori/main.c:153 +#: ../midori/main.c:165 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur '%s' n'est pas valide pour %s" -#: ../midori/main.c:160 ../midori/main.c:222 +#: ../midori/main.c:172 ../midori/main.c:241 #, c-format msgid "Unhandled settings value '%s'" msgstr "Réglage non pris en charge '%s'" -#: ../midori/main.c:236 ../midori/main.c:252 ../midori/main.c:254 -#: ../midori/main.c:268 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:243 +#: ../midori/main.c:346 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:248 +#: ../midori/main.c:359 msgid "[URL]" msgstr "[URL]" -#: ../midori/main.c:252 +#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 +msgid "midori" +msgstr "midori" + +#: ../midori/main.c:363 msgid "Unknown argument." msgstr "" -#: ../midori/main.c:254 +#: ../midori/main.c:365 msgid "Failed to setup interface." msgstr "" -#: ../midori/main.c:269 +#: ../midori/main.c:380 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et problèmes :" -#: ../midori/main.c:271 +#: ../midori/main.c:382 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions sur :" -#: ../midori/main.c:319 +#: ../midori/main.c:430 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Les signets n'ont pu être chargés. %s\n" -#: ../midori/main.c:333 +#: ../midori/main.c:444 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "La session n'a pu être chargée. %s\n" # pas très content -#: ../midori/main.c:345 +#: ../midori/main.c:456 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "La corbeille n'a pu être chargée. %s\n" -#: ../midori/main.c:355 +#: ../midori/main.c:468 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:479 +#: ../midori/main.c:606 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être sauveguardés. %s" -#: ../midori/main.c:488 +#: ../midori/main.c:616 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être sauveguardés. %s" # pas très content -#: ../midori/main.c:497 +#: ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être sauveguardé. %s" -#: ../midori/main.c:509 +#: ../midori/main.c:637 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être sauveguardé. %s" -#: ../midori/main.c:518 +#: ../midori/main.c:646 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être sauveguardé. %s" -#: ../midori/midori-browser.c:201 ../midori/midori-browser.c:2233 -#: ../midori/midori-browser.c:2239 +#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +msgid "Settings" +msgstr "Réglages" + +#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +msgid "The associated settings" +msgstr "Les réglages associés" + +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +msgid "Trash" +msgstr "Corbeille" + +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" + +#: ../midori/midori-app.c:132 +msgid "Browser" +msgstr "Navigateur" + +#: ../midori/midori-app.c:133 +msgid "The current browser" +msgstr "Le navigateur actuel" + +#: ../midori/midori-app.c:141 +msgid "Browser Count" +msgstr "Le nombre de navigateurs" + +#: ../midori/midori-app.c:142 +msgid "The current number of browsers" +msgstr "Le nombre actuel de navigateurs" + +#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 +#: ../midori/midori-searchentry.c:66 +msgid "Search Engines" +msgstr "Moteurs de recherche" + +#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +msgid "The list of search engines" +msgstr "" + +#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +msgid "Extensions" +msgstr "Extensions" + +#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +msgid "Userscripts" +msgstr "Scripts utilisateur" + +#: ../midori/midori-addons.c:42 +msgid "Userstyles" +msgstr "Styles utilisateur" + +#: ../midori/midori-browser.c:192 +msgid "Source" +msgstr "Source" + +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 +#: ../midori/midori-browser.c:2792 msgid "Reload the current page" msgstr "Recharger la page" -#: ../midori/midori-browser.c:209 ../midori/midori-browser.c:2236 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:272 +#: ../midori/midori-browser.c:337 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:721 -msgid "Menubar" -msgstr "Barre de menu" - -#: ../midori/midori-browser.c:722 -msgid "The menubar" -msgstr "La barre de menu" - -#: ../midori/midori-browser.c:730 ../midori/midori-preferences.c:332 -msgid "Navigationbar" -msgstr "Barre de navigation" - -#: ../midori/midori-browser.c:731 -msgid "The navigationbar" -msgstr "La barre de navigation" - -#: ../midori/midori-browser.c:739 -msgid "Tab" -msgstr "Onglet" - -#: ../midori/midori-browser.c:740 -msgid "The current tab" -msgstr "L'onglet actuel" - -#: ../midori/midori-browser.c:748 -msgid "Statusbar" -msgstr "Barre d'état" - -#: ../midori/midori-browser.c:749 -msgid "The statusbar" -msgstr "La barre d'état" - -#: ../midori/midori-browser.c:765 -msgid "Settings" -msgstr "Réglages" - -#: ../midori/midori-browser.c:766 -msgid "The associated settings" -msgstr "Les réglages associés" - -#: ../midori/midori-browser.c:785 -msgid "Statusbar Text" -msgstr "Texte de la barre d'état" - -#: ../midori/midori-browser.c:786 ../midori/midori-webview.c:224 -msgid "The text that is displayed in the statusbar" -msgstr "Le texte affiché dans la barre d'êtat" - -#: ../midori/midori-browser.c:804 -msgid "Trash" -msgstr "Corbeille" - -#: ../midori/midori-browser.c:805 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" - -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:560 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:560 msgid "Edit bookmark" msgstr "Éditer le signet" -#: ../midori/midori-browser.c:1457 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:1470 ../midori/webSearch.c:235 +#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:1489 ../midori/webSearch.c:249 +#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 msgid "_URL:" msgstr "_URL :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:1506 +#: ../midori/midori-browser.c:633 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:1510 +#: ../midori/midori-browser.c:637 msgid "Root" msgstr "Racine" -#: ../midori/midori-browser.c:1733 +#: ../midori/midori-browser.c:1064 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Action inattendue '%s'" + +#: ../midori/midori-browser.c:1283 +msgid "Menubar" +msgstr "Barre de menu" + +#: ../midori/midori-browser.c:1284 +msgid "The menubar" +msgstr "La barre de menu" + +#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +msgid "Navigationbar" +msgstr "Barre de navigation" + +#: ../midori/midori-browser.c:1293 +msgid "The navigationbar" +msgstr "La barre de navigation" + +#: ../midori/midori-browser.c:1301 +msgid "Tab" +msgstr "Onglet" + +#: ../midori/midori-browser.c:1302 +msgid "The current tab" +msgstr "L'onglet actuel" + +#: ../midori/midori-browser.c:1310 +msgid "Statusbar" +msgstr "Barre d'état" + +#: ../midori/midori-browser.c:1311 +msgid "The statusbar" +msgstr "La barre d'état" + +#: ../midori/midori-browser.c:1347 +msgid "Statusbar Text" +msgstr "Texte de la barre d'état" + +#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +msgid "The text that is displayed in the statusbar" +msgstr "Le texte affiché dans la barre d'êtat" + +#: ../midori/midori-browser.c:1381 +msgid "The list of search engines to be used for web search" +msgstr "" + +#: ../midori/midori-browser.c:2318 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:1922 +#: ../midori/midori-browser.c:2483 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:1930 +#: ../midori/midori-browser.c:2491 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader " -#: ../midori/midori-browser.c:2156 +#: ../midori/midori-browser.c:2709 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2159 +#: ../midori/midori-browser.c:2712 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2162 +#: ../midori/midori-browser.c:2715 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2165 +#: ../midori/midori-browser.c:2718 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:2168 +#: ../midori/midori-browser.c:2721 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:2170 +#: ../midori/midori-browser.c:2723 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:2171 +#: ../midori/midori-browser.c:2724 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:2173 +#: ../midori/midori-browser.c:2726 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:2174 +#: ../midori/midori-browser.c:2727 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:2176 +#: ../midori/midori-browser.c:2729 msgid "Pa_ge Setup" msgstr "Gestion de page" -#: ../midori/midori-browser.c:2180 +#: ../midori/midori-browser.c:2733 msgid "Show a preview of the printed page" msgstr "" -#: ../midori/midori-browser.c:2183 +#: ../midori/midori-browser.c:2736 msgid "Print the current page" msgstr "Imprimer la page actuel" -#: ../midori/midori-browser.c:2186 +#: ../midori/midori-browser.c:2739 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:2188 +#: ../midori/midori-browser.c:2741 msgid "_Edit" msgstr "Édit_er" -#: ../midori/midori-browser.c:2191 +#: ../midori/midori-browser.c:2744 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../midori/midori-browser.c:2194 +#: ../midori/midori-browser.c:2747 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../midori/midori-browser.c:2197 +#: ../midori/midori-browser.c:2750 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:2200 ../midori/midori-browser.c:2203 +#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:2206 +#: ../midori/midori-browser.c:2759 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:2209 +#: ../midori/midori-browser.c:2762 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:2212 +#: ../midori/midori-browser.c:2765 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:2215 +#: ../midori/midori-browser.c:2768 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2217 +#: ../midori/midori-browser.c:2770 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:2218 +#: ../midori/midori-browser.c:2771 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2220 +#: ../midori/midori-browser.c:2773 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:2221 +#: ../midori/midori-browser.c:2774 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2223 +#: ../midori/midori-browser.c:2776 msgid "_Quick Find" msgstr "Recherche rapide" -#: ../midori/midori-browser.c:2224 +#: ../midori/midori-browser.c:2777 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2780 msgid "Configure the application preferences" msgstr "Configurer les préferences de l'application" -#: ../midori/midori-browser.c:2229 +#: ../midori/midori-browser.c:2782 msgid "_View" msgstr "_Vue" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2783 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:2242 +#: ../midori/midori-browser.c:2795 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:2245 +#: ../midori/midori-browser.c:2798 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:2248 +#: ../midori/midori-browser.c:2801 msgid "Reset the zoom level" msgstr "Remettre le niveau d'agrandissement" -#: ../midori/midori-browser.c:2250 -msgid "View Source" -msgstr "Afficher la source" +#: ../midori/midori-browser.c:2803 +msgid "View _Source" +msgstr "Afficher la _source" -#: ../midori/midori-browser.c:2251 +#: ../midori/midori-browser.c:2804 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:2253 +#: ../midori/midori-browser.c:2806 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:2254 +#: ../midori/midori-browser.c:2807 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:2257 +#: ../midori/midori-browser.c:2810 msgid "Toggle fullscreen view" msgstr "Activer/Désactiver le plein écran" -#: ../midori/midori-browser.c:2259 +#: ../midori/midori-browser.c:2812 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:2262 +#: ../midori/midori-browser.c:2815 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2265 +#: ../midori/midori-browser.c:2818 msgid "Go forward to the next page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:2268 +#: ../midori/midori-browser.c:2821 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2270 +#: ../midori/midori-browser.c:2823 msgid "Location..." msgstr "Emplacement..." -#: ../midori/midori-browser.c:2271 +#: ../midori/midori-browser.c:2824 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:2273 +#: ../midori/midori-browser.c:2826 msgid "Web Search..." msgstr "Recherche toile..." -#: ../midori/midori-browser.c:2274 +#: ../midori/midori-browser.c:2827 msgid "Run a web search" msgstr "Démarrer une recherche toile" -#: ../midori/midori-browser.c:2276 +#: ../midori/midori-browser.c:2829 msgid "Open in Page_holder..." msgstr "Ouvrir dans le _cadre de pages..." -#: ../midori/midori-browser.c:2277 +#: ../midori/midori-browser.c:2830 msgid "Open the current page in the pageholder" msgstr "Ouvrir la page actuel dans le cadre de pages" -#: ../midori/midori-browser.c:2279 +#: ../midori/midori-browser.c:2832 msgid "Closed Tabs and Windows" msgstr "Onglets et fenêtres fermés" -#: ../midori/midori-browser.c:2280 +#: ../midori/midori-browser.c:2833 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:2282 +#: ../midori/midori-browser.c:2835 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:2283 +#: ../midori/midori-browser.c:2836 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:2285 +#: ../midori/midori-browser.c:2838 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:2286 +#: ../midori/midori-browser.c:2839 msgid "Open the last closed tab" msgstr "Ouvrir l'onglet plus récemment fermé" -#: ../midori/midori-browser.c:2288 +#: ../midori/midori-browser.c:2841 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:2291 +#: ../midori/midori-browser.c:2844 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:2293 +#: ../midori/midori-browser.c:2846 msgid "_Manage Bookmarks" msgstr "_Gérer les signets" -#: ../midori/midori-browser.c:2294 +#: ../midori/midori-browser.c:2847 msgid "Add, edit and remove bookmarks..." msgstr "Ajouter, modifier et supprimer des signets..." -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:2850 msgid "Open the selected bookmark" msgstr "Ouvrir le signet sélectionné" -#: ../midori/midori-browser.c:2299 +#: ../midori/midori-browser.c:2852 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2300 +#: ../midori/midori-browser.c:2853 msgid "Open the selected bookmark in a new tab" msgstr "Ouvrir le signet sélectionné dans un nouvel onglet" -#: ../midori/midori-browser.c:2302 +#: ../midori/midori-browser.c:2855 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2303 +#: ../midori/midori-browser.c:2856 msgid "Open the selected bookmark in a new window" msgstr "Ouvrir le signet sélectionné dans un nouvel fenêtre" -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2859 msgid "Edit the selected bookmark" msgstr "Éditer le signet sélectionné" -#: ../midori/midori-browser.c:2309 +#: ../midori/midori-browser.c:2862 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:2311 +#: ../midori/midori-browser.c:2864 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:2313 +#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 msgid "_Manage Search Engines" msgstr "_Gérer les moteurs de recherche" -#: ../midori/midori-browser.c:2314 +#: ../midori/midori-browser.c:2867 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:2317 +#: ../midori/midori-browser.c:2870 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:2319 +#: ../midori/midori-browser.c:2872 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:2320 +#: ../midori/midori-browser.c:2873 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:2875 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:2323 +#: ../midori/midori-browser.c:2876 msgid "Switch to the next tab" msgstr "" # fonctionnalité à tester -#: ../midori/midori-browser.c:2325 +#: ../midori/midori-browser.c:2878 msgid "Tab _Overview" msgstr "_Aperçu des onglets" -#: ../midori/midori-browser.c:2326 +#: ../midori/midori-browser.c:2879 msgid "Show an overview of all open tabs" msgstr "" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2881 msgid "_Help" msgstr "_Aide" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2883 msgid "_Contents" msgstr "_Contenu" -#: ../midori/midori-browser.c:2331 +#: ../midori/midori-browser.c:2884 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2334 +#: ../midori/midori-browser.c:2887 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:2340 +#: ../midori/midori-browser.c:2893 msgid "P_rivate Browsing" msgstr "Navigation en _privé" -#: ../midori/midori-browser.c:2341 +#: ../midori/midori-browser.c:2894 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:2344 +#: ../midori/midori-browser.c:2897 msgid "_Work Offline" msgstr "Travailler hors ligne" -#: ../midori/midori-browser.c:2345 +#: ../midori/midori-browser.c:2898 msgid "Work without a network connection" msgstr "" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:2902 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:2350 +#: ../midori/midori-browser.c:2903 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:2353 +#: ../midori/midori-browser.c:2906 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:2354 +#: ../midori/midori-browser.c:2907 msgid "Show sidepanel" msgstr "Afficher panneau latéral" -#: ../midori/midori-browser.c:2357 +#: ../midori/midori-browser.c:2910 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:2358 +#: ../midori/midori-browser.c:2911 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:2361 +#: ../midori/midori-browser.c:2914 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:2362 +#: ../midori/midori-browser.c:2915 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:2365 +#: ../midori/midori-browser.c:2918 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:2366 +#: ../midori/midori-browser.c:2919 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:2845 +#: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Signets" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:2852 ../midori/midori-preferences.c:248 +#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 msgid "Transfers" msgstr "Transferts" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:3469 msgid "Console" msgstr "Console" -#: ../midori/midori-browser.c:2868 ../midori/midori-preferences.c:395 +#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3485 msgid "Pageholder" msgstr "Cadre de pages" -#: ../midori/midori-browser.c:2886 -msgid "Userscripts" -msgstr "Scripts utilisateur" - -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3520 msgid "_Inline find:" msgstr "Recherche rapide:" -#: ../midori/midori-browser.c:2938 +#: ../midori/midori-browser.c:3553 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3570 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:2979 -msgid "Extensions" -msgstr "Extensions" - -#: ../midori/midori-browser.c:3148 ../midori/midori-webview.c:555 +#: ../midori/midori-browser.c:3807 #, c-format msgid "Unexpected setting '%s'" msgstr "Réglages des polices" -#: ../midori/midori-browser.c:3456 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Action inattendue '%s'" - #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Aspect des ombres autour de chaque panneau" @@ -709,586 +745,645 @@ msgstr "Menu pour contenir les éléments des panneaux" msgid "The index of the current page" msgstr "Le numéro de la page actuelle" -#: ../midori/midori-panel.c:212 ../midori/midori-panel.c:213 +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:391 +#: ../midori/midori-panel.c:392 msgid "Untitled" msgstr "Sans titre" -#: ../midori/midori-trash.c:96 -msgid "Limit" -msgstr "Plafond" - -#: ../midori/midori-trash.c:97 -msgid "The maximum number of items" -msgstr "Le nombre maximal d'éléments" - -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "Page récemment ouvertes" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Onglet actuel" # # Défaut n'est pas vraiment français, "par défaut" l'est -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Défaut" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:205 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Se rappeler de la taille de la fenêtre" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:243 msgid "Whether to save the last window size" msgstr "Enregistrer ou non la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:251 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:252 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:260 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:261 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:269 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:270 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:278 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:279 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:287 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:288 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:296 msgid "Last pageholder URI" msgstr "Dernière URI du cadre de pages" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:297 msgid "The URI last opened in the pageholder" msgstr "L'URI ouverte le plus récemment dans le cadre de pages" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:307 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:308 msgid "Whether to show the navigationbar" msgstr "Afficher ou non la barre de navigation" -#: ../midori/midori-websettings.c:323 +#: ../midori/midori-websettings.c:316 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:317 msgid "Whether to show the bookmarkbar" msgstr "Afficher ou non la barre des signets" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:325 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:333 +#: ../midori/midori-websettings.c:326 msgid "Whether to show the panel" msgstr "Afficher ou non le panneau" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:334 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:335 msgid "Whether to show the statusbar" msgstr "Afficher ou non la barre d'état" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:344 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:345 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:354 msgid "Small toolbar" msgstr "Petit barre d'outils" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:355 msgid "Use small toolbar icons" msgstr "Afficher de petites icônes de la barre d'outils" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:364 msgid "Show the New Tab button in the toolbar" msgstr "Afficher le bouton de nouvel onglet dans la barre d'outils" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:372 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:373 msgid "Show the Homepage button in the toolbar" msgstr "Afficher le bouton de page d'accueil dans la barre d'outils" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:381 msgid "Show Web search" msgstr "Afficher la recherche toile" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:382 msgid "Show the Web search entry in the toolbar" msgstr "Afficher le champ de recherche toile dans la barre d'outils" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:390 msgid "Show Trash" msgstr "Afficher la corbeille" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:391 msgid "Show the Trash button in the toolbar" msgstr "Afficher le bouton de la corbeille dans la barre d'outils" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:401 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:402 msgid "What to load on startup" msgstr "Que charger au démarrage" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:412 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:427 +#: ../midori/midori-websettings.c:420 msgid "Download Folder" msgstr "Répertoire de téléchargement" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:421 msgid "The folder downloaded files are saved to" msgstr "Le répertoire pour guarder les téléchargements" -#: ../midori/midori-websettings.c:436 -msgid "Show Download Notification" -msgstr "Afficher la notification de téléchargement" +#: ../midori/midori-websettings.c:429 +msgid "Download Manager" +msgstr "Gestionnaire de téléchargement" -#: ../midori/midori-websettings.c:437 -msgid "Show a notification window for finished downloads" -msgstr "Afficher une fenêtre de notification à la fin des téléchargements" +#: ../midori/midori-websettings.c:430 +msgid "An external download manager" +msgstr "Un gestionnaire de téléchargement extern" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:438 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:439 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:447 msgid "Preferred Encoding" msgstr "Encodage préferé" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:448 msgid "The preferred character encoding" msgstr "Encodage préféré des charactères" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:459 msgid "Tab Label Size" msgstr "Taille des onglets" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:460 msgid "The desired tab label size" msgstr "La taille désirée du libellé des onglets" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:468 msgid "Close Buttons on Tabs" msgstr "Bouton fermer sur les onglets" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:469 msgid "Whether tabs have close buttons" msgstr "Les onglets ont-ils des boutons de fermeture" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:477 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:478 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:487 msgid "Middle click opens Selection" msgstr "Clic molette charge la sélection" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:488 msgid "Load an URL from the selection via middle click" msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:496 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs in the background" msgstr "Ouvrir ou non les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres intempestives" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:506 msgid "Whether to open popup windows in tabs" msgstr "Ouvrir ou non les popups dans des onglets" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:516 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:517 msgid "What type of cookies to accept" msgstr "Quel type de témoins accepter" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:526 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:527 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:535 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:536 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels guarder les témoins" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:546 msgid "Remember last visited pages" msgstr "Se rappeler des pages visitées récemment" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:547 msgid "Whether the last visited pages are saved" msgstr "Enregistrer ou non les pages visitées" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:555 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:556 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels garder l'historique" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:564 msgid "Remember last form inputs" msgstr "Se rappeler des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:565 msgid "Whether the last form inputs are saved" msgstr "Enregistrer ou non les saisies de formulaires" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:573 msgid "Remember last downloaded files" msgstr "Se rappeler des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:574 msgid "Whether the last downloaded files are saved" msgstr "Enregistrer ou non la liste des fichiers téléchargés" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:584 msgid "HTTP Proxy" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:585 msgid "The proxy used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:593 msgid "Cache size" msgstr "Taille de l'antémémoire (cache)" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:594 msgid "The allowed size of the cache" msgstr "La taille acceptée de l'antémémoire" -#: ../midori/midori-webview.c:197 -msgid "The icon of the currently loaded page" -msgstr "L'icône de la page actuellement chargée" - -#: ../midori/midori-webview.c:206 +#: ../midori/midori-webview.c:193 msgid "The URI of the currently loaded page" msgstr "L'URI de la page actuellement chargée" -#: ../midori/midori-webview.c:215 +#: ../midori/midori-webview.c:202 msgid "The title of the currently loaded page" msgstr "Le titre de la page actuellement chargée" -#: ../midori/midori-webview.c:453 +#: ../midori/midori-webview.c:578 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-webview.c:476 +#: ../midori/midori-webview.c:606 +msgid "Download Link with Download _Manager" +msgstr "Télécharge le lien avec le gestionnaire de _télégarments" + +#: ../midori/midori-webview.c:624 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" -#: ../midori/midori-preferences.c:64 +#: ../midori/midori-preferences.c:62 msgid "Settings instance to provide properties" msgstr "" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:84 #, c-format msgid "%s Preferences" msgstr "%s Préferences" #. Page "General" -#: ../midori/midori-preferences.c:236 +#: ../midori/midori-preferences.c:267 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:237 +#: ../midori/midori-preferences.c:268 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../midori/midori-preferences.c:258 +#: ../midori/midori-preferences.c:301 msgid "Appearance" msgstr "Aspect" -#: ../midori/midori-preferences.c:259 +#: ../midori/midori-preferences.c:302 msgid "Font settings" msgstr "Réglages des polices" #. Page "Behavior" -#: ../midori/midori-preferences.c:280 +#: ../midori/midori-preferences.c:322 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:281 +#: ../midori/midori-preferences.c:323 msgid "Features" msgstr "Fonctionnalités" #. Page "Interface" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:373 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:387 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:361 ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:415 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:378 +#: ../midori/midori-preferences.c:420 msgid "Privacy" msgstr "Confidentialité" -#: ../midori/midori-preferences.c:379 +#: ../midori/midori-preferences.c:421 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../midori/midori-preferences.c:392 ../midori/midori-preferences.c:402 +#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 msgid "days" msgstr "jours" -#: ../midori/sokoke.c:286 +#: ../midori/midori-webitem.c:70 +msgid "Name" +msgstr "Nom" + +#: ../midori/midori-webitem.c:71 +msgid "The name of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:79 +msgid "Description" +msgstr "Description" + +#: ../midori/midori-webitem.c:80 +msgid "The description of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:88 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-webitem.c:89 +msgid "The URI of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:97 +msgid "Icon" +msgstr "Icôn" + +#: ../midori/midori-webitem.c:98 +msgid "The icon of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:106 +msgid "Token" +msgstr "" + +#: ../midori/midori-webitem.c:107 +msgid "The token of the web item" +msgstr "" + +#: ../midori/midori-searchentry.c:75 +msgid "Current Item" +msgstr "" + +#: ../midori/midori-searchentry.c:76 +msgid "The currently selected item" +msgstr "" + +#: ../midori/midori-searchentry.c:84 +msgid "Dialog" +msgstr "" + +#: ../midori/midori-searchentry.c:85 +msgid "A dialog to manage search engines" +msgstr "" + +#: ../midori/midori-searchentry.c:152 +msgid "Empty" +msgstr "Vide" + +#: ../midori/midori-searchentry.c:524 +msgid "Add search engine" +msgstr "Ajouter un moteur de recherche" + +#: ../midori/midori-searchentry.c:524 +msgid "Edit search engine" +msgstr "Éditer le moteur de recherche" + +#: ../midori/midori-searchentry.c:551 +msgid "_Name:" +msgstr "_Nom:" + +#: ../midori/midori-searchentry.c:595 +msgid "_Icon (name or file):" +msgstr "_Icône (nom ou fichier):" + +#: ../midori/midori-searchentry.c:609 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchentry.c:790 +msgid "Manage search engines" +msgstr "Gérer les moteurs de recherche" + +#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:348 msgid "Warning: You are using a superuser account!" msgstr "Attention: Vous êtes connecté en tant que super-utilisateur!" -#: ../midori/sokoke.c:449 ../katze/katze-xbel.c:952 +#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 #, c-format msgid "Writing failed." msgstr "Échec de l'écriture." -#: ../midori/webSearch.c:117 -msgid "Empty" -msgstr "Vide" +#: ../midori/gjs.c:89 +msgid "An unknown error occured." +msgstr "" -#: ../midori/webSearch.c:189 -msgid "Add search engine" -msgstr "Ajouter un moteur de recherche" +#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#, c-format +msgid "%s has no property '%s'" +msgstr "" -#: ../midori/webSearch.c:189 -msgid "Edit search engine" -msgstr "Éditer le moteur de recherche" +#: ../midori/gjs.c:445 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" -#: ../midori/webSearch.c:219 -msgid "_Name:" -msgstr "_Nom:" +#: ../midori/gjs.c:455 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" -#: ../midori/webSearch.c:263 -msgid "_Icon (name or file):" -msgstr "_Icône (nom ou fichier):" - -#: ../midori/webSearch.c:277 -msgid "_Keyword:" -msgstr "_Mot-clé:" - -#: ../midori/webSearch.c:346 -msgid "Manage search engines" -msgstr "Gérer les moteurs de recherche" - -#: ../katze/katze-throbber.c:135 +#: ../katze/katze-throbber.c:134 msgid "Symbolic size to use for the animation" msgstr "Taille symbolique à utiliser pour l'animation" -#: ../katze/katze-throbber.c:144 +#: ../katze/katze-throbber.c:143 msgid "The name of an icon containing animation frames" msgstr "" -#: ../katze/katze-throbber.c:153 +#: ../katze/katze-throbber.c:152 msgid "A GdkPixbuf containing animation frames" msgstr "" -#: ../katze/katze-throbber.c:162 +#: ../katze/katze-throbber.c:161 msgid "Whether the throbber should be animated" msgstr "" -#: ../katze/katze-throbber.c:171 +#: ../katze/katze-throbber.c:170 msgid "The name of an icon to be used as the static image" msgstr "" -#: ../katze/katze-throbber.c:180 +#: ../katze/katze-throbber.c:179 msgid "A GdkPixbuf to be used as the static image" msgstr "" -#: ../katze/katze-throbber.c:189 +#: ../katze/katze-throbber.c:188 msgid "The stock ID of an icon to be used as the static image" msgstr "" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:300 +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété '%s' n'est pas valide pour %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:185 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:172 +#: ../katze/katze-utils.c:177 msgid "Choose folder" msgstr "Choisissez un répertoire" -#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 -#: ../katze/katze-xbel.c:804 +#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:789 msgid "Malformed document." msgstr "Document malformé" -#: ../katze/katze-xbel.c:759 +#: ../katze/katze-xbel.c:744 msgid "File not found." msgstr "Fichier non trouvé." - -#~ msgid "Debugging" -#~ msgstr "Débogage" - -#~ msgid "Unhandled settings property '%s'" -#~ msgstr "Réglage non pris en charge '%s'" - -#~ msgid "Midori Web Browser" -#~ msgstr "Navigateur Midori" - -#~ msgid "New Bookmark" -#~ msgstr "Nouveau Signet" From bc761582396ab84516293541cc877bd15b328d5f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 16:25:10 +0200 Subject: [PATCH 0206/2970] Update German translation --- po/de.po | 671 +++++++++++++++++++++++++++---------------------------- 1 file changed, 329 insertions(+), 342 deletions(-) diff --git a/po/de.po b/po/de.po index 68342dd6..d17d98bf 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.17\n" +"Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-15 13:22+0200\n" +"POT-Creation-Date: 2008-07-19 16:00+0200\n" "PO-Revision-Date: 2008-03-20 13:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,7 +21,7 @@ msgstr "" msgid "Lightweight web browser" msgstr "Kleiner Netznavigator" -#: ../midori.desktop.in.h:2 +#: ../midori.desktop.in.h:2 ../midori/main.c:354 msgid "Midori" msgstr "Midori" @@ -80,92 +80,91 @@ msgstr "Wert '%s' ist ungültig für %s" msgid "Unhandled settings value '%s'" msgstr "Unbehandelter Einstellungswert '%s'" -#: ../midori/main.c:334 +#: ../midori/main.c:346 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:342 ../midori/main.c:351 ../midori/main.c:353 -#: ../midori/main.c:367 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:347 +#: ../midori/main.c:359 msgid "[URL]" msgstr "[URL]" -#: ../midori/main.c:351 +#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 +msgid "midori" +msgstr "midori" + +#: ../midori/main.c:363 msgid "Unknown argument." msgstr "Unbekanntes Argument." -#: ../midori/main.c:353 +#: ../midori/main.c:365 msgid "Failed to setup interface." msgstr "Oberfläche konnte nicht eingerichtet werden." -#: ../midori/main.c:368 +#: ../midori/main.c:380 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:370 +#: ../midori/main.c:382 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:418 +#: ../midori/main.c:430 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:432 +#: ../midori/main.c:444 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Die Sitzung konnte nicht geladen werden. %s\n" -#: ../midori/main.c:444 +#: ../midori/main.c:456 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" -#: ../midori/main.c:454 +#: ../midori/main.c:468 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:583 +#: ../midori/main.c:606 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:593 +#: ../midori/main.c:616 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../midori/main.c:602 +#: ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht geladen werden. %s" -#: ../midori/main.c:614 +#: ../midori/main.c:637 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:623 +#: ../midori/main.c:646 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1075 +#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 msgid "Settings" msgstr "Einstellungen" -#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1076 +#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 msgid "The associated settings" msgstr "Die zugewiesenen Einstellungen" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1114 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 msgid "Trash" msgstr "Papierkorb" -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1115 +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 msgid "The trash, collecting recently closed tabs and windows" msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" @@ -179,26 +178,26 @@ msgstr "Der aktuelle Navigator" #: ../midori/midori-app.c:141 msgid "Browser Count" -msgstr "" +msgstr "Anzahl Navigatoren" #: ../midori/midori-app.c:142 msgid "The current number of browsers" msgstr "Die maximale Anzahl an Navigatoren" -#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1128 -#: ../midori/midori-searchentry.c:71 +#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 +#: ../midori/midori-searchentry.c:66 msgid "Search Engines" msgstr "Suchmaschinen" -#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:72 +#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 msgid "The list of search engines" msgstr "Die Liste der Suchmaschine" -#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3199 +#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 msgid "Extensions" msgstr "Erweiterungen" -#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3106 +#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 msgid "Userscripts" msgstr "Benutzerskripte" @@ -206,522 +205,526 @@ msgstr "Benutzerskripte" msgid "Userstyles" msgstr "Benutzerstile" -#: ../midori/midori-browser.c:202 ../midori/midori-browser.c:2423 -#: ../midori/midori-browser.c:2429 +#: ../midori/midori-browser.c:192 +msgid "Source" +msgstr "Quelltext" + +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 +#: ../midori/midori-browser.c:2792 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:210 ../midori/midori-browser.c:2426 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:273 +#: ../midori/midori-browser.c:337 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:418 +#: ../midori/midori-browser.c:560 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:418 +#: ../midori/midori-browser.c:560 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:445 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:458 ../midori/midori-searchentry.c:501 +#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 msgid "_Description:" msgstr "_Beschreibung" -#: ../midori/midori-browser.c:477 ../midori/midori-searchentry.c:515 +#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:633 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:637 msgid "Root" msgstr "Wurzel" -#: ../midori/midori-browser.c:812 +#: ../midori/midori-browser.c:1064 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion '%s'." -#: ../midori/midori-browser.c:1031 +#: ../midori/midori-browser.c:1283 msgid "Menubar" msgstr "Menüleiste" -#: ../midori/midori-browser.c:1032 +#: ../midori/midori-browser.c:1284 msgid "The menubar" msgstr "Die Menüleiste" -#: ../midori/midori-browser.c:1040 ../midori/midori-preferences.c:333 +#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-browser.c:1041 +#: ../midori/midori-browser.c:1293 msgid "The navigationbar" msgstr "Die Navigationsleiste" -#: ../midori/midori-browser.c:1049 +#: ../midori/midori-browser.c:1301 msgid "Tab" msgstr "Reiter" -#: ../midori/midori-browser.c:1050 +#: ../midori/midori-browser.c:1302 msgid "The current tab" msgstr "Der aktuelle Reiter" -#: ../midori/midori-browser.c:1058 +#: ../midori/midori-browser.c:1310 msgid "Statusbar" msgstr "Statusleiste" -#: ../midori/midori-browser.c:1059 +#: ../midori/midori-browser.c:1311 msgid "The statusbar" msgstr "Die Statusleiste" -#: ../midori/midori-browser.c:1095 +#: ../midori/midori-browser.c:1347 msgid "Statusbar Text" msgstr "Statusleistenbeschriftung" -#: ../midori/midori-browser.c:1096 ../midori/midori-webview.c:225 +#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 msgid "The text that is displayed in the statusbar" msgstr "Der Text, der in der Statusleiste angezeigt wird" -#: ../midori/midori-browser.c:1129 +#: ../midori/midori-browser.c:1381 msgid "The list of search engines to be used for web search" msgstr "Die Liste der Suchmaschinen, die für die Netzsuche genutzt werden" -#: ../midori/midori-browser.c:1935 +#: ../midori/midori-browser.c:2318 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2112 +#: ../midori/midori-browser.c:2483 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2120 +#: ../midori/midori-browser.c:2491 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2346 +#: ../midori/midori-browser.c:2709 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:2712 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:2352 +#: ../midori/midori-browser.c:2715 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:2355 +#: ../midori/midori-browser.c:2718 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:2358 +#: ../midori/midori-browser.c:2721 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:2360 +#: ../midori/midori-browser.c:2723 msgid "_Close Tab" msgstr "Reiter sch_ließen" -#: ../midori/midori-browser.c:2361 +#: ../midori/midori-browser.c:2724 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:2363 +#: ../midori/midori-browser.c:2726 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:2364 +#: ../midori/midori-browser.c:2727 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:2366 +#: ../midori/midori-browser.c:2729 msgid "Pa_ge Setup" msgstr "Seite _einrichten" -#: ../midori/midori-browser.c:2370 +#: ../midori/midori-browser.c:2733 msgid "Show a preview of the printed page" msgstr "Eine Vorschau auf die gedruckte Seite anzeigen" -#: ../midori/midori-browser.c:2373 +#: ../midori/midori-browser.c:2736 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:2376 +#: ../midori/midori-browser.c:2739 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:2378 +#: ../midori/midori-browser.c:2741 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:2381 +#: ../midori/midori-browser.c:2744 msgid "Undo the last modification" msgstr "Die letzte Änderung wiederrufen" -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2747 msgid "Redo the last modification" msgstr "Die letzte Änderung wiederholen" -#: ../midori/midori-browser.c:2387 +#: ../midori/midori-browser.c:2750 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:2390 ../midori/midori-browser.c:2393 +#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:2396 +#: ../midori/midori-browser.c:2759 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:2399 +#: ../midori/midori-browser.c:2762 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:2402 +#: ../midori/midori-browser.c:2765 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:2405 +#: ../midori/midori-browser.c:2768 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:2407 +#: ../midori/midori-browser.c:2770 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:2408 +#: ../midori/midori-browser.c:2771 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2410 +#: ../midori/midori-browser.c:2773 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:2411 +#: ../midori/midori-browser.c:2774 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2413 +#: ../midori/midori-browser.c:2776 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:2414 +#: ../midori/midori-browser.c:2777 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:2417 +#: ../midori/midori-browser.c:2780 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:2419 +#: ../midori/midori-browser.c:2782 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:2420 +#: ../midori/midori-browser.c:2783 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:2432 +#: ../midori/midori-browser.c:2795 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2435 +#: ../midori/midori-browser.c:2798 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2438 +#: ../midori/midori-browser.c:2801 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:2440 -msgid "View Source" -msgstr "Quelltext anzeigen" +#: ../midori/midori-browser.c:2803 +msgid "View _Source" +msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:2441 +#: ../midori/midori-browser.c:2804 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:2443 +#: ../midori/midori-browser.c:2806 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:2444 +#: ../midori/midori-browser.c:2807 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:2447 +#: ../midori/midori-browser.c:2810 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:2449 +#: ../midori/midori-browser.c:2812 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:2452 +#: ../midori/midori-browser.c:2815 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:2455 +#: ../midori/midori-browser.c:2818 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:2458 +#: ../midori/midori-browser.c:2821 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:2460 +#: ../midori/midori-browser.c:2823 msgid "Location..." msgstr "Ort..." -#: ../midori/midori-browser.c:2461 +#: ../midori/midori-browser.c:2824 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:2463 +#: ../midori/midori-browser.c:2826 msgid "Web Search..." msgstr "Netzsuche..." -#: ../midori/midori-browser.c:2464 +#: ../midori/midori-browser.c:2827 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:2466 +#: ../midori/midori-browser.c:2829 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen..." -#: ../midori/midori-browser.c:2467 +#: ../midori/midori-browser.c:2830 msgid "Open the current page in the pageholder" msgstr "Die aktuelle Seite im Seitenhalter öffnen" -#: ../midori/midori-browser.c:2469 +#: ../midori/midori-browser.c:2832 msgid "Closed Tabs and Windows" msgstr "Geschlossene Reiter und Fenster" -#: ../midori/midori-browser.c:2470 +#: ../midori/midori-browser.c:2833 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:2472 +#: ../midori/midori-browser.c:2835 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:2473 +#: ../midori/midori-browser.c:2836 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:2475 +#: ../midori/midori-browser.c:2838 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:2476 +#: ../midori/midori-browser.c:2839 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2841 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:2481 +#: ../midori/midori-browser.c:2844 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2483 +#: ../midori/midori-browser.c:2846 msgid "_Manage Bookmarks" msgstr "Lesezeichen _verwalten" -#: ../midori/midori-browser.c:2484 +#: ../midori/midori-browser.c:2847 msgid "Add, edit and remove bookmarks..." msgstr "Lesezeichen hinzufügen, bearbeiten und löschen..." -#: ../midori/midori-browser.c:2487 +#: ../midori/midori-browser.c:2850 msgid "Open the selected bookmark" msgstr "Markiertes Lesezeichen kopieren" -#: ../midori/midori-browser.c:2489 +#: ../midori/midori-browser.c:2852 msgid "Open in New _Tab" msgstr "In einem neuen _Reiter öffnen" -#: ../midori/midori-browser.c:2490 +#: ../midori/midori-browser.c:2853 msgid "Open the selected bookmark in a new tab" msgstr "Öffne das markierte Lesezeichen in einem neuen Reiter" -#: ../midori/midori-browser.c:2492 +#: ../midori/midori-browser.c:2855 msgid "Open in New _Window" msgstr "In einem neuen _Fenster öffnen" -#: ../midori/midori-browser.c:2493 +#: ../midori/midori-browser.c:2856 msgid "Open the selected bookmark in a new window" msgstr "Markiertes Lesezeichen in neuem Fenster öffnen" -#: ../midori/midori-browser.c:2496 +#: ../midori/midori-browser.c:2859 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:2499 +#: ../midori/midori-browser.c:2862 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:2501 +#: ../midori/midori-browser.c:2864 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:2503 +#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 msgid "_Manage Search Engines" -msgstr "Suchmaschinen verwalten" +msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:2504 +#: ../midori/midori-browser.c:2867 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." -#: ../midori/midori-browser.c:2507 +#: ../midori/midori-browser.c:2870 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:2509 +#: ../midori/midori-browser.c:2872 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:2510 +#: ../midori/midori-browser.c:2873 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:2512 +#: ../midori/midori-browser.c:2875 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:2513 +#: ../midori/midori-browser.c:2876 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:2515 +#: ../midori/midori-browser.c:2878 msgid "Tab _Overview" msgstr "Reiterüber_sicht" -#: ../midori/midori-browser.c:2516 +#: ../midori/midori-browser.c:2879 msgid "Show an overview of all open tabs" msgstr "Zeige eine Übersicht über alle offenen Reiter" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2518 +#: ../midori/midori-browser.c:2881 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:2520 +#: ../midori/midori-browser.c:2883 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:2521 +#: ../midori/midori-browser.c:2884 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:2524 +#: ../midori/midori-browser.c:2887 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:2530 +#: ../midori/midori-browser.c:2893 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:2531 +#: ../midori/midori-browser.c:2894 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:2534 +#: ../midori/midori-browser.c:2897 msgid "_Work Offline" msgstr "_Ohne Verbindung arbeiten" -#: ../midori/midori-browser.c:2535 +#: ../midori/midori-browser.c:2898 msgid "Work without a network connection" msgstr "Ohne Netzwerkverbindung arbeiten" -#: ../midori/midori-browser.c:2539 +#: ../midori/midori-browser.c:2902 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:2540 +#: ../midori/midori-browser.c:2903 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:2543 +#: ../midori/midori-browser.c:2906 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:2544 +#: ../midori/midori-browser.c:2907 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:2547 +#: ../midori/midori-browser.c:2910 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:2548 +#: ../midori/midori-browser.c:2911 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:2551 +#: ../midori/midori-browser.c:2914 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:2552 +#: ../midori/midori-browser.c:2915 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:2555 +#: ../midori/midori-browser.c:2918 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:2556 +#: ../midori/midori-browser.c:2919 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Lesezeichen" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3072 ../midori/midori-preferences.c:249 +#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3469 msgid "Console" msgstr "Konsole" -#: ../midori/midori-browser.c:3088 ../midori/midori-preferences.c:396 +#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3485 msgid "Pageholder" msgstr "Seitenhalter" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3520 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3553 msgid "Match Case" -msgstr "Groß-/ Kleinschreibung beachten" +msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3570 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:3380 ../midori/midori-webview.c:556 +#: ../midori/midori-browser.c:3807 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung '%s'" @@ -738,486 +741,478 @@ msgstr "Menü für Leistenelemente" msgid "The index of the current page" msgstr "Der Index der aktiven Seite" -#: ../midori/midori-panel.c:212 ../midori/midori-panel.c:213 +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:391 +#: ../midori/midori-panel.c:392 msgid "Untitled" msgstr "Unbenannt" -#: ../midori/midori-trash.c:96 -msgid "Limit" -msgstr "Obergrenze" - -#: ../midori/midori-trash.c:97 -msgid "The maximum number of items" -msgstr "Die maximale Anzahl an Elementen" - -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-r)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "Benutzerdefinidert..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Alle Kekse" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Sitzungskekse" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:205 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:243 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:251 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:252 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:260 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:261 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:269 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:270 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:278 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:279 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:287 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:288 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:296 msgid "Last pageholder URI" msgstr "Letzte URI im Seitenhalter" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:297 msgid "The URI last opened in the pageholder" msgstr "Die letzte im Seitenhalter geöffnete URI" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:307 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:308 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:323 +#: ../midori/midori-websettings.c:316 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:317 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:325 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:333 +#: ../midori/midori-websettings.c:326 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:334 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:335 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:344 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:345 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:354 msgid "Small toolbar" msgstr "Kleine Werkzeugleiste" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:355 msgid "Use small toolbar icons" msgstr "Kleine Symbole benutzen" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Zeige Neuer Reiter" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:364 msgid "Show the New Tab button in the toolbar" msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:372 msgid "Show Homepage" -msgstr "Startseite anzeigen" +msgstr "Zeige Startseite" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:373 msgid "Show the Homepage button in the toolbar" msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:381 msgid "Show Web search" msgstr "Zeige Netzsuche" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:382 msgid "Show the Web search entry in the toolbar" msgstr "Netzsuchfeld in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:390 msgid "Show Trash" msgstr "Zeige Papierkorb" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:391 msgid "Show the Trash button in the toolbar" msgstr "Papierkorb-Knopf in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:401 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:402 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:412 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:427 +#: ../midori/midori-websettings.c:420 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:421 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:436 -msgid "Show Download Notification" -msgstr "Übertragungsbenachrichtigung anzeigen" +#: ../midori/midori-websettings.c:429 +msgid "Download Manager" +msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:437 -msgid "Show a notification window for finished downloads" -msgstr "Zeige ein Hinweisfenster für abgeschlossene Übertragungen" +#: ../midori/midori-websettings.c:430 +msgid "An external download manager" +msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:438 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:439 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:447 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:448 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:459 msgid "Tab Label Size" msgstr "Reitergröße" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:460 msgid "The desired tab label size" msgstr "Die gewünschte Größe der Reiterbeschriftung" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:468 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:469 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:477 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:478 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:487 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:488 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:496 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:506 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:516 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:517 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:526 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:527 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:535 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:536 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:546 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:547 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:555 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:556 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:564 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:565 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:573 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:574 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:584 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:585 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:593 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:594 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-webview.c:198 -msgid "The icon of the currently loaded page" -msgstr "Das Symbol der aktuellen Seite" - -#: ../midori/midori-webview.c:207 +#: ../midori/midori-webview.c:193 msgid "The URI of the currently loaded page" msgstr "Die URI der aktuellen Seite" -#: ../midori/midori-webview.c:216 +#: ../midori/midori-webview.c:202 msgid "The title of the currently loaded page" msgstr "Der Titel der aktuellen Seite" -#: ../midori/midori-webview.c:454 +#: ../midori/midori-webview.c:578 msgid "Open Link in New _Tab" msgstr "Verweis in einem neuen _Reiter öffnen" -#: ../midori/midori-webview.c:477 -msgid "Open URL in New _Tab" -msgstr "_URL in einem neuen Reiter öffnen" +#: ../midori/midori-webview.c:606 +msgid "Download Link with Download _Manager" +msgstr "Verweis mit Übertragungs_manager herunterladen" -#: ../midori/midori-preferences.c:64 +#: ../midori/midori-webview.c:624 +msgid "Open URL in New _Tab" +msgstr "URL in einem neuen _Reiter öffnen" + +#: ../midori/midori-preferences.c:62 msgid "Settings instance to provide properties" msgstr "Einstellungsinstanz mit erforderlichen Eigenschaften" -#: ../midori/midori-preferences.c:88 +#: ../midori/midori-preferences.c:84 #, c-format msgid "%s Preferences" msgstr "%s Einstellungen" #. Page "General" -#: ../midori/midori-preferences.c:237 +#: ../midori/midori-preferences.c:267 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:238 +#: ../midori/midori-preferences.c:268 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../midori/midori-preferences.c:259 +#: ../midori/midori-preferences.c:301 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:260 +#: ../midori/midori-preferences.c:302 msgid "Font settings" msgstr "Schrifteinstellungen" #. Page "Behavior" -#: ../midori/midori-preferences.c:281 +#: ../midori/midori-preferences.c:322 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:282 +#: ../midori/midori-preferences.c:323 msgid "Features" msgstr "Inhalte" #. Page "Interface" -#: ../midori/midori-preferences.c:332 +#: ../midori/midori-preferences.c:373 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:346 +#: ../midori/midori-preferences.c:387 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:362 ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-preferences.c:415 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:379 +#: ../midori/midori-preferences.c:420 msgid "Privacy" msgstr "Privatsphäre" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:421 msgid "Web Cookies" msgstr "Verbindungskekse" -#: ../midori/midori-preferences.c:393 ../midori/midori-preferences.c:403 +#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 msgid "days" msgstr "Tage" @@ -1235,11 +1230,11 @@ msgstr "Beschreibung" #: ../midori/midori-webitem.c:80 msgid "The description of the web item" -msgstr "" +msgstr "Die Beschreibung des Netzelementes" #: ../midori/midori-webitem.c:88 msgid "URI" -msgstr "" +msgstr "URI" #: ../midori/midori-webitem.c:89 msgid "The URI of the web item" @@ -1255,61 +1250,65 @@ msgstr "Der Index des aktiven Elements" #: ../midori/midori-webitem.c:106 msgid "Token" -msgstr "" +msgstr "Kürzel" #: ../midori/midori-webitem.c:107 msgid "The token of the web item" msgstr "Das Kürzel des Netzelements" -#: ../midori/midori-searchentry.c:80 +#: ../midori/midori-searchentry.c:75 msgid "Current Item" msgstr "Aktuelles Element" -#: ../midori/midori-searchentry.c:81 +#: ../midori/midori-searchentry.c:76 msgid "The currently selected item" msgstr "Das aktuell ausgewählte Element" -#: ../midori/midori-searchentry.c:89 +#: ../midori/midori-searchentry.c:84 msgid "Dialog" msgstr "Dialog" -#: ../midori/midori-searchentry.c:90 +#: ../midori/midori-searchentry.c:85 msgid "A dialog to manage search engines" msgstr "Ein Dialog zum verwalten von Suchmaschinen" -#: ../midori/midori-searchentry.c:144 +#: ../midori/midori-searchentry.c:152 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchentry.c:458 +#: ../midori/midori-searchentry.c:524 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchentry.c:458 +#: ../midori/midori-searchentry.c:524 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchentry.c:485 +#: ../midori/midori-searchentry.c:551 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchentry.c:529 +#: ../midori/midori-searchentry.c:595 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchentry.c:543 +#: ../midori/midori-searchentry.c:609 msgid "_Token:" -msgstr "" +msgstr "_Kürzel:" -#: ../midori/midori-searchentry.c:650 +#: ../midori/midori-searchentry.c:790 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" -#: ../midori/sokoke.c:294 +#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "Konnte externes Programm nicht ausführen." + +#: ../midori/sokoke.c:348 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:457 ../katze/katze-xbel.c:953 +#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." @@ -1318,20 +1317,20 @@ msgstr "Schreiben fehlgeschlagen." msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/gjs.c:309 ../midori/gjs.c:401 +#: ../midori/gjs.c:309 ../midori/gjs.c:399 #, c-format msgid "%s has no property '%s'" msgstr "%s hat keine Eigenschaft '%s'" -#: ../midori/gjs.c:447 +#: ../midori/gjs.c:445 #, c-format msgid "%s cannot be assigned to %s.%s" -msgstr "" +msgstr "%s kann %s.%s nicht zugewiesen werden" -#: ../midori/gjs.c:457 +#: ../midori/gjs.c:455 #, c-format msgid "%s.%s cannot be accessed" -msgstr "" +msgstr "Auf %s.%s kann nicht zugegriffen werden" #: ../katze/katze-throbber.c:134 msgid "Symbolic size to use for the animation" @@ -1363,37 +1362,25 @@ msgstr "" "Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " "soll" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:300 +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft '%s' ist ungültig für %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:185 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:172 +#: ../katze/katze-utils.c:177 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../katze/katze-xbel.c:724 ../katze/katze-xbel.c:732 -#: ../katze/katze-xbel.c:768 ../katze/katze-xbel.c:776 -#: ../katze/katze-xbel.c:805 +#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:789 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:744 msgid "File not found." msgstr "Datei nicht gefunden." - -#~ msgid "_Keyword:" -#~ msgstr "_Schlüsselwort:" - -#~ msgid "Debugging" -#~ msgstr "Fehlerbehebung" - -#~ msgid "Midori Web Browser" -#~ msgstr "Midori Netznavigator" - -#~ msgid "New Bookmark" -#~ msgstr "Neues Lesezeichen" From fffb6253e15ab7a7211e9d9d8f16cb3448940b09 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jul 2008 17:24:10 +0200 Subject: [PATCH 0207/2970] Update Swedish translation --- po/sv.po | 1548 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 892 insertions(+), 656 deletions(-) diff --git a/po/sv.po b/po/sv.po index bea20500..873a76c1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.17\n" +"Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 16:06+0200\n" +"POT-Creation-Date: 2008-07-19 16:00+0200\n" "PO-Revision-Date: 2008-03-23 21:05+0100\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: Swedish\n" @@ -20,1126 +20,1362 @@ msgstr "" msgid "Lightweight web browser" msgstr "Liten webbläsare" -#: ../midori.desktop.in.h:2 -msgid "Midori Web Browser" -msgstr "Midori Webbläsare" +#: ../midori.desktop.in.h:2 ../midori/main.c:354 +msgid "Midori" +msgstr "Midori" #: ../midori.desktop.in.h:3 msgid "Web Browser" msgstr "Webbläsare" -#: ../src/main.c:47 +#: ../midori/main.c:45 msgid "Bookmark" msgstr "Bokmärke" -#: ../src/main.c:48 -msgid "New Bookmark" -msgstr "Nytt Bokmärke" +#: ../midori/main.c:46 +msgid "_Add Bookmark" +msgstr "" -#: ../src/main.c:49 +#: ../midori/main.c:47 msgid "_Form Fill" msgstr "Fyll i _formulär" -#: ../src/main.c:50 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:407 -msgid "Homepage" -msgstr "Hemsida" +#: ../midori/main.c:48 +msgid "_Homepage" +msgstr "_Hemsida" -#: ../src/main.c:51 +#: ../midori/main.c:49 msgid "New _Tab" msgstr "Ny _tabb" -#: ../src/main.c:52 +#: ../midori/main.c:50 msgid "New _Window" msgstr "Nytt _fönster" -#: ../src/main.c:54 +#: ../midori/main.c:52 msgid "Select _All" msgstr "Välj _alla" -#: ../src/main.c:57 +#: ../midori/main.c:55 msgid "_Fullscreen" msgstr "_Fullskärm" -#: ../src/main.c:58 +#: ../midori/main.c:56 msgid "_Leave Fullscreen" msgstr "_Lämna fullskärm" -#: ../src/main.c:144 +#: ../midori/main.c:110 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Konfigurationsfilen kunde inte laddas. %s\n" -#: ../src/main.c:193 +#: ../midori/main.c:165 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../src/main.c:200 ../src/main.c:256 +#: ../midori/main.c:172 ../midori/main.c:241 #, c-format -msgid "Unhandled settings property '%s'" +msgid "Unhandled settings value '%s'" msgstr "" -#: ../src/main.c:270 ../src/main.c:304 -msgid "midori" -msgstr "midori" - -#: ../src/main.c:277 +#: ../midori/main.c:346 msgid "Display program version" msgstr "Visa programversion" -#: ../src/main.c:282 +#: ../midori/main.c:359 msgid "[URL]" msgstr "[URL]" -#: ../src/main.c:306 -msgid "Debugging" -msgstr "Felsökning" +#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 +msgid "midori" +msgstr "midori" -#: ../src/main.c:307 +#: ../midori/main.c:363 +msgid "Unknown argument." +msgstr "" + +#: ../midori/main.c:365 +msgid "Failed to setup interface." +msgstr "" + +#: ../midori/main.c:380 msgid "Please report comments, suggestions and bugs to:" msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" -#: ../src/main.c:309 +#: ../midori/main.c:382 msgid "Check for new versions at:" msgstr "Leta efter nya verioner på:" -#: ../src/main.c:344 +#: ../midori/main.c:430 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Bokmärkena kunde inte laddas. %s\n" -#: ../src/main.c:358 +#: ../midori/main.c:444 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "Sessionen kunde inte laddas. %s\n" -#: ../src/main.c:370 +#: ../midori/main.c:456 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "Papperskorgen kunde inte laddas. %s\n" -#: ../src/main.c:380 +#: ../midori/main.c:468 msgid "The following errors occured:" msgstr "Följande fel inträffade:" -#: ../src/main.c:489 -#, fuzzy, c-format +#: ../midori/main.c:606 +#, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Sessionen kunde inte laddas. %s\n" +msgstr "Sökmotorer kunde inte sparad. %s" -#: ../src/main.c:498 -#, fuzzy, c-format +#: ../midori/main.c:616 +#, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Bokmärkena kunde inte laddas. %s\n" +msgstr "Bokmärkena kunde inte sparad. %s" -#: ../src/main.c:507 -#, fuzzy, c-format +#: ../midori/main.c:625 +#, c-format msgid "The trash couldn't be saved. %s" -msgstr "Papperskorgen kunde inte laddas. %s\n" +msgstr "Papperskorgen kunde inte sparad. %s" -#: ../src/main.c:519 -#, fuzzy, c-format +#: ../midori/main.c:637 +#, c-format msgid "The session couldn't be saved. %s" -msgstr "Sessionen kunde inte laddas. %s\n" +msgstr "Sessionen kunde inte sparad. %s" -#: ../src/main.c:528 -#, fuzzy, c-format +#: ../midori/main.c:646 +#, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Konfigurationsfilen kunde inte laddas. %s\n" +msgstr "Konfigurationsfilen kunde inte sparad. %s" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 -#: ../src/midori-browser.c:2101 +#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +msgid "Settings" +msgstr "Inställningar" + +#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +msgid "The associated settings" +msgstr "De associerade inställningarna" + +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +msgid "Trash" +msgstr "Papperskorgen" + +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Soptunnan, samlar senast stängda tabbar och fönster" + +#: ../midori/midori-app.c:132 +msgid "Browser" +msgstr "Bläsare" + +#: ../midori/midori-app.c:133 +msgid "The current browser" +msgstr "" + +#: ../midori/midori-app.c:141 +msgid "Browser Count" +msgstr "" + +#: ../midori/midori-app.c:142 +msgid "The current number of browsers" +msgstr "" + +#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 +#: ../midori/midori-searchentry.c:66 +msgid "Search Engines" +msgstr "Sökmotorer" + +#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +msgid "The list of search engines" +msgstr "" + +#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +msgid "Extensions" +msgstr "" + +#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +msgid "Userscripts" +msgstr "" + +#: ../midori/midori-addons.c:42 +msgid "Userstyles" +msgstr "" + +#: ../midori/midori-browser.c:192 +msgid "Source" +msgstr "Källkod" + +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 +#: ../midori/midori-browser.c:2792 msgid "Reload the current page" msgstr "Ladda om sidan" -#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 msgid "Stop loading the current page" msgstr "Sluta ladda sidan" -#: ../src/midori-browser.c:264 +#: ../midori/midori-browser.c:337 #, c-format msgid "%d%% loaded" msgstr "%d%% laddat" -#: ../src/midori-browser.c:611 -msgid "Menubar" -msgstr "" - -#: ../src/midori-browser.c:612 -#, fuzzy -msgid "The menubar" -msgstr "Hemsida" - -#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 -msgid "Navigationbar" -msgstr "Navigeringsfält" - -#: ../src/midori-browser.c:626 -#, fuzzy -msgid "The navigationbar" -msgstr "Navigeringsfält" - -#: ../src/midori-browser.c:639 -msgid "Tab" -msgstr "" - -#: ../src/midori-browser.c:640 -#, fuzzy -msgid "The current tab" -msgstr "Stäng den här tabben" - -#: ../src/midori-browser.c:653 -#, fuzzy -msgid "Statusbar" -msgstr "_Statusrad" - -#: ../src/midori-browser.c:654 -#, fuzzy -msgid "The statusbar" -msgstr "_Statusrad" - -#: ../src/midori-browser.c:670 -#, fuzzy -msgid "Settings" -msgstr "Typsnittinställningar" - -#: ../src/midori-browser.c:671 -msgid "The associated settings" -msgstr "De associerade inställningarna" - -#: ../src/midori-browser.c:690 -#, fuzzy -msgid "Statusbar Text" -msgstr "_Statusrad" - -#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 -msgid "The text that is displayed in the statusbar" -msgstr "Texten som visas i statusraden" - -#: ../src/midori-browser.c:709 -#, fuzzy -msgid "Trash" -msgstr "Visa _papperskorgen" - -#: ../src/midori-browser.c:710 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Soptunnan, samlar senast stängda tabbar och fönster" - -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:560 msgid "New bookmark" msgstr "Nytt bokmärke" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:560 msgid "Edit bookmark" msgstr "Redigera bokmärke" -#: ../src/midori-browser.c:1311 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Titel:" -#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 +#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 msgid "_Description:" msgstr "_Beskrivning" -#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 +#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1364 +#: ../midori/midori-browser.c:633 msgid "_Folder:" msgstr "_Mapp:" -#: ../src/midori-browser.c:1368 +#: ../midori/midori-browser.c:637 msgid "Root" msgstr "Rot" -#: ../src/midori-browser.c:1591 -msgid "Separator" -msgstr "Avskiljare" - -#: ../src/midori-browser.c:1780 -msgid "A lightweight web browser." -msgstr "En liten webbläsare." - -#: ../src/midori-browser.c:1788 -msgid "translator-credits" -msgstr "Mikael Magnusson " - -#: ../src/midori-browser.c:2015 -msgid "_File" -msgstr "_Fil" - -#: ../src/midori-browser.c:2018 -msgid "Open a new window" -msgstr "Öppna i nytt fönster" - -#: ../src/midori-browser.c:2021 -msgid "Open a new tab" -msgstr "Öppna i ny tabb" - -#: ../src/midori-browser.c:2024 -msgid "Open a file" -msgstr "Öppna en fil" - -#: ../src/midori-browser.c:2027 -msgid "Save to a file" -msgstr "Spara till fil" - -#: ../src/midori-browser.c:2029 -msgid "_Close Tab" -msgstr "_Stäng tabb" - -#: ../src/midori-browser.c:2030 -msgid "Close the current tab" -msgstr "Stäng den här tabben" - -#: ../src/midori-browser.c:2032 -msgid "C_lose Window" -msgstr "S_täng fönster" - -#: ../src/midori-browser.c:2033 -msgid "Close this window" -msgstr "Stäng det här fönstret" - -#: ../src/midori-browser.c:2035 -msgid "Pa_ge Setup" -msgstr "_Sidinställningar" - -#: ../src/midori-browser.c:2045 -msgid "Quit the application" -msgstr "Avsluta programmet" - -#: ../src/midori-browser.c:2047 -msgid "_Edit" -msgstr "_Redigera" - -#: ../src/midori-browser.c:2050 -msgid "Undo the last modification" -msgstr "Ångra senaste ändringen" - -#: ../src/midori-browser.c:2053 -msgid "Redo the last modification" -msgstr "Gör om senaste ändringen" - -#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 -msgid "Copy the selected text" -msgstr "Kopiera markerad text" - -#: ../src/midori-browser.c:2065 -msgid "Paste text from the clipboard" -msgstr "Klistra in text från klippbordet" - -#: ../src/midori-browser.c:2068 -msgid "Delete the selected text" -msgstr "Ta bort markerad text" - -#: ../src/midori-browser.c:2071 -msgid "Select all text" -msgstr "Markera all text" - -#: ../src/midori-browser.c:2079 -msgid "Find _Next" -msgstr "Hitta _nästa" - -#: ../src/midori-browser.c:2082 -msgid "Find _Previous" -msgstr "Hitta _förra" - -#: ../src/midori-browser.c:2085 -msgid "_Quick Find" -msgstr "_Snabbsök" - -#: ../src/midori-browser.c:2091 -msgid "_View" -msgstr "_Visa" - -#: ../src/midori-browser.c:2092 -msgid "_Toolbars" -msgstr "_Verktygsfält" - -#: ../src/midori-browser.c:2112 -msgid "View Source" -msgstr "Visa källkod" - -#: ../src/midori-browser.c:2115 -msgid "View Selection Source" -msgstr "Visa källkod för markering" - -#: ../src/midori-browser.c:2119 -msgid "Toggle fullscreen view" -msgstr "Växla fullskärmsläge" - -#: ../src/midori-browser.c:2121 -msgid "_Go" -msgstr "_Gå" - -#: ../src/midori-browser.c:2132 -msgid "Location..." -msgstr "Plats..." - -#: ../src/midori-browser.c:2135 -msgid "Web Search..." -msgstr "Webbsökning..." - -#: ../src/midori-browser.c:2138 -msgid "Open in Page_holder..." -msgstr "Visa i sid_hållare..." - -#: ../src/midori-browser.c:2141 -msgid "Closed Tabs and Windows" -msgstr "Stängda tabbar och fönster" - -#: ../src/midori-browser.c:2142 -msgid "Reopen a previously closed tab or window" -msgstr "Öppna en tidigare stängd tabb eller fönster" - -#: ../src/midori-browser.c:2144 -msgid "Empty Trash" -msgstr "Töm papperskorgen" - -#: ../src/midori-browser.c:2147 -msgid "Undo Close Tab" -msgstr "Ångra stäng tabb" - -#: ../src/midori-browser.c:2150 -msgid "_Bookmarks" -msgstr "_Bokmärken" - -#: ../src/midori-browser.c:2155 -msgid "_Manage Bookmarks" -msgstr "_Hantera bokmärken" - -#: ../src/midori-browser.c:2161 -msgid "Open in New _Tab" -msgstr "Öppna i ny _tabb" - -#: ../src/midori-browser.c:2164 -msgid "Open in New _Window" -msgstr "Öppna i nytt _fönster" - -#: ../src/midori-browser.c:2173 -msgid "_Tools" -msgstr "_Verktyg" - -#: ../src/midori-browser.c:2175 -msgid "_Manage Search Engines" -msgstr "_Hantera sökmotorer" - -#: ../src/midori-browser.c:2176 -msgid "Add, edit and remove search engines..." -msgstr "Lägg till, ändra och ta bort sökmotorer..." - -#: ../src/midori-browser.c:2179 -msgid "_Window" -msgstr "_Fönster" - -#: ../src/midori-browser.c:2181 -msgid "_Previous Tab" -msgstr "_Föregående tabb" - -#: ../src/midori-browser.c:2184 -msgid "_Next Tab" -msgstr "_Nästa tabb" - -#: ../src/midori-browser.c:2187 -msgid "Tab _Overview" -msgstr "Tabbö_versikt" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2190 -msgid "_Help" -msgstr "_Hjälp" - -#: ../src/midori-browser.c:2192 -msgid "_Contents" -msgstr "_Innehåll" - -#: ../src/midori-browser.c:2202 -msgid "P_rivate Browsing" -msgstr "P_rivat läge" - -#: ../src/midori-browser.c:2206 -msgid "_Work Offline" -msgstr "_Arbeta offline" - -#: ../src/midori-browser.c:2211 -msgid "_Navigationbar" -msgstr "_Navigationsfält" - -#: ../src/midori-browser.c:2215 -msgid "Side_panel" -msgstr "Sido_panel" - -#: ../src/midori-browser.c:2219 -msgid "_Bookmarkbar" -msgstr "_Bokmärkesfält" - -#: ../src/midori-browser.c:2223 -msgid "_Transferbar" -msgstr "Ö_verföringsfält" - -#: ../src/midori-browser.c:2227 -msgid "_Statusbar" -msgstr "_Statusrad" - -#: ../src/midori-browser.c:2681 -msgid "Bookmarks" -msgstr "Bokmärken" - -#. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 -msgid "Transfers" -msgstr "Överföringar" - -#: ../src/midori-browser.c:2697 -msgid "Console" -msgstr "Konsol" - -#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 -msgid "History" -msgstr "Historia" - -#: ../src/midori-browser.c:2713 -msgid "Pageholder" -msgstr "Sidhållare" - -#: ../src/midori-browser.c:2722 -#, fuzzy -msgid "Userscripts" -msgstr "Aktivera _skript" - -#: ../src/midori-browser.c:2748 -msgid "_Inline find:" -msgstr "_Snabbsökning:" - -#: ../src/midori-browser.c:2774 -msgid "Match Case" -msgstr "_Gör skillnad på skiftläge" - -#: ../src/midori-browser.c:2791 -msgid "Close Findbar" -msgstr "Stäng sökfältet" - -#: ../src/midori-browser.c:2815 -msgid "Extensions" -msgstr "" - -#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 -#, fuzzy, c-format -msgid "Unexpected setting '%s'" -msgstr "Avancerade inställningar" - -#: ../src/midori-browser.c:3278 +#: ../midori/midori-browser.c:1064 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../src/midori-panel.c:147 +#: ../midori/midori-browser.c:1283 +msgid "Menubar" +msgstr "" + +#: ../midori/midori-browser.c:1284 +msgid "The menubar" +msgstr "" + +#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +msgid "Navigationbar" +msgstr "Navigeringsfält" + +#: ../midori/midori-browser.c:1293 +msgid "The navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:1301 +msgid "Tab" +msgstr "" + +#: ../midori/midori-browser.c:1302 +msgid "The current tab" +msgstr "" + +#: ../midori/midori-browser.c:1310 +msgid "Statusbar" +msgstr "Statusrad" + +#: ../midori/midori-browser.c:1311 +msgid "The statusbar" +msgstr "" + +#: ../midori/midori-browser.c:1347 +msgid "Statusbar Text" +msgstr "" + +#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +msgid "The text that is displayed in the statusbar" +msgstr "Texten som visas i statusraden" + +#: ../midori/midori-browser.c:1381 +msgid "The list of search engines to be used for web search" +msgstr "" + +#: ../midori/midori-browser.c:2318 +msgid "Separator" +msgstr "Avskiljare" + +#: ../midori/midori-browser.c:2483 +msgid "A lightweight web browser." +msgstr "En liten webbläsare." + +#: ../midori/midori-browser.c:2491 +msgid "translator-credits" +msgstr "Mikael Magnusson " + +#: ../midori/midori-browser.c:2709 +msgid "_File" +msgstr "_Fil" + +#: ../midori/midori-browser.c:2712 +msgid "Open a new window" +msgstr "Öppna i nytt fönster" + +#: ../midori/midori-browser.c:2715 +msgid "Open a new tab" +msgstr "Öppna i ny tabb" + +#: ../midori/midori-browser.c:2718 +msgid "Open a file" +msgstr "Öppna en fil" + +#: ../midori/midori-browser.c:2721 +msgid "Save to a file" +msgstr "Spara till fil" + +#: ../midori/midori-browser.c:2723 +msgid "_Close Tab" +msgstr "_Stäng tabb" + +#: ../midori/midori-browser.c:2724 +msgid "Close the current tab" +msgstr "Stäng den här tabben" + +#: ../midori/midori-browser.c:2726 +msgid "C_lose Window" +msgstr "S_täng fönster" + +#: ../midori/midori-browser.c:2727 +msgid "Close this window" +msgstr "Stäng det här fönstret" + +#: ../midori/midori-browser.c:2729 +msgid "Pa_ge Setup" +msgstr "_Sidinställningar" + +#: ../midori/midori-browser.c:2733 +msgid "Show a preview of the printed page" +msgstr "" + +#: ../midori/midori-browser.c:2736 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:2739 +msgid "Quit the application" +msgstr "Avsluta programmet" + +#: ../midori/midori-browser.c:2741 +msgid "_Edit" +msgstr "_Redigera" + +#: ../midori/midori-browser.c:2744 +msgid "Undo the last modification" +msgstr "Ångra senaste ändringen" + +#: ../midori/midori-browser.c:2747 +msgid "Redo the last modification" +msgstr "Gör om senaste ändringen" + +#: ../midori/midori-browser.c:2750 +msgid "Cut the selected text" +msgstr "Klippa ut markerad text" + +#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 +msgid "Copy the selected text" +msgstr "Kopiera markerad text" + +#: ../midori/midori-browser.c:2759 +msgid "Paste text from the clipboard" +msgstr "Klistra in text från klippbordet" + +#: ../midori/midori-browser.c:2762 +msgid "Delete the selected text" +msgstr "Ta bort markerad text" + +#: ../midori/midori-browser.c:2765 +msgid "Select all text" +msgstr "Markera all text" + +#: ../midori/midori-browser.c:2768 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:2770 +msgid "Find _Next" +msgstr "Hitta _nästa" + +#: ../midori/midori-browser.c:2771 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2773 +msgid "Find _Previous" +msgstr "Hitta _förra" + +#: ../midori/midori-browser.c:2774 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2776 +msgid "_Quick Find" +msgstr "_Snabbsök" + +#: ../midori/midori-browser.c:2777 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2780 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:2782 +msgid "_View" +msgstr "_Visa" + +#: ../midori/midori-browser.c:2783 +msgid "_Toolbars" +msgstr "_Verktygsfält" + +#: ../midori/midori-browser.c:2795 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2798 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2801 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2803 +msgid "View _Source" +msgstr "Visa _källkod" + +#: ../midori/midori-browser.c:2804 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:2806 +msgid "View Selection Source" +msgstr "Visa källkod för markering" + +#: ../midori/midori-browser.c:2807 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:2810 +msgid "Toggle fullscreen view" +msgstr "Växla fullskärmsläge" + +#: ../midori/midori-browser.c:2812 +msgid "_Go" +msgstr "_Gå" + +#: ../midori/midori-browser.c:2815 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:2818 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:2821 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:2823 +msgid "Location..." +msgstr "Plats..." + +#: ../midori/midori-browser.c:2824 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:2826 +msgid "Web Search..." +msgstr "Webbsökning..." + +#: ../midori/midori-browser.c:2827 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:2829 +msgid "Open in Page_holder..." +msgstr "Visa i sid_hållare..." + +#: ../midori/midori-browser.c:2830 +msgid "Open the current page in the pageholder" +msgstr "" + +#: ../midori/midori-browser.c:2832 +msgid "Closed Tabs and Windows" +msgstr "Stängda tabbar och fönster" + +#: ../midori/midori-browser.c:2833 +msgid "Reopen a previously closed tab or window" +msgstr "Öppna en tidigare stängd tabb eller fönster" + +#: ../midori/midori-browser.c:2835 +msgid "Empty Trash" +msgstr "Töm papperskorgen" + +#: ../midori/midori-browser.c:2836 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:2838 +msgid "Undo Close Tab" +msgstr "Ångra stäng tabb" + +#: ../midori/midori-browser.c:2839 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:2841 +msgid "_Bookmarks" +msgstr "_Bokmärken" + +#: ../midori/midori-browser.c:2844 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2846 +msgid "_Manage Bookmarks" +msgstr "_Hantera bokmärken" + +#: ../midori/midori-browser.c:2847 +msgid "Add, edit and remove bookmarks..." +msgstr "Lägg till, ändra och ta bort bokmärken..." + +#: ../midori/midori-browser.c:2850 +msgid "Open the selected bookmark" +msgstr "Kopiera markerad bokmärke" + +#: ../midori/midori-browser.c:2852 +msgid "Open in New _Tab" +msgstr "Öppna i ny _tabb" + +#: ../midori/midori-browser.c:2853 +msgid "Open the selected bookmark in a new tab" +msgstr "" + +#: ../midori/midori-browser.c:2855 +msgid "Open in New _Window" +msgstr "Öppna i nytt _fönster" + +#: ../midori/midori-browser.c:2856 +msgid "Open the selected bookmark in a new window" +msgstr "" + +#: ../midori/midori-browser.c:2859 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2862 +msgid "Delete the selected bookmark" +msgstr "Ta bort markerad bokmärke" + +#: ../midori/midori-browser.c:2864 +msgid "_Tools" +msgstr "_Verktyg" + +#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 +msgid "_Manage Search Engines" +msgstr "_Hantera sökmotorer" + +#: ../midori/midori-browser.c:2867 +msgid "Add, edit and remove search engines..." +msgstr "Lägg till, ändra och ta bort sökmotorer..." + +#: ../midori/midori-browser.c:2870 +msgid "_Window" +msgstr "_Fönster" + +#: ../midori/midori-browser.c:2872 +msgid "_Previous Tab" +msgstr "_Föregående tabb" + +#: ../midori/midori-browser.c:2873 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:2875 +msgid "_Next Tab" +msgstr "_Nästa tabb" + +#: ../midori/midori-browser.c:2876 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:2878 +msgid "Tab _Overview" +msgstr "Tabbö_versikt" + +#: ../midori/midori-browser.c:2879 +msgid "Show an overview of all open tabs" +msgstr "" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../midori/midori-browser.c:2881 +msgid "_Help" +msgstr "_Hjälp" + +#: ../midori/midori-browser.c:2883 +msgid "_Contents" +msgstr "_Innehåll" + +#: ../midori/midori-browser.c:2884 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:2887 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:2893 +msgid "P_rivate Browsing" +msgstr "P_rivat läge" + +#: ../midori/midori-browser.c:2894 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:2897 +msgid "_Work Offline" +msgstr "_Arbeta offline" + +#: ../midori/midori-browser.c:2898 +msgid "Work without a network connection" +msgstr "" + +#: ../midori/midori-browser.c:2902 +msgid "_Navigationbar" +msgstr "_Navigationsfält" + +#: ../midori/midori-browser.c:2903 +msgid "Show navigationbar" +msgstr "Visa navigeringsfält" + +#: ../midori/midori-browser.c:2906 +msgid "Side_panel" +msgstr "Sido_panel" + +#: ../midori/midori-browser.c:2907 +msgid "Show sidepanel" +msgstr "Visa sido_panel" + +#: ../midori/midori-browser.c:2910 +msgid "_Bookmarkbar" +msgstr "_Bokmärkesfält" + +#: ../midori/midori-browser.c:2911 +msgid "Show bookmarkbar" +msgstr "Visa bokmärkesfält" + +#: ../midori/midori-browser.c:2914 +msgid "_Transferbar" +msgstr "Ö_verföringsfält" + +#: ../midori/midori-browser.c:2915 +msgid "Show transferbar" +msgstr "Visa statusrad" + +#: ../midori/midori-browser.c:2918 +msgid "_Statusbar" +msgstr "_Statusrad" + +#: ../midori/midori-browser.c:2919 +msgid "Show statusbar" +msgstr "Visa statusrad" + +#: ../midori/midori-browser.c:3453 +msgid "Bookmarks" +msgstr "Bokmärken" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 +msgid "Transfers" +msgstr "Överföringar" + +#: ../midori/midori-browser.c:3469 +msgid "Console" +msgstr "Konsol" + +#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 +msgid "History" +msgstr "Historia" + +#: ../midori/midori-browser.c:3485 +msgid "Pageholder" +msgstr "Sidhållare" + +#: ../midori/midori-browser.c:3520 +msgid "_Inline find:" +msgstr "_Snabbsökning:" + +#: ../midori/midori-browser.c:3553 +msgid "Match Case" +msgstr "_Gör skillnad på skiftläge" + +#: ../midori/midori-browser.c:3570 +msgid "Close Findbar" +msgstr "Stäng sökfältet" + +#: ../midori/midori-browser.c:3807 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Utseende på skuggan runt varje panel" -#: ../src/midori-panel.c:157 +#: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Meny för att visa panelföremål" -#: ../src/midori-panel.c:166 +#: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Indexet för nuvarande sida" -#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 msgid "Close panel" msgstr "Stäng panel" -#: ../src/midori-panel.c:391 +#: ../midori/midori-panel.c:392 msgid "Untitled" msgstr "Namnlös" -#: ../src/midori-trash.c:97 -msgid "The maximum number of items" -msgstr "Maximalt antal föremål" - -#: ../src/midori-websettings.c:130 -#, fuzzy +#: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Tom sida" -#: ../src/midori-websettings.c:132 -#, fuzzy -msgid "Last open pages" -msgstr "Senaste öppna sidor" +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +msgid "Homepage" +msgstr "Hemsida" -#: ../src/midori-websettings.c:147 +#: ../midori/midori-websettings.c:132 +msgid "Last open pages" +msgstr "" + +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Kinesiska (BIG5)" -#: ../src/midori-websettings.c:148 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japanska (SHIFT_JIS)" -#: ../src/midori-websettings.c:149 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Ryska (KOI8-R)" -#: ../src/midori-websettings.c:150 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../src/midori-websettings.c:151 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Västerländsk (ISO-8859-1)" -#: ../src/midori-websettings.c:152 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "" -#: ../src/midori-websettings.c:167 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Ny tabb" -#: ../src/midori-websettings.c:168 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Nytt fönster" -#: ../src/midori-websettings.c:169 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Nuvarande tabb" -#: ../src/midori-websettings.c:184 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Standard" -#: ../src/midori-websettings.c:185 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Ikoner" -#: ../src/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "Text" -#: ../src/midori-websettings.c:187 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Både och" -#: ../src/midori-websettings.c:188 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Båda horisontellt" -#: ../src/midori-websettings.c:203 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Alla kakor" -#: ../src/midori-websettings.c:204 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Sessionskakor" -#: ../src/midori-websettings.c:205 +#: ../midori/midori-websettings.c:205 msgid "None" msgstr "Inga" -#: ../src/midori-websettings.c:247 -#, fuzzy +#: ../midori/midori-websettings.c:242 msgid "Remember last window size" -msgstr "Kom ihåg mina nerladdade filer" +msgstr "" -#: ../src/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "Whether to save the last window size" msgstr "" -#: ../src/midori-websettings.c:256 +#: ../midori/midori-websettings.c:251 msgid "Last window width" msgstr "" -#: ../src/midori-websettings.c:257 +#: ../midori/midori-websettings.c:252 msgid "The last saved window width" msgstr "" -#: ../src/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Last window height" msgstr "" -#: ../src/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "The last saved window height" msgstr "" -#: ../src/midori-websettings.c:274 +#: ../midori/midori-websettings.c:269 msgid "Last panel position" msgstr "" -#: ../src/midori-websettings.c:275 +#: ../midori/midori-websettings.c:270 msgid "The last saved panel position" msgstr "" -#: ../src/midori-websettings.c:283 -#, fuzzy +#: ../midori/midori-websettings.c:278 msgid "Last panel page" -msgstr "Senaste öppna sidor" +msgstr "" -#: ../src/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "The last saved panel page" msgstr "" -#: ../src/midori-websettings.c:292 -#, fuzzy +#: ../midori/midori-websettings.c:287 msgid "Last Web search" -msgstr "Webbsökning" +msgstr "" -#: ../src/midori-websettings.c:293 +#: ../midori/midori-websettings.c:288 msgid "The last saved Web search" msgstr "" -#: ../src/midori-websettings.c:301 -#, fuzzy +#: ../midori/midori-websettings.c:296 msgid "Last pageholder URI" -msgstr "Sidhållare" +msgstr "" -#: ../src/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "The URI last opened in the pageholder" msgstr "" -#: ../src/midori-websettings.c:312 -#, fuzzy +#: ../midori/midori-websettings.c:307 msgid "Show Navigationbar" -msgstr "Navigeringsfält" +msgstr "Visa Navigeringsfält" -#: ../src/midori-websettings.c:313 +#: ../midori/midori-websettings.c:308 msgid "Whether to show the navigationbar" msgstr "" -#: ../src/midori-websettings.c:321 -#, fuzzy +#: ../midori/midori-websettings.c:316 msgid "Show Bookmarkbar" -msgstr "_Bokmärkesfält" +msgstr "Visa Bokmärkesfält" -#: ../src/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../src/midori-websettings.c:330 +#: ../midori/midori-websettings.c:325 msgid "Show Panel" +msgstr "Visa Sidopanel" + +#: ../midori/midori-websettings.c:326 +msgid "Whether to show the panel" msgstr "" -#: ../src/midori-websettings.c:331 -#, fuzzy -msgid "Whether to show the panel" -msgstr "Ifall aktivitetssymbolen ska animeras" - -#: ../src/midori-websettings.c:339 -#, fuzzy +#: ../midori/midori-websettings.c:334 msgid "Show Statusbar" -msgstr "_Statusrad" +msgstr "Visa Statusrad" -#: ../src/midori-websettings.c:340 -#, fuzzy +#: ../midori/midori-websettings.c:335 msgid "Whether to show the statusbar" -msgstr "Texten som visas i statusraden" +msgstr "" -#: ../src/midori-websettings.c:349 -#, fuzzy +#: ../midori/midori-websettings.c:344 msgid "Toolbar Style" -msgstr "S_til för verktygsfält" +msgstr "Stil för verktygsfält" -#: ../src/midori-websettings.c:350 +#: ../midori/midori-websettings.c:345 msgid "The style of the toolbar" msgstr "" -#: ../src/midori-websettings.c:359 +#: ../midori/midori-websettings.c:354 msgid "Small toolbar" -msgstr "" +msgstr "Små verktygsfält" -#: ../src/midori-websettings.c:360 -#, fuzzy +#: ../midori/midori-websettings.c:355 msgid "Use small toolbar icons" -msgstr "Visa små _ikoner" +msgstr "Visa små ikoner" -#: ../src/midori-websettings.c:368 -#, fuzzy +#: ../midori/midori-websettings.c:363 msgid "Show New Tab" -msgstr "Visa _ny tabb" +msgstr "Visa Ny tabb" -#: ../src/midori-websettings.c:369 +#: ../midori/midori-websettings.c:364 msgid "Show the New Tab button in the toolbar" msgstr "" -#: ../src/midori-websettings.c:377 -#, fuzzy -msgid "Show Web search" -msgstr "Visa webb_sökning" +#: ../midori/midori-websettings.c:372 +msgid "Show Homepage" +msgstr "Visa Hemsida" -#: ../src/midori-websettings.c:378 +#: ../midori/midori-websettings.c:373 +msgid "Show the Homepage button in the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:381 +msgid "Show Web search" +msgstr "Visa Webbsökning" + +#: ../midori/midori-websettings.c:382 msgid "Show the Web search entry in the toolbar" msgstr "" -#: ../src/midori-websettings.c:386 -#, fuzzy +#: ../midori/midori-websettings.c:390 msgid "Show Trash" -msgstr "Visa _papperskorgen" +msgstr "Visa Papperskorgen" -#: ../src/midori-websettings.c:387 +#: ../midori/midori-websettings.c:391 msgid "Show the Trash button in the toolbar" msgstr "" -#: ../src/midori-websettings.c:397 -#, fuzzy +#: ../midori/midori-websettings.c:401 msgid "Load on Startup" msgstr "Ladda vid uppstart" -#: ../src/midori-websettings.c:398 -#, fuzzy +#: ../midori/midori-websettings.c:402 msgid "What to load on startup" -msgstr "Ladda vid uppstart" +msgstr "" -#: ../src/midori-websettings.c:408 -#, fuzzy +#: ../midori/midori-websettings.c:412 msgid "The homepage" -msgstr "Hemsida" +msgstr "" -#: ../src/midori-websettings.c:416 -#, fuzzy +#: ../midori/midori-websettings.c:420 msgid "Download Folder" msgstr "Nedladdningsmapp" -#: ../src/midori-websettings.c:417 -#, fuzzy +#: ../midori/midori-websettings.c:421 msgid "The folder downloaded files are saved to" -msgstr "Välj nedladdningsmapp" - -#: ../src/midori-websettings.c:425 -msgid "Show Download Notification" msgstr "" -#: ../src/midori-websettings.c:426 -#, fuzzy -msgid "Show a notification window for finished downloads" -msgstr "Visa ett notifieringsfönster för avslutade överföringar" +#: ../midori/midori-websettings.c:429 +msgid "Download Manager" +msgstr "" -#: ../src/midori-websettings.c:434 -#, fuzzy +#: ../midori/midori-websettings.c:430 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:438 msgid "Location entry Search" -msgstr "Sökmotor för _addressfältet" +msgstr "Sökmotor för Addressfältet" -#: ../src/midori-websettings.c:435 +#: ../midori/midori-websettings.c:439 msgid "The search to perform inside the location entry" msgstr "" -#: ../src/midori-websettings.c:443 -#, fuzzy +#: ../midori/midori-websettings.c:447 msgid "Preferred Encoding" -msgstr "Föredragna språk" +msgstr "" -#: ../src/midori-websettings.c:444 +#: ../midori/midori-websettings.c:448 msgid "The preferred character encoding" msgstr "" -#: ../src/midori-websettings.c:455 -#, fuzzy +#: ../midori/midori-websettings.c:459 msgid "Tab Label Size" -msgstr "Ta_bbstorlek" +msgstr "Tabbstorlek" -#: ../src/midori-websettings.c:456 +#: ../midori/midori-websettings.c:460 msgid "The desired tab label size" msgstr "Önskad storlek på tabbetikett" -#: ../src/midori-websettings.c:464 -#, fuzzy +#: ../midori/midori-websettings.c:468 msgid "Close Buttons on Tabs" -msgstr "Stäng_knappar på tabbar" +msgstr "Stängknappar på tabbar" -#: ../src/midori-websettings.c:465 +#: ../midori/midori-websettings.c:469 msgid "Whether tabs have close buttons" msgstr "Ifall tabbar har stängknappar" -#: ../src/midori-websettings.c:473 -#, fuzzy +#: ../midori/midori-websettings.c:477 msgid "Open new pages in" -msgstr "Öppna _nya sidor i" +msgstr "Öppna nya sidor i" -#: ../src/midori-websettings.c:474 -#, fuzzy +#: ../midori/midori-websettings.c:478 msgid "Where to open new pages" -msgstr "Öppna _nya sidor i" +msgstr "" -#: ../src/midori-websettings.c:483 -#, fuzzy +#: ../midori/midori-websettings.c:487 msgid "Middle click opens Selection" -msgstr "_Mittenklick öppnar markering" +msgstr "Mittenklick öppnar markering" -#: ../src/midori-websettings.c:484 +#: ../midori/midori-websettings.c:488 msgid "Load an URL from the selection via middle click" msgstr "Ladda en URL från markeringen via mittenklick" -#: ../src/midori-websettings.c:492 -#, fuzzy +#: ../midori/midori-websettings.c:496 msgid "Open tabs in the background" -msgstr "Öppna tabbar i _bakgrunden" +msgstr "Öppna tabbar i bakgrunden" -#: ../src/midori-websettings.c:493 -#, fuzzy +#: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs in the background" -msgstr "Öppna tabbar i _bakgrunden" +msgstr "" -#: ../src/midori-websettings.c:501 -#, fuzzy +#: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" -msgstr "Öppna popups i _tabbar" +msgstr "Öppna popups i tabbar" -#: ../src/midori-websettings.c:502 -#, fuzzy +#: ../midori/midori-websettings.c:506 msgid "Whether to open popup windows in tabs" -msgstr "Öppna popups i _tabbar" +msgstr "" -#: ../src/midori-websettings.c:512 +#: ../midori/midori-websettings.c:516 msgid "Accept cookies" msgstr "Acceptera kakor" -#: ../src/midori-websettings.c:513 +#: ../midori/midori-websettings.c:517 msgid "What type of cookies to accept" msgstr "" -#: ../src/midori-websettings.c:522 +#: ../midori/midori-websettings.c:526 msgid "Original cookies only" msgstr "" -#: ../src/midori-websettings.c:523 -#, fuzzy +#: ../midori/midori-websettings.c:527 msgid "Accept cookies from the original website only" msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" -#: ../src/midori-websettings.c:531 +#: ../midori/midori-websettings.c:535 msgid "Maximum cookie age" msgstr "Maximal kakålder" -#: ../src/midori-websettings.c:532 -#, fuzzy +#: ../midori/midori-websettings.c:536 msgid "The maximum number of days to save cookies for" -msgstr "Maximalt antal föremål" +msgstr "" -#: ../src/midori-websettings.c:542 -#, fuzzy +#: ../midori/midori-websettings.c:546 msgid "Remember last visited pages" -msgstr "Kom ihåg mina besökta sidor" +msgstr "" -#: ../src/midori-websettings.c:543 +#: ../midori/midori-websettings.c:547 msgid "Whether the last visited pages are saved" msgstr "" -#: ../src/midori-websettings.c:551 -#, fuzzy +#: ../midori/midori-websettings.c:555 msgid "Maximum history age" -msgstr "Maximal kakålder" +msgstr "" -#: ../src/midori-websettings.c:552 -#, fuzzy +#: ../midori/midori-websettings.c:556 msgid "The maximum number of days to save the history for" -msgstr "Maximalt antal föremål" +msgstr "" -#: ../src/midori-websettings.c:560 -#, fuzzy +#: ../midori/midori-websettings.c:564 msgid "Remember last form inputs" -msgstr "Kom ihåg vad jag fyllt i fält med" +msgstr "" -#: ../src/midori-websettings.c:561 +#: ../midori/midori-websettings.c:565 msgid "Whether the last form inputs are saved" msgstr "" -#: ../src/midori-websettings.c:569 -#, fuzzy +#: ../midori/midori-websettings.c:573 msgid "Remember last downloaded files" -msgstr "Kom ihåg mina nerladdade filer" +msgstr "" -#: ../src/midori-websettings.c:570 +#: ../midori/midori-websettings.c:574 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../src/midori-websettings.c:580 +#: ../midori/midori-websettings.c:584 msgid "HTTP Proxy" msgstr "" -#: ../src/midori-websettings.c:581 +#: ../midori/midori-websettings.c:585 msgid "The proxy used for HTTP connections" msgstr "" -#: ../src/midori-websettings.c:589 +#: ../midori/midori-websettings.c:593 msgid "Cache size" msgstr "Cache-storlek" -#: ../src/midori-websettings.c:590 +#: ../midori/midori-websettings.c:594 msgid "The allowed size of the cache" msgstr "" -#: ../src/midori-webview.c:217 -msgid "The icon of the currently loaded page" -msgstr "Ikonen för den laddade sidan" - -#: ../src/midori-webview.c:226 +#: ../midori/midori-webview.c:193 msgid "The URI of the currently loaded page" msgstr "URIn för den laddade sidan" -#: ../src/midori-webview.c:235 +#: ../midori/midori-webview.c:202 msgid "The title of the currently loaded page" msgstr "Titeln för den laddade sidan" -#: ../src/midori-webview.c:471 +#: ../midori/midori-webview.c:578 msgid "Open Link in New _Tab" msgstr "Öppna länk i ny _tabb" -#: ../src/midori-webview.c:494 +#: ../midori/midori-webview.c:606 +msgid "Download Link with Download _Manager" +msgstr "" + +#: ../midori/midori-webview.c:624 msgid "Open URL in New _Tab" msgstr "Öppna URL i ny _tabb" -#: ../src/midori-preferences.c:64 +#: ../midori/midori-preferences.c:62 msgid "Settings instance to provide properties" msgstr "" -#: ../src/midori-preferences.c:87 +#: ../midori/midori-preferences.c:84 #, c-format msgid "%s Preferences" msgstr "%s inställningar" #. Page "General" -#: ../src/midori-preferences.c:239 +#: ../midori/midori-preferences.c:267 msgid "General" msgstr "Allmänt" -#: ../src/midori-preferences.c:240 +#: ../midori/midori-preferences.c:268 msgid "Startup" msgstr "Uppstart" #. Page "Appearance" -#: ../src/midori-preferences.c:261 +#: ../midori/midori-preferences.c:301 msgid "Appearance" msgstr "Utseende" -#: ../src/midori-preferences.c:262 +#: ../midori/midori-preferences.c:302 msgid "Font settings" msgstr "Typsnittinställningar" #. Page "Behavior" -#: ../src/midori-preferences.c:283 +#: ../midori/midori-preferences.c:322 msgid "Behavior" msgstr "Beteende" -#: ../src/midori-preferences.c:284 +#: ../midori/midori-preferences.c:323 msgid "Features" msgstr "Funktioner" #. Page "Interface" -#: ../src/midori-preferences.c:316 +#: ../midori/midori-preferences.c:373 msgid "Interface" msgstr "Gränssnitt" -#: ../src/midori-preferences.c:330 +#: ../midori/midori-preferences.c:387 msgid "Browsing" msgstr "Bläddring" #. Page "Network" -#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 +#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 msgid "Network" msgstr "Nätverk" -#: ../src/midori-preferences.c:358 +#: ../midori/midori-preferences.c:415 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../src/midori-preferences.c:363 +#: ../midori/midori-preferences.c:420 msgid "Privacy" msgstr "Sekretess" -#: ../src/midori-preferences.c:364 -#, fuzzy +#: ../midori/midori-preferences.c:421 msgid "Web Cookies" msgstr "Kakor" -#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 +#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 msgid "days" msgstr "dagar" -#: ../src/sokoke.c:295 +#: ../midori/midori-webitem.c:70 +msgid "Name" +msgstr "Namn" + +#: ../midori/midori-webitem.c:71 +msgid "The name of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:79 +msgid "Description" +msgstr "Beskrivning" + +#: ../midori/midori-webitem.c:80 +msgid "The description of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:88 +msgid "URI" +msgstr "" + +#: ../midori/midori-webitem.c:89 +msgid "The URI of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:97 +msgid "Icon" +msgstr "Ikone" + +#: ../midori/midori-webitem.c:98 +msgid "The icon of the web item" +msgstr "" + +#: ../midori/midori-webitem.c:106 +msgid "Token" +msgstr "" + +#: ../midori/midori-webitem.c:107 +msgid "The token of the web item" +msgstr "" + +#: ../midori/midori-searchentry.c:75 +msgid "Current Item" +msgstr "" + +#: ../midori/midori-searchentry.c:76 +msgid "The currently selected item" +msgstr "" + +#: ../midori/midori-searchentry.c:84 +msgid "Dialog" +msgstr "" + +#: ../midori/midori-searchentry.c:85 +msgid "A dialog to manage search engines" +msgstr "" + +#: ../midori/midori-searchentry.c:152 +msgid "Empty" +msgstr "Tom" + +#: ../midori/midori-searchentry.c:524 +msgid "Add search engine" +msgstr "Lägg till sökmotor" + +#: ../midori/midori-searchentry.c:524 +msgid "Edit search engine" +msgstr "Redigera sökmotor" + +#: ../midori/midori-searchentry.c:551 +msgid "_Name:" +msgstr "_Namn:" + +#: ../midori/midori-searchentry.c:595 +msgid "_Icon (name or file):" +msgstr "_Ikon (namn eller fil):" + +#: ../midori/midori-searchentry.c:609 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchentry.c:790 +msgid "Manage search engines" +msgstr "Hantera sökmotorer" + +#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:348 msgid "Warning: You are using a superuser account!" msgstr "Varning: Du använder ett administratörskonto!" -#: ../src/sokoke.c:417 ../katze/katze-xbel.c:952 +#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 #, c-format msgid "Writing failed." msgstr "Kunde inte skriva." -#: ../src/webSearch.c:115 -msgid "Empty" -msgstr "Tom" +#: ../midori/gjs.c:89 +msgid "An unknown error occured." +msgstr "" -#: ../src/webSearch.c:187 -msgid "Add search engine" -msgstr "Lägg till sökmotor" +#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#, c-format +msgid "%s has no property '%s'" +msgstr "" -#: ../src/webSearch.c:187 -msgid "Edit search engine" -msgstr "Redigera sökmotor" +#: ../midori/gjs.c:445 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" -#: ../src/webSearch.c:217 -msgid "_Name:" -msgstr "_Namn:" +#: ../midori/gjs.c:455 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" -#: ../src/webSearch.c:261 -msgid "_Icon (name or file):" -msgstr "_Ikon (namn eller fil):" - -#: ../src/webSearch.c:275 -msgid "_Keyword:" -msgstr "_Nyckelord:" - -#: ../src/webSearch.c:344 -msgid "Manage search engines" -msgstr "Hantera sökmotorer" - -#: ../katze/katze-throbber.c:135 +#: ../katze/katze-throbber.c:134 msgid "Symbolic size to use for the animation" msgstr "Symbolisk storlek för animeringen" -#: ../katze/katze-throbber.c:144 +#: ../katze/katze-throbber.c:143 msgid "The name of an icon containing animation frames" msgstr "Namn på en ikon som innehåller animeringsbilder" -#: ../katze/katze-throbber.c:153 +#: ../katze/katze-throbber.c:152 msgid "A GdkPixbuf containing animation frames" msgstr "En GdkPixbuf som innehåller animeringbilder" -#: ../katze/katze-throbber.c:162 +#: ../katze/katze-throbber.c:161 msgid "Whether the throbber should be animated" msgstr "Ifall aktivitetssymbolen ska animeras" -#: ../katze/katze-throbber.c:171 +#: ../katze/katze-throbber.c:170 msgid "The name of an icon to be used as the static image" msgstr "Namn på ikon att använda som statisk bild" -#: ../katze/katze-throbber.c:180 +#: ../katze/katze-throbber.c:179 msgid "A GdkPixbuf to be used as the static image" msgstr "En GdkPixbuf att använda som statisk bild" -#: ../katze/katze-throbber.c:189 +#: ../katze/katze-throbber.c:188 msgid "The stock ID of an icon to be used as the static image" msgstr "Katalog-ID för en ikon att använda som statisk bild" -#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:161 -#, fuzzy +#: ../katze/katze-utils.c:177 msgid "Choose folder" -msgstr "Nedladdningsmapp" +msgstr "" -#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 -#: ../katze/katze-xbel.c:804 +#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:789 msgid "Malformed document." msgstr "Felaktigt dokument." -#: ../katze/katze-xbel.c:759 +#: ../katze/katze-xbel.c:744 msgid "File not found." msgstr "Fil saknas." From 83285cb052f7e190734ea3949153ccb21d60d6be Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sat, 19 Jul 2008 17:52:03 +0200 Subject: [PATCH 0208/2970] Use an anonymous function to execute user scripts --- midori/midori-addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 1a21dd27..2f8ddb48 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -176,7 +176,7 @@ _js_script_from_file (JSContextRef js_context, { /* Wrap the script to prevent global variables */ gchar* wrapped_script = g_strdup_printf ( - "var wrapped = function () { %s }; wrapped ();", script); + "(function () { %s })();", script); if (gjs_script_eval (js_context, wrapped_script, exception)) result = TRUE; g_free (wrapped_script); From 94d7e7dc535b9766026a41dc0b4e90e20caaaa61 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jul 2008 15:46:35 +0200 Subject: [PATCH 0209/2970] Introduce GjsValue API --- midori/gjs.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++- midori/gjs.h | 71 ++++++++++ 2 files changed, 438 insertions(+), 3 deletions(-) diff --git a/midori/gjs.c b/midori/gjs.c index b30a006b..0d432f39 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -14,7 +14,364 @@ #include #include -#define G_OBJECT_NAME(object) G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) +struct _GjsValue +{ + GObject parent_instance; + + JSContextRef js_context; + JSValueRef js_value; + gchar* string; +}; + +G_DEFINE_TYPE (GjsValue, gjs_value, G_TYPE_OBJECT) + +static void +gjs_value_finalize (GObject* object) +{ + GjsValue* value = GJS_VALUE (object); + + g_free (value->string); + + G_OBJECT_CLASS (gjs_value_parent_class)->finalize (object); +} + +static void +gjs_value_class_init (GjsValueClass* class) +{ + GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = gjs_value_finalize; +} + +static void +gjs_value_init (GjsValue* value) +{ + value->js_context = NULL; + value->js_value = NULL; + value->string = NULL; +} + +/** + * gjs_value_new: + * @js_context: a #JSContextRef + * @js_value: a #JSValueRef or %NULL + * + * Creates a new #GjsValue for a #JsValueRef. If @js_value + * is %NULL, the new value represents the global object. + * + * Return value: a new #GjsValue + **/ +GjsValue* +gjs_value_new (JSContextRef js_context, + JSValueRef js_value) +{ + GjsValue* value; + + g_return_val_if_fail (js_context, NULL); + + value = g_object_new (GJS_TYPE_VALUE, NULL); + value->js_context = js_context; + value->js_value = js_value ? js_value : JSContextGetGlobalObject (js_context); + return value; +} + +/** + * gjs_value_is_valid: + * @value: a #GjsValue + * + * Determines whether the value is valid, with regard to + * its internal state. This is primarily useful for API + * to ensure that the value is in a defined condition. + * + * Return value: %TRUE if value is valid + **/ +gboolean +gjs_value_is_valid (GjsValue* value) +{ + g_return_val_if_fail (GJS_IS_VALUE (value), FALSE); + g_return_val_if_fail (value->js_context, FALSE); + g_return_val_if_fail (value->js_value, FALSE); + + return TRUE; +} + +/** + * gjs_value_is_object: + * @value: a #GjsValue + * + * Determines whether the value is an object. + * + * Return value: %TRUE if value is an object + **/ +gboolean +gjs_value_is_object (GjsValue* value) +{ + g_return_val_if_fail (gjs_value_is_valid (value), FALSE); + + return JSValueIsObject (value->js_context, value->js_value) == true; +} + +/** + * gjs_value_has_attribute: + * @value: a #GjsValue + * @name: the name of a attribute + * + * Determines whether the value has the specified attribute. + * + * This can only be used on object values. + * + * Return value: %TRUE if the specified attribute exists + **/ +gboolean +gjs_value_has_attribute (GjsValue* value, + const gchar* name) +{ + JSObjectRef js_object; + JSStringRef js_name; + gboolean result; + + g_return_val_if_fail (gjs_value_is_object (value), FALSE); + g_return_val_if_fail (name, FALSE); + + js_object = JSValueToObject (value->js_context, value->js_value, NULL); + js_name = JSStringCreateWithUTF8CString (name); + result = JSObjectHasProperty (value->js_context, js_object, js_name) == true; + JSStringRelease (js_name); + return result; +} + +/** + * gjs_value_get_attribute: + * @value: a #GjsValue + * @name: the name of a attribute + * + * Retrieves the specified attribute. + * + * This can only be used on object values. + * + * Return value: a new #GjsValue + **/ +GjsValue* +gjs_value_get_attribute (GjsValue* value, + const gchar* name) +{ + JSObjectRef js_object; + JSStringRef js_name; + JSValueRef js_value; + + g_return_val_if_fail (gjs_value_has_attribute (value, name), NULL); + + js_object = JSValueToObject (value->js_context, value->js_value, NULL); + js_name = JSStringCreateWithUTF8CString (name); + js_value = JSObjectGetProperty (value->js_context, js_object, js_name, NULL); + JSStringRelease (js_name); + + return gjs_value_new (value->js_context, js_value); +} + +/** + * gjs_value_get_string: + * @value: a #GjsValue + * + * Retrieves the value in the form of a string. + * + * This can only be used on object values. + * + * Note: The string won't reflect changes to the value. + * + * Return value: the value as a string + **/ +const gchar* +gjs_value_get_string (GjsValue* value) +{ + JSStringRef js_string; + + g_return_val_if_fail (gjs_value_is_valid (value), NULL); + + if (value->string) + return value->string; + + js_string = JSValueToStringCopy (value->js_context, value->js_value, NULL); + value->string = gjs_string_utf8 (js_string); + JSStringRelease (js_string); + return value->string; +} + +void +gjs_value_weak_notify_cb (GjsValue* attribute, + GjsValue* value) +{ + g_object_unref (attribute); +} + +/** + * gjs_value_get_attribute_string: + * @value: a #GjsValue + * @name: the name of a attribute + * + * Retrieves the attribute of the value in the form of a string. + * + * This can only be used on object values. + * + * Note: The string won't reflect changes to the value. + * + * Return value: the value as a string + **/ +const gchar* +gjs_value_get_attribute_string (GjsValue* value, + const gchar* name) +{ + GjsValue* attribute; + + g_return_val_if_fail (gjs_value_has_attribute (value, name), NULL); + + attribute = gjs_value_get_attribute (value, name); + g_object_weak_ref (G_OBJECT (value), + (GWeakNotify)gjs_value_weak_notify_cb, attribute); + return gjs_value_get_string (attribute); +} + +/** + * gjs_value_foreach: + * @value: a #GjsValue + * @callback: a callback + * @user_data: user data + * + * Runs the specified callback for each attribute of the value. + * + * This can only be used on object values. + **/ +void +gjs_value_foreach (GjsValue* value, + GjsCallback callback, + gpointer user_data) +{ + JSObjectRef js_object; + JSPropertyNameArrayRef js_properties; + size_t n_properties; + guint i; + JSStringRef js_property; + gchar* property; + GjsValue* attribute; + + g_return_if_fail (gjs_value_is_object (value)); + + js_object = JSValueToObject (value->js_context, value->js_value, NULL); + js_properties = JSObjectCopyPropertyNames (value->js_context, js_object); + n_properties = JSPropertyNameArrayGetCount (js_properties); + for (i = 0; i < n_properties; i++) + { + js_property = JSPropertyNameArrayGetNameAtIndex (js_properties, i); + property = gjs_string_utf8 (js_property); + if (gjs_value_has_attribute (value, property)) + { + attribute = gjs_value_get_attribute (value, property); + callback (attribute, user_data); + g_object_unref (attribute); + } + g_free (property); + JSStringRelease (js_property); + } + JSPropertyNameArrayRelease (js_properties); +} + +/** + * gjs_value_get_by_name: + * @value: a #GjsValue + * @name: the name of an object + * + * Retrieves a value for the specified name, + * for example "document" or "document.body". + * + * Return value: the value, or %NULL + **/ +GjsValue* +gjs_value_get_by_name (GjsValue* value, + const gchar* name) +{ + gchar* script; + GjsValue* elements; + + g_return_val_if_fail (gjs_value_is_valid (value), NULL); + g_return_val_if_fail (name, NULL); + + script = g_strdup_printf ("return %s;", name); + elements = gjs_value_execute (value, script, NULL); + g_free (script); + return elements; +} + +/** + * gjs_value_get_elements_by_tag_name: + * @value: a #GjsValue + * @name: the tag name + * + * Retrieves all children with the specified tag name. + * + * This can only be used on object values. + * + * Return value: all matching elements + **/ +GjsValue* +gjs_value_get_elements_by_tag_name (GjsValue* value, + const gchar* name) +{ + gchar* script; + GjsValue* elements; + + g_return_val_if_fail (gjs_value_is_valid (value), NULL); + g_return_val_if_fail (name, NULL); + + script = g_strdup_printf ("return this.getElementsByTagName ('%s');", name); + elements = gjs_value_execute (value, script, NULL); + g_free (script); + return elements; +} + +/** + * gjs_value_execute: + * @value: a #GjsValue + * @script: javascript code + * + * Executes a piece of javascript code. If @value is an object + * it can be referred to as 'this' in the code. + * + * A 'return' statement in the code will yield the result to + * the return value of this function. + * + * Return value: the return value, or %NULL + **/ +GjsValue* +gjs_value_execute (GjsValue* value, + const gchar* script, + gchar** exception) +{ + JSStringRef js_script; + JSObjectRef js_function; + JSObjectRef js_object; + JSValueRef js_exception; + JSValueRef js_value; + JSStringRef js_message; + + g_return_val_if_fail (gjs_value_is_valid (value), FALSE); + g_return_val_if_fail (script, FALSE); + + js_script = JSStringCreateWithUTF8CString (script); + js_function = JSObjectMakeFunction (value->js_context, NULL, 0, NULL, + js_script, NULL, 1, NULL); + JSStringRelease (js_script); + js_object = JSValueToObject (value->js_context, value->js_value, NULL); + js_exception = NULL; + js_value = JSObjectCallAsFunction (value->js_context, js_function, + js_object, 0, NULL, &js_exception); + if (!js_value && exception) + { + js_message = JSValueToStringCopy (value->js_context, js_exception, NULL); + *exception = gjs_string_utf8 (js_message); + JSStringRelease (js_message); + return NULL; + } + return gjs_value_new (value->js_context, js_value); +} JSValueRef gjs_script_eval (JSContextRef js_context, @@ -93,12 +450,19 @@ gjs_script_from_file (JSContextRef js_context, gchar* gjs_string_utf8 (JSStringRef js_string) { - size_t size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); - gchar* string_utf8 = g_new (gchar, size_utf8); + size_t size_utf8; + gchar* string_utf8; + + g_return_val_if_fail (js_string, NULL); + + size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); + string_utf8 = g_new (gchar, size_utf8); JSStringGetUTF8CString (js_string, string_utf8, size_utf8); return string_utf8; } +#define G_OBJECT_NAME(object) G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) + static void _js_class_get_property_names_cb (JSContextRef js_context, JSObjectRef js_object, diff --git a/midori/gjs.h b/midori/gjs.h index 47e9fced..47e2b0a3 100644 --- a/midori/gjs.h +++ b/midori/gjs.h @@ -17,6 +17,77 @@ G_BEGIN_DECLS +#define GJS_TYPE_VALUE \ + (gjs_value_get_type ()) +#define GJS_VALUE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GJS_TYPE_VALUE, GjsValue)) +#define GJS_VALUE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GJS_TYPE_VALUE, GjsValueClass)) +#define GJS_IS_VALUE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GJS_TYPE_VALUE)) +#define GJS_IS_VALUE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GJS_TYPE_VALUE)) +#define GJS_VALUE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), GJS_TYPE_VALUE, GjsValueClass)) + +typedef struct _GjsValue GjsValue; +typedef struct _GjsValueClass GjsValueClass; + +struct _GjsValueClass +{ + GObjectClass parent_class; +}; + +GType +gjs_value_get_type (void); + +GjsValue* +gjs_value_new (JSContextRef js_context, + JSValueRef js_value); + +gboolean +gjs_value_is_valid (GjsValue* value); + +gboolean +gjs_value_is_object (GjsValue* value); + +gboolean +gjs_value_has_attribute (GjsValue* value, + const gchar* name); + +GjsValue* +gjs_value_get_attribute (GjsValue* value, + const gchar* name); + +const gchar* +gjs_value_get_string (GjsValue* value); + +const gchar* +gjs_value_get_attribute_string (GjsValue* value, + const gchar* name); + +typedef void +(*GjsCallback) (GjsValue* value, + gpointer user_data); + +void +gjs_value_foreach (GjsValue* value, + GjsCallback callback, + gpointer user_data); + +GjsValue* +gjs_value_get_by_name (GjsValue* value, + const gchar* name); + +GjsValue* +gjs_value_get_elements_by_tag_name (GjsValue* value, + const gchar* name); + +GjsValue* +gjs_value_execute (GjsValue* value, + const gchar* script, + gchar** exception); + JSValueRef gjs_script_eval (JSContextRef js_context, const gchar* script, From 15f4ab98d47f5a573c1e46bcd3119f7b55ef509a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jul 2008 15:55:08 +0200 Subject: [PATCH 0210/2970] Make the web view aware of news feeds This introduces the logic needed to lookup news feeds and implements a signal news-feed-ready in MidoriWebView, similar to icon-ready. The interface in the browser still needs to be done. --- midori/midori-browser.c | 49 ++++++++++++++++---- midori/midori-locationentry.c | 4 +- midori/midori-webview.c | 85 +++++++++++++++++++++++++++++++++++ midori/midori-webview.h | 5 +++ 4 files changed, 131 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 924d4426..a5dea097 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -285,6 +285,10 @@ _midori_browser_update_interface (MidoriBrowser* browser) katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); icon = katze_throbber_get_static_pixbuf (KATZE_THROBBER ( g_object_get_data (G_OBJECT (widget), "browser-tab-icon"))); + /* FIXME show news feed icon if feeds are available */ + /* gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, NULL); */ } static GtkWidget* @@ -442,6 +446,25 @@ midori_web_view_element_motion_cb (MidoriWebView* web_View, _midori_browser_set_statusbar_text (browser, link_uri); } +static void +midori_web_view_load_committed_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + MidoriBrowser* browser) +{ + const gchar* uri; + + if (web_view == midori_browser_get_current_web_view (browser)) + { + uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + midori_location_entry_set_text (MIDORI_LOCATION_ENTRY ( + browser->location), uri); + _midori_browser_set_statusbar_text (browser, NULL); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, NULL); + } +} + static void midori_web_view_icon_ready_cb (MidoriWebView* web_view, GdkPixbuf* icon, @@ -464,16 +487,15 @@ midori_web_view_icon_ready_cb (MidoriWebView* web_view, } static void -midori_web_view_load_committed_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - MidoriBrowser* browser) +midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, + const gchar* href, + const gchar* type, + const gchar* title, + MidoriBrowser* browser) { - if (web_view == midori_browser_get_current_web_view (browser)) - { - const gchar* uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - midori_location_entry_set_text (MIDORI_LOCATION_ENTRY (browser->location), uri); - _midori_browser_set_statusbar_text (browser, NULL); - } + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INDEX); } static gboolean @@ -919,6 +941,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_web_view_load_committed_cb, browser, "signal::icon-ready", midori_web_view_icon_ready_cb, browser, + "signal::news-feed-ready", + midori_web_view_news_feed_ready_cb, browser, "signal::progress-started", midori_web_view_progress_started_cb, browser, "signal::progress-changed", @@ -3284,6 +3308,13 @@ midori_browser_init (MidoriBrowser* browser) /* Location */ browser->location = midori_location_entry_new (); + /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INDEX); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, TRUE); /* FIXME: sokoke_entry_setup_completion (GTK_ENTRY (browser->location)); */ g_object_connect (browser->location, "signal::active-changed", diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 3e9c8728..37f2a448 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -80,8 +80,6 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_SECONDARY, TRUE); g_signal_connect (entry, "icon_released", G_CALLBACK (entry_icon_released), NULL); g_signal_connect (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); @@ -139,7 +137,7 @@ entry_icon_released (GtkIconEntry* entry, gpointer user_data) { if (icon_pos == GTK_ICON_ENTRY_SECONDARY) - gtk_entry_set_text (GTK_ENTRY (entry), ""); + /* FIXME Show available news feeds */; } static void diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 792e66bb..9b95cdca 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -12,6 +12,7 @@ #include "midori-webview.h" #include "main.h" +#include "gjs.h" #include "sokoke.h" #include "compat.h" @@ -59,6 +60,7 @@ enum enum { ICON_READY, + NEWS_FEED_READY, PROGRESS_STARTED, PROGRESS_CHANGED, PROGRESS_DONE, @@ -87,6 +89,44 @@ midori_web_view_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static void +midori_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void(*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1, + const gchar* arg_1, + const gchar* arg_2, + const gchar* arg_3, + gpointer data2); + register GMarshalFunc_VOID__STRING_STRING_STRING callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 4); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_STRING_STRING) (marshal_data + ? marshal_data : cc->callback); + callback (data1, + g_value_get_string (param_values + 1), + g_value_get_string (param_values + 2), + g_value_get_string (param_values + 3), + data2); +} + static void midori_web_view_class_init (MidoriWebViewClass* class) { @@ -101,6 +141,19 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_NONE, 1, GDK_TYPE_PIXBUF); + signals[NEWS_FEED_READY] = g_signal_new ( + "news-feed-ready", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + G_STRUCT_OFFSET (MidoriWebViewClass, news_feed_ready), + 0, + NULL, + midori_cclosure_marshal_VOID__STRING_STRING_STRING, + G_TYPE_NONE, 3, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING); + signals[PROGRESS_STARTED] = g_signal_new ( "progress-started", G_TYPE_FROM_CLASS (class), @@ -423,11 +476,43 @@ webkit_web_view_load_finished (MidoriWebView* web_view) g_signal_emit (web_view, signals[PROGRESS_DONE], 0, web_view->progress); } +static void +gjs_value_links_foreach_cb (GjsValue* link, + MidoriWebView* web_view) +{ + const gchar* type; + + if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "type") + && gjs_value_has_attribute (link, "href")) + { + type = gjs_value_get_attribute_string (link, "type"); + if (!strcmp (type, "application/rss+xml") + || !strcmp (type, "application/x.atom+xml") + || !strcmp (type, "application/atom+xml")) + g_signal_emit (web_view, signals[NEWS_FEED_READY], 0, + gjs_value_get_attribute_string (link, "href"), type, + gjs_value_has_attribute (link, "title") + ? gjs_value_get_attribute_string (link, "title") : NULL); + } +} + static void webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, MidoriWebView* web_view) { + GjsValue* value; + GjsValue* document; + GjsValue* links; + + value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); + document = gjs_value_get_by_name (value, "document"); + links = gjs_value_get_elements_by_tag_name (document, "link"); + gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, web_view); + g_object_unref (links); + g_object_unref (document); + g_object_unref (value); + web_view->is_loading = FALSE; web_view->progress = -1; diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 4cf8838b..adab180e 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -44,6 +44,11 @@ struct _MidoriWebViewClass (*icon_ready) (MidoriWebView* web_view, GdkPixbuf* icon); void + (*news_feed_ready) (MidoriWebView* web_view, + const gchar* href, + const gchar* type, + const gchar* title); + void (*progress_started) (MidoriWebView* web_view, guint progress); void From 6ebb81bf9051941fc485a4a31e8eec2212f9abbe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jul 2008 15:57:10 +0200 Subject: [PATCH 0211/2970] The WebList should keep a reference to added items --- midori/midori-weblist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c index fb301819..18f0d979 100644 --- a/midori/midori-weblist.c +++ b/midori/midori-weblist.c @@ -48,6 +48,7 @@ static void _midori_web_list_add_item (MidoriWebList* web_list, GObject* item) { + g_object_ref (item); web_list->items = g_list_append (web_list->items, item); } From a1213c80d9f7dcd6ae1a22e36b8f79c5675e26d9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jul 2008 20:04:54 +0200 Subject: [PATCH 0212/2970] Add gjs_value_forall and gjs_get_nth_attribute --- midori/gjs.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++- midori/gjs.h | 9 +++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/midori/gjs.c b/midori/gjs.c index 0d432f39..ca842655 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -230,13 +230,45 @@ gjs_value_get_attribute_string (GjsValue* value, return gjs_value_get_string (attribute); } +/** + * gjs_value_get_nth_attribute: + * @value: a #GjsValue + * @n: an index + * + * Retrieves the indiced attribute at the specified + * position. This is particularly faster than looking + * up attributes by name. + * + * This can only be used on object values. + * + * Return value: a new #GjsValue, or %NULL + **/ +GjsValue* +gjs_value_get_nth_attribute (GjsValue* value, + guint n) +{ + JSObjectRef js_object; + JSValueRef js_value; + + g_return_val_if_fail (gjs_value_is_object (value), NULL); + + js_object = JSValueToObject (value->js_context, value->js_value, NULL); + js_value = JSObjectGetPropertyAtIndex (value->js_context, js_object, n, NULL); + if (JSValueIsUndefined (value->js_context, js_value)) + return NULL; + + return gjs_value_new (value->js_context, js_value); +} + /** * gjs_value_foreach: * @value: a #GjsValue * @callback: a callback * @user_data: user data * - * Runs the specified callback for each attribute of the value. + * Calls the specified callback for each indiced attribute. + * This is a particularly fast way of looping through the + * elements of an array. * * This can only be used on object values. **/ @@ -244,6 +276,40 @@ void gjs_value_foreach (GjsValue* value, GjsCallback callback, gpointer user_data) +{ + guint i; + GjsValue* attribute; + + g_return_if_fail (gjs_value_is_object (value)); + + i = 0; + do + { + attribute = gjs_value_get_nth_attribute (value, i); + if (attribute) + { + callback (attribute, user_data); + g_object_unref (attribute); + } + i++; + } + while (attribute); +} + +/** + * gjs_value_forall: + * @value: a #GjsValue + * @callback: a callback + * @user_data: user data + * + * Calls the specified callback for each attribute. + * + * This can only be used on object values. + **/ +void +gjs_value_forall (GjsValue* value, + GjsCallback callback, + gpointer user_data) { JSObjectRef js_object; JSPropertyNameArrayRef js_properties; diff --git a/midori/gjs.h b/midori/gjs.h index 47e2b0a3..19bf4d4e 100644 --- a/midori/gjs.h +++ b/midori/gjs.h @@ -66,6 +66,10 @@ const gchar* gjs_value_get_attribute_string (GjsValue* value, const gchar* name); +GjsValue* +gjs_value_get_nth_attribute (GjsValue* value, + guint n); + typedef void (*GjsCallback) (GjsValue* value, gpointer user_data); @@ -75,6 +79,11 @@ gjs_value_foreach (GjsValue* value, GjsCallback callback, gpointer user_data); +void +gjs_value_forall (GjsValue* value, + GjsCallback callback, + gpointer user_data); + GjsValue* gjs_value_get_by_name (GjsValue* value, const gchar* name); From 4580486d36273f3ddfd5d768b53e30cbaef9cba9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jul 2008 01:39:29 +0200 Subject: [PATCH 0213/2970] Use notify::title instead of title-changed --- midori/midori-browser.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a5dea097..737b27d9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -414,10 +414,9 @@ midori_web_view_load_done_cb (GtkWidget* web_view, } static void -midori_web_view_title_changed_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - const gchar* title, - MidoriBrowser* browser) +midori_web_view_notify_title_cb (GtkWidget* web_view, + GParamSpec* pspec, + MidoriBrowser* browser) { if (web_view == midori_browser_get_current_web_view (browser)) { @@ -951,8 +950,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_web_view_progress_done_cb, browser, "signal::load-done", midori_web_view_load_done_cb, browser, - "signal::title-changed", - midori_web_view_title_changed_cb, browser, + "signal::notify::title", + midori_web_view_notify_title_cb, browser, "signal::status-bar-text-changed", midori_web_view_statusbar_text_changed_cb, browser, "signal::element-motion", From 030a6af57c93a3a79b308e7384110a248350e13a Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Tue, 22 Jul 2008 01:40:39 +0200 Subject: [PATCH 0214/2970] Run userscripts on DOMContentsLoaded --- midori/midori-addons.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 2f8ddb48..0bdd1334 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -171,12 +171,14 @@ _js_script_from_file (JSContextRef js_context, gboolean result = FALSE; gchar* script; GError* error = NULL; + gchar* wrapped_script; if (g_file_get_contents (filename, &script, NULL, &error)) { /* Wrap the script to prevent global variables */ - gchar* wrapped_script = g_strdup_printf ( - "(function () { %s })();", script); + wrapped_script = g_strdup_printf ( + "window.addEventListener ('DOMContentLoaded'," + "function () { %s }, true);", script); if (gjs_script_eval (js_context, wrapped_script, exception)) result = TRUE; g_free (wrapped_script); From 7e8119e5f6966538890ea2f4554880f2afc9e0f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jul 2008 01:51:08 +0200 Subject: [PATCH 0215/2970] Toggle ZoomReset as the zoom level changes --- midori/midori-browser.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 737b27d9..7568f018 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -429,6 +429,16 @@ midori_web_view_notify_title_cb (GtkWidget* web_view, } } +static void +midori_web_view_notify_zoom_level_cb (GtkWidget* web_view, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + if (web_view == midori_browser_get_current_web_view (browser)) + _action_set_sensitive (browser, "ZoomNormal", + webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); +} + static void midori_web_view_statusbar_text_changed_cb (MidoriWebView* web_view, const gchar* text, @@ -952,6 +962,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_web_view_load_done_cb, browser, "signal::notify::title", midori_web_view_notify_title_cb, browser, + "signal::notify::zoom-level", + midori_web_view_notify_zoom_level_cb, browser, "signal::status-bar-text-changed", midori_web_view_statusbar_text_changed_cb, browser, "signal::element-motion", From e7024a70602312f1ffb868d62801a0f97d93f7bb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jul 2008 02:00:45 +0200 Subject: [PATCH 0216/2970] Correct icon handling, which could cause warnings --- midori/midori-browser.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7568f018..22fa882e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -237,7 +237,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) gboolean loading; GtkWidget* widget; GtkWidget* web_view; - GdkPixbuf* icon; widget = midori_browser_get_current_tab (browser); web_view = widget && MIDORI_IS_WEB_VIEW (widget) ? widget : NULL; @@ -283,8 +282,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_show (browser->progressbar); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); - icon = katze_throbber_get_static_pixbuf (KATZE_THROBBER ( - g_object_get_data (G_OBJECT (widget), "browser-tab-icon"))); /* FIXME show news feed icon if feeds are available */ /* gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), @@ -988,7 +985,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, else icon = gtk_widget_render_icon (widget, GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - tab_icon = gtk_image_new_from_pixbuf (icon); + tab_icon = katze_throbber_new (); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (tab_icon), icon); title = _midori_browser_get_tab_title (browser, widget); tab_title = gtk_label_new (title); menuitem = gtk_image_menu_item_new_with_label (title); @@ -1930,8 +1928,7 @@ _action_source_view_activate (GtkAction* action, GtkWidget* text_view; gint n; - web_view = midori_browser_get_current_web_view (browser); - if (!(web_view && MIDORI_IS_WEB_VIEW (web_view))) + if (!(web_view = midori_browser_get_current_web_view (browser))) return; uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); From 2b7c0c42d51500c8a97776efedf70343142f8d53 Mon Sep 17 00:00:00 2001 From: Miguel Anxo Bouzada Date: Tue, 22 Jul 2008 02:21:22 +0200 Subject: [PATCH 0217/2970] Add Galician translation --- po/LINGUAS | 2 +- po/gl.po | 1416 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1417 insertions(+), 1 deletion(-) create mode 100644 po/gl.po diff --git a/po/LINGUAS b/po/LINGUAS index 72877481..ad3e984e 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es fr hu pl sv +de es fr gl hu pl sv diff --git a/po/gl.po b/po/gl.po new file mode 100644 index 00000000..f1b7f285 --- /dev/null +++ b/po/gl.po @@ -0,0 +1,1416 @@ +# Galician translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Miguel Anxo Bouzada 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori-0.0.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-19 16:00+0200\n" +"PO-Revision-Date: 2008-07-20 13:42+0100\n" +"Last-Translator: Miguel Anxo Bouzada \n" +"Language-Team: GALPon MiniNo \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Navegador lixeiro" + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:354 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Navegador" + +#: ../midori/main.c:45 +msgid "Bookmark" +msgstr "Marcapáxinas" + +#: ../midori/main.c:46 +msgid "_Add Bookmark" +msgstr "_Engadir marcapáxinas" + +#: ../midori/main.c:47 +msgid "_Form Fill" +msgstr "Encher _formulario" + +#: ../midori/main.c:48 +msgid "_Homepage" +msgstr "P_áxina de inicio" + +#: ../midori/main.c:49 +msgid "New _Tab" +msgstr "Nova lingüe_ta" + +#: ../midori/main.c:50 +msgid "New _Window" +msgstr "Nova _ventá" + +#: ../midori/main.c:52 +msgid "Select _All" +msgstr "Seleccion_ar todo" + +#: ../midori/main.c:55 +msgid "_Fullscreen" +msgstr "_Pantalla completa" + +#: ../midori/main.c:56 +msgid "_Leave Fullscreen" +msgstr "_Saír de pantalla completa" + +#: ../midori/main.c:110 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Non se puido cargar a configuración. %s\n" + +#: ../midori/main.c:165 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "O valor «%s» non é válido para %s" + +#: ../midori/main.c:172 +#: ../midori/main.c:241 +#, c-format +msgid "Unhandled settings value '%s'" +msgstr "Non se poden axustar as propiedades «%s»" + +#: ../midori/main.c:346 +msgid "Display program version" +msgstr "Amosar a versión do programa" + +#: ../midori/main.c:359 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:363 +#: ../midori/main.c:365 +#: ../midori/main.c:379 +msgid "midori" +msgstr "midori" + +#: ../midori/main.c:363 +msgid "Unknown argument." +msgstr "Argumento descoñecido." + +#: ../midori/main.c:365 +msgid "Failed to setup interface." +msgstr "Fallou a configuración da interface." + +#: ../midori/main.c:380 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor, envíe comentarios, suxerencias e problemas a:" + +#: ../midori/main.c:382 +msgid "Check for new versions at:" +msgstr "Comprobar se existen novas versións en:" + +#: ../midori/main.c:430 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Os marcapáxinas non puideron ser cargados. %s\n" + +#: ../midori/main.c:444 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Non se puido cargar a sesión. %s\n" + +#: ../midori/main.c:456 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Non se puido cargar a «Cesta do lixo». %s\n" + +#: ../midori/main.c:468 +msgid "The following errors occured:" +msgstr "Producíronse os seguinte erros:" + +#: ../midori/main.c:606 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Non se puido gardar o motor de busca. %s" + +#: ../midori/main.c:616 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Non se puideron gardar os marcapáxinas. %s" + +#: ../midori/main.c:625 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Non se puido gardar a «cesta do lixo». %s" + +#: ../midori/main.c:637 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Non se puido gardar a sesión. %s" + +#: ../midori/main.c:646 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Non se puido gardar a configuración. %s" + +#: ../midori/midori-app.c:114 +#: ../midori/midori-browser.c:1327 +msgid "Settings" +msgstr "Configuración" + +#: ../midori/midori-app.c:115 +#: ../midori/midori-browser.c:1328 +msgid "The associated settings" +msgstr "Axustes asociados" + +#: ../midori/midori-app.c:123 +#: ../midori/midori-browser.c:1366 +msgid "Trash" +msgstr "Cesta do lixo" + +#: ../midori/midori-app.c:124 +#: ../midori/midori-browser.c:1367 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Lixo, recollido recentemente pechando lingüetas e ventás" + +#: ../midori/midori-app.c:132 +msgid "Browser" +msgstr "Navegador" + +#: ../midori/midori-app.c:133 +msgid "The current browser" +msgstr "Navegador actual" + +#: ../midori/midori-app.c:141 +msgid "Browser Count" +msgstr "Contador do navegador" + +#: ../midori/midori-app.c:142 +msgid "The current number of browsers" +msgstr "Número actual de navegadores" + +#: ../midori/midori-app.c:150 +#: ../midori/midori-browser.c:1380 +#: ../midori/midori-searchentry.c:66 +msgid "Search Engines" +msgstr "Motores de busca" + +#: ../midori/midori-app.c:151 +#: ../midori/midori-searchentry.c:67 +msgid "The list of search engines" +msgstr "Lista de motores de busca" + +#: ../midori/midori-addons.c:40 +#: ../midori/midori-browser.c:3594 +msgid "Extensions" +msgstr "Extensións" + +#: ../midori/midori-addons.c:41 +#: ../midori/midori-browser.c:3494 +msgid "Userscripts" +msgstr "Scripts de usuario" + +#: ../midori/midori-addons.c:42 +msgid "Userstyles" +msgstr "Estilos de usuario" + +#: ../midori/midori-browser.c:192 +msgid "Source" +msgstr "Código fonte" + +#: ../midori/midori-browser.c:273 +#: ../midori/midori-browser.c:2786 +#: ../midori/midori-browser.c:2792 +msgid "Reload the current page" +msgstr "Cargar novamente a páxina actual" + +#: ../midori/midori-browser.c:282 +#: ../midori/midori-browser.c:2789 +msgid "Stop loading the current page" +msgstr "Deter a carga da páxina" + +#: ../midori/midori-browser.c:337 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% cargada" + +#: ../midori/midori-browser.c:560 +msgid "New bookmark" +msgstr "Novo marcapáxinas" + +#: ../midori/midori-browser.c:560 +msgid "Edit bookmark" +msgstr "Editar o marcapáxinas" + +#: ../midori/midori-browser.c:584 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:597 +#: ../midori/midori-searchentry.c:567 +msgid "_Description:" +msgstr "_Descrición" + +#: ../midori/midori-browser.c:616 +#: ../midori/midori-searchentry.c:581 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:633 +msgid "_Folder:" +msgstr "_Cartafol:" + +#: ../midori/midori-browser.c:637 +msgid "Root" +msgstr "Raiz" + +#: ../midori/midori-browser.c:1064 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acción non esperada «%s»" + +#: ../midori/midori-browser.c:1283 +msgid "Menubar" +msgstr "Barra do menú" + +#: ../midori/midori-browser.c:1284 +msgid "The menubar" +msgstr "Barra de menu" + +#: ../midori/midori-browser.c:1292 +#: ../midori/midori-preferences.c:374 +msgid "Navigationbar" +msgstr "Barra de navegación" + +#: ../midori/midori-browser.c:1293 +msgid "The navigationbar" +msgstr "Barra de navegación" + +#: ../midori/midori-browser.c:1301 +msgid "Tab" +msgstr "Lingüeta" + +#: ../midori/midori-browser.c:1302 +msgid "The current tab" +msgstr "Lingüeta actual" + +#: ../midori/midori-browser.c:1310 +msgid "Statusbar" +msgstr "Barra de estado" + +#: ../midori/midori-browser.c:1311 +msgid "The statusbar" +msgstr "Barra de estado" + +#: ../midori/midori-browser.c:1347 +msgid "Statusbar Text" +msgstr "Texto da barra de estado" + +#: ../midori/midori-browser.c:1348 +#: ../midori/midori-webview.c:211 +msgid "The text that is displayed in the statusbar" +msgstr "O texto amosase na barra de estado" + +#: ../midori/midori-browser.c:1381 +msgid "The list of search engines to be used for web search" +msgstr "Lista de motores de busca que pode utilizar para buscas na web" + +#: ../midori/midori-browser.c:2318 +msgid "Separator" +msgstr "Separador" + +#: ../midori/midori-browser.c:2483 +msgid "A lightweight web browser." +msgstr "Un navegador moi lixeiro" + +#: ../midori/midori-browser.c:2491 +msgid "translator-credits" +msgstr "" +"Miguel Anxo Bouzada\n" +"Antonio Sanchez" + +#: ../midori/midori-browser.c:2709 +msgid "_File" +msgstr "_Ficheiro" + +#: ../midori/midori-browser.c:2712 +msgid "Open a new window" +msgstr "Abrir unha nova ventá" + +#: ../midori/midori-browser.c:2715 +msgid "Open a new tab" +msgstr "Abrir unha nova lingüeta" + +#: ../midori/midori-browser.c:2718 +msgid "Open a file" +msgstr "Abrir un ficheiro" + +#: ../midori/midori-browser.c:2721 +msgid "Save to a file" +msgstr "Gardar nun ficheiro" + +#: ../midori/midori-browser.c:2723 +msgid "_Close Tab" +msgstr "Pechar _lingüeta" + +#: ../midori/midori-browser.c:2724 +msgid "Close the current tab" +msgstr "Pechar a lingüeta actual" + +#: ../midori/midori-browser.c:2726 +msgid "C_lose Window" +msgstr "_Pechar a ventá" + +#: ../midori/midori-browser.c:2727 +msgid "Close this window" +msgstr "Pechar esta ventá" + +#: ../midori/midori-browser.c:2729 +msgid "Pa_ge Setup" +msgstr "Configuración da páxina" + +#: ../midori/midori-browser.c:2733 +msgid "Show a preview of the printed page" +msgstr "Amosar previsualización da páxina á imprimir" + +#: ../midori/midori-browser.c:2736 +msgid "Print the current page" +msgstr "Imprimir a páxina actual" + +#: ../midori/midori-browser.c:2739 +msgid "Quit the application" +msgstr "Sair da aplicación" + +#: ../midori/midori-browser.c:2741 +msgid "_Edit" +msgstr "_Editar" + +#: ../midori/midori-browser.c:2744 +msgid "Undo the last modification" +msgstr "Desfacer a última modificación" + +#: ../midori/midori-browser.c:2747 +msgid "Redo the last modification" +msgstr "Refacer a última modificación" + +#: ../midori/midori-browser.c:2750 +msgid "Cut the selected text" +msgstr "Copiar o texto seleccionado" + +#: ../midori/midori-browser.c:2753 +#: ../midori/midori-browser.c:2756 +msgid "Copy the selected text" +msgstr "Copiar o texto seleccionado" + +#: ../midori/midori-browser.c:2759 +msgid "Paste text from the clipboard" +msgstr "Pegar o texto seleccionado no porta papeis" + +#: ../midori/midori-browser.c:2762 +msgid "Delete the selected text" +msgstr "Borrar o texto seleccionado" + +#: ../midori/midori-browser.c:2765 +msgid "Select all text" +msgstr "Seleccionar todo o texto" + +#: ../midori/midori-browser.c:2768 +msgid "Find a word or phrase in the page" +msgstr "Buscar palabra ou frase nesta páxina" + +#: ../midori/midori-browser.c:2770 +msgid "Find _Next" +msgstr "Buscar _seguinte" + +#: ../midori/midori-browser.c:2771 +msgid "Find the next occurrence of a word or phrase" +msgstr "Buscar a seguinte coincidencia de palabra ou frase" + +#: ../midori/midori-browser.c:2773 +msgid "Find _Previous" +msgstr "Buscar _anterior" + +#: ../midori/midori-browser.c:2774 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Buscar a anterior coincidencia de palabra ou frase" + +#: ../midori/midori-browser.c:2776 +msgid "_Quick Find" +msgstr "Busca _rapida" + +#: ../midori/midori-browser.c:2777 +msgid "Quickly jump to a word or phrase" +msgstr "Salto rápido a unha palabra ou frase" + +#: ../midori/midori-browser.c:2780 +msgid "Configure the application preferences" +msgstr "Configurar as preferencias da aplicación" + +#: ../midori/midori-browser.c:2782 +msgid "_View" +msgstr "_Ver" + +#: ../midori/midori-browser.c:2783 +msgid "_Toolbars" +msgstr "_Barra de ferramentas" + +#: ../midori/midori-browser.c:2795 +msgid "Increase the zoom level" +msgstr "Aumentar o nivel de zoom" + +#: ../midori/midori-browser.c:2798 +msgid "Decrease the zoom level" +msgstr "Diminuir o nivel de zoom" + +#: ../midori/midori-browser.c:2801 +msgid "Reset the zoom level" +msgstr "Reiniciar o nivel de zoom" + +#: ../midori/midori-browser.c:2803 +msgid "View _Source" +msgstr "Amosar _código fonte" + +#: ../midori/midori-browser.c:2804 +msgid "View the source code of the page" +msgstr "Ver o código fonte da páxina" + +#: ../midori/midori-browser.c:2806 +msgid "View Selection Source" +msgstr "Amosar código fonte da páxina seleccionada" + +#: ../midori/midori-browser.c:2807 +msgid "View the source code of the selection" +msgstr "Ver o código fonte da selección" + +#: ../midori/midori-browser.c:2810 +msgid "Toggle fullscreen view" +msgstr "Activar/desactivar pantalla completa" + +#: ../midori/midori-browser.c:2812 +msgid "_Go" +msgstr "_Ir" + +#: ../midori/midori-browser.c:2815 +msgid "Go back to the previous page" +msgstr "Ir á páxina anterior" + +#: ../midori/midori-browser.c:2818 +msgid "Go forward to the next page" +msgstr "Avanzar á seguinte páxina" + +#: ../midori/midori-browser.c:2821 +msgid "Go to your homepage" +msgstr "Ir a súa páxina de inicio" + +#: ../midori/midori-browser.c:2823 +msgid "Location..." +msgstr "Ubicación..." + +#: ../midori/midori-browser.c:2824 +msgid "Open a particular location" +msgstr "Abrir un enderezo determinado" + +#: ../midori/midori-browser.c:2826 +msgid "Web Search..." +msgstr "Buscar na web..." + +#: ../midori/midori-browser.c:2827 +msgid "Run a web search" +msgstr "Proceder a busca na web" + +#: ../midori/midori-browser.c:2829 +msgid "Open in Page_holder..." +msgstr "Abrir no _cadro de páxinas" + +#: ../midori/midori-browser.c:2830 +msgid "Open the current page in the pageholder" +msgstr "Abrir a páxina actual no cadro de páxinas" + +#: ../midori/midori-browser.c:2832 +msgid "Closed Tabs and Windows" +msgstr "Pechar ventás e lingüetas" + +#: ../midori/midori-browser.c:2833 +msgid "Reopen a previously closed tab or window" +msgstr "Voltar a abrir ventás ou lingüetas pechadas" + +#: ../midori/midori-browser.c:2835 +msgid "Empty Trash" +msgstr "Baleirar a cesta do lixo" + +#: ../midori/midori-browser.c:2836 +msgid "Delete the contents of the trash" +msgstr "Borrar o contido do lixo" + +#: ../midori/midori-browser.c:2838 +msgid "Undo Close Tab" +msgstr "Desfacer o peche de lingüeta" + +#: ../midori/midori-browser.c:2839 +msgid "Open the last closed tab" +msgstr "Abrir a última lingüeta pechada" + +#: ../midori/midori-browser.c:2841 +msgid "_Bookmarks" +msgstr "_Marcapáxinas" + +#: ../midori/midori-browser.c:2844 +msgid "Add a new bookmark" +msgstr "Engadir novo marcapáxinas" + +#: ../midori/midori-browser.c:2846 +msgid "_Manage Bookmarks" +msgstr "_Xestionar marcapáxinas" + +#: ../midori/midori-browser.c:2847 +msgid "Add, edit and remove bookmarks..." +msgstr "Engadir, editar ou eliminar marcapáxinas..." + +#: ../midori/midori-browser.c:2850 +msgid "Open the selected bookmark" +msgstr "Abrir o marcapáxinas seleccionado" + +#: ../midori/midori-browser.c:2852 +msgid "Open in New _Tab" +msgstr "Abrir nunha nova _lingüeta " + +#: ../midori/midori-browser.c:2853 +msgid "Open the selected bookmark in a new tab" +msgstr "Abrir o marcapáxinas seleccionado nunha lingüeta nova" + +#: ../midori/midori-browser.c:2855 +msgid "Open in New _Window" +msgstr "Abrir nunha nova _ventá" + +#: ../midori/midori-browser.c:2856 +msgid "Open the selected bookmark in a new window" +msgstr "Abrir o marcapáxinas seleccionado nunha ventá nova" + +#: ../midori/midori-browser.c:2859 +msgid "Edit the selected bookmark" +msgstr "Editar o marcapáxinas seleccionado" + +#: ../midori/midori-browser.c:2862 +msgid "Delete the selected bookmark" +msgstr "Borrar o marcapáxinas seleccionado" + +#: ../midori/midori-browser.c:2864 +msgid "_Tools" +msgstr "_Ferramentas" + +#: ../midori/midori-browser.c:2866 +#: ../midori/midori-searchentry.c:161 +msgid "_Manage Search Engines" +msgstr "_Xestor de motores de busca" + +#: ../midori/midori-browser.c:2867 +msgid "Add, edit and remove search engines..." +msgstr "Engadir, editar ou eliminar motores de busca..." + +#: ../midori/midori-browser.c:2870 +msgid "_Window" +msgstr "_Ventá" + +#: ../midori/midori-browser.c:2872 +msgid "_Previous Tab" +msgstr "Lingüeta _anterior" + +#: ../midori/midori-browser.c:2873 +msgid "Switch to the previous tab" +msgstr "Cambiar a lingüeta anterior" + +#: ../midori/midori-browser.c:2875 +msgid "_Next Tab" +msgstr "Lingüeta _seguinte" + +#: ../midori/midori-browser.c:2876 +msgid "Switch to the next tab" +msgstr "Cambiar a lingüeta seguinte" + +# comprobar +#: ../midori/midori-browser.c:2878 +msgid "Tab _Overview" +msgstr "_Descrición de lingüetas" + +#: ../midori/midori-browser.c:2879 +msgid "Show an overview of all open tabs" +msgstr "Amosar unha visión xeral de todas as lingüetas abertas" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../midori/midori-browser.c:2881 +msgid "_Help" +msgstr "_Axuda" + +#: ../midori/midori-browser.c:2883 +msgid "_Contents" +msgstr "_Contido" + +#: ../midori/midori-browser.c:2884 +msgid "Show the documentation" +msgstr "Amosar a documentación" + +#: ../midori/midori-browser.c:2887 +msgid "Show information about the program" +msgstr "Amosar información sobre o programa" + +#: ../midori/midori-browser.c:2893 +msgid "P_rivate Browsing" +msgstr "Navegación p_rivada" + +#: ../midori/midori-browser.c:2894 +msgid "Don't save any private data while browsing" +msgstr "Non gardar datos privados durante a navegación" + +#: ../midori/midori-browser.c:2897 +msgid "_Work Offline" +msgstr "Traballar desconectado" + +#: ../midori/midori-browser.c:2898 +msgid "Work without a network connection" +msgstr "Traballar sin conexión de rede" + +#: ../midori/midori-browser.c:2902 +msgid "_Navigationbar" +msgstr "Barra de _navegación" + +#: ../midori/midori-browser.c:2903 +msgid "Show navigationbar" +msgstr "Amosar a barra de navegación" + +#: ../midori/midori-browser.c:2906 +msgid "Side_panel" +msgstr "_Panel lateral" + +#: ../midori/midori-browser.c:2907 +msgid "Show sidepanel" +msgstr "Amosar panel lateral" + +#: ../midori/midori-browser.c:2910 +msgid "_Bookmarkbar" +msgstr "Barra de marcapáxinas" + +#: ../midori/midori-browser.c:2911 +msgid "Show bookmarkbar" +msgstr "Amosar a barra de marcapáxinas" + +#: ../midori/midori-browser.c:2914 +msgid "_Transferbar" +msgstr "Barra de _transferencias" + +#: ../midori/midori-browser.c:2915 +msgid "Show transferbar" +msgstr "Amosar a barra de transferencias" + +#: ../midori/midori-browser.c:2918 +msgid "_Statusbar" +msgstr "Barra de es_tado" + +#: ../midori/midori-browser.c:2919 +msgid "Show statusbar" +msgstr "Amosar a barra de estado" + +#: ../midori/midori-browser.c:3453 +msgid "Bookmarks" +msgstr "Marcapáxinas" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3460 +#: ../midori/midori-preferences.c:279 +msgid "Transfers" +msgstr "Transferencias" + +#: ../midori/midori-browser.c:3469 +msgid "Console" +msgstr "Consola" + +#: ../midori/midori-browser.c:3476 +#: ../midori/midori-preferences.c:437 +msgid "History" +msgstr "Histórico" + +#: ../midori/midori-browser.c:3485 +msgid "Pageholder" +msgstr "Cadro de páxinas" + +#: ../midori/midori-browser.c:3520 +msgid "_Inline find:" +msgstr "_Busca en liña:" + +#: ../midori/midori-browser.c:3553 +msgid "Match Case" +msgstr "Sensible a maiúsculas" + +#: ../midori/midori-browser.c:3570 +msgid "Close Findbar" +msgstr "Pechar barra de buscas" + +#: ../midori/midori-browser.c:3807 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Axuste non esperado «%s»" + +#: ../midori/midori-panel.c:147 +msgid "Appearance of the shadow around each panel" +msgstr "Aspecto das sombras arredor de cada panel" + +#: ../midori/midori-panel.c:157 +msgid "Menu to hold panel items" +msgstr "Menu para conter os elementos dos paneis" + +#: ../midori/midori-panel.c:166 +msgid "The index of the current page" +msgstr "Indice da páxina actual" + +#: ../midori/midori-panel.c:206 +#: ../midori/midori-panel.c:207 +msgid "Close panel" +msgstr "Perchar o panel" + +#: ../midori/midori-panel.c:392 +msgid "Untitled" +msgstr "Sin título" + +#: ../midori/midori-websettings.c:130 +msgid "Blank page" +msgstr "Páxina baleira" + +#: ../midori/midori-websettings.c:131 +#: ../midori/midori-websettings.c:411 +msgid "Homepage" +msgstr "Inicio" + +#: ../midori/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Páxinas abertas recentemente" + +#: ../midori/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Chinés (BIG5)" + +#: ../midori/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Xaponés (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Ruso (KOI8-R)" + +#: ../midori/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Occidental (ISO-8859-1)" + +#: ../midori/midori-websettings.c:152 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-websettings.c:167 +msgid "New tab" +msgstr "Nova lingüeta" + +#: ../midori/midori-websettings.c:168 +msgid "New window" +msgstr "Nova ventá" + +#: ../midori/midori-websettings.c:169 +msgid "Current tab" +msgstr "Lingüeta actual" + +#: ../midori/midori-websettings.c:184 +msgid "Default" +msgstr "Predeterminada" + +#: ../midori/midori-websettings.c:185 +msgid "Icons" +msgstr "Iconas" + +#: ../midori/midori-websettings.c:186 +msgid "Text" +msgstr "Texto" + +#: ../midori/midori-websettings.c:187 +msgid "Both" +msgstr "Ambos" + +#: ../midori/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Ambos en horizontal" + +#: ../midori/midori-websettings.c:203 +msgid "All cookies" +msgstr "Todas as «cookies»" + +#: ../midori/midori-websettings.c:204 +msgid "Session cookies" +msgstr "As «cookies» de esta sesión" + +#: ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Ningunha" + +#: ../midori/midori-websettings.c:242 +msgid "Remember last window size" +msgstr "Recordar último tamaño de ventá" + +#: ../midori/midori-websettings.c:243 +msgid "Whether to save the last window size" +msgstr "Gardar (ou non) o último tamaño de ventá" + +#: ../midori/midori-websettings.c:251 +msgid "Last window width" +msgstr "Última largura da ventá" + +#: ../midori/midori-websettings.c:252 +msgid "The last saved window width" +msgstr "Última largura da ventá gardada" + +#: ../midori/midori-websettings.c:260 +msgid "Last window height" +msgstr "Última altura da ventá" + +#: ../midori/midori-websettings.c:261 +msgid "The last saved window height" +msgstr "Última altura da ventá gardada" + +#: ../midori/midori-websettings.c:269 +msgid "Last panel position" +msgstr "Última posición do panel" + +#: ../midori/midori-websettings.c:270 +msgid "The last saved panel position" +msgstr "Uñtima posición gardada do panel" + +#: ../midori/midori-websettings.c:278 +msgid "Last panel page" +msgstr "Última páxina do panel" + +#: ../midori/midori-websettings.c:279 +msgid "The last saved panel page" +msgstr "Última páxina gardada do panel" + +#: ../midori/midori-websettings.c:287 +msgid "Last Web search" +msgstr "Última busca na web" + +#: ../midori/midori-websettings.c:288 +msgid "The last saved Web search" +msgstr "Última busca na web gardada" + +#: ../midori/midori-websettings.c:296 +msgid "Last pageholder URI" +msgstr "Última URI do cadro de páxinas" + +#: ../midori/midori-websettings.c:297 +msgid "The URI last opened in the pageholder" +msgstr "Última URI aberta no cadro de páxinas" + +#: ../midori/midori-websettings.c:307 +msgid "Show Navigationbar" +msgstr "Amosar a barra de navegación" + +#: ../midori/midori-websettings.c:308 +msgid "Whether to show the navigationbar" +msgstr "Amosar (ou non) a barra de navegación" + +#: ../midori/midori-websettings.c:316 +msgid "Show Bookmarkbar" +msgstr "Amosar a barra de marcapáxinas" + +#: ../midori/midori-websettings.c:317 +msgid "Whether to show the bookmarkbar" +msgstr "Amosar (ou non) a barra de marcapáxinas" + +#: ../midori/midori-websettings.c:325 +msgid "Show Panel" +msgstr "Amosar o panel" + +#: ../midori/midori-websettings.c:326 +msgid "Whether to show the panel" +msgstr "Amosar (ou non) o panel" + +#: ../midori/midori-websettings.c:334 +msgid "Show Statusbar" +msgstr "Amosar a barra de estado" + +#: ../midori/midori-websettings.c:335 +msgid "Whether to show the statusbar" +msgstr "Amosar (ou non) a barra de estado" + +#: ../midori/midori-websettings.c:344 +msgid "Toolbar Style" +msgstr "Estilo da barra de ferramentas" + +#: ../midori/midori-websettings.c:345 +msgid "The style of the toolbar" +msgstr "O estilo da barra de ferramentas" + +#: ../midori/midori-websettings.c:354 +msgid "Small toolbar" +msgstr "Barra de ferramentas pequena" + +#: ../midori/midori-websettings.c:355 +msgid "Use small toolbar icons" +msgstr "Amosar iconas pequenas na barra de ferramentas" + +#: ../midori/midori-websettings.c:363 +msgid "Show New Tab" +msgstr "Amosar nova lingüeta" + +#: ../midori/midori-websettings.c:364 +msgid "Show the New Tab button in the toolbar" +msgstr "Amosar o botón de «Nova lingüeta» na barra de ferramentas" + +#: ../midori/midori-websettings.c:372 +msgid "Show Homepage" +msgstr "Amosar páxina de inicio" + +#: ../midori/midori-websettings.c:373 +msgid "Show the Homepage button in the toolbar" +msgstr "Amosar o botón de «Páxina de Inicio» na barra de ferramentas" + +#: ../midori/midori-websettings.c:381 +msgid "Show Web search" +msgstr "Amosar o buscador web" + +#: ../midori/midori-websettings.c:382 +msgid "Show the Web search entry in the toolbar" +msgstr "Amosar a caixa se buscas na web na barra de ferramentas" + +#: ../midori/midori-websettings.c:390 +msgid "Show Trash" +msgstr "Amosar «Cesta do lixo»" + +#: ../midori/midori-websettings.c:391 +msgid "Show the Trash button in the toolbar" +msgstr "Amosar o botón «Cesta do lixo» na barra de ferramentas" + +#: ../midori/midori-websettings.c:401 +msgid "Load on Startup" +msgstr "Cargar ao inicio" + +#: ../midori/midori-websettings.c:402 +msgid "What to load on startup" +msgstr "Que cargar no inicio" + +#: ../midori/midori-websettings.c:412 +msgid "The homepage" +msgstr "Páxina de inicio" + +#: ../midori/midori-websettings.c:420 +msgid "Download Folder" +msgstr "Cartafol de descargas" + +#: ../midori/midori-websettings.c:421 +msgid "The folder downloaded files are saved to" +msgstr "O cartafol de descargas foi gardado en" + +#: ../midori/midori-websettings.c:429 +msgid "Download Manager" +msgstr "Xestor de descargas" + +#: ../midori/midori-websettings.c:430 +msgid "An external download manager" +msgstr "Xestor de descargas externo" + +#: ../midori/midori-websettings.c:438 +msgid "Location entry Search" +msgstr "Busca de barra de enderezos" + +#: ../midori/midori-websettings.c:439 +msgid "The search to perform inside the location entry" +msgstr "Facer unha busca a partir do contido da barra de enderezos" + +#: ../midori/midori-websettings.c:447 +msgid "Preferred Encoding" +msgstr "Codificación prefereida" + +#: ../midori/midori-websettings.c:448 +msgid "The preferred character encoding" +msgstr "Codificación de carácteres preferida" + +#: ../midori/midori-websettings.c:459 +msgid "Tab Label Size" +msgstr "Tamaño da etiqueta de lingüetas" + +#: ../midori/midori-websettings.c:460 +msgid "The desired tab label size" +msgstr "Tamaño desexado da etiqueta das lingüetas" + +#: ../midori/midori-websettings.c:468 +msgid "Close Buttons on Tabs" +msgstr "Botón de pechar nas lingüetas" + +#: ../midori/midori-websettings.c:469 +msgid "Whether tabs have close buttons" +msgstr "Cada unha das lingüetas terá o seu botón para pechala" + +#: ../midori/midori-websettings.c:477 +msgid "Open new pages in" +msgstr "Abrir as páxinas novas en" + +#: ../midori/midori-websettings.c:478 +msgid "Where to open new pages" +msgstr "Donde se van a abrir as páxinas novas" + +#: ../midori/midori-websettings.c:487 +msgid "Middle click opens Selection" +msgstr "Clic no botón do medio abre a selección" + +#: ../midori/midori-websettings.c:488 +msgid "Load an URL from the selection via middle click" +msgstr "Cargar unha URL na selección empregando o botón de medio do rato" + +#: ../midori/midori-websettings.c:496 +msgid "Open tabs in the background" +msgstr "Abrir lingüetas en segundo plano" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs in the background" +msgstr "Abrir (ou non) as novas lingüetas en segundo plano" + +#: ../midori/midori-websettings.c:505 +msgid "Open popups in tabs" +msgstr "Abrir «emerxentes» en lingüetas" + +#: ../midori/midori-websettings.c:506 +msgid "Whether to open popup windows in tabs" +msgstr "Abrir (ou non) as ventas emerxentes en lingüetas" + +#: ../midori/midori-websettings.c:516 +msgid "Accept cookies" +msgstr "Aceptar as «cookies»" + +#: ../midori/midori-websettings.c:517 +msgid "What type of cookies to accept" +msgstr "Que tipos de «cookies» van ser aceptadas" + +#: ../midori/midori-websettings.c:526 +msgid "Original cookies only" +msgstr "Só as «cookies» do sitio orixinal" + +#: ../midori/midori-websettings.c:527 +msgid "Accept cookies from the original website only" +msgstr "Só se aceptan as «cookies» do sitio orixe" + +#: ../midori/midori-websettings.c:535 +msgid "Maximum cookie age" +msgstr "Persistencia máxima das «cookies»" + +#: ../midori/midori-websettings.c:536 +msgid "The maximum number of days to save cookies for" +msgstr "Tempo máximo, en dias, durante os que se gardaran as «cookies»" + +#: ../midori/midori-websettings.c:546 +msgid "Remember last visited pages" +msgstr "Recordar as últimas páxinas visitadas" + +#: ../midori/midori-websettings.c:547 +msgid "Whether the last visited pages are saved" +msgstr "Recordar (ou non) as últimas páxinas que foron visitadas" + +#: ../midori/midori-websettings.c:555 +msgid "Maximum history age" +msgstr "Persistencia máxima do histórico" + +#: ../midori/midori-websettings.c:556 +msgid "The maximum number of days to save the history for" +msgstr "Tempo máximo, en dias, durante os que se gardará un dato do histórico" + +#: ../midori/midori-websettings.c:564 +msgid "Remember last form inputs" +msgstr "Recordar as últimas sesións de formularios" + +#: ../midori/midori-websettings.c:565 +msgid "Whether the last form inputs are saved" +msgstr "Recordar (ou non) as últimas sesións cos seus datos de formularios" + +#: ../midori/midori-websettings.c:573 +msgid "Remember last downloaded files" +msgstr "Recordar últimos ficheiros descargados" + +#: ../midori/midori-websettings.c:574 +msgid "Whether the last downloaded files are saved" +msgstr "Recordar (ou non) a lista de descargas de ficheiros realizadas últimamente" + +#: ../midori/midori-websettings.c:584 +msgid "HTTP Proxy" +msgstr "Servidor proxy HTTP" + +#: ../midori/midori-websettings.c:585 +msgid "The proxy used for HTTP connections" +msgstr "Servidor proxy para conexións HTTP" + +#: ../midori/midori-websettings.c:593 +msgid "Cache size" +msgstr "Tamaño da caché" + +#: ../midori/midori-websettings.c:594 +msgid "The allowed size of the cache" +msgstr "Tamaño asignado á memoria caché" + +#: ../midori/midori-webview.c:193 +msgid "The URI of the currently loaded page" +msgstr "URI da páxina actualmente cargada" + +#: ../midori/midori-webview.c:202 +msgid "The title of the currently loaded page" +msgstr "Título da páxina actualmente cargada" + +#: ../midori/midori-webview.c:578 +msgid "Open Link in New _Tab" +msgstr "Abrir a ligazón nunha nova _lingüeta" + +#: ../midori/midori-webview.c:606 +msgid "Download Link with Download _Manager" +msgstr "Descargar a ligazón con un _xestor de descargas" + +#: ../midori/midori-webview.c:624 +msgid "Open URL in New _Tab" +msgstr "Abrir a URL nunha nova _lingüeta" + +#: ../midori/midori-preferences.c:62 +msgid "Settings instance to provide properties" +msgstr "Configuración exemplo para fornecer propiedades" + +#: ../midori/midori-preferences.c:84 +#, c-format +msgid "%s Preferences" +msgstr "%s Preferencias" + +#. Page "General" +#: ../midori/midori-preferences.c:267 +msgid "General" +msgstr "Xeral" + +#: ../midori/midori-preferences.c:268 +msgid "Startup" +msgstr "Inicio" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:301 +msgid "Appearance" +msgstr "Aparencia" + +#: ../midori/midori-preferences.c:302 +msgid "Font settings" +msgstr "Axustes de fontes" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:322 +msgid "Behavior" +msgstr "Comportamento" + +#: ../midori/midori-preferences.c:323 +msgid "Features" +msgstr "Funcionalidades" + +#. Page "Interface" +#: ../midori/midori-preferences.c:373 +msgid "Interface" +msgstr "Interface" + +#: ../midori/midori-preferences.c:387 +msgid "Browsing" +msgstr "Navegación" + +#. Page "Network" +#: ../midori/midori-preferences.c:403 +#: ../midori/midori-preferences.c:404 +msgid "Network" +msgstr "Rede" + +#: ../midori/midori-preferences.c:415 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:420 +msgid "Privacy" +msgstr "Privacidade" + +#: ../midori/midori-preferences.c:421 +msgid "Web Cookies" +msgstr "«Cookies» de conexión" + +#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:444 +msgid "days" +msgstr "dias" + +#: ../midori/midori-webitem.c:70 +msgid "Name" +msgstr "Nome:" + +#: ../midori/midori-webitem.c:71 +msgid "The name of the web item" +msgstr "Nome do elemento web" + +#: ../midori/midori-webitem.c:79 +msgid "Description" +msgstr "Descrición" + +#: ../midori/midori-webitem.c:80 +msgid "The description of the web item" +msgstr "Descrición do elemento web" + +#: ../midori/midori-webitem.c:88 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-webitem.c:89 +msgid "The URI of the web item" +msgstr "URI do elemento web" + +#: ../midori/midori-webitem.c:97 +msgid "Icon" +msgstr "Icona" + +#: ../midori/midori-webitem.c:98 +msgid "The icon of the web item" +msgstr "Icona do elemento web" + +#: ../midori/midori-webitem.c:106 +msgid "Token" +msgstr "«Marca»" + +#: ../midori/midori-webitem.c:107 +msgid "The token of the web item" +msgstr "«Marca» do elemento web" + +#: ../midori/midori-searchentry.c:75 +msgid "Current Item" +msgstr "Elemento actual" + +#: ../midori/midori-searchentry.c:76 +msgid "The currently selected item" +msgstr "Elemento seleccionado actualmente" + +#: ../midori/midori-searchentry.c:84 +msgid "Dialog" +msgstr "Dialogo" + +#: ../midori/midori-searchentry.c:85 +msgid "A dialog to manage search engines" +msgstr "Caixa de dialogo para xestionar os motores de busca" + +#: ../midori/midori-searchentry.c:152 +msgid "Empty" +msgstr "Baleiro" + +#: ../midori/midori-searchentry.c:524 +msgid "Add search engine" +msgstr "Engadir un motor de busca" + +#: ../midori/midori-searchentry.c:524 +msgid "Edit search engine" +msgstr "Editar o motor de busca" + +#: ../midori/midori-searchentry.c:551 +msgid "_Name:" +msgstr "_Nome:" + +#: ../midori/midori-searchentry.c:595 +msgid "_Icon (name or file):" +msgstr "_Icona (nome ou ficheiro):" + +#: ../midori/midori-searchentry.c:609 +msgid "_Token:" +msgstr "«_Marca»" + +#: ../midori/midori-searchentry.c:790 +msgid "Manage search engines" +msgstr "Xestionar os motores de busca" + +#: ../midori/sokoke.c:60 +#: ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "Non se puido executar o programa externo." + +#: ../midori/sokoke.c:348 +msgid "Warning: You are using a superuser account!" +msgstr "Aviso: Estas conectado como super usuario!" + +#: ../midori/sokoke.c:522 +#: ../katze/katze-xbel.c:935 +#, c-format +msgid "Writing failed." +msgstr "Fallou a escritura." + +#: ../midori/gjs.c:89 +msgid "An unknown error occured." +msgstr "Atopouse un erro descoñecido:" + +#: ../midori/gjs.c:309 +#: ../midori/gjs.c:399 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s non ten a propiedade «%s»" + +#: ../midori/gjs.c:445 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s non pode ser asignado a %s.%s" + +#: ../midori/gjs.c:455 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s non se pode acceder" + +#: ../katze/katze-throbber.c:134 +msgid "Symbolic size to use for the animation" +msgstr "Tamaño simbólico a usar para animacións" + +#: ../katze/katze-throbber.c:143 +msgid "The name of an icon containing animation frames" +msgstr "O nome da icona contén cadros animados" + +#: ../katze/katze-throbber.c:152 +msgid "A GdkPixbuf containing animation frames" +msgstr "O «GdkPixbuf» conten cadros de animación" + +#: ../katze/katze-throbber.c:161 +msgid "Whether the throbber should be animated" +msgstr "Animar (ou non) a icona" + +#: ../katze/katze-throbber.c:170 +msgid "The name of an icon to be used as the static image" +msgstr "Nome a usar para a icona non animada" + +#: ../katze/katze-throbber.c:179 +msgid "A GdkPixbuf to be used as the static image" +msgstr "O «GdkPixbuf» vai ser usada como imaxe estática" + +#: ../katze/katze-throbber.c:188 +msgid "The stock ID of an icon to be used as the static image" +msgstr "ID da icona para ser usada como imaxe estática" + +#: ../katze/katze-utils.c:137 +#: ../katze/katze-utils.c:318 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "A propiedade «%s» non é válida para %s" + +#: ../katze/katze-utils.c:159 +#: ../katze/katze-utils.c:195 +msgid "Choose file" +msgstr "Escoller un ficheiro" + +#: ../katze/katze-utils.c:177 +msgid "Choose folder" +msgstr "Escoller un cartafol" + +#: ../katze/katze-xbel.c:708 +#: ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 +#: ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:789 +msgid "Malformed document." +msgstr "Documento defectuoso" + +#: ../katze/katze-xbel.c:744 +msgid "File not found." +msgstr "Non se atopa o ficheiro." From 3e6f7eeeae0e4dd16d03e42a9a50fc39b8482dcd Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 22 Jul 2008 12:37:02 +0200 Subject: [PATCH 0218/2970] Escape strings used in markup --- midori/midori-locationentry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 37f2a448..27daba15 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -178,9 +178,9 @@ midori_location_entry_set_item (GtkTreeModel* model, gchar* desc = NULL; if (item->title) - desc = g_strdup_printf ("%s - %s", item->uri, item->title); + desc = g_markup_printf_escaped ("%s - %s", item->uri, item->title); else - desc = g_strdup_printf ("%s", item->uri); + desc = g_markup_printf_escaped ("%s", item->uri); gtk_list_store_set (GTK_LIST_STORE (model), iter, FAVICON_COL, item->favicon, URI_COL, item->uri, TITLE_COL, desc, -1); From 2e60726c74fb3c82738b3c7a2618cacfd4a5d7d6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jul 2008 14:46:49 +0200 Subject: [PATCH 0219/2970] Make tabs with close buttons as small as without --- midori/midori-browser.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 22fa882e..66dc6a32 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -868,16 +868,16 @@ midori_browser_tab_label_button_release_event (GtkWidget* tab_label, } static void -midori_browser_tab_close_style_set (GtkWidget* tab_close, - GtkStyle* previous_style) +midori_browser_tab_icon_style_set (GtkWidget* tab_icon, + GtkStyle* previous_style) { GtkSettings* gtk_settings; gint width, height; - gtk_settings = gtk_widget_get_settings (tab_close); - gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_BUTTON, + gtk_settings = gtk_widget_get_settings (tab_icon); + gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_MENU, &width, &height); - gtk_widget_set_size_request (tab_close, width + 2, height + 2); + gtk_widget_set_size_request (tab_icon, width + 2, height + 2); } static void @@ -1007,6 +1007,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, g_object_set_data (G_OBJECT (widget), "browser-tab-icon", tab_icon); browser->tab_titles = g_list_prepend (browser->tab_titles, tab_title); + g_signal_connect (tab_icon, "style-set", + G_CALLBACK (midori_browser_tab_icon_style_set), NULL); g_signal_connect (widget, "leave-notify-event", G_CALLBACK (midori_browser_tab_leave_notify_event_cb), browser); @@ -1014,6 +1016,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); + gtk_misc_set_alignment (GTK_MISC (tab_icon), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), tab_icon, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (tab_title), 0.0, 0.5); /* TODO: make the tab initially look "unvisited" until it's focused */ @@ -1026,9 +1029,11 @@ _midori_browser_add_tab (MidoriBrowser* browser, gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); rcstyle = gtk_rc_style_new (); rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style(close_button, rcstyle); - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + gtk_widget_modify_style (close_button, rcstyle); + image = katze_throbber_new (); + katze_throbber_set_static_stock_id (KATZE_THROBBER (image), GTK_STOCK_CLOSE); gtk_button_set_image (GTK_BUTTON (close_button), image); + gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); gtk_widget_show_all (GTK_WIDGET (event_box)); if (!sokoke_object_get_boolean (browser->settings, "close-buttons-on-tabs")) @@ -1038,7 +1043,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, g_signal_connect (event_box, "button-release-event", G_CALLBACK (midori_browser_tab_label_button_release_event), widget); g_signal_connect (close_button, "style-set", - G_CALLBACK (midori_browser_tab_close_style_set), NULL); + G_CALLBACK (midori_browser_tab_icon_style_set), NULL); g_signal_connect (close_button, "clicked", G_CALLBACK (midori_browser_tab_close_clicked), widget); From 6dba8bb33b35ddbad0cc0666e6ba9d5267581965 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jul 2008 14:53:25 +0200 Subject: [PATCH 0220/2970] Highlight the Clear icon in the findbar --- midori/midori-browser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 66dc6a32..9450fcf1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3570,6 +3570,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (browser->find_text), + GTK_ICON_ENTRY_SECONDARY, TRUE); g_signal_connect (browser->find_text, "icon_released", G_CALLBACK (midori_browser_entry_clear_icon_released_cb), NULL); g_signal_connect (browser->find_text, "activate", From 6be7e2ec928657418eb189d299cf4ba259c48ad2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Jul 2008 14:42:27 +0200 Subject: [PATCH 0221/2970] Remove inner border between scrollbars and window border --- midori/midori-browser.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9450fcf1..deb8cde3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -912,6 +912,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), + GTK_SHADOW_ETCHED_IN); gobject_class = G_OBJECT_GET_CLASS (widget); if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) child = widget; @@ -1015,6 +1017,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); hbox = gtk_hbox_new (FALSE, 1); + gtk_container_border_width (GTK_CONTAINER (hbox), 2); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); gtk_misc_set_alignment (GTK_MISC (tab_icon), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), tab_icon, FALSE, FALSE, 0); @@ -1030,6 +1033,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, rcstyle = gtk_rc_style_new (); rcstyle->xthickness = rcstyle->ythickness = 0; gtk_widget_modify_style (close_button, rcstyle); + g_object_unref (rcstyle); image = katze_throbber_new (); katze_throbber_set_static_stock_id (KATZE_THROBBER (image), GTK_STOCK_CLOSE); gtk_button_set_image (GTK_BUTTON (close_button), image); @@ -3211,6 +3215,8 @@ midori_browser_search_notify_current_item_cb (GObject *gobject, static void midori_browser_init (MidoriBrowser* browser) { + GtkRcStyle* rcstyle; + /* Setup the window metrics */ g_signal_connect (browser, "realize", G_CALLBACK (midori_browser_realize_cb), browser); @@ -3547,6 +3553,11 @@ midori_browser_init (MidoriBrowser* browser) /* Notebook, containing all web_views */ browser->notebook = gtk_notebook_new (); + /* Remove the inner border between scrollbars and the window border */ + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style (browser->notebook, rcstyle); + g_object_unref (rcstyle); gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), browser->notebook, FALSE, FALSE); g_signal_connect_after (browser->notebook, "switch-page", From 28141e8bacd1a220f193d5409166a8892ae8e1ba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Jul 2008 17:54:24 +0200 Subject: [PATCH 0222/2970] Revamp the loading signals of MidoriWebView --- midori/midori-browser.c | 115 ++++++++-------------- midori/midori-webview.c | 213 ++++++++++++++++++---------------------- midori/midori-webview.h | 30 +++--- 3 files changed, 152 insertions(+), 206 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index deb8cde3..0c842a59 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -241,7 +241,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) widget = midori_browser_get_current_tab (browser); web_view = widget && MIDORI_IS_WEB_VIEW (widget) ? widget : NULL; loading = web_view != NULL - && midori_web_view_is_loading (MIDORI_WEB_VIEW (web_view)); + && midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) + != MIDORI_LOAD_FINISHED; _action_set_sensitive (browser, "Reload", web_view != NULL && !loading); _action_set_sensitive (browser, "Stop", web_view != NULL && loading); @@ -329,22 +330,26 @@ _midori_browser_set_current_page_smartly (MidoriBrowser* browser, static void _midori_browser_update_progress (MidoriBrowser* browser, - gint progress) + MidoriWebView* web_view) { - if (progress > -1) + gdouble progress; + gchar* message; + + progress = midori_web_view_get_progress (web_view); + if (progress > 0.0) { gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (browser->progressbar), - progress ? progress / 100.0 : 0); - gchar* message = g_strdup_printf (_("%d%% loaded"), progress); + progress); + message = g_strdup_printf (_("%d%% loaded"), (gint)(progress * 100)); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), message); g_free (message); } else { - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (browser->progressbar)); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), - NULL); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (browser->progressbar)); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), + NULL); } } @@ -360,54 +365,37 @@ midori_web_view_window_object_cleared_cb (GtkWidget* web_view, } static void -midori_web_view_load_started_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - MidoriBrowser* browser) +midori_web_view_notify_load_status_cb (GtkWidget* web_view, + GParamSpec* pspec, + MidoriBrowser* browser) { + const gchar* uri; + if (web_view == midori_browser_get_current_web_view (browser)) { + if (midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) + == MIDORI_LOAD_COMMITTED) + { + uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + midori_location_entry_set_text (MIDORI_LOCATION_ENTRY ( + browser->location), uri); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, NULL); + } + _midori_browser_update_interface (browser); _midori_browser_set_statusbar_text (browser, NULL); } } static void -midori_web_view_progress_started_cb (GtkWidget* web_view, - guint progress, - MidoriBrowser* browser) +midori_web_view_notify_progress_cb (GtkWidget* web_view, + GParamSpec* pspec, + MidoriBrowser* browser) { if (web_view == midori_browser_get_current_web_view (browser)) - _midori_browser_update_progress (browser, progress); -} - -static void -midori_web_view_progress_changed_cb (GtkWidget* web_view, - guint progress, - MidoriBrowser* browser) -{ - if (web_view == midori_browser_get_current_web_view (browser)) - _midori_browser_update_progress (browser, progress); -} - -static void -midori_web_view_progress_done_cb (GtkWidget* web_view, - guint progress, - MidoriBrowser* browser) -{ - if (web_view == midori_browser_get_current_web_view (browser)) - _midori_browser_update_progress (browser, progress); -} - -static void -midori_web_view_load_done_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - MidoriBrowser* browser) -{ - if (web_view == midori_browser_get_current_web_view (browser)) - { - _midori_browser_update_interface (browser); - _midori_browser_set_statusbar_text (browser, NULL); - } + _midori_browser_update_progress (browser, MIDORI_WEB_VIEW (web_view)); } static void @@ -452,25 +440,6 @@ midori_web_view_element_motion_cb (MidoriWebView* web_View, _midori_browser_set_statusbar_text (browser, link_uri); } -static void -midori_web_view_load_committed_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - MidoriBrowser* browser) -{ - const gchar* uri; - - if (web_view == midori_browser_get_current_web_view (browser)) - { - uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - midori_location_entry_set_text (MIDORI_LOCATION_ENTRY ( - browser->location), uri); - _midori_browser_set_statusbar_text (browser, NULL); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, NULL); - } -} - static void midori_web_view_icon_ready_cb (MidoriWebView* web_view, GdkPixbuf* icon, @@ -943,22 +912,14 @@ _midori_browser_add_tab (MidoriBrowser* browser, g_object_connect (widget, "signal::window-object-cleared", midori_web_view_window_object_cleared_cb, browser, - "signal::load-started", - midori_web_view_load_started_cb, browser, - "signal::load-committed", - midori_web_view_load_committed_cb, browser, + "signal::notify::progress", + midori_web_view_notify_progress_cb, browser, + "signal::notify::mload-status", + midori_web_view_notify_load_status_cb, browser, "signal::icon-ready", midori_web_view_icon_ready_cb, browser, "signal::news-feed-ready", midori_web_view_news_feed_ready_cb, browser, - "signal::progress-started", - midori_web_view_progress_started_cb, browser, - "signal::progress-changed", - midori_web_view_progress_changed_cb, browser, - "signal::progress-done", - midori_web_view_progress_done_cb, browser, - "signal::load-done", - midori_web_view_load_done_cb, browser, "signal::notify::title", midori_web_view_notify_title_cb, browser, "signal::notify::zoom-level", @@ -2613,6 +2574,8 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, g_free (window_title); _midori_browser_set_statusbar_text (browser, NULL); _midori_browser_update_interface (browser); + if (MIDORI_IS_WEB_VIEW (widget)) + _midori_browser_update_progress (browser, MIDORI_WEB_VIEW (widget)); } static void diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 9b95cdca..a9d72403 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -33,8 +33,8 @@ struct _MidoriWebView GdkPixbuf* icon; gchar* uri; gchar* title; - gboolean is_loading; - gint progress; + gdouble progress; + MidoriLoadStatus load_status; gchar* statusbar_text; gchar* link_uri; @@ -48,12 +48,31 @@ struct _MidoriWebView G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) +GType +midori_load_status_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", N_("Load Provisional") }, + { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", N_("Load Committed") }, + { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", N_("Load Finished") }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriLoadStatus", values); + } + return type; +} + enum { PROP_0, PROP_URI, PROP_TITLE, + PROP_PROGRESS, + PROP_MLOAD_STATUS, PROP_STATUSBAR_TEXT, PROP_SETTINGS }; @@ -61,10 +80,6 @@ enum enum { ICON_READY, NEWS_FEED_READY, - PROGRESS_STARTED, - PROGRESS_CHANGED, - PROGRESS_DONE, - LOAD_DONE, ELEMENT_MOTION, NEW_TAB, NEW_WINDOW, @@ -154,50 +169,6 @@ midori_web_view_class_init (MidoriWebViewClass* class) G_TYPE_STRING, G_TYPE_STRING); - signals[PROGRESS_STARTED] = g_signal_new ( - "progress-started", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, progress_started), - 0, - NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, - G_TYPE_INT); - - signals[PROGRESS_CHANGED] = g_signal_new ( - "progress-changed", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, progress_changed), - 0, - NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, - G_TYPE_INT); - - signals[PROGRESS_DONE] = g_signal_new ( - "progress-done", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, progress_done), - 0, - NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, - G_TYPE_INT); - - signals[LOAD_DONE] = g_signal_new ( - "load-done", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, load_done), - 0, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - WEBKIT_TYPE_WEB_FRAME); - signals[ELEMENT_MOTION] = g_signal_new ( "element-motion", G_TYPE_FROM_CLASS (class), @@ -238,6 +209,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + if (!g_object_class_find_property (gobject_class, "uri")) g_object_class_install_property (gobject_class, PROP_URI, g_param_spec_string ( @@ -247,6 +219,7 @@ midori_web_view_class_init (MidoriWebViewClass* class) "", flags)); + if (!g_object_class_find_property (gobject_class, "title")) g_object_class_install_property (gobject_class, PROP_TITLE, g_param_spec_string ( @@ -256,6 +229,27 @@ midori_web_view_class_init (MidoriWebViewClass* class) NULL, flags)); + if (!g_object_class_find_property (gobject_class, "progress")) + g_object_class_install_property (gobject_class, + PROP_PROGRESS, + g_param_spec_double ( + "progress", + "Progress", + _("The current loading progress"), + 0.0, 1.0, 0.0, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_MLOAD_STATUS, + g_param_spec_enum ( + "mload-status", + "Load Status", + _("The current loading status"), + MIDORI_TYPE_LOAD_STATUS, + MIDORI_LOAD_FINISHED, + G_PARAM_READABLE)); + + if (!g_object_class_find_property (gobject_class, "statusbar-text")) g_object_class_install_property (gobject_class, PROP_STATUSBAR_TEXT, g_param_spec_string ( @@ -270,26 +264,17 @@ midori_web_view_class_init (MidoriWebViewClass* class) "settings"); } -/*static void -webkit_web_view_load_started (MidoriWebView* web_view, +static void +webkit_web_view_load_started (MidoriWebView* web_view, WebKitWebFrame* web_frame) { - web_view->is_loading = TRUE; - web_view->progress = -1; - katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), TRUE); -}*/ + web_view->load_status = MIDORI_LOAD_PROVISIONAL; + g_object_notify (G_OBJECT (web_view), "mload-status"); + if (web_view->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), TRUE); -static void -_midori_web_view_set_uri (MidoriWebView* web_view, - const gchar* uri) -{ - katze_assign (web_view->uri, g_strdup (uri)); - if (web_view->xbel_item) - { - const gchar* uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (web_view->xbel_item, uri); - } - g_object_set (web_view, "title", NULL, NULL); + web_view->progress = 0.0; + g_object_notify (G_OBJECT (web_view), "progress"); } #if GLIB_CHECK_VERSION (2, 16, 0) @@ -417,9 +402,15 @@ webkit_web_view_load_committed (MidoriWebView* web_view, const gchar* uri; GdkPixbuf* icon; - web_view->progress = 0; uri = webkit_web_frame_get_uri (web_frame); - _midori_web_view_set_uri (web_view, uri); + katze_assign (web_view->uri, g_strdup (uri)); + if (web_view->xbel_item) + { + uri = midori_web_view_get_display_uri (web_view); + katze_xbel_bookmark_set_href (web_view->xbel_item, uri); + } + g_object_notify (G_OBJECT (web_view), "uri"); + g_object_set (web_view, "title", NULL, NULL); icon = gtk_widget_render_icon (GTK_WIDGET (web_view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); @@ -434,6 +425,9 @@ webkit_web_view_load_committed (MidoriWebView* web_view, gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM (web_view->menu_item), gtk_image_new_from_pixbuf (icon)); + + web_view->load_status = MIDORI_LOAD_COMMITTED; + g_object_notify (G_OBJECT (web_view), "mload-status"); } static void @@ -449,31 +443,11 @@ webkit_web_view_icon_ready (MidoriWebView* web_view, gtk_image_new_from_pixbuf (icon)); } -static void -webkit_web_view_load_started (MidoriWebView* web_view, - WebKitWebFrame* web_frame) -{ - /* FIXME: This is a hack, until signals are fixed upstream */ - web_view->is_loading = TRUE; - if (web_view->tab_icon) - katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), TRUE); - - web_view->progress = 0; - g_signal_emit (web_view, signals[PROGRESS_STARTED], 0, web_view->progress); -} - static void webkit_web_view_progress_changed (MidoriWebView* web_view, gint progress) { - web_view->progress = progress; - g_signal_emit (web_view, signals[PROGRESS_CHANGED], 0, web_view->progress); -} - -static void -webkit_web_view_load_finished (MidoriWebView* web_view) -{ - web_view->progress = 100; - g_signal_emit (web_view, signals[PROGRESS_DONE], 0, web_view->progress); + web_view->progress = progress ? progress / 100.0 : 0.0; + g_object_notify (G_OBJECT (web_view), "progress"); } static void @@ -513,13 +487,18 @@ webkit_web_frame_load_done (WebKitWebFrame* web_frame, g_object_unref (document); g_object_unref (value); - web_view->is_loading = FALSE; - web_view->progress = -1; - if (web_view->tab_icon) katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), FALSE); - g_signal_emit (web_view, signals[LOAD_DONE], 0, web_frame); + web_view->load_status = MIDORI_LOAD_FINISHED; + g_object_notify (G_OBJECT (web_view), "mload-status"); +} + +static void +webkit_web_view_load_finished (MidoriWebView* web_view) +{ + web_view->progress = 1.0; + g_object_notify (G_OBJECT (web_view), "progress"); } static void @@ -726,8 +705,8 @@ midori_web_view_init (MidoriWebView* web_view) { web_view->icon = gtk_widget_render_icon (GTK_WIDGET (web_view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - web_view->is_loading = FALSE; - web_view->progress = -1; + web_view->progress = 0.0; + web_view->load_status = MIDORI_LOAD_FINISHED; web_view->settings = midori_web_settings_new (); g_object_set (web_view, "WebKitWebView::settings", web_view->settings, NULL); @@ -736,20 +715,16 @@ midori_web_view_init (MidoriWebView* web_view) web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); g_object_connect (web_view, - /* "signal::load-started", - webkit_web_view_load_started, NULL, */ + "signal::load-started", + webkit_web_view_load_started, NULL, "signal::load-committed", webkit_web_view_load_committed, NULL, "signal::icon-ready", webkit_web_view_icon_ready, NULL, - "signal::load-started", - webkit_web_view_load_started, NULL, "signal::load-progress-changed", webkit_web_view_progress_changed, NULL, "signal::load-finished", webkit_web_view_load_finished, NULL, - /* "signal::load-done", - webkit_web_view_load_done, NULL, */ "signal::title-changed", webkit_web_view_title_changed, NULL, "signal::status-bar-text-changed", @@ -850,6 +825,12 @@ midori_web_view_get_property (GObject* object, case PROP_TITLE: g_value_set_string (value, web_view->title); break; + case PROP_PROGRESS: + g_value_set_double (value, web_view->progress); + break; + case PROP_MLOAD_STATUS: + g_value_set_enum (value, web_view->load_status); + break; case PROP_STATUSBAR_TEXT: g_value_set_string (value, web_view->statusbar_text); break; @@ -1025,36 +1006,34 @@ midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view) } /** - * midori_web_view_is_loading: + * midori_web_view_load_status: * @web_view: a #MidoriWebView * - * Determines whether currently a page is being loaded or not. + * Determines the current loading status of a page. * - * Return value: %TRUE if a page is being loaded, %FALSE otherwise + * Return value: the current #MidoriLoadStatus **/ -gint -midori_web_view_is_loading (MidoriWebView* web_view) +MidoriLoadStatus +midori_web_view_get_load_status (MidoriWebView* web_view) { - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), -1); + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), MIDORI_LOAD_FINISHED); - return web_view->is_loading; + return web_view->load_status; } /** * midori_web_view_get_progress: * @web_view: a #MidoriWebView * - * Retrieves the current loading progress in percent or -1 if no data - * has been loaded so far. + * Retrieves the current loading progress as + * a fraction between 0.0 and 1.0. * - * The value is undefined if no loading is in progress. - * - * Return value: the current loading progress or -1 + * Return value: the current loading progress **/ -gint +gdouble midori_web_view_get_progress (MidoriWebView* web_view) { - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), -1); + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), 0.0); return web_view->progress; } diff --git a/midori/midori-webview.h b/midori/midori-webview.h index adab180e..d6e5b825 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -49,15 +49,6 @@ struct _MidoriWebViewClass const gchar* type, const gchar* title); void - (*progress_started) (MidoriWebView* web_view, - guint progress); - void - (*progress_changed) (MidoriWebView* web_view, - guint progress); - void - (*progress_done) (MidoriWebView* web_view, - guint progress); - void (*load_done) (MidoriWebView* web_view, WebKitWebFrame* frame); void @@ -73,6 +64,19 @@ struct _MidoriWebViewClass const gchar* uri); }; +typedef enum +{ + MIDORI_LOAD_PROVISIONAL, + MIDORI_LOAD_COMMITTED, + MIDORI_LOAD_FINISHED +} MidoriLoadStatus; + +GType +midori_load_status_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_LOAD_STATUS \ + (midori_load_status_get_type ()) + GType midori_web_view_get_type (void); @@ -95,12 +99,12 @@ midori_web_view_get_proxy_tab_title (MidoriWebView* web_view); KatzeXbelItem* midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view); -gboolean -midori_web_view_is_loading (MidoriWebView* web_view); - -gint +gdouble midori_web_view_get_progress (MidoriWebView* web_view); +MidoriLoadStatus +midori_web_view_get_load_status (MidoriWebView* web_view); + const gchar* midori_web_view_get_display_uri (MidoriWebView* web_view); From 5e66e09c00272b7a9b0f5d31ea296cd95f63fae7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Jul 2008 18:23:21 +0200 Subject: [PATCH 0223/2970] Make statusbar children fit in better --- midori/midori-browser.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0c842a59..1742f114 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3595,11 +3595,15 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), browser->find, FALSE, FALSE, 0); /* Statusbar */ - /* FIXME: children are overlapping the statusbar border */ browser->statusbar = gtk_statusbar_new (); + /* Adjust the statusbar's padding to avoid child overlapping */ + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = -4; + gtk_widget_modify_style (browser->statusbar, rcstyle); + g_object_unref (rcstyle); gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); browser->progressbar = gtk_progress_bar_new (); - /* Setting the progressbar's height to 1 makes it fit in the statusbar */ + /* Set the progressbar's height to 1 to fit it in the statusbar */ gtk_widget_set_size_request (browser->progressbar, -1, 1); gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar, FALSE, FALSE, 3); From 3301b3780323e7ee16a607f4ee6cdcdc211be504 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Jul 2008 20:17:13 +0200 Subject: [PATCH 0224/2970] Save the session whenever it changes, instead of on quit. --- midori/main.c | 46 +++++++---- midori/midori-browser.c | 179 ++++++++++++++++------------------------ midori/midori-browser.h | 11 ++- 3 files changed, 108 insertions(+), 128 deletions(-) diff --git a/midori/main.c b/midori/main.c index d672038c..e0138ac5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -334,6 +334,30 @@ midori_web_list_add_item_cb (MidoriWebList* trash, } } +void +midori_browser_session_cb (MidoriBrowser* browser, + gpointer arg1, + KatzeXbelItem* session) +{ + gchar* config_path; + gchar* config_file; + GError* error; + + config_path = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, NULL); + g_mkdir_with_parents (config_path, 0755); + config_file = g_build_filename (config_path, "session.xbel", NULL); + error = NULL; + if (!katze_xbel_folder_to_file (session, config_file, &error)) + { + g_warning (_("The session couldn't be saved. %s"), error->message); + g_error_free (error); + } + + g_free (config_file); + g_free (config_path); +} + int main (int argc, char** argv) @@ -555,7 +579,7 @@ main (int argc, midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); - KatzeXbelItem* session = katze_xbel_folder_new (); + KatzeXbelItem* session = midori_browser_get_proxy_xbel_folder (browser); n = katze_xbel_folder_get_n_items (_session); for (i = 0; i < n; i++) { @@ -568,6 +592,13 @@ main (int argc, midori_browser_activate_action (browser, "Location"); katze_xbel_item_unref (_session); + g_signal_connect_after (browser, "notify::uri", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "add-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "remove-tab", + G_CALLBACK (midori_browser_session_cb), session); + /* Load extensions */ JSGlobalContextRef js_context = gjs_global_context_new (); /* FIXME: We want to honor system installed addons as well */ @@ -626,19 +657,6 @@ main (int argc, g_error_free (error); } katze_xbel_item_unref (xbel_trash); - g_object_get (settings, "load-on-startup", &load_on_startup, NULL); - if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) - { - katze_assign (config_file, g_build_filename (config_path, - "session.xbel", NULL)); - error = NULL; - if (!katze_xbel_folder_to_file (session, config_file, &error)) - { - g_warning (_("The session couldn't be saved. %s"), error->message); - g_error_free (error); - } - } - katze_xbel_item_unref (session); katze_assign (config_file, g_build_filename (config_path, "config", NULL)); error = NULL; if (!settings_save_to_file (settings, config_file, &error)) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1742f114..059d27c7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -89,6 +89,7 @@ enum PROP_MENUBAR, PROP_NAVIGATIONBAR, + PROP_URI, PROP_TAB, PROP_STATUSBAR, PROP_SETTINGS, @@ -105,7 +106,7 @@ enum NEW_WINDOW, ADD_TAB, - ADD_URI, + REMOVE_TAB, ACTIVATE_ACTION, QUIT, @@ -382,6 +383,7 @@ midori_web_view_notify_load_status_cb (GtkWidget* web_view, gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), GTK_ICON_ENTRY_SECONDARY, NULL); + g_object_notify (G_OBJECT (browser), "uri"); } _midori_browser_update_interface (browser); @@ -856,7 +858,7 @@ midori_browser_tab_close_clicked (GtkWidget* tab_close, gtk_widget_destroy (widget); } -static gint +static void _midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* widget) { @@ -1036,24 +1038,13 @@ _midori_browser_add_tab (MidoriBrowser* browser, G_CALLBACK (midori_browser_tab_destroy_cb), browser); _midori_browser_update_actions (browser); - - n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); - return n; } -static gint -_midori_browser_add_uri (MidoriBrowser* browser, - const gchar* uri) +static void +_midori_browser_remove_tab (MidoriBrowser* browser, + GtkWidget* widget) { - GtkWidget* web_view; - - web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", uri, - "settings", browser->settings, - NULL); - gtk_widget_show (web_view); - - return midori_browser_add_tab (browser, web_view); + gtk_widget_destroy (widget); } static void @@ -1112,80 +1103,6 @@ midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, data2); } -static void -midori_cclosure_marshal_INT__OBJECT (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef gint(*GMarshalFunc_INT__OBJECT) (gpointer data1, - gpointer arg_1, - gpointer data2); - register GMarshalFunc_INT__OBJECT callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_INT__OBJECT) (marshal_data - ? marshal_data : cc->callback); - v_return = callback (data1, - g_value_get_object (param_values + 1), - data2); - g_value_set_int (return_value, v_return); -} - -static void -midori_cclosure_marshal_INT__STRING (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef gint(*GMarshalFunc_INT__STRING) (gpointer data1, - const gchar* arg_1, - gpointer data2); - register GMarshalFunc_INT__STRING callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - gint v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_INT__STRING) (marshal_data - ? marshal_data : cc->callback); - v_return = callback (data1, - g_value_get_string (param_values + 1), - data2); - g_value_set_int (return_value, v_return); -} - static void midori_browser_class_init (MidoriBrowserClass* class) { @@ -1231,20 +1148,20 @@ midori_browser_class_init (MidoriBrowserClass* class) G_STRUCT_OFFSET (MidoriBrowserClass, add_tab), 0, NULL, - midori_cclosure_marshal_INT__OBJECT, - G_TYPE_INT, 1, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, GTK_TYPE_WIDGET); - signals[ADD_URI] = g_signal_new ( - "add-uri", + signals[REMOVE_TAB] = g_signal_new ( + "remove-tab", G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriBrowserClass, add_uri), + G_STRUCT_OFFSET (MidoriBrowserClass, remove_tab), 0, NULL, - midori_cclosure_marshal_INT__STRING, - G_TYPE_INT, 1, - G_TYPE_STRING); + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_WIDGET); signals[ACTIVATE_ACTION] = g_signal_new ( "activate-action", @@ -1268,7 +1185,7 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 0); class->add_tab = _midori_browser_add_tab; - class->add_uri = _midori_browser_add_uri; + class->remove_tab = _midori_browser_remove_tab; class->activate_action = _midori_browser_activate_action; class->quit = _midori_browser_quit; @@ -1297,6 +1214,15 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_TOOLBAR, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, + PROP_URI, + g_param_spec_string ( + "uri", + _("URI"), + _("The current URI"), + "about:blank", + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_TAB, g_param_spec_object ( @@ -2572,6 +2498,9 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); + + g_object_notify (G_OBJECT (browser), "uri"); + _midori_browser_set_statusbar_text (browser, NULL); _midori_browser_update_interface (browser); if (MIDORI_IS_WEB_VIEW (widget)) @@ -3844,6 +3773,9 @@ midori_browser_set_property (GObject* object, switch (prop_id) { + case PROP_URI: + _midori_browser_open_uri (browser, g_value_get_string (value)); + break; case PROP_TAB: midori_browser_set_current_tab (browser, g_value_get_object (value)); break; @@ -3912,6 +3844,9 @@ midori_browser_get_property (GObject* object, case PROP_NAVIGATIONBAR: g_value_set_object (value, browser->navigationbar); break; + case PROP_URI: + g_value_set_string (value, midori_browser_get_current_uri (browser)); + break; case PROP_TAB: g_value_set_object (value, midori_browser_get_current_tab (browser)); break; @@ -3969,10 +3904,11 @@ gint midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* widget) { - gint index; + GtkWidget* scrolled; - g_signal_emit (browser, signals[ADD_TAB], 0, widget, &index); - return index; + g_signal_emit (browser, signals[ADD_TAB], 0, widget); + scrolled = _midori_browser_scrolled_for_child (browser, widget); + return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); } /** @@ -3986,10 +3922,7 @@ void midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* widget) { - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); - gtk_container_remove (GTK_CONTAINER (browser->notebook), scrolled); - - /* FIXME: Remove the menuitem if this is a web view */ + g_signal_emit (browser, signals[REMOVE_TAB], 0, widget); } /** @@ -4032,10 +3965,15 @@ gint midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri) { - gint index; + GtkWidget* web_view; - g_signal_emit (browser, signals[ADD_URI], 0, uri, &index); - return index; + web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, + "uri", uri, + "settings", browser->settings, + NULL); + gtk_widget_show (web_view); + + return midori_browser_add_tab (browser, web_view); } /** @@ -4052,6 +3990,27 @@ midori_browser_activate_action (MidoriBrowser* browser, g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name); } +/** + * midori_browser_get_current_uri: + * @browser: a #MidoriBrowser + * + * Determines the URI loaded in the current page. + * + * If there is no page present at all, %NULL is returned. + * + * Return value: the current URI, or %NULL + **/ +const gchar* +midori_browser_get_current_uri (MidoriBrowser* browser) +{ + GtkWidget* widget; + + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + widget = midori_browser_get_current_web_view (browser); + return _midori_browser_get_tab_uri (browser, widget); +} + /** * midori_browser_set_current_page: * @browser: a #MidoriBrowser diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 83876435..5c125d3f 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -54,12 +54,12 @@ struct _MidoriBrowserClass (*new_window) (MidoriBrowser* browser, const gchar* uri); - gint + void (*add_tab) (MidoriBrowser* browser, GtkWidget* widget); - gint - (*add_uri) (MidoriBrowser* browser, - const gchar* uri); + void + (*remove_tab) (MidoriBrowser* browser, + GtkWidget* widget); void (*activate_action) (MidoriBrowser* browser, const gchar* name); @@ -93,6 +93,9 @@ void midori_browser_activate_action (MidoriBrowser* browser, const gchar* name); +const gchar* +midori_browser_get_current_uri (MidoriBrowser* browser); + void midori_browser_set_current_page (MidoriBrowser* browser, gint n); From 549310a7cd712b1285ccf41255f621991cb85c74 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 25 Jul 2008 12:45:50 +0200 Subject: [PATCH 0225/2970] Ensure REMOVE_TAB emission, don't alter session when destroying --- midori/main.c | 11 +++++++++++ midori/midori-browser.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/midori/main.c b/midori/main.c index e0138ac5..32f14517 100644 --- a/midori/main.c +++ b/midori/main.c @@ -358,6 +358,15 @@ midori_browser_session_cb (MidoriBrowser* browser, g_free (config_path); } +void +midori_browser_weak_notify_cb (MidoriBrowser* browser, + KatzeXbelItem* session) +{ + g_object_disconnect (browser, "any-signal", + G_CALLBACK (midori_browser_session_cb), session, NULL); +} + + int main (int argc, char** argv) @@ -598,6 +607,8 @@ main (int argc, G_CALLBACK (midori_browser_session_cb), session); g_signal_connect_after (browser, "remove-tab", G_CALLBACK (midori_browser_session_cb), session); + g_object_weak_ref (G_OBJECT (session), + (GWeakNotify)(midori_browser_weak_notify_cb), browser); /* Load extensions */ JSGlobalContextRef js_context = gjs_global_context_new (); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 059d27c7..1d23ec7b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -115,6 +115,9 @@ enum static guint signals[LAST_SIGNAL]; +static void +midori_browser_dispose (GObject* object); + static void midori_browser_finalize (GObject* object); @@ -787,6 +790,13 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, } _midori_browser_update_actions (browser); + + /* This callback must only be called once, but we need to ensure + that "remove-tab" is emitted in any case */ + g_signal_handlers_disconnect_by_func (widget, + midori_browser_tab_destroy_cb, browser); + + g_signal_emit (browser, signals[REMOVE_TAB], 0, widget); return FALSE; } @@ -1190,6 +1200,7 @@ midori_browser_class_init (MidoriBrowserClass* class) class->quit = _midori_browser_quit; GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class->dispose = midori_browser_dispose; gobject_class->finalize = midori_browser_finalize; gobject_class->set_property = midori_browser_set_property; gobject_class->get_property = midori_browser_get_property; @@ -2898,7 +2909,7 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, static void midori_browser_destroy_cb (MidoriBrowser* browser) { - /* Destroy tabs first, so widgets can still see window elements on destroy */ + /* Destroy tabs first, so child widgets don't need special care */ gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) gtk_widget_destroy, NULL); } @@ -3560,6 +3571,18 @@ midori_browser_init (MidoriBrowser* browser) browser->close_buttons = NULL; } +static void +midori_browser_dispose (GObject* object) +{ + MidoriBrowser* browser = MIDORI_BROWSER (object); + + /* We are done, the session mustn't change anymore */ + if (browser->proxy_xbel_folder) + katze_object_assign (browser->proxy_xbel_folder, NULL); + + G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object); +} + static void midori_browser_finalize (GObject* object) { @@ -3569,9 +3592,6 @@ midori_browser_finalize (GObject* object) g_list_free (browser->tab_titles); g_list_free (browser->close_buttons); - if (browser->proxy_xbel_folder) - katze_xbel_item_unref (browser->proxy_xbel_folder); - if (browser->settings) g_object_unref (browser->settings); if (browser->trash) @@ -4133,6 +4153,9 @@ midori_browser_get_current_web_view (MidoriBrowser* browser) * * Note that this implicitly creates proxy xbel items of all web views. * + * Note: Calling this function doesn't add a reference and the browser + * may release its reference at some point. + * * Return value: the proxy #KatzeXbelItem **/ KatzeXbelItem* From 892a166eea7bf5f6009ba6ee33d42718a8fdd337 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Jul 2008 02:26:58 +0200 Subject: [PATCH 0226/2970] Emulate window-object-cleared if it wasn't emitted --- midori/midori-webview.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index a9d72403..3f1423d2 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -29,6 +29,7 @@ webkit_web_view_get_selected_text (WebKitWebView* web_view); struct _MidoriWebView { WebKitWebView parent_instance; + gboolean window_object_cleared; GdkPixbuf* icon; gchar* uri; @@ -268,6 +269,8 @@ static void webkit_web_view_load_started (MidoriWebView* web_view, WebKitWebFrame* web_frame) { + web_view->window_object_cleared = FALSE; + web_view->load_status = MIDORI_LOAD_PROVISIONAL; g_object_notify (G_OBJECT (web_view), "mload-status"); if (web_view->tab_icon) @@ -277,6 +280,15 @@ webkit_web_view_load_started (MidoriWebView* web_view, g_object_notify (G_OBJECT (web_view), "progress"); } +static void +webkit_web_view_window_object_cleared_cb (MidoriWebView* web_view, + WebKitWebFrame* web_frame, + JSGlobalContextRef js_context, + JSObjectRef js_window) +{ + web_view->window_object_cleared = TRUE; +} + #if GLIB_CHECK_VERSION (2, 16, 0) void loadable_icon_finish_cb (GdkPixbuf* icon, @@ -475,10 +487,21 @@ webkit_web_frame_load_done (WebKitWebFrame* web_frame, gboolean success, MidoriWebView* web_view) { + JSContextRef js_context; + JSValueRef js_window; GjsValue* value; GjsValue* document; GjsValue* links; + /* If WebKit didn't emit the signal due to a bug, we will */ + if (!web_view->window_object_cleared) + { + js_context = webkit_web_frame_get_global_context (web_frame); + js_window = JSContextGetGlobalObject (js_context); + g_signal_emit_by_name (web_view, "window-object-cleared", + web_frame, js_context, js_window); + } + value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); document = gjs_value_get_by_name (value, "document"); links = gjs_value_get_elements_by_tag_name (document, "link"); @@ -717,6 +740,8 @@ midori_web_view_init (MidoriWebView* web_view) g_object_connect (web_view, "signal::load-started", webkit_web_view_load_started, NULL, + "signal::window-object-cleared", + webkit_web_view_window_object_cleared_cb, NULL, "signal::load-committed", webkit_web_view_load_committed, NULL, "signal::icon-ready", From 2cb278cdb32ef13e6a2fe744a26c4a09294d6b50 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 27 Jul 2008 07:39:39 +0200 Subject: [PATCH 0227/2970] Add Midori and news-feed icons, improve waf scripts Add small, optimized application icons and an all new news-feed icon including optimized versions. The build scripts are updated, and the data folder renamed to icons. Plus the wscript_build is improved. Of course, Midori now tests the icon theme for news-feed and uses it. --- Makefile.am | 2 +- configure.in | 4 +- data/wscript_build | 38 ---- icons/16x16/midori.png | Bin 0 -> 937 bytes icons/16x16/news-feed.png | Bin 0 -> 832 bytes icons/22x22/midori.png | Bin 0 -> 1400 bytes icons/22x22/news-feed.png | Bin 0 -> 1249 bytes {data => icons}/Makefile.am | 2 +- {data => icons/scalable}/midori.svg | 0 icons/scalable/news-feed.svg | 280 ++++++++++++++++++++++++++++ icons/wscript_build | 47 +++++ midori/main.c | 1 + midori/main.h | 2 +- midori/midori-browser.c | 22 ++- wscript | 10 +- 15 files changed, 356 insertions(+), 52 deletions(-) delete mode 100644 data/wscript_build create mode 100644 icons/16x16/midori.png create mode 100644 icons/16x16/news-feed.png create mode 100644 icons/22x22/midori.png create mode 100644 icons/22x22/news-feed.png rename {data => icons}/Makefile.am (93%) rename {data => icons/scalable}/midori.svg (100%) create mode 100644 icons/scalable/news-feed.svg create mode 100644 icons/wscript_build diff --git a/Makefile.am b/Makefile.am index 5270e0d9..9a6151c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = katze midori po data +SUBDIRS = katze midori po icons desktopdir = $(datadir)/applications desktop_in_files = midori.desktop diff --git a/configure.in b/configure.in index 097f30ba..b4f78bab 100644 --- a/configure.in +++ b/configure.in @@ -52,7 +52,7 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) # Checks for gtksourceview -PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview, have_gtksourceview=true, have_gtksourceview=false) +PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0, have_gtksourceview=true, have_gtksourceview=false) AC_SUBST(GTKSOURCEVIEW_CFLAGS) AC_SUBST(GTKSOURCEVIEW_LIBS) @@ -92,6 +92,6 @@ AC_CONFIG_FILES([ katze/Makefile \ midori/Makefile \ po/Makefile.in \ - data/Makefile + icons/Makefile ]) AC_OUTPUT diff --git a/data/wscript_build b/data/wscript_build deleted file mode 100644 index 83fcaa08..00000000 --- a/data/wscript_build +++ /dev/null @@ -1,38 +0,0 @@ -#! /usr/bin/env python -# WAF build script for midori - -import os -import pproc as subprocess - -srcdir = os.getcwd () -blddir = bld.m_bdir - -install_files ('DATADIR', 'icons/hicolor/scalable/apps', 'midori.svg') - -if bld.env ()['CONVERT']: - def mkdir (path): - if not os.access (path, os.F_OK): - os.mkdir (path) - - mkdir (blddir + '/icons') - - for size in [16, 24, 32, 48]: - format = str (size) + 'x' + str (size) - if size < 32: - small = str ((size / 3)) + 'x' + str ((size / 3.5)) - else: - small = '0x0' - - mkdir (blddir + '/icons/' + format) - convert = subprocess.Popen (['convert', '-adaptive-sharpen', small, - '-background', 'transparent', - '-geometry', format, '-extent', format, - srcdir + '/data/midori.svg', - blddir + '/icons/' + format + '/midori.png'], - stderr=subprocess.PIPE) - if not convert.wait (): - install_files ('DATADIR', 'icons/hicolor/' + format + '/apps', - blddir + '/icons/' + format + '/midori.png') - else: - Params.pprint ('BLUE', "Optimized icons could not be created.") - break diff --git a/icons/16x16/midori.png b/icons/16x16/midori.png new file mode 100644 index 0000000000000000000000000000000000000000..578f6cb5a00118b1d5bc295d955977c2bb3fd4a2 GIT binary patch literal 937 zcmV;a16KTrP)wK#uy$q&+aG0vC#pC?2<+0MO~{pw@=u;06_om zuq!V2Dw6uX$V=O*X3fKF1`GCxZ8?JvG~{6px(_QGWKlUUQrA<_NR*ByZT}y zyUa$OBlJw9DKdQV^XUu!anKnja&s_pk}$q+N34fNTcQ{|KBSwql}|0xKE`acQBIg} ziAqRuDKh~60d&TR$E!4^SNWd|_rEp(x9mpz$f06YHx8tR*{Kct$g2V`e)rBBZ>v-3 z-}&XgvV8pqopC|~-r!hUOMAF?doQxa9A@s`E0oKXNoM2L#sPX!RXnke`af(~-?|Rz z^fdChV!jS&3at4=7L~SLuk_$v;Wk`?3!y+r;=p%FlIzEvTX)c&?K{=9HUiCRfMJ+e z`ZGHZ0Ce*~!g-a(k6+)jm*mTfFzh1oriK<@yD~iVEeIh}$y`RVa31q|3hO*EOs6wu zwPM@^0J^0;);G6s-_x`zjGC##D}<1$UcgxHEL=qu91);f1pt6RB=C-eg~eqa43hxB zxkR~Hl|2x65tpuA#$@Ua+|&<+`tXdr2kSju^^{a0fZ4fusET_jlVCLf;FtrRFap9+ zj8BfEb5jQv^}BdJ(1)SJC*iRob%0-5jm*p}BuPp>*l}RsR!j>#;b7<{cmZ&jgKCZg z<#|xWssq-zH(_dO8kI`rY8?>th0bKNIcMbhH3&q4Q8VGdLa|VS&)*1>82|vU5QMfw zkWBuvqG^@y>wrVM&n-T;v14HD=kZcavoV)hKv;en&8<&hc6J^r2_xF@GGf6uar*RG zL?Ww?XA*4rp!=-~C?CVGC+6cZp`VI5@d`@@w3;e`H3ZtVp|0tEpYcmOE zKe9~kef`o`zux(6AfGEpB9*Q)#;#CG-(rmYR4!|uWfJWEzx96u5FbvYYfsRx00000 LNkvXXu0mjfOOLK> literal 0 HcmV?d00001 diff --git a/icons/16x16/news-feed.png b/icons/16x16/news-feed.png new file mode 100644 index 0000000000000000000000000000000000000000..05363c5a9a8612b6cba1757decaedfb8d7c28c17 GIT binary patch literal 832 zcmV-G1Hb%_dv{xNPqk>5rYMj%?nsO|;#GuN}hOxr*g~L5vU-qCzaN z=plN-f+y|d^ww(>KJ0R)wlU2d8oKcHG5pYr$l`61g<0J7ab*7Yk|KHt9V~j{+!B?Z zUev$=<-8)KOE-y0igq{9Ejx*|eYoGg#!Y_;MP5=AD_Ca{>=ELsL8;irT|Z0q_YG{* zc0yx}xZ`Pxy)P3t)yY0T1|bKt^%6Bm0L%jnlCIhDz`+3>|F zvLD|=v_l*{jhNytega+HX!FGV1ku2-vh%~w;-5MLH@+j8`UtD`5=KwsralC}i1rNK zN8r{7tY{PV9!0nA!9s`Z%U99iV_4rX6w4%YSFu_X>#ie9w?G6lEHQ|xipUCFJB!R+ zA)UPd8jw3PkX6xvQRL5QSZ<+>LnIIOp=tz0Wa4D@&EWn=5BKk?NpWQgU7BCpjQ>@# zc`I)B|D%A8PbVssZ!)+BKEm69bbHd&2|Vnr$(0?&5OZ z4oAeyIQNnqNV4pMqKG3QYS-%NqE=4&Ke@R|b}7$`H(oh!7ybe76MU%xdKyXq0000< KMNUMnLSTXc=6s6) literal 0 HcmV?d00001 diff --git a/icons/22x22/midori.png b/icons/22x22/midori.png new file mode 100644 index 0000000000000000000000000000000000000000..85523e8fdf0d804d2d11ace7d08fc5cc1c9b034e GIT binary patch literal 1400 zcmV-;1&8{HP)U>z7+2+eavV<)&Cb~WB!H1d6WG2pN;{LhKY>Qi}6XTy{1C7pTKmRZ_n*Ldl+6hja2fpZxO8$&aCw;(3?H$FKk@095ciUrs44OC%D%sD8S8 zx`uxa%m&~UQM7Co1bzb{MhXCM92X>nd;;L}nf3n*dmFfAX=$mS3W89vXi-kQsA#c# z?b;1P)AasWOxvaF`VXp~8Xh0xn)!}-RutX_zBE1E{gtL^B^x)c=U1;@i92`h;n1Nk zqK07{h{xj}s(xw!K-p_4`@`Y!cL9{EetP|x9hdKL@3C6Ny|uN~mddK-5G_`mKi5J| zocKAcX~1Y$Jm@s$5};jSA4MdJsx5lVQmxx zw?c{I$A26*45LEz)846C#b%Sv7ZoioYHWN{Ja+6`Sgj)aM8+N;!`f`psnXKoo0^&`*XGSWftWfbCL$ynjRl^7W!ZKlH+Nyh z&bM9{AA~!h>pIeJdo11ChvN0zhyUY_*CXZQs5vWmxZpt`Wo&It(L@p-2yky{njAyWWv47D3L= z&H}+Ct~@x2zaF>4q$U{3KoV>i8w-m7`jW86$5bhbE4Qqygy{|3L_DFRKiZB68G&h1 z+?%+JLiY;9sENJ@t#}yfhG7_>l!BUoB*=(HHJGMpsD2tw!gjmdRA0Z&F&-NQr6wd< zLcX*V*B_mRnMi;bakLFw0Hpvm0Zf6@XP3MHfxs{rhUuO8!&uX#CAql^5t@7qr>r2- z&%=!ZWZDb<0Zc&Rok+FL2Q_K(ZhB{>crh?AI8F%Zng#2+o}G~~4;s;+*t2l-=+}rv zH3TOEFipT=aigxd5xymj$Z+JroCQ;4r+LxVb}I;=V#1hm8?1d9M&C$Mn;Mp3$;5|ZG+>C@*DhGFc-oW-kt8u0j-t%nbP`98<7s};p< zv5PKt`b$OQ<0vfjqPzPpQlIo9mFOAjKuOLD4EB#<-@XGOLP)9Vr~Us4PvKb{ z$K7mbST9ypy=W)Iz<1yOG;-tmO}E#ZH&k6+socHW6K`p`0z$|Z)lZw}qECgV@Di3~ zn^>0J!m{iHA*7j7x(C3^JkPz#FiZy_#zECjA3Y5PfWHBiW_UaJp%(oB00003Ntd+*-8?fZ+XuB)r5S(~M6P{^{S znIs~c+NXpFA&8)Yz%P+SR)~o8QKAS8LnzIpgp9HcGoe;1BQ)7ocUw)v-F4sYIcH{` zKAd~k-7=|xfthE{^Pm6of1Wvy5)lASZc?kX?>}dZYjYwgCop+Ram`e_15sKJiBi9W zdGlDTc@=&my}Jb!b|!5pAn8nT)8+Xr%!Z`8!Ov74w%3+~Y>RK;;-!Z&1hrmV&s7shK2^bsVhQ`S>HW3?F z<~uGuYXf#m}5I`5I4NQn0>H(Vv z6GEJy$hvrGBwI_|zKy7DD=L*u!VgD~kt;|z4B{rfcLIKKt4xHxdXCJ|7ZT=`&Dh#I zu#L;XOCw$i2}*HIZH(71CcWoD$Pe7G{6r=(78~Mn4dhquBwV=@)4U2b&`s*VCcJZ> zqT(??5FJ3KlIYR>kjmW<*a6xVrLYmAG|J?WAd9VAjJfLxqBXnGXFnl*XftZKKM7fT z$Su<`54?I4#>HJxSAG4}iC==`>WNpsiJ7*PVBdNq8cPoSGDYsJdN1nI4+STU%v%0W#sa!n72;yBG3K^M2siF0T=N#{^3V94uRt`MIAp4@ z3pe6-?VhlaE`v + +image/svg+xml \ No newline at end of file diff --git a/icons/wscript_build b/icons/wscript_build new file mode 100644 index 00000000..bbf8ad64 --- /dev/null +++ b/icons/wscript_build @@ -0,0 +1,47 @@ +#! /usr/bin/env python +# WAF build script for midori + +def add_image (bld, install_files, category, name): + import os + import pproc as subprocess + + srcdir = os.getcwd () + blddir = bld.m_bdir + + def mkdir (path): + if not os.access (path, os.F_OK): + os.mkdir (path) + + def _install_files (folder, destination, source): + try: + install_files (folder, destination, source) + except: + pass + + if bld.env ()['CONVERT']: + mkdir (blddir + '/icons') + + for size in [16, 22, 32, 48]: + format = str (size) + 'x' + str (size) + if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): + _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, + srcdir + '/icons/' + format + '/' + name + '.png') + elif not bld.env ()['CONVERT']: + pass + elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): + mkdir (blddir + '/icons/' + format) + convert = subprocess.Popen (['convert', + '-background', 'transparent', + '-geometry', format, '-extent', format, + srcdir + '/icons/scalable/' + name + '.svg', + blddir + '/icons/' + format + '/' + name + '.png'], + stderr=subprocess.PIPE) + if not convert.wait (): + _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, + blddir + '/icons/' + format + '/' + name + '.png') + else: + Params.pprint ('BLUE', "Optimized icons could not be created.") + break + +add_image (bld, install_files, 'apps', 'midori') +add_image (bld, install_files, 'status', 'news-feed') diff --git a/midori/main.c b/midori/main.c index 32f14517..c586d8ee 100644 --- a/midori/main.c +++ b/midori/main.c @@ -35,6 +35,7 @@ stock_items_init (void) { static GtkStockItem items[] = { + { STOCK_NEWS_FEED }, { STOCK_LOCK_OPEN }, { STOCK_LOCK_SECURE }, { STOCK_LOCK_BROKEN }, diff --git a/midori/main.h b/midori/main.h index f9fcf4df..29b1bb53 100644 --- a/midori/main.h +++ b/midori/main.h @@ -31,7 +31,7 @@ KatzeXbelItem* bookmarks; #define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ #define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */ -#define STOCK_NEWSFEED GTK_STOCK_INDEX +#define STOCK_NEWS_FEED "news-feed" /* We assume that these legacy icon names are usually present */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1d23ec7b..03511b79 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -71,6 +71,8 @@ struct _MidoriBrowser GtkWidget* statusbar; GtkWidget* progressbar; + const gchar* stock_news_feed; + gchar* statusbar_text; MidoriWebSettings* settings; GList* tab_titles; @@ -475,7 +477,7 @@ midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, { gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INDEX); + GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); } static gboolean @@ -3035,16 +3037,24 @@ static const gchar* ui_markup = ""; static void -midori_browser_realize_cb (GtkStyle* style, MidoriBrowser* browser) +midori_browser_realize_cb (GtkStyle* style, + MidoriBrowser* browser) { - GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (browser)); + GdkScreen* screen; + GtkIconTheme* icon_theme; + + screen = gtk_widget_get_screen (GTK_WIDGET (browser)); if (screen) { - GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + icon_theme = gtk_icon_theme_get_for_screen (screen); if (gtk_icon_theme_has_icon (icon_theme, "midori")) gtk_window_set_icon_name (GTK_WINDOW (browser), "midori"); else gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); + if (gtk_icon_theme_has_icon (icon_theme, STOCK_NEWS_FEED)) + browser->stock_news_feed = STOCK_NEWS_FEED; + else + browser->stock_news_feed = GTK_STOCK_INDEX; } } @@ -3120,6 +3130,8 @@ midori_browser_init (MidoriBrowser* browser) { GtkRcStyle* rcstyle; + browser->stock_news_feed = GTK_STOCK_INDEX; + /* Setup the window metrics */ g_signal_connect (browser, "realize", G_CALLBACK (midori_browser_realize_cb), browser); @@ -3233,7 +3245,7 @@ midori_browser_init (MidoriBrowser* browser) /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INDEX); + GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), GTK_ICON_ENTRY_SECONDARY, TRUE); diff --git a/wscript b/wscript index c42e0dca..cfef9ce5 100644 --- a/wscript +++ b/wscript @@ -65,7 +65,7 @@ def set_options (opt): help='Disables native language support', dest='disable_nls') def build (bld): - bld.add_subdirs ('katze midori data') + bld.add_subdirs ('katze midori icons') if bld.env ()['INTLTOOL']: bld.add_subdirs ('po') @@ -89,9 +89,11 @@ def shutdown (): if not Params.g_options.destdir: # update the pixmap cache directory try: - subprocess.call (['gtk-update-icon-cache', '-q', '-f', '-t', dir]) - Params.pprint ('YELLOW', "Updated Gtk icon cache.") - icon_cache_updated = True + uic = subprocess.Popen (['gtk-update-icon-cache', '-q', '-f', '-t', dir], + stderr=subprocess.PIPE) + if not uic.wait (): + Params.pprint ('YELLOW', "Updated Gtk icon cache.") + icon_cache_updated = True except: Params.pprint ('RED', "Failed to update icon cache.") if not icon_cache_updated: From d5341ec07cb7da20492cf7b2adedd7cd391ff90e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 27 Jul 2008 07:43:30 +0200 Subject: [PATCH 0228/2970] Update the different informative text files --- AUTHORS | 14 +++++++++++--- HACKING | 12 ++++++------ INSTALL | 55 ++++++++++++++++++++++++++++--------------------------- README | 6 ++++-- TODO | 11 +++++------ 5 files changed, 54 insertions(+), 44 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2ac5cbab..9cf0454f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,13 +7,21 @@ Artwork by: Translations: de: Enrico Tröger de: Christian Dywan + es: Miguel Anxo Bouzada + es: Christian Dywan fr: Christian Dywan fr: Adrien Nader + gl: Miguel Anxo Bouzada hu: SZERVÁC Attila pl: Przemysław Sitek sv: Mikael Magnusson Contributors: - Ori Bernstein - Przemek Sitek - Enrico Tröger + Ori Bernstein + Przemek Sitek + Enrico Tröger + Arnaud Renevier + Dale Whittaker + +Code from other projects: + GTK+/ GdkPixbuf, Matthias Clasen diff --git a/HACKING b/HACKING index c6248360..c1fd5339 100644 --- a/HACKING +++ b/HACKING @@ -18,7 +18,9 @@ Source file example: void foobar (FooEnum bar, const gchar* foo) { - if(!foo) + gint n, i; + + if (!foo) return; #ifdef BAR_STRICT @@ -29,8 +31,7 @@ Source file example: } #endif - // this is an example - gint n; + /* this is an example */ switch (bar) { case FOO_FOO: @@ -43,7 +44,6 @@ Source file example: n = 1; } - guint i; for (i = 0; i < n; i++) { g_print ("%s\n", foo); @@ -64,7 +64,7 @@ Header file example: #define BAR_STRICT #endif - // -- Types + /* Types */ typedef enum { @@ -78,7 +78,7 @@ Header file example: FooEnum foo_bar; } FooStruct; - // -- Declarations + /* Declarations */ void foo_bar (FooEnum bar, diff --git a/INSTALL b/INSTALL index cf9d62d9..9aa86c99 100644 --- a/INSTALL +++ b/INSTALL @@ -1,31 +1,32 @@ ++++ Installing Midori +++ + +Building and installing Midori is straightforward. + +Make sure you have Python 2.4 or higher installed. + +Change to the Midori folder on your hard disk in a terminal. + +Run './waf configure' + +Run './waf build' + +You can now run Midori from _build_/default/midori + +You can install it with './waf install' + +For further options run './waf --help' + ++++ The alternative +++ + +Alternatively, autotools build files are available. + If you checked out from the repository, make sure -you have *libtool* and *intltool* installed, then run +you have *libtool* and *intltool* installed. +Then run './autogen.sh'. -1. ./autogen.sh +Run './configure' -2. ./configure --enable-debug=yes +Run 'make' -3. make - -If you obtained midori in the form of a release tarball, -you need to perform the following steps in order to -build and install the program. - -1. Unpack the archive. - -2. Check build options with - ./configure --help - -3. Prepare for build with - ./configure - -4. Build midori with - make - -5. To install midori run either - (sudo) make install - or - (sudo) checkinstall - -6. For a list of command line options run - midori --help \ No newline at end of file +The usual autotools way works here, please refer to +according documentation in case of questions. diff --git a/README b/README index 2537f5c3..ce6f660f 100644 --- a/README +++ b/README @@ -14,7 +14,9 @@ Requirements: GTK+ 2.6, WebkitGtk, libXML2 For installation instructions read INSTALL. Please report comments, suggestions and bugs to: - Christian Dywan + http://www.twotoasts.de/bugs + +And join the IRC channel #midori on irc.freenode.net Check for new versions at: - http://software.twotoasts.de + http://www.twotoasts.de diff --git a/TODO b/TODO index dd6fda22..25ca1c19 100644 --- a/TODO +++ b/TODO @@ -1,12 +1,15 @@ TODO: + . Revamp bookmarks UI, including creating of bookmark folders + . Use an update timeout in KatzePropertyProxy instead of only focus-out + . Show a loading mouse pointer + . Support bookmarklets + . Scroll tabs w/o switching tabs . Import and export of the bookmarks file, or using one from a specific path . Save files on change as opposed to on quit . Middle click toolbuttons or menuitems should open new tabs . Implement support for userstyles - . Actual multiple window support, some things just ignore this currently . Custom context menu actions, like in Thunar or Epiphany . Custom tab names - . Identify and fix Gtk2.6 compatibility problems . Open an auto-vanishing findbox with '.' . Custom panels, loaded from (x)htm(l) files or websites . Drag tabs onto the panel to add them to the sidebar @@ -17,7 +20,6 @@ TODO: . Per-site settings accessible via statusbar icons, ie. cookies, popups, plugins . CookieSafe like, a list of cookies, with type, block, allow . Support mouse gestures (extension) - . Optional internal source view using gtksourceview? . Automatic update checks (browser, extensions)? . Auto-group tabs by opener, with colors? . Mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page @@ -25,7 +27,6 @@ TODO: . 'about:' uris: about, blank, cache, config, plugins . Panel of open tabs (with tree-structure), optional thumbnail-view . Spell check support - . Allow text and full page zoom (how do we incorporate it in the gui?) . Check specific bookmarks for updates automatically (extension) . Mark "new" as well as "actually modified" tabs specially (even over sessions) . Customizable toolbars, custom buttons (uri, title, icon)? @@ -33,7 +34,6 @@ TODO: . Use libnotify for events, e.g. download finished . Save screenshot of a document? . Right-click a textbox in a search form and choose 'add to websearch' - . Support extensions written in lua, possibly also Python? . Reuse running instance, probably via libunique . Honor design principle "no warnings but undo of backups"? . Support widgets 1.0 spec in tool windows and standalone? @@ -52,4 +52,3 @@ TODO: . Custom-mode, e.g. hide menubar and use help icon to have a help viewer . Prevent dead tabs: download, aborted page . On url load, for big files, ask "Open or save?" - . An option to not reuse the current tab when entering an url or searching From 6f3f0f9d3db8bfe1ad2d965a957edfa5ac0b498f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 28 Jul 2008 00:21:45 +0200 Subject: [PATCH 0229/2970] Build fix for < Gtk 2.12 and Glib < 2.16 --- midori/compat.c | 7 +++++++ midori/compat.h | 4 ++++ midori/midori-browser.c | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/midori/compat.c b/midori/compat.c index 5bd73b70..a1e90621 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -95,6 +95,13 @@ gdk_pixbuf_new_from_stream (GInputStream* stream, #if !GTK_CHECK_VERSION(2, 12, 0) +void +gtk_widget_set_has_tooltip (GtkWidget* widget, + gboolean has_tooltip) +{ + /* Do nothing */ +} + void gtk_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) diff --git a/midori/compat.h b/midori/compat.h index 415b6b74..5aec6163 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -35,6 +35,10 @@ gdk_pixbuf_new_from_stream (GInputStream* stream, #if !GTK_CHECK_VERSION(2, 12, 0) +void +gtk_widget_set_has_tooltip (GtkWidget* widget, + gboolean has_tooltip); + void gtk_widget_set_tooltip_text (GtkWidget* widget, const gchar* text); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 03511b79..ed61d531 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1843,10 +1843,10 @@ _action_source_view_activate (GtkAction* action, uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); contents = NULL; - tag = NULL; #if GLIB_CHECK_VERSION (2, 16, 0) file = g_file_new_for_uri (uri); + tag = NULL; #ifdef HAVE_GTKSOURCEVIEW content_type = NULL; #endif From 486aa8f5dc12be87980456a691d174929ed831cc Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Mon, 28 Jul 2008 00:34:58 +0200 Subject: [PATCH 0230/2970] Unref the current engine only if it is set --- midori/midori-searchentry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index de498d29..bc2ceff4 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -281,7 +281,8 @@ midori_search_entry_finalize (GObject* object) MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); g_object_unref (search_entry->search_engines); - g_object_unref (search_entry->current_item); + if (search_entry->current_item) + g_object_unref (search_entry->current_item); G_OBJECT_CLASS (midori_search_entry_parent_class)->finalize (object); } From b85bd2d3ef8c9e088ded65cc5e047d736a23566a Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Mon, 28 Jul 2008 15:21:08 +0200 Subject: [PATCH 0231/2970] Initial attempt at userscript include/ exclude directives --- midori/midori-addons.c | 243 +++++++++++++++++++++++++++++++++++++++-- midori/midori-addons.h | 3 +- 2 files changed, 235 insertions(+), 11 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 0bdd1334..4eefd0f6 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -1,5 +1,6 @@ /* Copyright (C) 2008 Christian Dywan + Copyright (C) 2008 Arnaud Renevier This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,7 @@ #include #include #include +#include struct _MidoriAddons { @@ -163,6 +165,204 @@ midori_addons_init (MidoriAddons* addons) gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0); } +#define HAVE_GREGEX GLIB_CHECK_VERSION (2, 14, 0) + +static gboolean +_include_exclude_from_file (const gchar* filename, + GSList** includes, + GSList** excludes) +{ + GIOChannel* channel; + gchar* line; + gboolean found_meta; + #if HAVE_GREGEX + GRegex* meta_re; + GMatchInfo* match_info; + #endif + gchar* meta_name; + + if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + return FALSE; + + channel = g_io_channel_new_file (filename, "r", 0); + if (!channel) + return FALSE; + + found_meta = FALSE; + /* FIXME: Implement this without GRegex for Glib < 2.14 */ + #if HAVE_GREGEX + meta_re = g_regex_new ( + "//[[:space:]]+@([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]*", + G_REGEX_OPTIMIZE, 0, NULL); + #endif + + while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) + == G_IO_STATUS_NORMAL) + { + if (g_str_has_prefix (line, "// ==UserScript==")) + { + found_meta = TRUE; + g_free (line); + continue; + } + #if HAVE_GREGEX + match_info = NULL; + #endif + meta_name = NULL; + if (found_meta) + { + if (g_str_has_prefix (line, "// ==/UserScript==")) + { + found_meta = FALSE; + g_free (line); + continue; + } + #if HAVE_GREGEX + if (g_regex_match (meta_re, line, 0, &match_info)) + { + meta_name = g_match_info_fetch (match_info, 1); + if (!strcmp (meta_name, "require") || + !strcmp (meta_name, "resource")) + { + /* We don't support these, so abort here */ + g_match_info_free (match_info); + g_free (meta_name); + g_free (line); + g_io_channel_shutdown (channel, false, 0); + g_regex_unref (meta_re); + g_slist_free (*includes); + g_slist_free (*excludes); + return FALSE; + } + else if (!strcmp (meta_name, "include")) + { + *includes = g_slist_prepend (*includes, + g_match_info_fetch (match_info, 2)); + } + else if (!strcmp (meta_name, "exclude")) + { + *excludes = g_slist_prepend (*excludes, + g_match_info_fetch (match_info, 2)); + } + } + #endif + } + #if HAVE_GREGEX + g_match_info_free (match_info); + #endif + g_free (meta_name); + g_free (line); + } + g_io_channel_shutdown (channel, false, 0); + g_io_channel_unref (channel); + #if HAVE_GREGEX + g_regex_unref (meta_re); + #endif + + return TRUE; +} + +static gchar* +_convert_to_simple_regexp (const gchar* pattern) +{ + guint len; + gchar* dest; + guint pos; + guint i; + gchar c; + + len = strlen (pattern); + dest = g_malloc0 (len * 2 + 1); + dest[0] = '^'; + pos = 1; + + for (i = 0; i < len; i++) + { + c = pattern[i]; + switch (c) + { + case '*': + dest[pos] = '.'; + dest[pos + 1] = c; + pos++; + pos++; + break; + case '.' : + case '?' : + case '^' : + case '$' : + case '+' : + case '{' : + case '[' : + case '|' : + case '(' : + case ')' : + case ']' : + case '\\' : + dest[pos] = '\\'; + dest[pos + 1] = c; + pos++; + pos++; + break; + case ' ' : + break; + default: + dest[pos] = pattern[i]; + pos ++; + } + } + return dest; +} + +static gboolean +_may_load_script (const gchar* uri, + GSList** includes, + GSList** excludes) +{ + gboolean match; + GSList* list; + gchar* re; + + if (*includes) + match = FALSE; + else + match = TRUE; + + list = *includes; + while (list) + { + re = _convert_to_simple_regexp (list->data); + #if HAVE_GREGEX + if (g_regex_match_simple (re, uri, 0, 0)) + { + match = TRUE; + break; + } + #endif + g_free (re); + list = list->next; + } + if (!match) + { + return FALSE; + } + list = *excludes; + while (list) + { + re = _convert_to_simple_regexp (list->data); + #if HAVE_GREGEX + if (g_regex_match_simple (re, uri, 0, 0)) + { + match = FALSE; + break; + } + #endif + g_free (re); + list = list->next; + } + return match; +} + static gboolean _js_script_from_file (JSContextRef js_context, const gchar* filename, @@ -199,21 +399,46 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, JSObjectRef js_window, MidoriAddons* addons) { + gchar* addon_path; + GDir* addon_dir; + const gchar* filename; + gchar* fullname; + GSList* includes; + GSList* excludes; + const gchar* uri; + gchar* exception; + gchar* message; + /* FIXME: We want to honor system installed addons as well */ - gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _folder_for_kind (addons->kind), NULL); - GDir* addon_dir = g_dir_open (addon_path, 0, NULL); - if (addon_dir) + addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, + _folder_for_kind (addons->kind), NULL); + if ((addon_dir = g_dir_open (addon_path, 0, NULL))) { - const gchar* filename; while ((filename = g_dir_read_name (addon_dir))) { - gchar* fullname = g_build_filename (addon_path, filename, NULL); - gchar* exception; + fullname = g_build_filename (addon_path, filename, NULL); + includes = NULL; + excludes = NULL; + if (!_include_exclude_from_file (fullname, &includes, &excludes)) + { + g_free (fullname); + continue; + } + if (includes || excludes) + { + uri = webkit_web_frame_get_uri (web_frame); + if (!_may_load_script (uri, &includes, &excludes)) + { + g_free (fullname); + continue; + } + } + g_slist_free (includes); + g_slist_free (excludes); + exception = NULL; if (!_js_script_from_file (js_context, fullname, &exception)) { - gchar* message = g_strdup_printf ("console.error ('%s');", - exception); + message = g_strdup_printf ("console.error ('%s');", exception); gjs_script_eval (js_context, message, NULL); g_free (message); g_free (exception); diff --git a/midori/midori-addons.h b/midori/midori-addons.h index 9bdb12d7..e58127aa 100644 --- a/midori/midori-addons.h +++ b/midori/midori-addons.h @@ -32,7 +32,6 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_ADDONS, MidoriAddonsClass)) typedef struct _MidoriAddons MidoriAddons; -typedef struct _MidoriAddonsPrivate MidoriAddonsPrivate; typedef struct _MidoriAddonsClass MidoriAddonsClass; struct _MidoriAddonsClass @@ -61,7 +60,7 @@ midori_addons_new (GtkWidget* web_widget, MidoriAddonKind kind); GtkWidget* -midori_addons_get_toolbar (MidoriAddons* console); +midori_addons_get_toolbar (MidoriAddons* console); G_END_DECLS From 6a32c9313857957675c01d182ad8a6932b794b83 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Wed, 30 Jul 2008 01:32:45 +0200 Subject: [PATCH 0232/2970] Improve location favicon updating --- midori/midori-locationentry.c | 91 ++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 33 deletions(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 27daba15..5fde078f 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -188,6 +188,33 @@ midori_location_entry_set_item (GtkTreeModel* model, g_free (desc); } +static void +midori_location_entry_set_active_iter (MidoriLocationEntry* location_entry, + GtkTreeIter* iter) +{ + GdkPixbuf* pixbuf; + GtkTreeModel* model; + GtkWidget* entry; + + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), iter); + + /* When setting the active iter (when adding or setting an item) + * The favicon may have change, so we must update the entry favicon. + */ + if (entry) + { + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); + + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, pixbuf); + + g_object_unref (pixbuf); + } +} + /** * midori_location_entry_new: * @@ -202,56 +229,51 @@ midori_location_entry_new (void) } /** - * midori_location_entry_item_index: + * midori_location_entry_item_iter: * @location_entry: a #MidoriLocationEntry * @uri: a string + * @iter: a GtkTreeIter * - * Gets the index of the item matching @uri. + * Retrieves the iter of the item matching @uri. * - * Return value: an integer + * Return value: %TRUE if @uri was found, %FALSE otherwise **/ -gint -midori_location_entry_item_index (MidoriLocationEntry* location_entry, - const gchar* uri) +gboolean +midori_location_entry_item_iter (MidoriLocationEntry* location_entry, + const gchar* uri, + GtkTreeIter* iter) { GtkTreeModel* model; - GtkTreeIter iter; - gint index; gchar* tmpuri; - gint tmpindex; + gboolean found; - g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), -1); - g_return_val_if_fail (uri != NULL, -1); + g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), FALSE); + g_return_val_if_fail (uri != NULL, FALSE); + found = FALSE; model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); - - index = -1; - if (gtk_tree_model_get_iter_first (model, &iter)) + if (gtk_tree_model_get_iter_first (model, iter)) { tmpuri = NULL; - tmpindex = 0; do { - gtk_tree_model_get (model, &iter, URI_COL, &tmpuri, -1); - if (g_ascii_strcasecmp (uri, tmpuri) == 0) - { - g_free (tmpuri); - index = tmpindex; - break; - } + gtk_tree_model_get (model, iter, URI_COL, &tmpuri, -1); + found = !g_ascii_strcasecmp (uri, tmpuri); g_free (tmpuri); - tmpindex++; + + if (found) + break; } - while (gtk_tree_model_iter_next (model, &iter)); + while (gtk_tree_model_iter_next (model, iter)); } - return index; + return found; } /** * midori_location_entry_get_text: * @location_entry: a #MidoriLocationEntry * - * Gets the entry text. + * Retrieves the text of the embedded entry. * * Return value: a string **/ @@ -322,16 +344,19 @@ void midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, const gchar* uri) { - gint index; + gboolean found; + GtkTreeIter iter; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - index = midori_location_entry_item_index ( - MIDORI_LOCATION_ENTRY (location_entry), uri); - gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), index); - - if(index == -1) + found = midori_location_entry_item_iter (MIDORI_LOCATION_ENTRY (location_entry), + uri, + &iter); + if(found) + midori_location_entry_set_active_iter (location_entry, &iter); + else midori_location_entry_clear (location_entry); + } /** @@ -377,6 +402,6 @@ midori_location_entry_add_item (MidoriLocationEntry* location_entry, gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); midori_location_entry_set_item (model, &iter, item); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), &iter); + midori_location_entry_set_active_iter (location_entry, &iter); } From 630e88d9afeb6eaf3609de82a6a738c0701bfe48 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Wed, 30 Jul 2008 01:34:37 +0200 Subject: [PATCH 0233/2970] Lookup favicons in 'link' tags via GJS --- midori/midori-webview.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 3f1423d2..1c79d386 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -342,7 +342,7 @@ file_info_finish_cb (GFile* icon_file, { icon = g_file_icon_new (icon_file); g_loadable_icon_load_async (G_LOADABLE_ICON (icon), - 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); + 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); return; } } @@ -467,18 +467,35 @@ gjs_value_links_foreach_cb (GjsValue* link, MidoriWebView* web_view) { const gchar* type; + const gchar* rel; + GFile* icon_file; + GIcon* icon; - if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "type") - && gjs_value_has_attribute (link, "href")) + if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "href")) { - type = gjs_value_get_attribute_string (link, "type"); - if (!strcmp (type, "application/rss+xml") - || !strcmp (type, "application/x.atom+xml") - || !strcmp (type, "application/atom+xml")) - g_signal_emit (web_view, signals[NEWS_FEED_READY], 0, - gjs_value_get_attribute_string (link, "href"), type, - gjs_value_has_attribute (link, "title") - ? gjs_value_get_attribute_string (link, "title") : NULL); + if (gjs_value_has_attribute (link, "type")) + { + type = gjs_value_get_attribute_string (link, "type"); + if (!strcmp (type, "application/rss+xml") + || !strcmp (type, "application/x.atom+xml") + || !strcmp (type, "application/atom+xml")) + g_signal_emit (web_view, signals[NEWS_FEED_READY], 0, + gjs_value_get_attribute_string (link, "href"), type, + gjs_value_has_attribute (link, "title") + ? gjs_value_get_attribute_string (link, "title") : NULL); + } + if (gjs_value_has_attribute (link, "rel")) + { + rel = gjs_value_get_attribute_string (link, "rel"); + if (!strcmp (rel, "icon") || !strcmp (rel, "shortcut icon")) + { + icon_file = g_file_new_for_uri ( + gjs_value_get_attribute_string (link, "href")); + icon = g_file_icon_new (icon_file); + g_loadable_icon_load_async (G_LOADABLE_ICON (icon), + 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); + } + } } } From bc85edacdf7e22ce70a0b7c5a6c97044c8b94198 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Wed, 30 Jul 2008 01:37:07 +0200 Subject: [PATCH 0234/2970] Simplify meta block parsing and support Glib < 2.14 --- midori/midori-addons.c | 153 ++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 63 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 4eefd0f6..15249ab8 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -165,21 +165,15 @@ midori_addons_init (MidoriAddons* addons) gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0); } -#define HAVE_GREGEX GLIB_CHECK_VERSION (2, 14, 0) - static gboolean _include_exclude_from_file (const gchar* filename, GSList** includes, GSList** excludes) { GIOChannel* channel; - gchar* line; gboolean found_meta; - #if HAVE_GREGEX - GRegex* meta_re; - GMatchInfo* match_info; - #endif - gchar* meta_name; + gchar* line; + gchar* rest_of_line; if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) return FALSE; @@ -189,79 +183,50 @@ _include_exclude_from_file (const gchar* filename, return FALSE; found_meta = FALSE; - /* FIXME: Implement this without GRegex for Glib < 2.14 */ - #if HAVE_GREGEX - meta_re = g_regex_new ( - "//[[:space:]]+@([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]*", - G_REGEX_OPTIMIZE, 0, NULL); - #endif while (g_io_channel_read_line (channel, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { if (g_str_has_prefix (line, "// ==UserScript==")) - { found_meta = TRUE; - g_free (line); - continue; - } - #if HAVE_GREGEX - match_info = NULL; - #endif - meta_name = NULL; - if (found_meta) + else if (found_meta) { if (g_str_has_prefix (line, "// ==/UserScript==")) - { found_meta = FALSE; - g_free (line); - continue; - } - #if HAVE_GREGEX - if (g_regex_match (meta_re, line, 0, &match_info)) + else if (g_str_has_prefix (line, "// @require") || + g_str_has_prefix (line, "// @resource")) { - meta_name = g_match_info_fetch (match_info, 1); - if (!strcmp (meta_name, "require") || - !strcmp (meta_name, "resource")) - { /* We don't support these, so abort here */ - g_match_info_free (match_info); - g_free (meta_name); g_free (line); g_io_channel_shutdown (channel, false, 0); - g_regex_unref (meta_re); g_slist_free (*includes); g_slist_free (*excludes); return FALSE; - } - else if (!strcmp (meta_name, "include")) - { - *includes = g_slist_prepend (*includes, - g_match_info_fetch (match_info, 2)); - } - else if (!strcmp (meta_name, "exclude")) - { - *excludes = g_slist_prepend (*excludes, - g_match_info_fetch (match_info, 2)); - } - } - #endif + } + else if (g_str_has_prefix (line, "// @include")) + { + rest_of_line = g_strdup (line + strlen ("// @include")); + rest_of_line = g_strstrip (rest_of_line); + *includes = g_slist_prepend (*includes, rest_of_line); + } + else if (g_str_has_prefix (line, "// @exclude")) + { + rest_of_line = g_strdup (line + strlen ("// @exclude")); + rest_of_line = g_strstrip (rest_of_line); + *excludes = g_slist_prepend (*excludes, rest_of_line); + } } - #if HAVE_GREGEX - g_match_info_free (match_info); - #endif - g_free (meta_name); g_free (line); } g_io_channel_shutdown (channel, false, 0); g_io_channel_unref (channel); - #if HAVE_GREGEX - g_regex_unref (meta_re); - #endif return TRUE; } +#define HAVE_GREGEX GLIB_CHECK_VERSION (2, 14, 0) + +#if HAVE_GREGEX static gchar* _convert_to_simple_regexp (const gchar* pattern) { @@ -313,6 +278,35 @@ _convert_to_simple_regexp (const gchar* pattern) } return dest; } +#else +static bool +_match_with_wildcard (const gchar* str, + const gchar* pattern) +{ + gchar** parts; + gchar** parts_ref; + const gchar* subpart; + gchar* newsubpart; + + parts = g_strsplit (pattern, "*", 0); + parts_ref = parts; + subpart = str; + do + { + newsubpart = g_strstr_len (subpart, strlen (subpart), *parts); + if (!newsubpart) + { + g_strfreev (parts_ref); + return FALSE; + } + subpart = newsubpart + strlen (*parts); + parts++; + } + while (*parts); + g_strfreev (parts_ref); + return TRUE; +} +#endif static gboolean _may_load_script (const gchar* uri, @@ -321,7 +315,12 @@ _may_load_script (const gchar* uri, { gboolean match; GSList* list; + #if HAVE_GREGEX gchar* re; + #else + guint uri_len; + guint pattern_len; + #endif if (*includes) match = FALSE; @@ -329,17 +328,32 @@ _may_load_script (const gchar* uri, match = TRUE; list = *includes; + #if !HAVE_GREGEX + uri_len = strlen (uri); + #endif while (list) { - re = _convert_to_simple_regexp (list->data); #if HAVE_GREGEX + re = _convert_to_simple_regexp (list->data); if (g_regex_match_simple (re, uri, 0, 0)) { match = TRUE; break; } - #endif g_free (re); + #else + pattern_len = strlen (list->data); + if (!g_ascii_strncasecmp (uri, list->data, MAX (uri_len, pattern_len))) + { + match = TRUE; + break; + } + else if (_match_with_wildcard (uri, list->data)) + { + match = TRUE; + break; + } + #endif list = list->next; } if (!match) @@ -349,15 +363,27 @@ _may_load_script (const gchar* uri, list = *excludes; while (list) { - re = _convert_to_simple_regexp (list->data); #if HAVE_GREGEX + re = _convert_to_simple_regexp (list->data); if (g_regex_match_simple (re, uri, 0, 0)) { match = FALSE; break; } - #endif g_free (re); + #else + pattern_len = strlen (list->data); + if (!g_ascii_strncasecmp (uri, list->data, MAX (uri_len, pattern_len))) + { + match = FALSE; + break; + } + else if (_match_with_wildcard (uri, list->data)) + { + match = FALSE; + break; + } + #endif list = list->next; } return match; @@ -409,6 +435,10 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, gchar* exception; gchar* message; + uri = webkit_web_frame_get_uri (web_frame); + if (!uri) + return; + /* FIXME: We want to honor system installed addons as well */ addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, _folder_for_kind (addons->kind), NULL); @@ -425,14 +455,11 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, continue; } if (includes || excludes) - { - uri = webkit_web_frame_get_uri (web_frame); if (!_may_load_script (uri, &includes, &excludes)) { g_free (fullname); continue; } - } g_slist_free (includes); g_slist_free (excludes); exception = NULL; From e9e29e92f6c0ca386a17b85d759f4e60ee708a11 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 1 Aug 2008 15:40:23 +0200 Subject: [PATCH 0235/2970] Restrict addons to files with particular extensions --- midori/main.c | 3 + midori/midori-addons.c | 257 ++++++++++++++++++++++++++++++++++++----- midori/midori-addons.h | 17 ++- 3 files changed, 249 insertions(+), 28 deletions(-) diff --git a/midori/main.c b/midori/main.c index c586d8ee..a18028f6 100644 --- a/midori/main.c +++ b/midori/main.c @@ -622,6 +622,9 @@ main (int argc, const gchar* filename; while ((filename = g_dir_read_name (addon_dir))) { + if (!g_str_has_prefix (filename, ".midori.js")) + continue; + gchar* fullname = g_build_filename (addon_path, filename, NULL); gchar* exception = NULL; gjs_script_from_file (js_context, fullname, &exception); diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 15249ab8..731b8846 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -25,6 +25,7 @@ struct _MidoriAddons { GtkVBox parent_instance; + GtkWidget* web_widget; MidoriAddonKind kind; GtkWidget* toolbar; GtkWidget* treeview; @@ -32,6 +33,26 @@ struct _MidoriAddons G_DEFINE_TYPE (MidoriAddons, midori_addons, GTK_TYPE_VBOX) +enum +{ + PROP_0, + + PROP_WEB_WIDGET, + PROP_KIND +}; + +static void +midori_addons_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_addons_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + GType midori_addon_kind_get_type (void) { @@ -39,6 +60,7 @@ midori_addon_kind_get_type (void) if (!type) { static const GEnumValue values[] = { + { MIDORI_ADDON_NONE, "MIDORI_ADDON_NONE", N_("None") }, { MIDORI_ADDON_EXTENSIONS, "MIDORI_ADDON_EXTENSIONS", N_("Extensions") }, { MIDORI_ADDON_USER_SCRIPTS, "MIDORI_USER_SCRIPTS", N_("Userscripts") }, { MIDORI_ADDON_USER_STYLES, "MIDORI_USER_STYLES", N_("Userstyles") }, @@ -52,13 +74,83 @@ midori_addon_kind_get_type (void) static void midori_addons_class_init (MidoriAddonsClass* class) { - /* Nothing to do */ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_addons_set_property; + gobject_class->get_property = midori_addons_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_WEB_WIDGET, + g_param_spec_object ( + "web-widget", + _("Web Widget"), + _("The assigned web widget"), + GTK_TYPE_WIDGET, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_KIND, + g_param_spec_enum ( + "kind", + _("Kind"), + _("The kind of addons"), + MIDORI_TYPE_ADDON_KIND, + MIDORI_ADDON_NONE, + flags)); } -static const -gchar* _folder_for_kind (MidoriAddonKind kind) +static void +midori_addons_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) { - switch (kind) + MidoriAddons* addons = MIDORI_ADDONS (object); + + switch (prop_id) + { + case PROP_WEB_WIDGET: + midori_addons_set_web_widget (addons, g_value_get_object (value)); + break; + case PROP_KIND: + midori_addons_set_kind (addons, g_value_get_enum (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_addons_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriAddons* addons = MIDORI_ADDONS (object); + + switch (prop_id) + { + case PROP_WEB_WIDGET: + g_value_set_object (value, midori_addons_get_web_widget (addons)); + break; + case PROP_KIND: + g_value_set_enum (value, midori_addons_get_kind (addons)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static const gchar* +_addons_get_folder (MidoriAddons* addons) +{ + switch (addons->kind) { case MIDORI_ADDON_EXTENSIONS: return "extensions"; @@ -71,6 +163,22 @@ gchar* _folder_for_kind (MidoriAddonKind kind) } } +static const gchar* +_addons_get_extension (MidoriAddons* addons) +{ + switch (addons->kind) + { + case MIDORI_ADDON_EXTENSIONS: + return ".midori.js"; + case MIDORI_ADDON_USER_SCRIPTS: + return ".user.js"; + case MIDORI_ADDON_USER_STYLES: + return ".user.css"; + default: + return NULL; + } +} + static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) @@ -80,7 +188,7 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "Put scripts in the folder ~/.local/share/midori/%s", - _folder_for_kind (addons->kind)); + _addons_get_folder (addons)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -144,6 +252,8 @@ midori_addons_init (MidoriAddons* addons) GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; + addons->web_widget = NULL; + addons->treeview = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (addons->treeview), FALSE); column = gtk_tree_view_column_new (); @@ -441,11 +551,14 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, /* FIXME: We want to honor system installed addons as well */ addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _folder_for_kind (addons->kind), NULL); + _addons_get_folder (addons), NULL); if ((addon_dir = g_dir_open (addon_path, 0, NULL))) { while ((filename = g_dir_read_name (addon_dir))) { + if (!g_str_has_suffix (filename, _addons_get_extension (addons))) + continue; + fullname = g_build_filename (addon_path, filename, NULL); includes = NULL; excludes = NULL; @@ -480,45 +593,113 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, * midori_addons_new: * @web_widget: a web widget * @kind: the kind of addon - * @extension: a file extension mask * * Creates a new addons widget. * * @web_widget can be one of the following: * %MidoriBrowser, %MidoriWebView, %WebKitWebView * - * Note: Currently @extension has no effect. - * * Return value: a new #MidoriAddons **/ GtkWidget* midori_addons_new (GtkWidget* web_widget, MidoriAddonKind kind) { + MidoriAddons* addons; + g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL); - MidoriAddons* addons = g_object_new (MIDORI_TYPE_ADDONS, - /* "kind", kind, */ - NULL); + addons = g_object_new (MIDORI_TYPE_ADDONS, + /* "web-widget", web_widget, + "kind", kind, */ NULL); + addons->web_widget = web_widget; + midori_addons_set_kind (addons, kind); + + return GTK_WIDGET (addons); +} + +/** + * midori_addons_set_web_widget: + * @addons: a #MidoriAddons + * @web_widget: a web widget + * + * Sets the assigned web widget. Basically any widget + * with a window-object-cleared qualifies as such. + * + * Note: This may only be set once. + **/ +void +midori_addons_set_web_widget (MidoriAddons* addons, + GtkWidget* web_widget) +{ + g_return_if_fail (MIDORI_IS_ADDONS (addons)); + g_return_if_fail (GTK_IS_WIDGET (addons)); + g_return_if_fail (g_signal_lookup ("window-object-cleared", G_TYPE_FROM_INSTANCE (web_widget))); + + /* FIXME: Implement this */ +} + +/** + * midori_addons_get_web_widget: + * @addons: a #MidoriAddons + * + * Determines the assigned web widget. + * + * Return value: a web widget + **/ +GtkWidget* +midori_addons_get_web_widget (MidoriAddons* addons) +{ + return addons->web_widget; +} + +/** + * midori_addons_set_kind: + * @addons: a #MidoriAddons + * @kind: a #MidoriAddonKind + * + * Sets the kind of addons. + * + * Note: This may only be set once. + **/ +void +midori_addons_set_kind (MidoriAddons* addons, + MidoriAddonKind kind) +{ + GtkListStore* liststore; + gchar* addon_path; + GDir* addon_dir; + const gchar* filename; + GtkTreeIter iter; + + g_return_if_fail (MIDORI_IS_ADDONS (addons)); + g_return_if_fail (addons->kind == MIDORI_ADDON_NONE); + + if (kind == MIDORI_ADDON_NONE) + return; + + g_return_if_fail (addons->web_widget); addons->kind = kind; + if (kind == MIDORI_ADDON_USER_SCRIPTS) - g_signal_connect (web_widget, "window-object-cleared", + g_signal_connect (addons->web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); - GtkListStore* liststore = gtk_list_store_new (3, G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING); + liststore = gtk_list_store_new (3, G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING); /* FIXME: We want to honor system installed addons as well */ - gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _folder_for_kind (addons->kind), NULL); - GDir* addon_dir = g_dir_open (addon_path, 0, NULL); + addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, + _addons_get_folder (addons), NULL); + addon_dir = g_dir_open (addon_path, 0, NULL); if (addon_dir) { - const gchar* filename; while ((filename = g_dir_read_name (addon_dir))) { - GtkTreeIter iter; + if (!g_str_has_suffix (filename, _addons_get_extension (addons))) + continue; + gtk_list_store_append (liststore, &iter); gtk_list_store_set (liststore, &iter, 0, filename, 1, 0, 2, "", -1); @@ -528,28 +709,46 @@ midori_addons_new (GtkWidget* web_widget, gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), GTK_TREE_MODEL (liststore)); - return GTK_WIDGET (addons); + g_object_notify (G_OBJECT (addons), "kind"); +} + +/** + * midori_addons_get_kind: + * @addons: a #MidoriAddons + * + * Determines the kind of addons. + * + * Return value: a #MidoriAddonKind + **/ +MidoriAddonKind +midori_addons_get_kind (MidoriAddons* addons) +{ + return addons->kind; } /** * midori_addons_get_toolbar: + * @addons: a #MidoriAddons * - * Retrieves the toolbar of the addons. A new widget is created on - * the first call of this function. + * Retrieves the toolbar of the addons. A new widget + * is created on the first call of this function. * - * Return value: a new #MidoriAddons + * Return value: a toolbar widget **/ GtkWidget* midori_addons_get_toolbar (MidoriAddons* addons) { + GtkWidget* toolbar; + GtkToolItem* toolitem; + g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL); if (!addons->toolbar) { - GtkWidget* toolbar = gtk_toolbar_new (); + toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - GtkToolItem* toolitem = gtk_tool_item_new (); + toolitem = gtk_tool_item_new (); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); toolitem = gtk_separator_tool_item_new (); @@ -565,6 +764,10 @@ midori_addons_get_toolbar (MidoriAddons* addons) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); addons->toolbar = toolbar; + + g_signal_connect (addons->toolbar, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &addons->toolbar); } return addons->toolbar; diff --git a/midori/midori-addons.h b/midori/midori-addons.h index e58127aa..f141b78d 100644 --- a/midori/midori-addons.h +++ b/midori/midori-addons.h @@ -41,6 +41,7 @@ struct _MidoriAddonsClass typedef enum { + MIDORI_ADDON_NONE, MIDORI_ADDON_EXTENSIONS, MIDORI_ADDON_USER_SCRIPTS, MIDORI_ADDON_USER_STYLES @@ -59,8 +60,22 @@ GtkWidget* midori_addons_new (GtkWidget* web_widget, MidoriAddonKind kind); +void +midori_addons_set_web_widget (MidoriAddons* addons, + GtkWidget* web_widget); + GtkWidget* -midori_addons_get_toolbar (MidoriAddons* console); +midori_addons_get_web_widget (MidoriAddons* addons); + +void +midori_addons_set_kind (MidoriAddons* addons, + MidoriAddonKind kind); + +MidoriAddonKind +midori_addons_get_kind (MidoriAddons* addons); + +GtkWidget* +midori_addons_get_toolbar (MidoriAddons* addons); G_END_DECLS From 947761c32d295a394d65bb5c2b8d97112463f377 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 1 Aug 2008 15:43:24 +0200 Subject: [PATCH 0236/2970] Capitalize Midori in --version output --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index a18028f6..936967b5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -410,7 +410,7 @@ main (int argc, "\t%s\n\n" "%s\n" "\thttp://software.twotoasts.de\n", - _("midori"), PACKAGE_VERSION, + _("Midori"), PACKAGE_VERSION, _("Please report comments, suggestions and bugs to:"), PACKAGE_BUGREPORT, _("Check for new versions at:") From 68fe5e05e18b4b931de6afab32519d8ad76bd1dd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 1 Aug 2008 15:49:47 +0200 Subject: [PATCH 0237/2970] Use icons for Script and Extension --- midori/main.c | 1 + midori/main.h | 1 + midori/midori-browser.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/midori/main.c b/midori/main.c index 936967b5..4f89a358 100644 --- a/midori/main.c +++ b/midori/main.c @@ -35,6 +35,7 @@ stock_items_init (void) { static GtkStockItem items[] = { + { STOCK_EXTENSION }, { STOCK_NEWS_FEED }, { STOCK_LOCK_OPEN }, { STOCK_LOCK_SECURE }, diff --git a/midori/main.h b/midori/main.h index 29b1bb53..6cf216ce 100644 --- a/midori/main.h +++ b/midori/main.h @@ -30,6 +30,7 @@ KatzeXbelItem* bookmarks; in order to reduce the amount of warnings */ #define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ +#define STOCK_EXTENSION GTK_STOCK_EXECUTE /* "extension" */ #define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */ #define STOCK_NEWS_FEED "news-feed" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ed61d531..32522158 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3456,7 +3456,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - "", _("Userscripts")); + STOCK_SCRIPT, _("Userscripts")); /* Userstyles */ /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); @@ -3466,6 +3466,15 @@ midori_browser_init (MidoriBrowser* browser) panel, toolbar, "", _("Userstyles"));*/ + /* Extensions */ + panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); + gtk_widget_show (panel); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (browser->panel), + panel, toolbar, + STOCK_EXTENSION, _("Extensions")); + /* Notebook, containing all web_views */ browser->notebook = gtk_notebook_new (); /* Remove the inner border between scrollbars and the window border */ @@ -3560,15 +3569,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar, FALSE, FALSE, 3); - /* Extensions */ - panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); - gtk_widget_show (panel); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, toolbar, - "", _("Extensions")); - g_object_unref (ui_manager); #if !GLIB_CHECK_VERSION (2, 16, 0) From f210b90ff93b1dec01160b0f84bc57b6f8c19dfb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 Aug 2008 04:21:38 +0200 Subject: [PATCH 0238/2970] Tidy up redrawing and notifications in KatzeThrobber --- katze/katze-throbber.c | 125 ++++++++++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 44 deletions(-) diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 835d53d3..34f3510b 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2008 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -130,7 +130,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ICON_SIZE, g_param_spec_int ( "icon-size", - "Icon size", + _("Icon size"), _("Symbolic size to use for the animation"), 0, G_MAXINT, GTK_ICON_SIZE_MENU, flags)); @@ -139,7 +139,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ICON_NAME, g_param_spec_string ( "icon-name", - "Icon Name", + _("Icon Name"), _("The name of an icon containing animation frames"), "process-working", flags)); @@ -148,7 +148,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_PIXBUF, g_param_spec_object ( "pixbuf", - "Pixbuf", + _("Pixbuf"), _("A GdkPixbuf containing animation frames"), GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -157,7 +157,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ANIMATED, g_param_spec_boolean ( "animated", - "Animated", + _("Animated"), _("Whether the throbber should be animated"), FALSE, flags)); @@ -166,7 +166,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_STATIC_ICON_NAME, g_param_spec_string ( "static-icon-name", - "Static Icon Name", + _("Static Icon Name"), _("The name of an icon to be used as the static image"), NULL, flags)); @@ -175,7 +175,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_PIXBUF, g_param_spec_object ( "static-pixbuf", - "Static Pixbuf", + _("Static Pixbuf"), _("A GdkPixbuf to be used as the static image"), GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -184,7 +184,7 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_STATIC_STOCK_ID, g_param_spec_string ( "static-stock-id", - "Static Stock ID", + _("Static Stock ID"), _("The stock ID of an icon to be used as the static image"), NULL, flags)); @@ -261,10 +261,10 @@ katze_throbber_set_property (GObject* object, } static void -katze_throbber_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) +katze_throbber_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) { KatzeThrobber* throbber = KATZE_THROBBER (object); @@ -326,14 +326,20 @@ void katze_throbber_set_icon_size (KatzeThrobber* throbber, GtkIconSize icon_size) { + GtkSettings* gtk_settings; + g_return_if_fail (KATZE_IS_THROBBER (throbber)); - g_return_if_fail (gtk_icon_size_lookup (icon_size, - &throbber->width, - &throbber->height)); + gtk_settings = gtk_widget_get_settings (GTK_WIDGET (throbber)); + g_return_if_fail (gtk_icon_size_lookup_for_settings (gtk_settings, + icon_size, + &throbber->width, + &throbber->height)); throbber->icon_size = icon_size; g_object_notify (G_OBJECT (throbber), "icon-size"); + + gtk_widget_queue_draw (GTK_WIDGET (throbber)); } /** @@ -375,20 +381,24 @@ katze_throbber_set_pixbuf (KatzeThrobber* throbber, GdkPixbuf* pixbuf) { g_return_if_fail (KATZE_IS_THROBBER (throbber)); - g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); + g_return_if_fail (!pixbuf || GDK_IS_PIXBUF (pixbuf)); katze_object_assign (throbber->pixbuf, pixbuf); + g_object_freeze_notify (G_OBJECT (throbber)); + if (pixbuf) { g_object_ref (pixbuf); katze_assign (throbber->icon_name, NULL); + g_object_notify (G_OBJECT (throbber), "icon-name"); } gtk_widget_queue_draw (GTK_WIDGET (throbber)); g_object_notify (G_OBJECT (throbber), "pixbuf"); + g_object_thaw_notify (G_OBJECT (throbber)); } /** @@ -438,14 +448,20 @@ katze_throbber_set_static_icon_name (KatzeThrobber* throbber, katze_assign (throbber->static_icon_name, g_strdup (icon_name)); + g_object_freeze_notify (G_OBJECT (throbber)); + if (icon_name) { katze_assign (throbber->static_stock_id, NULL); icon_theme_changed (throbber); + + g_object_notify (G_OBJECT (throbber), "static-pixbuf"); + g_object_notify (G_OBJECT (throbber), "static-stock-id"); } g_object_notify (G_OBJECT (throbber), "static-icon-name"); + g_object_thaw_notify (G_OBJECT (throbber)); } /** @@ -468,15 +484,23 @@ katze_throbber_set_static_pixbuf (KatzeThrobber* throbber, katze_object_assign (throbber->static_pixbuf, pixbuf); + g_object_freeze_notify (G_OBJECT (throbber)); + if (pixbuf) { g_object_ref (pixbuf); katze_assign (throbber->static_icon_name, NULL); katze_assign (throbber->static_stock_id, NULL); + + gtk_widget_queue_draw (GTK_WIDGET (throbber)); + + g_object_notify (G_OBJECT (throbber), "static-icon-name"); + g_object_notify (G_OBJECT (throbber), "static-stock-id"); } g_object_notify (G_OBJECT (throbber), "static-pixbuf"); + g_object_thaw_notify (G_OBJECT (throbber)); } /** @@ -486,18 +510,23 @@ katze_throbber_set_static_pixbuf (KatzeThrobber* throbber, * * Sets the stock ID of an icon that should provide the static image. * - * The statc icon name and pixbuf are automatically invalidated. + * The static icon name and pixbuf are automatically invalidated. **/ void -katze_throbber_set_static_stock_id (KatzeThrobber* throbber, - const gchar* stock_id) +katze_throbber_set_static_stock_id (KatzeThrobber* throbber, + const gchar* stock_id) { g_return_if_fail (KATZE_IS_THROBBER (throbber)); + g_object_freeze_notify (G_OBJECT (throbber)); + if (stock_id) { GtkStockItem stock_item; g_return_if_fail (gtk_stock_lookup (stock_id, &stock_item)); + + g_object_notify (G_OBJECT (throbber), "static-icon-name"); + g_object_notify (G_OBJECT (throbber), "static-pixbuf"); } katze_assign (throbber->static_stock_id, g_strdup (stock_id)); @@ -506,6 +535,7 @@ katze_throbber_set_static_stock_id (KatzeThrobber* throbber, icon_theme_changed (throbber); g_object_notify (G_OBJECT (throbber), "static-stock-id"); + g_object_thaw_notify (G_OBJECT (throbber)); } /** @@ -637,13 +667,8 @@ katze_throbber_realize (GtkWidget* widget) static void katze_throbber_unrealize (GtkWidget* widget) { - KatzeThrobber* throbber = KATZE_THROBBER (widget); - if (GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize) GTK_WIDGET_CLASS (katze_throbber_parent_class)->unrealize (widget); - - katze_object_assign (throbber->pixbuf, NULL); - katze_object_assign (throbber->static_pixbuf, NULL); } static void @@ -651,11 +676,14 @@ pixbuf_assign_icon (GdkPixbuf** pixbuf, const gchar* icon_name, KatzeThrobber* throbber) { + GdkScreen* screen; + GtkIconTheme* icon_theme; + if (*pixbuf) g_object_unref (*pixbuf); - GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (throbber)); - GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen); + screen = gtk_widget_get_screen (GTK_WIDGET (throbber)); + icon_theme = gtk_icon_theme_get_for_screen (screen); *pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, MAX (throbber->width, throbber->height), @@ -667,22 +695,23 @@ static void icon_theme_changed (KatzeThrobber* throbber) { if (throbber->icon_name) - pixbuf_assign_icon (&throbber->pixbuf, throbber->icon_name, - throbber); + pixbuf_assign_icon (&throbber->pixbuf, + throbber->icon_name, throbber); if (throbber->static_icon_name) - pixbuf_assign_icon (&throbber->static_pixbuf, throbber->static_icon_name, - throbber); + pixbuf_assign_icon (&throbber->static_pixbuf, + throbber->static_icon_name, throbber); else if (throbber->static_stock_id) - { - if (throbber->static_pixbuf) - g_object_unref (throbber->static_pixbuf); + katze_object_assign (throbber->static_pixbuf, + gtk_widget_render_icon (GTK_WIDGET (throbber), + throbber->static_stock_id, + throbber->icon_size, + NULL)); - throbber->static_pixbuf = gtk_widget_render_icon (GTK_WIDGET (throbber), - throbber->static_stock_id, - throbber->icon_size, - NULL); - } + g_object_freeze_notify (G_OBJECT (throbber)); + g_object_notify (G_OBJECT (throbber), "pixbuf"); + g_object_notify (G_OBJECT (throbber), "static-pixbuf"); + g_object_thaw_notify (G_OBJECT (throbber)); gtk_widget_queue_draw (GTK_WIDGET (throbber)); } @@ -765,8 +794,8 @@ katze_throbber_expose_event (GtkWidget* widget, if (throbber->animated && !throbber->pixbuf && !throbber->icon_name) return TRUE; - if (!throbber->animated && - (throbber->static_pixbuf || throbber->static_icon_name || throbber->static_stock_id)) + if (!throbber->animated && (throbber->static_pixbuf + || throbber->static_icon_name || throbber->static_stock_id)) { if (G_UNLIKELY (!throbber->static_pixbuf && throbber->static_icon_name)) { @@ -774,9 +803,10 @@ katze_throbber_expose_event (GtkWidget* widget, if (!throbber->static_pixbuf) { - g_warning ("Named icon '%s' couldn't be loaded", + g_warning (_("Named icon '%s' couldn't be loaded"), throbber->static_icon_name); katze_assign (throbber->static_icon_name, NULL); + g_object_notify (G_OBJECT (throbber), "static-icon-name"); return TRUE; } } @@ -786,9 +816,10 @@ katze_throbber_expose_event (GtkWidget* widget, if (!throbber->static_pixbuf) { - g_warning ("Stock icon '%s' couldn't be loaded", + g_warning (_("Stock icon '%s' couldn't be loaded"), throbber->static_stock_id); katze_assign (throbber->static_stock_id, NULL); + g_object_notify (G_OBJECT (throbber), "static-stock-id"); return TRUE; } } @@ -808,8 +839,9 @@ katze_throbber_expose_event (GtkWidget* widget, if (!throbber->pixbuf) { - g_warning ("Icon '%s' couldn't be loaded", throbber->icon_name); + g_warning (_("Icon '%s' couldn't be loaded"), throbber->icon_name); katze_assign (throbber->icon_name, NULL); + g_object_notify (G_OBJECT (throbber), "icon-name"); return TRUE; } } @@ -839,9 +871,14 @@ katze_throbber_expose_event (GtkWidget* widget, } else { - g_warning ("Animation frames are broken"); + g_warning (_("Animation frames are broken")); katze_assign (throbber->icon_name, NULL); katze_object_assign (throbber->pixbuf, NULL); + + g_object_freeze_notify (G_OBJECT (throbber)); + g_object_notify (G_OBJECT (throbber), "icon-name"); + g_object_notify (G_OBJECT (throbber), "pixbuf"); + g_object_thaw_notify (G_OBJECT (throbber)); } } From e971c12c0b7b5365bf8187e0d6e57c2af17af091 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 Aug 2008 04:25:05 +0200 Subject: [PATCH 0239/2970] Show news feeds in a menu if the icon is clicked --- midori/midori-browser.c | 106 +++++++++++++++++++++++++++++----- midori/midori-locationentry.c | 20 +------ midori/midori-webview.c | 36 ++++++++++-- midori/midori-webview.h | 4 ++ 4 files changed, 127 insertions(+), 39 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 32522158..c25ddfce 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -24,6 +24,7 @@ #include "midori-searchentry.h" #include "midori-locationentry.h" #include "compat.h" +#include "gjs.h" #if GLIB_CHECK_VERSION (2, 16, 0) #include @@ -289,10 +290,16 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_show (browser->progressbar); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); - /* FIXME show news feed icon if feeds are available */ - /* gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( + + /* FIXME: This won't work due to a bug in GtkIconEntry */ + /* if (web_view && midori_web_view_get_news_feeds (MIDORI_WEB_VIEW (web_view))) + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, NULL); */ + GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); + else + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, NULL);*/ } static GtkWidget* @@ -1696,7 +1703,7 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - gtk_menu_shell_append(GTK_MENU_SHELL (menu), menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_trash_item_activate_cb), browser); @@ -2423,7 +2430,7 @@ _action_about_activate (GtkAction* action, "version", PACKAGE_VERSION, "comments", _("A lightweight web browser."), "copyright", "Copyright © 2007-2008 Christian Dywan", - "website", "http://software.twotoasts.de", + "website", "http://www.twotoasts.de", "authors", credits_authors, "documenters", credits_documenters, "artists", credits_artists, @@ -2443,6 +2450,72 @@ midori_browser_location_changed_cb (GtkWidget* widget, FIXME: If we want this feature, this is the wrong approach */ } +static void +midori_browser_menu_feed_item_activate_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + const gchar* uri; + + uri = g_object_get_data (G_OBJECT (widget), "uri"); + _midori_browser_open_uri (browser, uri); +} + +static void +midori_browser_location_icon_released_cb (GtkWidget* widget, + gint icon_pos, + gint button, + MidoriBrowser* browser) +{ + MidoriWebView* web_view; + MidoriWebList* news_feeds; + GtkWidget* menu; + guint n, i; + GjsValue* feed; + const gchar* uri; + const gchar* title; + GtkWidget* menuitem; + + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + { + web_view = (MidoriWebView*)midori_browser_get_current_web_view (browser); + if (web_view) + { + news_feeds = midori_web_view_get_news_feeds (web_view); + n = news_feeds ? midori_web_list_get_length (news_feeds) : 0; + if (n) + { + menu = gtk_menu_new (); + for (i = 0; i < n; i++) + { + if (!(feed = midori_web_list_get_nth_item (news_feeds, i))) + continue; + + uri = gjs_value_get_attribute_string (feed, "href"); + if (gjs_value_has_attribute (feed, "title")) + title = gjs_value_get_attribute_string (feed, "title"); + else + title = uri; + if (!*title) + title = uri; + menuitem = gtk_image_menu_item_new_with_label (title); + /* FIXME: Get the real icon */ + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( + menuitem), gtk_image_new_from_stock (STOCK_NEWS_FEED, + GTK_ICON_SIZE_MENU)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_menu_feed_item_activate_cb), + browser); + gtk_widget_show (menuitem); + } + sokoke_widget_popup (widget, GTK_MENU (menu), NULL, + SOKOKE_MENU_POSITION_CURSOR); + } + } + } +} + static void _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -3160,7 +3233,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_ui_manager_get_accel_group (ui_manager)); GError* error = NULL; - if (!gtk_ui_manager_add_ui_from_string(ui_manager, ui_markup, -1, &error)) + if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error)) { /* TODO: Should this be a message dialog? When does this happen? */ g_message ("User interface couldn't be created: %s", error->message); @@ -3173,8 +3246,8 @@ midori_browser_init (MidoriBrowser* browser) guint i; for (i = 0; i < entries_n; i++) { - action = gtk_action_group_get_action(browser->action_group, - entries[i].name); + action = gtk_action_group_get_action (browser->action_group, + entries[i].name); gtk_action_set_sensitive (action, entries[i].callback || !entries[i].tooltip); } @@ -3242,13 +3315,6 @@ midori_browser_init (MidoriBrowser* browser) /* Location */ browser->location = midori_location_entry_new (); - /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, TRUE); /* FIXME: sokoke_entry_setup_completion (GTK_ENTRY (browser->location)); */ g_object_connect (browser->location, "signal::active-changed", @@ -3261,6 +3327,16 @@ midori_browser_init (MidoriBrowser* browser) "signal::changed", midori_browser_location_changed_cb, browser, NULL); + /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (browser->location))), + GTK_ICON_ENTRY_SECONDARY, TRUE); + g_signal_connect (gtk_bin_get_child (GTK_BIN (browser->location)), + "icon-released", G_CALLBACK (midori_browser_location_icon_released_cb), + browser); GtkToolItem* toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); GtkWidget* align = gtk_alignment_new (0, 0.5, 1, 0.1); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 5fde078f..d9b84dfd 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -35,13 +35,6 @@ enum static guint signals[LAST_SIGNAL]; - -static void -entry_icon_released (GtkIconEntry* entry, - gint icon_pos, - gint button, - gpointer user_data); - static gboolean entry_key_press_event (GtkWidget* widget, GdkEventKey* event, @@ -80,14 +73,13 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); - g_signal_connect (entry, "icon_released", G_CALLBACK (entry_icon_released), NULL); g_signal_connect (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); gtk_widget_show (entry); gtk_container_add (GTK_CONTAINER (location_entry), entry); store = gtk_list_store_new (N_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); - g_object_set (G_OBJECT (location_entry), "model", GTK_TREE_MODEL (store), NULL); + g_object_set (G_OBJECT (location_entry), "model", store, NULL); g_object_unref(store); gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (location_entry), URI_COL); @@ -130,16 +122,6 @@ entry_key_press_event (GtkWidget* widget, return FALSE; } -static void -entry_icon_released (GtkIconEntry* entry, - gint icon_pos, - gint button, - gpointer user_data) -{ - if (icon_pos == GTK_ICON_ENTRY_SECONDARY) - /* FIXME Show available news feeds */; -} - static void midori_location_entry_active_changed (GtkComboBox* combo_box, gpointer user_data) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 1c79d386..ffb341cf 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -38,6 +38,7 @@ struct _MidoriWebView MidoriLoadStatus load_status; gchar* statusbar_text; gchar* link_uri; + MidoriWebList* news_feeds; MidoriWebSettings* settings; @@ -479,10 +480,13 @@ gjs_value_links_foreach_cb (GjsValue* link, if (!strcmp (type, "application/rss+xml") || !strcmp (type, "application/x.atom+xml") || !strcmp (type, "application/atom+xml")) + { + midori_web_list_add_item (web_view->news_feeds, link); g_signal_emit (web_view, signals[NEWS_FEED_READY], 0, gjs_value_get_attribute_string (link, "href"), type, gjs_value_has_attribute (link, "title") ? gjs_value_get_attribute_string (link, "title") : NULL); + } } if (gjs_value_has_attribute (link, "rel")) { @@ -522,6 +526,7 @@ webkit_web_frame_load_done (WebKitWebFrame* web_frame, value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); document = gjs_value_get_by_name (value, "document"); links = gjs_value_get_elements_by_tag_name (document, "link"); + midori_web_list_clear (web_view->news_feeds); gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, web_view); g_object_unref (links); g_object_unref (document); @@ -663,8 +668,8 @@ midori_web_view_menu_download_activate_cb (GtkWidget* widget, } static void -webkit_web_view_populate_popup_cb (GtkWidget* web_view, - GtkWidget* menu) +webkit_web_view_populate_popup_cb (GtkWidget* web_view, + GtkWidget* menu) { const gchar* uri; GtkWidget* menuitem; @@ -747,6 +752,7 @@ midori_web_view_init (MidoriWebView* web_view) GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); web_view->progress = 0.0; web_view->load_status = MIDORI_LOAD_FINISHED; + web_view->news_feeds = midori_web_list_new (); web_view->settings = midori_web_settings_new (); g_object_set (web_view, "WebKitWebView::settings", web_view->settings, NULL); @@ -799,13 +805,14 @@ midori_web_view_finalize (GObject* object) g_free (web_view->title); g_free (web_view->statusbar_text); g_free (web_view->link_uri); - - if (web_view->xbel_item) - katze_xbel_item_unref (web_view->xbel_item); + g_object_unref (web_view->news_feeds); if (web_view->settings) g_object_unref (web_view->settings); + if (web_view->xbel_item) + katze_xbel_item_unref (web_view->xbel_item); + G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); } @@ -1138,3 +1145,22 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) return web_view->link_uri; } + +/** + * midori_web_view_get_news_feeds: + * @web_view: a #MidoriWebView + * + * Retrieves a list of news feeds for the current page + * or %NULL if there are no feeds at all. + * + * Return value: a #MidoriWebList, or %NULL + **/ +MidoriWebList* +midori_web_view_get_news_feeds (MidoriWebView* web_view) +{ + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); + + if (!midori_web_list_is_empty (web_view->news_feeds)) + return web_view->news_feeds; + return NULL; +} diff --git a/midori/midori-webview.h b/midori/midori-webview.h index d6e5b825..c8662114 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -13,6 +13,7 @@ #define __MIDORI_WEB_VIEW_H__ #include "midori-websettings.h" +#include "midori-weblist.h" #include #include @@ -114,6 +115,9 @@ midori_web_view_get_display_title (MidoriWebView* web_view); const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view); +MidoriWebList* +midori_web_view_get_news_feeds (MidoriWebView* web_view); + G_END_DECLS #endif /* __MIDORI_WEB_VIEW_H__ */ From c9e57de8d67594c4ffae439f27502b68729b55aa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 Aug 2008 04:25:54 +0200 Subject: [PATCH 0240/2970] Scruffily clean up MidoriWebList when finalizing --- midori/midori-weblist.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/midori/midori-weblist.c b/midori/midori-weblist.c index 18f0d979..8eb50a6c 100644 --- a/midori/midori-weblist.c +++ b/midori/midori-weblist.c @@ -102,8 +102,12 @@ static void midori_web_list_finalize (GObject* object) { MidoriWebList* web_list = MIDORI_WEB_LIST (object); + guint n, i; - midori_web_list_clear (web_list); + /* Scruffily remove all items, no need for signals */ + n = g_list_length (web_list->items); + for (i = 0; i < n; i++) + g_object_unref (g_list_nth_data (web_list->items, i)); g_list_free (web_list->items); G_OBJECT_CLASS (midori_web_list_parent_class)->finalize (object); @@ -136,6 +140,7 @@ void midori_web_list_add_item (MidoriWebList* web_list, gpointer item) { + g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); g_return_if_fail (G_IS_OBJECT (item)); g_signal_emit (web_list, signals[ADD_ITEM], 0, item); @@ -152,6 +157,7 @@ void midori_web_list_remove_item (MidoriWebList* web_list, gpointer item) { + g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); g_return_if_fail (G_IS_OBJECT (item)); g_signal_emit (web_list, signals[REMOVE_ITEM], 0, item); @@ -271,13 +277,18 @@ midori_web_list_get_length (MidoriWebList* web_list) void midori_web_list_clear (MidoriWebList* web_list) { + guint n; + guint i; + GObject* item; + g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); - guint n = g_list_length (web_list->items); - guint i; + n = g_list_length (web_list->items); for (i = 0; i < n; i++) { - GObject* item = g_list_nth_data (web_list->items, i); - midori_web_list_remove_item (web_list, item); + if ((item = g_list_nth_data (web_list->items, i))) + midori_web_list_remove_item (web_list, item); } + g_list_free (web_list->items); + web_list->items = NULL; } From 18e1cd7e747e536e61dfe4beb7d8889fa5e72e7c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 Aug 2008 05:29:38 +0200 Subject: [PATCH 0241/2970] Reuse the trashed item and remove it from the trash properly --- midori/midori-browser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c25ddfce..4725cb06 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1679,10 +1679,10 @@ midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, /* Create a new web view with an uri which has been closed before */ KatzeXbelItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeXbelItem"); - const gchar* uri = katze_xbel_bookmark_get_href (item); - gint n = midori_browser_add_uri (browser, uri); + gint n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); - katze_xbel_item_unref (item); + midori_web_list_remove_item (browser->trash, item); + _midori_browser_update_actions (browser); } static void From 4a2e5c59f41e541fef427bc8cac5869a48dec738 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 Aug 2008 13:20:02 +0200 Subject: [PATCH 0242/2970] Bump version to 0.0.19 --- ChangeLog | 14 ++++++++++++++ configure.in | 2 +- wscript | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 379655e3..13df4b51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +v0.0.19: + + Improved Greasemonkey compatibility + + Improve multiple window support + + Use WAF buildscripts, still keeping autotools + + Install and use Midori logo + + Support zooming and printing + + Enhance Gjs functionality + + Refactor in some places, particularly Web Search + + Implement favicons and source view with GIO + + Introduce new fancy location entry + + Detect and show news feeds on web sites + + Save the session as needed, not only on quit + + Reintroduce Download Manager preference + v0.0.18: + First attempt at userscripts and extensions. + Show hidden location/ web search temporarily when needed. diff --git a/configure.in b/configure.in index b4f78bab..ed99b8ad 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.18], [http://software.twotoasts.de/bugs]) +AC_INIT([midori], [0.0.19], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/main.h]) AC_CONFIG_HEADER([config.h]) diff --git a/wscript b/wscript index cfef9ce5..9bd8d950 100644 --- a/wscript +++ b/wscript @@ -6,7 +6,7 @@ import pproc as subprocess import Common APPNAME = 'midori' -VERSION = '0.0.18' +VERSION = '0.0.19' try: git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], From 539a8f35c8c19c80d94ce72942677437cfe499df Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sun, 3 Aug 2008 04:58:45 +0200 Subject: [PATCH 0243/2970] Disconnect load-done handler when finalizing --- midori/midori-webview.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index ffb341cf..e9431350 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -797,7 +797,10 @@ midori_web_view_init (MidoriWebView* web_view) static void midori_web_view_finalize (GObject* object) { - MidoriWebView* web_view = MIDORI_WEB_VIEW (object); + MidoriWebView* web_view; + WebKitWebFrame* web_frame; + + web_view = MIDORI_WEB_VIEW (object); if (web_view->icon) g_object_unref (web_view->icon); @@ -813,6 +816,10 @@ midori_web_view_finalize (GObject* object) if (web_view->xbel_item) katze_xbel_item_unref (web_view->xbel_item); + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); + g_signal_handlers_disconnect_by_func (web_frame, + webkit_web_frame_load_done, web_view); + G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); } From c04db2dd71e2d79961d7dc7824b35701d3716da4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 5 Aug 2008 02:40:51 +0200 Subject: [PATCH 0244/2970] Remove small toolbar option completely, leave it to gtkrc --- midori/midori-browser.c | 11 +---------- midori/midori-websettings.c | 18 ------------------ 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4725cb06..575b5907 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3729,8 +3729,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint last_window_width, last_window_height; gint last_panel_position, last_panel_page; gboolean show_navigationbar, show_bookmarkbar, show_panel, show_statusbar; - gboolean small_toolbar, show_new_tab, show_homepage, - show_web_search, show_trash; + gboolean show_new_tab, show_homepage, show_web_search, show_trash; MidoriToolbarStyle toolbar_style; gint last_web_search; gchar* last_pageholder_uri; @@ -3749,7 +3748,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-bookmarkbar", &show_bookmarkbar, "show-panel", &show_panel, "show-statusbar", &show_statusbar, - "small-toolbar", &small_toolbar, "show-new-tab", &show_new_tab, "show-homepage", &show_homepage, "show-web-search", &show_web_search, @@ -3776,9 +3774,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) } _midori_browser_set_toolbar_style (browser, toolbar_style); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), - small_toolbar ? GTK_ICON_SIZE_SMALL_TOOLBAR - : GTK_ICON_SIZE_LARGE_TOOLBAR); if (browser->search_engines) { @@ -3833,10 +3828,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, if (name == g_intern_string ("toolbar-style")) _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); - else if (name == g_intern_string ("small-toolbar")) - gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), - g_value_get_boolean (&value) ? GTK_ICON_SIZE_SMALL_TOOLBAR - : GTK_ICON_SIZE_LARGE_TOOLBAR); else if (name == g_intern_string ("show-new-tab")) sokoke_widget_set_visible (browser->button_tab_new, g_value_get_boolean (&value)); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index d87b8db2..5d83ed46 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -34,7 +34,6 @@ struct _MidoriWebSettings gboolean show_statusbar; MidoriToolbarStyle toolbar_style; - gboolean small_toolbar; gboolean show_new_tab; gboolean show_homepage; gboolean show_web_search; @@ -87,7 +86,6 @@ enum PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, - PROP_SMALL_TOOLBAR, PROP_SHOW_NEW_TAB, PROP_SHOW_HOMEPAGE, PROP_SHOW_WEB_SEARCH, @@ -347,15 +345,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TOOLBAR_DEFAULT, flags)); - g_object_class_install_property (gobject_class, - PROP_SMALL_TOOLBAR, - g_param_spec_boolean ( - "small-toolbar", - _("Small toolbar"), - _("Use small toolbar icons"), - FALSE, - flags)); - g_object_class_install_property (gobject_class, PROP_SHOW_NEW_TAB, g_param_spec_boolean ( @@ -680,9 +669,6 @@ midori_web_settings_set_property (GObject* object, case PROP_TOOLBAR_STYLE: web_settings->toolbar_style = g_value_get_enum (value); break; - case PROP_SMALL_TOOLBAR: - web_settings->small_toolbar = g_value_get_boolean (value); - break; case PROP_SHOW_NEW_TAB: web_settings->show_new_tab = g_value_get_boolean (value); break; @@ -838,9 +824,6 @@ midori_web_settings_get_property (GObject* object, case PROP_TOOLBAR_STYLE: g_value_set_enum (value, web_settings->toolbar_style); break; - case PROP_SMALL_TOOLBAR: - g_value_set_boolean (value, web_settings->small_toolbar); - break; case PROP_SHOW_NEW_TAB: g_value_set_boolean (value, web_settings->show_new_tab); break; @@ -969,7 +952,6 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) "preferred-encoding", web_settings->preferred_encoding, "toolbar-style", web_settings->toolbar_style, - "small-toolbar", web_settings->small_toolbar, "show-web-search", web_settings->show_web_search, "show-new-tab", web_settings->show_new_tab, "show-trash", web_settings->show_trash, From 580256e5c4ce438bee69260e05bd11089eed365c Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Tue, 5 Aug 2008 03:08:54 +0200 Subject: [PATCH 0245/2970] Read and display @name in userscript metadata block --- midori/midori-addons.c | 74 ++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 731b8846..d5d8aae0 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -215,18 +215,13 @@ midori_addons_treeview_render_text_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - gchar* filename; - gint a; - gchar* b; - gtk_tree_model_get (model, iter, 0, &filename, 1, &a, 2, &b, -1); + gchar* displayname; - /* FIXME: Convert filename to UTF8 */ - gchar* text = g_strdup_printf ("%s", filename); - g_object_set (renderer, "text", text, NULL); - g_free (text); + gtk_tree_model_get (model, iter, 0, &displayname, -1); - g_free (filename); - g_free (b); + g_object_set (renderer, "text", displayname, NULL); + + g_free (displayname); } static void @@ -276,9 +271,11 @@ midori_addons_init (MidoriAddons* addons) } static gboolean -_include_exclude_from_file (const gchar* filename, - GSList** includes, - GSList** excludes) +_metadata_from_file (const gchar* filename, + GSList** includes, + GSList** excludes, + gchar** name, + gchar** description) { GIOChannel* channel; gboolean found_meta; @@ -303,8 +300,8 @@ _include_exclude_from_file (const gchar* filename, { if (g_str_has_prefix (line, "// ==/UserScript==")) found_meta = FALSE; - else if (g_str_has_prefix (line, "// @require") || - g_str_has_prefix (line, "// @resource")) + else if (g_str_has_prefix (line, "// @require ") || + g_str_has_prefix (line, "// @resource ")) { /* We don't support these, so abort here */ g_free (line); @@ -313,18 +310,30 @@ _include_exclude_from_file (const gchar* filename, g_slist_free (*excludes); return FALSE; } - else if (g_str_has_prefix (line, "// @include")) + else if (includes && g_str_has_prefix (line, "// @include ")) { - rest_of_line = g_strdup (line + strlen ("// @include")); + rest_of_line = g_strdup (line + strlen ("// @include ")); rest_of_line = g_strstrip (rest_of_line); *includes = g_slist_prepend (*includes, rest_of_line); } - else if (g_str_has_prefix (line, "// @exclude")) + else if (excludes && g_str_has_prefix (line, "// @exclude ")) { - rest_of_line = g_strdup (line + strlen ("// @exclude")); + rest_of_line = g_strdup (line + strlen ("// @exclude ")); rest_of_line = g_strstrip (rest_of_line); *excludes = g_slist_prepend (*excludes, rest_of_line); } + else if (name && g_str_has_prefix (line, "// @name ")) + { + rest_of_line = g_strdup (line + strlen ("// @name ")); + rest_of_line = g_strstrip (rest_of_line); + *name = rest_of_line; + } + else if (description && g_str_has_prefix (line, "// @description ")) + { + rest_of_line = g_strdup (line + strlen ("// @description ")); + rest_of_line = g_strstrip (rest_of_line); + *description = rest_of_line; + } } g_free (line); } @@ -562,7 +571,8 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, fullname = g_build_filename (addon_path, filename, NULL); includes = NULL; excludes = NULL; - if (!_include_exclude_from_file (fullname, &includes, &excludes)) + if (!_metadata_from_file (fullname, + &includes, &excludes, NULL, NULL)) { g_free (fullname); continue; @@ -670,6 +680,9 @@ midori_addons_set_kind (MidoriAddons* addons, gchar* addon_path; GDir* addon_dir; const gchar* filename; + const gchar* displayname; + gchar* fullname; + gchar* name; GtkTreeIter iter; g_return_if_fail (MIDORI_IS_ADDONS (addons)); @@ -700,9 +713,28 @@ midori_addons_set_kind (MidoriAddons* addons, if (!g_str_has_suffix (filename, _addons_get_extension (addons))) continue; + displayname = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); + if (!displayname) + displayname = filename; + + if (kind == MIDORI_ADDON_USER_SCRIPTS) + { + fullname = g_build_filename (addon_path, filename, NULL); + name = NULL; + if (!_metadata_from_file (fullname, NULL, NULL, + &name, NULL)) + { + g_free (fullname); + continue; + } + if (name) + displayname = name; + g_free (fullname); + } + gtk_list_store_append (liststore, &iter); gtk_list_store_set (liststore, &iter, - 0, filename, 1, 0, 2, "", -1); + 0, displayname, 1, 0, 2, "", -1); } g_dir_close (addon_dir); } From a41a0e008e74de71922f379180dea9355c8acf64 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 5 Aug 2008 05:03:05 +0200 Subject: [PATCH 0246/2970] Move MidoriWebList and MidoriWebItem to Katze --- katze/Makefile.am | 2 ++ katze/katze-throbber.c | 2 ++ katze/katze-throbber.h | 2 -- midori/midori-webitem.c => katze/katze-webitem.c | 7 ++++--- midori/midori-webitem.h => katze/katze-webitem.h | 0 midori/midori-weblist.c => katze/katze-weblist.c | 4 +++- midori/midori-weblist.h => katze/katze-weblist.h | 2 +- katze/katze.h | 2 ++ midori/Makefile.am | 4 +--- midori/main.c | 1 - midori/midori-app.c | 2 -- midori/midori-app.h | 1 - midori/midori-panel.c | 6 +++--- midori/midori-searchentry.c | 1 - midori/midori-searchentry.h | 3 ++- midori/midori-webview.h | 1 - midori/sokoke.c | 2 -- midori/sokoke.h | 2 +- po/POTFILES.in | 4 ++-- 19 files changed, 23 insertions(+), 25 deletions(-) rename midori/midori-webitem.c => katze/katze-webitem.c (98%) rename midori/midori-webitem.h => katze/katze-webitem.h (100%) rename midori/midori-weblist.c => katze/katze-weblist.c (99%) rename midori/midori-weblist.h => katze/katze-weblist.h (98%) diff --git a/katze/Makefile.am b/katze/Makefile.am index ba058a4f..ed4128d6 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -14,4 +14,6 @@ libkatze_la_SOURCES = \ katze.h \ katze-throbber.c katze-throbber.h \ katze-utils.c katze-utils.h \ + katze-webitem.c katze-webitem.h \ + katze-weblist.c katze-weblist.h \ katze-xbel.c katze-xbel.h diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 34f3510b..b8ea1847 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -11,6 +11,8 @@ #include "katze-throbber.h" +#include "katze-utils.h" + #include #include diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index 7a459129..b4ef681c 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -15,8 +15,6 @@ #include #include -#include "katze-utils.h" - G_BEGIN_DECLS #define KATZE_TYPE_THROBBER \ diff --git a/midori/midori-webitem.c b/katze/katze-webitem.c similarity index 98% rename from midori/midori-webitem.c rename to katze/katze-webitem.c index b74bbff1..cd2927f5 100644 --- a/midori/midori-webitem.c +++ b/katze/katze-webitem.c @@ -9,10 +9,11 @@ See the file COPYING for the full license text. */ -#include "midori-webitem.h" +#include "katze-webitem.h" + +#include "katze-utils.h" #include -#include struct _MidoriWebItem { @@ -366,7 +367,7 @@ midori_web_item_get_token (MidoriWebItem* web_item) **/ void midori_web_item_set_token (MidoriWebItem* web_item, - const gchar* token) + const gchar* token) { g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); diff --git a/midori/midori-webitem.h b/katze/katze-webitem.h similarity index 100% rename from midori/midori-webitem.h rename to katze/katze-webitem.h diff --git a/midori/midori-weblist.c b/katze/katze-weblist.c similarity index 99% rename from midori/midori-weblist.c rename to katze/katze-weblist.c index 8eb50a6c..e4abd211 100644 --- a/midori/midori-weblist.c +++ b/katze/katze-weblist.c @@ -9,7 +9,9 @@ See the file COPYING for the full license text. */ -#include "midori-weblist.h" +#include "katze-weblist.h" + +#include "katze-utils.h" #include #include diff --git a/midori/midori-weblist.h b/katze/katze-weblist.h similarity index 98% rename from midori/midori-weblist.h rename to katze/katze-weblist.h index e051cbc5..4f74cf4b 100644 --- a/midori/midori-weblist.h +++ b/katze/katze-weblist.h @@ -12,7 +12,7 @@ #ifndef __MIDORI_WEB_LIST_H__ #define __MIDORI_WEB_LIST_H__ -#include "midori-webitem.h" +#include "katze-webitem.h" G_BEGIN_DECLS diff --git a/katze/katze.h b/katze/katze.h index e0e72c9a..5523a131 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -14,6 +14,8 @@ #include "katze-throbber.h" #include "katze-utils.h" +#include "katze-webitem.h" +#include "katze-weblist.h" #include "katze-xbel.h" #endif /* __KATZE_H__ */ diff --git a/midori/Makefile.am b/midori/Makefile.am index 71629568..b3a009b7 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -20,9 +20,7 @@ bin_PROGRAMS = \ midori_SOURCES = \ main.c main.h \ - gtkiconentry.c gtkiconentry.h \ - midori-webitem.c midori-webitem.h \ - midori-weblist.c midori-weblist.h \ + gtkiconentry.c gtkiconentry.h \ midori-app.c midori-app.h \ midori-browser.c midori-browser.h \ midori-panel.c midori-panel.h \ diff --git a/midori/main.c b/midori/main.c index 4f89a358..0b064ae1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -16,7 +16,6 @@ #include "midori-app.h" #include "midori-websettings.h" #include "midori-browser.h" -#include "midori-weblist.h" #include "gjs.h" #include diff --git a/midori/midori-app.c b/midori/midori-app.c index fab0b780..58335a2f 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -11,8 +11,6 @@ #include "midori-app.h" -#include "midori-weblist.h" - #include #include diff --git a/midori/midori-app.h b/midori/midori-app.h index 9372d7e5..6735a98c 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -16,7 +16,6 @@ #include "midori-browser.h" #include "midori-websettings.h" -#include "midori-weblist.h" G_BEGIN_DECLS diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 22e153c4..794d37e1 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -143,7 +143,7 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_SHADOW_TYPE, g_param_spec_enum ( "shadow-type", - "Shadow Type", + _("Shadow Type"), _("Appearance of the shadow around each panel"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_NONE, @@ -153,7 +153,7 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_MENU, g_param_spec_object ( "menu", - "Menu", + _("Menu"), _("Menu to hold panel items"), GTK_TYPE_MENU, G_PARAM_READWRITE)); @@ -162,7 +162,7 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_PAGE, g_param_spec_int ( "page", - "Page", + _("Page"), _("The index of the current page"), -1, G_MAXINT, -1, flags)); diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index bc2ceff4..7f5a5a65 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -13,7 +13,6 @@ #include "sokoke.h" -#include #include #include diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h index ec379dd9..ac7b794e 100644 --- a/midori/midori-searchentry.h +++ b/midori/midori-searchentry.h @@ -12,9 +12,10 @@ #ifndef __MIDORI_SEARCH_ENTRY_H__ #define __MIDORI_SEARCH_ENTRY_H__ -#include "midori-weblist.h" #include "gtkiconentry.h" +#include + #include G_BEGIN_DECLS diff --git a/midori/midori-webview.h b/midori/midori-webview.h index c8662114..ed7f965b 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -13,7 +13,6 @@ #define __MIDORI_WEB_VIEW_H__ #include "midori-websettings.h" -#include "midori-weblist.h" #include #include diff --git a/midori/sokoke.c b/midori/sokoke.c index 49eeaa3d..a9d1f6eb 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -11,8 +11,6 @@ #include "sokoke.h" -#include "midori-webitem.h" - #include "config.h" #include "main.h" diff --git a/midori/sokoke.h b/midori/sokoke.h index 172b19b4..6d870b27 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -12,7 +12,7 @@ #ifndef __SOKOKE_H__ #define __SOKOKE_H__ 1 -#include "midori-weblist.h" +#include #include diff --git a/po/POTFILES.in b/po/POTFILES.in index df1c867e..16a7e207 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,11 +10,11 @@ midori/midori-panel.c midori/midori-websettings.c midori/midori-webview.c midori/midori-preferences.c -midori/midori-webitem.c -midori/midori-weblist.c midori/midori-searchentry.c midori/sokoke.c midori/gjs.c katze/katze-throbber.c katze/katze-utils.c +katze/katze-webitem.c +katze/katze-weblist.c katze/katze-xbel.c From 8ff2856bf69140475fe27097979ea6d25690e872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Sitek?= Date: Wed, 6 Aug 2008 20:22:45 +0200 Subject: [PATCH 0247/2970] Add #ifdefs around GFile to allow building with Glib < 2.16 --- midori/midori-webview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index e9431350..c55589cf 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -469,8 +469,10 @@ gjs_value_links_foreach_cb (GjsValue* link, { const gchar* type; const gchar* rel; +#if GLIB_CHECK_VERSION (2, 16, 0) GFile* icon_file; GIcon* icon; +#endif if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "href")) { @@ -488,6 +490,7 @@ gjs_value_links_foreach_cb (GjsValue* link, ? gjs_value_get_attribute_string (link, "title") : NULL); } } +#if GLIB_CHECK_VERSION (2, 16, 0) if (gjs_value_has_attribute (link, "rel")) { rel = gjs_value_get_attribute_string (link, "rel"); @@ -500,6 +503,7 @@ gjs_value_links_foreach_cb (GjsValue* link, 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); } } +#endif } } From 9a8c7d047f25d7b9846dc6f49b9bcac467bb3da2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 13:55:39 +0200 Subject: [PATCH 0248/2970] Mention optional dependencies in README --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index ce6f660f..1c7bc4ca 100644 --- a/README +++ b/README @@ -11,6 +11,8 @@ Midori is a lightweight web browser. Requirements: GTK+ 2.6, WebkitGtk, libXML2 +Optional: Glib 2.16, GtkSourceView 2.0 + For installation instructions read INSTALL. Please report comments, suggestions and bugs to: From cb0dd889e0266f0d74a1741196aed07aae475402 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sun, 10 Aug 2008 14:17:21 +0200 Subject: [PATCH 0249/2970] Use mnemonics in panel menu items --- midori/main.c | 8 ++++++-- midori/main.h | 7 ++++++- midori/midori-browser.c | 16 ++++++++-------- midori/midori-panel.c | 32 +++++++++++++++++++++++--------- midori/midori-panel.h | 3 ++- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/midori/main.c b/midori/main.c index 0b064ae1..f195b464 100644 --- a/midori/main.c +++ b/midori/main.c @@ -34,16 +34,20 @@ stock_items_init (void) { static GtkStockItem items[] = { + { STOCK_BOOKMARKS }, + { STOCK_CONSOLE }, { STOCK_EXTENSION }, { STOCK_NEWS_FEED }, { STOCK_LOCK_OPEN }, { STOCK_LOCK_SECURE }, { STOCK_LOCK_BROKEN }, + { STOCK_PAGE_HOLDER }, { STOCK_SCRIPT }, - { STOCK_THEME }, + { STOCK_STYLE }, + { STOCK_TRANSFER }, { STOCK_USER_TRASH }, - { STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, + { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, NULL }, { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, NULL }, { STOCK_FORM_FILL, N_("_Form Fill"), 0, 0, NULL }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, NULL }, diff --git a/midori/main.h b/midori/main.h index 6cf216ce..bc4b2f50 100644 --- a/midori/main.h +++ b/midori/main.h @@ -30,9 +30,15 @@ KatzeXbelItem* bookmarks; in order to reduce the amount of warnings */ #define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ +#define STOCK_BOOKMARKS "vcard" +#define STOCK_CONSOLE "terminal" #define STOCK_EXTENSION GTK_STOCK_EXECUTE /* "extension" */ #define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */ +#define STOCK_HISTORY "document-open-recent" #define STOCK_NEWS_FEED "news-feed" +#define STOCK_PAGE_HOLDER GTK_STOCK_CONVERT +#define STOCK_STYLE "gnome-settings-theme" +#define STOCK_TRANSFER "package" /* We assume that these legacy icon names are usually present */ @@ -46,7 +52,6 @@ KatzeXbelItem* bookmarks; #define STOCK_SCRIPT "stock_script" #define STOCK_SEND "stock_mail-send" #define STOCK_TAB_NEW "stock_new-tab" -#define STOCK_THEME "gnome-settings-theme" #define STOCK_USER_TRASH "gnome-stock-trash" #define STOCK_WINDOW_NEW "stock_new-window" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 575b5907..63c1ad0e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3491,14 +3491,14 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show_all (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), box, toolbar, - "vcard", _("Bookmarks")); + STOCK_BOOKMARKS, _("Bookmarks"), _("_Bookmarks")); /* Transfers */ GtkWidget* panel = midori_web_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, - "package", _("Transfers")); + STOCK_TRANSFER, _("Transfers"), _("_Transfers")); /* Console */ browser->panel_console = midori_console_new (); @@ -3507,14 +3507,14 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_console, toolbar, - "terminal", _("Console")); + STOCK_CONSOLE, _("Console"), _("_Console")); /* History */ panel = midori_web_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, - "document-open-recent", _("History")); + STOCK_HISTORY, _("History"), _("_History")); /* Pageholder */ browser->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, @@ -3523,7 +3523,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (browser->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_pageholder, NULL, - GTK_STOCK_CONVERT, _("Pageholder")); + STOCK_PAGE_HOLDER, _("Pageholder"), _("_Pageholder")); /* Userscripts */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); @@ -3532,7 +3532,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - STOCK_SCRIPT, _("Userscripts")); + STOCK_SCRIPT, _("Userscripts"), _("_Userscripts")); /* Userstyles */ /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); @@ -3540,7 +3540,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - "", _("Userstyles"));*/ + STOCK_STYLE, _("Userstyles"), _("_Userstyles"));*/ /* Extensions */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); @@ -3549,7 +3549,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - STOCK_EXTENSION, _("Extensions")); + STOCK_EXTENSION, _("Extensions"), _("_Extensions")); /* Notebook, containing all web_views */ browser->notebook = gtk_notebook_new (); diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 794d37e1..bba51d17 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -339,6 +339,7 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, * @toolbar: a toolbar widget, or %NULL * @icon: a stock ID or icon name, or %NULL * @label: a string to use as the label, or %NULL + * @mnemonic: a string to use as a mnemonic, or %NULL * * Appends a new page to the panel. If @toolbar is specified it will * be packaged above @child. @@ -348,6 +349,9 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, * * If @label is given, it is used as the label of this page. * + * If @mnemonic is given, it is used in labels with mnemonics + * such as menu items. See gtk_label_new_with_mnemonic(). + * * In the case of an error, -1 is returned. * * Return value: the index of the new page, or -1 @@ -357,20 +361,30 @@ midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, GtkWidget* toolbar, const gchar* icon, - const gchar* label) + const gchar* label, + const gchar* mnemonic) { + GtkWidget* scrolled; + GtkWidget* widget; + GObjectClass* gobject_class; + guint n; + const gchar* text; + const gchar* text_mnemonic; + GtkToolItem* toolitem; + GtkWidget* image; + GtkWidget* menuitem; + g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); g_return_val_if_fail (GTK_IS_WIDGET (child), -1); g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); - GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL); + scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); gtk_widget_show (scrolled); - GtkWidget* widget; - GObjectClass* gobject_class = G_OBJECT_GET_CLASS (child); + gobject_class = G_OBJECT_GET_CLASS (child); if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) widget = child; else @@ -387,13 +401,13 @@ midori_panel_append_page (MidoriPanel* panel, gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); - guint n = midori_panel_page_num (panel, child); + n = midori_panel_page_num (panel, child); - const gchar* text = label ? label : _("Untitled"); + text = label ? label : _("Untitled"); + text_mnemonic = mnemonic ? mnemonic : _("_Untitled"); g_object_set_data (G_OBJECT (child), "label", (gchar*)text); - GtkWidget* image; - GtkToolItem* toolitem = gtk_radio_tool_button_new (panel->group); + toolitem = gtk_radio_tool_button_new (panel->group); panel->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( toolitem)); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), text); @@ -410,7 +424,7 @@ midori_panel_append_page (MidoriPanel* panel, if (panel->menu) { - GtkWidget* menuitem = gtk_image_menu_item_new_with_label (text); + menuitem = gtk_image_menu_item_new_with_mnemonic (text_mnemonic); if (icon) { image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU); diff --git a/midori/midori-panel.h b/midori/midori-panel.h index 66b05434..5de7d004 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -58,7 +58,8 @@ midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, GtkWidget* toolbar, const gchar* icon, - const gchar* label); + const gchar* label, + const gchar* mnemonic); gint midori_panel_get_current_page (MidoriPanel* panel); From bb8eb7d5c1222b87f00e87143324dbd6e2b1b0a9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 14:19:03 +0200 Subject: [PATCH 0250/2970] Remove LIBSEXY from wscript_build, it's long obsolete --- midori/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/wscript_build b/midori/wscript_build index 9a70f59a..0963128e 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '.. ../katze' obj.find_sources_in_dirs ('.') -obj.uselib = 'GIO GTK LIBSEXY GTKSOURCEVIEW WEBKIT LIBXML' +obj.uselib = 'GIO GTK GTKSOURCEVIEW WEBKIT LIBXML' obj.uselib_local = 'katze' From 1b0fc074e333af772ef829e2cd2f1f2335b4cf91 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 14:38:47 +0200 Subject: [PATCH 0251/2970] Add 'configure' like waf wrapper --- .gitignore | 1 - configure | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 1 deletion(-) create mode 100755 configure diff --git a/.gitignore b/.gitignore index a033ed6b..f0d9bb19 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ aclocal.m4 autom4te.cache config.* -configure depcomp install-sh libtool diff --git a/configure b/configure new file mode 100755 index 00000000..28e8a727 --- /dev/null +++ b/configure @@ -0,0 +1,151 @@ +#! /bin/sh + +# waf configure wrapper + +# Fancy colors used to beautify the output a bit. +# +if [ "$NOCOLOR" ] ; then + NORMAL="" + BOLD="" + RED="" + YELLOW="" + GREEN="" +else + NORMAL="\033[0m" + BOLD="\033[1m" + RED="\033[91m" + YELLOW="\033[01;93m" + GREEN="\033[92m" +fi + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_ERROR=2 +EXIT_BUG=10 + +CUR_DIR=$PWD + +#possible relative path +WORKINGDIR=`dirname $0` +cd $WORKINGDIR +#abs path +WORKINGDIR=`pwd` +cd $CUR_DIR + +# Checks for Python interpreter. Honours $PYTHON if set. Stores path to +# interpreter in $PYTHON. +# +checkPython() +{ + if [ -z "$PYTHON" ] ; then + PYTHON=`which python 2>/dev/null` + fi + printf "Checking for Python\t\t\t: " + if [ ! -x "$PYTHON" ] ; then + printf $RED"not found!"$NORMAL"\n" + echo "Please make sure that the Python interpreter is available in your PATH" + echo "or invoke configure using the PYTHON flag, e.g." + echo "$ PYTHON=/usr/local/bin/python configure" + exit $EXIT_FAILURE + fi + printf $GREEN"$PYTHON"$NORMAL"\n" +} + +# Checks for WAF. Honours $WAF if set. Stores path to 'waf' in $WAF. +# Requires that $PYTHON is set. +# +checkWAF() +{ + printf "Checking for WAF\t\t\t: " + #installed miniwaf in sourcedir + if [ -z "$WAF" ] ; then + if [ -f "${WORKINGDIR}/waf" ] ; then + WAF="${WORKINGDIR}/waf" + if [ ! -x "$WAF" ] ; then + chmod +x $WAF + fi + fi + fi + if [ -z "$WAF" ] ; then + if [ -f "${WORKINGDIR}/waf-light" ] ; then + ${WORKINGDIR}/waf-light --make-waf + WAF="${WORKINGDIR}/waf" + fi + fi + #global installed waf with waf->waf.py link + if [ -z "$WAF" ] ; then + WAF=`which waf 2>/dev/null` + fi + # neither waf nor miniwaf could be found + if [ ! -x "$WAF" ] ; then + printf $RED"not found"$NORMAL"\n" + echo "Go to http://code.google.com/p/waf/" + echo "and download a waf version" + exit $EXIT_FAILURE + else + printf $GREEN"$WAF"$NORMAL"\n" + fi +} + +# Generates a Makefile. Requires that $WAF is set. +# +generateMakefile() +{ + cat > Makefile << EOF +#!/usr/bin/make -f +# Waf Makefile wrapper +WAF_HOME=$CUR_DIR + +all: + @$WAF build + +all-debug: + @$WAF -v build + +all-progress: + @$WAF -p build + +install: + @if test -n "\$(DESTDIR)"; then \\ + $WAF install --destdir="\$(DESTDIR)"; \\ + else \\ + $WAF install; \\ + fi; + +uninstall: + @if test -n "\$(DESTDIR)"; then \\ + $WAF uninstall --destdir="\$(DESTDIR)"; \\ + else \\ + $WAF uninstall; \\ + fi; + +clean: + @$WAF clean + +distclean: + @$WAF distclean + @-rm -rf _build_ + @-rm -f Makefile + +check: + @$WAF check + +dist: + @$WAF dist + +EOF +} + +checkPython +checkWAF + +echo "calling waf configure with parameters" +$WAF configure $* || exit $EXIT_ERROR + +if [ -f "Makefile" ] ; then + echo "" +else + generateMakefile +fi + +exit $EXIT_SUCCESS From 212597f41636e203c9c171040d0569787c5d7bde Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 15:53:07 +0200 Subject: [PATCH 0252/2970] Use rsvg instead of imagemagick to render icons Apparently rsvg-convert is good enough for what we need and it is a dependency of gtk already, unlike imagemagick's convert which even requires rsvg. --- icons/wscript_build | 15 ++++++++------- wscript | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/icons/wscript_build b/icons/wscript_build index bbf8ad64..51946f32 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -18,7 +18,9 @@ def add_image (bld, install_files, category, name): except: pass - if bld.env ()['CONVERT']: + rsvg_convert = bld.env ()['RSVG_CONVERT'] + + if rsvg_convert: mkdir (blddir + '/icons') for size in [16, 22, 32, 48]: @@ -26,15 +28,14 @@ def add_image (bld, install_files, category, name): if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, srcdir + '/icons/' + format + '/' + name + '.png') - elif not bld.env ()['CONVERT']: + elif not rsvg_convert: pass elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): mkdir (blddir + '/icons/' + format) - convert = subprocess.Popen (['convert', - '-background', 'transparent', - '-geometry', format, '-extent', format, - srcdir + '/icons/scalable/' + name + '.svg', - blddir + '/icons/' + format + '/' + name + '.png'], + convert = subprocess.Popen ([rsvg_convert, + '-w', str (size), '-h', str (size), + '-o', blddir + '/icons/' + format + '/' + name + '.png', + srcdir + '/icons/scalable/' + name + '.svg'], stderr=subprocess.PIPE) if not convert.wait (): _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, diff --git a/wscript b/wscript index 9bd8d950..52fa64f9 100644 --- a/wscript +++ b/wscript @@ -43,7 +43,7 @@ def configure (conf): conf.check_header ('unistd.h', 'HAVE_UNISTD_H') - if conf.find_program ('convert', var='CONVERT'): + if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): icons = 'yes' else: icons = 'no' From 323cf2458d36cc38004e4097ad6f548a5bdceebd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 18:28:08 +0200 Subject: [PATCH 0253/2970] Hide the navigationbar initially We need to make sure that the navigationbar is initially invisible, so we hide it expressly. Otherwise it shows up regardless of the show-navigationbar setting. --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 63c1ad0e..612b1df8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3368,6 +3368,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), GTK_TOOL_ITEM (browser->button_trash), -1); sokoke_container_show_children (GTK_CONTAINER (browser->navigationbar)); + gtk_widget_hide (browser->navigationbar); action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); browser->button_fullscreen = gtk_action_create_tool_item (action); gtk_widget_hide (browser->button_fullscreen); From b38e3f429e07201d45fadd6b5c92db5b87e93090 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 19:22:34 +0200 Subject: [PATCH 0254/2970] Wrap _has_selection with a check if it is effectly empty --- midori/midori-browser.c | 11 +++++++++-- midori/midori-webview.c | 30 +++++++++++++++++++++++++++++- midori/midori-webview.h | 3 +++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 612b1df8..cd354d61 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -701,6 +701,7 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, GtkWidget* menu, MidoriBrowser* browser) { + gboolean has_selection; const gchar* uri; GtkAction* action; GtkWidget* menuitem; @@ -708,6 +709,12 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, GtkStockItem stockitem; GtkWidget* image; + if (MIDORI_IS_WEB_VIEW (web_view) + && midori_web_view_has_selection (MIDORI_WEB_VIEW (web_view))) + has_selection = TRUE; + else + has_selection = FALSE; + uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) { @@ -726,12 +733,12 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } - if (webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + if (has_selection) { /* TODO: view selection source */ } - if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + if (!uri && !has_selection) { action = _action_by_name (browser, "UndoTabClose"); menuitem = gtk_action_create_menu_item (action); diff --git a/midori/midori-webview.c b/midori/midori-webview.c index c55589cf..8afc0b2b 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -728,7 +728,7 @@ webkit_web_view_populate_popup_cb (GtkWidget* web_view, } } - if (!uri && webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) + if (!uri && midori_web_view_has_selection (MIDORI_WEB_VIEW (web_view))) { text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); if (text && strchr (text, '.') && !strchr (text, ' ')) @@ -1175,3 +1175,31 @@ midori_web_view_get_news_feeds (MidoriWebView* web_view) return web_view->news_feeds; return NULL; } + +/** + * midori_web_view_has_selection: + * @web_view: a #MidoriWebView + * + * Determines whether something on the page is selected. + * + * By contrast to webkit_web_view_has_selection() this + * returns %FALSE if there is a selection that + * effectively only consists of whitespace. + * + * Return value: %TRUE if effectively there is a selection + **/ +gboolean +midori_web_view_has_selection (MidoriWebView* web_view) +{ + gchar* text; + + g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); + + text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); + if (text && *text) + { + g_free (text); + return TRUE; + } + return FALSE; +} diff --git a/midori/midori-webview.h b/midori/midori-webview.h index ed7f965b..76571c72 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -117,6 +117,9 @@ midori_web_view_get_link_uri (MidoriWebView* web_view); MidoriWebList* midori_web_view_get_news_feeds (MidoriWebView* web_view); +gboolean +midori_web_view_has_selection (MidoriWebView* web_view); + G_END_DECLS #endif /* __MIDORI_WEB_VIEW_H__ */ From 6e910ee10752da6804511609a7d80da2e0d33290 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 Aug 2008 19:54:22 +0200 Subject: [PATCH 0255/2970] Create context menu items w/o accelerators --- midori/midori-browser.c | 23 +++++-------------- midori/sokoke.c | 49 ++++++++++++++++++++++++++++++++++++++--- midori/sokoke.h | 3 +++ 3 files changed, 55 insertions(+), 20 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cd354d61..97b1d314 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -705,9 +705,6 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, const gchar* uri; GtkAction* action; GtkWidget* menuitem; - gchar* stock_id; - GtkStockItem stockitem; - GtkWidget* image; if (MIDORI_IS_WEB_VIEW (web_view) && midori_web_view_has_selection (MIDORI_WEB_VIEW (web_view))) @@ -718,16 +715,8 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); if (uri) { - /* Create the menuitem manually instead of from the action - because otherwise the menuitem has an accelerator label. */ action = _action_by_name (browser, "BookmarkAdd"); - g_object_get (action, "stock-id", &stock_id, NULL); - gtk_stock_lookup (stock_id, &stockitem); - menuitem = gtk_image_menu_item_new_with_mnemonic (stockitem.label); - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_free (stock_id); - gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item (action); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_bookmark_add_cb), web_view); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -741,22 +730,22 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view, if (!uri && !has_selection) { action = _action_by_name (browser, "UndoTabClose"); - menuitem = gtk_action_create_menu_item (action); + menuitem = sokoke_action_create_popup_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); action = _action_by_name (browser, "BookmarkAdd"); - menuitem = gtk_action_create_menu_item (action); + menuitem = sokoke_action_create_popup_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); action = _action_by_name (browser, "SaveAs"); - menuitem = gtk_action_create_menu_item (action); + menuitem = sokoke_action_create_popup_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); action = _action_by_name (browser, "SourceView"); - menuitem = gtk_action_create_menu_item (action); + menuitem = sokoke_action_create_popup_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); action = _action_by_name (browser, "Print"); - menuitem = gtk_action_create_menu_item (action); + menuitem = sokoke_action_create_popup_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } } diff --git a/midori/sokoke.c b/midori/sokoke.c index a9d1f6eb..663a99e8 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -304,7 +304,7 @@ sokoke_xfce_header_new (const gchar* icon, const gchar* title) { /* Create an xfce header with icon and title - This returns NULL if the desktop is not xfce */ + This returns NULL if the desktop is not Xfce */ if (sokoke_get_desktop () == SOKOKE_DESKTOP_XFCE) { GtkWidget* entry = gtk_entry_new (); @@ -579,7 +579,7 @@ gint sokoke_object_get_int (gpointer object, const gchar* property) { - gint value; + gint value = 0; g_return_val_if_fail (object != NULL, FALSE); g_return_val_if_fail (G_IS_OBJECT (object), FALSE); @@ -593,7 +593,7 @@ gboolean sokoke_object_get_boolean (gpointer object, const gchar* property) { - gboolean value; + gboolean value = FALSE; g_return_val_if_fail (object != NULL, FALSE); g_return_val_if_fail (G_IS_OBJECT (object), FALSE); @@ -602,3 +602,46 @@ sokoke_object_get_boolean (gpointer object, g_object_get (object, property, &value, NULL); return value; } + +/** + * sokoke_action_create_popup_menu_item: + * @action: a #GtkAction + * + * Creates a menu item from an action, much like + * gtk_action_create_menu_item() but it won't + * display an accelerator. + * + * Return value: a new #GtkMenuItem + **/ +GtkWidget* +sokoke_action_create_popup_menu_item (GtkAction* action) +{ + gchar* label; + gchar* stock_id; + gboolean sensitive; + GtkStockItem stockitem; + GtkWidget* menuitem; + GtkWidget* image; + + g_object_get (action, "label", &label, + "stock-id", &stock_id, "sensitive", &sensitive, NULL); + if (label) + { + menuitem = gtk_image_menu_item_new_with_mnemonic (label); + g_free (label); + } + else + { + gtk_stock_lookup (stock_id, &stockitem); + menuitem = gtk_image_menu_item_new_with_mnemonic (stockitem.label); + gtk_stock_item_free (&stockitem); + } + gtk_widget_set_sensitive (menuitem, sensitive); + image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + gtk_widget_show (menuitem); + + g_free (stock_id); + + return menuitem; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 6d870b27..616c601f 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -128,4 +128,7 @@ gboolean sokoke_object_get_boolean (gpointer object, const gchar* property); +GtkWidget* +sokoke_action_create_popup_menu_item (GtkAction* action); + #endif /* !__SOKOKE_H__ */ From 8dbd06ce47e800dc97dfe8cb986fbcc43f8cf355 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 01:57:48 +0200 Subject: [PATCH 0256/2970] Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards --- midori/midori-browser.c | 425 +++++++++++++++------------------- midori/midori-locationentry.c | 87 +++++-- midori/midori-locationentry.h | 17 +- 3 files changed, 263 insertions(+), 266 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 97b1d314..d6f1605a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -9,7 +9,9 @@ See the file COPYING for the full license text. */ -#include "config.h" +#if HAVE_CONFIG_H + #include +#endif #include "midori-browser.h" @@ -22,7 +24,7 @@ #include "midori-addons.h" #include "midori-console.h" #include "midori-searchentry.h" -#include "midori-locationentry.h" +#include "midori-locationaction.h" #include "compat.h" #include "gjs.h" @@ -30,7 +32,6 @@ #include #endif #include -#include #include #if HAVE_GTKSOURCEVIEW #include @@ -52,7 +53,6 @@ struct _MidoriBrowser GtkWidget* navigationbar; GtkWidget* button_tab_new; GtkWidget* button_homepage; - GtkWidget* location; GtkWidget* search; GtkWidget* button_trash; GtkWidget* button_fullscreen; @@ -130,11 +130,6 @@ midori_browser_set_property (GObject* object, const GValue* value, GParamSpec* pspec); -static void -midori_browser_location_active_changed_cb (MidoriLocationEntry* location_entry, - gint index, - MidoriBrowser* browser); - static void midori_browser_get_property (GObject* object, guint prop_id, @@ -244,6 +239,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) gboolean loading; GtkWidget* widget; GtkWidget* web_view; + GtkAction* action; widget = midori_browser_get_current_tab (browser); web_view = widget && MIDORI_IS_WEB_VIEW (widget) ? widget : NULL; @@ -270,8 +266,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "FindPrevious", web_view != NULL); /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ - GtkAction* action = gtk_action_group_get_action (browser->action_group, - "ReloadStop"); + action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); if (!loading) { gtk_widget_set_sensitive (browser->throbber, FALSE); @@ -383,18 +378,25 @@ midori_web_view_notify_load_status_cb (GtkWidget* web_view, MidoriBrowser* browser) { const gchar* uri; + GtkAction* action; + + uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + action = _action_by_name (browser, "Location"); + + if (midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) + == MIDORI_LOAD_COMMITTED) + midori_location_action_add_uri ( + MIDORI_LOCATION_ACTION (action), uri); if (web_view == midori_browser_get_current_web_view (browser)) { if (midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) == MIDORI_LOAD_COMMITTED) { - uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - midori_location_entry_set_text (MIDORI_LOCATION_ENTRY ( - browser->location), uri); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, NULL); + midori_location_action_set_uri ( + MIDORI_LOCATION_ACTION (action), uri); + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), NULL); g_object_notify (G_OBJECT (browser), "uri"); } @@ -417,11 +419,20 @@ midori_web_view_notify_title_cb (GtkWidget* web_view, GParamSpec* pspec, MidoriBrowser* browser) { + const gchar* uri; + const gchar* title; + GtkAction* action; + gchar* window_title; + + uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + title = midori_web_view_get_display_title (MIDORI_WEB_VIEW (web_view)); + action = _action_by_name (browser, "Location"); + midori_location_action_set_title_for_uri ( + MIDORI_LOCATION_ACTION (action), title, uri); + if (web_view == midori_browser_get_current_web_view (browser)) { - const gchar* title = midori_web_view_get_display_title ( - MIDORI_WEB_VIEW (web_view)); - gchar* window_title = g_strconcat (title, " - ", + window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); @@ -459,20 +470,13 @@ midori_web_view_icon_ready_cb (MidoriWebView* web_view, GdkPixbuf* icon, MidoriBrowser* browser) { - MidoriLocationEntryItem item; + const gchar* uri; + GtkAction* action; - item.favicon = icon; - item.uri = midori_web_view_get_display_uri (web_view); - item.title = midori_web_view_get_display_title (web_view); - - g_signal_handlers_block_by_func (browser->location, - midori_browser_location_active_changed_cb, browser); - - midori_location_entry_add_item (MIDORI_LOCATION_ENTRY - (browser->location), &item); - - g_signal_handlers_unblock_by_func (browser->location, - midori_browser_location_active_changed_cb, browser); + uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + action = _action_by_name (browser, "Location"); + midori_location_action_set_icon_for_uri ( + MIDORI_LOCATION_ACTION (action), icon, uri); } static void @@ -482,9 +486,8 @@ midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, const gchar* title, MidoriBrowser* browser) { - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); + midori_location_action_set_secondary_icon (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), browser->stock_news_feed); } static gboolean @@ -1341,7 +1344,7 @@ _action_tab_new_activate (GtkAction* action, { gint n = midori_browser_add_uri (browser, ""); midori_browser_set_current_page (browser, n); - gtk_widget_grab_focus (browser->location); + gtk_action_activate (_action_by_name (browser, "Location")); } static void @@ -1960,88 +1963,128 @@ _action_homepage_activate (GtkAction* action, g_free (homepage); } -/* catch the active-changed signal so that we can display the pack - when selected from the list */ -static void -midori_browser_location_active_changed_cb (MidoriLocationEntry* location_entry, - gint index, - MidoriBrowser* browser) -{ - const gchar* uri; - - if (index > -1) - { - uri = midori_location_entry_get_text (location_entry); - _midori_browser_open_uri (browser, uri); - } -} - -static gboolean -midori_browser_location_key_press_event_cb (GtkWidget* widget, - GdkEventKey* event, - MidoriBrowser* browser) -{ - gchar* location_entry_search; - - switch (event->keyval) - { - case GDK_ISO_Enter: - case GDK_KP_Enter: - case GDK_Return: - { - const gchar* uri = gtk_entry_get_text (GTK_ENTRY (widget)); - if (uri) - { - g_object_get (browser->settings, "location-entry-search", - &location_entry_search, NULL); - gchar* new_uri = sokoke_magic_uri (uri, browser->search_engines); - if (!new_uri && strstr (location_entry_search, "%s")) - new_uri = g_strdup_printf (location_entry_search, uri); - else if (!new_uri) - new_uri = g_strdup (location_entry_search); - g_free (location_entry_search); - /* TODO: Use new_uri intermediately when completion is better - Completion should be generated from history, that is - the uri as well as the title. */ - /* sokoke_entry_append_completion (GTK_ENTRY (widget), uri); */ - _midori_browser_open_uri (browser, new_uri); - g_free (new_uri); - gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); - } - return TRUE; - } - case GDK_Escape: - { - const gchar* uri = _midori_browser_get_tab_uri ( - browser, midori_browser_get_current_tab (browser)); - gtk_entry_set_text (GTK_ENTRY (widget), uri); - return TRUE; - } - } - return FALSE; -} - static void _action_location_activate (GtkAction* action, MidoriBrowser* browser) { if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) gtk_widget_show (browser->navigationbar); - gtk_widget_grab_focus (browser->location); } -static gboolean -midori_browser_location_focus_out_event_cb (GtkWidget* widget, - GdkEventFocus* event, - MidoriBrowser* browser) +static void +_action_location_active_changed (GtkAction* action, + gint index, + MidoriBrowser* browser) { - gboolean show_navigationbar; - g_object_get (browser->settings, - "show-navigationbar", &show_navigationbar, - NULL); - if (!show_navigationbar) + const gchar* uri; + + if (index > -1) + { + uri = midori_location_action_get_uri (MIDORI_LOCATION_ACTION (action)); + _midori_browser_open_uri (browser, uri); + } +} + +static void +_action_location_focus_out (GtkAction* action, + MidoriBrowser* browser) +{ + if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_hide (browser->navigationbar); - return FALSE; +} + +static void +_action_location_reset_uri (GtkAction* action, + MidoriBrowser* browser) +{ + const gchar* uri; + + uri = _midori_browser_get_tab_uri (browser, + midori_browser_get_current_tab (browser)); + midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); +} + +static void +_action_location_submit_uri (GtkAction* action, + const gchar* uri, + MidoriBrowser* browser) +{ + gchar* location_entry_search; + gchar* new_uri; + + g_object_get (browser->settings, "location-entry-search", + &location_entry_search, NULL); + new_uri = sokoke_magic_uri (uri, browser->search_engines); + if (!new_uri && strstr (location_entry_search, "%s")) + new_uri = g_strdup_printf (location_entry_search, uri); + else if (!new_uri) + new_uri = g_strdup (location_entry_search); + g_free (location_entry_search); + _midori_browser_open_uri (browser, new_uri); + g_free (new_uri); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); +} + +static void +midori_browser_menu_feed_item_activate_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + const gchar* uri; + + uri = g_object_get_data (G_OBJECT (widget), "uri"); + _midori_browser_open_uri (browser, uri); +} + +static void +_action_location_secondary_icon_released (GtkAction* action, + GtkWidget* widget, + MidoriBrowser* browser) +{ + MidoriWebView* web_view; + MidoriWebList* news_feeds; + GtkWidget* menu; + guint n, i; + GjsValue* feed; + const gchar* uri; + const gchar* title; + GtkWidget* menuitem; + + web_view = (MidoriWebView*)midori_browser_get_current_web_view (browser); + if (web_view) + { + news_feeds = midori_web_view_get_news_feeds (web_view); + n = news_feeds ? midori_web_list_get_length (news_feeds) : 0; + if (n) + { + menu = gtk_menu_new (); + for (i = 0; i < n; i++) + { + if (!(feed = midori_web_list_get_nth_item (news_feeds, i))) + continue; + + uri = gjs_value_get_attribute_string (feed, "href"); + if (gjs_value_has_attribute (feed, "title")) + title = gjs_value_get_attribute_string (feed, "title"); + else + title = uri; + if (!*title) + title = uri; + menuitem = gtk_image_menu_item_new_with_label (title); + /* FIXME: Get the real icon */ + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( + menuitem), gtk_image_new_from_stock (browser->stock_news_feed, + GTK_ICON_SIZE_MENU)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_menu_feed_item_activate_cb), + browser); + gtk_widget_show (menuitem); + } + sokoke_widget_popup (widget, GTK_MENU (menu), NULL, + SOKOKE_MENU_POSITION_CURSOR); + } + } } static void @@ -2436,82 +2479,6 @@ _action_about_activate (GtkAction* action, NULL); } -static void -midori_browser_location_changed_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - /* Preserve changes to the uri - const gchar* new_uri = gtk_entry_get_text (GTK_ENTRY (widget)); - katze_xbel_bookmark_set_href(browser->sessionItem, new_uri); - FIXME: If we want this feature, this is the wrong approach */ -} - -static void -midori_browser_menu_feed_item_activate_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - const gchar* uri; - - uri = g_object_get_data (G_OBJECT (widget), "uri"); - _midori_browser_open_uri (browser, uri); -} - -static void -midori_browser_location_icon_released_cb (GtkWidget* widget, - gint icon_pos, - gint button, - MidoriBrowser* browser) -{ - MidoriWebView* web_view; - MidoriWebList* news_feeds; - GtkWidget* menu; - guint n, i; - GjsValue* feed; - const gchar* uri; - const gchar* title; - GtkWidget* menuitem; - - if (icon_pos == GTK_ICON_ENTRY_SECONDARY) - { - web_view = (MidoriWebView*)midori_browser_get_current_web_view (browser); - if (web_view) - { - news_feeds = midori_web_view_get_news_feeds (web_view); - n = news_feeds ? midori_web_list_get_length (news_feeds) : 0; - if (n) - { - menu = gtk_menu_new (); - for (i = 0; i < n; i++) - { - if (!(feed = midori_web_list_get_nth_item (news_feeds, i))) - continue; - - uri = gjs_value_get_attribute_string (feed, "href"); - if (gjs_value_has_attribute (feed, "title")) - title = gjs_value_get_attribute_string (feed, "title"); - else - title = uri; - if (!*title) - title = uri; - menuitem = gtk_image_menu_item_new_with_label (title); - /* FIXME: Get the real icon */ - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( - menuitem), gtk_image_new_from_stock (STOCK_NEWS_FEED, - GTK_ICON_SIZE_MENU)); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_menu_feed_item_activate_cb), - browser); - gtk_widget_show (menuitem); - } - sokoke_widget_popup (widget, GTK_MENU (menu), NULL, - SOKOKE_MENU_POSITION_CURSOR); - } - } - } -} - static void _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -2562,18 +2529,14 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, { GtkWidget* widget; const gchar* uri; + GtkAction* action; const gchar* title; gchar* window_title; widget = midori_browser_get_current_tab (browser); uri = _midori_browser_get_tab_uri (browser, widget); - - g_signal_handlers_block_by_func (browser->location, - midori_browser_location_active_changed_cb, browser); - midori_location_entry_set_item_from_uri (MIDORI_LOCATION_ENTRY - (browser->location), uri); - g_signal_handlers_unblock_by_func (browser->location, - midori_browser_location_active_changed_cb, browser); + action = _action_by_name (browser, "Location"); + midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); title = _midori_browser_get_tab_title (browser, widget); window_title = g_strconcat (title, " - ", @@ -2834,18 +2797,16 @@ static const GtkActionEntry entries[] = { { "Homepage", STOCK_HOMEPAGE, NULL, "Home", N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, - { "Location", GTK_STOCK_JUMP_TO, - N_("Location..."), "l", - N_("Open a particular location"), G_CALLBACK (_action_location_activate) }, { "Search", GTK_STOCK_FIND, - N_("Web Search..."), "k", + N_("_Web Search..."), "k", N_("Run a web search"), G_CALLBACK (_action_search_activate) }, { "OpenInPageholder", GTK_STOCK_JUMP_TO, N_("Open in Page_holder..."), "", N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) }, { "Trash", STOCK_USER_TRASH, N_("Closed Tabs and Windows"), "", - N_("Reopen a previously closed tab or window"), NULL }, +/* N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, */ + N_("Reopen a previously closed tab or window"), G_CALLBACK (midori_browser_menu_trash_activate_cb) }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, @@ -3086,9 +3047,9 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" - "" + "" "" "" "" @@ -3175,8 +3136,8 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, } static void -midori_browser_search_notify_current_item_cb (GObject *gobject, - GParamSpec *arg1, +midori_browser_search_notify_current_item_cb (GObject* gobject, + GParamSpec* arg1, MidoriBrowser* browser) { MidoriSearchEntry* search_entry; @@ -3197,6 +3158,7 @@ midori_browser_search_notify_current_item_cb (GObject *gobject, static void midori_browser_init (MidoriBrowser* browser) { + GtkToolItem* toolitem; GtkRcStyle* rcstyle; browser->stock_news_feed = GTK_STOCK_INDEX; @@ -3256,6 +3218,32 @@ midori_browser_init (MidoriBrowser* browser) /* _action_set_active(browser, "Transferbar", config->toolbarTransfers); */ + action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, + "name", "Location", + "label", _("_Location..."), + "stock-id", GTK_STOCK_JUMP_TO, + "tooltip", _("Open a particular location"), + /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ + "secondary-icon", browser->stock_news_feed, + NULL); + g_object_connect (action, + "signal::activate", + _action_location_activate, browser, + "signal::active-changed", + _action_location_active_changed, browser, + "signal::focus-out", + _action_location_focus_out, browser, + "signal::reset-uri", + _action_location_reset_uri, browser, + "signal::submit-uri", + _action_location_submit_uri, browser, + "signal::secondary-icon-released", + _action_location_secondary_icon_released, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, + action, "L"); + g_object_unref (action); + /* Create the menubar */ browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new (); @@ -3309,37 +3297,6 @@ midori_browser_init (MidoriBrowser* browser) browser->button_homepage = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/Homepage"); - /* Location */ - browser->location = midori_location_entry_new (); - /* FIXME: sokoke_entry_setup_completion (GTK_ENTRY (browser->location)); */ - g_object_connect (browser->location, - "signal::active-changed", - midori_browser_location_active_changed_cb, browser, NULL); - g_object_connect (gtk_bin_get_child (GTK_BIN (browser->location)), - "signal::key-press-event", - midori_browser_location_key_press_event_cb, browser, - "signal::focus-out-event", - midori_browser_location_focus_out_event_cb, browser, - "signal::changed", - midori_browser_location_changed_cb, browser, - NULL); - /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, TRUE); - g_signal_connect (gtk_bin_get_child (GTK_BIN (browser->location)), - "icon-released", G_CALLBACK (midori_browser_location_icon_released_cb), - browser); - GtkToolItem* toolitem = gtk_tool_item_new (); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - GtkWidget* align = gtk_alignment_new (0, 0.5, 1, 0.1); - gtk_container_add (GTK_CONTAINER (align), browser->location); - gtk_container_add (GTK_CONTAINER(toolitem), align); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), toolitem, -1); - /* Search */ browser->search = midori_search_entry_new (); /* TODO: Make this actively resizable or enlarge to fit contents? @@ -4124,7 +4081,7 @@ midori_browser_set_current_page (MidoriBrowser* browser, GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); GtkWidget* widget = _midori_browser_child_for_scrolled (browser, scrolled); if (widget && !strcmp (_midori_browser_get_tab_uri (browser, widget), "")) - gtk_widget_grab_focus (browser->location); + gtk_action_activate (_action_by_name (browser, "Location")); else gtk_widget_grab_focus (widget); } @@ -4164,7 +4121,7 @@ midori_browser_set_current_tab (MidoriBrowser* browser, gint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); if (widget && !strcmp (_midori_browser_get_tab_uri (browser, widget), "")) - gtk_widget_grab_focus (browser->location); + gtk_action_activate (_action_by_name (browser, "Location")); else gtk_widget_grab_focus (widget); } diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index d9b84dfd..bebbac9c 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -17,6 +17,16 @@ #define DEFAULT_ICON GTK_STOCK_FILE +struct _MidoriLocationEntry +{ + GtkComboBoxEntry parent_instance; +}; + +struct _MidoriLocationEntryClass +{ + GtkComboBoxEntryClass parent_class; +}; + G_DEFINE_TYPE (MidoriLocationEntry, midori_location_entry, GTK_TYPE_COMBO_BOX_ENTRY) enum @@ -41,8 +51,8 @@ entry_key_press_event (GtkWidget* widget, MidoriLocationEntry* location_entry); static void -midori_location_entry_active_changed (GtkComboBox* combo_box, - gpointer user_data); +midori_location_entry_changed (GtkComboBox* combo_box, + gpointer user_data); static void midori_location_entry_class_init (MidoriLocationEntryClass* class) @@ -100,7 +110,7 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), -1); - g_signal_connect (location_entry, "changed", G_CALLBACK (midori_location_entry_active_changed), NULL); + g_signal_connect (location_entry, "changed", G_CALLBACK (midori_location_entry_changed), NULL); } static gboolean @@ -123,8 +133,8 @@ entry_key_press_event (GtkWidget* widget, } static void -midori_location_entry_active_changed (GtkComboBox* combo_box, - gpointer user_data) +midori_location_entry_changed (GtkComboBox* combo_box, + gpointer user_data) { GtkTreeIter iter; GtkIconEntry* entry; @@ -153,21 +163,48 @@ midori_location_entry_active_changed (GtkComboBox* combo_box, } static void -midori_location_entry_set_item (GtkTreeModel* model, +midori_location_entry_set_item (MidoriLocationEntry* entry, GtkTreeIter* iter, MidoriLocationEntryItem* item) { - gchar* desc = NULL; + GtkTreeModel* model; + gchar* title; + gchar* desc; + GdkPixbuf* icon; + GdkPixbuf* new_icon; + model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry)); + gtk_tree_model_get (model, iter, TITLE_COL, &title, -1); if (item->title) desc = g_markup_printf_escaped ("%s - %s", item->uri, item->title); - else + else if (!title && !item->title) desc = g_markup_printf_escaped ("%s", item->uri); + else + desc = NULL; + if (desc) + { + gtk_list_store_set (GTK_LIST_STORE (model), iter, + TITLE_COL, desc, -1); + g_free (desc); + } gtk_list_store_set (GTK_LIST_STORE (model), iter, - FAVICON_COL, item->favicon, URI_COL, item->uri, TITLE_COL, desc, -1); + URI_COL, item->uri, -1); - g_free (desc); + gtk_tree_model_get (model, iter, FAVICON_COL, &icon, -1); + if (item->favicon) + new_icon = g_object_ref (item->favicon); + else if (!icon && !item->favicon) + new_icon = gtk_widget_render_icon (GTK_WIDGET (entry), DEFAULT_ICON, + GTK_ICON_SIZE_MENU, NULL); + else + new_icon = NULL; + if (new_icon) + { + gtk_list_store_set (GTK_LIST_STORE (model), iter, + FAVICON_COL, new_icon, -1); + g_object_unref (new_icon); + } } static void @@ -183,7 +220,7 @@ midori_location_entry_set_active_iter (MidoriLocationEntry* location_entry, gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), iter); /* When setting the active iter (when adding or setting an item) - * The favicon may have change, so we must update the entry favicon. + * The favicon may have changed, so we must update the entry favicon. */ if (entry) { @@ -267,7 +304,7 @@ midori_location_entry_get_text (MidoriLocationEntry* location_entry) g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), NULL); entry = gtk_bin_get_child (GTK_BIN (location_entry)); - g_return_val_if_fail (GTK_IS_ICON_ENTRY (entry), NULL); + g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); return gtk_entry_get_text (GTK_ENTRY (entry)); } @@ -277,20 +314,34 @@ midori_location_entry_get_text (MidoriLocationEntry* location_entry) * @location_entry: a #MidoriLocationEntry * @text: a string * - * Sets the entry text to @text. + * Sets the entry text to @text and, if applicable, updates the icon. **/ void midori_location_entry_set_text (MidoriLocationEntry* location_entry, const gchar* text) { GtkWidget* entry; + GtkTreeIter iter; + GtkTreeModel* model; + GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); entry = gtk_bin_get_child (GTK_BIN (location_entry)); - g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); + g_return_if_fail (GTK_IS_ENTRY (entry)); gtk_entry_set_text (GTK_ENTRY (entry), text); + if (midori_location_entry_item_iter (location_entry, text, &iter)) + { + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + } + /* FIXME: Due to a bug in GtkIconEntry we can't reset the icon + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON);*/ } /** @@ -334,7 +385,7 @@ midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, found = midori_location_entry_item_iter (MIDORI_LOCATION_ENTRY (location_entry), uri, &iter); - if(found) + if (found) midori_location_entry_set_active_iter (location_entry, &iter); else midori_location_entry_clear (location_entry); @@ -347,7 +398,6 @@ midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, * @item: a MidoriLocationItem * * Adds @item if it is not already in the list. - * Sets @item to be active. **/ void midori_location_entry_add_item (MidoriLocationEntry* location_entry, @@ -360,7 +410,6 @@ midori_location_entry_add_item (MidoriLocationEntry* location_entry, g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); - g_return_if_fail (item->favicon != NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); if (gtk_tree_model_get_iter_first (model, &iter)) @@ -383,7 +432,7 @@ midori_location_entry_add_item (MidoriLocationEntry* location_entry, if (!item_exists) gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); - midori_location_entry_set_item (model, &iter, item); - midori_location_entry_set_active_iter (location_entry, &iter); + midori_location_entry_set_item (location_entry, &iter, item); + /*midori_location_entry_set_active_iter (location_entry, &iter);*/ } diff --git a/midori/midori-locationentry.h b/midori/midori-locationentry.h index 02a00e1d..d6421b47 100644 --- a/midori/midori-locationentry.h +++ b/midori/midori-locationentry.h @@ -27,16 +27,6 @@ typedef struct _MidoriLocationEntry MidoriLocationEntry; typedef struct _MidoriLocationEntryClass MidoriLocationEntryClass; typedef struct _MidoriLocationEntryItem MidoriLocationEntryItem; -struct _MidoriLocationEntry -{ - GtkComboBoxEntry parent_instance; -}; - -struct _MidoriLocationEntryClass -{ - GtkComboBoxEntryClass parent_class; -}; - struct _MidoriLocationEntryItem { GdkPixbuf* favicon; @@ -50,9 +40,10 @@ midori_location_entry_get_type (void); GtkWidget* midori_location_entry_new (void); -gint -midori_location_entry_item_index (MidoriLocationEntry* location_entry, - const gchar* uri); +gboolean +midori_location_entry_item_iter (MidoriLocationEntry* location_entry, + const gchar* uri, + GtkTreeIter* iter); const gchar* midori_location_entry_get_text (MidoriLocationEntry* location_entry); From 8ac30357c03d2d303aa9e96d8c3644c41338fce2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 02:03:55 +0200 Subject: [PATCH 0257/2970] Move around headers and localization code --- midori/gjs.c | 2 +- midori/main.c | 24 +++++++++--------------- midori/midori-addons.c | 5 ++++- midori/sokoke.c | 6 ++++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/midori/gjs.c b/midori/gjs.c index ca842655..b0ddd6f4 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -384,7 +384,7 @@ gjs_value_get_elements_by_tag_name (GjsValue* value, gchar* script; GjsValue* elements; - g_return_val_if_fail (gjs_value_is_valid (value), NULL); + g_return_val_if_fail (gjs_value_is_object (value), NULL); g_return_val_if_fail (name, NULL); script = g_strdup_printf ("return this.getElementsByTagName ('%s');", name); diff --git a/midori/main.c b/midori/main.c index f195b464..be6861f0 100644 --- a/midori/main.c +++ b/midori/main.c @@ -9,6 +9,10 @@ See the file COPYING for the full license text. */ +#if HAVE_CONFIG_H + #include +#endif + #include "main.h" #include "sokoke.h" @@ -21,10 +25,6 @@ #include #include -#if HAVE_CONFIG_H - #include "config.h" -#endif - #ifdef ENABLE_NLS #include #endif @@ -81,16 +81,6 @@ stock_items_init (void) g_object_unref (factory); } -static void -locale_init (void) -{ -#ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); -#endif -} - static MidoriWebSettings* settings_new_from_file (const gchar* filename) { @@ -388,7 +378,11 @@ main (int argc, gchar* homepage; MidoriWebList* search_engines; - locale_init (); + #ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + #endif g_set_application_name (_("Midori")); /* Parse cli options */ diff --git a/midori/midori-addons.c b/midori/midori-addons.c index d5d8aae0..bc7d8357 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -10,12 +10,15 @@ See the file COPYING for the full license text. */ -#include "config.h" +#if HAVE_CONFIG_H + #include +#endif #include "midori-addons.h" #include "sokoke.h" #include "gjs.h" + #include #include #include diff --git a/midori/sokoke.c b/midori/sokoke.c index 663a99e8..ccd99177 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -9,9 +9,11 @@ See the file COPYING for the full license text. */ -#include "sokoke.h" +#if HAVE_CONFIG_H + #include +#endif -#include "config.h" +#include "sokoke.h" #include "main.h" #ifdef HAVE_UNISTD_H From 42095e3aa4c35414db1ed76a9fd64ec319f95eef Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 02:18:33 +0200 Subject: [PATCH 0258/2970] Don't use the wrong Trash callback --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d6f1605a..74cb08ba 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2806,7 +2806,7 @@ static const GtkActionEntry entries[] = { { "Trash", STOCK_USER_TRASH, N_("Closed Tabs and Windows"), "", /* N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, */ - N_("Reopen a previously closed tab or window"), G_CALLBACK (midori_browser_menu_trash_activate_cb) }, + N_("Reopen a previously closed tab or window"), NULL }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, From c17f7135dddf6fed1f128643e51ed7c9f69f73cb Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Fri, 15 Aug 2008 02:20:05 +0200 Subject: [PATCH 0259/2970] Look for userscripts in system paths --- midori/midori-addons.c | 181 +++++++++++++++++++++++++---------------- 1 file changed, 109 insertions(+), 72 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index bc7d8357..50de6fae 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -182,6 +182,63 @@ _addons_get_extension (MidoriAddons* addons) } } +static GSList* +_addons_get_files (MidoriAddons* addons) +{ + GSList* files; + GDir* addon_dir; + const gchar* addons_name; + const gchar* addons_extension; + const char* const *datadirs; + const gchar* filename; + gchar *dirname; + gchar *fullname; + + files = NULL; + addons_name = _addons_get_folder (addons); + addons_extension = _addons_get_extension (addons); + + /* system data dirs */ + datadirs = g_get_system_data_dirs (); + while (*datadirs) + { + dirname = g_build_filename (*datadirs, PACKAGE_NAME, addons_name, NULL); + if ((addon_dir = g_dir_open (dirname, 0, NULL))) + { + while ((filename = g_dir_read_name (addon_dir))) + { + if (g_str_has_suffix (filename, addons_extension)) + { + fullname = g_build_filename (dirname, filename, NULL); + files = g_slist_prepend (files, fullname); + } + } + g_dir_close (addon_dir); + } + g_free (dirname); + datadirs++; + } + + /* user data dir */ + dirname = g_build_filename (g_get_user_data_dir () , PACKAGE_NAME, + addons_name, NULL); + if ((addon_dir = g_dir_open (dirname, 0, NULL))) + { + while ((filename = g_dir_read_name (addon_dir))) + { + if (g_str_has_suffix (filename, addons_extension)) + { + fullname = g_build_filename (dirname, filename, NULL); + files = g_slist_prepend (files, fullname); + } + } + g_dir_close (addon_dir); + } + g_free (dirname); + + return files; +} + static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) @@ -547,59 +604,50 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, JSObjectRef js_window, MidoriAddons* addons) { - gchar* addon_path; - GDir* addon_dir; - const gchar* filename; gchar* fullname; GSList* includes; GSList* excludes; const gchar* uri; gchar* exception; gchar* message; + GSList* addon_files; + GSList* list; uri = webkit_web_frame_get_uri (web_frame); if (!uri) return; - /* FIXME: We want to honor system installed addons as well */ - addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _addons_get_folder (addons), NULL); - if ((addon_dir = g_dir_open (addon_path, 0, NULL))) + addon_files = _addons_get_files(addons); + list = addon_files; + while (addon_files) { - while ((filename = g_dir_read_name (addon_dir))) + fullname = addon_files->data; + includes = NULL; + excludes = NULL; + if (!_metadata_from_file (fullname, &includes, &excludes, NULL, NULL)) { - if (!g_str_has_suffix (filename, _addons_get_extension (addons))) - continue; - - fullname = g_build_filename (addon_path, filename, NULL); - includes = NULL; - excludes = NULL; - if (!_metadata_from_file (fullname, - &includes, &excludes, NULL, NULL)) - { - g_free (fullname); - continue; - } - if (includes || excludes) - if (!_may_load_script (uri, &includes, &excludes)) - { - g_free (fullname); - continue; - } - g_slist_free (includes); - g_slist_free (excludes); - exception = NULL; - if (!_js_script_from_file (js_context, fullname, &exception)) - { - message = g_strdup_printf ("console.error ('%s');", exception); - gjs_script_eval (js_context, message, NULL); - g_free (message); - g_free (exception); - } - g_free (fullname); + addon_files = addon_files->next; + continue; } - g_dir_close (addon_dir); + if (includes || excludes) + if (!_may_load_script (uri, &includes, &excludes)) + { + addon_files = addon_files->next; + continue; + } + g_slist_free (includes); + g_slist_free (excludes); + exception = NULL; + if (!_js_script_from_file (js_context, fullname, &exception)) + { + message = g_strdup_printf ("console.error ('%s');", exception); + gjs_script_eval (js_context, message, NULL); + g_free (message); + g_free (exception); + } + addon_files = addon_files->next; } + g_slist_free (list); } /** @@ -680,13 +728,12 @@ midori_addons_set_kind (MidoriAddons* addons, MidoriAddonKind kind) { GtkListStore* liststore; - gchar* addon_path; - GDir* addon_dir; - const gchar* filename; - const gchar* displayname; gchar* fullname; + gchar* displayname; gchar* name; GtkTreeIter iter; + GSList* addon_files; + GSList* list; g_return_if_fail (MIDORI_IS_ADDONS (addons)); g_return_if_fail (addons->kind == MIDORI_ADDON_NONE); @@ -705,45 +752,35 @@ midori_addons_set_kind (MidoriAddons* addons, liststore = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING); - /* FIXME: We want to honor system installed addons as well */ - addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - _addons_get_folder (addons), NULL); - addon_dir = g_dir_open (addon_path, 0, NULL); - if (addon_dir) + + addon_files = _addons_get_files (addons); + list = addon_files; + while (addon_files) { - while ((filename = g_dir_read_name (addon_dir))) + fullname = addon_files->data; + displayname = g_filename_display_basename (fullname); + + if (kind == MIDORI_ADDON_USER_SCRIPTS) { - if (!g_str_has_suffix (filename, _addons_get_extension (addons))) + name = NULL; + if (!_metadata_from_file (fullname, NULL, NULL, &name, NULL)) continue; - - displayname = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); - if (!displayname) - displayname = filename; - - if (kind == MIDORI_ADDON_USER_SCRIPTS) + if (name) { - fullname = g_build_filename (addon_path, filename, NULL); - name = NULL; - if (!_metadata_from_file (fullname, NULL, NULL, - &name, NULL)) - { - g_free (fullname); - continue; - } - if (name) - displayname = name; - g_free (fullname); + g_free (displayname); + displayname = name; } - - gtk_list_store_append (liststore, &iter); - gtk_list_store_set (liststore, &iter, - 0, displayname, 1, 0, 2, "", -1); } - g_dir_close (addon_dir); + + gtk_list_store_append (liststore, &iter); + gtk_list_store_set (liststore, &iter, 0, displayname, 1, 0, 2, "", -1); + addon_files = addon_files->next; } + + g_slist_free (list); + gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), GTK_TREE_MODEL (liststore)); - g_object_notify (G_OBJECT (addons), "kind"); } From 37860b9bba24628f57d651c64229233031c0fa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Fri, 15 Aug 2008 02:25:06 +0200 Subject: [PATCH 0260/2970] Fallback to glibtoolize, such as on Darwin --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 2d0c0882..dd4632a3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ echo "no" | glib-gettextize --force --copy intltoolize --copy --force --automake -libtoolize --copy --force +libtoolize --copy --force || glibtoolize --copy --force aclocal autoheader autoconf From 16cb5b45bb66a66b6f6aa533219250cd811f239a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Fri, 15 Aug 2008 02:36:04 +0200 Subject: [PATCH 0261/2970] Make wrapped makefile's 'install' target phony --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 28e8a727..1f801a4a 100755 --- a/configure +++ b/configure @@ -112,6 +112,8 @@ install: $WAF install; \\ fi; +.PHONY: install + uninstall: @if test -n "\$(DESTDIR)"; then \\ $WAF uninstall --destdir="\$(DESTDIR)"; \\ From 6ab8bd6fd8bd77efee070cae2ece893a12341803 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 02:50:18 +0200 Subject: [PATCH 0262/2970] Fix Glib/ GtkSoureview conditionals --- midori/midori-browser.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 74cb08ba..59691503 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1821,7 +1821,7 @@ _action_source_view_activate (GtkAction* action, { GtkWidget* web_view; const gchar* uri; - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO GFile* file; gchar* tag; #ifdef HAVE_GTKSOURCEVIEW @@ -1833,7 +1833,7 @@ _action_source_view_activate (GtkAction* action, gchar* contents_utf8; #ifdef HAVE_GTKSOURCEVIEW GtkSourceBuffer* buffer; - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO GtkSourceLanguageManager* language_manager; GtkSourceLanguage* language; #endif @@ -1850,7 +1850,7 @@ _action_source_view_activate (GtkAction* action, contents = NULL; - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO file = g_file_new_for_uri (uri); tag = NULL; #ifdef HAVE_GTKSOURCEVIEW @@ -1878,6 +1878,7 @@ _action_source_view_activate (GtkAction* action, #ifdef HAVE_GTKSOURCEVIEW buffer = gtk_source_buffer_new (NULL); gtk_source_buffer_set_highlight_syntax (buffer, TRUE); + #ifdef HAVE_GIO if (content_type) { language_manager = gtk_source_language_manager_get_default (); @@ -1900,6 +1901,7 @@ _action_source_view_activate (GtkAction* action, gtk_source_buffer_set_language (buffer, language); } } + #endif #else buffer = gtk_text_buffer_new (NULL); #endif @@ -1920,7 +1922,7 @@ _action_source_view_activate (GtkAction* action, g_object_unref (buffer); g_free (contents_utf8); - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO g_free (tag); #endif } From 48885bf9ae06766219c3464974406087cbd0d112 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 02:58:09 +0200 Subject: [PATCH 0263/2970] Create proxy menus without accels properly Actually attempting to imitate Gtk's logic for creating menu items from actions was silly. It even had a rather obvious bug, no signals were ever connected. Now we leave all the work except for creating an empty image menu item to Gtk. And it works better than before. --- midori/sokoke.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index ccd99177..ea476f93 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -609,7 +609,7 @@ sokoke_object_get_boolean (gpointer object, * sokoke_action_create_popup_menu_item: * @action: a #GtkAction * - * Creates a menu item from an action, much like + * Creates a menu item from an action, just like * gtk_action_create_menu_item() but it won't * display an accelerator. * @@ -618,32 +618,10 @@ sokoke_object_get_boolean (gpointer object, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action) { - gchar* label; - gchar* stock_id; - gboolean sensitive; - GtkStockItem stockitem; GtkWidget* menuitem; - GtkWidget* image; - g_object_get (action, "label", &label, - "stock-id", &stock_id, "sensitive", &sensitive, NULL); - if (label) - { - menuitem = gtk_image_menu_item_new_with_mnemonic (label); - g_free (label); - } - else - { - gtk_stock_lookup (stock_id, &stockitem); - menuitem = gtk_image_menu_item_new_with_mnemonic (stockitem.label); - gtk_stock_item_free (&stockitem); - } - gtk_widget_set_sensitive (menuitem, sensitive); - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - gtk_widget_show (menuitem); - - g_free (stock_id); + menuitem = gtk_image_menu_item_new_with_mnemonic (""); + gtk_action_connect_proxy (action, menuitem); return menuitem; } From 97793d88cbe6b845f94a7e35b16c37a8e9d35312 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 10:07:51 +0200 Subject: [PATCH 0264/2970] Actually commit MidoriLocationAction this time --- midori/Makefile.am | 1 + midori/midori-locationaction.c | 515 +++++++++++++++++++++++++++++++++ midori/midori-locationaction.h | 62 ++++ 3 files changed, 578 insertions(+) create mode 100644 midori/midori-locationaction.c create mode 100644 midori/midori-locationaction.h diff --git a/midori/Makefile.am b/midori/Makefile.am index b3a009b7..99ed5170 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -31,6 +31,7 @@ midori_SOURCES = \ midori-preferences.c midori-preferences.h \ midori-searchentry.c midori-searchentry.h \ midori-locationentry.c midori-locationentry.h \ + midori-locationaction.c midori-locationaction.h \ gjs.c gjs.h \ sokoke.c sokoke.h \ compat.c compat.h diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c new file mode 100644 index 00000000..bf4de194 --- /dev/null +++ b/midori/midori-locationaction.c @@ -0,0 +1,515 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-locationaction.h" + +#include "main.h" +#include "gtkiconentry.h" + +#include +#include +#include + +struct _MidoriLocationAction +{ + GtkAction parent_instance; + + gchar* uri; +}; + +struct _MidoriLocationActionClass +{ + GtkActionClass parent_class; +}; + +G_DEFINE_TYPE (MidoriLocationAction, midori_location_action, GTK_TYPE_ACTION) + +enum +{ + PROP_0, + + PROP_SECONDARY_ICON +}; + +enum +{ + ACTIVE_CHANGED, + FOCUS_OUT, + SECONDARY_ICON_RELEASED, + RESET_URI, + SUBMIT_URI, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_location_action_finalize (GObject* object); + +static void +midori_location_action_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_location_action_activate (GtkAction* object); + +static GtkWidget* +midori_location_action_create_tool_item (GtkAction* action); + +static void +midori_location_action_connect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +midori_location_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +midori_location_action_class_init (MidoriLocationActionClass* class) +{ + GObjectClass* gobject_class; + GtkActionClass* action_class; + + signals[ACTIVE_CHANGED] = g_signal_new ("active-changed", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); + + signals[FOCUS_OUT] = g_signal_new ("focus-out", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[SECONDARY_ICON_RELEASED] = g_signal_new ("secondary-icon-released", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_WIDGET); + + signals[RESET_URI] = g_signal_new ("reset-uri", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[SUBMIT_URI] = g_signal_new ("submit-uri", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_location_action_finalize; + gobject_class->set_property = midori_location_action_set_property; + + action_class = GTK_ACTION_CLASS (class); + action_class->activate = midori_location_action_activate; + action_class->create_tool_item = midori_location_action_create_tool_item; + action_class->connect_proxy = midori_location_action_connect_proxy; + action_class->disconnect_proxy = midori_location_action_disconnect_proxy; + + g_object_class_install_property (gobject_class, + PROP_SECONDARY_ICON, + g_param_spec_string ( + "secondary-icon", + "Secondary", + _("The stock ID of the secondary icon"), + NULL, + G_PARAM_WRITABLE)); +} + +static void +midori_location_action_init (MidoriLocationAction* location_action) +{ + location_action->uri = NULL; +} + +static void +midori_location_action_finalize (GObject* object) +{ + MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object); + + g_free (location_action->uri); + + G_OBJECT_CLASS (midori_location_action_parent_class)->finalize (object); +} + +static void +midori_location_action_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object); + + switch (prop_id) + { + case PROP_SECONDARY_ICON: + { + midori_location_action_set_secondary_icon (location_action, + g_value_get_string (value)); + break; + } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_location_action_activate (GtkAction* action) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + proxies = gtk_action_get_proxies (action); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + /* Obviously only one widget can end up with the focus. + Yet we can't predict which one that is, can we? */ + gtk_widget_grab_focus (entry); + } + while ((proxies = g_slist_next (proxies))); + + if (GTK_ACTION_CLASS (midori_location_action_parent_class)->activate) + GTK_ACTION_CLASS (midori_location_action_parent_class)->activate (action); +} + +static GtkWidget* +midori_location_action_create_tool_item (GtkAction* action) +{ + GtkWidget* toolitem; + GtkWidget* entry; + GtkWidget* alignment; + + toolitem = GTK_WIDGET (gtk_tool_item_new ()); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + entry = midori_location_entry_new (); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( + gtk_bin_get_child (GTK_BIN (entry))), + GTK_ICON_ENTRY_SECONDARY, TRUE); + alignment = gtk_alignment_new (0, 0.5, 1, 0.1); + gtk_container_add (GTK_CONTAINER (alignment), entry); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (toolitem), alignment); + gtk_widget_show (alignment); + + return GTK_WIDGET (toolitem); +} + +static void +midori_location_action_active_changed_cb (GtkWidget* widget, + gint active, + GtkAction* action) +{ + MidoriLocationAction* location_action; + const gchar* text; + + location_action = MIDORI_LOCATION_ACTION (action); + text = midori_location_entry_get_text (MIDORI_LOCATION_ENTRY (widget)); + katze_assign (location_action->uri, g_strdup (text)); + + g_signal_emit (action, signals[ACTIVE_CHANGED], 0, active); +} + +static gboolean +midori_location_action_key_press_event_cb (GtkWidget* widget, + GdkEventKey* event, + GtkAction* action) +{ + const gchar* uri; + + switch (event->keyval) + { + case GDK_ISO_Enter: + case GDK_KP_Enter: + case GDK_Return: + { + if ((uri = gtk_entry_get_text (GTK_ENTRY (widget)))) + { + g_signal_emit (action, signals[SUBMIT_URI], 0, uri); + return TRUE; + } + } + case GDK_Escape: + { + g_signal_emit (action, signals[RESET_URI], 0); + return TRUE; + } + } + return FALSE; +} + +static gboolean +midori_location_action_focus_out_event_cb (GtkWidget* widget, + GdkEventKey* event, + GtkAction* action) +{ + g_signal_emit (action, signals[FOCUS_OUT], 0); + return FALSE; +} + +static void +midori_location_action_icon_released_cb (GtkWidget* widget, + GtkIconEntryPosition icon_pos, + gint button, + GtkAction* action) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + g_signal_emit (action, signals[SECONDARY_ICON_RELEASED], 0, widget); +} + +static void +midori_location_action_connect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + GtkWidget* alignment; + GtkWidget* entry; + + GTK_ACTION_CLASS (midori_location_action_parent_class)->connect_proxy ( + action, proxy); + + if (GTK_IS_TOOL_ITEM (proxy)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxy)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + g_signal_connect (entry, "active-changed", + G_CALLBACK (midori_location_action_active_changed_cb), action); + g_object_connect (gtk_bin_get_child (GTK_BIN (entry)), + "signal::key-press-event", + midori_location_action_key_press_event_cb, action, + "signal::focus-out-event", + midori_location_action_focus_out_event_cb, action, + "signal::icon-released", + midori_location_action_icon_released_cb, action, + NULL); + } +} + +static void +midori_location_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + g_signal_handlers_disconnect_by_func (proxy, + G_CALLBACK (gtk_action_activate), action); + + GTK_ACTION_CLASS (midori_location_action_parent_class)->disconnect_proxy + (action, proxy); +} + +const gchar* +midori_location_action_get_uri (MidoriLocationAction* location_action) +{ + g_return_val_if_fail (MIDORI_IS_LOCATION_ACTION (location_action), NULL); + + return location_action->uri; +} + +void +midori_location_action_set_uri (MidoriLocationAction* location_action, + const gchar* uri) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (uri != NULL); + + + katze_assign (location_action->uri, g_strdup (uri)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + midori_location_entry_set_text (MIDORI_LOCATION_ENTRY (entry), uri); + } + while ((proxies = g_slist_next (proxies))); +} + +void +midori_location_action_add_uri (MidoriLocationAction* location_action, + const gchar* uri) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + MidoriLocationEntryItem item; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (uri != NULL); + + + katze_assign (location_action->uri, g_strdup (uri)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + midori_location_entry_set_text (MIDORI_LOCATION_ENTRY (entry), uri); + + item.favicon = NULL; + item.uri = uri; + item.title = NULL; + midori_location_entry_add_item ( + MIDORI_LOCATION_ENTRY (entry), &item); + } + while ((proxies = g_slist_next (proxies))); +} + +void +midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, + GdkPixbuf* icon, + const gchar* uri) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + GtkWidget* child; + MidoriLocationEntryItem item; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); + g_return_if_fail (uri != NULL); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + child = gtk_bin_get_child (GTK_BIN (entry)); + + item.favicon = icon; + item.uri = uri; + item.title = NULL; + midori_location_entry_add_item ( + MIDORI_LOCATION_ENTRY (entry), &item); + if (location_action->uri == uri) + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), + GTK_ICON_ENTRY_PRIMARY, icon); + } + while ((proxies = g_slist_next (proxies))); +} + +void +midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, + const gchar* title, + const gchar* uri) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + MidoriLocationEntryItem item; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (title != NULL); + g_return_if_fail (uri != NULL); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + item.favicon = NULL; + item.uri = uri; + item.title = item.uri; + midori_location_entry_add_item ( + MIDORI_LOCATION_ENTRY (entry), &item); + } + while ((proxies = g_slist_next (proxies))); +} + +void +midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, + const gchar* stock_id) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + GtkWidget* child; + GtkStockItem stock_item; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (!stock_id || gtk_stock_lookup (stock_id, &stock_item)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + child = gtk_bin_get_child (GTK_BIN (entry)); + + if (stock_id) + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child), + GTK_ICON_ENTRY_SECONDARY, stock_id); + else + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), + GTK_ICON_ENTRY_SECONDARY, NULL); + } + while ((proxies = g_slist_next (proxies))); +} diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h new file mode 100644 index 00000000..5310c4d1 --- /dev/null +++ b/midori/midori-locationaction.h @@ -0,0 +1,62 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_LOCATION_ACTION_H__ +#define __MIDORI_LOCATION_ACTION_H__ + +#include "midori-locationentry.h" + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_LOCATION_ACTION (midori_location_action_get_type ()) +#define MIDORI_LOCATION_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationAction)) +#define MIDORI_LOCATION_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationActionClass)) +#define MIDORI_IS_LOCATION_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_LOCATION_ACTION)) +#define MIDORI_IS_LOCATION_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_LOCATION_ACTION)) +#define MIDORI_LOCATION_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationActionClass)) + +typedef struct _MidoriLocationAction MidoriLocationAction; +typedef struct _MidoriLocationActionClass MidoriLocationActionClass; +typedef struct _MidoriLocationActionItem MidoriLocationActionItem; + +GType +midori_location_action_get_type (void); + +const gchar* +midori_location_action_get_uri (MidoriLocationAction* action); + +void +midori_location_action_set_uri (MidoriLocationAction* location_action, + const gchar* uri); + +void +midori_location_action_add_uri (MidoriLocationAction* location_action, + const gchar* uri); + +void +midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, + GdkPixbuf* icon, + const gchar* text); + +void +midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, + const gchar* title, + const gchar* text); + +void +midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, + const gchar* stock_id); + +G_END_DECLS + +#endif /* __MIDORI_LOCATION_ACTION_H__ */ From 3b9abe6306f3d17d25d3f7dc5b040c69e7ebb597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 15 Aug 2008 11:24:52 +0200 Subject: [PATCH 0265/2970] Free selected text, even if it is an empty string --- midori/midori-webview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 8afc0b2b..b80561e8 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -1201,5 +1201,6 @@ midori_web_view_has_selection (MidoriWebView* web_view) g_free (text); return TRUE; } + g_free (text); return FALSE; } From 13dc575968eedb00390a98c7ff19d91c0f055bb3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 20:38:27 +0200 Subject: [PATCH 0266/2970] Introduce Open Tabs next to Current At the same time make Open popups in tabs readonly and hide it in the Preferences, as well as Open new pages in and the whole Privacy page. --- midori/midori-browser.c | 13 ++++++++++--- midori/midori-preferences.c | 12 +++++++----- midori/midori-websettings.c | 19 ++++++++++++++++++- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 59691503..c0ae46d2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1032,9 +1032,16 @@ _midori_browser_add_tab (MidoriBrowser* browser, g_signal_connect (close_button, "clicked", G_CALLBACK (midori_browser_tab_close_clicked), widget); - n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); - gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), scrolled, - event_box, n + 1); + if (sokoke_object_get_boolean (browser->settings, "open-tabs-next-to-current")) + { + n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), scrolled, + event_box, n + 1); + } + else + gtk_notebook_append_page (GTK_NOTEBOOK (browser->notebook), scrolled, + event_box); + #if GTK_CHECK_VERSION(2, 10, 0) gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook), scrolled, TRUE); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 5b86cd99..c9035dc2 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -386,15 +386,17 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button, 1, 2, 2, 3); FRAME_NEW(_("Browsing")); TABLE_NEW (3, 2); - label = katze_property_label (settings, "open-new-pages-in"); + /* label = katze_property_label (settings, "open-new-pages-in"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-new-pages-in", NULL); - FILLED_ADD (button, 1, 2, 0, 1); + FILLED_ADD (button, 1, 2, 0, 1); */ button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); SPANNED_ADD (button, 1, 2, 1, 2); - button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); + /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); + SPANNED_ADD (button, 0, 1, 2, 3);*/ + button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); SPANNED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); SPANNED_ADD (button, 1, 2, 2, 3); @@ -417,7 +419,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 1, 2); /* Page "Privacy" */ - PAGE_NEW (_("Privacy")); + /* PAGE_NEW (_("Privacy")); FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); @@ -447,7 +449,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "remember-last-form-inputs", NULL); SPANNED_ADD (button, 0, 2, 1, 2); button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); - SPANNED_ADD (button, 0, 2, 2, 3); + SPANNED_ADD (button, 0, 2, 2, 3); */ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), preferences->notebook, FALSE, FALSE, 4); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 5d83ed46..21146ebe 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -51,6 +51,7 @@ struct _MidoriWebSettings MidoriNewPage open_new_pages_in; gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; + gboolean open_tabs_next_to_current; gboolean open_popups_in_tabs; MidoriAcceptCookies accept_cookies; @@ -103,6 +104,7 @@ enum PROP_OPEN_NEW_PAGES_IN, PROP_MIDDLE_CLICK_OPENS_SELECTION, PROP_OPEN_TABS_IN_THE_BACKGROUND, + PROP_OPEN_TABS_NEXT_TO_CURRENT, PROP_OPEN_POPUPS_IN_TABS, PROP_ACCEPT_COOKIES, @@ -487,6 +489,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) FALSE, flags)); + g_object_class_install_property (gobject_class, + PROP_OPEN_TABS_NEXT_TO_CURRENT, + g_param_spec_boolean ( + "open-tabs-next-to-current", + _("Open Tabs next to Current"), + _("Whether to open new tabs next to the current tab or after the last one"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_OPEN_POPUPS_IN_TABS, g_param_spec_boolean ( @@ -494,7 +505,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Open popups in tabs"), _("Whether to open popup windows in tabs"), TRUE, - flags)); + G_PARAM_READABLE)); @@ -736,6 +747,9 @@ midori_web_settings_set_property (GObject* object, case PROP_OPEN_TABS_IN_THE_BACKGROUND: web_settings->open_tabs_in_the_background = g_value_get_boolean (value); break; + case PROP_OPEN_TABS_NEXT_TO_CURRENT: + web_settings->open_tabs_next_to_current = g_value_get_boolean (value); + break; case PROP_OPEN_POPUPS_IN_TABS: web_settings->open_popups_in_tabs = g_value_get_boolean (value); break; @@ -871,6 +885,9 @@ midori_web_settings_get_property (GObject* object, case PROP_OPEN_TABS_IN_THE_BACKGROUND: g_value_set_boolean (value, web_settings->open_tabs_in_the_background); break; + case PROP_OPEN_TABS_NEXT_TO_CURRENT: + g_value_set_boolean (value, web_settings->open_tabs_next_to_current); + break; case PROP_OPEN_POPUPS_IN_TABS: g_value_set_boolean (value, web_settings->open_popups_in_tabs); break; From 80251606ff1e57c5f6082cb66e91e50436d49a9b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 Aug 2008 20:48:30 +0200 Subject: [PATCH 0267/2970] Use Ctrl+Shift+T for Undo Close Tab --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c0ae46d2..1ba58493 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2820,7 +2820,7 @@ static const GtkActionEntry entries[] = { N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, { "UndoTabClose", GTK_STOCK_UNDELETE, - N_("Undo Close Tab"), "", + N_("Undo Close Tab"), "t", N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, { "Bookmarks", NULL, N_("_Bookmarks") }, From 85dea9aa44628b6257467af069ad6e6805068d51 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 17 Aug 2008 16:14:15 +0200 Subject: [PATCH 0268/2970] Use fallbacks for all icons, we don't want "broken" icons --- midori/main.c | 61 ++++++++++++++++++++++++++--------------- midori/main.h | 18 ++++++------ midori/midori-browser.c | 34 +++++++++-------------- midori/midori-panel.c | 45 ++++++++---------------------- midori/midori-panel.h | 5 ++-- 5 files changed, 74 insertions(+), 89 deletions(-) diff --git a/midori/main.c b/midori/main.c index be6861f0..ee9f685f 100644 --- a/midori/main.c +++ b/midori/main.c @@ -32,27 +32,37 @@ static void stock_items_init (void) { - static GtkStockItem items[] = + typedef struct { - { STOCK_BOOKMARKS }, - { STOCK_CONSOLE }, - { STOCK_EXTENSION }, - { STOCK_NEWS_FEED }, - { STOCK_LOCK_OPEN }, - { STOCK_LOCK_SECURE }, - { STOCK_LOCK_BROKEN }, - { STOCK_PAGE_HOLDER }, - { STOCK_SCRIPT }, - { STOCK_STYLE }, - { STOCK_TRANSFER }, - { STOCK_USER_TRASH }, + gchar* stock_id; + gchar* label; + GdkModifierType modifier; + guint keyval; + gchar* fallback; + } FatStockItem; - { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, NULL }, - { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, NULL }, - { STOCK_FORM_FILL, N_("_Form Fill"), 0, 0, NULL }, - { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, NULL }, - { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, NULL }, - { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, NULL }, + static FatStockItem items[] = + { + { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, + { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, + { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, + { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, + { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, + + { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, + { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, + { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD }, + { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, + { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, + { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, + { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, + { STOCK_PAGE_HOLDER, N_("_Pageholder"), 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, + { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, + { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, + { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, + { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, + { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, + { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, #if !GTK_CHECK_VERSION(2, 10, 0) { GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, NULL }, #endif @@ -61,6 +71,7 @@ stock_items_init (void) { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, #endif }; + GtkIconSource* icon_source; GtkIconSet* icon_set; GtkIconFactory* factory = gtk_icon_factory_new (); @@ -68,15 +79,21 @@ stock_items_init (void) for (i = 0; i < (guint)G_N_ELEMENTS (items); i++) { - icon_source = gtk_icon_source_new (); - gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + if (items[i].fallback) + { + gtk_icon_source_set_icon_name (icon_source, items[i].fallback); + items[i].fallback = NULL; + gtk_icon_set_add_source (icon_set, icon_source); + } + gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); gtk_icon_set_add_source (icon_set, icon_source); gtk_icon_source_free (icon_source); gtk_icon_factory_add (factory, items[i].stock_id, icon_set); gtk_icon_set_unref (icon_set); } - gtk_stock_add_static (items, G_N_ELEMENTS (items)); + gtk_stock_add ((GtkStockItem*)items, G_N_ELEMENTS (items)); gtk_icon_factory_add_default (factory); g_object_unref (factory); } diff --git a/midori/main.h b/midori/main.h index bc4b2f50..254c951f 100644 --- a/midori/main.h +++ b/midori/main.h @@ -25,31 +25,29 @@ KatzeXbelItem* bookmarks; /* Custom stock items We should distribute these - Names should match with epiphany and/ or xdg spec - NOTE: Those uncommented were replaced with remotely related icons - in order to reduce the amount of warnings */ + Names should match with epiphany and/ or xdg spec */ -#define STOCK_BOOKMARK GTK_STOCK_FILE /* "stock_bookmark" "bookmark-web" */ +#define STOCK_BOOKMARK "stock_bookmark" #define STOCK_BOOKMARKS "vcard" #define STOCK_CONSOLE "terminal" -#define STOCK_EXTENSION GTK_STOCK_EXECUTE /* "extension" */ -#define STOCK_FORM_FILL GTK_STOCK_JUSTIFY_FILL /* "insert-text" "form-fill" */ +#define STOCK_EXTENSION "extension" +#define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" #define STOCK_NEWS_FEED "news-feed" -#define STOCK_PAGE_HOLDER GTK_STOCK_CONVERT +#define STOCK_PAGE_HOLDER "page-holder" #define STOCK_STYLE "gnome-settings-theme" +#define STOCK_STYLES "gnome-settings-theme" #define STOCK_TRANSFER "package" +#define STOCK_TRANSFERS "package" /* We assume that these legacy icon names are usually present */ #define STOCK_BOOKMARK_ADD "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME #define STOCK_IMAGE "gnome-mime-image" -#define STOCK_LOCK_OPEN "stock_lock-open" -#define STOCK_LOCK_SECURE "stock_lock" -#define STOCK_LOCK_BROKEN "stock_lock-broken" #define STOCK_NETWORK_OFFLINE "network-offline" #define STOCK_SCRIPT "stock_script" +#define STOCK_SCRIPTS "stock_script" #define STOCK_SEND "stock_mail-send" #define STOCK_TAB_NEW "stock_new-tab" #define STOCK_USER_TRASH "gnome-stock-trash" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1ba58493..38151ede 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -72,8 +72,6 @@ struct _MidoriBrowser GtkWidget* statusbar; GtkWidget* progressbar; - const gchar* stock_news_feed; - gchar* statusbar_text; MidoriWebSettings* settings; GList* tab_titles; @@ -290,7 +288,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) /* if (web_view && midori_web_view_get_news_feeds (MIDORI_WEB_VIEW (web_view))) gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, browser->stock_news_feed); + GTK_ICON_ENTRY_SECONDARY, STOCK_NEWS_FEED); else gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), @@ -487,7 +485,7 @@ midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, MidoriBrowser* browser) { midori_location_action_set_secondary_icon (MIDORI_LOCATION_ACTION ( - _action_by_name (browser, "Location")), browser->stock_news_feed); + _action_by_name (browser, "Location")), STOCK_NEWS_FEED); } static gboolean @@ -2081,7 +2079,7 @@ _action_location_secondary_icon_released (GtkAction* action, menuitem = gtk_image_menu_item_new_with_label (title); /* FIXME: Get the real icon */ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( - menuitem), gtk_image_new_from_stock (browser->stock_news_feed, + menuitem), gtk_image_new_from_stock (STOCK_NEWS_FEED, GTK_ICON_SIZE_MENU)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); @@ -2813,7 +2811,7 @@ static const GtkActionEntry entries[] = { N_("Open in Page_holder..."), "", N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) }, { "Trash", STOCK_USER_TRASH, - N_("Closed Tabs and Windows"), "", + NULL, "", /* N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, */ N_("Reopen a previously closed tab or window"), NULL }, { "TrashEmpty", GTK_STOCK_CLEAR, @@ -3090,10 +3088,6 @@ midori_browser_realize_cb (GtkStyle* style, gtk_window_set_icon_name (GTK_WINDOW (browser), "midori"); else gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); - if (gtk_icon_theme_has_icon (icon_theme, STOCK_NEWS_FEED)) - browser->stock_news_feed = STOCK_NEWS_FEED; - else - browser->stock_news_feed = GTK_STOCK_INDEX; } } @@ -3170,8 +3164,6 @@ midori_browser_init (MidoriBrowser* browser) GtkToolItem* toolitem; GtkRcStyle* rcstyle; - browser->stock_news_feed = GTK_STOCK_INDEX; - /* Setup the window metrics */ g_signal_connect (browser, "realize", G_CALLBACK (midori_browser_realize_cb), browser); @@ -3233,7 +3225,7 @@ midori_browser_init (MidoriBrowser* browser) "stock-id", GTK_STOCK_JUMP_TO, "tooltip", _("Open a particular location"), /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ - "secondary-icon", browser->stock_news_feed, + "secondary-icon", STOCK_NEWS_FEED, NULL); g_object_connect (action, "signal::activate", @@ -3454,14 +3446,14 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show_all (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), box, toolbar, - STOCK_BOOKMARKS, _("Bookmarks"), _("_Bookmarks")); + STOCK_BOOKMARKS, _("Bookmarks")); /* Transfers */ GtkWidget* panel = midori_web_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, - STOCK_TRANSFER, _("Transfers"), _("_Transfers")); + STOCK_TRANSFERS, _("Transfers")); /* Console */ browser->panel_console = midori_console_new (); @@ -3470,14 +3462,14 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_console, toolbar, - STOCK_CONSOLE, _("Console"), _("_Console")); + STOCK_CONSOLE, _("Console")); /* History */ panel = midori_web_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, - STOCK_HISTORY, _("History"), _("_History")); + STOCK_HISTORY, _("History")); /* Pageholder */ browser->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, @@ -3486,7 +3478,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (browser->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_pageholder, NULL, - STOCK_PAGE_HOLDER, _("Pageholder"), _("_Pageholder")); + STOCK_PAGE_HOLDER, _("Pageholder")); /* Userscripts */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); @@ -3495,7 +3487,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - STOCK_SCRIPT, _("Userscripts"), _("_Userscripts")); + STOCK_SCRIPTS, _("Userscripts")); /* Userstyles */ /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); @@ -3503,7 +3495,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - STOCK_STYLE, _("Userstyles"), _("_Userstyles"));*/ + STOCK_STYLES, _("Userstyles"));*/ /* Extensions */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); @@ -3512,7 +3504,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - STOCK_EXTENSION, _("Extensions"), _("_Extensions")); + STOCK_EXTENSIONS, _("Extensions")); /* Notebook, containing all web_views */ browser->notebook = gtk_notebook_new (); diff --git a/midori/midori-panel.c b/midori/midori-panel.c index bba51d17..dc8a8936 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -337,21 +337,12 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, * @panel: a #MidoriPanel * @child: the child widget * @toolbar: a toolbar widget, or %NULL - * @icon: a stock ID or icon name, or %NULL - * @label: a string to use as the label, or %NULL - * @mnemonic: a string to use as a mnemonic, or %NULL + * @stock_id: a stock ID + * @label: a string to use as the label * * Appends a new page to the panel. If @toolbar is specified it will * be packaged above @child. * - * If @icon is an icon name, the according image is used as an - * icon for this page. - * - * If @label is given, it is used as the label of this page. - * - * If @mnemonic is given, it is used in labels with mnemonics - * such as menu items. See gtk_label_new_with_mnemonic(). - * * In the case of an error, -1 is returned. * * Return value: the index of the new page, or -1 @@ -360,16 +351,13 @@ gint midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, GtkWidget* toolbar, - const gchar* icon, - const gchar* label, - const gchar* mnemonic) + const gchar* stock_id, + const gchar* label) { GtkWidget* scrolled; GtkWidget* widget; GObjectClass* gobject_class; guint n; - const gchar* text; - const gchar* text_mnemonic; GtkToolItem* toolitem; GtkWidget* image; GtkWidget* menuitem; @@ -377,6 +365,8 @@ midori_panel_append_page (MidoriPanel* panel, g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); g_return_val_if_fail (GTK_IS_WIDGET (child), -1); g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); + g_return_val_if_fail (stock_id != NULL, -1); + g_return_val_if_fail (label != NULL, -1); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), @@ -403,19 +393,14 @@ midori_panel_append_page (MidoriPanel* panel, n = midori_panel_page_num (panel, child); - text = label ? label : _("Untitled"); - text_mnemonic = mnemonic ? mnemonic : _("_Untitled"); - g_object_set_data (G_OBJECT (child), "label", (gchar*)text); + g_object_set_data (G_OBJECT (child), "label", (gchar*)label); toolitem = gtk_radio_tool_button_new (panel->group); panel->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( toolitem)); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), text); - if (icon) - { - image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_BUTTON); - gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); - } + image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); g_object_set_data (G_OBJECT (toolitem), "page", child); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); @@ -424,14 +409,8 @@ midori_panel_append_page (MidoriPanel* panel, if (panel->menu) { - menuitem = gtk_image_menu_item_new_with_mnemonic (text_mnemonic); - if (icon) - { - image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), - image); - } - gtk_widget_show_all (menuitem); + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + gtk_widget_show (menuitem); g_object_set_data (G_OBJECT (menuitem), "page", child); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", diff --git a/midori/midori-panel.h b/midori/midori-panel.h index 5de7d004..806620a7 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -57,9 +57,8 @@ gint midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, GtkWidget* toolbar, - const gchar* icon, - const gchar* label, - const gchar* mnemonic); + const gchar* stock_id, + const gchar* label); gint midori_panel_get_current_page (MidoriPanel* panel); From b9e19d79d64ee55e34052a79c35029f5ef95a300 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 17 Aug 2008 19:11:43 +0200 Subject: [PATCH 0269/2970] Enable View Source only if GIO really supports HTTP --- midori/midori-browser.c | 10 ++++------ midori/sokoke.c | 23 +++++++++++++++++++++++ midori/sokoke.h | 3 +++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 38151ede..66a6c88d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -257,9 +257,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomOut", web_view != NULL); _action_set_sensitive (browser, "ZoomNormal", web_view != NULL && webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); - #if GLIB_CHECK_VERSION (2, 16, 0) - _action_set_sensitive (browser, "SourceView", web_view != NULL); - #endif + if (sokoke_gio_supports_http ()) + _action_set_sensitive (browser, "SourceView", web_view != NULL); _action_set_sensitive (browser, "FindNext", web_view != NULL); _action_set_sensitive (browser, "FindPrevious", web_view != NULL); /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ @@ -3602,9 +3601,8 @@ midori_browser_init (MidoriBrowser* browser) g_object_unref (ui_manager); - #if !GLIB_CHECK_VERSION (2, 16, 0) - _action_set_sensitive (browser, "SourceView", FALSE); - #endif + _action_set_sensitive (browser, "SourceView", sokoke_gio_supports_http ()); + #ifndef WEBKIT_CHECK_VERSION _action_set_sensitive (browser, "ZoomIn", FALSE); _action_set_sensitive (browser, "ZoomOut", FALSE); diff --git a/midori/sokoke.c b/midori/sokoke.c index ea476f93..0ab823de 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -625,3 +625,26 @@ sokoke_action_create_popup_menu_item (GtkAction* action) return menuitem; } + +gboolean +sokoke_gio_supports_http (void) +{ + #if HAVE_GIO + static gboolean supports_http; + static gboolean tested; + const gchar* const* schemes = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); + + if (tested) + return supports_http; + while (*schemes) + { + if (!strcmp (*schemes, "http")) + supports_http = TRUE; + schemes++; + } + tested = TRUE; + return supports_http; + #else + return FALSE; + #endif +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 616c601f..873e3704 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -131,4 +131,7 @@ sokoke_object_get_boolean (gpointer object, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); +gboolean +sokoke_gio_supports_http (void ); + #endif /* !__SOKOKE_H__ */ From 9bf1b23febd732e8dc7ae7a0ccff80a956f03775 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 18 Aug 2008 01:24:26 +0200 Subject: [PATCH 0270/2970] Implement the Userstyles Addon panel --- midori/midori-addons.c | 68 +++++++++++++++++++++++++++++++++++++---- midori/midori-browser.c | 4 +-- 2 files changed, 64 insertions(+), 8 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 50de6fae..dab59530 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -597,6 +597,51 @@ _js_script_from_file (JSContextRef js_context, return result; } +static gboolean +_js_style_from_file (JSContextRef js_context, + const gchar* filename, + gchar** exception) +{ + gboolean result = FALSE; + gchar* style; + GError* error = NULL; + guint i, n; + gchar* style_script; + + if (g_file_get_contents (filename, &style, NULL, &error)) + { + n = strlen (style); + for (i = 0; i < n; i++) + { + /* Replace line breaks with spaces */ + if (style[i] == '\n' || style[i] == '\r') + style[i] = ' '; + /* Change all single quotes to double quotes */ + if (style[i] == '\'') + style[i] = '\"'; + } + style_script = g_strdup_printf ( + "window.addEventListener ('DOMContentLoaded'," + "function () {" + "var mystyle = document.createElement(\"style\");" + "mystyle.setAttribute(\"type\", \"text/css\");" + "mystyle.appendChild(document.createTextNode('%s'));" + "document.getElementsByTagName(\"head\")[0].appendChild(mystyle);" + "}, true);", + style); + if (gjs_script_eval (js_context, style_script, exception)) + result = TRUE; + g_free (style_script); + g_free (style); + } + else + { + *exception = g_strdup (error->message); + g_error_free (error); + } + return result; +} + static void midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, WebKitWebFrame* web_frame, @@ -617,28 +662,38 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, if (!uri) return; - addon_files = _addons_get_files(addons); + addon_files = _addons_get_files (addons); list = addon_files; while (addon_files) { fullname = addon_files->data; includes = NULL; excludes = NULL; - if (!_metadata_from_file (fullname, &includes, &excludes, NULL, NULL)) + if (addons->kind == MIDORI_ADDON_USER_SCRIPTS && + !_metadata_from_file (fullname, &includes, &excludes, NULL, NULL)) { - addon_files = addon_files->next; + addon_files = g_slist_next (addon_files); continue; } if (includes || excludes) if (!_may_load_script (uri, &includes, &excludes)) { - addon_files = addon_files->next; + addon_files = g_slist_next (addon_files); continue; } g_slist_free (includes); g_slist_free (excludes); exception = NULL; - if (!_js_script_from_file (js_context, fullname, &exception)) + if (addons->kind == MIDORI_ADDON_USER_SCRIPTS && + !_js_script_from_file (js_context, fullname, &exception)) + { + message = g_strdup_printf ("console.error ('%s');", exception); + gjs_script_eval (js_context, message, NULL); + g_free (message); + g_free (exception); + } + else if (addons->kind == MIDORI_ADDON_USER_STYLES && + !_js_style_from_file (js_context, fullname, &exception)) { message = g_strdup_printf ("console.error ('%s');", exception); gjs_script_eval (js_context, message, NULL); @@ -745,7 +800,8 @@ midori_addons_set_kind (MidoriAddons* addons, addons->kind = kind; - if (kind == MIDORI_ADDON_USER_SCRIPTS) + if (kind == MIDORI_ADDON_USER_SCRIPTS + || kind == MIDORI_ADDON_USER_STYLES) g_signal_connect (addons->web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 66a6c88d..f59b53f0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3488,13 +3488,13 @@ midori_browser_init (MidoriBrowser* browser) panel, toolbar, STOCK_SCRIPTS, _("Userscripts")); /* Userstyles */ - /*panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); + panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); gtk_widget_show (panel); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, toolbar, - STOCK_STYLES, _("Userstyles"));*/ + STOCK_STYLES, _("Userstyles")); /* Extensions */ panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); From 5c0a23a10f1793c354de238b7a69db5ea25be40a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 18 Aug 2008 01:42:15 +0200 Subject: [PATCH 0271/2970] Provide an 'extension' icon --- icons/16x16/extension.png | Bin 0 -> 780 bytes icons/22x22/extension.png | Bin 0 -> 1105 bytes icons/scalable/extension.svg | 199 +++++++++++++++++++++++++++++++++++ icons/wscript_build | 1 + 4 files changed, 200 insertions(+) create mode 100644 icons/16x16/extension.png create mode 100644 icons/22x22/extension.png create mode 100644 icons/scalable/extension.svg diff --git a/icons/16x16/extension.png b/icons/16x16/extension.png new file mode 100644 index 0000000000000000000000000000000000000000..9dcd27e14b0e2acae4602a406734fdf351f3abb1 GIT binary patch literal 780 zcmV+n1M~ceP)RmrMFJDZK5?Ycm6jSr2!TM*`}HIDp4|2W7>2R&(4KmV^GmpT=e(SqpIHGcA;4vr ze4Fg%XJiVkVRdpC$4TT@Hj6UL?WtH5T*Hsq(Z8NxE+%f%3&70WIN^*!N{ctAeC+FZ zRE3 z!TW(Xq<8}u+DZ(Kevt(^#h&5uuljZ8^ZTN<#n&i=*a3KL$F4Y7b2xcAI?P;T21iMh zBauqsNQd&Godo>pd>-s#UG^q!+`Y0O{?tL$IpgfMvZ^!LSs~ZJ$S0IiIF3XrNkM1> z!PF3+`nzOd?j~3Nw{G>S^XUUocgcTGX|+WNW6E(7`Ns|(_fJK}$XppFEjgX(*-1LO zUs9Y`M(e{{kw|p@x;x1_0I0Yf+h;1JwjSDBAF|w@tRyoDspAxdOKE+0bADi`$Gg3} z+Syf6YfVgzptROn>#L6&qNf(OHUNTY8N}5*y(1m;egA-M+YAo(3#C=*i??m229#3& zexsBQYctl770g2z2C-Na!!T?lZm;Ewdo7>dPQm$?BwZ-k&uBBCQo7T0M9X)Be zJukJ^r5cTrQcERs+MD#`Z|MKrSlKL0ARUlEti4G`mdskNoqqwpULEDuZ~rC$0000< KMNUMnLSTYKd~3k~ literal 0 HcmV?d00001 diff --git a/icons/22x22/extension.png b/icons/22x22/extension.png new file mode 100644 index 0000000000000000000000000000000000000000..fb9c45e90e90af159a3e6c3c1632848382931489 GIT binary patch literal 1105 zcmV-X1g`suP)C(gb<|wz!=X8;Ws%+8eb1q0mQ=LXvL9(b`cRll3ewW zL_jz2UgtZxbS7=)&mV}_Jsf4!f$P1HQbI}z29EMT z9bC_w2QUf%x~^NBHpYU3V;50fz8L`S`J^}iK|~CMHK-I4v5E%t{oI?*<+5)($<=GP zu6z8_K!2vVs0>mHfPoc2md&ayoAG~vrId_w1>ryx8rLC7AZQd}A~m4_aPom+RaM)H zBgJ{xTCy#>-VBZy0b@*4wK>aX4TVy;nWc1KYHA9Js>cBaEN9b@QegMay|~bO{GduPMul#zcW1F=-QdPMDlao`%neR`20l;EJgl!#4 zyJ?uO`o3Q)iB!&*zQ6SaEgp|4kzfht{+fkh7?8}z)vkk!{r*m&sQ}R5DY^i3-Bz!L)91dve5C!gVBcUj0;+**ZUwIAf~3gzfv~)i zK~?!C{Jk&>Rng%45{jZO6>5BkI7u4THEkfhxC{;sfFo92kEb5nheT}?gd{wcJYtV)Gbwn==h1xmH>PV0IFrP3RP9d7~`ZW%Fs%7r47K%Kp>EaM50KjO$e$b z_@TEaow_l_TXwew8e+|Aq^K09PJf=gwYbm@AboS@MvLcp7Xh3qG_N!gj?(LgIwFHZ z16I$4v%>((HP%0>X*vhZE9g4$$(-xD$B5|ineLMVhY!At+kVBXPLf6d^sFBc&N-)? zSVmc8RIy)q!<2%|te?U4)DQ-L8BXVNxx-G9zOii9Xqskjc77(fp?u@LW@8P^7-QrM zA0y*eAcTaZ)j>(rJOYI)62OvWGj15>m;0W5&KysT;QxR*1EbRDL)h8ey5?X2Og)6| zbLUk6lK|?Z5cSp*+gW@ej^aq^e}dW8qlhbtGE@`_yX&1qlDVEY@zV#(jR5fUG4m@a z#eRU1lu`ka5K_dPBu(D|CL&lis{~-?6D=su+drKoWeNe7&B6fuf;!2&?>6?p?Yw^g XYeBdwwLjyi00000NkvXXu0mjf7`glx literal 0 HcmV?d00001 diff --git a/icons/scalable/extension.svg b/icons/scalable/extension.svg new file mode 100644 index 00000000..b3cb4f78 --- /dev/null +++ b/icons/scalable/extension.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Nancy Runge + + + + + licenced under LGPL + + + Extensions + + + http://www.twotoasts.de + + + + + + + + + + + diff --git a/icons/wscript_build b/icons/wscript_build index 51946f32..35cdcbf9 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -44,5 +44,6 @@ def add_image (bld, install_files, category, name): Params.pprint ('BLUE', "Optimized icons could not be created.") break +add_image (bld, install_files, 'categories', 'extension') add_image (bld, install_files, 'apps', 'midori') add_image (bld, install_files, 'status', 'news-feed') From 02e3b78341bf079d53f8b28928561788a6d51df3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 18 Aug 2008 23:43:15 +0200 Subject: [PATCH 0272/2970] Capitalize Midori when bailing out on an error --- midori/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index ee9f685f..c9cd06e8 100644 --- a/midori/main.c +++ b/midori/main.c @@ -409,9 +409,9 @@ main (int argc, GETTEXT_PACKAGE, &error)) { if (error->code == G_OPTION_ERROR_UNKNOWN_OPTION) - g_print ("%s - %s\n", _("midori"), _("Unknown argument.")); + g_print ("%s - %s\n", _("Midori"), _("Unknown argument.")); else - g_print ("%s - %s", _("midori"), _("Failed to setup interface.")); + g_print ("%s - %s", _("Midori"), _("Failed to setup interface.")); g_error_free (error); return 1; } From f6bf2f568d18827255483b9e39e4dc144ce37e36 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 18 Aug 2008 23:50:20 +0200 Subject: [PATCH 0273/2970] Update website URL --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index c9cd06e8..863ccee6 100644 --- a/midori/main.c +++ b/midori/main.c @@ -424,7 +424,7 @@ main (int argc, "%s\n" "\t%s\n\n" "%s\n" - "\thttp://software.twotoasts.de\n", + "\thttp://www.twotoasts.de\n", _("Midori"), PACKAGE_VERSION, _("Please report comments, suggestions and bugs to:"), PACKAGE_BUGREPORT, From e62ca7a8c008b2bd194ddaa71a8cb2df3b9a4962 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 21 Aug 2008 21:49:16 +0200 Subject: [PATCH 0274/2970] Don't implicitly change the URI when adding to LocationAction --- midori/midori-browser.c | 5 +++-- midori/midori-locationaction.c | 2 -- midori/midori-locationentry.c | 27 ++------------------------- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f59b53f0..a182774e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -483,8 +483,9 @@ midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, const gchar* title, MidoriBrowser* browser) { - midori_location_action_set_secondary_icon (MIDORI_LOCATION_ACTION ( - _action_by_name (browser, "Location")), STOCK_NEWS_FEED); + if (web_view == (MidoriWebView*)midori_browser_get_current_web_view (browser)) + midori_location_action_set_secondary_icon (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), STOCK_NEWS_FEED); } static gboolean diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index bf4de194..d8d285ac 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -398,8 +398,6 @@ midori_location_action_add_uri (MidoriLocationAction* location_action, alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); entry = gtk_bin_get_child (GTK_BIN (alignment)); - midori_location_entry_set_text (MIDORI_LOCATION_ENTRY (entry), uri); - item.favicon = NULL; item.uri = uri; item.title = NULL; diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index bebbac9c..24508505 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -377,15 +377,11 @@ void midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, const gchar* uri) { - gboolean found; GtkTreeIter iter; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - found = midori_location_entry_item_iter (MIDORI_LOCATION_ENTRY (location_entry), - uri, - &iter); - if (found) + if (midori_location_entry_item_iter (location_entry, uri, &iter)) midori_location_entry_set_active_iter (location_entry, &iter); else midori_location_entry_clear (location_entry); @@ -405,34 +401,15 @@ midori_location_entry_add_item (MidoriLocationEntry* location_entry, { GtkTreeModel* model; GtkTreeIter iter; - gboolean item_exists = FALSE; - gchar* uri; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); - if (gtk_tree_model_get_iter_first (model, &iter)) - { - uri = NULL; - do - { - gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); - if (g_ascii_strcasecmp (item->uri, uri) == 0) - { - item_exists = TRUE; - g_free (uri); - break; - } - g_free (uri); - } - while (gtk_tree_model_iter_next (model, &iter)); - } - if (!item_exists) + if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); midori_location_entry_set_item (location_entry, &iter, item); - /*midori_location_entry_set_active_iter (location_entry, &iter);*/ } From 65cbe4b05a3efe2d62241d7156eb4fbbf1ab610a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 21 Aug 2008 21:51:35 +0200 Subject: [PATCH 0275/2970] Make it clear that WAF is preferred and rename autogen.sh --- INSTALL | 11 ++++++----- autogen.sh => legacy.sh | 0 2 files changed, 6 insertions(+), 5 deletions(-) rename autogen.sh => legacy.sh (100%) diff --git a/INSTALL b/INSTALL index 9aa86c99..96ddec5b 100644 --- a/INSTALL +++ b/INSTALL @@ -16,13 +16,14 @@ You can install it with './waf install' For further options run './waf --help' -+++ The alternative +++ ++++ Legacy support +++ -Alternatively, autotools build files are available. +There are also autotools build files available. This +is not recommended except when waf for any reason won't work. -If you checked out from the repository, make sure -you have *libtool* and *intltool* installed. -Then run './autogen.sh'. +Make sure you have *libtool* and *intltool* installed. + +Run './legacy.sh'. Run './configure' diff --git a/autogen.sh b/legacy.sh similarity index 100% rename from autogen.sh rename to legacy.sh From c375f862a03099f29ea269c2e850f78ae0bbcca8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 22 Aug 2008 03:59:07 +0200 Subject: [PATCH 0276/2970] Implement single instance support with Unique --- configure.in | 5 ++ midori/Makefile.am | 2 + midori/main.c | 28 +++++-- midori/midori-app.c | 183 +++++++++++++++++++++++++++++++++++++++++++ midori/midori-app.h | 10 +++ midori/wscript_build | 2 +- wscript | 6 +- 7 files changed, 229 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index ed99b8ad..702d8812 100644 --- a/configure.in +++ b/configure.in @@ -38,6 +38,11 @@ if test x"$enable_debug" = x"yes"; then ]) fi +# Checks for UNIQUE +PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= 0.9, have_unique=true, have_unique=false) +AC_SUBST(UNIQUE_CFLAGS) +AC_SUBST(UNIQUE_LIBS) + # Checks for GIO2 PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=true, have_gio=false) AC_SUBST(GIO_CFLAGS) diff --git a/midori/Makefile.am b/midori/Makefile.am index 99ed5170..73229a72 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = \ + $(UNIQUE_CFLAGS) \ $(GIO_CFLAGS) \ $(GTK_CFLAGS) \ $(GTKSOURCEVIEW_CFLAGS) \ @@ -8,6 +9,7 @@ INCLUDES = \ AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" LDADD = \ + $(UNIQUE_LIBS) \ $(GIO_LIBS) \ $(GTK_LIBS) \ $(GTKSOURCEVIEW_LIBS)\ diff --git a/midori/main.c b/midori/main.c index 863ccee6..a1651468 100644 --- a/midori/main.c +++ b/midori/main.c @@ -384,6 +384,8 @@ main (int argc, char** argv) { gboolean version; + MidoriApp* app; + gboolean result; GError* error; GOptionEntry entries[] = { @@ -446,6 +448,23 @@ main (int argc, return 1; } + app = midori_app_new (); + if (midori_app_instance_is_running (app)) + { + /* TODO: Open as many tabs as we have uris, seperated by pipes */ + if (argc > 1) + result = midori_app_instance_send_uris (app, argv+1); + else + result = midori_app_instance_send_activate (app); + + if (result) + return 0; + + /* FIXME: Do we want a graphical error message? */ + g_print (_("An instance of Midori is already running but not responding.\n")); + return 1; + } + /* Load configuration files */ GString* error_messages = g_string_new (NULL); gchar* config_path = g_build_filename (g_get_user_config_dir (), @@ -590,11 +609,10 @@ main (int argc, g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_web_list_add_item_cb), NULL); - MidoriApp* app = g_object_new (MIDORI_TYPE_APP, - "settings", settings, - "trash", trash, - "search-engines", search_engines, - NULL); + g_object_set (app, "settings", settings, + "trash", trash, + "search-engines", search_engines, + NULL); MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", settings, diff --git a/midori/midori-app.c b/midori/midori-app.c index 58335a2f..660bbe4d 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -9,11 +9,20 @@ See the file COPYING for the full license text. */ +#if HAVE_CONFIG_H + #include +#endif + #include "midori-app.h" +#include #include #include +#ifdef HAVE_UNIQUE + #include +#endif + struct _MidoriApp { GObject parent_instance; @@ -25,6 +34,8 @@ struct _MidoriApp MidoriWebSettings* settings; MidoriWebList* trash; MidoriWebList* search_engines; + + gpointer instance; }; G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) @@ -163,9 +174,63 @@ midori_app_constructor (GType type, type, n_construct_properties, construct_properties); } +#ifdef HAVE_UNIQUE +static UniqueResponse +midori_browser_message_received_cb (UniqueApp* instance, + UniqueCommand command, + UniqueMessageData* message, + guint time, + MidoriApp* app) +{ + UniqueResponse response; + gchar** uris; + + switch (command) + { + case UNIQUE_ACTIVATE: + g_print("activate\n"); + gtk_window_set_screen (GTK_WINDOW (app->browser), + unique_message_data_get_screen (message)); + gtk_window_present (GTK_WINDOW (app->browser)); + response = UNIQUE_RESPONSE_OK; + break; + case UNIQUE_OPEN: + g_print("open\n"); + uris = unique_message_data_get_uris (message); + if (!uris) + response = UNIQUE_RESPONSE_FAIL; + else + { + g_print("open uris\n"); + while (*uris) + { + midori_browser_add_uri (app->browser, *uris); + g_print ("uri: %s\n", *uris); + uris++; + } + /* g_strfreev (uris); */ + response = UNIQUE_RESPONSE_OK; + } + break; + default: + g_print("fail\n"); + response = UNIQUE_RESPONSE_FAIL; + break; + } + + return response; +} +#endif + static void midori_app_init (MidoriApp* app) { + #ifdef HAVE_UNIQUE + gchar* display_name; + gchar* instance_name; + guint i, n; + #endif + g_assert (!_midori_app_singleton); _midori_app_singleton = app; @@ -175,6 +240,22 @@ midori_app_init (MidoriApp* app) app->settings = midori_web_settings_new (); app->trash = midori_web_list_new (); app->search_engines = midori_web_list_new (); + + #ifdef HAVE_UNIQUE + display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); + n = strlen (display_name); + for (i = 0; i < n; i++) + if (display_name[i] == ':' || display_name[i] == '.') + display_name[i] = '_'; + instance_name = g_strdup_printf ("de.twotoasts.midori_%s", display_name); + app->instance = unique_app_new (instance_name, NULL); + g_free (instance_name); + g_free (display_name); + g_signal_connect (app->instance, "message-received", + G_CALLBACK (midori_browser_message_received_cb), app); + #else + app->instance = NULL; + #endif } static void @@ -188,6 +269,9 @@ midori_app_finalize (GObject* object) g_object_unref (app->settings); g_object_unref (app->trash); + if (app->instance) + g_object_unref (app->instance); + G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); } @@ -321,8 +405,99 @@ midori_app_new (void) return app; } +/** + * midori_app_instance_is_running: + * @app: a #MidoriApp + * + * Determines whether an instance of Midori is + * already running on the default display. + * + * If Midori was built without single instance support + * this function will always return %FALSE. + * + * Return value: %TRUE if an instance is already running + **/ +gboolean +midori_app_instance_is_running (MidoriApp* app) +{ + g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + + #ifdef HAVE_UNIQUE + return unique_app_is_running (app->instance); + #else + return FALSE; + #endif +} + +/** + * midori_app_instance_send_activate: + * @app: a #MidoriApp + * + * Sends a message to an instance of Midori already + * running on the default display, asking to activate it. + * + * Practically the current browser will be focussed. + * + * Return value: %TRUE if the message was sent successfully + **/ +gboolean +midori_app_instance_send_activate (MidoriApp* app) +{ + #ifdef HAVE_UNIQUE + UniqueResponse response; + #endif + + g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); + + #ifdef HAVE_UNIQUE + response = unique_app_send_message (app->instance, UNIQUE_ACTIVATE, NULL); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + #endif + return FALSE; +} + +/** + * midori_app_instance_send_uris: + * @app: a #MidoriApp + * @uris: a string vector of URIs + * + * Sends a message to an instance of Midori already + * running on the default display, asking to open @uris. + * + * The strings in @uris will each be opened in a new tab. + * + * Return value: %TRUE if the message was sent successfully + **/ +gboolean +midori_app_instance_send_uris (MidoriApp* app, + gchar** uris) +{ + #ifdef HAVE_UNIQUE + UniqueMessageData* message; + UniqueResponse response; + #endif + + g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); + g_return_val_if_fail (uris != NULL, FALSE); + + #ifdef HAVE_UNIQUE + message = unique_message_data_new (); + unique_message_data_set_uris (message, uris); + response = unique_app_send_message (app->instance, UNIQUE_OPEN, message); + unique_message_data_free (message); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + #endif + return FALSE; +} + /** * midori_app_add_browser: + * @app: a #MidoriApp + * @browser: a #MidoriBrowser * * Adds a #MidoriBrowser to the #MidoriApp singleton. * @@ -336,6 +511,9 @@ void midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser) { + g_return_if_fail (MIDORI_IS_APP (app)); + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + gtk_window_add_accel_group (GTK_WINDOW (browser), app->accel_group); g_object_connect (browser, "signal::focus-in-event", midori_browser_focus_in_event_cb, app, @@ -346,6 +524,11 @@ midori_app_add_browser (MidoriApp* app, NULL); app->browsers = g_list_prepend (app->browsers, browser); + + #ifdef HAVE_UNIQUE + if (app->instance) + unique_app_watch_window (app->instance, GTK_WINDOW (browser)); + #endif } /** diff --git a/midori/midori-app.h b/midori/midori-app.h index 6735a98c..637cb6ef 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -53,6 +53,16 @@ midori_app_get_type (void); MidoriApp* midori_app_new (void); +gboolean +midori_app_instance_is_running (MidoriApp* app); + +gboolean +midori_app_instance_send_activate (MidoriApp* app); + +gboolean +midori_app_instance_send_uris (MidoriApp* app, + gchar** uris); + void midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser); diff --git a/midori/wscript_build b/midori/wscript_build index 0963128e..cc6435cf 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '.. ../katze' obj.find_sources_in_dirs ('.') -obj.uselib = 'GIO GTK GTKSOURCEVIEW WEBKIT LIBXML' +obj.uselib = 'UNIQUE GIO GTK GTKSOURCEVIEW WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 52fa64f9..10964a59 100644 --- a/wscript +++ b/wscript @@ -35,6 +35,10 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) + conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) + single_instance = ['no','yes'][conf.env['HAVE_UNIQUE'] == 1] + conf.check_message_custom ('single instance', 'support', single_instance) + conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) @@ -51,7 +55,7 @@ def configure (conf): conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) - conf.define ('PACKAGE_BUGREPORT', 'http://software.twotoasts.de/bugs') + conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs') conf.define ('GETTEXT_PACKAGE', APPNAME) conf.write_config_header ('config.h') From 0fa0e9c342c523130d79b6420a8635dc75f3afa4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 22 Aug 2008 04:01:41 +0200 Subject: [PATCH 0277/2970] Use HAVE_GIO instead of a full-blown version check --- midori/midori-browser.c | 2 +- midori/midori-webview.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a182774e..dd6d570e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -28,7 +28,7 @@ #include "compat.h" #include "gjs.h" -#if GLIB_CHECK_VERSION (2, 16, 0) +#ifdef HAVE_GIO #include #endif #include diff --git a/midori/midori-webview.c b/midori/midori-webview.c index b80561e8..faf45855 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -9,6 +9,10 @@ See the file COPYING for the full license text. */ +#if HAVE_CONFIG_H + #include +#endif + #include "midori-webview.h" #include "main.h" @@ -16,7 +20,7 @@ #include "sokoke.h" #include "compat.h" -#if GLIB_CHECK_VERSION (2, 16, 0) +#ifdef HAVE_GIO #include #endif #include @@ -290,7 +294,7 @@ webkit_web_view_window_object_cleared_cb (MidoriWebView* web_view, web_view->window_object_cleared = TRUE; } -#if GLIB_CHECK_VERSION (2, 16, 0) +#ifdef HAVE_GIO void loadable_icon_finish_cb (GdkPixbuf* icon, GAsyncResult* res, @@ -376,7 +380,7 @@ file_info_finish_cb (GFile* icon_file, static void _midori_web_view_load_icon (MidoriWebView* web_view) { - #if GLIB_CHECK_VERSION (2, 16, 0) + #ifdef HAVE_GIO GFile* file; GFile* icon_file; #endif @@ -384,7 +388,7 @@ _midori_web_view_load_icon (MidoriWebView* web_view) gint icon_width, icon_height; GdkPixbuf* pixbuf_scaled; - #if GLIB_CHECK_VERSION (2, 16, 0) + #ifdef HAVE_GIO if (web_view->uri) { file = g_file_new_for_uri (web_view->uri); @@ -469,7 +473,7 @@ gjs_value_links_foreach_cb (GjsValue* link, { const gchar* type; const gchar* rel; -#if GLIB_CHECK_VERSION (2, 16, 0) +#ifdef HAVE_GIO GFile* icon_file; GIcon* icon; #endif @@ -490,7 +494,7 @@ gjs_value_links_foreach_cb (GjsValue* link, ? gjs_value_get_attribute_string (link, "title") : NULL); } } -#if GLIB_CHECK_VERSION (2, 16, 0) +#ifdef HAVE_GIO if (gjs_value_has_attribute (link, "rel")) { rel = gjs_value_get_attribute_string (link, "rel"); From b371ab8da0725a46f2656b77bffc9c03c06f1a6e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 22 Aug 2008 04:03:02 +0200 Subject: [PATCH 0278/2970] Update AUTORS and TODO --- AUTHORS | 23 +++++++++++++---------- TODO | 2 -- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9cf0454f..6cb29671 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,18 @@ -Written by: +Developers: Christian Dywan -Artwork by: - Nancy Runge +Contributors: + Ori Bernstein + Przemek Sitek + Enrico Tröger + Arnaud Renevier + Dale Whittaker + Anders F Björklund + +Icons: + extension: Nancy Runge + midori: Nancy Runge + news-feed: Nancy Runge Translations: de: Enrico Tröger @@ -16,12 +26,5 @@ Translations: pl: Przemysław Sitek sv: Mikael Magnusson -Contributors: - Ori Bernstein - Przemek Sitek - Enrico Tröger - Arnaud Renevier - Dale Whittaker - Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen diff --git a/TODO b/TODO index 25ca1c19..af976e1f 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,6 @@ TODO: . Import and export of the bookmarks file, or using one from a specific path . Save files on change as opposed to on quit . Middle click toolbuttons or menuitems should open new tabs - . Implement support for userstyles . Custom context menu actions, like in Thunar or Epiphany . Custom tab names . Open an auto-vanishing findbox with '.' @@ -34,7 +33,6 @@ TODO: . Use libnotify for events, e.g. download finished . Save screenshot of a document? . Right-click a textbox in a search form and choose 'add to websearch' - . Reuse running instance, probably via libunique . Honor design principle "no warnings but undo of backups"? . Support widgets 1.0 spec in tool windows and standalone? . Blank page: several custom links, displayed as thumbnails, like Opera? From d30b2bc22c8d214ccbe59003778076937796448b Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Fri, 22 Aug 2008 04:14:28 +0200 Subject: [PATCH 0279/2970] Support user styles even when there is no HEAD --- midori/midori-addons.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index dab59530..4870c230 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -626,7 +626,9 @@ _js_style_from_file (JSContextRef js_context, "var mystyle = document.createElement(\"style\");" "mystyle.setAttribute(\"type\", \"text/css\");" "mystyle.appendChild(document.createTextNode('%s'));" - "document.getElementsByTagName(\"head\")[0].appendChild(mystyle);" + "var head = document.getElementsByTagName(\"head\")[0];" + "if (head) head.appendChild(mystyle);" + "else document.documentElement.insertBefore(mystyle, document.documentElement.firstChild);" "}, true);", style); if (gjs_script_eval (js_context, style_script, exception)) From af2e90a4b18b27f8370e9d813e58d5fa4d1ceaf6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 23 Aug 2008 18:32:53 +0200 Subject: [PATCH 0280/2970] Rename MidoriWebItem to KatzeItem --- katze/Makefile.am | 2 +- katze/katze-item.c | 376 ++++++++++++++++++++++++++++++++++++ katze/katze-item.h | 94 +++++++++ katze/katze-webitem.c | 376 ------------------------------------ katze/katze-webitem.h | 83 -------- katze/katze-weblist.c | 36 ++-- katze/katze-weblist.h | 15 +- katze/katze.h | 2 +- midori/main.c | 24 +-- midori/midori-browser.c | 41 ++-- midori/midori-searchentry.c | 128 ++++++------ midori/midori-searchentry.h | 4 +- midori/sokoke.c | 8 +- po/POTFILES.in | 2 +- 14 files changed, 599 insertions(+), 592 deletions(-) create mode 100644 katze/katze-item.c create mode 100644 katze/katze-item.h delete mode 100644 katze/katze-webitem.c delete mode 100644 katze/katze-webitem.h diff --git a/katze/Makefile.am b/katze/Makefile.am index ed4128d6..5aa7f435 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -14,6 +14,6 @@ libkatze_la_SOURCES = \ katze.h \ katze-throbber.c katze-throbber.h \ katze-utils.c katze-utils.h \ - katze-webitem.c katze-webitem.h \ + katze-item.c katze-item.h \ katze-weblist.c katze-weblist.h \ katze-xbel.c katze-xbel.h diff --git a/katze/katze-item.c b/katze/katze-item.c new file mode 100644 index 00000000..c4b36f8b --- /dev/null +++ b/katze/katze-item.c @@ -0,0 +1,376 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-item.h" + +#include "katze-utils.h" + +#include + +/** + * SECTION:katze-item + * @short_description: A useful item + * @see_also: #MidoriWebList + * + * #KatzeItem is a particularly useful item that provides + * several commonly needed properties. + */ + +G_DEFINE_TYPE (KatzeItem, katze_item, G_TYPE_OBJECT) + +enum +{ + PROP_0, + + PROP_NAME, + PROP_TEXT, + PROP_URI, + PROP_ICON, + PROP_TOKEN +}; + +static void +katze_item_finalize (GObject* object); + +static void +katze_item_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +katze_item_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +katze_item_class_init (KatzeItemClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_item_finalize; + gobject_class->set_property = katze_item_set_property; + gobject_class->get_property = katze_item_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_NAME, + g_param_spec_string ( + "name", + _("Name"), + _("The name of the item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_TEXT, + g_param_spec_string ( + "text", + _("Text"), + _("The descriptive text of the item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_URI, + g_param_spec_string ( + "uri", + _("URI"), + _("The URI of the item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_ICON, + g_param_spec_string ( + "icon", + _("Icon"), + _("The icon of the item"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_TOKEN, + g_param_spec_string ( + "token", + _("Token"), + _("The token of the item"), + NULL, + flags)); +} + + + +static void +katze_item_init (KatzeItem* item) +{ + /* Nothing to do here */ +} + +static void +katze_item_finalize (GObject* object) +{ + KatzeItem* item = KATZE_ITEM (object); + + g_free (item->name); + g_free (item->text); + g_free (item->uri); + g_free (item->icon); + g_free (item->token); + + G_OBJECT_CLASS (katze_item_parent_class)->finalize (object); +} + +static void +katze_item_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + KatzeItem* item = KATZE_ITEM (object); + + switch (prop_id) + { + case PROP_NAME: + item->name = g_value_dup_string (value); + break; + case PROP_TEXT: + item->text = g_value_dup_string (value); + break; + case PROP_URI: + item->uri = g_value_dup_string (value); + break; + case PROP_ICON: + item->icon = g_value_dup_string (value); + break; + case PROP_TOKEN: + item->token = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +katze_item_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + KatzeItem* item = KATZE_ITEM (object); + + switch (prop_id) + { + case PROP_NAME: + g_value_set_string (value, item->name); + break; + case PROP_TEXT: + g_value_set_string (value, item->text); + break; + case PROP_URI: + g_value_set_string (value, item->uri); + break; + case PROP_ICON: + g_value_set_string (value, item->icon); + break; + case PROP_TOKEN: + g_value_set_string (value, item->token); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * katze_item_new: + * + * Creates a new #KatzeItem. + * + * Return value: a new #KatzeItem + **/ +KatzeItem* +katze_item_new (void) +{ + KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, NULL); + + return item; +} + +/** + * katze_item_get_name: + * @item: a #KatzeItem + * + * Retrieves the name of @item. + * + * Return value: the name of the item + **/ +const gchar* +katze_item_get_name (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->name; +} + +/** + * katze_item_set_name: + * @item: a #KatzeItem + * @name: a string + * + * Sets the name of @item. + **/ +void +katze_item_set_name (KatzeItem* item, + const gchar* name) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + katze_assign (item->name, g_strdup (name)); + g_object_notify (G_OBJECT (item), "name"); +} + +/** + * katze_item_get_text: + * @item: a #KatzeItem + * + * Retrieves the descriptive text of @item. + * + * Return value: the text of the item + **/ +const gchar* +katze_item_get_text (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->text; +} + +/** + * katze_item_set_text: + * @item: a #KatzeItem + * @description: a string + * + * Sets the descriptive text of @item. + **/ +void +katze_item_set_text (KatzeItem* item, + const gchar* text) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + katze_assign (item->text, g_strdup (text)); + g_object_notify (G_OBJECT (item), "text"); +} + +/** + * katze_item_get_uri: + * @item: a #KatzeItem + * + * Retrieves the URI of @item. + * + * Return value: the URI of the item + **/ +const gchar* +katze_item_get_uri (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->uri; +} + +/** + * katze_item_set_uri: + * @item: a #KatzeItem + * @uri: a string + * + * Sets the URI of @item. + **/ +void +katze_item_set_uri (KatzeItem* item, + const gchar* uri) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + katze_assign (item->uri, g_strdup (uri)); + g_object_notify (G_OBJECT (item), "uri"); +} + +/** + * katze_item_get_icon: + * @item: a #KatzeItem + * + * Retrieves the icon of @item. + * + * Return value: the icon of the item + **/ +const gchar* +katze_item_get_icon (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->icon; +} + +/** + * katze_item_set_icon: + * @item: a #KatzeItem + * @icon: a string + * + * Sets the icon of @item. + **/ +void +katze_item_set_icon (KatzeItem* item, + const gchar* icon) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + katze_assign (item->icon, g_strdup (icon)); + g_object_notify (G_OBJECT (item), "icon"); +} + +/** + * katze_item_get_token: + * @item: a #KatzeItem + * + * Retrieves the token of @item. + * + * Return value: the token of the item + **/ +const gchar* +katze_item_get_token (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->token; +} + +/** + * katze_item_set_token: + * @item: a #KatzeItem + * @token: a string + * + * Sets the token of @item. + **/ +void +katze_item_set_token (KatzeItem* item, + const gchar* token) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + katze_assign (item->token, g_strdup (token)); + g_object_notify (G_OBJECT (item), "token"); +} diff --git a/katze/katze-item.h b/katze/katze-item.h new file mode 100644 index 00000000..fa61cbca --- /dev/null +++ b/katze/katze-item.h @@ -0,0 +1,94 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_WEB_ITEM_H__ +#define __MIDORI_WEB_ITEM_H__ + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_ITEM \ + (katze_item_get_type ()) +#define KATZE_ITEM(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_ITEM, KatzeItem)) +#define KATZE_ITEM_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_ITEM, KatzeItemClass)) +#define KATZE_IS_ITEM(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_ITEM)) +#define KATZE_IS_ITEM_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_ITEM)) +#define KATZE_ITEM_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_ITEM, KatzeItemClass)) + +typedef struct _KatzeItem KatzeItem; +typedef struct _KatzeItemClass KatzeItemClass; + +struct _KatzeItem +{ + GObject parent_instance; + + gchar* name; + gchar* text; + gchar* uri; + gchar* icon; + gchar* token; +}; + +struct _KatzeItemClass +{ + GObjectClass parent_class; +}; + +GType +katze_item_get_type (void); + +KatzeItem* +katze_item_new (void); + +const gchar* +katze_item_get_name (KatzeItem* item); + +void +katze_item_set_name (KatzeItem* item, + const gchar* name); + +const gchar* +katze_item_get_text (KatzeItem* item); + +void +katze_item_set_text (KatzeItem* item, + const gchar* text); + +const gchar* +katze_item_get_uri (KatzeItem* item); + +void +katze_item_set_uri (KatzeItem* item, + const gchar* uri); + +const gchar* +katze_item_get_icon (KatzeItem* item); + +void +katze_item_set_icon (KatzeItem* item, + const gchar* icon); + +const gchar* +katze_item_get_token (KatzeItem* item); + +void +katze_item_set_token (KatzeItem* item, + const gchar* token); + +G_END_DECLS + +#endif /* __MIDORI_WEB_ITEM_H__ */ diff --git a/katze/katze-webitem.c b/katze/katze-webitem.c deleted file mode 100644 index cd2927f5..00000000 --- a/katze/katze-webitem.c +++ /dev/null @@ -1,376 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "katze-webitem.h" - -#include "katze-utils.h" - -#include - -struct _MidoriWebItem -{ - GObject parent_instance; - - gchar* name; - gchar* description; - gchar* uri; - gchar* icon; - gchar* token; -}; - -G_DEFINE_TYPE (MidoriWebItem, midori_web_item, G_TYPE_OBJECT) - -enum -{ - PROP_0, - - PROP_NAME, - PROP_DESCRIPTION, - PROP_URI, - PROP_ICON, - PROP_TOKEN -}; - -static void -midori_web_item_finalize (GObject* object); - -static void -midori_web_item_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec); - -static void -midori_web_item_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec); - -static void -midori_web_item_class_init (MidoriWebItemClass* class) -{ - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_web_item_finalize; - gobject_class->set_property = midori_web_item_set_property; - gobject_class->get_property = midori_web_item_get_property; - - GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - - g_object_class_install_property (gobject_class, - PROP_NAME, - g_param_spec_string ( - "name", - _("Name"), - _("The name of the web item"), - NULL, - flags)); - - g_object_class_install_property (gobject_class, - PROP_DESCRIPTION, - g_param_spec_string ( - "description", - _("Description"), - _("The description of the web item"), - NULL, - flags)); - - g_object_class_install_property (gobject_class, - PROP_URI, - g_param_spec_string ( - "uri", - _("URI"), - _("The URI of the web item"), - NULL, - flags)); - - g_object_class_install_property (gobject_class, - PROP_ICON, - g_param_spec_string ( - "icon", - _("Icon"), - _("The icon of the web item"), - NULL, - flags)); - - g_object_class_install_property (gobject_class, - PROP_TOKEN, - g_param_spec_string ( - "token", - _("Token"), - _("The token of the web item"), - NULL, - flags)); -} - - - -static void -midori_web_item_init (MidoriWebItem* web_item) -{ - /* Nothing to do here */ -} - -static void -midori_web_item_finalize (GObject* object) -{ - MidoriWebItem* web_item = MIDORI_WEB_ITEM (object); - - g_free (web_item->name); - g_free (web_item->description); - g_free (web_item->uri); - g_free (web_item->icon); - g_free (web_item->token); - - G_OBJECT_CLASS (midori_web_item_parent_class)->finalize (object); -} - -static void -midori_web_item_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec) -{ - MidoriWebItem* web_item = MIDORI_WEB_ITEM (object); - - switch (prop_id) - { - case PROP_NAME: - web_item->name = g_value_dup_string (value); - break; - case PROP_DESCRIPTION: - web_item->description = g_value_dup_string (value); - break; - case PROP_URI: - web_item->uri = g_value_dup_string (value); - break; - case PROP_ICON: - web_item->icon = g_value_dup_string (value); - break; - case PROP_TOKEN: - web_item->token = g_value_dup_string (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -midori_web_item_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) -{ - MidoriWebItem* web_item = MIDORI_WEB_ITEM (object); - - switch (prop_id) - { - case PROP_NAME: - g_value_set_string (value, web_item->name); - break; - case PROP_DESCRIPTION: - g_value_set_string (value, web_item->description); - break; - case PROP_URI: - g_value_set_string (value, web_item->uri); - break; - case PROP_ICON: - g_value_set_string (value, web_item->icon); - break; - case PROP_TOKEN: - g_value_set_string (value, web_item->token); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/** - * midori_web_item_new: - * - * Creates a new #MidoriWebItem. - * - * Return value: a new #MidoriWebItem - **/ -MidoriWebItem* -midori_web_item_new (void) -{ - MidoriWebItem* web_item = g_object_new (MIDORI_TYPE_WEB_ITEM, - NULL); - - return web_item; -} - -/** - * midori_web_item_get_name: - * @web_item: a #MidoriWebItem - * - * Retrieves the name of @web_item. - * - * Return value: the name of the web item - **/ -const gchar* -midori_web_item_get_name (MidoriWebItem* web_item) -{ - g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); - - return web_item->name; -} - -/** - * midori_web_item_set_name: - * @web_item: a #MidoriWebItem - * @name: a string - * - * Sets the name of @web_item. - **/ -void -midori_web_item_set_name (MidoriWebItem* web_item, - const gchar* name) -{ - g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); - - katze_assign (web_item->name, g_strdup (name)); - g_object_notify (G_OBJECT (web_item), "name"); -} - -/** - * midori_web_item_get_description: - * @web_item: a #MidoriWebItem - * - * Retrieves the description of @web_item. - * - * Return value: the description of the web item - **/ -const gchar* -midori_web_item_get_description (MidoriWebItem* web_item) -{ - g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); - - return web_item->description; -} - -/** - * midori_web_item_set_description: - * @web_item: a #MidoriWebItem - * @description: a string - * - * Sets the description of @web_item. - **/ -void -midori_web_item_set_description (MidoriWebItem* web_item, - const gchar* description) -{ - g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); - - katze_assign (web_item->description, g_strdup (description)); - g_object_notify (G_OBJECT (web_item), "description"); -} - -/** - * midori_web_item_get_uri: - * @web_item: a #MidoriWebItem - * - * Retrieves the URI of @web_item. - * - * Return value: the URI of the web item - **/ -const gchar* -midori_web_item_get_uri (MidoriWebItem* web_item) -{ - g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); - - return web_item->uri; -} - -/** - * midori_web_item_set_uri: - * @web_item: a #MidoriWebItem - * @uri: a string - * - * Sets the URI of @web_item. - **/ -void -midori_web_item_set_uri (MidoriWebItem* web_item, - const gchar* uri) -{ - g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); - - katze_assign (web_item->uri, g_strdup (uri)); - g_object_notify (G_OBJECT (web_item), "uri"); -} - -/** - * midori_web_item_get_icon: - * @web_item: a #MidoriWebItem - * - * Retrieves the icon of @web_item. - * - * Return value: the icon of the web item - **/ -const gchar* -midori_web_item_get_icon (MidoriWebItem* web_item) -{ - g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); - - return web_item->icon; -} - -/** - * midori_web_item_set_icon: - * @web_item: a #MidoriWebItem - * @icon: a string - * - * Sets the icon of @web_item. - **/ -void -midori_web_item_set_icon (MidoriWebItem* web_item, - const gchar* icon) -{ - g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); - - katze_assign (web_item->icon, g_strdup (icon)); - g_object_notify (G_OBJECT (web_item), "icon"); -} - -/** - * midori_web_item_get_token: - * @web_item: a #MidoriWebItem - * - * Retrieves the token of @web_item. - * - * Return value: the token of the web item - **/ -const gchar* -midori_web_item_get_token (MidoriWebItem* web_item) -{ - g_return_val_if_fail (MIDORI_IS_WEB_ITEM (web_item), NULL); - - return web_item->token; -} - -/** - * midori_web_item_set_token: - * @web_item: a #MidoriWebItem - * @token: a string - * - * Sets the token of @web_item. - **/ -void -midori_web_item_set_token (MidoriWebItem* web_item, - const gchar* token) -{ - g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); - - katze_assign (web_item->token, g_strdup (token)); - g_object_notify (G_OBJECT (web_item), "token"); -} diff --git a/katze/katze-webitem.h b/katze/katze-webitem.h deleted file mode 100644 index c1276ab3..00000000 --- a/katze/katze-webitem.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_WEB_ITEM_H__ -#define __MIDORI_WEB_ITEM_H__ - -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_WEB_ITEM \ - (midori_web_item_get_type ()) -#define MIDORI_WEB_ITEM(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_ITEM, MidoriWebItem)) -#define MIDORI_WEB_ITEM_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_ITEM, MidoriWebItemClass)) -#define MIDORI_IS_WEB_ITEM(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_ITEM)) -#define MIDORI_IS_WEB_ITEM_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_ITEM)) -#define MIDORI_WEB_ITEM_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_ITEM, MidoriWebItemClass)) - -typedef struct _MidoriWebItem MidoriWebItem; -typedef struct _MidoriWebItemClass MidoriWebItemClass; - -struct _MidoriWebItemClass -{ - GObjectClass parent_class; -}; - -GType -midori_web_item_get_type (void); - -MidoriWebItem* -midori_web_item_new (void); - -const gchar* -midori_web_item_get_name (MidoriWebItem* web_item); - -void -midori_web_item_set_name (MidoriWebItem* web_item, - const gchar* name); - -const gchar* -midori_web_item_get_description (MidoriWebItem* web_item); - -void -midori_web_item_set_description (MidoriWebItem* web_item, - const gchar* description); - -const gchar* -midori_web_item_get_uri (MidoriWebItem* web_item); - -void -midori_web_item_set_uri (MidoriWebItem* web_item, - const gchar* uri); - -const gchar* -midori_web_item_get_icon (MidoriWebItem* web_item); - -void -midori_web_item_set_icon (MidoriWebItem* web_item, - const gchar* icon); - -const gchar* -midori_web_item_get_token (MidoriWebItem* web_item); - -void -midori_web_item_set_token (MidoriWebItem* web_item, - const gchar* token); - -G_END_DECLS - -#endif /* __MIDORI_WEB_ITEM_H__ */ diff --git a/katze/katze-weblist.c b/katze/katze-weblist.c index e4abd211..0d780bcc 100644 --- a/katze/katze-weblist.c +++ b/katze/katze-weblist.c @@ -19,20 +19,32 @@ /** * SECTION:midori-weblist * @short_description: A versatile object container - * @see_also: #MidoriWebItem + * @see_also: #KatzeItem * - * #MidoriWebList is a versatile container for objects with - * explicit support for #MidoriWebList and #MidoriWebItem children. + * #MidoriWebList is a versatile container for objects. */ struct _MidoriWebList { - GObject parent_instance; + KatzeItem parent_instance; GList* items; }; -G_DEFINE_TYPE (MidoriWebList, midori_web_list, G_TYPE_OBJECT) +struct _MidoriWebListClass +{ + KatzeItemClass parent_class; + + /* Signals */ + void + (*add_item) (MidoriWebList* web_list, + GObject* item); + void + (*remove_item) (MidoriWebList* web_list, + GObject* item); +}; + +G_DEFINE_TYPE (MidoriWebList, midori_web_list, KATZE_TYPE_ITEM) enum { ADD_ITEM, @@ -225,7 +237,7 @@ midori_web_list_get_item_index (MidoriWebList* web_list, * * Looks up an item in the list which has the specified token. * - * Supported is #MidoriWebItem. + * Currently only #KatzeItem is supported. * * Note that @token is by definition unique to one item. * @@ -236,19 +248,19 @@ midori_web_list_find_token (MidoriWebList* web_list, const gchar* token) { guint n, i; - GObject* item; - MidoriWebItem* web_item; + gpointer item; + const gchar* found_token; g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), NULL); n = g_list_length (web_list->items); for (i = 0; i < n; i++) { - item = (GObject*)g_list_nth_data (web_list->items, i); - if (!MIDORI_IS_WEB_ITEM (item)) + item = g_list_nth_data (web_list->items, i); + if (!KATZE_IS_ITEM (item)) continue; - web_item = (MidoriWebItem*)item; - if (!strcmp (midori_web_item_get_token (web_item), token)) + found_token = katze_item_get_token ((KatzeItem*)item); + if (found_token && !strcmp (found_token, token)) return item; } return NULL; diff --git a/katze/katze-weblist.h b/katze/katze-weblist.h index 4f74cf4b..0117f7dd 100644 --- a/katze/katze-weblist.h +++ b/katze/katze-weblist.h @@ -12,7 +12,7 @@ #ifndef __MIDORI_WEB_LIST_H__ #define __MIDORI_WEB_LIST_H__ -#include "katze-webitem.h" +#include "katze-item.h" G_BEGIN_DECLS @@ -32,19 +32,6 @@ G_BEGIN_DECLS typedef struct _MidoriWebList MidoriWebList; typedef struct _MidoriWebListClass MidoriWebListClass; -struct _MidoriWebListClass -{ - GObjectClass parent_class; - - /* Signals */ - void - (*add_item) (MidoriWebList* web_list, - GObject* item); - void - (*remove_item) (MidoriWebList* web_list, - GObject* item); -}; - GType midori_web_list_get_type (void); diff --git a/katze/katze.h b/katze/katze.h index 5523a131..159adf1b 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -14,7 +14,7 @@ #include "katze-throbber.h" #include "katze-utils.h" -#include "katze-webitem.h" +#include "katze-item.h" #include "katze-weblist.h" #include "katze-xbel.h" diff --git a/midori/main.c b/midori/main.c index a1651468..30e6c2fb 100644 --- a/midori/main.c +++ b/midori/main.c @@ -265,7 +265,7 @@ search_engines_new_from_file (const gchar* filename, GKeyFile* key_file; gchar** engines; guint i, j, n_properties; - MidoriWebItem* web_item; + KatzeItem* item; GParamSpec** pspecs; const gchar* property; gchar* value; @@ -277,20 +277,20 @@ search_engines_new_from_file (const gchar* filename, /*g_key_file_load_from_data_dirs(keyFile, sFilename, NULL , G_KEY_FILE_KEEP_COMMENTS, error);*/ engines = g_key_file_get_groups (key_file, NULL); + pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), + &n_properties); for (i = 0; engines[i] != NULL; i++) { - web_item = midori_web_item_new (); - pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (web_item), - &n_properties); + item = katze_item_new (); for (j = 0; j < n_properties; j++) { property = g_param_spec_get_name (pspecs[j]); value = g_key_file_get_string (key_file, engines[i], property, NULL); - g_object_set (web_item, property, value, NULL); + g_object_set (item, property, value, NULL); g_free (value); } - midori_web_list_add_item (search_engines, web_item); + midori_web_list_add_item (search_engines, item); } g_strfreev (engines); g_key_file_free (key_file); @@ -304,7 +304,7 @@ search_engines_save_to_file (MidoriWebList* search_engines, { GKeyFile* key_file; guint n, i, j, n_properties; - MidoriWebItem* web_item; + KatzeItem* item; const gchar* name; GParamSpec** pspecs; const gchar* property; @@ -313,16 +313,16 @@ search_engines_save_to_file (MidoriWebList* search_engines, key_file = g_key_file_new (); n = midori_web_list_get_length (search_engines); + pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), + &n_properties); for (i = 0; i < n; i++) { - web_item = midori_web_list_get_nth_item (search_engines, i); - name = midori_web_item_get_name (web_item); - pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (web_item), - &n_properties); + item = midori_web_list_get_nth_item (search_engines, i); + name = katze_item_get_name (item); for (j = 0; j < n_properties; j++) { property = g_param_spec_get_name (pspecs[j]); - g_object_get (web_item, property, &value, NULL); + g_object_get (item, property, &value, NULL); if (value) g_key_file_set_string (key_file, name, property, value); g_free (value); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index dd6d570e..c30b0463 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3098,18 +3098,19 @@ midori_browser_search_activate_cb (GtkWidget* widget, MidoriWebList* search_engines; const gchar* keywords; guint last_web_search; - MidoriWebItem* web_item; + KatzeItem* item; const gchar* url; gchar* location_entry_search; + gchar* search; search_engines = browser->search_engines; keywords = gtk_entry_get_text (GTK_ENTRY (widget)); g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - web_item = midori_web_list_get_nth_item (search_engines, last_web_search); - if (web_item) + item = midori_web_list_get_nth_item (search_engines, last_web_search); + if (item) { location_entry_search = NULL; - url = midori_web_item_get_uri (web_item); + url = katze_item_get_uri (item); } else /* The location entry search is our fallback */ { @@ -3117,7 +3118,6 @@ midori_browser_search_activate_cb (GtkWidget* widget, &location_entry_search, NULL); url = location_entry_search; } - gchar* search; if (strstr (url, "%s")) search = g_strdup_printf (url, keywords); else @@ -3144,14 +3144,13 @@ midori_browser_search_notify_current_item_cb (GObject* gobject, MidoriBrowser* browser) { MidoriSearchEntry* search_entry; - MidoriWebItem* web_item; + KatzeItem* item; guint index; search_entry = MIDORI_SEARCH_ENTRY (browser->search); - web_item = midori_search_entry_get_current_item (search_entry); - if (web_item) - index = midori_web_list_get_item_index (browser->search_engines, - web_item); + item = midori_search_entry_get_current_item (search_entry); + if (item) + index = midori_web_list_get_item_index (browser->search_engines, item); else index = 0; @@ -3677,7 +3676,7 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, static void _midori_browser_update_settings (MidoriBrowser* browser) { - MidoriWebItem* web_item; + KatzeItem* item; gboolean remember_last_window_size; gint last_window_width, last_window_height; @@ -3731,11 +3730,11 @@ _midori_browser_update_settings (MidoriBrowser* browser) if (browser->search_engines) { - web_item = midori_web_list_get_nth_item (browser->search_engines, - last_web_search); - if (web_item) - midori_search_entry_set_current_item (MIDORI_SEARCH_ENTRY (browser->search), - web_item); + item = midori_web_list_get_nth_item (browser->search_engines, + last_web_search); + if (item) + midori_search_entry_set_current_item ( + MIDORI_SEARCH_ENTRY (browser->search), item); } gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), @@ -3822,7 +3821,7 @@ midori_browser_set_property (GObject* object, { MidoriBrowser* browser = MIDORI_BROWSER (object); guint last_web_search; - MidoriWebItem* web_item; + KatzeItem* item; switch (prop_id) { @@ -3869,10 +3868,10 @@ midori_browser_set_property (GObject* object, { g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - web_item = midori_web_list_get_nth_item (browser->search_engines, - last_web_search); - if (web_item) - g_object_set (browser->search, "current-item", web_item, NULL); + item = midori_web_list_get_nth_item (browser->search_engines, + last_web_search); + if (item) + g_object_set (browser->search, "current-item", item, NULL); } break; default: diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index 7f5a5a65..413081fd 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -21,7 +21,7 @@ struct _MidoriSearchEntry GtkIconEntry parent_instance; MidoriWebList* search_engines; - MidoriWebItem* current_item; + KatzeItem* current_item; }; G_DEFINE_TYPE (MidoriSearchEntry, midori_search_entry, GTK_TYPE_ICON_ENTRY) @@ -73,7 +73,7 @@ midori_search_entry_class_init (MidoriSearchEntryClass* class) "current-item", _("Current Item"), _("The currently selected item"), - MIDORI_TYPE_WEB_ITEM, + KATZE_TYPE_ITEM, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -90,10 +90,10 @@ static void midori_search_entry_engine_activate_cb (GtkWidget* widget, MidoriSearchEntry* search_entry) { - MidoriWebItem* web_item; + KatzeItem* item; - web_item = (MidoriWebItem*)g_object_get_data (G_OBJECT (widget), "engine"); - midori_search_entry_set_current_item (search_entry, web_item); + item = (KatzeItem*)g_object_get_data (G_OBJECT (widget), "engine"); + midori_search_entry_set_current_item (search_entry, item); } static void @@ -110,16 +110,16 @@ midori_search_entry_manage_activate_cb (GtkWidget* menuitem, } static void -midori_search_entry_icon_released_cb (GtkWidget* widget, +midori_search_entry_icon_released_cb (GtkWidget* widget, GtkIconEntryPosition* pos, - gint button) + gint button) { MidoriSearchEntry* search_entry; MidoriWebList* search_engines; GtkWidget* menu; guint n, i; GtkWidget* menuitem; - MidoriWebItem* web_item; + KatzeItem* item; GdkPixbuf* pixbuf; GtkWidget* icon; @@ -131,16 +131,16 @@ midori_search_entry_icon_released_cb (GtkWidget* widget, { for (i = 0; i < n; i++) { - web_item = midori_web_list_get_nth_item (search_engines, i); + item = midori_web_list_get_nth_item (search_engines, i); menuitem = gtk_image_menu_item_new_with_label ( - midori_web_item_get_name (web_item)); - pixbuf = sokoke_web_icon (midori_web_item_get_icon (web_item), + katze_item_get_name (item)); + pixbuf = sokoke_web_icon (katze_item_get_icon (item), GTK_ICON_SIZE_MENU, menuitem); icon = gtk_image_new_from_pixbuf (pixbuf); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); g_object_unref (pixbuf); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "engine", web_item); + g_object_set_data (G_OBJECT (menuitem), "engine", item); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_search_entry_engine_activate_cb), widget); gtk_widget_show (menuitem); @@ -173,14 +173,13 @@ _midori_search_entry_move_index (MidoriSearchEntry* search_entry, guint n) { gint i; - MidoriWebItem* web_item; + KatzeItem* item; i = midori_web_list_get_item_index (search_entry->search_engines, search_entry->current_item); - web_item = midori_web_list_get_nth_item (search_entry->search_engines, - i + n); - if (web_item) - midori_search_entry_set_current_item (search_entry, web_item); + item = midori_web_list_get_nth_item (search_entry->search_engines, i + n); + if (item) + midori_search_entry_set_current_item (search_entry, item); } static gboolean @@ -218,7 +217,7 @@ midori_search_entry_scroll_event_cb (MidoriSearchEntry* search_entry, static void midori_search_entry_engines_add_item_cb (MidoriWebList* web_list, - MidoriWebItem* item, + KatzeItem* item, MidoriSearchEntry* search_entry) { if (!search_entry->current_item) @@ -227,16 +226,16 @@ midori_search_entry_engines_add_item_cb (MidoriWebList* web_list, static void midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, - MidoriWebItem* item, + KatzeItem* item, MidoriSearchEntry* search_entry) { - MidoriWebItem* web_item; + KatzeItem* found_item; if (search_entry->current_item == item) { - web_item = midori_web_list_get_nth_item (web_list, 0); - if (web_item) - midori_search_entry_set_current_item (search_entry, web_item); + found_item = midori_web_list_get_nth_item (web_list, 0); + if (found_item) + midori_search_entry_set_current_item (search_entry, found_item); else { gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), @@ -394,7 +393,7 @@ midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, /** * midori_search_entry_set_current_item: * @search_entry: a #MidoriSearchEntry - * @item: a #MidoriWebItem + * @item: a #KatzeItem * * Looks up the specified item in the list of search engines and makes * it the currently selected item. @@ -403,24 +402,23 @@ midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, **/ void midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, - MidoriWebItem* web_item) + KatzeItem* item) { GdkPixbuf* pixbuf; g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); - g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item)); + g_return_if_fail (KATZE_IS_ITEM (item)); - pixbuf = sokoke_web_icon (midori_web_item_get_icon (web_item), + pixbuf = sokoke_web_icon (katze_item_get_icon (item), GTK_ICON_SIZE_MENU, GTK_WIDGET (search_entry)); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), GTK_ICON_ENTRY_PRIMARY, pixbuf); g_object_unref (pixbuf); sokoke_entry_set_default_text (GTK_ENTRY (search_entry), - midori_web_item_get_name (web_item)); + katze_item_get_name (item)); - g_object_ref (web_item); - katze_object_assign (search_entry->current_item, web_item); + katze_object_assign (search_entry->current_item, g_object_ref (item)); g_object_notify (G_OBJECT (search_entry), "current-item"); } @@ -432,7 +430,7 @@ midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, * * Return value: the selected web item, or %NULL **/ -MidoriWebItem* +KatzeItem* midori_search_entry_get_current_item (MidoriSearchEntry* search_entry) { g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); @@ -447,13 +445,13 @@ midori_search_entry_dialog_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - MidoriWebItem* web_item; + KatzeItem* item; const gchar* icon; GdkPixbuf* pixbuf; - gtk_tree_model_get (model, iter, 0, &web_item, -1); + gtk_tree_model_get (model, iter, 0, &item, -1); - icon = midori_web_item_get_icon (web_item); + icon = katze_item_get_icon (item); if (icon) { pixbuf = sokoke_web_icon (icon, GTK_ICON_SIZE_DND, treeview); @@ -472,15 +470,15 @@ midori_search_entry_dialog_render_text (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - MidoriWebItem* web_item; + KatzeItem* item; const gchar* name; - const gchar* description; + const gchar* text; gchar* markup; - gtk_tree_model_get (model, iter, 0, &web_item, -1); - name = midori_web_item_get_name (web_item); - description = midori_web_item_get_description (web_item); - markup = g_markup_printf_escaped ("%s\n%s", name, description); + gtk_tree_model_get (model, iter, 0, &item, -1); + name = katze_item_get_name (item); + text = katze_item_get_text (item); + markup = g_markup_printf_escaped ("%s\n%s", name, text ? text : ""); g_object_set (renderer, "markup", markup, NULL); g_free (markup); } @@ -507,7 +505,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, MidoriSearchEntry* search_entry; GtkWidget* dialog; GtkSizeGroup* sizegroup; - MidoriWebItem* web_item; + KatzeItem* item; GtkWidget* hbox; GtkWidget* label; GtkTreeModel* liststore; @@ -535,7 +533,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, if (new_engine) { - web_item = midori_web_item_new (); + item = katze_item_new (); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); } @@ -543,7 +541,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, { selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); gtk_tree_selection_get_selected (selection, &liststore, &iter); - gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); + gtk_tree_model_get (liststore, &iter, 0, &item, -1); } hbox = gtk_hbox_new (FALSE, 8); @@ -557,7 +555,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_name), - STR_NON_NULL (midori_web_item_get_name (web_item))); + STR_NON_NULL (katze_item_get_name (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -571,7 +569,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_description) - , STR_NON_NULL (midori_web_item_get_description (web_item))); + , STR_NON_NULL (katze_item_get_text (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -585,7 +583,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_uri) - , STR_NON_NULL (midori_web_item_get_uri (web_item))); + , STR_NON_NULL (katze_item_get_uri (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -599,13 +597,13 @@ midori_search_entry_get_editor (GtkWidget* treeview, gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_icon) - , STR_NON_NULL (midori_web_item_get_icon (web_item))); + , STR_NON_NULL (katze_item_get_icon (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER(hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); label = gtk_label_new_with_mnemonic (_("_Token:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -613,7 +611,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE); if (!new_engine) gtk_entry_set_text (GTK_ENTRY (entry_token) - , STR_NON_NULL (midori_web_item_get_token (web_item))); + , STR_NON_NULL (katze_item_get_token (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -621,9 +619,9 @@ midori_search_entry_get_editor (GtkWidget* treeview, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - g_object_set (web_item, + g_object_set (item, "name", gtk_entry_get_text (GTK_ENTRY (entry_name)), - "description", gtk_entry_get_text (GTK_ENTRY (entry_description)), + "text", gtk_entry_get_text (GTK_ENTRY (entry_description)), "uri", gtk_entry_get_text (GTK_ENTRY (entry_uri)), "icon", gtk_entry_get_text (GTK_ENTRY (entry_icon)), "token", gtk_entry_get_text (GTK_ENTRY (entry_token)), @@ -631,7 +629,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); if (new_engine) - midori_web_list_add_item (search_entry->search_engines, web_item); + midori_web_list_add_item (search_entry->search_engines, item); } gtk_widget_destroy (dialog); } @@ -667,7 +665,7 @@ midori_search_entry_dialog_remove_cb (GtkWidget* widget, GtkTreeSelection* selection; GtkTreeModel* liststore; GtkTreeIter iter; - MidoriWebItem* web_item; + KatzeItem* item; MidoriWebList* search_engines; search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); @@ -675,9 +673,9 @@ midori_search_entry_dialog_remove_cb (GtkWidget* widget, selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) { - gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); - midori_web_list_remove_item (search_engines, web_item); - g_object_unref (web_item); + gtk_tree_model_get (liststore, &iter, 0, &item, -1); + midori_web_list_remove_item (search_engines, item); + g_object_unref (item); /* FIXME: we want to allow undo of some kind */ } } @@ -701,7 +699,7 @@ midori_search_entry_treeview_selection_cb (GtkTreeSelection* selection, static void midori_search_entry_dialog_engines_add_item_cb (MidoriWebList* web_list, - MidoriWebItem* item, + KatzeItem* item, GtkWidget* treeview) { GtkTreeModel* liststore; @@ -714,20 +712,20 @@ midori_search_entry_dialog_engines_add_item_cb (MidoriWebList* web_list, static void midori_search_entry_dialog_engines_remove_item_cb (MidoriWebList* web_list, - MidoriWebItem* item, + KatzeItem* item, GtkWidget* treeview) { GtkTreeModel* liststore; GtkTreeIter iter; gboolean valid; - MidoriWebItem* web_item; + KatzeItem* found_item; liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); valid = gtk_tree_model_get_iter_first (liststore, &iter); while (valid) { - gtk_tree_model_get (liststore, &iter, 0, &web_item, -1); - if (web_item == item) + gtk_tree_model_get (liststore, &iter, 0, &found_item, -1); + if (found_item == item) { gtk_list_store_remove (GTK_LIST_STORE (liststore), &iter); valid = FALSE; @@ -777,7 +775,7 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) GtkWidget* treeview; GtkWidget* scrolled; guint n, i; - MidoriWebItem* web_item; + KatzeItem* item; GtkWidget* vbox; GtkWidget* button; @@ -814,7 +812,7 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 12); - liststore = gtk_list_store_new (1, MIDORI_TYPE_WEB_ITEM); + liststore = gtk_list_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), "changed", G_CALLBACK (midori_search_entry_treeview_selection_cb), @@ -843,9 +841,9 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) n = midori_web_list_get_length (search_entry->search_engines); for (i = 0; i < n; i++) { - web_item = midori_web_list_get_nth_item (search_entry->search_engines, i); + item = midori_web_list_get_nth_item (search_entry->search_engines, i); gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), - NULL, i, 0, web_item, -1); + NULL, i, 0, item, -1); } g_object_unref (liststore); g_signal_connect (treeview, "destroy", diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h index ac7b794e..30d33ae6 100644 --- a/midori/midori-searchentry.h +++ b/midori/midori-searchentry.h @@ -54,12 +54,12 @@ void midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, MidoriWebList* name); -MidoriWebItem* +KatzeItem* midori_search_entry_get_current_item (MidoriSearchEntry* search_entry); void midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, - MidoriWebItem* name); + KatzeItem* name); GtkWidget* midori_search_entry_get_dialog (MidoriSearchEntry* search_entry); diff --git a/midori/sokoke.c b/midori/sokoke.c index 0ab823de..77263a3d 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -88,7 +88,7 @@ sokoke_magic_uri (const gchar* uri, gchar* search; const gchar* search_uri; gchar** parts; - MidoriWebItem* web_item; + KatzeItem* item; g_return_val_if_fail (uri, NULL); if (search_engines) @@ -122,9 +122,9 @@ sokoke_magic_uri (const gchar* uri, parts = g_strsplit (uri, " ", 2); if (parts[0] && parts[1]) { - web_item = midori_web_list_find_token (search_engines, parts[0]); - if (web_item) - search_uri = midori_web_item_get_uri (web_item); + item = midori_web_list_find_token (search_engines, parts[0]); + if (item) + search_uri = katze_item_get_uri (item); } g_free (parts); if (search_uri) diff --git a/po/POTFILES.in b/po/POTFILES.in index 16a7e207..4f59301e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,6 +15,6 @@ midori/sokoke.c midori/gjs.c katze/katze-throbber.c katze/katze-utils.c -katze/katze-webitem.c +katze/katze-item.c katze/katze-weblist.c katze/katze-xbel.c From e4457be3edd441b5acd69d0c7bd56ae047bf9b97 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sat, 23 Aug 2008 19:57:22 +0200 Subject: [PATCH 0281/2970] Read addons into a list for more flexibility Until now we used to scan directories every time we wanted to either display the list of addons or load addons in order to execute them. That is wasteful and inflexible. Use a list of elements and only update it when needed, for example when the directory folder notifies us of a change. This is a stop towards disabling particular elements. --- midori/midori-addons.c | 324 ++++++++++++++++++++++++++++------------- midori/midori-addons.h | 3 + 2 files changed, 224 insertions(+), 103 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 4870c230..ed3bd812 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -23,6 +23,9 @@ #include #include #include +#if HAVE_GIO + #include +#endif struct _MidoriAddons { @@ -32,6 +35,19 @@ struct _MidoriAddons MidoriAddonKind kind; GtkWidget* toolbar; GtkWidget* treeview; + + GSList* elements; +}; + +struct AddonElement +{ + gchar *fullpath; + gchar *name; + gchar *description; + gboolean enabled; + + GSList* includes; + GSList* excludes; }; G_DEFINE_TYPE (MidoriAddons, midori_addons, GTK_TYPE_VBOX) @@ -44,6 +60,9 @@ enum PROP_KIND }; +static void +midori_addons_finalize (GObject* object); + static void midori_addons_set_property (GObject* object, guint prop_id, @@ -81,6 +100,7 @@ midori_addons_class_init (MidoriAddonsClass* class) GParamFlags flags; gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_addons_finalize; gobject_class->set_property = midori_addons_set_property; gobject_class->get_property = midori_addons_get_property; @@ -183,31 +203,60 @@ _addons_get_extension (MidoriAddons* addons) } static GSList* -_addons_get_files (MidoriAddons* addons) +_addons_get_directories (MidoriAddons* addons) { - GSList* files; - GDir* addon_dir; - const gchar* addons_name; - const gchar* addons_extension; - const char* const *datadirs; - const gchar* filename; - gchar *dirname; - gchar *fullname; + GSList *directories; + const char* const* datadirs; + const gchar* folder; + gchar* path; - files = NULL; - addons_name = _addons_get_folder (addons); - addons_extension = _addons_get_extension (addons); + folder = _addons_get_folder (addons); + + /* user data dir */ + path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), + PACKAGE_NAME, folder, NULL); + directories = g_slist_prepend (NULL, path); /* system data dirs */ datadirs = g_get_system_data_dirs (); while (*datadirs) { - dirname = g_build_filename (*datadirs, PACKAGE_NAME, addons_name, NULL); + path = g_build_path (G_DIR_SEPARATOR_S, *datadirs, + PACKAGE_NAME, folder, NULL); + directories = g_slist_prepend (directories, path); + datadirs++; + } + + return directories; +} + +static GSList* +_addons_get_files (MidoriAddons* addons) +{ + GSList* files; + GDir* addon_dir; + const gchar* folder; + const gchar* extension; + GSList* list; + GSList* directories; + const gchar* filename; + gchar* dirname; + gchar* fullname; + + files = NULL; + folder = _addons_get_folder (addons); + extension = _addons_get_extension (addons); + + directories = _addons_get_directories (addons); + list = directories; + while (directories) + { + dirname = directories->data; if ((addon_dir = g_dir_open (dirname, 0, NULL))) { while ((filename = g_dir_read_name (addon_dir))) { - if (g_str_has_suffix (filename, addons_extension)) + if (g_str_has_suffix (filename, extension)) { fullname = g_build_filename (dirname, filename, NULL); files = g_slist_prepend (files, fullname); @@ -216,29 +265,25 @@ _addons_get_files (MidoriAddons* addons) g_dir_close (addon_dir); } g_free (dirname); - datadirs++; + directories = g_slist_next (directories); } - - /* user data dir */ - dirname = g_build_filename (g_get_user_data_dir () , PACKAGE_NAME, - addons_name, NULL); - if ((addon_dir = g_dir_open (dirname, 0, NULL))) - { - while ((filename = g_dir_read_name (addon_dir))) - { - if (g_str_has_suffix (filename, addons_extension)) - { - fullname = g_build_filename (dirname, filename, NULL); - files = g_slist_prepend (files, fullname); - } - } - g_dir_close (addon_dir); - } - g_free (dirname); + g_slist_free (list); return files; } +#if HAVE_GIO +static void +midori_addons_directory_monitor_changed (GFileMonitor* monitor, + GFile* child, + GFile* other_file, + GFileMonitorEvent flags, + MidoriAddons* addons) +{ + midori_addons_update_elements (addons); +} +#endif + static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) @@ -251,6 +296,11 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, _addons_get_folder (addons)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); +#if !HAVE_GIO + /* FIXME: Without GIO clicking this button is the only + way to update the list */ + midori_addons_update_elements (addons); +#endif } static void @@ -275,13 +325,13 @@ midori_addons_treeview_render_text_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - gchar* displayname; + gchar* name; - gtk_tree_model_get (model, iter, 0, &displayname, -1); + gtk_tree_model_get (model, iter, 0, &name, -1); - g_object_set (renderer, "text", displayname, NULL); + g_object_set (renderer, "text", name, NULL); - g_free (displayname); + g_free (name); } static void @@ -308,6 +358,7 @@ midori_addons_init (MidoriAddons* addons) GtkCellRenderer* renderer_pixbuf; addons->web_widget = NULL; + addons->elements = NULL; addons->treeview = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (addons->treeview), FALSE); @@ -330,6 +381,13 @@ midori_addons_init (MidoriAddons* addons) gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0); } +static void +midori_addons_finalize (GObject* object) +{ + MidoriAddons* addons = MIDORI_ADDONS (object); + g_slist_free (addons->elements); +} + static gboolean _metadata_from_file (const gchar* filename, GSList** includes, @@ -457,7 +515,9 @@ _convert_to_simple_regexp (const gchar* pattern) } return dest; } + #else + static bool _match_with_wildcard (const gchar* str, const gchar* pattern) @@ -563,7 +623,7 @@ _may_load_script (const gchar* uri, break; } #endif - list = list->next; + list = g_slist_next (list); } return match; } @@ -602,12 +662,14 @@ _js_style_from_file (JSContextRef js_context, const gchar* filename, gchar** exception) { - gboolean result = FALSE; + gboolean result; gchar* style; - GError* error = NULL; + GError* error; guint i, n; gchar* style_script; + result = FALSE; + error = NULL; if (g_file_get_contents (filename, &style, NULL, &error)) { n = strlen (style); @@ -651,40 +713,29 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, JSObjectRef js_window, MidoriAddons* addons) { - gchar* fullname; - GSList* includes; - GSList* excludes; const gchar* uri; + GSList* elements; + struct AddonElement* element; + gchar* fullname; gchar* exception; gchar* message; - GSList* addon_files; - GSList* list; uri = webkit_web_frame_get_uri (web_frame); if (!uri) return; - addon_files = _addons_get_files (addons); - list = addon_files; - while (addon_files) + elements = addons->elements; + while (elements) { - fullname = addon_files->data; - includes = NULL; - excludes = NULL; - if (addons->kind == MIDORI_ADDON_USER_SCRIPTS && - !_metadata_from_file (fullname, &includes, &excludes, NULL, NULL)) - { - addon_files = g_slist_next (addon_files); - continue; - } - if (includes || excludes) - if (!_may_load_script (uri, &includes, &excludes)) + element = elements->data; + fullname = element->fullpath; + + if (element->includes || element->excludes) + if (!_may_load_script (uri, &element->includes, &element->excludes)) { - addon_files = g_slist_next (addon_files); + elements = g_slist_next (elements); continue; } - g_slist_free (includes); - g_slist_free (excludes); exception = NULL; if (addons->kind == MIDORI_ADDON_USER_SCRIPTS && !_js_script_from_file (js_context, fullname, &exception)) @@ -702,9 +753,9 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, g_free (message); g_free (exception); } - addon_files = addon_files->next; + + elements = g_slist_next (elements); } - g_slist_free (list); } /** @@ -724,6 +775,13 @@ midori_addons_new (GtkWidget* web_widget, MidoriAddonKind kind) { MidoriAddons* addons; + #if HAVE_GIO + GSList* directories; + GSList* list; + GFile* directory; + GError* error; + GFileMonitor* monitor; + #endif g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL); @@ -732,6 +790,30 @@ midori_addons_new (GtkWidget* web_widget, "kind", kind, */ NULL); addons->web_widget = web_widget; midori_addons_set_kind (addons, kind); + midori_addons_update_elements (addons); + + #if HAVE_GIO + directories = _addons_get_directories (addons); + list = directories; + while (directories) + { + directory = g_file_new_for_path (directories->data); + directories = directories->next; + error = NULL; + monitor = g_file_monitor_directory (directory, + G_FILE_MONITOR_NONE, + NULL, &error); + if (!monitor) + { + g_warning ("could not monitor %s: %s", g_file_get_parse_name (directory), + error->message); + g_error_free (error); + } + g_signal_connect (monitor, "changed", + G_CALLBACK (midori_addons_directory_monitor_changed), addons); + } + g_slist_free (list); +#endif return GTK_WIDGET (addons); } @@ -784,14 +866,6 @@ void midori_addons_set_kind (MidoriAddons* addons, MidoriAddonKind kind) { - GtkListStore* liststore; - gchar* fullname; - gchar* displayname; - gchar* name; - GtkTreeIter iter; - GSList* addon_files; - GSList* list; - g_return_if_fail (MIDORI_IS_ADDONS (addons)); g_return_if_fail (addons->kind == MIDORI_ADDON_NONE); @@ -807,38 +881,6 @@ midori_addons_set_kind (MidoriAddons* addons, g_signal_connect (addons->web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); - liststore = gtk_list_store_new (3, G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING); - - addon_files = _addons_get_files (addons); - list = addon_files; - while (addon_files) - { - fullname = addon_files->data; - displayname = g_filename_display_basename (fullname); - - if (kind == MIDORI_ADDON_USER_SCRIPTS) - { - name = NULL; - if (!_metadata_from_file (fullname, NULL, NULL, &name, NULL)) - continue; - if (name) - { - g_free (displayname); - displayname = name; - } - } - - gtk_list_store_append (liststore, &iter); - gtk_list_store_set (liststore, &iter, 0, displayname, 1, 0, 2, "", -1); - addon_files = addon_files->next; - } - - g_slist_free (list); - - gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), - GTK_TREE_MODEL (liststore)); g_object_notify (G_OBJECT (addons), "kind"); } @@ -902,3 +944,79 @@ midori_addons_get_toolbar (MidoriAddons* addons) return addons->toolbar; } + +/** + * midori_addons_update_elements: + * @addons: a #MidoriAddons + * + * Updates all addons elements (file paths and metadata). + * + **/ +void +midori_addons_update_elements (MidoriAddons* addons) +{ + gchar* fullname; + gchar* displayname; + gchar* name; + gchar* description; + GSList* includes; + GSList* excludes; + GtkListStore* liststore; + GtkTreeIter iter; + GSList* addon_files; + GSList* list; + struct AddonElement* element; + + g_return_if_fail (addons->kind != MIDORI_ADDON_NONE); + + g_slist_free (addons->elements); + addons->elements = NULL; + + liststore = gtk_list_store_new (3, G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING); + + addon_files = _addons_get_files (addons); + list = addon_files; + while (addon_files) + { + fullname = addon_files->data; + displayname = g_filename_display_basename (fullname); + description = NULL; + includes = NULL; + excludes = NULL; + + if (addons->kind == MIDORI_ADDON_USER_SCRIPTS) + { + name = NULL; + if (!_metadata_from_file (fullname, &includes, &excludes, &name, + &description)) + continue; + if (name) + { + g_free (displayname); + displayname = name; + } + } + + gtk_list_store_append (liststore, &iter); + gtk_list_store_set (liststore, &iter, + 0, g_strdup (displayname), 1, 0, 2, "", -1); + + element = g_new (struct AddonElement, 1); + element->name = displayname; + element->description = description; + element->fullpath = fullname; + element->enabled = TRUE; + element->includes = includes; + element->excludes = excludes; + addons->elements = g_slist_prepend (addons->elements, element); + addon_files = g_slist_next (addon_files); + } + addons->elements = g_slist_reverse (addons->elements); + + g_slist_free (list); + + gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), + GTK_TREE_MODEL (liststore)); +} diff --git a/midori/midori-addons.h b/midori/midori-addons.h index f141b78d..a6f03a4d 100644 --- a/midori/midori-addons.h +++ b/midori/midori-addons.h @@ -77,6 +77,9 @@ midori_addons_get_kind (MidoriAddons* addons); GtkWidget* midori_addons_get_toolbar (MidoriAddons* addons); +void +midori_addons_update_elements (MidoriAddons* addons); + G_END_DECLS #endif /* __MIDORI_ADDONS_H__ */ From 3caa11b63e46d250ab8f72d3d56681ce83aaa4be Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 23 Aug 2008 22:00:40 +0200 Subject: [PATCH 0282/2970] Define the HAVE_FOO variables manually for autotools --- configure.in | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index 702d8812..d993d729 100644 --- a/configure.in +++ b/configure.in @@ -38,51 +38,58 @@ if test x"$enable_debug" = x"yes"; then ]) fi -# Checks for UNIQUE -PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= 0.9, have_unique=true, have_unique=false) +# Checks for Unique +PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= 0.9, have_unique=1, have_unique=0) AC_SUBST(UNIQUE_CFLAGS) AC_SUBST(UNIQUE_LIBS) +AC_DEFINE_UNQUOTED(HAVE_UNIQUE,$have_unique, [Whether Unique is available]) # Checks for GIO2 -PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=true, have_gio=false) +PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=1, have_gio=0) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) +AC_DEFINE_UNQUOTED(HAVE_GIO,$have_gio, [Whether GIO is available]) -# Checks for GTK+2 -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false) +# Checks for Gtk+2 +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=1, have_gtk=0) if test "x${have_gtk}" = "xfalse" ; then - AC_MSG_ERROR([No GTK+2 package information found]) + AC_MSG_ERROR([No Gtk+2 package information found]) fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +AC_DEFINE_UNQUOTED(HAVE_GTK,$have_gtk, [Whether Gtk is available]) -# Checks for gtksourceview -PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0, have_gtksourceview=true, have_gtksourceview=false) +# Checks for GtkSourceView +PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0, have_gtksourceview=1, have_gtksourceview=0) AC_SUBST(GTKSOURCEVIEW_CFLAGS) AC_SUBST(GTKSOURCEVIEW_LIBS) +AC_DEFINE_UNQUOTED(HAVE_GTKSOURCEVIEW,$have_gtksourceview, [Whether GtkSourceView is available]) # Checks for WebKit -PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) +PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=1, have_webkit=0) if test "x${have_webkit}" = "xfalse" ; then AC_MSG_ERROR([No WebKit package information found]) fi AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_LIBS) +AC_DEFINE_UNQUOTED(HAVE_WEBKIT,$have_webkit, [Whether WebKit is available]) # Checks for LibXML2 -PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=true, have_libxml=false) +PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=1, have_libxml=0) if test "x${have_libxml}" = "xfalse" ; then AC_MSG_ERROR([No libXML2 package information found]) fi AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) +AC_DEFINE_UNQUOTED(HAVE_LIBXML,$have_libxml, [Whether LibXML is available]) # i18n GETTEXT_PACKAGE=midori AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) -ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS +# take all languages found in file po/LINGUAS +ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" AM_GLIB_GNU_GETTEXT # workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) From 74a587f5e8b7cc236c9a69f1bf8f3548d902fd40 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 23 Aug 2008 23:44:55 +0200 Subject: [PATCH 0283/2970] Use #if instead of #ifdef consistently --- midori/main.c | 4 ++-- midori/midori-app.c | 20 ++++++++++---------- midori/midori-browser.c | 16 ++++++++-------- midori/midori-webview.c | 12 ++++++------ midori/sokoke.c | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/midori/main.c b/midori/main.c index 30e6c2fb..e3a666ba 100644 --- a/midori/main.c +++ b/midori/main.c @@ -25,7 +25,7 @@ #include #include -#ifdef ENABLE_NLS +#if ENABLE_NLS #include #endif @@ -397,7 +397,7 @@ main (int argc, gchar* homepage; MidoriWebList* search_engines; - #ifdef ENABLE_NLS + #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); diff --git a/midori/midori-app.c b/midori/midori-app.c index 660bbe4d..7314957c 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -19,7 +19,7 @@ #include #include -#ifdef HAVE_UNIQUE +#if HAVE_UNIQUE #include #endif @@ -174,7 +174,7 @@ midori_app_constructor (GType type, type, n_construct_properties, construct_properties); } -#ifdef HAVE_UNIQUE +#if HAVE_UNIQUE static UniqueResponse midori_browser_message_received_cb (UniqueApp* instance, UniqueCommand command, @@ -225,7 +225,7 @@ midori_browser_message_received_cb (UniqueApp* instance, static void midori_app_init (MidoriApp* app) { - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE gchar* display_name; gchar* instance_name; guint i, n; @@ -241,7 +241,7 @@ midori_app_init (MidoriApp* app) app->trash = midori_web_list_new (); app->search_engines = midori_web_list_new (); - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); n = strlen (display_name); for (i = 0; i < n; i++) @@ -422,7 +422,7 @@ midori_app_instance_is_running (MidoriApp* app) { g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE return unique_app_is_running (app->instance); #else return FALSE; @@ -443,14 +443,14 @@ midori_app_instance_is_running (MidoriApp* app) gboolean midori_app_instance_send_activate (MidoriApp* app) { - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE UniqueResponse response; #endif g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE response = unique_app_send_message (app->instance, UNIQUE_ACTIVATE, NULL); if (response == UNIQUE_RESPONSE_OK) return TRUE; @@ -474,7 +474,7 @@ gboolean midori_app_instance_send_uris (MidoriApp* app, gchar** uris) { - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE UniqueMessageData* message; UniqueResponse response; #endif @@ -483,7 +483,7 @@ midori_app_instance_send_uris (MidoriApp* app, g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); g_return_val_if_fail (uris != NULL, FALSE); - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE message = unique_message_data_new (); unique_message_data_set_uris (message, uris); response = unique_app_send_message (app->instance, UNIQUE_OPEN, message); @@ -525,7 +525,7 @@ midori_app_add_browser (MidoriApp* app, app->browsers = g_list_prepend (app->browsers, browser); - #ifdef HAVE_UNIQUE + #if HAVE_UNIQUE if (app->instance) unique_app_watch_window (app->instance, GTK_WINDOW (browser)); #endif diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c30b0463..146070df 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -28,7 +28,7 @@ #include "compat.h" #include "gjs.h" -#ifdef HAVE_GIO +#if HAVE_GIO #include #endif #include @@ -1829,14 +1829,14 @@ _action_source_view_activate (GtkAction* action, #if HAVE_GIO GFile* file; gchar* tag; - #ifdef HAVE_GTKSOURCEVIEW + #if HAVE_GTKSOURCEVIEW GFileInfo* info; const gchar* content_type; #endif #endif gchar* contents; gchar* contents_utf8; - #ifdef HAVE_GTKSOURCEVIEW + #if HAVE_GTKSOURCEVIEW GtkSourceBuffer* buffer; #if HAVE_GIO GtkSourceLanguageManager* language_manager; @@ -1858,12 +1858,12 @@ _action_source_view_activate (GtkAction* action, #if HAVE_GIO file = g_file_new_for_uri (uri); tag = NULL; - #ifdef HAVE_GTKSOURCEVIEW + #if HAVE_GTKSOURCEVIEW content_type = NULL; #endif if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL)) { - #ifdef HAVE_GTKSOURCEVIEW + #if HAVE_GTKSOURCEVIEW info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL); content_type = g_file_info_get_content_type (info); @@ -1880,10 +1880,10 @@ _action_source_view_activate (GtkAction* action, #endif contents_utf8 = contents; - #ifdef HAVE_GTKSOURCEVIEW + #if HAVE_GTKSOURCEVIEW buffer = gtk_source_buffer_new (NULL); gtk_source_buffer_set_highlight_syntax (buffer, TRUE); - #ifdef HAVE_GIO + #if HAVE_GIO if (content_type) { language_manager = gtk_source_language_manager_get_default (); @@ -1912,7 +1912,7 @@ _action_source_view_activate (GtkAction* action, #endif if (contents_utf8) gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1); - #ifdef HAVE_GTKSOURCEVIEW + #if HAVE_GTKSOURCEVIEW text_view = gtk_source_view_new_with_buffer (buffer); gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (text_view), TRUE); #else diff --git a/midori/midori-webview.c b/midori/midori-webview.c index faf45855..e85f052c 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -20,7 +20,7 @@ #include "sokoke.h" #include "compat.h" -#ifdef HAVE_GIO +#if HAVE_GIO #include #endif #include @@ -294,7 +294,7 @@ webkit_web_view_window_object_cleared_cb (MidoriWebView* web_view, web_view->window_object_cleared = TRUE; } -#ifdef HAVE_GIO +#if HAVE_GIO void loadable_icon_finish_cb (GdkPixbuf* icon, GAsyncResult* res, @@ -380,7 +380,7 @@ file_info_finish_cb (GFile* icon_file, static void _midori_web_view_load_icon (MidoriWebView* web_view) { - #ifdef HAVE_GIO + #if HAVE_GIO GFile* file; GFile* icon_file; #endif @@ -388,7 +388,7 @@ _midori_web_view_load_icon (MidoriWebView* web_view) gint icon_width, icon_height; GdkPixbuf* pixbuf_scaled; - #ifdef HAVE_GIO + #if HAVE_GIO if (web_view->uri) { file = g_file_new_for_uri (web_view->uri); @@ -473,7 +473,7 @@ gjs_value_links_foreach_cb (GjsValue* link, { const gchar* type; const gchar* rel; -#ifdef HAVE_GIO +#if HAVE_GIO GFile* icon_file; GIcon* icon; #endif @@ -494,7 +494,7 @@ gjs_value_links_foreach_cb (GjsValue* link, ? gjs_value_get_attribute_string (link, "title") : NULL); } } -#ifdef HAVE_GIO +#if HAVE_GIO if (gjs_value_has_attribute (link, "rel")) { rel = gjs_value_get_attribute_string (link, "rel"); diff --git a/midori/sokoke.c b/midori/sokoke.c index 77263a3d..60ee1476 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -16,7 +16,7 @@ #include "sokoke.h" #include "main.h" -#ifdef HAVE_UNISTD_H +#if HAVE_UNISTD_H #include #endif #include @@ -338,7 +338,7 @@ sokoke_superuser_warning_new (void) { /* Create a horizontal bar with a security warning This returns NULL if the user is no superuser */ - #ifdef HAVE_UNISTD_H + #if HAVE_UNISTD_H if (G_UNLIKELY (!geteuid ())) /* effective superuser? */ { GtkWidget* hbox = gtk_event_box_new (); From 1dfebf6c7f49d670e03babf389b170623902bf0b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 24 Aug 2008 03:05:00 +0200 Subject: [PATCH 0284/2970] Use the right index for Undo Close Tab. --- midori/midori-browser.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 146070df..6ac96059 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2650,10 +2650,14 @@ static void _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { + guint last; + KatzeXbelItem* item; + guint n; + /* Reopen the most recent trash item */ - guint length = midori_web_list_get_length (browser->trash); - KatzeXbelItem* item = midori_web_list_get_nth_item (browser->trash, length); - gint n = midori_browser_add_xbel_item (browser, item); + last = midori_web_list_get_length (browser->trash) - 1; + item = midori_web_list_get_nth_item (browser->trash, last); + n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); midori_web_list_remove_item (browser->trash, item); _midori_browser_update_actions (browser); From 45e4db6c86004da053bd1bf4efe971045ca9bbfc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 24 Aug 2008 03:15:45 +0200 Subject: [PATCH 0285/2970] Bump version to 0.0.20 --- ChangeLog | 11 +++++++++++ configure.in | 2 +- wscript | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13df4b51..73180647 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +v0.0.20: + + Single instance support using Unique + + Make it clear that WAF is preferred + + Provide an 'extension' icon + + Load user styles from ~/.local/share/midori/styles + + Use Ctrl+Shift+T for Undo Close Tab + + Add "open-tabs-next-to-current" preference + + Use rsvg-convert instead of imagemagick's convert + + @name in the meta data of userscripts is recognized + + Remove "small-toolbar" preference + v0.0.19: + Improved Greasemonkey compatibility + Improve multiple window support diff --git a/configure.in b/configure.in index d993d729..2dde9c20 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.19], [http://www.twotoasts.de/bugs]) +AC_INIT([midori], [0.0.20], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/main.h]) AC_CONFIG_HEADER([config.h]) diff --git a/wscript b/wscript index 10964a59..1ad146d8 100644 --- a/wscript +++ b/wscript @@ -6,7 +6,7 @@ import pproc as subprocess import Common APPNAME = 'midori' -VERSION = '0.0.19' +VERSION = '0.0.20' try: git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], From bf28e1097ba613007fdfee3632860f611a50e790 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 26 Aug 2008 01:19:38 +0200 Subject: [PATCH 0286/2970] Rework MidoriWebList into KatzeList and KatzeArray --- katze/Makefile.am | 3 +- katze/katze-array.c | 305 +++++++++++++++++++++++++++++++++++ katze/katze-array.h | 76 +++++++++ katze/katze-item.c | 2 +- katze/katze-item.h | 4 +- katze/katze-list.c | 244 ++++++++++++++++++++++++++++ katze/katze-list.h | 88 +++++++++++ katze/katze-weblist.c | 308 ------------------------------------ katze/katze-weblist.h | 72 --------- katze/katze.h | 7 +- midori/main.c | 37 +++-- midori/midori-app.c | 19 +-- midori/midori-app.h | 4 +- midori/midori-browser.c | 51 +++--- midori/midori-searchentry.c | 53 ++++--- midori/midori-searchentry.h | 4 +- midori/midori-webview.c | 14 +- midori/midori-webview.h | 2 +- midori/sokoke.c | 8 +- midori/sokoke.h | 2 +- po/POTFILES.in | 3 +- 21 files changed, 821 insertions(+), 485 deletions(-) create mode 100644 katze/katze-array.c create mode 100644 katze/katze-array.h create mode 100644 katze/katze-list.c create mode 100644 katze/katze-list.h delete mode 100644 katze/katze-weblist.c delete mode 100644 katze/katze-weblist.h diff --git a/katze/Makefile.am b/katze/Makefile.am index 5aa7f435..16115148 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -15,5 +15,6 @@ libkatze_la_SOURCES = \ katze-throbber.c katze-throbber.h \ katze-utils.c katze-utils.h \ katze-item.c katze-item.h \ - katze-weblist.c katze-weblist.h \ + katze-list.c katze-list.h \ + katze-array.c katze-array.h \ katze-xbel.c katze-xbel.h diff --git a/katze/katze-array.c b/katze/katze-array.c new file mode 100644 index 00000000..95f6900c --- /dev/null +++ b/katze/katze-array.c @@ -0,0 +1,305 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-array.h" + +#include "katze-utils.h" + +#include +#include + +/** + * SECTION:katze-array + * @short_description: A type aware item container + * @see_also: #KatzeArray + * + * #KatzeArray is a type aware container for items. + */ + +struct _KatzeArray +{ + KatzeList parent_instance; + + GType type; +}; + +struct _KatzeArrayClass +{ + KatzeListClass parent_class; +}; + +G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_LIST) + +static void +katze_array_finalize (GObject* object); + +static void +_katze_array_add_item (KatzeList* list, + gpointer item) +{ + if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) + g_object_ref (item); + KATZE_LIST_CLASS (katze_array_parent_class)->add_item (list, item); +} + +static void +_katze_array_remove_item (KatzeList* list, + gpointer item) +{ + KATZE_LIST_CLASS (katze_array_parent_class)->remove_item (list, item); + if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) + g_object_unref (item); +} + +static void +katze_array_class_init (KatzeArrayClass* class) +{ + GObjectClass* gobject_class; + KatzeListClass* katzelist_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_array_finalize; + + katzelist_class = KATZE_LIST_CLASS (class); + katzelist_class->add_item = _katze_array_add_item; + katzelist_class->remove_item = _katze_array_remove_item; +} + +static void +katze_array_init (KatzeArray* array) +{ + array->type = G_TYPE_NONE; +} + +static void +katze_array_finalize (GObject* object) +{ + KatzeArray* array; + guint n, i; + + array = KATZE_ARRAY (object); + if (katze_array_is_a (array, G_TYPE_OBJECT)) + { + n = katze_list_get_length ((KatzeList*)array); + for (i = 0; i < n; i++) + g_object_unref (katze_list_get_nth_item ((KatzeList*)array, i)); + } + + G_OBJECT_CLASS (katze_array_parent_class)->finalize (object); +} + +/** + * katze_array_new: + * @type: the expected item type + * + * Creates a new #KatzeArray for @type items. + * + * You may only add items of the given type or inherited + * from it to this array. + * + * The array will keep a reference on each object until + * it is removed from the array. + * + * Note: While you *can* (currently) use #KatzeList accessors + * to circumvent type safety, you are *encouraged* to use + * only #KatzeArray accessors, or behaviour is undefined. + * + * Return value: a new #KatzeArray + **/ +KatzeArray* +katze_array_new (GType type) +{ + KatzeArray* array = g_object_new (KATZE_TYPE_ARRAY, NULL); + array->type = type; + + return array; +} + +/** + * + * katze_array_is_a: + * @array: a #KatzeArray + * @is_a_type: type to compare with + * + * Checks whether the array is compatible + * with items of the specified type. + * + * Retur value: %TRUE if @array is compatible with @is_a_type + **/ +gboolean +katze_array_is_a (KatzeArray* array, + GType is_a_type) +{ + g_return_val_if_fail (KATZE_IS_ARRAY (array), FALSE); + + return g_type_is_a (array->type, is_a_type); +} + +/** + * katze_array_add_item: + * @array: a #KatzeArray + * @item: a #GObject + * + * Adds an item to the array. + **/ +void +katze_array_add_item (KatzeArray* array, + gpointer item) +{ + g_return_if_fail (KATZE_IS_ARRAY (array)); + if (katze_array_is_a (array, G_TYPE_OBJECT)) + g_return_if_fail (katze_array_is_a (array, G_OBJECT_TYPE (item))); + + g_signal_emit_by_name (array, "add-item", item); +} + +/** + * katze_array_add_item: + * @array: a #KatzeArray + * @item: a #GObject + * + * Removes an item from the array. + **/ +void +katze_array_remove_item (KatzeArray* array, + gpointer item) +{ + g_return_if_fail (KATZE_IS_ARRAY (array)); + if (katze_array_is_a (array, G_TYPE_OBJECT)) + g_return_if_fail (katze_array_is_a (array, G_OBJECT_TYPE (item))); + + g_signal_emit_by_name (array, "remove-item", item); +} + +/** + * katze_array_get_nth_item: + * @array: a #KatzeArray + * @n: an index in the array + * + * Retrieves the item in @array at the position @n. + * + * Return value: an item, or %NULL + **/ +gpointer +katze_array_get_nth_item (KatzeArray* array, + guint n) +{ + g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); + + return katze_list_get_nth_item (KATZE_LIST (array), n); +} + +/** + * katze_array_is_empty: + * @array: a #KatzeArray + * + * Determines if @array is empty. + * + * Return value: an item, or %NULL + **/ +gboolean +katze_array_is_empty (KatzeArray* array) +{ + g_return_val_if_fail (KATZE_IS_ARRAY (array), TRUE); + + return katze_list_is_empty (KATZE_LIST (array)); +} + +/** + * katze_array_get_item_position: + * @array: a #KatzeArray + * @item: an item in the array + * + * Retrieves the index of the item in @array. + * + * Return value: an item, or -1 + **/ +gint +katze_array_get_item_index (KatzeArray* array, + gpointer item) +{ + g_return_val_if_fail (KATZE_IS_ARRAY (array), -1); + if (katze_array_is_a (array, G_TYPE_OBJECT)) + g_return_val_if_fail (katze_array_is_a (array, G_OBJECT_TYPE (item)), -1); + + return katze_list_get_item_index (KATZE_LIST (array), item); +} + +/** + * katze_array_find_token: + * @array: a #KatzeArray + * @token: a token string + * + * Looks up an item in the array which has the specified token. + * + * This function will silently fail if the type of the list + * is not based on #GObject and only #KatzeItem children + * are checked for their token, any other objects are skipped. + * + * Note that @token is by definition unique to one item. + * + * Return value: an item, or %NULL + **/ +gpointer +katze_array_find_token (KatzeArray* array, + const gchar* token) +{ + guint n, i; + gpointer item; + const gchar* found_token; + + g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); + + if (!katze_array_is_a (array, G_TYPE_OBJECT)) + return NULL; + + n = katze_list_get_length ((KatzeList*)array); + for (i = 0; i < n; i++) + { + item = katze_list_get_nth_item ((KatzeList*)array, i); + if (!g_type_is_a (G_OBJECT_TYPE (item), KATZE_TYPE_ITEM)) + continue; + found_token = katze_item_get_token ((KatzeItem*)item); + if (found_token && !strcmp (found_token, token)) + return item; + } + return NULL; +} + +/** + * katze_array_get_length: + * @array: a #KatzeArray + * + * Retrieves the number of items in @array. + * + * Return value: the length of the list + **/ +guint +katze_array_get_length (KatzeArray* array) +{ + g_return_val_if_fail (KATZE_IS_ARRAY (array), 0); + + return katze_list_get_length (KATZE_LIST (array)); +} + +/** + * katze_array_clear: + * @array: a #KatzeArray + * + * Deletes all items currently contained in @array. + **/ +void +katze_array_clear (KatzeArray* array) +{ + g_return_if_fail (KATZE_IS_ARRAY (array)); + + katze_list_clear (KATZE_LIST (array)); +} diff --git a/katze/katze-array.h b/katze/katze-array.h new file mode 100644 index 00000000..1caf43e6 --- /dev/null +++ b/katze/katze-array.h @@ -0,0 +1,76 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_ARRAY_H__ +#define __KATZE_ARRAY_H__ + +#include "katze-list.h" + +G_BEGIN_DECLS + +#define KATZE_TYPE_ARRAY \ + (katze_array_get_type ()) +#define KATZE_ARRAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_ARRAY, KatzeArray)) +#define KATZE_ARRAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_ARRAY, KatzeArrayClass)) +#define KATZE_IS_ARRAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_ARRAY)) +#define KATZE_IS_ARRAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_ARRAY)) +#define KATZE_ARRAY_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_ARRAY, KatzeArrayClass)) + +typedef struct _KatzeArray KatzeArray; +typedef struct _KatzeArrayClass KatzeArrayClass; + +GType +katze_array_get_type (void); + +KatzeArray* +katze_array_new (GType type); + +gboolean +katze_array_is_a (KatzeArray* array, + GType is_a_type); + +void +katze_array_add_item (KatzeArray* array, + gpointer item); + +void +katze_array_remove_item (KatzeArray* array, + gpointer item); + +gpointer +katze_array_get_nth_item (KatzeArray* array, + guint n); + +gboolean +katze_array_is_empty (KatzeArray* array); + +gint +katze_array_get_item_index (KatzeArray* array, + gpointer item); + +gpointer +katze_array_find_token (KatzeArray* array, + const gchar* token); + +guint +katze_array_get_length (KatzeArray* array); + +void +katze_array_clear (KatzeArray* array); + +G_END_DECLS + +#endif /* __KATZE_ARRAY_H__ */ diff --git a/katze/katze-item.c b/katze/katze-item.c index c4b36f8b..1e9262b6 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -18,7 +18,7 @@ /** * SECTION:katze-item * @short_description: A useful item - * @see_also: #MidoriWebList + * @see_also: #KatzeArray * * #KatzeItem is a particularly useful item that provides * several commonly needed properties. diff --git a/katze/katze-item.h b/katze/katze-item.h index fa61cbca..8f138592 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -9,8 +9,8 @@ See the file COPYING for the full license text. */ -#ifndef __MIDORI_WEB_ITEM_H__ -#define __MIDORI_WEB_ITEM_H__ +#ifndef __KATZE_ITEM_H__ +#define __KATZE_ITEM_H__ #include diff --git a/katze/katze-list.c b/katze/katze-list.c new file mode 100644 index 00000000..15bb0e1e --- /dev/null +++ b/katze/katze-list.c @@ -0,0 +1,244 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-list.h" + +#include "katze-utils.h" + +#include +#include + +/** + * SECTION:katze-list + * @short_description: A verbose and versatile item container + * @see_also: #KatzeItem + * + * #KatzeList is a verbose and versatile container for items. + */ + +G_DEFINE_TYPE (KatzeList, katze_list, KATZE_TYPE_ITEM) + +enum { + ADD_ITEM, + REMOVE_ITEM, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +katze_list_finalize (GObject* object); + +static void +_katze_list_add_item (KatzeList* list, + gpointer item) +{ + list->items = g_list_append (list->items, item); +} + +static void +_katze_list_remove_item (KatzeList* list, + gpointer item) +{ + list->items = g_list_remove (list->items, item); +} + +static void +katze_list_class_init (KatzeListClass* class) +{ + GObjectClass* gobject_class; + + signals[ADD_ITEM] = g_signal_new ( + "add-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeListClass, add_item), + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + + signals[REMOVE_ITEM] = g_signal_new ( + "remove-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeListClass, remove_item), + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_list_finalize; + + class->add_item = _katze_list_add_item; + class->remove_item = _katze_list_remove_item; +} + +static void +katze_list_init (KatzeList* list) +{ + list->items = NULL; +} + +static void +katze_list_finalize (GObject* object) +{ + KatzeList* list; + + list = KATZE_LIST (object); + g_list_free (list->items); + + G_OBJECT_CLASS (katze_list_parent_class)->finalize (object); +} + +/** + * katze_list_new: + * + * Creates a new #KatzeList. + * + * Return value: a new #KatzeList + **/ +KatzeList* +katze_list_new (void) +{ + KatzeList* list = g_object_new (KATZE_TYPE_LIST, NULL); + + return list; +} + +/** + * katze_list_add_item: + * @list: a #KatzeList + * @item: a #GObject + * + * Adds an item to the list. + **/ +void +katze_list_add_item (KatzeList* list, + gpointer item) +{ + g_return_if_fail (KATZE_IS_LIST (list)); + + g_signal_emit (list, signals[ADD_ITEM], 0, item); +} + +/** + * katze_list_add_item: + * @list: a #KatzeList + * @item: a #GObject + * + * Removes an item from the list. + **/ +void +katze_list_remove_item (KatzeList* list, + gpointer item) +{ + g_return_if_fail (KATZE_IS_LIST (list)); + + g_signal_emit (list, signals[REMOVE_ITEM], 0, item); +} + +/** + * katze_list_get_nth_item: + * @list: a #KatzeList + * @n: an index in the list + * + * Retrieves the item in @list at the position @n. + * + * Return value: an item, or %NULL + **/ +gpointer +katze_list_get_nth_item (KatzeList* list, + guint n) +{ + g_return_val_if_fail (KATZE_IS_LIST (list), NULL); + + return g_list_nth_data (list->items, n); +} + +/** + * katze_list_is_empty: + * @list: a #KatzeList + * + * Determines if @list is empty. + * + * Return value: an item, or %NULL + **/ +gboolean +katze_list_is_empty (KatzeList* list) +{ + g_return_val_if_fail (KATZE_IS_LIST (list), TRUE); + + return !g_list_nth_data (list->items, 0); +} + +/** + * katze_list_get_item_position: + * @list: a #KatzeList + * @item: an item in the list + * + * Retrieves the index of the item in @list. + * + * Return value: an item, or -1 + **/ +gint +katze_list_get_item_index (KatzeList* list, + gpointer item) +{ + g_return_val_if_fail (KATZE_IS_LIST (list), -1); + + return g_list_index (list->items, item); +} + +/** + * katze_list_get_length: + * @list: a #KatzeList + * + * Retrieves the number of items in @list. + * + * Return value: the length of the list + **/ +guint +katze_list_get_length (KatzeList* list) +{ + g_return_val_if_fail (KATZE_IS_LIST (list), 0); + + return g_list_length (list->items); +} + +/** + * katze_list_clear: + * @list: a #KatzeList + * + * Deletes all items currently contained in @list. + **/ +void +katze_list_clear (KatzeList* list) +{ + guint n; + guint i; + GObject* item; + + g_return_if_fail (KATZE_IS_LIST (list)); + + n = g_list_length (list->items); + for (i = 0; i < n; i++) + { + if ((item = g_list_nth_data (list->items, i))) + katze_list_remove_item (list, item); + } + g_list_free (list->items); + list->items = NULL; +} diff --git a/katze/katze-list.h b/katze/katze-list.h new file mode 100644 index 00000000..0e2570db --- /dev/null +++ b/katze/katze-list.h @@ -0,0 +1,88 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_LIST_H__ +#define __KATZE_LIST_H__ + +#include "katze-item.h" + +G_BEGIN_DECLS + +#define KATZE_TYPE_LIST \ + (katze_list_get_type ()) +#define KATZE_LIST(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_LIST, KatzeList)) +#define KATZE_LIST_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_LIST, KatzeListClass)) +#define KATZE_IS_LIST(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_LIST)) +#define KATZE_IS_LIST_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_LIST)) +#define KATZE_LIST_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_LIST, KatzeListClass)) + +typedef struct _KatzeList KatzeList; +typedef struct _KatzeListClass KatzeListClass; + +struct _KatzeList +{ + KatzeItem parent_instance; + + GList* items; +}; + +struct _KatzeListClass +{ + KatzeItemClass parent_class; + + /* Signals */ + void + (*add_item) (KatzeList* list, + gpointer item); + void + (*remove_item) (KatzeList* list, + gpointer item); +}; + +GType +katze_list_get_type (void); + +KatzeList* +katze_list_new (void); + +void +katze_list_add_item (KatzeList* list, + gpointer item); + +void +katze_list_remove_item (KatzeList* list, + gpointer item); + +gpointer +katze_list_get_nth_item (KatzeList* list, + guint n); + +gboolean +katze_list_is_empty (KatzeList* list); + +gint +katze_list_get_item_index (KatzeList* list, + gpointer item); + +guint +katze_list_get_length (KatzeList* list); + +void +katze_list_clear (KatzeList* list); + +G_END_DECLS + +#endif /* __KATZE_LIST_H__ */ diff --git a/katze/katze-weblist.c b/katze/katze-weblist.c deleted file mode 100644 index 0d780bcc..00000000 --- a/katze/katze-weblist.c +++ /dev/null @@ -1,308 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "katze-weblist.h" - -#include "katze-utils.h" - -#include -#include - -/** - * SECTION:midori-weblist - * @short_description: A versatile object container - * @see_also: #KatzeItem - * - * #MidoriWebList is a versatile container for objects. - */ - -struct _MidoriWebList -{ - KatzeItem parent_instance; - - GList* items; -}; - -struct _MidoriWebListClass -{ - KatzeItemClass parent_class; - - /* Signals */ - void - (*add_item) (MidoriWebList* web_list, - GObject* item); - void - (*remove_item) (MidoriWebList* web_list, - GObject* item); -}; - -G_DEFINE_TYPE (MidoriWebList, midori_web_list, KATZE_TYPE_ITEM) - -enum { - ADD_ITEM, - REMOVE_ITEM, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -static void -midori_web_list_finalize (GObject* object); - -static void -_midori_web_list_add_item (MidoriWebList* web_list, - GObject* item) -{ - g_object_ref (item); - web_list->items = g_list_append (web_list->items, item); -} - -static void -_midori_web_list_remove_item (MidoriWebList* web_list, - GObject* item) -{ - web_list->items = g_list_remove (web_list->items, item); - g_object_unref (item); -} - -static void -midori_web_list_class_init (MidoriWebListClass* class) -{ - signals[ADD_ITEM] = g_signal_new ( - "add-item", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriWebListClass, add_item), - 0, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); - - signals[REMOVE_ITEM] = g_signal_new ( - "remove-item", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriWebListClass, remove_item), - 0, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); - - class->add_item = _midori_web_list_add_item; - class->remove_item = _midori_web_list_remove_item; - - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_web_list_finalize; -} - -static void -midori_web_list_init (MidoriWebList* web_list) -{ - web_list->items = NULL; -} - -static void -midori_web_list_finalize (GObject* object) -{ - MidoriWebList* web_list = MIDORI_WEB_LIST (object); - guint n, i; - - /* Scruffily remove all items, no need for signals */ - n = g_list_length (web_list->items); - for (i = 0; i < n; i++) - g_object_unref (g_list_nth_data (web_list->items, i)); - g_list_free (web_list->items); - - G_OBJECT_CLASS (midori_web_list_parent_class)->finalize (object); -} - -/** - * midori_web_list_new: - * - * Creates a new #MidoriWebList. - * - * Return value: a new #MidoriWebList - **/ -MidoriWebList* -midori_web_list_new (void) -{ - MidoriWebList* web_list = g_object_new (MIDORI_TYPE_WEB_LIST, - NULL); - - return web_list; -} - -/** - * midori_web_list_add_item: - * @web_list: a #MidoriWebList - * @item: a #GObject - * - * Adds an item to the list. - **/ -void -midori_web_list_add_item (MidoriWebList* web_list, - gpointer item) -{ - g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); - g_return_if_fail (G_IS_OBJECT (item)); - - g_signal_emit (web_list, signals[ADD_ITEM], 0, item); -} - -/** - * midori_web_list_add_item: - * @web_list: a #MidoriWebList - * @item: a #GObject - * - * Removes an item from the list. - **/ -void -midori_web_list_remove_item (MidoriWebList* web_list, - gpointer item) -{ - g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); - g_return_if_fail (G_IS_OBJECT (item)); - - g_signal_emit (web_list, signals[REMOVE_ITEM], 0, item); -} - -/** - * midori_web_list_get_nth_item: - * @web_list: a #MidoriWebList - * @n: an index in the list - * - * Retrieves the item in @web_list at the position @n. - * - * Return value: an item, or %NULL - **/ -gpointer -midori_web_list_get_nth_item (MidoriWebList* web_list, - guint n) -{ - g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), NULL); - - return g_list_nth_data (web_list->items, n); -} - -/** - * midori_web_list_is_empty: - * @web_list: a #MidoriWebList - * - * Determines if @web_list is empty. - * - * Return value: an item, or %NULL - **/ -gboolean -midori_web_list_is_empty (MidoriWebList* web_list) -{ - g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), TRUE); - - return !g_list_nth_data (web_list->items, 0); -} - -/** - * midori_web_list_get_item_position: - * @web_list: a #MidoriWebList - * @item: an item in the list - * - * Retrieves the index of the item in @web_list. - * - * Return value: an item, or -1 - **/ -gint -midori_web_list_get_item_index (MidoriWebList* web_list, - gpointer item) -{ - g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), -1); - g_return_val_if_fail (G_IS_OBJECT (item), -1); - - return g_list_index (web_list->items, item); -} - -/** - * midori_web_list_find_token: - * @web_list: a #MidoriWebList - * @token: a token string - * - * Looks up an item in the list which has the specified token. - * - * Currently only #KatzeItem is supported. - * - * Note that @token is by definition unique to one item. - * - * Return value: an item, or %NULL - **/ -gpointer -midori_web_list_find_token (MidoriWebList* web_list, - const gchar* token) -{ - guint n, i; - gpointer item; - const gchar* found_token; - - g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), NULL); - - n = g_list_length (web_list->items); - for (i = 0; i < n; i++) - { - item = g_list_nth_data (web_list->items, i); - if (!KATZE_IS_ITEM (item)) - continue; - found_token = katze_item_get_token ((KatzeItem*)item); - if (found_token && !strcmp (found_token, token)) - return item; - } - return NULL; -} - -/** - * midori_web_list_get_length: - * @web_list: a #MidoriWebList - * - * Retrieves the number of items in @web_list. - * - * Return value: the length of the list - **/ -guint -midori_web_list_get_length (MidoriWebList* web_list) -{ - g_return_val_if_fail (MIDORI_IS_WEB_LIST (web_list), 0); - - return g_list_length (web_list->items); -} - -/** - * midori_web_list_clear: - * @web_list: a #MidoriWebList - * - * Deletes all items currently contained in @web_list. - **/ -void -midori_web_list_clear (MidoriWebList* web_list) -{ - guint n; - guint i; - GObject* item; - - g_return_if_fail (MIDORI_IS_WEB_LIST (web_list)); - - n = g_list_length (web_list->items); - for (i = 0; i < n; i++) - { - if ((item = g_list_nth_data (web_list->items, i))) - midori_web_list_remove_item (web_list, item); - } - g_list_free (web_list->items); - web_list->items = NULL; -} diff --git a/katze/katze-weblist.h b/katze/katze-weblist.h deleted file mode 100644 index 0117f7dd..00000000 --- a/katze/katze-weblist.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_WEB_LIST_H__ -#define __MIDORI_WEB_LIST_H__ - -#include "katze-item.h" - -G_BEGIN_DECLS - -#define MIDORI_TYPE_WEB_LIST \ - (midori_web_list_get_type ()) -#define MIDORI_WEB_LIST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_LIST, MidoriWebList)) -#define MIDORI_WEB_LIST_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_LIST, MidoriWebListClass)) -#define MIDORI_IS_WEB_LIST(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_LIST)) -#define MIDORI_IS_WEB_LIST_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_LIST)) -#define MIDORI_WEB_LIST_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_LIST, MidoriWebListClass)) - -typedef struct _MidoriWebList MidoriWebList; -typedef struct _MidoriWebListClass MidoriWebListClass; - -GType -midori_web_list_get_type (void); - -MidoriWebList* -midori_web_list_new (void); - -void -midori_web_list_add_item (MidoriWebList* web_list, - gpointer item); - -void -midori_web_list_remove_item (MidoriWebList* web_list, - gpointer item); - -gpointer -midori_web_list_get_nth_item (MidoriWebList* web_list, - guint n); - -gboolean -midori_web_list_is_empty (MidoriWebList* web_list); - -gint -midori_web_list_get_item_index (MidoriWebList* web_list, - gpointer item); - -gpointer -midori_web_list_find_token (MidoriWebList* web_list, - const gchar* token); - -guint -midori_web_list_get_length (MidoriWebList* web_list); - -void -midori_web_list_clear (MidoriWebList* web_list); - -G_END_DECLS - -#endif /* __MIDORI_WEB_LIST_H__ */ diff --git a/katze/katze.h b/katze/katze.h index 159adf1b..fbe418b3 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -9,13 +9,14 @@ See the file COPYING for the full license text. */ -#ifndef __KATZE__ -#define __KATZE__ +#ifndef __KATZE_H__ +#define __KATZE_H__ #include "katze-throbber.h" #include "katze-utils.h" #include "katze-item.h" -#include "katze-weblist.h" +#include "katze-list.h" +#include "katze-array.h" #include "katze-xbel.h" #endif /* __KATZE_H__ */ diff --git a/midori/main.c b/midori/main.c index e3a666ba..efd1956d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -257,11 +257,11 @@ settings_save_to_file (MidoriWebSettings* settings, return saved; } -static MidoriWebList* +static KatzeArray* search_engines_new_from_file (const gchar* filename, GError** error) { - MidoriWebList* search_engines; + KatzeArray* search_engines; GKeyFile* key_file; gchar** engines; guint i, j, n_properties; @@ -270,7 +270,7 @@ search_engines_new_from_file (const gchar* filename, const gchar* property; gchar* value; - search_engines = midori_web_list_new (); + search_engines = katze_array_new (KATZE_TYPE_ITEM); key_file = g_key_file_new (); g_key_file_load_from_file (key_file, filename, G_KEY_FILE_KEEP_COMMENTS, error); @@ -290,7 +290,7 @@ search_engines_new_from_file (const gchar* filename, g_object_set (item, property, value, NULL); g_free (value); } - midori_web_list_add_item (search_engines, item); + katze_array_add_item (search_engines, item); } g_strfreev (engines); g_key_file_free (key_file); @@ -298,9 +298,9 @@ search_engines_new_from_file (const gchar* filename, } static gboolean -search_engines_save_to_file (MidoriWebList* search_engines, - const gchar* filename, - GError** error) +search_engines_save_to_file (KatzeArray* search_engines, + const gchar* filename, + GError** error) { GKeyFile* key_file; guint n, i, j, n_properties; @@ -312,12 +312,12 @@ search_engines_save_to_file (MidoriWebList* search_engines, gboolean saved; key_file = g_key_file_new (); - n = midori_web_list_get_length (search_engines); + n = katze_array_get_length (search_engines); pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), &n_properties); for (i = 0; i < n; i++) { - item = midori_web_list_get_nth_item (search_engines, i); + item = katze_array_get_nth_item (search_engines, i); name = katze_item_get_name (item); for (j = 0; j < n_properties; j++) { @@ -335,13 +335,16 @@ search_engines_save_to_file (MidoriWebList* search_engines, } static void -midori_web_list_add_item_cb (MidoriWebList* trash, - GObject* item) +midori_web_list_add_item_cb (KatzeArray* trash, + GObject* item) { - guint n = midori_web_list_get_length (trash); + guint n; + GObject* obsolete_item; + + n = katze_array_get_length (trash); if (n > 10) { - GObject* obsolete_item = midori_web_list_get_nth_item (trash, 0); + obsolete_item = katze_array_get_nth_item (trash, 0); g_object_unref (obsolete_item); } } @@ -380,7 +383,7 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, int -main (int argc, +main (int argc, char** argv) { gboolean version; @@ -395,7 +398,7 @@ main (int argc, }; MidoriStartup load_on_startup; gchar* homepage; - MidoriWebList* search_engines; + KatzeArray* search_engines; #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); @@ -598,13 +601,13 @@ main (int argc, stock_items_init (); - MidoriWebList* trash = midori_web_list_new (); + KatzeArray* trash = katze_array_new (KATZE_TYPE_XBEL_ITEM); guint n = katze_xbel_folder_get_n_items (xbel_trash); guint i; for (i = 0; i < n; i++) { KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); - midori_web_list_add_item (trash, item); + katze_array_add_item (trash, item); } g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_web_list_add_item_cb), NULL); diff --git a/midori/midori-app.c b/midori/midori-app.c index 7314957c..309d3622 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -32,8 +32,8 @@ struct _MidoriApp GtkAccelGroup* accel_group; MidoriWebSettings* settings; - MidoriWebList* trash; - MidoriWebList* search_engines; + KatzeArray* trash; + KatzeArray* search_engines; gpointer instance; }; @@ -131,7 +131,7 @@ midori_app_class_init (MidoriAppClass* class) "trash", _("Trash"), _("The trash, collecting recently closed tabs and windows"), - MIDORI_TYPE_WEB_LIST, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -158,7 +158,7 @@ midori_app_class_init (MidoriAppClass* class) "search-engines", _("Search Engines"), _("The list of search engines"), - MIDORI_TYPE_WEB_LIST, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); } @@ -188,24 +188,20 @@ midori_browser_message_received_cb (UniqueApp* instance, switch (command) { case UNIQUE_ACTIVATE: - g_print("activate\n"); gtk_window_set_screen (GTK_WINDOW (app->browser), unique_message_data_get_screen (message)); gtk_window_present (GTK_WINDOW (app->browser)); response = UNIQUE_RESPONSE_OK; break; case UNIQUE_OPEN: - g_print("open\n"); uris = unique_message_data_get_uris (message); if (!uris) response = UNIQUE_RESPONSE_FAIL; else { - g_print("open uris\n"); while (*uris) { midori_browser_add_uri (app->browser, *uris); - g_print ("uri: %s\n", *uris); uris++; } /* g_strfreev (uris); */ @@ -213,7 +209,6 @@ midori_browser_message_received_cb (UniqueApp* instance, } break; default: - g_print("fail\n"); response = UNIQUE_RESPONSE_FAIL; break; } @@ -238,8 +233,8 @@ midori_app_init (MidoriApp* app) app->accel_group = gtk_accel_group_new (); app->settings = midori_web_settings_new (); - app->trash = midori_web_list_new (); - app->search_engines = midori_web_list_new (); + app->trash = katze_array_new (KATZE_TYPE_XBEL_ITEM); + app->search_engines = katze_array_new (KATZE_TYPE_ITEM); #if HAVE_UNIQUE display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); @@ -572,7 +567,7 @@ midori_app_set_settings (MidoriApp* app, * * Return value: the assigned #MidoriTrash **/ -MidoriWebList* +KatzeArray* midori_app_get_trash (MidoriApp* app) { g_return_val_if_fail (MIDORI_IS_APP (app), NULL); diff --git a/midori/midori-app.h b/midori/midori-app.h index 637cb6ef..641aa2f7 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -44,7 +44,7 @@ struct _MidoriAppClass (*add_browser) (MidoriApp* app, MidoriBrowser* browser); void - (*quit) (MidoriApp* app); + (*quit) (MidoriApp* app); }; GType @@ -74,7 +74,7 @@ void midori_app_set_settings (MidoriApp* app, MidoriWebSettings* settings); -MidoriWebList* +KatzeArray* midori_app_get_trash (MidoriApp* app); void diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6ac96059..cba3ddfb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -78,8 +78,8 @@ struct _MidoriBrowser GList* close_buttons; KatzeXbelItem* proxy_xbel_folder; - MidoriWebList* trash; - MidoriWebList* search_engines; + KatzeArray* trash; + KatzeArray* search_engines; }; G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) @@ -216,6 +216,7 @@ static void _midori_browser_update_actions (MidoriBrowser* browser) { guint n; + gboolean trash_empty; n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); @@ -225,7 +226,7 @@ _midori_browser_update_actions (MidoriBrowser* browser) if (browser->trash) { - gboolean trash_empty = midori_web_list_is_empty (browser->trash); + trash_empty = katze_array_is_empty (browser->trash); _action_set_sensitive (browser, "UndoTabClose", !trash_empty); _action_set_sensitive (browser, "Trash", !trash_empty); } @@ -790,7 +791,7 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, MIDORI_WEB_VIEW (widget)); uri = katze_xbel_bookmark_get_href (xbel_item); if (browser->trash && uri && *uri) - midori_web_list_add_item (browser->trash, xbel_item); + katze_array_add_item (browser->trash, xbel_item); katze_xbel_folder_remove_item (browser->proxy_xbel_folder, xbel_item); katze_xbel_item_unref (xbel_item); } @@ -1318,7 +1319,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "trash", _("Trash"), _("The trash, collecting recently closed tabs and windows"), - MIDORI_TYPE_WEB_LIST, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); /** @@ -1332,7 +1333,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "search-engines", _("Search Engines"), _("The list of search engines to be used for web search"), - MIDORI_TYPE_WEB_LIST, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); } @@ -1685,7 +1686,7 @@ midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, "KatzeXbelItem"); gint n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); - midori_web_list_remove_item (browser->trash, item); + katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); } @@ -1694,12 +1695,12 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { GtkWidget* menu = gtk_menu_new (); - guint n = midori_web_list_get_length (browser->trash); + guint n = katze_array_get_length (browser->trash); GtkWidget* menuitem; guint i; for (i = 0; i < n; i++) { - KatzeXbelItem* item = midori_web_list_get_nth_item (browser->trash, i); + KatzeXbelItem* item = katze_array_get_nth_item (browser->trash, i); const gchar* title = katze_xbel_item_get_title (item); const gchar* uri = katze_xbel_bookmark_get_href (item); menuitem = gtk_image_menu_item_new_with_label (title ? title : uri); @@ -2048,7 +2049,7 @@ _action_location_secondary_icon_released (GtkAction* action, MidoriBrowser* browser) { MidoriWebView* web_view; - MidoriWebList* news_feeds; + KatzeArray* news_feeds; GtkWidget* menu; guint n, i; GjsValue* feed; @@ -2060,13 +2061,13 @@ _action_location_secondary_icon_released (GtkAction* action, if (web_view) { news_feeds = midori_web_view_get_news_feeds (web_view); - n = news_feeds ? midori_web_list_get_length (news_feeds) : 0; + n = news_feeds ? katze_array_get_length (news_feeds) : 0; if (n) { menu = gtk_menu_new (); for (i = 0; i < n; i++) { - if (!(feed = midori_web_list_get_nth_item (news_feeds, i))) + if (!(feed = katze_array_get_nth_item (news_feeds, i))) continue; uri = gjs_value_get_attribute_string (feed, "href"); @@ -2655,11 +2656,11 @@ _action_undo_tab_close_activate (GtkAction* action, guint n; /* Reopen the most recent trash item */ - last = midori_web_list_get_length (browser->trash) - 1; - item = midori_web_list_get_nth_item (browser->trash, last); + last = katze_array_get_length (browser->trash) - 1; + item = katze_array_get_nth_item (browser->trash, last); n = midori_browser_add_xbel_item (browser, item); midori_browser_set_current_page (browser, n); - midori_web_list_remove_item (browser->trash, item); + katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); } @@ -2667,7 +2668,7 @@ static void _action_trash_empty_activate (GtkAction* action, MidoriBrowser* browser) { - midori_web_list_clear (browser->trash); + katze_array_clear (browser->trash); _midori_browser_update_actions (browser); } @@ -3099,7 +3100,7 @@ static void midori_browser_search_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { - MidoriWebList* search_engines; + KatzeArray* search_engines; const gchar* keywords; guint last_web_search; KatzeItem* item; @@ -3110,7 +3111,7 @@ midori_browser_search_activate_cb (GtkWidget* widget, search_engines = browser->search_engines; keywords = gtk_entry_get_text (GTK_ENTRY (widget)); g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - item = midori_web_list_get_nth_item (search_engines, last_web_search); + item = katze_array_get_nth_item (search_engines, last_web_search); if (item) { location_entry_search = NULL; @@ -3154,7 +3155,7 @@ midori_browser_search_notify_current_item_cb (GObject* gobject, search_entry = MIDORI_SEARCH_ENTRY (browser->search); item = midori_search_entry_get_current_item (search_entry); if (item) - index = midori_web_list_get_item_index (browser->search_engines, item); + index = katze_array_get_item_index (browser->search_engines, item); else index = 0; @@ -3273,12 +3274,12 @@ midori_browser_init (MidoriBrowser* browser) g_object_ref (browser->popup_bookmark); browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); - menuitem = gtk_separator_menu_item_new(); + menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); browser->menu_window = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Window"))); - menuitem = gtk_separator_menu_item_new(); + menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); gtk_widget_show (browser->menubar); @@ -3734,8 +3735,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) if (browser->search_engines) { - item = midori_web_list_get_nth_item (browser->search_engines, - last_web_search); + item = katze_array_get_nth_item (browser->search_engines, + last_web_search); if (item) midori_search_entry_set_current_item ( MIDORI_SEARCH_ENTRY (browser->search), item); @@ -3872,8 +3873,8 @@ midori_browser_set_property (GObject* object, { g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - item = midori_web_list_get_nth_item (browser->search_engines, - last_web_search); + item = katze_array_get_nth_item (browser->search_engines, + last_web_search); if (item) g_object_set (browser->search, "current-item", item, NULL); } diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index 413081fd..790dbdb9 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -20,7 +20,7 @@ struct _MidoriSearchEntry { GtkIconEntry parent_instance; - MidoriWebList* search_engines; + KatzeArray* search_engines; KatzeItem* current_item; }; @@ -64,7 +64,7 @@ midori_search_entry_class_init (MidoriSearchEntryClass* class) "search-engines", _("Search Engines"), _("The list of search engines"), - MIDORI_TYPE_WEB_LIST, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -115,7 +115,7 @@ midori_search_entry_icon_released_cb (GtkWidget* widget, gint button) { MidoriSearchEntry* search_entry; - MidoriWebList* search_engines; + KatzeArray* search_engines; GtkWidget* menu; guint n, i; GtkWidget* menuitem; @@ -126,12 +126,12 @@ midori_search_entry_icon_released_cb (GtkWidget* widget, search_entry = MIDORI_SEARCH_ENTRY (widget); search_engines = search_entry->search_engines; menu = gtk_menu_new (); - n = midori_web_list_get_length (search_engines); + n = katze_array_get_length (search_engines); if (n) { for (i = 0; i < n; i++) { - item = midori_web_list_get_nth_item (search_engines, i); + item = katze_array_get_nth_item (search_engines, i); menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); pixbuf = sokoke_web_icon (katze_item_get_icon (item), @@ -175,9 +175,9 @@ _midori_search_entry_move_index (MidoriSearchEntry* search_entry, gint i; KatzeItem* item; - i = midori_web_list_get_item_index (search_entry->search_engines, - search_entry->current_item); - item = midori_web_list_get_nth_item (search_entry->search_engines, i + n); + i = katze_array_get_item_index (search_entry->search_engines, + search_entry->current_item); + item = katze_array_get_nth_item (search_entry->search_engines, i + n); if (item) midori_search_entry_set_current_item (search_entry, item); } @@ -216,8 +216,8 @@ midori_search_entry_scroll_event_cb (MidoriSearchEntry* search_entry, } static void -midori_search_entry_engines_add_item_cb (MidoriWebList* web_list, - KatzeItem* item, +midori_search_entry_engines_add_item_cb (KatzeArray* list, + KatzeItem* item, MidoriSearchEntry* search_entry) { if (!search_entry->current_item) @@ -225,7 +225,7 @@ midori_search_entry_engines_add_item_cb (MidoriWebList* web_list, } static void -midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, +midori_search_entry_engines_remove_item_cb (KatzeArray* list, KatzeItem* item, MidoriSearchEntry* search_entry) { @@ -233,7 +233,7 @@ midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, if (search_entry->current_item == item) { - found_item = midori_web_list_get_nth_item (web_list, 0); + found_item = katze_array_get_nth_item (list, 0); if (found_item) midori_search_entry_set_current_item (search_entry, found_item); else @@ -251,7 +251,7 @@ midori_search_entry_engines_remove_item_cb (MidoriWebList* web_list, static void midori_search_entry_init (MidoriSearchEntry* search_entry) { - search_entry->search_engines = midori_web_list_new (); + search_entry->search_engines = katze_array_new (KATZE_TYPE_ITEM); search_entry->current_item = NULL; gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (search_entry), @@ -357,7 +357,7 @@ midori_search_entry_new (void) * * Return value: the list of search engines **/ -MidoriWebList* +KatzeArray* midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry) { g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); @@ -374,9 +374,10 @@ midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry) **/ void midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, - MidoriWebList* search_engines) + KatzeArray* search_engines) { g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); + g_return_if_fail (katze_array_is_a (search_engines, KATZE_TYPE_ITEM)); g_object_ref (search_engines); katze_object_assign (search_entry->search_engines, search_engines); @@ -629,7 +630,7 @@ midori_search_entry_get_editor (GtkWidget* treeview, search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); if (new_engine) - midori_web_list_add_item (search_entry->search_engines, item); + katze_array_add_item (search_entry->search_engines, item); } gtk_widget_destroy (dialog); } @@ -666,7 +667,7 @@ midori_search_entry_dialog_remove_cb (GtkWidget* widget, GtkTreeModel* liststore; GtkTreeIter iter; KatzeItem* item; - MidoriWebList* search_engines; + KatzeArray* search_engines; search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); search_engines = search_entry->search_engines; @@ -674,7 +675,7 @@ midori_search_entry_dialog_remove_cb (GtkWidget* widget, if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) { gtk_tree_model_get (liststore, &iter, 0, &item, -1); - midori_web_list_remove_item (search_engines, item); + katze_array_remove_item (search_engines, item); g_object_unref (item); /* FIXME: we want to allow undo of some kind */ } @@ -698,9 +699,9 @@ midori_search_entry_treeview_selection_cb (GtkTreeSelection* selection, } static void -midori_search_entry_dialog_engines_add_item_cb (MidoriWebList* web_list, - KatzeItem* item, - GtkWidget* treeview) +midori_search_entry_dialog_engines_add_item_cb (KatzeArray* list, + KatzeItem* item, + GtkWidget* treeview) { GtkTreeModel* liststore; GtkTreeIter iter; @@ -711,9 +712,9 @@ midori_search_entry_dialog_engines_add_item_cb (MidoriWebList* web_list, } static void -midori_search_entry_dialog_engines_remove_item_cb (MidoriWebList* web_list, - KatzeItem* item, - GtkWidget* treeview) +midori_search_entry_dialog_engines_remove_item_cb (KatzeArray* list, + KatzeItem* item, + GtkWidget* treeview) { GtkTreeModel* liststore; GtkTreeIter iter; @@ -838,10 +839,10 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); - n = midori_web_list_get_length (search_entry->search_engines); + n = katze_array_get_length (search_entry->search_engines); for (i = 0; i < n; i++) { - item = midori_web_list_get_nth_item (search_entry->search_engines, i); + item = katze_array_get_nth_item (search_entry->search_engines, i); gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), NULL, i, 0, item, -1); } diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h index 30d33ae6..176f34d2 100644 --- a/midori/midori-searchentry.h +++ b/midori/midori-searchentry.h @@ -47,12 +47,12 @@ midori_search_entry_get_type (void); GtkWidget* midori_search_entry_new (void); -MidoriWebList* +KatzeArray* midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry); void midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, - MidoriWebList* name); + KatzeArray* name); KatzeItem* midori_search_entry_get_current_item (MidoriSearchEntry* search_entry); diff --git a/midori/midori-webview.c b/midori/midori-webview.c index e85f052c..d28a83f0 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -42,7 +42,7 @@ struct _MidoriWebView MidoriLoadStatus load_status; gchar* statusbar_text; gchar* link_uri; - MidoriWebList* news_feeds; + KatzeArray* news_feeds; MidoriWebSettings* settings; @@ -487,7 +487,7 @@ gjs_value_links_foreach_cb (GjsValue* link, || !strcmp (type, "application/x.atom+xml") || !strcmp (type, "application/atom+xml")) { - midori_web_list_add_item (web_view->news_feeds, link); + katze_array_add_item (web_view->news_feeds, link); g_signal_emit (web_view, signals[NEWS_FEED_READY], 0, gjs_value_get_attribute_string (link, "href"), type, gjs_value_has_attribute (link, "title") @@ -534,7 +534,7 @@ webkit_web_frame_load_done (WebKitWebFrame* web_frame, value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); document = gjs_value_get_by_name (value, "document"); links = gjs_value_get_elements_by_tag_name (document, "link"); - midori_web_list_clear (web_view->news_feeds); + katze_array_clear (web_view->news_feeds); gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, web_view); g_object_unref (links); g_object_unref (document); @@ -760,7 +760,7 @@ midori_web_view_init (MidoriWebView* web_view) GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); web_view->progress = 0.0; web_view->load_status = MIDORI_LOAD_FINISHED; - web_view->news_feeds = midori_web_list_new (); + web_view->news_feeds = katze_array_new (GJS_TYPE_VALUE); web_view->settings = midori_web_settings_new (); g_object_set (web_view, "WebKitWebView::settings", web_view->settings, NULL); @@ -1168,14 +1168,14 @@ midori_web_view_get_link_uri (MidoriWebView* web_view) * Retrieves a list of news feeds for the current page * or %NULL if there are no feeds at all. * - * Return value: a #MidoriWebList, or %NULL + * Return value: a #KatzeArray, or %NULL **/ -MidoriWebList* +KatzeArray* midori_web_view_get_news_feeds (MidoriWebView* web_view) { g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - if (!midori_web_list_is_empty (web_view->news_feeds)) + if (!katze_array_is_empty (web_view->news_feeds)) return web_view->news_feeds; return NULL; } diff --git a/midori/midori-webview.h b/midori/midori-webview.h index 76571c72..8773c1e4 100644 --- a/midori/midori-webview.h +++ b/midori/midori-webview.h @@ -114,7 +114,7 @@ midori_web_view_get_display_title (MidoriWebView* web_view); const gchar* midori_web_view_get_link_uri (MidoriWebView* web_view); -MidoriWebList* +KatzeArray* midori_web_view_get_news_feeds (MidoriWebView* web_view); gboolean diff --git a/midori/sokoke.c b/midori/sokoke.c index 60ee1476..58af4fd9 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -80,8 +80,8 @@ sokoke_spawn_program (const gchar* command, } gchar* -sokoke_magic_uri (const gchar* uri, - MidoriWebList* search_engines) +sokoke_magic_uri (const gchar* uri, + KatzeArray* search_engines) { gchar* current_dir; gchar* result; @@ -92,7 +92,7 @@ sokoke_magic_uri (const gchar* uri, g_return_val_if_fail (uri, NULL); if (search_engines) - g_return_val_if_fail (MIDORI_IS_WEB_LIST (search_engines), NULL); + g_return_val_if_fail (katze_array_is_a (search_engines, KATZE_TYPE_ITEM), NULL); /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) @@ -122,7 +122,7 @@ sokoke_magic_uri (const gchar* uri, parts = g_strsplit (uri, " ", 2); if (parts[0] && parts[1]) { - item = midori_web_list_find_token (search_engines, parts[0]); + item = katze_array_find_token (search_engines, parts[0]); if (item) search_uri = katze_item_get_uri (item); } diff --git a/midori/sokoke.h b/midori/sokoke.h index 873e3704..a74c80ce 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -25,7 +25,7 @@ sokoke_spawn_program (const gchar* command, gchar* sokoke_magic_uri (const gchar* uri, - MidoriWebList* search_engines); + KatzeArray* search_engines); void sokoke_entry_setup_completion (GtkEntry* entry); diff --git a/po/POTFILES.in b/po/POTFILES.in index 4f59301e..e8ee9570 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -16,5 +16,6 @@ midori/gjs.c katze/katze-throbber.c katze/katze-utils.c katze/katze-item.c -katze/katze-weblist.c +katze/katze-list.c +katze/katze-array.c katze/katze-xbel.c From db599a99d54c5f437dea6c3a39fe24958284ee57 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Tue, 26 Aug 2008 01:59:02 +0200 Subject: [PATCH 0287/2970] Always show the icon in the Web Search entry --- midori/midori-browser.c | 7 +++---- midori/midori-searchentry.c | 35 ++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cba3ddfb..29f7e649 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3534,7 +3534,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_label_new_with_mnemonic (_("_Inline find:"))); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_text = gtk_icon_entry_new (); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY(browser->find_text), + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), @@ -3549,7 +3549,7 @@ midori_browser_init (MidoriBrowser* browser) toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR(browser->find), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); toolitem = (GtkToolItem*)gtk_action_create_tool_item (_action_by_name (browser, "FindPrevious")); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); @@ -3875,8 +3875,7 @@ midori_browser_set_property (GObject* object, &last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, last_web_search); - if (item) - g_object_set (browser->search, "current-item", item, NULL); + g_object_set (browser->search, "current-item", item, NULL); } break; default: diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index 790dbdb9..a480d58c 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -234,17 +234,7 @@ midori_search_entry_engines_remove_item_cb (KatzeArray* list, if (search_entry->current_item == item) { found_item = katze_array_get_nth_item (list, 0); - if (found_item) - midori_search_entry_set_current_item (search_entry, found_item); - else - { - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), - GTK_ICON_ENTRY_PRIMARY, NULL); - sokoke_entry_set_default_text (GTK_ENTRY (search_entry), ""); - - katze_object_assign (search_entry->current_item, NULL); - g_object_notify (G_OBJECT (search_entry), "current-item"); - } + midori_search_entry_set_current_item (search_entry, found_item); } } @@ -394,11 +384,13 @@ midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, /** * midori_search_entry_set_current_item: * @search_entry: a #MidoriSearchEntry - * @item: a #KatzeItem + * @item: a #KatzeItem, or %NULL * * Looks up the specified item in the list of search engines and makes * it the currently selected item. * + * Pass %NULL for @item in order to unset the item. + * * This function fails if @item is not in the current list. **/ void @@ -408,18 +400,27 @@ midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, GdkPixbuf* pixbuf; g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); - g_return_if_fail (KATZE_IS_ITEM (item)); + g_return_if_fail (!item || KATZE_IS_ITEM (item)); - pixbuf = sokoke_web_icon (katze_item_get_icon (item), + pixbuf = sokoke_web_icon (item ? katze_item_get_icon (item) : NULL, GTK_ICON_SIZE_MENU, GTK_WIDGET (search_entry)); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), GTK_ICON_ENTRY_PRIMARY, pixbuf); g_object_unref (pixbuf); - sokoke_entry_set_default_text (GTK_ENTRY (search_entry), - katze_item_get_name (item)); - katze_object_assign (search_entry->current_item, g_object_ref (item)); + if (item) + { + katze_object_assign (search_entry->current_item, g_object_ref (item)); + sokoke_entry_set_default_text (GTK_ENTRY (search_entry), + katze_item_get_name (item)); + } + else + { + katze_object_assign (search_entry->current_item, NULL); + sokoke_entry_set_default_text (GTK_ENTRY (search_entry), ""); + } + g_object_notify (G_OBJECT (search_entry), "current-item"); } From f2ece009b3f0de4d96c23705328e1167bda350bd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 26 Aug 2008 02:27:02 +0200 Subject: [PATCH 0288/2970] Unset the panel menu items before activating We need a trick to fix the behaviour of toggle buttons not to fire any signals if they are activated repeatedly, which in our use case is essential. --- midori/midori-panel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index dc8a8936..2e71895d 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -322,7 +322,12 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, toolitem = g_object_get_data (G_OBJECT (widget), "toolitem"); if (toolitem) + { + /* Unset the button before setting it ensures that + it will emit signals even if it was active before */ + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), FALSE); gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); + } else { n = midori_panel_page_num (panel, child); @@ -341,7 +346,7 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, * @label: a string to use as the label * * Appends a new page to the panel. If @toolbar is specified it will - * be packaged above @child. + * be packed above @child. * * In the case of an error, -1 is returned. * From 0c88d21e4d2aba85e5f70e3fa1ccca58830d9dae Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 27 Aug 2008 00:44:21 +0200 Subject: [PATCH 0289/2970] Add switches to 'wscript' to disable Unique and GIO --- wscript | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index 1ad146d8..8d246fc8 100644 --- a/wscript +++ b/wscript @@ -35,11 +35,20 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) - conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) - single_instance = ['no','yes'][conf.env['HAVE_UNIQUE'] == 1] + if not Params.g_options.disable_unique: + conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) + single_instance = ['not available','yes'][conf.env['HAVE_UNIQUE'] == 1] + else: + single_instance = 'no' conf.check_message_custom ('single instance', 'support', single_instance) - conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) + if not Params.g_options.disable_gio: + conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) + gio = ['not available','yes'][conf.env['HAVE_GIO'] == 1] + else: + gio = 'no' + conf.check_message_custom ('GIO', 'support', gio) + conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) @@ -68,6 +77,11 @@ def set_options (opt): opt.add_option ('--disable-nls', action='store_true', default=False, help='Disables native language support', dest='disable_nls') + opt.add_option ('--disable-unique', action='store_true', default=False, + help='Disables Unique support', dest='disable_unique') + opt.add_option ('--disable-gio', action='store_true', default=False, + help='Disables GIO support', dest='disable_gio') + def build (bld): bld.add_subdirs ('katze midori icons') From e5a7b7af905490a67ef5fd7542e8a81fd27514b7 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Wed, 27 Aug 2008 01:02:22 +0200 Subject: [PATCH 0290/2970] Avoid an infinite loop when iterating over addons --- midori/midori-addons.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index ed3bd812..6d211882 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -876,8 +876,7 @@ midori_addons_set_kind (MidoriAddons* addons, addons->kind = kind; - if (kind == MIDORI_ADDON_USER_SCRIPTS - || kind == MIDORI_ADDON_USER_STYLES) + if (kind == MIDORI_ADDON_USER_SCRIPTS || kind == MIDORI_ADDON_USER_STYLES) g_signal_connect (addons->web_widget, "window-object-cleared", G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); @@ -989,9 +988,13 @@ midori_addons_update_elements (MidoriAddons* addons) if (addons->kind == MIDORI_ADDON_USER_SCRIPTS) { name = NULL; - if (!_metadata_from_file (fullname, &includes, &excludes, &name, - &description)) + if (!_metadata_from_file (fullname, &includes, &excludes, + &name, &description)) + { + addon_files = g_slist_next (addon_files); continue; + } + if (name) { g_free (displayname); From feadc600c58a0a95d575296b1152cecc2ce75fb8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 27 Aug 2008 18:04:51 +0200 Subject: [PATCH 0291/2970] Include GIO headers in sokoke to fix a build warning --- midori/sokoke.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/sokoke.c b/midori/sokoke.c index 58af4fd9..d97079b1 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -20,6 +20,10 @@ #include #endif #include + +#if HAVE_GIO + #include +#endif #include #include #include From 548c1e7d54f0a0cf154a58d593ff1dd82f20f8ab Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 27 Aug 2008 18:18:16 +0200 Subject: [PATCH 0292/2970] Update 'waf' to 1.4.4, among others for building on OpenBSD --- waf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/waf b/waf index 59869322..85f66f3f 100755 --- a/waf +++ b/waf @@ -37,8 +37,8 @@ if 'PSYCOWAF' in os.environ: try:import psyco;psyco.full() except:pass -VERSION="1.4.2" -REVISION="052bab0c35dd0fc6015e412d863fb679" +VERSION="1.4.4" +REVISION="8fadb97cd069d800c8aee7b24c9ec1ea" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' cwd = os.getcwd() join = os.path.join @@ -141,5 +141,5 @@ if Params.g_version != VERSION: Scripting.prepare() #==> -#6<\%_0gSqh;d"-6rAt(Y.KBGJ[/f.bs8W-!s8W-!s8W*t!!8"A!WX)!(0:cX5*GUh9W;*zzz!!!!.kFb$9&&!_dHcAS&q?Nau[[,0FDRrB-.jY0q;lA6F28-ENQRbdHeZOW;?E#3QhMO;noQBbLC%p8N24()OmQL#\SpP_d"l%Jff5Ek1$2(WO^>\aqp?WOfhHL)kD?+f?B70-hgfeW5_9(<+pYDG8!'Yo5!"IthB*2NAmK0H'k<8:<%RZn;hfZ!3M#fjAY!',XcokF:B\%\6#-!^V^dM$t6BtLM:f9[g>8dZB8?8/edK"C:55)O6e_W@:VlX3rZL#T-doAt@>AMQ/d.k3JV:Wb7CK]?HVqY:eIGRAQ\$b$&ZQFNg^!?<>I>>K.h]DOHmr*;FY]$Yj4THqs#msM%!)Vs7He3KIJjnnqE+NVoOtOWR(PR]3"]UXb'e6WsQ`WUI^#i(,>;r%1l`fiiHfI2X]Bdtq6WCO-Mqb_+>i&Z]=l,.0G>$^M^$]C"gUgM[4mdSS]48"3S_[pBcZ@jCG/o[J$98dICHYohfea[pq>"%43&B%[b4rjGAN:E]:SWMQG&eA>C4*TmpCInql@?L\)-k%h^qf1pYP0#i43-OgPssW^@%9D4,r^#mCfq5>HaT`gV%KMn0MR]mr%a/aNJ5&NkOl;L$lq8qL.LMgL"7Sqg`"jL$b);H$XAKgr9BX55@5%FSE7X+'Z<[mcKT.2gU8#EfNF"aYDn^i,qc)a*a7F$#>X?#"ib)(>FH5tEl4'/OQc`>ku'NL#)Fk*G/*28%/OGe^i%B%OT4l=2jl%;dS8G:@mGuhY+WXo6&)*md.V>[p+3E=foD?oC'9FdVI&-oah*F:F[;=9kCsqHtURq4$d4cII>kVX0[6CI*Zm;]5c_0GM_ahc@u@%mAG#3p"19JCPUQS]mW*@II?4QmF/2sp3"C.mlc]d4O8@tgU3I8i6T-H^bg?;"$d[KE8!qmZ^pd\DS5WFF.0=S%+3n[iB&JqCfaR:P\Kl'C]NZ>R@RpSqrrIo!MBHc!CYabj6aP@%I[N_l+B4I#L<(1T$GZ-4*S6lmcLo7-#&Mjbo7R9P@i&ROS?B'hWr2X[^kYPp,ZL&\Ou;PHf!W8+"p]YHTC\(PfMB]mJ!*igNpIcE7slZ]raKihS%t\VnVo\7h:#3pX>a4.H':(;b.H#!%'rX9Roe[TG($mSRMoU)WL@R8o[7FF5R`C%J,fQL!0bq^8ZAIVLhW,49r=eOb%ZYMHA6r*#)7aq!,)?4!!!!#,YDMH%0[e"5QoG07*/4O$9!b"0W1ku2%<>LoKYQ/Ja+-RdnJ/f,"+]t)?BnK-4-Ke9pG0D8C?NU1]V%d!MBDm!!",?p^bc\WbpYKl&E6T>3=AZKOX!ST)LT+,6Qc$fh1^/hlh6lf6q^$R[dY`c3J>ha`d-1Lq(G>=_*XR/uZKe[8MG`YD4UWe>1ft[ZaN<+q)&;6q(Vu+sIjnKbrV\5lHg62&K2a;>%aD'EdaaWs/\4W'lGVB$519TE5/TJhF.CPbr!/As=_U^rW6b-=ruIWZ#SCRA*(rYu:e&;e0SH2OQ!gQtgH)a\51!9V<#mAZ2PnN"VhO16E>N:g#PGPbkK#(.\js7#2;,farn('#[n?U=.Hq)-5"a@2YGKQ;TQ]Yq%+lZV:YG0kAq`KWuEuRV3I;;ONAQM^D.A'2(WIBRn*t2NZR*7[%708OTKb&g0Od8RQ/973jcZBJ_&0Q7\1bZO">YN?hFH/8UJaN=&jGA6OhX5`&C,LeLZ:N/]SA1BEm^-(%8cZm`m+.2%S.7[=ZF'UDH%Ak:@5$:P)o1eSBn1Em.(b#3hNP"hf#`A;9Ve=*0BPYE)F-s.34M30'_XMQJ+.q+NAZ*J,()+%gNOJ:Bn/PV0XUIH*L=er9r,pQ!M=u9/-Jqd,Xdkm1U.Bu/o9N]N6BM>j*Bh_3!.$Gp^M&@]M#R5i+R5'mp,f#j*N&FNN+cVVj,:P+j(?sTN?hU=+L%:J)GQA.0\Ij"&1"P!P1(Z['4>:r=D!YoZQpfr77nJdYYo(eMDT"raqD'tP&6D"1Ld[nY[k$gP/\-'&W:3OdAE:obnUPJBkoM5"VXa%'blcEPfVKOY_m*O-*g*3#*WgZ;,K_k=f+ofL1*!X/LdG59dCZT7^afdA?_jTCf4-3OgJsj<*;);;-=f@Lt5-UMal>+Ut$0bd8DE&U/Mi)O[^4&Z8,mI+XhtZ`=k-TR`#VgN(R!8/='g<1_<=])BpmJ@mX^j0nUbp>+4-HAk3P;QrsR.R=q;f&CHT&6:N7?77#_O]U9hcBJ6ka+a-j%Knat7\3BM-FkAs6&kKJGtc2M/q_=Z219A/V5LVP];QMN]hS#+8sJTgf\5.SYU6`?JGB#11_[R?kr=9gkB!N7'9*>>$E,bsOCG!89:uRT8fCo%)Ja*>8np9C1X+a:n#1/6'86Y@qfM3;JOF]A=-1d'M-0=Q7RW=#0*TQ'q%^),?c[u'$7)/W5sm.UrcMNM\0'N)$V$,ZsoD)6;#o_$SYt_Z>?".^\8MT2qiPhRX`%@0p1.3]]Zb"4:[VJSk$=eS,U2O)%sjI9dqF2;_2KQ;O!9/R/p8a7M:OKoJSIm2b06"WM-126JgN7)LnUP#7SShLg<$%p;A**^KS!-)efuW4Bp3)&(i#j9R+Te47?\L^7Oj$h16cWd[MEX)Ba.%pKp#ACPYDl)$*;,b`Bm8"=Cdl%R*_]>ZtY5-_J$;V(4sqF1sKW4XDJn1WgPEhR[1B6Z)Uok;6"3,11@Jh)P^2rR$ss3B""MhM_s)p=t1asU8l@NaX'X-PU%01`$LjV'Pu3nd[E$:R:]FI.RqBL6s5ukPc1"-Qt%]p1h@rVZ>?>jRT>TGW(fb7AZJI@.T0DCUo]=$Pg^na1GY-IP"T=R9oBe?&JK#X.8t".WYEu^<\eJ+ZQ]jB0T&T'W3f*iCE$/?,V.uER%fDR)'fOr-2C'kX09lUVp!]`-JgQ,?!uN[rIs0!&+2[%C:1mK#Pb.qDG^\NiDQZ8$[,#Q+8)7=rhJ'_@N,)mZ"dbBrs-7#(L2$t9\Yue>Q2AnZU;r=7Namo`CONt'E0VYL*[r:.Gtj`T"R';lOW`oXSFYW=?g#4nF8@ajYI7j'oL)M]DSg!;6;5ofBZtc"ZpAp"#5c#EapU3PE#qaN!;%)CJP8.Q_>d[e.lC-#>9Efpu\#i:U?I*;*N2c9KK!lYGIU1$f)0(f/+leJE&k;$!t(&.`ObR^I=e@pYRX"SSi`5N4]jdg*Of)?F!'.Hl6emhXoKn&S>rN)e`B8TMePa)D7YUH-%6%j[N1FWRccbIcT#XlTaF&'>geR'$_O`$`Mrm'ALOS"oIKH1K3Md&I<1$9!.9BcPW0j+drQD4H?23[/L\s1Y'Si"P_VPWa%)>btaf$gO!BhKhnmQsm#?GD]miSQ*j`W*Z%Pf#W;q42hJ2VDC_4N"I+W4Co@*HqL3-jN*Yn@*%7:/C%OiX3t@RYp8X5a7L:+6a]0Aq3ia]nP`\A5Edbdt5APKq&9_oG4%c&g3DbW#-0L:MPI2q1ug)O8h8p[G6;N)"rb_1gRpW`Tm"iF!TP"?OK]%rJ_/)^V;[Rnn?pLH?e2_1BMSMCTS4d\&,dRGgbSY/h9$=Ke^^;KB,l.0A,q80,<^+?S!W`7\sc_&M-?8X67QC'A(DIEm(rG?&anIM6r1fgK6;PR4IQ#'&<3Tfa9#-V@54(SXKSTo-p[^,=$I6-L.c:k\C]Q*H'+0Q#*p%mHV`L2T"$=9@/rL*)d]s]V)qS&Ah)4>Q6P;`RkG)CYcM@V.F"^sgUaJeks3n%pr"n[bV+]3JXm$L'FdZ$IjbghKg(cbkd$L;gRj*iDPA*bu_9PnOjkj`Yp@IG<(kDrnsDbPF`0CjR9gs+gC^o<.9V4!(8;6bI?4pGu.R$%8MO2it:dYH^r'[t^\*rY\ToHc\,@l.QK-@/BWd4jl\/336EYLN;!+?r6t)$/`"'=>:JI(!KY7\N=V([A[a]J4(NQQ=is=8Zj"m&\+:23.Za,_f6&3+%#lXUa6[$WMu6DlsnKPp)R:peY*'[&'\7?Zs7'#9EDX[p3RDVB><=%g7:Y??iDe2q/=!JaiGrj>N?E)Flrk]VLrnL(D6cm!LEjYtpQ^i.etF`;9.Hj56?b%k57+q!h,=G]cn[bC&9mZ$=0a-S4PPlPLemiLAD'Nr+HCUR*=*%u!U(O-kY'oWo:AcG&(EooARn3tb(N/:=3md'3AkR5g(N0gVpPqS'm'Z:EFnj%r-PlBh79bSMRBZgE>*h=\kC/pmN!^OM&X8\lg#I68Z$D'Mp?76dTdfY-55"XVUQk5G7c_47o[E:p\R5KS!#p6QrHVf]Rmqj-@Q&ZB>>-]/Aa*=hSF?NUc,eo$m?LSZsp/rMpU+%YoGSeB0;@7VO7l?6n;I4qJhIA4I%g)g=gZ2SC'gO;f;*`l#]UtA1Dr4tq4[rd;:d>d/*g;Wn^a?Gg\I)Zu=h-)oh9V>6`SS+hriDA.K<9X24W%^5[ZP]'%U*Ig*gs]:g+$#+nT-!3nXhM+f;8J#j1&L[Vl#;ROIg,@0fp@lJ)+"fQjr5fk^Yh:7GQ'_h]#od<"UN.qM)Q!_(M^%P=)to@UnJKqq`@hHjbX2's)oB:Cq8SSbu%gN]/8)?$XNZdEd(EM&We.;(7E9o2%/(t0B9[rm(;i4(*FR5j*&s#*[)PbB^*0FDA9]8KFW[#4.N04Cc`dK,Z=8iBH?s[p?sUZ_m"nj:h`FlVg'T0I"*/P(_Fc(;magLV3da;`&YN]a)199)qSdO(iT1AQG]rpi18"(q`0=`74R+`e&C@$N&Rc$CRqcF7Oj4GYt0gNWVLo`*H+HrSsU7E-+*-]m+i?KqU=28*h-hHQ@#t3_!!p$Fm[l8JeCTdDY]=?4WM&cZJM?>@&.sN4T@aBS5U"8m2n9]-,K]BP&74QAPjPDo:E#%0<(&rBkYjWd*;>nWc>Z'+I95h,]:=,lNu$;;8gM@Y/i9j>h.mtnbqjil];Bi:9r`["INN8ju+UsYM`oli3J2WhX%>7-@;GeJ*UY*lTcJ:g^h[AY7efXD*@'ZJ,#9fZdG4_V\D+XIJpiORJm6qQ0KG[G:.Zd_S.%mF]Ad%LqsPG*5KpRXCHoGjRN=bL=["H/G\5@/!?Hc\YN\Y!eur1.U!2.@Y25"L=d1Cfiojhj-g*-9",s(D!*hHW-k>Ln)24>^8f9X[4..aXLO8IU/-qF0P'KAD=6lh^@(RnO/6tG@7WE/=4ol59lELFVtSN!ib]pk=.;A*sZ>e.ek$pHYhLC!/Bg5+$2`6b"5WBKm!INf`c#fIn"`"$laaT-73[b;u_JEht:q__WFG1k*Y!`O\f,+mjHo!!WmC"a6Y`E;,)<.?9n\)lKdJE_h$EKsErlP\F+FY!/ksh2Db$MH#&`UXFB^k239ZKoROX/CZ\*^Ve[P#Bo32SX'7kR4D'd?X<]U(#-gU)@-]I\3f+XB,12jAT-,VK`.'1?R>b&)@iCjs9(qg:QO+lC.>_b2X^O2juDlg'##XWTtS,,o4&RUU08m:.4]-Am[/R-Rojem\DJ&sdg$O#6OdM3gR,'U8TGcI[gV4TX4m/o[lODh`:rsDEF2P#h(D7_pOpRi$"QCV\eg-%ghh6Er*"np-Zqc67?NN*uW&#P*O)r'[`tHq0bj=Q_Z%2FbEj5sSnE_dR+.qlUlg9@C,fV:shTImj6eFbb3)\?o4aYuK%Z!VG4/%qkIHoReTanS>o[1rM58O0=f"1%kVl1sQ;oV/(.OVVfHnu39G`?q=SG)KN"ior$*1-,1&6$iWpQmi._:KGJ#mi*taC4c%Ui'Hac*qSneb7dDlL8A",&O7%[,M8^ZX603ffb`QC7Ja[,"AIH\4;Cgtl#rb8O]XT?+/5W0>6hO6TTVg4G6qHPeq#_9gUf]+8:lKNhf9S>tds[BaP.Y(c#]pl)eUXcbJ*"15Y\I/;`ghk<&&s7+WX'o"lm%jjWha.&G/I[a41[X@DmM1IHk)7hGr5B6=>l9LiOia6!(SboCoXFD>Cfo1L"9%b:bd$QuY+St;KqJQl6:04`o]V=p\3A0BI<29ol/Pc]-)@iVOKh&Vh@>1FRgIlqdR,DqOTZ%>M6#mgd6Cre_G+q9bk7Vhq+^7JP7ZPQU"!HGtTUa-f[A5TrnoGSf6aN>N0g+b'DXl"/n+fZ8Bi:#s5o242"UA]:<7Q_^"j7QVC\[CP>I,eSBKFq9[h"HXr3)T6Df0:eSAdf4CD:Q-4ac/Dm9T50]>7g)'"I'fGD-JSL2I_2q\1Cp:/-,bQQ05j@f9QZ$"*4HK68r/'>'dpHRB(!\s*.YNTiM@-MPrlfn#[7K!P[Mi$:md#$R(p$F_)\\$dqsT^G@T(:Ma4,ab%]Mf*+R5S9/#l8M"Y#ij3''C!=UQ`?+c)iUjTc>hKG2IUI#DSiuO5+\ReoGC\YaYhl!L_VRg3e6't4NX83q=D/dt7/O=)]jf=k)M5B!,8ajN6AqqDCj]NX]8OYctQuV]'j\tG@q;X\V5'-[bWgY`nq0;Q.07kcOVI!j(Lo2R)0/j$C.Q;U`b\,e9rL=_roAc)63@M>Df-na0Y-FOb`TMTaXYaYg35&g_fadfILDW2Kn1%5'K@lV+Z8e3i)]-dJCA:_oK=A\7BIA^I_*LpO8(G`RIjkkc4"^3j^2N\hiofO]@C`CnV^iI%_k3s`FCW>#BD#&)*nedWQ"d_n_Q@i=nbM4k2<1m+%eq<.N$?>7(d]IU(;sc.epucSHZK([WrA[uf+P/hsJ"PsV?sjPigZ>9&OaJAc)ZdTP)Bd(NXp^5b28XkcM6/C[p*-k"8X1Rk[o-2p)/lIP:8;ak+FY7T&?4>ri,QMTm,L_pMq="3*"?(YR9F49d#tQe0uF`.9f?#+AWi(3CPWW%E5"*&mafA-XB\'T^@]dbSXeOu`/)`TA_sr(Gp]jIS`kKnZ1`rd&_-o"F!#+9^4,kV;oX0eVc2hg2(ejLTdl@kVL=Q`2Pge]NUh<\NUcl8V!:rk$KOV08J1?$J#4d/&8jY636;DP):,suh//Tn^t5>>$L\=bcrJ6+Lh.Ir[jbBp[DNqfb8*IA3\@.gTYmB:kKdQo$n_)]g3dg=n7A;e,HIkB)0=dTabb:`bGJ*HEGKJiEHGU^eF)UZDt<\*sZNn"h:Y1P5DXje)g&dQ]@^6BMSF&q*;jGBKK@I39@A_V*I/c#;[>=Bg\63radYpV6>fbFW'H#lc!_1S>!4O6($uBp7SWS5[ajW+f\NWk8rMcAbl?*q"=R.fBBTAo$cLc?*\[qdp^I8t;E,\6t>.ASAs$)n:C:JY3>o=\e4PPq?)_3@(ml_3?q(YOoR54t5F@=abH_Je]H@Kg[.7`fC8cj3IqgaSo"Nd]gJd_qQs.o4_pD<=7Y[9$DtP:[G)8U@nMdb>a>NS4ME1]qC'Sa-jtSC89aE@T*;>hG2H$@mh4+-eTA3ROrDIQ8W"-=q%HuSn'HOTk`rU$g:kWc?$L8f-;W)ph6+=7s&7U/&^c>?G1g2WR=(C842sGI["t2j`omAmO]?&oI`k8Kst[sF]JC:H"-"sS^2=qeVrbnQWlT6q7;#@D:fk5B`Ic"X*I(p_lmBi8!2r.(5g3:%mLk4GiS5%7N=$(]hD6Y8oBms\jCJ]k45rpc>*MeC8Du.^?WrtTZP6#b8]lL*t,htfjqH95ZY^fj.YiV>>F(YHVc]%l7-\*%ZjbUjtG(rCm.]J:2T%V!e8<)%3Fs+o9=q9.UV_**!m'ue^R]sd%\:93ZlTHR>,U=aMDE8F?-K1MpLF&*Gc\^C>Ecp3%XW\/&:[t'L4OXSCIq3\;;LJ\B8&fkBlp5;-B-"oW'P"OBU8YapH"_Bm.@\rmT>beQl9Y%$f?@48ntT2q8Cme8I\34hQ!TbLk]RJ`N*nSET-k5$-&lDlJep<7K1nYTHS/QN_afHq8Hi8rsm2)i?Y>)e!s)pK,g0RF,>.lT4gMkJB5O]O-SFgNFsOI82a;p[-[Zi3QNUbu+/.=?DS>Xokqd2.8tsO<=`XNeEkfZ,I\4MhFWH-k!,JA?Tn=FDm?!O!fc?eRZNgtE'&_EC$Ur%$(EbE_T#s+r3H[*5::=P%ROtkG?[mor1e6=KQP<6-4rr9'Dh`Vp$Oo,kPY3-8A4Ah]q/2N\!S/b&J-=7KM%VF@.$t"II^6VO%[b_"VG0ogm$'^e'![Cho(V@ik?@]CiAM$Gr]Ah3kOS<;_K>Dd3Qo6F8FD'R-Q[6\#Znl3F1g2,?VsH`a@JXoJaOo_B@-ZpKPY2KHu__i45[/b,RR"^?DVB^)+Ahpe^"%CE8jY\@\8$0mJY=KOGKH@tiS?6:L"bgf?cRicWQ*P*iL.TRke'nj5m/KAg.C9N[hehmC]:).sMkAj"B.iX^NGBP;XQ4=@Il)MP!PAf[;WcZgQ^bZ[n&'2SSq_Ws8#VpJt]s)oM8]bp]7/C`U4249VR$Od.c6T5RtL3700N;321#De;fN9Y7--[;pa&O8oEqS)b;Y^([/KBhfbGpR=qf=R#Mk\Y9T/>G$@6CJT)is$s=:%XMi]2S_H`M)H`W)_AkkGN-4I*\>^XlZ3<9OGuG.q>O!d=F"l-Z(';fgZgG$&a:#ONQ6L"=D0i:61eU`",jim9,6`\q_h7Q?;qaZp6/(IpU7jB2CXRkosr.nb%3CjjB*F+UBoD$bZ2Y\H"21OV#4&3bG2P$*8nnU(Rq[Di!-J[$b,qgh!%a9g6uG&UqDAeY0]')m7!4L",fM/(_'UUXCHE8ik>T-1a9MKJ1R`"46?BX=&)HO.fFJ6F4fLWQ=3]C+J<1]/U=.uY!CgD"fRdHMJ=usNSc\/-$2cJ*ABIEtYD+r6"H(#35DK`t*d$p$c+;oFQT8&q+Gg*>/g\e>QjZ#D,U+]2dMRn0J,j`Vj!F^Y%ahC]6Lm*#Ltf.QHF3[BoXN8,$WST@/Ul2!KX2>,GZ/Q:;T+Zh_`-h2ifNt5nSio0>$I/cd*G5"">rsLL=4oW'u4@L.+qmTF)Td)08&WfO>CLqV2jI"cf.W;(*,4,PolPlU3aDogd]X3`I9+4'V)7m,qY9J=*fqK:f*@KK.2Ykd2f9O[2']:d0_`BdNKgM)`"c>H;8n8-BBU+t+.>1;cFYK=?)KeeGbE/_O2_rsmgrondWe`ATE,7#BU*M14F)l%'Q6];6W^`4B1fTXhS@bgW]PZ7ik?0=HmR8tn,$e^dYhbt2'Hr&NQ>TN8OG%$(!G"u\32s)r9kK2fBL?50cHInMF/uH2e5^0b!^he%p*hhA!]FlLVpg[^G]1c"``SEk-)t-GYqnEI'fuu=?"D:.+/gS-+Ne*bG9Htup0`'l#UWqrq[qehW@k]U=;m1LHZ>DuLVV7Du'TbIDfhnK\lVl[K/#P')6Vf.plJXRIVIE/B%/]/=FCRG'R^=SSi"#sN#V,>k+&=5ng+#IKoYmt]A"g)/ID@/SdhRY8$R:C_j6-trIh8&.1\6a7Jf(r_F@kImX@,04F[lh#<9MYuD1\UGh#H)2$cuosCh,96LGY1G_7L-A!qJj<@N+*t8.9Sm,XD,Y(m;bR;HY8n_Q2mZH;QcBukrX!=iY[\!.'+UGdS5>=bgIXmQq?`BHk[.-HmS**P5q'fKL2iY,%^Ql\@uXq.`Rgo&j[=^g5quYg_d8=fs#Y4!I1Kp]NZYj8Bl`YeFYg33dU_\TSfr4qensoJ@-\UU$\UR3'1>MZSWFsI/oSFM>:43B?r;82>2%"_ODI!lg1.V:UTB>N41_LRB,#7!\#U,h8YMH6>HZQ_*#&eChJ"6fh\JL^k'%&c?Lp]!Um;A'%aHTUD-nd9pYq\<l;lQBXOe(Q;gH%3g&9be[BJ4.J]d$Mt:k,bS`^fdqeZ8!8DN^b4\YV[sRZ87u#Vq9^4`b^%7FrYcT]TdP_]'-J4n<(sBVu.2U]3?=aB:EEV^j^lHT_UP4,Mq;T=gspL^%&%61t&5X,&ktV]DV7dA$GAHR5d3PEd,14Q']am+`.T$:Yg%bSMH.bFOSbjZt3rDqIbK66p.9XDg.W%_PtW^)PgR\O+j,]q\aoKkfa'1h]1D8McKPt>[>:;"6f%nC$`W`N^a:.B-5cahUIO"#N%1IOZAd@A'I]_%igss3s,'o-C[!N6)Z$f:[jkfX(21">p3#'Z\m];k8QS16`WN&n5$2mRS74$9B`5N+lebXl"3u+2Pih5o1^VKJAXq:CIh4T5Q`tdm#0Y0P>A<*s=cE)953n\U^Z"mM*fY]1PlkdSpOiPpI>LM7@."E4I1.'T$8(O>;XF+!c-u%.,HudHdTEKEk.58;HUo,1eZ4E'7h>3V"[h!Q"hg0aL;P\$nZ]6aMb$cNH%_,.kroh`kfa;)nprn&47q76f7Y#I$9AU(Cq>PFF/9CZPU\N?YCB9(#e3bbXdHRLf31][(]`>=(g#LcLZFP[t#W5hc6X]T::'>u-m;Z5ELYnkH>Z`B@'"]V5/g/^B5C$mW"qZ??LS.Z+0B^No#*r_ab#!jH>/\@t\OL1ZLTIQFVl=bV%e.;ZT0:9!e/RENdZ9(i3uEC9''ERXWhn7]",Q2/qDO3\?eoq(q`=1V@'e<"?C;]"`r^[9`FX"8:=529jVIF6VXSEP3/VcV"+Xs#b#B[SS1J^L+i6T@'93YIu#8E;jXhpA6[n8Xs@jjYD5hGA/'R[qU(.+7:CpgcF13g[9Qppua.MA_I1iG6iii"EXbiGW@Rr0R67<4hhJF]Yd6WcVIRU)"VIZ%dNfCkO(E01g0H"GS&%gPZ$,D,^o>2-`&_Y1DhO<4*I5ORn!BaoN3ZcU]V+'C+\*3)*u[J%raqgOJm"D(_V9l#r0&flUF!?8RX**/o?d!gX5IZ#lQ;jL/53dLQ`P=:D=8D'S3o-sfY,A1cSa=N,ca18+ClacR@'-=ZE\(rPa/2L&>13&T3q,\Rum(b5m6r[57R8YL1)RQdZHeuVHJIB](nOe][r/-b1t!k'4jK36%qd>."k&XQq.o0UrE]_FWTX69EUoPkc>HuWjh2]'[/Mo/QO!oM:2_Fh(F@BBW\MX0,RQkX4B]!ajcmG=RDbC='lf&%S]p%X?a67L.VaX/c3GfCIA%k@H3E(rJfWcrmV,#nj)iC@l97p!^)?m)(L#>k0/2`A0&kd>r4l)aPb6X`3hHpZY\#0WFdWaT6?c/XA=+3B2SD=$[biX;$p+E:m5Mrq%oY5W?X!*Rm4lXgM:0(:_OU9Ga>/3D`P15S+&)R5O6F>YHt?[+W24P0>oli,lNq(_3R,C1jf=mm)$l4_;G%6!:7b@/,c/HSrI9EQ/tRmp5,h2P?%3;%?P7M5%s3a-Ef?HYVncF1#,_eUMoDmm$.pKNP?Y5?(D-1RC*M>,P/+^o>F-7TLk>%W>;-iEG7M%7](]sPPJ="Ph/]I+Fkqg7+S:ZLb_=do.l\)P9)8gq>\r,i\@lkjl+HgVDJC4&)lg:PGRTs$6MCC[8)0hSd3:2[#IMf*EI1LptlkYp&!UeP/F?la/r9U[tQuPO6e1F%9ZKQqZ7#d/h.k2J`(bgh>:a7?2A0sM+KSD*MgCk$VH&IiZ%o)p%9Ai&Z-*_!59#*7iqN>4CZLKfC8GL(Fq8!VR78E!;Rd2^jBCngq]63V&2f*hA,&6$^'4/4=I`I4UkLJ%Bg%G%&qRWiMIdP1imc1j$]C;up4O$;IS9]qJW:&8b)LDC:o>`>X&IUBnj'=joaW-iU*h23$lL5l(u[&.[[=&=qG>6_N/E6(R21#W8)"37A3oC[0J+%IR(ddQG/'#(3U5L&9:.9ef=hH]<22q;R!/LnT^87suU_6at#:m'+V*LP("CMW^Sma'Q<&?F,i9ZW\EQp(=FcQ2N1GAu"PN:u.m?=1EbgTU3q+0W*L5I='UKiKMb,@_%&gLXh'NjAZ\+3gV>n6hDX;_ecKQnTr2V?19sP;(*G"!o`1:@P5DiPTQoR=TiKX.YRX3R2>H+SBCS;l1U,O+h_f)#ljRJIH/1I%[j6=@;+.N!r0T0J6+63b2H:h0G5D=ic6n1icauTBINX<#qPENf[tbi-HR=+iuBS6DTrYNXDVA/l`Ze($GIB?Q\.Xb25//D`oJQm?]O$Ph\%^q9[`(/$Qn>RR3I0#ZN2p+h1QU73Qk-RjccR]88Nb0KZiDYQ>j&DL.&PoL.iPIfJ]Wn]0qel]DG\%8dh4H0LY1Of'1c0@T`t`gT$_oNs79B![/2oO5ADNo*:?eL$U^=0=E$RqRe$aQG*sg+KI:d]H#"%k[\)pNm3'%H>=4_QJ;/=4cX6P4h1\VI"&P$79Sb\hNf)qEHm9kl.UWp"@Zma&TfS#lZ\D"@=+T%X+Q7rSGjjnFQX?]Cu/;>ssf(CH!1q]cIEh/Xnn1Wk(]fhar)Rpc6+:D;Sc^4S[nt\VE-2jn8B@)X4)6Apq(rWi'I4g1]pOgpQq)F;0F0+PSR>'c:411B2pTlGJRBk:f!_QHb/)@0?@"gllDV&;ikd$XmSa,)2eT7ZaAf<_8t"1t'L7Al4Xf+qU_pbr5eD:&OXM;f)qO%k/pJTOZL`$:1JX",0r4gO29c=#l\,qTB:)%BIdA7/ssD2&,matNrd9Ya;(dj>LSC,E10bR9N/V]_ucXE4sL"8NsAeITXotH3X%H)>5pY=,tg;>?@R7';/a9]]jqG[rtdfO<8ZrEZQpHN`f9sP00G]9e+B7s5(\s+B\[W7t7f"L6WcRa]@W)nt3@U>BN&kP@\cSE8D?+V>6_TZFp,F>5qILjOJcJ%d:2m8d7h>l&.drOLp0fbpD5HG'9IZOCqYiH'RI'Ra7(`\:'Z5+b\OW0'Xu4*_;Iq`$W8jb@uMdΌftZd[-\e[ID:b1[Tf>8f(/^1>ImBOQCZIbl7HmSn6];9TbNRV4.jI*WQFIWiMC0CQ9TQ]9srq>O,"['30mIa@lLIYWl8!`KM)VQf*'<8[*=3W4!E1=i\M&K^+F6oGOBJn'j,UT6ZRq)UR>pnQba:gTsB&Y;aKJ"dZ96l?QiJRf`?c8eS.dAa"VR1_mC;+J.8!HPU*9mQK+YW^pTQSB/>93<7[/b[.Bq3R'*_(f;%C1DK/k:\\XAjVTs5r#N(BrYV%"gi>ZJYJ"NF[X>$49dr\#Ui>T$(#R*N]/sm13Sr42[8D9E&,rU*W`T(gJ\[e)Xa\7_emg>,18gTq#/YBQ9uoiXuCf8OhF9"\u1)KHOce63,_D+0^i]6:K51Bmo(\kfBCM7(fB5#PF2oX-+7F,_PS\E8Gm^PfJPC)p\Pp`T=DE0.8GR:FL3<\"lbNW0!4+0Gm?SbM:>`NY!kl5VK8#mNd^G+IW?,NL[n91t15ADaH'=p)Uc9#O>iT#R!I*_VaZpI+o\!;/tcXp6(pIde<(0+nrXn!?`p\VaItb-@#c)MiJFO#[fA^6D@gZ]7"P.32Z:@AU):>e;035o5N`:*:H(1i.ZlW#Lr`Ep6S>Vb"/nYQ1+]##sr,2a^h@s)-B]U;A)C5,;2]S`Zk!&ObCeAQFhbknDs6(K*V.r/:q)(o+8q56r5tV)Ho9t%PhaQ5[>XDLWitX42^4Xl;f+MN(%4j=*$)Od\1'>q)pYgqKX`tmH:"0St:?fK+3PX%O?/taJq`#&SLWsS$V7nV.F)"%dg(;P/6WB'.9-T[5]tOd2k32=^i9/R*0b)edt3*"5n4"7NgRa,)6K+5.!Gq`'bS-R*gt3Or=]sWj:(%B:.6sY=-[`6orEj;_\HQVG=#U/g6oSLie\jDNc@_Z:We1YGNmHDY;Y,gD8?k1G"3XRhl;qMs4u*YW9LjMU.#nqT^"pK$01tZpisuN>/P&5KfFiHhQF>6_8hNL;Cfq$H_W*:IQu/]o>WFt,8<7#e&T;BLt4:_^I9kT9^eK=@4mW(M7G&sZt=2)C2q9Lmd?Z@is*&9e]-X;U!"OnguhUlda9'gV@<*UB"7QhE4)2tmkma+o?qQMrHi[)2k/i?4ZU1`ICS4GhDd)c,5LOO.O5gG])&LOkukigK7%F"KgIoI`phe5[?lk?&YP6DMHa!%=b.Bu^ntQo[iNOPhkGp(G.o?KmN&aJC=TpX[/F-#A/1(A3r#'g-<7[0UoWV$2^s+2,i;[PT\*+?Z575GX(m\XrkH3qSo%dr+&rc?ZV2>2T(*!rpl1TN;DHYe(hB(A8?p;?0mmW$rCER2E2:*"2m)bb,-6m4rP&H%C.W`gLLhIc608%`+7&i#6:Y?7]+u'S"X@In'L=:3hDC]M+Y>,L`?_j'E&8a;$_[$l`#r3f773^+fau(`@F3d.pFS_!C4e8>Y,]n"1#G)cbNL[]$3DbotU]*=b9K`#P4k?55_jT,]gsM[j#I]"sf@KNNa.Q#94hp>\R4^%@k`%kQZDcBt\ln/2jM!J1cj5[:(LhUVKh^oUDLaSM,1(5+>>dd5kO`_08OlfDEQI,G#Nls0^1r6\?5J1`/4h(''$`=NV8s*m8%EY8nt/pm_hi,se>lpM>uf0X_!Y2+N%Qlh6)Uu45]nmog@D(X7D"pJ7Bm^?605@,c),/>Hh2'=`'[fA##R\i,hq#Ad:,>"H$u6bENF_*E^#CiOm?h@(Q\-%A%4-1)*ac*(_"\[Nc6Y<-@h)U`1Hq!L?7]nbfV/TG41C81P_t$rGP6J]:us!.*'!h2-BdQq:&cEZFO6jp`e<_h`-P]Z+HkNKQKHhLA_ZUY(\\dH)$R$7C;]=V4Gns%)Z?!C/6mmbRiOKd4,3c*u+:7]PEIn7JD*"jitohSF<;$@Cm>.k(32XKa2/cISmXOL.?-lk)fPh*8/W7p=eU_]TgM0Q9+9JfVdaE)14#91bjU",RTb?8RaquCII8>hZ+`"P;H%@]0'";V!d7jK1?9NNffTrF7W`&Ng&e3MdLe+aUQ`5nI/YM>q+kb="s9T_OsI/fQQucCGc%$3uXf5^K26CcZ@^SS7rq-%hS9.k>\q1:"tLX`Ufe@WZ<6N3:+1]"\+]c7f+>q:+*rgCIVA(cb]Uc=P"?gf,'EYh1ee3CNRkIN)GTB7^CChoK&'Q&4$>N/\3;ocO^f9pu4GO-Vb5/3\h_Jj#GAO7Np.t-Cs0c^2o7$.3d(Gn2(";@T.U6iO2gS)"[@>GFi'QbG=Bn%r]30:e?Zg7h]!NDcn-n6V^jrV?V?p++:3t?""jO?rU`pXoj(lNcY^3b89?Ck^AO^%'k"7HTL%8A.;R`PA_HJ#fk+RC@neu;sAXL+#;?V7%V?XS9ShSXkp:tcK1Me,Dn(@oZfp\uV[F""C/Ib[9RW\G-0t1po$S\?d,3rW?AYO:(d.[nanYXKF>&#\hn*[nsGqCVu;RW+HarIX62J9#88]EI:S>Dc1oIP'Rqc;H7e$crR845Kqn[OMJ<.nGfn*Ad)fj/slYj7e@_Aj8]7&ol(+0%4K(oj*AAkG72cMA$POHJR5;"(M#/_V59/um^Ohqdl%i$HqH;CJS8rr'kloM&6?QA7DWuES]k7tC1.c;I\Br]8YX)Q7jKFhIRC99@TVb>CU[*ntW8@>];6K*$>/g.r8X*@S^#Ya>2T[>#f#K?pCr*.0mok_jpM,ti\`EJD9rE-if>G#1ms\_H`I:SW*tYW_S6MaXo+UMk-;)iR))9g8.hO=J[9D=/`M#.Z:P@[G?;[=mbHuNC.[r3hq!mh)c$%&G_6kt2:L(e$%lhTNFZ7<_m_>)U*B1=!qpXZl\P'*+9%H!nYEtd"^TP-?_<7>HSGU>am'p;=S9/Y7H>kUQ\S%_83,QQU[17n:.\4)d\ec$NpcI`,'MW!T0t.llpa>9iM-bLhn\mkP@i>:_h"7YgGbYK2;GD_V_k+:]'"sOSaqHZse3/9]VE.^8R*N.F)N`ct5pJ3m%TPjMPnO2cNabJfQf/_R?F2YL5CT1>(9Q:n_+)\#WR-ej]=#gnmb2QX`hL;?&J+d`N:H2rhF)-7#%m*B%#!BQg?F@pX$<6KTjD=Lii>BG%oqE.KnD9V.Non2.?Tk!MFel:nY*jLGJTgh5j!0SdG/&`r`b-:TL_Gqp:M^$45^c=bU2.WqMQbulE?]bO`hiT7D.//hf4]?Ji;VbOEP"fBk0H1^-SVAgtW]g'Q)*SBb<;G!%911dYQl]iqASs+^`\r'nYU7>@Rd9Xd@J]?/+l76>KYhnHlc#HS+l6J0pp6FX3@KuKY(3@iC+f&<-ejl!aWLINHL+:4(QZCCP#K4U17>sn3(FWI@qp.$2mrG5DL*-=#;Jk,P/nQ[f,*l-TE?#U-2nJ,j4&^2s]3#rR5A_I,ZrP61A!]/,6lD!BL%ebIctc_RG#B5Fh_VClqI;e:]pBA"2B9oRW(-\3OT^Ju%aJbF01Z,(pME1O1%5l`Rb>YAR,TmE,-6Y:W7Qa3jU'hbO2Y(3ckuT4mHtrO@Z5K_T6mSeG$Ne#&-QchD`biAD5CEAmg(d*GE5m&<:LG"V+SU`JC;H7-Iip@,nQktLl]fq!MlWZS#Kl*:qTG::rRD`S.noE7-ck2\uL1>9$YS/X)d8Bo[',q;XQQHk+K`O!EmP3V])^m]>j7esQ,"'2p50e&#[WO*nF[-5]kL#h48Yce3S`NTK#>^6`UW6-nT#3q;%qUiJA>8:&+*b581deg`^2kDF)3S$bEb>MD`&3FN4d"3.5iBGBG<[h.?re\F?Bp?$4OrFn>Coa!8I!^ncm64g_Mt#+UXOLQIfm_Fio,\F7Zk71kX[R6@Po=57(#1O6*K[_V%UDV4udfiDRYUB#MQEGGuD1'5&Vq]DgZbB)Y^;ZD5!O?2p8.,K86I!mQBgX,]cNqJ*_GM7D3RG.MpgqT-'Fh#Jo**]m4,ToRfISspoT[E/j<4V8FpsX\@]BZuikdNs,I6=;\OR8UTr^e9<]),.c3'u@oPVGd_eC_pC=E(.>E5CM9F+HC98sW*/=_m9k_HUd*bI84"8!cUWV91I>riA]\OE!.)GE)fnV(*>[A#ab:n/jnVnO=KIr,7ZA@`)Q^^E3PqZ9&r;9n*;9_]X`u?/kj%G2$6'fEsH/s.#P15^5"AFh<)/EoQaqd(USEgJhBt`;m^LhWFKg';Yk)!7MHHhL0Y%FG_A[@%L3&rd8@6U?]nmdrX$<.)cR"Z]!`3o"?)O#;t=%.p8(Y$XR*(gDVX/[pJY2Ul9@P?M7f]OVV$=i"j>/f%r0!,4RB+SPd0M$po-QX4$@X54Ro4iCO2g\'.$^CGgQ+fIC#OlgBTk^[a*H86c=RHWg;@d#I>pZVRCjUD%H[^NZY5f&-7n@'ecOVY&e:btO'9KVBXeI<-SKO9FoDBc&C4!&V>PZK1:r!QFIgD'o\/Z8QsA2aDbqNlS5`*(/M%[+9P_M7q0*j4@@:4gFhB3'j`a*25QK3^5,b01YW%$eCH&-GO4FGl2RPinr;`+GqnrM$feVVoO#Y1U_7B]aD`EZ'f5q,h>G)9t+3$"/A?_/7[UquV75-Vl;DR`7aTh@55P*2td#j[M0l$oM2U.t!=#Fib00&6>0qk;>+i/ZpF.@i87:,&U)#?8M`qPQV.#L'a61ZsTh:*!KjrkL`@t*$6cXHt0m$N9Xq!"ub*P+,6B`dH>4eEDrGe4<(%fKEGMlHnFQ>+cs>@o6F!Y[V0a+P8eFjh:8>B!Zp7h2b+F.C=-r\Y.FELo'aK>'Jpr%&'tNrIC\^3'"JtOXX/2iB;Jps/kZ&JM*#LTpeGdnfBrdXU,8-]AU%81g=>7oHPcM1S;0IBKGUr#^Mi7[a[&U\T$+W@+V1F;5l])^n*m\&[1i+Ua)j*].cpm=JKOdVj-0qL4I<<3YDMj?IYA$=t?7V.P1AnEamf:'Q.c&:XE4h0mhh/SKNE'ZEr6-lpk^;8V29ZTeS`mf9lF5%+&=+ZTDi6h:#k[t/t+u'0*V780`kblKW[FEsKdhSBbcXmd]G-^+&c$k9_V2.`P"`q3:FFq!):@0m[lX?cQ>k#P2tOE[/i@NVe^?UN_2UYVXjnL^DF@dQR2h5gMDhDI.!1&+%P[g\dE$J/s;BlQU4tUcW#d_?`7bBFNgC7G]SHfAf]P3s5Q^;)U1=^jaMX`po6$if4F@JaZZ6HZ=!Iq@t]N9uF1>s/"YAT^J.#[#u*lGPXR'-L6R6Qd2.i[W76:TaO5W"aL+P(FC'?*;H[DW,rX@t.4]6K(^(UYJsjr7P5Om4-34l@al4OQD[iU[CWMRa3oU_Mf]LaZ&6jpR!Yh<#1cV2%#Pf[NPchej&>mfj1],`QJ$!Pt0U]/#?.a0o7hEriYUKnk8i*8SMNU?srjOHb7/e[%c5W:@rek*GQ0j$p$JCbq8+9"=$P>>B\]dZ(T!UB1_Al&;5r+P(X+E#e'u8nWSAnO\UX)/08r3)B:5f`f8)op(?$n1dC6RKgK'Ni,kSE'iOq(;5i=?\g1;#2jnOXItunZA5Qts:-U*s@L8k-dJL>[)XVjO9p@-iR*VDu,?NM\;IJ6nCq2C/K*Ig+L3mHqr`1,ahtnbLLE9Bl,oE3.*g#\;Q)Hf,DJUV^h$7IR*Wf%AC-+Et[*umd_S[=%bKH:1qegVCq93WbA$fmkH']s,[i@s^iSbE4DoJs<`DTTD%WtUA7sUPHF\"AsJ_C:b8O],T5AmbtPe1*)"R!VHd%+Eaof;02nTZb3^AO%01'h:f!XIi.VPL;L?R$D>21:G<=RMb^kXi:S("i@]Ms!YLssJYPr;SG3gs/jgM:Uc:!18A1m#Nk,Acaaj`1Qu]Ts'5(>.euhNq-Jj0q'3@:Xq?o^oju76)glV]$%bGr";Pk0U0iF+j',O]!ehlDCB:m?S%roU;t#7CkG@Ca"(V\78^4lCC!C80X/s#^"oB\b=3^(mGWAcB4f5pocij&^KR;D\bdf%0eR@QO\6GpDQ[c8:>"(1bbI6^(OJbD"espQqi4QTk.QK$4[QnN]J_OV\AqhK5jWQJ:NclI3=Ubdih4TV9:F@1=5]N=u5KeHJZ3nd8:4(=G`M"pUh%DS5*m9X*;`VL.7Rl*.8!ZIM]F97l5>LA/HoNUc,k#7)n%`G(Mp3/3pc'sdB9(P^$c71RfomaLjsh`2c-^!jfP+Da9%"81guLd\!XoqG)s7G@,\g,rRUp>q]grk.RB`5E&,,Cj7\)X+lD=\MhW[t3b_3b]W\CgoJ7];Br8#)f"E:5iB>!Z:Y!\sdD$Xk7_B8KjIuf]($a*]:6!?Dp1K!HK[?[Wu1>ZdYgQC$!U5Of_F.VYb+@jOOldnD5J840CYSIks!iO+D40lu[mK6p^1oM8%bK_2HJD_fECZpl+E1-oU./6L='=Y5[RCqu&1*F=DHb4O?>/OuQ#h1NNFri>RDTkpPjV#hjSu8R$oc`?bm8apjdYXZ"]Pg9QH;hhhOJa^d+303X,P,S-VY9AN3l]Qt.FTE??9_\5FI=2=."-]AjY$OqTGO=s:dn@j8iKM]/\PGmL,R/KL,CMcF7ref/VD<7o&]/WBlL@C&@f%%9uI?UiOC7]-ZNs!1-8T"&71CJi'61NfRB\OBq4XL4h;BuLkfn2]LmD"bpn9!l+4'3^;ir14r#G.I2^f57-!\shiYH-VP[gFo7g:KcGlBFS4>T(-"V\9e$=a-V8!>ZCMGI9)#F9(IlJ"[YD?MD2ru[/#-jm:^n\eOXd"D\=AkHN_T"LfWu;>tgIcs8^Z#=3`AD7*s.00FpO5s5qdrI/^4_R<:`kno6:i$!+V6W"nX`,(X!nl[SS;PKr]Xj)8$c?jrBbADQAa?[Qb^IR;12e3e9_kiER[6l-DE+XW1,%DddDdLk.d^8H2k2p.C(>n=+\O9oY:*sl.`*We'J<=?'aYP.(LD8](22dQN%/lJZ9c`R6$<>]'[/r6VakY*q!$Ot<\fEn$eD?Ltudeja?LN*D-JKtP555gsYI_P1X;TlKYE_.^@Jd31S8UA0HnB^8RfV^iq>URmig1YN?<4o[7O9AaKL]\?us!M"&XY%@b7c3Siei(U$P97\<.VmC^/fg;&-AoM?9NgoZjXf,T2Ycq)0&k@\Pcs:cgsZ*WI5'];6m!-!hZQ`k-oX)5@9?=-#m!F'tM%"L`:DB&a-nM5r_T44_>.cOj.0,3cFag_rIl)u6EqI`:8EE,!KQiRX+I1/sJ9h2^dh@-("2)YG!N8^Q)/MLYW@U(C867TKs%e>/@B\UljWe%l%7o[EcebKQ#?Y(.2e[E9/73p3=JQWV3?SOtb7^W*"GcqN8F\DG(LGm@\40Zf*8M!YE:$K1;T%NUa*W$:nqc]$\XBC5T&AG`*=I=7Y%15s.GJs$K:N,la4f5>LHV,cZJuajVNAOG#.i?1I3.hqLMhum/KWI>$@:MC6FqqL+6ctFq&A;jb0n"+:B)9[5WP-\#C(E&rk597]&1#)Zj-XftP(Ir,/88VDlkuQ0[5o)(;0ecbqu>"mcAh-[H3F/BpeT75$mFHm^Uq$PPkET@N>1pI9\4\u_e1]769u;$6`J]A4Ku[fN;KMB7)Fnke3&Cj+d2?K*98%B%Wa-D@Yu2L1r6,\GA;>WlI])(dor'NJ:*RMdicuGq+Te7qVYP+#69VkGSdILi:.:fbOhamcCdZ&DZ'4;=OE+qO.F3J+XN.=C\d4&m4qh?M7`brZ8;:WYUC8Yg#O`lC#MFN`,slSPN$9`&3&QK9Qpg9]7Jia,Ma&(#a5uV[HL1oh>UEo.TLH$)E`JEnpX``fCg)qNP%B&N+lF5t$n-r-#!h,4-AW5Q77CA.#)+Xl1b_`76icEn:BKA$*Vh,5KdLug*YqZLQ.mGAM6p"DnHKscDb12/0]53!/5#cn-3*^-Q.?%s\Rrk39@[.bA;"+\6VoR+8\,F&J69&XeL=(HsF23CoVEo-rcV_=[7EE4)Y`CG3.gs'u(+g!GbIN)1M&k3P[0&UX2TK4bE'i<+.B%d9J\;#2@]++"K3MLQ8@t]-$*F.9FU&>(eNg*;e/^-2&B?8T8`t"4!UK=PE$OZnp@I\A^N2h=`beM0G&4A4U3nNTb@O&Km(OP^@pfLRfo/8iMj5VP?GB+U$U.n[1>6`Fhe7u9564K`XJ7W$l)*R6\m9)j")JGeW=;M6c608_L#1o8R;>GO&%QVC(QM[mC6mHKb=ETj;\)!JE6%3$R$^V5%hY[kIY'qLIaO:U$dI*CP.h/3E)I@al/X.[qGueGkCJc-6:1*-cROLYW37^[uO$GI0>B,mpmck)E4./2JRWN(7>h;I5>@D\3`o/M4[>^mNTp`3mYES:d`U*XR2u@=Am/_Ffg7RfNm/(5GMrG2k=eD%j3l>47b$!V6r\JRLnGF;j*.X?8D^[8+-\MI>kL1iA>Xh@d.na*88C(4H8."1%][>!$j1V,6]`h!t6&87@(1X#&/0oZ&p)P41UikXAFPX)@;?8f&_K:]QU%YK([IONpsBN^2BYcnK*&I40=F:;35jYZnREm(FTn"`u,ZE%@6aME][`]VcFfqMrpHAW#:WZo(TbGHnP&6h9a]8<'Q_6&bIfkeOsd($(7M(g#^VHk-Opnl:us+l(Hh"g%*P76)HF]VFjcIQE_:C4:W2?BAd.'EQhL?Jk(q!(j>3D(SI6?.`-F%('9Z8=?u'Ze)l>#ZmE>4E>g,CD0fKVVSf9`CXXo-#7D&5niN5l@8qWUICoZ&G&S^`n\!`<-(U%&Z\/fc3(4;;?>73CYctr3=f/Q_(=J]2/*,RiT#@c1ja8[2qT6:_X-[S=(0ORU`+Zf-(=mC6Fe'S!\a$\9C&#-('&AG(!EbE:j.ThZNS`)R@P_Bot[pubc9mdGdInq<`jcTH*Ym8/%4RmuoGsmK7bY^+7@WA!3^)=##rLVhOW7DC@VB;69Y:i$BbE[YuM/R!;*gjHgS>[">VtXRCQq%r4Ylc_f6l;u\maft8@-YYH(3THL_1:pES!8/#8ZZ:Y_:nG(5Vsu.V`6:)_e;>*n!<5crc1E:O)q(qEgeeR?gf'WF;tPkP2&Ag=0Z++$]#^p3iQ2TG[UtW`k8bh$kL&Mt]9gRRc!d*c(9i!0.pTp$V!k2e$OIR0QCPr<[,KOG&alXb7I8h<&j)?ftl!1%G?EH.RLqQDXBHbgXiukCiIpkk/0kLr-HqScD0P49YNpjO;L]0t3WF@Sm#3\#fa73T#3b!4$hkiFl$_+HF\,^p:9r,FWXi?5NHSJ&)_OSZ!hb<]-$&.N2<(lB*Xn$nPp#rACGpo&$W-g,"A40>32KU,Oplk*$?drUZ+pEruG_.!J`7nN8qh>T&SA"%)Xd!+$Vg\,?7dH=DDCN[8L<$u3b%dfhT]D2WGm)'G`-;(`k4[oB'HB\mTbJ%M5.!I``dh:5jPPJ\?9Gg'nBAK&2\0<$V1QpHm'&gZok6mc.t5EC@:rpNl)q9M'&FemKrp-I5O8iWFbR]AV`p;3t8<+Tb'kSXnA_@+<-KW\&VF.`n9[Pg):oCd=skNdmsH(J;>KOG]aHh_Gr^Er_=On:eU2*b]#gqTXqMN]t$SNP@A.=csR2o#igWuHOGk&Hmq=1WPtQln.0R`$l5akO;H'SYiA_6[':"fKF,QJHME:Q\dc[h51C3Kmd=flX*K>bl\ed>0gE.m%UsF>9ML@7;IHAm-:p3>F*X8/oLfn=V/kGkV'C#ID\/b\HQh?jN?*oti0U=70Vs5o@jWVc:>;eU70krqXD)ms0AEbT^X^%t8qBQ`Z"u]A"d)5cqUYrB*^KSp4MQhGRpZ[WA.k!YFYh4E.`G0/<*Tq4&8NCcg7Z%dq,rBOj*J5)+lC.K31;m\HL2YE^NTb.Tk1"Jp"O$o)_=\O7/jBJk5:k>aj-q-[iu)oNXjt6]PYBlEk`c+9L%D_`IaM/DPeB?m7>GkDe_GW6f&m3<(Fdm>_j8b.lTba;A>(b#t_-o9aE5J(4mds]&0iee'54@IV$mG+0[,g\FhU?1XJ]W]e?3L;V*qQP+P\dqaU\iK.ULrNcr;)2+\Y&]Y6+srbAN.2Zc(ZK(V+AU$sY<lAkg'cW/+u:Z7m09e^&B]K*o(rs/+Mm>/L&`8!RWZh_?KV13P?"TrUQDc[c\@]LJ:R@18Go(s4R2YqghV/]@fX<%i6puToP`hRG2Q,9*OAu7#FJ2fP<7Pe=kWTX1bqgJN$0@i3>Er)b5d8#=X^#.p8;X*7D$%!faK/%u[650/hZj)](#^??CVolH9?5H+9aUK+R%-Odlp7YT6Q9j%o(;B&ch5!e,dD^5HK9uJqL&$`Id]&7X5QAOeZMW>lglM;aG1^MXp3W+Pg,Ed,QK'l9T.sft7sI-c*Ql$"R$[$7K!FNumnie?ofN0gSo9Y>`"2^Dq:i7jqPiX5r[rGc((X@8JuI^&L;SAC)&cgngjGr9d/3;P>_`EJNgRa$4$"_bdL[)72\]M4`4qcjj8dW:poFp-Ta*tk3nQ+hf0#m2[Rd%jjkp?SX`!Bc:lGUiZ[:7,P=o&"[e^N:Gq4)1nf4WRqhSXhlGu$&<^^NDM!HB-D#:V50qZcWLs,$?_,2.3QE-J^"C#^3pJn9:Du#uWL8"/MqbR$<#C\=!_!Sl_^EV7Ic%%_.t]OLn=M*mECh]e&O,K$f_C`N@k6TKpQ>7=n\[rh:l40='Rj:Nop`-Q6sY7;?Q/GefLaQ^%_;0P"#)-tl=J[/&Fo=PZKkJGF=b!uZLG93lVgCDDWQOe%'!&EK:Ka[11Vf"6'sK[O"N^@A)G5#0`A+\UNR'L*+ups-D?`;*1\&Jgsaia1G\(fbfYiUm&]Kss#p.ZV2Zr-uY%LEQ&jj%Ke&d4bKbHlW$biJ3hEeBXQoO3>>"lSTXgNb%!UdXH9!b&/:C;dY&K'd_3RsYnE_EBPbkIO`#0pighTtT#]5:__+nnf$u-"FI_-#GX]HYf38^?>$a))XsI(eQ=YuP/i@:i!-3s9MRl(T1!=2K'.=K1MRqX<@d0F54n>>88L:b;8/$SA*[uGDFn"Y["^YB*CsZpsbcB"\!s.i8ni%M#lL4TIrOgqa+#i*LqeEq/r"!f*,Kh`1:I8L(*PBo:Ya>GZ&,5BV5a-Ae[o0t*1KIHtTN!6tW!=G0-T'KDB[4:i9%_RH`rWI:>YmS>3APK:C*5T]nK8l&/b-WQMh'0EsH42\J9olA1Z!b:MpG:!]kof,%T_DH6"o&UJ20?[GOCoBL%Vs[mmk3&lTV:Z-G=,(fL;+^WcVX>Ve<,aW='^#H>#=kWT4d`>J3$h7rIAJ#i2$+.<)R';u]gV>TeX>%XNB6t!FF7jr)]%W:Smj]ZF)C`TX!9DN=d7SA50"33dsoAL-Ve15iKl(OG,e&_]M='5'.#oZs&relT.oXfE_,ODX[i]POiKg1<:6:\rNU`K4sh`61Lpmjq8gpkchFWE6n1?"Y(7f1<);5\nc3.tU7k7U8U\m5`XjF>$dkI3ghi.0@$2;UtQL#gEJ%aa+MR:K-`ZufCe`8Fic<-8Yo46PDf*mWZErdI@T["j2Gb_I$Xkt[q:b29Q'lm.a/GTBR%'5#=m=c[MZ\el7Y_7'/E4`["h2:W(=UQtD6s-KLqc'Jp`r\_k\F9%s,-Qo05O_@3X`&4&"&r>=\>Cr`kJfi&f8/]r)aeTnh_kD*D/hb9.m--6L),uAR@]"_#JdoCX>j8BU'D,mtUiXT!65s`/fr$W.1M:0QW%!GMc2A\dqZa"l)p<#uJOD;jl9"KKM'OjL3_5CG\HNTLlcJoXf,b0m*"4mm9#oX+eqhV]@Cl,b?%af9^h'1Us%*$42`4*2o:P^8Eh:Y.GWZ@%`\4*f-:G.g1`?1Z913PlgJ)%?`o3<7&m72%I+s3E",D>0aCHY2;6RQ@?DGQ:/\S+E"oI/N&._g)a^Ns]).`mHhJIKGa$Ct&;:(03ercR&RL.73dGX#N87%OQ6!p[Z6^VuCRrDR\MK'1D)_+t#-g5A!!ahk_]\MFP/6P%U!"QOVBcD1+U6/1odR^.O655PLBu=.G)6Q2JP'2Am/5Tb0L*nCrErjBk;iK5F\@@8TSBJPsr"1LAb)!?4rP8K&)o'U09?n0T?reVs2SU6b0IA:5X3^Q^2mtn4T5LH"jhqlT:Q7m57kiPug+pAWk/@Q/bK&YX,dd2-A*u>0V4SLm);Fhl4V=]O\ojq"3^=dt4J=eC'"=5%W]CB5TMPZV>=$0n4oHH(b:TG7mL=m+S/.71:+<<^rg4JL'O+pr!uuGF%nc5:)*RAX:=PSGLY0:T!D,#hW\t$Z]i1S[Y>+,Bh'aW/p;KJS?M20mIarT=YlVNh4De#6MJ4Gpl!trV&-\7Li=b(5;)Jp@#0hR,\sYE$J4rZ^bW'`B+,kOkkO-&-\-`DkjAbn[>WhrNGp[T+Y'%5DKU!R)mAr9ggd&fRe0.@Y$?WmcWEpJm5pVa5Q_mp]lpoUg`-eWY%uAo`%*[^T@nXpj(?.SFsA9,tP5Y.#acD26iG/:d8tfq@hC??fRN"-_D,G+JIPNT5#h0np:L.:'j$3Q!!qiI(cM1Z!;Ok&Nj"bA@&'q3Z/M8*P15E\/EJrF=/]p;AqASW``:oZDS+&P;&"h#dM*2g%V+I0Y!n1g1*E2I:H!BgFHCs#cNulZ@jIiiMmW]]SsiF=\j$mcfY#W_Y.-tMncTfAM?W[JUUW6,8@NWOKRmfml[7ZZ-"qt>Zg(+N)\:FA(\df>4i"[@Ptam8)@_nqbNTs*,+[9mHY?I#PP1CHCX=KOIS,YhE@44K.[>$W:V72,0oXDrOkn2M9n\4ac7U1e4p.)'UH=Ck44?YS?9"b??2C&IESMX-=eMG$ims`,L,8Io?5Zm5lQSQRA,;4*Ht?Q#(_i;'J^_iA<,HVSFS>:0LOc*bMm6:<-KmGXJ[#qt&u_ppJ_KlT;rGe[=7/kTO>_P+P7SN+bZ,KC^maZgSB]AmXn(P4P/V;_[>-7Ph=>s2:`\6V$&p+r8LEioNSN!#<#%mWCW-ZVV2:6RIJWR=\p\#D]"cPb6UC$2Gh+4i3YkG][^4t#3TU#eq2'\C%qkLXWcO5H\5aWqli*>EB>8E1*#HI&[Gc2NaV00Sm:X*@([/Kd3_mQK'C!Bq^Y<4`kRC(S\TJI?p1;1585":,V;a-EuOEATP-#+Ols+AGMZD>2K_2Hnc/fG^l$S:\Ls%:F0`R[11HSY]cQ^k(hsnHQ8U"*`,NJc$iuE6slG"oU9egNE0]1G1YH53pL-s"c^F*4kT2N7VUU=h1t.I[W3W"lE9(aT/PT,"/^4[;aFk6iCue;RbDCkf?/W+#-Cj^lYWf"S3q\p3K9Uh-N?k$2i#3:O_m#C8<+b4FIN.H"N$S$M_["Eil6u-J-f'))l\RLhG@XRG8Ki4:7k^*%Eb0QlBVd7p;*PNkQM)sXHK^U+&q_U;B*JE>b.U2aekH&]cWU(K\a@cUFUB5Nj/&B?Fqcc`S7CRABJ2]tiG!abTRBLR=r!$-_gs%DEimjI]D%?Y4L&C`Y+s:mp1rSU_fo+TjOIYe$_?=g<#G9F$`XcCFj&h/4`"-ncppuB*Tp\P6hJiXTllr)8=f=4.6*#pk:1R>15EX?()&M>RIuq8_]Wf!4aOmdXJkPL7+engS95>VgUrlU`-c;rO\[nZeE4+@j7425Fl)uX>G8*:*S%HRNObU,PAq/g`1q1CqA5EWGjrZoRWU&;m(U48AMU+*>Vr6Q*i5bG*0CY>a7$jP^n&H"B=RF1o!.)Z2V#nuRG6S^gJ\jJ'phi[m6aR^YNQnCE?3ql2K\MjfDUq,%)GZV7$S;89hK4q`DkMc**hf;K[md?T?n&V24%cd821(f<'.T$INUM^eW637&b.!Q:S#GE)M80>8>5((#`F."Vd>H;H94^A)qI67UObA[Kp#]69..$WX$1*A;2dhBl:&OUp@:Jk-/otH\KL^2]?\:26Rq`;\i4G2s?2U6['MqVZ%5\bN0Lq9iH<]#]7tKpsq!=)DDSVSlAp:b2d:\Yi5Gi?8f)B:LUc02XW'*`%6Vb+oVPJ,8/An2$lf]TVM5f,(]Vb#tg9Kq0Y#gk/re7I!-=!:`$Z3"s:W%Xh0_o"cR!:!CUE3@T7!p^FM8mTK&iH3Hq,6*W$R5].[1f(F(dX4VU@*997iDlS9S>AuWZ684'pKb6ooG7YG#Y\9t/pY+D5@>Z,e33X'c&;-G\R!(:J@*AsLP#@tXJkV-X$q/u=EL_8H9Zaei=Iu7@6m2e/Jc*Eeu`(?GBqs3_MEj7?WQU0\sEAUIS*lGg6H`NgL_J]L/Y5)QrNs`M/6#h9srrO4aW]ACVICO.;OC4>2D@,\-ffp:k`VAVLmXpPa92Pr-GPUGWjlPn:LCm*;8))`q3eNmP++CA1i(noUi=\[(mhfhKc)c2HG&n\1#a%Z)5V*,hHi1hK@!8]n)Kb1eC;21*oX+I+)Vco<'*GHYG#V'g3+Fg]ht)*#;37@=W-65mem9MB#mj(3%AQCj&CRoc&DlJ@mj;K$+(loQMfMu3q$qVd%*V(_*nh`S4Ldu0"eD4V:i\5)2fVf-g/UL'$?%o[2D05D),WnYZ@*Y9l4CU4Xe'nQh8ZB6/%hCnL0$g+FrES.a_@#44GUV""X03;3G*f5RG1g,a<+p4ea?K>f.05i#C(?C"]CCIf+QE*jX)qmS2G#Y]nBgHokJU=NK#:ouLq)*I/bBE7dkT[JZ!]),0kJ9QJK-[t9KS-7h_*]aR!J;GNs*^;b+BTWs,Z0.`Tj84!HPRODi'a56`cs+0P.*ZO%_G]i5sF):IGKNLeDLj&'D9@NLUk>@Lu8u.YP8b7+%S!1").dHHrHc1s<@>Md_pB;"tU;3JY=3-Nejls_DmV>;*0gIP2#BF_SHUYsLaE^>FN,'+bOB6fr&34f'5*Aofh9VslO.Uh_`0eWQ3dNrkN!b;XAokP!5tK.1ZRr9&SnZ/2V5T3E?`L7br42!?jna/OnLehWlViROAp8Ga2rdNg*ugh*V`K'3;OR.5\S'6O?!T$^<4F8_pC5"JDK!VYn85aC3&jEJ,pTum8XLWKB1nTU=FQYtmd8NkSEEZR]L/C:$S"Ig?T]lS2J98B)L\KK^h/sR9J82XHM[NPdl6p1&;287+V3=rKOp-A!'V!O3D+9SLTilC2S/SW2KZBt9?3G=YEp`&@P4\Jsd7HD8"oM7*K"^&"0p%7Er4p"bCo&l:[e-_n866E&4+?"u%=MRO=GDrQ+mj5JnS+Hd=DF:q"K#:k;L>132:h0Gk=hhWOK7DWeP9[k'Ys+BCWGQu&PpM3%lGRG(g./,t0lh3)S%ug>FUTT!#AbuLlKO>\K!G91>lQ>W[%5tsCdbrPQ>55EiB+*f(<6c40AFh\_9BnV).%ZbntaZ[!XKa(Y:]sf@FL^!cY\'qFA8]8YU.-^*X*iRt?-25*9,?%JBp^TQX2#/B?'f>R7-\?]_f=Zm2E"fmZe3eJd,!a?oGO,/("R1q0SW.u_qg,AuZdPa5h\\bD3B;;/Z'U8hq22?7&"YB<7U,6(3J*+O4+.S?S-;jR\fT)3JMKN!6%&TZOTFG5S`\WbK,A!C/tigHeZPJ=f:o_s4"uts;P>O2TK3kl)KI99RI$is(@^;4:IIbMSl%l0iV'WfcZH1d4a/VDl;,7$LQtEC')=?doF-EA=s7Q;o<^`OoW"Z,,jT8-1g%j:66:i@Co1&q6,UY+*UdCtW:hQPh"aVQ_01oF>7`CreMW2&_.t^J?ka:h*jkbS+nh]G&Gse`+oGc]&\K3Z"1sRQj1i>U3j\RoOXl/2OC?hJEG$kZQ]cG.n4,gVb6MrJhPnd#D_k,N:ZGpX%G;die+PF[a/suhDapGQXjPGk)GqeW`(;[Q:$j:FP>X:@@2H"Tl6pFVS%n2K]`*B60GY]N[Gg..r6do'#!aO=.;5F/mIPsBc&sC-=(3JgLccQ:J8rE@*-']JEeQ6R(P0Vs3O:W%'klBe)JR`FlXYYT%PuQ>0pU1R1JA-n%1RP/YcL"hZd)_,mQ*Ar[e:*UIV/Ot_Z[CT5nXMV=c.XH/4S/jOG+:)4@9Jc-XXT9'TCkoT@247p+@2-@Wb4\Za7.]ceb=AtCZDSd]D=OfEX7CckB8+^-pZNE]"Xf62Oe]e6dGhlIQru;,uGqGj@iu\&B"`+1-+qKGk,YK.PP=BVd1-9bm!Eb?]XH&bJec?mlGlX"!__-(U_+UCW%"CX@sIXciuK69BAg#8*9#&'#^YUi5T&b9TQ[=el'cK6-Um:'D-9HgGG-WG<@QpNM/%A@]1R:'Fj#T@EVckg]t5@h\=prAFB1U02n5.cPhMf*Y>]T;@c')]eX+&D&\n1=!0/#g"N`i)e.cA/a%,NPAThF6uR`G&QX#(;+*iM:f/sP$;qU$cFSZRrKE?>+$M4dd"iTOZb/H12&O5KL5)@m6N9)d+UV5_mZ34b\t9h$ICc&h6_u[,2A^'+Ap_1K48)J0nFjuAotH)CF-rX7fnbqF'Jm3dKF%[1-cM#feG5X*DoraM*Fa_t73:C48^;.*csVug!@/"0H[@brW@FcU,QQ?GIJ`PPrSO2CBjcFI-W>OkX$Hh*&]cc2n-i6Mo&3FA1^,Sl&Aj/;$(GW2:b$*Ic6e']^qrL4_$>)'@C2:SY[fbJ-hfOC/;T5o8:MOj?(?AAEbQ&S80?;nUX2su7&W`TGdJQ_c&hbRj4ug15Xi,T%_hp*I?j=LKI14VUH_WZP%@VL<0B]=3;9$%+.+-&Qa(a)nQ7*lCYXoN$#oPChjMu9(T[V\C*Ne#fbfq$/Y-88.naI$'[>p8%ujt+j'kU32eU:3*:?Pa)JRt1)[J0[0#(asS?C+P"n!"Scej?j&GZAM=J,`,B8psPQG',W>1#\tj0)U2fJ7WNE`@'U.@KP):GfM$s4;`VqK*=Du19K(e+[u^i4!<]5A0bZ4fT;^_ch%BkR!t&jUl1%Mc#C&]'knT:.?3\d#c_,SXJ^eXo&@%#+="mj60pbFVnbAQ?/7FqTbZY2oGXNt"kQ)M%6Bcp?)e>/%].O7Eb"H+PXN:`i\D;+eiGkUj3N#LY#&H,8B!/^F!59fFE_%R2ZdAQGY./qPXuQ("S-];a83Xd(^LH)W[3`Q*\-5/u.f1<"H'l!k__"5oAqpCe5?0[VT;YH(i-IL)lSb"_ihYHE!.l8eoISX):I"HO>8f9_g,Fn,!d"p4U^R_V#]Ahhj"At*?LHb/gtgT#K[im=&Sp8Q^eVb"Cpf@_,iOu$Na?.lVu$#7Y^`C&$e4c!"56XNX333DIb"TWMFuV;`e!4unUn?jJdic\CbXX3RZ)&Kk&c"K-sJ,W`ocSI4b3im5\MY[%[>@0kkooYLN%A:PW95-.KSo.4lGi(q;_tm,X"iJId]Loq@JubaRWBVBT!c);2GqE0tJLQ6+F0E1P0[Pk[B4s-7Lj%PGmJC[t-oK?;*_FW&VfJJB8FWLgIdRS'L([cu]nm'6k:8170UK$,OCm=@/R]X>rJJW5tQ:5A+q0<5#.rEB[4,mMlu\L:m8!FTmZ=(2nVlRG$[#XHF:_W%ilRX4[u?OIJ>_iXl8Pbl5!)^(TBamsO0;WQn'6ZgL*0+,fmNRp[[mB\r0/8?e.F5o,9p^5n%.d8Ec?YP*WX,"N9!6B#HQ*$07ncFB-$@Gr[:l@A[.-aC#=a\,TU;j[W$8p@P];&R(6GtZhLM#l/4i!leA:D25fXH+.g*.kDdeZ_2=.-q'1(ckGM28V`*d.r@!,ZlfI.rIU9Kl*XtaM%'=+r`L^JuVh4]-n#H8!No-:[mK$4H8[[g0'*Rq2.rN:#@V!0K)6/9>NMXpN-Q+9kSYR:48li"#75CU.+pLQoAR$Hd$4s!/8dQR2qL00+4r1bm&],)GHj/VDgM5qErH]ee4=>f)HFM3\SsOSg&S,6ML#6s'I&!s/sYSnC,88'oNSRf^=^!'dO"H6=-dc]pTU,_r/:4]1rR7qg7g"G"4k\2-Z@&-b;/B-"F2FT\o%qp4B:mpF>S;?8,,C1!A"qMVP4+!$+sWj:6_&k"(++MMNS#m;?)<2)ooLm8\;"E"K9$VXC,=VN=lE#,/VJh2R!RBDpQ%L?PM*!?OGr;-R!$E-6lX:i=>oGq@$AH*C?%7&K8:16C19FG_HiWLeCg:uH._iiZ`:'MVML79r3C3*U;R_^H#%8BK'Cd?h/`L&,"Y&JG*c5@<[fHJ&ciIJE,gnhnF:3SP0NUT=XltjC(@)c6C6(+K`Rm,aMq*hPh8O2B!:@8$EW*^>E&rru:K;Q+mI)3iPkMAp'0T;iDSc;nh*h3[&0NJA-'7p^T`k'ER$+%E3Gi5LB&?)5pdhL>W7\Gi8kf6T`P=b@61Zt'%fAMSi1n&b+Ua()\n>NkjSj>&/OmE7I)"r]O;@.P>uO>uOM@4/C'b)u;>bNGN!/Q1X+&h`H:rmdYo#'\uVd.fAQ.h!Y_L^,n^61^R&1BOlj(T?1oYh<)%jrm5;@R(@:d:b?!8P(*:Os=7I)in"6PfrNY`)$Qr4^iTc_*C_\V:;M;4p2dn3';'e>\jC7^-eG5n9kNUfFl((m@KS7eu28o:%5JK?o27er*;\QY8GijKl@sunSI[Se;b-^EF$<`>e/T]Rf$,G>PX_FLHjd(]kl%CHm0C!d^Q%iGkmq1g2Wf8Z#BP8V_/59k6=f>:OOG35%02_1aA=SV@nS%E99(ZoU=);rOC+=qU2Vm_@iJB/leRX?N%_UoH6ZRj7B#`YcWP>?%nhG3L:*2E,E&.D0A44h8RTF/MMpB+q._pX'BB7,&IrWm96Q+*Nf^#ZMSj>SRoYRT^8apI]U_cVnTT&(l`c12r4>g&dFc(_n1J==>XS!\f(9p@+:=G=T:F.0q+3IPWO1,gm>]:%t^H3*2@'f8r`:BiA0D[oD"\#AddF]im+SD0Ggk0?24LI9`ZRjdX4P.d'35+QHl3*Z_oBM+_]b7b\2$<.`pm0's@O[?/XY@*sVHl5!1,Hu7ERarr7`4h$iplpMG5P!ar%1=2iJ.+c&/gR?mF'idT6#+96YGkYd_FEC22QD;&m'ib4c9-"l&j.i-?NpU&b-i.n6Fo?]Yg@1X]WF&s@H_EOZF;G[?TS:t50e@57)Uk:N+^9)&6bJ<;XJm3B0IV.`_j&+>Y8(#L*J!n:D@@EsW4ROV,iF(D^E20eW:!_!b)p-;(9LT0=&YljXdSS+LW#FVn)4?G*]p+R3M-Bls\#IlF@J7s(2nDd!VZC_C`_TrcJ>e)snm/c@ELGFl(I1'p!$+/=,#"YJ)#''*$8XjQt9Y["TKm&8D%9!s39ZCk?,=r>`E#0\5F'54I=Ptph^.]'^(L5n1M>JUK1po6YHIYt;q%Cq3#nm$c\4W>kSH$EcS_6N@m6l@\m[*F4&OUn<269$C8dMF&epV)nQDEQ>')5K>Xp%Dk*nd!nJ\tZ#_*6_m_1mmpRaq%PobKd"Yh/?;oBpJ;rD-o6c:hV#(diX0Og2m!('P7lBnG+saG&?s2C,NNK<9#!5enOla%1M>/pK4%Br1QTTA+Vh'g(rk4ps<1C.fYHLd"$*n%OU=E"%Z@LUQHBsQ-=i6?s<72_(mDQ#XK_44\R(`V\2B,e2"".6:@H\SdLp"dMZZtrEB^#J&5%4S09oO@:[e)%?f.O)p7bG\]L+?@%:=>n"*qhQR3;.,'aEU<"r5Li;&$(1QbQA^-%1Pq_/98rmn+DVka7!\"$Ib@6S-IKUTF/%L3U`_oPr+s#*&+4n%;AYc@+0%Ua>4^S]MN3-%Ci_9DQkoNE40KOSLgL:dn1EB9E^sEGM@o4_s`646/7s)(j.Ot/u6$u?KL%gjV2(LAci#I-7lTE$R<6%!fb*BjPX0A[nYUTWqCHN#+[aY$MjOaCE9J.P$M;X^qbAe+-&">p:85WRWK;%pN7?V6jS^"[TD=^VVimH%H@gR&+<`BC"RO-_.+b,0"j>NlhRUQD-rsdIR;#3BH!?Yf[Zn^dtl+LD+M%8R*;P2[Pjkp53gadQYY1NQ:;5^1]#TA0N`QA\Zl4K=Sp/q@]cumPW'!mM>)i7E!KM4%E4'&rFYjaLftR[l(P&k(/-A]*AYpdi$=D:-KP,06`_u\g^CZ8RZ%>A*D^tL:LMZS#:#F-U2C(c]^SK**mk:9in0-I;IP*m.Gfk(cN7M%9H+OQ0/i%`U*Ds\K\8+(bodpr#=Q&2G`C!fW?Ep2]L_#6%O8OrcoD).ZnZ):m+)hdJ_7]sk9_u%[Z0#m1+e.`/Ln!tN@^fr3sKpH'KtC^8/b.j<(1.i6g@>glT'E>R;d3`$Z[$GAnG7dbfkgh6j00K8lJ<4G6Zf@"bt3M5G5[e`m7S#gZP"7N3YcAs.^tgdiEb600J:W6!s-XQ(=es,:S*TC"=[X[PL+&gZrT1WKX:'?TfaX-WD(J=R)pa?=s"BDHLQTs,=RJ)&0$&(92WaE40edtdq^!+!ee4c77hi9<6/4-(fZIaIE0-6e4bT^G7L##ei`K@Q4%]-5M<*O]W,\HVSbN&"6m$*)KJH:C;N*/8pmaNhIOg,PLoRRE-%tepaA^[@_mkQ#;"%)OgR$.1NC("36XjM9f313"o\Z_4mDc1$\Z=aQEQ:(E-PBqr-p#)?3kN1L'\7$Rcu5r,['#]J@+'Ze`I0JH*?D[&;6*tuH>llk.)b6ScijkU4UTkkm$6_h9*_Idk([B"VY>1"0Xh#c\[%].L"&*bhWjBLZ&_1l?u!I$H9G1f@7F*[_IJnbi91d^r3e/pqMEIKe*'KWC@f0d#lA0&gSPIh72aoebQ0?^AP!jhMdh&cQ'!Ume_.KE>lSqeq.)`OdK'e1?Xbp"(@5/[?T'Ul>'j/t/hKN29`)7?f")JT5"&P4YB%]V,'NfN?gn\2+7`"92hR'"Q2m)E8bVuUC.\:rtj.cbEWNPtN@Vi@?/ErW4:ECFDXO.M,+p:\T.5]OC43:5tVA10N=?'7)/#KT7)4,9+FF\)4'M\Kh2Na7bs$;L\aj;;>C^/m\-Psf7Di:I,I,gB9F_ctf^KCBF0J=1"YT6I-kIOX%Y;iD`2T/]@W)e'Y/m-h.B\;V$(YU^=I`iTM]\HN>c7p2cLD`(\=NUr5Tqd`Jdsk!F1/Xs>9iT,b(F+qU#OjpEnF2b]5BdY!E;jZP?Bkdu$Yg1,AHYWIRj6psF5/[11n*6C^hnZ.=:,hRl^+pSqG$rO(lX,o^'?UiYZ?SBro=KqLAPGHYVJd%uOL84+'[ThYu:g''5?N7Y'?_(t&Rl1$Q-iZ_ErAVY%>u(34N$#S0jE7GT>qVGS>W__VlY2L6%iA;SYe5n4jfd3/QG>T?Z5B2(X;qpj%VkP!28MP,BFf%Ntq*)AT2;NT8e`LrL*\%;,ZR5(?s0>?Oj;V\Q9rbtVK.3uab;88_fHi6rf,OJ%6PE2O7J0MIE:lbec<]dP&J^^e[C_e0YQDZ.:iV:k3SE7L6%T,1?].jkH:[`&_B[pEP=Vg03sh!]B0#7NQmo7fe(o[fE7P$QN2+I8UkNAOnRDK1i.&k`Y':7QE&cDf@VS?J6^74G7ngX3N=N(K7hWPf6@0$PA2N?&(#[rPSk<@i?`HFjA]'Q8(&k%P6U">a!9odC":c/_77U!dm&#?kN("u^@>WR;Mhc2nmF;.9=1=S;1dTbI_G"SK#7i2%ncd15:F1BXB$kjKYU*q-XL5;\6_Pis=pci%`%Jh=_S"b_XfF\*jF,M2EQ=QCTiUjoE6Z9.E]Ak5d\;fP15/qt'#h_ue&C@"&-=j"%N_TrX/@iiq--VGd7b%RYPH0H,];V.OjRCh`OMLne-TKDRsM:N]oG7^=(_)R5H`6L,J0%R.oD6I]l&*SL^gXDe,>g\I?LUgR1KgjNhjO9uot?]$K>f*:NL$h6C_I^.m#)+P_nTS@OQ#Q$SFD3*a,e5Ni5tYPRX&%o1hj[6i?]q%GA.]qQ=:d??'Te98kK5\N@=O:DDgW*sm9#nS?nKLl=m(pIKc,Th.ll.?7$Ln57gpM3(i,SLcE`)Q&(Z&2BO*@(n.#AT+([R!4kG)jG!j&)hR&L-Y44ZWVup!=2OQ/Bb`ILmi^$_J>-Ad.2#SM)^3e3%q?7Qe8cCVDTVVbE;P"iG-bP7&O.,WqQ[4Wa>hM*re2:4YiG6;)J0&7mQ>B-n%kJm2_%?u^al"ose3_nX\7@@CV]BU5egbs4-+sh"ofX+]%Ci-G:Mc"6?2Q4!"UMYoW<^gP&agTsPr3s3L'a[ejr"9P-tBsEHFJ7uUbp@f3#A.hrH+mQj(qnSr3d>l0`G&$QmBM536S\l/E>&m#=8c4&L.?4&.ES.)!.P5#Z:mXjSsbJ$Ui>bg#_9M9I:W'Ddqm(pbl4YBOA4J\J@['tL'n\iiQIZI^RS>&>La3\n7PVsr91Yf>(lcJV)>laWWSHmU)/ZgVU:-%#D75Fud=`Z"KI:&L3YVhAM&IN3m)5tCp`.@Xflh;H-%E28'&"1IaP?*(@K>]t'"=(:-;&Y>5Z7&.B.2UrVLP?A\2AJ@^F8';XPWO[,5Tpu,@Y(9MJ?IfNZ+7A\YJ\<@nCRY8Qq';J5]QCn>oC^=e?[i)I-4MKOT9@JrnqlAcKbK_SP8(.^7\U(g6:;MdnSP;SHfN`>U4:0/+$:geQOfa)=Sk9t\r-45+I@00eI^FOmq4S>/@%r#aq[FN.=tif.X[h7+XpgldRZ&hjT?lGjHnltNMMKYgGTI*08nlPOE*\gjBtY,mUkB"d0b8`IM!K]1Csj@:)1[8@$'u[On!\JT6Dc\3ICA;iE/B9GQsdYu5S)it+HR]kOWksPRH#&;%VICoftUFeKb3D*lV0_0-9aADkpYb2CU]"38nS18r*!OMc(=OI<8$?W?narMS85qE`fBtrRYtE=C0&\"Boba&-Vrg&qYaYHQ!%rN?1B'f*o1[c@#>e6V!!4S6/WS[>*ft)#4(p79tDKTHE,h%`MB"g'CRYjQHL+&'JLBO-WILFpZsCJ#"+'`s2q&LZKWI>?G'O=*CWMD#-cF9S>BbT=gL%*GB"*JDJ)e!0>u;c!p2RX+3dFskS7+QjF@,$>'Om>&@0j&MqCFUlfnLo8a-RVU6J_\$LJMp$^6=KtEcg,n3#p7XMg"r#/Afl>0(#I>p[MMQqPC4?+^l67">50GX2>OMQDOuE!P<1if&d\RU4/!!VC%9r$&\LV9I`"JYSeZ+U58kAT-Dhb8=>VI`)bE)SZII?2ElkRQ'X"2b[BO/7]6o_H,1+3uc5VT149J[,k&%-j+R^!7cOf(#6]jg7Lld+=h<%LKIcD4k>ttCfkDt+BY&l\$liN5Brk,/Tg]7lY$T^*YDnLaVCdTULQ2.]]\]gX.i;p%I:Ti$T3o3oJ]oR`[M!j,u9\X;%k.RWAV;UGS_87AYpA,&'\-WmfEpG]ru0H^:JQ5>I0XY^D2R#=7WNX,]D=hFb,(N^I/[B*q>?Qdu!,-2SBF!qjXX=F*6uW8@k$Z"2O>d0`<+P2Yr_a`pE5tlU"t7pq"c?j[n"&:A,tf=>>n('/E0(]`_PqUfaaq,ptC[8uDBF4M6R7+BG9)=[B,F(M]S:+:cVP+f/14e`=qnP'u1,3LDUH]cJ_X9`+Ku-L.!7p9h,mMQ9;T=V@ag=\#llBZC?#bF4WU1dTo;IT_'oF=!7oV+MXt&l((GA(c9CNptoB)"#Ik*>3CP#oPq(rppOi!2VEe!aN8;!bP[Q88KE=+J,5A'J)@/$06;b:j@1.E.]9u&P@lQePgF"VKA4::VVUpqt$M++^327qHpFc'_f_Wg%j4Rk$1+M'N^9dZcL`r-jM;oc3`?,KV7B@cgbs/48XRreJ05Q=TF*]&eG=<6m3AuKa%52U[pK\(X_IW;E>g#r)8c=J9OM<=C`+u>0I[SjJQu>EOqpaQ!N48bn<)41O9VV$b4!j7ZIPrOf>ob7.YuTGD?rW*aO>ZKV@bD,B$f*,\K$Gi[H<4g=5*lT\O9b0j)@rR>M-hg^9]A,L&DiW+pEZR!h%=BS-Qqm.EMNRaX;&KC@F>HkF3Mf0OSTJ-OJ]es_B.-N>*7^N2GDPZWgbhYGZS+i0e'mh8AU2Z9,p78GL\AF$M3JsdBC8JL\)bfj1?`!X?6ru:^l7e)TInrcu>OW8BP9J]iRV^.L&2i`e=C^R^%/4?u=N1Pl^W8k7=,A$ZbDpr#6r29AiIop[m67J,_l371C=-7D76W4RU7-V:??)'RF4q)BjZOl'5!Y"3(p^HQ(i96S3OJgc'[&OAsX#oJa<_4WJZY2DiIiKh8q4)-]CS/u'!`^1RU$t""nV1[o13l='GeAiS):OOsJD)+h3Fl_R<">iq$fZ/!:i^91/i4Qb>6)-ETn/2BiR5BXCkT3`*hnt4anTk1E(d0;o[B45so'32P-4&Y60'AY_TQ3'0&]_Q&9g_iP=2/@-`9aNIsOVjOA@/-l6k]*?a)B`;iZd_$D8dXAVYSdrr)dF<2]qNX-K<$Xl.:jf%@N=I'-d7:ne[LBRa%e+ul=&UR;L(K*c\gU=@Tui3A2/0>"s>;(Ajh&^BgrC\]"!l`n=3>34=M-M*!5eS;1?b[<'66](T#pDS3=LHs,9@aP*V+le>mMRH33R"A1U8=Sf;T0-ar-6*Q2>K1@/JN.9(EQZKF=4m1+fH1cqm%^9ZG#Q5nN'.,34gA+EEFlnkSda_c6<8A<_"*A0ZJ]1I&=O;t2,]$me#&Jl[QafWa+&Ge6oRaeP?*tUQoL`#B4f*\bVgG@%,nsaf"$1I>?L.QMoI;oJ^=`KKkbUtUD.NP`,aK.pP3AZre3(8ALJUd;[:Zc`;LNM2UUra1EFpL$2<.`$D%SX;`4S2%?gtorqLUo^V;-cKbI^#97NuNaX[Pl@<0aLc>MRPL(ps^H`?A'T]+dPh[I^oV4`%@=ZU@5@#0nl-AForGeTO]Bb/#S:tZN1h^lGqVP9[ZAq'Z471>tRL'UlHQRFnVp[N`>aXDQrf=r<1D>^rGc<6,(_U-lSUS]$'`#Z0QjQ]Se:ul0RLqhjB6&8*j-oMorUf9E@,!g[%bfm"LB8!lg!]%0KO>?iO^E/ULo$IHRJ`-poK,m3e#RV.&'pscf"`Z_\Fo%[6E-&/:B8"/R4-)r"T6a(\&BPTm47)r_W-:Dk-6YLC.!]1S\`KT_\)?!:h+\ZL6b[MN@l>`6E:Q)g'B1aibYa.kV_ia$d*5McY=#1hGJ$k6R*sS63eMqMPaauX"N3\FB=Ha7kX2XDktH`:&nqGQg7bcF`s#;$ZZIq'MB1Jm>%SeRBG,Ve;AQQO1uK@j@NK%U=ZPW4oc*`hU`t11loE3"c8pe3B5!ct!(^kXlEG.AN_o,LI`1pB?oQsPF=(u6gUQbW`!Bg#^E=K[8&:R=m3[UoD`':(U?b3FBa.NuO?DN`@;bns]sdO&=@!8O_c,W<-N1Ab)==A]#OIZH`XQ?:.rkj.21Ugi@./(P[kC20>3L>oJi$o)6UI;>F",B9(`X!_ZO.mbdJWs_n$1d1I7=,3K-2:rM3#-!820:YMBk*J%"o'm'g%V6J]6\kh4WtWON]Q^gj"Su_T()aM\6%(BNhiA/;=cm3*)69KA&X-QqLQHI)R)=g\B]R,7MGEEcqd@+W0cF&jW2O+iJIhSkdV2-UU80=T*2-C#T;J65C/pFAq)Un\+iccieW\MRT&B(d%MK=ck\I%QJFt#meUD-oTN'2ZmU<;;dOY+ASgDT*.(K[<_G3'3[H7/Xq37"q`!r#a'X/TM4tn0K=AA>:a0B$%UgYf*B\*I1:bW6?2uGSK6!&:!JXCW-b0K(^skF!^Rs,A05R:%g1\An%he-i:3P&@m9>QF>nG)O0S&,`#o->pduV#+l0/P'@)e\>g)\?R\bpWk.5*JV(-.Z7Au"E:_G:KjaN.$12LGsMLgEGP[`UtM3dACpTck=La5Po>^'fBHe]kLteJTo;Ak"!KP,T5ETtVT(1.=cl<16]N(7(CfO-ID)IZ5bM56fo1gnjkZS@qIM\r^tR$g?mM?5&^;1a>%33Th5e)Bp`/O!gH0(mXk+ooJ8!2nkkRgdSjr+L@6C]9)"9K%Xk7r)+)0dmtFL'+:.9uUOO868r(P6&%[DNs-V8J39fcTj@LKTg>B"YQ!EF(#nS,cPaO2XM(=7g$"Nd7H1g,ajDn+tAkCl+G2=5m`7BnXsN81*8e*NNC*O#8@FM"dBr-(q$K+BXSW_k:7+4=3qF("CtfD:02"ZfjVVT9kfM@+67*'+BNL1lS-pap!uAiqI-8pX?uf3!@Y/*LT5`G*0%7'U(N8<@Kn7)b%!.^/nN'(J-^We#Sp*"#(EW>8g\:b`[&GWaBD<0&&Y9mKhd:Fh$AioQ[d^%:IkVFot-KgAYQY^@&Jh;&[Gl[0*"/d>/4uYd>%qh/RHVflCaA'##iccT!SMZCNckqlhF?9kHn).=2X"ZgV]2I'E10H10aI&6'2Wb^^(7/-I"i]C3A=DNH*3Em*/qSUP"K@Xa(Hbg)X:'Q@#!7R$)NVFPf)Wfl9T^TeDF8t6fpYfQUZ:6+^I]46$^AhT?E[+N1QW`5oO&&DB('fh(4]=cRq^R\HD3%pK8hbu-9?o?:[M90'HnY$e/;\_N!!bp\JON@W`4$ti57X(i8.!WLj:-?@dUi48I:MKsJXXFB3_](q?aH\IiShG/ef(62f*QM>qQ&)a'%e/%U'2BW<6TGlqS@%@k'I:Fe\HuDm/V_q4=@a-i,U@unWjHJP$qZdI0`3@od5+,P:PGs4SOZE'@,k7eXU`nCP>]Y!#-^+bd"&N;@C2HO1M8g<`($o!oZW+^6*s16:'IOhB.hoL\DEL#d]RSoAD4/"Vqp)k@Y;ep"aH@0_YLtZW0Eh]9p@T/re&M`tAS^Ud%>_B4Fl/&C]8+YP*+A^_9d=$_mF3qsTn/?JuN5Qas)(C.kn#go)c&>n!"-e"JeO2>9>Q`pGTQ`mC_VOgH?_E%Of8L]ucg>V1`YL*6@6/!PhcUD:,HIOX`5G'O.Q#r3OMVf'Uf)j^%&*LOPGFu@u.Ui4\':-#uj*C8>ikkJl&,k%[)K6j+c4?lZr%G,kG#4JK2`p)Bmnfo?R;\%.(T2&(blLZ@D[!*1TOr,DKb>JV.VIj-aoHZ=4ni]6#1)/m3R!8[o7Yi`k$A%JFA7:S^''0H7^'*QfYj::mR;snfC_dl2Pdt@^m?\CLeFad>Q&?M&U`EOd(qTb'kSWLJ2m9>3L,)2Zd$*k^=n4>P!Z*je*F1pddf@h*IHmqhgQ;][-P)SUu.]=6##1"#h\Vrt2;EOKQ'jBMi\[DrkkcFY#+]XigGsYS@R3jNd5KM/i\SqE9PV1_9lmeE@gLmgf:$pgN5(0o\a@#N&*>2=mDRS-Gc,OO^(XqnZjAR,2Wu+C#>aE5;Los#XT:^`Bnr`lqYu3@pNSsY7O8PZ>9t08P]n.UM40#9ULI8n4C'_:i/10PgJ4D[[,1,d)I`&3ROj5Ro9U72OOrKZur)uR'og=N9>u!gG:j-<%R"Rftr&rfdP:1_#D%D4;ShTf[G4*[LTpg27-KBDa-A[*GHKa>!Rc)oXiQrqA8jen$:UnR"]4A3&$UtCFT.`fG+sg0N/m;q[N&chPhPDQQkba9\Eb?;!AR$25fI>4TP<$jh1?5ROn!]A+WEhm@m+D]as(G1jhQ*-S'F"7A8#lW_)0Hb*kB3mYq?L[e=3O!XQDFSaG,Km*hb7j1h3eJ[\>RUTbW6RhI<9REL4V**dZJo+-!b\CX`"OcUj8g*C*DTjkrQb$cMXLp`ge%rnC::>p]N4>(Pbhk$PFWf9Fo53LgE.M;4XO*t)0O<0`/9F'V)B;\L`$Tq8*O9/K,9/`TkO[S@5s8E[(,hCGP8k/P0T/dY;(1db!L:%BQ5o%uGpSo6K,@UE-d'opPkYP!6-%_UA?;a=IA8s.,[>c2s4s0\PD-5r,l-B/Jr"G2k:h).SW.fft/ReR"6@*o5Cm<&;oW!Q_Un;hQdMk\a#]<6CN?Y;"DrRjcAT(7>))%OrlfhdV7@.$R$'-n@nB_NR8a@ZV%R3BNnr3:H;@EURu(BtCYt1)j1:7OLg$AEuZ8%#du[dpOkk%LQ%N+n]UaS/pZ*FpNQ>A[r\?"jn!'GTY7_'L/ur[RG6Q5TpCu#ZVhT`*K(?E#loYMIW2.lZ55sp?P+`#!TH4hsGYE9t5>`)btnB&:S8.>HaMB6%K7a:.a%30s4(ON"uE>1]U0!7%tA^Q(_$6UJ#.!A*)2W+r2J/=]/+[`0@P/G#Mtj8d^G`eBNebTL4YG9-%-A@Nf2HOFmti$-rDSE:8D((j`^4eL?=rDI]$_j$:*_8-58'g3gIY@E>i^Xm*DtgYB0\=PHDN`W?\dOCSR*;o"!AB:/k$J:[TH3BqeEG.h:3JZu#t^.RS8QY08opR"tQa$Ci"hVI:ed+.'f&H1CV*F),[3$hAmYiUd]Z6e"+'q,;%K1S)O.L!5+5Zq5=Z3YdQ99O1f4Vp=,XW+)U+h!a,XN!j^@0b_n;;4=@82=&>BgNs*YC1-'A$8lGUi/IX.:n6X\Xa@]T8?8l*\G=tHH'%G(@K:>(T3GF1?6;&g`IJ:gFU@7!FQ_D4_^._&dch8Ki@],B8QAH%=CK*.A?kQe1Q)tODc#IWDjAT@k=;1t-,XQ8HpW-j#!RuTNA4ES5K<.C]7"2VAogO2_^*N2Io1dd%-9?h=fpLH"O`?\Gs!nF/,A)QL#o.E'E#o[)'H4M;,qtnI/4bMa)H7:6g.3[bh]k`.nahj;i)b4aSFdmC1^7T^V6S%Cui6WK[@djquC@e5ed`:n#Y9W]u9\d.Sfhg-C-4bB-!.O]cCjN^G.[ZnaOVnBZ+ODbWKi:YbI)UF?CG4Bt`on/U*t$)4g9Q]$]0AWn^o\7NL/Ip,WIG677;P,%u/MYd5Q:E3LL`1d,m^KbVb:$5j^laq&':4X3Nt5L/<7(2\H\\MmohV[sn>4M]6drF1?I\+H0eOiA7.A,`:dCGu&8HMWg7M#2U/.OBSiO6RZ%6l!iGJ52p9MC&Ze7!M(jOiYD>&R!:dd8"gO6XmcF5Sb@p5:f3A@4\'JpGrTV^7<-cCoKE/MLV/YKGXQpp^,"09L&)JX//%OMG9?l,>$r#haXPC)tD4jr\,)V<"GA_VCQW?=K%#U9q[)'?'N-t=_^]3GC^%qfZkW<5e(PlS$&!\ltC/.+*#0E@iK"plKj1%GQWkS>=uc;4V1>$s`X7+ogQOu3AEG*OG>Q'e?u9D:tpRgk(FR=;bo92^QI/-R4/5nISZ`'f225nL:o!nPJ&b%=!Y0uS[u6t$HJL._e/YRF'6/D2NC'D4AN]%TfcN(rlH&^;dVkP1^\/^;T#iF^75jIu0le(.(-dB'C/02OU%E&a\k(;B>'coo9H_atd)C2j][#-Xj3'SP1$rm!(NcgN#<>H,&pMi0@^0nXh,a34NFIq-E`!V)O/<5>_VHF!='ZL;a=bVt;3ADeUYS7e0"NkJ)l(.T%7fuH[H9uV$_8H3:C-=H$+5+YF5;`>sB7Bfj4Ti:O&D]1Llbpop@EF7,C)_hh0SgR)H:,[L9Qp#>3Y7dO$bdS`rN\``jnDFGHI"*11/?gu%87?jj]90U-!(_8dT/_B<7rX2$UX](_gL$+@unA4Ni>mtL+d=4l6rMf`eO!#6%MSIW'b,ee>HkoR8&i8C0*/#g"m7=,QnXh!5SrZ#M8)tcT1;)=9]$>&e]3Gm>RB5?U*VD>W;.#$mYi^7E5p^<7^]1dVBV1XH8b%HQ>RoB6LC48o80SA=At=DRW>7RVedfdOK+=.D?PLP;9LZCt&nPBdm1gR+oSb/XoroDdM`E2,+a!p??at6dr0L-!7T"[Oca9-sHN8[r6W$ejZ$D;U&?&P,heBMVHOj&diAfB$*$gH0:?dN?fBCZ*(BLW3i[".SBIg[C3ZS1IN0>WMMpZbAA21O%47394Tq`CRV;f;V&df[[/pSUop[p_FQ/o_iOU@p-6+@kFJMq=5Na.Ko,[t'NnE&iP6W?5<98dau&VTVKUc7.r(_8ZLlmd":3!)Bt8K]Pa826tmbo4bNVD9`Mo5p7/k*EQXfr!L>Xa&F.<=&p4*\]L(@Nm.95W>T7#`5hYTiJ??%cIs]@M]abW(&&%;6cseB%6V@mAj;Z)-+"FXOa>ND\qXRnnaQ?7:o_l[2Wjt'1nk&(,Q_p).q<6R?hS,8OglKLF]/aCBbjJueP8Au<4*MX,5@m^cH+]#r]Un,I"._83F9Y#MU(`8C9jNOH)'DKbJbdS:qfu(ggODj!<"!RPa]?n-&\-kcVFmOl5G8um%<]PHOLYa49@AY*;l#M3ii'LMr8pd(WNSiel^[_k$*T3TK=YfQNn[:fF9=3g)$WP\GVF`d0S.MCQ7ri*4SudQiY;stTcO_,Q<5TgVLkjLWQfWYdjgjj"qX5C$9CeEa9qU5B-9IGZH>\nVH?A4,gYCXtO!8:leGVt%:iP"2gRiUbcWE_).8hX,PHc.^h7FTMG-'hgj0W5e?;F.[KHr)7=0:f2S'4@:H0W2oSW@>`:*pQ`_tF;_9^fY(H/))kQM+e!1.%,n7'tsR>1?ao@8?&bB:!V/S8`l@f<876@Be(OKp!k>X-_M[%F]6dgHPmf@=Z;oOAhkMNO=t%/+%,u1`\KL&<^Qr*<\XpcihtP[.0,5T[PK\bqP0nljigu)7cL`TVAg;C=0"7(Q:VY"nQu+%j#T.(M]s4Cgpb2$t_@>7(#QX_GL]gea%>Oe(^qTQSaA&,(d<+e$uM'G:H.!e;F+Zrc,uf7CPBU^A,Z6<^DK6kGAFe]-7M*oT&PK`9uXAr-'_ZTERZ\q;!b7jIAm'?$Osufhi3qg#HmXpLEUY?Pq`:!)\J+^;M^6:7_]FrHd(d_rCSud*KZi!F1Z'o7c9e_AaOgPlmO:g"4fhB<3m!M1uUi)hrkM&Dln:s]__,k:Y8_Dj0t3.LC23.$#\+1"L(5@9rl$4YS2j2^SAKq=PDEUu+^$ApA]JuW<:LjG:'4T37UXFSF-dmN)2[*,]^I$I,4Ws1iK[>0L7#I>5WN]ccZ.,5)0i;t02SW.ciRYj(!7rGR6j:NJO.5AFMh;7//RbC'ob1>CUbU=OH56ce2b5&?YrBec4*?.'H%Tn7\pk9N<+\>kMho!YtCDq%rcm2U%:A[p]prpX9VZJVIIJhZS(Z$!\DugnCktj&ia#ThouK*I:+j^`59L'm+Fd+[9CIsi8V]'$.prUlFfUuRs-=2Qs&C>1&TIN6!)"mjt^fK^Y=2;qN=4joCKSXa4hGBg/Zq(/>&_>oT/>oH\)9!LDlg:,J=cl%Mf5q6FCK(Sm[Zl4d?$-'6LA_T"&sH!f:iY1*=Ir(Kj%^,S=Pk5Vl+g3m+"lY&pMtCM7:NG^9kL_jqAYbs\L-0^/WEW7OY"*lS/3)+!.LjeL9JM5d1`F#C$CFDLX*Bnm'lb]2qqT`Oq[6a%GGk>mo$mu!T6\?*9E7rV#.&l]W-em`s0aKe#Ce&Yg,>t+[+I03je]F>:eApPi;igA>-9nNJDL/h@#'(5(3dTuL63=7\lH!TOE]:!PgQCQ`NY*Pq(RQX2\Wo`G.+rE7-0b[Cj)W"K"6K)7c"kZ7%j1Dq!@N,W!1Tj,]Xgk6:b:fHbGB\7TES]IMbJBWE9mTj+L;n1?m%NJ9]Bf^*+X!HiD(SmbY-.JFf\*B9fX!?OLdb^)MS;HqDHqPk[slqQ-"#(`VB/NTp<='.+iQ39O^i(V#9;e$o=$1=N"O@'(1)-(ZK.'0AZDmLk?;ZbN_^:50;qOnQri(:=#;AaZB1"G+KL8GbshO32Vp`$Hcn20a$q/)g4TG_Zjgo"aE"oFs%2sge-@P&CjXg@lb:+^OL.Tk'_:QTH.$QF&ZM%.Qc8*j@eODCM'Wt1'b_QS\`>#lE+'4+#a]W`6W=Lp,pIrFM/B]35bX!:"c4):cTIM'GXCM6REe`*PJ$:7(_%$M7KH)70f!:^$"YCV!0e6bgVS7=X(LnDHqQC?(X^!;^dL_FFH%$\$c]N3i+X;1bO`*fIWC84+"a;LWtjWXFOS@.CVJJd7RP40oF,?-Kb!>h`5GCmJAY)e,;KV.F^j-*>IhA@-/Wj'(QLX`IR8G-lVTR&@$,)$#Ucd"/"i@73qF!D%l0=TW?A9E;`!QI"4+kFHV*@][J>8)I`TSf+K4M%k-"/D[`j@)<`I9@_E4#f+7b:QT)eU_#^@8d?3,JK#7)A;Ae(o-pL:7\N>KR(%r2`7B@/L+>=bEYRP:,WJGCn[c,B1<;H?*lf!(L'QXq_T8QCU.?_56R"@[5E?&^3(TL&&Y@LGqJdp/\ErT:Dc<<5^tNDS]e&)Tl0#ph)[(3ga<0a['c95aegqX>>+)U5nE9RZY5ClC>7e:pZCPHGcBa]n&7H_-6;eht9p;)2hPerAerLjXUH):&@RO0OC;<,M)2N$p&O*NR>!5fg#W8_mOHO.=#Fn+H#PS#pHMQ.rlbi=J)dsPLOP_i@hs5LLbDV-qh%p[SX-[':N(._.-3/<Tr/1T=Ha&iU,hO7G)\fXM4i$6H4c?SkPH1Xk#Z.-8V0HL@NTa@F+RI"#k\HDhg$+L(2G4ZY@+C7V7'274n]L<@Xe4,Z0;UMclHi$HcIB+nhLd5!VXV\eB'kfE4`rD\PT$?n[lQL^3@"MF%:Y,XjC27nL*7=0Z.\63i>OiIgR,_P#Qob`IPi:c1!>TR*/-k]Z?CN$MqGh67_aOq<`UlS>&qj?4=4^Sq'N7:b6fQjM!E6C)^U4bXmO_s3uURea4'A`Hb9mBTMd`;Mmr:AjpTF>.,KSYZmJ-::C>*b$2)!d2oriZ%O+8i``Zl#7SY3dGDbH9rJU!_G)TVdW-[Ts0kmdT'-FOG.q^Ei*"$Q$=;K'ab]+#3h:6TGE;T=2njnE(Q8oKL.A@EUsH(5W+o,")u1C%'pZYZAL6$;T6QKjo.:X*#/hMG_%`;YdTRn!AHfJ*GU`Ub).LNg1r>FPO[po:.([8pQoMrV2T$^G#fo"mUe>4*@Q%d7K6%?&O!\F0>dCG5ZV*PO!Fue2l*XfZUM;DcRqnkCd8XB4)jZJC[u4N!o'Ohi@7lhXQ0LYu+Me[r[>(nJK.&.QN5C9]6<5YUP)QY#P3-209UtRl3Qgl_@m[u\1!=-Gd)KSEFh;?BWCCl^^YB>6LkNcCc.&(]6=n)O.UsAM%h+Gg]dnkaQk%Y;[f!G1gdQG/e)pNj[!2Kia:NgW*K\X_)>csX"C#SoZX,pX-46?*8PYi3rV4ni&Pkb*_ZL/U]0"<\*%5K:c3B'lt)e4d_3%Ecc?*ps-U.ClC!l%?q?Tqf.B!VChnbl[WTGs-69m_K?l(%RZ^bX;qVqkE]#Wf3XG%`'D;4"?BrHbQc0`2lt5lV(r@D,8%o#ijc\KJ8;_3ZK2]!g&/(ofqJ#BTJ?ukaTGPc68"2?*b1h`G)+c6-;3n)-aGsNo6>%U5sW$UPuLkuit#Wj'dB4%[_&@>ie5bCQ!e=KuIC:AkO7f'<%l_qKq,plP2[=TX2er1!QdbpL^AF)8Af`&kdT%Ke[5*e*m>V474eL\S_?,n881L7QkGb#C.Ojo"i/Z\_lIB!UARr]SElh[)<:@B\R+S2%!qT\.P"@s@:5->f9j:"t!s#=qP1.6[tU3_"@/ft$PrlDdSJ/$+:iKHR(BZ&YC>20oP?+Gq9r?;T+s1>fL_;3K\@k1C3Jaq?4+R/5PV:0r"7%':<;RdEEO$er(5ScJnV*%WqS'/A:OFi_LjVl2&lr2[KZoU!1dcb9FE4p!R\E(<7j*S3=Qf78CB#TX?_,"8fKp;*@&*A6l@:-0,:'WI9=9@>G0mV3IL\]1H9U/1\=>Adoi/iE5km`V!l]d,;L(g/:c\k9*jfn.PPgj^5hKI@:]s0K",^7H$NX"!<1ac1lT5F);BDrJ5_gq-LI+rs`e/in2OdQNZ04>7'?E.khp?i$mDr(l!ViJdNr%SK\i22OJXEYES'fm&:pCU=Y]I"b^!:0dk=VG3@r5th/OcipDl'-nEBJq;25jmmHl`$'?63P+Fte.`9!'Os"TZJ=.q5C/#aC25_qk:!F2>]b("D2/@.X-iRHc+fkR5#.rOb4U0b1O@3og>FE)TGoX6f"EK_Qos_3i'D!EOf+US//5`fBMh@kjj6L.M.@6a9W8M:p+MY]Dg7+gha-EE'I>b2X/:$Wn4'6+2V8e]L07D,u][LZ=8#Xoo04nCD%9YEk'.Qm<82UR`$]i+Cn.BS\CAWWIBaq";D`#n*H\CkS&%=O5po&RW%;X_0,)9md9!+&tfZc6;[kre;OrK,SZC8cR?A9JTGe3VB)?l2U0[fQZ8R6*M"hl.Wd9WmA?eYG0U#46hFrPg)UHEdAkT`R>&X!_A[eerVreP:'R\s2?%1L7)iRoedkktlqHZ@4bBkP@1G".I:k5iOlC<)L*t_D)ahWEgn%.FlrlcKHr4_Za9o`@AjIBRnH9M?f>TN06&'IghaF/+]-;C:A?1F%1N\UM(S'\KXC6J)FGs,_\O+='*)Pk_U;['U,85d4\cRqo@3)gdBj1;67P@G+K;+!BsJccR.T_a.I"uGlj<(klu;jb5Lt@_Ud-(B6apsmb*0OnW\lE@ZWR%r2LP]5qQO!'78q9cQ:hQ6QL6_4enrs&]6-%!_%JUL&1Kei/;"X$2$.V+tm>ThD(GJP=Di^YPQuNI@E+7=fgu;R>msihX_lu"<.:f'ULtggi5,%1G^:PQ0[!g#:;]\hn9c2)=>E0f69oVQ`F1Rg\9$.lOQVa&UX#:70L?m=s:]a[JPS18W@d&-4lQ9a+0Fc;n:u7rj2N-6(sH-XPg`_9n<$kLp.TF;<4EjMMf:eb+&)-D0EV+@LA%+CaEUa,Gcms+d#JKr@i[LQ$gqF=sJMUF0i:i%,@j8pf<7?%2!_iNu$VkQj'^p`,VPF8Y5j"2j57_KKB?e)"V11Y-59^=uHMDL>:UH\g2\9<9`(b)1'#-&mgq`J2f[.>@q''(Rh/';M0hWpV4]96N,V"cP,7'*2ALkiULa=Gu-3?fPU$=O$2nDD6Lp9F#_:!-q/,2+Cig$80EA>Sb^iL,KS.:D[48oO5?\&2DMFd?"q!ZopYY5a:LZSVUWZbPX+Uq6HP5%,.ERL]EOECX_fpp;E/W40GTdi>"L]i+YDlOgqo1HCo"&4l;98\A2ZAbs0hSR7+Joa\cF-[ZO4)G9&@_/WI7;)ro?`>=P@+++*8rJjG4!7Ic5MJK[_C0bV>8j[#:BB5+u7DD[(:`O:Q)cZV>!0kml6P%9M2mH!(^BCEF"nDNJm;UC7p!T9oP.m&G(K4',C@oq>noO]u!*uHC=._*UDNUAPP9uS!B5-`ET+==DW&>38a@9XpJ*Odoql+6D$!?VJ])c9=%ep9&$=Y&O=(qpW\LAdoS^$7N$507d%ObG_,[HGu;KX&/IQ3LLLI`C$;:0o,AM[T8FrOL.Sr5M^Q*Qin?UYg$^"1K*F'A4:_8]'sfnW$HKWHgq$fPiYbFh#j9#TZg1i3`+]GT/Y+S\;6LR`%`.?8*19-=Dm2)3Zh,=VFdJTq*/!4[h'tVJ.,,'0`Q\C2)nRaM=_%_]W9_C#XH"$7Y.tJniRj&td>diuVTrnFdn4h_j.5Qq]$a=(PAp^nH=SAGG);6Y_-]]N7bW,%58ZmIIti;ap^>VR[u]l'poSTM1Ki7RgVG4Zf60M)*rl9M,eRq$S2B+$1G=3-T*W\9>ZVj\=ROP%3WJr,C&5i*1G7f#EA_+CJ'Z7nfF,D"=6=^8I_2T[!s@cR*RbI2dQ^^/dTn.PK6V;@Q#@Hm'\ZM6Z5$2%Y@#P^tuB>P9(f8JHgc`Dq$EI9!bE.B(uI[]LKZg=Y.iCO"U2k..ISJ5Hkm$AH7qW!O<\!eK)?a9b-DkLo%UhL'utK%\fCh+^:!W*L(FH:61"Zh8Fpi`7UQj5JQ$_%[ke$8\.as[,g.>ZU'9>rAJ>@Y.H=+,Sh8$t;1!g.G0"t0'.^:h(8GW6>X%1uJ::I;iPfQ3;B?G(4&<^K.Mp%kuISJ^iQGktapHg,5[6k.*_1P&Qn8n'>\!R`$E_"RK7:t:,IJ3lW3=NEC!TQ\[BJSLT`5%8#!!gEk_AsNge6A=?3"@LZa!%?oV-B3r9uL3h_3C/mM2n]8^8mgCTB$@]]:TA@knL^gX%JAc$)_3Pj:"XmDRFu;?>LeDDi7lm+t&+m*)EN=EJ)R2.N#"5;9+QOtS:G]ALbA;pHJdP)806%J']A:VaPd^dhMCs#_>?+jP+V1ujT@7f]V-HpN35hf*;&sTW49Znj3-'M;F-IY[./CCG_1/fX-1t!)g?+T<':0hN_l,uqYFQ9!?)9En'^O21*PP#+h$@W;J]b$7""(ncCB264JhY1m.$Egc#"h_0!2:US6XaaH7T*_'OAQrr,o:?J6KK>B&RnIB=ghOCugok-?2$SP,uBXr8&a]%_p\Jf!.W>/-jERn.%3Cr,>#1"rZ?3GS7&/-&L(XG@=:]EoEtS?.6-E_iUs#+Ve0\Z%at+RF4XYn]ODk`l)dfF!ASh->bXp=GBq/5mCjG2,8PQ_V!G)lRj?8$i-(l@RPh_ittPhFg5R)OD,8`+;p5[qgH.(Er(%FSEE!m*TDq=[_,9RJl6fJda&jmBVo>EOEj9L:U3n&KCRo?SL"*bnrWW#3amjk4"4W,65?'c;%^l<_dbDMQS(qnl&63lcB,PZcJF_!(=L,h[fsiY%m:Or,2dE^l4Fkh),.ujE7+L2(?:,/2Pq%9'.jS^$+.*J'[Z(In$KnV9-I Ju@5!s[[*0S6aM_O3P%Q:Ml5#IlfU#XfOa%%;R;Tg[9I"%H[p]E#hsQruM=.\\ZHq?T-4kSQ(05*C=::P>h+0K=Q0^Ik,aA`$k;mkqIhR\-Y$`rLH`ns?1(T$\r2igYV*X?UdkH[ff>S3DOPPJQs09%8Qg:McBn4Ua$mrI:`5`SjdS0/kS743d`:gMi1R1@9aZHZbjS>I]T8Fbc_j"?B(W-4f#1LYXmTbPj\6*40ZJGG!='n"M\RuE`'2(@Tkr.\_8gUYcNE.5^>XJF]aunL\WL4Q+W#lO,aa'ki_C6b%h:a^cR4=M0oJB5#@+qYsSXbA/U=B(#%,euZR0Vj;`(,1p$ZBqX*a]u8\F]V_AO_4M'GuD+hEnQUP(8PC1DmjeMfP5CPb_%Sdr2pHhfoouZl*iHmZ=aV'V$'b-"YHFEZJ%s.![@snZ&L?80IWTE7'Kn_,`7aeV?3E_"u\-p+;kGR@<'suC?k3Q[+O)2=\D@j"7q6ZqT:S1&.jH=M/WYf&<`b;Q=?#6@O7IRC8OJN'/M);RPJTYPbaUWWZrDg!2Z!dN>QKRR'Nh5;&Y\M9hAo1J[R(@YKGGaD'YOCD)sfi[*]mLC'K3HWe>-P/83ai77g%=8iC:&S,)gt$H`#od+?M)0p*,%'"ibc+TbIA0M+XsCA\>I>K8b$)@o1,GXU`I5S8P^J=a\N4`(b+"4@0p`!S%EKN-L/mF#%0dB-J/2-[I?\uSUAG,D5sAui#fZYIi-\)W&8FHb-6@j;9RAj+s:[*li)JNG;4hZW](6&M%!9;\#J.$P#?Wue6LFUj0XVBUX:U?b43#]f@8O9gaU/:gqA&;SgX5I@&NXD!KIVkFP`PeY+tE$`))^('b)ZZ;o`KV65E^NsK_P\jus,sSSr>G@cQn>Fpg0G]5=Rp\q*fJujmfd&q/rOu4%pS`Q=INIK`T(^Wb/LKWl`5=]@&`Q.$%*l9bH`GO9/`Csa$k3A##o.NWUc7qu$n(E'aT/1r1_^07cE%mp58Qi6$RjsAq%]9@%$(-&!t:`>mDSU70u[0bc>6Wt-j+tmC3poKUf+B)Id#ZY3MXa2oX]PhQ=jgM]3Wf=/bp??>K7,(eCWZj;8W?\DNJ`X2d:Cs^oOEbOcmd]=L;"m3]+M_Me!l?"W?qp:/+ef/P&`F99,S?1DaVZ:+V!u5@FV1``TpAOd-SR5bis%9#S=r5R6GX9c%NMeWKom!7LDCN^'#IPf9ZdHHXU:2",aXod'+3G1;NgHI`Bs`,7regeA^ka2"bal.Z#ucc0aiQ_<$aUX%Z"B\hZ.j_%>Xsh[(OD2)X?U'lldJS8Qmu^rf5MPdjTbQQU1Hr_0%uRuj7Bk<@$sNuT]#s"P6Br5>5m:;LW2\<^#L*H(8.k44e6")#n%.'G`;oJeT,:)D45uY%I$Wb@MSGlGG^ga#<)a-;=_E03a&8DG/fm6uT1P`]Ld%'!AYi&0Shp>[%\Lh]chg+_Z26-A[-!NNBgL5=c/bat8`-ce5(>h<1"1GLXN?26,X4bj_b2bGg7\)$'Mr"_>5r9^KeOVnF5oNo0m:T:@%WA(#^n7&A4A*]ISWL\P"%fm]RIQ4aTuB#[q?$e>]LEi\]d\%%2"eBM7rIBX:R'XSTU-<)c,J])3rjE)4R_PN+eLfoVcmAYS"![RcNOB6WdkqAl5Th/HH.G=0`hkK9?KqX&C$-`XaE[l#hT.f:ThjKs,,)C?C$'eo(_@N]12@b"LpERphklmgWO9>_'.g=K]\QXE-&n&p'a!,Z!4+.X!jFAT-"Ue6gU=KSh5[VXW8,slNADiWV6:`i9tAK;XAY?]ZYX?QB!$*bBWoY&hFhc:Q;&YSlLZGJSif.;+bSJcYD'=?L,"eC<@2m\^2$NJbT7!J+ZHXk4tJ1="cNa5'd3k%HMpB3!A>]dlQA`N."X^G9lQ4DD$$6CUJ^@TSXkuX#@CfnIH>6VW`O@DdUB.?.\bu=]]A-#H@/0RZ"a9X&M'ZPl?in+L@5RjM&iDc!f]^Nj<*H2Vf_uq!9/:rQ#8R0JVW&SVg?L127,nm3D`ekeUo6p5\oh&[]#J--r>,*QcG@1TgT;@S:'6q$T0;t^(Ei.Ql2P^T8Y+p.d8'S)Q;_$9%6(g&spVI`,;VFc=PT+0Y'!)d"'oY^Bc?rA)qDsf*=58.WPNYXtp/.1=Faut4#=t^.R'SI"tGFMLj`,U=I;7o:n#+)^9p>s_U4#=9*1:J+FVC%P!c\iP.XIR+)$+o.-_3`H@TJ`&cIQfQhaq0AbE'bC#l^h6\>.L/L3*183S+V^=/A4[t#"h%1Y8WoFW9oO?bQn9R_ACRI_d"bh;hQ7o0(t>W:6:F,8*F#15db)_2_>^.JBV*(MOQ@o6;55:;+ma'a2f$rD`=]LLD'cSFhMTh&9n5Vf8rBDag>OmM3p6*1:E0Z$'=f03lo*eKEEFI#a%_ZfJK/hiIoPJg5Zh,+E^F;R'O*tX!GA8p,9kaH,@LX6oUT=(52_1*#Hj-j?mH"CkLmtU7RdF(U6"&dY95$FE)em6%Wd$dL>]A?.3^$i?.<6'4h&c[Ds4%$/u&Q^'kFnM#+7mFUa^&(ip!is&3",AiBU!JgMhf8iQ;TRgtT,TR)_o;LH\a"6Uj[++P#@:46c>pr]O[Hs:_^e,@$%pp#pJ_"')_O>MHJf7P$sau>_6OPXD3O"^QOJ-X:d%!]`)!i`A6IT8i5JDJoE.mW)jT+oe`1/dhf$gj9q(Ak+-A0RU;?c@e+AkD+_[eWd^m5]lS80caYITS#9#)=5Mc_u4eQ\e6!qP[qD4M0f?nT2d$!C/7-mCDUYMg6[UaTO6F\e*QT;,pUDKaR8mB+(5?of%aW8)"4pft&C7Tb)r"*+q(ClpH1^6@/XB3Y>$P*5XX!qK0MeFW=e&]Dac3Ia:6pe93R>X(:5(,NaPfPgUX/6^-YkpHM::PJ8P6DVjI;sWbisY72DG5g#9)t1[3X09-cM45CR&)K!1J&M%E&n4j<)17?4'%KJ"Zre^`.%jTEn9,ke[_HYV)uMpTE*&=[arQY=`/i%b16#_g2"9_K>mY6#qn8TkZQ3-gRh4*aHdXbm,^,8!&;.&s/$IP"Z_Lj,6,PLbGaq>Y4$/UC2_b<7B/pC`$44\16G7Lj2L0E[s\"qkMJ-qroi0e_,rUD0AM?T.$Y$t,@.*Z(n'`C%+W*"mWCEgOW![t'9C.OpD[Jl?2:+jfMlDgBUmeqW74=A%]\&b,rgmBQ#)%@JY03TacIIr"Wp93:^Y\>m"NVaI0!f[u6Hhm\h/=-!j>K@/0#4-;<2..iiUmX&F2G4uX!Q61mi5rqad+_%h>':"EmP;.+omO]`.LV=*JjOK5rHhph^^GYm<,J-N(ipr!ICK"hfp]&6NGis0ckk"Z7Fq]5k_cH-4Lb/BJ/]$C$/#FP3SNJQ'CB'pIiY[NLlM6sMZ*"t"bnKDh\eYMcC>Jm=7.%7d$J7cO,C#I4_!1_?WK=QVXdrs2ZL^[^SOH8#L]U-a-5XM9dG1pXihSV\YOjnSV6><3U)^B[kq&G?)bjIY?#RLNT0L0oe&seHO$B$!fYk'BrR?/Vd%^R6PLFg5BG,dY'6U:j&V&lg(&NS,=kLn>#Sam:DY0B=67Rr<]@NKcf+=()3J7jkaLBrD2%M:)k-4<0Qi*bJ]%ufFo]>otm6lsSN8u^).1[^%^O-GNN`;,Al4>NYr!*1W>Ip_QHfW#g%62iZKfs6=+O,0;i+d!KH7DW%?d#*G5>RAne!\[+]m*WmD:YVl+kN[^25O\PEhleZ)'i(XYKODJIitc.1'&MZl!ZZ"BBJ3o_Ua;<[Z#U*o3t[MbBf)=].9e._d-g@!QgY=edKHjp:3Lu$Tt,frB3,$&-Y)dObe00I#.qa"Nf9mj`V\?IM@1N6;!pk=;LHUC;(BrAKEMS!@#euIr419VjEaF^pB6jl-=DK47PW"+a8"gVU;YZ?>-Z*tZS+#?-gW2k`mg+B%VNcQ/Z+r'D-q@%PdF>o:7]cZ*3A\gf+*Jq9NKV57sV1Hi*7DX+QVU.PHggT!YIH]DApI.IVoof-u+GOH;oq\a[nOtS#$^f0hmS8\u,"G6`0V>P&t'G5F4/cDrfi\mZ^X!IlZmk4!IL4'iU>(UlI9qmEY]AmK\.O,WH]?1u!onXbuTM%9SMulP5JX4bc:t3KSa[)a,(m#@D"!e=,fM[i$9U[6%;b0Oa,fB9ObN`FnfrDaI!8KhuL`S73%O[,/lIe$0hHu&)SAqdd65aW2&CRZ,V*O\WVhLNLY-ki<-VqDKSq`s^Lkll;L_Mh3eRtgbg4hYtD&Ji`ST.BN*:.oriKgfAJ?/lTTgNVBn^e^1XEGRp+?O'n\6b6Ro)1`gkgn%JT?hqE&g4X=[k9YY5q(4C42UG4Q+#GE8T44DI<=D7d'BsHL2n1ZCXkFqQ6g$Xi+?INL[`.p7NhnDA@Hb._V$?1a;Duj0JNWb.l:o>.:KpCAI&T'5m4qkgs*4l)AOZf1R"k-,$PId@58tZ.?*=?*e5*bfl80F"l&3^pE"sWB(U>Sqh\Y"J"rgSq@NgjKT`<%$j6o+bLJc0I?t>fSJK'_Zg0FRtRU(fr:L/AAKW?k:k2&3DkY^o*PspCP:Um!Yc"gACV?=6.Mm_B1PaX$,Y[nXFc"S%>070R8>jg(->tJ9et[i"8Yk;kFeR8"6`/8#eD;)lMUd?I@6R:Hn`@J7-K8YD2SbrSB]]"E$R\s$RGfRl%L8Q%U$B%fopH/Tot:K>`A7A?==Y0ZZB_X7&?Y4:AN)X&BY>$L#IcA7c_LF]4#$7$t5Wm>?Se+_@s3(],fhJd2?MZRZ*YJVc$(R-MgE3811:?Lp=@a\Bn:$2#nbDPi1/GRl)CcO*H(Zq+p)&?sh8=\P?;:8!QCbX2B3!Fh1W8m!!)$>;/Qi$!n*Z9]=a%4s[D:Vcp)_+3hbac;0%QP1#G&uAT$D?Wk\0Yn?!HY5Y!EW*fW8:r%a,";kO&;!%pPUKB3&:C)cH2R%pSfO*29SIVEGO.S:H%GD^gY\qT?qDIPLqnWe6jY'QP"lCE9=d5hf8_m*9fI$6&X2g9Uf(D5rDDD6U1r+K'"f%M5V9ZR8;+W1:'CEm"e7^8]=PV"D![Z!eW<'^Xu-`tK!K`3QbpQ1nt8[EN(Be*35W?E)o&bZV[S[Ff_f&3"-QEWl+#+lP#E"@d-D!K\#N$@"Os"h8QiLc_%Y'H@m5C7#kAk>GiJ_00c-@2$E-?u^a:?M8Zc6Ugq4D_bBs"9_[(*#Y4#Y:aVSrdEQKZ:O#`"!I-fLSp5Fts7GJ0G=@L^+FH_OnWfFn#;Dp&!_)aoL<$PIe7XC;nLLYM\k1ToT[QI2r"7F$d=qmqcH]^F"WpK-pSlQfT`A\C0bUNG*[0r1sV7C[(kX)#28DGKT%;&`o<)A>];(A2R6Mof_p:JWW$ir*VpUVY'*'ndLY?7%FK.>WhhbmQ*fnc6kp:s&GH]u:R`N'k*5[:0u7O$#!hDA0N661O*eC-pH/;6\,b;'JY8ENY6W+^6IPbd&(h;Z6mu`55Un`a!"K:/'ZE.0J+X&QjT")@-jg$=snc+:_jU1bZ&o18749oVG]a9Eb#@]V8/53'-I]CN.f$W^g5Z2K*4Qg";-Rr(.$6ar("R7$p)<9?u_hZK85,UKlp$0V1:B]-tJ*-,pqrQ@W0/k"B+pgeIUbL,L)5tjiQ0RC^JP_7h4$/D`3C\Wce!/KrDbX!=9miZO%2='\$Qq.hcUNBn[mK1DQ_97b_U08?3"`#G6HIV/R?+=Tl/L/Lq7Q!ECG>6kpKAXGDB_c'#t@V(UlL`6&A0[7kIM$RS`Y(:+Q):b#/_Pa4YiAkJj9X9&qQ=>ZfX+J],qJ0GS!/$l-27*5Ur!K98nW/3(jgpF&d/p77m9FePFT9qgI@OWbQMRi_%?:l*QYJpq4ca"/PU@I_'9&XB/LBLh'n8N?SLG5\^sG4E>2d\l^&8DeYhN-uK/_:/2;1B]0o?__ee=md8@dl;JJ^bH6o9#L*StQL]X[:@?H4GfQV$d`q;T?oSTD#,F%6<8A3B:OD_MV3\M]3Dl(,1_A`qfc*=qG.1>p!%S^Whguk#`<4\eUdruC*g&h,+lHCs,gbd0Y->ET0,Gr^k;q[mMaRV9NmkaHNN%)'e*8P(m1)Fbs4'Rqq1RE\.hP:?YXP;?><@'h]B=M!F>BCSd'c,f'&gV15;b&"TJoYncOPWlTu9StFU=U?eg/I3NK"%ln21SDq[c$E:=bsXIV=`9'jd>39Sb\k$[f4\fW*4.]%)in65'qGij_aT2UfaM\_SYf%IIG0a%EFlVZ%S;M'SRsu\WG`S@R3pdE9-FeLqh)9B9>gkp-j\P/fF@[guE,Q2e4Q5<%m!+W>@gP;#`W(j?U@3[6J'XkL;)+.s?3h=0*APoh*[g!G6W+))EZl60mR"Tb(b_8g@VG^Kc9KVY2pB8m>e(OG[O39^=a4=PHTp*-=JW>gP671"M3R$Q@IlM(oG0F-ZJ`)7.Alsf?k'9)s.6;rPcjT4tVi)1f(#93Q"g$XVfZ4R_pR*4oETrRe+kbG!h2P(f$i'#1%[f&#DV?-1HlO&o:"'aR?m\Y$\b2WH3kX8DPrMDkcm1dZ4(WPB4V8kbndh@\jk.T2G->?6n_j!]H?n(7VkGud.3U]`'"?-c5(Y=?:DJ>1M\cuJXYIHDlRF38!FJokMCr(!8/8U,fnr\-HW,T#[a03ZdXNTGq)T#kr?:7H7E:^L@t:f8d+(:=`GU\mdHL)'dK$7M0pS^F&O7HYE,LPlEWoJ6.6="mT3:6QSPHp&)GqU<:6V,h;;rWZfMs!r$K:KkBn]QgZ")gQRQeDWI&4>:IesY(*9.U0TM`"e+F`cMCllqh90.^2ZDTeW,8=*\am/;O2Yl+WO6)ahhDI++j`pHE91KQ^afbR.`t7:k<:\Db-tmf;_<"YF>iXSec?%g[<0,%f(cC?`1^2V[]G*7X_jkiQ:197hE9\GPALn6/.egP@=d"0*642_[WXioR"H[N\^u3u3/V"F@]M/dU^PL8t-H,J#_c\c^8h;thqOrWR@.aP(8?!6EsP9!78>g&oq%&3AWD)="X=in,8EFE7LT8MmW'Q9)Q+P`-i&H!d1-PMK1>kmG\VXf`:j3)3A=2tsJ6,I>?e7.3moa?V:LQZs2Zm?E9'\APefK3.W1ENb>8B9ieQc/4Q@Ir9s_c]iHCk9c?l2-Fg3amMES)52XPp3=.=F+nqZ5LN+D).$%i&X@ogBKBc(btB=]2fklO\7brm5]p5+/DS-'=,SH)jOO*%'q*&_J9h+MP@c13QHAZq<r_.r@sh2W=Eqkn6m2WXS&U_CZSmCR_#mf$j!=(slg'\*Gq2SrWY^$AHEm-m1&dOINZJT';HL(R]I8-BL$7e49>G__ptjUJWU;CnhWl$<^r,X5bVEb%ZPkVE+`bdb9,lhS7kA8Yd.(o7k.ECD9HU+?1GS\;+`-n;&+mkrGMdb6E7VT3aYN7T@i7rmHr0eS*B+Tn8jcHg)^CeTgQ):,#X.Tr@kpuLHFQu;QjPB3(3FiHK`f88Ojo<PS'j2aQct6Am]hH8p5FmXjbD(bNFFgP^Lo6drNpM%lZ@C6VIW(-=Gt.p4UIdV:l^gXgA2@>3)3HZ,Ph&ejGu?cg>[UgYjTA579b+(!*VsmNACGc;klaU!MHF;@%_XsA4YmMdO8=(2*rOCP1TNJiFQ%uWB8b."!t4,L`$.kZq`>,NH!SqHud3tF2KYh:PC7lq#_+\VZV('Q'!c0rEHt[Kc=_J:ET"(;(@VIoPT3X$@S2fTOZmiAUVYK53=/q4IpV-[Ok6Ga2:8G1ec5Y*cH9F2$DO)a*q7M5KD[@mglL$dRaFpLTh"2!-#-7cK&ogN)!45DqE&"IkdH+;i!HL2Sq_@#XO%[0\*W)A*(s#.6E(e)NKhfV?=11#]BdZRIK^($0:&:UGWA0FWLrS]gV*Q$`S>8#C!Y#'Fd2g,Ip3W#C'Y4ncUUL]k[@#.q<+l92e8*WjkS/0i9DU$3joN%fH2&msC:Hr;J^2n0h[>>fIG7JaHpF5`gpM,`/>I-8_0*W(P%.,ghLKV.A4M%44a\8LA8mL(qdFL;pM9/X^EHW_65]>!Z_1UKGo8>"sl4gEi;*)N'_m25I$AJu*aV_H8:25hu)T]8)4#rSdC$YUjkAD/!,JH#UE6GnE1*)o7O+]P=BaAfM-!,b6=FQqs_X_'(I/@`.b3Bm!SLBWQaKJK`:kUH$X7#k4'JVHC,@#!aGg4qC092I=PkMO[QnOs,H:B?0E4d-pE6JIDrD*Q+e-bHIu4'&c[F4*;nuU)^bR6N).sr1X,sN/4+C1h^o'(r=&`ee1O[S/RsiNNb?S$a']b2lLeR^*r+J>l97Rh&L+M$*BrQAu]Z\f$=DOUd?UV$5+UL+k=[Qr7$o,G)\a3pe0VmqP)P$+80=fX`$jp]gd>Jo9,'ZQr7F9jjiV.0!f+!f8]`-@un,$R[lfFX?n`ds:,Ie48I&;'%8'd$&U>C_pE'Y#?D'-A%M6XWkoD#Gt[@kA)Td)JXJAMqI-0cE-HoiR32Or/s.,=+_U^d4aOYtLho!,-QI"M8\Nr4Z#S@Z7Js.mHK94/($UDD5]c5W"G4afShujLTnnoIUeRO:a7(1IQS%1&U/<^/NR"%)9d=c!:4U1(bJ.;f@3X`:i;9'IZT4Q"At86/kjn6Y.hs(c+?1/7Uq998.%k,#Y1p_66-;X%hB7c%K,k0kgg[^Z[Y?Y58BQ/UrH'uE9PcM*73b)V?+`BRH7PBDc7=:%T#/J']lBCStEOe4jZS0$8:rR!jY73.D.f>*e[I?9G!J,"J*`"RX%4AWi9qGM\">Y=Hb"sB#S'8U2<3`apAm;=6P>ml@oP)1)FE81=H+s^HCurg3P"Ip$N8,^`&dmBkXH+.$>PT#A+cZdV[h3`pZk\-2r7`c!&5%_so,Y0,pZ*-cPcOs(Ra.3XQa&JrMrUt@^WVXUV79paU)[T\[mWd\_n>f!@oGA=Go1p7Am#!r,IJd!.LKr8R*g'!!*9V8faHPUqFLu=;upZ,Rkhj!WT<5_&P]dZ*&o*:gQ"H\RN4*>cK3aQZo2-$rj4^D#iAEDpb;Buhjr%I2E8?c2oahu5fWc-Crh7Xuat4g!SX3@VIu[E8_`BO?W7e=c[d=HNJ9Lo@TAn;&Mlq'LY!Y-&ShAd]Z_rX!];gb%a!'ecbH>n-c1/mC>i5>QBFE)J7T_l\AX(>C"FM*Cn#Q^Z#q5<`]a#2F`#3&Iun?mnnR"`$("BTUZ!Mc)u75LE#2^i]GZ\/PjQRg/.N.#)1M>JU:TR0\C1H_d=R1,?ZUO?(rl8JmO7;_L=X/cjChd&)OY'F+Wt6\\;fL!L47Ki1/i&M>M:-6Xqk^OA0`g)P-Q'"M4)4FlFu;/C5[@GDJ.BOXJ4#'[C+Otn;W%kt<'UuYiuDCIj^?,Qukh?="?P]NlJH%I%I:;etL/\$&t-0,c^%0b<3NG($`ZH]JkW_+cXM':YLQu(_P5dKrgGV*3/Op](\.qBHb(jOdEAY(:[P%G(6F`>X+j"iCO*S=n?Y-F:9/hEQ#ioHF-\P3P`f6-J_o;_onWnpZF'i_BO9!f$u11)$"<+n4>N=0GSVWerBl.km[iLJ-RoBXpS1G708F,4NX*fTgb9#SnH1b">^5jHZ8l`oAfGH;#-VQ=5:nkRK?/=m\=L-d>@U=($EipkK=;fIsg7p\#.OK@ZUjW:4"6&i2o&pgkoZ="N4C!=BZ*k_neK"tbF-ZbB>3i;_HT'HCfE>PM$YqciFRW/m>SN4YYBNL6#;`%a-8kL1_ukJ0-6U!\IREUPBnlaGRU)@VMdGr_>_c=r)Vc<%.E4o*l*cJGaMPC4q@K<6_.6a^!P6F<7H>]qsdYSaDX"G18lB_lm7et4I,s'QU5qPU(j=R#+I#Y&u9npU:H81<[J,k9ZLum?ulWbMtl"f>skfJ^ED)3mPl;>Vu3J%];QR3YI6(@4B2^!9/sBd`NsY%L3gr%]H)(fZhO'4Hf)0-?LXA3$KN`jNls3T\+?rAV7j2_!E"&NQXT4+_A9f=AMS*1`hK:%ZVJm!Vo`hC=>c%(Y/EdcP79;YhZ1/aCPZ[3CBRl-Jt`=o]O%P3-S5Nf*"*B/3fsu$pi\MJDn+m0FCa8U-d+2:cZ2'#P!7N&Vs\\3iOh#8EURL5.>i!02rUi#;hMTKkV5S4]$/;-]C&TT%]iJi4C#EJjhFaW]:F?sa/%F\+fY6!e]Yf(Mp,iU5TX7XI%0Fl0Wtto=L,*_F`DJoM=pW;)7gKha'Y1V\[Nrrmm7Uc@1X[iN+Ea5kW`%:^Ou/OKYikn]:[;<;M;%N#*C5+kg0bm1'nB#@msRZ?jX$Pk7%TE\g>D33t@8P75CN:P8J'EH9Qs65f03Me\;*MCO6LghLW1T,8H`Neu++.*GM6*FM%dk]rLc^W*PB2O8YhWFjQe(`d@EqF"1enM?E5pd)%&[O_ji9p-?u'(g-rhb;*a;4"B:-]`Pbl'T/Pe;HTfCj,(eKOf-a(KQK2X;?uf33'&iDs)I>==X"U3r=XLRS$8(72@YmTtN5B&JbgF/#7L4E8/01Q+@!e\)8AU,#@O.+OMT]VKH!Slg,8:;k/Y`uqL!*>J1^[d8DX(@OQ&8Y.Bj3B9j^#7H'J1F-;.F4E+TitocP5]u'_3=RPV1iun"o-U]kV-n`\4@UD^NRnBOk9b,_HdT"?:N)mHX$'ILMmGo\$6_j1gCcbV&l:.;BTqG,\@7O'.X>Q!7>CIp'`(Gb(A@UgNg3I0h)7S2PUiuajGbZ#cp*pAWTF+FWj,J)%_@=Dmfq#UFG>54NlMDG[tu_)&X;4f93JlYb66*.5)N7&*N3CX>:#`E+!>Q8dudJA;0K0QjHPfpjqR_YNOu>'FIh;1qS]D=_K\uQpTD6^%ne88:@,*E?WW+H35.N+&+"TjU$'*K*S6fS2^+spDC67Usr)kG4W$-Vq:?UuVQ*^RCL2Mo(Z^JY!TTL:!A1BtRQ]dV'N0ui"dB%'f6YsSq&J3tIt(dSGG)&>J3qKd3F?PquN4R=fY7\IN9+T_Y>,,a5[E;@0L9UT*)fZ\MuKtO_X&kms($'gDm6?BFmTg4c*6$EC+4MZO$a8'Rc;%fZRCttMM=WM?bV9[\8Q>*57[TXuXS#mJbC1Z*\<5;K^c4gZn,l9t#SX[uX+s[5>;bpnP,Vqk@8!1aCGBq:38NBcRB>>oMhafPK:CeEd1t^F3gbI7>T!of"t]iB9JMs`GXQNs41@L'#]d1b+u1T^cqEipq^;&XR#_gHg[p8dcnZB%0SL_PZT+Y3J=P5ONrA5t'-q],b3.:C$*O&^c6^\/fWam?gmH=S,[-@r/es&EPibBD#I*N;RN2)-&osGOVV_aj4qaFn;GQ`fOkcbZ/17@Ake4!=&2k>C:YC0m9JHF7!8?d&$)+ld/"sh[gnLZu-q96/D[&d(5O<1.AKKRhEuB)CDkOUF@dW9PmCk(,Wc_&k#k+U*0-3j-Z%Ncbu$+R;:/Wf6'>q1I1X.="OY_3n;#TJSWWN$\ge!Ni$@M?2SJFFi+/&;8ug,g3p)'5bBjul5t\*ol^V,4L7D!>j"*^Osc)#KMi.G!8;i,kQ^N?*e'dohjjmJ5n@LR)C1F>!/5D$&.dWbOpX8!%MQ%V/fDH+aL,ee^eD%[\frHCF4^peAFDEB5">@FCt_+:DghM,1L$?/&E2DIk*R#7Jrl6':dDG,$m,!H.SUY7]XJ8cAOFK5QqgC[.T?TD\Xhn1%Ye_m8Th&P1QD/JeeFNrASL3p+i:)"VLYd<+j:YLN74XU=Fb':4gY^;K+jdI3-`UVWj%Rf),!]E6Qs:-e,e'$A1#*KpN"Z:1X>_\O^s:M&7t`g'CRU>=ZRT=FJbFoacfNEM"!WP1'qeS368D(>cNlEo[[r$VK^C@"@S*WT$n#i'^)Z$=ZrZRDMW5k`?i^%W.[Fuh`TuXg/cpGSB;=ilmZHnMR3Bi&;"idB0"2PMb72&+UK@aWY7XkIGkb9cl]Et"7uG=XPA$VmQi^t,T`'r9^#'2!SVSC;o(7,dbg76T^(=CRdBY2rnRto_qq8O9,'G.?Z"M"?@pENlH'A)'8Nt8H&tbbi_lQ>MtA8)\"d8]Jo"[\O9ioTXU<-WQ!0?I/[gJO[\c``11d,`'U_ND`X4GNN/Si9h9t`&hA$J;9/=Ikg(MB"KPKYX]X$8dD:d^71&93op\Zf(\(@tJbMr]KHr%C7P&LE_cAs`am*Sd9:tW02Ct@7==oqAN^W56u$fD#s,U"-38HqKo%:9(`OP;>i(6)$[C6h??&uNijRFStqCg!2F!p"q2BTTUa_.=H_OiT6jB6bWNoO?EZcL,HcP*#+cltUQ%V7Cbb]2pEClYRtJTZj'(aJ#OT$r)6l^0_PO+V2k\3PcO0H2M8n+$C[/6O=5=C6Jle/p)EU^D+:/=Npk3"lI[bJtbeJ3j^"?pV,Aj6dq_0m_p)on7.8M*5d"I6*P+_S-5[oWI3,gSMD&g8Gmt1DSWj8^iX9(^T#?,"PkU8-Cnl!*MH3,/9H;PjN&I>>B%_KPK]iQe-^#!q/C*^%a^gMa:!mDr:Rb1%S/@3jITS[2'T:-*!Jqc_JG:=quQbhg@C#"I%d*Dq'(%3CV7=1[37M-jf^G1K(GDS^t"ZI&*MjUe02tOkFk0j*_5)c;+/K`[pO5'tap=]cNAH9'D&g&$?U'-,jg7f`0SB?[FVG*4BjkE6sQtY"r?\GUF\fi:dc%r+W->f'3RitK[883!@,/E.*T_#!9L=WL;7+Vro^#9>B`S@CC1Du6j8`BVQ=W<]e-XLNMrj,A2/ub/:o#V3ZH[7\bl-_7EK>7r^lh)&H(_n18RPPhskEJF>^o&crD+66:sl@[u5i5tGHMXH\N?M#`"1MK'?%[Sl:AV$r1=ZHH%;!Qc0H*>k\*PQeHq_Vh5:`q>9"Qj;%S?r=fuk8%9#m]EpAU(B_k9QS^]Y6k0i4VDQVhP!Rb,,>]@6`L%6gc1$7o0ZU]1'5TD)uMB4Gfa@.;+'AURjsA!mmWWG+L%9E,f1.J6^]da<+7T=(B?1?mR`$T72Umh$tZpX0WUM%79=\K]=!O'doI8A@#12P@Uu#ZG_kO9r-@)g.e>8H0qZ495bS=l#u_>;Q++#@>!tXA^g'j7np).AcAAsF%,mt4gbKsTiCNhtWT'o]iht1GdUFRkR&7TUPV(pb#N]gf)X6PFI:O^WPPX\G8L'/"4OucI[M(h9"&m%LL1pg*>-d;42AUb('cKKJ$`!)TY6'*EZqTqgjNu$0L^0'XhXBpbVn@B_e&FpnfbFZ=#`X!0CH);2io2MUu^fr(VVG#)i$!dq0_:nYcMAEMo'*UnC7%ud'$E.AZ.Z6QN\'0K?oLg?&1e^0[&9U\p)"/6bS36oH5!cqJe)NniGA:),9&[EYSc1d7e4TpFKI)Mcg@;8[k)2/7HbkAA2=+RATg'e7?%Y.0g"!h"JBV7[8!;o#[KQs*25DRFs#$^XE1dL8NU#tj<9$,"1Qcsg)2&\q@K2CX2i;):'1EO2qd'Qm3mfgpU7/UhTc!U$q,t62gTHFn%&Pl_YSY1nCf(&MFCFmI0O\s$]b5A=l0Y679R9*/%K)B;[pUk!pGQ#J?-@;pc)F[CS2;#\H3rNEJ/nikIkd;j3]pR>l#VpOdmQ-?)\aNnUhjBPU.[Eoi!DfJNsqYp]"U`s#9WN?i3,qpc^8o+3!4<^\@c?o7++Hn&,0$o)DM_omaI$^\tprrnm&@^R'0;J)C:Hp4$`KIJ&)s8B!e$?\+i&raLdM8PN=rQ2E1,(4VD9#\3P,0Rd;WPcFm'Wm`:]HXOV(rn)\066deqb$YLUB-!Gbo*nDdN.[2pi6U&jZ2h@`FXQBF;Q(c[/9^Clk:2;'OBE\ofEUs.]mc_`+7[Gb#[iFj]`&,=MUg]%5HQSsANMDV\!?7W1uI_Fll7Pj3R?gAZ[*KNq&j.i*iPH/&3^r073H$naJ+Ccg,lM@9_6GBcnMl'AB-H0D6g-p$n.BbG/HF%H2I-lh8$aW,0.a=V:`Y!V1sJcB`>Q>?ceLm#XBODm:d+Bd-eU1pBXcnZiJ'm&VP"J5m_Q2Zi+p,cs"UL@]R(^UgsAkUp1ab\l-HWUs9<2gc4)_n"hG(+5-F-j74=sSTS('^$S2DR@\NB]s2['Q6/OSXp\V4ap8F6+[.po(pZS9Y/R,ei!Se`I3c?@t36bV#XsXOsa:cA=Q)R9Snu#e.KQU"pI(+0?R/7!qpEi_![I[U*1NPQ(J^,BU/aV+#1Oe&a(KM?f(Tla9C"@f@7!=Pgr%$i+)pV9W,m[k1mp8fO!-k.%j"afB*JGJEIpn6`5bFfI3PJVV`u8\/*1S!]Ph_^&sG(AZ-mEBG';G.Q=4;3nRK(M:-jHcbWS^+`m,JoP!I7CZ&jJ?fV'Kqpf57("=*uWTi"a9&NI`g&PQPb[kf:kBoQQ^Q6dEZ"C1Y@('HZq,t7g026Wso;Ob[p$ltqUhZ*KKs6&hMa$bLc"<$$C,ld^N"UN:UTCeNr\rd$XGsr'"M%*P0WGI1TuYfG&Zm_a]ju>0@].'h"c%:nSOg;Q3It=Hlf2OVN$s!VK/-\$pC]2\cZ2fLp.&e_AF[c!"&[qm>\HB!8?(mqLP%F-rfm^"r,4p>%m5hflKamY6e77%2.`]fP]=G4!nP46spoICHM4"&F85bUH&!Ppc`NT_EZBJ34td.LW7b#IYW]#[Qh83^HRd8U4jF?%L/k[V)_hQLd$oPE"mZp$WolkDR'Tf%.+!l_qKuS_`1MLrXOhh8J.ehXFdSXc$kr?1`&N/adc%*qQ8:]=VOH!F"V1r[p)R6DEcpT]5XsNNpJetUt;13DYlW14lQ(FfrNuA]k>'cl"o)1]oD@?IEP]5lfII$GBNMgq>eUrnhV:XHI'$s!PVod2gP/3fA"$l4E\hQDn2,=]`[*_jT,]b"Y5PWRPnkOf'^*'Nf:Bcg?K(#lgJ:S>i0h'52URL"*I=UG(=Jgn$$)KgJolSUnuO+&8qBU_gUh,ldo>-mlYd[]=,dD>;CN9I>fOrpUp&ZVg[<'VoNYlC7F*JAk^CEF;i_\ms!RYjkS`nh&4Ada$lc`;3=[Gm=J%R;kbm7q@hQDXPalWrp:>LPaHo=k+Va&D'5pc9GKPIo-/H^4);pV'c%]s[RM6g2sZ7p0l%heo?!I*]NF[n\u:h=m?iR>$'EVP>Z]d__.nu:VPQM=41o9]qX/htf&o;=(69$0hR3F*IO?i]WmPibhf@k.UcgK%>ih39-X;*4%ii_;&4t=s8Lkg2CFRlBVq2]^J`!Y-5P(5t5eNc@OTGjN@;$=a5&idqUA,8UIL,WS+*JMtLT2^k!p[8c^D0Ll4m!fL?K%"Ud['.C(q-^O-$:pHg=>ZAo9Qf*L<-+29@3\:G2^OctH+@/8^J8ZO&gM2]Op;F*jHPbs:H%0g?/2&VXOU83ueM6Tb.agEFo%8%t,PS>q]PXNTU<7YImN>8\=/6LR_7Z=%.`agL+-'N([@7#s40r8KF_MFG9->@/@9WAF;7*A9BO[U_(5r),9bf8#,>9l&&V(*0NP$(23PRP?XBG+I3))Per$):&/AJ((Bfc)\%P-#mDRp_F(KVTkA`\O;E6tDZf7&a$TN?F>u$)'(FZ3cn7PSjT1/;@]BaT4f^(pk%rUag&G"I2NW6W5lM9[L&()Ds:'XW&OT@()K.Bi?HWA?mYI`Y+^PNO"j[9edr_.MF.CCGTB&'2_15'Tj)ob\SWY75PpGfd*7*UQ8Ylcc$,q2M'8>\e=6pWL0BSaSqN`nM=;d>CX`>A]P/)-"[G9T:5eAdk'H`f5qNZYEMbdUjdKC6GE]/ZVTH(1;kJ=H+b$W7s*dX6'6^q8o;"/;@Ps,/8^kJ.*r6f9c6M\MMt_9N)IUC9[Sb47&IqRNK&Q>Cll_qULRie`DNjS,W8=6/?'o<-*gL<)Hi;!P/s%6B[nkP[5?<*d7?udUs]QHW/ZJ=1,)o>P"_ZS1n%=]Ysuj0Ag9kuei$6q[*$!'269b.BprAMMQr:@gun@->OM;-E@>-.>)IU@9P@R2N)%k=sB3[/X]YE=P8C-a_%p0[BW^MV281jVH/m-)_/+m2(<6r[6_,V[3jC+VT;rg;&ZPOX!t(pPqta'OD7E#8S49_NLEh8;b!Q=/>gZJ;Dp"&,0\\sAOOBm0ZI9g1h@rVZ>?>jRT>TGW(fb7B!nJDPpn8]Be(@7AMhL[bfm@s;Ft\\M6UOE+sLm2V(,Z5e<[%3MVNE1,W=OgY84d>?\G^$^0t&rYAfK%`u()Qk.(kgCZ\f1]5AogI:e*fUgk?Xd(Qf-kpGjQbR>DrXBo$,*pZ_&,iIL+NU$6mE8i#s&+u_'^]Xu]U!DT\"09%25J5k%#*.HX>N,c]:5!C/jJD%hIm1!*bhH*X>'(9LgVF"q9SbA1*AVW7s>i]A\b[B1=9q^6^X*M3`b?fV/rrdH(d1VO_]Q5h7V#jqYs^HKmglJVm_*:So=coB8Eb&W:7AlD6"FGWk3b;oH>L#dEQjBT`jO\F7ETZEe0G%4-5l.Io_njDirWf/hor;Vp0O->4a13Og"']L15Wn;/PRbeSs3V8,Xlm"V`eT%+<1B4s.nS8=WSljuR*9!U4.-co2I90?MoQ@h<[6BW.F3`8@7)U]V$--[ZK;bS4>Z8E9IFS3=kqKjX3Z2uTF+ZC*?5e"O[WP0)9hI:h1*d=lBeN>NnW:UhH,?L^2iO8<7Ju/(hEu2ug+\0^en#JQI*MXt?B-l[0rG!=+6o*(8GZQXLrg?WA8RuXqV#%XkIKpt*rYXPLp('n',:)"G+Ot!C0a=Ydp2Fm-AnIj8=MNgQu2:F9qKS(jChqL+YTNXi:'$b7ZPDK^H#"*F/Is#79,B'fC64CFIuA%8g=RRIVD\\ck8#+4'S0:is%F!"&='IARL@J.K6cc2i'Q7#bnE\O0V]JX*>FZ0hIdfB1#/bN61iL?]b?(iSd6t2W8GJ(bfbsn=l=4@0Iq5Li\6'GuFrIHDBV\g\&JZh^-HUc&tX:Kk6:cOqobX`G_6AQg<"AZAs(K-t;;ZM$2YEBJm$k=:n&KX,`uU?RQ8O'N0K-g)173rUhZ2irAe3>0KrDLrVSrn^?[q(eNHYH1G8H+`0MmBD&D91:&[M"pjU;f$iP[t[FCLAN_N.K<-(pW)--VigWO0@]od1j>fI4RcN<1!lVo"qCpj#,-J^V5fJhKr($LOBk:*%bDA,T9%R3g`L![G/)RgNX5r-U3:0qQ&Ut=@WJPnKK14ddA>NkI#MuP:B6lL[:#I/LP+dZeah0H'dla?@MfB\-1glGj"u'0Wd)i6MBW+LZ^KN\4uXp7PHJRMZ@NVf15#M0Yirc`sO+-.!Bc^O1)p)a?a"P#@@$BT\0b>-YH#[4tEX&8;4$PM.'?tLM#4=8r&UA0kb,<2p?"*0FGs$;)`>\X5`c8(9>0'nHl;WZ(Vp5OE#Li(LNA$JAK0;d>pLf=E@e!2$ePUr80GDSI`ABYKaI&Kq7*,o82WY=[No$ar%&jYtPWLgW_i,^?;N)6:Hp6\jg+2OgU$rS.+6\!0\*I?4iou-'RgH\#jpFPb];-b@N,EWFD+4:pb;rfoomFaq_=`RGQh;]9&e](%h<0Yb)#H'EB?j!!1`Ds&Bp;K"N-^7>E5pB#lI4<*gd/7cPIdbPkg?uBqIFm*;)dqB`qb2EWMLCh"ZsW>K.-3f4_&\clYB5G<&ehF7Q]Bs\:tR,ak?cpl$E"u'ZCL-M,\m[TX7me-HpqtS[.'/L92h;K/?$2fh(Zse)/\_:gFGn,Llh947h%m6PIL(YoC_mC&'&of6aZpZZ,WciULom>.PX5irGt]G0MDfAYMtl&kS5f[dCAe$;jh,NYG]=[pVA\qE/;GfCVPe5MH=[Z0(t)r-RtAl(qab-;rfONmm680GcWlFpa7N%.13?:Z%sU.]sLQ-sp,4V(nlC6!X:6_,"G./b0Ha'hcL_K",bpMEFV.8WG2q8=cMIp1Z=77eRBaDA,*="R\I/+c]-H`SOCeftao\O7#7XMDR-)"K%mn&3IP=o;RaSk:\CC`H)b:YSY.Y0*It;qoI#W?D(JVg$m,a0td(4jjRI%cS$Uj3IFiU_@edLC@T<$\U[T[KnaSNdBBL^*8B]\6fCAT^_a4OEiB$%_jo,<9NX>PR6m/Tths)9Z`eHHJ;f@0jP+$&bG+n]#+2+IoN5K4egV,1CQ;JV9mCESXG9N(dC_+WV]nL0%[TX)=qkc]e1L?Bt'lO*Ai1h!:*ie^q`&\,mnAU)I/>\#$3@&O/;eq2_J1$QTT[&U5)JHs08_MQ?[c1.[/]>*2dc!9M1m[3L?PUNaqlhKuD2^#=k!-P6*j\A7>;5+p+!7oM>m!PSC[Qlq?Asif8i,I[.GSl,.56m/7aI:H,0XXU[J.'JA(r*fEqVpOI4p#[j(,G`V,T;aFm*m4a!m\JFKjYNP+fPu3u7ho+8d1?j(3/D/NG>O9UM/GPZrZ?K)f?^V;X(sBoSp=E,G-iOAZO8q-C[9__(,`&b4g]Zfbkr(<\fn8+HlU_*.GX=]8m5>sj":#7En`,-LK(W^US1>_gD#a(&eYS6g(I)I]aJH/3EO(B(WlAcKks-`=)d1(\>o@WHpi8n\#b_P>hp5t5cf"YNt>#<$M_q9t>E?W:/L<$#7(dhViSchN$L/pcakC4<)7Aom"$m4d+"6#ZHFX;LfoaBcLTqA#I"?H!_rq'V03XBceAtqM2C3upP%ncsU!giRceQot3/huR\-)^Qg7!l&pn`Q64J;+jJgM\:t;EeBo1Sh4mA3ife([?YI\Rg%iD>E0;a&ck3d<3KD%)PP8iRIo4k7)ddfGkjAo_J:cSo3Q):XcGVjG+bll1@co.7HBTR!_A%po3p7I.5'p7<'opq>gV_Y<-7;H8/o-[%($Vh.9HF("P4F2>A]2i217\>^1=SG^Li2fYnDDggLL#3?PgZOc]QXdu@9ee470bQS@BBSa/rZ1)Jme#&@QlSn$U_oRk':h5\g>E1,PF+pBsNK(4,uH;U`k9UrpH9Xm]MbO$YDb*"NR%!A=,$Jk`e\354*/l>-*/uoNuoX?6,QU42cs$CLuA4[!5;VC2WVadqj.oZj=VO6-J;g:,b*-]oot>eg;ck_JF5l=[cnIR:l5SNOCN^RH[KZLAp*#p;Q-+?0?B0Dm!W_fjX000'!u_F,i"Aj'u(OAX@7N8Y2<;D:Infi"dW;Z_HKM1R1#UU39g*Z'Djh3aX?"Q&;NJ38=#/Isl$KCY.n@/I<2uJ!fW+m.aXa`/=EU+XhP\Sa$m:g%`"([96\+Cc4hK'==+LQf7^NV)HqZZ8\M4A,O99]8(SX&09;H/!aH/=A1SSI"DrY5BbbK^0o.J6X6[penVtNHKD!W7>qn(!AgtFg?[GaHl]46$\;_dZhjB#eEH]*-g'%[h+?LBa.+"CNCS=L#LkI5_o!>^V#)jH8mmKBVI)4>)WhGW5!d,u/pkMbmt3Ae1r2[_!E5Vdjp.i[$.G,a(_tje()mlA*^7(+j&&L,9GMKCUA(a!<9rECB)HBo]3D6[@[iJ+NUL>j))?8fPVbRq?Q^.!PMB7s*"Ve2UGO/9%UA&MU6l%';2h:09P]Uh>G$X/I@Q@UI#YFcT23',4*gGHQQYoLC=A-H%$/#M'm-Q_:\u+0ZmH27JP[)D;l$F<:4,*2\TAqB%:WA*CqP+n?G9]^7OtFC$>WfcP,bgkWl[\Fg%k.k;^lI$,DY]jdoJ=@S8ascVI>;oK'cP=pEuptCo\YL?6:atr3\="`f@@8DA8G\,?@NR=OcrjFkE^CR57`KG%j(9$!cX3:UgA=jn>UlZ*2OcVF/qeiI@o[$Q+!GK1#(in9ifRJ+LiAJ$u_-*g.)V!"M@\#K-#mP3SLQjqhCbS+-.'^-?5P.Ep44VJba]7#E.@eZ(t>52;fb2e-!62pQE[WA,iPZYq40-n97hIVJbXXdWISkNP*Lia*,kYMuiJO)H\G7Ff\W&]-bEa&4:G4+ZFo!#i#VGWn3m1l*.FMs1.T1O>7ZW&16&WTT6BsZD\FP25l4;3liFhEHP4!h%YNAiCJ^r0gNu4\l9=,$-s\PQ*X5,=;p4"..g7.eO0si3[]NT\bq4Xq1g:e>ZEkIAnZr4=5Ou9N;6aN^jHON=XVYpToQ`[]_k7T!`A!6&7W<'u$E?#"PL[Ck73elI%iG^Wm,?qEMrtubm'ue^U9MW-\:93ZlTHR>,U>urh8$^nRouWq7G/0kREJ>d*-TE;]#"se5K8/Bo1U@UrGgAi8bWNZO,W`dfRhI8c9$i8UE-@/']`,1`a,Qu5Ql7)/%0jJcPEfh09.Y]n#TQ$F1([3W<=X>PDR&dBC24jG;A],4B'8A&'r7:>6ZhYJ(sF@3(H+[K,T_8JW2p/E\NI62oIqU-Z<(4bJX<.(Ko)(:`U&Z=0K*!ID)LPUZg/d9sR@6KB82/Z'GnB8l^O"(>@[d?]'dZ'H0:]'Otb(/V@EPQe1lm],nIW(O)jmTBk[IhP$tU*K$6hhQf'1Wo[grJXLSTKS5!\WD8mGdd;`CrJ.:.WjdM,d/B$bo(gYV`j!;/bF3F>6f[F13V]&\D"V62r2k3Zj/'dgcEL+0V)'iF/;)uMdbM$A&&WJ(1O/%u9&rBK(VdoI;5sC&N5nORqBGR0V)4t%7`^lmdTpgo[rtZ\ieS=[<_X_B[*>R":JX,;\<^J_2u'eJY%-ST\$3;W:_f;s=fF[d0-;TT\`ogXTHR--!Sf?4AWS+L9``S;`[o0m]VYp6G#\(U8=XlYJ(fK"*lThN>dfh`n$ibDu#'4ksBQG)cZeMHjjj3*Krf0"*@899.jNnej;]O^@\Q>+I3g)YZ=XEWPb)g.;@'0*/X%FI9Z?;OM,_UMa/T57\K_eb3o)63J2&R4SRN:f1pe4]AM7e;\4q;_*jlo67F1MSc;ir-@V,UGFRL>U`)q>+Dm=Q,:Cq>&O`i9.5Yk#Z!jHckpUB'G6=Mb08Rp=Fn_T")udN5)h:k\krhKL).>m^J0C#Y?=H_95h#U<2O]lfD($cM6>_GXY+d--URKY4DRS*6&%,+UO8D02lXhK-;H-j*sDFhA_JWe2/kI&K+2/\sQOOJPWUZQ*.%Z]KY3:LPg:`m=W"dNeZ@!NO:Q0CK*WSpd5d7fnE?-([Z_0.5Z>_EYXks\`qif+#E(EX*J@h.?"#p`GBZ7)DE>0K^GR9S5PCF)^3\,`mZt2@DD%mmmL2@SC2?)%F!4>A5=7:dTqO4!\p`BeC=d+AU_aLK<96-u^.e1)[<*p_If(+]bb)naAJ]'g1Pk:PBa6r>uF1g>8NQe;BUQ&7&9Y=MCiFH2jofhJLVPSI`Uhe&u)aAlL=h2]j.IWsX:/jFYgXgd1q@F1`g:=-Dd5s.8^,^qT62?mY=A2GP[ghbGp,A*>4R][IGQ3B!ub=2N0`LFasai#Mk;YR&+*0XWS8$-IG)ZhNASTJga)?'2oG56-\Y3jnEe@1$[G]D02brA9@)N@/G(l7j>H;tdF7%"cHH3lkVEdZ[o&n9U>lH:GOG1%dPkYhb4uAVsheDCuH&^Brhh/D81,6#/VMg)6@AG8__D6679c=kb_h4ZkS-?p!96\sgsWO0,92f@NVeX$0D`uOd6JY$Fd75dqF2^W02;eamE4`jnXS3OeC`s=Gf4e9YZ6p6nX["8UO)gt9JCMHML\V(e<*WA/WB\B-cU91"U*f/]^8IiuIO;s)@"$gd8Y!a\7@q:nW#?d\fq;9Z6kEe'MJ'`[JFh[a2mJ`Q;WA0&#j5kQ%7O3'F.`+M#_MO)!h^p-4:fftI=PKOEC3sH+&sHS=mjPB#+YU7_%Y:-%i)6N>nq]r6edn3(p/m)/c%=NN$F^0bpC?lDA24S(A,`+brg\k1ShYlu6psosEb$u:UQA81\Y1NmT31]]e,f@*cN1FGj,0I]pbPJ^,Y;Nq_;i?_&P;46u#-p_'V#"JqJa3_aB+E*o=JrU9G;_.V'lbFIa"'m4qQ+ENMP%3qWrfn#;ZV?2-sYmGM0[kPR*o"dZ_NiuK^ca7?\<7%h8Xl&t1@`KM"m_5VYWiHU#jXLk#k9B;pQ/X4do^Hn]Epcl+=BnlcL(8Ibl0Da7@T.!:jWUne-j\&'J+"GfAr3QDP'"7Gqd!n"!b5Y+6NEjVZ"*#rotlnUh)S%m6!D].,$hA'P)E>gJnY-j03!&NTc>bS]FWD5Il(T;juu#cbE']rEQn\KUWAlpe:*'kEQUsq)q+-!V&tYC]A+p1\(Bk)o;f-;I_#1MG&6i@:C]>sm]mDjNoa@83TC\cX6T3'<)X/coikReFK5-&)W8#+D-"eih]>X%9hp0s2FlSkf4hc>Q/-<1^d4rVXKru\A3a_ch0TYSqRhTGQk5O@$'AOeX-!0^C@Su@BA:,8X,+HXV5e.OYLg6H?S,PI^DX<)?TF8=MhW6U'#7Wti0g%*l5qMuG0Fo$SN$>&f)IH`l-BcjRo:iG"fr4`p"1[B$"@9]$V;ihr7MFuAcp(tY8UZBbiM+NAd-1R=9HDqooPG$38V<"/,#>T&]rVYk;6qB5bJIV2S`bLK&Vc"8(8.da9pI^]TC(2Q/0^d$Q%8BGm51c*0'+UD,S/t%KUQ&u_gH6FZVt`2uF8ll'J*Ki>:VQcLke!bg1<6e",K0LcU`0-8+*3Tu(pf^?JpIY'"c@*+rX=mM\k+=jO.Y*@HnaJ>&/'ddp1`sLI@Q3J$qmmgD&s!`e+Qf)=OWN^[Ol]Dg>UY*bBnk'F-KS34Y+XG-+P5@1>5!?GT$:qKlPde,-T3J0.^?k7#V-O_R77hJIbU2QMhkPY-r'p'5Ia1HLpmDs9>qjL3O6![t;,_Q2Ge]3b@7U#3qrp);l+`<3Bcq,o;qAo-UIuZY^\g=`rm!Q4,32'%ND#GIUl($"F_bg%2=?ue7.F_"d>,>d>'Mpdg't>jP_FiMndo0\`>AtN,8;:HK//aFPa*TB%=mY&i.hUZ'CDD-JE*HB5di30>O)N[k5,>\Q,d(pNWN77NKFcn-M8e0$Q+V8J$@c?aH>(Qk&g$Er`JmM+X!$GV8u0@aPoi`mQG9Q+L6D6*+/Mcsqr@hsn1:;0^u4p\klRe8o(\+o,n;P6HcZZ!][VpSi%T3=7?+n_rIY,73,/#rIbK;MFPB'T`P?F_L9qog4n*h,[oIY[e"e'B\/3JrM.g`d647o2T]%T)_n%j=QAhsfe*N-0@4olahA*dr:niFa(p64osK+e9"5D!g+[.Lp^&qrA_MIfBX+S(S82regC4_eY>"\nrfJ2Y$,0?a?EE"bFYrg.fkET@VI\]A.Dcf5u*-gK/8O>BX1uV@PFrgf4upS'8^Sg.&PIDqSF19"g_g*h>NKjk>P.gSMLG`/`(:c5!p,>om>OgqJNQCcpBYN]"$)eVssJ0osGSMOe&=2Mdmtif[OpUYjo+%U)F$QZRU/^@&m>sCO^-CsS&9qLf\L/s&B7FH(g*/f3_cVMW1!^0El=)5-`)dO5KG[We=*F..ZlWDk$.T@p?#Pr4YaM;9u_[]lds/UM$3j]M6b%'&ZeLVgm[t><7YtNW0Uc4$!_1Qo5EhUYrnBh]X!$5rMEV`*@id8Z(oc.bY#Q?dWT1FBs=b#QhKF9lbn"(aSqqcmHkq1E*uGo7ru.=&]#Z][f,R:cP0H^:p#H?Ho`Po2!J6.HgN"q=(.QqR2a`p>+-YqD"1[HbL#,M<3LdbILWhgW``C4s-ED][+UNdHqK.kF!:h*+rfG'EcOnlO41\3*jj;L\A!@:c*d[g2Gt:,G]g&%MQ@4,_n./UrIC][9)Z./CH&,.MG9l;-'=?mQ9s+0f(I(]&c0Ze6Eq'DVPujLD9Pc>_h?5F\nM)%Ai_+>AV<=$M_[0:GSIIc$@??='bZX@'u@)``5#0VLcZou+(tViDbTG2]ZL?37G"q^BA]tCSYk3&2F*A]r60`1ZqX04!>2l19nS4T^V!r:LQ"QBtg\6V0Zu_oLk@=I]-#[#W?To>Zt@\FD)q8sIDG+NKQa96LBWY/W/I_8f[gXH\Q>?Gl38GmH.=.;8/g:k,'#boLWo'YBa$cU30fLnR)q^^ePRIeG^_kYinq!+3'=q7X[g`s,>73qI_JkkM57MVi&bi@0?POQ&Gl6^bXj`l*f^%fpNWlk\jpZZ\_(%r4B51ABp%"XW-jcpo_lJUA#6nTg^$+BDru@Jqg1/aTeFpmIAM"a,,qG%3en";q40!XBs.W\'jk;^U\8_OV8Hp6a7-1AgU,>ahJVN1mZL-fA%Ga/NqQX\;+tG^kAeWhPI]s.aZ3)BH$1c=0$!Ab9SJR\-+EW898=l^]28FkgNN*\'b:4iD"IC2/k:buLL8,iN+J9YZ$K/G]WmAd@&%c,LaoN"@0)J.6!^J8VU$<04'c4Tmt3`1WE^k'AA&gZfJ\$:F5:ReCDl:-fX>@6B_OfXG?V#qI."d#(8WJ-A']Rgnb7BVI<3k(k-WGh*qs/DDB1G\dEFmL;Al.#`kmiYYs=?e2UZj.dh9O6_?l]b0c2`5P\EWY`Z*]:)U_dpmC'hh(mqO;)IdQf_DXZr!D-L5Oh_iU$Sc=9sm!.k3^I$Ojrm_N4Du1-rkn_dYofq=/Yf)5QdFUPKUb'%fe/WBqPGZ)3^&Vb0uIXAjO'jjYuZHnmf$AK8*,6HGW5a.P.l1.G:u@&M.Z(ojhFL6P%Ya+#`DClpF\mrV%el!U@Jn?(Vo4f;_93,WfTo\A\jUJn#h&#bkM6:E35/7!qOn75277%Qq\EUY/&=!TAj8I)gQ6;q)Hj=2[]i4Ob9B(mL+Z>Kbf-S^]snMJJQCISLL$c4l>d1,fndIVob56VQ\9h71g">+UYqb>k`Ih^Dj4)mS?2;/p[?p6C]5X6ZL+bd\YXn-@QI7;2J1\hc)*$$!hcq!n7-'G'gARRiH84aHpN5SWU0o2@,jC'eTfk\)Pr`MBETY^RS(-sOOH&,sUU?Ek]=Kg4n5r0rd2hFa@,Kje$Q6Dh[N44LE_?b-(Hk'.I`#IT%:uO9eeq]ZCnQtkaC?*"d:H)"jFn%9h_)kN$Z\)/=D8a8]Q$7ik4pD@heA5jS%=@(7SqW.V3C$1Uj?U1Hhfod*+C#>I^-1men@KlWs9E[kE`i/'Ap<7iRNg@s':l.SX0.\M)1PDmalhcPV`:i,.037AJ-+];M>?R,*QLII"/!M:DW&o?uI>-%Vrat>J4G)b=*,&nZk=*Q+XjRiNDdl052XF4?:m6i8MUi(p%)=R&MEVc69EY8+X[Sl5nHe7]-hjk8\Oqmcii9bjt"rHB)Tm/:ShQcDM8NU,fr,B:-\SO);?6=i7uF<4#Fa0;3f@FUn?>XE25,Y=mNXn&GUWn\Jt.(XoaY<>#\QeU<`FFKFED6,#3L6D5H5@sDmUg<7L0LsS\374YFY/kKMYj^"Q@Gu9H>E7bcDo@9*_'rZ`q`Z1f/cZe7#PVq?)2'!i%lJZ1"j]\N.iP\,a`DFhmJE*FH]A1Q$R0i^pl-:iM2L1Y-dcD?khD646nBNIr;:Jb1o2t6c4W9SA`&&"t`(#%a0:q+Pnd@FYP=6DmZN3[4Z6@X`D"CCbg[bTbCYo8Zj$MQ2:SNoSI^%0#\JSK%M8&["FfT:lm\7*D!2Edq:/_f@G=kOA-*Y'9Rs;i"uR@<^s=q4GabaSho!YRnA.T/IXp)j;>/)ed&TaN4;V-9kS[^-@JQr(>;aAnN<9f3T]Ajik)V@[H`D"H_d]"oh;upb@,'Z.%dDQ5Al,^Am0:^A]0@(='HVRhR1sn`cnBWLBNu*I@io3Q=d.@LSHun!Rp*cR6_)$C`2:CHjQbFk0=1;+gn,f2o;l#h"."G('BI%>\ppST!pUYeWA>#M;&u;b"Wa&Cos[N\_5XB%\3e&lc@_0X#CQ%T'=A+fjSDr23MU'bR`(eC/c6WYleN+*r_c69'k+;MVHV?/Jg,_7W^k3B;StB7WXAh1?LT:a5?L)mW5O3f[REFas;:,[,\%KT<]ND6t.0$=H=[eL=:3hDC]M+Y>,L`?_j'E&Ua!6I'fY>bAs\#FP!++jQtK%Ybs'l-]MNN(jR@$Knqk\`#N]^\>LehFj^4q_ikTj*QMjP78^P,=CFn=Y]Z>P\KLoY?AF6cLZeYarX^9,WdHoS=4\!eeE.#n+f57?Q[N_a#8aOADP&,,_f$Ro^+.^I4H;%_[#lfd'Mf36h9>Y2cuA(8gGI'dAX/.j?(&i_I%M<2$=Cl>6[V_+Qmp>_kfO(73l,q8%!!sm7-H`=+cqe`dJGkt&W)VJ=FL94AWm*MA0j_/0qg!f;F^(_MqIHhem%$k$$Sius2?UV/am(FXl(k")erRg4KR-2aOIia!6[s1_\1aZ*15M*8H(ET"07l\;F0BbtQ]h$-O6ae=pPVLJ6V"nGMW%m'frB,GOo7n"<[[;f6\`Q(m8S<#P/mU@!7%NXpgp[.V.,ZsN9WW$Z=$MJVajZc[>fk1\hB*ndh/6W>N#'+PZ+mY?rB'SjRY.l3?cN]KNZ(p+*>EKl]1U$/$@e5q="ahJhY3Y2mp#Yrj!mA-mVO&&Q"c$)\=H$7(OSk6#3ns6&c11<]EuO<(ms&,2CQZ_er9LMn^*-R7X](b07AfNuS&Z%k:L8k`0KB@D')>(Dc'odi\mKCa[m7n0>Pp*@>R_EPD7as36.Y_41t.GmTh26k^.aQAH\CZjDd&4VY-);Zo$mS3cF7L*;8KrB;4=gQ@,10DZhl4pq[@1Vt/.bZNOAo=&bQIA[g?UrP[0__YkYJp9m(u6:+]("i5gR#+(Mk(u.g5+qp:k(N.69+XOO1&7kQ;1I\p;RuA\=WfkQkZRq:SeH"\'cHUXhaAUrkY$5JGFYn;\^U;B0`DSLXO3No<8Ysr0@[0S!PhMhcBp@NupVpH2_f04+Q+^n.Vden=fMK]Q(,o#?SXC@-?CknKtVNERaL@=]?YB'!m?47js'4P4G$=08ces,Qjp'k2*:ZH.t`9sD3@b=+S%*>*G1ZDe`i?YuZADe`d"2*7!T\dOJi;Q26DGd;b3C>S7l]$(,WqXC-4:Kr!CY,e#Ua$q_bh)7:Y3TV3DQ!;i]Q'RZ4HJYdgpXO](lUXEB?TmJBTiD_@1rHeTlT+b/7nd8&[IKoEepJIem!F<0W1jQHPNCLk[iV_BG80*bcHII&W]TG?,Cm"rF?IcVpe*2:V?FuLNVqQ%eofkqoV^3RVg;L7''JO]ds6m])Bcu-RE\b8pt*,:\oFIbc\3g5rg<%U;tHGn^XbFSprqdf&(\d!`m9h[sS^B=5$D$dA(uDp!j^%CEJM+]mR)Y(#)tG)r'='(9m'"geSGZI>^;Zj]6N4L(`Hgr,o-0f0]fr;M*FMXG2%\O]D9+kc5(Ci4YMEj)r?lXZ^SQd`T[6W`s-Nr1nA=Qih\\mpn].PE5E0mD55`)1"pEk.;#V9M0Hh@)doBD&j21iSMc>Th?0c=*d,)3.i3`V3.jA\ug+k80%#>E2H_T#"F;%_.8Xn9$?cF&[],JsZcb>^Y,=:/>>PR>CX\'K92/B4=B6mP\eD?>I$/+X6cNqft==IV7%I'l@mVF)Do@`B;>"]m9l'Hb,(N58h1-9IgNh7ogE.'jQLb=msINT()"83H^M][Q>7Op=dLNGN>I9aXeFP.nOk'],(Vcl*.f'2'V_`UZdrAXHceZ81hL[T*SoCLs9!Gf6B/tI8uWlK6cMHKdpMNgIG='X0IP`X"Q^/)IBW.'%f"PHeI36gL5ccTIsqXO='o[B[E2jncqiP1Eo-QY&geJ1mOnX\)joD5/5:$HT&b6OM_k5HC/-8QOZom)f!d$K'@>UX@bdH[],Ya7lnn*o0mg*kV@P6SB&@@YLg3QqTYJFo8([t^'a'r^+\IGT//]U)L$UjW*"9<_tm0ohFOOVl9ZN\YoMX#+/BO^>IUA*[8EP$T6^_p=h(b$-5VDUTT[p%-1IK(p@Y_E8o3l-I<)-Zs'G#.2FN0UeC=DOqLmI!ath=YR_584KB=Spnl'(uAQ]>Np=9oGmiLF0?VA$:BqiZ9bo+P:C1A95I?W=ApKuOuR9*:=m(W"F]*8WX+([]t[c7lVa(Ads9j4lN+)mkjH;bNT?.c]T:f'/@*+]m2/"O&I5A$V[oq;%dp/(4(he1^6,.T3FcY.H*2$CBmB/Pi`.c%LUsNrOfpRT3rVQl7nQr`/j'!rV%Z5q4eIEP?H?K*[I4XO:\nI1V(?=9rakm8Vm=aQ_b^D9c(\eNPm$:[\-L7"Vf@)I=a);qR*Ot9F3'L3QT%H*#Jb%W428>G?4_)n"f'WpsAF$gO'@M;X>\CdaSK7LE:gX$s$>.fn?BkYkAW,5);'dYc9iZ[dZbK7Ph0KB&AA+9C[]V-PVk)>()d=%7J\k8PV%8UCmV[AcA=b*BgP`qT.9,Hb@d-%V3=^uGXD9""38>UcloFIn!^MNTY!HU0P3AT)Ut(bH&`8M*8bqR%opZlV>pZe\-.d[W0b;5D7!uMrq9ql/)FMgZFG@_f\aP_uFXjlhicjY:i(H.hsh*]4VqpjmdXZHlUaaN`PnU*[&VqHhPI;3pkP3_'`"@T.d@<2'VG3s%luNeTPXE7Am2.lB)qsNU+]+5$?(\VHMSlXj**QmhG(he;?On[9\&)Y5@OckP"]q^:eA'+kNT;D4#[93LXZ!HZtI`?d%Z5)[!G3bR]-,5+\sHdM!q!Y.J*@:-*B:k[!]@VnVG$m9K-[W[?:G$4TP,f#,4W,Q@+`0I3UER,8n+\Q#[aDk"77UKjD<4X7f?:M8Ut;QQ6SkcrW8kLsfgB+4q<)WGR0IEn:_3i<_!"(ocWZAYk#p;`8I.bC`X:Y_qqY,,pO"'jr5'?'K&$3B-%'Kg%,@4L-H9d;^qClcl2C4!NqC1A1!-#UiH&`-I4EOVNf*%)OK9af^H.K3nIB<>G?E-K.^f'.ge^btE(a%43p)+eH^pE@9,B"=KlP'26o=;Eg!aA+o-:^C[!qVTYh3';HMh*lB[V-"b,-)W=k4!\(D)*aIjfroO4.N+alW5C7n?q@MJc8o:aWlYoItYZmmQ[Kb&O$h1?J'\4E]$;N%r.+s_ZPn^fQQS5M_Ho_c:3nkakt[_-ai2DR/+;TZRs4]at2iNiET`D0`GECESn2,\cY+NB:Hr.2)o_oSFS+,WAIt,H%(.EG;2OW4(`&.Q4X9f:B>;Tli'\$@&DM:5dr>q^E*U*-gdi^lG;hMLP3t[qJ:D]c_,WW`ViV.IemlpHS+ofl0e%ujXTALd=fo:q.m_Ed-X#WRf9;BCQ24rMW(]kRt"&GO@mQ:jm9Si:#?\6<`7\`TcRDYTYuAZT*VEro!b5Q3>U0*U5dbG1Ce6eX&ZS8@]Z2_"uT>9"m"NDCWfl=T;RC$jiVRlRq'F_-eeTerX/8c>Xc)Qi9p?%Vq-q.se\63[,4>Io81gb;2&N\43H'..OY@3k&UD*#WKI'U%D.ck%&cD$o'Zb-d0VhrM-WGIcM(PcT3@S2Qe6n+PiagBtj*_E.\!OeF6*.WcZWPH1?3qXA>(_JBSSdhG8j%o-;;KPI\tbD$aee/.5*HF@H"'Qg$32UW$F)%0ja`!EXMV&9hnI9IHHGVN%X8Zi_92l$BBnPpJ2+d5`)@eJrM3d)]m:b(nk,j'V\bWU[.h?5pPn7OB9,@POprR?s9e!Qn=n-P6.5pUQ+8+dd0MVP6cYPpQ636W7g>_XGZPnSo[9-UU5]T6>GVPc)QC5:`'FX8M!G#&rt?X9FDuifJ5PQ`AYqOKE_2g%Q1i,mAQKk.OJWrY@OjlaJk5iP`E)*-8`-7c"k4-HQ&;KP3d,>a`e2[3u*%6pZDc'E"PrlIS^-bMOjrFn2,or:cQ8rO*(Jn%WQWL+EI1S@\">:p;G=oHN3kQW)HquL#,?k.RIemriTn_^XWbbk#KSq@LLa9X=DG+@"Rsccc-UT3r01Dd^+i:2UBt#E*fLKaSd/T_5'a]#,J^SqY::9fW8[4)TB29q5;06(^s97aJ/^k/"dkl1?h)L(/?o`UM+7Eau\ag.BDM'\oF;EAB"g'bF8@KU'V@^%\rk1Z8ndHCb8.,@TETI^Io-rJi5SXiXf=5\7QGLB?#m*FFfOsMa3L4E$G\_7^tNkVDU^"I@J]kh3]=;j4sR0V/N.&u=+p6"!0a63FD`s8c&ng1_C?5!e#)u*aB6KQ@KD*L(UpA@B,b8lLLB4,S\BEn5L;]BMQa,\#%YiMklfVJ1r98^f)(WEtSX%;7>Hs0MQMX&"afZS$aN\Oa0#&(\+P*@ah(2i?M#_WK/s%e'nh30PC^uVNcE@4fPfs98Za.Ie)\EKb5FobS8ObtqaqH+g*n`Xk`C*U8smVc^TSDCa;HBk)5EML5`,R]["Q+,D'D[5`*e[.;)hTNoU22,6Z">->p.\u*4X(nU]D)"T3enr73QYPWYd23_4LM\QSh)bp6,*'_bt4FVhUZQ`i"l(k!d;C$tN]C\6L9&b#n&+j$!,=AF3/,B-MGDNqZ#bg/U"G[,Y^P9g][B)%3<^L>Su%&p2<$oLUDKe\N1_2`s<%MSRuV^DEtRC3PZ]YHh'XBn^'@cDN&)DYZr)`QW>I>#RR.*sX9Q-LPrbnKO:B;]n&7,Y:SJG@(C(SHV7$N:sOabDo>Ecf)j:0([m32+/CKi*N@'E17S7G[*'CP.\E(n:Rml_XcHH>n0rXIE/.%Hi'c!*]sJ?$V,2?ABiCCVYS2I]S$U=d(P?FVZ_:Sp[`fNr;l,qR.O\PdK/$Xne=N\@["VCnKOTL(!=qbq2UTjR&OiQ$tONHeGlkN2t>(R@cHml8:uV];#7^cC,YHF?rNd\^!TShno5jf#l$Ad$Z/6@]f4CPWZMC'A9Zg.mUc_m,(M+*8To3ZUFEIeB$@ClIU_.D"j5pK0:/F3E*N$.]),TU9P[F4KHQ?%^\Ve]CIr;P?K\A"f$hVJ;uB&d$RYb&_RubD0>$SYd]*F/t8P+iW.P]!2<#p,g=M[il0!k.k+HT]\F`Wl7s`138l-L[T?,!)c@Wc2[(nnX@"M@eLs6DcBm'j$=_V++c/-I"q`$3KE&r)d''"E.E.NSj/M[^qM1^KG^0BmuG,LpG)0dCVDRV@[A-rAHseRc4-b+)KYQ$2XZ#pL:6qs<2f9qG,#^(PZaQU@b0RWf=`*P#A:J]@e'0*+R;r)kml&H[JLk@MZ9,ST4_^aXjaH$$S,%-NJ"]`onT2_b3<"iG!*`FZ.3j9p3>G]@Y:5aEO'JaPJg3oV<>W)^^O_*f$ODr\e'2\J`bYUYF,=E[u+sLaqG6W1"cL/:A7t/adf4+Dq-h2\;S9)A*4IX`aR<'hWR=Kd^qdQOj8<>ohicH5Ed3_2h>;-^Pa`Km^>tD<\er3)*_jqj8_F9\6;0'd(2.C[`(!X+:#00d^GP&26drbP3n61CWj9f#Q0\ELB#CAq8$8#"(B,c/fh@ET,s?k$nE.@Hf>V87LR<1r!fq9_?[s1j4THBf!]BF+LbPcgMFhC$i>deB`^/O+-]m9^a<0=cO,KeKqA(8VZbFC#k_q8A7R]-)u7aXi9MRWZWU\8HMU4DqHrQm-`6>/A#I%/T':M7KSh+[&*K:ed]6_bAn-]?&fXkL')ittc9b,\IDlo$*-3AW$^mf_,SetY/Ta>?<&M=jb,+f;ha>WcTWEP0#qVDDK=E6Qn_7tMu%I^<>49+W@9Tg]giLe0pY<@0T.lZN^LOBe=Y\k185j#GlbNg!;),UlP%da*hm%KQVeiFa^X\lT6$FMf/j\D2D?]g9cs>!dn8V)US&0^=igK*R\"BoP)AAn5N7FqE9OkT>@WUVDBIg@fd5%c8"?i?I<>?bN0iM%"CFp]1##dgCiDH\dXG!>i\0,8`q=a':Nc&u[P'Sd:_@4$r>,eV#=#El[B>_1`5#oKV:gp0]ik[TEQ7a:7*q?/No%)OlbZG.RG^_KS;q_QT1l3sP;7(eG9l6fQJ'%S>D'DHfc=+I\UjWSo._@@4*'i!:-T!Q@M?]X\VDSUO1)T+,P$[EVFq^A2)YVA;R_"3,,agKROZnW$dfq_W)s*/;$_I2.OOZZtL\&.&8WlhcWNN1PT*FX2l,fCDWj@W_#I4_9l?F]f+FuG682q#;&OZiTJXfaof8B08p:8=5*$`]6lK6:O&*P#BFJd^?S.-Po#*Q/,F\mYk4h5q)^`AGaT@:*0@*+`)5>K"'"#/;3UWu2M=^IiE\!'QZ)l3l$1?Td7YqaoF'bVX`KhL[rVl^)V"Pbu`L#ZXfj-Os5l[6.bVUm^41V@?*2#9BX5AXut:gESqjeCG]!t%)a:/#2b:!-)$H#g^Z"XG'8&Ts@01)G^``Hd='9(F9Mo;hZ])T+7^N$"(4!=TG`"[=/o?aa&@ZaTp"KUILc'A+b_-jIUO\Ft-Ch+4F;\gOaj2ipD1_^(na;FH%^1)"S[*"CX\0`6#DR1gXk[pjQC(A8XueW"Mk,D&6eO+$8cK:.@U`lN7"@?)kZbYXD_%H?4O(X<9e8Kd0`f.pTi4+\bhS=T>=!2+lH:N;-4Q2VD1iGGErC#7Z6`tsT7`AFG)/KDqlpMhf+!X(4Q_p&fd*JUWuAn-.P>O>Io;s/CcS?.U^.'$o0QU@9!pu]*ODr1=0m:5h@(I)6>k?Z;!e':"#ham$Xr>@M_[Pj,jn2K*U]F,eqZW'(B65sAJi1k(=_N?S:rS[8Qqdl2I$)=7W(JBluk3;C6%gMH'R//nZO9l;i8ARs]JAB0%&S8%._4"XJXEQ&X%dnU(St_$an5-qbY%UsE1B)ckS?/$E,uTT&`KnQSX?rV)$^u,,3Zb'Ee,?KH?#?b\Dl;;lp8kfL^(P([BZ?'d%*GGGp@e4DsrD:Nk;k@Z:]oBiX#AteBBhF+ISd^^<\EjY;Ms!cD9YWNefV<]1uBH`&.a02$qQ`1>3s$:Bp/W2_IQ]k]7[/+JV6\K*kNNHNoUb.>LIsVI:WY6:%E0+B/Hd03_s*_G;gJDDsAFn*NcCa5`Q]p;b3`CBofBSClJuqK0%iD:]Mr/]E(,QsI;F=>-;'=*Ud!)<=A:t2.A%EF5@(jAZ/8%jtiEc)siZ6L%W%`@GAou0aiMq",o,f3FWqXfW6uUea_LT`T/p(p'I*)^][dLV"l9+gr+'I5M&"pMFq,PKN&q_U1),(k\3$^'D%P*CAN;4V9h`1kAa:2i/LHq5RO.iCu2\]drE/I<%)6FDpSc4aG%=+l<#PDpuApL#S]23l-f@)-)dlA$fR>R1JoFm2VI`ToJnb7C=HKANjU9&grBP,lMi7H0'Z;!3.1T]9Pp\'t=\#1?#J$ou,$S;emLebZq\eD**lo#8;VNmM/k:E'Nr_!G$g^,[++=>KqZo.JQ=2rKXg$9*@A;)e(Z-.O:B=Det4c,"CU19MC%KaiS7qNIDG%'j8-h"k)SjsW]KF$)epb`;!O]$*G**2Q5=QN&"uX)kW?E;!U8OD&qX%g`5a:ddGP>81K]7OH^dB5L*6[l>c@n,?\II]@G56@`aM'Mq#E2h`]/QoN<)%'qWJ2Lhn>TV,RGa]>(\hu.0%A=F7C@iQV76-t@+&l86*NmVXOl&Q@E3fA_ec04"Ii@&^BRsd*!Q7/*C+k_T*]i[`dommY(@U]+""8Y`^(^[f)@r888Y-%em$\7^TY[]c+1k#,s3AHqnZ'Yf&>NiY75Fpap.+EZY_i"pk$im_:WAI,:X4ETV@DiPYMKdt_V$YZ)03`46jA-Rl2(Dh'2VW'FFo.>W*-L'F8fe_o6aiX:CP+r+41-3\kZh8U"nH#:@kVA_s\?'FWatT?CR5@`gtg#S?2^LCWpbR]0B@M^ctEP.^\X)G!G]L&'2FP)>^^E&A,r46L+&._d(UK@_93(OPi_!p=^t4*74JXj\AL+M(:P$XA\q-JbcK3A#ZoJ_Y<*cMQuIjucri]9KP<2%,01aTpBR'F$e(0Lk**=ajIG-i5[7Ci@V/qih3^EBcrU]]'A`9Y_6Z@.h2@\BXW^^A'/*GCTr8%>Y03Cj/nB'YRG,j/Gkn`8lhRf'ZgddCmjOnNkr.8:O(DC7bs-9@=k">K0ZY?i"C\!]jM1;>A788)LYlAPUXO3?eAMt?n\YC4:7?9b754hDnY4sb'4?:pQ$jI6;/gZLt)HC=+G;\8,NYjK&.nWc^I"\NMIR;.4"F-Wj)U`;eCmAL]i4MFF?ipcPa1E=*1j@?G@P#:@c,X]af-W9OV(pE<]V:M!5mnIP][[]#E/tZV_a,]E2k5rZgmI^"9G!.RnH2N@(KlnhAf*"TVV<*]dC&-)n,NWlON8/[0\IS&CPA4Vfc9A2YH/KPJ2Ag?oSo$s8Dd]kiI\`,-T,)AI:&>dee+l_p0-?\!npk.X^iXa]brm$"Jrgpl3":;tIP@n/Lf`^lmo6S)CkMGaO(2S/bn,$ULq%EZI`BJQ9:WHebITcPGrR>0Zb'>caF>JAC%!^.N,L=qg2gJLi)-eDKPbm2CRq3I3X'La@@9;("On!3j,CREr#F]Dr%WmbQ,)58^unncW`sfS*/#.kO*f>j>,O$.Y#!cISV`_8<>">dJe1684=6,[.0cXB,I.^f4/D)W7[_e.:JfXCV8!a'HoihK@_[%s%kEQ?\3`A#TFfWt8?+q%-9\1r;42QL)*\cZV45E%7,I)WbV[!./F1@A1!Edt-YNk*YLToJoGiunHnQe4r19au'i;GmZgPjrc6&/7^-TQ6-[TF=ERP\\8@F*3Bf?)4bYMqpTf@>PGPG>l-[]GD.ksHehF/M4Jdq-umqXIp``^r22*=KR5^!f%-5$q4[5'HU?-.KQo&t7?1^Uf.0_^/&uLS&MtVR'uaZ5jgXuHq!S&:+#QTQLaZ-rE;S4(]b(j!qVJqDjY#2'3Sqg:i066s\i6_3YAoa(\++p9djpM_FId!mb\M4Lk*+hCjb.CXW_OX9NI2fu`9f;L>nF:bdr$.F5_Rd;S"!-58dVu8e$i3JRnoEgAV.QWkl'G!8.'^9p<:riO5^$jb*Kl^3?POT8/&6mrosA,FB6i^.4]Z^#nBS2*kK[d0`=b8N'.uHmu]J\.2h.Vj&>N:+]t*K9QGH8MkqFZUX.Y&86>G9i`M1n%Y=hGa#R)rd>P""8[h3GlpUAHGTR='(*W0.o3cq^duj;jiDG#]bXW67--2AdSfW9[#g'0I")sj.i>"UARjF/N%tannL"=g5SV60:Xq<_h_L.C4dU&4=b^M1D5LEBB!r=h9h188dVSl:UNL^]Hd?0*?D5efWiV>rQnPr&2BdlTW`G8JYfUb]>e\Qc_LpFO0Hj`;afeR&?+61-)&Qo@nskX,'\c$K#qjkE?ImMi$T8n.cX3QDIo$=BCiY-Em4F&"bkT0.40Kqf"R8;+i!22p]ecoNUU&!!c=JEp9r0_fZ%;#9pj+ZSPLqG_g@[rRFPfd=34=":dAA0kX,-PM&N&ckQHK=jPt&?[=gh/'gKhlkiP,XS\I.*WIS5NRr-ObK7ZO7@>GbX]29=[#1s.ZDmY;@3b%E\s2kAC\Aa^lC'9>;f*R>o3e"5:W=*BUXS.IbPa5r?[bSKS02BAUh*+2o2#)R1uag@PT=6Dd%bum+4Yq`aWaNGB7Jo#(Dec%Ij8MsgQZ/t+,DNdYZpOcbNJU`&*s!*<)FC0LNio]Oi_K14ro_A@[o'XEYYb%1r!C,gD6BpY?EIQ([^IPp-DgJRBAVd?P$%sD]a#8$O4h?[=f[nYsFI?ab$lG=G2ei&SUC:pI&jrrkG78N*s'@?`hl"bhr6o:qQ8M5)"-s5B<&]t(qLV0L3n\#bNp%.S>b2@M>:7]T%;!kA0U=TA)ZgD8`E6Ec*E#=?I+.IAbC?gq8a3V#t\\^2/q9)Yi:I;4[B?`bOjNgFXl*T%T::H#l,%R<:,C=kt\:e^YG$1uHo?k"+W0WU7l`]JZMUePrWI)2Xr'P^@e`h(%/u_rGEUd#c3R.Hl&V0$@'pL.NU62Sj!XSF-/XD]1IsOaX?4NgqBZq8r;PI;nRZqm5\@h(o/#`PLr"$@d-UI4\f!M;#-aD0[=]])Ic5^(TZ:.dXiN-81i7#!eCq&d*Z1\!\0_gX0$?hgLan3N=Zf(L8AY;eC./V(bOIXWD;64nXTLX0hacc=+B`4CdrG^r1Hi<5a2?Wbs'":>1rgG/Zi[$;=EM9AHB>AJI"%1QU-i:(.E;8[D]2_`n9.7q4?9lnO`Rr;1K*qMkh9r*n/K@b$/`ltV_[<1YkWlA+;]Rg%&ii?mV,_rj0ae^"NVn<"tU8MVj:rH21IH52VUKSjQ)k=$r]Na&q4j^f3[mn(h/=n:Q@MQ6ofDO(ES4LL=7N7$Z3[Ddj2D-H+:<7JJcQGCXF$Io$2aJHqpGEW;k,=#fN8PH%M3s%p)])Xf;(q'?$qE'+t4k9J6mXM=Bq8pt\IN5G$@l#s02+V>3f`fUqM?M:Q]:X;]$#]HL+-5)Zi#Y=YOb^h)e7:Bqp\\m7nR4n:2ct-U]?/P:@^aMKN$A/XnO^U;EoX5gl@e#?7gf.$#19N`6\l?mf"#cEf6(JS,`3/cUKLN=M;Qbk#0g>\P>N=(p?BVN*S;)]Kd---Gl[#pQ]idSFQdgg9R;)cPti2o_]khM).oQW\&KLn[h4OQ,7LK:.%RNQDg3NQqt\.AsI`7b,SILTAmhR9D)]YeT&OM4?3*S*8EJO_anpH^Abt;L(Abh:p>$[a`I&^Q2_8/Cn>`Y;68M[ChB1\k]l`^6ugb#hT.^`1o4qtaM*Y4ITdg&@\'oYf!k7l[$GsT.++8f+n8a2W[uO4n"_m823,'Zg9aYs/uF>>6S?Y\8sWP_Bu[2pcM_9qZQ7:1eZa2JG;rK]D=gt030C#Bl6o1i(M`0_*i=bHW=drUtJ'k\BUgrqcOu29_$/jAm(1u9d.lFNOXCi8dS3(]!N"/I(9#JX`BTbhIXC`8".2-Q,KdSV011-3J]0,2^`g0Ks(af'q^k4Vd1(RQDkSGq9$GaZQ_GgaiijP)kj)`)JOCNO]bei1p!niUK0^))du`'6]Os"-^4m9Ob(9%3ZP)kTo6m5du56h,T<:/9o3-mfAbIJW7t;d7)a.CgTGak&*h.ls]4f4,2u/T+kBnB6Ql<)2.Tlp!E,oU.C/?'gB"qDTFV3bM^_X[T1;7;?k,EK;Ed4Y$Mp%Af:j>AWsPiZ%'Cbk=)7F%8S3eW)59K@[QeBR"oC`DHP!X#:Rn1?"NT97)j.'fC(q\4o!i3`,OVuKaFo'^=gt=lZfR1$P5!eY$G^L"c(r0/mW?E6F#]uOWN<3N%3)[t\kGE7gkWb?1-CLcEV+ABkM]R3hNcj$i8ai^'2bZiVKc5W?IFkf3\+g9-[?$+n_3%CHce]TCGJ4t4^9+""-@g,dAAUDo\URXa`Tp'ap:I7:71\VaZT/LNQ`ML#dqY##19=)>]_g0:tO;.A=fW$.pMF?\jT^^-("=SDAmqPT/$$3*T'oX@QG@pO6%bc:33#hpB$N3RCmQ`BLYa"j6$/$]ln$JPXf08jmm[EFH)B+^T'\u+NdC+ABD0*>FVF].>;)!l:q1EnaG9J4h%rTI@&\qj!%(iM?6$f@5H218h.6QN8Rp!$"GgO_*QPe12&,6j9`cZg1UQl*PM$GM#qKo&ar3>CW(tgb/d]Ca=g>#e_u%(BL>i#SL@_kC"+Us=6U4Kt\fbNLhZf:00fmJ+!6-Vc*[0Dh[Cb+M"p"H"\VBk`J"a[*XC>8=loEM^dVe")="n'W]2b(VoT`0NGm?:*idR004'bSh,6NC.b9SuNH)CQiQK@[q6meord0OV&Q5NdU[MlCZarWrVIHpH@,B:ouot7G2Q9k6@cM@(DqV*nndS]o+j'E'Eo)-;2J/BB"RDGVEj".`8ArB_!p#Uf>cO5G]3G'R46pZ"&5niCPhoMTC^rMdLl6$\8mCrJuAor8*kBfY=d`U@!DRiUuTg_6g=BDmre3`G6gUT9-Jtc%!Rd\LsS+l>PPS:RU^.ToK"ZR@j)P2*7C%KWZ;)c%$MQpD'KOO*^kLFhK6N.p!BIhOc!s).j?*X+FcZ7os^a*;A*U#rd-kbq+6W&]*%M@of5P5BCJ+gZM:%9[)_55,($mL;0J8V0eC$8s(M_D>Tmli"o3?)a+1]M@sCe]qf7(sR(dY!4^d0u;Ue#+?6;39r-N_m]6L-@8'fIY3J347+'dT)cmQ)=cq,JomjQo-S(R=ph9:)i,Y90I!43\RnbLAR_3S2kmtffWtB2Dka[%%2_MN]il-8ahH`U$;PAm*%RS]lJ:Bm]YMr-6idHJX,/gD0]/"5]Ya\CPca<cL/%k3rpW[OU2"Kkis=]`>^i1%0A60!MlXhppTcG-oqBNpR,K8$+UU`B9(5f(LCOMo":\0`/F.&3)VV3hlD1#7LDMF_GaT(?lZ.#>WWTb];lk&`@V@UUA5.u:KoLj#Vmfu`qL[iQ+FZPsB>fnFp%H&imsY4kk(!F3!"Z\JhXR-[q"aV0M/t#UaBe.4&^[DD-tkr>eQ_E9oT*B..G106V=g^k'3_9B5L)Nk[1b%a:3$)\TI;E]?YF^R*4CL^2GZr"P[I0%-'0?n=-l'hJS*S5"4/`n+ah^)_f4)WI)LWGHA/$4=g2i4WPTFNdlC\2@57kdhEi0]P.$IT7uc80R_QeU5#HYi=LYPguP*;Q!MtJrR?]'5*"I;VTV?)UY=A9W+Pa94/TA!N2CAG345-;brDYD[1O*Goi9"]Q_&F#J#@.%''C@KY-WqY;FnTEee-;U1Y1`ub?R1FOG1t;]uBHIVDj0f_FE3,b=ApNXirB?lt\F<-50.7MF"_*/T&-\V'fO?\UKg!NgVi^gSrq2et*K#6_Vf&nq9lgqX(;"%r&+&qi,$?bs:Gc/]GqQiQICSG!h2o7)_QCH[7$cjt[2-gLH!8nC[[EkYJPRrquSNO#Vn[KJ'."W;@P1K(Jrk0q%H":TEPbjui!VTe]4I(\&UYM$.\(T>\VToH$4e`SrtN9=tr6Nool*)Xh3)GYCf_8Jc\DC)B#@fJ9Jo!DUrVqXDBp+bD'`a`lS)M's;PlarS1joLlomWjrL-\di'g,]aQc^pqe&g_r[PbCb9?%4T*`V5t=2\asrIVV#5!=2>9If=>g@3DmuL\laT&&2cm2jL^qAE8)jl$5$^NmPY*tI&4dWIa[%7M%_%3^/4ba5!PsH:l?gj_%nsn;%6o'FnotqDKAlJE!n^$2k,V!/%?p?'kK/41B)7cl'[ru0e#+8-o:@:+r.u7g*rZQ)i;%O3Qq/[2`&\qJPKtF`:ed,^!NNtD>QGmJArLb%,dJ`-:2JgLGa!&PbP==W,?"jYoGrK>C%"QB.V7Y3%a!uW>mP[r!d#j]&CrCgO>@.2s$-,F'=p."]NY4LrQJDuRJ)Kbp5C1dSXdBB=#0OULWHLg+T16R#g5GUC!7ut@Hlcf.BoKC=!PtV/g^iT#VUsWas]HGc@*`nDr@.1T;MP-s.eiEO4iWu)KH'p'(f=/.]K(_/dO;p;ThN7hn5c8nf/-CmCq:\fAi0oITStu!\)5#ZY&":f+^Cols2W.i!p-GInSf$lLeF+hA[k6.alPbU/q&b,K](X[ctjkHU5NTrlD]ULXm<..Q$.%)B2.is43&Wen/#L=i"*MJAN7o9p]l;^e<3gUQ;b*hg>'l:b-ipm2pcG7Xj+BF;^h;];_kWBst9T\).3KZ`IU@6:DZ!XF;5$2>h960N_i'i[L2PNh#cd8+WQ/jAL5!>-qZq[\_.7G9ejnOGpY$OaSBi2P''i+AJhn*3XRH#l0)X6O#RO(/C^SR\p/US7C7jA)D*'4\#*H\sN='[=GGam9lBAOb5g]RPb(oQiUa?nFEe)6rI4\YU$.5[C3H4B-35leRFBe9q:n@lN;akRB6Xs.TSVMn6)LXc+_A3=H?RZHO]-!06AN%KnIN8I-%_)+ocb7=4]Jf6LHIf%7(M]f_XMNCLpeH/opJ/F5)=CN?U0Q!uY/U1V=M%$NDIdTIYZAoI,&8U7Ptglget+6t$cPKK'8aA9@'h@L(GM>fH3bcf+bO/hdbn-[:C(*NrSOp#2SLJ3/fMjgX=`lDm5Ad`V"/IPF!jEt-cD4q,&'YT9(qj="[Rg^#e17XKY3ai<4#W>#q(P,sHEsNXpRD]n=pV.#Z'CUtKlt94Hq0_iD?M84r!RQng'ICBsXWK4dS@0ti==]f;LrQAkT['a%E(A_G*hA30JKfA'8H%[ln0HS:"cj^;NL;Af+e?/DfC*>HmI>-V\@7J-N/8\A&NVZdoRP#akkDRGe]bTb_W.lc.OoD&$UIZV+sJ$KBtNu^hYQ*Cf7se\)r8=C8rA4VeVk>QR2o'5#`\X!VpKfP0L%<8AVS5jo@1uo%60anU3DOUr\Wb((0/*\ebC3r'`9.@qsaWALO*a@Z"kTZR-EO2l_8k=mn=[L:QZ.o^efmM_+P.>$u+FX"TnpT=buK0#A3.#>[FZ&PVeC;I)CqM,Fi"n&n->>0]29hpj/U1Wb+R_%8D'.n&jJ`00I[*"Fl8dCHsP.!J+EJFU`8H"`2STP`.e$!81'QKcj8:QR!,P!]',]VI0V!$7*\%$m&hS9S/5++bJ5e^U#,[8W7=;M#K*?i7BO[1$_T5r'Z2:k)YkMaQY$GT;ufOr[/JB`S8/niS@L38L0-?6k7GfhVbrK42RPa]M9Dg2SE-[!:beTpP$Qo/4.a_+E@SY"8Do$il3X>bo;r_LQDWO$8``]3%X9^9teu/?s3s`8SC`EKM&8tc@]MI/5M*VhENYWn.*&5:-5V'#a+p=k\[_tOp'_Fl=f;Qr"GZS^`rPt$HNo7'6%Pre9d.:_8[P4Z<%ZW6['VNT>WrX?cmR9Z7H_L!Q[5'6At;_&V),U3.]\9qN@nOY'c+6>#,X.7'Ar]3\T";IIVlWS4hKjROoUF"Uo-q/o5Tl+jq,W$c^7XFlehq*p]PfQC6?E^,Ylb)a66!c;\`_iTPJb0qpc!p?,)WlM&Tcnl6"3YK3Kf@P\Z@>+eo.)jUU;dLc'L%YetO;2,%mRkB)+,W\2:2LS'.NnHcdJ"$p%FG:%jD?g@R-4[Zjj+hVhE:_,LAl42[b(]tu#LQRH)gYq]FeHnDe\GBsPLht\_*/g<-SlZ\c505TJP&kF(@>PU>OCaV'8_>@%?"dE$s5kTrHMj9g4%7MI]"fjGMeaLSU3L%[1(;C?s<^qZiE)%E<:qB_3H0T`K/!GBu8^p+U@a,.ad'<(j*<5XGe5pTH.^r;=qZ5S-"$%T"OrX2,265LQ#M7IH7.Xq!_6.@!gq;9)W.B`#!*k4gET-'#Y$'S[[dGOcjYLAs>p0s2:,9mZ-.G_9!?\RX+03!;"JGPpes,m"954/bl;;WE;M1j4C:N8!?n5$^TV_\C%]Jk@c\G^lrjX\RH#Fs?U+hWc\#Dtm<_#CW6Yj?O\;EH`p@%%.2-%sGt800Q_4,ou#psTU.6Zmas$*hD2M<3=\MfZI1^*JG:L5/,2^J#pn\5?;iS@*I>hVDpb=O5rT*S!/m\W:#?[f.kBFJHP)P_:Q=1MN460.NN8^Gb#J(d92*rf$>ek+b,=AWTl,f5umNJW<=N[i%(`&K0-oQ%2`K+nn'8:X*Y^k7Y;J\oB:pmANnTI]4+#PMss?lI(_<:HQD+(r05,PY8/E6rS-5gA4G->A8;!KVE897=SrJF%LSrknRm*]`OlimoGkDhpIj[/L)CjpBRkna#l9[(CIS+3g@sobp9Gg$P$(%\-?1o.C=&ttW/&p/;0ZWgD"#qjPd!Ad\)T\mp2.Vgnnn&.qS5,ORjE`Ti-7rJYJ+;OYsFXOpIb_ZA%XMs`\$L:'GUalX%qQYpffF[d/u6U#D=425d[233.opVWaDmK["4:7*bgtb'(PYmYfE2]W3=H\Y#7BgKUDmF**LAP4+;*;B%t-#NqlFOaBqbr*m\[3_Ja5NKD6?>Z*Ca&0cnK/Se`,>3u?n$G\l%s"8.f!;^J3FHeDi%aRQHBa>?E7T4Du,aFRBInRL^F8@dQ?#'Y?9?[]=o,_H5^OE>ZQ[XfkZX5Qbf:-=%n&Be8G&\A*cN)'>:m7p^`Ff+Hq-;8otcn[%NIAW)KggcLLLGX5Ro-&okg_62C5$q$!7%%@P=4fChf)@.e83sAa`p.fjg@hjE/3$s@W:6T'Z2(Hr0X"9Js]/b(r*aYOOU&F%mX:cjolAT9LLQ)O@[OY^[::AFm5Gu5_Og>+uR=7?(]S/B/R8`0iJappj$r[8<05&a/i$pGk&gJCT[W8hl5uHN?I/9/ZGN`B,U!!hQ11@,5oh&k@o*c=RUG@HgE&&9XahG^e[h!8H%#Nb&PH9G]_l[s".-"Wf'g6"EDPYin:Mr)WB9lIf7M+spbEk#ub5JP>O".;Pj%C+icNIRqP+MJ2p$g@\%W`@ZWTph>YEB!X,QaIr]$Z6gc3-=k\ZU/]Rmi]\$_a/m\mSjR^m.gbnNJm66tcE*JO6#7*`Jqb<^A[9#a?OpI>?h-V)srOPsenNnhL5f+k^*qtf],JsC&VB1$!]DV-^a/@A>OHkZoljY**6mE#6LC92VWD)Umb'*?]=6a$A$L=Xs;6G7=SmE.D\A)*F6'V'a)`"S*q$Ad6)a([u.97bP>05/1p1UO64#U"_aPAkK7m)3(pZ@+jr+G#,]mi'(\4C,IB+LO4/oU'n\"VW[k\O%&5i0e4:.Jg?maX=>.3]saQ[Dk3FIc^g9ocR]7SFa.GP7K7LAd[uV4k;mc>8fRdI[=HL-J,-*H]5ElaoJ:Rdu,arjoS$pE)Q"(U"hnc<->QmT49"1WEY"N&r'WnL,8%Xi7J;"qQHnTo/V[0(?,+ko[[f[c'g#HTJ(0d?\f,i_G8of9DOn]G`&oeQl'^KN*l^nCdop#>/Up,-u/m=O>1"N4AbDGk+d\eNY*@#Dn0_^DHV>W51A6t;-Cms;rLu=L+FsYq*5qWY/ONm*8k,c.eOSo`P`G<'::rcltC`*\KGALuVs)N,c$8qa-r[@GDDj4SV_tio?:Cj5C4GO2Te,(fI-bdO6R=D7\**nm8A_G8N9oXb*KpA&E^p&iO_@TUQpCR-bKCYsS9Yk_8_(k6>n1?,%&!QJW[i]4Ap#9dG\B[1CV7DT)Im!k=UuQo99R9Lo%SX:DD.&eL+fBPU6"g$1r]/"C!P$?4)OP[d6CZpR&EC>s=U#8(TE1qd))FDI,+^T>S4W7M&,%qV+5P/inT8'5cgNBKq\:H.h2I.\rpAd8>YNO+tZqIkZZTdKeY=%4Y@K:+E#>T0(<04WIj'Va"u6<:GBuok4$+SGoULB/sGd/WY+bA:FJqh16[1P=oG!6'tG?UU3fgfh"P+kUcD3@fO;35U%1'8^sL'iUV3@(7S2I$!j"m>"r:Z09%?uYaZP/dR2G[ZtCM,gAj9EkY&lh_OO$uKCP,"GmdRDNoR4U[,g&+NKV$%c63QcTGg[V[Qg--caXrI5oD]jA`[=_#,"*P>h7\Q-C0Br4bu,Nd(qS#$j/-4[IQ90dV-F*'+'0UkU)=!")7Gpk4-ur]o!6n.OYXco'*raCj#Ug_pd-$NjdWcP&?3Jd1?(:Z^>Y.!!+e:r_EtJ(f+)hR9M@Nno.mKmejEPH:lCRurG<0\n0"p@L?GAr]uP("3dSucmVIoU+m`Gi="^5.*r"GKd'3tS/hnI+G;>%+lgaY5p:Jk2RFbA6e/*m.a_"Rg?=/1hiE$E*dNHM3&pqa0ia/_Qd*&+ha>2R#CCL?B/n!JV;Vk#>e+tCjdQ?l%W=MU%#7J,3p'Ot#TAJ.RN.k%*&9#Eh@1Cm:56g!K7,i8q!WWZT;k4E7$7T_P\H07p]QV;j'9Kf^a;A#$CdQa3D(GA9."BoOpr6bXkP.J%Ppj;'WC01%l@)nreY>n83l.;A)@%3cU`BI;'Br2''.dhXYh)j,,Z4_F):Hs<+++@h*02EK+:7s5PLAH@`\l`\N`j(*)2CSf<_MNglS4gP`OTEBu,dFG\Z,>FCO&hN+157NDkUH(jf%2C*_Ib7!KZ,*?TA['Si[sMP@7>mT6-.HICNB`#Sru'BFQlXrF!g_As$9=FVAA0`>/gmr%H5C((]^QIbIG*H/4P"cr"4(`uNWIQ\4i085>+;-b0)3otJKc^X+u!!D1][=(!e;$e4+<$S8[o@\pt`'d9Pr6Y;_eZ9j-R%76Q#=MZaF6c/6i7g,K?2?8""FuJE0O$6o2;XF*:3,6V#:Q)0?'pF4X>@N@1Q^=`/NbQK\'6>d"`q#.Scj.-1,gT20i:*(T^'H$_VrLJf03arWVM(,M-PNBn%>ERr227mj`qD_9gRL:1.7Q/9KSP]"%*d(W)icKi6<0LY9*Y&e_nb*ci\II-K:m0>87W8TR\!kT!4RX>>SiO]Fe"3h[4kG[)n7n6.Z3b/!=\S$[/UYkhd8W4aM9g6O[Lnos0Yhbm2qf$1Beu`kjabr:Oh$&Vk.Hr:6c+(1]K8?E16,KJ@(^+Ni=:ejEgeN7?0\@>"AF-$R+ZgQnE=_\uS7KZAHW\P,kIG)`nis3n.F7g7W^#8;gfl^)5J6n(J00CMAu-o%5/uBbK@**C>0l,":BIqfDqDj[_DB=&&LZm6q1hLpcI52H^/UeQc!_iG<-:!Y\IrQ4f_-L=s"ugS8l3Ju)!F(aO37=0pp@<+Hh49tX+g\\Q+�%Xi,]h(qU-Q>pRA!'t+6n`[!U7gC*t*MsZnb(kH(2o;_fjoE1*UQ::6DKr=RaE%0.>Tg0l9)UUtY_&1k(Eo!6.Tq(rMRC!,m%b9fh"8!OE,)Z&!^)f,CT.@E$_A+7:g(Z/?e6MLtSS=V'?7mLO47n[]I[3%,b5$69Upc]B&\i[BS`6:$e"nUj(M$l#B9"VpG8Mh\''^S)-(5Is5hJ4_=h7`MknD3884=c$mQNC"7\Ll#t^gD5]M9oZS9;//#?Z*d'K[Z.^I&Zgl2[A#nqL_V1,"8*"N9#kDEVpM45&C"3FmDjJSmH6kFp3\0]O]c/0O[\;>+bTcA"W_;1E$J4*BOi+k#4TF$V?Mc\T_ad6Hd,CjHAK[Bh8=b=s)"Ek?p%h3bJck6L[";HOkP3=_(H@`mh-l=VoEPS-u#,i^#5sCA9:0kp1Pt%W[3KMi#)(3\VUIJ?t,+9'Q]GMK]<8MO!@4(1q*5[.nkHFK@>csCHIAgkEdXYdhgV-=>]Y\3>JIE#RK]$Y1?F@3-/p]"?D^*R)['%*3I]X!Pj:pOLD,@Me,(u&A`CeOc&s-ruM%aU2,XZ;Z"H\L0"XFeD,R2a4R4G8H&h__n7"7>gGG!ePL-MmFI*r#i6,B4ullWFuCk$YDe@J7(b>E-XL.-o.,s;A5``EP0opr\N6BWSugr:b9E?rcUH\n3._Hh=6Ihg0`>$rr_9->H%,E-qm0OTWLLKij#@?;:s>I/Ddl7)Zm'B^e_^\?]Co?^_E(@2pDhM,SFc44OK2K=DC'4uX%,T/%o+[E4R;s9="#D`NQBbH^]76KQNB<;Jl-%]ifL]bfpF/A6I0cUbio)=L(3[+4Gp[>Pc=E/TlC%Qg7%[%?7I7M4'phC""5cUVj:A>3[+DMnB]Be%_U39=ppA@$c_jg3\46rS$2=gWmUIc\.42PMb[3]$+7aS*>ZJ&G3,UA7'!`FhF">$j78q9M>T$upaAbY:0_kdPJO^E\iI?G]uK!2>T?6dOI(d[gnidTl=KD;t=Y^B5QeDXPb3A,a*9H3kKdk8?A#ORT`fW'YD7f0p&+";2C81GB\@>J&r";7jL9`SQgcWE"L&Z]"u2'0>Y/"n$VTn5QU;Gmc5CJq:sCXZg>n%/#"1rsCbm<*uJ,hQpL3t"+]6;b:G"RZDiOqDntVc%Des"GPrmoB2!!0dWgPa&2I5gg@FNl!$YLDPMHV9Z$^CP@KQD,$[[$>@3lW59[qJb0K!d-p\XD.i;MjNSqL\hOqb:25h/R4=)MFo.2,aj9TE^(rEA"F:@\Gt#Y$(A#\41'MWt5nqO3/hrB-*hrI6';T5,'5;UK^Bb5GtgOS:ifAZI^KR_DBq#9a=r'(__rr0+lJGG`*"5sL-&U^L-R;;<.D^HH7%%\FK>'N[@q9Ril^61GQj'!+Yr8P02Ng5![0[A-ki8L*rFl!;#o"]#_e[m_uY2D#k\8%bCgpX2/t'THbsS1mdqZgQU-=n'02F7Z0m%uO$IbnBkJq\,loajWYjF-GhV,aU3,<6Sc_IQnoc)f:-PH^$]t"0pM@4!pdBf*0ub.7'/"_<&#+;VMV-l?2dN6M`^Vi/J8B#RWWE+)BLj7rqYn`=rs1jU1qVN1@_!J2;%n5J'adNe#YEIf@cRMC6hn%Cc?!sV#H7E6bf!2$eGE1sm,XT_1+Y7S3i`AIGAHY):Sg__MK*,s++M3+@Ao_h#Z5MDbPn#-J^<;SgNL*/\;(\(T!kbau+Ch96dS*J[c`p^5#onQFh_GCmH8LjVa?.IB6;*l86;-JehJn5@@_BM;io7mi"FQ^4F6urB8.gFK,OBCWUMt2U6;F6EW?fttW3smF(#&m8K1SM40psgW0?@ZQZ&5YR3HCC>'ZE\U-lP_1/I)WpfHoWUA>_m>XL3B%!!*A2HYA2//\a?<)44+PrS'.=/fC/,WJ#)sDTTC^a,lfo>j_7]K4Rmg8o2?@U$_98JQQkc.NKs'At8;07UOjiYAFb`N2MfjLFU!YrpNa<;L$FW1L\:#$3W!SO<.h(aL9XI`+)h,sG:DpmTXD@Sc>#\kTsll!M*"&.='#?[UQ2[8,,2j@H#<.k&G4:11`m4W0-k%kO12ef/rd(tVX!9X/?DdAl`&S6Lt/E#WU,U>jr(da`GWdM9\hk+(kD%22d%@2hrB=c0dE9EDkF&ngIZ]o!V;`lu_JNc`L*fPNq!D,#3,CsgM&O:&R)2:s54%+Qu]Q7?F%ZqE9Ve'h3>G3^g*U6/_f(c*+`OOdCi#W@n#j,\nN$WTW(aI4#]TK5Xc+iMI"/B@U9++IfD*mOV(%OnuQMK;f":Tk8kC=G5;OA!0,jK+8/9aS740)Q+QMZ.*3RB_5Eb^f5&st56&;49Y#?n./'QR<8[il]-\kspoNJ@]9IXI!(plIgl'dBLWB6KRhqq:j>nT#&KdW4LRGFbAO>Gb\(`M9rB6V/Inb,ICLS2EMQ1d'28p@I8"HhY=>1Bpl.$&5.D_._'4RR@?,Qbf<(V.)\V("!+0Pl_Q"Ar9R@6&j6P5R)iENt2<_SHApTF%"^jJlDn',M+Ui6(U'Y9K2`N%9GCM7"d]rBQclTN]Up>E(!1Ync))ollhd70)4tRrWij+XfDUFRnEtH[XW%^BM&u@\fbj;I`PJ_Uf(A=LVF]5o@$Y]dH1?IOWA`!&I*'Walc/AX1(e;QQ@tO0ISGk%.nTG8!s$hFudj1BR(gRK[-0D,=`DDp)B@_"/a$E56:jQ)C*RB-jH;f8ip:@t#+U3Z5f0G#0>*:!1M'^of.dYp+s;9B)jq\@:b'N+?YSU2a)bMig5[&=NB#0sW-dNBn^lOi1StIILod09SOc'e)>J-_7)PdJFbka@YfQ97DmVbZ30k\5"-o,Du*JQjT"q72MpkO0"JDrEr#3r\gPRrm3jeUAqNVWnJ?WEs\m-'grn\RY3D7\>?`<,P>j%1fQFe;UIOJPJ\>`JP@22:.&!qQO<$!<,1JYI0WB:e%,5To2>mVb7SqK5ijR;G'5C=h>aJ>8_9OubLVQjO_d0)q7EEE`bcu/:Sm8\ll'hC9e0Om*Nn*<)N&o^@)3jPtrCSBUIHXp%nhZ%BKsc#MV0gk\l''7`HGRr86\UD\Uu`jn1c36`J*]<<)>3\H>=;;r!MVrG%k/jZ!b=U$7[QZG%kJE;T-EamH4-G&k#NJ-Q6V(Va,iKn,t80>1PQlgIest$]Yl;9FE7P]s%L*c4=$MY8)JX;)fF=(_3K_D'#),P'g"\uo[g>M(`J2_sB=(oZ7Cs2GF.s728@olL&C*6\WL]/1U]?Lrhb+'_C2\c2No+!2SiZqe.^u+M0u`KP:"h>!2E0t)SY5d146..^L1[]U1dScn@q*7`7N=WMo<$Mpi?RO__d(-'&gX((L_DqjatB],9k51-U?+k0XOB=ZHpcEb!s:;X'I5-cKBHC2gj6ClDH#%CG>Ul(Na0uQe_.lgcSsVj!H*6V*f<=VC(sG>9gNb0c8$&4Z#*at9UW8a9cIS[J3\,XQ;?p[%8$Xn'T8qf,XnB#Q&Ar.oC\)+:'3o9;bh6Gs#%VGFU<59Cc&.PhP4(9eIC[9"CUDI;(XC!l0%i#J`P"1N6TV.Z)D3)Lf.S.l?U#<`N/t0a@Ms2LM*HC-F;$]`Oq2eM="kPXEKMkF/$);AM%WlYRaI`n1jl%I_K$_0V;dS5hIFe`mS[],hS)MSoVA/Q!@1R#_$jPCG'&9&(/s+n*MWZK$RTIiG-3RjbZ;+J4K@s\Ij%X6G1*>Xl6m,QLe*A^>9_Ht%48NB_p8sFjhZ-SVP67V)D6$*m\Muk!&oARQD)&,rX]A];P3%El'0lsjQkDdh`@8PHICVbj9\@3jR:Ilq;+RL@7[U-C#m_/1!==mu$e](K@fXD.B:fKJdrFN_fq]nG8[,4;L2r)Z#9_A>cSIu$D#o#N)k!k9:f1R1`SO_d#GK3)7cVnTl;lPEgAIut@*RDul(E00^s:\mJM#.$-R7G2L4`tU0/N:&XZr#hSMM8aD@ZnF9TKlcgEHQJ#eYXi]A'6.Vd%/0-9QG@4SWtYc`[&5*;&9<3U?5l&U_.-ha&>kG2n>.S7*`3c6dO;W(n9RK+8LAp6cV".c,6p>C3A=DNH*3Em*/qSUP"K@Xa(Hbg)X:'Q@#!7R$)NVFPf)Wfl9T^TeDF8t6fpYfQUZ:6+^I]46$^AhT?E[+N1QW`5oO&&DB('fh(4GBp#lIlaLfEPY-]]P&GqSGA]_R=,7Y5*CGEs"*6YX.\`GL.IQ+&qaF@N/O#`^!Ms-LBOQd-CBP"ckK'I?,;F+UL(L:E8J3O=j7d@Fk4-DS^LISN9IOT[UYn.e!6j*9Ca"MR^[Inn)_EI(OJf,gmS8s'!JD;It\[ZoCmjSh\&[jd*oAdB6M<=?=m&1a1c*;f$ZE`[gJhMZo\cVci_6^/am:8->\.WM$Fb^?ZYikUMH5_"F5?'quT1j3AVf3.ng7/+TF[#lhmh8M\InoTR7mpGbY`^j^!+]MjM5k4CLDWR%T55[%iL4"+T&FG)1%H5I]37%ldoh3f<2:qqu5?`S=l![)1[Q2/0`IZ]lrrC88=^sEC*ktL5LpY[[c#AT&1*2R=kL,P:G`ujknW4TBP=Q5"k'$Y2]VR0RONRB_^'QheK``%^'9YF!@o>.fX;\83QpH-oD4"PC,Ff&kTM_4Ge%;"KTnN&O,0"07fiKK%$J%q@Op2KP@],=>Cp&nTA4571>25XOT*(g?/!d2b/?K8ip3Zo_?JR[.\r21a"1KE\DD%A_::KJB"g'bMA'2s6S?OFq5/!h9WnR*K!FFK3<".Pbd$:8WeN*(+YC'djBtmY':`GM3O(=cD*/E.5,%`U,$b[+08@RVG"^apcZ'6)$h.%e)_E#c?1u2"^S'T.&E/5]WTTOI29r15M0:hgMhG/#;P:3!L8GCBSuu31:!GAPmRY8@ab,2EU)Pe$bKQ+R^/h9G*&.F2ZpO@cBp."F"e76oQ)j"5r:6ERDc[[s[8'kTK/ujb'"IrN4K"_T+V<3DQ!$/)c(>L=q+\6TdSC2&P9>Z->H#NmAhG@4"@QFR@I,UN52ma(?uUh2QT:BcH]8'96us#>fRrqE>g88NZ2Mi81Ar%hI/JK6?$@6+cCeET,67D]tf.CO8ubA1Lh:FRQ:VFZGQ'b#+-/V\ga83*U!aDdsB8]mr(V43dKIki;pS((a%SR/t[T(.sQ`9*,5D,;hL"Dq*e"6+T!!)b"LD9,((iARW).q:UAP@A<2DommYBOoQJn(SJHV_sl\DqDQQ,pHAlYDM)c(0#J$*kg.bH3.<,&p;u5>GJL36+.igD:hs0t;=OT@GMcFMITE[.B3-/c%n[tZ'HjQj"Fl?C+Oq=Z,,%J,a2@h#+Qs:Lb_i7Yk0896.^?,gJKB_NZK,sU)FHP)h]J=Z,!J#fXfaqPAWie1o"nX\NG!gj)IS;2`VOYSu?sEnO_+)q9JGTpZ8J&X:8?JNRR-4a,MHbAs:h%W]'X19DoTY4+Va-,=J>(tEhK^RZENhaN+HY!DVfQ^W*'AF56>!o_-kZFREjM%G#$heX'.,.Mn43fu^i7+t"eC*s6FH@uB$>j.>-YrenbJ\j(n1u1230+S#)tHIj!86,ib2n2oL,A$NG6/RW)JO1)VactBUU7!O-j[RHpJLL3glS;-!f3U@-IFIN]*&G_%94)[P>,HTTm3]@mp-VUX"-F=sJJs0&A+cJ,i-'g1,@F5Hr(7T02cCO0q-9jVRjmg(NB.+s`7$AE0D_)aHL"3U8*jFBn+7$YdZihk3$A`B*V(@J`E*=C.>bL#ZmQ8a#FiJ$e,Y/Z:KGtp"4dn'!bVKhS^M>`E'XCeO&lT2cAq!tiIbDBoN.sfPn#*uYcI3iF\@#dN)o]-WVCE?1)gpL8T2D-B[V9q4Z_k._cOgh-Me^b;#+#Xm=%)gW@[Y;((*f2d'U!/tEg`(!*7XMPL^!2^bjDQ#A;IQkd=k<'T_YS;'6,unb_1_0P&6T(f/JjaCa)\HcjhB9+bX/O\nUr<>);8ke_`$$PmX*j7OC00\:^72B4RDc-uk6A:,LDHO5EUM2#M_OO[j>`=DPXI1"PmN@i+I((,5T)!-N9GTV:.1(4)=B8ItJRRXu1;@FW]st,jXF8LG8Mmg(H0W3bZbD5ME"%p\9X&b:.(,')X;uOH(`\;]ct.Gkd3gl0XrJkZ0i$P>X-aW\-af4UPH64HlDABVR94-B:59CKq-\BfMqkO6@JXaV'7r3K0Ia=:,*u>dM0)CRB+Zic6@cr+1M)2lcS"jpQt.a?Ob"!b7qNT]OO464Y@F^jE^No6'A&\-X7>BNM_m8t80i(@PX>MfNMYTi%"9DZ"s0NWPqZt&67?5t]EAFh6%C)!.B)i"JYlnlX'r/e)0Q&ckL5Ub':)P8N7EfhI50@r%@k@o>/tC/H,j-Qor$ScOAdCn%o&&fNbi:?MpkYTj8Z)_t%kG]#5#!P%.;DD2Q\L-eHU3ogpkACDYi2F(@pR(sl@*^Ui#"%nL5&V%Nk9n-Mh#J6p3:-M"!._aAWZW4k\3!(fPsBZliI9`^+2YhUZu?rSX)D,]_<*U6H:rO9MXR8JI'`Yn7GbL=d(\V%iNhU)=\bK^)8."=Rq?62A,u5@uAH=#<#agf.[m/QFmDkDAm*Ep\qDPKfMRq<3Oa\)B7,#Ac!edn'+G94m=[Mhe^-+\qi3YASiN`=+!Qs&KWu'F[[)qt,uTA'eu>O+"lAGT>W@h-+eiT(Yj<-!!uuRdqDcL6Jt.]=0SC^<6'&dWl&JW,H4X%7#8=n'nLP&ih!5XQ#_dfiU58gg-qb\[&Eo5k`>=r!aAgN^"$qqWE,cihkROB8a"o;ITeW=.7$B!9?o?bp+U6sSdI_G]A:X&G"r%Xc"/,!.l)9O0OXWsWf<%oCaC[i98eP[]>-q.'IKYGjl;PW^@4Jq.5J%k1",S/5JNAMIIl>0BI^GG0Y4BpO&HG.rhr(6s%"tT&YYR2l!1qeF2KjSQY^5Qe,.!(RG0(Uk06jZ+QtEsfkng\QB`n^O=.(/#feJ@-$6<#e]h`JY3ichDHiZQJjb>%(_`1&3=Z\^%N(lZ&B.b6!]5iq2+/F#)XbJ:MhKPJiY2qpU-uE=L,7$lZ(;gQ(-5Wdka9ITrTAt#G2sQmP!Mi^ks%*PiZ8)NM!X(C#=qFJBi63GL4ZB>TqHIu4NI[_H&+Hs#TpD/KDCm\l_koF)\qj%Md)Ob,@(Pi/r$N,C95W<'+nD`^=kQV?.XY7YO)'Nah'/iM/o(*Z'GE48ED_C9LcDHFDdVP%T8".&-XV)3/a#Z/f%^_%cOOOd#31l(,HA:/:slYN4=7EVOs=p)r*i'jE$W>W5>imCMU60:&]IeForRP2@O!lZtbn2\N/;e.uZYl5^A*mNK8[[IIG@Rm`g*@9s*7SXVX?/a'%1p_dD*nqhFUT>^bc%$M2!Ds#E%FV8)d,X'$?Gfl<:qt]R.u3G0pH>'J(H3-c3eB)dgm:qX=0-h1RV#]U3Qu$';Grm:_j`k]Y'!O3EA[-<-K*beTA\#2$6s?c65!59s*>ZAr=\:TdV+Rgdr*'F7'^:5EBk0N`?YFVbaWSM[aEMUQSVQG`n,S7$,p0aTW5^L`K]S8SsXC)IeR&!57.`k:itSDh4/#Y"sQ#^,0*Y6&i'TT2c9K+)%TCSS&nRD's-?4h_bp,'-jK'iNK6brLIFOCWH.VTcr5\+kBBjnn:\bZ`[prg^-,h#N+8\IB4K`Yc6EnCbRXt?t9hEYWB6s$V(YfVX]jifF@_Sits&jTUN,[^^ZWtF#P8@F1sIed6Fb.5e,c<[/fcQ[_!R#d=Oc;k)tIXPMA]SUXWVFJV*D9qS4n-T_P$I@58Kr1,a5%W`*BhjgGBhlMOoE^H+QrFU_!\dcG/&ete8Y0oU(R[`>aq4nmgW3eVbLVW_43Pcg?%gDNJ]r@2W^LbV4c$Z-[ka:bAoA%$7@&QEa$Yu0oa5B0gVkR)3Yg.2g):#q0@4I3_b`j@q.=)ArE*%`o82AY&lo@L9NaC)Bd^L88TC=.!iM!SdEKkd[[g_WHdkb_F`J=&P'j9?5Y_KB\,;hL8T\\/-[fS4u:+0VRLEUAies-dEn\7KMN@%:s`D3\J(iV9#;PpY_\3N/F@$]I>ia!i#K$C!G)(!$IgU]tKYeff^:M#]606:b9LDP/tAa>>'Jic"qX)GPlP[Q2UiKi=(tNZ*j^1e+NT,%UP51CQ_s5dl&NpKbt>W>-1LPaZIT1-m*T+q//'1FudF_cfc-X&,(LKZKOhNAuc'L`2N/(b@pe.)-O*E(qdTO^\N^L`onhU*jN#p$;!9/te0eF0nd#q6A(Z,'+i*H&j^goSc5[`/s[T0SEHVoqAV':Ra.=`nGq!6.b*J'SVkW82a^/.)7C+]M?(a7J^\Iogl1VqkEWS32ke,H1bg)HqCp"rb9O91GU16QI!kmnTQqbX&IL9qdk(B3T/3APRte:<6UWr#.f&[2q?h&*ht)^P[Jj@pYUDG_\@@+f]*`kIA@i2L$soL?#54@R/X[a<(*M1Xj*pnfhgg/T%p0p.5M@&#?\lb'2MQ_)[Z4C0ZshL1uL&1Ut;A1P"N^DKY-pdMh[dZg0G!S%^o-ggn76bqe!fI'JH;e9W?L1.]I.+jVU\*dQ&iF/h0#M%<83&(HgL+2T/;'-KMHd!&h1lP$3!@KmGjh7q81[&[EkrYb=>Ddn7.6kI"8mHK06][i7uZSc9H[aWpZB(kR'-6`acA;29p7)oN=VTh$H9k'ntgL=*0L"MSEZtX@+%5qoLZih_B:`30:M]k2=#(VdR-IqV6m7`;<[d98hCe.T]\6)R,-eBl0*)&nsP$/-%(m(I76s5,,G+<*!VP]YqUM]1cGq)A56'ZdSekNOfQ)S=d>g-&D!==pHV3M?0.Nhm&d8\P?G;7UU6Y2Ro56?q5V](!a8oh:BL+L"@/r_-#^IQS$+,MXks.;7iNe90O.u[Td#no9668]-8qa-:PbC`A%'6.H!K%.k'iQ;-N<:@.+M*V%3[KTNLoectetT9)M58L$$Q9@HN3]`h1G%$6P)Yc!%@C?3KOPi&Q=1(tObuIl3m^paTO;O_Gshd&SOHZ&0_6N+U'Wp;e2.K"c7tc!7ZmMa9ei>!@e9g8l[9+KFOa$^Zg?tj_X9f8rn\\\^-mDX3O^$FMuGV07C1SCtCdXOEE:WIgtaM[7SuR4u-M;!kZ]\3C>\9qa9IWjH?(G@H"BY2>.?Y19&j4M+&sV;^Yp&;5acM=%..VV8skk<4'YoX4(hqFJV"R"!uM9qD'QYWfCEa6i4lX,BCUb6Z>?9r,]/A:79"=M7:M9[kf+i^^/E7_665g1E)o[#@QRUl`%XHhB-2VThMAi%%$:hn*@anc'+<+]U[K1E5.uh>sHBK-"!:-QcKZtamEO.3KgISEc?qAOI2(;b[DMi+0;IP"TIjqW3EoM^0\.1?1C"sa04>>%gMG>#Fe5Ej9=SgS/=J8*(k*SbsKn:G-T?AN#K"XHEI$%FrOuJ=ZmD^,r@_o<"ImN,c#LQh&(Q>Ijlu=;4hfK8P:_`kKCNL#Qpl[t4,X0+AF^kObeEAj:8N"$b,'hCE8!&'MX-)0M/]2>f`3f(O=dN!8)P9:I"0WlAL2>1(pRG&qZ)5>\S=>^%67oOd;&9)T+Uc"G3e^JCK1`0ucpdidOG&SLs$^s>!'*KRrJQ?<8TjM/QlpWj?f@RN$qTXKXI^E`n0=dlG\"3HXP"?oEP(/,*-)RPeCF^R%MjHK!GC;MS"gAQ"7#4-;#!eEgc1nZO,=9c$_FT>\#Y;#Q4))Iaus=ln#TJITu7$u;CW776:*dB!7q`eh-D?bop`+!+$T"o6bJ\+.'!FY/5=[4;]$A45*=+nRbaJ_R'$k;D6B>E]8_b-1X#&Ae3PdDV?\"_V8EP(X#1`+XJXIgHA^JeYa-coLPksVU$8na/W"`X9Bk;'4BQ]A.qE;Qo`?,YiqPVig>a/DcKjDdkF(o!fW6duh&SHJWKND$p_mFG!;r4&.072cNC&S%Q,;JK[Y6Yba5Qgnefa2\YVeHo\M<'!'k"*>6dG!K'RkrJXPrlk';cKA,o,\.$!&IB-ng#`=siEIre^DKgUXYA"KdA$e%j6V!Sc^hthn<8[q<_p.NN.u6^+9CVoR58=_e>UkfQ+jf1Cj:.`%qG;&YZg'8]TO=-h.rCUI*sD/M"(Mpi0f_spN7$=fQ7G,FR!pE[Y'Tc10Q`J=SL=4c>jgBbF_2?TC69/]_N&lW4FkpS)$ENj+B?#bl-=N/HGos:?aHcMOBo6XepC]8@5PZBb.lKjm`KUqrcVF?oY(i@O`PdJUW+p5X3Bl;BQ'.8>aNTn@<"?H;+G-#X!c$NK9u4K-AVe]gQ[_!93DYM"_q3q;.YanHs!AFFf8u,*3<;.JBBjp05RmH2UW0ADe)f$-d48CisafNbMBSc9b'bZ.UKm4O^)r_)!sfD9mlicWs`m&L'do=[XA=JBFJ,!o`7kNF1#!8;Mgc*V3r5-`X(]*?:7U`s]K`m<[r60O;]H6/FmdrVqQe'Y1%9cD>Q/[%mi`^ln[2(VTr(t^a/8B:pA\8!^)kt!M`%5b*?!Xu%d^k3qP9pjAK/7HOgW.Rtk[3QDC&r\=Fd23j.\D(%1#o"N"JY7tAgXb'mg+l$0(JsQ,P6;7at\P2V1TeU8Zl/)jZ2SFX`#9UDt__9JS>C1?,+2P!h==0%-6kE%%Sr@fmY%aO=^0:hh=XPdZj=X'B_JC-=Gci'\F!]-<8G$IsKE*6A@hAeVhH?aMh$`"&[9p#9aER[Jel(F#XWQMS:q_>[A#]?F!eh#]`3">\'s\6HMuT(VlMKKESYF@o7.JVFB'K*[!`%1Zo'-5iofLeJY!0c2i9KX^@R"d8qY\du!Ni=>e@!pZGTlUU_4@'KQ]5T`t-;GsV?%;=KgQDH(Y(t>CX@=hA7RZ\gYUo%EL6)Po"$s"BAJ5\-+X:ldHVup'c9<#LeIJ7OPqO[2]$XKY5LDR?Ak@]Jsb'NS'?QiNeJABgn1RE.pLa8iu23*0>ZB?.nXrUN>n6/UX'ra*Bb5/IVNW#P[4^?\(N9TDGI55Z,V:HM_0c)[_Ch:GH8jbqd:b/&%>j'a?E"Os)WCPmIpk3A-\ZYIoZONs&,c99O62=)`g%&/p`F'4sPe"?Imm!:B.-BcV.H+pd9iCg_cYJQrlb?qA8),U548BUbc_1t4hbp(s$Wd84>3NJ:C\ed4#8@s/<6!>jDB_fEd_`XiUp@c3bI$b=.Y>6VQkO/0FN:#FprfLp>B@3q]erSJs?K0?Dp[]3-(+`'4/ZRL0^?SDMa)'%hUI*tf&T%g':!730">J*T<]3:<p8ct$-*]F3(->Bkth_28pN2"uhg4(8kJE5PDUJ9G:``V?*)+cPP3"uP3DP[UHOk`9NPpE9=:3DM@A?<=N2^>#rAaa9$-A%QRoBO!9-;RBL"+#Zs%+*?4R=]&1oV6_k!:jQn9L<9#$GXeTsANelHQ;DZ6d'n)4R5_SNG;ACHP-LVWCmjg4]+Amc,[;9GLc&GUuM3AFc7D8%4a`nTB[5>&l\K07'h;%TQ2etp?1aC^AU"f*Qs&Xp_,Pp6^$Cm*&1;Q=5D-fc`+b#o(29a[%[['[8u1g-5rC\K@g0_IUWFDrJ(=(;4.`t7N$I%mA\E.hnAWqSN,'A#e3gs.\n!2``9LT%[2i4F[i$I6"94;5f&O\>u.S5AGOX7@F@tK1)4Wnr?#P*`Ur-FY0)oMC+J_hB^^tamA@pkB#j;r8#)2(NBo0,t:imF?+_Z%Z:J_n7/JJcHn!8XOT?$@.QM:B(Jf.-GpLAf^9'>-73dtp/Xm/m#q&%.>NH/<*W_93sIQF;8e[C\_AT6;&CO_@BE%64Z"add=bd@)pLY$u1Yj_0ka18V:e^O?Fm$MiURVN.>SP/1CqTBse0"3MaQ#dS\a*rKMIB?q!KQK!8Gr0Ji1$/8;_O2qdd5.G@@n'Z'aHS-T5X0??BTOk_`dp*70&T:6;N&VXNI]Pm8MBGX!*IT&LAJQBkI)sDW8C_c2P^FI.Y^X;=;U3P_XdYG29R.rKDo_Rc,/&6"b.;NX9qgbB4;ED;fS#"9h[$?W!I'H^&_GukBC4sIP,:mX:-I2V+#"l]ojUAk&%dkM@8M**$b"E%.3PJ?nh-WL$X^dFiOKO$X,Ru2kI2d\VGmmEc0#mNcj.#3\[6kdV0RY.$^q$iQE:$#7jp$"$JlGB3&EhHDu`$nq^7b(2W/t%dHP$tNs%'')>1&'AKWjHFG"H_j37-=953"DBD%'(n041P4eYP]SRl?8pG,t,@&r#T`G,)^D2jnt%M`,?r-1:]&moJD!EL!>]t991T#9Arrtr5i88'g:oSCl>2O#aW904,#GY3oDS>p*gMG[7,9R1mUZ2Qg\MR0/>]2Tq^4X6D9%I]ML`a*#ob_8K)te@%'k"V\%Z:%EoNCFbqdd?"kko.#fOq:Ou_h*IVu:mQTLc8A$/qHL;YbF>^?F&Wp5pK7rdP,]j1];!MojS3J8&4CA1,fab]@Q7>XlKi+7QkDI$pOe^p/5M6WV6!#$^Xlsi`3l!@5.]DPadP;q55tk&Z6:i<&+%(17Q^(T-!F`T:R1=cr5!j5uqr,)jb16%]F$MZ7X0Re5g`Fedq,2Eeq]PW>Z%S2_bgZ^9)2"&c?.F!iLoi+"[PlRQ/=$uK/_klm9bjikCAa8Fkc=Mf+[mi\npQ1Q"Mr)U(NO9W5c#/BH$?>c\d.35Mt,Jg6F%Zji`9on(FrUB9ZmY\\/-C/SPYWEfilcQ)IqQZ`SD\g"e1]*lmE=bR;E2[6X$EUYklOELmgS]JY//UG\&X5r+r^j9)&\HLcOZQWXC2%_lX'cYWY[mlaFbX?30g\.KeGDJoOKA+F>;M6bZ&AZe`XP60!`ls]BRB-eZpL6+t)&UY4_NQ.nR>i_MjCAHi7R5C#OV7G88"nG'l%t8OnA-sanEd1QNoO53]_Yt6Zr'e@O@CpNQWEmKL;tg/4;c.h#lB&2B5!VChf%pImi(+U@0?E2ecK_5n5l:&&.$.@#Qg.V%3S/dcq[iXY4HrrDJ\Y_6aUAm,JNH9FKub%elEig-t979YFbKH=,R[(=eFKjZd5lW\5IA^*pkFCb-I!J?c[=01kec!o_)dpB79TOW-#Vn=Vh?#/m[sRHS,l^^H!5;fYoM@n1I$L;$&)pbHK;(-:ueCP*:$Vf=MLnIWVi&8V4!;I&q=EQ$).bfl2504(q$3AL]VrTJ[T31/Qs*Kn5R?4WCsT:u(cqUrUt?YcP#5r`fWFgn.RG^0NZOZW+V7"f%JSclDmG<@[rXT&M:BOm3?3%knC?pl7sKX#?`kLG%V7Uj`mB?-XR\!BQ*rEFpG6*$L'r^8IdJ1-).:NBID$j[We:HTT#ZtTCD6V]/G8p\oHb'FAf?8G7[h?V.Os)$"E(J%lGF]35i7drT?cPc7^k'F1?+4]!fM7ek!+)S2:-)/gB@"^`C`^uOmL/H$\kQA!B0?:'[Om1<8B-V)9VQuHN'Wq.>kZ>,V:SR]jXn>UFjkAoK=M'*$+VIK+QEca5\PtGg6Qb2M',oSL(+(]+*#ime=2YZ#A``anE:NX,U>^k*liHr:u8s^!0J#ncNMolq0dAl'O"3BLG8LN4pZCnhVQ;-)&=BWPSWkh_^mL$@?H'p7Ue!C(Bd?kK(Pl-:H*,l8;bpJX%UEQlLXea;HJEqopM8u&uVGgK8'-dFY:gHJ_l/$Q^2QX+IaLfDq3?04#Jn83"Wp&)j3ZGNYR.e^Ler+JFjgtB\SP?Po`F*b?=prUqW[YJ?<_l.+@.-C1Ak_YqqQUo7&/[oi2=K%TM*XA[9S':J6<=4\0C.%`KX7+0k;0CmJ-LCdGh3s&qSFJ7P`/5n`NkkuUe?a0KO>QnS;]8/JD,glK#fH<)FM4jbFG+jjM[h.2Y]&I3gFhLB8#?D3$Mm;*\:8=G-59/'_J]<8s2H^'"7/D6HA%Gl3rKQ\RSYD!'q!a9bkJ$bU_XAtXb2Xc4r7L;V<)2HV<+&/;:HS[BJlED:0JmVVYIk_"3648p_kFC^@[p/gbs,0NVT&X%1qtkrLX\]m=9cF70^s)mVdb7.apH!B!gTNa#47S)!pgN5Ka;+;^#)O8!!Yglb[?jW8.rTY?D:0U*oIuYHN@;o_T:^NE9m-FLXe1Or5b<#o%d5?[jNBZT0!5W[UpuDGn/>&_YOD[S$"&%L%W.W">f*4*qn1JCGIo'd[ep('ib%(KuT+MS05Y^YQd2.FM2-1(:jFj(WpK+^ZG<-P#0Gl^6+9UaW-OUA\NfG\`'e?>MuK;6.);J@or?qJYVVA4MuX(DC0U,=&Ih@plccbZs3F/gGGn6g)NWn8V/13Ng=Y#YoY;9+Z]3Y(d/(BAFo\D542`@T)YG!UQucNjUm;/+`Zn,:B<:7->$]u7l$/RQI^Ki<"_VC$8joqgJA#gKSdS1C,(u1pdW7^h@&h.UY0k4NCqE$Op,/5H#JeA[uWamFt#FCg0h@n+WgI%sXi5!!BHAqrQK(@0/M/l%rba+/0!?5;>,SPjHk?L6X_g[5ZhAO`4\4-hH,Apia,'3XR-k(u$.ofSBnZ25kCs>O]rV#n))qoZM(7^V%tUp:c4XWG*,9%HSr>@]Re=]NE)SN''mGcd(.9X"]BLJ3lWO=_&HckT5ru?s-DZLZD+dJOkC?1J8&m'F7n&66[L;+9=t&qd`q>3M[&@akJ[>C))Dc22R8_,ljZdTeP'%cpis&j4,5qea%-:]^)Z'e-gQD)q[]H)&'V,iJd@$17&X)]_@.nEs^eE$0ql#[150_6ELV=ME]N.,Cbp@mIuM$D\X]JJShSRCsH&3"+a/=Zj+Va(N\/.(#?CQJTCqs=Tc'9QgGA/Ha<;@`3$@NO5J%63/"WK!cb,[a$.#_A-`A!0tE)A)qreh)Mk?u"0$N^aXs#?m8t8u01!&/aWO,`rp,@hW7C2;muPQ&KnEEj[88N@ap"fOQ2!JjS$J7;9'1Q-Pl*Al>F^m.]qH(n54KKntQP#aQt-#/J=t(#nP^f5!/nUI:DBB\H)'1i0KfVHDN9fc"Q42-4\,PmPX9"^O/cVPet^0e`Fe"#s'XG@H3.0]OG"#C8P(c]Yi+(23)+[0HQkb=.X>k;+'ZI_mN57P&&gn801dI&IKXtC+)euW7-Wo&.XOtLK]p4l4(1gUlB+5g(UGt6O6919X5DgEh0#A#V7@VB!:`=5/M9k*CP`6mj-_[iODb>sF1Gpmsa/=d!<[cWj"!W#))%n1pV7-X`lMbDRYUGd3iq9dHdB)3NNi"MIG4+&kc553,NPIF$gusYh"E!@=fD.1fuS4!>=-#$6Z:(/PbpRq6VJeD4%1>)FG:A@n)6-6%J(hf_WpG5ab+$A<9S['4\e1M_70npfESih$;/L+FWB2OD[Ptn1kM2f_`BU%JY*n[`NOGSp,P]!4'FgDJ\DNH*'ZLMV"AlF"WpZe6$%Iq\6`!c\25q$o(\rpGi"h#Z4UB]F#aL!J+:VtVE_k[Oa&?_DI@m'$r:t')0db'P2&Ab2.Wt/`K6'sCF(c=e)1]_(2WCr^mUk1>EqUdfYj;0M(rc31T>m][,OOA'(7e^5'W.gS+ibr"6APqEmA=9so#W?+JI?ZT13e7Rn;P!Zih`T44'o5!PfD:$@RqPQbpM#sd_9LOcnhAc-PH[nm"i`b.dQ8o4asoo>s!F]c-t!W8'dHW&9JEfGql!q4I&5R`e3O@ZK[ceKohb!HB@Lr4VUF9B-LQ!dr.Y_$n,DA!ur8]4;0M(_18kEOj8B.AX4A!G$($iX)II%WB\j1*m3Knd]q@DU>CYb4pZcbgY!?\[Nt:eYC;1"^obJQXq2="p`!oj3eoFe,C>de[1[",+%_Ol5+:soU?F)QNdc"he=AsoRcgg9]NdDHgeJL7p(e/bHb/@16-QW(:@.#Q3Yu8R[*V$.O^9RM*Rd/5n%2[/LM`TY8\[<(I%A`Bc0Q'VOFr&4F7HiA'c18O&=TVF]Q#^PgU1NJ3+k9`8+\(<8*GKjq60+=gaesXFSn(Q4iWo#W`E(>i1BFYGu?K@!MuJ]+ePgL<'HU<6>Q\.@Yu0/`^W?)dRkbmM!RtSK!u^f+?*aS&Qr570Gp&tO\2"^\WMf+dn33)e51g`44$TsUa;,E=&?INTicpj#hB8hb,maK`G^m$RqB-uPl\D5dIM@th*rV,VC?6uT[WY"Bg8SnMD^c3[lU;8.&'*6OqUM\V\^.=S4uQX/3o+LMkh*s0H_Xf0"j\GQ(^p)+[7;tfO+AD$kS\`9#*iL#!7Yn.0PS@O?s!B6*`]o%G6IL><\U&WtsEHLoOU88gT:Z:rq0\NN+=;;UmU7doe+k/BZI3/4>"dc)bDE)_u"VeY?k6WD0[59*$08Q(V7jdZ8aNX*b^Tg@h)iiB0%YJ\b3.Jkg"e)G3i+8cg,m,`*rd%nHQTRH$>g+'n*^Q9@_rA;no"9*.K)LaN0p&kMC?DK,bQU0&tLd!1kug*[B1!/q2b'_,$k'#^N13(+$KP_^2;!'#Wa!%"QP69pB>5f&d)6`:L_IP-Y'j]T6>ETABj_=QchK^:.p(,dM2aA9Q+),k']=Q8Bc-3?Kgh8u?PK='s]?6D!Q/C"l++hsU:i#"=IZS)5g[+r*b[q@H7+r-#I`BB`AGl:3)nQ1Pk&5n0,"H*P!P9lLtn4m?-*`Aa]KS1KlYa7Du?_6b[0(@1.:VQR8j\.`B6&-V4oZWFGg<1su;=>@h+?Di)S-rbhJZJ=e50U-%rNP%AR!ER*%ZJJ`*uOm+.R*992cK@2!^q"kUWm&k[P8$&Yd6>YmDGM!sI%c,snLGCCMj-X\kE2'=6pKCHOcU0]KUUdt2^oAI&*2lPmnpSr!X'),JGDVa;#)j*Po%$o[g?.\^3eK%'1XJa/=X/lRa2@Ob;+(shRk[bYn,0pC2kK[9[ISeA3!0YpS@QpK=UrKr38g;9e6a("p8q)c"!g>CU7h[67+r'"2*@R+J/jFp5c$4LP"H4A+;9DG+uq0=42U>J*;#c7iLcL6mHQ(^n*\T?5&^Zm"%n)W*RjA&dX;ng:4/_a)p,Dn+7"_]R'ab)87.]<)J_gJS8jdPN&FPUq%j]\XpAQhF9HeU#!kdF'4k^/SVO45dCs-[Q:XBDE.aRmK1*>n1P.^H?ra-[+rPs,;,GXD*#Oe?9qb1q6mtHWC]VK/E$H$1N(Rj#XJBk?+U'X@Lk0,7UBVlT1pA8;1eQ[E7mW&H,[eQ7&f;cQa`>H[9:A+[0G)=@Lh7tG[WDb^F'RI+o/0(j>oforB\+B&U7u+r,prfBUBEsXDL3H[?LJuhnW/eHhF'([O#0#Bl?AP&R\eZF#T:4=a>jDR-f@9*p%2;dR[5$D>@u2&lKJYYVU*NK/(JH7%i>?J+'Bh3P,c2E:=3B6q$"FO_car:@eeh^5t_QAN@iT-pN42+'@!-e^N:LI#O!r:1gl[ApD^='(+oU0tXK+O.FJWV"GWC'P(hM)S@[7q?m"5!'(<=85J")K]1C*#[K)Zp>W`(^*HN4%qS=LrJ.Q$.g22Al77^K2Jaf4J2e@JP*Ye.GKiHW16k<,&ffBL^#&3R=l^d/!TR=-+VEWGH-a?h'RZD^c'"GA2E6NJ]:80k!dN!XJ8ieAX!PMWp"?;c@Ug`bdP%]JduKE*i-8mN0d,P=NjLHuP>M=#`sq`bU!+\.@E+&%U"JA7loJM)Y-#C$SN29pSi1gcb`65aA!jn\$><;'\aO46mT+ce_"Gj,YWM)6?/"+rpK1_J)7317f);(1GXj+#I4U$`mBZesGjH6:LF0F=OBTSN&*a^SNQ'VR8Wpin81hIT#`!sjJcC7tEj#d#*>"W.lOBe"h24`d:p`3@?B*;-!7'aOKd+ZqJ\+?2WTZl3m=:hXug)IZa!1GO-k\o>qkm*2IIUQM@AD7$R0UGag_7?_a;((FCa-;%1.VKf\f;!R)I2SL1kFW[NB4ilF>]Hq5YH>#Ze(QkLK(sT[s[:')!&,M&b_4F+s`+fiS+Q4c2%q2n]%@#fO@6m=1&Lp0s9KPe*V:Yg$>8\/B>.mQ!lsj@\9e>q*4#V+TFCsU/UX1K=FN8+TkE2pehg65&mOeEs7>`&*e[O&o?uEq`D\]dl.ca3't"@/rX?EY^fT0)$V9>ZF[[,Qu^/MgPK-%$k+U0WZ66-84I"P6UVdrr,=(e3XOl,Ciill"HtQp2KO$bj^lZ!pp"=*`I"0t[ZYJbPME(9*_Lte+r#eG;>5PNcTlf*iA*r5K_lljeYOu%&dCKbhp=Q,^eOn3ZlfB?V$`,,&e#-H7UgfTT&]>d>X+;e\M9q9=i>MS:CF'J:\FY`EapgYM;hd$&DFn6l0V8>p5e*2&)LJc]KeO9"7RQF^%.#%!S;#aBIj!GDu-&*TPrq#4Jin0;Yj@.eZC60I*:l2Nb00oPD9T]HEW?A<>.*?;IL`%/,k%MJr=$`ikT&C32@34Q,c\k<03fNgu=_W(et#GBD/.\$:@=-3e!1/6uW_I1SPJ"&tkB+!'@KTAE?[E+4G8krK*V$0;jiPA*+g[^UU'"TlmU-k<\>K)i*],#2aWZlJ3L7gQoJ4$ZG@k&aT=7B/ra)2:.Q.Na-,f2i9%Sf*3ST\g%M^<[(Y%F52SPp%^rCpd*gb7g-1GG$HlU/;"hYe?g_QTW:V#Kgq<;"-XiFl.MFY=hGa"2%-R)-?c7\LAbTKWsLKDRk=%Da4fjfk,3`nc!@88EnmdJ$[Nt,P8R%:ckLf9T.$R<(V>`cS-mA(h9Y(Y:l9@fKp_,*HpU-*+>Rhda6l7SIl$!Jt2%a[(+mfGh&s.)#WX%([(DS;Z^-kdiTLdr.ek-8Cr3WZT2["&Sp8#DE4duJNiVb,lh\8]TL'"4RWHGW?T4*OQ<-c.5[Hl_Nt#_itdW6dLM0T-Omm)[MskhVZnf7`Ml&'tdjfED@WA`_opL2j_h1`bDq5s(+kE+jJf,b>S2^qdTtXV%_%S$bUmnY)1t9:#D2@mBXJ+F=S"'c'mpZM"@OEkhtXQ?Agk:]8%7Di+HOI9mJ5QOTu;D,GB%9&KA4/]"'%f\_!,D@S5>:[/^,5G0jpZiFXegO&pY9q%a+49POOadI=(MB:_7pBD?5.2M#K!+\MaDCrff04HRP(ZCR.N1[:0Vh^EH4?pH/38oo)@(3]3tddi9W^G0F!A7uceeb+?I+bd;EhifAuODX^@E\g7A8+QOYJhb0-FLKiJ\F1;#Dbt7@3&dDHl==EjKMEH=](2WZ:l#]3Cl2BcP^`;];K];$.2gSOp0IY4\!cq"RgH\_:jpaI&4FW^W"NR;*(Yi@dWON^ZGm%+[]aYB>M5$@$7U+eio^ll&0iZoa:_PG8;"!YFfmIpUI"Q93Y=Fle=^R)Y2M$Y=JDoV4TRgkOq/@nXhL+6%.HhqmF!0SV#A[L!P2)16!:h`3b-3?^L1-j:4Kdd^HaeDKJRS9qNM6#e'loa-t",_VOOA-"-idgG\#PV5d0NYMtJ&e7264jK7\KF73Z(Xd@qgtU4VT&Gq8X/iB+'s4Q[[,W3l*PUC.d(+]8"t_lCof._3D1WeW&e&Oq]fFuf%>l,7_C/DHlouOGHD@mN2-\pB/^4Gqu4@ViI6c'AR*Ji;2`A"V8_"I++#\fpCFg[iJtP*[KI%UhU+NioQRYXYGGNiTr\S1J0(VP$pV>q37H>d)t98)MV/S(c(.,2*m?[1u*.i"!.$ad'AiD]<],u\6YYI(WQYhh3j!US`u)]S),E;bLo@UAMN-SYoj9:DB2V7X@0VBTm5`k=*]";jZrl4XG=!l<+aNe\ScBR!+'31OLn7ZBJ0\;MRM:h"!P,")L;fS:auNX0>N"-"-R#qK+3Ne8Mo#g?j)#g4@me2o(u,$6up3]2`qNO6j(#,JC]lD?t.9W^4-RMbTbfcs8fKc(Bs/2e_n*$G*Nh?h`"noMdP0q)WZn2VG3N2Y2475g_mlF?@H1c/LM)Q#>/WL]GMiU,J=ED"9"7Va?Fg"'aF&8)QDk:gZu2b9I\>LoRjZ4O-AiC]Ib662,d!H0!(2`KAJlaWDseBZKdc[\r:@.Z0IDk7Ron?AHi\OP\FW`gO'BD_n_iT4#Z-0RYBHnJDrD)G;5WJU^"_I>Zs"Q"-J94e!esHN+qaVO=j\2)h`WFX;G]i"q,OunjHn*b\rsaKPd*BX9KriO.;+b6"h+)7Dh.)VLc+G7cQejT8U^nK%d4YiT!=g#^MY3P[nHE0tN1;iNtXN=9rGR(ngET>f=-[('-%ttC/2#]D+gLKY^2XoFQQt@f"3Ph^!BMq6_3eg!mpm#8TjXsGe.E]uF%3V)B!gPSI=tM:gEtV`b7SSeu@D7XfP@eRRZ7l@/XWTl$14cONQ86?6$RW`3Y-.)]f^>/G98Q88f(jNX1loqte@g`$_hlLd->>$j]9uMO#R'#rQ7p5l?u'^U>cOL=O"mm;R(!LW8*.oDS^g&A+03CIkJf5ChC)Sl"kTL*Kk"J"P?rk6tb!_=c#^RZRi161""d"O`bi$0s=1?2rO=hQSZk)48;(2T6p-8d\A8/tjNDXRt)f\,aGj&go,D\hBRH[s2aV6iiA8q_?r2E-:e#B;SBs2q(;,FK?lelak#OaIE,l@T#6H)/j3F_.S0JD>F>,+*!Ofp"?.!>84K-$M?(6P$EPXfb_ZnBSL^WiC?t(1;4N\<;q3c18I1F,sV=;Jj71$0;%M:C];sKM#.mQ5!na"ng^$Ci/?YAasnl,@+i<)U,[nj(R7+dYqljQI0ReZ+\mt]^'W#X`B6P"W5US1h*Y2G%rZVX-#PjH*8%CWp2\dRS_S*iodW:QE4)FAjmXh"Tl^f_'L3Ok$Q,m=QW%#g$rNB?N:AeBt[5,Y=[aE#0X/+!::qgB/m2=,K.edZY]_8=%k-Y/;>fT\`@:^g2^6dT[lB+WkF@Gfbk3F*+)PUIW$#C7LH7/N3-#P0,?'7CE#+#'B-aQjQj+krE3?nc@!3_]]T+OY';ViLor`2f`o+<*WiYm?iANt"&qK#:VYYYtX]km8hucn2(-J-O4R^BU3BKIAJNKIuh;!d'#384YVh]nA?>XQVF\#WfKSWMmRZ'-.@Vm'$-rOZP.'4eq2VU^,_6%Lplg(f6>9GoR6W,+2#gmHRgMBaj(c:#]N@$=`\qhObU(E`(EAG=?MHLg%[Z.+kjC;_8YU+fh.r'Zm&jk+m"O]sJ0Nhdt8;oi*TOe*k,*uAKlkufL"2Y)+5g7(L6MgZZH;(fVe,85L4J_<;)oLqR6O\f/0G&Ppr=>eB8G&h3_kE3:o]?J'btW]B'0=fEd>GO4C7nNKZ6=5r'qqn^@rq"\QRWD(K,VoIabdfgq"^Ir7QFtH7b9VUc2C:16Qb#U)e`L@]s)K*Bdk:G%@'QLil/YfCs*Jd52@[mjY>NRQ996_,4:n^V-kb_YYPH=f;?%R>gS[SHM\9D,']c_\e#hi*P[fr4;dBUr!#irSa>/mH70_KU+CFM^pB$"8#!$4HFRHuH_UZ@9$r#Hg-/ahX*QTcI9m)=^QK96qc@HLVCElg'S@Fg3k;h/3'F2Vj4o'SCW4Lb$J-,+,I?mW=X_Ki?k;\gbFM/K\]b8$fZGLXlIPRbc;Q*A4/jd?T58U(f`\LP1G6S4KdfD5R-sff:@"/1tT4"+0B@$!,2FEV24:jd"EJ]_aC9O]t"JP?u8X;k5jIWCAn5Ie.DRf+[o*8'R_\nJa[NlBqZtE1f&<.8UPcYrJQ7t*SJ4Z:$4'o;k;XCZde6Flb*.qPs`C;_O9p:0K)Eo,S)hW/D*'Fe@SS%Lf$Orl9,$Ol?MC$9up!,0gA]Gmi/gq^5ou!5/;/p&QQ!f@)+bn\Z+ZH^n/G#rTgE\f0X/G3?m.9OfZg,3[g@_dY[7f?qA0*OHl\n0:U"d(jY\IAcNKVbt2UtT"aTS"l30#MV6\nLjl9$]64fH0,We,*c,$3&oN:l1=P8K!Z@e]CiO6%jg.pCT#gLjR99r`j=Ct5n4Q>Ko76]1o9dSs9%f:W:_),j_p3icIo#^E>5CMf;>8*2"@Qc.L->*RtLj@9=PH(JG6eAF"lC,qX">67uAK.2/DPN64?gfNOn?(H"9KSuZ_Mgcr(FZU-!T>)S#c:h9i%$3uF3XlPlQYs_/;$O7"]8KXlm?nY]cSG76rq;D2jlBfVG'LdB?T%H%;$AXPog,;;;u#5%N3;GK9$)2d`(taLTu<<>hBPu(^[9riSaJ(0;on,B5Lr;SM;LQKk+AY,fS_6"j.uA':HW]TmZnB+,_fAVboMiMMF@:&7k?7,X.n,"4uJ."].A:4d&d/6;-l]F8L)<3&m3*_"<_CE/Lg/g5V:)l@Ntjc6;e^iaN.#Y]dUY?'ft/t@h[k2QLgLl3B2-/_V!]:A%'J=6gU#%b;WQOVf_CTTs'fK.Eo%f9]5\,?&"XnF;,@uhOm@j-;5JE@>`guY=Q=\kXPbcAAd']@kVi@FFbrD/-_f>J]5ol_LsJ2tpE'ZWlSGo]S#MsBDscV=j6iDOoM8]=<^(0nVogXk9K-r(?Ap0:.&41P*3&Q=?KK]LV19@l$V*h)m#:L:5fq.2\Y)1@Kj(Hb'OSE6?i=6S^jCm&sbmn[HIOYthi&D^q*^?V3dZbGH4F&n)VlG*bbe;C58DZPX0VAR9^t$,$+BNXEO2^<*6ON&,CFc]g;-eZ=I?Z0'2%,V(?BD46=P84XF%58#t5rQB>*)6*G]m:N9*=Q=X>Y@oIEFMZ?jYJ02&I+m'[MouEFWr0.8'%@"TR373E&Dj$+YkfD;dokVV1O?`HTLitQ1p'm-pHAuN:qX`D;t=bC][^A&F5`sf9daK!bT.kO^Aeb5Ft.3+a%*gVe"A>KHl[:,qeR$cXMU;C*QFPE?:]?&!uAdBZ$ZN,P2!RqJgV'&I*8h3LO+?3q!DJNblp-We<]ClJZmlM8]?M)^>A7e*O8?g1(0Jn+bJT"/F+&%7E)M984@436VKT[*]Iq@l0E0GUS->?k>kT84qn(fT[EGWWM7Uq;b1.%([.&Q/c%1^8_6\nHs%Z_>18u3HaTe'"6fZcA^VAP,R"uaM3+WAHRO>&#&R`-,s#"6pM)ejttdE+GUQ4B'MOHX*)]0M6\a)9S.V%\`X2j_WccL0a'7WX+_JYA$5+BAYFZQ9It\ogt?&lP[^Geer*)G&q$L()iF(6/E'1f/$.Ug*16l3]'OPb['3-qcn[gQcO,0#Ig1Rl-E6!/VD'i=&cl6uob:-M:&Q8_TG!?F!Tq//9tC=QXR@BM/dh2AWAde-6",'k+Yq!j2`2;kGW&9hC7:9\REA`B;)]KZ[FkW^^n=J6F=Cjdh`BVFB8biSH]1f?ZIjF1>C(D-%08VjRi*1n_knXJDC&'QHYQ+e/YiJ\5_E6*!j6)^^Qu4a(&'"!O'_AEFj`6PDj-7Y/Nm'I(SY(.S<42m!utGD&DFl>"Ng$u0n[,tNj6PRRtq[.FbXRZd>\Ou"XK[bHL@\j#^7[+84Y/23b++:O@6%oB>`Vkd5t%U">23K]5T$3UW%7T5S0P[u>7]V(3NDF[UW1G\gNP#J^&MjZCqe*_e@7i%V6QSQX%6`G(62Af8#[9>XkHn\Nr@CB.0g4q$5Ld:?:j0[me670]2],U$&=0]GSOW)/r)E:Gjbrf#De7"!Z@X?\_)@:0F^pl5RYVrqPNS5u;Um_N?!YFa$&g<)WE1Ptoh5.7brT)oba&"a,gfbV7%2@/uk%o6-95&&uA&6Y-RpuXRKPWA"2UZ!O]0ZKWB[RA1:%c2tF&'AQ7@?/(_M*4t258i0D789SJG'Bp\$h:U%;b'2Cti0;WR3KBo"\kWDlL4C`nYX2%l%N<0q"Rnd*j[QHD)ZSE)R[okt5uc!/Y1memp2EP<4<]@ddHt!j`'JnGD/h-D84(X:u1_]"MFaDS8se4jN,Vh/tL$&aeCo_0(^3iAb?/LCf--_[b%MN?bQ`8-ck')aH,%4bu!.*9`s;/NFs\UenK8nV`8Eh:;Z4gYpSXl>dS;Wcm_fq44.nJk3tg+gq:*@J)QZ"%X+a%%RtoPUE+q50cJ9Y?M>Mh8^%&BQ1@$cNd9)V"G(.hlHVHdh\m]_m7ucW]%hD>U)bf\aPJ,OOVH'GM^J\:#3*2EC@b>U#>PFih2_02f$04E;TT\SRM,IprOWj&G#nYg^U=F1R^5k@g@B@Re#nDho'-K.D-\p#>@rj&I_#OeG='.hs98,%7_HuJeBs^>fU(Zco=N,0$q&6,f<_XEMOqE#,P(K0emgf.$/t7;%6/'U>KHUM[;>VP?io6:?YA-J2X8+_jKIlC`5gN3tTqm'%9SK-#;])`rWcK>l;t?"S9ril'^b3!L>!marX94Zl^,F!aH'>:OI)cRoK.7<9VF20_BIB9sLKM%!lK)e"7s8$j&sIZ`n_0Mq)(^;fY;\6nVs"4o]/\7o"Wr=TiPQ(hd[)CY;[W-Op6e,c`gHb"dtNj/Q#GL[LC;7/ep96]tis%M-R`P"8"!eEWqe1dS`S`g.QU*$R%V3.Zi+nJ(VR+@m'$M%lX$J-fp6NOMZA4a-g.jQ!fdCIQWX.SW;$LX/KoFA:*Wgps8RiHs2B_+NlX_4bdu*@2"Bmt[JCML6@5:.mGGm9Eq4Igd-0(7J+N-"8Q?NY@)&4)Sb>+pU"$5cX9dpJtGIdt<7lWVs,@OJ:nDFF_.$8ZaB_9ZJaanD_)B0J$f?>oK;V3BYK/0[l)68"_dl9bNE"0I#72)[P!A4"b\cpXDTGa;4@0f@MU2CX<)"mQJ-dlsd.mu6A<7>]IGB<"#3nU,U:j@!_\[t[I[Za'e=]*tJ](fq6Jg<<"VEtj*=g9YdgRhP+%6S$X$nEe0&aLVgbK/a7N:o'qpPXQF*\80R:2!2N[__n3/W(Y0U)g3fO^EnSN(MS9SJ'_;F_F*X9m#,`l>9R:KR^"r^j:ou@Gmp)YX`4Lp2?fG^=%G&K!6/mt>#.:B5Z[7:62KPZ9_?F]o'@lRoP9I.hAm,eLVZ-*7P3_hXNlQZQpY^6iO)`DjM!7GNUTKN)$Mmpj@Cf"L]LEJjWK7L7MF\NuL+6(-6552$dar?)rFW\dNd@7m,hjUOOJ\PZ'I6)_mih6NDbZfFE]H6LE%*\"^Voe#;7Z5=Ves)=A/,?A2l"MRpV89-H'e6to\j&3*E1%BnmHjr!@bO1W3^;bkiEL[LcOQ7M_qajnIL"PXTgt(?+nd1./f7C3HSg,J=2l5gKAC+Z@/]`RS8=Vhg1fi"R\b[Ae>2H5)c'BrN0n_agaqBH[`P&6?t\oT/:jfgmc"a9XDCV6/Op_.`nQY%B%%jjiU5uEOC,cEc%D?d$!c7j(1C%X!Ys!7$D@mj%k9q\+cH;dK.%>W_.M?0:D2UQX>Xak'm88_J8M/<%3pZW%AQVV6,E_Q+bmkX5tZ%gG%b0C[hRL0'3cS"K=K4\2dhr`F0%VR^lV5VAfiQr'KX0^2"GjsN_Ucqau4']!QA`L[O["8*PimGL*URngcEr_3,K46I9):_u(AfS_#%#rfg1=!k%T2uR*4;2QtTBEO.Qr0Z?.`1M7ooYgtUP0F+pP1br^nJ"(Lgf\K1Z(s`E9BX0$mf1RC:U;%]%7oq?cT39>,.SrYG8^IXl,3[SolDTC-K4=B2COLZ4'"H!MG^(Z7m8.JKttb@%(jho(BDblJ54ImnOk`<&SfRBdXs\p@Ltq]X5jSS!kIBAnpfb%6'cLjY4^'9HIn#%HqX]==ll>Bf:W$jAcM]]2[Tc$G\@GTtihb+Z9o75h["^86Rq\lU%)m!A3/6oX]k&$,j_XC7=EIGLbc#>SFH;fnPnt[4o_!cDJ#bCBn'')1^.`=<#R1;Rj4OJ7ARSB/ng4G;Ft5EhM%sVUmr[Qoa5oI98pjo&o$l^%()#*T3dFaTi\0bhm\M#&WM,gk2td0WUP(q/]`o^p@q5GA*sJhKpVX;8_BZd>Yt7Ritar2]0KW\V-G$M"St$6Gd`s(dX<)(\$d'7Hi),[meBrSUr<@96X&gN:R39qU+'+ZmCiX%phnj,#HRf%O$%V3F)'iU%OE1"#0*_\0Nf`&$Db)G*^20>qru+h'YTG`,]N)TZD:\Ss?7Okd-NO5VtB#K,!_b19]0KRVNMiYTbVkLr3n!CVo:sJHjV>)Jhd71rj507;>EB,D#5CclAdV[hje]4EM$IQ:s4m0rWelG8MH^n@o[jtR,`2+TePNGG^.$mFNQ8IXi('%e!RLS6eWh["4&9,]F2]J(MA9!IWkD/9W?Ch+A>WK%:=#[UBkAf:rrK>.TkkfjK^7m"VTSd^NZ2&POU]!fEO<;7<0fK>pnR(GL4(EprjFArILPcLUV#P>$2#12*UU0HDYh'WGLS<9m`\6e/>/qek3N3S<\8?`eAFp?7Y=[$/aFnB;OGobh(\RE4@dP&ph#cG!2OPtNl5Xt"JaWY.QHjq(4OeHYh/V(YU"1cq'3#ATNZ3c2@AV>Y&;!U[B:'U5%#)jc9lELb!J5-Yh3\%jt_PVFAA_`u86DEh>cnHsfYmL^-R3kBmr/?/d9#]F>$$HC)FQVZ!p(o"JJa)SC,lh6"=g0ejaiD>t6.*0]-VQ)MD%Qq9O=J@56bW",Jt^En3'=#:ZC=`&M!ha#ISfGM4-qXl[F;S<:BrS/];S@rJ+H;iKu3j0f$rD>[XKeif+^\nSQ^bgnO'nZ5Au0W>G)uK[qhHj4'LB"&V&36%\6Kj\:*21WW=R>`.(KR\i0Hlj^b7_L*\dFQ,@4)K*F!\XsS4mk48KmRif,Yl-ft[`),/(..4?u1[*n_8\L_IB4Ss!"&!SuInB]NEZp2t_^*HiL6I)i4gZ7YZkYbPR]RhifRls9&8]om)Uf0UMS1%jV&]fa6Z;9'He8ZJgm'>D>rJ/+iLCkY.mh,U1ahF8W`^V/8bRBB);>Y`2=EUE,#D%G_D2&g8SWU*6bq`hJ8L2h$QHFmO];CR".N,k0Aam@EcJ]87!t@;4**?YqJY82t,RZD_JA>G'L6>PUd-IXg+E0RqIOP'i1ld4:=;*'/`nT".^#L[fB"D$Z[dM=kUc98[P#0:4KQd/Vqtp:R"7'G"@!gZV]#?3`:JH&7584?[q;Di+KO6AM0%Z99.s30[J1PG#kA3]4NB&U,&:K26gs-iF"'RMjgDh:k`elcDM"2VIOUV'8/qY;^LKen('RU-@'KJIA#Sr>9[itAtSd!$I[\<6':Fdc\C$K$4St&.JjPXG.nmD^oD=;SRD7F7m2>qCsf#X=llQa2bG:0a.1*2Lgb+KRcA9ml)D+ta*JRTOT#B&tJOs(+KH.;7*$_4DJ9_c^0:8nZgZ6X1HT_$?a&3pl1+[D_n#Hh&U@RUaabf)qp'%k-"FTQAGlpuJ2>_*Os(*OE2!=_e@"UVs6V-b&g?L?^P&2]6FB-_C$K\bZp"J-t9E'G*b9releh--*koM>]:[K6=UY5!Wo=;G;'I-YB"oVQcO^`63n8&=a?J(+c7^`43bd'X27C?8\V,J4bGIGf)2^YXF:Cue+M,J:2U&n6_%QV,"oi[F[6'^]JC?&9O%VU$@%V_o@UpT1&%0q7p^^$"DLR13%36WV1%s(@BL%)oHS031)@8_MPUDgF.n8;V&,V&O,B0TaW5tRb'#kc(QLj=M/sAQf_f7PM9u-Y)l/kIGr@C)-NYTe*b1bBQ?:bu/lim]TtK;:kaf/J.GdB_paTr8?\deA4!%O@#FOiLf]EFkBIO9bg8<=86VT3#feRI1m9MZS1V:_STNjlGNX+)#0MJY=1cPLTIN>:[`Mh()9A7O9p%na5fH#WS:Kh]F9lR\sS*>O$>q_babM43d$$N5?]%mNE$-^*S"%Z!.#Zp#E4$bihBP%Aqp$PE6:,1d_EQaWp)E:HoTgG\3CdO'm!J)Js$9g$SN*&!e1K%+B)N6]%Pno[])e<>8g0;PEUhMDo_^"JPBgI3+Y./^t,(":FS6-]NEn(VAGd-,Sc8jBfgXs;@gRD/u^hK7h@n/F%EhlU!E6L5jY\?$B2ZWE;%K^\X5DP"@45U_;L6eWe,'1lt4N;_^GRm2\#[pkq.^8dea.WCAY]WASoNQ"`o)@6MJqra8n2-I\JSa$n0gk0o'\;DV(U*NH,pD6[4V#"sFOOb3p$h;2i$647$Qjg0(U;lf?G=km/sUZ?/>?XJt-K,P_lPuS]%O:7%mf%muPRAi&#qj2M"]'FT?1hA5]'m"%](98o6%$=6m.FpJ-U.Luq5l/>)WVM"2n_a(Yr:9I^k'=^tF!Tgth:3Q]^WchY[%Xa>AD+)i<3h\?I@aeYW#*5MGpGfE)jE0J&mla&j>P1I"f#!o>,@?s$)t72pDmJfD2U2;+a5(/<0=!Ck-c3Y;n=_3-`Uj^]eNeD^QI=&1F39Lf4/O9lB^PbDXC](S$q$EVu`;OShWS5!+KaFg\(J>m"@U[8=]o#rE8ra^jaEiL+W0"7QhLY#TJhT([E+-mW5Te6X!q\p/g[Cbj8L"q*Be7ocX/:P=0eshlQj22UkO%XpIso5H#TZ5RGs9_KI0;kZXVU^-Js1Pa>3UFIm7Pl"@L9$1,uee7f'V_Q`O4I06V8OLLm7p=-ql%.20$rn0pFG$e7h+I%cuWGUb7^\d1b-J%Ek`B*%"h,QmUFb!8M$TTmd(a7.j-)bUM$e+Vu&]Kb;.>$^]FY/]^NSAL,B2r00_9"5!IR"92Xl1jX]td\"0<6p@^=eCQ^G&nt%$Qm-S<7SQQ5CD9eDja#t8#oY.,76A%9Cp]G[<"_m#OTb*5fs\IEe55B4SPN^R9CYggg8V?]0.h[ip/0Rfq!+<%"[CTgeM9HJLk`dA5Z3:Y:_P'/cn,NVJ_G6ZB6O;^='cfI0)GPTjWOD-$35q(aV),@l.FRI!U>:S#i=E;%K)YOU$[C@+n?$X1CT$E-kN1&':^DDNV:q\8jcF05[a\XZ4HDkA$i**[P&Yb'K?c4UILI2+Eo.U,$0BunY-%`PqoTfYAmke@EMu,Cm53Ke6:!p+75Th\q:j>7LHc_LOBR-m6-;8'$[-_+Cf4RV$(XbH'qA\XIWH48.d%EKI*7&JIYk'/&7hGa(&a1RVfPOklqJb>A/.&#frsp=CR8L0rLHd!3H@GPo<=aaJ,*7]Vf(9EmcA9m)7,dBLJ"KL2+-$T\/jY0@M8:@mN./h$Jat]`^SZV^K#_`g:]L&e5Fq4IWL[UEi,5+2!*A9-A_q[s#=HGd?H>oGn;'`D8GR@9I?r6RL#gu@"n)d&g'#5ZtGlmCN.Ioh_sN]][Q/=IU[(MeMPs+CI>?eUk?VC@6&LQS1!"?].^0N,:]SA=JQc5i4bcg_;R#[iG%]`$ZiVUah4-iGK39o=+r`pVEuqC/oMhAZpT$69ZMDVKa\4?O05dA?EUZI0!Rm?&h%cVFWO/'VJn&-`rQ8K31X7g.8CeKg;<'.@9WX'4(_NOJ?L^NQGm)&>BjpfbQFOiNJc^Q,+>77ij=Z>nkH,!W?05^j4/i.#^"@OGOc(%Fa,D0s),Do_aIoVj$gXKtAG]T]0:+7.`=9PA6\#Xm,9=$pKfUJ-s]c4GUgIkR[I^;:g%hW%FCj!,'g\#_())K,kLM"rr@oH+kRQ$Pp@82gV&8.T>nc\Wos`C9L=j1lh$9C8gO?=9\=kVI_6@Oj`Z.on*HNS57`2qcOltNjgC1DCj-/:T+C5V?&D:HQ8.GHp1ft.'aHpl]E?0YeJl2-ts3p8P6#rn:!;"&NO5c*SZ+Me[.EDdur6Sh1?-a$U.n78,1><[[LO>1V9q,Qc)doDIVPEFfZ\g3j+?s4ohKQj:`?K)6$Sauj/-3RBWc8."I2kCW8q:jQ5.N)LT6-JCksnp!#ab>%m70@NQdVjuC7TB%6+mOjER]tD:%l/GR6'LIA3/AI?7`=3pQ9O!=D4=K'j39CUd2!t4Z8.T6U9&$1aLM>9QZDpdOIi"F7K%"^/i,*`qK6@.5Nm,OgVcpMloalLWCG/fcYOh.DZh9I2oeeERIOD#%kJ&&HLW$,TC]V=pe)[!,>?O#I72gV)m:([I1E]@$1sRX1Qfs;2[sPj/[^7&E?0a?hi.9?`;U3:;Osc8CZnNJ`$YIJd6Q;!'jJ'Z#Us>4rj9;a?1V/[qPELHZ,^lq=nm>%cG7)3L81nH\J+!RWAf8APdJke2qM>0VA<6$HJ$4/l^8K=,B*h161B1_'IjJ*ciPFh&[1giop/*&LZE3$r5GLG'f+J"S5Hs@@O=uO3SmM(NFR:g[S'Zm"s*L2r2%psk&m^@+_u[gdrqAOP!^9c:N'Hi4$^IoqKOX16Uq[mN$;4t+F\>Xe>ZRq=FNGsVD;JE7R7&AqP">j!?.ej=I'6]NAq.M*pb*KaE:,&DDpMW]I\-T$5Z@^X]94V[KRsF?B2A #<== From a1e8f67a4044fee14ddff0a137a3d9d7c4e86cdc Mon Sep 17 00:00:00 2001 From: Lukasz Romanowicz Date: Thu, 28 Aug 2008 00:40:41 +0200 Subject: [PATCH 0293/2970] Update Polish translation --- AUTHORS | 1 + po/pl.po | 103 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6cb29671..2b93c60c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,6 +24,7 @@ Translations: gl: Miguel Anxo Bouzada hu: SZERVÁC Attila pl: Przemysław Sitek + pl: Lukasz Romanowicz sv: Mikael Magnusson Code from other projects: diff --git a/po/pl.po b/po/pl.po index 921ab922..354bf33d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,14 +2,15 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Przemysław Sitek , 2008. +# Lukasz Romanowicz , 2008. # msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-05-04 16:06+0200\n" -"PO-Revision-Date: 2008-06-17 17:08+0100\n" -"Last-Translator: Przemysław Sitek \n" +"PO-Revision-Date: 2008-08-27 00:24+0100\n" +"Last-Translator: Lukasz Romanowicz \n" "Language-Team: pl \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -21,7 +22,7 @@ msgstr "Lekka przeglądarka internetowa" #: ../midori.desktop.in.h:2 msgid "Midori" -msgstr "" +msgstr "Midori" #: ../midori.desktop.in.h:3 msgid "Web Browser" @@ -96,7 +97,7 @@ msgstr "[URL]" #: ../midori/main.c:351 msgid "Unknown argument." -msgstr "" +msgstr "Nieznany argument" #: ../midori/main.c:353 msgid "Failed to setup interface." @@ -104,11 +105,11 @@ msgstr "" #: ../midori/main.c:368 msgid "Please report comments, suggestions and bugs to:" -msgstr "" +msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów:" #: ../midori/main.c:370 msgid "Check for new versions at:" -msgstr "" +msgstr "Sprawdź nową wersję na:" #: ../midori/main.c:418 #, c-format @@ -176,11 +177,11 @@ msgstr "" #: ../midori/midori-app.c:132 msgid "Browser" -msgstr "" +msgstr "Przeglądarka" #: ../midori/midori-app.c:133 msgid "The current browser" -msgstr "" +msgstr "Obecna przeglądarka" #: ../midori/midori-app.c:141 msgid "Browser Count" @@ -194,12 +195,12 @@ msgstr "" #: ../midori/midori-browser.c:1130 #: ../midori/midori-searchentry.c:71 msgid "Search Engines" -msgstr "" +msgstr "Wyszukiwarki" #: ../midori/midori-app.c:151 #: ../midori/midori-searchentry.c:72 msgid "The list of search engines" -msgstr "" +msgstr "Lista wyszukiwarek" #: ../midori/midori-addons.c:40 #: ../midori/midori-browser.c:3201 @@ -366,11 +367,11 @@ msgstr "_Ustawienia strony" #: ../midori/midori-browser.c:2372 msgid "Show a preview of the printed page" -msgstr "" +msgstr "Pokaż podgląd drukowanej strony" #: ../midori/midori-browser.c:2375 msgid "Print the current page" -msgstr "" +msgstr "Drukuj bieżącą stronę" #: ../midori/midori-browser.c:2378 msgid "Quit the application" @@ -390,7 +391,7 @@ msgstr "Przywróć" #: ../midori/midori-browser.c:2389 msgid "Cut the selected text" -msgstr "" +msgstr "Wytnij zaznaczony tekst" #: ../midori/midori-browser.c:2392 #: ../midori/midori-browser.c:2395 @@ -411,7 +412,7 @@ msgstr "Zaznacz w_szystko" #: ../midori/midori-browser.c:2407 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Znajdź słowa lub frazy na stronie" #: ../midori/midori-browser.c:2409 msgid "Find _Next" @@ -451,11 +452,11 @@ msgstr "Paski _narzędziowe" #: ../midori/midori-browser.c:2434 msgid "Increase the zoom level" -msgstr "" +msgstr "Powiększ" #: ../midori/midori-browser.c:2437 msgid "Decrease the zoom level" -msgstr "" +msgstr "Zmniejsz" #: ../midori/midori-browser.c:2440 msgid "Reset the zoom level" @@ -467,7 +468,7 @@ msgstr "Ź_ródło strony" #: ../midori/midori-browser.c:2443 msgid "View the source code of the page" -msgstr "" +msgstr "Zobacz kod źródłowy strony" #: ../midori/midori-browser.c:2445 msgid "View Selection Source" @@ -487,15 +488,15 @@ msgstr "P_rzejdź" #: ../midori/midori-browser.c:2454 msgid "Go back to the previous page" -msgstr "" +msgstr "Wróć do poprzedniej strony" #: ../midori/midori-browser.c:2457 msgid "Go forward to the next page" -msgstr "" +msgstr "Przejdź do następnej strony" #: ../midori/midori-browser.c:2460 msgid "Go to your homepage" -msgstr "" +msgstr "Przejdź do strony startowej" #: ../midori/midori-browser.c:2462 msgid "Location..." @@ -535,7 +536,7 @@ msgstr "Opróżnij kosz" #: ../midori/midori-browser.c:2475 msgid "Delete the contents of the trash" -msgstr "" +msgstr "Usuń zawartość kosza" #: ../midori/midori-browser.c:2477 msgid "Undo Close Tab" @@ -543,7 +544,7 @@ msgstr "Cofnij zamknięcie karty" #: ../midori/midori-browser.c:2478 msgid "Open the last closed tab" -msgstr "" +msgstr "Otwórz ostatnio zamkniętą kartę" #: ../midori/midori-browser.c:2480 msgid "_Bookmarks" @@ -551,7 +552,7 @@ msgstr "_Zakładki" #: ../midori/midori-browser.c:2483 msgid "Add a new bookmark" -msgstr "" +msgstr "Dodaj nową zakładkę" #: ../midori/midori-browser.c:2485 msgid "_Manage Bookmarks" @@ -563,7 +564,7 @@ msgstr "" #: ../midori/midori-browser.c:2489 msgid "Open the selected bookmark" -msgstr "" +msgstr "Otwórz wybraną zakładkę" #: ../midori/midori-browser.c:2491 msgid "Open in New _Tab" @@ -571,7 +572,7 @@ msgstr "Otwórz odnośnik w nowej _karcie" #: ../midori/midori-browser.c:2492 msgid "Open the selected bookmark in a new tab" -msgstr "" +msgstr "Otwórz wybraną zakładkę w nowej karcie" #: ../midori/midori-browser.c:2494 msgid "Open in New _Window" @@ -579,15 +580,15 @@ msgstr "Otwórz odnośnik w _nowym oknie" #: ../midori/midori-browser.c:2495 msgid "Open the selected bookmark in a new window" -msgstr "" +msgstr "Otwórz wybraną zakładkę w nowym oknie" #: ../midori/midori-browser.c:2498 msgid "Edit the selected bookmark" -msgstr "" +msgstr "Edytuj wybraną zakładkę" #: ../midori/midori-browser.c:2501 msgid "Delete the selected bookmark" -msgstr "" +msgstr "Skasuj wybraną zakładkę" #: ../midori/midori-browser.c:2503 msgid "_Tools" @@ -611,7 +612,7 @@ msgstr "_Poprzednia karta" #: ../midori/midori-browser.c:2512 msgid "Switch to the previous tab" -msgstr "" +msgstr "Przełącz na poprzednią kartę" #: ../midori/midori-browser.c:2514 msgid "_Next Tab" @@ -619,7 +620,7 @@ msgstr "_Następna karta" #: ../midori/midori-browser.c:2515 msgid "Switch to the next tab" -msgstr "" +msgstr "Przełącz na następną kartę" #: ../midori/midori-browser.c:2517 msgid "Tab _Overview" @@ -627,7 +628,7 @@ msgstr "P_odgląd kart" #: ../midori/midori-browser.c:2518 msgid "Show an overview of all open tabs" -msgstr "" +msgstr "Pokaż wszystkie otwarte karty" #. G_CALLBACK (_action_tab_overview_activate) #: ../midori/midori-browser.c:2520 @@ -640,11 +641,11 @@ msgstr "_Zawartość" #: ../midori/midori-browser.c:2523 msgid "Show the documentation" -msgstr "" +msgstr "Pokaż dokumentację" #: ../midori/midori-browser.c:2526 msgid "Show information about the program" -msgstr "" +msgstr "Pokaż informacje o programie" #: ../midori/midori-browser.c:2532 msgid "P_rivate Browsing" @@ -652,7 +653,7 @@ msgstr "P_rywatne przeglądanie" #: ../midori/midori-browser.c:2533 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "Nie zapisuj żadnych prywatnych danych podczas przeglądania" #: ../midori/midori-browser.c:2536 msgid "_Work Offline" @@ -700,7 +701,7 @@ msgstr "Pasek stanu" #: ../midori/midori-browser.c:2558 msgid "Show statusbar" -msgstr "" +msgstr "Pokaż pasek stanu" #: ../midori/midori-browser.c:3067 msgid "Bookmarks" @@ -758,7 +759,7 @@ msgstr "" #: ../midori/midori-panel.c:212 #: ../midori/midori-panel.c:213 msgid "Close panel" -msgstr "" +msgstr "Zamknij panel" #: ../midori/midori-panel.c:391 msgid "Untitled" @@ -766,7 +767,7 @@ msgstr "Bez tytułu" #: ../midori/midori-trash.c:96 msgid "Limit" -msgstr "" +msgstr "Ograniczenie" #: ../midori/midori-trash.c:97 msgid "The maximum number of items" @@ -855,7 +856,7 @@ msgstr "Żadne" #: ../midori/midori-websettings.c:249 msgid "Remember last window size" -msgstr "" +msgstr "Pamiętaj ostatni rozmiar okna" #: ../midori/midori-websettings.c:250 msgid "Whether to save the last window size" @@ -863,27 +864,27 @@ msgstr "" #: ../midori/midori-websettings.c:258 msgid "Last window width" -msgstr "" +msgstr "Ostatnia szerokość okna" #: ../midori/midori-websettings.c:259 msgid "The last saved window width" -msgstr "" +msgstr "Ostatnia zapisana szerokość okna" #: ../midori/midori-websettings.c:267 msgid "Last window height" -msgstr "" +msgstr "Ostatnia wysokość okna" #: ../midori/midori-websettings.c:268 msgid "The last saved window height" -msgstr "" +msgstr "Ostatnia zapisana wysokość okna" #: ../midori/midori-websettings.c:276 msgid "Last panel position" -msgstr "" +msgstr "Ostatnia pozycja panelu" #: ../midori/midori-websettings.c:277 msgid "The last saved panel position" -msgstr "" +msgstr "Ostatnio zapisana pozycja panelu" #: ../midori/midori-websettings.c:285 msgid "Last panel page" @@ -927,7 +928,7 @@ msgstr "" #: ../midori/midori-websettings.c:332 msgid "Show Panel" -msgstr "" +msgstr "Pokaż panel" #: ../midori/midori-websettings.c:333 msgid "Whether to show the panel" @@ -947,7 +948,7 @@ msgstr "" #: ../midori/midori-websettings.c:352 msgid "The style of the toolbar" -msgstr "" +msgstr "Styl paska narzędzi" #: ../midori/midori-websettings.c:361 msgid "Small toolbar" @@ -963,7 +964,7 @@ msgstr "Pokazuj przycisk \"Nowa karta\"" #: ../midori/midori-websettings.c:371 msgid "Show the New Tab button in the toolbar" -msgstr "" +msgstr "Pokaż przycisk nowej karty na pasku narzędzi" #: ../midori/midori-websettings.c:379 msgid "Show Homepage" @@ -971,7 +972,7 @@ msgstr "Pokazuj stronę startową" #: ../midori/midori-websettings.c:380 msgid "Show the Homepage button in the toolbar" -msgstr "" +msgstr "Pokaż przycisk strony startowej na pasku narzędzi" #: ../midori/midori-websettings.c:388 msgid "Show Web search" @@ -987,7 +988,7 @@ msgstr "Pokazuj kosz" #: ../midori/midori-websettings.c:398 msgid "Show the Trash button in the toolbar" -msgstr "" +msgstr "Pokaż kosz na pasku narzędzi" #: ../midori/midori-websettings.c:408 msgid "Load on Startup" @@ -1260,7 +1261,7 @@ msgstr "" #: ../midori/midori-webitem.c:88 msgid "URI" -msgstr "" +msgstr "URI" #: ../midori/midori-webitem.c:89 msgid "The URI of the web item" @@ -1392,7 +1393,7 @@ msgstr "" #: ../katze/katze-utils.c:159 #: ../katze/katze-utils.c:183 msgid "Choose file" -msgstr "" +msgstr "Wybierz plik" #: ../katze/katze-utils.c:171 msgid "Choose folder" From be4038e555b35dad97c524c82fee98e2e3097c78 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 28 Aug 2008 00:55:35 +0200 Subject: [PATCH 0294/2970] Remove GIO HTTPS check again, it's not worth the trouble Apparently lots of users cannot use Midori after this change and with no way to track down the cause of the issue, let's just not use this. The check was only for minimal gain anyway --- midori/midori-browser.c | 9 ++++++--- midori/sokoke.c | 26 -------------------------- midori/sokoke.h | 3 --- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 29f7e649..7965fd73 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -258,8 +258,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomOut", web_view != NULL); _action_set_sensitive (browser, "ZoomNormal", web_view != NULL && webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); - if (sokoke_gio_supports_http ()) - _action_set_sensitive (browser, "SourceView", web_view != NULL); + #if HAVE_GIO + _action_set_sensitive (browser, "SourceView", web_view != NULL); + #endif _action_set_sensitive (browser, "FindNext", web_view != NULL); _action_set_sensitive (browser, "FindPrevious", web_view != NULL); /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ @@ -3606,7 +3607,9 @@ midori_browser_init (MidoriBrowser* browser) g_object_unref (ui_manager); - _action_set_sensitive (browser, "SourceView", sokoke_gio_supports_http ()); + #if !HAVE_GIO + _action_set_sensitive (browser, "SourceView", FALSE); + #endif #ifndef WEBKIT_CHECK_VERSION _action_set_sensitive (browser, "ZoomIn", FALSE); diff --git a/midori/sokoke.c b/midori/sokoke.c index d97079b1..8affd5dd 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -21,9 +21,6 @@ #endif #include -#if HAVE_GIO - #include -#endif #include #include #include @@ -629,26 +626,3 @@ sokoke_action_create_popup_menu_item (GtkAction* action) return menuitem; } - -gboolean -sokoke_gio_supports_http (void) -{ - #if HAVE_GIO - static gboolean supports_http; - static gboolean tested; - const gchar* const* schemes = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); - - if (tested) - return supports_http; - while (*schemes) - { - if (!strcmp (*schemes, "http")) - supports_http = TRUE; - schemes++; - } - tested = TRUE; - return supports_http; - #else - return FALSE; - #endif -} diff --git a/midori/sokoke.h b/midori/sokoke.h index a74c80ce..59f8ea87 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -131,7 +131,4 @@ sokoke_object_get_boolean (gpointer object, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); -gboolean -sokoke_gio_supports_http (void ); - #endif /* !__SOKOKE_H__ */ From b6ae63249b14d6501dd46466c7f15f10882f31f2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 28 Aug 2008 01:15:30 +0200 Subject: [PATCH 0295/2970] Use HAVE_GIO *everywhere* now --- midori/compat.c | 4 ++-- midori/compat.h | 8 ++++++-- midori/gtkiconentry.c | 14 +++++++------- midori/gtkiconentry.h | 9 ++++++--- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index a1e90621..7a871ad1 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -13,7 +13,7 @@ #if !GTK_CHECK_VERSION(2, 14, 0) -#if GLIB_CHECK_VERSION(2, 16, 0) +#if HAVE_GIO /* GTK+/ GdkPixbuf internal helper function Copyright (C) 2008 Matthias Clasen @@ -120,7 +120,7 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, { static GtkTooltips* tooltips = NULL; if (G_UNLIKELY (!tooltips)) - tooltips = gtk_tooltips_new(); + tooltips = gtk_tooltips_new (); gtk_tool_item_set_tooltip (toolitem, tooltips, text, NULL); } diff --git a/midori/compat.h b/midori/compat.h index 5aec6163..a3c6d5c1 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -12,8 +12,12 @@ #ifndef __COMPAT_H__ #define __COMPAT_H__ +#if HAVE_CONFIG_H + #include +#endif + #include -#if GLIB_CHECK_VERSION(2, 16, 0) +#if HAVE_GIO #include #endif #include @@ -22,7 +26,7 @@ G_BEGIN_DECLS #if !GTK_CHECK_VERSION(2, 14, 0) -#if GLIB_CHECK_VERSION(2,16, 0) +#if HAVE_GIO GdkPixbuf* gdk_pixbuf_new_from_stream (GInputStream* stream, diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 6faa9845..33d4308f 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -61,7 +61,7 @@ typedef struct GdkCursorType cursor_type; gboolean custom_cursor; GtkImageType storage_type; - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO GIcon *gicon; #endif gchar *icon_name; @@ -274,7 +274,7 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) NULL, GTK_PARAM_WRITABLE)); - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO g_object_class_install_property (gobject_class, PROP_GICON_PRIMARY, g_param_spec_object ("gicon-primary", @@ -433,7 +433,7 @@ gtk_icon_entry_set_property (GObject *object, g_value_get_string (value)); break; - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO case PROP_GICON_PRIMARY: gtk_icon_entry_set_icon_from_gicon (entry, GTK_ICON_ENTRY_PRIMARY, @@ -471,7 +471,7 @@ gtk_icon_entry_get_property (GObject *object, GTK_ICON_ENTRY_SECONDARY)); break; - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO case PROP_GICON_PRIMARY: g_value_set_object (value, gtk_icon_entry_get_gicon (entry, @@ -1104,7 +1104,7 @@ icon_theme_changed (GtkIconEntry *entry) gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name); } - #if GLIB_CHECK_VERSION (2, 16, 0) + #if HAVE_GIO else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) { g_object_unref (priv->icons[i].pixbuf); @@ -1339,7 +1339,7 @@ gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, * appropriately. */ -#if GLIB_CHECK_VERSION (2, 16, 0) +#if HAVE_GIO void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, @@ -1493,7 +1493,7 @@ gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, */ -#if GLIB_CHECK_VERSION (2, 16, 0) +#if HAVE_GIO GIcon * gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos) diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index 314eccb6..c7fe063b 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -21,9 +21,12 @@ #ifndef __GTK_ICON_ENTRY_H__ #define __GTK_ICON_ENTRY_H__ +#if HAVE_CONFIG_H + #include +#endif #include -#if GLIB_CHECK_VERSION (2, 16, 0) +#if HAVE_GIO #include #endif #include @@ -83,14 +86,14 @@ void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, GtkIconEntryPosition icon_pos, const gchar *icon_name); -#if GLIB_CHECK_VERSION (2, 16, 0) +#if HAVE_GIO void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, GIcon *icon); #endif GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos); -#if GLIB_CHECK_VERSION (2, 16, 0) +#if HAVE_GIO GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos); #endif From 311e30bbfe60f8ecc3a3286afbf18f4a70772019 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 29 Aug 2008 02:29:48 +0200 Subject: [PATCH 0296/2970] Focus the web view when middle click pasting w/o Ctrl --- midori/midori-webview.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/midori/midori-webview.c b/midori/midori-webview.c index d28a83f0..7f920da5 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -21,7 +21,7 @@ #include "compat.h" #if HAVE_GIO -#include + #include #endif #include #include @@ -472,8 +472,8 @@ gjs_value_links_foreach_cb (GjsValue* link, MidoriWebView* web_view) { const gchar* type; - const gchar* rel; #if HAVE_GIO + const gchar* rel; GFile* icon_file; GIcon* icon; #endif @@ -601,7 +601,10 @@ gtk_widget_button_press_event_after (MidoriWebView* web_view, if (state & GDK_CONTROL_MASK) g_signal_emit (web_view, signals[NEW_TAB], 0, new_uri); else + { g_object_set (web_view, "uri", new_uri, NULL); + gtk_widget_grab_focus (GTK_WIDGET (web_view)); + } g_free (new_uri); g_free (uri); return TRUE; From 6dc95a7a9c9c8514be5d8a27130c64eb6d6f1861 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 29 Aug 2008 03:20:31 +0200 Subject: [PATCH 0297/2970] Refactor a lot of tree view selection code into convenience --- midori/midori-browser.c | 209 ++++++++++++++++++---------------------- midori/sokoke.c | 39 +++++++- midori/sokoke.h | 5 + 3 files changed, 138 insertions(+), 115 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7965fd73..3db8f8e6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2146,28 +2146,26 @@ midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, } static void -midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, +midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, MidoriBrowser* browser) { - GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); - if (selection) - { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + gboolean is_separator; - gboolean is_separator = katze_xbel_item_is_separator (item); - _action_set_sensitive (browser, "BookmarkEdit", !is_separator); - _action_set_sensitive (browser, "BookmarkDelete", TRUE); - } - else - { - _action_set_sensitive (browser, "BookmarkEdit", FALSE); - _action_set_sensitive (browser, "BookmarkDelete", FALSE); - } + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + + is_separator = katze_xbel_item_is_separator (item); + _action_set_sensitive (browser, "BookmarkEdit", !is_separator); + _action_set_sensitive (browser, "BookmarkDelete", TRUE); + } + else + { + _action_set_sensitive (browser, "BookmarkEdit", FALSE); + _action_set_sensitive (browser, "BookmarkDelete", FALSE); } } @@ -2192,29 +2190,25 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, GdkEventButton* event, MidoriBrowser* browser) { + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + if (event->button != 2 && event->button != 3) return FALSE; - GtkTreeSelection* selection = gtk_tree_view_get_selection ( - GTK_TREE_VIEW (widget)); - if (selection) + if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (event->button == 2 && katze_xbel_item_is_bookmark (item)) { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (event->button == 2 && katze_xbel_item_is_bookmark (item)) - { - const gchar* uri = katze_xbel_bookmark_get_href (item); - gint n = midori_browser_add_uri (browser, uri); - midori_browser_set_current_page (browser, n); - } - else - _midori_panel_bookmarks_popup (widget, event, item, browser); - return TRUE; + const gchar* uri = katze_xbel_bookmark_get_href (item); + gint n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); } + else + _midori_panel_bookmarks_popup (widget, event, item, browser); + return TRUE; } return FALSE; } @@ -2223,18 +2217,14 @@ static void midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, MidoriBrowser* browser) { - GtkTreeSelection* selection = gtk_tree_view_get_selection ( - GTK_TREE_VIEW (widget)); - if (selection) + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + + if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - _midori_panel_bookmarks_popup (widget, NULL, item, browser); - } + gtk_tree_model_get (model, &iter, 0, &item, -1); + _midori_panel_bookmarks_popup (widget, NULL, item, browser); } } @@ -2565,20 +2555,18 @@ static void _action_bookmark_open_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); - if (selection) + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + + tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) - g_object_set (midori_browser_get_current_web_view (browser), - "uri", katze_xbel_bookmark_get_href(item), NULL); - } + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) + g_object_set (midori_browser_get_current_web_view (browser), + "uri", katze_xbel_bookmark_get_href (item), NULL); } } @@ -2586,21 +2574,20 @@ static void _action_bookmark_open_tab_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); - if (selection) + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + gint n; + + tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) - { - gint n = midori_browser_add_xbel_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); - } + n = midori_browser_add_xbel_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); } } } @@ -2609,21 +2596,20 @@ static void _action_bookmark_open_window_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); - if (selection) + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + gint n; + + tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (katze_xbel_item_is_bookmark (item)) { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) - { - gint n = midori_browser_add_xbel_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); - } + n = midori_browser_add_xbel_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); } } } @@ -2632,19 +2618,17 @@ static void _action_bookmark_edit_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); - if (selection) + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + + tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (!katze_xbel_item_is_separator (item)) - midori_browser_edit_bookmark_dialog_new (browser, item); - } + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (!katze_xbel_item_is_separator (item)) + midori_browser_edit_bookmark_dialog_new (browser, item); } } @@ -2677,22 +2661,21 @@ static void _action_bookmark_delete_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - GtkTreeSelection* selection = gtk_tree_view_get_selection (treeview); - if (selection) + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeXbelItem* item; + KatzeXbelItem* parent; + + tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { - GtkTreeModel* model; - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - KatzeXbelItem* item; - gtk_tree_model_get (model, &iter, 0, &item, -1); - KatzeXbelItem* parent = katze_xbel_item_get_parent (item); - katze_xbel_folder_remove_item (parent, item); - /* This is a preliminary hack, until we fix it properly again */ - gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - katze_xbel_item_unref (item); - } + gtk_tree_model_get (model, &iter, 0, &item, -1); + parent = katze_xbel_item_get_parent (item); + katze_xbel_folder_remove_item (parent, item); + /* This is a preliminary hack, until we fix it properly again */ + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + katze_xbel_item_unref (item); } } diff --git a/midori/sokoke.c b/midori/sokoke.c index 8affd5dd..fadd5245 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -611,7 +611,7 @@ sokoke_object_get_boolean (gpointer object, * @action: a #GtkAction * * Creates a menu item from an action, just like - * gtk_action_create_menu_item() but it won't + * gtk_action_create_menu_item(), but it won't * display an accelerator. * * Return value: a new #GtkMenuItem @@ -621,8 +621,43 @@ sokoke_action_create_popup_menu_item (GtkAction* action) { GtkWidget* menuitem; - menuitem = gtk_image_menu_item_new_with_mnemonic (""); + g_return_val_if_fail (GTK_IS_ACTION (action), NULL); + + menuitem = gtk_image_menu_item_new (); gtk_action_connect_proxy (action, menuitem); return menuitem; } + +/** + * sokoke_tree_view_get_selected_iter: + * @tree_view: a #GtkTreeView + * @model: a pointer to store the model, or %NULL + * @iter: a pointer to store the iter, or %NULL + * + * Determines whether there is a selection in the tree view + * and sets the @iter to the current selection. + * + * If there is a selection and @model is not %NULL, it is + * set to the model, mainly for convenience. + * + * Either @model or @iter or both can be %NULL in which case + * no value will be assigned in any case. + * + * Return value: %TRUE if there is a selection + **/ +gboolean +sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, + GtkTreeModel** model, + GtkTreeIter* iter) +{ + GtkTreeSelection* selection; + + g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE); + + selection = gtk_tree_view_get_selection (tree_view); + if (selection) + if (gtk_tree_selection_get_selected (selection, model, iter)) + return TRUE; + return FALSE; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 59f8ea87..99d8b903 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -131,4 +131,9 @@ sokoke_object_get_boolean (gpointer object, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); +gboolean +sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, + GtkTreeModel** model, + GtkTreeIter* iter); + #endif /* !__SOKOKE_H__ */ From cad440fa3399b97e1c9c99b076982200151a5709 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 02:45:13 +0200 Subject: [PATCH 0298/2970] Show progress in location entry if statusbar is hidden --- AUTHORS | 2 + midori/midori-browser.c | 32 ++-- midori/midori-locationaction.c | 59 +++++++- midori/midori-locationaction.h | 7 + midori/midori-locationentry.c | 267 ++++++++++++++++++++++++++++++++- midori/midori-locationentry.h | 7 + 6 files changed, 362 insertions(+), 12 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2b93c60c..161eb23a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,3 +29,5 @@ Translations: Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen + GTK+/ GtkEntry, Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3db8f8e6..78aff86f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -271,9 +271,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_set_sensitive (browser->throbber, FALSE); g_object_set (action, "stock-id", GTK_STOCK_REFRESH, - "tooltip", _("Reload the current page"), NULL); + "tooltip", _("Reload the current page"), + "sensitive", web_view != NULL, NULL); gtk_widget_hide (browser->progressbar); - gtk_action_set_sensitive (action, web_view != NULL); } else { @@ -282,6 +282,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); gtk_widget_show (browser->progressbar); + if (!GTK_WIDGET_VISIBLE (browser->statusbar)) + g_object_set (_action_by_name (browser, "Location"), "progress", + midori_web_view_get_progress (MIDORI_WEB_VIEW (web_view)), NULL); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); @@ -339,10 +342,15 @@ static void _midori_browser_update_progress (MidoriBrowser* browser, MidoriWebView* web_view) { + MidoriLocationAction* action; gdouble progress; gchar* message; + action = MIDORI_LOCATION_ACTION (_action_by_name (browser, "Location")); progress = midori_web_view_get_progress (web_view); + /* When we are finished, we don't want to *see* progress anymore */ + if (midori_web_view_get_load_status (web_view) == MIDORI_LOAD_FINISHED) + progress = 0.0; if (progress > 0.0) { gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (browser->progressbar), @@ -351,12 +359,15 @@ _midori_browser_update_progress (MidoriBrowser* browser, gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), message); g_free (message); + if (!GTK_WIDGET_VISIBLE (browser->statusbar)) + midori_location_action_set_progress (action, progress); } else { gtk_progress_bar_pulse (GTK_PROGRESS_BAR (browser->progressbar)); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), NULL); + midori_location_action_set_progress (action, 0.0); } } @@ -634,7 +645,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_xbel_bookmark_get_href (bookmark)); - gtk_box_pack_start (GTK_BOX(hbox), entry_uri, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); } @@ -661,7 +672,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, katze_xbel_item_set_title (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); katze_xbel_item_set_desc (bookmark, - gtk_entry_get_text(GTK_ENTRY(entry_desc))); + gtk_entry_get_text (GTK_ENTRY (entry_desc))); if (katze_xbel_item_is_bookmark (bookmark)) katze_xbel_bookmark_set_href (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); @@ -1582,8 +1593,8 @@ _midori_browser_tab_set_highlight_text_matches (MidoriBrowser* browser, } static void -_action_find_activate(GtkAction* action, - MidoriBrowser* browser) +_action_find_activate (GtkAction* action, + MidoriBrowser* browser) { if (GTK_WIDGET_VISIBLE (browser->find)) { @@ -1609,7 +1620,7 @@ _midori_browser_find (MidoriBrowser* browser, { const gchar* text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); const gboolean case_sensitive = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON(browser->find_case)); + GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); GtkWidget* widget = midori_browser_get_current_tab (browser); if (GTK_WIDGET_VISIBLE (browser->find)) _midori_browser_tab_unmark_text_matches (browser, widget); @@ -1772,6 +1783,9 @@ _action_statusbar_activate (GtkToggleAction* action, gboolean active = gtk_toggle_action_get_active (action); g_object_set (browser->settings, "show-statusbar", active, NULL); sokoke_widget_set_visible (browser->statusbar, active); + if (active) + g_object_set (_action_by_name (browser, "Location"), + "progress", 0.0, NULL); } static void @@ -3237,8 +3251,8 @@ midori_browser_init (MidoriBrowser* browser) browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new (); gtk_widget_show (menuitem); - browser->throbber = katze_throbber_new(); - gtk_widget_show(browser->throbber); + browser->throbber = katze_throbber_new (); + gtk_widget_show (browser->throbber); gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber); gtk_widget_set_sensitive (menuitem, FALSE); gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index d8d285ac..503740b8 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -23,6 +23,7 @@ struct _MidoriLocationAction GtkAction parent_instance; gchar* uri; + gdouble progress; }; struct _MidoriLocationActionClass @@ -36,6 +37,7 @@ enum { PROP_0, + PROP_PROGRESS, PROP_SECONDARY_ICON }; @@ -138,11 +140,20 @@ midori_location_action_class_init (MidoriLocationActionClass* class) action_class->connect_proxy = midori_location_action_connect_proxy; action_class->disconnect_proxy = midori_location_action_disconnect_proxy; + g_object_class_install_property (gobject_class, + PROP_PROGRESS, + g_param_spec_double ( + "progress", + _("Progress"), + _("The current progress of the action"), + 0.0, 1.0, 0.0, + G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, g_param_spec_string ( "secondary-icon", - "Secondary", + _("Secondary"), _("The stock ID of the secondary icon"), NULL, G_PARAM_WRITABLE)); @@ -152,6 +163,7 @@ static void midori_location_action_init (MidoriLocationAction* location_action) { location_action->uri = NULL; + location_action->progress = 0.0; } static void @@ -174,6 +186,12 @@ midori_location_action_set_property (GObject* object, switch (prop_id) { + case PROP_PROGRESS: + { + midori_location_action_set_progress (location_action, + g_value_get_double (value)); + break; + } case PROP_SECONDARY_ICON: { midori_location_action_set_secondary_icon (location_action, @@ -223,6 +241,8 @@ midori_location_action_create_tool_item (GtkAction* action) toolitem = GTK_WIDGET (gtk_tool_item_new ()); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); entry = midori_location_entry_new (); + midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), + MIDORI_LOCATION_ACTION (action)->progress); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (entry))), GTK_ICON_ENTRY_SECONDARY, TRUE); @@ -355,7 +375,6 @@ midori_location_action_set_uri (MidoriLocationAction* location_action, g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - katze_assign (location_action->uri, g_strdup (uri)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); @@ -478,6 +497,42 @@ midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, while ((proxies = g_slist_next (proxies))); } +gdouble +midori_location_action_get_progress (MidoriLocationAction* location_action) +{ + g_return_val_if_fail (MIDORI_IS_LOCATION_ACTION (location_action), 0.0); + + return location_action->progress; +} + +void +midori_location_action_set_progress (MidoriLocationAction* location_action, + gdouble progress) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + + location_action->progress = CLAMP (progress, 0.0, 1.0); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), + location_action->progress); + } + while ((proxies = g_slist_next (proxies))); +} + void midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, const gchar* stock_id) diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index 5310c4d1..c6d1e2cd 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -53,6 +53,13 @@ midori_location_action_set_title_for_uri (MidoriLocationAction* location_action const gchar* title, const gchar* text); +gdouble +midori_location_action_get_progress (MidoriLocationAction* location_action); + +void +midori_location_action_set_progress (MidoriLocationAction* location_action, + gdouble progress); + void midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, const gchar* stock_id); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 24508505..70466eaf 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -20,6 +20,8 @@ struct _MidoriLocationEntry { GtkComboBoxEntry parent_instance; + + gdouble progress; }; struct _MidoriLocationEntryClass @@ -68,6 +70,263 @@ midori_location_entry_class_init (MidoriLocationEntryClass* class) G_TYPE_INT); } +#define HAVE_ENTRY_PROGRESS GTK_CHECK_VERSION (2, 10, 0) + +#ifdef HAVE_ENTRY_PROGRESS + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted */ +static void +gtk_entry_get_pixel_ranges (GtkEntry *entry, + gint **ranges, + gint *n_ranges) +{ + gint start_char, end_char; + + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_char, &end_char)) + { + PangoLayout *layout = gtk_entry_get_layout (entry); + PangoLayoutLine *line = pango_layout_get_lines (layout)->data; + const char *text = pango_layout_get_text (layout); + gint start_index = g_utf8_offset_to_pointer (text, start_char) - text; + gint end_index = g_utf8_offset_to_pointer (text, end_char) - text; + gint real_n_ranges, i; + + pango_layout_line_get_x_ranges (line, start_index, end_index, ranges, &real_n_ranges); + + if (ranges) + { + gint *r = *ranges; + + for (i = 0; i < real_n_ranges; ++i) + { + r[2 * i + 1] = (r[2 * i + 1] - r[2 * i]) / PANGO_SCALE; + r[2 * i] = r[2 * i] / PANGO_SCALE; + } + } + + if (n_ranges) + *n_ranges = real_n_ranges; + } + else + { + if (n_ranges) + *n_ranges = 0; + if (ranges) + *ranges = NULL; + } +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted + Code adjusted to not rely on internal qdata */ +static void +_gtk_entry_effective_inner_border (GtkEntry *entry, + GtkBorder *border) +{ + static const GtkBorder default_inner_border = { 2, 2, 2, 2 }; + GtkBorder *tmp_border; + + tmp_border = (GtkBorder*) gtk_entry_get_inner_border (entry); + + if (tmp_border) + { + *border = *tmp_border; + return; + } + + gtk_widget_style_get (GTK_WIDGET (entry), "inner-border", &tmp_border, NULL); + + if (tmp_border) + { + *border = *tmp_border; + gtk_border_free (tmp_border); + return; + } + + *border = default_inner_border; +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted */ +static void +get_layout_position (GtkEntry *entry, + gint *x, + gint *y) +{ + PangoLayout *layout; + PangoRectangle logical_rect; + gint area_width, area_height; + GtkBorder inner_border; + gint y_pos; + PangoLayoutLine *line; + + layout = gtk_entry_get_layout (entry); + + GTK_ENTRY_CLASS (G_OBJECT_GET_CLASS (entry))->get_text_area_size (entry, NULL, NULL, &area_width, &area_height); + _gtk_entry_effective_inner_border (entry, &inner_border); + + area_height = PANGO_SCALE * (area_height - inner_border.top - inner_border.bottom); + + line = pango_layout_get_lines (layout)->data; + pango_layout_line_get_extents (line, NULL, &logical_rect); + + /* Align primarily for locale's ascent/descent */ + y_pos = ((area_height - entry->ascent - entry->descent) / 2 + + entry->ascent + logical_rect.y); + + /* Now see if we need to adjust to fit in actual drawn string */ + if (logical_rect.height > area_height) + y_pos = (area_height - logical_rect.height) / 2; + else if (y_pos < 0) + y_pos = 0; + else if (y_pos + logical_rect.height > area_height) + y_pos = area_height - logical_rect.height; + + y_pos = inner_border.top + y_pos / PANGO_SCALE; + + if (x) + *x = inner_border.left - entry->scroll_offset; + + if (y) + *y = y_pos; +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted + Code adjusted to not rely on internal _gtk_entry_ensure_layout */ +static void +gtk_entry_draw_text (GtkEntry *entry) +{ + GtkWidget *widget; + + if (!entry->visible && entry->invisible_char == 0) + return; + + if (GTK_WIDGET_DRAWABLE (entry)) + { + PangoLayout *layout = gtk_entry_get_layout (entry); + cairo_t *cr; + gint x, y; + gint start_pos, end_pos; + + widget = GTK_WIDGET (entry); + + get_layout_position (entry, &x, &y); + + cr = gdk_cairo_create (entry->text_area); + + cairo_move_to (cr, x, y); + gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); + pango_cairo_show_layout (cr, layout); + + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) + { + gint *ranges; + gint n_ranges, i; + PangoRectangle logical_rect; + GdkColor *selection_color, *text_color; + GtkBorder inner_border; + + pango_layout_get_pixel_extents (layout, NULL, &logical_rect); + gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); + + if (GTK_WIDGET_HAS_FOCUS (entry)) + { + selection_color = &widget->style->base [GTK_STATE_SELECTED]; + text_color = &widget->style->text [GTK_STATE_SELECTED]; + } + else + { + selection_color = &widget->style->base [GTK_STATE_ACTIVE]; + text_color = &widget->style->text [GTK_STATE_ACTIVE]; + } + + _gtk_entry_effective_inner_border (entry, &inner_border); + + for (i = 0; i < n_ranges; ++i) + cairo_rectangle (cr, + inner_border.left - entry->scroll_offset + ranges[2 * i], + y, + ranges[2 * i + 1], + logical_rect.height); + + cairo_clip (cr); + + gdk_cairo_set_source_color (cr, selection_color); + cairo_paint (cr); + + cairo_move_to (cr, x, y); + gdk_cairo_set_source_color (cr, text_color); + pango_cairo_show_layout (cr, layout); + + g_free (ranges); + } + + cairo_destroy (cr); + } +} + +static gboolean +entry_expose_event (GtkWidget* entry, + GdkEventExpose* event, + MidoriLocationEntry* location_entry) +{ + GdkWindow* text_area; + gint width, height; + + text_area = GTK_ENTRY (entry)->text_area; + + gdk_drawable_get_size (text_area, &width, &height); + + if (location_entry->progress > 0.0/* && location_entry->progress < 1.0*/) + { + gtk_paint_box (entry->style, text_area, + GTK_STATE_SELECTED, GTK_SHADOW_OUT, + &event->area, entry, "bar", + 0, 0, location_entry->progress * width, height); + gtk_entry_draw_text (GTK_ENTRY (entry)); + } + return FALSE; +} + +#endif + +gdouble +midori_location_entry_get_progress (MidoriLocationEntry* location_entry) +{ + g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), 0.0); + + return location_entry->progress; +} + +void +midori_location_entry_set_progress (MidoriLocationEntry* location_entry, + gdouble progress) +{ + #ifdef HAVE_ENTRY_PROGRESS + GtkWidget* child; + #endif + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + + location_entry->progress = CLAMP (progress, 0.0, 1.0); + + #ifdef HAVE_ENTRY_PROGRESS + child = gtk_bin_get_child (GTK_BIN (location_entry)); + if (GTK_ENTRY (child)->text_area) + gdk_window_invalidate_rect (GTK_ENTRY (child)->text_area, NULL, FALSE); + #endif +} + static void midori_location_entry_init (MidoriLocationEntry* location_entry) { @@ -81,16 +340,22 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) "widget_class \"*MidoriLocationEntry\" " "style \"midori-location-entry-style\"\n"); + location_entry->progress = 0.0; + entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); g_signal_connect (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); + #ifdef HAVE_ENTRY_PROGRESS + g_signal_connect_after (entry, "expose-event", + G_CALLBACK (entry_expose_event), location_entry); + #endif gtk_widget_show (entry); gtk_container_add (GTK_CONTAINER (location_entry), entry); store = gtk_list_store_new (N_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); g_object_set (G_OBJECT (location_entry), "model", store, NULL); - g_object_unref(store); + g_object_unref (store); gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (location_entry), URI_COL); gtk_cell_layout_clear (GTK_CELL_LAYOUT (location_entry)); diff --git a/midori/midori-locationentry.h b/midori/midori-locationentry.h index d6421b47..53f8a6fc 100644 --- a/midori/midori-locationentry.h +++ b/midori/midori-locationentry.h @@ -63,6 +63,13 @@ void midori_location_entry_add_item (MidoriLocationEntry* location_entry, MidoriLocationEntryItem* item); +gdouble +midori_location_entry_get_progress (MidoriLocationEntry* location_entry); + +void +midori_location_entry_set_progress (MidoriLocationEntry* location_entry, + gdouble progress); + G_END_DECLS #endif /* __MIDORI_LOCATION_ENTRY_H__ */ From d60190aaee8e8e84e0067a1df421ed22502eca1a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 03:14:00 +0200 Subject: [PATCH 0299/2970] Warn at configure time if GVfs is not installed --- wscript | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wscript b/wscript index 8d246fc8..d280fc1e 100644 --- a/wscript +++ b/wscript @@ -4,6 +4,7 @@ import Params import pproc as subprocess import Common +import platform APPNAME = 'midori' VERSION = '0.0.20' @@ -49,6 +50,13 @@ def configure (conf): gio = 'no' conf.check_message_custom ('GIO', 'support', gio) + if gio == 'yes': + if platform.system () != 'Windows': + if not conf.find_program ('gvfs-open'): + print '\tNote: There doesn\'t seem to be GVfs installed.' + print '\t The HTTP backend of GVfs is recommended for' + print '\t viewing source code and loading favicons.' + conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) From 8025d129a1953f0d84fad4ac7bf41af9f84efacd Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sun, 31 Aug 2008 03:21:29 +0200 Subject: [PATCH 0300/2970] Alt + Enter in the location should issue a new tab --- midori/midori-browser.c | 10 +++++++- midori/midori-locationaction.c | 46 +++++++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 78aff86f..7c761bc2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2030,10 +2030,12 @@ _action_location_reset_uri (GtkAction* action, static void _action_location_submit_uri (GtkAction* action, const gchar* uri, + gboolean new_tab, MidoriBrowser* browser) { gchar* location_entry_search; gchar* new_uri; + gint n; g_object_get (browser->settings, "location-entry-search", &location_entry_search, NULL); @@ -2043,7 +2045,13 @@ _action_location_submit_uri (GtkAction* action, else if (!new_uri) new_uri = g_strdup (location_entry_search); g_free (location_entry_search); - _midori_browser_open_uri (browser, new_uri); + if (new_tab) + { + n = midori_browser_add_uri (browser, new_uri); + midori_browser_set_current_page (browser, n); + } + else + _midori_browser_open_uri (browser, new_uri); g_free (new_uri); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 503740b8..6a45992e 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -76,6 +76,42 @@ static void midori_location_action_disconnect_proxy (GtkAction* action, GtkWidget* proxy); +static void +midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void(*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, + const gchar* arg_1, + gboolean arg_2, + gpointer data2); + register GMarshalFunc_VOID__STRING_BOOLEAN callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data + ? marshal_data : cc->callback); + callback (data1, + g_value_get_string (param_values + 1), + g_value_get_boolean (param_values + 2), + data2); +} + static void midori_location_action_class_init (MidoriLocationActionClass* class) { @@ -126,9 +162,10 @@ midori_location_action_class_init (MidoriLocationActionClass* class) 0, 0, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); + midori_cclosure_marshal_VOID__STRING_BOOLEAN, + G_TYPE_NONE, 2, + G_TYPE_STRING, + G_TYPE_BOOLEAN); gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_location_action_finalize; @@ -285,7 +322,8 @@ midori_location_action_key_press_event_cb (GtkWidget* widget, { if ((uri = gtk_entry_get_text (GTK_ENTRY (widget)))) { - g_signal_emit (action, signals[SUBMIT_URI], 0, uri); + g_signal_emit (action, signals[SUBMIT_URI], 0, uri, + (event->state & GDK_MOD1_MASK) ? TRUE : FALSE); return TRUE; } } From 8b8aa3b5507f304739c61f3f3dcbeb66a7fbf204 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 10:41:21 +0200 Subject: [PATCH 0301/2970] Don't rely on GTK_ENTRY_CLASS (entry)->get_text_area_size --- midori/midori-locationentry.c | 74 ++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 70466eaf..432a6bed 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -151,6 +151,78 @@ _gtk_entry_effective_inner_border (GtkEntry *entry, *border = default_inner_border; } +void +gtk_entry_borders (GtkEntry* entry, + gint* xborder, + gint* yborder, + gboolean* interior_focus, + gint* focus_width) +{ + GtkWidget *widget = GTK_WIDGET (entry); + + if (entry->has_frame) + { + *xborder = widget->style->xthickness; + *yborder = widget->style->ythickness; + } + else + { + *xborder = 0; + *yborder = 0; + } + + gtk_widget_style_get (widget, "interior-focus", interior_focus, + "focus-line-width", focus_width, NULL); + + if (interior_focus) + { + *xborder += *focus_width; + *yborder += *focus_width; + } +} + +/* GTK+/ GtkEntry internal helper function + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Modified by the GTK+ Team and others 1997-2000 + Copied from Gtk+ 2.13, whitespace adjusted */ +static void +gtk_entry_get_text_area_size (GtkEntry *entry, + gint *x, + gint *y, + gint *width, + gint *height) +{ + gint frame_height; + gint xborder, yborder; + gboolean interior_focus; + gint focus_width; + GtkRequisition requisition; + GtkWidget *widget = GTK_WIDGET (entry); + + gtk_widget_get_child_requisition (widget, &requisition); + gtk_entry_borders (entry, &xborder, &yborder, &interior_focus, &focus_width); + + if (GTK_WIDGET_REALIZED (widget)) + gdk_drawable_get_size (widget->window, NULL, &frame_height); + else + frame_height = requisition.height; + + if (GTK_WIDGET_HAS_FOCUS (widget) && interior_focus) + frame_height -= 2 * focus_width; + + if (x) + *x = xborder; + + if (y) + *y = frame_height / 2 - (requisition.height - yborder * 2) / 2; + + if (width) + *width = GTK_WIDGET (entry)->allocation.width - xborder * 2; + + if (height) + *height = requisition.height - yborder * 2; +} + /* GTK+/ GtkEntry internal helper function Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald Modified by the GTK+ Team and others 1997-2000 @@ -169,7 +241,7 @@ get_layout_position (GtkEntry *entry, layout = gtk_entry_get_layout (entry); - GTK_ENTRY_CLASS (G_OBJECT_GET_CLASS (entry))->get_text_area_size (entry, NULL, NULL, &area_width, &area_height); + gtk_entry_get_text_area_size (entry, NULL, NULL, &area_width, &area_height); _gtk_entry_effective_inner_border (entry, &inner_border); area_height = PANGO_SCALE * (area_height - inner_border.top - inner_border.bottom); From dd87bbefd9821389ec45e92609dee46a5dacb47f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 11:34:42 +0200 Subject: [PATCH 0302/2970] Update German, Spanish and French translations --- po/de.po | 836 +++++++++++++++++++++++++++++------------------------ po/es.po | 854 +++++++++++++++++++++++++++++++------------------------ po/fr.po | 757 +++++++++++++++++++++++++++--------------------- 3 files changed, 1384 insertions(+), 1063 deletions(-) diff --git a/po/de.po b/po/de.po index d17d98bf..f8926a1d 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-19 16:00+0200\n" -"PO-Revision-Date: 2008-03-20 13:21+0100\n" +"POT-Creation-Date: 2008-08-26 00:20+0200\n" +"PO-Revision-Date: 2008-08-18 22:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,7 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Kleiner Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:354 +#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 +#: ../midori/main.c:419 ../midori/main.c:433 msgid "Midori" msgstr "Midori" @@ -29,668 +30,723 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:45 -msgid "Bookmark" -msgstr "Lesezeichen" +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "_Lesezeichen" -#: ../midori/main.c:46 +#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +msgid "_Bookmarks" +msgstr "_Lesezeichen" + +#: ../midori/main.c:54 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:47 -msgid "_Form Fill" -msgstr "_Formulare ausfüllen" +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Konsole" -#: ../midori/main.c:48 +#: ../midori/main.c:56 +msgid "_Extensions" +msgstr "_Erweiterungen" + +#: ../midori/main.c:57 +msgid "_History" +msgstr "_Verlauf" + +#: ../midori/main.c:58 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:49 +#: ../midori/main.c:59 +msgid "_Pageholder" +msgstr "_Seitenhalter" + +#: ../midori/main.c:60 +msgid "_Userscripts" +msgstr "_Benutzerskripte" + +#: ../midori/main.c:61 +msgid "User_styles" +msgstr "Benutzer_stile" + +#: ../midori/main.c:62 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:50 +#: ../midori/main.c:63 +msgid "_Transfers" +msgstr "Über_tragungen" + +#: ../midori/main.c:64 +msgid "_Closed Tabs and Windows" +msgstr "_Geschlossene Reiter und Fenster" + +#: ../midori/main.c:65 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:52 +#: ../midori/main.c:67 msgid "Select _All" msgstr "A_lles markieren" -#: ../midori/main.c:55 +#: ../midori/main.c:70 msgid "_Fullscreen" msgstr "_Vollbild" -#: ../midori/main.c:56 +#: ../midori/main.c:71 msgid "_Leave Fullscreen" msgstr "Vollbild _verlassen" -#: ../midori/main.c:110 +#: ../midori/main.c:122 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" -#: ../midori/main.c:165 +#: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert '%s' ist ungültig für %s" -#: ../midori/main.c:172 ../midori/main.c:241 +#: ../midori/main.c:184 ../midori/main.c:253 #, c-format msgid "Unhandled settings value '%s'" msgstr "Unbehandelter Einstellungswert '%s'" -#: ../midori/main.c:346 -msgid "Display program version" -msgstr "Programmversion anzeigen" - -#: ../midori/main.c:359 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:363 -msgid "Unknown argument." -msgstr "Unbekanntes Argument." - -#: ../midori/main.c:365 -msgid "Failed to setup interface." -msgstr "Oberfläche konnte nicht eingerichtet werden." - -#: ../midori/main.c:380 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" - -#: ../midori/main.c:382 -msgid "Check for new versions at:" -msgstr "Informieren Sie sich über neue Versionen unter:" - -#: ../midori/main.c:430 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" - -#: ../midori/main.c:444 -#, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "Die Sitzung konnte nicht geladen werden. %s\n" - -#: ../midori/main.c:456 -#, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" - -#: ../midori/main.c:468 -msgid "The following errors occured:" -msgstr "Folgende Fehler sind aufgetreten:" - -#: ../midori/main.c:606 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" - -#: ../midori/main.c:616 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Die Lesezeichen konnten nicht geladen werden. %s" - -#: ../midori/main.c:625 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Der Papierkorb konnte nicht geladen werden. %s" - -#: ../midori/main.c:637 +#: ../midori/main.c:368 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:646 +#: ../midori/main.c:396 +msgid "Display program version" +msgstr "Programmversion anzeigen" + +#: ../midori/main.c:413 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:417 +msgid "Unknown argument." +msgstr "Unbekanntes Argument." + +#: ../midori/main.c:419 +msgid "Failed to setup interface." +msgstr "Oberfläche konnte nicht eingerichtet werden." + +#: ../midori/main.c:434 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" + +#: ../midori/main.c:436 +msgid "Check for new versions at:" +msgstr "Informieren Sie sich über neue Versionen unter:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:467 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:501 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" + +#: ../midori/main.c:515 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Die Sitzung konnte nicht geladen werden. %s\n" + +#: ../midori/main.c:527 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" + +#: ../midori/main.c:539 +msgid "The following errors occured:" +msgstr "Folgende Fehler sind aufgetreten:" + +#: ../midori/main.c:688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" + +#: ../midori/main.c:698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Die Lesezeichen konnten nicht geladen werden. %s" + +#: ../midori/main.c:707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Der Papierkorb konnte nicht geladen werden. %s" + +#: ../midori/main.c:715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 msgid "Settings" msgstr "Einstellungen" -#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 msgid "The associated settings" msgstr "Die zugewiesenen Einstellungen" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 msgid "Trash" msgstr "Papierkorb" -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 msgid "The trash, collecting recently closed tabs and windows" msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" -#: ../midori/midori-app.c:132 +#: ../midori/midori-app.c:141 msgid "Browser" msgstr "Navigator" -#: ../midori/midori-app.c:133 +#: ../midori/midori-app.c:142 msgid "The current browser" msgstr "Der aktuelle Navigator" -#: ../midori/midori-app.c:141 +#: ../midori/midori-app.c:150 msgid "Browser Count" msgstr "Anzahl Navigatoren" -#: ../midori/midori-app.c:142 +#: ../midori/midori-app.c:151 msgid "The current number of browsers" msgstr "Die maximale Anzahl an Navigatoren" -#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 -#: ../midori/midori-searchentry.c:66 +#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-searchentry.c:65 msgid "Search Engines" msgstr "Suchmaschinen" -#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 msgid "The list of search engines" msgstr "Die Liste der Suchmaschine" -#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Keine" + +#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 msgid "Extensions" msgstr "Erweiterungen" -#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../midori/midori-addons.c:42 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 msgid "Userstyles" msgstr "Benutzerstile" +#: ../midori/midori-addons.c:113 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:114 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:122 +msgid "Kind" +msgstr "" + +#: ../midori/midori-addons.c:123 +msgid "The kind of addons" +msgstr "" + #: ../midori/midori-browser.c:192 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2782 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:349 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:597 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 +#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 msgid "_Description:" msgstr "_Beschreibung" -#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 +#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:633 +#: ../midori/midori-browser.c:646 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:650 msgid "Root" msgstr "Wurzel" -#: ../midori/midori-browser.c:1064 +#: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion '%s'." -#: ../midori/midori-browser.c:1283 +#: ../midori/midori-browser.c:1228 msgid "Menubar" msgstr "Menüleiste" -#: ../midori/midori-browser.c:1284 +#: ../midori/midori-browser.c:1229 msgid "The menubar" msgstr "Die Menüleiste" -#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1238 msgid "The navigationbar" msgstr "Die Navigationsleiste" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-browser.c:1247 +msgid "The current URI" +msgstr "Die aktuelle URI" + +#: ../midori/midori-browser.c:1255 msgid "Tab" msgstr "Reiter" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1256 msgid "The current tab" msgstr "Der aktuelle Reiter" -#: ../midori/midori-browser.c:1310 +#: ../midori/midori-browser.c:1264 msgid "Statusbar" msgstr "Statusleiste" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1265 msgid "The statusbar" msgstr "Die Statusleiste" -#: ../midori/midori-browser.c:1347 +#: ../midori/midori-browser.c:1301 msgid "Statusbar Text" msgstr "Statusleistenbeschriftung" -#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 msgid "The text that is displayed in the statusbar" msgstr "Der Text, der in der Statusleiste angezeigt wird" -#: ../midori/midori-browser.c:1381 +#: ../midori/midori-browser.c:1335 msgid "The list of search engines to be used for web search" msgstr "Die Liste der Suchmaschinen, die für die Netzsuche genutzt werden" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2313 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2483 +#: ../midori/midori-browser.c:2478 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2491 +#: ../midori/midori-browser.c:2486 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2709 +#: ../midori/midori-browser.c:2699 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2702 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2705 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2708 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:2721 +#: ../midori/midori-browser.c:2711 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:2723 +#: ../midori/midori-browser.c:2713 msgid "_Close Tab" msgstr "Reiter sch_ließen" -#: ../midori/midori-browser.c:2724 +#: ../midori/midori-browser.c:2714 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:2716 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2717 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2719 msgid "Pa_ge Setup" msgstr "Seite _einrichten" -#: ../midori/midori-browser.c:2733 +#: ../midori/midori-browser.c:2723 msgid "Show a preview of the printed page" msgstr "Eine Vorschau auf die gedruckte Seite anzeigen" -#: ../midori/midori-browser.c:2736 +#: ../midori/midori-browser.c:2726 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:2739 +#: ../midori/midori-browser.c:2729 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:2741 +#: ../midori/midori-browser.c:2731 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:2734 msgid "Undo the last modification" msgstr "Die letzte Änderung wiederrufen" -#: ../midori/midori-browser.c:2747 +#: ../midori/midori-browser.c:2737 msgid "Redo the last modification" msgstr "Die letzte Änderung wiederholen" -#: ../midori/midori-browser.c:2750 +#: ../midori/midori-browser.c:2740 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2749 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2752 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:2765 +#: ../midori/midori-browser.c:2755 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:2768 +#: ../midori/midori-browser.c:2758 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2760 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2761 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2763 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:2774 +#: ../midori/midori-browser.c:2764 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2766 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:2777 +#: ../midori/midori-browser.c:2767 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:2780 +#: ../midori/midori-browser.c:2770 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:2772 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:2783 +#: ../midori/midori-browser.c:2773 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:2785 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2798 +#: ../midori/midori-browser.c:2788 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2801 +#: ../midori/midori-browser.c:2791 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:2793 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:2804 +#: ../midori/midori-browser.c:2794 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2796 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2797 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:2810 +#: ../midori/midori-browser.c:2800 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:2812 +#: ../midori/midori-browser.c:2802 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:2815 +#: ../midori/midori-browser.c:2805 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:2808 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2811 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:2823 -msgid "Location..." -msgstr "Ort..." +#: ../midori/midori-browser.c:2813 +msgid "_Web Search..." +msgstr "_Netzsuche..." -#: ../midori/midori-browser.c:2824 -msgid "Open a particular location" -msgstr "Öffne einen bestimmten Ort" - -#: ../midori/midori-browser.c:2826 -msgid "Web Search..." -msgstr "Netzsuche..." - -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2814 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:2829 +#: ../midori/midori-browser.c:2816 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen..." -#: ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:2817 msgid "Open the current page in the pageholder" msgstr "Die aktuelle Seite im Seitenhalter öffnen" -#: ../midori/midori-browser.c:2832 -msgid "Closed Tabs and Windows" -msgstr "Geschlossene Reiter und Fenster" - -#: ../midori/midori-browser.c:2833 +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2821 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:2823 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:2836 +#: ../midori/midori-browser.c:2824 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:2826 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:2839 +#: ../midori/midori-browser.c:2827 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:2841 -msgid "_Bookmarks" -msgstr "_Lesezeichen" - -#: ../midori/midori-browser.c:2844 +#: ../midori/midori-browser.c:2832 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2846 +#: ../midori/midori-browser.c:2834 msgid "_Manage Bookmarks" msgstr "Lesezeichen _verwalten" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2835 msgid "Add, edit and remove bookmarks..." msgstr "Lesezeichen hinzufügen, bearbeiten und löschen..." -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:2838 msgid "Open the selected bookmark" msgstr "Markiertes Lesezeichen kopieren" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2840 msgid "Open in New _Tab" msgstr "In einem neuen _Reiter öffnen" -#: ../midori/midori-browser.c:2853 +#: ../midori/midori-browser.c:2841 msgid "Open the selected bookmark in a new tab" msgstr "Öffne das markierte Lesezeichen in einem neuen Reiter" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:2843 msgid "Open in New _Window" msgstr "In einem neuen _Fenster öffnen" -#: ../midori/midori-browser.c:2856 +#: ../midori/midori-browser.c:2844 msgid "Open the selected bookmark in a new window" msgstr "Markiertes Lesezeichen in neuem Fenster öffnen" -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2847 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2850 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:2852 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 +#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:2867 +#: ../midori/midori-browser.c:2855 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." -#: ../midori/midori-browser.c:2870 +#: ../midori/midori-browser.c:2858 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:2860 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:2861 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:2863 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:2864 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:2878 +#: ../midori/midori-browser.c:2866 msgid "Tab _Overview" msgstr "Reiterüber_sicht" -#: ../midori/midori-browser.c:2879 +#: ../midori/midori-browser.c:2867 msgid "Show an overview of all open tabs" msgstr "Zeige eine Übersicht über alle offenen Reiter" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2869 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:2871 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2872 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:2875 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:2881 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:2882 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:2885 msgid "_Work Offline" msgstr "_Ohne Verbindung arbeiten" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2886 msgid "Work without a network connection" msgstr "Ohne Netzwerkverbindung arbeiten" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:2890 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:2891 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2894 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:2895 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:2910 +#: ../midori/midori-browser.c:2898 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:2899 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:2914 +#: ../midori/midori-browser.c:2902 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:2903 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:2918 +#: ../midori/midori-browser.c:2906 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:2907 msgid "Show statusbar" msgstr "Statusleiste anzeigen" +#: ../midori/midori-browser.c:3228 +msgid "_Location..." +msgstr "_Ort..." + +#: ../midori/midori-browser.c:3230 +msgid "Open a particular location" +msgstr "Öffne einen bestimmten Ort" + #: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Lesezeichen" @@ -704,7 +760,7 @@ msgstr "Übertragungen" msgid "Console" msgstr "Konsole" -#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 +#: ../midori/midori-browser.c:3476 msgid "History" msgstr "Verlauf" @@ -712,31 +768,43 @@ msgstr "Verlauf" msgid "Pageholder" msgstr "Seitenhalter" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3534 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3569 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3570 +#: ../midori/midori-browser.c:3586 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:3807 +#: ../midori/midori-browser.c:3817 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung '%s'" +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "Art des Schattens" + #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Erscheinungsbild des Schattens um jede Leiste" +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Menü" + #: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menü für Leistenelemente" +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "Seite" + #: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Der Index der aktiven Seite" @@ -745,15 +813,11 @@ msgstr "Der Index der aktiven Seite" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:392 -msgid "Untitled" -msgstr "Unbenannt" - #: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 msgid "Homepage" msgstr "Startseite" @@ -805,7 +869,7 @@ msgstr "Standard" msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 msgid "Text" msgstr "Text" @@ -825,10 +889,6 @@ msgstr "Alle Kekse" msgid "Session cookies" msgstr "Sitzungskekse" -#: ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Keine" - #: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" @@ -926,129 +986,129 @@ msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" #: ../midori/midori-websettings.c:354 -msgid "Small toolbar" -msgstr "Kleine Werkzeugleiste" - -#: ../midori/midori-websettings.c:355 -msgid "Use small toolbar icons" -msgstr "Kleine Symbole benutzen" - -#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Zeige Neuer Reiter" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:363 msgid "Show Homepage" msgstr "Zeige Startseite" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:364 msgid "Show the Homepage button in the toolbar" msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:372 msgid "Show Web search" msgstr "Zeige Netzsuche" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" msgstr "Netzsuchfeld in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:381 msgid "Show Trash" msgstr "Zeige Papierkorb" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" msgstr "Papierkorb-Knopf in der Werkzeugleiste anzeigen" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:392 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:393 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:420 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:421 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:430 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:450 msgid "Tab Label Size" msgstr "Reitergröße" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:451 msgid "The desired tab label size" msgstr "Die gewünschte Größe der Reiterbeschriftung" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:468 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:469 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:487 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "Reiter neben aktuellem öffnen" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" + #: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" @@ -1129,23 +1189,43 @@ msgstr "Zwischenspeichergröße" msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-webview.c:193 +#: ../midori/midori-webview.c:64 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-webview.c:65 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-webview.c:66 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" msgstr "Die URI der aktuellen Seite" -#: ../midori/midori-webview.c:202 +#: ../midori/midori-webview.c:234 msgid "The title of the currently loaded page" msgstr "Der Titel der aktuellen Seite" -#: ../midori/midori-webview.c:578 +#: ../midori/midori-webview.c:244 +msgid "The current loading progress" +msgstr "Der aktuelle Ladefortschritt" + +#: ../midori/midori-webview.c:253 +msgid "The current loading status" +msgstr "Der aktuelle Ladezustand" + +#: ../midori/midori-webview.c:695 msgid "Open Link in New _Tab" msgstr "Verweis in einem neuen _Reiter öffnen" -#: ../midori/midori-webview.c:606 +#: ../midori/midori-webview.c:723 msgid "Download Link with Download _Manager" msgstr "Verweis mit Übertragungs_manager herunterladen" -#: ../midori/midori-webview.c:624 +#: ../midori/midori-webview.c:741 msgid "Open URL in New _Tab" msgstr "URL in einem neuen _Reiter öffnen" @@ -1195,108 +1275,55 @@ msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../midori/midori-preferences.c:420 -msgid "Privacy" -msgstr "Privatsphäre" - -#: ../midori/midori-preferences.c:421 -msgid "Web Cookies" -msgstr "Verbindungskekse" - -#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 -msgid "days" -msgstr "Tage" - -#: ../midori/midori-webitem.c:70 -msgid "Name" -msgstr "Name" - -#: ../midori/midori-webitem.c:71 -msgid "The name of the web item" -msgstr "Der Index des aktiven Elements" - -#: ../midori/midori-webitem.c:79 -msgid "Description" -msgstr "Beschreibung" - -#: ../midori/midori-webitem.c:80 -msgid "The description of the web item" -msgstr "Die Beschreibung des Netzelementes" - -#: ../midori/midori-webitem.c:88 -msgid "URI" -msgstr "URI" - -#: ../midori/midori-webitem.c:89 -msgid "The URI of the web item" -msgstr "Die URI des aktuellen Elements" - -#: ../midori/midori-webitem.c:97 -msgid "Icon" -msgstr "Symbol" - -#: ../midori/midori-webitem.c:98 -msgid "The icon of the web item" -msgstr "Der Index des aktiven Elements" - -#: ../midori/midori-webitem.c:106 -msgid "Token" -msgstr "Kürzel" - -#: ../midori/midori-webitem.c:107 -msgid "The token of the web item" -msgstr "Das Kürzel des Netzelements" - -#: ../midori/midori-searchentry.c:75 +#: ../midori/midori-searchentry.c:74 msgid "Current Item" msgstr "Aktuelles Element" -#: ../midori/midori-searchentry.c:76 +#: ../midori/midori-searchentry.c:75 msgid "The currently selected item" msgstr "Das aktuell ausgewählte Element" -#: ../midori/midori-searchentry.c:84 +#: ../midori/midori-searchentry.c:83 msgid "Dialog" msgstr "Dialog" -#: ../midori/midori-searchentry.c:85 +#: ../midori/midori-searchentry.c:84 msgid "A dialog to manage search engines" msgstr "Ein Dialog zum verwalten von Suchmaschinen" -#: ../midori/midori-searchentry.c:152 +#: ../midori/midori-searchentry.c:151 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchentry.c:550 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchentry.c:594 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchentry.c:608 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchentry.c:789 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" @@ -1313,55 +1340,102 @@ msgstr "Warnung: Sie benutzen ein Administratorkonto!" msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/gjs.c:89 +#: ../midori/gjs.c:512 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" msgstr "%s hat keine Eigenschaft '%s'" -#: ../midori/gjs.c:445 +#: ../midori/gjs.c:875 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s kann %s.%s nicht zugewiesen werden" -#: ../midori/gjs.c:455 +#: ../midori/gjs.c:885 #, c-format msgid "%s.%s cannot be accessed" msgstr "Auf %s.%s kann nicht zugegriffen werden" -#: ../katze/katze-throbber.c:134 +#: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "Symbolgröße" + +#: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" msgstr "Größenkonstante für die Animation" -#: ../katze/katze-throbber.c:143 +#: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "Symbolname" + +#: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" msgstr "Der Name eines Symbols, welches Animationsbilder enthält" -#: ../katze/katze-throbber.c:152 +#: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "Pixbuf" + +#: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" msgstr "Ein GdkPixbuf, welcher Animationsbilder enthält" -#: ../katze/katze-throbber.c:161 +#: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "Animiert" + +#: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" msgstr "Ob das Aktivitätssymbol animiert sein soll" -#: ../katze/katze-throbber.c:170 +#: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "Statischer Symbolname" + +#: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" msgstr "Der Name eines Symbols, das als statisches Bild verwendet werden soll" -#: ../katze/katze-throbber.c:179 +#: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" msgstr "Ein GdkPixbuf, welcher als statisches Bild verwendet werden soll" -#: ../katze/katze-throbber.c:188 +#: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "Statische Bestandskennung" + +#: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" msgstr "" -"Die Inventarkennung eines Symbols, das als statisches Bild verwendet werden " +"Die Bestandskennung eines Symbols, das als statisches Bild verwendet werden " "soll" +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Das benannte Symbol '%s' konnte nicht geladen werden" + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Das Bestandssymbol '%s' konnte nicht geladen werden" + +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "Das Symbol '%s' konnte nicht geladen werden" + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "Animationsbilder sind fehlerhaft" + #: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" @@ -1375,6 +1449,38 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "Name" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "Der Index des Elements" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "Der beschreibende Text des Elementes" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "Die URI des Elements" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "Symbol" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "Das Symbol des Elements" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "Kürzel" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "Das Kürzel des Elements" + #: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 #: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 #: ../katze/katze-xbel.c:789 diff --git a/po/es.po b/po/es.po index cb60581e..819df5f7 100644 --- a/po/es.po +++ b/po/es.po @@ -2,14 +2,15 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Miguel Anxo Bouzada 2008 +# Antonio Sanchez 2008 # Christian Dywan 2008 # msgid "" msgstr "" -"Project-Id-Version: midori-0.0.18\n" +"Project-Id-Version: midori-0.0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-19 16:00+0200\n" -"PO-Revision-Date: 2008-07-14 22:07+0100\n" +"POT-Creation-Date: 2008-08-26 00:20+0200\n" +"PO-Revision-Date: 2008-08-18 22:07+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" @@ -20,7 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../midori.desktop.in.h:2 ../midori/main.c:354 +#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 +#: ../midori/main.c:419 ../midori/main.c:433 msgid "Midori" msgstr "Midori" @@ -28,668 +30,724 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:45 -msgid "Bookmark" -msgstr "Marcador" +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "_Marcador" -#: ../midori/main.c:46 +#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/main.c:54 msgid "_Add Bookmark" msgstr "_Añadir Marcador" -#: ../midori/main.c:47 -msgid "_Form Fill" -msgstr "Rellenar _formulario" +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Consola" -#: ../midori/main.c:48 +#: ../midori/main.c:56 +msgid "_Extensions" +msgstr "_Extensiones" + +#: ../midori/main.c:57 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/main.c:58 msgid "_Homepage" msgstr "Página de _inicio" -#: ../midori/main.c:49 +#: ../midori/main.c:59 +msgid "_Pageholder" +msgstr "Cu_adro de páginas" + +#: ../midori/main.c:60 +msgid "_Userscripts" +msgstr "_Scripts de usuario" + +#: ../midori/main.c:61 +msgid "User_styles" +msgstr "Estilos de _usuario" + +#: ../midori/main.c:62 msgid "New _Tab" msgstr "Nueva pes_taña" -#: ../midori/main.c:50 +#: ../midori/main.c:63 +msgid "_Transfers" +msgstr "_Transferencias" + +#: ../midori/main.c:64 +msgid "_Closed Tabs and Windows" +msgstr "Ventanas y pestañas _cerradas" + +#: ../midori/main.c:65 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/main.c:52 +#: ../midori/main.c:67 msgid "Select _All" msgstr "Seleccion_ar todo" -#: ../midori/main.c:55 +#: ../midori/main.c:70 msgid "_Fullscreen" msgstr "_Pantalla completa" -#: ../midori/main.c:56 +#: ../midori/main.c:71 msgid "_Leave Fullscreen" msgstr "_Salir de pantalla completa" -#: ../midori/main.c:110 +#: ../midori/main.c:122 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "No se pudo cargar la configuración. %s\n" -#: ../midori/main.c:165 +#: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:172 ../midori/main.c:241 +#: ../midori/main.c:184 ../midori/main.c:253 #, c-format msgid "Unhandled settings value '%s'" msgstr "" -#: ../midori/main.c:346 -msgid "Display program version" -msgstr "Mostrar la versión del programa" - -#: ../midori/main.c:359 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:363 -msgid "Unknown argument." -msgstr "" - -#: ../midori/main.c:365 -msgid "Failed to setup interface." -msgstr "" - -#: ../midori/main.c:380 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" - -#: ../midori/main.c:382 -msgid "Check for new versions at:" -msgstr "Comprobar si existen nuevas versiones en:" - -#: ../midori/main.c:430 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Los marcadores no pudieron ser cargados. %s\n" - -#: ../midori/main.c:444 -#, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "No se pudo cargar la sesión. %s\n" - -#: ../midori/main.c:456 -#, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "No se pudo cargar la papelera. %s\n" - -#: ../midori/main.c:468 -msgid "The following errors occured:" -msgstr "Se produjeron los siguientes errores:" - -#: ../midori/main.c:606 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "No se pudo guardar el motor de busqueda. %s" - -#: ../midori/main.c:616 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "No se pudieron guardar los marcadores. %s" - -#: ../midori/main.c:625 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "No se pudo guardar la papelera. %s" - -#: ../midori/main.c:637 +#: ../midori/main.c:368 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:646 +#: ../midori/main.c:396 +msgid "Display program version" +msgstr "Mostrar la versión del programa" + +#: ../midori/main.c:413 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:417 +msgid "Unknown argument." +msgstr "Argumento desconocido" + +#: ../midori/main.c:419 +msgid "Failed to setup interface." +msgstr "Falló la configuración de la interfaz" + +#: ../midori/main.c:434 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" + +#: ../midori/main.c:436 +msgid "Check for new versions at:" +msgstr "Comprobar si existen nuevas versiones en:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:467 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:501 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Los marcadores no pudieron ser cargados. %s\n" + +#: ../midori/main.c:515 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "No se pudo cargar la sesión. %s\n" + +#: ../midori/main.c:527 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "No se pudo cargar la papelera. %s\n" + +#: ../midori/main.c:539 +msgid "The following errors occured:" +msgstr "Se produjeron los siguientes errores:" + +#: ../midori/main.c:688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "No se pudo guardar el motor de busqueda. %s" + +#: ../midori/main.c:698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "No se pudieron guardar los marcadores. %s" + +#: ../midori/main.c:707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "No se pudo guardar la papelera. %s" + +#: ../midori/main.c:715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 msgid "Settings" msgstr "Configuración" -#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 msgid "The associated settings" msgstr "Ajustes asociados" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 msgid "Trash" msgstr "Papelera" -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 msgid "The trash, collecting recently closed tabs and windows" msgstr "Papelera, recogido recientemente cerrando pestañas y ventanas" -#: ../midori/midori-app.c:132 +#: ../midori/midori-app.c:141 msgid "Browser" msgstr "Navegador" -#: ../midori/midori-app.c:133 +#: ../midori/midori-app.c:142 msgid "The current browser" msgstr "El navegador actual" -#: ../midori/midori-app.c:141 +#: ../midori/midori-app.c:150 msgid "Browser Count" msgstr "Número de navegadores" -#: ../midori/midori-app.c:142 +#: ../midori/midori-app.c:151 msgid "The current number of browsers" msgstr "Número de navegadores actual de elementos" -#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 -#: ../midori/midori-searchentry.c:66 +#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-searchentry.c:65 msgid "Search Engines" msgstr "Motores de busqueda" -#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 msgid "The list of search engines" msgstr "La lista de motores de busqueda" -#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Ninguna" + +#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 msgid "Extensions" msgstr "Extensiones" -#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../midori/midori-addons.c:42 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 msgid "Userstyles" msgstr "Estilos de usuario" +#: ../midori/midori-addons.c:113 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:114 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:122 +msgid "Kind" +msgstr "" + +#: ../midori/midori-addons.c:123 +msgid "The kind of addons" +msgstr "" + #: ../midori/midori-browser.c:192 msgid "Source" msgstr "Código fuente" -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2782 msgid "Reload the current page" msgstr "Cargar nuevamente la página actual" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 msgid "Stop loading the current page" msgstr "Detener la carga de la página" -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:349 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:597 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 +#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 msgid "_Description:" msgstr "_Descripción" -#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 +#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:633 +#: ../midori/midori-browser.c:646 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:650 msgid "Root" msgstr "Raíz" -#: ../midori/midori-browser.c:1064 +#: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." msgstr "Acción no esperada «%s»" -#: ../midori/midori-browser.c:1283 +#: ../midori/midori-browser.c:1228 msgid "Menubar" msgstr "Barra del menú" -#: ../midori/midori-browser.c:1284 +#: ../midori/midori-browser.c:1229 msgid "The menubar" msgstr "Barra del menu" -#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1238 msgid "The navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-browser.c:1247 +msgid "The current URI" +msgstr "URI actual" + +#: ../midori/midori-browser.c:1255 msgid "Tab" msgstr "Pestaña" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1256 msgid "The current tab" msgstr "Pestaña actual" -#: ../midori/midori-browser.c:1310 +#: ../midori/midori-browser.c:1264 msgid "Statusbar" msgstr "Barra de estado" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1265 msgid "The statusbar" msgstr "Barra de estado" -#: ../midori/midori-browser.c:1347 +#: ../midori/midori-browser.c:1301 msgid "Statusbar Text" msgstr "Texto de la barra de estado" -#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 msgid "The text that is displayed in the statusbar" msgstr "El texto se muestra en la barra de estado" -#: ../midori/midori-browser.c:1381 +#: ../midori/midori-browser.c:1335 msgid "The list of search engines to be used for web search" msgstr "" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2313 msgid "Separator" msgstr "Separador" -#: ../midori/midori-browser.c:2483 +#: ../midori/midori-browser.c:2478 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:2491 +#: ../midori/midori-browser.c:2486 msgid "translator-credits" msgstr "" -"Miguel Anxo Bouzada\n" -"Antonio Sanchez" +"Miguel Anxo Bouzada \n" +"Antonio Sanchez \n" +"Christian Dywan " -#: ../midori/midori-browser.c:2709 +#: ../midori/midori-browser.c:2699 msgid "_File" msgstr "_Fichero" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2702 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2705 msgid "Open a new tab" msgstr "Abrir unha nueva pestaña" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2708 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:2721 +#: ../midori/midori-browser.c:2711 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:2723 +#: ../midori/midori-browser.c:2713 msgid "_Close Tab" msgstr "Cerrar _pestaña" -#: ../midori/midori-browser.c:2724 +#: ../midori/midori-browser.c:2714 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:2716 msgid "C_lose Window" msgstr "_Cerrar la ventana" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2717 msgid "Close this window" msgstr "Cerrar esta ventana" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2719 msgid "Pa_ge Setup" msgstr "Configuración de la página" -#: ../midori/midori-browser.c:2733 +#: ../midori/midori-browser.c:2723 msgid "Show a preview of the printed page" msgstr "Mostrar una vista de la página imprimido" -#: ../midori/midori-browser.c:2736 +#: ../midori/midori-browser.c:2726 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:2739 +#: ../midori/midori-browser.c:2729 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:2741 +#: ../midori/midori-browser.c:2731 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:2734 msgid "Undo the last modification" msgstr "Deshacer la última modificación" -#: ../midori/midori-browser.c:2747 +#: ../midori/midori-browser.c:2737 msgid "Redo the last modification" msgstr "Rehacer la última modificación" -#: ../midori/midori-browser.c:2750 +#: ../midori/midori-browser.c:2740 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2749 msgid "Paste text from the clipboard" msgstr "Pegar el texto seleccionado al portapapeles" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2752 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:2765 +#: ../midori/midori-browser.c:2755 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:2768 +#: ../midori/midori-browser.c:2758 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2760 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2761 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2763 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:2774 +#: ../midori/midori-browser.c:2764 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2766 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:2777 +#: ../midori/midori-browser.c:2767 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2780 +#: ../midori/midori-browser.c:2770 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:2772 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:2783 +#: ../midori/midori-browser.c:2773 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:2785 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:2798 +#: ../midori/midori-browser.c:2788 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:2801 +#: ../midori/midori-browser.c:2791 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:2793 msgid "View _Source" msgstr "Mostrar _código fuente" -#: ../midori/midori-browser.c:2804 +#: ../midori/midori-browser.c:2794 msgid "View the source code of the page" msgstr "Mostrar el código fuente de la página" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2796 msgid "View Selection Source" msgstr "Mostrar código fuente de la seleccionada" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2797 msgid "View the source code of the selection" msgstr "Mostrar el código fuente de la seleccionada" -#: ../midori/midori-browser.c:2810 +#: ../midori/midori-browser.c:2800 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:2812 +#: ../midori/midori-browser.c:2802 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:2815 +#: ../midori/midori-browser.c:2805 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:2808 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2811 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2823 -msgid "Location..." -msgstr "Ubicación..." +#: ../midori/midori-browser.c:2813 +msgid "_Web Search..." +msgstr "Buscar en la _red..." -#: ../midori/midori-browser.c:2824 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:2826 -msgid "Web Search..." -msgstr "Buscar en la red..." - -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2814 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:2829 +#: ../midori/midori-browser.c:2816 msgid "Open in Page_holder..." msgstr "Abrir en el cuadro de páginas..." -#: ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:2817 msgid "Open the current page in the pageholder" msgstr "Última la página actual en el cuadro de páginas" -#: ../midori/midori-browser.c:2832 -msgid "Closed Tabs and Windows" -msgstr "Cerrar ventanas y pestañas" - -#: ../midori/midori-browser.c:2833 +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2821 msgid "Reopen a previously closed tab or window" msgstr "Volver a abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:2823 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:2836 +#: ../midori/midori-browser.c:2824 msgid "Delete the contents of the trash" msgstr "Borrar el conenido de la papelera" -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:2826 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:2839 +#: ../midori/midori-browser.c:2827 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:2841 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/midori-browser.c:2844 +#: ../midori/midori-browser.c:2832 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:2846 +#: ../midori/midori-browser.c:2834 msgid "_Manage Bookmarks" msgstr "_Gestionar marcadores" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2835 msgid "Add, edit and remove bookmarks..." msgstr "Añadir, editar o eliminar marcadores..." -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:2838 msgid "Open the selected bookmark" msgstr "Abrir el marcador seleccionado" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2840 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2853 +#: ../midori/midori-browser.c:2841 msgid "Open the selected bookmark in a new tab" msgstr "Abrir el marcador seleccionado en una neuva pestaña" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:2843 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:2856 +#: ../midori/midori-browser.c:2844 msgid "Open the selected bookmark in a new window" msgstr "Abrir el marcador seleccionado en una neuva ventana" -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2847 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2850 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:2852 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 +#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 msgid "_Manage Search Engines" msgstr "_Gestionar los motores de busqueda" -#: ../midori/midori-browser.c:2867 +#: ../midori/midori-browser.c:2855 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar o eliminar motores de busqueda..." -#: ../midori/midori-browser.c:2870 +#: ../midori/midori-browser.c:2858 msgid "_Window" msgstr "_Ventana" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:2860 msgid "_Previous Tab" msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:2861 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:2863 msgid "_Next Tab" msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:2864 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:2878 +#: ../midori/midori-browser.c:2866 msgid "Tab _Overview" msgstr "_Visión general de pestañas" -#: ../midori/midori-browser.c:2879 +#: ../midori/midori-browser.c:2867 msgid "Show an overview of all open tabs" msgstr "Mostrar una visión general de todas las pesañas abiertas" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2869 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:2871 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2872 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:2875 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:2881 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:2882 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:2885 msgid "_Work Offline" msgstr "Trabajar desconectado" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2886 msgid "Work without a network connection" msgstr "" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:2890 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:2891 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2894 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:2895 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:2910 +#: ../midori/midori-browser.c:2898 msgid "_Bookmarkbar" msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:2899 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:2914 +#: ../midori/midori-browser.c:2902 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:2903 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:2918 +#: ../midori/midori-browser.c:2906 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:2907 msgid "Show statusbar" msgstr "Mostrar la barra de estado" +#: ../midori/midori-browser.c:3228 +msgid "_Location..." +msgstr "_Ubicación..." + +#: ../midori/midori-browser.c:3230 +msgid "Open a particular location" +msgstr "" + #: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Marcadores" @@ -703,7 +761,7 @@ msgstr "Transferencias" msgid "Console" msgstr "Consola" -#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 +#: ../midori/midori-browser.c:3476 msgid "History" msgstr "Histórico" @@ -711,31 +769,43 @@ msgstr "Histórico" msgid "Pageholder" msgstr "Cuadro de páginas" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3534 msgid "_Inline find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3569 msgid "Match Case" msgstr "Sensible a mayúsculas" -#: ../midori/midori-browser.c:3570 +#: ../midori/midori-browser.c:3586 msgid "Close Findbar" msgstr "Cerrar barra de busquedas" -#: ../midori/midori-browser.c:3807 +#: ../midori/midori-browser.c:3817 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "" + #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Aspecto de las sombras alrededor de cada panel" +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Menú" + #: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menú para contener los elementos de los paneles" +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "Pagina" + #: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Índice de la página actual" @@ -744,15 +814,11 @@ msgstr "Índice de la página actual" msgid "Close panel" msgstr "Cerrar el panel" -#: ../midori/midori-panel.c:392 -msgid "Untitled" -msgstr "Sin título" - #: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Página vacía" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 msgid "Homepage" msgstr "Página de inicio" @@ -804,7 +870,7 @@ msgstr "Predeterminada" msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 msgid "Text" msgstr "Texto" @@ -824,10 +890,6 @@ msgstr "Todas las galletas" msgid "Session cookies" msgstr "Las galletas de esta sesión" -#: ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Ninguna" - #: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Recordar último tamaño de ventana" @@ -925,129 +987,129 @@ msgid "The style of the toolbar" msgstr "El estilo de la barra de herramientas" #: ../midori/midori-websettings.c:354 -msgid "Small toolbar" -msgstr "Barra de herramientas pequeña" - -#: ../midori/midori-websettings.c:355 -msgid "Use small toolbar icons" -msgstr "Mostrar iconos pequeños en la barra de herramientas" - -#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Mostrar «Nueva pestaña»" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" msgstr "Mostrar el botón de «Nueva pestaña» en la barra de herramientas" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:363 msgid "Show Homepage" msgstr "Mostrar «Página de inicio»" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:364 msgid "Show the Homepage button in the toolbar" msgstr "Mostrar el botón de «Pagina inicial» en la barra de herramientas" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:372 msgid "Show Web search" msgstr "Mostrar «Buscador red»" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" msgstr "Mostrar la caja de busquedas en la red en la barra de herramientas" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:381 msgid "Show Trash" msgstr "Mostrar «Papelera»" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" msgstr "Mostrar el botón «Papelera» en la barra de herramientas" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:392 msgid "Load on Startup" msgstr "Cargar al inicio" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:393 msgid "What to load on startup" msgstr "Qué cargar en el inicio" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The homepage" msgstr "La página de inicio" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "La carpeta de descargas fue guardada en" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:420 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:421 msgid "An external download manager" msgstr "Un gestor de descargas externo" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:430 msgid "The search to perform inside the location entry" msgstr "Hacer una busqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:450 msgid "Tab Label Size" msgstr "Tamaño de la etiqueta de pestañas" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:451 msgid "The desired tab label size" msgstr "Tamaño deseado de la etiqueta de las pestañas" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" msgstr "Cada una de las pestañas tendrá su botón para cerrarla" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:468 msgid "Open new pages in" msgstr "Abrir las páginas nuevas en" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:469 msgid "Where to open new pages" msgstr "Donde se van a abrir las páginas nuevas" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" msgstr "Clic medio abre la selección" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "Cargar una URL en la selección empleando el botón del medio del ratón" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:487 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" msgstr "Abrir (o no) las pestañas nuevas en segundo plano" +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "Abrir pestañas a lado de la actual" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Abrir las pestañas nuevas al lado de la pestaña actual o la última" + #: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" @@ -1130,23 +1192,43 @@ msgstr "Tamaño de la caché" msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" -#: ../midori/midori-webview.c:193 +#: ../midori/midori-webview.c:64 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-webview.c:65 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-webview.c:66 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" msgstr "URI de la página actualmente cargada" -#: ../midori/midori-webview.c:202 +#: ../midori/midori-webview.c:234 msgid "The title of the currently loaded page" msgstr "Título de la página actualmente cargada" -#: ../midori/midori-webview.c:578 +#: ../midori/midori-webview.c:244 +msgid "The current loading progress" +msgstr "" + +#: ../midori/midori-webview.c:253 +msgid "The current loading status" +msgstr "" + +#: ../midori/midori-webview.c:695 msgid "Open Link in New _Tab" msgstr "Abrir el enlace en una pestaña _nueva" -#: ../midori/midori-webview.c:606 +#: ../midori/midori-webview.c:723 msgid "Download Link with Download _Manager" msgstr "Descargar el enlace con el Gestor de descargas" -#: ../midori/midori-webview.c:624 +#: ../midori/midori-webview.c:741 msgid "Open URL in New _Tab" msgstr "Abrir la URL en una pestaña _nueva" @@ -1196,114 +1278,61 @@ msgid "Browsing" msgstr "Navegación" #. Page "Network" -#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../midori/midori-preferences.c:420 -msgid "Privacy" -msgstr "Privacidad" - -#: ../midori/midori-preferences.c:421 -msgid "Web Cookies" -msgstr "Galletas de conexión" - -#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 -msgid "days" -msgstr "días" - -#: ../midori/midori-webitem.c:70 -msgid "Name" -msgstr "Nombre" - -#: ../midori/midori-webitem.c:71 -msgid "The name of the web item" -msgstr "Nombre del elemento red" - -#: ../midori/midori-webitem.c:79 -msgid "Description" -msgstr "Descripción" - -#: ../midori/midori-webitem.c:80 -msgid "The description of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:88 -msgid "URI" -msgstr "URI" - -#: ../midori/midori-webitem.c:89 -msgid "The URI of the web item" -msgstr "El URI del elemento red" - -#: ../midori/midori-webitem.c:97 -msgid "Icon" -msgstr "Icono" - -#: ../midori/midori-webitem.c:98 -msgid "The icon of the web item" -msgstr "El icono del elemento red" - -#: ../midori/midori-webitem.c:106 -msgid "Token" -msgstr "Abreviatura" - -#: ../midori/midori-webitem.c:107 -msgid "The token of the web item" -msgstr "La abreviatura del elemento red" - -#: ../midori/midori-searchentry.c:75 +#: ../midori/midori-searchentry.c:74 msgid "Current Item" msgstr "Elemento actual" -#: ../midori/midori-searchentry.c:76 +#: ../midori/midori-searchentry.c:75 msgid "The currently selected item" msgstr "El elemento actualmente seleccionado" -#: ../midori/midori-searchentry.c:84 +#: ../midori/midori-searchentry.c:83 msgid "Dialog" msgstr "Diálogo" -#: ../midori/midori-searchentry.c:85 +#: ../midori/midori-searchentry.c:84 msgid "A dialog to manage search engines" msgstr "Un diálogo a gestionar los motores de busqueda" -#: ../midori/midori-searchentry.c:152 +#: ../midori/midori-searchentry.c:151 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Add search engine" msgstr "Añadir un motor de búsqueda" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchentry.c:550 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchentry.c:594 msgid "_Icon (name or file):" msgstr "_Icono (nombre o fichero):" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchentry.c:608 msgid "_Token:" msgstr "_Abreviatura" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchentry.c:789 msgid "Manage search engines" msgstr "Gestionar los motores de busqueda" #: ../midori/sokoke.c:60 ../midori/sokoke.c:72 msgid "Could not run external program." -msgstr "" +msgstr "No se pudo ejecutar la aplicación externa." #: ../midori/sokoke.c:348 msgid "Warning: You are using a superuser account!" @@ -1314,52 +1343,99 @@ msgstr "Aviso: Estás conectado como super usuario!" msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/gjs.c:89 +#: ../midori/gjs.c:512 msgid "An unknown error occured." -msgstr "" +msgstr "Se produjo un error desconocido." -#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" -msgstr "" +msgstr "%s no tiene la propiedad «%s»" -#: ../midori/gjs.c:445 +#: ../midori/gjs.c:875 #, c-format msgid "%s cannot be assigned to %s.%s" -msgstr "" +msgstr "%s no puede ser asignado a %s.%s" -#: ../midori/gjs.c:455 +#: ../midori/gjs.c:885 #, c-format msgid "%s.%s cannot be accessed" -msgstr "" +msgstr "%s.%s non se puede accede" -#: ../katze/katze-throbber.c:134 +#: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "Talla de iconos" + +#: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" msgstr "Tamaño simbólico a usar para animaciónes" -#: ../katze/katze-throbber.c:143 +#: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "Nombre de icono" + +#: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" msgstr "El nombre del icono contiene cuadros animados" -#: ../katze/katze-throbber.c:152 +#: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "Pixbuf" + +#: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" msgstr "El GdkPixbuf contiene cuadros de animación" -#: ../katze/katze-throbber.c:161 +#: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "Animado" + +#: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" msgstr "Animar (o no) el icono" -#: ../katze/katze-throbber.c:170 +#: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "Nombre del icono estático" + +#: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" msgstr "Nombre a usar para el icono no animado" -#: ../katze/katze-throbber.c:179 +#: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "Pixbuf estático" + +#: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" msgstr "El GdkPixbuf va a ser usado como imagen estática" -#: ../katze/katze-throbber.c:188 +#: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "ID stock estático" + +#: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" -msgstr "ID del icono que va a usarse como imagen estática" +msgstr "ID stock del icono que va a usarse como imagen estática" + +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "No se pudo cargar el icono nombrado «%s»" + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "No se pudo cargar el icono stock «%s»" + +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "No se pudo cargar el icono «%s»" + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "" #: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format @@ -1374,6 +1450,38 @@ msgstr "Escoger un fichero" msgid "Choose folder" msgstr "Escoger una carpeta" +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "Nombre" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "Nombre del elemento" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "Descripción del texto del elemento" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "El URI del elemento" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "Icono" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "El icono del elemento" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "Abreviatura" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "La abreviatura del elemento" + #: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 #: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 #: ../katze/katze-xbel.c:789 diff --git a/po/fr.po b/po/fr.po index e51fc457..8161aa73 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-19 16:00+0200\n" +"POT-Creation-Date: 2008-08-26 00:20+0200\n" "PO-Revision-Date: 2008-03-31 17:37+0100\n" "Last-Translator: Adrien Nader \n" "Language-Team: French \n" @@ -21,7 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Petit navigateur" -#: ../midori.desktop.in.h:2 ../midori/main.c:354 +#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 +#: ../midori/main.c:419 ../midori/main.c:433 msgid "Midori" msgstr "Midori" @@ -29,672 +30,727 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur" -#: ../midori/main.c:45 -msgid "Bookmark" -msgstr "Signet" +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "_Signet" -#: ../midori/main.c:46 +#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +msgid "_Bookmarks" +msgstr "_Signets" + +#: ../midori/main.c:54 msgid "_Add Bookmark" msgstr "_Ajouter signet" -#: ../midori/main.c:47 -msgid "_Form Fill" -msgstr "Remplissage de _formulaire" +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Console" -#: ../midori/main.c:48 +#: ../midori/main.c:56 +msgid "_Extensions" +msgstr "_Extensions" + +#: ../midori/main.c:57 +msgid "_History" +msgstr "_Historique" + +#: ../midori/main.c:58 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:49 +#: ../midori/main.c:59 +msgid "_Pageholder" +msgstr "C_adre de pages" + +#: ../midori/main.c:60 +msgid "_Userscripts" +msgstr "_Scripts utilisateur" + +#: ../midori/main.c:61 +msgid "User_styles" +msgstr "Styles _utilisateur" + +#: ../midori/main.c:62 msgid "New _Tab" -msgstr "Nouvel _Onglet" +msgstr "Nouvel O_nglet" -#: ../midori/main.c:50 +#: ../midori/main.c:63 +msgid "_Transfers" +msgstr "_Transferts" + +#: ../midori/main.c:64 +msgid "_Closed Tabs and Windows" +msgstr "_Onglets et fenêtres fermés" + +#: ../midori/main.c:65 msgid "New _Window" -msgstr "Nouvelle _Fenêtre" +msgstr "Nouvelle F_enêtre" -#: ../midori/main.c:52 +#: ../midori/main.c:67 msgid "Select _All" msgstr "_Tout sélectionner" -#: ../midori/main.c:55 +#: ../midori/main.c:70 msgid "_Fullscreen" msgstr "_Plein écran" -#: ../midori/main.c:56 +#: ../midori/main.c:71 msgid "_Leave Fullscreen" msgstr "_Quitter le plein écran" -#: ../midori/main.c:110 +#: ../midori/main.c:122 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "La configuration n'a pu être chargée. %s\n" -#: ../midori/main.c:165 +#: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur '%s' n'est pas valide pour %s" -#: ../midori/main.c:172 ../midori/main.c:241 +#: ../midori/main.c:184 ../midori/main.c:253 #, c-format msgid "Unhandled settings value '%s'" msgstr "Réglage non pris en charge '%s'" -#: ../midori/main.c:346 +#: ../midori/main.c:368 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "La session n'a pu être sauveguardé. %s" + +#: ../midori/main.c:396 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:359 +#: ../midori/main.c:413 msgid "[URL]" msgstr "[URL]" -#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:363 +#: ../midori/main.c:417 msgid "Unknown argument." msgstr "" -#: ../midori/main.c:365 +#: ../midori/main.c:419 msgid "Failed to setup interface." msgstr "" -#: ../midori/main.c:380 +#: ../midori/main.c:434 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et problèmes :" -#: ../midori/main.c:382 +#: ../midori/main.c:436 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions sur :" -#: ../midori/main.c:430 +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:467 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:501 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Les signets n'ont pu être chargés. %s\n" -#: ../midori/main.c:444 +#: ../midori/main.c:515 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "La session n'a pu être chargée. %s\n" # pas très content -#: ../midori/main.c:456 +#: ../midori/main.c:527 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "La corbeille n'a pu être chargée. %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:539 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:606 +#: ../midori/main.c:688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être sauveguardés. %s" -#: ../midori/main.c:616 +#: ../midori/main.c:698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être sauveguardés. %s" # pas très content -#: ../midori/main.c:625 +#: ../midori/main.c:707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être sauveguardé. %s" -#: ../midori/main.c:637 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "La session n'a pu être sauveguardé. %s" - -#: ../midori/main.c:646 +#: ../midori/main.c:715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être sauveguardé. %s" -#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 msgid "Settings" msgstr "Réglages" -#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 msgid "The associated settings" msgstr "Les réglages associés" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 msgid "Trash" msgstr "Corbeille" -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 msgid "The trash, collecting recently closed tabs and windows" msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" -#: ../midori/midori-app.c:132 +#: ../midori/midori-app.c:141 msgid "Browser" msgstr "Navigateur" -#: ../midori/midori-app.c:133 +#: ../midori/midori-app.c:142 msgid "The current browser" msgstr "Le navigateur actuel" -#: ../midori/midori-app.c:141 +#: ../midori/midori-app.c:150 msgid "Browser Count" msgstr "Le nombre de navigateurs" -#: ../midori/midori-app.c:142 +#: ../midori/midori-app.c:151 msgid "The current number of browsers" msgstr "Le nombre actuel de navigateurs" -#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 -#: ../midori/midori-searchentry.c:66 +#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-searchentry.c:65 msgid "Search Engines" msgstr "Moteurs de recherche" -#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 msgid "The list of search engines" msgstr "" -#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Aucun" + +#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 msgid "Extensions" msgstr "Extensions" -#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../midori/midori-addons.c:42 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 msgid "Userstyles" msgstr "Styles utilisateur" +#: ../midori/midori-addons.c:113 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:114 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:122 +msgid "Kind" +msgstr "" + +#: ../midori/midori-addons.c:123 +msgid "The kind of addons" +msgstr "" + #: ../midori/midori-browser.c:192 msgid "Source" msgstr "Source" -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2782 msgid "Reload the current page" msgstr "Recharger la page" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:349 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "Edit bookmark" msgstr "Éditer le signet" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:597 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 +#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 +#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 msgid "_URL:" msgstr "_URL :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:633 +#: ../midori/midori-browser.c:646 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:650 msgid "Root" msgstr "Racine" -#: ../midori/midori-browser.c:1064 +#: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue '%s'" -#: ../midori/midori-browser.c:1283 +#: ../midori/midori-browser.c:1228 msgid "Menubar" msgstr "Barre de menu" -#: ../midori/midori-browser.c:1284 +#: ../midori/midori-browser.c:1229 msgid "The menubar" msgstr "La barre de menu" -#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1238 msgid "The navigationbar" msgstr "La barre de navigation" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-browser.c:1247 +msgid "The current URI" +msgstr "L'URI actuel" + +#: ../midori/midori-browser.c:1255 msgid "Tab" msgstr "Onglet" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1256 msgid "The current tab" msgstr "L'onglet actuel" -#: ../midori/midori-browser.c:1310 +#: ../midori/midori-browser.c:1264 msgid "Statusbar" msgstr "Barre d'état" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1265 msgid "The statusbar" msgstr "La barre d'état" -#: ../midori/midori-browser.c:1347 +#: ../midori/midori-browser.c:1301 msgid "Statusbar Text" msgstr "Texte de la barre d'état" -#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 msgid "The text that is displayed in the statusbar" msgstr "Le texte affiché dans la barre d'êtat" -#: ../midori/midori-browser.c:1381 +#: ../midori/midori-browser.c:1335 msgid "The list of search engines to be used for web search" msgstr "" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2313 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:2483 +#: ../midori/midori-browser.c:2478 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2491 +#: ../midori/midori-browser.c:2486 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader " -#: ../midori/midori-browser.c:2709 +#: ../midori/midori-browser.c:2699 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2702 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2705 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2708 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:2721 +#: ../midori/midori-browser.c:2711 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:2723 +#: ../midori/midori-browser.c:2713 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:2724 +#: ../midori/midori-browser.c:2714 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:2716 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2717 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2719 msgid "Pa_ge Setup" msgstr "Gestion de page" -#: ../midori/midori-browser.c:2733 +#: ../midori/midori-browser.c:2723 msgid "Show a preview of the printed page" msgstr "" -#: ../midori/midori-browser.c:2736 +#: ../midori/midori-browser.c:2726 msgid "Print the current page" msgstr "Imprimer la page actuel" -#: ../midori/midori-browser.c:2739 +#: ../midori/midori-browser.c:2729 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:2741 +#: ../midori/midori-browser.c:2731 msgid "_Edit" msgstr "Édit_er" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:2734 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../midori/midori-browser.c:2747 +#: ../midori/midori-browser.c:2737 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../midori/midori-browser.c:2750 +#: ../midori/midori-browser.c:2740 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2749 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2752 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:2765 +#: ../midori/midori-browser.c:2755 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:2768 +#: ../midori/midori-browser.c:2758 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2760 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2761 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2763 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:2774 +#: ../midori/midori-browser.c:2764 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2766 msgid "_Quick Find" msgstr "Recherche rapide" -#: ../midori/midori-browser.c:2777 +#: ../midori/midori-browser.c:2767 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2780 +#: ../midori/midori-browser.c:2770 msgid "Configure the application preferences" msgstr "Configurer les préferences de l'application" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:2772 msgid "_View" msgstr "_Vue" -#: ../midori/midori-browser.c:2783 +#: ../midori/midori-browser.c:2773 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:2785 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:2798 +#: ../midori/midori-browser.c:2788 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:2801 +#: ../midori/midori-browser.c:2791 msgid "Reset the zoom level" msgstr "Remettre le niveau d'agrandissement" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:2793 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:2804 +#: ../midori/midori-browser.c:2794 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2796 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2797 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:2810 +#: ../midori/midori-browser.c:2800 msgid "Toggle fullscreen view" msgstr "Activer/Désactiver le plein écran" -#: ../midori/midori-browser.c:2812 +#: ../midori/midori-browser.c:2802 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:2815 +#: ../midori/midori-browser.c:2805 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:2808 msgid "Go forward to the next page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2811 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2823 -msgid "Location..." -msgstr "Emplacement..." +#: ../midori/midori-browser.c:2813 +msgid "_Web Search..." +msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:2824 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:2826 -msgid "Web Search..." -msgstr "Recherche toile..." - -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2814 msgid "Run a web search" msgstr "Démarrer une recherche toile" -#: ../midori/midori-browser.c:2829 +#: ../midori/midori-browser.c:2816 msgid "Open in Page_holder..." msgstr "Ouvrir dans le _cadre de pages..." -#: ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:2817 msgid "Open the current page in the pageholder" msgstr "Ouvrir la page actuel dans le cadre de pages" -#: ../midori/midori-browser.c:2832 -msgid "Closed Tabs and Windows" -msgstr "Onglets et fenêtres fermés" - -#: ../midori/midori-browser.c:2833 +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2821 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:2823 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:2836 +#: ../midori/midori-browser.c:2824 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:2826 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:2839 +#: ../midori/midori-browser.c:2827 msgid "Open the last closed tab" msgstr "Ouvrir l'onglet plus récemment fermé" -#: ../midori/midori-browser.c:2841 -msgid "_Bookmarks" -msgstr "_Signets" - -#: ../midori/midori-browser.c:2844 +#: ../midori/midori-browser.c:2832 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:2846 +#: ../midori/midori-browser.c:2834 msgid "_Manage Bookmarks" msgstr "_Gérer les signets" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2835 msgid "Add, edit and remove bookmarks..." msgstr "Ajouter, modifier et supprimer des signets..." -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:2838 msgid "Open the selected bookmark" msgstr "Ouvrir le signet sélectionné" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2840 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2853 +#: ../midori/midori-browser.c:2841 msgid "Open the selected bookmark in a new tab" msgstr "Ouvrir le signet sélectionné dans un nouvel onglet" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:2843 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2856 +#: ../midori/midori-browser.c:2844 msgid "Open the selected bookmark in a new window" msgstr "Ouvrir le signet sélectionné dans un nouvel fenêtre" -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2847 msgid "Edit the selected bookmark" msgstr "Éditer le signet sélectionné" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2850 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:2852 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 +#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 msgid "_Manage Search Engines" msgstr "_Gérer les moteurs de recherche" -#: ../midori/midori-browser.c:2867 +#: ../midori/midori-browser.c:2855 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:2870 +#: ../midori/midori-browser.c:2858 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:2860 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:2861 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:2863 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:2864 msgid "Switch to the next tab" msgstr "" # fonctionnalité à tester -#: ../midori/midori-browser.c:2878 +#: ../midori/midori-browser.c:2866 msgid "Tab _Overview" msgstr "_Aperçu des onglets" -#: ../midori/midori-browser.c:2879 +#: ../midori/midori-browser.c:2867 msgid "Show an overview of all open tabs" msgstr "" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2869 msgid "_Help" msgstr "_Aide" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:2871 msgid "_Contents" msgstr "_Contenu" -#: ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2872 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:2875 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:2881 msgid "P_rivate Browsing" msgstr "Navigation en _privé" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:2882 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:2885 msgid "_Work Offline" msgstr "Travailler hors ligne" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2886 msgid "Work without a network connection" msgstr "" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:2890 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:2891 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2894 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:2895 msgid "Show sidepanel" msgstr "Afficher panneau latéral" -#: ../midori/midori-browser.c:2910 +#: ../midori/midori-browser.c:2898 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:2899 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:2914 +#: ../midori/midori-browser.c:2902 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:2903 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:2918 +#: ../midori/midori-browser.c:2906 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:2907 msgid "Show statusbar" msgstr "Afficher la barre d'état" +#: ../midori/midori-browser.c:3228 +msgid "_Location..." +msgstr "_Emplacement..." + +#: ../midori/midori-browser.c:3230 +msgid "Open a particular location" +msgstr "" + #: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Signets" @@ -708,7 +764,7 @@ msgstr "Transferts" msgid "Console" msgstr "Console" -#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 +#: ../midori/midori-browser.c:3476 msgid "History" msgstr "Historique" @@ -716,31 +772,43 @@ msgstr "Historique" msgid "Pageholder" msgstr "Cadre de pages" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3534 msgid "_Inline find:" msgstr "Recherche rapide:" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3569 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3570 +#: ../midori/midori-browser.c:3586 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:3807 +#: ../midori/midori-browser.c:3817 #, c-format msgid "Unexpected setting '%s'" msgstr "Réglages des polices" +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "" + #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Aspect des ombres autour de chaque panneau" +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Menu" + #: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menu pour contenir les éléments des panneaux" +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "" + #: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Le numéro de la page actuelle" @@ -749,21 +817,17 @@ msgstr "Le numéro de la page actuelle" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:392 -msgid "Untitled" -msgstr "Sans titre" - #: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 msgid "Homepage" msgstr "Page d'accueil" #: ../midori/midori-websettings.c:132 msgid "Last open pages" -msgstr "Page récemment ouvertes" +msgstr "Pages récemment ouvertes" #: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" @@ -810,7 +874,7 @@ msgstr "Défaut" msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 msgid "Text" msgstr "Texte" @@ -830,10 +894,6 @@ msgstr "Tous les témoins" msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Aucun" - #: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Se rappeler de la taille de la fenêtre" @@ -931,129 +991,129 @@ msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" #: ../midori/midori-websettings.c:354 -msgid "Small toolbar" -msgstr "Petit barre d'outils" - -#: ../midori/midori-websettings.c:355 -msgid "Use small toolbar icons" -msgstr "Afficher de petites icônes de la barre d'outils" - -#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" msgstr "Afficher le bouton de nouvel onglet dans la barre d'outils" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:363 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:364 msgid "Show the Homepage button in the toolbar" msgstr "Afficher le bouton de page d'accueil dans la barre d'outils" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:372 msgid "Show Web search" msgstr "Afficher la recherche toile" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" msgstr "Afficher le champ de recherche toile dans la barre d'outils" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:381 msgid "Show Trash" msgstr "Afficher la corbeille" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" msgstr "Afficher le bouton de la corbeille dans la barre d'outils" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:392 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:393 msgid "What to load on startup" msgstr "Que charger au démarrage" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Folder" msgstr "Répertoire de téléchargement" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "Le répertoire pour guarder les téléchargements" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:420 msgid "Download Manager" msgstr "Gestionnaire de téléchargement" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:421 msgid "An external download manager" msgstr "Un gestionnaire de téléchargement extern" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:430 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" msgstr "Encodage préferé" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" msgstr "Encodage préféré des charactères" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:450 msgid "Tab Label Size" msgstr "Taille des onglets" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:451 msgid "The desired tab label size" msgstr "La taille désirée du libellé des onglets" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" msgstr "Bouton fermer sur les onglets" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" msgstr "Les onglets ont-ils des boutons de fermeture" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:468 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:469 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" msgstr "Clic molette charge la sélection" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:487 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" msgstr "Ouvrir ou non les nouveaux onglets en arrière-plan" +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "Ouvrir les onglets à côté de l'actuel" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Ouvrir les nouveaux onglets à côté de l'actuel ou après le dernier" + #: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres intempestives" @@ -1134,23 +1194,43 @@ msgstr "Taille de l'antémémoire (cache)" msgid "The allowed size of the cache" msgstr "La taille acceptée de l'antémémoire" -#: ../midori/midori-webview.c:193 +#: ../midori/midori-webview.c:64 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-webview.c:65 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-webview.c:66 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" msgstr "L'URI de la page actuellement chargée" -#: ../midori/midori-webview.c:202 +#: ../midori/midori-webview.c:234 msgid "The title of the currently loaded page" msgstr "Le titre de la page actuellement chargée" -#: ../midori/midori-webview.c:578 +#: ../midori/midori-webview.c:244 +msgid "The current loading progress" +msgstr "" + +#: ../midori/midori-webview.c:253 +msgid "The current loading status" +msgstr "" + +#: ../midori/midori-webview.c:695 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-webview.c:606 +#: ../midori/midori-webview.c:723 msgid "Download Link with Download _Manager" msgstr "Télécharge le lien avec le gestionnaire de _télégarments" -#: ../midori/midori-webview.c:624 +#: ../midori/midori-webview.c:741 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" @@ -1200,108 +1280,55 @@ msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "MB" msgstr "Mo" -#. Page "Privacy" -#: ../midori/midori-preferences.c:420 -msgid "Privacy" -msgstr "Confidentialité" - -#: ../midori/midori-preferences.c:421 -msgid "Web Cookies" -msgstr "Témoins de connexion" - -#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 -msgid "days" -msgstr "jours" - -#: ../midori/midori-webitem.c:70 -msgid "Name" -msgstr "Nom" - -#: ../midori/midori-webitem.c:71 -msgid "The name of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:79 -msgid "Description" -msgstr "Description" - -#: ../midori/midori-webitem.c:80 -msgid "The description of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:88 -msgid "URI" -msgstr "URI" - -#: ../midori/midori-webitem.c:89 -msgid "The URI of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:97 -msgid "Icon" -msgstr "Icôn" - -#: ../midori/midori-webitem.c:98 -msgid "The icon of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:106 -msgid "Token" -msgstr "" - -#: ../midori/midori-webitem.c:107 -msgid "The token of the web item" -msgstr "" - -#: ../midori/midori-searchentry.c:75 +#: ../midori/midori-searchentry.c:74 msgid "Current Item" msgstr "" -#: ../midori/midori-searchentry.c:76 +#: ../midori/midori-searchentry.c:75 msgid "The currently selected item" msgstr "" -#: ../midori/midori-searchentry.c:84 +#: ../midori/midori-searchentry.c:83 msgid "Dialog" msgstr "" -#: ../midori/midori-searchentry.c:85 +#: ../midori/midori-searchentry.c:84 msgid "A dialog to manage search engines" msgstr "" -#: ../midori/midori-searchentry.c:152 +#: ../midori/midori-searchentry.c:151 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Edit search engine" msgstr "Éditer le moteur de recherche" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchentry.c:550 msgid "_Name:" msgstr "_Nom:" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchentry.c:594 msgid "_Icon (name or file):" msgstr "_Icône (nom ou fichier):" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchentry.c:608 msgid "_Token:" msgstr "" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchentry.c:789 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" @@ -1318,53 +1345,101 @@ msgstr "Attention: Vous êtes connecté en tant que super-utilisateur!" msgid "Writing failed." msgstr "Échec de l'écriture." -#: ../midori/gjs.c:89 +#: ../midori/gjs.c:512 msgid "An unknown error occured." msgstr "" -#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" msgstr "" -#: ../midori/gjs.c:445 +#: ../midori/gjs.c:875 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:455 +#: ../midori/gjs.c:885 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../katze/katze-throbber.c:134 +#: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "Taille d'icôn" + +#: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" msgstr "Taille symbolique à utiliser pour l'animation" -#: ../katze/katze-throbber.c:143 +#: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "Nom d'icon" + +#: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" msgstr "" -#: ../katze/katze-throbber.c:152 +#: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" msgstr "" -#: ../katze/katze-throbber.c:161 +#: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "Animé" + +#: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" msgstr "" -#: ../katze/katze-throbber.c:170 +#: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" msgstr "" -#: ../katze/katze-throbber.c:179 +#: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" msgstr "" -#: ../katze/katze-throbber.c:188 +#: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "" + +#: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" msgstr "" +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Icon nommé '%s' n'a pu être chargée." + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Icon stock '%s' n'a pu être chargée." + +# pas très content +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "Icon '%s' n'a pu être chargée." + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "" + #: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" @@ -1378,6 +1453,38 @@ msgstr "Choisissez un fichier" msgid "Choose folder" msgstr "Choisissez un répertoire" +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "Nom" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "Le numéro de l'élement" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "Le texte descriptif de l'élement" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "L'URI de l'élement" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "Icôn" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "L'icôn de l'élement" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "Sigle" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "Le sigle de l'élement" + #: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 #: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 #: ../katze/katze-xbel.c:789 From a048bf0feb57477f84b1462c18283c575daf7fa2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 11:51:03 +0200 Subject: [PATCH 0303/2970] Cleanup Galician, Hungarian and Swedish fuzzy strings --- po/gl.po | 882 ++++++++++++++++-------------- po/hu.po | 1609 +++++++++++++++++++++++++++++++++--------------------- po/sv.po | 832 ++++++++++++++++------------ 3 files changed, 1948 insertions(+), 1375 deletions(-) diff --git a/po/gl.po b/po/gl.po index f1b7f285..a870d7fe 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori-0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-19 16:00+0200\n" +"POT-Creation-Date: 2008-08-26 00:20+0200\n" "PO-Revision-Date: 2008-07-20 13:42+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: GALPon MiniNo \n" @@ -19,8 +19,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador lixeiro" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:354 +#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 +#: ../midori/main.c:419 ../midori/main.c:433 msgid "Midori" msgstr "Midori" @@ -28,695 +28,730 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:45 -msgid "Bookmark" -msgstr "Marcapáxinas" +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "_Marcapáxina" -#: ../midori/main.c:46 +#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +msgid "_Bookmarks" +msgstr "_Marcapáxinas" + +#: ../midori/main.c:54 msgid "_Add Bookmark" msgstr "_Engadir marcapáxinas" -#: ../midori/main.c:47 -msgid "_Form Fill" -msgstr "Encher _formulario" +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Consola" -#: ../midori/main.c:48 +#: ../midori/main.c:56 +msgid "_Extensions" +msgstr "_Extensións" + +#: ../midori/main.c:57 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/main.c:58 msgid "_Homepage" msgstr "P_áxina de inicio" -#: ../midori/main.c:49 +#: ../midori/main.c:59 +msgid "_Pageholder" +msgstr "C_adro de páxinas" + +#: ../midori/main.c:60 +msgid "_Userscripts" +msgstr "_Scripts de usuario" + +#: ../midori/main.c:61 +msgid "User_styles" +msgstr "_Estilos de usuario" + +#: ../midori/main.c:62 msgid "New _Tab" msgstr "Nova lingüe_ta" -#: ../midori/main.c:50 +#: ../midori/main.c:63 +msgid "_Transfers" +msgstr "_Transferencias" + +#: ../midori/main.c:64 +msgid "_Closed Tabs and Windows" +msgstr "" + +#: ../midori/main.c:65 msgid "New _Window" msgstr "Nova _ventá" -#: ../midori/main.c:52 +#: ../midori/main.c:67 msgid "Select _All" msgstr "Seleccion_ar todo" -#: ../midori/main.c:55 +#: ../midori/main.c:70 msgid "_Fullscreen" msgstr "_Pantalla completa" -#: ../midori/main.c:56 +#: ../midori/main.c:71 msgid "_Leave Fullscreen" msgstr "_Saír de pantalla completa" -#: ../midori/main.c:110 +#: ../midori/main.c:122 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Non se puido cargar a configuración. %s\n" -#: ../midori/main.c:165 +#: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor «%s» non é válido para %s" -#: ../midori/main.c:172 -#: ../midori/main.c:241 +#: ../midori/main.c:184 ../midori/main.c:253 #, c-format msgid "Unhandled settings value '%s'" msgstr "Non se poden axustar as propiedades «%s»" -#: ../midori/main.c:346 -msgid "Display program version" -msgstr "Amosar a versión do programa" - -#: ../midori/main.c:359 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:363 -#: ../midori/main.c:365 -#: ../midori/main.c:379 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:363 -msgid "Unknown argument." -msgstr "Argumento descoñecido." - -#: ../midori/main.c:365 -msgid "Failed to setup interface." -msgstr "Fallou a configuración da interface." - -#: ../midori/main.c:380 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, envíe comentarios, suxerencias e problemas a:" - -#: ../midori/main.c:382 -msgid "Check for new versions at:" -msgstr "Comprobar se existen novas versións en:" - -#: ../midori/main.c:430 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Os marcapáxinas non puideron ser cargados. %s\n" - -#: ../midori/main.c:444 -#, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "Non se puido cargar a sesión. %s\n" - -#: ../midori/main.c:456 -#, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "Non se puido cargar a «Cesta do lixo». %s\n" - -#: ../midori/main.c:468 -msgid "The following errors occured:" -msgstr "Producíronse os seguinte erros:" - -#: ../midori/main.c:606 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Non se puido gardar o motor de busca. %s" - -#: ../midori/main.c:616 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Non se puideron gardar os marcapáxinas. %s" - -#: ../midori/main.c:625 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Non se puido gardar a «cesta do lixo». %s" - -#: ../midori/main.c:637 +#: ../midori/main.c:368 #, c-format msgid "The session couldn't be saved. %s" msgstr "Non se puido gardar a sesión. %s" -#: ../midori/main.c:646 +#: ../midori/main.c:396 +msgid "Display program version" +msgstr "Amosar a versión do programa" + +#: ../midori/main.c:413 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:417 +msgid "Unknown argument." +msgstr "Argumento descoñecido." + +#: ../midori/main.c:419 +msgid "Failed to setup interface." +msgstr "Fallou a configuración da interface." + +#: ../midori/main.c:434 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor, envíe comentarios, suxerencias e problemas a:" + +#: ../midori/main.c:436 +msgid "Check for new versions at:" +msgstr "Comprobar se existen novas versións en:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:467 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:501 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Os marcapáxinas non puideron ser cargados. %s\n" + +#: ../midori/main.c:515 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Non se puido cargar a sesión. %s\n" + +#: ../midori/main.c:527 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Non se puido cargar a «Cesta do lixo». %s\n" + +#: ../midori/main.c:539 +msgid "The following errors occured:" +msgstr "Producíronse os seguinte erros:" + +#: ../midori/main.c:688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Non se puido gardar o motor de busca. %s" + +#: ../midori/main.c:698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Non se puideron gardar os marcapáxinas. %s" + +#: ../midori/main.c:707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Non se puido gardar a «cesta do lixo». %s" + +#: ../midori/main.c:715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Non se puido gardar a configuración. %s" -#: ../midori/midori-app.c:114 -#: ../midori/midori-browser.c:1327 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 msgid "Settings" msgstr "Configuración" -#: ../midori/midori-app.c:115 -#: ../midori/midori-browser.c:1328 +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 msgid "The associated settings" msgstr "Axustes asociados" -#: ../midori/midori-app.c:123 -#: ../midori/midori-browser.c:1366 +#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 msgid "Trash" msgstr "Cesta do lixo" -#: ../midori/midori-app.c:124 -#: ../midori/midori-browser.c:1367 +#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 msgid "The trash, collecting recently closed tabs and windows" msgstr "Lixo, recollido recentemente pechando lingüetas e ventás" -#: ../midori/midori-app.c:132 +#: ../midori/midori-app.c:141 msgid "Browser" msgstr "Navegador" -#: ../midori/midori-app.c:133 +#: ../midori/midori-app.c:142 msgid "The current browser" msgstr "Navegador actual" -#: ../midori/midori-app.c:141 +#: ../midori/midori-app.c:150 msgid "Browser Count" msgstr "Contador do navegador" -#: ../midori/midori-app.c:142 +#: ../midori/midori-app.c:151 msgid "The current number of browsers" msgstr "Número actual de navegadores" -#: ../midori/midori-app.c:150 -#: ../midori/midori-browser.c:1380 -#: ../midori/midori-searchentry.c:66 +#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-searchentry.c:65 msgid "Search Engines" msgstr "Motores de busca" -#: ../midori/midori-app.c:151 -#: ../midori/midori-searchentry.c:67 +#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 msgid "The list of search engines" msgstr "Lista de motores de busca" -#: ../midori/midori-addons.c:40 -#: ../midori/midori-browser.c:3594 +#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Ningunha" + +#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 msgid "Extensions" msgstr "Extensións" -#: ../midori/midori-addons.c:41 -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../midori/midori-addons.c:42 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 msgid "Userstyles" msgstr "Estilos de usuario" +#: ../midori/midori-addons.c:113 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:114 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:122 +msgid "Kind" +msgstr "" + +#: ../midori/midori-addons.c:123 +msgid "The kind of addons" +msgstr "" + #: ../midori/midori-browser.c:192 msgid "Source" msgstr "Código fonte" -#: ../midori/midori-browser.c:273 -#: ../midori/midori-browser.c:2786 -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2782 msgid "Reload the current page" msgstr "Cargar novamente a páxina actual" -#: ../midori/midori-browser.c:282 -#: ../midori/midori-browser.c:2789 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:349 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "New bookmark" msgstr "Novo marcapáxinas" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "Edit bookmark" msgstr "Editar o marcapáxinas" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:597 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:597 -#: ../midori/midori-searchentry.c:567 +#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 msgid "_Description:" msgstr "_Descrición" -#: ../midori/midori-browser.c:616 -#: ../midori/midori-searchentry.c:581 +#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:633 +#: ../midori/midori-browser.c:646 msgid "_Folder:" msgstr "_Cartafol:" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:650 msgid "Root" msgstr "Raiz" -#: ../midori/midori-browser.c:1064 +#: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." msgstr "Acción non esperada «%s»" -#: ../midori/midori-browser.c:1283 +#: ../midori/midori-browser.c:1228 msgid "Menubar" msgstr "Barra do menú" -#: ../midori/midori-browser.c:1284 +#: ../midori/midori-browser.c:1229 msgid "The menubar" msgstr "Barra de menu" -#: ../midori/midori-browser.c:1292 -#: ../midori/midori-preferences.c:374 +#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1238 msgid "The navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-browser.c:1247 +msgid "The current URI" +msgstr "" + +#: ../midori/midori-browser.c:1255 msgid "Tab" msgstr "Lingüeta" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1256 msgid "The current tab" msgstr "Lingüeta actual" -#: ../midori/midori-browser.c:1310 +#: ../midori/midori-browser.c:1264 msgid "Statusbar" msgstr "Barra de estado" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1265 msgid "The statusbar" msgstr "Barra de estado" -#: ../midori/midori-browser.c:1347 +#: ../midori/midori-browser.c:1301 msgid "Statusbar Text" msgstr "Texto da barra de estado" -#: ../midori/midori-browser.c:1348 -#: ../midori/midori-webview.c:211 +#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 msgid "The text that is displayed in the statusbar" msgstr "O texto amosase na barra de estado" -#: ../midori/midori-browser.c:1381 +#: ../midori/midori-browser.c:1335 msgid "The list of search engines to be used for web search" msgstr "Lista de motores de busca que pode utilizar para buscas na web" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2313 msgid "Separator" msgstr "Separador" -#: ../midori/midori-browser.c:2483 +#: ../midori/midori-browser.c:2478 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:2491 +#: ../midori/midori-browser.c:2486 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada\n" "Antonio Sanchez" -#: ../midori/midori-browser.c:2709 +#: ../midori/midori-browser.c:2699 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2702 msgid "Open a new window" msgstr "Abrir unha nova ventá" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2705 msgid "Open a new tab" msgstr "Abrir unha nova lingüeta" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2708 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:2721 +#: ../midori/midori-browser.c:2711 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:2723 +#: ../midori/midori-browser.c:2713 msgid "_Close Tab" msgstr "Pechar _lingüeta" -#: ../midori/midori-browser.c:2724 +#: ../midori/midori-browser.c:2714 msgid "Close the current tab" msgstr "Pechar a lingüeta actual" -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:2716 msgid "C_lose Window" msgstr "_Pechar a ventá" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2717 msgid "Close this window" msgstr "Pechar esta ventá" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2719 msgid "Pa_ge Setup" msgstr "Configuración da páxina" -#: ../midori/midori-browser.c:2733 +#: ../midori/midori-browser.c:2723 msgid "Show a preview of the printed page" msgstr "Amosar previsualización da páxina á imprimir" -#: ../midori/midori-browser.c:2736 +#: ../midori/midori-browser.c:2726 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:2739 +#: ../midori/midori-browser.c:2729 msgid "Quit the application" msgstr "Sair da aplicación" -#: ../midori/midori-browser.c:2741 +#: ../midori/midori-browser.c:2731 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:2734 msgid "Undo the last modification" msgstr "Desfacer a última modificación" -#: ../midori/midori-browser.c:2747 +#: ../midori/midori-browser.c:2737 msgid "Redo the last modification" msgstr "Refacer a última modificación" -#: ../midori/midori-browser.c:2750 +#: ../midori/midori-browser.c:2740 msgid "Cut the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:2753 -#: ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2749 msgid "Paste text from the clipboard" msgstr "Pegar o texto seleccionado no porta papeis" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2752 msgid "Delete the selected text" msgstr "Borrar o texto seleccionado" -#: ../midori/midori-browser.c:2765 +#: ../midori/midori-browser.c:2755 msgid "Select all text" msgstr "Seleccionar todo o texto" -#: ../midori/midori-browser.c:2768 +#: ../midori/midori-browser.c:2758 msgid "Find a word or phrase in the page" msgstr "Buscar palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2760 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2761 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar a seguinte coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2763 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:2774 +#: ../midori/midori-browser.c:2764 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar a anterior coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2766 msgid "_Quick Find" msgstr "Busca _rapida" -#: ../midori/midori-browser.c:2777 +#: ../midori/midori-browser.c:2767 msgid "Quickly jump to a word or phrase" msgstr "Salto rápido a unha palabra ou frase" -#: ../midori/midori-browser.c:2780 +#: ../midori/midori-browser.c:2770 msgid "Configure the application preferences" msgstr "Configurar as preferencias da aplicación" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:2772 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:2783 +#: ../midori/midori-browser.c:2773 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:2785 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:2798 +#: ../midori/midori-browser.c:2788 msgid "Decrease the zoom level" msgstr "Diminuir o nivel de zoom" -#: ../midori/midori-browser.c:2801 +#: ../midori/midori-browser.c:2791 msgid "Reset the zoom level" msgstr "Reiniciar o nivel de zoom" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:2793 msgid "View _Source" msgstr "Amosar _código fonte" -#: ../midori/midori-browser.c:2804 +#: ../midori/midori-browser.c:2794 msgid "View the source code of the page" msgstr "Ver o código fonte da páxina" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2796 msgid "View Selection Source" msgstr "Amosar código fonte da páxina seleccionada" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2797 msgid "View the source code of the selection" msgstr "Ver o código fonte da selección" -#: ../midori/midori-browser.c:2810 +#: ../midori/midori-browser.c:2800 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:2812 +#: ../midori/midori-browser.c:2802 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:2815 +#: ../midori/midori-browser.c:2805 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:2808 msgid "Go forward to the next page" msgstr "Avanzar á seguinte páxina" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2811 msgid "Go to your homepage" msgstr "Ir a súa páxina de inicio" -#: ../midori/midori-browser.c:2823 -msgid "Location..." -msgstr "Ubicación..." +#: ../midori/midori-browser.c:2813 +msgid "_Web Search..." +msgstr "Buscar na _web..." -#: ../midori/midori-browser.c:2824 -msgid "Open a particular location" -msgstr "Abrir un enderezo determinado" - -#: ../midori/midori-browser.c:2826 -msgid "Web Search..." -msgstr "Buscar na web..." - -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2814 msgid "Run a web search" msgstr "Proceder a busca na web" -#: ../midori/midori-browser.c:2829 +#: ../midori/midori-browser.c:2816 msgid "Open in Page_holder..." msgstr "Abrir no _cadro de páxinas" -#: ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:2817 msgid "Open the current page in the pageholder" msgstr "Abrir a páxina actual no cadro de páxinas" -#: ../midori/midori-browser.c:2832 -msgid "Closed Tabs and Windows" -msgstr "Pechar ventás e lingüetas" - -#: ../midori/midori-browser.c:2833 +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2821 msgid "Reopen a previously closed tab or window" msgstr "Voltar a abrir ventás ou lingüetas pechadas" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:2823 msgid "Empty Trash" msgstr "Baleirar a cesta do lixo" -#: ../midori/midori-browser.c:2836 +#: ../midori/midori-browser.c:2824 msgid "Delete the contents of the trash" msgstr "Borrar o contido do lixo" -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:2826 msgid "Undo Close Tab" msgstr "Desfacer o peche de lingüeta" -#: ../midori/midori-browser.c:2839 +#: ../midori/midori-browser.c:2827 msgid "Open the last closed tab" msgstr "Abrir a última lingüeta pechada" -#: ../midori/midori-browser.c:2841 -msgid "_Bookmarks" -msgstr "_Marcapáxinas" - -#: ../midori/midori-browser.c:2844 +#: ../midori/midori-browser.c:2832 msgid "Add a new bookmark" msgstr "Engadir novo marcapáxinas" -#: ../midori/midori-browser.c:2846 +#: ../midori/midori-browser.c:2834 msgid "_Manage Bookmarks" msgstr "_Xestionar marcapáxinas" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2835 msgid "Add, edit and remove bookmarks..." msgstr "Engadir, editar ou eliminar marcapáxinas..." -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:2838 msgid "Open the selected bookmark" msgstr "Abrir o marcapáxinas seleccionado" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2840 msgid "Open in New _Tab" msgstr "Abrir nunha nova _lingüeta " -#: ../midori/midori-browser.c:2853 +#: ../midori/midori-browser.c:2841 msgid "Open the selected bookmark in a new tab" msgstr "Abrir o marcapáxinas seleccionado nunha lingüeta nova" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:2843 msgid "Open in New _Window" msgstr "Abrir nunha nova _ventá" -#: ../midori/midori-browser.c:2856 +#: ../midori/midori-browser.c:2844 msgid "Open the selected bookmark in a new window" msgstr "Abrir o marcapáxinas seleccionado nunha ventá nova" -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2847 msgid "Edit the selected bookmark" msgstr "Editar o marcapáxinas seleccionado" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2850 msgid "Delete the selected bookmark" msgstr "Borrar o marcapáxinas seleccionado" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:2852 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:2866 -#: ../midori/midori-searchentry.c:161 +#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:2867 +#: ../midori/midori-browser.c:2855 msgid "Add, edit and remove search engines..." msgstr "Engadir, editar ou eliminar motores de busca..." -#: ../midori/midori-browser.c:2870 +#: ../midori/midori-browser.c:2858 msgid "_Window" msgstr "_Ventá" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:2860 msgid "_Previous Tab" msgstr "Lingüeta _anterior" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:2861 msgid "Switch to the previous tab" msgstr "Cambiar a lingüeta anterior" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:2863 msgid "_Next Tab" msgstr "Lingüeta _seguinte" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:2864 msgid "Switch to the next tab" msgstr "Cambiar a lingüeta seguinte" # comprobar -#: ../midori/midori-browser.c:2878 +#: ../midori/midori-browser.c:2866 msgid "Tab _Overview" msgstr "_Descrición de lingüetas" -#: ../midori/midori-browser.c:2879 +#: ../midori/midori-browser.c:2867 msgid "Show an overview of all open tabs" msgstr "Amosar unha visión xeral de todas as lingüetas abertas" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2869 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:2871 msgid "_Contents" msgstr "_Contido" -#: ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2872 msgid "Show the documentation" msgstr "Amosar a documentación" -#: ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:2875 msgid "Show information about the program" msgstr "Amosar información sobre o programa" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:2881 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:2882 msgid "Don't save any private data while browsing" msgstr "Non gardar datos privados durante a navegación" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:2885 msgid "_Work Offline" msgstr "Traballar desconectado" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2886 msgid "Work without a network connection" msgstr "Traballar sin conexión de rede" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:2890 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:2891 msgid "Show navigationbar" msgstr "Amosar a barra de navegación" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2894 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:2895 msgid "Show sidepanel" msgstr "Amosar panel lateral" -#: ../midori/midori-browser.c:2910 +#: ../midori/midori-browser.c:2898 msgid "_Bookmarkbar" msgstr "Barra de marcapáxinas" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:2899 msgid "Show bookmarkbar" msgstr "Amosar a barra de marcapáxinas" -#: ../midori/midori-browser.c:2914 +#: ../midori/midori-browser.c:2902 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:2903 msgid "Show transferbar" msgstr "Amosar a barra de transferencias" -#: ../midori/midori-browser.c:2918 +#: ../midori/midori-browser.c:2906 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:2907 msgid "Show statusbar" msgstr "Amosar a barra de estado" +#: ../midori/midori-browser.c:3228 +msgid "_Location..." +msgstr "Ubicación..." + +#: ../midori/midori-browser.c:3230 +msgid "Open a particular location" +msgstr "Abrir un enderezo determinado" + #: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Marcapáxinas" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 -#: ../midori/midori-preferences.c:279 +#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 msgid "Transfers" msgstr "Transferencias" @@ -725,7 +760,6 @@ msgid "Console" msgstr "Consola" #: ../midori/midori-browser.c:3476 -#: ../midori/midori-preferences.c:437 msgid "History" msgstr "Histórico" @@ -733,50 +767,56 @@ msgstr "Histórico" msgid "Pageholder" msgstr "Cadro de páxinas" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3534 msgid "_Inline find:" msgstr "_Busca en liña:" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3569 msgid "Match Case" msgstr "Sensible a maiúsculas" -#: ../midori/midori-browser.c:3570 +#: ../midori/midori-browser.c:3586 msgid "Close Findbar" msgstr "Pechar barra de buscas" -#: ../midori/midori-browser.c:3807 +#: ../midori/midori-browser.c:3817 #, c-format msgid "Unexpected setting '%s'" msgstr "Axuste non esperado «%s»" +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "" + #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Aspecto das sombras arredor de cada panel" +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Menú" + #: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Menu para conter os elementos dos paneis" +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "" + #: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Indice da páxina actual" -#: ../midori/midori-panel.c:206 -#: ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 msgid "Close panel" msgstr "Perchar o panel" -#: ../midori/midori-panel.c:392 -msgid "Untitled" -msgstr "Sin título" - #: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Páxina baleira" -#: ../midori/midori-websettings.c:131 -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 msgid "Homepage" msgstr "Inicio" @@ -828,7 +868,7 @@ msgstr "Predeterminada" msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 msgid "Text" msgstr "Texto" @@ -848,10 +888,6 @@ msgstr "Todas as «cookies»" msgid "Session cookies" msgstr "As «cookies» de esta sesión" -#: ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Ningunha" - #: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Recordar último tamaño de ventá" @@ -949,129 +985,129 @@ msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" #: ../midori/midori-websettings.c:354 -msgid "Small toolbar" -msgstr "Barra de ferramentas pequena" - -#: ../midori/midori-websettings.c:355 -msgid "Use small toolbar icons" -msgstr "Amosar iconas pequenas na barra de ferramentas" - -#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Amosar nova lingüeta" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" msgstr "Amosar o botón de «Nova lingüeta» na barra de ferramentas" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:363 msgid "Show Homepage" msgstr "Amosar páxina de inicio" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:364 msgid "Show the Homepage button in the toolbar" msgstr "Amosar o botón de «Páxina de Inicio» na barra de ferramentas" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:372 msgid "Show Web search" msgstr "Amosar o buscador web" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" msgstr "Amosar a caixa se buscas na web na barra de ferramentas" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:381 msgid "Show Trash" msgstr "Amosar «Cesta do lixo»" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" msgstr "Amosar o botón «Cesta do lixo» na barra de ferramentas" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:392 msgid "Load on Startup" msgstr "Cargar ao inicio" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:393 msgid "What to load on startup" msgstr "Que cargar no inicio" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The homepage" msgstr "Páxina de inicio" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Folder" msgstr "Cartafol de descargas" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:420 msgid "Download Manager" msgstr "Xestor de descargas" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:421 msgid "An external download manager" msgstr "Xestor de descargas externo" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:430 msgid "The search to perform inside the location entry" msgstr "Facer unha busca a partir do contido da barra de enderezos" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" msgstr "Codificación prefereida" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" msgstr "Codificación de carácteres preferida" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:450 msgid "Tab Label Size" msgstr "Tamaño da etiqueta de lingüetas" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:451 msgid "The desired tab label size" msgstr "Tamaño desexado da etiqueta das lingüetas" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lingüetas" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" msgstr "Cada unha das lingüetas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:468 msgid "Open new pages in" msgstr "Abrir as páxinas novas en" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:469 msgid "Where to open new pages" msgstr "Donde se van a abrir as páxinas novas" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" msgstr "Clic no botón do medio abre a selección" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "Cargar unha URL na selección empregando o botón de medio do rato" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:487 msgid "Open tabs in the background" msgstr "Abrir lingüetas en segundo plano" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lingüetas en segundo plano" +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + #: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Abrir «emerxentes» en lingüetas" @@ -1134,7 +1170,8 @@ msgstr "Recordar últimos ficheiros descargados" #: ../midori/midori-websettings.c:574 msgid "Whether the last downloaded files are saved" -msgstr "Recordar (ou non) a lista de descargas de ficheiros realizadas últimamente" +msgstr "" +"Recordar (ou non) a lista de descargas de ficheiros realizadas últimamente" #: ../midori/midori-websettings.c:584 msgid "HTTP Proxy" @@ -1152,23 +1189,43 @@ msgstr "Tamaño da caché" msgid "The allowed size of the cache" msgstr "Tamaño asignado á memoria caché" -#: ../midori/midori-webview.c:193 +#: ../midori/midori-webview.c:64 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-webview.c:65 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-webview.c:66 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" msgstr "URI da páxina actualmente cargada" -#: ../midori/midori-webview.c:202 +#: ../midori/midori-webview.c:234 msgid "The title of the currently loaded page" msgstr "Título da páxina actualmente cargada" -#: ../midori/midori-webview.c:578 +#: ../midori/midori-webview.c:244 +msgid "The current loading progress" +msgstr "" + +#: ../midori/midori-webview.c:253 +msgid "The current loading status" +msgstr "" + +#: ../midori/midori-webview.c:695 msgid "Open Link in New _Tab" msgstr "Abrir a ligazón nunha nova _lingüeta" -#: ../midori/midori-webview.c:606 +#: ../midori/midori-webview.c:723 msgid "Download Link with Download _Manager" msgstr "Descargar a ligazón con un _xestor de descargas" -#: ../midori/midori-webview.c:624 +#: ../midori/midori-webview.c:741 msgid "Open URL in New _Tab" msgstr "Abrir a URL nunha nova _lingüeta" @@ -1218,115 +1275,59 @@ msgid "Browsing" msgstr "Navegación" #. Page "Network" -#: ../midori/midori-preferences.c:403 -#: ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../midori/midori-preferences.c:420 -msgid "Privacy" -msgstr "Privacidade" - -#: ../midori/midori-preferences.c:421 -msgid "Web Cookies" -msgstr "«Cookies» de conexión" - -#: ../midori/midori-preferences.c:434 -#: ../midori/midori-preferences.c:444 -msgid "days" -msgstr "dias" - -#: ../midori/midori-webitem.c:70 -msgid "Name" -msgstr "Nome:" - -#: ../midori/midori-webitem.c:71 -msgid "The name of the web item" -msgstr "Nome do elemento web" - -#: ../midori/midori-webitem.c:79 -msgid "Description" -msgstr "Descrición" - -#: ../midori/midori-webitem.c:80 -msgid "The description of the web item" -msgstr "Descrición do elemento web" - -#: ../midori/midori-webitem.c:88 -msgid "URI" -msgstr "URI" - -#: ../midori/midori-webitem.c:89 -msgid "The URI of the web item" -msgstr "URI do elemento web" - -#: ../midori/midori-webitem.c:97 -msgid "Icon" -msgstr "Icona" - -#: ../midori/midori-webitem.c:98 -msgid "The icon of the web item" -msgstr "Icona do elemento web" - -#: ../midori/midori-webitem.c:106 -msgid "Token" -msgstr "«Marca»" - -#: ../midori/midori-webitem.c:107 -msgid "The token of the web item" -msgstr "«Marca» do elemento web" - -#: ../midori/midori-searchentry.c:75 +#: ../midori/midori-searchentry.c:74 msgid "Current Item" msgstr "Elemento actual" -#: ../midori/midori-searchentry.c:76 +#: ../midori/midori-searchentry.c:75 msgid "The currently selected item" msgstr "Elemento seleccionado actualmente" -#: ../midori/midori-searchentry.c:84 +#: ../midori/midori-searchentry.c:83 msgid "Dialog" msgstr "Dialogo" -#: ../midori/midori-searchentry.c:85 +#: ../midori/midori-searchentry.c:84 msgid "A dialog to manage search engines" msgstr "Caixa de dialogo para xestionar os motores de busca" -#: ../midori/midori-searchentry.c:152 +#: ../midori/midori-searchentry.c:151 msgid "Empty" msgstr "Baleiro" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Add search engine" msgstr "Engadir un motor de busca" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Edit search engine" msgstr "Editar o motor de busca" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchentry.c:550 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchentry.c:594 msgid "_Icon (name or file):" msgstr "_Icona (nome ou ficheiro):" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchentry.c:608 msgid "_Token:" msgstr "«_Marca»" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchentry.c:789 msgid "Manage search engines" msgstr "Xestionar os motores de busca" -#: ../midori/sokoke.c:60 -#: ../midori/sokoke.c:72 +#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 msgid "Could not run external program." msgstr "Non se puido executar o programa externo." @@ -1334,68 +1335,111 @@ msgstr "Non se puido executar o programa externo." msgid "Warning: You are using a superuser account!" msgstr "Aviso: Estas conectado como super usuario!" -#: ../midori/sokoke.c:522 -#: ../katze/katze-xbel.c:935 +#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 #, c-format msgid "Writing failed." msgstr "Fallou a escritura." -#: ../midori/gjs.c:89 +#: ../midori/gjs.c:512 msgid "An unknown error occured." msgstr "Atopouse un erro descoñecido:" -#: ../midori/gjs.c:309 -#: ../midori/gjs.c:399 +#: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" msgstr "%s non ten a propiedade «%s»" -#: ../midori/gjs.c:445 +#: ../midori/gjs.c:875 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s non pode ser asignado a %s.%s" -#: ../midori/gjs.c:455 +#: ../midori/gjs.c:885 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s non se pode acceder" -#: ../katze/katze-throbber.c:134 +#: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "" + +#: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" msgstr "Tamaño simbólico a usar para animacións" -#: ../katze/katze-throbber.c:143 +#: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" msgstr "O nome da icona contén cadros animados" -#: ../katze/katze-throbber.c:152 +#: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" msgstr "O «GdkPixbuf» conten cadros de animación" -#: ../katze/katze-throbber.c:161 +#: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "" + +#: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" msgstr "Animar (ou non) a icona" -#: ../katze/katze-throbber.c:170 +#: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" msgstr "Nome a usar para a icona non animada" -#: ../katze/katze-throbber.c:179 +#: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" msgstr "O «GdkPixbuf» vai ser usada como imaxe estática" -#: ../katze/katze-throbber.c:188 +#: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "" + +#: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" msgstr "ID da icona para ser usada como imaxe estática" -#: ../katze/katze-utils.c:137 -#: ../katze/katze-utils.c:318 +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propiedade «%s» non é válida para %s" -#: ../katze/katze-utils.c:159 -#: ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" msgstr "Escoller un ficheiro" @@ -1403,10 +1447,40 @@ msgstr "Escoller un ficheiro" msgid "Choose folder" msgstr "Escoller un cartafol" -#: ../katze/katze-xbel.c:708 -#: ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 -#: ../katze/katze-xbel.c:760 +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "Nome:" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "Icona" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "«Marca»" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "«Marca» do elemento" + +#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 #: ../katze/katze-xbel.c:789 msgid "Malformed document." msgstr "Documento defectuoso" diff --git a/po/hu.po b/po/hu.po index 79478656..6813e080 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-12 01:17+0200\n" +"POT-Creation-Date: 2008-08-26 00:20+0200\n" "PO-Revision-Date: 2008-05-10 19:33+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@ -20,1075 +20,1468 @@ msgstr "" msgid "Lightweight web browser" msgstr "Pehelysúlyú webböngésző" -#: ../midori.desktop.in.h:2 -msgid "Midori Web Browser" -msgstr "Midori webböngésző" +#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 +#: ../midori/main.c:419 ../midori/main.c:433 +msgid "Midori" +msgstr "Midori" #: ../midori.desktop.in.h:3 msgid "Web Browser" msgstr "Webböngésző" -#: ../src/main.c:48 -msgid "Bookmark" -msgstr "Könyvjelző" +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "" -#: ../src/main.c:49 -msgid "New Bookmark" -msgstr "Új könyvjelző" +#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +msgid "_Bookmarks" +msgstr "Könyv_jelzők" -#: ../src/main.c:50 -msgid "_Form Fill" -msgstr "Űrlap kitöltés" +#: ../midori/main.c:54 +msgid "_Add Bookmark" +msgstr "" -#: ../src/main.c:51 ../src/midori-websettings.c:131 -#: ../src/midori-websettings.c:407 -msgid "Homepage" -msgstr "Honlap" +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Konzol" -#: ../src/main.c:52 +#: ../midori/main.c:56 +msgid "_Extensions" +msgstr "K_iterjesztések" + +#: ../midori/main.c:57 +msgid "_History" +msgstr "_Történet" + +#: ../midori/main.c:58 +msgid "_Homepage" +msgstr "H_onlap" + +#: ../midori/main.c:59 +msgid "_Pageholder" +msgstr "_Mappa:" + +#: ../midori/main.c:60 +msgid "_Userscripts" +msgstr "" + +#: ../midori/main.c:61 +msgid "User_styles" +msgstr "" + +#: ../midori/main.c:62 msgid "New _Tab" msgstr "Új _lap" -#: ../src/main.c:53 +#: ../midori/main.c:63 +msgid "_Transfers" +msgstr "_Letöltések" + +#: ../midori/main.c:64 +msgid "_Closed Tabs and Windows" +msgstr "_Bezárt lapok és ablakok" + +#: ../midori/main.c:65 msgid "New _Window" msgstr "Új _ablak" -#: ../src/main.c:55 +#: ../midori/main.c:67 msgid "Select _All" msgstr "Mindent ki_jelöl" -#: ../src/main.c:58 +#: ../midori/main.c:70 msgid "_Fullscreen" msgstr "_Teljes képernyő" -#: ../src/main.c:59 +#: ../midori/main.c:71 msgid "_Leave Fullscreen" msgstr "Teljes képernyő elhagyása" -#: ../src/main.c:145 +#: ../midori/main.c:122 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "A beállítást nem sikerült betölteni. %s\n" -#: ../src/main.c:194 +#: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' érték érvénytelen ehhez: %s" -#: ../src/main.c:201 ../src/main.c:257 +#: ../midori/main.c:184 ../midori/main.c:253 #, c-format -msgid "Unhandled settings property '%s'" +msgid "Unhandled settings value '%s'" msgstr "" -#: ../src/main.c:271 ../src/main.c:305 -msgid "midori" -msgstr "midori" - -#: ../src/main.c:278 -msgid "Display program version" -msgstr "Program verzió kiírása" - -#: ../src/main.c:283 -msgid "[URL]" -msgstr "[URL]" - -#: ../src/main.c:307 -msgid "Debugging" -msgstr "Hibakeresés" - -#: ../src/main.c:308 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Véleményeket, javaslatokat és hibákat ide:" - -#: ../src/main.c:310 -msgid "Check for new versions at:" -msgstr "Új verziók keresése itt:" - -#: ../src/main.c:358 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "A könyvjelzőket nem tudtam betölteni. %s\n" - -#: ../src/main.c:372 -#, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "A folyamatot nem tudtam betölteni. %s\n" - -#: ../src/main.c:384 -#, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "A kukát nem tudtam betölteni. %s\n" - -#: ../src/main.c:394 -msgid "The following errors occured:" -msgstr "Az alábbi hibák történtek:" - -#: ../src/main.c:527 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "A keresőmotorokat nem tudtam elmenteni. %s" - -#: ../src/main.c:536 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "A könyvjelzőket nem tudtam elmenteni. %s" - -#: ../src/main.c:545 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "A kukát nem tudtam elmenteni. %s" - -#: ../src/main.c:557 +#: ../midori/main.c:368 #, c-format msgid "The session couldn't be saved. %s" msgstr "A folyamatot nem tudtam elmenteni. %s" -#: ../src/main.c:566 +#: ../midori/main.c:396 +msgid "Display program version" +msgstr "Program verzió kiírása" + +#: ../midori/main.c:413 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:417 +msgid "Unknown argument." +msgstr "" + +#: ../midori/main.c:419 +msgid "Failed to setup interface." +msgstr "" + +#: ../midori/main.c:434 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Véleményeket, javaslatokat és hibákat ide:" + +#: ../midori/main.c:436 +msgid "Check for new versions at:" +msgstr "Új verziók keresése itt:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:467 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:501 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "A könyvjelzőket nem tudtam betölteni. %s\n" + +#: ../midori/main.c:515 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "A folyamatot nem tudtam betölteni. %s\n" + +#: ../midori/main.c:527 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "A kukát nem tudtam betölteni. %s\n" + +#: ../midori/main.c:539 +msgid "The following errors occured:" +msgstr "Az alábbi hibák történtek:" + +#: ../midori/main.c:688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "A keresőmotorokat nem tudtam elmenteni. %s" + +#: ../midori/main.c:698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "A könyvjelzőket nem tudtam elmenteni. %s" + +#: ../midori/main.c:707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "A kukát nem tudtam elmenteni. %s" + +#: ../midori/main.c:715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A beállítást nem tudtam elmenteni. %s" -#: ../src/midori-browser.c:193 ../src/midori-browser.c:2095 -#: ../src/midori-browser.c:2101 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 +msgid "Settings" +msgstr "Beállítások" + +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 +msgid "The associated settings" +msgstr "Társított beállítások" + +#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 +msgid "Trash" +msgstr "Kuka" + +#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "A legutóbb bezárt lapokat és ablakokat gyűjtő kuka." + +#: ../midori/midori-app.c:141 +msgid "Browser" +msgstr "Böngésző" + +#: ../midori/midori-app.c:142 +msgid "The current browser" +msgstr "" + +#: ../midori/midori-app.c:150 +msgid "Browser Count" +msgstr "" + +#: ../midori/midori-app.c:151 +msgid "The current number of browsers" +msgstr "" + +#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-searchentry.c:65 +msgid "Search Engines" +msgstr "" + +#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 +msgid "The list of search engines" +msgstr "" + +#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Semmi" + +#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 +msgid "Extensions" +msgstr "Kiterjesztések" + +#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 +msgid "Userscripts" +msgstr "" + +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 +msgid "Userstyles" +msgstr "" + +#: ../midori/midori-addons.c:113 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:114 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:122 +msgid "Kind" +msgstr "" + +#: ../midori/midori-addons.c:123 +msgid "The kind of addons" +msgstr "" + +#: ../midori/midori-browser.c:192 +msgid "Source" +msgstr "" + +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2782 msgid "Reload the current page" msgstr "Oldal újratöltése" -#: ../src/midori-browser.c:201 ../src/midori-browser.c:2098 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 msgid "Stop loading the current page" msgstr "Betöltés leállítása" -#: ../src/midori-browser.c:264 +#: ../midori/midori-browser.c:349 #, c-format msgid "%d%% loaded" msgstr "%d%% betöltve" -#: ../src/midori-browser.c:611 -msgid "Menubar" -msgstr "Menüsáv" - -#: ../src/midori-browser.c:612 -msgid "The menubar" -msgstr "A menüsáv" - -#: ../src/midori-browser.c:625 ../src/midori-preferences.c:317 -msgid "Navigationbar" -msgstr "Címsáv" - -#: ../src/midori-browser.c:626 -msgid "The navigationbar" -msgstr "A címsáv" - -#: ../src/midori-browser.c:639 -msgid "Tab" -msgstr "Lap" - -#: ../src/midori-browser.c:640 -msgid "The current tab" -msgstr "Jelenlegi lap" - -#: ../src/midori-browser.c:653 -msgid "Statusbar" -msgstr "Állapotsáv" - -#: ../src/midori-browser.c:654 -msgid "The statusbar" -msgstr "Az állapotsáv" - -#: ../src/midori-browser.c:670 -msgid "Settings" -msgstr "Beállítások" - -#: ../src/midori-browser.c:671 -msgid "The associated settings" -msgstr "Társított beállítások" - -#: ../src/midori-browser.c:690 -msgid "Statusbar Text" -msgstr "Állapotsáv szöveg" - -#: ../src/midori-browser.c:691 ../src/midori-webview.c:244 -msgid "The text that is displayed in the statusbar" -msgstr "Az állapotsávra írt szöveg" - -#: ../src/midori-browser.c:709 -msgid "Trash" -msgstr "Kuka" - -#: ../src/midori-browser.c:710 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "A legutóbb bezárt lapokat és ablakokat gyűjtő kuka." - -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:573 msgid "New bookmark" msgstr "Új könyvjelző" -#: ../src/midori-browser.c:1294 +#: ../midori/midori-browser.c:573 msgid "Edit bookmark" msgstr "Könyvjelző szerkesztése" -#: ../src/midori-browser.c:1311 +#: ../midori/midori-browser.c:597 msgid "_Title:" msgstr "_Cím:" -#: ../src/midori-browser.c:1327 ../src/webSearch.c:233 +#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 msgid "_Description:" msgstr "_Leírás:" -#: ../src/midori-browser.c:1346 ../src/webSearch.c:247 +#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 msgid "_URL:" msgstr "_URL:" -#: ../src/midori-browser.c:1364 +#: ../midori/midori-browser.c:646 msgid "_Folder:" msgstr "_Mappa:" -#: ../src/midori-browser.c:1368 +#: ../midori/midori-browser.c:650 msgid "Root" msgstr "Gyökér" -#: ../src/midori-browser.c:1591 -msgid "Separator" -msgstr "Elválasztó" - -#: ../src/midori-browser.c:1780 -msgid "A lightweight web browser." -msgstr "Egy pehelysúlyú webböngésző" - -#: ../src/midori-browser.c:1788 -msgid "translator-credits" -msgstr "SZERVÁC Attila " - -#: ../src/midori-browser.c:2015 -msgid "_File" -msgstr "_Fájl" - -#: ../src/midori-browser.c:2018 -msgid "Open a new window" -msgstr "Új ablak megnyitása" - -#: ../src/midori-browser.c:2021 -msgid "Open a new tab" -msgstr "Új lap megnyitása" - -#: ../src/midori-browser.c:2024 -msgid "Open a file" -msgstr "Fájl megnyitása" - -#: ../src/midori-browser.c:2027 -msgid "Save to a file" -msgstr "Mentés fájlba" - -#: ../src/midori-browser.c:2029 -msgid "_Close Tab" -msgstr "_Lap bezárása" - -#: ../src/midori-browser.c:2030 -msgid "Close the current tab" -msgstr "A jelenlegi lap bezárása" - -#: ../src/midori-browser.c:2032 -msgid "C_lose Window" -msgstr "_Ablak bezárása" - -#: ../src/midori-browser.c:2033 -msgid "Close this window" -msgstr "A jelenlegi ablak bezárása" - -#: ../src/midori-browser.c:2035 -msgid "Pa_ge Setup" -msgstr "_Oldal beállítása" - -#: ../src/midori-browser.c:2045 -msgid "Quit the application" -msgstr "Kilépés a programból" - -#: ../src/midori-browser.c:2047 -msgid "_Edit" -msgstr "Sz_erkesztés" - -#: ../src/midori-browser.c:2050 -msgid "Undo the last modification" -msgstr "Utolsó módosítás visszavonása" - -#: ../src/midori-browser.c:2053 -msgid "Redo the last modification" -msgstr "Utolsó módosítás ismétlése" - -#: ../src/midori-browser.c:2059 ../src/midori-browser.c:2062 -msgid "Copy the selected text" -msgstr "A kijelölt szöveg másolása" - -#: ../src/midori-browser.c:2065 -msgid "Paste text from the clipboard" -msgstr "Szöveg beillesztése a vágólapról" - -#: ../src/midori-browser.c:2068 -msgid "Delete the selected text" -msgstr "A kijelölt szöveg törlése" - -#: ../src/midori-browser.c:2071 -msgid "Select all text" -msgstr "Minden szöveg kijelölése" - -#: ../src/midori-browser.c:2079 -msgid "Find _Next" -msgstr "_Következő" - -#: ../src/midori-browser.c:2082 -msgid "Find _Previous" -msgstr "_Előző" - -#: ../src/midori-browser.c:2085 -msgid "_Quick Find" -msgstr "_Gyors keresés" - -#: ../src/midori-browser.c:2091 -msgid "_View" -msgstr "_Nézet" - -#: ../src/midori-browser.c:2092 -msgid "_Toolbars" -msgstr "Eszköz_sávok" - -#: ../src/midori-browser.c:2112 -msgid "View Source" -msgstr "Forrás megtekintése" - -#: ../src/midori-browser.c:2115 -msgid "View Selection Source" -msgstr "Kijelölés forrásnak megtekintése" - -#: ../src/midori-browser.c:2119 -msgid "Toggle fullscreen view" -msgstr "Teljes képernyős váltás" - -#: ../src/midori-browser.c:2121 -msgid "_Go" -msgstr "_Ugrás" - -#: ../src/midori-browser.c:2132 -msgid "Location..." -msgstr "Hely..." - -#: ../src/midori-browser.c:2135 -msgid "Web Search..." -msgstr "Web-keresés..." - -#: ../src/midori-browser.c:2138 -msgid "Open in Page_holder..." -msgstr "" - -#: ../src/midori-browser.c:2141 -msgid "Closed Tabs and Windows" -msgstr "Bezárt lapok és ablakok" - -#: ../src/midori-browser.c:2142 -msgid "Reopen a previously closed tab or window" -msgstr "Egy korábban bezárt lap vagy ablak megnyitása" - -#: ../src/midori-browser.c:2144 -msgid "Empty Trash" -msgstr "Üres kuka" - -#: ../src/midori-browser.c:2147 -msgid "Undo Close Tab" -msgstr "Lap bezárásának visszavonása" - -#: ../src/midori-browser.c:2150 -msgid "_Bookmarks" -msgstr "Könyv_jelzők" - -#: ../src/midori-browser.c:2155 -msgid "_Manage Bookmarks" -msgstr "Könyvjelzők _kezelése" - -#: ../src/midori-browser.c:2161 -msgid "Open in New _Tab" -msgstr "Megnyitás új _lapon" - -#: ../src/midori-browser.c:2164 -msgid "Open in New _Window" -msgstr "Megnyitás új _ablakban" - -#: ../src/midori-browser.c:2173 -msgid "_Tools" -msgstr "Esz_közök" - -#: ../src/midori-browser.c:2175 -msgid "_Manage Search Engines" -msgstr "Kereső-motorok kezelése" - -#: ../src/midori-browser.c:2176 -msgid "Add, edit and remove search engines..." -msgstr "Kereső-motorok hozzáadása, szerkesztése és eltávolítása..." - -#: ../src/midori-browser.c:2179 -msgid "_Window" -msgstr "_Ablak" - -#: ../src/midori-browser.c:2181 -msgid "_Previous Tab" -msgstr "_Előző lap" - -#: ../src/midori-browser.c:2184 -msgid "_Next Tab" -msgstr "_Következő lap" - -#: ../src/midori-browser.c:2187 -msgid "Tab _Overview" -msgstr "Lapok át_tekintése" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../src/midori-browser.c:2190 -msgid "_Help" -msgstr "_Súgó" - -#: ../src/midori-browser.c:2192 -msgid "_Contents" -msgstr "_Tartalom" - -#: ../src/midori-browser.c:2202 -msgid "P_rivate Browsing" -msgstr "_Személyes böngészés" - -#: ../src/midori-browser.c:2206 -msgid "_Work Offline" -msgstr "_Kapcsolat nélküli munka" - -#: ../src/midori-browser.c:2211 -msgid "_Navigationbar" -msgstr "_Címsáv" - -#: ../src/midori-browser.c:2215 -msgid "Side_panel" -msgstr "Oldal_panel" - -#: ../src/midori-browser.c:2219 -msgid "_Bookmarkbar" -msgstr "_Könyvjelzősáv" - -#: ../src/midori-browser.c:2223 -msgid "_Transferbar" -msgstr "_Letöltési sáv" - -#: ../src/midori-browser.c:2227 -msgid "_Statusbar" -msgstr "_Állapotsáv" - -#: ../src/midori-browser.c:2681 -msgid "Bookmarks" -msgstr "Könyvjelzők" - -#. TODO: We need something like "use current website" -#: ../src/midori-browser.c:2688 ../src/midori-preferences.c:251 -msgid "Transfers" -msgstr "Letöltések" - -#: ../src/midori-browser.c:2697 -msgid "Console" -msgstr "Konzol" - -#: ../src/midori-browser.c:2704 ../src/midori-preferences.c:380 -msgid "History" -msgstr "Történet" - -#: ../src/midori-browser.c:2713 -msgid "Pageholder" -msgstr "" - -#: ../src/midori-browser.c:2722 -msgid "Userscripts" -msgstr "" - -#: ../src/midori-browser.c:2748 -msgid "_Inline find:" -msgstr "" - -#: ../src/midori-browser.c:2774 -msgid "Match Case" -msgstr "Nagybetű-érzékeny" - -#: ../src/midori-browser.c:2791 -msgid "Close Findbar" -msgstr "Keresősáv bezárása" - -#: ../src/midori-browser.c:2815 -msgid "Extensions" -msgstr "Kiterjesztések" - -#: ../src/midori-browser.c:2973 ../src/midori-webview.c:573 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Ismeretlen '%s' beállítás" - -#: ../src/midori-browser.c:3278 +#: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." msgstr "Ismeretlen '%s' művelet" -#: ../src/midori-panel.c:147 +#: ../midori/midori-browser.c:1228 +msgid "Menubar" +msgstr "Menüsáv" + +#: ../midori/midori-browser.c:1229 +msgid "The menubar" +msgstr "A menüsáv" + +#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 +msgid "Navigationbar" +msgstr "Címsáv" + +#: ../midori/midori-browser.c:1238 +msgid "The navigationbar" +msgstr "A címsáv" + +#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +msgid "URI" +msgstr "" + +#: ../midori/midori-browser.c:1247 +msgid "The current URI" +msgstr "" + +#: ../midori/midori-browser.c:1255 +msgid "Tab" +msgstr "Lap" + +#: ../midori/midori-browser.c:1256 +msgid "The current tab" +msgstr "Jelenlegi lap" + +#: ../midori/midori-browser.c:1264 +msgid "Statusbar" +msgstr "Állapotsáv" + +#: ../midori/midori-browser.c:1265 +msgid "The statusbar" +msgstr "Az állapotsáv" + +#: ../midori/midori-browser.c:1301 +msgid "Statusbar Text" +msgstr "Állapotsáv szöveg" + +#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 +msgid "The text that is displayed in the statusbar" +msgstr "Az állapotsávra írt szöveg" + +#: ../midori/midori-browser.c:1335 +msgid "The list of search engines to be used for web search" +msgstr "" + +#: ../midori/midori-browser.c:2313 +msgid "Separator" +msgstr "Elválasztó" + +#: ../midori/midori-browser.c:2478 +msgid "A lightweight web browser." +msgstr "Egy pehelysúlyú webböngésző" + +#: ../midori/midori-browser.c:2486 +msgid "translator-credits" +msgstr "SZERVÁC Attila " + +#: ../midori/midori-browser.c:2699 +msgid "_File" +msgstr "_Fájl" + +#: ../midori/midori-browser.c:2702 +msgid "Open a new window" +msgstr "Új ablak megnyitása" + +#: ../midori/midori-browser.c:2705 +msgid "Open a new tab" +msgstr "Új lap megnyitása" + +#: ../midori/midori-browser.c:2708 +msgid "Open a file" +msgstr "Fájl megnyitása" + +#: ../midori/midori-browser.c:2711 +msgid "Save to a file" +msgstr "Mentés fájlba" + +#: ../midori/midori-browser.c:2713 +msgid "_Close Tab" +msgstr "_Lap bezárása" + +#: ../midori/midori-browser.c:2714 +msgid "Close the current tab" +msgstr "A jelenlegi lap bezárása" + +#: ../midori/midori-browser.c:2716 +msgid "C_lose Window" +msgstr "_Ablak bezárása" + +#: ../midori/midori-browser.c:2717 +msgid "Close this window" +msgstr "A jelenlegi ablak bezárása" + +#: ../midori/midori-browser.c:2719 +msgid "Pa_ge Setup" +msgstr "_Oldal beállítása" + +#: ../midori/midori-browser.c:2723 +msgid "Show a preview of the printed page" +msgstr "" + +#: ../midori/midori-browser.c:2726 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:2729 +msgid "Quit the application" +msgstr "Kilépés a programból" + +#: ../midori/midori-browser.c:2731 +msgid "_Edit" +msgstr "Sz_erkesztés" + +#: ../midori/midori-browser.c:2734 +msgid "Undo the last modification" +msgstr "Utolsó módosítás visszavonása" + +#: ../midori/midori-browser.c:2737 +msgid "Redo the last modification" +msgstr "Utolsó módosítás ismétlése" + +#: ../midori/midori-browser.c:2740 +msgid "Cut the selected text" +msgstr "" + +#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 +msgid "Copy the selected text" +msgstr "A kijelölt szöveg másolása" + +#: ../midori/midori-browser.c:2749 +msgid "Paste text from the clipboard" +msgstr "Szöveg beillesztése a vágólapról" + +#: ../midori/midori-browser.c:2752 +msgid "Delete the selected text" +msgstr "A kijelölt szöveg törlése" + +#: ../midori/midori-browser.c:2755 +msgid "Select all text" +msgstr "Minden szöveg kijelölése" + +#: ../midori/midori-browser.c:2758 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:2760 +msgid "Find _Next" +msgstr "_Következő" + +#: ../midori/midori-browser.c:2761 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2763 +msgid "Find _Previous" +msgstr "_Előző" + +#: ../midori/midori-browser.c:2764 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2766 +msgid "_Quick Find" +msgstr "_Gyors keresés" + +#: ../midori/midori-browser.c:2767 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:2770 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:2772 +msgid "_View" +msgstr "_Nézet" + +#: ../midori/midori-browser.c:2773 +msgid "_Toolbars" +msgstr "Eszköz_sávok" + +#: ../midori/midori-browser.c:2785 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2788 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2791 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:2793 +msgid "View _Source" +msgstr "" + +#: ../midori/midori-browser.c:2794 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:2796 +msgid "View Selection Source" +msgstr "Kijelölés forrásnak megtekintése" + +#: ../midori/midori-browser.c:2797 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:2800 +msgid "Toggle fullscreen view" +msgstr "Teljes képernyős váltás" + +#: ../midori/midori-browser.c:2802 +msgid "_Go" +msgstr "_Ugrás" + +#: ../midori/midori-browser.c:2805 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:2808 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:2811 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:2813 +msgid "_Web Search..." +msgstr "_Web-keresés..." + +#: ../midori/midori-browser.c:2814 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:2816 +msgid "Open in Page_holder..." +msgstr "" + +#: ../midori/midori-browser.c:2817 +msgid "Open the current page in the pageholder" +msgstr "" + +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2821 +msgid "Reopen a previously closed tab or window" +msgstr "Egy korábban bezárt lap vagy ablak megnyitása" + +#: ../midori/midori-browser.c:2823 +msgid "Empty Trash" +msgstr "Üres kuka" + +#: ../midori/midori-browser.c:2824 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:2826 +msgid "Undo Close Tab" +msgstr "Lap bezárásának visszavonása" + +#: ../midori/midori-browser.c:2827 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:2832 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2834 +msgid "_Manage Bookmarks" +msgstr "Könyvjelzők _kezelése" + +#: ../midori/midori-browser.c:2835 +msgid "Add, edit and remove bookmarks..." +msgstr "" + +#: ../midori/midori-browser.c:2838 +msgid "Open the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2840 +msgid "Open in New _Tab" +msgstr "Megnyitás új _lapon" + +#: ../midori/midori-browser.c:2841 +msgid "Open the selected bookmark in a new tab" +msgstr "" + +#: ../midori/midori-browser.c:2843 +msgid "Open in New _Window" +msgstr "Megnyitás új _ablakban" + +#: ../midori/midori-browser.c:2844 +msgid "Open the selected bookmark in a new window" +msgstr "" + +#: ../midori/midori-browser.c:2847 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2850 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2852 +msgid "_Tools" +msgstr "Esz_közök" + +#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 +msgid "_Manage Search Engines" +msgstr "Kereső-motorok kezelése" + +#: ../midori/midori-browser.c:2855 +msgid "Add, edit and remove search engines..." +msgstr "Kereső-motorok hozzáadása, szerkesztése és eltávolítása..." + +#: ../midori/midori-browser.c:2858 +msgid "_Window" +msgstr "_Ablak" + +#: ../midori/midori-browser.c:2860 +msgid "_Previous Tab" +msgstr "_Előző lap" + +#: ../midori/midori-browser.c:2861 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:2863 +msgid "_Next Tab" +msgstr "_Következő lap" + +#: ../midori/midori-browser.c:2864 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:2866 +msgid "Tab _Overview" +msgstr "Lapok át_tekintése" + +#: ../midori/midori-browser.c:2867 +msgid "Show an overview of all open tabs" +msgstr "" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../midori/midori-browser.c:2869 +msgid "_Help" +msgstr "_Súgó" + +#: ../midori/midori-browser.c:2871 +msgid "_Contents" +msgstr "_Tartalom" + +#: ../midori/midori-browser.c:2872 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:2875 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:2881 +msgid "P_rivate Browsing" +msgstr "_Személyes böngészés" + +#: ../midori/midori-browser.c:2882 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:2885 +msgid "_Work Offline" +msgstr "_Kapcsolat nélküli munka" + +#: ../midori/midori-browser.c:2886 +msgid "Work without a network connection" +msgstr "" + +#: ../midori/midori-browser.c:2890 +msgid "_Navigationbar" +msgstr "_Címsáv" + +#: ../midori/midori-browser.c:2891 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:2894 +msgid "Side_panel" +msgstr "Oldal_panel" + +#: ../midori/midori-browser.c:2895 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:2898 +msgid "_Bookmarkbar" +msgstr "_Könyvjelzősáv" + +#: ../midori/midori-browser.c:2899 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:2902 +msgid "_Transferbar" +msgstr "_Letöltési sáv" + +#: ../midori/midori-browser.c:2903 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:2906 +msgid "_Statusbar" +msgstr "_Állapotsáv" + +#: ../midori/midori-browser.c:2907 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:3228 +msgid "_Location..." +msgstr "_Hely..." + +#: ../midori/midori-browser.c:3230 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3453 +msgid "Bookmarks" +msgstr "Könyvjelzők" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 +msgid "Transfers" +msgstr "Letöltések" + +#: ../midori/midori-browser.c:3469 +msgid "Console" +msgstr "Konzol" + +#: ../midori/midori-browser.c:3476 +msgid "History" +msgstr "Történet" + +#: ../midori/midori-browser.c:3485 +msgid "Pageholder" +msgstr "" + +#: ../midori/midori-browser.c:3534 +msgid "_Inline find:" +msgstr "" + +#: ../midori/midori-browser.c:3569 +msgid "Match Case" +msgstr "Nagybetű-érzékeny" + +#: ../midori/midori-browser.c:3586 +msgid "Close Findbar" +msgstr "Keresősáv bezárása" + +#: ../midori/midori-browser.c:3817 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Ismeretlen '%s' beállítás" + +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "" + +#: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Panelek körüli árnyékok megjelenése" -#: ../src/midori-panel.c:157 +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Menü" + +#: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Panel-elemek menüje" -#: ../src/midori-panel.c:166 +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "" + +#: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "" -#: ../src/midori-panel.c:212 ../src/midori-panel.c:213 +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 msgid "Close panel" msgstr "Panel bezárása" -#: ../src/midori-panel.c:391 -msgid "Untitled" -msgstr "Névtelen" - -#: ../src/midori-trash.c:97 -msgid "The maximum number of items" -msgstr "Az elemek maximális száma" - -#: ../src/midori-websettings.c:130 +#: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Üres lap" -#: ../src/midori-websettings.c:132 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 +msgid "Homepage" +msgstr "Honlap" + +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "Legutóbb megnyitott lapok" -#: ../src/midori-websettings.c:147 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Kínai (BIG5)" -#: ../src/midori-websettings.c:148 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japán (SHIFT_JIS)" -#: ../src/midori-websettings.c:149 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Orosz (KOI8-r)" -#: ../src/midori-websettings.c:150 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../src/midori-websettings.c:151 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Nyugati (ISO-8859-1)" -#: ../src/midori-websettings.c:152 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "Egyéni..." -#: ../src/midori-websettings.c:167 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Új lap" -#: ../src/midori-websettings.c:168 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Új ablak" -#: ../src/midori-websettings.c:169 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Jelenlegi lap" -#: ../src/midori-websettings.c:184 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Alap" -#: ../src/midori-websettings.c:185 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Ikonok" -#: ../src/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 msgid "Text" msgstr "Szöveg" -#: ../src/midori-websettings.c:187 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Mindkettő" -#: ../src/midori-websettings.c:188 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Mindkettő vízszintesen" -#: ../src/midori-websettings.c:203 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Minden süti" -#: ../src/midori-websettings.c:204 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Munkafolyamat sütik" -#: ../src/midori-websettings.c:205 -msgid "None" -msgstr "Semmi" - -#: ../src/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "Legutóbbi ablak méretének megjegyzése" -#: ../src/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "Whether to save the last window size" msgstr "Mentésre kerüljön-e a legutóbbi ablak mérete" -#: ../src/midori-websettings.c:256 +#: ../midori/midori-websettings.c:251 msgid "Last window width" msgstr "Legutóbbi ablak szélessége" -#: ../src/midori-websettings.c:257 +#: ../midori/midori-websettings.c:252 msgid "The last saved window width" msgstr "A legutóbb elmentett ablak-szélesség" -#: ../src/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Last window height" msgstr "Legutóbbi ablak magassága" -#: ../src/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "The last saved window height" msgstr "A legutóbb mentett ablak-magasság" -#: ../src/midori-websettings.c:274 +#: ../midori/midori-websettings.c:269 msgid "Last panel position" msgstr "A panel helyzete" -#: ../src/midori-websettings.c:275 +#: ../midori/midori-websettings.c:270 msgid "The last saved panel position" msgstr "A legutóbb mentett panel-helyzet" -#: ../src/midori-websettings.c:283 +#: ../midori/midori-websettings.c:278 msgid "Last panel page" msgstr "Legutóbbi panel-lap" -#: ../src/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "The last saved panel page" msgstr "A legutóbb mentett panel-lap" -#: ../src/midori-websettings.c:292 +#: ../midori/midori-websettings.c:287 msgid "Last Web search" msgstr "Legutóbbi web-keresés" -#: ../src/midori-websettings.c:293 +#: ../midori/midori-websettings.c:288 msgid "The last saved Web search" msgstr "A legutóbb mentett web-keresés" -#: ../src/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "Last pageholder URI" msgstr "" -#: ../src/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "The URI last opened in the pageholder" msgstr "" -#: ../src/midori-websettings.c:312 +#: ../midori/midori-websettings.c:307 msgid "Show Navigationbar" msgstr "Címsáv mutatása" -#: ../src/midori-websettings.c:313 +#: ../midori/midori-websettings.c:308 msgid "Whether to show the navigationbar" msgstr "Megjelenjen-e a címsáv" -#: ../src/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Show Bookmarkbar" msgstr "Könyvjelzősáv mutatása" -#: ../src/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Whether to show the bookmarkbar" msgstr "Megjelenjen-e a könyvjelzősáv" -#: ../src/midori-websettings.c:330 +#: ../midori/midori-websettings.c:325 msgid "Show Panel" msgstr "Panel mutatása" -#: ../src/midori-websettings.c:331 +#: ../midori/midori-websettings.c:326 msgid "Whether to show the panel" msgstr "Megjelenjen-e a panel" -#: ../src/midori-websettings.c:339 +#: ../midori/midori-websettings.c:334 msgid "Show Statusbar" msgstr "Állapotsáv mutatása" -#: ../src/midori-websettings.c:340 +#: ../midori/midori-websettings.c:335 msgid "Whether to show the statusbar" msgstr "Megjelenjen-e az állapotsáv" -#: ../src/midori-websettings.c:349 +#: ../midori/midori-websettings.c:344 msgid "Toolbar Style" msgstr "Eszközsáv stílus" -#: ../src/midori-websettings.c:350 +#: ../midori/midori-websettings.c:345 msgid "The style of the toolbar" msgstr "Az eszközsáv stílusa" -#: ../src/midori-websettings.c:359 -msgid "Small toolbar" -msgstr "Kis eszközsáv" - -#: ../src/midori-websettings.c:360 -msgid "Use small toolbar icons" -msgstr "Kis eszközsáv-ikonok használata" - -#: ../src/midori-websettings.c:368 +#: ../midori/midori-websettings.c:354 msgid "Show New Tab" msgstr "Új lap mutatása" -#: ../src/midori-websettings.c:369 +#: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" msgstr "Új lap gomb mutatása az eszközsávon" -#: ../src/midori-websettings.c:377 +#: ../midori/midori-websettings.c:363 +msgid "Show Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:364 +msgid "Show the Homepage button in the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:372 msgid "Show Web search" msgstr "Web-keresés mutatása" -#: ../src/midori-websettings.c:378 +#: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" msgstr "A Web-kereső mező mutatása az eszközsávon" -#: ../src/midori-websettings.c:386 +#: ../midori/midori-websettings.c:381 msgid "Show Trash" msgstr "Kuka mutatása" -#: ../src/midori-websettings.c:387 +#: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" msgstr "A kuka gomb mutatása az eszközsávon" -#: ../src/midori-websettings.c:397 +#: ../midori/midori-websettings.c:392 msgid "Load on Startup" msgstr "Betöltés induláskor" -#: ../src/midori-websettings.c:398 +#: ../midori/midori-websettings.c:393 msgid "What to load on startup" msgstr "Az induláskor betöltendő" -#: ../src/midori-websettings.c:408 +#: ../midori/midori-websettings.c:403 msgid "The homepage" msgstr "A honlap" -#: ../src/midori-websettings.c:416 +#: ../midori/midori-websettings.c:411 msgid "Download Folder" msgstr "Letöltő mappa" -#: ../src/midori-websettings.c:417 +#: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "A fájlok alapértelmezett letöltési mappája" -#: ../src/midori-websettings.c:425 -msgid "Show Download Notification" -msgstr "Letöltés-értesítő mutatása" +#: ../midori/midori-websettings.c:420 +msgid "Download Manager" +msgstr "" -#: ../src/midori-websettings.c:426 -msgid "Show a notification window for finished downloads" -msgstr "Egy értesítő ablakot mutat az elvégzett letöltésekről" +#: ../midori/midori-websettings.c:421 +msgid "An external download manager" +msgstr "" -#: ../src/midori-websettings.c:434 +#: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "A hely-beviteli Kereső" -#: ../src/midori-websettings.c:435 +#: ../midori/midori-websettings.c:430 msgid "The search to perform inside the location entry" msgstr "A keresés a hely-beviteli mezőben" -#: ../src/midori-websettings.c:443 +#: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" msgstr "Alapértelmezett kódolás" -#: ../src/midori-websettings.c:444 +#: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" msgstr "Az alapértelmezett karakter-kódolás" -#: ../src/midori-websettings.c:455 +#: ../midori/midori-websettings.c:450 msgid "Tab Label Size" msgstr "A címke mérete" -#: ../src/midori-websettings.c:456 +#: ../midori/midori-websettings.c:451 msgid "The desired tab label size" msgstr "A lapok címkéinek kívánt mérete" -#: ../src/midori-websettings.c:464 +#: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" msgstr "Bezáró gombok a lapokon" -#: ../src/midori-websettings.c:465 +#: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" msgstr "Legyenek-e bezáró gombok a lapokon" -#: ../src/midori-websettings.c:473 +#: ../midori/midori-websettings.c:468 msgid "Open new pages in" msgstr "Új lapok megnyitása itt:" -#: ../src/midori-websettings.c:474 +#: ../midori/midori-websettings.c:469 msgid "Where to open new pages" msgstr "Hol nyíljanak az új lapok" -#: ../src/midori-websettings.c:483 +#: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" msgstr "Középső gombra megnyitás" -#: ../src/midori-websettings.c:484 +#: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "URL betöltése a kijelölésből középső gombbal" -#: ../src/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Open tabs in the background" msgstr "Lapok megnyitása a háttérben" -#: ../src/midori-websettings.c:493 +#: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" msgstr "Az új lapok a háttérben nyíljanak-e" -#: ../src/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Felugrók megnyitása lapokon" -#: ../src/midori-websettings.c:502 +#: ../midori/midori-websettings.c:506 msgid "Whether to open popup windows in tabs" msgstr "Megnyíljanak-e a felugró ablakok lapokon" -#: ../src/midori-websettings.c:512 +#: ../midori/midori-websettings.c:516 msgid "Accept cookies" msgstr "Sütik fogadása" -#: ../src/midori-websettings.c:513 +#: ../midori/midori-websettings.c:517 msgid "What type of cookies to accept" msgstr "Milyen sütiket fogadjunk el" -#: ../src/midori-websettings.c:522 +#: ../midori/midori-websettings.c:526 msgid "Original cookies only" msgstr "Csak eredeti sütiket" -#: ../src/midori-websettings.c:523 +#: ../midori/midori-websettings.c:527 msgid "Accept cookies from the original website only" msgstr "Csak az eredeti lapról való sütiket fogadjuk el" -#: ../src/midori-websettings.c:531 +#: ../midori/midori-websettings.c:535 msgid "Maximum cookie age" msgstr "Sütik maximális kora" -#: ../src/midori-websettings.c:532 +#: ../midori/midori-websettings.c:536 msgid "The maximum number of days to save cookies for" msgstr "A napok száma, melyre a sütiket legfeljebb elmentsük" -#: ../src/midori-websettings.c:542 +#: ../midori/midori-websettings.c:546 msgid "Remember last visited pages" msgstr "Legutóbbi lapok megjegyzése" -#: ../src/midori-websettings.c:543 +#: ../midori/midori-websettings.c:547 msgid "Whether the last visited pages are saved" msgstr "Mentsük-e a legutóbb meglátogatott lapokat" -#: ../src/midori-websettings.c:551 +#: ../midori/midori-websettings.c:555 msgid "Maximum history age" msgstr "Történet maximális kora" -#: ../src/midori-websettings.c:552 +#: ../midori/midori-websettings.c:556 msgid "The maximum number of days to save the history for" msgstr "A legtöbb nap, melyre a történetet elmentsük" -#: ../src/midori-websettings.c:560 +#: ../midori/midori-websettings.c:564 msgid "Remember last form inputs" msgstr "Űrlapok megjegyzése" -#: ../src/midori-websettings.c:561 +#: ../midori/midori-websettings.c:565 msgid "Whether the last form inputs are saved" msgstr "Mentsük-e az űrlapokba bevitt adatokat" -#: ../src/midori-websettings.c:569 +#: ../midori/midori-websettings.c:573 msgid "Remember last downloaded files" msgstr "Legutóbbi letöltések megjegyzése" -#: ../src/midori-websettings.c:570 +#: ../midori/midori-websettings.c:574 msgid "Whether the last downloaded files are saved" msgstr "Jegyezzük-e a legutóbbi letöltéseket" -#: ../src/midori-websettings.c:580 +#: ../midori/midori-websettings.c:584 msgid "HTTP Proxy" msgstr "HTTP Proxy" -#: ../src/midori-websettings.c:581 +#: ../midori/midori-websettings.c:585 msgid "The proxy used for HTTP connections" msgstr "A HTTP-kapcsolatok proxy kiszolgálója" -#: ../src/midori-websettings.c:589 +#: ../midori/midori-websettings.c:593 msgid "Cache size" msgstr "Gyorstár mérete" -#: ../src/midori-websettings.c:590 +#: ../midori/midori-websettings.c:594 msgid "The allowed size of the cache" msgstr "Az engedélyezett gyorstár-méret" -#: ../src/midori-webview.c:217 -msgid "The icon of the currently loaded page" -msgstr "A jelenlegi lap ikonja" +#: ../midori/midori-webview.c:64 +msgid "Load Provisional" +msgstr "" -#: ../src/midori-webview.c:226 +#: ../midori/midori-webview.c:65 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-webview.c:66 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" msgstr "A jelenlegi lap URI-ja" -#: ../src/midori-webview.c:235 +#: ../midori/midori-webview.c:234 msgid "The title of the currently loaded page" msgstr "A jelenlegi lap címe" -#: ../src/midori-webview.c:471 +#: ../midori/midori-webview.c:244 +msgid "The current loading progress" +msgstr "" + +#: ../midori/midori-webview.c:253 +msgid "The current loading status" +msgstr "" + +#: ../midori/midori-webview.c:695 msgid "Open Link in New _Tab" msgstr "Hivatkozás megnyitása új _lapon" -#: ../src/midori-webview.c:494 +#: ../midori/midori-webview.c:723 +msgid "Download Link with Download _Manager" +msgstr "" + +#: ../midori/midori-webview.c:741 msgid "Open URL in New _Tab" msgstr "URL megnyitása új _lapon" -#: ../src/midori-preferences.c:64 +#: ../midori/midori-preferences.c:62 msgid "Settings instance to provide properties" msgstr "" -#: ../src/midori-preferences.c:87 +#: ../midori/midori-preferences.c:84 #, c-format msgid "%s Preferences" msgstr "%s beállításai" #. Page "General" -#: ../src/midori-preferences.c:239 +#: ../midori/midori-preferences.c:267 msgid "General" msgstr "Általános" -#: ../src/midori-preferences.c:240 +#: ../midori/midori-preferences.c:268 msgid "Startup" msgstr "Indulás" #. Page "Appearance" -#: ../src/midori-preferences.c:261 +#: ../midori/midori-preferences.c:301 msgid "Appearance" msgstr "Megjelenés" -#: ../src/midori-preferences.c:262 +#: ../midori/midori-preferences.c:302 msgid "Font settings" msgstr "Betű beállítások" #. Page "Behavior" -#: ../src/midori-preferences.c:283 +#: ../midori/midori-preferences.c:322 msgid "Behavior" msgstr "Viselkedés" -#: ../src/midori-preferences.c:284 +#: ../midori/midori-preferences.c:323 msgid "Features" msgstr "Képességek" #. Page "Interface" -#: ../src/midori-preferences.c:316 +#: ../midori/midori-preferences.c:373 msgid "Interface" msgstr "Felület" -#: ../src/midori-preferences.c:330 +#: ../midori/midori-preferences.c:387 msgid "Browsing" msgstr "Böngészés" #. Page "Network" -#: ../src/midori-preferences.c:346 ../src/midori-preferences.c:347 +#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 msgid "Network" msgstr "Hálózat" -#: ../src/midori-preferences.c:358 +#: ../midori/midori-preferences.c:417 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../src/midori-preferences.c:363 -msgid "Privacy" -msgstr "Adatvédelem" +#: ../midori/midori-searchentry.c:74 +msgid "Current Item" +msgstr "" -#: ../src/midori-preferences.c:364 -msgid "Web Cookies" -msgstr "Webes sütik" +#: ../midori/midori-searchentry.c:75 +msgid "The currently selected item" +msgstr "" -#: ../src/midori-preferences.c:377 ../src/midori-preferences.c:387 -msgid "days" -msgstr "nap" +#: ../midori/midori-searchentry.c:83 +msgid "Dialog" +msgstr "" -#: ../src/sokoke.c:286 +#: ../midori/midori-searchentry.c:84 +msgid "A dialog to manage search engines" +msgstr "" + +#: ../midori/midori-searchentry.c:151 +msgid "Empty" +msgstr "Üres" + +#: ../midori/midori-searchentry.c:523 +msgid "Add search engine" +msgstr "Kereső-motor hozzáadása" + +#: ../midori/midori-searchentry.c:523 +msgid "Edit search engine" +msgstr "Kereső-motor szerkesztése" + +#: ../midori/midori-searchentry.c:550 +msgid "_Name:" +msgstr "_Név:" + +#: ../midori/midori-searchentry.c:594 +msgid "_Icon (name or file):" +msgstr "_Ikon (Név vagy fájl):" + +#: ../midori/midori-searchentry.c:608 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchentry.c:789 +msgid "Manage search engines" +msgstr "Kereső-motorok kezelése" + +#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:348 msgid "Warning: You are using a superuser account!" msgstr "VESZÉLY! Rendszergazda hozzáférést használsz!" -#: ../src/sokoke.c:408 ../katze/katze-xbel.c:952 +#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 #, c-format msgid "Writing failed." msgstr "Az írás meghiúsult." -#: ../src/webSearch.c:115 -msgid "Empty" -msgstr "Üres" +#: ../midori/gjs.c:512 +msgid "An unknown error occured." +msgstr "" -#: ../src/webSearch.c:187 -msgid "Add search engine" -msgstr "Kereső-motor hozzáadása" +#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#, c-format +msgid "%s has no property '%s'" +msgstr "" -#: ../src/webSearch.c:187 -msgid "Edit search engine" -msgstr "Kereső-motor szerkesztése" +#: ../midori/gjs.c:875 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" -#: ../src/webSearch.c:217 -msgid "_Name:" -msgstr "_Név:" - -#: ../src/webSearch.c:261 -msgid "_Icon (name or file):" -msgstr "_Ikon (Név vagy fájl):" - -#: ../src/webSearch.c:275 -msgid "_Keyword:" -msgstr "_Kulcsszó:" - -#: ../src/webSearch.c:344 -msgid "Manage search engines" -msgstr "Kereső-motorok kezelése" +#: ../midori/gjs.c:885 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" #: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "" + +#: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" msgstr "Az animációra használt jelképes méret" #: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" msgstr "Egy animációs kereteket tartalmazó ikon neve" #: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" msgstr "Egy animációs kereteket tartalmazó GdkPixbuf" #: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "" + +#: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" msgstr "A betöltés-jelző animált legyen-e" #: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" msgstr "Egy állóképként használandó ikon neve" #: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" msgstr "Egy állóképként használandó GdkPixbuf" #: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "" + +#: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" msgstr "" -#: ../katze/katze-utils.c:127 ../katze/katze-utils.c:275 +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Érvénytelen '%s' tulajdonság ehhez: %s" -#: ../katze/katze-utils.c:149 ../katze/katze-utils.c:173 +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" msgstr "Válassz fájlt" -#: ../katze/katze-utils.c:161 +#: ../katze/katze-utils.c:177 msgid "Choose folder" msgstr "Válassz mappát" -#: ../katze/katze-xbel.c:723 ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 ../katze/katze-xbel.c:775 -#: ../katze/katze-xbel.c:804 +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "" + +#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 +#: ../katze/katze-xbel.c:789 msgid "Malformed document." msgstr "Hibás dokumentum." -#: ../katze/katze-xbel.c:759 +#: ../katze/katze-xbel.c:744 msgid "File not found." msgstr "A fájl nem található." diff --git a/po/sv.po b/po/sv.po index 873a76c1..b7e1718b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-19 16:00+0200\n" +"POT-Creation-Date: 2008-08-26 00:20+0200\n" "PO-Revision-Date: 2008-03-23 21:05+0100\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: Swedish\n" @@ -20,7 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Liten webbläsare" -#: ../midori.desktop.in.h:2 ../midori/main.c:354 +#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 +#: ../midori/main.c:419 ../midori/main.c:433 msgid "Midori" msgstr "Midori" @@ -28,666 +29,721 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbläsare" -#: ../midori/main.c:45 -msgid "Bookmark" -msgstr "Bokmärke" +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "_Bokmärk" -#: ../midori/main.c:46 +#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +msgid "_Bookmarks" +msgstr "_Bokmärken" + +#: ../midori/main.c:54 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:47 -msgid "_Form Fill" -msgstr "Fyll i _formulär" +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Konsol" -#: ../midori/main.c:48 +#: ../midori/main.c:56 +msgid "_Extensions" +msgstr "" + +#: ../midori/main.c:57 +msgid "_History" +msgstr "_Historia" + +#: ../midori/main.c:58 msgid "_Homepage" msgstr "_Hemsida" -#: ../midori/main.c:49 +#: ../midori/main.c:59 +msgid "_Pageholder" +msgstr "_Sidhållare" + +#: ../midori/main.c:60 +msgid "_Userscripts" +msgstr "_Beskrivning" + +#: ../midori/main.c:61 +msgid "User_styles" +msgstr "" + +#: ../midori/main.c:62 msgid "New _Tab" msgstr "Ny _tabb" -#: ../midori/main.c:50 +#: ../midori/main.c:63 +msgid "_Transfers" +msgstr "_Överföringar" + +#: ../midori/main.c:64 +msgid "_Closed Tabs and Windows" +msgstr "_Stängda tabbar och fönster" + +#: ../midori/main.c:65 msgid "New _Window" msgstr "Nytt _fönster" -#: ../midori/main.c:52 +#: ../midori/main.c:67 msgid "Select _All" msgstr "Välj _alla" -#: ../midori/main.c:55 +#: ../midori/main.c:70 msgid "_Fullscreen" msgstr "_Fullskärm" -#: ../midori/main.c:56 +#: ../midori/main.c:71 msgid "_Leave Fullscreen" msgstr "_Lämna fullskärm" -#: ../midori/main.c:110 +#: ../midori/main.c:122 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "Konfigurationsfilen kunde inte laddas. %s\n" -#: ../midori/main.c:165 +#: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:172 ../midori/main.c:241 +#: ../midori/main.c:184 ../midori/main.c:253 #, c-format msgid "Unhandled settings value '%s'" msgstr "" -#: ../midori/main.c:346 -msgid "Display program version" -msgstr "Visa programversion" - -#: ../midori/main.c:359 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:363 ../midori/main.c:365 ../midori/main.c:379 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:363 -msgid "Unknown argument." -msgstr "" - -#: ../midori/main.c:365 -msgid "Failed to setup interface." -msgstr "" - -#: ../midori/main.c:380 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" - -#: ../midori/main.c:382 -msgid "Check for new versions at:" -msgstr "Leta efter nya verioner på:" - -#: ../midori/main.c:430 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Bokmärkena kunde inte laddas. %s\n" - -#: ../midori/main.c:444 -#, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "Sessionen kunde inte laddas. %s\n" - -#: ../midori/main.c:456 -#, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "Papperskorgen kunde inte laddas. %s\n" - -#: ../midori/main.c:468 -msgid "The following errors occured:" -msgstr "Följande fel inträffade:" - -#: ../midori/main.c:606 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Sökmotorer kunde inte sparad. %s" - -#: ../midori/main.c:616 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Bokmärkena kunde inte sparad. %s" - -#: ../midori/main.c:625 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Papperskorgen kunde inte sparad. %s" - -#: ../midori/main.c:637 +#: ../midori/main.c:368 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunde inte sparad. %s" -#: ../midori/main.c:646 +#: ../midori/main.c:396 +msgid "Display program version" +msgstr "Visa programversion" + +#: ../midori/main.c:413 +msgid "[URL]" +msgstr "[URL]" + +#: ../midori/main.c:417 +msgid "Unknown argument." +msgstr "" + +#: ../midori/main.c:419 +msgid "Failed to setup interface." +msgstr "" + +#: ../midori/main.c:434 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" + +#: ../midori/main.c:436 +msgid "Check for new versions at:" +msgstr "Leta efter nya verioner på:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:467 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:501 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Bokmärkena kunde inte laddas. %s\n" + +#: ../midori/main.c:515 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Sessionen kunde inte laddas. %s\n" + +#: ../midori/main.c:527 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Papperskorgen kunde inte laddas. %s\n" + +#: ../midori/main.c:539 +msgid "The following errors occured:" +msgstr "Följande fel inträffade:" + +#: ../midori/main.c:688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Sökmotorer kunde inte sparad. %s" + +#: ../midori/main.c:698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bokmärkena kunde inte sparad. %s" + +#: ../midori/main.c:707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Papperskorgen kunde inte sparad. %s" + +#: ../midori/main.c:715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurationsfilen kunde inte sparad. %s" -#: ../midori/midori-app.c:114 ../midori/midori-browser.c:1327 +#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 msgid "Settings" msgstr "Inställningar" -#: ../midori/midori-app.c:115 ../midori/midori-browser.c:1328 +#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 msgid "The associated settings" msgstr "De associerade inställningarna" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1366 +#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 msgid "Trash" msgstr "Papperskorgen" -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1367 +#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 msgid "The trash, collecting recently closed tabs and windows" msgstr "Soptunnan, samlar senast stängda tabbar och fönster" -#: ../midori/midori-app.c:132 +#: ../midori/midori-app.c:141 msgid "Browser" msgstr "Bläsare" -#: ../midori/midori-app.c:133 +#: ../midori/midori-app.c:142 msgid "The current browser" msgstr "" -#: ../midori/midori-app.c:141 +#: ../midori/midori-app.c:150 msgid "Browser Count" msgstr "" -#: ../midori/midori-app.c:142 +#: ../midori/midori-app.c:151 msgid "The current number of browsers" msgstr "" -#: ../midori/midori-app.c:150 ../midori/midori-browser.c:1380 -#: ../midori/midori-searchentry.c:66 +#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-searchentry.c:65 msgid "Search Engines" msgstr "Sökmotorer" -#: ../midori/midori-app.c:151 ../midori/midori-searchentry.c:67 +#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 msgid "The list of search engines" msgstr "" -#: ../midori/midori-addons.c:40 ../midori/midori-browser.c:3594 +#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Inga" + +#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 msgid "Extensions" msgstr "" -#: ../midori/midori-addons.c:41 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 msgid "Userscripts" msgstr "" -#: ../midori/midori-addons.c:42 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 msgid "Userstyles" msgstr "" +#: ../midori/midori-addons.c:113 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:114 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:122 +msgid "Kind" +msgstr "" + +#: ../midori/midori-addons.c:123 +msgid "The kind of addons" +msgstr "" + #: ../midori/midori-browser.c:192 msgid "Source" msgstr "Källkod" -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2786 -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2782 msgid "Reload the current page" msgstr "Ladda om sidan" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2789 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 msgid "Stop loading the current page" msgstr "Sluta ladda sidan" -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:349 #, c-format msgid "%d%% loaded" msgstr "%d%% laddat" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "New bookmark" msgstr "Nytt bokmärke" -#: ../midori/midori-browser.c:560 +#: ../midori/midori-browser.c:573 msgid "Edit bookmark" msgstr "Redigera bokmärke" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:597 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:597 ../midori/midori-searchentry.c:567 +#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 msgid "_Description:" msgstr "_Beskrivning" -#: ../midori/midori-browser.c:616 ../midori/midori-searchentry.c:581 +#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:633 +#: ../midori/midori-browser.c:646 msgid "_Folder:" msgstr "_Mapp:" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:650 msgid "Root" msgstr "Rot" -#: ../midori/midori-browser.c:1064 +#: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:1283 +#: ../midori/midori-browser.c:1228 msgid "Menubar" msgstr "" -#: ../midori/midori-browser.c:1284 +#: ../midori/midori-browser.c:1229 msgid "The menubar" msgstr "" -#: ../midori/midori-browser.c:1292 ../midori/midori-preferences.c:374 +#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Navigeringsfält" -#: ../midori/midori-browser.c:1293 +#: ../midori/midori-browser.c:1238 msgid "The navigationbar" msgstr "" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +msgid "URI" +msgstr "" + +#: ../midori/midori-browser.c:1247 +msgid "The current URI" +msgstr "" + +#: ../midori/midori-browser.c:1255 msgid "Tab" msgstr "" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1256 msgid "The current tab" msgstr "" -#: ../midori/midori-browser.c:1310 +#: ../midori/midori-browser.c:1264 msgid "Statusbar" msgstr "Statusrad" -#: ../midori/midori-browser.c:1311 +#: ../midori/midori-browser.c:1265 msgid "The statusbar" msgstr "" -#: ../midori/midori-browser.c:1347 +#: ../midori/midori-browser.c:1301 msgid "Statusbar Text" msgstr "" -#: ../midori/midori-browser.c:1348 ../midori/midori-webview.c:211 +#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 msgid "The text that is displayed in the statusbar" msgstr "Texten som visas i statusraden" -#: ../midori/midori-browser.c:1381 +#: ../midori/midori-browser.c:1335 msgid "The list of search engines to be used for web search" msgstr "" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2313 msgid "Separator" msgstr "Avskiljare" -#: ../midori/midori-browser.c:2483 +#: ../midori/midori-browser.c:2478 msgid "A lightweight web browser." msgstr "En liten webbläsare." -#: ../midori/midori-browser.c:2491 +#: ../midori/midori-browser.c:2486 msgid "translator-credits" msgstr "Mikael Magnusson " -#: ../midori/midori-browser.c:2709 +#: ../midori/midori-browser.c:2699 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2702 msgid "Open a new window" msgstr "Öppna i nytt fönster" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2705 msgid "Open a new tab" msgstr "Öppna i ny tabb" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2708 msgid "Open a file" msgstr "Öppna en fil" -#: ../midori/midori-browser.c:2721 +#: ../midori/midori-browser.c:2711 msgid "Save to a file" msgstr "Spara till fil" -#: ../midori/midori-browser.c:2723 +#: ../midori/midori-browser.c:2713 msgid "_Close Tab" msgstr "_Stäng tabb" -#: ../midori/midori-browser.c:2724 +#: ../midori/midori-browser.c:2714 msgid "Close the current tab" msgstr "Stäng den här tabben" -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:2716 msgid "C_lose Window" msgstr "S_täng fönster" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2717 msgid "Close this window" msgstr "Stäng det här fönstret" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2719 msgid "Pa_ge Setup" msgstr "_Sidinställningar" -#: ../midori/midori-browser.c:2733 +#: ../midori/midori-browser.c:2723 msgid "Show a preview of the printed page" msgstr "" -#: ../midori/midori-browser.c:2736 +#: ../midori/midori-browser.c:2726 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:2739 +#: ../midori/midori-browser.c:2729 msgid "Quit the application" msgstr "Avsluta programmet" -#: ../midori/midori-browser.c:2741 +#: ../midori/midori-browser.c:2731 msgid "_Edit" msgstr "_Redigera" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:2734 msgid "Undo the last modification" msgstr "Ångra senaste ändringen" -#: ../midori/midori-browser.c:2747 +#: ../midori/midori-browser.c:2737 msgid "Redo the last modification" msgstr "Gör om senaste ändringen" -#: ../midori/midori-browser.c:2750 +#: ../midori/midori-browser.c:2740 msgid "Cut the selected text" msgstr "Klippa ut markerad text" -#: ../midori/midori-browser.c:2753 ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 msgid "Copy the selected text" msgstr "Kopiera markerad text" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2749 msgid "Paste text from the clipboard" msgstr "Klistra in text från klippbordet" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2752 msgid "Delete the selected text" msgstr "Ta bort markerad text" -#: ../midori/midori-browser.c:2765 +#: ../midori/midori-browser.c:2755 msgid "Select all text" msgstr "Markera all text" -#: ../midori/midori-browser.c:2768 +#: ../midori/midori-browser.c:2758 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2760 msgid "Find _Next" msgstr "Hitta _nästa" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2761 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2763 msgid "Find _Previous" msgstr "Hitta _förra" -#: ../midori/midori-browser.c:2774 +#: ../midori/midori-browser.c:2764 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2766 msgid "_Quick Find" msgstr "_Snabbsök" -#: ../midori/midori-browser.c:2777 +#: ../midori/midori-browser.c:2767 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2780 +#: ../midori/midori-browser.c:2770 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:2772 msgid "_View" msgstr "_Visa" -#: ../midori/midori-browser.c:2783 +#: ../midori/midori-browser.c:2773 msgid "_Toolbars" msgstr "_Verktygsfält" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:2785 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:2798 +#: ../midori/midori-browser.c:2788 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:2801 +#: ../midori/midori-browser.c:2791 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:2793 msgid "View _Source" msgstr "Visa _källkod" -#: ../midori/midori-browser.c:2804 +#: ../midori/midori-browser.c:2794 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2796 msgid "View Selection Source" msgstr "Visa källkod för markering" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2797 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:2810 +#: ../midori/midori-browser.c:2800 msgid "Toggle fullscreen view" msgstr "Växla fullskärmsläge" -#: ../midori/midori-browser.c:2812 +#: ../midori/midori-browser.c:2802 msgid "_Go" msgstr "_Gå" -#: ../midori/midori-browser.c:2815 +#: ../midori/midori-browser.c:2805 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:2808 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2811 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2823 -msgid "Location..." -msgstr "Plats..." +#: ../midori/midori-browser.c:2813 +msgid "_Web Search..." +msgstr "_Webbsökning..." -#: ../midori/midori-browser.c:2824 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:2826 -msgid "Web Search..." -msgstr "Webbsökning..." - -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2814 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:2829 +#: ../midori/midori-browser.c:2816 msgid "Open in Page_holder..." msgstr "Visa i sid_hållare..." -#: ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:2817 msgid "Open the current page in the pageholder" msgstr "" -#: ../midori/midori-browser.c:2832 -msgid "Closed Tabs and Windows" -msgstr "Stängda tabbar och fönster" - -#: ../midori/midori-browser.c:2833 +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2821 msgid "Reopen a previously closed tab or window" msgstr "Öppna en tidigare stängd tabb eller fönster" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:2823 msgid "Empty Trash" msgstr "Töm papperskorgen" -#: ../midori/midori-browser.c:2836 +#: ../midori/midori-browser.c:2824 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:2826 msgid "Undo Close Tab" msgstr "Ångra stäng tabb" -#: ../midori/midori-browser.c:2839 +#: ../midori/midori-browser.c:2827 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:2841 -msgid "_Bookmarks" -msgstr "_Bokmärken" - -#: ../midori/midori-browser.c:2844 +#: ../midori/midori-browser.c:2832 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:2846 +#: ../midori/midori-browser.c:2834 msgid "_Manage Bookmarks" msgstr "_Hantera bokmärken" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2835 msgid "Add, edit and remove bookmarks..." msgstr "Lägg till, ändra och ta bort bokmärken..." -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:2838 msgid "Open the selected bookmark" msgstr "Kopiera markerad bokmärke" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2840 msgid "Open in New _Tab" msgstr "Öppna i ny _tabb" -#: ../midori/midori-browser.c:2853 +#: ../midori/midori-browser.c:2841 msgid "Open the selected bookmark in a new tab" msgstr "" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:2843 msgid "Open in New _Window" msgstr "Öppna i nytt _fönster" -#: ../midori/midori-browser.c:2856 +#: ../midori/midori-browser.c:2844 msgid "Open the selected bookmark in a new window" msgstr "" -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2847 msgid "Edit the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2850 msgid "Delete the selected bookmark" msgstr "Ta bort markerad bokmärke" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:2852 msgid "_Tools" msgstr "_Verktyg" -#: ../midori/midori-browser.c:2866 ../midori/midori-searchentry.c:161 +#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 msgid "_Manage Search Engines" msgstr "_Hantera sökmotorer" -#: ../midori/midori-browser.c:2867 +#: ../midori/midori-browser.c:2855 msgid "Add, edit and remove search engines..." msgstr "Lägg till, ändra och ta bort sökmotorer..." -#: ../midori/midori-browser.c:2870 +#: ../midori/midori-browser.c:2858 msgid "_Window" msgstr "_Fönster" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:2860 msgid "_Previous Tab" msgstr "_Föregående tabb" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:2861 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:2863 msgid "_Next Tab" msgstr "_Nästa tabb" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:2864 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:2878 +#: ../midori/midori-browser.c:2866 msgid "Tab _Overview" msgstr "Tabbö_versikt" -#: ../midori/midori-browser.c:2879 +#: ../midori/midori-browser.c:2867 msgid "Show an overview of all open tabs" msgstr "" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2869 msgid "_Help" msgstr "_Hjälp" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:2871 msgid "_Contents" msgstr "_Innehåll" -#: ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2872 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:2875 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:2881 msgid "P_rivate Browsing" msgstr "P_rivat läge" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:2882 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:2885 msgid "_Work Offline" msgstr "_Arbeta offline" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2886 msgid "Work without a network connection" msgstr "" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:2890 msgid "_Navigationbar" msgstr "_Navigationsfält" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:2891 msgid "Show navigationbar" msgstr "Visa navigeringsfält" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2894 msgid "Side_panel" msgstr "Sido_panel" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:2895 msgid "Show sidepanel" msgstr "Visa sido_panel" -#: ../midori/midori-browser.c:2910 +#: ../midori/midori-browser.c:2898 msgid "_Bookmarkbar" msgstr "_Bokmärkesfält" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:2899 msgid "Show bookmarkbar" msgstr "Visa bokmärkesfält" -#: ../midori/midori-browser.c:2914 +#: ../midori/midori-browser.c:2902 msgid "_Transferbar" msgstr "Ö_verföringsfält" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:2903 msgid "Show transferbar" msgstr "Visa statusrad" -#: ../midori/midori-browser.c:2918 +#: ../midori/midori-browser.c:2906 msgid "_Statusbar" msgstr "_Statusrad" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:2907 msgid "Show statusbar" msgstr "Visa statusrad" +#: ../midori/midori-browser.c:3228 +msgid "_Location..." +msgstr "_Plats..." + +#: ../midori/midori-browser.c:3230 +msgid "Open a particular location" +msgstr "" + #: ../midori/midori-browser.c:3453 msgid "Bookmarks" msgstr "Bokmärken" @@ -701,7 +757,7 @@ msgstr "Överföringar" msgid "Console" msgstr "Konsol" -#: ../midori/midori-browser.c:3476 ../midori/midori-preferences.c:437 +#: ../midori/midori-browser.c:3476 msgid "History" msgstr "Historia" @@ -709,31 +765,43 @@ msgstr "Historia" msgid "Pageholder" msgstr "Sidhållare" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3534 msgid "_Inline find:" msgstr "_Snabbsökning:" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3569 msgid "Match Case" msgstr "_Gör skillnad på skiftläge" -#: ../midori/midori-browser.c:3570 +#: ../midori/midori-browser.c:3586 msgid "Close Findbar" msgstr "Stäng sökfältet" -#: ../midori/midori-browser.c:3807 +#: ../midori/midori-browser.c:3817 #, c-format msgid "Unexpected setting '%s'" msgstr "" +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "" + #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" msgstr "Utseende på skuggan runt varje panel" +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "" + #: ../midori/midori-panel.c:157 msgid "Menu to hold panel items" msgstr "Meny för att visa panelföremål" +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "" + #: ../midori/midori-panel.c:166 msgid "The index of the current page" msgstr "Indexet för nuvarande sida" @@ -742,15 +810,11 @@ msgstr "Indexet för nuvarande sida" msgid "Close panel" msgstr "Stäng panel" -#: ../midori/midori-panel.c:392 -msgid "Untitled" -msgstr "Namnlös" - #: ../midori/midori-websettings.c:130 msgid "Blank page" msgstr "Tom sida" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 msgid "Homepage" msgstr "Hemsida" @@ -802,7 +866,7 @@ msgstr "Standard" msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 msgid "Text" msgstr "Text" @@ -822,10 +886,6 @@ msgstr "Alla kakor" msgid "Session cookies" msgstr "Sessionskakor" -#: ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Inga" - #: ../midori/midori-websettings.c:242 msgid "Remember last window size" msgstr "" @@ -923,129 +983,129 @@ msgid "The style of the toolbar" msgstr "" #: ../midori/midori-websettings.c:354 -msgid "Small toolbar" -msgstr "Små verktygsfält" - -#: ../midori/midori-websettings.c:355 -msgid "Use small toolbar icons" -msgstr "Visa små ikoner" - -#: ../midori/midori-websettings.c:363 msgid "Show New Tab" msgstr "Visa Ny tabb" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" msgstr "" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:363 msgid "Show Homepage" msgstr "Visa Hemsida" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:364 msgid "Show the Homepage button in the toolbar" msgstr "" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:372 msgid "Show Web search" msgstr "Visa Webbsökning" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" msgstr "" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:381 msgid "Show Trash" msgstr "Visa Papperskorgen" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" msgstr "" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:392 msgid "Load on Startup" msgstr "Ladda vid uppstart" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:393 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Folder" msgstr "Nedladdningsmapp" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:420 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:421 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Sökmotor för Addressfältet" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:430 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:450 msgid "Tab Label Size" msgstr "Tabbstorlek" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:451 msgid "The desired tab label size" msgstr "Önskad storlek på tabbetikett" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" msgstr "Stängknappar på tabbar" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" msgstr "Ifall tabbar har stängknappar" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:468 msgid "Open new pages in" msgstr "Öppna nya sidor i" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:469 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" msgstr "Mittenklick öppnar markering" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" msgstr "Ladda en URL från markeringen via mittenklick" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:487 msgid "Open tabs in the background" msgstr "Öppna tabbar i bakgrunden" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" msgstr "" +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + #: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" msgstr "Öppna popups i tabbar" @@ -1126,23 +1186,43 @@ msgstr "Cache-storlek" msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-webview.c:193 +#: ../midori/midori-webview.c:64 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-webview.c:65 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-webview.c:66 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" msgstr "URIn för den laddade sidan" -#: ../midori/midori-webview.c:202 +#: ../midori/midori-webview.c:234 msgid "The title of the currently loaded page" msgstr "Titeln för den laddade sidan" -#: ../midori/midori-webview.c:578 +#: ../midori/midori-webview.c:244 +msgid "The current loading progress" +msgstr "" + +#: ../midori/midori-webview.c:253 +msgid "The current loading status" +msgstr "" + +#: ../midori/midori-webview.c:695 msgid "Open Link in New _Tab" msgstr "Öppna länk i ny _tabb" -#: ../midori/midori-webview.c:606 +#: ../midori/midori-webview.c:723 msgid "Download Link with Download _Manager" msgstr "" -#: ../midori/midori-webview.c:624 +#: ../midori/midori-webview.c:741 msgid "Open URL in New _Tab" msgstr "Öppna URL i ny _tabb" @@ -1192,108 +1272,55 @@ msgid "Browsing" msgstr "Bläddring" #. Page "Network" -#: ../midori/midori-preferences.c:403 ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 msgid "Network" msgstr "Nätverk" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "MB" msgstr "MB" -#. Page "Privacy" -#: ../midori/midori-preferences.c:420 -msgid "Privacy" -msgstr "Sekretess" - -#: ../midori/midori-preferences.c:421 -msgid "Web Cookies" -msgstr "Kakor" - -#: ../midori/midori-preferences.c:434 ../midori/midori-preferences.c:444 -msgid "days" -msgstr "dagar" - -#: ../midori/midori-webitem.c:70 -msgid "Name" -msgstr "Namn" - -#: ../midori/midori-webitem.c:71 -msgid "The name of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:79 -msgid "Description" -msgstr "Beskrivning" - -#: ../midori/midori-webitem.c:80 -msgid "The description of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:88 -msgid "URI" -msgstr "" - -#: ../midori/midori-webitem.c:89 -msgid "The URI of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:97 -msgid "Icon" -msgstr "Ikone" - -#: ../midori/midori-webitem.c:98 -msgid "The icon of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:106 -msgid "Token" -msgstr "" - -#: ../midori/midori-webitem.c:107 -msgid "The token of the web item" -msgstr "" - -#: ../midori/midori-searchentry.c:75 +#: ../midori/midori-searchentry.c:74 msgid "Current Item" msgstr "" -#: ../midori/midori-searchentry.c:76 +#: ../midori/midori-searchentry.c:75 msgid "The currently selected item" msgstr "" -#: ../midori/midori-searchentry.c:84 +#: ../midori/midori-searchentry.c:83 msgid "Dialog" msgstr "" -#: ../midori/midori-searchentry.c:85 +#: ../midori/midori-searchentry.c:84 msgid "A dialog to manage search engines" msgstr "" -#: ../midori/midori-searchentry.c:152 +#: ../midori/midori-searchentry.c:151 msgid "Empty" msgstr "Tom" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Add search engine" msgstr "Lägg till sökmotor" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchentry.c:523 msgid "Edit search engine" msgstr "Redigera sökmotor" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchentry.c:550 msgid "_Name:" msgstr "_Namn:" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchentry.c:594 msgid "_Icon (name or file):" msgstr "_Ikon (namn eller fil):" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchentry.c:608 msgid "_Token:" msgstr "" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchentry.c:789 msgid "Manage search engines" msgstr "Hantera sökmotorer" @@ -1310,53 +1337,100 @@ msgstr "Varning: Du använder ett administratörskonto!" msgid "Writing failed." msgstr "Kunde inte skriva." -#: ../midori/gjs.c:89 +#: ../midori/gjs.c:512 msgid "An unknown error occured." msgstr "" -#: ../midori/gjs.c:309 ../midori/gjs.c:399 +#: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" msgstr "" -#: ../midori/gjs.c:445 +#: ../midori/gjs.c:875 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:455 +#: ../midori/gjs.c:885 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../katze/katze-throbber.c:134 +#: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "" + +#: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" msgstr "Symbolisk storlek för animeringen" -#: ../katze/katze-throbber.c:143 +#: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" msgstr "Namn på en ikon som innehåller animeringsbilder" -#: ../katze/katze-throbber.c:152 +#: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" msgstr "En GdkPixbuf som innehåller animeringbilder" -#: ../katze/katze-throbber.c:161 +#: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "" + +#: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" msgstr "Ifall aktivitetssymbolen ska animeras" -#: ../katze/katze-throbber.c:170 +#: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" msgstr "Namn på ikon att använda som statisk bild" -#: ../katze/katze-throbber.c:179 +#: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" msgstr "En GdkPixbuf att använda som statisk bild" -#: ../katze/katze-throbber.c:188 +#: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "" + +#: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" msgstr "Katalog-ID för en ikon att använda som statisk bild" +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "" + #: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" @@ -1370,6 +1444,38 @@ msgstr "" msgid "Choose folder" msgstr "" +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "Namn" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "Ikone" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "" + #: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 #: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 #: ../katze/katze-xbel.c:789 From a10dd2e20556c2381000e651f5273b52106d7105 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 17:05:40 +0200 Subject: [PATCH 0304/2970] Pass search engines to new browser windows --- midori/midori-app.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-app.c b/midori/midori-app.c index 309d3622..8961951e 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -349,6 +349,7 @@ midori_browser_new_window_cb (MidoriBrowser* browser, MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", app->settings, "trash", app->trash, + "search-engines", app->search_engines, NULL); midori_browser_add_uri (new_browser, uri); gtk_widget_show (GTK_WIDGET (new_browser)); From 88956ae34cdfd6e1b115de131738eb41ed94f2ba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 17:23:03 +0200 Subject: [PATCH 0305/2970] Bump version to 0.0.21 --- ChangeLog | 8 ++++++++ configure.in | 2 +- wscript | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73180647..4dcb4741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +v0.0.21: + + Update some translations + + Show progress in location when statusbar is hidden + + Alt + Enter in location should issue a new tab + + Warn at configure time if GVfs is not installed + + Remove GVfs code that could caused huge problems + + Update wad to 1.4.4 to fix building on some systems + v0.0.20: + Single instance support using Unique + Make it clear that WAF is preferred diff --git a/configure.in b/configure.in index 2dde9c20..6c471e9c 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Register ourselves to autoconf -AC_INIT([midori], [0.0.20], [http://www.twotoasts.de/bugs]) +AC_INIT([midori], [0.0.21], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/main.h]) AC_CONFIG_HEADER([config.h]) diff --git a/wscript b/wscript index d280fc1e..ef083ecf 100644 --- a/wscript +++ b/wscript @@ -7,7 +7,7 @@ import Common import platform APPNAME = 'midori' -VERSION = '0.0.20' +VERSION = '0.0.21' try: git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], From efab194b63c57dd5344533a9467e0096df0f2e86 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Aug 2008 20:48:13 +0200 Subject: [PATCH 0306/2970] First move towards superseding KatzeXbelItem by KatzeItem The idea is, since we have KatzeItem, KatzeList and KatzeArray now, except for KatzeXbelItem's loading and saving XBEL the interface is obsolete. As a bonus, we actually save the trash again. --- katze/katze-xbel.c | 2 +- katze/katze-xbel.h | 3 ++ midori/main.c | 93 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c index be70a185..b526cdfb 100644 --- a/katze/katze-xbel.c +++ b/katze/katze-xbel.c @@ -803,7 +803,7 @@ katze_xbel_xml_element (const gchar* name, return markup; } -static gchar* +gchar* katze_xbel_item_to_data (KatzeXbelItem* item) { g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); diff --git a/katze/katze-xbel.h b/katze/katze-xbel.h index 359aada6..cb66807b 100644 --- a/katze/katze-xbel.h +++ b/katze/katze-xbel.h @@ -161,6 +161,9 @@ katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, gchar** full_path, GError** error); +gchar* +katze_xbel_item_to_data (KatzeXbelItem* item); + gchar* katze_xbel_folder_to_data (KatzeXbelItem* folder, gsize* length, diff --git a/midori/main.c b/midori/main.c index efd1956d..42428eff 100644 --- a/midori/main.c +++ b/midori/main.c @@ -349,7 +349,7 @@ midori_web_list_add_item_cb (KatzeArray* trash, } } -void +static void midori_browser_session_cb (MidoriBrowser* browser, gpointer arg1, KatzeXbelItem* session) @@ -373,7 +373,7 @@ midori_browser_session_cb (MidoriBrowser* browser, g_free (config_path); } -void +static void midori_browser_weak_notify_cb (MidoriBrowser* browser, KatzeXbelItem* session) { @@ -381,6 +381,86 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } +static gchar* +_simple_xml_element (const gchar* name, + const gchar* value) +{ + gchar* value_escaped; + gchar* markup; + + if (!value) + return g_strdup (""); + value_escaped = g_markup_escape_text (value, -1); + markup = g_strdup_printf ("<%s>%s\n", name, value_escaped, name); + g_free (value_escaped); + return markup; +} + +static gchar* +katze_xbel_array_to_xml (KatzeArray* array, + GError** error) +{ + GString* inner_markup; + guint i, n; + KatzeXbelItem* item; + gchar* item_xml; + gchar* title; + gchar* desc; + gchar* outer_markup; + + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_XBEL_ITEM), NULL); + + inner_markup = g_string_new (NULL); + n = katze_array_get_length (array); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (array, i); + item_xml = katze_xbel_item_to_data (item); + g_string_append (inner_markup, item_xml); + g_free (item_xml); + } + + title = _simple_xml_element ("title", katze_item_get_name (KATZE_ITEM (array))); + desc = _simple_xml_element ("desc", katze_item_get_text (KATZE_ITEM (array))); + outer_markup = g_strdup_printf ( + "%s%s\n%s%s%s\n", + "\n", + "\n", + title, + desc, + g_string_free (inner_markup, FALSE)); + g_free (title); + g_free (desc); + + return outer_markup; +} + +static gboolean +katze_array_to_file (KatzeArray* array, + const gchar* filename, + GError** error) +{ + gchar* data; + FILE* fp; + + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_XBEL_ITEM), FALSE); + g_return_val_if_fail (filename, FALSE); + + if (!(data = katze_xbel_array_to_xml (array, error))) + return FALSE; + if (!(fp = fopen (filename, "w"))) + { + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_ACCES, + _("Writing failed.")); + return FALSE; + } + fputs (data, fp); + fclose (fp); + g_free (data); + return TRUE; +} int main (int argc, @@ -609,6 +689,7 @@ main (int argc, KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); katze_array_add_item (trash, item); } + katze_xbel_item_unref (xbel_trash); g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_web_list_add_item_cb), NULL); @@ -678,7 +759,7 @@ main (int argc, JSGlobalContextRelease (js_context); /* Save configuration files */ - config_path = g_build_filename (g_get_user_config_dir(), PACKAGE_NAME, + config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); g_mkdir_with_parents (config_path, 0755); config_file = g_build_filename (config_path, "search", NULL); @@ -698,16 +779,16 @@ main (int argc, g_warning (_("The bookmarks couldn't be saved. %s"), error->message); g_error_free (error); } - katze_xbel_item_unref(bookmarks); + katze_xbel_item_unref (bookmarks); g_free (config_file); config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); error = NULL; - if (!katze_xbel_folder_to_file (xbel_trash, config_file, &error)) + if (!katze_array_to_file (trash, config_file, &error)) { g_warning (_("The trash couldn't be saved. %s"), error->message); g_error_free (error); } - katze_xbel_item_unref (xbel_trash); + g_object_unref (trash); katze_assign (config_file, g_build_filename (config_path, "config", NULL)); error = NULL; if (!settings_save_to_file (settings, config_file, &error)) From 06d47bf3a946b88fc8e09383761080152e16fef4 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sun, 31 Aug 2008 21:33:32 +0200 Subject: [PATCH 0307/2970] Implement enabling/ disabling addons This patch doesn't take care of saving state to disk and the feature is not currently multi window aware. --- midori/main.c | 2 + midori/main.h | 2 + midori/midori-addons.c | 215 ++++++++++++++++++++++++++++++++++++----- 3 files changed, 196 insertions(+), 23 deletions(-) diff --git a/midori/main.c b/midori/main.c index 42428eff..8765d0cf 100644 --- a/midori/main.c +++ b/midori/main.c @@ -53,6 +53,8 @@ stock_items_init (void) { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD }, { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, + { STOCK_DISABLE, N_("_Disable"), 0, 0, GTK_STOCK_NO }, + { STOCK_ENABLE, N_("_Enable"), 0, 0, GTK_STOCK_YES }, { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, diff --git a/midori/main.h b/midori/main.h index 254c951f..51ef1d32 100644 --- a/midori/main.h +++ b/midori/main.h @@ -30,6 +30,8 @@ KatzeXbelItem* bookmarks; #define STOCK_BOOKMARK "stock_bookmark" #define STOCK_BOOKMARKS "vcard" #define STOCK_CONSOLE "terminal" +#define STOCK_DISABLE "list-remove" +#define STOCK_ENABLE "list-add" #define STOCK_EXTENSION "extension" #define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 6d211882..6936756c 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -15,6 +15,7 @@ #endif #include "midori-addons.h" +#include "main.h" #include "sokoke.h" #include "gjs.h" @@ -45,6 +46,7 @@ struct AddonElement gchar *name; gchar *description; gboolean enabled; + gboolean broken; GSList* includes; GSList* excludes; @@ -272,6 +274,45 @@ _addons_get_files (MidoriAddons* addons) return files; } +GtkTreePath* +_treeview_first_selected_path (GtkTreeView *treeview) +{ + GtkTreeSelection* selection; + GList* tree_paths; + + selection = gtk_tree_view_get_selection (treeview); + if (!selection) + return NULL; + + if (gtk_tree_selection_get_selected (selection, NULL, NULL)) + { + tree_paths = gtk_tree_selection_get_selected_rows (selection, NULL); + return g_list_nth_data (tree_paths, 0); + } + else + return NULL; +} + +static void +_addons_toggle_enable_button (MidoriAddons* addons, + gboolean sensitive) +{ + GtkToolItem* button; + + button = gtk_toolbar_get_nth_item (GTK_TOOLBAR (addons->toolbar), 1); + gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); +} + +static void +_addons_toggle_disable_button (MidoriAddons* addons, + gboolean sensitive) +{ + GtkToolItem* button; + + button = gtk_toolbar_get_nth_item (GTK_TOOLBAR (addons->toolbar), 2); + gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); +} + #if HAVE_GIO static void midori_addons_directory_monitor_changed (GFileMonitor* monitor, @@ -284,6 +325,67 @@ midori_addons_directory_monitor_changed (GFileMonitor* monitor, } #endif +static void +midori_addons_treeview_cursor_changed (GtkTreeView* treeview, + MidoriAddons* addons) +{ + struct AddonElement* element; + GtkTreeModel* model; + GtkTreeIter iter; + GtkTreePath *path; + + path = _treeview_first_selected_path (treeview); + + model = gtk_tree_view_get_model (treeview); + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_model_get (model, &iter, 0, &element, -1); + if (element->broken) + { + _addons_toggle_enable_button (addons, FALSE); + _addons_toggle_disable_button (addons, FALSE); + } else + { + _addons_toggle_enable_button (addons, !element->enabled); + _addons_toggle_disable_button (addons, element->enabled); + } + } +} + +static void +midori_addons_button_status_clicked_cb (GtkToolItem* toolitem, + MidoriAddons* addons) +{ + GtkTreeView* treeview; + struct AddonElement* element; + GtkTreeModel* model; + GtkTreeIter iter; + GtkTreePath* path; + + treeview = GTK_TREE_VIEW (addons->treeview); + + path = _treeview_first_selected_path (treeview); + model = gtk_tree_view_get_model (treeview); + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_model_get (model, &iter, 0, &element, -1); + if (toolitem == gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (addons->toolbar), 2)) /* disable button */ + element->enabled = FALSE; + else if (toolitem == gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (addons->toolbar), 1)) /* enable button */ + element->enabled = TRUE; + + _addons_toggle_enable_button (addons, !element->enabled); + _addons_toggle_disable_button (addons, element->enabled); + + /* After enabling or disabling an element, the tree view + is not updated automatically; we need to notify tree model + in order to take the modification into account */ + gtk_tree_model_row_changed (model, path, &iter); + } +} + static void midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, MidoriAddons* addons) @@ -296,11 +398,11 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, _addons_get_folder (addons)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); -#if !HAVE_GIO + #if !HAVE_GIO /* FIXME: Without GIO clicking this button is the only way to update the list */ midori_addons_update_elements (addons); -#endif + #endif } static void @@ -310,12 +412,14 @@ midori_addons_treeview_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - /* gchar* source_id; - gtk_tree_model_get (model, iter, 2, &source_id, -1); */ + struct AddonElement *element; - g_object_set (renderer, "stock-id", GTK_STOCK_FILE, NULL); + gtk_tree_model_get (model, iter, 0, &element, -1); - /* g_free (source_id); */ + if (element->broken) + g_object_set (renderer, "stock-id", GTK_STOCK_STOP, NULL); + else + g_object_set (renderer, "stock-id", GTK_STOCK_FILE, NULL); } static void @@ -325,13 +429,15 @@ midori_addons_treeview_render_text_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - gchar* name; + struct AddonElement *element; - gtk_tree_model_get (model, iter, 0, &name, -1); + gtk_tree_model_get (model, iter, 0, &element, -1); - g_object_set (renderer, "text", name, NULL); - - g_free (name); + g_object_set (renderer, "text", element->name, NULL); + if (!element->enabled) + g_object_set (renderer, "sensitive", false, NULL); + else + g_object_set (renderer, "sensitive", true, NULL); } static void @@ -426,6 +532,8 @@ _metadata_from_file (const gchar* filename, g_io_channel_shutdown (channel, false, 0); g_slist_free (*includes); g_slist_free (*excludes); + *includes = NULL; + *excludes = NULL; return FALSE; } else if (includes && g_str_has_prefix (line, "// @include ")) @@ -593,7 +701,7 @@ _may_load_script (const gchar* uri, break; } #endif - list = list->next; + list = g_slist_next (list); } if (!match) { @@ -728,6 +836,12 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, while (elements) { element = elements->data; + if (!element->enabled || element->broken) + { + elements = g_slist_next (elements); + continue; + } + fullname = element->fullpath; if (element->includes || element->excludes) @@ -736,6 +850,7 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, elements = g_slist_next (elements); continue; } + exception = NULL; if (addons->kind == MIDORI_ADDON_USER_SCRIPTS && !_js_script_from_file (js_context, fullname, &exception)) @@ -798,7 +913,7 @@ midori_addons_new (GtkWidget* web_widget, while (directories) { directory = g_file_new_for_path (directories->data); - directories = directories->next; + directories = g_slist_next (directories); error = NULL; monitor = g_file_monitor_directory (directory, G_FILE_MONITOR_NONE, @@ -922,12 +1037,34 @@ midori_addons_get_toolbar (MidoriAddons* addons) toolitem = gtk_tool_item_new (); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); + + /* enable button */ + toolitem = gtk_tool_button_new_from_stock (STOCK_ENABLE); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_addons_button_status_clicked_cb), addons); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); + gtk_widget_show (GTK_WIDGET (toolitem)); + + /* disable button */ + toolitem = gtk_tool_button_new_from_stock (STOCK_DISABLE); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_addons_button_status_clicked_cb), addons); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); + gtk_widget_show (GTK_WIDGET (toolitem)); + + /* separator */ toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); gtk_tool_item_set_expand (toolitem, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); + + /* add button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", @@ -936,6 +1073,10 @@ midori_addons_get_toolbar (MidoriAddons* addons) gtk_widget_show (GTK_WIDGET (toolitem)); addons->toolbar = toolbar; + g_signal_connect (addons->treeview, "cursor-changed", + G_CALLBACK (midori_addons_treeview_cursor_changed), + addons); + g_signal_connect (addons->toolbar, "destroy", G_CALLBACK (gtk_widget_destroyed), &addons->toolbar); @@ -954,6 +1095,9 @@ midori_addons_get_toolbar (MidoriAddons* addons) void midori_addons_update_elements (MidoriAddons* addons) { + GTree* disabled; + GSList* elements; + gboolean broken; gchar* fullname; gchar* displayname; gchar* name; @@ -968,10 +1112,21 @@ midori_addons_update_elements (MidoriAddons* addons) g_return_if_fail (addons->kind != MIDORI_ADDON_NONE); + /* FIXME: would GHashTable be better? */ + disabled = g_tree_new ((GCompareFunc)strcmp); + elements = addons->elements; + while (elements) + { + element = elements->data; + if (!element->enabled) + g_tree_insert (disabled, element->fullpath, NULL); + elements = g_slist_next (elements); + } + g_slist_free (addons->elements); addons->elements = NULL; - liststore = gtk_list_store_new (3, G_TYPE_STRING, + liststore = gtk_list_store_new (3, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_STRING); @@ -984,16 +1139,14 @@ midori_addons_update_elements (MidoriAddons* addons) description = NULL; includes = NULL; excludes = NULL; + broken = FALSE; if (addons->kind == MIDORI_ADDON_USER_SCRIPTS) { name = NULL; if (!_metadata_from_file (fullname, &includes, &excludes, &name, &description)) - { - addon_files = g_slist_next (addon_files); - continue; - } + broken = TRUE; if (name) { @@ -1002,24 +1155,40 @@ midori_addons_update_elements (MidoriAddons* addons) } } - gtk_list_store_append (liststore, &iter); - gtk_list_store_set (liststore, &iter, - 0, g_strdup (displayname), 1, 0, 2, "", -1); - element = g_new (struct AddonElement, 1); element->name = displayname; element->description = description; element->fullpath = fullname; - element->enabled = TRUE; + + if (g_tree_lookup_extended (disabled, fullname, NULL, NULL)) + element->enabled = FALSE; + else + element->enabled = TRUE; + element->broken = broken; element->includes = includes; element->excludes = excludes; addons->elements = g_slist_prepend (addons->elements, element); + + gtk_list_store_append (liststore, &iter); + gtk_list_store_set (liststore, &iter, + 0, element, 1, 0, 2, "", -1); + addon_files = g_slist_next (addon_files); } addons->elements = g_slist_reverse (addons->elements); + g_tree_destroy (disabled); g_slist_free (list); gtk_tree_view_set_model (GTK_TREE_VIEW (addons->treeview), GTK_TREE_MODEL (liststore)); + + /* In case a row was selected, that selection will be cancelled + when calling gtk_tree_view_set_model. So, we need to make sure + that the buttons are insensitive. */ + if (addons->toolbar) + { + _addons_toggle_enable_button (addons, FALSE); + _addons_toggle_disable_button (addons, FALSE); + } } From c3f50388a19da24b3df4eafb48e32d6e2acb40d1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 3 Sep 2008 02:28:54 +0200 Subject: [PATCH 0308/2970] Make bookmarks a property of browser and app This means we have removed the last remaining global variable. --- midori/main.c | 4 + midori/main.h | 8 -- midori/midori-app.c | 73 ++++++++++----- midori/midori-browser.c | 195 +++++++++++++++++++++++++++------------- midori/midori-webview.c | 3 +- 5 files changed, 190 insertions(+), 93 deletions(-) diff --git a/midori/main.c b/midori/main.c index 8765d0cf..267cb53a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -23,6 +23,7 @@ #include "gjs.h" #include +#include #include #if ENABLE_NLS @@ -481,6 +482,7 @@ main (int argc, MidoriStartup load_on_startup; gchar* homepage; KatzeArray* search_engines; + KatzeXbelItem* bookmarks; #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); @@ -696,12 +698,14 @@ main (int argc, G_CALLBACK (midori_web_list_add_item_cb), NULL); g_object_set (app, "settings", settings, + "bookmarks", bookmarks, "trash", trash, "search-engines", search_engines, NULL); MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", settings, + "bookmarks", bookmarks, "trash", trash, "search-engines", search_engines, NULL); diff --git a/midori/main.h b/midori/main.h index 51ef1d32..b2a3b89f 100644 --- a/midori/main.h +++ b/midori/main.h @@ -12,15 +12,7 @@ #ifndef __MAIN_H__ #define __MAIN_H__ 1 -#include - #include -#include -#include - -/* FIXME: Remove these globals */ - -KatzeXbelItem* bookmarks; /* Custom stock items diff --git a/midori/midori-app.c b/midori/midori-app.c index 8961951e..b463775c 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -32,6 +32,7 @@ struct _MidoriApp GtkAccelGroup* accel_group; MidoriWebSettings* settings; + KatzeXbelItem* bookmarks; KatzeArray* trash; KatzeArray* search_engines; @@ -47,10 +48,11 @@ enum PROP_0, PROP_SETTINGS, + PROP_BOOKMARKS, PROP_TRASH, + PROP_SEARCH_ENGINES, PROP_BROWSER, - PROP_BROWSER_COUNT, - PROP_SEARCH_ENGINES + PROP_BROWSER_COUNT }; enum { @@ -85,6 +87,8 @@ midori_app_get_property (GObject* object, static void midori_app_class_init (MidoriAppClass* class) { + GObjectClass* gobject_class; + signals[ADD_BROWSER] = g_signal_new ( "add-browser", G_TYPE_FROM_CLASS (class), @@ -106,15 +110,14 @@ midori_app_class_init (MidoriAppClass* class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class = G_OBJECT_CLASS (class); gobject_class->constructor = midori_app_constructor; gobject_class->finalize = midori_app_finalize; gobject_class->set_property = midori_app_set_property; gobject_class->get_property = midori_app_get_property; - MidoriAppClass* midoriapp_class = MIDORI_APP_CLASS (class); - midoriapp_class->add_browser = midori_app_add_browser; - midoriapp_class->quit = midori_app_quit; + class->add_browser = midori_app_add_browser; + class->quit = midori_app_quit; g_object_class_install_property (gobject_class, PROP_SETTINGS, @@ -125,6 +128,15 @@ midori_app_class_init (MidoriAppClass* class) MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_BOOKMARKS, + g_param_spec_object ( + "bookmarks", + _("Bookmarks"), + _("The bookmarks folder, containing all bookmarks"), + KATZE_TYPE_XBEL_ITEM, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_TRASH, g_param_spec_object ( @@ -134,6 +146,15 @@ midori_app_class_init (MidoriAppClass* class) KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_SEARCH_ENGINES, + g_param_spec_object ( + "search-engines", + _("Search Engines"), + _("The list of search engines"), + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_BROWSER, g_param_spec_object ( @@ -151,15 +172,6 @@ midori_app_class_init (MidoriAppClass* class) _("The current number of browsers"), 0, G_MAXUINT, 0, G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, - PROP_SEARCH_ENGINES, - g_param_spec_object ( - "search-engines", - _("Search Engines"), - _("The list of search engines"), - KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); } static GObject* @@ -233,8 +245,9 @@ midori_app_init (MidoriApp* app) app->accel_group = gtk_accel_group_new (); app->settings = midori_web_settings_new (); - app->trash = katze_array_new (KATZE_TYPE_XBEL_ITEM); - app->search_engines = katze_array_new (KATZE_TYPE_ITEM); + app->bookmarks = NULL; + app->trash = NULL; + app->search_engines = NULL; #if HAVE_UNIQUE display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); @@ -261,8 +274,14 @@ midori_app_finalize (GObject* object) g_list_free (app->browsers); g_object_unref (app->accel_group); - g_object_unref (app->settings); - g_object_unref (app->trash); + if (app->settings) + g_object_unref (app->settings); + if (app->bookmarks) + g_object_unref (app->bookmarks); + if (app->trash) + g_object_unref (app->trash); + if (app->search_engines) + g_object_unref (app->search_engines); if (app->instance) g_object_unref (app->instance); @@ -285,6 +304,11 @@ midori_app_set_property (GObject* object, g_object_ref (app->settings); /* FIXME: Propagate settings to all browsers */ break; + case PROP_BOOKMARKS: + katze_object_assign (app->bookmarks, g_value_get_object (value)); + g_object_ref (app->bookmarks); + /* FIXME: Propagate bookmarks to all browsers */ + break; case PROP_TRASH: katze_object_assign (app->trash, g_value_get_object (value)); g_object_ref (app->trash); @@ -314,18 +338,21 @@ midori_app_get_property (GObject* object, case PROP_SETTINGS: g_value_set_object (value, app->settings); break; + case PROP_BOOKMARKS: + g_value_set_object (value, app->bookmarks); + break; case PROP_TRASH: g_value_set_object (value, app->trash); break; + case PROP_SEARCH_ENGINES: + g_value_set_object (value, app->search_engines); + break; case PROP_BROWSER: g_value_set_object (value, app->browser); break; case PROP_BROWSER_COUNT: g_value_set_uint (value, g_list_length (app->browsers)); break; - case PROP_SEARCH_ENGINES: - g_value_set_object (value, app->search_engines); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -338,6 +365,7 @@ midori_browser_focus_in_event_cb (MidoriBrowser* browser, MidoriApp* app) { app->browser = browser; + g_object_notify (G_OBJECT (app), "browser"); return FALSE; } @@ -348,6 +376,7 @@ midori_browser_new_window_cb (MidoriBrowser* browser, { MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", app->settings, + "bookmarks", app->bookmarks, "trash", app->trash, "search-engines", app->search_engines, NULL); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7c761bc2..4f6a1089 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -74,6 +74,7 @@ struct _MidoriBrowser gchar* statusbar_text; MidoriWebSettings* settings; + KatzeXbelItem* bookmarks; GList* tab_titles; GList* close_buttons; @@ -93,8 +94,9 @@ enum PROP_URI, PROP_TAB, PROP_STATUSBAR, - PROP_SETTINGS, PROP_STATUSBAR_TEXT, + PROP_SETTINGS, + PROP_BOOKMARKS, PROP_TRASH, PROP_SEARCH_ENGINES }; @@ -680,7 +682,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, /* FIXME: We want to choose a folder */ if (new_bookmark) { - katze_xbel_folder_append_item (bookmarks, bookmark); + katze_xbel_folder_append_item (browser->bookmarks, bookmark); GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); GtkTreeIter iter; @@ -1278,23 +1280,6 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_STATUSBAR, G_PARAM_READABLE)); - /** - * MidoriBrowser:settings: - * - * An associated settings instance that is shared among all web views. - * - * Setting this value is propagated to every present web view. Also - * every newly created web view will use this instance automatically. - */ - g_object_class_install_property (gobject_class, - PROP_SETTINGS, - g_param_spec_object ( - "settings", - _("Settings"), - _("The associated settings"), - MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_READWRITE)); - /** * MidoriBrowser:statusbar-text: * @@ -1315,6 +1300,42 @@ midori_browser_class_init (MidoriBrowserClass* class) "", flags)); + /** + * MidoriBrowser:settings: + * + * An associated settings instance that is shared among all web views. + * + * Setting this value is propagated to every present web view. Also + * every newly created web view will use this instance automatically. + * + * If no settings are specified a default will be used. + */ + g_object_class_install_property (gobject_class, + PROP_SETTINGS, + g_param_spec_object ( + "settings", + _("Settings"), + _("The associated settings"), + MIDORI_TYPE_WEB_SETTINGS, + G_PARAM_READWRITE)); + + /** + * MidoriBrowser:bookmarks: + * + * The bookmarks folder, containing all bookmarks. + * + * This is actually a reference to a bookmarks instance, + * so if bookmarks should be used it must be initially set. + */ + g_object_class_install_property (gobject_class, + PROP_BOOKMARKS, + g_param_spec_object ( + "bookmarks", + _("Bookmarks"), + _("The bookmarks folder, containing all bookmarks"), + KATZE_TYPE_XBEL_ITEM, + G_PARAM_READWRITE)); + /** * MidoriBrowser:trash: * @@ -1338,6 +1359,9 @@ midori_browser_class_init (MidoriBrowserClass* class) * MidoriBrowser:search-engines: * * The list of search engines to be used for web search. + * + * This is actually a reference to a search engines instance, + * so if search engines should be used it must be initially set. */ g_object_class_install_property (gobject_class, PROP_SEARCH_ENGINES, @@ -3174,6 +3198,11 @@ midori_browser_init (MidoriBrowser* browser) GtkToolItem* toolitem; GtkRcStyle* rcstyle; + browser->settings = midori_web_settings_new (); + browser->bookmarks = NULL; + browser->trash = NULL; + browser->search_engines = NULL; + /* Setup the window metrics */ g_signal_connect (browser, "realize", G_CALLBACK (midori_browser_realize_cb), browser); @@ -3347,48 +3376,6 @@ midori_browser_init (MidoriBrowser* browser) GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); - _midori_browser_create_bookmark_menu (browser, bookmarks, - browser->menu_bookmarks); - for (i = 0; i < katze_xbel_folder_get_n_items (bookmarks); i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (bookmarks, i); - const gchar* title = katze_xbel_item_is_separator (item) - ? "" : katze_xbel_item_get_title (item); - const gchar* desc = katze_xbel_item_is_separator (item) - ? "" : katze_xbel_item_get_desc (item); - switch (katze_xbel_item_get_kind (item)) - { - case KATZE_XBEL_ITEM_KIND_FOLDER: - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); - gtk_tool_item_set_is_important(toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb), - browser); - if (desc && *desc) - gtk_tool_item_set_tooltip_text (toolitem, desc); - g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_BOOKMARK: - toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); - gtk_tool_item_set_is_important(toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), - browser); - if (desc && *desc) - gtk_tool_item_set_tooltip_text (toolitem, desc); - g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_SEPARATOR: - toolitem = gtk_separator_tool_item_new (); - break; - default: - g_warning ("Unknown item kind"); - } - gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); - } - sokoke_container_show_children (GTK_CONTAINER (browser->bookmarkbar)); gtk_box_pack_start (GTK_BOX (vbox), browser->bookmarkbar, FALSE, FALSE, 0); /* Superuser warning */ @@ -3431,7 +3418,6 @@ midori_browser_init (MidoriBrowser* browser) (GtkTreeCellDataFunc)midori_browser_bookmarks_item_render_text_cb, treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - _tree_store_insert_folder (GTK_TREE_STORE (treestore), NULL, bookmarks); g_object_unref (treestore); g_object_connect (treeview, "signal::row-activated", @@ -3452,6 +3438,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show_all (box); GtkWidget* toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_bookmarks"); + _action_set_sensitive (browser, "BookmarkAdd", FALSE); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); gtk_widget_show_all (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), @@ -3648,6 +3635,8 @@ midori_browser_finalize (GObject* object) if (browser->settings) g_object_unref (browser->settings); + if (browser->bookmarks) + g_object_unref (browser->bookmarks); if (browser->trash) g_object_unref (browser->trash); if (browser->search_engines) @@ -3826,6 +3815,78 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_unset (&value); } +static void +midori_browser_load_bookmarks (MidoriBrowser* browser) +{ + guint i, n; + KatzeXbelItem* item; + const gchar* title; + const gchar* desc; + GtkToolItem* toolitem; + GtkTreeModel* treestore; + + // FIXME: Clear bookmarks menu + // FIXME: Clear bookmarkbar + // FIXME: Clear bookmark panel + + _action_set_sensitive (browser, "BookmarkAdd", FALSE); + + if (!browser->bookmarks) + return; + + _midori_browser_create_bookmark_menu (browser, browser->bookmarks, + browser->menu_bookmarks); + n = katze_xbel_folder_get_n_items (browser->bookmarks); + for (i = 0; i < n; i++) + { + item = katze_xbel_folder_get_nth_item (browser->bookmarks, i); + title = katze_xbel_item_is_separator (item) + ? "" : katze_xbel_item_get_title (item); + desc = katze_xbel_item_is_separator (item) + ? "" : katze_xbel_item_get_desc (item); + switch (katze_xbel_item_get_kind (item)) + { + case KATZE_XBEL_ITEM_KIND_FOLDER: + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb), + browser); + if (desc && *desc) + gtk_tool_item_set_tooltip_text (toolitem, desc); + g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); + break; + case KATZE_XBEL_ITEM_KIND_BOOKMARK: + toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), + browser); + if (desc && *desc) + gtk_tool_item_set_tooltip_text (toolitem, desc); + g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); + break; + case KATZE_XBEL_ITEM_KIND_SEPARATOR: + toolitem = gtk_separator_tool_item_new (); + break; + default: + g_warning ("Unknown item kind"); + } + gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); + } + sokoke_container_show_children (GTK_CONTAINER (browser->bookmarkbar)); + + treestore = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); + _tree_store_insert_folder (GTK_TREE_STORE (treestore), + NULL, browser->bookmarks); + midori_panel_bookmarks_cursor_or_row_changed_cb ( + GTK_TREE_VIEW (browser->panel_bookmarks), browser); + + _action_set_sensitive (browser, "BookmarkAdd", TRUE); +} + static void midori_browser_set_property (GObject* object, guint prop_id, @@ -3863,6 +3924,13 @@ midori_browser_set_property (GObject* object, (GtkCallback) midori_web_view_set_settings, browser->settings); break; + case PROP_BOOKMARKS: + ; /* FIXME: Disconnect handlers */ + katze_object_assign (browser->bookmarks, g_value_get_object (value)); + g_object_ref (browser->bookmarks); + midori_browser_load_bookmarks (browser); + /* FIXME: Connect to updates */ + break; case PROP_TRASH: ; /* FIXME: Disconnect handlers */ katze_object_assign (browser->trash, g_value_get_object (value)); @@ -3923,6 +3991,9 @@ midori_browser_get_property (GObject* object, case PROP_SETTINGS: g_value_set_object (value, browser->settings); break; + case PROP_BOOKMARKS: + g_value_set_object (value, browser->bookmarks); + break; case PROP_TRASH: g_value_set_object (value, browser->trash); break; diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 7f920da5..eecea993 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -20,11 +20,12 @@ #include "sokoke.h" #include "compat.h" +#include #if HAVE_GIO #include #endif +#include #include -#include /* This is unstable API, so we need to declare it */ gchar* From 131b911ab57b8b7e6f71de768af4eaa384aff13b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 3 Sep 2008 02:39:25 +0200 Subject: [PATCH 0309/2970] Rename main.h to midori-stock.h --- midori/Makefile.am | 2 +- midori/main.c | 7 +++---- midori/midori-addons.c | 2 +- midori/midori-browser.c | 7 ++++--- midori/midori-locationaction.c | 2 +- midori/{main.h => midori-stock.h} | 6 +++--- midori/midori-webview.c | 6 +++--- midori/sokoke.c | 1 - 8 files changed, 16 insertions(+), 17 deletions(-) rename midori/{main.h => midori-stock.h} (95%) diff --git a/midori/Makefile.am b/midori/Makefile.am index 73229a72..ffe49e56 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = \ midori midori_SOURCES = \ - main.c main.h \ + main.c midori-stock.h \ gtkiconentry.c gtkiconentry.h \ midori-app.c midori-app.h \ midori-browser.c midori-browser.h \ diff --git a/midori/main.c b/midori/main.c index 267cb53a..b7d6f8b2 100644 --- a/midori/main.c +++ b/midori/main.c @@ -13,13 +13,12 @@ #include #endif -#include "main.h" - -#include "sokoke.h" - #include "midori-app.h" #include "midori-websettings.h" #include "midori-browser.h" +#include "midori-stock.h" + +#include "sokoke.h" #include "gjs.h" #include diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 6936756c..9842a468 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -15,7 +15,7 @@ #endif #include "midori-addons.h" -#include "main.h" +#include "midori-stock.h" #include "sokoke.h" #include "gjs.h" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4f6a1089..a005e453 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -15,9 +15,6 @@ #include "midori-browser.h" -#include "main.h" -#include "gtkiconentry.h" -#include "sokoke.h" #include "midori-webview.h" #include "midori-preferences.h" #include "midori-panel.h" @@ -25,7 +22,11 @@ #include "midori-console.h" #include "midori-searchentry.h" #include "midori-locationaction.h" +#include "midori-stock.h" + +#include "gtkiconentry.h" #include "compat.h" +#include "sokoke.h" #include "gjs.h" #if HAVE_GIO diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 6a45992e..75feb5ac 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -11,10 +11,10 @@ #include "midori-locationaction.h" -#include "main.h" #include "gtkiconentry.h" #include +#include #include #include diff --git a/midori/main.h b/midori/midori-stock.h similarity index 95% rename from midori/main.h rename to midori/midori-stock.h index b2a3b89f..caa467b7 100644 --- a/midori/main.h +++ b/midori/midori-stock.h @@ -9,8 +9,8 @@ See the file COPYING for the full license text. */ -#ifndef __MAIN_H__ -#define __MAIN_H__ 1 +#ifndef __MIDORI_STOCK_H__ +#define __MIDORI_STOCK_H__ 1 #include @@ -57,4 +57,4 @@ #define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" #endif -#endif /* !__MAIN_H__ */ +#endif /* !__MIDORI_STOCK_H__ */ diff --git a/midori/midori-webview.c b/midori/midori-webview.c index eecea993..301b82f2 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -14,11 +14,11 @@ #endif #include "midori-webview.h" +#include "midori-stock.h" -#include "main.h" -#include "gjs.h" -#include "sokoke.h" #include "compat.h" +#include "sokoke.h" +#include "gjs.h" #include #if HAVE_GIO diff --git a/midori/sokoke.c b/midori/sokoke.c index fadd5245..063c88c2 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -14,7 +14,6 @@ #endif #include "sokoke.h" -#include "main.h" #if HAVE_UNISTD_H #include From 065cfd08161938f015654d19b6855f7b96945b97 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 3 Sep 2008 03:19:40 +0200 Subject: [PATCH 0310/2970] Disable localization file updates and make them optional --- wscript | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index ef083ecf..ed38e04c 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,6 @@ def configure (conf): if not Params.g_options.disable_nls: conf.check_tool ('intltool') if conf.env['INTLTOOL'] and conf.env['POCOM']: - conf.find_program ('intltool-update', var='INTLTOOL_UPDATE') nls = 'yes' conf.define ('ENABLE_NLS', 1) conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) @@ -36,6 +35,16 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) + if Params.g_options.enable_update_po: + conf.find_program ('intltool-update', var='INTLTOOL_UPDATE') + if conf.env['INTLTOOL_UPDATE']: + update_po = 'yes' + else: + update_po = 'not available' + else: + update_po = 'no' + conf.check_message_custom ('localization file', 'updates', update_po) + if not Params.g_options.disable_unique: conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) single_instance = ['not available','yes'][conf.env['HAVE_UNIQUE'] == 1] @@ -90,6 +99,9 @@ def set_options (opt): opt.add_option ('--disable-gio', action='store_true', default=False, help='Disables GIO support', dest='disable_gio') + opt.add_option ('--enable-update-po', action='store_true', default=False, + help='Enables localization file updates', dest='enable_update_po') + def build (bld): bld.add_subdirs ('katze midori icons') From 1d047c4ab573a29e2c0298ea605cf251844f4a50 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Sep 2008 00:35:15 +0200 Subject: [PATCH 0311/2970] Factor out katze_xbel_folder_from_data_dirs and _to_data --- katze/katze-xbel.c | 38 +----------------------- katze/katze-xbel.h | 11 ------- midori/main.c | 66 ++++++++++++++++++++--------------------- midori/midori-browser.c | 35 +++++++++++----------- midori/midori-browser.h | 4 +-- 5 files changed, 53 insertions(+), 101 deletions(-) diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c index b526cdfb..3d4a3902 100644 --- a/katze/katze-xbel.c +++ b/katze/katze-xbel.c @@ -764,32 +764,6 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, return TRUE; } -/** - * katze_xbel_folder_from_data_dirs: - * @folder: An empty folder. - * @file: A relative path to a file. - * @full_path: return location for the full path of the file or %NULL - * @error: return location for a GError or %NULL - * - * Tries to load @file from the user data dir or any of the system data dirs. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gboolean -katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, - const gchar* file, - gchar** full_path, - GError** error) -{ - g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); - g_return_val_if_fail (file, FALSE); - /* FIXME: Essentially unimplemented */ - - *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); - return FALSE; -} - static gchar* katze_xbel_xml_element (const gchar* name, const gchar* value) @@ -860,17 +834,7 @@ katze_xbel_item_to_data (KatzeXbelItem* item) return markup; } -/** - * katze_xbel_folder_to_data: - * @folder: A folder. - * @length: return location for the length of the created string or %NULL - * @error: return location for a GError or %NULL - * - * Retrieve the contents of @folder as a string. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gchar* +static gchar* katze_xbel_folder_to_data (KatzeXbelItem* folder, gsize* length, GError** error) diff --git a/katze/katze-xbel.h b/katze/katze-xbel.h index cb66807b..5631b217 100644 --- a/katze/katze-xbel.h +++ b/katze/katze-xbel.h @@ -155,20 +155,9 @@ katze_xbel_folder_from_file (KatzeXbelItem* folder, const gchar* file, GError** error); -gboolean -katze_xbel_folder_from_data_dirs (KatzeXbelItem* folder, - const gchar* file, - gchar** full_path, - GError** error); - gchar* katze_xbel_item_to_data (KatzeXbelItem* item); -gchar* -katze_xbel_folder_to_data (KatzeXbelItem* folder, - gsize* length, - GError** error); - gboolean katze_xbel_folder_to_file (KatzeXbelItem* folder, const gchar* file, diff --git a/midori/main.c b/midori/main.c index b7d6f8b2..157136f7 100644 --- a/midori/main.c +++ b/midori/main.c @@ -351,38 +351,6 @@ midori_web_list_add_item_cb (KatzeArray* trash, } } -static void -midori_browser_session_cb (MidoriBrowser* browser, - gpointer arg1, - KatzeXbelItem* session) -{ - gchar* config_path; - gchar* config_file; - GError* error; - - config_path = g_build_filename (g_get_user_config_dir (), - PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0755); - config_file = g_build_filename (config_path, "session.xbel", NULL); - error = NULL; - if (!katze_xbel_folder_to_file (session, config_file, &error)) - { - g_warning (_("The session couldn't be saved. %s"), error->message); - g_error_free (error); - } - - g_free (config_file); - g_free (config_path); -} - -static void -midori_browser_weak_notify_cb (MidoriBrowser* browser, - KatzeXbelItem* session) -{ - g_object_disconnect (browser, "any-signal", - G_CALLBACK (midori_browser_session_cb), session, NULL); -} - static gchar* _simple_xml_element (const gchar* name, const gchar* value) @@ -464,6 +432,38 @@ katze_array_to_file (KatzeArray* array, return TRUE; } +static void +midori_browser_session_cb (MidoriBrowser* browser, + gpointer arg1, + KatzeArray* session) +{ + gchar* config_path; + gchar* config_file; + GError* error; + + config_path = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, NULL); + g_mkdir_with_parents (config_path, 0755); + config_file = g_build_filename (config_path, "session.xbel", NULL); + error = NULL; + if (!katze_array_to_file (session, config_file, &error)) + { + g_warning (_("The session couldn't be saved. %s"), error->message); + g_error_free (error); + } + + g_free (config_file); + g_free (config_path); +} + +static void +midori_browser_weak_notify_cb (MidoriBrowser* browser, + KatzeXbelItem* session) +{ + g_object_disconnect (browser, "any-signal", + G_CALLBACK (midori_browser_session_cb), session, NULL); +} + int main (int argc, char** argv) @@ -711,7 +711,7 @@ main (int argc, midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); - KatzeXbelItem* session = midori_browser_get_proxy_xbel_folder (browser); + KatzeArray* session = midori_browser_get_proxy_xbel_array (browser); n = katze_xbel_folder_get_n_items (_session); for (i = 0; i < n; i++) { diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a005e453..c0bfa090 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -79,7 +79,7 @@ struct _MidoriBrowser GList* tab_titles; GList* close_buttons; - KatzeXbelItem* proxy_xbel_folder; + KatzeArray* proxy_xbel_array; KatzeArray* trash; KatzeArray* search_engines; }; @@ -800,14 +800,14 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, KatzeXbelItem* xbel_item; const gchar* uri; - if (browser->proxy_xbel_folder && MIDORI_IS_WEB_VIEW (widget)) + if (browser->proxy_xbel_array && MIDORI_IS_WEB_VIEW (widget)) { xbel_item = midori_web_view_get_proxy_xbel_item ( MIDORI_WEB_VIEW (widget)); uri = katze_xbel_bookmark_get_href (xbel_item); if (browser->trash && uri && *uri) katze_array_add_item (browser->trash, xbel_item); - katze_xbel_folder_remove_item (browser->proxy_xbel_folder, xbel_item); + katze_array_remove_item (browser->proxy_xbel_array, xbel_item); katze_xbel_item_unref (xbel_item); } @@ -935,12 +935,12 @@ _midori_browser_add_tab (MidoriBrowser* browser, tab_title = midori_web_view_get_proxy_tab_title (MIDORI_WEB_VIEW (widget)); menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); - if (browser->proxy_xbel_folder) + if (browser->proxy_xbel_array) { xbel_item = midori_web_view_get_proxy_xbel_item ( MIDORI_WEB_VIEW (widget)); katze_xbel_item_ref (xbel_item); - katze_xbel_folder_append_item (browser->proxy_xbel_folder, xbel_item); + katze_array_add_item (browser->proxy_xbel_array, xbel_item); } g_object_connect (widget, @@ -991,14 +991,13 @@ _midori_browser_add_tab (MidoriBrowser* browser, gtk_image_new_from_pixbuf (icon)); g_object_unref (icon); - if (browser->proxy_xbel_folder) + if (browser->proxy_xbel_array) { xbel_item = katze_xbel_bookmark_new (); katze_xbel_item_set_title (xbel_item, title); katze_xbel_bookmark_set_href (xbel_item, _midori_browser_get_tab_uri (browser, widget)); - katze_xbel_folder_append_item (browser->proxy_xbel_folder, - xbel_item); + katze_array_add_item (browser->proxy_xbel_array, xbel_item); } } g_object_set_data (G_OBJECT (widget), "browser-tab-icon", tab_icon); @@ -3619,8 +3618,8 @@ midori_browser_dispose (GObject* object) MidoriBrowser* browser = MIDORI_BROWSER (object); /* We are done, the session mustn't change anymore */ - if (browser->proxy_xbel_folder) - katze_object_assign (browser->proxy_xbel_folder, NULL); + if (browser->proxy_xbel_array) + katze_object_assign (browser->proxy_xbel_array, NULL); G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object); } @@ -4258,10 +4257,10 @@ midori_browser_get_current_web_view (MidoriBrowser* browser) } /** - * midori_browser_get_proxy_xbel_folder: + * midori_browser_get_proxy_xbel_array: * @browser: a #MidoriBrowser * - * Retrieves a proxy xbel folder representing the respective proxy xbel items + * Retrieves a proxy xbel array representing the respective proxy xbel items * of the present web views that can be used for session management. * * The folder is created on the first call and will be updated to reflect @@ -4272,19 +4271,19 @@ midori_browser_get_current_web_view (MidoriBrowser* browser) * Note: Calling this function doesn't add a reference and the browser * may release its reference at some point. * - * Return value: the proxy #KatzeXbelItem + * Return value: the proxy #KatzeArray **/ -KatzeXbelItem* -midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser) +KatzeArray* +midori_browser_get_proxy_xbel_array (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - if (!browser->proxy_xbel_folder) + if (!browser->proxy_xbel_array) { - browser->proxy_xbel_folder = katze_xbel_folder_new (); + browser->proxy_xbel_array = katze_array_new (KATZE_TYPE_XBEL_ITEM); /* FIXME: Fill in xbel items of all present web views */ } - return browser->proxy_xbel_folder; + return browser->proxy_xbel_array; } /** diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 5c125d3f..42bff3f5 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -113,8 +113,8 @@ midori_browser_get_current_tab (MidoriBrowser* browser); GtkWidget* midori_browser_get_current_web_view (MidoriBrowser* browser); -KatzeXbelItem* -midori_browser_get_proxy_xbel_folder (MidoriBrowser* browser); +KatzeArray* +midori_browser_get_proxy_xbel_array (MidoriBrowser* browser); void midori_browser_quit (MidoriBrowser* browser); From e4f8fb12374c490bc1219925eae1da735f857e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 5 Sep 2008 21:07:34 +0200 Subject: [PATCH 0312/2970] Update French translation --- AUTHORS | 1 + po/fr.po | 812 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 414 insertions(+), 399 deletions(-) diff --git a/AUTHORS b/AUTHORS index 161eb23a..9682e1a4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,6 +21,7 @@ Translations: es: Christian Dywan fr: Christian Dywan fr: Adrien Nader + fr: Robert-André Mauchin gl: Miguel Anxo Bouzada hu: SZERVÁC Attila pl: Przemysław Sitek diff --git a/po/fr.po b/po/fr.po index 8161aa73..0d3bd81b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,795 +3,815 @@ # This file is distributed under the same license as the midori package. # Christian Dywan 2008 # Adrien Nader 2008 +# Robert-André Mauchin 2008 # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.18\n" +"Project-Id-Version: midori 0.0.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 00:20+0200\n" -"PO-Revision-Date: 2008-03-31 17:37+0100\n" -"Last-Translator: Adrien Nader \n" +"POT-Creation-Date: 2008-09-05 11:05+0200\n" +"PO-Revision-Date: 2008-09-05 12:58+0200\n" +"Last-Translator: Robert-André Mauchin \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Petit navigateur" +msgstr "Navigateur toile léger" -#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 -#: ../midori/main.c:419 ../midori/main.c:433 +#: ../midori.desktop.in.h:2 ../midori/main.c:491 ../midori/main.c:500 +#: ../midori/main.c:502 ../midori/main.c:516 msgid "Midori" msgstr "Midori" #: ../midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Navigateur" +msgstr "Navigateur toile" #: ../midori/main.c:52 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +#: ../midori/main.c:53 ../midori/midori-browser.c:2859 msgid "_Bookmarks" msgstr "_Signets" #: ../midori/main.c:54 msgid "_Add Bookmark" -msgstr "_Ajouter signet" +msgstr "_Ajouter un signet" #: ../midori/main.c:55 msgid "_Console" msgstr "_Console" #: ../midori/main.c:56 +msgid "_Disable" +msgstr "_Désactiver" + +#: ../midori/main.c:57 +msgid "_Enable" +msgstr "_Activer" + +#: ../midori/main.c:58 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:57 +#: ../midori/main.c:59 msgid "_History" msgstr "_Historique" -#: ../midori/main.c:58 +#: ../midori/main.c:60 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:59 +#: ../midori/main.c:61 msgid "_Pageholder" msgstr "C_adre de pages" -#: ../midori/main.c:60 -msgid "_Userscripts" -msgstr "_Scripts utilisateur" - -#: ../midori/main.c:61 -msgid "User_styles" -msgstr "Styles _utilisateur" - #: ../midori/main.c:62 -msgid "New _Tab" -msgstr "Nouvel O_nglet" +msgid "_Userscripts" +msgstr "Scripts _utilisateur" #: ../midori/main.c:63 +msgid "User_styles" +msgstr "_Styles utilisateur" + +#: ../midori/main.c:64 +msgid "New _Tab" +msgstr "Nouvel _onglet" + +#: ../midori/main.c:65 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/main.c:64 +#: ../midori/main.c:66 msgid "_Closed Tabs and Windows" -msgstr "_Onglets et fenêtres fermés" - -#: ../midori/main.c:65 -msgid "New _Window" -msgstr "Nouvelle F_enêtre" +msgstr "Onglets et fenêtres _fermés" #: ../midori/main.c:67 +msgid "New _Window" +msgstr "Nouvelle _fenêtre" + +#: ../midori/main.c:69 msgid "Select _All" msgstr "_Tout sélectionner" -#: ../midori/main.c:70 +#: ../midori/main.c:72 msgid "_Fullscreen" msgstr "_Plein écran" -#: ../midori/main.c:71 +#: ../midori/main.c:73 msgid "_Leave Fullscreen" msgstr "_Quitter le plein écran" -#: ../midori/main.c:122 +#: ../midori/main.c:124 #, c-format msgid "The configuration couldn't be loaded. %s\n" msgstr "La configuration n'a pu être chargée. %s\n" -#: ../midori/main.c:177 +#: ../midori/main.c:179 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "La valeur '%s' n'est pas valide pour %s" +msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:184 ../midori/main.c:253 +#: ../midori/main.c:186 ../midori/main.c:255 #, c-format msgid "Unhandled settings value '%s'" -msgstr "Réglage non pris en charge '%s'" +msgstr "Valeur de paramètre non pris en charge « %s »" -#: ../midori/main.c:368 +#: ../midori/main.c:426 ../midori/sokoke.c:522 ../katze/katze-xbel.c:899 +#, c-format +msgid "Writing failed." +msgstr "L'écriture a échoué." + +#: ../midori/main.c:451 #, c-format msgid "The session couldn't be saved. %s" -msgstr "La session n'a pu être sauveguardé. %s" +msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:396 +#: ../midori/main.c:478 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:413 +#: ../midori/main.c:496 msgid "[URL]" msgstr "[URL]" -#: ../midori/main.c:417 +#: ../midori/main.c:500 msgid "Unknown argument." -msgstr "" +msgstr "Paramètre inconnu." -#: ../midori/main.c:419 +#: ../midori/main.c:502 msgid "Failed to setup interface." -msgstr "" +msgstr "La mise en place de l'interface a échoué." -#: ../midori/main.c:434 +#: ../midori/main.c:517 msgid "Please report comments, suggestions and bugs to:" -msgstr "Merci d'envoyer vos commentaires, suggestions et problèmes :" +msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:436 +#: ../midori/main.c:519 msgid "Check for new versions at:" -msgstr "Vérifier l'existence de nouvelles versions sur :" +msgstr "Vérifier l'existence de nouvelles versions à :" #. FIXME: Do we want a graphical error message? -#: ../midori/main.c:467 +#: ../midori/main.c:550 #, c-format msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:501 +#: ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be loaded. %s\n" msgstr "Les signets n'ont pu être chargés. %s\n" -#: ../midori/main.c:515 +#: ../midori/main.c:598 #, c-format msgid "The session couldn't be loaded. %s\n" msgstr "La session n'a pu être chargée. %s\n" # pas très content -#: ../midori/main.c:527 +#: ../midori/main.c:610 #, c-format msgid "The trash couldn't be loaded. %s\n" msgstr "La corbeille n'a pu être chargée. %s\n" -#: ../midori/main.c:539 +#: ../midori/main.c:622 msgid "The following errors occured:" -msgstr "Les erreurs suivantes ont eu lieu :" +msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:688 +#: ../midori/main.c:774 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Les moteurs de recherche n'ont pu être sauveguardés. %s" +msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:698 +#: ../midori/main.c:784 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Les signets n'ont pu être sauveguardés. %s" +msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content -#: ../midori/main.c:707 +#: ../midori/main.c:793 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "La corbeille n'a pu être sauveguardé. %s" +msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:715 +#: ../midori/main.c:801 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "La configuration n'a pu être sauveguardé. %s" +msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 +#: ../midori/midori-app.c:126 ../midori/midori-browser.c:1317 msgid "Settings" -msgstr "Réglages" +msgstr "Paramètres" -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 +#: ../midori/midori-app.c:127 ../midori/midori-browser.c:1318 msgid "The associated settings" -msgstr "Les réglages associés" +msgstr "Les paramètres associés" -#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 +#: ../midori/midori-app.c:135 ../midori/midori-browser.c:1334 +#: ../midori/midori-browser.c:3446 +msgid "Bookmarks" +msgstr "Signets" + +#: ../midori/midori-app.c:136 ../midori/midori-browser.c:1335 +msgid "The bookmarks folder, containing all bookmarks" +msgstr "Le dossier de signets, contenant tous les signets" + +#: ../midori/midori-app.c:144 ../midori/midori-browser.c:1353 msgid "Trash" msgstr "Corbeille" -#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 +#: ../midori/midori-app.c:145 ../midori/midori-browser.c:1354 msgid "The trash, collecting recently closed tabs and windows" -msgstr "La corbeille, récupérant les onglets et fenêtres récemment fermés" +msgstr "La corbeille, contenant les onglets et fenêtres récemment fermés" -#: ../midori/midori-app.c:141 -msgid "Browser" -msgstr "Navigateur" - -#: ../midori/midori-app.c:142 -msgid "The current browser" -msgstr "Le navigateur actuel" - -#: ../midori/midori-app.c:150 -msgid "Browser Count" -msgstr "Le nombre de navigateurs" - -#: ../midori/midori-app.c:151 -msgid "The current number of browsers" -msgstr "Le nombre actuel de navigateurs" - -#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 +#: ../midori/midori-app.c:153 ../midori/midori-browser.c:1370 #: ../midori/midori-searchentry.c:65 msgid "Search Engines" msgstr "Moteurs de recherche" -#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 +#: ../midori/midori-app.c:154 ../midori/midori-searchentry.c:66 msgid "The list of search engines" -msgstr "" +msgstr "La liste des moteurs de recherche" -#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +#: ../midori/midori-app.c:162 +msgid "Browser" +msgstr "Navigateur" + +#: ../midori/midori-app.c:163 +msgid "The current browser" +msgstr "Le navigateur actuel" + +#: ../midori/midori-app.c:171 +msgid "Browser Count" +msgstr "Le nombre de navigateurs" + +#: ../midori/midori-app.c:172 +msgid "The current number of browsers" +msgstr "Le nombre actuel de navigateurs" + +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 msgid "None" msgstr "Aucun" -#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3504 msgid "Extensions" msgstr "Extensions" -#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3487 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3495 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../midori/midori-addons.c:113 +#: ../midori/midori-addons.c:115 msgid "Web Widget" -msgstr "" +msgstr "Widget toile" -#: ../midori/midori-addons.c:114 +#: ../midori/midori-addons.c:116 msgid "The assigned web widget" -msgstr "" +msgstr "Le widget toile assigné" -#: ../midori/midori-addons.c:122 +#: ../midori/midori-addons.c:124 msgid "Kind" -msgstr "" +msgstr "Type" -#: ../midori/midori-addons.c:123 +#: ../midori/midori-addons.c:125 msgid "The kind of addons" -msgstr "" +msgstr "Le type d'addiciels" -#: ../midori/midori-browser.c:192 +#: ../midori/midori-browser.c:195 msgid "Source" msgstr "Source" -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2812 msgid "Reload the current page" -msgstr "Recharger la page" +msgstr "Actualiser la page" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 +#: ../midori/midori-browser.c:286 ../midori/midori-browser.c:2809 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:349 +#: ../midori/midori-browser.c:361 #, c-format msgid "%d%% loaded" -msgstr "%d%% chargés" +msgstr "%d %% chargés" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:588 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:588 msgid "Edit bookmark" -msgstr "Éditer le signet" +msgstr "Modifier le signet" -#: ../midori/midori-browser.c:597 +#: ../midori/midori-browser.c:612 msgid "_Title:" -msgstr "_Titre :" +msgstr "_Titre :" -#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 +#: ../midori/midori-browser.c:625 ../midori/midori-searchentry.c:567 msgid "_Description:" -msgstr "_Description :" +msgstr "_Description :" -#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 +#: ../midori/midori-browser.c:644 ../midori/midori-searchentry.c:581 msgid "_URL:" -msgstr "_URL :" +msgstr "_URL :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:646 +#: ../midori/midori-browser.c:661 msgid "_Folder:" -msgstr "_Dossier :" +msgstr "_Dossier :" -#: ../midori/midori-browser.c:650 +#: ../midori/midori-browser.c:665 msgid "Root" msgstr "Racine" -#: ../midori/midori-browser.c:1082 +#: ../midori/midori-browser.c:1096 #, c-format msgid "Unexpected action '%s'." -msgstr "Action inattendue '%s'" +msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:1228 +#: ../midori/midori-browser.c:1242 msgid "Menubar" msgstr "Barre de menu" -#: ../midori/midori-browser.c:1229 +#: ../midori/midori-browser.c:1243 msgid "The menubar" msgstr "La barre de menu" -#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 +#: ../midori/midori-browser.c:1251 ../midori/midori-preferences.c:374 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-browser.c:1238 +#: ../midori/midori-browser.c:1252 msgid "The navigationbar" msgstr "La barre de navigation" -#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 +#: ../midori/midori-browser.c:1260 ../katze/katze-item.c:90 msgid "URI" msgstr "URI" -#: ../midori/midori-browser.c:1247 +#: ../midori/midori-browser.c:1261 msgid "The current URI" msgstr "L'URI actuel" -#: ../midori/midori-browser.c:1255 +#: ../midori/midori-browser.c:1269 msgid "Tab" msgstr "Onglet" -#: ../midori/midori-browser.c:1256 +#: ../midori/midori-browser.c:1270 msgid "The current tab" msgstr "L'onglet actuel" -#: ../midori/midori-browser.c:1264 +#: ../midori/midori-browser.c:1278 msgid "Statusbar" msgstr "Barre d'état" -#: ../midori/midori-browser.c:1265 +#: ../midori/midori-browser.c:1279 msgid "The statusbar" msgstr "La barre d'état" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1298 msgid "Statusbar Text" msgstr "Texte de la barre d'état" -#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 +#: ../midori/midori-browser.c:1299 ../midori/midori-webview.c:265 msgid "The text that is displayed in the statusbar" msgstr "Le texte affiché dans la barre d'êtat" -#: ../midori/midori-browser.c:1335 +#: ../midori/midori-browser.c:1371 msgid "The list of search engines to be used for web search" -msgstr "" +msgstr "La liste des moteurs de recherche à utiliser pour la recherche toile" -#: ../midori/midori-browser.c:2313 +#: ../midori/midori-browser.c:2350 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2515 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2486 +#: ../midori/midori-browser.c:2523 msgid "translator-credits" msgstr "" "Christian Dywan \n" -"Adrien Nader " +"Adrien Nader \n" +"Robert-André Mauchin " -#: ../midori/midori-browser.c:2699 +#: ../midori/midori-browser.c:2729 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:2732 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2705 +#: ../midori/midori-browser.c:2735 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:2738 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:2711 +#: ../midori/midori-browser.c:2741 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:2713 +#: ../midori/midori-browser.c:2743 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:2714 +#: ../midori/midori-browser.c:2744 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:2716 +#: ../midori/midori-browser.c:2746 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:2747 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:2719 +#: ../midori/midori-browser.c:2749 msgid "Pa_ge Setup" -msgstr "Gestion de page" +msgstr "Mise de page" -#: ../midori/midori-browser.c:2723 +#: ../midori/midori-browser.c:2753 msgid "Show a preview of the printed page" -msgstr "" +msgstr "Affiche un aperçu de la page avant impression" -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:2756 msgid "Print the current page" -msgstr "Imprimer la page actuel" +msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2759 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:2731 +#: ../midori/midori-browser.c:2761 msgid "_Edit" -msgstr "Édit_er" +msgstr "É_dition" -#: ../midori/midori-browser.c:2734 +#: ../midori/midori-browser.c:2764 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../midori/midori-browser.c:2737 +#: ../midori/midori-browser.c:2767 msgid "Redo the last modification" -msgstr "Répéter la dernière modification" +msgstr "Rétablir la dernière modification" -#: ../midori/midori-browser.c:2740 +#: ../midori/midori-browser.c:2770 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 +#: ../midori/midori-browser.c:2773 ../midori/midori-browser.c:2776 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:2749 +#: ../midori/midori-browser.c:2779 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:2752 +#: ../midori/midori-browser.c:2782 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:2755 +#: ../midori/midori-browser.c:2785 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:2758 +#: ../midori/midori-browser.c:2788 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:2760 +#: ../midori/midori-browser.c:2790 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:2761 +#: ../midori/midori-browser.c:2791 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:2793 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:2764 +#: ../midori/midori-browser.c:2794 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:2766 +#: ../midori/midori-browser.c:2796 msgid "_Quick Find" -msgstr "Recherche rapide" +msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:2767 +#: ../midori/midori-browser.c:2797 msgid "Quickly jump to a word or phrase" -msgstr "" +msgstr "Saut rapide vers un mot ou d'une phrase" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2800 msgid "Configure the application preferences" -msgstr "Configurer les préferences de l'application" +msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:2802 msgid "_View" -msgstr "_Vue" +msgstr "_Affichage" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2803 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:2785 +#: ../midori/midori-browser.c:2815 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:2788 +#: ../midori/midori-browser.c:2818 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:2791 +#: ../midori/midori-browser.c:2821 msgid "Reset the zoom level" -msgstr "Remettre le niveau d'agrandissement" +msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:2793 +#: ../midori/midori-browser.c:2823 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:2824 msgid "View the source code of the page" -msgstr "" +msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:2796 +#: ../midori/midori-browser.c:2826 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:2827 msgid "View the source code of the selection" -msgstr "Afficher le code source de la sélection" +msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2830 msgid "Toggle fullscreen view" -msgstr "Activer/Désactiver le plein écran" +msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:2832 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:2805 +#: ../midori/midori-browser.c:2835 msgid "Go back to the previous page" -msgstr "" +msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:2808 +#: ../midori/midori-browser.c:2838 msgid "Go forward to the next page" -msgstr "Arrêter le chargement de la page" +msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:2811 +#: ../midori/midori-browser.c:2841 msgid "Go to your homepage" -msgstr "" +msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:2813 +#: ../midori/midori-browser.c:2843 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:2814 +#: ../midori/midori-browser.c:2844 msgid "Run a web search" -msgstr "Démarrer une recherche toile" +msgstr "Lance une recherche toile" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2846 msgid "Open in Page_holder..." msgstr "Ouvrir dans le _cadre de pages..." -#: ../midori/midori-browser.c:2817 +#: ../midori/midori-browser.c:2847 msgid "Open the current page in the pageholder" -msgstr "Ouvrir la page actuel dans le cadre de pages" +msgstr "Ouvrir la page actuelle dans le cadre de pages" #. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2851 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:2823 +#: ../midori/midori-browser.c:2853 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2854 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:2826 +#: ../midori/midori-browser.c:2856 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2857 msgid "Open the last closed tab" -msgstr "Ouvrir l'onglet plus récemment fermé" +msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:2832 +#: ../midori/midori-browser.c:2862 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:2834 +#: ../midori/midori-browser.c:2864 msgid "_Manage Bookmarks" -msgstr "_Gérer les signets" +msgstr "_Gestion des signets" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:2865 msgid "Add, edit and remove bookmarks..." msgstr "Ajouter, modifier et supprimer des signets..." -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:2868 msgid "Open the selected bookmark" msgstr "Ouvrir le signet sélectionné" -#: ../midori/midori-browser.c:2840 +#: ../midori/midori-browser.c:2870 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2841 +#: ../midori/midori-browser.c:2871 msgid "Open the selected bookmark in a new tab" msgstr "Ouvrir le signet sélectionné dans un nouvel onglet" -#: ../midori/midori-browser.c:2843 +#: ../midori/midori-browser.c:2873 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2844 +#: ../midori/midori-browser.c:2874 msgid "Open the selected bookmark in a new window" -msgstr "Ouvrir le signet sélectionné dans un nouvel fenêtre" +msgstr "Ouvrir le signet sélectionné dans une nouvelle fenêtre" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2877 msgid "Edit the selected bookmark" -msgstr "Éditer le signet sélectionné" +msgstr "Modifier le signet sélectionné" -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:2880 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2882 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 +#: ../midori/midori-browser.c:2884 ../midori/midori-searchentry.c:160 msgid "_Manage Search Engines" -msgstr "_Gérer les moteurs de recherche" +msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:2885 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:2858 +#: ../midori/midori-browser.c:2888 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:2890 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:2891 msgid "Switch to the previous tab" -msgstr "" +msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:2863 +#: ../midori/midori-browser.c:2893 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:2894 msgid "Switch to the next tab" -msgstr "" +msgstr "Bascule vers l'onglet suivant" # fonctionnalité à tester -#: ../midori/midori-browser.c:2866 +#: ../midori/midori-browser.c:2896 msgid "Tab _Overview" msgstr "_Aperçu des onglets" -#: ../midori/midori-browser.c:2867 +#: ../midori/midori-browser.c:2897 msgid "Show an overview of all open tabs" -msgstr "" +msgstr "Affiche une vue générale de tous les onglets ouverts" #. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:2899 msgid "_Help" -msgstr "_Aide" +msgstr "Aid_e" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:2901 msgid "_Contents" -msgstr "_Contenu" +msgstr "_Sommaire" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:2902 msgid "Show the documentation" -msgstr "" +msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:2905 msgid "Show information about the program" -msgstr "" +msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2911 msgid "P_rivate Browsing" -msgstr "Navigation en _privé" +msgstr "Navigation _privée" -#: ../midori/midori-browser.c:2882 +#: ../midori/midori-browser.c:2912 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:2915 msgid "_Work Offline" -msgstr "Travailler hors ligne" +msgstr "Travailler _hors ligne" -#: ../midori/midori-browser.c:2886 +#: ../midori/midori-browser.c:2916 msgid "Work without a network connection" -msgstr "" +msgstr "Travaille sans connexion réseau" -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:2920 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:2891 +#: ../midori/midori-browser.c:2921 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:2924 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:2895 +#: ../midori/midori-browser.c:2925 msgid "Show sidepanel" -msgstr "Afficher panneau latéral" +msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2928 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:2899 +#: ../midori/midori-browser.c:2929 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:2932 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:2933 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2936 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:2937 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3263 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3265 msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:3453 -msgid "Bookmarks" -msgstr "Signets" +msgstr "Ouvre un emplacement particulier" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 +#: ../midori/midori-browser.c:3453 ../midori/midori-preferences.c:279 msgid "Transfers" msgstr "Transferts" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3462 msgid "Console" msgstr "Console" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3469 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3485 +#: ../midori/midori-browser.c:3478 msgid "Pageholder" msgstr "Cadre de pages" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3527 msgid "_Inline find:" -msgstr "Recherche rapide:" +msgstr "Recherche rapide :" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3562 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3579 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:3814 #, c-format msgid "Unexpected setting '%s'" -msgstr "Réglages des polices" +msgstr "Paramètre inattendu « %s »" #: ../midori/midori-panel.c:146 msgid "Shadow Type" -msgstr "" +msgstr "Type d'ombres" #: ../midori/midori-panel.c:147 msgid "Appearance of the shadow around each panel" @@ -807,7 +827,7 @@ msgstr "Menu pour contenir les éléments des panneaux" #: ../midori/midori-panel.c:165 msgid "Page" -msgstr "" +msgstr "Page" #: ../midori/midori-panel.c:166 msgid "The index of the current page" @@ -827,7 +847,7 @@ msgstr "Page d'accueil" #: ../midori/midori-websettings.c:132 msgid "Last open pages" -msgstr "Pages récemment ouvertes" +msgstr "Dernières pages ouvertes" #: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" @@ -865,10 +885,9 @@ msgstr "Nouvelle fenêtre" msgid "Current tab" msgstr "Onglet actuel" -# # Défaut n'est pas vraiment français, "par défaut" l'est #: ../midori/midori-websettings.c:184 msgid "Default" -msgstr "Défaut" +msgstr "Par défaut" #: ../midori/midori-websettings.c:185 msgid "Icons" @@ -896,11 +915,11 @@ msgstr "Témoins de session" #: ../midori/midori-websettings.c:242 msgid "Remember last window size" -msgstr "Se rappeler de la taille de la fenêtre" +msgstr "Se souvenir de la taille de la fenêtre" #: ../midori/midori-websettings.c:243 msgid "Whether to save the last window size" -msgstr "Enregistrer ou non la dernière taille de la fenêtre" +msgstr "Enregistrer la dernière taille de la fenêtre" #: ../midori/midori-websettings.c:251 msgid "Last window width" @@ -944,11 +963,11 @@ msgstr "La dernière recherche toile enregistrée" #: ../midori/midori-websettings.c:296 msgid "Last pageholder URI" -msgstr "Dernière URI du cadre de pages" +msgstr "Dernier URI du cadre de pages" #: ../midori/midori-websettings.c:297 msgid "The URI last opened in the pageholder" -msgstr "L'URI ouverte le plus récemment dans le cadre de pages" +msgstr "Le dernier URI ouvert dans le cadre de pages" #: ../midori/midori-websettings.c:307 msgid "Show Navigationbar" @@ -956,7 +975,7 @@ msgstr "Afficher la barre de navigation" #: ../midori/midori-websettings.c:308 msgid "Whether to show the navigationbar" -msgstr "Afficher ou non la barre de navigation" +msgstr "Indique s'il faut afficher la barre de navigation" #: ../midori/midori-websettings.c:316 msgid "Show Bookmarkbar" @@ -964,7 +983,7 @@ msgstr "Afficher la barre des _signets" #: ../midori/midori-websettings.c:317 msgid "Whether to show the bookmarkbar" -msgstr "Afficher ou non la barre des signets" +msgstr "Indique s'il faut afficher la barre des signets" #: ../midori/midori-websettings.c:325 msgid "Show Panel" @@ -972,7 +991,7 @@ msgstr "Afficher le panneau" #: ../midori/midori-websettings.c:326 msgid "Whether to show the panel" -msgstr "Afficher ou non le panneau" +msgstr "Indique s'il faut afficher le panneau" #: ../midori/midori-websettings.c:334 msgid "Show Statusbar" @@ -980,7 +999,7 @@ msgstr "Afficher la barre d'état" #: ../midori/midori-websettings.c:335 msgid "Whether to show the statusbar" -msgstr "Afficher ou non la barre d'état" +msgstr "Indique s'il faut afficher la barre d'état" #: ../midori/midori-websettings.c:344 msgid "Toolbar Style" @@ -992,7 +1011,7 @@ msgstr "Le style de la barre d'outils" #: ../midori/midori-websettings.c:354 msgid "Show New Tab" -msgstr "Nouvel onglet" +msgstr "Afficher Nouvel onglet" #: ../midori/midori-websettings.c:355 msgid "Show the New Tab button in the toolbar" @@ -1000,7 +1019,7 @@ msgstr "Afficher le bouton de nouvel onglet dans la barre d'outils" #: ../midori/midori-websettings.c:363 msgid "Show Homepage" -msgstr "Afficher la page d'accueil" +msgstr "Afficher Page d'accueil" #: ../midori/midori-websettings.c:364 msgid "Show the Homepage button in the toolbar" @@ -1008,7 +1027,7 @@ msgstr "Afficher le bouton de page d'accueil dans la barre d'outils" #: ../midori/midori-websettings.c:372 msgid "Show Web search" -msgstr "Afficher la recherche toile" +msgstr "Afficher Recherche toile" #: ../midori/midori-websettings.c:373 msgid "Show the Web search entry in the toolbar" @@ -1016,7 +1035,7 @@ msgstr "Afficher le champ de recherche toile dans la barre d'outils" #: ../midori/midori-websettings.c:381 msgid "Show Trash" -msgstr "Afficher la corbeille" +msgstr "Afficher Corbeille" #: ../midori/midori-websettings.c:382 msgid "Show the Trash button in the toolbar" @@ -1028,7 +1047,7 @@ msgstr "Charger au démarrage" #: ../midori/midori-websettings.c:393 msgid "What to load on startup" -msgstr "Que charger au démarrage" +msgstr "Éléments à charger au démarrage" #: ../midori/midori-websettings.c:403 msgid "The homepage" @@ -1036,19 +1055,19 @@ msgstr "La page d'accueil" #: ../midori/midori-websettings.c:411 msgid "Download Folder" -msgstr "Répertoire de téléchargement" +msgstr "Dossier de téléchargements" #: ../midori/midori-websettings.c:412 msgid "The folder downloaded files are saved to" -msgstr "Le répertoire pour guarder les téléchargements" +msgstr "Le dossier où enregistrer les téléchargements" #: ../midori/midori-websettings.c:420 msgid "Download Manager" -msgstr "Gestionnaire de téléchargement" +msgstr "Gestionnaire de téléchargements" #: ../midori/midori-websettings.c:421 msgid "An external download manager" -msgstr "Un gestionnaire de téléchargement extern" +msgstr "Un gestionnaire de téléchargements externe" #: ../midori/midori-websettings.c:429 msgid "Location entry Search" @@ -1060,11 +1079,11 @@ msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" #: ../midori/midori-websettings.c:438 msgid "Preferred Encoding" -msgstr "Encodage préferé" +msgstr "Codage favori" #: ../midori/midori-websettings.c:439 msgid "The preferred character encoding" -msgstr "Encodage préféré des charactères" +msgstr "Codage des caractères favori" #: ../midori/midori-websettings.c:450 msgid "Tab Label Size" @@ -1076,11 +1095,11 @@ msgstr "La taille désirée du libellé des onglets" #: ../midori/midori-websettings.c:459 msgid "Close Buttons on Tabs" -msgstr "Bouton fermer sur les onglets" +msgstr "Boutons fermer sur les onglets" #: ../midori/midori-websettings.c:460 msgid "Whether tabs have close buttons" -msgstr "Les onglets ont-ils des boutons de fermeture" +msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" #: ../midori/midori-websettings.c:468 msgid "Open new pages in" @@ -1092,7 +1111,7 @@ msgstr "Où ouvrir les nouvelles pages" #: ../midori/midori-websettings.c:478 msgid "Middle click opens Selection" -msgstr "Clic molette charge la sélection" +msgstr "Clic milieu ouvre la sélection" #: ../midori/midori-websettings.c:479 msgid "Load an URL from the selection via middle click" @@ -1104,7 +1123,7 @@ msgstr "Ouvrir les onglets en arrière-plan" #: ../midori/midori-websettings.c:488 msgid "Whether to open new tabs in the background" -msgstr "Ouvrir ou non les nouveaux onglets en arrière-plan" +msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" #: ../midori/midori-websettings.c:496 msgid "Open Tabs next to Current" @@ -1112,15 +1131,15 @@ msgstr "Ouvrir les onglets à côté de l'actuel" #: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Ouvrir les nouveaux onglets à côté de l'actuel ou après le dernier" +msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le dernier" #: ../midori/midori-websettings.c:505 msgid "Open popups in tabs" -msgstr "Ouvrir les fenêtres intempestives" +msgstr "Ouvrir les fenêtres surgissantes dans des onglets" #: ../midori/midori-websettings.c:506 msgid "Whether to open popup windows in tabs" -msgstr "Ouvrir ou non les popups dans des onglets" +msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" #: ../midori/midori-websettings.c:516 msgid "Accept cookies" @@ -1128,7 +1147,7 @@ msgstr "Accepter les témoins" #: ../midori/midori-websettings.c:517 msgid "What type of cookies to accept" -msgstr "Quel type de témoins accepter" +msgstr "Type de témoins à accepter" #: ../midori/midori-websettings.c:526 msgid "Original cookies only" @@ -1144,15 +1163,15 @@ msgstr "Âge maximal des témoins" #: ../midori/midori-websettings.c:536 msgid "The maximum number of days to save cookies for" -msgstr "Le nombre maximal de jours durant lesquels guarder les témoins" +msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" #: ../midori/midori-websettings.c:546 msgid "Remember last visited pages" -msgstr "Se rappeler des pages visitées récemment" +msgstr "Se souvenir des pages récemment visitées" #: ../midori/midori-websettings.c:547 msgid "Whether the last visited pages are saved" -msgstr "Enregistrer ou non les pages visitées" +msgstr "Indique s'il faut enregistrer les dernières pages visitées" #: ../midori/midori-websettings.c:555 msgid "Maximum history age" @@ -1160,23 +1179,23 @@ msgstr "Âge maximal de l'historique" #: ../midori/midori-websettings.c:556 msgid "The maximum number of days to save the history for" -msgstr "Le nombre maximal de jours durant lesquels garder l'historique" +msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" #: ../midori/midori-websettings.c:564 msgid "Remember last form inputs" -msgstr "Se rappeler des dernières saisies de formulaires" +msgstr "Se souvenir des dernières saisies de formulaires" #: ../midori/midori-websettings.c:565 msgid "Whether the last form inputs are saved" -msgstr "Enregistrer ou non les saisies de formulaires" +msgstr "Indique s'il faut enregistrer les saisies de formulaires" #: ../midori/midori-websettings.c:573 msgid "Remember last downloaded files" -msgstr "Se rappeler des derniers fichiers téléchargés" +msgstr "Se souvenir des derniers fichiers téléchargés" #: ../midori/midori-websettings.c:574 msgid "Whether the last downloaded files are saved" -msgstr "Enregistrer ou non la liste des fichiers téléchargés" +msgstr "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" #: ../midori/midori-websettings.c:584 msgid "HTTP Proxy" @@ -1192,56 +1211,56 @@ msgstr "Taille de l'antémémoire (cache)" #: ../midori/midori-websettings.c:594 msgid "The allowed size of the cache" -msgstr "La taille acceptée de l'antémémoire" - -#: ../midori/midori-webview.c:64 -msgid "Load Provisional" -msgstr "" +msgstr "La taille de l'antémémoire permise" #: ../midori/midori-webview.c:65 -msgid "Load Committed" -msgstr "" +msgid "Load Provisional" +msgstr "Chargement provisoire" #: ../midori/midori-webview.c:66 -msgid "Load Finished" -msgstr "" +msgid "Load Committed" +msgstr "Chargement envoyé" -#: ../midori/midori-webview.c:224 +#: ../midori/midori-webview.c:67 +msgid "Load Finished" +msgstr "Chargement effectué" + +#: ../midori/midori-webview.c:225 msgid "The URI of the currently loaded page" msgstr "L'URI de la page actuellement chargée" -#: ../midori/midori-webview.c:234 +#: ../midori/midori-webview.c:235 msgid "The title of the currently loaded page" msgstr "Le titre de la page actuellement chargée" -#: ../midori/midori-webview.c:244 +#: ../midori/midori-webview.c:245 msgid "The current loading progress" -msgstr "" +msgstr "L'avancement du chargement en cours" -#: ../midori/midori-webview.c:253 +#: ../midori/midori-webview.c:254 msgid "The current loading status" -msgstr "" +msgstr "L'état du chargement en cours" -#: ../midori/midori-webview.c:695 +#: ../midori/midori-webview.c:699 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-webview.c:723 +#: ../midori/midori-webview.c:727 msgid "Download Link with Download _Manager" -msgstr "Télécharge le lien avec le gestionnaire de _télégarments" +msgstr "Télécharger le lien avec le gestionnaire de _téléchargements" -#: ../midori/midori-webview.c:741 +#: ../midori/midori-webview.c:745 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" #: ../midori/midori-preferences.c:62 msgid "Settings instance to provide properties" -msgstr "" +msgstr "Réglages de l'instance pour fournir les propriétés" #: ../midori/midori-preferences.c:84 #, c-format msgid "%s Preferences" -msgstr "%s Préferences" +msgstr "Préférences de %s" #. Page "General" #: ../midori/midori-preferences.c:267 @@ -1255,11 +1274,11 @@ msgstr "Démarrage" #. Page "Appearance" #: ../midori/midori-preferences.c:301 msgid "Appearance" -msgstr "Aspect" +msgstr "Apparence" #: ../midori/midori-preferences.c:302 msgid "Font settings" -msgstr "Réglages des polices" +msgstr "Paramètres des polices" #. Page "Behavior" #: ../midori/midori-preferences.c:322 @@ -1290,83 +1309,78 @@ msgstr "Mo" #: ../midori/midori-searchentry.c:74 msgid "Current Item" -msgstr "" +msgstr "Élément actuel" #: ../midori/midori-searchentry.c:75 msgid "The currently selected item" -msgstr "" +msgstr "L'élément sélectionné actuel" #: ../midori/midori-searchentry.c:83 msgid "Dialog" -msgstr "" +msgstr "Boite de dialogue" #: ../midori/midori-searchentry.c:84 msgid "A dialog to manage search engines" -msgstr "" +msgstr "Une boite de dialogue pour gérer les moteurs de recherche" #: ../midori/midori-searchentry.c:151 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchentry.c:524 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchentry.c:524 msgid "Edit search engine" -msgstr "Éditer le moteur de recherche" +msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchentry.c:550 +#: ../midori/midori-searchentry.c:551 msgid "_Name:" -msgstr "_Nom:" +msgstr "_Nom :" -#: ../midori/midori-searchentry.c:594 +#: ../midori/midori-searchentry.c:595 msgid "_Icon (name or file):" -msgstr "_Icône (nom ou fichier):" +msgstr "_Icône (nom ou fichier) :" -#: ../midori/midori-searchentry.c:608 +#: ../midori/midori-searchentry.c:609 msgid "_Token:" -msgstr "" +msgstr "_Jeton :" -#: ../midori/midori-searchentry.c:789 +#: ../midori/midori-searchentry.c:790 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" #: ../midori/sokoke.c:60 ../midori/sokoke.c:72 msgid "Could not run external program." -msgstr "" +msgstr "Impossible d'exécuter le programme externe" #: ../midori/sokoke.c:348 msgid "Warning: You are using a superuser account!" -msgstr "Attention: Vous êtes connecté en tant que super-utilisateur!" - -#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 -#, c-format -msgid "Writing failed." -msgstr "Échec de l'écriture." +msgstr "Attention : vous êtes connecté en tant que superutilisateur !" #: ../midori/gjs.c:512 msgid "An unknown error occured." -msgstr "" +msgstr "Une erreur inconnu est survenue." #: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" -msgstr "" +msgstr "%s n'a pas de propriété « %s »" #: ../midori/gjs.c:875 #, c-format msgid "%s cannot be assigned to %s.%s" -msgstr "" +msgstr "%s ne peut être assigné à %s.%s" #: ../midori/gjs.c:885 #, c-format msgid "%s.%s cannot be accessed" -msgstr "" +msgstr "%s.%s ne peut être accédé" #: ../katze/katze-throbber.c:135 msgid "Icon size" -msgstr "Taille d'icôn" +msgstr "Taille d'icône" #: ../katze/katze-throbber.c:136 msgid "Symbolic size to use for the animation" @@ -1378,15 +1392,15 @@ msgstr "Nom d'icon" #: ../katze/katze-throbber.c:145 msgid "The name of an icon containing animation frames" -msgstr "" +msgstr "Le nom d'une icône contenant des trames d'animation" #: ../katze/katze-throbber.c:153 msgid "Pixbuf" -msgstr "" +msgstr "Pixbuf" #: ../katze/katze-throbber.c:154 msgid "A GdkPixbuf containing animation frames" -msgstr "" +msgstr "Un GdkPixbuf contenant des trames d'animation" #: ../katze/katze-throbber.c:162 msgid "Animated" @@ -1394,56 +1408,56 @@ msgstr "Animé" #: ../katze/katze-throbber.c:163 msgid "Whether the throbber should be animated" -msgstr "" +msgstr "Indique si le pulsateur doit être animé" #: ../katze/katze-throbber.c:171 msgid "Static Icon Name" -msgstr "" +msgstr "Nom d'icône statique" #: ../katze/katze-throbber.c:172 msgid "The name of an icon to be used as the static image" -msgstr "" +msgstr "Un nom d'icône statique devant être utilisé comme image statique" #: ../katze/katze-throbber.c:180 msgid "Static Pixbuf" -msgstr "" +msgstr "Pixbuf statique" #: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" -msgstr "" +msgstr "Un GdkPixbuf devant être utilisé comme image statique" #: ../katze/katze-throbber.c:189 msgid "Static Stock ID" -msgstr "" +msgstr "ID de catalogue statique" #: ../katze/katze-throbber.c:190 msgid "The stock ID of an icon to be used as the static image" -msgstr "" +msgstr "L'ID de catalogue d'une icône devant être utilisée comme image statique" #: ../katze/katze-throbber.c:808 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Icon nommé '%s' n'a pu être chargée." +msgstr "L'icône nommée « %s » n'a pu être chargée." #: ../katze/katze-throbber.c:821 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Icon stock '%s' n'a pu être chargée." +msgstr "L'icône de catalogue « %s » n'a pu être chargée." # pas très content #: ../katze/katze-throbber.c:844 #, c-format msgid "Icon '%s' couldn't be loaded" -msgstr "Icon '%s' n'a pu être chargée." +msgstr "L'icône « %s » n'a pu être chargée." #: ../katze/katze-throbber.c:876 msgid "Animation frames are broken" -msgstr "" +msgstr "Les trames d'animation sont corrompues" #: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "La propriété '%s' n'est pas valide pour %s" +msgstr "La propriété « %s » n'est pas valide pour %s" #: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" @@ -1459,38 +1473,38 @@ msgstr "Nom" #: ../katze/katze-item.c:73 msgid "The name of the item" -msgstr "Le numéro de l'élement" +msgstr "Le nom de l'élément" #: ../katze/katze-item.c:82 msgid "The descriptive text of the item" -msgstr "Le texte descriptif de l'élement" +msgstr "Le texte descriptif de l'élément" #: ../katze/katze-item.c:91 msgid "The URI of the item" -msgstr "L'URI de l'élement" +msgstr "L'URI de l'élément" #: ../katze/katze-item.c:99 msgid "Icon" -msgstr "Icôn" +msgstr "Icône" #: ../katze/katze-item.c:100 msgid "The icon of the item" -msgstr "L'icôn de l'élement" +msgstr "L'icône de l'élément" #: ../katze/katze-item.c:108 msgid "Token" -msgstr "Sigle" +msgstr "Jeton" #: ../katze/katze-item.c:109 msgid "The token of the item" -msgstr "Le sigle de l'élement" +msgstr "Le jeton de l'élément" #: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 #: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -#: ../katze/katze-xbel.c:789 msgid "Malformed document." -msgstr "Document malformé" +msgstr "Document mal formé" #: ../katze/katze-xbel.c:744 msgid "File not found." msgstr "Fichier non trouvé." + From fc507daf560eadcbbfd1cc3f0d22b1123c2b1953 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Sep 2008 02:38:38 +0200 Subject: [PATCH 0313/2970] Update German translation --- po/de.po | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/po/de.po b/po/de.po index f8926a1d..6b54b0f8 100644 --- a/po/de.po +++ b/po/de.po @@ -19,7 +19,7 @@ msgstr "" #: ../midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Kleiner Netznavigator" +msgstr "Schlanker Netznavigator" #: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 #: ../midori/main.c:419 ../midori/main.c:433 @@ -106,12 +106,12 @@ msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" #: ../midori/main.c:177 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "Wert '%s' ist ungültig für %s" +msgstr "Wert »%s« ist ungültig für %s" #: ../midori/main.c:184 ../midori/main.c:253 #, c-format msgid "Unhandled settings value '%s'" -msgstr "Unbehandelter Einstellungswert '%s'" +msgstr "Unbehandelter Einstellungswert »%s«" #: ../midori/main.c:368 #, c-format @@ -146,7 +146,7 @@ msgstr "Informieren Sie sich über neue Versionen unter:" #: ../midori/main.c:467 #, c-format msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" #: ../midori/main.c:501 #, c-format @@ -246,19 +246,19 @@ msgstr "Benutzerstile" #: ../midori/midori-addons.c:113 msgid "Web Widget" -msgstr "" +msgstr "Netz-Steuerelement" #: ../midori/midori-addons.c:114 msgid "The assigned web widget" -msgstr "" +msgstr "Das zugewiesene Netz-Steuerelement" #: ../midori/midori-addons.c:122 msgid "Kind" -msgstr "" +msgstr "Sorte" #: ../midori/midori-addons.c:123 msgid "The kind of addons" -msgstr "" +msgstr "Die Sorte Ergänzung" #: ../midori/midori-browser.c:192 msgid "Source" @@ -309,7 +309,7 @@ msgstr "Wurzel" #: ../midori/midori-browser.c:1082 #, c-format msgid "Unexpected action '%s'." -msgstr "Unerwartete Aktion '%s'." +msgstr "Unerwartete Aktion »%s«." #: ../midori/midori-browser.c:1228 msgid "Menubar" @@ -399,7 +399,7 @@ msgstr "In Datei speichern" #: ../midori/midori-browser.c:2713 msgid "_Close Tab" -msgstr "Reiter sch_ließen" +msgstr "Reiter s_chließen" #: ../midori/midori-browser.c:2714 msgid "Close the current tab" @@ -551,7 +551,7 @@ msgstr "Gehe zu Deiner Startseite" #: ../midori/midori-browser.c:2813 msgid "_Web Search..." -msgstr "_Netzsuche..." +msgstr "_Netzsuche…" #: ../midori/midori-browser.c:2814 msgid "Run a web search" @@ -559,7 +559,7 @@ msgstr "Starte eine Netzsuche" #: ../midori/midori-browser.c:2816 msgid "Open in Page_holder..." -msgstr "In Seiten_halter öffnen..." +msgstr "In Seiten_halter öffnen…" #: ../midori/midori-browser.c:2817 msgid "Open the current page in the pageholder" @@ -596,7 +596,7 @@ msgstr "Lesezeichen _verwalten" #: ../midori/midori-browser.c:2835 msgid "Add, edit and remove bookmarks..." -msgstr "Lesezeichen hinzufügen, bearbeiten und löschen..." +msgstr "Lesezeichen hinzufügen, bearbeiten und löschen…" #: ../midori/midori-browser.c:2838 msgid "Open the selected bookmark" @@ -636,7 +636,7 @@ msgstr "_Suchmaschinen verwalten" #: ../midori/midori-browser.c:2855 msgid "Add, edit and remove search engines..." -msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen..." +msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" #: ../midori/midori-browser.c:2858 msgid "_Window" @@ -741,7 +741,7 @@ msgstr "Statusleiste anzeigen" #: ../midori/midori-browser.c:3228 msgid "_Location..." -msgstr "_Ort..." +msgstr "_Ort…" #: ../midori/midori-browser.c:3230 msgid "Open a particular location" @@ -783,7 +783,7 @@ msgstr "Suchleiste schließen" #: ../midori/midori-browser.c:3817 #, c-format msgid "Unexpected setting '%s'" -msgstr "Unerwartete Einstellung '%s'" +msgstr "Unerwartete Einstellung »%s«" #: ../midori/midori-panel.c:146 msgid "Shadow Type" @@ -839,7 +839,7 @@ msgstr "Russisch (KOI8-r)" #: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "Unicode (UTF-8)" #: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" @@ -847,7 +847,7 @@ msgstr "Westlich (ISO-8859-1)" #: ../midori/midori-websettings.c:152 msgid "Custom..." -msgstr "Benutzerdefinidert..." +msgstr "Benutzerdefinidert…" #: ../midori/midori-websettings.c:167 msgid "New tab" @@ -1191,15 +1191,15 @@ msgstr "Die erlaubte Zwischenspeichergröße" #: ../midori/midori-webview.c:64 msgid "Load Provisional" -msgstr "" +msgstr "Vorläufiger Ladevorgang" #: ../midori/midori-webview.c:65 msgid "Load Committed" -msgstr "" +msgstr "Bestätigter Ladevorgang" #: ../midori/midori-webview.c:66 msgid "Load Finished" -msgstr "" +msgstr "Vollendeter Ladevorgang" #: ../midori/midori-webview.c:224 msgid "The URI of the currently loaded page" @@ -1347,7 +1347,7 @@ msgstr "Ein unbekannter Fehler ist aufgetreten." #: ../midori/gjs.c:739 ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" -msgstr "%s hat keine Eigenschaft '%s'" +msgstr "%s hat keine Eigenschaft »%s«" #: ../midori/gjs.c:875 #, c-format @@ -1401,7 +1401,7 @@ msgstr "Der Name eines Symbols, das als statisches Bild verwendet werden soll" #: ../katze/katze-throbber.c:180 msgid "Static Pixbuf" -msgstr "" +msgstr "Statischer Pixbuf" #: ../katze/katze-throbber.c:181 msgid "A GdkPixbuf to be used as the static image" @@ -1420,17 +1420,17 @@ msgstr "" #: ../katze/katze-throbber.c:808 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Das benannte Symbol '%s' konnte nicht geladen werden" +msgstr "Das benannte Symbol »%s« konnte nicht geladen werden" #: ../katze/katze-throbber.c:821 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Das Bestandssymbol '%s' konnte nicht geladen werden" +msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" #: ../katze/katze-throbber.c:844 #, c-format msgid "Icon '%s' couldn't be loaded" -msgstr "Das Symbol '%s' konnte nicht geladen werden" +msgstr "Das Symbol »%s« konnte nicht geladen werden" #: ../katze/katze-throbber.c:876 msgid "Animation frames are broken" @@ -1439,7 +1439,7 @@ msgstr "Animationsbilder sind fehlerhaft" #: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Eigenschaft '%s' ist ungültig für %s" +msgstr "Eigenschaft »%s« ist ungültig für %s" #: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 msgid "Choose file" From 1a0718805ededc48c480da8e808ccbe774293c84 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Sep 2008 03:07:11 +0200 Subject: [PATCH 0314/2970] Fix unwanted hotkeys in context menu items again --- midori/sokoke.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 063c88c2..b5a6ce5a 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -613,17 +613,55 @@ sokoke_object_get_boolean (gpointer object, * gtk_action_create_menu_item(), but it won't * display an accelerator. * + * Note: This menu item is not a proxy and will + * not reflect any changes to the action. + * * Return value: a new #GtkMenuItem **/ GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action) { GtkWidget* menuitem; + GtkWidget* icon; + gchar* label; + gchar* stock_id; + gchar* icon_name; + gboolean sensitive; + gboolean visible; g_return_val_if_fail (GTK_IS_ACTION (action), NULL); - menuitem = gtk_image_menu_item_new (); - gtk_action_connect_proxy (action, menuitem); + g_object_get (action, + "label", &label, + "stock-id", &stock_id, + "icon-name", &icon_name, + "sensitive", &sensitive, + "visible", &visible, + NULL); + if (stock_id) + { + if (label) + { + menuitem = gtk_image_menu_item_new_with_mnemonic (label); + icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + } + else + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + } + else + { + menuitem = gtk_image_menu_item_new_with_mnemonic (label); + if (icon_name) + { + icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + } + } + gtk_widget_set_sensitive (menuitem, sensitive); + sokoke_widget_set_visible (menuitem, visible); + g_signal_connect_swapped (menuitem, "activate", + G_CALLBACK (gtk_action_activate), action); return menuitem; } From 30cbc635d67001379a2e818c4360f29e47f2a5db Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Sep 2008 03:39:25 +0200 Subject: [PATCH 0315/2970] Ellipsize menu items referring to websites or bookmarks. Originally menu items could in some cases become as wide as the whole screen, making working with menus rather hard. Now we ellipsize at 50 characters in the middle of the string. --- midori/midori-browser.c | 70 +++++++++++++++++++++++------------------ midori/midori-webview.c | 2 +- midori/sokoke.c | 26 +++++++++++++++ midori/sokoke.h | 3 ++ 4 files changed, 69 insertions(+), 32 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c0bfa090..b5c7c1a5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -986,7 +986,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, katze_throbber_set_static_pixbuf (KATZE_THROBBER (tab_icon), icon); title = _midori_browser_get_tab_title (browser, widget); tab_title = gtk_label_new (title); - menuitem = gtk_image_menu_item_new_with_label (title); + menuitem = sokoke_image_menu_item_new_ellipsized (title); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_pixbuf (icon)); g_object_unref (icon); @@ -1730,19 +1730,25 @@ static void midori_browser_menu_trash_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { - GtkWidget* menu = gtk_menu_new (); - guint n = katze_array_get_length (browser->trash); + GtkWidget* menu; + guint i, n; + KatzeXbelItem* item; + const gchar* title; + const gchar* uri; GtkWidget* menuitem; - guint i; + GtkWidget* icon; + GtkAction* action; + + menu = gtk_menu_new (); + n = katze_array_get_length (browser->trash); for (i = 0; i < n; i++) { - KatzeXbelItem* item = katze_array_get_nth_item (browser->trash, i); - const gchar* title = katze_xbel_item_get_title (item); - const gchar* uri = katze_xbel_bookmark_get_href (item); - menuitem = gtk_image_menu_item_new_with_label (title ? title : uri); + item = katze_array_get_nth_item (browser->trash, i); + title = katze_xbel_item_get_title (item); + uri = katze_xbel_bookmark_get_href (item); + menuitem = sokoke_image_menu_item_new_ellipsized (title ? title : uri); /* FIXME: Get the real icon */ - GtkWidget* icon = gtk_image_new_from_stock (GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); @@ -1754,8 +1760,7 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - GtkAction* action = gtk_action_group_get_action (browser->action_group, - "TrashEmpty"); + action = gtk_action_group_get_action (browser->action_group, "TrashEmpty"); menuitem = gtk_action_create_menu_item (action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -2124,7 +2129,7 @@ _action_location_secondary_icon_released (GtkAction* action, title = uri; if (!*title) title = uri; - menuitem = gtk_image_menu_item_new_with_label (title); + menuitem = sokoke_image_menu_item_new_ellipsized (title); /* FIXME: Get the real icon */ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( menuitem), gtk_image_new_from_stock (STOCK_NEWS_FEED, @@ -2403,38 +2408,40 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, KatzeXbelItem* folder, GtkWidget* menu) { - guint n = katze_xbel_folder_get_n_items (folder); - guint i; + guint i, n; + KatzeXbelItem* item; + const gchar* title; + GtkWidget* menuitem; + GtkWidget* submenu; + GtkWidget* icon; + + n = katze_xbel_folder_get_n_items (folder); for (i = 0; i < n; i++) { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (folder, i); - const gchar* title = katze_xbel_item_is_separator (item) + item = katze_xbel_folder_get_nth_item (folder, i); + title = katze_xbel_item_is_separator (item) ? "" : katze_xbel_item_get_title (item); - /* const gchar* desc = katze_xbel_item_is_separator (item) - ? "" : katze_xbel_item_get_desc (item); */ - GtkWidget* menuitem = NULL; + switch (katze_xbel_item_get_kind (item)) { case KATZE_XBEL_ITEM_KIND_FOLDER: /* FIXME: what about katze_xbel_folder_is_folded? */ - menuitem = gtk_image_menu_item_new_with_label (title); + menuitem = sokoke_image_menu_item_new_ellipsized (title); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU)); - GtkWidget* _menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), _menu); + submenu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_bookmark_menu_folder_activate_cb), browser); g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); break; case KATZE_XBEL_ITEM_KIND_BOOKMARK: - menuitem = gtk_image_menu_item_new_with_label (title); - GtkWidget* image = gtk_image_new_from_stock (STOCK_BOOKMARK, - GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), - image); + menuitem = sokoke_image_menu_item_new_ellipsized (title); + icon = gtk_image_new_from_stock (STOCK_BOOKMARK, GTK_ICON_SIZE_MENU); + gtk_widget_show (icon); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), browser); @@ -2444,7 +2451,8 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, menuitem = gtk_separator_menu_item_new (); break; default: - g_warning ("Unknown xbel item kind"); + menuitem = NULL; + g_warning ("Unknown XBEL item kind"); } gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -3567,7 +3575,7 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (browser->find_highlight, "toggled", G_CALLBACK (_find_highlight_toggled), browser); gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_highlight), - "Highlight Matches"); + _("Highlight Matches")); gtk_tool_item_set_is_important (GTK_TOOL_ITEM (browser->find_highlight), TRUE); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_highlight, -1); toolitem = gtk_separator_tool_item_new (); diff --git a/midori/midori-webview.c b/midori/midori-webview.c index 301b82f2..754529b0 100644 --- a/midori/midori-webview.c +++ b/midori/midori-webview.c @@ -965,7 +965,7 @@ midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) if (!web_view->menu_item) { title = midori_web_view_get_display_title (web_view); - web_view->menu_item = gtk_image_menu_item_new_with_label (title); + web_view->menu_item = sokoke_image_menu_item_new_ellipsized (title); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (web_view->menu_item), gtk_image_new_from_pixbuf (web_view->icon)); diff --git a/midori/sokoke.c b/midori/sokoke.c index b5a6ce5a..9af538b5 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -666,6 +666,32 @@ sokoke_action_create_popup_menu_item (GtkAction* action) return menuitem; } +/** + * sokoke_image_menu_item_new_ellipsized: + * @label: the text of the menu item + * + * Creates a new #GtkImageMenuItem containing an ellipsized label. + * + * Return value: a new #GtkImageMenuItem + **/ +GtkWidget* +sokoke_image_menu_item_new_ellipsized (const gchar* label) +{ + GtkWidget* menuitem; + GtkWidget* label_widget; + + menuitem = gtk_image_menu_item_new (); + label_widget = gtk_label_new (label); + /* FIXME: Should text direction be respected here? */ + gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.0); + gtk_label_set_max_width_chars (GTK_LABEL (label_widget), 50); + gtk_label_set_ellipsize (GTK_LABEL (label_widget), PANGO_ELLIPSIZE_MIDDLE); + gtk_widget_show (label_widget); + gtk_container_add (GTK_CONTAINER (menuitem), label_widget); + + return menuitem; +} + /** * sokoke_tree_view_get_selected_iter: * @tree_view: a #GtkTreeView diff --git a/midori/sokoke.h b/midori/sokoke.h index 99d8b903..c40ba2bd 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -131,6 +131,9 @@ sokoke_object_get_boolean (gpointer object, GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); +GtkWidget* +sokoke_image_menu_item_new_ellipsized (const gchar* label); + gboolean sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, GtkTreeModel** model, From cecce230613827b19a1c92ba23499fc6379d9859 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sun, 7 Sep 2008 20:31:09 +0200 Subject: [PATCH 0316/2970] Fix doc domment for katze_array_remove_item --- katze/katze-array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/katze/katze-array.c b/katze/katze-array.c index 95f6900c..6f11f010 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -162,7 +162,7 @@ katze_array_add_item (KatzeArray* array, } /** - * katze_array_add_item: + * katze_array_remove_item: * @array: a #KatzeArray * @item: a #GObject * From ee33d8e3dd8cfddb5c34aa26b78b96817847eda6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Sep 2008 21:48:04 +0200 Subject: [PATCH 0317/2970] Add option to generate API documentation --- docs/api/wscript_build | 33 +++++++++++++++++++++++++++++++++ wscript | 19 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 docs/api/wscript_build diff --git a/docs/api/wscript_build b/docs/api/wscript_build new file mode 100644 index 00000000..7cba870e --- /dev/null +++ b/docs/api/wscript_build @@ -0,0 +1,33 @@ +#! /usr/bin/env python +# WAF build script for midori + +import pproc as subprocess + +for module in ('midori', 'katze'): + try: + if not os.access ('_build_', os.F_OK): + os.mkdir ('_build_') + if not os.access ('_build_/docs', os.F_OK): + os.mkdir ('_build_/docs') + if not os.access ('_build_/docs/api', os.F_OK): + os.mkdir ('_build_/docs/api') + subprocess.call (['gtkdoc-scan', '--module=' + module, + '--source-dir=' + module, '--output-dir=_build_/docs/api/' + module, + '--rebuild-sections', '--rebuild-types']) + os.chdir ('_build_/docs/api/' + module) + subprocess.call (['gtkdoc-mktmpl', '--module=' + module, + '--output-dir=.' + module]) + subprocess.call (['gtkdoc-mkdb', '--module=' + module, + '--source-dir=.', '--output-dir=xml', + '--source-suffixes=c,h', '--output-format=xml', + '--default-includes=%s/%s.h' % (module, module), + '--sgml-mode', '--main-sgml-file=%s.sgml' % module]) + if not os.access ('html', os.F_OK): + os.mkdir ('html') + os.chdir ('html') + subprocess.call (['gtkdoc-mkhtml', module, '../%s.sgml' % module]) + Params.pprint ('YELLOW', "Created documentation for %s." % module) + os.chdir ('../../../../..') + except Exception, msg: + print msg + Params.pprint ('RED', "Failed to create documentation for %s." % module) diff --git a/wscript b/wscript index ed38e04c..9fb4a0bb 100644 --- a/wscript +++ b/wscript @@ -45,6 +45,20 @@ def configure (conf): update_po = 'no' conf.check_message_custom ('localization file', 'updates', update_po) + if Params.g_options.enable_api_docs: + conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') + conf.find_program ('gtkdoc-mktmpl', var='GTKDOC_MKTMPL') + conf.find_program ('gtkdoc-mkdb', var='GTKDOC_MKDB') + conf.find_program ('gtkdoc-mkhtml', var='GTKDOC_MKHTML') + if conf.env['GTKDOC_SCAN'] and conf.env['GTKDOC_MKTMPL'] \ + and conf.env['GTKDOC_MKDB'] and conf.env['GTKDOC_MKHTML']: + api_docs = 'yes' + else: + api_docs = 'not available' + else: + api_docs = 'no' + conf.check_message_custom ('generate', 'API documentation', api_docs) + if not Params.g_options.disable_unique: conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) single_instance = ['not available','yes'][conf.env['HAVE_UNIQUE'] == 1] @@ -101,6 +115,8 @@ def set_options (opt): opt.add_option ('--enable-update-po', action='store_true', default=False, help='Enables localization file updates', dest='enable_update_po') + opt.add_option ('--enable-api-docs', action='store_true', default=False, + help='Enables API documentation', dest='enable_api_docs') def build (bld): bld.add_subdirs ('katze midori icons') @@ -108,6 +124,9 @@ def build (bld): if bld.env ()['INTLTOOL']: bld.add_subdirs ('po') + if bld.env ()['GTKDOC_SCAN'] and Params.g_commands['build']: + bld.add_subdirs ('docs/api') + if bld.env ()['INTLTOOL']: obj = bld.create_obj ('intltool_in') obj.source = 'midori.desktop.in' From f72f48542b1693a5e9362e36931dfefaa7cb3dd7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Sep 2008 22:41:03 +0200 Subject: [PATCH 0318/2970] Enable Help > Contents to open the FAQ on the web. --- midori/midori-browser.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b5c7c1a5..49905f61 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2532,6 +2532,17 @@ _action_about_activate (GtkAction* action, NULL); } +static void +_action_help_contents_activate (GtkAction* action, + MidoriBrowser* browser) +{ + const gchar* faq_uri = "http://wiki.xfce.org/_export/xhtml/midori_faq"; + gint n; + + n = midori_browser_add_uri (browser, faq_uri); + midori_browser_set_current_page (browser, n); +} + static void _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -2907,7 +2918,7 @@ static const GtkActionEntry entries[] = { { "Help", NULL, N_("_Help") }, { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", - N_("Show the documentation"), NULL/*G_CALLBACK (_action_help_contents_activate)*/ }, + N_("Show the documentation"), G_CALLBACK (_action_help_contents_activate) }, { "About", GTK_STOCK_ABOUT, NULL, "", N_("Show information about the program"), G_CALLBACK (_action_about_activate) }, From c9f582616d01b6c7f53c7ffbfd8bb4bca50feb49 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 10 Sep 2008 18:27:11 +0200 Subject: [PATCH 0319/2970] Fix the legacy build --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 6c471e9c..777efd08 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # Register ourselves to autoconf AC_INIT([midori], [0.0.21], [http://www.twotoasts.de/bugs]) -AC_CONFIG_SRCDIR([midori/main.h]) +AC_CONFIG_SRCDIR([midori/midori-stock.h]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) From b62869a49bc7f73e23f5ebcd0394611f2941444f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 10 Sep 2008 19:18:16 +0200 Subject: [PATCH 0320/2970] Support multiple URIs on the command line --- midori/main.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/midori/main.c b/midori/main.c index 157136f7..270e61a0 100644 --- a/midori/main.c +++ b/midori/main.c @@ -469,6 +469,7 @@ main (int argc, char** argv) { gboolean version; + gchar** uris; MidoriApp* app; gboolean result; GError* error; @@ -476,12 +477,18 @@ main (int argc, { { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, + N_("URIs"), NULL }, { NULL } }; MidoriStartup load_on_startup; gchar* homepage; KatzeArray* search_engines; KatzeXbelItem* bookmarks; + guint i; + gchar* uri; + KatzeXbelItem* item; + gchar* uri_ready; #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); @@ -492,8 +499,9 @@ main (int argc, /* Parse cli options */ version = FALSE; + uris = NULL; error = NULL; - if (!gtk_init_with_args (&argc, &argv, _("[URL]"), entries, + if (!gtk_init_with_args (&argc, &argv, _("[URIs]"), entries, GETTEXT_PACKAGE, &error)) { if (error->code == G_OPTION_ERROR_UNKNOWN_OPTION) @@ -653,19 +661,23 @@ main (int argc, } g_string_free (error_messages, TRUE); - /* TODO: Handle any number of separate uris from argv - Open as many tabs as we have uris, seperated by pipes */ - gchar* uri = argc > 1 ? strtok (g_strdup (argv[1]), "|") : NULL; - while (uri != NULL) + /* Open as many tabs as we have uris, seperated by pipes */ + i = 0; + while (uris && uris[i]) { - KatzeXbelItem* item = katze_xbel_bookmark_new (); - gchar* uri_ready = sokoke_magic_uri (uri, NULL); - katze_xbel_bookmark_set_href (item, uri_ready); - g_free (uri_ready); - katze_xbel_folder_append_item (_session, item); - uri = strtok (NULL, "|"); + uri = strtok (g_strdup (uris[i]), "|"); + while (uri != NULL) + { + item = katze_xbel_bookmark_new (); + uri_ready = sokoke_magic_uri (uri, NULL); + katze_xbel_bookmark_set_href (item, uri_ready); + g_free (uri_ready); + katze_xbel_folder_append_item (_session, item); + uri = strtok (NULL, "|"); + } + g_free (uri); + i++; } - g_free (uri); if (katze_xbel_folder_is_empty (_session)) { @@ -686,7 +698,6 @@ main (int argc, KatzeArray* trash = katze_array_new (KATZE_TYPE_XBEL_ITEM); guint n = katze_xbel_folder_get_n_items (xbel_trash); - guint i; for (i = 0; i < n; i++) { KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); @@ -719,7 +730,7 @@ main (int argc, midori_browser_add_xbel_item (browser, item); } /* FIXME: Switch to the last active page */ - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, 0); + item = katze_xbel_folder_get_nth_item (_session, 0); if (!strcmp (katze_xbel_bookmark_get_href (item), "")) midori_browser_activate_action (browser, "Location"); katze_xbel_item_unref (_session); From 2c1cdb0573a92254fef50a2aeed36cf9d8cc7f89 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 10 Sep 2008 19:48:45 +0200 Subject: [PATCH 0321/2970] Running "midori" should open a new window --- midori/main.c | 6 +++--- midori/midori-app.c | 43 +++++++++++++++++++++++++++++++++++++++++++ midori/midori-app.h | 3 +++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index 270e61a0..84eb844b 100644 --- a/midori/main.c +++ b/midori/main.c @@ -546,10 +546,10 @@ main (int argc, if (midori_app_instance_is_running (app)) { /* TODO: Open as many tabs as we have uris, seperated by pipes */ - if (argc > 1) - result = midori_app_instance_send_uris (app, argv+1); + if (uris) + result = midori_app_instance_send_uris (app, uris); else - result = midori_app_instance_send_activate (app); + result = midori_app_instance_send_new_browser (app); if (result) return 0; diff --git a/midori/midori-app.c b/midori/midori-app.c index b463775c..38e3d4bf 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -195,6 +195,7 @@ midori_browser_message_received_cb (UniqueApp* instance, MidoriApp* app) { UniqueResponse response; + MidoriBrowser* browser; gchar** uris; switch (command) @@ -205,6 +206,21 @@ midori_browser_message_received_cb (UniqueApp* instance, gtk_window_present (GTK_WINDOW (app->browser)); response = UNIQUE_RESPONSE_OK; break; + case UNIQUE_NEW: + browser = g_object_new (MIDORI_TYPE_BROWSER, + "settings", app->settings, + "bookmarks", app->bookmarks, + "trash", app->trash, + "search-engines", app->search_engines, + NULL); + /* FIXME: Should open the homepage according to settings */ + midori_browser_add_uri (browser, "about:blank"); + midori_app_add_browser (app, browser); + gtk_window_set_screen (GTK_WINDOW (app->browser), + unique_message_data_get_screen (message)); + gtk_widget_show (GTK_WIDGET (browser)); + response = UNIQUE_RESPONSE_OK; + break; case UNIQUE_OPEN: uris = unique_message_data_get_uris (message); if (!uris) @@ -483,6 +499,33 @@ midori_app_instance_send_activate (MidoriApp* app) return FALSE; } +/** + * midori_app_instance_send_new_browser: + * @app: a #MidoriApp + * + * Sends a message to an instance of Midori already + * running on the default display, asking to open a new browser. + * + * Return value: %TRUE if the message was sent successfully + **/ +gboolean +midori_app_instance_send_new_browser (MidoriApp* app) +{ + #if HAVE_UNIQUE + UniqueResponse response; + #endif + + g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); + + #if HAVE_UNIQUE + response = unique_app_send_message (app->instance, UNIQUE_NEW, NULL); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + #endif + return FALSE; +} + /** * midori_app_instance_send_uris: * @app: a #MidoriApp diff --git a/midori/midori-app.h b/midori/midori-app.h index 641aa2f7..361b9d66 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -59,6 +59,9 @@ midori_app_instance_is_running (MidoriApp* app); gboolean midori_app_instance_send_activate (MidoriApp* app); +gboolean +midori_app_instance_send_new_browser (MidoriApp* app); + gboolean midori_app_instance_send_uris (MidoriApp* app, gchar** uris); From 04ad087d9853f5b859a001a114a0418570c0642e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 11 Sep 2008 01:49:01 +0200 Subject: [PATCH 0322/2970] Make the Preferences more compact --- midori/midori-preferences.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c9035dc2..e2b44dd1 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -234,17 +234,19 @@ midori_preferences_set_settings (MidoriPreferences* preferences, preferences->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); - sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + sizegroup = NULL; #define PAGE_NEW(__label) page = gtk_vbox_new (FALSE, 0); \ - gtk_container_set_border_width (GTK_CONTAINER (page), 5); \ + if (sizegroup) g_object_unref (sizegroup); \ + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); \ + gtk_container_set_border_width (GTK_CONTAINER (page), 4); \ gtk_notebook_append_page (GTK_NOTEBOOK (preferences->notebook), page, \ gtk_label_new (__label)) #define FRAME_NEW(__label) frame = sokoke_hig_frame_new (__label); \ - gtk_container_set_border_width (GTK_CONTAINER (frame), 5); \ + gtk_container_set_border_width (GTK_CONTAINER (frame), 4); \ gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0); #define TABLE_NEW(__rows, __cols) table = gtk_table_new ( \ __rows, __cols, FALSE); \ - gtk_container_set_border_width (GTK_CONTAINER (table), 5); \ + gtk_container_set_border_width (GTK_CONTAINER (table), 4); \ gtk_container_add (GTK_CONTAINER (frame), table); #define WIDGET_ADD(__widget, __left, __right, __top, __bottom) \ gtk_table_attach (GTK_TABLE (table), __widget \ @@ -333,7 +335,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "enable-scripts", NULL); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); - SPANNED_ADD(button, 1, 2, 2, 3); + SPANNED_ADD (button, 1, 2, 2, 3); label = katze_property_label (settings, "user-stylesheet-uri"); INDENTED_ADD (label, 0, 1, 3, 4); hbox = gtk_hbox_new (FALSE, 4); @@ -375,7 +377,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, TABLE_NEW (3, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); - FILLED_ADD(button, 1, 2, 0, 1); + FILLED_ADD (button, 1, 2, 0, 1); button = katze_property_proxy (settings, "show-new-tab", NULL); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "show-web-search", NULL); @@ -384,7 +386,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "show-trash", NULL); SPANNED_ADD (button, 1, 2, 2, 3); - FRAME_NEW(_("Browsing")); + FRAME_NEW (_("Browsing")); TABLE_NEW (3, 2); /* label = katze_property_label (settings, "open-new-pages-in"); INDENTED_ADD (label, 0, 1, 0, 1); @@ -393,13 +395,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); - SPANNED_ADD (button, 1, 2, 1, 2); + WIDGET_ADD (button, 1, 2, 1, 2); /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); SPANNED_ADD (button, 0, 1, 2, 3);*/ button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); - SPANNED_ADD (button, 0, 1, 2, 3); + WIDGET_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); - SPANNED_ADD (button, 1, 2, 2, 3); + WIDGET_ADD (button, 1, 2, 2, 3); /* Page "Network" */ PAGE_NEW (_("Network")); @@ -451,6 +453,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); SPANNED_ADD (button, 0, 2, 2, 3); */ + g_object_unref (sizegroup); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), preferences->notebook, FALSE, FALSE, 4); gtk_widget_show_all (GTK_DIALOG (preferences)->vbox); From 4d4df1ed09f6dd0b48cc4e6597e3f20494586237 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 11 Sep 2008 01:49:50 +0200 Subject: [PATCH 0323/2970] Make spin buttons smaller --- katze/katze-utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index adb300d9..061e7c3d 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -249,6 +249,8 @@ katze_property_proxy (gpointer object, widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_FLOAT (pspec)->minimum, G_PARAM_SPEC_FLOAT (pspec)->maximum, 1); + /* Keep it narrow, 5 + 2 digits are usually fine */ + gtk_entry_set_width_chars (GTK_ENTRY (widget), 5 + 2); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), 2); gfloat value; g_object_get (object, property, &value, NULL); @@ -261,6 +263,8 @@ katze_property_proxy (gpointer object, widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_INT (pspec)->minimum, G_PARAM_SPEC_INT (pspec)->maximum, 1); + /* Keep it narrow, 5 digits are usually fine */ + gtk_entry_set_width_chars (GTK_ENTRY (widget), 5); gint value; g_object_get (object, property, &value, NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); From 4f80303e5465f415b2a931dcc60a7de33e9a550e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 11 Sep 2008 01:50:22 +0200 Subject: [PATCH 0324/2970] Make the Manage Search Engines dialog a bit smaller --- midori/midori-searchentry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c index a480d58c..2cac9ec7 100644 --- a/midori/midori-searchentry.c +++ b/midori/midori-searchentry.c @@ -802,7 +802,7 @@ midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_HELP, FALSE); sokoke_widget_get_text_size (dialog, "M", &width, &height); - gtk_window_set_default_size (GTK_WINDOW (dialog), width * 45, -1); + gtk_window_set_default_size (GTK_WINDOW (dialog), width * 42, -1); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); /* TODO: Do we want tooltips for explainations or can we omit that? From c80b7053f4e9a7e5e5432409edc7031ef9b2c12c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 11 Sep 2008 02:00:52 +0200 Subject: [PATCH 0325/2970] Hide the User Stylesheet preference if unused We have more powerful options in the form of addon panels by now. If someone uses it they may keep their preference or clear it, but otherwise we don't show the widget anymore. --- midori/midori-preferences.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index e2b44dd1..5350a46f 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -226,6 +226,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; + gchar* user_stylesheet_uri; g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -336,18 +337,26 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); SPANNED_ADD (button, 1, 2, 2, 3); - label = katze_property_label (settings, "user-stylesheet-uri"); - INDENTED_ADD (label, 0, 1, 3, 4); - hbox = gtk_hbox_new (FALSE, 4); - entry = katze_property_proxy (settings, "user-stylesheet-uri", "uri"); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), - gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU)); - g_signal_connect (button, "clicked", - G_CALLBACK (clear_button_clicked_cb), entry); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); - FILLED_ADD (hbox, 1, 2, 3, 4); + g_object_get (settings, "user-stylesheet-uri", &user_stylesheet_uri, NULL); + /* Add the stylesheet uri widget only if there's a value + Otherwise we prefer to not use it, it is superfluous basically */ + if (user_stylesheet_uri) + { + label = katze_property_label (settings, "user-stylesheet-uri"); + INDENTED_ADD (label, 0, 1, 3, 4); + hbox = gtk_hbox_new (FALSE, 4); + entry = katze_property_proxy (settings, "user-stylesheet-uri", "uri"); + gtk_widget_set_sensitive (entry, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + button = gtk_button_new (); + gtk_container_add (GTK_CONTAINER (button), + gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU)); + g_signal_connect (button, "clicked", + G_CALLBACK (clear_button_clicked_cb), entry); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); + FILLED_ADD (hbox, 1, 2, 3, 4); + g_free (user_stylesheet_uri); + } if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), "zoom-step")) { label = katze_property_label (settings, "zoom-step"); From ea2daa62de4b576a9e4ccebcbc59a626f18ee0e1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 11 Sep 2008 02:14:53 +0200 Subject: [PATCH 0326/2970] If there's no statusbar, force location visibile for progress The idea is that if you hide the statusbar and the location you don't usually need it, but progress is something you are still interested in. So show the navigationbar during progress changes and hide it normally otherwise. --- midori/midori-browser.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 49905f61..9828b507 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -277,6 +277,10 @@ _midori_browser_update_interface (MidoriBrowser* browser) "tooltip", _("Reload the current page"), "sensitive", web_view != NULL, NULL); gtk_widget_hide (browser->progressbar); + if (!GTK_WIDGET_VISIBLE (browser->statusbar)) + if (!sokoke_object_get_boolean (browser->settings, + "show-navigationbar")) + gtk_widget_hide (browser->navigationbar); } else { @@ -286,8 +290,12 @@ _midori_browser_update_interface (MidoriBrowser* browser) "tooltip", _("Stop loading the current page"), NULL); gtk_widget_show (browser->progressbar); if (!GTK_WIDGET_VISIBLE (browser->statusbar)) + { + if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->navigationbar); g_object_set (_action_by_name (browser, "Location"), "progress", midori_web_view_get_progress (MIDORI_WEB_VIEW (web_view)), NULL); + } } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); @@ -2041,7 +2049,8 @@ static void _action_location_focus_out (GtkAction* action, MidoriBrowser* browser) { - if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")) + if (GTK_WIDGET_VISIBLE (browser->statusbar) && + !sokoke_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_hide (browser->navigationbar); } From f68fa4bbe7b62e26c6f5d5ecfd31021c87545a95 Mon Sep 17 00:00:00 2001 From: Kristjan Siimson Date: Sun, 14 Sep 2008 12:53:10 +0200 Subject: [PATCH 0327/2970] Add Estonian translation. --- AUTHORS | 1 + po/LINGUAS | 2 +- po/et.po | 1548 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1550 insertions(+), 1 deletion(-) create mode 100644 po/et.po diff --git a/AUTHORS b/AUTHORS index 9682e1a4..40f1c95f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -19,6 +19,7 @@ Translations: de: Christian Dywan es: Miguel Anxo Bouzada es: Christian Dywan + et: Kristjan Siimson fr: Christian Dywan fr: Adrien Nader fr: Robert-André Mauchin diff --git a/po/LINGUAS b/po/LINGUAS index ad3e984e..466b5916 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es fr gl hu pl sv +de es et fr gl hu pl sv diff --git a/po/et.po b/po/et.po new file mode 100644 index 00000000..ad9b4847 --- /dev/null +++ b/po/et.po @@ -0,0 +1,1548 @@ +# Estonian translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Kristjan Siimson 2008 +# + +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.21\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-11 17:01-0700\n" +"PO-Revision-Date: \n" +"Last-Translator: Kristjan Siimson \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Poedit-Language: Estonian\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Kergekaaluline veebibrauser" + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:498 +#: ../midori/main.c:508 +#: ../midori/main.c:510 +#: ../midori/main.c:524 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Veebibrauser" + +#: ../midori/main.c:52 +msgid "_Bookmark" +msgstr "_Järjehoidja" + +#: ../midori/main.c:53 +#: ../midori/midori-browser.c:2887 +msgid "_Bookmarks" +msgstr "Järjehoidjad" + +#: ../midori/main.c:54 +msgid "_Add Bookmark" +msgstr "_Lisa järjehoidja" + +#: ../midori/main.c:55 +msgid "_Console" +msgstr "_Konsool" + +#: ../midori/main.c:56 +msgid "_Disable" +msgstr "_Lülita välja" + +#: ../midori/main.c:57 +msgid "_Enable" +msgstr "_Lülita sisse" + +#: ../midori/main.c:58 +msgid "_Extensions" +msgstr "_Laiendid" + +#: ../midori/main.c:59 +msgid "_History" +msgstr "_Ajalugu" + +#: ../midori/main.c:60 +msgid "_Homepage" +msgstr "_Kodulehekülg" + +#: ../midori/main.c:61 +msgid "_Pageholder" +msgstr "_Lehehoidja" + +#: ../midori/main.c:62 +msgid "_Userscripts" +msgstr "_Kasutajaskriptid" + +#: ../midori/main.c:63 +msgid "User_styles" +msgstr "Kasutaja_stiilid" + +#: ../midori/main.c:64 +msgid "New _Tab" +msgstr "Uus _kaart" + +#: ../midori/main.c:65 +msgid "_Transfers" +msgstr "_Ülekanded" + +#: ../midori/main.c:66 +msgid "_Closed Tabs and Windows" +msgstr "_Suletud kaardid ja aknad" + +#: ../midori/main.c:67 +msgid "New _Window" +msgstr "Uus _aken" + +#: ../midori/main.c:69 +msgid "Select _All" +msgstr "Vali _kõik" + +#: ../midori/main.c:72 +msgid "_Fullscreen" +msgstr "_Täisekraan" + +#: ../midori/main.c:73 +msgid "_Leave Fullscreen" +msgstr "_Lahku täisekraanist" + +#: ../midori/main.c:124 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Seadistust ei saanud laadida. %s\n" + +#: ../midori/main.c:179 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "\"%s\" on vale %s väärtus" + +#: ../midori/main.c:186 +#: ../midori/main.c:255 +#, c-format +msgid "Unhandled settings value '%s'" +msgstr "Käsitlemata seadistuste väärtus \"%s\"" + +#: ../midori/main.c:426 +#: ../midori/sokoke.c:522 +#: ../katze/katze-xbel.c:899 +#, c-format +msgid "Writing failed." +msgstr "Kirjutamine ei õnnestunud." + +#: ../midori/main.c:451 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sessiooni ei saanud salvestada. %s" + +#: ../midori/main.c:479 +msgid "Display program version" +msgstr "Näita programmi versiooni" + +#: ../midori/main.c:481 +msgid "URIs" +msgstr "URI-d" + +#: ../midori/main.c:504 +msgid "[URIs]" +msgstr "[URI-d]" + +#: ../midori/main.c:508 +msgid "Unknown argument." +msgstr "Tundmatu argument." + +#: ../midori/main.c:510 +msgid "Failed to setup interface." +msgstr "Liidese seadistamine ei õnnestunud." + +#: ../midori/main.c:525 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Märkused, ettepanekud ja vead palun sinna:" + +#: ../midori/main.c:527 +msgid "Check for new versions at:" +msgstr "Kontrolli uusi versioone:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:558 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori juba töötab, kuid ei vasta.\n" + +#: ../midori/main.c:592 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Järjehoidjaid ei saanud laadida. %s\n" + +#: ../midori/main.c:606 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Sessiooni ei saanud laadida. %s\n" + +#: ../midori/main.c:618 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Prügi ei saanud laadida. %s\n" + +#: ../midori/main.c:630 +msgid "The following errors occured:" +msgstr "Tekkisid järgnevad vead:" + +#: ../midori/main.c:785 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Otsingumootoreid ei saanud salvestada. %s" + +#: ../midori/main.c:795 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Järjehoidjaid ei saanud salvestada. %s" + +#: ../midori/main.c:804 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Prügi ei saanud salvestada. %s" + +#: ../midori/main.c:812 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Seadistust ei saanud salvestada. %s" + +#: ../midori/midori-app.c:126 +#: ../midori/midori-browser.c:1325 +msgid "Settings" +msgstr "Seadistused" + +#: ../midori/midori-app.c:127 +#: ../midori/midori-browser.c:1326 +msgid "The associated settings" +msgstr "Seostatud seadistused" + +#: ../midori/midori-app.c:135 +#: ../midori/midori-browser.c:1342 +#: ../midori/midori-browser.c:3474 +msgid "Bookmarks" +msgstr "Järjehoidjad" + +#: ../midori/midori-app.c:136 +#: ../midori/midori-browser.c:1343 +msgid "The bookmarks folder, containing all bookmarks" +msgstr "Järjehoidjate kataloog, sisaldab kõiki järjehoidjaid" + +#: ../midori/midori-app.c:144 +#: ../midori/midori-browser.c:1361 +msgid "Trash" +msgstr "Prügi" + +#: ../midori/midori-app.c:145 +#: ../midori/midori-browser.c:1362 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Prügi, kogub hiljuti suletud kaarte ja aknaid" + +#: ../midori/midori-app.c:153 +#: ../midori/midori-browser.c:1378 +#: ../midori/midori-searchentry.c:65 +msgid "Search Engines" +msgstr "Otsingumootorid" + +#: ../midori/midori-app.c:154 +#: ../midori/midori-searchentry.c:66 +msgid "The list of search engines" +msgstr "Otsingumootorite loetelu" + +#: ../midori/midori-app.c:162 +msgid "Browser" +msgstr "Brauser" + +#: ../midori/midori-app.c:163 +msgid "The current browser" +msgstr "Praegune brauser" + +#: ../midori/midori-app.c:171 +msgid "Browser Count" +msgstr "Brausereid" + +#: ../midori/midori-app.c:172 +msgid "The current number of browsers" +msgstr "Praegune brauserite arv" + +#: ../midori/midori-addons.c:87 +#: ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Pole" + +#: ../midori/midori-addons.c:88 +#: ../midori/midori-browser.c:3532 +msgid "Extensions" +msgstr "Laiendid" + +#: ../midori/midori-addons.c:89 +#: ../midori/midori-browser.c:3515 +msgid "Userscripts" +msgstr "Kasutajaskriptid" + +#: ../midori/midori-addons.c:90 +#: ../midori/midori-browser.c:3523 +msgid "Userstyles" +msgstr "Kasutajastiilid" + +#: ../midori/midori-addons.c:115 +msgid "Web Widget" +msgstr "Veebividin" + +#: ../midori/midori-addons.c:116 +msgid "The assigned web widget" +msgstr "Määratud veebividin" + +#: ../midori/midori-addons.c:124 +msgid "Kind" +msgstr "Liik" + +#: ../midori/midori-addons.c:125 +msgid "The kind of addons" +msgstr "Lisandite liik" + +#: ../midori/midori-browser.c:195 +msgid "Source" +msgstr "Lähtekood" + +#: ../midori/midori-browser.c:277 +#: ../midori/midori-browser.c:2834 +#: ../midori/midori-browser.c:2840 +msgid "Reload the current page" +msgstr "Laadi käesolev lehekülg uuesti" + +#: ../midori/midori-browser.c:290 +#: ../midori/midori-browser.c:2837 +msgid "Stop loading the current page" +msgstr "Peata käesoleva lehekülje laadimine" + +#: ../midori/midori-browser.c:369 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% laaditud" + +#: ../midori/midori-browser.c:596 +msgid "New bookmark" +msgstr "Uus järjehoidja" + +#: ../midori/midori-browser.c:596 +msgid "Edit bookmark" +msgstr "Muuda järjehoidjat" + +#: ../midori/midori-browser.c:620 +msgid "_Title:" +msgstr "_Pealkiri:" + +#: ../midori/midori-browser.c:633 +#: ../midori/midori-searchentry.c:567 +msgid "_Description:" +msgstr "_Kirjeldus:" + +#: ../midori/midori-browser.c:652 +#: ../midori/midori-searchentry.c:581 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:669 +msgid "_Folder:" +msgstr "_Kataloog:" + +#: ../midori/midori-browser.c:673 +msgid "Root" +msgstr "Juur" + +#: ../midori/midori-browser.c:1104 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ootamatu toiming \"%s\"." + +#: ../midori/midori-browser.c:1250 +msgid "Menubar" +msgstr "Menüüriba" + +#: ../midori/midori-browser.c:1251 +msgid "The menubar" +msgstr "Menüüriba" + +#: ../midori/midori-browser.c:1259 +#: ../midori/midori-preferences.c:385 +msgid "Navigationbar" +msgstr "Navigatsiooniriba" + +#: ../midori/midori-browser.c:1260 +msgid "The navigationbar" +msgstr "Navigatsiooniriba" + +#: ../midori/midori-browser.c:1268 +#: ../katze/katze-item.c:90 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-browser.c:1269 +msgid "The current URI" +msgstr "Käesolev URI" + +#: ../midori/midori-browser.c:1277 +msgid "Tab" +msgstr "Kaart" + +#: ../midori/midori-browser.c:1278 +msgid "The current tab" +msgstr "Käesolev kaart" + +#: ../midori/midori-browser.c:1286 +msgid "Statusbar" +msgstr "Olekuriba" + +#: ../midori/midori-browser.c:1287 +msgid "The statusbar" +msgstr "Olekuriba" + +#: ../midori/midori-browser.c:1306 +msgid "Statusbar Text" +msgstr "Olekuriba tekst" + +#: ../midori/midori-browser.c:1307 +#: ../midori/midori-webview.c:265 +msgid "The text that is displayed in the statusbar" +msgstr "Olekuribal näidatav tekst" + +#: ../midori/midori-browser.c:1379 +msgid "The list of search engines to be used for web search" +msgstr "Loetelu veebiotsinguks kasutatavatest otsingumootoritest" + +#: ../midori/midori-browser.c:2364 +msgid "Separator" +msgstr "Eraldaja" + +#: ../midori/midori-browser.c:2532 +msgid "A lightweight web browser." +msgstr "Kergekaaluline veebibrauser." + +#: ../midori/midori-browser.c:2540 +msgid "translator-credits" +msgstr "tõlkija-tunnustused" + +#: ../midori/midori-browser.c:2757 +msgid "_File" +msgstr "_Fail" + +#: ../midori/midori-browser.c:2760 +msgid "Open a new window" +msgstr "Ava uus aken" + +#: ../midori/midori-browser.c:2763 +msgid "Open a new tab" +msgstr "Ava uus kaart" + +#: ../midori/midori-browser.c:2766 +msgid "Open a file" +msgstr "Ava fail" + +#: ../midori/midori-browser.c:2769 +msgid "Save to a file" +msgstr "Salvesta faili" + +#: ../midori/midori-browser.c:2771 +msgid "_Close Tab" +msgstr "_Sulge kaart" + +#: ../midori/midori-browser.c:2772 +msgid "Close the current tab" +msgstr "Sulge käesolev kaart" + +#: ../midori/midori-browser.c:2774 +msgid "C_lose Window" +msgstr "S_ulge aken" + +#: ../midori/midori-browser.c:2775 +msgid "Close this window" +msgstr "Sulge see aken" + +#: ../midori/midori-browser.c:2777 +msgid "Pa_ge Setup" +msgstr "Lehekülje _seadistamine" + +#: ../midori/midori-browser.c:2781 +msgid "Show a preview of the printed page" +msgstr "Näita trükitava lehekülje eelvaadet" + +#: ../midori/midori-browser.c:2784 +msgid "Print the current page" +msgstr "Trüki käesolev lehekülg" + +#: ../midori/midori-browser.c:2787 +msgid "Quit the application" +msgstr "Välju rakendusest" + +#: ../midori/midori-browser.c:2789 +msgid "_Edit" +msgstr "_Redigeerimine" + +#: ../midori/midori-browser.c:2792 +msgid "Undo the last modification" +msgstr "Võta viimane muudatus tagasi" + +#: ../midori/midori-browser.c:2795 +msgid "Redo the last modification" +msgstr "Tee viimane muudatus uuesti" + +#: ../midori/midori-browser.c:2798 +msgid "Cut the selected text" +msgstr "Lõika valitud tekst" + +#: ../midori/midori-browser.c:2801 +#: ../midori/midori-browser.c:2804 +msgid "Copy the selected text" +msgstr "Kopeeri valitud tekst" + +#: ../midori/midori-browser.c:2807 +msgid "Paste text from the clipboard" +msgstr "Aseta tekst lõikepuhvrist" + +#: ../midori/midori-browser.c:2810 +msgid "Delete the selected text" +msgstr "Kustuta valitud tekst" + +#: ../midori/midori-browser.c:2813 +msgid "Select all text" +msgstr "Vali kõik tekst" + +#: ../midori/midori-browser.c:2816 +msgid "Find a word or phrase in the page" +msgstr "Leia leheküljelt sõna või fraas" + +#: ../midori/midori-browser.c:2818 +msgid "Find _Next" +msgstr "Otsi _järgmist" + +#: ../midori/midori-browser.c:2819 +msgid "Find the next occurrence of a word or phrase" +msgstr "Leia järgmine sõna või fraasi esinemine" + +#: ../midori/midori-browser.c:2821 +msgid "Find _Previous" +msgstr "Otsi _eelmist" + +#: ../midori/midori-browser.c:2822 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Leia eelmine sõna või fraasi esinemine" + +#: ../midori/midori-browser.c:2824 +msgid "_Quick Find" +msgstr "_Kiirotsing" + +#: ../midori/midori-browser.c:2825 +msgid "Quickly jump to a word or phrase" +msgstr "Kiirelt hüppa sõna või fraasini" + +#: ../midori/midori-browser.c:2828 +msgid "Configure the application preferences" +msgstr "Seadista rakenduse eelistused" + +#: ../midori/midori-browser.c:2830 +msgid "_View" +msgstr "_Vaade" + +#: ../midori/midori-browser.c:2831 +msgid "_Toolbars" +msgstr "_Tööriistaribad" + +#: ../midori/midori-browser.c:2843 +msgid "Increase the zoom level" +msgstr "Tõsta suurendusastet" + +#: ../midori/midori-browser.c:2846 +msgid "Decrease the zoom level" +msgstr "Kahanda suurendusastet" + +#: ../midori/midori-browser.c:2849 +msgid "Reset the zoom level" +msgstr "Tühista suurendusaste" + +#: ../midori/midori-browser.c:2851 +msgid "View _Source" +msgstr "Vaata _lähtekoodi" + +#: ../midori/midori-browser.c:2852 +msgid "View the source code of the page" +msgstr "Vaata lehekülje lähtekoodi" + +#: ../midori/midori-browser.c:2854 +msgid "View Selection Source" +msgstr "Vaata valiku lähtekoodi" + +#: ../midori/midori-browser.c:2855 +msgid "View the source code of the selection" +msgstr "Vaata valiku lähtekoodi" + +#: ../midori/midori-browser.c:2858 +msgid "Toggle fullscreen view" +msgstr "Vaheta täisekraanivaadet" + +#: ../midori/midori-browser.c:2860 +msgid "_Go" +msgstr "_Mine" + +#: ../midori/midori-browser.c:2863 +msgid "Go back to the previous page" +msgstr "Mine tagasi eelmisele leheküljele" + +#: ../midori/midori-browser.c:2866 +msgid "Go forward to the next page" +msgstr "Mine edasi järgmisele leheküljele" + +#: ../midori/midori-browser.c:2869 +msgid "Go to your homepage" +msgstr "Mine oma koduleheküljele" + +#: ../midori/midori-browser.c:2871 +msgid "_Web Search..." +msgstr "_Veebiotsing..." + +#: ../midori/midori-browser.c:2872 +msgid "Run a web search" +msgstr "Käivita veebiotsing" + +#: ../midori/midori-browser.c:2874 +msgid "Open in Page_holder..." +msgstr "Ava lehe_hoidjas..." + +#: ../midori/midori-browser.c:2875 +msgid "Open the current page in the pageholder" +msgstr "Ava käesolev lehekülg lehehoidjas" + +#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, +#: ../midori/midori-browser.c:2879 +msgid "Reopen a previously closed tab or window" +msgstr "Ava uuesti varem suletud kaart või aken" + +#: ../midori/midori-browser.c:2881 +msgid "Empty Trash" +msgstr "Tühjenda prügi" + +#: ../midori/midori-browser.c:2882 +msgid "Delete the contents of the trash" +msgstr "Kustuta prügi sisu" + +#: ../midori/midori-browser.c:2884 +msgid "Undo Close Tab" +msgstr "Võta tagasi kaardi sulgemine" + +#: ../midori/midori-browser.c:2885 +msgid "Open the last closed tab" +msgstr "Ava viimati suletud kaart" + +#: ../midori/midori-browser.c:2890 +msgid "Add a new bookmark" +msgstr "Lisa uus järjehoidja" + +#: ../midori/midori-browser.c:2892 +msgid "_Manage Bookmarks" +msgstr "_Halda järjehoidjaid" + +#: ../midori/midori-browser.c:2893 +msgid "Add, edit and remove bookmarks..." +msgstr "Lisa, muuda ja eemalda järjehoidjaid..." + +#: ../midori/midori-browser.c:2896 +msgid "Open the selected bookmark" +msgstr "Ava valitud järjehoidja" + +#: ../midori/midori-browser.c:2898 +msgid "Open in New _Tab" +msgstr "Ava uuel _kaardil" + +#: ../midori/midori-browser.c:2899 +msgid "Open the selected bookmark in a new tab" +msgstr "Ava valitud järjehoidja uuel kaardil" + +#: ../midori/midori-browser.c:2901 +msgid "Open in New _Window" +msgstr "Ava uues _aknas" + +#: ../midori/midori-browser.c:2902 +msgid "Open the selected bookmark in a new window" +msgstr "Ava valitud järjehoidja uues aknas" + +#: ../midori/midori-browser.c:2905 +msgid "Edit the selected bookmark" +msgstr "Muuda valitud järjehoidjat" + +#: ../midori/midori-browser.c:2908 +msgid "Delete the selected bookmark" +msgstr "Kustuta valitud järjehoidja" + +#: ../midori/midori-browser.c:2910 +msgid "_Tools" +msgstr "_Tööriistad" + +#: ../midori/midori-browser.c:2912 +#: ../midori/midori-searchentry.c:160 +msgid "_Manage Search Engines" +msgstr "_Halda otsingumootoreid" + +#: ../midori/midori-browser.c:2913 +msgid "Add, edit and remove search engines..." +msgstr "Lisa, muuda ja eemalda otsingumootoreid" + +#: ../midori/midori-browser.c:2916 +msgid "_Window" +msgstr "_Aken" + +#: ../midori/midori-browser.c:2918 +msgid "_Previous Tab" +msgstr "_Eelmine kaart" + +#: ../midori/midori-browser.c:2919 +msgid "Switch to the previous tab" +msgstr "Lülitu eelmisele kaardile" + +#: ../midori/midori-browser.c:2921 +msgid "_Next Tab" +msgstr "_Järgmine kaart" + +#: ../midori/midori-browser.c:2922 +msgid "Switch to the next tab" +msgstr "Lülitu järgmisele kaardile" + +#: ../midori/midori-browser.c:2924 +msgid "Tab _Overview" +msgstr "Kaardi _ülevaade" + +#: ../midori/midori-browser.c:2925 +msgid "Show an overview of all open tabs" +msgstr "Näita ülevaadet kõikidest avatud kaartidest" + +#. G_CALLBACK (_action_tab_overview_activate) +#: ../midori/midori-browser.c:2927 +msgid "_Help" +msgstr "_Abi" + +#: ../midori/midori-browser.c:2929 +msgid "_Contents" +msgstr "_Sisukord" + +#: ../midori/midori-browser.c:2930 +msgid "Show the documentation" +msgstr "Näita dokumentatsiooni" + +#: ../midori/midori-browser.c:2933 +msgid "Show information about the program" +msgstr "Näita teavet programmi kohta" + +#: ../midori/midori-browser.c:2939 +msgid "P_rivate Browsing" +msgstr "_Isiklik lehitsemine" + +#: ../midori/midori-browser.c:2940 +msgid "Don't save any private data while browsing" +msgstr "Ära salvesta lehitsemisel isiklike andmeid" + +#: ../midori/midori-browser.c:2943 +msgid "_Work Offline" +msgstr "_Tööta ühenduseta" + +#: ../midori/midori-browser.c:2944 +msgid "Work without a network connection" +msgstr "Tööta ilma võrguühenduseta." + +#: ../midori/midori-browser.c:2948 +msgid "_Navigationbar" +msgstr "_Navigatsiooniriba" + +#: ../midori/midori-browser.c:2949 +msgid "Show navigationbar" +msgstr "Näita navigatsiooniriba" + +#: ../midori/midori-browser.c:2952 +msgid "Side_panel" +msgstr "Külg_paneel" + +#: ../midori/midori-browser.c:2953 +msgid "Show sidepanel" +msgstr "Näita külgpaneeli" + +#: ../midori/midori-browser.c:2956 +msgid "_Bookmarkbar" +msgstr "_Järjehoidjariba" + +#: ../midori/midori-browser.c:2957 +msgid "Show bookmarkbar" +msgstr "Näita järjehoidjariba" + +#: ../midori/midori-browser.c:2960 +msgid "_Transferbar" +msgstr "_Ülekanderiba" + +#: ../midori/midori-browser.c:2961 +msgid "Show transferbar" +msgstr "Näita ülekanderiba" + +#: ../midori/midori-browser.c:2964 +msgid "_Statusbar" +msgstr "_Olekuriba" + +#: ../midori/midori-browser.c:2965 +msgid "Show statusbar" +msgstr "Näita olekuriba" + +#: ../midori/midori-browser.c:3291 +msgid "_Location..." +msgstr "_Asukoht..." + +#: ../midori/midori-browser.c:3293 +msgid "Open a particular location" +msgstr "Ava kindel asukoht" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3481 +#: ../midori/midori-preferences.c:282 +msgid "Transfers" +msgstr "Ülekanded" + +#: ../midori/midori-browser.c:3490 +msgid "Console" +msgstr "Konsool" + +#: ../midori/midori-browser.c:3497 +msgid "History" +msgstr "Ajalugu" + +#: ../midori/midori-browser.c:3506 +msgid "Pageholder" +msgstr "Lehehoidja" + +#: ../midori/midori-browser.c:3555 +msgid "_Inline find:" +msgstr "_Reasisene otsing:" + +#: ../midori/midori-browser.c:3590 +msgid "Match Case" +msgstr "Tõusutundlik" + +#: ../midori/midori-browser.c:3598 +msgid "Highlight Matches" +msgstr "Tõsta sobivused esile" + +#: ../midori/midori-browser.c:3607 +msgid "Close Findbar" +msgstr "Sulge otsinguriba" + +#: ../midori/midori-browser.c:3842 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Ootamatu seade \"%s\"" + +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "Varju liik" + +#: ../midori/midori-panel.c:147 +msgid "Appearance of the shadow around each panel" +msgstr "Varju väljanägemine iga paneeli ümber" + +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Menüü" + +#: ../midori/midori-panel.c:157 +msgid "Menu to hold panel items" +msgstr "Menüü paneelielementide hoidmiseks" + +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "Lehekülg" + +#: ../midori/midori-panel.c:166 +msgid "The index of the current page" +msgstr "Käesoleva lehekülje indeks" + +#: ../midori/midori-panel.c:206 +#: ../midori/midori-panel.c:207 +msgid "Close panel" +msgstr "Sulge paneel" + +#: ../midori/midori-websettings.c:130 +msgid "Blank page" +msgstr "Tühi lehekülg" + +#: ../midori/midori-websettings.c:131 +#: ../midori/midori-websettings.c:402 +msgid "Homepage" +msgstr "Kodulehekülg" + +#: ../midori/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Viimati avatud leheküljed" + +#: ../midori/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Hiina (BIG5)" + +#: ../midori/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Jaapani (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Vene (KOI8-R)" + +#: ../midori/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Lääne (ISO-8859-1)" + +#: ../midori/midori-websettings.c:152 +msgid "Custom..." +msgstr "Kohandatud..." + +#: ../midori/midori-websettings.c:167 +msgid "New tab" +msgstr "Uus kaart" + +#: ../midori/midori-websettings.c:168 +msgid "New window" +msgstr "Uus aken" + +#: ../midori/midori-websettings.c:169 +msgid "Current tab" +msgstr "Käesolev kaart" + +#: ../midori/midori-websettings.c:184 +msgid "Default" +msgstr "Vaikimisi" + +#: ../midori/midori-websettings.c:185 +msgid "Icons" +msgstr "Ikoonid" + +#: ../midori/midori-websettings.c:186 +#: ../katze/katze-item.c:81 +msgid "Text" +msgstr "Tekst" + +#: ../midori/midori-websettings.c:187 +msgid "Both" +msgstr "Mõlemad" + +#: ../midori/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Mõlemad rõhtsed" + +#: ../midori/midori-websettings.c:203 +msgid "All cookies" +msgstr "Kõik küpsised" + +#: ../midori/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Sessiooni küpsised" + +#: ../midori/midori-websettings.c:242 +msgid "Remember last window size" +msgstr "Jäta meelde viimane akna suurus" + +#: ../midori/midori-websettings.c:243 +msgid "Whether to save the last window size" +msgstr "Kas salvestada viimane akna suurus" + +#: ../midori/midori-websettings.c:251 +msgid "Last window width" +msgstr "Viimane akna laius" + +#: ../midori/midori-websettings.c:252 +msgid "The last saved window width" +msgstr "Viimati salvestatud akna suurus" + +#: ../midori/midori-websettings.c:260 +msgid "Last window height" +msgstr "Viimane akna kõrgus" + +#: ../midori/midori-websettings.c:261 +msgid "The last saved window height" +msgstr "Viimati salvestatud akna kõrgus" + +#: ../midori/midori-websettings.c:269 +msgid "Last panel position" +msgstr "Viimane paneeli asukoht" + +#: ../midori/midori-websettings.c:270 +msgid "The last saved panel position" +msgstr "Viimati salvestatud paneeli asukoht" + +#: ../midori/midori-websettings.c:278 +msgid "Last panel page" +msgstr "Viimane paneeli lehekülg" + +#: ../midori/midori-websettings.c:279 +msgid "The last saved panel page" +msgstr "Viimati salvestatud paneeli lehekülg" + +#: ../midori/midori-websettings.c:287 +msgid "Last Web search" +msgstr "Viimane veebiotsing" + +#: ../midori/midori-websettings.c:288 +msgid "The last saved Web search" +msgstr "Viimati salvestatud veebiotsing" + +#: ../midori/midori-websettings.c:296 +msgid "Last pageholder URI" +msgstr "Viimase lehehoidja URI" + +#: ../midori/midori-websettings.c:297 +msgid "The URI last opened in the pageholder" +msgstr "Viimati lehehoidjas avatud URI" + +#: ../midori/midori-websettings.c:307 +msgid "Show Navigationbar" +msgstr "Näita navigatsiooniriba" + +#: ../midori/midori-websettings.c:308 +msgid "Whether to show the navigationbar" +msgstr "Kas näidata navigatsiooniriba" + +#: ../midori/midori-websettings.c:316 +msgid "Show Bookmarkbar" +msgstr "Näita järjehoidjariba" + +#: ../midori/midori-websettings.c:317 +msgid "Whether to show the bookmarkbar" +msgstr "Kas näidata järjehoidjariba" + +#: ../midori/midori-websettings.c:325 +msgid "Show Panel" +msgstr "Näita paneeli" + +#: ../midori/midori-websettings.c:326 +msgid "Whether to show the panel" +msgstr "Kas näidata paneeli" + +#: ../midori/midori-websettings.c:334 +msgid "Show Statusbar" +msgstr "Näita olekuriba" + +#: ../midori/midori-websettings.c:335 +msgid "Whether to show the statusbar" +msgstr "Kas näidata olekuriba" + +#: ../midori/midori-websettings.c:344 +msgid "Toolbar Style" +msgstr "Tööriistariba stiil" + +#: ../midori/midori-websettings.c:345 +msgid "The style of the toolbar" +msgstr "Tööriistariba stiil" + +#: ../midori/midori-websettings.c:354 +msgid "Show New Tab" +msgstr "Näita uut kaarti" + +#: ../midori/midori-websettings.c:355 +msgid "Show the New Tab button in the toolbar" +msgstr "Näita tööriistaribas uue kaardi nuppu" + +#: ../midori/midori-websettings.c:363 +msgid "Show Homepage" +msgstr "Näita kodulehekülge" + +#: ../midori/midori-websettings.c:364 +msgid "Show the Homepage button in the toolbar" +msgstr "Näita tööriistaribas kodulehekülje nuppu" + +#: ../midori/midori-websettings.c:372 +msgid "Show Web search" +msgstr "Näita veebiotsingut" + +#: ../midori/midori-websettings.c:373 +msgid "Show the Web search entry in the toolbar" +msgstr "Näita tööriistaribas veebiotsingu sissekannet" + +#: ../midori/midori-websettings.c:381 +msgid "Show Trash" +msgstr "Näita prügi" + +#: ../midori/midori-websettings.c:382 +msgid "Show the Trash button in the toolbar" +msgstr "Näita tööriistaribas prügi nuppu" + +#: ../midori/midori-websettings.c:392 +msgid "Load on Startup" +msgstr "Laadi tööleminekul" + +#: ../midori/midori-websettings.c:393 +msgid "What to load on startup" +msgstr "Mida tööleminekul laadida" + +#: ../midori/midori-websettings.c:403 +msgid "The homepage" +msgstr "Kodulehekülg" + +#: ../midori/midori-websettings.c:411 +msgid "Download Folder" +msgstr "Allalaadimise kataloog" + +#: ../midori/midori-websettings.c:412 +msgid "The folder downloaded files are saved to" +msgstr "Kataloog kuhu salvestatakse allalaaditud failid" + +#: ../midori/midori-websettings.c:420 +msgid "Download Manager" +msgstr "Allalaadimise haldur" + +#: ../midori/midori-websettings.c:421 +msgid "An external download manager" +msgstr "Väline allalaadimise haldur" + +#: ../midori/midori-websettings.c:429 +msgid "Location entry Search" +msgstr "Asukoha sissekande otsing" + +#: ../midori/midori-websettings.c:430 +msgid "The search to perform inside the location entry" +msgstr "Otsing mida viia läbi asukoha sissekandes" + +#: ../midori/midori-websettings.c:438 +msgid "Preferred Encoding" +msgstr "Eelistatud kodeering" + +#: ../midori/midori-websettings.c:439 +msgid "The preferred character encoding" +msgstr "Eelistatud märkide kodeering" + +#: ../midori/midori-websettings.c:450 +msgid "Tab Label Size" +msgstr "Kaardimärgendi suurus" + +#: ../midori/midori-websettings.c:451 +msgid "The desired tab label size" +msgstr "Soovitud kaardimärgendi suurus" + +#: ../midori/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "Sulgemisnupud kaartidel" + +#: ../midori/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "Kas kaartidel on sulgemisnupud" + +#: ../midori/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "Ava uued leheküljed" + +#: ../midori/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "Kus avada uued leheküljed" + +#: ../midori/midori-websettings.c:478 +msgid "Middle click opens Selection" +msgstr "Keskmine klõps avab valiku" + +#: ../midori/midori-websettings.c:479 +msgid "Load an URL from the selection via middle click" +msgstr "Laadi keskmise klõpsuga valikust URL" + +#: ../midori/midori-websettings.c:487 +msgid "Open tabs in the background" +msgstr "Ava kaardid taustal" + +#: ../midori/midori-websettings.c:488 +msgid "Whether to open new tabs in the background" +msgstr "Kas avada uued kaardid taustal" + +#: ../midori/midori-websettings.c:496 +msgid "Open Tabs next to Current" +msgstr "Ava kaardid käesoleva kõrval" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Kas avada uued kaardid käesoleva või viimase kaardi kõrval" + +#: ../midori/midori-websettings.c:505 +msgid "Open popups in tabs" +msgstr "Ava hüpikaknad kaartides" + +#: ../midori/midori-websettings.c:506 +msgid "Whether to open popup windows in tabs" +msgstr "Kas avada hüpikaknad kaartides" + +#: ../midori/midori-websettings.c:516 +msgid "Accept cookies" +msgstr "Võta küpsised vastu" + +#: ../midori/midori-websettings.c:517 +msgid "What type of cookies to accept" +msgstr "Mis liiki küpsised vastu võtta" + +#: ../midori/midori-websettings.c:526 +msgid "Original cookies only" +msgstr "Ainult algupärased küpsised" + +#: ../midori/midori-websettings.c:527 +msgid "Accept cookies from the original website only" +msgstr "Võta vastu küpsised ainult algupäraselt veebileheküljelt" + +#: ../midori/midori-websettings.c:535 +msgid "Maximum cookie age" +msgstr "Suurim küpsise vanus" + +#: ../midori/midori-websettings.c:536 +msgid "The maximum number of days to save cookies for" +msgstr "Suurim arv päevasid küpsiste salvestamiseks" + +#: ../midori/midori-websettings.c:546 +msgid "Remember last visited pages" +msgstr "Jäta meelde viimati külastatud leheküljed" + +#: ../midori/midori-websettings.c:547 +msgid "Whether the last visited pages are saved" +msgstr "Kas viimati külastatud leheküljed on salvestatud" + +#: ../midori/midori-websettings.c:555 +msgid "Maximum history age" +msgstr "Suurim ajaloo vanus" + +#: ../midori/midori-websettings.c:556 +msgid "The maximum number of days to save the history for" +msgstr "Suurim arv päevasid ajaloo salvestamiseks" + +#: ../midori/midori-websettings.c:564 +msgid "Remember last form inputs" +msgstr "Jäta meelde viimased ankeedisisendid" + +#: ../midori/midori-websettings.c:565 +msgid "Whether the last form inputs are saved" +msgstr "Kas viimased ankeedisisendid salvestatakse" + +#: ../midori/midori-websettings.c:573 +msgid "Remember last downloaded files" +msgstr "Jäta meelde viimati allalaaditud failid" + +#: ../midori/midori-websettings.c:574 +msgid "Whether the last downloaded files are saved" +msgstr "Kas viimati allalaaditud failid on salvestatud" + +#: ../midori/midori-websettings.c:584 +msgid "HTTP Proxy" +msgstr "HTTP proksi" + +#: ../midori/midori-websettings.c:585 +msgid "The proxy used for HTTP connections" +msgstr "HTTP ühendusteks kasutatav proksi" + +#: ../midori/midori-websettings.c:593 +msgid "Cache size" +msgstr "Vahemälu suurus" + +#: ../midori/midori-websettings.c:594 +msgid "The allowed size of the cache" +msgstr "Lubatud vahemälu suurus" + +#: ../midori/midori-webview.c:65 +msgid "Load Provisional" +msgstr "Laadi esialgne" + +#: ../midori/midori-webview.c:66 +msgid "Load Committed" +msgstr "Laadi üleantud" + +#: ../midori/midori-webview.c:67 +msgid "Load Finished" +msgstr "Laadimine lõpetatud" + +#: ../midori/midori-webview.c:225 +msgid "The URI of the currently loaded page" +msgstr "Käesoleva laaditud lehekülje URI" + +#: ../midori/midori-webview.c:235 +msgid "The title of the currently loaded page" +msgstr "Käesoleva laaditud lehekülje pealkiri" + +#: ../midori/midori-webview.c:245 +msgid "The current loading progress" +msgstr "Käesoleva laadimise edenemine" + +#: ../midori/midori-webview.c:254 +msgid "The current loading status" +msgstr "Käesoleva laadimise olek" + +#: ../midori/midori-webview.c:699 +msgid "Open Link in New _Tab" +msgstr "Ava link uues _kaardis" + +#: ../midori/midori-webview.c:727 +msgid "Download Link with Download _Manager" +msgstr "Laadi link allalaadimise halduriga" + +#: ../midori/midori-webview.c:745 +msgid "Open URL in New _Tab" +msgstr "Ava URL uues _kaardis" + +#: ../midori/midori-preferences.c:62 +msgid "Settings instance to provide properties" +msgstr "Omadustega varustav seadistuste instants" + +#: ../midori/midori-preferences.c:84 +#, c-format +msgid "%s Preferences" +msgstr "%s eelistused" + +#. Page "General" +#: ../midori/midori-preferences.c:270 +msgid "General" +msgstr "Üldine" + +#: ../midori/midori-preferences.c:271 +msgid "Startup" +msgstr "Tööleminek" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:304 +msgid "Appearance" +msgstr "Välimus" + +#: ../midori/midori-preferences.c:305 +msgid "Font settings" +msgstr "Fondi seadistused" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:325 +msgid "Behavior" +msgstr "Käitumine" + +#: ../midori/midori-preferences.c:326 +msgid "Features" +msgstr "Võimalused" + +#. Page "Interface" +#: ../midori/midori-preferences.c:384 +msgid "Interface" +msgstr "Liides" + +#: ../midori/midori-preferences.c:398 +msgid "Browsing" +msgstr "Lehitsemine" + +#. Page "Network" +#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:417 +msgid "Network" +msgstr "Võrk" + +#: ../midori/midori-preferences.c:428 +msgid "MB" +msgstr "MB" + +#: ../midori/midori-searchentry.c:74 +msgid "Current Item" +msgstr "Käesolev element" + +#: ../midori/midori-searchentry.c:75 +msgid "The currently selected item" +msgstr "Hetkel valitud element" + +#: ../midori/midori-searchentry.c:83 +msgid "Dialog" +msgstr "Dialoog" + +#: ../midori/midori-searchentry.c:84 +msgid "A dialog to manage search engines" +msgstr "Dialoog otsingumootorite haldamiseks" + +#: ../midori/midori-searchentry.c:151 +msgid "Empty" +msgstr "Tühi" + +#: ../midori/midori-searchentry.c:524 +msgid "Add search engine" +msgstr "Lisa otsingumootor" + +#: ../midori/midori-searchentry.c:524 +msgid "Edit search engine" +msgstr "Muuda otsingumootorit" + +#: ../midori/midori-searchentry.c:551 +msgid "_Name:" +msgstr "_Nimi:" + +#: ../midori/midori-searchentry.c:595 +msgid "_Icon (name or file):" +msgstr "_Ikoon (nimi või fail):" + +#: ../midori/midori-searchentry.c:609 +msgid "_Token:" +msgstr "_Luba:" + +#: ../midori/midori-searchentry.c:790 +msgid "Manage search engines" +msgstr "Halda otsingumootoreid" + +#: ../midori/sokoke.c:60 +#: ../midori/sokoke.c:72 +msgid "Could not run external program." +msgstr "Välist programmi ei saanud käivitada" + +#: ../midori/sokoke.c:348 +msgid "Warning: You are using a superuser account!" +msgstr "Hoiatus: Sa kasutad superkasutaja kontot!" + +#: ../midori/gjs.c:512 +msgid "An unknown error occured." +msgstr "Juhtus tundmatu viga." + +#: ../midori/gjs.c:739 +#: ../midori/gjs.c:829 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s ei ühtegi väärtust \"%s\"" + +#: ../midori/gjs.c:875 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s ei saa määrata %s.%s" + +#: ../midori/gjs.c:885 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s ei saa ligi" + +#: ../katze/katze-throbber.c:135 +msgid "Icon size" +msgstr "Ikooni suurus" + +#: ../katze/katze-throbber.c:136 +msgid "Symbolic size to use for the animation" +msgstr "Sümboolne suurus animeerimisel kasutamiseks" + +#: ../katze/katze-throbber.c:144 +msgid "Icon Name" +msgstr "Ikooni nimi" + +#: ../katze/katze-throbber.c:145 +msgid "The name of an icon containing animation frames" +msgstr "Animatsioonikaadreid sisaldava ikooni nimi" + +#: ../katze/katze-throbber.c:153 +msgid "Pixbuf" +msgstr "Pixbuf" + +#: ../katze/katze-throbber.c:154 +msgid "A GdkPixbuf containing animation frames" +msgstr "Animatsioonikaadreid sisaldav GdkPixpuf" + +#: ../katze/katze-throbber.c:162 +msgid "Animated" +msgstr "Animeeritud" + +#: ../katze/katze-throbber.c:163 +msgid "Whether the throbber should be animated" +msgstr "Kas tuksuja peaks olema animeeritud" + +#: ../katze/katze-throbber.c:171 +msgid "Static Icon Name" +msgstr "Staatilise ikooni nimi" + +#: ../katze/katze-throbber.c:172 +msgid "The name of an icon to be used as the static image" +msgstr "Staatilise pildina kasutatava ikooni nimi" + +#: ../katze/katze-throbber.c:180 +msgid "Static Pixbuf" +msgstr "Staatiline Pixbuf" + +#: ../katze/katze-throbber.c:181 +msgid "A GdkPixbuf to be used as the static image" +msgstr "Staatilise pildina kasutatav GdkPixbuf" + +#: ../katze/katze-throbber.c:189 +msgid "Static Stock ID" +msgstr "Staatilise varutunnus" + +#: ../katze/katze-throbber.c:190 +msgid "The stock ID of an icon to be used as the static image" +msgstr "Staatilise pildina kasutatava ikooni varutunnus" + +#: ../katze/katze-throbber.c:808 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Nimetatud ikooni \"%s\" ei saanud laadida" + +#: ../katze/katze-throbber.c:821 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Varuikooni \"%s\" ei saanud laadida" + +#: ../katze/katze-throbber.c:844 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "Ikooni \"%s\" ei saanud laadida" + +#: ../katze/katze-throbber.c:876 +msgid "Animation frames are broken" +msgstr "Animatsioonikaadrid on vigased" + +#: ../katze/katze-utils.c:137 +#: ../katze/katze-utils.c:322 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Omadus \"%s\" ei ole õige %s jaoks" + +#: ../katze/katze-utils.c:159 +#: ../katze/katze-utils.c:195 +msgid "Choose file" +msgstr "Vali fail" + +#: ../katze/katze-utils.c:177 +msgid "Choose folder" +msgstr "Vali kataloog" + +#: ../katze/katze-item.c:72 +msgid "Name" +msgstr "Nimi" + +#: ../katze/katze-item.c:73 +msgid "The name of the item" +msgstr "Elemendi nimi" + +#: ../katze/katze-item.c:82 +msgid "The descriptive text of the item" +msgstr "Elemendi kirjeldav tekst" + +#: ../katze/katze-item.c:91 +msgid "The URI of the item" +msgstr "Elemendi URI" + +#: ../katze/katze-item.c:99 +msgid "Icon" +msgstr "Ikoon" + +#: ../katze/katze-item.c:100 +msgid "The icon of the item" +msgstr "Elemendi ikoon" + +#: ../katze/katze-item.c:108 +msgid "Token" +msgstr "Luba" + +#: ../katze/katze-item.c:109 +msgid "The token of the item" +msgstr "Elemendi luba" + +#: ../katze/katze-xbel.c:708 +#: ../katze/katze-xbel.c:716 +#: ../katze/katze-xbel.c:752 +#: ../katze/katze-xbel.c:760 +msgid "Malformed document." +msgstr "Väärvormistatud dokument." + +#: ../katze/katze-xbel.c:744 +msgid "File not found." +msgstr "Faili ei leitud." From 0943ac252e2f199c1c0c1d383201f698277c0fc1 Mon Sep 17 00:00:00 2001 From: Kristjan Siimson Date: Tue, 16 Sep 2008 06:43:17 +0200 Subject: [PATCH 0328/2970] Fix translator-credits in Estonian translation --- po/et.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/et.po b/po/et.po index ad9b4847..ae7a8e20 100644 --- a/po/et.po +++ b/po/et.po @@ -426,7 +426,8 @@ msgstr "Kergekaaluline veebibrauser." #: ../midori/midori-browser.c:2540 msgid "translator-credits" -msgstr "tõlkija-tunnustused" +msgstr "" +"Kristjan Siimson " #: ../midori/midori-browser.c:2757 msgid "_File" From 7c4480ca534f07d67adcc056942db15bf3baae3a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 23 Sep 2008 17:16:22 +0200 Subject: [PATCH 0329/2970] Always use Glib error directly if gtk_init failed --- midori/main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/midori/main.c b/midori/main.c index 84eb844b..de898e2d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -504,10 +504,7 @@ main (int argc, if (!gtk_init_with_args (&argc, &argv, _("[URIs]"), entries, GETTEXT_PACKAGE, &error)) { - if (error->code == G_OPTION_ERROR_UNKNOWN_OPTION) - g_print ("%s - %s\n", _("Midori"), _("Unknown argument.")); - else - g_print ("%s - %s", _("Midori"), _("Failed to setup interface.")); + g_print ("%s - %s\n", _("Midori"), error->message); g_error_free (error); return 1; } From 6fb2d5b22f9bf53d62be0e2da8ddaeb00fd3f88f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 24 Sep 2008 02:07:15 +0200 Subject: [PATCH 0330/2970] Really don't show the Stylesheet preference --- midori/midori-preferences.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 5350a46f..e0412f64 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -340,7 +340,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_object_get (settings, "user-stylesheet-uri", &user_stylesheet_uri, NULL); /* Add the stylesheet uri widget only if there's a value Otherwise we prefer to not use it, it is superfluous basically */ - if (user_stylesheet_uri) + if (user_stylesheet_uri && *user_stylesheet_uri) { label = katze_property_label (settings, "user-stylesheet-uri"); INDENTED_ADD (label, 0, 1, 3, 4); From 45f32f3f7758887c1234735c7b20e4ae19b54e26 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 24 Sep 2008 02:09:26 +0200 Subject: [PATCH 0331/2970] Don't show the zoom stepping preference at all --- midori/midori-preferences.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index e0412f64..0ec4ca8c 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -357,24 +357,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 3, 4); g_free (user_stylesheet_uri); } - if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), "zoom-step")) - { - label = katze_property_label (settings, "zoom-step"); - INDENTED_ADD (label, 0, 1, 4, 5); - hbox = gtk_hbox_new (FALSE, 4); - entry = katze_property_proxy (settings, "zoom-step", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - FILLED_ADD (hbox, 1, 2, 4, 5); - } - else - { - label = gtk_label_new ("Zoom Stepping Value"); - INDENTED_ADD (label, 0, 1, 4, 5); - hbox = gtk_hbox_new (FALSE, 4); - entry = gtk_label_new ("Not available in this WebKit version"); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - FILLED_ADD (hbox, 1, 2, 4, 5); - } label = katze_property_label (settings, "location-entry-search"); INDENTED_ADD (label, 0, 1, 5, 6); entry = katze_property_proxy (settings, "location-entry-search", NULL); From 62838fdf58183de24573c0a7afd358bea94741c6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 26 Sep 2008 23:13:46 +0200 Subject: [PATCH 0332/2970] Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages. --- midori/Makefile.am | 3 +- midori/main.c | 109 +- midori/midori-browser.c | 1265 +++++++------------- midori/midori-browser.h | 13 +- midori/midori-panel.c | 5 + midori/midori-source.c | 191 +++ midori/midori-source.h | 47 + midori/midori-view.c | 2451 +++++++++++++++++++++++++++++++++++++++ midori/midori-view.h | 161 +++ midori/midori-webview.c | 1214 ------------------- midori/midori-webview.h | 125 -- midori/sokoke.c | 35 +- midori/sokoke.h | 3 + 13 files changed, 3406 insertions(+), 2216 deletions(-) create mode 100644 midori/midori-source.c create mode 100644 midori/midori-source.h create mode 100644 midori/midori-view.c create mode 100644 midori/midori-view.h delete mode 100644 midori/midori-webview.c delete mode 100644 midori/midori-webview.h diff --git a/midori/Makefile.am b/midori/Makefile.am index ffe49e56..3c327a3f 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -28,7 +28,8 @@ midori_SOURCES = \ midori-panel.c midori-panel.h \ midori-addons.c midori-addons.h \ midori-console.c midori-console.h \ - midori-webview.c midori-webview.h \ + midori-view.c midori-view.h \ + midori-source.c midori-source.h \ midori-websettings.c midori-websettings.h \ midori-preferences.c midori-preferences.h \ midori-searchentry.c midori-searchentry.h \ diff --git a/midori/main.c b/midori/main.c index de898e2d..fac85f03 100644 --- a/midori/main.c +++ b/midori/main.c @@ -13,6 +13,7 @@ #include #endif +#include "midori-view.h" #include "midori-app.h" #include "midori-websettings.h" #include "midori-browser.h" @@ -367,25 +368,76 @@ _simple_xml_element (const gchar* name, } static gchar* -katze_xbel_array_to_xml (KatzeArray* array, - GError** error) +katze_item_to_data (KatzeItem* item) +{ + gchar* markup; + + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + markup = NULL; + if (KATZE_IS_ARRAY (item)) + { + GString* _markup = g_string_new (NULL); + guint n = katze_array_get_length (KATZE_ARRAY (item)); + guint i; + for (i = 0; i < n; i++) + { + KatzeItem* _item = katze_array_get_nth_item (KATZE_ARRAY (item), i); + gchar* item_markup = katze_item_to_data (_item); + g_string_append (_markup, item_markup); + g_free (item_markup); + } + /* gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); */ + gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); + gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); + markup = g_strdup_printf ("\n%s%s%s\n", + "" /* folded ? folded : "" */, + title, desc, + g_string_free (_markup, FALSE)); + /* g_free (folded); */ + g_free (title); + g_free (desc); + } + else if (katze_item_get_uri (item)) + { + gchar* href_escaped = g_markup_escape_text (katze_item_get_uri (item), -1); + gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); + g_free (href_escaped); + gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); + gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); + markup = g_strdup_printf ("\n%s%s%s\n", + href, + title, desc, + ""); + g_free (href); + g_free (title); + g_free (desc); + } + else + markup = g_strdup ("\n"); + return markup; +} + +static gchar* +katze_array_to_xml (KatzeArray* array, + GError** error) { GString* inner_markup; guint i, n; - KatzeXbelItem* item; + KatzeItem* item; gchar* item_xml; gchar* title; gchar* desc; gchar* outer_markup; - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_XBEL_ITEM), NULL); + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL); inner_markup = g_string_new (NULL); n = katze_array_get_length (array); for (i = 0; i < n; i++) { item = katze_array_get_nth_item (array, i); - item_xml = katze_xbel_item_to_data (item); + item_xml = katze_item_to_data (item); g_string_append (inner_markup, item_xml); g_free (item_xml); } @@ -415,10 +467,10 @@ katze_array_to_file (KatzeArray* array, gchar* data; FILE* fp; - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_XBEL_ITEM), FALSE); + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); g_return_val_if_fail (filename, FALSE); - if (!(data = katze_xbel_array_to_xml (array, error))) + if (!(data = katze_array_to_xml (array, error))) return FALSE; if (!(fp = fopen (filename, "w"))) { @@ -468,6 +520,7 @@ int main (int argc, char** argv) { + guint socket_id; gboolean version; gchar** uris; MidoriApp* app; @@ -475,12 +528,16 @@ main (int argc, GError* error; GOptionEntry entries[] = { - { "version", 'v', 0, G_OPTION_ARG_NONE, &version, + { "id", 'i', 0, G_OPTION_ARG_INT, &socket_id, + N_("Internal identifier"), NULL }, + { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, N_("URIs"), NULL }, { NULL } }; + GtkWidget* view; + GtkWidget* plug; MidoriStartup load_on_startup; gchar* homepage; KatzeArray* search_engines; @@ -498,6 +555,7 @@ main (int argc, g_set_application_name (_("Midori")); /* Parse cli options */ + socket_id = 0; version = FALSE; uris = NULL; error = NULL; @@ -509,6 +567,22 @@ main (int argc, return 1; } + stock_items_init (); + + if (socket_id) + { + /* If an ID was specified we create a view in a plug. + This allows us to open views in separate processes. */ + view = g_object_new (MIDORI_TYPE_VIEW, "socket-id", socket_id, NULL); + gtk_widget_show (view); + plug = gtk_plug_new (socket_id); + gtk_container_add (GTK_CONTAINER (plug), view); + g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit), NULL); + gtk_widget_show (plug); + gtk_main (); + return 0; + } + if (version) { g_print ( @@ -539,6 +613,8 @@ main (int argc, return 1; } + sokoke_remember_argv0 (argv[0]); + app = midori_app_new (); if (midori_app_instance_is_running (app)) { @@ -691,14 +767,19 @@ main (int argc, } g_free (config_path); - stock_items_init (); - - KatzeArray* trash = katze_array_new (KATZE_TYPE_XBEL_ITEM); + KatzeArray* trash = katze_array_new (KATZE_TYPE_ITEM); guint n = katze_xbel_folder_get_n_items (xbel_trash); for (i = 0; i < n; i++) { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (xbel_trash, i); - katze_array_add_item (trash, item); + KatzeXbelItem* xbel_item = katze_xbel_folder_get_nth_item (xbel_trash, i); + if (!katze_xbel_item_is_separator (xbel_item)) + { + KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, + "name", katze_xbel_item_get_title (xbel_item), + "uri", katze_xbel_bookmark_get_href (xbel_item), + NULL); + katze_array_add_item (trash, item); + } } katze_xbel_item_unref (xbel_trash); g_signal_connect_after (trash, "add-item", @@ -719,7 +800,7 @@ main (int argc, midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); - KatzeArray* session = midori_browser_get_proxy_xbel_array (browser); + KatzeArray* session = midori_browser_get_proxy_array (browser); n = katze_xbel_folder_get_n_items (_session); for (i = 0; i < n; i++) { diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9828b507..91c2a9bb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -15,7 +15,8 @@ #include "midori-browser.h" -#include "midori-webview.h" +#include "midori-view.h" +#include "midori-source.h" #include "midori-preferences.h" #include "midori-panel.h" #include "midori-addons.h" @@ -34,10 +35,6 @@ #endif #include #include -#if HAVE_GTKSOURCEVIEW -#include -#include -#endif #include struct _MidoriBrowser @@ -76,10 +73,8 @@ struct _MidoriBrowser gchar* statusbar_text; MidoriWebSettings* settings; KatzeXbelItem* bookmarks; - GList* tab_titles; - GList* close_buttons; - KatzeArray* proxy_xbel_array; + KatzeArray* proxy_array; KatzeArray* trash; KatzeArray* search_engines; }; @@ -105,8 +100,6 @@ enum enum { WINDOW_OBJECT_CLEARED, - STATUSBAR_TEXT_CHANGED, - ELEMENT_MOTION, NEW_WINDOW, ADD_TAB, @@ -163,56 +156,15 @@ _action_set_active (MidoriBrowser* browser, gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); } -static const gchar* -_midori_browser_get_tab_uri (MidoriBrowser* browser, - GtkWidget* widget) -{ - const gchar* uri; - - if (MIDORI_IS_WEB_VIEW (widget)) - return midori_web_view_get_display_uri (MIDORI_WEB_VIEW (widget)); - - uri = g_object_get_data (G_OBJECT (widget), "browser-tab-uri"); - return uri ? uri : "file://"; -} - -/* Note: The return value is valid only - until the next call to this function */ -static const gchar* -_midori_browser_get_tab_title (MidoriBrowser* browser, - GtkWidget* widget) -{ - const gchar* uri; - static gchar* title = NULL; - - if (MIDORI_IS_WEB_VIEW (widget)) - return midori_web_view_get_display_title (MIDORI_WEB_VIEW (widget)); - - uri = g_object_get_data (G_OBJECT (widget), "browser-tab-uri"); - if (g_str_has_prefix (uri, "view-source:")) - { - g_free (title); - title = g_strconcat (_("Source"), ": ", uri, NULL); - return title; - } - return "untitled"; -} - static void _midori_browser_open_uri (MidoriBrowser* browser, const gchar* uri) { - GtkWidget* web_view; - gint n; + GtkWidget* view; - web_view = midori_browser_get_current_web_view (browser); - if (web_view) - webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), uri); - else - { - n = midori_browser_add_uri (browser, uri); - midori_browser_set_current_page (browser, n); - } + view = midori_browser_get_current_tab (browser); + if (view) + midori_view_set_uri (MIDORI_VIEW (view), uri); } static void @@ -238,35 +190,41 @@ _midori_browser_update_actions (MidoriBrowser* browser) static void _midori_browser_update_interface (MidoriBrowser* browser) { + GtkWidget* view; gboolean loading; - GtkWidget* widget; - GtkWidget* web_view; + gboolean can_reload; GtkAction* action; - widget = midori_browser_get_current_tab (browser); - web_view = widget && MIDORI_IS_WEB_VIEW (widget) ? widget : NULL; - loading = web_view != NULL - && midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) + view = midori_browser_get_current_tab (browser); + loading = midori_view_get_load_status (MIDORI_VIEW (view)) != MIDORI_LOAD_FINISHED; + can_reload = midori_view_can_reload (MIDORI_VIEW (view)); - _action_set_sensitive (browser, "Reload", web_view != NULL && !loading); - _action_set_sensitive (browser, "Stop", web_view != NULL && loading); - _action_set_sensitive (browser, "Back", web_view != NULL - && webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view))); - _action_set_sensitive (browser, "Forward", web_view != NULL - && webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view))); + _action_set_sensitive (browser, "Reload", can_reload && !loading); + _action_set_sensitive (browser, "Stop", can_reload && loading); + _action_set_sensitive (browser, "Back", + midori_view_can_go_back (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "Forward", + midori_view_can_go_forward (MIDORI_VIEW (view))); - _action_set_sensitive (browser, "Print", web_view != NULL); - _action_set_sensitive (browser, "ZoomIn", web_view != NULL); - _action_set_sensitive (browser, "ZoomOut", web_view != NULL); - _action_set_sensitive (browser, "ZoomNormal", web_view != NULL - && webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); - #if HAVE_GIO - _action_set_sensitive (browser, "SourceView", web_view != NULL); - #endif - _action_set_sensitive (browser, "FindNext", web_view != NULL); - _action_set_sensitive (browser, "FindPrevious", web_view != NULL); - /* _action_set_sensitive (browser, "FindQuick", web_view != NULL); */ + _action_set_sensitive (browser, "Print", + midori_view_can_print (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "ZoomIn", + midori_view_can_zoom_in (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "ZoomOut", + midori_view_can_zoom_out (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "ZoomNormal", + midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0); + _action_set_sensitive (browser, "SourceView", + midori_view_can_view_source (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "Find", + midori_view_can_find (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "FindNext", + midori_view_can_find (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "FindPrevious", + midori_view_can_find (MIDORI_VIEW (view))); + /* _action_set_sensitive (browser, "FindQuick", + midori_view_can_find (MIDORI_VIEW (view))); */ action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); if (!loading) @@ -275,7 +233,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) g_object_set (action, "stock-id", GTK_STOCK_REFRESH, "tooltip", _("Reload the current page"), - "sensitive", web_view != NULL, NULL); + "sensitive", can_reload, NULL); gtk_widget_hide (browser->progressbar); if (!GTK_WIDGET_VISIBLE (browser->statusbar)) if (!sokoke_object_get_boolean (browser->settings, @@ -294,13 +252,13 @@ _midori_browser_update_interface (MidoriBrowser* browser) if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) gtk_widget_show (browser->navigationbar); g_object_set (_action_by_name (browser, "Location"), "progress", - midori_web_view_get_progress (MIDORI_WEB_VIEW (web_view)), NULL); + midori_view_get_progress (MIDORI_VIEW (view)), NULL); } } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); /* FIXME: This won't work due to a bug in GtkIconEntry */ - /* if (web_view && midori_web_view_get_news_feeds (MIDORI_WEB_VIEW (web_view))) + /* if (view && midori_view_get_news_feeds (MIDORI_VIEW (view))) gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( gtk_bin_get_child (GTK_BIN (browser->location))), GTK_ICON_ENTRY_SECONDARY, STOCK_NEWS_FEED); @@ -310,26 +268,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) GTK_ICON_ENTRY_SECONDARY, NULL);*/ } -static GtkWidget* -_midori_browser_scrolled_for_child (MidoriBrowser* browser, - GtkWidget* child) -{ - GtkWidget* scrolled = gtk_widget_get_parent (child); - if (GTK_IS_VIEWPORT (scrolled)) - scrolled = gtk_widget_get_parent (scrolled); - return scrolled; -} - -static GtkWidget* -_midori_browser_child_for_scrolled (MidoriBrowser* browser, - GtkWidget* scrolled) -{ - GtkWidget* child = gtk_bin_get_child (GTK_BIN (scrolled)); - if (GTK_IS_VIEWPORT (child)) - child = gtk_bin_get_child (GTK_BIN (child)); - return child; -} - static void _midori_browser_set_statusbar_text (MidoriBrowser* browser, const gchar* text) @@ -351,16 +289,16 @@ _midori_browser_set_current_page_smartly (MidoriBrowser* browser, static void _midori_browser_update_progress (MidoriBrowser* browser, - MidoriWebView* web_view) + MidoriView* view) { MidoriLocationAction* action; gdouble progress; gchar* message; action = MIDORI_LOCATION_ACTION (_action_by_name (browser, "Location")); - progress = midori_web_view_get_progress (web_view); + progress = midori_view_get_progress (view); /* When we are finished, we don't want to *see* progress anymore */ - if (midori_web_view_get_load_status (web_view) == MIDORI_LOAD_FINISHED) + if (midori_view_get_load_status (view) == MIDORI_LOAD_FINISHED) progress = 0.0; if (progress > 0.0) { @@ -383,35 +321,55 @@ _midori_browser_update_progress (MidoriBrowser* browser, } static void -midori_web_view_window_object_cleared_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - JSGlobalContextRef js_context, - JSObjectRef js_window, - MidoriBrowser* browser) +_midori_browser_activate_action (MidoriBrowser* browser, + const gchar* name) { - g_signal_emit (browser, signals[WINDOW_OBJECT_CLEARED], 0, - web_frame, js_context, js_window); + GtkAction* action = _action_by_name (browser, name); + if (action) + gtk_action_activate (action); + else + g_warning (_("Unexpected action '%s'."), name); } static void -midori_web_view_notify_load_status_cb (GtkWidget* web_view, - GParamSpec* pspec, - MidoriBrowser* browser) +midori_view_notify_icon_cb (MidoriView* view, + GParamSpec* pspec, + MidoriBrowser* browser) { const gchar* uri; GtkAction* action; - uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + action = _action_by_name (browser, "Location"); + midori_location_action_set_icon_for_uri ( + MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); +} + +static void +midori_view_notify_load_status_cb (GtkWidget* view, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + const gchar* uri; + GtkAction* action; + + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - if (midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) + if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) midori_location_action_add_uri ( MIDORI_LOCATION_ACTION (action), uri); - - if (web_view == midori_browser_get_current_web_view (browser)) + else if (midori_view_get_load_status (MIDORI_VIEW (view)) + == MIDORI_LOAD_FINISHED) { - if (midori_web_view_get_load_status (MIDORI_WEB_VIEW (web_view)) + /* g_signal_emit (browser, signals[WINDOW_OBJECT_CLEARED], 0, + web_frame, js_context, js_window); */ + } + + if (view == midori_browser_get_current_tab (browser)) + { + if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) { midori_location_action_set_uri ( @@ -427,79 +385,15 @@ midori_web_view_notify_load_status_cb (GtkWidget* web_view, } static void -midori_web_view_notify_progress_cb (GtkWidget* web_view, - GParamSpec* pspec, - MidoriBrowser* browser) +midori_view_notify_progress_cb (GtkWidget* view, + GParamSpec* pspec, + MidoriBrowser* browser) { - if (web_view == midori_browser_get_current_web_view (browser)) - _midori_browser_update_progress (browser, MIDORI_WEB_VIEW (web_view)); -} - -static void -midori_web_view_notify_title_cb (GtkWidget* web_view, - GParamSpec* pspec, - MidoriBrowser* browser) -{ - const gchar* uri; - const gchar* title; - GtkAction* action; - gchar* window_title; - - uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - title = midori_web_view_get_display_title (MIDORI_WEB_VIEW (web_view)); - action = _action_by_name (browser, "Location"); - midori_location_action_set_title_for_uri ( - MIDORI_LOCATION_ACTION (action), title, uri); - - if (web_view == midori_browser_get_current_web_view (browser)) - { - window_title = g_strconcat (title, " - ", - g_get_application_name (), NULL); - gtk_window_set_title (GTK_WINDOW (browser), window_title); - g_free (window_title); - } -} - -static void -midori_web_view_notify_zoom_level_cb (GtkWidget* web_view, - GParamSpec* pspec, - MidoriBrowser* browser) -{ - if (web_view == midori_browser_get_current_web_view (browser)) - _action_set_sensitive (browser, "ZoomNormal", - webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) != 1.0); -} - -static void -midori_web_view_statusbar_text_changed_cb (MidoriWebView* web_view, - const gchar* text, - MidoriBrowser* browser) -{ - _midori_browser_set_statusbar_text (browser, text); -} - -static void -midori_web_view_element_motion_cb (MidoriWebView* web_View, - const gchar* link_uri, - MidoriBrowser* browser) -{ - _midori_browser_set_statusbar_text (browser, link_uri); -} - -static void -midori_web_view_icon_ready_cb (MidoriWebView* web_view, - GdkPixbuf* icon, - MidoriBrowser* browser) -{ - const gchar* uri; - GtkAction* action; - - uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - action = _action_by_name (browser, "Location"); - midori_location_action_set_icon_for_uri ( - MIDORI_LOCATION_ACTION (action), icon, uri); + if (view == midori_browser_get_current_tab (browser)) + _midori_browser_update_progress (browser, MIDORI_VIEW (view)); } +/* static void midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, const gchar* href, @@ -511,80 +405,53 @@ midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, midori_location_action_set_secondary_icon (MIDORI_LOCATION_ACTION ( _action_by_name (browser, "Location")), STOCK_NEWS_FEED); } +*/ -static gboolean -midori_web_view_console_message_cb (GtkWidget* web_view, - const gchar* message, - guint line, - const gchar* source_id, - MidoriBrowser* browser) +static void +midori_view_notify_title_cb (GtkWidget* view, + GParamSpec* pspec, + MidoriBrowser* browser) { - midori_console_add (MIDORI_CONSOLE (browser->panel_console), - message, line, source_id); - return TRUE; + const gchar* uri; + const gchar* title; + GtkAction* action; + gchar* window_title; + + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + title = midori_view_get_display_title (MIDORI_VIEW (view)); + action = _action_by_name (browser, "Location"); + midori_location_action_set_title_for_uri ( + MIDORI_LOCATION_ACTION (action), title, uri); + + if (view == midori_browser_get_current_tab (browser)) + { + window_title = g_strconcat (title, " - ", + g_get_application_name (), NULL); + gtk_window_set_title (GTK_WINDOW (browser), window_title); + g_free (window_title); + } } -static gboolean -midori_web_view_button_press_event_cb (MidoriWebView* web_view, - GdkEventButton* event, - MidoriBrowser* browser) +static void +midori_view_notify_zoom_level_cb (GtkWidget* view, + GParamSpec* pspec, + MidoriBrowser* browser) { - GdkModifierType state = (GdkModifierType)0; - gint x, y; - const gchar* link_uri; - guint n; - gboolean background; + if (view == midori_browser_get_current_tab (browser)) + _action_set_sensitive (browser, "ZoomNormal", + midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0); +} - gdk_window_get_pointer (NULL, &x, &y, &state); - link_uri = midori_web_view_get_link_uri (web_view); +static void +midori_view_notify_statusbar_text_cb (MidoriView* view, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + gchar* text; - switch (event->button) - { - case 1: - if (!link_uri) - return FALSE; - if (state & GDK_SHIFT_MASK) - { - /* Open link in new window */ - g_signal_emit (browser, signals[NEW_WINDOW], 0, link_uri); - return TRUE; - } - else if (state & GDK_MOD1_MASK) - { - /* Open link in new tab */ - n = midori_browser_add_uri (browser, link_uri); - background = sokoke_object_get_boolean (browser->settings, - "open-tabs-in-the-background"); - if (state & GDK_CONTROL_MASK) - background = !background; - if (!background) - midori_browser_set_current_page (browser, n); - return TRUE; - } - break; - case 2: - if (link_uri) - { - /* Open link in new tab */ - n = midori_browser_add_uri (browser, link_uri); - background = sokoke_object_get_boolean (browser->settings, - "open-tabs-in-the-background"); - if (state & GDK_CONTROL_MASK) - background = !background; - if (!background) - midori_browser_set_current_page (browser, n); - return TRUE; - } - else if (state & GDK_CONTROL_MASK) - { - webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); - return FALSE; /* Allow Ctrl + Middle click */ - } - break; - case 3: - return FALSE; - } - return FALSE; + g_object_get (view, "statusbar-text", &text, NULL); + _midori_browser_set_statusbar_text (browser, text); + g_free (text); } static void @@ -607,12 +474,12 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (new_bookmark) { - GtkWidget* widget = midori_browser_get_current_tab (browser); + GtkWidget* view = midori_browser_get_current_tab (browser); bookmark = katze_xbel_bookmark_new (); katze_xbel_item_set_title (bookmark, - _midori_browser_get_tab_title (browser, widget)); + midori_view_get_display_title (MIDORI_VIEW (view))); katze_xbel_bookmark_set_href (bookmark, - _midori_browser_get_tab_uri (browser, widget)); + midori_view_get_display_uri (MIDORI_VIEW (view))); } GtkWidget* hbox = gtk_hbox_new (FALSE, 8); @@ -707,74 +574,19 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } static void -midori_web_view_bookmark_add_cb (GtkWidget* menuitem, - GtkWidget* web_view) +midori_view_add_bookmark_cb (GtkWidget* menuitem, + const gchar* uri, + GtkWidget* view) { - const gchar* uri; KatzeXbelItem* xbel_item; MidoriBrowser* browser; - uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); xbel_item = katze_xbel_bookmark_new (); katze_xbel_bookmark_set_href (xbel_item, uri); browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); midori_browser_edit_bookmark_dialog_new (browser, xbel_item); } -static void -midori_web_view_populate_popup_cb (GtkWidget* web_view, - GtkWidget* menu, - MidoriBrowser* browser) -{ - gboolean has_selection; - const gchar* uri; - GtkAction* action; - GtkWidget* menuitem; - - if (MIDORI_IS_WEB_VIEW (web_view) - && midori_web_view_has_selection (MIDORI_WEB_VIEW (web_view))) - has_selection = TRUE; - else - has_selection = FALSE; - - uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); - if (uri) - { - action = _action_by_name (browser, "BookmarkAdd"); - menuitem = sokoke_action_create_popup_menu_item (action); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_bookmark_add_cb), web_view); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - } - - if (has_selection) - { - /* TODO: view selection source */ - } - - if (!uri && !has_selection) - { - action = _action_by_name (browser, "UndoTabClose"); - menuitem = sokoke_action_create_popup_menu_item (action); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - action = _action_by_name (browser, "BookmarkAdd"); - menuitem = sokoke_action_create_popup_menu_item (action); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - action = _action_by_name (browser, "SaveAs"); - menuitem = sokoke_action_create_popup_menu_item (action); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - action = _action_by_name (browser, "SourceView"); - menuitem = sokoke_action_create_popup_menu_item (action); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - action = _action_by_name (browser, "Print"); - menuitem = sokoke_action_create_popup_menu_item (action); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - } -} - static gboolean midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, GdkEventCrossing* event, @@ -785,18 +597,37 @@ midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, } static void -midori_web_view_new_tab_cb (GtkWidget* web_view, - const gchar* uri, - MidoriBrowser* browser) +midori_view_activate_action_cb (GtkWidget* view, + const gchar* action, + MidoriBrowser* browser) +{ + _midori_browser_activate_action (browser, action); +} + +static void +midori_view_console_message_cb (GtkWidget* view, + const gchar* message, + gint line, + const gchar* source_id, + MidoriBrowser* browser) +{ + midori_console_add (MIDORI_CONSOLE (browser->panel_console), + message, line, source_id); +} + +static void +midori_view_new_tab_cb (GtkWidget* view, + const gchar* uri, + MidoriBrowser* browser) { gint n = midori_browser_add_uri (browser, uri); _midori_browser_set_current_page_smartly (browser, n); } static void -midori_web_view_new_window_cb (GtkWidget* web_view, - const gchar* uri, - MidoriBrowser* browser) +midori_view_new_window_cb (GtkWidget* view, + const gchar* uri, + MidoriBrowser* browser) { g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); } @@ -805,18 +636,17 @@ static gboolean midori_browser_tab_destroy_cb (GtkWidget* widget, MidoriBrowser* browser) { - KatzeXbelItem* xbel_item; + KatzeItem* item; const gchar* uri; - if (browser->proxy_xbel_array && MIDORI_IS_WEB_VIEW (widget)) + if (browser->proxy_array && MIDORI_IS_VIEW (widget)) { - xbel_item = midori_web_view_get_proxy_xbel_item ( - MIDORI_WEB_VIEW (widget)); - uri = katze_xbel_bookmark_get_href (xbel_item); + item = midori_view_get_proxy_item (MIDORI_VIEW (widget)); + uri = katze_item_get_uri (item); if (browser->trash && uri && *uri) - katze_array_add_item (browser->trash, xbel_item); - katze_array_remove_item (browser->proxy_xbel_array, xbel_item); - katze_xbel_item_unref (xbel_item); + katze_array_add_item (browser->trash, item); + katze_array_remove_item (browser->proxy_array, item); + g_object_unref (item); } _midori_browser_update_actions (browser); @@ -844,243 +674,88 @@ midori_browser_window_menu_item_activate_cb (GtkWidget* menuitem, midori_browser_set_current_tab (browser, widget); } -static void -_update_label_size (GtkWidget* label, - gint size) -{ - gint width, height; - - if (size > -1) - { - sokoke_widget_get_text_size (label, "M", &width, &height); - gtk_widget_set_size_request (label, width * size, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - } - else - { - gtk_widget_set_size_request (label, -1, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); - } -} - -static gboolean -midori_browser_tab_label_button_release_event (GtkWidget* tab_label, - GdkEventButton* event, - GtkWidget* widget) -{ - if (event->button == 2) - { - /* Close the widget on middle click */ - gtk_widget_destroy (widget); - return TRUE; - } - - return FALSE; -} - -static void -midori_browser_tab_icon_style_set (GtkWidget* tab_icon, - GtkStyle* previous_style) -{ - GtkSettings* gtk_settings; - gint width, height; - - gtk_settings = gtk_widget_get_settings (tab_icon); - gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_MENU, - &width, &height); - gtk_widget_set_size_request (tab_icon, width + 2, height + 2); -} - -static void -midori_browser_tab_close_clicked (GtkWidget* tab_close, - GtkWidget* widget) -{ - gtk_widget_destroy (widget); -} - static void _midori_browser_add_tab (MidoriBrowser* browser, - GtkWidget* widget) + GtkWidget* view) { - GtkWidget* scrolled; - GtkWidget* child; - GObjectClass* gobject_class; - GdkPixbuf* icon; - GtkWidget* tab_icon; - const gchar* title; - GtkWidget* tab_title; + GtkWidget* tab_label; GtkWidget* menuitem; - KatzeXbelItem* xbel_item; - GtkWidget* event_box; - GtkWidget* hbox; - GtkWidget* close_button; - GtkRcStyle* rcstyle; - GtkWidget* image; + KatzeItem* item; guint n; - scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), + GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_ETCHED_IN); - gobject_class = G_OBJECT_GET_CLASS (widget); - if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) - child = widget; - else + + tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); + menuitem = midori_view_get_proxy_menu_item (MIDORI_VIEW (view)); + + if (browser->proxy_array) { - child = gtk_viewport_new (NULL, NULL); - gtk_widget_show (child); - gtk_container_add (GTK_CONTAINER (child), widget); + item = midori_view_get_proxy_item (MIDORI_VIEW (view)); + g_object_ref (item); + katze_array_add_item (browser->proxy_array, item); } - gtk_container_add (GTK_CONTAINER (scrolled), child); - gtk_widget_show (scrolled); - if (MIDORI_IS_WEB_VIEW (widget)) - { - tab_icon = midori_web_view_get_proxy_tab_icon (MIDORI_WEB_VIEW (widget)); - tab_title = midori_web_view_get_proxy_tab_title (MIDORI_WEB_VIEW (widget)); - menuitem = midori_web_view_get_proxy_menu_item (MIDORI_WEB_VIEW (widget)); + g_object_connect (view, + "signal::notify::icon", + midori_view_notify_icon_cb, browser, + "signal::notify::load-status", + midori_view_notify_load_status_cb, browser, + "signal::notify::progress", + midori_view_notify_progress_cb, browser, + /* "signal::news-feed-ready", + midori_view_news_feed_ready_cb, browser, */ + "signal::notify::title", + midori_view_notify_title_cb, browser, + "signal::notify::zoom-level", + midori_view_notify_zoom_level_cb, browser, + "signal::notify::statusbar-text", + midori_view_notify_statusbar_text_cb, browser, + "signal::activate-action", + midori_view_activate_action_cb, browser, + "signal::console-message", + midori_view_console_message_cb, browser, + "signal::new-tab", + midori_view_new_tab_cb, browser, + "signal::new-window", + midori_view_new_window_cb, browser, + "signal::add-bookmark", + midori_view_add_bookmark_cb, browser, + NULL); - if (browser->proxy_xbel_array) - { - xbel_item = midori_web_view_get_proxy_xbel_item ( - MIDORI_WEB_VIEW (widget)); - katze_xbel_item_ref (xbel_item); - katze_array_add_item (browser->proxy_xbel_array, xbel_item); - } - - g_object_connect (widget, - "signal::window-object-cleared", - midori_web_view_window_object_cleared_cb, browser, - "signal::notify::progress", - midori_web_view_notify_progress_cb, browser, - "signal::notify::mload-status", - midori_web_view_notify_load_status_cb, browser, - "signal::icon-ready", - midori_web_view_icon_ready_cb, browser, - "signal::news-feed-ready", - midori_web_view_news_feed_ready_cb, browser, - "signal::notify::title", - midori_web_view_notify_title_cb, browser, - "signal::notify::zoom-level", - midori_web_view_notify_zoom_level_cb, browser, - "signal::status-bar-text-changed", - midori_web_view_statusbar_text_changed_cb, browser, - "signal::element-motion", - midori_web_view_element_motion_cb, browser, - "signal::console-message", - midori_web_view_console_message_cb, browser, - "signal::new-tab", - midori_web_view_new_tab_cb, browser, - "signal::new-window", - midori_web_view_new_window_cb, browser, - "signal::button-press-event", - midori_web_view_button_press_event_cb, browser, - "signal::populate-popup", - midori_web_view_populate_popup_cb, browser, - NULL); - } - else - { - if (GTK_IS_TEXT_VIEW (widget)) - icon = gtk_widget_render_icon (widget, GTK_STOCK_EDIT, - GTK_ICON_SIZE_MENU, NULL); - else - icon = gtk_widget_render_icon (widget, GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); - tab_icon = katze_throbber_new (); - katze_throbber_set_static_pixbuf (KATZE_THROBBER (tab_icon), icon); - title = _midori_browser_get_tab_title (browser, widget); - tab_title = gtk_label_new (title); - menuitem = sokoke_image_menu_item_new_ellipsized (title); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), - gtk_image_new_from_pixbuf (icon)); - g_object_unref (icon); - - if (browser->proxy_xbel_array) - { - xbel_item = katze_xbel_bookmark_new (); - katze_xbel_item_set_title (xbel_item, title); - katze_xbel_bookmark_set_href (xbel_item, - _midori_browser_get_tab_uri (browser, widget)); - katze_array_add_item (browser->proxy_xbel_array, xbel_item); - } - } - g_object_set_data (G_OBJECT (widget), "browser-tab-icon", tab_icon); - browser->tab_titles = g_list_prepend (browser->tab_titles, tab_title); - - g_signal_connect (tab_icon, "style-set", - G_CALLBACK (midori_browser_tab_icon_style_set), NULL); - g_signal_connect (widget, "leave-notify-event", + g_signal_connect (view, "leave-notify-event", G_CALLBACK (midori_browser_tab_leave_notify_event_cb), browser); - event_box = gtk_event_box_new (); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); - hbox = gtk_hbox_new (FALSE, 1); - gtk_container_border_width (GTK_CONTAINER (hbox), 2); - gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - gtk_misc_set_alignment (GTK_MISC (tab_icon), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), tab_icon, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (tab_title), 0.0, 0.5); - /* TODO: make the tab initially look "unvisited" until it's focused */ - gtk_box_pack_start (GTK_BOX (hbox), tab_title, FALSE, TRUE, 0); - _update_label_size (tab_title, - sokoke_object_get_int (browser->settings, "tab-label-size")); - - close_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (close_button, rcstyle); - g_object_unref (rcstyle); - image = katze_throbber_new (); - katze_throbber_set_static_stock_id (KATZE_THROBBER (image), GTK_STOCK_CLOSE); - gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); - gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); - gtk_widget_show_all (GTK_WIDGET (event_box)); - if (!sokoke_object_get_boolean (browser->settings, "close-buttons-on-tabs")) - gtk_widget_hide (close_button); - browser->close_buttons = g_list_prepend (browser->close_buttons, close_button); - - g_signal_connect (event_box, "button-release-event", - G_CALLBACK (midori_browser_tab_label_button_release_event), widget); - g_signal_connect (close_button, "style-set", - G_CALLBACK (midori_browser_tab_icon_style_set), NULL); - g_signal_connect (close_button, "clicked", - G_CALLBACK (midori_browser_tab_close_clicked), widget); - if (sokoke_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); - gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), scrolled, - event_box, n + 1); + gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), view, + tab_label, n + 1); } else - gtk_notebook_append_page (GTK_NOTEBOOK (browser->notebook), scrolled, - event_box); + gtk_notebook_append_page (GTK_NOTEBOOK (browser->notebook), view, + tab_label); #if GTK_CHECK_VERSION(2, 10, 0) gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook), - scrolled, TRUE); + view, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (browser->notebook), - scrolled, TRUE); + view, TRUE); #endif gtk_widget_show (menuitem); g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_window_menu_item_activate_cb), scrolled); + G_CALLBACK (midori_browser_window_menu_item_activate_cb), view); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); /* We want the tab to be removed if the widget is destroyed */ - g_signal_connect_swapped (widget, "destroy", + g_signal_connect_swapped (view, "destroy", G_CALLBACK (gtk_widget_destroy), menuitem); - g_signal_connect_swapped (widget, "destroy", - G_CALLBACK (gtk_widget_destroy), scrolled); - g_signal_connect (widget, "destroy", + g_signal_connect (view, "destroy", G_CALLBACK (midori_browser_tab_destroy_cb), browser); _midori_browser_update_actions (browser); @@ -1088,20 +763,9 @@ _midori_browser_add_tab (MidoriBrowser* browser, static void _midori_browser_remove_tab (MidoriBrowser* browser, - GtkWidget* widget) + GtkWidget* view) { - gtk_widget_destroy (widget); -} - -static void -_midori_browser_activate_action (MidoriBrowser* browser, - const gchar* name) -{ - GtkAction* action = _action_by_name (browser, name); - if (action) - gtk_action_activate (action); - else - g_warning (_("Unexpected action '%s'."), name); + gtk_widget_destroy (view); } static void @@ -1165,17 +829,6 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_POINTER, G_TYPE_POINTER); - signals[ELEMENT_MOTION] = g_signal_new ( - "element-motion", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriBrowserClass, element_motion), - 0, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); - signals[NEW_WINDOW] = g_signal_new ( "new-window", G_TYPE_FROM_CLASS (class), @@ -1415,9 +1068,9 @@ _action_open_activate (GtkAction* action, gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); - /* base the start folder on the current web view's uri if it is local */ - GtkWidget* widget = midori_browser_get_current_tab (browser); - if ((uri = (gchar*)_midori_browser_get_tab_uri (browser, widget))) + /* base the start folder on the current view's uri if it is local */ + GtkWidget* view = midori_browser_get_current_tab (browser); + if ((uri = (gchar*)midori_view_get_display_uri (MIDORI_VIEW (view)))) { gchar* filename = g_filename_from_uri (uri, NULL, NULL); if (filename) @@ -1469,9 +1122,9 @@ static void _action_print_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_tab (browser); - if (web_view) - webkit_web_view_execute_script (WEBKIT_WEB_VIEW (web_view), "print ();"); + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + midori_view_print (MIDORI_VIEW (view)); } static void @@ -1489,12 +1142,12 @@ _action_edit_activate (GtkAction* action, gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE; gboolean has_selection, can_select_all = FALSE; - if (WEBKIT_IS_WEB_VIEW (widget)) + if (MIDORI_IS_VIEW (widget)) { - WebKitWebView* web_view = WEBKIT_WEB_VIEW (widget); - can_cut = webkit_web_view_can_cut_clipboard (web_view); - can_copy = webkit_web_view_can_copy_clipboard (web_view); - can_paste = webkit_web_view_can_paste_clipboard (web_view); + MidoriView* view = MIDORI_VIEW (widget); + can_cut = midori_view_can_cut_clipboard (view); + can_copy = midori_view_can_copy_clipboard (view); + can_paste = midori_view_can_paste_clipboard (view); can_select_all = TRUE; } else if (GTK_IS_EDITABLE (widget)) @@ -1725,10 +1378,12 @@ static void midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { + KatzeItem* item; + gint n; + /* Create a new web view with an uri which has been closed before */ - KatzeXbelItem* item = g_object_get_data (G_OBJECT (menuitem), - "KatzeXbelItem"); - gint n = midori_browser_add_xbel_item (browser, item); + item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + n = midori_browser_add_item (browser, item); midori_browser_set_current_page (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); @@ -1740,7 +1395,7 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, { GtkWidget* menu; guint i, n; - KatzeXbelItem* item; + KatzeItem* item; const gchar* title; const gchar* uri; GtkWidget* menuitem; @@ -1752,14 +1407,14 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, for (i = 0; i < n; i++) { item = katze_array_get_nth_item (browser->trash, i); - title = katze_xbel_item_get_title (item); - uri = katze_xbel_bookmark_get_href (item); + title = katze_item_get_name (item); + uri = katze_item_get_uri (item); menuitem = sokoke_image_menu_item_new_ellipsized (title ? title : uri); /* FIXME: Get the real icon */ icon = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_trash_item_activate_cb), browser); gtk_widget_show (menuitem); @@ -1830,19 +1485,23 @@ _action_reload_stop_activate (GtkAction* action, MidoriBrowser* browser) { gchar* stock_id; + GtkWidget* view; + GdkModifierType state = (GdkModifierType)0; + gint x, y; + gboolean from_cache; + g_object_get (action, "stock-id", &stock_id, NULL); - GtkWidget* web_view = midori_browser_get_current_web_view (browser); + view = midori_browser_get_current_tab (browser); + /* Refresh or stop, depending on the stock id */ if (!strcmp (stock_id, GTK_STOCK_REFRESH)) { - /*GdkModifierType state = (GdkModifierType)0; - gint x, y; gdk_window_get_pointer (NULL, &x, &y, &state); - gboolean from_cache = state & GDK_SHIFT_MASK;*/ - webkit_web_view_reload (WEBKIT_WEB_VIEW (web_view)); + from_cache = state & GDK_SHIFT_MASK; + midori_view_reload (MIDORI_VIEW (view), !from_cache); } else - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (web_view)); + midori_view_stop_loading (MIDORI_VIEW (view)); g_free (stock_id); } @@ -1850,139 +1509,50 @@ static void _action_zoom_in_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view) - webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + midori_view_set_zoom_level (MIDORI_VIEW (view), + midori_view_get_zoom_level (MIDORI_VIEW (view)) + 0.25f); } static void _action_zoom_out_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view) - webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + midori_view_set_zoom_level (MIDORI_VIEW (view), + midori_view_get_zoom_level (MIDORI_VIEW (view)) - 0.25f); } static void _action_zoom_normal_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - if (web_view) - webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (web_view), 1.0); + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } static void _action_source_view_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view; - const gchar* uri; - #if HAVE_GIO - GFile* file; - gchar* tag; - #if HAVE_GTKSOURCEVIEW - GFileInfo* info; - const gchar* content_type; - #endif - #endif - gchar* contents; - gchar* contents_utf8; - #if HAVE_GTKSOURCEVIEW - GtkSourceBuffer* buffer; - #if HAVE_GIO - GtkSourceLanguageManager* language_manager; - GtkSourceLanguage* language; - #endif - #else - GtkTextBuffer* buffer; - #endif - GtkWidget* text_view; + GtkWidget* view; + GtkWidget* source_view; + gchar* uri; gint n; - if (!(web_view = midori_browser_get_current_web_view (browser))) + if (!(view = midori_browser_get_current_tab (browser))) return; - uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view)); - - contents = NULL; - - #if HAVE_GIO - file = g_file_new_for_uri (uri); - tag = NULL; - #if HAVE_GTKSOURCEVIEW - content_type = NULL; - #endif - if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL)) - { - #if HAVE_GTKSOURCEVIEW - info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, NULL, NULL); - content_type = g_file_info_get_content_type (info); - #endif - g_object_unref (file); - } - if (contents && !g_utf8_validate (contents, -1, NULL)) - { - contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", - NULL, NULL, NULL); - g_free (contents); - } - else - #endif - contents_utf8 = contents; - - #if HAVE_GTKSOURCEVIEW - buffer = gtk_source_buffer_new (NULL); - gtk_source_buffer_set_highlight_syntax (buffer, TRUE); - #if HAVE_GIO - if (content_type) - { - language_manager = gtk_source_language_manager_get_default (); - if (!strcmp (content_type, "text/html")) - { - language = gtk_source_language_manager_get_language ( - language_manager, "html"); - gtk_source_buffer_set_language (buffer, language); - } - else if (!strcmp (content_type, "text/css")) - { - language = gtk_source_language_manager_get_language ( - language_manager, "css"); - gtk_source_buffer_set_language (buffer, language); - } - else if (!strcmp (content_type, "text/javascript")) - { - language = gtk_source_language_manager_get_language ( - language_manager, "js"); - gtk_source_buffer_set_language (buffer, language); - } - } - #endif - #else - buffer = gtk_text_buffer_new (NULL); - #endif - if (contents_utf8) - gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1); - #if HAVE_GTKSOURCEVIEW - text_view = gtk_source_view_new_with_buffer (buffer); - gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (text_view), TRUE); - #else - text_view = gtk_text_view_new_with_buffer (buffer); - #endif - gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE); - g_object_set_data (G_OBJECT (text_view), "browser-tab-uri", - g_strconcat ("view-source:", uri, NULL)); - gtk_widget_show (text_view); - n = midori_browser_add_tab (browser, text_view); + uri = g_strdup_printf ("view-source:%s", + midori_view_get_display_uri (MIDORI_VIEW (view))); + source_view = midori_view_new_with_uri (uri); + g_free (uri); + gtk_widget_show (source_view); + n = midori_browser_add_tab (browser, source_view); midori_browser_set_current_page (browser, n); - - g_object_unref (buffer); - g_free (contents_utf8); - #if HAVE_GIO - g_free (tag); - #endif } static void @@ -2000,16 +1570,18 @@ static void _action_back_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - webkit_web_view_go_back (WEBKIT_WEB_VIEW (web_view)); + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + midori_view_go_back (MIDORI_VIEW (view)); } static void _action_forward_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* web_view = midori_browser_get_current_web_view (browser); - webkit_web_view_go_forward (WEBKIT_WEB_VIEW (web_view)); + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + midori_view_go_forward (MIDORI_VIEW (view)); } static void @@ -2060,8 +1632,7 @@ _action_location_reset_uri (GtkAction* action, { const gchar* uri; - uri = _midori_browser_get_tab_uri (browser, - midori_browser_get_current_tab (browser)); + uri = midori_browser_get_current_uri (browser); midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); } @@ -2109,7 +1680,7 @@ _action_location_secondary_icon_released (GtkAction* action, GtkWidget* widget, MidoriBrowser* browser) { - MidoriWebView* web_view; + MidoriView* view; KatzeArray* news_feeds; GtkWidget* menu; guint n, i; @@ -2118,10 +1689,10 @@ _action_location_secondary_icon_released (GtkAction* action, const gchar* title; GtkWidget* menuitem; - web_view = (MidoriWebView*)midori_browser_get_current_web_view (browser); - if (web_view) + view = (MidoriView*)midori_browser_get_current_tab (browser); + if (view) { - news_feeds = midori_web_view_get_news_feeds (web_view); + news_feeds = NULL /* midori_view_get_news_feeds (view) */; n = news_feeds ? katze_array_get_length (news_feeds) : 0; if (n) { @@ -2565,15 +2136,19 @@ static void _action_open_in_panel_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* widget = midori_browser_get_current_tab (browser); - const gchar* uri = _midori_browser_get_tab_uri (browser, widget); + GtkWidget* view; + const gchar* uri; + gint n; + + view = midori_browser_get_current_tab (browser); + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); /* FIXME: Don't assign the uri here, update it properly while navigating */ g_object_set (browser->settings, "last-pageholder-uri", uri, NULL); - gint n = midori_panel_page_num (MIDORI_PANEL (browser->panel), - browser->panel_pageholder); + n = midori_panel_page_num (MIDORI_PANEL (browser->panel), + browser->panel_pageholder); midori_panel_set_current_page (MIDORI_PANEL (browser->panel), n); gtk_widget_show (browser->panel); - g_object_set (browser->panel_pageholder, "uri", uri, NULL); + midori_view_set_uri (MIDORI_VIEW (browser->panel_pageholder), uri); } @@ -2600,18 +2175,18 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, guint page_num, MidoriBrowser* browser) { - GtkWidget* widget; + GtkWidget* view; const gchar* uri; GtkAction* action; const gchar* title; gchar* window_title; - widget = midori_browser_get_current_tab (browser); - uri = _midori_browser_get_tab_uri (browser, widget); + view = midori_browser_get_current_tab (browser); + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); - title = _midori_browser_get_tab_title (browser, widget); + title = midori_view_get_display_title (MIDORI_VIEW (view)); window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); @@ -2621,8 +2196,7 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_set_statusbar_text (browser, NULL); _midori_browser_update_interface (browser); - if (MIDORI_IS_WEB_VIEW (widget)) - _midori_browser_update_progress (browser, MIDORI_WEB_VIEW (widget)); + _midori_browser_update_progress (browser, MIDORI_VIEW (view)); } static void @@ -2639,8 +2213,8 @@ _action_bookmark_open_activate (GtkAction* action, { gtk_tree_model_get (model, &iter, 0, &item, -1); if (katze_xbel_item_is_bookmark (item)) - g_object_set (midori_browser_get_current_web_view (browser), - "uri", katze_xbel_bookmark_get_href (item), NULL); + _midori_browser_open_uri (browser, + katze_xbel_bookmark_get_href (item)); } } @@ -2711,13 +2285,13 @@ _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) { guint last; - KatzeXbelItem* item; + KatzeItem* item; guint n; /* Reopen the most recent trash item */ last = katze_array_get_length (browser->trash) - 1; item = katze_array_get_nth_item (browser->trash, last); - n = midori_browser_add_xbel_item (browser, item); + n = midori_browser_add_item (browser, item); midori_browser_set_current_page (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); @@ -3474,7 +3048,7 @@ midori_browser_init (MidoriBrowser* browser) STOCK_BOOKMARKS, _("Bookmarks")); /* Transfers */ - GtkWidget* panel = midori_web_view_new (); + GtkWidget* panel = midori_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, @@ -3490,16 +3064,14 @@ midori_browser_init (MidoriBrowser* browser) STOCK_CONSOLE, _("Console")); /* History */ - panel = midori_web_view_new (); + panel = midori_view_new (); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, STOCK_HISTORY, _("History")); /* Pageholder */ - browser->panel_pageholder = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", "", - NULL); + browser->panel_pageholder = midori_view_new (); gtk_widget_show (browser->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_pageholder, NULL, @@ -3531,7 +3103,7 @@ midori_browser_init (MidoriBrowser* browser) panel, toolbar, STOCK_EXTENSIONS, _("Extensions")); - /* Notebook, containing all web_views */ + /* Notebook, containing all views */ browser->notebook = gtk_notebook_new (); /* Remove the inner border between scrollbars and the window border */ rcstyle = gtk_rc_style_new (); @@ -3635,9 +3207,6 @@ midori_browser_init (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomIn", FALSE); _action_set_sensitive (browser, "ZoomOut", FALSE); #endif - - browser->tab_titles = NULL; - browser->close_buttons = NULL; } static void @@ -3646,8 +3215,8 @@ midori_browser_dispose (GObject* object) MidoriBrowser* browser = MIDORI_BROWSER (object); /* We are done, the session mustn't change anymore */ - if (browser->proxy_xbel_array) - katze_object_assign (browser->proxy_xbel_array, NULL); + if (browser->proxy_array) + katze_object_assign (browser->proxy_array, NULL); G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object); } @@ -3658,8 +3227,6 @@ midori_browser_finalize (GObject* object) MidoriBrowser* browser = MIDORI_BROWSER (object); g_free (browser->statusbar_text); - g_list_free (browser->tab_titles); - g_list_free (browser->close_buttons); if (browser->settings) g_object_unref (browser->settings); @@ -3719,8 +3286,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint tab_label_size; gboolean close_buttons_on_tabs; - guint i, n; - g_object_get (browser->settings, "remember-last-window-size", &remember_last_window_size, "last-window-width", &last_window_width, @@ -3770,7 +3335,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); - g_object_set (browser->panel_pageholder, "uri", last_pageholder_uri, NULL); + midori_view_set_uri (MIDORI_VIEW (browser->panel_pageholder), + last_pageholder_uri); _action_set_active (browser, "Navigationbar", show_navigationbar); _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); @@ -3782,16 +3348,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) sokoke_widget_set_visible (browser->search, show_web_search); sokoke_widget_set_visible (browser->button_trash, show_trash); - /* We assume that tab_titles has the same length as close_buttons */ - n = g_list_length (browser->tab_titles); - for (i = 0; i < n; i++) - { - _update_label_size (g_list_nth_data (browser->tab_titles, i), - tab_label_size); - sokoke_widget_set_visible (g_list_nth_data (browser->close_buttons, i), - close_buttons_on_tabs); - } - g_free (last_pageholder_uri); } @@ -3802,8 +3358,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, { const gchar* name; GValue value = {0, }; - guint i; - guint n; name = g_intern_string (pspec->name); g_value_init (&value, pspec->value_type); @@ -3823,20 +3377,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, else if (name == g_intern_string ("show-trash")) sokoke_widget_set_visible (browser->button_trash, g_value_get_boolean (&value)); - else if (name == g_intern_string ("tab-label-size")) - { - n = g_list_length (browser->tab_titles); - for (i = 0; i < n; i++) - _update_label_size (g_list_nth_data (browser->tab_titles, i), - g_value_get_int (&value)); - } - else if (name == g_intern_string ("close-buttons-on-tabs")) - { - n = g_list_length (browser->close_buttons); - for (i = 0; i < n; i++) - sokoke_widget_set_visible (g_list_nth_data (browser->close_buttons, i), - g_value_get_boolean (&value)); - } else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); @@ -3946,11 +3486,8 @@ midori_browser_set_property (GObject* object, _midori_browser_update_settings (browser); g_signal_connect (browser->settings, "notify", G_CALLBACK (midori_browser_settings_notify), browser); - /* FIXME: Assigning settings must be conditional, if web view or not */ - /* FIXME: Assign settings only if the same settings object was used */ gtk_container_foreach (GTK_CONTAINER (browser->notebook), - (GtkCallback) midori_web_view_set_settings, - browser->settings); + (GtkCallback) midori_view_set_settings, browser->settings); break; case PROP_BOOKMARKS: ; /* FIXME: Disconnect handlers */ @@ -4056,63 +3593,100 @@ midori_browser_new (void) /** * midori_browser_add_tab: * @browser: a #MidoriBrowser - * @widget: a tab + * @widget: a view * - * Appends an arbitrary widget in the form of a new tab and creates an + * Appends a view in the form of a new tab and creates an * according item in the Window menu. * * Return value: the index of the new tab, or -1 in case of an error **/ gint midori_browser_add_tab (MidoriBrowser* browser, - GtkWidget* widget) + GtkWidget* view) { - GtkWidget* scrolled; - - g_signal_emit (browser, signals[ADD_TAB], 0, widget); - scrolled = _midori_browser_scrolled_for_child (browser, widget); - return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); + g_signal_emit (browser, signals[ADD_TAB], 0, view); + return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); } /** * midori_browser_remove_tab: * @browser: a #MidoriBrowser - * @widget: a tab + * @widget: a view * - * Removes an existing tab from the browser, including an associated menu item. + * Removes an existing view from the browser, + * including an associated menu item. **/ void midori_browser_remove_tab (MidoriBrowser* browser, - GtkWidget* widget) + GtkWidget* view) { - g_signal_emit (browser, signals[REMOVE_TAB], 0, widget); + g_signal_emit (browser, signals[REMOVE_TAB], 0, view); } /** - * midori_browser_add_xbel_item: + * midori_browser_add_item: * @browser: a #MidoriBrowser - * @xbel_item: a bookmark + * @xbel_item: an XBEL item * - * Appends a #KatzeXbelItem in the form of a new tab. + * Appends a new view as described by @item. + * + * Note: Currently this will always be a #MidoriWebView. + * + * Return value: the index of the new view, or -1 in case of an error + **/ +gint +midori_browser_add_xbel_item (MidoriBrowser* browser, + KatzeXbelItem* item) +{ + const gchar* uri; + const gchar* title; + GtkWidget* view; + + g_return_val_if_fail (katze_xbel_item_is_bookmark (item), -1); + + uri = katze_xbel_bookmark_get_href (item); + title = katze_xbel_item_get_title (item); + view = g_object_new (MIDORI_TYPE_VIEW, + "title", title, + "settings", browser->settings, + NULL); + midori_view_set_uri (MIDORI_VIEW (view), uri); + gtk_widget_show (view); + + return midori_browser_add_tab (browser, view); +} + +/** + * midori_browser_add_item: + * @browser: a #MidoriBrowser + * @item: an item + * + * Appends a new view as described by @item. + * + * Note: Currently this will always be a #MidoriWebView. * * Return value: the index of the new tab, or -1 in case of an error **/ gint -midori_browser_add_xbel_item (MidoriBrowser* browser, - KatzeXbelItem* xbel_item) +midori_browser_add_item (MidoriBrowser* browser, + KatzeItem* item) { - g_return_val_if_fail (katze_xbel_item_is_bookmark (xbel_item), -1); + const gchar* uri; + const gchar* title; + GtkWidget* view; - const gchar* uri = katze_xbel_bookmark_get_href (xbel_item); - const gchar* title = katze_xbel_item_get_title (xbel_item); - GtkWidget* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", uri, - "title", title, - "settings", browser->settings, - NULL); - gtk_widget_show (web_view); + g_return_val_if_fail (KATZE_IS_ITEM (item), -1); - return midori_browser_add_tab (browser, web_view); + uri = katze_item_get_uri (item); + title = katze_item_get_name (item); + view = g_object_new (MIDORI_TYPE_VIEW, + "title", title, + "settings", browser->settings, + NULL); + midori_view_set_uri (MIDORI_VIEW (view), uri); + gtk_widget_show (view); + + return midori_browser_add_tab (browser, view); } /** @@ -4120,23 +3694,25 @@ midori_browser_add_xbel_item (MidoriBrowser* browser, * @browser: a #MidoriBrowser * @uri: an URI * - * Appends an uri in the form of a new tab. + * Appends an uri in the form of a new view. * - * Return value: the index of the new tab, or -1 + * Note: Currently this will always be a #MidoriView. + * + * Return value: the index of the new view, or -1 **/ gint midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri) { - GtkWidget* web_view; + GtkWidget* view; - web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, - "uri", uri, - "settings", browser->settings, - NULL); - gtk_widget_show (web_view); + view = g_object_new (MIDORI_TYPE_VIEW, + "settings", browser->settings, + NULL); + midori_view_set_uri (MIDORI_VIEW (view), uri); + gtk_widget_show (view); - return midori_browser_add_tab (browser, web_view); + return midori_browser_add_tab (browser, view); } /** @@ -4157,21 +3733,21 @@ midori_browser_activate_action (MidoriBrowser* browser, * midori_browser_get_current_uri: * @browser: a #MidoriBrowser * - * Determines the URI loaded in the current page. + * Determines the URI loaded in the current view. * - * If there is no page present at all, %NULL is returned. + * If there is no view present at all, %NULL is returned. * * Return value: the current URI, or %NULL **/ const gchar* midori_browser_get_current_uri (MidoriBrowser* browser) { - GtkWidget* widget; + GtkWidget* view; g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - widget = midori_browser_get_current_web_view (browser); - return _midori_browser_get_tab_uri (browser, widget); + view = midori_browser_get_current_tab (browser); + return midori_view_get_display_uri (MIDORI_VIEW (view)); } /** @@ -4187,13 +3763,14 @@ void midori_browser_set_current_page (MidoriBrowser* browser, gint n) { + GtkWidget* view; + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); - GtkWidget* scrolled = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); - GtkWidget* widget = _midori_browser_child_for_scrolled (browser, scrolled); - if (widget && !strcmp (_midori_browser_get_tab_uri (browser, widget), "")) + view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); + if (view && midori_view_is_blank (MIDORI_VIEW (view))) gtk_action_activate (_action_by_name (browser, "Location")); else - gtk_widget_grab_focus (widget); + gtk_widget_grab_focus (view); } /** @@ -4217,23 +3794,27 @@ midori_browser_get_current_page (MidoriBrowser* browser) /** * midori_browser_set_current_tab: * @browser: a #MidoriBrowser - * @widget: a #GtkWidget + * @view: a #GtkWidget * - * Switches to the page containing @widget. + * Switches to the page containing @view. * * The widget will also grab the focus automatically. **/ void midori_browser_set_current_tab (MidoriBrowser* browser, - GtkWidget* widget) + GtkWidget* view) { - GtkWidget* scrolled = _midori_browser_scrolled_for_child (browser, widget); - gint n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), scrolled); + gint n; + + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (GTK_IS_WIDGET (view)); + + n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n); - if (widget && !strcmp (_midori_browser_get_tab_uri (browser, widget), "")) + if (view && midori_view_is_blank (MIDORI_VIEW (view))) gtk_action_activate (_action_by_name (browser, "Location")); else - gtk_widget_grab_focus (widget); + gtk_widget_grab_focus (view); } /** @@ -4244,57 +3825,37 @@ midori_browser_set_current_tab (MidoriBrowser* browser, * * If there is no tab present at all, %NULL is returned. * + * See also midori_browser_get_current_page(). + * * Return value: the selected tab, or %NULL **/ GtkWidget* midori_browser_get_current_tab (MidoriBrowser* browser) { + gint n; + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); + n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); if (n >= 0) { - GtkWidget* widget = _midori_browser_child_for_scrolled (browser, - gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n)); - return widget; + return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); } else return NULL; } /** - * midori_browser_get_current_web_view: + * midori_browser_get_proxy_array: * @browser: a #MidoriBrowser * - * Determines the currently selected web view. - * - * If there is no web view selected or if there is no tab present - * at all, %NULL is returned. - * - * See also midori_browser_get_current_page - * - * Return value: the selected web view, or %NULL - **/ -GtkWidget* -midori_browser_get_current_web_view (MidoriBrowser* browser) -{ - g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - - GtkWidget* web_view = midori_browser_get_current_tab (browser); - return MIDORI_IS_WEB_VIEW (web_view) ? web_view : NULL; -} - -/** - * midori_browser_get_proxy_xbel_array: - * @browser: a #MidoriBrowser - * - * Retrieves a proxy xbel array representing the respective proxy xbel items - * of the present web views that can be used for session management. + * Retrieves a proxy array representing the respective proxy items + * of the present views that can be used for session management. * * The folder is created on the first call and will be updated to reflect * changes to all items automatically. * - * Note that this implicitly creates proxy xbel items of all web views. + * Note that this implicitly creates proxy items of all views. * * Note: Calling this function doesn't add a reference and the browser * may release its reference at some point. @@ -4302,16 +3863,16 @@ midori_browser_get_current_web_view (MidoriBrowser* browser) * Return value: the proxy #KatzeArray **/ KatzeArray* -midori_browser_get_proxy_xbel_array (MidoriBrowser* browser) +midori_browser_get_proxy_array (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - if (!browser->proxy_xbel_array) + if (!browser->proxy_array) { - browser->proxy_xbel_array = katze_array_new (KATZE_TYPE_XBEL_ITEM); - /* FIXME: Fill in xbel items of all present web views */ + browser->proxy_array = katze_array_new (KATZE_TYPE_ITEM); + /* FIXME: Fill in items of all present views */ } - return browser->proxy_xbel_array; + return browser->proxy_array; } /** diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 42bff3f5..1a79087f 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -56,10 +56,10 @@ struct _MidoriBrowserClass void (*add_tab) (MidoriBrowser* browser, - GtkWidget* widget); + GtkWidget* view); void (*remove_tab) (MidoriBrowser* browser, - GtkWidget* widget); + GtkWidget* view); void (*activate_action) (MidoriBrowser* browser, const gchar* name); @@ -85,6 +85,10 @@ gint midori_browser_add_xbel_item (MidoriBrowser* browser, KatzeXbelItem* xbel_item); +gint +midori_browser_add_item (MidoriBrowser* browser, + KatzeItem* item); + gint midori_browser_add_uri (MidoriBrowser* browser, const gchar* uri); @@ -110,11 +114,8 @@ midori_browser_set_current_tab (MidoriBrowser* browser, GtkWidget* midori_browser_get_current_tab (MidoriBrowser* browser); -GtkWidget* -midori_browser_get_current_web_view (MidoriBrowser* browser); - KatzeArray* -midori_browser_get_proxy_xbel_array (MidoriBrowser* browser); +midori_browser_get_proxy_array (MidoriBrowser* browser); void midori_browser_quit (MidoriBrowser* browser); diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 2e71895d..10e51b6b 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -373,6 +373,10 @@ midori_panel_append_page (MidoriPanel* panel, g_return_val_if_fail (stock_id != NULL, -1); g_return_val_if_fail (label != NULL, -1); + if (GTK_IS_SCROLLED_WINDOW (child)) + scrolled = child; + else + { scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, @@ -389,6 +393,7 @@ midori_panel_append_page (MidoriPanel* panel, gtk_container_add (GTK_CONTAINER (widget), child); } gtk_container_add (GTK_CONTAINER (scrolled), widget); + } gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); if (!toolbar) diff --git a/midori/midori-source.c b/midori/midori-source.c new file mode 100644 index 00000000..ce3131bb --- /dev/null +++ b/midori/midori-source.c @@ -0,0 +1,191 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori-source.h" + +#include +#if HAVE_GIO + #include +#endif +#include +#if HAVE_GTKSOURCEVIEW + #include + #include + + #define MidoriSourceView GtkSourceView + #define MidoriSourceViewClass GtkSourceViewClass + #define MIDORI_TYPE_SOURCE_VIEW GTK_TYPE_SOURCE_VIEW +#else + #define MidoriSourceView GtkTextView + #define MidoriSourceViewClass GtkTextViewClass + #define MIDORI_TYPE_SOURCE_VIEW GTK_TYPE_TEXT_VIEW +#endif + +struct _MidoriSource +{ + MidoriSourceView parent_instance; +}; + +struct _MidoriSourceClass +{ + MidoriSourceViewClass parent_class; +}; + +G_DEFINE_TYPE (MidoriSource, midori_source, MIDORI_TYPE_SOURCE_VIEW); + +static void +midori_source_finalize (GObject* object); + +static void +midori_source_class_init (MidoriSourceClass* class) +{ + GObjectClass* gobject_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_source_finalize; +} + +static void +midori_source_init (MidoriSource* source) +{ + #if HAVE_GTKSOURCEVIEW + GtkSourceBuffer* buffer; + #else + GtkTextBuffer* buffer; + #endif + + #if HAVE_GTKSOURCEVIEW + buffer = gtk_source_buffer_new (NULL); + gtk_source_buffer_set_highlight_syntax (buffer, TRUE); + gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (source), TRUE); + #else + buffer = gtk_text_buffer_new (NULL); + #endif + gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), GTK_TEXT_BUFFER (buffer)); + gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); +} + +static void +midori_source_finalize (GObject* object) +{ + G_OBJECT_CLASS (midori_source_parent_class)->finalize (object); +} + +/** + * midori_source_new: + * @uri: a view-source: URI + * + * Creates a new source widget. + * + * Return value: a new #MidoriSource + **/ +GtkWidget* +midori_source_new (const gchar* uri) +{ + MidoriSource* source = g_object_new (MIDORI_TYPE_SOURCE, + /*"uri", uri,*/ + NULL); + midori_source_set_uri (source, uri); + + return GTK_WIDGET (source); +} + +void +midori_source_set_uri (MidoriSource* source, + const gchar* uri) +{ + #if HAVE_GIO + GFile* file; + gchar* tag; + #if HAVE_GTKSOURCEVIEW + GFileInfo* info; + const gchar* content_type; + #endif + #endif + gchar* contents; + gchar* contents_utf8; + GtkTextBuffer* buffer; + #if HAVE_GTKSOURCEVIEW + #if HAVE_GIO + GtkSourceLanguageManager* language_manager; + GtkSourceLanguage* language; + #endif + #endif + + g_return_if_fail (MIDORI_IS_SOURCE (source)); + + contents = NULL; + + #if HAVE_GIO + file = g_file_new_for_uri (uri); + tag = NULL; + #if HAVE_GTKSOURCEVIEW + content_type = NULL; + #endif + if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL)) + { + #if HAVE_GTKSOURCEVIEW + info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, NULL, NULL); + content_type = g_file_info_get_content_type (info); + #endif + g_object_unref (file); + } + if (contents && !g_utf8_validate (contents, -1, NULL)) + { + contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", + NULL, NULL, NULL); + g_free (contents); + } + else + #endif + contents_utf8 = contents; + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); + #if HAVE_GTKSOURCEVIEW + #if HAVE_GIO + if (content_type) + { + language_manager = gtk_source_language_manager_get_default (); + if (!strcmp (content_type, "text/html")) + { + language = gtk_source_language_manager_get_language ( + language_manager, "html"); + gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language); + } + else if (!strcmp (content_type, "text/css")) + { + language = gtk_source_language_manager_get_language ( + language_manager, "css"); + gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language); + } + else if (!strcmp (content_type, "text/javascript")) + { + language = gtk_source_language_manager_get_language ( + language_manager, "js"); + gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language); + } + } + #endif + #endif + if (contents_utf8) + gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1); + + g_object_unref (buffer); + g_free (contents_utf8); + #if HAVE_GIO + g_free (tag); + #endif +} diff --git a/midori/midori-source.h b/midori/midori-source.h new file mode 100644 index 00000000..e7b18783 --- /dev/null +++ b/midori/midori-source.h @@ -0,0 +1,47 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_SOURCE_H__ +#define __MIDORI_SOURCE_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_SOURCE \ + (midori_source_get_type ()) +#define MIDORI_SOURCE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_SOURCE, MidoriSource)) +#define MIDORI_SOURCE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_SOURCE, MidoriSourceClass)) +#define MIDORI_IS_SOURCE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_SOURCE)) +#define MIDORI_IS_SOURCE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_SOURCE)) +#define MIDORI_SOURCE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_SOURCE, MidoriSourceClass)) + +typedef struct _MidoriSource MidoriSource; +typedef struct _MidoriSourceClass MidoriSourceClass; + +GType +midori_source_get_type (void); + +GtkWidget* +midori_source_new (const gchar* uri); + +void +midori_source_set_uri (MidoriSource* source, + const gchar* uri); + +G_END_DECLS + +#endif /* __MIDORI_SOURCE_H__ */ diff --git a/midori/midori-view.c b/midori/midori-view.c new file mode 100644 index 00000000..14986c9b --- /dev/null +++ b/midori/midori-view.c @@ -0,0 +1,2451 @@ +/* + Copyright (C) 2007-2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori-view.h" +#include "midori-source.h" + +#include "midori-stock.h" + +#include "compat.h" +#include "sokoke.h" +#include "gjs.h" + +#include +#include +#if HAVE_GIO + #include +#endif +#include +#include + +/* This is unstable API, so we need to declare it */ +gchar* +webkit_web_view_get_selected_text (WebKitWebView* web_view); + +struct _MidoriView +{ + GtkScrolledWindow parent_instance; + + gint socket_id; + GIOChannel* input; + FILE* output; + + gchar* command_cache; + gchar* premature_uri; + gchar* uri; + gchar* title; + GdkPixbuf* icon; + gdouble progress; + MidoriLoadStatus load_status; + gchar* statusbar_text; + gchar* link_uri; + gboolean has_selection; + gchar* selected_text; + gboolean can_cut_clipboard; + gboolean can_copy_clipboard; + gboolean can_paste_clipboard; + gfloat zoom_level; + MidoriWebSettings* settings; + GtkWidget* web_view; + gboolean window_object_cleared; + + gchar* download_manager; + gint tab_label_size; + gboolean close_buttons_on_tabs; + + GtkWidget* menu_item; + GtkWidget* tab_label; + GtkWidget* tab_icon; + GtkWidget* tab_title; + GtkWidget* tab_close; + KatzeItem* item; +}; + +struct _MidoriViewClass +{ + GtkScrolledWindowClass parent_class; +}; + +G_DEFINE_TYPE (MidoriView, midori_view, GTK_TYPE_SCROLLED_WINDOW) + +GType +midori_load_status_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", N_("Load Provisional") }, + { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", N_("Load Committed") }, + { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", N_("Load Finished") }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriLoadStatus", values); + } + return type; +} + +enum +{ + PROP_0, + + PROP_SOCKET_ID, + PROP_URI, + PROP_TITLE, + PROP_ICON, + PROP_LOAD_STATUS, + PROP_PROGRESS, + PROP_ZOOM_LEVEL, + PROP_STATUSBAR_TEXT, + PROP_SETTINGS +}; + +enum { + ACTIVATE_ACTION, + CONSOLE_MESSAGE, + NEW_TAB, + NEW_WINDOW, + ADD_BOOKMARK, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_view_finalize (GObject* object); + +static void +midori_view_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_view_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_cclosure_marshal_VOID__STRING_INT_STRING (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void(*GMarshalFunc_VOID__STRING_INT_STRING) (gpointer data1, + gpointer arg_1, + gint arg_2, + gpointer arg_3, + gpointer data2); + register GMarshalFunc_VOID__STRING_INT_STRING callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 4); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_INT_STRING) (marshal_data + ? marshal_data : cc->callback); + callback (data1, + (gchar*)g_value_get_string (param_values + 1), + g_value_get_int (param_values + 2), + (gchar*)g_value_get_string (param_values + 3), + data2); +} + +static void +midori_view_class_init (MidoriViewClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + signals[ACTIVATE_ACTION] = g_signal_new ( + "activate-action", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + signals[CONSOLE_MESSAGE] = g_signal_new ( + "console-message", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + midori_cclosure_marshal_VOID__STRING_INT_STRING, + G_TYPE_NONE, 3, + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING); + + signals[NEW_TAB] = g_signal_new ( + "new-tab", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + signals[NEW_WINDOW] = g_signal_new ( + "new-window", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + signals[ADD_BOOKMARK] = g_signal_new ( + "add-bookmark", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_view_finalize; + gobject_class->set_property = midori_view_set_property; + gobject_class->get_property = midori_view_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_SOCKET_ID, + g_param_spec_uint ( + "socket-id", + _("Socket ID"), + _("The ID of a socket"), + 0, + G_MAXUINT, + 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property (gobject_class, + PROP_URI, + g_param_spec_string ( + "uri", + _("Uri"), + _("The URI of the currently loaded page"), + "about:blank", + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_TITLE, + g_param_spec_string ( + "title", + _("Title"), + _("The title of the currently loaded page"), + NULL, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_ICON, + g_param_spec_object ( + "icon", + _("Icon"), + _("The icon of the view"), + GDK_TYPE_PIXBUF, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_LOAD_STATUS, + g_param_spec_enum ( + "load-status", + _("Load Status"), + _("The current loading status"), + MIDORI_TYPE_LOAD_STATUS, + MIDORI_LOAD_FINISHED, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_PROGRESS, + g_param_spec_double ( + "progress", + _("Progress"), + _("The current loading progress"), + 0.0, 1.0, 0.0, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_ZOOM_LEVEL, + g_param_spec_float ( + "zoom-level", + _("Zoom Level"), + _("The current zoom level"), + G_MINFLOAT, + G_MAXFLOAT, + 1.0f, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_STATUSBAR_TEXT, + g_param_spec_string ( + "statusbar-text", + _("Statusbar Text"), + _("The text that is displayed in the statusbar"), + "", + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_SETTINGS, + g_param_spec_object ( + "settings", + _("Settings"), + _("The associated settings"), + MIDORI_TYPE_WEB_SETTINGS, + G_PARAM_READWRITE)); +} + +#define midori_view_is_socket(view) !view->socket_id +#define midori_view_is_plug(view) view->socket_id > 0 + +#if 0 + #define midori_debug g_debug +#else + #define midori_debug(...) ; +#endif + +/** + * int_to_str + * @in: an integer + * + * Converts an integer to a string. + * + * The returned string is valid until + * the next call to this function. + * + * Return value: a string + **/ +static const gchar* +int_to_str (gint in) +{ + static gchar* out = NULL; + g_free (out); + out = g_strdup_printf ("%d", in); + return out; +} + +/** + * float_to_str + * @in: a float + * + * Converts a float to a string. + * + * The returned string is valid until + * the next call to this function. + * + * Return value: a string + **/ +static const gchar* +float_to_str (gfloat in) +{ + static gchar* out = NULL; + g_free (out); + out = g_strdup_printf ("%f", in); + return out; +} + + +static void +send_command (MidoriView* view, + const gchar* command, + const gchar* argument) +{ + gchar* data; + gchar* cache; + + if (argument) + data = g_strdup_printf ("%s %s", command, argument); + else + data = g_strdup (command); + + if (!view->output) + { + /* The output is not ready, so we cache for now */ + cache = g_strdup_printf ("%s\n%s", + view->command_cache ? view->command_cache : "", data); + katze_assign (view->command_cache, cache); + midori_debug ("!view->output, caching command: %s", command); + return; + } + + fwrite (data, strlen (data) + 1, 1, view->output); + fflush (view->output); + + g_free (data); +} + +static void +midori_view_notify_uri_cb (MidoriView* view, + GParamSpec pspec) +{ + if (midori_view_is_socket (view) && view->item) + katze_item_set_uri (view->item, view->uri); + + if (midori_view_is_plug (view)) + /* We must not send a NULL string here */ + send_command (view, "uri", view->uri ? view->uri : ""); +} + +static void +midori_view_notify_icon_cb (MidoriView* view, + GParamSpec pspec) +{ + if (view->tab_icon) + katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon), + view->icon); + if (view->menu_item) + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (view->menu_item), + gtk_image_new_from_pixbuf (view->icon)); +} + +#if HAVE_GIO +void +loadable_icon_finish_cb (GdkPixbuf* icon, + GAsyncResult* res, + MidoriView* view) +{ + GdkPixbuf* pixbuf; + GInputStream* stream; + GError* error; + GdkPixbuf* pixbuf_scaled; + gint icon_width, icon_height; + + pixbuf = NULL; + stream = g_loadable_icon_load_finish (G_LOADABLE_ICON (icon), + res, NULL, NULL); + if (stream) + { + error = NULL; + pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error); + if (error) + midori_debug ("Icon couldn't be loaded: %s", error->message); + g_object_unref (stream); + } + if (!pixbuf) + pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + katze_object_assign (view->icon, pixbuf_scaled); + g_object_notify (G_OBJECT (view), "icon"); +} + +void +file_info_finish_cb (GFile* icon_file, + GAsyncResult* res, + MidoriView* view) +{ + GFileInfo* info; + const gchar* content_type; + GIcon* icon; + GFile* parent; + GFile* file; + GdkPixbuf* pixbuf; + gint icon_width, icon_height; + GdkPixbuf* pixbuf_scaled; + + info = g_file_query_info_finish (G_FILE (icon_file), res, NULL); + if (info) + { + content_type = g_file_info_get_content_type (info); + if (g_str_has_prefix (content_type, "image/")) + { + icon = g_file_icon_new (icon_file); + g_loadable_icon_load_async (G_LOADABLE_ICON (icon), + 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, view); + return; + } + } + + file = g_file_get_parent (icon_file); + parent = g_file_get_parent (file); + /* We need to check if file equals the parent due to a GIO bug */ + if (parent && !g_file_equal (file, parent)) + { + icon_file = g_file_get_child (parent, "favicon.ico"); + g_file_query_info_async (icon_file, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, 0, NULL, + (GAsyncReadyCallback)file_info_finish_cb, view); + return; + } + + pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + + view->icon = pixbuf_scaled; + g_object_notify (G_OBJECT (view), "icon"); +} +#endif + +static void +_midori_web_view_load_icon (MidoriView* view) +{ + #if HAVE_GIO + GFile* file; + GFile* icon_file; + #endif + GdkPixbuf* pixbuf; + gint icon_width, icon_height; + GdkPixbuf* pixbuf_scaled; + + #if HAVE_GIO + if (view->uri) + { + file = g_file_new_for_uri (view->uri); + icon_file = g_file_get_child (file, "favicon.ico"); + g_file_query_info_async (icon_file, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, + G_FILE_QUERY_INFO_NONE, 0, NULL, + (GAsyncReadyCallback)file_info_finish_cb, view); + return; + } + #endif + + pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + + view->icon = pixbuf_scaled; + g_object_notify (G_OBJECT (view), "icon"); +} + +static void +midori_view_notify_load_status_cb (MidoriView* view, + GParamSpec pspec) +{ + g_object_get (G_OBJECT (view), "load-status", &view->load_status, NULL); + + if (midori_view_is_socket (view)) + { + if (view->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), + view->load_status != MIDORI_LOAD_FINISHED); + } + + if (midori_view_is_plug (view)) + send_command (view, "load-status", int_to_str (view->load_status)); + + if (!midori_view_is_plug (view)) + if (view->load_status == MIDORI_LOAD_COMMITTED) + _midori_web_view_load_icon (view); +} + +static void +midori_view_notify_progress_cb (MidoriView* view, + GParamSpec pspec) +{ + g_object_get (G_OBJECT (view), "progress", &view->progress, NULL); + + if (midori_view_is_plug (view)) + send_command (view, "progress", float_to_str (view->progress)); +} + +static void +midori_view_action_cb (MidoriView* view, + const gchar* action) +{ + if (midori_view_is_socket (view)) + return; + + send_command (view, "activate-action", action); +} + +static void +midori_view_console_message_cb (MidoriView* view, + const gchar* message, + gint line, + const gchar* source_id) +{ + gchar* argument; + + if (midori_view_is_socket (view)) + return; + + argument = g_strdup_printf ("%s %d %s", message, line, source_id); + send_command (view, "console-message", argument); + g_free (argument); +} + +static void +midori_view_new_tab_cb (MidoriView* view, + const gchar* uri) +{ + if (midori_view_is_socket (view)) + return; + + send_command (view, "new-tab", uri); +} + +static void +midori_view_new_window_cb (MidoriView* view, + const gchar* uri) +{ + if (midori_view_is_socket (view)) + return; + + send_command (view, "new-window", uri); +} + +static void +midori_view_add_bookmark_cb (MidoriView* view, + const gchar* uri) +{ + if (midori_view_is_socket (view)) + return; + + send_command (view, "add-bookmark", uri); +} + +static void +receive_status (MidoriView* view, + const gchar* command) +{ + if (!strncmp (command, "uri ", 4)) + { + katze_assign (view->uri, g_strdup (&command[4])); + g_object_notify (G_OBJECT (view), "uri"); + } + else if (!strncmp (command, "title ", 6)) + { + g_object_set (view, "title", &command[6], NULL); + } + else if (!strncmp (command, "load-status ", 12)) + { + view->load_status = (MidoriLoadStatus)atoi (&command[12]); + g_object_notify (G_OBJECT (view), "load-status"); + } + else if (!strncmp (command, "progress ", 9)) + { + view->progress = atof (&command[9]); + g_object_notify (G_OBJECT (view), "progress"); + } + else if (!strncmp (command, "zoom-level ", 11)) + { + view->zoom_level = atof (&command[11]); + g_object_notify (G_OBJECT (view), "zoom-level"); + } + else if (!strncmp (command, "statusbar-text ", 15)) + { + g_object_set (view, "statusbar-text", &command[15], NULL); + } + else if (!strncmp (command, "activate-action ", 16)) + { + g_signal_emit (view, signals[ACTIVATE_ACTION], 0, &command[16]); + } + else if (!strncmp (command, "console-message ", 16)) + { + /* FIXME: Implement */ + } + else if (!strncmp (command, "new-tab ", 8)) + { + g_signal_emit (view, signals[NEW_TAB], 0, &command[8]); + } + else if (!strncmp (command, "new-window ", 11)) + { + g_signal_emit (view, signals[NEW_WINDOW], 0, &command[11]); + } + else if (!strncmp (command, "add-bookmark ", 13)) + { + g_signal_emit (view, signals[ADD_BOOKMARK], 0, &command[13]); + } + else if (!strncmp (command, "clipboard ", 10)) + { + view->can_cut_clipboard = atof (&command[10]); + view->can_copy_clipboard = atof (&command[12]); + view->can_paste_clipboard = atof (&command[14]); + midori_debug ("clipboards: %s => %d, %d, %d", + &command[10], + atoi (&command[10]), atoi (&command[12]), atoi (&command[14])); + } + else if (g_str_has_prefix (command, "**")) + { + g_print ("%s\n", command); + } + else + { + midori_debug ("receive_status: unknown command '%s'", command); + } +} + +static void +receive_command (MidoriView* view, + const gchar* command) +{ + if (!strncmp (command, "set-uri ", 8)) + midori_view_set_uri (view, &command[8]); + else if (!strncmp (command, "set-zoom-level ", 15)) + midori_view_set_zoom_level (view, atof (&command[15]) / 10); + else if (!strncmp (command, "reload ", 7)) + midori_view_reload (view, atoi (&command[7])); + else if (!strncmp (command, "stop-loading", 12)) + midori_view_stop_loading (view); + else if (!strncmp (command, "go-back", 7)) + midori_view_go_back (view); + else if (!strncmp (command, "go-forward", 10)) + midori_view_go_forward (view); + else if (!strncmp (command, "print", 5)) + midori_view_print (view); + else if (!strncmp (command, "download-manager ", 17)) + { + katze_assign (view->download_manager, g_strdup (&command[17])); + } + else if (g_str_has_prefix (command, "**")) + g_print ("%s\n", command); + else + midori_debug ("receive_command: unknown command '%s'", command); +} + +static gboolean +io_input_watch_cb (GIOChannel* source, + GIOCondition condition, + MidoriView* view) +{ + gchar* buffer; + GError* error; + + error = NULL; + switch (condition) + { + case G_IO_PRI: + case G_IO_IN: + if (g_io_channel_read_line (source, + &buffer, NULL, NULL, &error) == G_IO_STATUS_NORMAL) + { + if (view->socket_id) + receive_command (view, buffer); + else + receive_status (view, buffer); + g_free (buffer); + } + else + { + g_warning ("Communication error: %s", error->message); + g_error_free (error); + } + break; + case G_IO_ERR: + case G_IO_NVAL: + g_warning ("Invalid operation"); + return FALSE; + case G_IO_HUP: + midori_debug ("Tab closed"); + return FALSE; + default: + g_warning ("Unexpected condition"); + return FALSE; + } + + return TRUE; +} + +static void +webkit_web_view_load_started_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + MidoriView* view) +{ + view->window_object_cleared = FALSE; + + view->load_status = MIDORI_LOAD_PROVISIONAL; + g_object_notify (G_OBJECT (view), "load-status"); + + view->progress = 0.0; + g_object_notify (G_OBJECT (view), "progress"); +} + +static void +webkit_web_view_window_object_cleared_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + JSGlobalContextRef js_context, + JSObjectRef js_window, + MidoriView* view) +{ + view->window_object_cleared = TRUE; +} + +static void +webkit_web_view_load_committed_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + MidoriView* view) +{ + const gchar* uri; + GdkPixbuf* icon; + + uri = webkit_web_frame_get_uri (web_frame); + katze_assign (view->uri, g_strdup (uri)); + g_object_notify (G_OBJECT (view), "uri"); + g_object_set (view, "title", NULL, NULL); + + icon = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + katze_object_assign (view->icon, icon); + g_object_notify (G_OBJECT (view), "icon"); + + view->load_status = MIDORI_LOAD_COMMITTED; + g_object_notify (G_OBJECT (view), "load-status"); +} + +static void +webkit_web_view_progress_changed_cb (WebKitWebView* web_view, + gint progress, + MidoriView* view) +{ + view->progress = progress ? progress / 100.0 : 0.0; + g_object_notify (G_OBJECT (view), "progress"); +} + +/* +static void +gjs_value_links_foreach_cb (GjsValue* link, + MidoriView* view) +{ + const gchar* type; +#if HAVE_GIO + const gchar* rel; + GFile* icon_file; + GIcon* icon; +#endif + + if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "href")) + { + if (gjs_value_has_attribute (link, "type")) + { + type = gjs_value_get_attribute_string (link, "type"); + if (!strcmp (type, "application/rss+xml") + || !strcmp (type, "application/x.atom+xml") + || !strcmp (type, "application/atom+xml")) + { + katze_array_add_item (view->news_feeds, link); + g_signal_emit_by_name (view, "news-feed-ready", + gjs_value_get_attribute_string (link, "href"), type, + gjs_value_has_attribute (link, "title") + ? gjs_value_get_attribute_string (link, "title") : NULL); + } + } +#if HAVE_GIO + if (gjs_value_has_attribute (link, "rel")) + { + rel = gjs_value_get_attribute_string (link, "rel"); + if (!strcmp (rel, "icon") || !strcmp (rel, "shortcut icon")) + { + icon_file = g_file_new_for_uri ( + gjs_value_get_attribute_string (link, "href")); + icon = g_file_icon_new (icon_file); + g_loadable_icon_load_async (G_LOADABLE_ICON (icon), + 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, view); + } + } +#endif + } +} +*/ + +static void +webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, + gboolean success, + MidoriView* view) +{ + gchar* data; + JSContextRef js_context; + JSValueRef js_window; + /* GjsValue* value; + GjsValue* document; + GjsValue* links; */ + + if (!success) + { + midori_debug ("'%s' not found.", view->uri); + data = g_strdup_printf ("error:404 %s ", view->uri ? view->uri : ""); + midori_view_set_uri (view, data); + g_free (data); + return; + } + + /* If WebKit didn't emit the signal due to a bug, we will */ + if (!view->window_object_cleared) + { + js_context = webkit_web_frame_get_global_context (web_frame); + js_window = JSContextGetGlobalObject (js_context); + g_signal_emit_by_name (view->web_view, "window-object-cleared", + web_frame, js_context, js_window); + } + + /* value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); + document = gjs_value_get_by_name (value, "document"); + links = gjs_value_get_elements_by_tag_name (document, "link"); + katze_array_clear (web_view->news_feeds); + gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, web_view); + g_object_unref (links); + g_object_unref (document); + g_object_unref (value); */ + + view->load_status = MIDORI_LOAD_FINISHED; + g_object_notify (G_OBJECT (view), "load-status"); +} + +static void +webkit_web_view_load_finished_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + MidoriView* view) +{ + view->progress = 1.0; + g_object_notify (G_OBJECT (view), "progress"); +} + +static void +webkit_web_view_title_changed_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + const gchar* title, + MidoriView* view) +{ + g_object_set (view, "title", title, NULL); +} + +static void +webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view, + const gchar* text, + MidoriView* view) +{ + g_object_set (G_OBJECT (view), "statusbar-text", text, NULL); +} + +static void +webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view, + const gchar* tooltip, + const gchar* link_uri, + MidoriView* view) +{ + katze_assign (view->link_uri, g_strdup (link_uri)); + g_object_set (G_OBJECT (view), "statusbar-text", link_uri, NULL); +} + +static gboolean +gtk_widget_button_press_event_cb (WebKitWebView* web_view, + GdkEventButton* event, + MidoriView* view) +{ + GdkModifierType state; + gint x, y; + GtkClipboard* clipboard; + gchar* uri; + gchar* new_uri; + const gchar* link_uri; + + gdk_window_get_pointer (NULL, &x, &y, &state); + link_uri = midori_view_get_link_uri (MIDORI_VIEW (view)); + + switch (event->button) + { + case 1: + if (!link_uri) + return FALSE; + if (state & GDK_SHIFT_MASK) + { + /* Open link in new window */ + g_signal_emit_by_name (view, "new-window", link_uri); + return TRUE; + } + else if (state & GDK_MOD1_MASK) + { + /* Open link in new tab */ + g_signal_emit_by_name (view, "new-tab", link_uri); + /* FIXME: Open in the background as appropriate */ + /* background = sokoke_object_get_boolean (browser->settings, + "open-tabs-in-the-background"); + if (state & GDK_CONTROL_MASK) + background = !background; + if (background) + open_tab_in_the_background */ + return TRUE; + } + break; + case 2: + if (link_uri) + { + /* Open link in new tab */ + g_signal_emit_by_name (view, "new-tab", link_uri); + /* FIXME: Open in the background as appropriate */ + /* background = sokoke_object_get_boolean (browser->settings, + "open-tabs-in-the-background"); + if (state & GDK_CONTROL_MASK) + background = !background; + if (background) + open_tab_in_the_background */ + return TRUE; + } + else if (state & GDK_CONTROL_MASK) + { + midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0); + return FALSE; /* Allow Ctrl + Middle click */ + } + else if (TRUE /*middle-click-opens-selection*/) + { + state = (GdkModifierType) event->state; + clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (GTK_WIDGET (view)), + GDK_SELECTION_PRIMARY); + uri = gtk_clipboard_wait_for_text (clipboard); + if (uri && strchr (uri, '.') && !strchr (uri, ' ')) + { + new_uri = sokoke_magic_uri (uri, NULL); + if (state & GDK_CONTROL_MASK) + g_signal_emit_by_name (view, "new-tab", new_uri); + else + { + midori_view_set_uri (MIDORI_VIEW (view), new_uri); + gtk_widget_grab_focus (GTK_WIDGET (view)); + } + g_free (new_uri); + g_free (uri); + return TRUE; + } + } + break; + } + + return FALSE; +} + +static gboolean +gtk_widget_button_release_event_cb (WebKitWebView* web_view, + GdkEventButton* event, + MidoriView* view) +{ + GtkClipboard* clipboard; + gchar* text; + + /* Emulate the primary clipboard, which WebKit doesn't support */ + text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); + clipboard = gtk_clipboard_get_for_display ( + gtk_widget_get_display (GTK_WIDGET (web_view)), GDK_SELECTION_PRIMARY); + gtk_clipboard_set_text (clipboard, text, -1); + g_free (text); + return FALSE; +} + +static gboolean +gtk_widget_scroll_event_cb (WebKitWebView* web_view, + GdkEventScroll* event, + MidoriView* view) +{ + GdkModifierType state = (GdkModifierType)0; + gint x, y; + + gdk_window_get_pointer (NULL, &x, &y, &state); + if (state & GDK_CONTROL_MASK) + { + if (event->direction == GDK_SCROLL_DOWN) + webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); + else if(event->direction == GDK_SCROLL_UP) + webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); + return TRUE; + } + else + return FALSE; +} + +static void +midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri); +} + +static void +midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + g_signal_emit (view, signals[NEW_WINDOW], 0, view->link_uri); +} + +static void +midori_web_view_menu_download_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + sokoke_spawn_program (view->download_manager, view->link_uri); +} + +static void +midori_web_view_menu_add_bookmark_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + g_signal_emit (view, signals[ADD_BOOKMARK], 0, view->link_uri); +} + +static void +midori_web_view_menu_action_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + const gchar* action = g_object_get_data (G_OBJECT (widget), "action"); + g_signal_emit_by_name (view, "activate-action", action); +} + +static void +webkit_web_view_populate_popup_cb (WebKitWebView* web_view, + GtkWidget* menu, + MidoriView* view) +{ + GtkWidget* menuitem; + GtkWidget* icon; + gchar* stock_id; + GdkScreen* screen; + GtkIconTheme* icon_theme; + GList* items; + + /* We do not want to modify the Edit menu. + The only reliable indicator is inspecting the first item. */ + items = gtk_container_get_children (GTK_CONTAINER (menu)); + menuitem = (GtkWidget*)g_list_nth_data (items, 0); + if (GTK_IS_IMAGE_MENU_ITEM (menuitem)) + { + icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); + gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL); + if (!strcmp (stock_id, GTK_STOCK_CUT)) + return; + } + + if (view->link_uri) + { + menuitem = gtk_image_menu_item_new_with_mnemonic ( + _("Open Link in New _Tab")); + screen = gtk_widget_get_screen (GTK_WIDGET (view)); + icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, STOCK_TAB_NEW)) + { + icon = gtk_image_new_from_stock (STOCK_TAB_NEW, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + } + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 1); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), view); + gtk_widget_show (menuitem); + /* hack to implement New Window */ + items = gtk_container_get_children (GTK_CONTAINER (menu)); + menuitem = (GtkWidget*)g_list_nth_data (items, 2); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_new_window_activate_cb), view); + menuitem = (GtkWidget*)g_list_nth_data (items, 3); + /* hack to disable non-functional Download File */ + gtk_widget_set_sensitive (menuitem, FALSE); + g_list_free (items); + if (view->download_manager && *view->download_manager) + { + menuitem = gtk_image_menu_item_new_with_mnemonic ( + _("Download Link with Download _Manager")); + icon = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 4); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_download_activate_cb), view); + gtk_widget_show (menuitem); + } + menuitem = gtk_image_menu_item_new_from_stock (STOCK_BOOKMARK_ADD, NULL); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 5); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_add_bookmark_activate_cb), view); + gtk_widget_show (menuitem); + } + + if (!view->link_uri && midori_view_has_selection (view)) + { + if (strchr (view->selected_text, '.') + && !strchr (view->selected_text, ' ')) + { + menuitem = gtk_image_menu_item_new_with_mnemonic ( + _("Open URL in New _Tab")); + icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, -1); + g_object_set_data (G_OBJECT (menuitem), "uri", view->selected_text); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), view); + gtk_widget_show (menuitem); + } + /* FIXME: view selection source */ + } + + if (!view->link_uri && !midori_view_has_selection (view)) + { + /* FIXME: Make this sensitive only when there is a tab to undo */ + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); + icon = gtk_image_new_from_stock (GTK_STOCK_UNDELETE, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "UndoTabClose"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_activate_cb), view); + gtk_widget_show (menuitem); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = gtk_image_menu_item_new_from_stock (STOCK_BOOKMARK_ADD, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "BookmarkAdd"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_activate_cb), view); + gtk_widget_show (menuitem); + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "SaveAs"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_activate_cb), view); + gtk_widget_show (menuitem); + /* FIXME: Make this sensitive once it's implemented */ + gtk_widget_set_sensitive (menuitem, FALSE); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("View _Source")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "SourceView"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_activate_cb), view); + gtk_widget_show (menuitem); + #if !HAVE_GIO + gtk_widget_set_sensitive (menuitem, FALSE); + #endif + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "Print"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_activate_cb), view); + gtk_widget_show (menuitem); + } +} + +static void +webkit_web_view_console_message_cb (GtkWidget* web_view, + const gchar* message, + guint line, + const gchar* source_id, + MidoriView* view) +{ + g_signal_emit_by_name (view, "console-message", message, line, source_id); +} + +static gboolean +gtk_widget_focus_out_event_cb (GtkWidget* web_view, + GdkEventFocus* event, + MidoriView* view) +{ + gchar* data; + + data = g_strdup_printf ("%d %d %d", + midori_view_can_cut_clipboard (view), + midori_view_can_copy_clipboard (view), + midori_view_can_paste_clipboard (view)); + send_command (view, "clipboard", data); + g_free (data); + + return FALSE; +} + +static void +midori_view_realize (MidoriView* view) +{ + WebKitWebFrame* web_frame; + + view->web_view = webkit_web_view_new (); + /* Adjustments are not created automatically */ + g_object_set (view, "hadjustment", NULL, "vadjustment", NULL, NULL); + + /* FIXME: Strictly we should send a command to query + the policy or send it as an argument */ + /* The socket view is not supposed to scroll at all */ + if (midori_view_is_socket (view)) + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view), + GTK_POLICY_NEVER, GTK_POLICY_NEVER); + /* The plug view should use the policy of the socket */ + if (midori_view_is_plug (view)) + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + gtk_widget_show (view->web_view); + + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + + g_object_connect (view->web_view, + "signal::load-started", + webkit_web_view_load_started_cb, view, + "signal::window-object-cleared", + webkit_web_view_window_object_cleared_cb, view, + "signal::load-committed", + webkit_web_view_load_committed_cb, view, + "signal::load-progress-changed", + webkit_web_view_progress_changed_cb, view, + "signal::load-finished", + webkit_web_view_load_finished_cb, view, + "signal::title-changed", + webkit_web_view_title_changed_cb, view, + "signal::status-bar-text-changed", + webkit_web_view_statusbar_text_changed_cb, view, + "signal::hovering-over-link", + webkit_web_view_hovering_over_link_cb, view, + "signal::button-press-event", + gtk_widget_button_press_event_cb, view, + "signal::button-release-event", + gtk_widget_button_release_event_cb, view, + "signal::scroll-event", + gtk_widget_scroll_event_cb, view, + "signal::populate-popup", + webkit_web_view_populate_popup_cb, view, + "signal::console-message", + webkit_web_view_console_message_cb, view, + "signal::focus-out-event", + gtk_widget_focus_out_event_cb, view, + NULL); + g_object_connect (web_frame, + "signal::load-done", + webkit_web_frame_load_done_cb, view, + NULL); + + gtk_container_add (GTK_CONTAINER (view), view->web_view); + if (view->premature_uri) + { + midori_debug ("Loading premature uri '%s' now", view->premature_uri); + midori_view_set_uri (view, view->premature_uri); + } + katze_assign (view->premature_uri, NULL); +} + +static void +gtk_socket_realize_cb (GtkWidget* socket, + MidoriView* view) +{ + gchar* socket_id; + GError* error; + gboolean success; + gint stdin; + gint stdout; + gchar* argv[] = { NULL, "--id", NULL, NULL }; + + /* Sockets are not supported on all platforms, + so fallback to working without any socket or plug. */ + if (!gtk_socket_get_id (GTK_SOCKET (socket))) + { + gtk_widget_destroy (socket); + midori_view_realize (view); + return; + } + + socket_id = g_strdup_printf ("%d", gtk_socket_get_id (GTK_SOCKET (socket))); + argv[0] = (gchar*)sokoke_remember_argv0 (NULL); + argv[2] = socket_id; + error = NULL; + success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, + NULL, NULL, NULL, + &stdin, &stdout, NULL, &error); + g_free (socket_id); + + if (!success) + { + /* Fallback to operating without a socket */ + view->socket_id = 0; + midori_view_realize (view); + + g_error_free (error); + return; + } + + view->output = fdopen (stdin, "w"); + view->input = g_io_channel_unix_new (stdout); + g_io_channel_set_close_on_unref (view->input, TRUE); + g_io_add_watch (view->input, + G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_NVAL | G_IO_HUP, + (GIOFunc)io_input_watch_cb, view); + + if (view->command_cache) + { + /* Send cached commands if any */ + fwrite (view->command_cache, + strlen (view->command_cache) + 1, 1, view->output); + katze_assign (view->command_cache, NULL); + fflush (view->output); + } +} + +static gboolean +gtk_socket_plug_removed_cb (GtkWidget* socket, + MidoriView* view) +{ + if (view->output) + { + fclose (view->output); + view->output = NULL; + } + + if (view->input) + { + g_io_channel_unref (view->input); + view->input = NULL; + } + + midori_debug ("'%s' died.", view->uri); + send_command (view, "set-uri error:died", view->uri ? view->uri : ""); + if (GTK_WIDGET_REALIZED (view)) + gtk_socket_realize_cb (socket, view); + + return TRUE; +} + +static void +midori_view_realize_cb (MidoriView* view) +{ + GtkWidget* plug; + GtkWidget* socket; + + if (midori_view_is_plug (view)) + { + plug = gtk_plug_new (view->socket_id); + midori_view_realize (view); + gtk_widget_show (plug); + + view->input = g_io_channel_unix_new (0); /* 0 is stdin */ + g_io_channel_set_close_on_unref (view->input, TRUE); + g_io_add_watch (view->input, + G_IO_IN | G_IO_ERR | G_IO_NVAL | G_IO_HUP, + (GIOFunc)io_input_watch_cb, view); + view->output = fdopen (1, "w"); /* 1 is stdout */ + } + else if (midori_view_is_socket (view)) + { + socket = gtk_socket_new (); + g_signal_connect (socket, "realize", + G_CALLBACK (gtk_socket_realize_cb), view); + g_signal_connect (socket, "plug-removed", + G_CALLBACK (gtk_socket_plug_removed_cb), view); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (view), + GTK_WIDGET (socket)); + gtk_widget_show (socket); + } +} + +static void +midori_view_init (MidoriView* view) +{ + view->command_cache = NULL; + view->premature_uri = NULL; + view->uri = NULL; + view->title = NULL; + view->icon = gtk_widget_render_icon (GTK_WIDGET (view), GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); + view->progress = 0.0; + view->load_status = MIDORI_LOAD_FINISHED; + view->statusbar_text = NULL; + view->link_uri = NULL; + view->selected_text = NULL; + view->settings = NULL; + view->item = NULL; + + view->download_manager = NULL; + + g_object_connect (view, + "signal::notify::uri", + midori_view_notify_uri_cb, NULL, + "signal::notify::icon", + midori_view_notify_icon_cb, NULL, + "signal::notify::load-status", + midori_view_notify_load_status_cb, NULL, + "signal::notify::progress", + midori_view_notify_progress_cb, NULL, + "signal::realize", + midori_view_realize_cb, NULL, + "signal::activate-action", + midori_view_action_cb, NULL, + "signal::console-message", + midori_view_console_message_cb, NULL, + "signal::new-tab", + midori_view_new_tab_cb, NULL, + "signal::new-window", + midori_view_new_window_cb, NULL, + "signal::add-bookmark", + midori_view_add_bookmark_cb, NULL, + NULL); +} + +static void +midori_view_finalize (GObject* object) +{ + MidoriView* view; + /* WebKitWebFrame* web_frame; */ + + view = MIDORI_VIEW (object); + + g_free (view->command_cache); + g_free (view->premature_uri); + g_free (view->uri); + g_free (view->title); + if (view->icon) + g_object_unref (view->icon); + g_free (view->statusbar_text); + g_free (view->link_uri); + g_free (view->selected_text); + if (view->settings) + g_object_unref (view->settings); + if (view->item) + g_object_unref (view->item); + + g_free (view->download_manager); + + /* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + g_signal_handlers_disconnect_by_func (web_frame, + webkit_web_frame_load_done, view); */ + + G_OBJECT_CLASS (midori_view_parent_class)->finalize (object); +} + +static void +midori_view_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriView* view; + + view = MIDORI_VIEW (object); + + switch (prop_id) + { + case PROP_SOCKET_ID: + view->socket_id = g_value_get_uint (value); + break; + case PROP_TITLE: + katze_assign (view->title, g_value_dup_string (value)); + if (!midori_view_is_plug (view)) + { + #define title midori_view_get_display_title (view) + if (view->tab_label) + { + gtk_label_set_text (GTK_LABEL (view->tab_title), title); + gtk_widget_set_tooltip_text (view->tab_title, title); + } + if (view->menu_item) + gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( + view->menu_item))), title); + if (view->item) + katze_item_set_name (view->item, title); + #undef title + } + if (midori_view_is_plug (view)) + /* We must not send a NULL string here */ + send_command (view, "title", view->title ? view->title : ""); + break; + case PROP_ZOOM_LEVEL: + midori_view_set_zoom_level (view, g_value_get_float (value)); + if (midori_view_is_plug (view)) + send_command (view, "zoom-level", float_to_str (view->zoom_level)); + break; + case PROP_STATUSBAR_TEXT: + katze_assign (view->statusbar_text, g_value_dup_string (value)); + if (midori_view_is_plug (view)) + /* We must not send a NULL string here */ + send_command (view, "statusbar-text", + view->statusbar_text ? view->statusbar_text : ""); + break; + case PROP_SETTINGS: + midori_view_set_settings (view, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_view_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriView* view = MIDORI_VIEW (object); + + switch (prop_id) + { + case PROP_SOCKET_ID: + g_value_set_uint (value, view->socket_id); + break; + case PROP_URI: + g_value_set_string (value, view->uri); + break; + case PROP_TITLE: + g_value_set_string (value, view->title); + break; + case PROP_PROGRESS: + g_value_set_double (value, midori_view_get_progress (view)); + break; + case PROP_LOAD_STATUS: + g_value_set_enum (value, midori_view_get_load_status (view)); + break; + case PROP_ZOOM_LEVEL: + g_value_set_float (value, midori_view_get_zoom_level (view)); + break; + case PROP_STATUSBAR_TEXT: + g_value_set_string (value, view->statusbar_text); + break; + case PROP_SETTINGS: + g_value_set_object (value, view->settings); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/** + * midori_view_new: + * @view: a #MidoriView + * + * Creates a new view. + * + * Return value: a new #MidoriView + **/ +GtkWidget* +midori_view_new (void) +{ + return g_object_new (MIDORI_TYPE_VIEW, NULL); +} + +/** + * midori_view_new_with_uri: + * @view: a #MidoriView + * @uri: an URI + * + * Creates a new view with a particular URI. + * + * This constructor supports opaque views and is + * in fact currently the only way to create them. + * + * The only currently supported opaque view is + * the source view, implementing a #MidoriSource. + * Pass an URI prefixed with "view-source:" in + * order to create a source view. + * + * Return value: a new #MidoriView + **/ +GtkWidget* +midori_view_new_with_uri (const gchar* uri) +{ + MidoriView* view; + gchar* title; + GtkWidget* widget; + + view = g_object_new (MIDORI_TYPE_VIEW, NULL); + + if (uri && g_str_has_prefix (uri, "view-source:")) + { + view->socket_id = -1; + katze_assign (view->uri, g_strdup (uri)); + g_object_notify (G_OBJECT (view), "uri"); + title = g_strdup_printf ("%s - %s", _("Source"), &uri[12]); + g_object_set (view, "title", title, NULL); + g_free (title); + katze_object_assign (view->icon, + gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU, NULL)); + widget = midori_source_new (&uri[12]); + /* Adjustments are not created automatically */ + g_object_set (view, "hadjustment", NULL, "vadjustment", NULL, NULL); + gtk_container_add (GTK_CONTAINER (view), widget); + gtk_widget_show (widget); + } + else + midori_view_set_uri (view, uri); + + return (GtkWidget*)view; +} + +static void +_update_label_size (GtkWidget* label, + gint size) +{ + gint width, height; + + if (size > -1) + { + sokoke_widget_get_text_size (label, "M", &width, &height); + gtk_widget_set_size_request (label, width * size, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + } + else + { + gtk_widget_set_size_request (label, -1, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); + } +} + +static void +_midori_view_update_settings (MidoriView* view) +{ + g_object_get (view->settings, + "download-manager", &view->download_manager, + "close-buttons-on-tabs", &view->close_buttons_on_tabs, + NULL); + + if (midori_view_is_socket (view)) + send_command (view, "download-manager", view->download_manager); +} + +static void +midori_view_settings_notify_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + MidoriView* view) +{ + const gchar* name; + GValue value = { 0, }; + + name = g_intern_string (g_param_spec_get_name (pspec)); + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (view->settings), name, &value); + + if (name == g_intern_string ("download-manager")) + { + katze_assign (view->download_manager, g_value_dup_string (&value)); + if (midori_view_is_socket (view)) + send_command (view, "download-manager", view->download_manager); + } + else if (name == g_intern_string ("tab-label-size")) + { + view->tab_label_size = g_value_get_int (&value); + if (!midori_view_is_plug (view)) + _update_label_size (view->tab_title, + sokoke_object_get_int (view->settings, "tab-label-size")); + } + else if (name == g_intern_string ("close-buttons-on-tabs")) + { + view->close_buttons_on_tabs = g_value_get_boolean (&value); + sokoke_widget_set_visible (view->tab_close, + view->close_buttons_on_tabs); + } + + g_value_unset (&value); +} + +/** + * midori_view_set_settings: + * @view: a #MidoriView + * @settings: a #MidoriWebSettings + * + * Assigns a settings instance to the view. + **/ +void +midori_view_set_settings (MidoriView* view, + MidoriWebSettings* settings) +{ + if (view->settings) + g_signal_handlers_disconnect_by_func (view->settings, + midori_view_settings_notify_cb, view); + katze_object_assign (view->settings, g_object_ref (settings)); + /* FIXME: Propagate settings to the web view */ + _midori_view_update_settings (view); + g_signal_connect (settings, "notify", + G_CALLBACK (midori_view_settings_notify_cb), view); + g_object_notify (G_OBJECT (view), "settings"); +} + +/** + * midori_view_load_status: + * @web_view: a #MidoriView + * + * Determines the current loading status of a view. + * + * Return value: the current #MidoriLoadStatus + **/ +MidoriLoadStatus +midori_view_get_load_status (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), MIDORI_LOAD_FINISHED); + + return view->load_status; +} + +/** + * midori_view_get_progress: + * @view: a #MidoriView + * + * Retrieves the current loading progress as + * a fraction between 0.0 and 1.0. + * + * Return value: the current loading progress + **/ +gdouble +midori_view_get_progress (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), 0.0); + + return view->progress; +} + +/** + * midori_view_set_uri: + * @view: a #MidoriView + * + * Opens the specified URI in the view. + * + * FIXME: + * If the view doesn't allow changing the URI it + * will automatically request a new tab. + **/ +void +midori_view_set_uri (MidoriView* view, + const gchar* uri) +{ + gchar* data; + + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + /* We must not send a NULL string here */ + send_command (view, "set-uri", uri ? uri : ""); + else + { + if (!view->web_view) + { + /* An URI is requested before the view was realized. + We special case this to load it when we are ready. */ + midori_debug ("Deferring premature uri '%s'", uri); + katze_assign (view->premature_uri, g_strdup (uri)); + return; + } + midori_debug ("Opening URI: %s", uri); + /* This is not prefectly elegant, but creating an + error page inline is the simplest solution. */ + if (g_str_has_prefix (uri, "error:")) + { + data = NULL; + if (!strncmp (uri, "error:died ", 11)) + { + katze_assign (view->uri, g_strdup (&uri[11])); + data = g_strdup_printf ( + "Page died - %s" + "

Page died - %s

" + "

The page you were navigating on died." + "

Try to load the page again, " + "or move on to another page." + "", + view->uri, view->uri, view->uri); + } + else if (!strncmp (uri, "error:404 ", 10)) + { + katze_assign (view->uri, g_strdup (&uri[10])); + data = g_strdup_printf ( + "Not found - %s" + "

Not found - %s

" + "

The page you were opening doesn't exist." + "

Try to load the page again, " + "or move on to another page." + "", + view->uri, view->uri, view->uri); + } + if (data) + { + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (view->web_view), data, view->uri); + g_free (data); + g_object_notify (G_OBJECT (view), "uri"); + return; + } + } + else + { + katze_assign (view->uri, g_strdup (uri)); + webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); + } + } +} + +/** + * midori_view_is_blank: + * @view: a #MidoriView + * + * Determines whether the view is currently empty. + **/ +gboolean +midori_view_is_blank (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), TRUE); + + return !(view->uri && *view->uri); +} + +/** + * midori_view_get_icon: + * @view: a #MidoriView + * + * Retrieves the icon of the view. + * + * Return value: a #GdkPixbuf + **/ +GdkPixbuf* +midori_view_get_icon (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + return view->icon; +} + +/** + * midori_view_get_display_uri: + * @view: a #MidoriView + * + * Retrieves a string that is suitable for displaying, + * particularly an empty URI is represented as "about:blank". + * + * You can assume that the string is not %NULL. + * + * Return value: an URI string + **/ +const gchar* +midori_view_get_display_uri (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); + + if (view->uri && *view->uri) + return view->uri; + return "about:blank"; +} + +/** + * midori_view_get_display_title: + * @view: a #MidoriView + * + * Retrieves a string that is suitable for displaying + * as a title. Most of the time this will be the title + * or the current URI. + * + * You can assume that the string is not %NULL. + * + * Return value: a title string + **/ +const gchar* +midori_view_get_display_title (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); + + if (view->title && *view->title) + return view->title; + return midori_view_get_display_uri (view); +} + +/** + * midori_view_get_link_uri: + * @view: a #MidoriView + * + * Retrieves the uri of the currently focused link, + * particularly while the mouse hovers a link or a + * context menu is being opened. + * + * Return value: an URI string, or %NULL if there is no link focussed + **/ +const gchar* +midori_view_get_link_uri (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + return view->link_uri; +} + +/** + * midori_view_has_selection: + * @view: a #MidoriView + * + * Determines whether something in the view is selected. + * + * This function returns %FALSE if there is a selection + * that effectively only consists of whitespace. + * + * Return value: %TRUE if effectively there is a selection + **/ +gboolean +midori_view_has_selection (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_socket (view)) + return view->has_selection; + else + { + view->selected_text = webkit_web_view_get_selected_text ( + WEBKIT_WEB_VIEW (view->web_view)); + if (view->selected_text && *view->selected_text) + return TRUE; + return FALSE; + } +} + +/** + * midori_view_get_selected_text: + * @view: a #MidoriView + * + * Retrieves the currently selected text. + * + * Return value: the selected text, or %NULL + **/ +const gchar* +midori_view_get_selected_text (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + if (midori_view_is_socket (view)) + return view->selected_text; + else if (midori_view_has_selection (view)) + return midori_view_get_selected_text (view); + else + return NULL; +} + +/** + * midori_view_can_cut_clipboard: + * @view: a #MidoriView + * + * Determines whether a selection can be cut. + * + * Return value: %TRUE if a selection can be cut + **/ +gboolean +midori_view_can_cut_clipboard (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_socket (view)) + return view->can_cut_clipboard; + else if (view->web_view) + { + view->can_cut_clipboard = webkit_web_view_can_cut_clipboard ( + WEBKIT_WEB_VIEW (view->web_view)); + return view->can_cut_clipboard; + } + return FALSE; +} + +/** + * midori_view_can_copy_clipboard: + * @view: a #MidoriView + * + * Determines whether a selection can be copied. + * + * Return value: %TRUE if a selection can be copied + **/ +gboolean +midori_view_can_copy_clipboard (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_socket (view)) + return view->can_copy_clipboard; + else if (view->web_view) + { + view->can_copy_clipboard = webkit_web_view_can_copy_clipboard ( + WEBKIT_WEB_VIEW (view->web_view)); + return view->can_copy_clipboard; + } + return FALSE; +} + +/** + * midori_view_can_paste_clipboard: + * @view: a #MidoriView + * + * Determines whether a selection can be pasted. + * + * Return value: %TRUE if a selection can be pasted + **/ +gboolean +midori_view_can_paste_clipboard (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_socket (view)) + return view->can_paste_clipboard; + else if (view->web_view) + { + view->can_paste_clipboard = webkit_web_view_can_paste_clipboard ( + WEBKIT_WEB_VIEW (view->web_view)); + return view->can_paste_clipboard; + } + return FALSE; +} + +/** + * midori_view_get_proxy_menu_item: + * @view: a #MidoriView + * + * Retrieves a proxy menu item that is typically added to a Window menu + * and which on activation switches to the right window/ tab. + * + * The item is created on the first call and will be updated to reflect + * changes to the icon and title automatically. + * + * The menu item is valid until it is removed from its container. + * + * Return value: the proxy #GtkMenuItem + **/ +GtkWidget* +midori_view_get_proxy_menu_item (MidoriView* view) +{ + const gchar* title; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + if (!view->menu_item) + { + title = midori_view_get_display_title (view); + view->menu_item = sokoke_image_menu_item_new_ellipsized (title); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view->menu_item), + gtk_image_new_from_pixbuf (view->icon)); + + g_signal_connect (view->menu_item, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &view->menu_item); + } + return view->menu_item; +} + +static gboolean +midori_view_tab_label_button_release_event (GtkWidget* tab_label, + GdkEventButton* event, + GtkWidget* widget) +{ + if (event->button == 2) + { + /* Close the widget on middle click */ + gtk_widget_destroy (widget); + return TRUE; + } + + return FALSE; +} + +static void +midori_view_tab_icon_style_set (GtkWidget* tab_icon, + GtkStyle* previous_style) +{ + GtkSettings* gtk_settings; + gint width, height; + + gtk_settings = gtk_widget_get_settings (tab_icon); + gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_MENU, + &width, &height); + gtk_widget_set_size_request (tab_icon, width + 2, height + 2); +} + +static void +midori_view_tab_close_clicked (GtkWidget* tab_close, + GtkWidget* widget) +{ + gtk_widget_destroy (widget); +} + +/** + * midori_view_get_proxy_tab_label: + * @view: a #MidoriView + * + * Retrieves a proxy tab label that is typically used when + * adding the view to a notebook. + * + * The label is created on the first call and will be updated to reflect + * changes of the loading progress and title. + * + * The label is valid until it is removed from its container. + * + * Return value: the proxy #GtkEventBox + **/ +GtkWidget* +midori_view_get_proxy_tab_label (MidoriView* view) +{ + GtkWidget* event_box; + GtkWidget* hbox; + GtkRcStyle* rcstyle; + GtkWidget* image; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + if (!view->tab_label) + { + view->tab_icon = katze_throbber_new (); + katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon), + midori_view_get_icon (view)); + + view->tab_title = gtk_label_new (midori_view_get_display_title (view)); + + event_box = gtk_event_box_new (); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); + hbox = gtk_hbox_new (FALSE, 1); + gtk_container_border_width (GTK_CONTAINER (hbox), 2); + gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); + gtk_misc_set_alignment (GTK_MISC (view->tab_icon), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5); + /* TODO: make the tab initially look "unvisited" until it's focused */ + gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); + if (view->settings) + _update_label_size (view->tab_title, + sokoke_object_get_int (view->settings, "tab-label-size")); + + view->tab_close = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click (GTK_BUTTON (view->tab_close), FALSE); + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style (view->tab_close, rcstyle); + g_object_unref (rcstyle); + image = katze_throbber_new (); + katze_throbber_set_static_stock_id (KATZE_THROBBER (image), + GTK_STOCK_CLOSE); + gtk_button_set_image (GTK_BUTTON (view->tab_close), image); + gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); + gtk_box_pack_end (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_WIDGET (event_box)); + + if (view->settings && + !sokoke_object_get_boolean (view->settings, "close-buttons-on-tabs")) + gtk_widget_hide (view->tab_close); + + g_signal_connect (event_box, "button-release-event", + G_CALLBACK (midori_view_tab_label_button_release_event), view); + g_signal_connect (view->tab_close, "style-set", + G_CALLBACK (midori_view_tab_icon_style_set), NULL); + g_signal_connect (view->tab_close, "clicked", + G_CALLBACK (midori_view_tab_close_clicked), view); + + view->tab_label = event_box; + g_signal_connect (view->tab_label, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &view->tab_label); + } + return view->tab_label; +} + +/** + * midori_view_get_proxy_item: + * @view: a #MidoriView + * + * Retrieves a proxy item that can be used for bookmark storage as + * well as session management. + * + * The item is created on the first call and will be updated to reflect + * changes to the title and uri automatically. + * + * Return value: the proxy #KatzeItem + **/ +KatzeItem* +midori_view_get_proxy_item (MidoriView* view) +{ + const gchar* uri; + const gchar* title; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + + if (!view->item) + { + view->item = katze_item_new (); + uri = midori_view_get_display_uri (view); + katze_item_set_uri (view->item, uri); + title = midori_view_get_display_title (view); + katze_item_set_name (view->item, title); + } + return view->item; +} + +/** + * midori_view_get_zoom_level: + * @view: a #MidoriView + * + * Determines the current zoom level of the view. + * + * Return value: the current zoom level + **/ +gfloat +midori_view_get_zoom_level (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), 1.0); + + if (midori_view_is_socket (view)) + return view->zoom_level; + else if (view->web_view) + return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); + return FALSE; +} + +/** + * midori_view_set_zoom_level: + * @view: a #MidoriView + * @zoom_level: the new zoom level + * + * Sets the current zoom level of the view. + **/ +void +midori_view_set_zoom_level (MidoriView* view, + gfloat zoom_level) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "set-zoom-level", float_to_str (zoom_level)); + else + webkit_web_view_set_zoom_level ( + WEBKIT_WEB_VIEW (view->web_view), zoom_level); +} + +#define can_do(what) \ +gboolean \ +midori_view_can_##what (MidoriView* view) \ +{ \ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); \ +\ + return view->socket_id > -1; \ +} + +can_do (zoom_in) +can_do (zoom_out) +can_do (reload) +can_do (go_back) +can_do (go_forward) +can_do (print) +#if HAVE_GIO + can_do (view_source) +#else + gboolean midori_view_can_view_source (MidoriView* view) + { + return FALSE; + } +#endif +can_do (find) + +/** + * midori_view_reload: + * @view: a #MidoriView + * @from_cache: whether to allow caching + * + * Reloads the view. + * + * Note: The @from_cache value is currently ignored. + **/ +void +midori_view_reload (MidoriView* view, + gboolean from_cache) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "reload", int_to_str (from_cache)); + else + webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); +} + +/** + * midori_view_stop_loading + * @view: a #MidoriView + * + * Stops loading the view if it is currently loading. + **/ +void +midori_view_stop_loading (MidoriView* view) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "stop-loading", NULL); + else + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); +} + +/** + * midori_view_go_back + * @view: a #MidoriView + * + * Goes back one page in the view. + **/ +void +midori_view_go_back (MidoriView* view) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "go-back", NULL); + else + webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view)); +} + +/** + * midori_view_go_forward + * @view: a #MidoriView + * + * Goes forward one page in the view. + **/ +void +midori_view_go_forward (MidoriView* view) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "go-forward", NULL); + else + webkit_web_view_go_forward (WEBKIT_WEB_VIEW (view->web_view)); +} + +/** + * midori_view_print + * @view: a #MidoriView + * + * Prints the contents of the view. + **/ +void +midori_view_print (MidoriView* view) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "print", NULL); + else + webkit_web_view_execute_script ( + WEBKIT_WEB_VIEW (view->web_view), "print();"); +} diff --git a/midori/midori-view.h b/midori/midori-view.h new file mode 100644 index 00000000..96b5d22e --- /dev/null +++ b/midori/midori-view.h @@ -0,0 +1,161 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_VIEW_H__ +#define __MIDORI_VIEW_H__ + +#include "midori-websettings.h" + +#include + +G_BEGIN_DECLS + +typedef enum +{ + MIDORI_LOAD_PROVISIONAL, + MIDORI_LOAD_COMMITTED, + MIDORI_LOAD_FINISHED +} MidoriLoadStatus; + +GType +midori_load_status_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_LOAD_STATUS \ + (midori_load_status_get_type ()) + +#define MIDORI_TYPE_VIEW \ + (midori_view_get_type ()) +#define MIDORI_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEW, MidoriView)) +#define MIDORI_VIEW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_VIEW, MidoriViewClass)) +#define MIDORI_IS_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_VIEW)) +#define MIDORI_IS_VIEW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_VIEW)) +#define MIDORI_VIEW_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_VIEW, MidoriViewClass)) + +typedef struct _MidoriView MidoriView; +typedef struct _MidoriViewClass MidoriViewClass; + +GType +midori_view_get_type (void); + +GtkWidget* +midori_view_new (void); + +GtkWidget* +midori_view_new_with_uri (const gchar* uri); + +void +midori_view_set_settings (MidoriView* view, + MidoriWebSettings* settings); + +gdouble +midori_view_get_progress (MidoriView* view); + +MidoriLoadStatus +midori_view_get_load_status (MidoriView* view); + +void +midori_view_set_uri (MidoriView* view, + const gchar* uri); + +gboolean +midori_view_is_blank (MidoriView* view); + +const gchar* +midori_view_get_display_uri (MidoriView* view); + +const gchar* +midori_view_get_display_title (MidoriView* view); + +GdkPixbuf* +midori_view_get_icon (MidoriView* view); + +const gchar* +midori_view_get_link_uri (MidoriView* view); + +gboolean +midori_view_has_selection (MidoriView* view); + +const gchar* +midori_view_get_selected_text (MidoriView* view); + +gboolean +midori_view_can_cut_clipboard (MidoriView* view); + +gboolean +midori_view_can_copy_clipboard (MidoriView* view); + +gboolean +midori_view_can_paste_clipboard (MidoriView* view); + +GtkWidget* +midori_view_get_proxy_menu_item (MidoriView* view); + +GtkWidget* +midori_view_get_proxy_tab_label (MidoriView* view); + +KatzeItem* +midori_view_get_proxy_item (MidoriView* view); + +gfloat +midori_view_get_zoom_level (MidoriView* view); + +gboolean +midori_view_can_zoom_in (MidoriView* view); + +gboolean +midori_view_can_zoom_out (MidoriView* view); + +void +midori_view_set_zoom_level (MidoriView* view, + gfloat zoom_level); + +gboolean +midori_view_can_reload (MidoriView* view); + +void +midori_view_reload (MidoriView* view, + gboolean from_cache); + +void +midori_view_stop_loading (MidoriView* view); + +gboolean +midori_view_can_go_back (MidoriView* view); + +void +midori_view_go_back (MidoriView* view); + +gboolean +midori_view_can_go_forward (MidoriView* view); + +void +midori_view_go_forward (MidoriView* view); + +gboolean +midori_view_can_print (MidoriView* view); + +void +midori_view_print (MidoriView* view); + +gboolean +midori_view_can_view_source (MidoriView* view); + +gboolean +midori_view_can_find (MidoriView* view); + +G_END_DECLS + +#endif /* __MIDORI_VIEW_H__ */ diff --git a/midori/midori-webview.c b/midori/midori-webview.c deleted file mode 100644 index 754529b0..00000000 --- a/midori/midori-webview.c +++ /dev/null @@ -1,1214 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#if HAVE_CONFIG_H - #include -#endif - -#include "midori-webview.h" -#include "midori-stock.h" - -#include "compat.h" -#include "sokoke.h" -#include "gjs.h" - -#include -#if HAVE_GIO - #include -#endif -#include -#include - -/* This is unstable API, so we need to declare it */ -gchar* -webkit_web_view_get_selected_text (WebKitWebView* web_view); - -struct _MidoriWebView -{ - WebKitWebView parent_instance; - gboolean window_object_cleared; - - GdkPixbuf* icon; - gchar* uri; - gchar* title; - gdouble progress; - MidoriLoadStatus load_status; - gchar* statusbar_text; - gchar* link_uri; - KatzeArray* news_feeds; - - MidoriWebSettings* settings; - - GtkWidget* menu_item; - GtkWidget* tab_icon; - GtkWidget* tab_title; - KatzeXbelItem* xbel_item; -}; - -G_DEFINE_TYPE (MidoriWebView, midori_web_view, WEBKIT_TYPE_WEB_VIEW) - -GType -midori_load_status_get_type (void) -{ - static GType type = 0; - if (!type) - { - static const GEnumValue values[] = { - { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", N_("Load Provisional") }, - { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", N_("Load Committed") }, - { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", N_("Load Finished") }, - { 0, NULL, NULL } - }; - type = g_enum_register_static ("MidoriLoadStatus", values); - } - return type; -} - -enum -{ - PROP_0, - - PROP_URI, - PROP_TITLE, - PROP_PROGRESS, - PROP_MLOAD_STATUS, - PROP_STATUSBAR_TEXT, - PROP_SETTINGS -}; - -enum { - ICON_READY, - NEWS_FEED_READY, - ELEMENT_MOTION, - NEW_TAB, - NEW_WINDOW, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -static void -midori_web_view_finalize (GObject* object); - -static void -midori_web_view_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec); - -static void -midori_web_view_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec); - -static void -midori_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void(*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1, - const gchar* arg_1, - const gchar* arg_2, - const gchar* arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_STRING_STRING callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_STRING_STRING) (marshal_data - ? marshal_data : cc->callback); - callback (data1, - g_value_get_string (param_values + 1), - g_value_get_string (param_values + 2), - g_value_get_string (param_values + 3), - data2); -} - -static void -midori_web_view_class_init (MidoriWebViewClass* class) -{ - signals[ICON_READY] = g_signal_new ( - "icon-ready", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, icon_ready), - 0, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - GDK_TYPE_PIXBUF); - - signals[NEWS_FEED_READY] = g_signal_new ( - "news-feed-ready", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, news_feed_ready), - 0, - NULL, - midori_cclosure_marshal_VOID__STRING_STRING_STRING, - G_TYPE_NONE, 3, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); - - signals[ELEMENT_MOTION] = g_signal_new ( - "element-motion", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriWebViewClass, element_motion), - 0, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); - - signals[NEW_TAB] = g_signal_new ( - "new-tab", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriWebViewClass, new_tab), - 0, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); - - signals[NEW_WINDOW] = g_signal_new ( - "new-window", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriWebViewClass, new_window), - 0, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); - - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_web_view_finalize; - gobject_class->set_property = midori_web_view_set_property; - gobject_class->get_property = midori_web_view_get_property; - - GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - - if (!g_object_class_find_property (gobject_class, "uri")) - g_object_class_install_property (gobject_class, - PROP_URI, - g_param_spec_string ( - "uri", - "Uri", - _("The URI of the currently loaded page"), - "", - flags)); - - if (!g_object_class_find_property (gobject_class, "title")) - g_object_class_install_property (gobject_class, - PROP_TITLE, - g_param_spec_string ( - "title", - "Title", - _("The title of the currently loaded page"), - NULL, - flags)); - - if (!g_object_class_find_property (gobject_class, "progress")) - g_object_class_install_property (gobject_class, - PROP_PROGRESS, - g_param_spec_double ( - "progress", - "Progress", - _("The current loading progress"), - 0.0, 1.0, 0.0, - G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, - PROP_MLOAD_STATUS, - g_param_spec_enum ( - "mload-status", - "Load Status", - _("The current loading status"), - MIDORI_TYPE_LOAD_STATUS, - MIDORI_LOAD_FINISHED, - G_PARAM_READABLE)); - - if (!g_object_class_find_property (gobject_class, "statusbar-text")) - g_object_class_install_property (gobject_class, - PROP_STATUSBAR_TEXT, - g_param_spec_string ( - "statusbar-text", - "Statusbar Text", - _("The text that is displayed in the statusbar"), - "", - G_PARAM_READABLE)); - - g_object_class_override_property (gobject_class, - PROP_SETTINGS, - "settings"); -} - -static void -webkit_web_view_load_started (MidoriWebView* web_view, - WebKitWebFrame* web_frame) -{ - web_view->window_object_cleared = FALSE; - - web_view->load_status = MIDORI_LOAD_PROVISIONAL; - g_object_notify (G_OBJECT (web_view), "mload-status"); - if (web_view->tab_icon) - katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), TRUE); - - web_view->progress = 0.0; - g_object_notify (G_OBJECT (web_view), "progress"); -} - -static void -webkit_web_view_window_object_cleared_cb (MidoriWebView* web_view, - WebKitWebFrame* web_frame, - JSGlobalContextRef js_context, - JSObjectRef js_window) -{ - web_view->window_object_cleared = TRUE; -} - -#if HAVE_GIO -void -loadable_icon_finish_cb (GdkPixbuf* icon, - GAsyncResult* res, - MidoriWebView* web_view) -{ - GInputStream* stream; - GdkPixbuf* pixbuf; - GdkPixbuf* pixbuf_scaled; - gint icon_width, icon_height; - - pixbuf = NULL; - stream = g_loadable_icon_load_finish (G_LOADABLE_ICON (icon), - res, NULL, NULL); - if (stream) - { - pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); - g_object_unref (stream); - } - if (!pixbuf) - pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - web_view->icon = pixbuf_scaled; - g_signal_emit (web_view, signals[ICON_READY], 0, web_view->icon); -} - -void -file_info_finish_cb (GFile* icon_file, - GAsyncResult* res, - MidoriWebView* web_view) -{ - GFileInfo* info; - const gchar* content_type; - GIcon* icon; - GFile* parent; - GFile* file; - GdkPixbuf* pixbuf; - gint icon_width, icon_height; - GdkPixbuf* pixbuf_scaled; - - info = g_file_query_info_finish (G_FILE (icon_file), res, NULL); - if (info) - { - content_type = g_file_info_get_content_type (info); - if (g_str_has_prefix (content_type, "image/")) - { - icon = g_file_icon_new (icon_file); - g_loadable_icon_load_async (G_LOADABLE_ICON (icon), - 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); - return; - } - } - - file = g_file_get_parent (icon_file); - parent = g_file_get_parent (file); - /* We need to check if file equals the parent due to a GIO bug */ - if (parent && !g_file_equal (file, parent)) - { - icon_file = g_file_get_child (parent, "favicon.ico"); - g_file_query_info_async (icon_file, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, 0, NULL, - (GAsyncReadyCallback)file_info_finish_cb, web_view); - return; - } - - pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - - web_view->icon = pixbuf_scaled; - g_signal_emit (web_view, signals[ICON_READY], 0, web_view->icon); -} -#endif - -static void -_midori_web_view_load_icon (MidoriWebView* web_view) -{ - #if HAVE_GIO - GFile* file; - GFile* icon_file; - #endif - GdkPixbuf* pixbuf; - gint icon_width, icon_height; - GdkPixbuf* pixbuf_scaled; - - #if HAVE_GIO - if (web_view->uri) - { - file = g_file_new_for_uri (web_view->uri); - icon_file = g_file_get_child (file, "favicon.ico"); - g_file_query_info_async (icon_file, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, 0, NULL, - (GAsyncReadyCallback)file_info_finish_cb, web_view); - return; - } - #endif - - pixbuf = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - - web_view->icon = pixbuf_scaled; - g_signal_emit (web_view, signals[ICON_READY], 0, web_view->icon); -} - -static void -webkit_web_view_load_committed (MidoriWebView* web_view, - WebKitWebFrame* web_frame) -{ - const gchar* uri; - GdkPixbuf* icon; - - uri = webkit_web_frame_get_uri (web_frame); - katze_assign (web_view->uri, g_strdup (uri)); - if (web_view->xbel_item) - { - uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (web_view->xbel_item, uri); - } - g_object_notify (G_OBJECT (web_view), "uri"); - g_object_set (web_view, "title", NULL, NULL); - - icon = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - katze_object_assign (web_view->icon, icon); - _midori_web_view_load_icon (web_view); - - if (web_view->tab_icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - icon); - - if (web_view->menu_item) - gtk_image_menu_item_set_image ( - GTK_IMAGE_MENU_ITEM (web_view->menu_item), - gtk_image_new_from_pixbuf (icon)); - - web_view->load_status = MIDORI_LOAD_COMMITTED; - g_object_notify (G_OBJECT (web_view), "mload-status"); -} - -static void -webkit_web_view_icon_ready (MidoriWebView* web_view, - GdkPixbuf* icon) -{ - if (web_view->tab_icon) - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - icon); - if (web_view->menu_item) - gtk_image_menu_item_set_image ( - GTK_IMAGE_MENU_ITEM (web_view->menu_item), - gtk_image_new_from_pixbuf (icon)); -} - -static void -webkit_web_view_progress_changed (MidoriWebView* web_view, gint progress) -{ - web_view->progress = progress ? progress / 100.0 : 0.0; - g_object_notify (G_OBJECT (web_view), "progress"); -} - -static void -gjs_value_links_foreach_cb (GjsValue* link, - MidoriWebView* web_view) -{ - const gchar* type; -#if HAVE_GIO - const gchar* rel; - GFile* icon_file; - GIcon* icon; -#endif - - if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "href")) - { - if (gjs_value_has_attribute (link, "type")) - { - type = gjs_value_get_attribute_string (link, "type"); - if (!strcmp (type, "application/rss+xml") - || !strcmp (type, "application/x.atom+xml") - || !strcmp (type, "application/atom+xml")) - { - katze_array_add_item (web_view->news_feeds, link); - g_signal_emit (web_view, signals[NEWS_FEED_READY], 0, - gjs_value_get_attribute_string (link, "href"), type, - gjs_value_has_attribute (link, "title") - ? gjs_value_get_attribute_string (link, "title") : NULL); - } - } -#if HAVE_GIO - if (gjs_value_has_attribute (link, "rel")) - { - rel = gjs_value_get_attribute_string (link, "rel"); - if (!strcmp (rel, "icon") || !strcmp (rel, "shortcut icon")) - { - icon_file = g_file_new_for_uri ( - gjs_value_get_attribute_string (link, "href")); - icon = g_file_icon_new (icon_file); - g_loadable_icon_load_async (G_LOADABLE_ICON (icon), - 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, web_view); - } - } -#endif - } -} - -static void -webkit_web_frame_load_done (WebKitWebFrame* web_frame, - gboolean success, - MidoriWebView* web_view) -{ - JSContextRef js_context; - JSValueRef js_window; - GjsValue* value; - GjsValue* document; - GjsValue* links; - - /* If WebKit didn't emit the signal due to a bug, we will */ - if (!web_view->window_object_cleared) - { - js_context = webkit_web_frame_get_global_context (web_frame); - js_window = JSContextGetGlobalObject (js_context); - g_signal_emit_by_name (web_view, "window-object-cleared", - web_frame, js_context, js_window); - } - - value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); - document = gjs_value_get_by_name (value, "document"); - links = gjs_value_get_elements_by_tag_name (document, "link"); - katze_array_clear (web_view->news_feeds); - gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, web_view); - g_object_unref (links); - g_object_unref (document); - g_object_unref (value); - - if (web_view->tab_icon) - katze_throbber_set_animated (KATZE_THROBBER (web_view->tab_icon), - FALSE); - web_view->load_status = MIDORI_LOAD_FINISHED; - g_object_notify (G_OBJECT (web_view), "mload-status"); -} - -static void -webkit_web_view_load_finished (MidoriWebView* web_view) -{ - web_view->progress = 1.0; - g_object_notify (G_OBJECT (web_view), "progress"); -} - -static void -webkit_web_view_title_changed (MidoriWebView* web_view, - WebKitWebFrame* web_frame, const gchar* title) -{ - g_object_set (web_view, "title", title, NULL); -} - -static void -webkit_web_view_statusbar_text_changed (MidoriWebView* web_view, - const gchar* text) -{ - katze_assign (web_view->statusbar_text, g_strdup (text)); - g_object_notify (G_OBJECT (web_view), "statusbar-text"); -} - -static void -webkit_web_view_hovering_over_link (MidoriWebView* web_view, - const gchar* tooltip, - const gchar* link_uri) -{ - katze_assign (web_view->link_uri, g_strdup (link_uri)); - g_signal_emit (web_view, signals[ELEMENT_MOTION], 0, link_uri); -} - -static gboolean -gtk_widget_button_press_event_after (MidoriWebView* web_view, - GdkEventButton* event) -{ - GdkModifierType state; - GtkClipboard* clipboard; - gchar* uri; - gchar* new_uri; - - if (event->button == 2 && sokoke_object_get_boolean - (web_view->settings, "middle-click-opens-selection")) - { - state = (GdkModifierType) event->state; - clipboard = gtk_clipboard_get_for_display ( - gtk_widget_get_display (GTK_WIDGET (web_view)), - GDK_SELECTION_PRIMARY); - uri = gtk_clipboard_wait_for_text (clipboard); - if (uri && strchr (uri, '.') && !strchr (uri, ' ')) - { - new_uri = sokoke_magic_uri (uri, NULL); - if (state & GDK_CONTROL_MASK) - g_signal_emit (web_view, signals[NEW_TAB], 0, new_uri); - else - { - g_object_set (web_view, "uri", new_uri, NULL); - gtk_widget_grab_focus (GTK_WIDGET (web_view)); - } - g_free (new_uri); - g_free (uri); - return TRUE; - } - } - return FALSE; -} - -static gboolean -gtk_widget_button_release_event (MidoriWebView* web_view, - GdkEventButton* event) -{ - GtkClipboard* clipboard; - gchar* text; - - /* Emulate the primary clipboard, which WebKit doesn't support */ - text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); - clipboard = gtk_clipboard_get_for_display ( - gtk_widget_get_display (GTK_WIDGET (web_view)), GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text (clipboard, text, -1); - g_free (text); - return FALSE; -} - -static gboolean -gtk_widget_scroll_event (MidoriWebView* web_view, - GdkEventScroll* event) -{ - GdkModifierType state = (GdkModifierType)0; - gint x, y; - - gdk_window_get_pointer (NULL, &x, &y, &state); - if (state & GDK_CONTROL_MASK) - { - if (event->direction == GDK_SCROLL_DOWN) - webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); - else if(event->direction == GDK_SCROLL_UP) - webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); - return TRUE; - } - else - return FALSE; -} - -static void -midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, - MidoriWebView* web_view) -{ - const gchar* uri = g_object_get_data (G_OBJECT (widget), "uri"); - g_signal_emit (web_view, signals[NEW_TAB], 0, uri); -} - -static void -midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, - MidoriWebView* web_view) -{ - const gchar* uri = g_object_get_data (G_OBJECT (widget), "uri"); - g_signal_emit (web_view, signals[NEW_WINDOW], 0, uri); -} - -static void -midori_web_view_menu_download_activate_cb (GtkWidget* widget, - MidoriWebView* web_view) -{ - gchar* program; - const gchar* uri; - - g_object_get (web_view->settings, "download-manager", &program, NULL); - uri = g_object_get_data (G_OBJECT (widget), "uri"); - sokoke_spawn_program (program, uri); - g_free (program); -} - -static void -webkit_web_view_populate_popup_cb (GtkWidget* web_view, - GtkWidget* menu) -{ - const gchar* uri; - GtkWidget* menuitem; - GdkScreen* screen; - GtkIconTheme* icon_theme; - GtkWidget* icon; - gchar* text; - GList* items; - gchar* program; - - uri = midori_web_view_get_link_uri (MIDORI_WEB_VIEW (web_view)); - if (uri) - { - menuitem = gtk_image_menu_item_new_with_mnemonic ( - _("Open Link in New _Tab")); - screen = gtk_widget_get_screen (web_view); - icon_theme = gtk_icon_theme_get_for_screen (screen); - if (gtk_icon_theme_has_icon (icon_theme, STOCK_TAB_NEW)) - { - icon = gtk_image_new_from_stock (STOCK_TAB_NEW, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - } - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 1); - g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); - gtk_widget_show (menuitem); - /* hack to implement New Window */ - items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, 2); - g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_new_window_activate_cb), web_view); - menuitem = (GtkWidget*)g_list_nth_data (items, 3); - /* hack to disable non-functional Download File */ - gtk_widget_set_sensitive (menuitem, FALSE); - g_list_free (items); - g_object_get (MIDORI_WEB_VIEW (web_view)->settings, - "download-manager", &program, NULL); - if (program && *program) - { - menuitem = gtk_image_menu_item_new_with_mnemonic ( - _("Download Link with Download _Manager")); - icon = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 4); - g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_download_activate_cb), web_view); - gtk_widget_show (menuitem); - } - } - - if (!uri && midori_web_view_has_selection (MIDORI_WEB_VIEW (web_view))) - { - text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); - if (text && strchr (text, '.') && !strchr (text, ' ')) - { - menuitem = gtk_image_menu_item_new_with_mnemonic ( - _("Open URL in New _Tab")); - icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, -1); - g_object_set_data (G_OBJECT (menuitem), "uri", text); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), web_view); - gtk_widget_show (menuitem); - } - /* text should be const, but it is allocated, so we must free it */ - g_free (text); - } -} - -static void -midori_web_view_init (MidoriWebView* web_view) -{ - web_view->icon = gtk_widget_render_icon (GTK_WIDGET (web_view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - web_view->progress = 0.0; - web_view->load_status = MIDORI_LOAD_FINISHED; - web_view->news_feeds = katze_array_new (GJS_TYPE_VALUE); - - web_view->settings = midori_web_settings_new (); - g_object_set (web_view, "WebKitWebView::settings", web_view->settings, NULL); - - WebKitWebFrame* web_frame; - web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); - - g_object_connect (web_view, - "signal::load-started", - webkit_web_view_load_started, NULL, - "signal::window-object-cleared", - webkit_web_view_window_object_cleared_cb, NULL, - "signal::load-committed", - webkit_web_view_load_committed, NULL, - "signal::icon-ready", - webkit_web_view_icon_ready, NULL, - "signal::load-progress-changed", - webkit_web_view_progress_changed, NULL, - "signal::load-finished", - webkit_web_view_load_finished, NULL, - "signal::title-changed", - webkit_web_view_title_changed, NULL, - "signal::status-bar-text-changed", - webkit_web_view_statusbar_text_changed, NULL, - "signal::hovering-over-link", - webkit_web_view_hovering_over_link, NULL, - "signal::button-press-event", - gtk_widget_button_press_event_after, NULL, - "signal::button-release-event", - gtk_widget_button_release_event, NULL, - "signal::scroll-event", - gtk_widget_scroll_event, NULL, - "signal::populate-popup", - webkit_web_view_populate_popup_cb, NULL, - NULL); - g_object_connect (web_frame, - "signal::load-done", - webkit_web_frame_load_done, web_view, - NULL); -} - -static void -midori_web_view_finalize (GObject* object) -{ - MidoriWebView* web_view; - WebKitWebFrame* web_frame; - - web_view = MIDORI_WEB_VIEW (object); - - if (web_view->icon) - g_object_unref (web_view->icon); - g_free (web_view->uri); - g_free (web_view->title); - g_free (web_view->statusbar_text); - g_free (web_view->link_uri); - g_object_unref (web_view->news_feeds); - - if (web_view->settings) - g_object_unref (web_view->settings); - - if (web_view->xbel_item) - katze_xbel_item_unref (web_view->xbel_item); - - web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)); - g_signal_handlers_disconnect_by_func (web_frame, - webkit_web_frame_load_done, web_view); - - G_OBJECT_CLASS (midori_web_view_parent_class)->finalize (object); -} - -static void -midori_web_view_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec) -{ - MidoriWebView* web_view = MIDORI_WEB_VIEW (object); - - switch (prop_id) - { - case PROP_URI: - { - const gchar* uri = g_value_get_string (value); - if (uri && *uri) - webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), uri); - break; - } - case PROP_TITLE: - katze_assign (web_view->title, g_value_dup_string (value)); - const gchar* title = midori_web_view_get_display_title (web_view); - if (web_view->tab_title) - { - gtk_label_set_text (GTK_LABEL (web_view->tab_title), title); - gtk_widget_set_tooltip_text (web_view->tab_title, title); - } - if (web_view->menu_item) - gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( - web_view->menu_item))), title); - if (web_view->xbel_item) - katze_xbel_item_set_title (web_view->xbel_item, title); - break; - case PROP_SETTINGS: - katze_object_assign (web_view->settings, g_value_get_object (value)); - g_object_ref (web_view->settings); - g_object_set (object, "WebKitWebView::settings", web_view->settings, NULL); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -midori_web_view_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) -{ - MidoriWebView* web_view = MIDORI_WEB_VIEW (object); - - switch (prop_id) - { - case PROP_URI: - g_value_set_string (value, web_view->uri); - break; - case PROP_TITLE: - g_value_set_string (value, web_view->title); - break; - case PROP_PROGRESS: - g_value_set_double (value, web_view->progress); - break; - case PROP_MLOAD_STATUS: - g_value_set_enum (value, web_view->load_status); - break; - case PROP_STATUSBAR_TEXT: - g_value_set_string (value, web_view->statusbar_text); - break; - case PROP_SETTINGS: - g_value_set_object (value, web_view->settings); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/** - * midori_web_view_new: - * - * Creates a new web view widget. - * - * Return value: a new #MidoriWebView - **/ -GtkWidget* -midori_web_view_new (void) -{ - MidoriWebView* web_view = g_object_new (MIDORI_TYPE_WEB_VIEW, - NULL); - - return GTK_WIDGET (web_view); -} - -/** - * midori_web_view_set_settings: - * @web_view: a #MidoriWebView - * @web_settings: a #MidoriWebSettings - * - * Assigns a settings instance to the web view. - **/ -void -midori_web_view_set_settings (MidoriWebView* web_view, - MidoriWebSettings* web_settings) -{ - g_object_set (web_view, "settings", web_settings, NULL); -} - -/** - * midori_web_view_get_proxy_menu_item: - * @web_view: a #MidoriWebView - * - * Retrieves a proxy menu item that is typically added to a Window menu - * and which on activation switches to the right window/ tab. - * - * The item is created on the first call and will be updated to reflect - * changes to the icon and title automatically. - * - * Note: The item is only valid as the web view is embedded in a #GtkNotebook. - * - * Return value: the proxy #GtkMenuItem or %NULL - **/ -GtkWidget* -midori_web_view_get_proxy_menu_item (MidoriWebView* web_view) -{ - const gchar* title; - - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); - - if (!web_view->menu_item) - { - title = midori_web_view_get_display_title (web_view); - web_view->menu_item = sokoke_image_menu_item_new_ellipsized (title); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (web_view->menu_item), - gtk_image_new_from_pixbuf (web_view->icon)); - - g_signal_connect (web_view->menu_item, "destroy", - G_CALLBACK (gtk_widget_destroyed), - &web_view->menu_item); - } - return web_view->menu_item; -} - -/** - * midori_web_view_get_proxy_tab_icon: - * @web_view: a #MidoriWebView - * - * Retrieves a proxy tab icon that is typically used in a tab label. - * - * The icon is created on the first call and will be updated to reflect - * loading progress and changes of the actual icon. - * - * Note: If a proxy tab label has been created before, this represents - * the existing icon used in the label. - * - * Return value: the proxy #GtkImage - **/ -GtkWidget* -midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - - if (!web_view->tab_icon) - { - web_view->tab_icon = katze_throbber_new (); - katze_throbber_set_static_pixbuf (KATZE_THROBBER (web_view->tab_icon), - web_view->icon); - - g_signal_connect (web_view->tab_icon, "destroy", - G_CALLBACK (gtk_widget_destroyed), - &web_view->tab_icon); - } - return web_view->tab_icon; -} - -/** - * midori_web_view_get_proxy_tab_title: - * @web_view: a #MidoriWebView - * - * Retrieves a proxy tab title that is typically used as the label - * of a #GtkNotebook page. - * - * The title is created on the first call and will be updated to - * reflect changes automatically. - * - * Return value: the proxy #GtkLabel - **/ -GtkWidget* -midori_web_view_get_proxy_tab_title (MidoriWebView* web_view) -{ - const gchar* title; - - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - - if (!web_view->tab_title) - { - title = midori_web_view_get_display_title (web_view); - web_view->tab_title = gtk_label_new (title); - - g_signal_connect (web_view->tab_title, "destroy", - G_CALLBACK (gtk_widget_destroyed), - &web_view->tab_title); - } - return web_view->tab_title; -} - -/** - * midori_web_view_get_proxy_xbel_item: - * @web_view: a #MidoriWebView - * - * Retrieves a proxy xbel item that can be used for bookmark storage as - * well as session management. - * - * The item is created on the first call and will be updated to reflect - * changes to the title and href automatically. - * - * Note: Currently the item is always a bookmark, but this might change - * in the future. - * - * Return value: the proxy #KatzeXbelItem - **/ -KatzeXbelItem* -midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view) -{ - const gchar* uri; - const gchar* title; - - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - - if (!web_view->xbel_item) - { - web_view->xbel_item = katze_xbel_bookmark_new (); - uri = midori_web_view_get_display_uri (web_view); - katze_xbel_bookmark_set_href (web_view->xbel_item, uri); - title = midori_web_view_get_display_title (web_view); - katze_xbel_item_set_title (web_view->xbel_item, title); - } - return web_view->xbel_item; -} - -/** - * midori_web_view_load_status: - * @web_view: a #MidoriWebView - * - * Determines the current loading status of a page. - * - * Return value: the current #MidoriLoadStatus - **/ -MidoriLoadStatus -midori_web_view_get_load_status (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), MIDORI_LOAD_FINISHED); - - return web_view->load_status; -} - -/** - * midori_web_view_get_progress: - * @web_view: a #MidoriWebView - * - * Retrieves the current loading progress as - * a fraction between 0.0 and 1.0. - * - * Return value: the current loading progress - **/ -gdouble -midori_web_view_get_progress (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), 0.0); - - return web_view->progress; -} - -/** - * midori_web_view_get_display_uri: - * @web_view: a #MidoriWebView - * - * Retrieves a string that is suitable for displaying, particularly an - * empty URI is represented as "". - * - * You can assume that the string is not %NULL. - * - * Return value: an URI string - **/ -const gchar* -midori_web_view_get_display_uri (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), ""); - - return web_view->uri ? web_view->uri : ""; -} - -/** - * midori_web_view_get_display_title: - * @web_view: a #MidoriWebView - * - * Retrieves a string that is suitable for displaying as a title. Most of the - * time this will be the title or the current URI. - * - * You can assume that the string is not %NULL. - * - * Return value: a title string - **/ -const gchar* -midori_web_view_get_display_title (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), "about:blank"); - - if (web_view->title) - return web_view->title; - if (web_view->uri) - return web_view->uri; - return "about:blank"; -} - -/** - * midori_web_view_get_link_uri: - * @web_view: a #MidoriWebView - * - * Retrieves the uri of the currently focused link, particularly while the - * mouse hovers a link or a context menu is being opened. - * - * Return value: an URI string, or %NULL if there is no link focussed - **/ -const gchar* -midori_web_view_get_link_uri (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - - return web_view->link_uri; -} - -/** - * midori_web_view_get_news_feeds: - * @web_view: a #MidoriWebView - * - * Retrieves a list of news feeds for the current page - * or %NULL if there are no feeds at all. - * - * Return value: a #KatzeArray, or %NULL - **/ -KatzeArray* -midori_web_view_get_news_feeds (MidoriWebView* web_view) -{ - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), NULL); - - if (!katze_array_is_empty (web_view->news_feeds)) - return web_view->news_feeds; - return NULL; -} - -/** - * midori_web_view_has_selection: - * @web_view: a #MidoriWebView - * - * Determines whether something on the page is selected. - * - * By contrast to webkit_web_view_has_selection() this - * returns %FALSE if there is a selection that - * effectively only consists of whitespace. - * - * Return value: %TRUE if effectively there is a selection - **/ -gboolean -midori_web_view_has_selection (MidoriWebView* web_view) -{ - gchar* text; - - g_return_val_if_fail (MIDORI_IS_WEB_VIEW (web_view), FALSE); - - text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); - if (text && *text) - { - g_free (text); - return TRUE; - } - g_free (text); - return FALSE; -} diff --git a/midori/midori-webview.h b/midori/midori-webview.h deleted file mode 100644 index 8773c1e4..00000000 --- a/midori/midori-webview.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_WEB_VIEW_H__ -#define __MIDORI_WEB_VIEW_H__ - -#include "midori-websettings.h" - -#include -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_WEB_VIEW \ - (midori_web_view_get_type ()) -#define MIDORI_WEB_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_WEB_VIEW, MidoriWebView)) -#define MIDORI_WEB_VIEW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_WEB_VIEW, MidoriWebViewClass)) -#define MIDORI_IS_WEB_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_WEB_VIEW)) -#define MIDORI_IS_WEB_VIEW_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_WEB_VIEW)) -#define MIDORI_WEB_VIEW_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_WEB_VIEW, MidoriWebViewClass)) - -typedef struct _MidoriWebView MidoriWebView; -typedef struct _MidoriWebViewClass MidoriWebViewClass; - -struct _MidoriWebViewClass -{ - WebKitWebViewClass parent_class; - - /* Signals */ - void - (*icon_ready) (MidoriWebView* web_view, - GdkPixbuf* icon); - void - (*news_feed_ready) (MidoriWebView* web_view, - const gchar* href, - const gchar* type, - const gchar* title); - void - (*load_done) (MidoriWebView* web_view, - WebKitWebFrame* frame); - void - (*element_motion) (MidoriWebView* web_view, - const gchar* link_uri); - void - (*close) (MidoriWebView* web_view); - void - (*new_tab) (MidoriWebView* web_view, - const gchar* uri); - void - (*new_window) (MidoriWebView* web_view, - const gchar* uri); -}; - -typedef enum -{ - MIDORI_LOAD_PROVISIONAL, - MIDORI_LOAD_COMMITTED, - MIDORI_LOAD_FINISHED -} MidoriLoadStatus; - -GType -midori_load_status_get_type (void) G_GNUC_CONST; - -#define MIDORI_TYPE_LOAD_STATUS \ - (midori_load_status_get_type ()) - -GType -midori_web_view_get_type (void); - -GtkWidget* -midori_web_view_new (void); - -void -midori_web_view_set_settings (MidoriWebView* web_view, - MidoriWebSettings* web_settings); - -GtkWidget* -midori_web_view_get_proxy_menu_item (MidoriWebView* web_view); - -GtkWidget* -midori_web_view_get_proxy_tab_icon (MidoriWebView* web_view); - -GtkWidget* -midori_web_view_get_proxy_tab_title (MidoriWebView* web_view); - -KatzeXbelItem* -midori_web_view_get_proxy_xbel_item (MidoriWebView* web_view); - -gdouble -midori_web_view_get_progress (MidoriWebView* web_view); - -MidoriLoadStatus -midori_web_view_get_load_status (MidoriWebView* web_view); - -const gchar* -midori_web_view_get_display_uri (MidoriWebView* web_view); - -const gchar* -midori_web_view_get_display_title (MidoriWebView* web_view); - -const gchar* -midori_web_view_get_link_uri (MidoriWebView* web_view); - -KatzeArray* -midori_web_view_get_news_feeds (MidoriWebView* web_view); - -gboolean -midori_web_view_has_selection (MidoriWebView* web_view); - -G_END_DECLS - -#endif /* __MIDORI_WEB_VIEW_H__ */ diff --git a/midori/sokoke.c b/midori/sokoke.c index 9af538b5..4efd01c8 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -24,6 +24,32 @@ #include #include +/** + * sokoke_remember_argv0: + * @argv0: the contents of argv[0] or %NULL + * + * Stores or retrieves the value of argv[0]. + * + * Call it with a string for argv0 to store. + * + * Passing %NULL for argv0 will preserve + * a previously stored value. + * + * Return value: the contents of argv[0] or %NULL + **/ +const gchar* +sokoke_remember_argv0 (const gchar* argv0) +{ + static const gchar* remembered_argv0 = NULL; + + if (argv0) + remembered_argv0 = argv0; + + g_return_val_if_fail (remembered_argv0 != NULL, NULL); + + return remembered_argv0; +} + static void error_dialog (const gchar* short_message, const gchar* detailed_message) @@ -260,9 +286,10 @@ sokoke_widget_popup (GtkWidget* widget, event_time = gtk_get_current_event_time (); } - if (!gtk_menu_get_attach_widget(menu)) + if (!gtk_menu_get_attach_widget (menu)) gtk_menu_attach_to_widget (menu, widget, NULL); + if (widget) { SokokePopupInfo info = { widget, pos }; @@ -350,7 +377,7 @@ sokoke_superuser_warning_new (void) gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, >K_WIDGET (label)->style->fg[GTK_STATE_SELECTED]); gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER(hbox), GTK_WIDGET (label)); + gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (label)); gtk_widget_show (hbox); return hbox; } @@ -399,7 +426,7 @@ sokoke_on_entry_focus_in_event (GtkEntry* entry, if (has_default) { gtk_entry_set_text (entry, ""); - g_object_set_data (G_OBJECT(entry), "sokoke_has_default", + g_object_set_data (G_OBJECT (entry), "sokoke_has_default", GINT_TO_POINTER (0)); sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_NORMAL); @@ -418,7 +445,7 @@ sokoke_on_entry_focus_out_event (GtkEntry* entry, const gchar* default_text = (const gchar*)g_object_get_data ( G_OBJECT (entry), "sokoke_default_text"); gtk_entry_set_text (entry, default_text); - g_object_set_data (G_OBJECT(entry), + g_object_set_data (G_OBJECT (entry), "sokoke_has_default", GINT_TO_POINTER (1)); sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC); diff --git a/midori/sokoke.h b/midori/sokoke.h index c40ba2bd..46edc48e 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -19,6 +19,9 @@ /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON +const gchar* +sokoke_remember_argv0 (const gchar* argv0); + gboolean sokoke_spawn_program (const gchar* command, const gchar* argument); From b76b0fa04eb670cb86c0615d7cabb01681cf26c2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 26 Sep 2008 23:39:39 +0200 Subject: [PATCH 0333/2970] Remove Manage Bookmarks item --- midori/midori-browser.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 91c2a9bb..4ceba146 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2462,9 +2462,6 @@ static const GtkActionEntry entries[] = { { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, - { "BookmarksManage", NULL, - N_("_Manage Bookmarks"), "b", - N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, { "BookmarkOpen", GTK_STOCK_OPEN, NULL, "", N_("Open the selected bookmark"), G_CALLBACK (_action_bookmark_open_activate) }, @@ -2665,7 +2662,6 @@ static const gchar* ui_markup = "

" "" "" - "" "" /* Bookmarks shall be appended here */ "" From 213ae2f74ab9e3103ba65e350ba99a20f918bb1a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 28 Sep 2008 11:00:31 +0200 Subject: [PATCH 0334/2970] Fix Back and Forward sensitivity --- midori/midori-view.c | 59 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 14986c9b..aa17c8dd 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -57,6 +57,8 @@ struct _MidoriView gboolean can_copy_clipboard; gboolean can_paste_clipboard; gfloat zoom_level; + gboolean can_go_back; + gboolean can_go_forward; MidoriWebSettings* settings; GtkWidget* web_view; gboolean window_object_cleared; @@ -564,7 +566,8 @@ static void midori_view_notify_load_status_cb (MidoriView* view, GParamSpec pspec) { - g_object_get (G_OBJECT (view), "load-status", &view->load_status, NULL); + view->can_go_back = midori_view_can_go_back (view); + view->can_go_forward = midori_view_can_go_forward (view); if (midori_view_is_socket (view)) { @@ -574,7 +577,11 @@ midori_view_notify_load_status_cb (MidoriView* view, } if (midori_view_is_plug (view)) + { send_command (view, "load-status", int_to_str (view->load_status)); + send_command (view, "can-go-back", int_to_str (view->can_go_back)); + send_command (view, "can-go-forward", int_to_str (view->can_go_forward)); + } if (!midori_view_is_plug (view)) if (view->load_status == MIDORI_LOAD_COMMITTED) @@ -585,8 +592,6 @@ static void midori_view_notify_progress_cb (MidoriView* view, GParamSpec pspec) { - g_object_get (G_OBJECT (view), "progress", &view->progress, NULL); - if (midori_view_is_plug (view)) send_command (view, "progress", float_to_str (view->progress)); } @@ -675,6 +680,14 @@ receive_status (MidoriView* view, view->zoom_level = atof (&command[11]); g_object_notify (G_OBJECT (view), "zoom-level"); } + else if (!strncmp (command, "can-go-back ", 12)) + { + view->can_go_back = atoi (&command[12]); + } + else if (!strncmp (command, "can-go-forward ", 15)) + { + view->can_go_forward = atoi (&command[15]); + } else if (!strncmp (command, "statusbar-text ", 15)) { g_object_set (view, "statusbar-text", &command[15], NULL); @@ -2347,8 +2360,6 @@ midori_view_can_##what (MidoriView* view) \ can_do (zoom_in) can_do (zoom_out) can_do (reload) -can_do (go_back) -can_do (go_forward) can_do (print) #if HAVE_GIO can_do (view_source) @@ -2398,6 +2409,25 @@ midori_view_stop_loading (MidoriView* view) webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); } +/** + * midori_view_can_go_back + * @view: a #MidoriView + * + * Determines whether the view can go back. + **/ +gboolean +midori_view_can_go_back (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_socket (view)) + return view->can_go_back; + else if (view->web_view) + return webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (view->web_view)); + else + return FALSE; +} + /** * midori_view_go_back * @view: a #MidoriView @@ -2415,6 +2445,25 @@ midori_view_go_back (MidoriView* view) webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view)); } +/** + * midori_view_can_go_forward + * @view: a #MidoriView + * + * Determines whether the view can go forward. + **/ +gboolean +midori_view_can_go_forward (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + if (midori_view_is_socket (view)) + return view->can_go_forward; + else if (view->web_view) + return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (view->web_view)); + else + return FALSE; +} + /** * midori_view_go_forward * @view: a #MidoriView From b41c13b8fa4134f5f198925ac54f3c755b388200 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 28 Sep 2008 16:29:41 +0200 Subject: [PATCH 0335/2970] Make Find work again, and disable it for source tabs --- midori/midori-browser.c | 113 ++++++++++++++------------------ midori/midori-view.c | 139 +++++++++++++++++++++++++++++++++++++++- midori/midori-view.h | 18 ++++++ 3 files changed, 203 insertions(+), 67 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4ceba146..a6d52b81 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -225,6 +225,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_view_can_find (MIDORI_VIEW (view))); /* _action_set_sensitive (browser, "FindQuick", midori_view_can_find (MIDORI_VIEW (view))); */ + gtk_widget_set_sensitive (GTK_WIDGET (browser->find_highlight), + midori_view_can_find (MIDORI_VIEW (view))); action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); if (!loading) @@ -632,6 +634,29 @@ midori_view_new_window_cb (GtkWidget* view, g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); } +static void +midori_view_search_text_cb (GtkWidget* view, + gboolean found, + MidoriBrowser* browser) +{ + const gchar* text; + gboolean case_sensitive; + gboolean highlight; + + if (GTK_WIDGET_VISIBLE (browser->find)) + { + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), + GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); + text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); + case_sensitive = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); + midori_view_mark_text_matches (MIDORI_VIEW (view), text, case_sensitive); + highlight = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight)); + midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); + } +} + static gboolean midori_browser_tab_destroy_cb (GtkWidget* widget, MidoriBrowser* browser) @@ -723,6 +748,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_new_tab_cb, browser, "signal::new-window", midori_view_new_window_cb, browser, + "signal::search-text", + midori_view_search_text_cb, browser, "signal::add-bookmark", midori_view_add_bookmark_cb, browser, NULL); @@ -1235,56 +1262,16 @@ _action_select_all_activate (GtkAction* action, } } -static void -_midori_browser_tab_unmark_text_matches (MidoriBrowser* browser, - GtkWidget* widget) -{ - if (WEBKIT_IS_WEB_VIEW (widget)) - webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (widget)); -} - -static gboolean -_midori_browser_tab_search_text (MidoriBrowser* browser, - GtkWidget* widget, - const gchar* text, - gboolean case_sensitive, - gboolean forward) -{ - if (WEBKIT_IS_WEB_VIEW (widget)) - return webkit_web_view_search_text (WEBKIT_WEB_VIEW (widget), - text, case_sensitive, forward, TRUE); - return FALSE; -} - -static void -_midori_browser_tab_mark_text_matches (MidoriBrowser* browser, - GtkWidget* widget, - const gchar* text, - gboolean case_sensitive) -{ - if (WEBKIT_IS_WEB_VIEW (widget)) - webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (widget), - text, case_sensitive, 0); -} - -static void -_midori_browser_tab_set_highlight_text_matches (MidoriBrowser* browser, - GtkWidget* widget, - gboolean highlight) -{ - if (WEBKIT_IS_WEB_VIEW (widget)) - webkit_web_view_set_highlight_text_matches ( - WEBKIT_WEB_VIEW (widget), highlight); -} - static void _action_find_activate (GtkAction* action, MidoriBrowser* browser) { + GtkWidget* view; + if (GTK_WIDGET_VISIBLE (browser->find)) { - GtkWidget* widget = midori_browser_get_current_tab (browser); - _midori_browser_tab_unmark_text_matches (browser, widget); + view = midori_browser_get_current_tab (browser); + midori_view_unmark_text_matches (MIDORI_VIEW (view)); gtk_toggle_tool_button_set_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight), FALSE); gtk_widget_hide (browser->find); @@ -1303,26 +1290,18 @@ static void _midori_browser_find (MidoriBrowser* browser, gboolean forward) { - const gchar* text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); - const gboolean case_sensitive = gtk_toggle_tool_button_get_active ( + const gchar* text; + gboolean case_sensitive; + GtkWidget* view; + + text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); + case_sensitive = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); - GtkWidget* widget = midori_browser_get_current_tab (browser); + view = midori_browser_get_current_tab (browser); + if (GTK_WIDGET_VISIBLE (browser->find)) - _midori_browser_tab_unmark_text_matches (browser, widget); - gboolean found = _midori_browser_tab_search_text (browser, widget, - text, case_sensitive, forward); - if (GTK_WIDGET_VISIBLE (browser->find)) - { - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), - GTK_ICON_ENTRY_PRIMARY, - (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); - _midori_browser_tab_mark_text_matches (browser, widget, - text, case_sensitive); - const gboolean highlight = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight)); - _midori_browser_tab_set_highlight_text_matches (browser, widget, - highlight); - } + midori_view_unmark_text_matches (MIDORI_VIEW (view)); + midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); } static void @@ -1343,10 +1322,12 @@ static void _find_highlight_toggled (GtkToggleToolButton* toolitem, MidoriBrowser* browser) { - GtkWidget* widget = midori_browser_get_current_tab (browser); - const gboolean highlight = gtk_toggle_tool_button_get_active (toolitem); - _midori_browser_tab_set_highlight_text_matches (browser, widget, - highlight); + GtkWidget* view; + gboolean highlight; + + view = midori_browser_get_current_tab (browser); + highlight = gtk_toggle_tool_button_get_active (toolitem); + midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index aa17c8dd..b1f57716 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -119,6 +119,7 @@ enum { CONSOLE_MESSAGE, NEW_TAB, NEW_WINDOW, + SEARCH_TEXT, ADD_BOOKMARK, LAST_SIGNAL @@ -231,6 +232,17 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + signals[SEARCH_TEXT] = g_signal_new ( + "search-text", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, + G_TYPE_BOOLEAN); + signals[ADD_BOOKMARK] = g_signal_new ( "add-bookmark", G_TYPE_FROM_CLASS (class), @@ -385,7 +397,6 @@ float_to_str (gfloat in) return out; } - static void send_command (MidoriView* view, const gchar* command, @@ -642,6 +653,16 @@ midori_view_new_window_cb (MidoriView* view, send_command (view, "new-window", uri); } +static void +midori_view_search_text_cb (MidoriView* view, + gboolean found) +{ + if (!midori_view_is_plug (view)) + return; + + send_command (view, "search-text", int_to_str (found)); +} + static void midori_view_add_bookmark_cb (MidoriView* view, const gchar* uri) @@ -708,6 +729,10 @@ receive_status (MidoriView* view, { g_signal_emit (view, signals[NEW_WINDOW], 0, &command[11]); } + else if (!strncmp (command, "search-text ", 12)) + { + g_signal_emit (view, signals[SEARCH_TEXT], 0, atoi (&command[12])); + } else if (!strncmp (command, "add-bookmark ", 13)) { g_signal_emit (view, signals[ADD_BOOKMARK], 0, &command[13]); @@ -749,6 +774,18 @@ receive_command (MidoriView* view, midori_view_go_forward (view); else if (!strncmp (command, "print", 5)) midori_view_print (view); + else if (!strncmp (command, "unmark-matches", 14)) + midori_view_unmark_text_matches (view); + else if (!strncmp (command, "search-text ", 12)) + /* (forward, case_sensitive, text) => (text, case_sensitive, forward) */ + midori_view_search_text (view, &command[16], + atoi (&command[14]), atoi (&command[12])); + else if (!strncmp (command, "mark-matches ", 13)) + /* (case_sensitive, text) => (text, case_sensitive) */ + midori_view_mark_text_matches (view, &command[17], + atoi (&command[15])); + else if (!strncmp (command, "hl-matches ", 11)) + midori_view_set_highlight_text_matches (view, atoi (&command[11])); else if (!strncmp (command, "download-manager ", 17)) { katze_assign (view->download_manager, g_strdup (&command[17])); @@ -1520,6 +1557,8 @@ midori_view_init (MidoriView* view) midori_view_new_tab_cb, NULL, "signal::new-window", midori_view_new_window_cb, NULL, + "signal::search-text", + midori_view_search_text_cb, NULL, "signal::add-bookmark", midori_view_add_bookmark_cb, NULL, NULL); @@ -2498,3 +2537,101 @@ midori_view_print (MidoriView* view) webkit_web_view_execute_script ( WEBKIT_WEB_VIEW (view->web_view), "print();"); } + +/** + * midori_view_unmark_text_matches + * @view: a #MidoriView + * + * Unmarks the text matches in the view. + **/ +void +midori_view_unmark_text_matches (MidoriView* view) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "unmark-matches", NULL); + else + webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (view->web_view)); +} + +/** + * midori_view_search_text + * @view: a #MidoriView + * @text: a string + * @case_sensitive: case sensitivity + * @forward: whether to search forward + * + * Searches a text within the view. + **/ +void +midori_view_search_text (MidoriView* view, + const gchar* text, + gboolean case_sensitive, + gboolean forward) +{ + gchar* data; + + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + { + /* (text, case_sensitive, forward) => (forward, case_sensitive, text) */ + data = g_strdup_printf ("%d %d %s", forward, case_sensitive, text); + send_command (view, "search-text", data); + g_free (data); + } + else + g_signal_emit (view, signals[SEARCH_TEXT], 0, + webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view), + text, case_sensitive, forward, TRUE)); +} + +/** + * midori_view_mark_text_matches + * @view: a #MidoriView + * @text: a string + * @case_sensitive: case sensitivity + * + * Marks all text matches within the view. + **/ +void +midori_view_mark_text_matches (MidoriView* view, + const gchar* text, + gboolean case_sensitive) +{ + gchar* data; + + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + { + /* (text, case_sensitive) => (case_sensitive, text) */ + data = g_strdup_printf ("%d %s", case_sensitive, text); + send_command (view, "mark-matches", data); + g_free (data); + } + else + webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (view->web_view), + text, case_sensitive, 0); +} + +/** + * midori_view_set_highlight_text_matches + * @view: a #MidoriView + * @highlight: whether to highlight matches + * + * Whether to highlight all matches within the view. + **/ +void +midori_view_set_highlight_text_matches (MidoriView* view, + gboolean highlight) +{ + g_return_if_fail (MIDORI_IS_VIEW (view)); + + if (midori_view_is_socket (view)) + send_command (view, "hl-matches", int_to_str (highlight)); + else + webkit_web_view_set_highlight_text_matches ( + WEBKIT_WEB_VIEW (view->web_view), highlight); +} diff --git a/midori/midori-view.h b/midori/midori-view.h index 96b5d22e..b052266a 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -156,6 +156,24 @@ midori_view_can_view_source (MidoriView* view); gboolean midori_view_can_find (MidoriView* view); +void +midori_view_unmark_text_matches (MidoriView* view); + +void +midori_view_search_text (MidoriView* view, + const gchar* text, + gboolean case_sensitive, + gboolean forward); + +void +midori_view_mark_text_matches (MidoriView* view, + const gchar* text, + gboolean case_sensitive); + +void +midori_view_set_highlight_text_matches (MidoriView* view, + gboolean highlight); + G_END_DECLS #endif /* __MIDORI_VIEW_H__ */ From 353533c8a76722b357c46691844b76a6b26ca35f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 30 Sep 2008 20:17:20 +0200 Subject: [PATCH 0336/2970] Fix running standalone javascripts --- midori/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index fac85f03..e4948b59 100644 --- a/midori/main.c +++ b/midori/main.c @@ -538,6 +538,8 @@ main (int argc, }; GtkWidget* view; GtkWidget* plug; + JSGlobalContextRef js_context; + gchar* exception; MidoriStartup load_on_startup; gchar* homepage; KatzeArray* search_engines; @@ -601,15 +603,15 @@ main (int argc, } /* Standalone gjs support */ - if (argc > 1 && argv[1] && g_str_has_suffix (argv[1], ".js")) + if (uris && uris[0] && g_str_has_suffix (uris[0], ".js")) { - JSGlobalContextRef js_context = gjs_global_context_new (); - gchar* exception = NULL; - gjs_script_from_file (js_context, argv[1], &exception); + js_context = gjs_global_context_new (); + exception = NULL; + gjs_script_from_file (js_context, uris[0], &exception); JSGlobalContextRelease (js_context); if (!exception) return 0; - printf ("%s - Exception: %s\n", argv[1], exception); + printf ("%s - Exception: %s\n", uris[0], exception); return 1; } @@ -823,7 +825,7 @@ main (int argc, (GWeakNotify)(midori_browser_weak_notify_cb), browser); /* Load extensions */ - JSGlobalContextRef js_context = gjs_global_context_new (); + js_context = gjs_global_context_new (); /* FIXME: We want to honor system installed addons as well */ gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, "extensions", NULL); From fb320cc0b6cd0e94ae16d28ab4af255baff4799c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 1 Oct 2008 04:00:16 +0200 Subject: [PATCH 0337/2970] Finally obsolete KatzeXbelItem --- katze/Makefile.am | 3 +- katze/katze-array.c | 14 +- katze/katze-item.c | 38 ++ katze/katze-item.h | 9 + katze/katze-xbel.c | 906 ---------------------------------------- katze/katze-xbel.h | 166 -------- katze/katze.h | 1 - midori/main.c | 303 +++++++++++--- midori/midori-app.c | 4 +- midori/midori-browser.c | 361 ++++++++-------- midori/midori-browser.h | 4 - po/POTFILES.in | 4 +- 12 files changed, 493 insertions(+), 1320 deletions(-) delete mode 100644 katze/katze-xbel.c delete mode 100644 katze/katze-xbel.h diff --git a/katze/Makefile.am b/katze/Makefile.am index 16115148..8e6caa71 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -16,5 +16,4 @@ libkatze_la_SOURCES = \ katze-utils.c katze-utils.h \ katze-item.c katze-item.h \ katze-list.c katze-list.h \ - katze-array.c katze-array.h \ - katze-xbel.c katze-xbel.h + katze-array.c katze-array.h diff --git a/katze/katze-array.c b/katze/katze-array.c index 6f11f010..c62121e4 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -19,7 +19,7 @@ /** * SECTION:katze-array * @short_description: A type aware item container - * @see_also: #KatzeArray + * @see_also: #KatzeList * * #KatzeArray is a type aware container for items. */ @@ -46,7 +46,11 @@ _katze_array_add_item (KatzeList* list, gpointer item) { if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) + { g_object_ref (item); + if (KATZE_IS_ITEM (item)) + katze_item_set_parent (item, list); + } KATZE_LIST_CLASS (katze_array_parent_class)->add_item (list, item); } @@ -56,7 +60,11 @@ _katze_array_remove_item (KatzeList* list, { KATZE_LIST_CLASS (katze_array_parent_class)->remove_item (list, item); if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) + { + if (KATZE_IS_ITEM (item)) + katze_item_set_parent (item, NULL); g_object_unref (item); + } } static void @@ -149,6 +157,8 @@ katze_array_is_a (KatzeArray* array, * @item: a #GObject * * Adds an item to the array. + * + * If @item is a #KatzeItem its parent is set accordingly. **/ void katze_array_add_item (KatzeArray* array, @@ -167,6 +177,8 @@ katze_array_add_item (KatzeArray* array, * @item: a #GObject * * Removes an item from the array. + * + * If @item is a #KatzeItem its parent is unset accordingly. **/ void katze_array_remove_item (KatzeArray* array, diff --git a/katze/katze-item.c b/katze/katze-item.c index 1e9262b6..f71d8d05 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -374,3 +374,41 @@ katze_item_set_token (KatzeItem* item, katze_assign (item->token, g_strdup (token)); g_object_notify (G_OBJECT (item), "token"); } + +/** + * katze_item_get_parent: + * @item: a #KatzeItem + * + * Determines the parent of @item. + * + * Return value: the parent of the item + **/ +gpointer +katze_item_get_parent (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->parent; +} + +/** + * katze_item_set_parent: + * @item: a #KatzeItem + * @parent: the new parent + * + * Sets the parent of @item. + * + * This is intended for item container implementations and + * should not be used otherwise. + **/ +void +katze_item_set_parent (KatzeItem* item, + gpointer parent) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (parent) + g_object_ref (parent); + katze_object_assign (item->parent, parent); + /* g_object_notify (G_OBJECT (item), "parent"); */ +} diff --git a/katze/katze-item.h b/katze/katze-item.h index 8f138592..7a921c97 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -41,6 +41,8 @@ struct _KatzeItem gchar* uri; gchar* icon; gchar* token; + + KatzeItem* parent; }; struct _KatzeItemClass @@ -89,6 +91,13 @@ void katze_item_set_token (KatzeItem* item, const gchar* token); +gpointer +katze_item_get_parent (KatzeItem* item); + +void +katze_item_set_parent (KatzeItem* item, + gpointer parent); + G_END_DECLS #endif /* __MIDORI_WEB_ITEM_H__ */ diff --git a/katze/katze-xbel.c b/katze/katze-xbel.c deleted file mode 100644 index 3d4a3902..00000000 --- a/katze/katze-xbel.c +++ /dev/null @@ -1,906 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -/** - * TODO: - * - Support info > metadata, alias, added, modified, visited - * - Compatibility: The Nokia 770 *requires* metadata and folder - * - Compatibility: Kazehakase's bookmarks - * - Compatibility: Epiphany's bookmarks - * - XML Indentation - **/ - -#include "katze-xbel.h" - -#include -#include -#include -#include -#include - -#include "katze-utils.h" - -struct _KatzeXbelItem -{ - GObject parent_instance; - - guint refs; - KatzeXbelItemKind kind; - KatzeXbelItem* parent; - - GList* items; - gboolean folded; - gchar* title; - gchar* desc; - gchar* href; -}; - -G_DEFINE_TYPE (KatzeXbelItem, katze_xbel_item, G_TYPE_OBJECT) - -static void -katze_xbel_item_finalize (GObject* object); - -static void -katze_xbel_item_class_init (KatzeXbelItemClass* class) -{ - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = katze_xbel_item_finalize; -} - -static void -katze_xbel_item_init (KatzeXbelItem* item) -{ - item->parent = NULL; -} - -static void -katze_xbel_item_finalize (GObject* object) -{ - KatzeXbelItem* item = KATZE_XBEL_ITEM (object); - - if (item->parent) - katze_xbel_folder_remove_item (item->parent, item); - - if (item->kind == KATZE_XBEL_ITEM_KIND_FOLDER) - { - guint n = katze_xbel_folder_get_n_items (item); - guint i; - for (i = 0; i < n; i++) - { - KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); - _item->parent = NULL; - katze_xbel_item_unref (_item); - } - g_list_free (item->items); - } - if (item->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) - { - g_free (item->title); - g_free (item->desc); - } - if (item->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) - g_free (item->href); - - G_OBJECT_CLASS (katze_xbel_item_parent_class)->finalize (object); -} - -/* Create a new item of a certain type */ -static KatzeXbelItem* -katze_xbel_item_new (KatzeXbelItemKind kind) -{ - KatzeXbelItem* item = g_object_new (KATZE_TYPE_XBEL_ITEM, NULL); - - item->kind = kind; - - if (kind == KATZE_XBEL_ITEM_KIND_FOLDER) - { - item->items = NULL; - item->folded = TRUE; - } - if (kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) - { - item->title = NULL; - item->desc = NULL; - } - if (kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) - item->href = g_strdup (""); - return item; -} - -/** - * katze_xbel_bookmark_new: - * - * Create a new empty bookmark. - * - * Return value: a newly allocated bookmark - **/ -KatzeXbelItem* -katze_xbel_bookmark_new (void) -{ - return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_BOOKMARK); -} - -static KatzeXbelItem* -katze_xbel_bookmark_from_xmlNodePtr (xmlNodePtr cur) -{ - g_return_val_if_fail (cur, NULL); - - KatzeXbelItem* bookmark = katze_xbel_bookmark_new (); - xmlChar* key = xmlGetProp (cur, (xmlChar*)"href"); - katze_xbel_bookmark_set_href (bookmark, (gchar*)key); - cur = cur->xmlChildrenNode; - while (cur) - { - if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) - { - xmlChar* key = xmlNodeGetContent (cur); - katze_xbel_item_set_title (bookmark, g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) - { - xmlChar* key = xmlNodeGetContent (cur); - katze_xbel_item_set_desc (bookmark, g_strstrip ((gchar*)key)); - } - cur = cur->next; - } - return bookmark; -} - -/** - * katze_katze_xbel_separator_new: - * - * Create a new separator. - * - * The returned item must be freed eventually. - * - * Return value: a newly allocated separator. - **/ -KatzeXbelItem* -katze_xbel_separator_new (void) -{ - return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_SEPARATOR); -} - -/** - * katze_xbel_folder_new: - * - * Create a new empty folder. - * - * The returned item must be freed eventually. - * - * Return value: a newly allocated folder. - **/ -KatzeXbelItem* -katze_xbel_folder_new (void) -{ - return katze_xbel_item_new (KATZE_XBEL_ITEM_KIND_FOLDER); -} - -/* Create a folder from an xmlNodePtr */ -static KatzeXbelItem* -katze_xbel_folder_from_xmlNodePtr (xmlNodePtr cur) -{ - g_return_val_if_fail (cur, NULL); - - KatzeXbelItem* folder = katze_xbel_folder_new (); - - xmlChar* key = xmlGetProp (cur, (xmlChar*)"folded"); - if (key) - { - if (!g_ascii_strncasecmp ((gchar*)key, "yes", 3)) - folder->folded = TRUE; - else if (!g_ascii_strncasecmp ((gchar*)key, "no", 2)) - folder->folded = FALSE; - else - g_warning ("XBEL: Unknown value for folded."); - xmlFree (key); - } - cur = cur->xmlChildrenNode; - while (cur) - { - if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) - { - xmlChar* key = xmlNodeGetContent (cur); - katze_assign (folder->title, g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) - { - xmlChar* key = xmlNodeGetContent (cur); - katze_assign (folder->desc, g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) - { - KatzeXbelItem* item = katze_xbel_folder_from_xmlNodePtr (cur); - item->parent = folder; - folder->items = g_list_prepend (folder->items, item); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) - { - KatzeXbelItem* item = katze_xbel_bookmark_from_xmlNodePtr (cur); - item->parent = folder; - folder->items = g_list_prepend (folder->items, item); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) - { - KatzeXbelItem* item = katze_xbel_separator_new (); - item->parent = folder; - folder->items = g_list_prepend (folder->items, item); - } - cur = cur->next; - } - /* Prepending and reversing is faster than appending */ - folder->items = g_list_reverse (folder->items); - return folder; -} - -/* Loads the contents from an xmlNodePtr into a folder. */ -static gboolean -katze_xbel_folder_from_xmlDocPtr (KatzeXbelItem* folder, - xmlDocPtr doc) -{ - g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); - g_return_val_if_fail (doc, FALSE); - - xmlNodePtr cur = xmlDocGetRootElement (doc); - xmlChar* version = xmlGetProp (cur, (xmlChar*)"version"); - if (xmlStrcmp (version, (xmlChar*)"1.0")) - g_warning ("XBEL version is not 1.0."); - xmlFree (version); - - katze_assign (folder->title, (gchar*)xmlGetProp (cur, (xmlChar*)"title")); - katze_assign (folder->desc, (gchar*)xmlGetProp (cur, (xmlChar*)"desc")); - if ((cur = xmlDocGetRootElement (doc)) == NULL) - { - /* Empty document */ - return FALSE; - } - if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) - { - /* Wrong document kind */ - return FALSE; - } - cur = cur->xmlChildrenNode; - while (cur) - { - KatzeXbelItem* item = NULL; - if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) - item = katze_xbel_folder_from_xmlNodePtr (cur); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) - item = katze_xbel_bookmark_from_xmlNodePtr (cur); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) - item = katze_xbel_separator_new (); - /*else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) - item = katze_xbel_parse_info (xbel, cur);*/ - if (item) - { - item->parent = folder; - folder->items = g_list_prepend (folder->items, item); - } - cur = cur->next; - } - /* Prepending and reversing is faster than appending */ - folder->items = g_list_reverse (folder->items); - return TRUE; -} - -/** - * katze_xbel_item_ref: - * @item: a valid item - * - * Ref an KatzeXbelItem. - * - * Ref means that the reference count is increased by one. - * - * This has no effect on children of a folder. - **/ -void -katze_xbel_item_ref (KatzeXbelItem* item) -{ - g_return_if_fail (KATZE_IS_XBEL_ITEM (item)); - - g_object_ref (item); -} - -/** - * katze_xbel_item_unref: - * @item: a valid item - * - * Unref an KatzeXbelItem. If @item is a folder all of its children will also - * be unreffed automatically. - * - * Unref means that the reference count is decreased. If there are no - * references left, the memory will be freed and if needed removed from - * its containing folder. - **/ -void -katze_xbel_item_unref (KatzeXbelItem* item) -{ - g_return_if_fail (KATZE_IS_XBEL_ITEM (item)); - - g_object_unref (item); -} - -/** - * katze_xbel_item_copy: - * @item: the item to copy - * - * Copy an KatzeXbelItem. - * - * The returned item must be unreffed eventually. - * - * Return value: a copy of @item - **/ -KatzeXbelItem* -katze_xbel_item_copy (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); - - KatzeXbelItem* copy = katze_xbel_item_new (item->kind); - - if (katze_xbel_item_is_folder (item)) - { - guint n = katze_xbel_folder_get_n_items (item); - guint i; - for (i = 0; i < n; i++) - { - KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); - katze_xbel_folder_append_item (copy, katze_xbel_item_copy (_item)); - } - } - if (item->kind != KATZE_XBEL_ITEM_KIND_SEPARATOR) - { - katze_xbel_item_set_title (copy, item->title); - katze_xbel_item_set_desc (copy, item->desc); - } - if (item->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK) - katze_xbel_bookmark_set_href (copy, item->href); - return copy; -} - -/** - * katze_xbel_folder_append_item: - * @folder: a folder - * @item: the item to append - * - * Append the given item to a folder. - * - * The item is actually moved and must not be contained in another folder. - * - **/ -void -katze_xbel_folder_append_item (KatzeXbelItem* folder, - KatzeXbelItem* item) -{ - g_return_if_fail (!katze_xbel_item_get_parent (item)); - g_return_if_fail (katze_xbel_item_is_folder (folder)); - - folder->items = g_list_append (folder->items, item); - - item->parent = folder; -} - -/** - * katze_xbel_folder_prepend_item: - * @folder: a folder - * @item: the item to prepend - * - * Prepend the given item to a folder. - * - * The item is actually moved and must not be contained in another folder. - * - **/ -void -katze_xbel_folder_prepend_item (KatzeXbelItem* folder, - KatzeXbelItem* item) -{ - g_return_if_fail (!katze_xbel_item_get_parent (item)); - g_return_if_fail (katze_xbel_item_is_folder (folder)); - - folder->items = g_list_prepend (folder->items, item); - - item->parent = folder; -} - -/** - * katze_xbel_folder_remove_item: - * @folder: a folder - * @item: the item to remove - * - * Remove the given @item from a @folder. - **/ -void -katze_xbel_folder_remove_item (KatzeXbelItem* folder, - KatzeXbelItem* item) -{ - g_return_if_fail (KATZE_IS_XBEL_ITEM (item)); - g_return_if_fail (katze_xbel_item_get_parent(folder) != item); - - /* Fortunately we know that items are unique */ - folder->items = g_list_remove (folder->items, item); - - item->parent = NULL; -} - -/** - * katze_xbel_folder_get_n_items: - * @folder: a folder - * - * Retrieve the number of items contained in the given @folder. - * - * Return value: number of items - **/ -guint -katze_xbel_folder_get_n_items (KatzeXbelItem* folder) -{ - g_return_val_if_fail (katze_xbel_item_is_folder (folder), 0); - - return g_list_length (folder->items); -} - -/** - * katze_xbel_folder_get_nth_item: - * @folder: a folder - * @n: the index of an item - * - * Retrieve an item contained in the given @folder by its index. - * - * Return value: the item at the given index or %NULL - **/ -KatzeXbelItem* -katze_xbel_folder_get_nth_item (KatzeXbelItem* folder, - guint n) -{ - g_return_val_if_fail (katze_xbel_item_is_folder(folder), NULL); - - return (KatzeXbelItem*) g_list_nth_data (folder->items, n); -} - -/** - * katze_xbel_folder_is_empty: - * @folder: A folder. - * - * Determines wether or not a folder contains no items. This is significantly - * faster than katze_xbel_folder_get_n_items for this particular purpose. - * - * Return value: Wether the given @folder is folded. - **/ -gboolean -katze_xbel_folder_is_empty (KatzeXbelItem* folder) -{ - return !katze_xbel_folder_get_nth_item (folder, 0); -} - -/** - * katze_xbel_folder_get_folded: - * @folder: A folder. - * - * Determines wether or not a folder is folded. If a folder is not folded - * it should not be exposed in a user interface. - * - * New folders are folded by default. - * - * Return value: Wether the given @folder is folded. - **/ -gboolean -katze_xbel_folder_get_folded (KatzeXbelItem* folder) -{ - g_return_val_if_fail (katze_xbel_item_is_folder (folder), TRUE); - - return folder->folded; -} - -/** - * katze_xbel_item_get_kind: - * @item: A item. - * - * Determines the kind of an item. - * - * Return value: The kind of the given @item. - **/ -KatzeXbelItemKind -katze_xbel_item_get_kind (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), KATZE_XBEL_ITEM_KIND_BOOKMARK); - - return item->kind; -} - -/** - * katze_xbel_item_get_parent: - * @item: A valid item. - * - * Retrieves the parent folder of an item. - * - * Return value: The parent folder of the given @item or %NULL. - **/ -KatzeXbelItem* -katze_xbel_item_get_parent (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); - - return item->parent; -} - -/** - * katze_xbel_item_get_title: - * @item: A valid item. - * - * Retrieves the title of an item. - * - * Return value: The title of the given @item or %NULL. - **/ -G_CONST_RETURN gchar* -katze_xbel_item_get_title (KatzeXbelItem* item) -{ - g_return_val_if_fail (!katze_xbel_item_is_separator (item), NULL); - - return item->title; -} - -/** - * katze_xbel_item_get_desc: - * @item: A valid item. - * - * Retrieves the description of an item. - * - * Return value: The description of the @item or %NULL. - **/ -G_CONST_RETURN gchar* -katze_xbel_item_get_desc (KatzeXbelItem* item) -{ - g_return_val_if_fail (!katze_xbel_item_is_separator (item), NULL); - - return item->desc; -} - -/** - * katze_xbel_bookmark_get_href: - * @bookmark: A bookmark. - * - * Retrieves the uri of a bookmark. The value is guaranteed to not be %NULL. - * - * Return value: The uri of the @bookmark. - **/ -G_CONST_RETURN gchar* -katze_xbel_bookmark_get_href (KatzeXbelItem* bookmark) -{ - g_return_val_if_fail (katze_xbel_item_is_bookmark (bookmark), NULL); - - return bookmark->href; -} - -/** - * katze_xbel_item_is_bookmark: - * @item: A valid item. - * - * Determines wether or not an item is a bookmark. - * - * Return value: %TRUE if the @item is a bookmark. - **/ -gboolean -katze_xbel_item_is_bookmark (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), FALSE); - - return item->kind == KATZE_XBEL_ITEM_KIND_BOOKMARK; -} - -/** - * katze_xbel_item_is_separator: - * @item: A valid item. - * - * Determines wether or not an item is a separator. - * - * Return value: %TRUE if the @item is a separator. - **/ -gboolean katze_xbel_item_is_separator (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), FALSE); - - return item->kind == KATZE_XBEL_ITEM_KIND_SEPARATOR; -} - -/** - * katze_xbel_item_is_folder: - * @item: A valid item. - * - * Determines wether or not an item is a folder. - * - * Return value: %TRUE if the item is a folder. - **/ -gboolean -katze_xbel_item_is_folder (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), FALSE); - - return item->kind == KATZE_XBEL_ITEM_KIND_FOLDER; -} - -/** - * katze_xbel_folder_set_folded: - * @folder: A folder. - * @folded: TRUE if the folder is folded. - * - * Sets the foldedness of the @folder. - **/ -void -katze_xbel_folder_set_folded (KatzeXbelItem* folder, - gboolean folded) -{ - g_return_if_fail (katze_xbel_item_is_folder (folder)); - - folder->folded = folded; -} - -/** - * katze_xbel_item_set_title: - * @item: A valid item. - * @title: A string to use for the title. - * - * Sets the title of the @item. - **/ -void -katze_xbel_item_set_title (KatzeXbelItem* item, - const gchar* title) -{ - g_return_if_fail (!katze_xbel_item_is_separator (item)); - - katze_assign (item->title, g_strdup (title)); -} - -/** - * katze_xbel_item_set_desc: - * @item: A valid item. - * @title: A string to use for the description. - * - * Sets the description of the @item. - **/ -void -katze_xbel_item_set_desc (KatzeXbelItem* item, - const gchar* desc) -{ - g_return_if_fail (!katze_xbel_item_is_separator (item)); - - katze_assign (item->desc, g_strdup (desc)); -} - -/** - * katze_xbel_bookmark_set_href: - * @bookmark: A bookmark. - * @href: A string containing a valid uri. - * - * Sets the uri of the bookmark. - * - * The uri must not be %NULL. - * - * This uri is not currently validated in any way. This may change in the future. - **/ -void -katze_xbel_bookmark_set_href (KatzeXbelItem* bookmark, - const gchar* href) -{ - g_return_if_fail (katze_xbel_item_is_bookmark (bookmark)); - g_return_if_fail (href); - - katze_assign (bookmark->href, g_strdup (href)); -} - -gboolean -katze_xbel_folder_from_data (KatzeXbelItem* folder, - const gchar* data, - GError** error) -{ - g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); - g_return_val_if_fail (data, FALSE); - xmlDocPtr doc; - if((doc = xmlParseMemory (data, strlen (data))) == NULL) - { - /* No valid xml or broken encoding */ - *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); - return FALSE; - } - if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) - { - /* Parsing failed */ - xmlFreeDoc(doc); - *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); - return FALSE; - } - xmlFreeDoc(doc); - return TRUE; -} - -/** - * katze_xbel_folder_from_file: - * @folder: An empty folder. - * @file: A relative path to a file. - * @error: return location for a GError or %NULL - * - * Tries to load @file. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gboolean -katze_xbel_folder_from_file (KatzeXbelItem* folder, - const gchar* file, - GError** error) -{ - g_return_val_if_fail (katze_xbel_folder_is_empty (folder), FALSE); - g_return_val_if_fail (file, FALSE); - if (!g_file_test (file, G_FILE_TEST_EXISTS)) - { - /* File doesn't exist */ - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_NOENT, - _("File not found.")); - return FALSE; - } - xmlDocPtr doc; - if ((doc = xmlParseFile (file)) == NULL) - { - /* No valid xml or broken encoding */ - *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); - return FALSE; - } - if (!katze_xbel_folder_from_xmlDocPtr (folder, doc)) - { - /* Parsing failed */ - xmlFreeDoc (doc); - *error = g_error_new_literal (KATZE_XBEL_ERROR, KATZE_XBEL_ERROR_READ, - _("Malformed document.")); - return FALSE; - } - xmlFreeDoc (doc); - return TRUE; -} - -static gchar* -katze_xbel_xml_element (const gchar* name, - const gchar* value) -{ - if (!value) - return g_strdup (""); - gchar* valueEscaped = g_markup_escape_text (value, -1); - gchar* markup = g_strdup_printf ("<%s>%s\n", - name, valueEscaped, name); - g_free (valueEscaped); - return markup; -} - -gchar* -katze_xbel_item_to_data (KatzeXbelItem* item) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (item), NULL); - - gchar* markup = NULL; - switch (item->kind) - { - case KATZE_XBEL_ITEM_KIND_FOLDER: - { - GString* _markup = g_string_new (NULL); - guint n = katze_xbel_folder_get_n_items (item); - guint i; - for (i = 0; i < n; i++) - { - KatzeXbelItem* _item = katze_xbel_folder_get_nth_item (item, i); - gchar* item_markup = katze_xbel_item_to_data (_item); - g_string_append (_markup, item_markup); - g_free (item_markup); - } - gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); - gchar* title = katze_xbel_xml_element ("title", item->title); - gchar* desc = katze_xbel_xml_element ("desc", item->desc); - markup = g_strdup_printf ("\n%s%s%s\n", - folded ? folded : "", - title, desc, - g_string_free (_markup, FALSE)); - g_free (folded); - g_free (title); - g_free (desc); - break; - } - case KATZE_XBEL_ITEM_KIND_BOOKMARK: - { - gchar* href_escaped = g_markup_escape_text (item->href, -1); - gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); - g_free (href_escaped); - gchar* title = katze_xbel_xml_element ("title", item->title); - gchar* desc = katze_xbel_xml_element ("desc", item->desc); - markup = g_strdup_printf ("\n%s%s%s\n", - href, - title, desc, - ""); - g_free (href); - g_free (title); - g_free (desc); - break; - } - case KATZE_XBEL_ITEM_KIND_SEPARATOR: - markup = g_strdup ("\n"); - break; - default: - g_warning ("XBEL: Unknown item kind"); - } - return markup; -} - -static gchar* -katze_xbel_folder_to_data (KatzeXbelItem* folder, - gsize* length, - GError** error) -{ - g_return_val_if_fail (katze_xbel_item_is_folder (folder), FALSE); - - GString* inner_markup = g_string_new (NULL); - guint n = katze_xbel_folder_get_n_items (folder); - guint i; - for (i = 0; i < n; i++) - { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (folder, i); - gchar* sItem = katze_xbel_item_to_data (item); - g_string_append (inner_markup, sItem); - g_free (sItem); - } - gchar* title = katze_xbel_xml_element ("title", folder->title); - gchar* desc = katze_xbel_xml_element ("desc", folder->desc); - gchar* outer_markup; - outer_markup = g_strdup_printf ( - "%s%s\n%s%s%s\n", - "\n", - "\n", - title, - desc, - g_string_free (inner_markup, FALSE)); - g_free (title); - g_free (desc); - - if (length) - *length = strlen (outer_markup); - return outer_markup; -} - -/** - * katze_xbel_folder_to_file: - * @folder: A folder. - * @file: The destination filename. - * @error: return location for a GError or %NULL - * - * Write the contents of @folder to the specified file, creating it if necessary. - * - * Return value: %TRUE on success or %FALSE when an error occured. - **/ -gboolean -katze_xbel_folder_to_file (KatzeXbelItem* folder, - const gchar* file, - GError** error) -{ - g_return_val_if_fail (KATZE_IS_XBEL_ITEM (folder), FALSE); - g_return_val_if_fail (file, FALSE); - - gchar* data; - if (!(data = katze_xbel_folder_to_data (folder, NULL, error))) - return FALSE; - FILE* fp; - if (!(fp = fopen (file, "w"))) - { - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_ACCES, - _("Writing failed.")); - return FALSE; - } - fputs (data, fp); - fclose (fp); - g_free (data); - return TRUE; -} diff --git a/katze/katze-xbel.h b/katze/katze-xbel.h deleted file mode 100644 index 5631b217..00000000 --- a/katze/katze-xbel.h +++ /dev/null @@ -1,166 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __KATZE_XBEL_H__ -#define __KATZE_XBEL_H__ 1 - -#include - -G_BEGIN_DECLS - -#define KATZE_TYPE_XBEL_ITEM \ - (katze_xbel_item_get_type ()) -#define KATZE_XBEL_ITEM(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_XBEL_ITEM, KatzeXbelItem)) -#define KATZE_IS_XBEL_ITEM(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_XBEL_ITEM)) - -typedef struct _KatzeXbelItem KatzeXbelItem; -typedef struct _KatzeXbelItemClass KatzeXbelItemClass; - -struct _KatzeXbelItemClass -{ - GObjectClass parent_class; -}; - -#define KATZE_XBEL_ERROR g_quark_from_string("KATZE_XBEL_ERROR") - -typedef enum -{ - KATZE_XBEL_ERROR_INVALID_URI, /* Malformed uri */ - KATZE_XBEL_ERROR_INVALID_VALUE, /* Requested field not found */ - KATZE_XBEL_ERROR_URI_NOT_FOUND, /* Requested uri not found */ - KATZE_XBEL_ERROR_READ, /* Malformed document */ - KATZE_XBEL_ERROR_UNKNOWN_ENCODING, /* Parsed text was in an unknown encoding */ - KATZE_XBEL_ERROR_WRITE, /* Writing failed. */ -} KatzeXbelError; - -typedef enum -{ - KATZE_XBEL_ITEM_KIND_FOLDER, - KATZE_XBEL_ITEM_KIND_BOOKMARK, - KATZE_XBEL_ITEM_KIND_SEPARATOR -} KatzeXbelItemKind; - -GType -katze_xbel_item_get_type (void) G_GNUC_CONST; - -KatzeXbelItem* -katze_xbel_bookmark_new (void); - -KatzeXbelItem* -katze_xbel_separator_new (void); - -KatzeXbelItem* -katze_xbel_folder_new (void); - -void -katze_xbel_item_ref (KatzeXbelItem* item); - -void -katze_xbel_item_unref (KatzeXbelItem* item); - -KatzeXbelItem* -katze_xbel_item_copy (KatzeXbelItem* item); - -void -katze_xbel_folder_append_item (KatzeXbelItem* folder, - KatzeXbelItem* item); - -void -katze_xbel_folder_prepend_item (KatzeXbelItem* folder, - KatzeXbelItem* item); - -void -katze_xbel_folder_remove_item (KatzeXbelItem* folder, - KatzeXbelItem* item); - -guint -katze_xbel_folder_get_n_items (KatzeXbelItem* folder); - -KatzeXbelItem* -katze_xbel_folder_get_nth_item (KatzeXbelItem* folder, - guint n); - -gboolean -katze_xbel_folder_is_empty (KatzeXbelItem* folder); - -gboolean -katze_xbel_folder_get_folded (KatzeXbelItem* folder); - -KatzeXbelItemKind -katze_xbel_item_get_kind (KatzeXbelItem* item); - -KatzeXbelItem* -katze_xbel_item_get_parent (KatzeXbelItem* item); - -G_CONST_RETURN gchar* -katze_xbel_item_get_title (KatzeXbelItem* item); - -G_CONST_RETURN gchar* -katze_xbel_item_get_desc (KatzeXbelItem* item); - -G_CONST_RETURN gchar* -katze_xbel_bookmark_get_href (KatzeXbelItem* bookmark); - -/*time_t -katze_xbel_bookmark_get_added (KatzeXbelItem* bookmark); - -time_t -katze_xbel_bookmark_get_modified (KatzeXbelItem* bookmark); - -time_t -katze_xbel_bookmark_get_visited (KatzeXbelItem* bookmark);*/ - -gboolean -katze_xbel_item_is_bookmark (KatzeXbelItem* bookmark); - -gboolean -katze_xbel_item_is_separator (KatzeXbelItem* bookmark); - -gboolean -katze_xbel_item_is_folder (KatzeXbelItem* bookmark); - -void -katze_xbel_folder_set_folded (KatzeXbelItem* folder, - gboolean folded); - -void -katze_xbel_item_set_title (KatzeXbelItem* item, - const gchar* title); - -void -katze_xbel_item_set_desc (KatzeXbelItem* item, - const gchar* desc); - -void -katze_xbel_bookmark_set_href (KatzeXbelItem* bookmark, - const gchar* href); - -gboolean -katze_xbel_folder_from_data (KatzeXbelItem* folder, - const gchar* data, - GError** error); - -gboolean -katze_xbel_folder_from_file (KatzeXbelItem* folder, - const gchar* file, - GError** error); - -gchar* -katze_xbel_item_to_data (KatzeXbelItem* item); - -gboolean -katze_xbel_folder_to_file (KatzeXbelItem* folder, - const gchar* file, - GError** error); - -#endif /* !__KATZE_XBEL_H__ */ diff --git a/katze/katze.h b/katze/katze.h index fbe418b3..d38bd99f 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -17,6 +17,5 @@ #include "katze-item.h" #include "katze-list.h" #include "katze-array.h" -#include "katze-xbel.h" #endif /* __KATZE_H__ */ diff --git a/midori/main.c b/midori/main.c index e4948b59..dfd6f602 100644 --- a/midori/main.c +++ b/midori/main.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #if ENABLE_NLS #include @@ -352,6 +354,216 @@ midori_web_list_add_item_cb (KatzeArray* trash, } } +static KatzeItem* +katze_item_from_xmlNodePtr (xmlNodePtr cur) +{ + KatzeItem* item; + xmlChar* key; + + item = katze_item_new (); + key = xmlGetProp (cur, (xmlChar*)"href"); + katze_item_set_uri (item, (gchar*)key); + g_free (key); + + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) + { + key = xmlNodeGetContent (cur); + katze_item_set_name (item, g_strstrip ((gchar*)key)); + g_free (key); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) + { + key = xmlNodeGetContent (cur); + katze_item_set_text (item, g_strstrip ((gchar*)key)); + g_free (key); + } + cur = cur->next; + } + return item; +} + +/* Create an array from an xmlNodePtr */ +static KatzeArray* +katze_array_from_xmlNodePtr (xmlNodePtr cur) +{ + KatzeArray* array; + xmlChar* key; + KatzeItem* item; + + array = katze_array_new (KATZE_TYPE_ARRAY); + + key = xmlGetProp (cur, (xmlChar*)"folded"); + if (key) + { + /* if (!g_ascii_strncasecmp ((gchar*)key, "yes", 3)) + folder->folded = TRUE; + else if (!g_ascii_strncasecmp ((gchar*)key, "no", 2)) + folder->folded = FALSE; + else + g_warning ("XBEL: Unknown value for folded."); */ + xmlFree (key); + } + + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) + { + key = xmlNodeGetContent (cur); + katze_item_set_name (KATZE_ITEM (array), g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) + { + key = xmlNodeGetContent (cur); + katze_item_set_text (KATZE_ITEM (array), g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + { + item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); + katze_array_add_item (array, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + { + item = katze_item_from_xmlNodePtr (cur); + katze_array_add_item (array, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + { + item = katze_item_new (); + katze_array_add_item (array, item); + } + cur = cur->next; + } + return array; +} + +/* Loads the contents from an xmlNodePtr into an array. */ +static gboolean +katze_array_from_xmlDocPtr (KatzeArray* array, + xmlDocPtr doc) +{ + xmlNodePtr cur; + xmlChar* version; + gchar* value; + KatzeItem* item; + + cur = xmlDocGetRootElement (doc); + version = xmlGetProp (cur, (xmlChar*)"version"); + if (xmlStrcmp (version, (xmlChar*)"1.0")) + g_warning ("XBEL version is not 1.0."); + xmlFree (version); + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"title"); + katze_item_set_name (KATZE_ITEM (array), value); + g_free (value); + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"desc"); + katze_item_set_text (KATZE_ITEM (array), value); + g_free (value); + + if ((cur = xmlDocGetRootElement (doc)) == NULL) + { + /* Empty document */ + return FALSE; + } + if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) + { + /* Wrong document kind */ + return FALSE; + } + cur = cur->xmlChildrenNode; + while (cur) + { + item = NULL; + if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + item = katze_item_from_xmlNodePtr (cur); + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + item = katze_item_new (); + /*else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + item = katze_xbel_parse_info (xbel, cur);*/ + if (item) + katze_array_add_item (array, item); + cur = cur->next; + } + return TRUE; +} + +#if 0 +static gboolean +katze_array_from_data (KatzeArray* array, + const gchar* data, + GError** error) +{ + xmlDocPtr doc; + + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); + g_return_val_if_fail (data != NULL, FALSE); + + katze_array_clear (array); + + if((doc = xmlParseMemory (data, strlen (data))) == NULL) + { + /* No valid xml or broken encoding */ + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + if (!katze_array_from_xmlDocPtr (array, doc)) + { + /* Parsing failed */ + xmlFreeDoc (doc); + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + xmlFreeDoc (doc); + return TRUE; +} +#endif + +static gboolean +katze_array_from_file (KatzeArray* array, + const gchar* filename, + GError** error) +{ + xmlDocPtr doc; + + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); + g_return_val_if_fail (filename != NULL, FALSE); + + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) + { + /* File doesn't exist */ + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_NOENT, + _("File not found.")); + return FALSE; + } + + if ((doc = xmlParseFile (filename)) == NULL) + { + /* No valid xml or broken encoding */ + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + + if (!katze_array_from_xmlDocPtr (array, doc)) + { + /* Parsing failed */ + xmlFreeDoc (doc); + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + xmlFreeDoc (doc); + return TRUE; +} + static gchar* _simple_xml_element (const gchar* name, const gchar* value) @@ -510,7 +722,7 @@ midori_browser_session_cb (MidoriBrowser* browser, static void midori_browser_weak_notify_cb (MidoriBrowser* browser, - KatzeXbelItem* session) + KatzeArray* session) { g_object_disconnect (browser, "any-signal", G_CALLBACK (midori_browser_session_cb), session, NULL); @@ -543,10 +755,14 @@ main (int argc, MidoriStartup load_on_startup; gchar* homepage; KatzeArray* search_engines; - KatzeXbelItem* bookmarks; - guint i; + KatzeArray* bookmarks; + KatzeArray* _session; + KatzeArray* trash; + MidoriBrowser* browser; + KatzeArray* session; + guint n, i; gchar* uri; - KatzeXbelItem* item; + KatzeItem* item; gchar* uri_ready; #if ENABLE_NLS @@ -658,9 +874,9 @@ main (int argc, } katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel", NULL)); - bookmarks = katze_xbel_folder_new (); + bookmarks = katze_array_new (KATZE_TYPE_ARRAY); error = NULL; - if (!katze_xbel_folder_from_file (bookmarks, config_file, &error)) + if (!katze_array_from_file (bookmarks, config_file, &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, @@ -668,13 +884,13 @@ main (int argc, g_error_free (error); } g_free (config_file); - KatzeXbelItem* _session = katze_xbel_folder_new (); + _session = katze_array_new (KATZE_TYPE_ITEM); g_object_get (settings, "load-on-startup", &load_on_startup, NULL); if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { config_file = g_build_filename (config_path, "session.xbel", NULL); error = NULL; - if (!katze_xbel_folder_from_file (_session, config_file, &error)) + if (!katze_array_from_file (_session, config_file, &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, @@ -684,9 +900,9 @@ main (int argc, g_free (config_file); } config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); - KatzeXbelItem* xbel_trash = katze_xbel_folder_new (); + trash = katze_array_new (KATZE_TYPE_ITEM); error = NULL; - if (!katze_xbel_folder_from_file (xbel_trash, config_file, &error)) + if (!katze_array_from_file (trash, config_file, &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, @@ -724,9 +940,9 @@ main (int argc, { g_object_unref (settings); g_object_unref (search_engines); - katze_xbel_item_unref (bookmarks); - katze_xbel_item_unref (_session); - katze_xbel_item_unref (xbel_trash); + g_object_unref (bookmarks); + g_object_unref (_session); + g_object_unref (trash); g_string_free (error_messages, TRUE); return 0; } @@ -743,47 +959,32 @@ main (int argc, uri = strtok (g_strdup (uris[i]), "|"); while (uri != NULL) { - item = katze_xbel_bookmark_new (); + item = katze_item_new (); uri_ready = sokoke_magic_uri (uri, NULL); - katze_xbel_bookmark_set_href (item, uri_ready); + katze_item_set_uri (item, uri_ready); g_free (uri_ready); - katze_xbel_folder_append_item (_session, item); + katze_array_add_item (_session, item); uri = strtok (NULL, "|"); } g_free (uri); i++; } - if (katze_xbel_folder_is_empty (_session)) + if (katze_array_is_empty (_session)) { - KatzeXbelItem* item = katze_xbel_bookmark_new (); + item = katze_item_new (); if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) - katze_xbel_bookmark_set_href (item, ""); + katze_item_set_uri (item, ""); else { g_object_get (settings, "homepage", &homepage, NULL); - katze_xbel_bookmark_set_href (item, homepage); + katze_item_set_uri (item, homepage); g_free (homepage); } - katze_xbel_folder_prepend_item (_session, item); + katze_array_add_item (_session, item); } g_free (config_path); - KatzeArray* trash = katze_array_new (KATZE_TYPE_ITEM); - guint n = katze_xbel_folder_get_n_items (xbel_trash); - for (i = 0; i < n; i++) - { - KatzeXbelItem* xbel_item = katze_xbel_folder_get_nth_item (xbel_trash, i); - if (!katze_xbel_item_is_separator (xbel_item)) - { - KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, - "name", katze_xbel_item_get_title (xbel_item), - "uri", katze_xbel_bookmark_get_href (xbel_item), - NULL); - katze_array_add_item (trash, item); - } - } - katze_xbel_item_unref (xbel_trash); g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_web_list_add_item_cb), NULL); @@ -793,27 +994,27 @@ main (int argc, "search-engines", search_engines, NULL); - MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", settings, - "bookmarks", bookmarks, - "trash", trash, - "search-engines", search_engines, - NULL); + browser = g_object_new (MIDORI_TYPE_BROWSER, + "settings", settings, + "bookmarks", bookmarks, + "trash", trash, + "search-engines", search_engines, + NULL); midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); - KatzeArray* session = midori_browser_get_proxy_array (browser); - n = katze_xbel_folder_get_n_items (_session); + session = midori_browser_get_proxy_array (browser); + n = katze_array_get_length (_session); for (i = 0; i < n; i++) { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (_session, i); - midori_browser_add_xbel_item (browser, item); + item = katze_array_get_nth_item (_session, i); + midori_browser_add_item (browser, item); } /* FIXME: Switch to the last active page */ - item = katze_xbel_folder_get_nth_item (_session, 0); - if (!strcmp (katze_xbel_bookmark_get_href (item), "")) + item = katze_array_get_nth_item (_session, 0); + if (!strcmp (katze_item_get_uri (item), "")) midori_browser_activate_action (browser, "Location"); - katze_xbel_item_unref (_session); + g_object_unref (_session); g_signal_connect_after (browser, "notify::uri", G_CALLBACK (midori_browser_session_cb), session); @@ -870,12 +1071,12 @@ main (int argc, g_free (config_file); config_file = g_build_filename (config_path, "bookmarks.xbel", NULL); error = NULL; - if (!katze_xbel_folder_to_file (bookmarks, config_file, &error)) + if (!katze_array_to_file (bookmarks, config_file, &error)) { g_warning (_("The bookmarks couldn't be saved. %s"), error->message); g_error_free (error); } - katze_xbel_item_unref (bookmarks); + g_object_unref (bookmarks); g_free (config_file); config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); error = NULL; diff --git a/midori/midori-app.c b/midori/midori-app.c index 38e3d4bf..2767ffb9 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -32,7 +32,7 @@ struct _MidoriApp GtkAccelGroup* accel_group; MidoriWebSettings* settings; - KatzeXbelItem* bookmarks; + KatzeArray* bookmarks; KatzeArray* trash; KatzeArray* search_engines; @@ -134,7 +134,7 @@ midori_app_class_init (MidoriAppClass* class) "bookmarks", _("Bookmarks"), _("The bookmarks folder, containing all bookmarks"), - KATZE_TYPE_XBEL_ITEM, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a6d52b81..07d5c5d8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -72,7 +72,7 @@ struct _MidoriBrowser gchar* statusbar_text; MidoriWebSettings* settings; - KatzeXbelItem* bookmarks; + KatzeArray* bookmarks; KatzeArray* proxy_array; KatzeArray* trash; @@ -458,10 +458,25 @@ midori_view_notify_statusbar_text_cb (MidoriView* view, static void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, - KatzeXbelItem* bookmark) + KatzeItem* bookmark) { - gboolean new_bookmark = !bookmark; - GtkWidget* dialog = gtk_dialog_new_with_buttons ( + gboolean new_bookmark; + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + GtkWidget* view; + GtkWidget* hbox; + GtkWidget* label; + const gchar* value; + GtkWidget* entry_title; + GtkWidget* entry_desc; + GtkWidget* entry_uri; + GtkWidget* combo_folder; + GtkTreeView* treeview; + GtkTreeModel* treemodel; + GtkTreeIter iter; + + new_bookmark = bookmark == NULL; + dialog = gtk_dialog_new_with_buttons ( new_bookmark ? _("New bookmark") : _("Edit bookmark"), GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, @@ -472,27 +487,25 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); - GtkSizeGroup* sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); if (new_bookmark) { - GtkWidget* view = midori_browser_get_current_tab (browser); - bookmark = katze_xbel_bookmark_new (); - katze_xbel_item_set_title (bookmark, - midori_view_get_display_title (MIDORI_VIEW (view))); - katze_xbel_bookmark_set_href (bookmark, - midori_view_get_display_uri (MIDORI_VIEW (view))); + view = midori_browser_get_current_tab (browser); + bookmark = g_object_new (KATZE_TYPE_ITEM, + "uri", midori_view_get_display_uri (MIDORI_VIEW (view)), + "name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL); } - GtkWidget* hbox = gtk_hbox_new (FALSE, 8); + hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - GtkWidget* label = gtk_label_new_with_mnemonic (_("_Title:")); + label = gtk_label_new_with_mnemonic (_("_Title:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_title = gtk_entry_new (); + entry_title = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); - const gchar* title = katze_xbel_item_get_title (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_title), title ? title : ""); + value = katze_item_get_name (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_title), value ? value : ""); gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -502,19 +515,19 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, label = gtk_label_new_with_mnemonic (_("_Description:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - GtkWidget* entry_desc = gtk_entry_new (); + entry_desc = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_desc), TRUE); if (!new_bookmark) { - const gchar* desc = katze_xbel_item_get_desc (bookmark); - gtk_entry_set_text (GTK_ENTRY (entry_desc), desc ? desc : ""); + value = katze_item_get_text (bookmark); + gtk_entry_set_text (GTK_ENTRY (entry_desc), value ? value : ""); } gtk_box_pack_start (GTK_BOX (hbox), entry_desc, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); - GtkWidget* entry_uri = NULL; - if (katze_xbel_item_is_bookmark (bookmark)) + entry_uri = NULL; + if (!KATZE_IS_ARRAY (bookmark)) { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); @@ -523,14 +536,13 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); - gtk_entry_set_text (GTK_ENTRY (entry_uri), - katze_xbel_bookmark_get_href (bookmark)); + gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark)); gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); } - GtkWidget* combo_folder = NULL; + combo_folder = NULL; if (new_bookmark) { hbox = gtk_hbox_new (FALSE, 8); @@ -549,27 +561,26 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - katze_xbel_item_set_title (bookmark, + katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); - katze_xbel_item_set_desc (bookmark, + katze_item_set_text (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_desc))); - if (katze_xbel_item_is_bookmark (bookmark)) - katze_xbel_bookmark_set_href (bookmark, + if (!KATZE_IS_ARRAY (bookmark)) + katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); /* FIXME: We want to choose a folder */ if (new_bookmark) { - katze_xbel_folder_append_item (browser->bookmarks, bookmark); - GtkTreeView* treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; + katze_array_add_item (browser->bookmarks, bookmark); + treeview = GTK_TREE_VIEW (browser->panel_bookmarks); + treemodel = gtk_tree_view_get_model (treeview); gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), &iter, NULL, G_MAXINT, 0, bookmark, -1); - katze_xbel_item_ref (bookmark); + g_object_ref (bookmark); } - /* FIXME: update navigationbar */ + /* FIXME: Update navigationbar */ /* FIXME: Update panel in other windows */ } gtk_widget_destroy (dialog); @@ -580,13 +591,13 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem, const gchar* uri, GtkWidget* view) { - KatzeXbelItem* xbel_item; + KatzeItem* item; MidoriBrowser* browser; - xbel_item = katze_xbel_bookmark_new (); - katze_xbel_bookmark_set_href (xbel_item, uri); + item = katze_item_new (); + katze_item_set_uri (item, uri); browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); - midori_browser_edit_bookmark_dialog_new (browser, xbel_item); + midori_browser_edit_bookmark_dialog_new (browser, item); } static gboolean @@ -1021,7 +1032,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "bookmarks", _("Bookmarks"), _("The bookmarks folder, containing all bookmarks"), - KATZE_TYPE_XBEL_ITEM, + KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); /** @@ -1726,6 +1737,7 @@ midori_browser_search_focus_out_event_cb (GtkWidget* widget, { gboolean show_navigationbar; gboolean show_web_search; + g_object_get (browser->settings, "show-navigationbar", &show_navigationbar, "show-web-search", &show_web_search, @@ -1743,17 +1755,19 @@ midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, GtkTreeViewColumn* column, MidoriBrowser* browser) { - GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeModel* model; GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + + model = gtk_tree_view_get_model (treeview); + if (gtk_tree_model_get_iter (model, &iter, path)) { - KatzeXbelItem* item; gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) - { - const gchar* uri = katze_xbel_bookmark_get_href (item); + uri = katze_item_get_uri (item); + if (uri && *uri) _midori_browser_open_uri (browser, uri); - } } } @@ -1763,14 +1777,14 @@ midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, { GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; gboolean is_separator; if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - is_separator = katze_xbel_item_is_separator (item); + is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); _action_set_sensitive (browser, "BookmarkEdit", !is_separator); _action_set_sensitive (browser, "BookmarkDelete", TRUE); } @@ -1784,14 +1798,16 @@ midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, static void _midori_panel_bookmarks_popup (GtkWidget* widget, GdkEventButton* event, - KatzeXbelItem* item, + KatzeItem* item, MidoriBrowser* browser) { - gboolean is_bookmark = katze_xbel_item_is_bookmark (item); + const gchar* uri; - _action_set_sensitive (browser, "BookmarkOpen", is_bookmark); - _action_set_sensitive (browser, "BookmarkOpenTab", is_bookmark); - _action_set_sensitive (browser, "BookmarkOpenWindow", is_bookmark); + uri = katze_item_get_uri (item); + + _action_set_sensitive (browser, "BookmarkOpen", uri != NULL); + _action_set_sensitive (browser, "BookmarkOpenTab", uri != NULL); + _action_set_sensitive (browser, "BookmarkOpenWindow", uri != NULL); sokoke_widget_popup (widget, GTK_MENU (browser->popup_bookmark), event, SOKOKE_MENU_POSITION_CURSOR); @@ -1804,7 +1820,9 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, { GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; + const gchar* uri; + gint n; if (event->button != 2 && event->button != 3) return FALSE; @@ -1812,11 +1830,14 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - if (event->button == 2 && katze_xbel_item_is_bookmark (item)) + uri = katze_item_get_uri (item); + if (event->button == 2) { - const gchar* uri = katze_xbel_bookmark_get_href (item); - gint n = midori_browser_add_uri (browser, uri); - midori_browser_set_current_page (browser, n); + if (uri && *uri) + { + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); + } } else _midori_panel_bookmarks_popup (widget, event, item, browser); @@ -1831,7 +1852,7 @@ midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, { GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { @@ -1841,21 +1862,23 @@ midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, } static void -_tree_store_insert_folder (GtkTreeStore* treestore, - GtkTreeIter* parent, - KatzeXbelItem* folder) +_tree_store_insert_folder (GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeArray* array) { - guint n = katze_xbel_folder_get_n_items (folder); - guint i; + guint n, i; + KatzeItem* item; + GtkTreeIter iter; + + n = katze_array_get_length (array); for (i = 0; i < n; i++) { - KatzeXbelItem* item = katze_xbel_folder_get_nth_item (folder, i); - GtkTreeIter iter; + item = katze_array_get_nth_item (array, i); gtk_tree_store_insert_with_values (treestore, &iter, parent, n, 0, item, -1); - katze_xbel_item_ref (item); - if (katze_xbel_item_is_folder (item)) - _tree_store_insert_folder (treestore, &iter, item); + g_object_ref (item); + if (KATZE_IS_ARRAY (item)) + _tree_store_insert_folder (treestore, &iter, KATZE_ARRAY (item)); } } @@ -1866,27 +1889,28 @@ midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - KatzeXbelItem* item; + KatzeItem* item; + GdkPixbuf* pixbuf; gtk_tree_model_get (model, iter, 0, &item, -1); if (G_UNLIKELY (!item)) return; - if (G_UNLIKELY (!katze_xbel_item_get_parent (item))) + if (G_UNLIKELY (!katze_item_get_parent (item))) { gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - katze_xbel_item_unref (item); + g_object_unref (item); return; } /* TODO: Would it be better to not do this on every redraw? */ - GdkPixbuf* pixbuf = NULL; - if (katze_xbel_item_is_bookmark (item)) - pixbuf = gtk_widget_render_icon (treeview, STOCK_BOOKMARK, - GTK_ICON_SIZE_MENU, NULL); - else if (katze_xbel_item_is_folder (item)) + pixbuf = NULL; + if (KATZE_IS_ARRAY (item)) pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + else if (katze_item_get_uri (item)) + pixbuf = gtk_widget_render_icon (treeview, STOCK_BOOKMARK, + GTK_ICON_SIZE_MENU, NULL); g_object_set (renderer, "pixbuf", pixbuf, NULL); if (pixbuf) g_object_unref (pixbuf); @@ -1899,39 +1923,42 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - KatzeXbelItem* item; + KatzeItem* item; gtk_tree_model_get (model, iter, 0, &item, -1); if (G_UNLIKELY (!item)) return; - if (G_UNLIKELY (!katze_xbel_item_get_parent (item))) + if (G_UNLIKELY (!katze_item_get_parent (item))) { gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - katze_xbel_item_unref (item); + g_object_unref (item); return; } - if (katze_xbel_item_is_separator (item)) - g_object_set (renderer, "markup", _("Separator"), NULL); - else + if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) g_object_set (renderer, "markup", NULL, - "text", katze_xbel_item_get_title (item), NULL); + "text", katze_item_get_name (item), NULL); + else + g_object_set (renderer, "markup", _("Separator"), NULL); } static void _midori_browser_create_bookmark_menu (MidoriBrowser* browser, - KatzeXbelItem* folder, + KatzeArray* array, GtkWidget* menu); static void midori_browser_bookmark_menu_folder_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - GtkWidget* menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)); + GtkWidget* menu; + KatzeArray* array; + + menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)); gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL); - KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data(G_OBJECT (menuitem), "KatzeXbelItem"); - _midori_browser_create_bookmark_menu (browser, folder, menu); + array = (KatzeArray*)g_object_get_data (G_OBJECT (menuitem), "KatzeArray"); + _midori_browser_create_bookmark_menu (browser, array, menu); /* Remove all menuitems when the menu is hidden. FIXME: We really *want* the line below, but it won't work like that g_signal_connect_after (menu, "hide", G_CALLBACK (gtk_container_foreach), gtk_widget_destroy); */ @@ -1942,10 +1969,12 @@ static void midori_browser_bookmarkbar_folder_activate_cb (GtkToolItem* toolitem, MidoriBrowser* browser) { - GtkWidget* menu = gtk_menu_new (); - KatzeXbelItem* folder = (KatzeXbelItem*)g_object_get_data ( - G_OBJECT (toolitem), "KatzeXbelItem"); - _midori_browser_create_bookmark_menu (browser, folder, menu); + GtkWidget* menu; + KatzeArray* array; + + menu = gtk_menu_new (); + array = (KatzeArray*)g_object_get_data (G_OBJECT (toolitem), "KatzeArray"); + _midori_browser_create_bookmark_menu (browser, array, menu); /* Remove all menuitems when the menu is hidden. FIXME: We really *should* run the line below, but it won't work like that g_signal_connect (menu, "hide", G_CALLBACK (gtk_container_foreach), @@ -1958,35 +1987,34 @@ static void midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, MidoriBrowser* browser) { - KatzeXbelItem* item = (KatzeXbelItem*)g_object_get_data (G_OBJECT (widget), - "KatzeXbelItem"); - _midori_browser_open_uri (browser, katze_xbel_bookmark_get_href (item)); + KatzeItem* item; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (widget), "KatzeItem"); + _midori_browser_open_uri (browser, katze_item_get_uri (item)); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } static void _midori_browser_create_bookmark_menu (MidoriBrowser* browser, - KatzeXbelItem* folder, + KatzeArray* array, GtkWidget* menu) { guint i, n; - KatzeXbelItem* item; + KatzeItem* item; const gchar* title; GtkWidget* menuitem; GtkWidget* submenu; GtkWidget* icon; - n = katze_xbel_folder_get_n_items (folder); + n = katze_array_get_length (array); for (i = 0; i < n; i++) { - item = katze_xbel_folder_get_nth_item (folder, i); - title = katze_xbel_item_is_separator (item) - ? "" : katze_xbel_item_get_title (item); + item = katze_array_get_nth_item (array, i); + title = katze_item_get_name (item); - switch (katze_xbel_item_get_kind (item)) + if (KATZE_IS_ARRAY (item)) { - case KATZE_XBEL_ITEM_KIND_FOLDER: - /* FIXME: what about katze_xbel_folder_is_folded? */ + /* FIXME: what about the "folded" status */ menuitem = sokoke_image_menu_item_new_ellipsized (title); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, @@ -1996,9 +2024,10 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_bookmark_menu_folder_activate_cb), browser); - g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_BOOKMARK: + g_object_set_data (G_OBJECT (menuitem), "KatzeArray", item); + } + else if (katze_item_get_uri (item)) + { menuitem = sokoke_image_menu_item_new_ellipsized (title); icon = gtk_image_new_from_stock (STOCK_BOOKMARK, GTK_ICON_SIZE_MENU); gtk_widget_show (icon); @@ -2006,15 +2035,10 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), browser); - g_object_set_data (G_OBJECT (menuitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_SEPARATOR: + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + } + else menuitem = gtk_separator_menu_item_new (); - break; - default: - menuitem = NULL; - g_warning ("Unknown XBEL item kind"); - } gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); } @@ -2187,15 +2211,16 @@ _action_bookmark_open_activate (GtkAction* action, GtkTreeView* tree_view; GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; + const gchar* uri; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) - _midori_browser_open_uri (browser, - katze_xbel_bookmark_get_href (item)); + uri = katze_item_get_uri (item); + if (uri && *uri) + _midori_browser_open_uri (browser, uri); } } @@ -2206,16 +2231,18 @@ _action_bookmark_open_tab_activate (GtkAction* action, GtkTreeView* tree_view; GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; + const gchar* uri; gint n; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) + uri = katze_item_get_uri (item); + if (uri && *uri) { - n = midori_browser_add_xbel_item (browser, item); + n = midori_browser_add_item (browser, item); _midori_browser_set_current_page_smartly (browser, n); } } @@ -2228,16 +2255,18 @@ _action_bookmark_open_window_activate (GtkAction* action, GtkTreeView* tree_view; GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; + const gchar* uri; gint n; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - if (katze_xbel_item_is_bookmark (item)) + uri = katze_item_get_uri (item); + if (uri && *uri) { - n = midori_browser_add_xbel_item (browser, item); + n = midori_browser_add_item (browser, item); _midori_browser_set_current_page_smartly (browser, n); } } @@ -2250,13 +2279,13 @@ _action_bookmark_edit_activate (GtkAction* action, GtkTreeView* tree_view; GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; + KatzeItem* item; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - if (!katze_xbel_item_is_separator (item)) + /* if (katze_item_get_uri (item)) */ midori_browser_edit_bookmark_dialog_new (browser, item); } } @@ -2293,18 +2322,18 @@ _action_bookmark_delete_activate (GtkAction* action, GtkTreeView* tree_view; GtkTreeModel* model; GtkTreeIter iter; - KatzeXbelItem* item; - KatzeXbelItem* parent; + KatzeItem* item; + KatzeArray* parent; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - parent = katze_xbel_item_get_parent (item); - katze_xbel_folder_remove_item (parent, item); - /* This is a preliminary hack, until we fix it properly again */ + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + /* FIXME: This is a preliminary hack, until we fix it properly again */ gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - katze_xbel_item_unref (item); + g_object_unref (item); } } @@ -2982,7 +3011,7 @@ midori_browser_init (MidoriBrowser* browser) GtkTreeViewColumn* column; GtkCellRenderer* renderer_text; GtkCellRenderer* renderer_pixbuf; - GtkTreeStore* treestore = gtk_tree_store_new (1, KATZE_TYPE_XBEL_ITEM); + GtkTreeStore* treestore = gtk_tree_store_new (1, KATZE_TYPE_ITEM); GtkWidget* treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); @@ -3364,7 +3393,7 @@ static void midori_browser_load_bookmarks (MidoriBrowser* browser) { guint i, n; - KatzeXbelItem* item; + KatzeItem* item; const gchar* title; const gchar* desc; GtkToolItem* toolitem; @@ -3381,17 +3410,15 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) _midori_browser_create_bookmark_menu (browser, browser->bookmarks, browser->menu_bookmarks); - n = katze_xbel_folder_get_n_items (browser->bookmarks); + n = katze_array_get_length (browser->bookmarks); for (i = 0; i < n; i++) { - item = katze_xbel_folder_get_nth_item (browser->bookmarks, i); - title = katze_xbel_item_is_separator (item) - ? "" : katze_xbel_item_get_title (item); - desc = katze_xbel_item_is_separator (item) - ? "" : katze_xbel_item_get_desc (item); - switch (katze_xbel_item_get_kind (item)) + item = katze_array_get_nth_item (browser->bookmarks, i); + title = katze_item_get_name (item); + desc = katze_item_get_text (item); + + if (KATZE_IS_ARRAY (item)) { - case KATZE_XBEL_ITEM_KIND_FOLDER: toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); gtk_tool_item_set_is_important (toolitem, TRUE); @@ -3400,9 +3427,10 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) browser); if (desc && *desc) gtk_tool_item_set_tooltip_text (toolitem, desc); - g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_BOOKMARK: + g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item); + } + else if (katze_item_get_uri (item)) + { toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); gtk_tool_item_set_is_important (toolitem, TRUE); @@ -3411,14 +3439,10 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) browser); if (desc && *desc) gtk_tool_item_set_tooltip_text (toolitem, desc); - g_object_set_data (G_OBJECT (toolitem), "KatzeXbelItem", item); - break; - case KATZE_XBEL_ITEM_KIND_SEPARATOR: - toolitem = gtk_separator_tool_item_new (); - break; - default: - g_warning ("Unknown item kind"); + g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); } + else + toolitem = gtk_separator_tool_item_new (); gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); } sokoke_container_show_children (GTK_CONTAINER (browser->bookmarkbar)); @@ -3600,39 +3624,6 @@ midori_browser_remove_tab (MidoriBrowser* browser, g_signal_emit (browser, signals[REMOVE_TAB], 0, view); } -/** - * midori_browser_add_item: - * @browser: a #MidoriBrowser - * @xbel_item: an XBEL item - * - * Appends a new view as described by @item. - * - * Note: Currently this will always be a #MidoriWebView. - * - * Return value: the index of the new view, or -1 in case of an error - **/ -gint -midori_browser_add_xbel_item (MidoriBrowser* browser, - KatzeXbelItem* item) -{ - const gchar* uri; - const gchar* title; - GtkWidget* view; - - g_return_val_if_fail (katze_xbel_item_is_bookmark (item), -1); - - uri = katze_xbel_bookmark_get_href (item); - title = katze_xbel_item_get_title (item); - view = g_object_new (MIDORI_TYPE_VIEW, - "title", title, - "settings", browser->settings, - NULL); - midori_view_set_uri (MIDORI_VIEW (view), uri); - gtk_widget_show (view); - - return midori_browser_add_tab (browser, view); -} - /** * midori_browser_add_item: * @browser: a #MidoriBrowser diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 1a79087f..535c2295 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -81,10 +81,6 @@ void midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* widget); -gint -midori_browser_add_xbel_item (MidoriBrowser* browser, - KatzeXbelItem* xbel_item); - gint midori_browser_add_item (MidoriBrowser* browser, KatzeItem* item); diff --git a/po/POTFILES.in b/po/POTFILES.in index e8ee9570..91045bb6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,7 +8,8 @@ midori/midori-console.c midori/midori-browser.c midori/midori-panel.c midori/midori-websettings.c -midori/midori-webview.c +midori/midori-view.c +midori/midori-source.c midori/midori-preferences.c midori/midori-searchentry.c midori/sokoke.c @@ -18,4 +19,3 @@ katze/katze-utils.c katze/katze-item.c katze/katze-list.c katze/katze-array.c -katze/katze-xbel.c From 95111a054cc7b442219f94fd6026570c4f20817c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Oct 2008 00:49:16 +0200 Subject: [PATCH 0338/2970] Reimplement missing preferences Implement font properties, web features, Middle click opens selection, Open tabs in the background and proxy. While we are at it, remove Tab label size. --- midori/midori-browser.c | 6 +- midori/midori-view.c | 340 +++++++++++++++++++++++++++++------- midori/midori-websettings.c | 22 +-- 3 files changed, 286 insertions(+), 82 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 07d5c5d8..b734e903 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -631,10 +631,12 @@ midori_view_console_message_cb (GtkWidget* view, static void midori_view_new_tab_cb (GtkWidget* view, const gchar* uri, + gboolean background, MidoriBrowser* browser) { gint n = midori_browser_add_uri (browser, uri); - _midori_browser_set_current_page_smartly (browser, n); + if (!background) + midori_browser_set_current_page (browser, n); } static void @@ -3289,7 +3291,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) MidoriToolbarStyle toolbar_style; gint last_web_search; gchar* last_pageholder_uri; - gint tab_label_size; gboolean close_buttons_on_tabs; g_object_get (browser->settings, @@ -3309,7 +3310,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) "toolbar-style", &toolbar_style, "last-web-search", &last_web_search, "last-pageholder-uri", &last_pageholder_uri, - "tab-label-size", &tab_label_size, "close-buttons-on-tabs", &close_buttons_on_tabs, NULL); diff --git a/midori/midori-view.c b/midori/midori-view.c index b1f57716..eeea06f3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -64,8 +64,20 @@ struct _MidoriView gboolean window_object_cleared; gchar* download_manager; - gint tab_label_size; + gchar* default_font_family; + gint default_font_size; + gint minimum_font_size; + gchar* default_encoding; + gboolean auto_load_images; + gboolean auto_shrink_images; + gboolean print_backgrounds; + gboolean resizable_text_areas; + gboolean enable_scripts; + gboolean enable_plugins; + gboolean middle_click_opens_selection; + gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; + gchar* http_proxy; GtkWidget* menu_item; GtkWidget* tab_label; @@ -86,16 +98,15 @@ GType midori_load_status_get_type (void) { static GType type = 0; - if (!type) - { - static const GEnumValue values[] = { - { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", N_("Load Provisional") }, - { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", N_("Load Committed") }, - { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", N_("Load Finished") }, - { 0, NULL, NULL } - }; - type = g_enum_register_static ("MidoriLoadStatus", values); - } + if (type) + return type; + static const GEnumValue values[] = { + { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", N_("Load Provisional") }, + { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", N_("Load Committed") }, + { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", N_("Load Finished") }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriLoadStatus", values); return type; } @@ -142,6 +153,42 @@ midori_view_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static void +midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void(*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, + gpointer arg_1, + gboolean arg_2, + gpointer data2); + register GMarshalFunc_VOID__STRING_BOOLEAN callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data + ? marshal_data : cc->callback); + callback (data1, + (gchar*)g_value_get_string (param_values + 1), + g_value_get_boolean (param_values + 2), + data2); +} + static void midori_cclosure_marshal_VOID__STRING_INT_STRING (GClosure* closure, GValue* return_value, @@ -217,9 +264,10 @@ midori_view_class_init (MidoriViewClass* class) 0, 0, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); + midori_cclosure_marshal_VOID__STRING_BOOLEAN, + G_TYPE_NONE, 2, + G_TYPE_STRING, + G_TYPE_BOOLEAN); signals[NEW_WINDOW] = g_signal_new ( "new-window", @@ -334,7 +382,7 @@ midori_view_class_init (MidoriViewClass* class) g_param_spec_string ( "statusbar-text", _("Statusbar Text"), - _("The text that is displayed in the statusbar"), + _("The text displayed in the statusbar"), "", G_PARAM_READWRITE)); @@ -635,12 +683,18 @@ midori_view_console_message_cb (MidoriView* view, static void midori_view_new_tab_cb (MidoriView* view, - const gchar* uri) + const gchar* uri, + gboolean background) { + gchar* argument; + if (midori_view_is_socket (view)) return; - send_command (view, "new-tab", uri); + /* (uri, background) => (background, uri) */ + argument = g_strdup_printf ("%d %s", background, uri); + send_command (view, "new-tab", argument); + g_free (argument); } static void @@ -723,7 +777,8 @@ receive_status (MidoriView* view, } else if (!strncmp (command, "new-tab ", 8)) { - g_signal_emit (view, signals[NEW_TAB], 0, &command[8]); + /* (background, uri) => (uri, background) */ + g_signal_emit (view, signals[NEW_TAB], 0, &command[10], atoi (&command[8])); } else if (!strncmp (command, "new-window ", 11)) { @@ -756,6 +811,11 @@ receive_status (MidoriView* view, } } +#define UPDATE_SETTING(name, value) \ + g_object_set (webkit_web_view_get_settings ( \ + WEBKIT_WEB_VIEW (view->web_view)), \ + name, value, NULL) + static void receive_command (MidoriView* view, const gchar* command) @@ -786,9 +846,72 @@ receive_command (MidoriView* view, atoi (&command[15])); else if (!strncmp (command, "hl-matches ", 11)) midori_view_set_highlight_text_matches (view, atoi (&command[11])); - else if (!strncmp (command, "download-manager ", 17)) + else if (!strncmp (command, "dlmgr ", 6)) { - katze_assign (view->download_manager, g_strdup (&command[17])); + katze_assign (view->download_manager, g_strdup (&command[6])); + } + else if (!strncmp (command, "dffamily ", 9)) + { + katze_assign (view->default_font_family, g_strdup (&command[9])); + UPDATE_SETTING ("default-font-family", view->default_font_family); + } + else if (!strncmp (command, "dfsize ", 7)) + { + view->default_font_size = atoi (&command[7]); + UPDATE_SETTING ("default-font-size", view->default_font_size); + } + else if (!strncmp (command, "mfsize ", 7)) + { + view->minimum_font_size = atoi (&command[7]); + UPDATE_SETTING ("minimum-font-size", view->minimum_font_size); + } + else if (!strncmp (command, "denc ", 5)) + { + katze_assign (view->default_encoding, g_strdup (&command[5])); + UPDATE_SETTING ("default-encoding", view->default_encoding); + } + else if (!strncmp (command, "alimg ", 6)) + { + view->auto_load_images = atoi (&command[6]); + UPDATE_SETTING ("auto-load-images", view->auto_load_images); + } + else if (!strncmp (command, "asimg ", 6)) + { + view->auto_shrink_images = atoi (&command[6]); + UPDATE_SETTING ("auto-shrink-images", view->auto_shrink_images); + } + else if (!strncmp (command, "pbkg ", 5)) + { + view->print_backgrounds = atoi (&command[5]); + UPDATE_SETTING ("print-backgrounds", view->print_backgrounds); + } + else if (!strncmp (command, "rta ", 4)) + { + view->print_backgrounds = atoi (&command[4]); + UPDATE_SETTING ("resizable-text-areas", view->resizable_text_areas); + } + else if (!strncmp (command, "escripts ", 9)) + { + view->enable_scripts = atoi (&command[9]); + UPDATE_SETTING ("enable-scripts", view->enable_scripts); + } + else if (!strncmp (command, "eplugins ", 9)) + { + view->enable_plugins = atoi (&command[9]); + UPDATE_SETTING ("enable-plugins", view->enable_plugins); + } + else if (!strncmp (command, "mclksel ", 8)) + { + view->middle_click_opens_selection = atoi (&command[8]); + } + else if (!strncmp (command, "tabsbkg ", 8)) + { + view->open_tabs_in_the_background = atoi (&command[8]); + } + else if (!strncmp (command, "proxy ", 6)) + { + katze_assign (view->http_proxy, g_strdup (&command[6])); + g_setenv ("http_proxy", view->http_proxy ? view->http_proxy : "", TRUE); } else if (g_str_has_prefix (command, "**")) g_print ("%s\n", command); @@ -970,7 +1093,8 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, web_frame, js_context, js_window); } - /* value = gjs_value_new (webkit_web_frame_get_global_context (web_frame), NULL); + /* js_context = webkit_web_frame_get_global_context (web_frame); + value = gjs_value_new (js_context, NULL); document = gjs_value_get_by_name (value, "document"); links = gjs_value_get_elements_by_tag_name (document, "link"); katze_array_clear (web_view->news_feeds); @@ -1030,6 +1154,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, gchar* uri; gchar* new_uri; const gchar* link_uri; + gboolean background; gdk_window_get_pointer (NULL, &x, &y, &state); link_uri = midori_view_get_link_uri (MIDORI_VIEW (view)); @@ -1048,14 +1173,10 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, else if (state & GDK_MOD1_MASK) { /* Open link in new tab */ - g_signal_emit_by_name (view, "new-tab", link_uri); - /* FIXME: Open in the background as appropriate */ - /* background = sokoke_object_get_boolean (browser->settings, - "open-tabs-in-the-background"); + background = view->open_tabs_in_the_background; if (state & GDK_CONTROL_MASK) background = !background; - if (background) - open_tab_in_the_background */ + g_signal_emit_by_name (view, "new-tab", link_uri, background); return TRUE; } break; @@ -1063,14 +1184,10 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, if (link_uri) { /* Open link in new tab */ - g_signal_emit_by_name (view, "new-tab", link_uri); - /* FIXME: Open in the background as appropriate */ - /* background = sokoke_object_get_boolean (browser->settings, - "open-tabs-in-the-background"); + background = view->open_tabs_in_the_background; if (state & GDK_CONTROL_MASK) background = !background; - if (background) - open_tab_in_the_background */ + g_signal_emit_by_name (view, "new-tab", link_uri, background); return TRUE; } else if (state & GDK_CONTROL_MASK) @@ -1078,7 +1195,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0); return FALSE; /* Allow Ctrl + Middle click */ } - else if (TRUE /*middle-click-opens-selection*/) + else if (view->middle_click_opens_selection) { state = (GdkModifierType) event->state; clipboard = gtk_clipboard_get_for_display ( @@ -1089,7 +1206,12 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, { new_uri = sokoke_magic_uri (uri, NULL); if (state & GDK_CONTROL_MASK) - g_signal_emit_by_name (view, "new-tab", new_uri); + { + background = view->open_tabs_in_the_background; + if (state & GDK_CONTROL_MASK) + background = !background; + g_signal_emit_by_name (view, "new-tab", new_uri, background); + } else { midori_view_set_uri (MIDORI_VIEW (view), new_uri); @@ -1148,7 +1270,8 @@ static void midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, MidoriView* view) { - g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri); + g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri, + view->open_tabs_in_the_background); } static void @@ -1537,6 +1660,9 @@ midori_view_init (MidoriView* view) view->item = NULL; view->download_manager = NULL; + view->default_font_family = NULL; + view->default_encoding = NULL; + view->http_proxy = NULL; g_object_connect (view, "signal::notify::uri", @@ -1588,7 +1714,8 @@ midori_view_finalize (GObject* object) g_free (view->download_manager); - /* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + /* web_frame = webkit_web_view_get_main_frame + (WEBKIT_WEB_VIEW (view->web_view)); g_signal_handlers_disconnect_by_func (web_frame, webkit_web_frame_load_done, view); */ @@ -1761,17 +1888,12 @@ _update_label_size (GtkWidget* label, { gint width, height; - if (size > -1) - { - sokoke_widget_get_text_size (label, "M", &width, &height); - gtk_widget_set_size_request (label, width * size, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - } - else - { - gtk_widget_set_size_request (label, -1, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); - } + if (size < 1) + size = 10; + + sokoke_widget_get_text_size (label, "M", &width, &height); + gtk_widget_set_size_request (label, width * size, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); } static void @@ -1779,11 +1901,41 @@ _midori_view_update_settings (MidoriView* view) { g_object_get (view->settings, "download-manager", &view->download_manager, + "default-font-family", &view->default_font_family, + "default-font-size", &view->default_font_size, + "minimum-font-size", &view->minimum_font_size, + "default-encoding", &view->default_encoding, + "auto-load-images", &view->auto_load_images, + "auto-shrink-images", &view->auto_shrink_images, + "print-backgrounds", &view->print_backgrounds, + "resizable-text-areas", &view->resizable_text_areas, + "enable-scripts", &view->enable_scripts, + "enable-plugins", &view->enable_plugins, "close-buttons-on-tabs", &view->close_buttons_on_tabs, + "middle-click-opens-selection", &view->middle_click_opens_selection, + "open-tabs-in-the-background", &view->open_tabs_in_the_background, + "http-proxy", &view->http_proxy, NULL); if (midori_view_is_socket (view)) - send_command (view, "download-manager", view->download_manager); + { + send_command (view, "dlmgr", view->download_manager); + send_command (view, "dffamily", view->default_font_family); + send_command (view, "dfsize", int_to_str (view->default_font_size)); + send_command (view, "mfsize", int_to_str (view->minimum_font_size)); + send_command (view, "denc", view->default_encoding); + send_command (view, "alimg", int_to_str (view->auto_load_images)); + send_command (view, "asimg", int_to_str (view->auto_shrink_images)); + send_command (view, "pbkg", int_to_str (view->print_backgrounds)); + send_command (view, "rta", int_to_str (view->resizable_text_areas)); + send_command (view, "escripts", int_to_str (view->enable_scripts)); + send_command (view, "eplugins", int_to_str (view->enable_plugins)); + send_command (view, "mclksel", + int_to_str (view->middle_click_opens_selection)); + send_command (view, "tabsbkg", + int_to_str (view->open_tabs_in_the_background)); + send_command (view, "proxy", view->http_proxy); + } } static void @@ -1802,14 +1954,67 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, { katze_assign (view->download_manager, g_value_dup_string (&value)); if (midori_view_is_socket (view)) - send_command (view, "download-manager", view->download_manager); + send_command (view, "dlmgr", view->download_manager); } - else if (name == g_intern_string ("tab-label-size")) + else if (name == g_intern_string ("default-font-family")) { - view->tab_label_size = g_value_get_int (&value); - if (!midori_view_is_plug (view)) - _update_label_size (view->tab_title, - sokoke_object_get_int (view->settings, "tab-label-size")); + katze_assign (view->default_font_family, g_value_dup_string (&value)); + if (midori_view_is_socket (view)) + send_command (view, "dffamily", view->default_font_family); + } + else if (name == g_intern_string ("default-font-size")) + { + view->default_font_size = g_value_get_int (&value); + if (midori_view_is_socket (view)) + send_command (view, "dfsize", int_to_str (view->default_font_size)); + } + else if (name == g_intern_string ("minimum-font-size")) + { + view->minimum_font_size = g_value_get_int (&value); + if (midori_view_is_socket (view)) + send_command (view, "mfsize", int_to_str (view->minimum_font_size)); + } + else if (name == g_intern_string ("default-encoding")) + { + katze_assign (view->default_encoding, g_value_dup_string (&value)); + if (midori_view_is_socket (view)) + send_command (view, "denc", view->default_encoding); + } + else if (name == g_intern_string ("auto-load-images")) + { + view->auto_load_images = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "alimg", int_to_str (view->auto_load_images)); + } + else if (name == g_intern_string ("auto-shrink-images")) + { + view->auto_shrink_images = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "asimg", int_to_str (view->auto_shrink_images)); + } + else if (name == g_intern_string ("print-backgrounds")) + { + view->print_backgrounds = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "pbkg", int_to_str (view->print_backgrounds)); + } + else if (name == g_intern_string ("resizable-text-areas")) + { + view->resizable_text_areas = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "rta", int_to_str (view->resizable_text_areas)); + } + else if (name == g_intern_string ("enable-scripts")) + { + view->enable_scripts = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "escripts", int_to_str (view->enable_scripts)); + } + else if (name == g_intern_string ("enable-plugins")) + { + view->enable_plugins = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "eplugins", int_to_str (view->enable_plugins)); } else if (name == g_intern_string ("close-buttons-on-tabs")) { @@ -1817,6 +2022,26 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, sokoke_widget_set_visible (view->tab_close, view->close_buttons_on_tabs); } + else if (name == g_intern_string ("middle-click-opens-selection")) + { + view->middle_click_opens_selection = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "mclksel", + int_to_str (view->middle_click_opens_selection)); + } + else if (name == g_intern_string ("open-tabs-in-the-background")) + { + view->open_tabs_in_the_background = g_value_get_boolean (&value); + if (midori_view_is_socket (view)) + send_command (view, "tabsbkg", + int_to_str (view->open_tabs_in_the_background)); + } + else if (name == g_intern_string ("http-proxy")) + { + katze_assign (view->http_proxy, g_value_dup_string (&value)); + if (midori_view_is_socket (view)) + send_command (view, "proxy", view->http_proxy); + } g_value_unset (&value); } @@ -1836,7 +2061,6 @@ midori_view_set_settings (MidoriView* view, g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); katze_object_assign (view->settings, g_object_ref (settings)); - /* FIXME: Propagate settings to the web view */ _midori_view_update_settings (view); g_signal_connect (settings, "notify", G_CALLBACK (midori_view_settings_notify_cb), view); @@ -2278,9 +2502,7 @@ midori_view_get_proxy_tab_label (MidoriView* view) gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5); /* TODO: make the tab initially look "unvisited" until it's focused */ gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); - if (view->settings) - _update_label_size (view->tab_title, - sokoke_object_get_int (view->settings, "tab-label-size")); + _update_label_size (view->tab_title, 10); view->tab_close = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 21146ebe..110d19b3 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -46,7 +46,6 @@ struct _MidoriWebSettings gchar* location_entry_search; MidoriPreferredEncoding preferred_encoding; - gint tab_label_size; gboolean close_buttons_on_tabs; MidoriNewPage open_new_pages_in; gboolean middle_click_opens_selection; @@ -99,7 +98,6 @@ enum PROP_LOCATION_ENTRY_SEARCH, PROP_PREFERRED_ENCODING, - PROP_TAB_LABEL_SIZE, PROP_CLOSE_BUTTONS_ON_TABS, PROP_OPEN_NEW_PAGES_IN, PROP_MIDDLE_CLICK_OPENS_SELECTION, @@ -442,16 +440,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); - - g_object_class_install_property (gobject_class, - PROP_TAB_LABEL_SIZE, - g_param_spec_int ( - "tab-label-size", - _("Tab Label Size"), - _("The desired tab label size"), - 0, G_MAXINT, 10, - flags)); - g_object_class_install_property (gobject_class, PROP_CLOSE_BUTTONS_ON_TABS, g_param_spec_boolean ( @@ -597,7 +585,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) } static void -notify_default_encoding_cb (GObject* object, GParamSpec* pspec) +notify_default_encoding_cb (GObject* object, + GParamSpec* pspec) { MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); @@ -732,9 +721,6 @@ midori_web_settings_set_property (GObject* object, } break; - case PROP_TAB_LABEL_SIZE: - web_settings->tab_label_size = g_value_get_int (value); - break; case PROP_CLOSE_BUTTONS_ON_TABS: web_settings->close_buttons_on_tabs = g_value_get_boolean (value); break; @@ -870,9 +856,6 @@ midori_web_settings_get_property (GObject* object, g_value_set_enum (value, web_settings->preferred_encoding); break; - case PROP_TAB_LABEL_SIZE: - g_value_set_int (value, web_settings->tab_label_size); - break; case PROP_CLOSE_BUTTONS_ON_TABS: g_value_set_boolean (value, web_settings->close_buttons_on_tabs); break; @@ -973,7 +956,6 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) "show-new-tab", web_settings->show_new_tab, "show-trash", web_settings->show_trash, - "tab-label-size", web_settings->tab_label_size, "close-buttons-on-tabs", web_settings->close_buttons_on_tabs, "open-new-pages-in", web_settings->open_new_pages_in, "middle-click-opens-selection", web_settings->middle_click_opens_selection, From 37aca287b4e0572ae0c4b2b6943fdedcb536fc01 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Oct 2008 03:42:18 +0200 Subject: [PATCH 0339/2970] Remove a few still unimplementable items Remove Page setup, Print preview, Undo, Redo and Tab overview. We still can't implement any of these items, so let's just keep focussing on what we *can* implement. --- midori/midori-browser.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b734e903..cb6c11ef 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2359,12 +2359,6 @@ static const GtkActionEntry entries[] = { { "WindowClose", NULL, N_("C_lose Window"), "w", N_("Close this window"), G_CALLBACK (_action_window_close_activate) }, - { "PageSetup", GTK_STOCK_PROPERTIES, - N_("Pa_ge Setup"), "", - "Configure your print settings", NULL/*G_CALLBACK (_action_page_setup_activate)*/ }, - { "PrintPreview", GTK_STOCK_PRINT_PREVIEW, - NULL, "", - N_("Show a preview of the printed page"), NULL/*G_CALLBACK (_action_print_preview_activate)*/ }, { "Print", GTK_STOCK_PRINT, NULL, "p", N_("Print the current page"), G_CALLBACK (_action_print_activate) }, @@ -2373,12 +2367,6 @@ static const GtkActionEntry entries[] = { N_("Quit the application"), G_CALLBACK (_action_quit_activate) }, { "Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK (_action_edit_activate) }, - { "Undo", GTK_STOCK_UNDO, - NULL, "z", - N_("Undo the last modification"), NULL/*G_CALLBACK (_action_undo_activate)*/ }, - { "Redo", GTK_STOCK_REDO, - NULL, "z", - N_("Redo the last modification"), NULL/*G_CALLBACK (_action_redo_activate)*/ }, { "Cut", GTK_STOCK_CUT, NULL, "x", N_("Cut the selected text"), G_CALLBACK (_action_cut_activate) }, @@ -2503,9 +2491,6 @@ static const GtkActionEntry entries[] = { { "TabNext", GTK_STOCK_GO_FORWARD, N_("_Next Tab"), "Page_Down", N_("Switch to the next tab"), G_CALLBACK (_action_tab_next_activate) }, - { "TabOverview", NULL, - N_("Tab _Overview"), "", - N_("Show an overview of all open tabs"), NULL/*G_CALLBACK (_action_tab_overview_activate)*/ }, { "Help", NULL, N_("_Help") }, { "HelpContents", GTK_STOCK_HELP, @@ -2522,10 +2507,6 @@ static const GtkToggleActionEntry toggle_entries[] = { N_("P_rivate Browsing"), "", N_("Don't save any private data while browsing"), NULL/*G_CALLBACK (_action_private_browsing_activate)*/, FALSE }, - { "WorkOffline", GTK_STOCK_DISCONNECT, - N_("_Work Offline"), "", - N_("Work without a network connection"), NULL/*G_CALLBACK (_action_work_offline_activate)*/, - FALSE }, { "Navigationbar", NULL, N_("_Navigationbar"), "", @@ -2613,19 +2594,12 @@ static const gchar* ui_markup = "" "" "" - "" - "" "" - "" "" - "" "" "" "" "" - "" - "" - "" "" "" "" @@ -2684,7 +2658,6 @@ static const gchar* ui_markup = "" "" "" - "" "" /* All open tabs shall be appended here */ "" @@ -2929,7 +2902,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); gtk_widget_show (browser->menubar); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); - _action_set_sensitive (browser, "WorkOffline", FALSE); /* Create the navigationbar */ browser->navigationbar = gtk_ui_manager_get_widget ( From 1801298731db15552aca26ae39f368e4ef854959 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Oct 2008 03:44:16 +0200 Subject: [PATCH 0340/2970] Remove User stylesheet entirely, don't support it --- midori/midori-preferences.c | 39 +++---------------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 0ec4ca8c..47fa3c4b 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -58,24 +58,12 @@ midori_preferences_class_init (MidoriPreferencesClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - "Settings", + _("Settings"), _("Settings instance to provide properties"), MIDORI_TYPE_WEB_SETTINGS, G_PARAM_WRITABLE)); } -static void -clear_button_clicked_cb (GtkWidget* button, GtkWidget* file_chooser) -{ - gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_chooser), ""); - /* Emit signal manually for Gtk doesn't emit it otherwise */ - #if GTK_CHECK_VERSION (2, 12, 0) - g_signal_emit_by_name (file_chooser, "file-set"); - #else - g_signal_emit_by_name (file_chooser, "selection-changed"); - #endif -} - static void midori_preferences_init (MidoriPreferences* preferences) { @@ -226,7 +214,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; - gchar* user_stylesheet_uri; g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -337,30 +324,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); SPANNED_ADD (button, 1, 2, 2, 3); - g_object_get (settings, "user-stylesheet-uri", &user_stylesheet_uri, NULL); - /* Add the stylesheet uri widget only if there's a value - Otherwise we prefer to not use it, it is superfluous basically */ - if (user_stylesheet_uri && *user_stylesheet_uri) - { - label = katze_property_label (settings, "user-stylesheet-uri"); - INDENTED_ADD (label, 0, 1, 3, 4); - hbox = gtk_hbox_new (FALSE, 4); - entry = katze_property_proxy (settings, "user-stylesheet-uri", "uri"); - gtk_widget_set_sensitive (entry, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), - gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU)); - g_signal_connect (button, "clicked", - G_CALLBACK (clear_button_clicked_cb), entry); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4); - FILLED_ADD (hbox, 1, 2, 3, 4); - g_free (user_stylesheet_uri); - } label = katze_property_label (settings, "location-entry-search"); - INDENTED_ADD (label, 0, 1, 5, 6); + INDENTED_ADD (label, 0, 1, 3, 4); entry = katze_property_proxy (settings, "location-entry-search", NULL); - FILLED_ADD (entry, 1, 2, 5, 6); + FILLED_ADD (entry, 1, 2, 3, 4); /* Page "Interface" */ PAGE_NEW (_("Interface")); From c36784229c28847106dc7c3709df94a73f0bac0a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Oct 2008 05:45:10 +0200 Subject: [PATCH 0341/2970] Make sure to present the window when opening a tab --- midori/midori-app.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-app.c b/midori/midori-app.c index 2767ffb9..d5db66fb 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -222,6 +222,9 @@ midori_browser_message_received_cb (UniqueApp* instance, response = UNIQUE_RESPONSE_OK; break; case UNIQUE_OPEN: + gtk_window_set_screen (GTK_WINDOW (app->browser), + unique_message_data_get_screen (message)); + gtk_window_present (GTK_WINDOW (app->browser)); uris = unique_message_data_get_uris (message); if (!uris) response = UNIQUE_RESPONSE_FAIL; From e4238d7c73ce0e284f051f699c802db8ac1316ff Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Oct 2008 22:14:14 +0200 Subject: [PATCH 0342/2970] Initial attempt at user documentation --- README | 9 +- docs/user/midori.css | 114 ++++++++++++++++++++++++ docs/user/midori.txt | 202 +++++++++++++++++++++++++++++++++++++++++++ wscript | 50 +++++++++++ 4 files changed, 371 insertions(+), 4 deletions(-) create mode 100644 docs/user/midori.css create mode 100644 docs/user/midori.txt diff --git a/README b/README index 1c7bc4ca..4a350946 100644 --- a/README +++ b/README @@ -3,15 +3,16 @@ Midori is a lightweight web browser. * Full integration with GTK+2. * Fast rendering with WebKit. * Tabs, windows and session management. -* Bookmarks with XBEL and keyword support. -* Flexibly configurable Web Searchbox. -* Custom context menu actions. +* Flexibly configurable Web Search. * User scripts and user styles support. +* Straightforward bookmark management. +* Customizable and extensible interface. * Extensible via Javascript. +* Custom context menu actions. Requirements: GTK+ 2.6, WebkitGtk, libXML2 -Optional: Glib 2.16, GtkSourceView 2.0 +Optional: Glib 2.16, GtkSourceView 2.0, Unique 0.9, xdg-open For installation instructions read INSTALL. diff --git a/docs/user/midori.css b/docs/user/midori.css new file mode 100644 index 00000000..57048efe --- /dev/null +++ b/docs/user/midori.css @@ -0,0 +1,114 @@ +/* +:Author: Christian Dywan +:Contact: christian@twotoasts.de +:Copyright: This stylesheet has been placed in the public domain. + +Stylesheet for Midori's documentation based on a version of Enrico Troeger. +*/ + +@media screen { + + body { + background-color: #f6fff3; + color: #404040; + margin-left: 0.4em; + width: 60em; + font-size: 90%; + } + + a { + color: #013100; + } + + a:visited { + color: #7E558E; + } + + a:hover { + text-decoration: none; + } + + h1, h2, h3 { + font-family: sans-serif; + color: #002a00; + } + + h1 { + border-top: 1px dotted; + margin-top: 2em; + } + + h1.title { + text-align: left } + + h2 { + margin-top: 30px; + } + + h2.subtitle { + text-align: left } + + h3 { + padding-left: 3px; + } + + blockquote, pre { + border: 1px solid; + padding: 0.4em; + } + + blockquote { + font-family: sans-serif; + background-color: #DBEDD5; + border: 1px dotted; + border-left: 4px solid; + border-color: #9FD98C; + } + + pre { + background-color: #deefd4; + border: 1px dotted; + border-left: 4px solid; + border-color: #9acb7d; + } + + tt, pre, code { + color: #002a00; + } + + table { + border: 1px solid #9acb7f; + } + + th { + border: none; + background-color: #9acb7d; + } + + tr:nth-child(even) { + background-color: #d3eac6; + } + + td { + border: none; + } + + .docinfo-name { + color: #002a00; + } + + p.admonition-title { + color: #990000; + font-weight: bold; + } + + div.note { + margin: 1em 3em; + padding: 0em; + } + + dt { + font-style: italic; + } + +} diff --git a/docs/user/midori.txt b/docs/user/midori.txt new file mode 100644 index 00000000..f582d650 --- /dev/null +++ b/docs/user/midori.txt @@ -0,0 +1,202 @@ +.. |(version)| replace:: 0.0.21 + +''''''' + Midori +''''''' + +----------------------------------------- + A lightweight, portable GTK+ web browser +----------------------------------------- + +:Authors: Christian Dywan +:Date: $Date: 2008-08-03 20:30:35 +0100 (Sat, 28 Sep 2008) $ +:Version: |(version)| + +Copyright © 2008 + +This documentation is distributed under the terms of the +`GNU Lesser General Public License`_; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + + +.. contents:: + + + +Introduction +'''''''''''' + + +What is Midori +-------------- + +Midori is a lightweight and portable web browser based on Gtk+. The +interface is designed to be intuitive yet powerful. + +* Full integration with GTK+2. +* Fast rendering with WebKit. +* Tabs, windows and session management. +* Flexibly configurable Web Search. +* User scripts and user styles support. +* Straightforward bookmark management. +* Customizable and extensible interface. +* Extensible via Javascript. +* Custom context menu actions. + + +Running Midori +-------------- + + +* If you are using a graphical desktop environment you will usually find + Midori in the menu under Network. + +* You can also run Midori from a console or a Run dialog. + See also `Command line usage`. + + $ midori + +A browser window appears where you can start navigating the web right away. + + +The main interface +-------------------------- + + +The main browser window consists of a few basic elements: + + +* The menubar. It's pretty much standardized and gives you access to + allmost all features, many of the items have a keyboard shortcut by default. + See also `Keyboard shortcuts`_. + +* The navigationbar. It lets you open tabs, go back and forward, enter + addresses, search the web and reopen closed tabs. + See also `The navigationbar`. + +* The sidepanel. It takes a pretty central role in the functionality it provides, + yet it can be hidden and resized to not distract you. + See also `The sidepanel`. + +* The statusbar. It displays informational text when hovering something + with a pointer. That's it. + + +Taking a closer look +'''''''''''''''''''' + + +Command line usage +------------------ + + +Running Midori normally works as follows: + + +* $ midori + + Just run a new instance of Midori. If an instance of Midori is already + running a new window in that instance will be opened. + +* $ midori [URIs] + + You can supply any number of URIs to open as arguments. If you have a + saved session or a running instance they will be added to the last + active window. + +* $ midori [URI1]|[URI2]|... + + You can separate URIS by a pipe (|) as well. They are handled as if you + provided all URIs as separate arguments. + +* $ midori [JAVASCRIPT] + + If you pass a filename ending with ".js" Midori will attempt to run + the contents of the file as javascript code. + + +Note that support for opening tabs in an existing instance depends on +your build and may not be available on some platforms. + + +The following arguments are supported if you call Midori from a command line. + + ++--------------+--------------+------------------------------------------------+ +| Short option | Long option | Function | ++==============+==============+================================================+ +| -i | --id | This is an internal identifier. It is used to | +| | | spawn child processes for new tabs. Do not use | +| | | it unless you know what you are doing. | ++--------------+--------------+------------------------------------------------+ +| -v | --version | Show version information and exit. | ++--------------+--------------+------------------------------------------------+ + + +Keyboard shortcuts +------------------ + + +... + + +The navigationbar +----------------- + + +... + + + +The sidepanel +------------- + + +... + + +Frequently asked questions +'''''''''''''''''''''''''' + + +How do you pronounce Midori and what does it mean anyway? +--------------------------------------------------------- + +Pronounce it "midoɺi", with a Bavarian/ Japanese "r" or "Mee-Doh-Ree" +in English or read it Italian. The name comes from the Japanese word +緑 (みどり) for the colour "green". + + +What does the logo mean? +------------------------ + +The paw of a green cat. Obviously. Also it resembles the letter "M" +in "Midori". The curving is supposed to emphasize speed. + + +On which platforms does Midori run currently? +--------------------------------------------- + +Midori is basically very portable and should run on all platforms that +its dependencies support. + + + +Under which license is Midori distributed? +------------------------------------------ + +Midori, documentation and all delivered artwork are licensed under the LGPL2. + + +GNU Lesser General Public License +''''''''''''''''''''''''''''''''' + +:: + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + FIXME: Provide full license text + diff --git a/wscript b/wscript index 9fb4a0bb..782d8174 100644 --- a/wscript +++ b/wscript @@ -5,6 +5,7 @@ import Params import pproc as subprocess import Common import platform +import os APPNAME = 'midori' VERSION = '0.0.21' @@ -23,6 +24,19 @@ blddir = '_build_' def configure (conf): conf.check_tool ('compiler_cc') + if not Params.g_options.disable_docs: + conf.find_program ('rst2html.py', var='RST2HTML') + # debian renames the executable, check that as well :( + if not conf.env['RST2HTML']: + conf.find_program ('rst2html', var='RST2HTML') + if conf.env['RST2HTML']: + docs = 'yes' + else: + docs = 'not available' + else: + docs = 'no' + conf.check_message_custom ('generate', 'user documentation', docs) + if not Params.g_options.disable_nls: conf.check_tool ('intltool') if conf.env['INTLTOOL'] and conf.env['POCOM']: @@ -45,6 +59,20 @@ def configure (conf): update_po = 'no' conf.check_message_custom ('localization file', 'updates', update_po) + # We support building without intltool + # Therefore datadir may not have been defined + if not conf.is_defined ('DATADIR'): + if Params.g_options.datadir != '': + conf.define ('DATADIR', Params.g_options.datadir) + else: + conf.define ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) + + if Params.g_options.docdir == '': + docdir = "%s/doc" % conf.env['DATADIR'] + else: + docdir = Params.g_options.docdir + conf.define ('DOCDIR', docdir) + if Params.g_options.enable_api_docs: conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') conf.find_program ('gtkdoc-mktmpl', var='GTKDOC_MKTMPL') @@ -104,6 +132,10 @@ def configure (conf): def set_options (opt): opt.tool_options ('compiler_cc') opt.tool_options ('intltool') + opt.add_option ('--docdir', type='string', default='', + help='documentation root', dest='docdir') + opt.add_option ('--disable-docs', action='store_true', default=False, + help='Disables user documentation', dest='disable_docs') opt.add_option ('--disable-nls', action='store_true', default=False, help='Disables native language support', dest='disable_nls') @@ -121,6 +153,24 @@ def set_options (opt): def build (bld): bld.add_subdirs ('katze midori icons') + install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING README') + + if bld.env ()['RST2HTML']: + # FIXME: Build only if needed + if not os.access (blddir, os.F_OK): + os.mkdir (blddir) + if not os.access (blddir + '/docs', os.F_OK): + os.mkdir (blddir + '/docs') + if not os.access (blddir + '/docs/user', os.F_OK): + os.mkdir (blddir + '/docs/user') + os.chdir (blddir + '/docs/user') + subprocess.call ([bld.env ()['RST2HTML'], '-stg', + '--stylesheet=../../../docs/user/midori.css', + '../../../docs/user/midori.txt', + 'midori.html',]) + os.chdir ('../../..') + install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') + if bld.env ()['INTLTOOL']: bld.add_subdirs ('po') From 8953a9b26b606662e20d316f7bdbf8b72632b2dd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Oct 2008 22:23:00 +0200 Subject: [PATCH 0343/2970] Integrate documentation, bug tracker and website --- midori/midori-browser.c | 74 ++++++++++++++++++++++++++++++++++++----- midori/midori-view.c | 13 ++++++++ 2 files changed, 79 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cb6c11ef..8ae8e230 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2088,8 +2088,8 @@ _action_tab_next_activate (GtkAction* action, static const gchar* credits_authors[] = { "Christian Dywan ", NULL }; -static const gchar* credits_documenters/*[]*/ = /*{ - */NULL/* }*/; +static const gchar* credits_documenters[] = { + "Christian Dywan " }; static const gchar* credits_artists[] = { "Nancy Runge ", NULL }; @@ -2099,10 +2099,35 @@ static const gchar* license = "License as published by the Free Software Foundation; either\n" "version 2.1 of the License, or (at your option) any later version.\n"; +static void +_action_about_activate_link (GtkAboutDialog* about, + const gchar* link, + gpointer user_data) +{ + MidoriBrowser* browser; + gint n; + + browser = MIDORI_BROWSER (user_data); + n = midori_browser_add_uri (browser, link); + midori_browser_set_current_page (browser, n); +} + +static void +_action_about_activate_email (GtkAboutDialog* about, + const gchar* link, + gpointer user_data) +{ + gchar* command = g_strconcat ("xdg-open ", link, NULL); + g_spawn_command_line_async (command, NULL); + g_free (command); +} + static void _action_about_activate (GtkAction* action, MidoriBrowser* browser) { + gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL); + gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL); gtk_show_about_dialog (GTK_WINDOW (browser), "logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)), "name", PACKAGE_NAME, @@ -2120,16 +2145,40 @@ _action_about_activate (GtkAction* action, } static void -_action_help_contents_activate (GtkAction* action, - MidoriBrowser* browser) +_action_help_link_activate (GtkAction* action, + MidoriBrowser* browser) { - const gchar* faq_uri = "http://wiki.xfce.org/_export/xhtml/midori_faq"; + const gchar* action_name; + const gchar* uri; gint n; - n = midori_browser_add_uri (browser, faq_uri); - midori_browser_set_current_page (browser, n); + action_name = gtk_action_get_name (action); + if (!strncmp ("HelpContents", action_name, 12)) + { + #ifdef DOCDIR + uri = DOCDIR "/midori/user/midori.html"; + if (!g_file_test (uri, G_FILE_TEST_EXISTS)) + uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; + #else + uri = "error:nodocs " DATADIR "/doc/midori/user/midori.html"; + #endif + } + else if (!strncmp ("HelpFAQ", action_name, 7)) + uri = "http://wiki.xfce.org/_export/xhtml/midori_faq"; + else if (!strncmp ("HelpBugs", action_name, 8)) + uri = "http://www.twotoasts.de/bugs/"; + else + uri = NULL; + + if (uri) + { + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); + } + } + static void _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -2495,7 +2544,13 @@ static const GtkActionEntry entries[] = { { "Help", NULL, N_("_Help") }, { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", - N_("Show the documentation"), G_CALLBACK (_action_help_contents_activate) }, + N_("Show the documentation"), G_CALLBACK (_action_help_link_activate) }, + { "HelpFAQ", NULL, + N_("_Frequent questions"), NULL, + N_("Show the Frequently Asked Questions"), G_CALLBACK (_action_help_link_activate) }, + { "HelpBugs", NULL, + N_("_Report a bug"), NULL, + N_("Open Midori's bug tracker"), G_CALLBACK (_action_help_link_activate) }, { "About", GTK_STOCK_ABOUT, NULL, "", N_("Show information about the program"), G_CALLBACK (_action_about_activate) }, @@ -2663,6 +2718,9 @@ static const gchar* ui_markup = "" "" "" + "" + "" + "" "" "" "" diff --git a/midori/midori-view.c b/midori/midori-view.c index eeea06f3..c35646f8 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2161,6 +2161,19 @@ midori_view_set_uri (MidoriView* view, "", view->uri, view->uri, view->uri); } + else if (!strncmp (uri, "error:nodocs ", 13)) + { + katze_assign (view->uri, g_strdup (&uri[13])); + data = g_strdup_printf ( + "No documentation installed" + "

No documentation installed

" + "

There is no documentation installed at %s." + "You may want to ask your distribution or " + "package maintainer for it or if this a custom build " + "verify that the build is setup properly." + "", + view->uri); + } if (data) { webkit_web_view_load_html_string ( From 5eb74b6bf350813a441679a91e364363f9ec87b0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Oct 2008 00:46:54 +0200 Subject: [PATCH 0344/2970] Connect Help in Preferences to HelpContents --- midori/midori-browser.c | 11 +++++++++++ midori/midori-preferences.c | 19 +++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8ae8e230..2e89252e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1428,6 +1428,15 @@ midori_browser_menu_trash_activate_cb (GtkWidget* widget, SOKOKE_MENU_POSITION_RIGHT); } +static void +midori_preferences_response_help_cb (GtkWidget* preferences, + gint response, + MidoriBrowser* browser) +{ + if (response == GTK_RESPONSE_HELP) + gtk_action_activate (_action_by_name (browser, "HelpContents")); +} + static void _action_preferences_activate (GtkAction* action, MidoriBrowser* browser) @@ -1440,6 +1449,8 @@ _action_preferences_activate (GtkAction* action, { dialog = midori_preferences_new (GTK_WINDOW (browser), browser->settings); + g_signal_connect (dialog, "response", + G_CALLBACK (midori_preferences_response_help_cb), browser); gtk_widget_show (dialog); } } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 47fa3c4b..23caa880 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -64,13 +64,23 @@ midori_preferences_class_init (MidoriPreferencesClass* class) G_PARAM_WRITABLE)); } +static void +midori_preferences_response_cb (MidoriPreferences* preferences, + gint response) +{ + if (response == GTK_RESPONSE_CLOSE) + gtk_widget_destroy (GTK_WIDGET (preferences)); +} + static void midori_preferences_init (MidoriPreferences* preferences) { + gchar* dialog_title; + preferences->notebook = NULL; - gchar* dialog_title = g_strdup_printf (_("%s Preferences"), - g_get_application_name ()); + dialog_title = g_strdup_printf (_("%s Preferences"), + g_get_application_name ()); g_object_set (preferences, "icon-name", GTK_STOCK_PREFERENCES, "title", dialog_title, @@ -80,11 +90,8 @@ midori_preferences_init (MidoriPreferences* preferences) GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - /* TODO: Implement some kind of help function */ - gtk_dialog_set_response_sensitive (GTK_DIALOG (preferences), - GTK_RESPONSE_HELP, FALSE); g_signal_connect (preferences, "response", - G_CALLBACK (gtk_widget_destroy), preferences); + G_CALLBACK (midori_preferences_response_cb), NULL); /* TODO: Do we want tooltips for explainations or can we omit that? */ g_free (dialog_title); From ba681359f56b03310b6aee4c96fb46a48506cc3e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Oct 2008 00:56:05 +0200 Subject: [PATCH 0345/2970] Undo the Primary Clipboard hack, WebKit has it now --- midori/midori-view.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index c35646f8..7873e237 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1228,23 +1228,6 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, return FALSE; } -static gboolean -gtk_widget_button_release_event_cb (WebKitWebView* web_view, - GdkEventButton* event, - MidoriView* view) -{ - GtkClipboard* clipboard; - gchar* text; - - /* Emulate the primary clipboard, which WebKit doesn't support */ - text = webkit_web_view_get_selected_text (WEBKIT_WEB_VIEW (web_view)); - clipboard = gtk_clipboard_get_for_display ( - gtk_widget_get_display (GTK_WIDGET (web_view)), GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text (clipboard, text, -1); - g_free (text); - return FALSE; -} - static gboolean gtk_widget_scroll_event_cb (WebKitWebView* web_view, GdkEventScroll* event, @@ -1505,8 +1488,6 @@ midori_view_realize (MidoriView* view) webkit_web_view_hovering_over_link_cb, view, "signal::button-press-event", gtk_widget_button_press_event_cb, view, - "signal::button-release-event", - gtk_widget_button_release_event_cb, view, "signal::scroll-event", gtk_widget_scroll_event_cb, view, "signal::populate-popup", From f7436303f68b382206b6964f90400f46f9088145 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Oct 2008 01:00:34 +0200 Subject: [PATCH 0346/2970] Move Find items to Edit again --- midori/midori-browser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2e89252e..e78c6cf9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2673,6 +2673,10 @@ static const gchar* ui_markup = "" "" "" + "" + "" + "" + "" "" "" "

" @@ -2707,10 +2711,6 @@ static const gchar* ui_markup = "" "" "" - "" - "" - "" - "" "" "" "" From aa5602ec9ea6abb64fea1ae9c4f11d05b084a974 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Oct 2008 01:45:17 +0200 Subject: [PATCH 0347/2970] Add Always Show Tabbar preference --- midori/midori-browser.c | 27 ++++++++++++++++++++++++++- midori/midori-preferences.c | 14 ++++++++------ midori/midori-websettings.c | 17 +++++++++++++++++ 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e78c6cf9..163ae484 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -167,14 +167,31 @@ _midori_browser_open_uri (MidoriBrowser* browser, midori_view_set_uri (MIDORI_VIEW (view), uri); } +static void +_toggle_tabbar_smartly (MidoriBrowser* browser) +{ + guint n; + gboolean always_show_tabbar; + + n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); + if (n < 2) + { + g_object_get (browser->settings, "always-show-tabbar", + &always_show_tabbar, NULL); + if (always_show_tabbar) + n++; + } + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); +} + static void _midori_browser_update_actions (MidoriBrowser* browser) { guint n; gboolean trash_empty; + _toggle_tabbar_smartly (browser); n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), n > 1); _action_set_sensitive (browser, "TabClose", n > 1); _action_set_sensitive (browser, "TabPrevious", n > 1); _action_set_sensitive (browser, "TabNext", n > 1); @@ -695,6 +712,11 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, midori_browser_tab_destroy_cb, browser); g_signal_emit (browser, signals[REMOVE_TAB], 0, widget); + + /* We don't ever want to be in a situation with no tabs, + so just create an empty one if the last one is closed. */ + if (!midori_browser_get_current_tab (browser)) + midori_browser_add_uri (browser, ""); return FALSE; } @@ -3369,6 +3391,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) } _midori_browser_set_toolbar_style (browser, toolbar_style); + _toggle_tabbar_smartly (browser); if (browser->search_engines) { @@ -3412,6 +3435,8 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, if (name == g_intern_string ("toolbar-style")) _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); + else if (name == g_intern_string ("always-show-tabbar")) + _toggle_tabbar_smartly (browser); else if (name == g_intern_string ("show-new-tab")) sokoke_widget_set_visible (browser->button_tab_new, g_value_get_boolean (&value)); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 23caa880..2ea831b8 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -339,18 +339,20 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (_("Interface")); FRAME_NEW (_("Navigationbar")); - TABLE_NEW (3, 2); + TABLE_NEW (4, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); - button = katze_property_proxy (settings, "show-new-tab", NULL); + button = katze_property_proxy (settings, "always-show-tabbar", NULL); INDENTED_ADD (button, 0, 1, 1, 2); - button = katze_property_proxy (settings, "show-web-search", NULL); - SPANNED_ADD (button, 1, 2, 1, 2); - button = katze_property_proxy (settings, "show-homepage", NULL); + button = katze_property_proxy (settings, "show-new-tab", NULL); INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "show-trash", NULL); + button = katze_property_proxy (settings, "show-web-search", NULL); SPANNED_ADD (button, 1, 2, 2, 3); + button = katze_property_proxy (settings, "show-homepage", NULL); + INDENTED_ADD (button, 0, 1, 3, 4); + button = katze_property_proxy (settings, "show-trash", NULL); + SPANNED_ADD (button, 1, 2, 3, 4); FRAME_NEW (_("Browsing")); TABLE_NEW (3, 2); /* label = katze_property_label (settings, "open-new-pages-in"); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 110d19b3..4d234ebf 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -34,6 +34,7 @@ struct _MidoriWebSettings gboolean show_statusbar; MidoriToolbarStyle toolbar_style; + gboolean always_show_tabbar; gboolean show_new_tab; gboolean show_homepage; gboolean show_web_search; @@ -86,6 +87,7 @@ enum PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, + PROP_ALWAYS_SHOW_TABBAR, PROP_SHOW_NEW_TAB, PROP_SHOW_HOMEPAGE, PROP_SHOW_WEB_SEARCH, @@ -345,6 +347,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TOOLBAR_DEFAULT, flags)); + g_object_class_install_property (gobject_class, + PROP_ALWAYS_SHOW_TABBAR, + g_param_spec_boolean ( + "always-show-tabbar", + _("Always Show Tabbar"), + _("Always show the tabbar"), + FALSE, + flags)); + g_object_class_install_property (gobject_class, PROP_SHOW_NEW_TAB, g_param_spec_boolean ( @@ -669,6 +680,9 @@ midori_web_settings_set_property (GObject* object, case PROP_TOOLBAR_STYLE: web_settings->toolbar_style = g_value_get_enum (value); break; + case PROP_ALWAYS_SHOW_TABBAR: + web_settings->always_show_tabbar = g_value_get_boolean (value); + break; case PROP_SHOW_NEW_TAB: web_settings->show_new_tab = g_value_get_boolean (value); break; @@ -824,6 +838,9 @@ midori_web_settings_get_property (GObject* object, case PROP_TOOLBAR_STYLE: g_value_set_enum (value, web_settings->toolbar_style); break; + case PROP_ALWAYS_SHOW_TABBAR: + g_value_set_boolean (value, web_settings->always_show_tabbar); + break; case PROP_SHOW_NEW_TAB: g_value_set_boolean (value, web_settings->show_new_tab); break; From ba6386850ec44184801b86a299742222ae3b8750 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Oct 2008 23:25:02 +0200 Subject: [PATCH 0348/2970] Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need. --- midori/Makefile.am | 2 +- midori/midori-browser.c | 196 +++--- midori/midori-searchaction.c | 1140 ++++++++++++++++++++++++++++++++++ midori/midori-searchaction.h | 64 ++ midori/midori-searchentry.c | 891 -------------------------- midori/midori-searchentry.h | 69 -- po/POTFILES.in | 2 +- 7 files changed, 1300 insertions(+), 1064 deletions(-) create mode 100644 midori/midori-searchaction.c create mode 100644 midori/midori-searchaction.h delete mode 100644 midori/midori-searchentry.c delete mode 100644 midori/midori-searchentry.h diff --git a/midori/Makefile.am b/midori/Makefile.am index 3c327a3f..627c49a5 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -32,7 +32,7 @@ midori_SOURCES = \ midori-source.c midori-source.h \ midori-websettings.c midori-websettings.h \ midori-preferences.c midori-preferences.h \ - midori-searchentry.c midori-searchentry.h \ + midori-searchaction.c midori-searchaction.h \ midori-locationentry.c midori-locationentry.h \ midori-locationaction.c midori-locationaction.h \ gjs.c gjs.h \ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 163ae484..24426dbc 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -21,8 +21,8 @@ #include "midori-panel.h" #include "midori-addons.h" #include "midori-console.h" -#include "midori-searchentry.h" #include "midori-locationaction.h" +#include "midori-searchaction.h" #include "midori-stock.h" #include "gtkiconentry.h" @@ -1758,30 +1758,75 @@ static void _action_search_activate (GtkAction* action, MidoriBrowser* browser) { - if (!GTK_WIDGET_VISIBLE (browser->search)) - gtk_widget_show (browser->search); if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) gtk_widget_show (browser->navigationbar); - gtk_widget_grab_focus (browser->search); } -static gboolean -midori_browser_search_focus_out_event_cb (GtkWidget* widget, - GdkEventFocus* event, - MidoriBrowser* browser) +static void +_action_search_submit (GtkAction* action, + const gchar* keywords, + gboolean new_tab, + MidoriBrowser* browser) { - gboolean show_navigationbar; - gboolean show_web_search; + guint last_web_search; + KatzeItem* item; + const gchar* url; + gchar* location_entry_search; + gchar* search; - g_object_get (browser->settings, - "show-navigationbar", &show_navigationbar, - "show-web-search", &show_web_search, - NULL); - if (!show_navigationbar) + g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); + item = katze_array_get_nth_item (browser->search_engines, last_web_search); + if (item) + { + location_entry_search = NULL; + url = katze_item_get_uri (item); + } + else /* The location entry search is our fallback */ + { + g_object_get (browser->settings, "location-entry-search", + &location_entry_search, NULL); + url = location_entry_search; + } + if (strstr (url, "%s")) + search = g_strdup_printf (url, keywords); + else + search = g_strconcat (url, " ", keywords, NULL); + + if (new_tab) + midori_browser_add_uri (browser, search); + else + _midori_browser_open_uri (browser, search); + + g_free (search); + g_free (location_entry_search); +} + +static void +_action_search_notify_current_item (GtkAction* action, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + MidoriSearchAction* search_action; + KatzeItem* item; + guint index; + + search_action = MIDORI_SEARCH_ACTION (action); + item = midori_search_action_get_current_item (search_action); + if (item) + index = katze_array_get_item_index (browser->search_engines, item); + else + index = 0; + + g_object_set (browser->settings, "last-web-search", index, NULL); +} + +static void +_action_search_focus_out (GtkAction* action, + MidoriBrowser* browser) +{ + if (GTK_WIDGET_VISIBLE (browser->statusbar) && + !sokoke_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_hide (browser->navigationbar); - if (!show_web_search) - gtk_widget_hide (browser->search); - return FALSE; } static void @@ -2092,8 +2137,8 @@ _action_manage_search_engines_activate (GtkAction* action, { GtkWidget* dialog; - dialog = midori_search_entry_get_dialog ( - MIDORI_SEARCH_ENTRY (browser->search)); + dialog = midori_search_action_get_dialog ( + MIDORI_SEARCH_ACTION (_action_by_name (browser, "Search"))); if (GTK_WIDGET_VISIBLE (dialog)) gtk_window_present (GTK_WINDOW (dialog)); else @@ -2523,9 +2568,6 @@ static const GtkActionEntry entries[] = { { "Homepage", STOCK_HOMEPAGE, NULL, "Home", N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, - { "Search", GTK_STOCK_FIND, - N_("_Web Search..."), "k", - N_("Run a web search"), G_CALLBACK (_action_search_activate) }, { "OpenInPageholder", GTK_STOCK_JUMP_TO, N_("Open in Page_holder..."), "", N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) }, @@ -2764,7 +2806,7 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" "" "" @@ -2800,43 +2842,6 @@ midori_browser_realize_cb (GtkStyle* style, } } -static void -midori_browser_search_activate_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - KatzeArray* search_engines; - const gchar* keywords; - guint last_web_search; - KatzeItem* item; - const gchar* url; - gchar* location_entry_search; - gchar* search; - - search_engines = browser->search_engines; - keywords = gtk_entry_get_text (GTK_ENTRY (widget)); - g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); - item = katze_array_get_nth_item (search_engines, last_web_search); - if (item) - { - location_entry_search = NULL; - url = katze_item_get_uri (item); - } - else /* The location entry search is our fallback */ - { - g_object_get (browser->settings, "location-entry-search", - &location_entry_search, NULL); - url = location_entry_search; - } - if (strstr (url, "%s")) - search = g_strdup_printf (url, keywords); - else - search = g_strconcat (url, " ", keywords, NULL); - sokoke_entry_append_completion (GTK_ENTRY (widget), keywords); - _midori_browser_open_uri (browser, search); - g_free (search); - g_free (location_entry_search); -} - static void midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, gint icon_pos, @@ -2847,25 +2852,6 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, gtk_entry_set_text (GTK_ENTRY (entry), ""); } -static void -midori_browser_search_notify_current_item_cb (GObject* gobject, - GParamSpec* arg1, - MidoriBrowser* browser) -{ - MidoriSearchEntry* search_entry; - KatzeItem* item; - guint index; - - search_entry = MIDORI_SEARCH_ENTRY (browser->search); - item = midori_search_entry_get_current_item (search_entry); - if (item) - index = katze_array_get_item_index (browser->search_engines, item); - else - index = 0; - - g_object_set (browser->settings, "last-web-search", index, NULL); -} - static void midori_browser_init (MidoriBrowser* browser) { @@ -2958,6 +2944,26 @@ midori_browser_init (MidoriBrowser* browser) action, "L"); g_object_unref (action); + action = g_object_new (MIDORI_TYPE_SEARCH_ACTION, + "name", "Search", + "label", _("_Web Search..."), + "stock-id", GTK_STOCK_FIND, + "tooltip", _("Run a web search"), + NULL); + g_object_connect (action, + "signal::activate", + _action_search_activate, browser, + "signal::submit", + _action_search_submit, browser, + "signal::focus-out", + _action_search_focus_out, browser, + "signal::notify::current-item", + _action_search_notify_current_item, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, + action, "K"); + g_object_unref (action); + /* Create the menubar */ browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new (); @@ -3009,24 +3015,9 @@ midori_browser_init (MidoriBrowser* browser) g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); browser->button_homepage = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/Homepage"); + browser->search = gtk_ui_manager_get_widget ( + ui_manager, "/toolbar_navigation/Search"); - /* Search */ - browser->search = midori_search_entry_new (); - /* TODO: Make this actively resizable or enlarge to fit contents? - The interface is somewhat awkward and ought to be rethought - Display "show in context menu" search engines as "completion actions" */ - sokoke_entry_setup_completion (GTK_ENTRY (browser->search)); - g_object_connect (browser->search, - "signal::activate", - midori_browser_search_activate_cb, browser, - "signal::focus-out-event", - midori_browser_search_focus_out_event_cb, browser, - "signal::notify::current-item", - midori_browser_search_notify_current_item_cb, browser, - NULL); - toolitem = gtk_tool_item_new (); - gtk_container_add (GTK_CONTAINER (toolitem), browser->search); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), toolitem, -1); action = gtk_action_group_get_action (browser->action_group, "Trash"); browser->button_trash = gtk_action_create_tool_item (action); g_signal_connect (browser->button_trash, "clicked", @@ -3398,8 +3389,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) item = katze_array_get_nth_item (browser->search_engines, last_web_search); if (item) - midori_search_entry_set_current_item ( - MIDORI_SEARCH_ENTRY (browser->search), item); + midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( + _action_by_name (browser, "Search")), item); } gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), @@ -3574,8 +3565,8 @@ midori_browser_set_property (GObject* object, ; /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_get_object (value)); g_object_ref (browser->search_engines); - g_object_set (browser->search, "search-engines", - browser->search_engines, NULL); + midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( + _action_by_name (browser, "Search")), browser->search_engines); /* FIXME: Connect to updates */ if (browser->settings) { @@ -3583,7 +3574,8 @@ midori_browser_set_property (GObject* object, &last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, last_web_search); - g_object_set (browser->search, "current-item", item, NULL); + midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( + _action_by_name (browser, "Search")), item); } break; default: diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c new file mode 100644 index 00000000..549c60f2 --- /dev/null +++ b/midori/midori-searchaction.c @@ -0,0 +1,1140 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-searchaction.h" + +#include "gtkiconentry.h" +#include "sokoke.h" + +#include +#include +#include +#include + +struct _MidoriSearchAction +{ + GtkAction parent_instance; + + KatzeArray* search_engines; + KatzeItem* current_item; + gchar* text; + + GtkWidget* last_proxy; + + GtkWidget* dialog; + GtkWidget* treeview; + GtkWidget* edit_button; + GtkWidget* remove_button; +}; + +struct _MidoriSearchActionClass +{ + GtkActionClass parent_class; +}; + +G_DEFINE_TYPE (MidoriSearchAction, midori_search_action, GTK_TYPE_ACTION) + +enum +{ + PROP_0, + + PROP_SEARCH_ENGINES, + PROP_CURRENT_ITEM, + PROP_TEXT, + PROP_DIALOG +}; + +enum +{ + SUBMIT, + FOCUS_OUT, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +midori_search_action_finalize (GObject* object); + +static void +midori_search_action_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_search_action_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_search_action_activate (GtkAction* object); + +static GtkWidget* +midori_search_action_create_tool_item (GtkAction* action); + +static void +midori_search_action_connect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +midori_search_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void(*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, + const gchar* arg_1, + gboolean arg_2, + gpointer data2); + register GMarshalFunc_VOID__STRING_BOOLEAN callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data + ? marshal_data : cc->callback); + callback (data1, + g_value_get_string (param_values + 1), + g_value_get_boolean (param_values + 2), + data2); +} + +static void +midori_search_action_class_init (MidoriSearchActionClass* class) +{ + GObjectClass* gobject_class; + GtkActionClass* action_class; + + signals[SUBMIT] = g_signal_new ("submit", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + midori_cclosure_marshal_VOID__STRING_BOOLEAN, + G_TYPE_NONE, 2, + G_TYPE_STRING, + G_TYPE_BOOLEAN); + + signals[FOCUS_OUT] = g_signal_new ("focus-out", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_search_action_finalize; + gobject_class->set_property = midori_search_action_set_property; + gobject_class->get_property = midori_search_action_get_property; + + action_class = GTK_ACTION_CLASS (class); + action_class->activate = midori_search_action_activate; + action_class->create_tool_item = midori_search_action_create_tool_item; + action_class->connect_proxy = midori_search_action_connect_proxy; + action_class->disconnect_proxy = midori_search_action_disconnect_proxy; + + g_object_class_install_property (gobject_class, + PROP_SEARCH_ENGINES, + g_param_spec_object ( + "search-engines", + _("Search Engines"), + _("The list of search engines"), + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_CURRENT_ITEM, + g_param_spec_object ( + "current-item", + _("Current Item"), + _("The currently selected item"), + KATZE_TYPE_ITEM, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_TEXT, + g_param_spec_string ( + "text", + _("Text"), + _("The current text typed in the entry"), + NULL, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_DIALOG, + g_param_spec_object ( + "dialog", + _("Dialog"), + _("A dialog to manage search engines"), + GTK_TYPE_DIALOG, + G_PARAM_READABLE)); +} + +static void +midori_search_action_init (MidoriSearchAction* search_action) +{ + search_action->search_engines = NULL; + search_action->current_item = NULL; + search_action->text = NULL; + + search_action->last_proxy = NULL; + + search_action->dialog = NULL; + search_action->treeview = NULL; + search_action->edit_button = NULL; + search_action->remove_button = NULL; +} + +static void +midori_search_action_finalize (GObject* object) +{ + MidoriSearchAction* search_action = MIDORI_SEARCH_ACTION (object); + + g_free (search_action->text); + + G_OBJECT_CLASS (midori_search_action_parent_class)->finalize (object); +} + +static void +midori_search_action_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriSearchAction* search_action = MIDORI_SEARCH_ACTION (object); + + switch (prop_id) + { + case PROP_SEARCH_ENGINES: + midori_search_action_set_search_engines (search_action, + g_value_get_object (value)); + break; + case PROP_CURRENT_ITEM: + midori_search_action_set_current_item (search_action, + g_value_get_object (value)); + break; + case PROP_TEXT: + midori_search_action_set_text (search_action, + g_value_get_string (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_search_action_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriSearchAction* search_action = MIDORI_SEARCH_ACTION (object); + + switch (prop_id) + { + case PROP_SEARCH_ENGINES: + g_value_set_object (value, search_action->search_engines); + break; + case PROP_CURRENT_ITEM: + g_value_set_object (value, search_action->current_item); + break; + case PROP_TEXT: + g_value_set_string (value, search_action->text); + break; + case PROP_DIALOG: + g_value_set_object (value, + midori_search_action_get_dialog (search_action)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_search_action_activate (GtkAction* action) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + proxies = gtk_action_get_proxies (action); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + /* Obviously only one widget can end up with the focus. + Yet we can't predict which one that is, can we? */ + gtk_widget_grab_focus (entry); + MIDORI_SEARCH_ACTION (action)->last_proxy = proxies->data; + } + while ((proxies = g_slist_next (proxies))); + + if (GTK_ACTION_CLASS (midori_search_action_parent_class)->activate) + GTK_ACTION_CLASS (midori_search_action_parent_class)->activate (action); +} + +static GtkWidget* +midori_search_action_create_tool_item (GtkAction* action) +{ + GtkWidget* toolitem; + GtkWidget* entry; + GtkWidget* alignment; + + toolitem = GTK_WIDGET (gtk_tool_item_new ()); + entry = gtk_icon_entry_new (); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, TRUE); + alignment = gtk_alignment_new (0, 0.5, 1, 0.1); + gtk_container_add (GTK_CONTAINER (alignment), entry); + gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (toolitem), alignment); + gtk_widget_show (alignment); + + MIDORI_SEARCH_ACTION (action)->last_proxy = GTK_WIDGET (toolitem); + return GTK_WIDGET (toolitem); +} + +static void +_midori_search_action_move_index (MidoriSearchAction* search_action, + guint n) +{ + gint i; + KatzeItem* item; + + i = katze_array_get_item_index (search_action->search_engines, + search_action->current_item); + item = katze_array_get_nth_item (search_action->search_engines, i + n); + if (item) + midori_search_action_set_current_item (search_action, item); +} + +static gboolean +midori_search_action_key_press_event_cb (GtkWidget* entry, + GdkEventKey* event, + MidoriSearchAction* search_action) +{ + const gchar* text; + + switch (event->keyval) + { + case GDK_ISO_Enter: + case GDK_KP_Enter: + case GDK_Return: + text = gtk_entry_get_text (GTK_ENTRY (entry)); + g_signal_emit (search_action, signals[SUBMIT], 0, text, + (event->state & GDK_MOD1_MASK) ? TRUE : FALSE); + search_action->last_proxy = entry; + return TRUE; + case GDK_Up: + if (event->state & GDK_CONTROL_MASK) + _midori_search_action_move_index (search_action, - 1); + return TRUE; + case GDK_Down: + if (event->state & GDK_CONTROL_MASK) + _midori_search_action_move_index (search_action, + 1); + return TRUE; + } + + return FALSE; +} + +static gboolean +midori_search_action_focus_out_event_cb (GtkWidget* widget, + GdkEventKey* event, + GtkAction* action) +{ + g_signal_emit (action, signals[FOCUS_OUT], 0); + return FALSE; +} + +static void +midori_search_action_engine_activate_cb (GtkWidget* menuitem, + MidoriSearchAction* search_action) +{ + KatzeItem* item; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "engine"); + midori_search_action_set_current_item (search_action, item); +} + +static void +midori_search_action_manage_activate_cb (GtkWidget* menuitem, + MidoriSearchAction* search_action) +{ + GtkWidget* dialog; + + dialog = midori_search_action_get_dialog (search_action); + if (GTK_WIDGET_VISIBLE (dialog)) + gtk_window_present (GTK_WINDOW (dialog)); + else + gtk_widget_show (dialog); +} + +static void +midori_search_action_icon_released_cb (GtkWidget* entry, + GtkIconEntryPosition icon_pos, + gint button, + GtkAction* action) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + return; + + KatzeArray* search_engines; + GtkWidget* menu; + guint n, i; + GtkWidget* menuitem; + KatzeItem* item; + GdkPixbuf* pixbuf; + GtkWidget* icon; + + search_engines = MIDORI_SEARCH_ACTION (action)->search_engines; + menu = gtk_menu_new (); + n = katze_array_get_length (search_engines); + if (n) + { + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (search_engines, i); + menuitem = gtk_image_menu_item_new_with_label ( + katze_item_get_name (item)); + pixbuf = sokoke_web_icon (katze_item_get_icon (item), + GTK_ICON_SIZE_MENU, menuitem); + icon = gtk_image_new_from_pixbuf (pixbuf); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + g_object_unref (pixbuf); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "engine", item); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_search_action_engine_activate_cb), action); + gtk_widget_show (menuitem); + } + } + else + { + menuitem = gtk_image_menu_item_new_with_label (_("Empty")); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } + + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Manage Search Engines")); + icon = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_search_action_manage_activate_cb), action); + gtk_widget_show (menuitem); + sokoke_widget_popup (entry, GTK_MENU (menu), + NULL, SOKOKE_MENU_POSITION_LEFT); +} + +static gboolean +midori_search_action_scroll_event_cb (GtkWidget* entry, + GdkEventScroll* event, + MidoriSearchAction* search_action) +{ + if (event->direction == GDK_SCROLL_DOWN) + _midori_search_action_move_index (search_action, + 1); + else if (event->direction == GDK_SCROLL_UP) + _midori_search_action_move_index (search_action, - 1); + return FALSE; +} + +static void +midori_search_action_connect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + GtkWidget* alignment; + GtkWidget* entry; + + GTK_ACTION_CLASS (midori_search_action_parent_class)->connect_proxy ( + action, proxy); + + if (GTK_IS_TOOL_ITEM (proxy)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxy)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + g_object_connect (entry, + "signal::key-press-event", + midori_search_action_key_press_event_cb, action, + "signal::focus-out-event", + midori_search_action_focus_out_event_cb, action, + "signal::icon-released", + midori_search_action_icon_released_cb, action, + "signal::scroll-event", + midori_search_action_scroll_event_cb, action, + NULL); + } + + MIDORI_SEARCH_ACTION (action)->last_proxy = proxy; +} + +static void +midori_search_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + GSList* proxies; + + /* FIXME: This is wrong */ + g_signal_handlers_disconnect_by_func (proxy, + G_CALLBACK (gtk_action_activate), action); + + GTK_ACTION_CLASS (midori_search_action_parent_class)->disconnect_proxy + (action, proxy); + + if (MIDORI_SEARCH_ACTION (action)->last_proxy == proxy) + { + proxies = gtk_action_get_proxies (action); + if (proxies) + MIDORI_SEARCH_ACTION (action)->last_proxy = proxies->data; + } +} + +const gchar* +midori_search_action_get_text (MidoriSearchAction* search_action) +{ + g_return_val_if_fail (MIDORI_IS_SEARCH_ACTION (search_action), NULL); + + return search_action->text; +} + +void +midori_search_action_set_text (MidoriSearchAction* search_action, + const gchar* text) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); + g_return_if_fail (text != NULL); + + katze_assign (search_action->text, g_strdup (text)); + g_object_notify (G_OBJECT (search_action), "text"); + + proxies = gtk_action_get_proxies (GTK_ACTION (search_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + gtk_entry_set_text (GTK_ENTRY (entry), text); + search_action->last_proxy = proxies->data; + } + while ((proxies = g_slist_next (proxies))); +} + +KatzeArray* +midori_search_action_get_search_engines (MidoriSearchAction* search_action) +{ + g_return_val_if_fail (MIDORI_IS_SEARCH_ACTION (search_action), NULL); + + return search_action->search_engines; +} + +static void +midori_search_action_engines_add_item_cb (KatzeArray* list, + KatzeItem* item, + MidoriSearchAction* search_action) +{ + if (!search_action->current_item) + midori_search_action_set_current_item (search_action, item); +} + +static void +midori_search_action_engines_remove_item_cb (KatzeArray* list, + KatzeItem* item, + MidoriSearchAction* search_action) +{ + KatzeItem* found_item; + + if (search_action->current_item == item) + { + found_item = katze_array_get_nth_item (list, 0); + midori_search_action_set_current_item (search_action, found_item); + } +} + +void +midori_search_action_set_search_engines (MidoriSearchAction* search_action, + KatzeArray* search_engines) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); + g_return_if_fail (!search_engines || + katze_array_is_a (search_engines, KATZE_TYPE_ITEM)); + + /* FIXME: Disconnect old search engines */ + /* FIXME: Disconnect and reconnect dialog signals */ + + if (search_engines) + g_object_ref (search_engines); + katze_object_assign (search_action->search_engines, search_engines); + + g_object_connect (search_engines, + "signal-after::add-item", + midori_search_action_engines_add_item_cb, search_action, + "signal-after::remove-item", + midori_search_action_engines_remove_item_cb, search_action, + NULL); + + g_object_notify (G_OBJECT (search_action), "search-engines"); + + proxies = gtk_action_get_proxies (GTK_ACTION (search_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + /* FIXME: Unset the current item if it isn't in the list */ + } + while ((proxies = g_slist_next (proxies))); +} + +KatzeItem* +midori_search_action_get_current_item (MidoriSearchAction* search_action) +{ + g_return_val_if_fail (MIDORI_IS_SEARCH_ACTION (search_action), NULL); + + return search_action->current_item; +} + +void +midori_search_action_set_current_item (MidoriSearchAction* search_action, + KatzeItem* item) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + GdkPixbuf* pixbuf; + + g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); + g_return_if_fail (!item || KATZE_IS_ITEM (item)); + + if (item) + g_object_ref (item); + katze_object_assign (search_action->current_item, item); + + proxies = gtk_action_get_proxies (GTK_ACTION (search_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + pixbuf = sokoke_web_icon (item ? katze_item_get_icon (item) : NULL, + GTK_ICON_SIZE_MENU, entry); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, pixbuf); + g_object_unref (pixbuf); + if (item) + sokoke_entry_set_default_text (GTK_ENTRY (entry), + katze_item_get_name (item)); + else + sokoke_entry_set_default_text (GTK_ENTRY (entry), ""); + } + while ((proxies = g_slist_next (proxies))); +} + +static void +midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + const gchar* icon; + GdkPixbuf* pixbuf; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + icon = katze_item_get_icon (item); + if (icon) + { + pixbuf = sokoke_web_icon (icon, GTK_ICON_SIZE_DND, treeview); + g_object_set (renderer, "pixbuf", pixbuf, NULL); + if (pixbuf) + g_object_unref (pixbuf); + } + else + g_object_set (renderer, "pixbuf", NULL, NULL); +} + +static void +midori_search_action_dialog_render_text (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + const gchar* name; + const gchar* text; + gchar* markup; + + gtk_tree_model_get (model, iter, 0, &item, -1); + name = katze_item_get_name (item); + text = katze_item_get_text (item); + markup = g_markup_printf_escaped ("%s\n%s", name, text ? text : ""); + g_object_set (renderer, "markup", markup, NULL); + g_free (markup); +} + +static void +midori_search_action_editor_name_changed_cb (GtkWidget* entry, + GtkWidget* dialog) +{ + const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, text && *text); +} + +static inline const gchar* +STR_NON_NULL (const gchar* string) +{ + return string ? string : ""; +} + +static void +midori_search_action_get_editor (MidoriSearchAction* search_action, + gboolean new_engine) +{ + GtkWidget* toplevel; + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + KatzeItem* item; + GtkWidget* hbox; + GtkWidget* label; + GtkTreeModel* liststore; + GtkTreeIter iter; + GtkTreeSelection* selection; + GtkWidget* entry_name; + GtkWidget* entry_description; + GtkWidget* entry_uri; + GtkWidget* entry_icon; + GtkWidget* entry_token; + + toplevel = gtk_widget_get_toplevel (search_action->treeview); + dialog = gtk_dialog_new_with_buttons ( + new_engine ? _("Add search engine") : _("Edit search engine"), + toplevel ? GTK_WINDOW (toplevel) : NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + new_engine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), + new_engine ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + if (new_engine) + { + item = katze_item_new (); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_ACCEPT, FALSE); + } + else + { + selection = gtk_tree_view_get_selection ( + GTK_TREE_VIEW (search_action->treeview)); + gtk_tree_selection_get_selected (selection, &liststore, &iter); + gtk_tree_model_get (liststore, &iter, 0, &item, -1); + } + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Name:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_name = gtk_entry_new (); + g_signal_connect (entry_name, "changed", + G_CALLBACK (midori_search_action_editor_name_changed_cb), dialog); + gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_name), + STR_NON_NULL (katze_item_get_name (item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Description:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_description = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_description) + , STR_NON_NULL (katze_item_get_text (item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_URL:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_uri = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_uri) + , STR_NON_NULL (katze_item_get_uri (item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Icon (name or file):")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_icon = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_icon) + , STR_NON_NULL (katze_item_get_icon (item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Token:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry_token = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE); + if (!new_engine) + gtk_entry_set_text (GTK_ENTRY (entry_token) + , STR_NON_NULL (katze_item_get_token (item))); + gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + g_object_set (item, + "name", gtk_entry_get_text (GTK_ENTRY (entry_name)), + "text", gtk_entry_get_text (GTK_ENTRY (entry_description)), + "uri", gtk_entry_get_text (GTK_ENTRY (entry_uri)), + "icon", gtk_entry_get_text (GTK_ENTRY (entry_icon)), + "token", gtk_entry_get_text (GTK_ENTRY (entry_token)), + NULL); + + if (new_engine) + katze_array_add_item (search_action->search_engines, item); + } + gtk_widget_destroy (dialog); +} + +static void +midori_search_action_dialog_add_cb (GtkWidget* widget, + MidoriSearchAction* search_action) +{ + midori_search_action_get_editor (search_action, TRUE); +} + +static void +midori_search_action_dialog_edit_cb (GtkWidget* widget, + MidoriSearchAction* search_action) +{ + GtkWidget* treeview; + GtkTreeSelection* selection; + + treeview = search_action->treeview; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (gtk_tree_selection_get_selected (selection, NULL, NULL)) + midori_search_action_get_editor (search_action, FALSE); +} + +static void +midori_search_action_dialog_remove_cb (GtkWidget* widget, + MidoriSearchAction* search_action) +{ + KatzeArray* search_engines; + GtkWidget* treeview; + GtkTreeSelection* selection; + GtkTreeModel* liststore; + GtkTreeIter iter; + KatzeItem* item; + + search_engines = search_action->search_engines; + treeview = search_action->treeview; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) + { + gtk_tree_model_get (liststore, &iter, 0, &item, -1); + katze_array_remove_item (search_engines, item); + g_object_unref (item); + /* FIXME: we want to allow undo of some kind */ + } +} + +static void +midori_search_action_treeview_selection_cb (GtkTreeSelection* selection, + MidoriSearchAction* search_action) +{ + gboolean selected; + + selected = gtk_tree_selection_get_selected (selection, NULL, NULL); + + gtk_widget_set_sensitive (search_action->edit_button, selected); + gtk_widget_set_sensitive (search_action->remove_button, selected); +} + +static void +midori_search_action_dialog_engines_add_item_cb (KatzeArray* list, + KatzeItem* item, + GtkAction* action) +{ + MidoriSearchAction* search_action; + GtkTreeModel* liststore; + GtkTreeIter iter; + + search_action = MIDORI_SEARCH_ACTION (action); + liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (search_action->treeview)); + gtk_list_store_append (GTK_LIST_STORE (liststore), &iter); + gtk_list_store_set (GTK_LIST_STORE (liststore), &iter, 0, item, -1); +} + +static void +midori_search_action_dialog_engines_remove_item_cb (KatzeArray* list, + KatzeItem* item, + GtkAction* action) +{ + MidoriSearchAction* search_action; + GtkTreeModel* liststore; + GtkTreeIter iter; + gboolean valid; + KatzeItem* found_item; + + search_action = MIDORI_SEARCH_ACTION (action); + liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (search_action->treeview)); + valid = gtk_tree_model_get_iter_first (liststore, &iter); + while (valid) + { + gtk_tree_model_get (liststore, &iter, 0, &found_item, -1); + if (found_item == item) + { + gtk_list_store_remove (GTK_LIST_STORE (liststore), &iter); + valid = FALSE; + } + else + valid = gtk_tree_model_iter_next (liststore, &iter); + } +} + +static void +midori_search_action_treeview_destroy_cb (GtkWidget* treeview, + MidoriSearchAction* search_action) +{ + g_signal_handlers_disconnect_by_func ( + search_action->search_engines, + midori_search_action_dialog_engines_add_item_cb, search_action); + g_signal_handlers_disconnect_by_func ( + search_action->search_engines, + midori_search_action_dialog_engines_remove_item_cb, search_action); +} + +/** + * midori_search_action_get_dialog: + * @search_action: a #MidoriSearchAction + * + * Obtains a dialog that provides an interface for managing + * the list of search engines. + * + * The dialog is created once and this function will return + * the very same dialog until it is destroyed, in which case + * a new dialog is created. + * + * Return value: a #GtkDialog + **/ +GtkWidget* +midori_search_action_get_dialog (MidoriSearchAction* search_action) +{ + const gchar* dialog_title; + GtkWidget* toplevel; + GtkWidget* dialog; + gint width, height; + GtkWidget* xfce_heading; + GtkWidget* hbox; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkListStore* liststore; + GtkWidget* treeview; + GtkWidget* scrolled; + guint n, i; + KatzeItem* item; + GtkWidget* vbox; + GtkWidget* button; + + g_return_val_if_fail (MIDORI_IS_SEARCH_ACTION (search_action), NULL); + + /* If there is a dialog, use that. We want only one. */ + if (search_action->dialog) + return search_action->dialog; + + dialog_title = _("Manage search engines"); + toplevel = gtk_widget_get_toplevel (search_action->last_proxy); + dialog = gtk_dialog_new_with_buttons (dialog_title, + toplevel ? GTK_WINDOW (toplevel) : NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_HELP, GTK_RESPONSE_HELP, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + NULL); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); + /* TODO: Implement some kind of help function */ + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_HELP, FALSE); + sokoke_widget_get_text_size (dialog, "M", &width, &height); + gtk_window_set_default_size (GTK_WINDOW (dialog), width * 42, -1); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + /* TODO: Do we want tooltips for explainations or can we omit that? + We need mnemonics */ + if ((xfce_heading = sokoke_xfce_header_new ( + gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + xfce_heading, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + TRUE, TRUE, 12); + liststore = gtk_list_store_new (1, KATZE_TYPE_ITEM); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + search_action->treeview = treeview; + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), + "changed", G_CALLBACK (midori_search_action_treeview_selection_cb), + search_action); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_search_action_dialog_render_icon_cb, + treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_search_action_dialog_render_text, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scrolled), treeview); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), + GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); + n = katze_array_get_length (search_action->search_engines); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (search_action->search_engines, i); + gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), + NULL, i, 0, item, -1); + } + g_object_unref (liststore); + g_signal_connect (treeview, "destroy", + G_CALLBACK (midori_search_action_treeview_destroy_cb), search_action); + vbox = gtk_vbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); + button = gtk_button_new_from_stock (GTK_STOCK_ADD); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_add_cb), search_action); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_from_stock (GTK_STOCK_EDIT); + search_action->edit_button = button; + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_edit_cb), search_action); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + if (!n) + gtk_widget_set_sensitive (button, FALSE); + button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + search_action->remove_button = button; + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_remove_cb), search_action); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + if (!n) + gtk_widget_set_sensitive (button, FALSE); + button = gtk_label_new (""); /* This is an invisible separator */ + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); + button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); + gtk_widget_set_sensitive (button, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + button = gtk_button_new_from_stock (GTK_STOCK_GO_UP); + gtk_widget_set_sensitive (button, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + + g_object_connect (search_action->search_engines, + "signal-after::add-item", + midori_search_action_dialog_engines_add_item_cb, search_action, + "signal-after::remove-item", + midori_search_action_dialog_engines_remove_item_cb, search_action, + NULL); + + search_action->dialog = dialog; + return dialog; +} diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h new file mode 100644 index 00000000..a2cecaf2 --- /dev/null +++ b/midori/midori-searchaction.h @@ -0,0 +1,64 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_SEARCH_ACTION_H__ +#define __MIDORI_SEARCH_ACTION_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_SEARCH_ACTION \ + (midori_search_action_get_type ()) +#define MIDORI_SEARCH_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_SEARCH_ACTION, MidoriSearchAction)) +#define MIDORI_SEARCH_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_SEARCH_ACTION, MidoriSearchActionClass)) +#define MIDORI_IS_SEARCH_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_SEARCH_ACTION)) +#define MIDORI_IS_SEARCH_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_SEARCH_ACTION)) +#define MIDORI_SEARCH_ACTION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_SEARCH_ACTION, MidoriSearchActionClass)) + +typedef struct _MidoriSearchAction MidoriSearchAction; +typedef struct _MidoriSearchActionClass MidoriSearchActionClass; + +GType +midori_search_action_get_type (void); + +const gchar* +midori_search_action_get_text (MidoriSearchAction* action); + +void +midori_search_action_set_text (MidoriSearchAction* search_action, + const gchar* text); + +KatzeArray* +midori_search_action_get_search_engines (MidoriSearchAction* search_action); + +void +midori_search_action_set_search_engines (MidoriSearchAction* search_action, + KatzeArray* search_engines); + +KatzeItem* +midori_search_action_get_current_item (MidoriSearchAction* search_action); + +void +midori_search_action_set_current_item (MidoriSearchAction* search_action, + KatzeItem* item); + +GtkWidget* +midori_search_action_get_dialog (MidoriSearchAction* search_action); + +G_END_DECLS + +#endif /* __MIDORI_SEARCH_ACTION_H__ */ diff --git a/midori/midori-searchentry.c b/midori/midori-searchentry.c deleted file mode 100644 index 2cac9ec7..00000000 --- a/midori/midori-searchentry.c +++ /dev/null @@ -1,891 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "midori-searchentry.h" - -#include "sokoke.h" - -#include -#include - -struct _MidoriSearchEntry -{ - GtkIconEntry parent_instance; - - KatzeArray* search_engines; - KatzeItem* current_item; -}; - -G_DEFINE_TYPE (MidoriSearchEntry, midori_search_entry, GTK_TYPE_ICON_ENTRY) - -enum -{ - PROP_0, - - PROP_SEARCH_ENGINES, - PROP_CURRENT_ITEM, - PROP_DIALOG -}; - -static void -midori_search_entry_finalize (GObject* object); - -static void -midori_search_entry_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec); - -static void -midori_search_entry_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec); - -static void -midori_search_entry_class_init (MidoriSearchEntryClass* class) -{ - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_search_entry_finalize; - gobject_class->set_property = midori_search_entry_set_property; - gobject_class->get_property = midori_search_entry_get_property; - - g_object_class_install_property (gobject_class, - PROP_SEARCH_ENGINES, - g_param_spec_object ( - "search-engines", - _("Search Engines"), - _("The list of search engines"), - KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, - PROP_CURRENT_ITEM, - g_param_spec_object ( - "current-item", - _("Current Item"), - _("The currently selected item"), - KATZE_TYPE_ITEM, - G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, - PROP_DIALOG, - g_param_spec_object ( - "dialog", - _("Dialog"), - _("A dialog to manage search engines"), - GTK_TYPE_DIALOG, - G_PARAM_READABLE)); -} - -static void -midori_search_entry_engine_activate_cb (GtkWidget* widget, - MidoriSearchEntry* search_entry) -{ - KatzeItem* item; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (widget), "engine"); - midori_search_entry_set_current_item (search_entry, item); -} - -static void -midori_search_entry_manage_activate_cb (GtkWidget* menuitem, - MidoriSearchEntry* search_entry) -{ - GtkWidget* dialog; - - dialog = midori_search_entry_get_dialog (search_entry); - if (GTK_WIDGET_VISIBLE (dialog)) - gtk_window_present (GTK_WINDOW (dialog)); - else - gtk_widget_show (dialog); -} - -static void -midori_search_entry_icon_released_cb (GtkWidget* widget, - GtkIconEntryPosition* pos, - gint button) -{ - MidoriSearchEntry* search_entry; - KatzeArray* search_engines; - GtkWidget* menu; - guint n, i; - GtkWidget* menuitem; - KatzeItem* item; - GdkPixbuf* pixbuf; - GtkWidget* icon; - - search_entry = MIDORI_SEARCH_ENTRY (widget); - search_engines = search_entry->search_engines; - menu = gtk_menu_new (); - n = katze_array_get_length (search_engines); - if (n) - { - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (search_engines, i); - menuitem = gtk_image_menu_item_new_with_label ( - katze_item_get_name (item)); - pixbuf = sokoke_web_icon (katze_item_get_icon (item), - GTK_ICON_SIZE_MENU, menuitem); - icon = gtk_image_new_from_pixbuf (pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - g_object_unref (pixbuf); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "engine", item); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_search_entry_engine_activate_cb), widget); - gtk_widget_show (menuitem); - } - } - else - { - menuitem = gtk_image_menu_item_new_with_label (_("Empty")); - gtk_widget_set_sensitive (menuitem, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - } - - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Manage Search Engines")); - icon = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_search_entry_manage_activate_cb), widget); - gtk_widget_show (menuitem); - sokoke_widget_popup (widget, GTK_MENU (menu), - NULL, SOKOKE_MENU_POSITION_LEFT); -} - -static void -_midori_search_entry_move_index (MidoriSearchEntry* search_entry, - guint n) -{ - gint i; - KatzeItem* item; - - i = katze_array_get_item_index (search_entry->search_engines, - search_entry->current_item); - item = katze_array_get_nth_item (search_entry->search_engines, i + n); - if (item) - midori_search_entry_set_current_item (search_entry, item); -} - -static gboolean -midori_search_entry_key_press_event_cb (MidoriSearchEntry* search_entry, - GdkEventKey* event) -{ - GdkModifierType state; - gint x, y; - - gdk_window_get_pointer (NULL, &x, &y, &state); - if (!(state & GDK_CONTROL_MASK)) - return FALSE; - switch (event->keyval) - { - case GDK_Up: - _midori_search_entry_move_index (search_entry, - 1); - return TRUE; - case GDK_Down: - _midori_search_entry_move_index (search_entry, + 1); - return TRUE; - } - return FALSE; -} - -static gboolean -midori_search_entry_scroll_event_cb (MidoriSearchEntry* search_entry, - GdkEventScroll* event) -{ - if (event->direction == GDK_SCROLL_DOWN) - _midori_search_entry_move_index (search_entry, + 1); - else if (event->direction == GDK_SCROLL_UP) - _midori_search_entry_move_index (search_entry, - 1); - return TRUE; -} - -static void -midori_search_entry_engines_add_item_cb (KatzeArray* list, - KatzeItem* item, - MidoriSearchEntry* search_entry) -{ - if (!search_entry->current_item) - midori_search_entry_set_current_item (search_entry, item); -} - -static void -midori_search_entry_engines_remove_item_cb (KatzeArray* list, - KatzeItem* item, - MidoriSearchEntry* search_entry) -{ - KatzeItem* found_item; - - if (search_entry->current_item == item) - { - found_item = katze_array_get_nth_item (list, 0); - midori_search_entry_set_current_item (search_entry, found_item); - } -} - -static void -midori_search_entry_init (MidoriSearchEntry* search_entry) -{ - search_entry->search_engines = katze_array_new (KATZE_TYPE_ITEM); - search_entry->current_item = NULL; - - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (search_entry), - GTK_ICON_ENTRY_PRIMARY, TRUE); - g_object_connect (search_entry, - "signal::icon-released", - midori_search_entry_icon_released_cb, NULL, - "signal::key-press-event", - midori_search_entry_key_press_event_cb, NULL, - "signal::scroll-event", - midori_search_entry_scroll_event_cb, NULL, - NULL); - - g_object_connect (search_entry->search_engines, - "signal-after::add-item", - midori_search_entry_engines_add_item_cb, search_entry, - "signal-after::remove-item", - midori_search_entry_engines_remove_item_cb, search_entry, - NULL); -} - -static void -midori_search_entry_finalize (GObject* object) -{ - MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); - - g_object_unref (search_entry->search_engines); - if (search_entry->current_item) - g_object_unref (search_entry->current_item); - - G_OBJECT_CLASS (midori_search_entry_parent_class)->finalize (object); -} - -static void -midori_search_entry_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec) -{ - MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); - - switch (prop_id) - { - case PROP_SEARCH_ENGINES: - midori_search_entry_set_search_engines (search_entry, - g_value_get_object (value)); - break; - case PROP_CURRENT_ITEM: - midori_search_entry_set_current_item (search_entry, - g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -midori_search_entry_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) -{ - MidoriSearchEntry* search_entry = MIDORI_SEARCH_ENTRY (object); - - switch (prop_id) - { - case PROP_SEARCH_ENGINES: - g_value_set_object (value, search_entry->search_engines); - break; - case PROP_CURRENT_ITEM: - g_value_set_object (value, search_entry->current_item); - break; - case PROP_DIALOG: - g_value_set_object (value, midori_search_entry_get_dialog (search_entry)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/** - * midori_search_entry_new: - * - * Creates a new #MidoriSearchEntry. - * - * Return value: a new #MidoriSearchEntry - **/ -GtkWidget* -midori_search_entry_new (void) -{ - GtkWidget* search_entry = g_object_new (MIDORI_TYPE_SEARCH_ENTRY, NULL); - - return search_entry; -} - -/** - * midori_search_entry_get_search_engines: - * @search_entry: a #MidoriSearchEntry - * - * Retrieves the list of search engines. - * - * Return value: the list of search engines - **/ -KatzeArray* -midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry) -{ - g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); - - return search_entry->search_engines; -} - -/** - * midori_search_entry_set_search_engines: - * @search_entry: a #MidoriSearchEntry - * @search_engines: a list of search engines - * - * Sets the list of search engines. - **/ -void -midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, - KatzeArray* search_engines) -{ - g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); - g_return_if_fail (katze_array_is_a (search_engines, KATZE_TYPE_ITEM)); - - g_object_ref (search_engines); - katze_object_assign (search_entry->search_engines, search_engines); - g_object_notify (G_OBJECT (search_entry), "search-engines"); - - g_object_connect (search_engines, - "signal-after::add-item", - midori_search_entry_engines_add_item_cb, search_entry, - "signal-after::remove-item", - midori_search_entry_engines_remove_item_cb, search_entry, - NULL); -} - -/** - * midori_search_entry_set_current_item: - * @search_entry: a #MidoriSearchEntry - * @item: a #KatzeItem, or %NULL - * - * Looks up the specified item in the list of search engines and makes - * it the currently selected item. - * - * Pass %NULL for @item in order to unset the item. - * - * This function fails if @item is not in the current list. - **/ -void -midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, - KatzeItem* item) -{ - GdkPixbuf* pixbuf; - - g_return_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry)); - g_return_if_fail (!item || KATZE_IS_ITEM (item)); - - pixbuf = sokoke_web_icon (item ? katze_item_get_icon (item) : NULL, - GTK_ICON_SIZE_MENU, GTK_WIDGET (search_entry)); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (search_entry), - GTK_ICON_ENTRY_PRIMARY, - pixbuf); - g_object_unref (pixbuf); - - if (item) - { - katze_object_assign (search_entry->current_item, g_object_ref (item)); - sokoke_entry_set_default_text (GTK_ENTRY (search_entry), - katze_item_get_name (item)); - } - else - { - katze_object_assign (search_entry->current_item, NULL); - sokoke_entry_set_default_text (GTK_ENTRY (search_entry), ""); - } - - g_object_notify (G_OBJECT (search_entry), "current-item"); -} - -/** - * midori_search_entry_get_current_item: - * @search_entry: a #MidoriSearchEntry - * - * Retrieves the currently selected item. - * - * Return value: the selected web item, or %NULL - **/ -KatzeItem* -midori_search_entry_get_current_item (MidoriSearchEntry* search_entry) -{ - g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); - - return search_entry->current_item; -} - -static void -midori_search_entry_dialog_render_icon_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - KatzeItem* item; - const gchar* icon; - GdkPixbuf* pixbuf; - - gtk_tree_model_get (model, iter, 0, &item, -1); - - icon = katze_item_get_icon (item); - if (icon) - { - pixbuf = sokoke_web_icon (icon, GTK_ICON_SIZE_DND, treeview); - g_object_set (renderer, "pixbuf", pixbuf, NULL); - if (pixbuf) - g_object_unref (pixbuf); - } - else - g_object_set (renderer, "pixbuf", NULL, NULL); -} - -static void -midori_search_entry_dialog_render_text (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - KatzeItem* item; - const gchar* name; - const gchar* text; - gchar* markup; - - gtk_tree_model_get (model, iter, 0, &item, -1); - name = katze_item_get_name (item); - text = katze_item_get_text (item); - markup = g_markup_printf_escaped ("%s\n%s", name, text ? text : ""); - g_object_set (renderer, "markup", markup, NULL); - g_free (markup); -} - -static void -midori_search_entry_editor_name_changed_cb (GtkWidget* widget, - GtkWidget* dialog) -{ - const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget)); - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT, text && *text); -} - -const gchar* -STR_NON_NULL (const gchar* string) -{ - return string ? string : ""; -} - -static void -midori_search_entry_get_editor (GtkWidget* treeview, - gboolean new_engine) -{ - MidoriSearchEntry* search_entry; - GtkWidget* dialog; - GtkSizeGroup* sizegroup; - KatzeItem* item; - GtkWidget* hbox; - GtkWidget* label; - GtkTreeModel* liststore; - GtkTreeIter iter; - GtkTreeSelection* selection; - GtkWidget* entry_name; - GtkWidget* entry_description; - GtkWidget* entry_uri; - GtkWidget* entry_icon; - GtkWidget* entry_token; - - GtkWidget* toplevel = gtk_widget_get_toplevel (treeview); - dialog = gtk_dialog_new_with_buttons ( - new_engine ? _("Add search engine") : _("Edit search engine"), - toplevel ? GTK_WINDOW (toplevel) : NULL, - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - new_engine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), - new_engine ? GTK_STOCK_ADD : GTK_STOCK_REMOVE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); - sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - - if (new_engine) - { - item = katze_item_new (); - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT, FALSE); - } - else - { - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - gtk_tree_selection_get_selected (selection, &liststore, &iter); - gtk_tree_model_get (liststore, &iter, 0, &item, -1); - } - - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Name:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry_name = gtk_entry_new (); - g_signal_connect (entry_name, "changed", - G_CALLBACK (midori_search_entry_editor_name_changed_cb), dialog); - gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE); - if (!new_engine) - gtk_entry_set_text (GTK_ENTRY (entry_name), - STR_NON_NULL (katze_item_get_name (item))); - gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Description:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry_description = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); - if (!new_engine) - gtk_entry_set_text (GTK_ENTRY (entry_description) - , STR_NON_NULL (katze_item_get_text (item))); - gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_URL:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry_uri = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE); - if (!new_engine) - gtk_entry_set_text (GTK_ENTRY (entry_uri) - , STR_NON_NULL (katze_item_get_uri (item))); - gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Icon (name or file):")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry_icon = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE); - if (!new_engine) - gtk_entry_set_text (GTK_ENTRY (entry_icon) - , STR_NON_NULL (katze_item_get_icon (item))); - gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - hbox = gtk_hbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Token:")); - gtk_size_group_add_widget (sizegroup, label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - entry_token = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE); - if (!new_engine) - gtk_entry_set_text (GTK_ENTRY (entry_token) - , STR_NON_NULL (katze_item_get_token (item))); - gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_widget_show_all (hbox); - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - g_object_set (item, - "name", gtk_entry_get_text (GTK_ENTRY (entry_name)), - "text", gtk_entry_get_text (GTK_ENTRY (entry_description)), - "uri", gtk_entry_get_text (GTK_ENTRY (entry_uri)), - "icon", gtk_entry_get_text (GTK_ENTRY (entry_icon)), - "token", gtk_entry_get_text (GTK_ENTRY (entry_token)), - NULL); - - search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); - if (new_engine) - katze_array_add_item (search_entry->search_engines, item); - } - gtk_widget_destroy (dialog); -} - -static void -midori_search_entry_dialog_add_cb (GtkWidget* widget, - GtkWidget* treeview) -{ - MidoriSearchEntry* search_entry; - - search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); - midori_search_entry_get_editor (treeview, TRUE); -} - -static void -midori_search_entry_dialog_edit_cb (GtkWidget* widget, - GtkWidget* treeview) -{ - MidoriSearchEntry* search_entry; - GtkTreeSelection* selection; - - search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - if (gtk_tree_selection_get_selected (selection, NULL, NULL)) - midori_search_entry_get_editor (treeview, FALSE); -} - -static void -midori_search_entry_dialog_remove_cb (GtkWidget* widget, - GtkWidget* treeview) -{ - MidoriSearchEntry* search_entry; - GtkTreeSelection* selection; - GtkTreeModel* liststore; - GtkTreeIter iter; - KatzeItem* item; - KatzeArray* search_engines; - - search_entry = g_object_get_data (G_OBJECT (treeview), "search-entry"); - search_engines = search_entry->search_engines; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) - { - gtk_tree_model_get (liststore, &iter, 0, &item, -1); - katze_array_remove_item (search_engines, item); - g_object_unref (item); - /* FIXME: we want to allow undo of some kind */ - } -} - -static void -midori_search_entry_treeview_selection_cb (GtkTreeSelection* selection, - GtkWidget* treeview) -{ - gboolean selected; - GtkWidget* edit_button; - GtkWidget* remove_button; - - selected = gtk_tree_selection_get_selected (selection, NULL, NULL); - - edit_button = g_object_get_data (G_OBJECT (treeview), "edit-button"); - remove_button = g_object_get_data (G_OBJECT (treeview), "remove-button"); - - gtk_widget_set_sensitive (edit_button, selected); - gtk_widget_set_sensitive (remove_button, selected); -} - -static void -midori_search_entry_dialog_engines_add_item_cb (KatzeArray* list, - KatzeItem* item, - GtkWidget* treeview) -{ - GtkTreeModel* liststore; - GtkTreeIter iter; - - liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - gtk_list_store_append (GTK_LIST_STORE (liststore), &iter); - gtk_list_store_set (GTK_LIST_STORE (liststore), &iter, 0, item, -1); -} - -static void -midori_search_entry_dialog_engines_remove_item_cb (KatzeArray* list, - KatzeItem* item, - GtkWidget* treeview) -{ - GtkTreeModel* liststore; - GtkTreeIter iter; - gboolean valid; - KatzeItem* found_item; - - liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - valid = gtk_tree_model_get_iter_first (liststore, &iter); - while (valid) - { - gtk_tree_model_get (liststore, &iter, 0, &found_item, -1); - if (found_item == item) - { - gtk_list_store_remove (GTK_LIST_STORE (liststore), &iter); - valid = FALSE; - } - else - valid = gtk_tree_model_iter_next (liststore, &iter); - } -} - -static void -midori_search_entry_treeview_destroy_cb (GtkWidget* treeview, - GtkWidget* search_entry) -{ - g_signal_handlers_disconnect_by_func ( - MIDORI_SEARCH_ENTRY (search_entry)->search_engines, - midori_search_entry_dialog_engines_add_item_cb, treeview); - g_signal_handlers_disconnect_by_func ( - MIDORI_SEARCH_ENTRY (search_entry)->search_engines, - midori_search_entry_dialog_engines_remove_item_cb, treeview); -} - -/** - * midori_search_entry_get_dialog: - * @search_entry: a #MidoriSearchEntry - * - * Obtains a dialog that provides an interface for managing - * the list of search engines. - * - * A new dialog is created each time, so it may be a good idea - * to store the pointer for the life time of the dialog. - * - * Return value: a dialog - **/ -GtkWidget* -midori_search_entry_get_dialog (MidoriSearchEntry* search_entry) -{ - static GtkWidget* dialog = NULL; - const gchar* dialog_title; - GtkWidget* toplevel; - gint width, height; - GtkWidget* xfce_heading; - GtkWidget* hbox; - GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_pixbuf; - GtkListStore* liststore; - GtkWidget* treeview; - GtkWidget* scrolled; - guint n, i; - KatzeItem* item; - GtkWidget* vbox; - GtkWidget* button; - - g_return_val_if_fail (MIDORI_IS_SEARCH_ENTRY (search_entry), NULL); - - /* If there is a dialog, use that. We want only one. */ - if (dialog) - return dialog; - - dialog_title = _("Manage search engines"); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (search_entry)); - dialog = gtk_dialog_new_with_buttons (dialog_title, - toplevel ? GTK_WINDOW (toplevel) : NULL, - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_HELP, GTK_RESPONSE_HELP, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); - g_signal_connect (dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), &dialog); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); - /* TODO: Implement some kind of help function */ - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), - GTK_RESPONSE_HELP, FALSE); - sokoke_widget_get_text_size (dialog, "M", &width, &height); - gtk_window_set_default_size (GTK_WINDOW (dialog), width * 42, -1); - g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), dialog); - /* TODO: Do we want tooltips for explainations or can we omit that? - We need mnemonics */ - if ((xfce_heading = sokoke_xfce_header_new ( - gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title))) - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), - xfce_heading, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 12); - liststore = gtk_list_store_new (1, KATZE_TYPE_ITEM); - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); - g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), - "changed", G_CALLBACK (midori_search_entry_treeview_selection_cb), - treeview); - g_object_set_data (G_OBJECT (treeview), "search-entry", search_entry); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); - column = gtk_tree_view_column_new (); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)midori_search_entry_dialog_render_icon_cb, - treeview, NULL); - renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, TRUE); - gtk_tree_view_column_set_cell_data_func (column, renderer_text, - (GtkTreeCellDataFunc)midori_search_entry_dialog_render_text, - treeview, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scrolled), treeview); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), - GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); - n = katze_array_get_length (search_entry->search_engines); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (search_entry->search_engines, i); - gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), - NULL, i, 0, item, -1); - } - g_object_unref (liststore); - g_signal_connect (treeview, "destroy", - G_CALLBACK (midori_search_entry_treeview_destroy_cb), search_entry); - vbox = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4); - button = gtk_button_new_from_stock (GTK_STOCK_ADD); - g_signal_connect (button, "clicked", - G_CALLBACK (midori_search_entry_dialog_add_cb), treeview); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - button = gtk_button_new_from_stock (GTK_STOCK_EDIT); - g_signal_connect (button, "clicked", - G_CALLBACK (midori_search_entry_dialog_edit_cb), treeview); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - g_object_set_data (G_OBJECT (treeview), "edit-button", button); - if (!n) - gtk_widget_set_sensitive (button, FALSE); - button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); - g_signal_connect (button, "clicked", - G_CALLBACK (midori_search_entry_dialog_remove_cb), treeview); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - if (!n) - gtk_widget_set_sensitive (button, FALSE); - g_object_set_data (G_OBJECT (treeview), "remove-button", button); - button = gtk_label_new (""); /* This is an invisible separator */ - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); - button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); - gtk_widget_set_sensitive (button, FALSE); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - button = gtk_button_new_from_stock (GTK_STOCK_GO_UP); - gtk_widget_set_sensitive (button, FALSE); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - - g_object_connect (search_entry->search_engines, - "signal-after::add-item", - midori_search_entry_dialog_engines_add_item_cb, treeview, - "signal-after::remove-item", - midori_search_entry_dialog_engines_remove_item_cb, treeview, - NULL); - - return dialog; -} diff --git a/midori/midori-searchentry.h b/midori/midori-searchentry.h deleted file mode 100644 index 176f34d2..00000000 --- a/midori/midori-searchentry.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_SEARCH_ENTRY_H__ -#define __MIDORI_SEARCH_ENTRY_H__ - -#include "gtkiconentry.h" - -#include - -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_SEARCH_ENTRY \ - (midori_search_entry_get_type ()) -#define MIDORI_SEARCH_ENTRY(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_SEARCH_ENTRY, MidoriSearchEntry)) -#define MIDORI_SEARCH_ENTRY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_SEARCH_ENTRY, MidoriSearchEntryClass)) -#define MIDORI_IS_SEARCH_ENTRY(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_SEARCH_ENTRY)) -#define MIDORI_IS_SEARCH_ENTRY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_SEARCH_ENTRY)) -#define MIDORI_SEARCH_ENTRY_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_SEARCH_ENTRY, MidoriSearchEntryClass)) - -typedef struct _MidoriSearchEntry MidoriSearchEntry; -typedef struct _MidoriSearchEntryClass MidoriSearchEntryClass; - -struct _MidoriSearchEntryClass -{ - GtkIconEntryClass parent_class; -}; - -GType -midori_search_entry_get_type (void); - -GtkWidget* -midori_search_entry_new (void); - -KatzeArray* -midori_search_entry_get_search_engines (MidoriSearchEntry* search_entry); - -void -midori_search_entry_set_search_engines (MidoriSearchEntry* search_entry, - KatzeArray* name); - -KatzeItem* -midori_search_entry_get_current_item (MidoriSearchEntry* search_entry); - -void -midori_search_entry_set_current_item (MidoriSearchEntry* search_entry, - KatzeItem* name); - -GtkWidget* -midori_search_entry_get_dialog (MidoriSearchEntry* search_entry); - -G_END_DECLS - -#endif /* __MIDORI_SEARCH_ENTRY_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 91045bb6..61ab1ba7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,7 +11,7 @@ midori/midori-websettings.c midori/midori-view.c midori/midori-source.c midori/midori-preferences.c -midori/midori-searchentry.c +midori/midori-searchaction.c midori/sokoke.c midori/gjs.c katze/katze-throbber.c From a13f8b64b3658c6be248afe100b675e2eba8d4fe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 6 Oct 2008 00:27:25 +0200 Subject: [PATCH 0349/2970] Remove the proxy hack, it's not reliable at all --- midori/midori-view.c | 15 --------------- midori/midori-websettings.c | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7873e237..32181953 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -77,7 +77,6 @@ struct _MidoriView gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; - gchar* http_proxy; GtkWidget* menu_item; GtkWidget* tab_label; @@ -908,11 +907,6 @@ receive_command (MidoriView* view, { view->open_tabs_in_the_background = atoi (&command[8]); } - else if (!strncmp (command, "proxy ", 6)) - { - katze_assign (view->http_proxy, g_strdup (&command[6])); - g_setenv ("http_proxy", view->http_proxy ? view->http_proxy : "", TRUE); - } else if (g_str_has_prefix (command, "**")) g_print ("%s\n", command); else @@ -1643,7 +1637,6 @@ midori_view_init (MidoriView* view) view->download_manager = NULL; view->default_font_family = NULL; view->default_encoding = NULL; - view->http_proxy = NULL; g_object_connect (view, "signal::notify::uri", @@ -1895,7 +1888,6 @@ _midori_view_update_settings (MidoriView* view) "close-buttons-on-tabs", &view->close_buttons_on_tabs, "middle-click-opens-selection", &view->middle_click_opens_selection, "open-tabs-in-the-background", &view->open_tabs_in_the_background, - "http-proxy", &view->http_proxy, NULL); if (midori_view_is_socket (view)) @@ -1915,7 +1907,6 @@ _midori_view_update_settings (MidoriView* view) int_to_str (view->middle_click_opens_selection)); send_command (view, "tabsbkg", int_to_str (view->open_tabs_in_the_background)); - send_command (view, "proxy", view->http_proxy); } } @@ -2017,12 +2008,6 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, send_command (view, "tabsbkg", int_to_str (view->open_tabs_in_the_background)); } - else if (name == g_intern_string ("http-proxy")) - { - katze_assign (view->http_proxy, g_value_dup_string (&value)); - if (midori_view_is_socket (view)) - send_command (view, "proxy", view->http_proxy); - } g_value_unset (&value); } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 4d234ebf..70613ed2 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -582,8 +582,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "http-proxy", _("HTTP Proxy"), _("The proxy used for HTTP connections"), - g_getenv ("http_proxy"), - flags)); + NULL, + G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_CACHE_SIZE, @@ -622,6 +622,8 @@ notify_default_encoding_cb (GObject* object, static void midori_web_settings_init (MidoriWebSettings* web_settings) { + web_settings->http_proxy = NULL; + g_signal_connect (web_settings, "notify::default-encoding", G_CALLBACK (notify_default_encoding_cb), NULL); } @@ -779,7 +781,6 @@ midori_web_settings_set_property (GObject* object, case PROP_HTTP_PROXY: katze_assign (web_settings->http_proxy, g_value_dup_string (value)); - g_setenv ("http_proxy", web_settings->http_proxy ? web_settings->http_proxy : "", TRUE); break; case PROP_CACHE_SIZE: web_settings->cache_size = g_value_get_int (value); @@ -988,7 +989,6 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) "remember-last-form-inputs", web_settings->remember_last_form_inputs, "remember-last-downloaded-files", web_settings->remember_last_downloaded_files, - "http-proxy", web_settings->http_proxy, "cache-size", web_settings->cache_size, NULL); From d445745787919695bf57b1d557c2d02642a05a5a Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 7 Oct 2008 02:19:33 +0200 Subject: [PATCH 0350/2970] Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime. --- configure.in | 6 + katze/katze-item.c | 105 ++++++++- katze/katze-item.h | 16 ++ katze/katze-list.c | 43 +++- katze/katze-list.h | 3 + midori/main.c | 309 +++++++++++++++++++++++++ midori/midori-app.c | 25 ++ midori/midori-browser.c | 492 +++++++++++++++++++++++++++++++++++++++- midori/wscript_build | 2 +- wscript | 1 + 10 files changed, 982 insertions(+), 20 deletions(-) diff --git a/configure.in b/configure.in index 777efd08..fa102248 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,12 @@ AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) AC_DEFINE_UNQUOTED(HAVE_LIBXML,$have_libxml, [Whether LibXML is available]) +# Check for sqlite 3 +PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.0], have_sqlite3=1, have_sqlite3=0) +AC_SUBST([SQLITE3_CFLAGS]) +AC_SUBST([SQLITE3_LIBS]) +AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$have_sqlite3, [Whether sqlite3 is available]) + # i18n GETTEXT_PACKAGE=midori AC_SUBST(GETTEXT_PACKAGE) diff --git a/katze/katze-item.c b/katze/katze-item.c index f71d8d05..46e0b8a0 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -34,7 +34,9 @@ enum PROP_TEXT, PROP_URI, PROP_ICON, - PROP_TOKEN + PROP_TOKEN, + PROP_ADDED, + PROP_VISITS }; static void @@ -109,6 +111,27 @@ katze_item_class_init (KatzeItemClass* class) _("The token of the item"), NULL, flags)); + + g_object_class_install_property (gobject_class, + PROP_ADDED, + g_param_spec_string ( + "added", + _("Added"), + _("When the item was added"), + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_VISITS, + g_param_spec_int ( + "visits", + _("Visits"), + _("The number of visits of the item"), + G_MININT, + G_MAXINT, + 0, + flags)); + } @@ -129,6 +152,7 @@ katze_item_finalize (GObject* object) g_free (item->uri); g_free (item->icon); g_free (item->token); + g_free (item->added); G_OBJECT_CLASS (katze_item_parent_class)->finalize (object); } @@ -158,6 +182,12 @@ katze_item_set_property (GObject* object, case PROP_TOKEN: item->token = g_value_dup_string (value); break; + case PROP_ADDED: + item->added = g_value_dup_string (value); + break; + case PROP_VISITS: + item->visits = g_value_get_int (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -189,6 +219,12 @@ katze_item_get_property (GObject* object, case PROP_TOKEN: g_value_set_string (value, item->token); break; + case PROP_ADDED: + g_value_set_string (value, item->added); + break; + case PROP_VISITS: + g_value_set_int (value, item->visits); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -375,6 +411,72 @@ katze_item_set_token (KatzeItem* item, g_object_notify (G_OBJECT (item), "token"); } +/** + * katze_item_get_added: + * @item: a #KatzeItem + * + * Determines when @item was added. + * + * Return value: a timestamp + **/ +const gchar* +katze_item_get_added (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + return item->added; +} + +/** + * katze_item_set_added: + * @item: a #KatzeItem + * @added: a timestamp + * + * Sets when @item was added. + **/ +void +katze_item_set_added (KatzeItem* item, + const gchar* added) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + katze_assign (item->added, g_strdup (added)); + g_object_notify (G_OBJECT (item), "added"); +} + +/** + * katze_item_get_visits: + * @item: a #KatzeItem + * + * Retrieves the number of visits of @item. + * + * Return value: the number of visits + **/ +gint +katze_item_get_visits (KatzeItem* item) +{ + g_return_val_if_fail (KATZE_IS_ITEM (item), -1); + + return item->visits; +} + +/** + * katze_item_set_visits: + * @item: a #KatzeItem + * @visits: an integer + * + * Sets the number of visits of @item. + **/ +void +katze_item_set_visits (KatzeItem* item, + gint visits) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + item->visits = visits; + g_object_notify (G_OBJECT (item), "visits"); +} + /** * katze_item_get_parent: * @item: a #KatzeItem @@ -412,3 +514,4 @@ katze_item_set_parent (KatzeItem* item, katze_object_assign (item->parent, parent); /* g_object_notify (G_OBJECT (item), "parent"); */ } + diff --git a/katze/katze-item.h b/katze/katze-item.h index 7a921c97..8014b57a 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -41,6 +41,8 @@ struct _KatzeItem gchar* uri; gchar* icon; gchar* token; + gchar* added; + gint visits; KatzeItem* parent; }; @@ -91,6 +93,20 @@ void katze_item_set_token (KatzeItem* item, const gchar* token); +const gchar* +katze_item_get_added (KatzeItem* item); + +void +katze_item_set_added (KatzeItem* item, + const gchar* added); + +gint +katze_item_get_visits (KatzeItem* item); + +void +katze_item_set_visits (KatzeItem* item, + gint visits); + gpointer katze_item_get_parent (KatzeItem* item); diff --git a/katze/katze-list.c b/katze/katze-list.c index 15bb0e1e..cb0fe80d 100644 --- a/katze/katze-list.c +++ b/katze/katze-list.c @@ -29,6 +29,7 @@ G_DEFINE_TYPE (KatzeList, katze_list, KATZE_TYPE_ITEM) enum { ADD_ITEM, REMOVE_ITEM, + CLEAR, LAST_SIGNAL }; @@ -52,6 +53,23 @@ _katze_list_remove_item (KatzeList* list, list->items = g_list_remove (list->items, item); } +static void +_katze_list_clear (KatzeList* list) +{ + guint n; + guint i; + GObject* item; + + n = g_list_length (list->items); + for (i = 0; i < n; i++) + { + if ((item = g_list_nth_data (list->items, i))) + katze_list_remove_item (list, item); + } + g_list_free (list->items); + list->items = NULL; +} + static void katze_list_class_init (KatzeListClass* class) { @@ -79,11 +97,23 @@ katze_list_class_init (KatzeListClass* class) G_TYPE_NONE, 1, G_TYPE_POINTER); + signals[CLEAR] = g_signal_new ( + "clear", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeListClass, clear), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = katze_list_finalize; class->add_item = _katze_list_add_item; class->remove_item = _katze_list_remove_item; + class->clear = _katze_list_clear; } static void @@ -227,18 +257,7 @@ katze_list_get_length (KatzeList* list) void katze_list_clear (KatzeList* list) { - guint n; - guint i; - GObject* item; - g_return_if_fail (KATZE_IS_LIST (list)); - n = g_list_length (list->items); - for (i = 0; i < n; i++) - { - if ((item = g_list_nth_data (list->items, i))) - katze_list_remove_item (list, item); - } - g_list_free (list->items); - list->items = NULL; + g_signal_emit (list, signals[CLEAR], 0); } diff --git a/katze/katze-list.h b/katze/katze-list.h index 0e2570db..4d5d9d93 100644 --- a/katze/katze-list.h +++ b/katze/katze-list.h @@ -50,6 +50,9 @@ struct _KatzeListClass void (*remove_item) (KatzeList* list, gpointer item); + void + (*clear) (KatzeList* list); + }; GType diff --git a/midori/main.c b/midori/main.c index dfd6f602..bb6e4ed3 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1,5 +1,6 @@ /* Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2008 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -27,11 +28,21 @@ #include #include #include +#include #if ENABLE_NLS #include #endif +#define MIDORI_HISTORY_ERROR g_quark_from_string("MIDORI_HISTORY_ERROR") + +typedef enum +{ + MIDORI_HISTORY_ERROR_DB_OPEN, /* Error opening the database file */ + MIDORI_HISTORY_ERROR_EXEC_SQL, /* Error executing SQL statement */ + +} MidoriHistoryError; + static void stock_items_init (void) { @@ -564,6 +575,283 @@ katze_array_from_file (KatzeArray* array, return TRUE; } +/* Open database 'dbname' */ +static sqlite3* +db_open (const char* dbname, + GError** error) +{ + sqlite3* db; + + if (sqlite3_open (dbname, &db)) + { + if (error) + { + *error = g_error_new (MIDORI_HISTORY_ERROR, + MIDORI_HISTORY_ERROR_DB_OPEN, + _("Error opening database: %s\n"), + sqlite3_errmsg (db)); + } + sqlite3_close (db); + return NULL; + } + return (db); +} + +/* Close database 'db' */ +static void +db_close (sqlite3* db) +{ + sqlite3_close (db); +} + +/* Execute an SQL statement and run 'callback' on the result data */ +static gboolean +db_exec_callback (sqlite3* db, + const char* sqlcmd, + int (*callback)(void*, int, char**, char**), + void* cbarg, + GError** error) +{ + char* errmsg; + + if (sqlite3_exec (db, sqlcmd, callback, cbarg, &errmsg) != SQLITE_OK) + { + if (error) + { + *error = g_error_new (MIDORI_HISTORY_ERROR, + MIDORI_HISTORY_ERROR_EXEC_SQL, + _("Error opening database: %s\n"), + errmsg); + } + sqlite3_free (errmsg); + return FALSE; + } + return TRUE; +} + +/* Execute a SQL statement */ +static gboolean +db_exec (sqlite3* db, + const char* sqlcmd, + GError** error) +{ + return (db_exec_callback (db, sqlcmd, NULL, NULL, error)); +} + +/* sqlite method for retrieving the date/ time */ +static int +gettimestr (void* data, + int argc, + char** argv, + char** colname) +{ + KatzeItem* item = KATZE_ITEM (data); + (void) colname; + + g_return_val_if_fail (argc == 1, 1); + + katze_item_set_added (item, argv[0]); + return 0; +} + +static void +midori_history_remove_item_cb (KatzeArray* history, + KatzeItem* item, + sqlite3* db) +{ + gchar* sqlcmd; + gboolean success = TRUE; + GError* error = NULL; + + g_return_if_fail (KATZE_IS_ITEM (item)); + + sqlcmd = g_strdup_printf ("DELETE FROM history WHERE uri = '%s' AND" + " title = '%s' AND date = '%s' AND visits = %d", + katze_item_get_uri (item), + katze_item_get_name (item), + katze_item_get_added (item), + katze_item_get_visits (item)); + success = db_exec (db, sqlcmd, &error); + if (!success) + { + g_printerr (_("Failed to remove history item. %s\n"), error->message); + g_error_free (error); + return ; + } + g_free (sqlcmd); +} + +static void +midori_history_clear_before_cb (KatzeArray* item, + sqlite3* db) +{ + g_signal_handlers_block_by_func (item, midori_history_remove_item_cb, db); +} + +static void +midori_history_clear_cb (KatzeArray* history, + sqlite3* db) +{ + GError* error = NULL; + + g_return_if_fail (KATZE_IS_ARRAY (history)); + + if (!db_exec (db, "DELETE FROM history", &error)) + { + g_printerr (_("Failed to clear history. %s\n"), error->message); + g_error_free (error); + } +} + +static void +midori_history_add_item_cb (KatzeArray* array, + KatzeItem* item, + sqlite3* db) +{ + gchar* sqlcmd; + gboolean success = TRUE; + GError* error = NULL; + + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_history_add_item_cb), db); + g_signal_connect (item, "remove-item", + G_CALLBACK (midori_history_remove_item_cb), db); + g_signal_connect (item, "clear", + G_CALLBACK (midori_history_clear_before_cb), db); + return; + } + + /* New item, set added to the current date/ time */ + if (!katze_item_get_added (item)) + { + if (!db_exec_callback (db, "SELECT datetime('now')", + gettimestr, item, &error)) + { + g_printerr (_("Failed to add history item. %s\n"), error->message); + g_error_free (error); + return; + } + } + sqlcmd = g_strdup_printf ("INSERT INTO history VALUES" + "('%s', '%s', '%s', %d)", + katze_item_get_uri (item), + katze_item_get_name (item), + katze_item_get_added (item), + katze_item_get_visits (item)); + success = db_exec (db, sqlcmd, &error); + g_free (sqlcmd); + if (!success) + { + g_printerr (_("Failed to add history item. %s\n"), error->message); + g_error_free (error); + return ; + } +} + +static int +midori_history_add_items (void* data, + int argc, + char** argv, + char** colname) +{ + KatzeItem* item; + KatzeArray* parent = NULL; + KatzeArray* array = KATZE_ARRAY (data); + gchar* newdate; + gint i, j, n; + gint ncols = 4; + gsize len; + + g_return_val_if_fail (KATZE_IS_ARRAY (array), 1); + + /* Test whether have the right number of columns */ + g_return_val_if_fail (argc % ncols == 0, 1); + + for (i = 0; i <= (argc - ncols); i++) + { + if (argv[i]) + { + if (colname[i] && g_ascii_strcasecmp (colname[i], "uri") == 0 && + colname[i + 1] && g_ascii_strcasecmp (colname[i + 1], "title") == 0 && + colname[i + 2] && g_ascii_strcasecmp (colname[i + 2], "date") == 0 && + colname[i + 3] && g_ascii_strcasecmp (colname[i + 3], "visits") == 0) + { + item = katze_item_new (); + katze_item_set_uri (item, argv[i]); + katze_item_set_name (item, argv[i + 1]); + katze_item_set_added (item, argv[i + 2]); + katze_item_set_visits (item, atoi (argv[i + 3])); + + len = (g_strrstr (argv[i + 2], " ") - argv[i + 2]); + newdate = g_strndup (argv[i + 2], len); + + n = katze_array_get_length (array); + for (j = 0; j < n; j++) + { + parent = katze_array_get_nth_item (array, j); + if (newdate && g_ascii_strcasecmp + (katze_item_get_added (KATZE_ITEM (parent)), newdate) == 0) + break; + } + if (j == n) + { + parent = katze_array_new (KATZE_TYPE_ARRAY); + katze_item_set_added (KATZE_ITEM (parent), newdate); + katze_array_add_item (array, parent); + } + g_free (newdate); + + katze_array_add_item (parent, item); + } + } + } + return 0; +} + +static sqlite3* +midori_history_initialize (KatzeArray* array, + const gchar* filename, + GError** error) +{ + sqlite3* db; + KatzeItem* item; + gint i, n; + + if ((db = db_open (filename, error)) == NULL) + return db; + + if (!db_exec (db, + "CREATE TABLE IF NOT EXISTS " + "history(uri text, title text, date text, visits integer)", + error)) + return NULL; + + if (!db_exec_callback (db, + "SELECT uri, title, date, visits FROM history " + "ORDER BY strftime('%s', date) ASC", + midori_history_add_items, + array, + error)) + return NULL; + + n = katze_array_get_length (array); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (array, i); + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_history_add_item_cb), db); + g_signal_connect (item, "remove-item", + G_CALLBACK (midori_history_remove_item_cb), db); + g_signal_connect (item, "clear", + G_CALLBACK (midori_history_clear_before_cb), db); + } + return db; +} + static gchar* _simple_xml_element (const gchar* name, const gchar* value) @@ -756,6 +1044,7 @@ main (int argc, gchar* homepage; KatzeArray* search_engines; KatzeArray* bookmarks; + KatzeArray* history; KatzeArray* _session; KatzeArray* trash; MidoriBrowser* browser; @@ -764,6 +1053,7 @@ main (int argc, gchar* uri; KatzeItem* item; gchar* uri_ready; + sqlite3* db; #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); @@ -910,6 +1200,16 @@ main (int argc, g_error_free (error); } g_free (config_file); + config_file = g_build_filename (config_path, "history.db", NULL); + history = katze_array_new (KATZE_TYPE_ARRAY); + error = NULL; + if ((db = midori_history_initialize (history, config_file, &error)) == NULL) + { + g_string_append_printf (error_messages, + _("The history couldn't be loaded. %s\n"), error->message); + g_error_free (error); + } + g_free (config_file); /* In case of errors */ if (error_messages->len) @@ -943,6 +1243,7 @@ main (int argc, g_object_unref (bookmarks); g_object_unref (_session); g_object_unref (trash); + g_object_unref (history); g_string_free (error_messages, TRUE); return 0; } @@ -987,11 +1288,16 @@ main (int argc, g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_web_list_add_item_cb), NULL); + g_signal_connect_after (history, "add-item", + G_CALLBACK (midori_history_add_item_cb), db); + g_signal_connect_after (history, "clear", + G_CALLBACK (midori_history_clear_cb), db); g_object_set (app, "settings", settings, "bookmarks", bookmarks, "trash", trash, "search-engines", search_engines, + "history", history, NULL); browser = g_object_new (MIDORI_TYPE_BROWSER, @@ -999,6 +1305,7 @@ main (int argc, "bookmarks", bookmarks, "trash", trash, "search-engines", search_engines, + "history", history, NULL); midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); @@ -1059,6 +1366,8 @@ main (int argc, config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); g_mkdir_with_parents (config_path, 0755); + g_object_unref (history); + db_close (db); config_file = g_build_filename (config_path, "search", NULL); error = NULL; if (!search_engines_save_to_file (search_engines, config_file, &error)) diff --git a/midori/midori-app.c b/midori/midori-app.c index d5db66fb..4c77f0c8 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -35,6 +35,7 @@ struct _MidoriApp KatzeArray* bookmarks; KatzeArray* trash; KatzeArray* search_engines; + KatzeArray* history; gpointer instance; }; @@ -52,6 +53,7 @@ enum PROP_TRASH, PROP_SEARCH_ENGINES, PROP_BROWSER, + PROP_HISTORY, PROP_BROWSER_COUNT }; @@ -172,6 +174,17 @@ midori_app_class_init (MidoriAppClass* class) _("The current number of browsers"), 0, G_MAXUINT, 0, G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_HISTORY, + g_param_spec_object ( + "history", + _("History"), + _("The list of history items"), + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); + + } static GObject* @@ -212,6 +225,7 @@ midori_browser_message_received_cb (UniqueApp* instance, "bookmarks", app->bookmarks, "trash", app->trash, "search-engines", app->search_engines, + "history", app->history, NULL); /* FIXME: Should open the homepage according to settings */ midori_browser_add_uri (browser, "about:blank"); @@ -267,6 +281,7 @@ midori_app_init (MidoriApp* app) app->bookmarks = NULL; app->trash = NULL; app->search_engines = NULL; + app->history = NULL; #if HAVE_UNIQUE display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); @@ -301,6 +316,8 @@ midori_app_finalize (GObject* object) g_object_unref (app->trash); if (app->search_engines) g_object_unref (app->search_engines); + if (app->history) + g_object_unref (app->history); if (app->instance) g_object_unref (app->instance); @@ -338,6 +355,10 @@ midori_app_set_property (GObject* object, g_object_ref (app->search_engines); /* FIXME: Propagate search engines to all browsers */ break; + case PROP_HISTORY: + katze_object_assign (app->history, g_value_get_object (value)); + /* FIXME: Propagate history to all browsers */ + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -366,6 +387,9 @@ midori_app_get_property (GObject* object, case PROP_SEARCH_ENGINES: g_value_set_object (value, app->search_engines); break; + case PROP_HISTORY: + g_value_set_object (value, app->history); + break; case PROP_BROWSER: g_value_set_object (value, app->browser); break; @@ -398,6 +422,7 @@ midori_browser_new_window_cb (MidoriBrowser* browser, "bookmarks", app->bookmarks, "trash", app->trash, "search-engines", app->search_engines, + "history", app->history, NULL); midori_browser_add_uri (new_browser, uri); gtk_widget_show (GTK_WIDGET (new_browser)); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 24426dbc..0608ed57 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1,5 +1,6 @@ /* Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2008 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -47,6 +48,7 @@ struct _MidoriBrowser GtkWidget* menu_tools; GtkWidget* menu_window; GtkWidget* popup_bookmark; + GtkWidget* popup_history; GtkWidget* throbber; GtkWidget* navigationbar; GtkWidget* button_tab_new; @@ -58,6 +60,7 @@ struct _MidoriBrowser GtkWidget* panel; GtkWidget* panel_bookmarks; + GtkWidget* panel_history; GtkWidget* panel_console; GtkWidget* panel_pageholder; GtkWidget* notebook; @@ -77,6 +80,7 @@ struct _MidoriBrowser KatzeArray* proxy_array; KatzeArray* trash; KatzeArray* search_engines; + KatzeArray* history; }; G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) @@ -94,7 +98,8 @@ enum PROP_SETTINGS, PROP_BOOKMARKS, PROP_TRASH, - PROP_SEARCH_ENGINES + PROP_SEARCH_ENGINES, + PROP_HISTORY }; enum @@ -130,7 +135,9 @@ midori_browser_get_property (GObject* object, GValue* value, GParamSpec* pspec); - +static void +midori_browser_new_history_item (MidoriBrowser* browser, + KatzeItem* item); static GtkAction* _action_by_name (MidoriBrowser* browser, @@ -435,12 +442,24 @@ midori_view_notify_title_cb (GtkWidget* view, const gchar* title; GtkAction* action; gchar* window_title; + KatzeItem* item; uri = midori_view_get_display_uri (MIDORI_VIEW (view)); title = midori_view_get_display_title (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); midori_location_action_set_title_for_uri ( MIDORI_LOCATION_ACTION (action), title, uri); + if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) + { + if (!browser->history) + return; + + item = katze_item_new (); + katze_item_set_uri (item, uri); + katze_item_set_name (item, title); + katze_item_set_visits (item, -1); + midori_browser_new_history_item (browser, item); + } if (view == midori_browser_get_current_tab (browser)) { @@ -1094,6 +1113,23 @@ midori_browser_class_init (MidoriBrowserClass* class) _("The list of search engines to be used for web search"), KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); + + /** + * MidoriBrowser:history: + * + * The list of history items. + * + * This is actually a reference to a history instance, + * so if history should be used it must be initially set. + */ + g_object_class_install_property (gobject_class, + PROP_HISTORY, + g_param_spec_object ( + "history", + _("History"), + _("The list of history items"), + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); } static void @@ -1941,6 +1977,98 @@ midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, } } +static void +midori_panel_history_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriBrowser* browser) +{ + KatzeItem* item; + GtkTreeModel* model; + GtkTreeIter iter; + const gchar* uri; + + model = gtk_tree_view_get_model (treeview); + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (KATZE_IS_ITEM (item)) + { + uri = katze_item_get_uri (item); + _midori_browser_open_uri (browser, uri); + } + g_object_unref (item); + } +} + +static void +_midori_panel_history_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeItem* item, + MidoriBrowser* browser) +{ + gboolean is_history_item = (KATZE_IS_ITEM (item) && !KATZE_IS_ARRAY (item)); + + _action_set_sensitive (browser, "HistoryOpen", is_history_item); + _action_set_sensitive (browser, "HistoryOpenTab", is_history_item); + + sokoke_widget_popup (widget, GTK_MENU (browser->popup_history), + event, SOKOKE_MENU_POSITION_CURSOR); +} + +static gboolean +midori_panel_history_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriBrowser* browser) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + gint n; + + if (event->button != 2 && event->button != 3) + return FALSE; + + if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), + &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (event->button == 2) + { + if (uri && *uri) + { + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); + } + } + else + _midori_panel_history_popup (widget, event, item, browser); + + g_object_unref (item); + return TRUE; + } + return FALSE; +} + +static void +midori_panel_history_popup_menu_cb (GtkWidget* widget, + MidoriBrowser* browser) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), + &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + _midori_panel_history_popup (widget, NULL, item, browser); + g_object_unref (item); + } +} + static void _tree_store_insert_folder (GtkTreeStore* treestore, GtkTreeIter* parent, @@ -2131,6 +2259,70 @@ _action_bookmark_add_activate (GtkAction* action, midori_browser_edit_bookmark_dialog_new (browser, NULL); } +static void +midori_browser_history_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + GdkPixbuf* pixbuf = NULL; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (G_UNLIKELY (!item)) + return; + if (G_UNLIKELY (!katze_item_get_parent (item))) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); + g_object_unref (item); + return; + } + + if (KATZE_IS_ARRAY (item)) + pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, + GTK_ICON_SIZE_MENU, NULL); + else + pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); + + g_object_set (renderer, "pixbuf", pixbuf, NULL); + + if (pixbuf) + g_object_unref (pixbuf); + + g_object_unref (item); +} + +static void +midori_browser_history_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (G_UNLIKELY (!item)) + return; + if (G_UNLIKELY (!katze_item_get_parent (item))) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); + g_object_unref (item); + return; + } + + if (KATZE_IS_ARRAY (item)) + g_object_set (renderer, "text", katze_item_get_added (item), NULL); + else + g_object_set (renderer, "text", katze_item_get_name (item), NULL); + + g_object_unref (item); +} + static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) @@ -2419,6 +2611,120 @@ _action_bookmark_edit_activate (GtkAction* action, } } +static void +_action_history_open_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + + tree_view = GTK_TREE_VIEW (browser->panel_history); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (uri && *uri) + _midori_browser_open_uri (browser, uri); + g_object_unref (item); + } +} + +static void +_action_history_open_tab_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + gint n; + + tree_view = GTK_TREE_VIEW (browser->panel_history); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (uri && *uri) + { + n = midori_browser_add_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); + } + g_object_unref (item); + } +} + +static void +_action_history_delete_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkTreeView* treeview; + GtkTreeModel* treemodel; + GtkTreeIter iter; + GtkTreeIter childiter; + KatzeItem* item; + KatzeItem* child; + KatzeArray* parent; + gint i, n; + + treeview = GTK_TREE_VIEW (browser->panel_history); + if (sokoke_tree_view_get_selected_iter (treeview, &treemodel, &iter)) + { + gtk_tree_model_get (treemodel, &iter, 0, &item, -1); + + if (KATZE_IS_ARRAY (item)) + { + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); + katze_array_remove_item (KATZE_ARRAY (item), child); + } + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + while (gtk_tree_model_iter_nth_child (treemodel, &childiter, &iter, 0)) + gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &childiter); + gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); + g_object_unref (item); + } + else + { + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); + g_object_unref (item); + } + } +} + +static void +_action_history_clear_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkTreeView* tree_view; + GtkTreeStore* store; + KatzeItem* item; + gint i, n; + + if (!browser->history) + return; + + tree_view = GTK_TREE_VIEW (browser->panel_history); + store = GTK_TREE_STORE (gtk_tree_view_get_model (tree_view)); + gtk_tree_store_clear (store); + + n = katze_array_get_length (browser->history); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (browser->history, i); + katze_array_clear (KATZE_ARRAY (item)); + } + katze_array_clear (browser->history); +} + static void _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) @@ -2601,7 +2907,18 @@ static const GtkActionEntry entries[] = { { "BookmarkDelete", GTK_STOCK_DELETE, NULL, "", N_("Delete the selected bookmark"), G_CALLBACK (_action_bookmark_delete_activate) }, - + { "HistoryDelete", GTK_STOCK_DELETE, + NULL, "", + N_("Delete the selected history item"), G_CALLBACK (_action_history_delete_activate) }, + { "HistoryClear", GTK_STOCK_CLEAR, + NULL, "", + N_("Clear the enitre history"), G_CALLBACK (_action_history_clear_activate) }, + { "HistoryOpen", GTK_STOCK_OPEN, + NULL, "", + N_("Open the selected history item"), G_CALLBACK (_action_history_open_activate) }, + { "HistoryOpenTab", STOCK_TAB_NEW, + N_("Open in New _Tab"), "", + N_("Open the selected history item in a new tab"), G_CALLBACK (_action_history_open_tab_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", @@ -2822,6 +3139,16 @@ static const gchar* ui_markup = "" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" ""; static void @@ -2862,6 +3189,7 @@ midori_browser_init (MidoriBrowser* browser) browser->bookmarks = NULL; browser->trash = NULL; browser->search_engines = NULL; + browser->history = NULL; /* Setup the window metrics */ g_signal_connect (browser, "realize", @@ -2987,6 +3315,9 @@ midori_browser_init (MidoriBrowser* browser) browser->popup_bookmark = gtk_ui_manager_get_widget ( ui_manager, "/popup_bookmark"); g_object_ref (browser->popup_bookmark); + browser->popup_history = gtk_ui_manager_get_widget ( + ui_manager, "/popup_history"); + g_object_ref (browser->popup_history); browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); menuitem = gtk_separator_menu_item_new (); @@ -3126,10 +3457,39 @@ midori_browser_init (MidoriBrowser* browser) STOCK_CONSOLE, _("Console")); /* History */ - panel = midori_view_new (); - gtk_widget_show (panel); + box = gtk_vbox_new (FALSE, 0); + treestore = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_browser_history_render_icon_cb, + treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_browser_history_render_text_cb, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + g_object_unref (treestore); + g_object_connect (treeview, + "signal::row-activated", + midori_panel_history_row_activated_cb, browser, + "signal::button-release-event", + midori_panel_history_button_release_event_cb, browser, + "signal::popup-menu", + midori_panel_history_popup_menu_cb, browser, + NULL); + gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); + browser->panel_history = treeview; + gtk_widget_show_all (box); + toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_history"); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); + gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, NULL, + box, toolbar, STOCK_HISTORY, _("History")); /* Pageholder */ @@ -3298,6 +3658,8 @@ midori_browser_finalize (GObject* object) g_object_unref (browser->trash); if (browser->search_engines) g_object_unref (browser->search_engines); + if (browser->history) + g_object_unref (browser->history); G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } @@ -3513,6 +3875,115 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) _action_set_sensitive (browser, "BookmarkAdd", TRUE); } +static void +_tree_store_insert_history_item (GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeItem* item) +{ + GtkTreeIter iter; + KatzeItem* child; + guint i, n; + GtkTreeIter* piter; + + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + piter = parent; + if (katze_item_get_added (item)) + { + gtk_tree_store_insert_with_values (treestore, &iter, parent, 0, 0, item, -1); + g_object_unref (item); + piter = &iter; + } + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), i); + _tree_store_insert_history_item (treestore, piter, child); + } + } + else + { + gtk_tree_store_insert_with_values (treestore, &iter, parent, 0, 0, item, -1); + g_object_unref (item); + } +} + +static void +midori_browser_new_history_item (MidoriBrowser* browser, + KatzeItem* item) +{ + GtkTreeView* treeview; + GtkTreeModel* treemodel; + GtkTreeIter iter; + KatzeArray* parent; + gint i; + gboolean found; + time_t now; + gchar newdate [70]; + gchar *today; + gsize len; + + treeview = GTK_TREE_VIEW (browser->panel_history); + treemodel = gtk_tree_view_get_model (treeview); + + now = time (NULL); + strftime (newdate, sizeof (newdate), "%Y-%m-%d %H:%M:%S", localtime (&now)); + katze_item_set_added (item, newdate); + + len = (g_strrstr (newdate, " ") - newdate); + today = g_strndup (newdate, len); + + found = FALSE; + i = 0; + while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) + { + gtk_tree_model_get (treemodel, &iter, 0, &parent, -1); + if (g_ascii_strcasecmp (today, + katze_item_get_added (KATZE_ITEM (parent))) == 0) + { + found = TRUE; + break; + } + g_object_unref (parent); + } + if (!found) + { + parent = katze_array_new (KATZE_TYPE_ARRAY); + katze_item_set_added (KATZE_ITEM (parent), today); + katze_array_add_item (browser->history, parent); + katze_array_add_item (parent, item); + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, + KATZE_ITEM (parent)); + } + else + { + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), + &iter, item); + katze_array_add_item (parent, item); + g_object_unref (parent); + } + g_free (today); + +} + +static void +midori_browser_load_history (MidoriBrowser* browser) +{ + GtkTreeView* treeview; + GtkTreeModel* treemodel; + + if (!browser->history) + return; + + treeview = GTK_TREE_VIEW (browser->panel_history); + treemodel = gtk_tree_view_get_model (treeview); + + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), + NULL, KATZE_ITEM (browser->history)); +} + static void midori_browser_set_property (GObject* object, guint prop_id, @@ -3578,6 +4049,12 @@ midori_browser_set_property (GObject* object, _action_by_name (browser, "Search")), item); } break; + case PROP_HISTORY: + ; /* FIXME: Disconnect handlers */ + katze_object_assign (browser->history, g_value_get_object (value)); + midori_browser_load_history (browser); + /* FIXME: Connect to updates */ + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -3624,6 +4101,9 @@ midori_browser_get_property (GObject* object, case PROP_SEARCH_ENGINES: g_value_set_object (value, browser->search_engines); break; + case PROP_HISTORY: + g_value_set_object (value, browser->history); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/midori/wscript_build b/midori/wscript_build index cc6435cf..0dfb01a3 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '.. ../katze' obj.find_sources_in_dirs ('.') -obj.uselib = 'UNIQUE GIO GTK GTKSOURCEVIEW WEBKIT LIBXML' +obj.uselib = 'UNIQUE GIO GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 782d8174..76e1c4da 100644 --- a/wscript +++ b/wscript @@ -110,6 +110,7 @@ def configure (conf): conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) + conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) From 63fc20b6f44f7f41db6b46d1a2f1c45abb6c4918 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Oct 2008 03:24:27 +0200 Subject: [PATCH 0351/2970] Assign KatzeItem property strings properly --- katze/katze-item.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/katze/katze-item.c b/katze/katze-item.c index 46e0b8a0..f77f4b86 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -168,22 +168,22 @@ katze_item_set_property (GObject* object, switch (prop_id) { case PROP_NAME: - item->name = g_value_dup_string (value); + katze_assign (item->name, g_value_dup_string (value)); break; case PROP_TEXT: - item->text = g_value_dup_string (value); + katze_assign (item->text, g_value_dup_string (value)); break; case PROP_URI: - item->uri = g_value_dup_string (value); + katze_assign (item->uri, g_value_dup_string (value)); break; case PROP_ICON: - item->icon = g_value_dup_string (value); + katze_assign (item->icon, g_value_dup_string (value)); break; case PROP_TOKEN: - item->token = g_value_dup_string (value); + katze_assign (item->token, g_value_dup_string (value)); break; case PROP_ADDED: - item->added = g_value_dup_string (value); + katze_assign (item->added, g_value_dup_string (value)); break; case PROP_VISITS: item->visits = g_value_get_int (value); From 9abfe87be925cbd71ec3ac1126542654c1a9977d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Oct 2008 22:30:09 +0200 Subject: [PATCH 0352/2970] The URI of blank tabs is "", the title is "about:blank". Something in the stack seems to magically turn empty strings into about:blank, which is a problem if we want to be able to start typing right away when opening blank tabs. We simply enforce the desired behaviour now. --- midori/midori-app.c | 2 +- midori/midori-view.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 4c77f0c8..4d2ebb1f 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -228,7 +228,7 @@ midori_browser_message_received_cb (UniqueApp* instance, "history", app->history, NULL); /* FIXME: Should open the homepage according to settings */ - midori_browser_add_uri (browser, "about:blank"); + midori_browser_add_uri (browser, ""); midori_app_add_browser (app, browser); gtk_window_set_screen (GTK_WINDOW (app->browser), unique_message_data_get_screen (message)); diff --git a/midori/midori-view.c b/midori/midori-view.c index 32181953..a061c144 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2191,8 +2191,9 @@ midori_view_get_icon (MidoriView* view) * midori_view_get_display_uri: * @view: a #MidoriView * - * Retrieves a string that is suitable for displaying, - * particularly an empty URI is represented as "about:blank". + * Retrieves a string that is suitable for displaying. + * + * Note that "about:blank" is represented as "". * * You can assume that the string is not %NULL. * @@ -2201,11 +2202,16 @@ midori_view_get_icon (MidoriView* view) const gchar* midori_view_get_display_uri (MidoriView* view) { - g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); + g_return_val_if_fail (MIDORI_IS_VIEW (view), ""); + + /* Something in the stack tends to turn "" into "about:blank". + Yet for practical purposes we prefer "". */ + if (view->uri && !strcmp (view->uri, "about:blank")) + return ""; if (view->uri && *view->uri) return view->uri; - return "about:blank"; + return ""; } /** @@ -2216,6 +2222,8 @@ midori_view_get_display_uri (MidoriView* view) * as a title. Most of the time this will be the title * or the current URI. * + * An empty page is represented as "about:blank". + * * You can assume that the string is not %NULL. * * Return value: a title string @@ -2225,6 +2233,9 @@ midori_view_get_display_title (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); + if (view->title && !strcmp (view->title, "")) + return "about:blank"; + if (view->title && *view->title) return view->title; return midori_view_get_display_uri (view); From 16e47a6a1f80c73715937d6d66358e9a9987e1cb Mon Sep 17 00:00:00 2001 From: Brandon Mercer Date: Wed, 8 Oct 2008 15:45:34 +0200 Subject: [PATCH 0353/2970] Don't use 'stdin' or 'stdout' as variable names --- midori/midori-view.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index a061c144..08430fd7 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1512,8 +1512,8 @@ gtk_socket_realize_cb (GtkWidget* socket, gchar* socket_id; GError* error; gboolean success; - gint stdin; - gint stdout; + gint stdin_fd; + gint stdout_fd; gchar* argv[] = { NULL, "--id", NULL, NULL }; /* Sockets are not supported on all platforms, @@ -1531,7 +1531,7 @@ gtk_socket_realize_cb (GtkWidget* socket, error = NULL; success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, - &stdin, &stdout, NULL, &error); + &stdin_fd, &stdout_fd, NULL, &error); g_free (socket_id); if (!success) @@ -1544,8 +1544,8 @@ gtk_socket_realize_cb (GtkWidget* socket, return; } - view->output = fdopen (stdin, "w"); - view->input = g_io_channel_unix_new (stdout); + view->output = fdopen (stdin_fd, "w"); + view->input = g_io_channel_unix_new (stdout_fd); g_io_channel_set_close_on_unref (view->input, TRUE); g_io_add_watch (view->input, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_NVAL | G_IO_HUP, From e1b828edf2d014f9eb5c78e5df020a45ecaed902 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Oct 2008 22:31:37 +0200 Subject: [PATCH 0354/2970] Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now. --- katze/Makefile.am | 3 +- katze/katze-arrayaction.c | 361 ++++++++++++++++++++++++++++++++++++++ katze/katze-arrayaction.h | 47 +++++ katze/katze-utils.c | 123 +++++++++++++ katze/katze-utils.h | 15 ++ katze/katze.h | 1 + midori/midori-browser.c | 323 +++++++++++++++++++--------------- midori/sokoke.c | 91 +--------- po/POTFILES.in | 1 + 9 files changed, 732 insertions(+), 233 deletions(-) create mode 100644 katze/katze-arrayaction.c create mode 100644 katze/katze-arrayaction.h diff --git a/katze/Makefile.am b/katze/Makefile.am index 8e6caa71..f357f6a5 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -16,4 +16,5 @@ libkatze_la_SOURCES = \ katze-utils.c katze-utils.h \ katze-item.c katze-item.h \ katze-list.c katze-list.h \ - katze-array.c katze-array.h + katze-array.c katze-array.h \ + katze-arrayaction.c katze-arrayaction.h diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c new file mode 100644 index 00000000..a47f4f92 --- /dev/null +++ b/katze/katze-arrayaction.c @@ -0,0 +1,361 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-arrayaction.h" + +#include "katze-utils.h" + +#include +#include + +struct _KatzeArrayAction +{ + GtkAction parent_instance; + + KatzeArray* array; +}; + +struct _KatzeArrayActionClass +{ + GtkActionClass parent_class; +}; + +G_DEFINE_TYPE (KatzeArrayAction, katze_array_action, GTK_TYPE_ACTION) + +enum +{ + PROP_0, + + PROP_ARRAY +}; + +enum +{ + POPULATE_POPUP, + ACTIVATE_ITEM, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +katze_array_action_finalize (GObject* object); + +static void +katze_array_action_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +katze_array_action_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +katze_array_action_activate (GtkAction* object); + +static GtkWidget* +katze_array_action_create_tool_item (GtkAction* action); + +static GtkWidget* +katze_array_action_create_menu_item (GtkAction* action); + +static void +katze_array_action_connect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +katze_array_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +katze_array_action_class_init (KatzeArrayActionClass* class) +{ + GObjectClass* gobject_class; + GtkActionClass* action_class; + + signals[POPULATE_POPUP] = g_signal_new ("populate-popup", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU); + + signals[ACTIVATE_ITEM] = g_signal_new ("activate-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + KATZE_TYPE_ITEM); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_array_action_finalize; + gobject_class->set_property = katze_array_action_set_property; + gobject_class->get_property = katze_array_action_get_property; + + action_class = GTK_ACTION_CLASS (class); + action_class->activate = katze_array_action_activate; + action_class->create_menu_item = katze_array_action_create_menu_item; + action_class->create_tool_item = katze_array_action_create_tool_item; + action_class->connect_proxy = katze_array_action_connect_proxy; + action_class->disconnect_proxy = katze_array_action_disconnect_proxy; + + g_object_class_install_property (gobject_class, + PROP_ARRAY, + g_param_spec_object ( + "array", + _("Array"), + _("The array the action represents"), + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); +} + +static void +katze_array_action_init (KatzeArrayAction* array_action) +{ + array_action->array = NULL; +} + +static void +katze_array_action_finalize (GObject* object) +{ + KatzeArrayAction* array_action = KATZE_ARRAY_ACTION (object); + + if (array_action->array) + g_object_unref (array_action->array); + + G_OBJECT_CLASS (katze_array_action_parent_class)->finalize (object); +} + +static void +katze_array_action_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + KatzeArrayAction* array_action = KATZE_ARRAY_ACTION (object); + + switch (prop_id) + { + case PROP_ARRAY: + katze_array_action_set_array (array_action, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +katze_array_action_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + KatzeArrayAction* array_action = KATZE_ARRAY_ACTION (object); + + switch (prop_id) + { + case PROP_ARRAY: + g_value_set_object (value, array_action->array); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +katze_array_action_activate (GtkAction* action) +{ + GSList* proxies; + + proxies = gtk_action_get_proxies (action); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + + } + while ((proxies = g_slist_next (proxies))); + + if (GTK_ACTION_CLASS (katze_array_action_parent_class)->activate) + GTK_ACTION_CLASS (katze_array_action_parent_class)->activate (action); +} + +static void +katze_array_action_menu_item_activate_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) +{ + KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); + g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); +} + +static void +katze_array_action_proxy_clicked_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) +{ + GtkWidget* menu; + guint n, i; + GtkWidget* menuitem; + KatzeItem* item; + GdkPixbuf* pixbuf; + GtkWidget* icon; + + if (GTK_IS_MENU_ITEM (proxy)) + { + if (!(menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)))) + { + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (proxy), menu); + } + gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)(gtk_widget_destroy), NULL); + } + else + menu = gtk_menu_new (); + + n = katze_array_get_length (array_action->array); + if (n > 0) + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (array_action->array, i); + /* FIXME: The menu item should reflect changes to the item */ + menuitem = katze_image_menu_item_new_ellipsized ( + katze_item_get_name (item)); + pixbuf = gtk_widget_render_icon (menuitem, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); + icon = gtk_image_new_from_pixbuf (pixbuf); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + g_object_unref (pixbuf); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); + gtk_widget_show (menuitem); + } + else + { + menuitem = gtk_image_menu_item_new_with_label (_("Empty")); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } + + g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); + + if (!GTK_IS_MENU_ITEM (proxy)) + katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu), + NULL, KATZE_MENU_POSITION_LEFT); +} + +static GtkWidget* +katze_array_action_create_menu_item (GtkAction* action) +{ + GtkWidget* menuitem; + + menuitem = gtk_menu_item_new (); + return menuitem; +} + +static GtkWidget* +katze_array_action_create_tool_item (GtkAction* action) +{ + GtkWidget* toolitem; + + toolitem = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + return toolitem; +} + +static void +katze_array_action_connect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + GTK_ACTION_CLASS (katze_array_action_parent_class)->connect_proxy ( + action, proxy); + + if (GTK_IS_TOOL_ITEM (proxy)) + { + g_signal_connect (proxy, "clicked", + G_CALLBACK (katze_array_action_proxy_clicked_cb), action); + } + else if (GTK_IS_MENU_ITEM (proxy)) + { + /* FIXME: 'select' doesn't cover all ways of selection */ + g_signal_connect (proxy, "select", + G_CALLBACK (katze_array_action_proxy_clicked_cb), action); + } +} + +static void +katze_array_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + g_signal_handlers_disconnect_by_func (proxy, + G_CALLBACK (katze_array_action_proxy_clicked_cb), action); + + GTK_ACTION_CLASS (katze_array_action_parent_class)->disconnect_proxy + (action, proxy); +} + +KatzeArray* +katze_array_action_get_array (KatzeArrayAction* array_action) +{ + g_return_val_if_fail (KATZE_IS_ARRAY_ACTION (array_action), NULL); + + return array_action->array; +} + +void +katze_array_action_set_array (KatzeArrayAction* array_action, + KatzeArray* array) +{ + GSList* proxies; + + g_return_if_fail (KATZE_IS_ARRAY_ACTION (array_action)); + g_return_if_fail (!array || katze_array_is_a (array, KATZE_TYPE_ITEM)); + + /* FIXME: Disconnect old array */ + + if (array) + g_object_ref (array); + katze_object_assign (array_action->array, array); + + /* FIXME: Add and remove items dynamically */ + /*g_object_connect (array, + "signal-after::add-item", + katze_array_action_engines_add_item_cb, array_action, + "signal-after::remove-item", + katze_array_action_engines_remove_item_cb, array_action, + NULL);*/ + + g_object_notify (G_OBJECT (array_action), "array"); + + proxies = gtk_action_get_proxies (GTK_ACTION (array_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + + } + while ((proxies = g_slist_next (proxies))); +} diff --git a/katze/katze-arrayaction.h b/katze/katze-arrayaction.h new file mode 100644 index 00000000..b4e9ee22 --- /dev/null +++ b/katze/katze-arrayaction.h @@ -0,0 +1,47 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_ARRAY_ACTION_H__ +#define __KATZE_ARRAY_ACTION_H__ + +#include "katze-array.h" + +G_BEGIN_DECLS + +#define KATZE_TYPE_ARRAY_ACTION \ + (katze_array_action_get_type ()) +#define KATZE_ARRAY_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_ARRAY_ACTION, KatzeArrayAction)) +#define KATZE_ARRAY_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_ARRAY_ACTION, KatzeArrayActionClass)) +#define KATZE_IS_ARRAY_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_ARRAY_ACTION)) +#define KATZE_IS_ARRAY_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_ARRAY_ACTION)) +#define KATZE_ARRAY_ACTION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_ARRAY_ACTION, KatzeArrayActionClass)) + +typedef struct _KatzeArrayAction KatzeArrayAction; +typedef struct _KatzeArrayActionClass KatzeArrayActionClass; + +GType +katze_array_action_get_type (void); + +KatzeArray* +katze_array_action_get_array (KatzeArrayAction* array_action); + +void +katze_array_action_set_array (KatzeArrayAction* array_action, + KatzeArray* array); + +G_END_DECLS + +#endif /* __KATZE_ARRAY_ACTION_H__ */ diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 061e7c3d..af2d3857 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -328,3 +328,126 @@ katze_property_label (gpointer object, return widget; } + +typedef struct +{ + GtkWidget* widget; + KatzeMenuPos position; +} KatzePopupInfo; + +static void +katze_widget_popup_position_menu (GtkMenu* menu, + gint* x, + gint* y, + gboolean* push_in, + gpointer user_data) +{ + gint wx, wy; + gint menu_width; + GtkRequisition menu_req; + GtkRequisition widget_req; + KatzePopupInfo* info = user_data; + GtkWidget* widget = info->widget; + gint widget_height; + + /* Retrieve size and position of both widget and menu */ + if (GTK_WIDGET_NO_WINDOW (widget)) + { + gdk_window_get_position (widget->window, &wx, &wy); + wx += widget->allocation.x; + wy += widget->allocation.y; + } + else + gdk_window_get_origin (widget->window, &wx, &wy); + gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); + gtk_widget_size_request (widget, &widget_req); + menu_width = menu_req.width; + widget_height = widget_req.height; /* Better than allocation.height */ + + /* Calculate menu position */ + if (info->position == KATZE_MENU_POSITION_CURSOR) + ; /* Do nothing? */ + else if (info->position == KATZE_MENU_POSITION_RIGHT) + { + *x = wx + widget->allocation.width - menu_width; + *y = wy + widget_height; + } else if (info->position == KATZE_MENU_POSITION_LEFT) + { + *x = wx; + *y = wy + widget_height; + } + + *push_in = TRUE; +} + +/** + * katze_widget_popup: + * @widget: a widget + * @menu: the menu to popup + * @event: a button event, or %NULL + * @pos: the preferred positioning + * + * Pops up the given menu relative to @widget. Use this + * instead of writing custom positioning functions. + * + * Return value: a new label widget + **/ +void +katze_widget_popup (GtkWidget* widget, + GtkMenu* menu, + GdkEventButton* event, + KatzeMenuPos pos) +{ + int button, event_time; + if (event) + { + button = event->button; + event_time = event->time; + } + else + { + button = 0; + event_time = gtk_get_current_event_time (); + } + + if (!gtk_menu_get_attach_widget (menu)) + gtk_menu_attach_to_widget (menu, widget, NULL); + + + if (widget) + { + KatzePopupInfo info = { widget, pos }; + gtk_menu_popup (menu, NULL, NULL, + katze_widget_popup_position_menu, &info, + button, event_time); + } + else + gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, event_time); +} + +/** + * katze_image_menu_item_new_ellipsized: + * @label: a label or %NULL + * + * Creates an image menu item where the label is + * reasonably ellipsized for you. + * + * Return value: a new label widget + **/ +GtkWidget* +katze_image_menu_item_new_ellipsized (const gchar* label) +{ + GtkWidget* menuitem; + GtkWidget* label_widget; + + menuitem = gtk_image_menu_item_new (); + label_widget = gtk_label_new (label); + /* FIXME: Should text direction be respected here? */ + gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.0); + gtk_label_set_max_width_chars (GTK_LABEL (label_widget), 50); + gtk_label_set_ellipsize (GTK_LABEL (label_widget), PANGO_ELLIPSIZE_MIDDLE); + gtk_widget_show (label_widget); + gtk_container_add (GTK_CONTAINER (menuitem), label_widget); + + return menuitem; +} diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 6ff7b863..52ac45a8 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -63,6 +63,21 @@ GtkWidget* katze_property_label (gpointer object, const gchar* property); +typedef enum { + KATZE_MENU_POSITION_CURSOR = 0, + KATZE_MENU_POSITION_LEFT, + KATZE_MENU_POSITION_RIGHT +} KatzeMenuPos; + +void +katze_widget_popup (GtkWidget* widget, + GtkMenu* menu, + GdkEventButton* event, + KatzeMenuPos pos); + +GtkWidget* +katze_image_menu_item_new_ellipsized (const gchar* label); + G_END_DECLS #endif /* __KATZE_UTILS_H__ */ diff --git a/katze/katze.h b/katze/katze.h index d38bd99f..eb4e2c40 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -17,5 +17,6 @@ #include "katze-item.h" #include "katze-list.h" #include "katze-array.h" +#include "katze-arrayaction.h" #endif /* __KATZE_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0608ed57..aa5acd69 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -44,9 +44,7 @@ struct _MidoriBrowser GtkActionGroup* action_group; GtkWidget* menubar; - GtkWidget* menu_bookmarks; GtkWidget* menu_tools; - GtkWidget* menu_window; GtkWidget* popup_bookmark; GtkWidget* popup_history; GtkWidget* throbber; @@ -72,12 +70,11 @@ struct _MidoriBrowser GtkWidget* statusbar; GtkWidget* progressbar; - gchar* statusbar_text; - MidoriWebSettings* settings; - KatzeArray* bookmarks; + MidoriWebSettings* settings; KatzeArray* proxy_array; + KatzeArray* bookmarks; KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; @@ -733,32 +730,19 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, g_signal_emit (browser, signals[REMOVE_TAB], 0, widget); /* We don't ever want to be in a situation with no tabs, - so just create an empty one if the last one is closed. */ - if (!midori_browser_get_current_tab (browser)) + so just create an empty one if the last one is closed. + The only exception is when we are closing the window, + which is indicated by the proxy array having been unset. */ + if (browser->proxy_array && !midori_browser_get_current_tab (browser)) midori_browser_add_uri (browser, ""); return FALSE; } -static void -midori_browser_window_menu_item_activate_cb (GtkWidget* menuitem, - GtkWidget* widget) -{ - MidoriBrowser* browser; - - g_return_if_fail (GTK_IS_WIDGET (widget)); - - browser = MIDORI_BROWSER (gtk_widget_get_toplevel (widget)); - g_return_if_fail (browser); - - midori_browser_set_current_tab (browser, widget); -} - static void _midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* view) { GtkWidget* tab_label; - GtkWidget* menuitem; KatzeItem* item; guint n; @@ -770,14 +754,10 @@ _midori_browser_add_tab (MidoriBrowser* browser, GTK_SHADOW_ETCHED_IN); tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); - menuitem = midori_view_get_proxy_menu_item (MIDORI_VIEW (view)); - if (browser->proxy_array) - { - item = midori_view_get_proxy_item (MIDORI_VIEW (view)); - g_object_ref (item); - katze_array_add_item (browser->proxy_array, item); - } + item = midori_view_get_proxy_item (MIDORI_VIEW (view)); + g_object_ref (item); + katze_array_add_item (browser->proxy_array, item); g_object_connect (view, "signal::notify::icon", @@ -828,14 +808,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, view, TRUE); #endif - gtk_widget_show (menuitem); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_window_menu_item_activate_cb), view); - gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); - /* We want the tab to be removed if the widget is destroyed */ - g_signal_connect_swapped (view, "destroy", - G_CALLBACK (gtk_widget_destroy), menuitem); g_signal_connect (view, "destroy", G_CALLBACK (midori_browser_tab_destroy_cb), browser); @@ -1427,63 +1400,105 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, } static void -midori_browser_menu_trash_item_activate_cb (GtkWidget* menuitem, - MidoriBrowser* browser) +_action_trash_populate_popup (GtkAction* action, + GtkMenu* menu, + MidoriBrowser* browser) { - KatzeItem* item; - gint n; + GtkWidget* menuitem; - /* Create a new web view with an uri which has been closed before */ - item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - n = midori_browser_add_item (browser, item); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "TrashEmpty")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +_action_trash_activate_item (GtkAction* action, + KatzeItem* item, + MidoriBrowser* browser) +{ + gint n = midori_browser_add_item (browser, item); midori_browser_set_current_page (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); } static void -midori_browser_menu_trash_activate_cb (GtkWidget* widget, - MidoriBrowser* browser) +_action_history_populate_popup (GtkAction* action, + GtkMenu* menu, + MidoriBrowser* browser) { - GtkWidget* menu; - guint i, n; - KatzeItem* item; - const gchar* title; - const gchar* uri; - GtkWidget* menuitem; - GtkWidget* icon; - GtkAction* action; + /* Nothing to do */ +} - menu = gtk_menu_new (); - n = katze_array_get_length (browser->trash); +static void +_action_history_activate_item (GtkAction* action, + KatzeItem* item, + MidoriBrowser* browser) +{ + _midori_browser_open_uri (browser, katze_item_get_uri (item)); +} + +static void +_action_bookmarks_populate_popup (GtkAction* action, + GtkMenu* menu, + MidoriBrowser* browser) +{ + GtkWidget* menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "BookmarkAdd")); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +_action_bookmarks_activate_item (GtkAction* action, + KatzeItem* item, + MidoriBrowser* browser) +{ + gint n = midori_browser_add_item (browser, item); + midori_browser_set_current_page (browser, n); + _midori_browser_update_actions (browser); +} + +static void +_action_window_populate_popup (GtkAction* action, + GtkMenu* menu, + MidoriBrowser* browser) +{ + GtkWidget* menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "TabPrevious")); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "TabNext")); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +_action_window_activate_item (GtkAction* action, + KatzeItem* item, + MidoriBrowser* browser) +{ + guint i, n; + GtkWidget* view; + + n = katze_array_get_length (browser->proxy_array); for (i = 0; i < n; i++) { - item = katze_array_get_nth_item (browser->trash, i); - title = katze_item_get_name (item); - uri = katze_item_get_uri (item); - menuitem = sokoke_image_menu_item_new_ellipsized (title ? title : uri); - /* FIXME: Get the real icon */ - icon = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_menu_trash_item_activate_cb), browser); - gtk_widget_show (menuitem); + view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), i); + if (midori_view_get_proxy_item (MIDORI_VIEW (view)) == item) + gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), i); } - - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - action = gtk_action_group_get_action (browser->action_group, "TrashEmpty"); - menuitem = gtk_action_create_menu_item (action); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - if (GTK_IS_MENU_ITEM (widget)) - gtk_menu_item_set_submenu (GTK_MENU_ITEM (widget), menu); - else - sokoke_widget_popup (widget, GTK_MENU (menu), NULL, - SOKOKE_MENU_POSITION_RIGHT); } static void @@ -2877,10 +2892,6 @@ static const GtkActionEntry entries[] = { { "OpenInPageholder", GTK_STOCK_JUMP_TO, N_("Open in Page_holder..."), "", N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) }, - { "Trash", STOCK_USER_TRASH, - NULL, "", -/* N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, */ - N_("Reopen a previously closed tab or window"), NULL }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, @@ -2888,7 +2899,6 @@ static const GtkActionEntry entries[] = { N_("Undo Close Tab"), "t", N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, - { "Bookmarks", NULL, N_("_Bookmarks") }, { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, @@ -2925,7 +2935,6 @@ static const GtkActionEntry entries[] = { N_("Add, edit and remove search engines..."), G_CALLBACK (_action_manage_search_engines_activate) }, - { "Window", NULL, N_("_Window") }, { "TabPrevious", GTK_STOCK_GO_BACK, N_("_Previous Tab"), "Page_Up", N_("Switch to the previous tab"), G_CALLBACK (_action_tab_previous_activate) }, @@ -3086,28 +3095,15 @@ static const gchar* ui_markup = "" "" "" - "" - /* Closed tabs shall be prepended here */ - "" - "" - "" - "" - "" - "" - "" - "" - /* Bookmarks shall be appended here */ + "" + /* "" */ "" + "" "" "" /* Panel items shall be appended here */ "" - "" - "" - "" - "" - /* All open tabs shall be appended here */ - "" + "" "" "" "" @@ -3124,7 +3120,7 @@ static const gchar* ui_markup = "" "" "" - "" + "" "" "" "" @@ -3186,6 +3182,7 @@ midori_browser_init (MidoriBrowser* browser) GtkRcStyle* rcstyle; browser->settings = midori_web_settings_new (); + browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); browser->bookmarks = NULL; browser->trash = NULL; browser->search_engines = NULL; @@ -3292,6 +3289,70 @@ midori_browser_init (MidoriBrowser* browser) action, "K"); g_object_unref (action); + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, + "name", "Trash", + "stock-id", STOCK_USER_TRASH, + "tooltip", _("Reopen a previously closed tab or window"), + NULL); + g_object_connect (action, + "signal::populate-popup", + _action_trash_populate_popup, browser, + "signal::activate-item", + _action_trash_activate_item, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, + action, ""); + g_object_unref (action); + + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, + "name", "RecentlyVisited", + "label", _("_Recently visited pages"), + "stock-id", STOCK_HISTORY, + "tooltip", _("Revisit pages that you opened before"), + NULL); + g_object_connect (action, + "signal::populate-popup", + _action_history_populate_popup, browser, + "signal::activate-item", + _action_history_activate_item, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, + action, ""); + g_object_unref (action); + + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, + "name", "Bookmarks", + "label", _("_Bookmarks"), + "stock-id", STOCK_BOOKMARKS, + "tooltip", _("Reopen a previously closed tab or window"), + NULL); + g_object_connect (action, + "signal::populate-popup", + _action_bookmarks_populate_popup, browser, + "signal::activate-item", + _action_bookmarks_activate_item, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, + action, ""); + g_object_unref (action); + + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, + "name", "Window", + "label", _("Window"), + "stock-id", GTK_STOCK_INDEX, + "tooltip", _("Show a list of all open tabs"), + "array", browser->proxy_array, + NULL); + g_object_connect (action, + "signal::populate-popup", + _action_window_populate_popup, browser, + "signal::activate-item", + _action_window_activate_item, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, + action, ""); + g_object_unref (action); + /* Create the menubar */ browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); GtkWidget* menuitem = gtk_menu_item_new (); @@ -3303,31 +3364,15 @@ midori_browser_init (MidoriBrowser* browser) gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem); gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); - menuitem = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Trash"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_menu_trash_activate_cb), - browser); - browser->menu_bookmarks = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( - gtk_ui_manager_get_widget (ui_manager, "/menubar/Bookmarks"))); - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_bookmarks), menuitem); - browser->popup_bookmark = gtk_ui_manager_get_widget ( - ui_manager, "/popup_bookmark"); - g_object_ref (browser->popup_bookmark); - browser->popup_history = gtk_ui_manager_get_widget ( - ui_manager, "/popup_history"); - g_object_ref (browser->popup_history); + browser->popup_bookmark = g_object_ref (gtk_ui_manager_get_widget ( + ui_manager, "/popup_bookmark")); + browser->popup_history = g_object_ref (gtk_ui_manager_get_widget ( + ui_manager, "/popup_history")); browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); - browser->menu_window = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( - gtk_ui_manager_get_widget (ui_manager, "/menubar/Window"))); - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_window), menuitem); gtk_widget_show (browser->menubar); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); @@ -3348,13 +3393,9 @@ midori_browser_init (MidoriBrowser* browser) ui_manager, "/toolbar_navigation/Homepage"); browser->search = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation/Search"); + browser->button_trash = gtk_ui_manager_get_widget ( + ui_manager, "/toolbar_navigation/Trash"); - action = gtk_action_group_get_action (browser->action_group, "Trash"); - browser->button_trash = gtk_action_create_tool_item (action); - g_signal_connect (browser->button_trash, "clicked", - G_CALLBACK (midori_browser_menu_trash_activate_cb), browser); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (browser->button_trash), -1); sokoke_container_show_children (GTK_CONTAINER (browser->navigationbar)); gtk_widget_hide (browser->navigationbar); action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); @@ -3637,8 +3678,7 @@ midori_browser_dispose (GObject* object) MidoriBrowser* browser = MIDORI_BROWSER (object); /* We are done, the session mustn't change anymore */ - if (browser->proxy_array) - katze_object_assign (browser->proxy_array, NULL); + katze_object_assign (browser->proxy_array, NULL); G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object); } @@ -3827,8 +3867,6 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) if (!browser->bookmarks) return; - _midori_browser_create_bookmark_menu (browser, browser->bookmarks, - browser->menu_bookmarks); n = katze_array_get_length (browser->bookmarks); for (i = 0; i < n; i++) { @@ -4022,6 +4060,8 @@ midori_browser_set_property (GObject* object, ; /* FIXME: Disconnect handlers */ katze_object_assign (browser->bookmarks, g_value_get_object (value)); g_object_ref (browser->bookmarks); + g_object_set (_action_by_name (browser, "Bookmarks"), "array", + browser->bookmarks, NULL); midori_browser_load_bookmarks (browser); /* FIXME: Connect to updates */ break; @@ -4029,6 +4069,8 @@ midori_browser_set_property (GObject* object, ; /* FIXME: Disconnect handlers */ katze_object_assign (browser->trash, g_value_get_object (value)); g_object_ref (browser->trash); + g_object_set (_action_by_name (browser, "Trash"), "array", + browser->trash, NULL); /* FIXME: Connect to updates */ _midori_browser_update_actions (browser); break; @@ -4052,7 +4094,10 @@ midori_browser_set_property (GObject* object, case PROP_HISTORY: ; /* FIXME: Disconnect handlers */ katze_object_assign (browser->history, g_value_get_object (value)); + g_object_ref (browser->history); midori_browser_load_history (browser); + g_object_set (_action_by_name (browser, "RecentlyVisited"), "array", + browser->history, NULL); /* FIXME: Connect to updates */ break; default: @@ -4358,10 +4403,7 @@ midori_browser_get_current_tab (MidoriBrowser* browser) * Retrieves a proxy array representing the respective proxy items * of the present views that can be used for session management. * - * The folder is created on the first call and will be updated to reflect - * changes to all items automatically. - * - * Note that this implicitly creates proxy items of all views. + * The array is updated automatically. * * Note: Calling this function doesn't add a reference and the browser * may release its reference at some point. @@ -4373,11 +4415,6 @@ midori_browser_get_proxy_array (MidoriBrowser* browser) { g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - if (!browser->proxy_array) - { - browser->proxy_array = katze_array_new (KATZE_TYPE_ITEM); - /* FIXME: Fill in items of all present views */ - } return browser->proxy_array; } diff --git a/midori/sokoke.c b/midori/sokoke.c index 4efd01c8..7be3c2b4 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -217,88 +217,13 @@ sokoke_container_show_children (GtkContainer* container) gtk_container_foreach (container, (GtkCallback)(gtk_widget_show_all), NULL); } -typedef struct -{ - GtkWidget* widget; - SokokeMenuPos position; -} SokokePopupInfo; - -static void -sokoke_widget_popup_position_menu (GtkMenu* menu, - gint* x, - gint* y, - gboolean* push_in, - gpointer user_data) -{ - gint wx, wy; - gint menu_width; - GtkRequisition menu_req; - GtkRequisition widget_req; - SokokePopupInfo* info = user_data; - GtkWidget* widget = info->widget; - - /* Retrieve size and position of both widget and menu */ - if (GTK_WIDGET_NO_WINDOW (widget)) - { - gdk_window_get_position (widget->window, &wx, &wy); - wx += widget->allocation.x; - wy += widget->allocation.y; - } - else - gdk_window_get_origin (widget->window, &wx, &wy); - gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); - gtk_widget_size_request (widget, &widget_req); - menu_width = menu_req.width; - gint widget_height = widget_req.height; /* Better than allocation.height */ - - /* Calculate menu position */ - if (info->position == SOKOKE_MENU_POSITION_CURSOR) - ; /* Do nothing? */ - else if (info->position == SOKOKE_MENU_POSITION_RIGHT) - { - *x = wx + widget->allocation.width - menu_width; - *y = wy + widget_height; - } else if (info->position == SOKOKE_MENU_POSITION_LEFT) - { - *x = wx; - *y = wy + widget_height; - } - - *push_in = TRUE; -} - - void sokoke_widget_popup (GtkWidget* widget, GtkMenu* menu, GdkEventButton* event, SokokeMenuPos pos) { - int button, event_time; - if (event) - { - button = event->button; - event_time = event->time; - } - else - { - button = 0; - event_time = gtk_get_current_event_time (); - } - - if (!gtk_menu_get_attach_widget (menu)) - gtk_menu_attach_to_widget (menu, widget, NULL); - - - if (widget) - { - SokokePopupInfo info = { widget, pos }; - gtk_menu_popup (menu, NULL, NULL, - sokoke_widget_popup_position_menu, &info, - button, event_time); - } - else - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, event_time); + katze_widget_popup (widget, menu, event, (KatzeMenuPos)pos); } typedef enum @@ -704,19 +629,7 @@ sokoke_action_create_popup_menu_item (GtkAction* action) GtkWidget* sokoke_image_menu_item_new_ellipsized (const gchar* label) { - GtkWidget* menuitem; - GtkWidget* label_widget; - - menuitem = gtk_image_menu_item_new (); - label_widget = gtk_label_new (label); - /* FIXME: Should text direction be respected here? */ - gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.0); - gtk_label_set_max_width_chars (GTK_LABEL (label_widget), 50); - gtk_label_set_ellipsize (GTK_LABEL (label_widget), PANGO_ELLIPSIZE_MIDDLE); - gtk_widget_show (label_widget); - gtk_container_add (GTK_CONTAINER (menuitem), label_widget); - - return menuitem; + return katze_image_menu_item_new_ellipsized (label); } /** diff --git a/po/POTFILES.in b/po/POTFILES.in index 61ab1ba7..7552c1a2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -19,3 +19,4 @@ katze/katze-utils.c katze/katze-item.c katze/katze-list.c katze/katze-array.c +katze/katze-arrayaction.c From 06aa03c6a6c8bbbe7d74a05b2c661c759df49ca6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Oct 2008 22:50:56 +0200 Subject: [PATCH 0355/2970] Prevent blank pages from landing in the trash This actually used to work but meanwhile the definition of a blank view changed. --- midori/midori-browser.c | 2 +- midori/midori-view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index aa5acd69..e418ae56 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -714,7 +714,7 @@ midori_browser_tab_destroy_cb (GtkWidget* widget, { item = midori_view_get_proxy_item (MIDORI_VIEW (widget)); uri = katze_item_get_uri (item); - if (browser->trash && uri && *uri) + if (browser->trash && !midori_view_is_blank (MIDORI_VIEW (widget))) katze_array_add_item (browser->trash, item); katze_array_remove_item (browser->proxy_array, item); g_object_unref (item); diff --git a/midori/midori-view.c b/midori/midori-view.c index 08430fd7..b3303ce9 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2168,7 +2168,7 @@ midori_view_is_blank (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), TRUE); - return !(view->uri && *view->uri); + return midori_view_get_display_uri (view)[0] == '\0'; } /** From 52c9eca92a6870a52f85f036aa81795893fe0c99 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Oct 2008 23:00:33 +0200 Subject: [PATCH 0356/2970] Notify when the current item changes This fixes the browser not using the chosen search engine at all. --- midori/midori-searchaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 549c60f2..6d08d1a6 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -14,10 +14,8 @@ #include "gtkiconentry.h" #include "sokoke.h" -#include #include #include -#include struct _MidoriSearchAction { @@ -328,7 +326,7 @@ midori_search_action_create_tool_item (GtkAction* action) gtk_widget_show (alignment); MIDORI_SEARCH_ACTION (action)->last_proxy = GTK_WIDGET (toolitem); - return GTK_WIDGET (toolitem); + return toolitem; } static void @@ -667,6 +665,8 @@ midori_search_action_set_current_item (MidoriSearchAction* search_action, g_object_ref (item); katze_object_assign (search_action->current_item, item); + g_object_notify (G_OBJECT (search_action), "current-item"); + proxies = gtk_action_get_proxies (GTK_ACTION (search_action)); if (!proxies) return; From 77a813dba2c0a6403e0edce1afea32c713b65ebc Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Fri, 10 Oct 2008 23:19:37 +0200 Subject: [PATCH 0357/2970] Show a dialog before clearing the history Plus you can now remove history items with Del. --- midori/midori-browser.c | 104 ++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e418ae56..4070100e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -35,6 +35,7 @@ #include #endif #include +#include #include #include @@ -2067,6 +2068,58 @@ midori_panel_history_button_release_event_cb (GtkWidget* widget, return FALSE; } +static void +midori_panel_remove_history_item (GtkTreeView* treeview) +{ + GtkTreeModel* treemodel; + GtkTreeIter iter; + GtkTreeIter child_iter; + KatzeItem* item; + KatzeItem* child; + KatzeArray* parent; + gint i, n; + + if (sokoke_tree_view_get_selected_iter (treeview, &treemodel, &iter)) + { + gtk_tree_model_get (treemodel, &iter, 0, &item, -1); + + if (KATZE_IS_ARRAY (item)) + { + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); + katze_array_remove_item (KATZE_ARRAY (item), child); + } + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + while (gtk_tree_model_iter_nth_child (treemodel, + &child_iter, &iter, 0)) + gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &child_iter); + gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); + g_object_unref (item); + } + else + { + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); + g_object_unref (item); + } + } +} + +static gboolean +midori_panel_history_key_release_event_cb (GtkWidget* widget, + GdkEventKey* event, + MidoriBrowser* browser) +{ + if (event->keyval == GDK_Delete) + midori_panel_remove_history_item (GTK_TREE_VIEW (widget)); + + return FALSE; +} + static void midori_panel_history_popup_menu_cb (GtkWidget* widget, MidoriBrowser* browser) @@ -2676,57 +2729,32 @@ static void _action_history_delete_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview; - GtkTreeModel* treemodel; - GtkTreeIter iter; - GtkTreeIter childiter; - KatzeItem* item; - KatzeItem* child; - KatzeArray* parent; - gint i, n; - - treeview = GTK_TREE_VIEW (browser->panel_history); - if (sokoke_tree_view_get_selected_iter (treeview, &treemodel, &iter)) - { - gtk_tree_model_get (treemodel, &iter, 0, &item, -1); - - if (KATZE_IS_ARRAY (item)) - { - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); - katze_array_remove_item (KATZE_ARRAY (item), child); - } - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - while (gtk_tree_model_iter_nth_child (treemodel, &childiter, &iter, 0)) - gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &childiter); - gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); - g_object_unref (item); - } - else - { - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); - g_object_unref (item); - } - } + midori_panel_remove_history_item (GTK_TREE_VIEW (browser->panel_history)); } static void _action_history_clear_activate (GtkAction* action, MidoriBrowser* browser) { + GtkWidget* dialog; GtkTreeView* tree_view; GtkTreeStore* store; KatzeItem* item; gint i, n; + gint result; if (!browser->history) return; + dialog = gtk_message_dialog_new (GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, + _("Are you sure you want to remove all history items?")); + result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (result != GTK_RESPONSE_YES) + return; + tree_view = GTK_TREE_VIEW (browser->panel_history); store = GTK_TREE_STORE (gtk_tree_view_get_model (tree_view)); gtk_tree_store_clear (store); @@ -3520,6 +3548,8 @@ midori_browser_init (MidoriBrowser* browser) midori_panel_history_row_activated_cb, browser, "signal::button-release-event", midori_panel_history_button_release_event_cb, browser, + "signal::key-release-event", + midori_panel_history_key_release_event_cb, browser, "signal::popup-menu", midori_panel_history_popup_menu_cb, browser, NULL); From b343611f5f1ba64afa10ddd32142d50e8032d159 Mon Sep 17 00:00:00 2001 From: Troitskiy Nikita Date: Fri, 10 Oct 2008 23:40:36 +0200 Subject: [PATCH 0358/2970] Add Russian translation. --- AUTHORS | 1 + po/LINGUAS | 2 +- po/ru.po | 1611 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1613 insertions(+), 1 deletion(-) create mode 100644 po/ru.po diff --git a/AUTHORS b/AUTHORS index 40f1c95f..124c6602 100644 --- a/AUTHORS +++ b/AUTHORS @@ -27,6 +27,7 @@ Translations: hu: SZERVÁC Attila pl: Przemysław Sitek pl: Lukasz Romanowicz + ru: Troitskiy Nikita sv: Mikael Magnusson Code from other projects: diff --git a/po/LINGUAS b/po/LINGUAS index 466b5916..95b72068 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fr gl hu pl sv +de es et fr gl hu pl ru sv diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 00000000..594222c5 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,1611 @@ +# Russian translation for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Troitskiy Nikita 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.21\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-10-10 23:33+0200\n" +"PO-Revision-Date: 2008-09-10 00:35+0300\n" +"Last-Translator: Troitskiy Nikita \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Легковесный обозреватель интернет" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1063 ../midori/main.c:1073 +#: ../midori/main.c:1103 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Обозреватель интернет" + +#: ../midori/main.c:66 +msgid "_Bookmark" +msgstr "Закладка" + +#: ../midori/main.c:67 ../midori/midori-browser.c:3353 +msgid "_Bookmarks" +msgstr "_Закладки" + +#: ../midori/main.c:68 +msgid "_Add Bookmark" +msgstr "_Добавить закладку" + +#: ../midori/main.c:69 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/main.c:70 +msgid "_Disable" +msgstr "" + +#: ../midori/main.c:71 +msgid "_Enable" +msgstr "" + +#: ../midori/main.c:72 +msgid "_Extensions" +msgstr "_Дополнения" + +#: ../midori/main.c:73 +msgid "_History" +msgstr "_История" + +#: ../midori/main.c:74 +msgid "_Homepage" +msgstr "Домашняя страница" + +#: ../midori/main.c:75 +msgid "_Pageholder" +msgstr "" + +#: ../midori/main.c:76 +msgid "_Userscripts" +msgstr "_Скрипты пользователя" + +#: ../midori/main.c:77 +msgid "User_styles" +msgstr "_Стили пользователя" + +#: ../midori/main.c:78 +msgid "New _Tab" +msgstr "Новая Вкладка" + +#: ../midori/main.c:79 +msgid "_Transfers" +msgstr "_Передачи" + +#: ../midori/main.c:80 +msgid "_Closed Tabs and Windows" +msgstr "_Закрытые вкладки и окна" + +#: ../midori/main.c:81 +msgid "New _Window" +msgstr "Новое окно" + +#: ../midori/main.c:83 +msgid "Select _All" +msgstr "Пометить всё" + +#: ../midori/main.c:86 +msgid "_Fullscreen" +msgstr "Полноэкранный режим" + +#: ../midori/main.c:87 +msgid "_Leave Fullscreen" +msgstr "Выйти из полноэкранного режима" + +#: ../midori/main.c:138 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Настройки не могут быть загружены. %s\n" + +#: ../midori/main.c:193 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Значение '%s' недействительно для %s" + +#: ../midori/main.c:200 ../midori/main.c:269 +#, c-format +msgid "Unhandled settings value '%s'" +msgstr "Неподдерживаемое значение параметра %s" + +#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 +#: ../midori/main.c:571 +msgid "Malformed document." +msgstr "Плохо сформированный документ" + +#: ../midori/main.c:554 +msgid "File not found." +msgstr "Файл не найден" + +#: ../midori/main.c:591 ../midori/main.c:623 +#, c-format +msgid "Error opening database: %s\n" +msgstr "" + +#: ../midori/main.c:677 +#, c-format +msgid "Failed to remove history item. %s\n" +msgstr "" + +#: ../midori/main.c:701 +#, c-format +msgid "Failed to clear history. %s\n" +msgstr "" + +#: ../midori/main.c:734 ../midori/main.c:749 +#, c-format +msgid "Failed to add history item. %s\n" +msgstr "" + +#: ../midori/main.c:978 ../midori/sokoke.c:474 +#, c-format +msgid "Writing failed." +msgstr "Запись завершилась неудачей" + +#: ../midori/main.c:1003 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Сессия не может быть сохранена. %s" + +#: ../midori/main.c:1032 +msgid "Internal identifier" +msgstr "" + +#: ../midori/main.c:1034 +msgid "Display program version" +msgstr "Отобразить версию программы" + +#: ../midori/main.c:1036 +msgid "URIs" +msgstr "" + +#: ../midori/main.c:1070 +msgid "[URIs]" +msgstr "" + +#: ../midori/main.c:1104 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Предложения, комментарии и соббщения об ошибках направляйте по адресу:" + +#: ../midori/main.c:1106 +msgid "Check for new versions at:" +msgstr "Искать обновления на:" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:1139 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midory уже запущен, но неотвечает.\n" + +#: ../midori/main.c:1173 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Закладки не могут быть загружены %s\n" + +#: ../midori/main.c:1187 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Сессия не может быть загружена. %s\n" + +#: ../midori/main.c:1199 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Корзина не может быть загружена. %s\n" + +#: ../midori/main.c:1209 +#, c-format +msgid "The history couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:1221 +msgid "The following errors occured:" +msgstr "Обнаружены следующе ошибки:" + +#: ../midori/main.c:1375 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Средства поиска не могут быть сохранены. %s" + +#: ../midori/main.c:1385 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Закладки не могут быть сохранены. %s" + +#: ../midori/main.c:1394 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Корзина не может быть сохранена. %s" + +#: ../midori/main.c:1402 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Конфигурация не может быть сохранена. %s" + +#: ../midori/midori-app.c:128 ../midori/midori-browser.c:1033 +#: ../midori/midori-view.c:392 ../midori/midori-preferences.c:61 +msgid "Settings" +msgstr "Установки" + +#: ../midori/midori-app.c:129 ../midori/midori-browser.c:1034 +#: ../midori/midori-view.c:393 +msgid "The associated settings" +msgstr "" + +#: ../midori/midori-app.c:137 ../midori/midori-browser.c:1050 +#: ../midori/midori-browser.c:3510 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../midori/midori-app.c:138 ../midori/midori-browser.c:1051 +msgid "The bookmarks folder, containing all bookmarks" +msgstr "" + +#: ../midori/midori-app.c:146 ../midori/midori-browser.c:1069 +msgid "Trash" +msgstr "Корзина" + +#: ../midori/midori-app.c:147 ../midori/midori-browser.c:1070 +msgid "The trash, collecting recently closed tabs and windows" +msgstr "Корзина. Сохраняет закрытые вкладки и окна" + +#: ../midori/midori-app.c:155 ../midori/midori-browser.c:1086 +#: ../midori/midori-searchaction.c:168 +msgid "Search Engines" +msgstr "Средства поиска" + +#: ../midori/midori-app.c:156 ../midori/midori-searchaction.c:169 +msgid "The list of search engines" +msgstr "Список средств поиска" + +#: ../midori/midori-app.c:164 +msgid "Browser" +msgstr "Обозреватель" + +#: ../midori/midori-app.c:165 +msgid "The current browser" +msgstr "Данный браузер" + +#: ../midori/midori-app.c:173 +msgid "Browser Count" +msgstr "" + +#: ../midori/midori-app.c:174 +msgid "The current number of browsers" +msgstr "Текущее число обозревателей" + +#: ../midori/midori-app.c:182 ../midori/midori-browser.c:1103 +#: ../midori/midori-browser.c:3564 +msgid "History" +msgstr "История" + +#: ../midori/midori-app.c:183 ../midori/midori-browser.c:1104 +msgid "The list of history items" +msgstr "" + +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "Ни один" + +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3597 +msgid "Extensions" +msgstr "Дополнения" + +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3580 +msgid "Userscripts" +msgstr "Скрипты пользователя" + +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3588 +msgid "Userstyles" +msgstr "Стили пользователя" + +#: ../midori/midori-addons.c:115 +msgid "Web Widget" +msgstr "" + +#: ../midori/midori-addons.c:116 +msgid "The assigned web widget" +msgstr "" + +#: ../midori/midori-addons.c:124 +msgid "Kind" +msgstr "Тип" + +#: ../midori/midori-addons.c:125 +msgid "The kind of addons" +msgstr "Тип дополнения" + +#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2890 +msgid "Reload the current page" +msgstr "Обновить страницу" + +#: ../midori/midori-browser.c:272 ../midori/midori-browser.c:2887 +msgid "Stop loading the current page" +msgstr "Прекратить загрузку страницы" + +#: ../midori/midori-browser.c:331 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% загружен" + +#: ../midori/midori-browser.c:355 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Неожиданное действие '%s'." + +#: ../midori/midori-browser.c:514 +msgid "New bookmark" +msgstr "Новая закладка" + +#: ../midori/midori-browser.c:514 +msgid "Edit bookmark" +msgstr "Редактировать закладку" + +#: ../midori/midori-browser.c:536 +msgid "_Title:" +msgstr "_Заголовок:" + +#: ../midori/midori-browser.c:549 ../midori/midori-searchaction.c:819 +msgid "_Description:" +msgstr "_Описание:" + +#: ../midori/midori-browser.c:568 ../midori/midori-searchaction.c:833 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:584 +msgid "_Folder:" +msgstr "_Папка:" + +#: ../midori/midori-browser.c:588 +msgid "Root" +msgstr "Root" + +#: ../midori/midori-browser.c:958 +msgid "Menubar" +msgstr "Вкладка меню" + +#: ../midori/midori-browser.c:959 +msgid "The menubar" +msgstr "Вкладка меню" + +#: ../midori/midori-browser.c:967 ../midori/midori-preferences.c:341 +msgid "Navigationbar" +msgstr "Панель навигации" + +#: ../midori/midori-browser.c:968 +msgid "The navigationbar" +msgstr "Панель навигации" + +#: ../midori/midori-browser.c:976 ../katze/katze-item.c:92 +msgid "URI" +msgstr "URI" + +#: ../midori/midori-browser.c:977 +msgid "The current URI" +msgstr "Данная URI" + +#: ../midori/midori-browser.c:985 +msgid "Tab" +msgstr "Вкладка" + +#: ../midori/midori-browser.c:986 +msgid "The current tab" +msgstr "Данная вкладка" + +#: ../midori/midori-browser.c:994 +msgid "Statusbar" +msgstr "Панель состояния" + +#: ../midori/midori-browser.c:995 +msgid "The statusbar" +msgstr "Панель состояния" + +#: ../midori/midori-browser.c:1014 ../midori/midori-view.c:383 +msgid "Statusbar Text" +msgstr "Текст вкладки статуса" + +#: ../midori/midori-browser.c:1015 +msgid "The text that is displayed in the statusbar" +msgstr "Текст отображаемый во вкладке статуса" + +#: ../midori/midori-browser.c:1087 +msgid "The list of search engines to be used for web search" +msgstr "Список средств поиска используемые для поиска в сети" + +#: ../midori/midori-browser.c:2219 +msgid "Separator" +msgstr "Разделитель" + +#: ../midori/midori-browser.c:2473 +msgid "A lightweight web browser." +msgstr "Легковесный·веб·браузер" + +#: ../midori/midori-browser.c:2481 +msgid "translator-credits" +msgstr "" +"Troitskiy Nikita " + +#: ../midori/midori-browser.c:2752 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:2819 +msgid "_File" +msgstr "_Файл" + +#: ../midori/midori-browser.c:2822 +msgid "Open a new window" +msgstr "Открыть в новом окне" + +#: ../midori/midori-browser.c:2825 +msgid "Open a new tab" +msgstr "Открыть в новой вкладке" + +#: ../midori/midori-browser.c:2828 +msgid "Open a file" +msgstr "Открыть файл" + +#: ../midori/midori-browser.c:2831 +msgid "Save to a file" +msgstr "Сохранить в файл" + +#: ../midori/midori-browser.c:2833 +msgid "_Close Tab" +msgstr "Закрыть вкладку" + +#: ../midori/midori-browser.c:2834 +msgid "Close the current tab" +msgstr "Закрыть данную вкладку" + +#: ../midori/midori-browser.c:2836 +msgid "C_lose Window" +msgstr "Закрыть окно" + +#: ../midori/midori-browser.c:2837 +msgid "Close this window" +msgstr "Закрыть данное окно" + +#: ../midori/midori-browser.c:2840 +msgid "Print the current page" +msgstr "Распечатать страницу" + +#: ../midori/midori-browser.c:2843 +msgid "Quit the application" +msgstr "Закрыть приложение" + +#: ../midori/midori-browser.c:2845 +msgid "_Edit" +msgstr "_Правка" + +#: ../midori/midori-browser.c:2848 +msgid "Cut the selected text" +msgstr "Вырезать выделенный текст" + +#: ../midori/midori-browser.c:2851 ../midori/midori-browser.c:2854 +msgid "Copy the selected text" +msgstr "Копировать выделенный текст" + +#: ../midori/midori-browser.c:2857 +msgid "Paste text from the clipboard" +msgstr "Вставить текст из буфера обмена" + +#: ../midori/midori-browser.c:2860 +msgid "Delete the selected text" +msgstr "Удалить выделенный текст" + +#: ../midori/midori-browser.c:2863 +msgid "Select all text" +msgstr "Выделить весь текст" + +#: ../midori/midori-browser.c:2866 +msgid "Find a word or phrase in the page" +msgstr "Поиск слова или фразы на странице" + +#: ../midori/midori-browser.c:2868 +msgid "Find _Next" +msgstr "Найти _Дальше" + +#: ../midori/midori-browser.c:2869 +msgid "Find the next occurrence of a word or phrase" +msgstr "Найти следующее местонахождение слова или фразы" + +#: ../midori/midori-browser.c:2871 +msgid "Find _Previous" +msgstr "Найти Предыдущее" + +#: ../midori/midori-browser.c:2872 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Найти предыдущее местонахождение слова или фразы" + +#: ../midori/midori-browser.c:2874 +msgid "_Quick Find" +msgstr "_Быстрый Поиск" + +#: ../midori/midori-browser.c:2875 +msgid "Quickly jump to a word or phrase" +msgstr "Перепрыгнуть на слово или фразу" + +#: ../midori/midori-browser.c:2878 +msgid "Configure the application preferences" +msgstr "Настройка приложения" + +#: ../midori/midori-browser.c:2880 +msgid "_View" +msgstr "_Вид" + +#: ../midori/midori-browser.c:2881 +msgid "_Toolbars" +msgstr "_Панели инструментов" + +#: ../midori/midori-browser.c:2893 +msgid "Increase the zoom level" +msgstr "Увеличить масштаб" + +#: ../midori/midori-browser.c:2896 +msgid "Decrease the zoom level" +msgstr "Уменьшить масштаб" + +#: ../midori/midori-browser.c:2899 +msgid "Reset the zoom level" +msgstr "Сбросить значение масштаба" + +#: ../midori/midori-browser.c:2901 ../midori/midori-view.c:1397 +msgid "View _Source" +msgstr "Просмотр исходного кода" + +#: ../midori/midori-browser.c:2902 +msgid "View the source code of the page" +msgstr "Просмотр исходного кода страницы" + +#: ../midori/midori-browser.c:2904 +msgid "View Selection Source" +msgstr "Просмотр исходного кода выделеного фрагмента" + +#: ../midori/midori-browser.c:2905 +msgid "View the source code of the selection" +msgstr "Просмотр исходного кода выделенного фрагмента" + +#: ../midori/midori-browser.c:2908 +msgid "Toggle fullscreen view" +msgstr "Переключить полноэкранный режим" + +#: ../midori/midori-browser.c:2910 +msgid "_Go" +msgstr "_Журнал" + +#: ../midori/midori-browser.c:2913 +msgid "Go back to the previous page" +msgstr "На предыдущую страницу" + +#: ../midori/midori-browser.c:2916 +msgid "Go forward to the next page" +msgstr "На следующую страницу" + +#: ../midori/midori-browser.c:2919 +msgid "Go to your homepage" +msgstr "На домашнюю страницу" + +#: ../midori/midori-browser.c:2921 +msgid "Open in Page_holder..." +msgstr "" + +#: ../midori/midori-browser.c:2922 +msgid "Open the current page in the pageholder" +msgstr "" + +#: ../midori/midori-browser.c:2924 +msgid "Empty Trash" +msgstr "Очистить" + +#: ../midori/midori-browser.c:2925 +msgid "Delete the contents of the trash" +msgstr "Очистить содержимое корзины" + +#. FIXME: Make this sensitive only when there is a tab to undo +#: ../midori/midori-browser.c:2927 ../midori/midori-view.c:1372 +msgid "Undo Close Tab" +msgstr "Отменить закрытие вкладок" + +#: ../midori/midori-browser.c:2928 +msgid "Open the last closed tab" +msgstr "Открыть последнюю закрытую вкладку" + +#: ../midori/midori-browser.c:2932 +msgid "Add a new bookmark" +msgstr "Новая закладка" + +#: ../midori/midori-browser.c:2935 +msgid "Open the selected bookmark" +msgstr "Открыть закладку" + +#: ../midori/midori-browser.c:2937 ../midori/midori-browser.c:2958 +msgid "Open in New _Tab" +msgstr "Открыть в новой _Вкладка" + +#: ../midori/midori-browser.c:2938 +msgid "Open the selected bookmark in a new tab" +msgstr "Открыть выбранные закладки в новых вкладках" + +#: ../midori/midori-browser.c:2940 +msgid "Open in New _Window" +msgstr "Открыть в новом _окне" + +#: ../midori/midori-browser.c:2941 +msgid "Open the selected bookmark in a new window" +msgstr "Открыть выбранные закладки в новом окне" + +#: ../midori/midori-browser.c:2944 +msgid "Edit the selected bookmark" +msgstr "Редактировать закладку" + +#: ../midori/midori-browser.c:2947 +msgid "Delete the selected bookmark" +msgstr "Удалить закладку" + +#: ../midori/midori-browser.c:2950 +msgid "Delete the selected history item" +msgstr "" + +#: ../midori/midori-browser.c:2953 +msgid "Clear the enitre history" +msgstr "" + +#: ../midori/midori-browser.c:2956 +msgid "Open the selected history item" +msgstr "" + +#: ../midori/midori-browser.c:2959 +msgid "Open the selected history item in a new tab" +msgstr "" + +#: ../midori/midori-browser.c:2960 +msgid "_Tools" +msgstr "_Сервис" + +#: ../midori/midori-browser.c:2962 ../midori/midori-searchaction.c:458 +msgid "_Manage Search Engines" +msgstr "_Управление средствами поиска" + +#: ../midori/midori-browser.c:2963 +msgid "Add, edit and remove search engines..." +msgstr "Добавление, правка и удаление средства поиска..." + +#: ../midori/midori-browser.c:2967 +msgid "_Previous Tab" +msgstr "_Предыдущая вкладка" + +#: ../midori/midori-browser.c:2968 +msgid "Switch to the previous tab" +msgstr "Переключиться на предыдущую вкладку" + +#: ../midori/midori-browser.c:2970 +msgid "_Next Tab" +msgstr "_Следующая вкладка" + +#: ../midori/midori-browser.c:2971 +msgid "Switch to the next tab" +msgstr "Переключиться на следующую вкладку" + +#: ../midori/midori-browser.c:2973 +msgid "_Help" +msgstr "_Справка" + +#: ../midori/midori-browser.c:2975 +msgid "_Contents" +msgstr "_Содержание" + +#: ../midori/midori-browser.c:2976 +msgid "Show the documentation" +msgstr "Документация" + +#: ../midori/midori-browser.c:2978 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:2979 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:2981 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:2982 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:2985 +msgid "Show information about the program" +msgstr "О программе" + +#: ../midori/midori-browser.c:2991 +msgid "P_rivate Browsing" +msgstr "" + +#: ../midori/midori-browser.c:2992 +msgid "Don't save any private data while browsing" +msgstr "Не сохранять персональные данные во время навигации" + +#: ../midori/midori-browser.c:2996 +msgid "_Navigationbar" +msgstr "_Панель навигации" + +#: ../midori/midori-browser.c:2997 +msgid "Show navigationbar" +msgstr "Показать панель навигации" + +#: ../midori/midori-browser.c:3000 +msgid "Side_panel" +msgstr "Боковая _панель" + +#: ../midori/midori-browser.c:3001 +msgid "Show sidepanel" +msgstr "Показать боковую панель" + +#: ../midori/midori-browser.c:3004 +msgid "_Bookmarkbar" +msgstr "_Панель закладок" + +#: ../midori/midori-browser.c:3005 +msgid "Show bookmarkbar" +msgstr "Показать панель закладок" + +#: ../midori/midori-browser.c:3008 +msgid "_Transferbar" +msgstr "_Панель передачи" + +#: ../midori/midori-browser.c:3009 +msgid "Show transferbar" +msgstr "Показать вкладку передачи" + +#: ../midori/midori-browser.c:3012 +msgid "_Statusbar" +msgstr "_Панель состояния" + +#: ../midori/midori-browser.c:3013 +msgid "Show statusbar" +msgstr "Показать панель состояния" + +#: ../midori/midori-browser.c:3276 +msgid "_Location..." +msgstr "_Положение..." + +#: ../midori/midori-browser.c:3278 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3302 +msgid "_Web Search..." +msgstr "_Поиск в сети..." + +#: ../midori/midori-browser.c:3304 +msgid "Run a web search" +msgstr "Запустить поиск в сети" + +#: ../midori/midori-browser.c:3323 ../midori/midori-browser.c:3355 +msgid "Reopen a previously closed tab or window" +msgstr "Открыть ранее закрытые вкладки или она" + +#: ../midori/midori-browser.c:3337 +msgid "_Recently visited pages" +msgstr "" + +#: ../midori/midori-browser.c:3339 +msgid "Revisit pages that you opened before" +msgstr "" + +#: ../midori/midori-browser.c:3369 +msgid "Window" +msgstr "" + +#: ../midori/midori-browser.c:3371 +msgid "Show a list of all open tabs" +msgstr "" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3517 ../midori/midori-preferences.c:276 +msgid "Transfers" +msgstr "Передачи" + +#: ../midori/midori-browser.c:3526 +msgid "Console" +msgstr "Консоль" + +#: ../midori/midori-browser.c:3571 +msgid "Pageholder" +msgstr "" + +#: ../midori/midori-browser.c:3620 +msgid "_Inline find:" +msgstr "_Встроенный поиск:" + +#: ../midori/midori-browser.c:3655 +msgid "Match Case" +msgstr "Условие совпадения" + +#: ../midori/midori-browser.c:3663 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:3672 +msgid "Close Findbar" +msgstr "Закрыть вкладку поиска" + +#: ../midori/midori-browser.c:3877 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Неожиданный параметр '%s'" + +#: ../midori/midori-panel.c:146 +msgid "Shadow Type" +msgstr "Тип тени" + +#: ../midori/midori-panel.c:147 +msgid "Appearance of the shadow around each panel" +msgstr "Внешний вид тени вокруг панели" + +#: ../midori/midori-panel.c:156 +msgid "Menu" +msgstr "Меню" + +#: ../midori/midori-panel.c:157 +msgid "Menu to hold panel items" +msgstr "Управление содержимым панелей" + +#: ../midori/midori-panel.c:165 +msgid "Page" +msgstr "Страница" + +#: ../midori/midori-panel.c:166 +msgid "The index of the current page" +msgstr "" + +#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +msgid "Close panel" +msgstr "Закрыть панель" + +#: ../midori/midori-websettings.c:130 +msgid "Blank page" +msgstr "Пустая страница" + +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +msgid "Homepage" +msgstr "Домашняя страница" + +#: ../midori/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Последние закрытые страницы" + +#: ../midori/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Китайская (BIG5)" + +#: ../midori/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Японская (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Кириллица (KOI8-r)" + +#: ../midori/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Юникод (UTF-8)" + +#: ../midori/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Западная (ISO-8859-1)" + +#: ../midori/midori-websettings.c:152 +msgid "Custom..." +msgstr "Дополнительно..." + +#: ../midori/midori-websettings.c:167 +msgid "New tab" +msgstr "Новая вкладка" + +#: ../midori/midori-websettings.c:168 +msgid "New window" +msgstr "Новое окно" + +#: ../midori/midori-websettings.c:169 +msgid "Current tab" +msgstr "Текущая вкладка" + +#: ../midori/midori-websettings.c:184 +msgid "Default" +msgstr "По-умолчанию" + +#: ../midori/midori-websettings.c:185 +msgid "Icons" +msgstr "Только значки" + +#: ../midori/midori-websettings.c:186 ../midori/midori-searchaction.c:186 +#: ../katze/katze-item.c:83 +msgid "Text" +msgstr "Только текст" + +#: ../midori/midori-websettings.c:187 +msgid "Both" +msgstr "Значки и текст" + +#: ../midori/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Значки и текст горизонтально" + +#: ../midori/midori-websettings.c:203 +msgid "All cookies" +msgstr "Все куки" + +#: ../midori/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Куки сессии" + +#: ../midori/midori-websettings.c:242 +msgid "Remember last window size" +msgstr "Запомнить размер последнего окна" + +#: ../midori/midori-websettings.c:243 +msgid "Whether to save the last window size" +msgstr "Запомнить последний размер окна" + +#: ../midori/midori-websettings.c:251 +msgid "Last window width" +msgstr "Ширина последнего окна" + +#: ../midori/midori-websettings.c:252 +msgid "The last saved window width" +msgstr "Ширина последнего сохранённого окна" + +#: ../midori/midori-websettings.c:260 +msgid "Last window height" +msgstr "Высота последнего сохранённого окна" + +#: ../midori/midori-websettings.c:261 +msgid "The last saved window height" +msgstr "Высота последнего сохранённого окна" + +#: ../midori/midori-websettings.c:269 +msgid "Last panel position" +msgstr "Позиция последней панели" + +#: ../midori/midori-websettings.c:270 +msgid "The last saved panel position" +msgstr "Последняя сохранённая позиция панели" + +#: ../midori/midori-websettings.c:278 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:279 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:287 +msgid "Last Web search" +msgstr "Последний поиск" + +#: ../midori/midori-websettings.c:288 +msgid "The last saved Web search" +msgstr "Последний сохранённый поиск в сети" + +#: ../midori/midori-websettings.c:296 +msgid "Last pageholder URI" +msgstr "" + +#: ../midori/midori-websettings.c:297 +msgid "The URI last opened in the pageholder" +msgstr "" + +#: ../midori/midori-websettings.c:307 +msgid "Show Navigationbar" +msgstr "Показать панель навигации" + +#: ../midori/midori-websettings.c:308 +msgid "Whether to show the navigationbar" +msgstr "Показывать панель навигации" + +#: ../midori/midori-websettings.c:316 +msgid "Show Bookmarkbar" +msgstr "Показать закладки" + +#: ../midori/midori-websettings.c:317 +msgid "Whether to show the bookmarkbar" +msgstr "Показывать закладки" + +#: ../midori/midori-websettings.c:325 +msgid "Show Panel" +msgstr "Показать панель" + +#: ../midori/midori-websettings.c:326 +msgid "Whether to show the panel" +msgstr "Показывать панель" + +#: ../midori/midori-websettings.c:334 +msgid "Show Statusbar" +msgstr "Показать вкладку статуса" + +#: ../midori/midori-websettings.c:335 +msgid "Whether to show the statusbar" +msgstr "Показывать панель состояния" + +#: ../midori/midori-websettings.c:344 +msgid "Toolbar Style" +msgstr "Стиль панель инструментов" + +#: ../midori/midori-websettings.c:345 +msgid "The style of the toolbar" +msgstr "Стиль панели инструментов" + +#: ../midori/midori-websettings.c:354 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:355 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:363 +msgid "Show New Tab" +msgstr "Показать новую вкладку" + +#: ../midori/midori-websettings.c:364 +msgid "Show the New Tab button in the toolbar" +msgstr "Показать кнопку Новая Вкладка в панели инструментов" + +#: ../midori/midori-websettings.c:372 +msgid "Show Homepage" +msgstr "Показать домашнюю страницу" + +#: ../midori/midori-websettings.c:373 +msgid "Show the Homepage button in the toolbar" +msgstr "Показать кнопку Домашняя Страница в панели инструментов" + +#: ../midori/midori-websettings.c:381 +msgid "Show Web search" +msgstr "Показать поиск" + +#: ../midori/midori-websettings.c:382 +msgid "Show the Web search entry in the toolbar" +msgstr "Показывать запись сетевого поиска в панели инструментов" + +#: ../midori/midori-websettings.c:390 +msgid "Show Trash" +msgstr "Показать корзину" + +#: ../midori/midori-websettings.c:391 +msgid "Show the Trash button in the toolbar" +msgstr "Показать кнопку Корзина в панели инструментов" + +#: ../midori/midori-websettings.c:401 +msgid "Load on Startup" +msgstr "Загружать при запуске" + +#: ../midori/midori-websettings.c:402 +msgid "What to load on startup" +msgstr "Загружать при запуске" + +#: ../midori/midori-websettings.c:412 +msgid "The homepage" +msgstr "Домашняя страница" + +#: ../midori/midori-websettings.c:420 +msgid "Download Folder" +msgstr "Каталог загрузок" + +#: ../midori/midori-websettings.c:421 +msgid "The folder downloaded files are saved to" +msgstr "Каталог, в который сохранялись файлы" + +#: ../midori/midori-websettings.c:429 +msgid "Download Manager" +msgstr "Администратор загрузок" + +#: ../midori/midori-websettings.c:430 +msgid "An external download manager" +msgstr "Внешний администратор загрузок" + +#: ../midori/midori-websettings.c:438 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:439 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:447 +msgid "Preferred Encoding" +msgstr "Предпочтительная кодировка" + +#: ../midori/midori-websettings.c:448 +msgid "The preferred character encoding" +msgstr "Предпочтительная кодировка символов" + +#: ../midori/midori-websettings.c:458 +msgid "Close Buttons on Tabs" +msgstr "Кнопки закрытия на вкладках" + +#: ../midori/midori-websettings.c:459 +msgid "Whether tabs have close buttons" +msgstr "Наличие кнопки закрытия на вкладках" + +#: ../midori/midori-websettings.c:467 +msgid "Open new pages in" +msgstr "Открыть новую страницу в" + +#: ../midori/midori-websettings.c:468 +msgid "Where to open new pages" +msgstr "Где открыть новую страницу в" + +#: ../midori/midori-websettings.c:477 +msgid "Middle click opens Selection" +msgstr "Действие по нажатию средней кнопки мыши" + +#: ../midori/midori-websettings.c:478 +msgid "Load an URL from the selection via middle click" +msgstr "Загружать выделенный URL средней кнопкой" + +#: ../midori/midori-websettings.c:486 +msgid "Open tabs in the background" +msgstr "Открывать вкладки в фоне" + +#: ../midori/midori-websettings.c:487 +msgid "Whether to open new tabs in the background" +msgstr "Открывать новые вкладки в фоне" + +#: ../midori/midori-websettings.c:495 +msgid "Open Tabs next to Current" +msgstr "Открывать в следующей за данной вкладке" + +#: ../midori/midori-websettings.c:496 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Открывать новую вкладку в следующей за данной или за последней" + +#: ../midori/midori-websettings.c:504 +msgid "Open popups in tabs" +msgstr "Открывать всплывающие окна во вкладках" + +#: ../midori/midori-websettings.c:505 +msgid "Whether to open popup windows in tabs" +msgstr "Открывать всплывающие окна во вкладках" + +#: ../midori/midori-websettings.c:515 +msgid "Accept cookies" +msgstr "Разрешить куки" + +#: ../midori/midori-websettings.c:516 +msgid "What type of cookies to accept" +msgstr "Тип принимаемых cookies" + +#: ../midori/midori-websettings.c:525 +msgid "Original cookies only" +msgstr "" + +#: ../midori/midori-websettings.c:526 +msgid "Accept cookies from the original website only" +msgstr "" + +#: ../midori/midori-websettings.c:534 +msgid "Maximum cookie age" +msgstr "Максимальный возраст cookies" + +#: ../midori/midori-websettings.c:535 +msgid "The maximum number of days to save cookies for" +msgstr "Максимальное число дней хранения cookies" + +#: ../midori/midori-websettings.c:545 +msgid "Remember last visited pages" +msgstr "Запомнить страницы последних посещений" + +#: ../midori/midori-websettings.c:546 +msgid "Whether the last visited pages are saved" +msgstr "Сохранять историю последних посещений" + +#: ../midori/midori-websettings.c:554 +msgid "Maximum history age" +msgstr "Максимальный возраст истории" + +#: ../midori/midori-websettings.c:555 +msgid "The maximum number of days to save the history for" +msgstr "Максимальное число дней хранения истории" + +#: ../midori/midori-websettings.c:563 +msgid "Remember last form inputs" +msgstr "Использовать маленькие изображения в панели инструментов" + +#: ../midori/midori-websettings.c:564 +msgid "Whether the last form inputs are saved" +msgstr "Сохранять последние данные формы" + +#: ../midori/midori-websettings.c:572 +msgid "Remember last downloaded files" +msgstr "Запомнить последние скачанные файлы" + +#: ../midori/midori-websettings.c:573 +msgid "Whether the last downloaded files are saved" +msgstr "Сохранять историю последних загрузок" + +#: ../midori/midori-websettings.c:583 +msgid "HTTP Proxy" +msgstr "HTTP прокси" + +#: ../midori/midori-websettings.c:584 +msgid "The proxy used for HTTP connections" +msgstr "Прокси сервер для HTTP соединений" + +#: ../midori/midori-websettings.c:592 +msgid "Cache size" +msgstr "Размер кеша" + +#: ../midori/midori-websettings.c:593 +msgid "The allowed size of the cache" +msgstr "Разрешённый размер кеша" + +#: ../midori/midori-view.c:103 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-view.c:104 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-view.c:105 +msgid "Load Finished" +msgstr "Загрузка завершена" + +#: ../midori/midori-view.c:315 +msgid "Socket ID" +msgstr "" + +#: ../midori/midori-view.c:316 +msgid "The ID of a socket" +msgstr "" + +#: ../midori/midori-view.c:326 +msgid "Uri" +msgstr "" + +#: ../midori/midori-view.c:327 +msgid "The URI of the currently loaded page" +msgstr "URI загруженной страницы" + +#: ../midori/midori-view.c:335 +msgid "Title" +msgstr "" + +#: ../midori/midori-view.c:336 +msgid "The title of the currently loaded page" +msgstr "Заголовок загруженной страницы" + +#: ../midori/midori-view.c:344 ../katze/katze-item.c:101 +msgid "Icon" +msgstr "Значок" + +#: ../midori/midori-view.c:345 +msgid "The icon of the view" +msgstr "" + +#: ../midori/midori-view.c:353 +msgid "Load Status" +msgstr "" + +#: ../midori/midori-view.c:354 +msgid "The current loading status" +msgstr "Статус загрузки" + +#: ../midori/midori-view.c:363 +msgid "Progress" +msgstr "" + +#: ../midori/midori-view.c:364 +msgid "The current loading progress" +msgstr "Процесс загрузки" + +#: ../midori/midori-view.c:372 +msgid "Zoom Level" +msgstr "" + +#: ../midori/midori-view.c:373 +msgid "The current zoom level" +msgstr "" + +#: ../midori/midori-view.c:384 +msgid "The text displayed in the statusbar" +msgstr "" + +#: ../midori/midori-view.c:1310 +msgid "Open Link in New _Tab" +msgstr "Открыть ссылку в новой _Вкладке" + +#: ../midori/midori-view.c:1334 +msgid "Download Link with Download _Manager" +msgstr "Загрузить с помощью администратора загрузок" + +#: ../midori/midori-view.c:1356 +msgid "Open URL in New _Tab" +msgstr "Открыть URL в новой _Вкладке" + +#: ../midori/midori-view.c:1841 +msgid "Source" +msgstr "Исходный код" + +#: ../midori/midori-preferences.c:62 +msgid "Settings instance to provide properties" +msgstr "" + +#: ../midori/midori-preferences.c:82 +#, c-format +msgid "%s Preferences" +msgstr "Параметры %s" + +#. Page "General" +#: ../midori/midori-preferences.c:264 +msgid "General" +msgstr "Общие" + +#: ../midori/midori-preferences.c:265 +msgid "Startup" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:298 +msgid "Appearance" +msgstr "Внешний вид" + +#: ../midori/midori-preferences.c:299 +msgid "Font settings" +msgstr "Настройки шрифта" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:319 +msgid "Behavior" +msgstr "Поведение" + +#: ../midori/midori-preferences.c:320 +msgid "Features" +msgstr "Возможности" + +#. Page "Interface" +#: ../midori/midori-preferences.c:340 +msgid "Interface" +msgstr "Внешний вид" + +#: ../midori/midori-preferences.c:356 +msgid "Browsing" +msgstr "Навигация" + +#. Page "Network" +#: ../midori/midori-preferences.c:374 ../midori/midori-preferences.c:375 +msgid "Network" +msgstr "Сеть" + +#: ../midori/midori-preferences.c:386 +msgid "MB" +msgstr "" + +#: ../midori/midori-searchaction.c:177 +msgid "Current Item" +msgstr "" + +#: ../midori/midori-searchaction.c:178 +msgid "The currently selected item" +msgstr "" + +#: ../midori/midori-searchaction.c:187 +msgid "The current text typed in the entry" +msgstr "" + +#: ../midori/midori-searchaction.c:195 +msgid "Dialog" +msgstr "Диалог" + +#: ../midori/midori-searchaction.c:196 +msgid "A dialog to manage search engines" +msgstr "Диалог управления средствами поиска" + +#: ../midori/midori-searchaction.c:449 ../katze/katze-arrayaction.c:256 +msgid "Empty" +msgstr "Очистить" + +#: ../midori/midori-searchaction.c:775 +msgid "Add search engine" +msgstr "Добавление средства поиска" + +#: ../midori/midori-searchaction.c:775 +msgid "Edit search engine" +msgstr "Правка средства поиска" + +#: ../midori/midori-searchaction.c:803 +msgid "_Name:" +msgstr "_Имя:" + +#: ../midori/midori-searchaction.c:847 +msgid "_Icon (name or file):" +msgstr "_Значок (имя файла):" + +#: ../midori/midori-searchaction.c:861 +msgid "_Token:" +msgstr "_Признак:" + +#: ../midori/midori-searchaction.c:1038 +msgid "Manage search engines" +msgstr "Управление средствами поиска" + +#: ../midori/sokoke.c:86 ../midori/sokoke.c:98 +msgid "Could not run external program." +msgstr "Не могу выполнить внешнюю программу." + +#: ../midori/sokoke.c:300 +msgid "Warning: You are using a superuser account!" +msgstr "Внимание: Вы используете привилегированную учётную запись" + +#: ../midori/gjs.c:512 +msgid "An unknown error occured." +msgstr "Обнаружена неизвестная ошибка" + +#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s не обладает свойством '%s'" + +#: ../midori/gjs.c:875 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s не может быть назначен для %s.%s" + +#: ../midori/gjs.c:885 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s недоступен" + +#: ../katze/katze-throbber.c:134 +msgid "Icon size" +msgstr "Размер значков" + +#: ../katze/katze-throbber.c:135 +msgid "Symbolic size to use for the animation" +msgstr "" + +#: ../katze/katze-throbber.c:143 +msgid "Icon Name" +msgstr "Имя иконки" + +#: ../katze/katze-throbber.c:144 +msgid "The name of an icon containing animation frames" +msgstr "Имя иконки содержащей анимационные рамки" + +#: ../katze/katze-throbber.c:152 +msgid "Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:153 +msgid "A GdkPixbuf containing animation frames" +msgstr "" + +#: ../katze/katze-throbber.c:161 +msgid "Animated" +msgstr "" + +#: ../katze/katze-throbber.c:162 +msgid "Whether the throbber should be animated" +msgstr "" + +#: ../katze/katze-throbber.c:170 +msgid "Static Icon Name" +msgstr "" + +#: ../katze/katze-throbber.c:171 +msgid "The name of an icon to be used as the static image" +msgstr "Имя иконки для статичного изобрадения" + +#: ../katze/katze-throbber.c:179 +msgid "Static Pixbuf" +msgstr "" + +#: ../katze/katze-throbber.c:180 +msgid "A GdkPixbuf to be used as the static image" +msgstr "" + +#: ../katze/katze-throbber.c:188 +msgid "Static Stock ID" +msgstr "" + +#: ../katze/katze-throbber.c:189 +msgid "The stock ID of an icon to be used as the static image" +msgstr "" + +#: ../katze/katze-throbber.c:807 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:820 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:843 +#, c-format +msgid "Icon '%s' couldn't be loaded" +msgstr "Значок '%s' не может быть загружен" + +#: ../katze/katze-throbber.c:875 +msgid "Animation frames are broken" +msgstr "Анимационные рамки неисправны" + +#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:322 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Значение '%s' недействительно для %s" + +#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +msgid "Choose file" +msgstr "Выберите файл" + +#: ../katze/katze-utils.c:177 +msgid "Choose folder" +msgstr "Выберите каталог" + +#: ../katze/katze-item.c:74 +msgid "Name" +msgstr "Имя" + +#: ../katze/katze-item.c:75 +msgid "The name of the item" +msgstr "" + +#: ../katze/katze-item.c:84 +msgid "The descriptive text of the item" +msgstr "Описание пункта" + +#: ../katze/katze-item.c:93 +msgid "The URI of the item" +msgstr "" + +#: ../katze/katze-item.c:102 +msgid "The icon of the item" +msgstr "" + +#: ../katze/katze-item.c:110 +msgid "Token" +msgstr "Признак" + +#: ../katze/katze-item.c:111 +msgid "The token of the item" +msgstr "" + +#: ../katze/katze-item.c:119 +msgid "Added" +msgstr "" + +#: ../katze/katze-item.c:120 +msgid "When the item was added" +msgstr "" + +#: ../katze/katze-item.c:128 +msgid "Visits" +msgstr "" + +#: ../katze/katze-item.c:129 +msgid "The number of visits of the item" +msgstr "" + +#: ../katze/katze-arrayaction.c:123 +msgid "Array" +msgstr "" + +#: ../katze/katze-arrayaction.c:124 +msgid "The array the action represents" +msgstr "" From ca411ee2b335f1203a80f2c269b0c662adc2cbd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 11 Oct 2008 02:40:16 +0200 Subject: [PATCH 0359/2970] Remove the Encoding key from the Desktop file --- midori.desktop.in | 1 - 1 file changed, 1 deletion(-) diff --git a/midori.desktop.in b/midori.desktop.in index ad78064a..487d7f8f 100644 --- a/midori.desktop.in +++ b/midori.desktop.in @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Type=Application _Name=Midori _GenericName=Web Browser From 1bc9238f87e516211028f275af78669eafce8266 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Oct 2008 03:36:57 +0200 Subject: [PATCH 0360/2970] Actually remove old items from the trash again --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index bb6e4ed3..ffb414be 100644 --- a/midori/main.c +++ b/midori/main.c @@ -361,7 +361,7 @@ midori_web_list_add_item_cb (KatzeArray* trash, if (n > 10) { obsolete_item = katze_array_get_nth_item (trash, 0); - g_object_unref (obsolete_item); + katze_array_remove_item (trash, obsolete_item); } } From 9f2418d455379c5fa9530d9fd0a33df2fbdb1309 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Oct 2008 04:02:34 +0200 Subject: [PATCH 0361/2970] Focus tabs remotely opend in the running instance --- midori/midori-app.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 4d2ebb1f..2c4e1595 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -246,7 +246,8 @@ midori_browser_message_received_cb (UniqueApp* instance, { while (*uris) { - midori_browser_add_uri (app->browser, *uris); + midori_browser_set_current_page (app->browser, + midori_browser_add_uri (app->browser, *uris)); uris++; } /* g_strfreev (uris); */ From cee341f4077502dd4ee860d5d42bcaaaede20dd1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Oct 2008 05:46:26 +0200 Subject: [PATCH 0362/2970] Add --single-process command line option --- docs/user/midori.txt | 21 ++++++++++++--------- midori/main.c | 12 +++++++++++- midori/midori-view.c | 30 ++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index f582d650..f1140c1a 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -124,15 +124,18 @@ your build and may not be available on some platforms. The following arguments are supported if you call Midori from a command line. -+--------------+--------------+------------------------------------------------+ -| Short option | Long option | Function | -+==============+==============+================================================+ -| -i | --id | This is an internal identifier. It is used to | -| | | spawn child processes for new tabs. Do not use | -| | | it unless you know what you are doing. | -+--------------+--------------+------------------------------------------------+ -| -v | --version | Show version information and exit. | -+--------------+--------------+------------------------------------------------+ ++-------+--------------------+------------------------------------------------+ +| Short | Long option | Function | ++=======+====================+================================================+ +| -s | --single-process | This forces all tabs to be opened inside the | +| | | one single browser process. | ++-------+--------------------+------------------------------------------------+ +| -i | --id | This is an internal identifier. It is used to | +| | | spawn child processes for new tabs. Do not use | +| | | it unless you know what you are doing. | ++-------+--------------------+------------------------------------------------+ +| -v | --version | Show version information and exit. | ++-------+--------------------+------------------------------------------------+ Keyboard shortcuts diff --git a/midori/main.c b/midori/main.c index ffb414be..13f71fe5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1016,10 +1016,14 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } +gboolean +midori_view_single_process (gboolean enable); + int main (int argc, char** argv) { + gboolean single_process; guint socket_id; gboolean version; gchar** uris; @@ -1028,6 +1032,8 @@ main (int argc, GError* error; GOptionEntry entries[] = { + { "single-process", 's', 0, G_OPTION_ARG_NONE, &single_process, + N_("Run everything in the same process"), NULL }, { "id", 'i', 0, G_OPTION_ARG_INT, &socket_id, N_("Internal identifier"), NULL }, { "version", 'v', 0, G_OPTION_ARG_NONE, &version, @@ -1060,7 +1066,6 @@ main (int argc, bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif - g_set_application_name (_("Midori")); /* Parse cli options */ socket_id = 0; @@ -1081,6 +1086,7 @@ main (int argc, { /* If an ID was specified we create a view in a plug. This allows us to open views in separate processes. */ + g_set_application_name ("midori-plug"); view = g_object_new (MIDORI_TYPE_VIEW, "socket-id", socket_id, NULL); gtk_widget_show (view); plug = gtk_plug_new (socket_id); @@ -1091,6 +1097,10 @@ main (int argc, return 0; } + if (single_process) + midori_view_single_process (TRUE); + + g_set_application_name (_("Midori")); if (version) { g_print ( diff --git a/midori/midori-view.c b/midori/midori-view.c index b3303ce9..8303ce36 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -395,6 +395,15 @@ midori_view_class_init (MidoriViewClass* class) G_PARAM_READWRITE)); } +gboolean +midori_view_single_process (gboolean enable) +{ + static gboolean single_process = FALSE; + if (enable) + single_process = TRUE; + return single_process; +} + #define midori_view_is_socket(view) !view->socket_id #define midori_view_is_plug(view) view->socket_id > 0 @@ -655,8 +664,8 @@ midori_view_notify_progress_cb (MidoriView* view, } static void -midori_view_action_cb (MidoriView* view, - const gchar* action) +midori_view_activate_action_cb (MidoriView* view, + const gchar* action) { if (midori_view_is_socket (view)) return; @@ -1517,10 +1526,14 @@ gtk_socket_realize_cb (GtkWidget* socket, gchar* argv[] = { NULL, "--id", NULL, NULL }; /* Sockets are not supported on all platforms, + or Midori can run in single process mode, so fallback to working without any socket or plug. */ - if (!gtk_socket_get_id (GTK_SOCKET (socket))) + if (!gtk_socket_get_id (GTK_SOCKET (socket)) + || midori_view_single_process (FALSE)) { - gtk_widget_destroy (socket); + /* Fallback to operating without a socket */ + gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (view))); + view->socket_id = -1; midori_view_realize (view); return; } @@ -1537,7 +1550,8 @@ gtk_socket_realize_cb (GtkWidget* socket, if (!success) { /* Fallback to operating without a socket */ - view->socket_id = 0; + gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (view))); + view->socket_id = -1; midori_view_realize (view); g_error_free (error); @@ -1607,13 +1621,13 @@ midori_view_realize_cb (MidoriView* view) else if (midori_view_is_socket (view)) { socket = gtk_socket_new (); + gtk_widget_show (socket); g_signal_connect (socket, "realize", G_CALLBACK (gtk_socket_realize_cb), view); g_signal_connect (socket, "plug-removed", G_CALLBACK (gtk_socket_plug_removed_cb), view); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (view), GTK_WIDGET (socket)); - gtk_widget_show (socket); } } @@ -1650,7 +1664,7 @@ midori_view_init (MidoriView* view) "signal::realize", midori_view_realize_cb, NULL, "signal::activate-action", - midori_view_action_cb, NULL, + midori_view_activate_action_cb, NULL, "signal::console-message", midori_view_console_message_cb, NULL, "signal::new-tab", @@ -2233,7 +2247,7 @@ midori_view_get_display_title (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); - if (view->title && !strcmp (view->title, "")) + if (!view->uri || (view->title && !strcmp (view->title, ""))) return "about:blank"; if (view->title && *view->title) From c1aff9030fab199e14a7004d8a09a044d5b48213 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Oct 2008 07:27:52 +0200 Subject: [PATCH 0363/2970] Add license note to lots of files and add EXPAT file. --- AUTHORS | 2 ++ ChangeLog | 2 ++ EXPAT | 18 ++++++++++++++++++ HACKING | 2 ++ INSTALL | 2 ++ Makefile.am | 2 ++ README | 2 ++ TODO | 2 ++ configure.in | 1 + docs/api/wscript_build | 1 + docs/user/midori.css | 2 +- icons/Makefile.am | 2 ++ icons/wscript_build | 1 + katze/Makefile.am | 2 ++ katze/wscript_build | 1 + legacy.sh | 1 + midori/Makefile.am | 2 ++ midori/wscript_build | 1 + po/wscript_build | 1 + wscript | 1 + 20 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 EXPAT diff --git a/AUTHORS b/AUTHORS index 124c6602..68ec1880 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + Developers: Christian Dywan diff --git a/ChangeLog b/ChangeLog index 4dcb4741..4979a3e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + v0.0.21: + Update some translations + Show progress in location when statusbar is hidden diff --git a/EXPAT b/EXPAT new file mode 100644 index 00000000..7da1ab30 --- /dev/null +++ b/EXPAT @@ -0,0 +1,18 @@ +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/HACKING b/HACKING index c1fd5339..88342471 100644 --- a/HACKING +++ b/HACKING @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + It is 4 spaces, no tabs, preferrably at 80 columns per line. The preferred coding style is explained by example. diff --git a/INSTALL b/INSTALL index 96ddec5b..9fe73038 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + +++ Installing Midori +++ Building and installing Midori is straightforward. diff --git a/Makefile.am b/Makefile.am index 9a6151c4..9e2ee96e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + AUTOMAKE_OPTIONS = gnu SUBDIRS = katze midori po icons diff --git a/README b/README index 4a350946..23a69fb7 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + Midori is a lightweight web browser. * Full integration with GTK+2. diff --git a/TODO b/TODO index af976e1f..58e019ac 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + TODO: . Revamp bookmarks UI, including creating of bookmark folders . Use an update timeout in KatzePropertyProxy instead of only focus-out diff --git a/configure.in b/configure.in index fa102248..2638da05 100644 --- a/configure.in +++ b/configure.in @@ -1,3 +1,4 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. # Register ourselves to autoconf AC_INIT([midori], [0.0.21], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/midori-stock.h]) diff --git a/docs/api/wscript_build b/docs/api/wscript_build index 7cba870e..7733da71 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. import pproc as subprocess diff --git a/docs/user/midori.css b/docs/user/midori.css index 57048efe..eb96e13e 100644 --- a/docs/user/midori.css +++ b/docs/user/midori.css @@ -1,7 +1,7 @@ /* :Author: Christian Dywan :Contact: christian@twotoasts.de -:Copyright: This stylesheet has been placed in the public domain. +:Copyright: This file is licensed under the terms of the expat license, see the file EXPAT. Stylesheet for Midori's documentation based on a version of Enrico Troeger. */ diff --git a/icons/Makefile.am b/icons/Makefile.am index b03110ca..1ca619c3 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + iconsdir = $(datadir)/icons/hicolor/scalable/apps icons_DATA = scalable/midori.svg diff --git a/icons/wscript_build b/icons/wscript_build index 35cdcbf9..2896e0cf 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. def add_image (bld, install_files, category, name): import os diff --git a/katze/Makefile.am b/katze/Makefile.am index f357f6a5..a6b17545 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + INCLUDES = \ $(GTK_CFLAGS) \ $(LIBXML_CFLAGS) diff --git a/katze/wscript_build b/katze/wscript_build index efa43b5e..b3145552 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. obj = bld.create_obj ('cc', 'staticlib') obj.name = 'katze' diff --git a/legacy.sh b/legacy.sh index dd4632a3..70867688 100755 --- a/legacy.sh +++ b/legacy.sh @@ -1,4 +1,5 @@ #!/bin/sh +# This file is licensed under the terms of the expat license, see the file EXPAT. echo "no" | glib-gettextize --force --copy intltoolize --copy --force --automake diff --git a/midori/Makefile.am b/midori/Makefile.am index 627c49a5..6219a8ea 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + INCLUDES = \ $(UNIQUE_CFLAGS) \ $(GIO_CFLAGS) \ diff --git a/midori/wscript_build b/midori/wscript_build index 0dfb01a3..af1c06e8 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. obj = bld.create_obj ('cc', 'program') obj.target = 'midori' diff --git a/po/wscript_build b/po/wscript_build index 149046b6..fe03f6c6 100644 --- a/po/wscript_build +++ b/po/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. import Params import pproc as subprocess diff --git a/wscript b/wscript index 76e1c4da..b872cfda 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. import Params import pproc as subprocess From b7bc4af7ce7ff0784bda8cc93b8fc9e67b741db1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Oct 2008 15:33:28 +0200 Subject: [PATCH 0364/2970] Make titles show URIs again instead of only about:blank --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 8303ce36..e7f71c1e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2247,7 +2247,7 @@ midori_view_get_display_title (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); - if (!view->uri || (view->title && !strcmp (view->title, ""))) + if (midori_view_is_blank (view)) return "about:blank"; if (view->title && *view->title) From 91ea115171c7b0bbb8dd187a78df076d7e5941f1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Oct 2008 18:14:57 +0200 Subject: [PATCH 0365/2970] Create navigationbar from a string of actions --- midori/midori-browser.c | 136 +++++++++++++++++++++++------------- midori/midori-preferences.c | 13 ++-- midori/midori-websettings.c | 18 +++++ 3 files changed, 110 insertions(+), 57 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4070100e..cdfcfb14 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -50,10 +50,6 @@ struct _MidoriBrowser GtkWidget* popup_history; GtkWidget* throbber; GtkWidget* navigationbar; - GtkWidget* button_tab_new; - GtkWidget* button_homepage; - GtkWidget* search; - GtkWidget* button_trash; GtkWidget* button_fullscreen; GtkWidget* bookmarkbar; @@ -1400,6 +1396,31 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, } } +static gboolean +midori_browser_toolbar_popup_context_menu_cb (GtkWidget* toolbar, + gint x, + gint y, + gint button, + MidoriBrowser* browser) +{ + GtkWidget* menu; + GtkWidget* menuitem; + + menu = gtk_menu_new (); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "Navigationbar")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "Bookmarkbar")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + + katze_widget_popup (toolbar, GTK_MENU (menu), NULL, + button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR); + return TRUE; +} + static void _action_trash_populate_popup (GtkAction* action, GtkMenu* menu, @@ -3141,14 +3162,6 @@ static const gchar* ui_markup = "" "" "" - "" - "" - "" - "" - "" - "" - "" - "" "" "" "" @@ -3414,16 +3427,7 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->navigationbar), TRUE); gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0); - browser->button_tab_new = gtk_ui_manager_get_widget ( - ui_manager, "/toolbar_navigation/TabNew"); g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); - browser->button_homepage = gtk_ui_manager_get_widget ( - ui_manager, "/toolbar_navigation/Homepage"); - browser->search = gtk_ui_manager_get_widget ( - ui_manager, "/toolbar_navigation/Search"); - browser->button_trash = gtk_ui_manager_get_widget ( - ui_manager, "/toolbar_navigation/Trash"); - sokoke_container_show_children (GTK_CONTAINER (browser->navigationbar)); gtk_widget_hide (browser->navigationbar); action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); @@ -3433,6 +3437,8 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (_action_fullscreen_activate), browser); gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), GTK_TOOL_ITEM (browser->button_fullscreen), -1); + g_signal_connect (browser->navigationbar, "popup-context-menu", + G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); /* Bookmarkbar */ browser->bookmarkbar = gtk_toolbar_new (); @@ -3441,6 +3447,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_box_pack_start (GTK_BOX (vbox), browser->bookmarkbar, FALSE, FALSE, 0); + g_signal_connect (browser->bookmarkbar, "popup-context-menu", + G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); /* Superuser warning */ GtkWidget* hbox; @@ -3764,20 +3772,68 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, gtk_toolbar_style); } +static gboolean +midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser) +{ + if (event->button == 3) + { + midori_browser_toolbar_popup_context_menu_cb (browser->navigationbar, + event->x, event->y, event->button, browser); + + return TRUE; + } + return FALSE; +} + +static void +_midori_browser_set_toolbar_items (MidoriBrowser* browser, + const gchar* items) +{ + gchar** names; + gchar** name; + GtkAction* action; + GtkWidget* toolitem; + + gtk_container_foreach (GTK_CONTAINER (browser->navigationbar), + (GtkCallback)gtk_widget_destroy, NULL); + + names = g_strsplit (items ? items : "", ",", 0); + name = names; + while (*name) + { + action = _action_by_name (browser, *name); + if (action) + { + toolitem = gtk_action_create_tool_item (action); + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (toolitem), -1); + } + name++; + } + g_strfreev (names); +} + static void _midori_browser_update_settings (MidoriBrowser* browser) { - KatzeItem* item; - gboolean remember_last_window_size; gint last_window_width, last_window_height; gint last_panel_position, last_panel_page; gboolean show_navigationbar, show_bookmarkbar, show_panel, show_statusbar; - gboolean show_new_tab, show_homepage, show_web_search, show_trash; MidoriToolbarStyle toolbar_style; + gchar* toolbar_items; gint last_web_search; gchar* last_pageholder_uri; gboolean close_buttons_on_tabs; + GdkScreen* screen; + gint default_width, default_height; + KatzeItem* item; g_object_get (browser->settings, "remember-last-window-size", &remember_last_window_size, @@ -3789,19 +3845,16 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-bookmarkbar", &show_bookmarkbar, "show-panel", &show_panel, "show-statusbar", &show_statusbar, - "show-new-tab", &show_new_tab, - "show-homepage", &show_homepage, - "show-web-search", &show_web_search, - "show-trash", &show_trash, "toolbar-style", &toolbar_style, + "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, "last-pageholder-uri", &last_pageholder_uri, "close-buttons-on-tabs", &close_buttons_on_tabs, NULL); - GdkScreen* screen = gtk_window_get_screen (GTK_WINDOW (browser)); - const gint default_width = (gint)gdk_screen_get_width (screen) / 1.7; - const gint default_height = (gint)gdk_screen_get_height (screen) / 1.7; + screen = gtk_window_get_screen (GTK_WINDOW (browser)); + default_width = gdk_screen_get_width (screen) / 1.7; + default_height = gdk_screen_get_height (screen) / 1.7; if (remember_last_window_size) { @@ -3815,6 +3868,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) _midori_browser_set_toolbar_style (browser, toolbar_style); _toggle_tabbar_smartly (browser); + _midori_browser_set_toolbar_items (browser, toolbar_items); if (browser->search_engines) { @@ -3836,11 +3890,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Panel", show_panel); _action_set_active (browser, "Statusbar", show_statusbar); - sokoke_widget_set_visible (browser->button_tab_new, show_new_tab); - sokoke_widget_set_visible (browser->button_homepage, show_homepage); - sokoke_widget_set_visible (browser->search, show_web_search); - sokoke_widget_set_visible (browser->button_trash, show_trash); - + g_free (toolbar_items); g_free (last_pageholder_uri); } @@ -3858,20 +3908,10 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, if (name == g_intern_string ("toolbar-style")) _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); + else if (name == g_intern_string ("toolbar-items")) + _midori_browser_set_toolbar_items (browser, g_value_get_string (&value)); else if (name == g_intern_string ("always-show-tabbar")) _toggle_tabbar_smartly (browser); - else if (name == g_intern_string ("show-new-tab")) - sokoke_widget_set_visible (browser->button_tab_new, - g_value_get_boolean (&value)); - else if (name == g_intern_string ("show-homepage")) - sokoke_widget_set_visible (browser->button_homepage, - g_value_get_boolean (&value)); - else if (name == g_intern_string ("show-web-search")) - sokoke_widget_set_visible (browser->search, - g_value_get_boolean (&value)); - else if (name == g_intern_string ("show-trash")) - sokoke_widget_set_visible (browser->button_trash, - g_value_get_boolean (&value)); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 2ea831b8..702962e7 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -339,20 +339,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (_("Interface")); FRAME_NEW (_("Navigationbar")); - TABLE_NEW (4, 2); + TABLE_NEW (3, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); + INDENTED_ADD (katze_property_label (settings, "toolbar-items"), 0, 1, 1, 2); + button = katze_property_proxy (settings, "toolbar-items", NULL); + FILLED_ADD (button, 1, 2, 1, 2); button = katze_property_proxy (settings, "always-show-tabbar", NULL); - INDENTED_ADD (button, 0, 1, 1, 2); - button = katze_property_proxy (settings, "show-new-tab", NULL); INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "show-web-search", NULL); - SPANNED_ADD (button, 1, 2, 2, 3); - button = katze_property_proxy (settings, "show-homepage", NULL); - INDENTED_ADD (button, 0, 1, 3, 4); - button = katze_property_proxy (settings, "show-trash", NULL); - SPANNED_ADD (button, 1, 2, 3, 4); FRAME_NEW (_("Browsing")); TABLE_NEW (3, 2); /* label = katze_property_label (settings, "open-new-pages-in"); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 70613ed2..8ea61b21 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -34,6 +34,7 @@ struct _MidoriWebSettings gboolean show_statusbar; MidoriToolbarStyle toolbar_style; + gchar* toolbar_items; gboolean always_show_tabbar; gboolean show_new_tab; gboolean show_homepage; @@ -87,6 +88,7 @@ enum PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, + PROP_TOOLBAR_ITEMS, PROP_ALWAYS_SHOW_TABBAR, PROP_SHOW_NEW_TAB, PROP_SHOW_HOMEPAGE, @@ -347,6 +349,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TOOLBAR_DEFAULT, flags)); + g_object_class_install_property (gobject_class, + PROP_TOOLBAR_ITEMS, + g_param_spec_string ( + "toolbar-items", + _("Toolbar Items"), + _("The items to show on the toolbar"), + "Back,Forward,ReloadStop,Location,Trash", + flags)); + g_object_class_install_property (gobject_class, PROP_ALWAYS_SHOW_TABBAR, g_param_spec_boolean ( @@ -682,6 +693,9 @@ midori_web_settings_set_property (GObject* object, case PROP_TOOLBAR_STYLE: web_settings->toolbar_style = g_value_get_enum (value); break; + case PROP_TOOLBAR_ITEMS: + katze_assign (web_settings->toolbar_items, g_value_dup_string (value)); + break; case PROP_ALWAYS_SHOW_TABBAR: web_settings->always_show_tabbar = g_value_get_boolean (value); break; @@ -839,6 +853,9 @@ midori_web_settings_get_property (GObject* object, case PROP_TOOLBAR_STYLE: g_value_set_enum (value, web_settings->toolbar_style); break; + case PROP_TOOLBAR_ITEMS: + g_value_set_string (value, web_settings->toolbar_items); + break; case PROP_ALWAYS_SHOW_TABBAR: g_value_set_boolean (value, web_settings->always_show_tabbar); break; @@ -970,6 +987,7 @@ midori_web_settings_copy (MidoriWebSettings* web_settings) "preferred-encoding", web_settings->preferred_encoding, "toolbar-style", web_settings->toolbar_style, + "toolbar-items", web_settings->toolbar_items, "show-web-search", web_settings->show_web_search, "show-new-tab", web_settings->show_new_tab, "show-trash", web_settings->show_trash, From 552854c11feb860eef77766566c4f306302cb8ec Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Oct 2008 21:44:00 +0200 Subject: [PATCH 0366/2970] Keep otherwise unused actions in a Dummy This is needed for accelerators to work even if the according actions are not part of the permanent UI description. --- midori/midori-browser.c | 44 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cdfcfb14..46bba2b2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1431,7 +1431,7 @@ _action_trash_populate_popup (GtkAction* action, menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - menuitem = sokoke_action_create_popup_menu_item ( + menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "TrashEmpty")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -1472,7 +1472,7 @@ _action_bookmarks_populate_popup (GtkAction* action, GtkWidget* menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - menuitem = sokoke_action_create_popup_menu_item ( + menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "BookmarkAdd")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -1496,11 +1496,11 @@ _action_window_populate_popup (GtkAction* action, GtkWidget* menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - menuitem = sokoke_action_create_popup_menu_item ( + menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "TabPrevious")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - menuitem = sokoke_action_create_popup_menu_item ( + menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "TabNext")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); @@ -3004,6 +3004,7 @@ static const GtkActionEntry entries[] = { { "About", GTK_STOCK_ABOUT, NULL, "", N_("Show information about the program"), G_CALLBACK (_action_about_activate) }, + { "Dummy", NULL, "Dummy" }, }; static const guint entries_n = G_N_ELEMENTS (entries); @@ -3114,7 +3115,6 @@ static const gchar* ui_markup = "" "" "" - "" "" "" "" @@ -3160,6 +3160,14 @@ static const gchar* ui_markup = "" "" "" + /* For accelerators to work all actions need to be used + *somewhere* in the UI definition */ + "" + "" + "" + "" + "" + "" "" "" "" @@ -3221,6 +3229,7 @@ midori_browser_init (MidoriBrowser* browser) { GtkToolItem* toolitem; GtkRcStyle* rcstyle; + GtkAction* action; browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); @@ -3264,26 +3273,11 @@ midori_browser_init (MidoriBrowser* browser) g_error_free (error); } - GtkAction* action; - /* Make all actions except toplevel menus which lack a callback insensitive - This will vanish once all actions are implemented */ - guint i; - for (i = 0; i < entries_n; i++) - { - action = gtk_action_group_get_action (browser->action_group, - entries[i].name); - gtk_action_set_sensitive (action, - entries[i].callback || !entries[i].tooltip); - } - for (i = 0; i < toggle_entries_n; i++) - { - action = gtk_action_group_get_action (browser->action_group, - toggle_entries[i].name); - gtk_action_set_sensitive (action, toggle_entries[i].callback != NULL); - } - /* _action_set_active(browser, "Transferbar", config->toolbarTransfers); */ + /* Hide the 'Dummy' which only holds otherwise unused actions */ + g_object_set (_action_by_name (browser, "Dummy"), "visible", FALSE, NULL); + action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, "name", "Location", "label", _("_Location..."), @@ -3415,7 +3409,11 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); gtk_widget_show (browser->menubar); + _action_set_sensitive (browser, "SaveAs", FALSE); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); + _action_set_sensitive (browser, "FindQuick", FALSE); + _action_set_sensitive (browser, "Transferbar", FALSE); + _action_set_sensitive (browser, "SelectionSourceView", FALSE); /* Create the navigationbar */ browser->navigationbar = gtk_ui_manager_get_widget ( From 36a99b9d22994737c473f6a68e75e2dcc14987fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Oct 2008 22:09:49 +0200 Subject: [PATCH 0367/2970] Allow hiding the menubar and showing it again --- midori/midori-browser.c | 26 +++++++++++++-- midori/midori-websettings.c | 66 +++++++++---------------------------- midori/midori-websettings.h | 3 -- midori/sokoke.c | 8 ++++- 4 files changed, 47 insertions(+), 56 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 46bba2b2..29c5adaf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1407,6 +1407,10 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* toolbar, GtkWidget* menuitem; menu = gtk_menu_new (); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "Menubar")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Navigationbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -1550,6 +1554,15 @@ _action_preferences_activate (GtkAction* action, } } +static void +_action_menubar_activate (GtkToggleAction* action, + MidoriBrowser* browser) +{ + gboolean active = gtk_toggle_action_get_active (action); + g_object_set (browser->settings, "show-menubar", active, NULL); + sokoke_widget_set_visible (browser->menubar, active); +} + static void _action_navigationbar_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -3014,6 +3027,10 @@ static const GtkToggleActionEntry toggle_entries[] = { N_("Don't save any private data while browsing"), NULL/*G_CALLBACK (_action_private_browsing_activate)*/, FALSE }, + { "Menubar", NULL, + N_("_Menubar"), "", + N_("Show menubar"), G_CALLBACK (_action_menubar_activate), + FALSE }, { "Navigationbar", NULL, N_("_Navigationbar"), "", N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate), @@ -3120,6 +3137,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -3408,7 +3426,8 @@ midori_browser_init (MidoriBrowser* browser) menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); - gtk_widget_show (browser->menubar); + gtk_widget_hide (browser->menubar); + _action_set_sensitive (browser, "SaveAs", FALSE); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); _action_set_sensitive (browser, "FindQuick", FALSE); @@ -3823,7 +3842,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) gboolean remember_last_window_size; gint last_window_width, last_window_height; gint last_panel_position, last_panel_page; - gboolean show_navigationbar, show_bookmarkbar, show_panel, show_statusbar; + gboolean show_menubar, show_navigationbar, show_bookmarkbar; + gboolean show_panel, show_statusbar; MidoriToolbarStyle toolbar_style; gchar* toolbar_items; gint last_web_search; @@ -3839,6 +3859,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "last-window-height", &last_window_height, "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, + "show-menubar", &show_menubar, "show-navigationbar", &show_navigationbar, "show-bookmarkbar", &show_bookmarkbar, "show-panel", &show_panel, @@ -3883,6 +3904,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) midori_view_set_uri (MIDORI_VIEW (browser->panel_pageholder), last_pageholder_uri); + _action_set_active (browser, "Menubar", show_menubar); _action_set_active (browser, "Navigationbar", show_navigationbar); _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); _action_set_active (browser, "Panel", show_panel); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 8ea61b21..eca36ff8 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -28,6 +28,7 @@ struct _MidoriWebSettings gint last_web_search; gchar* last_pageholder_uri; + gboolean show_menubar; gboolean show_navigationbar; gboolean show_bookmarkbar; gboolean show_panel; @@ -82,6 +83,7 @@ enum PROP_LAST_WEB_SEARCH, PROP_LAST_PAGEHOLDER_URI, + PROP_SHOW_MENUBAR, PROP_SHOW_NAVIGATIONBAR, PROP_SHOW_BOOKMARKBAR, PROP_SHOW_PANEL, @@ -301,6 +303,14 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); + g_object_class_install_property (gobject_class, + PROP_SHOW_MENUBAR, + g_param_spec_boolean ( + "show-menubar", + _("Show Menubar"), + _("Whether to show the menubar"), + TRUE, + flags)); g_object_class_install_property (gobject_class, PROP_SHOW_NAVIGATIONBAR, @@ -677,6 +687,9 @@ midori_web_settings_set_property (GObject* object, katze_assign (web_settings->last_pageholder_uri, g_value_dup_string (value)); break; + case PROP_SHOW_MENUBAR: + web_settings->show_menubar = g_value_get_boolean (value); + break; case PROP_SHOW_NAVIGATIONBAR: web_settings->show_navigationbar = g_value_get_boolean (value); break; @@ -837,6 +850,9 @@ midori_web_settings_get_property (GObject* object, g_value_set_string (value, web_settings->last_pageholder_uri); break; + case PROP_SHOW_MENUBAR: + g_value_set_boolean (value, web_settings->show_menubar); + break; case PROP_SHOW_NAVIGATIONBAR: g_value_set_boolean (value, web_settings->show_navigationbar); break; @@ -962,53 +978,3 @@ midori_web_settings_new (void) return web_settings; } - -/** - * midori_web_settings_copy: - * - * Copies an existing #MidoriWebSettings instance. - * - * Return value: a new #MidoriWebSettings - **/ -MidoriWebSettings* -midori_web_settings_copy (MidoriWebSettings* web_settings) -{ - g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (web_settings), NULL); - - MidoriWebSettings* copy; - copy = MIDORI_WEB_SETTINGS (webkit_web_settings_copy ( - WEBKIT_WEB_SETTINGS (web_settings))); - g_object_set (copy, - "load-on-startup", web_settings->load_on_startup, - "homepage", web_settings->homepage, - "download-folder", web_settings->download_folder, - "download-manager", web_settings->download_manager, - "location-entry-search", web_settings->location_entry_search, - "preferred-encoding", web_settings->preferred_encoding, - - "toolbar-style", web_settings->toolbar_style, - "toolbar-items", web_settings->toolbar_items, - "show-web-search", web_settings->show_web_search, - "show-new-tab", web_settings->show_new_tab, - "show-trash", web_settings->show_trash, - - "close-buttons-on-tabs", web_settings->close_buttons_on_tabs, - "open-new-pages-in", web_settings->open_new_pages_in, - "middle-click-opens-selection", web_settings->middle_click_opens_selection, - "open-tabs-in-the-background", web_settings->open_tabs_in_the_background, - "open-popups-in-tabs", web_settings->open_popups_in_tabs, - - "accept-cookies", web_settings->accept_cookies, - "original-cookies-only", web_settings->original_cookies_only, - "maximum-cookie-age", web_settings->maximum_cookie_age, - - "remember-last-visited-pages", web_settings->remember_last_visited_pages, - "maximum-history-age", web_settings->maximum_history_age, - "remember-last-form-inputs", web_settings->remember_last_form_inputs, - "remember-last-downloaded-files", web_settings->remember_last_downloaded_files, - - "cache-size", web_settings->cache_size, - NULL); - - return copy; -} diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index cecab796..b71e920b 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -115,9 +115,6 @@ midori_web_settings_get_type (void); MidoriWebSettings* midori_web_settings_new (void); -MidoriWebSettings* -midori_web_settings_copy (MidoriWebSettings* web_settings); - G_END_DECLS #endif /* __MIDORI_WEB_SETTINGS_H__ */ diff --git a/midori/sokoke.c b/midori/sokoke.c index 7be3c2b4..aa2a1808 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -590,7 +590,13 @@ sokoke_action_create_popup_menu_item (GtkAction* action) "sensitive", &sensitive, "visible", &visible, NULL); - if (stock_id) + if (GTK_IS_TOGGLE_ACTION (action)) + { + menuitem = gtk_check_menu_item_new_with_mnemonic (label); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + } + else if (stock_id) { if (label) { From 68cf3388f6a7d2700dcaefa0c10ee8223edefe07 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Oct 2008 17:50:07 +0200 Subject: [PATCH 0368/2970] Make sqlite history storage truly optional --- midori/main.c | 19 ++++++++++++++++++- wscript | 12 +++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index 13f71fe5..9be1b720 100644 --- a/midori/main.c +++ b/midori/main.c @@ -28,7 +28,12 @@ #include #include #include -#include + +#if HAVE_SQLITE3_H + #include +#elif HAVE_SQLITE_H + #include +#endif #if ENABLE_NLS #include @@ -575,6 +580,7 @@ katze_array_from_file (KatzeArray* array, return TRUE; } +#ifdef HAVE_SQLITE /* Open database 'dbname' */ static sqlite3* db_open (const char* dbname, @@ -851,6 +857,7 @@ midori_history_initialize (KatzeArray* array, } return db; } +#endif static gchar* _simple_xml_element (const gchar* name, @@ -1059,7 +1066,9 @@ main (int argc, gchar* uri; KatzeItem* item; gchar* uri_ready; + #ifdef HAVE_SQLITE sqlite3* db; + #endif #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); @@ -1210,8 +1219,11 @@ main (int argc, g_error_free (error); } g_free (config_file); + #ifdef HAVE_SQLITE config_file = g_build_filename (config_path, "history.db", NULL); + #endif history = katze_array_new (KATZE_TYPE_ARRAY); + #ifdef HAVE_SQLITE error = NULL; if ((db = midori_history_initialize (history, config_file, &error)) == NULL) { @@ -1220,6 +1232,7 @@ main (int argc, g_error_free (error); } g_free (config_file); + #endif /* In case of errors */ if (error_messages->len) @@ -1298,10 +1311,12 @@ main (int argc, g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_web_list_add_item_cb), NULL); + #ifdef HAVE_SQLITE g_signal_connect_after (history, "add-item", G_CALLBACK (midori_history_add_item_cb), db); g_signal_connect_after (history, "clear", G_CALLBACK (midori_history_clear_cb), db); + #endif g_object_set (app, "settings", settings, "bookmarks", bookmarks, @@ -1377,7 +1392,9 @@ main (int argc, NULL); g_mkdir_with_parents (config_path, 0755); g_object_unref (history); + #ifdef HAVE_SQLITE db_close (db); + #endif config_file = g_build_filename (config_path, "search", NULL); error = NULL; if (!search_engines_save_to_file (search_engines, config_file, &error)) diff --git a/wscript b/wscript index b872cfda..aec27955 100644 --- a/wscript +++ b/wscript @@ -109,9 +109,17 @@ def configure (conf): print '\t The HTTP backend of GVfs is recommended for' print '\t viewing source code and loading favicons.' + if not Params.g_options.disable_sqlite: + conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) + sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] + if not conf.check_header ('sqlite3.h', 'HAVE_SQLITE3_H'): + conf.check_header ('sqlite.h', 'HAVE_SQLITE_H') + else: + sqlite = 'no' + conf.check_message_custom ('history database', 'support', sqlite) + conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) - conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) @@ -146,6 +154,8 @@ def set_options (opt): help='Disables Unique support', dest='disable_unique') opt.add_option ('--disable-gio', action='store_true', default=False, help='Disables GIO support', dest='disable_gio') + opt.add_option ('--disable-sqlite', action='store_true', default=False, + help='Disables sqlite support', dest='disable_sqlite') opt.add_option ('--enable-update-po', action='store_true', default=False, help='Enables localization file updates', dest='enable_update_po') From d72579711c5a0104e3d6e29ea79dd52738aad57a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Oct 2008 18:29:46 +0200 Subject: [PATCH 0369/2970] Implement the Remeber last visited pages preference --- midori/midori-browser.c | 16 ++++++++++++---- midori/midori-locationaction.c | 5 ++--- midori/midori-locationaction.h | 19 ++++++++++++------- midori/midori-preferences.c | 12 ++++++------ midori/midori-websettings.c | 2 +- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 29c5adaf..c19afc5a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -361,7 +361,8 @@ midori_view_notify_icon_cb (MidoriView* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - midori_location_action_set_icon_for_uri ( + if (sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + midori_location_action_set_icon_for_uri ( MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); } @@ -378,8 +379,11 @@ midori_view_notify_load_status_cb (GtkWidget* view, if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) - midori_location_action_add_uri ( - MIDORI_LOCATION_ACTION (action), uri); + { + if (sokoke_object_get_boolean (browser->settings, + "remember-last-visited-pages")) + midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); + } else if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_FINISHED) { @@ -441,7 +445,8 @@ midori_view_notify_title_cb (GtkWidget* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); title = midori_view_get_display_title (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - midori_location_action_set_title_for_uri ( + if (sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + midori_location_action_set_title_for_uri ( MIDORI_LOCATION_ACTION (action), title, uri); if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) { @@ -4053,6 +4058,9 @@ midori_browser_new_history_item (MidoriBrowser* browser, gchar *today; gsize len; + if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + return; + treeview = GTK_TREE_VIEW (browser->panel_history); treemodel = gtk_tree_view_get_model (treeview); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 75feb5ac..b5294388 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -13,10 +13,8 @@ #include "gtkiconentry.h" -#include #include #include -#include struct _MidoriLocationAction { @@ -289,7 +287,7 @@ midori_location_action_create_tool_item (GtkAction* action) gtk_container_add (GTK_CONTAINER (toolitem), alignment); gtk_widget_show (alignment); - return GTK_WIDGET (toolitem); + return toolitem; } static void @@ -387,6 +385,7 @@ static void midori_location_action_disconnect_proxy (GtkAction* action, GtkWidget* proxy) { + /* FIXME: This is wrong */ g_signal_handlers_disconnect_by_func (proxy, G_CALLBACK (gtk_action_activate), action); diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index c6d1e2cd..837527d7 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -18,16 +18,21 @@ G_BEGIN_DECLS -#define MIDORI_TYPE_LOCATION_ACTION (midori_location_action_get_type ()) -#define MIDORI_LOCATION_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationAction)) -#define MIDORI_LOCATION_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationActionClass)) -#define MIDORI_IS_LOCATION_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_LOCATION_ACTION)) -#define MIDORI_IS_LOCATION_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_LOCATION_ACTION)) -#define MIDORI_LOCATION_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationActionClass)) +#define MIDORI_TYPE_LOCATION_ACTION \ + (midori_location_action_get_type ()) +#define MIDORI_LOCATION_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationAction)) +#define MIDORI_LOCATION_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationActionClass)) +#define MIDORI_IS_LOCATION_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_LOCATION_ACTION)) +#define MIDORI_IS_LOCATION_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_LOCATION_ACTION)) +#define MIDORI_LOCATION_ACTION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_LOCATION_ACTION, MidoriLocationActionClass)) typedef struct _MidoriLocationAction MidoriLocationAction; typedef struct _MidoriLocationActionClass MidoriLocationActionClass; -typedef struct _MidoriLocationActionItem MidoriLocationActionItem; GType midori_location_action_get_type (void); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 702962e7..c0a84f9c 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -366,7 +366,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 2, 3); /* Page "Network" */ - PAGE_NEW (_("Network")); + /*PAGE_NEW (_("Network")); FRAME_NEW (_("Network")); TABLE_NEW (2, 2); label = katze_property_label (settings, "http-proxy"); @@ -380,11 +380,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 1, 2); + FILLED_ADD (hbox, 1, 2, 1, 2);*/ /* Page "Privacy" */ - /* PAGE_NEW (_("Privacy")); - FRAME_NEW (_("Web Cookies")); + PAGE_NEW (_("Privacy")); + /*FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); INDENTED_ADD (label, 0, 1, 0, 1); @@ -399,7 +399,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 2, 3); + FILLED_ADD (hbox, 1, 2, 2, 3);*/ FRAME_NEW (_("History")); TABLE_NEW (3, 2); button = katze_property_proxy (settings, "remember-last-visited-pages", NULL); @@ -413,7 +413,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "remember-last-form-inputs", NULL); SPANNED_ADD (button, 0, 2, 1, 2); button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); - SPANNED_ADD (button, 0, 2, 2, 3); */ + SPANNED_ADD (button, 0, 2, 2, 3); g_object_unref (sizegroup); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index eca36ff8..0c91990c 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -566,7 +566,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Remember last visited pages"), _("Whether the last visited pages are saved"), TRUE, - G_PARAM_READABLE)); + flags)); g_object_class_install_property (gobject_class, PROP_MAXIMUM_HISTORY_AGE, From 7597e2026d463e046d7be76de66a0f970bf78821 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 15 Oct 2008 03:07:38 +0200 Subject: [PATCH 0370/2970] Undo tabs-in-processes, it didn't work out We are not literally undoing in the sense of reverting, this is actually about undoing the individual parts of the last refactoring that implemented the socket/ plug logic. As turned out, the idea was nice but the implementation was absolutely not, embedding of processes in a graphical way is not at all reliable enough for complex use cases. Naturally this change should solve all sorts of peculiar issues, including actual regressions in functionality. Relieving. --- docs/user/midori.txt | 7 - midori/main.c | 31 +- midori/midori-browser.c | 22 +- midori/midori-view.c | 1278 ++++++++------------------------------- midori/midori-view.h | 3 - midori/sokoke.c | 26 - midori/sokoke.h | 3 - 7 files changed, 259 insertions(+), 1111 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index f1140c1a..3e38ddfc 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -127,13 +127,6 @@ The following arguments are supported if you call Midori from a command line. +-------+--------------------+------------------------------------------------+ | Short | Long option | Function | +=======+====================+================================================+ -| -s | --single-process | This forces all tabs to be opened inside the | -| | | one single browser process. | -+-------+--------------------+------------------------------------------------+ -| -i | --id | This is an internal identifier. It is used to | -| | | spawn child processes for new tabs. Do not use | -| | | it unless you know what you are doing. | -+-------+--------------------+------------------------------------------------+ | -v | --version | Show version information and exit. | +-------+--------------------+------------------------------------------------+ diff --git a/midori/main.c b/midori/main.c index 9be1b720..90de8150 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1030,8 +1030,6 @@ int main (int argc, char** argv) { - gboolean single_process; - guint socket_id; gboolean version; gchar** uris; MidoriApp* app; @@ -1039,18 +1037,12 @@ main (int argc, GError* error; GOptionEntry entries[] = { - { "single-process", 's', 0, G_OPTION_ARG_NONE, &single_process, - N_("Run everything in the same process"), NULL }, - { "id", 'i', 0, G_OPTION_ARG_INT, &socket_id, - N_("Internal identifier"), NULL }, { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, N_("URIs"), NULL }, { NULL } }; - GtkWidget* view; - GtkWidget* plug; JSGlobalContextRef js_context; gchar* exception; MidoriStartup load_on_startup; @@ -1077,7 +1069,6 @@ main (int argc, #endif /* Parse cli options */ - socket_id = 0; version = FALSE; uris = NULL; error = NULL; @@ -1090,26 +1081,8 @@ main (int argc, } stock_items_init (); - - if (socket_id) - { - /* If an ID was specified we create a view in a plug. - This allows us to open views in separate processes. */ - g_set_application_name ("midori-plug"); - view = g_object_new (MIDORI_TYPE_VIEW, "socket-id", socket_id, NULL); - gtk_widget_show (view); - plug = gtk_plug_new (socket_id); - gtk_container_add (GTK_CONTAINER (plug), view); - g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit), NULL); - gtk_widget_show (plug); - gtk_main (); - return 0; - } - - if (single_process) - midori_view_single_process (TRUE); - g_set_application_name (_("Midori")); + if (version) { g_print ( @@ -1140,8 +1113,6 @@ main (int argc, return 1; } - sokoke_remember_argv0 (argv[0]); - app = midori_app_new (); if (midori_app_instance_is_running (app)) { diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c19afc5a..0cc425fd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -384,12 +384,6 @@ midori_view_notify_load_status_cb (GtkWidget* view, "remember-last-visited-pages")) midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); } - else if (midori_view_get_load_status (MIDORI_VIEW (view)) - == MIDORI_LOAD_FINISHED) - { - /* g_signal_emit (browser, signals[WINDOW_OBJECT_CLEARED], 0, - web_frame, js_context, js_window); */ - } if (view == midori_browser_get_current_tab (browser)) { @@ -417,6 +411,17 @@ midori_view_notify_progress_cb (GtkWidget* view, _midori_browser_update_progress (browser, MIDORI_VIEW (view)); } +static void +midori_view_window_object_cleared_cb (GtkWidget* view, + WebKitWebFrame* web_frame, + JSContextRef js_context, + JSObjectRef js_window, + MidoriBrowser* browser) +{ + g_signal_emit (browser, signals[WINDOW_OBJECT_CLEARED], 0, + web_frame, js_context, js_window); +} + /* static void midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, @@ -768,6 +773,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_notify_load_status_cb, browser, "signal::notify::progress", midori_view_notify_progress_cb, browser, + "signal::window-object-cleared", + midori_view_window_object_cleared_cb, browser, /* "signal::news-feed-ready", midori_view_news_feed_ready_cb, browser, */ "signal::notify::title", @@ -1666,7 +1673,8 @@ _action_source_view_activate (GtkAction* action, uri = g_strdup_printf ("view-source:%s", midori_view_get_display_uri (MIDORI_VIEW (view))); - source_view = midori_view_new_with_uri (uri); + source_view = midori_view_new (); + midori_view_set_uri (MIDORI_VIEW (source_view), uri); g_free (uri); gtk_widget_show (source_view); n = midori_browser_add_tab (browser, source_view); diff --git a/midori/midori-view.c b/midori/midori-view.c index e7f71c1e..14caa14b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -33,17 +33,13 @@ /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); +void +webkit_web_frame_print (WebKitWebFrame* web_frame); struct _MidoriView { GtkScrolledWindow parent_instance; - gint socket_id; - GIOChannel* input; - FILE* output; - - gchar* command_cache; - gchar* premature_uri; gchar* uri; gchar* title; GdkPixbuf* icon; @@ -53,27 +49,11 @@ struct _MidoriView gchar* link_uri; gboolean has_selection; gchar* selected_text; - gboolean can_cut_clipboard; - gboolean can_copy_clipboard; - gboolean can_paste_clipboard; - gfloat zoom_level; - gboolean can_go_back; - gboolean can_go_forward; MidoriWebSettings* settings; GtkWidget* web_view; gboolean window_object_cleared; gchar* download_manager; - gchar* default_font_family; - gint default_font_size; - gint minimum_font_size; - gchar* default_encoding; - gboolean auto_load_images; - gboolean auto_shrink_images; - gboolean print_backgrounds; - gboolean resizable_text_areas; - gboolean enable_scripts; - gboolean enable_plugins; gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; @@ -113,7 +93,6 @@ enum { PROP_0, - PROP_SOCKET_ID, PROP_URI, PROP_TITLE, PROP_ICON, @@ -127,6 +106,7 @@ enum enum { ACTIVATE_ACTION, CONSOLE_MESSAGE, + WINDOW_OBJECT_CLEARED, NEW_TAB, NEW_WINDOW, SEARCH_TEXT, @@ -226,6 +206,45 @@ midori_cclosure_marshal_VOID__STRING_INT_STRING (GClosure* closure, data2); } +static void +midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef gboolean(*GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer arg_3, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_POINTER_POINTER callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 4); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (marshal_data + ? marshal_data : cc->callback); + + callback (data1, + g_value_get_object (param_values + 1), + g_value_get_pointer (param_values + 2), + g_value_get_pointer (param_values + 3), + data2); +} + static void midori_view_class_init (MidoriViewClass* class) { @@ -256,6 +275,19 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_INT, G_TYPE_STRING); + signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( + "window-object-cleared", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER, + G_TYPE_NONE, 3, + WEBKIT_TYPE_WEB_FRAME, + G_TYPE_POINTER, + G_TYPE_POINTER); + signals[NEW_TAB] = g_signal_new ( "new-tab", G_TYPE_FROM_CLASS (class), @@ -308,17 +340,6 @@ midori_view_class_init (MidoriViewClass* class) flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - g_object_class_install_property (gobject_class, - PROP_SOCKET_ID, - g_param_spec_uint ( - "socket-id", - _("Socket ID"), - _("The ID of a socket"), - 0, - G_MAXUINT, - 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property (gobject_class, PROP_URI, g_param_spec_string ( @@ -395,105 +416,6 @@ midori_view_class_init (MidoriViewClass* class) G_PARAM_READWRITE)); } -gboolean -midori_view_single_process (gboolean enable) -{ - static gboolean single_process = FALSE; - if (enable) - single_process = TRUE; - return single_process; -} - -#define midori_view_is_socket(view) !view->socket_id -#define midori_view_is_plug(view) view->socket_id > 0 - -#if 0 - #define midori_debug g_debug -#else - #define midori_debug(...) ; -#endif - -/** - * int_to_str - * @in: an integer - * - * Converts an integer to a string. - * - * The returned string is valid until - * the next call to this function. - * - * Return value: a string - **/ -static const gchar* -int_to_str (gint in) -{ - static gchar* out = NULL; - g_free (out); - out = g_strdup_printf ("%d", in); - return out; -} - -/** - * float_to_str - * @in: a float - * - * Converts a float to a string. - * - * The returned string is valid until - * the next call to this function. - * - * Return value: a string - **/ -static const gchar* -float_to_str (gfloat in) -{ - static gchar* out = NULL; - g_free (out); - out = g_strdup_printf ("%f", in); - return out; -} - -static void -send_command (MidoriView* view, - const gchar* command, - const gchar* argument) -{ - gchar* data; - gchar* cache; - - if (argument) - data = g_strdup_printf ("%s %s", command, argument); - else - data = g_strdup (command); - - if (!view->output) - { - /* The output is not ready, so we cache for now */ - cache = g_strdup_printf ("%s\n%s", - view->command_cache ? view->command_cache : "", data); - katze_assign (view->command_cache, cache); - midori_debug ("!view->output, caching command: %s", command); - return; - } - - fwrite (data, strlen (data) + 1, 1, view->output); - fflush (view->output); - - g_free (data); -} - -static void -midori_view_notify_uri_cb (MidoriView* view, - GParamSpec pspec) -{ - if (midori_view_is_socket (view) && view->item) - katze_item_set_uri (view->item, view->uri); - - if (midori_view_is_plug (view)) - /* We must not send a NULL string here */ - send_command (view, "uri", view->uri ? view->uri : ""); -} - static void midori_view_notify_icon_cb (MidoriView* view, GParamSpec pspec) @@ -527,7 +449,7 @@ loadable_icon_finish_cb (GdkPixbuf* icon, error = NULL; pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error); if (error) - midori_debug ("Icon couldn't be loaded: %s", error->message); + g_warning (_("Icon couldn't be loaded: %s\n"), error->message); g_object_unref (stream); } if (!pixbuf) @@ -633,336 +555,12 @@ static void midori_view_notify_load_status_cb (MidoriView* view, GParamSpec pspec) { - view->can_go_back = midori_view_can_go_back (view); - view->can_go_forward = midori_view_can_go_forward (view); + if (view->tab_icon) + katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), + view->load_status != MIDORI_LOAD_FINISHED); - if (midori_view_is_socket (view)) - { - if (view->tab_icon) - katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), - view->load_status != MIDORI_LOAD_FINISHED); - } - - if (midori_view_is_plug (view)) - { - send_command (view, "load-status", int_to_str (view->load_status)); - send_command (view, "can-go-back", int_to_str (view->can_go_back)); - send_command (view, "can-go-forward", int_to_str (view->can_go_forward)); - } - - if (!midori_view_is_plug (view)) - if (view->load_status == MIDORI_LOAD_COMMITTED) - _midori_web_view_load_icon (view); -} - -static void -midori_view_notify_progress_cb (MidoriView* view, - GParamSpec pspec) -{ - if (midori_view_is_plug (view)) - send_command (view, "progress", float_to_str (view->progress)); -} - -static void -midori_view_activate_action_cb (MidoriView* view, - const gchar* action) -{ - if (midori_view_is_socket (view)) - return; - - send_command (view, "activate-action", action); -} - -static void -midori_view_console_message_cb (MidoriView* view, - const gchar* message, - gint line, - const gchar* source_id) -{ - gchar* argument; - - if (midori_view_is_socket (view)) - return; - - argument = g_strdup_printf ("%s %d %s", message, line, source_id); - send_command (view, "console-message", argument); - g_free (argument); -} - -static void -midori_view_new_tab_cb (MidoriView* view, - const gchar* uri, - gboolean background) -{ - gchar* argument; - - if (midori_view_is_socket (view)) - return; - - /* (uri, background) => (background, uri) */ - argument = g_strdup_printf ("%d %s", background, uri); - send_command (view, "new-tab", argument); - g_free (argument); -} - -static void -midori_view_new_window_cb (MidoriView* view, - const gchar* uri) -{ - if (midori_view_is_socket (view)) - return; - - send_command (view, "new-window", uri); -} - -static void -midori_view_search_text_cb (MidoriView* view, - gboolean found) -{ - if (!midori_view_is_plug (view)) - return; - - send_command (view, "search-text", int_to_str (found)); -} - -static void -midori_view_add_bookmark_cb (MidoriView* view, - const gchar* uri) -{ - if (midori_view_is_socket (view)) - return; - - send_command (view, "add-bookmark", uri); -} - -static void -receive_status (MidoriView* view, - const gchar* command) -{ - if (!strncmp (command, "uri ", 4)) - { - katze_assign (view->uri, g_strdup (&command[4])); - g_object_notify (G_OBJECT (view), "uri"); - } - else if (!strncmp (command, "title ", 6)) - { - g_object_set (view, "title", &command[6], NULL); - } - else if (!strncmp (command, "load-status ", 12)) - { - view->load_status = (MidoriLoadStatus)atoi (&command[12]); - g_object_notify (G_OBJECT (view), "load-status"); - } - else if (!strncmp (command, "progress ", 9)) - { - view->progress = atof (&command[9]); - g_object_notify (G_OBJECT (view), "progress"); - } - else if (!strncmp (command, "zoom-level ", 11)) - { - view->zoom_level = atof (&command[11]); - g_object_notify (G_OBJECT (view), "zoom-level"); - } - else if (!strncmp (command, "can-go-back ", 12)) - { - view->can_go_back = atoi (&command[12]); - } - else if (!strncmp (command, "can-go-forward ", 15)) - { - view->can_go_forward = atoi (&command[15]); - } - else if (!strncmp (command, "statusbar-text ", 15)) - { - g_object_set (view, "statusbar-text", &command[15], NULL); - } - else if (!strncmp (command, "activate-action ", 16)) - { - g_signal_emit (view, signals[ACTIVATE_ACTION], 0, &command[16]); - } - else if (!strncmp (command, "console-message ", 16)) - { - /* FIXME: Implement */ - } - else if (!strncmp (command, "new-tab ", 8)) - { - /* (background, uri) => (uri, background) */ - g_signal_emit (view, signals[NEW_TAB], 0, &command[10], atoi (&command[8])); - } - else if (!strncmp (command, "new-window ", 11)) - { - g_signal_emit (view, signals[NEW_WINDOW], 0, &command[11]); - } - else if (!strncmp (command, "search-text ", 12)) - { - g_signal_emit (view, signals[SEARCH_TEXT], 0, atoi (&command[12])); - } - else if (!strncmp (command, "add-bookmark ", 13)) - { - g_signal_emit (view, signals[ADD_BOOKMARK], 0, &command[13]); - } - else if (!strncmp (command, "clipboard ", 10)) - { - view->can_cut_clipboard = atof (&command[10]); - view->can_copy_clipboard = atof (&command[12]); - view->can_paste_clipboard = atof (&command[14]); - midori_debug ("clipboards: %s => %d, %d, %d", - &command[10], - atoi (&command[10]), atoi (&command[12]), atoi (&command[14])); - } - else if (g_str_has_prefix (command, "**")) - { - g_print ("%s\n", command); - } - else - { - midori_debug ("receive_status: unknown command '%s'", command); - } -} - -#define UPDATE_SETTING(name, value) \ - g_object_set (webkit_web_view_get_settings ( \ - WEBKIT_WEB_VIEW (view->web_view)), \ - name, value, NULL) - -static void -receive_command (MidoriView* view, - const gchar* command) -{ - if (!strncmp (command, "set-uri ", 8)) - midori_view_set_uri (view, &command[8]); - else if (!strncmp (command, "set-zoom-level ", 15)) - midori_view_set_zoom_level (view, atof (&command[15]) / 10); - else if (!strncmp (command, "reload ", 7)) - midori_view_reload (view, atoi (&command[7])); - else if (!strncmp (command, "stop-loading", 12)) - midori_view_stop_loading (view); - else if (!strncmp (command, "go-back", 7)) - midori_view_go_back (view); - else if (!strncmp (command, "go-forward", 10)) - midori_view_go_forward (view); - else if (!strncmp (command, "print", 5)) - midori_view_print (view); - else if (!strncmp (command, "unmark-matches", 14)) - midori_view_unmark_text_matches (view); - else if (!strncmp (command, "search-text ", 12)) - /* (forward, case_sensitive, text) => (text, case_sensitive, forward) */ - midori_view_search_text (view, &command[16], - atoi (&command[14]), atoi (&command[12])); - else if (!strncmp (command, "mark-matches ", 13)) - /* (case_sensitive, text) => (text, case_sensitive) */ - midori_view_mark_text_matches (view, &command[17], - atoi (&command[15])); - else if (!strncmp (command, "hl-matches ", 11)) - midori_view_set_highlight_text_matches (view, atoi (&command[11])); - else if (!strncmp (command, "dlmgr ", 6)) - { - katze_assign (view->download_manager, g_strdup (&command[6])); - } - else if (!strncmp (command, "dffamily ", 9)) - { - katze_assign (view->default_font_family, g_strdup (&command[9])); - UPDATE_SETTING ("default-font-family", view->default_font_family); - } - else if (!strncmp (command, "dfsize ", 7)) - { - view->default_font_size = atoi (&command[7]); - UPDATE_SETTING ("default-font-size", view->default_font_size); - } - else if (!strncmp (command, "mfsize ", 7)) - { - view->minimum_font_size = atoi (&command[7]); - UPDATE_SETTING ("minimum-font-size", view->minimum_font_size); - } - else if (!strncmp (command, "denc ", 5)) - { - katze_assign (view->default_encoding, g_strdup (&command[5])); - UPDATE_SETTING ("default-encoding", view->default_encoding); - } - else if (!strncmp (command, "alimg ", 6)) - { - view->auto_load_images = atoi (&command[6]); - UPDATE_SETTING ("auto-load-images", view->auto_load_images); - } - else if (!strncmp (command, "asimg ", 6)) - { - view->auto_shrink_images = atoi (&command[6]); - UPDATE_SETTING ("auto-shrink-images", view->auto_shrink_images); - } - else if (!strncmp (command, "pbkg ", 5)) - { - view->print_backgrounds = atoi (&command[5]); - UPDATE_SETTING ("print-backgrounds", view->print_backgrounds); - } - else if (!strncmp (command, "rta ", 4)) - { - view->print_backgrounds = atoi (&command[4]); - UPDATE_SETTING ("resizable-text-areas", view->resizable_text_areas); - } - else if (!strncmp (command, "escripts ", 9)) - { - view->enable_scripts = atoi (&command[9]); - UPDATE_SETTING ("enable-scripts", view->enable_scripts); - } - else if (!strncmp (command, "eplugins ", 9)) - { - view->enable_plugins = atoi (&command[9]); - UPDATE_SETTING ("enable-plugins", view->enable_plugins); - } - else if (!strncmp (command, "mclksel ", 8)) - { - view->middle_click_opens_selection = atoi (&command[8]); - } - else if (!strncmp (command, "tabsbkg ", 8)) - { - view->open_tabs_in_the_background = atoi (&command[8]); - } - else if (g_str_has_prefix (command, "**")) - g_print ("%s\n", command); - else - midori_debug ("receive_command: unknown command '%s'", command); -} - -static gboolean -io_input_watch_cb (GIOChannel* source, - GIOCondition condition, - MidoriView* view) -{ - gchar* buffer; - GError* error; - - error = NULL; - switch (condition) - { - case G_IO_PRI: - case G_IO_IN: - if (g_io_channel_read_line (source, - &buffer, NULL, NULL, &error) == G_IO_STATUS_NORMAL) - { - if (view->socket_id) - receive_command (view, buffer); - else - receive_status (view, buffer); - g_free (buffer); - } - else - { - g_warning ("Communication error: %s", error->message); - g_error_free (error); - } - break; - case G_IO_ERR: - case G_IO_NVAL: - g_warning ("Invalid operation"); - return FALSE; - case G_IO_HUP: - midori_debug ("Tab closed"); - return FALSE; - default: - g_warning ("Unexpected condition"); - return FALSE; - } - - return TRUE; + if (view->load_status == MIDORI_LOAD_COMMITTED) + _midori_web_view_load_icon (view); } static void @@ -979,16 +577,6 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "progress"); } -static void -webkit_web_view_window_object_cleared_cb (WebKitWebView* web_view, - WebKitWebFrame* web_frame, - JSGlobalContextRef js_context, - JSObjectRef js_window, - MidoriView* view) -{ - view->window_object_cleared = TRUE; -} - static void webkit_web_view_load_committed_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, @@ -1072,28 +660,26 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, MidoriView* view) { gchar* data; - JSContextRef js_context; + /*JSContextRef js_context; JSValueRef js_window; - /* GjsValue* value; + GjsValue* value; GjsValue* document; GjsValue* links; */ if (!success) { - midori_debug ("'%s' not found.", view->uri); - data = g_strdup_printf ("error:404 %s ", view->uri ? view->uri : ""); - midori_view_set_uri (view, data); + /* Simply print a 404 error page on the fly. */ + data = g_strdup_printf ( + "Not found - %s" + "

Not found - %s

" + "

The page you were opening doesn't exist." + "

Try to load the page again, " + "or move on to another page." + "", + view->uri, view->uri, view->uri); + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); - return; - } - - /* If WebKit didn't emit the signal due to a bug, we will */ - if (!view->window_object_cleared) - { - js_context = webkit_web_frame_get_global_context (web_frame); - js_window = JSContextGetGlobalObject (js_context); - g_signal_emit_by_name (view->web_view, "window-object-cleared", - web_frame, js_context, js_window); } /* js_context = webkit_web_frame_get_global_context (web_frame); @@ -1409,9 +995,8 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - #if !HAVE_GIO - gtk_widget_set_sensitive (menuitem, FALSE); - #endif + if (!midori_view_can_view_source (view)) + gtk_widget_set_sensitive (menuitem, FALSE); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "Print"); @@ -1431,211 +1016,20 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, g_signal_emit_by_name (view, "console-message", message, line, source_id); } -static gboolean -gtk_widget_focus_out_event_cb (GtkWidget* web_view, - GdkEventFocus* event, - MidoriView* view) -{ - gchar* data; - - data = g_strdup_printf ("%d %d %d", - midori_view_can_cut_clipboard (view), - midori_view_can_copy_clipboard (view), - midori_view_can_paste_clipboard (view)); - send_command (view, "clipboard", data); - g_free (data); - - return FALSE; -} - static void -midori_view_realize (MidoriView* view) +webkit_web_view_window_object_cleared_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + JSContextRef js_context, + JSObjectRef js_window, + MidoriView* view) { - WebKitWebFrame* web_frame; - - view->web_view = webkit_web_view_new (); - /* Adjustments are not created automatically */ - g_object_set (view, "hadjustment", NULL, "vadjustment", NULL, NULL); - - /* FIXME: Strictly we should send a command to query - the policy or send it as an argument */ - /* The socket view is not supposed to scroll at all */ - if (midori_view_is_socket (view)) - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view), - GTK_POLICY_NEVER, GTK_POLICY_NEVER); - /* The plug view should use the policy of the socket */ - if (midori_view_is_plug (view)) - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - gtk_widget_show (view->web_view); - - web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); - - g_object_connect (view->web_view, - "signal::load-started", - webkit_web_view_load_started_cb, view, - "signal::window-object-cleared", - webkit_web_view_window_object_cleared_cb, view, - "signal::load-committed", - webkit_web_view_load_committed_cb, view, - "signal::load-progress-changed", - webkit_web_view_progress_changed_cb, view, - "signal::load-finished", - webkit_web_view_load_finished_cb, view, - "signal::title-changed", - webkit_web_view_title_changed_cb, view, - "signal::status-bar-text-changed", - webkit_web_view_statusbar_text_changed_cb, view, - "signal::hovering-over-link", - webkit_web_view_hovering_over_link_cb, view, - "signal::button-press-event", - gtk_widget_button_press_event_cb, view, - "signal::scroll-event", - gtk_widget_scroll_event_cb, view, - "signal::populate-popup", - webkit_web_view_populate_popup_cb, view, - "signal::console-message", - webkit_web_view_console_message_cb, view, - "signal::focus-out-event", - gtk_widget_focus_out_event_cb, view, - NULL); - g_object_connect (web_frame, - "signal::load-done", - webkit_web_frame_load_done_cb, view, - NULL); - - gtk_container_add (GTK_CONTAINER (view), view->web_view); - if (view->premature_uri) - { - midori_debug ("Loading premature uri '%s' now", view->premature_uri); - midori_view_set_uri (view, view->premature_uri); - } - katze_assign (view->premature_uri, NULL); -} - -static void -gtk_socket_realize_cb (GtkWidget* socket, - MidoriView* view) -{ - gchar* socket_id; - GError* error; - gboolean success; - gint stdin_fd; - gint stdout_fd; - gchar* argv[] = { NULL, "--id", NULL, NULL }; - - /* Sockets are not supported on all platforms, - or Midori can run in single process mode, - so fallback to working without any socket or plug. */ - if (!gtk_socket_get_id (GTK_SOCKET (socket)) - || midori_view_single_process (FALSE)) - { - /* Fallback to operating without a socket */ - gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (view))); - view->socket_id = -1; - midori_view_realize (view); - return; - } - - socket_id = g_strdup_printf ("%d", gtk_socket_get_id (GTK_SOCKET (socket))); - argv[0] = (gchar*)sokoke_remember_argv0 (NULL); - argv[2] = socket_id; - error = NULL; - success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, - NULL, NULL, NULL, - &stdin_fd, &stdout_fd, NULL, &error); - g_free (socket_id); - - if (!success) - { - /* Fallback to operating without a socket */ - gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (view))); - view->socket_id = -1; - midori_view_realize (view); - - g_error_free (error); - return; - } - - view->output = fdopen (stdin_fd, "w"); - view->input = g_io_channel_unix_new (stdout_fd); - g_io_channel_set_close_on_unref (view->input, TRUE); - g_io_add_watch (view->input, - G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_NVAL | G_IO_HUP, - (GIOFunc)io_input_watch_cb, view); - - if (view->command_cache) - { - /* Send cached commands if any */ - fwrite (view->command_cache, - strlen (view->command_cache) + 1, 1, view->output); - katze_assign (view->command_cache, NULL); - fflush (view->output); - } -} - -static gboolean -gtk_socket_plug_removed_cb (GtkWidget* socket, - MidoriView* view) -{ - if (view->output) - { - fclose (view->output); - view->output = NULL; - } - - if (view->input) - { - g_io_channel_unref (view->input); - view->input = NULL; - } - - midori_debug ("'%s' died.", view->uri); - send_command (view, "set-uri error:died", view->uri ? view->uri : ""); - if (GTK_WIDGET_REALIZED (view)) - gtk_socket_realize_cb (socket, view); - - return TRUE; -} - -static void -midori_view_realize_cb (MidoriView* view) -{ - GtkWidget* plug; - GtkWidget* socket; - - if (midori_view_is_plug (view)) - { - plug = gtk_plug_new (view->socket_id); - midori_view_realize (view); - gtk_widget_show (plug); - - view->input = g_io_channel_unix_new (0); /* 0 is stdin */ - g_io_channel_set_close_on_unref (view->input, TRUE); - g_io_add_watch (view->input, - G_IO_IN | G_IO_ERR | G_IO_NVAL | G_IO_HUP, - (GIOFunc)io_input_watch_cb, view); - view->output = fdopen (1, "w"); /* 1 is stdout */ - } - else if (midori_view_is_socket (view)) - { - socket = gtk_socket_new (); - gtk_widget_show (socket); - g_signal_connect (socket, "realize", - G_CALLBACK (gtk_socket_realize_cb), view); - g_signal_connect (socket, "plug-removed", - G_CALLBACK (gtk_socket_plug_removed_cb), view); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (view), - GTK_WIDGET (socket)); - } + g_signal_emit (view, signals[WINDOW_OBJECT_CLEARED], 0, + web_frame, js_context, js_window); } static void midori_view_init (MidoriView* view) { - view->command_cache = NULL; - view->premature_uri = NULL; view->uri = NULL; view->title = NULL; view->icon = gtk_widget_render_icon (GTK_WIDGET (view), GTK_STOCK_FILE, @@ -1645,37 +1039,22 @@ midori_view_init (MidoriView* view) view->statusbar_text = NULL; view->link_uri = NULL; view->selected_text = NULL; - view->settings = NULL; + view->settings = midori_web_settings_new (); view->item = NULL; view->download_manager = NULL; - view->default_font_family = NULL; - view->default_encoding = NULL; g_object_connect (view, - "signal::notify::uri", - midori_view_notify_uri_cb, NULL, "signal::notify::icon", midori_view_notify_icon_cb, NULL, "signal::notify::load-status", midori_view_notify_load_status_cb, NULL, - "signal::notify::progress", - midori_view_notify_progress_cb, NULL, - "signal::realize", - midori_view_realize_cb, NULL, - "signal::activate-action", - midori_view_activate_action_cb, NULL, - "signal::console-message", - midori_view_console_message_cb, NULL, - "signal::new-tab", - midori_view_new_tab_cb, NULL, - "signal::new-window", - midori_view_new_window_cb, NULL, - "signal::search-text", - midori_view_search_text_cb, NULL, - "signal::add-bookmark", - midori_view_add_bookmark_cb, NULL, NULL); + + view->web_view = NULL; + + /* Adjustments are not created automatically */ + g_object_set (view, "hadjustment", NULL, "vadjustment", NULL, NULL); } static void @@ -1686,8 +1065,6 @@ midori_view_finalize (GObject* object) view = MIDORI_VIEW (object); - g_free (view->command_cache); - g_free (view->premature_uri); g_free (view->uri); g_free (view->title); if (view->icon) @@ -1722,41 +1099,26 @@ midori_view_set_property (GObject* object, switch (prop_id) { - case PROP_SOCKET_ID: - view->socket_id = g_value_get_uint (value); - break; case PROP_TITLE: katze_assign (view->title, g_value_dup_string (value)); - if (!midori_view_is_plug (view)) + #define title midori_view_get_display_title (view) + if (view->tab_label) { - #define title midori_view_get_display_title (view) - if (view->tab_label) - { - gtk_label_set_text (GTK_LABEL (view->tab_title), title); - gtk_widget_set_tooltip_text (view->tab_title, title); - } - if (view->menu_item) - gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( - view->menu_item))), title); - if (view->item) - katze_item_set_name (view->item, title); - #undef title + gtk_label_set_text (GTK_LABEL (view->tab_title), title); + gtk_widget_set_tooltip_text (view->tab_title, title); } - if (midori_view_is_plug (view)) - /* We must not send a NULL string here */ - send_command (view, "title", view->title ? view->title : ""); + if (view->menu_item) + gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( + view->menu_item))), title); + if (view->item) + katze_item_set_name (view->item, title); + #undef title break; case PROP_ZOOM_LEVEL: midori_view_set_zoom_level (view, g_value_get_float (value)); - if (midori_view_is_plug (view)) - send_command (view, "zoom-level", float_to_str (view->zoom_level)); break; case PROP_STATUSBAR_TEXT: katze_assign (view->statusbar_text, g_value_dup_string (value)); - if (midori_view_is_plug (view)) - /* We must not send a NULL string here */ - send_command (view, "statusbar-text", - view->statusbar_text ? view->statusbar_text : ""); break; case PROP_SETTINGS: midori_view_set_settings (view, g_value_get_object (value)); @@ -1777,9 +1139,6 @@ midori_view_get_property (GObject* object, switch (prop_id) { - case PROP_SOCKET_ID: - g_value_set_uint (value, view->socket_id); - break; case PROP_URI: g_value_set_string (value, view->uri); break; @@ -1821,55 +1180,6 @@ midori_view_new (void) return g_object_new (MIDORI_TYPE_VIEW, NULL); } -/** - * midori_view_new_with_uri: - * @view: a #MidoriView - * @uri: an URI - * - * Creates a new view with a particular URI. - * - * This constructor supports opaque views and is - * in fact currently the only way to create them. - * - * The only currently supported opaque view is - * the source view, implementing a #MidoriSource. - * Pass an URI prefixed with "view-source:" in - * order to create a source view. - * - * Return value: a new #MidoriView - **/ -GtkWidget* -midori_view_new_with_uri (const gchar* uri) -{ - MidoriView* view; - gchar* title; - GtkWidget* widget; - - view = g_object_new (MIDORI_TYPE_VIEW, NULL); - - if (uri && g_str_has_prefix (uri, "view-source:")) - { - view->socket_id = -1; - katze_assign (view->uri, g_strdup (uri)); - g_object_notify (G_OBJECT (view), "uri"); - title = g_strdup_printf ("%s - %s", _("Source"), &uri[12]); - g_object_set (view, "title", title, NULL); - g_free (title); - katze_object_assign (view->icon, - gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU, NULL)); - widget = midori_source_new (&uri[12]); - /* Adjustments are not created automatically */ - g_object_set (view, "hadjustment", NULL, "vadjustment", NULL, NULL); - gtk_container_add (GTK_CONTAINER (view), widget); - gtk_widget_show (widget); - } - else - midori_view_set_uri (view, uri); - - return (GtkWidget*)view; -} - static void _update_label_size (GtkWidget* label, gint size) @@ -1889,39 +1199,10 @@ _midori_view_update_settings (MidoriView* view) { g_object_get (view->settings, "download-manager", &view->download_manager, - "default-font-family", &view->default_font_family, - "default-font-size", &view->default_font_size, - "minimum-font-size", &view->minimum_font_size, - "default-encoding", &view->default_encoding, - "auto-load-images", &view->auto_load_images, - "auto-shrink-images", &view->auto_shrink_images, - "print-backgrounds", &view->print_backgrounds, - "resizable-text-areas", &view->resizable_text_areas, - "enable-scripts", &view->enable_scripts, - "enable-plugins", &view->enable_plugins, "close-buttons-on-tabs", &view->close_buttons_on_tabs, "middle-click-opens-selection", &view->middle_click_opens_selection, "open-tabs-in-the-background", &view->open_tabs_in_the_background, NULL); - - if (midori_view_is_socket (view)) - { - send_command (view, "dlmgr", view->download_manager); - send_command (view, "dffamily", view->default_font_family); - send_command (view, "dfsize", int_to_str (view->default_font_size)); - send_command (view, "mfsize", int_to_str (view->minimum_font_size)); - send_command (view, "denc", view->default_encoding); - send_command (view, "alimg", int_to_str (view->auto_load_images)); - send_command (view, "asimg", int_to_str (view->auto_shrink_images)); - send_command (view, "pbkg", int_to_str (view->print_backgrounds)); - send_command (view, "rta", int_to_str (view->resizable_text_areas)); - send_command (view, "escripts", int_to_str (view->enable_scripts)); - send_command (view, "eplugins", int_to_str (view->enable_plugins)); - send_command (view, "mclksel", - int_to_str (view->middle_click_opens_selection)); - send_command (view, "tabsbkg", - int_to_str (view->open_tabs_in_the_background)); - } } static void @@ -1939,68 +1220,6 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, if (name == g_intern_string ("download-manager")) { katze_assign (view->download_manager, g_value_dup_string (&value)); - if (midori_view_is_socket (view)) - send_command (view, "dlmgr", view->download_manager); - } - else if (name == g_intern_string ("default-font-family")) - { - katze_assign (view->default_font_family, g_value_dup_string (&value)); - if (midori_view_is_socket (view)) - send_command (view, "dffamily", view->default_font_family); - } - else if (name == g_intern_string ("default-font-size")) - { - view->default_font_size = g_value_get_int (&value); - if (midori_view_is_socket (view)) - send_command (view, "dfsize", int_to_str (view->default_font_size)); - } - else if (name == g_intern_string ("minimum-font-size")) - { - view->minimum_font_size = g_value_get_int (&value); - if (midori_view_is_socket (view)) - send_command (view, "mfsize", int_to_str (view->minimum_font_size)); - } - else if (name == g_intern_string ("default-encoding")) - { - katze_assign (view->default_encoding, g_value_dup_string (&value)); - if (midori_view_is_socket (view)) - send_command (view, "denc", view->default_encoding); - } - else if (name == g_intern_string ("auto-load-images")) - { - view->auto_load_images = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "alimg", int_to_str (view->auto_load_images)); - } - else if (name == g_intern_string ("auto-shrink-images")) - { - view->auto_shrink_images = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "asimg", int_to_str (view->auto_shrink_images)); - } - else if (name == g_intern_string ("print-backgrounds")) - { - view->print_backgrounds = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "pbkg", int_to_str (view->print_backgrounds)); - } - else if (name == g_intern_string ("resizable-text-areas")) - { - view->resizable_text_areas = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "rta", int_to_str (view->resizable_text_areas)); - } - else if (name == g_intern_string ("enable-scripts")) - { - view->enable_scripts = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "escripts", int_to_str (view->enable_scripts)); - } - else if (name == g_intern_string ("enable-plugins")) - { - view->enable_plugins = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "eplugins", int_to_str (view->enable_plugins)); } else if (name == g_intern_string ("close-buttons-on-tabs")) { @@ -2011,16 +1230,10 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, else if (name == g_intern_string ("middle-click-opens-selection")) { view->middle_click_opens_selection = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "mclksel", - int_to_str (view->middle_click_opens_selection)); } else if (name == g_intern_string ("open-tabs-in-the-background")) { view->open_tabs_in_the_background = g_value_get_boolean (&value); - if (midori_view_is_socket (view)) - send_command (view, "tabsbkg", - int_to_str (view->open_tabs_in_the_background)); } g_value_unset (&value); @@ -2041,6 +1254,8 @@ midori_view_set_settings (MidoriView* view, g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); katze_object_assign (view->settings, g_object_ref (settings)); + if (view->web_view) + g_object_set (view->web_view, "settings", view->settings, NULL); _midori_view_update_settings (view); g_signal_connect (settings, "notify", G_CALLBACK (midori_view_settings_notify_cb), view); @@ -2080,68 +1295,99 @@ midori_view_get_progress (MidoriView* view) return view->progress; } +static void +midori_view_construct_web_view (MidoriView* view) +{ + WebKitWebFrame* web_frame; + + view->web_view = webkit_web_view_new (); + + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + + g_object_connect (view->web_view, + "signal::load-started", + webkit_web_view_load_started_cb, view, + "signal::load-committed", + webkit_web_view_load_committed_cb, view, + "signal::load-progress-changed", + webkit_web_view_progress_changed_cb, view, + "signal::load-finished", + webkit_web_view_load_finished_cb, view, + "signal::title-changed", + webkit_web_view_title_changed_cb, view, + "signal::status-bar-text-changed", + webkit_web_view_statusbar_text_changed_cb, view, + "signal::hovering-over-link", + webkit_web_view_hovering_over_link_cb, view, + "signal::button-press-event", + gtk_widget_button_press_event_cb, view, + "signal::scroll-event", + gtk_widget_scroll_event_cb, view, + "signal::populate-popup", + webkit_web_view_populate_popup_cb, view, + "signal::console-message", + webkit_web_view_console_message_cb, view, + "signal::window-object-cleared", + webkit_web_view_window_object_cleared_cb, view, + NULL); + g_object_connect (web_frame, + "signal::load-done", + webkit_web_frame_load_done_cb, view, + NULL); + + g_object_set (view->web_view, "settings", view->settings, NULL); + + gtk_widget_show (view->web_view); + gtk_container_add (GTK_CONTAINER (view), view->web_view); +} + /** * midori_view_set_uri: * @view: a #MidoriView * * Opens the specified URI in the view. * - * FIXME: - * If the view doesn't allow changing the URI it - * will automatically request a new tab. + * Pass an URI prefixed with "view-source:" in + * order to create a source view. **/ void midori_view_set_uri (MidoriView* view, const gchar* uri) { + GtkWidget* widget; gchar* data; g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - /* We must not send a NULL string here */ - send_command (view, "set-uri", uri ? uri : ""); + if (!view->web_view && view->uri + && g_str_has_prefix (view->uri, "view-source:")) + { + g_signal_emit (view, signals[NEW_TAB], 0, uri); + } + else if (!view->web_view && uri && g_str_has_prefix (uri, "view-source:")) + { + katze_assign (view->uri, g_strdup (uri)); + g_object_notify (G_OBJECT (view), "uri"); + data = g_strdup_printf ("%s - %s", _("Source"), &uri[12]); + g_object_set (view, "title", data, NULL); + g_free (data); + katze_object_assign (view->icon, + gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU, NULL)); + widget = midori_source_new (&uri[12]); + gtk_container_add (GTK_CONTAINER (view), widget); + gtk_widget_show (widget); + } else { if (!view->web_view) - { - /* An URI is requested before the view was realized. - We special case this to load it when we are ready. */ - midori_debug ("Deferring premature uri '%s'", uri); - katze_assign (view->premature_uri, g_strdup (uri)); - return; - } - midori_debug ("Opening URI: %s", uri); + midori_view_construct_web_view (view); /* This is not prefectly elegant, but creating an error page inline is the simplest solution. */ if (g_str_has_prefix (uri, "error:")) { data = NULL; - if (!strncmp (uri, "error:died ", 11)) - { - katze_assign (view->uri, g_strdup (&uri[11])); - data = g_strdup_printf ( - "Page died - %s" - "

Page died - %s

" - "

The page you were navigating on died." - "

Try to load the page again, " - "or move on to another page." - "", - view->uri, view->uri, view->uri); - } - else if (!strncmp (uri, "error:404 ", 10)) - { - katze_assign (view->uri, g_strdup (&uri[10])); - data = g_strdup_printf ( - "Not found - %s" - "

Not found - %s

" - "

The page you were opening doesn't exist." - "

Try to load the page again, " - "or move on to another page." - "", - view->uri, view->uri, view->uri); - } - else if (!strncmp (uri, "error:nodocs ", 13)) + if (!strncmp (uri, "error:nodocs ", 13)) { katze_assign (view->uri, g_strdup (&uri[13])); data = g_strdup_printf ( @@ -2289,16 +1535,12 @@ midori_view_has_selection (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_socket (view)) - return view->has_selection; - else - { - view->selected_text = webkit_web_view_get_selected_text ( + view->selected_text = webkit_web_view_get_selected_text ( WEBKIT_WEB_VIEW (view->web_view)); - if (view->selected_text && *view->selected_text) - return TRUE; + if (view->selected_text && *view->selected_text) + return TRUE; + else return FALSE; - } } /** @@ -2314,9 +1556,7 @@ midori_view_get_selected_text (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - if (midori_view_is_socket (view)) - return view->selected_text; - else if (midori_view_has_selection (view)) + if (midori_view_has_selection (view)) return midori_view_get_selected_text (view); else return NULL; @@ -2335,15 +1575,11 @@ midori_view_can_cut_clipboard (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_socket (view)) - return view->can_cut_clipboard; - else if (view->web_view) - { - view->can_cut_clipboard = webkit_web_view_can_cut_clipboard ( + if (view->web_view) + return webkit_web_view_can_cut_clipboard ( WEBKIT_WEB_VIEW (view->web_view)); - return view->can_cut_clipboard; - } - return FALSE; + else + return FALSE; } /** @@ -2359,15 +1595,11 @@ midori_view_can_copy_clipboard (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_socket (view)) - return view->can_copy_clipboard; - else if (view->web_view) - { - view->can_copy_clipboard = webkit_web_view_can_copy_clipboard ( + if (view->web_view) + return webkit_web_view_can_copy_clipboard ( WEBKIT_WEB_VIEW (view->web_view)); - return view->can_copy_clipboard; - } - return FALSE; + else + return FALSE; } /** @@ -2383,15 +1615,11 @@ midori_view_can_paste_clipboard (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_socket (view)) - return view->can_paste_clipboard; - else if (view->web_view) - { - view->can_paste_clipboard = webkit_web_view_can_paste_clipboard ( + if (view->web_view) + return webkit_web_view_can_paste_clipboard ( WEBKIT_WEB_VIEW (view->web_view)); - return view->can_paste_clipboard; - } - return FALSE; + else + return FALSE; } /** @@ -2523,8 +1751,7 @@ midori_view_get_proxy_tab_label (MidoriView* view) gtk_box_pack_end (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); gtk_widget_show_all (GTK_WIDGET (event_box)); - if (view->settings && - !sokoke_object_get_boolean (view->settings, "close-buttons-on-tabs")) + if (!view->close_buttons_on_tabs) gtk_widget_hide (view->tab_close); g_signal_connect (event_box, "button-release-event", @@ -2586,10 +1813,10 @@ midori_view_get_zoom_level (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), 1.0); - if (midori_view_is_socket (view)) - return view->zoom_level; - else if (view->web_view) + #ifdef WEBKIT_CHECK_VERSION + if (view->web_view != NULL) return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); + #endif return FALSE; } @@ -2606,11 +1833,34 @@ midori_view_set_zoom_level (MidoriView* view, { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "set-zoom-level", float_to_str (zoom_level)); - else - webkit_web_view_set_zoom_level ( - WEBKIT_WEB_VIEW (view->web_view), zoom_level); + #ifdef WEBKIT_CHECK_VERSION + webkit_web_view_set_zoom_level ( + WEBKIT_WEB_VIEW (view->web_view), zoom_level); + #endif +} + +gboolean +midori_view_can_zoom_in (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + #ifdef WEBKIT_CHECK_VERSION + return view->web_view != NULL; + #else + return FALSE; + #endif +} + +gboolean +midori_view_can_zoom_out (MidoriView* view) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + + #ifdef WEBKIT_CHECK_VERSION + return view->web_view != NULL; + #else + return FALSE; + #endif } #define can_do(what) \ @@ -2619,11 +1869,9 @@ midori_view_can_##what (MidoriView* view) \ { \ g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); \ \ - return view->socket_id > -1; \ + return view->web_view != NULL; \ } -can_do (zoom_in) -can_do (zoom_out) can_do (reload) can_do (print) #if HAVE_GIO @@ -2631,7 +1879,7 @@ can_do (print) #else gboolean midori_view_can_view_source (MidoriView* view) { - return FALSE; + return view->web_view != NULL; } #endif can_do (find) @@ -2651,10 +1899,7 @@ midori_view_reload (MidoriView* view, { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "reload", int_to_str (from_cache)); - else - webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); + webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); } /** @@ -2668,10 +1913,7 @@ midori_view_stop_loading (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "stop-loading", NULL); - else - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); } /** @@ -2685,9 +1927,7 @@ midori_view_can_go_back (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_socket (view)) - return view->can_go_back; - else if (view->web_view) + if (view->web_view) return webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (view->web_view)); else return FALSE; @@ -2704,10 +1944,7 @@ midori_view_go_back (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "go-back", NULL); - else - webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view)); + webkit_web_view_go_back (WEBKIT_WEB_VIEW (view->web_view)); } /** @@ -2721,9 +1958,7 @@ midori_view_can_go_forward (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - if (midori_view_is_socket (view)) - return view->can_go_forward; - else if (view->web_view) + if (view->web_view) return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (view->web_view)); else return FALSE; @@ -2740,10 +1975,7 @@ midori_view_go_forward (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "go-forward", NULL); - else - webkit_web_view_go_forward (WEBKIT_WEB_VIEW (view->web_view)); + webkit_web_view_go_forward (WEBKIT_WEB_VIEW (view->web_view)); } /** @@ -2757,11 +1989,13 @@ midori_view_print (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "print", NULL); - else - webkit_web_view_execute_script ( - WEBKIT_WEB_VIEW (view->web_view), "print();"); + #ifdef WEBKIT_CHECK_VERSION + webkit_web_frame_print (webkit_web_view_get_main_frame ( + WEBKIT_WEB_VIEW (view->web_view))); + #else + webkit_web_view_execute_script ( + WEBKIT_WEB_VIEW (view->web_view), "print();"); + #endif } /** @@ -2775,10 +2009,7 @@ midori_view_unmark_text_matches (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "unmark-matches", NULL); - else - webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (view->web_view)); + webkit_web_view_unmark_text_matches (WEBKIT_WEB_VIEW (view->web_view)); } /** @@ -2796,21 +2027,11 @@ midori_view_search_text (MidoriView* view, gboolean case_sensitive, gboolean forward) { - gchar* data; - g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - { - /* (text, case_sensitive, forward) => (forward, case_sensitive, text) */ - data = g_strdup_printf ("%d %d %s", forward, case_sensitive, text); - send_command (view, "search-text", data); - g_free (data); - } - else - g_signal_emit (view, signals[SEARCH_TEXT], 0, - webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view), - text, case_sensitive, forward, TRUE)); + g_signal_emit (view, signals[SEARCH_TEXT], 0, + webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view), + text, case_sensitive, forward, TRUE)); } /** @@ -2826,20 +2047,10 @@ midori_view_mark_text_matches (MidoriView* view, const gchar* text, gboolean case_sensitive) { - gchar* data; - g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - { - /* (text, case_sensitive) => (case_sensitive, text) */ - data = g_strdup_printf ("%d %s", case_sensitive, text); - send_command (view, "mark-matches", data); - g_free (data); - } - else - webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (view->web_view), - text, case_sensitive, 0); + webkit_web_view_mark_text_matches (WEBKIT_WEB_VIEW (view->web_view), + text, case_sensitive, 0); } /** @@ -2855,9 +2066,6 @@ midori_view_set_highlight_text_matches (MidoriView* view, { g_return_if_fail (MIDORI_IS_VIEW (view)); - if (midori_view_is_socket (view)) - send_command (view, "hl-matches", int_to_str (highlight)); - else - webkit_web_view_set_highlight_text_matches ( - WEBKIT_WEB_VIEW (view->web_view), highlight); + webkit_web_view_set_highlight_text_matches ( + WEBKIT_WEB_VIEW (view->web_view), highlight); } diff --git a/midori/midori-view.h b/midori/midori-view.h index b052266a..02220dbd 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -53,9 +53,6 @@ midori_view_get_type (void); GtkWidget* midori_view_new (void); -GtkWidget* -midori_view_new_with_uri (const gchar* uri); - void midori_view_set_settings (MidoriView* view, MidoriWebSettings* settings); diff --git a/midori/sokoke.c b/midori/sokoke.c index aa2a1808..057ae3c0 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -24,32 +24,6 @@ #include #include -/** - * sokoke_remember_argv0: - * @argv0: the contents of argv[0] or %NULL - * - * Stores or retrieves the value of argv[0]. - * - * Call it with a string for argv0 to store. - * - * Passing %NULL for argv0 will preserve - * a previously stored value. - * - * Return value: the contents of argv[0] or %NULL - **/ -const gchar* -sokoke_remember_argv0 (const gchar* argv0) -{ - static const gchar* remembered_argv0 = NULL; - - if (argv0) - remembered_argv0 = argv0; - - g_return_val_if_fail (remembered_argv0 != NULL, NULL); - - return remembered_argv0; -} - static void error_dialog (const gchar* short_message, const gchar* detailed_message) diff --git a/midori/sokoke.h b/midori/sokoke.h index 46edc48e..c40ba2bd 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -19,9 +19,6 @@ /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON -const gchar* -sokoke_remember_argv0 (const gchar* argv0); - gboolean sokoke_spawn_program (const gchar* command, const gchar* argument); From 58255d19aaa4e91d1f47fcecbfd5f369f5a76750 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 15 Oct 2008 03:32:11 +0200 Subject: [PATCH 0371/2970] Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier. --- katze/katze-arrayaction.c | 4 +-- katze/katze-item.c | 28 ++++++++++----------- katze/katze-throbber.c | 31 +++++++++++------------ katze/katze-throbber.h | 1 - midori/compat.h | 3 +-- midori/midori-addons.c | 8 +++--- midori/midori-app.c | 28 ++++++++++----------- midori/midori-browser.c | 46 +++++++++++++++++----------------- midori/midori-locationaction.c | 8 +++--- midori/midori-panel.c | 16 ++++++------ midori/midori-preferences.c | 4 +-- midori/midori-searchaction.c | 16 ++++++------ midori/midori-view.c | 32 +++++++++++------------ 13 files changed, 111 insertions(+), 114 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index a47f4f92..bf99b890 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -120,8 +120,8 @@ katze_array_action_class_init (KatzeArrayActionClass* class) PROP_ARRAY, g_param_spec_object ( "array", - _("Array"), - _("The array the action represents"), + "Array", + "The array the action represents", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); } diff --git a/katze/katze-item.c b/katze/katze-item.c index f77f4b86..f2a40d24 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -71,8 +71,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_NAME, g_param_spec_string ( "name", - _("Name"), - _("The name of the item"), + "Name", + "The name of the item", NULL, flags)); @@ -80,8 +80,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_TEXT, g_param_spec_string ( "text", - _("Text"), - _("The descriptive text of the item"), + "Text", + "The descriptive text of the item", NULL, flags)); @@ -89,8 +89,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_URI, g_param_spec_string ( "uri", - _("URI"), - _("The URI of the item"), + "URI", + "The URI of the item", NULL, flags)); @@ -98,8 +98,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_ICON, g_param_spec_string ( "icon", - _("Icon"), - _("The icon of the item"), + "Icon", + "The icon of the item", NULL, flags)); @@ -107,8 +107,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_TOKEN, g_param_spec_string ( "token", - _("Token"), - _("The token of the item"), + "Token", + "The token of the item", NULL, flags)); @@ -116,8 +116,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_ADDED, g_param_spec_string ( "added", - _("Added"), - _("When the item was added"), + "Added", + "When the item was added", NULL, flags)); @@ -125,8 +125,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_VISITS, g_param_spec_int ( "visits", - _("Visits"), - _("The number of visits of the item"), + "Visits", + "The number of visits of the item", G_MININT, G_MAXINT, 0, diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index b8ea1847..35396fe5 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -13,7 +13,6 @@ #include "katze-utils.h" -#include #include struct _KatzeThrobber @@ -51,7 +50,7 @@ enum }; static void -katze_throbber_dispose(GObject* object); +katze_throbber_dispose (GObject* object); static void katze_throbber_set_property (GObject* object, @@ -132,8 +131,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ICON_SIZE, g_param_spec_int ( "icon-size", - _("Icon size"), - _("Symbolic size to use for the animation"), + "Icon size", + "Symbolic size to use for the animation", 0, G_MAXINT, GTK_ICON_SIZE_MENU, flags)); @@ -141,8 +140,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ICON_NAME, g_param_spec_string ( "icon-name", - _("Icon Name"), - _("The name of an icon containing animation frames"), + "Icon Name", + "The name of an icon containing animation frames", "process-working", flags)); @@ -150,8 +149,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_PIXBUF, g_param_spec_object ( "pixbuf", - _("Pixbuf"), - _("A GdkPixbuf containing animation frames"), + "Pixbuf", + "A GdkPixbuf containing animation frames", GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -159,8 +158,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ANIMATED, g_param_spec_boolean ( "animated", - _("Animated"), - _("Whether the throbber should be animated"), + "Animated", + "Whether the throbber should be animated", FALSE, flags)); @@ -168,8 +167,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_STATIC_ICON_NAME, g_param_spec_string ( "static-icon-name", - _("Static Icon Name"), - _("The name of an icon to be used as the static image"), + "Static Icon Name", + "The name of an icon to be used as the static image", NULL, flags)); @@ -177,8 +176,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_PIXBUF, g_param_spec_object ( "static-pixbuf", - _("Static Pixbuf"), - _("A GdkPixbuf to be used as the static image"), + "Static Pixbuf", + "A GdkPixbuf to be used as the static image", GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -186,8 +185,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_STATIC_STOCK_ID, g_param_spec_string ( "static-stock-id", - _("Static Stock ID"), - _("The stock ID of an icon to be used as the static image"), + "Static Stock ID", + "The stock ID of an icon to be used as the static image", NULL, flags)); } diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index b4ef681c..34d00044 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -12,7 +12,6 @@ #ifndef __KATZE_THROBBER_H__ #define __KATZE_THROBBER_H__ -#include #include G_BEGIN_DECLS diff --git a/midori/compat.h b/midori/compat.h index a3c6d5c1..bd03cf97 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -16,9 +16,8 @@ #include #endif -#include #if HAVE_GIO -#include + #include #endif #include diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 9842a468..8415215d 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -112,8 +112,8 @@ midori_addons_class_init (MidoriAddonsClass* class) PROP_WEB_WIDGET, g_param_spec_object ( "web-widget", - _("Web Widget"), - _("The assigned web widget"), + "Web Widget", + "The assigned web widget", GTK_TYPE_WIDGET, G_PARAM_READWRITE)); @@ -121,8 +121,8 @@ midori_addons_class_init (MidoriAddonsClass* class) PROP_KIND, g_param_spec_enum ( "kind", - _("Kind"), - _("The kind of addons"), + "Kind", + "The kind of addons", MIDORI_TYPE_ADDON_KIND, MIDORI_ADDON_NONE, flags)); diff --git a/midori/midori-app.c b/midori/midori-app.c index 2c4e1595..14e41a67 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -125,8 +125,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("The associated settings"), + "Settings", + "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -134,8 +134,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_BOOKMARKS, g_param_spec_object ( "bookmarks", - _("Bookmarks"), - _("The bookmarks folder, containing all bookmarks"), + "Bookmarks", + "The bookmarks folder, containing all bookmarks", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -143,8 +143,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_TRASH, g_param_spec_object ( "trash", - _("Trash"), - _("The trash, collecting recently closed tabs and windows"), + "Trash", + "The trash, collecting recently closed tabs and windows", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -152,8 +152,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_SEARCH_ENGINES, g_param_spec_object ( "search-engines", - _("Search Engines"), - _("The list of search engines"), + "Search Engines", + "The list of search engines", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -161,8 +161,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_BROWSER, g_param_spec_object ( "browser", - _("Browser"), - _("The current browser"), + "Browser", + "The current browser", MIDORI_TYPE_BROWSER, G_PARAM_READABLE)); @@ -170,8 +170,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_BROWSER_COUNT, g_param_spec_uint ( "browser-count", - _("Browser Count"), - _("The current number of browsers"), + "Browser Count", + "The current number of browsers", 0, G_MAXUINT, 0, G_PARAM_READABLE)); @@ -179,8 +179,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_HISTORY, g_param_spec_object ( "history", - _("History"), - _("The list of history items"), + "History", + "The list of history items", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0cc425fd..9c96b890 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -963,8 +963,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_MENUBAR, g_param_spec_object ( "menubar", - _("Menubar"), - _("The menubar"), + "Menubar", + "The menubar", GTK_TYPE_MENU_BAR, G_PARAM_READABLE)); @@ -972,8 +972,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_NAVIGATIONBAR, g_param_spec_object ( "navigationbar", - _("Navigationbar"), - _("The navigationbar"), + "Navigationbar", + "The navigationbar", GTK_TYPE_TOOLBAR, G_PARAM_READABLE)); @@ -981,8 +981,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_URI, g_param_spec_string ( "uri", - _("URI"), - _("The current URI"), + "URI", + "The current URI", "about:blank", G_PARAM_READWRITE)); @@ -990,8 +990,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_TAB, g_param_spec_object ( "tab", - _("Tab"), - _("The current tab"), + "Tab", + "The current tab", GTK_TYPE_WIDGET, G_PARAM_READWRITE)); @@ -999,8 +999,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_STATUSBAR, g_param_spec_object ( "statusbar", - _("Statusbar"), - _("The statusbar"), + "Statusbar", + "The statusbar", GTK_TYPE_STATUSBAR, G_PARAM_READABLE)); @@ -1019,8 +1019,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_STATUSBAR_TEXT, g_param_spec_string ( "statusbar-text", - _("Statusbar Text"), - _("The text that is displayed in the statusbar"), + "Statusbar Text", + "The text that is displayed in the statusbar", "", flags)); @@ -1038,8 +1038,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("The associated settings"), + "Settings", + "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -1055,8 +1055,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_BOOKMARKS, g_param_spec_object ( "bookmarks", - _("Bookmarks"), - _("The bookmarks folder, containing all bookmarks"), + "Bookmarks", + "The bookmarks folder, containing all bookmarks", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -1074,8 +1074,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_TRASH, g_param_spec_object ( "trash", - _("Trash"), - _("The trash, collecting recently closed tabs and windows"), + "Trash", + "The trash, collecting recently closed tabs and windows", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -1091,8 +1091,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_SEARCH_ENGINES, g_param_spec_object ( "search-engines", - _("Search Engines"), - _("The list of search engines to be used for web search"), + "Search Engines", + "The list of search engines to be used for web search", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -1108,8 +1108,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_HISTORY, g_param_spec_object ( "history", - _("History"), - _("The list of history items"), + "History", + "The list of history items", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); } @@ -3048,7 +3048,7 @@ static const GtkToggleActionEntry toggle_entries[] = { N_("_Navigationbar"), "", N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate), FALSE }, - { "Panel", NULL, + { "Panel", GTK_STOCK_INDENT, N_("Side_panel"), "F9", N_("Show sidepanel"), G_CALLBACK (_action_panel_activate), FALSE }, diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index b5294388..b7d56b73 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -179,8 +179,8 @@ midori_location_action_class_init (MidoriLocationActionClass* class) PROP_PROGRESS, g_param_spec_double ( "progress", - _("Progress"), - _("The current progress of the action"), + "Progress", + "The current progress of the action", 0.0, 1.0, 0.0, G_PARAM_WRITABLE)); @@ -188,8 +188,8 @@ midori_location_action_class_init (MidoriLocationActionClass* class) PROP_SECONDARY_ICON, g_param_spec_string ( "secondary-icon", - _("Secondary"), - _("The stock ID of the secondary icon"), + "Secondary", + "The stock ID of the secondary icon", NULL, G_PARAM_WRITABLE)); } diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 10e51b6b..f20f81d5 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -143,8 +143,8 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_SHADOW_TYPE, g_param_spec_enum ( "shadow-type", - _("Shadow Type"), - _("Appearance of the shadow around each panel"), + "Shadow Type", + "Appearance of the shadow around each panel", GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_NONE, flags)); @@ -153,8 +153,8 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_MENU, g_param_spec_object ( "menu", - _("Menu"), - _("Menu to hold panel items"), + "Menu", + "Menu to hold panel items", GTK_TYPE_MENU, G_PARAM_READWRITE)); @@ -162,8 +162,8 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_PAGE, g_param_spec_int ( "page", - _("Page"), - _("The index of the current page"), + "Page", + "The index of the current page", -1, G_MAXINT, -1, flags)); } @@ -401,7 +401,7 @@ midori_panel_append_page (MidoriPanel* panel, gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); - n = midori_panel_page_num (panel, child); + n = midori_panel_page_num (panel, scrolled); g_object_set_data (G_OBJECT (child), "label", (gchar*)label); @@ -421,7 +421,7 @@ midori_panel_append_page (MidoriPanel* panel, { menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_widget_show (menuitem); - g_object_set_data (G_OBJECT (menuitem), "page", child); + g_object_set_data (G_OBJECT (menuitem), "page", scrolled); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c0a84f9c..bdb28827 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -58,8 +58,8 @@ midori_preferences_class_init (MidoriPreferencesClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("Settings instance to provide properties"), + "Settings", + "Settings instance to provide properties", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_WRITABLE)); } diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 6d08d1a6..8999c21b 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -165,8 +165,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_SEARCH_ENGINES, g_param_spec_object ( "search-engines", - _("Search Engines"), - _("The list of search engines"), + "Search Engines", + "The list of search engines", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -174,8 +174,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_CURRENT_ITEM, g_param_spec_object ( "current-item", - _("Current Item"), - _("The currently selected item"), + "Current Item", + "The currently selected item", KATZE_TYPE_ITEM, G_PARAM_READWRITE)); @@ -183,8 +183,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_TEXT, g_param_spec_string ( "text", - _("Text"), - _("The current text typed in the entry"), + "Text", + "The current text typed in the entry", NULL, G_PARAM_READWRITE)); @@ -192,8 +192,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_DIALOG, g_param_spec_object ( "dialog", - _("Dialog"), - _("A dialog to manage search engines"), + "Dialog", + "A dialog to manage search engines", GTK_TYPE_DIALOG, G_PARAM_READABLE)); } diff --git a/midori/midori-view.c b/midori/midori-view.c index 14caa14b..3149d064 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -344,8 +344,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_URI, g_param_spec_string ( "uri", - _("Uri"), - _("The URI of the currently loaded page"), + "Uri", + "The URI of the currently loaded page", "about:blank", G_PARAM_READABLE)); @@ -353,8 +353,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_TITLE, g_param_spec_string ( "title", - _("Title"), - _("The title of the currently loaded page"), + "Title", + "The title of the currently loaded page", NULL, G_PARAM_READWRITE)); @@ -362,8 +362,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_ICON, g_param_spec_object ( "icon", - _("Icon"), - _("The icon of the view"), + "Icon", + "The icon of the view", GDK_TYPE_PIXBUF, G_PARAM_READABLE)); @@ -371,8 +371,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_LOAD_STATUS, g_param_spec_enum ( "load-status", - _("Load Status"), - _("The current loading status"), + "Load Status", + "The current loading status", MIDORI_TYPE_LOAD_STATUS, MIDORI_LOAD_FINISHED, G_PARAM_READABLE)); @@ -381,8 +381,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_PROGRESS, g_param_spec_double ( "progress", - _("Progress"), - _("The current loading progress"), + "Progress", + "The current loading progress", 0.0, 1.0, 0.0, G_PARAM_READABLE)); @@ -390,8 +390,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_ZOOM_LEVEL, g_param_spec_float ( "zoom-level", - _("Zoom Level"), - _("The current zoom level"), + "Zoom Level", + "The current zoom level", G_MINFLOAT, G_MAXFLOAT, 1.0f, @@ -401,8 +401,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_STATUSBAR_TEXT, g_param_spec_string ( "statusbar-text", - _("Statusbar Text"), - _("The text displayed in the statusbar"), + "Statusbar Text", + "The text displayed in the statusbar", "", G_PARAM_READWRITE)); @@ -410,8 +410,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("The associated settings"), + "Settings", + "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); } From ae14651145430bbf7c3a3e78f8fe436bf8cad67f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 16 Oct 2008 00:58:22 +0200 Subject: [PATCH 0372/2970] Implement OSX Preferences style on OSX --- midori/midori-preferences.c | 88 ++++++++++++++++++++++++++++++++++--- midori/sokoke.c | 4 ++ 2 files changed, 85 insertions(+), 7 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index bdb28827..0009534e 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -72,6 +72,10 @@ midori_preferences_response_cb (MidoriPreferences* preferences, gtk_widget_destroy (GTK_WIDGET (preferences)); } +#ifdef GDK_WINDOWING_QUARTZ + #define USE_OSX_STYLE +#endif + static void midori_preferences_init (MidoriPreferences* preferences) { @@ -86,10 +90,12 @@ midori_preferences_init (MidoriPreferences* preferences) "title", dialog_title, "has-separator", FALSE, NULL); + #ifndef USE_OSX_STYLE gtk_dialog_add_buttons (GTK_DIALOG (preferences), GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + #endif g_signal_connect (preferences, "response", G_CALLBACK (midori_preferences_response_cb), NULL); @@ -199,6 +205,42 @@ proxy_download_manager_icon_cb (GtkWidget* entry, return FALSE; } +#ifdef USE_OSX_STYLE +static void +midori_preferences_help_clicked_cb (GtkWidget* button, + GtkDialog* dialog) +{ + gtk_dialog_response (dialog, GTK_RESPONSE_HELP); +} + +static void +midori_preferences_toolbutton_clicked_cb (GtkWidget* toolbutton, + GtkWidget* page) +{ + gpointer notebook = g_object_get_data (G_OBJECT (toolbutton), "notebook"); + guint n = gtk_notebook_page_num (notebook, page); + gtk_notebook_set_current_page (notebook, n); +} +#endif + +static inline void +midori_preferences_add_toolbutton (GtkWidget* toolbar, + GtkWidget** toolbutton, + const gchar* icon, + const gchar* label, + GtkWidget* page) +{ +#ifdef USE_OSX_STYLE + *toolbutton = GTK_WIDGET (*toolbutton ? gtk_radio_tool_button_new_from_widget ( + GTK_RADIO_TOOL_BUTTON (*toolbutton)) : gtk_radio_tool_button_new (NULL)); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (*toolbutton), label); + gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (*toolbutton), icon); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (*toolbutton), -1); + g_signal_connect (*toolbutton, "clicked", + G_CALLBACK (midori_preferences_toolbutton_clicked_cb), page); +#endif +} + /** * midori_preferences_set_settings: * @settings: the settings @@ -212,6 +254,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, MidoriWebSettings* settings) { GtkSizeGroup* sizegroup; + GtkWidget* toolbar; + GtkWidget* toolbutton; GtkWidget* page; GtkWidget* frame; GtkWidget* table; @@ -229,8 +273,25 @@ midori_preferences_set_settings (MidoriPreferences* preferences, preferences->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); + + #ifdef USE_OSX_STYLE + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (preferences->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (preferences->notebook), FALSE); + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), + toolbar, FALSE, FALSE, 0); + #endif + toolbutton = NULL; + sizegroup = NULL; - #define PAGE_NEW(__label) page = gtk_vbox_new (FALSE, 0); \ + #define PAGE_NEW(__icon, __label) \ + page = gtk_vbox_new (FALSE, 0); \ + midori_preferences_add_toolbutton (toolbar, &toolbutton, \ + __icon, __label, page); \ + if (toolbutton) g_object_set_data (G_OBJECT (toolbutton), \ + "notebook", preferences->notebook); \ if (sizegroup) g_object_unref (sizegroup); \ sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); \ gtk_container_set_border_width (GTK_CONTAINER (page), 4); \ @@ -261,7 +322,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_container_add (GTK_CONTAINER (align), __widget); \ FILLED_ADD (align, __left, __right, __top, __bottom) /* Page "General" */ - PAGE_NEW (_("General")); + PAGE_NEW (GTK_STOCK_HOME, _("General")); FRAME_NEW (_("Startup")); TABLE_NEW (2, 2); label = katze_property_label (settings, "load-on-startup"); @@ -295,7 +356,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 1, 2); /* Page "Appearance" */ - PAGE_NEW (_("Appearance")); + PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); FRAME_NEW (_("Font settings")); TABLE_NEW (5, 2); label = katze_property_label (settings, "default-font-family"); @@ -316,7 +377,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (button, 1, 2, 2, 3); /* Page "Behavior" */ - PAGE_NEW (_("Behavior")); + PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); FRAME_NEW (_("Features")); TABLE_NEW (6, 2); button = katze_property_proxy (settings, "auto-load-images", NULL); @@ -337,7 +398,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (entry, 1, 2, 3, 4); /* Page "Interface" */ - PAGE_NEW (_("Interface")); + PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); FRAME_NEW (_("Navigationbar")); TABLE_NEW (3, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); @@ -366,7 +427,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 2, 3); /* Page "Network" */ - /*PAGE_NEW (_("Network")); + /*PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); TABLE_NEW (2, 2); label = katze_property_label (settings, "http-proxy"); @@ -383,7 +444,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 1, 2);*/ /* Page "Privacy" */ - PAGE_NEW (_("Privacy")); + PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); /*FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); @@ -418,5 +479,18 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_object_unref (sizegroup); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), preferences->notebook, FALSE, FALSE, 4); + #ifdef USE_OSX_STYLE + GtkWidget* icon; + hbox = gtk_hbox_new (FALSE, 0); + button = gtk_button_new (); + icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), icon); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_preferences_help_clicked_cb), preferences); + gtk_box_pack_end (GTK_BOX (hbox), + button, FALSE, FALSE, 4); + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (preferences)->vbox), + hbox, FALSE, FALSE, 0); + #endif gtk_widget_show_all (GTK_DIALOG (preferences)->vbox); } diff --git a/midori/sokoke.c b/midori/sokoke.c index 057ae3c0..925c7489 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -210,6 +210,7 @@ typedef enum static SokokeDesktop sokoke_get_desktop (void) { + #ifdef GDK_WINDOWING_X11 static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) { @@ -225,6 +226,9 @@ sokoke_get_desktop (void) } return desktop; + #else + return SOKOKE_DESKTOP_UNKNOWN; + #endif } GtkWidget* From 49a4b00b71e0a5d62375de0c84ae4a83fd8ca83f Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Thu, 16 Oct 2008 01:31:47 +0200 Subject: [PATCH 0373/2970] Implement number of days history is saved Note that this will 'break' any existing history and all dates will suddenly jump the beginning of the unix epoch. --- katze/katze-item.c | 21 +++++++------- katze/katze-item.h | 8 +++--- midori/main.c | 57 +++++++++++++++++++++++++------------ midori/midori-browser.c | 25 ++++++++-------- midori/midori-websettings.c | 2 +- midori/sokoke.c | 30 +++++++++++++++++++ midori/sokoke.h | 4 +++ 7 files changed, 101 insertions(+), 46 deletions(-) diff --git a/katze/katze-item.c b/katze/katze-item.c index f2a40d24..3cc437f1 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -114,11 +114,13 @@ katze_item_class_init (KatzeItemClass* class) g_object_class_install_property (gobject_class, PROP_ADDED, - g_param_spec_string ( + g_param_spec_int64 ( "added", "Added", "When the item was added", - NULL, + G_MININT64, + G_MAXINT64, + 0, flags)); g_object_class_install_property (gobject_class, @@ -152,7 +154,6 @@ katze_item_finalize (GObject* object) g_free (item->uri); g_free (item->icon); g_free (item->token); - g_free (item->added); G_OBJECT_CLASS (katze_item_parent_class)->finalize (object); } @@ -183,7 +184,7 @@ katze_item_set_property (GObject* object, katze_assign (item->token, g_value_dup_string (value)); break; case PROP_ADDED: - katze_assign (item->added, g_value_dup_string (value)); + item->added = g_value_get_int64 (value); break; case PROP_VISITS: item->visits = g_value_get_int (value); @@ -220,7 +221,7 @@ katze_item_get_property (GObject* object, g_value_set_string (value, item->token); break; case PROP_ADDED: - g_value_set_string (value, item->added); + g_value_set_int64 (value, item->added); break; case PROP_VISITS: g_value_set_int (value, item->visits); @@ -419,10 +420,10 @@ katze_item_set_token (KatzeItem* item, * * Return value: a timestamp **/ -const gchar* +gint64 katze_item_get_added (KatzeItem* item) { - g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + g_return_val_if_fail (KATZE_IS_ITEM (item), 0); return item->added; } @@ -435,12 +436,12 @@ katze_item_get_added (KatzeItem* item) * Sets when @item was added. **/ void -katze_item_set_added (KatzeItem* item, - const gchar* added) +katze_item_set_added (KatzeItem* item, + gint64 added) { g_return_if_fail (KATZE_IS_ITEM (item)); - katze_assign (item->added, g_strdup (added)); + item->added = added; g_object_notify (G_OBJECT (item), "added"); } diff --git a/katze/katze-item.h b/katze/katze-item.h index 8014b57a..6aceb449 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -41,8 +41,8 @@ struct _KatzeItem gchar* uri; gchar* icon; gchar* token; - gchar* added; - gint visits; + gint64 added; + gint visits; KatzeItem* parent; }; @@ -93,12 +93,12 @@ void katze_item_set_token (KatzeItem* item, const gchar* token); -const gchar* +gint64 katze_item_get_added (KatzeItem* item); void katze_item_set_added (KatzeItem* item, - const gchar* added); + gint64 added); gint katze_item_get_visits (KatzeItem* item); diff --git a/midori/main.c b/midori/main.c index 90de8150..1c6e5410 100644 --- a/midori/main.c +++ b/midori/main.c @@ -656,7 +656,7 @@ gettimestr (void* data, g_return_val_if_fail (argc == 1, 1); - katze_item_set_added (item, argv[0]); + katze_item_set_added (item, g_ascii_strtoull (argv[0], NULL, 10)); return 0; } @@ -672,7 +672,7 @@ midori_history_remove_item_cb (KatzeArray* history, g_return_if_fail (KATZE_IS_ITEM (item)); sqlcmd = g_strdup_printf ("DELETE FROM history WHERE uri = '%s' AND" - " title = '%s' AND date = '%s' AND visits = %d", + " title = '%s' AND date = %ld AND visits = %d", katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item), @@ -734,7 +734,7 @@ midori_history_add_item_cb (KatzeArray* array, /* New item, set added to the current date/ time */ if (!katze_item_get_added (item)) { - if (!db_exec_callback (db, "SELECT datetime('now')", + if (!db_exec_callback (db, "SELECT date('now')", gettimestr, item, &error)) { g_printerr (_("Failed to add history item. %s\n"), error->message); @@ -743,7 +743,7 @@ midori_history_add_item_cb (KatzeArray* array, } } sqlcmd = g_strdup_printf ("INSERT INTO history VALUES" - "('%s', '%s', '%s', %d)", + "('%s', '%s', %" G_GUINT64_FORMAT ", %d)", katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item), @@ -767,10 +767,10 @@ midori_history_add_items (void* data, KatzeItem* item; KatzeArray* parent = NULL; KatzeArray* array = KATZE_ARRAY (data); - gchar* newdate; + gint64 date; + time_t newdate; gint i, j, n; gint ncols = 4; - gsize len; g_return_val_if_fail (KATZE_IS_ARRAY (array), 1); @@ -789,28 +789,24 @@ midori_history_add_items (void* data, item = katze_item_new (); katze_item_set_uri (item, argv[i]); katze_item_set_name (item, argv[i + 1]); - katze_item_set_added (item, argv[i + 2]); + date = g_ascii_strtoull (argv[i + 2], NULL, 10); + katze_item_set_added (item, date); katze_item_set_visits (item, atoi (argv[i + 3])); - len = (g_strrstr (argv[i + 2], " ") - argv[i + 2]); - newdate = g_strndup (argv[i + 2], len); - n = katze_array_get_length (array); for (j = 0; j < n; j++) { parent = katze_array_get_nth_item (array, j); - if (newdate && g_ascii_strcasecmp - (katze_item_get_added (KATZE_ITEM (parent)), newdate) == 0) + newdate = katze_item_get_added (KATZE_ITEM (parent)); + if (sokoke_same_day (&date, &newdate)) break; } if (j == n) { parent = katze_array_new (KATZE_TYPE_ARRAY); - katze_item_set_added (KATZE_ITEM (parent), newdate); + katze_item_set_added (KATZE_ITEM (parent), date); katze_array_add_item (array, parent); } - g_free (newdate); - katze_array_add_item (parent, item); } } @@ -832,13 +828,13 @@ midori_history_initialize (KatzeArray* array, if (!db_exec (db, "CREATE TABLE IF NOT EXISTS " - "history(uri text, title text, date text, visits integer)", + "history(uri text, title text, date integer, visits integer)", error)) return NULL; if (!db_exec_callback (db, "SELECT uri, title, date, visits FROM history " - "ORDER BY strftime('%s', date) ASC", + "ORDER BY date ASC", midori_history_add_items, array, error)) @@ -857,6 +853,29 @@ midori_history_initialize (KatzeArray* array, } return db; } + +static void +midori_history_terminate (sqlite3* db, + gint max_history_age) +{ + gchar* sqlcmd; + gboolean success = TRUE; + GError* error = NULL; + + sqlcmd = g_strdup_printf ( + "DELETE FROM history WHERE " + "(julianday(date('now')) - julianday(date(date,'unixepoch')))" + " >= %d", max_history_age); + db_exec (db, sqlcmd, &error); + if (!success) + { + g_printerr (_("Failed to remove old history items. %s\n"), error->message); + g_error_free (error); + return ; + } + g_free (sqlcmd); + db_close (db); +} #endif static gchar* @@ -1060,6 +1079,7 @@ main (int argc, gchar* uri_ready; #ifdef HAVE_SQLITE sqlite3* db; + gint max_history_age; #endif #if ENABLE_NLS @@ -1364,7 +1384,8 @@ main (int argc, g_mkdir_with_parents (config_path, 0755); g_object_unref (history); #ifdef HAVE_SQLITE - db_close (db); + g_object_get (settings, "maximum-history-age", &max_history_age, NULL); + midori_history_terminate (db, max_history_age); #endif config_file = g_build_filename (config_path, "search", NULL); error = NULL; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9c96b890..52453d2c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2418,6 +2418,8 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { KatzeItem* item; + time_t date; + char sdate[50]; gtk_tree_model_get (model, iter, 0, &item, -1); @@ -2431,7 +2433,11 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, } if (KATZE_IS_ARRAY (item)) - g_object_set (renderer, "text", katze_item_get_added (item), NULL); + { + date = (time_t)katze_item_get_added (item); + strftime (sdate, sizeof (sdate), "%Y-%m-%d", localtime (&date)); + g_object_set (renderer, "text", sdate, NULL); + } else g_object_set (renderer, "text", katze_item_get_name (item), NULL); @@ -4062,9 +4068,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, gint i; gboolean found; time_t now; - gchar newdate [70]; - gchar *today; - gsize len; + gint64 date; if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) return; @@ -4073,19 +4077,15 @@ midori_browser_new_history_item (MidoriBrowser* browser, treemodel = gtk_tree_view_get_model (treeview); now = time (NULL); - strftime (newdate, sizeof (newdate), "%Y-%m-%d %H:%M:%S", localtime (&now)); - katze_item_set_added (item, newdate); - - len = (g_strrstr (newdate, " ") - newdate); - today = g_strndup (newdate, len); + katze_item_set_added (item, now); found = FALSE; i = 0; while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) { gtk_tree_model_get (treemodel, &iter, 0, &parent, -1); - if (g_ascii_strcasecmp (today, - katze_item_get_added (KATZE_ITEM (parent))) == 0) + date = katze_item_get_added (KATZE_ITEM (parent)); + if (sokoke_same_day (&now, &date)) { found = TRUE; break; @@ -4095,7 +4095,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, if (!found) { parent = katze_array_new (KATZE_TYPE_ARRAY); - katze_item_set_added (KATZE_ITEM (parent), today); + katze_item_set_added (KATZE_ITEM (parent), now); katze_array_add_item (browser->history, parent); katze_array_add_item (parent, item); _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, @@ -4108,7 +4108,6 @@ midori_browser_new_history_item (MidoriBrowser* browser, katze_array_add_item (parent, item); g_object_unref (parent); } - g_free (today); } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 0c91990c..1ff3cb98 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -575,7 +575,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Maximum history age"), _("The maximum number of days to save the history for"), 0, G_MAXINT, 30, - G_PARAM_READABLE)); + flags)); g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_FORM_INPUTS, diff --git a/midori/sokoke.c b/midori/sokoke.c index 925c7489..6ab9dcae 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -648,3 +648,33 @@ sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, return TRUE; return FALSE; } + +/** + * sokoke_same_day: + * @day1: a time_t timestamp value + * @day2: a time_t timestamp value + * + * Compares two timestamps to see if their values are on the + * same day. + * + * Return value: %TRUE if the day of the timestamps match. + **/ +gboolean +sokoke_same_day (const time_t* day1, + const time_t* day2) +{ + struct tm* tm1; + struct tm* tm2; + gboolean same; + + tm2 = localtime (day1); + tm1 = (struct tm*) g_memdup (tm2, sizeof (struct tm)); + tm2 = localtime (day2); + + same = (tm1->tm_year == tm2->tm_year && + tm1->tm_mon == tm2->tm_mon && + tm1->tm_mday == tm2->tm_mday) ? TRUE : FALSE; + g_free (tm1); + return same; +} + diff --git a/midori/sokoke.h b/midori/sokoke.h index c40ba2bd..39113af5 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -139,4 +139,8 @@ sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, GtkTreeModel** model, GtkTreeIter* iter); +gboolean +sokoke_same_day (const time_t* day1, + const time_t* day2); + #endif /* !__SOKOKE_H__ */ From 7849f28e08811434bc61bbdfdc3b9fffb2b1f555 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 16 Oct 2008 03:51:39 +0200 Subject: [PATCH 0374/2970] Display a shaded logo in error pages --- AUTHORS | 3 +- data/logo-shade.svg | 150 +++++++++++++++++++++++++++++++++++++++++++ midori/midori-view.c | 4 ++ wscript | 22 +++++++ 4 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 data/logo-shade.svg diff --git a/AUTHORS b/AUTHORS index 68ec1880..f0e7c330 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,10 +11,11 @@ Contributors: Dale Whittaker Anders F Björklund -Icons: +Graphics: extension: Nancy Runge midori: Nancy Runge news-feed: Nancy Runge + logo-shade: Nancy Runge Translations: de: Enrico Tröger diff --git a/data/logo-shade.svg b/data/logo-shade.svg new file mode 100644 index 00000000..7a21a99b --- /dev/null +++ b/data/logo-shade.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Nancy Runge <nancy@twotoasts.de> + + + + + + + + + + + + + + + + + diff --git a/midori/midori-view.c b/midori/midori-view.c index 3149d064..636a53a2 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -672,6 +672,8 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, data = g_strdup_printf ( "Not found - %s" "

Not found - %s

" + "" "

The page you were opening doesn't exist." "

Try to load the page again, " "or move on to another page." @@ -1393,6 +1395,8 @@ midori_view_set_uri (MidoriView* view, data = g_strdup_printf ( "No documentation installed" "

No documentation installed

" + "" "

There is no documentation installed at %s." "You may want to ask your distribution or " "package maintainer for it or if this a custom build " diff --git a/wscript b/wscript index aec27955..4f1d460a 100644 --- a/wscript +++ b/wscript @@ -163,6 +163,16 @@ def set_options (opt): help='Enables API documentation', dest='enable_api_docs') def build (bld): + def mkdir (path): + if not os.access (path, os.F_OK): + os.mkdir (path) + + def _install_files (folder, destination, source): + try: + install_files (folder, destination, source) + except: + pass + bld.add_subdirs ('katze midori icons') install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING README') @@ -201,6 +211,18 @@ def build (bld): if bld.env ()['INTLTOOL']: install_files ('DATADIR', 'applications', 'midori.desktop') + if bld.env ()['RSVG_CONVERT']: + mkdir (blddir + '/data') + convert = subprocess.Popen ([bld.env ()['RSVG_CONVERT'], + '-o', blddir + '/data/logo-shade.png', + srcdir + '/data/logo-shade.svg'], + stderr=subprocess.PIPE) + if not convert.wait (): + _install_files ('DATADIR', APPNAME, + blddir + '/data/logo-shade.png') + else: + Params.pprint ('BLUE', "logo-shade could not be rasterized.") + def shutdown (): if Params.g_commands['install'] or Params.g_commands['uninstall']: dir = Common.path_install ('DATADIR', 'icons/hicolor') From 43b195976254fe710731a1cd58af6bebdff9236a Mon Sep 17 00:00:00 2001 From: Brandon Mercer Date: Thu, 16 Oct 2008 20:29:58 +0200 Subject: [PATCH 0375/2970] Don't search if there's a colon (:) in a domain --- midori/sokoke.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 6ab9dcae..cd5f5518 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -111,7 +111,8 @@ sokoke_magic_uri (const gchar* uri, if (!strstr (uri, "://")) { /* Do we have a domain, ip address or localhost? */ - if (strchr (uri, '.') != NULL || !strcmp (uri, "localhost")) + if (strchr (uri, '.') != NULL || strchr (uri, ':') + || !strcmp (uri, "localhost")) return g_strconcat ("http://", uri, NULL); /* We don't want to search? So return early. */ if (!search_engines) From a12f3d10e0874818794585c9f44776b59f8f6c57 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 16 Oct 2008 20:36:42 +0200 Subject: [PATCH 0376/2970] Hitting Return or Enter in a Preferences entry applies it --- katze/katze-utils.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index af2d3857..ce619781 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -59,6 +59,16 @@ proxy_combo_box_text_changed_cb (GtkComboBox* button, GObject* object) return FALSE; } +static gboolean +proxy_entry_activate_cb (GtkEntry* entry, + GObject* object) +{ + const gchar* text = gtk_entry_get_text (entry); + const gchar* property = g_object_get_data (G_OBJECT (entry), "property"); + g_object_set (object, property, text, NULL); + return FALSE; +} + static gboolean proxy_entry_focus_out_event_cb (GtkEntry* entry, GdkEventFocus* event, @@ -241,6 +251,8 @@ katze_property_proxy (gpointer object, if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_entry_set_text (GTK_ENTRY (widget), string ? string : ""); + g_signal_connect (widget, "activate", + G_CALLBACK (proxy_entry_activate_cb), object); g_signal_connect (widget, "focus-out-event", G_CALLBACK (proxy_entry_focus_out_event_cb), object); } From 6cd7e61c6152babcab22cf495ddedb592f6012bd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 16 Oct 2008 20:54:26 +0200 Subject: [PATCH 0377/2970] Speficy -r or --run to run a file as javascript --- docs/user/midori.txt | 6 ++++-- midori/main.c | 30 +++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index 3e38ddfc..26e41383 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -111,9 +111,9 @@ Running Midori normally works as follows: You can separate URIS by a pipe (|) as well. They are handled as if you provided all URIs as separate arguments. -* $ midori [JAVASCRIPT] +* $ midori --run [JAVASCRIPT] - If you pass a filename ending with ".js" Midori will attempt to run + If you pass the filename of a javascript Midori will attempt to run the contents of the file as javascript code. @@ -127,6 +127,8 @@ The following arguments are supported if you call Midori from a command line. +-------+--------------------+------------------------------------------------+ | Short | Long option | Function | +=======+====================+================================================+ +| -r | --run | Run the specified filename as javascript | ++-------+--------------------+------------------------------------------------+ | -v | --version | Show version information and exit. | +-------+--------------------+------------------------------------------------+ diff --git a/midori/main.c b/midori/main.c index 1c6e5410..20d3d748 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1049,6 +1049,7 @@ int main (int argc, char** argv) { + gboolean run; gboolean version; gchar** uris; MidoriApp* app; @@ -1056,6 +1057,8 @@ main (int argc, GError* error; GOptionEntry entries[] = { + { "run", 'r', 0, G_OPTION_ARG_NONE, &run, + N_("Run the specified filename as javascript"), NULL }, { "version", 'v', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, @@ -1089,6 +1092,7 @@ main (int argc, #endif /* Parse cli options */ + run = FALSE; version = FALSE; uris = NULL; error = NULL; @@ -1121,16 +1125,24 @@ main (int argc, } /* Standalone gjs support */ - if (uris && uris[0] && g_str_has_suffix (uris[0], ".js")) + if (run) { - js_context = gjs_global_context_new (); - exception = NULL; - gjs_script_from_file (js_context, uris[0], &exception); - JSGlobalContextRelease (js_context); - if (!exception) - return 0; - printf ("%s - Exception: %s\n", uris[0], exception); - return 1; + if (uris && *uris) + { + js_context = gjs_global_context_new (); + exception = NULL; + gjs_script_from_file (js_context, *uris, &exception); + JSGlobalContextRelease (js_context); + if (!exception) + return 0; + g_print ("%s - Exception: %s\n", *uris, exception); + return 1; + } + else + { + g_print ("%s - %s\n", _("Midori"), _("No filename specified")); + return 1; + } } app = midori_app_new (); From 49956f6b9be11d100be73d0e3c1e3e2dfd70a48b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 08:21:07 +0200 Subject: [PATCH 0378/2970] Use gint64 format specifier instead of %ld --- midori/main.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/midori/main.c b/midori/main.c index 20d3d748..ff535489 100644 --- a/midori/main.c +++ b/midori/main.c @@ -671,12 +671,13 @@ midori_history_remove_item_cb (KatzeArray* history, g_return_if_fail (KATZE_IS_ITEM (item)); - sqlcmd = g_strdup_printf ("DELETE FROM history WHERE uri = '%s' AND" - " title = '%s' AND date = %ld AND visits = %d", - katze_item_get_uri (item), - katze_item_get_name (item), - katze_item_get_added (item), - katze_item_get_visits (item)); + sqlcmd = g_strdup_printf ( + "DELETE FROM history WHERE uri = '%s' AND" + " title = '%s' AND date = %" G_GINT64_FORMAT " AND visits = %d", + katze_item_get_uri (item), + katze_item_get_name (item), + katze_item_get_added (item), + katze_item_get_visits (item)); success = db_exec (db, sqlcmd, &error); if (!success) { @@ -781,10 +782,10 @@ midori_history_add_items (void* data, { if (argv[i]) { - if (colname[i] && g_ascii_strcasecmp (colname[i], "uri") == 0 && - colname[i + 1] && g_ascii_strcasecmp (colname[i + 1], "title") == 0 && - colname[i + 2] && g_ascii_strcasecmp (colname[i + 2], "date") == 0 && - colname[i + 3] && g_ascii_strcasecmp (colname[i + 3], "visits") == 0) + if (colname[i] && !g_ascii_strcasecmp (colname[i], "uri") && + colname[i + 1] && !g_ascii_strcasecmp (colname[i + 1], "title") && + colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "date") && + colname[i + 3] && !g_ascii_strcasecmp (colname[i + 3], "visits")) { item = katze_item_new (); katze_item_set_uri (item, argv[i]); From 6eefea515e91f4f9a8b5d650da154a57abbbf728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 17 Oct 2008 20:52:39 +0200 Subject: [PATCH 0379/2970] Correct build dependencies in midori/wscript_build --- midori/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/wscript_build b/midori/wscript_build index af1c06e8..951ebc97 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -4,7 +4,7 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' -obj.includes = '.. ../katze' +obj.includes = '. ..' obj.find_sources_in_dirs ('.') obj.uselib = 'UNIQUE GIO GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' From 171030a3a832cbc851d7f9ae7c4cac8f0ebe8f09 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 20:56:56 +0200 Subject: [PATCH 0380/2970] Initialize a variable to avoid a warning --- midori/midori-preferences.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 0009534e..fa7c2bb0 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -283,6 +283,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), toolbar, FALSE, FALSE, 0); #endif + toolbar = NULL; toolbutton = NULL; sizegroup = NULL; From 3f5ac14b45f6040963a10a8700e088d1083abba8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 21:12:16 +0200 Subject: [PATCH 0381/2970] Disconnect view settings notification in finalize --- midori/midori-view.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 636a53a2..9425b5de 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -132,6 +132,11 @@ midori_view_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static void +midori_view_settings_notify_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + MidoriView* view); + static void midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, GValue* return_value, @@ -1067,6 +1072,9 @@ midori_view_finalize (GObject* object) view = MIDORI_VIEW (object); + g_signal_handlers_disconnect_by_func (view->settings, + midori_view_settings_notify_cb, view); + g_free (view->uri); g_free (view->title); if (view->icon) From ee3b7a3b51658b3079cc23870b3758a1657312de Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 23:14:21 +0200 Subject: [PATCH 0382/2970] Finish essential KatzeArrayAction functionality --- katze/katze-arrayaction.c | 112 ++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 17 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index bf99b890..2dfebb53 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -209,28 +209,90 @@ katze_array_action_menu_item_activate_cb (GtkWidget* proxy, g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); } +static void +katze_array_action_menu_item_select_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) +{ + guint n, i; + GtkWidget* menu; + GtkWidget* menuitem; + GtkWidget* submenu; + KatzeArray* array; + KatzeItem* item; + GdkPixbuf* pixbuf; + GtkWidget* icon; + + menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)); + gtk_container_foreach (GTK_CONTAINER (menu), + (GtkCallback)(gtk_widget_destroy), NULL); + + array = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); + n = katze_array_get_length (array); + if (n > 0) + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (array, i); + /* FIXME: The menu item should reflect changes to the item */ + if (!KATZE_IS_ARRAY (item) && !katze_item_get_uri (item)) + { + menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + continue; + } + menuitem = katze_image_menu_item_new_ellipsized ( + katze_item_get_name (item)); + pixbuf = gtk_widget_render_icon (menuitem, + KATZE_IS_ARRAY (item) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); + icon = gtk_image_new_from_pixbuf (pixbuf); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + g_object_unref (pixbuf); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + if (KATZE_IS_ARRAY (item)) + { + submenu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); + g_signal_connect (menuitem, "select", + G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); + } + else + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); + gtk_widget_show (menuitem); + } + else + { + menuitem = gtk_image_menu_item_new_with_label (_("Empty")); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } +} + static void katze_array_action_proxy_clicked_cb (GtkWidget* proxy, KatzeArrayAction* array_action) { - GtkWidget* menu; guint n, i; + GtkWidget* menu; GtkWidget* menuitem; + GtkWidget* submenu; KatzeItem* item; GdkPixbuf* pixbuf; GtkWidget* icon; if (GTK_IS_MENU_ITEM (proxy)) { - if (!(menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)))) - { - menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (proxy), menu); - } - gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)(gtk_widget_destroy), NULL); + g_object_set_data (G_OBJECT (proxy), "KatzeItem", array_action->array); + katze_array_action_menu_item_select_cb (proxy, array_action); + g_signal_emit (array_action, signals[POPULATE_POPUP], 0, + gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy))); + return; } - else - menu = gtk_menu_new (); + + menu = gtk_menu_new (); n = katze_array_get_length (array_action->array); if (n > 0) @@ -238,18 +300,34 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, { item = katze_array_get_nth_item (array_action->array, i); /* FIXME: The menu item should reflect changes to the item */ + if (!KATZE_IS_ARRAY (item) && !katze_item_get_uri (item)) + { + menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + continue; + } menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - pixbuf = gtk_widget_render_icon (menuitem, GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); + pixbuf = gtk_widget_render_icon (menuitem, + KATZE_IS_ARRAY (item) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); icon = gtk_image_new_from_pixbuf (pixbuf); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); g_object_unref (pixbuf); + gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - g_signal_connect (menuitem, "activate", - G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); - gtk_widget_show (menuitem); + if (KATZE_IS_ARRAY (item)) + { + submenu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); + g_signal_connect (menuitem, "select", + G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); + } + else + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); } else { @@ -261,9 +339,8 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); - if (!GTK_IS_MENU_ITEM (proxy)) - katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu), - NULL, KATZE_MENU_POSITION_LEFT); + katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu), + NULL, KATZE_MENU_POSITION_LEFT); } static GtkWidget* @@ -298,6 +375,7 @@ katze_array_action_connect_proxy (GtkAction* action, } else if (GTK_IS_MENU_ITEM (proxy)) { + gtk_menu_item_set_submenu (GTK_MENU_ITEM (proxy), gtk_menu_new ()); /* FIXME: 'select' doesn't cover all ways of selection */ g_signal_connect (proxy, "select", G_CALLBACK (katze_array_action_proxy_clicked_cb), action); From 7b82ccc1397e234d9e7e6b13b307d5a03e55a480 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 23:15:37 +0200 Subject: [PATCH 0383/2970] Open all bookmarks in the current tab --- midori/midori-browser.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 52453d2c..5c2cd264 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1499,9 +1499,8 @@ _action_bookmarks_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - gint n = midori_browser_add_item (browser, item); - midori_browser_set_current_page (browser, n); - _midori_browser_update_actions (browser); + _midori_browser_open_uri (browser, katze_item_get_uri (item)); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } static void @@ -3943,7 +3942,7 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, name = g_intern_string (pspec->name); g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (browser->settings), name, &value); + g_object_get_property (G_OBJECT (web_settings), name, &value); if (name == g_intern_string ("toolbar-style")) _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); From 741c5b953a5fc6e107b705d76f170b8db06985d2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 23:18:56 +0200 Subject: [PATCH 0384/2970] Properly create unfullscreen button with the toolbar --- midori/midori-browser.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5c2cd264..0329caf9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3465,13 +3465,6 @@ midori_browser_init (MidoriBrowser* browser) g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); sokoke_container_show_children (GTK_CONTAINER (browser->navigationbar)); gtk_widget_hide (browser->navigationbar); - action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); - browser->button_fullscreen = gtk_action_create_tool_item (action); - gtk_widget_hide (browser->button_fullscreen); - g_signal_connect (browser->button_fullscreen, "clicked", - G_CALLBACK (_action_fullscreen_activate), browser); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (browser->button_fullscreen), -1); g_signal_connect (browser->navigationbar, "popup-context-menu", G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); @@ -3852,6 +3845,14 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, name++; } g_strfreev (names); + + action = gtk_action_group_get_action (browser->action_group, "Fullscreen"); + browser->button_fullscreen = gtk_action_create_tool_item (action); + gtk_widget_hide (browser->button_fullscreen); + g_signal_connect (browser->button_fullscreen, "clicked", + G_CALLBACK (_action_fullscreen_activate), browser); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (browser->button_fullscreen), -1); } static void From d53ef7c92fdc2763acedd76206ee430efc7165fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 23:30:31 +0200 Subject: [PATCH 0385/2970] Show toolbar menu when right-clicking the menubar --- midori/midori-browser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0329caf9..92a4c9d3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3260,6 +3260,11 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, gtk_entry_set_text (GTK_ENTRY (entry), ""); } +static gboolean +midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser); + static void midori_browser_init (MidoriBrowser* browser) { @@ -3445,6 +3450,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); gtk_widget_hide (browser->menubar); + g_signal_connect (browser->menubar, "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); _action_set_sensitive (browser, "SaveAs", FALSE); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); From 5ec06f6d2e01c6a99ee635bddd177583afcd71e5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Oct 2008 23:53:20 +0200 Subject: [PATCH 0386/2970] Add UndoTabClose to the Dummy menu --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 92a4c9d3..191305aa 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3202,6 +3202,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "

" "" From fa9becaf8350554a2a98345381f5bc6d9c818385 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Oct 2008 00:06:47 +0200 Subject: [PATCH 0387/2970] Properly reset Manage Search Engines dialog pointer --- midori/midori-searchaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 8999c21b..465efa79 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1044,7 +1044,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); g_signal_connect (dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), &dialog); + G_CALLBACK (gtk_widget_destroyed), &search_action->dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); /* TODO: Implement some kind of help function */ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), From 26ac7a379d42251aca810627f538d9aafa05390d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Oct 2008 21:48:41 +0200 Subject: [PATCH 0388/2970] List some tool items in Preferences --- midori/midori-preferences.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index fa7c2bb0..cce0284b 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -401,15 +401,22 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); FRAME_NEW (_("Navigationbar")); - TABLE_NEW (3, 2); + TABLE_NEW (4, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); INDENTED_ADD (katze_property_label (settings, "toolbar-items"), 0, 1, 1, 2); button = katze_property_proxy (settings, "toolbar-items", NULL); FILLED_ADD (button, 1, 2, 1, 2); + button = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (button), + "" + "TabNew, Open, Print, Find, Location, Preferences, Window, Bookmarks\n" + "ReloadStop, ZoomIn, ZoomOut, Back, Forward, Homepage, Search, Trash" + ""); + FILLED_ADD (button, 0, 2, 2, 3); button = katze_property_proxy (settings, "always-show-tabbar", NULL); - INDENTED_ADD (button, 0, 1, 2, 3); + INDENTED_ADD (button, 0, 1, 3, 4); FRAME_NEW (_("Browsing")); TABLE_NEW (3, 2); /* label = katze_property_label (settings, "open-new-pages-in"); From 8ad56494229e663f8a0914004833f1d91711dc28 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Oct 2008 21:56:53 +0200 Subject: [PATCH 0389/2970] Assign Settings to source views --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 191305aa..585d7c2f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1673,6 +1673,7 @@ _action_source_view_activate (GtkAction* action, uri = g_strdup_printf ("view-source:%s", midori_view_get_display_uri (MIDORI_VIEW (view))); source_view = midori_view_new (); + midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); midori_view_set_uri (MIDORI_VIEW (source_view), uri); g_free (uri); gtk_widget_show (source_view); From 3a9071a7616a6c9ca06447fa393aa8256ca26064 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sat, 18 Oct 2008 22:07:18 +0200 Subject: [PATCH 0390/2970] Skip non-strings when loading or saving search engines --- midori/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/main.c b/midori/main.c index ff535489..6f00cf3a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -305,6 +305,8 @@ search_engines_new_from_file (const gchar* filename, item = katze_item_new (); for (j = 0; j < n_properties; j++) { + if (!G_IS_PARAM_SPEC_STRING (pspecs[j])) + continue; property = g_param_spec_get_name (pspecs[j]); value = g_key_file_get_string (key_file, engines[i], property, NULL); @@ -342,6 +344,8 @@ search_engines_save_to_file (KatzeArray* search_engines, name = katze_item_get_name (item); for (j = 0; j < n_properties; j++) { + if (!G_IS_PARAM_SPEC_STRING (pspecs[j])) + continue; property = g_param_spec_get_name (pspecs[j]); g_object_get (item, property, &value, NULL); if (value) From 51d111d85ce97e7ebe3b89648d9c83a175621d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 18 Oct 2008 22:50:58 +0200 Subject: [PATCH 0391/2970] Optimize view popup population --- midori/midori-view.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 9425b5de..3bad796b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -893,6 +893,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, GdkScreen* screen; GtkIconTheme* icon_theme; GList* items; + gboolean has_selection; /* We do not want to modify the Edit menu. The only reliable indicator is inspecting the first item. */ @@ -906,6 +907,8 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, return; } + has_selection = midori_view_has_selection (view); + if (view->link_uri) { menuitem = gtk_image_menu_item_new_with_mnemonic ( @@ -949,7 +952,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, gtk_widget_show (menuitem); } - if (!view->link_uri && midori_view_has_selection (view)) + if (!view->link_uri && has_selection) { if (strchr (view->selected_text, '.') && !strchr (view->selected_text, ' ')) @@ -968,7 +971,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, /* FIXME: view selection source */ } - if (!view->link_uri && !midori_view_has_selection (view)) + if (!view->link_uri && !has_selection) { /* FIXME: Make this sensitive only when there is a tab to undo */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); From 952729e4ae66646c0817b98ae46e1a282dec35b1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Oct 2008 23:21:06 +0200 Subject: [PATCH 0392/2970] Show URL in New Tab menu item only over selections --- midori/midori-view.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 3bad796b..680c266e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -895,8 +895,10 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, GList* items; gboolean has_selection; - /* We do not want to modify the Edit menu. - The only reliable indicator is inspecting the first item. */ + has_selection = midori_view_has_selection (view); + + /* Unfortunately inspecting the menu is the only way to + determine that the mouse is over a text area or selection. */ items = gtk_container_get_children (GTK_CONTAINER (menu)); menuitem = (GtkWidget*)g_list_nth_data (items, 0); if (GTK_IS_IMAGE_MENU_ITEM (menuitem)) @@ -905,10 +907,10 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL); if (!strcmp (stock_id, GTK_STOCK_CUT)) return; + if (strcmp (stock_id, GTK_STOCK_FIND)) + has_selection = FALSE; } - has_selection = midori_view_has_selection (view); - if (view->link_uri) { menuitem = gtk_image_menu_item_new_with_mnemonic ( From 567e402eaa432826ad01c21b33584298cd46d77e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Oct 2008 00:15:02 +0200 Subject: [PATCH 0393/2970] Make the pageholder work again --- midori/midori-browser.c | 2 ++ midori/midori-panel.c | 55 ++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 585d7c2f..89bd5561 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3610,6 +3610,8 @@ midori_browser_init (MidoriBrowser* browser) /* Pageholder */ browser->panel_pageholder = midori_view_new (); + midori_view_set_settings (MIDORI_VIEW (browser->panel_pageholder), + browser->settings); gtk_widget_show (browser->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_pageholder, NULL, diff --git a/midori/midori-panel.c b/midori/midori-panel.c index f20f81d5..14cc5a2a 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -11,6 +11,7 @@ #include "midori-panel.h" +#include "midori-view.h" #include "sokoke.h" #include "compat.h" @@ -377,22 +378,22 @@ midori_panel_append_page (MidoriPanel* panel, scrolled = child; else { - scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); - gtk_widget_show (scrolled); - gobject_class = G_OBJECT_GET_CLASS (child); - if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) - widget = child; - else - { - widget = gtk_viewport_new (NULL, NULL); - gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (widget), child); - } - gtk_container_add (GTK_CONTAINER (scrolled), widget); + scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gtk_widget_show (scrolled); + gobject_class = G_OBJECT_GET_CLASS (child); + if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) + widget = child; + else + { + widget = gtk_viewport_new (NULL, NULL); + gtk_widget_show (widget); + gtk_container_add (GTK_CONTAINER (widget), child); + } + gtk_container_add (GTK_CONTAINER (scrolled), widget); } gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); @@ -421,7 +422,7 @@ midori_panel_append_page (MidoriPanel* panel, { menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_widget_show (menuitem); - g_object_set_data (G_OBJECT (menuitem), "page", scrolled); + g_object_set_data (G_OBJECT (menuitem), "page", child); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), @@ -454,7 +455,13 @@ static GtkWidget* _midori_panel_child_for_scrolled (MidoriPanel* panel, GtkWidget* scrolled) { - GtkWidget* child = gtk_bin_get_child (GTK_BIN (scrolled)); + GtkWidget* child; + + /* This is a lazy hack, we should have a way of determining + whether the scrolled is the actual child. */ + if (MIDORI_IS_VIEW (scrolled)) + return scrolled; + child = gtk_bin_get_child (GTK_BIN (scrolled)); if (GTK_IS_VIEWPORT (child)) child = gtk_bin_get_child (GTK_BIN (child)); return child; @@ -474,9 +481,11 @@ GtkWidget* midori_panel_get_nth_page (MidoriPanel* panel, guint page_num) { + GtkWidget* scrolled; + g_return_val_if_fail (MIDORI_IS_PANEL (panel), NULL); - GtkWidget* scrolled = gtk_notebook_get_nth_page ( + scrolled = gtk_notebook_get_nth_page ( GTK_NOTEBOOK (panel->notebook), page_num); if (scrolled) return _midori_panel_child_for_scrolled (panel, scrolled); @@ -503,7 +512,13 @@ static GtkWidget* _midori_panel_scrolled_for_child (MidoriPanel* panel, GtkWidget* child) { - GtkWidget* scrolled = gtk_widget_get_parent (GTK_WIDGET (child)); + GtkWidget* scrolled; + + /* This is a lazy hack, we should have a way of determining + whether the scrolled is the actual child. */ + if (MIDORI_IS_VIEW (child)) + return child; + scrolled = gtk_widget_get_parent (GTK_WIDGET (child)); if (GTK_IS_VIEWPORT (scrolled)) scrolled = gtk_widget_get_parent (scrolled); return scrolled; From c2cba4899ae764ea625048a058f70844f62c1653 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Oct 2008 00:35:23 +0200 Subject: [PATCH 0394/2970] Bump version to 0.1.0 --- ChangeLog | 16 ++++++++++++++++ README | 2 +- configure.in | 2 +- wscript | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4979a3e3..3a280d2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.0: + + Allow for hiding the menubar + + Make the navigationbar customizable + + Implement a History panel + + Remove the HTTP Proxy hack + + Add an Always Show Tabbar Preference + + Implement 404 error pages + + Remove the Primary Clipboard hack + + Provide user documentation + + Display Not found errors when possible + + Remove Stylesheet and Zoom Stepping preferences + + Make dialogs more compact + + Ellipsize extremely long menu items + + Save the trash again when quitting + + Implement enabling/ disabling addons + v0.0.21: + Update some translations + Show progress in location when statusbar is hidden diff --git a/README b/README index 23a69fb7..97360c91 100644 --- a/README +++ b/README @@ -14,7 +14,7 @@ Midori is a lightweight web browser. Requirements: GTK+ 2.6, WebkitGtk, libXML2 -Optional: Glib 2.16, GtkSourceView 2.0, Unique 0.9, xdg-open +Optional: Glib 2.16, GtkSourceView 2.0, Unique 0.9, sqlite 3.0, xdg-open For installation instructions read INSTALL. diff --git a/configure.in b/configure.in index 2638da05..d97e2756 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # This file is licensed under the terms of the expat license, see the file EXPAT. # Register ourselves to autoconf -AC_INIT([midori], [0.0.21], [http://www.twotoasts.de/bugs]) +AC_INIT([midori], [0.1.0], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/midori-stock.h]) AC_CONFIG_HEADER([config.h]) diff --git a/wscript b/wscript index 4f1d460a..eb735587 100644 --- a/wscript +++ b/wscript @@ -9,7 +9,7 @@ import platform import os APPNAME = 'midori' -VERSION = '0.0.21' +VERSION = '0.1.0' try: git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], From 3f78fc132e4542ea7a6f440cc21c899c6ffd7b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 19 Oct 2008 01:32:38 +0200 Subject: [PATCH 0395/2970] Compare strings with strcmp, this fixes icons in the location --- midori/midori-locationaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index b7d56b73..e8b0f406 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -494,7 +494,7 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, item.title = NULL; midori_location_entry_add_item ( MIDORI_LOCATION_ENTRY (entry), &item); - if (location_action->uri == uri) + if (!g_strcmp0 (location_action->uri, uri)) gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), GTK_ICON_ENTRY_PRIMARY, icon); } From a08b760d4e167998f554a8ed95f40ee2d01ef518 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Oct 2008 01:52:21 +0200 Subject: [PATCH 0396/2970] Add g_strcmp0 to compat, it's Glib 2.16 --- midori/compat.c | 18 ++++++++++++++++++ midori/compat.h | 8 ++++++++ 2 files changed, 26 insertions(+) diff --git a/midori/compat.c b/midori/compat.c index 7a871ad1..cd6243d5 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -11,6 +11,24 @@ #include "compat.h" +#if !GLIB_CHECK_VERSION(2, 16, 0) + +/* Glib string function + Copyright (C) 2008 Tim Janik + Copied from Glib 2.16, coding style adjusted */ +gint +g_strcmp0 (const gchar* string1, + const gchar* string2) +{ + if (!string1) + return -(str1 != str2); + if (!string2) + return string1 != string2; + return strcmp (string1, string2); +} + +#endif + #if !GTK_CHECK_VERSION(2, 14, 0) #if HAVE_GIO diff --git a/midori/compat.h b/midori/compat.h index bd03cf97..49cb3e60 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -23,6 +23,14 @@ G_BEGIN_DECLS +#if !GLIB_CHECK_VERSION(2, 16, 0) + +gint +g_strcmp0 (const gchar* string1, + const gchar* string2); + +#endif + #if !GTK_CHECK_VERSION(2, 14, 0) #if HAVE_GIO From a6e4d7b84b68acf2758e8f52acec95d6f8918e7a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Oct 2008 22:18:07 +0200 Subject: [PATCH 0397/2970] Load and cache favicons with libsoup instead of GIO The previous code relied on GIO implementing HTTP with libsoup, so this is effectively not a new dependency. And since many people don't have GVfs and even if they do, somehow GIO doesn't work as good as one should expect, direct use of libsoup is actually an improvement. Plus the new code caches icons on disk which we didn't do before. --- midori/midori-view.c | 199 +++++++++++++++++++++++++------------------ midori/wscript_build | 2 +- wscript | 9 ++ 3 files changed, 125 insertions(+), 85 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 680c266e..345049cc 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -24,12 +24,13 @@ #include #include -#if HAVE_GIO - #include -#endif #include #include +#if HAVE_LIBSOUP + #include +#endif + /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); @@ -64,6 +65,10 @@ struct _MidoriView GtkWidget* tab_title; GtkWidget* tab_close; KatzeItem* item; + + #if HAVE_LIBSOUP + SoupSession* session; + #endif }; struct _MidoriViewClass @@ -434,119 +439,136 @@ midori_view_notify_icon_cb (MidoriView* view, gtk_image_new_from_pixbuf (view->icon)); } -#if HAVE_GIO -void -loadable_icon_finish_cb (GdkPixbuf* icon, - GAsyncResult* res, - MidoriView* view) +#if HAVE_LIBSOUP +static void +midori_view_got_headers_cb (SoupMessage* msg, + MidoriView* view) +{ + const gchar* mime; + + switch (msg->status_code) + { + case 200: + mime = soup_message_headers_get (msg->response_headers, "content-type"); + if (!g_str_has_prefix (mime, "image/")) + soup_session_cancel_message (view->session, msg, 200); + break; + case 301: + break; + default: + soup_session_cancel_message (view->session, msg, 200); + } +} + +static gchar* +midori_view_get_cached_icon_file (gchar* uri) +{ + gchar* cache_dir; + gchar* checksum; + gchar* icon_file; + gchar* icon_path; + + cache_dir = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "icons", NULL); + g_mkdir_with_parents (cache_dir, 0755); + #if GLIB_CHECK_VERSION(2, 16, 0) + checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + #else + checksum = g_strdup_printf ("%u", g_str_hash (uri)); + #endif + icon_file = g_strdup_printf ("%s.ico", checksum); + g_free (checksum); + icon_path = g_build_filename (cache_dir, icon_file, NULL); + g_free (icon_file); + return icon_path; +} + +static void +midori_view_got_body_cb (SoupMessage* msg, + MidoriView* view) { GdkPixbuf* pixbuf; - GInputStream* stream; - GError* error; + SoupURI* soup_uri; + gchar* uri; + gchar* icon_file; + FILE* fp; GdkPixbuf* pixbuf_scaled; gint icon_width, icon_height; pixbuf = NULL; - stream = g_loadable_icon_load_finish (G_LOADABLE_ICON (icon), - res, NULL, NULL); - if (stream) + if (msg->response_body->length > 0) { - error = NULL; - pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error); - if (error) - g_warning (_("Icon couldn't be loaded: %s\n"), error->message); - g_object_unref (stream); + soup_uri = soup_message_get_uri (msg); + uri = soup_uri_to_string (soup_uri, FALSE); + icon_file = midori_view_get_cached_icon_file (uri); + g_free (uri); + if ((fp = fopen (icon_file, "w"))) + { + fwrite (msg->response_body->data, + 1, msg->response_body->length, fp); + fclose (fp); + pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); + } + g_free (icon_file); } if (!pixbuf) pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR); g_object_unref (pixbuf); + katze_object_assign (view->icon, pixbuf_scaled); g_object_notify (G_OBJECT (view), "icon"); } - -void -file_info_finish_cb (GFile* icon_file, - GAsyncResult* res, - MidoriView* view) -{ - GFileInfo* info; - const gchar* content_type; - GIcon* icon; - GFile* parent; - GFile* file; - GdkPixbuf* pixbuf; - gint icon_width, icon_height; - GdkPixbuf* pixbuf_scaled; - - info = g_file_query_info_finish (G_FILE (icon_file), res, NULL); - if (info) - { - content_type = g_file_info_get_content_type (info); - if (g_str_has_prefix (content_type, "image/")) - { - icon = g_file_icon_new (icon_file); - g_loadable_icon_load_async (G_LOADABLE_ICON (icon), - 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, view); - return; - } - } - - file = g_file_get_parent (icon_file); - parent = g_file_get_parent (file); - /* We need to check if file equals the parent due to a GIO bug */ - if (parent && !g_file_equal (file, parent)) - { - icon_file = g_file_get_child (parent, "favicon.ico"); - g_file_query_info_async (icon_file, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, 0, NULL, - (GAsyncReadyCallback)file_info_finish_cb, view); - return; - } - - pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - - view->icon = pixbuf_scaled; - g_object_notify (G_OBJECT (view), "icon"); -} #endif static void _midori_web_view_load_icon (MidoriView* view) { - #if HAVE_GIO - GFile* file; - GFile* icon_file; + #if HAVE_LIBSOUP + guint i; + gchar* uri; + gchar* icon_file; + SoupMessage* msg; #endif GdkPixbuf* pixbuf; gint icon_width, icon_height; GdkPixbuf* pixbuf_scaled; - #if HAVE_GIO - if (view->uri) + pixbuf = NULL; + #if HAVE_LIBSOUP + if (view->uri && g_str_has_prefix (view->uri, "http://")) { - file = g_file_new_for_uri (view->uri); - icon_file = g_file_get_child (file, "favicon.ico"); - g_file_query_info_async (icon_file, - G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, 0, NULL, - (GAsyncReadyCallback)file_info_finish_cb, view); - return; + i = 8; + while (view->uri[i] != '\0' && view->uri[i] != '/') + i++; + if (view->uri[i] == '/') + { + uri = g_strdup (view->uri); + uri[i] = '\0'; + uri = g_strdup_printf ("%s/favicon.ico", uri); + icon_file = midori_view_get_cached_icon_file (uri); + if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) + pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); + else + { + msg = soup_message_new ("GET", uri); + g_signal_connect (msg, "got-headers", + G_CALLBACK (midori_view_got_headers_cb), view); + g_signal_connect (msg, "got-body", + G_CALLBACK (midori_view_got_body_cb), view); + soup_session_queue_message (view->session, msg, NULL, NULL); + } + g_free (uri); + } } #endif - pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + if (!pixbuf) + pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR); @@ -1056,6 +1078,11 @@ midori_view_init (MidoriView* view) view->download_manager = NULL; + #if HAVE_LIBSOUP + if (!g_thread_supported ()) g_thread_init (NULL); + view->session = soup_session_async_new (); + #endif + g_object_connect (view, "signal::notify::icon", midori_view_notify_icon_cb, NULL, @@ -1094,6 +1121,10 @@ midori_view_finalize (GObject* object) g_free (view->download_manager); + #if HAVE_LIBSOUP + g_object_unref (view->session); + #endif + /* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); g_signal_handlers_disconnect_by_func (web_frame, diff --git a/midori/wscript_build b/midori/wscript_build index 951ebc97..a5ae6932 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.') -obj.uselib = 'UNIQUE GIO GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GIO GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index eb735587..160fb253 100644 --- a/wscript +++ b/wscript @@ -95,6 +95,13 @@ def configure (conf): single_instance = 'no' conf.check_message_custom ('single instance', 'support', single_instance) + if not Params.g_options.disable_libsoup: + conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP', mandatory=False) + libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] + else: + libsoup = 'no' + conf.check_message_custom ('libsoup', 'support', libsoup) + if not Params.g_options.disable_gio: conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) gio = ['not available','yes'][conf.env['HAVE_GIO'] == 1] @@ -152,6 +159,8 @@ def set_options (opt): opt.add_option ('--disable-unique', action='store_true', default=False, help='Disables Unique support', dest='disable_unique') + opt.add_option ('--disable-libsoup', action='store_true', default=False, + help='Disables libsoup support', dest='disable_libsoup') opt.add_option ('--disable-gio', action='store_true', default=False, help='Disables GIO support', dest='disable_gio') opt.add_option ('--disable-sqlite', action='store_true', default=False, From cf854d961764254448517cd68fd752707297fce2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Oct 2008 22:53:51 +0200 Subject: [PATCH 0398/2970] Remove support for GtkSourceView --- configure.in | 6 ---- midori/midori-source.c | 74 +++--------------------------------------- wscript | 1 - 3 files changed, 4 insertions(+), 77 deletions(-) diff --git a/configure.in b/configure.in index d97e2756..b8b93241 100644 --- a/configure.in +++ b/configure.in @@ -60,12 +60,6 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_DEFINE_UNQUOTED(HAVE_GTK,$have_gtk, [Whether Gtk is available]) -# Checks for GtkSourceView -PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0, have_gtksourceview=1, have_gtksourceview=0) -AC_SUBST(GTKSOURCEVIEW_CFLAGS) -AC_SUBST(GTKSOURCEVIEW_LIBS) -AC_DEFINE_UNQUOTED(HAVE_GTKSOURCEVIEW,$have_gtksourceview, [Whether GtkSourceView is available]) - # Checks for WebKit PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=1, have_webkit=0) if test "x${have_webkit}" = "xfalse" ; then diff --git a/midori/midori-source.c b/midori/midori-source.c index ce3131bb..bede4992 100644 --- a/midori/midori-source.c +++ b/midori/midori-source.c @@ -20,30 +20,18 @@ #include #endif #include -#if HAVE_GTKSOURCEVIEW - #include - #include - - #define MidoriSourceView GtkSourceView - #define MidoriSourceViewClass GtkSourceViewClass - #define MIDORI_TYPE_SOURCE_VIEW GTK_TYPE_SOURCE_VIEW -#else - #define MidoriSourceView GtkTextView - #define MidoriSourceViewClass GtkTextViewClass - #define MIDORI_TYPE_SOURCE_VIEW GTK_TYPE_TEXT_VIEW -#endif struct _MidoriSource { - MidoriSourceView parent_instance; + GtkTextView parent_instance; }; struct _MidoriSourceClass { - MidoriSourceViewClass parent_class; + GtkTextViewClass parent_class; }; -G_DEFINE_TYPE (MidoriSource, midori_source, MIDORI_TYPE_SOURCE_VIEW); +G_DEFINE_TYPE (MidoriSource, midori_source, GTK_TYPE_TEXT_VIEW); static void midori_source_finalize (GObject* object); @@ -60,20 +48,10 @@ midori_source_class_init (MidoriSourceClass* class) static void midori_source_init (MidoriSource* source) { - #if HAVE_GTKSOURCEVIEW - GtkSourceBuffer* buffer; - #else GtkTextBuffer* buffer; - #endif - #if HAVE_GTKSOURCEVIEW - buffer = gtk_source_buffer_new (NULL); - gtk_source_buffer_set_highlight_syntax (buffer, TRUE); - gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (source), TRUE); - #else buffer = gtk_text_buffer_new (NULL); - #endif - gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), GTK_TEXT_BUFFER (buffer)); + gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), buffer); gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); } @@ -109,20 +87,10 @@ midori_source_set_uri (MidoriSource* source, #if HAVE_GIO GFile* file; gchar* tag; - #if HAVE_GTKSOURCEVIEW - GFileInfo* info; - const gchar* content_type; - #endif #endif gchar* contents; gchar* contents_utf8; GtkTextBuffer* buffer; - #if HAVE_GTKSOURCEVIEW - #if HAVE_GIO - GtkSourceLanguageManager* language_manager; - GtkSourceLanguage* language; - #endif - #endif g_return_if_fail (MIDORI_IS_SOURCE (source)); @@ -131,16 +99,8 @@ midori_source_set_uri (MidoriSource* source, #if HAVE_GIO file = g_file_new_for_uri (uri); tag = NULL; - #if HAVE_GTKSOURCEVIEW - content_type = NULL; - #endif if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL)) { - #if HAVE_GTKSOURCEVIEW - info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, - G_FILE_QUERY_INFO_NONE, NULL, NULL); - content_type = g_file_info_get_content_type (info); - #endif g_object_unref (file); } if (contents && !g_utf8_validate (contents, -1, NULL)) @@ -154,32 +114,6 @@ midori_source_set_uri (MidoriSource* source, contents_utf8 = contents; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); - #if HAVE_GTKSOURCEVIEW - #if HAVE_GIO - if (content_type) - { - language_manager = gtk_source_language_manager_get_default (); - if (!strcmp (content_type, "text/html")) - { - language = gtk_source_language_manager_get_language ( - language_manager, "html"); - gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language); - } - else if (!strcmp (content_type, "text/css")) - { - language = gtk_source_language_manager_get_language ( - language_manager, "css"); - gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language); - } - else if (!strcmp (content_type, "text/javascript")) - { - language = gtk_source_language_manager_get_language ( - language_manager, "js"); - gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language); - } - } - #endif - #endif if (contents_utf8) gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1); diff --git a/wscript b/wscript index 160fb253..d683eb07 100644 --- a/wscript +++ b/wscript @@ -126,7 +126,6 @@ def configure (conf): conf.check_message_custom ('history database', 'support', sqlite) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) - conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) From 7f8fc2b31dd8fad3339b8d98496eff022ea22175 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Oct 2008 00:13:41 +0200 Subject: [PATCH 0399/2970] Implement viewing source with libsoup --- midori/main.c | 3 + midori/midori-browser.c | 7 --- midori/midori-source.c | 122 ++++++++++++++++++++++++++++++---------- midori/midori-view.c | 23 +++++--- 4 files changed, 110 insertions(+), 45 deletions(-) diff --git a/midori/main.c b/midori/main.c index 6f00cf3a..df4478cc 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1109,6 +1109,9 @@ main (int argc, return 1; } + #if HAVE_LIBSOUP + if (!g_thread_supported ()) g_thread_init (NULL); + #endif stock_items_init (); g_set_application_name (_("Midori")); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 89bd5561..c37bfcd2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -31,9 +31,6 @@ #include "sokoke.h" #include "gjs.h" -#if HAVE_GIO -#include -#endif #include #include #include @@ -3739,10 +3736,6 @@ midori_browser_init (MidoriBrowser* browser) g_object_unref (ui_manager); - #if !HAVE_GIO - _action_set_sensitive (browser, "SourceView", FALSE); - #endif - #ifndef WEBKIT_CHECK_VERSION _action_set_sensitive (browser, "ZoomIn", FALSE); _action_set_sensitive (browser, "ZoomOut", FALSE); diff --git a/midori/midori-source.c b/midori/midori-source.c index bede4992..f08975f4 100644 --- a/midori/midori-source.c +++ b/midori/midori-source.c @@ -16,14 +16,19 @@ #include "midori-source.h" #include -#if HAVE_GIO - #include -#endif #include +#if HAVE_LIBSOUP + #include +#endif + struct _MidoriSource { GtkTextView parent_instance; + + #if HAVE_LIBSOUP + SoupSession* session; + #endif }; struct _MidoriSourceClass @@ -53,11 +58,19 @@ midori_source_init (MidoriSource* source) buffer = gtk_text_buffer_new (NULL); gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), buffer); gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); + + #if HAVE_LIBSOUP + source->session = soup_session_async_new (); + #endif } static void midori_source_finalize (GObject* object) { + #if HAVE_LIBSOUP + g_object_unref (MIDORI_SOURCE (object)->session); + #endif + G_OBJECT_CLASS (midori_source_parent_class)->finalize (object); } @@ -80,46 +93,97 @@ midori_source_new (const gchar* uri) return GTK_WIDGET (source); } +#if HAVE_LIBSOUP +static void +midori_source_got_body_cb (SoupMessage* msg, + MidoriSource* source) +{ + const gchar* contents; + const gchar* mime; + gchar** mimev; + gchar* charset; + gchar* contents_utf8; + GtkTextBuffer* buffer; + + if (msg->response_body->length > 0) + { + contents = msg->response_body->data; + if (contents && !g_utf8_validate (contents, -1, NULL)) + { + charset = NULL; + if (msg->response_headers) + { + mime = soup_message_headers_get (msg->response_headers, + "content-type"); + if (mime) + { + mimev = g_strsplit (mime, " ", 2); + if (mimev[0] && mimev[1] && + g_str_has_prefix (mimev[1], "charset=")) + charset = g_strdup (&mimev[1][8]); + g_strfreev (mimev); + } + } + contents_utf8 = g_convert (contents, -1, "UTF-8", + charset ? charset : "ISO-8859-1", NULL, NULL, NULL); + } + else + contents_utf8 = (gchar*)contents; + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); + if (contents_utf8) + gtk_text_buffer_set_text (buffer, contents_utf8, -1); + g_object_unref (buffer); + if (contents != contents_utf8) + g_free (contents_utf8); + } +} +#endif + void midori_source_set_uri (MidoriSource* source, const gchar* uri) { - #if HAVE_GIO - GFile* file; - gchar* tag; - #endif gchar* contents; gchar* contents_utf8; GtkTextBuffer* buffer; + #if HAVE_LIBSOUP + SoupMessage* msg; + #endif + gchar* filename; g_return_if_fail (MIDORI_IS_SOURCE (source)); + g_return_if_fail (uri != NULL); contents = NULL; - #if HAVE_GIO - file = g_file_new_for_uri (uri); - tag = NULL; - if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL)) + #if HAVE_LIBSOUP + if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) { - g_object_unref (file); + msg = soup_message_new ("GET", uri); + g_signal_connect (msg, "got-body", + G_CALLBACK (midori_source_got_body_cb), source); + soup_session_queue_message (source->session, msg, NULL, NULL); + return; } - if (contents && !g_utf8_validate (contents, -1, NULL)) + #endif + if (g_str_has_prefix (uri, "file://")) { - contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", - NULL, NULL, NULL); - g_free (contents); + contents = NULL; + filename = g_filename_from_uri (uri, NULL, NULL); + if (!filename || !g_file_get_contents (filename, &contents, NULL, NULL)) + return; + if (contents && !g_utf8_validate (contents, -1, NULL)) + { + contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", + NULL, NULL, NULL); + g_free (contents); + } + else + contents_utf8 = contents; + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); + if (contents_utf8) + gtk_text_buffer_set_text (buffer, contents_utf8, -1); + g_object_unref (buffer); + g_free (contents_utf8); } - else - #endif - contents_utf8 = contents; - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); - if (contents_utf8) - gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1); - - g_object_unref (buffer); - g_free (contents_utf8); - #if HAVE_GIO - g_free (tag); - #endif } diff --git a/midori/midori-view.c b/midori/midori-view.c index 345049cc..2a978a08 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1079,7 +1079,6 @@ midori_view_init (MidoriView* view) view->download_manager = NULL; #if HAVE_LIBSOUP - if (!g_thread_supported ()) g_thread_init (NULL); view->session = soup_session_async_new (); #endif @@ -1911,6 +1910,20 @@ midori_view_can_zoom_out (MidoriView* view) #endif } +gboolean +midori_view_can_view_source (MidoriView* view) +{ + const gchar* uri = view->uri; + + #if HAVE_LIBSOUP + if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) + return TRUE; + #endif + if (g_str_has_prefix (uri, "file://")) + return TRUE; + return FALSE; +} + #define can_do(what) \ gboolean \ midori_view_can_##what (MidoriView* view) \ @@ -1922,14 +1935,6 @@ midori_view_can_##what (MidoriView* view) \ can_do (reload) can_do (print) -#if HAVE_GIO - can_do (view_source) -#else - gboolean midori_view_can_view_source (MidoriView* view) - { - return view->web_view != NULL; - } -#endif can_do (find) /** From e848d1df6e406f71dd867889392da089816846b8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Oct 2008 00:41:52 +0200 Subject: [PATCH 0400/2970] Require Gtk 2.10 and don't treat GIO specially anymore --- README | 4 ++-- configure.in | 8 +------- midori/Makefile.am | 6 ++---- midori/compat.c | 2 +- midori/compat.h | 9 +++++---- midori/gtkiconentry.c | 14 +++++++------- midori/gtkiconentry.h | 6 +++--- midori/main.c | 7 ------- midori/midori-addons.c | 10 +++++----- midori/midori-browser.c | 2 -- midori/midori-locationentry.c | 2 +- midori/midori-stock.h | 10 ---------- midori/midori-view.c | 4 ++-- midori/wscript_build | 2 +- wscript | 18 +----------------- 15 files changed, 31 insertions(+), 73 deletions(-) diff --git a/README b/README index 97360c91..63d716d5 100644 --- a/README +++ b/README @@ -12,9 +12,9 @@ Midori is a lightweight web browser. * Extensible via Javascript. * Custom context menu actions. -Requirements: GTK+ 2.6, WebkitGtk, libXML2 +Requirements: GTK+ 2.10, WebkitGtk, libXML2 -Optional: Glib 2.16, GtkSourceView 2.0, Unique 0.9, sqlite 3.0, xdg-open +Optional: Unique 0.9, libsoup 2.4, sqlite 3.0, xdg-open For installation instructions read INSTALL. diff --git a/configure.in b/configure.in index b8b93241..67480fca 100644 --- a/configure.in +++ b/configure.in @@ -45,14 +45,8 @@ AC_SUBST(UNIQUE_CFLAGS) AC_SUBST(UNIQUE_LIBS) AC_DEFINE_UNQUOTED(HAVE_UNIQUE,$have_unique, [Whether Unique is available]) -# Checks for GIO2 -PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=1, have_gio=0) -AC_SUBST(GIO_CFLAGS) -AC_SUBST(GIO_LIBS) -AC_DEFINE_UNQUOTED(HAVE_GIO,$have_gio, [Whether GIO is available]) - # Checks for Gtk+2 -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=1, have_gtk=0) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10, have_gtk=1, have_gtk=0) if test "x${have_gtk}" = "xfalse" ; then AC_MSG_ERROR([No Gtk+2 package information found]) fi diff --git a/midori/Makefile.am b/midori/Makefile.am index 6219a8ea..b92bf83e 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -2,9 +2,8 @@ INCLUDES = \ $(UNIQUE_CFLAGS) \ - $(GIO_CFLAGS) \ + $(SQLITE3_CFLAGS) \ $(GTK_CFLAGS) \ - $(GTKSOURCEVIEW_CFLAGS) \ $(WEBKIT_CFLAGS) \ -I../katze @@ -12,9 +11,8 @@ AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" LDADD = \ $(UNIQUE_LIBS) \ - $(GIO_LIBS) \ + $(SQLITE3_LIBS) \ $(GTK_LIBS) \ - $(GTKSOURCEVIEW_LIBS)\ $(WEBKIT_LIBS) \ $(INTLLIBS) \ ../katze/libkatze.la diff --git a/midori/compat.c b/midori/compat.c index cd6243d5..e51fc095 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -31,7 +31,7 @@ g_strcmp0 (const gchar* string1, #if !GTK_CHECK_VERSION(2, 14, 0) -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) /* GTK+/ GdkPixbuf internal helper function Copyright (C) 2008 Matthias Clasen diff --git a/midori/compat.h b/midori/compat.h index 49cb3e60..423b2236 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -16,14 +16,15 @@ #include #endif -#if HAVE_GIO +#include +#if GLIB_CHECK_VERSION (2, 16, 0) #include #endif #include G_BEGIN_DECLS -#if !GLIB_CHECK_VERSION(2, 16, 0) +#if !GLIB_CHECK_VERSION (2, 16, 0) gint g_strcmp0 (const gchar* string1, @@ -31,9 +32,9 @@ g_strcmp0 (const gchar* string1, #endif -#if !GTK_CHECK_VERSION(2, 14, 0) +#if !GTK_CHECK_VERSION (2, 14, 0) -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) GdkPixbuf* gdk_pixbuf_new_from_stream (GInputStream* stream, diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 33d4308f..6faa9845 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -61,7 +61,7 @@ typedef struct GdkCursorType cursor_type; gboolean custom_cursor; GtkImageType storage_type; - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) GIcon *gicon; #endif gchar *icon_name; @@ -274,7 +274,7 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) NULL, GTK_PARAM_WRITABLE)); - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) g_object_class_install_property (gobject_class, PROP_GICON_PRIMARY, g_param_spec_object ("gicon-primary", @@ -433,7 +433,7 @@ gtk_icon_entry_set_property (GObject *object, g_value_get_string (value)); break; - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) case PROP_GICON_PRIMARY: gtk_icon_entry_set_icon_from_gicon (entry, GTK_ICON_ENTRY_PRIMARY, @@ -471,7 +471,7 @@ gtk_icon_entry_get_property (GObject *object, GTK_ICON_ENTRY_SECONDARY)); break; - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) case PROP_GICON_PRIMARY: g_value_set_object (value, gtk_icon_entry_get_gicon (entry, @@ -1104,7 +1104,7 @@ icon_theme_changed (GtkIconEntry *entry) gtk_icon_entry_set_icon_from_icon_name (entry, i, priv->icons[i].icon_name); } - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) { g_object_unref (priv->icons[i].pixbuf); @@ -1339,7 +1339,7 @@ gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, * appropriately. */ -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, @@ -1493,7 +1493,7 @@ gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, */ -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) GIcon * gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos) diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index c7fe063b..82015339 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -26,7 +26,7 @@ #endif #include -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) #include #endif #include @@ -86,14 +86,14 @@ void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, GtkIconEntryPosition icon_pos, const gchar *icon_name); -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, GIcon *icon); #endif GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos); -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos); #endif diff --git a/midori/main.c b/midori/main.c index df4478cc..fd4de3d0 100644 --- a/midori/main.c +++ b/midori/main.c @@ -84,13 +84,6 @@ stock_items_init (void) { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, - #if !GTK_CHECK_VERSION(2, 10, 0) - { GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, NULL }, - #endif - #if !GTK_CHECK_VERSION(2, 8, 0) - { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL }, - { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, - #endif }; GtkIconSource* icon_source; diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 8415215d..b41e5b0a 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -24,7 +24,7 @@ #include #include #include -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) #include #endif @@ -313,7 +313,7 @@ _addons_toggle_disable_button (MidoriAddons* addons, gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); } -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) static void midori_addons_directory_monitor_changed (GFileMonitor* monitor, GFile* child, @@ -398,7 +398,7 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, _addons_get_folder (addons)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - #if !HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) /* FIXME: Without GIO clicking this button is the only way to update the list */ midori_addons_update_elements (addons); @@ -890,7 +890,7 @@ midori_addons_new (GtkWidget* web_widget, MidoriAddonKind kind) { MidoriAddons* addons; - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) GSList* directories; GSList* list; GFile* directory; @@ -907,7 +907,7 @@ midori_addons_new (GtkWidget* web_widget, midori_addons_set_kind (addons, kind); midori_addons_update_elements (addons); - #if HAVE_GIO + #if GLIB_CHECK_VERSION (2, 16, 0) directories = _addons_get_directories (addons); list = directories; while (directories) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c37bfcd2..b6d0878e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -807,12 +807,10 @@ _midori_browser_add_tab (MidoriBrowser* browser, gtk_notebook_append_page (GTK_NOTEBOOK (browser->notebook), view, tab_label); - #if GTK_CHECK_VERSION(2, 10, 0) gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (browser->notebook), view, TRUE); gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (browser->notebook), view, TRUE); - #endif /* We want the tab to be removed if the widget is destroyed */ g_signal_connect (view, "destroy", diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 432a6bed..2f684631 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -70,7 +70,7 @@ midori_location_entry_class_init (MidoriLocationEntryClass* class) G_TYPE_INT); } -#define HAVE_ENTRY_PROGRESS GTK_CHECK_VERSION (2, 10, 0) +#define HAVE_ENTRY_PROGRESS 1 #ifdef HAVE_ENTRY_PROGRESS diff --git a/midori/midori-stock.h b/midori/midori-stock.h index caa467b7..6bcf3d21 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -47,14 +47,4 @@ #define STOCK_USER_TRASH "gnome-stock-trash" #define STOCK_WINDOW_NEW "stock_new-window" -/* For backwards compatibility */ - -#if !GTK_CHECK_VERSION(2, 10, 0) -#define GTK_STOCK_SELECT_ALL "gtk-select-all" -#endif -#if !GTK_CHECK_VERSION(2, 8, 0) -#define GTK_STOCK_FULLSCREEN "gtk-fullscreen" -#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen" -#endif - #endif /* !__MIDORI_STOCK_H__ */ diff --git a/midori/midori-view.c b/midori/midori-view.c index 2a978a08..f4b06382 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -641,7 +641,7 @@ gjs_value_links_foreach_cb (GjsValue* link, MidoriView* view) { const gchar* type; -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) const gchar* rel; GFile* icon_file; GIcon* icon; @@ -663,7 +663,7 @@ gjs_value_links_foreach_cb (GjsValue* link, ? gjs_value_get_attribute_string (link, "title") : NULL); } } -#if HAVE_GIO +#if GLIB_CHECK_VERSION (2, 16, 0) if (gjs_value_has_attribute (link, "rel")) { rel = gjs_value_get_attribute_string (link, "rel"); diff --git a/midori/wscript_build b/midori/wscript_build index a5ae6932..f5cfe69d 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.') -obj.uselib = 'UNIQUE LIBSOUP GIO GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index d683eb07..9178d9cd 100644 --- a/wscript +++ b/wscript @@ -102,20 +102,6 @@ def configure (conf): libsoup = 'no' conf.check_message_custom ('libsoup', 'support', libsoup) - if not Params.g_options.disable_gio: - conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) - gio = ['not available','yes'][conf.env['HAVE_GIO'] == 1] - else: - gio = 'no' - conf.check_message_custom ('GIO', 'support', gio) - - if gio == 'yes': - if platform.system () != 'Windows': - if not conf.find_program ('gvfs-open'): - print '\tNote: There doesn\'t seem to be GVfs installed.' - print '\t The HTTP backend of GVfs is recommended for' - print '\t viewing source code and loading favicons.' - if not Params.g_options.disable_sqlite: conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] @@ -125,7 +111,7 @@ def configure (conf): sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) - conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) + conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) @@ -160,8 +146,6 @@ def set_options (opt): help='Disables Unique support', dest='disable_unique') opt.add_option ('--disable-libsoup', action='store_true', default=False, help='Disables libsoup support', dest='disable_libsoup') - opt.add_option ('--disable-gio', action='store_true', default=False, - help='Disables GIO support', dest='disable_gio') opt.add_option ('--disable-sqlite', action='store_true', default=False, help='Disables sqlite support', dest='disable_sqlite') From 2fccaa1beaeab7c1eab39391957dfdd797943164 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Oct 2008 08:50:16 +0200 Subject: [PATCH 0401/2970] Add an Open external pages in Preference --- midori/midori-app.c | 31 +++++++++++++++++-- midori/midori-browser.c | 62 ++++++++++++++++++++++--------------- midori/midori-browser.h | 4 +++ midori/midori-preferences.c | 6 +++- midori/midori-websettings.c | 18 +++++++++++ 5 files changed, 93 insertions(+), 28 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 14e41a67..326dc1af 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -210,6 +210,8 @@ midori_browser_message_received_cb (UniqueApp* instance, UniqueResponse response; MidoriBrowser* browser; gchar** uris; + MidoriNewPage open_external_pages_in; + gboolean first; switch (command) { @@ -244,10 +246,35 @@ midori_browser_message_received_cb (UniqueApp* instance, response = UNIQUE_RESPONSE_FAIL; else { + g_object_get (app->settings, "open-external-pages-in", + &open_external_pages_in, NULL); + if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW) + { + browser = g_object_new (MIDORI_TYPE_BROWSER, + "settings", app->settings, + "bookmarks", app->bookmarks, + "trash", app->trash, + "search-engines", app->search_engines, + "history", app->history, + NULL); + midori_app_add_browser (app, browser); + gtk_window_set_screen (GTK_WINDOW (app->browser), + unique_message_data_get_screen (message)); + gtk_widget_show (GTK_WIDGET (browser)); + } + else + browser = app->browser; + first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); while (*uris) { - midori_browser_set_current_page (app->browser, - midori_browser_add_uri (app->browser, *uris)); + if (first) + { + midori_browser_set_current_uri (browser, *uris); + first = FALSE; + } + else + midori_browser_set_current_page (browser, + midori_browser_add_uri (browser, *uris)); uris++; } /* g_strfreev (uris); */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b6d0878e..e0ffcb4f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -154,17 +154,6 @@ _action_set_active (MidoriBrowser* browser, gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); } -static void -_midori_browser_open_uri (MidoriBrowser* browser, - const gchar* uri) -{ - GtkWidget* view; - - view = midori_browser_get_current_tab (browser); - if (view) - midori_view_set_uri (MIDORI_VIEW (view), uri); -} - static void _toggle_tabbar_smartly (MidoriBrowser* browser) { @@ -1169,7 +1158,7 @@ _action_open_activate (GtkAction* action, { uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); gchar* folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); g_free (last_dir); last_dir = folder; @@ -1472,7 +1461,7 @@ _action_history_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - _midori_browser_open_uri (browser, katze_item_get_uri (item)); + midori_browser_set_current_uri (browser, katze_item_get_uri (item)); } static void @@ -1494,7 +1483,7 @@ _action_bookmarks_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - _midori_browser_open_uri (browser, katze_item_get_uri (item)); + midori_browser_set_current_uri (browser, katze_item_get_uri (item)); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } @@ -1712,7 +1701,7 @@ _action_homepage_activate (GtkAction* action, gchar* homepage; g_object_get (browser->settings, "homepage", &homepage, NULL); - _midori_browser_open_uri (browser, homepage); + midori_browser_set_current_uri (browser, homepage); g_free (homepage); } @@ -1734,7 +1723,7 @@ _action_location_active_changed (GtkAction* action, if (index > -1) { uri = midori_location_action_get_uri (MIDORI_LOCATION_ACTION (action)); - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); } } @@ -1781,7 +1770,7 @@ _action_location_submit_uri (GtkAction* action, midori_browser_set_current_page (browser, n); } else - _midori_browser_open_uri (browser, new_uri); + midori_browser_set_current_uri (browser, new_uri); g_free (new_uri); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } @@ -1793,7 +1782,7 @@ midori_browser_menu_feed_item_activate_cb (GtkWidget* widget, const gchar* uri; uri = g_object_get_data (G_OBJECT (widget), "uri"); - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); } static void @@ -1889,7 +1878,7 @@ _action_search_submit (GtkAction* action, if (new_tab) midori_browser_add_uri (browser, search); else - _midori_browser_open_uri (browser, search); + midori_browser_set_current_uri (browser, search); g_free (search); g_free (location_entry_search); @@ -1941,7 +1930,7 @@ midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, gtk_tree_model_get (model, &iter, 0, &item, -1); uri = katze_item_get_uri (item); if (uri && *uri) - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); } } @@ -2053,7 +2042,7 @@ midori_panel_history_row_activated_cb (GtkTreeView* treeview, if (KATZE_IS_ITEM (item)) { uri = katze_item_get_uri (item); - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); } g_object_unref (item); } @@ -2308,7 +2297,7 @@ midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, KatzeItem* item; item = (KatzeItem*)g_object_get_data (G_OBJECT (widget), "KatzeItem"); - _midori_browser_open_uri (browser, katze_item_get_uri (item)); + midori_browser_set_current_uri (browser, katze_item_get_uri (item)); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } @@ -2657,7 +2646,7 @@ _action_bookmark_open_activate (GtkAction* action, gtk_tree_model_get (model, &iter, 0, &item, -1); uri = katze_item_get_uri (item); if (uri && *uri) - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); } } @@ -2743,7 +2732,7 @@ _action_history_open_activate (GtkAction* action, gtk_tree_model_get (model, &iter, 0, &item, -1); uri = katze_item_get_uri (item); if (uri && *uri) - _midori_browser_open_uri (browser, uri); + midori_browser_set_current_uri (browser, uri); g_object_unref (item); } } @@ -4142,7 +4131,7 @@ midori_browser_set_property (GObject* object, switch (prop_id) { case PROP_URI: - _midori_browser_open_uri (browser, g_value_get_string (value)); + midori_browser_set_current_uri (browser, g_value_get_string (value)); break; case PROP_TAB: midori_browser_set_current_tab (browser, g_value_get_object (value)); @@ -4387,6 +4376,29 @@ midori_browser_activate_action (MidoriBrowser* browser, g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name); } +/** + * midori_browser_set_current_uri: + * @browser: a #MidoriBrowser + * @uri: an URI + * + * Loads the specified URI in the current view. + * + * If the current view is opaque, and cannot load + * new pages, it will automatically open a new tab. + **/ +void +midori_browser_set_current_uri (MidoriBrowser* browser, + const gchar* uri) +{ + GtkWidget* view; + + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (uri); + + view = midori_browser_get_current_tab (browser); + midori_view_set_uri (MIDORI_VIEW (view), uri); +} + /** * midori_browser_get_current_uri: * @browser: a #MidoriBrowser diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 535c2295..b0d45835 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -93,6 +93,10 @@ void midori_browser_activate_action (MidoriBrowser* browser, const gchar* name); +void +midori_browser_set_current_uri (MidoriBrowser* browser, + const gchar* uri); + const gchar* midori_browser_get_current_uri (MidoriBrowser* browser); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index cce0284b..a117d4a1 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -83,7 +83,7 @@ midori_preferences_init (MidoriPreferences* preferences) preferences->notebook = NULL; - dialog_title = g_strdup_printf (_("%s Preferences"), + dialog_title = g_strdup_printf (_("Preferences for %s"), g_get_application_name ()); g_object_set (preferences, "icon-name", GTK_STOCK_PREFERENCES, @@ -419,6 +419,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (button, 0, 1, 3, 4); FRAME_NEW (_("Browsing")); TABLE_NEW (3, 2); + label = katze_property_label (settings, "open-external-pages-in"); + INDENTED_ADD (label, 0, 1, 0, 1); + button = katze_property_proxy (settings, "open-external-pages-in", NULL); + FILLED_ADD (button, 1, 2, 0, 1); /* label = katze_property_label (settings, "open-new-pages-in"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-new-pages-in", NULL); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 1ff3cb98..dc0b5a53 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -51,6 +51,7 @@ struct _MidoriWebSettings gboolean close_buttons_on_tabs; MidoriNewPage open_new_pages_in; + MidoriNewPage open_external_pages_in; gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; gboolean open_tabs_next_to_current; @@ -106,6 +107,7 @@ enum PROP_CLOSE_BUTTONS_ON_TABS, PROP_OPEN_NEW_PAGES_IN, + PROP_OPEN_EXTERNAL_PAGES_IN, PROP_MIDDLE_CLICK_OPENS_SELECTION, PROP_OPEN_TABS_IN_THE_BACKGROUND, PROP_OPEN_TABS_NEXT_TO_CURRENT, @@ -491,6 +493,16 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_NEW_PAGE_TAB, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, + PROP_OPEN_EXTERNAL_PAGES_IN, + g_param_spec_enum ( + "open-external-pages-in", + _("Open external pages in"), + _("Where to open externally opened pages"), + MIDORI_TYPE_NEW_PAGE, + MIDORI_NEW_PAGE_TAB, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_MIDDLE_CLICK_OPENS_SELECTION, g_param_spec_boolean ( @@ -770,6 +782,9 @@ midori_web_settings_set_property (GObject* object, case PROP_OPEN_NEW_PAGES_IN: web_settings->open_new_pages_in = g_value_get_enum (value); break; + case PROP_OPEN_EXTERNAL_PAGES_IN: + web_settings->open_external_pages_in = g_value_get_enum (value); + break; case PROP_MIDDLE_CLICK_OPENS_SELECTION: web_settings->middle_click_opens_selection = g_value_get_boolean (value); break; @@ -913,6 +928,9 @@ midori_web_settings_get_property (GObject* object, case PROP_OPEN_NEW_PAGES_IN: g_value_set_enum (value, web_settings->open_new_pages_in); break; + case PROP_OPEN_EXTERNAL_PAGES_IN: + g_value_set_enum (value, web_settings->open_external_pages_in); + break; case PROP_MIDDLE_CLICK_OPENS_SELECTION: g_value_set_boolean (value, web_settings->middle_click_opens_selection); break; From df12b9acb9a7b52e2e97338973d11369ee06cda3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Oct 2008 21:32:25 +0200 Subject: [PATCH 0402/2970] Implement View source with external Text editor --- midori/midori-browser.c | 108 +++++++++++++++++++++++++++++++++--- midori/midori-preferences.c | 16 +++++- midori/midori-websettings.c | 17 ++++++ 3 files changed, 131 insertions(+), 10 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e0ffcb4f..66936e7c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -35,6 +35,13 @@ #include #include #include +#ifdef HAVE_UNISTD_H + #include +#endif + +#if HAVE_LIBSOUP + #include +#endif struct _MidoriBrowser { @@ -72,6 +79,10 @@ struct _MidoriBrowser KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; + + #if HAVE_LIBSOUP + SoupSession* session; + #endif }; G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) @@ -1642,27 +1653,98 @@ _action_zoom_normal_activate (GtkAction* action, midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } +#if HAVE_LIBSOUP +static void +midori_browser_got_body_cb (SoupMessage* msg, + MidoriBrowser* browser) +{ + SoupURI* soup_uri; + gchar* uri; + gchar* filename; + gchar* unique_filename; + gchar* text_editor; + gint fd; + FILE* fp; + + if (msg->response_body->length > 0) + { + soup_uri = soup_message_get_uri (msg); + uri = soup_uri_to_string (soup_uri, FALSE); + filename = g_strdup_printf ("%uXXXXXX", g_str_hash (uri)); + g_free (uri); + if (((fd = g_file_open_tmp (filename, &unique_filename, NULL)) != -1)) + { + if ((fp = fdopen (fd, "w"))) + { + fwrite (msg->response_body->data, + 1, msg->response_body->length, fp); + fclose (fp); + g_object_get (browser->settings, + "text-editor", &text_editor, NULL); + sokoke_spawn_program (text_editor, unique_filename); + g_free (unique_filename); + g_free (text_editor); + } + close (fd); + } + g_free (filename); + } +} +#endif + static void _action_source_view_activate (GtkAction* action, MidoriBrowser* browser) { + gchar* text_editor; + const gchar* current_uri; + #if HAVE_LIBSOUP + SoupMessage* msg; + #endif GtkWidget* view; GtkWidget* source_view; + gchar* filename; gchar* uri; gint n; if (!(view = midori_browser_get_current_tab (browser))) return; - uri = g_strdup_printf ("view-source:%s", - midori_view_get_display_uri (MIDORI_VIEW (view))); - source_view = midori_view_new (); - midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); - midori_view_set_uri (MIDORI_VIEW (source_view), uri); - g_free (uri); - gtk_widget_show (source_view); - n = midori_browser_add_tab (browser, source_view); - midori_browser_set_current_page (browser, n); + g_object_get (browser->settings, "text-editor", &text_editor, NULL); + if (text_editor && *text_editor) + { + current_uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + #if HAVE_LIBSOUP + if (g_str_has_prefix (current_uri, "http://") || + g_str_has_prefix (current_uri, "https://")) + { + msg = soup_message_new ("GET", current_uri); + g_signal_connect (msg, "got-body", + G_CALLBACK (midori_browser_got_body_cb), browser); + soup_session_queue_message (browser->session, msg, NULL, NULL); + g_free (text_editor); + return; + } + #endif + if (g_str_has_prefix (current_uri, "file://")) + { + filename = g_filename_from_uri (current_uri, NULL, NULL); + sokoke_spawn_program (text_editor, filename); + } + } + else + { + uri = g_strdup_printf ("view-source:%s", + midori_view_get_display_uri (MIDORI_VIEW (view))); + source_view = midori_view_new (); + midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); + midori_view_set_uri (MIDORI_VIEW (source_view), uri); + g_free (uri); + gtk_widget_show (source_view); + n = midori_browser_add_tab (browser, source_view); + midori_browser_set_current_page (browser, n); + } + g_free (text_editor); } static void @@ -3258,6 +3340,10 @@ midori_browser_init (MidoriBrowser* browser) GtkRcStyle* rcstyle; GtkAction* action; + #if HAVE_LIBSOUP + browser->session = soup_session_async_new (); + #endif + browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); browser->bookmarks = NULL; @@ -3758,6 +3844,10 @@ midori_browser_finalize (GObject* object) if (browser->history) g_object_unref (browser->history); + #if HAVE_LIBSOUP + g_object_unref (browser->session); + #endif + G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index a117d4a1..97e815b0 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -336,7 +336,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (entry, 1, 2, 1, 2); /* TODO: We need something like "use current website" */ FRAME_NEW (_("Transfers")); - TABLE_NEW (1, 2); + TABLE_NEW (3, 2); label = katze_property_label (settings, "download-folder"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "download-folder", "folder"); @@ -355,6 +355,20 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_signal_connect (entry, "focus-out-event", G_CALLBACK (proxy_download_manager_icon_cb), button); FILLED_ADD (hbox, 1, 2, 1, 2); + label = katze_property_label (settings, "text-editor"); + INDENTED_ADD (label, 0, 1, 2, 3); + hbox = gtk_hbox_new (FALSE, 4); + button = gtk_image_new (); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + gtk_widget_set_size_request (button, icon_width, icon_height); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); + entry = katze_property_proxy (settings, "text-editor", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_download_manager_icon_cb), button); + FILLED_ADD (hbox, 1, 2, 2, 3); /* Page "Appearance" */ PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index dc0b5a53..ff3bb185 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -46,6 +46,7 @@ struct _MidoriWebSettings gchar* homepage; gchar* download_folder; gchar* download_manager; + gchar* text_editor; gchar* location_entry_search; MidoriPreferredEncoding preferred_encoding; @@ -102,6 +103,7 @@ enum PROP_HOMEPAGE, PROP_DOWNLOAD_FOLDER, PROP_DOWNLOAD_MANAGER, + PROP_TEXT_EDITOR, PROP_LOCATION_ENTRY_SEARCH, PROP_PREFERRED_ENCODING, @@ -454,6 +456,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) NULL, flags)); + g_object_class_install_property (gobject_class, + PROP_TEXT_EDITOR, + g_param_spec_string ( + "text-editor", + _("Text Editor"), + _("An external text editor"), + NULL, + flags)); + g_object_class_install_property (gobject_class, PROP_LOCATION_ENTRY_SEARCH, g_param_spec_string ( @@ -749,6 +760,9 @@ midori_web_settings_set_property (GObject* object, case PROP_DOWNLOAD_MANAGER: katze_assign (web_settings->download_manager, g_value_dup_string (value)); break; + case PROP_TEXT_EDITOR: + katze_assign (web_settings->text_editor, g_value_dup_string (value)); + break; case PROP_LOCATION_ENTRY_SEARCH: katze_assign (web_settings->location_entry_search, g_value_dup_string (value)); break; @@ -915,6 +929,9 @@ midori_web_settings_get_property (GObject* object, case PROP_DOWNLOAD_MANAGER: g_value_set_string (value, web_settings->download_manager); break; + case PROP_TEXT_EDITOR: + g_value_set_string (value, web_settings->text_editor); + break; case PROP_LOCATION_ENTRY_SEARCH: g_value_set_string (value, web_settings->location_entry_search); break; From 74a34277e0c3e2861344e2ef10e49b1457a210dd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Oct 2008 22:25:51 +0200 Subject: [PATCH 0403/2970] Add source view icons to the location --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 66936e7c..3fba755a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1739,6 +1739,7 @@ _action_source_view_activate (GtkAction* action, source_view = midori_view_new (); midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); midori_view_set_uri (MIDORI_VIEW (source_view), uri); + midori_view_notify_icon_cb (source_view, NULL, browser); g_free (uri); gtk_widget_show (source_view); n = midori_browser_add_tab (browser, source_view); From 01fc5594bd58dac49ed7264771551f9b7efec425 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 21 Oct 2008 22:52:30 +0200 Subject: [PATCH 0404/2970] Don't use the icon "page-holder", it doesn't exist --- midori/midori-stock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 6bcf3d21..601daa76 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -28,7 +28,7 @@ #define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" #define STOCK_NEWS_FEED "news-feed" -#define STOCK_PAGE_HOLDER "page-holder" +#define STOCK_PAGE_HOLDER GTK_STOCK_ORIENTATION_PORTRAIT #define STOCK_STYLE "gnome-settings-theme" #define STOCK_STYLES "gnome-settings-theme" #define STOCK_TRANSFER "package" From c9920a10b76cf434c85a88be86c0f8f2c9eca04d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 21 Oct 2008 22:53:06 +0200 Subject: [PATCH 0405/2970] Install the EXPAT license file --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 9178d9cd..895b2238 100644 --- a/wscript +++ b/wscript @@ -167,7 +167,7 @@ def build (bld): bld.add_subdirs ('katze midori icons') - install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING README') + install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING EXPAT README') if bld.env ()['RST2HTML']: # FIXME: Build only if needed From 839d692ec47565f30d24f4f79187aaad7d2d8e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 21 Oct 2008 22:59:57 +0200 Subject: [PATCH 0406/2970] Focus the location when remotely opening a new window --- midori/midori-app.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-app.c b/midori/midori-app.c index 326dc1af..2ce8d656 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -231,6 +231,7 @@ midori_browser_message_received_cb (UniqueApp* instance, NULL); /* FIXME: Should open the homepage according to settings */ midori_browser_add_uri (browser, ""); + midori_browser_activate_action (browser, "Location"); midori_app_add_browser (app, browser); gtk_window_set_screen (GTK_WINDOW (app->browser), unique_message_data_get_screen (message)); From ce66f54620949724db00b614051c738ace44ffc6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 21 Oct 2008 23:07:07 +0200 Subject: [PATCH 0407/2970] Suppress error when not building from git --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 895b2238..13e38328 100644 --- a/wscript +++ b/wscript @@ -13,7 +13,7 @@ VERSION = '0.1.0' try: git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], - stdout=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE) if not git.wait (): VERSION = (VERSION + '-' + git.stdout.read ()).strip () except: From 62d7a7d0b4c815be264e4c82f0b13df6e0614304 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Oct 2008 00:01:01 +0200 Subject: [PATCH 0408/2970] Add Compact sidepanel Preference --- midori/midori-browser.c | 13 +++-- midori/midori-panel.c | 16 ++++++ midori/midori-panel.h | 4 ++ midori/midori-preferences.c | 18 +++--- midori/midori-websettings.c | 106 +++++++++--------------------------- 5 files changed, 64 insertions(+), 93 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3fba755a..8bab0f91 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1739,7 +1739,7 @@ _action_source_view_activate (GtkAction* action, source_view = midori_view_new (); midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); midori_view_set_uri (MIDORI_VIEW (source_view), uri); - midori_view_notify_icon_cb (source_view, NULL, browser); + midori_view_notify_icon_cb (MIDORI_VIEW (source_view), NULL, browser); g_free (uri); gtk_widget_show (source_view); n = midori_browser_add_tab (browser, source_view); @@ -3809,11 +3809,6 @@ midori_browser_init (MidoriBrowser* browser) FALSE, FALSE, 3); g_object_unref (ui_manager); - - #ifndef WEBKIT_CHECK_VERSION - _action_set_sensitive (browser, "ZoomIn", FALSE); - _action_set_sensitive (browser, "ZoomOut", FALSE); - #endif } static void @@ -3942,6 +3937,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) { gboolean remember_last_window_size; gint last_window_width, last_window_height; + gboolean compact_sidepanel; gint last_panel_position, last_panel_page; gboolean show_menubar, show_navigationbar, show_bookmarkbar; gboolean show_panel, show_statusbar; @@ -3958,6 +3954,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "remember-last-window-size", &remember_last_window_size, "last-window-width", &last_window_width, "last-window-height", &last_window_height, + "compact-sidepanel", &compact_sidepanel, "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, "show-menubar", &show_menubar, @@ -3999,6 +3996,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_by_name (browser, "Search")), item); } + midori_panel_set_compact (MIDORI_PANEL (browser->panel), compact_sidepanel); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); @@ -4031,6 +4029,9 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value)); else if (name == g_intern_string ("toolbar-items")) _midori_browser_set_toolbar_items (browser, g_value_get_string (&value)); + else if (name == g_intern_string ("compact-sidepanel")) + midori_panel_set_compact (MIDORI_PANEL (browser->panel), + g_value_get_boolean (&value)); else if (name == g_intern_string ("always-show-tabbar")) _toggle_tabbar_smartly (browser); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 14cc5a2a..e2413e87 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -311,6 +311,22 @@ midori_panel_new (void) return GTK_WIDGET (panel); } +/** + * midori_panel_set_compact: + * @compact: %TRUE if the panel should be compact + * + * Determines if the panel should be compact. + **/ +void +midori_panel_set_compact (MidoriPanel* panel, + gboolean compact) +{ + g_return_if_fail (MIDORI_IS_PANEL (panel)); + + gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), + compact ? GTK_TOOLBAR_ICONS : GTK_TOOLBAR_BOTH); +} + static void midori_panel_menu_item_activate_cb (GtkWidget* widget, MidoriPanel* panel) diff --git a/midori/midori-panel.h b/midori/midori-panel.h index 806620a7..bdea460e 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -53,6 +53,10 @@ midori_panel_get_type (void); GtkWidget* midori_panel_new (void); +void +midori_panel_set_compact (MidoriPanel* panel, + gboolean compact); + gint midori_panel_append_page (MidoriPanel* panel, GtkWidget* child, diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 97e815b0..0fd7263e 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -415,7 +415,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); FRAME_NEW (_("Navigationbar")); - TABLE_NEW (4, 2); + TABLE_NEW (3, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); @@ -429,10 +429,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, "ReloadStop, ZoomIn, ZoomOut, Back, Forward, Homepage, Search, Trash" ""); FILLED_ADD (button, 0, 2, 2, 3); - button = katze_property_proxy (settings, "always-show-tabbar", NULL); - INDENTED_ADD (button, 0, 1, 3, 4); FRAME_NEW (_("Browsing")); - TABLE_NEW (3, 2); + TABLE_NEW (4, 2); label = katze_property_label (settings, "open-external-pages-in"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-external-pages-in", NULL); @@ -441,16 +439,20 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-new-pages-in", NULL); FILLED_ADD (button, 1, 2, 0, 1); */ - button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); + button = katze_property_proxy (settings, "always-show-tabbar", NULL); INDENTED_ADD (button, 0, 1, 1, 2); + button = katze_property_proxy (settings, "compact-sidepanel", NULL); + INDENTED_ADD (button, 1, 2, 1, 2); + button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); + INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); - WIDGET_ADD (button, 1, 2, 1, 2); + WIDGET_ADD (button, 1, 2, 2, 3); /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); SPANNED_ADD (button, 0, 1, 2, 3);*/ button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); - WIDGET_ADD (button, 0, 1, 2, 3); + WIDGET_ADD (button, 0, 1, 3, 4); button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); - WIDGET_ADD (button, 1, 2, 2, 3); + WIDGET_ADD (button, 1, 2, 3, 4); /* Page "Network" */ /*PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index ff3bb185..19ea94c3 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -36,11 +36,7 @@ struct _MidoriWebSettings MidoriToolbarStyle toolbar_style; gchar* toolbar_items; - gboolean always_show_tabbar; - gboolean show_new_tab; - gboolean show_homepage; - gboolean show_web_search; - gboolean show_trash; + gboolean compact_sidepanel; MidoriStartup load_on_startup; gchar* homepage; @@ -50,6 +46,7 @@ struct _MidoriWebSettings gchar* location_entry_search; MidoriPreferredEncoding preferred_encoding; + gboolean always_show_tabbar; gboolean close_buttons_on_tabs; MidoriNewPage open_new_pages_in; MidoriNewPage open_external_pages_in; @@ -93,11 +90,7 @@ enum PROP_TOOLBAR_STYLE, PROP_TOOLBAR_ITEMS, - PROP_ALWAYS_SHOW_TABBAR, - PROP_SHOW_NEW_TAB, - PROP_SHOW_HOMEPAGE, - PROP_SHOW_WEB_SEARCH, - PROP_SHOW_TRASH, + PROP_COMPACT_SIDEPANEL, PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, @@ -107,6 +100,7 @@ enum PROP_LOCATION_ENTRY_SEARCH, PROP_PREFERRED_ENCODING, + PROP_ALWAYS_SHOW_TABBAR, PROP_CLOSE_BUTTONS_ON_TABS, PROP_OPEN_NEW_PAGES_IN, PROP_OPEN_EXTERNAL_PAGES_IN, @@ -373,51 +367,14 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); g_object_class_install_property (gobject_class, - PROP_ALWAYS_SHOW_TABBAR, + PROP_COMPACT_SIDEPANEL, g_param_spec_boolean ( - "always-show-tabbar", - _("Always Show Tabbar"), - _("Always show the tabbar"), + "compact-sidepanel", + _("Compact Sidepanel"), + _("Whether to make the sidepanel compact"), FALSE, flags)); - g_object_class_install_property (gobject_class, - PROP_SHOW_NEW_TAB, - g_param_spec_boolean ( - "show-new-tab", - _("Show New Tab"), - _("Show the New Tab button in the toolbar"), - TRUE, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SHOW_HOMEPAGE, - g_param_spec_boolean ( - "show-homepage", - _("Show Homepage"), - _("Show the Homepage button in the toolbar"), - TRUE, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SHOW_WEB_SEARCH, - g_param_spec_boolean ( - "show-web-search", - _("Show Web search"), - _("Show the Web search entry in the toolbar"), - TRUE, - flags)); - - g_object_class_install_property (gobject_class, - PROP_SHOW_TRASH, - g_param_spec_boolean ( - "show-trash", - _("Show Trash"), - _("Show the Trash button in the toolbar"), - TRUE, - flags)); - - g_object_class_install_property (gobject_class, PROP_LOAD_ON_STARTUP, @@ -485,6 +442,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); + g_object_class_install_property (gobject_class, + PROP_ALWAYS_SHOW_TABBAR, + g_param_spec_boolean ( + "always-show-tabbar", + _("Always Show Tabbar"), + _("Always show the tabbar"), + FALSE, + flags)); + g_object_class_install_property (gobject_class, PROP_CLOSE_BUTTONS_ON_TABS, g_param_spec_boolean ( @@ -732,20 +698,8 @@ midori_web_settings_set_property (GObject* object, case PROP_TOOLBAR_ITEMS: katze_assign (web_settings->toolbar_items, g_value_dup_string (value)); break; - case PROP_ALWAYS_SHOW_TABBAR: - web_settings->always_show_tabbar = g_value_get_boolean (value); - break; - case PROP_SHOW_NEW_TAB: - web_settings->show_new_tab = g_value_get_boolean (value); - break; - case PROP_SHOW_HOMEPAGE: - web_settings->show_homepage = g_value_get_boolean (value); - break; - case PROP_SHOW_WEB_SEARCH: - web_settings->show_web_search = g_value_get_boolean (value); - break; - case PROP_SHOW_TRASH: - web_settings->show_trash = g_value_get_boolean (value); + case PROP_COMPACT_SIDEPANEL: + web_settings->compact_sidepanel = g_value_get_boolean (value); break; case PROP_LOAD_ON_STARTUP: @@ -790,6 +744,9 @@ midori_web_settings_set_property (GObject* object, } break; + case PROP_ALWAYS_SHOW_TABBAR: + web_settings->always_show_tabbar = g_value_get_boolean (value); + break; case PROP_CLOSE_BUTTONS_ON_TABS: web_settings->close_buttons_on_tabs = g_value_get_boolean (value); break; @@ -901,20 +858,8 @@ midori_web_settings_get_property (GObject* object, case PROP_TOOLBAR_ITEMS: g_value_set_string (value, web_settings->toolbar_items); break; - case PROP_ALWAYS_SHOW_TABBAR: - g_value_set_boolean (value, web_settings->always_show_tabbar); - break; - case PROP_SHOW_NEW_TAB: - g_value_set_boolean (value, web_settings->show_new_tab); - break; - case PROP_SHOW_HOMEPAGE: - g_value_set_boolean (value, web_settings->show_homepage); - break; - case PROP_SHOW_WEB_SEARCH: - g_value_set_boolean (value, web_settings->show_web_search); - break; - case PROP_SHOW_TRASH: - g_value_set_boolean (value, web_settings->show_trash); + case PROP_COMPACT_SIDEPANEL: + g_value_set_boolean (value, web_settings->compact_sidepanel); break; case PROP_LOAD_ON_STARTUP: @@ -939,6 +884,9 @@ midori_web_settings_get_property (GObject* object, g_value_set_enum (value, web_settings->preferred_encoding); break; + case PROP_ALWAYS_SHOW_TABBAR: + g_value_set_boolean (value, web_settings->always_show_tabbar); + break; case PROP_CLOSE_BUTTONS_ON_TABS: g_value_set_boolean (value, web_settings->close_buttons_on_tabs); break; From 2c90d97a7b3acf93428a9229ffd41b566645b2b3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Oct 2008 00:05:04 +0200 Subject: [PATCH 0409/2970] Use Yes and No without labels in Addon toolbars --- midori/midori-addons.c | 2 -- midori/midori-stock.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index b41e5b0a..38a6e9fa 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -1040,7 +1040,6 @@ midori_addons_get_toolbar (MidoriAddons* addons) /* enable button */ toolitem = gtk_tool_button_new_from_stock (STOCK_ENABLE); - gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_status_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); @@ -1049,7 +1048,6 @@ midori_addons_get_toolbar (MidoriAddons* addons) /* disable button */ toolitem = gtk_tool_button_new_from_stock (STOCK_DISABLE); - gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_status_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 601daa76..b82c6fcb 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -22,8 +22,8 @@ #define STOCK_BOOKMARK "stock_bookmark" #define STOCK_BOOKMARKS "vcard" #define STOCK_CONSOLE "terminal" -#define STOCK_DISABLE "list-remove" -#define STOCK_ENABLE "list-add" +#define STOCK_DISABLE GTK_STOCK_NO +#define STOCK_ENABLE GTK_STOCK_YES #define STOCK_EXTENSION "extension" #define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" From 9ba3f59ff7926ffaddc5084cb1c31d54c18e9422 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Oct 2008 00:26:20 +0200 Subject: [PATCH 0410/2970] Show progress in location independant of statusbar visibility --- midori/midori-browser.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8bab0f91..e71fe5ac 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -252,10 +252,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) "tooltip", _("Reload the current page"), "sensitive", can_reload, NULL); gtk_widget_hide (browser->progressbar); - if (!GTK_WIDGET_VISIBLE (browser->statusbar)) - if (!sokoke_object_get_boolean (browser->settings, - "show-navigationbar")) - gtk_widget_hide (browser->navigationbar); + if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar") + && !sokoke_object_get_boolean (browser->settings, "show-statusbar")) + gtk_widget_hide (browser->navigationbar); } else { @@ -264,13 +263,11 @@ _midori_browser_update_interface (MidoriBrowser* browser) "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); gtk_widget_show (browser->progressbar); - if (!GTK_WIDGET_VISIBLE (browser->statusbar)) - { - if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) - gtk_widget_show (browser->navigationbar); - g_object_set (_action_by_name (browser, "Location"), "progress", - midori_view_get_progress (MIDORI_VIEW (view)), NULL); - } + if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->navigationbar); + action = _action_by_name (browser, "Location"); + midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), + midori_view_get_progress (MIDORI_VIEW (view))); } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); @@ -325,8 +322,7 @@ _midori_browser_update_progress (MidoriBrowser* browser, gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), message); g_free (message); - if (!GTK_WIDGET_VISIBLE (browser->statusbar)) - midori_location_action_set_progress (action, progress); + midori_location_action_set_progress (action, progress); } else { @@ -1594,9 +1590,6 @@ _action_statusbar_activate (GtkToggleAction* action, gboolean active = gtk_toggle_action_get_active (action); g_object_set (browser->settings, "show-statusbar", active, NULL); sokoke_widget_set_visible (browser->statusbar, active); - if (active) - g_object_set (_action_by_name (browser, "Location"), - "progress", 0.0, NULL); } static void @@ -1792,7 +1785,7 @@ static void _action_location_activate (GtkAction* action, MidoriBrowser* browser) { - if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) + if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_show (browser->navigationbar); } @@ -1814,8 +1807,7 @@ static void _action_location_focus_out (GtkAction* action, MidoriBrowser* browser) { - if (GTK_WIDGET_VISIBLE (browser->statusbar) && - !sokoke_object_get_boolean (browser->settings, "show-navigationbar")) + if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_hide (browser->navigationbar); } From bd111d485c6a8e4d12df124d6e4a218505ea42e4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Oct 2008 00:28:49 +0200 Subject: [PATCH 0411/2970] Show all of Toolsbars in the toolbar context menu --- midori/midori-browser.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e71fe5ac..abc6a8fc 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1422,6 +1422,14 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* toolbar, _action_by_name (browser, "Bookmarkbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "Transferbar")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + menuitem = sokoke_action_create_popup_menu_item ( + _action_by_name (browser, "Statusbar")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); katze_widget_popup (toolbar, GTK_MENU (menu), NULL, button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR); From 53c5bd3c9c3ba975d262d301db2a1df0945bb6e4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Oct 2008 00:46:53 +0200 Subject: [PATCH 0412/2970] Use fallback stock icon if there is no throbber animation --- katze/katze-throbber.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 35396fe5..9977984a 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -840,19 +840,27 @@ katze_throbber_expose_event (GtkWidget* widget, if (!throbber->pixbuf) { - g_warning (_("Icon '%s' couldn't be loaded"), throbber->icon_name); - katze_assign (throbber->icon_name, NULL); + /* Fallback to a stock icon */ + katze_assign (throbber->icon_name, g_strdup (GTK_STOCK_EXECUTE)); g_object_notify (G_OBJECT (throbber), "icon-name"); return TRUE; } } - if (G_UNLIKELY (!throbber->pixbuf)) - return TRUE; - gint cols = gdk_pixbuf_get_width (throbber->pixbuf) / throbber->width; gint rows = gdk_pixbuf_get_height (throbber->pixbuf) / throbber->height; + if (G_UNLIKELY (cols == 1 && cols == rows)) + { + gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf, + 0, 0, + widget->allocation.x, + widget->allocation.y, + throbber->width, throbber->height, + GDK_RGB_DITHER_NONE, 0, 0); + return TRUE; + } + if (G_LIKELY (cols > 0 && rows > 0)) { gint index = throbber->index % (cols * rows); From 5c69e0269dc591fbecf948481982ddea2fd57a55 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Oct 2008 00:09:12 +0200 Subject: [PATCH 0413/2970] Implement KatzeNet as a generic URI loader KatzeNet can from now on be used where URIs are handled and one would have used libSoup and/ or local file handling as appropriate, whereas KatzeNet does both. Since we are displaying icons in several places KatzeNet also provides an icon loader that saves us from doublicating even more code. All bookmarks and also history items have icons now, since KatzeNet makes that incredibly easy. Search engines are also using favicons now, and right now custom icons don't work, we still need to fix that. Note that only icons are cached, nothing else and the code is known to have a hidden, hard to reproduce crasher which may appear when an icon is newly loaded. --- katze/Makefile.am | 3 +- katze/katze-arrayaction.c | 27 +- katze/katze-net.c | 511 +++++++++++++++++++++++++++++++++++ katze/katze-net.h | 86 ++++++ katze/katze-utils.c | 53 ++++ katze/katze-utils.h | 6 + katze/katze.h | 1 + katze/wscript_build | 2 +- midori/midori-browser.c | 122 ++++----- midori/midori-searchaction.c | 66 +++-- midori/midori-source.c | 96 ++----- midori/midori-view.c | 151 +---------- 12 files changed, 804 insertions(+), 320 deletions(-) create mode 100644 katze/katze-net.c create mode 100644 katze/katze-net.h diff --git a/katze/Makefile.am b/katze/Makefile.am index a6b17545..7729d067 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -19,4 +19,5 @@ libkatze_la_SOURCES = \ katze-item.c katze-item.h \ katze-list.c katze-list.h \ katze-array.c katze-array.h \ - katze-arrayaction.c katze-arrayaction.h + katze-arrayaction.c katze-arrayaction.h \ + katze-net.c katze-net.h diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 2dfebb53..f0287362 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -11,6 +11,7 @@ #include "katze-arrayaction.h" +#include "katze-net.h" #include "katze-utils.h" #include @@ -21,6 +22,7 @@ struct _KatzeArrayAction GtkAction parent_instance; KatzeArray* array; + KatzeNet* net; }; struct _KatzeArrayActionClass @@ -130,6 +132,7 @@ static void katze_array_action_init (KatzeArrayAction* array_action) { array_action->array = NULL; + array_action->net = katze_net_new (); } static void @@ -137,8 +140,8 @@ katze_array_action_finalize (GObject* object) { KatzeArrayAction* array_action = KATZE_ARRAY_ACTION (object); - if (array_action->array) - g_object_unref (array_action->array); + katze_object_assign (array_action->array, NULL); + katze_object_assign (array_action->net, NULL); G_OBJECT_CLASS (katze_array_action_parent_class)->finalize (object); } @@ -209,6 +212,15 @@ katze_array_action_menu_item_activate_cb (GtkWidget* proxy, g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); } +static void +katze_array_action_icon_cb (GdkPixbuf* icon, + GtkWidget* menuitem) +{ + GtkWidget* image = gtk_image_new_from_pixbuf (icon); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + g_object_unref (menuitem); +} + static void katze_array_action_menu_item_select_cb (GtkWidget* proxy, KatzeArrayAction* array_action) @@ -242,9 +254,14 @@ katze_array_action_menu_item_select_cb (GtkWidget* proxy, } menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - pixbuf = gtk_widget_render_icon (menuitem, - KATZE_IS_ARRAY (item) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); + if (KATZE_IS_ARRAY (item)) + pixbuf = gtk_widget_render_icon (menuitem, + GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + else + pixbuf = katze_net_load_icon (array_action->net, + katze_item_get_uri (item), + (KatzeNetIconCb)katze_array_action_icon_cb, + proxy, g_object_ref (menuitem)); icon = gtk_image_new_from_pixbuf (pixbuf); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); g_object_unref (pixbuf); diff --git a/katze/katze-net.c b/katze/katze-net.c new file mode 100644 index 00000000..fdbf938a --- /dev/null +++ b/katze/katze-net.c @@ -0,0 +1,511 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "katze-net.h" + +#if HAVE_LIBSOUP + #include +#endif + +struct _KatzeNet +{ + GObject parent_instance; + + gchar* cache_path; + guint cache_size; + + #if HAVE_LIBSOUP + SoupSession* session; + #endif +}; + +struct _KatzeNetClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE (KatzeNet, katze_net, G_TYPE_OBJECT) + +static void +katze_net_finalize (GObject* object); + +static void +katze_net_class_init (KatzeNetClass* class) +{ + GObjectClass* gobject_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_net_finalize; +} + +static void +katze_net_init (KatzeNet* net) +{ + net->cache_path = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, NULL); + + #if HAVE_LIBSOUP + net->session = soup_session_async_new (); + #endif +} + +static void +katze_net_finalize (GObject* object) +{ + KatzeNet* net = KATZE_NET (object); + + katze_assign (net->cache_path, NULL); + + G_OBJECT_CLASS (katze_net_parent_class)->finalize (object); +} + +/** + * katze_net_new: + * + * Instantiates a new #KatzeNet singleton. + * + * Subsequent calls will ref the initial instance. + * + * Return value: a new #KatzeNet + **/ +KatzeNet* +katze_net_new (void) +{ + KatzeNet* net = g_object_new (KATZE_TYPE_NET, + NULL); + + return net; +} + +typedef struct +{ + KatzeNet* net; + KatzeNetStatusCb status_cb; + KatzeNetTransferCb transfer_cb; + gpointer user_data; + KatzeNetRequest* request; +} KatzeNetPriv; + +static void +katze_net_priv_free (KatzeNetPriv* priv) +{ + KatzeNetRequest* request; + + request = priv->request; + + g_free (request->uri); + g_free (request->mime_type); + g_free (request->data); + + g_free (request); + g_free (priv); +} + +static gchar* +katze_net_get_cached_path (KatzeNet* net, + const gchar* uri, + const gchar* subfolder) +{ + gchar* cache_path; + gchar* checksum; + gchar* extension; + gchar* cached_filename; + gchar* cached_path; + + if (subfolder) + cache_path = g_build_filename (net->cache_path, subfolder, NULL); + else + cache_path = net->cache_path; + g_mkdir_with_parents (cache_path, 0755); + #if GLIB_CHECK_VERSION (2, 16, 0) + checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + #else + checksum = g_strdup_printf ("%u", g_str_hash (uri)); + #endif + + extension = g_strrstr (uri, "."); + cached_filename = g_strdup_printf ("%s%s%s", checksum, + extension ? "." : "", extension ? extension : ""); + g_free (checksum); + cached_path = g_build_filename (cache_path, cached_filename, NULL); + g_free (cached_filename); + if (subfolder) + g_free (cache_path); + return cached_path; +} + +#if HAVE_LIBSOUP +static void +katze_net_got_headers_cb (SoupMessage* msg, + KatzeNetPriv* priv) +{ + KatzeNetRequest* request; + + request = priv->request; + + switch (msg->status_code) + { + case 200: + request->status = KATZE_NET_VERIFIED; + break; + case 301: + request->status = KATZE_NET_MOVED; + break; + default: + request->status = KATZE_NET_NOT_FOUND; + } + + if (!priv->status_cb (request, priv->user_data)) + soup_session_cancel_message (priv->net->session, msg, msg->status_code); +} + +static void +katze_net_got_body_cb (SoupMessage* msg, + KatzeNetPriv* priv) +{ + KatzeNetRequest* request; + #if 0 + gchar* filename; + FILE* fp; + #endif + + request = priv->request; + + if (msg->response_body->length > 0) + { + #if 0 + /* FIXME: Caching */ + filename = katze_net_get_cached_path (net, request->uri, NULL); + if ((fp = fopen (filename, "wb"))) + { + fwrite (msg->response_body->data, + 1, msg->response_body->length, fp); + fclose (fp); + } + g_free (filename); + #endif + request->data = g_memdup (msg->response_body->data, + msg->response_body->length); + request->length = msg->response_body->length; + } + + priv->transfer_cb (request, priv->user_data); + katze_net_priv_free (priv); +} +#endif + +gboolean +katze_net_local_cb (KatzeNetPriv* priv) +{ + KatzeNetRequest* request; + gchar* filename; + gchar* contents; + gsize length; + + request = priv->request; + filename = g_filename_from_uri (request->uri, NULL, NULL); + + if (!filename || !g_file_test (filename, G_FILE_TEST_EXISTS)) + { + request->status = KATZE_NET_NOT_FOUND; + if (priv->status_cb) + priv->status_cb (request, priv->user_data); + katze_net_priv_free (priv); + return FALSE; + } + request->status = KATZE_NET_VERIFIED; + if (priv->status_cb && !priv->status_cb (request, priv->user_data)) + { + katze_net_priv_free (priv); + return FALSE; + } + + if (!priv->transfer_cb) + { + katze_net_priv_free (priv); + return FALSE; + } + + contents = NULL; + if (!g_file_get_contents (filename, &contents, &length, NULL)) + { + request->status = KATZE_NET_FAILED; + priv->transfer_cb (request, priv->user_data); + katze_net_priv_free (priv); + return FALSE; + } + + request->status = KATZE_NET_DONE; + request->data = contents; + request->length = length; + priv->transfer_cb (request, priv->user_data); + katze_net_priv_free (priv); + return FALSE; +} + +gboolean +katze_net_default_cb (KatzeNetPriv* priv) +{ + KatzeNetRequest* request; + + request = priv->request; + request->status = KATZE_NET_NOT_FOUND; + if (priv->status_cb) + priv->status_cb (request, priv->user_data); + katze_net_priv_free (priv); + return FALSE; +} + +/** + * katze_net_load_uri: + * @net: a #KatzeNet + * @uri: an URI string + * @status_cb: function to call for status information + * @transfer_cb: function to call upon transfer + * @user_data: data to pass to the callback + * + * Requests a transfer of @uri. + * + * @status_cb will be called when the status of @uri + * is verified. The specified callback may be called + * multiple times unless cancelled. + * + * @transfer_cb will be called when the data @uri is + * pointing to was transferred. Note that even a failed + * transfer may transfer data. + * + * @status_cb will always to be called at least once. + **/ +void +katze_net_load_uri (KatzeNet* net, + const gchar* uri, + KatzeNetStatusCb status_cb, + KatzeNetTransferCb transfer_cb, + gpointer user_data) +{ + KatzeNetRequest* request; + KatzeNetPriv* priv; + #if HAVE_LIBSOUP + SoupMessage* msg; + #endif + + g_return_if_fail (KATZE_IS_NET (net)); + g_return_if_fail (uri != NULL); + + if (!status_cb && !transfer_cb) + return; + + request = g_new0 (KatzeNetRequest, 1); + request->uri = g_strdup (uri); + request->mime_type = NULL; + request->data = NULL; + + priv = g_new0 (KatzeNetPriv, 1); + priv->net = net; + priv->status_cb = status_cb; + priv->transfer_cb = transfer_cb; + priv->user_data = user_data; + priv->request = request; + + #if HAVE_LIBSOUP + if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) + { + msg = soup_message_new ("GET", uri); + if (status_cb) + g_signal_connect (msg, "got-headers", + G_CALLBACK (katze_net_got_headers_cb), priv); + if (transfer_cb) + g_signal_connect (msg, "got-body", + G_CALLBACK (katze_net_got_body_cb), priv); + soup_session_queue_message (net->session, msg, NULL, NULL); + return; + } + #endif + + if (g_str_has_prefix (uri, "file://")) + { + g_idle_add ((GSourceFunc)katze_net_local_cb, priv); + return; + } + + g_idle_add ((GSourceFunc)katze_net_default_cb, priv); +} + +typedef struct +{ + KatzeNet* net; + gchar* icon_file; + KatzeNetIconCb icon_cb; + GtkWidget* widget; + gpointer user_data; +} KatzeNetIconPriv; + +static void +katze_net_icon_priv_free (KatzeNetIconPriv* priv) +{ + g_free (priv->icon_file); + g_object_unref (priv->widget); + g_free (priv); +} + +static gboolean +katze_net_icon_status_cb (KatzeNetRequest* request, + KatzeNetIconPriv* priv) +{ + switch (request->status) + { + case KATZE_NET_VERIFIED: + if (request->mime_type && + !g_str_has_prefix (request->mime_type, "image/")) + { + katze_net_icon_priv_free (priv); + return FALSE; + } + break; + case KATZE_NET_MOVED: + break; + default: + katze_net_icon_priv_free (priv); + return FALSE; + } + + return TRUE; +} + +static void +katze_net_icon_transfer_cb (KatzeNetRequest* request, + KatzeNetIconPriv* priv) +{ + GdkPixbuf* pixbuf; + FILE* fp; + GdkPixbuf* pixbuf_scaled; + gint icon_width, icon_height; + + pixbuf = NULL; + if (request->data) + { + if ((fp = fopen (priv->icon_file, "wb"))) + { + fwrite (request->data, 1, request->length, fp); + fclose (fp); + pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); + } + else if (priv->icon_cb) + pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data, + request->length, request->mime_type, NULL); + } + + if (!priv->icon_cb) + { + katze_net_icon_priv_free (priv); + return; + } + + if (!pixbuf) + pixbuf = gtk_widget_render_icon (priv->widget, + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + + priv->icon_cb (pixbuf_scaled, priv->user_data); + katze_net_icon_priv_free (priv); +} + +/** + * katze_net_load_icon: + * @net: a #KatzeNet + * @uri: an URI string, or %NULL + * @icon_cb: function to call upon completion + * @widget: a related #GtkWidget + * @user_data: data to pass to the callback + * + * Requests a transfer of an icon for @uri. This is + * implemented by looking for a favicon.ico, an + * image according to the file type or even a + * generated icon. The provided icon is intended + * for user interfaces and not guaranteed to be + * the same over multiple requests, plus it may + * be scaled to fit the menu icon size. + * + * The @widget is needed for theming information. + * + * The caller is expected to use the returned icon + * and update it if @icon_cb is called. + * + * Depending on whether the icon was previously + * cached or @uri is a local resource, the returned + * icon may already be the final one. + **/ +GdkPixbuf* +katze_net_load_icon (KatzeNet* net, + const gchar* uri, + KatzeNetIconCb icon_cb, + GtkWidget* widget, + gpointer user_data) +{ + guint i; + KatzeNetIconPriv* priv; + gchar* icon_uri; + gchar* icon_file; + GdkPixbuf* pixbuf; + gint icon_width, icon_height; + GdkPixbuf* pixbuf_scaled; + + g_return_val_if_fail (KATZE_IS_NET (net), NULL); + + pixbuf = NULL; + if (uri && g_str_has_prefix (uri, "http://")) + { + i = 8; + while (uri[i] != '\0' && uri[i] != '/') + i++; + if (uri[i] == '/') + { + icon_uri = g_strdup (uri); + icon_uri[i] = '\0'; + icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri); + icon_file = katze_net_get_cached_path (net, icon_uri, "icons"); + + if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) + pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); + else + { + priv = g_new0 (KatzeNetIconPriv, 1); + priv->net = net; + priv->icon_file = icon_file; + priv->icon_cb = icon_cb; + priv->widget = g_object_ref (widget); + priv->user_data = user_data; + + katze_net_load_uri (net, icon_uri, + (KatzeNetStatusCb)katze_net_icon_status_cb, + (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv); + } + g_free (icon_uri); + } + } + + if (!pixbuf) + pixbuf = gtk_widget_render_icon (widget, + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + + return pixbuf_scaled; +} diff --git a/katze/katze-net.h b/katze/katze-net.h new file mode 100644 index 00000000..2b6f78c8 --- /dev/null +++ b/katze/katze-net.h @@ -0,0 +1,86 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_NET_H__ +#define __KATZE_NET_H__ + +#include "katze-utils.h" + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_NET \ + (katze_net_get_type ()) +#define KATZE_NET(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_NET, KatzeNet)) +#define KATZE_NET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_NET, KatzeNetClass)) +#define KATZE_IS_NET(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_NET)) +#define KATZE_IS_NET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_NET)) +#define KATZE_NET_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_NET, KatzeNetClass)) + +typedef struct _KatzeNet KatzeNet; +typedef struct _KatzeNetClass KatzeNetClass; + +GType +katze_net_get_type (void); + +KatzeNet* +katze_net_new (void); + +typedef enum +{ + KATZE_NET_VERIFIED, + KATZE_NET_MOVED, + KATZE_NET_NOT_FOUND, + KATZE_NET_FAILED, + KATZE_NET_DONE +} KatzeNetStatus; + +typedef struct +{ + gchar* uri; + KatzeNetStatus status; + gchar* mime_type; + gchar* data; + gsize length; +} KatzeNetRequest; + +typedef gboolean (*KatzeNetStatusCb) (KatzeNetRequest* request, + gpointer user_data); + +typedef void (*KatzeNetTransferCb) (KatzeNetRequest* request, + gpointer user_data); + +void +katze_net_load_uri (KatzeNet* net, + const gchar* uri, + KatzeNetStatusCb status_cb, + KatzeNetTransferCb transfer_cb, + gpointer user_data); + +typedef void (*KatzeNetIconCb) (GdkPixbuf* icon, + gpointer user_data); + +GdkPixbuf* +katze_net_load_icon (KatzeNet* net, + const gchar* uri, + KatzeNetIconCb icon_cb, + GtkWidget* widget, + gpointer user_data); + +G_END_DECLS + +#endif /* __KATZE_NET_H__ */ diff --git a/katze/katze-utils.c b/katze/katze-utils.c index ce619781..f91542e1 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -463,3 +463,56 @@ katze_image_menu_item_new_ellipsized (const gchar* label) return menuitem; } + +/** + * katze_pixbuf_new_from_buffer: + * @buffer: Buffer with image data + * @length: Length of the buffer + * @mime_type: a MIME type, or %NULL + * @error: return location for a #GError, or %NULL + * + * Creates a new #GdkPixbuf out of the specified buffer. + * + * You can specify a MIME type if looking at the buffer + * is not enough to determine the right type. + * + * Return value: A newly-allocated #GdkPixbuf + **/ +GdkPixbuf* +katze_pixbuf_new_from_buffer (const guchar* buffer, + gsize length, + const gchar* mime_type, + GError** error) +{ + /* Proposed for inclusion in GdkPixbuf + See http://bugzilla.gnome.org/show_bug.cgi?id=74291 */ + GdkPixbufLoader* loader; + GdkPixbuf* pixbuf; + + g_return_val_if_fail (buffer != NULL, NULL); + g_return_val_if_fail (length > 0, NULL); + + if (mime_type) + { + loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error); + if (!loader) + return NULL; + } + else + loader = gdk_pixbuf_loader_new (); + if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) + { + g_object_unref (loader); + return NULL; + } + if (!gdk_pixbuf_loader_close (loader, error)) + { + g_object_unref (loader); + return NULL; + } + + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + g_object_ref (pixbuf); + g_object_unref (loader); + return pixbuf; +} diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 52ac45a8..97e5b8dc 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -78,6 +78,12 @@ katze_widget_popup (GtkWidget* widget, GtkWidget* katze_image_menu_item_new_ellipsized (const gchar* label); +GdkPixbuf* +katze_pixbuf_new_from_buffer (const guchar* buffer, + gsize length, + const gchar* mime_type, + GError** error); + G_END_DECLS #endif /* __KATZE_UTILS_H__ */ diff --git a/katze/katze.h b/katze/katze.h index eb4e2c40..a4cf626a 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -18,5 +18,6 @@ #include "katze-list.h" #include "katze-array.h" #include "katze-arrayaction.h" +#include "katze-net.h" #endif /* __KATZE_H__ */ diff --git a/katze/wscript_build b/katze/wscript_build index b3145552..ca4dddfb 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -7,7 +7,7 @@ obj.name = 'katze' obj.target = 'katze' obj.includes = '.' obj.find_sources_in_dirs ('.') -obj.uselib = 'GTK LIBXML' +obj.uselib = 'LIBSOUP GTK LIBXML' obj.inst_var = 0 # FIXME: Do not install this static lib diff --git a/midori/midori-browser.c b/midori/midori-browser.c index abc6a8fc..f89b78fb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -39,10 +39,6 @@ #include #endif -#if HAVE_LIBSOUP - #include -#endif - struct _MidoriBrowser { GtkWindow parent_instance; @@ -80,9 +76,7 @@ struct _MidoriBrowser KatzeArray* search_engines; KatzeArray* history; - #if HAVE_LIBSOUP - SoupSession* session; - #endif + KatzeNet* net; }; G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) @@ -1654,31 +1648,24 @@ _action_zoom_normal_activate (GtkAction* action, midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } -#if HAVE_LIBSOUP static void -midori_browser_got_body_cb (SoupMessage* msg, - MidoriBrowser* browser) +midori_browser_transfer_cb (KatzeNetRequest* request, + MidoriBrowser* browser) { - SoupURI* soup_uri; - gchar* uri; gchar* filename; gchar* unique_filename; gchar* text_editor; gint fd; FILE* fp; - if (msg->response_body->length > 0) + if (request->data) { - soup_uri = soup_message_get_uri (msg); - uri = soup_uri_to_string (soup_uri, FALSE); - filename = g_strdup_printf ("%uXXXXXX", g_str_hash (uri)); - g_free (uri); + filename = g_strdup_printf ("%uXXXXXX", g_str_hash (request->uri)); if (((fd = g_file_open_tmp (filename, &unique_filename, NULL)) != -1)) { if ((fp = fdopen (fd, "w"))) { - fwrite (msg->response_body->data, - 1, msg->response_body->length, fp); + fwrite (request->data, 1, request->length, fp); fclose (fp); g_object_get (browser->settings, "text-editor", &text_editor, NULL); @@ -1691,20 +1678,14 @@ midori_browser_got_body_cb (SoupMessage* msg, g_free (filename); } } -#endif static void _action_source_view_activate (GtkAction* action, MidoriBrowser* browser) { gchar* text_editor; - const gchar* current_uri; - #if HAVE_LIBSOUP - SoupMessage* msg; - #endif GtkWidget* view; GtkWidget* source_view; - gchar* filename; gchar* uri; gint n; @@ -1714,24 +1695,11 @@ _action_source_view_activate (GtkAction* action, g_object_get (browser->settings, "text-editor", &text_editor, NULL); if (text_editor && *text_editor) { - current_uri = midori_view_get_display_uri (MIDORI_VIEW (view)); - #if HAVE_LIBSOUP - if (g_str_has_prefix (current_uri, "http://") || - g_str_has_prefix (current_uri, "https://")) - { - msg = soup_message_new ("GET", current_uri); - g_signal_connect (msg, "got-body", - G_CALLBACK (midori_browser_got_body_cb), browser); - soup_session_queue_message (browser->session, msg, NULL, NULL); - g_free (text_editor); - return; - } - #endif - if (g_str_has_prefix (current_uri, "file://")) - { - filename = g_filename_from_uri (current_uri, NULL, NULL); - sokoke_spawn_program (text_editor, filename); - } + katze_net_load_uri (browser->net, + midori_view_get_display_uri (MIDORI_VIEW (view)), + NULL, (KatzeNetTransferCb)midori_browser_transfer_cb, browser); + g_free (text_editor); + return; } else { @@ -2299,8 +2267,10 @@ midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else if (katze_item_get_uri (item)) - pixbuf = gtk_widget_render_icon (treeview, STOCK_BOOKMARK, - GTK_ICON_SIZE_MENU, NULL); + /* FIXME: Implement icon_cb */ + pixbuf = katze_net_load_icon ( + MIDORI_BROWSER (gtk_widget_get_toplevel (treeview))->net, + katze_item_get_uri (item), NULL, treeview, treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); if (pixbuf) g_object_unref (pixbuf); @@ -2394,7 +2364,8 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, const gchar* title; GtkWidget* menuitem; GtkWidget* submenu; - GtkWidget* icon; + GtkWidget* image; + GdkPixbuf* icon; n = katze_array_get_length (array); for (i = 0; i < n; i++) @@ -2419,9 +2390,16 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser, else if (katze_item_get_uri (item)) { menuitem = sokoke_image_menu_item_new_ellipsized (title); - icon = gtk_image_new_from_stock (STOCK_BOOKMARK, GTK_ICON_SIZE_MENU); - gtk_widget_show (icon); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + image = gtk_image_new (); + /* FIXME: Implement icon_cb */ + icon = katze_net_load_icon (browser->net, + katze_item_get_uri (item), + NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, + GTK_WIDGET (browser), NULL /*g_object_ref (image)*/); + gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); + g_object_unref (icon); + gtk_widget_show (image); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), browser); @@ -2466,8 +2444,10 @@ midori_browser_history_render_icon_cb (GtkTreeViewColumn* column, pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); + /* FIXME: Implement icon_cb */ + pixbuf = katze_net_load_icon ( + MIDORI_BROWSER (gtk_widget_get_toplevel (treeview))->net, + katze_item_get_uri (item), NULL, treeview, treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -3341,9 +3321,7 @@ midori_browser_init (MidoriBrowser* browser) GtkRcStyle* rcstyle; GtkAction* action; - #if HAVE_LIBSOUP - browser->session = soup_session_async_new (); - #endif + browser->net = katze_net_new (); browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); @@ -3829,20 +3807,13 @@ midori_browser_finalize (GObject* object) g_free (browser->statusbar_text); - if (browser->settings) - g_object_unref (browser->settings); - if (browser->bookmarks) - g_object_unref (browser->bookmarks); - if (browser->trash) - g_object_unref (browser->trash); - if (browser->search_engines) - g_object_unref (browser->search_engines); - if (browser->history) - g_object_unref (browser->history); + katze_object_assign (browser->settings, NULL); + katze_object_assign (browser->bookmarks, NULL); + katze_object_assign (browser->trash, NULL); + katze_object_assign (browser->search_engines, NULL); + katze_object_assign (browser->history, NULL); - #if HAVE_LIBSOUP - g_object_unref (browser->session); - #endif + katze_object_assign (browser->net, NULL); G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } @@ -4047,6 +4018,8 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) KatzeItem* item; const gchar* title; const gchar* desc; + GtkWidget* image; + GdkPixbuf* icon; GtkToolItem* toolitem; GtkTreeModel* treestore; @@ -4080,8 +4053,15 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) } else if (katze_item_get_uri (item)) { - toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + image = gtk_image_new (); + /* FIXME: Implement icon_cb */ + icon = katze_net_load_icon (browser->net, + katze_item_get_uri (item), + NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, + GTK_WIDGET (browser), NULL /*g_object_ref (image)*/); + gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); + g_object_unref (icon); + toolitem = gtk_tool_button_new (image, title); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), @@ -4152,6 +4132,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, gboolean found; time_t now; gint64 date; + time_t date_; if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) return; @@ -4168,7 +4149,8 @@ midori_browser_new_history_item (MidoriBrowser* browser, { gtk_tree_model_get (treemodel, &iter, 0, &parent, -1); date = katze_item_get_added (KATZE_ITEM (parent)); - if (sokoke_same_day (&now, &date)) + date_ = (time_t)date; + if (sokoke_same_day (&now, &date_)) { found = TRUE; break; diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 465efa79..296c9ed3 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -25,6 +25,8 @@ struct _MidoriSearchAction KatzeItem* current_item; gchar* text; + KatzeNet* net; + GtkWidget* last_proxy; GtkWidget* dialog; @@ -205,6 +207,8 @@ midori_search_action_init (MidoriSearchAction* search_action) search_action->current_item = NULL; search_action->text = NULL; + search_action->net = katze_net_new (); + search_action->last_proxy = NULL; search_action->dialog = NULL; @@ -218,7 +222,9 @@ midori_search_action_finalize (GObject* object) { MidoriSearchAction* search_action = MIDORI_SEARCH_ACTION (object); - g_free (search_action->text); + katze_assign (search_action->text, NULL); + + katze_object_assign (search_action->net, NULL); G_OBJECT_CLASS (midori_search_action_parent_class)->finalize (object); } @@ -419,8 +425,8 @@ midori_search_action_icon_released_cb (GtkWidget* entry, guint n, i; GtkWidget* menuitem; KatzeItem* item; - GdkPixbuf* pixbuf; - GtkWidget* icon; + GdkPixbuf* icon; + GtkWidget* image; search_engines = MIDORI_SEARCH_ACTION (action)->search_engines; menu = gtk_menu_new (); @@ -432,11 +438,15 @@ midori_search_action_icon_released_cb (GtkWidget* entry, item = katze_array_get_nth_item (search_engines, i); menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); - pixbuf = sokoke_web_icon (katze_item_get_icon (item), - GTK_ICON_SIZE_MENU, menuitem); - icon = gtk_image_new_from_pixbuf (pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - g_object_unref (pixbuf); + image = gtk_image_new (); + /* FIXME: Implement icon_cb */ + icon = katze_net_load_icon (MIDORI_SEARCH_ACTION (action)->net, + katze_item_get_uri (item), + NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, + entry, NULL /*g_object_ref (image)*/); + gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); + g_object_unref (icon); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "engine", item); g_signal_connect (menuitem, "activate", @@ -456,8 +466,8 @@ midori_search_action_icon_released_cb (GtkWidget* entry, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Manage Search Engines")); - icon = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_search_action_manage_activate_cb), action); @@ -656,7 +666,7 @@ midori_search_action_set_current_item (MidoriSearchAction* search_action, GSList* proxies; GtkWidget* alignment; GtkWidget* entry; - GdkPixbuf* pixbuf; + GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); g_return_if_fail (!item || KATZE_IS_ITEM (item)); @@ -677,11 +687,14 @@ midori_search_action_set_current_item (MidoriSearchAction* search_action, alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); entry = gtk_bin_get_child (GTK_BIN (alignment)); - pixbuf = sokoke_web_icon (item ? katze_item_get_icon (item) : NULL, - GTK_ICON_SIZE_MENU, entry); + /* FIXME: Implement icon_cb */ + icon = katze_net_load_icon (search_action->net, + katze_item_get_uri (item), + NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, + entry, NULL /*g_object_ref (entry)*/); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, pixbuf); - g_object_unref (pixbuf); + GTK_ICON_ENTRY_PRIMARY, icon); + g_object_unref (icon); if (item) sokoke_entry_set_default_text (GTK_ENTRY (entry), katze_item_get_name (item)); @@ -698,22 +711,21 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { + KatzeNet* net; KatzeItem* item; - const gchar* icon; - GdkPixbuf* pixbuf; + GdkPixbuf* icon; gtk_tree_model_get (model, iter, 0, &item, -1); - icon = katze_item_get_icon (item); - if (icon) - { - pixbuf = sokoke_web_icon (icon, GTK_ICON_SIZE_DND, treeview); - g_object_set (renderer, "pixbuf", pixbuf, NULL); - if (pixbuf) - g_object_unref (pixbuf); - } - else - g_object_set (renderer, "pixbuf", NULL, NULL); + /* FIXME: Use the net of the MidoriSearchAction */ + net = katze_net_new (); + /* FIXME: Implement icon_cb */ + icon = katze_net_load_icon (net, katze_item_get_uri (item), + NULL /*(KatzeNetIconCb)midori_search_action_dialog_icon_cb*/, + treeview, NULL /*g_object_ref (treeview)*/); + g_object_set (renderer, "pixbuf", icon, NULL); + g_object_unref (icon); + g_object_unref (net); } static void diff --git a/midori/midori-source.c b/midori/midori-source.c index f08975f4..9b8cbd93 100644 --- a/midori/midori-source.c +++ b/midori/midori-source.c @@ -15,20 +15,16 @@ #include "midori-source.h" +#include + #include #include -#if HAVE_LIBSOUP - #include -#endif - struct _MidoriSource { GtkTextView parent_instance; - #if HAVE_LIBSOUP - SoupSession* session; - #endif + KatzeNet* net; }; struct _MidoriSourceClass @@ -59,17 +55,13 @@ midori_source_init (MidoriSource* source) gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), buffer); gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); - #if HAVE_LIBSOUP - source->session = soup_session_async_new (); - #endif + source->net = katze_net_new (); } static void midori_source_finalize (GObject* object) { - #if HAVE_LIBSOUP - g_object_unref (MIDORI_SOURCE (object)->session); - #endif + katze_object_assign (MIDORI_SOURCE (object)->net, NULL); G_OBJECT_CLASS (midori_source_parent_class)->finalize (object); } @@ -93,97 +85,49 @@ midori_source_new (const gchar* uri) return GTK_WIDGET (source); } -#if HAVE_LIBSOUP static void -midori_source_got_body_cb (SoupMessage* msg, - MidoriSource* source) +midori_source_transfer_cb (KatzeNetRequest* request, + MidoriSource* source) { - const gchar* contents; - const gchar* mime; gchar** mimev; gchar* charset; gchar* contents_utf8; GtkTextBuffer* buffer; - if (msg->response_body->length > 0) + if (request->data) { - contents = msg->response_body->data; - if (contents && !g_utf8_validate (contents, -1, NULL)) + if (!g_utf8_validate (request->data, request->length, NULL)) { charset = NULL; - if (msg->response_headers) + if (request->mime_type) { - mime = soup_message_headers_get (msg->response_headers, - "content-type"); - if (mime) - { - mimev = g_strsplit (mime, " ", 2); - if (mimev[0] && mimev[1] && - g_str_has_prefix (mimev[1], "charset=")) - charset = g_strdup (&mimev[1][8]); - g_strfreev (mimev); - } + mimev = g_strsplit (request->mime_type, " ", 2); + if (mimev[0] && mimev[1] && + g_str_has_prefix (mimev[1], "charset=")) + charset = g_strdup (&mimev[1][8]); + g_strfreev (mimev); } - contents_utf8 = g_convert (contents, -1, "UTF-8", + contents_utf8 = g_convert (request->data, -1, "UTF-8", charset ? charset : "ISO-8859-1", NULL, NULL, NULL); } else - contents_utf8 = (gchar*)contents; + contents_utf8 = (gchar*)request->data; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); if (contents_utf8) gtk_text_buffer_set_text (buffer, contents_utf8, -1); g_object_unref (buffer); - if (contents != contents_utf8) + if (contents_utf8 != request->data) g_free (contents_utf8); } } -#endif void midori_source_set_uri (MidoriSource* source, const gchar* uri) { - gchar* contents; - gchar* contents_utf8; - GtkTextBuffer* buffer; - #if HAVE_LIBSOUP - SoupMessage* msg; - #endif - gchar* filename; - g_return_if_fail (MIDORI_IS_SOURCE (source)); g_return_if_fail (uri != NULL); - contents = NULL; - - #if HAVE_LIBSOUP - if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) - { - msg = soup_message_new ("GET", uri); - g_signal_connect (msg, "got-body", - G_CALLBACK (midori_source_got_body_cb), source); - soup_session_queue_message (source->session, msg, NULL, NULL); - return; - } - #endif - if (g_str_has_prefix (uri, "file://")) - { - contents = NULL; - filename = g_filename_from_uri (uri, NULL, NULL); - if (!filename || !g_file_get_contents (filename, &contents, NULL, NULL)) - return; - if (contents && !g_utf8_validate (contents, -1, NULL)) - { - contents_utf8 = g_convert (contents, -1, "UTF-8", "ISO-8859-1", - NULL, NULL, NULL); - g_free (contents); - } - else - contents_utf8 = contents; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); - if (contents_utf8) - gtk_text_buffer_set_text (buffer, contents_utf8, -1); - g_object_unref (buffer); - g_free (contents_utf8); - } + katze_net_load_uri (source->net, uri, + NULL, (KatzeNetTransferCb)midori_source_transfer_cb, source); } diff --git a/midori/midori-view.c b/midori/midori-view.c index f4b06382..8ef42b88 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -27,10 +27,6 @@ #include #include -#if HAVE_LIBSOUP - #include -#endif - /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); @@ -66,9 +62,7 @@ struct _MidoriView GtkWidget* tab_close; KatzeItem* item; - #if HAVE_LIBSOUP - SoupSession* session; - #endif + KatzeNet* net; }; struct _MidoriViewClass @@ -439,142 +433,23 @@ midori_view_notify_icon_cb (MidoriView* view, gtk_image_new_from_pixbuf (view->icon)); } -#if HAVE_LIBSOUP static void -midori_view_got_headers_cb (SoupMessage* msg, - MidoriView* view) +midori_view_icon_cb (GdkPixbuf* icon, + MidoriView* view) { - const gchar* mime; - - switch (msg->status_code) - { - case 200: - mime = soup_message_headers_get (msg->response_headers, "content-type"); - if (!g_str_has_prefix (mime, "image/")) - soup_session_cancel_message (view->session, msg, 200); - break; - case 301: - break; - default: - soup_session_cancel_message (view->session, msg, 200); - } -} - -static gchar* -midori_view_get_cached_icon_file (gchar* uri) -{ - gchar* cache_dir; - gchar* checksum; - gchar* icon_file; - gchar* icon_path; - - cache_dir = g_build_filename (g_get_user_cache_dir (), - PACKAGE_NAME, "icons", NULL); - g_mkdir_with_parents (cache_dir, 0755); - #if GLIB_CHECK_VERSION(2, 16, 0) - checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); - #else - checksum = g_strdup_printf ("%u", g_str_hash (uri)); - #endif - icon_file = g_strdup_printf ("%s.ico", checksum); - g_free (checksum); - icon_path = g_build_filename (cache_dir, icon_file, NULL); - g_free (icon_file); - return icon_path; -} - -static void -midori_view_got_body_cb (SoupMessage* msg, - MidoriView* view) -{ - GdkPixbuf* pixbuf; - SoupURI* soup_uri; - gchar* uri; - gchar* icon_file; - FILE* fp; - GdkPixbuf* pixbuf_scaled; - gint icon_width, icon_height; - - pixbuf = NULL; - if (msg->response_body->length > 0) - { - soup_uri = soup_message_get_uri (msg); - uri = soup_uri_to_string (soup_uri, FALSE); - icon_file = midori_view_get_cached_icon_file (uri); - g_free (uri); - if ((fp = fopen (icon_file, "w"))) - { - fwrite (msg->response_body->data, - 1, msg->response_body->length, fp); - fclose (fp); - pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); - } - g_free (icon_file); - } - if (!pixbuf) - pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - - katze_object_assign (view->icon, pixbuf_scaled); + katze_object_assign (view->icon, icon); g_object_notify (G_OBJECT (view), "icon"); } -#endif static void _midori_web_view_load_icon (MidoriView* view) { - #if HAVE_LIBSOUP - guint i; - gchar* uri; - gchar* icon_file; - SoupMessage* msg; - #endif GdkPixbuf* pixbuf; - gint icon_width, icon_height; - GdkPixbuf* pixbuf_scaled; - pixbuf = NULL; - #if HAVE_LIBSOUP - if (view->uri && g_str_has_prefix (view->uri, "http://")) - { - i = 8; - while (view->uri[i] != '\0' && view->uri[i] != '/') - i++; - if (view->uri[i] == '/') - { - uri = g_strdup (view->uri); - uri[i] = '\0'; - uri = g_strdup_printf ("%s/favicon.ico", uri); - icon_file = midori_view_get_cached_icon_file (uri); - if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) - pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); - else - { - msg = soup_message_new ("GET", uri); - g_signal_connect (msg, "got-headers", - G_CALLBACK (midori_view_got_headers_cb), view); - g_signal_connect (msg, "got-body", - G_CALLBACK (midori_view_got_body_cb), view); - soup_session_queue_message (view->session, msg, NULL, NULL); - } - g_free (uri); - } - } - #endif + pixbuf = katze_net_load_icon (view->net, view->uri, + (KatzeNetIconCb)midori_view_icon_cb, GTK_WIDGET (view), view); - if (!pixbuf) - pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, - GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - - view->icon = pixbuf_scaled; + katze_object_assign (view->icon, pixbuf); g_object_notify (G_OBJECT (view), "icon"); } @@ -586,7 +461,7 @@ midori_view_notify_load_status_cb (MidoriView* view, katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), view->load_status != MIDORI_LOAD_FINISHED); - if (view->load_status == MIDORI_LOAD_COMMITTED) + if (view->web_view && view->load_status == MIDORI_LOAD_COMMITTED) _midori_web_view_load_icon (view); } @@ -1078,9 +953,7 @@ midori_view_init (MidoriView* view) view->download_manager = NULL; - #if HAVE_LIBSOUP - view->session = soup_session_async_new (); - #endif + view->net = katze_net_new (); g_object_connect (view, "signal::notify::icon", @@ -1120,9 +993,7 @@ midori_view_finalize (GObject* object) g_free (view->download_manager); - #if HAVE_LIBSOUP - g_object_unref (view->session); - #endif + g_object_unref (view->net); /* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); @@ -1864,7 +1735,7 @@ midori_view_get_zoom_level (MidoriView* view) if (view->web_view != NULL) return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); #endif - return FALSE; + return 1.0; } /** From d26c50f2d47e551fdb033ba924668781fd4fc01d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Oct 2008 00:19:04 +0200 Subject: [PATCH 0414/2970] Explicitly build with GIO again, Gtk < 2.14 needs that --- midori/wscript_build | 2 +- wscript | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/wscript_build b/midori/wscript_build index f5cfe69d..a855e98a 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.') -obj.uselib = 'UNIQUE LIBSOUP GTK GTKSOURCEVIEW SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 13e38328..5b2e876c 100644 --- a/wscript +++ b/wscript @@ -111,6 +111,7 @@ def configure (conf): sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) + conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) From f14c2ff70f3858223834e59a7b434f3ac71bc1d6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Oct 2008 00:21:04 +0200 Subject: [PATCH 0415/2970] Set tooltips on the sidepanel toolbar --- midori/midori-panel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index e2413e87..1ebdf249 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -428,6 +428,7 @@ midori_panel_append_page (MidoriPanel* panel, image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); g_object_set_data (G_OBJECT (toolitem), "page", child); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); From dd45aed1390df67ebf38e9eb23b9e6ee4f9dc508 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Oct 2008 00:25:17 +0200 Subject: [PATCH 0416/2970] Blank tabs should be titled "Blank page". --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 8ef42b88..2e6568c4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1412,7 +1412,7 @@ midori_view_get_display_title (MidoriView* view) g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); if (midori_view_is_blank (view)) - return "about:blank"; + return _("Blank page"); if (view->title && *view->title) return view->title; From cb1fde09fe3c1f949fc8b16db918a2d0d3727cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 24 Oct 2008 00:54:28 +0200 Subject: [PATCH 0417/2970] Don't needlessly create text buffers --- midori/midori-source.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/midori/midori-source.c b/midori/midori-source.c index 9b8cbd93..1bd98774 100644 --- a/midori/midori-source.c +++ b/midori/midori-source.c @@ -49,10 +49,6 @@ midori_source_class_init (MidoriSourceClass* class) static void midori_source_init (MidoriSource* source) { - GtkTextBuffer* buffer; - - buffer = gtk_text_buffer_new (NULL); - gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), buffer); gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); source->net = katze_net_new (); @@ -115,7 +111,6 @@ midori_source_transfer_cb (KatzeNetRequest* request, buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); if (contents_utf8) gtk_text_buffer_set_text (buffer, contents_utf8, -1); - g_object_unref (buffer); if (contents_utf8 != request->data) g_free (contents_utf8); } From 5e8887a6997ec1b5648109e3145ee41c0b986a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 24 Oct 2008 01:15:43 +0200 Subject: [PATCH 0418/2970] Preserve extensions for viewing source files --- midori/midori-browser.c | 45 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f89b78fb..91210f2e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1648,11 +1648,51 @@ _action_zoom_normal_activate (GtkAction* action, midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } +static gchar* +midori_browser_get_uri_extension (const gchar* uri) +{ + gchar* extension; + gchar* slash; + gchar* period; + gchar* ext_end; + gchar* tmp = g_strdup (uri); + + /* Find the last slash in the URI and search for the last period + *after* the last slash. This is not completely accurate + but should cover most (simple) URIs */ + slash = strrchr (tmp, '/'); + /* Huh, URI without slashes? */ + if (!slash) + return g_strdup (""); + + ext_end = period = strrchr (slash, '.'); + if (!period) + return g_strdup (""); + + /* Skip the period */ + ext_end++; + /* If *ext_end is 0 here, the URI ended with a period, so skip */ + if (!*ext_end) + return g_strdup (""); + + /* Find the end of the extension */ + while (*ext_end && g_ascii_isalnum (*ext_end)) + ext_end++; + + *ext_end = 0; + extension = g_strdup (period); + + g_free (tmp); + + return extension; +} + static void midori_browser_transfer_cb (KatzeNetRequest* request, MidoriBrowser* browser) { gchar* filename; + gchar* extension; gchar* unique_filename; gchar* text_editor; gint fd; @@ -1660,7 +1700,10 @@ midori_browser_transfer_cb (KatzeNetRequest* request, if (request->data) { - filename = g_strdup_printf ("%uXXXXXX", g_str_hash (request->uri)); + extension = midori_browser_get_uri_extension (request->uri); + filename = g_strdup_printf ("%uXXXXXX%s", + g_str_hash (request->uri), extension); + g_free (extension); if (((fd = g_file_open_tmp (filename, &unique_filename, NULL)) != -1)) { if ((fp = fdopen (fd, "w"))) From 307050c42a714644db2764d82cc095969018d12a Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Fri, 24 Oct 2008 01:35:34 +0200 Subject: [PATCH 0419/2970] Display relative dates in History panel --- midori/midori-browser.c | 62 +++++++++++++++++++++++++++-------------- midori/sokoke.c | 30 ++++++++++++++++++++ midori/sokoke.h | 4 +++ 3 files changed, 75 insertions(+), 21 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 91210f2e..9f254a1f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2508,10 +2508,10 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { KatzeItem* item; - time_t date; - char sdate[50]; + char* sdate; + gint age; - gtk_tree_model_get (model, iter, 0, &item, -1); + gtk_tree_model_get (model, iter, 0, &item, 1, &age, -1); if (G_UNLIKELY (!item)) return; @@ -2524,9 +2524,22 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, if (KATZE_IS_ARRAY (item)) { - date = (time_t)katze_item_get_added (item); - strftime (sdate, sizeof (sdate), "%Y-%m-%d", localtime (&date)); - g_object_set (renderer, "text", sdate, NULL); + g_return_if_fail (age >= 0); + + if (age > 1) + { + sdate = g_strdup_printf (_("%d days ago"), age); + g_object_set (renderer, "text", sdate, NULL); + g_free (sdate); + } + else + { + if (age == 0) + sdate = _("Today"); + else + sdate = _("Yesterday"); + g_object_set (renderer, "text", sdate, NULL); + } } else g_object_set (renderer, "text", katze_item_get_name (item), NULL); @@ -3664,7 +3677,7 @@ midori_browser_init (MidoriBrowser* browser) /* History */ box = gtk_vbox_new (FALSE, 0); - treestore = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + treestore = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); @@ -4137,15 +4150,21 @@ _tree_store_insert_history_item (GtkTreeStore* treestore, KatzeItem* child; guint i, n; GtkTreeIter* piter; + time_t now; + gint64 date; + gint age = -1; g_return_if_fail (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item)) { piter = parent; - if (katze_item_get_added (item)) + if ((date = katze_item_get_added (item))) { - gtk_tree_store_insert_with_values (treestore, &iter, parent, 0, 0, item, -1); + now = time (NULL); + age = sokoke_days_between (&date, &now); + gtk_tree_store_insert_with_values (treestore, &iter, parent, + 0, 0, item, 1, age, -1); g_object_unref (item); piter = &iter; } @@ -4158,7 +4177,8 @@ _tree_store_insert_history_item (GtkTreeStore* treestore, } else { - gtk_tree_store_insert_with_values (treestore, &iter, parent, 0, 0, item, -1); + gtk_tree_store_insert_with_values (treestore, &iter, parent, + 0, 0, item, 1, age, -1); g_object_unref (item); } } @@ -4176,6 +4196,8 @@ midori_browser_new_history_item (MidoriBrowser* browser, time_t now; gint64 date; time_t date_; + gint age; + gint newage; if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) return; @@ -4190,14 +4212,20 @@ midori_browser_new_history_item (MidoriBrowser* browser, i = 0; while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) { - gtk_tree_model_get (treemodel, &iter, 0, &parent, -1); + gtk_tree_model_get (treemodel, &iter, 0, &parent, 1, &age, -1); date = katze_item_get_added (KATZE_ITEM (parent)); date_ = (time_t)date; - if (sokoke_same_day (&now, &date_)) + newage = sokoke_days_between (&date, &now); + if (newage == 0) { found = TRUE; - break; + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), + &iter, item); + katze_array_add_item (parent, item); } + if (age != newage) + gtk_tree_store_set (GTK_TREE_STORE (treemodel), + &iter, 1, newage, -1); g_object_unref (parent); } if (!found) @@ -4209,14 +4237,6 @@ midori_browser_new_history_item (MidoriBrowser* browser, _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, KATZE_ITEM (parent)); } - else - { - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), - &iter, item); - katze_array_add_item (parent, item); - g_object_unref (parent); - } - } static void diff --git a/midori/sokoke.c b/midori/sokoke.c index cd5f5518..a8c3f4eb 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -679,3 +679,33 @@ sokoke_same_day (const time_t* day1, return same; } +/** + * sokoke_days_between: + * @day1: a time_t timestamp value + * @day2: a time_t timestamp value + * + * Calculates the number of days between two timestamps. + * + * Return value: an integer. + **/ +gint +sokoke_days_between (const time_t* day1, + const time_t* day2) +{ + GDate* date1; + GDate* date2; + gint age; + + date1 = g_date_new (); + date2 = g_date_new (); + + g_date_set_time_t (date1, *day1); + g_date_set_time_t (date2, *day2); + + age = g_date_days_between (date1, date2); + + g_date_free (date1); + g_date_free (date2); + + return age; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 39113af5..0f69217b 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -143,4 +143,8 @@ gboolean sokoke_same_day (const time_t* day1, const time_t* day2); +gint +sokoke_days_between (const time_t* day1, + const time_t* day2); + #endif /* !__SOKOKE_H__ */ From e1dd0194b122624da4f7efa37ba9fb36c100eb0d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Oct 2008 19:29:57 +0200 Subject: [PATCH 0420/2970] Set a default Find icon in Search if engines are empty --- midori/midori-searchaction.c | 45 +++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 296c9ed3..970d4890 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -488,6 +488,34 @@ midori_search_action_scroll_event_cb (GtkWidget* entry, return FALSE; } +static void +midori_search_action_set_entry_icon (MidoriSearchAction* search_action, + GtkWidget* entry) +{ + GdkPixbuf* icon; + + if (search_action->current_item) + { + /* FIXME: Implement icon_cb */ + icon = katze_net_load_icon (search_action->net, + katze_item_get_uri (search_action->current_item), + NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, + entry, NULL /*g_object_ref (entry)*/); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + g_object_unref (icon); + sokoke_entry_set_default_text (GTK_ENTRY (entry), + katze_item_get_name (search_action->current_item)); + } + else + { + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, + GTK_STOCK_FIND); + sokoke_entry_set_default_text (GTK_ENTRY (entry), ""); + } +} + static void midori_search_action_connect_proxy (GtkAction* action, GtkWidget* proxy) @@ -503,6 +531,8 @@ midori_search_action_connect_proxy (GtkAction* action, alignment = gtk_bin_get_child (GTK_BIN (proxy)); entry = gtk_bin_get_child (GTK_BIN (alignment)); + midori_search_action_set_entry_icon (MIDORI_SEARCH_ACTION (action), + entry); g_object_connect (entry, "signal::key-press-event", midori_search_action_key_press_event_cb, action, @@ -666,7 +696,6 @@ midori_search_action_set_current_item (MidoriSearchAction* search_action, GSList* proxies; GtkWidget* alignment; GtkWidget* entry; - GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); g_return_if_fail (!item || KATZE_IS_ITEM (item)); @@ -687,19 +716,7 @@ midori_search_action_set_current_item (MidoriSearchAction* search_action, alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); entry = gtk_bin_get_child (GTK_BIN (alignment)); - /* FIXME: Implement icon_cb */ - icon = katze_net_load_icon (search_action->net, - katze_item_get_uri (item), - NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, - entry, NULL /*g_object_ref (entry)*/); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - g_object_unref (icon); - if (item) - sokoke_entry_set_default_text (GTK_ENTRY (entry), - katze_item_get_name (item)); - else - sokoke_entry_set_default_text (GTK_ENTRY (entry), ""); + midori_search_action_set_entry_icon (search_action, entry); } while ((proxies = g_slist_next (proxies))); } From b53a2ebb3792425df352bccac2b417d356ada845 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Oct 2008 19:58:58 +0200 Subject: [PATCH 0421/2970] Finish soup messaging cleanly and free private data --- katze/katze-net.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/katze/katze-net.c b/katze/katze-net.c index fdbf938a..23a0d258 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -168,7 +168,10 @@ katze_net_got_headers_cb (SoupMessage* msg, } if (!priv->status_cb (request, priv->user_data)) + { + g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv); soup_session_cancel_message (priv->net->session, msg, msg->status_code); + } } static void @@ -202,6 +205,12 @@ katze_net_got_body_cb (SoupMessage* msg, } priv->transfer_cb (request, priv->user_data); +} + +static void +katze_net_finished_cb (SoupMessage* msg, + KatzeNetPriv* priv) +{ katze_net_priv_free (priv); } #endif @@ -329,6 +338,8 @@ katze_net_load_uri (KatzeNet* net, if (transfer_cb) g_signal_connect (msg, "got-body", G_CALLBACK (katze_net_got_body_cb), priv); + g_signal_connect (msg, "finished", + G_CALLBACK (katze_net_finished_cb), priv); soup_session_queue_message (net->session, msg, NULL, NULL); return; } From cefcb42eef2eacc5bedbde45497535ce3e0481c7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Oct 2008 16:16:48 +0200 Subject: [PATCH 0422/2970] Recognize favicons in domains with no trailing slash --- katze/katze-net.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 23a0d258..be7b7088 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -489,25 +489,28 @@ katze_net_load_icon (KatzeNet* net, icon_uri = g_strdup (uri); icon_uri[i] = '\0'; icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri); - icon_file = katze_net_get_cached_path (net, icon_uri, "icons"); - - if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) - pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); - else - { - priv = g_new0 (KatzeNetIconPriv, 1); - priv->net = net; - priv->icon_file = icon_file; - priv->icon_cb = icon_cb; - priv->widget = g_object_ref (widget); - priv->user_data = user_data; - - katze_net_load_uri (net, icon_uri, - (KatzeNetStatusCb)katze_net_icon_status_cb, - (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv); - } - g_free (icon_uri); } + else + icon_uri = g_strdup_printf ("%s/favicon.ico", uri); + + icon_file = katze_net_get_cached_path (net, icon_uri, "icons"); + + if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) + pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); + else + { + priv = g_new0 (KatzeNetIconPriv, 1); + priv->net = net; + priv->icon_file = icon_file; + priv->icon_cb = icon_cb; + priv->widget = g_object_ref (widget); + priv->user_data = user_data; + + katze_net_load_uri (net, icon_uri, + (KatzeNetStatusCb)katze_net_icon_status_cb, + (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv); + } + g_free (icon_uri); } if (!pixbuf) From 1f915eb58aec5925d8f24e442c9995cae50e2196 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Oct 2008 16:18:38 +0200 Subject: [PATCH 0423/2970] Show icons of programs in complex commands as well --- midori/midori-preferences.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 0fd7263e..b8d61538 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -182,26 +182,34 @@ proxy_download_manager_icon_cb (GtkWidget* entry, GdkEventFocus* event, GtkImage* icon) { - const gchar* program; + const gchar* command; + gchar* first_space; + gchar* first_part; gchar* path; - program = gtk_entry_get_text (GTK_ENTRY (entry)); - path = g_find_program_in_path (program); + command = gtk_entry_get_text (GTK_ENTRY (entry)); + if ((first_space = strstr (command, " "))) + first_part = g_strndup (command, first_space - command); + else + first_part = g_strdup (command); + path = g_find_program_in_path (first_part); if (path) { if (gtk_icon_theme_has_icon (gtk_icon_theme_get_for_screen ( - gtk_widget_get_screen (entry)), program)) - gtk_image_set_from_icon_name (icon, program, GTK_ICON_SIZE_MENU); + gtk_widget_get_screen (entry)), first_part)) + gtk_image_set_from_icon_name (icon, first_part, GTK_ICON_SIZE_MENU); else gtk_image_set_from_stock (icon, GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); g_free (path); } - else if (program && *program) + else if (first_part && *first_part) gtk_image_set_from_stock (icon, GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); else gtk_image_clear (icon); + g_free (first_part); + return FALSE; } From b931e1bf53f96f5d9690932604e6579674a5989b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Oct 2008 00:54:57 +0200 Subject: [PATCH 0424/2970] Improve OSX adjustments in various places --- configure.in | 1 - midori/Makefile.am | 4 +++- midori/main.c | 2 +- midori/midori-browser.c | 15 ++++++++++----- midori/midori-panel.c | 4 ++++ midori/midori-preferences.c | 21 +++++++++++---------- midori/midori-searchaction.c | 18 ++++++++++++++++++ midori/midori-view.c | 11 +++++++++-- midori/sokoke.c | 14 +++++++++----- wscript | 12 +++++++----- 10 files changed, 72 insertions(+), 30 deletions(-) diff --git a/configure.in b/configure.in index 67480fca..38d2ff3b 100644 --- a/configure.in +++ b/configure.in @@ -92,7 +92,6 @@ if test "x$MSGFMT" = "xno"; then AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) fi - # Here we tell the configure script which files to *create* AC_CONFIG_FILES([ Makefile \ diff --git a/midori/Makefile.am b/midori/Makefile.am index b92bf83e..e7cf7228 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -2,15 +2,17 @@ INCLUDES = \ $(UNIQUE_CFLAGS) \ + $(LIBXML_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(GTK_CFLAGS) \ $(WEBKIT_CFLAGS) \ -I../katze -AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" +AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\" -DDATADIR=\""$(datadir)"\" LDADD = \ $(UNIQUE_LIBS) \ + $(LIBXML_LIBS) \ $(SQLITE3_LIBS) \ $(GTK_LIBS) \ $(WEBKIT_LIBS) \ diff --git a/midori/main.c b/midori/main.c index fd4de3d0..6589a5aa 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1084,7 +1084,7 @@ main (int argc, #endif #if ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, MIDORI_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9f254a1f..15f66aec 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -864,6 +864,9 @@ midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, static void midori_browser_class_init (MidoriBrowserClass* class) { + GObjectClass* gobject_class; + GParamFlags flags; + signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( "window-object-cleared", G_TYPE_FROM_CLASS (class), @@ -936,13 +939,13 @@ midori_browser_class_init (MidoriBrowserClass* class) class->activate_action = _midori_browser_activate_action; class->quit = _midori_browser_quit; - GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class = G_OBJECT_CLASS (class); gobject_class->dispose = midori_browser_dispose; gobject_class->finalize = midori_browser_finalize; gobject_class->set_property = midori_browser_set_property; gobject_class->get_property = midori_browser_get_property; - GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; g_object_class_install_property (gobject_class, PROP_MENUBAR, @@ -2583,7 +2586,7 @@ _action_tab_next_activate (GtkAction* action, static const gchar* credits_authors[] = { "Christian Dywan ", NULL }; static const gchar* credits_documenters[] = { - "Christian Dywan " }; + "Christian Dywan ", NULL }; static const gchar* credits_artists[] = { "Nancy Runge ", NULL }; @@ -2672,7 +2675,6 @@ _action_help_link_activate (GtkAction* action, } - static void _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -2701,7 +2703,6 @@ _action_open_in_panel_activate (GtkAction* action, midori_view_set_uri (MIDORI_VIEW (browser->panel_pageholder), uri); } - static void midori_panel_notify_position_cb (GObject* object, GParamSpec* arg1, @@ -3824,7 +3825,11 @@ midori_browser_init (MidoriBrowser* browser) gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close Findbar")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); + #ifdef HAVE_OSX + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, 0); + #else gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); + #endif sokoke_container_show_children (GTK_CONTAINER (browser->find)); gtk_box_pack_start (GTK_BOX (vbox), browser->find, FALSE, FALSE, 0); diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 1ebdf249..9f62f86b 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -208,7 +208,11 @@ midori_panel_init (MidoriPanel* panel) gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Close panel")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_button_close_clicked_cb), panel); + #if HAVE_OSX + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, 0); + #else gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + #endif gtk_box_pack_start (GTK_BOX (vbox), labelbar, FALSE, FALSE, 0); gtk_widget_show_all (vbox); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index b8d61538..99123801 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -11,6 +11,10 @@ #include "midori-preferences.h" +#if HAVE_CONFIG_H + #include +#endif + #include "sokoke.h" #include @@ -72,10 +76,6 @@ midori_preferences_response_cb (MidoriPreferences* preferences, gtk_widget_destroy (GTK_WIDGET (preferences)); } -#ifdef GDK_WINDOWING_QUARTZ - #define USE_OSX_STYLE -#endif - static void midori_preferences_init (MidoriPreferences* preferences) { @@ -90,7 +90,7 @@ midori_preferences_init (MidoriPreferences* preferences) "title", dialog_title, "has-separator", FALSE, NULL); - #ifndef USE_OSX_STYLE + #ifndef HAVE_OSX gtk_dialog_add_buttons (GTK_DIALOG (preferences), GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, @@ -213,7 +213,7 @@ proxy_download_manager_icon_cb (GtkWidget* entry, return FALSE; } -#ifdef USE_OSX_STYLE +#ifdef HAVE_OSX static void midori_preferences_help_clicked_cb (GtkWidget* button, GtkDialog* dialog) @@ -238,7 +238,7 @@ midori_preferences_add_toolbutton (GtkWidget* toolbar, const gchar* label, GtkWidget* page) { -#ifdef USE_OSX_STYLE +#ifdef HAVE_OSX *toolbutton = GTK_WIDGET (*toolbutton ? gtk_radio_tool_button_new_from_widget ( GTK_RADIO_TOOL_BUTTON (*toolbutton)) : gtk_radio_tool_button_new (NULL)); gtk_tool_button_set_label (GTK_TOOL_BUTTON (*toolbutton), label); @@ -282,7 +282,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, preferences->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); - #ifdef USE_OSX_STYLE + #ifdef HAVE_OSX gtk_notebook_set_show_tabs (GTK_NOTEBOOK (preferences->notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (preferences->notebook), FALSE); toolbar = gtk_toolbar_new (); @@ -290,8 +290,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), toolbar, FALSE, FALSE, 0); - #endif + #else toolbar = NULL; + #endif toolbutton = NULL; sizegroup = NULL; @@ -515,7 +516,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_object_unref (sizegroup); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), preferences->notebook, FALSE, FALSE, 4); - #ifdef USE_OSX_STYLE + #ifdef HAVE_OSX GtkWidget* icon; hbox = gtk_hbox_new (FALSE, 0); button = gtk_button_new (); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 970d4890..d1335670 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1069,8 +1069,10 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) dialog = gtk_dialog_new_with_buttons (dialog_title, toplevel ? GTK_WINDOW (toplevel) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + #ifndef HAVE_OSX GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + #endif NULL); g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &search_action->dialog); @@ -1155,6 +1157,22 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) button = gtk_button_new_from_stock (GTK_STOCK_GO_UP); gtk_widget_set_sensitive (button, FALSE); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); + + #ifdef HAVE_OSX + GtkWidget* icon; + hbox = gtk_hbox_new (FALSE, 0); + button = gtk_button_new (); + icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), icon); + /* TODO: Implement some kind of help function */ + gtk_widget_set_sensitive (button, FALSE); + /* g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_help_clicked_cb), dialog); */ + gtk_box_pack_end (GTK_BOX (hbox), + button, FALSE, FALSE, 4); + gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), + hbox, FALSE, FALSE, 0); + #endif gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); g_object_connect (search_action->search_engines, diff --git a/midori/midori-view.c b/midori/midori-view.c index 2e6568c4..568539c3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1648,10 +1648,8 @@ midori_view_get_proxy_tab_label (MidoriView* view) gtk_container_border_width (GTK_CONTAINER (hbox), 2); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); gtk_misc_set_alignment (GTK_MISC (view->tab_icon), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5); /* TODO: make the tab initially look "unvisited" until it's focused */ - gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); _update_label_size (view->tab_title, 10); view->tab_close = gtk_button_new (); @@ -1666,7 +1664,16 @@ midori_view_get_proxy_tab_label (MidoriView* view) GTK_STOCK_CLOSE); gtk_button_set_image (GTK_BUTTON (view->tab_close), image); gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); + + #if HAVE_OSX + gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); + #else + gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); + #endif gtk_widget_show_all (GTK_WIDGET (event_box)); if (!view->close_buttons_on_tabs) diff --git a/midori/sokoke.c b/midori/sokoke.c index a8c3f4eb..34036698 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -9,12 +9,12 @@ See the file COPYING for the full license text. */ +#include "sokoke.h" + #if HAVE_CONFIG_H #include #endif -#include "sokoke.h" - #if HAVE_UNISTD_H #include #endif @@ -48,6 +48,9 @@ sokoke_spawn_program (const gchar* command, gchar** argv; GError* error; + g_return_val_if_fail (command != NULL, FALSE); + g_return_val_if_fail (argument != NULL, FALSE); + argument_escaped = g_shell_quote (argument); if (strstr (command, "%s")) command_ready = g_strdup_printf (command, argument_escaped); @@ -205,13 +208,16 @@ typedef enum { SOKOKE_DESKTOP_UNTESTED, SOKOKE_DESKTOP_XFCE, + SOKOKE_DESKTOP_OSX, SOKOKE_DESKTOP_UNKNOWN } SokokeDesktop; static SokokeDesktop sokoke_get_desktop (void) { - #ifdef GDK_WINDOWING_X11 + #ifdef HAVE_OSX + return SOKOKE_DESKTOP_OSX; + #else static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) { @@ -227,8 +233,6 @@ sokoke_get_desktop (void) } return desktop; - #else - return SOKOKE_DESKTOP_UNKNOWN; #endif } diff --git a/wscript b/wscript index 5b2e876c..b4d2af6c 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import Params import pproc as subprocess import Common -import platform +import sys import os APPNAME = 'midori' @@ -117,6 +117,8 @@ def configure (conf): conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) conf.check_header ('unistd.h', 'HAVE_UNISTD_H') + if sys.platform == 'darwin': + conf.define ('HAVE_OSX', 1) if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): icons = 'yes' @@ -168,7 +170,7 @@ def build (bld): bld.add_subdirs ('katze midori icons') - install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING EXPAT README') + install_files ('DOCDIR', '/' + APPNAME + '/', 'AUTHORS ChangeLog COPYING EXPAT README') if bld.env ()['RST2HTML']: # FIXME: Build only if needed @@ -194,15 +196,15 @@ def build (bld): if bld.env ()['INTLTOOL']: obj = bld.create_obj ('intltool_in') - obj.source = 'midori.desktop.in' + obj.source = APPNAME + '.desktop.in' obj.inst_var = 'DATADIR' obj.inst_dir = 'applications' obj.flags = '-d' else: # FIXME: process desktop.in without intltool - Params.pprint ('BLUE', "File midori.desktop not generated") + Params.pprint ('BLUE', "File " + APPNAME + ".desktop not generated") if bld.env ()['INTLTOOL']: - install_files ('DATADIR', 'applications', 'midori.desktop') + install_files ('DATADIR', 'applications', APPNAME + '.desktop') if bld.env ()['RSVG_CONVERT']: mkdir (blddir + '/data') From c82624f16aa979fa50e4a0edb7f71335fa8c0d83 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Oct 2008 01:36:15 +0200 Subject: [PATCH 0425/2970] Change tab close buttons so they are less missaligned --- midori/midori-view.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 568539c3..842a8dac 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1600,7 +1600,7 @@ midori_view_tab_icon_style_set (GtkWidget* tab_icon, gtk_settings = gtk_widget_get_settings (tab_icon); gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_MENU, &width, &height); - gtk_widget_set_size_request (tab_icon, width + 2, height + 2); + gtk_widget_set_size_request (tab_icon, width + 4, height + 4); } static void @@ -1659,11 +1659,8 @@ midori_view_get_proxy_tab_label (MidoriView* view) rcstyle->xthickness = rcstyle->ythickness = 0; gtk_widget_modify_style (view->tab_close, rcstyle); g_object_unref (rcstyle); - image = katze_throbber_new (); - katze_throbber_set_static_stock_id (KATZE_THROBBER (image), - GTK_STOCK_CLOSE); + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (view->tab_close), image); - gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); #if HAVE_OSX gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); From 7a623745cdcac3b63ead4fbd8a92efccd35cd781 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Oct 2008 01:48:21 +0200 Subject: [PATCH 0426/2970] Use our own labels for WebKit Settings properties --- midori/midori-preferences.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 99123801..cf34039e 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -383,7 +383,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); FRAME_NEW (_("Font settings")); TABLE_NEW (5, 2); - label = katze_property_label (settings, "default-font-family"); + label = gtk_label_new (_("Default Font Family")); INDENTED_ADD (label, 0, 1, 0, 1); hbox = gtk_hbox_new (FALSE, 4); button = katze_property_proxy (settings, "default-font-family", "font"); @@ -391,7 +391,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, entry = katze_property_proxy (settings, "default-font-size", NULL); gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); FILLED_ADD (hbox, 1, 2, 0, 1); - label = katze_property_label (settings, "minimum-font-size"); + label = gtk_label_new (_("Minimum Font Size")); INDENTED_ADD (label, 0, 1, 1, 2); entry = katze_property_proxy (settings, "minimum-font-size", NULL); INDENTED_ADD (entry, 1, 2, 1, 2); @@ -405,16 +405,22 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FRAME_NEW (_("Features")); TABLE_NEW (6, 2); button = katze_property_proxy (settings, "auto-load-images", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); INDENTED_ADD (button, 0, 1, 0, 1); button = katze_property_proxy (settings, "auto-shrink-images", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Shrink images automatically")); SPANNED_ADD (button, 1, 2, 0, 1); button = katze_property_proxy (settings, "print-backgrounds", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Print backgrounds")); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "resizable-text-areas", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Resizable text areas")); SPANNED_ADD (button, 1, 2, 1, 2); button = katze_property_proxy (settings, "enable-scripts", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); SPANNED_ADD (button, 1, 2, 2, 3); label = katze_property_label (settings, "location-entry-search"); INDENTED_ADD (label, 0, 1, 3, 4); From 819bcd64440b1392914dd1a8b2a6bfe94e7c2bd3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Oct 2008 17:07:59 +0100 Subject: [PATCH 0427/2970] Implement Save As functionality --- midori/midori-browser.c | 107 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 15f66aec..1935b8b8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -216,6 +216,10 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (MIDORI_VIEW (view))); + /* Currently views that don't support source, don't support + saving either. If that changes, we need to thinkof something. */ + _action_set_sensitive (browser, "SaveAs", + midori_view_can_view_source (MIDORI_VIEW (view))); _action_set_sensitive (browser, "Print", midori_view_can_print (MIDORI_VIEW (view))); _action_set_sensitive (browser, "ZoomIn", @@ -1171,6 +1175,96 @@ _action_open_activate (GtkAction* action, gtk_widget_destroy (dialog); } +static void +midori_browser_save_transfer_cb (KatzeNetRequest* request, + gchar* filename) +{ + FILE* fp; + + if (request->data) + { + /* FIXME: Show an error message if the file cannot be saved */ + if ((fp = fopen (filename, "wb"))) + { + fwrite (request->data, 1, request->length, fp); + fclose (fp); + } + } + g_free (filename); +} + +static void +_action_save_as_activate (GtkAction* action, + MidoriBrowser* browser) +{ + static gchar* last_dir = NULL; + gchar* uri = NULL; + gboolean folder_set = FALSE; + GtkWidget* dialog; + GtkWidget* view; + gchar* filename; + gchar* dirname; + gchar* last_slash; + gchar* folder; + + dialog = gtk_file_chooser_dialog_new ( + ("Save file as"), GTK_WINDOW (browser), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_SAVE); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + + view = midori_browser_get_current_tab (browser); + if ((uri = (gchar*)midori_view_get_display_uri (MIDORI_VIEW (view)))) + { + /* Base the start folder on the current view's uri if it is local */ + filename = g_filename_from_uri (uri, NULL, NULL); + if (filename) + { + dirname = g_path_get_dirname (filename); + if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) + { + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); + folder_set = TRUE; + } + + g_free (dirname); + g_free (filename); + } + + /* Try to provide a good default filename */ + filename = g_filename_from_uri (uri, NULL, NULL); + if (!filename && (last_slash = g_strrstr (uri, "/"))) + { + if (last_slash[0] == '/') + last_slash++; + filename = g_strdup (last_slash); + } + else + filename = g_strdup (uri); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); + g_free (filename); + } + + if (!folder_set && last_dir && *last_dir) + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); + katze_net_load_uri (browser->net, uri, NULL, + (KatzeNetTransferCb)midori_browser_save_transfer_cb, filename); + + g_free (last_dir); + last_dir = folder; + g_free (uri); + } + gtk_widget_destroy (dialog); +} + static void _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) @@ -1691,8 +1785,8 @@ midori_browser_get_uri_extension (const gchar* uri) } static void -midori_browser_transfer_cb (KatzeNetRequest* request, - MidoriBrowser* browser) +midori_browser_source_transfer_cb (KatzeNetRequest* request, + MidoriBrowser* browser) { gchar* filename; gchar* extension; @@ -1742,8 +1836,8 @@ _action_source_view_activate (GtkAction* action, if (text_editor && *text_editor) { katze_net_load_uri (browser->net, - midori_view_get_display_uri (MIDORI_VIEW (view)), - NULL, (KatzeNetTransferCb)midori_browser_transfer_cb, browser); + midori_view_get_display_uri (MIDORI_VIEW (view)), NULL, + (KatzeNetTransferCb)midori_browser_source_transfer_cb, browser); g_free (text_editor); return; } @@ -2985,7 +3079,7 @@ static const GtkActionEntry entries[] = { N_("Open a file"), G_CALLBACK (_action_open_activate) }, { "SaveAs", GTK_STOCK_SAVE_AS, NULL, "s", - N_("Save to a file"), NULL/*G_CALLBACK (_action_saveas_activate)*/ }, + N_("Save to a file"), G_CALLBACK (_action_save_as_activate) }, { "TabClose", NULL, N_("_Close Tab"), "w", N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, @@ -3107,7 +3201,7 @@ static const GtkActionEntry entries[] = { N_("Delete the selected history item"), G_CALLBACK (_action_history_delete_activate) }, { "HistoryClear", GTK_STOCK_CLEAR, NULL, "", - N_("Clear the enitre history"), G_CALLBACK (_action_history_clear_activate) }, + N_("Clear the entire history"), G_CALLBACK (_action_history_clear_activate) }, { "HistoryOpen", GTK_STOCK_OPEN, NULL, "", N_("Open the selected history item"), G_CALLBACK (_action_history_open_activate) }, @@ -3561,7 +3655,6 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (browser->menubar, "button-press-event", G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); - _action_set_sensitive (browser, "SaveAs", FALSE); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); _action_set_sensitive (browser, "FindQuick", FALSE); _action_set_sensitive (browser, "Transferbar", FALSE); From e83f93742da3516c4af857875c50fb07a6f605d8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Oct 2008 17:08:26 +0100 Subject: [PATCH 0428/2970] Change tab components again, correct close button placement --- midori/midori-view.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 842a8dac..f505f248 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1590,19 +1590,6 @@ midori_view_tab_label_button_release_event (GtkWidget* tab_label, return FALSE; } -static void -midori_view_tab_icon_style_set (GtkWidget* tab_icon, - GtkStyle* previous_style) -{ - GtkSettings* gtk_settings; - gint width, height; - - gtk_settings = gtk_widget_get_settings (tab_icon); - gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_MENU, - &width, &height); - gtk_widget_set_size_request (tab_icon, width + 4, height + 4); -} - static void midori_view_tab_close_clicked (GtkWidget* tab_close, GtkWidget* widget) @@ -1645,10 +1632,7 @@ midori_view_get_proxy_tab_label (MidoriView* view) event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); hbox = gtk_hbox_new (FALSE, 1); - gtk_container_border_width (GTK_CONTAINER (hbox), 2); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - gtk_misc_set_alignment (GTK_MISC (view->tab_icon), 0.0, 0.5); - gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5); /* TODO: make the tab initially look "unvisited" until it's focused */ _update_label_size (view->tab_title, 10); @@ -1661,15 +1645,16 @@ midori_view_get_proxy_tab_label (MidoriView* view) g_object_unref (rcstyle); image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (view->tab_close), image); + gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); #if HAVE_OSX gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); #else gtk_box_pack_start (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), view->tab_title, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (hbox), view->tab_close, FALSE, FALSE, 0); #endif gtk_widget_show_all (GTK_WIDGET (event_box)); @@ -1678,8 +1663,6 @@ midori_view_get_proxy_tab_label (MidoriView* view) g_signal_connect (event_box, "button-release-event", G_CALLBACK (midori_view_tab_label_button_release_event), view); - g_signal_connect (view->tab_close, "style-set", - G_CALLBACK (midori_view_tab_icon_style_set), NULL); g_signal_connect (view->tab_close, "clicked", G_CALLBACK (midori_view_tab_close_clicked), view); From 7a7353e6fd34cdab6c9b6feb5da58a5a115a3bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 26 Oct 2008 18:39:06 +0100 Subject: [PATCH 0429/2970] Implement middle click on bookmarkbar items --- midori/midori-browser.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1935b8b8..08f99fdf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2494,6 +2494,34 @@ midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } +static gboolean +midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser) +{ + KatzeItem* item; + gint n; + gboolean open_in_background; + + if (event->button == 2) + { + g_object_get (browser->settings, "open-tabs-in-the-background", + &open_in_background, NULL); + item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); + n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + if (!open_in_background) + midori_browser_set_current_page (browser, n); + return TRUE; + } + else if (event->button == 3) + { + midori_browser_toolbar_popup_context_menu_cb (browser->navigationbar, + event->x, event->y, event->button, browser); + return TRUE; + } + return FALSE; +} + static void _midori_browser_create_bookmark_menu (MidoriBrowser* browser, KatzeArray* array, @@ -4220,9 +4248,15 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), browser); + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), + browser); if (desc && *desc) gtk_tool_item_set_tooltip_text (toolitem, desc); g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); + g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), + "KatzeItem", item); } else toolitem = gtk_separator_tool_item_new (); From 23e784922ed284ab7b00982e3a1538224e707627 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Oct 2008 22:22:26 +0100 Subject: [PATCH 0430/2970] Revamp bookmarkbar items based on KatzeArrayAction Some refactoring in KatzeArrayAction and the addition of a function to create arbitrary bookmark tool items allows us to easily revamp the bookmarkbar so that it finally reflectls changes to the bookmarks, including adding and removing items. --- katze/katze-arrayaction.c | 205 +++++++++++++++++++++++------------ katze/katze-arrayaction.h | 6 ++ midori/midori-browser.c | 217 +++++++++++--------------------------- 3 files changed, 207 insertions(+), 221 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index f0287362..cc5f45f1 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -223,22 +223,21 @@ katze_array_action_icon_cb (GdkPixbuf* icon, static void katze_array_action_menu_item_select_cb (GtkWidget* proxy, - KatzeArrayAction* array_action) + KatzeArrayAction* array_action); + +static void +katze_array_action_generate_menu (KatzeArrayAction* array_action, + KatzeArray* array, + GtkWidget* menu, + GtkWidget* proxy) { guint n, i; - GtkWidget* menu; - GtkWidget* menuitem; - GtkWidget* submenu; - KatzeArray* array; KatzeItem* item; - GdkPixbuf* pixbuf; - GtkWidget* icon; + GtkWidget* menuitem; + GdkPixbuf* icon; + GtkWidget* image; + GtkWidget* submenu; - menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)); - gtk_container_foreach (GTK_CONTAINER (menu), - (GtkCallback)(gtk_widget_destroy), NULL); - - array = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); n = katze_array_get_length (array); if (n > 0) for (i = 0; i < n; i++) @@ -255,16 +254,16 @@ katze_array_action_menu_item_select_cb (GtkWidget* proxy, menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); if (KATZE_IS_ARRAY (item)) - pixbuf = gtk_widget_render_icon (menuitem, + icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - pixbuf = katze_net_load_icon (array_action->net, + icon = katze_net_load_icon (array_action->net, katze_item_get_uri (item), (KatzeNetIconCb)katze_array_action_icon_cb, proxy, g_object_ref (menuitem)); - icon = gtk_image_new_from_pixbuf (pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - g_object_unref (pixbuf); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); if (KATZE_IS_ARRAY (item)) @@ -288,17 +287,27 @@ katze_array_action_menu_item_select_cb (GtkWidget* proxy, } } +static void +katze_array_action_menu_item_select_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) +{ + GtkWidget* menu; + KatzeArray* array; + + menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)); + gtk_container_foreach (GTK_CONTAINER (menu), + (GtkCallback)(gtk_widget_destroy), NULL); + + array = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); + katze_array_action_generate_menu (array_action, array, menu, proxy); +} + static void katze_array_action_proxy_clicked_cb (GtkWidget* proxy, KatzeArrayAction* array_action) { - guint n, i; GtkWidget* menu; - GtkWidget* menuitem; - GtkWidget* submenu; - KatzeItem* item; - GdkPixbuf* pixbuf; - GtkWidget* icon; + KatzeArray* array; if (GTK_IS_MENU_ITEM (proxy)) { @@ -311,50 +320,14 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, menu = gtk_menu_new (); - n = katze_array_get_length (array_action->array); - if (n > 0) - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (array_action->array, i); - /* FIXME: The menu item should reflect changes to the item */ - if (!KATZE_IS_ARRAY (item) && !katze_item_get_uri (item)) - { - menuitem = gtk_separator_menu_item_new (); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - continue; - } - menuitem = katze_image_menu_item_new_ellipsized ( - katze_item_get_name (item)); - pixbuf = gtk_widget_render_icon (menuitem, - KATZE_IS_ARRAY (item) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, - GTK_ICON_SIZE_MENU, NULL); - icon = gtk_image_new_from_pixbuf (pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - g_object_unref (pixbuf); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - if (KATZE_IS_ARRAY (item)) - { - submenu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); - g_signal_connect (menuitem, "select", - G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); - } - else - g_signal_connect (menuitem, "activate", - G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); - } - else - { - menuitem = gtk_image_menu_item_new_with_label (_("Empty")); - gtk_widget_set_sensitive (menuitem, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - } + array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray"); + if (!array) + array = array_action->array; + katze_array_action_generate_menu (array_action, array, menu, proxy); - g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); + /* populate-popup should only affect the main proxy */ + if (array == array_action->array) + g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu), NULL, KATZE_MENU_POSITION_LEFT); @@ -378,6 +351,106 @@ katze_array_action_create_tool_item (GtkAction* action) return toolitem; } +static void +katze_array_action_item_notify_cb (KatzeItem* item, + GParamSpec* pspec, + GtkToolItem* toolitem) +{ + KatzeArrayAction* array_action; + const gchar* property; + const gchar* title; + const gchar* desc; + GdkPixbuf* icon; + GtkWidget* image; + + if (!G_IS_PARAM_SPEC_STRING (pspec)) + return; + + array_action = (KatzeArrayAction*)g_object_get_data ( + G_OBJECT (toolitem), "KatzeArrayAction"); + property = g_param_spec_get_name (pspec); + if (!strcmp (property, "name")) + { + title = katze_item_get_name (item); + if (title) + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + else + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), + katze_item_get_uri (item)); + } + else if (!strcmp (property, "text")) + { + desc = katze_item_get_text (item); + if (desc && *desc) + gtk_tool_item_set_tooltip_text (toolitem, desc); + else + gtk_tool_item_set_tooltip_text (toolitem, + katze_item_get_uri (item)); + } + else if (!KATZE_IS_ARRAY (item) && !strcmp (property, "uri")) + { + icon = katze_net_load_icon (array_action->net, katze_item_get_uri (item), + (KatzeNetIconCb)katze_array_action_icon_cb, + GTK_WIDGET (toolitem), g_object_ref (toolitem)); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + gtk_widget_show (image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + } +} + +GtkToolItem* +katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, + KatzeItem* item) +{ + const gchar* title; + const gchar* uri; + const gchar* desc; + GtkToolItem* toolitem; + GdkPixbuf* icon; + GtkWidget* image; + + title = katze_item_get_name (item); + uri = katze_item_get_uri (item); + desc = katze_item_get_text (item); + + if (!KATZE_IS_ARRAY (item) && !uri) + return gtk_separator_tool_item_new (); + + toolitem = gtk_tool_button_new (NULL, NULL); + if (KATZE_IS_ARRAY (item)) + icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), + GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + else + icon = katze_net_load_icon (array_action->net, uri, + (KatzeNetIconCb)katze_array_action_icon_cb, + GTK_WIDGET (toolitem), g_object_ref (toolitem)); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + gtk_widget_show (image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + if (title) + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); + else + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), uri); + gtk_tool_item_set_is_important (toolitem, TRUE); + if (desc && *desc) + gtk_tool_item_set_tooltip_text (toolitem, desc); + else + gtk_tool_item_set_tooltip_text (toolitem, uri); + if (KATZE_IS_ARRAY (item)) + { + g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action); + } + + g_object_set_data (G_OBJECT (toolitem), "KatzeArrayAction", array_action); + g_signal_connect (item, "notify", + G_CALLBACK (katze_array_action_item_notify_cb), toolitem); + return toolitem; +} + static void katze_array_action_connect_proxy (GtkAction* action, GtkWidget* proxy) diff --git a/katze/katze-arrayaction.h b/katze/katze-arrayaction.h index b4e9ee22..062ffbd0 100644 --- a/katze/katze-arrayaction.h +++ b/katze/katze-arrayaction.h @@ -14,6 +14,8 @@ #include "katze-array.h" +#include + G_BEGIN_DECLS #define KATZE_TYPE_ARRAY_ACTION \ @@ -42,6 +44,10 @@ void katze_array_action_set_array (KatzeArrayAction* array_action, KatzeArray* array); +GtkToolItem* +katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, + KatzeItem* item); + G_END_DECLS #endif /* __KATZE_ARRAY_ACTION_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 08f99fdf..0df54628 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2443,46 +2443,6 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, g_object_set (renderer, "markup", _("Separator"), NULL); } -static void -_midori_browser_create_bookmark_menu (MidoriBrowser* browser, - KatzeArray* array, - GtkWidget* menu); - -static void -midori_browser_bookmark_menu_folder_activate_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - GtkWidget* menu; - KatzeArray* array; - - menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem)); - gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback) gtk_widget_destroy, NULL); - array = (KatzeArray*)g_object_get_data (G_OBJECT (menuitem), "KatzeArray"); - _midori_browser_create_bookmark_menu (browser, array, menu); - /* Remove all menuitems when the menu is hidden. - FIXME: We really *want* the line below, but it won't work like that - g_signal_connect_after (menu, "hide", G_CALLBACK (gtk_container_foreach), gtk_widget_destroy); */ - gtk_widget_show (menuitem); -} - -static void -midori_browser_bookmarkbar_folder_activate_cb (GtkToolItem* toolitem, - MidoriBrowser* browser) -{ - GtkWidget* menu; - KatzeArray* array; - - menu = gtk_menu_new (); - array = (KatzeArray*)g_object_get_data (G_OBJECT (toolitem), "KatzeArray"); - _midori_browser_create_bookmark_menu (browser, array, menu); - /* Remove all menuitems when the menu is hidden. - FIXME: We really *should* run the line below, but it won't work like that - g_signal_connect (menu, "hide", G_CALLBACK (gtk_container_foreach), - gtk_widget_destroy); */ - sokoke_widget_popup (GTK_WIDGET (toolitem), GTK_MENU (menu), - NULL, SOKOKE_MENU_POSITION_LEFT); -} - static void midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, MidoriBrowser* browser) @@ -2505,13 +2465,16 @@ midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, if (event->button == 2) { - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_in_background, NULL); item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - if (!open_in_background) - midori_browser_set_current_page (browser, n); - return TRUE; + if (katze_item_get_uri (item)) + { + g_object_get (browser->settings, "open-tabs-in-the-background", + &open_in_background, NULL); + n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + if (!open_in_background) + midori_browser_set_current_page (browser, n); + return TRUE; + } } else if (event->button == 3) { @@ -2522,64 +2485,6 @@ midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, return FALSE; } -static void -_midori_browser_create_bookmark_menu (MidoriBrowser* browser, - KatzeArray* array, - GtkWidget* menu) -{ - guint i, n; - KatzeItem* item; - const gchar* title; - GtkWidget* menuitem; - GtkWidget* submenu; - GtkWidget* image; - GdkPixbuf* icon; - - n = katze_array_get_length (array); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (array, i); - title = katze_item_get_name (item); - - if (KATZE_IS_ARRAY (item)) - { - /* FIXME: what about the "folded" status */ - menuitem = sokoke_image_menu_item_new_ellipsized (title); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), - gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, - GTK_ICON_SIZE_MENU)); - submenu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_bookmark_menu_folder_activate_cb), - browser); - g_object_set_data (G_OBJECT (menuitem), "KatzeArray", item); - } - else if (katze_item_get_uri (item)) - { - menuitem = sokoke_image_menu_item_new_ellipsized (title); - image = gtk_image_new (); - /* FIXME: Implement icon_cb */ - icon = katze_net_load_icon (browser->net, - katze_item_get_uri (item), - NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, - GTK_WIDGET (browser), NULL /*g_object_ref (image)*/); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); - g_object_unref (icon); - gtk_widget_show (image); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), - browser); - g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - } - else - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - } -} - static void _action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) @@ -4193,20 +4098,61 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_unset (&value); } +static void +browser_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* item, + MidoriBrowser* browser) +{ + GtkToolItem* toolitem; + + toolitem = katze_array_action_create_tool_item_for ( + KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item); + + g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); + if (!KATZE_IS_ARRAY (item) && katze_item_get_uri (item)) + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), + browser); + if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) + { + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), + browser); + g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), + "KatzeItem", item); + } + gtk_widget_show (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); +} + +static void +browser_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* removed_item, + MidoriBrowser* browser) +{ + GList* children; + GtkWidget* toolitem; + KatzeItem* item; + + children = gtk_container_get_children (GTK_CONTAINER (browser->bookmarkbar)); + while (children != NULL) + { + toolitem = GTK_WIDGET (children->data); + item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); + if (item == removed_item) + gtk_widget_destroy (toolitem); + children = g_list_next (children); + } +} + static void midori_browser_load_bookmarks (MidoriBrowser* browser) { guint i, n; KatzeItem* item; - const gchar* title; - const gchar* desc; - GtkWidget* image; - GdkPixbuf* icon; - GtkToolItem* toolitem; GtkTreeModel* treestore; - // FIXME: Clear bookmarks menu - // FIXME: Clear bookmarkbar // FIXME: Clear bookmark panel _action_set_sensitive (browser, "BookmarkAdd", FALSE); @@ -4218,51 +4164,12 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) for (i = 0; i < n; i++) { item = katze_array_get_nth_item (browser->bookmarks, i); - title = katze_item_get_name (item); - desc = katze_item_get_text (item); - - if (KATZE_IS_ARRAY (item)) - { - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_browser_bookmarkbar_folder_activate_cb), - browser); - if (desc && *desc) - gtk_tool_item_set_tooltip_text (toolitem, desc); - g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item); - } - else if (katze_item_get_uri (item)) - { - image = gtk_image_new (); - /* FIXME: Implement icon_cb */ - icon = katze_net_load_icon (browser->net, - katze_item_get_uri (item), - NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, - GTK_WIDGET (browser), NULL /*g_object_ref (image)*/); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); - g_object_unref (icon); - toolitem = gtk_tool_button_new (image, title); - gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb), - browser); - g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), - "button-press-event", - G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), - browser); - if (desc && *desc) - gtk_tool_item_set_tooltip_text (toolitem, desc); - g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); - g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), - "KatzeItem", item); - } - else - toolitem = gtk_separator_tool_item_new (); - gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); + browser_bookmarks_add_item_cb (browser->bookmarks, item, browser); } - sokoke_container_show_children (GTK_CONTAINER (browser->bookmarkbar)); + g_signal_connect (browser->bookmarks, "add-item", + G_CALLBACK (browser_bookmarks_add_item_cb), browser); + g_signal_connect (browser->bookmarks, "remove-item", + G_CALLBACK (browser_bookmarks_remove_item_cb), browser); treestore = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); _tree_store_insert_folder (GTK_TREE_STORE (treestore), From dc8e8891e77c5f289c078bc9fc7d37f8903fc7e0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Oct 2008 03:01:52 +0100 Subject: [PATCH 0431/2970] Correct a missing differentiation between proxy widgets --- katze/katze-arrayaction.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index cc5f45f1..b06c41a6 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -214,11 +214,16 @@ katze_array_action_menu_item_activate_cb (GtkWidget* proxy, static void katze_array_action_icon_cb (GdkPixbuf* icon, - GtkWidget* menuitem) + GtkWidget* widget) { GtkWidget* image = gtk_image_new_from_pixbuf (icon); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_unref (menuitem); + g_object_unref (icon); + gtk_widget_show (image); + if (GTK_IS_IMAGE_MENU_ITEM (widget)) + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (widget), image); + else + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (widget), image); + g_object_unref (widget); } static void From 0ca873cb084a8c1f7570d2687631c5351881fca8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Oct 2008 03:03:20 +0100 Subject: [PATCH 0432/2970] Cache icons in memory and fix a redirection crasher bug --- katze/katze-net.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index be7b7088..a46913db 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -23,6 +23,7 @@ struct _KatzeNet { GObject parent_instance; + GHashTable* memory; gchar* cache_path; guint cache_size; @@ -50,9 +51,18 @@ katze_net_class_init (KatzeNetClass* class) gobject_class->finalize = katze_net_finalize; } +static void +katze_net_object_maybe_unref (gpointer object) +{ + if (object) + g_object_unref (object); +} + static void katze_net_init (KatzeNet* net) { + net->memory = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, katze_net_object_maybe_unref); net->cache_path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, NULL); @@ -66,6 +76,7 @@ katze_net_finalize (GObject* object) { KatzeNet* net = KATZE_NET (object); + g_hash_table_destroy (net->memory); katze_assign (net->cache_path, NULL); G_OBJECT_CLASS (katze_net_parent_class)->finalize (object); @@ -147,6 +158,10 @@ katze_net_get_cached_path (KatzeNet* net, } #if HAVE_LIBSOUP +static void +katze_net_got_body_cb (SoupMessage* msg, + KatzeNetPriv* priv); + static void katze_net_got_headers_cb (SoupMessage* msg, KatzeNetPriv* priv) @@ -170,7 +185,8 @@ katze_net_got_headers_cb (SoupMessage* msg, if (!priv->status_cb (request, priv->user_data)) { g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv); - soup_session_cancel_message (priv->net->session, msg, msg->status_code); + g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv); + soup_session_cancel_message (priv->net->session, msg, 1); } } @@ -404,6 +420,9 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, GdkPixbuf* pixbuf_scaled; gint icon_width, icon_height; + if (request->status == KATZE_NET_MOVED) + return; + pixbuf = NULL; if (request->data) { @@ -413,9 +432,13 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, fclose (fp); pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); } - else if (priv->icon_cb) + else pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data, request->length, request->mime_type, NULL); + if (pixbuf) + g_object_ref (pixbuf); + g_hash_table_insert (priv->net->memory, + g_strdup (priv->icon_file), pixbuf); } if (!priv->icon_cb) @@ -460,6 +483,10 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, * Depending on whether the icon was previously * cached or @uri is a local resource, the returned * icon may already be the final one. + * + * Note that both the returned #GdkPixbuf and the + * icon passed to @icon_cb are newly allocated and + * the caller owns the reference. **/ GdkPixbuf* katze_net_load_icon (KatzeNet* net, @@ -477,6 +504,7 @@ katze_net_load_icon (KatzeNet* net, GdkPixbuf* pixbuf_scaled; g_return_val_if_fail (KATZE_IS_NET (net), NULL); + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); pixbuf = NULL; if (uri && g_str_has_prefix (uri, "http://")) @@ -495,7 +523,13 @@ katze_net_load_icon (KatzeNet* net, icon_file = katze_net_get_cached_path (net, icon_uri, "icons"); - if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) + if (g_hash_table_lookup_extended (net->memory, + icon_file, NULL, (gpointer)&pixbuf)) + { + if (pixbuf) + g_object_ref (pixbuf); + } + else if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); else { From 70516f1f5b4d264c3b74664ca1f53c92b20a3c6c Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Mon, 27 Oct 2008 03:12:09 +0100 Subject: [PATCH 0433/2970] First stab at integration history with the location For starters, the location contains items from the history and not only from the current session. --- midori/midori-browser.c | 37 +++++++++++++++++++++++++ midori/midori-locationaction.c | 50 +++++++++++++++++++++++++++++++--- midori/midori-locationaction.h | 5 ++++ midori/midori-locationentry.c | 33 +++++++++++++++++++--- midori/midori-locationentry.h | 6 +++- 5 files changed, 122 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0df54628..e7b43ee9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4278,11 +4278,43 @@ midori_browser_new_history_item (MidoriBrowser* browser, } } +static void +_location_action_insert_history_item (MidoriLocationAction* action, + MidoriBrowser* browser, + KatzeItem* item) +{ + KatzeItem* child; + guint i, n; + const gchar* uri; + GdkPixbuf* pixbuf = NULL; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (action)); + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = n; i > 0; i--) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), i - 1); + _location_action_insert_history_item (action, browser, child); + } + } + else + { + uri = katze_item_get_uri (item); + pixbuf = katze_net_load_icon (browser->net, katze_item_get_uri (item), + NULL, GTK_WIDGET (browser), NULL); + midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); + } +} + static void midori_browser_load_history (MidoriBrowser* browser) { GtkTreeView* treeview; GtkTreeModel* treemodel; + GtkAction* action; if (!browser->history) return; @@ -4292,6 +4324,11 @@ midori_browser_load_history (MidoriBrowser* browser) _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, KATZE_ITEM (browser->history)); + + action = _action_by_name (browser, "Location"); + _location_action_insert_history_item (MIDORI_LOCATION_ACTION (action), + browser, + KATZE_ITEM (browser->history)); } static void diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index e8b0f406..1e03ea99 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -457,12 +457,54 @@ midori_location_action_add_uri (MidoriLocationAction* location_action, item.favicon = NULL; item.uri = uri; item.title = NULL; - midori_location_entry_add_item ( + midori_location_entry_prepend_item ( MIDORI_LOCATION_ENTRY (entry), &item); } while ((proxies = g_slist_next (proxies))); } +void +midori_location_action_add_item (MidoriLocationAction* location_action, + const gchar* uri, + GdkPixbuf* icon, + const gchar* title) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + GtkWidget* child; + MidoriLocationEntryItem item; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (uri != NULL); + g_return_if_fail (title != NULL); + g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); + + katze_assign (location_action->uri, g_strdup (uri)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + child = gtk_bin_get_child (GTK_BIN (entry)); + + item.favicon = icon; + item.uri = uri; + item.title = title; + midori_location_entry_append_item ( + MIDORI_LOCATION_ENTRY (entry), &item); + if (!g_strcmp0 (location_action->uri, uri)) + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), + GTK_ICON_ENTRY_PRIMARY, icon); + } + while ((proxies = g_slist_next (proxies))); +} + void midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, GdkPixbuf* icon, @@ -492,7 +534,7 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, item.favicon = icon; item.uri = uri; item.title = NULL; - midori_location_entry_add_item ( + midori_location_entry_prepend_item ( MIDORI_LOCATION_ENTRY (entry), &item); if (!g_strcmp0 (location_action->uri, uri)) gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), @@ -527,8 +569,8 @@ midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, item.favicon = NULL; item.uri = uri; - item.title = item.uri; - midori_location_entry_add_item ( + item.title = title; + midori_location_entry_prepend_item ( MIDORI_LOCATION_ENTRY (entry), &item); } while ((proxies = g_slist_next (proxies))); diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index 837527d7..ba6da7bb 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -49,6 +49,11 @@ midori_location_action_add_uri (MidoriLocationAction* location_action const gchar* uri); void +midori_location_action_add_item (MidoriLocationAction* location_action, + const gchar* uri, + GdkPixbuf* icon, + const gchar* title); +void midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, GdkPixbuf* icon, const gchar* text); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 2f684631..d90e3f88 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -726,15 +726,15 @@ midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, } /** - * midori_location_entry_add_item: + * midori_location_entry_prepend_item: * @location_entry: a #MidoriLocationEntry * @item: a MidoriLocationItem * - * Adds @item if it is not already in the list. + * Prepends @item if it is not already in the list. **/ void -midori_location_entry_add_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item) +midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item) { GtkTreeModel* model; GtkTreeIter iter; @@ -750,3 +750,28 @@ midori_location_entry_add_item (MidoriLocationEntry* location_entry, midori_location_entry_set_item (location_entry, &iter, item); } +/** + * midori_location_entry_append_item: + * @location_entry: a #MidoriLocationEntry + * @item: a MidoriLocationItem + * + * Appends @item if it is not already in the list. + **/ +void +midori_location_entry_append_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + g_return_if_fail (item->uri != NULL); + + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + + if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + midori_location_entry_set_item (location_entry, &iter, item); +} + diff --git a/midori/midori-locationentry.h b/midori/midori-locationentry.h index 53f8a6fc..cc47b9da 100644 --- a/midori/midori-locationentry.h +++ b/midori/midori-locationentry.h @@ -60,7 +60,11 @@ midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, const gchar* uri); void -midori_location_entry_add_item (MidoriLocationEntry* location_entry, +midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item); + +void +midori_location_entry_append_item (MidoriLocationEntry* location_entry, MidoriLocationEntryItem* item); gdouble From f5f1946c891169df185c835e9bd659476fe66ff5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Oct 2008 03:35:37 +0100 Subject: [PATCH 0434/2970] Preserve location entry model beyond widget lifetime --- midori/midori-locationaction.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 1e03ea99..9145d276 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -22,6 +22,8 @@ struct _MidoriLocationAction gchar* uri; gdouble progress; + + GtkTreeModel* model; }; struct _MidoriLocationActionClass @@ -199,6 +201,8 @@ midori_location_action_init (MidoriLocationAction* location_action) { location_action->uri = NULL; location_action->progress = 0.0; + + location_action->model = NULL; } static void @@ -208,6 +212,8 @@ midori_location_action_finalize (GObject* object) g_free (location_action->uri); + katze_object_assign (location_action->model, NULL); + G_OBJECT_CLASS (midori_location_action_parent_class)->finalize (object); } @@ -359,6 +365,7 @@ midori_location_action_connect_proxy (GtkAction* action, { GtkWidget* alignment; GtkWidget* entry; + MidoriLocationAction* location_action; GTK_ACTION_CLASS (midori_location_action_parent_class)->connect_proxy ( action, proxy); @@ -368,6 +375,14 @@ midori_location_action_connect_proxy (GtkAction* action, alignment = gtk_bin_get_child (GTK_BIN (proxy)); entry = gtk_bin_get_child (GTK_BIN (alignment)); + location_action = MIDORI_LOCATION_ACTION (action); + if (location_action->model) + gtk_combo_box_set_model (GTK_COMBO_BOX (entry), + location_action->model); + else + location_action->model = g_object_ref (gtk_combo_box_get_model ( + GTK_COMBO_BOX (entry))); + g_signal_connect (entry, "active-changed", G_CALLBACK (midori_location_action_active_changed_cb), action); g_object_connect (gtk_bin_get_child (GTK_BIN (entry)), From 4a3501a2790723a54e2e34a212a00d1c161021c2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Oct 2008 04:23:41 +0100 Subject: [PATCH 0435/2970] Share net between browser and views --- midori/midori-browser.c | 21 +++++++---------- midori/midori-view.c | 50 +++++++++++++++++++++++++++-------------- midori/midori-view.h | 2 +- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e7b43ee9..4ef511c0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1845,7 +1845,7 @@ _action_source_view_activate (GtkAction* action, { uri = g_strdup_printf ("view-source:%s", midori_view_get_display_uri (MIDORI_VIEW (view))); - source_view = midori_view_new (); + source_view = midori_view_new (browser->net); midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); midori_view_set_uri (MIDORI_VIEW (source_view), uri); midori_view_notify_icon_cb (MIDORI_VIEW (source_view), NULL, browser); @@ -3687,7 +3687,7 @@ midori_browser_init (MidoriBrowser* browser) STOCK_BOOKMARKS, _("Bookmarks")); /* Transfers */ - GtkWidget* panel = midori_view_new (); + GtkWidget* panel = midori_view_new (browser->net); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, @@ -3741,7 +3741,7 @@ midori_browser_init (MidoriBrowser* browser) STOCK_HISTORY, _("History")); /* Pageholder */ - browser->panel_pageholder = midori_view_new (); + browser->panel_pageholder = midori_view_new (browser->net); midori_view_set_settings (MIDORI_VIEW (browser->panel_pageholder), browser->settings); gtk_widget_show (browser->panel_pageholder); @@ -4357,8 +4357,7 @@ midori_browser_set_property (GObject* object, g_signal_handlers_disconnect_by_func (browser->settings, midori_browser_settings_notify, browser); - katze_object_assign (browser->settings, g_value_get_object (value)); - g_object_ref (browser->settings); + katze_object_assign (browser->settings, g_value_dup_object (value)); _midori_browser_update_settings (browser); g_signal_connect (browser->settings, "notify", G_CALLBACK (midori_browser_settings_notify), browser); @@ -4367,8 +4366,7 @@ midori_browser_set_property (GObject* object, break; case PROP_BOOKMARKS: ; /* FIXME: Disconnect handlers */ - katze_object_assign (browser->bookmarks, g_value_get_object (value)); - g_object_ref (browser->bookmarks); + katze_object_assign (browser->bookmarks, g_value_dup_object (value)); g_object_set (_action_by_name (browser, "Bookmarks"), "array", browser->bookmarks, NULL); midori_browser_load_bookmarks (browser); @@ -4376,8 +4374,7 @@ midori_browser_set_property (GObject* object, break; case PROP_TRASH: ; /* FIXME: Disconnect handlers */ - katze_object_assign (browser->trash, g_value_get_object (value)); - g_object_ref (browser->trash); + katze_object_assign (browser->trash, g_value_dup_object (value)); g_object_set (_action_by_name (browser, "Trash"), "array", browser->trash, NULL); /* FIXME: Connect to updates */ @@ -4385,8 +4382,7 @@ midori_browser_set_property (GObject* object, break; case PROP_SEARCH_ENGINES: ; /* FIXME: Disconnect handlers */ - katze_object_assign (browser->search_engines, g_value_get_object (value)); - g_object_ref (browser->search_engines); + katze_object_assign (browser->search_engines, g_value_dup_object (value)); midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), browser->search_engines); /* FIXME: Connect to updates */ @@ -4402,8 +4398,7 @@ midori_browser_set_property (GObject* object, break; case PROP_HISTORY: ; /* FIXME: Disconnect handlers */ - katze_object_assign (browser->history, g_value_get_object (value)); - g_object_ref (browser->history); + katze_object_assign (browser->history, g_value_dup_object (value)); midori_browser_load_history (browser); g_object_set (_action_by_name (browser, "RecentlyVisited"), "array", browser->history, NULL); diff --git a/midori/midori-view.c b/midori/midori-view.c index f505f248..2fa72822 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -99,7 +99,8 @@ enum PROP_PROGRESS, PROP_ZOOM_LEVEL, PROP_STATUSBAR_TEXT, - PROP_SETTINGS + PROP_SETTINGS, + PROP_NET }; enum { @@ -418,6 +419,15 @@ midori_view_class_init (MidoriViewClass* class) "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_NET, + g_param_spec_object ( + "net", + "Net", + "The associated net", + KATZE_TYPE_NET, + G_PARAM_READWRITE)); } static void @@ -979,21 +989,19 @@ midori_view_finalize (GObject* object) g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); - g_free (view->uri); - g_free (view->title); - if (view->icon) - g_object_unref (view->icon); - g_free (view->statusbar_text); - g_free (view->link_uri); - g_free (view->selected_text); - if (view->settings) - g_object_unref (view->settings); - if (view->item) - g_object_unref (view->item); + katze_assign (view->uri, NULL); + katze_assign (view->title, NULL); + katze_object_assign (view->icon, NULL); + katze_assign (view->statusbar_text, NULL); + katze_assign (view->link_uri, NULL); + katze_assign (view->selected_text, NULL); - g_free (view->download_manager); + katze_object_assign (view->settings, NULL); + katze_object_assign (view->item, NULL); - g_object_unref (view->net); + katze_assign (view->download_manager, NULL); + + katze_object_assign (view->net, NULL); /* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); @@ -1039,6 +1047,11 @@ midori_view_set_property (GObject* object, case PROP_SETTINGS: midori_view_set_settings (view, g_value_get_object (value)); break; + case PROP_NET: + katze_object_assign (view->net, g_value_dup_object (value)); + if (!view->net) + view->net = katze_net_new (); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1076,6 +1089,9 @@ midori_view_get_property (GObject* object, case PROP_SETTINGS: g_value_set_object (value, view->settings); break; + case PROP_NET: + g_value_set_object (value, view->net); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1084,16 +1100,16 @@ midori_view_get_property (GObject* object, /** * midori_view_new: - * @view: a #MidoriView + * @net: a #KatzeNet * * Creates a new view. * * Return value: a new #MidoriView **/ GtkWidget* -midori_view_new (void) +midori_view_new (KatzeNet* net) { - return g_object_new (MIDORI_TYPE_VIEW, NULL); + return g_object_new (MIDORI_TYPE_VIEW, "net", net, NULL); } static void diff --git a/midori/midori-view.h b/midori/midori-view.h index 02220dbd..13a8c4ba 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -51,7 +51,7 @@ GType midori_view_get_type (void); GtkWidget* -midori_view_new (void); +midori_view_new (KatzeNet* net); void midori_view_set_settings (MidoriView* view, From 86af851d4c6062e67d591b6a6825798e915a71f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 27 Oct 2008 22:36:41 +0100 Subject: [PATCH 0436/2970] Don't doublicate the "." in cached filenames --- katze/katze-net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index a46913db..efe3b603 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -147,8 +147,8 @@ katze_net_get_cached_path (KatzeNet* net, #endif extension = g_strrstr (uri, "."); - cached_filename = g_strdup_printf ("%s%s%s", checksum, - extension ? "." : "", extension ? extension : ""); + cached_filename = g_strdup_printf ("%s%s", checksum, + extension ? extension : ""); g_free (checksum); cached_path = g_build_filename (cache_path, cached_filename, NULL); g_free (cached_filename); From f7c1edacbe2cbcebb181b9452ccd436ab6528140 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Mon, 27 Oct 2008 22:43:27 +0100 Subject: [PATCH 0437/2970] Limit the number of items in the location popup --- midori/midori-locationentry.c | 78 +++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 21 deletions(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index d90e3f88..8862b092 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -16,6 +16,7 @@ #include #define DEFAULT_ICON GTK_STOCK_FILE +#define MAX_ITEMS 25 struct _MidoriLocationEntry { @@ -85,7 +86,8 @@ gtk_entry_get_pixel_ranges (GtkEntry *entry, { gint start_char, end_char; - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_char, &end_char)) + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), + &start_char, &end_char)) { PangoLayout *layout = gtk_entry_get_layout (entry); PangoLayoutLine *line = pango_layout_get_lines (layout)->data; @@ -94,7 +96,8 @@ gtk_entry_get_pixel_ranges (GtkEntry *entry, gint end_index = g_utf8_offset_to_pointer (text, end_char) - text; gint real_n_ranges, i; - pango_layout_line_get_x_ranges (line, start_index, end_index, ranges, &real_n_ranges); + pango_layout_line_get_x_ranges (line, + start_index, end_index, ranges, &real_n_ranges); if (ranges) { @@ -244,7 +247,8 @@ get_layout_position (GtkEntry *entry, gtk_entry_get_text_area_size (entry, NULL, NULL, &area_width, &area_height); _gtk_entry_effective_inner_border (entry, &inner_border); - area_height = PANGO_SCALE * (area_height - inner_border.top - inner_border.bottom); + area_height = PANGO_SCALE * + (area_height - inner_border.top - inner_border.bottom); line = pango_layout_get_lines (layout)->data; pango_layout_line_get_extents (line, NULL, &logical_rect); @@ -300,7 +304,8 @@ gtk_entry_draw_text (GtkEntry *entry) gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); pango_cairo_show_layout (cr, layout); - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) + if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), + &start_pos, &end_pos)) { gint *ranges; gint n_ranges, i; @@ -326,7 +331,8 @@ gtk_entry_draw_text (GtkEntry *entry) for (i = 0; i < n_ranges; ++i) cairo_rectangle (cr, - inner_border.left - entry->scroll_offset + ranges[2 * i], + inner_border.left - + entry->scroll_offset + ranges[2 * i], y, ranges[2 * i + 1], logical_rect.height); @@ -415,8 +421,10 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) location_entry->progress = 0.0; entry = gtk_icon_entry_new (); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); - g_signal_connect (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); + g_signal_connect (entry, "key-press-event", + G_CALLBACK (entry_key_press_event), location_entry); #ifdef HAVE_ENTRY_PROGRESS g_signal_connect_after (entry, "expose-event", G_CALLBACK (entry_expose_event), location_entry); @@ -425,29 +433,37 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) gtk_widget_show (entry); gtk_container_add (GTK_CONTAINER (location_entry), entry); - store = gtk_list_store_new (N_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); - g_object_set (G_OBJECT (location_entry), "model", store, NULL); + store = gtk_list_store_new (N_COLS, + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); + g_object_set (location_entry, "model", store, NULL); g_object_unref (store); - gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (location_entry), URI_COL); + gtk_combo_box_entry_set_text_column ( + GTK_COMBO_BOX_ENTRY (location_entry), URI_COL); gtk_cell_layout_clear (GTK_CELL_LAYOUT (location_entry)); /* setup the renderer for the favicon */ renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), renderer, "pixbuf", FAVICON_COL, NULL); - g_object_set (G_OBJECT (renderer), "xpad", 5, "ypad", 5, "yalign", 0.0, NULL); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), + renderer, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), + renderer, "pixbuf", FAVICON_COL, NULL); + g_object_set (renderer, "xpad", 5, "ypad", 5, "yalign", 0.0, NULL); /* setup the renderer for the uri/title */ renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), renderer, "markup", TITLE_COL, NULL); - g_object_set (G_OBJECT (renderer), "xpad", 5, "ypad", 5, NULL); - g_object_set (G_OBJECT (renderer), "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), + renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), + renderer, "markup", TITLE_COL, NULL); + g_object_set (renderer, "xpad", 5, "ypad", 5, NULL); + g_object_set (renderer, "ellipsize-set", TRUE, + "ellipsize", PANGO_ELLIPSIZE_END, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), -1); - g_signal_connect (location_entry, "changed", G_CALLBACK (midori_location_entry_changed), NULL); + g_signal_connect (location_entry, "changed", + G_CALLBACK (midori_location_entry_changed), NULL); } static gboolean @@ -731,6 +747,8 @@ midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, * @item: a MidoriLocationItem * * Prepends @item if it is not already in the list. + * If the item already exists, it is moved before the first item. + * If the maximum is reached, the last item is removed. **/ void midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, @@ -738,6 +756,8 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, { GtkTreeModel* model; GtkTreeIter iter; + GtkTreeIter index; + gint n; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); @@ -745,8 +765,20 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) + { + n = gtk_tree_model_iter_n_children (model, NULL); + if (n >= MAX_ITEMS) + { + gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); + gtk_list_store_remove (GTK_LIST_STORE (model), &index); + } gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); - + } + else + { + gtk_tree_model_get_iter_first (model, &index); + gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); + } midori_location_entry_set_item (location_entry, &iter, item); } @@ -756,6 +788,7 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, * @item: a MidoriLocationItem * * Appends @item if it is not already in the list. + * @item is not added if the maximum is reached. **/ void midori_location_entry_append_item (MidoriLocationEntry* location_entry, @@ -770,8 +803,11 @@ midori_location_entry_append_item (MidoriLocationEntry* location_entry, model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - + { + if (gtk_tree_model_iter_n_children (model, NULL) >= MAX_ITEMS) + return; + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + } midori_location_entry_set_item (location_entry, &iter, item); } From 1c5348e4cf11dd87bfa5d5564886f386103590d2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Oct 2008 22:57:28 +0100 Subject: [PATCH 0438/2970] Explain how to debug Midori in INSTALL file --- INSTALL | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/INSTALL b/INSTALL index 9fe73038..649fe430 100644 --- a/INSTALL +++ b/INSTALL @@ -18,6 +18,28 @@ You can install it with './waf install' For further options run './waf --help' ++++ Debugging Midori +++ + +Run './waf configure -d debug' from the Midori folder. + +Run './waf build' + +Midori is now built with debugging symbols. + +Make sure you have installed 'gdb', the GNU Debugger. + +Run Midori as 'gdb _build_/default/midori'. + +Try to reproduce a crash that you experienced earlier, +this time Midori will freeze at the point of the crash. +Switch to your terminal, type bt ('backtrace') and hit Return. +What you obtained now is a backtrace that should include +function names and line numbers. + +For further information a tutorial for gdb and +reading up on how you can install debugging +symbols for libraries used by Midori are recommended. + +++ Legacy support +++ There are also autotools build files available. This @@ -33,3 +55,6 @@ Run 'make' The usual autotools way works here, please refer to according documentation in case of questions. + +Note that the autotools based build is not a +full replacement for the recommended system. From 973b149c5ee02b8841ef8d009e03eba1d7b03d23 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Wed, 29 Oct 2008 03:43:08 +0100 Subject: [PATCH 0439/2970] Allow adding bookmarks from history items --- midori/midori-browser.c | 46 +++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4ef511c0..4ac5bb82 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -489,9 +489,9 @@ midori_view_notify_statusbar_text_cb (MidoriView* view, static void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, - KatzeItem* bookmark) + KatzeItem* bookmark, + gboolean new_bookmark) { - gboolean new_bookmark; GtkWidget* dialog; GtkSizeGroup* sizegroup; GtkWidget* view; @@ -506,7 +506,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkTreeModel* treemodel; GtkTreeIter iter; - new_bookmark = bookmark == NULL; dialog = gtk_dialog_new_with_buttons ( new_bookmark ? _("New bookmark") : _("Edit bookmark"), GTK_WINDOW (browser), @@ -520,7 +519,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - if (new_bookmark) + if (!bookmark) { view = midori_browser_get_current_tab (browser); bookmark = g_object_new (KATZE_TYPE_ITEM, @@ -548,7 +547,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_desc = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_desc), TRUE); - if (!new_bookmark) + if (bookmark) { value = katze_item_get_text (bookmark); gtk_entry_set_text (GTK_ENTRY (entry_desc), value ? value : ""); @@ -628,7 +627,7 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem, item = katze_item_new (); katze_item_set_uri (item, uri); browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); - midori_browser_edit_bookmark_dialog_new (browser, item); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); } static gboolean @@ -2249,6 +2248,7 @@ _midori_panel_history_popup (GtkWidget* widget, _action_set_sensitive (browser, "HistoryOpen", is_history_item); _action_set_sensitive (browser, "HistoryOpenTab", is_history_item); + _action_set_sensitive (browser, "HistoryAddBookmark", is_history_item); sokoke_widget_popup (widget, GTK_MENU (browser->popup_history), event, SOKOKE_MENU_POSITION_CURSOR); @@ -2296,6 +2296,7 @@ midori_panel_remove_history_item (GtkTreeView* treeview) GtkTreeModel* treemodel; GtkTreeIter iter; GtkTreeIter child_iter; + GtkTreeSelection* selection; KatzeItem* item; KatzeItem* child; KatzeArray* parent; @@ -2325,7 +2326,11 @@ midori_panel_remove_history_item (GtkTreeView* treeview) { parent = katze_item_get_parent (item); katze_array_remove_item (parent, item); - gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); + if (gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter)) + { + selection = gtk_tree_view_get_selection (treeview); + gtk_tree_selection_select_iter (selection, &iter); + } g_object_unref (item); } } @@ -2489,7 +2494,7 @@ static void _action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) { - midori_browser_edit_bookmark_dialog_new (browser, NULL); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE); } static void @@ -2859,7 +2864,7 @@ _action_bookmark_edit_activate (GtkAction* action, { gtk_tree_model_get (model, &iter, 0, &item, -1); /* if (katze_item_get_uri (item)) */ - midori_browser_edit_bookmark_dialog_new (browser, item); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); } } @@ -2952,6 +2957,24 @@ _action_history_clear_activate (GtkAction* action, katze_array_clear (browser->history); } +static void +_action_history_add_bookmark_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + tree_view = GTK_TREE_VIEW (browser->panel_history); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE); + g_object_unref (item); + } +} + static void _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) @@ -3141,6 +3164,9 @@ static const GtkActionEntry entries[] = { { "HistoryOpenTab", STOCK_TAB_NEW, N_("Open in New _Tab"), "", N_("Open the selected history item in a new tab"), G_CALLBACK (_action_history_open_tab_activate) }, + { "HistoryAddBookmark", STOCK_BOOKMARK_ADD, + NULL, "", + N_("Add the selected history item as a bookmark"), G_CALLBACK (_action_history_add_bookmark_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", @@ -3361,6 +3387,8 @@ static const gchar* ui_markup = "" "" "" + "" + "" "" "" ""; From 27d5b35f1d85c999021967ddeebf68e4014f9544 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Oct 2008 04:07:37 +0100 Subject: [PATCH 0440/2970] Ellipsize bookmarkbar items reasonably --- katze/katze-arrayaction.c | 49 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index b06c41a6..fbbdf405 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -14,8 +14,9 @@ #include "katze-net.h" #include "katze-utils.h" -#include +#include #include +#include struct _KatzeArrayAction { @@ -356,6 +357,25 @@ katze_array_action_create_tool_item (GtkAction* action) return toolitem; } +static void +katze_array_action_label_notify_cb (GtkToolButton* item, + GParamSpec* pspec, + GtkLabel* label) +{ + const gchar* property; + const gchar* text; + + if (!G_IS_PARAM_SPEC_STRING (pspec)) + return; + + property = g_param_spec_get_name (pspec); + if (!strcmp (property, "label")) + { + text = gtk_tool_button_get_label (item); + gtk_label_set_text (label, text); + } +} + static void katze_array_action_item_notify_cb (KatzeItem* item, GParamSpec* pspec, @@ -404,6 +424,21 @@ katze_array_action_item_notify_cb (KatzeItem* item, } } +/** + * katze_array_action_create_tool_item_for: + * @array_action: a #KatzeArrayAction + * @item: a #KatzeItem + * + * Creates a tool item for a particular @item, that also + * reflects changes to its properties. In the case of + * an array, the item will create a popup menu with + * the contained items. + * + * Note that the label is reasonably ellipsized for you, + * much like katze_image_menu_item_new_ellipsized(). + * + * Return value: a new tool item + **/ GtkToolItem* katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, KatzeItem* item) @@ -414,6 +449,7 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, GtkToolItem* toolitem; GdkPixbuf* icon; GtkWidget* image; + GtkWidget* label; title = katze_item_get_name (item); uri = katze_item_get_uri (item); @@ -434,6 +470,17 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, g_object_unref (icon); gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + label = gtk_label_new (NULL); + /* FIXME: Should text direction be respected here? */ + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gtk_label_set_max_width_chars (GTK_LABEL (label), 25); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE); + gtk_widget_show (label); + gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (toolitem), label); + /* GtkToolItem won't update our custom label, so we + apply a little bit of 'magic' to fix that. */ + g_signal_connect (toolitem, "notify", + G_CALLBACK (katze_array_action_label_notify_cb), label); if (title) gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), title); else From 0a65f30926e291b858d1b46018b9e84894470c0b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Oct 2008 02:19:52 +0100 Subject: [PATCH 0441/2970] Refactor bookmark context menu, apply it on the bookmarkbar --- midori/main.c | 2 + midori/midori-browser.c | 354 +++++++++++++++++++--------------------- midori/midori-stock.h | 4 +- 3 files changed, 168 insertions(+), 192 deletions(-) diff --git a/midori/main.c b/midori/main.c index 6589a5aa..043f86ec 100644 --- a/midori/main.c +++ b/midori/main.c @@ -77,6 +77,8 @@ stock_items_init (void) { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, + { STOCK_OPEN_IN_TAB, N_("Open in New _Tab"), 0, 0, GTK_STOCK_ADD }, + { STOCK_OPEN_IN_WINDOW, N_("Open in New _Window"), 0, 0, GTK_STOCK_ADD }, { STOCK_PAGE_HOLDER, N_("_Pageholder"), 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4ac5bb82..33078e4f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -46,8 +46,6 @@ struct _MidoriBrowser GtkActionGroup* action_group; GtkWidget* menubar; GtkWidget* menu_tools; - GtkWidget* popup_bookmark; - GtkWidget* popup_history; GtkWidget* throbber; GtkWidget* navigationbar; GtkWidget* button_fullscreen; @@ -610,7 +608,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, g_object_ref (bookmark); } - /* FIXME: Update navigationbar */ /* FIXME: Update panel in other windows */ } gtk_widget_destroy (dialog); @@ -2149,20 +2146,151 @@ midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, } static void -_midori_panel_bookmarks_popup (GtkWidget* widget, - GdkEventButton* event, - KatzeItem* item, - MidoriBrowser* browser) +midori_browser_bookmark_popup_item (GtkWidget* menu, + const gchar* stock_id, + KatzeItem* item, + gpointer callback, + MidoriBrowser* browser) { const gchar* uri; + GtkWidget* menuitem; uri = katze_item_get_uri (item); - _action_set_sensitive (browser, "BookmarkOpen", uri != NULL); - _action_set_sensitive (browser, "BookmarkOpenTab", uri != NULL); - _action_set_sensitive (browser, "BookmarkOpenWindow", uri != NULL); + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (!strcmp (stock_id, GTK_STOCK_EDIT)) + gtk_widget_set_sensitive (menuitem, + KATZE_IS_ARRAY (item) || uri != NULL); + else if (strcmp (stock_id, GTK_STOCK_DELETE)) + gtk_widget_set_sensitive (menuitem, uri != NULL); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), browser); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} - sokoke_widget_popup (widget, GTK_MENU (browser->popup_bookmark), +static void +midori_browser_bookmark_open_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + midori_browser_set_current_uri (browser, uri); +} + +static void +midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + KatzeItem* item; + const gchar* uri; + guint n; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + n = midori_browser_add_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); + } +} + +static void +midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); +} + +static void +midori_browser_bookmark_bookmark_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE); +} + +static void +midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (KATZE_IS_ARRAY (item) || (uri && *uri)) + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); +} + +static void +midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + KatzeItem* item; + const gchar* uri; + KatzeItem* parent; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (KATZE_IS_ARRAY (item) || (uri && *uri)) + { + parent = katze_item_get_parent (item); + katze_array_remove_item (KATZE_ARRAY (parent), item); + } +} + +static void +midori_browser_bookmark_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeItem* item, + gboolean history_item, + MidoriBrowser* browser) +{ + GtkWidget* menu; + GtkWidget* menuitem; + + menu = gtk_menu_new (); + midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, + item, midori_browser_bookmark_open_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, STOCK_OPEN_IN_TAB, + item, midori_browser_bookmark_open_in_tab_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, STOCK_OPEN_IN_WINDOW, + item, midori_browser_bookmark_open_in_window_activate_cb, browser); + if (history_item && !KATZE_IS_ARRAY (item)) + midori_browser_bookmark_popup_item (menu, STOCK_BOOKMARK_ADD, + item, midori_browser_bookmark_bookmark_activate_cb, browser); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + if (!history_item) + midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, + item, midori_browser_bookmark_edit_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, + item, midori_browser_bookmark_delete_activate_cb, browser); + + sokoke_widget_popup (widget, GTK_MENU (menu), event, SOKOKE_MENU_POSITION_CURSOR); } @@ -2193,7 +2321,7 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, } } else - _midori_panel_bookmarks_popup (widget, event, item, browser); + midori_browser_bookmark_popup (widget, event, item, FALSE, browser); return TRUE; } return FALSE; @@ -2210,7 +2338,7 @@ midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - _midori_panel_bookmarks_popup (widget, NULL, item, browser); + midori_browser_bookmark_popup (widget, NULL, item, FALSE, browser); } } @@ -2244,14 +2372,7 @@ _midori_panel_history_popup (GtkWidget* widget, KatzeItem* item, MidoriBrowser* browser) { - gboolean is_history_item = (KATZE_IS_ITEM (item) && !KATZE_IS_ARRAY (item)); - - _action_set_sensitive (browser, "HistoryOpen", is_history_item); - _action_set_sensitive (browser, "HistoryOpenTab", is_history_item); - _action_set_sensitive (browser, "HistoryAddBookmark", is_history_item); - - sokoke_widget_popup (widget, GTK_MENU (browser->popup_history), - event, SOKOKE_MENU_POSITION_CURSOR); + midori_browser_bookmark_popup (widget, event, item, TRUE, browser); } static gboolean @@ -2483,8 +2604,8 @@ midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, } else if (event->button == 3) { - midori_browser_toolbar_popup_context_menu_cb (browser->navigationbar, - event->x, event->y, event->button, browser); + item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); + midori_browser_bookmark_popup (toolitem, NULL, item, FALSE, browser); return TRUE; } return FALSE; @@ -2782,138 +2903,6 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_update_progress (browser, MIDORI_VIEW (view)); } -static void -_action_bookmark_open_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - - tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - midori_browser_set_current_uri (browser, uri); - } -} - -static void -_action_bookmark_open_tab_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - gint n; - - tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - { - n = midori_browser_add_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); - } - } -} - -static void -_action_bookmark_open_window_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - gint n; - - tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - { - n = midori_browser_add_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); - } - } -} - -static void -_action_bookmark_edit_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - /* if (katze_item_get_uri (item)) */ - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); - } -} - -static void -_action_history_open_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - - tree_view = GTK_TREE_VIEW (browser->panel_history); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - midori_browser_set_current_uri (browser, uri); - g_object_unref (item); - } -} - -static void -_action_history_open_tab_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - gint n; - - tree_view = GTK_TREE_VIEW (browser->panel_history); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - { - n = midori_browser_add_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); - } - g_object_unref (item); - } -} - static void _action_history_delete_activate (GtkAction* action, MidoriBrowser* browser) @@ -3000,6 +2989,24 @@ _action_trash_empty_activate (GtkAction* action, _midori_browser_update_actions (browser); } +static void +_action_bookmark_edit_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkTreeView* tree_view; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); + } +} + static void _action_bookmark_delete_activate (GtkAction* action, MidoriBrowser* browser) @@ -3137,15 +3144,6 @@ static const GtkActionEntry entries[] = { { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, - { "BookmarkOpen", GTK_STOCK_OPEN, - NULL, "", - N_("Open the selected bookmark"), G_CALLBACK (_action_bookmark_open_activate) }, - { "BookmarkOpenTab", STOCK_TAB_NEW, - N_("Open in New _Tab"), "", - N_("Open the selected bookmark in a new tab"), G_CALLBACK (_action_bookmark_open_tab_activate) }, - { "BookmarkOpenWindow", STOCK_WINDOW_NEW, - N_("Open in New _Window"), "", - N_("Open the selected bookmark in a new window"), G_CALLBACK (_action_bookmark_open_window_activate) }, { "BookmarkEdit", GTK_STOCK_EDIT, NULL, "", N_("Edit the selected bookmark"), G_CALLBACK (_action_bookmark_edit_activate) }, @@ -3158,12 +3156,6 @@ static const GtkActionEntry entries[] = { { "HistoryClear", GTK_STOCK_CLEAR, NULL, "", N_("Clear the entire history"), G_CALLBACK (_action_history_clear_activate) }, - { "HistoryOpen", GTK_STOCK_OPEN, - NULL, "", - N_("Open the selected history item"), G_CALLBACK (_action_history_open_activate) }, - { "HistoryOpenTab", STOCK_TAB_NEW, - N_("Open in New _Tab"), "", - N_("Open the selected history item in a new tab"), G_CALLBACK (_action_history_open_tab_activate) }, { "HistoryAddBookmark", STOCK_BOOKMARK_ADD, NULL, "", N_("Add the selected history item as a bookmark"), G_CALLBACK (_action_history_add_bookmark_activate) }, @@ -3371,26 +3363,10 @@ static const gchar* ui_markup = "" "" "" - "" - "" - "" - "" - "" - "" - "" - "" "" "" "" "" - "" - "" - "" - "" - "" - "" - "" - "" ""; static void @@ -3603,10 +3579,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem); gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); - browser->popup_bookmark = g_object_ref (gtk_ui_manager_get_widget ( - ui_manager, "/popup_bookmark")); - browser->popup_history = g_object_ref (gtk_ui_manager_get_widget ( - ui_manager, "/popup_history")); browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); menuitem = gtk_separator_menu_item_new (); @@ -4150,6 +4122,8 @@ browser_bookmarks_add_item_cb (KatzeArray* array, g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), "KatzeItem", item); } + /* FIXME: Work around the inability to apply button events + to separator tool items */ gtk_widget_show (GTK_WIDGET (toolitem)); gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); } diff --git a/midori/midori-stock.h b/midori/midori-stock.h index b82c6fcb..04db4cbe 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -31,11 +31,11 @@ #define STOCK_PAGE_HOLDER GTK_STOCK_ORIENTATION_PORTRAIT #define STOCK_STYLE "gnome-settings-theme" #define STOCK_STYLES "gnome-settings-theme" +#define STOCK_OPEN_IN_TAB "stock_new-tab" +#define STOCK_OPEN_IN_WINDOW "stock_new-tab" #define STOCK_TRANSFER "package" #define STOCK_TRANSFERS "package" -/* We assume that these legacy icon names are usually present */ - #define STOCK_BOOKMARK_ADD "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME #define STOCK_IMAGE "gnome-mime-image" From 80128d931546cb1629df6a7c813b3f0621daec4d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Oct 2008 02:21:19 +0100 Subject: [PATCH 0442/2970] Apply some cleanup with regard to referencing and more --- midori/midori-app.c | 32 +++++++++++--------------------- midori/midori-panel.c | 2 +- midori/midori-preferences.c | 1 + midori/midori-view.c | 18 +++++++++++------- po/wscript_build | 8 +++++--- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 2ce8d656..9264ae07 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -337,19 +337,13 @@ midori_app_finalize (GObject* object) g_list_free (app->browsers); g_object_unref (app->accel_group); - if (app->settings) - g_object_unref (app->settings); - if (app->bookmarks) - g_object_unref (app->bookmarks); - if (app->trash) - g_object_unref (app->trash); - if (app->search_engines) - g_object_unref (app->search_engines); - if (app->history) - g_object_unref (app->history); + katze_object_assign (app->settings, NULL); + katze_object_assign (app->bookmarks, NULL); + katze_object_assign (app->trash, NULL); + katze_object_assign (app->search_engines, NULL); + katze_object_assign (app->history, NULL); - if (app->instance) - g_object_unref (app->instance); + katze_object_assign (app->instance, NULL); G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); } @@ -365,27 +359,23 @@ midori_app_set_property (GObject* object, switch (prop_id) { case PROP_SETTINGS: - katze_object_assign (app->settings, g_value_get_object (value)); - g_object_ref (app->settings); + katze_object_assign (app->settings, g_value_dup_object (value)); /* FIXME: Propagate settings to all browsers */ break; case PROP_BOOKMARKS: - katze_object_assign (app->bookmarks, g_value_get_object (value)); - g_object_ref (app->bookmarks); + katze_object_assign (app->bookmarks, g_value_dup_object (value)); /* FIXME: Propagate bookmarks to all browsers */ break; case PROP_TRASH: - katze_object_assign (app->trash, g_value_get_object (value)); - g_object_ref (app->trash); + katze_object_assign (app->trash, g_value_dup_object (value)); /* FIXME: Propagate trash to all browsers */ break; case PROP_SEARCH_ENGINES: - katze_object_assign (app->search_engines, g_value_get_object (value)); - g_object_ref (app->search_engines); + katze_object_assign (app->search_engines, g_value_dup_object (value)); /* FIXME: Propagate search engines to all browsers */ break; case PROP_HISTORY: - katze_object_assign (app->history, g_value_get_object (value)); + katze_object_assign (app->history, g_value_dup_object (value)); /* FIXME: Propagate history to all browsers */ break; default: diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 9f62f86b..c4fd41be 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -261,7 +261,7 @@ midori_panel_set_property (GObject* object, g_value_get_enum (value)); break; case PROP_MENU: - katze_object_assign (panel->menu, g_value_get_object (value)); + katze_object_assign (panel->menu, g_value_dup_object (value)); /* FIXME: Move existing items to the new menu */ break; case PROP_PAGE: diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index cf34039e..6127bc7a 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -17,6 +17,7 @@ #include "sokoke.h" +#include #include struct _MidoriPreferences diff --git a/midori/midori-view.c b/midori/midori-view.c index 2fa72822..c073fce2 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -946,6 +946,14 @@ webkit_web_view_window_object_cleared_cb (GtkWidget* web_view, web_frame, js_context, js_window); } +static void +webkit_web_view_destroy_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame) +{ + g_signal_handlers_disconnect_by_func (web_frame, + webkit_web_frame_load_done_cb, gtk_widget_get_parent (web_view)); +} + static void midori_view_init (MidoriView* view) { @@ -982,7 +990,6 @@ static void midori_view_finalize (GObject* object) { MidoriView* view; - /* WebKitWebFrame* web_frame; */ view = MIDORI_VIEW (object); @@ -1003,11 +1010,6 @@ midori_view_finalize (GObject* object) katze_object_assign (view->net, NULL); - /* web_frame = webkit_web_view_get_main_frame - (WEBKIT_WEB_VIEW (view->web_view)); - g_signal_handlers_disconnect_by_func (web_frame, - webkit_web_frame_load_done, view); */ - G_OBJECT_CLASS (midori_view_parent_class)->finalize (object); } @@ -1045,7 +1047,7 @@ midori_view_set_property (GObject* object, katze_assign (view->statusbar_text, g_value_dup_string (value)); break; case PROP_SETTINGS: - midori_view_set_settings (view, g_value_get_object (value)); + midori_view_set_settings (view, g_value_dup_object (value)); break; case PROP_NET: katze_object_assign (view->net, g_value_dup_object (value)); @@ -1261,6 +1263,8 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_console_message_cb, view, "signal::window-object-cleared", webkit_web_view_window_object_cleared_cb, view, + "signal::destroy", + webkit_web_view_destroy_cb, web_frame, NULL); g_object_connect (web_frame, "signal::load-done", diff --git a/po/wscript_build b/po/wscript_build index fe03f6c6..28cda9f1 100644 --- a/po/wscript_build +++ b/po/wscript_build @@ -6,15 +6,17 @@ import Params import pproc as subprocess import os +APPNAME = 'midori' + if bld.env ()['INTLTOOL_UPDATE']: os.chdir ('./po') try: try: - size_old = os.stat ('midori.pot').st_size + size_old = os.stat (APPNAME + '.pot').st_size except: size_old = 0 subprocess.call (['intltool-update', '--pot']) - size_new = os.stat ('midori.pot').st_size + size_new = os.stat (APPNAME + '.pot').st_size if size_new <> size_old: Params.pprint ('YELLOW', "Updated po template.") try: @@ -29,4 +31,4 @@ if bld.env ()['INTLTOOL_UPDATE']: os.chdir ('..') obj = bld.create_obj ('intltool_po') -obj.appname = 'midori' +obj.appname = APPNAME From 28ccfd8743a1c58e269c5058481c83a25b83afb4 Mon Sep 17 00:00:00 2001 From: Elias Julkunen Date: Thu, 30 Oct 2008 02:34:40 +0100 Subject: [PATCH 0443/2970] Add Finnish translation. --- AUTHORS | 1 + po/LINGUAS | 2 +- po/fi.po | 1394 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1396 insertions(+), 1 deletion(-) create mode 100644 po/fi.po diff --git a/AUTHORS b/AUTHORS index f0e7c330..dcf6c455 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,6 +23,7 @@ Translations: es: Miguel Anxo Bouzada es: Christian Dywan et: Kristjan Siimson + fi: Elias Julkunen fr: Christian Dywan fr: Adrien Nader fr: Robert-André Mauchin diff --git a/po/LINGUAS b/po/LINGUAS index 95b72068..495e40cd 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fr gl hu pl ru sv +de es et fi fr gl hu pl ru sv diff --git a/po/fi.po b/po/fi.po new file mode 100644 index 00000000..d558fdb9 --- /dev/null +++ b/po/fi.po @@ -0,0 +1,1394 @@ +# Finnish translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Elias Julkunen , 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.0.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-10-26 14:27+0200\n" +"PO-Revision-Date: 2008-10-28 21:34+0200\n" +"Last-Translator: Elias Julkunen \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Kevyt verkkoselain" + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1100 +#: ../midori/main.c:1109 +#: ../midori/main.c:1120 +#: ../midori/main.c:1144 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Verkkoselain" + +#: ../midori/main.c:71 +msgid "_Bookmark" +msgstr "_Kirjanmerkki" + +#: ../midori/main.c:72 +#: ../midori/midori-browser.c:3509 +msgid "_Bookmarks" +msgstr "_Kirjanmerkit" + +#: ../midori/main.c:73 +msgid "_Add Bookmark" +msgstr "_Lisää kirjanmerkki" + +#: ../midori/main.c:74 +msgid "_Console" +msgstr "_Konsoli" + +#: ../midori/main.c:75 +msgid "_Disable" +msgstr "_Poista käytöstä" + +#: ../midori/main.c:76 +msgid "_Enable" +msgstr "_Käytä" + +#: ../midori/main.c:77 +msgid "_Extensions" +msgstr "_Liitännäiset" + +#: ../midori/main.c:78 +msgid "_History" +msgstr "_Historia" + +#: ../midori/main.c:79 +msgid "_Homepage" +msgstr "_Kotisivu" + +#: ../midori/main.c:80 +msgid "_Pageholder" +msgstr "_Sivun pitäjä" + +#: ../midori/main.c:81 +msgid "_Userscripts" +msgstr "Käyttäjän _skriptit" + +#: ../midori/main.c:82 +msgid "User_styles" +msgstr "Käyttäjän _tyylit" + +#: ../midori/main.c:83 +msgid "New _Tab" +msgstr "Uusi _välilehti" + +#: ../midori/main.c:84 +msgid "_Transfers" +msgstr "_Siirrot" + +#: ../midori/main.c:85 +msgid "_Closed Tabs and Windows" +msgstr "_Suljetut välilehdet ja ikkunat" + +#: ../midori/main.c:86 +msgid "New _Window" +msgstr "Uusi _ikkuna" + +#: ../midori/main.c:136 +#, c-format +msgid "The configuration couldn't be loaded. %s\n" +msgstr "Asetuksia ei voitu ladata. %s\n" + +#: ../midori/main.c:191 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../midori/main.c:198 +#: ../midori/main.c:267 +#, c-format +msgid "Unhandled settings value '%s'" +msgstr "Käsittämätön asetusarvo \"%s\"" + +#: ../midori/main.c:526 +#: ../midori/main.c:534 +#: ../midori/main.c:564 +#: ../midori/main.c:573 +msgid "Malformed document." +msgstr "Virheellinen dokumentti." + +#: ../midori/main.c:556 +msgid "File not found." +msgstr "Tiedostoa ei löydy" + +#: ../midori/main.c:594 +#: ../midori/main.c:626 +#, c-format +msgid "Error opening database: %s\n" +msgstr "Virhe avattaessa tietokantaa: %s\n" + +#: ../midori/main.c:681 +#, c-format +msgid "Failed to remove history item. %s\n" +msgstr "Historiatietuetta ei voitu poistaa. %s\n" + +#: ../midori/main.c:705 +#, c-format +msgid "Failed to clear history. %s\n" +msgstr "Historiaa ei voitu tyhjentää. %s\n" + +#: ../midori/main.c:738 +#: ../midori/main.c:753 +#, c-format +msgid "Failed to add history item. %s\n" +msgstr "Historiatietuetta ei voitu lisätä. %s\n" + +#: ../midori/main.c:870 +#, c-format +msgid "Failed to remove old history items. %s\n" +msgstr "Vanhoja historiatietueita ei voitu poistaa. %s\n" + +#: ../midori/main.c:1002 +#: ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Kirjoitus epäonnistui." + +#: ../midori/main.c:1027 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Istuntoa ei voitu tallentaa. %s" + +#: ../midori/main.c:1059 +msgid "Run the specified filename as javascript" +msgstr "Suorita annettu tiedostonimi javascriptinä" + +#: ../midori/main.c:1061 +msgid "Display program version" +msgstr "Näytä sovelluksen versio" + +#: ../midori/main.c:1063 +msgid "URIs" +msgstr "URL-osoitteet" + +#: ../midori/main.c:1097 +msgid "[URIs]" +msgstr "[URL-osoitteet]" + +#: ../midori/main.c:1121 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Lähetä kommentteja, ehdotuksia ja ohjelmavirheitä osoitteeseen:" + +#: ../midori/main.c:1123 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1144 +msgid "No filename specified" +msgstr "Tiedostonimeä ei määritelty" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:1162 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori on jo käynnissä, muttei vastaa.\n" + +#: ../midori/main.c:1196 +#, c-format +msgid "The bookmarks couldn't be loaded. %s\n" +msgstr "Kirjanmerkkejä ei voitu ladata. %s\n" + +#: ../midori/main.c:1210 +#, c-format +msgid "The session couldn't be loaded. %s\n" +msgstr "Istuntoa ei voitu ladata. %s\n" + +#: ../midori/main.c:1222 +#, c-format +msgid "The trash couldn't be loaded. %s\n" +msgstr "Roskakoria ei voitu ladata. %s\n" + +#: ../midori/main.c:1235 +#, c-format +msgid "The history couldn't be loaded. %s\n" +msgstr "Historiaa ei voitu ladata. %s\n" + +#: ../midori/main.c:1248 +msgid "The following errors occured:" +msgstr "Seuraavat virheet tapahtuivat:" + +#: ../midori/main.c:1407 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Hakumoottoreita ei voitu tallentaa. %s" + +#: ../midori/main.c:1417 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Kirjanmerkkejä ei voitu tallentaa. %s" + +#: ../midori/main.c:1426 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Roskakoria ei voitu tallentaa. %s" + +#: ../midori/main.c:1434 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Asetuksia ei voitu tallentaa. %s" + +#: ../midori/midori-addons.c:87 +#: ../midori/midori-websettings.c:207 +msgid "None" +msgstr "Ei mitään" + +#: ../midori/midori-addons.c:88 +#: ../midori/midori-browser.c:3750 +msgid "Extensions" +msgstr "Liitännäiset" + +#: ../midori/midori-addons.c:89 +#: ../midori/midori-browser.c:3733 +msgid "Userscripts" +msgstr "Käyttäjän skriptit" + +#: ../midori/midori-addons.c:90 +#: ../midori/midori-browser.c:3741 +msgid "Userstyles" +msgstr "Käyttäjän tyylit" + +#: ../midori/midori-browser.c:246 +#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3047 +msgid "Reload the current page" +msgstr "Lataa nykyinen sivu uudelleen" + +#: ../midori/midori-browser.c:258 +#: ../midori/midori-browser.c:3044 +msgid "Stop loading the current page" +msgstr "Keskeytä nykyisen sivun lataaminen" + +#: ../midori/midori-browser.c:315 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% ladattu" + +#: ../midori/midori-browser.c:338 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Odottamaton toimenpide \"%s\"." + +#: ../midori/midori-browser.c:507 +msgid "New bookmark" +msgstr "Uusi kirjanmerkki" + +#: ../midori/midori-browser.c:507 +msgid "Edit bookmark" +msgstr "Muokkaa kirjanmerkkiä" + +#: ../midori/midori-browser.c:529 +msgid "_Title:" +msgstr "_Nimi:" + +#: ../midori/midori-browser.c:542 +#: ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Kuvaus:" + +#: ../midori/midori-browser.c:561 +#: ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL-osoite:" + +#: ../midori/midori-browser.c:577 +msgid "_Folder:" +msgstr "_Kansio:" + +#: ../midori/midori-browser.c:581 +msgid "Root" +msgstr "" + +#: ../midori/midori-browser.c:2349 +msgid "Separator" +msgstr "Erotin" + +#: ../midori/midori-browser.c:2534 +#, c-format +msgid "%d days ago" +msgstr "%d päivää sitten" + +#: ../midori/midori-browser.c:2541 +msgid "Today" +msgstr "Tänään" + +#: ../midori/midori-browser.c:2543 +msgid "Yesterday" +msgstr "Eilen" + +#: ../midori/midori-browser.c:2632 +msgid "A lightweight web browser." +msgstr "Kevyt verkkoselain" + +#: ../midori/midori-browser.c:2640 +msgid "translator-credits" +msgstr "Elias Julkunen, elias.julkunen@gmail.com" + +#: ../midori/midori-browser.c:2909 +msgid "Are you sure you want to remove all history items?" +msgstr "Haluatko varmasti tyhjentää koko historian?" + +#: ../midori/midori-browser.c:2976 +msgid "_File" +msgstr "_Tiedosto" + +#: ../midori/midori-browser.c:2979 +msgid "Open a new window" +msgstr "Avaa uusi ikkuna" + +#: ../midori/midori-browser.c:2982 +msgid "Open a new tab" +msgstr "Avaa uusi välilehti" + +#: ../midori/midori-browser.c:2985 +msgid "Open a file" +msgstr "Avaa tiedosto" + +#: ../midori/midori-browser.c:2988 +msgid "Save to a file" +msgstr "Tallenna tiedostoon" + +#: ../midori/midori-browser.c:2990 +msgid "_Close Tab" +msgstr "Sulje _välilehti" + +#: ../midori/midori-browser.c:2991 +msgid "Close the current tab" +msgstr "Sulje nykyinen välilehti" + +#: ../midori/midori-browser.c:2993 +msgid "C_lose Window" +msgstr "Sulje _ikkuna" + +#: ../midori/midori-browser.c:2994 +msgid "Close this window" +msgstr "Sulje tämä ikkuna" + +#: ../midori/midori-browser.c:2997 +msgid "Print the current page" +msgstr "Tulosta nykyinen sivu" + +#: ../midori/midori-browser.c:3000 +msgid "Quit the application" +msgstr "Poistu sovelluksesta" + +#: ../midori/midori-browser.c:3002 +msgid "_Edit" +msgstr "_Muokkaa" + +#: ../midori/midori-browser.c:3005 +msgid "Cut the selected text" +msgstr "Leikkaa valittu teksti" + +#: ../midori/midori-browser.c:3008 +#: ../midori/midori-browser.c:3011 +msgid "Copy the selected text" +msgstr "Kopioi valittu teksti" + +#: ../midori/midori-browser.c:3014 +msgid "Paste text from the clipboard" +msgstr "Liitä teksti leikepöydältä" + +#: ../midori/midori-browser.c:3017 +msgid "Delete the selected text" +msgstr "Poista valittu teksti" + +#: ../midori/midori-browser.c:3020 +msgid "Select all text" +msgstr "Valitse kaikki tekstit" + +#: ../midori/midori-browser.c:3023 +msgid "Find a word or phrase in the page" +msgstr "Etsi sana tai lause sivulta" + +#: ../midori/midori-browser.c:3025 +msgid "Find _Next" +msgstr "Etsi _seuraava" + +#: ../midori/midori-browser.c:3026 +msgid "Find the next occurrence of a word or phrase" +msgstr "Etsii seuraavan sanan tai lauseen esiintymän" + +#: ../midori/midori-browser.c:3028 +msgid "Find _Previous" +msgstr "Etsi _edellinen" + +#: ../midori/midori-browser.c:3029 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Etsii edellisen sanan tai lauseen esiintymän" + +#: ../midori/midori-browser.c:3031 +msgid "_Quick Find" +msgstr "_Pikahaku" + +#: ../midori/midori-browser.c:3032 +msgid "Quickly jump to a word or phrase" +msgstr "Hyppää nopeasti sanaan tai lauseeseen" + +#: ../midori/midori-browser.c:3035 +msgid "Configure the application preferences" +msgstr "Muokkaa sovelluksen asetuksia" + +#: ../midori/midori-browser.c:3037 +msgid "_View" +msgstr "_Näytä" + +#: ../midori/midori-browser.c:3038 +msgid "_Toolbars" +msgstr "_Työkalupalkit" + +#: ../midori/midori-browser.c:3050 +msgid "Increase the zoom level" +msgstr "Suurenna" + +#: ../midori/midori-browser.c:3053 +msgid "Decrease the zoom level" +msgstr "Pienennä" + +#: ../midori/midori-browser.c:3056 +msgid "Reset the zoom level" +msgstr "Palauta suurennustaso" + +#: ../midori/midori-browser.c:3058 +#: ../midori/midori-view.c:901 +msgid "View _Source" +msgstr "Näytä _lähdekoodi" + +#: ../midori/midori-browser.c:3059 +msgid "View the source code of the page" +msgstr "Näytä sivun lähdekoodi" + +#: ../midori/midori-browser.c:3061 +msgid "View Selection Source" +msgstr "Näytä valinnan lähde" + +#: ../midori/midori-browser.c:3062 +msgid "View the source code of the selection" +msgstr "Näytä valinnan lähdekoodin" + +#: ../midori/midori-browser.c:3065 +msgid "Toggle fullscreen view" +msgstr "Vaihda kokonäyttötilan välillä" + +#: ../midori/midori-browser.c:3067 +msgid "_Go" +msgstr "_Siirry" + +#: ../midori/midori-browser.c:3070 +msgid "Go back to the previous page" +msgstr "Siirry takaisin edelliselle sivulle" + +#: ../midori/midori-browser.c:3073 +msgid "Go forward to the next page" +msgstr "Siirry eteenpäin seuraavalle sivulle" + +#: ../midori/midori-browser.c:3076 +msgid "Go to your homepage" +msgstr "Siirry kotisivulle" + +#: ../midori/midori-browser.c:3078 +msgid "Open in Page_holder..." +msgstr "Avaa _sivun pitäjässä" + +#: ../midori/midori-browser.c:3079 +msgid "Open the current page in the pageholder" +msgstr "Avaa nykyisen sivun sivun pitäjä" + +#: ../midori/midori-browser.c:3081 +msgid "Empty Trash" +msgstr "Tyhjennä roskakori" + +#: ../midori/midori-browser.c:3082 +msgid "Delete the contents of the trash" +msgstr "Poista roskakorin sisältö" + +#. FIXME: Make this sensitive only when there is a tab to undo +#: ../midori/midori-browser.c:3084 +#: ../midori/midori-view.c:876 +msgid "Undo Close Tab" +msgstr "Kumoa välilehden sulkeminen" + +#: ../midori/midori-browser.c:3085 +msgid "Open the last closed tab" +msgstr "Avaa viimeisin suljettu välilehti" + +#: ../midori/midori-browser.c:3089 +msgid "Add a new bookmark" +msgstr "Lisää uusi kirjanmerkki" + +#: ../midori/midori-browser.c:3092 +msgid "Open the selected bookmark" +msgstr "Avaa valittu kirjanmerkki" + +#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3115 +msgid "Open in New _Tab" +msgstr "Avaa uudessa _välilehdessä" + +#: ../midori/midori-browser.c:3095 +msgid "Open the selected bookmark in a new tab" +msgstr "Avaa valitun kirjanmerkin uudessa välilehdessä" + +#: ../midori/midori-browser.c:3097 +msgid "Open in New _Window" +msgstr "Avaa uudessa _ikkunassa" + +#: ../midori/midori-browser.c:3098 +msgid "Open the selected bookmark in a new window" +msgstr "Avaa valitun kirjanmerkin uudessa ikkunassa" + +#: ../midori/midori-browser.c:3101 +msgid "Edit the selected bookmark" +msgstr "Muokkaa valittua kirjanmerkkiä" + +#: ../midori/midori-browser.c:3104 +msgid "Delete the selected bookmark" +msgstr "Poista valittu kirjanmerkki" + +#: ../midori/midori-browser.c:3107 +msgid "Delete the selected history item" +msgstr "Poista valittu historiatietue" + +#: ../midori/midori-browser.c:3110 +msgid "Clear the enitre history" +msgstr "Tyhjennä koko historia" + +#: ../midori/midori-browser.c:3113 +msgid "Open the selected history item" +msgstr "Avaa valittu historiatietue" + +#: ../midori/midori-browser.c:3116 +msgid "Open the selected history item in a new tab" +msgstr "Avaa valittu historiatietue uudessa välilehdessä" + +#: ../midori/midori-browser.c:3117 +msgid "_Tools" +msgstr "_Työkalut" + +#: ../midori/midori-browser.c:3119 +#: ../midori/midori-searchaction.c:468 +msgid "_Manage Search Engines" +msgstr "_Hallitse hakumoottoreita" + +#: ../midori/midori-browser.c:3120 +msgid "Add, edit and remove search engines..." +msgstr "Lisää, muokkaa ja poista hakumoottoreita..." + +#: ../midori/midori-browser.c:3124 +msgid "_Previous Tab" +msgstr "_Edellinen välilehti" + +#: ../midori/midori-browser.c:3125 +msgid "Switch to the previous tab" +msgstr "Vaihda edelliseen välilehteen" + +#: ../midori/midori-browser.c:3127 +msgid "_Next Tab" +msgstr "_Seuraava välilehti" + +#: ../midori/midori-browser.c:3128 +msgid "Switch to the next tab" +msgstr "Vaihda seuraavaan välilehteen" + +#: ../midori/midori-browser.c:3130 +msgid "_Help" +msgstr "_Ohje" + +#: ../midori/midori-browser.c:3132 +msgid "_Contents" +msgstr "_Sisältö" + +#: ../midori/midori-browser.c:3133 +msgid "Show the documentation" +msgstr "Näyttää dokumentaation" + +#: ../midori/midori-browser.c:3135 +msgid "_Frequent questions" +msgstr "_Usein kysytyt kysymykset" + +#: ../midori/midori-browser.c:3136 +msgid "Show the Frequently Asked Questions" +msgstr "Näyttää usein kysytyt kysymykset" + +#: ../midori/midori-browser.c:3138 +msgid "_Report a bug" +msgstr "_Ilmoita ohjelmavirheestä" + +#: ../midori/midori-browser.c:3139 +msgid "Open Midori's bug tracker" +msgstr "Avaa Midorin ohjelmavirhehallinnan" + +#: ../midori/midori-browser.c:3142 +msgid "Show information about the program" +msgstr "Näyttää tietoja sovelluksesta" + +#: ../midori/midori-browser.c:3149 +msgid "P_rivate Browsing" +msgstr "_Yksityinen selaaminen" + +#: ../midori/midori-browser.c:3150 +msgid "Don't save any private data while browsing" +msgstr "Ei tallenna mitään yksityisyystietoja selatessa" + +#: ../midori/midori-browser.c:3154 +msgid "_Menubar" +msgstr "_Valikkopalkki" + +#: ../midori/midori-browser.c:3155 +msgid "Show menubar" +msgstr "Näyttää valikkopalkin" + +#: ../midori/midori-browser.c:3158 +msgid "_Navigationbar" +msgstr "_Navigointipalkki" + +#: ../midori/midori-browser.c:3159 +msgid "Show navigationbar" +msgstr "Näyttää navigointipalkin" + +#: ../midori/midori-browser.c:3162 +msgid "Side_panel" +msgstr "_Sivupaneeli" + +#: ../midori/midori-browser.c:3163 +msgid "Show sidepanel" +msgstr "Näyttää sivupaneelin" + +#: ../midori/midori-browser.c:3166 +msgid "_Bookmarkbar" +msgstr "_Kirjanmerkkipalkki" + +#: ../midori/midori-browser.c:3167 +msgid "Show bookmarkbar" +msgstr "Näyttää kirjanmerkkipalkin" + +#: ../midori/midori-browser.c:3170 +msgid "_Transferbar" +msgstr "_Siirtopalkki" + +#: ../midori/midori-browser.c:3171 +msgid "Show transferbar" +msgstr "Näytä siirtopalkki" + +#: ../midori/midori-browser.c:3174 +msgid "_Statusbar" +msgstr "_Tilapalkki" + +#: ../midori/midori-browser.c:3175 +msgid "Show statusbar" +msgstr "Näytä tilapalkki" + +#: ../midori/midori-browser.c:3432 +msgid "_Location..." +msgstr "_Sijainti..." + +#: ../midori/midori-browser.c:3434 +msgid "Open a particular location" +msgstr "Avaa tarkka sijainti" + +#: ../midori/midori-browser.c:3458 +msgid "_Web Search..." +msgstr "_WWW-haku" + +#: ../midori/midori-browser.c:3460 +msgid "Run a web search" +msgstr "Suorita WWW-haku" + +#: ../midori/midori-browser.c:3479 +#: ../midori/midori-browser.c:3511 +msgid "Reopen a previously closed tab or window" +msgstr "Avaa uudelleen aikaisemmin suljettu välilehti tai ikkuna" + +#: ../midori/midori-browser.c:3493 +msgid "_Recently visited pages" +msgstr "_Usein vieraillut sivut" + +#: ../midori/midori-browser.c:3495 +msgid "Revisit pages that you opened before" +msgstr "Vieraile uudelleen sivuilla, jotka avasit aiemmin" + +#: ../midori/midori-browser.c:3525 +msgid "Window" +msgstr "Ikkuna" + +#: ../midori/midori-browser.c:3527 +msgid "Show a list of all open tabs" +msgstr "Näytä luettelo kaikista avoimista välilehdistä" + +#: ../midori/midori-browser.c:3661 +msgid "Bookmarks" +msgstr "Kirjanmerkit" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3668 +#: ../midori/midori-preferences.c:347 +msgid "Transfers" +msgstr "Siirrot" + +#: ../midori/midori-browser.c:3677 +msgid "Console" +msgstr "Konsoli" + +#. FRAME_NEW (_("Web Cookies")); +#. TABLE_NEW (3, 2); +#. label = katze_property_label (settings, "accept-cookies"); +#. INDENTED_ADD (label, 0, 1, 0, 1); +#. button = katze_property_proxy (settings, "accept-cookies", NULL); +#. FILLED_ADD (button, 1, 2, 0, 1); +#. button = katze_property_proxy (settings, "original-cookies-only", "blurb"); +#. SPANNED_ADD (button, 0, 2, 1, 2); +#. label = katze_property_label (settings, "maximum-cookie-age"); +#. INDENTED_ADD (label, 0, 1, 2, 3); +#. hbox = gtk_hbox_new (FALSE, 4); +#. entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); +#. gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); +#. gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), +#. FALSE, FALSE, 0); +#. FILLED_ADD (hbox, 1, 2, 2, 3); +#: ../midori/midori-browser.c:3715 +#: ../midori/midori-preferences.c:507 +msgid "History" +msgstr "Historia" + +#: ../midori/midori-browser.c:3724 +msgid "Pageholder" +msgstr "Sivun pitäjä" + +#: ../midori/midori-browser.c:3773 +msgid "_Inline find:" +msgstr "_Haku:" + +#: ../midori/midori-browser.c:3808 +msgid "Match Case" +msgstr "Kirjainkoko merkitsee" + +#: ../midori/midori-browser.c:3816 +msgid "Highlight Matches" +msgstr "Korosta osumat" + +#: ../midori/midori-browser.c:3825 +msgid "Close Findbar" +msgstr "Sulje hakupalkki" + +#: ../midori/midori-browser.c:4071 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Odottamaton asetus \"%s\"" + +#: ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:208 +msgid "Close panel" +msgstr "Sulje paneeli" + +#: ../midori/midori-websettings.c:132 +#: ../midori/midori-view.c:1415 +msgid "Blank page" +msgstr "Tyhjä sivu" + +#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:393 +msgid "Homepage" +msgstr "Kotisivu" + +#: ../midori/midori-websettings.c:134 +msgid "Last open pages" +msgstr "Viimeisimmät avoinna olleet sivut" + +#: ../midori/midori-websettings.c:149 +msgid "Chinese (BIG5)" +msgstr "Kiinalainen (BIG5)" + +#: ../midori/midori-websettings.c:150 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanilainen (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:151 +msgid "Russian (KOI8-R)" +msgstr "Venäläinen (KOI8-R)" + +#: ../midori/midori-websettings.c:152 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:153 +msgid "Western (ISO-8859-1)" +msgstr "Läntinen (ISO-8859-1)" + +#: ../midori/midori-websettings.c:154 +msgid "Custom..." +msgstr "Muokattu..." + +#: ../midori/midori-websettings.c:169 +msgid "New tab" +msgstr "Uusi välilehti" + +#: ../midori/midori-websettings.c:170 +msgid "New window" +msgstr "Uusi ikkuna" + +#: ../midori/midori-websettings.c:171 +msgid "Current tab" +msgstr "Nykyinen välilehti" + +#: ../midori/midori-websettings.c:186 +msgid "Default" +msgstr "Oletus" + +#: ../midori/midori-websettings.c:187 +msgid "Icons" +msgstr "Kuvakkeet" + +#: ../midori/midori-websettings.c:188 +msgid "Text" +msgstr "Teksti" + +#: ../midori/midori-websettings.c:189 +msgid "Both" +msgstr "Molemmat" + +#: ../midori/midori-websettings.c:190 +msgid "Both horizontal" +msgstr "Molemmat vaakasuorassa" + +#: ../midori/midori-websettings.c:205 +msgid "All cookies" +msgstr "Kaikki evästeet" + +#: ../midori/midori-websettings.c:206 +msgid "Session cookies" +msgstr "Istunnon evästeet" + +#: ../midori/midori-websettings.c:244 +msgid "Remember last window size" +msgstr "Muista viimeisin ikkunan koko" + +#: ../midori/midori-websettings.c:245 +msgid "Whether to save the last window size" +msgstr "Tallennetaanko viimeisin ikkunan koko" + +#: ../midori/midori-websettings.c:253 +msgid "Last window width" +msgstr "Viimeisin ikkunan leveys" + +#: ../midori/midori-websettings.c:254 +msgid "The last saved window width" +msgstr "Viimeisin tallennettu ikkunan leveys" + +#: ../midori/midori-websettings.c:262 +msgid "Last window height" +msgstr "Viimeisin ikkunan korkeus" + +#: ../midori/midori-websettings.c:263 +msgid "The last saved window height" +msgstr "Viimeisin tallennettu ikkunan korkeus" + +#: ../midori/midori-websettings.c:271 +msgid "Last panel position" +msgstr "Viimeisin paneelin paikka" + +#: ../midori/midori-websettings.c:272 +msgid "The last saved panel position" +msgstr "Viimeisin tallennettu paneelin paikka" + +#: ../midori/midori-websettings.c:280 +msgid "Last panel page" +msgstr "Viimeisin paneelin sivu" + +#: ../midori/midori-websettings.c:281 +msgid "The last saved panel page" +msgstr "Viimeisin tallennettu paneelin sivu" + +#: ../midori/midori-websettings.c:289 +msgid "Last Web search" +msgstr "Viimeisin verkkohaku" + +#: ../midori/midori-websettings.c:290 +msgid "The last saved Web search" +msgstr "Viimeisin tallennettu verkkohaku" + +#: ../midori/midori-websettings.c:298 +msgid "Last pageholder URI" +msgstr "Viimeisin sivun pitäjän URL-osoite" + +#: ../midori/midori-websettings.c:299 +msgid "The URI last opened in the pageholder" +msgstr "Viimeisin avoinna ollut URL-osoite sivun pitäjässä" + +#: ../midori/midori-websettings.c:308 +msgid "Show Menubar" +msgstr "Näytä valikkopalkki" + +#: ../midori/midori-websettings.c:309 +msgid "Whether to show the menubar" +msgstr "Näytetäänkö valikkopalkki" + +#: ../midori/midori-websettings.c:317 +msgid "Show Navigationbar" +msgstr "Näytä navigointipalkki" + +#: ../midori/midori-websettings.c:318 +msgid "Whether to show the navigationbar" +msgstr "Näytetäänkö navigointipalkki" + +#: ../midori/midori-websettings.c:326 +msgid "Show Bookmarkbar" +msgstr "Näytä kirjanmerkkipalkki" + +#: ../midori/midori-websettings.c:327 +msgid "Whether to show the bookmarkbar" +msgstr "Näytetäänkö kirjanmerkkipalkki" + +#: ../midori/midori-websettings.c:335 +msgid "Show Panel" +msgstr "Näytä paneeli" + +#: ../midori/midori-websettings.c:336 +msgid "Whether to show the panel" +msgstr "Näytetäänkö paneeli" + +#: ../midori/midori-websettings.c:344 +msgid "Show Statusbar" +msgstr "Näytä tilapalkki" + +#: ../midori/midori-websettings.c:345 +msgid "Whether to show the statusbar" +msgstr "Näytetäänkö tilapalkki" + +#: ../midori/midori-websettings.c:354 +msgid "Toolbar Style" +msgstr "Työkalupalkin tyyli" + +#: ../midori/midori-websettings.c:355 +msgid "The style of the toolbar" +msgstr "Työkalupalkin tyyli" + +#: ../midori/midori-websettings.c:364 +msgid "Toolbar Items" +msgstr "Työjakupalkin painikkeet" + +#: ../midori/midori-websettings.c:365 +msgid "The items to show on the toolbar" +msgstr "Työkalupalkissa näytettävät painikkeet" + +#: ../midori/midori-websettings.c:373 +msgid "Compact Sidepanel" +msgstr "Kompakti sivupaneeli" + +#: ../midori/midori-websettings.c:374 +msgid "Whether to make the sidepanel compact" +msgstr "Tehdäänkö sivupaneelista kompakti" + +#: ../midori/midori-websettings.c:383 +msgid "Load on Startup" +msgstr "Lataa käynnistettäessä" + +#: ../midori/midori-websettings.c:384 +msgid "What to load on startup" +msgstr "Mitä ladataan käynnistyksessä" + +#: ../midori/midori-websettings.c:394 +msgid "The homepage" +msgstr "Kotisivu" + +#: ../midori/midori-websettings.c:402 +msgid "Download Folder" +msgstr "Latauskansio" + +#: ../midori/midori-websettings.c:403 +msgid "The folder downloaded files are saved to" +msgstr "Kansio, jonne ladatut tiedostot tallennetaan" + +#: ../midori/midori-websettings.c:411 +msgid "Download Manager" +msgstr "Latauksien hallinta" + +#: ../midori/midori-websettings.c:412 +msgid "An external download manager" +msgstr "Ulkoinen latauksien hallinta" + +#: ../midori/midori-websettings.c:420 +msgid "Text Editor" +msgstr "Tekstieditori" + +#: ../midori/midori-websettings.c:421 +msgid "An external text editor" +msgstr "Ulkoinen tekstieditori" + +#: ../midori/midori-websettings.c:429 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:430 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:438 +msgid "Preferred Encoding" +msgstr "Käytettävä merkkikoodaus" + +#: ../midori/midori-websettings.c:439 +msgid "The preferred character encoding" +msgstr "Oletuksena käytettävä merkkikoodaus" + +#: ../midori/midori-websettings.c:449 +msgid "Always Show Tabbar" +msgstr "Näytä aina välilehtipalkki" + +#: ../midori/midori-websettings.c:450 +msgid "Always show the tabbar" +msgstr "Näytä aina välilehtipalkki" + +#: ../midori/midori-websettings.c:458 +msgid "Close Buttons on Tabs" +msgstr "Sulje-painikkeet väilehdissä" + +#: ../midori/midori-websettings.c:459 +msgid "Whether tabs have close buttons" +msgstr "Onko välilehdissä sulje-painikkeet" + +#: ../midori/midori-websettings.c:467 +msgid "Open new pages in" +msgstr "Avaa uudet sivut" + +#: ../midori/midori-websettings.c:468 +msgid "Where to open new pages" +msgstr "Miten uudet sivut avataan" + +#: ../midori/midori-websettings.c:477 +msgid "Open external pages in" +msgstr "Avaa ulkoiset sivut" + +#: ../midori/midori-websettings.c:478 +msgid "Where to open externally opened pages" +msgstr "Miten ulkoisesti avatut sivut avataan" + +#: ../midori/midori-websettings.c:487 +msgid "Middle click opens Selection" +msgstr "Keskinapsautus avaa valinnan" + +#: ../midori/midori-websettings.c:488 +msgid "Load an URL from the selection via middle click" +msgstr "Lataa URL-osoitteen valinnasta keskinapsautuksella" + +#: ../midori/midori-websettings.c:496 +msgid "Open tabs in the background" +msgstr "Avaa välilehdet taustalla" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs in the background" +msgstr "Avataanko uudet välilehdet taustalla" + +#: ../midori/midori-websettings.c:505 +msgid "Open Tabs next to Current" +msgstr "Avaa välilehdet nykyisestä seuraavaksi" + +#: ../midori/midori-websettings.c:506 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Avataanko uudet välilehdet nykyisestä välilehdestä seuraavaksi vai viimeisen jälkeiseksi" + +#: ../midori/midori-websettings.c:514 +msgid "Open popups in tabs" +msgstr "Avaa ponnahdusikkunat välilehdissä" + +#: ../midori/midori-websettings.c:515 +msgid "Whether to open popup windows in tabs" +msgstr "Avataanko ponnahdusikkunat välilehdissä" + +#: ../midori/midori-websettings.c:525 +msgid "Accept cookies" +msgstr "Salli evästeet" + +#: ../midori/midori-websettings.c:526 +msgid "What type of cookies to accept" +msgstr "Minkälaiset evästeet sallitaan" + +#: ../midori/midori-websettings.c:535 +msgid "Original cookies only" +msgstr "Alkuperäiset evästeet" + +#: ../midori/midori-websettings.c:536 +msgid "Accept cookies from the original website only" +msgstr "Sallii vain alkuperäisen sivuston evästeet" + +#: ../midori/midori-websettings.c:544 +msgid "Maximum cookie age" +msgstr "Evästeiden enimmäisikä" + +#: ../midori/midori-websettings.c:545 +msgid "The maximum number of days to save cookies for" +msgstr "Kuinka monta päivää evästeet säilytetään" + +#: ../midori/midori-websettings.c:555 +msgid "Remember last visited pages" +msgstr "Muista sivut, joilla on vierailtu" + +#: ../midori/midori-websettings.c:556 +msgid "Whether the last visited pages are saved" +msgstr "Tallennetaanko sivut, joilla on vierailtu" + +#: ../midori/midori-websettings.c:564 +msgid "Maximum history age" +msgstr "Historian enimmäisikä" + +#: ../midori/midori-websettings.c:565 +msgid "The maximum number of days to save the history for" +msgstr "Kuinka monta päivää historia säilytetään" + +#: ../midori/midori-websettings.c:573 +msgid "Remember last form inputs" +msgstr "Muista lomakkeisiin annetut tiedot" + +#: ../midori/midori-websettings.c:574 +msgid "Whether the last form inputs are saved" +msgstr "Tallennetaanko lomakkeisiin annetut tiedot" + +#: ../midori/midori-websettings.c:582 +msgid "Remember last downloaded files" +msgstr "Muista ladatut tiedostot" + +#: ../midori/midori-websettings.c:583 +msgid "Whether the last downloaded files are saved" +msgstr "Tallennetaanko ladattujen tiedostojen lista" + +#: ../midori/midori-websettings.c:593 +msgid "HTTP Proxy" +msgstr "HTTP-välityspalvelin" + +#: ../midori/midori-websettings.c:594 +msgid "The proxy used for HTTP connections" +msgstr "HTTP-yhteyksille käytettävä välityspalvelin" + +#: ../midori/midori-websettings.c:602 +msgid "Cache size" +msgstr "Välimuistin koko" + +#: ../midori/midori-websettings.c:603 +msgid "The allowed size of the cache" +msgstr "Välimuistin enimmäiskoko" + +#: ../midori/midori-view.c:82 +msgid "Load Provisional" +msgstr "" + +#: ../midori/midori-view.c:83 +msgid "Load Committed" +msgstr "" + +#: ../midori/midori-view.c:84 +msgid "Load Finished" +msgstr "" + +#: ../midori/midori-view.c:814 +msgid "Open Link in New _Tab" +msgstr "Avaa linkki uudessa _välilehdessä" + +#: ../midori/midori-view.c:838 +msgid "Download Link with Download _Manager" +msgstr "Lataa linkin kohde _latauksien hallinnalla" + +#: ../midori/midori-view.c:860 +msgid "Open URL in New _Tab" +msgstr "Avaa URL-osoite uudessa _välilehdessä" + +#: ../midori/midori-view.c:1287 +msgid "Source" +msgstr "Lähde" + +#: ../midori/midori-preferences.c:86 +#, c-format +msgid "Preferences for %s" +msgstr "Kohteen %s asetukset" + +#. Page "General" +#: ../midori/midori-preferences.c:335 +msgid "General" +msgstr "Yleiset" + +#: ../midori/midori-preferences.c:336 +msgid "Startup" +msgstr "Käynnistys" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:383 +msgid "Appearance" +msgstr "Ulkoasu" + +#: ../midori/midori-preferences.c:384 +msgid "Font settings" +msgstr "Kirjasinasetukset" + +#: ../midori/midori-preferences.c:386 +msgid "Default Font Family" +msgstr "Oletuskirjasin" + +#: ../midori/midori-preferences.c:394 +msgid "Minimum Font Size" +msgstr "Kirjasimen vähimmäiskoko" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:404 +msgid "Behavior" +msgstr "Käyttäytyminen" + +#: ../midori/midori-preferences.c:405 +msgid "Features" +msgstr "Ominaisuudet" + +#: ../midori/midori-preferences.c:408 +msgid "Load images automatically" +msgstr "Lataa kuvat automaattisesti" + +#: ../midori/midori-preferences.c:411 +msgid "Shrink images automatically" +msgstr "Pienennä kuvat automaattisesti" + +#: ../midori/midori-preferences.c:414 +msgid "Print backgrounds" +msgstr "Näytä taustakuvat" + +#: ../midori/midori-preferences.c:417 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:423 +msgid "Enable scripts" +msgstr "Salli skriptit" + +#. Page "Interface" +#: ../midori/midori-preferences.c:431 +msgid "Interface" +msgstr "Käyttöliittymä" + +#: ../midori/midori-preferences.c:432 +msgid "Navigationbar" +msgstr "Navigointipalkki" + +#: ../midori/midori-preferences.c:447 +msgid "Browsing" +msgstr "Selaaminen" + +#. Page "Network" +#. PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); +#. FRAME_NEW (_("Network")); +#. TABLE_NEW (2, 2); +#. label = katze_property_label (settings, "http-proxy"); +#. INDENTED_ADD (label, 0, 1, 0, 1); +#. button = katze_property_proxy (settings, "http-proxy", NULL); +#. FILLED_ADD (button, 1, 2, 0, 1); +#. label = katze_property_label (settings, "cache-size"); +#. INDENTED_ADD (label, 0, 1, 1, 2); +#. hbox = gtk_hbox_new (FALSE, 4); +#. entry = katze_property_proxy (settings, "cache-size", NULL); +#. gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); +#. gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), +#. FALSE, FALSE, 0); +#. FILLED_ADD (hbox, 1, 2, 1, 2); +#. Page "Privacy" +#: ../midori/midori-preferences.c:490 +msgid "Privacy" +msgstr "Yksityisyys" + +#: ../midori/midori-preferences.c:514 +msgid "days" +msgstr "päivää" + +#: ../midori/midori-searchaction.c:459 +#: ../katze/katze-arrayaction.c:284 +#: ../katze/katze-arrayaction.c:351 +msgid "Empty" +msgstr "Tyhjä" + +#: ../midori/midori-searchaction.c:804 +msgid "Add search engine" +msgstr "Lisää hakumoottori" + +#: ../midori/midori-searchaction.c:804 +msgid "Edit search engine" +msgstr "Muokkaa hakumoottoria" + +#: ../midori/midori-searchaction.c:832 +msgid "_Name:" +msgstr "_Nimi:" + +#: ../midori/midori-searchaction.c:876 +msgid "_Icon (name or file):" +msgstr "_Kuvake (nimi tai tiedosto):" + +#: ../midori/midori-searchaction.c:890 +msgid "_Token:" +msgstr "_Merkki:" + +#: ../midori/midori-searchaction.c:1067 +msgid "Manage search engines" +msgstr "Hallitse hakumoottoreita" + +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Ulkoista ohjelmaa ei voitu suorittaa" + +#: ../midori/sokoke.c:283 +msgid "Warning: You are using a superuser account!" +msgstr "Varoitus: Käytät pääkäyttäjän tiliä!" + +#: ../midori/gjs.c:512 +msgid "An unknown error occured." +msgstr "Tapahtui tuntematon virhe." + +#: ../midori/gjs.c:739 +#: ../midori/gjs.c:829 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s:lla ei ole ominaisuutta \"%s\"" + +#: ../midori/gjs.c:875 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" + +#: ../midori/gjs.c:885 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" + +#: ../katze/katze-throbber.c:807 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Nimettyä kuvaketta \"%s\" ei voitu ladata" + +#: ../katze/katze-throbber.c:820 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Vakiokuvaketta \"%s\" ei voitu ladata" + +#: ../katze/katze-throbber.c:883 +msgid "Animation frames are broken" +msgstr "Animaatiokehykset ovat rikki" + +#: ../katze/katze-utils.c:147 +#: ../katze/katze-utils.c:334 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Ominaisuus \"%s\" on epäkelpo kohteelle %s" + +#: ../katze/katze-utils.c:169 +#: ../katze/katze-utils.c:205 +msgid "Choose file" +msgstr "Valitse tiedosto" + +#: ../katze/katze-utils.c:187 +msgid "Choose folder" +msgstr "Valitse kansio" + From d1b64e6d484f7bf3ee30e9818c11439da642a432 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Oct 2008 22:17:19 +0100 Subject: [PATCH 0444/2970] Fix tab icon alignment and hiding throbber fallback when needed --- katze/katze-throbber.c | 54 ++++++++++++++++++++++++++++++------------ midori/midori-view.c | 47 +++++++++++++++++++++++------------- 2 files changed, 69 insertions(+), 32 deletions(-) diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 9977984a..9ec60242 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -14,6 +14,7 @@ #include "katze-utils.h" #include +#include struct _KatzeThrobber { @@ -782,10 +783,30 @@ katze_throbber_size_request (GtkWidget* widget, requisition); } +static void +katze_throbber_aligned_coords (GtkWidget* widget, + gint* ax, + gint* ay) +{ + gfloat xalign, yalign; + gint xpad, ypad; + + gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign); + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + xalign = 1.0 - xalign; + gtk_misc_get_padding (GTK_MISC (widget), &xpad, &ypad); + + *ax = floor (widget->allocation.x + xpad + + ((widget->allocation.width - widget->requisition.width) * xalign)); + *ay = floor (widget->allocation.y + ypad + + ((widget->allocation.height - widget->requisition.height) * yalign)); +} + static gboolean katze_throbber_expose_event (GtkWidget* widget, GdkEventExpose* event) { + gint ax, ay; KatzeThrobber* throbber = KATZE_THROBBER (widget); if (G_UNLIKELY (!throbber->width || !throbber->height)) @@ -825,10 +846,10 @@ katze_throbber_expose_event (GtkWidget* widget, } } + katze_throbber_aligned_coords (widget, &ax, &ay); + gdk_draw_pixbuf (event->window, NULL, throbber->static_pixbuf, - 0, 0, - widget->allocation.x, - widget->allocation.y, + 0, 0, ax, ay, throbber->width, throbber->height, GDK_RGB_DITHER_NONE, 0, 0); } @@ -852,29 +873,32 @@ katze_throbber_expose_event (GtkWidget* widget, if (G_UNLIKELY (cols == 1 && cols == rows)) { - gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf, - 0, 0, - widget->allocation.x, - widget->allocation.y, - throbber->width, throbber->height, - GDK_RGB_DITHER_NONE, 0, 0); + katze_throbber_aligned_coords (widget, &ax, &ay); + + if (throbber->animated) + gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf, + 0, 0, ax, ay, + throbber->width, throbber->height, + GDK_RGB_DITHER_NONE, 0, 0); return TRUE; } if (G_LIKELY (cols > 0 && rows > 0)) { - gint index = throbber->index % (cols * rows); + gint index; + guint x, y; + katze_throbber_aligned_coords (widget, &ax, &ay); + + index = throbber->index % (cols * rows); if (G_LIKELY (throbber->timer_id >= 0)) index = MAX (index, 1); - guint x = (index % cols) * throbber->width; - guint y = (index / cols) * throbber->height; + x = (index % cols) * throbber->width; + y = (index / cols) * throbber->height; gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf, - x, y, - widget->allocation.x, - widget->allocation.y, + x, y, ax, ay, throbber->width, throbber->height, GDK_RGB_DITHER_NONE, 0, 0); } diff --git a/midori/midori-view.c b/midori/midori-view.c index c073fce2..4de7c599 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1114,20 +1114,6 @@ midori_view_new (KatzeNet* net) return g_object_new (MIDORI_TYPE_VIEW, "net", net, NULL); } -static void -_update_label_size (GtkWidget* label, - gint size) -{ - gint width, height; - - if (size < 1) - size = 10; - - sokoke_widget_get_text_size (label, "M", &width, &height); - gtk_widget_set_size_request (label, width * size, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); -} - static void _midori_view_update_settings (MidoriView* view) { @@ -1617,6 +1603,30 @@ midori_view_tab_close_clicked (GtkWidget* tab_close, gtk_widget_destroy (widget); } +static void +midori_view_tab_icon_style_set_cb (GtkWidget* tab_icon, + GtkStyle* previous_style) +{ + GtkSettings* gtk_settings; + gint width, height; + + gtk_settings = gtk_widget_get_settings (tab_icon); + gtk_icon_size_lookup_for_settings (gtk_settings, GTK_ICON_SIZE_MENU, + &width, &height); + gtk_widget_set_size_request (tab_icon, width + 4, height + 4); +} + +static void +midori_view_update_label_size (GtkWidget* label, + gint size) +{ + gint width; + + sokoke_widget_get_text_size (label, "M", &width, NULL); + gtk_widget_set_size_request (label, width * size, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); +} + /** * midori_view_get_proxy_tab_label: * @view: a #MidoriView @@ -1646,15 +1656,16 @@ midori_view_get_proxy_tab_label (MidoriView* view) view->tab_icon = katze_throbber_new (); katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon), midori_view_get_icon (view)); + gtk_misc_set_alignment (GTK_MISC (view->tab_icon), 0.0, 0.5); view->tab_title = gtk_label_new (midori_view_get_display_title (view)); + gtk_misc_set_alignment (GTK_MISC (view->tab_title), 0.0, 0.5); event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - /* TODO: make the tab initially look "unvisited" until it's focused */ - _update_label_size (view->tab_title, 10); + midori_view_update_label_size (view->tab_title, 10); view->tab_close = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE); @@ -1665,7 +1676,7 @@ midori_view_get_proxy_tab_label (MidoriView* view) g_object_unref (rcstyle); image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (view->tab_close), image); - gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.5); #if HAVE_OSX gtk_box_pack_end (GTK_BOX (hbox), view->tab_icon, FALSE, FALSE, 0); @@ -1683,6 +1694,8 @@ midori_view_get_proxy_tab_label (MidoriView* view) g_signal_connect (event_box, "button-release-event", G_CALLBACK (midori_view_tab_label_button_release_event), view); + g_signal_connect (view->tab_close, "style-set", + G_CALLBACK (midori_view_tab_icon_style_set_cb), NULL); g_signal_connect (view->tab_close, "clicked", G_CALLBACK (midori_view_tab_close_clicked), view); From e4540ff586faadadee307cef9a7b5d9cab4e9106 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 31 Oct 2008 01:35:20 +0100 Subject: [PATCH 0445/2970] Use Yes and No for enabling and disabling addons Incidentally this implicitly corrects the Clear History dialog which used to display Enable and Disable buttons. --- midori/main.c | 2 -- midori/midori-addons.c | 6 ++++-- midori/midori-stock.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index 043f86ec..e15adf84 100644 --- a/midori/main.c +++ b/midori/main.c @@ -72,8 +72,6 @@ stock_items_init (void) { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD }, { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, - { STOCK_DISABLE, N_("_Disable"), 0, 0, GTK_STOCK_NO }, - { STOCK_ENABLE, N_("_Enable"), 0, 0, GTK_STOCK_YES }, { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 38a6e9fa..c94ed1a1 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -1039,7 +1039,8 @@ midori_addons_get_toolbar (MidoriAddons* addons) gtk_widget_show (GTK_WIDGET (toolitem)); /* enable button */ - toolitem = gtk_tool_button_new_from_stock (STOCK_ENABLE); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_status_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); @@ -1047,7 +1048,8 @@ midori_addons_get_toolbar (MidoriAddons* addons) gtk_widget_show (GTK_WIDGET (toolitem)); /* disable button */ - toolitem = gtk_tool_button_new_from_stock (STOCK_DISABLE); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_status_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 04db4cbe..305e0cca 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -22,8 +22,6 @@ #define STOCK_BOOKMARK "stock_bookmark" #define STOCK_BOOKMARKS "vcard" #define STOCK_CONSOLE "terminal" -#define STOCK_DISABLE GTK_STOCK_NO -#define STOCK_ENABLE GTK_STOCK_YES #define STOCK_EXTENSION "extension" #define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" From d8edb2f05d56e04333aeb0cd7a2ee1eaa912c547 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 31 Oct 2008 01:38:18 +0100 Subject: [PATCH 0446/2970] Marge some more of history and bookmark handling --- midori/midori-browser.c | 174 +++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 91 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 33078e4f..61af8da4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2254,6 +2254,9 @@ midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); uri = katze_item_get_uri (item); + /* FIXME: Even toplevel items should technically have a parent */ + g_return_if_fail (katze_item_get_parent (item)); + if (KATZE_IS_ARRAY (item) || (uri && *uri)) { parent = katze_item_get_parent (item); @@ -2412,49 +2415,28 @@ midori_panel_history_button_release_event_cb (GtkWidget* widget, } static void -midori_panel_remove_history_item (GtkTreeView* treeview) +midori_browser_model_remove_item (GtkTreeModel* model, + KatzeItem* item, + GtkTreeIter* iter) { - GtkTreeModel* treemodel; - GtkTreeIter iter; GtkTreeIter child_iter; - GtkTreeSelection* selection; - KatzeItem* item; KatzeItem* child; - KatzeArray* parent; gint i, n; - if (sokoke_tree_view_get_selected_iter (treeview, &treemodel, &iter)) + if (KATZE_IS_ARRAY (item)) { - gtk_tree_model_get (treemodel, &iter, 0, &item, -1); - - if (KATZE_IS_ARRAY (item)) + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) { - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); - katze_array_remove_item (KATZE_ARRAY (item), child); - } - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - while (gtk_tree_model_iter_nth_child (treemodel, - &child_iter, &iter, 0)) - gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &child_iter); - gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter); - g_object_unref (item); - } - else - { - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - if (gtk_tree_store_remove (GTK_TREE_STORE (treemodel), &iter)) - { - selection = gtk_tree_view_get_selection (treeview); - gtk_tree_selection_select_iter (selection, &iter); - } - g_object_unref (item); + child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); + katze_array_remove_item (KATZE_ARRAY (item), child); } + while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) + gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); } + + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); + g_object_unref (item); } static gboolean @@ -2462,8 +2444,20 @@ midori_panel_history_key_release_event_cb (GtkWidget* widget, GdkEventKey* event, MidoriBrowser* browser) { + GtkTreeView* treeview; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + if (event->keyval == GDK_Delete) - midori_panel_remove_history_item (GTK_TREE_VIEW (widget)); + { + treeview = GTK_TREE_VIEW (widget); + if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_browser_model_remove_item (model, item, &iter); + } + } return FALSE; } @@ -2485,27 +2479,6 @@ midori_panel_history_popup_menu_cb (GtkWidget* widget, } } -static void -_tree_store_insert_folder (GtkTreeStore* treestore, - GtkTreeIter* parent, - KatzeArray* array) -{ - guint n, i; - KatzeItem* item; - GtkTreeIter iter; - - n = katze_array_get_length (array); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (array, i); - gtk_tree_store_insert_with_values (treestore, &iter, parent, n, - 0, item, -1); - g_object_ref (item); - if (KATZE_IS_ARRAY (item)) - _tree_store_insert_folder (treestore, &iter, KATZE_ARRAY (item)); - } -} - static void midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, @@ -2518,14 +2491,7 @@ midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); - if (G_UNLIKELY (!item)) - return; - if (G_UNLIKELY (!katze_item_get_parent (item))) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - g_object_unref (item); - return; - } + g_assert (KATZE_IS_ITEM (item)); /* TODO: Would it be better to not do this on every redraw? */ pixbuf = NULL; @@ -2553,14 +2519,7 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); - if (G_UNLIKELY (!item)) - return; - if (G_UNLIKELY (!katze_item_get_parent (item))) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - g_object_unref (item); - return; - } + g_assert (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) g_object_set (renderer, "markup", NULL, @@ -2630,14 +2589,7 @@ midori_browser_history_render_icon_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); - if (G_UNLIKELY (!item)) - return; - if (G_UNLIKELY (!katze_item_get_parent (item))) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - g_object_unref (item); - return; - } + g_assert (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item)) pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, @@ -2669,14 +2621,7 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, 1, &age, -1); - if (G_UNLIKELY (!item)) - return; - if (G_UNLIKELY (!katze_item_get_parent (item))) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - g_object_unref (item); - return; - } + g_assert (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item)) { @@ -2907,7 +2852,17 @@ static void _action_history_delete_activate (GtkAction* action, MidoriBrowser* browser) { - midori_panel_remove_history_item (GTK_TREE_VIEW (browser->panel_history)); + GtkTreeView* treeview; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + treeview = GTK_TREE_VIEW (browser->panel_history); + if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_browser_model_remove_item (model, item, &iter); + } } static void @@ -4136,6 +4091,9 @@ browser_bookmarks_remove_item_cb (KatzeArray* array, GList* children; GtkWidget* toolitem; KatzeItem* item; + GtkTreeModel* model; + GtkTreeIter iter; + gsize i = 0; children = gtk_container_get_children (GTK_CONTAINER (browser->bookmarkbar)); while (children != NULL) @@ -4146,6 +4104,40 @@ browser_bookmarks_remove_item_cb (KatzeArray* array, gtk_widget_destroy (toolitem); children = g_list_next (children); } + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); + i = 0; + item = NULL; + while (item != removed_item && + gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (item == removed_item) + midori_browser_model_remove_item (model, item, &iter); + i++; + } +} + +static void +bookmarks_model_insert_folder (GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeArray* array) +{ + guint n, i; + KatzeItem* item; + GtkTreeIter iter; + + n = katze_array_get_length (array); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (array, i); + g_object_ref (item); + gtk_tree_store_insert_with_values (treestore, &iter, parent, n, + 0, item, -1); + g_object_ref (item); + if (KATZE_IS_ARRAY (item)) + bookmarks_model_insert_folder (treestore, &iter, KATZE_ARRAY (item)); + } } static void @@ -4174,8 +4166,8 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) G_CALLBACK (browser_bookmarks_remove_item_cb), browser); treestore = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); - _tree_store_insert_folder (GTK_TREE_STORE (treestore), - NULL, browser->bookmarks); + bookmarks_model_insert_folder (GTK_TREE_STORE (treestore), + NULL, browser->bookmarks); midori_panel_bookmarks_cursor_or_row_changed_cb ( GTK_TREE_VIEW (browser->panel_bookmarks), browser); From 96ddc8ae0a4da7a8279a56e7b142213dcd7abea2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 1 Nov 2008 19:15:58 +0100 Subject: [PATCH 0447/2970] Initial support for the Web Inspector --- midori/midori-browser.c | 100 +++++++++++++++++++++++++++--------- midori/midori-preferences.c | 11 +++- midori/midori-view.c | 92 +++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 26 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 61af8da4..f329d548 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -58,6 +58,9 @@ struct _MidoriBrowser GtkWidget* panel_pageholder; GtkWidget* notebook; + GtkWidget* inspector; + GtkWidget* inspector_view; + GtkWidget* find; GtkWidget* find_text; GtkToolItem* find_case; @@ -259,7 +262,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); gtk_widget_show (browser->progressbar); - if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !GTK_WIDGET_VISIBLE (browser->navigationbar)) + if (!GTK_WIDGET_VISIBLE (browser->statusbar) + && !GTK_WIDGET_VISIBLE (browser->navigationbar)) gtk_widget_show (browser->navigationbar); action = _action_by_name (browser, "Location"); midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), @@ -655,6 +659,17 @@ midori_view_console_message_cb (GtkWidget* view, message, line, source_id); } +static void +midori_view_attach_inspector_cb (GtkWidget* view, + GtkWidget* inspector_view, + MidoriBrowser* browser) +{ + GtkWidget* scrolled = gtk_widget_get_parent (browser->inspector_view); + gtk_container_remove (GTK_CONTAINER (scrolled), browser->inspector_view); + gtk_container_add (GTK_CONTAINER (scrolled), inspector_view); + browser->inspector_view = inspector_view; +} + static void midori_view_new_tab_cb (GtkWidget* view, const gchar* uri, @@ -774,6 +789,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_activate_action_cb, browser, "signal::console-message", midori_view_console_message_cb, browser, + "signal::attach-inspector", + midori_view_attach_inspector_cb, browser, "signal::new-tab", midori_view_new_tab_cb, browser, "signal::new-window", @@ -3038,7 +3055,8 @@ static const GtkActionEntry entries[] = { N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) }, { "FindPrevious", GTK_STOCK_GO_BACK, N_("Find _Previous"), "g", - N_("Find the previous occurrence of a word or phrase"), G_CALLBACK (_action_find_previous_activate) }, + N_("Find the previous occurrence of a word or phrase"), + G_CALLBACK (_action_find_previous_activate) }, { "FindQuick", GTK_STOCK_FIND, N_("_Quick Find"), "period", N_("Quickly jump to a word or phrase"), NULL/*G_CALLBACK (_action_find_quick_activate)*/ }, @@ -3071,7 +3089,8 @@ static const GtkActionEntry entries[] = { N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, { "SelectionSourceView", NULL, N_("View Selection Source"), "", - N_("View the source code of the selection"), NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, + N_("View the source code of the selection"), + NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, { "Fullscreen", GTK_STOCK_FULLSCREEN, NULL, "F11", N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) }, @@ -3113,7 +3132,8 @@ static const GtkActionEntry entries[] = { N_("Clear the entire history"), G_CALLBACK (_action_history_clear_activate) }, { "HistoryAddBookmark", STOCK_BOOKMARK_ADD, NULL, "", - N_("Add the selected history item as a bookmark"), G_CALLBACK (_action_history_add_bookmark_activate) }, + N_("Add the selected history item as a bookmark"), + G_CALLBACK (_action_history_add_bookmark_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", @@ -3147,7 +3167,8 @@ static const GtkActionEntry entries[] = { static const GtkToggleActionEntry toggle_entries[] = { { "PrivateBrowsing", NULL, N_("P_rivate Browsing"), "", - N_("Don't save any private data while browsing"), NULL/*G_CALLBACK (_action_private_browsing_activate)*/, + N_("Don't save any private data while browsing"), + NULL/*G_CALLBACK (_action_private_browsing_activate)*/, FALSE }, { "Menubar", NULL, @@ -3360,9 +3381,26 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, static void midori_browser_init (MidoriBrowser* browser) { - GtkToolItem* toolitem; - GtkRcStyle* rcstyle; + GtkWidget* vbox; + GtkUIManager* ui_manager; + GError* error; GtkAction* action; + GtkWidget* menuitem; + GtkSettings* gtk_settings; + GtkWidget* hbox; + GtkWidget* hpaned; + GtkWidget* vpaned; + GtkWidget* box; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkTreeStore* treestore; + GtkWidget* treeview; + GtkWidget* toolbar; + GtkToolItem* toolitem; + GtkWidget* panel; + GtkRcStyle* rcstyle; + GtkWidget* scrolled; browser->net = katze_net_new (); @@ -3384,7 +3422,7 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_destroy_cb), NULL); gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser"); gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ()); - GtkWidget* vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (browser), vbox); gtk_widget_show (vbox); @@ -3395,12 +3433,12 @@ midori_browser_init (MidoriBrowser* browser) entries, entries_n, browser); gtk_action_group_add_toggle_actions (browser->action_group, toggle_entries, toggle_entries_n, browser); - GtkUIManager* ui_manager = gtk_ui_manager_new (); + ui_manager = gtk_ui_manager_new (); gtk_ui_manager_insert_action_group (ui_manager, browser->action_group, 0); gtk_window_add_accel_group (GTK_WINDOW (browser), gtk_ui_manager_get_accel_group (ui_manager)); - GError* error = NULL; + error = NULL; if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error)) { /* TODO: Should this be a message dialog? When does this happen? */ @@ -3525,7 +3563,7 @@ midori_browser_init (MidoriBrowser* browser) /* Create the menubar */ browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); - GtkWidget* menuitem = gtk_menu_item_new (); + menuitem = gtk_menu_item_new (); gtk_widget_show (menuitem); browser->throbber = katze_throbber_new (); gtk_widget_show (browser->throbber); @@ -3552,7 +3590,7 @@ midori_browser_init (MidoriBrowser* browser) browser->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); /* FIXME: settings should be connected with screen changes */ - GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); + gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (gtk_settings) g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser); @@ -3575,12 +3613,11 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); /* Superuser warning */ - GtkWidget* hbox; if ((hbox = sokoke_superuser_warning_new ())) gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); /* Create the panel */ - GtkWidget* hpaned = gtk_hpaned_new (); + hpaned = gtk_hpaned_new (); g_signal_connect (hpaned, "notify::position", G_CALLBACK (midori_panel_notify_position_cb), browser); @@ -3595,12 +3632,9 @@ midori_browser_init (MidoriBrowser* browser) gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); /* Bookmarks */ - GtkWidget* box = gtk_vbox_new (FALSE, 0); - GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_pixbuf; - GtkTreeStore* treestore = gtk_tree_store_new (1, KATZE_TYPE_ITEM); - GtkWidget* treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); + box = gtk_vbox_new (FALSE, 0); + treestore = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); @@ -3632,8 +3666,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); browser->panel_bookmarks = treeview; gtk_widget_show_all (box); - GtkWidget* toolbar = gtk_ui_manager_get_widget (ui_manager, - "/toolbar_bookmarks"); + toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_bookmarks"); _action_set_sensitive (browser, "BookmarkAdd", FALSE); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); gtk_widget_show_all (toolbar); @@ -3642,7 +3675,7 @@ midori_browser_init (MidoriBrowser* browser) STOCK_BOOKMARKS, _("Bookmarks")); /* Transfers */ - GtkWidget* panel = midori_view_new (browser->net); + panel = midori_view_new (browser->net); gtk_widget_show (panel); midori_panel_append_page (MIDORI_PANEL (browser->panel), panel, NULL, @@ -3731,6 +3764,9 @@ midori_browser_init (MidoriBrowser* browser) STOCK_EXTENSIONS, _("Extensions")); /* Notebook, containing all views */ + vpaned = gtk_vpaned_new (); + gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); + gtk_widget_show (vpaned); browser->notebook = gtk_notebook_new (); /* Remove the inner border between scrollbars and the window border */ rcstyle = gtk_rc_style_new (); @@ -3738,12 +3774,28 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_modify_style (browser->notebook, rcstyle); g_object_unref (rcstyle); gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); - gtk_paned_pack2 (GTK_PANED (hpaned), browser->notebook, FALSE, FALSE); + gtk_paned_pack2 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE); g_signal_connect_after (browser->notebook, "switch-page", G_CALLBACK (gtk_notebook_switch_page_cb), browser); gtk_widget_show (browser->notebook); + /* Inspector container */ + browser->inspector = gtk_vbox_new (FALSE, 0); + gtk_paned_pack2 (GTK_PANED (vpaned), browser->inspector, TRUE, TRUE); + scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), + GTK_SHADOW_ETCHED_IN); + gtk_box_pack_start (GTK_BOX (browser->inspector), + scrolled, TRUE, TRUE, 0); + browser->inspector_view = webkit_web_view_new (); + gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view); + gtk_widget_show_all (browser->inspector); + /* Incremental findbar */ browser->find = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 6127bc7a..d4bd25f9 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -423,10 +423,17 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "enable-plugins", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); SPANNED_ADD (button, 1, 2, 2, 3); + #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 3) + button = katze_property_proxy (settings, "enable-developer-extras", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Developer tools")); + SPANNED_ADD (button, 0, 1, 3, 4); + #endif + #endif label = katze_property_label (settings, "location-entry-search"); - INDENTED_ADD (label, 0, 1, 3, 4); + INDENTED_ADD (label, 0, 1, 4, 5); entry = katze_property_proxy (settings, "location-entry-search", NULL); - FILLED_ADD (entry, 1, 2, 3, 4); + FILLED_ADD (entry, 1, 2, 4, 5); /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); diff --git a/midori/midori-view.c b/midori/midori-view.c index 4de7c599..a394d0ad 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -106,6 +106,7 @@ enum enum { ACTIVATE_ACTION, CONSOLE_MESSAGE, + ATTACH_INSPECTOR, WINDOW_OBJECT_CLEARED, NEW_TAB, NEW_WINDOW, @@ -280,6 +281,17 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_INT, G_TYPE_STRING); + signals[ATTACH_INSPECTOR] = g_signal_new ( + "attach-inspector", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_WIDGET); + signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( "window-object-cleared", G_TYPE_FROM_CLASS (class), @@ -1215,10 +1227,80 @@ midori_view_get_progress (MidoriView* view) return view->progress; } +#ifdef WEBKIT_CHECK_VERSION +#if WEBKIT_CHECK_VERSION (1, 0, 3) +static WebKitWebView* +webkit_web_inspector_inspect_web_view_cb (WebKitWebInspector* inspector, + WebKitWebView* web_view, + MidoriView* view) +{ + gchar* title; + GtkWidget* window; + GtkWidget* toplevel; + GdkScreen* screen; + gint width, height; + GtkIconTheme* icon_theme; + GdkPixbuf* icon; + GdkPixbuf* gray_icon; + GtkWidget* inspector_view; + + title = g_strdup_printf (_("Inspect page - %s"), ""); + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (window), title); + g_free (title); + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); + if (GTK_WIDGET_TOPLEVEL (toplevel)) + { + gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (toplevel)); + screen = gtk_window_get_screen (GTK_WINDOW (toplevel)); + width = gdk_screen_get_width (screen) / 1.7; + height = gdk_screen_get_height (screen) / 1.7; + gtk_window_set_default_size (GTK_WINDOW (window), width, height); + } + + /* Attempt to make a gray version of the icon on the fly */ + icon_theme = gtk_icon_theme_get_for_screen ( + gtk_widget_get_screen (GTK_WIDGET (view))); + icon = gtk_icon_theme_load_icon (icon_theme, "midori", 32, + GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + if (icon) + { + gray_icon = gdk_pixbuf_copy (icon); + if (gray_icon) + { + gdk_pixbuf_saturate_and_pixelate (gray_icon, gray_icon, 0.1, FALSE); + gtk_window_set_icon (GTK_WINDOW (window), gray_icon); + g_object_unref (gray_icon); + } + g_object_unref (icon); + } + else + gtk_window_set_icon_name (GTK_WINDOW (window), "midori"); + inspector_view = webkit_web_view_new (); + gtk_container_add (GTK_CONTAINER (window), inspector_view); + + /* FIXME: Implement web inspector signals properly + FIXME: Save and restore window size + FIXME: Update window title with URI */ + gtk_widget_show_all (window); + /* inspector_view = webkit_web_view_new (); + gtk_widget_show (inspector_view); + g_signal_emit (view, signals[ATTACH_INSPECTOR], 0, inspector_view); */ + return WEBKIT_WEB_VIEW (inspector_view); +} +#endif +#endif + static void midori_view_construct_web_view (MidoriView* view) { WebKitWebFrame* web_frame; + #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 3) + WebKitWebInspector* inspector; + #endif + #endif view->web_view = webkit_web_view_new (); @@ -1261,6 +1343,16 @@ midori_view_construct_web_view (MidoriView* view) gtk_widget_show (view->web_view); gtk_container_add (GTK_CONTAINER (view), view->web_view); + + #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 3) + inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (view->web_view)); + g_object_connect (inspector, + "signal::inspect-web-view", + webkit_web_inspector_inspect_web_view_cb, view, + NULL); + #endif + #endif } /** From 017c4d5d6f55a60249814a137749446fd762aada Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 1 Nov 2008 19:19:28 +0100 Subject: [PATCH 0448/2970] Correct erroneous strings --- midori/midori-preferences.c | 2 +- midori/midori-stock.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index d4bd25f9..3613d147 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -421,7 +421,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); + gtk_button_set_label (GTK_BUTTON (button), _("Enable plugins")); SPANNED_ADD (button, 1, 2, 2, 3); #ifdef WEBKIT_CHECK_VERSION #if WEBKIT_CHECK_VERSION (1, 0, 3) diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 305e0cca..9c475003 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -30,7 +30,7 @@ #define STOCK_STYLE "gnome-settings-theme" #define STOCK_STYLES "gnome-settings-theme" #define STOCK_OPEN_IN_TAB "stock_new-tab" -#define STOCK_OPEN_IN_WINDOW "stock_new-tab" +#define STOCK_OPEN_IN_WINDOW "stock_new-window" #define STOCK_TRANSFER "package" #define STOCK_TRANSFERS "package" From 02751ee5752280eead0be5dfdf89b0a370104b9d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 1 Nov 2008 19:25:13 +0100 Subject: [PATCH 0449/2970] Simplify Download menu item and hide WebKit's item --- midori/midori-view.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index a394d0ad..216aa871 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -851,13 +851,14 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_new_window_activate_cb), view); menuitem = (GtkWidget*)g_list_nth_data (items, 3); - /* hack to disable non-functional Download File */ - gtk_widget_set_sensitive (menuitem, FALSE); g_list_free (items); + /* hack to disable non-functional Download File + FIXME: Make sure this really is the right menu item */ + gtk_widget_hide (menuitem); if (view->download_manager && *view->download_manager) { menuitem = gtk_image_menu_item_new_with_mnemonic ( - _("Download Link with Download _Manager")); + _("_Download Link destination")); icon = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); From dbcfce4197f2051df34edd76f34837db1294e7f5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 3 Nov 2008 00:17:43 +0100 Subject: [PATCH 0450/2970] Improve strings for the sake of better localization --- midori/main.c | 26 ++++++++++++-------------- midori/midori-browser.c | 28 ++++++++++++++++------------ midori/midori-preferences.c | 14 +++++++++----- midori/midori-stock.h | 2 -- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/midori/main.c b/midori/main.c index e15adf84..d5735b98 100644 --- a/midori/main.c +++ b/midori/main.c @@ -75,8 +75,6 @@ stock_items_init (void) { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, - { STOCK_OPEN_IN_TAB, N_("Open in New _Tab"), 0, 0, GTK_STOCK_ADD }, - { STOCK_OPEN_IN_WINDOW, N_("Open in New _Window"), 0, 0, GTK_STOCK_ADD }, { STOCK_PAGE_HOLDER, N_("_Pageholder"), 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, @@ -133,7 +131,7 @@ settings_new_from_file (const gchar* filename) G_KEY_FILE_KEEP_COMMENTS, &error)) { if (error->code != G_FILE_ERROR_NOENT) - printf (_("The configuration couldn't be loaded. %s\n"), + printf (_("The configuration couldn't be loaded: %s\n"), error->message); g_error_free (error); } @@ -591,7 +589,7 @@ db_open (const char* dbname, { *error = g_error_new (MIDORI_HISTORY_ERROR, MIDORI_HISTORY_ERROR_DB_OPEN, - _("Error opening database: %s\n"), + _("Failed to open database: %s\n"), sqlite3_errmsg (db)); } sqlite3_close (db); @@ -623,7 +621,7 @@ db_exec_callback (sqlite3* db, { *error = g_error_new (MIDORI_HISTORY_ERROR, MIDORI_HISTORY_ERROR_EXEC_SQL, - _("Error opening database: %s\n"), + _("Failed to open database: %s\n"), errmsg); } sqlite3_free (errmsg); @@ -678,7 +676,7 @@ midori_history_remove_item_cb (KatzeArray* history, success = db_exec (db, sqlcmd, &error); if (!success) { - g_printerr (_("Failed to remove history item. %s\n"), error->message); + g_printerr (_("Failed to remove history item: %s\n"), error->message); g_error_free (error); return ; } @@ -702,7 +700,7 @@ midori_history_clear_cb (KatzeArray* history, if (!db_exec (db, "DELETE FROM history", &error)) { - g_printerr (_("Failed to clear history. %s\n"), error->message); + g_printerr (_("Failed to clear history: %s\n"), error->message); g_error_free (error); } } @@ -735,7 +733,7 @@ midori_history_add_item_cb (KatzeArray* array, if (!db_exec_callback (db, "SELECT date('now')", gettimestr, item, &error)) { - g_printerr (_("Failed to add history item. %s\n"), error->message); + g_printerr (_("Failed to add history item: %s\n"), error->message); g_error_free (error); return; } @@ -750,7 +748,7 @@ midori_history_add_item_cb (KatzeArray* array, g_free (sqlcmd); if (!success) { - g_printerr (_("Failed to add history item. %s\n"), error->message); + g_printerr (_("Failed to add history item: %s\n"), error->message); g_error_free (error); return ; } @@ -867,7 +865,7 @@ midori_history_terminate (sqlite3* db, db_exec (db, sqlcmd, &error); if (!success) { - g_printerr (_("Failed to remove old history items. %s\n"), error->message); + g_printerr (_("Failed to remove old history items: %s\n"), error->message); g_error_free (error); return ; } @@ -1193,7 +1191,7 @@ main (int argc, { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, - _("The bookmarks couldn't be loaded. %s\n"), error->message); + _("The bookmarks couldn't be loaded: %s\n"), error->message); g_error_free (error); } g_free (config_file); @@ -1207,7 +1205,7 @@ main (int argc, { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, - _("The session couldn't be loaded. %s\n"), error->message); + _("The session couldn't be loaded: %s\n"), error->message); g_error_free (error); } g_free (config_file); @@ -1219,7 +1217,7 @@ main (int argc, { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, - _("The trash couldn't be loaded. %s\n"), error->message); + _("The trash couldn't be loaded: %s\n"), error->message); g_error_free (error); } g_free (config_file); @@ -1232,7 +1230,7 @@ main (int argc, if ((db = midori_history_initialize (history, config_file, &error)) == NULL) { g_string_append_printf (error_messages, - _("The history couldn't be loaded. %s\n"), error->message); + _("The history couldn't be loaded: %s\n"), error->message); g_error_free (error); } g_free (config_file); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f329d548..59e3c9e9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1145,7 +1145,7 @@ _action_open_activate (GtkAction* action, GtkWidget* dialog; dialog = gtk_file_chooser_dialog_new ( - ("Open file"), GTK_WINDOW (browser), + _("Open file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -1221,7 +1221,7 @@ _action_save_as_activate (GtkAction* action, gchar* folder; dialog = gtk_file_chooser_dialog_new ( - ("Save file as"), GTK_WINDOW (browser), + _("Save file as"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, @@ -2165,6 +2165,7 @@ midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, static void midori_browser_bookmark_popup_item (GtkWidget* menu, const gchar* stock_id, + const gchar* label, KatzeItem* item, gpointer callback, MidoriBrowser* browser) @@ -2175,6 +2176,9 @@ midori_browser_bookmark_popup_item (GtkWidget* menu, uri = katze_item_get_uri (item); menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); if (!strcmp (stock_id, GTK_STOCK_EDIT)) gtk_widget_set_sensitive (menuitem, KATZE_IS_ARRAY (item) || uri != NULL); @@ -2292,22 +2296,22 @@ midori_browser_bookmark_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, + midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL, item, midori_browser_bookmark_open_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, STOCK_OPEN_IN_TAB, + midori_browser_bookmark_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), item, midori_browser_bookmark_open_in_tab_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, STOCK_OPEN_IN_WINDOW, + midori_browser_bookmark_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), item, midori_browser_bookmark_open_in_window_activate_cb, browser); if (history_item && !KATZE_IS_ARRAY (item)) - midori_browser_bookmark_popup_item (menu, STOCK_BOOKMARK_ADD, + midori_browser_bookmark_popup_item (menu, STOCK_BOOKMARK_ADD, NULL, item, midori_browser_bookmark_bookmark_activate_cb, browser); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); if (!history_item) - midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, + midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL, item, midori_browser_bookmark_edit_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, + midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, item, midori_browser_bookmark_delete_activate_cb, browser); sokoke_widget_popup (widget, GTK_MENU (menu), @@ -3132,7 +3136,7 @@ static const GtkActionEntry entries[] = { N_("Clear the entire history"), G_CALLBACK (_action_history_clear_activate) }, { "HistoryAddBookmark", STOCK_BOOKMARK_ADD, NULL, "", - N_("Add the selected history item as a bookmark"), + N_("Bookmark the selected history item"), G_CALLBACK (_action_history_add_bookmark_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, @@ -3516,7 +3520,7 @@ midori_browser_init (MidoriBrowser* browser) "name", "RecentlyVisited", "label", _("_Recently visited pages"), "stock-id", STOCK_HISTORY, - "tooltip", _("Revisit pages that you opened before"), + "tooltip", _("Reopen pages that you visited earlier"), NULL); g_object_connect (action, "signal::populate-popup", @@ -3532,7 +3536,7 @@ midori_browser_init (MidoriBrowser* browser) "name", "Bookmarks", "label", _("_Bookmarks"), "stock-id", STOCK_BOOKMARKS, - "tooltip", _("Reopen a previously closed tab or window"), + "tooltip", _("Show the saved bookmarks"), NULL); g_object_connect (action, "signal::populate-popup", @@ -3546,7 +3550,7 @@ midori_browser_init (MidoriBrowser* browser) action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Window", - "label", _("Window"), + "label", _("_Window"), "stock-id", GTK_STOCK_INDEX, "tooltip", _("Show a list of all open tabs"), "array", browser->proxy_array, diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 3613d147..4a524c2f 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -426,7 +426,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, #ifdef WEBKIT_CHECK_VERSION #if WEBKIT_CHECK_VERSION (1, 0, 3) button = katze_property_proxy (settings, "enable-developer-extras", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Developer tools")); + gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); SPANNED_ADD (button, 0, 1, 3, 4); #endif #endif @@ -478,7 +478,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 3, 4); /* Page "Network" */ - /*PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); + #if 0 + PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); TABLE_NEW (2, 2); label = katze_property_label (settings, "http-proxy"); @@ -492,11 +493,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 1, 2);*/ + FILLED_ADD (hbox, 1, 2, 1, 2); + #endif /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); - /*FRAME_NEW (_("Web Cookies")); + #if 0 + FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); INDENTED_ADD (label, 0, 1, 0, 1); @@ -511,7 +514,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 2, 3);*/ + FILLED_ADD (hbox, 1, 2, 2, 3); + #endif FRAME_NEW (_("History")); TABLE_NEW (3, 2); button = katze_property_proxy (settings, "remember-last-visited-pages", NULL); diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 9c475003..d1b1d6c9 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -29,8 +29,6 @@ #define STOCK_PAGE_HOLDER GTK_STOCK_ORIENTATION_PORTRAIT #define STOCK_STYLE "gnome-settings-theme" #define STOCK_STYLES "gnome-settings-theme" -#define STOCK_OPEN_IN_TAB "stock_new-tab" -#define STOCK_OPEN_IN_WINDOW "stock_new-window" #define STOCK_TRANSFER "package" #define STOCK_TRANSFERS "package" From 32d8503bfc4d9bc4681766a9fc92d7c4841e06a5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 3 Nov 2008 00:19:11 +0100 Subject: [PATCH 0451/2970] Add file TRANSLATE with tips for translating Midori --- TRANSLATE | 20 ++++++++++++++++++++ wscript | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 TRANSLATE diff --git a/TRANSLATE b/TRANSLATE new file mode 100644 index 00000000..133ed47b --- /dev/null +++ b/TRANSLATE @@ -0,0 +1,20 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + ++++ Translating Midori +++ + +If you want to translate Midori, you need a few preparations. + +First enable localization file updates when building: + +./waf configure --enable-update-po && ./waf build + +If you want to add a new language 'aa', create it like this: + +msginit -l aa_CC -o aa.po -i midori.pot && sed -i 's/PACKAGE/midori/g' aa.po + +To check your language 'aa' for errors, do this: + +msgfmt -c --check-accelerators=_ aa.po + +As a general rule, your localization should be based off of the +current state of the git repository. diff --git a/wscript b/wscript index b4d2af6c..72201fe0 100644 --- a/wscript +++ b/wscript @@ -170,7 +170,8 @@ def build (bld): bld.add_subdirs ('katze midori icons') - install_files ('DOCDIR', '/' + APPNAME + '/', 'AUTHORS ChangeLog COPYING EXPAT README') + install_files ('DOCDIR', '/' + APPNAME + '/', \ + 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') if bld.env ()['RST2HTML']: # FIXME: Build only if needed From e228ccbad0310bc0e701baf1edec327f7e24e22f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 3 Nov 2008 00:19:47 +0100 Subject: [PATCH 0452/2970] Update German translation --- po/de.po | 1220 ++++++++++++++++++++++++------------------------------ 1 file changed, 539 insertions(+), 681 deletions(-) diff --git a/po/de.po b/po/de.po index 6b54b0f8..3a4ed392 100644 --- a/po/de.po +++ b/po/de.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.18\n" +"Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 00:20+0200\n" -"PO-Revision-Date: 2008-08-18 22:21+0100\n" +"POT-Creation-Date: 2008-11-02 23:30+0100\n" +"PO-Revision-Date: 2008-11-02 28:21+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 -#: ../midori/main.c:419 ../midori/main.c:433 +#: ../midori.desktop.in.h:2 ../midori/main.c:1098 ../midori/main.c:1107 +#: ../midori/main.c:1118 ../midori/main.c:1142 msgid "Midori" msgstr "Midori" @@ -30,1021 +30,956 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:52 +#: ../midori/main.c:71 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +#: ../midori/main.c:72 ../midori/midori-browser.c:3537 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/main.c:54 +#: ../midori/main.c:73 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:55 +#: ../midori/main.c:74 msgid "_Console" msgstr "_Konsole" -#: ../midori/main.c:56 +#: ../midori/main.c:75 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/main.c:57 +#: ../midori/main.c:76 msgid "_History" msgstr "_Verlauf" -#: ../midori/main.c:58 +#: ../midori/main.c:77 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:59 +#: ../midori/main.c:78 msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../midori/main.c:60 +#: ../midori/main.c:79 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/main.c:61 +#: ../midori/main.c:80 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/main.c:62 +#: ../midori/main.c:81 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:63 +#: ../midori/main.c:82 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/main.c:64 +#: ../midori/main.c:83 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/main.c:65 +#: ../midori/main.c:84 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:67 -msgid "Select _All" -msgstr "A_lles markieren" - -#: ../midori/main.c:70 -msgid "_Fullscreen" -msgstr "_Vollbild" - -#: ../midori/main.c:71 -msgid "_Leave Fullscreen" -msgstr "Vollbild _verlassen" - -#: ../midori/main.c:122 +#: ../midori/main.c:134 #, c-format -msgid "The configuration couldn't be loaded. %s\n" -msgstr "Die Konfiguration konnte nicht geladen werden. %s\n" +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:177 +#: ../midori/main.c:189 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:184 ../midori/main.c:253 +#: ../midori/main.c:196 ../midori/main.c:265 #, c-format msgid "Unhandled settings value '%s'" msgstr "Unbehandelter Einstellungswert »%s«" -#: ../midori/main.c:368 +#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 +#: ../midori/main.c:571 +msgid "Malformed document." +msgstr "Fehlerhaftes Dokument" + +#: ../midori/main.c:554 +msgid "File not found." +msgstr "Datei nicht gefunden." + +#: ../midori/main.c:592 ../midori/main.c:624 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Datenbank konnte nicht geöffnet werden: %s\n" + +#: ../midori/main.c:679 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" + +#: ../midori/main.c:703 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" + +#: ../midori/main.c:736 ../midori/main.c:751 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" + +#: ../midori/main.c:868 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" + +#: ../midori/main.c:1000 ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Schreiben fehlgeschlagen." + +#: ../midori/main.c:1025 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:396 +#: ../midori/main.c:1057 +msgid "Run the specified filename as javascript" +msgstr "Angegebenen Dateinamen als Javaskript ausführen" + +#: ../midori/main.c:1059 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:413 -msgid "[URL]" -msgstr "[URL]" +#: ../midori/main.c:1061 +msgid "URIs" +msgstr "URIs" -#: ../midori/main.c:417 -msgid "Unknown argument." -msgstr "Unbekanntes Argument." +#: ../midori/main.c:1095 +msgid "[URIs]" +msgstr "[URIs]" -#: ../midori/main.c:419 -msgid "Failed to setup interface." -msgstr "Oberfläche konnte nicht eingerichtet werden." - -#: ../midori/main.c:434 +#: ../midori/main.c:1119 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:436 +#: ../midori/main.c:1121 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" +#: ../midori/main.c:1142 +msgid "No filename specified" +msgstr "Kein Dateiname angegeben" + #. FIXME: Do we want a graphical error message? -#: ../midori/main.c:467 +#: ../midori/main.c:1160 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:501 +#: ../midori/main.c:1194 #, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Die Lesezeichen konnten nicht geladen werden. %s\n" +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:515 +#: ../midori/main.c:1208 #, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "Die Sitzung konnte nicht geladen werden. %s\n" +msgid "The session couldn't be loaded: %s\n" +msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:527 +#: ../midori/main.c:1220 #, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "Der Papierkorb konnte nicht geladen werden. %s\n" +msgid "The trash couldn't be loaded: %s\n" +msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:539 +#: ../midori/main.c:1233 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Der Verlauf konnte nicht geladen werden: %s\n" + +#: ../midori/main.c:1246 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:688 +#: ../midori/main.c:1405 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:698 +#: ../midori/main.c:1415 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../midori/main.c:707 +#: ../midori/main.c:1424 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht geladen werden. %s" -#: ../midori/main.c:715 +#: ../midori/main.c:1432 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 -msgid "Settings" -msgstr "Einstellungen" - -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 -msgid "The associated settings" -msgstr "Die zugewiesenen Einstellungen" - -#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 -msgid "Trash" -msgstr "Papierkorb" - -#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Der Papierkorb, Behältnis für kürzlich geschlossene Reiter und Fenster" - -#: ../midori/midori-app.c:141 -msgid "Browser" -msgstr "Navigator" - -#: ../midori/midori-app.c:142 -msgid "The current browser" -msgstr "Der aktuelle Navigator" - -#: ../midori/midori-app.c:150 -msgid "Browser Count" -msgstr "Anzahl Navigatoren" - -#: ../midori/midori-app.c:151 -msgid "The current number of browsers" -msgstr "Die maximale Anzahl an Navigatoren" - -#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "Suchmaschinen" - -#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "Die Liste der Suchmaschine" - -#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 msgid "None" msgstr "Keine" -#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3768 msgid "Extensions" msgstr "Erweiterungen" -#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3751 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3759 msgid "Userstyles" msgstr "Benutzerstile" -#: ../midori/midori-addons.c:113 -msgid "Web Widget" -msgstr "Netz-Steuerelement" +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Einschalten" -#: ../midori/midori-addons.c:114 -msgid "The assigned web widget" -msgstr "Das zugewiesene Netz-Steuerelement" +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Auschalten" -#: ../midori/midori-addons.c:122 -msgid "Kind" -msgstr "Sorte" - -#: ../midori/midori-addons.c:123 -msgid "The kind of addons" -msgstr "Die Sorte Ergänzung" - -#: ../midori/midori-browser.c:192 -msgid "Source" -msgstr "Quelltext" - -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3081 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 +#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3078 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:349 +#: ../midori/midori-browser.c:321 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:573 -msgid "New bookmark" -msgstr "Neues Lesezeichen" - -#: ../midori/midori-browser.c:573 -msgid "Edit bookmark" -msgstr "Lesezeichen bearbeiten" - -#: ../midori/midori-browser.c:597 -msgid "_Title:" -msgstr "_Titel:" - -#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 -msgid "_Description:" -msgstr "_Beschreibung" - -#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:646 -msgid "_Folder:" -msgstr "_Ordner:" - -#: ../midori/midori-browser.c:650 -msgid "Root" -msgstr "Wurzel" - -#: ../midori/midori-browser.c:1082 +#: ../midori/midori-browser.c:344 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:1228 -msgid "Menubar" -msgstr "Menüleiste" +#: ../midori/midori-browser.c:512 +msgid "New bookmark" +msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:1229 -msgid "The menubar" -msgstr "Die Menüleiste" +#: ../midori/midori-browser.c:512 +msgid "Edit bookmark" +msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 -msgid "Navigationbar" -msgstr "Navigationsleiste" +#: ../midori/midori-browser.c:534 +msgid "_Title:" +msgstr "_Titel:" -#: ../midori/midori-browser.c:1238 -msgid "The navigationbar" -msgstr "Die Navigationsleiste" +#: ../midori/midori-browser.c:547 ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Beschreibung" -#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 -msgid "URI" -msgstr "URI" +#: ../midori/midori-browser.c:566 ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL:" -#: ../midori/midori-browser.c:1247 -msgid "The current URI" -msgstr "Die aktuelle URI" +#: ../midori/midori-browser.c:582 +msgid "_Folder:" +msgstr "_Ordner:" -#: ../midori/midori-browser.c:1255 -msgid "Tab" -msgstr "Reiter" +#: ../midori/midori-browser.c:586 +msgid "Root" +msgstr "Wurzel" -#: ../midori/midori-browser.c:1256 -msgid "The current tab" -msgstr "Der aktuelle Reiter" +#: ../midori/midori-browser.c:1148 +msgid "Open file" +msgstr "Datei öffnen" -#: ../midori/midori-browser.c:1264 -msgid "Statusbar" -msgstr "Statusleiste" +#: ../midori/midori-browser.c:1224 +msgid "Save file as" +msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1265 -msgid "The statusbar" -msgstr "Die Statusleiste" +#: ../midori/midori-browser.c:2301 +msgid "Open in New _Tab" +msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:1301 -msgid "Statusbar Text" -msgstr "Statusleistenbeschriftung" +#: ../midori/midori-browser.c:2303 +msgid "Open in New _Window" +msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 -msgid "The text that is displayed in the statusbar" -msgstr "Der Text, der in der Statusleiste angezeigt wird" - -#: ../midori/midori-browser.c:1335 -msgid "The list of search engines to be used for web search" -msgstr "Die Liste der Suchmaschinen, die für die Netzsuche genutzt werden" - -#: ../midori/midori-browser.c:2313 +#: ../midori/midori-browser.c:2549 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2653 +#, c-format +msgid "%d days ago" +msgstr "vor %d Tagen" + +#: ../midori/midori-browser.c:2660 +msgid "Today" +msgstr "Heute" + +#: ../midori/midori-browser.c:2662 +msgid "Yesterday" +msgstr "Gestern" + +#: ../midori/midori-browser.c:2751 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2486 +#: ../midori/midori-browser.c:2759 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2699 +#: ../midori/midori-browser.c:2906 +msgid "Are you sure you want to remove all history items?" +msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" + +#: ../midori/midori-browser.c:3009 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:3012 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:2705 +#: ../midori/midori-browser.c:3015 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:3018 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:2711 +#: ../midori/midori-browser.c:3021 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:2713 +#: ../midori/midori-browser.c:3023 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:2714 +#: ../midori/midori-browser.c:3024 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:2716 +#: ../midori/midori-browser.c:3026 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:3027 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:2719 -msgid "Pa_ge Setup" -msgstr "Seite _einrichten" - -#: ../midori/midori-browser.c:2723 -msgid "Show a preview of the printed page" -msgstr "Eine Vorschau auf die gedruckte Seite anzeigen" - -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:3030 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:3033 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:2731 +#: ../midori/midori-browser.c:3035 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:2734 -msgid "Undo the last modification" -msgstr "Die letzte Änderung wiederrufen" - -#: ../midori/midori-browser.c:2737 -msgid "Redo the last modification" -msgstr "Die letzte Änderung wiederholen" - -#: ../midori/midori-browser.c:2740 +#: ../midori/midori-browser.c:3038 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 +#: ../midori/midori-browser.c:3041 ../midori/midori-browser.c:3044 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:2749 +#: ../midori/midori-browser.c:3047 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:2752 +#: ../midori/midori-browser.c:3050 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:2755 +#: ../midori/midori-browser.c:3053 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:2758 +#: ../midori/midori-browser.c:3056 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:2760 +#: ../midori/midori-browser.c:3058 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:2761 +#: ../midori/midori-browser.c:3059 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:3061 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:2764 +#: ../midori/midori-browser.c:3062 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2766 +#: ../midori/midori-browser.c:3065 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:2767 +#: ../midori/midori-browser.c:3066 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:3069 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:3071 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:3072 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:2785 +#: ../midori/midori-browser.c:3084 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2788 +#: ../midori/midori-browser.c:3087 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2791 +#: ../midori/midori-browser.c:3090 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:2793 +#: ../midori/midori-browser.c:3092 ../midori/midori-view.c:924 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3093 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:2796 +#: ../midori/midori-browser.c:3095 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:3096 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:3100 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3102 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:2805 +#: ../midori/midori-browser.c:3105 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:2808 +#: ../midori/midori-browser.c:3108 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:2811 +#: ../midori/midori-browser.c:3111 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:2813 -msgid "_Web Search..." -msgstr "_Netzsuche…" - -#: ../midori/midori-browser.c:2814 -msgid "Run a web search" -msgstr "Starte eine Netzsuche" - -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:3113 msgid "Open in Page_holder..." msgstr "In Seiten_halter öffnen…" -#: ../midori/midori-browser.c:2817 +#: ../midori/midori-browser.c:3114 msgid "Open the current page in the pageholder" msgstr "Die aktuelle Seite im Seitenhalter öffnen" -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2821 -msgid "Reopen a previously closed tab or window" -msgstr "Reiter oder Fenster zurückholen" - -#: ../midori/midori-browser.c:2823 +#: ../midori/midori-browser.c:3116 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:3117 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:2826 +#. FIXME: Make this sensitive only when there is a tab to undo +#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:899 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:3120 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:2832 +#: ../midori/midori-browser.c:3124 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2834 -msgid "_Manage Bookmarks" -msgstr "Lesezeichen _verwalten" - -#: ../midori/midori-browser.c:2835 -msgid "Add, edit and remove bookmarks..." -msgstr "Lesezeichen hinzufügen, bearbeiten und löschen…" - -#: ../midori/midori-browser.c:2838 -msgid "Open the selected bookmark" -msgstr "Markiertes Lesezeichen kopieren" - -#: ../midori/midori-browser.c:2840 -msgid "Open in New _Tab" -msgstr "In einem neuen _Reiter öffnen" - -#: ../midori/midori-browser.c:2841 -msgid "Open the selected bookmark in a new tab" -msgstr "Öffne das markierte Lesezeichen in einem neuen Reiter" - -#: ../midori/midori-browser.c:2843 -msgid "Open in New _Window" -msgstr "In einem neuen _Fenster öffnen" - -#: ../midori/midori-browser.c:2844 -msgid "Open the selected bookmark in a new window" -msgstr "Markiertes Lesezeichen in neuem Fenster öffnen" - -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:3127 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:3133 +msgid "Delete the selected history item" +msgstr "Ausgewählten Verlaufseintrag löschen" + +#: ../midori/midori-browser.c:3136 +msgid "Clear the entire history" +msgstr "Den gesamten Verlauf löschen" + +#: ../midori/midori-browser.c:3139 +msgid "Bookmark the selected history item" +msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" + +#: ../midori/midori-browser.c:3141 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 +#: ../midori/midori-browser.c:3143 ../midori/midori-searchaction.c:468 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:3144 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:2858 -msgid "_Window" -msgstr "_Fenster" - -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:3148 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:3149 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:2863 +#: ../midori/midori-browser.c:3151 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:3152 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:2866 -msgid "Tab _Overview" -msgstr "Reiterüber_sicht" - -#: ../midori/midori-browser.c:2867 -msgid "Show an overview of all open tabs" -msgstr "Zeige eine Übersicht über alle offenen Reiter" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:3154 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3156 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:3157 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:3159 +msgid "_Frequent questions" +msgstr "_Häufige Fragen" + +#: ../midori/midori-browser.c:3160 +msgid "Show the Frequently Asked Questions" +msgstr "Häufig gestellte Fragen anzeigen" + +#: ../midori/midori-browser.c:3162 +msgid "_Report a bug" +msgstr "Fehler _berichten" + +#: ../midori/midori-browser.c:3163 +msgid "Open Midori's bug tracker" +msgstr "Midoris Fehlerverfolgung öffnen" + +#: ../midori/midori-browser.c:3166 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:3173 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:2882 +#: ../midori/midori-browser.c:3174 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:2885 -msgid "_Work Offline" -msgstr "_Ohne Verbindung arbeiten" +#: ../midori/midori-browser.c:3179 +msgid "_Menubar" +msgstr "_Menüleiste" -#: ../midori/midori-browser.c:2886 -msgid "Work without a network connection" -msgstr "Ohne Netzwerkverbindung arbeiten" +#: ../midori/midori-browser.c:3180 +msgid "Show menubar" +msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:3183 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:2891 +#: ../midori/midori-browser.c:3184 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3187 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:2895 +#: ../midori/midori-browser.c:3188 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:3191 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:2899 +#: ../midori/midori-browser.c:3192 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:3195 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3196 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3199 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:3200 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3460 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3462 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3486 +msgid "_Web Search..." +msgstr "_Netzsuche…" + +#: ../midori/midori-browser.c:3488 +msgid "Run a web search" +msgstr "Starte eine Netzsuche" + +#: ../midori/midori-browser.c:3507 +msgid "Reopen a previously closed tab or window" +msgstr "Reiter oder Fenster zurückholen" + +#: ../midori/midori-browser.c:3521 +msgid "_Recently visited pages" +msgstr "_Zuletzt besuchte Seiten" + +#: ../midori/midori-browser.c:3523 +msgid "Reopen pages that you visited earlier" +msgstr "Bereits besuchte Seiten erneut öffnen" + +#: ../midori/midori-browser.c:3539 +msgid "Show the saved bookmarks" +msgstr "Die gespeicherten Lesezeichen anzeigen" + +#: ../midori/midori-browser.c:3553 +msgid "_Window" +msgstr "_Fenster" + +#: ../midori/midori-browser.c:3555 +msgid "Show a list of all open tabs" +msgstr "Zeige eine Übersicht aller offenen Reiter" + +#: ../midori/midori-browser.c:3679 msgid "Bookmarks" msgstr "Lesezeichen" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 +#: ../midori/midori-browser.c:3686 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3695 msgid "Console" msgstr "Konsole" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3733 ../midori/midori-preferences.c:521 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3485 +#: ../midori/midori-browser.c:3742 msgid "Pageholder" msgstr "Seitenhalter" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3810 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3845 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3853 +msgid "Highlight Matches" +msgstr "Treffer hervorheben" + +#: ../midori/midori-browser.c:3862 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:4108 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "Art des Schattens" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Erscheinungsbild des Schattens um jede Leiste" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Menü" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Menü für Leistenelemente" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "Seite" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "Der Index der aktiven Seite" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1514 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:393 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:134 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:150 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-r)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:152 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:153 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:154 msgid "Custom..." msgstr "Benutzerdefinidert…" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:171 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 +#: ../midori/midori-websettings.c:188 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:190 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "All cookies" msgstr "Alle Kekse" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Session cookies" msgstr "Sitzungskekse" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:281 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:289 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:298 msgid "Last pageholder URI" msgstr "Letzte URI im Seitenhalter" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:299 msgid "The URI last opened in the pageholder" msgstr "Die letzte im Seitenhalter geöffnete URI" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:308 +msgid "Show Menubar" +msgstr "Menüleiste anzeigen" + +#: ../midori/midori-websettings.c:309 +msgid "Whether to show the menubar" +msgstr "Die Menüleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:317 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:318 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:326 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:327 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:335 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:344 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:354 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:355 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Zeige Neuer Reiter" - -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" - -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "Zeige Startseite" - #: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "Neuer Reiter-Knopf in der Werkzeugleiste anzeigen" +msgid "Toolbar Items" +msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Zeige Netzsuche" +#: ../midori/midori-websettings.c:365 +msgid "The items to show on the toolbar" +msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" #: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "Netzsuchfeld in der Werkzeugleiste anzeigen" +msgid "Compact Sidepanel" +msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Zeige Papierkorb" +#: ../midori/midori-websettings.c:374 +msgid "Whether to make the sidepanel compact" +msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "Papierkorb-Knopf in der Werkzeugleiste anzeigen" - -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:383 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:384 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:394 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:402 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" +#: ../midori/midori-websettings.c:420 +msgid "Text Editor" +msgstr "Texteditor" + +#: ../midori/midori-websettings.c:421 +msgid "An external text editor" +msgstr "Ein externer Texteditor" + #: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Adressfeldsuche" @@ -1061,285 +996,313 @@ msgstr "Bevorzugter Zeichensatz" msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" +#: ../midori/midori-websettings.c:449 +msgid "Always Show Tabbar" +msgstr "Reiterleiste immer anzeigen" + #: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "Reitergröße" +msgid "Always show the tabbar" +msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "Die gewünschte Größe der Reiterbeschriftung" - -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:458 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:459 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:467 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:468 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" +#: ../midori/midori-websettings.c:477 +msgid "Open external pages in" +msgstr "Öffne Seiten von außerhalb in" + #: ../midori/midori-websettings.c:478 +msgid "Where to open externally opened pages" +msgstr "Wo Seiten von außerhalb geöffnet werden sollen" + +#: ../midori/midori-websettings.c:487 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:488 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:496 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:505 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:506 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:514 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:515 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:525 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:526 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:535 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:536 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:544 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:545 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:555 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:556 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:564 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:565 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:573 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:574 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:582 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:583 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:593 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:594 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:602 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:603 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-webview.c:64 +#: ../midori/midori-view.c:82 msgid "Load Provisional" msgstr "Vorläufiger Ladevorgang" -#: ../midori/midori-webview.c:65 +#: ../midori/midori-view.c:83 msgid "Load Committed" msgstr "Bestätigter Ladevorgang" -#: ../midori/midori-webview.c:66 +#: ../midori/midori-view.c:84 msgid "Load Finished" msgstr "Vollendeter Ladevorgang" -#: ../midori/midori-webview.c:224 -msgid "The URI of the currently loaded page" -msgstr "Die URI der aktuellen Seite" - -#: ../midori/midori-webview.c:234 -msgid "The title of the currently loaded page" -msgstr "Der Titel der aktuellen Seite" - -#: ../midori/midori-webview.c:244 -msgid "The current loading progress" -msgstr "Der aktuelle Ladefortschritt" - -#: ../midori/midori-webview.c:253 -msgid "The current loading status" -msgstr "Der aktuelle Ladezustand" - -#: ../midori/midori-webview.c:695 +#: ../midori/midori-view.c:836 msgid "Open Link in New _Tab" -msgstr "Verweis in einem neuen _Reiter öffnen" +msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-webview.c:723 -msgid "Download Link with Download _Manager" -msgstr "Verweis mit Übertragungs_manager herunterladen" +#: ../midori/midori-view.c:861 +msgid "_Download Link destination" +msgstr "Verweisziel _herunterladen" -#: ../midori/midori-webview.c:741 +#: ../midori/midori-view.c:883 msgid "Open URL in New _Tab" -msgstr "URL in einem neuen _Reiter öffnen" +msgstr "URL in neuem _Reiter öffnen" -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "Einstellungsinstanz mit erforderlichen Eigenschaften" - -#: ../midori/midori-preferences.c:84 +#: ../midori/midori-view.c:1248 #, c-format -msgid "%s Preferences" -msgstr "%s Einstellungen" +msgid "Inspect page - %s" +msgstr "Seite untersuchen - %s" + +#: ../midori/midori-view.c:1386 +msgid "Source" +msgstr "Quelltext" + +#: ../midori/midori-preferences.c:89 +#, c-format +msgid "Preferences for %s" +msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:267 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:268 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../midori/midori-preferences.c:301 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Schrifteinstellungen" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "Standardschriftart" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "Mindestschriftgröße" + #. Page "Behavior" -#: ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Inhalte" +#: ../midori/midori-preferences.c:411 +msgid "Load images automatically" +msgstr "Bilder automatisch laden" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "Bilder automatisch verkleinern" + +#: ../midori/midori-preferences.c:417 +msgid "Print backgrounds" +msgstr "Hintergründe drucken" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "Vergrößerbare Textfelder" + +#: ../midori/midori-preferences.c:423 +msgid "Enable scripts" +msgstr "Skripte einschalten" + +#: ../midori/midori-preferences.c:426 +msgid "Enable plugins" +msgstr "Zusatzmodule einschalten" + +#: ../midori/midori-preferences.c:431 +msgid "Enable developer tools" +msgstr "Entwicklerwerkzeuge einschalten" + #. Page "Interface" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:441 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:442 +msgid "Navigationbar" +msgstr "Navigationsleiste" + +#: ../midori/midori-preferences.c:457 msgid "Browsing" msgstr "Navigation" -#. Page "Network" -#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:496 msgid "MB" msgstr "MB" -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "Aktuelles Element" +#. Page "Privacy" +#: ../midori/midori-preferences.c:502 +msgid "Privacy" +msgstr "Privatssphäre" -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "Das aktuell ausgewählte Element" +#: ../midori/midori-preferences.c:504 +msgid "Web Cookies" +msgstr "Netzkekse" -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "Dialog" +#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +msgid "days" +msgstr "Tage" -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "Ein Dialog zum verwalten von Suchmaschinen" - -#: ../midori/midori-searchentry.c:151 +#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchaction.c:804 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchaction.c:804 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchentry.c:550 +#: ../midori/midori-searchaction.c:832 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchentry.c:594 +#: ../midori/midori-searchaction.c:876 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchentry.c:608 +#: ../midori/midori-searchaction.c:890 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchentry.c:789 +#: ../midori/midori-searchaction.c:1067 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" -#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:348 +#: ../midori/sokoke.c:283 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 -#, c-format -msgid "Writing failed." -msgstr "Schreiben fehlgeschlagen." - #: ../midori/gjs.c:512 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." @@ -1359,134 +1322,29 @@ msgstr "%s kann %s.%s nicht zugewiesen werden" msgid "%s.%s cannot be accessed" msgstr "Auf %s.%s kann nicht zugegriffen werden" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" -msgstr "Symbolgröße" - -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Größenkonstante für die Animation" - -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" -msgstr "Symbolname" - -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "Der Name eines Symbols, welches Animationsbilder enthält" - -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" -msgstr "Pixbuf" - -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "Ein GdkPixbuf, welcher Animationsbilder enthält" - -#: ../katze/katze-throbber.c:162 -msgid "Animated" -msgstr "Animiert" - -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "Ob das Aktivitätssymbol animiert sein soll" - -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "Statischer Symbolname" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Der Name eines Symbols, das als statisches Bild verwendet werden soll" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "Statischer Pixbuf" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "Ein GdkPixbuf, welcher als statisches Bild verwendet werden soll" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "Statische Bestandskennung" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "" -"Die Bestandskennung eines Symbols, das als statisches Bild verwendet werden " -"soll" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Das benannte Symbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "Das Symbol »%s« konnte nicht geladen werden" - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:187 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" - -#: ../katze/katze-item.c:72 -msgid "Name" -msgstr "Name" - -#: ../katze/katze-item.c:73 -msgid "The name of the item" -msgstr "Der Index des Elements" - -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" -msgstr "Der beschreibende Text des Elementes" - -#: ../katze/katze-item.c:91 -msgid "The URI of the item" -msgstr "Die URI des Elements" - -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "Symbol" - -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "Das Symbol des Elements" - -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "Kürzel" - -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "Das Kürzel des Elements" - -#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -#: ../katze/katze-xbel.c:789 -msgid "Malformed document." -msgstr "Fehlerhaftes Dokument" - -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "Datei nicht gefunden." From 82367f164cc62d2428114a6ff342a851f32402b0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 3 Nov 2008 00:21:15 +0100 Subject: [PATCH 0453/2970] Update French translation --- po/fr.po | 1237 ++++++++++++++++++++++++------------------------------ 1 file changed, 543 insertions(+), 694 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0d3bd81b..b067c388 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,11 +7,11 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.21\n" +"Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-05 11:05+0200\n" -"PO-Revision-Date: 2008-09-05 12:58+0200\n" -"Last-Translator: Robert-André Mauchin \n" +"POT-Creation-Date: 2008-11-02 23:30+0100\n" +"PO-Revision-Date: 2008-11-02 23:11+0100\n" +"Last-Translator: Christian Dywan 2008\n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../midori.desktop.in.h:2 ../midori/main.c:491 ../midori/main.c:500 -#: ../midori/main.c:502 ../midori/main.c:516 +#: ../midori.desktop.in.h:2 ../midori/main.c:1098 ../midori/main.c:1107 +#: ../midori/main.c:1118 ../midori/main.c:1142 msgid "Midori" msgstr "Midori" @@ -31,1044 +31,961 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:52 +#: ../midori/main.c:71 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/main.c:53 ../midori/midori-browser.c:2859 +#: ../midori/main.c:72 ../midori/midori-browser.c:3537 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/main.c:54 +#: ../midori/main.c:73 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/main.c:55 +#: ../midori/main.c:74 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:56 -msgid "_Disable" -msgstr "_Désactiver" - -#: ../midori/main.c:57 -msgid "_Enable" -msgstr "_Activer" - -#: ../midori/main.c:58 +#: ../midori/main.c:75 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:59 +#: ../midori/main.c:76 msgid "_History" msgstr "_Historique" -#: ../midori/main.c:60 +#: ../midori/main.c:77 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:61 +#: ../midori/main.c:78 msgid "_Pageholder" msgstr "C_adre de pages" -#: ../midori/main.c:62 +#: ../midori/main.c:79 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/main.c:63 +#: ../midori/main.c:80 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/main.c:64 +#: ../midori/main.c:81 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/main.c:65 +#: ../midori/main.c:82 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/main.c:66 +#: ../midori/main.c:83 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/main.c:67 +#: ../midori/main.c:84 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/main.c:69 -msgid "Select _All" -msgstr "_Tout sélectionner" - -#: ../midori/main.c:72 -msgid "_Fullscreen" -msgstr "_Plein écran" - -#: ../midori/main.c:73 -msgid "_Leave Fullscreen" -msgstr "_Quitter le plein écran" - -#: ../midori/main.c:124 +#: ../midori/main.c:134 #, c-format -msgid "The configuration couldn't be loaded. %s\n" -msgstr "La configuration n'a pu être chargée. %s\n" +msgid "The configuration couldn't be loaded: %s\n" +msgstr "La configuration n'a pu être chargée: %s\n" -#: ../midori/main.c:179 +#: ../midori/main.c:189 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:186 ../midori/main.c:255 +#: ../midori/main.c:196 ../midori/main.c:265 #, c-format msgid "Unhandled settings value '%s'" msgstr "Valeur de paramètre non pris en charge « %s »" -#: ../midori/main.c:426 ../midori/sokoke.c:522 ../katze/katze-xbel.c:899 +#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 +#: ../midori/main.c:571 +msgid "Malformed document." +msgstr "Document mal formé" + +#: ../midori/main.c:554 +msgid "File not found." +msgstr "Fichier non trouvé." + +#: ../midori/main.c:592 ../midori/main.c:624 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#: ../midori/main.c:679 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +#: ../midori/main.c:703 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:736 ../midori/main.c:751 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "" + +#: ../midori/main.c:868 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:1000 ../midori/sokoke.c:457 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/main.c:451 +#: ../midori/main.c:1025 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:478 +#: ../midori/main.c:1057 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1059 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:496 -msgid "[URL]" -msgstr "[URL]" +#: ../midori/main.c:1061 +msgid "URIs" +msgstr "URIs" -#: ../midori/main.c:500 -msgid "Unknown argument." -msgstr "Paramètre inconnu." +#: ../midori/main.c:1095 +msgid "[URIs]" +msgstr "[URIs]" -#: ../midori/main.c:502 -msgid "Failed to setup interface." -msgstr "La mise en place de l'interface a échoué." - -#: ../midori/main.c:517 +#: ../midori/main.c:1119 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:519 +#: ../midori/main.c:1121 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" +#: ../midori/main.c:1142 +msgid "No filename specified" +msgstr "Aucun nom de fichier indiqué" + #. FIXME: Do we want a graphical error message? -#: ../midori/main.c:550 +#: ../midori/main.c:1160 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:584 +#: ../midori/main.c:1194 #, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Les signets n'ont pu être chargés. %s\n" +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Les signets n'ont pu être chargés: %s\n" -#: ../midori/main.c:598 +#: ../midori/main.c:1208 #, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "La session n'a pu être chargée. %s\n" +msgid "The session couldn't be loaded: %s\n" +msgstr "La session n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:610 +#: ../midori/main.c:1220 #, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "La corbeille n'a pu être chargée. %s\n" +msgid "The trash couldn't be loaded: %s\n" +msgstr "La corbeille n'a pu être chargée: %s\n" -#: ../midori/main.c:622 +# pas très content +#: ../midori/main.c:1233 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "L'historique n'a pu être chargée. %s\n" + +#: ../midori/main.c:1246 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:774 +#: ../midori/main.c:1405 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:784 +#: ../midori/main.c:1415 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content -#: ../midori/main.c:793 +#: ../midori/main.c:1424 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:801 +#: ../midori/main.c:1432 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/midori-app.c:126 ../midori/midori-browser.c:1317 -msgid "Settings" -msgstr "Paramètres" - -#: ../midori/midori-app.c:127 ../midori/midori-browser.c:1318 -msgid "The associated settings" -msgstr "Les paramètres associés" - -#: ../midori/midori-app.c:135 ../midori/midori-browser.c:1334 -#: ../midori/midori-browser.c:3446 -msgid "Bookmarks" -msgstr "Signets" - -#: ../midori/midori-app.c:136 ../midori/midori-browser.c:1335 -msgid "The bookmarks folder, containing all bookmarks" -msgstr "Le dossier de signets, contenant tous les signets" - -#: ../midori/midori-app.c:144 ../midori/midori-browser.c:1353 -msgid "Trash" -msgstr "Corbeille" - -#: ../midori/midori-app.c:145 ../midori/midori-browser.c:1354 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "La corbeille, contenant les onglets et fenêtres récemment fermés" - -#: ../midori/midori-app.c:153 ../midori/midori-browser.c:1370 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "Moteurs de recherche" - -#: ../midori/midori-app.c:154 ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "La liste des moteurs de recherche" - -#: ../midori/midori-app.c:162 -msgid "Browser" -msgstr "Navigateur" - -#: ../midori/midori-app.c:163 -msgid "The current browser" -msgstr "Le navigateur actuel" - -#: ../midori/midori-app.c:171 -msgid "Browser Count" -msgstr "Le nombre de navigateurs" - -#: ../midori/midori-app.c:172 -msgid "The current number of browsers" -msgstr "Le nombre actuel de navigateurs" - -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 msgid "None" msgstr "Aucun" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3504 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3768 msgid "Extensions" msgstr "Extensions" -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3487 +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3751 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3495 +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3759 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../midori/midori-addons.c:115 -msgid "Web Widget" -msgstr "Widget toile" +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Activer" -#: ../midori/midori-addons.c:116 -msgid "The assigned web widget" -msgstr "Le widget toile assigné" +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Désactiver" -#: ../midori/midori-addons.c:124 -msgid "Kind" -msgstr "Type" - -#: ../midori/midori-addons.c:125 -msgid "The kind of addons" -msgstr "Le type d'addiciels" - -#: ../midori/midori-browser.c:195 -msgid "Source" -msgstr "Source" - -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:2806 -#: ../midori/midori-browser.c:2812 +#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3081 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:286 ../midori/midori-browser.c:2809 +#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3078 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:361 +#: ../midori/midori-browser.c:321 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:588 -msgid "New bookmark" -msgstr "Nouveau signet" - -#: ../midori/midori-browser.c:588 -msgid "Edit bookmark" -msgstr "Modifier le signet" - -#: ../midori/midori-browser.c:612 -msgid "_Title:" -msgstr "_Titre :" - -#: ../midori/midori-browser.c:625 ../midori/midori-searchentry.c:567 -msgid "_Description:" -msgstr "_Description :" - -#: ../midori/midori-browser.c:644 ../midori/midori-searchentry.c:581 -msgid "_URL:" -msgstr "_URL :" - -# manque un raccourcis Alt+X -#: ../midori/midori-browser.c:661 -msgid "_Folder:" -msgstr "_Dossier :" - -#: ../midori/midori-browser.c:665 -msgid "Root" -msgstr "Racine" - -#: ../midori/midori-browser.c:1096 +#: ../midori/midori-browser.c:344 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:1242 -msgid "Menubar" -msgstr "Barre de menu" +#: ../midori/midori-browser.c:512 +msgid "New bookmark" +msgstr "Nouveau signet" -#: ../midori/midori-browser.c:1243 -msgid "The menubar" -msgstr "La barre de menu" +#: ../midori/midori-browser.c:512 +msgid "Edit bookmark" +msgstr "Modifier le signet" -#: ../midori/midori-browser.c:1251 ../midori/midori-preferences.c:374 -msgid "Navigationbar" -msgstr "Barre de navigation" +#: ../midori/midori-browser.c:534 +msgid "_Title:" +msgstr "_Titre :" -#: ../midori/midori-browser.c:1252 -msgid "The navigationbar" -msgstr "La barre de navigation" +#: ../midori/midori-browser.c:547 ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Description :" -#: ../midori/midori-browser.c:1260 ../katze/katze-item.c:90 -msgid "URI" -msgstr "URI" +#: ../midori/midori-browser.c:566 ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL :" -#: ../midori/midori-browser.c:1261 -msgid "The current URI" -msgstr "L'URI actuel" +# manque un raccourcis Alt+X +#: ../midori/midori-browser.c:582 +msgid "_Folder:" +msgstr "_Dossier :" -#: ../midori/midori-browser.c:1269 -msgid "Tab" -msgstr "Onglet" +#: ../midori/midori-browser.c:586 +msgid "Root" +msgstr "Racine" -#: ../midori/midori-browser.c:1270 -msgid "The current tab" -msgstr "L'onglet actuel" +#: ../midori/midori-browser.c:1148 +msgid "Open file" +msgstr "Ouvrir fichier" -#: ../midori/midori-browser.c:1278 -msgid "Statusbar" -msgstr "Barre d'état" +#: ../midori/midori-browser.c:1224 +msgid "Save file as" +msgstr "Enregistrer fichier dans" -#: ../midori/midori-browser.c:1279 -msgid "The statusbar" -msgstr "La barre d'état" +#: ../midori/midori-browser.c:2301 +msgid "Open in New _Tab" +msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:1298 -msgid "Statusbar Text" -msgstr "Texte de la barre d'état" +#: ../midori/midori-browser.c:2303 +msgid "Open in New _Window" +msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:1299 ../midori/midori-webview.c:265 -msgid "The text that is displayed in the statusbar" -msgstr "Le texte affiché dans la barre d'êtat" - -#: ../midori/midori-browser.c:1371 -msgid "The list of search engines to be used for web search" -msgstr "La liste des moteurs de recherche à utiliser pour la recherche toile" - -#: ../midori/midori-browser.c:2350 +#: ../midori/midori-browser.c:2549 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:2515 +#: ../midori/midori-browser.c:2653 +#, c-format +msgid "%d days ago" +msgstr "avant %d jours" + +#: ../midori/midori-browser.c:2660 +msgid "Today" +msgstr "Aujourd'hui" + +#: ../midori/midori-browser.c:2662 +msgid "Yesterday" +msgstr "Hier" + +#: ../midori/midori-browser.c:2751 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2523 +#: ../midori/midori-browser.c:2759 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin " -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2906 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3009 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2732 +#: ../midori/midori-browser.c:3012 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2735 +#: ../midori/midori-browser.c:3015 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2738 +#: ../midori/midori-browser.c:3018 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:2741 +#: ../midori/midori-browser.c:3021 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:2743 +#: ../midori/midori-browser.c:3023 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:3024 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:2746 +#: ../midori/midori-browser.c:3026 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:2747 +#: ../midori/midori-browser.c:3027 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:2749 -msgid "Pa_ge Setup" -msgstr "Mise de page" - -#: ../midori/midori-browser.c:2753 -msgid "Show a preview of the printed page" -msgstr "Affiche un aperçu de la page avant impression" - -#: ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:3030 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:3033 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:2761 +#: ../midori/midori-browser.c:3035 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:2764 -msgid "Undo the last modification" -msgstr "Annuler la dernière modification" - -#: ../midori/midori-browser.c:2767 -msgid "Redo the last modification" -msgstr "Rétablir la dernière modification" - -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:3038 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:2773 ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:3041 ../midori/midori-browser.c:3044 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:2779 +#: ../midori/midori-browser.c:3047 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:3050 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:2785 +#: ../midori/midori-browser.c:3053 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:2788 +#: ../midori/midori-browser.c:3056 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:2790 +#: ../midori/midori-browser.c:3058 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:2791 +#: ../midori/midori-browser.c:3059 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:2793 +#: ../midori/midori-browser.c:3061 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3062 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:2796 +#: ../midori/midori-browser.c:3065 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:3066 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou d'une phrase" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:3069 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3071 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:3072 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:2815 +#: ../midori/midori-browser.c:3084 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:3087 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:3090 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:2823 +#: ../midori/midori-browser.c:3092 ../midori/midori-view.c:924 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:3093 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:2826 +#: ../midori/midori-browser.c:3095 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:3096 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:3100 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:2832 +#: ../midori/midori-browser.c:3102 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:2835 +#: ../midori/midori-browser.c:3105 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:2838 +#: ../midori/midori-browser.c:3108 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:2841 +#: ../midori/midori-browser.c:3111 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:2843 -msgid "_Web Search..." -msgstr "Recherche _toile..." - -#: ../midori/midori-browser.c:2844 -msgid "Run a web search" -msgstr "Lance une recherche toile" - -#: ../midori/midori-browser.c:2846 +#: ../midori/midori-browser.c:3113 msgid "Open in Page_holder..." msgstr "Ouvrir dans le _cadre de pages..." -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:3114 msgid "Open the current page in the pageholder" msgstr "Ouvrir la page actuelle dans le cadre de pages" -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2851 -msgid "Reopen a previously closed tab or window" -msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" - -#: ../midori/midori-browser.c:2853 +#: ../midori/midori-browser.c:3116 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:2854 +#: ../midori/midori-browser.c:3117 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:2856 +#. FIXME: Make this sensitive only when there is a tab to undo +#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:899 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:2857 +#: ../midori/midori-browser.c:3120 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:3124 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:2864 -msgid "_Manage Bookmarks" -msgstr "_Gestion des signets" - -#: ../midori/midori-browser.c:2865 -msgid "Add, edit and remove bookmarks..." -msgstr "Ajouter, modifier et supprimer des signets..." - -#: ../midori/midori-browser.c:2868 -msgid "Open the selected bookmark" -msgstr "Ouvrir le signet sélectionné" - -#: ../midori/midori-browser.c:2870 -msgid "Open in New _Tab" -msgstr "Ouvrir dans un nouvel _onglet" - -#: ../midori/midori-browser.c:2871 -msgid "Open the selected bookmark in a new tab" -msgstr "Ouvrir le signet sélectionné dans un nouvel onglet" - -#: ../midori/midori-browser.c:2873 -msgid "Open in New _Window" -msgstr "Ouvrir dans une nouvelle _fenêtre" - -#: ../midori/midori-browser.c:2874 -msgid "Open the selected bookmark in a new window" -msgstr "Ouvrir le signet sélectionné dans une nouvelle fenêtre" - -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3127 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../midori/midori-browser.c:2880 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:2882 +#: ../midori/midori-browser.c:3133 +msgid "Delete the selected history item" +msgstr "Supprimer l'element sélectionné de la historique" + +#: ../midori/midori-browser.c:3136 +msgid "Clear the entire history" +msgstr "Vider l'historique entier" + +#: ../midori/midori-browser.c:3139 +msgid "Bookmark the selected history item" +msgstr "Ajouter un signet pour l'element sélectionné de la historique" + +#: ../midori/midori-browser.c:3141 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:2884 ../midori/midori-searchentry.c:160 +#: ../midori/midori-browser.c:3143 ../midori/midori-searchaction.c:468 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:3144 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:2888 -msgid "_Window" -msgstr "_Fenêtre" - -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:3148 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:2891 +#: ../midori/midori-browser.c:3149 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:3151 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3152 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -# fonctionnalité à tester -#: ../midori/midori-browser.c:2896 -msgid "Tab _Overview" -msgstr "_Aperçu des onglets" - -#: ../midori/midori-browser.c:2897 -msgid "Show an overview of all open tabs" -msgstr "Affiche une vue générale de tous les onglets ouverts" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2899 +#: ../midori/midori-browser.c:3154 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:2901 +#: ../midori/midori-browser.c:3156 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:3157 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:2905 +#: ../midori/midori-browser.c:3159 +msgid "_Frequent questions" +msgstr "_Questions couramment" + +#: ../midori/midori-browser.c:3160 +msgid "Show the Frequently Asked Questions" +msgstr "Afficher les foire aux questions" + +#: ../midori/midori-browser.c:3162 +msgid "_Report a bug" +msgstr "_Adviser un problème" + +#: ../midori/midori-browser.c:3163 +msgid "Open Midori's bug tracker" +msgstr "Ouvrir le persécuteur de problèmes de Midori" + +#: ../midori/midori-browser.c:3166 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:3173 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3174 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:2915 -msgid "_Work Offline" -msgstr "Travailler _hors ligne" +#: ../midori/midori-browser.c:3179 +msgid "_Menubar" +msgstr "Barre de _menu" -#: ../midori/midori-browser.c:2916 -msgid "Work without a network connection" -msgstr "Travaille sans connexion réseau" +#: ../midori/midori-browser.c:3180 +msgid "Show menubar" +msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:2920 +#: ../midori/midori-browser.c:3183 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3184 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:2924 +#: ../midori/midori-browser.c:3187 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:3188 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:3191 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:2929 +#: ../midori/midori-browser.c:3192 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:2932 +#: ../midori/midori-browser.c:3195 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:2933 +#: ../midori/midori-browser.c:3196 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:2936 +#: ../midori/midori-browser.c:3199 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:2937 +#: ../midori/midori-browser.c:3200 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3460 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3462 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" +#: ../midori/midori-browser.c:3486 +msgid "_Web Search..." +msgstr "Recherche _toile..." + +#: ../midori/midori-browser.c:3488 +msgid "Run a web search" +msgstr "Lance une recherche toile" + +#: ../midori/midori-browser.c:3507 +msgid "Reopen a previously closed tab or window" +msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" + +#: ../midori/midori-browser.c:3521 +msgid "_Recently visited pages" +msgstr "Pages _récemment visitées" + +#: ../midori/midori-browser.c:3523 +msgid "Reopen pages that you visited earlier" +msgstr "Réouvre des pages déjà visitées" + +#: ../midori/midori-browser.c:3539 +msgid "Show the saved bookmarks" +msgstr "Afficher les signets sauveguardées" + +#: ../midori/midori-browser.c:3553 +msgid "_Window" +msgstr "_Fenêtre" + +#: ../midori/midori-browser.c:3555 +msgid "Show a list of all open tabs" +msgstr "Afficher une vue générale de tous les onglets ouverts" + +#: ../midori/midori-browser.c:3679 +msgid "Bookmarks" +msgstr "Signets" + #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3453 ../midori/midori-preferences.c:279 +#: ../midori/midori-browser.c:3686 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Transferts" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3695 msgid "Console" msgstr "Console" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3733 ../midori/midori-preferences.c:521 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3742 msgid "Pageholder" msgstr "Cadre de pages" -#: ../midori/midori-browser.c:3527 +#: ../midori/midori-browser.c:3810 msgid "_Inline find:" msgstr "Recherche rapide :" -#: ../midori/midori-browser.c:3562 +#: ../midori/midori-browser.c:3845 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3579 +#: ../midori/midori-browser.c:3853 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:3862 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:3814 +#: ../midori/midori-browser.c:4108 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "Type d'ombres" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Aspect des ombres autour de chaque panneau" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Menu" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Menu pour contenir les éléments des panneaux" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "Page" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "Le numéro de la page actuelle" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1514 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:393 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:134 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:150 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:152 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:153 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:154 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:171 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 +#: ../midori/midori-websettings.c:188 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:190 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Whether to save the last window size" msgstr "Enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:281 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:289 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:298 msgid "Last pageholder URI" msgstr "Dernier URI du cadre de pages" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:299 msgid "The URI last opened in the pageholder" msgstr "Le dernier URI ouvert dans le cadre de pages" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:308 +msgid "Show Menubar" +msgstr "Afficher la barre de menu" + +#: ../midori/midori-websettings.c:309 +msgid "Whether to show the menubar" +msgstr "Indique s'il faut afficher la barre de menu" + +#: ../midori/midori-websettings.c:317 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:318 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:326 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:327 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:335 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:344 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:354 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:355 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Afficher Nouvel onglet" - -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "Afficher le bouton de nouvel onglet dans la barre d'outils" - -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "Afficher Page d'accueil" - #: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "Afficher le bouton de page d'accueil dans la barre d'outils" +msgid "Toolbar Items" +msgstr "Elements de la barre d'outils" -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Afficher Recherche toile" +#: ../midori/midori-websettings.c:365 +msgid "The items to show on the toolbar" +msgstr "Les elements pour afficher dans la barre d'outils" #: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "Afficher le champ de recherche toile dans la barre d'outils" +msgid "Compact Sidepanel" +msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Afficher Corbeille" +#: ../midori/midori-websettings.c:374 +msgid "Whether to make the sidepanel compact" +msgstr "Indique s'il faut mettre le panneau compact" -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "Afficher le bouton de la corbeille dans la barre d'outils" - -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:383 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:384 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:394 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:402 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" +#: ../midori/midori-websettings.c:420 +msgid "Text Editor" +msgstr "Editeur texte" + +#: ../midori/midori-websettings.c:421 +msgid "An external text editor" +msgstr "Un editeur texte externe" + #: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" @@ -1085,277 +1002,313 @@ msgstr "Codage favori" msgid "The preferred character encoding" msgstr "Codage des caractères favori" +#: ../midori/midori-websettings.c:449 +msgid "Always Show Tabbar" +msgstr "Toujours afficher barre d'onglets" + #: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "Taille des onglets" +msgid "Always show the tabbar" +msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "La taille désirée du libellé des onglets" - -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:458 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:459 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:467 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:468 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" +#: ../midori/midori-websettings.c:477 +msgid "Open external pages in" +msgstr "Ouvrir les nouvelles pages dans" + #: ../midori/midori-websettings.c:478 +msgid "Where to open externally opened pages" +msgstr "Où ouvrir les pages externes" + +#: ../midori/midori-websettings.c:487 msgid "Middle click opens Selection" msgstr "Clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:488 msgid "Load an URL from the selection via middle click" msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:496 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:505 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:506 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le dernier" +msgstr "" +"Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " +"dernier" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:514 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:515 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:525 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:526 msgid "What type of cookies to accept" msgstr "Type de témoins à accepter" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:535 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:536 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:544 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:545 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:555 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:556 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:564 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:565 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:573 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:574 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:582 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:583 msgid "Whether the last downloaded files are saved" -msgstr "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" +msgstr "" +"Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:593 msgid "HTTP Proxy" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:594 msgid "The proxy used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:602 msgid "Cache size" msgstr "Taille de l'antémémoire (cache)" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:603 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" -#: ../midori/midori-webview.c:65 +#: ../midori/midori-view.c:82 msgid "Load Provisional" msgstr "Chargement provisoire" -#: ../midori/midori-webview.c:66 +#: ../midori/midori-view.c:83 msgid "Load Committed" msgstr "Chargement envoyé" -#: ../midori/midori-webview.c:67 +#: ../midori/midori-view.c:84 msgid "Load Finished" msgstr "Chargement effectué" -#: ../midori/midori-webview.c:225 -msgid "The URI of the currently loaded page" -msgstr "L'URI de la page actuellement chargée" - -#: ../midori/midori-webview.c:235 -msgid "The title of the currently loaded page" -msgstr "Le titre de la page actuellement chargée" - -#: ../midori/midori-webview.c:245 -msgid "The current loading progress" -msgstr "L'avancement du chargement en cours" - -#: ../midori/midori-webview.c:254 -msgid "The current loading status" -msgstr "L'état du chargement en cours" - -#: ../midori/midori-webview.c:699 +#: ../midori/midori-view.c:836 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-webview.c:727 -msgid "Download Link with Download _Manager" -msgstr "Télécharger le lien avec le gestionnaire de _téléchargements" +#: ../midori/midori-view.c:861 +msgid "_Download Link destination" +msgstr "_Télécharger destination du lien" -#: ../midori/midori-webview.c:745 +#: ../midori/midori-view.c:883 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "Réglages de l'instance pour fournir les propriétés" - -#: ../midori/midori-preferences.c:84 +#: ../midori/midori-view.c:1248 #, c-format -msgid "%s Preferences" +msgid "Inspect page - %s" +msgstr "Analyser page - %s" + +#: ../midori/midori-view.c:1386 +msgid "Source" +msgstr "Source" + +#: ../midori/midori-preferences.c:89 +#, c-format +msgid "Preferences for %s" msgstr "Préférences de %s" #. Page "General" -#: ../midori/midori-preferences.c:267 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:268 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../midori/midori-preferences.c:301 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Paramètres des polices" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "Police par défaut" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "Taille minimum de police" + #. Page "Behavior" -#: ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Fonctionnalités" +#: ../midori/midori-preferences.c:411 +msgid "Load images automatically" +msgstr "Charger les images automatiquement" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "Diminuer les images automatiquement" + +#: ../midori/midori-preferences.c:417 +msgid "Print backgrounds" +msgstr "Imprimer les arrière-plans" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "On peut agrandir champs de texte" + +#: ../midori/midori-preferences.c:423 +msgid "Enable scripts" +msgstr "Activer scripts" + +#: ../midori/midori-preferences.c:426 +msgid "Enable plugins" +msgstr "Activer greffons" + +#: ../midori/midori-preferences.c:431 +msgid "Enable developer tools" +msgstr "Activer les outils développeur" + #. Page "Interface" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:441 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:442 +msgid "Navigationbar" +msgstr "Barre de navigation" + +#: ../midori/midori-preferences.c:457 msgid "Browsing" msgstr "Navigation" -#. Page "Network" -#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:496 msgid "MB" msgstr "Mo" -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "Élément actuel" +#. Page "Privacy" +#: ../midori/midori-preferences.c:502 +msgid "Privacy" +msgstr "Vie privée" -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "L'élément sélectionné actuel" +#: ../midori/midori-preferences.c:504 +msgid "Web Cookies" +msgstr "Témoins de toile" -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "Boite de dialogue" +#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +msgid "days" +msgstr "jours" -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "Une boite de dialogue pour gérer les moteurs de recherche" - -#: ../midori/midori-searchentry.c:151 +#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchaction.c:804 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchaction.c:804 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchaction.c:832 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchaction.c:876 msgid "_Icon (name or file):" msgstr "_Icône (nom ou fichier) :" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchaction.c:890 msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchaction.c:1067 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" -#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" -#: ../midori/sokoke.c:348 +#: ../midori/sokoke.c:283 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous êtes connecté en tant que superutilisateur !" @@ -1378,133 +1331,29 @@ msgstr "%s ne peut être assigné à %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s ne peut être accédé" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" -msgstr "Taille d'icône" - -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Taille symbolique à utiliser pour l'animation" - -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" -msgstr "Nom d'icon" - -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "Le nom d'une icône contenant des trames d'animation" - -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" -msgstr "Pixbuf" - -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "Un GdkPixbuf contenant des trames d'animation" - -#: ../katze/katze-throbber.c:162 -msgid "Animated" -msgstr "Animé" - -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "Indique si le pulsateur doit être animé" - -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "Nom d'icône statique" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Un nom d'icône statique devant être utilisé comme image statique" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "Pixbuf statique" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "Un GdkPixbuf devant être utilisé comme image statique" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "ID de catalogue statique" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "L'ID de catalogue d'une icône devant être utilisée comme image statique" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "L'icône nommée « %s » n'a pu être chargée." -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "L'icône de catalogue « %s » n'a pu être chargée." -# pas très content -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "L'icône « %s » n'a pu être chargée." - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:187 msgid "Choose folder" msgstr "Choisissez un répertoire" - -#: ../katze/katze-item.c:72 -msgid "Name" -msgstr "Nom" - -#: ../katze/katze-item.c:73 -msgid "The name of the item" -msgstr "Le nom de l'élément" - -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" -msgstr "Le texte descriptif de l'élément" - -#: ../katze/katze-item.c:91 -msgid "The URI of the item" -msgstr "L'URI de l'élément" - -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "Icône" - -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "L'icône de l'élément" - -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "Jeton" - -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "Le jeton de l'élément" - -#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -msgid "Malformed document." -msgstr "Document mal formé" - -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "Fichier non trouvé." - From 81f712447599cd1b39bf4dbec944f750c70198f6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 3 Nov 2008 00:47:15 +0100 Subject: [PATCH 0454/2970] Update Spanish translation --- po/es.po | 1218 ++++++++++++++++++++++++------------------------------ 1 file changed, 539 insertions(+), 679 deletions(-) diff --git a/po/es.po b/po/es.po index 819df5f7..456591d9 100644 --- a/po/es.po +++ b/po/es.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori-0.0.19\n" +"Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 00:20+0200\n" -"PO-Revision-Date: 2008-08-18 22:07+0100\n" +"POT-Creation-Date: 2008-11-02 23:30+0100\n" +"PO-Revision-Date: 2008-11-03 00:40+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 -#: ../midori/main.c:419 ../midori/main.c:433 +#: ../midori.desktop.in.h:2 ../midori/main.c:1098 ../midori/main.c:1107 +#: ../midori/main.c:1118 ../midori/main.c:1142 msgid "Midori" msgstr "Midori" @@ -30,1022 +30,957 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:52 +#: ../midori/main.c:71 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +#: ../midori/main.c:72 ../midori/midori-browser.c:3537 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/main.c:54 +#: ../midori/main.c:73 msgid "_Add Bookmark" msgstr "_Añadir Marcador" -#: ../midori/main.c:55 +#: ../midori/main.c:74 msgid "_Console" msgstr "_Consola" -#: ../midori/main.c:56 +#: ../midori/main.c:75 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/main.c:57 +#: ../midori/main.c:76 msgid "_History" msgstr "_Histórico" -#: ../midori/main.c:58 +#: ../midori/main.c:77 msgid "_Homepage" msgstr "Página de _inicio" -#: ../midori/main.c:59 +#: ../midori/main.c:78 msgid "_Pageholder" msgstr "Cu_adro de páginas" -#: ../midori/main.c:60 +#: ../midori/main.c:79 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/main.c:61 +#: ../midori/main.c:80 msgid "User_styles" msgstr "Estilos de _usuario" -#: ../midori/main.c:62 +#: ../midori/main.c:81 msgid "New _Tab" msgstr "Nueva pes_taña" -#: ../midori/main.c:63 +#: ../midori/main.c:82 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/main.c:64 +#: ../midori/main.c:83 msgid "_Closed Tabs and Windows" msgstr "Ventanas y pestañas _cerradas" -#: ../midori/main.c:65 +#: ../midori/main.c:84 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/main.c:67 -msgid "Select _All" -msgstr "Seleccion_ar todo" - -#: ../midori/main.c:70 -msgid "_Fullscreen" -msgstr "_Pantalla completa" - -#: ../midori/main.c:71 -msgid "_Leave Fullscreen" -msgstr "_Salir de pantalla completa" - -#: ../midori/main.c:122 +#: ../midori/main.c:134 #, c-format -msgid "The configuration couldn't be loaded. %s\n" -msgstr "No se pudo cargar la configuración. %s\n" +msgid "The configuration couldn't be loaded: %s\n" +msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:177 +#: ../midori/main.c:189 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:184 ../midori/main.c:253 +#: ../midori/main.c:196 ../midori/main.c:265 #, c-format msgid "Unhandled settings value '%s'" msgstr "" -#: ../midori/main.c:368 +#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 +#: ../midori/main.c:571 +msgid "Malformed document." +msgstr "Documento defectuoso" + +#: ../midori/main.c:554 +msgid "File not found." +msgstr "No se encuentra el archivo." + +#: ../midori/main.c:592 ../midori/main.c:624 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#: ../midori/main.c:679 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falló a borrar elemento del histórico: %s\n" + +#: ../midori/main.c:703 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:736 ../midori/main.c:751 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Falló a añadir un elemento al histórico: %s\n" + +#: ../midori/main.c:868 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:1000 ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Falló la escritura." + +#: ../midori/main.c:1025 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:396 +#: ../midori/main.c:1057 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1059 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:413 -msgid "[URL]" -msgstr "[URL]" +#: ../midori/main.c:1061 +msgid "URIs" +msgstr "URIs" -#: ../midori/main.c:417 -msgid "Unknown argument." -msgstr "Argumento desconocido" +#: ../midori/main.c:1095 +msgid "[URIs]" +msgstr "[URIs]" -#: ../midori/main.c:419 -msgid "Failed to setup interface." -msgstr "Falló la configuración de la interfaz" - -#: ../midori/main.c:434 +#: ../midori/main.c:1119 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" -#: ../midori/main.c:436 +#: ../midori/main.c:1121 msgid "Check for new versions at:" msgstr "Comprobar si existen nuevas versiones en:" +#: ../midori/main.c:1142 +msgid "No filename specified" +msgstr "" + #. FIXME: Do we want a graphical error message? -#: ../midori/main.c:467 +#: ../midori/main.c:1160 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:501 +#: ../midori/main.c:1194 #, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Los marcadores no pudieron ser cargados. %s\n" +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Los marcadores no pudieron ser cargados: %s\n" -#: ../midori/main.c:515 +#: ../midori/main.c:1208 #, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "No se pudo cargar la sesión. %s\n" +msgid "The session couldn't be loaded: %s\n" +msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:527 +#: ../midori/main.c:1220 #, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "No se pudo cargar la papelera. %s\n" +msgid "The trash couldn't be loaded: %s\n" +msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:539 +#: ../midori/main.c:1233 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "No se pudo cargar el histórico: %s\n" + +#: ../midori/main.c:1246 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:688 +#: ../midori/main.c:1405 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar el motor de busqueda. %s" -#: ../midori/main.c:698 +#: ../midori/main.c:1415 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" -#: ../midori/main.c:707 +#: ../midori/main.c:1424 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:715 +#: ../midori/main.c:1432 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 -msgid "Settings" -msgstr "Configuración" - -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 -msgid "The associated settings" -msgstr "Ajustes asociados" - -#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 -msgid "Trash" -msgstr "Papelera" - -#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Papelera, recogido recientemente cerrando pestañas y ventanas" - -#: ../midori/midori-app.c:141 -msgid "Browser" -msgstr "Navegador" - -#: ../midori/midori-app.c:142 -msgid "The current browser" -msgstr "El navegador actual" - -#: ../midori/midori-app.c:150 -msgid "Browser Count" -msgstr "Número de navegadores" - -#: ../midori/midori-app.c:151 -msgid "The current number of browsers" -msgstr "Número de navegadores actual de elementos" - -#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "Motores de busqueda" - -#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "La lista de motores de busqueda" - -#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 msgid "None" msgstr "Ninguna" -#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3768 msgid "Extensions" msgstr "Extensiones" -#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3751 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3759 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../midori/midori-addons.c:113 -msgid "Web Widget" -msgstr "" +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Activar" -#: ../midori/midori-addons.c:114 -msgid "The assigned web widget" -msgstr "" +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Desactivar" -#: ../midori/midori-addons.c:122 -msgid "Kind" -msgstr "" - -#: ../midori/midori-addons.c:123 -msgid "The kind of addons" -msgstr "" - -#: ../midori/midori-browser.c:192 -msgid "Source" -msgstr "Código fuente" - -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3081 msgid "Reload the current page" msgstr "Cargar nuevamente la página actual" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 +#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3078 msgid "Stop loading the current page" msgstr "Detener la carga de la página" -#: ../midori/midori-browser.c:349 +#: ../midori/midori-browser.c:321 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:573 -msgid "New bookmark" -msgstr "Nuevo marcador" - -#: ../midori/midori-browser.c:573 -msgid "Edit bookmark" -msgstr "Editar marcador" - -#: ../midori/midori-browser.c:597 -msgid "_Title:" -msgstr "_Título:" - -#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 -msgid "_Description:" -msgstr "_Descripción" - -#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:646 -msgid "_Folder:" -msgstr "_Carpeta:" - -#: ../midori/midori-browser.c:650 -msgid "Root" -msgstr "Raíz" - -#: ../midori/midori-browser.c:1082 +#: ../midori/midori-browser.c:344 #, c-format msgid "Unexpected action '%s'." msgstr "Acción no esperada «%s»" -#: ../midori/midori-browser.c:1228 -msgid "Menubar" -msgstr "Barra del menú" +#: ../midori/midori-browser.c:512 +msgid "New bookmark" +msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:1229 -msgid "The menubar" -msgstr "Barra del menu" +#: ../midori/midori-browser.c:512 +msgid "Edit bookmark" +msgstr "Editar marcador" -#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 -msgid "Navigationbar" -msgstr "Barra de navegación" +#: ../midori/midori-browser.c:534 +msgid "_Title:" +msgstr "_Título:" -#: ../midori/midori-browser.c:1238 -msgid "The navigationbar" -msgstr "Barra de navegación" +#: ../midori/midori-browser.c:547 ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Descripción" -#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 -msgid "URI" -msgstr "URI" +#: ../midori/midori-browser.c:566 ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL:" -#: ../midori/midori-browser.c:1247 -msgid "The current URI" -msgstr "URI actual" +#: ../midori/midori-browser.c:582 +msgid "_Folder:" +msgstr "_Carpeta:" -#: ../midori/midori-browser.c:1255 -msgid "Tab" -msgstr "Pestaña" +#: ../midori/midori-browser.c:586 +msgid "Root" +msgstr "Raíz" -#: ../midori/midori-browser.c:1256 -msgid "The current tab" -msgstr "Pestaña actual" +#: ../midori/midori-browser.c:1148 +msgid "Open file" +msgstr "Abrir archivo" -#: ../midori/midori-browser.c:1264 -msgid "Statusbar" -msgstr "Barra de estado" +#: ../midori/midori-browser.c:1224 +msgid "Save file as" +msgstr "Guardar archivo en" -#: ../midori/midori-browser.c:1265 -msgid "The statusbar" -msgstr "Barra de estado" +#: ../midori/midori-browser.c:2301 +msgid "Open in New _Tab" +msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:1301 -msgid "Statusbar Text" -msgstr "Texto de la barra de estado" +#: ../midori/midori-browser.c:2303 +msgid "Open in New _Window" +msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 -msgid "The text that is displayed in the statusbar" -msgstr "El texto se muestra en la barra de estado" - -#: ../midori/midori-browser.c:1335 -msgid "The list of search engines to be used for web search" -msgstr "" - -#: ../midori/midori-browser.c:2313 +#: ../midori/midori-browser.c:2549 msgid "Separator" msgstr "Separador" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2653 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2660 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2662 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2751 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:2486 +#: ../midori/midori-browser.c:2759 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" "Antonio Sanchez \n" "Christian Dywan " -#: ../midori/midori-browser.c:2699 +#: ../midori/midori-browser.c:2906 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3009 msgid "_File" msgstr "_Fichero" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:3012 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:2705 +#: ../midori/midori-browser.c:3015 msgid "Open a new tab" -msgstr "Abrir unha nueva pestaña" +msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:3018 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:2711 +#: ../midori/midori-browser.c:3021 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:2713 +#: ../midori/midori-browser.c:3023 msgid "_Close Tab" msgstr "Cerrar _pestaña" -#: ../midori/midori-browser.c:2714 +#: ../midori/midori-browser.c:3024 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:2716 +#: ../midori/midori-browser.c:3026 msgid "C_lose Window" msgstr "_Cerrar la ventana" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:3027 msgid "Close this window" msgstr "Cerrar esta ventana" -#: ../midori/midori-browser.c:2719 -msgid "Pa_ge Setup" -msgstr "Configuración de la página" - -#: ../midori/midori-browser.c:2723 -msgid "Show a preview of the printed page" -msgstr "Mostrar una vista de la página imprimido" - -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:3030 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:3033 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:2731 +#: ../midori/midori-browser.c:3035 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:2734 -msgid "Undo the last modification" -msgstr "Deshacer la última modificación" - -#: ../midori/midori-browser.c:2737 -msgid "Redo the last modification" -msgstr "Rehacer la última modificación" - -#: ../midori/midori-browser.c:2740 +#: ../midori/midori-browser.c:3038 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 +#: ../midori/midori-browser.c:3041 ../midori/midori-browser.c:3044 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:2749 +#: ../midori/midori-browser.c:3047 msgid "Paste text from the clipboard" msgstr "Pegar el texto seleccionado al portapapeles" -#: ../midori/midori-browser.c:2752 +#: ../midori/midori-browser.c:3050 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:2755 +#: ../midori/midori-browser.c:3053 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:2758 +#: ../midori/midori-browser.c:3056 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2760 +#: ../midori/midori-browser.c:3058 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:2761 +#: ../midori/midori-browser.c:3059 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:3061 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:2764 +#: ../midori/midori-browser.c:3062 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2766 +#: ../midori/midori-browser.c:3065 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:2767 +#: ../midori/midori-browser.c:3066 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:3069 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:3071 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:3072 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:2785 +#: ../midori/midori-browser.c:3084 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:2788 +#: ../midori/midori-browser.c:3087 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:2791 +#: ../midori/midori-browser.c:3090 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:2793 +#: ../midori/midori-browser.c:3092 ../midori/midori-view.c:924 msgid "View _Source" msgstr "Mostrar _código fuente" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3093 msgid "View the source code of the page" msgstr "Mostrar el código fuente de la página" -#: ../midori/midori-browser.c:2796 +#: ../midori/midori-browser.c:3095 msgid "View Selection Source" msgstr "Mostrar código fuente de la seleccionada" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:3096 msgid "View the source code of the selection" msgstr "Mostrar el código fuente de la seleccionada" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:3100 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3102 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:2805 +#: ../midori/midori-browser.c:3105 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2808 +#: ../midori/midori-browser.c:3108 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:2811 +#: ../midori/midori-browser.c:3111 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2813 -msgid "_Web Search..." -msgstr "Buscar en la _red..." - -#: ../midori/midori-browser.c:2814 -msgid "Run a web search" -msgstr "" - -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:3113 msgid "Open in Page_holder..." msgstr "Abrir en el cuadro de páginas..." -#: ../midori/midori-browser.c:2817 +#: ../midori/midori-browser.c:3114 msgid "Open the current page in the pageholder" msgstr "Última la página actual en el cuadro de páginas" -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2821 -msgid "Reopen a previously closed tab or window" -msgstr "Volver a abrir ventanas o pestañas cerradas" - -#: ../midori/midori-browser.c:2823 +#: ../midori/midori-browser.c:3116 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:3117 msgid "Delete the contents of the trash" msgstr "Borrar el conenido de la papelera" -#: ../midori/midori-browser.c:2826 +#. FIXME: Make this sensitive only when there is a tab to undo +#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:899 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:3120 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:2832 +#: ../midori/midori-browser.c:3124 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:2834 -msgid "_Manage Bookmarks" -msgstr "_Gestionar marcadores" - -#: ../midori/midori-browser.c:2835 -msgid "Add, edit and remove bookmarks..." -msgstr "Añadir, editar o eliminar marcadores..." - -#: ../midori/midori-browser.c:2838 -msgid "Open the selected bookmark" -msgstr "Abrir el marcador seleccionado" - -#: ../midori/midori-browser.c:2840 -msgid "Open in New _Tab" -msgstr "Abrir en una nueva _pestaña " - -#: ../midori/midori-browser.c:2841 -msgid "Open the selected bookmark in a new tab" -msgstr "Abrir el marcador seleccionado en una neuva pestaña" - -#: ../midori/midori-browser.c:2843 -msgid "Open in New _Window" -msgstr "Abrir en una nueva _ventana" - -#: ../midori/midori-browser.c:2844 -msgid "Open the selected bookmark in a new window" -msgstr "Abrir el marcador seleccionado en una neuva ventana" - -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:3127 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:3133 +msgid "Delete the selected history item" +msgstr "Borrar el elemento seleccionado del histórico" + +#: ../midori/midori-browser.c:3136 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3139 +msgid "Bookmark the selected history item" +msgstr "Añadir un marcador pour el elemento seleccionado del histórico" + +#: ../midori/midori-browser.c:3141 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 +#: ../midori/midori-browser.c:3143 ../midori/midori-searchaction.c:468 msgid "_Manage Search Engines" msgstr "_Gestionar los motores de busqueda" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:3144 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar o eliminar motores de busqueda..." -#: ../midori/midori-browser.c:2858 -msgid "_Window" -msgstr "_Ventana" - -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:3148 msgid "_Previous Tab" msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:3149 msgid "Switch to the previous tab" -msgstr "" +msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:2863 +#: ../midori/midori-browser.c:3151 msgid "_Next Tab" msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:3152 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:2866 -msgid "Tab _Overview" -msgstr "_Visión general de pestañas" - -#: ../midori/midori-browser.c:2867 -msgid "Show an overview of all open tabs" -msgstr "Mostrar una visión general de todas las pesañas abiertas" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:3154 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3156 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:3157 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:3159 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3160 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3162 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3163 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3166 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:3173 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:2882 +#: ../midori/midori-browser.c:3174 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:2885 -msgid "_Work Offline" -msgstr "Trabajar desconectado" +#: ../midori/midori-browser.c:3179 +msgid "_Menubar" +msgstr "Barra del _menú" -#: ../midori/midori-browser.c:2886 -msgid "Work without a network connection" -msgstr "" +#: ../midori/midori-browser.c:3180 +msgid "Show menubar" +msgstr "Mostrar barra del menu" -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:3183 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:2891 +#: ../midori/midori-browser.c:3184 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3187 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:2895 +#: ../midori/midori-browser.c:3188 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:3191 msgid "_Bookmarkbar" msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:2899 +#: ../midori/midori-browser.c:3192 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:3195 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3196 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3199 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:3200 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3460 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3462 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3486 +msgid "_Web Search..." +msgstr "Buscar en la _red..." + +#: ../midori/midori-browser.c:3488 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:3507 +msgid "Reopen a previously closed tab or window" +msgstr "Volver a abrir ventanas o pestañas cerradas" + +#: ../midori/midori-browser.c:3521 +msgid "_Recently visited pages" +msgstr "_Últimas páginas visitadas" + +#: ../midori/midori-browser.c:3523 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3539 +msgid "Show the saved bookmarks" +msgstr "Mostrar los marcadores guardos." + +#: ../midori/midori-browser.c:3553 +msgid "_Window" +msgstr "_Ventana" + +#: ../midori/midori-browser.c:3555 +msgid "Show a list of all open tabs" +msgstr "Mostrar una lista de todas las pesañas abiertas" + +#: ../midori/midori-browser.c:3679 msgid "Bookmarks" msgstr "Marcadores" #. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 +#: ../midori/midori-browser.c:3686 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Transferencias" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3695 msgid "Console" msgstr "Consola" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3733 ../midori/midori-preferences.c:521 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:3485 +#: ../midori/midori-browser.c:3742 msgid "Pageholder" msgstr "Cuadro de páginas" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3810 msgid "_Inline find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3845 msgid "Match Case" msgstr "Sensible a mayúsculas" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3853 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:3862 msgid "Close Findbar" msgstr "Cerrar barra de busquedas" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:4108 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Aspecto de las sombras alrededor de cada panel" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Menú" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Menú para contener los elementos de los paneles" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "Pagina" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "Índice de la página actual" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 msgid "Close panel" msgstr "Cerrar el panel" -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1514 msgid "Blank page" msgstr "Página vacía" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:393 msgid "Homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:134 msgid "Last open pages" msgstr "Páginas abiertas recientemente" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:150 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:152 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:153 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:154 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:171 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 +#: ../midori/midori-websettings.c:188 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:190 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "All cookies" msgstr "Todas las galletas" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Session cookies" msgstr "Las galletas de esta sesión" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Remember last window size" msgstr "Recordar último tamaño de ventana" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Whether to save the last window size" msgstr "Guardar (o no) el último tamaño de ventana" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:254 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "The last saved window height" msgstr "Última altura de la ventana guardada" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:281 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:289 msgid "Last Web search" msgstr "Última busqueda en la red" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "The last saved Web search" msgstr "Última busqueda en la red guardada" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:298 msgid "Last pageholder URI" msgstr "Última URI del cuadro de páginas" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:299 msgid "The URI last opened in the pageholder" msgstr "Última URI abierta en el cuadro de páginas" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:308 +msgid "Show Menubar" +msgstr "Mostrar barra del menú" + +#: ../midori/midori-websettings.c:309 +msgid "Whether to show the menubar" +msgstr "Mostrar (o no) la barra de menú" + +#: ../midori/midori-websettings.c:317 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:318 msgid "Whether to show the navigationbar" msgstr "Mostrar (o no) la barra de navegación" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:326 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:327 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (o no) la barra de marcadores" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:335 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the panel" msgstr "Mostrar (o no) el panel" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:344 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the statusbar" msgstr "Mostrar (o no) la barra de estado" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:354 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:355 msgid "The style of the toolbar" msgstr "El estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Mostrar «Nueva pestaña»" - -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "Mostrar el botón de «Nueva pestaña» en la barra de herramientas" - -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "Mostrar «Página de inicio»" - #: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "Mostrar el botón de «Pagina inicial» en la barra de herramientas" +msgid "Toolbar Items" +msgstr "Elementos de herramientas" -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Mostrar «Buscador red»" +#: ../midori/midori-websettings.c:365 +msgid "The items to show on the toolbar" +msgstr "Los elementos a mostrar en la barra de herramientas" #: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "Mostrar la caja de busquedas en la red en la barra de herramientas" +msgid "Compact Sidepanel" +msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Mostrar «Papelera»" +#: ../midori/midori-websettings.c:374 +msgid "Whether to make the sidepanel compact" +msgstr "Hacer (o no) el panel compacto" -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "Mostrar el botón «Papelera» en la barra de herramientas" - -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:383 msgid "Load on Startup" msgstr "Cargar al inicio" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:384 msgid "What to load on startup" msgstr "Qué cargar en el inicio" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:394 msgid "The homepage" msgstr "La página de inicio" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:402 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:403 msgid "The folder downloaded files are saved to" msgstr "La carpeta de descargas fue guardada en" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:411 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:412 msgid "An external download manager" msgstr "Un gestor de descargas externo" +#: ../midori/midori-websettings.c:420 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:421 +msgid "An external text editor" +msgstr "" + #: ../midori/midori-websettings.c:429 msgid "Location entry Search" msgstr "Búsqueda en la barra" @@ -1062,287 +997,315 @@ msgstr "Codificación preferida" msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" +#: ../midori/midori-websettings.c:449 +msgid "Always Show Tabbar" +msgstr "" + #: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "Tamaño de la etiqueta de pestañas" +msgid "Always show the tabbar" +msgstr "" -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "Tamaño deseado de la etiqueta de las pestañas" - -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:458 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:459 msgid "Whether tabs have close buttons" msgstr "Cada una de las pestañas tendrá su botón para cerrarla" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:467 msgid "Open new pages in" msgstr "Abrir las páginas nuevas en" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:468 msgid "Where to open new pages" msgstr "Donde se van a abrir las páginas nuevas" +#: ../midori/midori-websettings.c:477 +msgid "Open external pages in" +msgstr "Abrir las páginas externas en" + #: ../midori/midori-websettings.c:478 +msgid "Where to open externally opened pages" +msgstr "Donde se van a abrir las páginas externas" + +#: ../midori/midori-websettings.c:487 msgid "Middle click opens Selection" msgstr "Clic medio abre la selección" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:488 msgid "Load an URL from the selection via middle click" msgstr "Cargar una URL en la selección empleando el botón del medio del ratón" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:496 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:497 msgid "Whether to open new tabs in the background" msgstr "Abrir (o no) las pestañas nuevas en segundo plano" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:505 msgid "Open Tabs next to Current" msgstr "Abrir pestañas a lado de la actual" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:506 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abrir las pestañas nuevas al lado de la pestaña actual o la última" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:514 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:515 msgid "Whether to open popup windows in tabs" msgstr "Abrir (o no) las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:525 msgid "Accept cookies" msgstr "Aceptar las galletas" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:526 msgid "What type of cookies to accept" msgstr "Qué tipos de galletas van a ser aceptadas" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:535 msgid "Original cookies only" msgstr "Solo las galletas del sitio original" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:536 msgid "Accept cookies from the original website only" msgstr "Solo se aceptan las galletas del sitio de origen" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:544 msgid "Maximum cookie age" msgstr "Persistencia máxima de las galletas" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:545 msgid "The maximum number of days to save cookies for" msgstr "Tiempo máximo, en días, durante los que se guardaran las galletas" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:555 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:556 msgid "Whether the last visited pages are saved" msgstr "Recordar (o no) las últimas páginas que fueron visitadas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:564 msgid "Maximum history age" msgstr "Persistencia máxima del histórico" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:565 msgid "The maximum number of days to save the history for" msgstr "" "Tiempo máximo, en días, durante los que se guardará un dato del histórico" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:573 msgid "Remember last form inputs" msgstr "Recordar las últimas sesiones de formularios" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:574 msgid "Whether the last form inputs are saved" msgstr "Recordar (o no) las últimas sesiones con sus datos de formularios" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:582 msgid "Remember last downloaded files" msgstr "Recordar últimos ficheros descargados" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:583 msgid "Whether the last downloaded files are saved" msgstr "" "Recordar (o no) la lista de descargas de ficheros realizadas últimamente" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:593 msgid "HTTP Proxy" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:594 msgid "The proxy used for HTTP connections" msgstr "Servidor proxy para conexiones HTTP" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:602 msgid "Cache size" msgstr "Tamaño de la caché" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:603 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" -#: ../midori/midori-webview.c:64 +#: ../midori/midori-view.c:82 msgid "Load Provisional" msgstr "" -#: ../midori/midori-webview.c:65 +#: ../midori/midori-view.c:83 msgid "Load Committed" msgstr "" -#: ../midori/midori-webview.c:66 +#: ../midori/midori-view.c:84 msgid "Load Finished" msgstr "" -#: ../midori/midori-webview.c:224 -msgid "The URI of the currently loaded page" -msgstr "URI de la página actualmente cargada" - -#: ../midori/midori-webview.c:234 -msgid "The title of the currently loaded page" -msgstr "Título de la página actualmente cargada" - -#: ../midori/midori-webview.c:244 -msgid "The current loading progress" -msgstr "" - -#: ../midori/midori-webview.c:253 -msgid "The current loading status" -msgstr "" - -#: ../midori/midori-webview.c:695 +#: ../midori/midori-view.c:836 msgid "Open Link in New _Tab" msgstr "Abrir el enlace en una pestaña _nueva" -#: ../midori/midori-webview.c:723 -msgid "Download Link with Download _Manager" -msgstr "Descargar el enlace con el Gestor de descargas" +#: ../midori/midori-view.c:861 +msgid "_Download Link destination" +msgstr "" -#: ../midori/midori-webview.c:741 +#: ../midori/midori-view.c:883 msgid "Open URL in New _Tab" msgstr "Abrir la URL en una pestaña _nueva" -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "Configuración de ejemplo para proporcionar propiedades" - -#: ../midori/midori-preferences.c:84 +#: ../midori/midori-view.c:1248 #, c-format -msgid "%s Preferences" -msgstr "%s Preferencias" +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1386 +msgid "Source" +msgstr "Código fuente" + +#: ../midori/midori-preferences.c:89 +#, c-format +msgid "Preferences for %s" +msgstr "Preferencias de %s" #. Page "General" -#: ../midori/midori-preferences.c:267 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:268 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Inicio" #. Page "Appearance" -#: ../midori/midori-preferences.c:301 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Apariencia" -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Ajustes de las fuentes" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Funcionalidades" +#: ../midori/midori-preferences.c:411 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print backgrounds" +msgstr "Imprimir trasfondos" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "Pido agrandar los campos de textos" + +#: ../midori/midori-preferences.c:423 +msgid "Enable scripts" +msgstr "Activar guiónes" + +#: ../midori/midori-preferences.c:426 +msgid "Enable plugins" +msgstr "Activar complementos" + +#: ../midori/midori-preferences.c:431 +msgid "Enable developer tools" +msgstr "Activar accesorios de desarrolladores" + #. Page "Interface" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:441 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:442 +msgid "Navigationbar" +msgstr "Barra de navegación" + +#: ../midori/midori-preferences.c:457 msgid "Browsing" msgstr "Navegación" -#. Page "Network" -#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:496 msgid "MB" msgstr "MB" -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "Elemento actual" +#. Page "Privacy" +#: ../midori/midori-preferences.c:502 +msgid "Privacy" +msgstr "Esfera privada" -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "El elemento actualmente seleccionado" +#: ../midori/midori-preferences.c:504 +msgid "Web Cookies" +msgstr "Galletas red" -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "Diálogo" +#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +msgid "days" +msgstr "dias" -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "Un diálogo a gestionar los motores de busqueda" - -#: ../midori/midori-searchentry.c:151 +#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchaction.c:804 msgid "Add search engine" msgstr "Añadir un motor de búsqueda" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchaction.c:804 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchentry.c:550 +#: ../midori/midori-searchaction.c:832 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchentry.c:594 +#: ../midori/midori-searchaction.c:876 msgid "_Icon (name or file):" msgstr "_Icono (nombre o fichero):" -#: ../midori/midori-searchentry.c:608 +#: ../midori/midori-searchaction.c:890 msgid "_Token:" msgstr "_Abreviatura" -#: ../midori/midori-searchentry.c:789 +#: ../midori/midori-searchaction.c:1067 msgid "Manage search engines" msgstr "Gestionar los motores de busqueda" -#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." -#: ../midori/sokoke.c:348 +#: ../midori/sokoke.c:283 msgid "Warning: You are using a superuser account!" msgstr "Aviso: Estás conectado como super usuario!" -#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 -#, c-format -msgid "Writing failed." -msgstr "Falló la escritura." - #: ../midori/gjs.c:512 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." @@ -1362,132 +1325,29 @@ msgstr "%s no puede ser asignado a %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s non se puede accede" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" -msgstr "Talla de iconos" - -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Tamaño simbólico a usar para animaciónes" - -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" -msgstr "Nombre de icono" - -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "El nombre del icono contiene cuadros animados" - -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" -msgstr "Pixbuf" - -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "El GdkPixbuf contiene cuadros de animación" - -#: ../katze/katze-throbber.c:162 -msgid "Animated" -msgstr "Animado" - -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "Animar (o no) el icono" - -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "Nombre del icono estático" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Nombre a usar para el icono no animado" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "Pixbuf estático" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "El GdkPixbuf va a ser usado como imagen estática" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "ID stock estático" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "ID stock del icono que va a usarse como imagen estática" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "No se pudo cargar el icono nombrado «%s»" -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "No se pudo cargar el icono stock «%s»" -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "No se pudo cargar el icono «%s»" - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 msgid "Choose file" msgstr "Escoger un fichero" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:187 msgid "Choose folder" msgstr "Escoger una carpeta" - -#: ../katze/katze-item.c:72 -msgid "Name" -msgstr "Nombre" - -#: ../katze/katze-item.c:73 -msgid "The name of the item" -msgstr "Nombre del elemento" - -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" -msgstr "Descripción del texto del elemento" - -#: ../katze/katze-item.c:91 -msgid "The URI of the item" -msgstr "El URI del elemento" - -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "Icono" - -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "El icono del elemento" - -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "Abreviatura" - -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "La abreviatura del elemento" - -#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -#: ../katze/katze-xbel.c:789 -msgid "Malformed document." -msgstr "Documento defectuoso" - -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "No se encuentra el archivo." From 50e078e7281a8644781695f3893a2c09c9d44105 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 4 Nov 2008 02:10:51 +0100 Subject: [PATCH 0455/2970] Implement history based auto completion in the location --- midori/midori-locationentry.c | 239 +++++++++++++++++++++++++++------- 1 file changed, 192 insertions(+), 47 deletions(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 8862b092..759ad377 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -14,6 +14,7 @@ #include "sokoke.h" #include +#include #define DEFAULT_ICON GTK_STOCK_FILE #define MAX_ITEMS 25 @@ -37,6 +38,7 @@ enum FAVICON_COL, URI_COL, TITLE_COL, + VISIBLE_COL, N_COLS }; @@ -71,6 +73,19 @@ midori_location_entry_class_init (MidoriLocationEntryClass* class) G_TYPE_INT); } +static GtkTreeModel* +midori_location_entry_get_model (MidoriLocationEntry* location_entry) +{ + GtkTreeModel* model; + GtkTreeModelFilter* filter_model; + + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + filter_model = GTK_TREE_MODEL_FILTER (model); + g_assert (filter_model); + + return gtk_tree_model_filter_get_model (filter_model); +} + #define HAVE_ENTRY_PROGRESS 1 #ifdef HAVE_ENTRY_PROGRESS @@ -405,12 +420,141 @@ midori_location_entry_set_progress (MidoriLocationEntry* location_entry, #endif } +static gboolean +midori_location_entry_completion_selected (GtkEntryCompletion* completion, + GtkTreeModel* model, + GtkTreeIter* iter, + MidoriLocationEntry* location_entry) +{ + gchar* uri; + + gtk_tree_model_get (model, iter, URI_COL, &uri, -1); + midori_location_entry_set_item_from_uri (location_entry, uri); + g_free (uri); + + return FALSE; +} + +static void +midori_location_entry_render_pixbuf_cb (GtkCellLayout* layout, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + gpointer data) +{ + GdkPixbuf* pixbuf; + + gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); + if (pixbuf) + { + g_object_set (renderer, "pixbuf", pixbuf, NULL); + g_object_set (renderer, "xpad", 5, "ypad", 5, "yalign", 0.0, NULL); + g_object_unref (pixbuf); + } +} + +static void +midori_location_entry_render_text_cb (GtkCellLayout* layout, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + gpointer data) +{ + gchar* uri; + gchar* title; + gchar* desc; + + gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); + if (title) + desc = g_markup_printf_escaped ("%s - %s", uri, title); + else + desc = g_markup_printf_escaped ("%s", uri); + + g_object_set (renderer, "markup", desc, "xpad", 5, "ypad", 5, NULL); + g_object_set (renderer, "ellipsize-set", TRUE, + "ellipsize", PANGO_ELLIPSIZE_END, NULL); + + katze_assign (uri, NULL); + katze_assign (title, NULL); + katze_assign (desc, NULL); +} + +static gboolean +midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, + const gchar* key, + GtkTreeIter* iter, + gpointer data) +{ + GtkTreeModel* model; + gchar* uri; + gchar* title; + gboolean match = FALSE; + gchar *temp; + + model = gtk_entry_completion_get_model (completion); + gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); + + if (uri) + { + temp = g_utf8_casefold (uri, -1); + match = (strstr (temp, key) != NULL); + g_free (temp); + g_free (uri); + + if (!match && title) + { + temp = g_utf8_casefold (title, -1); + match = (strstr (temp, key) != NULL); + g_free (temp); + g_free (title); + } + } + return match; +} + +static void +midori_location_entry_completion_init (MidoriLocationEntry* location_entry) +{ + GtkWidget* entry; + GtkEntryCompletion* completion; + GtkCellRenderer* renderer; + + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + completion = gtk_entry_completion_new (); + + gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), + midori_location_entry_get_model (location_entry)); + gtk_entry_completion_set_text_column (GTK_ENTRY_COMPLETION (completion), + URI_COL); + gtk_cell_layout_clear (GTK_CELL_LAYOUT (completion)); + + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, FALSE); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, + midori_location_entry_render_pixbuf_cb, + NULL, NULL); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, + midori_location_entry_render_text_cb, + NULL, NULL); + gtk_entry_completion_set_match_func (completion, + midori_location_entry_completion_match_cb, NULL, NULL); + + gtk_entry_set_completion (GTK_ENTRY (entry), completion); + g_signal_connect (completion, "match-selected", + G_CALLBACK (midori_location_entry_completion_selected), location_entry); + + g_object_unref (completion); +} + static void midori_location_entry_init (MidoriLocationEntry* location_entry) { GtkWidget* entry; GtkListStore* store; GtkCellRenderer* renderer; + GtkTreeModel* filter_model; /* we want the widget to have appears-as-list applied */ gtk_rc_parse_string ("style \"midori-location-entry-style\" {\n" @@ -423,7 +567,7 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); - g_signal_connect (entry, "key-press-event", + g_signal_connect_after (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); #ifdef HAVE_ENTRY_PROGRESS g_signal_connect_after (entry, "expose-event", @@ -434,8 +578,10 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) gtk_container_add (GTK_CONTAINER (location_entry), entry); store = gtk_list_store_new (N_COLS, - GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); - g_object_set (location_entry, "model", store, NULL); + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); + filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); + gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); + g_object_set (location_entry, "model", filter_model, NULL); g_object_unref (store); gtk_combo_box_entry_set_text_column ( @@ -446,22 +592,20 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), - renderer, "pixbuf", FAVICON_COL, NULL); - g_object_set (renderer, "xpad", 5, "ypad", 5, "yalign", 0.0, NULL); - - /* setup the renderer for the uri/title */ + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), renderer, + midori_location_entry_render_pixbuf_cb, + NULL, NULL); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (location_entry), - renderer, "markup", TITLE_COL, NULL); - g_object_set (renderer, "xpad", 5, "ypad", 5, NULL); - g_object_set (renderer, "ellipsize-set", TRUE, - "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), renderer, + midori_location_entry_render_text_cb, + NULL, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), -1); + midori_location_entry_completion_init (location_entry); + g_signal_connect (location_entry, "changed", G_CALLBACK (midori_location_entry_changed), NULL); } @@ -521,28 +665,12 @@ midori_location_entry_set_item (MidoriLocationEntry* entry, MidoriLocationEntryItem* item) { GtkTreeModel* model; - gchar* title; - gchar* desc; GdkPixbuf* icon; GdkPixbuf* new_icon; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry)); - gtk_tree_model_get (model, iter, TITLE_COL, &title, -1); - if (item->title) - desc = g_markup_printf_escaped ("%s - %s", item->uri, item->title); - else if (!title && !item->title) - desc = g_markup_printf_escaped ("%s", item->uri); - else - desc = NULL; - if (desc) - { - gtk_list_store_set (GTK_LIST_STORE (model), iter, - TITLE_COL, desc, -1); - g_free (desc); - } - + model = midori_location_entry_get_model (entry); gtk_list_store_set (GTK_LIST_STORE (model), iter, - URI_COL, item->uri, -1); + URI_COL, item->uri, TITLE_COL, item->title, -1); gtk_tree_model_get (model, iter, FAVICON_COL, &icon, -1); if (item->favicon) @@ -567,17 +695,28 @@ midori_location_entry_set_active_iter (MidoriLocationEntry* location_entry, GdkPixbuf* pixbuf; GtkTreeModel* model; GtkWidget* entry; + GtkTreeModel* filter_model; + GtkTreeIter filter_iter; entry = gtk_bin_get_child (GTK_BIN (location_entry)); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), iter); + model = midori_location_entry_get_model (location_entry); + filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + + /* The filter iter must be set, not the child iter, + * but the row must first be set as visible to + * convert to a filter iter without error. + */ + gtk_list_store_set (GTK_LIST_STORE (model), iter, VISIBLE_COL, TRUE, -1); + gtk_tree_model_filter_convert_child_iter_to_iter ( + GTK_TREE_MODEL_FILTER (filter_model), &filter_iter, iter); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), &filter_iter); /* When setting the active iter (when adding or setting an item) - * The favicon may have changed, so we must update the entry favicon. + * the favicon may have changed, so we must update the entry favicon. */ if (entry) { - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), @@ -623,7 +762,7 @@ midori_location_entry_item_iter (MidoriLocationEntry* location_entry, g_return_val_if_fail (uri != NULL, FALSE); found = FALSE; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + model = midori_location_entry_get_model (location_entry); if (gtk_tree_model_get_iter_first (model, iter)) { tmpuri = NULL; @@ -631,7 +770,7 @@ midori_location_entry_item_iter (MidoriLocationEntry* location_entry, { gtk_tree_model_get (model, iter, URI_COL, &tmpuri, -1); found = !g_ascii_strcasecmp (uri, tmpuri); - g_free (tmpuri); + katze_assign (tmpuri, NULL); if (found) break; @@ -686,7 +825,7 @@ midori_location_entry_set_text (MidoriLocationEntry* location_entry, gtk_entry_set_text (GTK_ENTRY (entry), text); if (midori_location_entry_item_iter (location_entry, text, &iter)) { - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + model = midori_location_entry_get_model (location_entry); gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); @@ -754,6 +893,7 @@ void midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, MidoriLocationEntryItem* item) { + GtkTreeModel* filter_model; GtkTreeModel* model; GtkTreeIter iter; GtkTreeIter index; @@ -762,16 +902,11 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + model = midori_location_entry_get_model (location_entry); if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) { - n = gtk_tree_model_iter_n_children (model, NULL); - if (n >= MAX_ITEMS) - { - gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); - gtk_list_store_remove (GTK_LIST_STORE (model), &index); - } gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); } else @@ -779,6 +914,13 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, gtk_tree_model_get_iter_first (model, &index); gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); } + n = gtk_tree_model_iter_n_children (filter_model, NULL); + if (n > MAX_ITEMS) + { + gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); + gtk_list_store_set (GTK_LIST_STORE (model), &index, VISIBLE_COL, FALSE, -1); + } + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, TRUE, -1); midori_location_entry_set_item (location_entry, &iter, item); } @@ -796,17 +938,20 @@ midori_location_entry_append_item (MidoriLocationEntry* location_entry, { GtkTreeModel* model; GtkTreeIter iter; + gint n; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + model = midori_location_entry_get_model (location_entry); if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) { - if (gtk_tree_model_iter_n_children (model, NULL) >= MAX_ITEMS) - return; gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + n = gtk_tree_model_iter_n_children (model, NULL); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, + (n <= MAX_ITEMS), -1); } midori_location_entry_set_item (location_entry, &iter, item); } From 6159e490185526fd524bcb6b95f81d78c608d088 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 4 Nov 2008 02:50:25 +0100 Subject: [PATCH 0456/2970] Show title in location combo and the URI below in small font --- midori/midori-locationentry.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 759ad377..51997277 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -466,11 +466,11 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); if (title) - desc = g_markup_printf_escaped ("%s - %s", uri, title); + desc = g_markup_printf_escaped ("%s\n%s", title, uri); else - desc = g_markup_printf_escaped ("%s", uri); + desc = g_markup_printf_escaped ("%s", uri); - g_object_set (renderer, "markup", desc, "xpad", 5, "ypad", 5, NULL); + g_object_set (renderer, "markup", desc, NULL); g_object_set (renderer, "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); @@ -580,7 +580,8 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) store = gtk_list_store_new (N_COLS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); - gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); + gtk_tree_model_filter_set_visible_column ( + GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); g_object_set (location_entry, "model", filter_model, NULL); g_object_unref (store); @@ -592,15 +593,13 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) renderer = gtk_cell_renderer_pixbuf_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, FALSE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), renderer, - midori_location_entry_render_pixbuf_cb, - NULL, NULL); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), + renderer, midori_location_entry_render_pixbuf_cb, NULL, NULL); renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), renderer, TRUE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), renderer, - midori_location_entry_render_text_cb, - NULL, NULL); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), + renderer, midori_location_entry_render_text_cb, NULL, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), -1); @@ -918,7 +917,8 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, if (n > MAX_ITEMS) { gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); - gtk_list_store_set (GTK_LIST_STORE (model), &index, VISIBLE_COL, FALSE, -1); + gtk_list_store_set (GTK_LIST_STORE (model), + &index, VISIBLE_COL, FALSE, -1); } gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, TRUE, -1); midori_location_entry_set_item (location_entry, &iter, item); From 9e9365a22160ded3e61fe2749e0cd5ee59b7f2e6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 6 Nov 2008 01:32:42 +0100 Subject: [PATCH 0457/2970] Small adjustments to the History panel Based on suggestions by Dale --- midori/midori-browser.c | 53 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 59e3c9e9..492f930e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2390,6 +2390,28 @@ midori_panel_history_row_activated_cb (GtkTreeView* treeview, } } +static void +midori_panel_history_cursor_or_row_changed_cb (GtkTreeView* tree_view, + MidoriBrowser* browser) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + gboolean is_page; + + if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + + is_page = !KATZE_IS_ARRAY (item) && katze_item_get_uri (item); + _action_set_sensitive (browser, "HistoryAddBookmark", is_page); + } + else + { + _action_set_sensitive (browser, "HistoryAddBookmark", FALSE); + } +} + static void _midori_panel_history_popup (GtkWidget* widget, GdkEventButton* event, @@ -2637,18 +2659,32 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { KatzeItem* item; + time_t date; + gchar datebuf[50]; char* sdate; gint age; gtk_tree_model_get (model, iter, 0, &item, 1, &age, -1); - g_assert (KATZE_IS_ITEM (item)); + g_assert (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item)) { - g_return_if_fail (age >= 0); + g_assert (age >= 0); - if (age > 1) + if (age > 7) + { + date = (time_t)katze_item_get_added (item); + strftime (datebuf, sizeof (datebuf), "%Y-%m-%d", localtime (&date)); + g_object_set (renderer, "text", datebuf, NULL); + } + else if (age > 6) + { + sdate = g_strdup_printf (_("A week ago")); + g_object_set (renderer, "text", sdate, NULL); + g_free (sdate); + } + else if (age > 1) { sdate = g_strdup_printf (_("%d days ago"), age); g_object_set (renderer, "text", sdate, NULL); @@ -2935,7 +2971,8 @@ _action_history_add_bookmark_activate (GtkAction* action, if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE); + if (!KATZE_IS_ARRAY (item)) + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE); g_object_unref (item); } } @@ -3344,7 +3381,9 @@ static const gchar* ui_markup = "" "" "" + "" "" + "" "" "" ""; @@ -3715,6 +3754,10 @@ midori_browser_init (MidoriBrowser* browser) g_object_connect (treeview, "signal::row-activated", midori_panel_history_row_activated_cb, browser, + "signal::cursor-changed", + midori_panel_history_cursor_or_row_changed_cb, browser, + "signal::columns-changed", + midori_panel_history_cursor_or_row_changed_cb, browser, "signal::button-release-event", midori_panel_history_button_release_event_cb, browser, "signal::key-release-event", @@ -3722,6 +3765,8 @@ midori_browser_init (MidoriBrowser* browser) "signal::popup-menu", midori_panel_history_popup_menu_cb, browser, NULL); + midori_panel_history_cursor_or_row_changed_cb (GTK_TREE_VIEW (treeview), + browser); gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); browser->panel_history = treeview; gtk_widget_show_all (box); From dad59bf5059c08dd62702bffb55da3f74b86871c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 6 Nov 2008 01:36:57 +0100 Subject: [PATCH 0458/2970] Remove unused gdk_pixbuf_new_from_stream and sokoke_web_icon --- midori/compat.c | 82 ------------------------------------------------- midori/compat.h | 13 -------- midori/sokoke.c | 38 ----------------------- midori/sokoke.h | 5 --- 4 files changed, 138 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index e51fc095..20fdc2df 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -29,88 +29,6 @@ g_strcmp0 (const gchar* string1, #endif -#if !GTK_CHECK_VERSION(2, 14, 0) - -#if GLIB_CHECK_VERSION (2, 16, 0) - -/* GTK+/ GdkPixbuf internal helper function - Copyright (C) 2008 Matthias Clasen - Copied from Gtk+ 2.13, coding style adjusted */ - -static GdkPixbuf* -load_from_stream (GdkPixbufLoader* loader, - GInputStream* stream, - GCancellable* cancellable, - GError** error) -{ - GdkPixbuf* pixbuf; - gssize n_read; - guchar buffer[65536]; - gboolean res; - - res = TRUE; - while (1) - { - n_read = g_input_stream_read (stream, buffer, sizeof (buffer), - cancellable, error); - if (n_read < 0) - { - res = FALSE; - error = NULL; /* Ignore further errors */ - break; - } - - if (!n_read) - break; - - if (!gdk_pixbuf_loader_write (loader, buffer, n_read, - error)) - { - res = FALSE; - error = NULL; - break; - } - } - - if (!gdk_pixbuf_loader_close (loader, error)) - { - res = FALSE; - error = NULL; - } - - pixbuf = NULL; - if (res) - { - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - if (pixbuf) - g_object_ref (pixbuf); - } - - return pixbuf; -} - -/* GTK+/ GdkPixbuf stream loading function - Copyright (C) 2008 Matthias Clasen - Copied from Gtk+ 2.13, coding style adjusted */ -GdkPixbuf* -gdk_pixbuf_new_from_stream (GInputStream* stream, - GCancellable* cancellable, - GError** error) -{ - GdkPixbuf* pixbuf; - GdkPixbufLoader* loader; - - loader = gdk_pixbuf_loader_new (); - pixbuf = load_from_stream (loader, stream, cancellable, error); - g_object_unref (loader); - - return pixbuf; -} - -#endif - -#endif - #if !GTK_CHECK_VERSION(2, 12, 0) void diff --git a/midori/compat.h b/midori/compat.h index 423b2236..68cda360 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -32,19 +32,6 @@ g_strcmp0 (const gchar* string1, #endif -#if !GTK_CHECK_VERSION (2, 14, 0) - -#if GLIB_CHECK_VERSION (2, 16, 0) - -GdkPixbuf* -gdk_pixbuf_new_from_stream (GInputStream* stream, - GCancellable* cancellable, - GError** error); - -#endif - -#endif - #if !GTK_CHECK_VERSION(2, 12, 0) void diff --git a/midori/sokoke.c b/midori/sokoke.c index 34036698..5310cf4c 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -474,44 +474,6 @@ sokoke_widget_get_text_size (GtkWidget* widget, g_object_unref (layout); } -GdkPixbuf* -sokoke_web_icon (const gchar* icon, - GtkIconSize size, - GtkWidget* widget) -{ - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - - GdkPixbuf* pixbuf = NULL; - if (icon && *icon) - { - /* TODO: We want to allow http as well, maybe also base64? */ - const gchar* icon_ready = g_str_has_prefix (icon, "file://") - ? &icon[7] : icon; - GtkStockItem stock_id; - if (gtk_stock_lookup (icon, &stock_id)) - pixbuf = gtk_widget_render_icon (widget, icon_ready, size, NULL); - else - { - gint width, height; - if (gtk_widget_has_screen (widget)) - { - GdkScreen* screen = gtk_widget_get_screen (widget); - gtk_icon_size_lookup_for_settings ( - gtk_settings_get_for_screen (screen), - size, &width, &height); - pixbuf = gtk_icon_theme_load_icon ( - gtk_icon_theme_get_for_screen (screen), icon, - MAX (width, height), GTK_ICON_LOOKUP_USE_BUILTIN, NULL); - } - } - if (!pixbuf) - pixbuf = gdk_pixbuf_new_from_file_at_size (icon_ready, 16, 16, NULL); - } - if (!pixbuf) - pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FIND, size, NULL); - return pixbuf; -} - gint sokoke_object_get_int (gpointer object, const gchar* property) diff --git a/midori/sokoke.h b/midori/sokoke.h index 0f69217b..526e9b3f 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -115,11 +115,6 @@ sokoke_widget_get_text_size (GtkWidget* widget, gint* width, gint* height); -GdkPixbuf* -sokoke_web_icon (const gchar* icon, - GtkIconSize size, - GtkWidget* widget); - gint sokoke_object_get_int (gpointer object, const gchar* property); From 4670a9ca2e3e41173e79293f2a6bc8a6e8a302f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 6 Nov 2008 01:40:06 +0100 Subject: [PATCH 0459/2970] Bolden completion matches and gray URIs instead of small font --- midori/midori-locationentry.c | 70 ++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 51997277..7add46bd 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -447,8 +447,7 @@ midori_location_entry_render_pixbuf_cb (GtkCellLayout* layout, gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); if (pixbuf) { - g_object_set (renderer, "pixbuf", pixbuf, NULL); - g_object_set (renderer, "xpad", 5, "ypad", 5, "yalign", 0.0, NULL); + g_object_set (renderer, "pixbuf", pixbuf, "yalign", 0.25, NULL); g_object_unref (pixbuf); } } @@ -463,20 +462,61 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar* uri; gchar* title; gchar* desc; + gchar* desc_uri; + gchar* desc_title; + GtkWidget* entry; + gchar* key; + gchar* temp; + gchar** parts; gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); - if (title) - desc = g_markup_printf_escaped ("%s\n%s", title, uri); + + desc_uri = desc_title = key = NULL; + if (data) + { + entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (data)); + key = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); + } + if (data && uri) + { + temp = g_utf8_strdown (uri, -1); + parts = g_strsplit (temp, key, 2); + g_free (temp); + if (parts && parts[0] && parts[1]) + desc_uri = g_markup_printf_escaped ("%s%s%s", + parts[0], key, parts[1]); + g_strfreev (parts); + } + if (uri && !desc_uri) + desc_uri = g_markup_escape_text (uri, -1); + if (data && title) + { + temp = g_utf8_strdown (title, -1); + parts = g_strsplit (temp, key, 2); + g_free (temp); + if (parts && parts[0] && parts[1]) + desc_title = g_markup_printf_escaped ("%s%s%s", + parts[0], key, parts[1]); + g_strfreev (parts); + } + if (title && !desc_title) + desc_title = g_markup_escape_text (title, -1); + + if (desc_title) + desc = g_strdup_printf ("%s\n%s", + desc_title, desc_uri); else - desc = g_markup_printf_escaped ("%s", uri); + desc = g_strdup_printf ("%s", desc_uri); - g_object_set (renderer, "markup", desc, NULL); - g_object_set (renderer, "ellipsize-set", TRUE, - "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_object_set (renderer, "markup", desc, + "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - katze_assign (uri, NULL); - katze_assign (title, NULL); - katze_assign (desc, NULL); + g_free (uri); + g_free (title); + g_free (key); + g_free (desc); + g_free (desc_uri); + g_free (desc_title); } static gboolean @@ -488,12 +528,13 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, GtkTreeModel* model; gchar* uri; gchar* title; - gboolean match = FALSE; - gchar *temp; + gboolean match; + gchar* temp; model = gtk_entry_completion_get_model (completion); gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); + match = FALSE; if (uri) { temp = g_utf8_casefold (uri, -1); @@ -509,6 +550,7 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, g_free (title); } } + return match; } @@ -537,7 +579,7 @@ midori_location_entry_completion_init (MidoriLocationEntry* location_entry) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, midori_location_entry_render_text_cb, - NULL, NULL); + completion, NULL); gtk_entry_completion_set_match_func (completion, midori_location_entry_completion_match_cb, NULL, NULL); From 7ac9c7787b9ec50a860b0a380f00c426ba4401cd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 6 Nov 2008 01:51:46 +0100 Subject: [PATCH 0460/2970] Conditionally silence JavaScriptCore deprecation warning --- midori/gjs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/midori/gjs.c b/midori/gjs.c index b0ddd6f4..99e4ec5f 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -13,6 +13,8 @@ #include #include +/* Needed for versioning macros */ +#include struct _GjsValue { @@ -595,7 +597,7 @@ _js_object_set_property (JSContextRef js_context, JSValueRef js_value) { JSStringRef js_name = JSStringCreateWithUTF8CString (name); - JSObjectSetProperty(js_context, js_object, js_name, js_value, + JSObjectSetProperty (js_context, js_object, js_name, js_value, kJSPropertyAttributeNone, NULL); JSStringRelease (js_name); } @@ -727,7 +729,8 @@ _js_class_get_property_cb (JSContextRef js_context, js_class_def.className = g_strdup (property); js_class_def.callAsFunction = _js_object_call_as_function_cb; JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_function = JSObjectMake (js_context, js_class, property); + JSObjectRef js_function = JSObjectMake (js_context, + js_class, property); return js_function; } g_free (property); @@ -1011,14 +1014,21 @@ gjs_module_new (JSContextRef js_context, js_class_def.hasProperty = _js_module_has_property_cb; js_class_def.getProperty = _js_module_get_property_cb; JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_module = JSObjectMake (js_context, js_class, (gpointer)namespace); + JSObjectRef js_module = JSObjectMake (js_context, js_class, + (gpointer)namespace); return js_module; } JSGlobalContextRef gjs_global_context_new (void) { + #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 3) + JSGlobalContextRef js_context = JSGlobalContextCreateInGroup (NULL, NULL); + #else JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); + #endif + #endif JSObjectRef js_object = gjs_object_new (js_context, "GJS", NULL); _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), "gjs", js_object); From 0246eeb124fb380e1aaa4aeae5d17dde43525f4c Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sat, 8 Nov 2008 02:23:08 +0100 Subject: [PATCH 0461/2970] Implement sorting location items by the number of visits For the moment, a define in the code decides whether items are sorted based on when they were added or how often a page was visited. The 'visits' property and respective database column is unused (we keep it for compatibility). It turns out it's enough to store that information in the tree model. The visit based sorting is not enabled because it is simply delaying startup incredibly. It will have to be decided whether to introduce a preference, or always use a visited based sorting once the startup delay is fixed. History items are also deleted from the tree model now if they are too old, according to the preference. --- katze/katze-item.c | 53 +--------- katze/katze-item.h | 8 -- midori/main.c | 18 ++-- midori/midori-browser.c | 26 +++-- midori/midori-locationaction.c | 52 ++++++++- midori/midori-locationaction.h | 49 +++++---- midori/midori-locationentry.c | 187 ++++++++++++++++++++++++++++----- midori/midori-locationentry.h | 43 ++++---- 8 files changed, 289 insertions(+), 147 deletions(-) diff --git a/katze/katze-item.c b/katze/katze-item.c index 3cc437f1..787995d8 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -35,8 +35,7 @@ enum PROP_URI, PROP_ICON, PROP_TOKEN, - PROP_ADDED, - PROP_VISITS + PROP_ADDED }; static void @@ -123,17 +122,6 @@ katze_item_class_init (KatzeItemClass* class) 0, flags)); - g_object_class_install_property (gobject_class, - PROP_VISITS, - g_param_spec_int ( - "visits", - "Visits", - "The number of visits of the item", - G_MININT, - G_MAXINT, - 0, - flags)); - } @@ -186,9 +174,6 @@ katze_item_set_property (GObject* object, case PROP_ADDED: item->added = g_value_get_int64 (value); break; - case PROP_VISITS: - item->visits = g_value_get_int (value); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -223,9 +208,6 @@ katze_item_get_property (GObject* object, case PROP_ADDED: g_value_set_int64 (value, item->added); break; - case PROP_VISITS: - g_value_set_int (value, item->visits); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -445,39 +427,6 @@ katze_item_set_added (KatzeItem* item, g_object_notify (G_OBJECT (item), "added"); } -/** - * katze_item_get_visits: - * @item: a #KatzeItem - * - * Retrieves the number of visits of @item. - * - * Return value: the number of visits - **/ -gint -katze_item_get_visits (KatzeItem* item) -{ - g_return_val_if_fail (KATZE_IS_ITEM (item), -1); - - return item->visits; -} - -/** - * katze_item_set_visits: - * @item: a #KatzeItem - * @visits: an integer - * - * Sets the number of visits of @item. - **/ -void -katze_item_set_visits (KatzeItem* item, - gint visits) -{ - g_return_if_fail (KATZE_IS_ITEM (item)); - - item->visits = visits; - g_object_notify (G_OBJECT (item), "visits"); -} - /** * katze_item_get_parent: * @item: a #KatzeItem diff --git a/katze/katze-item.h b/katze/katze-item.h index 6aceb449..add88de1 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -42,7 +42,6 @@ struct _KatzeItem gchar* icon; gchar* token; gint64 added; - gint visits; KatzeItem* parent; }; @@ -100,13 +99,6 @@ void katze_item_set_added (KatzeItem* item, gint64 added); -gint -katze_item_get_visits (KatzeItem* item); - -void -katze_item_set_visits (KatzeItem* item, - gint visits); - gpointer katze_item_get_parent (KatzeItem* item); diff --git a/midori/main.c b/midori/main.c index d5735b98..550e5722 100644 --- a/midori/main.c +++ b/midori/main.c @@ -668,11 +668,10 @@ midori_history_remove_item_cb (KatzeArray* history, sqlcmd = g_strdup_printf ( "DELETE FROM history WHERE uri = '%s' AND" - " title = '%s' AND date = %" G_GINT64_FORMAT " AND visits = %d", + " title = '%s' AND date = %" G_GINT64_FORMAT, katze_item_get_uri (item), katze_item_get_name (item), - katze_item_get_added (item), - katze_item_get_visits (item)); + katze_item_get_added (item)); success = db_exec (db, sqlcmd, &error); if (!success) { @@ -739,11 +738,10 @@ midori_history_add_item_cb (KatzeArray* array, } } sqlcmd = g_strdup_printf ("INSERT INTO history VALUES" - "('%s', '%s', %" G_GUINT64_FORMAT ", %d)", + "('%s', '%s', %" G_GUINT64_FORMAT ", -1)", katze_item_get_uri (item), katze_item_get_name (item), - katze_item_get_added (item), - katze_item_get_visits (item)); + katze_item_get_added (item)); success = db_exec (db, sqlcmd, &error); g_free (sqlcmd); if (!success) @@ -766,7 +764,7 @@ midori_history_add_items (void* data, gint64 date; time_t newdate; gint i, j, n; - gint ncols = 4; + gint ncols = 3; g_return_val_if_fail (KATZE_IS_ARRAY (array), 1); @@ -779,15 +777,13 @@ midori_history_add_items (void* data, { if (colname[i] && !g_ascii_strcasecmp (colname[i], "uri") && colname[i + 1] && !g_ascii_strcasecmp (colname[i + 1], "title") && - colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "date") && - colname[i + 3] && !g_ascii_strcasecmp (colname[i + 3], "visits")) + colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "date")) { item = katze_item_new (); katze_item_set_uri (item, argv[i]); katze_item_set_name (item, argv[i + 1]); date = g_ascii_strtoull (argv[i + 2], NULL, 10); katze_item_set_added (item, date); - katze_item_set_visits (item, atoi (argv[i + 3])); n = katze_array_get_length (array); for (j = 0; j < n; j++) @@ -829,7 +825,7 @@ midori_history_initialize (KatzeArray* array, return NULL; if (!db_exec_callback (db, - "SELECT uri, title, date, visits FROM history " + "SELECT uri, title, date FROM history " "ORDER BY date ASC", midori_history_add_items, array, diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 492f930e..1b5eb90a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -454,7 +454,6 @@ midori_view_notify_title_cb (GtkWidget* view, item = katze_item_new (); katze_item_set_uri (item, uri); katze_item_set_name (item, title); - katze_item_set_visits (item, -1); midori_browser_new_history_item (browser, item); } @@ -2491,15 +2490,19 @@ midori_panel_history_key_release_event_cb (GtkWidget* widget, GtkTreeModel* model; GtkTreeIter iter; KatzeItem* item; + GtkAction* location_action; - if (event->keyval == GDK_Delete) + if (event->keyval != GDK_Delete) + return FALSE; + + treeview = GTK_TREE_VIEW (widget); + if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) { - treeview = GTK_TREE_VIEW (widget); - if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_browser_model_remove_item (model, item, &iter); - } + location_action = _action_by_name (browser, "Location"); + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_browser_model_remove_item (model, item, &iter); + midori_location_action_delete_item_from_uri ( + MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); } return FALSE; @@ -2913,12 +2916,16 @@ _action_history_delete_activate (GtkAction* action, GtkTreeModel* model; GtkTreeIter iter; KatzeItem* item; + GtkAction* location_action; treeview = GTK_TREE_VIEW (browser->panel_history); if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) { + location_action = _action_by_name (browser, "Location"); gtk_tree_model_get (model, &iter, 0, &item, -1); midori_browser_model_remove_item (model, item, &iter); + midori_location_action_delete_item_from_uri ( + MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); } } @@ -2930,6 +2937,7 @@ _action_history_clear_activate (GtkAction* action, GtkTreeView* tree_view; GtkTreeStore* store; KatzeItem* item; + GtkAction* location_action; gint i, n; gint result; @@ -2945,6 +2953,7 @@ _action_history_clear_activate (GtkAction* action, if (result != GTK_RESPONSE_YES) return; + location_action = _action_by_name (browser, "Location"); tree_view = GTK_TREE_VIEW (browser->panel_history); store = GTK_TREE_STORE (gtk_tree_view_get_model (tree_view)); gtk_tree_store_clear (store); @@ -2956,6 +2965,7 @@ _action_history_clear_activate (GtkAction* action, katze_array_clear (KATZE_ARRAY (item)); } katze_array_clear (browser->history); + midori_location_action_clear (MIDORI_LOCATION_ACTION (location_action)); } static void diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 9145d276..90d1ae46 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -456,7 +456,6 @@ midori_location_action_add_uri (MidoriLocationAction* location_action, g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - katze_assign (location_action->uri, g_strdup (uri)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); @@ -660,3 +659,54 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action } while ((proxies = g_slist_next (proxies))); } + +void +midori_location_action_delete_item_from_uri (MidoriLocationAction* location_action, + const gchar* uri) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (uri != NULL); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + midori_location_entry_delete_item_from_uri + (MIDORI_LOCATION_ENTRY (entry), uri); + } + while ((proxies = g_slist_next (proxies))); +} + +void +midori_location_action_clear (MidoriLocationAction* location_action) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + + midori_location_entry_clear (MIDORI_LOCATION_ENTRY (entry)); + } + while ((proxies = g_slist_next (proxies))); +} diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index ba6da7bb..5a8f53de 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -35,44 +35,51 @@ typedef struct _MidoriLocationAction MidoriLocationAction; typedef struct _MidoriLocationActionClass MidoriLocationActionClass; GType -midori_location_action_get_type (void); +midori_location_action_get_type (void); const gchar* -midori_location_action_get_uri (MidoriLocationAction* action); +midori_location_action_get_uri (MidoriLocationAction* action); void -midori_location_action_set_uri (MidoriLocationAction* location_action, - const gchar* uri); +midori_location_action_set_uri (MidoriLocationAction* location_action, + const gchar* uri); void -midori_location_action_add_uri (MidoriLocationAction* location_action, - const gchar* uri); +midori_location_action_add_uri (MidoriLocationAction* location_action, + const gchar* uri); void -midori_location_action_add_item (MidoriLocationAction* location_action, - const gchar* uri, - GdkPixbuf* icon, - const gchar* title); +midori_location_action_add_item (MidoriLocationAction* location_action, + const gchar* uri, + GdkPixbuf* icon, + const gchar* title); void -midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, - GdkPixbuf* icon, - const gchar* text); +midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, + GdkPixbuf* icon, + const gchar* text); void -midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, - const gchar* title, - const gchar* text); +midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, + const gchar* title, + const gchar* text); gdouble -midori_location_action_get_progress (MidoriLocationAction* location_action); +midori_location_action_get_progress (MidoriLocationAction* location_action); void -midori_location_action_set_progress (MidoriLocationAction* location_action, - gdouble progress); +midori_location_action_set_progress (MidoriLocationAction* location_action, + gdouble progress); void -midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, - const gchar* stock_id); +midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, + const gchar* stock_id); + +void +midori_location_action_delete_item_from_uri (MidoriLocationAction* location_action, + const gchar* uri); + +void +midori_location_action_clear (MidoriLocationAction* location_action); G_END_DECLS diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 7add46bd..6170c8dd 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -18,6 +18,7 @@ #define DEFAULT_ICON GTK_STOCK_FILE #define MAX_ITEMS 25 +/* #define ORDER_BY_VISITS 1 */ struct _MidoriLocationEntry { @@ -31,13 +32,15 @@ struct _MidoriLocationEntryClass GtkComboBoxEntryClass parent_class; }; -G_DEFINE_TYPE (MidoriLocationEntry, midori_location_entry, GTK_TYPE_COMBO_BOX_ENTRY) +G_DEFINE_TYPE (MidoriLocationEntry, + midori_location_entry, GTK_TYPE_COMBO_BOX_ENTRY) enum { FAVICON_COL, URI_COL, TITLE_COL, + VISITS_COL, VISIBLE_COL, N_COLS }; @@ -74,18 +77,78 @@ midori_location_entry_class_init (MidoriLocationEntryClass* class) } static GtkTreeModel* -midori_location_entry_get_model (MidoriLocationEntry* location_entry) +midori_location_entry_get_filter_model (MidoriLocationEntry* location_entry) +{ + return gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); +} + +static GtkTreeModel* +midori_location_entry_get_sort_model (MidoriLocationEntry* location_entry) { GtkTreeModel* model; GtkTreeModelFilter* filter_model; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + model = midori_location_entry_get_filter_model (location_entry); filter_model = GTK_TREE_MODEL_FILTER (model); g_assert (filter_model); return gtk_tree_model_filter_get_model (filter_model); } +static GtkTreeModel* +midori_location_entry_get_model (MidoriLocationEntry* location_entry) +{ + + GtkTreeModel* model; +#ifdef ORDER_BY_VISITS + GtkTreeModelSort* sort_model; +#endif + + model = midori_location_entry_get_sort_model (location_entry); + +#ifdef ORDER_BY_VISITS + sort_model = GTK_TREE_MODEL_SORT (model); + g_assert (sort_model); + + return gtk_tree_model_sort_get_model (sort_model); +#else + return GTK_IS_TREE_MODEL (model) ? model : NULL; +#endif + +} + +static gboolean +midori_location_entry_child_iter_to_iter (MidoriLocationEntry* location_entry, + GtkTreeIter* iter, + GtkTreeIter* child_iter) +{ + GtkTreeModel* filter_model; +#ifdef ORDER_BY_VISITS + GtkTreeModel* sort_model; + GtkTreeIter sort_iter; +#endif + GtkTreeIter* temp_iter; + + temp_iter = child_iter; + + filter_model = midori_location_entry_get_filter_model (location_entry); + +#ifdef ORDER_BY_VISITS + sort_model = midori_location_entry_get_sort_model (location_entry); + + g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (filter_model) && + GTK_IS_TREE_MODEL_SORT (sort_model), FALSE); + + gtk_tree_model_sort_convert_child_iter_to_iter + (GTK_TREE_MODEL_SORT (sort_model), &sort_iter, child_iter); + + temp_iter = &sort_iter; +#endif + + return gtk_tree_model_filter_convert_child_iter_to_iter + (GTK_TREE_MODEL_FILTER (filter_model), iter, temp_iter); +} + #define HAVE_ENTRY_PROGRESS 1 #ifdef HAVE_ENTRY_PROGRESS @@ -565,7 +628,7 @@ midori_location_entry_completion_init (MidoriLocationEntry* location_entry) completion = gtk_entry_completion_new (); gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), - midori_location_entry_get_model (location_entry)); + midori_location_entry_get_sort_model (location_entry)); gtk_entry_completion_set_text_column (GTK_ENTRY_COMPLETION (completion), URI_COL); gtk_cell_layout_clear (GTK_CELL_LAYOUT (completion)); @@ -597,6 +660,9 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) GtkListStore* store; GtkCellRenderer* renderer; GtkTreeModel* filter_model; +#ifdef ORDER_BY_VISITS + GtkTreeModel* sort_model; +#endif /* we want the widget to have appears-as-list applied */ gtk_rc_parse_string ("style \"midori-location-entry-style\" {\n" @@ -620,8 +686,18 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) gtk_container_add (GTK_CONTAINER (location_entry), entry); store = gtk_list_store_new (N_COLS, - GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INT, G_TYPE_BOOLEAN); + +#ifdef ORDER_BY_VISITS + sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store)); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), + VISITS_COL, GTK_SORT_DESCENDING); + filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (sort_model), NULL); +#else filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); +#endif + gtk_tree_model_filter_set_visible_column ( GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); g_object_set (location_entry, "model", filter_model, NULL); @@ -687,7 +763,8 @@ midori_location_entry_changed (GtkComboBox* combo_box, { pixbuf = NULL; - model = gtk_combo_box_get_model (combo_box); + model = midori_location_entry_get_filter_model + (MIDORI_LOCATION_ENTRY (combo_box)); gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, -1); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), @@ -736,22 +813,19 @@ midori_location_entry_set_active_iter (MidoriLocationEntry* location_entry, GdkPixbuf* pixbuf; GtkTreeModel* model; GtkWidget* entry; - GtkTreeModel* filter_model; - GtkTreeIter filter_iter; + GtkTreeIter parent_iter; entry = gtk_bin_get_child (GTK_BIN (location_entry)); - model = midori_location_entry_get_model (location_entry); - filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); /* The filter iter must be set, not the child iter, * but the row must first be set as visible to * convert to a filter iter without error. */ gtk_list_store_set (GTK_LIST_STORE (model), iter, VISIBLE_COL, TRUE, -1); - gtk_tree_model_filter_convert_child_iter_to_iter ( - GTK_TREE_MODEL_FILTER (filter_model), &filter_iter, iter); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), &filter_iter); + if (midori_location_entry_child_iter_to_iter ( + location_entry, &parent_iter, iter)) + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), &parent_iter); /* When setting the active iter (when adding or setting an item) * the favicon may have changed, so we must update the entry favicon. @@ -777,7 +851,7 @@ midori_location_entry_set_active_iter (MidoriLocationEntry* location_entry, GtkWidget* midori_location_entry_new (void) { - return (g_object_new (MIDORI_TYPE_LOCATION_ENTRY, NULL)); + return g_object_new (MIDORI_TYPE_LOCATION_ENTRY, NULL); } /** @@ -878,13 +952,13 @@ midori_location_entry_set_text (MidoriLocationEntry* location_entry, } /** - * midori_location_entry_clear: + * midori_location_entry_reset: * @location_entry: a #MidoriLocationEntry * * Clears the entry text and resets the entry favicon. **/ void -midori_location_entry_clear (MidoriLocationEntry* location_entry) +midori_location_entry_reset (MidoriLocationEntry* location_entry) { GtkWidget* entry; @@ -898,6 +972,23 @@ midori_location_entry_clear (MidoriLocationEntry* location_entry) GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); } +/** + * midori_location_entry_clear: + * @location_entry: a #MidoriLocationEntry + * + * Removes all items from @location_entry + **/ +void +midori_location_entry_clear (MidoriLocationEntry* location_entry) +{ + GtkTreeModel* model; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + + model = midori_location_entry_get_model (location_entry); + gtk_list_store_clear (GTK_LIST_STORE (model)); +} + /** * midori_location_entry_set_item_from_uri: * @location_entry: a #MidoriLocationEntry @@ -917,7 +1008,7 @@ midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, if (midori_location_entry_item_iter (location_entry, uri, &iter)) midori_location_entry_set_active_iter (location_entry, &iter); else - midori_location_entry_clear (location_entry); + midori_location_entry_reset (location_entry); } @@ -939,22 +1030,23 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, GtkTreeIter iter; GtkTreeIter index; gint n; + gint visits = 0; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); - filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + filter_model = midori_location_entry_get_filter_model (location_entry); model = midori_location_entry_get_model (location_entry); - if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) - { - gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); - } - else + if (midori_location_entry_item_iter (location_entry, item->uri, &iter)) { gtk_tree_model_get_iter_first (model, &index); + gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); } + else + gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); + n = gtk_tree_model_iter_n_children (filter_model, NULL); if (n > MAX_ITEMS) { @@ -962,7 +1054,11 @@ midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, gtk_list_store_set (GTK_LIST_STORE (model), &index, VISIBLE_COL, FALSE, -1); } - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, TRUE, -1); + + /* Only increment the visits when we add the uri */ + if (!item->title && !item->favicon) + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, + VISIBLE_COL, TRUE, -1); midori_location_entry_set_item (location_entry, &iter, item); } @@ -981,6 +1077,7 @@ midori_location_entry_append_item (MidoriLocationEntry* location_entry, GtkTreeModel* model; GtkTreeIter iter; gint n; + gint visits = 0; g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); g_return_if_fail (item->uri != NULL); @@ -989,12 +1086,46 @@ midori_location_entry_append_item (MidoriLocationEntry* location_entry, if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) { - gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); - n = gtk_tree_model_iter_n_children (model, NULL); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, - (n <= MAX_ITEMS), -1); + n = gtk_tree_model_iter_n_children (model, NULL); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, + (n <= MAX_ITEMS), -1); } + else + gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, -1); midori_location_entry_set_item (location_entry, &iter, item); } +/** + * midori_location_entry_set_item_from_uri: + * @location_entry: a #MidoriLocationEntry + * @uri: a string + * + * Finds the item from the list matching @uri + * and removes it if it is the last instance. + **/ +void +midori_location_entry_delete_item_from_uri (MidoriLocationEntry* location_entry, + const gchar* uri) +{ + GtkTreeModel* model; + GtkTreeIter iter; + gint visits = 0; + + g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); + + model = midori_location_entry_get_model (location_entry); + if (midori_location_entry_item_iter (location_entry, uri, &iter)) + { + gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); + if (visits > 1) + gtk_list_store_set (GTK_LIST_STORE (model), + &iter, VISITS_COL, --visits, -1); + else + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + } +} + diff --git a/midori/midori-locationentry.h b/midori/midori-locationentry.h index cc47b9da..6be5ed69 100644 --- a/midori/midori-locationentry.h +++ b/midori/midori-locationentry.h @@ -35,44 +35,51 @@ struct _MidoriLocationEntryItem }; GType -midori_location_entry_get_type (void); +midori_location_entry_get_type (void); GtkWidget* -midori_location_entry_new (void); +midori_location_entry_new (void); gboolean -midori_location_entry_item_iter (MidoriLocationEntry* location_entry, - const gchar* uri, - GtkTreeIter* iter); +midori_location_entry_item_iter (MidoriLocationEntry* location_entry, + const gchar* uri, + GtkTreeIter* iter); const gchar* -midori_location_entry_get_text (MidoriLocationEntry* location_entry); +midori_location_entry_get_text (MidoriLocationEntry* location_entry); void -midori_location_entry_set_text (MidoriLocationEntry* location_entry, - const gchar* text); +midori_location_entry_set_text (MidoriLocationEntry* location_entry, + const gchar* text); void -midori_location_entry_clear (MidoriLocationEntry* location_entry); +midori_location_entry_reset (MidoriLocationEntry* location_entry); void -midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, - const gchar* uri); +midori_location_entry_clear (MidoriLocationEntry* location_entry); void -midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item); +midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, + const gchar* uri); void -midori_location_entry_append_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item); +midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item); + +void +midori_location_entry_append_item (MidoriLocationEntry* location_entry, + MidoriLocationEntryItem* item); + +void +midori_location_entry_delete_item_from_uri (MidoriLocationEntry* location_entry, + const gchar* uri); gdouble -midori_location_entry_get_progress (MidoriLocationEntry* location_entry); +midori_location_entry_get_progress (MidoriLocationEntry* location_entry); void -midori_location_entry_set_progress (MidoriLocationEntry* location_entry, - gdouble progress); +midori_location_entry_set_progress (MidoriLocationEntry* location_entry, + gdouble progress); G_END_DECLS From 3c450ebc97056c8882289b95abdf7573ce80b54e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 8 Nov 2008 03:05:30 +0100 Subject: [PATCH 0462/2970] Introduce descriptive comments meant to help translators intltool automatically embeds comments in the po template if they are directly before a translatable string. From now on we will try to avoid leaving accidental comments and instead put descriptive comments for translators before strings, starting with 'i18n'. --- TRANSLATE | 5 +++++ midori/main.c | 3 ++- midori/midori-browser.c | 4 +++- midori/midori-preferences.c | 2 +- midori/midori-view.c | 2 +- midori/midori-websettings.c | 1 + po/POTFILES.skip | 1 + 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/TRANSLATE b/TRANSLATE index 133ed47b..3c151c52 100644 --- a/TRANSLATE +++ b/TRANSLATE @@ -18,3 +18,8 @@ msgfmt -c --check-accelerators=_ aa.po As a general rule, your localization should be based off of the current state of the git repository. + +Some strings have comments, starting with 'i18n', which are meant +to describe the role of a string to translators. +Please don't hesitate to ask for additional descriptive comments +for any unclear strings that you are uncertain about. diff --git a/midori/main.c b/midori/main.c index 550e5722..1e0102c9 100644 --- a/midori/main.c +++ b/midori/main.c @@ -861,6 +861,7 @@ midori_history_terminate (sqlite3* db, db_exec (db, sqlcmd, &error); if (!success) { + /* i18n: Couldn't remove items that are older than n days */ g_printerr (_("Failed to remove old history items: %s\n"), error->message); g_error_free (error); return ; @@ -1152,8 +1153,8 @@ main (int argc, if (result) return 0; - /* FIXME: Do we want a graphical error message? */ g_print (_("An instance of Midori is already running but not responding.\n")); + /* FIXME: Do we want a graphical error message? */ return 1; } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1b5eb90a..22278632 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3794,6 +3794,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (browser->panel_pageholder); midori_panel_append_page (MIDORI_PANEL (browser->panel), browser->panel_pageholder, NULL, + /* i18n: A panel showing a user specified web page */ STOCK_PAGE_HOLDER, _("Pageholder")); /* Userscripts */ @@ -3862,7 +3863,8 @@ midori_browser_init (MidoriBrowser* browser) toolitem = gtk_tool_item_new (); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_add (GTK_CONTAINER (toolitem), - gtk_label_new_with_mnemonic (_("_Inline find:"))); + /* i18n: A panel at the bottom, to search text in pages */ + gtk_label_new_with_mnemonic (_("_Inline find:"))); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_text = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 4a524c2f..ce657c8d 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -342,9 +342,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (button, 1, 2, 0, 1); label = katze_property_label (settings, "homepage"); INDENTED_ADD (label, 0, 1, 1, 2); + /* TODO: We need something like "use current website" */ entry = katze_property_proxy (settings, "homepage", NULL); FILLED_ADD (entry, 1, 2, 1, 2); - /* TODO: We need something like "use current website" */ FRAME_NEW (_("Transfers")); TABLE_NEW (3, 2); label = katze_property_label (settings, "download-folder"); diff --git a/midori/midori-view.c b/midori/midori-view.c index 216aa871..a9d9ac0e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -895,7 +895,6 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, if (!view->link_uri && !has_selection) { - /* FIXME: Make this sensitive only when there is a tab to undo */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); icon = gtk_image_new_from_stock (GTK_STOCK_UNDELETE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); @@ -903,6 +902,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_object_set_data (G_OBJECT (menuitem), "action", "UndoTabClose"); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_action_activate_cb), view); + /* FIXME: Make this sensitive only when there is a tab to undo */ gtk_widget_show (menuitem); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 19ea94c3..fc6b1ba0 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -277,6 +277,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_LAST_PANEL_PAGE, g_param_spec_int ( "last-panel-page", + /* i18n: The internal index of the last opened panel */ _("Last panel page"), _("The last saved panel page"), 0, G_MAXINT, 0, diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 810789ee..8468b7fe 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1,2 @@ # List of source files containing translatable strings but should be ignored. +midori/gtkiconentry.c From 0c093cb33516c86ea028d85ef99531e07f4c83d1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 8 Nov 2008 03:24:02 +0100 Subject: [PATCH 0463/2970] Do not load icons automatically everywhere KatzeNet won't attempt to load icons that are not cached unless the caller provides an icon callback. For the moment, this means much less loading for items that are not actually visible, but for visiting pages or looking at bookmark menus. --- katze/katze-net.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index efe3b603..9b81a38d 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -531,7 +531,9 @@ katze_net_load_icon (KatzeNet* net, } else if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); - else + /* If the called doesn't provide an icon callback, + we assume there is no interest in loading an un-cached icon. */ + else if (icon_cb) { priv = g_new0 (KatzeNetIconPriv, 1); priv->net = net; From 9abb753cc4a7d64c73e693ac1d310af8feb8d127 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 8 Nov 2008 13:12:54 +0100 Subject: [PATCH 0464/2970] Remove sqlite header check, it turns out to be wrong --- configure.in | 2 +- midori/main.c | 4 +--- wscript | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 38d2ff3b..931fb769 100644 --- a/configure.in +++ b/configure.in @@ -76,7 +76,7 @@ AC_DEFINE_UNQUOTED(HAVE_LIBXML,$have_libxml, [Whether LibXML is available]) PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.0], have_sqlite3=1, have_sqlite3=0) AC_SUBST([SQLITE3_CFLAGS]) AC_SUBST([SQLITE3_LIBS]) -AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$have_sqlite3, [Whether sqlite3 is available]) +AC_DEFINE_UNQUOTED(HAVE_SQLITE,$have_sqlite3, [Whether sqlite3 is available]) # i18n GETTEXT_PACKAGE=midori diff --git a/midori/main.c b/midori/main.c index 1e0102c9..65c0ba04 100644 --- a/midori/main.c +++ b/midori/main.c @@ -29,10 +29,8 @@ #include #include -#if HAVE_SQLITE3_H +#ifdef HAVE_SQLITE #include -#elif HAVE_SQLITE_H - #include #endif #if ENABLE_NLS diff --git a/wscript b/wscript index 72201fe0..1bc78376 100644 --- a/wscript +++ b/wscript @@ -105,8 +105,6 @@ def configure (conf): if not Params.g_options.disable_sqlite: conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] - if not conf.check_header ('sqlite3.h', 'HAVE_SQLITE3_H'): - conf.check_header ('sqlite.h', 'HAVE_SQLITE_H') else: sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) From 57ec9a7bb8e519bdf4794c34bf32ae007a492a3a Mon Sep 17 00:00:00 2001 From: Elias Julkunen Date: Sat, 8 Nov 2008 13:17:53 +0100 Subject: [PATCH 0465/2970] Update Finnish translation --- po/fi.po | 109 +++++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/po/fi.po b/po/fi.po index d558fdb9..7d17aaf0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.1\n" +"Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-26 14:27+0200\n" -"PO-Revision-Date: 2008-10-28 21:34+0200\n" +"PO-Revision-Date: 2008-10-30 21:20+0200\n" "Last-Translator: Elias Julkunen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "_Poista käytöstä" #: ../midori/main.c:76 msgid "_Enable" -msgstr "_Käytä" +msgstr "_Ota käyttöön" #: ../midori/main.c:77 msgid "_Extensions" @@ -70,7 +70,7 @@ msgstr "_Kotisivu" #: ../midori/main.c:80 msgid "_Pageholder" -msgstr "_Sivun pitäjä" +msgstr "_Sivupidike" #: ../midori/main.c:81 msgid "_Userscripts" @@ -104,13 +104,13 @@ msgstr "Asetuksia ei voitu ladata. %s\n" #: ../midori/main.c:191 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "" +msgstr "Arvo ”%s” ei kelpaa kohteelle %s" #: ../midori/main.c:198 #: ../midori/main.c:267 #, c-format msgid "Unhandled settings value '%s'" -msgstr "Käsittämätön asetusarvo \"%s\"" +msgstr "Käsittelemätön asetusarvo ”%s”" #: ../midori/main.c:526 #: ../midori/main.c:534 @@ -121,7 +121,7 @@ msgstr "Virheellinen dokumentti." #: ../midori/main.c:556 msgid "File not found." -msgstr "Tiedostoa ei löydy" +msgstr "Tiedostoa ei löytynyt" #: ../midori/main.c:594 #: ../midori/main.c:626 @@ -148,7 +148,7 @@ msgstr "Historiatietuetta ei voitu lisätä. %s\n" #: ../midori/main.c:870 #, c-format msgid "Failed to remove old history items. %s\n" -msgstr "Vanhoja historiatietueita ei voitu poistaa. %s\n" +msgstr "Vanhoja historiatietueita ei voitfu poistaa. %s\n" #: ../midori/main.c:1002 #: ../midori/sokoke.c:457 @@ -171,23 +171,23 @@ msgstr "Näytä sovelluksen versio" #: ../midori/main.c:1063 msgid "URIs" -msgstr "URL-osoitteet" +msgstr "URI-osoitteet" #: ../midori/main.c:1097 msgid "[URIs]" -msgstr "[URL-osoitteet]" +msgstr "[URI-osoitteet]" #: ../midori/main.c:1121 msgid "Please report comments, suggestions and bugs to:" -msgstr "Lähetä kommentteja, ehdotuksia ja ohjelmavirheitä osoitteeseen:" +msgstr "Voit lähettää kommentteja, ehdotuksia ja tietoa ohjelmavirheistä osoitteeseen:" #: ../midori/main.c:1123 msgid "Check for new versions at:" -msgstr "" +msgstr "Kaäy katsomassa uusia versioita osoittesta:" #: ../midori/main.c:1144 msgid "No filename specified" -msgstr "Tiedostonimeä ei määritelty" +msgstr "Tiedostonimeä ei annettu" #. FIXME: Do we want a graphical error message? #: ../midori/main.c:1162 @@ -222,7 +222,7 @@ msgstr "Seuraavat virheet tapahtuivat:" #: ../midori/main.c:1407 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Hakumoottoreita ei voitu tallentaa. %s" +msgstr "Hakukoneita ei voitu tallentaa. %s" #: ../midori/main.c:1417 #, c-format @@ -273,12 +273,12 @@ msgstr "Keskeytä nykyisen sivun lataaminen" #: ../midori/midori-browser.c:315 #, c-format msgid "%d%% loaded" -msgstr "%d%% ladattu" +msgstr "%d %% ladattu" #: ../midori/midori-browser.c:338 #, c-format msgid "Unexpected action '%s'." -msgstr "Odottamaton toimenpide \"%s\"." +msgstr "Odottamaton toimenpide ”%s”." #: ../midori/midori-browser.c:507 msgid "New bookmark" @@ -308,7 +308,7 @@ msgstr "_Kansio:" #: ../midori/midori-browser.c:581 msgid "Root" -msgstr "" +msgstr "Juuri" #: ../midori/midori-browser.c:2349 msgid "Separator" @@ -333,7 +333,7 @@ msgstr "Kevyt verkkoselain" #: ../midori/midori-browser.c:2640 msgid "translator-credits" -msgstr "Elias Julkunen, elias.julkunen@gmail.com" +msgstr "Elias Julkunen, " #: ../midori/midori-browser.c:2909 msgid "Are you sure you want to remove all history items?" @@ -418,7 +418,7 @@ msgstr "Etsi _seuraava" #: ../midori/midori-browser.c:3026 msgid "Find the next occurrence of a word or phrase" -msgstr "Etsii seuraavan sanan tai lauseen esiintymän" +msgstr "Etsi seuraavan sanan tai lauseen esiintymä" #: ../midori/midori-browser.c:3028 msgid "Find _Previous" @@ -426,7 +426,7 @@ msgstr "Etsi _edellinen" #: ../midori/midori-browser.c:3029 msgid "Find the previous occurrence of a word or phrase" -msgstr "Etsii edellisen sanan tai lauseen esiintymän" +msgstr "Etsi edellisen sanan tai lauseen esiintymä" #: ../midori/midori-browser.c:3031 msgid "_Quick Find" @@ -471,11 +471,11 @@ msgstr "Näytä sivun lähdekoodi" #: ../midori/midori-browser.c:3061 msgid "View Selection Source" -msgstr "Näytä valinnan lähde" +msgstr "Näytä valinnan lähdekoodi" #: ../midori/midori-browser.c:3062 msgid "View the source code of the selection" -msgstr "Näytä valinnan lähdekoodin" +msgstr "Näytä valinnan lähdekoodi" #: ../midori/midori-browser.c:3065 msgid "Toggle fullscreen view" @@ -503,7 +503,7 @@ msgstr "Avaa _sivun pitäjässä" #: ../midori/midori-browser.c:3079 msgid "Open the current page in the pageholder" -msgstr "Avaa nykyisen sivun sivun pitäjä" +msgstr "Avaa nykyinen sivu sivun pitäjässä" #: ../midori/midori-browser.c:3081 msgid "Empty Trash" @@ -538,7 +538,7 @@ msgstr "Avaa uudessa _välilehdessä" #: ../midori/midori-browser.c:3095 msgid "Open the selected bookmark in a new tab" -msgstr "Avaa valitun kirjanmerkin uudessa välilehdessä" +msgstr "Avaa valittu kirjanmerkki uudessa välilehdessä" #: ../midori/midori-browser.c:3097 msgid "Open in New _Window" @@ -546,7 +546,7 @@ msgstr "Avaa uudessa _ikkunassa" #: ../midori/midori-browser.c:3098 msgid "Open the selected bookmark in a new window" -msgstr "Avaa valitun kirjanmerkin uudessa ikkunassa" +msgstr "Avaa valittu kirjanmerkki uudessa ikkunassa" #: ../midori/midori-browser.c:3101 msgid "Edit the selected bookmark" @@ -579,11 +579,11 @@ msgstr "_Työkalut" #: ../midori/midori-browser.c:3119 #: ../midori/midori-searchaction.c:468 msgid "_Manage Search Engines" -msgstr "_Hallitse hakumoottoreita" +msgstr "_Hallitse hakukoneita" #: ../midori/midori-browser.c:3120 msgid "Add, edit and remove search engines..." -msgstr "Lisää, muokkaa ja poista hakumoottoreita..." +msgstr "Lisää, muokkaa ja poista hakukoneita..." #: ../midori/midori-browser.c:3124 msgid "_Previous Tab" @@ -611,7 +611,7 @@ msgstr "_Sisältö" #: ../midori/midori-browser.c:3133 msgid "Show the documentation" -msgstr "Näyttää dokumentaation" +msgstr "Näyttä dokumentaatio" #: ../midori/midori-browser.c:3135 msgid "_Frequent questions" @@ -619,7 +619,7 @@ msgstr "_Usein kysytyt kysymykset" #: ../midori/midori-browser.c:3136 msgid "Show the Frequently Asked Questions" -msgstr "Näyttää usein kysytyt kysymykset" +msgstr "Näytä usein kysytyt kysymykset" #: ../midori/midori-browser.c:3138 msgid "_Report a bug" @@ -627,11 +627,11 @@ msgstr "_Ilmoita ohjelmavirheestä" #: ../midori/midori-browser.c:3139 msgid "Open Midori's bug tracker" -msgstr "Avaa Midorin ohjelmavirhehallinnan" +msgstr "Avaa Midorin ohjelmavirhehallinta" #: ../midori/midori-browser.c:3142 msgid "Show information about the program" -msgstr "Näyttää tietoja sovelluksesta" +msgstr "Näytää tietoja sovelluksesta" #: ../midori/midori-browser.c:3149 msgid "P_rivate Browsing" @@ -647,7 +647,7 @@ msgstr "_Valikkopalkki" #: ../midori/midori-browser.c:3155 msgid "Show menubar" -msgstr "Näyttää valikkopalkin" +msgstr "Näytä valikkopalkki" #: ../midori/midori-browser.c:3158 msgid "_Navigationbar" @@ -655,7 +655,7 @@ msgstr "_Navigointipalkki" #: ../midori/midori-browser.c:3159 msgid "Show navigationbar" -msgstr "Näyttää navigointipalkin" +msgstr "Näytä navigointipalkki" #: ../midori/midori-browser.c:3162 msgid "Side_panel" @@ -663,7 +663,7 @@ msgstr "_Sivupaneeli" #: ../midori/midori-browser.c:3163 msgid "Show sidepanel" -msgstr "Näyttää sivupaneelin" +msgstr "Näytä sivupaneeli" #: ../midori/midori-browser.c:3166 msgid "_Bookmarkbar" @@ -671,7 +671,7 @@ msgstr "_Kirjanmerkkipalkki" #: ../midori/midori-browser.c:3167 msgid "Show bookmarkbar" -msgstr "Näyttää kirjanmerkkipalkin" +msgstr "Näytä kirjanmerkkipalkki" #: ../midori/midori-browser.c:3170 msgid "_Transferbar" @@ -763,7 +763,7 @@ msgstr "Historia" #: ../midori/midori-browser.c:3724 msgid "Pageholder" -msgstr "Sivun pitäjä" +msgstr "Sivupidike" #: ../midori/midori-browser.c:3773 msgid "_Inline find:" @@ -784,7 +784,7 @@ msgstr "Sulje hakupalkki" #: ../midori/midori-browser.c:4071 #, c-format msgid "Unexpected setting '%s'" -msgstr "Odottamaton asetus \"%s\"" +msgstr "Odottamaton asetus ”%s”" #: ../midori/midori-panel.c:207 #: ../midori/midori-panel.c:208 @@ -919,11 +919,11 @@ msgstr "Viimeisin tallennettu verkkohaku" #: ../midori/midori-websettings.c:298 msgid "Last pageholder URI" -msgstr "Viimeisin sivun pitäjän URL-osoite" +msgstr "Viimeisin sivupidike URL-osoite" #: ../midori/midori-websettings.c:299 msgid "The URI last opened in the pageholder" -msgstr "Viimeisin avoinna ollut URL-osoite sivun pitäjässä" +msgstr "Viimeisin avoinna ollut URL-osoite sivupipidike" #: ../midori/midori-websettings.c:308 msgid "Show Menubar" @@ -975,7 +975,7 @@ msgstr "Työkalupalkin tyyli" #: ../midori/midori-websettings.c:364 msgid "Toolbar Items" -msgstr "Työjakupalkin painikkeet" +msgstr "Työkakupalkin painikkeet" #: ../midori/midori-websettings.c:365 msgid "The items to show on the toolbar" @@ -1051,11 +1051,11 @@ msgstr "Näytä aina välilehtipalkki" #: ../midori/midori-websettings.c:458 msgid "Close Buttons on Tabs" -msgstr "Sulje-painikkeet väilehdissä" +msgstr "Sulkemispainikkeet välilehdissä" #: ../midori/midori-websettings.c:459 msgid "Whether tabs have close buttons" -msgstr "Onko välilehdissä sulje-painikkeet" +msgstr "Onko välilehdissä sulkemispainikkeet" #: ../midori/midori-websettings.c:467 msgid "Open new pages in" @@ -1095,7 +1095,7 @@ msgstr "Avaa välilehdet nykyisestä seuraavaksi" #: ../midori/midori-websettings.c:506 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Avataanko uudet välilehdet nykyisestä välilehdestä seuraavaksi vai viimeisen jälkeiseksi" +msgstr "Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi" #: ../midori/midori-websettings.c:514 msgid "Open popups in tabs" @@ -1127,7 +1127,7 @@ msgstr "Evästeiden enimmäisikä" #: ../midori/midori-websettings.c:545 msgid "The maximum number of days to save cookies for" -msgstr "Kuinka monta päivää evästeet säilytetään" +msgstr "Evästetietojen säilytysaika päivinä" #: ../midori/midori-websettings.c:555 msgid "Remember last visited pages" @@ -1143,7 +1143,7 @@ msgstr "Historian enimmäisikä" #: ../midori/midori-websettings.c:565 msgid "The maximum number of days to save the history for" -msgstr "Kuinka monta päivää historia säilytetään" +msgstr "Historiatietojen säilytysaika päivinä" #: ../midori/midori-websettings.c:573 msgid "Remember last form inputs" @@ -1203,7 +1203,7 @@ msgstr "Avaa URL-osoite uudessa _välilehdessä" #: ../midori/midori-view.c:1287 msgid "Source" -msgstr "Lähde" +msgstr "Lähdekoodi" #: ../midori/midori-preferences.c:86 #, c-format @@ -1230,7 +1230,7 @@ msgstr "Kirjasinasetukset" #: ../midori/midori-preferences.c:386 msgid "Default Font Family" -msgstr "Oletuskirjasin" +msgstr "Oletuskirjasinperhe" #: ../midori/midori-preferences.c:394 msgid "Minimum Font Size" @@ -1312,11 +1312,11 @@ msgstr "Tyhjä" #: ../midori/midori-searchaction.c:804 msgid "Add search engine" -msgstr "Lisää hakumoottori" +msgstr "Lisää hakukone" #: ../midori/midori-searchaction.c:804 msgid "Edit search engine" -msgstr "Muokkaa hakumoottoria" +msgstr "Muokkaa hakukonetta" #: ../midori/midori-searchaction.c:832 msgid "_Name:" @@ -1332,7 +1332,7 @@ msgstr "_Merkki:" #: ../midori/midori-searchaction.c:1067 msgid "Manage search engines" -msgstr "Hallitse hakumoottoreita" +msgstr "Hallitse hakukoneita" #: ../midori/sokoke.c:63 #: ../midori/sokoke.c:75 @@ -1351,7 +1351,7 @@ msgstr "Tapahtui tuntematon virhe." #: ../midori/gjs.c:829 #, c-format msgid "%s has no property '%s'" -msgstr "%s:lla ei ole ominaisuutta \"%s\"" +msgstr "Asialla %s ei ole ominaisuutta ”%s”" #: ../midori/gjs.c:875 #, c-format @@ -1366,12 +1366,12 @@ msgstr "" #: ../katze/katze-throbber.c:807 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Nimettyä kuvaketta \"%s\" ei voitu ladata" +msgstr "Nimettyä kuvaketta ”%s” ei voitu ladata" #: ../katze/katze-throbber.c:820 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Vakiokuvaketta \"%s\" ei voitu ladata" +msgstr "Vakiokuvaketta ”%s” ei voitu ladata" #: ../katze/katze-throbber.c:883 msgid "Animation frames are broken" @@ -1381,7 +1381,7 @@ msgstr "Animaatiokehykset ovat rikki" #: ../katze/katze-utils.c:334 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Ominaisuus \"%s\" on epäkelpo kohteelle %s" +msgstr "Ominaisuus ”%s” on epäkelpo kohteelle %s" #: ../katze/katze-utils.c:169 #: ../katze/katze-utils.c:205 @@ -1391,4 +1391,3 @@ msgstr "Valitse tiedosto" #: ../katze/katze-utils.c:187 msgid "Choose folder" msgstr "Valitse kansio" - From 87092babefbc0e8ea4925da9f54e055d6ce62c8e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 9 Nov 2008 19:09:35 +0100 Subject: [PATCH 0466/2970] Move completion logic from LocationEntry to LocationAction This resolves various indirections, and since we are always using the action anyway, we finally move all logic to one place. There should be room for optimizations now. Incidentally this also keeps the completion intact if the entry needs to be recreated. --- midori/midori-locationaction.c | 755 ++++++++++++++++++++++++++++----- midori/midori-locationaction.h | 7 + midori/midori-locationentry.c | 703 +----------------------------- midori/midori-locationentry.h | 44 -- 4 files changed, 655 insertions(+), 854 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 90d1ae46..a0940758 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1,5 +1,6 @@ /* Copyright (C) 2008 Christian Dywan + Copyright (C) 2008 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -12,10 +13,14 @@ #include "midori-locationaction.h" #include "gtkiconentry.h" +#include "sokoke.h" +#include #include #include +#define MAX_ITEMS 25 + struct _MidoriLocationAction { GtkAction parent_instance; @@ -24,6 +29,9 @@ struct _MidoriLocationAction gdouble progress; GtkTreeModel* model; + GtkTreeModel* filter_model; + GtkTreeModel* sort_model; + GdkPixbuf* default_icon; }; struct _MidoriLocationActionClass @@ -53,6 +61,16 @@ enum static guint signals[LAST_SIGNAL]; +enum +{ + FAVICON_COL, + URI_COL, + TITLE_COL, + VISITS_COL, + VISIBLE_COL, + N_COLS +}; + static void midori_location_action_finalize (GObject* object); @@ -199,10 +217,27 @@ midori_location_action_class_init (MidoriLocationActionClass* class) static void midori_location_action_init (MidoriLocationAction* location_action) { + GtkTreeModel* liststore; + GtkTreeModel* sort_model; + GtkTreeModel* filter_model; + location_action->uri = NULL; location_action->progress = 0.0; - location_action->model = NULL; + liststore = (GtkTreeModel*)gtk_list_store_new (N_COLS, + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INT, G_TYPE_BOOLEAN); + sort_model = (GtkTreeModel*)gtk_tree_model_sort_new_with_model (liststore); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), + VISITS_COL, GTK_SORT_DESCENDING); + filter_model = gtk_tree_model_filter_new (sort_model, NULL); + gtk_tree_model_filter_set_visible_column ( + GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); + + location_action->model = liststore; + location_action->filter_model = filter_model; + location_action->sort_model = sort_model; + location_action->default_icon = NULL; } static void @@ -210,9 +245,12 @@ midori_location_action_finalize (GObject* object) { MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object); - g_free (location_action->uri); + katze_assign (location_action->uri, NULL); katze_object_assign (location_action->model, NULL); + katze_object_assign (location_action->sort_model, NULL); + katze_object_assign (location_action->filter_model, NULL); + katze_object_assign (location_action->default_icon, NULL); G_OBJECT_CLASS (midori_location_action_parent_class)->finalize (object); } @@ -228,17 +266,13 @@ midori_location_action_set_property (GObject* object, switch (prop_id) { case PROP_PROGRESS: - { midori_location_action_set_progress (location_action, g_value_get_double (value)); break; - } case PROP_SECONDARY_ICON: - { midori_location_action_set_secondary_icon (location_action, g_value_get_string (value)); break; - } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -276,20 +310,16 @@ static GtkWidget* midori_location_action_create_tool_item (GtkAction* action) { GtkWidget* toolitem; - GtkWidget* entry; + GtkWidget* location_entry; GtkWidget* alignment; toolitem = GTK_WIDGET (gtk_tool_item_new ()); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - entry = midori_location_entry_new (); - midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), - MIDORI_LOCATION_ACTION (action)->progress); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (entry))), - GTK_ICON_ENTRY_SECONDARY, TRUE); + location_entry = midori_location_entry_new (); + alignment = gtk_alignment_new (0, 0.5, 1, 0.1); - gtk_container_add (GTK_CONTAINER (alignment), entry); - gtk_widget_show (entry); + gtk_container_add (GTK_CONTAINER (alignment), location_entry); + gtk_widget_show (location_entry); gtk_container_add (GTK_CONTAINER (toolitem), alignment); gtk_widget_show (alignment); @@ -297,15 +327,17 @@ midori_location_action_create_tool_item (GtkAction* action) } static void -midori_location_action_active_changed_cb (GtkWidget* widget, +midori_location_action_active_changed_cb (GtkWidget* location_entry, gint active, GtkAction* action) { MidoriLocationAction* location_action; + GtkWidget* entry; const gchar* text; location_action = MIDORI_LOCATION_ACTION (action); - text = midori_location_entry_get_text (MIDORI_LOCATION_ENTRY (widget)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + text = gtk_entry_get_text (GTK_ENTRY (entry)); katze_assign (location_action->uri, g_strdup (text)); g_signal_emit (action, signals[ACTIVE_CHANGED], 0, active); @@ -359,6 +391,397 @@ midori_location_action_icon_released_cb (GtkWidget* widget, g_signal_emit (action, signals[SECONDARY_ICON_RELEASED], 0, widget); } +static void +midori_location_entry_render_pixbuf_cb (GtkCellLayout* layout, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + gpointer data) +{ + GdkPixbuf* pixbuf; + + gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); + if (pixbuf) + { + g_object_set (renderer, "pixbuf", pixbuf, "yalign", 0.25, NULL); + g_object_unref (pixbuf); + } +} + +static void +midori_location_entry_render_text_cb (GtkCellLayout* layout, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + gpointer data) +{ + gchar* uri; + gchar* title; + gchar* desc; + gchar* desc_uri; + gchar* desc_title; + GtkWidget* entry; + gchar* key; + gchar* temp; + gchar** parts; + + gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); + + desc_uri = desc_title = key = NULL; + if (data) + { + entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (data)); + key = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); + } + if (data && uri) + { + temp = g_utf8_strdown (uri, -1); + parts = g_strsplit (temp, key, 2); + g_free (temp); + if (parts && parts[0] && parts[1]) + desc_uri = g_markup_printf_escaped ("%s%s%s", + parts[0], key, parts[1]); + g_strfreev (parts); + } + if (uri && !desc_uri) + desc_uri = g_markup_escape_text (uri, -1); + if (data && title) + { + temp = g_utf8_strdown (title, -1); + parts = g_strsplit (temp, key, 2); + g_free (temp); + if (parts && parts[0] && parts[1]) + desc_title = g_markup_printf_escaped ("%s%s%s", + parts[0], key, parts[1]); + g_strfreev (parts); + } + if (title && !desc_title) + desc_title = g_markup_escape_text (title, -1); + + if (desc_title) + desc = g_strdup_printf ("%s\n%s", + desc_title, desc_uri); + else + desc = g_strdup_printf ("%s", desc_uri); + + g_object_set (renderer, "markup", desc, + "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + + g_free (uri); + g_free (title); + g_free (key); + g_free (desc); + g_free (desc_uri); + g_free (desc_title); +} + +static gboolean +midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, + const gchar* key, + GtkTreeIter* iter, + gpointer data) +{ + GtkTreeModel* model; + gchar* uri; + gchar* title; + gboolean match; + gchar* temp; + + model = gtk_entry_completion_get_model (completion); + gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); + + match = FALSE; + if (uri) + { + temp = g_utf8_casefold (uri, -1); + match = (strstr (temp, key) != NULL); + g_free (temp); + g_free (uri); + + if (!match && title) + { + temp = g_utf8_casefold (title, -1); + match = (strstr (temp, key) != NULL); + g_free (temp); + g_free (title); + } + } + + return match; +} + +static void +midori_location_action_set_item (MidoriLocationAction* location_action, + GtkTreeIter* iter, + MidoriLocationEntryItem* item) +{ + GtkTreeModel* model; + GdkPixbuf* icon; + GdkPixbuf* new_icon; + + model = location_action->model; + gtk_list_store_set (GTK_LIST_STORE (model), iter, + URI_COL, item->uri, TITLE_COL, item->title, -1); + + gtk_tree_model_get (model, iter, FAVICON_COL, &icon, -1); + if (item->favicon) + new_icon = item->favicon; + else if (!icon && !item->favicon) + new_icon = location_action->default_icon; + else + new_icon = NULL; + if (new_icon) + gtk_list_store_set (GTK_LIST_STORE (model), iter, + FAVICON_COL, new_icon, -1); +} + +static gboolean +midori_location_action_child_iter_to_iter (MidoriLocationAction* location_action, + GtkTreeIter* iter, + GtkTreeIter* child_iter) +{ + GtkTreeModel* filter_model; + GtkTreeModel* sort_model; + GtkTreeIter sort_iter; + GtkTreeIter* temp_iter; + + temp_iter = child_iter; + + filter_model = location_action->filter_model; + sort_model = location_action->sort_model; + gtk_tree_model_sort_convert_child_iter_to_iter + (GTK_TREE_MODEL_SORT (sort_model), &sort_iter, child_iter); + temp_iter = &sort_iter; + + return gtk_tree_model_filter_convert_child_iter_to_iter + (GTK_TREE_MODEL_FILTER (filter_model), iter, temp_iter); +} + +static void +midori_location_action_set_active_iter (MidoriLocationAction* location_action, + GtkTreeIter* iter) +{ + GdkPixbuf* pixbuf; + GtkTreeModel* model; + GSList* proxies; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + GtkTreeIter parent_iter; + + model = location_action->filter_model; + + /* The filter iter must be set, not the child iter, + * but the row must first be set as visible to + * convert to a filter iter without error. + */ + gtk_list_store_set (GTK_LIST_STORE (model), iter, VISIBLE_COL, TRUE, -1); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + + if (midori_location_action_child_iter_to_iter ( + location_action, &parent_iter, iter)) + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), + &parent_iter); + + /* When setting the active iter (when adding or setting an item) + * the icon may have changed, so we must update the entry icon. + */ + gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); + + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, pixbuf); + g_object_unref (pixbuf); + } + while ((proxies = g_slist_next (proxies))); +} + +/** + * midori_location_action_item_iter: + * @location_action: a #MidoriLocationAction + * @uri: a string + * @iter: a GtkTreeIter + * + * Retrieves the iter of the item matching @uri. + * + * Return value: %TRUE if @uri was found, %FALSE otherwise + **/ +static gboolean +midori_location_action_item_iter (MidoriLocationAction* location_action, + const gchar* uri, + GtkTreeIter* iter) +{ + GtkTreeModel* model; + gchar* tmpuri; + gboolean found; + + g_return_val_if_fail (MIDORI_IS_LOCATION_ACTION (location_action), FALSE); + g_return_val_if_fail (uri != NULL, FALSE); + + found = FALSE; + model = location_action->model; // filter_model + if (gtk_tree_model_get_iter_first (model, iter)) + { + tmpuri = NULL; + do + { + gtk_tree_model_get (model, iter, URI_COL, &tmpuri, -1); + found = !g_ascii_strcasecmp (uri, tmpuri); + katze_assign (tmpuri, NULL); + + if (found) + break; + } + while (gtk_tree_model_iter_next (model, iter)); + } + return found; +} + +/** + * midori_location_action_reset: + * @location_action: a #MidoriLocationAction + * + * Clears the text in the entry and resets the icon. + **/ +static void +midori_location_action_reset (MidoriLocationAction* location_action) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + + gtk_entry_set_text (GTK_ENTRY (entry), ""); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE); + } + while ((proxies = g_slist_next (proxies))); +} + +/** + * midori_location_action_set_item_from_uri: + * @location_action: a #MidoriLocationAction + * @uri: a string + * + * Finds the item from the list matching @uri + * and sets it as the active item. + * If @uri is not found it clears the active item. + **/ +static void +midori_location_action_set_item_from_uri (MidoriLocationAction* location_action, + const gchar* uri) +{ + GtkTreeIter iter; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + + if (midori_location_action_item_iter (location_action, uri, &iter)) + midori_location_action_set_active_iter (location_action, &iter); + else + midori_location_action_reset (location_action); + +} + +static gboolean +midori_location_entry_completion_selected (GtkEntryCompletion* completion, + GtkTreeModel* model, + GtkTreeIter* iter, + MidoriLocationAction* location_action) +{ + gchar* uri; + + gtk_tree_model_get (model, iter, URI_COL, &uri, -1); + midori_location_action_set_item_from_uri (location_action, uri); + g_free (uri); + + return FALSE; +} + +static void +midori_location_action_completion_init (MidoriLocationAction* location_action, + GtkWidget* location_entry) +{ + GtkWidget* entry; + GtkEntryCompletion* completion; + GtkCellRenderer* renderer; + + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + completion = gtk_entry_completion_new (); + + gtk_entry_completion_set_model (completion, location_action->sort_model); + gtk_entry_completion_set_text_column (completion, URI_COL); + gtk_cell_layout_clear (GTK_CELL_LAYOUT (completion)); + + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, FALSE); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, + midori_location_entry_render_pixbuf_cb, + NULL, NULL); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, + midori_location_entry_render_text_cb, + completion, NULL); + gtk_entry_completion_set_match_func (completion, + midori_location_entry_completion_match_cb, NULL, NULL); + + gtk_entry_set_completion (GTK_ENTRY (entry), completion); + g_signal_connect (completion, "match-selected", + G_CALLBACK (midori_location_entry_completion_selected), location_entry); + + g_object_unref (completion); +} + +static void +midori_location_action_entry_changed_cb (GtkComboBox* combo_box, + MidoriLocationAction* location_action) +{ + GtkTreeIter iter; + GtkIconEntry* entry; + GtkTreeModel* model; + GdkPixbuf* pixbuf; + + if (gtk_combo_box_get_active_iter (combo_box, &iter)) + { + if ((entry = GTK_ICON_ENTRY (gtk_bin_get_child (GTK_BIN (combo_box))))) + { + pixbuf = NULL; + + model = location_action->filter_model; + gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, -1); + + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, pixbuf); + g_object_unref (pixbuf); + + g_signal_emit (MIDORI_LOCATION_ENTRY (combo_box), + signals[ACTIVE_CHANGED], 0, gtk_combo_box_get_active (combo_box)); + } + } +} + static void midori_location_action_connect_proxy (GtkAction* action, GtkWidget* proxy) @@ -366,6 +789,7 @@ midori_location_action_connect_proxy (GtkAction* action, GtkWidget* alignment; GtkWidget* entry; MidoriLocationAction* location_action; + GtkCellRenderer* renderer; GTK_ACTION_CLASS (midori_location_action_parent_class)->connect_proxy ( action, proxy); @@ -376,14 +800,30 @@ midori_location_action_connect_proxy (GtkAction* action, entry = gtk_bin_get_child (GTK_BIN (alignment)); location_action = MIDORI_LOCATION_ACTION (action); - if (location_action->model) - gtk_combo_box_set_model (GTK_COMBO_BOX (entry), - location_action->model); - else - location_action->model = g_object_ref (gtk_combo_box_get_model ( - GTK_COMBO_BOX (entry))); + midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), + MIDORI_LOCATION_ACTION (action)->progress); + gtk_combo_box_set_model (GTK_COMBO_BOX (entry), + MIDORI_LOCATION_ACTION (action)->filter_model); + gtk_combo_box_entry_set_text_column ( + GTK_COMBO_BOX_ENTRY (entry), URI_COL); + gtk_cell_layout_clear (GTK_CELL_LAYOUT (entry)); - g_signal_connect (entry, "active-changed", + /* Setup the renderer for the favicon */ + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (entry), renderer, FALSE); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (entry), + renderer, midori_location_entry_render_pixbuf_cb, NULL, NULL); + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (entry), renderer, TRUE); + gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (entry), + renderer, midori_location_entry_render_text_cb, NULL, NULL); + + gtk_combo_box_set_active (GTK_COMBO_BOX (entry), -1); + midori_location_action_completion_init (location_action, entry); + g_signal_connect (entry, "changed", + G_CALLBACK (midori_location_action_entry_changed_cb), action); + + g_signal_connect (location_action, "active-changed", G_CALLBACK (midori_location_action_active_changed_cb), action); g_object_connect (gtk_bin_get_child (GTK_BIN (entry)), "signal::key-press-event", @@ -416,18 +856,26 @@ midori_location_action_get_uri (MidoriLocationAction* location_action) return location_action->uri; } -void -midori_location_action_set_uri (MidoriLocationAction* location_action, - const gchar* uri) +/** + * midori_location_action_set_text: + * @location_action: a #MidoriLocationAction + * @text: a string + * + * Sets the entry text to @text and, if applicable, updates the icon. + **/ +static void +midori_location_action_set_text (MidoriLocationAction* location_action, + const gchar* text) { GSList* proxies; GtkWidget* alignment; + GtkWidget* location_entry; GtkWidget* entry; + GtkTreeIter iter; + GtkTreeModel* model; + GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (uri != NULL); - - katze_assign (location_action->uri, g_strdup (uri)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); if (!proxies) @@ -437,20 +885,128 @@ midori_location_action_set_uri (MidoriLocationAction* location_action, if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); - midori_location_entry_set_text (MIDORI_LOCATION_ENTRY (entry), uri); + gtk_entry_set_text (GTK_ENTRY (entry), text); + if (midori_location_action_item_iter (location_action, text, &iter)) + { + model = location_action->model; // filter_model + gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + } + /* FIXME: Due to a bug in GtkIconEntry we can't reset the icon + else + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, location_action->default_icon);*/ } while ((proxies = g_slist_next (proxies))); } +void +midori_location_action_set_uri (MidoriLocationAction* location_action, + const gchar* uri) +{ + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (uri != NULL); + + katze_assign (location_action->uri, g_strdup (uri)); + + midori_location_action_set_text (location_action, uri); +} + +/** + * midori_location_action_prepend_item: + * @location_action: a #MidoriLocationAction + * @item: a MidoriLocationItem + * + * Prepends @item if it is not already in the list. + * If the item already exists, it is moved before the first item. + * If the maximum is reached, the last item is removed. + **/ +static void +midori_location_action_prepend_item (MidoriLocationAction* location_action, + MidoriLocationEntryItem* item) +{ + GtkTreeModel* filter_model; + GtkTreeModel* model; + GtkTreeIter iter; + GtkTreeIter index; + gint n; + gint visits = 0; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (item->uri != NULL); + + filter_model = location_action->filter_model; + model = location_action->model; + + if (midori_location_action_item_iter (location_action, item->uri, &iter)) + { + gtk_tree_model_get_iter_first (model, &index); + gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); + gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); + } + else + gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); + + n = gtk_tree_model_iter_n_children (filter_model, NULL); + if (n > MAX_ITEMS) + { + gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); + gtk_list_store_set (GTK_LIST_STORE (model), + &index, VISIBLE_COL, FALSE, -1); + } + + /* Only increment the visits when we add the uri */ + if (!item->title && !item->favicon) + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, + VISIBLE_COL, TRUE, -1); + midori_location_action_set_item (location_action, &iter, item); +} + +/** + * midori_location_entry_append_item: + * @location_entry: a #MidoriLocationEntry + * @item: a MidoriLocationItem + * + * Appends @item if it is not already in the list. + * @item is not added if the maximum is reached. + **/ +static void +midori_location_action_append_item (MidoriLocationAction* location_action, + MidoriLocationEntryItem* item) +{ + GtkTreeModel* model; + GtkTreeIter iter; + gint n; + gint visits = 0; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (item->uri != NULL); + + model = location_action->model; + + if (!midori_location_action_item_iter (location_action, item->uri, &iter)) + { + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + n = gtk_tree_model_iter_n_children (model, NULL); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, + (n <= MAX_ITEMS), -1); + } + else + gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, -1); + midori_location_action_set_item (location_action, &iter, item); +} + void midori_location_action_add_uri (MidoriLocationAction* location_action, const gchar* uri) { - GSList* proxies; - GtkWidget* alignment; - GtkWidget* entry; MidoriLocationEntryItem item; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); @@ -458,23 +1014,10 @@ midori_location_action_add_uri (MidoriLocationAction* location_action, katze_assign (location_action->uri, g_strdup (uri)); - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - - item.favicon = NULL; - item.uri = uri; - item.title = NULL; - midori_location_entry_prepend_item ( - MIDORI_LOCATION_ENTRY (entry), &item); - } - while ((proxies = g_slist_next (proxies))); + item.favicon = NULL; + item.uri = uri; + item.title = NULL; + midori_location_action_prepend_item (location_action, &item); } void @@ -485,8 +1028,8 @@ midori_location_action_add_item (MidoriLocationAction* location_action, { GSList* proxies; GtkWidget* alignment; + GtkWidget* location_entry; GtkWidget* entry; - GtkWidget* child; MidoriLocationEntryItem item; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); @@ -496,25 +1039,25 @@ midori_location_action_add_item (MidoriLocationAction* location_action, katze_assign (location_action->uri, g_strdup (uri)); + item.favicon = icon; + item.uri = uri; + item.title = title; + midori_location_action_append_item (location_action, &item); + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); if (!proxies) return; do - if (GTK_IS_TOOL_ITEM (proxies->data)) + if (GTK_IS_TOOL_ITEM (proxies->data) && + !g_strcmp0 (location_action->uri, uri)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - child = gtk_bin_get_child (GTK_BIN (entry)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); - item.favicon = icon; - item.uri = uri; - item.title = title; - midori_location_entry_append_item ( - MIDORI_LOCATION_ENTRY (entry), &item); - if (!g_strcmp0 (location_action->uri, uri)) - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_PRIMARY, icon); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); } while ((proxies = g_slist_next (proxies))); } @@ -526,33 +1069,33 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, { GSList* proxies; GtkWidget* alignment; + GtkWidget* location_entry; GtkWidget* entry; - GtkWidget* child; MidoriLocationEntryItem item; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); g_return_if_fail (uri != NULL); + item.favicon = icon; + item.uri = uri; + item.title = NULL; + midori_location_action_prepend_item (location_action, &item); + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); if (!proxies) return; do - if (GTK_IS_TOOL_ITEM (proxies->data)) + if (GTK_IS_TOOL_ITEM (proxies->data) && + !g_strcmp0 (location_action->uri, uri)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - child = gtk_bin_get_child (GTK_BIN (entry)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); - item.favicon = icon; - item.uri = uri; - item.title = NULL; - midori_location_entry_prepend_item ( - MIDORI_LOCATION_ENTRY (entry), &item); - if (!g_strcmp0 (location_action->uri, uri)) - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_PRIMARY, icon); + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); } while ((proxies = g_slist_next (proxies))); } @@ -562,32 +1105,16 @@ midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, const gchar* title, const gchar* uri) { - GSList* proxies; - GtkWidget* alignment; - GtkWidget* entry; MidoriLocationEntryItem item; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (title != NULL); g_return_if_fail (uri != NULL); - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - - item.favicon = NULL; - item.uri = uri; - item.title = title; - midori_location_entry_prepend_item ( - MIDORI_LOCATION_ENTRY (entry), &item); - } - while ((proxies = g_slist_next (proxies))); + item.favicon = NULL; + item.uri = uri; + item.title = title; + midori_location_action_prepend_item (location_action, &item); } gdouble @@ -660,31 +1187,35 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action while ((proxies = g_slist_next (proxies))); } +/** + * midori_location_entry_set_item_from_uri: + * @location_entry: a #MidoriLocationEntry + * @uri: a string + * + * Finds the item from the list matching @uri + * and removes it if it is the last instance. + **/ void midori_location_action_delete_item_from_uri (MidoriLocationAction* location_action, const gchar* uri) { - GSList* proxies; - GtkWidget* alignment; - GtkWidget* entry; + GtkTreeModel* model; + GtkTreeIter iter; + gint visits; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) + model = location_action->model; + if (midori_location_action_item_iter (location_action, uri, &iter)) { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - - midori_location_entry_delete_item_from_uri - (MIDORI_LOCATION_ENTRY (entry), uri); + gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); + if (visits > 1) + gtk_list_store_set (GTK_LIST_STORE (model), + &iter, VISITS_COL, --visits, -1); + else + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); } - while ((proxies = g_slist_next (proxies))); } void @@ -706,7 +1237,7 @@ midori_location_action_clear (MidoriLocationAction* location_action) alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); entry = gtk_bin_get_child (GTK_BIN (alignment)); - midori_location_entry_clear (MIDORI_LOCATION_ENTRY (entry)); + gtk_list_store_clear (GTK_LIST_STORE (location_action->filter_model)); } while ((proxies = g_slist_next (proxies))); } diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index 5a8f53de..a95301c9 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -34,6 +34,13 @@ G_BEGIN_DECLS typedef struct _MidoriLocationAction MidoriLocationAction; typedef struct _MidoriLocationActionClass MidoriLocationActionClass; +struct _MidoriLocationEntryItem +{ + GdkPixbuf* favicon; + const gchar* uri; + const gchar* title; +}; + GType midori_location_action_get_type (void); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 6170c8dd..1e9a4766 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -10,15 +10,10 @@ */ #include "midori-locationentry.h" + #include "gtkiconentry.h" #include "sokoke.h" - #include -#include - -#define DEFAULT_ICON GTK_STOCK_FILE -#define MAX_ITEMS 25 -/* #define ORDER_BY_VISITS 1 */ struct _MidoriLocationEntry { @@ -45,108 +40,15 @@ enum N_COLS }; -enum -{ - ACTIVE_CHANGED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - static gboolean entry_key_press_event (GtkWidget* widget, GdkEventKey* event, MidoriLocationEntry* location_entry); -static void -midori_location_entry_changed (GtkComboBox* combo_box, - gpointer user_data); - static void midori_location_entry_class_init (MidoriLocationEntryClass* class) { - signals[ACTIVE_CHANGED] = g_signal_new ("active-changed", - G_TYPE_FROM_CLASS (class), - (GSignalFlags) (G_SIGNAL_RUN_LAST), - 0, - 0, - NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, - G_TYPE_INT); -} -static GtkTreeModel* -midori_location_entry_get_filter_model (MidoriLocationEntry* location_entry) -{ - return gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); -} - -static GtkTreeModel* -midori_location_entry_get_sort_model (MidoriLocationEntry* location_entry) -{ - GtkTreeModel* model; - GtkTreeModelFilter* filter_model; - - model = midori_location_entry_get_filter_model (location_entry); - filter_model = GTK_TREE_MODEL_FILTER (model); - g_assert (filter_model); - - return gtk_tree_model_filter_get_model (filter_model); -} - -static GtkTreeModel* -midori_location_entry_get_model (MidoriLocationEntry* location_entry) -{ - - GtkTreeModel* model; -#ifdef ORDER_BY_VISITS - GtkTreeModelSort* sort_model; -#endif - - model = midori_location_entry_get_sort_model (location_entry); - -#ifdef ORDER_BY_VISITS - sort_model = GTK_TREE_MODEL_SORT (model); - g_assert (sort_model); - - return gtk_tree_model_sort_get_model (sort_model); -#else - return GTK_IS_TREE_MODEL (model) ? model : NULL; -#endif - -} - -static gboolean -midori_location_entry_child_iter_to_iter (MidoriLocationEntry* location_entry, - GtkTreeIter* iter, - GtkTreeIter* child_iter) -{ - GtkTreeModel* filter_model; -#ifdef ORDER_BY_VISITS - GtkTreeModel* sort_model; - GtkTreeIter sort_iter; -#endif - GtkTreeIter* temp_iter; - - temp_iter = child_iter; - - filter_model = midori_location_entry_get_filter_model (location_entry); - -#ifdef ORDER_BY_VISITS - sort_model = midori_location_entry_get_sort_model (location_entry); - - g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (filter_model) && - GTK_IS_TREE_MODEL_SORT (sort_model), FALSE); - - gtk_tree_model_sort_convert_child_iter_to_iter - (GTK_TREE_MODEL_SORT (sort_model), &sort_iter, child_iter); - - temp_iter = &sort_iter; -#endif - - return gtk_tree_model_filter_convert_child_iter_to_iter - (GTK_TREE_MODEL_FILTER (filter_model), iter, temp_iter); } #define HAVE_ENTRY_PROGRESS 1 @@ -456,14 +358,6 @@ entry_expose_event (GtkWidget* entry, #endif -gdouble -midori_location_entry_get_progress (MidoriLocationEntry* location_entry) -{ - g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), 0.0); - - return location_entry->progress; -} - void midori_location_entry_set_progress (MidoriLocationEntry* location_entry, gdouble progress) @@ -483,188 +377,12 @@ midori_location_entry_set_progress (MidoriLocationEntry* location_entry, #endif } -static gboolean -midori_location_entry_completion_selected (GtkEntryCompletion* completion, - GtkTreeModel* model, - GtkTreeIter* iter, - MidoriLocationEntry* location_entry) -{ - gchar* uri; - - gtk_tree_model_get (model, iter, URI_COL, &uri, -1); - midori_location_entry_set_item_from_uri (location_entry, uri); - g_free (uri); - - return FALSE; -} - -static void -midori_location_entry_render_pixbuf_cb (GtkCellLayout* layout, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - gpointer data) -{ - GdkPixbuf* pixbuf; - - gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); - if (pixbuf) - { - g_object_set (renderer, "pixbuf", pixbuf, "yalign", 0.25, NULL); - g_object_unref (pixbuf); - } -} - -static void -midori_location_entry_render_text_cb (GtkCellLayout* layout, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - gpointer data) -{ - gchar* uri; - gchar* title; - gchar* desc; - gchar* desc_uri; - gchar* desc_title; - GtkWidget* entry; - gchar* key; - gchar* temp; - gchar** parts; - - gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); - - desc_uri = desc_title = key = NULL; - if (data) - { - entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (data)); - key = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); - } - if (data && uri) - { - temp = g_utf8_strdown (uri, -1); - parts = g_strsplit (temp, key, 2); - g_free (temp); - if (parts && parts[0] && parts[1]) - desc_uri = g_markup_printf_escaped ("%s%s%s", - parts[0], key, parts[1]); - g_strfreev (parts); - } - if (uri && !desc_uri) - desc_uri = g_markup_escape_text (uri, -1); - if (data && title) - { - temp = g_utf8_strdown (title, -1); - parts = g_strsplit (temp, key, 2); - g_free (temp); - if (parts && parts[0] && parts[1]) - desc_title = g_markup_printf_escaped ("%s%s%s", - parts[0], key, parts[1]); - g_strfreev (parts); - } - if (title && !desc_title) - desc_title = g_markup_escape_text (title, -1); - - if (desc_title) - desc = g_strdup_printf ("%s\n%s", - desc_title, desc_uri); - else - desc = g_strdup_printf ("%s", desc_uri); - - g_object_set (renderer, "markup", desc, - "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - - g_free (uri); - g_free (title); - g_free (key); - g_free (desc); - g_free (desc_uri); - g_free (desc_title); -} - -static gboolean -midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, - const gchar* key, - GtkTreeIter* iter, - gpointer data) -{ - GtkTreeModel* model; - gchar* uri; - gchar* title; - gboolean match; - gchar* temp; - - model = gtk_entry_completion_get_model (completion); - gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); - - match = FALSE; - if (uri) - { - temp = g_utf8_casefold (uri, -1); - match = (strstr (temp, key) != NULL); - g_free (temp); - g_free (uri); - - if (!match && title) - { - temp = g_utf8_casefold (title, -1); - match = (strstr (temp, key) != NULL); - g_free (temp); - g_free (title); - } - } - - return match; -} - -static void -midori_location_entry_completion_init (MidoriLocationEntry* location_entry) -{ - GtkWidget* entry; - GtkEntryCompletion* completion; - GtkCellRenderer* renderer; - - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - completion = gtk_entry_completion_new (); - - gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), - midori_location_entry_get_sort_model (location_entry)); - gtk_entry_completion_set_text_column (GTK_ENTRY_COMPLETION (completion), - URI_COL); - gtk_cell_layout_clear (GTK_CELL_LAYOUT (completion)); - - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, FALSE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, - midori_location_entry_render_pixbuf_cb, - NULL, NULL); - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), renderer, TRUE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), renderer, - midori_location_entry_render_text_cb, - completion, NULL); - gtk_entry_completion_set_match_func (completion, - midori_location_entry_completion_match_cb, NULL, NULL); - - gtk_entry_set_completion (GTK_ENTRY (entry), completion); - g_signal_connect (completion, "match-selected", - G_CALLBACK (midori_location_entry_completion_selected), location_entry); - - g_object_unref (completion); -} - static void midori_location_entry_init (MidoriLocationEntry* location_entry) { GtkWidget* entry; - GtkListStore* store; - GtkCellRenderer* renderer; - GtkTreeModel* filter_model; -#ifdef ORDER_BY_VISITS - GtkTreeModel* sort_model; -#endif - /* we want the widget to have appears-as-list applied */ + /* We want the widget to have appears-as-list applied */ gtk_rc_parse_string ("style \"midori-location-entry-style\" {\n" " GtkComboBox::appears-as-list = 1\n }\n" "widget_class \"*MidoriLocationEntry\" " @@ -674,57 +392,17 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, TRUE); g_signal_connect_after (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); #ifdef HAVE_ENTRY_PROGRESS g_signal_connect_after (entry, "expose-event", G_CALLBACK (entry_expose_event), location_entry); #endif - gtk_widget_show (entry); gtk_container_add (GTK_CONTAINER (location_entry), entry); - - store = gtk_list_store_new (N_COLS, - GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INT, G_TYPE_BOOLEAN); - -#ifdef ORDER_BY_VISITS - sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store)); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), - VISITS_COL, GTK_SORT_DESCENDING); - filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (sort_model), NULL); -#else - filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); -#endif - - gtk_tree_model_filter_set_visible_column ( - GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); - g_object_set (location_entry, "model", filter_model, NULL); - g_object_unref (store); - - gtk_combo_box_entry_set_text_column ( - GTK_COMBO_BOX_ENTRY (location_entry), URI_COL); - gtk_cell_layout_clear (GTK_CELL_LAYOUT (location_entry)); - - /* setup the renderer for the favicon */ - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), - renderer, FALSE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), - renderer, midori_location_entry_render_pixbuf_cb, NULL, NULL); - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (location_entry), - renderer, TRUE); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (location_entry), - renderer, midori_location_entry_render_text_cb, NULL, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (location_entry), -1); - - midori_location_entry_completion_init (location_entry); - - g_signal_connect (location_entry, "changed", - G_CALLBACK (midori_location_entry_changed), NULL); } static gboolean @@ -746,101 +424,6 @@ entry_key_press_event (GtkWidget* widget, return FALSE; } -static void -midori_location_entry_changed (GtkComboBox* combo_box, - gpointer user_data) -{ - GtkTreeIter iter; - GtkIconEntry* entry; - GtkTreeModel* model; - GdkPixbuf* pixbuf; - - if (gtk_combo_box_get_active_iter (combo_box, &iter)) - { - entry = GTK_ICON_ENTRY (GTK_BIN (combo_box)->child); - - if (entry) - { - pixbuf = NULL; - - model = midori_location_entry_get_filter_model - (MIDORI_LOCATION_ENTRY (combo_box)); - gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, -1); - - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, pixbuf); - g_object_unref (pixbuf); - - g_signal_emit (MIDORI_LOCATION_ENTRY (combo_box), - signals[ACTIVE_CHANGED], 0, gtk_combo_box_get_active (combo_box)); - } - } -} - -static void -midori_location_entry_set_item (MidoriLocationEntry* entry, - GtkTreeIter* iter, - MidoriLocationEntryItem* item) -{ - GtkTreeModel* model; - GdkPixbuf* icon; - GdkPixbuf* new_icon; - - model = midori_location_entry_get_model (entry); - gtk_list_store_set (GTK_LIST_STORE (model), iter, - URI_COL, item->uri, TITLE_COL, item->title, -1); - - gtk_tree_model_get (model, iter, FAVICON_COL, &icon, -1); - if (item->favicon) - new_icon = g_object_ref (item->favicon); - else if (!icon && !item->favicon) - new_icon = gtk_widget_render_icon (GTK_WIDGET (entry), DEFAULT_ICON, - GTK_ICON_SIZE_MENU, NULL); - else - new_icon = NULL; - if (new_icon) - { - gtk_list_store_set (GTK_LIST_STORE (model), iter, - FAVICON_COL, new_icon, -1); - g_object_unref (new_icon); - } -} - -static void -midori_location_entry_set_active_iter (MidoriLocationEntry* location_entry, - GtkTreeIter* iter) -{ - GdkPixbuf* pixbuf; - GtkTreeModel* model; - GtkWidget* entry; - GtkTreeIter parent_iter; - - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - model = midori_location_entry_get_model (location_entry); - - /* The filter iter must be set, not the child iter, - * but the row must first be set as visible to - * convert to a filter iter without error. - */ - gtk_list_store_set (GTK_LIST_STORE (model), iter, VISIBLE_COL, TRUE, -1); - if (midori_location_entry_child_iter_to_iter ( - location_entry, &parent_iter, iter)) - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), &parent_iter); - - /* When setting the active iter (when adding or setting an item) - * the favicon may have changed, so we must update the entry favicon. - */ - if (entry) - { - gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); - - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, pixbuf); - - g_object_unref (pixbuf); - } -} - /** * midori_location_entry_new: * @@ -853,279 +436,3 @@ midori_location_entry_new (void) { return g_object_new (MIDORI_TYPE_LOCATION_ENTRY, NULL); } - -/** - * midori_location_entry_item_iter: - * @location_entry: a #MidoriLocationEntry - * @uri: a string - * @iter: a GtkTreeIter - * - * Retrieves the iter of the item matching @uri. - * - * Return value: %TRUE if @uri was found, %FALSE otherwise - **/ -gboolean -midori_location_entry_item_iter (MidoriLocationEntry* location_entry, - const gchar* uri, - GtkTreeIter* iter) -{ - GtkTreeModel* model; - gchar* tmpuri; - gboolean found; - - g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), FALSE); - g_return_val_if_fail (uri != NULL, FALSE); - - found = FALSE; - model = midori_location_entry_get_model (location_entry); - if (gtk_tree_model_get_iter_first (model, iter)) - { - tmpuri = NULL; - do - { - gtk_tree_model_get (model, iter, URI_COL, &tmpuri, -1); - found = !g_ascii_strcasecmp (uri, tmpuri); - katze_assign (tmpuri, NULL); - - if (found) - break; - } - while (gtk_tree_model_iter_next (model, iter)); - } - return found; -} - -/** - * midori_location_entry_get_text: - * @location_entry: a #MidoriLocationEntry - * - * Retrieves the text of the embedded entry. - * - * Return value: a string - **/ -const gchar* -midori_location_entry_get_text (MidoriLocationEntry* location_entry) -{ - GtkWidget* entry; - - g_return_val_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry), NULL); - - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); - - return gtk_entry_get_text (GTK_ENTRY (entry)); -} - -/** - * midori_location_entry_set_text: - * @location_entry: a #MidoriLocationEntry - * @text: a string - * - * Sets the entry text to @text and, if applicable, updates the icon. - **/ -void -midori_location_entry_set_text (MidoriLocationEntry* location_entry, - const gchar* text) -{ - GtkWidget* entry; - GtkTreeIter iter; - GtkTreeModel* model; - GdkPixbuf* icon; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - g_return_if_fail (GTK_IS_ENTRY (entry)); - - gtk_entry_set_text (GTK_ENTRY (entry), text); - if (midori_location_entry_item_iter (location_entry, text, &iter)) - { - model = midori_location_entry_get_model (location_entry); - gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - } - /* FIXME: Due to a bug in GtkIconEntry we can't reset the icon - else - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON);*/ -} - -/** - * midori_location_entry_reset: - * @location_entry: a #MidoriLocationEntry - * - * Clears the entry text and resets the entry favicon. - **/ -void -midori_location_entry_reset (MidoriLocationEntry* location_entry) -{ - GtkWidget* entry; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - g_return_if_fail (GTK_IS_ICON_ENTRY (entry)); - - gtk_entry_set_text (GTK_ENTRY (entry), ""); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, DEFAULT_ICON); -} - -/** - * midori_location_entry_clear: - * @location_entry: a #MidoriLocationEntry - * - * Removes all items from @location_entry - **/ -void -midori_location_entry_clear (MidoriLocationEntry* location_entry) -{ - GtkTreeModel* model; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - - model = midori_location_entry_get_model (location_entry); - gtk_list_store_clear (GTK_LIST_STORE (model)); -} - -/** - * midori_location_entry_set_item_from_uri: - * @location_entry: a #MidoriLocationEntry - * @uri: a string - * - * Finds the item from the list matching @uri and sets it as the active item. - * If @uri is not found it clears the active item. - **/ -void -midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, - const gchar* uri) -{ - GtkTreeIter iter; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - - if (midori_location_entry_item_iter (location_entry, uri, &iter)) - midori_location_entry_set_active_iter (location_entry, &iter); - else - midori_location_entry_reset (location_entry); - -} - -/** - * midori_location_entry_prepend_item: - * @location_entry: a #MidoriLocationEntry - * @item: a MidoriLocationItem - * - * Prepends @item if it is not already in the list. - * If the item already exists, it is moved before the first item. - * If the maximum is reached, the last item is removed. - **/ -void -midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item) -{ - GtkTreeModel* filter_model; - GtkTreeModel* model; - GtkTreeIter iter; - GtkTreeIter index; - gint n; - gint visits = 0; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - g_return_if_fail (item->uri != NULL); - - filter_model = midori_location_entry_get_filter_model (location_entry); - model = midori_location_entry_get_model (location_entry); - - if (midori_location_entry_item_iter (location_entry, item->uri, &iter)) - { - gtk_tree_model_get_iter_first (model, &index); - gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); - gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); - } - else - gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); - - n = gtk_tree_model_iter_n_children (filter_model, NULL); - if (n > MAX_ITEMS) - { - gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); - gtk_list_store_set (GTK_LIST_STORE (model), - &index, VISIBLE_COL, FALSE, -1); - } - - /* Only increment the visits when we add the uri */ - if (!item->title && !item->favicon) - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, - VISIBLE_COL, TRUE, -1); - midori_location_entry_set_item (location_entry, &iter, item); -} - -/** - * midori_location_entry_append_item: - * @location_entry: a #MidoriLocationEntry - * @item: a MidoriLocationItem - * - * Appends @item if it is not already in the list. - * @item is not added if the maximum is reached. - **/ -void -midori_location_entry_append_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item) -{ - GtkTreeModel* model; - GtkTreeIter iter; - gint n; - gint visits = 0; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - g_return_if_fail (item->uri != NULL); - - model = midori_location_entry_get_model (location_entry); - - if (!midori_location_entry_item_iter (location_entry, item->uri, &iter)) - { - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - - n = gtk_tree_model_iter_n_children (model, NULL); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, - (n <= MAX_ITEMS), -1); - } - else - gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); - - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, -1); - midori_location_entry_set_item (location_entry, &iter, item); -} - -/** - * midori_location_entry_set_item_from_uri: - * @location_entry: a #MidoriLocationEntry - * @uri: a string - * - * Finds the item from the list matching @uri - * and removes it if it is the last instance. - **/ -void -midori_location_entry_delete_item_from_uri (MidoriLocationEntry* location_entry, - const gchar* uri) -{ - GtkTreeModel* model; - GtkTreeIter iter; - gint visits = 0; - - g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); - - model = midori_location_entry_get_model (location_entry); - if (midori_location_entry_item_iter (location_entry, uri, &iter)) - { - gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); - if (visits > 1) - gtk_list_store_set (GTK_LIST_STORE (model), - &iter, VISITS_COL, --visits, -1); - else - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); - } -} - diff --git a/midori/midori-locationentry.h b/midori/midori-locationentry.h index 6be5ed69..f84d0b29 100644 --- a/midori/midori-locationentry.h +++ b/midori/midori-locationentry.h @@ -27,56 +27,12 @@ typedef struct _MidoriLocationEntry MidoriLocationEntry; typedef struct _MidoriLocationEntryClass MidoriLocationEntryClass; typedef struct _MidoriLocationEntryItem MidoriLocationEntryItem; -struct _MidoriLocationEntryItem -{ - GdkPixbuf* favicon; - const gchar* uri; - const gchar* title; -}; - GType midori_location_entry_get_type (void); GtkWidget* midori_location_entry_new (void); -gboolean -midori_location_entry_item_iter (MidoriLocationEntry* location_entry, - const gchar* uri, - GtkTreeIter* iter); - -const gchar* -midori_location_entry_get_text (MidoriLocationEntry* location_entry); - -void -midori_location_entry_set_text (MidoriLocationEntry* location_entry, - const gchar* text); - -void -midori_location_entry_reset (MidoriLocationEntry* location_entry); - -void -midori_location_entry_clear (MidoriLocationEntry* location_entry); - -void -midori_location_entry_set_item_from_uri (MidoriLocationEntry* location_entry, - const gchar* uri); - -void -midori_location_entry_prepend_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item); - -void -midori_location_entry_append_item (MidoriLocationEntry* location_entry, - MidoriLocationEntryItem* item); - -void -midori_location_entry_delete_item_from_uri (MidoriLocationEntry* location_entry, - const gchar* uri); - -gdouble -midori_location_entry_get_progress (MidoriLocationEntry* location_entry); - void midori_location_entry_set_progress (MidoriLocationEntry* location_entry, gdouble progress); From 9e79f6ba146e89b9d675342522311719cd133198 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 9 Nov 2008 19:26:48 +0100 Subject: [PATCH 0467/2970] Move around history loading in MidoriBrowser --- midori/midori-browser.c | 320 ++++++++++++++++++++-------------------- 1 file changed, 161 insertions(+), 159 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 22278632..07560318 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1115,7 +1115,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "History", "The list of history items", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + flags)); } static void @@ -3431,6 +3431,162 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser); +static void +_tree_store_insert_history_item (GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeItem* item) +{ + GtkTreeIter iter; + KatzeItem* child; + guint i, n; + GtkTreeIter* piter; + time_t now; + gint64 date; + gint age = -1; + + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + piter = parent; + if ((date = katze_item_get_added (item))) + { + now = time (NULL); + age = sokoke_days_between (&date, &now); + gtk_tree_store_insert_with_values (treestore, &iter, parent, + 0, 0, item, 1, age, -1); + g_object_unref (item); + piter = &iter; + } + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), i); + _tree_store_insert_history_item (treestore, piter, child); + } + } + else + { + gtk_tree_store_insert_with_values (treestore, &iter, parent, + 0, 0, item, 1, age, -1); + g_object_unref (item); + } +} + +static void +midori_browser_new_history_item (MidoriBrowser* browser, + KatzeItem* item) +{ + GtkTreeView* treeview; + GtkTreeModel* treemodel; + GtkTreeIter iter; + KatzeArray* parent; + gint i; + gboolean found; + time_t now; + gint64 date; + time_t date_; + gint age; + gint newage; + + if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + return; + + treeview = GTK_TREE_VIEW (browser->panel_history); + treemodel = gtk_tree_view_get_model (treeview); + + now = time (NULL); + katze_item_set_added (item, now); + + found = FALSE; + i = 0; + while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) + { + gtk_tree_model_get (treemodel, &iter, 0, &parent, 1, &age, -1); + date = katze_item_get_added (KATZE_ITEM (parent)); + date_ = (time_t)date; + newage = sokoke_days_between (&date, &now); + if (newage == 0) + { + found = TRUE; + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), + &iter, item); + katze_array_add_item (parent, item); + } + if (age != newage) + gtk_tree_store_set (GTK_TREE_STORE (treemodel), + &iter, 1, newage, -1); + g_object_unref (parent); + } + if (!found) + { + parent = katze_array_new (KATZE_TYPE_ARRAY); + katze_item_set_added (KATZE_ITEM (parent), now); + katze_array_add_item (browser->history, parent); + katze_array_add_item (parent, item); + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, + KATZE_ITEM (parent)); + } +} + +static void +_location_action_insert_history_item (MidoriLocationAction* action, + MidoriBrowser* browser, + KatzeItem* item) +{ + KatzeItem* child; + guint i, n; + const gchar* uri; + GdkPixbuf* pixbuf = NULL; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (action)); + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = n; i > 0; i--) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), i - 1); + _location_action_insert_history_item (action, browser, child); + } + } + else + { + uri = katze_item_get_uri (item); + pixbuf = katze_net_load_icon (browser->net, katze_item_get_uri (item), + NULL, GTK_WIDGET (browser), NULL); + midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); + } +} + +static void +midori_browser_load_history (MidoriBrowser* browser) +{ + GtkTreeView* treeview; + GtkTreeModel* treemodel; + GtkAction* action; + + /* FIXME: Clear current items */ + + g_object_set (_action_by_name (browser, "RecentlyVisited"), + "array", browser->history, NULL); + + if (!browser->history) + return; + + treeview = GTK_TREE_VIEW (browser->panel_history); + treemodel = gtk_tree_view_get_model (treeview); + + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), + NULL, KATZE_ITEM (browser->history)); + + action = _action_by_name (browser, "Location"); + _location_action_insert_history_item (MIDORI_LOCATION_ACTION (action), + browser, + KATZE_ITEM (browser->history)); +} + static void midori_browser_init (MidoriBrowser* browser) { @@ -3462,7 +3618,6 @@ midori_browser_init (MidoriBrowser* browser) browser->bookmarks = NULL; browser->trash = NULL; browser->search_engines = NULL; - browser->history = NULL; /* Setup the window metrics */ g_signal_connect (browser, "realize", @@ -4287,157 +4442,6 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) _action_set_sensitive (browser, "BookmarkAdd", TRUE); } -static void -_tree_store_insert_history_item (GtkTreeStore* treestore, - GtkTreeIter* parent, - KatzeItem* item) -{ - GtkTreeIter iter; - KatzeItem* child; - guint i, n; - GtkTreeIter* piter; - time_t now; - gint64 date; - gint age = -1; - - g_return_if_fail (KATZE_IS_ITEM (item)); - - if (KATZE_IS_ARRAY (item)) - { - piter = parent; - if ((date = katze_item_get_added (item))) - { - now = time (NULL); - age = sokoke_days_between (&date, &now); - gtk_tree_store_insert_with_values (treestore, &iter, parent, - 0, 0, item, 1, age, -1); - g_object_unref (item); - piter = &iter; - } - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), i); - _tree_store_insert_history_item (treestore, piter, child); - } - } - else - { - gtk_tree_store_insert_with_values (treestore, &iter, parent, - 0, 0, item, 1, age, -1); - g_object_unref (item); - } -} - -static void -midori_browser_new_history_item (MidoriBrowser* browser, - KatzeItem* item) -{ - GtkTreeView* treeview; - GtkTreeModel* treemodel; - GtkTreeIter iter; - KatzeArray* parent; - gint i; - gboolean found; - time_t now; - gint64 date; - time_t date_; - gint age; - gint newage; - - if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) - return; - - treeview = GTK_TREE_VIEW (browser->panel_history); - treemodel = gtk_tree_view_get_model (treeview); - - now = time (NULL); - katze_item_set_added (item, now); - - found = FALSE; - i = 0; - while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) - { - gtk_tree_model_get (treemodel, &iter, 0, &parent, 1, &age, -1); - date = katze_item_get_added (KATZE_ITEM (parent)); - date_ = (time_t)date; - newage = sokoke_days_between (&date, &now); - if (newage == 0) - { - found = TRUE; - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), - &iter, item); - katze_array_add_item (parent, item); - } - if (age != newage) - gtk_tree_store_set (GTK_TREE_STORE (treemodel), - &iter, 1, newage, -1); - g_object_unref (parent); - } - if (!found) - { - parent = katze_array_new (KATZE_TYPE_ARRAY); - katze_item_set_added (KATZE_ITEM (parent), now); - katze_array_add_item (browser->history, parent); - katze_array_add_item (parent, item); - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, - KATZE_ITEM (parent)); - } -} - -static void -_location_action_insert_history_item (MidoriLocationAction* action, - MidoriBrowser* browser, - KatzeItem* item) -{ - KatzeItem* child; - guint i, n; - const gchar* uri; - GdkPixbuf* pixbuf = NULL; - - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (action)); - g_return_if_fail (KATZE_IS_ITEM (item)); - - if (KATZE_IS_ARRAY (item)) - { - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = n; i > 0; i--) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), i - 1); - _location_action_insert_history_item (action, browser, child); - } - } - else - { - uri = katze_item_get_uri (item); - pixbuf = katze_net_load_icon (browser->net, katze_item_get_uri (item), - NULL, GTK_WIDGET (browser), NULL); - midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); - } -} - -static void -midori_browser_load_history (MidoriBrowser* browser) -{ - GtkTreeView* treeview; - GtkTreeModel* treemodel; - GtkAction* action; - - if (!browser->history) - return; - - treeview = GTK_TREE_VIEW (browser->panel_history); - treemodel = gtk_tree_view_get_model (treeview); - - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), - NULL, KATZE_ITEM (browser->history)); - - action = _action_by_name (browser, "Location"); - _location_action_insert_history_item (MIDORI_LOCATION_ACTION (action), - browser, - KATZE_ITEM (browser->history)); -} - static void midori_browser_set_property (GObject* object, guint prop_id, @@ -4472,7 +4476,7 @@ midori_browser_set_property (GObject* object, (GtkCallback) midori_view_set_settings, browser->settings); break; case PROP_BOOKMARKS: - ; /* FIXME: Disconnect handlers */ + /* FIXME: Disconnect handlers */ katze_object_assign (browser->bookmarks, g_value_dup_object (value)); g_object_set (_action_by_name (browser, "Bookmarks"), "array", browser->bookmarks, NULL); @@ -4480,7 +4484,7 @@ midori_browser_set_property (GObject* object, /* FIXME: Connect to updates */ break; case PROP_TRASH: - ; /* FIXME: Disconnect handlers */ + /* FIXME: Disconnect handlers */ katze_object_assign (browser->trash, g_value_dup_object (value)); g_object_set (_action_by_name (browser, "Trash"), "array", browser->trash, NULL); @@ -4488,7 +4492,7 @@ midori_browser_set_property (GObject* object, _midori_browser_update_actions (browser); break; case PROP_SEARCH_ENGINES: - ; /* FIXME: Disconnect handlers */ + /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_dup_object (value)); midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), browser->search_engines); @@ -4504,11 +4508,9 @@ midori_browser_set_property (GObject* object, } break; case PROP_HISTORY: - ; /* FIXME: Disconnect handlers */ + /* FIXME: Disconnect handlers */ katze_object_assign (browser->history, g_value_dup_object (value)); midori_browser_load_history (browser); - g_object_set (_action_by_name (browser, "RecentlyVisited"), "array", - browser->history, NULL); /* FIXME: Connect to updates */ break; default: From 7c63a0b4801bb998e24586d291fa3ebb030531a8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 9 Nov 2008 19:51:12 +0100 Subject: [PATCH 0468/2970] Make Open selected URL in New Tab work again --- midori/midori-view.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index a9d9ac0e..7738f618 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -768,7 +768,11 @@ static void midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, MidoriView* view) { - g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri, + gchar* uri = view->link_uri; + + if (!uri) + uri = (gchar*)g_object_get_data (G_OBJECT (widget), "uri"); + g_signal_emit (view, signals[NEW_TAB], 0, uri, view->open_tabs_in_the_background); } From 38c6ad5dadbff5af0df7b03c6489a1510663468e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 9 Nov 2008 22:07:42 +0100 Subject: [PATCH 0469/2970] Implement Save As for arbitrary links --- midori/midori-browser.c | 186 ++++++++++++++++++++++------------------ midori/midori-view.c | 31 ++++++- 2 files changed, 130 insertions(+), 87 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 07560318..7a4bc986 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -218,7 +218,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_view_can_go_forward (MIDORI_VIEW (view))); /* Currently views that don't support source, don't support - saving either. If that changes, we need to thinkof something. */ + saving either. If that changes, we need to think of something. */ _action_set_sensitive (browser, "SaveAs", midori_view_can_view_source (MIDORI_VIEW (view))); _action_set_sensitive (browser, "Print", @@ -630,6 +630,103 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem, midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); } +static void +midori_browser_save_transfer_cb (KatzeNetRequest* request, + gchar* filename) +{ + FILE* fp; + + if (request->data) + { + /* FIXME: Show an error message if the file cannot be saved */ + if ((fp = fopen (filename, "wb"))) + { + fwrite (request->data, 1, request->length, fp); + fclose (fp); + } + } + g_free (filename); +} + +static void +midori_browser_save_uri (MidoriBrowser* browser, + const gchar* uri) +{ + static gchar* last_dir = NULL; + gboolean folder_set = FALSE; + GtkWidget* dialog; + gchar* filename; + gchar* dirname; + gchar* last_slash; + gchar* folder; + + dialog = gtk_file_chooser_dialog_new ( + _("Save file as"), GTK_WINDOW (browser), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_SAVE); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); + + if (uri) + { + /* Base the start folder on the current view's uri if it is local */ + filename = g_filename_from_uri (uri, NULL, NULL); + if (filename) + { + dirname = g_path_get_dirname (filename); + if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) + { + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); + folder_set = TRUE; + } + + g_free (dirname); + g_free (filename); + } + + /* Try to provide a good default filename */ + filename = g_filename_from_uri (uri, NULL, NULL); + if (!filename && (last_slash = g_strrstr (uri, "/"))) + { + if (last_slash[0] == '/') + last_slash++; + filename = g_strdup (last_slash); + } + else + filename = g_strdup (uri); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); + g_free (filename); + } + + if (!folder_set && last_dir && *last_dir) + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); + katze_net_load_uri (browser->net, uri, NULL, + (KatzeNetTransferCb)midori_browser_save_transfer_cb, filename); + + g_free (last_dir); + last_dir = folder; + } + gtk_widget_destroy (dialog); +} + +static void +midori_view_save_as_cb (GtkWidget* menuitem, + const gchar* uri, + GtkWidget* view) +{ + MidoriBrowser* browser; + + browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); + midori_browser_save_uri (browser, uri); +} + static gboolean midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, GdkEventCrossing* event, @@ -798,6 +895,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_search_text_cb, browser, "signal::add-bookmark", midori_view_add_bookmark_cb, browser, + "signal::save-as", + midori_view_save_as_cb, browser, NULL); g_signal_connect (view, "leave-notify-event", @@ -1187,94 +1286,11 @@ _action_open_activate (GtkAction* action, gtk_widget_destroy (dialog); } -static void -midori_browser_save_transfer_cb (KatzeNetRequest* request, - gchar* filename) -{ - FILE* fp; - - if (request->data) - { - /* FIXME: Show an error message if the file cannot be saved */ - if ((fp = fopen (filename, "wb"))) - { - fwrite (request->data, 1, request->length, fp); - fclose (fp); - } - } - g_free (filename); -} - static void _action_save_as_activate (GtkAction* action, MidoriBrowser* browser) { - static gchar* last_dir = NULL; - gchar* uri = NULL; - gboolean folder_set = FALSE; - GtkWidget* dialog; - GtkWidget* view; - gchar* filename; - gchar* dirname; - gchar* last_slash; - gchar* folder; - - dialog = gtk_file_chooser_dialog_new ( - _("Save file as"), GTK_WINDOW (browser), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_SAVE); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); - - view = midori_browser_get_current_tab (browser); - if ((uri = (gchar*)midori_view_get_display_uri (MIDORI_VIEW (view)))) - { - /* Base the start folder on the current view's uri if it is local */ - filename = g_filename_from_uri (uri, NULL, NULL); - if (filename) - { - dirname = g_path_get_dirname (filename); - if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) - { - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); - folder_set = TRUE; - } - - g_free (dirname); - g_free (filename); - } - - /* Try to provide a good default filename */ - filename = g_filename_from_uri (uri, NULL, NULL); - if (!filename && (last_slash = g_strrstr (uri, "/"))) - { - if (last_slash[0] == '/') - last_slash++; - filename = g_strdup (last_slash); - } - else - filename = g_strdup (uri); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); - g_free (filename); - } - - if (!folder_set && last_dir && *last_dir) - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); - katze_net_load_uri (browser->net, uri, NULL, - (KatzeNetTransferCb)midori_browser_save_transfer_cb, filename); - - g_free (last_dir); - last_dir = folder; - g_free (uri); - } - gtk_widget_destroy (dialog); + midori_browser_save_uri (browser, midori_browser_get_current_uri (browser)); } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index 7738f618..92c6af8c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -112,6 +112,7 @@ enum { NEW_WINDOW, SEARCH_TEXT, ADD_BOOKMARK, + SAVE_AS, LAST_SIGNAL }; @@ -350,6 +351,17 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + signals[SAVE_AS] = g_signal_new ( + "save-as", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_view_finalize; gobject_class->set_property = midori_view_set_property; @@ -783,6 +795,13 @@ midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, g_signal_emit (view, signals[NEW_WINDOW], 0, view->link_uri); } +static void +midori_web_view_menu_save_as_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + g_signal_emit (view, signals[SAVE_AS], 0, view->link_uri); +} + static void midori_web_view_menu_download_activate_cb (GtkWidget* widget, MidoriView* view) @@ -859,6 +878,12 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, /* hack to disable non-functional Download File FIXME: Make sure this really is the right menu item */ gtk_widget_hide (menuitem); + menuitem = gtk_image_menu_item_new_with_mnemonic ( + _("_Save Link destination")); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 3); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_save_as_activate_cb), view); + gtk_widget_show (menuitem); if (view->download_manager && *view->download_manager) { menuitem = gtk_image_menu_item_new_with_mnemonic ( @@ -923,8 +948,10 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - /* FIXME: Make this sensitive once it's implemented */ - gtk_widget_set_sensitive (menuitem, FALSE); + /* Currently views that don't support source, don't support + saving either. If that changes, we need to think of something. */ + if (!midori_view_can_view_source (view)) + gtk_widget_set_sensitive (menuitem, FALSE); menuitem = gtk_image_menu_item_new_with_mnemonic (_("View _Source")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "SourceView"); From 0bfb12f0b174e90c9317024741b34beb39c94294 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 01:08:38 +0100 Subject: [PATCH 0470/2970] Faciliate translation workflow, look at TRANSLATE for details Also three strings are marked untranslatable since they never appear in the user interface and 'Unhandled settings value' is reworded to 'Invalid configuration value'. --- TRANSLATE | 11 ++++++++--- midori/main.c | 18 +++++++++--------- midori/midori-view.c | 6 +++--- po/wscript_build | 34 ---------------------------------- wscript | 42 +++++++++++++++++++++++++++++------------- 5 files changed, 49 insertions(+), 62 deletions(-) delete mode 100644 po/wscript_build diff --git a/TRANSLATE b/TRANSLATE index 3c151c52..23a2eb27 100644 --- a/TRANSLATE +++ b/TRANSLATE @@ -4,13 +4,18 @@ This file is licensed under the terms of the expat license, see the file EXPAT. If you want to translate Midori, you need a few preparations. -First enable localization file updates when building: +First create/ update the localization template: -./waf configure --enable-update-po && ./waf build +./waf build --update-po + +Running this command again will also update all translations +as needed, according to changes in the template. If you want to add a new language 'aa', create it like this: -msginit -l aa_CC -o aa.po -i midori.pot && sed -i 's/PACKAGE/midori/g' aa.po +cd po +msginit -l aa_CC -o aa.po -i midori.pot +sed -i 's/PACKAGE/midori/g' aa.po To check your language 'aa' for errors, do this: diff --git a/midori/main.c b/midori/main.c index 65c0ba04..7ff82237 100644 --- a/midori/main.c +++ b/midori/main.c @@ -57,6 +57,10 @@ stock_items_init (void) guint keyval; gchar* fallback; } FatStockItem; + GtkIconSource* icon_source; + GtkIconSet* icon_set; + GtkIconFactory* factory = gtk_icon_factory_new (); + gsize i; static FatStockItem items[] = { @@ -82,12 +86,7 @@ stock_items_init (void) { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, }; - GtkIconSource* icon_source; - GtkIconSet* icon_set; - GtkIconFactory* factory = gtk_icon_factory_new (); - guint i; - - for (i = 0; i < (guint)G_N_ELEMENTS (items); i++) + for (i = 0; i < G_N_ELEMENTS (items); i++) { icon_set = gtk_icon_set_new (); icon_source = gtk_icon_source_new (); @@ -191,7 +190,7 @@ settings_new_from_file (const gchar* filename) g_type_class_unref (enum_class); } else - g_warning (_("Unhandled settings value '%s'"), property); + g_warning (_("Invalid configuration value '%s'"), property); } return settings; } @@ -208,6 +207,7 @@ settings_save_to_file (MidoriWebSettings* settings, GParamSpec* pspec; GType type; const gchar* property; + gboolean saved; key_file = g_key_file_new (); class = G_OBJECT_GET_CLASS (settings); @@ -260,9 +260,9 @@ settings_save_to_file (MidoriWebSettings* settings, enum_value->value_name); } else - g_warning (_("Unhandled settings value '%s'"), property); + g_warning (_("Invalid configuration value '%s'"), property); } - gboolean saved = sokoke_key_file_save_to_file (key_file, filename, error); + saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); return saved; } diff --git a/midori/midori-view.c b/midori/midori-view.c index 92c6af8c..f664d7b0 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -79,9 +79,9 @@ midori_load_status_get_type (void) if (type) return type; static const GEnumValue values[] = { - { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", N_("Load Provisional") }, - { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", N_("Load Committed") }, - { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", N_("Load Finished") }, + { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", "Load Provisional" }, + { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", "Load Committed" }, + { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", "Load Finished" }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriLoadStatus", values); diff --git a/po/wscript_build b/po/wscript_build deleted file mode 100644 index 28cda9f1..00000000 --- a/po/wscript_build +++ /dev/null @@ -1,34 +0,0 @@ -#! /usr/bin/env python -# WAF build script for midori -# This file is licensed under the terms of the expat license, see the file EXPAT. - -import Params -import pproc as subprocess -import os - -APPNAME = 'midori' - -if bld.env ()['INTLTOOL_UPDATE']: - os.chdir ('./po') - try: - try: - size_old = os.stat (APPNAME + '.pot').st_size - except: - size_old = 0 - subprocess.call (['intltool-update', '--pot']) - size_new = os.stat (APPNAME + '.pot').st_size - if size_new <> size_old: - Params.pprint ('YELLOW', "Updated po template.") - try: - intltool_update = subprocess.Popen (['intltool-update', '-r'], - stderr=subprocess.PIPE) - intltool_update.wait () - Params.pprint ('YELLOW', "Updated translations.") - except: - Params.pprint ('RED', "Failed to update translations.") - except: - Params.pprint ('RED', "Failed to generate po template.") - os.chdir ('..') - -obj = bld.create_obj ('intltool_po') -obj.appname = APPNAME diff --git a/wscript b/wscript index 1bc78376..51ea3e63 100644 --- a/wscript +++ b/wscript @@ -50,16 +50,6 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) - if Params.g_options.enable_update_po: - conf.find_program ('intltool-update', var='INTLTOOL_UPDATE') - if conf.env['INTLTOOL_UPDATE']: - update_po = 'yes' - else: - update_po = 'not available' - else: - update_po = 'no' - conf.check_message_custom ('localization file', 'updates', update_po) - # We support building without intltool # Therefore datadir may not have been defined if not conf.is_defined ('DATADIR'): @@ -150,11 +140,12 @@ def set_options (opt): opt.add_option ('--disable-sqlite', action='store_true', default=False, help='Disables sqlite support', dest='disable_sqlite') - opt.add_option ('--enable-update-po', action='store_true', default=False, - help='Enables localization file updates', dest='enable_update_po') opt.add_option ('--enable-api-docs', action='store_true', default=False, help='Enables API documentation', dest='enable_api_docs') + opt.add_option ('--update-po', action='store_true', default=False, + help='Update localization files', dest='update_po') + def build (bld): def mkdir (path): if not os.access (path, os.F_OK): @@ -188,7 +179,9 @@ def build (bld): install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') if bld.env ()['INTLTOOL']: - bld.add_subdirs ('po') + obj = bld.create_obj ('intltool_po') + obj.podir = 'po' + obj.appname = APPNAME if bld.env ()['GTKDOC_SCAN'] and Params.g_commands['build']: bld.add_subdirs ('docs/api') @@ -234,3 +227,26 @@ def shutdown (): if not icon_cache_updated: Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) + + elif Params.g_options.update_po: + os.chdir('./po') + try: + try: + size_old = os.stat (APPNAME + '.pot').st_size + except: + size_old = 0 + subprocess.call (['intltool-update', '--pot']) + size_new = os.stat (APPNAME + '.pot').st_size + if size_new <> size_old: + Params.pprint ('YELLOW', "Updated po template.") + try: + intltool_update = subprocess.Popen (['intltool-update', '-r'], + stderr=subprocess.PIPE) + intltool_update.wait () + Params.pprint ('YELLOW', "Updated translations.") + except: + Params.pprint ('RED', "Failed to update translations.") + except: + Params.pprint ('RED', "Failed to generate po template.") + Params.pprint ('RED', "Make sure intltool is installed.") + os.chdir ('..') From 1b148cca673aad6e8fc8039124092a07b3ea7b75 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 03:03:36 +0100 Subject: [PATCH 0471/2970] Repair completion popup to actually open the selection --- midori/midori-locationaction.c | 40 ++++++++++------------------------ 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index a0940758..76641497 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -326,23 +326,6 @@ midori_location_action_create_tool_item (GtkAction* action) return toolitem; } -static void -midori_location_action_active_changed_cb (GtkWidget* location_entry, - gint active, - GtkAction* action) -{ - MidoriLocationAction* location_action; - GtkWidget* entry; - const gchar* text; - - location_action = MIDORI_LOCATION_ACTION (action); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - text = gtk_entry_get_text (GTK_ENTRY (entry)); - katze_assign (location_action->uri, g_strdup (text)); - - g_signal_emit (action, signals[ACTIVE_CHANGED], 0, active); -} - static gboolean midori_location_action_key_press_event_cb (GtkWidget* widget, GdkEventKey* event, @@ -569,7 +552,7 @@ midori_location_action_set_active_iter (MidoriLocationAction* location_action, GtkWidget* entry; GtkTreeIter parent_iter; - model = location_action->filter_model; + model = location_action->model; /* The filter iter must be set, not the child iter, * but the row must first be set as visible to @@ -705,10 +688,10 @@ midori_location_action_set_item_from_uri (MidoriLocationAction* location_action, } static gboolean -midori_location_entry_completion_selected (GtkEntryCompletion* completion, - GtkTreeModel* model, - GtkTreeIter* iter, - MidoriLocationAction* location_action) +midori_location_entry_match_selected_cb (GtkEntryCompletion* completion, + GtkTreeModel* model, + GtkTreeIter* iter, + MidoriLocationAction* location_action) { gchar* uri; @@ -749,7 +732,7 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, gtk_entry_set_completion (GTK_ENTRY (entry), completion); g_signal_connect (completion, "match-selected", - G_CALLBACK (midori_location_entry_completion_selected), location_entry); + G_CALLBACK (midori_location_entry_match_selected_cb), location_action); g_object_unref (completion); } @@ -762,6 +745,7 @@ midori_location_action_entry_changed_cb (GtkComboBox* combo_box, GtkIconEntry* entry; GtkTreeModel* model; GdkPixbuf* pixbuf; + gchar* uri; if (gtk_combo_box_get_active_iter (combo_box, &iter)) { @@ -770,14 +754,16 @@ midori_location_action_entry_changed_cb (GtkComboBox* combo_box, pixbuf = NULL; model = location_action->filter_model; - gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, -1); + gtk_tree_model_get (model, &iter, FAVICON_COL, &pixbuf, + URI_COL, &uri, -1); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, pixbuf); g_object_unref (pixbuf); + katze_assign (location_action->uri, uri); - g_signal_emit (MIDORI_LOCATION_ENTRY (combo_box), - signals[ACTIVE_CHANGED], 0, gtk_combo_box_get_active (combo_box)); + g_signal_emit (location_action, signals[ACTIVE_CHANGED], 0, + gtk_combo_box_get_active (combo_box)); } } } @@ -823,8 +809,6 @@ midori_location_action_connect_proxy (GtkAction* action, g_signal_connect (entry, "changed", G_CALLBACK (midori_location_action_entry_changed_cb), action); - g_signal_connect (location_action, "active-changed", - G_CALLBACK (midori_location_action_active_changed_cb), action); g_object_connect (gtk_bin_get_child (GTK_BIN (entry)), "signal::key-press-event", midori_location_action_key_press_event_cb, action, From aafd8df41327a87a5a3e5b5eff3c2ffcad076cfe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 03:04:35 +0100 Subject: [PATCH 0472/2970] Expressly say Print background *images* --- midori/midori-preferences.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index ce657c8d..ec519aae 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -412,7 +412,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_button_set_label (GTK_BUTTON (button), _("Shrink images automatically")); SPANNED_ADD (button, 1, 2, 0, 1); button = katze_property_proxy (settings, "print-backgrounds", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Print backgrounds")); + gtk_button_set_label (GTK_BUTTON (button), _("Print background images")); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "resizable-text-areas", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Resizable text areas")); From 709504d400a9fd08543784a68226b722eae3e7d6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 22:01:53 +0100 Subject: [PATCH 0473/2970] Add translation template to the repository --- .gitignore | 1 - TRANSLATE | 19 +- po/midori.pot | 1345 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1359 insertions(+), 6 deletions(-) create mode 100644 po/midori.pot diff --git a/.gitignore b/.gitignore index f0d9bb19..7c0e878e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ intltool-update po/.intltool-merge-cache po/POTFILES -po/midori.pot po/stamp-it po/*.gmo diff --git a/TRANSLATE b/TRANSLATE index 23a2eb27..6d77eb2f 100644 --- a/TRANSLATE +++ b/TRANSLATE @@ -2,15 +2,12 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +++ Translating Midori +++ -If you want to translate Midori, you need a few preparations. +If you want to translate Midori, here are a few helpful tips. -First create/ update the localization template: +To update the localization template: ./waf build --update-po -Running this command again will also update all translations -as needed, according to changes in the template. - If you want to add a new language 'aa', create it like this: cd po @@ -21,6 +18,18 @@ To check your language 'aa' for errors, do this: msgfmt -c --check-accelerators=_ aa.po +To test your changes, make sure you install Midori: + +./waf install + +And of course you can uninstall it again after testing: + +./waf uninstall + +To run Midori in a particular language, run it like this: + +LANG=fr_FR.utf8 midori + As a general rule, your localization should be based off of the current state of the git repository. diff --git a/po/midori.pot b/po/midori.pot new file mode 100644 index 00000000..c99b908d --- /dev/null +++ b/po/midori.pot @@ -0,0 +1,1345 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-10 20:53+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1093 ../midori/main.c:1102 +#: ../midori/main.c:1113 ../midori/main.c:1137 +msgid "Midori" +msgstr "" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "" + +#: ../midori/main.c:73 +msgid "_Bookmark" +msgstr "" + +#: ../midori/main.c:74 ../midori/midori-browser.c:3757 +msgid "_Bookmarks" +msgstr "" + +#: ../midori/main.c:75 +msgid "_Add Bookmark" +msgstr "" + +#: ../midori/main.c:76 +msgid "_Console" +msgstr "" + +#: ../midori/main.c:77 +msgid "_Extensions" +msgstr "" + +#: ../midori/main.c:78 +msgid "_History" +msgstr "" + +#: ../midori/main.c:79 +msgid "_Homepage" +msgstr "" + +#: ../midori/main.c:80 +msgid "_Pageholder" +msgstr "" + +#: ../midori/main.c:81 +msgid "_Userscripts" +msgstr "" + +#: ../midori/main.c:82 +msgid "User_styles" +msgstr "" + +#: ../midori/main.c:83 +msgid "New _Tab" +msgstr "" + +#: ../midori/main.c:84 +msgid "_Transfers" +msgstr "" + +#: ../midori/main.c:85 +msgid "_Closed Tabs and Windows" +msgstr "" + +#: ../midori/main.c:86 +msgid "New _Window" +msgstr "" + +#: ../midori/main.c:131 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:186 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../midori/main.c:193 ../midori/main.c:263 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "" + +#: ../midori/main.c:522 ../midori/main.c:530 ../midori/main.c:560 +#: ../midori/main.c:569 +msgid "Malformed document." +msgstr "" + +#: ../midori/main.c:552 +msgid "File not found." +msgstr "" + +#: ../midori/main.c:590 ../midori/main.c:622 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#: ../midori/main.c:676 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +#: ../midori/main.c:700 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:733 ../midori/main.c:747 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:863 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:995 ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "" + +#: ../midori/main.c:1020 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1052 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1054 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1056 +msgid "URIs" +msgstr "" + +#: ../midori/main.c:1090 +msgid "[URIs]" +msgstr "" + +#: ../midori/main.c:1114 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:1116 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1137 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1154 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1189 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1203 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1215 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1228 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1241 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:1400 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1410 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1419 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1427 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "" + +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +msgid "None" +msgstr "" + +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3995 +msgid "Extensions" +msgstr "" + +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3978 +msgid "Userscripts" +msgstr "" + +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3986 +msgid "Userstyles" +msgstr "" + +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "" + +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "" + +#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3144 +msgid "Reload the current page" +msgstr "" + +#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3141 +msgid "Stop loading the current page" +msgstr "" + +#: ../midori/midori-browser.c:321 +#, c-format +msgid "%d%% loaded" +msgstr "" + +#: ../midori/midori-browser.c:344 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../midori/midori-browser.c:511 +msgid "New bookmark" +msgstr "" + +#: ../midori/midori-browser.c:511 +msgid "Edit bookmark" +msgstr "" + +#: ../midori/midori-browser.c:533 +msgid "_Title:" +msgstr "" + +#: ../midori/midori-browser.c:546 ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "" + +#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "" + +#: ../midori/midori-browser.c:581 +msgid "_Folder:" +msgstr "" + +#: ../midori/midori-browser.c:585 +msgid "Root" +msgstr "" + +#: ../midori/midori-browser.c:664 +msgid "Save file as" +msgstr "" + +#: ../midori/midori-browser.c:1246 +msgid "Open file" +msgstr "" + +#: ../midori/midori-browser.c:2316 +msgid "Open in New _Tab" +msgstr "" + +#: ../midori/midori-browser.c:2318 +msgid "Open in New _Window" +msgstr "" + +#: ../midori/midori-browser.c:2590 +msgid "Separator" +msgstr "" + +#: ../midori/midori-browser.c:2702 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2708 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2715 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2717 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2806 +msgid "A lightweight web browser." +msgstr "" + +#: ../midori/midori-browser.c:2814 +msgid "translator-credits" +msgstr "" + +#: ../midori/midori-browser.c:2966 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3072 +msgid "_File" +msgstr "" + +#: ../midori/midori-browser.c:3075 +msgid "Open a new window" +msgstr "" + +#: ../midori/midori-browser.c:3078 +msgid "Open a new tab" +msgstr "" + +#: ../midori/midori-browser.c:3081 +msgid "Open a file" +msgstr "" + +#: ../midori/midori-browser.c:3084 +msgid "Save to a file" +msgstr "" + +#: ../midori/midori-browser.c:3086 +msgid "_Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:3087 +msgid "Close the current tab" +msgstr "" + +#: ../midori/midori-browser.c:3089 +msgid "C_lose Window" +msgstr "" + +#: ../midori/midori-browser.c:3090 +msgid "Close this window" +msgstr "" + +#: ../midori/midori-browser.c:3093 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:3096 +msgid "Quit the application" +msgstr "" + +#: ../midori/midori-browser.c:3098 +msgid "_Edit" +msgstr "" + +#: ../midori/midori-browser.c:3101 +msgid "Cut the selected text" +msgstr "" + +#: ../midori/midori-browser.c:3104 ../midori/midori-browser.c:3107 +msgid "Copy the selected text" +msgstr "" + +#: ../midori/midori-browser.c:3110 +msgid "Paste text from the clipboard" +msgstr "" + +#: ../midori/midori-browser.c:3113 +msgid "Delete the selected text" +msgstr "" + +#: ../midori/midori-browser.c:3116 +msgid "Select all text" +msgstr "" + +#: ../midori/midori-browser.c:3119 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:3121 +msgid "Find _Next" +msgstr "" + +#: ../midori/midori-browser.c:3122 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3124 +msgid "Find _Previous" +msgstr "" + +#: ../midori/midori-browser.c:3125 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3128 +msgid "_Quick Find" +msgstr "" + +#: ../midori/midori-browser.c:3129 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3132 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:3134 +msgid "_View" +msgstr "" + +#: ../midori/midori-browser.c:3135 +msgid "_Toolbars" +msgstr "" + +#: ../midori/midori-browser.c:3147 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3150 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3153 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3155 ../midori/midori-view.c:969 +msgid "View _Source" +msgstr "" + +#: ../midori/midori-browser.c:3156 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:3158 +msgid "View Selection Source" +msgstr "" + +#: ../midori/midori-browser.c:3159 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:3163 +msgid "Toggle fullscreen view" +msgstr "" + +#: ../midori/midori-browser.c:3165 +msgid "_Go" +msgstr "" + +#: ../midori/midori-browser.c:3168 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:3171 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:3174 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:3176 +msgid "Open in Page_holder..." +msgstr "" + +#: ../midori/midori-browser.c:3177 +msgid "Open the current page in the pageholder" +msgstr "" + +#: ../midori/midori-browser.c:3179 +msgid "Empty Trash" +msgstr "" + +#: ../midori/midori-browser.c:3180 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:3182 ../midori/midori-view.c:941 +msgid "Undo Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:3183 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:3187 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3190 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3193 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3196 +msgid "Delete the selected history item" +msgstr "" + +#: ../midori/midori-browser.c:3199 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3202 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../midori/midori-browser.c:3204 +msgid "_Tools" +msgstr "" + +#: ../midori/midori-browser.c:3206 ../midori/midori-searchaction.c:468 +msgid "_Manage Search Engines" +msgstr "" + +#: ../midori/midori-browser.c:3207 +msgid "Add, edit and remove search engines..." +msgstr "" + +#: ../midori/midori-browser.c:3211 +msgid "_Previous Tab" +msgstr "" + +#: ../midori/midori-browser.c:3212 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:3214 +msgid "_Next Tab" +msgstr "" + +#: ../midori/midori-browser.c:3215 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:3217 +msgid "_Help" +msgstr "" + +#: ../midori/midori-browser.c:3219 +msgid "_Contents" +msgstr "" + +#: ../midori/midori-browser.c:3220 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:3222 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3223 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3225 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3226 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3229 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:3236 +msgid "P_rivate Browsing" +msgstr "" + +#: ../midori/midori-browser.c:3237 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:3242 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:3243 +msgid "Show menubar" +msgstr "" + +#: ../midori/midori-browser.c:3246 +msgid "_Navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:3247 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:3250 +msgid "Side_panel" +msgstr "" + +#: ../midori/midori-browser.c:3251 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:3254 +msgid "_Bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:3255 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:3258 +msgid "_Transferbar" +msgstr "" + +#: ../midori/midori-browser.c:3259 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:3262 +msgid "_Statusbar" +msgstr "" + +#: ../midori/midori-browser.c:3263 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:3680 +msgid "_Location..." +msgstr "" + +#: ../midori/midori-browser.c:3682 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3706 +msgid "_Web Search..." +msgstr "" + +#: ../midori/midori-browser.c:3708 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:3727 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:3741 +msgid "_Recently visited pages" +msgstr "" + +#: ../midori/midori-browser.c:3743 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3759 +msgid "Show the saved bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:3773 +msgid "_Window" +msgstr "" + +#: ../midori/midori-browser.c:3775 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:3899 +msgid "Bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:3906 ../midori/midori-preferences.c:348 +msgid "Transfers" +msgstr "" + +#: ../midori/midori-browser.c:3915 +msgid "Console" +msgstr "" + +#: ../midori/midori-browser.c:3959 ../midori/midori-preferences.c:519 +msgid "History" +msgstr "" + +#. i18n: A panel showing a user specified web page +#: ../midori/midori-browser.c:3969 +msgid "Pageholder" +msgstr "" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4038 +msgid "_Inline find:" +msgstr "" + +#: ../midori/midori-browser.c:4073 +msgid "Match Case" +msgstr "" + +#: ../midori/midori-browser.c:4081 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:4090 +msgid "Close Findbar" +msgstr "" + +#: ../midori/midori-browser.c:4336 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +msgid "Close panel" +msgstr "" + +#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1559 +msgid "Blank page" +msgstr "" + +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:394 +msgid "Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:134 +msgid "Last open pages" +msgstr "" + +#: ../midori/midori-websettings.c:149 +msgid "Chinese (BIG5)" +msgstr "" + +#: ../midori/midori-websettings.c:150 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-websettings.c:151 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-websettings.c:152 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-websettings.c:153 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-websettings.c:154 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-websettings.c:169 +msgid "New tab" +msgstr "" + +#: ../midori/midori-websettings.c:170 +msgid "New window" +msgstr "" + +#: ../midori/midori-websettings.c:171 +msgid "Current tab" +msgstr "" + +#: ../midori/midori-websettings.c:186 +msgid "Default" +msgstr "" + +#: ../midori/midori-websettings.c:187 +msgid "Icons" +msgstr "" + +#: ../midori/midori-websettings.c:188 +msgid "Text" +msgstr "" + +#: ../midori/midori-websettings.c:189 +msgid "Both" +msgstr "" + +#: ../midori/midori-websettings.c:190 +msgid "Both horizontal" +msgstr "" + +#: ../midori/midori-websettings.c:205 +msgid "All cookies" +msgstr "" + +#: ../midori/midori-websettings.c:206 +msgid "Session cookies" +msgstr "" + +#: ../midori/midori-websettings.c:244 +msgid "Remember last window size" +msgstr "" + +#: ../midori/midori-websettings.c:245 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:253 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:254 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:262 +msgid "Last window height" +msgstr "" + +#: ../midori/midori-websettings.c:263 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:271 +msgid "Last panel position" +msgstr "" + +#: ../midori/midori-websettings.c:272 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:281 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:282 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:290 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:291 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:299 +msgid "Last pageholder URI" +msgstr "" + +#: ../midori/midori-websettings.c:300 +msgid "The URI last opened in the pageholder" +msgstr "" + +#: ../midori/midori-websettings.c:309 +msgid "Show Menubar" +msgstr "" + +#: ../midori/midori-websettings.c:310 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:318 +msgid "Show Navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:319 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:327 +msgid "Show Bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:328 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:336 +msgid "Show Panel" +msgstr "" + +#: ../midori/midori-websettings.c:337 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:345 +msgid "Show Statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:346 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:355 +msgid "Toolbar Style" +msgstr "" + +#: ../midori/midori-websettings.c:356 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:365 +msgid "Toolbar Items" +msgstr "" + +#: ../midori/midori-websettings.c:366 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:374 +msgid "Compact Sidepanel" +msgstr "" + +#: ../midori/midori-websettings.c:375 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:384 +msgid "Load on Startup" +msgstr "" + +#: ../midori/midori-websettings.c:385 +msgid "What to load on startup" +msgstr "" + +#: ../midori/midori-websettings.c:395 +msgid "The homepage" +msgstr "" + +#: ../midori/midori-websettings.c:403 +msgid "Download Folder" +msgstr "" + +#: ../midori/midori-websettings.c:404 +msgid "The folder downloaded files are saved to" +msgstr "" + +#: ../midori/midori-websettings.c:412 +msgid "Download Manager" +msgstr "" + +#: ../midori/midori-websettings.c:413 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:421 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:422 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:430 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:431 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:439 +msgid "Preferred Encoding" +msgstr "" + +#: ../midori/midori-websettings.c:440 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:450 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:451 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "" + +#: ../midori/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "" + +#: ../midori/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:478 +msgid "Open external pages in" +msgstr "" + +#: ../midori/midori-websettings.c:479 +msgid "Where to open externally opened pages" +msgstr "" + +#: ../midori/midori-websettings.c:488 +msgid "Middle click opens Selection" +msgstr "" + +#: ../midori/midori-websettings.c:489 +msgid "Load an URL from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:497 +msgid "Open tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:506 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:507 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:515 +msgid "Open popups in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:526 +msgid "Accept cookies" +msgstr "" + +#: ../midori/midori-websettings.c:527 +msgid "What type of cookies to accept" +msgstr "" + +#: ../midori/midori-websettings.c:536 +msgid "Original cookies only" +msgstr "" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies from the original website only" +msgstr "" + +#: ../midori/midori-websettings.c:545 +msgid "Maximum cookie age" +msgstr "" + +#: ../midori/midori-websettings.c:546 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:556 +msgid "Remember last visited pages" +msgstr "" + +#: ../midori/midori-websettings.c:557 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../midori/midori-websettings.c:565 +msgid "Maximum history age" +msgstr "" + +#: ../midori/midori-websettings.c:566 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:574 +msgid "Remember last form inputs" +msgstr "" + +#: ../midori/midori-websettings.c:575 +msgid "Whether the last form inputs are saved" +msgstr "" + +#: ../midori/midori-websettings.c:583 +msgid "Remember last downloaded files" +msgstr "" + +#: ../midori/midori-websettings.c:584 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../midori/midori-websettings.c:594 +msgid "HTTP Proxy" +msgstr "" + +#: ../midori/midori-websettings.c:595 +msgid "The proxy used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:603 +msgid "Cache size" +msgstr "" + +#: ../midori/midori-websettings.c:604 +msgid "The allowed size of the cache" +msgstr "" + +#: ../midori/midori-view.c:873 +msgid "Open Link in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:896 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:904 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:926 +msgid "Open URL in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:1293 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1431 +msgid "Source" +msgstr "" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#. Page "General" +#: ../midori/midori-preferences.c:336 +msgid "General" +msgstr "" + +#: ../midori/midori-preferences.c:337 +msgid "Startup" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:384 +msgid "Appearance" +msgstr "" + +#: ../midori/midori-preferences.c:385 +msgid "Font settings" +msgstr "" + +#: ../midori/midori-preferences.c:387 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:395 +msgid "Minimum Font Size" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:405 +msgid "Behavior" +msgstr "" + +#: ../midori/midori-preferences.c:406 +msgid "Features" +msgstr "" + +#: ../midori/midori-preferences.c:409 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:412 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:415 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:418 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:421 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-preferences.c:424 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:439 +msgid "Interface" +msgstr "" + +#: ../midori/midori-preferences.c:440 +msgid "Navigationbar" +msgstr "" + +#: ../midori/midori-preferences.c:455 +msgid "Browsing" +msgstr "" + +#: ../midori/midori-preferences.c:482 ../midori/midori-preferences.c:483 +msgid "Network" +msgstr "" + +#: ../midori/midori-preferences.c:494 +msgid "MB" +msgstr "" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:500 +msgid "Privacy" +msgstr "" + +#: ../midori/midori-preferences.c:502 +msgid "Web Cookies" +msgstr "" + +#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:526 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +msgid "Empty" +msgstr "" + +#: ../midori/midori-searchaction.c:804 +msgid "Add search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:804 +msgid "Edit search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:832 +msgid "_Name:" +msgstr "" + +#: ../midori/midori-searchaction.c:876 +msgid "_Icon (name or file):" +msgstr "" + +#: ../midori/midori-searchaction.c:890 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1067 +msgid "Manage search engines" +msgstr "" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:283 +msgid "Warning: You are using a superuser account!" +msgstr "" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:187 +msgid "Choose folder" +msgstr "" From 91e2cb4129c23739d4535656a04bdc2ab4fb3c02 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 22:02:43 +0100 Subject: [PATCH 0474/2970] Unset the tab icon if it is destroyed --- midori/midori-view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index f664d7b0..b88a138f 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1824,6 +1824,9 @@ midori_view_get_proxy_tab_label (MidoriView* view) G_CALLBACK (midori_view_tab_close_clicked), view); view->tab_label = event_box; + g_signal_connect (view->tab_icon, "destroy", + G_CALLBACK (gtk_widget_destroyed), + &view->tab_icon); g_signal_connect (view->tab_label, "destroy", G_CALLBACK (gtk_widget_destroyed), &view->tab_label); From 22a9bf1bc192ed064fd90e0a2dca3655a9c2dd74 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 22:18:35 +0100 Subject: [PATCH 0475/2970] Print warnings after configuring if packages are missing --- wscript | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/wscript b/wscript index 51ea3e63..c6558f8a 100644 --- a/wscript +++ b/wscript @@ -122,6 +122,20 @@ def configure (conf): conf.write_config_header ('config.h') conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') + print + if single_instance == 'not available': + print "Single instance support is unavailable in this build." + print " Install libUnique and reconfigure to enable it." + print + if libsoup == 'not available': + print "Icons, view source and Save as are unavailable in this build." + print " Install libSoup and reconfigure to enable these features." + print + if sqlite == 'not available': + print "History storage on disk is unavailable in this build." + print " Install sqlite3 and reconfigure to enable it." + print + def set_options (opt): opt.tool_options ('compiler_cc') opt.tool_options ('intltool') From fa0d09f0308b26678da80d87e0af9d590f5b326c Mon Sep 17 00:00:00 2001 From: Vincent Tunru Date: Mon, 10 Nov 2008 22:23:42 +0100 Subject: [PATCH 0476/2970] Add Dutch translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/nl.po | 1348 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1350 insertions(+), 1 deletion(-) create mode 100644 po/nl.po diff --git a/AUTHORS b/AUTHORS index dcf6c455..083526b2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,6 +29,7 @@ Translations: fr: Robert-André Mauchin gl: Miguel Anxo Bouzada hu: SZERVÁC Attila + nl: Vincent Tunru pl: Przemysław Sitek pl: Lukasz Romanowicz ru: Troitskiy Nikita diff --git a/po/LINGUAS b/po/LINGUAS index 495e40cd..724b6c51 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fi fr gl hu pl ru sv +de es et fi fr gl hu nl pl ru sv diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 00000000..892bf9b0 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,1348 @@ +# Dutch translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Vincent Tunru 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-10 20:20+0100\n" +"PO-Revision-Date: 2008-11-10 02:02+0100\n" +"Last-Translator: Vincent Tunru \n" +"Language-Team: Dutch\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Lichtgewicht webbrowser" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1093 ../midori/main.c:1102 +#: ../midori/main.c:1113 ../midori/main.c:1137 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Webbrowser" + +#: ../midori/main.c:73 +msgid "_Bookmark" +msgstr "_Bladwijzer" + +#: ../midori/main.c:74 ../midori/midori-browser.c:3757 +msgid "_Bookmarks" +msgstr "_Bladwijzers" + +#: ../midori/main.c:75 +msgid "_Add Bookmark" +msgstr "Bladwijzer _toevoegen" + +#: ../midori/main.c:76 +msgid "_Console" +msgstr "_Console" + +#: ../midori/main.c:77 +msgid "_Extensions" +msgstr "_Extensies" + +#: ../midori/main.c:78 +msgid "_History" +msgstr "_Geschiedenis" + +#: ../midori/main.c:79 +msgid "_Homepage" +msgstr "_Homepage" + +#: ../midori/main.c:80 +msgid "_Pageholder" +msgstr "_Paginavak" + +#: ../midori/main.c:81 +msgid "_Userscripts" +msgstr "Gebruikers_scripts" + +#: ../midori/main.c:82 +msgid "User_styles" +msgstr "Gebruikers_opmaakprofielen" + +#: ../midori/main.c:83 +msgid "New _Tab" +msgstr "Nieuw _tabblad" + +#: ../midori/main.c:84 +msgid "_Transfers" +msgstr "Bestands_overdrachten" + +#: ../midori/main.c:85 +msgid "_Closed Tabs and Windows" +msgstr "Ge_sloten tabbladen en vensters" + +#: ../midori/main.c:86 +msgid "New _Window" +msgstr "Nieuw _venster" + +#: ../midori/main.c:131 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Configuratie kan niet geladen worden: %s\n" + +#: ../midori/main.c:186 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Waarde '%s' is ongeldig voor %s" + +#: ../midori/main.c:193 ../midori/main.c:263 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Ongeldige waarde '%s'" + +#: ../midori/main.c:522 ../midori/main.c:530 ../midori/main.c:560 +#: ../midori/main.c:569 +msgid "Malformed document." +msgstr "Ongeldig document." + +#: ../midori/main.c:552 +msgid "File not found." +msgstr "Bestand niet gevonden." + +#: ../midori/main.c:590 ../midori/main.c:622 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Kan database niet openen: %s\n" + +#: ../midori/main.c:676 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kan item in geschiedenis niet verwijderen: %s\n" + +#: ../midori/main.c:700 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Kan geschiedenis niet wissen: %s\n" + +#: ../midori/main.c:733 ../midori/main.c:747 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:863 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Kan verjaarde items in geschiedenis niet verwijderen: %s\n" + +#: ../midori/main.c:995 ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Fout bij schrijven." + +#: ../midori/main.c:1020 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "De sessie kan niet worden opgeslagen. %s" + +#: ../midori/main.c:1052 +msgid "Run the specified filename as javascript" +msgstr "Voer de gegeven bestandsnaam uit als Javascript" + +#: ../midori/main.c:1054 +msgid "Display program version" +msgstr "Versie-informatie weergeven" + +#: ../midori/main.c:1056 +msgid "URIs" +msgstr "URI's" + +#: ../midori/main.c:1090 +msgid "[URIs]" +msgstr "[URI's]" + +#: ../midori/main.c:1114 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" + +#: ../midori/main.c:1116 +msgid "Check for new versions at:" +msgstr "Controleer op nieuwe versies op:" + +#: ../midori/main.c:1137 +msgid "No filename specified" +msgstr "Geen bestandsnaam ingegeven" + +#: ../midori/main.c:1154 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori is al actief maar reageert niet.\n" + +#: ../midori/main.c:1189 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "De bladwijzers kunnen niet geladen worden: %s\n" + +#: ../midori/main.c:1203 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "De sessie kan niet geladen worden: %s\n" + +#: ../midori/main.c:1215 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "De prullenbak kan niet geladen worden: %s\n" + +#: ../midori/main.c:1228 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "De geschiedenis kan niet geladen worden: %s\n" + +#: ../midori/main.c:1241 +msgid "The following errors occured:" +msgstr "De volgende fouten hebben plaatsgevonden:" + +#: ../midori/main.c:1400 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" + +#: ../midori/main.c:1410 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" + +#: ../midori/main.c:1419 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "De prullenbak kan niet worden opgeslagen. %s" + +#: ../midori/main.c:1427 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "De instellingen kunnen niet worden opgeslagen. %s" + +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +msgid "None" +msgstr "Geen" + +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3995 +msgid "Extensions" +msgstr "Extensies" + +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3978 +msgid "Userscripts" +msgstr "Gebruikersscripts" + +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3986 +msgid "Userstyles" +msgstr "Gebruikersopmaakprofielen" + +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Inschakelen" + +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Uitschakelen" + +#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3144 +msgid "Reload the current page" +msgstr "De huidige pagina herladen" + +#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3141 +msgid "Stop loading the current page" +msgstr "Stop met het laden van de huidige pagina" + +#: ../midori/midori-browser.c:321 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% geladen" + +#: ../midori/midori-browser.c:344 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Onverwachte actie '%s'." + +#: ../midori/midori-browser.c:511 +msgid "New bookmark" +msgstr "Nieuwe bladwijzer" + +#: ../midori/midori-browser.c:511 +msgid "Edit bookmark" +msgstr "Bladwijzer bewerken" + +#: ../midori/midori-browser.c:533 +msgid "_Title:" +msgstr "_Titel:" + +#: ../midori/midori-browser.c:546 ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Beschrijving:" + +#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:581 +msgid "_Folder:" +msgstr "_Map:" + +#: ../midori/midori-browser.c:585 +msgid "Root" +msgstr "Hoofdmap" + +#: ../midori/midori-browser.c:664 +msgid "Save file as" +msgstr "Bestand opslaan als" + +#: ../midori/midori-browser.c:1246 +msgid "Open file" +msgstr "Bestand openen" + +#: ../midori/midori-browser.c:2316 +msgid "Open in New _Tab" +msgstr "In nieuw _tabblad openen" + +#: ../midori/midori-browser.c:2318 +msgid "Open in New _Window" +msgstr "In nieuw _venster openen" + +#: ../midori/midori-browser.c:2590 +msgid "Separator" +msgstr "Scheidingsteken" + +#: ../midori/midori-browser.c:2702 +#, c-format +msgid "A week ago" +msgstr "Eén week geleden" + +#: ../midori/midori-browser.c:2708 +#, c-format +msgid "%d days ago" +msgstr "%d dagen geleden" + +#: ../midori/midori-browser.c:2715 +msgid "Today" +msgstr "Vandaag" + +#: ../midori/midori-browser.c:2717 +msgid "Yesterday" +msgstr "Gisteren" + +#: ../midori/midori-browser.c:2806 +msgid "A lightweight web browser." +msgstr "Een lichtgewicht webbrowser." + +#: ../midori/midori-browser.c:2814 +msgid "translator-credits" +msgstr "Vincent Tunru " + +#: ../midori/midori-browser.c:2966 +msgid "Are you sure you want to remove all history items?" +msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" + +#: ../midori/midori-browser.c:3072 +msgid "_File" +msgstr "_Bestand" + +#: ../midori/midori-browser.c:3075 +msgid "Open a new window" +msgstr "Nieuw venster openen" + +#: ../midori/midori-browser.c:3078 +msgid "Open a new tab" +msgstr "Nieuw tabblad openen" + +#: ../midori/midori-browser.c:3081 +msgid "Open a file" +msgstr "Bestand openen" + +#: ../midori/midori-browser.c:3084 +msgid "Save to a file" +msgstr "Opslaan naar bestand" + +#: ../midori/midori-browser.c:3086 +msgid "_Close Tab" +msgstr "Tabblad _sluiten" + +#: ../midori/midori-browser.c:3087 +msgid "Close the current tab" +msgstr "Huidig tabblad sluiten" + +#: ../midori/midori-browser.c:3089 +msgid "C_lose Window" +msgstr "Venster _sluiten" + +#: ../midori/midori-browser.c:3090 +msgid "Close this window" +msgstr "Dit venster sluiten" + +#: ../midori/midori-browser.c:3093 +msgid "Print the current page" +msgstr "Huidige pagina uitprinten" + +#: ../midori/midori-browser.c:3096 +msgid "Quit the application" +msgstr "Programma afsluiten" + +#: ../midori/midori-browser.c:3098 +msgid "_Edit" +msgstr "_Bewerken" + +#: ../midori/midori-browser.c:3101 +msgid "Cut the selected text" +msgstr "Geselecteerde tekst knippen" + +#: ../midori/midori-browser.c:3104 ../midori/midori-browser.c:3107 +msgid "Copy the selected text" +msgstr "Geselecteerde tekst kopiëren" + +#: ../midori/midori-browser.c:3110 +msgid "Paste text from the clipboard" +msgstr "Tekst van het klembord plakken" + +#: ../midori/midori-browser.c:3113 +msgid "Delete the selected text" +msgstr "Geselecteerde tekst verwijderen" + +#: ../midori/midori-browser.c:3116 +msgid "Select all text" +msgstr "Alle tekst selecteren" + +#: ../midori/midori-browser.c:3119 +msgid "Find a word or phrase in the page" +msgstr "Zoek naar een woord of zin in deze pagina" + +#: ../midori/midori-browser.c:3121 +msgid "Find _Next" +msgstr "Vo_lgende zoeken" + +#: ../midori/midori-browser.c:3122 +msgid "Find the next occurrence of a word or phrase" +msgstr "Volgende voorkomen van een woord of zin opzoeken" + +#: ../midori/midori-browser.c:3124 +msgid "Find _Previous" +msgstr "Vo_rige zoeken" + +#: ../midori/midori-browser.c:3125 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Vorige voorkomen van een woord of zin opzoeken" + +#: ../midori/midori-browser.c:3128 +msgid "_Quick Find" +msgstr "_Snel zoeken" + +#: ../midori/midori-browser.c:3129 +msgid "Quickly jump to a word or phrase" +msgstr "Snel naar een woord of zin springen" + +#: ../midori/midori-browser.c:3132 +msgid "Configure the application preferences" +msgstr "Voorkeuren instellen" + +#: ../midori/midori-browser.c:3134 +msgid "_View" +msgstr "_Beeld" + +#: ../midori/midori-browser.c:3135 +msgid "_Toolbars" +msgstr "_Werkbalken" + +#: ../midori/midori-browser.c:3147 +msgid "Increase the zoom level" +msgstr "Zoomniveau verhogen" + +#: ../midori/midori-browser.c:3150 +msgid "Decrease the zoom level" +msgstr "Zoomniveau verlagen" + +#: ../midori/midori-browser.c:3153 +msgid "Reset the zoom level" +msgstr "Zoomniveau op beginwaarde" + +#: ../midori/midori-browser.c:3155 ../midori/midori-view.c:962 +msgid "View _Source" +msgstr "_Bron bekijken" + +#: ../midori/midori-browser.c:3156 +msgid "View the source code of the page" +msgstr "Broncode van deze pagina bekijken" + +#: ../midori/midori-browser.c:3158 +msgid "View Selection Source" +msgstr "Bron van selectie bekijken" + +#: ../midori/midori-browser.c:3159 +msgid "View the source code of the selection" +msgstr "Bekijk de broncode van de geselecteerde tekst" + +#: ../midori/midori-browser.c:3163 +msgid "Toggle fullscreen view" +msgstr "Volledig scherm" + +#: ../midori/midori-browser.c:3165 +msgid "_Go" +msgstr "_Ga naar" + +#: ../midori/midori-browser.c:3168 +msgid "Go back to the previous page" +msgstr "Terug naar de vorige pagina" + +#: ../midori/midori-browser.c:3171 +msgid "Go forward to the next page" +msgstr "Naar de volgende pagina" + +#: ../midori/midori-browser.c:3174 +msgid "Go to your homepage" +msgstr "Naar de homepage" + +#: ../midori/midori-browser.c:3176 +msgid "Open in Page_holder..." +msgstr "Openen in _paginavak" + +#: ../midori/midori-browser.c:3177 +msgid "Open the current page in the pageholder" +msgstr "Open de huidige pagina in het paginavak" + +#: ../midori/midori-browser.c:3179 +msgid "Empty Trash" +msgstr "Prullenbak leegmaken" + +#: ../midori/midori-browser.c:3180 +msgid "Delete the contents of the trash" +msgstr "Verwijder de inhoud van de prullenbak" + +#: ../midori/midori-browser.c:3182 ../midori/midori-view.c:934 +msgid "Undo Close Tab" +msgstr "Tabblad sluiten ongedaan maken" + +#: ../midori/midori-browser.c:3183 +msgid "Open the last closed tab" +msgstr "Open het laatst gesloten tabblad" + +#: ../midori/midori-browser.c:3187 +msgid "Add a new bookmark" +msgstr "Nieuwe bladwijzer toevoegen" + +#: ../midori/midori-browser.c:3190 +msgid "Edit the selected bookmark" +msgstr "Geselecteerde bladwijzer bewerken" + +#: ../midori/midori-browser.c:3193 +msgid "Delete the selected bookmark" +msgstr "Geselecteerde bladwijzer verwijderen" + +#: ../midori/midori-browser.c:3196 +msgid "Delete the selected history item" +msgstr "Geselecteerde item uit geschiedenis verwijderen" + +#: ../midori/midori-browser.c:3199 +msgid "Clear the entire history" +msgstr "Volledige geschiedenis wissen" + +#: ../midori/midori-browser.c:3202 +msgid "Bookmark the selected history item" +msgstr "Geselecteerde item uit geschiedenis toevoegen als bladwijzer" + +#: ../midori/midori-browser.c:3204 +msgid "_Tools" +msgstr "_Hulpmiddelen" + +#: ../midori/midori-browser.c:3206 ../midori/midori-searchaction.c:468 +msgid "_Manage Search Engines" +msgstr "_Zoekmachines beheren" + +#: ../midori/midori-browser.c:3207 +msgid "Add, edit and remove search engines..." +msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." + +#: ../midori/midori-browser.c:3211 +msgid "_Previous Tab" +msgstr "Vo_rig tabblad" + +#: ../midori/midori-browser.c:3212 +msgid "Switch to the previous tab" +msgstr "Overschakelen naar het vorige tabblad" + +#: ../midori/midori-browser.c:3214 +msgid "_Next Tab" +msgstr "Vo_lgend tabblad" + +#: ../midori/midori-browser.c:3215 +msgid "Switch to the next tab" +msgstr "Overschakelen naar het volgende tabblad" + +#: ../midori/midori-browser.c:3217 +msgid "_Help" +msgstr "_Hulp" + +#: ../midori/midori-browser.c:3219 +msgid "_Contents" +msgstr "_Inhoud" + +#: ../midori/midori-browser.c:3220 +msgid "Show the documentation" +msgstr "Documentatie weergeven" + +#: ../midori/midori-browser.c:3222 +msgid "_Frequent questions" +msgstr "_Veelgestelde vragen" + +#: ../midori/midori-browser.c:3223 +msgid "Show the Frequently Asked Questions" +msgstr "Veelgestelde vragen weergeven" + +#: ../midori/midori-browser.c:3225 +msgid "_Report a bug" +msgstr "Fouten _melden" + +#: ../midori/midori-browser.c:3226 +msgid "Open Midori's bug tracker" +msgstr "Open Midori's foutmelder" + +#: ../midori/midori-browser.c:3229 +msgid "Show information about the program" +msgstr "Informatie over dit programma weergeven" + +#: ../midori/midori-browser.c:3236 +msgid "P_rivate Browsing" +msgstr "P_rivé browsen" + +#: ../midori/midori-browser.c:3237 +msgid "Don't save any private data while browsing" +msgstr "Geen privé-data opslaan tijdens het browsen" + +#: ../midori/midori-browser.c:3242 +msgid "_Menubar" +msgstr "_Menubalk" + +#: ../midori/midori-browser.c:3243 +msgid "Show menubar" +msgstr "Menubalk weergeven" + +#: ../midori/midori-browser.c:3246 +msgid "_Navigationbar" +msgstr "_Navigatiebalk" + +#: ../midori/midori-browser.c:3247 +msgid "Show navigationbar" +msgstr "Navigatiebalk weergeven" + +#: ../midori/midori-browser.c:3250 +msgid "Side_panel" +msgstr "_Paneel" + +#: ../midori/midori-browser.c:3251 +msgid "Show sidepanel" +msgstr "_Paneel weergeven" + +#: ../midori/midori-browser.c:3254 +msgid "_Bookmarkbar" +msgstr "_Bladwijzerbalk" + +#: ../midori/midori-browser.c:3255 +msgid "Show bookmarkbar" +msgstr "Bladwijzerbalk weergeven" + +#: ../midori/midori-browser.c:3258 +msgid "_Transferbar" +msgstr "Bestands_overdrachten-balk" + +#: ../midori/midori-browser.c:3259 +msgid "Show transferbar" +msgstr "Bestandsoverdrachten-balk weergeven" + +#: ../midori/midori-browser.c:3262 +msgid "_Statusbar" +msgstr "_Statusbalk" + +#: ../midori/midori-browser.c:3263 +msgid "Show statusbar" +msgstr "Statusbalk weergeven" + +#: ../midori/midori-browser.c:3680 +msgid "_Location..." +msgstr "_Locatie..." + +#: ../midori/midori-browser.c:3682 +msgid "Open a particular location" +msgstr "Open een locatie" + +#: ../midori/midori-browser.c:3706 +msgid "_Web Search..." +msgstr "Zoeken op het _web..." + +#: ../midori/midori-browser.c:3708 +msgid "Run a web search" +msgstr "Doorzoek het web" + +#: ../midori/midori-browser.c:3727 +msgid "Reopen a previously closed tab or window" +msgstr "Heropen een eerder gesloten tabblad of venster" + +#: ../midori/midori-browser.c:3741 +msgid "_Recently visited pages" +msgstr "_Recent bezochte pagina's" + +#: ../midori/midori-browser.c:3743 +msgid "Reopen pages that you visited earlier" +msgstr "Eerder bezochte pagina's heropenen" + +#: ../midori/midori-browser.c:3759 +msgid "Show the saved bookmarks" +msgstr "Opgeslagen bladwijzers weergeven" + +#: ../midori/midori-browser.c:3773 +msgid "_Window" +msgstr "_Venster" + +#: ../midori/midori-browser.c:3775 +msgid "Show a list of all open tabs" +msgstr "Geef een lijst met open tabbladen weer" + +#: ../midori/midori-browser.c:3899 +msgid "Bookmarks" +msgstr "Bladwijzers" + +#: ../midori/midori-browser.c:3906 ../midori/midori-preferences.c:348 +msgid "Transfers" +msgstr "Bestandsoverdrachten" + +#: ../midori/midori-browser.c:3915 +msgid "Console" +msgstr "Console" + +#: ../midori/midori-browser.c:3959 ../midori/midori-preferences.c:519 +msgid "History" +msgstr "Geschiedenis" + +#. i18n: A panel showing a user specified web page +#: ../midori/midori-browser.c:3969 +msgid "Pageholder" +msgstr "Paginavak" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4038 +msgid "_Inline find:" +msgstr "_Ingebed zoeken:" + +#: ../midori/midori-browser.c:4073 +msgid "Match Case" +msgstr "Hoofdlettergevoelig" + +#: ../midori/midori-browser.c:4081 +msgid "Highlight Matches" +msgstr "Gevonden items markeren" + +#: ../midori/midori-browser.c:4090 +msgid "Close Findbar" +msgstr "Zoekbalk sluiten" + +#: ../midori/midori-browser.c:4336 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Onverwachte configuratie-optie '%s'" + +#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +msgid "Close panel" +msgstr "Paneel sluiten" + +#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1552 +msgid "Blank page" +msgstr "Blanco pagina" + +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:394 +msgid "Homepage" +msgstr "Homepage" + +#: ../midori/midori-websettings.c:134 +msgid "Last open pages" +msgstr "Laatst geopende pagina's" + +#: ../midori/midori-websettings.c:149 +msgid "Chinese (BIG5)" +msgstr "Chinees (BIG5)" + +#: ../midori/midori-websettings.c:150 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japans (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:151 +msgid "Russian (KOI8-R)" +msgstr "Russisch (KOI8-R)" + +#: ../midori/midori-websettings.c:152 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:153 +msgid "Western (ISO-8859-1)" +msgstr "Westers (ISO-8859-1)" + +#: ../midori/midori-websettings.c:154 +msgid "Custom..." +msgstr "Aangepast..." + +#: ../midori/midori-websettings.c:169 +msgid "New tab" +msgstr "Nieuw tabblad" + +#: ../midori/midori-websettings.c:170 +msgid "New window" +msgstr "Nieuw venster" + +#: ../midori/midori-websettings.c:171 +msgid "Current tab" +msgstr "Huidig tabblad" + +#: ../midori/midori-websettings.c:186 +msgid "Default" +msgstr "Standaard" + +#: ../midori/midori-websettings.c:187 +msgid "Icons" +msgstr "Pictogrammen" + +#: ../midori/midori-websettings.c:188 +msgid "Text" +msgstr "Tekst" + +#: ../midori/midori-websettings.c:189 +msgid "Both" +msgstr "Beide" + +#: ../midori/midori-websettings.c:190 +msgid "Both horizontal" +msgstr "Beide horizontaal" + +#: ../midori/midori-websettings.c:205 +msgid "All cookies" +msgstr "Alle cookies" + +#: ../midori/midori-websettings.c:206 +msgid "Session cookies" +msgstr "Sessie-cookies" + +#: ../midori/midori-websettings.c:244 +msgid "Remember last window size" +msgstr "Laatst gebruikte venstergrootte onthouden" + +#: ../midori/midori-websettings.c:245 +msgid "Whether to save the last window size" +msgstr "Laatst gebruiken venstergrootte onthouden" + +#: ../midori/midori-websettings.c:253 +msgid "Last window width" +msgstr "Laatst gebruikte vensterbreedte" + +#: ../midori/midori-websettings.c:254 +msgid "The last saved window width" +msgstr "Laatst gebruikte vensterbreedte" + +#: ../midori/midori-websettings.c:262 +msgid "Last window height" +msgstr "Laatst gebruikte vensterhoogte" + +#: ../midori/midori-websettings.c:263 +msgid "The last saved window height" +msgstr "Laatst gebruikte vensterhoogte" + +#: ../midori/midori-websettings.c:271 +msgid "Last panel position" +msgstr "Laatst gebruikte positie van paneel" + +#: ../midori/midori-websettings.c:272 +msgid "The last saved panel position" +msgstr "Laatst gebruikte positie van paneel" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:281 +msgid "Last panel page" +msgstr "Laatst geopende paneel" + +#: ../midori/midori-websettings.c:282 +msgid "The last saved panel page" +msgstr "Laatst geopende paneel" + +#: ../midori/midori-websettings.c:290 +msgid "Last Web search" +msgstr "Laatst uitgevoerde zoekopdracht" + +#: ../midori/midori-websettings.c:291 +msgid "The last saved Web search" +msgstr "Laatst uitgevoerde zoekopdracht" + +#: ../midori/midori-websettings.c:299 +msgid "Last pageholder URI" +msgstr "Laatst gebruikte URI in het paginavak" + +#: ../midori/midori-websettings.c:300 +msgid "The URI last opened in the pageholder" +msgstr "Laatst gebruikte URI in het paginavak" + +#: ../midori/midori-websettings.c:309 +msgid "Show Menubar" +msgstr "Menubalk weergeven" + +#: ../midori/midori-websettings.c:310 +msgid "Whether to show the menubar" +msgstr "Menubalk weergeven" + +#: ../midori/midori-websettings.c:318 +msgid "Show Navigationbar" +msgstr "Navigatiebalk weergeven" + +#: ../midori/midori-websettings.c:319 +msgid "Whether to show the navigationbar" +msgstr "Navigatiebalk weergeven" + +#: ../midori/midori-websettings.c:327 +msgid "Show Bookmarkbar" +msgstr "Bladwijzerbalk weergeven" + +#: ../midori/midori-websettings.c:328 +msgid "Whether to show the bookmarkbar" +msgstr "Bladwijzerbalk weergeven" + +#: ../midori/midori-websettings.c:336 +msgid "Show Panel" +msgstr "Paneel weergeven" + +#: ../midori/midori-websettings.c:337 +msgid "Whether to show the panel" +msgstr "Paneel weergeven" + +#: ../midori/midori-websettings.c:345 +msgid "Show Statusbar" +msgstr "Statusbalk weergeven" + +#: ../midori/midori-websettings.c:346 +msgid "Whether to show the statusbar" +msgstr "Statusbalk weergeven" + +#: ../midori/midori-websettings.c:355 +msgid "Toolbar Style" +msgstr "Stijl van de werkbalk" + +#: ../midori/midori-websettings.c:356 +msgid "The style of the toolbar" +msgstr "Stijl van de werkbalk" + +#: ../midori/midori-websettings.c:365 +msgid "Toolbar Items" +msgstr "Items in de werkbalk" + +#: ../midori/midori-websettings.c:366 +msgid "The items to show on the toolbar" +msgstr "Items om weer te geven in de werkbalk" + +#: ../midori/midori-websettings.c:374 +msgid "Compact Sidepanel" +msgstr "Compact paneel" + +#: ../midori/midori-websettings.c:375 +msgid "Whether to make the sidepanel compact" +msgstr "Het paneel compact weergeven" + +#: ../midori/midori-websettings.c:384 +msgid "Load on Startup" +msgstr "Laden bij opstarten" + +#: ../midori/midori-websettings.c:385 +msgid "What to load on startup" +msgstr "Wat geladen moet worden tijdens het opstarten" + +#: ../midori/midori-websettings.c:395 +msgid "The homepage" +msgstr "Homepage" + +#: ../midori/midori-websettings.c:403 +msgid "Download Folder" +msgstr "Downloadmap" + +#: ../midori/midori-websettings.c:404 +#, fuzzy +msgid "The folder downloaded files are saved to" +msgstr "De map waar gedownloadede de bestanden worden opgeslagen" + +#: ../midori/midori-websettings.c:412 +msgid "Download Manager" +msgstr "Downloadbeheer" + +#: ../midori/midori-websettings.c:413 +msgid "An external download manager" +msgstr "Extern downloadbeheer" + +#: ../midori/midori-websettings.c:421 +msgid "Text Editor" +msgstr "Tekstbewerker" + +#: ../midori/midori-websettings.c:422 +msgid "An external text editor" +msgstr "Een externe tekstbewerker" + +#: ../midori/midori-websettings.c:430 +msgid "Location entry Search" +msgstr "Zoeken vanuit locatieveld" + +#: ../midori/midori-websettings.c:431 +msgid "The search to perform inside the location entry" +msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" + +#: ../midori/midori-websettings.c:439 +msgid "Preferred Encoding" +msgstr "Voorkeurs-codering" + +#: ../midori/midori-websettings.c:440 +msgid "The preferred character encoding" +msgstr "Voorkeurs-codering" + +#: ../midori/midori-websettings.c:450 +msgid "Always Show Tabbar" +msgstr "Tabbladen altijd weergeven" + +#: ../midori/midori-websettings.c:451 +msgid "Always show the tabbar" +msgstr "Balk met tabbladen altijd weergeven" + +#: ../midori/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "Sluitknoppen op tabbladen" + +#: ../midori/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "Sluitknoppen op tabbladen" + +#: ../midori/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "Nieuwe pagina's openen in" + +#: ../midori/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "Waar nieuwe pagina's geopend moeten worden" + +#: ../midori/midori-websettings.c:478 +msgid "Open external pages in" +msgstr "Externe pagina's openen in" + +#: ../midori/midori-websettings.c:479 +msgid "Where to open externally opened pages" +msgstr "Waar externe pagina's geopend moeten worden" + +#: ../midori/midori-websettings.c:488 +msgid "Middle click opens Selection" +msgstr "Middel-klikken opent selectie" + +#: ../midori/midori-websettings.c:489 +msgid "Load an URL from the selection via middle click" +msgstr "Laad een URL vanuit de selectie met een klik op de middelste muisknop" + +#: ../midori/midori-websettings.c:497 +msgid "Open tabs in the background" +msgstr "Tabbladen op de achtergrond openen" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to open new tabs in the background" +msgstr "Tabbladen op de achtergrond openen" + +#: ../midori/midori-websettings.c:506 +msgid "Open Tabs next to Current" +msgstr "Tabbladen naast het huidige tabblad openen" + +#: ../midori/midori-websettings.c:507 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Tabbladen naast het huidige tabblad openen" + +#: ../midori/midori-websettings.c:515 +msgid "Open popups in tabs" +msgstr "Pop-ups in tabbladen openen" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to open popup windows in tabs" +msgstr "Pop-ups in tabbladen openen" + +#: ../midori/midori-websettings.c:526 +msgid "Accept cookies" +msgstr "Cookies accepteren" + +#: ../midori/midori-websettings.c:527 +msgid "What type of cookies to accept" +msgstr "Welke soorten cookies geaccepteerd moeten worden" + +#: ../midori/midori-websettings.c:536 +msgid "Original cookies only" +msgstr "Alleen originele cookies" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies from the original website only" +msgstr "Alleen cookies accepteren van de originele website" + +#: ../midori/midori-websettings.c:545 +msgid "Maximum cookie age" +msgstr "Maximale leeftijd van cookies" + +#: ../midori/midori-websettings.c:546 +msgid "The maximum number of days to save cookies for" +msgstr "Hoeveel dagen een cookie maximaal bewaard mag worden" + +#: ../midori/midori-websettings.c:556 +msgid "Remember last visited pages" +msgstr "Laatst bezochte pagina's onthouden" + +#: ../midori/midori-websettings.c:557 +msgid "Whether the last visited pages are saved" +msgstr "Laatst bezochte pagina's onthouden" + +#: ../midori/midori-websettings.c:565 +msgid "Maximum history age" +msgstr "Dagen in geschiedenis" + +#: ../midori/midori-websettings.c:566 +msgid "The maximum number of days to save the history for" +msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" + +#: ../midori/midori-websettings.c:574 +msgid "Remember last form inputs" +msgstr "Laatst ingevoerde data in formulieren onthouden" + +#: ../midori/midori-websettings.c:575 +msgid "Whether the last form inputs are saved" +msgstr "Laatst ingevoerde data in formulieren onthouden" + +#: ../midori/midori-websettings.c:583 +#, fuzzy +msgid "Remember last downloaded files" +msgstr "Laatst gedownloadede bestanden onthouden" + +#: ../midori/midori-websettings.c:584 +#, fuzzy +msgid "Whether the last downloaded files are saved" +msgstr "Laatst gedownloadede bestanden onthouden" + +#: ../midori/midori-websettings.c:594 +msgid "HTTP Proxy" +msgstr "HTTP proxy" + +#: ../midori/midori-websettings.c:595 +msgid "The proxy used for HTTP connections" +msgstr "De gebruikte proxy voor HTTP-verbindingen" + +#: ../midori/midori-websettings.c:603 +msgid "Cache size" +msgstr "Cachegrootte" + +#: ../midori/midori-websettings.c:604 +msgid "The allowed size of the cache" +msgstr "Toegestane grootte voor de cache" + +#: ../midori/midori-view.c:866 +msgid "Open Link in New _Tab" +msgstr "Link in nieuw _tabblad openen" + +#: ../midori/midori-view.c:889 +msgid "_Save Link destination" +msgstr "Locatie _opslaan" + +#: ../midori/midori-view.c:897 +msgid "_Download Link destination" +msgstr "Locatie _downloaden" + +#: ../midori/midori-view.c:919 +msgid "Open URL in New _Tab" +msgstr "URL in nieuw _tabblad openen" + +#: ../midori/midori-view.c:1286 +#, c-format +msgid "Inspect page - %s" +msgstr "Pagina analyseren - %s" + +#: ../midori/midori-view.c:1424 +msgid "Source" +msgstr "Bron" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "Voorkeuren voor %s" + +#. Page "General" +#: ../midori/midori-preferences.c:336 +msgid "General" +msgstr "Algemeen" + +#: ../midori/midori-preferences.c:337 +msgid "Startup" +msgstr "Opstarten" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:384 +msgid "Appearance" +msgstr "Weergave" + +#: ../midori/midori-preferences.c:385 +msgid "Font settings" +msgstr "Lettertype" + +#: ../midori/midori-preferences.c:387 +msgid "Default Font Family" +msgstr "Standaard lettertype" + +#: ../midori/midori-preferences.c:395 +msgid "Minimum Font Size" +msgstr "Minimale lettergrootte" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:405 +msgid "Behavior" +msgstr "Gedrag" + +#: ../midori/midori-preferences.c:406 +msgid "Features" +msgstr "Opties" + +#: ../midori/midori-preferences.c:409 +msgid "Load images automatically" +msgstr "Afbeeldingen automatisch laden" + +#: ../midori/midori-preferences.c:412 +msgid "Shrink images automatically" +msgstr "Afbeeldingen automatisch verkleinen" + +#: ../midori/midori-preferences.c:415 +msgid "Print background images" +msgstr "Achtergrondafbeeldingen meenemen in afdrukken" + +#: ../midori/midori-preferences.c:418 +msgid "Resizable text areas" +msgstr "Schaalbare tekstvlakken" + +#: ../midori/midori-preferences.c:421 +msgid "Enable scripts" +msgstr "Scripts aanzetten" + +#: ../midori/midori-preferences.c:424 +msgid "Enable plugins" +msgstr "Plugins aanzetten" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "Ontwikkelaars-opties aanzetten" + +#. Page "Interface" +#: ../midori/midori-preferences.c:439 +msgid "Interface" +msgstr "Gebruik" + +#: ../midori/midori-preferences.c:440 +msgid "Navigationbar" +msgstr "Navigatiebalk" + +#: ../midori/midori-preferences.c:455 +msgid "Browsing" +msgstr "Browsen" + +#: ../midori/midori-preferences.c:482 ../midori/midori-preferences.c:483 +msgid "Network" +msgstr "Netwerk" + +#: ../midori/midori-preferences.c:494 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:500 +msgid "Privacy" +msgstr "Privacy" + +#: ../midori/midori-preferences.c:502 +msgid "Web Cookies" +msgstr "Cookies" + +#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:526 +msgid "days" +msgstr "dagen" + +#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +msgid "Empty" +msgstr "Leeg" + +#: ../midori/midori-searchaction.c:804 +msgid "Add search engine" +msgstr "Zoekmachine toevoegen" + +#: ../midori/midori-searchaction.c:804 +msgid "Edit search engine" +msgstr "Zoekmachine bewerken" + +#: ../midori/midori-searchaction.c:832 +msgid "_Name:" +msgstr "_Naam:" + +#: ../midori/midori-searchaction.c:876 +msgid "_Icon (name or file):" +msgstr "_Pictogram (naam of bestand):" + +#: ../midori/midori-searchaction.c:890 +msgid "_Token:" +msgstr "_Trefwoord:" + +#: ../midori/midori-searchaction.c:1067 +msgid "Manage search engines" +msgstr "Zoekmachines beheren" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Kan externe applicatie niet uitvoeren." + +#: ../midori/sokoke.c:283 +msgid "Warning: You are using a superuser account!" +msgstr "Waarschuwing: u bent ingelogd als root!" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Onbekende fout." + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s heeft geen eigenschap '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s kan niet toegewezen worden aan %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s is niet toegankelijk" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Pictogram '%s' kan niet geladen worden" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Standaardpictogram '%s' kan niet geladen worden" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Film-frames werken niet " + +#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Eigenschap '%s' is ongeldig voor %s" + +#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +msgid "Choose file" +msgstr "Bestand kiezen" + +#: ../katze/katze-utils.c:187 +msgid "Choose folder" +msgstr "Map kiezen" From d11900932ec84f76a9cf36743f45d00685111c27 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 10 Nov 2008 22:48:54 +0100 Subject: [PATCH 0477/2970] Add a note about LINGUAS to TRANSLATE --- TRANSLATE | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TRANSLATE b/TRANSLATE index 6d77eb2f..e620cb65 100644 --- a/TRANSLATE +++ b/TRANSLATE @@ -14,6 +14,9 @@ cd po msginit -l aa_CC -o aa.po -i midori.pot sed -i 's/PACKAGE/midori/g' aa.po +Make sure you add your language to the file po/LINGUAS. +Just open the file with a text editor and add your code. + To check your language 'aa' for errors, do this: msgfmt -c --check-accelerators=_ aa.po From 9e997e4c90f599a3f819dd4f02d1b3ae0f1d71a8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 11 Nov 2008 00:51:28 +0100 Subject: [PATCH 0478/2970] Update location icon even if it's not in the history --- midori/midori-browser.c | 2 ++ midori/midori-locationaction.c | 34 ++++++++++++++++++++++++++++++++-- midori/midori-locationaction.h | 4 ++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7a4bc986..e0a7e7ed 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2910,6 +2910,8 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); + midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action), + midori_view_get_icon (MIDORI_VIEW (view))); title = midori_view_get_display_title (MIDORI_VIEW (view)); window_title = g_strconcat (title, " - ", diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 76641497..57220740 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -611,7 +611,7 @@ midori_location_action_item_iter (MidoriLocationAction* location_action, g_return_val_if_fail (uri != NULL, FALSE); found = FALSE; - model = location_action->model; // filter_model + model = location_action->model; if (gtk_tree_model_get_iter_first (model, iter)) { tmpuri = NULL; @@ -860,6 +860,7 @@ midori_location_action_set_text (MidoriLocationAction* location_action, GdkPixbuf* icon; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (text != NULL); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); if (!proxies) @@ -875,7 +876,7 @@ midori_location_action_set_text (MidoriLocationAction* location_action, gtk_entry_set_text (GTK_ENTRY (entry), text); if (midori_location_action_item_iter (location_action, text, &iter)) { - model = location_action->model; // filter_model + model = location_action->model; gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); @@ -900,6 +901,35 @@ midori_location_action_set_uri (MidoriLocationAction* location_action, midori_location_action_set_text (location_action, uri); } +void +midori_location_action_set_icon (MidoriLocationAction* location_action, + GdkPixbuf* icon) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (icon && GDK_IS_PIXBUF (icon)); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); + } + while ((proxies = g_slist_next (proxies))); +} + /** * midori_location_action_prepend_item: * @location_action: a #MidoriLocationAction diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index a95301c9..5d2d1d23 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -51,6 +51,10 @@ void midori_location_action_set_uri (MidoriLocationAction* location_action, const gchar* uri); +void +midori_location_action_set_icon (MidoriLocationAction* location_action, + GdkPixbuf* icon); + void midori_location_action_add_uri (MidoriLocationAction* location_action, const gchar* uri); From cbea7844020a3ee28b957d3373fc12aa45821674 Mon Sep 17 00:00:00 2001 From: Andhika Padmawan Date: Tue, 11 Nov 2008 21:39:31 +0100 Subject: [PATCH 0479/2970] Add Indonesian translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/id.po | 1379 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1381 insertions(+), 1 deletion(-) create mode 100644 po/id.po diff --git a/AUTHORS b/AUTHORS index 083526b2..acc4a2bf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,6 +29,7 @@ Translations: fr: Robert-André Mauchin gl: Miguel Anxo Bouzada hu: SZERVÁC Attila + id: Andhika Padmawan nl: Vincent Tunru pl: Przemysław Sitek pl: Lukasz Romanowicz diff --git a/po/LINGUAS b/po/LINGUAS index 724b6c51..052cbe4d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fi fr gl hu nl pl ru sv +de es et fi fr gl hu id nl pl ru sv diff --git a/po/id.po b/po/id.po new file mode 100644 index 00000000..2dfc389a --- /dev/null +++ b/po/id.po @@ -0,0 +1,1379 @@ +# Indonesian translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Andhika Padmawan 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-10 20:20+0100\n" +"PO-Revision-Date: 2008-11-11 23:29+0700\n" +"Last-Translator: Andhika Padmawan \n" +"Language-Team: Indonesian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,54,-1,-1,-1,-1\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Peramban web ringan" + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1093 +#: ../midori/main.c:1102 +#: ../midori/main.c:1113 +#: ../midori/main.c:1137 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Peramban Web" + +#: ../midori/main.c:73 +msgid "_Bookmark" +msgstr "_Bookmark" + +#: ../midori/main.c:74 +#: ../midori/midori-browser.c:3757 +msgid "_Bookmarks" +msgstr "_Bookmark" + +#: ../midori/main.c:75 +msgid "_Add Bookmark" +msgstr "_Tambah Bookmark" + +#: ../midori/main.c:76 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/main.c:77 +msgid "_Extensions" +msgstr "_Ekstensi" + +#: ../midori/main.c:78 +msgid "_History" +msgstr "_Riwayat" + +#: ../midori/main.c:79 +msgid "_Homepage" +msgstr "_Beranda" + +#: ../midori/main.c:80 +msgid "_Pageholder" +msgstr "_Pageholder" + +#: ../midori/main.c:81 +msgid "_Userscripts" +msgstr "_Skrip pengguna" + +#: ../midori/main.c:82 +msgid "User_styles" +msgstr "Ga_ya pengguna" + +#: ../midori/main.c:83 +msgid "New _Tab" +msgstr "Tab _Baru" + +#: ../midori/main.c:84 +msgid "_Transfers" +msgstr "_Transfer" + +#: ../midori/main.c:85 +msgid "_Closed Tabs and Windows" +msgstr "Tutup Tab dan _Jendela" + +#: ../midori/main.c:86 +msgid "New _Window" +msgstr "Jendela _Baru" + +#: ../midori/main.c:131 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Konfigurasi tak dapat dimuat: %s\n" + +#: ../midori/main.c:186 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Nilai '%s' hanya sah untuk %s" + +#: ../midori/main.c:193 +#: ../midori/main.c:263 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Nilai konfigurasi '%s' tidak sah" + +#: ../midori/main.c:522 +#: ../midori/main.c:530 +#: ../midori/main.c:560 +#: ../midori/main.c:569 +msgid "Malformed document." +msgstr "Dokumen salah bentuk." + +#: ../midori/main.c:552 +msgid "File not found." +msgstr "Berkas tak ditemukan." + +#: ../midori/main.c:590 +#: ../midori/main.c:622 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Gagal membuka basis data: %s\n" + +#: ../midori/main.c:676 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Gagal menghapus item riwayat: %s\n" + +#: ../midori/main.c:700 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Gagal membersihkan riwayat: %s\n" + +#: ../midori/main.c:733 +#: ../midori/main.c:747 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Gagal menambah item riwayat: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:863 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Gagal menghapus item riwayat lama: %s\n" + +#: ../midori/main.c:995 +#: ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Penulisan gagal." + +#: ../midori/main.c:1020 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sesi tak dapat disimpan. %s" + +#: ../midori/main.c:1052 +msgid "Run the specified filename as javascript" +msgstr "Jalankan nama berkas yang ditentukan sebagai javascript" + +#: ../midori/main.c:1054 +msgid "Display program version" +msgstr "Tampilkan versi program" + +#: ../midori/main.c:1056 +msgid "URIs" +msgstr "URI" + +#: ../midori/main.c:1090 +msgid "[URIs]" +msgstr "[URI]" + +#: ../midori/main.c:1114 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Silakan laporkan komentar, saran dan kutu ke:" + +#: ../midori/main.c:1116 +msgid "Check for new versions at:" +msgstr "Cek versi baru di:" + +#: ../midori/main.c:1137 +msgid "No filename specified" +msgstr "Tak ada nama berkas yang ditentukan" + +#: ../midori/main.c:1154 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Sebuah instansi Midori telah berjalan namun tidak merespon.\n" + +#: ../midori/main.c:1189 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Bookmark tak dapat dimuat: %s\n" + +#: ../midori/main.c:1203 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sesi tak dapat dimuat: %s\n" + +#: ../midori/main.c:1215 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Kotak sampah tak dapat dimuat: %s\n" + +#: ../midori/main.c:1228 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Riwayat tak dapat dimuat: %s\n" + +#: ../midori/main.c:1241 +msgid "The following errors occured:" +msgstr "Galat berikut terjadi:" + +#: ../midori/main.c:1400 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Mesin pencari tak dapat disimpan. %s" + +#: ../midori/main.c:1410 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bookmark tak dapat disimpan. %s" + +#: ../midori/main.c:1419 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Kotak sampah tak dapat disimpan. %s" + +#: ../midori/main.c:1427 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Konfigurasi tak dapat disimpan. %s" + +#: ../midori/midori-addons.c:87 +#: ../midori/midori-websettings.c:207 +msgid "None" +msgstr "Tak ada" + +#: ../midori/midori-addons.c:88 +#: ../midori/midori-browser.c:3995 +msgid "Extensions" +msgstr "Ekstensi" + +#: ../midori/midori-addons.c:89 +#: ../midori/midori-browser.c:3978 +msgid "Userscripts" +msgstr "Skrip pengguna" + +#: ../midori/midori-addons.c:90 +#: ../midori/midori-browser.c:3986 +msgid "Userstyles" +msgstr "Gaya pengguna" + +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Aktifkan" + +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Non Aktifkan" + +#: ../midori/midori-browser.c:251 +#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3144 +msgid "Reload the current page" +msgstr "Muat ulang halaman ini" + +#: ../midori/midori-browser.c:263 +#: ../midori/midori-browser.c:3141 +msgid "Stop loading the current page" +msgstr "Stop memuat halaman ini" + +#: ../midori/midori-browser.c:321 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% termuat" + +#: ../midori/midori-browser.c:344 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Aksi tak diharapkan '%s'." + +#: ../midori/midori-browser.c:511 +msgid "New bookmark" +msgstr "Bookmark baru" + +#: ../midori/midori-browser.c:511 +msgid "Edit bookmark" +msgstr "Sunting bookmark" + +#: ../midori/midori-browser.c:533 +msgid "_Title:" +msgstr "_Judul:" + +#: ../midori/midori-browser.c:546 +#: ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Keterangan:" + +#: ../midori/midori-browser.c:565 +#: ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:581 +msgid "_Folder:" +msgstr "_Folder:" + +#: ../midori/midori-browser.c:585 +msgid "Root" +msgstr "Root" + +#: ../midori/midori-browser.c:664 +msgid "Save file as" +msgstr "Simpan berkas sebagai" + +#: ../midori/midori-browser.c:1246 +msgid "Open file" +msgstr "Buka berkas" + +#: ../midori/midori-browser.c:2316 +msgid "Open in New _Tab" +msgstr "Buka di _Tab Baru" + +#: ../midori/midori-browser.c:2318 +msgid "Open in New _Window" +msgstr "Buka di _Jendela Baru" + +#: ../midori/midori-browser.c:2590 +msgid "Separator" +msgstr "Pemisah" + +#: ../midori/midori-browser.c:2702 +#, c-format +msgid "A week ago" +msgstr "Seminggu yang lalu" + +#: ../midori/midori-browser.c:2708 +#, c-format +msgid "%d days ago" +msgstr "%d hari yang lalu" + +#: ../midori/midori-browser.c:2715 +msgid "Today" +msgstr "Hari Ini" + +#: ../midori/midori-browser.c:2717 +msgid "Yesterday" +msgstr "Kemarin" + +#: ../midori/midori-browser.c:2806 +msgid "A lightweight web browser." +msgstr "Peramban web ringan." + +#: ../midori/midori-browser.c:2814 +msgid "translator-credits" +msgstr "Andhika Padmawan 2008" + +#: ../midori/midori-browser.c:2966 +msgid "Are you sure you want to remove all history items?" +msgstr "Anda yakin ingin menghapus semua item riwayat?" + +#: ../midori/midori-browser.c:3072 +msgid "_File" +msgstr "_Berkas" + +#: ../midori/midori-browser.c:3075 +msgid "Open a new window" +msgstr "Buka di jendela baru" + +#: ../midori/midori-browser.c:3078 +msgid "Open a new tab" +msgstr "Buka di tab baru" + +#: ../midori/midori-browser.c:3081 +msgid "Open a file" +msgstr "Buka berkas" + +#: ../midori/midori-browser.c:3084 +msgid "Save to a file" +msgstr "Simpan ke berkas" + +#: ../midori/midori-browser.c:3086 +msgid "_Close Tab" +msgstr "_Tutup Tab" + +#: ../midori/midori-browser.c:3087 +msgid "Close the current tab" +msgstr "Tutup tab saat ini" + +#: ../midori/midori-browser.c:3089 +msgid "C_lose Window" +msgstr "T_utup Jendela" + +#: ../midori/midori-browser.c:3090 +msgid "Close this window" +msgstr "Tutup jendela ini" + +#: ../midori/midori-browser.c:3093 +msgid "Print the current page" +msgstr "Cetak halaman saat ini" + +#: ../midori/midori-browser.c:3096 +msgid "Quit the application" +msgstr "Keluar aplikasi" + +#: ../midori/midori-browser.c:3098 +msgid "_Edit" +msgstr "_Sunting" + +#: ../midori/midori-browser.c:3101 +msgid "Cut the selected text" +msgstr "Potong teks terpilih" + +#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3107 +msgid "Copy the selected text" +msgstr "Salin teks terpilih" + +#: ../midori/midori-browser.c:3110 +msgid "Paste text from the clipboard" +msgstr "Tempel teks dari papan klip" + +#: ../midori/midori-browser.c:3113 +msgid "Delete the selected text" +msgstr "Hapus teks terpilih" + +#: ../midori/midori-browser.c:3116 +msgid "Select all text" +msgstr "Pilih semua teks" + +#: ../midori/midori-browser.c:3119 +msgid "Find a word or phrase in the page" +msgstr "Cari kata atau frasa di halaman" + +#: ../midori/midori-browser.c:3121 +msgid "Find _Next" +msgstr "Cari _Berikutnya" + +#: ../midori/midori-browser.c:3122 +msgid "Find the next occurrence of a word or phrase" +msgstr "Cari kejadian berikutnya dari kata atau frasa" + +#: ../midori/midori-browser.c:3124 +msgid "Find _Previous" +msgstr "Cari _Sebelumnya" + +#: ../midori/midori-browser.c:3125 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Cari kejadian sebelumnya dari kata atau frasa" + +#: ../midori/midori-browser.c:3128 +msgid "_Quick Find" +msgstr "_Cari Cepat" + +#: ../midori/midori-browser.c:3129 +msgid "Quickly jump to a word or phrase" +msgstr "Lompat segera ke kata atau frasa" + +#: ../midori/midori-browser.c:3132 +msgid "Configure the application preferences" +msgstr "Konfigurasi pilihan aplikasi" + +#: ../midori/midori-browser.c:3134 +msgid "_View" +msgstr "_Tampilan" + +#: ../midori/midori-browser.c:3135 +msgid "_Toolbars" +msgstr "_Batang Alat" + +#: ../midori/midori-browser.c:3147 +msgid "Increase the zoom level" +msgstr "Naikkan level pembesaran" + +#: ../midori/midori-browser.c:3150 +msgid "Decrease the zoom level" +msgstr "Turunkan level pembesaran" + +#: ../midori/midori-browser.c:3153 +msgid "Reset the zoom level" +msgstr "Reset level pembesaran" + +#: ../midori/midori-browser.c:3155 +#: ../midori/midori-view.c:962 +msgid "View _Source" +msgstr "Tampilkan _Sumber" + +#: ../midori/midori-browser.c:3156 +msgid "View the source code of the page" +msgstr "Tampilkan kode program dari halaman" + +#: ../midori/midori-browser.c:3158 +msgid "View Selection Source" +msgstr "Tampilkan Pemilihan Sumber" + +#: ../midori/midori-browser.c:3159 +msgid "View the source code of the selection" +msgstr "Tampilkan kode program dari pemilihan" + +#: ../midori/midori-browser.c:3163 +msgid "Toggle fullscreen view" +msgstr "Aktifkan tampilan layar penuh" + +#: ../midori/midori-browser.c:3165 +msgid "_Go" +msgstr "_Ke" + +#: ../midori/midori-browser.c:3168 +msgid "Go back to the previous page" +msgstr "Mundur ke halaman sebelumnya" + +#: ../midori/midori-browser.c:3171 +msgid "Go forward to the next page" +msgstr "Maju ke halaman berikutnya" + +#: ../midori/midori-browser.c:3174 +msgid "Go to your homepage" +msgstr "Ke laman anda" + +#: ../midori/midori-browser.c:3176 +msgid "Open in Page_holder..." +msgstr "Buka di Page_holder..." + +#: ../midori/midori-browser.c:3177 +msgid "Open the current page in the pageholder" +msgstr "Buka halaman saat ini di pageholder" + +#: ../midori/midori-browser.c:3179 +msgid "Empty Trash" +msgstr "Kosongkan Tempat Sampah" + +#: ../midori/midori-browser.c:3180 +msgid "Delete the contents of the trash" +msgstr "Hapus isi tempat sampah" + +#: ../midori/midori-browser.c:3182 +#: ../midori/midori-view.c:934 +msgid "Undo Close Tab" +msgstr "Batalkan Menutup Tab" + +#: ../midori/midori-browser.c:3183 +msgid "Open the last closed tab" +msgstr "Buka tab yang terakhir ditutup" + +#: ../midori/midori-browser.c:3187 +msgid "Add a new bookmark" +msgstr "Tambah bookmark baru" + +#: ../midori/midori-browser.c:3190 +msgid "Edit the selected bookmark" +msgstr "Sunting bookmark terpilih" + +#: ../midori/midori-browser.c:3193 +msgid "Delete the selected bookmark" +msgstr "Hapus bookmark terpilih" + +#: ../midori/midori-browser.c:3196 +msgid "Delete the selected history item" +msgstr "Hapus item riwayat terpilih" + +#: ../midori/midori-browser.c:3199 +msgid "Clear the entire history" +msgstr "Bersihkan seluruh riwayat" + +#: ../midori/midori-browser.c:3202 +msgid "Bookmark the selected history item" +msgstr "Bookmark item riwayat terpilih" + +#: ../midori/midori-browser.c:3204 +msgid "_Tools" +msgstr "_Alat" + +#: ../midori/midori-browser.c:3206 +#: ../midori/midori-searchaction.c:468 +msgid "_Manage Search Engines" +msgstr "_Atur Mesin Pencari" + +#: ../midori/midori-browser.c:3207 +msgid "Add, edit and remove search engines..." +msgstr "Tambah, sunting dan hapus mesin pencari..." + +#: ../midori/midori-browser.c:3211 +msgid "_Previous Tab" +msgstr "_Tab Sebelumnya" + +#: ../midori/midori-browser.c:3212 +msgid "Switch to the previous tab" +msgstr "Pindah ke tab sebelumnya" + +#: ../midori/midori-browser.c:3214 +msgid "_Next Tab" +msgstr "Tab _Berikutnya" + +#: ../midori/midori-browser.c:3215 +msgid "Switch to the next tab" +msgstr "Pindah ke tab berikutnya" + +#: ../midori/midori-browser.c:3217 +msgid "_Help" +msgstr "_Bantuan" + +#: ../midori/midori-browser.c:3219 +msgid "_Contents" +msgstr "_Isi" + +#: ../midori/midori-browser.c:3220 +msgid "Show the documentation" +msgstr "Tampilkan dokumentasi" + +#: ../midori/midori-browser.c:3222 +msgid "_Frequent questions" +msgstr "_Pertanyaan sering" + +#: ../midori/midori-browser.c:3223 +msgid "Show the Frequently Asked Questions" +msgstr "Tampilkan Pertanyaan Acapkali Diajukan" + +#: ../midori/midori-browser.c:3225 +msgid "_Report a bug" +msgstr "_Laporkan kutu" + +#: ../midori/midori-browser.c:3226 +msgid "Open Midori's bug tracker" +msgstr "Buka pelacak kutu Midori" + +#: ../midori/midori-browser.c:3229 +msgid "Show information about the program" +msgstr "Tampilkan informasi tentang program" + +#: ../midori/midori-browser.c:3236 +msgid "P_rivate Browsing" +msgstr "Meramban P_rivat" + +#: ../midori/midori-browser.c:3237 +msgid "Don't save any private data while browsing" +msgstr "Jangan simpan data privat ketika meramban" + +#: ../midori/midori-browser.c:3242 +msgid "_Menubar" +msgstr "_Batang menu" + +#: ../midori/midori-browser.c:3243 +msgid "Show menubar" +msgstr "Tampilkan batang menu" + +#: ../midori/midori-browser.c:3246 +msgid "_Navigationbar" +msgstr "Batang _navigasi" + +#: ../midori/midori-browser.c:3247 +msgid "Show navigationbar" +msgstr "Tampilkan batang navigasi" + +#: ../midori/midori-browser.c:3250 +msgid "Side_panel" +msgstr "Panel _sisi" + +#: ../midori/midori-browser.c:3251 +msgid "Show sidepanel" +msgstr "Tampilkan panel sisi" + +#: ../midori/midori-browser.c:3254 +msgid "_Bookmarkbar" +msgstr "Batang _bookmark" + +#: ../midori/midori-browser.c:3255 +msgid "Show bookmarkbar" +msgstr "Tampilkan batang bookmark" + +#: ../midori/midori-browser.c:3258 +msgid "_Transferbar" +msgstr "Batang _transfer" + +#: ../midori/midori-browser.c:3259 +msgid "Show transferbar" +msgstr "Tampilkan batang transfer" + +#: ../midori/midori-browser.c:3262 +msgid "_Statusbar" +msgstr "Batang stat_us" + +#: ../midori/midori-browser.c:3263 +msgid "Show statusbar" +msgstr "Tampilkan batang status" + +#: ../midori/midori-browser.c:3680 +msgid "_Location..." +msgstr "_Lokasi..." + +#: ../midori/midori-browser.c:3682 +msgid "Open a particular location" +msgstr "Buka lokasi khusus" + +#: ../midori/midori-browser.c:3706 +msgid "_Web Search..." +msgstr "Penelusuran _Web..." + +#: ../midori/midori-browser.c:3708 +msgid "Run a web search" +msgstr "Jalankan penelusuran web" + +#: ../midori/midori-browser.c:3727 +msgid "Reopen a previously closed tab or window" +msgstr "Buka kembali tab atau jendela yang sebelumnya tertutup" + +#: ../midori/midori-browser.c:3741 +msgid "_Recently visited pages" +msgstr "_Halaman yang baru dikunjungi" + +#: ../midori/midori-browser.c:3743 +msgid "Reopen pages that you visited earlier" +msgstr "Buka kembali halaman yang sebelumnya anda kunjungi" + +#: ../midori/midori-browser.c:3759 +msgid "Show the saved bookmarks" +msgstr "Tampilkan bookmark tersimpan" + +#: ../midori/midori-browser.c:3773 +msgid "_Window" +msgstr "_Jendela" + +#: ../midori/midori-browser.c:3775 +msgid "Show a list of all open tabs" +msgstr "Tampilkan senarai semua tab yang terbuka" + +#: ../midori/midori-browser.c:3899 +msgid "Bookmarks" +msgstr "Bookmark" + +#: ../midori/midori-browser.c:3906 +#: ../midori/midori-preferences.c:348 +msgid "Transfers" +msgstr "Transfer" + +#: ../midori/midori-browser.c:3915 +msgid "Console" +msgstr "Konsol" + +#: ../midori/midori-browser.c:3959 +#: ../midori/midori-preferences.c:519 +msgid "History" +msgstr "Riwayat" + +#. i18n: A panel showing a user specified web page +#: ../midori/midori-browser.c:3969 +msgid "Pageholder" +msgstr "Pageholder" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4038 +msgid "_Inline find:" +msgstr "_Cari dalam baris:" + +#: ../midori/midori-browser.c:4073 +msgid "Match Case" +msgstr "Cocokkan Huruf" + +#: ../midori/midori-browser.c:4081 +msgid "Highlight Matches" +msgstr "Sorot Kecocokan" + +#: ../midori/midori-browser.c:4090 +msgid "Close Findbar" +msgstr "Tutup batang cari" + +#: ../midori/midori-browser.c:4336 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Pengaturan tak diharapkan '%s'" + +#: ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:208 +msgid "Close panel" +msgstr "Tutup panel" + +#: ../midori/midori-websettings.c:132 +#: ../midori/midori-view.c:1552 +msgid "Blank page" +msgstr "Halaman kosong" + +#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:394 +msgid "Homepage" +msgstr "Beranda" + +#: ../midori/midori-websettings.c:134 +msgid "Last open pages" +msgstr "Halaman terakhir dibuka" + +#: ../midori/midori-websettings.c:149 +msgid "Chinese (BIG5)" +msgstr "China (BIG5)" + +#: ../midori/midori-websettings.c:150 +msgid "Japanese (SHIFT_JIS)" +msgstr "Jepang (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:151 +msgid "Russian (KOI8-R)" +msgstr "Rusia (KOI8-R)" + +#: ../midori/midori-websettings.c:152 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:153 +msgid "Western (ISO-8859-1)" +msgstr "Barat (ISO-8859-1)" + +#: ../midori/midori-websettings.c:154 +msgid "Custom..." +msgstr "Suai..." + +#: ../midori/midori-websettings.c:169 +msgid "New tab" +msgstr "Tab baru" + +#: ../midori/midori-websettings.c:170 +msgid "New window" +msgstr "Jendela baru" + +#: ../midori/midori-websettings.c:171 +msgid "Current tab" +msgstr "Tab saat ini" + +#: ../midori/midori-websettings.c:186 +msgid "Default" +msgstr "Standar" + +#: ../midori/midori-websettings.c:187 +msgid "Icons" +msgstr "Ikon" + +#: ../midori/midori-websettings.c:188 +msgid "Text" +msgstr "Teks" + +#: ../midori/midori-websettings.c:189 +msgid "Both" +msgstr "Keduanya" + +#: ../midori/midori-websettings.c:190 +msgid "Both horizontal" +msgstr "Keduanya horizontal" + +#: ../midori/midori-websettings.c:205 +msgid "All cookies" +msgstr "Semua kuki" + +#: ../midori/midori-websettings.c:206 +msgid "Session cookies" +msgstr "Kuki sesi" + +#: ../midori/midori-websettings.c:244 +msgid "Remember last window size" +msgstr "Ingat ukuran jendela terakhir" + +#: ../midori/midori-websettings.c:245 +msgid "Whether to save the last window size" +msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan" + +#: ../midori/midori-websettings.c:253 +msgid "Last window width" +msgstr "Lebar jendela terakhir" + +#: ../midori/midori-websettings.c:254 +msgid "The last saved window width" +msgstr "Lebar jendela terakhir tersimpan" + +#: ../midori/midori-websettings.c:262 +msgid "Last window height" +msgstr "Tinggi jendela terakhir" + +#: ../midori/midori-websettings.c:263 +msgid "The last saved window height" +msgstr "Tinggi jendela terakhir tersimpan" + +#: ../midori/midori-websettings.c:271 +msgid "Last panel position" +msgstr "Posisi panel terakhir" + +#: ../midori/midori-websettings.c:272 +msgid "The last saved panel position" +msgstr "Posisi panel terakhir tersimpan" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:281 +msgid "Last panel page" +msgstr "Halaman panel terakhir" + +#: ../midori/midori-websettings.c:282 +msgid "The last saved panel page" +msgstr "Halaman panel terakhir tersimpan" + +#: ../midori/midori-websettings.c:290 +msgid "Last Web search" +msgstr "Penelusuran Web terakhir" + +#: ../midori/midori-websettings.c:291 +msgid "The last saved Web search" +msgstr "Penelusuran Web terakhir tersimpan" + +#: ../midori/midori-websettings.c:299 +msgid "Last pageholder URI" +msgstr "URI pageholder terakhir" + +#: ../midori/midori-websettings.c:300 +msgid "The URI last opened in the pageholder" +msgstr "URI terakhir dibuka di pageholder" + +#: ../midori/midori-websettings.c:309 +msgid "Show Menubar" +msgstr "Tampilkan Batang Menu" + +#: ../midori/midori-websettings.c:310 +msgid "Whether to show the menubar" +msgstr "Apakah ingin menampilkan batang menu" + +#: ../midori/midori-websettings.c:318 +msgid "Show Navigationbar" +msgstr "Tampilkan Batang Navigasi" + +#: ../midori/midori-websettings.c:319 +msgid "Whether to show the navigationbar" +msgstr "Apakah ingin menampilkan batang navigasi" + +#: ../midori/midori-websettings.c:327 +msgid "Show Bookmarkbar" +msgstr "Tampilkan Batang Bookmark" + +#: ../midori/midori-websettings.c:328 +msgid "Whether to show the bookmarkbar" +msgstr "Apakah ingin menampilkan batang bookmark" + +#: ../midori/midori-websettings.c:336 +msgid "Show Panel" +msgstr "Tampilkan Panel" + +#: ../midori/midori-websettings.c:337 +msgid "Whether to show the panel" +msgstr "Apakah ingin menampilkan panel" + +#: ../midori/midori-websettings.c:345 +msgid "Show Statusbar" +msgstr "Tampilkan Batang Status" + +#: ../midori/midori-websettings.c:346 +msgid "Whether to show the statusbar" +msgstr "Apakah ingin menampilkan batang status" + +#: ../midori/midori-websettings.c:355 +msgid "Toolbar Style" +msgstr "Gaya Batang Alat" + +#: ../midori/midori-websettings.c:356 +msgid "The style of the toolbar" +msgstr "Gaya dari batang alat" + +#: ../midori/midori-websettings.c:365 +msgid "Toolbar Items" +msgstr "Item Batang Alat" + +#: ../midori/midori-websettings.c:366 +msgid "The items to show on the toolbar" +msgstr "Item yang akan ditampilkan di batang alat" + +#: ../midori/midori-websettings.c:374 +msgid "Compact Sidepanel" +msgstr "Panel Sisi Kompak" + +#: ../midori/midori-websettings.c:375 +msgid "Whether to make the sidepanel compact" +msgstr "Apakah ingin membuat panel sisi kompak" + +#: ../midori/midori-websettings.c:384 +msgid "Load on Startup" +msgstr "Muat saat Mulai" + +#: ../midori/midori-websettings.c:385 +msgid "What to load on startup" +msgstr "Apa yang akan dimuat saat mulai" + +#: ../midori/midori-websettings.c:395 +msgid "The homepage" +msgstr "Laman" + +#: ../midori/midori-websettings.c:403 +msgid "Download Folder" +msgstr "Folder Unduh" + +#: ../midori/midori-websettings.c:404 +msgid "The folder downloaded files are saved to" +msgstr "Folder berkas terunduh disimpan di" + +#: ../midori/midori-websettings.c:412 +msgid "Download Manager" +msgstr "Manajer Unduh" + +#: ../midori/midori-websettings.c:413 +msgid "An external download manager" +msgstr "Manajer unduh eksternal" + +#: ../midori/midori-websettings.c:421 +msgid "Text Editor" +msgstr "Penyunting Teks" + +#: ../midori/midori-websettings.c:422 +msgid "An external text editor" +msgstr "Penyunting teks eksternal" + +#: ../midori/midori-websettings.c:430 +msgid "Location entry Search" +msgstr "Pencari entri lokasi" + +#: ../midori/midori-websettings.c:431 +msgid "The search to perform inside the location entry" +msgstr "Pencarian yang dilakukan di dalam entri lokasi" + +#: ../midori/midori-websettings.c:439 +msgid "Preferred Encoding" +msgstr "Penyandian Kesukaan" + +#: ../midori/midori-websettings.c:440 +msgid "The preferred character encoding" +msgstr "Penyandian karakter kesukaan" + +#: ../midori/midori-websettings.c:450 +msgid "Always Show Tabbar" +msgstr "Selalu Tampilkan Batang Tab" + +#: ../midori/midori-websettings.c:451 +msgid "Always show the tabbar" +msgstr "Selalu tampilkan batang tab" + +#: ../midori/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "Tutup Tombol di Tab" + +#: ../midori/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "Apakah tab memiliki tombol tutup" + +#: ../midori/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "Buka halaman baru di" + +#: ../midori/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "Dimana membuka halaman baru" + +#: ../midori/midori-websettings.c:478 +msgid "Open external pages in" +msgstr "Buka halaman eksternal di" + +#: ../midori/midori-websettings.c:479 +msgid "Where to open externally opened pages" +msgstr "Dimana ingin membuka halaman yang dibuka secara eksternal" + +#: ../midori/midori-websettings.c:488 +msgid "Middle click opens Selection" +msgstr "Klik tengah membuka Pilihan" + +#: ../midori/midori-websettings.c:489 +msgid "Load an URL from the selection via middle click" +msgstr "Muat URI dari pilihan via klik tengah" + +#: ../midori/midori-websettings.c:497 +msgid "Open tabs in the background" +msgstr "Buka tab di latar belakang" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to open new tabs in the background" +msgstr "Apakah ingin membuka tab baru di latar belakang" + +#: ../midori/midori-websettings.c:506 +msgid "Open Tabs next to Current" +msgstr "Buka tab di samping Saat Ini" + +#: ../midori/midori-websettings.c:507 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Apakah ingin membuka tab baru di sebelah tab saat ini atau setelah tab terakhir" + +#: ../midori/midori-websettings.c:515 +msgid "Open popups in tabs" +msgstr "Buka popup di tab" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to open popup windows in tabs" +msgstr "Apakah ingin membuka jendela popup di tab" + +#: ../midori/midori-websettings.c:526 +msgid "Accept cookies" +msgstr "Terima kuki" + +#: ../midori/midori-websettings.c:527 +msgid "What type of cookies to accept" +msgstr "Tipe kuki apa yang diterima" + +#: ../midori/midori-websettings.c:536 +msgid "Original cookies only" +msgstr "Hanya kuki asli" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies from the original website only" +msgstr "Terima kuki hanya dari situs web asli" + +#: ../midori/midori-websettings.c:545 +msgid "Maximum cookie age" +msgstr "Usia kuki maksimum" + +#: ../midori/midori-websettings.c:546 +msgid "The maximum number of days to save cookies for" +msgstr "Jumlah maksimum hari untuk menyimpan kuki" + +#: ../midori/midori-websettings.c:556 +msgid "Remember last visited pages" +msgstr "Ingat halaman terakhir dikunjungi" + +#: ../midori/midori-websettings.c:557 +msgid "Whether the last visited pages are saved" +msgstr "Apakah halaman terakhir dikunjungi tersimpan" + +#: ../midori/midori-websettings.c:565 +msgid "Maximum history age" +msgstr "Usia riwayat maksimum" + +#: ../midori/midori-websettings.c:566 +msgid "The maximum number of days to save the history for" +msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat" + +#: ../midori/midori-websettings.c:574 +msgid "Remember last form inputs" +msgstr "Ingat bentuk terakhir masukan" + +#: ../midori/midori-websettings.c:575 +msgid "Whether the last form inputs are saved" +msgstr "Apakah bentuk terakhir masukan disimpan" + +#: ../midori/midori-websettings.c:583 +msgid "Remember last downloaded files" +msgstr "Ingat berkas terakhir terunduh" + +#: ../midori/midori-websettings.c:584 +msgid "Whether the last downloaded files are saved" +msgstr "Apakah berkas terakhir terunduh disimpan" + +#: ../midori/midori-websettings.c:594 +msgid "HTTP Proxy" +msgstr "Proxy HTTP" + +#: ../midori/midori-websettings.c:595 +msgid "The proxy used for HTTP connections" +msgstr "Proxy yang digunakan untuk koneksi HTTP" + +#: ../midori/midori-websettings.c:603 +msgid "Cache size" +msgstr "Ukuran tembolok" + +#: ../midori/midori-websettings.c:604 +msgid "The allowed size of the cache" +msgstr "Ukuran tembolok yang diizinkan" + +#: ../midori/midori-view.c:866 +msgid "Open Link in New _Tab" +msgstr "Buka Taut di _Tab Baru" + +#: ../midori/midori-view.c:889 +msgid "_Save Link destination" +msgstr "_Simpan Taut tujuan" + +#: ../midori/midori-view.c:897 +msgid "_Download Link destination" +msgstr "_Unduh Taut tujuan" + +#: ../midori/midori-view.c:919 +msgid "Open URL in New _Tab" +msgstr "Buka URL di _Tab Baru" + +#: ../midori/midori-view.c:1286 +#, c-format +msgid "Inspect page - %s" +msgstr "Periksa halaman - %s" + +#: ../midori/midori-view.c:1424 +msgid "Source" +msgstr "Sumber" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "Pengaturan untuk %s" + +#. Page "General" +#: ../midori/midori-preferences.c:336 +msgid "General" +msgstr "Umum" + +#: ../midori/midori-preferences.c:337 +msgid "Startup" +msgstr "Mulai" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:384 +msgid "Appearance" +msgstr "Tampilan" + +#: ../midori/midori-preferences.c:385 +msgid "Font settings" +msgstr "Pengaturan fonta" + +#: ../midori/midori-preferences.c:387 +msgid "Default Font Family" +msgstr "Keluarga Fonta Standar" + +#: ../midori/midori-preferences.c:395 +msgid "Minimum Font Size" +msgstr "Ukuran Fonta Minimum" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:405 +msgid "Behavior" +msgstr "Perilaku" + +#: ../midori/midori-preferences.c:406 +msgid "Features" +msgstr "Fitur" + +#: ../midori/midori-preferences.c:409 +msgid "Load images automatically" +msgstr "Muat citra secara otomatis" + +#: ../midori/midori-preferences.c:412 +msgid "Shrink images automatically" +msgstr "Kecilkan citra secara otomatis" + +#: ../midori/midori-preferences.c:415 +msgid "Print background images" +msgstr "Cetak citra latar belakang" + +#: ../midori/midori-preferences.c:418 +msgid "Resizable text areas" +msgstr "Area teks dapat diubah ukuran" + +#: ../midori/midori-preferences.c:421 +msgid "Enable scripts" +msgstr "Aktifkan skrip" + +#: ../midori/midori-preferences.c:424 +msgid "Enable plugins" +msgstr "Aktifkan plugin" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "Aktifkan alat pengembang" + +#. Page "Interface" +#: ../midori/midori-preferences.c:439 +msgid "Interface" +msgstr "Antarmuka" + +#: ../midori/midori-preferences.c:440 +msgid "Navigationbar" +msgstr "Batang navigasi" + +#: ../midori/midori-preferences.c:455 +msgid "Browsing" +msgstr "Meramban" + +#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:483 +msgid "Network" +msgstr "Jaringan" + +#: ../midori/midori-preferences.c:494 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:500 +msgid "Privacy" +msgstr "Privasi" + +#: ../midori/midori-preferences.c:502 +msgid "Web Cookies" +msgstr "Kuki Web" + +#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:526 +msgid "days" +msgstr "hari" + +#: ../midori/midori-searchaction.c:459 +#: ../katze/katze-arrayaction.c:289 +msgid "Empty" +msgstr "Kosong" + +#: ../midori/midori-searchaction.c:804 +msgid "Add search engine" +msgstr "Tambah mesin pencari" + +#: ../midori/midori-searchaction.c:804 +msgid "Edit search engine" +msgstr "Sunting mesin pencari" + +#: ../midori/midori-searchaction.c:832 +msgid "_Name:" +msgstr "_Nama:" + +#: ../midori/midori-searchaction.c:876 +msgid "_Icon (name or file):" +msgstr "_Ikon (nama atau berkas):" + +#: ../midori/midori-searchaction.c:890 +msgid "_Token:" +msgstr "_Token:" + +#: ../midori/midori-searchaction.c:1067 +msgid "Manage search engines" +msgstr "Atur mesin pencari" + +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Tak dapat menjalankan program eksternal." + +#: ../midori/sokoke.c:283 +msgid "Warning: You are using a superuser account!" +msgstr "Peringatan: Anda menggunakan akun superuser!" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Galat tak diketahui terjadi." + +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s tak memiliki properti '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s tak dapat ditugaskan ke %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s tak dapat diakses" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Ikon bernama '%s' tak dapat dimuat" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Stok ikon '%s' tak dapat dimuat" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Bingkai animasi rusak" + +#: ../katze/katze-utils.c:147 +#: ../katze/katze-utils.c:334 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Properti '%s' tidak sah untuk %s" + +#: ../katze/katze-utils.c:169 +#: ../katze/katze-utils.c:205 +msgid "Choose file" +msgstr "Pilih berkas" + +#: ../katze/katze-utils.c:187 +msgid "Choose folder" +msgstr "Pilih folder" From f77e79be7836ded2cc52a738f9d7585e4ba7c7b4 Mon Sep 17 00:00:00 2001 From: Mirat Can Bayrak Date: Tue, 11 Nov 2008 21:58:08 +0100 Subject: [PATCH 0480/2970] Add Turkish translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/tr.po | 1382 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1384 insertions(+), 1 deletion(-) create mode 100644 po/tr.po diff --git a/AUTHORS b/AUTHORS index acc4a2bf..9cf55fc2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -35,6 +35,7 @@ Translations: pl: Lukasz Romanowicz ru: Troitskiy Nikita sv: Mikael Magnusson + tr: Mirat Can Bayrak Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen diff --git a/po/LINGUAS b/po/LINGUAS index 052cbe4d..f0be0ec3 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fi fr gl hu id nl pl ru sv +de es et fi fr gl hu id nl pl ru sv tr diff --git a/po/tr.po b/po/tr.po new file mode 100644 index 00000000..d2d90c31 --- /dev/null +++ b/po/tr.po @@ -0,0 +1,1382 @@ +# Turkish translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Mirat Can Bayrak +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-02 23:30+0100\n" +"PO-Revision-Date: 2008-11-10 16:53+0200\n" +"Last-Translator: Mirat Can Bayrak \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Hafif web tarayıcı " + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1098 +#: ../midori/main.c:1107 +#: ../midori/main.c:1118 +#: ../midori/main.c:1142 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Web Tarayıcı" + +#: ../midori/main.c:71 +msgid "_Bookmark" +msgstr "_Yer imi" + +#: ../midori/main.c:72 +#: ../midori/midori-browser.c:3537 +msgid "_Bookmarks" +msgstr "_Yer İmleri" + +#: ../midori/main.c:73 +msgid "_Add Bookmark" +msgstr "_Yer İmi Ekle" + +#: ../midori/main.c:74 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/main.c:75 +msgid "_Extensions" +msgstr "_Eklentiler" + +#: ../midori/main.c:76 +msgid "_History" +msgstr "_Geçmiş" + +#: ../midori/main.c:77 +msgid "_Homepage" +msgstr "_Anasayfa" + +#: ../midori/main.c:78 +msgid "_Pageholder" +msgstr "_Sayfa tutucu" + +#: ../midori/main.c:79 +msgid "_Userscripts" +msgstr "_Kullanıcı betikleri" + +#: ../midori/main.c:80 +msgid "User_styles" +msgstr "Kullanıcı _stilleri" + +#: ../midori/main.c:81 +msgid "New _Tab" +msgstr "Yeni _Tab" + +#: ../midori/main.c:82 +msgid "_Transfers" +msgstr "_Aktarımlar" + +#: ../midori/main.c:83 +msgid "_Closed Tabs and Windows" +msgstr "_Kapatılmış Pencereler ve Tablar" + +#: ../midori/main.c:84 +msgid "New _Window" +msgstr "Yeni _Pencere" + +#: ../midori/main.c:134 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Ayarlar yüklenemedi: %s\n" + +#: ../midori/main.c:189 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "'%s' değeri şunun için yanlış : %s" + +#: ../midori/main.c:196 +#: ../midori/main.c:265 +#, c-format +msgid "Unhandled settings value '%s'" +msgstr "İşlenemeyen ayar değeri '%s'" + +#: ../midori/main.c:524 +#: ../midori/main.c:532 +#: ../midori/main.c:562 +#: ../midori/main.c:571 +msgid "Malformed document." +msgstr "Bozuk biçimli döküman" + +#: ../midori/main.c:554 +msgid "File not found." +msgstr "Dosya bulunamadı" + +#: ../midori/main.c:592 +#: ../midori/main.c:624 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Şu veri tabanı açılamadı: %s\n" + +#: ../midori/main.c:679 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Şu geçmiş öğesi silinemedi: %s\n" + +#: ../midori/main.c:703 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Geçmiş temizlenemedi: %s\n" + +#: ../midori/main.c:736 +#: ../midori/main.c:751 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Geçmiş öğesi eklenemedi: %s\n" + +#: ../midori/main.c:868 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Eski geçmiş öğeleri silinemedi: %s\n" + +#: ../midori/main.c:1000 +#: ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Yazma işlemi gerçekleştirilemedi" + +#: ../midori/main.c:1025 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Bu oturum kaydedilemedi. %s" + +#: ../midori/main.c:1057 +msgid "Run the specified filename as javascript" +msgstr "Belirtilen dosyayı javascript olarak kabul et ve çalıştır" + +#: ../midori/main.c:1059 +msgid "Display program version" +msgstr "Program versiyonunu göster" + +#: ../midori/main.c:1061 +msgid "URIs" +msgstr "URIs" + +#: ../midori/main.c:1095 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1119 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya raporlayın:" + +#: ../midori/main.c:1121 +msgid "Check for new versions at:" +msgstr "Yeni versiyonlar için şurayı kontrol edin:" + +#: ../midori/main.c:1142 +msgid "No filename specified" +msgstr "Dosya ismi belirtlilmedi" + +#. FIXME: Do we want a graphical error message? +#: ../midori/main.c:1160 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Şu anda Midori'nin başka bir örneği çalışıyor fakat cevap vermiyor.\n" + +#: ../midori/main.c:1194 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Yer imleri yüklenemedi: %s\n" + +#: ../midori/main.c:1208 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Oturum yüklenemedi: %s\n" + +#: ../midori/main.c:1220 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Çöp kutusu yüklenemedi: %s\n" + +#: ../midori/main.c:1233 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Geçmiş yüklenemedi: %s\n" + +#: ../midori/main.c:1246 +msgid "The following errors occured:" +msgstr "Şu hatalar ortaya çıktı:" + +#: ../midori/main.c:1405 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Arama motorları kaydedilemedi. %s" + +#: ../midori/main.c:1415 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Yer imleri kaydedilemedi. %s" + +#: ../midori/main.c:1424 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Çöp kutusu kaydedilemedi. %s" + +#: ../midori/main.c:1432 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Ayarlar kaydedilemedi. %s" + +#: ../midori/midori-addons.c:87 +#: ../midori/midori-websettings.c:207 +msgid "None" +msgstr "Yok" + +#: ../midori/midori-addons.c:88 +#: ../midori/midori-browser.c:3768 +msgid "Extensions" +msgstr "Eklentiler" + +#: ../midori/midori-addons.c:89 +#: ../midori/midori-browser.c:3751 +msgid "Userscripts" +msgstr "Kullanıcı Betikleri" + +#: ../midori/midori-addons.c:90 +#: ../midori/midori-browser.c:3759 +msgid "Userstyles" +msgstr "Kullanıcı Stilleri" + +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Etkin" + +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Kapalı" + +#: ../midori/midori-browser.c:251 +#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3081 +msgid "Reload the current page" +msgstr "Bu sayfayı yeniden yükle" + +#: ../midori/midori-browser.c:263 +#: ../midori/midori-browser.c:3078 +msgid "Stop loading the current page" +msgstr "Bu sayfayı yüklemeyi durdur" + +#: ../midori/midori-browser.c:321 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% yüklendi" + +#: ../midori/midori-browser.c:344 +#, c-format +msgid "Unexpected action '%s'." +msgstr "beklenmedik hareket '%s'." + +#: ../midori/midori-browser.c:512 +msgid "New bookmark" +msgstr "Yeni yer imi" + +#: ../midori/midori-browser.c:512 +msgid "Edit bookmark" +msgstr "Yer imini düzenle" + +#: ../midori/midori-browser.c:534 +msgid "_Title:" +msgstr "_Başlık:" + +#: ../midori/midori-browser.c:547 +#: ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Açıklama:" + +#: ../midori/midori-browser.c:566 +#: ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:582 +msgid "_Folder:" +msgstr "_Klasör:" + +#: ../midori/midori-browser.c:586 +msgid "Root" +msgstr "Root" + +#: ../midori/midori-browser.c:1148 +msgid "Open file" +msgstr "Dosya aç" + +#: ../midori/midori-browser.c:1224 +msgid "Save file as" +msgstr "Dosyayı kaydet" + +#: ../midori/midori-browser.c:2301 +msgid "Open in New _Tab" +msgstr "Yeni tabda aç" + +#: ../midori/midori-browser.c:2303 +msgid "Open in New _Window" +msgstr "Yeni Pencerede aç" + +#: ../midori/midori-browser.c:2549 +msgid "Separator" +msgstr "Ayraç" + +#: ../midori/midori-browser.c:2653 +#, c-format +msgid "%d days ago" +msgstr "%d gün önce" + +#: ../midori/midori-browser.c:2660 +msgid "Today" +msgstr "Bugün" + +#: ../midori/midori-browser.c:2662 +msgid "Yesterday" +msgstr "Dün" + +#: ../midori/midori-browser.c:2751 +msgid "A lightweight web browser." +msgstr "Hafif bir web tarayıcısı" + +#: ../midori/midori-browser.c:2759 +msgid "translator-credits" +msgstr "" +"Mirat Can Bayrak " + +#: ../midori/midori-browser.c:2906 +msgid "Are you sure you want to remove all history items?" +msgstr "Bütün geçmiş öğelerini silmek istediğinizden emin misiniz?" + +#: ../midori/midori-browser.c:3009 +msgid "_File" +msgstr "_Dosya" + +#: ../midori/midori-browser.c:3012 +msgid "Open a new window" +msgstr "Yeni bir pencerede aç" + +#: ../midori/midori-browser.c:3015 +msgid "Open a new tab" +msgstr "Yeni bir tabda aç" + +#: ../midori/midori-browser.c:3018 +msgid "Open a file" +msgstr "Bir dosya aç" + +#: ../midori/midori-browser.c:3021 +msgid "Save to a file" +msgstr "Bir dosyaya kaydet" + +#: ../midori/midori-browser.c:3023 +msgid "_Close Tab" +msgstr "_Tabı kapat" + +#: ../midori/midori-browser.c:3024 +msgid "Close the current tab" +msgstr "Geçerli tabı kapat" + +#: ../midori/midori-browser.c:3026 +msgid "C_lose Window" +msgstr "Pen_cereyi Kapat" + +#: ../midori/midori-browser.c:3027 +msgid "Close this window" +msgstr "Bu pencereyi kapat" + +#: ../midori/midori-browser.c:3030 +msgid "Print the current page" +msgstr "Geçerli sayfayı yazdır" + +#: ../midori/midori-browser.c:3033 +msgid "Quit the application" +msgstr "Uygulamadan çık" + +#: ../midori/midori-browser.c:3035 +msgid "_Edit" +msgstr "_Düzenle" + +#: ../midori/midori-browser.c:3038 +msgid "Cut the selected text" +msgstr "Seçili metni kes" + +#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3044 +msgid "Copy the selected text" +msgstr "Seçili metni kopyala" + +#: ../midori/midori-browser.c:3047 +msgid "Paste text from the clipboard" +msgstr "Metni panodan yapıştır" + +#: ../midori/midori-browser.c:3050 +msgid "Delete the selected text" +msgstr "Seçili metni sil" + +#: ../midori/midori-browser.c:3053 +msgid "Select all text" +msgstr "Bütün metni seç" + +#: ../midori/midori-browser.c:3056 +msgid "Find a word or phrase in the page" +msgstr "Bir kelime yada ibareyi geçerli sayfada ara" + +#: ../midori/midori-browser.c:3058 +msgid "Find _Next" +msgstr "So_nrakini Bul" + +#: ../midori/midori-browser.c:3059 +msgid "Find the next occurrence of a word or phrase" +msgstr "Kelime ya da ibarenin sonraki örneğini bul" + +#: ../midori/midori-browser.c:3061 +msgid "Find _Previous" +msgstr "Öncekini Bu_l" + +#: ../midori/midori-browser.c:3062 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Kelime ya da ibarenin sonraki örneğini bul" + +#: ../midori/midori-browser.c:3065 +msgid "_Quick Find" +msgstr "Ç_abuk Bul" + +#: ../midori/midori-browser.c:3066 +msgid "Quickly jump to a word or phrase" +msgstr "Hemen kelime yada ibarenin olduğu noktaya zıpla" + +#: ../midori/midori-browser.c:3069 +msgid "Configure the application preferences" +msgstr "Uygulamanın ayarlarını düzenle" + +#: ../midori/midori-browser.c:3071 +msgid "_View" +msgstr "_Görünüm" + +#: ../midori/midori-browser.c:3072 +msgid "_Toolbars" +msgstr "_Araç Çubukları" + +#: ../midori/midori-browser.c:3084 +msgid "Increase the zoom level" +msgstr "Yakınlaştırma seviyesini arttır" + +#: ../midori/midori-browser.c:3087 +msgid "Decrease the zoom level" +msgstr "Yakınlaşma seviyesini azalt" + +#: ../midori/midori-browser.c:3090 +msgid "Reset the zoom level" +msgstr "Yakınlaşma oranını sıfırla" + +#: ../midori/midori-browser.c:3092 +#: ../midori/midori-view.c:924 +msgid "View _Source" +msgstr "Ka_ynağı Gör" + +#: ../midori/midori-browser.c:3093 +msgid "View the source code of the page" +msgstr "Geçerli sayfanın kaynak kodunu gör" + +#: ../midori/midori-browser.c:3095 +msgid "View Selection Source" +msgstr "Seçim kaynağını gör" + +#: ../midori/midori-browser.c:3096 +msgid "View the source code of the selection" +msgstr "Geçerli seçime ait kaynak kodu gör" + +#: ../midori/midori-browser.c:3100 +msgid "Toggle fullscreen view" +msgstr "Tam ekran modunu aç/kapat" + +#: ../midori/midori-browser.c:3102 +msgid "_Go" +msgstr "_Git" + +#: ../midori/midori-browser.c:3105 +msgid "Go back to the previous page" +msgstr "Önceki sayfaya geri dön" + +#: ../midori/midori-browser.c:3108 +msgid "Go forward to the next page" +msgstr "Sonraki sayfaya git" + +#: ../midori/midori-browser.c:3111 +msgid "Go to your homepage" +msgstr "Anasayfaya git" + +#: ../midori/midori-browser.c:3113 +msgid "Open in Page_holder..." +msgstr "Sayfa_tutucu içerisinde aç" + +#: ../midori/midori-browser.c:3114 +msgid "Open the current page in the pageholder" +msgstr "Geçerli sayfayı sayfa tutucu içinde aç" + +#: ../midori/midori-browser.c:3116 +msgid "Empty Trash" +msgstr "Çöp Kutusunu Boşalt" + +#: ../midori/midori-browser.c:3117 +msgid "Delete the contents of the trash" +msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" + +#. FIXME: Make this sensitive only when there is a tab to undo +#: ../midori/midori-browser.c:3119 +#: ../midori/midori-view.c:899 +msgid "Undo Close Tab" +msgstr "Tab kapatmayı geri al" + +#: ../midori/midori-browser.c:3120 +msgid "Open the last closed tab" +msgstr "Son kapatılan tabı geri açar" + +#: ../midori/midori-browser.c:3124 +msgid "Add a new bookmark" +msgstr "Yeni bir yer imi ekle" + +#: ../midori/midori-browser.c:3127 +msgid "Edit the selected bookmark" +msgstr "Seçili yer imini düzenle" + +#: ../midori/midori-browser.c:3130 +msgid "Delete the selected bookmark" +msgstr "Seçili yer imini sil" + +#: ../midori/midori-browser.c:3133 +msgid "Delete the selected history item" +msgstr "Seçili geçmiş öğesini sil" + +#: ../midori/midori-browser.c:3136 +msgid "Clear the entire history" +msgstr "Bütün geçmişi sil" + +#: ../midori/midori-browser.c:3139 +msgid "Bookmark the selected history item" +msgstr "Seçili geçmiş öğesini yer imlerine ekle" + +#: ../midori/midori-browser.c:3141 +msgid "_Tools" +msgstr "_Araçlar" + +#: ../midori/midori-browser.c:3143 +#: ../midori/midori-searchaction.c:468 +msgid "_Manage Search Engines" +msgstr "Arama _Motorlarını Yönet" + +#: ../midori/midori-browser.c:3144 +msgid "Add, edit and remove search engines..." +msgstr "Arama motorlarını ekle, sil ve düzenle..." + +#: ../midori/midori-browser.c:3148 +msgid "_Previous Tab" +msgstr "Ön_ceki Tab" + +#: ../midori/midori-browser.c:3149 +msgid "Switch to the previous tab" +msgstr "Önceki taba geç" + +#: ../midori/midori-browser.c:3151 +msgid "_Next Tab" +msgstr "So_nraki Tab" + +#: ../midori/midori-browser.c:3152 +msgid "Switch to the next tab" +msgstr "Sonraki taba geç" + +#: ../midori/midori-browser.c:3154 +msgid "_Help" +msgstr "_Yardım" + +#: ../midori/midori-browser.c:3156 +msgid "_Contents" +msgstr "_İçerik" + +#: ../midori/midori-browser.c:3157 +msgid "Show the documentation" +msgstr "Dökümantasyonu göster" + +#: ../midori/midori-browser.c:3159 +msgid "_Frequent questions" +msgstr "_Sıkça sorulan sorular" + +#: ../midori/midori-browser.c:3160 +msgid "Show the Frequently Asked Questions" +msgstr "Sıkça sorulan soruları gösterir" + +#: ../midori/midori-browser.c:3162 +msgid "_Report a bug" +msgstr "Hata _Raporla" + +#: ../midori/midori-browser.c:3163 +msgid "Open Midori's bug tracker" +msgstr "Midori'nin hata takip sistemini açar" + +#: ../midori/midori-browser.c:3166 +msgid "Show information about the program" +msgstr "Program hakkında bilgi gösterir" + +#: ../midori/midori-browser.c:3173 +msgid "P_rivate Browsing" +msgstr "G_izli Gezinti" + +#: ../midori/midori-browser.c:3174 +msgid "Don't save any private data while browsing" +msgstr "Gezinirken hiç bir özel veriyi kaydetme" + +#: ../midori/midori-browser.c:3179 +msgid "_Menubar" +msgstr "_Menü Çubuğu" + +#: ../midori/midori-browser.c:3180 +msgid "Show menubar" +msgstr "Menü çubuğunu göster" + +#: ../midori/midori-browser.c:3183 +msgid "_Navigationbar" +msgstr "_Gezinti araç Çubuğu" + +#: ../midori/midori-browser.c:3184 +msgid "Show navigationbar" +msgstr "Gezinti araç çubuğunu göster" + +#: ../midori/midori-browser.c:3187 +msgid "Side_panel" +msgstr "Yan _panel" + +#: ../midori/midori-browser.c:3188 +msgid "Show sidepanel" +msgstr "Yan paneli göster" + +#: ../midori/midori-browser.c:3191 +msgid "_Bookmarkbar" +msgstr "_Yer imi araç çubuğu" + +#: ../midori/midori-browser.c:3192 +msgid "Show bookmarkbar" +msgstr "Yer imi araç çubuğunu göster" + +#: ../midori/midori-browser.c:3195 +msgid "_Transferbar" +msgstr "_Aktarım araç çubuğu" + +#: ../midori/midori-browser.c:3196 +msgid "Show transferbar" +msgstr "Aktarım araç çubuğunu göster" + +#: ../midori/midori-browser.c:3199 +msgid "_Statusbar" +msgstr "_Durum Çubuğu" + +#: ../midori/midori-browser.c:3200 +msgid "Show statusbar" +msgstr "Durum çubuğunu göster" + +#: ../midori/midori-browser.c:3460 +msgid "_Location..." +msgstr "Kon_um..." + +#: ../midori/midori-browser.c:3462 +msgid "Open a particular location" +msgstr "Belirli bir konumu aç" + +#: ../midori/midori-browser.c:3486 +msgid "_Web Search..." +msgstr "_Ağ Araması..." + +#: ../midori/midori-browser.c:3488 +msgid "Run a web search" +msgstr "Bir ağ araması gerçekleştir" + +#: ../midori/midori-browser.c:3507 +msgid "Reopen a previously closed tab or window" +msgstr "Daha önce kapatılmış bir pencereyi ya da tabı yeniden aç" + +#: ../midori/midori-browser.c:3521 +msgid "_Recently visited pages" +msgstr "_Yeni ziyaret edilmiş sayfalar" + +#: ../midori/midori-browser.c:3523 +msgid "Reopen pages that you visited earlier" +msgstr "Daha önce ziyaret edilmiş sayfaları yeniden aç" + +#: ../midori/midori-browser.c:3539 +msgid "Show the saved bookmarks" +msgstr "Kaydedilmiş yer imlerini göster" + +#: ../midori/midori-browser.c:3553 +msgid "_Window" +msgstr "_Pencere" + +#: ../midori/midori-browser.c:3555 +msgid "Show a list of all open tabs" +msgstr "Açık tabların bir listesini göster" + +#: ../midori/midori-browser.c:3679 +msgid "Bookmarks" +msgstr "Yer imleri" + +#. TODO: We need something like "use current website" +#: ../midori/midori-browser.c:3686 +#: ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Aktarımlar" + +#: ../midori/midori-browser.c:3695 +msgid "Console" +msgstr "Konsole" + +#: ../midori/midori-browser.c:3733 +#: ../midori/midori-preferences.c:521 +msgid "History" +msgstr "Geçmiş" + +#: ../midori/midori-browser.c:3742 +msgid "Pageholder" +msgstr "Sayfa Tutucu" + +#: ../midori/midori-browser.c:3810 +msgid "_Inline find:" +msgstr "Sat_ıriçi bul:" + +#: ../midori/midori-browser.c:3845 +msgid "Match Case" +msgstr "Duruma Eşle" + +#: ../midori/midori-browser.c:3853 +msgid "Highlight Matches" +msgstr "Eşlemeleri Işıklandır" + +#: ../midori/midori-browser.c:3862 +msgid "Close Findbar" +msgstr "Arama çubuğunu Kapat" + +#: ../midori/midori-browser.c:4108 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Beklenmedik ayar '%s'" + +#: ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:208 +msgid "Close panel" +msgstr "Paneli kapat" + +#: ../midori/midori-websettings.c:132 +#: ../midori/midori-view.c:1514 +msgid "Blank page" +msgstr "Blank page" + +#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:393 +msgid "Homepage" +msgstr "Anasayfa" + +#: ../midori/midori-websettings.c:134 +msgid "Last open pages" +msgstr "Son açılmış sayfalar" + +#: ../midori/midori-websettings.c:149 +msgid "Chinese (BIG5)" +msgstr "Çince (BIG5)" + +#: ../midori/midori-websettings.c:150 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonca (Shift_JIS)" + +#: ../midori/midori-websettings.c:151 +msgid "Russian (KOI8-R)" +msgstr "Kiril (KOI8-R)" + +#: ../midori/midori-websettings.c:152 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:153 +msgid "Western (ISO-8859-1)" +msgstr "Batı Avrupa (ISO-8859-1)" + +#: ../midori/midori-websettings.c:154 +msgid "Custom..." +msgstr "Özel..." + +#: ../midori/midori-websettings.c:169 +msgid "New tab" +msgstr "Yeni sekme" + +#: ../midori/midori-websettings.c:170 +msgid "New window" +msgstr "Yeni pencere" + +#: ../midori/midori-websettings.c:171 +msgid "Current tab" +msgstr "Geçerli sekme" + +#: ../midori/midori-websettings.c:186 +msgid "Default" +msgstr "Öntanımlı" + +#: ../midori/midori-websettings.c:187 +msgid "Icons" +msgstr "Simgeler" + +#: ../midori/midori-websettings.c:188 +msgid "Text" +msgstr "Metin" + +#: ../midori/midori-websettings.c:189 +msgid "Both" +msgstr "Her ikiside" + +#: ../midori/midori-websettings.c:190 +msgid "Both horizontal" +msgstr "İkiside yatay" + +#: ../midori/midori-websettings.c:205 +msgid "All cookies" +msgstr "Tüm kurabiyeler" + +#: ../midori/midori-websettings.c:206 +msgid "Session cookies" +msgstr "Oturum kurabiyeleri" + +#: ../midori/midori-websettings.c:244 +msgid "Remember last window size" +msgstr "Son pencerenin ölçülerini hatırla" + +#: ../midori/midori-websettings.c:245 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:253 +msgid "Last window width" +msgstr "Son pencerenin eni" + +#: ../midori/midori-websettings.c:254 +msgid "The last saved window width" +msgstr "Son kaydedilmiş pencere eni" + +#: ../midori/midori-websettings.c:262 +msgid "Last window height" +msgstr "Son pencere yüksekliği" + +#: ../midori/midori-websettings.c:263 +msgid "The last saved window height" +msgstr "Son kaydedilmiş pencere yüksekliği" + +#: ../midori/midori-websettings.c:271 +msgid "Last panel position" +msgstr "Son panel pozisyonu" + +#: ../midori/midori-websettings.c:272 +msgid "The last saved panel position" +msgstr "Son kaydedilen panel pozisyonu" + +#: ../midori/midori-websettings.c:280 +msgid "Last panel page" +msgstr "Son panel sayfası" + +#: ../midori/midori-websettings.c:281 +msgid "The last saved panel page" +msgstr "Son kaydedilmiş panel sayfası" + +#: ../midori/midori-websettings.c:289 +msgid "Last Web search" +msgstr "Son ağ araması" + +#: ../midori/midori-websettings.c:290 +msgid "The last saved Web search" +msgstr "Kaydedilmiş son ağ araması" + +#: ../midori/midori-websettings.c:298 +msgid "Last pageholder URI" +msgstr "Son sayfa tutacı URI" + +#: ../midori/midori-websettings.c:299 +msgid "The URI last opened in the pageholder" +msgstr "Sayfa tutucu içinde son açılan URI" + +#: ../midori/midori-websettings.c:308 +msgid "Show Menubar" +msgstr "Menü Çubuğunu Göster" + +#: ../midori/midori-websettings.c:309 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:317 +msgid "Show Navigationbar" +msgstr "Gezinti Araç Çubuğunu Göster" + +#: ../midori/midori-websettings.c:318 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:326 +msgid "Show Bookmarkbar" +msgstr "Yer İmi Araç Çubuğunu Göster" + +#: ../midori/midori-websettings.c:327 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:335 +msgid "Show Panel" +msgstr "Paneli Göster" + +#: ../midori/midori-websettings.c:336 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:344 +msgid "Show Statusbar" +msgstr "Durum Çubuğunu Göster" + +#: ../midori/midori-websettings.c:345 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:354 +msgid "Toolbar Style" +msgstr "Araç Çubuğu Sitili" + +#: ../midori/midori-websettings.c:355 +msgid "The style of the toolbar" +msgstr "Araç çubuğunun sitili" + +#: ../midori/midori-websettings.c:364 +msgid "Toolbar Items" +msgstr "Araç Çubuğu Öğeleri" + +#: ../midori/midori-websettings.c:365 +msgid "The items to show on the toolbar" +msgstr "Araç çubuğunun üzerinde gösterilecek öğeler" + +#: ../midori/midori-websettings.c:373 +msgid "Compact Sidepanel" +msgstr "Küçük Yan Panel" + +#: ../midori/midori-websettings.c:374 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:383 +msgid "Load on Startup" +msgstr "Açılışta Yükle" + +#: ../midori/midori-websettings.c:384 +msgid "What to load on startup" +msgstr "Açılışta ne yüklenecek" + +#: ../midori/midori-websettings.c:394 +msgid "The homepage" +msgstr "anasayfa" + +#: ../midori/midori-websettings.c:402 +msgid "Download Folder" +msgstr "İndirilecek Klasör" + +#: ../midori/midori-websettings.c:403 +msgid "The folder downloaded files are saved to" +msgstr "İndirilen dosyaların kaydedileceği klasör" + +#: ../midori/midori-websettings.c:411 +msgid "Download Manager" +msgstr "İndirme Yöneticisi" + +#: ../midori/midori-websettings.c:412 +msgid "An external download manager" +msgstr "Harici indirme yöneticisi" + +#: ../midori/midori-websettings.c:420 +msgid "Text Editor" +msgstr "Metin Düzenleyici" + +#: ../midori/midori-websettings.c:421 +msgid "An external text editor" +msgstr "Harici metin düzenleyici" + +#: ../midori/midori-websettings.c:429 +msgid "Location entry Search" +msgstr "Konum girişi Arama" + +#: ../midori/midori-websettings.c:430 +msgid "The search to perform inside the location entry" +msgstr "Konum girişi içerisinde yapılacak arama" + +#: ../midori/midori-websettings.c:438 +msgid "Preferred Encoding" +msgstr "Tercih Edilen Kodlama" + +#: ../midori/midori-websettings.c:439 +msgid "The preferred character encoding" +msgstr "Tercih edilen karakter kodlaması" + +#: ../midori/midori-websettings.c:449 +msgid "Always Show Tabbar" +msgstr "Tab Çubuğunu Her Zaman Göster" + +#: ../midori/midori-websettings.c:450 +msgid "Always show the tabbar" +msgstr "Tab Çubuğunu Her Zaman Göster" + +#: ../midori/midori-websettings.c:458 +msgid "Close Buttons on Tabs" +msgstr "Tablardaki Düğmeleri Kapat" + +#: ../midori/midori-websettings.c:459 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:467 +msgid "Open new pages in" +msgstr "Yeni sayfaları aç" + +#: ../midori/midori-websettings.c:468 +msgid "Where to open new pages" +msgstr "Yeni sayfalar nereye açılacak" + +#: ../midori/midori-websettings.c:477 +msgid "Open external pages in" +msgstr "Harici sayfaları şu şekilde aç" + +#: ../midori/midori-websettings.c:478 +msgid "Where to open externally opened pages" +msgstr "Harici açılan sayfalar nereye açılacak" + +#: ../midori/midori-websettings.c:487 +msgid "Middle click opens Selection" +msgstr "Orta tuş seçimi açar" + +#: ../midori/midori-websettings.c:488 +msgid "Load an URL from the selection via middle click" +msgstr "Orta tuş ile seçim içinden bir url yükle" + +#: ../midori/midori-websettings.c:496 +msgid "Open tabs in the background" +msgstr "Tabları arkaplanda aç" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:505 +msgid "Open Tabs next to Current" +msgstr "Tabları geçerliden sonrakine aç" + +#: ../midori/midori-websettings.c:506 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:514 +msgid "Open popups in tabs" +msgstr "Popup pencereleri tablarda aç" + +#: ../midori/midori-websettings.c:515 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:525 +msgid "Accept cookies" +msgstr "Kurabiyeleri kabul et" + +#: ../midori/midori-websettings.c:526 +msgid "What type of cookies to accept" +msgstr "Hangi tür kurabiyeler kabul edilecek" + +#: ../midori/midori-websettings.c:535 +msgid "Original cookies only" +msgstr "Sadece orjinal kurabiyeler" + +#: ../midori/midori-websettings.c:536 +msgid "Accept cookies from the original website only" +msgstr "Sadece orjinal web sitesine ait kurabiyeleri kabul et" + +#: ../midori/midori-websettings.c:544 +msgid "Maximum cookie age" +msgstr "Azami kurabiye ömrü" + +#: ../midori/midori-websettings.c:545 +msgid "The maximum number of days to save cookies for" +msgstr "Kurabiyelerin saklanacağı azami gün sayısı" + +#: ../midori/midori-websettings.c:555 +msgid "Remember last visited pages" +msgstr "Son ziyaret edilen sayfaları hatırla" + +#: ../midori/midori-websettings.c:556 +msgid "Whether the last visited pages are saved" +msgstr "Eğer son ziyaret edilen sayfalar kaydedilmiş ise" + +#: ../midori/midori-websettings.c:564 +msgid "Maximum history age" +msgstr "Azami geçmiş yaşı" + +#: ../midori/midori-websettings.c:565 +msgid "The maximum number of days to save the history for" +msgstr "Geçmişin saklanacağı azami gün sayısı" + +#: ../midori/midori-websettings.c:573 +msgid "Remember last form inputs" +msgstr "Son form girişlerini hatırla" + +#: ../midori/midori-websettings.c:574 +msgid "Whether the last form inputs are saved" +msgstr "Son form girişlerinin saklanacağı azami gün sayısı" + +#: ../midori/midori-websettings.c:582 +msgid "Remember last downloaded files" +msgstr "Son indirilmiş dosyaları hatırla" + +#: ../midori/midori-websettings.c:583 +msgid "Whether the last downloaded files are saved" +msgstr "Eğer son indirilmiş dosyalar kaydedildiyse" + +#: ../midori/midori-websettings.c:593 +msgid "HTTP Proxy" +msgstr "HTTP vekil sunucu" + +#: ../midori/midori-websettings.c:594 +msgid "The proxy used for HTTP connections" +msgstr "HTTP bağlantıları için kullanılan vekil sunucu" + +#: ../midori/midori-websettings.c:602 +msgid "Cache size" +msgstr "Önbellek boyutu" + +#: ../midori/midori-websettings.c:603 +msgid "The allowed size of the cache" +msgstr "İzin verilen önbellek boyutu" + +#: ../midori/midori-view.c:82 +msgid "Load Provisional" +msgstr "Koşullu Yükle" + +#: ../midori/midori-view.c:83 +msgid "Load Committed" +msgstr "İşlenmişi Yükle" + +#: ../midori/midori-view.c:84 +msgid "Load Finished" +msgstr "Tamamlananı Yükle" + +#: ../midori/midori-view.c:836 +msgid "Open Link in New _Tab" +msgstr "Bağlantıyı Yeni _Tabda Aç" + +#: ../midori/midori-view.c:861 +msgid "_Download Link destination" +msgstr "Bağlantı Konumunu İnd_ir" + +#: ../midori/midori-view.c:883 +msgid "Open URL in New _Tab" +msgstr "URL'yi Yeni _Tabda aç" + +#: ../midori/midori-view.c:1248 +#, c-format +msgid "Inspect page - %s" +msgstr "Sayfayı incele - %s" + +#: ../midori/midori-view.c:1386 +msgid "Source" +msgstr "Kaynak" + +#: ../midori/midori-preferences.c:89 +#, c-format +msgid "Preferences for %s" +msgstr "%s için tercihler" + +#. Page "General" +#: ../midori/midori-preferences.c:338 +msgid "General" +msgstr "Genel" + +#: ../midori/midori-preferences.c:339 +msgid "Startup" +msgstr "Açılış" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:386 +msgid "Appearance" +msgstr "Görünüm" + +#: ../midori/midori-preferences.c:387 +msgid "Font settings" +msgstr "Font seçenekleri" + +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "Öntanımlı Font Ailesi" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "Minimum Font Boyutu" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:407 +msgid "Behavior" +msgstr "Davranış" + +#: ../midori/midori-preferences.c:408 +msgid "Features" +msgstr "Özellikler" + +#: ../midori/midori-preferences.c:411 +msgid "Load images automatically" +msgstr "İmajları otomatik yükle" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "İmajları otomatik küçült" + +#: ../midori/midori-preferences.c:417 +msgid "Print backgrounds" +msgstr "Arkaplanları yazdır" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "Yeniden boyutlandırılabilir metin alanları" + +#: ../midori/midori-preferences.c:423 +msgid "Enable scripts" +msgstr "Betiklere izin ver" + +#: ../midori/midori-preferences.c:426 +msgid "Enable plugins" +msgstr "Eklentilere İzin ver" + +#: ../midori/midori-preferences.c:431 +msgid "Enable developer tools" +msgstr "Geliştirici araçlarına izin ver" + +#. Page "Interface" +#: ../midori/midori-preferences.c:441 +msgid "Interface" +msgstr "Arayüz" + +#: ../midori/midori-preferences.c:442 +msgid "Navigationbar" +msgstr "Gezinti Araç Çubuğu" + +#: ../midori/midori-preferences.c:457 +msgid "Browsing" +msgstr "Gözden Geçiriliyor" + +#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:485 +msgid "Network" +msgstr "Ağ" + +#: ../midori/midori-preferences.c:496 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:502 +msgid "Privacy" +msgstr "Gizlilik" + +#: ../midori/midori-preferences.c:504 +msgid "Web Cookies" +msgstr "Web Kurabiyeleri" + +#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:528 +msgid "days" +msgstr "günler" + +#: ../midori/midori-searchaction.c:459 +#: ../katze/katze-arrayaction.c:289 +msgid "Empty" +msgstr "Boş" + +#: ../midori/midori-searchaction.c:804 +msgid "Add search engine" +msgstr "Arama motoru ekle" + +#: ../midori/midori-searchaction.c:804 +msgid "Edit search engine" +msgstr "Arama motoru düzenle" + +#: ../midori/midori-searchaction.c:832 +msgid "_Name:" +msgstr "_İsim:" + +#: ../midori/midori-searchaction.c:876 +msgid "_Icon (name or file):" +msgstr "_İkon (isim ya da dosya):" + +#: ../midori/midori-searchaction.c:890 +msgid "_Token:" +msgstr "_Alındı:" + +#: ../midori/midori-searchaction.c:1067 +msgid "Manage search engines" +msgstr "Arama motorlarını yönet" + +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Harici program çalıştırılamadı" + +#: ../midori/sokoke.c:283 +msgid "Warning: You are using a superuser account!" +msgstr "Dikkat: Süperkullanıcı hesabı kullanıyorsunuz!" + +#: ../midori/gjs.c:512 +msgid "An unknown error occured." +msgstr "Bilinmeyen hata oluştu" + +#: ../midori/gjs.c:739 +#: ../midori/gjs.c:829 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s böyle bir özelliğe sahip değil '%s'" + +#: ../midori/gjs.c:875 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s şuna eşitlenemiyor %s.%s" + +#: ../midori/gjs.c:885 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "Erişilemiyor: %s.%s " + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "'%s' olarak isimlendirilmiş ikon yüklenemiyor" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "'%s' stok ikonu yüklenemedi" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Animasyon kareleri kırık" + +#: ../katze/katze-utils.c:147 +#: ../katze/katze-utils.c:334 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "'%s' özelliği %s için geçersiz" + +#: ../katze/katze-utils.c:169 +#: ../katze/katze-utils.c:205 +msgid "Choose file" +msgstr "Dosya Seç" + +#: ../katze/katze-utils.c:187 +msgid "Choose folder" +msgstr "Klasör seç" + From 819dfd8d7773e6fd44fe5d9d522e83b53d35ca0e Mon Sep 17 00:00:00 2001 From: Alexander Hesse Date: Tue, 11 Nov 2008 22:12:26 +0100 Subject: [PATCH 0481/2970] Open links in new tabs using Control and Left mouse button --- AUTHORS | 1 + midori/midori-view.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 9cf55fc2..bad50956 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ Contributors: Arnaud Renevier Dale Whittaker Anders F Björklund + Alexander Hesse Graphics: extension: Nancy Runge diff --git a/midori/midori-view.c b/midori/midori-view.c index b88a138f..0ea72c26 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -691,7 +691,21 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, case 1: if (!link_uri) return FALSE; - if (state & GDK_SHIFT_MASK) + #ifdef HAVE_OSX + /* FIXME: Test for Command key */ + if (0) + #else + if (state & GDK_CONTROL_MASK) + #endif + { + /* Open link in new tab */ + background = view->open_tabs_in_the_background; + if (state & GDK_SHIFT_MASK) + g_signal_emit_by_name (view, "new-tab", link_uri, background); + else g_signal_emit_by_name (view, "new-tab", link_uri, !background); + return TRUE; + } + else if (state & GDK_SHIFT_MASK) { /* Open link in new window */ g_signal_emit_by_name (view, "new-window", link_uri); From c634ff73950e13407109fbae62b0329995baab80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 11 Nov 2008 23:42:22 +0100 Subject: [PATCH 0482/2970] Use event->state instead of manually retrieving the state --- midori/midori-view.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 0ea72c26..be3ae68d 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -675,15 +675,12 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, GdkEventButton* event, MidoriView* view) { - GdkModifierType state; - gint x, y; GtkClipboard* clipboard; gchar* uri; gchar* new_uri; const gchar* link_uri; gboolean background; - gdk_window_get_pointer (NULL, &x, &y, &state); link_uri = midori_view_get_link_uri (MIDORI_VIEW (view)); switch (event->button) @@ -695,27 +692,27 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, /* FIXME: Test for Command key */ if (0) #else - if (state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) #endif { /* Open link in new tab */ background = view->open_tabs_in_the_background; - if (state & GDK_SHIFT_MASK) + if (event->state & GDK_SHIFT_MASK) g_signal_emit_by_name (view, "new-tab", link_uri, background); else g_signal_emit_by_name (view, "new-tab", link_uri, !background); return TRUE; } - else if (state & GDK_SHIFT_MASK) + else if (event->state & GDK_SHIFT_MASK) { /* Open link in new window */ g_signal_emit_by_name (view, "new-window", link_uri); return TRUE; } - else if (state & GDK_MOD1_MASK) + else if (event->state & GDK_MOD1_MASK) { /* Open link in new tab */ background = view->open_tabs_in_the_background; - if (state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) background = !background; g_signal_emit_by_name (view, "new-tab", link_uri, background); return TRUE; @@ -726,19 +723,18 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, { /* Open link in new tab */ background = view->open_tabs_in_the_background; - if (state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) background = !background; g_signal_emit_by_name (view, "new-tab", link_uri, background); return TRUE; } - else if (state & GDK_CONTROL_MASK) + else if (event->state & GDK_CONTROL_MASK) { midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0); return FALSE; /* Allow Ctrl + Middle click */ } else if (view->middle_click_opens_selection) { - state = (GdkModifierType) event->state; clipboard = gtk_clipboard_get_for_display ( gtk_widget_get_display (GTK_WIDGET (view)), GDK_SELECTION_PRIMARY); @@ -746,10 +742,10 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, if (uri && strchr (uri, '.') && !strchr (uri, ' ')) { new_uri = sokoke_magic_uri (uri, NULL); - if (state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) { background = view->open_tabs_in_the_background; - if (state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) background = !background; g_signal_emit_by_name (view, "new-tab", new_uri, background); } @@ -774,11 +770,7 @@ gtk_widget_scroll_event_cb (WebKitWebView* web_view, GdkEventScroll* event, MidoriView* view) { - GdkModifierType state = (GdkModifierType)0; - gint x, y; - - gdk_window_get_pointer (NULL, &x, &y, &state); - if (state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) { if (event->direction == GDK_SCROLL_DOWN) webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); From 30086f10ed231c81332bd24c291abc983ff24710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Wed, 12 Nov 2008 00:16:03 +0100 Subject: [PATCH 0483/2970] Use custom key modifier mask --- midori/midori-view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index be3ae68d..61d995a3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -670,6 +670,9 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view, g_object_set (G_OBJECT (view), "statusbar-text", link_uri, NULL); } +#define MIDORI_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK \ + | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK ) + static gboolean gtk_widget_button_press_event_cb (WebKitWebView* web_view, GdkEventButton* event, @@ -681,6 +684,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, const gchar* link_uri; gboolean background; + event->state = event->state & MIDORI_KEYS_MODIFIER_MASK; link_uri = midori_view_get_link_uri (MIDORI_VIEW (view)); switch (event->button) @@ -770,6 +774,8 @@ gtk_widget_scroll_event_cb (WebKitWebView* web_view, GdkEventScroll* event, MidoriView* view) { + event->state = event->state & MIDORI_KEYS_MODIFIER_MASK; + if (event->state & GDK_CONTROL_MASK) { if (event->direction == GDK_SCROLL_DOWN) From bd65ef323bac7dffb5216efcaee4899c1ba857e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Wed, 12 Nov 2008 00:47:09 +0100 Subject: [PATCH 0484/2970] Make mouse click handling more consistent --- midori/midori-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 61d995a3..d16de49e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -702,8 +702,8 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, /* Open link in new tab */ background = view->open_tabs_in_the_background; if (event->state & GDK_SHIFT_MASK) - g_signal_emit_by_name (view, "new-tab", link_uri, background); - else g_signal_emit_by_name (view, "new-tab", link_uri, !background); + background = !background; + g_signal_emit_by_name (view, "new-tab", link_uri, background); return TRUE; } else if (event->state & GDK_SHIFT_MASK) From 0b16997f1abca4b32a188a122bc24ba27ca2a9fc Mon Sep 17 00:00:00 2001 From: Brian Vuyk Date: Wed, 12 Nov 2008 02:15:52 +0100 Subject: [PATCH 0485/2970] Fix some compiler warnings --- AUTHORS | 1 + midori/main.c | 2 +- midori/midori-browser.c | 7 +++---- midori/sokoke.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index bad50956..fab8e869 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,6 +11,7 @@ Contributors: Dale Whittaker Anders F Björklund Alexander Hesse + Brian Vuyk Graphics: extension: Nancy Runge diff --git a/midori/main.c b/midori/main.c index 7ff82237..8130ec09 100644 --- a/midori/main.c +++ b/midori/main.c @@ -788,7 +788,7 @@ midori_history_add_items (void* data, { parent = katze_array_get_nth_item (array, j); newdate = katze_item_get_added (KATZE_ITEM (parent)); - if (sokoke_same_day (&date, &newdate)) + if (sokoke_same_day ((time_t *)&date, (time_t *)&newdate)) break; } if (j == n) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e0a7e7ed..68ecac19 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2914,8 +2914,7 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, midori_view_get_icon (MIDORI_VIEW (view))); title = midori_view_get_display_title (MIDORI_VIEW (view)); - window_title = g_strconcat (title, " - ", - g_get_application_name (), NULL); + window_title = g_strconcat (title, " - ", g_get_application_name (), NULL); gtk_window_set_title (GTK_WINDOW (browser), window_title); g_free (window_title); @@ -3470,7 +3469,7 @@ _tree_store_insert_history_item (GtkTreeStore* treestore, if ((date = katze_item_get_added (item))) { now = time (NULL); - age = sokoke_days_between (&date, &now); + age = sokoke_days_between ((time_t *)&date, (time_t *)&now); gtk_tree_store_insert_with_values (treestore, &iter, parent, 0, 0, item, 1, age, -1); g_object_unref (item); @@ -3523,7 +3522,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, gtk_tree_model_get (treemodel, &iter, 0, &parent, 1, &age, -1); date = katze_item_get_added (KATZE_ITEM (parent)); date_ = (time_t)date; - newage = sokoke_days_between (&date, &now); + newage = sokoke_days_between ((time_t *)&date, (time_t *)&now); if (newage == 0) { found = TRUE; diff --git a/midori/sokoke.c b/midori/sokoke.c index 5310cf4c..33381986 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -29,7 +29,7 @@ error_dialog (const gchar* short_message, const gchar* detailed_message) { GtkWidget* dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, short_message); + NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", short_message); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", detailed_message); gtk_widget_show (dialog); @@ -94,8 +94,8 @@ sokoke_magic_uri (const gchar* uri, KatzeItem* item; g_return_val_if_fail (uri, NULL); - if (search_engines) - g_return_val_if_fail (katze_array_is_a (search_engines, KATZE_TYPE_ITEM), NULL); + g_return_val_if_fail (!search_engines || + katze_array_is_a (search_engines, KATZE_TYPE_ITEM), NULL); /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) From 7863d0f7fdaf5fdade0819e2a7569100ff486cc5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 14 Nov 2008 02:46:23 +0100 Subject: [PATCH 0486/2970] Introduce unit tests for automated testing The first one is a test for sokoke_magic_uri and it already helped improving the function. --- midori/sokoke.c | 15 ++++++++++++--- wscript | 12 ++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 33381986..90019545 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -88,9 +88,9 @@ sokoke_magic_uri (const gchar* uri, { gchar* current_dir; gchar* result; + gchar** parts; gchar* search; const gchar* search_uri; - gchar** parts; KatzeItem* item; g_return_val_if_fail (uri, NULL); @@ -114,8 +114,17 @@ sokoke_magic_uri (const gchar* uri, if (!strstr (uri, "://")) { /* Do we have a domain, ip address or localhost? */ - if (strchr (uri, '.') != NULL || strchr (uri, ':') - || !strcmp (uri, "localhost")) + parts = g_strsplit (uri, ".", 0); + if (parts[0] && parts[1]) + { + search = NULL; + if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0]))) + search = g_strconcat ("http://", uri, NULL); + g_free (parts); + if (search) + return search; + } + if (strchr (uri, ':') || !strcmp (uri, "localhost")) return g_strconcat ("http://", uri, NULL); /* We don't want to search? So return early. */ if (!search_engines) diff --git a/wscript b/wscript index c6558f8a..45dcf493 100644 --- a/wscript +++ b/wscript @@ -7,6 +7,7 @@ import pproc as subprocess import Common import sys import os +import UnitTest APPNAME = 'midori' VERSION = '0.1.0' @@ -224,6 +225,9 @@ def build (bld): else: Params.pprint ('BLUE', "logo-shade could not be rasterized.") + if Params.g_commands['check']: + bld.add_subdirs ('tests') + def shutdown (): if Params.g_commands['install'] or Params.g_commands['uninstall']: dir = Common.path_install ('DATADIR', 'icons/hicolor') @@ -242,6 +246,14 @@ def shutdown (): Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) + elif Params.g_commands['check']: + test = UnitTest.unit_test () + test.change_to_testfile_dir = True + test.want_to_see_test_output = True + test.want_to_see_test_error = True + test.run () + test.print_results () + elif Params.g_options.update_po: os.chdir('./po') try: From a1f2385eb443a0a0c1ddb8649bd50b9bc487a165 Mon Sep 17 00:00:00 2001 From: Andhika Padmawan Date: Fri, 14 Nov 2008 02:52:49 +0100 Subject: [PATCH 0487/2970] Update Indonesian translation --- po/id.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/id.po b/po/id.po index 2dfc389a..135ae6c3 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-10 20:20+0100\n" -"PO-Revision-Date: 2008-11-11 23:29+0700\n" +"PO-Revision-Date: 2008-11-13 21:26+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" @@ -34,12 +34,12 @@ msgstr "Peramban Web" #: ../midori/main.c:73 msgid "_Bookmark" -msgstr "_Bookmark" +msgstr "B_ookmark" #: ../midori/main.c:74 #: ../midori/midori-browser.c:3757 msgid "_Bookmarks" -msgstr "_Bookmark" +msgstr "B_ookmark" #: ../midori/main.c:75 msgid "_Add Bookmark" @@ -355,7 +355,7 @@ msgstr "Peramban web ringan." #: ../midori/midori-browser.c:2814 msgid "translator-credits" -msgstr "Andhika Padmawan 2008" +msgstr "Andhika Padmawan " #: ../midori/midori-browser.c:2966 msgid "Are you sure you want to remove all history items?" @@ -599,7 +599,7 @@ msgstr "Pindah ke tab berikutnya" #: ../midori/midori-browser.c:3217 msgid "_Help" -msgstr "_Bantuan" +msgstr "Ba_ntuan" #: ../midori/midori-browser.c:3219 msgid "_Contents" @@ -611,7 +611,7 @@ msgstr "Tampilkan dokumentasi" #: ../midori/midori-browser.c:3222 msgid "_Frequent questions" -msgstr "_Pertanyaan sering" +msgstr "_Sering ditanyakan" #: ../midori/midori-browser.c:3223 msgid "Show the Frequently Asked Questions" @@ -976,11 +976,11 @@ msgstr "Apakah ingin membuat panel sisi kompak" #: ../midori/midori-websettings.c:384 msgid "Load on Startup" -msgstr "Muat saat Mulai" +msgstr "Dimuat Saat Hidupkan" #: ../midori/midori-websettings.c:385 msgid "What to load on startup" -msgstr "Apa yang akan dimuat saat mulai" +msgstr "Apa yang akan dimuat saat hidupkan" #: ../midori/midori-websettings.c:395 msgid "The homepage" @@ -1060,7 +1060,7 @@ msgstr "Dimana ingin membuka halaman yang dibuka secara eksternal" #: ../midori/midori-websettings.c:488 msgid "Middle click opens Selection" -msgstr "Klik tengah membuka Pilihan" +msgstr "Klik Tengah Membuka Pilihan" #: ../midori/midori-websettings.c:489 msgid "Load an URL from the selection via middle click" @@ -1068,7 +1068,7 @@ msgstr "Muat URI dari pilihan via klik tengah" #: ../midori/midori-websettings.c:497 msgid "Open tabs in the background" -msgstr "Buka tab di latar belakang" +msgstr "Buka Tab di Latar Belakang" #: ../midori/midori-websettings.c:498 msgid "Whether to open new tabs in the background" @@ -1076,7 +1076,7 @@ msgstr "Apakah ingin membuka tab baru di latar belakang" #: ../midori/midori-websettings.c:506 msgid "Open Tabs next to Current" -msgstr "Buka tab di samping Saat Ini" +msgstr "Buka Tab di Samping Saat Ini" #: ../midori/midori-websettings.c:507 msgid "Whether to open new tabs next to the current tab or after the last one" @@ -1140,11 +1140,11 @@ msgstr "Apakah bentuk terakhir masukan disimpan" #: ../midori/midori-websettings.c:583 msgid "Remember last downloaded files" -msgstr "Ingat berkas terakhir terunduh" +msgstr "Ingat berkas terakhir diunduh" #: ../midori/midori-websettings.c:584 msgid "Whether the last downloaded files are saved" -msgstr "Apakah berkas terakhir terunduh disimpan" +msgstr "Apakah berkas terakhir diunduh akan disimpan" #: ../midori/midori-websettings.c:594 msgid "HTTP Proxy" @@ -1241,7 +1241,7 @@ msgstr "Cetak citra latar belakang" #: ../midori/midori-preferences.c:418 msgid "Resizable text areas" -msgstr "Area teks dapat diubah ukuran" +msgstr "Area teks dapat diubah ukurannya" #: ../midori/midori-preferences.c:421 msgid "Enable scripts" From 59ff9878c9d087c26bbb570db3fce656d4a0e2a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 16 Nov 2008 00:03:34 +0100 Subject: [PATCH 0488/2970] Actually commit the 'tests' folder --- tests/magic-uri.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ tests/wscript_build | 11 +++++++ 2 files changed, 86 insertions(+) create mode 100644 tests/magic-uri.c create mode 100644 tests/wscript_build diff --git a/tests/magic-uri.c b/tests/magic-uri.c new file mode 100644 index 00000000..2cdf5709 --- /dev/null +++ b/tests/magic-uri.c @@ -0,0 +1,75 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "compat.h" +#include "sokoke.h" + +int +main (int argc, + char** argv) +{ + KatzeArray* search_engines; + KatzeItem* item; + gchar* uri; + gchar* a, *b; + + gtk_init (&argc, &argv); + + search_engines = katze_array_new (KATZE_TYPE_ITEM); + item = g_object_new (KATZE_TYPE_ITEM, + "uri", "http://www.searchmash.com/search/%s", + "token", "sm", NULL); + katze_array_add_item (search_engines, item); + +#define test_input(input, expected) \ + uri = sokoke_magic_uri (input, search_engines); \ + if (g_strcmp0 (uri, expected)) \ + { \ + g_print ("Input: %s\nExpected: %s\nResult: %s\n\n", \ + input ? input : "NULL", \ + expected ? expected : "NULL", \ + uri ? uri : "NULL"); \ + return 1; \ + } \ + g_free (uri) + + test_input ("ftp://ftp.mozilla.org", "ftp://ftp.mozilla.org"); + test_input ("ftp://ftp.mozilla.org/pub", "ftp://ftp.mozilla.org/pub"); + test_input ("http://www.example.com", "http://www.example.com"); + test_input ("http://example.com", "http://example.com"); + test_input ("example.com", "http://example.com"); + test_input ("example.com", "http://example.com"); + test_input ("/home/user/midori.html", "file:///home/user/midori.html"); + a = g_get_current_dir (); + b = g_strconcat ("file://", a, G_DIR_SEPARATOR_S, "magic-uri.c", NULL); + g_free (a); + test_input ("magic-uri.c", b); + g_free (b); + test_input ("localhost", "http://localhost"); + test_input ("localhost:8000", "http://localhost:8000"); + test_input ("192.168.1.1", "http://192.168.1.1"); + test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); + test_input ("sm midori", "http://www.searchmash.com/search/midori"); + test_input ("sm cats dogs", "http://www.searchmash.com/search/cats dogs"); + test_input ("dict midori", NULL); + test_input ("cats", NULL); + test_input ("cats dogs", NULL); + test_input ("gtk 2.0", NULL); + test_input ("gtk2.0", NULL); + test_input ("midori0.1.0", NULL); + test_input ("midori 0.1.0", NULL); + + return 0; +} diff --git a/tests/wscript_build b/tests/wscript_build new file mode 100644 index 00000000..f0b93d35 --- /dev/null +++ b/tests/wscript_build @@ -0,0 +1,11 @@ +#! /usr/bin/env python +# WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. + +obj = bld.create_obj ('cc', 'program') +obj.target = 'magic-uri' +obj.includes = '.. ../midori' +obj.source = 'magic-uri.c ../midori/compat.c ../midori/sokoke.c' +obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib_local = 'katze' +obj.unit_test = 1 From e019c677bb2d48f171e14d65d2eb2e7ece2d0bc0 Mon Sep 17 00:00:00 2001 From: Brian Vuyk Date: Sun, 16 Nov 2008 00:10:39 +0100 Subject: [PATCH 0489/2970] Arrange file saving for error handling to fix warnings --- katze/katze-net.c | 8 +++++++- midori/midori-browser.c | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 9b81a38d..9fa651e2 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -419,6 +419,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, FILE* fp; GdkPixbuf* pixbuf_scaled; gint icon_width, icon_height; + size_t ret; if (request->status == KATZE_NET_MOVED) return; @@ -428,8 +429,13 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, { if ((fp = fopen (priv->icon_file, "wb"))) { - fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); + if ((ret - request->length) != 0) + { + /* FIXME: We need error handling. If this is called, + it means there was a write error */ + } pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); } else diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 68ecac19..221ba366 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -635,14 +635,20 @@ midori_browser_save_transfer_cb (KatzeNetRequest* request, gchar* filename) { FILE* fp; + size_t ret; if (request->data) { /* FIXME: Show an error message if the file cannot be saved */ if ((fp = fopen (filename, "wb"))) { - fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); + if ((ret - request->length) != 0) + { + /* FIXME: We need error handling. If this is called, + i means there was a write error */ + } } } g_free (filename); @@ -1822,6 +1828,7 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, gchar* text_editor; gint fd; FILE* fp; + size_t ret; if (request->data) { @@ -1833,8 +1840,13 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, { if ((fp = fdopen (fd, "w"))) { - fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); + if ((ret - request->length) != 0) + { + /* FIXME: We need error handling. If this is called, + it means there was a write error */ + } g_object_get (browser->settings, "text-editor", &text_editor, NULL); sokoke_spawn_program (text_editor, unique_filename); From 744f9ce56fb8bcc337d69bc1957cbfc0a1872322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 16 Nov 2008 00:21:22 +0100 Subject: [PATCH 0490/2970] Save files with permissions of 0700 instead of 0755 --- katze/katze-net.c | 2 +- midori/main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 9fa651e2..d1e88eee 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -139,7 +139,7 @@ katze_net_get_cached_path (KatzeNet* net, cache_path = g_build_filename (net->cache_path, subfolder, NULL); else cache_path = net->cache_path; - g_mkdir_with_parents (cache_path, 0755); + g_mkdir_with_parents (cache_path, 0700); #if GLIB_CHECK_VERSION (2, 16, 0) checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); #else diff --git a/midori/main.c b/midori/main.c index 8130ec09..2e994ac5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1012,7 +1012,7 @@ midori_browser_session_cb (MidoriBrowser* browser, config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0755); + g_mkdir_with_parents (config_path, 0700); config_file = g_build_filename (config_path, "session.xbel", NULL); error = NULL; if (!katze_array_to_file (session, config_file, &error)) @@ -1160,7 +1160,7 @@ main (int argc, GString* error_messages = g_string_new (NULL); gchar* config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0755); + g_mkdir_with_parents (config_path, 0700); gchar* config_file = g_build_filename (config_path, "config", NULL); error = NULL; MidoriWebSettings* settings = settings_new_from_file (config_file); @@ -1387,7 +1387,7 @@ main (int argc, /* Save configuration files */ config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0755); + g_mkdir_with_parents (config_path, 0700); g_object_unref (history); #ifdef HAVE_SQLITE g_object_get (settings, "maximum-history-age", &max_history_age, NULL); From b9a183c316197f325b950988a471b522d4bf792d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 16 Nov 2008 00:36:32 +0100 Subject: [PATCH 0491/2970] Allow ":" as in "foo:bar" to search from the location --- midori/sokoke.c | 8 +++++--- tests/magic-uri.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 90019545..776931c3 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -114,8 +114,12 @@ sokoke_magic_uri (const gchar* uri, if (!strstr (uri, "://")) { /* Do we have a domain, ip address or localhost? */ + search = strchr (uri, ':'); + if ((search && search[0] && !g_ascii_isalpha (search[1])) + || !strcmp (uri, "localhost")) + return g_strconcat ("http://", uri, NULL); parts = g_strsplit (uri, ".", 0); - if (parts[0] && parts[1]) + if (!search && parts[0] && parts[1]) { search = NULL; if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0]))) @@ -124,8 +128,6 @@ sokoke_magic_uri (const gchar* uri, if (search) return search; } - if (strchr (uri, ':') || !strcmp (uri, "localhost")) - return g_strconcat ("http://", uri, NULL); /* We don't want to search? So return early. */ if (!search_engines) return g_strdup (uri); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 2cdf5709..0685f3d8 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -70,6 +70,8 @@ main (int argc, test_input ("gtk2.0", NULL); test_input ("midori0.1.0", NULL); test_input ("midori 0.1.0", NULL); + test_input ("search:cats", NULL); + test_input ("search:twotoasts.de", NULL); return 0; } From c49ed67ab07dd17fe8cc02af2c19db16db411720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 16 Nov 2008 01:04:12 +0100 Subject: [PATCH 0492/2970] Correct usage of datatypes in a number of places --- katze/katze-net.h | 2 +- katze/katze-throbber.c | 2 +- katze/katze-utils.c | 3 ++- midori/main.c | 2 +- midori/midori-browser.c | 3 ++- midori/midori-locationaction.c | 4 ++-- midori/midori-locationentry.c | 4 ++-- midori/midori-view.c | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/katze/katze-net.h b/katze/katze-net.h index 2b6f78c8..3aa12805 100644 --- a/katze/katze-net.h +++ b/katze/katze-net.h @@ -55,7 +55,7 @@ typedef struct KatzeNetStatus status; gchar* mime_type; gchar* data; - gsize length; + goffset length; } KatzeNetRequest; typedef gboolean (*KatzeNetStatusCb) (KatzeNetRequest* request, diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 9ec60242..68b61bb1 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -793,7 +793,7 @@ katze_throbber_aligned_coords (GtkWidget* widget, gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign); if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - xalign = 1.0 - xalign; + xalign = 1.0f - xalign; gtk_misc_get_padding (GTK_MISC (widget), &xpad, &ypad); *ax = floor (widget->allocation.x + xpad diff --git a/katze/katze-utils.c b/katze/katze-utils.c index f91542e1..048f2428 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -308,7 +308,8 @@ katze_property_proxy (gpointer object, gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); - g_object_set_data (G_OBJECT (widget), "property", (gchar*)property); + g_object_set_data_full (G_OBJECT (widget), "property", + g_strdup (property), g_free); return widget; } diff --git a/midori/main.c b/midori/main.c index 2e994ac5..5e0c119c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1369,7 +1369,7 @@ main (int argc, continue; gchar* fullname = g_build_filename (addon_path, filename, NULL); - gchar* exception = NULL; + exception = NULL; gjs_script_from_file (js_context, fullname, &exception); if (exception) /* FIXME: Do we want to print this somewhere else? */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 221ba366..ce8b3049 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2056,7 +2056,8 @@ _action_location_secondary_icon_released (GtkAction* action, menuitem), gtk_image_new_from_stock (STOCK_NEWS_FEED, GTK_ICON_SIZE_MENU)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "uri", (gchar*)uri); + g_object_set_data_full (G_OBJECT (menuitem), + "uri", g_strup ((gchar*)uri), g_free); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_menu_feed_item_activate_cb), browser); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 57220740..17f1d55f 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -317,7 +317,7 @@ midori_location_action_create_tool_item (GtkAction* action) gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); location_entry = midori_location_entry_new (); - alignment = gtk_alignment_new (0, 0.5, 1, 0.1); + alignment = gtk_alignment_new (0.0f, 0.5f, 1.0f, 0.1f); gtk_container_add (GTK_CONTAINER (alignment), location_entry); gtk_widget_show (location_entry); gtk_container_add (GTK_CONTAINER (toolitem), alignment); @@ -339,7 +339,7 @@ midori_location_action_key_press_event_cb (GtkWidget* widget, case GDK_KP_Enter: case GDK_Return: { - if ((uri = gtk_entry_get_text (GTK_ENTRY (widget)))) + if ((uri = gtk_entry_get_text (GTK_ENTRY (widget))) && *uri) { g_signal_emit (action, signals[SUBMIT_URI], 0, uri, (event->state & GDK_MOD1_MASK) ? TRUE : FALSE); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 1e9a4766..3f4dd2a8 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -72,8 +72,8 @@ gtk_entry_get_pixel_ranges (GtkEntry *entry, PangoLayout *layout = gtk_entry_get_layout (entry); PangoLayoutLine *line = pango_layout_get_lines (layout)->data; const char *text = pango_layout_get_text (layout); - gint start_index = g_utf8_offset_to_pointer (text, start_char) - text; - gint end_index = g_utf8_offset_to_pointer (text, end_char) - text; + gsize start_index = g_utf8_offset_to_pointer (text, start_char) - text; + gsize end_index = g_utf8_offset_to_pointer (text, end_char) - text; gint real_n_ranges, i; pango_layout_line_get_x_ranges (line, diff --git a/midori/midori-view.c b/midori/midori-view.c index d16de49e..65ba2eca 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1313,7 +1313,7 @@ webkit_web_inspector_inspect_web_view_cb (WebKitWebInspector* inspector, gray_icon = gdk_pixbuf_copy (icon); if (gray_icon) { - gdk_pixbuf_saturate_and_pixelate (gray_icon, gray_icon, 0.1, FALSE); + gdk_pixbuf_saturate_and_pixelate (gray_icon, gray_icon, 0.1f, FALSE); gtk_window_set_icon (GTK_WINDOW (window), gray_icon); g_object_unref (gray_icon); } From 24ca48cc1eb6c54fbf258eeb2c014485677512a1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 16 Nov 2008 02:00:17 +0100 Subject: [PATCH 0493/2970] Move variable declarations to the beginnings of blocks --- midori/midori-browser.c | 4 +++- midori/midori-console.c | 11 ++++++++--- midori/midori-panel.c | 30 +++++++++++++++++++++--------- midori/midori-preferences.c | 10 ++++++---- midori/midori-view.c | 6 ++++-- midori/midori-websettings.c | 16 +++++++++++----- midori/sokoke.c | 35 +++++++++++++++++++++++------------ 7 files changed, 76 insertions(+), 36 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ce8b3049..6d843ed5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1281,8 +1281,10 @@ _action_open_activate (GtkAction* action, if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { + gchar* folder; + + folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - gchar* folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); midori_browser_set_current_uri (browser, uri); g_free (last_dir); diff --git a/midori/midori-console.c b/midori/midori-console.c index 2a4df539..507b26dc 100644 --- a/midori/midori-console.c +++ b/midori/midori-console.c @@ -64,9 +64,11 @@ midori_console_treeview_render_text_cb (GtkTreeViewColumn* column, gchar* message; gint line; gchar* source_id; + gchar* text; + gtk_tree_model_get (model, iter, 0, &message, 1, &line, 2, &source_id, -1); - gchar* text = g_strdup_printf ("%d @ %s\n%s", line, source_id, message); + text = g_strdup_printf ("%d @ %s\n%s", line, source_id, message); g_object_set (renderer, "text", text, NULL); g_free (text); @@ -153,10 +155,13 @@ midori_console_get_toolbar (MidoriConsole* console) if (!console->toolbar) { - GtkWidget* toolbar = gtk_toolbar_new (); + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - GtkToolItem* toolitem = gtk_tool_item_new (); + toolitem = gtk_tool_item_new (); /* TODO: What about a find entry here that filters e.g. by url? */ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); diff --git a/midori/midori-panel.c b/midori/midori-panel.c index c4fd41be..2a2cb6f4 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -109,6 +109,9 @@ midori_cclosure_marshal_BOOLEAN__VOID (GClosure* closure, static void midori_panel_class_init (MidoriPanelClass* class) { + GObjectClass* gobject_class; + GParamFlags flags; + signals[CLOSE] = g_signal_new ( "close", @@ -133,12 +136,12 @@ midori_panel_class_init (MidoriPanelClass* class) class->close = midori_panel_close_cb; - GObjectClass* gobject_class = G_OBJECT_CLASS (class); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_panel_finalize; gobject_class->set_property = midori_panel_set_property; gobject_class->get_property = midori_panel_get_property; - GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; g_object_class_install_property (gobject_class, PROP_SHADOW_TYPE, @@ -180,6 +183,10 @@ midori_panel_button_close_clicked_cb (GtkWidget* toolitem, static void midori_panel_init (MidoriPanel* panel) { + GtkWidget* vbox; + GtkWidget* labelbar; + GtkToolItem* toolitem; + /* Create the sidebar */ panel->toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_BOTH); @@ -189,14 +196,14 @@ midori_panel_init (MidoriPanel* panel) GTK_ORIENTATION_VERTICAL); gtk_box_pack_start (GTK_BOX (panel), panel->toolbar, FALSE, FALSE, 0); gtk_widget_show_all (panel->toolbar); - GtkWidget* vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (panel), vbox, TRUE, TRUE, 0); /* Create the titlebar */ - GtkWidget* labelbar = gtk_toolbar_new (); + labelbar = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (labelbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (labelbar), GTK_TOOLBAR_ICONS); - GtkToolItem* toolitem = gtk_tool_item_new (); + toolitem = gtk_tool_item_new (); gtk_tool_item_set_expand (toolitem, TRUE); panel->toolbar_label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (panel->toolbar_label), 0, 0.5); @@ -559,9 +566,12 @@ gint midori_panel_page_num (MidoriPanel* panel, GtkWidget* child) { - g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); + GtkWidget* scrolled; - GtkWidget* scrolled = _midori_panel_scrolled_for_child (panel, child); + g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); + g_return_val_if_fail (GTK_IS_WIDGET (child), -1); + + scrolled = _midori_panel_scrolled_for_child (panel, child); return gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), scrolled); } @@ -579,12 +589,14 @@ void midori_panel_set_current_page (MidoriPanel* panel, gint n) { + GtkWidget* child; + g_return_if_fail (MIDORI_IS_PANEL (panel)); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); - GtkWidget* child = midori_panel_get_nth_page (panel, n); - if (child) + + if ((child = midori_panel_get_nth_page (panel, n))) { const gchar* label = g_object_get_data (G_OBJECT (child), "label"); g_object_set (panel->toolbar_label, "label", label, NULL); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index ec519aae..58791794 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -167,13 +167,15 @@ GtkWidget* midori_preferences_new (GtkWindow* parent, MidoriWebSettings* settings) { + MidoriPreferences* preferences; + g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (settings), NULL); - MidoriPreferences* preferences = g_object_new (MIDORI_TYPE_PREFERENCES, - "transient-for", parent, - "settings", settings, - NULL); + preferences = g_object_new (MIDORI_TYPE_PREFERENCES, + "transient-for", parent, + "settings", settings, + NULL); return GTK_WIDGET (preferences); } diff --git a/midori/midori-view.c b/midori/midori-view.c index 65ba2eca..36c90dfe 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -76,14 +76,16 @@ GType midori_load_status_get_type (void) { static GType type = 0; - if (type) - return type; static const GEnumValue values[] = { { MIDORI_LOAD_PROVISIONAL, "MIDORI_LOAD_PROVISIONAL", "Load Provisional" }, { MIDORI_LOAD_COMMITTED, "MIDORI_LOAD_COMMITTED", "Load Committed" }, { MIDORI_LOAD_FINISHED, "MIDORI_LOAD_FINISHED", "Load Finished" }, { 0, NULL, NULL } }; + + if (type) + return type; + type = g_enum_register_static ("MidoriLoadStatus", values); return type; } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index fc6b1ba0..e5487104 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -230,12 +230,15 @@ midori_web_settings_get_property (GObject* object, static void midori_web_settings_class_init (MidoriWebSettingsClass* class) { - GObjectClass* gobject_class = G_OBJECT_CLASS (class); + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_web_settings_finalize; gobject_class->set_property = midori_web_settings_set_property; gobject_class->get_property = midori_web_settings_get_property; - GParamFlags flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_WINDOW_SIZE, @@ -610,11 +613,14 @@ static void notify_default_encoding_cb (GObject* object, GParamSpec* pspec) { - MidoriWebSettings* web_settings = MIDORI_WEB_SETTINGS (object); - + MidoriWebSettings* web_settings; const gchar* string; + const gchar* encoding; + + web_settings = MIDORI_WEB_SETTINGS (object); + g_object_get (object, "default-encoding", &string, NULL); - const gchar* encoding = string ? string : ""; + encoding = string ? string : ""; if (!strcmp (encoding, "BIG5")) web_settings->preferred_encoding = MIDORI_ENCODING_CHINESE; else if (!strcmp (encoding, "SHIFT_JIS")) diff --git a/midori/sokoke.c b/midori/sokoke.c index 776931c3..d170e5b9 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -178,12 +178,13 @@ void sokoke_combo_box_add_strings (GtkComboBox* combobox, const gchar* label_first, ...) { + const gchar* label; + /* Add a number of strings to a combobox, terminated with NULL This works only for text comboboxes */ va_list args; va_start (args, label_first); - const gchar* label; for (label = label_first; label; label = va_arg (args, const gchar*)) gtk_combo_box_append_text (combobox, label); @@ -255,17 +256,22 @@ sokoke_xfce_header_new (const gchar* icon, This returns NULL if the desktop is not Xfce */ if (sokoke_get_desktop () == SOKOKE_DESKTOP_XFCE) { - GtkWidget* entry = gtk_entry_new (); + GtkWidget* entry; gchar* markup; - GtkWidget* xfce_heading = gtk_event_box_new (); + GtkWidget* xfce_heading; + GtkWidget* hbox; + GtkWidget* image; + GtkWidget* label; + + xfce_heading = gtk_event_box_new (); + entry = gtk_entry_new (); gtk_widget_modify_bg (xfce_heading, GTK_STATE_NORMAL, &entry->style->base[GTK_STATE_NORMAL]); - GtkWidget* hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - GtkWidget* image = gtk_image_new_from_icon_name (icon, - GTK_ICON_SIZE_DIALOG); + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - GtkWidget* label = gtk_label_new (NULL); + label = gtk_label_new (NULL); gtk_widget_modify_fg (label, GTK_STATE_NORMAL , &entry->style->text[GTK_STATE_NORMAL]); markup = g_strdup_printf ("%s", @@ -287,11 +293,13 @@ sokoke_superuser_warning_new (void) #if HAVE_UNISTD_H if (G_UNLIKELY (!geteuid ())) /* effective superuser? */ { - GtkWidget* hbox = gtk_event_box_new (); + GtkWidget* hbox; + GtkWidget* label; + + hbox = gtk_event_box_new (); gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL, &hbox->style->bg[GTK_STATE_SELECTED]); - GtkWidget* label = gtk_label_new ( - _("Warning: You are using a superuser account!")); + label = gtk_label_new (_("Warning: You are using a superuser account!")); gtk_misc_set_padding (GTK_MISC (label), 0, 2); gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, >K_WIDGET (label)->style->fg[GTK_STATE_SELECTED]); @@ -458,10 +466,13 @@ sokoke_key_file_save_to_file (GKeyFile* key_file, const gchar* filename, GError** error) { - gchar* data = g_key_file_to_data (key_file, NULL, error); + gchar* data; + FILE* fp; + + data = g_key_file_to_data (key_file, NULL, error); if (!data) return FALSE; - FILE* fp; + if (!(fp = fopen (filename, "w"))) { *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES, From 4e8236c95cc96da0eead90df61440f0b4f57136f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 01:55:49 +0100 Subject: [PATCH 0494/2970] Use gint64 instead of goffset, the latter is too new --- katze/katze-net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/katze/katze-net.h b/katze/katze-net.h index 3aa12805..0da0c287 100644 --- a/katze/katze-net.h +++ b/katze/katze-net.h @@ -55,7 +55,7 @@ typedef struct KatzeNetStatus status; gchar* mime_type; gchar* data; - goffset length; + gint64 length; } KatzeNetRequest; typedef gboolean (*KatzeNetStatusCb) (KatzeNetRequest* request, From d60166aa02cb335d3f60094790d9d0250a6e9970 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 01:57:33 +0100 Subject: [PATCH 0495/2970] Add katze_get_object --- katze/katze-utils.c | 22 ++++++++++++++++++++++ katze/katze-utils.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 048f2428..fff0cf8a 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -517,3 +517,25 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, g_object_unref (loader); return pixbuf; } + +/** + * katze_object_get_object: + * @object: a #GObject + * @property_name: the name of the property to get + * + * Retrieve the object value of the specified property. + * + * Return value: Return value: an object + **/ +gpointer +katze_object_get_object (gpointer object, + const gchar* property) +{ + GObject* value = NULL; + + g_return_val_if_fail (G_IS_OBJECT (object), NULL); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 97e5b8dc..b86bc729 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -84,6 +84,10 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, const gchar* mime_type, GError** error); +gpointer +katze_object_get_object (gpointer object, + const gchar* property); + G_END_DECLS #endif /* __KATZE_UTILS_H__ */ From 5a1b766a434a20bb143e636673638fe1d69d99e0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 02:01:30 +0100 Subject: [PATCH 0496/2970] Fix MidoriApp so that add-browser is actually usable --- midori/midori-app.c | 152 +++++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 72 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 9264ae07..b7966835 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -86,6 +86,84 @@ midori_app_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static gboolean +midori_browser_focus_in_event_cb (MidoriBrowser* browser, + GdkEventFocus* event, + MidoriApp* app) +{ + app->browser = browser; + g_object_notify (G_OBJECT (app), "browser"); + return FALSE; +} + +static void +midori_browser_new_window_cb (MidoriBrowser* browser, + const gchar* uri, + MidoriApp* app) +{ + MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, + "settings", app->settings, + "bookmarks", app->bookmarks, + "trash", app->trash, + "search-engines", app->search_engines, + "history", app->history, + NULL); + midori_browser_add_uri (new_browser, uri); + gtk_widget_show (GTK_WIDGET (new_browser)); + + g_signal_emit (app, signals[ADD_BROWSER], 0, new_browser); +} + +static gboolean +midori_browser_delete_event_cb (MidoriBrowser* browser, + GdkEvent* event, + MidoriApp* app) +{ + return FALSE; +} + +static gboolean +midori_browser_destroy_cb (MidoriBrowser* browser, + MidoriApp* app) +{ + app->browsers = g_list_remove (app->browsers, browser); + if (g_list_nth (app->browsers, 0)) + return FALSE; + midori_app_quit (app); + return TRUE; +} + +static void +midori_browser_quit_cb (MidoriBrowser* browser, + MidoriApp* app) +{ + midori_app_quit (app); +} + +void +_midori_app_add_browser (MidoriApp* app, + MidoriBrowser* browser) +{ + g_return_if_fail (MIDORI_IS_APP (app)); + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + + gtk_window_add_accel_group (GTK_WINDOW (browser), app->accel_group); + g_object_connect (browser, + "signal::focus-in-event", midori_browser_focus_in_event_cb, app, + "signal::new-window", midori_browser_new_window_cb, app, + "signal::delete-event", midori_browser_delete_event_cb, app, + "signal::destroy", midori_browser_destroy_cb, app, + "signal::quit", midori_browser_quit_cb, app, + NULL); + + app->browsers = g_list_prepend (app->browsers, browser); + + #if HAVE_UNIQUE + if (app->instance) + unique_app_watch_window (app->instance, GTK_WINDOW (browser)); + #endif +} + static void midori_app_class_init (MidoriAppClass* class) { @@ -118,7 +196,7 @@ midori_app_class_init (MidoriAppClass* class) gobject_class->set_property = midori_app_set_property; gobject_class->get_property = midori_app_get_property; - class->add_browser = midori_app_add_browser; + class->add_browser = _midori_app_add_browser; class->quit = midori_app_quit; g_object_class_install_property (gobject_class, @@ -183,8 +261,6 @@ midori_app_class_init (MidoriAppClass* class) "The list of history items", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); - - } static GObject* @@ -421,60 +497,6 @@ midori_app_get_property (GObject* object, } } -static gboolean -midori_browser_focus_in_event_cb (MidoriBrowser* browser, - GdkEventFocus* event, - MidoriApp* app) -{ - app->browser = browser; - g_object_notify (G_OBJECT (app), "browser"); - return FALSE; -} - -static void -midori_browser_new_window_cb (MidoriBrowser* browser, - const gchar* uri, - MidoriApp* app) -{ - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", app->settings, - "bookmarks", app->bookmarks, - "trash", app->trash, - "search-engines", app->search_engines, - "history", app->history, - NULL); - midori_browser_add_uri (new_browser, uri); - gtk_widget_show (GTK_WIDGET (new_browser)); - - g_signal_emit (app, signals[ADD_BROWSER], 0, new_browser); -} - -static gboolean -midori_browser_delete_event_cb (MidoriBrowser* browser, - GdkEvent* event, - MidoriApp* app) -{ - return FALSE; -} - -static gboolean -midori_browser_destroy_cb (MidoriBrowser* browser, - MidoriApp* app) -{ - app->browsers = g_list_remove (app->browsers, browser); - if (g_list_nth (app->browsers, 0)) - return FALSE; - midori_app_quit (app); - return TRUE; -} - -static void -midori_browser_quit_cb (MidoriBrowser* browser, - MidoriApp* app) -{ - midori_app_quit (app); -} - /** * midori_app_new: * @@ -629,21 +651,7 @@ midori_app_add_browser (MidoriApp* app, g_return_if_fail (MIDORI_IS_APP (app)); g_return_if_fail (MIDORI_IS_BROWSER (browser)); - gtk_window_add_accel_group (GTK_WINDOW (browser), app->accel_group); - g_object_connect (browser, - "signal::focus-in-event", midori_browser_focus_in_event_cb, app, - "signal::new-window", midori_browser_new_window_cb, app, - "signal::delete-event", midori_browser_delete_event_cb, app, - "signal::destroy", midori_browser_destroy_cb, app, - "signal::quit", midori_browser_quit_cb, app, - NULL); - - app->browsers = g_list_prepend (app->browsers, browser); - - #if HAVE_UNIQUE - if (app->instance) - unique_app_watch_window (app->instance, GTK_WINDOW (browser)); - #endif + g_signal_emit (app, signals[ADD_BROWSER], 0, browser); } /** From 33804965a120dc5fbb26189dd22b2a50fd3a43f9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 02:02:59 +0100 Subject: [PATCH 0497/2970] Expose browser notebook and panel as properties --- midori/midori-browser.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6d843ed5..496e3ff6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -88,6 +88,8 @@ enum PROP_MENUBAR, PROP_NAVIGATIONBAR, + PROP_NOTEBOOK, + PROP_PANEL, PROP_URI, PROP_TAB, PROP_STATUSBAR, @@ -1086,6 +1088,24 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_TOOLBAR, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, + PROP_NOTEBOOK, + g_param_spec_object ( + "notebook", + "Notebook", + "The notebook containing the views", + GTK_TYPE_NOTEBOOK, + G_PARAM_READABLE)); + + g_object_class_install_property (gobject_class, + PROP_PANEL, + g_param_spec_object ( + "panel", + "Panel", + "The side panel embedded in the browser", + MIDORI_TYPE_PANEL, + G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_URI, g_param_spec_string ( @@ -4567,6 +4587,12 @@ midori_browser_get_property (GObject* object, case PROP_NAVIGATIONBAR: g_value_set_object (value, browser->navigationbar); break; + case PROP_NOTEBOOK: + g_value_set_object (value, browser->notebook); + break; + case PROP_PANEL: + g_value_set_object (value, browser->panel); + break; case PROP_URI: g_value_set_string (value, midori_browser_get_current_uri (browser)); break; From 3cd50f419b55c8ac81d557ddf5764f78bffd75ff Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 02:07:53 +0100 Subject: [PATCH 0498/2970] Introduce a C extension interface --- README | 4 +- extensions/wscript_build | 30 +++++++ katze/wscript_build | 7 +- midori/main.c | 71 +++++++++------- midori/midori-extension.c | 175 ++++++++++++++++++++++++++++++++++++++ midori/midori-extension.h | 56 ++++++++++++ midori/midori.h | 30 +++++++ midori/wscript_build | 2 +- wscript | 17 +++- 9 files changed, 355 insertions(+), 37 deletions(-) create mode 100644 extensions/wscript_build create mode 100644 midori/midori-extension.c create mode 100644 midori/midori-extension.h create mode 100644 midori/midori.h diff --git a/README b/README index 63d716d5..62995981 100644 --- a/README +++ b/README @@ -9,12 +9,12 @@ Midori is a lightweight web browser. * User scripts and user styles support. * Straightforward bookmark management. * Customizable and extensible interface. -* Extensible via Javascript. +* Extensions written in C. * Custom context menu actions. Requirements: GTK+ 2.10, WebkitGtk, libXML2 -Optional: Unique 0.9, libsoup 2.4, sqlite 3.0, xdg-open +Optional: Unique 0.9, libsoup 2.4, sqlite 3.0, docutils, xdg-open For installation instructions read INSTALL. diff --git a/extensions/wscript_build b/extensions/wscript_build new file mode 100644 index 00000000..4b75ea7b --- /dev/null +++ b/extensions/wscript_build @@ -0,0 +1,30 @@ +#! /usr/bin/env python +# WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. + +extensions = os.listdir ('extensions') +for extension in extensions: + try: + folder = 'extensions' + os.sep + extension + files = os.listdir (folder) + target = extension + source = '' + for fila in files: + if fila[-2:] == '.c': + source += ' ' + extension + os.sep + fila + includes = '.' + os.sep + '..' + except: + if extension[-2:] != '.c': + continue + target = extension[:-2] + source = extension + includes = '..' + + obj = bld.create_obj ('cc', 'shlib') + obj.target = target + obj.includes = includes + obj.source = source + obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' + obj.uselib_local = 'katze' + obj.inst_var = 'LIBDIR' + obj.inst_dir = 'midori' diff --git a/katze/wscript_build b/katze/wscript_build index ca4dddfb..aad466c1 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -2,12 +2,15 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import platform + obj = bld.create_obj ('cc', 'staticlib') obj.name = 'katze' obj.target = 'katze' obj.includes = '.' obj.find_sources_in_dirs ('.') -obj.uselib = 'LIBSOUP GTK LIBXML' +obj.uselib = 'GMODULE LIBSOUP GTK LIBXML' obj.inst_var = 0 -# FIXME: Do not install this static lib +if platform.architecture ()[0] == '64bit': + obj.env.append_value ('CCFLAGS', '-fPIC') diff --git a/midori/main.c b/midori/main.c index 5e0c119c..a1e5f214 100644 --- a/midori/main.c +++ b/midori/main.c @@ -19,6 +19,7 @@ #include "midori-websettings.h" #include "midori-browser.h" #include "midori-stock.h" +#include "midori-extension.h" #include "sokoke.h" #include "gjs.h" @@ -1033,9 +1034,6 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } -gboolean -midori_view_single_process (gboolean enable); - int main (int argc, char** argv) @@ -1322,6 +1320,45 @@ main (int argc, "history", history, NULL); + /* Load extensions */ + gchar* extension_path; + GDir* extension_dir; + const gchar* filename; + + extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); + if (g_module_supported ()) + extension_dir = g_dir_open (extension_path, 0, NULL); + else + extension_dir = NULL; + if (extension_dir) + { + while ((filename = g_dir_read_name (extension_dir))) + { + gchar* fullname; + GModule* module; + typedef MidoriExtension* (*extension_main_func)(MidoriApp* app); + extension_main_func extension_main; + + fullname = g_build_filename (extension_path, filename, NULL); + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); + g_free (fullname); + if (!module) + { + g_warning ("%s", g_module_error ()); + continue; + } + ; + if (!g_module_symbol (module, "extension_main", + (gpointer) &extension_main)) + { + g_warning ("%s", g_module_error ()); + continue; + } + extension_main (app); + } + g_dir_close (extension_dir); + } + browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", settings, "bookmarks", bookmarks, @@ -1354,36 +1391,8 @@ main (int argc, g_object_weak_ref (G_OBJECT (session), (GWeakNotify)(midori_browser_weak_notify_cb), browser); - /* Load extensions */ - js_context = gjs_global_context_new (); - /* FIXME: We want to honor system installed addons as well */ - gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, - "extensions", NULL); - GDir* addon_dir = g_dir_open (addon_path, 0, NULL); - if (addon_dir) - { - const gchar* filename; - while ((filename = g_dir_read_name (addon_dir))) - { - if (!g_str_has_prefix (filename, ".midori.js")) - continue; - - gchar* fullname = g_build_filename (addon_path, filename, NULL); - exception = NULL; - gjs_script_from_file (js_context, fullname, &exception); - if (exception) - /* FIXME: Do we want to print this somewhere else? */ - /* FIXME Convert the filename to UTF8 */ - printf ("%s - Exception: %s\n", filename, exception); - g_free (fullname); - } - g_dir_close (addon_dir); - } - gtk_main (); - JSGlobalContextRelease (js_context); - /* Save configuration files */ config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); diff --git a/midori/midori-extension.c b/midori/midori-extension.c new file mode 100644 index 00000000..b97f8eda --- /dev/null +++ b/midori/midori-extension.c @@ -0,0 +1,175 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-extension.h" + +#include + +G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT); + +struct _MidoriExtensionPrivate +{ + gchar* name; + gchar* description; + gchar* version; + gchar* authors; +}; + +enum +{ + PROP_0, + + PROP_NAME, + PROP_DESCRIPTION, + PROP_VERSION, + PROP_AUTHORS +}; + +static void +midori_extension_finalize (GObject* object); + +static void +midori_extension_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_extension_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_extension_class_init (MidoriExtensionClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_extension_finalize; + gobject_class->set_property = midori_extension_set_property; + gobject_class->get_property = midori_extension_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_NAME, + g_param_spec_string ( + "name", + "Name", + "The name of the extension", + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_DESCRIPTION, + g_param_spec_string ( + "description", + "Description", + "The description of the extension", + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_VERSION, + g_param_spec_string ( + "version", + "Version", + "The version of the extension", + NULL, + flags)); + + g_object_class_install_property (gobject_class, + PROP_AUTHORS, + g_param_spec_string ( + "authors", + "Authors", + "The authors of the extension", + NULL, + flags)); + + g_type_class_add_private (class, sizeof (MidoriExtensionPrivate)); +} + +static void +midori_extension_init (MidoriExtension* extension) +{ + extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (extension, + MIDORI_TYPE_EXTENSION, MidoriExtensionPrivate); +} + +static void +midori_extension_finalize (GObject* object) +{ + MidoriExtension* extension = MIDORI_EXTENSION (object); + + katze_assign (extension->priv->name, NULL); + katze_assign (extension->priv->description, NULL); + katze_assign (extension->priv->version, NULL); + katze_assign (extension->priv->authors, NULL); +} + +static void +midori_extension_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriExtension* extension = MIDORI_EXTENSION (object); + + switch (prop_id) + { + case PROP_NAME: + katze_assign (extension->priv->name, g_value_dup_string (value)); + break; + case PROP_DESCRIPTION: + katze_assign (extension->priv->description, g_value_dup_string (value)); + break; + case PROP_VERSION: + katze_assign (extension->priv->version, g_value_dup_string (value)); + break; + case PROP_AUTHORS: + katze_assign (extension->priv->authors, g_value_dup_string (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_extension_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriExtension* extension = MIDORI_EXTENSION (object); + + switch (prop_id) + { + case PROP_NAME: + g_value_set_string (value, extension->priv->name); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, extension->priv->description); + break; + case PROP_VERSION: + g_value_set_string (value, extension->priv->version); + break; + case PROP_AUTHORS: + g_value_set_string (value, extension->priv->authors); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} diff --git a/midori/midori-extension.h b/midori/midori-extension.h new file mode 100644 index 00000000..7bf9e2f6 --- /dev/null +++ b/midori/midori-extension.h @@ -0,0 +1,56 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_EXTENSION_H__ +#define __MIDORI_EXTENSION_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_EXTENSION \ + (midori_extension_get_type ()) +#define MIDORI_EXTENSION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_EXTENSION, MidoriExtension)) +#define MIDORI_EXTENSION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_EXTENSION, MidoriExtensionClass)) +#define MIDORI_IS_EXTENSION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_EXTENSION)) +#define MIDORI_IS_EXTENSION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_EXTENSION)) +#define MIDORI_EXTENSION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_EXTENSION, MidoriExtensionClass)) + +typedef struct _MidoriExtension MidoriExtension; +typedef struct _MidoriExtensionClass MidoriExtensionClass; +typedef struct _MidoriExtensionPrivate MidoriExtensionPrivate; + +struct _MidoriExtension +{ + GObject parent_instance; + + MidoriExtensionPrivate* priv; +}; + +struct _MidoriExtensionClass +{ + GObjectClass parent_class; +}; + +GType +midori_extension_get_type (void); + +/* There is no API for MidoriExtension. Please use the + available properties and signals. */ + +G_END_DECLS + +#endif /* __MIDORI_EXTENSION_H__ */ diff --git a/midori/midori.h b/midori/midori.h new file mode 100644 index 00000000..997e37bd --- /dev/null +++ b/midori/midori.h @@ -0,0 +1,30 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_H__ +#define __MIDORI_H__ + +#include "midori-addons.h" +#include "midori-app.h" +#include "midori-browser.h" +#include "midori-console.h" +#include "midori-extension.h" +#include "midori-locationaction.h" +#include "midori-locationentry.h" +#include "midori-panel.h" +#include "midori-preferences.h" +#include "midori-searchaction.h" +#include "midori-source.h" +#include "midori-stock.h" +#include "midori-view.h" +#include "midori-websettings.h" + +#endif /* __MIDORI_H__ */ diff --git a/midori/wscript_build b/midori/wscript_build index a855e98a..dd6bac24 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.') -obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GMODULE GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 45dcf493..34f31a61 100644 --- a/wscript +++ b/wscript @@ -51,6 +51,12 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) + if Params.g_options.libdir == '': + libdir = os.path.join (conf.env['PREFIX'], 'lib') + else: + libdir = Params.g_options.libdir + conf.define ('LIBDIR', libdir) + # We support building without intltool # Therefore datadir may not have been defined if not conf.is_defined ('DATADIR'): @@ -100,6 +106,7 @@ def configure (conf): sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) + conf.check_pkg ('gmodule-2.0', destvar='GMODULE', vnum='2.8.0', mandatory=False) conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) @@ -141,7 +148,7 @@ def set_options (opt): opt.tool_options ('compiler_cc') opt.tool_options ('intltool') opt.add_option ('--docdir', type='string', default='', - help='documentation root', dest='docdir') + help='Documentation root', dest='docdir') opt.add_option ('--disable-docs', action='store_true', default=False, help='Disables user documentation', dest='disable_docs') @@ -161,6 +168,11 @@ def set_options (opt): opt.add_option ('--update-po', action='store_true', default=False, help='Update localization files', dest='update_po') + opt.add_option ('--libdir', type='string', default='', + help='Library root', dest='libdir') + opt.add_option ('--disable-extensions', action='store_true', default=False, + help='Disables building of extensions', dest='disable_extensions') + def build (bld): def mkdir (path): if not os.access (path, os.F_OK): @@ -174,6 +186,9 @@ def build (bld): bld.add_subdirs ('katze midori icons') + if not Params.g_options.disable_extensions: + bld.add_subdirs ('extensions') + install_files ('DOCDIR', '/' + APPNAME + '/', \ 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') From 9158e3356720cec5827afc1dc72992e7f91e07ef Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 02:08:50 +0100 Subject: [PATCH 0499/2970] Add two example extensions --- extensions/statusbar-features.c | 52 ++++++++++++++++++++++ extensions/tab-panel/main.c | 45 +++++++++++++++++++ extensions/tab-panel/tab-panel-extension.c | 38 ++++++++++++++++ extensions/tab-panel/tab-panel-extension.h | 43 ++++++++++++++++++ 4 files changed, 178 insertions(+) create mode 100644 extensions/statusbar-features.c create mode 100644 extensions/tab-panel/main.c create mode 100644 extensions/tab-panel/tab-panel-extension.c create mode 100644 extensions/tab-panel/tab-panel-extension.h diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c new file mode 100644 index 00000000..26e2876e --- /dev/null +++ b/extensions/statusbar-features.c @@ -0,0 +1,52 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +void +realign_tabs_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser) +{ + GtkWidget* statusbar; + GtkWidget* bbox; + MidoriWebSettings* settings; + GtkWidget* button; + + /* FIXME: Monitor each view and modify its settings individually + instead of merely replicating the global preferences. */ + + statusbar = katze_object_get_object (browser, "statusbar"); + bbox = gtk_hbutton_box_new (); + settings = katze_object_get_object (browser, "settings"); + button = katze_property_proxy (settings, "auto-load-images", NULL); + gtk_container_add (GTK_CONTAINER (bbox), button); + gtk_widget_show (button); + button = katze_property_proxy (settings, "enable-scripts", NULL); + gtk_container_add (GTK_CONTAINER (bbox), button); + gtk_widget_show (button); + gtk_widget_show (bbox); + gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); +} + +MidoriExtension* extension_main (MidoriApp* app) +{ + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", "Statusbar Features", + "description", "", + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + + g_signal_connect (app, "add-browser", + G_CALLBACK (realign_tabs_app_add_browser_cb), NULL); + + return extension; +} diff --git a/extensions/tab-panel/main.c b/extensions/tab-panel/main.c new file mode 100644 index 00000000..83664ba8 --- /dev/null +++ b/extensions/tab-panel/main.c @@ -0,0 +1,45 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "tab-panel-extension.h" + +#include + +void +tab_panel_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser) +{ + GtkWidget* panel; + GtkWidget* child; + + /* FIXME: Actually provide a tree view listing all views. */ + + panel = katze_object_get_object (browser, "panel"); + child = midori_view_new (NULL); + gtk_widget_show (child); + midori_panel_append_page (MIDORI_PANEL (panel), child, + NULL, GTK_STOCK_INDEX, "Tab Panel"); +} + +MidoriExtension* extension_main (MidoriApp* app) +{ + MidoriExtension* extension = g_object_new (TAB_PANEL_TYPE_EXTENSION, + "name", "Tab Panel", + "description", "", + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + + g_signal_connect (app, "add-browser", + G_CALLBACK (tab_panel_app_add_browser_cb), extension); + + return extension; +} diff --git a/extensions/tab-panel/tab-panel-extension.c b/extensions/tab-panel/tab-panel-extension.c new file mode 100644 index 00000000..27cdb92a --- /dev/null +++ b/extensions/tab-panel/tab-panel-extension.c @@ -0,0 +1,38 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "tab-panel-extension.h" + +#include + +struct _TabPanelExtension +{ + MidoriExtension parent_instance; +}; + +struct _TabPanelExtensionClass +{ + MidoriExtensionClass parent_class; +}; + +G_DEFINE_TYPE (TabPanelExtension, tab_panel_extension, MIDORI_TYPE_EXTENSION); + +static void +tab_panel_extension_class_init (TabPanelExtensionClass* class) +{ + /* Nothing to do. */ +} + +static void +tab_panel_extension_init (TabPanelExtension* source) +{ + /* Nothing to do. */ +} diff --git a/extensions/tab-panel/tab-panel-extension.h b/extensions/tab-panel/tab-panel-extension.h new file mode 100644 index 00000000..583998b4 --- /dev/null +++ b/extensions/tab-panel/tab-panel-extension.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __TAB_PANEL_EXTENSION_H__ +#define __TAB_PANEL_EXTENSION_H__ + +#include + +G_BEGIN_DECLS + +#define TAB_PANEL_TYPE_EXTENSION \ + (midori_extension_get_type ()) +#define TAB_PANEL_EXTENSION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), TAB_PANEL_TYPE_EXTENSION, TabPanelExtension)) +#define TAB_PANEL_EXTENSION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), TAB_PANEL_TYPE_EXTENSION, TabPanelExtensionClass)) +#define TAB_PANEL_IS_EXTENSION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TAB_PANEL_TYPE_EXTENSION)) +#define TAB_PANEL_IS_EXTENSION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), TAB_PANEL_TYPE_EXTENSION)) +#define TAB_PANEL_EXTENSION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), TAB_PANEL_TYPE_EXTENSION, TabPanelExtensionClass)) + +typedef struct _TabPanelExtension TabPanelExtension; +typedef struct _TabPanelExtensionClass TabPanelExtensionClass; + +GType +tab_panel_extension_get_type (void); + +/* There is no API for TabPanelExtension. Please use the + available properties and signals. */ + +G_END_DECLS + +#endif /* __TAB_PANEL_EXTENSION_H__ */ From c72977974d390852266376389061876d6f112375 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 02:46:59 +0100 Subject: [PATCH 0500/2970] Always initialize threads, libSoup requires that --- midori/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index a1e5f214..66eb90e9 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1093,9 +1093,9 @@ main (int argc, return 1; } - #if HAVE_LIBSOUP + /* libSoup uses threads, therefore if WebKit is built with libSoup + or Midori is using it, we need to initialize threads. */ if (!g_thread_supported ()) g_thread_init (NULL); - #endif stock_items_init (); g_set_application_name (_("Midori")); From e5059423147ca99c9d9364da29b9ea2cec4ca1a2 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 18 Nov 2008 03:01:33 +0100 Subject: [PATCH 0501/2970] Highlight completion matches while preserving the case --- midori/midori-locationaction.c | 39 +++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 17f1d55f..1f09d59d 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -405,8 +405,11 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar* desc_title; GtkWidget* entry; gchar* key; + gchar* start; + gchar* skey; gchar* temp; gchar** parts; + glong len; gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); @@ -419,24 +422,40 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, if (data && uri) { temp = g_utf8_strdown (uri, -1); - parts = g_strsplit (temp, key, 2); + start = strstr (temp, key); g_free (temp); - if (parts && parts[0] && parts[1]) - desc_uri = g_markup_printf_escaped ("%s%s%s", - parts[0], key, parts[1]); - g_strfreev (parts); + if (start) + { + len = g_utf8_strlen (key, -1); + skey = g_malloc0 (len); + g_utf8_strncpy (skey, uri + (start - temp), len); + parts = g_strsplit (uri, skey, 2); + if (parts && parts[0] && parts[1]) + desc_uri = g_markup_printf_escaped ("%s%s%s", + parts[0], skey, parts[1]); + g_strfreev (parts); + g_free (skey); + } } if (uri && !desc_uri) desc_uri = g_markup_escape_text (uri, -1); if (data && title) { temp = g_utf8_strdown (title, -1); - parts = g_strsplit (temp, key, 2); + start = strstr (temp, key); g_free (temp); - if (parts && parts[0] && parts[1]) - desc_title = g_markup_printf_escaped ("%s%s%s", - parts[0], key, parts[1]); - g_strfreev (parts); + if (start) + { + len = g_utf8_strlen (key, -1); + skey = g_malloc0 (len); + g_utf8_strncpy (skey, title + (start - temp), len); + parts = g_strsplit (title, skey, 2); + if (parts && parts[0] && parts[1]) + desc_title = g_markup_printf_escaped ("%s%s%s", + parts[0], skey, parts[1]); + g_strfreev (parts); + g_free (skey); + } } if (title && !desc_title) desc_title = g_markup_escape_text (title, -1); From 56d26b02e52810579b537269c6ffb4c70de23e33 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 06:37:11 +0100 Subject: [PATCH 0502/2970] Allow "g cache:127.0.0.1" to search from the location --- midori/sokoke.c | 6 ++++-- tests/magic-uri.c | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index d170e5b9..e052fbfd 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -115,8 +115,10 @@ sokoke_magic_uri (const gchar* uri, { /* Do we have a domain, ip address or localhost? */ search = strchr (uri, ':'); - if ((search && search[0] && !g_ascii_isalpha (search[1])) - || !strcmp (uri, "localhost")) + if (search && search[0] && !g_ascii_isalpha (search[1])) + if (!strchr (search, '.')) + return g_strconcat ("http://", uri, NULL); + if (!strcmp (uri, "localhost")) return g_strconcat ("http://", uri, NULL); parts = g_strsplit (uri, ".", 0); if (!search && parts[0] && parts[1]) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 0685f3d8..5623f200 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -72,6 +72,9 @@ main (int argc, test_input ("midori 0.1.0", NULL); test_input ("search:cats", NULL); test_input ("search:twotoasts.de", NULL); + test_input ("g cache:127.0.0.1", NULL); + test_input ("g cache:127.0.0.1/foo", NULL); + test_input ("g cache:twotoats.de/foo", NULL); return 0; } From 166a7e48e060d7efd676d4f86c2ddaacaa2d0d1f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 22:00:38 +0100 Subject: [PATCH 0503/2970] Malloc in bytes, not characters, and don't copy freed memory This was teamwork of Brian, Enrico and me. --- midori/midori-locationaction.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 1f09d59d..51af271c 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -423,12 +423,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, { temp = g_utf8_strdown (uri, -1); start = strstr (temp, key); - g_free (temp); if (start) { - len = g_utf8_strlen (key, -1); - skey = g_malloc0 (len); - g_utf8_strncpy (skey, uri + (start - temp), len); + skey = g_malloc0 (strlen (key) + 1); + g_utf8_strncpy (skey, uri + (start - temp), g_utf8_strlen (key, -1)); parts = g_strsplit (uri, skey, 2); if (parts && parts[0] && parts[1]) desc_uri = g_markup_printf_escaped ("%s%s%s", @@ -436,6 +434,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, g_strfreev (parts); g_free (skey); } + g_free (temp); } if (uri && !desc_uri) desc_uri = g_markup_escape_text (uri, -1); @@ -443,12 +442,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, { temp = g_utf8_strdown (title, -1); start = strstr (temp, key); - g_free (temp); if (start) { - len = g_utf8_strlen (key, -1); - skey = g_malloc0 (len); - g_utf8_strncpy (skey, title + (start - temp), len); + skey = g_malloc0 (strlen (key) + 1); + g_utf8_strncpy (skey, title + (start - temp), g_utf8_strlen (key, -1)); parts = g_strsplit (title, skey, 2); if (parts && parts[0] && parts[1]) desc_title = g_markup_printf_escaped ("%s%s%s", @@ -456,6 +453,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, g_strfreev (parts); g_free (skey); } + g_free (temp); } if (title && !desc_title) desc_title = g_markup_escape_text (title, -1); From 79cbcd088603b709be1365136d27eb409381b93b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 22:26:06 +0100 Subject: [PATCH 0504/2970] Make libxml technically optional, while it remains mandatory --- midori/main.c | 52 +++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/midori/main.c b/midori/main.c index 66eb90e9..2b6b2cf2 100644 --- a/midori/main.c +++ b/midori/main.c @@ -27,8 +27,11 @@ #include #include #include -#include -#include + +#ifdef HAVE_LIBXML + #include + #include +#endif #ifdef HAVE_SQLITE #include @@ -364,6 +367,7 @@ midori_web_list_add_item_cb (KatzeArray* trash, } } +#ifdef HAVE_LIBXML static KatzeItem* katze_item_from_xmlNodePtr (xmlNodePtr cur) { @@ -503,39 +507,6 @@ katze_array_from_xmlDocPtr (KatzeArray* array, return TRUE; } -#if 0 -static gboolean -katze_array_from_data (KatzeArray* array, - const gchar* data, - GError** error) -{ - xmlDocPtr doc; - - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); - g_return_val_if_fail (data != NULL, FALSE); - - katze_array_clear (array); - - if((doc = xmlParseMemory (data, strlen (data))) == NULL) - { - /* No valid xml or broken encoding */ - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Malformed document.")); - return FALSE; - } - if (!katze_array_from_xmlDocPtr (array, doc)) - { - /* Parsing failed */ - xmlFreeDoc (doc); - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Malformed document.")); - return FALSE; - } - xmlFreeDoc (doc); - return TRUE; -} -#endif - static gboolean katze_array_from_file (KatzeArray* array, const gchar* filename, @@ -573,6 +544,7 @@ katze_array_from_file (KatzeArray* array, xmlFreeDoc (doc); return TRUE; } +#endif #ifdef HAVE_SQLITE /* Open database 'dbname' */ @@ -1176,9 +1148,10 @@ main (int argc, error->message); */ g_error_free (error); } + bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + #ifdef HAVE_LIBXML katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel", NULL)); - bookmarks = katze_array_new (KATZE_TYPE_ARRAY); error = NULL; if (!katze_array_from_file (bookmarks, config_file, &error)) { @@ -1188,7 +1161,9 @@ main (int argc, g_error_free (error); } g_free (config_file); + #endif _session = katze_array_new (KATZE_TYPE_ITEM); + #ifdef HAVE_LIBXML g_object_get (settings, "load-on-startup", &load_on_startup, NULL); if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { @@ -1203,8 +1178,10 @@ main (int argc, } g_free (config_file); } - config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); + #endif trash = katze_array_new (KATZE_TYPE_ITEM); + #ifdef HAVE_LIBXML + config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); error = NULL; if (!katze_array_from_file (trash, config_file, &error)) { @@ -1214,6 +1191,7 @@ main (int argc, g_error_free (error); } g_free (config_file); + #endif #ifdef HAVE_SQLITE config_file = g_build_filename (config_path, "history.db", NULL); #endif From 1e6c22d94a1bd4a37ec177bc4928e9a7ffc66f64 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 22:59:19 +0100 Subject: [PATCH 0505/2970] Add more katze_object_get_foo functions --- katze/katze-utils.c | 180 +++++++++++++++++++++++++++++++++++++------- katze/katze-utils.h | 20 +++++ 2 files changed, 171 insertions(+), 29 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index fff0cf8a..6d2d9359 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -139,36 +139,47 @@ katze_property_proxy (gpointer object, const gchar* property, const gchar* hint) { + GObjectClass* class; + GParamSpec* pspec; + GType type; + const gchar* nick; + const gchar* _hint; + GtkWidget* widget; + gchar* string; + g_return_val_if_fail (G_IS_OBJECT (object), NULL); - GObjectClass* class = G_OBJECT_GET_CLASS (object); - GParamSpec* pspec = g_object_class_find_property (class, property); + + class = G_OBJECT_GET_CLASS (object); + pspec = g_object_class_find_property (class, property); if (!pspec) { g_warning (_("Property '%s' is invalid for %s"), property, G_OBJECT_CLASS_NAME (class)); return gtk_label_new (property); } - GType type = G_PARAM_SPEC_TYPE (pspec); - const gchar* nick = g_param_spec_get_nick (pspec); - const gchar* _hint = g_intern_string (hint); + + type = G_PARAM_SPEC_TYPE (pspec); + nick = g_param_spec_get_nick (pspec); + _hint = g_intern_string (hint); if (_hint == g_intern_string ("blurb")) nick = g_param_spec_get_blurb (pspec); - GtkWidget* widget; - gchar* string = NULL; + string = NULL; if (type == G_TYPE_PARAM_BOOLEAN) { + gboolean toggled = katze_object_get_boolean (object, property); + widget = gtk_check_button_new_with_label (gettext (nick)); - gboolean toggled; - g_object_get (object, property, &toggled, NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); g_signal_connect (widget, "toggled", G_CALLBACK (proxy_toggle_button_toggled_cb), object); } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) { + string = katze_object_get_string (object, property); + widget = gtk_file_chooser_button_new (_("Choose file"), GTK_FILE_CHOOSER_ACTION_OPEN); - g_object_get (object, property, &string, NULL); + if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), @@ -184,9 +195,10 @@ katze_property_proxy (gpointer object, } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("folder")) { + string = katze_object_get_string (object, property); + widget = gtk_file_chooser_button_new (_("Choose folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); - g_object_get (object, property, &string, NULL); if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), @@ -202,9 +214,10 @@ katze_property_proxy (gpointer object, } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("uri")) { + string = katze_object_get_string (object, property); + widget = gtk_file_chooser_button_new (_("Choose file"), GTK_FILE_CHOOSER_ACTION_OPEN); - g_object_get (object, property, &string, NULL); if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (widget), @@ -220,22 +233,22 @@ katze_property_proxy (gpointer object, } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("font")) { - widget = gtk_combo_box_new_text (); - PangoContext* context = gtk_widget_get_pango_context (widget); + int n_families, i; + PangoContext* context; PangoFontFamily** families; - int n_families; + string = katze_object_get_string (object, property); + + widget = gtk_combo_box_new_text (); + context = gtk_widget_get_pango_context (widget); pango_context_list_families (context, &families, &n_families); - g_object_get (object, property, &string, NULL); if (!string) string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); - gint i = 0; - while (i < n_families) + for (i = 0; i < n_families; i++) { const gchar* font = pango_font_family_get_name (families[i]); gtk_combo_box_append_text (GTK_COMBO_BOX (widget), font); if (string && !strcmp (font, string)) gtk_combo_box_set_active (GTK_COMBO_BOX (widget), i); - i++; } gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE ( gtk_combo_box_get_model (GTK_COMBO_BOX (widget))), @@ -258,45 +271,44 @@ katze_property_proxy (gpointer object, } else if (type == G_TYPE_PARAM_FLOAT) { + gfloat value = katze_object_get_float (object, property); + widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_FLOAT (pspec)->minimum, G_PARAM_SPEC_FLOAT (pspec)->maximum, 1); /* Keep it narrow, 5 + 2 digits are usually fine */ gtk_entry_set_width_chars (GTK_ENTRY (widget), 5 + 2); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (widget), 2); - gfloat value; - g_object_get (object, property, &value, NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); g_signal_connect (widget, "value-changed", G_CALLBACK (proxy_spin_button_changed_cb), object); } else if (type == G_TYPE_PARAM_INT) { + gint value = katze_object_get_int (object, property); + widget = gtk_spin_button_new_with_range ( G_PARAM_SPEC_INT (pspec)->minimum, G_PARAM_SPEC_INT (pspec)->maximum, 1); /* Keep it narrow, 5 digits are usually fine */ gtk_entry_set_width_chars (GTK_ENTRY (widget), 5); - gint value; - g_object_get (object, property, &value, NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); g_signal_connect (widget, "value-changed", G_CALLBACK (proxy_spin_button_changed_cb), object); } else if (type == G_TYPE_PARAM_ENUM) { + gint i; GEnumClass* enum_class = G_ENUM_CLASS ( g_type_class_ref (pspec->value_type)); + gint value = katze_object_get_enum (object, property); + widget = gtk_combo_box_new_text (); - gint i = 0; - while (i < enum_class->n_values) + for (i = 0; i < enum_class->n_values; i++) { const gchar* label = gettext (enum_class->values[i].value_nick); gtk_combo_box_append_text (GTK_COMBO_BOX (widget), label); - i++; } - gint value; - g_object_get (object, property, &value, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), value); g_signal_connect (widget, "changed", G_CALLBACK (proxy_combo_box_changed_cb), object); @@ -518,6 +530,116 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, return pixbuf; } +/** + * katze_object_get_boolean: + * @object: a #GObject + * @property_name: the name of the property to get + * + * Retrieve the boolean value of the specified property. + * + * Return value: a boolean + **/ +gboolean +katze_object_get_boolean (gpointer object, + const gchar* property) +{ + gboolean value = FALSE; + + g_return_val_if_fail (G_IS_OBJECT (object), FALSE); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} + +/** + * katze_object_get_int: + * @object: a #GObject + * @property_name: the name of the property to get + * + * Retrieve the integer value of the specified property. + * + * Return value: an integer + **/ +gint +katze_object_get_int (gpointer object, + const gchar* property) +{ + gint value = -1; + + g_return_val_if_fail (G_IS_OBJECT (object), -1); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} + +/** + * katze_object_get_float: + * @object: a #GObject + * @property_name: the name of the property to get + * + * Retrieve the float value of the specified property. + * + * Return value: a float + **/ +gfloat +katze_object_get_float (gpointer object, + const gchar* property) +{ + gfloat value = -1.0f; + + g_return_val_if_fail (G_IS_OBJECT (object), -1.0f); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} + +/** + * katze_object_get_enum: + * @object: a #GObject + * @property_name: the name of the property to get + * + * Retrieve the enum value of the specified property. + * + * Return value: an enum + **/ +gint +katze_object_get_enum (gpointer object, + const gchar* property) +{ + gint value = -1; + + g_return_val_if_fail (G_IS_OBJECT (object), -1); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} + +/** + * katze_object_get_string: + * @object: a #GObject + * @property_name: the name of the property to get + * + * Retrieve the string value of the specified property. + * + * Return value: a float + **/ +gchar* +katze_object_get_string (gpointer object, + const gchar* property) +{ + gchar* value = NULL; + + g_return_val_if_fail (G_IS_OBJECT (object), NULL); + /* FIXME: Check value type */ + + g_object_get (object, property, &value, NULL); + return value; +} + /** * katze_object_get_object: * @object: a #GObject @@ -525,7 +647,7 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, * * Retrieve the object value of the specified property. * - * Return value: Return value: an object + * Return value: an object **/ gpointer katze_object_get_object (gpointer object, diff --git a/katze/katze-utils.h b/katze/katze-utils.h index b86bc729..10a23016 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -84,6 +84,26 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, const gchar* mime_type, GError** error); +gint +katze_object_get_boolean (gpointer object, + const gchar* property); + +gint +katze_object_get_int (gpointer object, + const gchar* property); + +gfloat +katze_object_get_float (gpointer object, + const gchar* property); + +gint +katze_object_get_enum (gpointer object, + const gchar* property); + +gchar* +katze_object_get_string (gpointer object, + const gchar* property); + gpointer katze_object_get_object (gpointer object, const gchar* property); From 58cb93d9005b582cf77fee32219b0a8784c94317 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 18 Nov 2008 23:10:21 +0100 Subject: [PATCH 0506/2970] Use katze_object_get_foo instead of sokoke_object_get_foo --- midori/midori-browser.c | 22 +++++++++++----------- midori/midori-locationaction.c | 1 - midori/midori-locationentry.c | 2 +- midori/sokoke.c | 28 ---------------------------- midori/sokoke.h | 8 -------- 5 files changed, 12 insertions(+), 49 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 496e3ff6..a6a6f646 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -253,8 +253,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) "tooltip", _("Reload the current page"), "sensitive", can_reload, NULL); gtk_widget_hide (browser->progressbar); - if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar") - && !sokoke_object_get_boolean (browser->settings, "show-statusbar")) + if (!katze_object_get_boolean (browser->settings, "show-navigationbar") + && !katze_object_get_boolean (browser->settings, "show-statusbar")) gtk_widget_hide (browser->navigationbar); } else @@ -298,7 +298,7 @@ static void _midori_browser_set_current_page_smartly (MidoriBrowser* browser, gint n) { - if (!sokoke_object_get_boolean (browser->settings, + if (!katze_object_get_boolean (browser->settings, "open-tabs-in-the-background")) midori_browser_set_current_page (browser, n); } @@ -356,7 +356,7 @@ midori_view_notify_icon_cb (MidoriView* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - if (sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + if (katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) midori_location_action_set_icon_for_uri ( MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); } @@ -375,7 +375,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) { - if (sokoke_object_get_boolean (browser->settings, + if (katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); } @@ -445,7 +445,7 @@ midori_view_notify_title_cb (GtkWidget* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); title = midori_view_get_display_title (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - if (sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + if (katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) midori_location_action_set_title_for_uri ( MIDORI_LOCATION_ACTION (action), title, uri); if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) @@ -910,7 +910,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, g_signal_connect (view, "leave-notify-event", G_CALLBACK (midori_browser_tab_leave_notify_event_cb), browser); - if (sokoke_object_get_boolean (browser->settings, "open-tabs-next-to-current")) + if (katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), view, @@ -1963,7 +1963,7 @@ static void _action_location_activate (GtkAction* action, MidoriBrowser* browser) { - if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")) + if (!katze_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_show (browser->navigationbar); } @@ -1985,7 +1985,7 @@ static void _action_location_focus_out (GtkAction* action, MidoriBrowser* browser) { - if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")) + if (!katze_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_hide (browser->navigationbar); } @@ -2162,7 +2162,7 @@ _action_search_focus_out (GtkAction* action, MidoriBrowser* browser) { if (GTK_WIDGET_VISIBLE (browser->statusbar) && - !sokoke_object_get_boolean (browser->settings, "show-navigationbar")) + !katze_object_get_boolean (browser->settings, "show-navigationbar")) gtk_widget_hide (browser->navigationbar); } @@ -3541,7 +3541,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, gint age; gint newage; - if (!sokoke_object_get_boolean (browser->settings, "remember-last-visited-pages")) + if (!katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) return; treeview = GTK_TREE_VIEW (browser->panel_history); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 51af271c..f3a952ff 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -409,7 +409,6 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar* skey; gchar* temp; gchar** parts; - glong len; gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 3f4dd2a8..eceb4b56 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -415,7 +415,7 @@ entry_key_press_event (GtkWidget* widget, case GDK_Down: case GDK_Up: { - if (!sokoke_object_get_boolean (location_entry, "popup-shown")) + if (!katze_object_get_boolean (location_entry, "popup-shown")) gtk_combo_box_popup (GTK_COMBO_BOX (location_entry)); return TRUE; } diff --git a/midori/sokoke.c b/midori/sokoke.c index e052fbfd..b0620673 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -498,34 +498,6 @@ sokoke_widget_get_text_size (GtkWidget* widget, g_object_unref (layout); } -gint -sokoke_object_get_int (gpointer object, - const gchar* property) -{ - gint value = 0; - - g_return_val_if_fail (object != NULL, FALSE); - g_return_val_if_fail (G_IS_OBJECT (object), FALSE); - /* FIXME: Check value type */ - - g_object_get (object, property, &value, NULL); - return value; -} - -gboolean -sokoke_object_get_boolean (gpointer object, - const gchar* property) -{ - gboolean value = FALSE; - - g_return_val_if_fail (object != NULL, FALSE); - g_return_val_if_fail (G_IS_OBJECT (object), FALSE); - /* FIXME: Check value type */ - - g_object_get (object, property, &value, NULL); - return value; -} - /** * sokoke_action_create_popup_menu_item: * @action: a #GtkAction diff --git a/midori/sokoke.h b/midori/sokoke.h index 526e9b3f..3f7d5a71 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -115,14 +115,6 @@ sokoke_widget_get_text_size (GtkWidget* widget, gint* width, gint* height); -gint -sokoke_object_get_int (gpointer object, - const gchar* property); - -gboolean -sokoke_object_get_boolean (gpointer object, - const gchar* property); - GtkWidget* sokoke_action_create_popup_menu_item (GtkAction* action); From dc59d66eb9ea8a1a3a8eefdaf9bb15bef8e031cf Mon Sep 17 00:00:00 2001 From: Brian Vuyk Date: Tue, 18 Nov 2008 23:18:53 +0100 Subject: [PATCH 0507/2970] Print file saving errors to the standard output --- katze/katze-net.c | 4 ++-- midori/midori-browser.c | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index d1e88eee..0df4e2dc 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -433,8 +433,8 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, fclose (fp); if ((ret - request->length) != 0) { - /* FIXME: We need error handling. If this is called, - it means there was a write error */ + g_warning ("Error writing to file %s " + "in katze_net_icon_transfer_cb()", priv->icon_file); } pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a6a6f646..903f6716 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -641,15 +641,16 @@ midori_browser_save_transfer_cb (KatzeNetRequest* request, if (request->data) { - /* FIXME: Show an error message if the file cannot be saved */ if ((fp = fopen (filename, "wb"))) { ret = fwrite (request->data, 1, request->length, fp); fclose (fp); if ((ret - request->length) != 0) { - /* FIXME: We need error handling. If this is called, - i means there was a write error */ + /* Once we have a download interface this should be + indicated graphically. */ + g_warning ("Error writing to file %s " + "in midori_browser_save_transfer_cb", filename); } } } @@ -1866,8 +1867,9 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, fclose (fp); if ((ret - request->length) != 0) { - /* FIXME: We need error handling. If this is called, - it means there was a write error */ + /* FIXME: Show an error in the graphical interface */ + g_warning ("Error writing to file %s " + "in midori_browser_source_transfer_cb()", filename); } g_object_get (browser->settings, "text-editor", &text_editor, NULL); From 72f39b0f82c150954faf05733094467d637951f1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 Nov 2008 01:22:25 +0100 Subject: [PATCH 0508/2970] Change extension API to split initialization and activation We want to be able to keep extensions in a state where they don't actually do anything but merely provide context information. Therefore don't pass the MidoriApp. As soon as we want to use extensions, we activate them. Extensions are now saved in an array in MidoriApp. --- extensions/statusbar-features.c | 19 +++++-- extensions/tab-panel/main.c | 17 +++++-- midori/main.c | 36 +++++++++----- midori/midori-app.c | 88 +++++++++++---------------------- midori/midori-app.h | 10 ---- midori/midori-extension.c | 21 ++++++++ 6 files changed, 101 insertions(+), 90 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 26e2876e..c1a37e3a 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -12,8 +12,8 @@ #include void -realign_tabs_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser) +statusbar_features_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser) { GtkWidget* statusbar; GtkWidget* bbox; @@ -36,7 +36,16 @@ realign_tabs_app_add_browser_cb (MidoriApp* app, gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); } -MidoriExtension* extension_main (MidoriApp* app) +static void +statusbar_features_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + g_signal_connect (app, "add-browser", + G_CALLBACK (statusbar_features_app_add_browser_cb), NULL); +} + +MidoriExtension* +extension_init (void) { MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", "Statusbar Features", @@ -45,8 +54,8 @@ MidoriExtension* extension_main (MidoriApp* app) "authors", "Christian Dywan ", NULL); - g_signal_connect (app, "add-browser", - G_CALLBACK (realign_tabs_app_add_browser_cb), NULL); + g_signal_connect (extension, "activate", + G_CALLBACK (statusbar_features_activate_cb), NULL); return extension; } diff --git a/extensions/tab-panel/main.c b/extensions/tab-panel/main.c index 83664ba8..60cb316b 100644 --- a/extensions/tab-panel/main.c +++ b/extensions/tab-panel/main.c @@ -13,7 +13,7 @@ #include -void +static void tab_panel_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser) { @@ -29,7 +29,16 @@ tab_panel_app_add_browser_cb (MidoriApp* app, NULL, GTK_STOCK_INDEX, "Tab Panel"); } -MidoriExtension* extension_main (MidoriApp* app) +static void +tab_panel_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + g_signal_connect (app, "add-browser", + G_CALLBACK (tab_panel_app_add_browser_cb), NULL); +} + +MidoriExtension* +extension_init (void) { MidoriExtension* extension = g_object_new (TAB_PANEL_TYPE_EXTENSION, "name", "Tab Panel", @@ -38,8 +47,8 @@ MidoriExtension* extension_main (MidoriApp* app) "authors", "Christian Dywan ", NULL); - g_signal_connect (app, "add-browser", - G_CALLBACK (tab_panel_app_add_browser_cb), extension); + g_signal_connect (extension, "activate", + G_CALLBACK (tab_panel_activate_cb), NULL); return extension; } diff --git a/midori/main.c b/midori/main.c index 2b6b2cf2..c4bd900c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1291,18 +1291,14 @@ main (int argc, G_CALLBACK (midori_history_clear_cb), db); #endif - g_object_set (app, "settings", settings, - "bookmarks", bookmarks, - "trash", trash, - "search-engines", search_engines, - "history", history, - NULL); - /* Load extensions */ + KatzeArray* extensions; gchar* extension_path; GDir* extension_dir; const gchar* filename; + MidoriExtension* extension; + extensions = katze_array_new (MIDORI_TYPE_EXTENSION); extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); if (g_module_supported ()) extension_dir = g_dir_open (extension_path, 0, NULL); @@ -1314,8 +1310,8 @@ main (int argc, { gchar* fullname; GModule* module; - typedef MidoriExtension* (*extension_main_func)(MidoriApp* app); - extension_main_func extension_main; + typedef MidoriExtension* (*extension_init_func)(void); + extension_init_func extension_init; fullname = g_build_filename (extension_path, filename, NULL); module = g_module_open (fullname, G_MODULE_BIND_LOCAL); @@ -1326,17 +1322,33 @@ main (int argc, continue; } ; - if (!g_module_symbol (module, "extension_main", - (gpointer) &extension_main)) + if (!g_module_symbol (module, "extension_init", + (gpointer) &extension_init)) { g_warning ("%s", g_module_error ()); continue; } - extension_main (app); + extension = extension_init (); + katze_array_add_item (extensions, extension); } g_dir_close (extension_dir); } + g_object_set (app, "settings", settings, + "bookmarks", bookmarks, + "trash", trash, + "search-engines", search_engines, + "history", history, + "extensions", extensions, + NULL); + + n = katze_array_get_length (extensions); + for (i = 0; i < n; i++) + { + extension = katze_array_get_nth_item (extensions, i); + g_signal_emit_by_name (extension, "activate", app); + } + browser = g_object_new (MIDORI_TYPE_BROWSER, "settings", settings, "bookmarks", bookmarks, diff --git a/midori/midori-app.c b/midori/midori-app.c index b7966835..5e754e1e 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -36,6 +36,7 @@ struct _MidoriApp KatzeArray* trash; KatzeArray* search_engines; KatzeArray* history; + KatzeArray* extensions; gpointer instance; }; @@ -52,8 +53,9 @@ enum PROP_BOOKMARKS, PROP_TRASH, PROP_SEARCH_ENGINES, - PROP_BROWSER, PROP_HISTORY, + PROP_EXTENSIONS, + PROP_BROWSER, PROP_BROWSER_COUNT }; @@ -235,6 +237,24 @@ midori_app_class_init (MidoriAppClass* class) KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_HISTORY, + g_param_spec_object ( + "history", + "History", + "The list of history items", + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, + PROP_EXTENSIONS, + g_param_spec_object ( + "extensions", + "Extensions", + "The list of extensions", + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_BROWSER, g_param_spec_object ( @@ -252,15 +272,6 @@ midori_app_class_init (MidoriAppClass* class) "The current number of browsers", 0, G_MAXUINT, 0, G_PARAM_READABLE)); - - g_object_class_install_property (gobject_class, - PROP_HISTORY, - g_param_spec_object ( - "history", - "History", - "The list of history items", - KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); } static GObject* @@ -387,6 +398,7 @@ midori_app_init (MidoriApp* app) app->trash = NULL; app->search_engines = NULL; app->history = NULL; + app->extensions = NULL; #if HAVE_UNIQUE display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); @@ -418,6 +430,7 @@ midori_app_finalize (GObject* object) katze_object_assign (app->trash, NULL); katze_object_assign (app->search_engines, NULL); katze_object_assign (app->history, NULL); + katze_object_assign (app->extensions, NULL); katze_object_assign (app->instance, NULL); @@ -454,6 +467,9 @@ midori_app_set_property (GObject* object, katze_object_assign (app->history, g_value_dup_object (value)); /* FIXME: Propagate history to all browsers */ break; + case PROP_EXTENSIONS: + katze_object_assign (app->extensions, g_value_dup_object (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -485,6 +501,9 @@ midori_app_get_property (GObject* object, case PROP_HISTORY: g_value_set_object (value, app->history); break; + case PROP_EXTENSIONS: + g_value_set_object (value, app->extensions); + break; case PROP_BROWSER: g_value_set_object (value, app->browser); break; @@ -654,55 +673,6 @@ midori_app_add_browser (MidoriApp* app, g_signal_emit (app, signals[ADD_BROWSER], 0, browser); } -/** - * midori_app_get_settings: - * @app: a #MidoriApp - * - * Retrieves the #MidoriWebSettings of the app. - * - * Return value: the assigned #MidoriWebSettings - **/ -MidoriWebSettings* -midori_app_get_settings (MidoriApp* app) -{ - g_return_val_if_fail (MIDORI_IS_APP (app), NULL); - - return app->settings; -} - -/** - * midori_app_set_settings: - * @app: a #MidoriApp - * - * Assigns the #MidoriWebSettings to the app. - * - * Return value: the assigned #MidoriWebSettings - **/ -void -midori_app_set_settings (MidoriApp* app, - MidoriWebSettings* settings) -{ - g_return_if_fail (MIDORI_IS_APP (app)); - - g_object_set (app, "settings", settings, NULL); -} - -/** - * midori_app_get_trash: - * @app: a #MidoriApp - * - * Retrieves the trash of the app. - * - * Return value: the assigned #MidoriTrash - **/ -KatzeArray* -midori_app_get_trash (MidoriApp* app) -{ - g_return_val_if_fail (MIDORI_IS_APP (app), NULL); - - return app->trash; -} - /** * midori_app_quit: * @app: a #MidoriApp diff --git a/midori/midori-app.h b/midori/midori-app.h index 361b9d66..98aff04c 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -70,16 +70,6 @@ void midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser); -MidoriWebSettings* -midori_app_get_settings (MidoriApp* app); - -void -midori_app_set_settings (MidoriApp* app, - MidoriWebSettings* settings); - -KatzeArray* -midori_app_get_trash (MidoriApp* app); - void midori_app_quit (MidoriApp* app); diff --git a/midori/midori-extension.c b/midori/midori-extension.c index b97f8eda..553292bd 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -11,6 +11,8 @@ #include "midori-extension.h" +#include "midori-app.h" + #include G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT); @@ -33,6 +35,14 @@ enum PROP_AUTHORS }; +enum { + ACTIVATE, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + static void midori_extension_finalize (GObject* object); @@ -54,6 +64,17 @@ midori_extension_class_init (MidoriExtensionClass* class) GObjectClass* gobject_class; GParamFlags flags; + signals[ACTIVATE] = g_signal_new ( + "activate", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + MIDORI_TYPE_APP); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_extension_finalize; gobject_class->set_property = midori_extension_set_property; From 03ffd05e0a50e27f41bfcba8527fa93c0aa02398 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 Nov 2008 01:41:58 +0100 Subject: [PATCH 0509/2970] Do not load icons other than in tabs --- katze/katze-arrayaction.c | 24 +++--------------------- midori/midori-browser.c | 9 ++++----- midori/midori-searchaction.c | 13 +++---------- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index fbbdf405..5ab26c09 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -213,20 +213,6 @@ katze_array_action_menu_item_activate_cb (GtkWidget* proxy, g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); } -static void -katze_array_action_icon_cb (GdkPixbuf* icon, - GtkWidget* widget) -{ - GtkWidget* image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); - gtk_widget_show (image); - if (GTK_IS_IMAGE_MENU_ITEM (widget)) - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (widget), image); - else - gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (widget), image); - g_object_unref (widget); -} - static void katze_array_action_menu_item_select_cb (GtkWidget* proxy, KatzeArrayAction* array_action); @@ -264,9 +250,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else icon = katze_net_load_icon (array_action->net, - katze_item_get_uri (item), - (KatzeNetIconCb)katze_array_action_icon_cb, - proxy, g_object_ref (menuitem)); + katze_item_get_uri (item), NULL, proxy, NULL); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); @@ -415,8 +399,7 @@ katze_array_action_item_notify_cb (KatzeItem* item, else if (!KATZE_IS_ARRAY (item) && !strcmp (property, "uri")) { icon = katze_net_load_icon (array_action->net, katze_item_get_uri (item), - (KatzeNetIconCb)katze_array_action_icon_cb, - GTK_WIDGET (toolitem), g_object_ref (toolitem)); + NULL, GTK_WIDGET (toolitem), NULL); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_widget_show (image); @@ -464,8 +447,7 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else icon = katze_net_load_icon (array_action->net, uri, - (KatzeNetIconCb)katze_array_action_icon_cb, - GTK_WIDGET (toolitem), g_object_ref (toolitem)); + NULL, GTK_WIDGET (toolitem), NULL); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_widget_show (image); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 903f6716..76bd6217 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2598,10 +2598,9 @@ midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else if (katze_item_get_uri (item)) - /* FIXME: Implement icon_cb */ pixbuf = katze_net_load_icon ( MIDORI_BROWSER (gtk_widget_get_toplevel (treeview))->net, - katze_item_get_uri (item), NULL, treeview, treeview); + katze_item_get_uri (item), NULL, treeview, NULL); g_object_set (renderer, "pixbuf", pixbuf, NULL); if (pixbuf) g_object_unref (pixbuf); @@ -2694,10 +2693,9 @@ midori_browser_history_render_icon_cb (GtkTreeViewColumn* column, pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - /* FIXME: Implement icon_cb */ pixbuf = katze_net_load_icon ( MIDORI_BROWSER (gtk_widget_get_toplevel (treeview))->net, - katze_item_get_uri (item), NULL, treeview, treeview); + katze_item_get_uri (item), NULL, treeview, NULL); g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -3610,7 +3608,8 @@ _location_action_insert_history_item (MidoriLocationAction* action, uri = katze_item_get_uri (item); pixbuf = katze_net_load_icon (browser->net, katze_item_get_uri (item), NULL, GTK_WIDGET (browser), NULL); - midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); + midori_location_action_add_item (action, uri, + pixbuf, katze_item_get_name (item)); } } diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index d1335670..8ebe1bdd 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -439,11 +439,8 @@ midori_search_action_icon_released_cb (GtkWidget* entry, menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); image = gtk_image_new (); - /* FIXME: Implement icon_cb */ icon = katze_net_load_icon (MIDORI_SEARCH_ACTION (action)->net, - katze_item_get_uri (item), - NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, - entry, NULL /*g_object_ref (image)*/); + katze_item_get_uri (item), NULL, entry, NULL); gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); g_object_unref (icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); @@ -496,11 +493,9 @@ midori_search_action_set_entry_icon (MidoriSearchAction* search_action, if (search_action->current_item) { - /* FIXME: Implement icon_cb */ icon = katze_net_load_icon (search_action->net, katze_item_get_uri (search_action->current_item), - NULL /*(KatzeNetIconCb)midori_browser_bookmark_icon_cb*/, - entry, NULL /*g_object_ref (entry)*/); + NULL, entry, NULL); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); g_object_unref (icon); @@ -736,10 +731,8 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, /* FIXME: Use the net of the MidoriSearchAction */ net = katze_net_new (); - /* FIXME: Implement icon_cb */ icon = katze_net_load_icon (net, katze_item_get_uri (item), - NULL /*(KatzeNetIconCb)midori_search_action_dialog_icon_cb*/, - treeview, NULL /*g_object_ref (treeview)*/); + NULL, treeview, NULL); g_object_set (renderer, "pixbuf", icon, NULL); g_object_unref (icon); g_object_unref (net); From ab747a427fc3390c1030875c151b6f0750d2175d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 Nov 2008 01:49:04 +0100 Subject: [PATCH 0510/2970] Let MidoriApp be a normal instance There is hardly a practical need for the application to be a singleton, it's cleaner and it prevents extensions from reaching out for it before activation. --- midori/midori-app.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 5e754e1e..2b875b1a 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -43,8 +43,6 @@ struct _MidoriApp G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) -static MidoriApp* _midori_app_singleton = NULL; - enum { PROP_0, @@ -68,11 +66,6 @@ enum { static guint signals[LAST_SIGNAL]; -static GObject* -midori_app_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam* construct_properties); - static void midori_app_finalize (GObject* object); @@ -193,7 +186,6 @@ midori_app_class_init (MidoriAppClass* class) G_TYPE_NONE, 0); gobject_class = G_OBJECT_CLASS (class); - gobject_class->constructor = midori_app_constructor; gobject_class->finalize = midori_app_finalize; gobject_class->set_property = midori_app_set_property; gobject_class->get_property = midori_app_get_property; @@ -274,18 +266,6 @@ midori_app_class_init (MidoriAppClass* class) G_PARAM_READABLE)); } -static GObject* -midori_app_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam* construct_properties) -{ - if (_midori_app_singleton) - return g_object_ref (_midori_app_singleton); - else - return G_OBJECT_CLASS (midori_app_parent_class)->constructor ( - type, n_construct_properties, construct_properties); -} - #if HAVE_UNIQUE static UniqueResponse midori_browser_message_received_cb (UniqueApp* instance, @@ -387,10 +367,6 @@ midori_app_init (MidoriApp* app) guint i, n; #endif - g_assert (!_midori_app_singleton); - - _midori_app_singleton = app; - app->accel_group = gtk_accel_group_new (); app->settings = midori_web_settings_new (); From fdb12aa5371903d66f5e1a9f2c6cf75911dd51f7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 Nov 2008 03:49:57 +0100 Subject: [PATCH 0511/2970] Move transfers, console and addons out of the browser --- midori/main.c | 82 +++++++++++++++++++++++++++++++++++++++-- midori/midori-addons.c | 2 + midori/midori-browser.c | 59 ----------------------------- 3 files changed, 81 insertions(+), 62 deletions(-) diff --git a/midori/main.c b/midori/main.c index c4bd900c..f02ae809 100644 --- a/midori/main.c +++ b/midori/main.c @@ -14,12 +14,16 @@ #include #endif -#include "midori-view.h" +#include "midori-addons.h" #include "midori-app.h" -#include "midori-websettings.h" #include "midori-browser.h" -#include "midori-stock.h" +#include "midori-console.h" #include "midori-extension.h" +#include "midori-panel.h" +#include "midori-stock.h" +#include "midori-view.h" +#include "midori-websettings.h" + #include "sokoke.h" #include "gjs.h" @@ -974,6 +978,76 @@ katze_array_to_file (KatzeArray* array, return TRUE; } +static void +midori_view_console_message_cb (GtkWidget* view, + const gchar* message, + gint line, + const gchar* source_id, + MidoriConsole* console) +{ + midori_console_add (console, message, line, source_id); +} + +static void +midori_browser_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriConsole* console) +{ + g_signal_connect (view, "console-message", + G_CALLBACK (midori_view_console_message_cb), console); +} + +static void +midori_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + KatzeNet* net) +{ + GtkWidget* panel; + GtkWidget* addon; + GtkWidget* toolbar; + + panel = katze_object_get_object (browser, "panel"); + + /* Transfers */ + /* addon = midori_view_new (net); + gtk_widget_show (addon); + midori_panel_append_page (MIDORI_PANEL (panel), addon, NULL, + STOCK_TRANSFERS, _("Transfers")); */ + + /* Console */ + addon = midori_console_new (); + gtk_widget_show (addon); + toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (addon)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, + STOCK_CONSOLE, _("Console")); + g_signal_connect (browser, "add-tab", + G_CALLBACK (midori_browser_add_tab_cb), addon); + + /* Userscripts */ + addon = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); + gtk_widget_show (addon); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, + STOCK_SCRIPTS, _("Userscripts")); + /* Userstyles */ + addon = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); + gtk_widget_show (addon); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, + STOCK_STYLES, _("Userstyles")); + + /* Extensions */ + addon = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); + gtk_widget_show (addon); + toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); + gtk_widget_show (toolbar); + midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, + STOCK_EXTENSIONS, _("Extensions")); +} + static void midori_browser_session_cb (MidoriBrowser* browser, gpointer arg1, @@ -1341,6 +1415,8 @@ main (int argc, "history", history, "extensions", extensions, NULL); + g_signal_connect (app, "add-browser", + G_CALLBACK (midori_app_add_browser_cb), NULL); n = katze_array_get_length (extensions); for (i = 0; i < n; i++) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index c94ed1a1..51007d74 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -965,6 +965,8 @@ midori_addons_set_web_widget (MidoriAddons* addons, GtkWidget* midori_addons_get_web_widget (MidoriAddons* addons) { + g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL); + return addons->web_widget; } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 76bd6217..e173bd81 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -20,8 +20,6 @@ #include "midori-source.h" #include "midori-preferences.h" #include "midori-panel.h" -#include "midori-addons.h" -#include "midori-console.h" #include "midori-locationaction.h" #include "midori-searchaction.h" #include "midori-stock.h" @@ -54,7 +52,6 @@ struct _MidoriBrowser GtkWidget* panel; GtkWidget* panel_bookmarks; GtkWidget* panel_history; - GtkWidget* panel_console; GtkWidget* panel_pageholder; GtkWidget* notebook; @@ -753,17 +750,6 @@ midori_view_activate_action_cb (GtkWidget* view, _midori_browser_activate_action (browser, action); } -static void -midori_view_console_message_cb (GtkWidget* view, - const gchar* message, - gint line, - const gchar* source_id, - MidoriBrowser* browser) -{ - midori_console_add (MIDORI_CONSOLE (browser->panel_console), - message, line, source_id); -} - static void midori_view_attach_inspector_cb (GtkWidget* view, GtkWidget* inspector_view, @@ -892,8 +878,6 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_notify_statusbar_text_cb, browser, "signal::activate-action", midori_view_activate_action_cb, browser, - "signal::console-message", - midori_view_console_message_cb, browser, "signal::attach-inspector", midori_view_attach_inspector_cb, browser, "signal::new-tab", @@ -3660,7 +3644,6 @@ midori_browser_init (MidoriBrowser* browser) GtkWidget* treeview; GtkWidget* toolbar; GtkToolItem* toolitem; - GtkWidget* panel; GtkRcStyle* rcstyle; GtkWidget* scrolled; @@ -3935,22 +3918,6 @@ midori_browser_init (MidoriBrowser* browser) box, toolbar, STOCK_BOOKMARKS, _("Bookmarks")); - /* Transfers */ - panel = midori_view_new (browser->net); - gtk_widget_show (panel); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, NULL, - STOCK_TRANSFERS, _("Transfers")); - - /* Console */ - browser->panel_console = midori_console_new (); - gtk_widget_show (browser->panel_console); - toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (browser->panel_console)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - browser->panel_console, toolbar, - STOCK_CONSOLE, _("Console")); - /* History */ box = gtk_vbox_new (FALSE, 0); treestore = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT); @@ -4005,32 +3972,6 @@ midori_browser_init (MidoriBrowser* browser) /* i18n: A panel showing a user specified web page */ STOCK_PAGE_HOLDER, _("Pageholder")); - /* Userscripts */ - panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); - gtk_widget_show (panel); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, toolbar, - STOCK_SCRIPTS, _("Userscripts")); - /* Userstyles */ - panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); - gtk_widget_show (panel); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, toolbar, - STOCK_STYLES, _("Userstyles")); - - /* Extensions */ - panel = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); - gtk_widget_show (panel); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (panel)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - panel, toolbar, - STOCK_EXTENSIONS, _("Extensions")); - /* Notebook, containing all views */ vpaned = gtk_vpaned_new (); gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); From 600423de4e34bb817d1b6d113df7ac44404f587c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 21 Nov 2008 02:44:03 +0100 Subject: [PATCH 0512/2970] Take special care of spaces in search strings --- midori/sokoke.c | 3 ++- tests/magic-uri.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index b0620673..7ea9b830 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -125,7 +125,8 @@ sokoke_magic_uri (const gchar* uri, { search = NULL; if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0]))) - search = g_strconcat ("http://", uri, NULL); + if (!strchr (parts[0], ' ') && !strchr (parts[1], ' ')) + search = g_strconcat ("http://", uri, NULL); g_free (parts); if (search) return search; diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 5623f200..18bfa86e 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -44,6 +44,7 @@ main (int argc, return 1; \ } \ g_free (uri) +#define SM "http://www.searchmash.com/search/" test_input ("ftp://ftp.mozilla.org", "ftp://ftp.mozilla.org"); test_input ("ftp://ftp.mozilla.org/pub", "ftp://ftp.mozilla.org/pub"); @@ -61,8 +62,8 @@ main (int argc, test_input ("localhost:8000", "http://localhost:8000"); test_input ("192.168.1.1", "http://192.168.1.1"); test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); - test_input ("sm midori", "http://www.searchmash.com/search/midori"); - test_input ("sm cats dogs", "http://www.searchmash.com/search/cats dogs"); + test_input ("sm midori", SM "midori"); + test_input ("sm cats dogs", SM "cats dogs"); test_input ("dict midori", NULL); test_input ("cats", NULL); test_input ("cats dogs", NULL); @@ -74,7 +75,14 @@ main (int argc, test_input ("search:twotoasts.de", NULL); test_input ("g cache:127.0.0.1", NULL); test_input ("g cache:127.0.0.1/foo", NULL); - test_input ("g cache:twotoats.de/foo", NULL); + test_input ("g cache:twotoasts.de/foo", NULL); + test_input ("sm cache:127.0.0.1", SM "cache:127.0.0.1"); + test_input ("sm cache:127.0.0.1/foo", SM "cache:127.0.0.1/foo"); + test_input ("sm cache:twotoasts.de/foo", SM "cache:twotoasts.de/foo"); + test_input ("de.po verbose", NULL); + test_input ("verbose de.po", NULL); + test_input ("g de.po verbose", NULL); + test_input ("sm de.po verbose", SM "de.po verbose"); return 0; } From 418f4dac1246f5e0f406df54e060a443648b457a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 21 Nov 2008 02:46:47 +0100 Subject: [PATCH 0513/2970] Remove unused sokoke completion helpers --- midori/sokoke.c | 25 ------------------------- midori/sokoke.h | 7 ------- 2 files changed, 32 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 7ea9b830..2822f5a2 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -152,31 +152,6 @@ sokoke_magic_uri (const gchar* uri, return g_strdup (uri); } -void -sokoke_entry_setup_completion (GtkEntry* entry) -{ - /* TODO: The current behavior works only with the beginning of strings - But we want to match "localhost" with "loc" and "hos" */ - GtkEntryCompletion* completion = gtk_entry_completion_new (); - gtk_entry_completion_set_model (completion, - GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING))); - gtk_entry_completion_set_text_column (completion, 0); - gtk_entry_completion_set_minimum_key_length (completion, 3); - gtk_entry_set_completion (entry, completion); - /* FIXME: Completion doesn't work well, so it's disabled */ - gtk_entry_completion_set_popup_completion (completion, FALSE); -} - -void -sokoke_entry_append_completion (GtkEntry* entry, const gchar* text) -{ - GtkEntryCompletion* completion = gtk_entry_get_completion (entry); - GtkTreeModel* completion_store = gtk_entry_completion_get_model (completion); - GtkTreeIter iter; - gtk_list_store_insert (GTK_LIST_STORE (completion_store), &iter, 0); - gtk_list_store_set (GTK_LIST_STORE (completion_store), &iter, 0, text, -1); -} - void sokoke_combo_box_add_strings (GtkComboBox* combobox, const gchar* label_first, ...) diff --git a/midori/sokoke.h b/midori/sokoke.h index 3f7d5a71..6e769ed9 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -27,13 +27,6 @@ gchar* sokoke_magic_uri (const gchar* uri, KatzeArray* search_engines); -void -sokoke_entry_setup_completion (GtkEntry* entry); - -void -sokoke_entry_append_completion (GtkEntry* entry, - const gchar* text); - typedef enum { SOKOKE_MENU_POSITION_CURSOR = 0, SOKOKE_MENU_POSITION_LEFT, From d2cdb9592834f0d89ad1bebd97166f0d7ec0d120 Mon Sep 17 00:00:00 2001 From: Dmitry Nikitin Date: Sat, 22 Nov 2008 00:00:35 +0100 Subject: [PATCH 0514/2970] Add Ukrainian translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/uk.po | 1346 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1348 insertions(+), 1 deletion(-) create mode 100644 po/uk.po diff --git a/AUTHORS b/AUTHORS index fab8e869..ccc51ff0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,6 +38,7 @@ Translations: ru: Troitskiy Nikita sv: Mikael Magnusson tr: Mirat Can Bayrak + uk: Dmitry Nikitin Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen diff --git a/po/LINGUAS b/po/LINGUAS index f0be0ec3..3da2241e 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fi fr gl hu id nl pl ru sv tr +de es et fi fr gl hu id nl pl ru sv tr uk diff --git a/po/uk.po b/po/uk.po new file mode 100644 index 00000000..46de8693 --- /dev/null +++ b/po/uk.po @@ -0,0 +1,1346 @@ +# Ukrainian translation for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Dmitry Nikitin 2008 +# +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-10 20:53+0100\n" +"PO-Revision-Date: 2008-11-21 17:49+0200\n" +"Last-Translator: Dmitry Nikitin \n" +"Language-Team: Ukrainian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Легкий переглядач Веб" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1093 ../midori/main.c:1102 +#: ../midori/main.c:1113 ../midori/main.c:1137 +msgid "Midori" +msgstr "Мідорі" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Переглядач Веб" + +#: ../midori/main.c:73 +msgid "_Bookmark" +msgstr "_Закладка" + +#: ../midori/main.c:74 ../midori/midori-browser.c:3757 +msgid "_Bookmarks" +msgstr "_Закладки" + +#: ../midori/main.c:75 +msgid "_Add Bookmark" +msgstr "_Додати закладку" + +#: ../midori/main.c:76 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/main.c:77 +msgid "_Extensions" +msgstr "_Розширення" + +#: ../midori/main.c:78 +msgid "_History" +msgstr "_Історія" + +#: ../midori/main.c:79 +msgid "_Homepage" +msgstr "Д_омашня" + +#: ../midori/main.c:80 +msgid "_Pageholder" +msgstr "_Тримач сторінки" + +#: ../midori/main.c:81 +msgid "_Userscripts" +msgstr "_Скрипти користувача" + +#: ../midori/main.c:82 +msgid "User_styles" +msgstr "Ст_илі користувача" + +#: ../midori/main.c:83 +msgid "New _Tab" +msgstr "Нова _вкладка" + +#: ../midori/main.c:84 +msgid "_Transfers" +msgstr "_Завантаження" + +#: ../midori/main.c:85 +msgid "_Closed Tabs and Windows" +msgstr "_Закриті вкладки та вікна" + +#: ../midori/main.c:86 +msgid "New _Window" +msgstr "_Нове вікно" + +#: ../midori/main.c:131 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Конфігурація не може бути завантажена: %s\n" + +#: ../midori/main.c:186 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Значення '%s' є неправильним для %s" + +#: ../midori/main.c:193 ../midori/main.c:263 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Неправильне значення конфігурації '%s'" + +#: ../midori/main.c:522 ../midori/main.c:530 ../midori/main.c:560 +#: ../midori/main.c:569 +msgid "Malformed document." +msgstr "Неправильний документ." + +#: ../midori/main.c:552 +msgid "File not found." +msgstr "Файл не знайдений." + +#: ../midori/main.c:590 ../midori/main.c:622 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Не вдалось відкрити базу даних: %s\n" + +#: ../midori/main.c:676 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Невдача при видаленні об'єкту історії: %s\n" + +#: ../midori/main.c:700 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Невдача при очищенні історії: %s\n" + +#: ../midori/main.c:733 ../midori/main.c:747 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Невдача при додаванні об'єкту історії: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:863 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Невдача видалення старого об'єкту історії: %s\n" + +#: ../midori/main.c:995 ../midori/sokoke.c:457 +#, c-format +msgid "Writing failed." +msgstr "Невдача при запису." + +#: ../midori/main.c:1020 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Сесія не може бути збережена. %s" + +#: ../midori/main.c:1052 +msgid "Run the specified filename as javascript" +msgstr "Запустити визначений файл як джава-скрипт" + +#: ../midori/main.c:1054 +msgid "Display program version" +msgstr "Відобразити версію програми" + +#: ../midori/main.c:1056 +msgid "URIs" +msgstr "посилання URIs" + +#: ../midori/main.c:1090 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1114 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції баги для:" + +#: ../midori/main.c:1116 +msgid "Check for new versions at:" +msgstr "Перевірити наявність нової версії на:" + +#: ../midori/main.c:1137 +msgid "No filename specified" +msgstr "Не вказано назви файлу" + +#: ../midori/main.c:1154 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Один із екземплярів програми Midori вже працює але не відповідає на запити.\n" + +#: ../midori/main.c:1189 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Неможливо завантажити закладки: %s\n" + +#: ../midori/main.c:1203 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Неможливо завантажити сесію: %s\n" + +#: ../midori/main.c:1215 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Неможливо завантажити смітник: %s\n" + +#: ../midori/main.c:1228 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Неможливо завантажити історію: %s\n" + +#: ../midori/main.c:1241 +msgid "The following errors occured:" +msgstr "Отримано наступні помилки:" + +#: ../midori/main.c:1400 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Неможливо зберегти пошукову машину. %s" + +#: ../midori/main.c:1410 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Неможливо зберегти закладки. %s" + +#: ../midori/main.c:1419 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Неможливо зберегти смітник. %s" + +#: ../midori/main.c:1427 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Неможливо зберегти конфігурацію. %s" + +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +msgid "None" +msgstr "Нічого" + +#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3995 +msgid "Extensions" +msgstr "Розширення" + +#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3978 +msgid "Userscripts" +msgstr "Скрипти користувача" + +#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3986 +msgid "Userstyles" +msgstr "Стилі користувача" + +#: ../midori/midori-addons.c:1043 +msgid "_Enable" +msgstr "_Увімкнути" + +#: ../midori/midori-addons.c:1052 +msgid "_Disable" +msgstr "_Вимкнути" + +#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3144 +msgid "Reload the current page" +msgstr "Оновити поточну сторінку" + +#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3141 +msgid "Stop loading the current page" +msgstr "Зупинити завантаження поточної сторінки" + +#: ../midori/midori-browser.c:321 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% завантажено" + +#: ../midori/midori-browser.c:344 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Несподівана дія '%s'." + +#: ../midori/midori-browser.c:511 +msgid "New bookmark" +msgstr "Нова закладка" + +#: ../midori/midori-browser.c:511 +msgid "Edit bookmark" +msgstr "Редагувати закладку" + +#: ../midori/midori-browser.c:533 +msgid "_Title:" +msgstr "_Назва:" + +#: ../midori/midori-browser.c:546 ../midori/midori-searchaction.c:848 +msgid "_Description:" +msgstr "_Опис:" + +#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:862 +msgid "_URL:" +msgstr "_Посилання:" + +#: ../midori/midori-browser.c:581 +msgid "_Folder:" +msgstr "_Тека:" + +#: ../midori/midori-browser.c:585 +msgid "Root" +msgstr "Адмін" + +#: ../midori/midori-browser.c:664 +msgid "Save file as" +msgstr "Зберегти файл як" + +#: ../midori/midori-browser.c:1246 +msgid "Open file" +msgstr "Відкрити файл" + +#: ../midori/midori-browser.c:2316 +msgid "Open in New _Tab" +msgstr "Відкрити у новій _вкладці" + +#: ../midori/midori-browser.c:2318 +msgid "Open in New _Window" +msgstr "Відкрити у новому _вікні" + +#: ../midori/midori-browser.c:2590 +msgid "Separator" +msgstr "Роздільник" + +#: ../midori/midori-browser.c:2702 +#, c-format +msgid "A week ago" +msgstr "Тижневої давності" + +#: ../midori/midori-browser.c:2708 +#, c-format +msgid "%d days ago" +msgstr "%d днів тому" + +#: ../midori/midori-browser.c:2715 +msgid "Today" +msgstr "Сьогодні" + +#: ../midori/midori-browser.c:2717 +msgid "Yesterday" +msgstr "Вчора" + +#: ../midori/midori-browser.c:2806 +msgid "A lightweight web browser." +msgstr "Легкий переглядач Веб" + +#: ../midori/midori-browser.c:2814 +msgid "translator-credits" +msgstr "Dmitry Nikitin " + +#: ../midori/midori-browser.c:2966 +msgid "Are you sure you want to remove all history items?" +msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" + +#: ../midori/midori-browser.c:3072 +msgid "_File" +msgstr "_Файл" + +#: ../midori/midori-browser.c:3075 +msgid "Open a new window" +msgstr "Відкрити в новому вікні" + +#: ../midori/midori-browser.c:3078 +msgid "Open a new tab" +msgstr "Відкрити в новій вкладці" + +#: ../midori/midori-browser.c:3081 +msgid "Open a file" +msgstr "Відкрити файл" + +#: ../midori/midori-browser.c:3084 +msgid "Save to a file" +msgstr "Зберегти в файл" + +#: ../midori/midori-browser.c:3086 +msgid "_Close Tab" +msgstr "_Закрити вкладку" + +#: ../midori/midori-browser.c:3087 +msgid "Close the current tab" +msgstr "Закрити поточну вкладку" + +#: ../midori/midori-browser.c:3089 +msgid "C_lose Window" +msgstr "З_акрити вікно" + +#: ../midori/midori-browser.c:3090 +msgid "Close this window" +msgstr "Закрити це вікно" + +#: ../midori/midori-browser.c:3093 +msgid "Print the current page" +msgstr "Надрукувати поточну строрінку" + +#: ../midori/midori-browser.c:3096 +msgid "Quit the application" +msgstr "Вийти з програми" + +#: ../midori/midori-browser.c:3098 +msgid "_Edit" +msgstr "_Редагувати" + +#: ../midori/midori-browser.c:3101 +msgid "Cut the selected text" +msgstr "Вирізати вибраний текст" + +#: ../midori/midori-browser.c:3104 ../midori/midori-browser.c:3107 +msgid "Copy the selected text" +msgstr "Копіювати вибраний текст" + +#: ../midori/midori-browser.c:3110 +msgid "Paste text from the clipboard" +msgstr "Вставити текст з буфера" + +#: ../midori/midori-browser.c:3113 +msgid "Delete the selected text" +msgstr "Видалити вибраний текст" + +#: ../midori/midori-browser.c:3116 +msgid "Select all text" +msgstr "Виділити весь текст" + +#: ../midori/midori-browser.c:3119 +msgid "Find a word or phrase in the page" +msgstr "Шукати слово чи фразу на сторінці" + +#: ../midori/midori-browser.c:3121 +msgid "Find _Next" +msgstr "Шукати _наступне" + +#: ../midori/midori-browser.c:3122 +msgid "Find the next occurrence of a word or phrase" +msgstr "Шукати наступне входження слова або фрази" + +#: ../midori/midori-browser.c:3124 +msgid "Find _Previous" +msgstr "Шукати _попереднє" + +#: ../midori/midori-browser.c:3125 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Шукати попереднє входження слова або фрази" + +#: ../midori/midori-browser.c:3128 +msgid "_Quick Find" +msgstr "_Швидкий пошук" + +#: ../midori/midori-browser.c:3129 +msgid "Quickly jump to a word or phrase" +msgstr "Швидкий перехід на слово або фразу" + +#: ../midori/midori-browser.c:3132 +msgid "Configure the application preferences" +msgstr "Налаштувати властивості програми" + +#: ../midori/midori-browser.c:3134 +msgid "_View" +msgstr "_Перегляд" + +#: ../midori/midori-browser.c:3135 +msgid "_Toolbars" +msgstr "Панелі _Інструментів" + +#: ../midori/midori-browser.c:3147 +msgid "Increase the zoom level" +msgstr "Збільшити розмір перегляду" + +#: ../midori/midori-browser.c:3150 +msgid "Decrease the zoom level" +msgstr "Зменшити розмір перегляду" + +#: ../midori/midori-browser.c:3153 +msgid "Reset the zoom level" +msgstr "Відновити розмір перегляду" + +#: ../midori/midori-browser.c:3155 ../midori/midori-view.c:969 +msgid "View _Source" +msgstr "Перегляд _коду" + +#: ../midori/midori-browser.c:3156 +msgid "View the source code of the page" +msgstr "Переглянути вихідний код сторінки" + +#: ../midori/midori-browser.c:3158 +msgid "View Selection Source" +msgstr "Переглянути вибраний код" + +#: ../midori/midori-browser.c:3159 +msgid "View the source code of the selection" +msgstr "Переглянути вихідний код вибраного" + +#: ../midori/midori-browser.c:3163 +msgid "Toggle fullscreen view" +msgstr "Перемкнути в повноекранний режим" + +#: ../midori/midori-browser.c:3165 +msgid "_Go" +msgstr "_Перейти" + +#: ../midori/midori-browser.c:3168 +msgid "Go back to the previous page" +msgstr "Повернутись на попередню сторінку" + +#: ../midori/midori-browser.c:3171 +msgid "Go forward to the next page" +msgstr "Перейти до наступної сторінки" + +#: ../midori/midori-browser.c:3174 +msgid "Go to your homepage" +msgstr "Перейти на домашню сторінку" + +#: ../midori/midori-browser.c:3176 +msgid "Open in Page_holder..." +msgstr "Відкрити в тримачі _сторінок..." + +#: ../midori/midori-browser.c:3177 +msgid "Open the current page in the pageholder" +msgstr "Відкрити поточну сторінку в тримачі сторінок" + +#: ../midori/midori-browser.c:3179 +msgid "Empty Trash" +msgstr "Спорожнити смітник" + +#: ../midori/midori-browser.c:3180 +msgid "Delete the contents of the trash" +msgstr "Видалити вміст смітника" + +#: ../midori/midori-browser.c:3182 ../midori/midori-view.c:941 +msgid "Undo Close Tab" +msgstr "Повернути закриту вкладку" + +#: ../midori/midori-browser.c:3183 +msgid "Open the last closed tab" +msgstr "Відкрити останню закриту вкладку" + +#: ../midori/midori-browser.c:3187 +msgid "Add a new bookmark" +msgstr "Додати нову закладку" + +#: ../midori/midori-browser.c:3190 +msgid "Edit the selected bookmark" +msgstr "Редагувати вибрану закладку" + +#: ../midori/midori-browser.c:3193 +msgid "Delete the selected bookmark" +msgstr "Видалити вибрану закладку" + +#: ../midori/midori-browser.c:3196 +msgid "Delete the selected history item" +msgstr "Видалити вибраний об'єкт історії" + +#: ../midori/midori-browser.c:3199 +msgid "Clear the entire history" +msgstr "Очистити історію" + +#: ../midori/midori-browser.c:3202 +msgid "Bookmark the selected history item" +msgstr "Додати в закладки вибраний об'єкт історії" + +#: ../midori/midori-browser.c:3204 +msgid "_Tools" +msgstr "_Інструменти" + +#: ../midori/midori-browser.c:3206 ../midori/midori-searchaction.c:468 +msgid "_Manage Search Engines" +msgstr "_Налаштувати пошукові машини" + +#: ../midori/midori-browser.c:3207 +msgid "Add, edit and remove search engines..." +msgstr "Додати, редагувати чи видалити пошукові машини..." + +#: ../midori/midori-browser.c:3211 +msgid "_Previous Tab" +msgstr "_Попередня вкладка" + +#: ../midori/midori-browser.c:3212 +msgid "Switch to the previous tab" +msgstr "Перемкнути до попередньої вкладки" + +#: ../midori/midori-browser.c:3214 +msgid "_Next Tab" +msgstr "_Наступна вкладка" + +#: ../midori/midori-browser.c:3215 +msgid "Switch to the next tab" +msgstr "Перемкнути до наступної вкладки" + +#: ../midori/midori-browser.c:3217 +msgid "_Help" +msgstr "_Допомога" + +#: ../midori/midori-browser.c:3219 +msgid "_Contents" +msgstr "_Зміст" + +#: ../midori/midori-browser.c:3220 +msgid "Show the documentation" +msgstr "Показати документацію" + +#: ../midori/midori-browser.c:3222 +msgid "_Frequent questions" +msgstr "_Найуживаніші питання" + +#: ../midori/midori-browser.c:3223 +msgid "Show the Frequently Asked Questions" +msgstr "Показати найуживаніші запитання" + +#: ../midori/midori-browser.c:3225 +msgid "_Report a bug" +msgstr "П_овідомити про помилку" + +#: ../midori/midori-browser.c:3226 +msgid "Open Midori's bug tracker" +msgstr "Відкрити баг-трекер Midori" + +#: ../midori/midori-browser.c:3229 +msgid "Show information about the program" +msgstr "Відобразити інформацію про програму" + +#: ../midori/midori-browser.c:3236 +msgid "P_rivate Browsing" +msgstr "_Режим приватності" + +#: ../midori/midori-browser.c:3237 +msgid "Don't save any private data while browsing" +msgstr "Не зберізати будь яких даних під час перегляду Веб" + +#: ../midori/midori-browser.c:3242 +msgid "_Menubar" +msgstr "Панель _меню" + +#: ../midori/midori-browser.c:3243 +msgid "Show menubar" +msgstr "Показати панель меню" + +#: ../midori/midori-browser.c:3246 +msgid "_Navigationbar" +msgstr "Панель _навігації" + +#: ../midori/midori-browser.c:3247 +msgid "Show navigationbar" +msgstr "Показати панель навігації" + +#: ../midori/midori-browser.c:3250 +msgid "Side_panel" +msgstr "_Бічна панель" + +#: ../midori/midori-browser.c:3251 +msgid "Show sidepanel" +msgstr "Показати бічну панель" + +#: ../midori/midori-browser.c:3254 +msgid "_Bookmarkbar" +msgstr "Панель _закладок" + +#: ../midori/midori-browser.c:3255 +msgid "Show bookmarkbar" +msgstr "Показати панель закладок" + +#: ../midori/midori-browser.c:3258 +msgid "_Transferbar" +msgstr "Панель за_вантажень" + +#: ../midori/midori-browser.c:3259 +msgid "Show transferbar" +msgstr "Показати панель завантажень" + +#: ../midori/midori-browser.c:3262 +msgid "_Statusbar" +msgstr "Панель _стану" + +#: ../midori/midori-browser.c:3263 +msgid "Show statusbar" +msgstr "Показати панель стану" + +#: ../midori/midori-browser.c:3680 +msgid "_Location..." +msgstr "_Місцезнаходження..." + +#: ../midori/midori-browser.c:3682 +msgid "Open a particular location" +msgstr "Відкрити поточне місцезнаходження" + +#: ../midori/midori-browser.c:3706 +msgid "_Web Search..." +msgstr "_Пошук у Веб..." + +#: ../midori/midori-browser.c:3708 +msgid "Run a web search" +msgstr "Запустити пошук у Веб" + +#: ../midori/midori-browser.c:3727 +msgid "Reopen a previously closed tab or window" +msgstr "Знову відкрити закриту вкладку чи вікно" + +#: ../midori/midori-browser.c:3741 +msgid "_Recently visited pages" +msgstr "_Останні відвідані сторінки" + +#: ../midori/midori-browser.c:3743 +msgid "Reopen pages that you visited earlier" +msgstr "Знову відкрити сторінки, що були переглянуті раніше" + +#: ../midori/midori-browser.c:3759 +msgid "Show the saved bookmarks" +msgstr "Показати збережені закладки" + +#: ../midori/midori-browser.c:3773 +msgid "_Window" +msgstr "_Вікно" + +#: ../midori/midori-browser.c:3775 +msgid "Show a list of all open tabs" +msgstr "Показати список відкритих вкладок" + +#: ../midori/midori-browser.c:3899 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../midori/midori-browser.c:3906 ../midori/midori-preferences.c:348 +msgid "Transfers" +msgstr "Завантаження" + +#: ../midori/midori-browser.c:3915 +msgid "Console" +msgstr "Консоль" + +#: ../midori/midori-browser.c:3959 ../midori/midori-preferences.c:519 +msgid "History" +msgstr "Історія" + +#. i18n: A panel showing a user specified web page +#: ../midori/midori-browser.c:3969 +msgid "Pageholder" +msgstr "Тримач сторінок" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4038 +msgid "_Inline find:" +msgstr "Знайти _входження:" + +#: ../midori/midori-browser.c:4073 +msgid "Match Case" +msgstr "Входження" + +#: ../midori/midori-browser.c:4081 +msgid "Highlight Matches" +msgstr "Підсвітити входження" + +#: ../midori/midori-browser.c:4090 +msgid "Close Findbar" +msgstr "Закрити панель пошуку" + +#: ../midori/midori-browser.c:4336 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Невавершені властивості '%s'" + +#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +msgid "Close panel" +msgstr "Закрити панель" + +#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1559 +msgid "Blank page" +msgstr "Пуста сторінка" + +#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:394 +msgid "Homepage" +msgstr "Домашня сторінка" + +#: ../midori/midori-websettings.c:134 +msgid "Last open pages" +msgstr "Останні відкриті сторінки" + +#: ../midori/midori-websettings.c:149 +msgid "Chinese (BIG5)" +msgstr "Китайська (BIG5)" + +#: ../midori/midori-websettings.c:150 +msgid "Japanese (SHIFT_JIS)" +msgstr "Японська (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:151 +msgid "Russian (KOI8-R)" +msgstr "Російська (KOI8-R)" + +#: ../midori/midori-websettings.c:152 +msgid "Unicode (UTF-8)" +msgstr "Юнікод (UTF-8)" + +#: ../midori/midori-websettings.c:153 +msgid "Western (ISO-8859-1)" +msgstr "Західний (ISO-8859-1)" + +#: ../midori/midori-websettings.c:154 +msgid "Custom..." +msgstr "Інша..." + +#: ../midori/midori-websettings.c:169 +msgid "New tab" +msgstr "Нова вкладка" + +#: ../midori/midori-websettings.c:170 +msgid "New window" +msgstr "Нове вікно" + +#: ../midori/midori-websettings.c:171 +msgid "Current tab" +msgstr "Поточна вкладка" + +#: ../midori/midori-websettings.c:186 +msgid "Default" +msgstr "Типово" + +#: ../midori/midori-websettings.c:187 +msgid "Icons" +msgstr "Значки" + +#: ../midori/midori-websettings.c:188 +msgid "Text" +msgstr "Текст" + +#: ../midori/midori-websettings.c:189 +msgid "Both" +msgstr "Обидва" + +#: ../midori/midori-websettings.c:190 +msgid "Both horizontal" +msgstr "Обидва горизонтально" + +#: ../midori/midori-websettings.c:205 +msgid "All cookies" +msgstr "Всі куки" + +#: ../midori/midori-websettings.c:206 +msgid "Session cookies" +msgstr "Куки сесії" + +#: ../midori/midori-websettings.c:244 +msgid "Remember last window size" +msgstr "Запам'ятати останній розмір вікна" + +#: ../midori/midori-websettings.c:245 +msgid "Whether to save the last window size" +msgstr "Властивості збереження розміру вікна" + +#: ../midori/midori-websettings.c:253 +msgid "Last window width" +msgstr "Ширина останнього вікна" + +#: ../midori/midori-websettings.c:254 +msgid "The last saved window width" +msgstr "Остання збережена ширина вікна" + +#: ../midori/midori-websettings.c:262 +msgid "Last window height" +msgstr "Висота останнього вікна" + +#: ../midori/midori-websettings.c:263 +msgid "The last saved window height" +msgstr "Остання збережена висота вікна" + +#: ../midori/midori-websettings.c:271 +msgid "Last panel position" +msgstr "Остання позиція панелі" + +#: ../midori/midori-websettings.c:272 +msgid "The last saved panel position" +msgstr "Остання збережена позиція панелі" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:281 +msgid "Last panel page" +msgstr "Остання сторінка панелі" + +#: ../midori/midori-websettings.c:282 +msgid "The last saved panel page" +msgstr "Остання збережена сторінка панелі" + +#: ../midori/midori-websettings.c:290 +msgid "Last Web search" +msgstr "Останній пошук у Веб" + +#: ../midori/midori-websettings.c:291 +msgid "The last saved Web search" +msgstr "Останній збережений пошук у Веб" + +#: ../midori/midori-websettings.c:299 +msgid "Last pageholder URI" +msgstr "Останнє посилання тримача сторінок" + +#: ../midori/midori-websettings.c:300 +msgid "The URI last opened in the pageholder" +msgstr "Останнє посилання відкрите у тримачі сторінок" + +#: ../midori/midori-websettings.c:309 +msgid "Show Menubar" +msgstr "Показати панель меню" + +#: ../midori/midori-websettings.c:310 +msgid "Whether to show the menubar" +msgstr "Налаштування відображення панелі меню" + +#: ../midori/midori-websettings.c:318 +msgid "Show Navigationbar" +msgstr "Показати панель навігації" + +#: ../midori/midori-websettings.c:319 +msgid "Whether to show the navigationbar" +msgstr "Налаштування відображення панелі навігації" + +#: ../midori/midori-websettings.c:327 +msgid "Show Bookmarkbar" +msgstr "Показати панель закладок" + +#: ../midori/midori-websettings.c:328 +msgid "Whether to show the bookmarkbar" +msgstr "Налаштування відображення панелі закладок" + +#: ../midori/midori-websettings.c:336 +msgid "Show Panel" +msgstr "Показати панель" + +#: ../midori/midori-websettings.c:337 +msgid "Whether to show the panel" +msgstr "Налаштування відображення панелі" + +#: ../midori/midori-websettings.c:345 +msgid "Show Statusbar" +msgstr "Показати панель стану" + +#: ../midori/midori-websettings.c:346 +msgid "Whether to show the statusbar" +msgstr "Налаштування відображення панелі стану" + +#: ../midori/midori-websettings.c:355 +msgid "Toolbar Style" +msgstr "Стиль панелі" + +#: ../midori/midori-websettings.c:356 +msgid "The style of the toolbar" +msgstr "Стиль панелі" + +#: ../midori/midori-websettings.c:365 +msgid "Toolbar Items" +msgstr "Об'єкти панелі інструментів" + +#: ../midori/midori-websettings.c:366 +msgid "The items to show on the toolbar" +msgstr "Об'єкти, що відображаються у панелі інструментів" + +#: ../midori/midori-websettings.c:374 +msgid "Compact Sidepanel" +msgstr "Компактна бічна панель" + +#: ../midori/midori-websettings.c:375 +msgid "Whether to make the sidepanel compact" +msgstr "Налаштування відображення компактної бічної панелі" + +#: ../midori/midori-websettings.c:384 +msgid "Load on Startup" +msgstr "Завантажити при старті" + +#: ../midori/midori-websettings.c:385 +msgid "What to load on startup" +msgstr "Що завантажувати при старті" + +#: ../midori/midori-websettings.c:395 +msgid "The homepage" +msgstr "Домашню сторінку" + +#: ../midori/midori-websettings.c:403 +msgid "Download Folder" +msgstr "Теку завантажень" + +#: ../midori/midori-websettings.c:404 +msgid "The folder downloaded files are saved to" +msgstr "Завантажені файли зберігати в" + +#: ../midori/midori-websettings.c:412 +msgid "Download Manager" +msgstr "Менеджер завантажень" + +#: ../midori/midori-websettings.c:413 +msgid "An external download manager" +msgstr "Зовнішній менеджер завантажень" + +#: ../midori/midori-websettings.c:421 +msgid "Text Editor" +msgstr "Текстовий редактор" + +#: ../midori/midori-websettings.c:422 +msgid "An external text editor" +msgstr "Зовнішній текстовий редактор" + +#: ../midori/midori-websettings.c:430 +msgid "Location entry Search" +msgstr "Місце початку пошуку" + +#: ../midori/midori-websettings.c:431 +msgid "The search to perform inside the location entry" +msgstr "Здійснювати пошук всередині місця входження" + +#: ../midori/midori-websettings.c:439 +msgid "Preferred Encoding" +msgstr "Улюблене кодування" + +#: ../midori/midori-websettings.c:440 +msgid "The preferred character encoding" +msgstr "Улюблене кодування символів" + +#: ../midori/midori-websettings.c:450 +msgid "Always Show Tabbar" +msgstr "Завжди відображати панель сторінок" + +#: ../midori/midori-websettings.c:451 +msgid "Always show the tabbar" +msgstr "Завжди відображати панель вкладок" + +#: ../midori/midori-websettings.c:459 +msgid "Close Buttons on Tabs" +msgstr "Кнопки закриття на вкладках" + +#: ../midori/midori-websettings.c:460 +msgid "Whether tabs have close buttons" +msgstr "Чи матимуть вкладки кнопки закриття" + +#: ../midori/midori-websettings.c:468 +msgid "Open new pages in" +msgstr "Відкривати нові сторінки в" + +#: ../midori/midori-websettings.c:469 +msgid "Where to open new pages" +msgstr "Де відкривати нові сторінки" + +#: ../midori/midori-websettings.c:478 +msgid "Open external pages in" +msgstr "Відкривати зовнішні виклики сторінок в" + +#: ../midori/midori-websettings.c:479 +msgid "Where to open externally opened pages" +msgstr "Де відкривати сторінки зовнішнього виклику" + +#: ../midori/midori-websettings.c:488 +msgid "Middle click opens Selection" +msgstr "Середня кнопка відкриває виділене" + +#: ../midori/midori-websettings.c:489 +msgid "Load an URL from the selection via middle click" +msgstr "Завантажувати посилання URL з виділеного через клацання середньої кнопки" + +#: ../midori/midori-websettings.c:497 +msgid "Open tabs in the background" +msgstr "Відкривати вкладки в фонових" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to open new tabs in the background" +msgstr "Чи відкривати нові вкладки в фоновому режимі" + +#: ../midori/midori-websettings.c:506 +msgid "Open Tabs next to Current" +msgstr "Відкривати вкладки у наступних після поточної" + +#: ../midori/midori-websettings.c:507 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" + +#: ../midori/midori-websettings.c:515 +msgid "Open popups in tabs" +msgstr "Відкривати спливаючі вікна у вкладках" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to open popup windows in tabs" +msgstr "Чи відкривати спливаючі вікна у вкладках" + +#: ../midori/midori-websettings.c:526 +msgid "Accept cookies" +msgstr "Приймати cookies" + +#: ../midori/midori-websettings.c:527 +msgid "What type of cookies to accept" +msgstr "Якого типу cookies приймати" + +#: ../midori/midori-websettings.c:536 +msgid "Original cookies only" +msgstr "Тільки оригінальніcookies" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies from the original website only" +msgstr "Приймати cookies тільки з поточного сайту" + +#: ../midori/midori-websettings.c:545 +msgid "Maximum cookie age" +msgstr "Тривалість життя cookie" + +#: ../midori/midori-websettings.c:546 +msgid "The maximum number of days to save cookies for" +msgstr "Максимальне число днів зберігання cookies для" + +#: ../midori/midori-websettings.c:556 +msgid "Remember last visited pages" +msgstr "Запам'ятати останні відвідані сторінки" + +#: ../midori/midori-websettings.c:557 +msgid "Whether the last visited pages are saved" +msgstr "Чи зберігати останні відвідані сторінки" + +#: ../midori/midori-websettings.c:565 +msgid "Maximum history age" +msgstr "Тривалість життя історії" + +#: ../midori/midori-websettings.c:566 +msgid "The maximum number of days to save the history for" +msgstr "Максимальне число днів для зберігати історію для" + +#: ../midori/midori-websettings.c:574 +msgid "Remember last form inputs" +msgstr "Запам'ятовувати введене" + +#: ../midori/midori-websettings.c:575 +msgid "Whether the last form inputs are saved" +msgstr "Чи зберігати введене останнього разу" + +#: ../midori/midori-websettings.c:583 +msgid "Remember last downloaded files" +msgstr "Запам'ятовувати останні завантажені файли" + +#: ../midori/midori-websettings.c:584 +msgid "Whether the last downloaded files are saved" +msgstr "Чи зберігати останні завантажені файли" + +#: ../midori/midori-websettings.c:594 +msgid "HTTP Proxy" +msgstr "Проксі HTTP" + +#: ../midori/midori-websettings.c:595 +msgid "The proxy used for HTTP connections" +msgstr "Проксі, що використовується для HTTP з'єднань" + +#: ../midori/midori-websettings.c:603 +msgid "Cache size" +msgstr "Розмір кешу" + +#: ../midori/midori-websettings.c:604 +msgid "The allowed size of the cache" +msgstr "Дозволений розмір кешу" + +#: ../midori/midori-view.c:873 +msgid "Open Link in New _Tab" +msgstr "Відкривати посилання у нових в_кладках" + +#: ../midori/midori-view.c:896 +msgid "_Save Link destination" +msgstr "Збер_ігати віддаленні посилання" + +#: ../midori/midori-view.c:904 +msgid "_Download Link destination" +msgstr "За_вантажувати віддалені посилання" + +#: ../midori/midori-view.c:926 +msgid "Open URL in New _Tab" +msgstr "Відкривати URL у нових вкла_дках" + +#: ../midori/midori-view.c:1293 +#, c-format +msgid "Inspect page - %s" +msgstr "Перевірка сторінки - %s" + +#: ../midori/midori-view.c:1431 +msgid "Source" +msgstr "Вихідний код" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "Властивості для %s" + +#. Page "General" +#: ../midori/midori-preferences.c:336 +msgid "General" +msgstr "Основні" + +#: ../midori/midori-preferences.c:337 +msgid "Startup" +msgstr "Початкові" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:384 +msgid "Appearance" +msgstr "Зовнішній вигляд" + +#: ../midori/midori-preferences.c:385 +msgid "Font settings" +msgstr "Властивості шрифту" + +#: ../midori/midori-preferences.c:387 +msgid "Default Font Family" +msgstr "Типове сімейство шрифтів" + +#: ../midori/midori-preferences.c:395 +msgid "Minimum Font Size" +msgstr "Мінімальний розмір шрифту" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:405 +msgid "Behavior" +msgstr "Заголовок" + +#: ../midori/midori-preferences.c:406 +msgid "Features" +msgstr "Опції" + +#: ../midori/midori-preferences.c:409 +msgid "Load images automatically" +msgstr "Автоматично завантажувати зображення" + +#: ../midori/midori-preferences.c:412 +msgid "Shrink images automatically" +msgstr "Автоматично зменшувати зображення" + +#: ../midori/midori-preferences.c:415 +msgid "Print background images" +msgstr "Друкувати фонові зображення" + +#: ../midori/midori-preferences.c:418 +msgid "Resizable text areas" +msgstr "Межі тексту змінюють розмір" + +#: ../midori/midori-preferences.c:421 +msgid "Enable scripts" +msgstr "Дозволити скрипти" + +#: ../midori/midori-preferences.c:424 +msgid "Enable plugins" +msgstr "Дозволити розширення" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "Дозволити утиліти розробника" + +#. Page "Interface" +#: ../midori/midori-preferences.c:439 +msgid "Interface" +msgstr "Інтерфейс" + +#: ../midori/midori-preferences.c:440 +msgid "Navigationbar" +msgstr "Панель навігації" + +#: ../midori/midori-preferences.c:455 +msgid "Browsing" +msgstr "Перегляд сторінок" + +#: ../midori/midori-preferences.c:482 ../midori/midori-preferences.c:483 +msgid "Network" +msgstr "Мережа" + +#: ../midori/midori-preferences.c:494 +msgid "MB" +msgstr "МБ" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:500 +msgid "Privacy" +msgstr "Приватність" + +#: ../midori/midori-preferences.c:502 +msgid "Web Cookies" +msgstr "Веб Cookies" + +#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:526 +msgid "days" +msgstr "днів" + +#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +msgid "Empty" +msgstr "Порожня" + +#: ../midori/midori-searchaction.c:804 +msgid "Add search engine" +msgstr "Додати пошукову машину" + +#: ../midori/midori-searchaction.c:804 +msgid "Edit search engine" +msgstr "Редагувати пошукову машину" + +#: ../midori/midori-searchaction.c:832 +msgid "_Name:" +msgstr "_Назва:" + +#: ../midori/midori-searchaction.c:876 +msgid "_Icon (name or file):" +msgstr "_Значок (назва або файл):" + +#: ../midori/midori-searchaction.c:890 +msgid "_Token:" +msgstr "_Ознака:" + +#: ../midori/midori-searchaction.c:1067 +msgid "Manage search engines" +msgstr "Керувати пошуковими машинами" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Неможливо запустити зовнішню програму." + +#: ../midori/sokoke.c:283 +msgid "Warning: You are using a superuser account!" +msgstr "Попередження: Ви використовуєте права адміністратора!" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Отримано невідому помилку." + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s не має властивостей '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s не може бути призначено для %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s неможливо отримати доступ" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Названий значок '%s' не може бути завантажений" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Значок лічильника '%s' не може бути завантажений" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Фрейми анімації пошкоджені" + +#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Властивості '%s' неправильні для %s" + +#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +msgid "Choose file" +msgstr "Вибрати файл" + +#: ../katze/katze-utils.c:187 +msgid "Choose folder" +msgstr "Вибрати теку" + From e1c5e81cc9c8b76ca6586b250e0ea38bad0b9cf9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 22 Nov 2008 01:17:23 +0100 Subject: [PATCH 0515/2970] Cleanup MidoriAddons a bit and remove Extensions from it --- midori/main.c | 15 +++-- midori/midori-addons.c | 148 ++++++++++------------------------------- midori/midori-addons.h | 17 +---- 3 files changed, 46 insertions(+), 134 deletions(-) diff --git a/midori/main.c b/midori/main.c index f02ae809..b3293657 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1009,10 +1009,12 @@ midori_app_add_browser_cb (MidoriApp* app, panel = katze_object_get_object (browser, "panel"); /* Transfers */ - /* addon = midori_view_new (net); + #if 0 + addon = midori_view_new (net); gtk_widget_show (addon); midori_panel_append_page (MIDORI_PANEL (panel), addon, NULL, - STOCK_TRANSFERS, _("Transfers")); */ + STOCK_TRANSFERS, _("Transfers")); + #endif /* Console */ addon = midori_console_new (); @@ -1025,14 +1027,14 @@ midori_app_add_browser_cb (MidoriApp* app, G_CALLBACK (midori_browser_add_tab_cb), addon); /* Userscripts */ - addon = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_SCRIPTS); + addon = midori_addons_new (MIDORI_ADDON_USER_SCRIPTS, GTK_WIDGET (browser)); gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, STOCK_SCRIPTS, _("Userscripts")); /* Userstyles */ - addon = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_USER_STYLES); + addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser)); gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); @@ -1040,12 +1042,15 @@ midori_app_add_browser_cb (MidoriApp* app, STOCK_STYLES, _("Userstyles")); /* Extensions */ - addon = midori_addons_new (GTK_WIDGET (browser), MIDORI_ADDON_EXTENSIONS); + #if 0 + addon = midori_addons_new (MIDORI_ADDON_EXTENSIONS, + katze_object_get_object (app, "extensions"), NULL); gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, STOCK_EXTENSIONS, _("Extensions")); + #endif } static void diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 51007d74..51a8b6b7 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -32,8 +32,8 @@ struct _MidoriAddons { GtkVBox parent_instance; - GtkWidget* web_widget; MidoriAddonKind kind; + GtkWidget* web_widget; GtkWidget* toolbar; GtkWidget* treeview; @@ -58,8 +58,8 @@ enum { PROP_0, - PROP_WEB_WIDGET, - PROP_KIND + PROP_KIND, + PROP_WEB_WIDGET }; static void @@ -85,7 +85,6 @@ midori_addon_kind_get_type (void) { static const GEnumValue values[] = { { MIDORI_ADDON_NONE, "MIDORI_ADDON_NONE", N_("None") }, - { MIDORI_ADDON_EXTENSIONS, "MIDORI_ADDON_EXTENSIONS", N_("Extensions") }, { MIDORI_ADDON_USER_SCRIPTS, "MIDORI_USER_SCRIPTS", N_("Userscripts") }, { MIDORI_ADDON_USER_STYLES, "MIDORI_USER_STYLES", N_("Userstyles") }, { 0, NULL, NULL } @@ -108,15 +107,6 @@ midori_addons_class_init (MidoriAddonsClass* class) flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; - g_object_class_install_property (gobject_class, - PROP_WEB_WIDGET, - g_param_spec_object ( - "web-widget", - "Web Widget", - "The assigned web widget", - GTK_TYPE_WIDGET, - G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, PROP_KIND, g_param_spec_enum ( @@ -126,6 +116,15 @@ midori_addons_class_init (MidoriAddonsClass* class) MIDORI_TYPE_ADDON_KIND, MIDORI_ADDON_NONE, flags)); + + g_object_class_install_property (gobject_class, + PROP_WEB_WIDGET, + g_param_spec_object ( + "web-widget", + "Web Widget", + "The assigned web widget", + GTK_TYPE_WIDGET, + G_PARAM_READWRITE)); } static void @@ -138,11 +137,11 @@ midori_addons_set_property (GObject* object, switch (prop_id) { - case PROP_WEB_WIDGET: - midori_addons_set_web_widget (addons, g_value_get_object (value)); - break; case PROP_KIND: - midori_addons_set_kind (addons, g_value_get_enum (value)); + addons->kind = g_value_get_enum (value); + break; + case PROP_WEB_WIDGET: + katze_object_assign (addons->web_widget, g_value_dup_object (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -160,11 +159,11 @@ midori_addons_get_property (GObject* object, switch (prop_id) { - case PROP_WEB_WIDGET: - g_value_set_object (value, midori_addons_get_web_widget (addons)); - break; case PROP_KIND: - g_value_set_enum (value, midori_addons_get_kind (addons)); + g_value_set_enum (value, addons->kind); + break; + case PROP_WEB_WIDGET: + g_value_set_object (value, addons->web_widget); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -177,8 +176,6 @@ _addons_get_folder (MidoriAddons* addons) { switch (addons->kind) { - case MIDORI_ADDON_EXTENSIONS: - return "extensions"; case MIDORI_ADDON_USER_SCRIPTS: return "scripts"; case MIDORI_ADDON_USER_STYLES: @@ -193,8 +190,6 @@ _addons_get_extension (MidoriAddons* addons) { switch (addons->kind) { - case MIDORI_ADDON_EXTENSIONS: - return ".midori.js"; case MIDORI_ADDON_USER_SCRIPTS: return ".user.js"; case MIDORI_ADDON_USER_STYLES: @@ -491,6 +486,9 @@ static void midori_addons_finalize (GObject* object) { MidoriAddons* addons = MIDORI_ADDONS (object); + + katze_object_assign (addons->web_widget, NULL); + g_slist_free (addons->elements); } @@ -875,8 +873,8 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, /** * midori_addons_new: - * @web_widget: a web widget * @kind: the kind of addon + * @web_widget: a web widget * * Creates a new addons widget. * @@ -886,8 +884,8 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, * Return value: a new #MidoriAddons **/ GtkWidget* -midori_addons_new (GtkWidget* web_widget, - MidoriAddonKind kind) +midori_addons_new (MidoriAddonKind kind, + GtkWidget* web_widget) { MidoriAddons* addons; #if GLIB_CHECK_VERSION (2, 16, 0) @@ -901,10 +899,14 @@ midori_addons_new (GtkWidget* web_widget, g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL); addons = g_object_new (MIDORI_TYPE_ADDONS, - /* "web-widget", web_widget, - "kind", kind, */ NULL); - addons->web_widget = web_widget; - midori_addons_set_kind (addons, kind); + "kind", kind, + "web-widget", web_widget, + NULL); + + if (kind == MIDORI_ADDON_USER_SCRIPTS || kind == MIDORI_ADDON_USER_STYLES) + g_signal_connect (addons->web_widget, "window-object-cleared", + G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); + midori_addons_update_elements (addons); #if GLIB_CHECK_VERSION (2, 16, 0) @@ -933,87 +935,6 @@ midori_addons_new (GtkWidget* web_widget, return GTK_WIDGET (addons); } -/** - * midori_addons_set_web_widget: - * @addons: a #MidoriAddons - * @web_widget: a web widget - * - * Sets the assigned web widget. Basically any widget - * with a window-object-cleared qualifies as such. - * - * Note: This may only be set once. - **/ -void -midori_addons_set_web_widget (MidoriAddons* addons, - GtkWidget* web_widget) -{ - g_return_if_fail (MIDORI_IS_ADDONS (addons)); - g_return_if_fail (GTK_IS_WIDGET (addons)); - g_return_if_fail (g_signal_lookup ("window-object-cleared", G_TYPE_FROM_INSTANCE (web_widget))); - - /* FIXME: Implement this */ -} - -/** - * midori_addons_get_web_widget: - * @addons: a #MidoriAddons - * - * Determines the assigned web widget. - * - * Return value: a web widget - **/ -GtkWidget* -midori_addons_get_web_widget (MidoriAddons* addons) -{ - g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL); - - return addons->web_widget; -} - -/** - * midori_addons_set_kind: - * @addons: a #MidoriAddons - * @kind: a #MidoriAddonKind - * - * Sets the kind of addons. - * - * Note: This may only be set once. - **/ -void -midori_addons_set_kind (MidoriAddons* addons, - MidoriAddonKind kind) -{ - g_return_if_fail (MIDORI_IS_ADDONS (addons)); - g_return_if_fail (addons->kind == MIDORI_ADDON_NONE); - - if (kind == MIDORI_ADDON_NONE) - return; - - g_return_if_fail (addons->web_widget); - - addons->kind = kind; - - if (kind == MIDORI_ADDON_USER_SCRIPTS || kind == MIDORI_ADDON_USER_STYLES) - g_signal_connect (addons->web_widget, "window-object-cleared", - G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); - - g_object_notify (G_OBJECT (addons), "kind"); -} - -/** - * midori_addons_get_kind: - * @addons: a #MidoriAddons - * - * Determines the kind of addons. - * - * Return value: a #MidoriAddonKind - **/ -MidoriAddonKind -midori_addons_get_kind (MidoriAddons* addons) -{ - return addons->kind; -} - /** * midori_addons_get_toolbar: * @addons: a #MidoriAddons @@ -1112,6 +1033,7 @@ midori_addons_update_elements (MidoriAddons* addons) GSList* list; struct AddonElement* element; + g_return_if_fail (MIDORI_IS_ADDONS (addons)); g_return_if_fail (addons->kind != MIDORI_ADDON_NONE); /* FIXME: would GHashTable be better? */ diff --git a/midori/midori-addons.h b/midori/midori-addons.h index a6f03a4d..4503562b 100644 --- a/midori/midori-addons.h +++ b/midori/midori-addons.h @@ -42,7 +42,6 @@ struct _MidoriAddonsClass typedef enum { MIDORI_ADDON_NONE, - MIDORI_ADDON_EXTENSIONS, MIDORI_ADDON_USER_SCRIPTS, MIDORI_ADDON_USER_STYLES } MidoriAddonKind; @@ -57,23 +56,9 @@ GType midori_addons_get_type (void); GtkWidget* -midori_addons_new (GtkWidget* web_widget, - MidoriAddonKind kind); - -void -midori_addons_set_web_widget (MidoriAddons* addons, +midori_addons_new (MidoriAddonKind kind, GtkWidget* web_widget); -GtkWidget* -midori_addons_get_web_widget (MidoriAddons* addons); - -void -midori_addons_set_kind (MidoriAddons* addons, - MidoriAddonKind kind); - -MidoriAddonKind -midori_addons_get_kind (MidoriAddons* addons); - GtkWidget* midori_addons_get_toolbar (MidoriAddons* addons); From 9c8bab302ccab374c652e81a76e1f9c4c9872775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 22 Nov 2008 01:45:47 +0100 Subject: [PATCH 0516/2970] Use -V instead of -v for --version --- docs/user/midori.txt | 2 +- midori/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index 26e41383..bd246ab6 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -129,7 +129,7 @@ The following arguments are supported if you call Midori from a command line. +=======+====================+================================================+ | -r | --run | Run the specified filename as javascript | +-------+--------------------+------------------------------------------------+ -| -v | --version | Show version information and exit. | +| -V | --version | Show version information and exit. | +-------+--------------------+------------------------------------------------+ diff --git a/midori/main.c b/midori/main.c index b3293657..707a90f5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1099,7 +1099,7 @@ main (int argc, { { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, - { "version", 'v', 0, G_OPTION_ARG_NONE, &version, + { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, N_("URIs"), NULL }, From 5a2f5b9b125d1fe2ca0fffa74491b80be3cf5173 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 23 Nov 2008 01:44:40 +0100 Subject: [PATCH 0517/2970] Fix clipboard menu items and do some tidying --- midori/midori-browser.c | 47 ++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e173bd81..94f6430c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1345,12 +1345,12 @@ _action_edit_activate (GtkAction* action, gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE; gboolean has_selection, can_select_all = FALSE; - if (MIDORI_IS_VIEW (widget)) + if (WEBKIT_IS_WEB_VIEW (widget)) { - MidoriView* view = MIDORI_VIEW (widget); - can_cut = midori_view_can_cut_clipboard (view); - can_copy = midori_view_can_copy_clipboard (view); - can_paste = midori_view_can_paste_clipboard (view); + WebKitWebView* view = WEBKIT_WEB_VIEW (widget); + can_cut = webkit_web_view_can_cut_clipboard (view); + can_copy = webkit_web_view_can_copy_clipboard (view); + can_paste = webkit_web_view_can_paste_clipboard (view); can_select_all = TRUE; } else if (GTK_IS_EDITABLE (widget)) @@ -3752,8 +3752,7 @@ midori_browser_init (MidoriBrowser* browser) "signal::activate-item", _action_trash_activate_item, browser, NULL); - gtk_action_group_add_action_with_accel (browser->action_group, - action, ""); + gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); action = g_object_new (KATZE_TYPE_ARRAY_ACTION, @@ -3768,8 +3767,7 @@ midori_browser_init (MidoriBrowser* browser) "signal::activate-item", _action_history_activate_item, browser, NULL); - gtk_action_group_add_action_with_accel (browser->action_group, - action, ""); + gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); action = g_object_new (KATZE_TYPE_ARRAY_ACTION, @@ -3784,8 +3782,7 @@ midori_browser_init (MidoriBrowser* browser) "signal::activate-item", _action_bookmarks_activate_item, browser, NULL); - gtk_action_group_add_action_with_accel (browser->action_group, - action, ""); + gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); action = g_object_new (KATZE_TYPE_ARRAY_ACTION, @@ -3801,8 +3798,7 @@ midori_browser_init (MidoriBrowser* browser) "signal::activate-item", _action_window_activate_item, browser, NULL); - gtk_action_group_add_action_with_accel (browser->action_group, - action, ""); + gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); /* Create the menubar */ @@ -3833,7 +3829,7 @@ midori_browser_init (MidoriBrowser* browser) /* Create the navigationbar */ browser->navigationbar = gtk_ui_manager_get_widget ( ui_manager, "/toolbar_navigation"); - /* FIXME: settings should be connected with screen changes */ + /* FIXME: Settings should be connected with screen changes */ gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (gtk_settings) g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", @@ -4109,7 +4105,7 @@ midori_browser_finalize (GObject* object) { MidoriBrowser* browser = MIDORI_BROWSER (object); - g_free (browser->statusbar_text); + katze_assign (browser->statusbar_text, NULL); katze_object_assign (browser->settings, NULL); katze_object_assign (browser->bookmarks, NULL); @@ -4601,6 +4597,9 @@ gint midori_browser_add_tab (MidoriBrowser* browser, GtkWidget* view) { + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); + g_return_val_if_fail (GTK_IS_WIDGET (view), -1); + g_signal_emit (browser, signals[ADD_TAB], 0, view); return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view); } @@ -4617,6 +4616,9 @@ void midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* view) { + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (GTK_IS_WIDGET (view)); + g_signal_emit (browser, signals[REMOVE_TAB], 0, view); } @@ -4627,8 +4629,6 @@ midori_browser_remove_tab (MidoriBrowser* browser, * * Appends a new view as described by @item. * - * Note: Currently this will always be a #MidoriWebView. - * * Return value: the index of the new tab, or -1 in case of an error **/ gint @@ -4639,6 +4639,7 @@ midori_browser_add_item (MidoriBrowser* browser, const gchar* title; GtkWidget* view; + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (KATZE_IS_ITEM (item), -1); uri = katze_item_get_uri (item); @@ -4660,8 +4661,6 @@ midori_browser_add_item (MidoriBrowser* browser, * * Appends an uri in the form of a new view. * - * Note: Currently this will always be a #MidoriView. - * * Return value: the index of the new view, or -1 **/ gint @@ -4670,6 +4669,9 @@ midori_browser_add_uri (MidoriBrowser* browser, { GtkWidget* view; + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); + g_return_val_if_fail (uri != NULL, -1); + view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, NULL); @@ -4690,6 +4692,9 @@ void midori_browser_activate_action (MidoriBrowser* browser, const gchar* name) { + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + g_return_if_fail (name != NULL); + g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name); } @@ -4710,7 +4715,7 @@ midori_browser_set_current_uri (MidoriBrowser* browser, GtkWidget* view; g_return_if_fail (MIDORI_IS_BROWSER (browser)); - g_return_if_fail (uri); + g_return_if_fail (uri != NULL); view = midori_browser_get_current_tab (browser); midori_view_set_uri (MIDORI_VIEW (view), uri); @@ -4825,9 +4830,7 @@ midori_browser_get_current_tab (MidoriBrowser* browser) n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); if (n >= 0) - { return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n); - } else return NULL; } From 02b2d027c930d09a86e53548407e1c8f371a1016 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 23 Nov 2008 01:45:53 +0100 Subject: [PATCH 0518/2970] Localize Statusbar Features --- extensions/statusbar-features.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index c1a37e3a..78cdd764 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -11,6 +11,8 @@ #include +#include + void statusbar_features_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser) @@ -27,9 +29,11 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, bbox = gtk_hbutton_box_new (); settings = katze_object_get_object (browser, "settings"); button = katze_property_proxy (settings, "auto-load-images", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_widget_show (button); button = katze_property_proxy (settings, "enable-scripts", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); gtk_container_add (GTK_CONTAINER (bbox), button); gtk_widget_show (button); gtk_widget_show (bbox); From f2e6e3579a277c93349aac0e1790714b0781c92c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 23 Nov 2008 01:51:30 +0100 Subject: [PATCH 0519/2970] Pack items in a normal box and not homogeneous --- extensions/statusbar-features.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 78cdd764..b95e926f 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -26,15 +26,15 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, instead of merely replicating the global preferences. */ statusbar = katze_object_get_object (browser, "statusbar"); - bbox = gtk_hbutton_box_new (); + bbox = gtk_hbox_new (FALSE, 0); settings = katze_object_get_object (browser, "settings"); button = katze_property_proxy (settings, "auto-load-images", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); - gtk_container_add (GTK_CONTAINER (bbox), button); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); button = katze_property_proxy (settings, "enable-scripts", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); - gtk_container_add (GTK_CONTAINER (bbox), button); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); gtk_widget_show (bbox); gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); From 4b06ec3c1ffe5a5e63289fd5765d57c91954b029 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 23 Nov 2008 05:19:43 +0100 Subject: [PATCH 0520/2970] Replace window-object-cleared with context-ready Introduce MidoriBrowser::load-status and also midori_view_execute_script while we are at it. --- midori/main.c | 4 +- midori/midori-addons.c | 14 ++-- midori/midori-browser.c | 94 ++++++++--------------- midori/midori-view.c | 165 ++++++++++++++++------------------------ midori/midori-view.h | 5 ++ 5 files changed, 110 insertions(+), 172 deletions(-) diff --git a/midori/main.c b/midori/main.c index 707a90f5..d4cdd1c8 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1033,6 +1033,7 @@ midori_app_add_browser_cb (MidoriApp* app, gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, STOCK_SCRIPTS, _("Userscripts")); + /* Userstyles */ addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser)); gtk_widget_show (addon); @@ -1043,8 +1044,7 @@ midori_app_add_browser_cb (MidoriApp* app, /* Extensions */ #if 0 - addon = midori_addons_new (MIDORI_ADDON_EXTENSIONS, - katze_object_get_object (app, "extensions"), NULL); + addon = midori_addons_new (MIDORI_ADDON_EXTENSIONS); gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 51a8b6b7..b0d2c415 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -813,11 +813,9 @@ _js_style_from_file (JSContextRef js_context, } static void -midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, - WebKitWebFrame* web_frame, - JSGlobalContextRef js_context, - JSObjectRef js_window, - MidoriAddons* addons) +midori_web_widget_context_ready_cb (GtkWidget* web_widget, + JSGlobalContextRef js_context, + MidoriAddons* addons) { const gchar* uri; GSList* elements; @@ -826,7 +824,7 @@ midori_web_widget_window_object_cleared_cb (GtkWidget* web_widget, gchar* exception; gchar* message; - uri = webkit_web_frame_get_uri (web_frame); + uri = katze_object_get_string (web_widget, "uri"); if (!uri) return; @@ -904,8 +902,8 @@ midori_addons_new (MidoriAddonKind kind, NULL); if (kind == MIDORI_ADDON_USER_SCRIPTS || kind == MIDORI_ADDON_USER_STYLES) - g_signal_connect (addons->web_widget, "window-object-cleared", - G_CALLBACK (midori_web_widget_window_object_cleared_cb), addons); + g_signal_connect (addons->web_widget, "context-ready", + G_CALLBACK (midori_web_widget_context_ready_cb), addons); midori_addons_update_elements (addons); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 94f6430c..788e09c7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -89,6 +89,7 @@ enum PROP_PANEL, PROP_URI, PROP_TAB, + PROP_LOAD_STATUS, PROP_STATUSBAR, PROP_STATUSBAR_TEXT, PROP_SETTINGS, @@ -100,12 +101,11 @@ enum enum { - WINDOW_OBJECT_CLEARED, NEW_WINDOW, - ADD_TAB, REMOVE_TAB, ACTIVATE_ACTION, + CONTEXT_READY, QUIT, LAST_SIGNAL @@ -392,6 +392,8 @@ midori_view_notify_load_status_cb (GtkWidget* view, _midori_browser_update_interface (browser); _midori_browser_set_statusbar_text (browser, NULL); } + + g_object_notify (G_OBJECT (browser), "load-status"); } static void @@ -404,14 +406,11 @@ midori_view_notify_progress_cb (GtkWidget* view, } static void -midori_view_window_object_cleared_cb (GtkWidget* view, - WebKitWebFrame* web_frame, - JSContextRef js_context, - JSObjectRef js_window, - MidoriBrowser* browser) +midori_view_context_ready_cb (GtkWidget* view, + JSContextRef js_context, + MidoriBrowser* browser) { - g_signal_emit (browser, signals[WINDOW_OBJECT_CLEARED], 0, - web_frame, js_context, js_window); + g_signal_emit (browser, signals[CONTEXT_READY], 0, js_context); } /* @@ -866,8 +865,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_notify_load_status_cb, browser, "signal::notify::progress", midori_view_notify_progress_cb, browser, - "signal::window-object-cleared", - midori_view_window_object_cleared_cb, browser, + "signal::context-ready", + midori_view_context_ready_cb, browser, /* "signal::news-feed-ready", midori_view_news_feed_ready_cb, browser, */ "signal::notify::title", @@ -930,64 +929,12 @@ _midori_browser_quit (MidoriBrowser* browser) /* Nothing to do */ } -static void -midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef gboolean(*GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_POINTER_POINTER callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (marshal_data - ? marshal_data : cc->callback); - - callback (data1, - g_value_get_object (param_values + 1), - g_value_get_pointer (param_values + 2), - g_value_get_pointer (param_values + 3), - data2); -} - static void midori_browser_class_init (MidoriBrowserClass* class) { GObjectClass* gobject_class; GParamFlags flags; - signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( - "window-object-cleared", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriBrowserClass, window_object_cleared), - 0, - NULL, - midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER, - G_TYPE_NONE, 3, - WEBKIT_TYPE_WEB_FRAME, - G_TYPE_POINTER, - G_TYPE_POINTER); - signals[NEW_WINDOW] = g_signal_new ( "new-window", G_TYPE_FROM_CLASS (class), @@ -1032,6 +979,17 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + signals[CONTEXT_READY] = g_signal_new ( + "context-ready", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + signals[QUIT] = g_signal_new ( "quit", G_TYPE_FROM_CLASS (class), @@ -1109,6 +1067,16 @@ midori_browser_class_init (MidoriBrowserClass* class) GTK_TYPE_WIDGET, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, + PROP_LOAD_STATUS, + g_param_spec_enum ( + "load-status", + "Load Status", + "The current load status", + MIDORI_TYPE_LOAD_STATUS, + MIDORI_LOAD_FINISHED, + G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_STATUSBAR, g_param_spec_object ( diff --git a/midori/midori-view.c b/midori/midori-view.c index 36c90dfe..201e9ecb 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -15,12 +15,11 @@ #include "midori-view.h" #include "midori-source.h" - #include "midori-stock.h" #include "compat.h" #include "sokoke.h" -#include "gjs.h" +/* #include "gjs.h" */ #include #include @@ -48,7 +47,7 @@ struct _MidoriView gchar* selected_text; MidoriWebSettings* settings; GtkWidget* web_view; - gboolean window_object_cleared; + /* KatzeArray* news_feeds; */ gchar* download_manager; gboolean middle_click_opens_selection; @@ -100,6 +99,7 @@ enum PROP_LOAD_STATUS, PROP_PROGRESS, PROP_ZOOM_LEVEL, + /* PROP_NEWS_FEEDS, */ PROP_STATUSBAR_TEXT, PROP_SETTINGS, PROP_NET @@ -108,8 +108,8 @@ enum enum { ACTIVATE_ACTION, CONSOLE_MESSAGE, + CONTEXT_READY, ATTACH_INSPECTOR, - WINDOW_OBJECT_CLEARED, NEW_TAB, NEW_WINDOW, SEARCH_TEXT, @@ -215,45 +215,6 @@ midori_cclosure_marshal_VOID__STRING_INT_STRING (GClosure* closure, data2); } -static void -midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef gboolean(*GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_POINTER_POINTER callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_POINTER_POINTER) (marshal_data - ? marshal_data : cc->callback); - - callback (data1, - g_value_get_object (param_values + 1), - g_value_get_pointer (param_values + 2), - g_value_get_pointer (param_values + 3), - data2); -} - static void midori_view_class_init (MidoriViewClass* class) { @@ -284,6 +245,17 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_INT, G_TYPE_STRING); + signals[CONTEXT_READY] = g_signal_new ( + "context-ready", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + signals[ATTACH_INSPECTOR] = g_signal_new ( "attach-inspector", G_TYPE_FROM_CLASS (class), @@ -295,19 +267,6 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_NONE, 1, GTK_TYPE_WIDGET); - signals[WINDOW_OBJECT_CLEARED] = g_signal_new ( - "window-object-cleared", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - 0, - 0, - NULL, - midori_cclosure_marshal_VOID__OBJECT_POINTER_POINTER, - G_TYPE_NONE, 3, - WEBKIT_TYPE_WEB_FRAME, - G_TYPE_POINTER, - G_TYPE_POINTER); - signals[NEW_TAB] = g_signal_new ( "new-tab", G_TYPE_FROM_CLASS (class), @@ -428,6 +387,15 @@ midori_view_class_init (MidoriViewClass* class) 1.0f, G_PARAM_READWRITE)); + /* g_object_class_install_property (gobject_class, + PROP_NEWS_FEEDS, + g_param_spec_object ( + "news-feeds", + "News Feeds", + "The list of available news feeds", + KATZE_TYPE_ARRAY, + G_PARAM_READWRITE)); */ + g_object_class_install_property (gobject_class, PROP_STATUSBAR_TEXT, g_param_spec_string ( @@ -506,8 +474,6 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, MidoriView* view) { - view->window_object_cleared = FALSE; - view->load_status = MIDORI_LOAD_PROVISIONAL; g_object_notify (G_OBJECT (view), "load-status"); @@ -546,17 +512,11 @@ webkit_web_view_progress_changed_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "progress"); } -/* -static void +/*static void gjs_value_links_foreach_cb (GjsValue* link, MidoriView* view) { const gchar* type; -#if GLIB_CHECK_VERSION (2, 16, 0) - const gchar* rel; - GFile* icon_file; - GIcon* icon; -#endif if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "href")) { @@ -568,29 +528,14 @@ gjs_value_links_foreach_cb (GjsValue* link, || !strcmp (type, "application/atom+xml")) { katze_array_add_item (view->news_feeds, link); - g_signal_emit_by_name (view, "news-feed-ready", + g_signal_emit (view, signals[NEWS_FEED_READY], gjs_value_get_attribute_string (link, "href"), type, gjs_value_has_attribute (link, "title") ? gjs_value_get_attribute_string (link, "title") : NULL); } } -#if GLIB_CHECK_VERSION (2, 16, 0) - if (gjs_value_has_attribute (link, "rel")) - { - rel = gjs_value_get_attribute_string (link, "rel"); - if (!strcmp (rel, "icon") || !strcmp (rel, "shortcut icon")) - { - icon_file = g_file_new_for_uri ( - gjs_value_get_attribute_string (link, "href")); - icon = g_file_icon_new (icon_file); - g_loadable_icon_load_async (G_LOADABLE_ICON (icon), - 0, NULL, (GAsyncReadyCallback)loadable_icon_finish_cb, view); - } - } -#endif } -} -*/ +}*/ static void webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, @@ -598,11 +543,6 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, MidoriView* view) { gchar* data; - /*JSContextRef js_context; - JSValueRef js_window; - GjsValue* value; - GjsValue* document; - GjsValue* links; */ if (!success) { @@ -622,16 +562,6 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, g_free (data); } - /* js_context = webkit_web_frame_get_global_context (web_frame); - value = gjs_value_new (js_context, NULL); - document = gjs_value_get_by_name (value, "document"); - links = gjs_value_get_elements_by_tag_name (document, "link"); - katze_array_clear (web_view->news_feeds); - gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, web_view); - g_object_unref (links); - g_object_unref (document); - g_object_unref (value); */ - view->load_status = MIDORI_LOAD_FINISHED; g_object_notify (G_OBJECT (view), "load-status"); } @@ -641,8 +571,23 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, MidoriView* view) { + /* JSContextRef js_context; + GjsValue* value; + GjsValue* document; + GjsValue* links; */ + view->progress = 1.0; g_object_notify (G_OBJECT (view), "progress"); + + /* js_context = webkit_web_frame_get_global_context (web_frame); + value = gjs_value_new (js_context, NULL); + document = gjs_value_get_by_name (value, "document"); + links = gjs_value_get_elements_by_tag_name (document, "link"); + katze_array_clear (view->news_feeds); + gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, view); + g_object_unref (links); + g_object_unref (document); + g_object_unref (value); */ } static void @@ -1000,8 +945,7 @@ webkit_web_view_window_object_cleared_cb (GtkWidget* web_view, JSObjectRef js_window, MidoriView* view) { - g_signal_emit (view, signals[WINDOW_OBJECT_CLEARED], 0, - web_frame, js_context, js_window); + g_signal_emit (view, signals[CONTEXT_READY], 0, js_context); } static void @@ -2154,3 +2098,26 @@ midori_view_set_highlight_text_matches (MidoriView* view, webkit_web_view_set_highlight_text_matches ( WEBKIT_WEB_VIEW (view->web_view), highlight); } + +/** + * midori_view_execute_script + * @view: a #MidoriView + * @script: script code + * @exception: location to store an exception message + * + * Execute a script on the view. + * + * Returns: %TRUE if the script was executed successfully + **/ +gboolean +midori_view_execute_script (MidoriView* view, + const gchar* script, + gchar** exception) +{ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + g_return_val_if_fail (script != NULL, FALSE); + + /* FIXME Actually store exception. */ + webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), script); + return TRUE; +} diff --git a/midori/midori-view.h b/midori/midori-view.h index 13a8c4ba..8a839d55 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -171,6 +171,11 @@ void midori_view_set_highlight_text_matches (MidoriView* view, gboolean highlight); +gboolean +midori_view_execute_script (MidoriView* view, + const gchar* script, + gchar** exception); + G_END_DECLS #endif /* __MIDORI_VIEW_H__ */ From d00ff950589beb52e7d9e28bff63b8b83a063204 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 24 Nov 2008 01:41:45 +0100 Subject: [PATCH 0521/2970] Provide MidoriPane interface for use with MidoriPanel --- extensions/statusbar-features.c | 2 - extensions/tab-panel/main.c | 4 +- extensions/tab-panel/tab-panel-extension.c | 2 +- midori/main.c | 20 +- midori/midori-app.c | 12 ++ midori/midori-app.h | 12 -- midori/midori-browser.c | 16 +- midori/midori-pane.c | 131 +++++++++++++ midori/midori-pane.h | 62 ++++++ midori/midori-panel.c | 217 +++++++++++++++++---- midori/midori-panel.h | 27 +-- midori/midori.h | 4 + 12 files changed, 420 insertions(+), 89 deletions(-) create mode 100644 midori/midori-pane.c create mode 100644 midori/midori-pane.h diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index b95e926f..88006c18 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -11,8 +11,6 @@ #include -#include - void statusbar_features_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser) diff --git a/extensions/tab-panel/main.c b/extensions/tab-panel/main.c index 60cb316b..c0aea024 100644 --- a/extensions/tab-panel/main.c +++ b/extensions/tab-panel/main.c @@ -25,8 +25,8 @@ tab_panel_app_add_browser_cb (MidoriApp* app, panel = katze_object_get_object (browser, "panel"); child = midori_view_new (NULL); gtk_widget_show (child); - midori_panel_append_page (MIDORI_PANEL (panel), child, - NULL, GTK_STOCK_INDEX, "Tab Panel"); + midori_panel_append_widget (MIDORI_PANEL (panel), child, + GTK_STOCK_INDEX, "Tab Panel", NULL); } static void diff --git a/extensions/tab-panel/tab-panel-extension.c b/extensions/tab-panel/tab-panel-extension.c index 27cdb92a..417c1359 100644 --- a/extensions/tab-panel/tab-panel-extension.c +++ b/extensions/tab-panel/tab-panel-extension.c @@ -32,7 +32,7 @@ tab_panel_extension_class_init (TabPanelExtensionClass* class) } static void -tab_panel_extension_init (TabPanelExtension* source) +tab_panel_extension_init (TabPanelExtension* extension) { /* Nothing to do. */ } diff --git a/midori/main.c b/midori/main.c index d4cdd1c8..a1aaf560 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1012,8 +1012,8 @@ midori_app_add_browser_cb (MidoriApp* app, #if 0 addon = midori_view_new (net); gtk_widget_show (addon); - midori_panel_append_page (MIDORI_PANEL (panel), addon, NULL, - STOCK_TRANSFERS, _("Transfers")); + midori_panel_append_widget (MIDORI_PANEL (panel), addon, + STOCK_TRANSFERS, _("Transfers"), NULL); #endif /* Console */ @@ -1021,8 +1021,8 @@ midori_app_add_browser_cb (MidoriApp* app, gtk_widget_show (addon); toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (addon)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, - STOCK_CONSOLE, _("Console")); + midori_panel_append_widget (MIDORI_PANEL (panel), addon, + STOCK_CONSOLE, _("Console"), toolbar); g_signal_connect (browser, "add-tab", G_CALLBACK (midori_browser_add_tab_cb), addon); @@ -1031,16 +1031,16 @@ midori_app_add_browser_cb (MidoriApp* app, gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, - STOCK_SCRIPTS, _("Userscripts")); + midori_panel_append_widget (MIDORI_PANEL (panel), addon, + STOCK_SCRIPTS, _("Userscripts"), toolbar); /* Userstyles */ addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser)); gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, - STOCK_STYLES, _("Userstyles")); + midori_panel_append_widget (MIDORI_PANEL (panel), addon, + STOCK_STYLES, _("Userstyles"), toolbar); /* Extensions */ #if 0 @@ -1048,8 +1048,8 @@ midori_app_add_browser_cb (MidoriApp* app, gtk_widget_show (addon); toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (panel), addon, toolbar, - STOCK_EXTENSIONS, _("Extensions")); + midori_panel_append_page (MIDORI_PANEL (panel), addon, + STOCK_EXTENSIONS, _("_Extensions"), toolbar); #endif } diff --git a/midori/midori-app.c b/midori/midori-app.c index 2b875b1a..525b8f2a 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -41,6 +41,18 @@ struct _MidoriApp gpointer instance; }; +struct _MidoriAppClass +{ + GObjectClass parent_class; + + /* Signals */ + void + (*add_browser) (MidoriApp* app, + MidoriBrowser* browser); + void + (*quit) (MidoriApp* app); +}; + G_DEFINE_TYPE (MidoriApp, midori_app, G_TYPE_OBJECT) enum diff --git a/midori/midori-app.h b/midori/midori-app.h index 98aff04c..c42e1cd3 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -35,18 +35,6 @@ G_BEGIN_DECLS typedef struct _MidoriApp MidoriApp; typedef struct _MidoriAppClass MidoriAppClass; -struct _MidoriAppClass -{ - GObjectClass parent_class; - - /* Signals */ - void - (*add_browser) (MidoriApp* app, - MidoriBrowser* browser); - void - (*quit) (MidoriApp* app); -}; - GType midori_app_get_type (void); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 788e09c7..7abdbc09 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3878,9 +3878,8 @@ midori_browser_init (MidoriBrowser* browser) _action_set_sensitive (browser, "BookmarkAdd", FALSE); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); gtk_widget_show_all (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - box, toolbar, - STOCK_BOOKMARKS, _("Bookmarks")); + midori_panel_append_widget (MIDORI_PANEL (browser->panel), + box, STOCK_BOOKMARKS, _("Bookmarks"), toolbar); /* History */ box = gtk_vbox_new (FALSE, 0); @@ -3922,19 +3921,18 @@ midori_browser_init (MidoriBrowser* browser) toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_history"); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - box, toolbar, - STOCK_HISTORY, _("History")); + midori_panel_append_widget (MIDORI_PANEL (browser->panel), + box, STOCK_HISTORY, _("History"), toolbar); /* Pageholder */ browser->panel_pageholder = midori_view_new (browser->net); midori_view_set_settings (MIDORI_VIEW (browser->panel_pageholder), browser->settings); gtk_widget_show (browser->panel_pageholder); - midori_panel_append_page (MIDORI_PANEL (browser->panel), - browser->panel_pageholder, NULL, + midori_panel_append_widget (MIDORI_PANEL (browser->panel), + browser->panel_pageholder, /* i18n: A panel showing a user specified web page */ - STOCK_PAGE_HOLDER, _("Pageholder")); + STOCK_PAGE_HOLDER, _("Pageholder"), NULL); /* Notebook, containing all views */ vpaned = gtk_vpaned_new (); diff --git a/midori/midori-pane.c b/midori/midori-pane.c new file mode 100644 index 00000000..0817efab --- /dev/null +++ b/midori/midori-pane.c @@ -0,0 +1,131 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-pane.h" + +#include + +struct _MidoriPane +{ + GtkHBox parent_instance; +}; + +static void +midori_pane_base_init (MidoriPaneIface* iface); + +GType +midori_pane_get_type (void) +{ + static GType pane_type = 0; + + if (!pane_type) + { + const GTypeInfo pane_info = + { + sizeof (MidoriPaneIface), + (GBaseInitFunc) midori_pane_base_init, + (GBaseFinalizeFunc) NULL, + }; + + pane_type = g_type_register_static (G_TYPE_INTERFACE, + "MidoriPane", + &pane_info, 0); + g_type_interface_add_prerequisite (pane_type, GTK_TYPE_WIDGET); + } + + return pane_type; +} + +static const gchar* +midori_pane_default_get_stock_id (MidoriPane* pane) +{ + return NULL; +} + +static const gchar* +midori_pane_default_get_label (MidoriPane* pane) +{ + return NULL; +} + +static GtkWidget* +midori_pane_default_get_toolbar (MidoriPane* pane) +{ + return NULL; +} + +static void +midori_pane_base_init (MidoriPaneIface* iface) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + iface->get_stock_id = midori_pane_default_get_stock_id; + iface->get_label = midori_pane_default_get_label; + iface->get_toolbar = midori_pane_default_get_toolbar; + + initialized = TRUE; +} + +/** + * midori_pane_get_stock_id: + * @pane: a #MidoriPane + * + * Retrieves the stock ID of the pane. + * + * Return value: a stock ID + **/ +const gchar* +midori_pane_get_stock_id (MidoriPane* pane) +{ + g_return_val_if_fail (MIDORI_IS_PANE (pane), NULL); + + return MIDORI_PANE_GET_IFACE (pane)->get_stock_id (pane); +} + +/** + * midori_pane_get_label: + * @pane: a #MidoriPane + * + * Retrieves the label of the pane. + * + * Return value: a label string + **/ +const gchar* +midori_pane_get_label (MidoriPane* pane) +{ + g_return_val_if_fail (MIDORI_IS_PANE (pane), NULL); + + return MIDORI_PANE_GET_IFACE (pane)->get_label (pane); +} + +/** + * midori_pane_get_toolbar: + * @pane: a #MidoriPane + * + * Retrieves the toolbar of the pane. + * + * Return value: a toolbar + **/ +GtkWidget* +midori_pane_get_toolbar (MidoriPane* pane) +{ + GtkWidget* toolbar; + + g_return_val_if_fail (MIDORI_IS_PANE (pane), NULL); + + toolbar = MIDORI_PANE_GET_IFACE (pane)->get_toolbar (pane); + if (!toolbar) + toolbar = gtk_event_box_new (); + return toolbar; +} diff --git a/midori/midori-pane.h b/midori/midori-pane.h new file mode 100644 index 00000000..78ccb045 --- /dev/null +++ b/midori/midori-pane.h @@ -0,0 +1,62 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_PANE_H__ +#define __MIDORI_PANE_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_PANE \ + (midori_pane_get_type ()) +#define MIDORI_PANE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PANE, MidoriPane)) +#define MIDORI_IS_PANE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PANE)) +#define MIDORI_PANE_GET_IFACE(inst) \ + (G_TYPE_INSTANCE_GET_INTERFACE ((inst), MIDORI_TYPE_PANE, MidoriPaneIface)) + +typedef struct _MidoriPane MidoriPane; +typedef struct _MidoriPaneIface MidoriPaneIface; + +struct _MidoriPaneIface +{ + GTypeInterface base_iface; + + /* Virtual functions */ + const gchar* + (*get_stock_id) (MidoriPane* pane); + + const gchar* + (*get_label) (MidoriPane* pane); + + GtkWidget* + (*get_toolbar) (MidoriPane* pane); +}; + +GType +midori_pane_get_type (void); + +const gchar* +midori_pane_get_stock_id (MidoriPane* pane); + +const gchar* +midori_pane_get_label (MidoriPane* pane); + +GtkWidget* +midori_pane_get_toolbar (MidoriPane* pane); + +G_END_DECLS + +#endif /* __MIDORI_PANE_H__ */ diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 2a2cb6f4..405e80a5 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -30,6 +30,15 @@ struct _MidoriPanel GtkMenu* menu; }; +struct _MidoriPanelClass +{ + GtkHBoxClass parent_class; + + /* Signals */ + gboolean + (*close) (MidoriPanel* panel); +}; + G_DEFINE_TYPE (MidoriPanel, midori_panel, GTK_TYPE_HBOX) enum @@ -66,7 +75,7 @@ midori_panel_get_property (GObject* object, GParamSpec* pspec); static gboolean -midori_panel_close_cb (MidoriPanel* panel) +midori_panel_close (MidoriPanel* panel) { gtk_widget_hide (GTK_WIDGET (panel)); return FALSE; @@ -127,20 +136,20 @@ midori_panel_class_init (MidoriPanelClass* class) "switch-page", G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST), - G_STRUCT_OFFSET (MidoriPanelClass, switch_page), + 0, 0, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - class->close = midori_panel_close_cb; - gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_panel_finalize; gobject_class->set_property = midori_panel_set_property; gobject_class->get_property = midori_panel_get_property; + class->close = midori_panel_close; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; g_object_class_install_property (gobject_class, @@ -343,7 +352,7 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, MidoriPanel* panel) { GtkWidget* child; - GtkToolItem* toolitem; + GtkToggleToolButton* toolitem; guint n; child = g_object_get_data (G_OBJECT (widget), "page"); @@ -351,10 +360,10 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, if (toolitem) { - /* Unset the button before setting it ensures that + /* Unsetting the button before setting it ensures that it will emit signals even if it was active before */ - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), FALSE); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); + gtk_toggle_tool_button_set_active (toolitem, FALSE); + gtk_toggle_tool_button_set_active (toolitem, TRUE); } else { @@ -382,27 +391,24 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, **/ gint midori_panel_append_page (MidoriPanel* panel, - GtkWidget* child, - GtkWidget* toolbar, - const gchar* stock_id, - const gchar* label) + MidoriPane* pane) { GtkWidget* scrolled; - GtkWidget* widget; GObjectClass* gobject_class; - guint n; + GtkWidget* widget; + GtkWidget* toolbar; + const gchar* label; + const gchar* stock_id; GtkToolItem* toolitem; GtkWidget* image; GtkWidget* menuitem; + guint n; g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); - g_return_val_if_fail (GTK_IS_WIDGET (child), -1); - g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); - g_return_val_if_fail (stock_id != NULL, -1); - g_return_val_if_fail (label != NULL, -1); + g_return_val_if_fail (MIDORI_IS_PANE (pane), -1); - if (GTK_IS_SCROLLED_WINDOW (child)) - scrolled = child; + if (GTK_IS_SCROLLED_WINDOW (pane)) + scrolled = (GtkWidget*)pane; else { scrolled = gtk_scrolled_window_new (NULL, NULL); @@ -411,36 +417,38 @@ midori_panel_append_page (MidoriPanel* panel, GTK_POLICY_AUTOMATIC); GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); gtk_widget_show (scrolled); - gobject_class = G_OBJECT_GET_CLASS (child); + gobject_class = G_OBJECT_GET_CLASS (pane); if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) - widget = child; + widget = (GtkWidget*)pane; else { widget = gtk_viewport_new (NULL, NULL); gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (widget), child); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (pane)); } gtk_container_add (GTK_CONTAINER (scrolled), widget); } gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); - if (!toolbar) - toolbar = gtk_event_box_new (); + toolbar = midori_pane_get_toolbar (pane); gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); n = midori_panel_page_num (panel, scrolled); + label = midori_pane_get_label (pane); + stock_id = midori_pane_get_stock_id (pane); - g_object_set_data (G_OBJECT (child), "label", (gchar*)label); - - toolitem = gtk_radio_tool_button_new (panel->group); + toolitem = gtk_radio_tool_button_new_from_stock (panel->group, stock_id); panel->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( - toolitem)); + toolitem)); image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); - g_object_set_data (G_OBJECT (toolitem), "page", child); + if (label) + { + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); + } + g_object_set_data (G_OBJECT (toolitem), "page", pane); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); gtk_widget_show_all (GTK_WIDGET (toolitem)); @@ -450,7 +458,7 @@ midori_panel_append_page (MidoriPanel* panel, { menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_widget_show (menuitem); - g_object_set_data (G_OBJECT (menuitem), "page", child); + g_object_set_data (G_OBJECT (menuitem), "page", pane); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), @@ -589,16 +597,153 @@ void midori_panel_set_current_page (MidoriPanel* panel, gint n) { - GtkWidget* child; + GtkWidget* pane; g_return_if_fail (MIDORI_IS_PANEL (panel)); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); - if ((child = midori_panel_get_nth_page (panel, n))) + if ((pane = midori_panel_get_nth_page (panel, n))) { - const gchar* label = g_object_get_data (G_OBJECT (child), "label"); + const gchar* label = midori_pane_get_label (MIDORI_PANE (pane)); g_object_set (panel->toolbar_label, "label", label, NULL); } } + +typedef struct +{ + GtkAlignment parent_instance; + + gchar* label; + gchar* stock_id; + GtkWidget* toolbar; +} MidoriDummyPane; + +typedef struct +{ + GtkAlignmentClass parent_class; +} MidoriDummyPaneClass; + +#define MIDORI_TYPE_DUMMY_PANE (midori_dummy_pane_get_type ()) +#define MIDORI_DUMMY_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + MIDORI_TYPE_DUMMY_PANE, MidoriDummyPane)) +#define MIDORI_IS_DUMMY_PANE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_DUMMY_PANE)) + +static void +midori_dummy_pane_iface_init (MidoriPaneIface* iface); + +static void +midori_dummy_pane_finalize (GObject* object); + +G_DEFINE_TYPE_WITH_CODE (MidoriDummyPane, midori_dummy_pane, GTK_TYPE_ALIGNMENT, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_PANE, + midori_dummy_pane_iface_init)); + +static void +midori_dummy_pane_class_init (MidoriDummyPaneClass* class) +{ + GObjectClass* gobject_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_dummy_pane_finalize; +} + +static const gchar* +midori_dummy_pane_get_label (MidoriPane* pane) +{ + return MIDORI_DUMMY_PANE (pane)->label; +} + +static const gchar* +midori_dummy_pane_get_stock_id (MidoriPane* pane) +{ + return MIDORI_DUMMY_PANE (pane)->stock_id; +} + +static GtkWidget* +midori_dummy_pane_get_toolbar (MidoriPane* pane) +{ + return MIDORI_DUMMY_PANE (pane)->toolbar; +} + +static void +midori_dummy_pane_iface_init (MidoriPaneIface* iface) +{ + iface->get_stock_id = midori_dummy_pane_get_stock_id; + iface->get_label = midori_dummy_pane_get_label; + iface->get_toolbar = midori_dummy_pane_get_toolbar; +} + +static void +midori_dummy_pane_init (MidoriDummyPane* pane) +{ + pane->stock_id = NULL; + pane->label = NULL; + pane->toolbar = NULL; +} + +static void +midori_dummy_pane_finalize (GObject* object) +{ + MidoriDummyPane* pane = MIDORI_DUMMY_PANE (object); + + katze_assign (pane->stock_id, NULL); + katze_assign (pane->label, NULL); + + G_OBJECT_CLASS (midori_dummy_pane_parent_class)->finalize (object); +} + +static GtkWidget* +midori_dummy_pane_new (const gchar* stock_id, + const gchar* label, + GtkWidget* toolbar) +{ + GtkWidget* pane = g_object_new (MIDORI_TYPE_DUMMY_PANE, NULL); + + MIDORI_DUMMY_PANE (pane)->stock_id = g_strdup (stock_id); + MIDORI_DUMMY_PANE (pane)->label = g_strdup (label); + MIDORI_DUMMY_PANE (pane)->toolbar = toolbar; + + return pane; +} + +/** + * midori_panel_append_widget: + * @panel: a #MidoriPanel + * @widget: the child widget + * @stock_id: a stock ID + * @label: a string to use as the label, or %NULL + * @toolbar: a toolbar widget, or %NULL + * + * Appends an arbitrary widget to the panel by wrapping it + * in a #MidoriPane created on the fly. + * + * Actually implementing #MidoriPane instead of using + * this convenience is recommended. + * + * In the case of an error, -1 is returned. + * + * Return value: the index of the new page, or -1 + **/ +gint +midori_panel_append_widget (MidoriPanel* panel, + GtkWidget* widget, + const gchar* stock_id, + const gchar* label, + GtkWidget* toolbar) +{ + GtkWidget* pane; + + g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); + g_return_val_if_fail (GTK_IS_WIDGET (widget), -1); + + g_return_val_if_fail (stock_id != NULL, -1); + g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); + + pane = midori_dummy_pane_new (stock_id, label, toolbar); + gtk_widget_show (pane); + gtk_container_add (GTK_CONTAINER (pane), widget); + return midori_panel_append_page (panel, MIDORI_PANE (pane)); +} diff --git a/midori/midori-panel.h b/midori/midori-panel.h index bdea460e..d03e5696 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -16,6 +16,8 @@ #include +#include "midori-pane.h" + G_BEGIN_DECLS #define MIDORI_TYPE_PANEL \ @@ -34,19 +36,6 @@ G_BEGIN_DECLS typedef struct _MidoriPanel MidoriPanel; typedef struct _MidoriPanelClass MidoriPanelClass; -struct _MidoriPanelClass -{ - GtkHBoxClass parent_class; - - /* Signals */ - gboolean - (*close) (MidoriPanel* panel); - - void - (*switch_page) (MidoriPanel* panel, - gint page); -}; - GType midori_panel_get_type (void); @@ -59,10 +48,7 @@ midori_panel_set_compact (MidoriPanel* panel, gint midori_panel_append_page (MidoriPanel* panel, - GtkWidget* child, - GtkWidget* toolbar, - const gchar* stock_id, - const gchar* label); + MidoriPane* pane); gint midori_panel_get_current_page (MidoriPanel* panel); @@ -82,6 +68,13 @@ void midori_panel_set_current_page (MidoriPanel* panel, gint n); +gint +midori_panel_append_widget (MidoriPanel* panel, + GtkWidget* widget, + const gchar* stock_id, + const gchar* label, + GtkWidget* toolbar); + G_END_DECLS #endif /* __MIDORI_PANEL_H__ */ diff --git a/midori/midori.h b/midori/midori.h index 997e37bd..9a564eb5 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -19,6 +19,7 @@ #include "midori-extension.h" #include "midori-locationaction.h" #include "midori-locationentry.h" +#include "midori-pane.h" #include "midori-panel.h" #include "midori-preferences.h" #include "midori-searchaction.h" @@ -27,4 +28,7 @@ #include "midori-view.h" #include "midori-websettings.h" +/* For convenience, include localization header */ +#include + #endif /* __MIDORI_H__ */ From 687179a747a930d3217761857274c4f825bcfe0c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 Nov 2008 23:51:10 +0100 Subject: [PATCH 0522/2970] Tab labels should adjust to the notebook orientation --- midori/midori-view.c | 106 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 101 insertions(+), 5 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 201e9ecb..6b09e13e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1699,14 +1699,103 @@ midori_view_tab_icon_style_set_cb (GtkWidget* tab_icon, } static void -midori_view_update_label_size (GtkWidget* label, - gint size) +midori_view_update_tab_title (GtkWidget* label, + gint size, + gdouble angle) { gint width; sokoke_widget_get_text_size (label, "M", &width, NULL); - gtk_widget_set_size_request (label, width * size, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + if (angle == 0.0 || angle == 360.0) + { + gtk_widget_set_size_request (label, width * size, -1); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + } + else + { + gtk_widget_set_size_request (label, -1, width * size); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_NONE); + } + gtk_label_set_angle (GTK_LABEL (label), angle); +} + +static void +gtk_box_repack (GtkBox* box, + GtkWidget* child) +{ + GtkWidget* old_box; + gboolean expand, fill; + guint padding; + GtkPackType pack_type; + + old_box = gtk_widget_get_parent (child); + g_return_if_fail (GTK_IS_BOX (old_box)); + + gtk_box_query_child_packing (GTK_BOX (old_box), child, + &expand, &fill, &padding, &pack_type); + + g_object_ref (child); + gtk_container_remove (GTK_CONTAINER (old_box), child); + if (pack_type == GTK_PACK_START) + gtk_box_pack_start (box, child, expand, fill, padding); + else + gtk_box_pack_end (box, child, expand, fill, padding); + g_object_unref (child); +} + +static void +midori_view_tab_label_parent_set (GtkWidget* tab_label, + GtkObject* old_parent, + MidoriView* view) +{ + GtkWidget* parent; + + if (old_parent) + /* FIXME: Disconnect orientation notification */; + + if (!(parent = gtk_widget_get_parent (tab_label))) + return; + + if (GTK_IS_NOTEBOOK (parent)) + { + GtkPositionType pos; + gdouble old_angle, angle; + GtkWidget* box; + + pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (parent)); + old_angle = gtk_label_get_angle (GTK_LABEL (view->tab_title)); + switch (pos) + { + case GTK_POS_LEFT: + angle = 90.0; + break; + case GTK_POS_RIGHT: + angle = 270.0; + break; + default: + angle = 0.0; + } + + if (old_angle != angle) + { + if (angle == 0.0) + box = gtk_hbox_new (FALSE, 1); + else + box = gtk_vbox_new (FALSE, 1); + gtk_box_repack (GTK_BOX (box), view->tab_icon); + gtk_box_repack (GTK_BOX (box), view->tab_title); + gtk_box_repack (GTK_BOX (box), view->tab_close); + + gtk_container_remove (GTK_CONTAINER (tab_label), + gtk_bin_get_child (GTK_BIN (tab_label))); + gtk_container_add (GTK_CONTAINER (tab_label), GTK_WIDGET (box)); + gtk_widget_show (box); + } + + midori_view_update_tab_title (view->tab_title, 10, angle); + + /* FIXME: Connect orientation notification */ + } } /** @@ -1716,6 +1805,9 @@ midori_view_update_label_size (GtkWidget* label, * Retrieves a proxy tab label that is typically used when * adding the view to a notebook. * + * Note that the label actually adjusts its orientation + * to the according tab position when used in a notebook. + * * The label is created on the first call and will be updated to reflect * changes of the loading progress and title. * @@ -1747,7 +1839,7 @@ midori_view_get_proxy_tab_label (MidoriView* view) gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE); hbox = gtk_hbox_new (FALSE, 1); gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (hbox)); - midori_view_update_label_size (view->tab_title, 10); + midori_view_update_tab_title (view->tab_title, 10, 0.0); view->tab_close = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (view->tab_close), GTK_RELIEF_NONE); @@ -1788,6 +1880,10 @@ midori_view_get_proxy_tab_label (MidoriView* view) g_signal_connect (view->tab_label, "destroy", G_CALLBACK (gtk_widget_destroyed), &view->tab_label); + + g_signal_connect (view->tab_label, "parent-set", + G_CALLBACK (midori_view_tab_label_parent_set), + view); } return view->tab_label; } From 11d67dc326ac315b343a3264c18c021c42310523 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 Nov 2008 23:53:54 +0100 Subject: [PATCH 0523/2970] Reimplement the page holder as an extension --- extensions/page-holder.c | 154 +++++++++ po/POTFILES.in | 2 + po/midori.pot | 687 +++++++++++++++++++-------------------- 3 files changed, 491 insertions(+), 352 deletions(-) create mode 100644 extensions/page-holder.c diff --git a/extensions/page-holder.c b/extensions/page-holder.c new file mode 100644 index 00000000..b396b059 --- /dev/null +++ b/extensions/page-holder.c @@ -0,0 +1,154 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +#define STOCK_PAGE_HOLDER "page-holder" + +static gint +page_holder_notebook_append_view (GtkWidget* notebook) +{ + GtkWidget* view; + MidoriBrowser* browser; + GtkWidget* label; + + view = midori_view_new (NULL); + browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); + midori_view_set_settings (MIDORI_VIEW (view), + MIDORI_WEB_SETTINGS (katze_object_get_object (browser, "settings"))); + gtk_widget_show (view); + label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); + return gtk_notebook_append_page (GTK_NOTEBOOK (notebook), view, label); +} + +static void +page_holder_button_jump_to_clicked_cb (GtkWidget* button, + GtkWidget* notebook) +{ + gint n; + MidoriBrowser* browser; + const gchar* uri; + GtkWidget* view; + + n = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)); + if (n < 0) + n = page_holder_notebook_append_view (notebook); + + browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); + uri = midori_browser_get_current_uri (browser); + view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), n); + midori_view_set_uri (MIDORI_VIEW (view), uri); +} + +static void +page_holder_button_add_clicked_cb (GtkWidget* button, + GtkWidget* notebook) +{ + gint n; + GtkWidget* view; + MidoriBrowser* browser; + const gchar* uri; + + n = page_holder_notebook_append_view (notebook); + view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), n); + browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); + uri = midori_browser_get_current_uri (browser); + midori_view_set_uri (MIDORI_VIEW (view), uri); +} + +static void +page_holder_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + GtkWidget* panel; + GtkWidget* notebook; + GtkWidget* toolbar; + GtkToolItem* toolitem; + + panel = katze_object_get_object (browser, "panel"); + notebook = gtk_notebook_new (); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_RIGHT); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); + gtk_widget_show (notebook); + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + gtk_widget_show (toolbar); + + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (page_holder_button_jump_to_clicked_cb), notebook); + gtk_widget_show (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); + gtk_tool_item_set_expand (toolitem, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (page_holder_button_add_clicked_cb), notebook); + gtk_widget_show (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + + midori_panel_append_widget (MIDORI_PANEL (panel), notebook, + /* i18n: A panel showing a user specified web page */ + STOCK_PAGE_HOLDER, _("Pageholder"), toolbar); +} + +static void +page_holder_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + g_signal_connect (app, "add-browser", + G_CALLBACK (page_holder_app_add_browser_cb), extension); +} + +MidoriExtension* +extension_init (void) +{ + GtkIconFactory* factory; + GtkIconSource* icon_source; + GtkIconSet* icon_set; + static GtkStockItem items[] = + { + { STOCK_PAGE_HOLDER, N_("_Pageholder"), 0, 0, NULL }, + }; + + factory = gtk_icon_factory_new (); + gtk_stock_add (items, G_N_ELEMENTS (items)); + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, GTK_STOCK_ORIENTATION_PORTRAIT); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, STOCK_PAGE_HOLDER, icon_set); + gtk_icon_set_unref (icon_set); + gtk_icon_factory_add_default (factory); + g_object_unref (factory); + + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Pageholder"), + "description", "", + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + + g_signal_connect (extension, "activate", + G_CALLBACK (page_holder_activate_cb), NULL); + + return extension; +} diff --git a/po/POTFILES.in b/po/POTFILES.in index 7552c1a2..7171a765 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -20,3 +20,5 @@ katze/katze-item.c katze/katze-list.c katze/katze-array.c katze/katze-arrayaction.c +extensions/page-holder.c +extensions/statusbar-features.c diff --git a/po/midori.pot b/po/midori.pot index c99b908d..e11e764c 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 0.1.0\n" +"Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-10 20:53+0100\n" +"POT-Creation-Date: 2008-11-25 23:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../midori.desktop.in.h:2 ../midori/main.c:1093 ../midori/main.c:1102 -#: ../midori/main.c:1113 ../midori/main.c:1137 +#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 +#: ../midori/main.c:1161 ../midori/main.c:1185 msgid "Midori" msgstr "" @@ -29,1134 +29,1108 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:73 +#: ../midori/main.c:81 msgid "_Bookmark" msgstr "" -#: ../midori/main.c:74 ../midori/midori-browser.c:3757 +#: ../midori/main.c:82 ../midori/midori-browser.c:3719 msgid "_Bookmarks" msgstr "" -#: ../midori/main.c:75 +#: ../midori/main.c:83 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:76 +#: ../midori/main.c:84 msgid "_Console" msgstr "" -#: ../midori/main.c:77 +#: ../midori/main.c:85 msgid "_Extensions" msgstr "" -#: ../midori/main.c:78 +#: ../midori/main.c:86 msgid "_History" msgstr "" -#: ../midori/main.c:79 +#: ../midori/main.c:87 msgid "_Homepage" msgstr "" -#: ../midori/main.c:80 -msgid "_Pageholder" -msgstr "" - -#: ../midori/main.c:81 +#: ../midori/main.c:88 msgid "_Userscripts" msgstr "" -#: ../midori/main.c:82 +#: ../midori/main.c:89 msgid "User_styles" msgstr "" -#: ../midori/main.c:83 +#: ../midori/main.c:90 msgid "New _Tab" msgstr "" -#: ../midori/main.c:84 +#: ../midori/main.c:91 msgid "_Transfers" msgstr "" -#: ../midori/main.c:85 +#: ../midori/main.c:92 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/main.c:86 +#: ../midori/main.c:93 msgid "New _Window" msgstr "" -#: ../midori/main.c:131 +#: ../midori/main.c:138 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:186 +#: ../midori/main.c:193 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:193 ../midori/main.c:263 +#: ../midori/main.c:200 ../midori/main.c:270 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:522 ../midori/main.c:530 ../midori/main.c:560 -#: ../midori/main.c:569 -msgid "Malformed document." -msgstr "" - -#: ../midori/main.c:552 +#: ../midori/main.c:527 msgid "File not found." msgstr "" -#: ../midori/main.c:590 ../midori/main.c:622 +#: ../midori/main.c:535 ../midori/main.c:544 +msgid "Malformed document." +msgstr "" + +#: ../midori/main.c:566 ../midori/main.c:598 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:676 +#: ../midori/main.c:652 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:700 +#: ../midori/main.c:676 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:733 ../midori/main.c:747 +#: ../midori/main.c:709 ../midori/main.c:723 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:863 +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:995 ../midori/sokoke.c:457 +#: ../midori/main.c:971 ../midori/sokoke.c:457 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1020 +#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "" + +#: ../midori/main.c:1024 +msgid "Console" +msgstr "" + +#: ../midori/main.c:1034 ../midori/midori-addons.c:88 +msgid "Userscripts" +msgstr "" + +#: ../midori/main.c:1042 ../midori/midori-addons.c:89 +msgid "Userstyles" +msgstr "" + +#: ../midori/main.c:1051 +msgid "Extensions" +msgstr "" + +#: ../midori/main.c:1071 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1052 +#: ../midori/main.c:1100 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1054 +#: ../midori/main.c:1102 msgid "Display program version" msgstr "" -#: ../midori/main.c:1056 +#: ../midori/main.c:1104 msgid "URIs" msgstr "" -#: ../midori/main.c:1090 +#: ../midori/main.c:1138 msgid "[URIs]" msgstr "" -#: ../midori/main.c:1114 +#: ../midori/main.c:1162 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1116 +#: ../midori/main.c:1164 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1137 +#: ../midori/main.c:1185 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1154 +#: ../midori/main.c:1202 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1189 +#: ../midori/main.c:1238 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1203 +#: ../midori/main.c:1254 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1215 +#: ../midori/main.c:1268 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1228 +#: ../midori/main.c:1282 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1241 +#: ../midori/main.c:1295 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1400 +#: ../midori/main.c:1479 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1410 +#: ../midori/main.c:1489 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1419 +#: ../midori/main.c:1498 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1427 +#: ../midori/main.c:1506 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 msgid "None" msgstr "" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3995 -msgid "Extensions" -msgstr "" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3978 -msgid "Userscripts" -msgstr "" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3986 -msgid "Userstyles" -msgstr "" - -#: ../midori/midori-addons.c:1043 +#: ../midori/midori-addons.c:964 msgid "_Enable" msgstr "" -#: ../midori/midori-addons.c:1052 +#: ../midori/midori-addons.c:973 msgid "_Disable" msgstr "" -#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3138 -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3112 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:533 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:546 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "" -#: ../midori/midori-browser.c:581 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "" -#: ../midori/midori-browser.c:664 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1246 +#: ../midori/midori-browser.c:1224 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2316 +#: ../midori/midori-browser.c:2304 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2306 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2590 +#: ../midori/midori-browser.c:2577 msgid "Separator" msgstr "" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:2688 #, c-format msgid "A week ago" msgstr "" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:2694 #, c-format msgid "%d days ago" msgstr "" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2701 msgid "Today" msgstr "" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:2703 msgid "Yesterday" msgstr "" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2792 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2814 +#: ../midori/midori-browser.c:2800 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2966 +#: ../midori/midori-browser.c:2934 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3040 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3043 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3046 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3049 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3052 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3054 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3055 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3057 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3058 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3061 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3064 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3066 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3069 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3104 ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3078 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3081 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3084 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3087 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3089 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3090 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3092 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3093 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3096 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3097 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3100 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3102 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3103 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3115 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3118 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3153 +#: ../midori/midori-browser.c:3121 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3155 ../midori/midori-view.c:969 +#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3124 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3126 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3127 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3131 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3133 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3136 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3139 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3142 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3176 -msgid "Open in Page_holder..." -msgstr "" - -#: ../midori/midori-browser.c:3177 -msgid "Open the current page in the pageholder" -msgstr "" - -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3144 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3145 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3182 ../midori/midori-view.c:941 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3148 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3152 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3155 msgid "Edit the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3158 msgid "Delete the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3164 msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3167 msgid "Bookmark the selected history item" msgstr "" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3169 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3206 ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3172 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3176 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3177 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3179 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3180 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3182 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3184 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3185 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3187 msgid "_Frequent questions" msgstr "" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3188 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3190 msgid "_Report a bug" msgstr "" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3191 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3194 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3201 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3202 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3207 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3208 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3211 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3212 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3215 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3216 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3219 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3220 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3223 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3224 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3227 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3228 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3680 +#: ../midori/midori-browser.c:3644 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3682 +#: ../midori/midori-browser.c:3646 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3670 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3708 +#: ../midori/midori-browser.c:3672 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3691 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3741 +#: ../midori/midori-browser.c:3704 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:3706 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3721 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:3734 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3775 +#: ../midori/midori-browser.c:3736 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3858 msgid "Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3906 ../midori/midori-preferences.c:348 -msgid "Transfers" -msgstr "" - -#: ../midori/midori-browser.c:3915 -msgid "Console" -msgstr "" - -#: ../midori/midori-browser.c:3959 ../midori/midori-preferences.c:519 +#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 msgid "History" msgstr "" -#. i18n: A panel showing a user specified web page -#: ../midori/midori-browser.c:3969 -msgid "Pageholder" -msgstr "" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:3944 msgid "_Inline find:" msgstr "" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:3979 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:3987 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4090 +#: ../midori/midori-browser.c:3996 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4237 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1559 +#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:246 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:254 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:272 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:283 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:291 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:292 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:299 -msgid "Last pageholder URI" -msgstr "" - -#: ../midori/midori-websettings.c:300 -msgid "The URI last opened in the pageholder" -msgstr "" - -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:301 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:302 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:310 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:311 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:319 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:320 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:328 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:329 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:337 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:338 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:347 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:348 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:357 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:358 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:366 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:367 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:376 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:377 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:387 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:395 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:396 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:404 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:405 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:413 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:414 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:422 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:423 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:431 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:432 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:442 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:443 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:451 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:452 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:460 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:461 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:470 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:471 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:480 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:481 msgid "Load an URL from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:489 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:490 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:498 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:499 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:507 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:508 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:518 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:519 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:528 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:529 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:537 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:538 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:548 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:549 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:557 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:558 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:566 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:567 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:575 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:576 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:586 msgid "HTTP Proxy" msgstr "" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:587 msgid "The proxy used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:595 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:596 msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-view.c:873 +#: ../midori/midori-view.c:818 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:896 +#: ../midori/midori-view.c:841 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:904 +#: ../midori/midori-view.c:849 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:926 +#: ../midori/midori-view.c:871 msgid "Open URL in New _Tab" msgstr "" -#: ../midori/midori-view.c:1293 +#: ../midori/midori-view.c:1237 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1431 +#: ../midori/midori-view.c:1375 msgid "Source" msgstr "" @@ -1166,127 +1140,127 @@ msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:389 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:412 +#: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:426 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:431 msgid "Enable developer tools" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:441 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:442 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:457 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:482 ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:496 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:502 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:504 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "" @@ -1294,7 +1268,7 @@ msgstr "" msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:280 msgid "Warning: You are using a superuser account!" msgstr "" @@ -1331,15 +1305,24 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:156 ../katze/katze-utils.c:347 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:219 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:200 msgid "Choose folder" msgstr "" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "" From 2bc42bfd8d04f7eabd0f00026162ba99b670f9f8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 Nov 2008 23:55:54 +0100 Subject: [PATCH 0524/2970] Remove the page holder from the core --- katze/katze-array.c | 2 +- midori/main.c | 3 +-- midori/midori-browser.c | 39 ------------------------------------- midori/midori-stock.h | 1 - midori/midori-websettings.c | 17 ---------------- 5 files changed, 2 insertions(+), 60 deletions(-) diff --git a/katze/katze-array.c b/katze/katze-array.c index c62121e4..66dfcc0c 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -226,7 +226,7 @@ katze_array_is_empty (KatzeArray* array) } /** - * katze_array_get_item_position: + * katze_array_get_item_index: * @array: a #KatzeArray * @item: an item in the array * diff --git a/midori/main.c b/midori/main.c index a1aaf560..2d042d71 100644 --- a/midori/main.c +++ b/midori/main.c @@ -85,7 +85,6 @@ stock_items_init (void) { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, - { STOCK_PAGE_HOLDER, N_("_Pageholder"), 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, @@ -1049,7 +1048,7 @@ midori_app_add_browser_cb (MidoriApp* app, toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); gtk_widget_show (toolbar); midori_panel_append_page (MIDORI_PANEL (panel), addon, - STOCK_EXTENSIONS, _("_Extensions"), toolbar); + STOCK_EXTENSIONS, _("Extensions"), toolbar); #endif } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7abdbc09..cf46217e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -52,7 +52,6 @@ struct _MidoriBrowser GtkWidget* panel; GtkWidget* panel_bookmarks; GtkWidget* panel_history; - GtkWidget* panel_pageholder; GtkWidget* notebook; GtkWidget* inspector; @@ -2845,25 +2844,6 @@ _action_panel_activate (GtkToggleAction* action, sokoke_widget_set_visible (browser->panel, active); } -static void -_action_open_in_panel_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view; - const gchar* uri; - gint n; - - view = midori_browser_get_current_tab (browser); - uri = midori_view_get_display_uri (MIDORI_VIEW (view)); - /* FIXME: Don't assign the uri here, update it properly while navigating */ - g_object_set (browser->settings, "last-pageholder-uri", uri, NULL); - n = midori_panel_page_num (MIDORI_PANEL (browser->panel), - browser->panel_pageholder); - midori_panel_set_current_page (MIDORI_PANEL (browser->panel), n); - gtk_widget_show (browser->panel); - midori_view_set_uri (MIDORI_VIEW (browser->panel_pageholder), uri); -} - static void midori_panel_notify_position_cb (GObject* object, GParamSpec* arg1, @@ -3160,9 +3140,6 @@ static const GtkActionEntry entries[] = { { "Homepage", STOCK_HOMEPAGE, NULL, "Home", N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, - { "OpenInPageholder", GTK_STOCK_JUMP_TO, - N_("Open in Page_holder..."), "", - N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, @@ -3360,7 +3337,6 @@ static const gchar* ui_markup = "" "" "" - "" "" /* "" */ "" @@ -3924,16 +3900,6 @@ midori_browser_init (MidoriBrowser* browser) midori_panel_append_widget (MIDORI_PANEL (browser->panel), box, STOCK_HISTORY, _("History"), toolbar); - /* Pageholder */ - browser->panel_pageholder = midori_view_new (browser->net); - midori_view_set_settings (MIDORI_VIEW (browser->panel_pageholder), - browser->settings); - gtk_widget_show (browser->panel_pageholder); - midori_panel_append_widget (MIDORI_PANEL (browser->panel), - browser->panel_pageholder, - /* i18n: A panel showing a user specified web page */ - STOCK_PAGE_HOLDER, _("Pageholder"), NULL); - /* Notebook, containing all views */ vpaned = gtk_vpaned_new (); gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); @@ -4181,7 +4147,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) MidoriToolbarStyle toolbar_style; gchar* toolbar_items; gint last_web_search; - gchar* last_pageholder_uri; gboolean close_buttons_on_tabs; GdkScreen* screen; gint default_width, default_height; @@ -4202,7 +4167,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, - "last-pageholder-uri", &last_pageholder_uri, "close-buttons-on-tabs", &close_buttons_on_tabs, NULL); @@ -4237,8 +4201,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); - midori_view_set_uri (MIDORI_VIEW (browser->panel_pageholder), - last_pageholder_uri); _action_set_active (browser, "Menubar", show_menubar); _action_set_active (browser, "Navigationbar", show_navigationbar); @@ -4247,7 +4209,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Statusbar", show_statusbar); g_free (toolbar_items); - g_free (last_pageholder_uri); } static void diff --git a/midori/midori-stock.h b/midori/midori-stock.h index d1b1d6c9..36bb2129 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -26,7 +26,6 @@ #define STOCK_EXTENSIONS "extension" #define STOCK_HISTORY "document-open-recent" #define STOCK_NEWS_FEED "news-feed" -#define STOCK_PAGE_HOLDER GTK_STOCK_ORIENTATION_PORTRAIT #define STOCK_STYLE "gnome-settings-theme" #define STOCK_STYLES "gnome-settings-theme" #define STOCK_TRANSFER "package" diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index e5487104..42eb570d 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -26,7 +26,6 @@ struct _MidoriWebSettings gint last_panel_position; gint last_panel_page; gint last_web_search; - gchar* last_pageholder_uri; gboolean show_menubar; gboolean show_navigationbar; @@ -80,7 +79,6 @@ enum PROP_LAST_PANEL_POSITION, PROP_LAST_PANEL_PAGE, PROP_LAST_WEB_SEARCH, - PROP_LAST_PAGEHOLDER_URI, PROP_SHOW_MENUBAR, PROP_SHOW_NAVIGATIONBAR, @@ -295,15 +293,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) 0, G_MAXINT, 0, flags)); - g_object_class_install_property (gobject_class, - PROP_LAST_PAGEHOLDER_URI, - g_param_spec_string ( - "last-pageholder-uri", - _("Last pageholder URI"), - _("The URI last opened in the pageholder"), - "", - flags)); - g_object_class_install_property (gobject_class, PROP_SHOW_MENUBAR, @@ -679,9 +668,6 @@ midori_web_settings_set_property (GObject* object, case PROP_LAST_WEB_SEARCH: web_settings->last_web_search = g_value_get_int (value); break; - case PROP_LAST_PAGEHOLDER_URI: - katze_assign (web_settings->last_pageholder_uri, g_value_dup_string (value)); - break; case PROP_SHOW_MENUBAR: web_settings->show_menubar = g_value_get_boolean (value); @@ -839,9 +825,6 @@ midori_web_settings_get_property (GObject* object, case PROP_LAST_WEB_SEARCH: g_value_set_int (value, web_settings->last_web_search); break; - case PROP_LAST_PAGEHOLDER_URI: - g_value_set_string (value, web_settings->last_pageholder_uri); - break; case PROP_SHOW_MENUBAR: g_value_set_boolean (value, web_settings->show_menubar); From 30572a2b73eb102c041d4e239e51e599c1b6dc27 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 28 Nov 2008 23:56:30 +0100 Subject: [PATCH 0525/2970] Add API to extensions for deactivating and configuration --- midori/midori-extension.c | 88 +++++++++++++++++++++++++++++++++++++++ midori/midori-extension.h | 10 ++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 553292bd..3aadeebb 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -11,6 +11,10 @@ #include "midori-extension.h" +#if HAVE_CONFIG_H + #include +#endif + #include "midori-app.h" #include @@ -23,6 +27,8 @@ struct _MidoriExtensionPrivate gchar* description; gchar* version; gchar* authors; + + gchar* config_dir; }; enum @@ -37,6 +43,7 @@ enum enum { ACTIVATE, + DEACTIVATE, LAST_SIGNAL }; @@ -75,6 +82,17 @@ midori_extension_class_init (MidoriExtensionClass* class) G_TYPE_NONE, 1, MIDORI_TYPE_APP); + signals[DEACTIVATE] = g_signal_new ( + "deactivate", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, + G_TYPE_NONE); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_extension_finalize; gobject_class->set_property = midori_extension_set_property; @@ -126,6 +144,8 @@ midori_extension_init (MidoriExtension* extension) { extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (extension, MIDORI_TYPE_EXTENSION, MidoriExtensionPrivate); + + extension->priv->config_dir = NULL; } static void @@ -137,6 +157,8 @@ midori_extension_finalize (GObject* object) katze_assign (extension->priv->description, NULL); katze_assign (extension->priv->version, NULL); katze_assign (extension->priv->authors, NULL); + + katze_assign (extension->priv->config_dir, NULL); } static void @@ -194,3 +216,69 @@ midori_extension_get_property (GObject* object, break; } } + +/** + * midori_extension_is_prepared: + * @extension: a #MidoriExtension + * + * Determines if @extension is prepared for use, for instance + * by ensuring that all required values are set and that it + * is actually activatable. + * + * Return value: %TRUE if @extension is ready for use + **/ +gboolean +midori_extension_is_prepared (MidoriExtension* extension) +{ + g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), FALSE); + + if (extension->priv->name && extension->priv->description + && extension->priv->version && extension->priv->authors + && g_signal_has_handler_pending (extension, signals[ACTIVATE], 0, FALSE)) + return TRUE; + return FALSE; +} + +/** + * midori_extension_deactivate: + * @extension: a #MidoriExtension + * + * Attempts to deactivate @extension in a way that the instance + * is actually finished irreversibly. + **/ +void +midori_extension_deactivate (MidoriExtension* extension) +{ + g_return_if_fail (MIDORI_IS_EXTENSION (extension)); + + g_signal_emit (extension, signals[DEACTIVATE], 0); + g_signal_handlers_destroy (extension); + g_object_run_dispose (G_OBJECT (extension)); +} + +/** + * midori_extension_get_config_dir: + * @extension: a #MidoriExtension + * + * Retrieves the path to a directory reserved for configuration + * files specific to the extension. For that purpose the 'name' + * of the extension is actually part of the path. + * + * The path is actually created if it doesn't already exist. + * + * Return value: a path, such as ~/.config/midori/extensions/name + **/ +const gchar* +midori_extension_get_config_dir (MidoriExtension* extension) +{ + g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), NULL); + g_return_val_if_fail (midori_extension_is_prepared (extension), NULL); + + if (!extension->priv->config_dir) + extension->priv->config_dir = g_build_filename ( + g_get_user_config_dir (), PACKAGE_NAME, "extensions", + extension->priv->name, NULL); + + g_mkdir_with_parents (extension->priv->config_dir, 0700); + return extension->priv->config_dir; +} diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 7bf9e2f6..7f13d5de 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -48,8 +48,14 @@ struct _MidoriExtensionClass GType midori_extension_get_type (void); -/* There is no API for MidoriExtension. Please use the - available properties and signals. */ +gboolean +midori_extension_is_prepared (MidoriExtension* extension); + +void +midori_extension_deactivate (MidoriExtension* extension); + +const gchar* +midori_extension_get_config_dir (MidoriExtension* extension); G_END_DECLS From 417493caa3e4542bfa16c080d0ea41a8ff7b3148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 29 Nov 2008 00:16:57 +0100 Subject: [PATCH 0526/2970] Don't use grep in sokoke_get_desktop and fix memory leaks --- katze/katze-utils.c | 6 ++---- midori/midori-preferences.c | 2 +- midori/sokoke.c | 12 +++++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 6d2d9359..03788b8a 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -59,14 +59,13 @@ proxy_combo_box_text_changed_cb (GtkComboBox* button, GObject* object) return FALSE; } -static gboolean +static void proxy_entry_activate_cb (GtkEntry* entry, GObject* object) { const gchar* text = gtk_entry_get_text (entry); const gchar* property = g_object_get_data (G_OBJECT (entry), "property"); g_object_set (object, property, text, NULL); - return FALSE; } static gboolean @@ -99,13 +98,12 @@ proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) return FALSE; } -static gchar* +static void proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) { gint value = gtk_combo_box_get_active (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); g_object_set (object, property, value, NULL); - return FALSE; } /** diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 58791794..aed94c62 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -100,7 +100,7 @@ midori_preferences_init (MidoriPreferences* preferences) g_signal_connect (preferences, "response", G_CALLBACK (midori_preferences_response_cb), NULL); - /* TODO: Do we want tooltips for explainations or can we omit that? */ + /* TODO: Do we want tooltips for explanations or can we omit that? */ g_free (dialog_title); } diff --git a/midori/sokoke.c b/midori/sokoke.c index 2822f5a2..970b54bd 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -212,14 +212,15 @@ sokoke_get_desktop (void) if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) { /* Are we running in Xfce? */ - gint result; gchar* out; gchar* err; - gboolean success = g_spawn_command_line_sync ( - "xprop -root _DT_SAVE_MODE | grep -q xfce4", - &out, &err, &result, NULL); - if (success && !result) + gint result; + gchar *out = NULL; + gboolean success = g_spawn_command_line_sync ("xprop -root _DT_SAVE_MODE", + &out, NULL, &result, NULL); + if (success && ! result && out != NULL && strstr(out, "xfce4") != NULL) desktop = SOKOKE_DESKTOP_XFCE; else desktop = SOKOKE_DESKTOP_UNKNOWN; + g_free(out); } return desktop; @@ -258,6 +259,7 @@ sokoke_xfce_header_new (const gchar* icon, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER (xfce_heading), hbox); g_free (markup); + gtk_widget_destroy(entry); return xfce_heading; } return NULL; From 9b24d58553c34c00d8c2a726b3082d4de6b34e23 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 29 Nov 2008 16:45:24 +0100 Subject: [PATCH 0527/2970] Rename MidoriPane to MidoriView and add protocol support --- midori/midori-pane.c | 131 ------------------- midori/midori-pane.h | 62 --------- midori/midori-panel.c | 131 +++++++++---------- midori/midori-panel.h | 4 +- midori/midori-viewable.c | 266 +++++++++++++++++++++++++++++++++++++++ midori/midori-viewable.h | 73 +++++++++++ midori/midori.h | 2 +- 7 files changed, 409 insertions(+), 260 deletions(-) delete mode 100644 midori/midori-pane.c delete mode 100644 midori/midori-pane.h create mode 100644 midori/midori-viewable.c create mode 100644 midori/midori-viewable.h diff --git a/midori/midori-pane.c b/midori/midori-pane.c deleted file mode 100644 index 0817efab..00000000 --- a/midori/midori-pane.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "midori-pane.h" - -#include - -struct _MidoriPane -{ - GtkHBox parent_instance; -}; - -static void -midori_pane_base_init (MidoriPaneIface* iface); - -GType -midori_pane_get_type (void) -{ - static GType pane_type = 0; - - if (!pane_type) - { - const GTypeInfo pane_info = - { - sizeof (MidoriPaneIface), - (GBaseInitFunc) midori_pane_base_init, - (GBaseFinalizeFunc) NULL, - }; - - pane_type = g_type_register_static (G_TYPE_INTERFACE, - "MidoriPane", - &pane_info, 0); - g_type_interface_add_prerequisite (pane_type, GTK_TYPE_WIDGET); - } - - return pane_type; -} - -static const gchar* -midori_pane_default_get_stock_id (MidoriPane* pane) -{ - return NULL; -} - -static const gchar* -midori_pane_default_get_label (MidoriPane* pane) -{ - return NULL; -} - -static GtkWidget* -midori_pane_default_get_toolbar (MidoriPane* pane) -{ - return NULL; -} - -static void -midori_pane_base_init (MidoriPaneIface* iface) -{ - static gboolean initialized = FALSE; - - if (initialized) - return; - - iface->get_stock_id = midori_pane_default_get_stock_id; - iface->get_label = midori_pane_default_get_label; - iface->get_toolbar = midori_pane_default_get_toolbar; - - initialized = TRUE; -} - -/** - * midori_pane_get_stock_id: - * @pane: a #MidoriPane - * - * Retrieves the stock ID of the pane. - * - * Return value: a stock ID - **/ -const gchar* -midori_pane_get_stock_id (MidoriPane* pane) -{ - g_return_val_if_fail (MIDORI_IS_PANE (pane), NULL); - - return MIDORI_PANE_GET_IFACE (pane)->get_stock_id (pane); -} - -/** - * midori_pane_get_label: - * @pane: a #MidoriPane - * - * Retrieves the label of the pane. - * - * Return value: a label string - **/ -const gchar* -midori_pane_get_label (MidoriPane* pane) -{ - g_return_val_if_fail (MIDORI_IS_PANE (pane), NULL); - - return MIDORI_PANE_GET_IFACE (pane)->get_label (pane); -} - -/** - * midori_pane_get_toolbar: - * @pane: a #MidoriPane - * - * Retrieves the toolbar of the pane. - * - * Return value: a toolbar - **/ -GtkWidget* -midori_pane_get_toolbar (MidoriPane* pane) -{ - GtkWidget* toolbar; - - g_return_val_if_fail (MIDORI_IS_PANE (pane), NULL); - - toolbar = MIDORI_PANE_GET_IFACE (pane)->get_toolbar (pane); - if (!toolbar) - toolbar = gtk_event_box_new (); - return toolbar; -} diff --git a/midori/midori-pane.h b/midori/midori-pane.h deleted file mode 100644 index 78ccb045..00000000 --- a/midori/midori-pane.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_PANE_H__ -#define __MIDORI_PANE_H__ - -#include - -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_PANE \ - (midori_pane_get_type ()) -#define MIDORI_PANE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PANE, MidoriPane)) -#define MIDORI_IS_PANE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PANE)) -#define MIDORI_PANE_GET_IFACE(inst) \ - (G_TYPE_INSTANCE_GET_INTERFACE ((inst), MIDORI_TYPE_PANE, MidoriPaneIface)) - -typedef struct _MidoriPane MidoriPane; -typedef struct _MidoriPaneIface MidoriPaneIface; - -struct _MidoriPaneIface -{ - GTypeInterface base_iface; - - /* Virtual functions */ - const gchar* - (*get_stock_id) (MidoriPane* pane); - - const gchar* - (*get_label) (MidoriPane* pane); - - GtkWidget* - (*get_toolbar) (MidoriPane* pane); -}; - -GType -midori_pane_get_type (void); - -const gchar* -midori_pane_get_stock_id (MidoriPane* pane); - -const gchar* -midori_pane_get_label (MidoriPane* pane); - -GtkWidget* -midori_pane_get_toolbar (MidoriPane* pane); - -G_END_DECLS - -#endif /* __MIDORI_PANE_H__ */ diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 405e80a5..9794d257 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -377,21 +377,21 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, /** * midori_panel_append_page: * @panel: a #MidoriPanel - * @child: the child widget + * @viewable: a viewable widget * @toolbar: a toolbar widget, or %NULL * @stock_id: a stock ID * @label: a string to use as the label * * Appends a new page to the panel. If @toolbar is specified it will - * be packed above @child. + * be packed above @viewable. * * In the case of an error, -1 is returned. * * Return value: the index of the new page, or -1 **/ gint -midori_panel_append_page (MidoriPanel* panel, - MidoriPane* pane) +midori_panel_append_page (MidoriPanel* panel, + MidoriViewable* viewable) { GtkWidget* scrolled; GObjectClass* gobject_class; @@ -405,10 +405,10 @@ midori_panel_append_page (MidoriPanel* panel, guint n; g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); - g_return_val_if_fail (MIDORI_IS_PANE (pane), -1); + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), -1); - if (GTK_IS_SCROLLED_WINDOW (pane)) - scrolled = (GtkWidget*)pane; + if (GTK_IS_SCROLLED_WINDOW (viewable)) + scrolled = (GtkWidget*)viewable; else { scrolled = gtk_scrolled_window_new (NULL, NULL); @@ -417,26 +417,26 @@ midori_panel_append_page (MidoriPanel* panel, GTK_POLICY_AUTOMATIC); GTK_WIDGET_SET_FLAGS (scrolled, GTK_CAN_FOCUS); gtk_widget_show (scrolled); - gobject_class = G_OBJECT_GET_CLASS (pane); + gobject_class = G_OBJECT_GET_CLASS (viewable); if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal) - widget = (GtkWidget*)pane; + widget = (GtkWidget*)viewable; else { widget = gtk_viewport_new (NULL, NULL); gtk_widget_show (widget); - gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (pane)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (viewable)); } gtk_container_add (GTK_CONTAINER (scrolled), widget); } gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); - toolbar = midori_pane_get_toolbar (pane); + toolbar = midori_viewable_get_toolbar (viewable); gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); n = midori_panel_page_num (panel, scrolled); - label = midori_pane_get_label (pane); - stock_id = midori_pane_get_stock_id (pane); + label = midori_viewable_get_label (viewable); + stock_id = midori_viewable_get_stock_id (viewable); toolitem = gtk_radio_tool_button_new_from_stock (panel->group, stock_id); panel->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( @@ -448,7 +448,7 @@ midori_panel_append_page (MidoriPanel* panel, gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); } - g_object_set_data (G_OBJECT (toolitem), "page", pane); + g_object_set_data (G_OBJECT (toolitem), "page", viewable); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_panel_menu_item_activate_cb), panel); gtk_widget_show_all (GTK_WIDGET (toolitem)); @@ -458,7 +458,7 @@ midori_panel_append_page (MidoriPanel* panel, { menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_widget_show (menuitem); - g_object_set_data (G_OBJECT (menuitem), "page", pane); + g_object_set_data (G_OBJECT (menuitem), "page", viewable); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), @@ -597,16 +597,18 @@ void midori_panel_set_current_page (MidoriPanel* panel, gint n) { - GtkWidget* pane; + GtkWidget* viewable; g_return_if_fail (MIDORI_IS_PANEL (panel)); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); - if ((pane = midori_panel_get_nth_page (panel, n))) + if ((viewable = midori_panel_get_nth_page (panel, n))) { - const gchar* label = midori_pane_get_label (MIDORI_PANE (pane)); + const gchar* label; + + label = midori_viewable_get_label (MIDORI_VIEWABLE (viewable)); g_object_set (panel->toolbar_label, "label", label, NULL); } } @@ -618,95 +620,96 @@ typedef struct gchar* label; gchar* stock_id; GtkWidget* toolbar; -} MidoriDummyPane; +} MidoriDummyViewable; typedef struct { GtkAlignmentClass parent_class; -} MidoriDummyPaneClass; +} MidoriDummyViewableClass; -#define MIDORI_TYPE_DUMMY_PANE (midori_dummy_pane_get_type ()) -#define MIDORI_DUMMY_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - MIDORI_TYPE_DUMMY_PANE, MidoriDummyPane)) -#define MIDORI_IS_DUMMY_PANE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_DUMMY_PANE)) +#define MIDORI_TYPE_DUMMY_VIEWABLE (midori_dummy_viewable_get_type ()) +#define MIDORI_DUMMY_VIEWABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + MIDORI_TYPE_DUMMY_VIEWABLE, MidoriDummyViewable)) +#define MIDORI_IS_DUMMY_VIEWABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_DUMMY_VIEWABLE)) static void -midori_dummy_pane_iface_init (MidoriPaneIface* iface); +midori_dummy_viewable_iface_init (MidoriViewableIface* iface); static void -midori_dummy_pane_finalize (GObject* object); +midori_dummy_viewable_finalize (GObject* object); -G_DEFINE_TYPE_WITH_CODE (MidoriDummyPane, midori_dummy_pane, GTK_TYPE_ALIGNMENT, - G_IMPLEMENT_INTERFACE (MIDORI_TYPE_PANE, - midori_dummy_pane_iface_init)); +G_DEFINE_TYPE_WITH_CODE (MidoriDummyViewable, midori_dummy_viewable, + GTK_TYPE_ALIGNMENT, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_dummy_viewable_iface_init)); static void -midori_dummy_pane_class_init (MidoriDummyPaneClass* class) +midori_dummy_viewable_class_init (MidoriDummyViewableClass* class) { GObjectClass* gobject_class; gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_dummy_pane_finalize; + gobject_class->finalize = midori_dummy_viewable_finalize; } static const gchar* -midori_dummy_pane_get_label (MidoriPane* pane) +midori_dummy_viewable_get_label (MidoriViewable* viewable) { - return MIDORI_DUMMY_PANE (pane)->label; + return MIDORI_DUMMY_VIEWABLE (viewable)->label; } static const gchar* -midori_dummy_pane_get_stock_id (MidoriPane* pane) +midori_dummy_viewable_get_stock_id (MidoriViewable* viewable) { - return MIDORI_DUMMY_PANE (pane)->stock_id; + return MIDORI_DUMMY_VIEWABLE (viewable)->stock_id; } static GtkWidget* -midori_dummy_pane_get_toolbar (MidoriPane* pane) +midori_dummy_viewable_get_toolbar (MidoriViewable* viewable) { - return MIDORI_DUMMY_PANE (pane)->toolbar; + return MIDORI_DUMMY_VIEWABLE (viewable)->toolbar; } static void -midori_dummy_pane_iface_init (MidoriPaneIface* iface) +midori_dummy_viewable_iface_init (MidoriViewableIface* iface) { - iface->get_stock_id = midori_dummy_pane_get_stock_id; - iface->get_label = midori_dummy_pane_get_label; - iface->get_toolbar = midori_dummy_pane_get_toolbar; + iface->get_stock_id = midori_dummy_viewable_get_stock_id; + iface->get_label = midori_dummy_viewable_get_label; + iface->get_toolbar = midori_dummy_viewable_get_toolbar; } static void -midori_dummy_pane_init (MidoriDummyPane* pane) +midori_dummy_viewable_init (MidoriDummyViewable* viewable) { - pane->stock_id = NULL; - pane->label = NULL; - pane->toolbar = NULL; + viewable->stock_id = NULL; + viewable->label = NULL; + viewable->toolbar = NULL; } static void -midori_dummy_pane_finalize (GObject* object) +midori_dummy_viewable_finalize (GObject* object) { - MidoriDummyPane* pane = MIDORI_DUMMY_PANE (object); + MidoriDummyViewable* viewable = MIDORI_DUMMY_VIEWABLE (object); - katze_assign (pane->stock_id, NULL); - katze_assign (pane->label, NULL); + katze_assign (viewable->stock_id, NULL); + katze_assign (viewable->label, NULL); - G_OBJECT_CLASS (midori_dummy_pane_parent_class)->finalize (object); + G_OBJECT_CLASS (midori_dummy_viewable_parent_class)->finalize (object); } static GtkWidget* -midori_dummy_pane_new (const gchar* stock_id, +midori_dummy_viewable_new (const gchar* stock_id, const gchar* label, GtkWidget* toolbar) { - GtkWidget* pane = g_object_new (MIDORI_TYPE_DUMMY_PANE, NULL); + GtkWidget* viewable = g_object_new (MIDORI_TYPE_DUMMY_VIEWABLE, NULL); - MIDORI_DUMMY_PANE (pane)->stock_id = g_strdup (stock_id); - MIDORI_DUMMY_PANE (pane)->label = g_strdup (label); - MIDORI_DUMMY_PANE (pane)->toolbar = toolbar; + MIDORI_DUMMY_VIEWABLE (viewable)->stock_id = g_strdup (stock_id); + MIDORI_DUMMY_VIEWABLE (viewable)->label = g_strdup (label); + MIDORI_DUMMY_VIEWABLE (viewable)->toolbar = toolbar; - return pane; + return viewable; } /** @@ -718,9 +721,9 @@ midori_dummy_pane_new (const gchar* stock_id, * @toolbar: a toolbar widget, or %NULL * * Appends an arbitrary widget to the panel by wrapping it - * in a #MidoriPane created on the fly. + * in a #MidoriViewable created on the fly. * - * Actually implementing #MidoriPane instead of using + * Actually implementing #MidoriViewable instead of using * this convenience is recommended. * * In the case of an error, -1 is returned. @@ -734,7 +737,7 @@ midori_panel_append_widget (MidoriPanel* panel, const gchar* label, GtkWidget* toolbar) { - GtkWidget* pane; + GtkWidget* viewable; g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1); g_return_val_if_fail (GTK_IS_WIDGET (widget), -1); @@ -742,8 +745,8 @@ midori_panel_append_widget (MidoriPanel* panel, g_return_val_if_fail (stock_id != NULL, -1); g_return_val_if_fail (!toolbar || GTK_IS_WIDGET (toolbar), -1); - pane = midori_dummy_pane_new (stock_id, label, toolbar); - gtk_widget_show (pane); - gtk_container_add (GTK_CONTAINER (pane), widget); - return midori_panel_append_page (panel, MIDORI_PANE (pane)); + viewable = midori_dummy_viewable_new (stock_id, label, toolbar); + gtk_widget_show (viewable); + gtk_container_add (GTK_CONTAINER (viewable), widget); + return midori_panel_append_page (panel, MIDORI_VIEWABLE (viewable)); } diff --git a/midori/midori-panel.h b/midori/midori-panel.h index d03e5696..40caeee1 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -16,7 +16,7 @@ #include -#include "midori-pane.h" +#include "midori-viewable.h" G_BEGIN_DECLS @@ -48,7 +48,7 @@ midori_panel_set_compact (MidoriPanel* panel, gint midori_panel_append_page (MidoriPanel* panel, - MidoriPane* pane); + MidoriViewable* viewable); gint midori_panel_get_current_page (MidoriPanel* panel); diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c new file mode 100644 index 00000000..d83c2c64 --- /dev/null +++ b/midori/midori-viewable.c @@ -0,0 +1,266 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-viewable.h" + +#include + +static void +midori_viewable_base_init (MidoriViewableIface* iface); + +static void +midori_viewable_base_finalize (MidoriViewableIface* iface); + +GType +midori_viewable_get_type (void) +{ + static GType viewable_type = 0; + + if (!viewable_type) + { + const GTypeInfo viewable_info = + { + sizeof (MidoriViewableIface), + (GBaseInitFunc) midori_viewable_base_init, + (GBaseFinalizeFunc) midori_viewable_base_finalize, + }; + + viewable_type = g_type_register_static (G_TYPE_INTERFACE, + "MidoriViewable", + &viewable_info, 0); + g_type_interface_add_prerequisite (viewable_type, GTK_TYPE_WIDGET); + } + + return viewable_type; +} + +static const gchar* +midori_viewable_default_get_stock_id (MidoriViewable* viewable) +{ + return NULL; +} + +static const gchar* +midori_viewable_default_get_label (MidoriViewable* viewable) +{ + return NULL; +} + +static GtkWidget* +midori_viewable_default_get_toolbar (MidoriViewable* viewable) +{ + return NULL; +} + +static void +midori_viewable_base_init (MidoriViewableIface* iface) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + iface->p = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + iface->get_stock_id = midori_viewable_default_get_stock_id; + iface->get_label = midori_viewable_default_get_label; + iface->get_toolbar = midori_viewable_default_get_toolbar; + + initialized = TRUE; +} + +static void +midori_viewable_base_finalize (MidoriViewableIface* iface) +{ + g_hash_table_destroy (iface->p); +} + +/** + * midori_viewable_new_from_uri: + * @uri: an URI + * + * Attempts to create a new #MidoriViewable from the specified URI. + * + * The protocol of @uri must previously have been registered by + * the #MidoriViewable via midori_viewable_register_protocol(). + * + * Return value: a new #MidoriViewable, or %NULL + **/ +GtkWidget* +midori_viewable_new_from_uri (const gchar* uri) +{ + MidoriViewableIface* iface; + gchar** parts; + gchar* type_name; + GType type; + + if (!(iface = g_type_default_interface_peek (MIDORI_TYPE_VIEWABLE))) + { + g_warning ("No viewable interface available"); + return NULL; + } + + g_return_val_if_fail (uri != NULL, NULL); + + g_debug ("size: %d", g_hash_table_size (iface->p)); + if (!g_hash_table_size (iface->p)) + return NULL; + + if ((parts = g_strsplit (uri, "://", 2))) + { + g_debug ("%s, %s", parts[0], uri); + if (!(type_name = g_hash_table_lookup (iface->p, parts[0]))) + { + /* FIXME: Support midori://dummy/foo */ + + type_name = g_hash_table_lookup (iface->p, uri); + } + g_strfreev (parts); + if (type_name) + { + type = g_type_from_name (type_name); + g_free (type_name); + if (type) + return g_object_new (type, "uri", uri, NULL); + } + } + else if ((parts = g_strsplit_set (uri, ":", 2))) + { + g_debug (parts[0]); + type_name = g_hash_table_lookup (iface->p, parts[0]); + g_strfreev (parts); + if (type_name) + { + type = g_type_from_name (type_name); + g_free (type_name); + if (type) + return g_object_new (type, "uri", uri, NULL); + } + } + return NULL; +} + +static gboolean +viewable_type_implements (GType type, + GType interface) +{ + GType *interfaces; + guint i; + + if (!(interfaces = g_type_interfaces (type, NULL))) + return FALSE; + for (i = 0; interfaces[i]; i++) + { + if (interfaces[i] == interface) + { + g_free (interfaces); + return TRUE; + } + } + g_free (interfaces); + return FALSE; +} + +/** + * midori_viewable_register_protocol: + * @type: a type that implements #MidoriViewable + * @protocol: a protocol + * + * Registers the specified protocol as supported by @type. + * + * The following kinds of protocols are supported: + * + * "dummy": support URIs like "dummy://foo/bar" + * "about:dummy": support URIs like "about:dummy" + * FIXME: The following is not yet fully supported + * "midori://dummy": support URIs like "midori://dummy/foo" + * + * Return value: a new #MidoriViewable, or %NULL + **/ +void +midori_viewable_register_protocol (GType type, + const gchar* protocol) +{ + MidoriViewableIface* iface; + GObjectClass* class; + + if (!(iface = g_type_default_interface_peek (MIDORI_TYPE_VIEWABLE))) + { + g_warning ("No viewable interface available"); + return; + } + + g_return_if_fail (viewable_type_implements (type, MIDORI_TYPE_VIEWABLE)); + + if (!(class = g_type_class_peek (type))) + { + g_warning ("No class for %s available", g_type_name (type)); + return; + } + g_return_if_fail (g_object_class_find_property (class, "uri")); + /* FIXME: Verify the syntax of protocol */ + + g_hash_table_insert (iface->p, g_strdup (protocol), + g_strdup (g_type_name (type))); +} + +/** + * midori_viewable_get_stock_id: + * @viewable: a #MidoriViewable + * + * Retrieves the stock ID of the viewable. + * + * Return value: a stock ID + **/ +const gchar* +midori_viewable_get_stock_id (MidoriViewable* viewable) +{ + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL); + + return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_stock_id (viewable); +} + +/** + * midori_viewable_get_label: + * @viewable: a #MidoriViewable + * + * Retrieves the label of the viewable. + * + * Return value: a label string + **/ +const gchar* +midori_viewable_get_label (MidoriViewable* viewable) +{ + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL); + + return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_label (viewable); +} + +/** + * midori_viewable_get_toolbar: + * @viewable: a #MidoriViewable + * + * Retrieves the toolbar of the viewable. + * + * Return value: a toolbar + **/ +GtkWidget* +midori_viewable_get_toolbar (MidoriViewable* viewable) +{ + GtkWidget* toolbar; + + g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL); + + toolbar = MIDORI_VIEWABLE_GET_IFACE (viewable)->get_toolbar (viewable); + if (!toolbar) + toolbar = gtk_event_box_new (); + return toolbar; +} diff --git a/midori/midori-viewable.h b/midori/midori-viewable.h new file mode 100644 index 00000000..80a6a108 --- /dev/null +++ b/midori/midori-viewable.h @@ -0,0 +1,73 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_VIEWABLE_H__ +#define __MIDORI_VIEWABLE_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_VIEWABLE \ + (midori_viewable_get_type ()) +#define MIDORI_VIEWABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEWABLE, MidoriViewable)) +#define MIDORI_IS_VIEWABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_VIEWABLE)) +#define MIDORI_VIEWABLE_GET_IFACE(inst) \ + (G_TYPE_INSTANCE_GET_INTERFACE ((inst), MIDORI_TYPE_VIEWABLE, \ + MidoriViewableIface)) + +typedef struct _MidoriViewable MidoriViewable; +typedef struct _MidoriViewableIface MidoriViewableIface; + +struct _MidoriViewableIface +{ + GTypeInterface base_iface; + + /* Virtual functions */ + const gchar* + (*get_stock_id) (MidoriViewable* viewable); + + const gchar* + (*get_label) (MidoriViewable* viewable); + + GtkWidget* + (*get_toolbar) (MidoriViewable* viewable); + + /* Private data */ + gpointer p; +}; + +GType +midori_viewable_get_type (void); + +GtkWidget* +midori_viewable_new_from_uri (const gchar* uri); + +void +midori_viewable_register_protocol (GType type, + const gchar* protocol); + +const gchar* +midori_viewable_get_stock_id (MidoriViewable* viewable); + +const gchar* +midori_viewable_get_label (MidoriViewable* viewable); + +GtkWidget* +midori_viewable_get_toolbar (MidoriViewable* viewable); + +G_END_DECLS + +#endif /* __MIDORI_VIEWABLE_H__ */ diff --git a/midori/midori.h b/midori/midori.h index 9a564eb5..a456ac88 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -19,13 +19,13 @@ #include "midori-extension.h" #include "midori-locationaction.h" #include "midori-locationentry.h" -#include "midori-pane.h" #include "midori-panel.h" #include "midori-preferences.h" #include "midori-searchaction.h" #include "midori-source.h" #include "midori-stock.h" #include "midori-view.h" +#include "midori-viewable.h" #include "midori-websettings.h" /* For convenience, include localization header */ From dc2b7dcd02695dc9ead86005e28ad2110d115aba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 29 Nov 2008 23:47:47 +0100 Subject: [PATCH 0528/2970] German, Spanish and French translation updates --- po/de.po | 691 +++++++++++++++++++++++++------------------------- po/es.po | 751 +++++++++++++++++++++++++++---------------------------- po/fr.po | 703 +++++++++++++++++++++++++-------------------------- 3 files changed, 1046 insertions(+), 1099 deletions(-) diff --git a/po/de.po b/po/de.po index 3a4ed392..ff1f6cbb 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-02 23:30+0100\n" -"PO-Revision-Date: 2008-11-02 28:21+0100\n" +"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"PO-Revision-Date: 2008-11-29 22:04+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:1098 ../midori/main.c:1107 -#: ../midori/main.c:1118 ../midori/main.c:1142 +#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 +#: ../midori/main.c:1161 ../midori/main.c:1185 msgid "Midori" msgstr "Midori" @@ -30,1142 +30,1115 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:71 +#: ../midori/main.c:81 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:72 ../midori/midori-browser.c:3537 +#: ../midori/main.c:82 ../midori/midori-browser.c:3719 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/main.c:73 +#: ../midori/main.c:83 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:74 +#: ../midori/main.c:84 msgid "_Console" msgstr "_Konsole" -#: ../midori/main.c:75 +#: ../midori/main.c:85 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/main.c:76 +#: ../midori/main.c:86 msgid "_History" msgstr "_Verlauf" -#: ../midori/main.c:77 +#: ../midori/main.c:87 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:78 -msgid "_Pageholder" -msgstr "_Seitenhalter" - -#: ../midori/main.c:79 +#: ../midori/main.c:88 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/main.c:80 +#: ../midori/main.c:89 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/main.c:81 +#: ../midori/main.c:90 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:82 +#: ../midori/main.c:91 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/main.c:83 +#: ../midori/main.c:92 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/main.c:84 +#: ../midori/main.c:93 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:134 +#: ../midori/main.c:138 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:189 +#: ../midori/main.c:193 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:196 ../midori/main.c:265 +#: ../midori/main.c:200 ../midori/main.c:270 #, c-format -msgid "Unhandled settings value '%s'" -msgstr "Unbehandelter Einstellungswert »%s«" +msgid "Invalid configuration value '%s'" +msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 -#: ../midori/main.c:571 -msgid "Malformed document." -msgstr "Fehlerhaftes Dokument" - -#: ../midori/main.c:554 +#: ../midori/main.c:527 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:592 ../midori/main.c:624 +#: ../midori/main.c:535 ../midori/main.c:544 +msgid "Malformed document." +msgstr "Fehlerhaftes Dokument" + +#: ../midori/main.c:566 ../midori/main.c:598 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:679 +#: ../midori/main.c:652 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:703 +#: ../midori/main.c:676 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:736 ../midori/main.c:751 +#: ../midori/main.c:709 ../midori/main.c:723 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:868 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:1000 ../midori/sokoke.c:457 +#: ../midori/main.c:971 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/main.c:1025 +#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Übertragungen" + +#: ../midori/main.c:1024 +msgid "Console" +msgstr "Konsole" + +#: ../midori/main.c:1034 ../midori/midori-addons.c:88 +msgid "Userscripts" +msgstr "Benutzerskripte" + +#: ../midori/main.c:1042 ../midori/midori-addons.c:89 +msgid "Userstyles" +msgstr "Benutzerstile" + +#: ../midori/main.c:1051 +msgid "Extensions" +msgstr "Erweiterungen" + +#: ../midori/main.c:1071 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1057 +#: ../midori/main.c:1100 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1059 +#: ../midori/main.c:1102 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1061 +#: ../midori/main.c:1104 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1095 +#: ../midori/main.c:1138 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1119 +#: ../midori/main.c:1162 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1121 +#: ../midori/main.c:1164 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1142 +#: ../midori/main.c:1185 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:1160 +#: ../midori/main.c:1202 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1194 +#: ../midori/main.c:1238 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1208 +#: ../midori/main.c:1254 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1220 +#: ../midori/main.c:1268 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1233 +#: ../midori/main.c:1282 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1246 +#: ../midori/main.c:1295 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1405 +#: ../midori/main.c:1479 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1415 +#: ../midori/main.c:1489 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../midori/main.c:1424 +#: ../midori/main.c:1498 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht geladen werden. %s" -#: ../midori/main.c:1432 +#: ../midori/main.c:1506 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 msgid "None" msgstr "Keine" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3768 -msgid "Extensions" -msgstr "Erweiterungen" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3751 -msgid "Userscripts" -msgstr "Benutzerskripte" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3759 -msgid "Userstyles" -msgstr "Benutzerstile" - -#: ../midori/midori-addons.c:1043 +#: ../midori/midori-addons.c:964 msgid "_Enable" msgstr "_Einschalten" -#: ../midori/midori-addons.c:1052 +#: ../midori/midori-addons.c:973 msgid "_Disable" msgstr "_Auschalten" -#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3075 -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3112 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:547 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Beschreibung" -#: ../midori/midori-browser.c:566 ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:582 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Wurzel" -#: ../midori/midori-browser.c:1148 -msgid "Open file" -msgstr "Datei öffnen" - -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:2301 +#: ../midori/midori-browser.c:1224 +msgid "Open file" +msgstr "Datei öffnen" + +#: ../midori/midori-browser.c:2304 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2303 +#: ../midori/midori-browser.c:2306 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2549 +#: ../midori/midori-browser.c:2577 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2653 +#: ../midori/midori-browser.c:2688 +#, c-format +msgid "A week ago" +msgstr "Vor einer Woche" + +#: ../midori/midori-browser.c:2694 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../midori/midori-browser.c:2660 +#: ../midori/midori-browser.c:2701 msgid "Today" msgstr "Heute" -#: ../midori/midori-browser.c:2662 +#: ../midori/midori-browser.c:2703 msgid "Yesterday" msgstr "Gestern" -#: ../midori/midori-browser.c:2751 +#: ../midori/midori-browser.c:2792 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2800 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2934 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3040 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3012 +#: ../midori/midori-browser.c:3043 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3046 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3049 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3052 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3054 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3055 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3057 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3058 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3061 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3064 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3066 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3069 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3041 ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3078 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3081 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3084 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3087 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3089 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3090 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3092 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:3093 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3096 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3097 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3100 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3102 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3103 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3115 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3118 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3121 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3092 ../midori/midori-view.c:924 +#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3124 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3126 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3127 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3131 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3133 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3136 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3139 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3142 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3113 -msgid "Open in Page_holder..." -msgstr "In Seiten_halter öffnen…" - -#: ../midori/midori-browser.c:3114 -msgid "Open the current page in the pageholder" -msgstr "Die aktuelle Seite im Seitenhalter öffnen" - -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3144 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3145 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#. FIXME: Make this sensitive only when there is a tab to undo -#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:899 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3148 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3152 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3155 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3158 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3164 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3167 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3169 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3143 ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3172 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3176 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3177 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3179 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3180 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3182 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3184 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3185 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3187 msgid "_Frequent questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3188 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3190 msgid "_Report a bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3191 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3194 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3201 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3202 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3207 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3208 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3211 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3212 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3215 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3216 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3219 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3220 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3223 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3224 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3227 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3228 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3644 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3646 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3670 msgid "_Web Search..." msgstr "_Netzsuche…" -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3672 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3691 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3521 +#: ../midori/midori-browser.c:3704 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3706 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3721 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3734 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3736 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:3679 +#: ../midori/midori-browser.c:3858 msgid "Bookmarks" msgstr "Lesezeichen" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3686 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Übertragungen" - -#: ../midori/midori-browser.c:3695 -msgid "Console" -msgstr "Konsole" - -#: ../midori/midori-browser.c:3733 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3742 -msgid "Pageholder" -msgstr "Seitenhalter" - -#: ../midori/midori-browser.c:3810 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3944 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3979 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3853 +#: ../midori/midori-browser.c:3987 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:3996 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4108 +#: ../midori/midori-browser.c:4237 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1514 +#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-r)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "Benutzerdefinidert…" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Alle Kekse" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Sitzungskekse" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:246 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:254 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:272 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" -#: ../midori/midori-websettings.c:280 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:282 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../midori/midori-websettings.c:298 -msgid "Last pageholder URI" -msgstr "Letzte URI im Seitenhalter" - -#: ../midori/midori-websettings.c:299 -msgid "The URI last opened in the pageholder" -msgstr "Die letzte im Seitenhalter geöffnete URI" - -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:301 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:302 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:310 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:311 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:319 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:320 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:328 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:329 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:337 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:338 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:347 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:348 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:357 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:358 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:366 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:367 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:376 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:377 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:387 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:395 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:396 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:404 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:405 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:413 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:414 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:422 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:423 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:431 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:432 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:442 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:443 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:451 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:460 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:461 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:470 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:471 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:480 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:481 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:489 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:490 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:498 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:499 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:507 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:508 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:518 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:519 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:528 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:529 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:537 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:538 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:548 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:549 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:557 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:558 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:566 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:567 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:575 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:576 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:586 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:587 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:595 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:596 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-view.c:82 -msgid "Load Provisional" -msgstr "Vorläufiger Ladevorgang" - -#: ../midori/midori-view.c:83 -msgid "Load Committed" -msgstr "Bestätigter Ladevorgang" - -#: ../midori/midori-view.c:84 -msgid "Load Finished" -msgstr "Vollendeter Ladevorgang" - -#: ../midori/midori-view.c:836 +#: ../midori/midori-view.c:818 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:861 +#: ../midori/midori-view.c:841 +#, fuzzy +msgid "_Save Link destination" +msgstr "Verweisziel _herunterladen" + +#: ../midori/midori-view.c:849 msgid "_Download Link destination" msgstr "Verweisziel _herunterladen" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:871 msgid "Open URL in New _Tab" msgstr "URL in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1237 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1386 +#: ../midori/midori-view.c:1375 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-preferences.c:89 +#: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" @@ -1205,7 +1178,7 @@ msgstr "Verhalten" msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:411 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 msgid "Load images automatically" msgstr "Bilder automatisch laden" @@ -1214,14 +1187,15 @@ msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" #: ../midori/midori-preferences.c:417 -msgid "Print backgrounds" +#, fuzzy +msgid "Print background images" msgstr "Hintergründe drucken" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 msgid "Enable scripts" msgstr "Skripte einschalten" @@ -1267,31 +1241,31 @@ msgstr "Netzkekse" msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" @@ -1299,25 +1273,25 @@ msgstr "Suchmaschinen verwalten" msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s hat keine Eigenschaft »%s«" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s kann %s.%s nicht zugewiesen werden" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "Auf %s.%s kann nicht zugegriffen werden" @@ -1336,15 +1310,24 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Seitenhalter" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Seitenhalter" diff --git a/po/es.po b/po/es.po index 456591d9..6c75e04c 100644 --- a/po/es.po +++ b/po/es.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-02 23:30+0100\n" -"PO-Revision-Date: 2008-11-03 00:40+0100\n" +"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"PO-Revision-Date: 2008-11-29 22:13+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../midori.desktop.in.h:2 ../midori/main.c:1098 ../midori/main.c:1107 -#: ../midori/main.c:1118 ../midori/main.c:1142 +#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 +#: ../midori/main.c:1161 ../midori/main.c:1185 msgid "Midori" msgstr "Midori" @@ -30,1145 +30,1117 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:71 +#: ../midori/main.c:81 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/main.c:72 ../midori/midori-browser.c:3537 +#: ../midori/main.c:82 ../midori/midori-browser.c:3719 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/main.c:73 +#: ../midori/main.c:83 msgid "_Add Bookmark" msgstr "_Añadir Marcador" -#: ../midori/main.c:74 +#: ../midori/main.c:84 msgid "_Console" msgstr "_Consola" -#: ../midori/main.c:75 +#: ../midori/main.c:85 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/main.c:76 +#: ../midori/main.c:86 msgid "_History" msgstr "_Histórico" -#: ../midori/main.c:77 +#: ../midori/main.c:87 msgid "_Homepage" msgstr "Página de _inicio" -#: ../midori/main.c:78 -msgid "_Pageholder" -msgstr "Cu_adro de páginas" - -#: ../midori/main.c:79 +#: ../midori/main.c:88 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/main.c:80 +#: ../midori/main.c:89 msgid "User_styles" msgstr "Estilos de _usuario" -#: ../midori/main.c:81 +#: ../midori/main.c:90 msgid "New _Tab" msgstr "Nueva pes_taña" -#: ../midori/main.c:82 +#: ../midori/main.c:91 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/main.c:83 +#: ../midori/main.c:92 msgid "_Closed Tabs and Windows" msgstr "Ventanas y pestañas _cerradas" -#: ../midori/main.c:84 +#: ../midori/main.c:93 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/main.c:134 +#: ../midori/main.c:138 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:189 +#: ../midori/main.c:193 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:196 ../midori/main.c:265 +#: ../midori/main.c:200 ../midori/main.c:270 #, c-format -msgid "Unhandled settings value '%s'" +msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 -#: ../midori/main.c:571 -msgid "Malformed document." -msgstr "Documento defectuoso" - -#: ../midori/main.c:554 +#: ../midori/main.c:527 msgid "File not found." msgstr "No se encuentra el archivo." -#: ../midori/main.c:592 ../midori/main.c:624 +#: ../midori/main.c:535 ../midori/main.c:544 +msgid "Malformed document." +msgstr "Documento defectuoso" + +#: ../midori/main.c:566 ../midori/main.c:598 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Falló a abrir la banco de datos" -#: ../midori/main.c:679 +#: ../midori/main.c:652 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falló a borrar elemento del histórico: %s\n" -#: ../midori/main.c:703 +#: ../midori/main.c:676 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "Falló a vaciar el histórico: %s\n" -#: ../midori/main.c:736 ../midori/main.c:751 +#: ../midori/main.c:709 ../midori/main.c:723 #, c-format msgid "Failed to add history item: %s\n" msgstr "Falló a añadir un elemento al histórico: %s\n" -#: ../midori/main.c:868 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Falló a eliminar elementos viejos del histórico: %s\n" -#: ../midori/main.c:1000 ../midori/sokoke.c:457 +#: ../midori/main.c:971 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/main.c:1025 +#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Transferencias" + +#: ../midori/main.c:1024 +msgid "Console" +msgstr "Consola" + +#: ../midori/main.c:1034 ../midori/midori-addons.c:88 +msgid "Userscripts" +msgstr "Scripts de usuario" + +#: ../midori/main.c:1042 ../midori/midori-addons.c:89 +msgid "Userstyles" +msgstr "Estilos de usuario" + +#: ../midori/main.c:1051 +msgid "Extensions" +msgstr "Extensiones" + +#: ../midori/main.c:1071 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:1057 +#: ../midori/main.c:1100 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1059 +#: ../midori/main.c:1102 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1061 +#: ../midori/main.c:1104 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1095 +#: ../midori/main.c:1138 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1119 +#: ../midori/main.c:1162 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" -#: ../midori/main.c:1121 +#: ../midori/main.c:1164 msgid "Check for new versions at:" msgstr "Comprobar si existen nuevas versiones en:" -#: ../midori/main.c:1142 +#: ../midori/main.c:1185 msgid "No filename specified" -msgstr "" +msgstr "Ninguna nombre de archivo indicado" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:1160 +#: ../midori/main.c:1202 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1194 +#: ../midori/main.c:1238 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Los marcadores no pudieron ser cargados: %s\n" -#: ../midori/main.c:1208 +#: ../midori/main.c:1254 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1220 +#: ../midori/main.c:1268 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1233 +#: ../midori/main.c:1282 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el histórico: %s\n" -#: ../midori/main.c:1246 +#: ../midori/main.c:1295 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:1405 +#: ../midori/main.c:1479 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar el motor de busqueda. %s" -#: ../midori/main.c:1415 +#: ../midori/main.c:1489 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" -#: ../midori/main.c:1424 +#: ../midori/main.c:1498 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:1432 +#: ../midori/main.c:1506 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 msgid "None" msgstr "Ninguna" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3768 -msgid "Extensions" -msgstr "Extensiones" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3751 -msgid "Userscripts" -msgstr "Scripts de usuario" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3759 -msgid "Userstyles" -msgstr "Estilos de usuario" - -#: ../midori/midori-addons.c:1043 +#: ../midori/midori-addons.c:964 msgid "_Enable" msgstr "_Activar" -#: ../midori/midori-addons.c:1052 +#: ../midori/midori-addons.c:973 msgid "_Disable" msgstr "_Desactivar" -#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3075 -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3112 msgid "Reload the current page" msgstr "Cargar nuevamente la página actual" -#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 msgid "Stop loading the current page" msgstr "Detener la carga de la página" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Acción no esperada «%s»" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:547 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Descripción" -#: ../midori/midori-browser.c:566 ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:582 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Raíz" -#: ../midori/midori-browser.c:1148 -msgid "Open file" -msgstr "Abrir archivo" - -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Guardar archivo en" -#: ../midori/midori-browser.c:2301 +#: ../midori/midori-browser.c:1224 +msgid "Open file" +msgstr "Abrir archivo" + +#: ../midori/midori-browser.c:2304 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2303 +#: ../midori/midori-browser.c:2306 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:2549 +#: ../midori/midori-browser.c:2577 msgid "Separator" msgstr "Separador" -#: ../midori/midori-browser.c:2653 +#: ../midori/midori-browser.c:2688 +#, c-format +msgid "A week ago" +msgstr "Hace una semana" + +#: ../midori/midori-browser.c:2694 #, c-format msgid "%d days ago" -msgstr "" +msgstr "Hace %d días" -#: ../midori/midori-browser.c:2660 +#: ../midori/midori-browser.c:2701 msgid "Today" -msgstr "" +msgstr "Hoy" -#: ../midori/midori-browser.c:2662 +#: ../midori/midori-browser.c:2703 msgid "Yesterday" -msgstr "" +msgstr "Ayer" -#: ../midori/midori-browser.c:2751 +#: ../midori/midori-browser.c:2792 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2800 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" "Antonio Sanchez \n" "Christian Dywan " -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2934 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3040 msgid "_File" msgstr "_Fichero" -#: ../midori/midori-browser.c:3012 +#: ../midori/midori-browser.c:3043 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3046 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3049 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3052 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3054 msgid "_Close Tab" msgstr "Cerrar _pestaña" -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3055 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3057 msgid "C_lose Window" msgstr "_Cerrar la ventana" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3058 msgid "Close this window" msgstr "Cerrar esta ventana" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3061 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3064 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3066 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3069 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:3041 ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3078 msgid "Paste text from the clipboard" msgstr "Pegar el texto seleccionado al portapapeles" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3081 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3084 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3087 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3089 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3090 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3092 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:3093 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3096 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3097 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3100 msgid "Configure the application preferences" -msgstr "" +msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3102 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3103 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3115 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3118 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3121 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3092 ../midori/midori-view.c:924 +#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 msgid "View _Source" msgstr "Mostrar _código fuente" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3124 msgid "View the source code of the page" msgstr "Mostrar el código fuente de la página" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3126 msgid "View Selection Source" msgstr "Mostrar código fuente de la seleccionada" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3127 msgid "View the source code of the selection" msgstr "Mostrar el código fuente de la seleccionada" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3131 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3133 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3136 msgid "Go back to the previous page" -msgstr "" +msgstr "Ir a la última pagina" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3139 msgid "Go forward to the next page" -msgstr "" +msgstr "Ir a la siguiente pagina" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3142 msgid "Go to your homepage" -msgstr "" +msgstr "Ir a la página de inicio" -#: ../midori/midori-browser.c:3113 -msgid "Open in Page_holder..." -msgstr "Abrir en el cuadro de páginas..." - -#: ../midori/midori-browser.c:3114 -msgid "Open the current page in the pageholder" -msgstr "Última la página actual en el cuadro de páginas" - -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3144 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3145 msgid "Delete the contents of the trash" msgstr "Borrar el conenido de la papelera" -#. FIXME: Make this sensitive only when there is a tab to undo -#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:899 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3148 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3152 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3155 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3158 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected history item" msgstr "Borrar el elemento seleccionado del histórico" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3164 msgid "Clear the entire history" -msgstr "" +msgstr "Vaciar el histórico completo" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3167 msgid "Bookmark the selected history item" msgstr "Añadir un marcador pour el elemento seleccionado del histórico" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3169 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3143 ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Gestionar los motores de busqueda" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3172 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar o eliminar motores de busqueda..." -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3176 msgid "_Previous Tab" msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3177 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3179 msgid "_Next Tab" msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3180 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3182 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3184 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3185 msgid "Show the documentation" -msgstr "" +msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3187 msgid "_Frequent questions" -msgstr "" +msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3188 msgid "Show the Frequently Asked Questions" -msgstr "" +msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3190 msgid "_Report a bug" -msgstr "" +msgstr "_Reportar un probléma" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3191 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "Abrir el perseguidor de problemas de Midori" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3194 msgid "Show information about the program" -msgstr "" +msgstr "Mostrar informationes sobre el programa" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3201 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3202 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "No guardar datos privados mientras de la navegación" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3207 msgid "_Menubar" msgstr "Barra del _menú" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3208 msgid "Show menubar" msgstr "Mostrar barra del menu" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3211 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3212 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3215 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3216 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3219 msgid "_Bookmarkbar" msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3220 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3223 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3224 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3227 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3228 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3644 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3646 msgid "Open a particular location" -msgstr "" +msgstr "Abrir un lugar específico" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3670 msgid "_Web Search..." msgstr "Buscar en la _red..." -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3672 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3691 msgid "Reopen a previously closed tab or window" msgstr "Volver a abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:3521 +#: ../midori/midori-browser.c:3704 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3706 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3721 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardos." -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3734 msgid "_Window" msgstr "_Ventana" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3736 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pesañas abiertas" -#: ../midori/midori-browser.c:3679 +#: ../midori/midori-browser.c:3858 msgid "Bookmarks" msgstr "Marcadores" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3686 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Transferencias" - -#: ../midori/midori-browser.c:3695 -msgid "Console" -msgstr "Consola" - -#: ../midori/midori-browser.c:3733 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:3742 -msgid "Pageholder" -msgstr "Cuadro de páginas" - -#: ../midori/midori-browser.c:3810 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3944 msgid "_Inline find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3979 msgid "Match Case" msgstr "Sensible a mayúsculas" -#: ../midori/midori-browser.c:3853 +#: ../midori/midori-browser.c:3987 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:3996 msgid "Close Findbar" msgstr "Cerrar barra de busquedas" -#: ../midori/midori-browser.c:4108 +#: ../midori/midori-browser.c:4237 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Cerrar el panel" -#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1514 +#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 msgid "Blank page" msgstr "Página vacía" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 msgid "Homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "Páginas abiertas recientemente" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Todas las galletas" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Las galletas de esta sesión" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Remember last window size" msgstr "Recordar último tamaño de ventana" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:246 msgid "Whether to save the last window size" msgstr "Guardar (o no) el último tamaño de ventana" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:254 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "The last saved window height" msgstr "Última altura de la ventana guardada" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:272 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" -#: ../midori/midori-websettings.c:280 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:282 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 msgid "Last Web search" msgstr "Última busqueda en la red" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "The last saved Web search" msgstr "Última busqueda en la red guardada" -#: ../midori/midori-websettings.c:298 -msgid "Last pageholder URI" -msgstr "Última URI del cuadro de páginas" - -#: ../midori/midori-websettings.c:299 -msgid "The URI last opened in the pageholder" -msgstr "Última URI abierta en el cuadro de páginas" - -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:301 msgid "Show Menubar" msgstr "Mostrar barra del menú" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:302 msgid "Whether to show the menubar" msgstr "Mostrar (o no) la barra de menú" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:310 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:311 msgid "Whether to show the navigationbar" msgstr "Mostrar (o no) la barra de navegación" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:319 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:320 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (o no) la barra de marcadores" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:328 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:329 msgid "Whether to show the panel" msgstr "Mostrar (o no) el panel" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:337 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:338 msgid "Whether to show the statusbar" msgstr "Mostrar (o no) la barra de estado" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:347 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:348 msgid "The style of the toolbar" msgstr "El estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:357 msgid "Toolbar Items" msgstr "Elementos de herramientas" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:358 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:366 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:367 msgid "Whether to make the sidepanel compact" msgstr "Hacer (o no) el panel compacto" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:376 msgid "Load on Startup" msgstr "Cargar al inicio" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:377 msgid "What to load on startup" msgstr "Qué cargar en el inicio" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:387 msgid "The homepage" msgstr "La página de inicio" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:395 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:396 msgid "The folder downloaded files are saved to" msgstr "La carpeta de descargas fue guardada en" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:404 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:405 msgid "An external download manager" msgstr "Un gestor de descargas externo" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:413 msgid "Text Editor" -msgstr "" +msgstr "Editor de textos" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:414 msgid "An external text editor" -msgstr "" +msgstr "Un editor de textos externo" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:422 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:423 msgid "The search to perform inside the location entry" msgstr "Hacer una busqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:431 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:432 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:442 msgid "Always Show Tabbar" -msgstr "" +msgstr "Siempre mostrar barra de pestañas" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:443 msgid "Always show the tabbar" -msgstr "" +msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:451 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Whether tabs have close buttons" msgstr "Cada una de las pestañas tendrá su botón para cerrarla" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:460 msgid "Open new pages in" msgstr "Abrir las páginas nuevas en" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:461 msgid "Where to open new pages" msgstr "Donde se van a abrir las páginas nuevas" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:470 msgid "Open external pages in" msgstr "Abrir las páginas externas en" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:471 msgid "Where to open externally opened pages" msgstr "Donde se van a abrir las páginas externas" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:480 msgid "Middle click opens Selection" msgstr "Clic medio abre la selección" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:481 msgid "Load an URL from the selection via middle click" msgstr "Cargar una URL en la selección empleando el botón del medio del ratón" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:489 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:490 msgid "Whether to open new tabs in the background" msgstr "Abrir (o no) las pestañas nuevas en segundo plano" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:498 msgid "Open Tabs next to Current" msgstr "Abrir pestañas a lado de la actual" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:499 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abrir las pestañas nuevas al lado de la pestaña actual o la última" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:507 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:508 msgid "Whether to open popup windows in tabs" msgstr "Abrir (o no) las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:518 msgid "Accept cookies" msgstr "Aceptar las galletas" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:519 msgid "What type of cookies to accept" msgstr "Qué tipos de galletas van a ser aceptadas" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:528 msgid "Original cookies only" msgstr "Solo las galletas del sitio original" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:529 msgid "Accept cookies from the original website only" msgstr "Solo se aceptan las galletas del sitio de origen" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:537 msgid "Maximum cookie age" msgstr "Persistencia máxima de las galletas" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:538 msgid "The maximum number of days to save cookies for" msgstr "Tiempo máximo, en días, durante los que se guardaran las galletas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:548 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:549 msgid "Whether the last visited pages are saved" msgstr "Recordar (o no) las últimas páginas que fueron visitadas" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:557 msgid "Maximum history age" msgstr "Persistencia máxima del histórico" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:558 msgid "The maximum number of days to save the history for" msgstr "" "Tiempo máximo, en días, durante los que se guardará un dato del histórico" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:566 msgid "Remember last form inputs" msgstr "Recordar las últimas sesiones de formularios" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:567 msgid "Whether the last form inputs are saved" msgstr "Recordar (o no) las últimas sesiones con sus datos de formularios" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:575 msgid "Remember last downloaded files" msgstr "Recordar últimos ficheros descargados" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:576 msgid "Whether the last downloaded files are saved" msgstr "" "Recordar (o no) la lista de descargas de ficheros realizadas últimamente" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:586 msgid "HTTP Proxy" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:587 msgid "The proxy used for HTTP connections" msgstr "Servidor proxy para conexiones HTTP" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:595 msgid "Cache size" msgstr "Tamaño de la caché" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:596 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" -#: ../midori/midori-view.c:82 -msgid "Load Provisional" -msgstr "" - -#: ../midori/midori-view.c:83 -msgid "Load Committed" -msgstr "" - -#: ../midori/midori-view.c:84 -msgid "Load Finished" -msgstr "" - -#: ../midori/midori-view.c:836 +#: ../midori/midori-view.c:818 msgid "Open Link in New _Tab" msgstr "Abrir el enlace en una pestaña _nueva" -#: ../midori/midori-view.c:861 -msgid "_Download Link destination" -msgstr "" +#: ../midori/midori-view.c:841 +msgid "_Save Link destination" +msgstr "_Guardar el destino del enlace" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:849 +msgid "_Download Link destination" +msgstr "_Descargar el destino del enlace" + +#: ../midori/midori-view.c:871 msgid "Open URL in New _Tab" msgstr "Abrir la URL en una pestaña _nueva" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1237 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Examinar la pagina - %s" -#: ../midori/midori-view.c:1386 +#: ../midori/midori-view.c:1375 msgid "Source" msgstr "Código fuente" -#: ../midori/midori-preferences.c:89 +#: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Preferencias de %s" @@ -1193,11 +1165,11 @@ msgstr "Ajustes de las fuentes" #: ../midori/midori-preferences.c:389 msgid "Default Font Family" -msgstr "" +msgstr "Fuente estándar" #: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" -msgstr "" +msgstr "Tamaño de fuente mínimo" #. Page "Behavior" #: ../midori/midori-preferences.c:407 @@ -1208,23 +1180,23 @@ msgstr "Comportamiento" msgid "Features" msgstr "Funcionalidades" -#: ../midori/midori-preferences.c:411 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 msgid "Load images automatically" -msgstr "" +msgstr "Cargar imagenes automáticamente" #: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" -msgstr "" +msgstr "Reducir imagenes automáticamente" #: ../midori/midori-preferences.c:417 -msgid "Print backgrounds" -msgstr "Imprimir trasfondos" +msgid "Print background images" +msgstr "Imprimir imagenes de trasfondo" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Pido agrandar los campos de textos" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 msgid "Enable scripts" msgstr "Activar guiónes" @@ -1270,31 +1242,31 @@ msgstr "Galletas red" msgid "days" msgstr "dias" -#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Añadir un motor de búsqueda" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Icono (nombre o fichero):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Abreviatura" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Gestionar los motores de busqueda" @@ -1302,25 +1274,25 @@ msgstr "Gestionar los motores de busqueda" msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Aviso: Estás conectado como super usuario!" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s no tiene la propiedad «%s»" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s no puede ser asignado a %s.%s" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s non se puede accede" @@ -1339,15 +1311,24 @@ msgstr "No se pudo cargar el icono stock «%s»" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Escoger un fichero" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Escoger una carpeta" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Cuadro de páginas" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "Cu_adro de páginas" diff --git a/po/fr.po b/po/fr.po index b067c388..ba17898d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-02 23:30+0100\n" -"PO-Revision-Date: 2008-11-02 23:11+0100\n" +"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"PO-Revision-Date: 2008-11-02 22:11+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../midori.desktop.in.h:2 ../midori/main.c:1098 ../midori/main.c:1107 -#: ../midori/main.c:1118 ../midori/main.c:1142 +#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 +#: ../midori/main.c:1161 ../midori/main.c:1185 msgid "Midori" msgstr "Midori" @@ -31,1150 +31,1123 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:71 +#: ../midori/main.c:81 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/main.c:72 ../midori/midori-browser.c:3537 +#: ../midori/main.c:82 ../midori/midori-browser.c:3719 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/main.c:73 +#: ../midori/main.c:83 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/main.c:74 +#: ../midori/main.c:84 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:75 +#: ../midori/main.c:85 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:76 +#: ../midori/main.c:86 msgid "_History" msgstr "_Historique" -#: ../midori/main.c:77 +#: ../midori/main.c:87 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:78 -msgid "_Pageholder" -msgstr "C_adre de pages" - -#: ../midori/main.c:79 +#: ../midori/main.c:88 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/main.c:80 +#: ../midori/main.c:89 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/main.c:81 +#: ../midori/main.c:90 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/main.c:82 +#: ../midori/main.c:91 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/main.c:83 +#: ../midori/main.c:92 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/main.c:84 +#: ../midori/main.c:93 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/main.c:134 +#: ../midori/main.c:138 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée: %s\n" -#: ../midori/main.c:189 +#: ../midori/main.c:193 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:196 ../midori/main.c:265 +#: ../midori/main.c:200 ../midori/main.c:270 #, c-format -msgid "Unhandled settings value '%s'" -msgstr "Valeur de paramètre non pris en charge « %s »" +msgid "Invalid configuration value '%s'" +msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 -#: ../midori/main.c:571 -msgid "Malformed document." -msgstr "Document mal formé" - -#: ../midori/main.c:554 +#: ../midori/main.c:527 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/main.c:592 ../midori/main.c:624 +#: ../midori/main.c:535 ../midori/main.c:544 +msgid "Malformed document." +msgstr "Document mal formé" + +#: ../midori/main.c:566 ../midori/main.c:598 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:679 +#: ../midori/main.c:652 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:703 +#: ../midori/main.c:676 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:736 ../midori/main.c:751 +#: ../midori/main.c:709 ../midori/main.c:723 #, c-format msgid "Failed to add history item: %s\n" msgstr "" -#: ../midori/main.c:868 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:1000 ../midori/sokoke.c:457 +#: ../midori/main.c:971 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/main.c:1025 +#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Transferts" + +#: ../midori/main.c:1024 +msgid "Console" +msgstr "Console" + +#: ../midori/main.c:1034 ../midori/midori-addons.c:88 +msgid "Userscripts" +msgstr "Scripts utilisateur" + +#: ../midori/main.c:1042 ../midori/midori-addons.c:89 +msgid "Userstyles" +msgstr "Styles utilisateur" + +#: ../midori/main.c:1051 +msgid "Extensions" +msgstr "Extensions" + +#: ../midori/main.c:1071 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1057 +#: ../midori/main.c:1100 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1059 +#: ../midori/main.c:1102 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1061 +#: ../midori/main.c:1104 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1095 +#: ../midori/main.c:1138 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1119 +#: ../midori/main.c:1162 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1121 +#: ../midori/main.c:1164 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1142 +#: ../midori/main.c:1185 msgid "No filename specified" msgstr "Aucun nom de fichier indiqué" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:1160 +#: ../midori/main.c:1202 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1194 +#: ../midori/main.c:1238 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés: %s\n" -#: ../midori/main.c:1208 +#: ../midori/main.c:1254 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:1220 +#: ../midori/main.c:1268 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:1233 +#: ../midori/main.c:1282 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargée. %s\n" -#: ../midori/main.c:1246 +#: ../midori/main.c:1295 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1405 +#: ../midori/main.c:1479 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1415 +#: ../midori/main.c:1489 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content -#: ../midori/main.c:1424 +#: ../midori/main.c:1498 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1432 +#: ../midori/main.c:1506 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 msgid "None" msgstr "Aucun" -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3768 -msgid "Extensions" -msgstr "Extensions" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3751 -msgid "Userscripts" -msgstr "Scripts utilisateur" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3759 -msgid "Userstyles" -msgstr "Styles utilisateur" - -#: ../midori/midori-addons.c:1043 +#: ../midori/midori-addons.c:964 msgid "_Enable" msgstr "_Activer" -#: ../midori/midori-addons.c:1052 +#: ../midori/midori-addons.c:973 msgid "_Disable" msgstr "_Désactiver" -#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3075 -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3112 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:547 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:566 ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:582 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Racine" -#: ../midori/midori-browser.c:1148 -msgid "Open file" -msgstr "Ouvrir fichier" - -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Enregistrer fichier dans" -#: ../midori/midori-browser.c:2301 +#: ../midori/midori-browser.c:1224 +msgid "Open file" +msgstr "Ouvrir fichier" + +#: ../midori/midori-browser.c:2304 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2303 +#: ../midori/midori-browser.c:2306 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2549 +#: ../midori/midori-browser.c:2577 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:2653 +#: ../midori/midori-browser.c:2688 +#, c-format +msgid "A week ago" +msgstr "Avant une semaine" + +#: ../midori/midori-browser.c:2694 #, c-format msgid "%d days ago" -msgstr "avant %d jours" +msgstr "Avant %d jours" -#: ../midori/midori-browser.c:2660 +#: ../midori/midori-browser.c:2701 msgid "Today" msgstr "Aujourd'hui" -#: ../midori/midori-browser.c:2662 +#: ../midori/midori-browser.c:2703 msgid "Yesterday" msgstr "Hier" -#: ../midori/midori-browser.c:2751 +#: ../midori/midori-browser.c:2792 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2800 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin " -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2934 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3040 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3012 +#: ../midori/midori-browser.c:3043 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3046 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3049 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3052 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3054 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3055 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3057 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3058 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3061 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3064 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3066 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3069 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3041 ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3078 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3081 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3084 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3087 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3089 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3090 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3092 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:3093 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3096 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3097 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou d'une phrase" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3100 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3102 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3103 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3115 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3118 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3121 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3092 ../midori/midori-view.c:924 +#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3124 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3126 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3127 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3131 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3133 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3136 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3139 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3142 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:3113 -msgid "Open in Page_holder..." -msgstr "Ouvrir dans le _cadre de pages..." - -#: ../midori/midori-browser.c:3114 -msgid "Open the current page in the pageholder" -msgstr "Ouvrir la page actuelle dans le cadre de pages" - -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3144 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3145 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#. FIXME: Make this sensitive only when there is a tab to undo -#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:899 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3148 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3152 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3155 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3158 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected history item" msgstr "Supprimer l'element sélectionné de la historique" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3164 msgid "Clear the entire history" msgstr "Vider l'historique entier" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3167 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'element sélectionné de la historique" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3169 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3143 ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3172 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3176 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3177 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3179 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3180 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3182 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3184 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3185 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3187 msgid "_Frequent questions" msgstr "_Questions couramment" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3188 msgid "Show the Frequently Asked Questions" msgstr "Afficher les foire aux questions" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3190 msgid "_Report a bug" msgstr "_Adviser un problème" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3191 msgid "Open Midori's bug tracker" msgstr "Ouvrir le persécuteur de problèmes de Midori" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3194 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3201 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3202 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3207 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3208 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3211 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3212 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3215 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3216 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3219 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3220 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3223 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3224 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3227 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3228 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3644 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3646 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3670 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3672 msgid "Run a web search" msgstr "Lance une recherche toile" -#: ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3691 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:3521 +#: ../midori/midori-browser.c:3704 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3706 msgid "Reopen pages that you visited earlier" msgstr "Réouvre des pages déjà visitées" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3721 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauveguardées" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3734 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3736 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" -#: ../midori/midori-browser.c:3679 +#: ../midori/midori-browser.c:3858 msgid "Bookmarks" msgstr "Signets" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3686 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Transferts" - -#: ../midori/midori-browser.c:3695 -msgid "Console" -msgstr "Console" - -#: ../midori/midori-browser.c:3733 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3742 -msgid "Pageholder" -msgstr "Cadre de pages" - -#: ../midori/midori-browser.c:3810 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3944 msgid "_Inline find:" -msgstr "Recherche rapide :" +msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3979 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3853 +#: ../midori/midori-browser.c:3987 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:3996 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4108 +#: ../midori/midori-browser.c:4237 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1514 +#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:132 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:147 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:148 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:149 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:150 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:151 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:152 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:167 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:168 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:169 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:184 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:185 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:186 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:187 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:188 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:203 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:204 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:246 msgid "Whether to save the last window size" msgstr "Enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:254 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:272 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" -#: ../midori/midori-websettings.c:280 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:282 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../midori/midori-websettings.c:298 -msgid "Last pageholder URI" -msgstr "Dernier URI du cadre de pages" - -#: ../midori/midori-websettings.c:299 -msgid "The URI last opened in the pageholder" -msgstr "Le dernier URI ouvert dans le cadre de pages" - -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:301 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:302 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:310 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:311 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:319 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:320 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:328 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:329 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:337 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:338 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:347 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:348 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:357 msgid "Toolbar Items" msgstr "Elements de la barre d'outils" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:358 msgid "The items to show on the toolbar" msgstr "Les elements pour afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:366 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:367 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau compact" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:376 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:377 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:387 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:395 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:396 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:404 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:405 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:413 msgid "Text Editor" msgstr "Editeur texte" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:414 msgid "An external text editor" msgstr "Un editeur texte externe" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:422 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:423 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:431 msgid "Preferred Encoding" msgstr "Codage favori" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:432 msgid "The preferred character encoding" msgstr "Codage des caractères favori" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:442 msgid "Always Show Tabbar" msgstr "Toujours afficher barre d'onglets" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:443 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:451 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:460 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:461 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:470 msgid "Open external pages in" -msgstr "Ouvrir les nouvelles pages dans" +msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:471 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:480 msgid "Middle click opens Selection" msgstr "Clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:481 msgid "Load an URL from the selection via middle click" msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:489 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:490 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:498 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:499 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:507 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:508 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:518 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:519 msgid "What type of cookies to accept" msgstr "Type de témoins à accepter" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:528 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:529 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:537 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:538 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:548 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:549 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:557 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:558 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:566 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:567 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:575 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:576 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:586 msgid "HTTP Proxy" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:587 msgid "The proxy used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:595 msgid "Cache size" msgstr "Taille de l'antémémoire (cache)" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:596 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" -#: ../midori/midori-view.c:82 -msgid "Load Provisional" -msgstr "Chargement provisoire" - -#: ../midori/midori-view.c:83 -msgid "Load Committed" -msgstr "Chargement envoyé" - -#: ../midori/midori-view.c:84 -msgid "Load Finished" -msgstr "Chargement effectué" - -#: ../midori/midori-view.c:836 +#: ../midori/midori-view.c:818 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:861 -msgid "_Download Link destination" -msgstr "_Télécharger destination du lien" +#: ../midori/midori-view.c:841 +#, fuzzy +msgid "_Save Link destination" +msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:849 +msgid "_Download Link destination" +msgstr "_Télécharger la cible du lien" + +#: ../midori/midori-view.c:871 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1237 #, c-format msgid "Inspect page - %s" -msgstr "Analyser page - %s" +msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1386 +#: ../midori/midori-view.c:1375 msgid "Source" msgstr "Source" -#: ../midori/midori-preferences.c:89 +#: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Préférences de %s" @@ -1214,7 +1187,7 @@ msgstr "Comportement" msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:411 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 msgid "Load images automatically" msgstr "Charger les images automatiquement" @@ -1223,14 +1196,15 @@ msgid "Shrink images automatically" msgstr "Diminuer les images automatiquement" #: ../midori/midori-preferences.c:417 -msgid "Print backgrounds" +#, fuzzy +msgid "Print background images" msgstr "Imprimer les arrière-plans" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "On peut agrandir champs de texte" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 msgid "Enable scripts" msgstr "Activer scripts" @@ -1276,31 +1250,31 @@ msgstr "Témoins de toile" msgid "days" msgstr "jours" -#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Icône (nom ou fichier) :" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Gérer les moteurs de recherche" @@ -1308,25 +1282,25 @@ msgstr "Gérer les moteurs de recherche" msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous êtes connecté en tant que superutilisateur !" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Une erreur inconnu est survenue." -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s n'a pas de propriété « %s »" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s ne peut être assigné à %s.%s" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s ne peut être accédé" @@ -1345,15 +1319,24 @@ msgstr "L'icône de catalogue « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Choisissez un répertoire" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Cadre de pages" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "C_adre de pages" From 110b90d31f69ca161369f45b5efcc4fc46fcffc9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 29 Nov 2008 23:53:47 +0100 Subject: [PATCH 0529/2970] Add British English translation --- AUTHORS | 2 + po/LINGUAS | 2 +- po/en_GB.po | 1330 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1333 insertions(+), 1 deletion(-) create mode 100644 po/en_GB.po diff --git a/AUTHORS b/AUTHORS index ccc51ff0..456f5641 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,6 +22,8 @@ Graphics: Translations: de: Enrico Tröger de: Christian Dywan + en_GB: Bastien Nocera + en_GB: Abigail Brady es: Miguel Anxo Bouzada es: Christian Dywan et: Kristjan Siimson diff --git a/po/LINGUAS b/po/LINGUAS index 3da2241e..3e86930d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de es et fi fr gl hu id nl pl ru sv tr uk +de en_GB es et fi fr gl hu id nl pl ru sv tr uk diff --git a/po/en_GB.po b/po/en_GB.po new file mode 100644 index 00000000..d33c18df --- /dev/null +++ b/po/en_GB.po @@ -0,0 +1,1330 @@ +# British English translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Bastien Nocera 2008 +# Abigail Brady 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"PO-Revision-Date: 2008-11-29 23:39+0100\n" +"Last-Translator: Abigail Brady \n" +"Language-Team: British English \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Lightweight web browser" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 +#: ../midori/main.c:1161 ../midori/main.c:1185 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Web Browser" + +#: ../midori/main.c:81 +msgid "_Bookmark" +msgstr "_Bookmark" + +#: ../midori/main.c:82 ../midori/midori-browser.c:3719 +msgid "_Bookmarks" +msgstr "_Bookmarks" + +#: ../midori/main.c:83 +msgid "_Add Bookmark" +msgstr "_Add Bookmark" + +#: ../midori/main.c:84 +msgid "_Console" +msgstr "_Console" + +#: ../midori/main.c:85 +msgid "_Extensions" +msgstr "_Extensions" + +#: ../midori/main.c:86 +msgid "_History" +msgstr "_History" + +#: ../midori/main.c:87 +msgid "_Homepage" +msgstr "_Homepage" + +#: ../midori/main.c:88 +msgid "_Userscripts" +msgstr "_Userscripts" + +#: ../midori/main.c:89 +msgid "User_styles" +msgstr "User_styles" + +#: ../midori/main.c:90 +msgid "New _Tab" +msgstr "New _Tab" + +#: ../midori/main.c:91 +msgid "_Transfers" +msgstr "_Transfers" + +#: ../midori/main.c:92 +msgid "_Closed Tabs and Windows" +msgstr "_Closed Tabs and Windows" + +#: ../midori/main.c:93 +msgid "New _Window" +msgstr "New _Window" + +#: ../midori/main.c:138 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "The configuration couldn't be loaded: %s\n" + +#: ../midori/main.c:193 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Value '%s' is invalid for %s" + +#: ../midori/main.c:200 ../midori/main.c:270 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Invalid configuration value '%s'" + +#: ../midori/main.c:527 +msgid "File not found." +msgstr "File not found." + +#: ../midori/main.c:535 ../midori/main.c:544 +msgid "Malformed document." +msgstr "Malformed document." + +#: ../midori/main.c:566 ../midori/main.c:598 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Failed to open database: %s\n" + +#: ../midori/main.c:652 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Failed to remove history item: %s\n" + +#: ../midori/main.c:676 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Failed to clear history: %s\n" + +#: ../midori/main.c:709 ../midori/main.c:723 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Failed to add history item: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:839 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Failed to remove old history items: %s\n" + +#: ../midori/main.c:971 ../midori/sokoke.c:459 +#, c-format +msgid "Writing failed." +msgstr "Writing failed." + +#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Transfers" + +#: ../midori/main.c:1024 +msgid "Console" +msgstr "Console" + +#: ../midori/main.c:1034 ../midori/midori-addons.c:88 +msgid "Userscripts" +msgstr "Userscripts" + +#: ../midori/main.c:1042 ../midori/midori-addons.c:89 +msgid "Userstyles" +msgstr "Userstyles" + +#: ../midori/main.c:1051 +msgid "Extensions" +msgstr "Extensions" + +#: ../midori/main.c:1071 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "The session couldn't be saved. %s" + +#: ../midori/main.c:1100 +msgid "Run the specified filename as javascript" +msgstr "Run the specified filename as javascript" + +#: ../midori/main.c:1102 +msgid "Display program version" +msgstr "Display program version" + +#: ../midori/main.c:1104 +msgid "URIs" +msgstr "URIs" + +#: ../midori/main.c:1138 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1162 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Please report comments, suggestions and bugs to:" + +#: ../midori/main.c:1164 +msgid "Check for new versions at:" +msgstr "Check for new versions at:" + +#: ../midori/main.c:1185 +msgid "No filename specified" +msgstr "No filename specified" + +#: ../midori/main.c:1202 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "An instance of Midori is already running but not responding.\n" + +#: ../midori/main.c:1238 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "The bookmarks couldn't be loaded: %s\n" + +#: ../midori/main.c:1254 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "The session couldn't be loaded: %s\n" + +#: ../midori/main.c:1268 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "The wastebasket couldn't be loaded: %s\n" + +#: ../midori/main.c:1282 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "The history couldn't be loaded: %s\n" + +#: ../midori/main.c:1295 +msgid "The following errors occured:" +msgstr "The following errors occured:" + +#: ../midori/main.c:1479 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "The search engines couldn't be saved. %s" + +#: ../midori/main.c:1489 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "The bookmarks couldn't be saved. %s" + +#: ../midori/main.c:1498 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "The wastebasket couldn't be saved. %s" + +#: ../midori/main.c:1506 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "The configuration couldn't be saved. %s" + +#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 +msgid "None" +msgstr "None" + +#: ../midori/midori-addons.c:964 +msgid "_Enable" +msgstr "_Enable" + +#: ../midori/midori-addons.c:973 +msgid "_Disable" +msgstr "_Disable" + +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3112 +msgid "Reload the current page" +msgstr "Reload the current page" + +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 +msgid "Stop loading the current page" +msgstr "Stop loading the current page" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% loaded" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Unexpected action '%s'." + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "New bookmark" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Edit bookmark" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Title:" + +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Description:" + +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Folder:" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Root" + +#: ../midori/midori-browser.c:668 +msgid "Save file as" +msgstr "Save file as" + +#: ../midori/midori-browser.c:1224 +msgid "Open file" +msgstr "Open file" + +#: ../midori/midori-browser.c:2304 +msgid "Open in New _Tab" +msgstr "Open in New _Tab" + +#: ../midori/midori-browser.c:2306 +msgid "Open in New _Window" +msgstr "Open in New _Window" + +#: ../midori/midori-browser.c:2577 +msgid "Separator" +msgstr "Separator" + +#: ../midori/midori-browser.c:2688 +#, c-format +msgid "A week ago" +msgstr "A week ago" + +#: ../midori/midori-browser.c:2694 +#, c-format +msgid "%d days ago" +msgstr "%d days ago" + +#: ../midori/midori-browser.c:2701 +msgid "Today" +msgstr "Today" + +#: ../midori/midori-browser.c:2703 +msgid "Yesterday" +msgstr "Yesterday" + +#: ../midori/midori-browser.c:2792 +msgid "A lightweight web browser." +msgstr "A lightweight web browser." + +#: ../midori/midori-browser.c:2800 +msgid "translator-credits" +msgstr "" +"Bastien Nocera \n" +"Abigail Brady " + +#: ../midori/midori-browser.c:2934 +msgid "Are you sure you want to remove all history items?" +msgstr "Are you sure you want to remove all history items?" + +#: ../midori/midori-browser.c:3040 +msgid "_File" +msgstr "_File" + +#: ../midori/midori-browser.c:3043 +msgid "Open a new window" +msgstr "Open a new window" + +#: ../midori/midori-browser.c:3046 +msgid "Open a new tab" +msgstr "Open a new tab" + +#: ../midori/midori-browser.c:3049 +msgid "Open a file" +msgstr "Open a file" + +#: ../midori/midori-browser.c:3052 +msgid "Save to a file" +msgstr "Save to a file" + +#: ../midori/midori-browser.c:3054 +msgid "_Close Tab" +msgstr "_Close Tab" + +#: ../midori/midori-browser.c:3055 +msgid "Close the current tab" +msgstr "Close the current tab" + +#: ../midori/midori-browser.c:3057 +msgid "C_lose Window" +msgstr "C_lose Window" + +#: ../midori/midori-browser.c:3058 +msgid "Close this window" +msgstr "Close this window" + +#: ../midori/midori-browser.c:3061 +msgid "Print the current page" +msgstr "Print the current page" + +#: ../midori/midori-browser.c:3064 +msgid "Quit the application" +msgstr "Quit the application" + +#: ../midori/midori-browser.c:3066 +msgid "_Edit" +msgstr "_Edit" + +#: ../midori/midori-browser.c:3069 +msgid "Cut the selected text" +msgstr "Cut the selected text" + +#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 +msgid "Copy the selected text" +msgstr "Copy the selected text" + +#: ../midori/midori-browser.c:3078 +msgid "Paste text from the clipboard" +msgstr "Paste text from the clipboard" + +#: ../midori/midori-browser.c:3081 +msgid "Delete the selected text" +msgstr "Delete the selected text" + +#: ../midori/midori-browser.c:3084 +msgid "Select all text" +msgstr "Select all text" + +#: ../midori/midori-browser.c:3087 +msgid "Find a word or phrase in the page" +msgstr "Find a word or phrase in the page" + +#: ../midori/midori-browser.c:3089 +msgid "Find _Next" +msgstr "Find _Next" + +#: ../midori/midori-browser.c:3090 +msgid "Find the next occurrence of a word or phrase" +msgstr "Find the next occurrence of a word or phrase" + +#: ../midori/midori-browser.c:3092 +msgid "Find _Previous" +msgstr "Find _Previous" + +#: ../midori/midori-browser.c:3093 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Find the previous occurrence of a word or phrase" + +#: ../midori/midori-browser.c:3096 +msgid "_Quick Find" +msgstr "_Quick Find" + +#: ../midori/midori-browser.c:3097 +msgid "Quickly jump to a word or phrase" +msgstr "Quickly jump to a word or phrase" + +#: ../midori/midori-browser.c:3100 +msgid "Configure the application preferences" +msgstr "Configure the application preferences" + +#: ../midori/midori-browser.c:3102 +msgid "_View" +msgstr "_View" + +#: ../midori/midori-browser.c:3103 +msgid "_Toolbars" +msgstr "_Toolbars" + +#: ../midori/midori-browser.c:3115 +msgid "Increase the zoom level" +msgstr "Increase the zoom level" + +#: ../midori/midori-browser.c:3118 +msgid "Decrease the zoom level" +msgstr "Decrease the zoom level" + +#: ../midori/midori-browser.c:3121 +msgid "Reset the zoom level" +msgstr "Reset the zoom level" + +#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 +msgid "View _Source" +msgstr "View _Source" + +#: ../midori/midori-browser.c:3124 +msgid "View the source code of the page" +msgstr "View the source code of the page" + +#: ../midori/midori-browser.c:3126 +msgid "View Selection Source" +msgstr "View Selection Source" + +#: ../midori/midori-browser.c:3127 +msgid "View the source code of the selection" +msgstr "View the source code of the selection" + +#: ../midori/midori-browser.c:3131 +msgid "Toggle fullscreen view" +msgstr "Toggle fullscreen view" + +#: ../midori/midori-browser.c:3133 +msgid "_Go" +msgstr "_Go" + +#: ../midori/midori-browser.c:3136 +msgid "Go back to the previous page" +msgstr "Go back to the previous page" + +#: ../midori/midori-browser.c:3139 +msgid "Go forward to the next page" +msgstr "Go forward to the next page" + +#: ../midori/midori-browser.c:3142 +msgid "Go to your homepage" +msgstr "Go to your homepage" + +#: ../midori/midori-browser.c:3144 +msgid "Empty Trash" +msgstr "Empty Wastebasket" + +#: ../midori/midori-browser.c:3145 +msgid "Delete the contents of the trash" +msgstr "Delete the contents of the wastebasket" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 +msgid "Undo Close Tab" +msgstr "Undo Close Tab" + +#: ../midori/midori-browser.c:3148 +msgid "Open the last closed tab" +msgstr "Open the last closed tab" + +#: ../midori/midori-browser.c:3152 +msgid "Add a new bookmark" +msgstr "Add a new bookmark" + +#: ../midori/midori-browser.c:3155 +msgid "Edit the selected bookmark" +msgstr "Edit the selected bookmark" + +#: ../midori/midori-browser.c:3158 +msgid "Delete the selected bookmark" +msgstr "Delete the selected bookmark" + +#: ../midori/midori-browser.c:3161 +msgid "Delete the selected history item" +msgstr "Delete the selected history item" + +#: ../midori/midori-browser.c:3164 +msgid "Clear the entire history" +msgstr "Clear the entire history" + +#: ../midori/midori-browser.c:3167 +msgid "Bookmark the selected history item" +msgstr "Bookmark the selected history item" + +#: ../midori/midori-browser.c:3169 +msgid "_Tools" +msgstr "_Tools" + +#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 +msgid "_Manage Search Engines" +msgstr "_Manage Search Engines" + +#: ../midori/midori-browser.c:3172 +msgid "Add, edit and remove search engines..." +msgstr "Add, edit and remove search engines..." + +#: ../midori/midori-browser.c:3176 +msgid "_Previous Tab" +msgstr "_Previous Tab" + +#: ../midori/midori-browser.c:3177 +msgid "Switch to the previous tab" +msgstr "Switch to the previous tab" + +#: ../midori/midori-browser.c:3179 +msgid "_Next Tab" +msgstr "_Next Tab" + +#: ../midori/midori-browser.c:3180 +msgid "Switch to the next tab" +msgstr "Switch to the next tab" + +#: ../midori/midori-browser.c:3182 +msgid "_Help" +msgstr "_Help" + +#: ../midori/midori-browser.c:3184 +msgid "_Contents" +msgstr "_Contents" + +#: ../midori/midori-browser.c:3185 +msgid "Show the documentation" +msgstr "Show the documentation" + +#: ../midori/midori-browser.c:3187 +msgid "_Frequent questions" +msgstr "_Frequent questions" + +#: ../midori/midori-browser.c:3188 +msgid "Show the Frequently Asked Questions" +msgstr "Show the Frequently Asked Questions" + +#: ../midori/midori-browser.c:3190 +msgid "_Report a bug" +msgstr "_Report a bug" + +#: ../midori/midori-browser.c:3191 +msgid "Open Midori's bug tracker" +msgstr "Open Midori's bug tracker" + +#: ../midori/midori-browser.c:3194 +msgid "Show information about the program" +msgstr "Show information about the program" + +#: ../midori/midori-browser.c:3201 +msgid "P_rivate Browsing" +msgstr "P_rivate Browsing" + +#: ../midori/midori-browser.c:3202 +msgid "Don't save any private data while browsing" +msgstr "Don't save any private data while browsing" + +#: ../midori/midori-browser.c:3207 +msgid "_Menubar" +msgstr "_Menubar" + +#: ../midori/midori-browser.c:3208 +msgid "Show menubar" +msgstr "Show menubar" + +#: ../midori/midori-browser.c:3211 +msgid "_Navigationbar" +msgstr "_Navigationbar" + +#: ../midori/midori-browser.c:3212 +msgid "Show navigationbar" +msgstr "Show navigationbar" + +#: ../midori/midori-browser.c:3215 +msgid "Side_panel" +msgstr "Side_panel" + +#: ../midori/midori-browser.c:3216 +msgid "Show sidepanel" +msgstr "Show sidepanel" + +#: ../midori/midori-browser.c:3219 +msgid "_Bookmarkbar" +msgstr "_Bookmarkbar" + +#: ../midori/midori-browser.c:3220 +msgid "Show bookmarkbar" +msgstr "Show bookmarkbar" + +#: ../midori/midori-browser.c:3223 +msgid "_Transferbar" +msgstr "_Transferbar" + +#: ../midori/midori-browser.c:3224 +msgid "Show transferbar" +msgstr "Show transferbar" + +#: ../midori/midori-browser.c:3227 +msgid "_Statusbar" +msgstr "_Statusbar" + +#: ../midori/midori-browser.c:3228 +msgid "Show statusbar" +msgstr "Show statusbar" + +#: ../midori/midori-browser.c:3644 +msgid "_Location..." +msgstr "_Location..." + +#: ../midori/midori-browser.c:3646 +msgid "Open a particular location" +msgstr "Open a particular location" + +#: ../midori/midori-browser.c:3670 +msgid "_Web Search..." +msgstr "_Web Search..." + +#: ../midori/midori-browser.c:3672 +msgid "Run a web search" +msgstr "Run a web search" + +#: ../midori/midori-browser.c:3691 +msgid "Reopen a previously closed tab or window" +msgstr "Reopen a previously closed tab or window" + +#: ../midori/midori-browser.c:3704 +msgid "_Recently visited pages" +msgstr "_Recently visited pages" + +#: ../midori/midori-browser.c:3706 +msgid "Reopen pages that you visited earlier" +msgstr "Reopen pages that you visited earlier" + +#: ../midori/midori-browser.c:3721 +msgid "Show the saved bookmarks" +msgstr "Show the saved bookmarks" + +#: ../midori/midori-browser.c:3734 +msgid "_Window" +msgstr "_Window" + +#: ../midori/midori-browser.c:3736 +msgid "Show a list of all open tabs" +msgstr "Show a list of all open tabs" + +#: ../midori/midori-browser.c:3858 +msgid "Bookmarks" +msgstr "Bookmarks" + +#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 +msgid "History" +msgstr "History" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3944 +msgid "_Inline find:" +msgstr "_Inline find:" + +#: ../midori/midori-browser.c:3979 +msgid "Match Case" +msgstr "Match Case" + +#: ../midori/midori-browser.c:3987 +msgid "Highlight Matches" +msgstr "Highlight Matches" + +#: ../midori/midori-browser.c:3996 +msgid "Close Findbar" +msgstr "Close Findbar" + +#: ../midori/midori-browser.c:4237 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Unexpected setting '%s'" + +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "Close panel" + +#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 +msgid "Blank page" +msgstr "Blank page" + +#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 +msgid "Homepage" +msgstr "Homepage" + +#: ../midori/midori-websettings.c:132 +msgid "Last open pages" +msgstr "Last open pages" + +#: ../midori/midori-websettings.c:147 +msgid "Chinese (BIG5)" +msgstr "Chinese (BIG5)" + +#: ../midori/midori-websettings.c:148 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanese (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:149 +msgid "Russian (KOI8-R)" +msgstr "Russian (KOI8-R)" + +#: ../midori/midori-websettings.c:150 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:151 +msgid "Western (ISO-8859-1)" +msgstr "Western (ISO-8859-1)" + +#: ../midori/midori-websettings.c:152 +msgid "Custom..." +msgstr "Custom..." + +#: ../midori/midori-websettings.c:167 +msgid "New tab" +msgstr "New tab" + +#: ../midori/midori-websettings.c:168 +msgid "New window" +msgstr "New window" + +#: ../midori/midori-websettings.c:169 +msgid "Current tab" +msgstr "Current tab" + +#: ../midori/midori-websettings.c:184 +msgid "Default" +msgstr "Default" + +#: ../midori/midori-websettings.c:185 +msgid "Icons" +msgstr "Icons" + +#: ../midori/midori-websettings.c:186 +msgid "Text" +msgstr "Text" + +#: ../midori/midori-websettings.c:187 +msgid "Both" +msgstr "Both" + +#: ../midori/midori-websettings.c:188 +msgid "Both horizontal" +msgstr "Both horizontal" + +#: ../midori/midori-websettings.c:203 +msgid "All cookies" +msgstr "All cookies" + +#: ../midori/midori-websettings.c:204 +msgid "Session cookies" +msgstr "Session cookies" + +#: ../midori/midori-websettings.c:245 +msgid "Remember last window size" +msgstr "Remember last window size" + +#: ../midori/midori-websettings.c:246 +msgid "Whether to save the last window size" +msgstr "Whether to save the last window size" + +#: ../midori/midori-websettings.c:254 +msgid "Last window width" +msgstr "Last window width" + +#: ../midori/midori-websettings.c:255 +msgid "The last saved window width" +msgstr "The last saved window width" + +#: ../midori/midori-websettings.c:263 +msgid "Last window height" +msgstr "Last window height" + +#: ../midori/midori-websettings.c:264 +msgid "The last saved window height" +msgstr "The last saved window height" + +#: ../midori/midori-websettings.c:272 +msgid "Last panel position" +msgstr "Last panel position" + +#: ../midori/midori-websettings.c:273 +msgid "The last saved panel position" +msgstr "The last saved panel position" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:282 +msgid "Last panel page" +msgstr "Last panel page" + +#: ../midori/midori-websettings.c:283 +msgid "The last saved panel page" +msgstr "The last saved panel page" + +#: ../midori/midori-websettings.c:291 +msgid "Last Web search" +msgstr "Last Web search" + +#: ../midori/midori-websettings.c:292 +msgid "The last saved Web search" +msgstr "The last saved Web search" + +#: ../midori/midori-websettings.c:301 +msgid "Show Menubar" +msgstr "Show Menubar" + +#: ../midori/midori-websettings.c:302 +msgid "Whether to show the menubar" +msgstr "Whether to show the menubar" + +#: ../midori/midori-websettings.c:310 +msgid "Show Navigationbar" +msgstr "Show Navigationbar" + +#: ../midori/midori-websettings.c:311 +msgid "Whether to show the navigationbar" +msgstr "Whether to show the navigationbar" + +#: ../midori/midori-websettings.c:319 +msgid "Show Bookmarkbar" +msgstr "Show Bookmarkbar" + +#: ../midori/midori-websettings.c:320 +msgid "Whether to show the bookmarkbar" +msgstr "Whether to show the bookmarkbar" + +#: ../midori/midori-websettings.c:328 +msgid "Show Panel" +msgstr "Show Panel" + +#: ../midori/midori-websettings.c:329 +msgid "Whether to show the panel" +msgstr "Whether to show the panel" + +#: ../midori/midori-websettings.c:337 +msgid "Show Statusbar" +msgstr "Show Statusbar" + +#: ../midori/midori-websettings.c:338 +msgid "Whether to show the statusbar" +msgstr "Whether to show the statusbar" + +#: ../midori/midori-websettings.c:347 +msgid "Toolbar Style" +msgstr "Toolbar Style" + +#: ../midori/midori-websettings.c:348 +msgid "The style of the toolbar" +msgstr "The style of the toolbar" + +#: ../midori/midori-websettings.c:357 +msgid "Toolbar Items" +msgstr "Toolbar Items" + +#: ../midori/midori-websettings.c:358 +msgid "The items to show on the toolbar" +msgstr "The items to show on the toolbar" + +#: ../midori/midori-websettings.c:366 +msgid "Compact Sidepanel" +msgstr "Compact Sidepanel" + +#: ../midori/midori-websettings.c:367 +msgid "Whether to make the sidepanel compact" +msgstr "Whether to make the sidepanel compact" + +#: ../midori/midori-websettings.c:376 +msgid "Load on Startup" +msgstr "Load on Startup" + +#: ../midori/midori-websettings.c:377 +msgid "What to load on startup" +msgstr "What to load on startup" + +#: ../midori/midori-websettings.c:387 +msgid "The homepage" +msgstr "The homepage" + +#: ../midori/midori-websettings.c:395 +msgid "Download Folder" +msgstr "Download Folder" + +#: ../midori/midori-websettings.c:396 +msgid "The folder downloaded files are saved to" +msgstr "The folder downloaded files are saved to" + +#: ../midori/midori-websettings.c:404 +msgid "Download Manager" +msgstr "Download Manager" + +#: ../midori/midori-websettings.c:405 +msgid "An external download manager" +msgstr "An external download manager" + +#: ../midori/midori-websettings.c:413 +msgid "Text Editor" +msgstr "Text Editor" + +#: ../midori/midori-websettings.c:414 +msgid "An external text editor" +msgstr "An external text editor" + +#: ../midori/midori-websettings.c:422 +msgid "Location entry Search" +msgstr "Location entry Search" + +#: ../midori/midori-websettings.c:423 +msgid "The search to perform inside the location entry" +msgstr "The search to perform inside the location entry" + +#: ../midori/midori-websettings.c:431 +msgid "Preferred Encoding" +msgstr "Preferred Encoding" + +#: ../midori/midori-websettings.c:432 +msgid "The preferred character encoding" +msgstr "The preferred character encoding" + +#: ../midori/midori-websettings.c:442 +msgid "Always Show Tabbar" +msgstr "Always Show Tabbar" + +#: ../midori/midori-websettings.c:443 +msgid "Always show the tabbar" +msgstr "Always show the tabbar" + +#: ../midori/midori-websettings.c:451 +msgid "Close Buttons on Tabs" +msgstr "Close Buttons on Tabs" + +#: ../midori/midori-websettings.c:452 +msgid "Whether tabs have close buttons" +msgstr "Whether tabs have close buttons" + +#: ../midori/midori-websettings.c:460 +msgid "Open new pages in" +msgstr "Open new pages in" + +#: ../midori/midori-websettings.c:461 +msgid "Where to open new pages" +msgstr "Where to open new pages" + +#: ../midori/midori-websettings.c:470 +msgid "Open external pages in" +msgstr "Open external pages in" + +#: ../midori/midori-websettings.c:471 +msgid "Where to open externally opened pages" +msgstr "Where to open externally opened pages" + +#: ../midori/midori-websettings.c:480 +msgid "Middle click opens Selection" +msgstr "Middle click opens Selection" + +#: ../midori/midori-websettings.c:481 +msgid "Load an URL from the selection via middle click" +msgstr "Load an URL from the selection via middle click" + +#: ../midori/midori-websettings.c:489 +msgid "Open tabs in the background" +msgstr "Open tabs in the background" + +#: ../midori/midori-websettings.c:490 +msgid "Whether to open new tabs in the background" +msgstr "Whether to open new tabs in the background" + +#: ../midori/midori-websettings.c:498 +msgid "Open Tabs next to Current" +msgstr "Open Tabs next to Current" + +#: ../midori/midori-websettings.c:499 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Whether to open new tabs next to the current tab or after the last one" + +#: ../midori/midori-websettings.c:507 +msgid "Open popups in tabs" +msgstr "Open popups in tabs" + +#: ../midori/midori-websettings.c:508 +msgid "Whether to open popup windows in tabs" +msgstr "Whether to open popup windows in tabs" + +#: ../midori/midori-websettings.c:518 +msgid "Accept cookies" +msgstr "Accept cookies" + +#: ../midori/midori-websettings.c:519 +msgid "What type of cookies to accept" +msgstr "What type of cookies to accept" + +#: ../midori/midori-websettings.c:528 +msgid "Original cookies only" +msgstr "Original cookies only" + +#: ../midori/midori-websettings.c:529 +msgid "Accept cookies from the original website only" +msgstr "Accept cookies from the original website only" + +#: ../midori/midori-websettings.c:537 +msgid "Maximum cookie age" +msgstr "Maximum cookie age" + +#: ../midori/midori-websettings.c:538 +msgid "The maximum number of days to save cookies for" +msgstr "The maximum number of days to save cookies for" + +#: ../midori/midori-websettings.c:548 +msgid "Remember last visited pages" +msgstr "Remember last visited pages" + +#: ../midori/midori-websettings.c:549 +msgid "Whether the last visited pages are saved" +msgstr "Whether the last visited pages are saved" + +#: ../midori/midori-websettings.c:557 +msgid "Maximum history age" +msgstr "Maximum history age" + +#: ../midori/midori-websettings.c:558 +msgid "The maximum number of days to save the history for" +msgstr "The maximum number of days to save the history for" + +#: ../midori/midori-websettings.c:566 +msgid "Remember last form inputs" +msgstr "Remember last form inputs" + +#: ../midori/midori-websettings.c:567 +msgid "Whether the last form inputs are saved" +msgstr "Whether the last form inputs are saved" + +#: ../midori/midori-websettings.c:575 +msgid "Remember last downloaded files" +msgstr "Remember last downloaded files" + +#: ../midori/midori-websettings.c:576 +msgid "Whether the last downloaded files are saved" +msgstr "Whether the last downloaded files are saved" + +#: ../midori/midori-websettings.c:586 +msgid "HTTP Proxy" +msgstr "HTTP Proxy" + +#: ../midori/midori-websettings.c:587 +msgid "The proxy used for HTTP connections" +msgstr "The proxy used for HTTP connections" + +#: ../midori/midori-websettings.c:595 +msgid "Cache size" +msgstr "Cache size" + +#: ../midori/midori-websettings.c:596 +msgid "The allowed size of the cache" +msgstr "The allowed size of the cache" + +#: ../midori/midori-view.c:818 +msgid "Open Link in New _Tab" +msgstr "Open Link in New _Tab" + +#: ../midori/midori-view.c:841 +msgid "_Save Link destination" +msgstr "_Save Link destination" + +#: ../midori/midori-view.c:849 +msgid "_Download Link destination" +msgstr "_Download Link destination" + +#: ../midori/midori-view.c:871 +msgid "Open URL in New _Tab" +msgstr "Open URL in New _Tab" + +#: ../midori/midori-view.c:1237 +#, c-format +msgid "Inspect page - %s" +msgstr "Inspect page - %s" + +#: ../midori/midori-view.c:1375 +msgid "Source" +msgstr "Source" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "Preferences for %s" + +#. Page "General" +#: ../midori/midori-preferences.c:338 +msgid "General" +msgstr "General" + +#: ../midori/midori-preferences.c:339 +msgid "Startup" +msgstr "Startup" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:386 +msgid "Appearance" +msgstr "Appearance" + +#: ../midori/midori-preferences.c:387 +msgid "Font settings" +msgstr "Font settings" + +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "Default Font Family" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "Minimum Font Size" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:407 +msgid "Behavior" +msgstr "Behaviour" + +#: ../midori/midori-preferences.c:408 +msgid "Features" +msgstr "Features" + +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 +msgid "Load images automatically" +msgstr "Load images automatically" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "Shrink images automatically" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "Print background images" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "Resizable text areas" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 +msgid "Enable scripts" +msgstr "Enable scripts" + +#: ../midori/midori-preferences.c:426 +msgid "Enable plugins" +msgstr "Enable plugins" + +#: ../midori/midori-preferences.c:431 +msgid "Enable developer tools" +msgstr "Enable developer tools" + +#. Page "Interface" +#: ../midori/midori-preferences.c:441 +msgid "Interface" +msgstr "Interface" + +#: ../midori/midori-preferences.c:442 +msgid "Navigationbar" +msgstr "Navigationbar" + +#: ../midori/midori-preferences.c:457 +msgid "Browsing" +msgstr "Browsing" + +#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 +msgid "Network" +msgstr "Network" + +#: ../midori/midori-preferences.c:496 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:502 +msgid "Privacy" +msgstr "Privacy" + +#: ../midori/midori-preferences.c:504 +msgid "Web Cookies" +msgstr "Web Cookies" + +#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +msgid "days" +msgstr "days" + +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "Empty" + +#: ../midori/midori-searchaction.c:797 +msgid "Add search engine" +msgstr "Add search engine" + +#: ../midori/midori-searchaction.c:797 +msgid "Edit search engine" +msgstr "Edit search engine" + +#: ../midori/midori-searchaction.c:825 +msgid "_Name:" +msgstr "_Name:" + +#: ../midori/midori-searchaction.c:869 +msgid "_Icon (name or file):" +msgstr "_Icon (name or file):" + +#: ../midori/midori-searchaction.c:883 +msgid "_Token:" +msgstr "_Token:" + +#: ../midori/midori-searchaction.c:1060 +msgid "Manage search engines" +msgstr "Manage search engines" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Could not run external program." + +#: ../midori/sokoke.c:282 +msgid "Warning: You are using a superuser account!" +msgstr "Warning: You are using a superuser account!" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "An unknown error occured." + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s has no property '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s cannot be assigned to %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s cannot be accessed" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Named icon '%s' couldn't be loaded" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Stock icon '%s' couldn't be loaded" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Animation frames are broken" + +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Property '%s' is invalid for %s" + +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +msgid "Choose file" +msgstr "Choose file" + +#: ../katze/katze-utils.c:198 +msgid "Choose folder" +msgstr "Choose folder" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Pageholder" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Pageholder" From d5e9443624073fc5f1e771c1561ac25ffb9dd6d3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Nov 2008 01:11:03 +0100 Subject: [PATCH 0530/2970] Fix erroneous string in es.po --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 6c75e04c..4f8e3c0e 100644 --- a/po/es.po +++ b/po/es.po @@ -108,7 +108,7 @@ msgstr "Documento defectuoso" #: ../midori/main.c:566 ../midori/main.c:598 #, c-format msgid "Failed to open database: %s\n" -msgstr "Falló a abrir la banco de datos" +msgstr "Falló a abrir la banco de datos: %s\n" #: ../midori/main.c:652 #, c-format From 5f149946d6d67cc85bd537a04bf4a487510b10d1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Nov 2008 01:22:03 +0100 Subject: [PATCH 0531/2970] Implement MIDORI_CHECK_VERSION for use in extensions --- midori/midori.h | 6 ++++++ wscript | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/midori/midori.h b/midori/midori.h index a456ac88..7a4dd10e 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -31,4 +31,10 @@ /* For convenience, include localization header */ #include +#define MIDORI_CHECK_VERSION(major, minor, micro) \ + (MIDORI_MAJOR_VERSION > (major) || \ + (MIDORI_MAJOR_VERSION == (major) && MIDORI_MINOR_VERSION > (minor)) || \ + (MIDORI_MAJOR_VERSION == (major) && MIDORI_MINOR_VERSION == (minor) && \ + MIDORI_MICRO_VERSION >= (micro))) + #endif /* __MIDORI_H__ */ diff --git a/wscript b/wscript index 34f31a61..4cc24f6f 100644 --- a/wscript +++ b/wscript @@ -9,8 +9,12 @@ import sys import os import UnitTest +major = 0 +minor = 1 +micro = 0 + APPNAME = 'midori' -VERSION = '0.1.0' +VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], @@ -127,6 +131,10 @@ def configure (conf): conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs') conf.define ('GETTEXT_PACKAGE', APPNAME) + conf.define ('MIDORI_MAJOR_VERSION', major) + conf.define ('MIDORI_MINOR_VERSION', minor) + conf.define ('MIDORI_MICRO_VERSION', micro) + conf.write_config_header ('config.h') conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') From c2c031e041ff51072393b585a210851d5a355884 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Nov 2008 01:48:04 +0100 Subject: [PATCH 0532/2970] Bump version to 0.1.1 --- ChangeLog | 13 +++++++++++++ configure.in | 2 +- wscript | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a280d2a..add8b40c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.1: + + Reimplement page holder as an extension + + Introduce a C extension interface + + Introduce unit tests for automated testing + + Implement history based location completion + + Support the Web Inspector in new WebKit versions + + Bookmarkbar properly reflects changes + + Improve overall OS X integration + + Add a Text Editor Preference + + Add a Compat sidebar Preference + + Add an Open external pages in Preference + + Implement source view and cached favicons with libsoup + v0.1.0: + Allow for hiding the menubar + Make the navigationbar customizable diff --git a/configure.in b/configure.in index 931fb769..9c4a7605 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # This file is licensed under the terms of the expat license, see the file EXPAT. # Register ourselves to autoconf -AC_INIT([midori], [0.1.0], [http://www.twotoasts.de/bugs]) +AC_INIT([midori], [0.1.1], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/midori-stock.h]) AC_CONFIG_HEADER([config.h]) diff --git a/wscript b/wscript index 4cc24f6f..c15fcf6c 100644 --- a/wscript +++ b/wscript @@ -11,7 +11,7 @@ import UnitTest major = 0 minor = 1 -micro = 0 +micro = 1 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From a4e6720fd71d80fd9c56116f7daafb06b2578d96 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 30 Nov 2008 02:08:28 +0100 Subject: [PATCH 0533/2970] Localization string improvements --- extensions/statusbar-features.c | 17 +++++++++++++++-- midori/main.c | 2 +- midori/midori-view.c | 21 ++++++++++++++------- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 88006c18..fb8cada1 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -27,11 +27,24 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, bbox = gtk_hbox_new (FALSE, 0); settings = katze_object_get_object (browser, "settings"); button = katze_property_proxy (settings, "auto-load-images", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); + gtk_button_set_label (GTK_BUTTON (button), _("Images")); + #if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text (button, _("Load images automatically")); + #endif gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); button = katze_property_proxy (settings, "enable-scripts", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); + gtk_button_set_label (GTK_BUTTON (button), _("Scripts")); + #if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text (button, _("Enable scripts")); + #endif + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); + gtk_widget_show (button); + button = katze_property_proxy (settings, "enable-plugins", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Plugins")); + #if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text (button, _("Enable plugins")); + #endif gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); gtk_widget_show (bbox); diff --git a/midori/main.c b/midori/main.c index 2d042d71..4a18ae08 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1308,7 +1308,7 @@ main (int argc, GTK_MESSAGE_DIALOG (dialog), "%s", error_messages->str); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - "_Ignore", GTK_RESPONSE_ACCEPT, + _("_Ignore"), GTK_RESPONSE_ACCEPT, NULL); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT) { diff --git a/midori/midori-view.c b/midori/midori-view.c index 6b09e13e..1cf76301 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -542,21 +542,24 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, gboolean success, MidoriView* view) { + gchar* title; gchar* data; if (!success) { - /* Simply print a 404 error page on the fly. */ + /* i18n: The title of the 404 - Not found error page */ + title = g_strdup_printf (_("Not found - %s"), view->uri); data = g_strdup_printf ( - "Not found - %s" - "

Not found - %s

" + "%s" + "

%s

" "" "

The page you were opening doesn't exist." "

Try to load the page again, " "or move on to another page." "", - view->uri, view->uri, view->uri); + title, title, view->uri); + g_free (title); webkit_web_view_load_html_string ( WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); @@ -1393,10 +1396,13 @@ midori_view_set_uri (MidoriView* view, data = NULL; if (!strncmp (uri, "error:nodocs ", 13)) { + gchar* title; + katze_assign (view->uri, g_strdup (&uri[13])); + title = g_strdup_printf (_("No documentation installed")); data = g_strdup_printf ( - "No documentation installed" - "

No documentation installed

" + "%s" + "

%s

" "" "

There is no documentation installed at %s." @@ -1404,7 +1410,8 @@ midori_view_set_uri (MidoriView* view, "package maintainer for it or if this a custom build " "verify that the build is setup properly." "", - view->uri); + title, title, view->uri); + g_free (title); } if (data) { From 58069545626558e1d2e3f868b486e6dbf3b367d2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 1 Dec 2008 23:33:47 +0100 Subject: [PATCH 0534/2970] Add katze_object_has_property --- katze/katze-utils.c | 35 +++++++++++++++++++++++++++++------ katze/katze-utils.h | 4 ++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 03788b8a..6753bbcf 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -528,10 +528,33 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, return pixbuf; } +/** + * katze_object_has_property: + * @object: a #GObject + * @property: the name of the property + * + * Determine if @object has a property with the specified name. + * + * Return value: a boolean + * + * Since: 0.1.2 + **/ +gboolean +katze_object_has_property (gpointer object, + const gchar* property) +{ + GObjectClass* class; + + g_return_val_if_fail (G_IS_OBJECT (object), FALSE); + + class = G_OBJECT_GET_CLASS (object); + return g_object_class_find_property (class, property) != NULL; +} + /** * katze_object_get_boolean: * @object: a #GObject - * @property_name: the name of the property to get + * @property: the name of the property to get * * Retrieve the boolean value of the specified property. * @@ -553,7 +576,7 @@ katze_object_get_boolean (gpointer object, /** * katze_object_get_int: * @object: a #GObject - * @property_name: the name of the property to get + * @property: the name of the property to get * * Retrieve the integer value of the specified property. * @@ -575,7 +598,7 @@ katze_object_get_int (gpointer object, /** * katze_object_get_float: * @object: a #GObject - * @property_name: the name of the property to get + * @property: the name of the property to get * * Retrieve the float value of the specified property. * @@ -597,7 +620,7 @@ katze_object_get_float (gpointer object, /** * katze_object_get_enum: * @object: a #GObject - * @property_name: the name of the property to get + * @property: the name of the property to get * * Retrieve the enum value of the specified property. * @@ -619,7 +642,7 @@ katze_object_get_enum (gpointer object, /** * katze_object_get_string: * @object: a #GObject - * @property_name: the name of the property to get + * @property: the name of the property to get * * Retrieve the string value of the specified property. * @@ -641,7 +664,7 @@ katze_object_get_string (gpointer object, /** * katze_object_get_object: * @object: a #GObject - * @property_name: the name of the property to get + * @property: the name of the property to get * * Retrieve the object value of the specified property. * diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 10a23016..d38f8c92 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -84,6 +84,10 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, const gchar* mime_type, GError** error); +gboolean +katze_object_has_property (gpointer object, + const gchar* property); + gint katze_object_get_boolean (gpointer object, const gchar* property); From 8da012bac198553c909d6e83f24b02d6b9f3789f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 1 Dec 2008 23:39:19 +0100 Subject: [PATCH 0535/2970] Use blurb as tooltip in katze_property_proxy --- katze/katze-utils.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 6753bbcf..faed5d34 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -316,6 +316,7 @@ katze_property_proxy (gpointer object, widget = gtk_label_new (gettext (nick)); g_free (string); + gtk_widget_set_tooltip_text (widget, g_param_spec_get_blurb (pspec)); gtk_widget_set_sensitive (widget, pspec->flags & G_PARAM_WRITABLE); g_object_set_data_full (G_OBJECT (widget), "property", @@ -337,17 +338,23 @@ GtkWidget* katze_property_label (gpointer object, const gchar* property) { + GObjectClass* class; + GParamSpec* pspec; + const gchar* nick; + GtkWidget* widget; + g_return_val_if_fail (G_IS_OBJECT (object), NULL); - GObjectClass* class = G_OBJECT_GET_CLASS (object); - GParamSpec* pspec = g_object_class_find_property (class, property); + + class = G_OBJECT_GET_CLASS (object); + pspec = g_object_class_find_property (class, property); if (!pspec) { g_warning (_("Property '%s' is invalid for %s"), property, G_OBJECT_CLASS_NAME (class)); return gtk_label_new (property); } - const gchar* nick = g_param_spec_get_nick (pspec); - GtkWidget* widget = gtk_label_new (nick); + nick = g_param_spec_get_nick (pspec); + widget = gtk_label_new (nick); return widget; } From cb5f646cf5b2d004937e74c78b0eddcdcacff599 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 2 Dec 2008 02:00:55 +0100 Subject: [PATCH 0536/2970] Enable Open pages in and Enable eveloper extras conditionally --- midori/midori-preferences.c | 38 +++++++++++++++++-------------------- midori/midori-websettings.c | 24 ++++++++++++++++++++++- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index aed94c62..5785773a 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -425,13 +425,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "enable-plugins", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable plugins")); SPANNED_ADD (button, 1, 2, 2, 3); - #ifdef WEBKIT_CHECK_VERSION - #if WEBKIT_CHECK_VERSION (1, 0, 3) button = katze_property_proxy (settings, "enable-developer-extras", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); SPANNED_ADD (button, 0, 1, 3, 4); - #endif - #endif label = katze_property_label (settings, "location-entry-search"); INDENTED_ADD (label, 0, 1, 4, 5); entry = katze_property_proxy (settings, "location-entry-search", NULL); @@ -455,29 +451,29 @@ midori_preferences_set_settings (MidoriPreferences* preferences, ""); FILLED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Browsing")); - TABLE_NEW (4, 2); - label = katze_property_label (settings, "open-external-pages-in"); - INDENTED_ADD (label, 0, 1, 0, 1); - button = katze_property_proxy (settings, "open-external-pages-in", NULL); - FILLED_ADD (button, 1, 2, 0, 1); - /* label = katze_property_label (settings, "open-new-pages-in"); + TABLE_NEW (5, 2); + label = katze_property_label (settings, "open-new-pages-in"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-new-pages-in", NULL); - FILLED_ADD (button, 1, 2, 0, 1); */ + FILLED_ADD (button, 1, 2, 0, 1); + label = katze_property_label (settings, "open-external-pages-in"); + INDENTED_ADD (label, 0, 1, 1, 2); + button = katze_property_proxy (settings, "open-external-pages-in", NULL); + FILLED_ADD (button, 1, 2, 1, 2); button = katze_property_proxy (settings, "always-show-tabbar", NULL); - INDENTED_ADD (button, 0, 1, 1, 2); - button = katze_property_proxy (settings, "compact-sidepanel", NULL); - INDENTED_ADD (button, 1, 2, 1, 2); - button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); INDENTED_ADD (button, 0, 1, 2, 3); + button = katze_property_proxy (settings, "compact-sidepanel", NULL); + INDENTED_ADD (button, 1, 2, 2, 3); + button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); + INDENTED_ADD (button, 0, 1, 3, 4); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); - WIDGET_ADD (button, 1, 2, 2, 3); - /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); - SPANNED_ADD (button, 0, 1, 2, 3);*/ - button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); - WIDGET_ADD (button, 0, 1, 3, 4); - button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); WIDGET_ADD (button, 1, 2, 3, 4); + /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); + SPANNED_ADD (button, 0, 1, 4, 5);*/ + button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); + WIDGET_ADD (button, 0, 1, 5, 6); + button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); + WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ #if 0 diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 42eb570d..dd735ce7 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -107,6 +107,7 @@ enum PROP_OPEN_TABS_NEXT_TO_CURRENT, PROP_OPEN_POPUPS_IN_TABS, + PROP_ENABLE_DEVELOPER_EXTRAS, PROP_ACCEPT_COOKIES, PROP_ORIGINAL_COOKIES_ONLY, PROP_MAXIMUM_COOKIE_AGE, @@ -453,6 +454,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) TRUE, flags)); + g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); g_object_class_install_property (gobject_class, PROP_OPEN_NEW_PAGES_IN, g_param_spec_enum ( @@ -461,7 +463,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open new pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, - G_PARAM_READABLE)); + g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW) + ? G_PARAM_READWRITE : G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_OPEN_EXTERNAL_PAGES_IN, @@ -510,6 +513,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE)); + if (!g_object_class_find_property (gobject_class, "enable-developer-extras")) + /** + * MidoriWebSettings:enable-developer-extras: + * + * Whether to enable extra developer tools. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_ENABLE_DEVELOPER_EXTRAS, + g_param_spec_boolean ( + "enable-developer-extras", + "Enable Developer Extras", + "Whether to enable extra developer tools", + FALSE, + G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_ACCEPT_COOKIES, @@ -899,6 +918,9 @@ midori_web_settings_get_property (GObject* object, g_value_set_boolean (value, web_settings->open_popups_in_tabs); break; + case PROP_ENABLE_DEVELOPER_EXTRAS: + g_value_set_boolean (value, FALSE); + break; case PROP_ACCEPT_COOKIES: g_value_set_enum (value, web_settings->accept_cookies); break; From cc329ec70678aa9da14d0b243a60d0947f4b8e17 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 3 Dec 2008 04:16:19 +0100 Subject: [PATCH 0537/2970] Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available. --- midori/midori-browser.c | 30 ++++++- midori/midori-view.c | 171 ++++++++++++++++++++++++++++++++++------ midori/midori-view.h | 13 +++ 3 files changed, 188 insertions(+), 26 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cf46217e..a94f8983 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -778,6 +778,29 @@ midori_view_new_window_cb (GtkWidget* view, g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); } +static void +midori_view_new_view_cb (GtkWidget* view, + GtkWidget* new_view, + MidoriNewView where, + MidoriBrowser* browser) +{ + if (where == MIDORI_NEW_VIEW_WINDOW) + { + /* MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, + NULL); + g_signal_emit (browser, signals[NEW_BROWSER], 0, new_browser); */ + g_debug ("Opening all pages in new windows not implemented"); + midori_browser_set_current_page (browser, + midori_browser_add_tab (browser, new_view)); + } + else + { + gint n = midori_browser_add_tab (browser, new_view); + if (where != MIDORI_NEW_VIEW_BACKGROUND) + midori_browser_set_current_page (browser, n); + } +} + static void midori_view_search_text_cb (GtkWidget* view, gboolean found, @@ -882,17 +905,18 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_new_tab_cb, browser, "signal::new-window", midori_view_new_window_cb, browser, + "signal::new-view", + midori_view_new_view_cb, browser, "signal::search-text", midori_view_search_text_cb, browser, "signal::add-bookmark", midori_view_add_bookmark_cb, browser, "signal::save-as", midori_view_save_as_cb, browser, + "signal::leave-notify-event", + midori_browser_tab_leave_notify_event_cb, browser, NULL); - g_signal_connect (view, "leave-notify-event", - G_CALLBACK (midori_browser_tab_leave_notify_event_cb), browser); - if (katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); diff --git a/midori/midori-view.c b/midori/midori-view.c index 1cf76301..500e3509 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -53,6 +53,7 @@ struct _MidoriView gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; + MidoriNewPage open_new_pages_in; GtkWidget* menu_item; GtkWidget* tab_label; @@ -89,6 +90,25 @@ midori_load_status_get_type (void) return type; } +GType +midori_new_view_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_NEW_VIEW_TAB, "MIDORI_NEW_VIEW_TAB", "New view in a tab" }, + { MIDORI_NEW_VIEW_BACKGROUND, "MIDORI_NEW_VIEW_BACKGROUND", + "New view in a background tab" }, + { MIDORI_NEW_VIEW_WINDOW, "MIDORI_NEW_VIEW_WINDOW", + "New view in a window" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriNewView", values); + } + return type; +} + enum { PROP_0, @@ -112,6 +132,7 @@ enum { ATTACH_INSPECTOR, NEW_TAB, NEW_WINDOW, + NEW_VIEW, SEARCH_TEXT, ADD_BOOKMARK, SAVE_AS, @@ -177,6 +198,42 @@ midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, data2); } +static void +midori_cclosure_marshal_VOID__OBJECT_ENUM (GClosure* closure, + GValue* return_value, + guint n_param_values, + const GValue* param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void(*GMarshalFunc_VOID__OBJECT_ENUM) (gpointer data1, + gpointer arg_1, + gint arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_ENUM callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_ENUM) (marshal_data + ? marshal_data : cc->callback); + callback (data1, + g_value_get_object (param_values + 1), + g_value_get_enum (param_values + 2), + data2); +} + static void midori_cclosure_marshal_VOID__STRING_INT_STRING (GClosure* closure, GValue* return_value, @@ -290,6 +347,30 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + /** + * MidoriView::new-view: + * @view: the object on which the signal is emitted + * @new_view: a newly created view + * @where: where to open the view + * + * Emitted when a new view is created. The value of + * @where determines where to open the view according + * to how it was opened and user preferences. + * + * Since: 0.1.2 + */ + signals[NEW_VIEW] = g_signal_new ( + "new-view", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + midori_cclosure_marshal_VOID__OBJECT_ENUM, + G_TYPE_NONE, 2, + MIDORI_TYPE_VIEW, + MIDORI_TYPE_NEW_VIEW); + signals[SEARCH_TEXT] = g_signal_new ( "search-text", G_TYPE_FROM_CLASS (class), @@ -783,7 +864,7 @@ midori_web_view_menu_action_activate_cb (GtkWidget* widget, MidoriView* view) { const gchar* action = g_object_get_data (G_OBJECT (widget), "action"); - g_signal_emit_by_name (view, "activate-action", action); + g_signal_emit (view, ACTIVATE_ACTION, 0, action); } static void @@ -931,6 +1012,47 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, } } +static gboolean +webkit_web_view_web_view_ready_cb (GtkWidget* web_view, + MidoriView* view) +{ + GtkWidget* new_view = gtk_widget_get_parent (web_view); + MidoriNewView where = MIDORI_NEW_VIEW_TAB; + if (view->open_new_pages_in == MIDORI_NEW_PAGE_TAB) + { + if (view->open_tabs_in_the_background) + where = MIDORI_NEW_VIEW_BACKGROUND; + } + else if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW) + where = MIDORI_NEW_VIEW_WINDOW; + + gtk_widget_show (new_view); + if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT) + { + g_debug ("Opening all pages in current tab not implemented"); + g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); + } + else + g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); + + return TRUE; +} + +static GtkWidget* +webkit_web_view_create_web_view_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + MidoriView* view) +{ + GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, + "net", view->net, + "settings", view->settings, + NULL); + midori_view_set_uri (MIDORI_VIEW (new_view), ""); + g_signal_connect (MIDORI_VIEW (new_view)->web_view, "web-view-ready", + G_CALLBACK (webkit_web_view_web_view_ready_cb), view); + return MIDORI_VIEW (new_view)->web_view; +} + static void webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* message, @@ -938,7 +1060,7 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* source_id, MidoriView* view) { - g_signal_emit_by_name (view, "console-message", message, line, source_id); + g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); } static void @@ -1125,6 +1247,7 @@ _midori_view_update_settings (MidoriView* view) g_object_get (view->settings, "download-manager", &view->download_manager, "close-buttons-on-tabs", &view->close_buttons_on_tabs, + "open-new-pages-in", &view->open_new_pages_in, "middle-click-opens-selection", &view->middle_click_opens_selection, "open-tabs-in-the-background", &view->open_tabs_in_the_background, NULL); @@ -1152,6 +1275,10 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, sokoke_widget_set_visible (view->tab_close, view->close_buttons_on_tabs); } + else if (name == g_intern_string ("open-new-pages-in")) + { + view->open_new_pages_in = g_value_get_enum (&value); + } else if (name == g_intern_string ("middle-click-opens-selection")) { view->middle_click_opens_selection = g_value_get_boolean (&value); @@ -1220,12 +1347,10 @@ midori_view_get_progress (MidoriView* view) return view->progress; } -#ifdef WEBKIT_CHECK_VERSION -#if WEBKIT_CHECK_VERSION (1, 0, 3) static WebKitWebView* -webkit_web_inspector_inspect_web_view_cb (WebKitWebInspector* inspector, - WebKitWebView* web_view, - MidoriView* view) +webkit_web_inspector_inspect_web_view_cb (gpointer inspector, + WebKitWebView* web_view, + MidoriView* view) { gchar* title; GtkWidget* window; @@ -1282,18 +1407,12 @@ webkit_web_inspector_inspect_web_view_cb (WebKitWebInspector* inspector, g_signal_emit (view, signals[ATTACH_INSPECTOR], 0, inspector_view); */ return WEBKIT_WEB_VIEW (inspector_view); } -#endif -#endif static void midori_view_construct_web_view (MidoriView* view) { WebKitWebFrame* web_frame; - #ifdef WEBKIT_CHECK_VERSION - #if WEBKIT_CHECK_VERSION (1, 0, 3) - WebKitWebInspector* inspector; - #endif - #endif + gpointer inspector; view->web_view = webkit_web_view_new (); @@ -1327,6 +1446,13 @@ midori_view_construct_web_view (MidoriView* view) "signal::destroy", webkit_web_view_destroy_cb, web_frame, NULL); + if (g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW)) + g_object_connect (view->web_view, + "signal::create-web-view", + webkit_web_view_create_web_view_cb, view, + /*"signal::web-view-ready", + webkit_web_view_web_view_ready_cb, view,*/ + NULL); g_object_connect (web_frame, "signal::load-done", webkit_web_frame_load_done_cb, view, @@ -1337,15 +1463,14 @@ midori_view_construct_web_view (MidoriView* view) gtk_widget_show (view->web_view); gtk_container_add (GTK_CONTAINER (view), view->web_view); - #ifdef WEBKIT_CHECK_VERSION - #if WEBKIT_CHECK_VERSION (1, 0, 3) - inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (view->web_view)); - g_object_connect (inspector, - "signal::inspect-web-view", - webkit_web_inspector_inspect_web_view_cb, view, - NULL); - #endif - #endif + if (katze_object_has_property (view->web_view, "web-inspector")) + { + inspector = katze_object_get_object (view->web_view, "web-inspector"); + g_object_connect (inspector, + "signal::inspect-web-view", + webkit_web_inspector_inspect_web_view_cb, view, + NULL); + } } /** diff --git a/midori/midori-view.h b/midori/midori-view.h index 8a839d55..74fa2834 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -31,6 +31,19 @@ midori_load_status_get_type (void) G_GNUC_CONST; #define MIDORI_TYPE_LOAD_STATUS \ (midori_load_status_get_type ()) +typedef enum +{ + MIDORI_NEW_VIEW_TAB, + MIDORI_NEW_VIEW_BACKGROUND, + MIDORI_NEW_VIEW_WINDOW +} MidoriNewView; + +GType +midori_new_view_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_NEW_VIEW \ + (midori_new_view_get_type ()) + #define MIDORI_TYPE_VIEW \ (midori_view_get_type ()) #define MIDORI_VIEW(obj) \ From c78f775142d8b615556ce5da6d0434859dc09787 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 3 Dec 2008 23:57:37 +0100 Subject: [PATCH 0538/2970] Implement MidoriViewable in MidoriAddons --- midori/midori-addons.c | 58 ++++++++++++++++++++++++++++++++++++------ midori/midori-addons.h | 9 +++---- 2 files changed, 53 insertions(+), 14 deletions(-) diff --git a/midori/midori-addons.c b/midori/midori-addons.c index b0d2c415..f73ff580 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -40,6 +40,11 @@ struct _MidoriAddons GSList* elements; }; +struct _MidoriAddonsClass +{ + GtkVBoxClass parent_class; +}; + struct AddonElement { gchar *fullpath; @@ -52,7 +57,12 @@ struct AddonElement GSList* excludes; }; -G_DEFINE_TYPE (MidoriAddons, midori_addons, GTK_TYPE_VBOX) +static void +midori_addons_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriAddons, midori_addons, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_addons_viewable_iface_init)); enum { @@ -127,6 +137,36 @@ midori_addons_class_init (MidoriAddonsClass* class) G_PARAM_READWRITE)); } +static const gchar* +midori_addons_get_label (MidoriViewable* viewable) +{ + if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_SCRIPTS) + return _("Userscripts"); + else if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_SCRIPTS) + return _("Userstyles"); + else + return NULL; +} + +static const gchar* +midori_addons_get_stock_id (MidoriViewable* viewable) +{ + if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_SCRIPTS) + return STOCK_SCRIPTS; + else if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_STYLES) + return STOCK_STYLES; + else + return NULL; +} + +static void +midori_addons_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_addons_get_stock_id; + iface->get_label = midori_addons_get_label; + iface->get_toolbar = midori_addons_get_toolbar; +} + static void midori_addons_set_property (GObject* object, guint prop_id, @@ -941,16 +981,18 @@ midori_addons_new (MidoriAddonKind kind, * is created on the first call of this function. * * Return value: a toolbar widget + * + * Deprecated: 0.1.2: Use midori_viewable_get_toolbar() instead. **/ GtkWidget* -midori_addons_get_toolbar (MidoriAddons* addons) +midori_addons_get_toolbar (MidoriViewable* addons) { GtkWidget* toolbar; GtkToolItem* toolitem; g_return_val_if_fail (MIDORI_IS_ADDONS (addons), NULL); - if (!addons->toolbar) + if (!MIDORI_ADDONS (addons)->toolbar) { toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); @@ -992,18 +1034,18 @@ midori_addons_get_toolbar (MidoriAddons* addons) G_CALLBACK (midori_addons_button_add_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - addons->toolbar = toolbar; + MIDORI_ADDONS (addons)->toolbar = toolbar; - g_signal_connect (addons->treeview, "cursor-changed", + g_signal_connect (MIDORI_ADDONS (addons)->treeview, "cursor-changed", G_CALLBACK (midori_addons_treeview_cursor_changed), addons); - g_signal_connect (addons->toolbar, "destroy", + g_signal_connect (toolbar, "destroy", G_CALLBACK (gtk_widget_destroyed), - &addons->toolbar); + &MIDORI_ADDONS (addons)->toolbar); } - return addons->toolbar; + return MIDORI_ADDONS (addons)->toolbar; } /** diff --git a/midori/midori-addons.h b/midori/midori-addons.h index 4503562b..662745ab 100644 --- a/midori/midori-addons.h +++ b/midori/midori-addons.h @@ -16,6 +16,8 @@ #include +#include "midori-viewable.h" + G_BEGIN_DECLS #define MIDORI_TYPE_ADDONS \ @@ -34,11 +36,6 @@ G_BEGIN_DECLS typedef struct _MidoriAddons MidoriAddons; typedef struct _MidoriAddonsClass MidoriAddonsClass; -struct _MidoriAddonsClass -{ - GtkVBoxClass parent_class; -}; - typedef enum { MIDORI_ADDON_NONE, @@ -60,7 +57,7 @@ midori_addons_new (MidoriAddonKind kind, GtkWidget* web_widget); GtkWidget* -midori_addons_get_toolbar (MidoriAddons* addons); +midori_addons_get_toolbar (MidoriViewable* addons); void midori_addons_update_elements (MidoriAddons* addons); From cfd3a475439a1cdd271fdd948f73e2182affab17 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 00:31:40 +0100 Subject: [PATCH 0539/2970] Implement MidoriViewable and "app" in MidoriConsole --- midori/midori-console.c | 163 +++++++++++++++++++++++++++++++++++++--- midori/midori-console.h | 9 +-- 2 files changed, 154 insertions(+), 18 deletions(-) diff --git a/midori/midori-console.c b/midori/midori-console.c index 507b26dc..4946caf2 100644 --- a/midori/midori-console.c +++ b/midori/midori-console.c @@ -11,6 +11,11 @@ #include "midori-console.h" +#include "midori-app.h" +#include "midori-browser.h" +#include "midori-stock.h" +#include "midori-view.h" + #include "sokoke.h" #include @@ -20,14 +25,137 @@ struct _MidoriConsole GtkWidget* toolbar; GtkWidget* treeview; + MidoriApp* app; }; -G_DEFINE_TYPE (MidoriConsole, midori_console, GTK_TYPE_VBOX) +struct _MidoriConsoleClass +{ + GtkVBoxClass parent_class; +}; + +static void +midori_console_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriConsole, midori_console, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_console_viewable_iface_init)); + +enum +{ + PROP_0, + + PROP_APP +}; + +static void +midori_console_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_console_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); static void midori_console_class_init (MidoriConsoleClass* class) { - /* Nothing to do */ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_console_set_property; + gobject_class->get_property = midori_console_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_APP, + g_param_spec_object ( + "app", + "App", + "The app", + MIDORI_TYPE_APP, + flags)); +} + +static const gchar* +midori_console_get_label (MidoriViewable* viewable) +{ + return _("Console"); +} + +static const gchar* +midori_console_get_stock_id (MidoriViewable* viewable) +{ + return STOCK_CONSOLE; +} + +static void +midori_console_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_console_get_stock_id; + iface->get_label = midori_console_get_label; + iface->get_toolbar = midori_console_get_toolbar; +} + +static void +midori_view_console_message_cb (GtkWidget* view, + const gchar* message, + gint line, + const gchar* source_id, + MidoriConsole* console) +{ + midori_console_add (console, message, line, source_id); +} + +static void +midori_console_browser_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriConsole* console) +{ + g_signal_connect (view, "console-message", + G_CALLBACK (midori_view_console_message_cb), console); +} + +static void +midori_console_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriConsole* console = MIDORI_CONSOLE (object); + + switch (prop_id) + { + case PROP_APP: + console->app = g_value_get_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_console_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriConsole* console = MIDORI_CONSOLE (object); + + switch (prop_id) + { + case PROP_APP: + g_value_set_object (value, console->app); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void @@ -46,12 +174,7 @@ midori_console_treeview_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - /* gchar* source_id; - gtk_tree_model_get (model, iter, 2, &source_id, -1); */ - g_object_set (renderer, "stock-id", GTK_STOCK_DIALOG_WARNING, NULL); - - /* g_free (source_id); */ } static void @@ -92,6 +215,16 @@ midori_console_treeview_row_activated_cb (GtkTreeView* treeview, }*/ } +static void +midori_console_hierarchy_changed_cb (MidoriConsole* console, + GtkWidget* old_parent) +{ + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (console)); + if (GTK_WIDGET_TOPLEVEL (browser)) + g_signal_connect (browser, "add-tab", + G_CALLBACK (midori_console_browser_add_tab_cb), console); +} + static void midori_console_init (MidoriConsole* console) { @@ -122,6 +255,9 @@ midori_console_init (MidoriConsole* console) console); gtk_widget_show (console->treeview); gtk_box_pack_start (GTK_BOX (console), console->treeview, TRUE, TRUE, 0); + + g_signal_connect (console, "hierarchy-changed", + G_CALLBACK (midori_console_hierarchy_changed_cb), NULL); } /** @@ -142,18 +278,21 @@ midori_console_new (void) /** * midori_console_get_toolbar: + * @console: a #MidoriConsole * * Retrieves the toolbar of the console. A new widget is created on * the first call of this function. * - * Return value: a new #MidoriConsole + * Return value: a toolbar widget + * + * Deprecated: 0.1.2: Use midori_viewable_get_toolbar() instead. **/ GtkWidget* -midori_console_get_toolbar (MidoriConsole* console) +midori_console_get_toolbar (MidoriViewable* console) { g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL); - if (!console->toolbar) + if (!MIDORI_CONSOLE (console)->toolbar) { GtkWidget* toolbar; GtkToolItem* toolitem; @@ -177,10 +316,10 @@ midori_console_get_toolbar (MidoriConsole* console) G_CALLBACK (midori_console_button_clear_clicked_cb), console); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - console->toolbar = toolbar; + MIDORI_CONSOLE (console)->toolbar = toolbar; } - return console->toolbar; + return MIDORI_CONSOLE (console)->toolbar; } /** diff --git a/midori/midori-console.h b/midori/midori-console.h index b4c096cf..011837dc 100644 --- a/midori/midori-console.h +++ b/midori/midori-console.h @@ -16,6 +16,8 @@ #include +#include "midori-viewable.h" + G_BEGIN_DECLS #define MIDORI_TYPE_CONSOLE \ @@ -34,11 +36,6 @@ G_BEGIN_DECLS typedef struct _MidoriConsole MidoriConsole; typedef struct _MidoriConsoleClass MidoriConsoleClass; -struct _MidoriConsoleClass -{ - GtkVBoxClass parent_class; -}; - GType midori_console_get_type (void); @@ -46,7 +43,7 @@ GtkWidget* midori_console_new (void); GtkWidget* -midori_console_get_toolbar (MidoriConsole* console); +midori_console_get_toolbar (MidoriViewable* console); void midori_console_add (MidoriConsole* console, From b5e2146249c6357cd4eb670478c0ec297b621b2f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 01:42:02 +0100 Subject: [PATCH 0540/2970] Add midori_extension_is_active --- midori/midori-extension.c | 31 +++++++++++++++++++++++++++++++ midori/midori-extension.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 3aadeebb..04228bd1 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -28,6 +28,7 @@ struct _MidoriExtensionPrivate gchar* version; gchar* authors; + gboolean active; gchar* config_dir; }; @@ -139,13 +140,25 @@ midori_extension_class_init (MidoriExtensionClass* class) g_type_class_add_private (class, sizeof (MidoriExtensionPrivate)); } +void +midori_extension_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + extension->priv->active = TRUE; + /* FIXME: Disconnect all signal handlers */ +} + static void midori_extension_init (MidoriExtension* extension) { extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (extension, MIDORI_TYPE_EXTENSION, MidoriExtensionPrivate); + extension->priv->active = FALSE; extension->priv->config_dir = NULL; + + g_signal_connect (extension, "activate", + G_CALLBACK (midori_extension_activate_cb), NULL); } static void @@ -239,6 +252,24 @@ midori_extension_is_prepared (MidoriExtension* extension) return FALSE; } +/** + * midori_extension_is_active: + * @extension: a #MidoriExtension + * + * Determines if @extension is active. + * + * Return value: %TRUE if @extension is active + * + * Since: 0.1.2 + **/ +gboolean +midori_extension_is_active (MidoriExtension* extension) +{ + g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), FALSE); + + return extension->priv->active; +} + /** * midori_extension_deactivate: * @extension: a #MidoriExtension diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 7f13d5de..3e21056a 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -51,6 +51,9 @@ midori_extension_get_type (void); gboolean midori_extension_is_prepared (MidoriExtension* extension); +gboolean +midori_extension_is_active (MidoriExtension* extension); + void midori_extension_deactivate (MidoriExtension* extension); From e4f401c7e73a4844d5bc12177f3321bff3b38378 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 01:44:33 +0100 Subject: [PATCH 0541/2970] Implement new Extensions panel, in the new folder extensions --- midori/wscript_build | 4 +- panels/midori-extensions.c | 336 +++++++++++++++++++++++++++++++++++++ panels/midori-extensions.h | 45 +++++ po/POTFILES.in | 1 + 4 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 panels/midori-extensions.c create mode 100644 panels/midori-extensions.h diff --git a/midori/wscript_build b/midori/wscript_build index dd6bac24..4c4f17cb 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -4,7 +4,7 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' -obj.includes = '. ..' -obj.find_sources_in_dirs ('.') +obj.includes = '. .. ../panels' +obj.find_sources_in_dirs ('. ../panels') obj.uselib = 'UNIQUE LIBSOUP GMODULE GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c new file mode 100644 index 00000000..b7887850 --- /dev/null +++ b/panels/midori-extensions.c @@ -0,0 +1,336 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-extensions.h" + +#include "midori-app.h" +#include "midori-extension.h" +#include "midori-stock.h" +#include "midori-viewable.h" + +#include "sokoke.h" +#include + +struct _MidoriExtensions +{ + GtkVBox parent_instance; + + GtkWidget* toolbar; + GtkWidget* treeview; + MidoriApp* app; +}; + +struct _MidoriExtensionsClass +{ + GtkVBoxClass parent_class; +}; + +static void +midori_extensions_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriExtensions, midori_extensions, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_extensions_viewable_iface_init)); + +enum +{ + PROP_0, + + PROP_APP +}; + +static void +midori_extensions_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_extensions_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_extensions_class_init (MidoriExtensionsClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_extensions_set_property; + gobject_class->get_property = midori_extensions_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_APP, + g_param_spec_object ( + "app", + "App", + "The app", + MIDORI_TYPE_APP, + flags)); +} + +static const gchar* +midori_extensions_get_label (MidoriViewable* viewable) +{ + return _("Extensions"); +} + +static const gchar* +midori_extensions_get_stock_id (MidoriViewable* viewable) +{ + return STOCK_EXTENSIONS; +} + +static void +midori_extensions_button_status_clicked_cb (GtkToolItem* toolitem, + MidoriExtensions* extensions) +{ + GtkTreeView* treeview; + GtkTreeModel* model; + GtkTreeIter iter; + MidoriExtension* extension; + + treeview = GTK_TREE_VIEW (extensions->treeview); + + if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + { + GtkToolItem* button_enable = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (extensions->toolbar), 1); + GtkToolItem* button_disable = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (extensions->toolbar), 2); + + gtk_tree_model_get (model, &iter, 0, &extension, -1); + if (toolitem == button_enable) + g_signal_emit_by_name (extension, "activate", extensions->app); + else if (toolitem == button_disable) + midori_extension_deactivate (extension); + + gtk_widget_set_sensitive (GTK_WIDGET (button_enable), + !midori_extension_is_active (extension)); + gtk_widget_set_sensitive (GTK_WIDGET (button_enable), + midori_extension_is_active (extension)); + } +} + +static GtkWidget* +midori_extensions_get_toolbar (MidoriViewable* extensions) +{ + if (!MIDORI_EXTENSIONS (extensions)->toolbar) + { + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + toolitem = gtk_tool_item_new (); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + + /* enable button */ + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_extensions_button_status_clicked_cb), extensions); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); + gtk_widget_show (GTK_WIDGET (toolitem)); + + /* disable button */ + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_extensions_button_status_clicked_cb), extensions); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); + gtk_widget_show (GTK_WIDGET (toolitem)); + + MIDORI_EXTENSIONS (extensions)->toolbar = toolbar; + } + + return MIDORI_EXTENSIONS (extensions)->toolbar; +} + +static void +midori_extensions_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_extensions_get_stock_id; + iface->get_label = midori_extensions_get_label; + iface->get_toolbar = midori_extensions_get_toolbar; +} + +static void +midori_extensions_add_item_cb (KatzeArray* array, + MidoriExtension* extension, + MidoriExtensions* extensions) +{ + GtkTreeIter iter; + GtkListStore* liststore = GTK_LIST_STORE (gtk_tree_view_get_model ( + GTK_TREE_VIEW (extensions->treeview))); + gtk_list_store_append (liststore, &iter); + gtk_list_store_set (liststore, &iter, 0, extension, -1); +} + +static void +midori_extensions_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriExtensions* extensions = MIDORI_EXTENSIONS (object); + + switch (prop_id) + { + case PROP_APP: + { + KatzeArray* array; + guint i, n; + + extensions->app = g_value_get_object (value); + array = katze_object_get_object (extensions->app, "extensions"); + g_signal_connect (array, "add-item", + G_CALLBACK (midori_extensions_add_item_cb), extensions); + + if ((n = katze_array_get_length (array))) + for (i = 0; i < n; i++) + midori_extensions_add_item_cb (array, + katze_array_get_nth_item (array, i), extensions); + } + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_extensions_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriExtensions* extensions = MIDORI_EXTENSIONS (object); + + switch (prop_id) + { + case PROP_APP: + g_value_set_object (value, extensions->app); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_extensions_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + g_object_set (renderer, "stock-id", GTK_STOCK_EXECUTE, NULL); +} + +static void +midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + MidoriExtension* extension; + gchar* text; + + gtk_tree_model_get (model, iter, 0, &extension, -1); + + text = g_strdup_printf ("%s\n%s", + katze_object_get_string (extension, "name"), + katze_object_get_string (extension, "description")); + g_object_set (renderer, "text", text, NULL); + g_free (text); +} + +static void +midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriExtensions* extensions) +{ + GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + + if (gtk_tree_model_get_iter (model, &iter, path)) + { + MidoriExtension* extension; + + gtk_tree_model_get (model, &iter, 0, &extension, -1); + if (midori_extension_is_active (extension)) + { + midori_extension_deactivate (extension); + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + } + else + g_signal_emit_by_name (extension, "activate", extensions->app); + } +} + +static void +midori_extensions_init (MidoriExtensions* extensions) +{ + /* Create the treeview */ + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkListStore* liststore = gtk_list_store_new (1, G_TYPE_OBJECT); + extensions->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (extensions->treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_extensions_treeview_render_icon_cb, + extensions->treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_extensions_treeview_render_text_cb, + extensions->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (extensions->treeview), column); + g_object_unref (liststore); + g_signal_connect (extensions->treeview, "row-activated", + G_CALLBACK (midori_extensions_treeview_row_activated_cb), + extensions); + gtk_widget_show (extensions->treeview); + gtk_box_pack_start (GTK_BOX (extensions), extensions->treeview, TRUE, TRUE, 0); +} + +/** + * midori_extensions_new: + * + * Creates a new empty extensions. + * + * Return value: a new #MidoriExtensions + * + * Since: 0.1.2 + **/ +GtkWidget* +midori_extensions_new (void) +{ + MidoriExtensions* extensions = g_object_new (MIDORI_TYPE_EXTENSIONS, + NULL); + + return GTK_WIDGET (extensions); +} diff --git a/panels/midori-extensions.h b/panels/midori-extensions.h new file mode 100644 index 00000000..58de7d02 --- /dev/null +++ b/panels/midori-extensions.h @@ -0,0 +1,45 @@ +/* + Copyright (C) 2008 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_EXTENSIONS_H__ +#define __MIDORI_EXTENSIONS_H__ + +#include + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_EXTENSIONS \ + (midori_extensions_get_type ()) +#define MIDORI_EXTENSIONS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_EXTENSIONS, MidoriExtensions)) +#define MIDORI_EXTENSIONS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_EXTENSIONS, MidoriExtensionsClass)) +#define MIDORI_IS_EXTENSIONS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_EXTENSIONS)) +#define MIDORI_IS_EXTENSIONS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_EXTENSIONS)) +#define MIDORI_EXTENSIONS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_EXTENSIONS, MidoriExtensionsClass)) + +typedef struct _MidoriExtensions MidoriExtensions; +typedef struct _MidoriExtensionsClass MidoriExtensionsClass; + +GType +midori_extensions_get_type (void); + +GtkWidget* +midori_extensions_new (void); + +G_END_DECLS + +#endif /* __MIDORI_EXTENSIONS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 7171a765..be85eecc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,6 +14,7 @@ midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c midori/gjs.c +panels/midori-extensions.c katze/katze-throbber.c katze/katze-utils.c katze/katze-item.c From b956a73914a96af25adea3a7f4d72cdbf575b7ac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 01:45:32 +0100 Subject: [PATCH 0542/2970] Update panel handling according to latest changes --- midori/main.c | 49 +++++++------------------------------------------ 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/midori/main.c b/midori/main.c index 4a18ae08..48b5e906 100644 --- a/midori/main.c +++ b/midori/main.c @@ -19,6 +19,7 @@ #include "midori-browser.h" #include "midori-console.h" #include "midori-extension.h" +#include "midori-extensions.h" #include "midori-panel.h" #include "midori-stock.h" #include "midori-view.h" @@ -977,25 +978,6 @@ katze_array_to_file (KatzeArray* array, return TRUE; } -static void -midori_view_console_message_cb (GtkWidget* view, - const gchar* message, - gint line, - const gchar* source_id, - MidoriConsole* console) -{ - midori_console_add (console, message, line, source_id); -} - -static void -midori_browser_add_tab_cb (MidoriBrowser* browser, - MidoriView* view, - MidoriConsole* console) -{ - g_signal_connect (view, "console-message", - G_CALLBACK (midori_view_console_message_cb), console); -} - static void midori_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -1003,7 +985,6 @@ midori_app_add_browser_cb (MidoriApp* app, { GtkWidget* panel; GtkWidget* addon; - GtkWidget* toolbar; panel = katze_object_get_object (browser, "panel"); @@ -1016,40 +997,24 @@ midori_app_add_browser_cb (MidoriApp* app, #endif /* Console */ - addon = midori_console_new (); + addon = g_object_new (MIDORI_TYPE_CONSOLE, "app", app, NULL); gtk_widget_show (addon); - toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (addon)); - gtk_widget_show (toolbar); - midori_panel_append_widget (MIDORI_PANEL (panel), addon, - STOCK_CONSOLE, _("Console"), toolbar); - g_signal_connect (browser, "add-tab", - G_CALLBACK (midori_browser_add_tab_cb), addon); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); /* Userscripts */ addon = midori_addons_new (MIDORI_ADDON_USER_SCRIPTS, GTK_WIDGET (browser)); gtk_widget_show (addon); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); - gtk_widget_show (toolbar); - midori_panel_append_widget (MIDORI_PANEL (panel), addon, - STOCK_SCRIPTS, _("Userscripts"), toolbar); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); /* Userstyles */ addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser)); gtk_widget_show (addon); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); - gtk_widget_show (toolbar); - midori_panel_append_widget (MIDORI_PANEL (panel), addon, - STOCK_STYLES, _("Userstyles"), toolbar); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); /* Extensions */ - #if 0 - addon = midori_addons_new (MIDORI_ADDON_EXTENSIONS); + addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL); gtk_widget_show (addon); - toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); - gtk_widget_show (toolbar); - midori_panel_append_page (MIDORI_PANEL (panel), addon, - STOCK_EXTENSIONS, _("Extensions"), toolbar); - #endif + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); } static void From c8e73b80a32bb6d674109c8ec451975ab6426584 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 01:50:26 +0100 Subject: [PATCH 0543/2970] Move MidoriConsole to panels folder --- midori/midori.h | 1 - {midori => panels}/midori-console.c | 0 {midori => panels}/midori-console.h | 0 po/POTFILES.in | 2 +- 4 files changed, 1 insertion(+), 2 deletions(-) rename {midori => panels}/midori-console.c (100%) rename {midori => panels}/midori-console.h (100%) diff --git a/midori/midori.h b/midori/midori.h index 7a4dd10e..f1a19b5a 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -15,7 +15,6 @@ #include "midori-addons.h" #include "midori-app.h" #include "midori-browser.h" -#include "midori-console.h" #include "midori-extension.h" #include "midori-locationaction.h" #include "midori-locationentry.h" diff --git a/midori/midori-console.c b/panels/midori-console.c similarity index 100% rename from midori/midori-console.c rename to panels/midori-console.c diff --git a/midori/midori-console.h b/panels/midori-console.h similarity index 100% rename from midori/midori-console.h rename to panels/midori-console.h diff --git a/po/POTFILES.in b/po/POTFILES.in index be85eecc..9c6adf9d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,6 @@ midori.desktop.in midori/main.c midori/midori-app.c midori/midori-addons.c -midori/midori-console.c midori/midori-browser.c midori/midori-panel.c midori/midori-websettings.c @@ -14,6 +13,7 @@ midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c midori/gjs.c +panels/midori-console.c panels/midori-extensions.c katze/katze-throbber.c katze/katze-utils.c From d5e582106426fd6e3aa133770261c89b03d4fc67 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 01:53:52 +0100 Subject: [PATCH 0544/2970] Move MidoriAddons to panels folder --- midori/midori.h | 1 - {midori => panels}/midori-addons.c | 0 {midori => panels}/midori-addons.h | 0 po/POTFILES.in | 2 +- 4 files changed, 1 insertion(+), 2 deletions(-) rename {midori => panels}/midori-addons.c (100%) rename {midori => panels}/midori-addons.h (100%) diff --git a/midori/midori.h b/midori/midori.h index f1a19b5a..a0f50f0e 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -12,7 +12,6 @@ #ifndef __MIDORI_H__ #define __MIDORI_H__ -#include "midori-addons.h" #include "midori-app.h" #include "midori-browser.h" #include "midori-extension.h" diff --git a/midori/midori-addons.c b/panels/midori-addons.c similarity index 100% rename from midori/midori-addons.c rename to panels/midori-addons.c diff --git a/midori/midori-addons.h b/panels/midori-addons.h similarity index 100% rename from midori/midori-addons.h rename to panels/midori-addons.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 9c6adf9d..692b8864 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,7 +3,6 @@ midori.desktop.in midori/main.c midori/midori-app.c -midori/midori-addons.c midori/midori-browser.c midori/midori-panel.c midori/midori-websettings.c @@ -13,6 +12,7 @@ midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c midori/gjs.c +panels/midori-addons.c panels/midori-console.c panels/midori-extensions.c katze/katze-throbber.c From e1ca9028c764d7ac5befaff1313b592658f50e15 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 4 Dec 2008 02:03:11 +0100 Subject: [PATCH 0545/2970] Remove autotooled build system once and for all --- .gitignore | 24 ----------- INSTALL | 19 --------- Makefile.am | 24 ----------- NEWS | 0 configure.in | 103 --------------------------------------------- icons/Makefile.am | 19 --------- katze/Makefile.am | 23 ---------- legacy.sh | 13 ------ midori/Makefile.am | 42 ------------------ 9 files changed, 267 deletions(-) delete mode 100644 Makefile.am delete mode 100644 NEWS delete mode 100644 configure.in delete mode 100644 icons/Makefile.am delete mode 100644 katze/Makefile.am delete mode 100755 legacy.sh delete mode 100644 midori/Makefile.am diff --git a/.gitignore b/.gitignore index 7c0e878e..7fe1870d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1,9 @@ -*.la -*.lo -*.o -.deps -.libs -aclocal.m4 -autom4te.cache -config.* -depcomp -install-sh -libtool -ltmain.sh Makefile -Makefile.in -Makefile.in.in -missing -mkinstalldirs -stamp-h1 .waf-* .lock-wscript _build_ -intltool-extract.in -intltool-extract -intltool-merge.in -intltool-merge -intltool-update.in -intltool-update - po/.intltool-merge-cache po/POTFILES po/stamp-it diff --git a/INSTALL b/INSTALL index 649fe430..89dd7340 100644 --- a/INSTALL +++ b/INSTALL @@ -39,22 +39,3 @@ function names and line numbers. For further information a tutorial for gdb and reading up on how you can install debugging symbols for libraries used by Midori are recommended. - -+++ Legacy support +++ - -There are also autotools build files available. This -is not recommended except when waf for any reason won't work. - -Make sure you have *libtool* and *intltool* installed. - -Run './legacy.sh'. - -Run './configure' - -Run 'make' - -The usual autotools way works here, please refer to -according documentation in case of questions. - -Note that the autotools based build is not a -full replacement for the recommended system. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 9e2ee96e..00000000 --- a/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -AUTOMAKE_OPTIONS = gnu - -SUBDIRS = katze midori po icons - -desktopdir = $(datadir)/applications -desktop_in_files = midori.desktop -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -DISTCLEANFILES = \ - midori.desktop \ - intltool-extract \ - intltool-merge \ - intltool-update - -EXTRA_DIST = \ - HACKING \ - TODO \ - midori.desktop.in \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29b..00000000 diff --git a/configure.in b/configure.in deleted file mode 100644 index 9c4a7605..00000000 --- a/configure.in +++ /dev/null @@ -1,103 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. -# Register ourselves to autoconf -AC_INIT([midori], [0.1.1], [http://www.twotoasts.de/bugs]) -AC_CONFIG_SRCDIR([midori/midori-stock.h]) -AC_CONFIG_HEADER([config.h]) - -AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) -AM_PROG_LIBTOOL - -# Checks for programs -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_INTLTOOL - -# Checks for header files -AC_HEADER_STDC - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST - -# Checks if we want debugging support -AC_ARG_ENABLE([debug], -AC_HELP_STRING([--enable-debug=@<:@no/yes@:>@] - , [Enable debugging @<:@default=yes@:>@]) - , [], [enable_debug=yes]) -AC_MSG_CHECKING([whether to enable debugging support]) -AC_MSG_RESULT([$enable_debug]) -if test x"$enable_debug" = x"yes"; then - # Check whether the compiler accepts -Wall - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wall" - AC_MSG_CHECKING([whether $CC accepts -Wall]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - CFLAGS="$save_CFLAGS" - ]) -fi - -# Checks for Unique -PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= 0.9, have_unique=1, have_unique=0) -AC_SUBST(UNIQUE_CFLAGS) -AC_SUBST(UNIQUE_LIBS) -AC_DEFINE_UNQUOTED(HAVE_UNIQUE,$have_unique, [Whether Unique is available]) - -# Checks for Gtk+2 -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10, have_gtk=1, have_gtk=0) -if test "x${have_gtk}" = "xfalse" ; then - AC_MSG_ERROR([No Gtk+2 package information found]) -fi -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) -AC_DEFINE_UNQUOTED(HAVE_GTK,$have_gtk, [Whether Gtk is available]) - -# Checks for WebKit -PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=1, have_webkit=0) -if test "x${have_webkit}" = "xfalse" ; then - AC_MSG_ERROR([No WebKit package information found]) -fi -AC_SUBST(WEBKIT_CFLAGS) -AC_SUBST(WEBKIT_LIBS) -AC_DEFINE_UNQUOTED(HAVE_WEBKIT,$have_webkit, [Whether WebKit is available]) - -# Checks for LibXML2 -PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=1, have_libxml=0) -if test "x${have_libxml}" = "xfalse" ; then - AC_MSG_ERROR([No libXML2 package information found]) -fi -AC_SUBST(LIBXML_CFLAGS) -AC_SUBST(LIBXML_LIBS) -AC_DEFINE_UNQUOTED(HAVE_LIBXML,$have_libxml, [Whether LibXML is available]) - -# Check for sqlite 3 -PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.0], have_sqlite3=1, have_sqlite3=0) -AC_SUBST([SQLITE3_CFLAGS]) -AC_SUBST([SQLITE3_LIBS]) -AC_DEFINE_UNQUOTED(HAVE_SQLITE,$have_sqlite3, [Whether sqlite3 is available]) - -# i18n -GETTEXT_PACKAGE=midori -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) - -# take all languages found in file po/LINGUAS -ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" - -AM_GLIB_GNU_GETTEXT -# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) -if test "x$MSGFMT" = "xno"; then - AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) -fi - -# Here we tell the configure script which files to *create* -AC_CONFIG_FILES([ - Makefile \ - katze/Makefile \ - midori/Makefile \ - po/Makefile.in \ - icons/Makefile -]) -AC_OUTPUT diff --git a/icons/Makefile.am b/icons/Makefile.am deleted file mode 100644 index 1ca619c3..00000000 --- a/icons/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -iconsdir = $(datadir)/icons/hicolor/scalable/apps -icons_DATA = scalable/midori.svg - -EXTRA_DIST = $(icons_DATA) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi diff --git a/katze/Makefile.am b/katze/Makefile.am deleted file mode 100644 index 7729d067..00000000 --- a/katze/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -INCLUDES = \ - $(GTK_CFLAGS) \ - $(LIBXML_CFLAGS) - -noinst_LTLIBRARIES = \ - libkatze.la - -libkatze_la_LIBADD = \ - $(GTK_LIBS) \ - $(INTLLIBS) \ - $(LIBXML_LIBS) - -libkatze_la_SOURCES = \ - katze.h \ - katze-throbber.c katze-throbber.h \ - katze-utils.c katze-utils.h \ - katze-item.c katze-item.h \ - katze-list.c katze-list.h \ - katze-array.c katze-array.h \ - katze-arrayaction.c katze-arrayaction.h \ - katze-net.c katze-net.h diff --git a/legacy.sh b/legacy.sh deleted file mode 100755 index 70867688..00000000 --- a/legacy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# This file is licensed under the terms of the expat license, see the file EXPAT. - -echo "no" | glib-gettextize --force --copy -intltoolize --copy --force --automake -libtoolize --copy --force || glibtoolize --copy --force -aclocal -autoheader -autoconf -automake --add-missing --copy - -echo "Now running the configure script" -./configure $* diff --git a/midori/Makefile.am b/midori/Makefile.am deleted file mode 100644 index e7cf7228..00000000 --- a/midori/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -INCLUDES = \ - $(UNIQUE_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - $(GTK_CFLAGS) \ - $(WEBKIT_CFLAGS) \ - -I../katze - -AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\" -DDATADIR=\""$(datadir)"\" - -LDADD = \ - $(UNIQUE_LIBS) \ - $(LIBXML_LIBS) \ - $(SQLITE3_LIBS) \ - $(GTK_LIBS) \ - $(WEBKIT_LIBS) \ - $(INTLLIBS) \ - ../katze/libkatze.la - -bin_PROGRAMS = \ - midori - -midori_SOURCES = \ - main.c midori-stock.h \ - gtkiconentry.c gtkiconentry.h \ - midori-app.c midori-app.h \ - midori-browser.c midori-browser.h \ - midori-panel.c midori-panel.h \ - midori-addons.c midori-addons.h \ - midori-console.c midori-console.h \ - midori-view.c midori-view.h \ - midori-source.c midori-source.h \ - midori-websettings.c midori-websettings.h \ - midori-preferences.c midori-preferences.h \ - midori-searchaction.c midori-searchaction.h \ - midori-locationentry.c midori-locationentry.h \ - midori-locationaction.c midori-locationaction.h \ - gjs.c gjs.h \ - sokoke.c sokoke.h \ - compat.c compat.h From 604c0e6e5954ef775a5db98302ac108fa5e94a9d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 04:40:10 +0100 Subject: [PATCH 0546/2970] Hack to store cookies on disk with libSoup 2.25.2 Note that if the WebKit build doesn't use libSoup cookies will never be loaded or saved just like before. --- AUTHORS | 1 + midori/main.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++ wscript | 2 + 3 files changed, 247 insertions(+) diff --git a/AUTHORS b/AUTHORS index 456f5641..7e7f0779 100644 --- a/AUTHORS +++ b/AUTHORS @@ -46,3 +46,4 @@ Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen GTK+/ GtkEntry, Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald Modified by the GTK+ Team and others 1997-2000 + libSoup/ CookieJarText, Copyright (C) 2008 Xan Lopez , Dan Winship diff --git a/midori/main.c b/midori/main.c index 48b5e906..2bed84d5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -42,6 +42,10 @@ #include #endif +#if HAVE_LIBSOUP + #include +#endif + #if ENABLE_NLS #include #endif @@ -1049,6 +1053,234 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } +#if HAVE_LIBSOUP_2_25_2 +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static SoupCookie* +parse_cookie (gchar* line, + time_t now) +{ + gchar** result; + SoupCookie *cookie = NULL; + gboolean http_only; + time_t max_age; + gchar* host, *is_domain, *path, *secure, *expires, *name, *value; + + if (g_str_has_prefix (line, "#HttpOnly_")) + { + http_only = TRUE; + line += strlen ("#HttpOnly_"); + } + else if (*line == '#' || g_ascii_isspace (*line)) + return cookie; + else + http_only = FALSE; + + result = g_strsplit (line, "\t", -1); + if (g_strv_length (result) != 7) + goto out; + + /* Check this first */ + expires = result[4]; + max_age = strtoul (expires, NULL, 10) - now; + if (max_age <= 0) + goto out; + + host = result[0]; + is_domain = result[1]; + path = result[2]; + secure = result[3]; + + name = result[5]; + value = result[6]; + + cookie = soup_cookie_new (name, value, host, path, max_age); + + if (strcmp (secure, "FALSE")) + soup_cookie_set_secure (cookie, TRUE); + if (http_only) + soup_cookie_set_http_only (cookie, TRUE); + + out: + g_strfreev (result); + + return cookie; +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static void +parse_line (SoupCookieJar* jar, + gchar* line, + time_t now) +{ + SoupCookie* cookie; + + if ((cookie = parse_cookie (line, now))) + soup_cookie_jar_add_cookie (jar, cookie); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static void +cookie_jar_load (SoupCookieJar* jar, + const gchar* filename) +{ + char* contents = NULL; + gchar* line; + gchar* p; + gsize length = 0; + time_t now = time (NULL); + + if (!g_file_get_contents (filename, &contents, &length, NULL)) + return; + + line = contents; + for (p = contents; *p; p++) + { + /* \r\n comes out as an extra empty line and gets ignored */ + if (*p == '\r' || *p == '\n') + { + *p = '\0'; + parse_line (jar, line, now); + line = p + 1; + } + } + parse_line (jar, line, now); + + g_free (contents); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Copied from libSoup 2.24, coding style preserved */ +static void +write_cookie (FILE *out, SoupCookie *cookie) +{ + fseek (out, 0, SEEK_END); + + fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n", + cookie->http_only ? "#HttpOnly_" : "", + cookie->domain, + *cookie->domain == '.' ? "TRUE" : "FALSE", + cookie->path, + cookie->secure ? "TRUE" : "FALSE", + (gulong)soup_date_to_time_t (cookie->expires), + cookie->name, + cookie->value); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Copied from libSoup 2.24, coding style preserved */ +static void +delete_cookie (const char *filename, SoupCookie *cookie) +{ + char *contents = NULL, *line, *p; + gsize length = 0; + FILE *f; + SoupCookie *c; + time_t now = time (NULL); + + if (!g_file_get_contents (filename, &contents, &length, NULL)) + return; + + f = fopen (filename, "w"); + if (!f) { + g_free (contents); + return; + } + + line = contents; + for (p = contents; *p; p++) { + /* \r\n comes out as an extra empty line and gets ignored */ + if (*p == '\r' || *p == '\n') { + *p = '\0'; + c = parse_cookie (line, now); + if (!c) + continue; + if (!soup_cookie_equal (cookie, c)) + write_cookie (f, c); + line = p + 1; + soup_cookie_free (c); + } + } + c = parse_cookie (line, now); + if (c) { + if (!soup_cookie_equal (cookie, c)) + write_cookie (f, c); + soup_cookie_free (c); + } + + g_free (contents); + fclose (f); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static void +cookie_jar_changed_cb (SoupCookieJar* jar, + SoupCookie* old_cookie, + SoupCookie* new_cookie, + gchar* filename) +{ + if (old_cookie) + delete_cookie (filename, old_cookie); + + if (new_cookie) + { + FILE *out; + + out = fopen (filename, "a"); + if (!out) + return; + + if (new_cookie->expires) + write_cookie (out, new_cookie); + + if (fclose (out) != 0) + return; + } +} + +/* The following code hooks up to any created cookie jar in order to + load and save cookies. This is *not* a generally advisable technique + but merely a preliminary workaround until WebKit exposes its + network backend and we can pass our own jar. */ +typedef void (*GObjectConstructed) (GObject*); +static GObjectConstructed old_jar_constructed_cb; +void +cookie_jar_constructed_cb (GObject* object) +{ + gchar* config_path; + gchar* config_file; + SoupCookieJar* jar; + + if (old_jar_constructed_cb) + old_jar_constructed_cb (object); + + config_path = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, NULL); + g_mkdir_with_parents (config_path, 0700); + config_file = g_build_filename (config_path, "cookies.txt", NULL); + jar = SOUP_COOKIE_JAR (object); + cookie_jar_load (jar, config_file); + g_signal_connect_data (jar, "changed", + G_CALLBACK (cookie_jar_changed_cb), config_file, + (GClosureNotify)g_free, 0); +} +#endif + int main (int argc, char** argv) @@ -1114,6 +1346,18 @@ main (int argc, stock_items_init (); g_set_application_name (_("Midori")); + #if HAVE_LIBSOUP_2_25_2 + /* This is a nasty trick that allows us to manipulate cookies + even without having a pointer to the jar. */ + soup_cookie_jar_get_type (); + SoupCookieJarClass* jar_class = g_type_class_ref (SOUP_TYPE_COOKIE_JAR); + if (jar_class) + { + old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; + G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; + } + #endif + if (version) { g_print ( diff --git a/wscript b/wscript index c15fcf6c..14891841 100644 --- a/wscript +++ b/wscript @@ -98,6 +98,8 @@ def configure (conf): if not Params.g_options.disable_libsoup: conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP', mandatory=False) + conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP_2_25_2', + vnum='2.25.2', mandatory=False) libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] else: libsoup = 'no' From 7f0563f5f4985f1b39806c81316d9ba7691aa269 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 04:47:51 +0100 Subject: [PATCH 0547/2970] Scratch the '.user' part in '.user.css' and '.user.js'. For all practical purposes it caused confusion among users and the regular file extension should be just as fine. --- panels/midori-addons.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/midori-addons.c b/panels/midori-addons.c index f73ff580..a8dc3155 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -231,9 +231,9 @@ _addons_get_extension (MidoriAddons* addons) switch (addons->kind) { case MIDORI_ADDON_USER_SCRIPTS: - return ".user.js"; + return ".js"; case MIDORI_ADDON_USER_STYLES: - return ".user.css"; + return ".css"; default: return NULL; } From dc5ecc5f72359a99e2f07c30addb858de9547da3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 04:53:30 +0100 Subject: [PATCH 0548/2970] Respect menubar visibility when restoring from fullscreen --- midori/midori-browser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a94f8983..c925b2a3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3269,7 +3269,8 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser, } else { - gtk_widget_show (browser->menubar); + if (katze_object_get_boolean (browser->settings, "show-menubar")) + gtk_widget_show (browser->menubar); gtk_widget_hide (browser->button_fullscreen); g_object_set (browser->button_fullscreen, "stock-id", GTK_STOCK_FULLSCREEN, NULL); From d3a00cecacd5bbc1a23994cec0389f42bce52b46 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 05:34:33 +0100 Subject: [PATCH 0549/2970] Update translation template --- po/de.po | 625 ++++++------ po/en_GB.po | 620 ++++++------ po/es.po | 620 ++++++------ po/et.po | 1922 ++++++++++++++++++----------------- po/fi.po | 982 +++++++++--------- po/fr.po | 625 ++++++------ po/gl.po | 1536 +++++++++++++++------------- po/hu.po | 2679 +++++++++++++++++++++++++------------------------ po/id.po | 783 +++++++-------- po/midori.pot | 627 ++++++------ po/nl.po | 741 +++++++------- po/pl.po | 1794 +++++++++++++++++---------------- po/ru.po | 1716 +++++++++++++++---------------- po/sv.po | 2674 ++++++++++++++++++++++++------------------------ po/tr.po | 814 ++++++++------- po/uk.po | 751 +++++++------- wscript | 2 +- 17 files changed, 9966 insertions(+), 9545 deletions(-) diff --git a/po/de.po b/po/de.po index ff1f6cbb..dbadcc63 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-29 22:04+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 -#: ../midori/main.c:1161 ../midori/main.c:1185 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -30,232 +30,208 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:81 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:82 ../midori/midori-browser.c:3719 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/main.c:83 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:84 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konsole" -#: ../midori/main.c:85 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/main.c:86 +#: ../midori/main.c:91 msgid "_History" msgstr "_Verlauf" -#: ../midori/main.c:87 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:88 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/main.c:89 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/main.c:90 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:91 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/main.c:92 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/main.c:93 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:138 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:193 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:200 ../midori/main.c:270 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:527 +#: ../midori/main.c:532 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:535 ../midori/main.c:544 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/main.c:566 ../midori/main.c:598 +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:652 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:676 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:709 ../midori/main.c:723 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:971 ../midori/sokoke.c:459 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/main.c:1024 -msgid "Console" -msgstr "Konsole" - -#: ../midori/main.c:1034 ../midori/midori-addons.c:88 -msgid "Userscripts" -msgstr "Benutzerskripte" - -#: ../midori/main.c:1042 ../midori/midori-addons.c:89 -msgid "Userstyles" -msgstr "Benutzerstile" - -#: ../midori/main.c:1051 -msgid "Extensions" -msgstr "Erweiterungen" - -#: ../midori/main.c:1071 +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1100 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1102 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1104 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1138 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1162 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1164 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1185 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1202 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1238 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1254 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1268 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1282 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1295 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1479 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "_Ignorieren" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1489 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../midori/main.c:1498 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht geladen werden. %s" -#: ../midori/main.c:1506 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Keine" - -#: ../midori/midori-addons.c:964 -msgid "_Enable" -msgstr "_Einschalten" - -#: ../midori/midori-addons.c:973 -msgid "_Disable" -msgstr "_Auschalten" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" @@ -301,432 +277,432 @@ msgstr "Wurzel" msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2304 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2577 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2688 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../midori/midori-browser.c:2694 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../midori/midori-browser.c:2701 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Heute" -#: ../midori/midori-browser.c:2703 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Gestern" -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3057 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3646 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "_Netzsuche…" -#: ../midori/midori-browser.c:3672 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:3691 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3704 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3734 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3736 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Verlauf" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4237 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -735,409 +711,423 @@ msgstr "Unerwartete Einstellung »%s«" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-r)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Benutzerdefinidert…" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Alle Kekse" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Sitzungskekse" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Keine" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-view.c:818 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "Nicht gefunden - %s" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:841 -#, fuzzy +#: ../midori/midori-view.c:925 msgid "_Save Link destination" -msgstr "Verweisziel _herunterladen" +msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:849 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "Verweisziel _herunterladen" -#: ../midori/midori-view.c:871 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "URL in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Quelltext" +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "Keine Dokumentation installiert" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" @@ -1178,7 +1168,7 @@ msgstr "Verhalten" msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Bilder automatisch laden" @@ -1187,57 +1177,56 @@ msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" #: ../midori/midori-preferences.c:417 -#, fuzzy msgid "Print background images" -msgstr "Hintergründe drucken" +msgstr "Hintergrundbilder drucken" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:429 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" #. Page "Interface" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Netzkekse" -#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "Tage" @@ -1296,6 +1285,30 @@ msgstr "%s kann %s.%s nicht zugewiesen werden" msgid "%s.%s cannot be accessed" msgstr "Auf %s.%s kann nicht zugegriffen werden" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Benutzerskripte" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Benutzerstile" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Einschalten" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Auschalten" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsole" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Erweiterungen" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1310,7 +1323,7 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" @@ -1331,3 +1344,15 @@ msgstr "Seitenhalter" #: ../extensions/page-holder.c:128 msgid "_Pageholder" msgstr "_Seitenhalter" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "Bilder" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "Skripte" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "Zusatzmodule" diff --git a/po/en_GB.po b/po/en_GB.po index d33c18df..0db7c1bf 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-29 23:39+0100\n" "Last-Translator: Abigail Brady \n" "Language-Team: British English \n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lightweight web browser" -#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 -#: ../midori/main.c:1161 ../midori/main.c:1185 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -29,232 +29,208 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web Browser" -#: ../midori/main.c:81 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Bookmark" -#: ../midori/main.c:82 ../midori/midori-browser.c:3719 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Bookmarks" -#: ../midori/main.c:83 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Add Bookmark" -#: ../midori/main.c:84 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:85 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:86 +#: ../midori/main.c:91 msgid "_History" msgstr "_History" -#: ../midori/main.c:87 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Homepage" -#: ../midori/main.c:88 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Userscripts" -#: ../midori/main.c:89 +#: ../midori/main.c:94 msgid "User_styles" msgstr "User_styles" -#: ../midori/main.c:90 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "New _Tab" -#: ../midori/main.c:91 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Transfers" -#: ../midori/main.c:92 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Closed Tabs and Windows" -#: ../midori/main.c:93 +#: ../midori/main.c:98 msgid "New _Window" msgstr "New _Window" -#: ../midori/main.c:138 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "The configuration couldn't be loaded: %s\n" -#: ../midori/main.c:193 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Value '%s' is invalid for %s" -#: ../midori/main.c:200 ../midori/main.c:270 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "Invalid configuration value '%s'" -#: ../midori/main.c:527 +#: ../midori/main.c:532 msgid "File not found." msgstr "File not found." -#: ../midori/main.c:535 ../midori/main.c:544 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "Malformed document." -#: ../midori/main.c:566 ../midori/main.c:598 +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Failed to open database: %s\n" -#: ../midori/main.c:652 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Failed to remove history item: %s\n" -#: ../midori/main.c:676 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Failed to clear history: %s\n" -#: ../midori/main.c:709 ../midori/main.c:723 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Failed to add history item: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Failed to remove old history items: %s\n" -#: ../midori/main.c:971 ../midori/sokoke.c:459 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Writing failed." -#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Transfers" -#: ../midori/main.c:1024 -msgid "Console" -msgstr "Console" - -#: ../midori/main.c:1034 ../midori/midori-addons.c:88 -msgid "Userscripts" -msgstr "Userscripts" - -#: ../midori/main.c:1042 ../midori/midori-addons.c:89 -msgid "Userstyles" -msgstr "Userstyles" - -#: ../midori/main.c:1051 -msgid "Extensions" -msgstr "Extensions" - -#: ../midori/main.c:1071 +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "The session couldn't be saved. %s" -#: ../midori/main.c:1100 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:1102 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:1104 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1138 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1162 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Please report comments, suggestions and bugs to:" -#: ../midori/main.c:1164 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Check for new versions at:" -#: ../midori/main.c:1185 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "No filename specified" -#: ../midori/main.c:1202 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "An instance of Midori is already running but not responding.\n" -#: ../midori/main.c:1238 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "The bookmarks couldn't be loaded: %s\n" -#: ../midori/main.c:1254 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "The session couldn't be loaded: %s\n" -#: ../midori/main.c:1268 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "The wastebasket couldn't be loaded: %s\n" -#: ../midori/main.c:1282 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "The history couldn't be loaded: %s\n" -#: ../midori/main.c:1295 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "The following errors occured:" -#: ../midori/main.c:1479 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "The search engines couldn't be saved. %s" -#: ../midori/main.c:1489 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "The bookmarks couldn't be saved. %s" -#: ../midori/main.c:1498 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "The wastebasket couldn't be saved. %s" -#: ../midori/main.c:1506 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "The configuration couldn't be saved. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "None" - -#: ../midori/midori-addons.c:964 -msgid "_Enable" -msgstr "_Enable" - -#: ../midori/midori-addons.c:973 -msgid "_Disable" -msgstr "_Disable" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Reload the current page" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Stop loading the current page" @@ -300,432 +276,432 @@ msgstr "Root" msgid "Save file as" msgstr "Save file as" -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Open file" -#: ../midori/midori-browser.c:2304 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Open in New _Tab" -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Open in New _Window" -#: ../midori/midori-browser.c:2577 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Separator" -#: ../midori/midori-browser.c:2688 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "A week ago" -#: ../midori/midori-browser.c:2694 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "%d days ago" -#: ../midori/midori-browser.c:2701 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Today" -#: ../midori/midori-browser.c:2703 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Yesterday" -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "A lightweight web browser." -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "" "Bastien Nocera \n" "Abigail Brady " -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Are you sure you want to remove all history items?" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Open a new window" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Open a new tab" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Open a file" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Save to a file" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "_Close Tab" -#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Close the current tab" -#: ../midori/midori-browser.c:3057 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "C_lose Window" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Close this window" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Print the current page" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Quit the application" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Edit" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Cut the selected text" -#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Copy the selected text" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Paste text from the clipboard" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Delete the selected text" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Select all text" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Find a word or phrase in the page" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Find _Next" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Find the next occurrence of a word or phrase" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Find _Previous" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Find the previous occurrence of a word or phrase" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "_Quick Find" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Quickly jump to a word or phrase" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Configure the application preferences" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_View" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Toolbars" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Increase the zoom level" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Decrease the zoom level" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Reset the zoom level" -#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "View _Source" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "View the source code of the page" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "View Selection Source" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "View the source code of the selection" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Toggle fullscreen view" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Go" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Go back to the previous page" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Go forward to the next page" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Go to your homepage" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Empty Wastebasket" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Delete the contents of the wastebasket" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Undo Close Tab" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Open the last closed tab" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Add a new bookmark" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Edit the selected bookmark" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Delete the selected bookmark" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Delete the selected history item" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Clear the entire history" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Bookmark the selected history item" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Tools" -#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Manage Search Engines" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Add, edit and remove search engines..." -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Previous Tab" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Switch to the previous tab" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Next Tab" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Switch to the next tab" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Help" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Contents" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Show the documentation" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Frequent questions" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Show the Frequently Asked Questions" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "_Report a bug" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Open Midori's bug tracker" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Show information about the program" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "P_rivate Browsing" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Don't save any private data while browsing" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "_Menubar" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Show menubar" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Navigationbar" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Show navigationbar" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Show sidepanel" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Bookmarkbar" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Show bookmarkbar" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Transferbar" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Show transferbar" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Statusbar" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Show statusbar" -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Location..." -#: ../midori/midori-browser.c:3646 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Open a particular location" -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "_Web Search..." -#: ../midori/midori-browser.c:3672 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Run a web search" -#: ../midori/midori-browser.c:3691 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Reopen a previously closed tab or window" -#: ../midori/midori-browser.c:3704 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Recently visited pages" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Reopen pages that you visited earlier" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Show the saved bookmarks" -#: ../midori/midori-browser.c:3734 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Window" -#: ../midori/midori-browser.c:3736 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Show a list of all open tabs" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Bookmarks" -#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "History" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Inline find:" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Match Case" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Highlight Matches" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Close Findbar" -#: ../midori/midori-browser.c:4237 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Unexpected setting '%s'" @@ -734,408 +710,423 @@ msgstr "Unexpected setting '%s'" msgid "Close panel" msgstr "Close panel" -#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Last open pages" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chinese (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japanese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Russian (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Western (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Custom..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "New tab" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "New window" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Current tab" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Default" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Icons" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Both" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Both horizontal" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "All cookies" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Session cookies" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "None" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Remember last window size" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Whether to save the last window size" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Last window width" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "The last saved window width" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Last window height" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "The last saved window height" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Last panel position" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "The last saved panel position" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Last panel page" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "The last saved panel page" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Last Web search" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "The last saved Web search" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Show Menubar" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Whether to show the menubar" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Show Navigationbar" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Whether to show the navigationbar" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Show Bookmarkbar" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Whether to show the bookmarkbar" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Show Panel" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Whether to show the panel" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Show Statusbar" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Whether to show the statusbar" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Toolbar Style" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "The style of the toolbar" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Toolbar Items" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "The items to show on the toolbar" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Compact Sidepanel" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Whether to make the sidepanel compact" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Load on Startup" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "What to load on startup" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "The homepage" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Download Folder" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "The folder downloaded files are saved to" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Download Manager" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "An external download manager" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Text Editor" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "An external text editor" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Location entry Search" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "The search to perform inside the location entry" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Preferred Encoding" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "The preferred character encoding" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Always Show Tabbar" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Always show the tabbar" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Close Buttons on Tabs" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Whether tabs have close buttons" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Open new pages in" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Where to open new pages" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Open external pages in" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Where to open externally opened pages" -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Middle click opens Selection" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Load an URL from the selection via middle click" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Open tabs in the background" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Whether to open new tabs in the background" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Open Tabs next to Current" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Whether to open new tabs next to the current tab or after the last one" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Open popups in tabs" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Whether to open popup windows in tabs" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Accept cookies" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "What type of cookies to accept" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Original cookies only" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Accept cookies from the original website only" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Maximum cookie age" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "The maximum number of days to save cookies for" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Remember last visited pages" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Whether the last visited pages are saved" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Maximum history age" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "The maximum number of days to save the history for" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Remember last form inputs" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Whether the last form inputs are saved" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Remember last downloaded files" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Whether the last downloaded files are saved" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP Proxy" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "The proxy used for HTTP connections" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Cache size" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "The allowed size of the cache" -#: ../midori/midori-view.c:818 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Open Link in New _Tab" -#: ../midori/midori-view.c:841 +#: ../midori/midori-view.c:925 msgid "_Save Link destination" msgstr "_Save Link destination" -#: ../midori/midori-view.c:849 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "_Download Link destination" -#: ../midori/midori-view.c:871 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Open URL in New _Tab" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Inspect page - %s" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Source" +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Show the documentation" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" @@ -1176,7 +1167,7 @@ msgstr "Behaviour" msgid "Features" msgstr "Features" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Load images automatically" @@ -1192,49 +1183,49 @@ msgstr "Print background images" msgid "Resizable text areas" msgstr "Resizable text areas" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Enable scripts" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Enable plugins" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:429 msgid "Enable developer tools" msgstr "Enable developer tools" #. Page "Interface" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Navigationbar" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Browsing" -#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Network" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "days" @@ -1293,6 +1284,30 @@ msgstr "%s cannot be assigned to %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s cannot be accessed" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Userscripts" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Userstyles" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Enable" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Disable" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Console" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensions" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1307,7 +1322,7 @@ msgstr "Stock icon '%s' couldn't be loaded" msgid "Animation frames are broken" msgstr "Animation frames are broken" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Property '%s' is invalid for %s" @@ -1328,3 +1343,16 @@ msgstr "Pageholder" #: ../extensions/page-holder.c:128 msgid "_Pageholder" msgstr "_Pageholder" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Userscripts" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" diff --git a/po/es.po b/po/es.po index 4f8e3c0e..91f7bbae 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-29 22:13+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: GALPon MiniNo \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 -#: ../midori/main.c:1161 ../midori/main.c:1185 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -30,232 +30,208 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:81 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/main.c:82 ../midori/midori-browser.c:3719 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/main.c:83 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Añadir Marcador" -#: ../midori/main.c:84 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Consola" -#: ../midori/main.c:85 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/main.c:86 +#: ../midori/main.c:91 msgid "_History" msgstr "_Histórico" -#: ../midori/main.c:87 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "Página de _inicio" -#: ../midori/main.c:88 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/main.c:89 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Estilos de _usuario" -#: ../midori/main.c:90 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Nueva pes_taña" -#: ../midori/main.c:91 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/main.c:92 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "Ventanas y pestañas _cerradas" -#: ../midori/main.c:93 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/main.c:138 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:193 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:200 ../midori/main.c:270 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:527 +#: ../midori/main.c:532 msgid "File not found." msgstr "No se encuentra el archivo." -#: ../midori/main.c:535 ../midori/main.c:544 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "Documento defectuoso" -#: ../midori/main.c:566 ../midori/main.c:598 +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Falló a abrir la banco de datos: %s\n" -#: ../midori/main.c:652 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falló a borrar elemento del histórico: %s\n" -#: ../midori/main.c:676 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falló a vaciar el histórico: %s\n" -#: ../midori/main.c:709 ../midori/main.c:723 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Falló a añadir un elemento al histórico: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falló a eliminar elementos viejos del histórico: %s\n" -#: ../midori/main.c:971 ../midori/sokoke.c:459 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Transferencias" -#: ../midori/main.c:1024 -msgid "Console" -msgstr "Consola" - -#: ../midori/main.c:1034 ../midori/midori-addons.c:88 -msgid "Userscripts" -msgstr "Scripts de usuario" - -#: ../midori/main.c:1042 ../midori/midori-addons.c:89 -msgid "Userstyles" -msgstr "Estilos de usuario" - -#: ../midori/main.c:1051 -msgid "Extensions" -msgstr "Extensiones" - -#: ../midori/main.c:1071 +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:1100 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1102 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1104 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1138 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1162 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" -#: ../midori/main.c:1164 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Comprobar si existen nuevas versiones en:" -#: ../midori/main.c:1185 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Ninguna nombre de archivo indicado" -#: ../midori/main.c:1202 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1238 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Los marcadores no pudieron ser cargados: %s\n" -#: ../midori/main.c:1254 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1268 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1282 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el histórico: %s\n" -#: ../midori/main.c:1295 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:1479 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar el motor de busqueda. %s" -#: ../midori/main.c:1489 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" -#: ../midori/main.c:1498 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:1506 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Ninguna" - -#: ../midori/midori-addons.c:964 -msgid "_Enable" -msgstr "_Activar" - -#: ../midori/midori-addons.c:973 -msgid "_Disable" -msgstr "_Desactivar" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Cargar nuevamente la página actual" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Detener la carga de la página" @@ -301,433 +277,433 @@ msgstr "Raíz" msgid "Save file as" msgstr "Guardar archivo en" -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2304 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:2577 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Separador" -#: ../midori/midori-browser.c:2688 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "Hace una semana" -#: ../midori/midori-browser.c:2694 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "Hace %d días" -#: ../midori/midori-browser.c:2701 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Hoy" -#: ../midori/midori-browser.c:2703 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Ayer" -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" "Antonio Sanchez \n" "Christian Dywan " -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Fichero" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "Cerrar _pestaña" -#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:3057 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "_Cerrar la ventana" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Cerrar esta ventana" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Pegar el texto seleccionado al portapapeles" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Mostrar _código fuente" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Mostrar el código fuente de la página" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Mostrar código fuente de la seleccionada" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Mostrar el código fuente de la seleccionada" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Ir a la última pagina" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Ir a la siguiente pagina" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Ir a la página de inicio" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Borrar el conenido de la papelera" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Borrar el elemento seleccionado del histórico" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Vaciar el histórico completo" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Añadir un marcador pour el elemento seleccionado del histórico" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Gestionar los motores de busqueda" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar o eliminar motores de busqueda..." -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "Pestaña _anterior" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "Pestaña _siguiente" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "_Reportar un probléma" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Abrir el perseguidor de problemas de Midori" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Mostrar informationes sobre el programa" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "No guardar datos privados mientras de la navegación" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "Barra del _menú" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Mostrar barra del menu" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "Barra de _marcadores" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:3646 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Abrir un lugar específico" -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "Buscar en la _red..." -#: ../midori/midori-browser.c:3672 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3691 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Volver a abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:3704 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardos." -#: ../midori/midori-browser.c:3734 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Ventana" -#: ../midori/midori-browser.c:3736 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pesañas abiertas" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Marcadores" -#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Histórico" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Sensible a mayúsculas" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Cerrar barra de busquedas" -#: ../midori/midori-browser.c:4237 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" @@ -736,410 +712,425 @@ msgstr "Ajuste no esperado «%s»" msgid "Close panel" msgstr "Cerrar el panel" -#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Página vacía" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Páginas abiertas recientemente" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Todas las galletas" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Las galletas de esta sesión" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Ninguna" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Recordar último tamaño de ventana" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Guardar (o no) el último tamaño de ventana" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Última altura de la ventana guardada" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Última busqueda en la red" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Última busqueda en la red guardada" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Mostrar barra del menú" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Mostrar (o no) la barra de menú" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Mostrar (o no) la barra de navegación" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (o no) la barra de marcadores" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Mostrar (o no) el panel" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Mostrar (o no) la barra de estado" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "El estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Elementos de herramientas" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Hacer (o no) el panel compacto" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Cargar al inicio" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Qué cargar en el inicio" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "La página de inicio" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "La carpeta de descargas fue guardada en" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Un gestor de descargas externo" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Editor de textos" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Un editor de textos externo" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Hacer una busqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Siempre mostrar barra de pestañas" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Cada una de las pestañas tendrá su botón para cerrarla" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Abrir las páginas nuevas en" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Donde se van a abrir las páginas nuevas" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Abrir las páginas externas en" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Donde se van a abrir las páginas externas" -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Clic medio abre la selección" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Cargar una URL en la selección empleando el botón del medio del ratón" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Abrir (o no) las pestañas nuevas en segundo plano" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Abrir pestañas a lado de la actual" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abrir las pestañas nuevas al lado de la pestaña actual o la última" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Abrir (o no) las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Aceptar las galletas" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Qué tipos de galletas van a ser aceptadas" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Solo las galletas del sitio original" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Solo se aceptan las galletas del sitio de origen" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Persistencia máxima de las galletas" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Tiempo máximo, en días, durante los que se guardaran las galletas" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Recordar (o no) las últimas páginas que fueron visitadas" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Persistencia máxima del histórico" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "" "Tiempo máximo, en días, durante los que se guardará un dato del histórico" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Recordar las últimas sesiones de formularios" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Recordar (o no) las últimas sesiones con sus datos de formularios" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Recordar últimos ficheros descargados" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "" "Recordar (o no) la lista de descargas de ficheros realizadas últimamente" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Servidor proxy para conexiones HTTP" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Tamaño de la caché" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" -#: ../midori/midori-view.c:818 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Abrir el enlace en una pestaña _nueva" -#: ../midori/midori-view.c:841 +#: ../midori/midori-view.c:925 msgid "_Save Link destination" msgstr "_Guardar el destino del enlace" -#: ../midori/midori-view.c:849 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "_Descargar el destino del enlace" -#: ../midori/midori-view.c:871 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Abrir la URL en una pestaña _nueva" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Examinar la pagina - %s" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Código fuente" +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Mostrar la documentación" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" @@ -1180,7 +1171,7 @@ msgstr "Comportamiento" msgid "Features" msgstr "Funcionalidades" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Cargar imagenes automáticamente" @@ -1196,49 +1187,49 @@ msgstr "Imprimir imagenes de trasfondo" msgid "Resizable text areas" msgstr "Pido agrandar los campos de textos" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Activar guiónes" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Activar complementos" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:429 msgid "Enable developer tools" msgstr "Activar accesorios de desarrolladores" #. Page "Interface" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Navegación" -#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Esfera privada" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Galletas red" -#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "dias" @@ -1297,6 +1288,30 @@ msgstr "%s no puede ser asignado a %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s non se puede accede" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Scripts de usuario" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Estilos de usuario" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Activar" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Desactivar" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Consola" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensiones" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1311,7 +1326,7 @@ msgstr "No se pudo cargar el icono stock «%s»" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" @@ -1332,3 +1347,16 @@ msgstr "Cuadro de páginas" #: ../extensions/page-holder.c:128 msgid "_Pageholder" msgstr "Cu_adro de páginas" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Scripts de usuario" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" diff --git a/po/et.po b/po/et.po index ae7a8e20..577cde2d 100644 --- a/po/et.po +++ b/po/et.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the midori package. # Kristjan Siimson 2008 # - msgid "" msgstr "" "Project-Id-Version: midori 0.0.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-11 17:01-0700\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: \n" "Last-Translator: Kristjan Siimson \n" "Language-Team: \n" @@ -22,11 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Kergekaaluline veebibrauser" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:498 -#: ../midori/main.c:508 -#: ../midori/main.c:510 -#: ../midori/main.c:524 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -34,1516 +30,1636 @@ msgstr "Midori" msgid "Web Browser" msgstr "Veebibrauser" -#: ../midori/main.c:52 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Järjehoidja" -#: ../midori/main.c:53 -#: ../midori/midori-browser.c:2887 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "Järjehoidjad" -#: ../midori/main.c:54 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Lisa järjehoidja" -#: ../midori/main.c:55 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konsool" -#: ../midori/main.c:56 -msgid "_Disable" -msgstr "_Lülita välja" - -#: ../midori/main.c:57 -msgid "_Enable" -msgstr "_Lülita sisse" - -#: ../midori/main.c:58 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Laiendid" -#: ../midori/main.c:59 +#: ../midori/main.c:91 msgid "_History" msgstr "_Ajalugu" -#: ../midori/main.c:60 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Kodulehekülg" -#: ../midori/main.c:61 -msgid "_Pageholder" -msgstr "_Lehehoidja" - -#: ../midori/main.c:62 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Kasutajaskriptid" -#: ../midori/main.c:63 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Kasutaja_stiilid" -#: ../midori/main.c:64 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Uus _kaart" -#: ../midori/main.c:65 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Ülekanded" -#: ../midori/main.c:66 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Suletud kaardid ja aknad" -#: ../midori/main.c:67 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Uus _aken" -#: ../midori/main.c:69 -msgid "Select _All" -msgstr "Vali _kõik" - -#: ../midori/main.c:72 -msgid "_Fullscreen" -msgstr "_Täisekraan" - -#: ../midori/main.c:73 -msgid "_Leave Fullscreen" -msgstr "_Lahku täisekraanist" - -#: ../midori/main.c:124 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "Seadistust ei saanud laadida. %s\n" -#: ../midori/main.c:179 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "\"%s\" on vale %s väärtus" -#: ../midori/main.c:186 -#: ../midori/main.c:255 -#, c-format -msgid "Unhandled settings value '%s'" +#: ../midori/main.c:205 ../midori/main.c:275 +#, fuzzy, c-format +msgid "Invalid configuration value '%s'" msgstr "Käsitlemata seadistuste väärtus \"%s\"" -#: ../midori/main.c:426 -#: ../midori/sokoke.c:522 -#: ../katze/katze-xbel.c:899 +#: ../midori/main.c:532 +msgid "File not found." +msgstr "Faili ei leitud." + +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Väärvormistatud dokument." + +#: ../midori/main.c:571 ../midori/main.c:603 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#: ../midori/main.c:657 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +#: ../midori/main.c:681 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:714 ../midori/main.c:728 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Kirjutamine ei õnnestunud." -#: ../midori/main.c:451 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Ülekanded" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessiooni ei saanud salvestada. %s" -#: ../midori/main.c:479 +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Näita programmi versiooni" -#: ../midori/main.c:481 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URI-d" -#: ../midori/main.c:504 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URI-d]" -#: ../midori/main.c:508 -msgid "Unknown argument." -msgstr "Tundmatu argument." - -#: ../midori/main.c:510 -msgid "Failed to setup interface." -msgstr "Liidese seadistamine ei õnnestunud." - -#: ../midori/main.c:525 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Märkused, ettepanekud ja vead palun sinna:" -#: ../midori/main.c:527 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Kontrolli uusi versioone:" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:558 +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori juba töötab, kuid ei vasta.\n" -#: ../midori/main.c:592 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Järjehoidjaid ei saanud laadida. %s\n" -#: ../midori/main.c:606 -#, c-format -msgid "The session couldn't be loaded. %s\n" +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" msgstr "Sessiooni ei saanud laadida. %s\n" -#: ../midori/main.c:618 -#, c-format -msgid "The trash couldn't be loaded. %s\n" +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" msgstr "Prügi ei saanud laadida. %s\n" -#: ../midori/main.c:630 +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Prügi ei saanud laadida. %s\n" + +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Tekkisid järgnevad vead:" -#: ../midori/main.c:785 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Otsingumootoreid ei saanud salvestada. %s" -#: ../midori/main.c:795 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Järjehoidjaid ei saanud salvestada. %s" -#: ../midori/main.c:804 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Prügi ei saanud salvestada. %s" -#: ../midori/main.c:812 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Seadistust ei saanud salvestada. %s" -#: ../midori/midori-app.c:126 -#: ../midori/midori-browser.c:1325 -msgid "Settings" -msgstr "Seadistused" - -#: ../midori/midori-app.c:127 -#: ../midori/midori-browser.c:1326 -msgid "The associated settings" -msgstr "Seostatud seadistused" - -#: ../midori/midori-app.c:135 -#: ../midori/midori-browser.c:1342 -#: ../midori/midori-browser.c:3474 -msgid "Bookmarks" -msgstr "Järjehoidjad" - -#: ../midori/midori-app.c:136 -#: ../midori/midori-browser.c:1343 -msgid "The bookmarks folder, containing all bookmarks" -msgstr "Järjehoidjate kataloog, sisaldab kõiki järjehoidjaid" - -#: ../midori/midori-app.c:144 -#: ../midori/midori-browser.c:1361 -msgid "Trash" -msgstr "Prügi" - -#: ../midori/midori-app.c:145 -#: ../midori/midori-browser.c:1362 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Prügi, kogub hiljuti suletud kaarte ja aknaid" - -#: ../midori/midori-app.c:153 -#: ../midori/midori-browser.c:1378 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "Otsingumootorid" - -#: ../midori/midori-app.c:154 -#: ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "Otsingumootorite loetelu" - -#: ../midori/midori-app.c:162 -msgid "Browser" -msgstr "Brauser" - -#: ../midori/midori-app.c:163 -msgid "The current browser" -msgstr "Praegune brauser" - -#: ../midori/midori-app.c:171 -msgid "Browser Count" -msgstr "Brausereid" - -#: ../midori/midori-app.c:172 -msgid "The current number of browsers" -msgstr "Praegune brauserite arv" - -#: ../midori/midori-addons.c:87 -#: ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Pole" - -#: ../midori/midori-addons.c:88 -#: ../midori/midori-browser.c:3532 -msgid "Extensions" -msgstr "Laiendid" - -#: ../midori/midori-addons.c:89 -#: ../midori/midori-browser.c:3515 -msgid "Userscripts" -msgstr "Kasutajaskriptid" - -#: ../midori/midori-addons.c:90 -#: ../midori/midori-browser.c:3523 -msgid "Userstyles" -msgstr "Kasutajastiilid" - -#: ../midori/midori-addons.c:115 -msgid "Web Widget" -msgstr "Veebividin" - -#: ../midori/midori-addons.c:116 -msgid "The assigned web widget" -msgstr "Määratud veebividin" - -#: ../midori/midori-addons.c:124 -msgid "Kind" -msgstr "Liik" - -#: ../midori/midori-addons.c:125 -msgid "The kind of addons" -msgstr "Lisandite liik" - -#: ../midori/midori-browser.c:195 -msgid "Source" -msgstr "Lähtekood" - -#: ../midori/midori-browser.c:277 -#: ../midori/midori-browser.c:2834 -#: ../midori/midori-browser.c:2840 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Laadi käesolev lehekülg uuesti" -#: ../midori/midori-browser.c:290 -#: ../midori/midori-browser.c:2837 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Peata käesoleva lehekülje laadimine" -#: ../midori/midori-browser.c:369 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% laaditud" -#: ../midori/midori-browser.c:596 -msgid "New bookmark" -msgstr "Uus järjehoidja" - -#: ../midori/midori-browser.c:596 -msgid "Edit bookmark" -msgstr "Muuda järjehoidjat" - -#: ../midori/midori-browser.c:620 -msgid "_Title:" -msgstr "_Pealkiri:" - -#: ../midori/midori-browser.c:633 -#: ../midori/midori-searchentry.c:567 -msgid "_Description:" -msgstr "_Kirjeldus:" - -#: ../midori/midori-browser.c:652 -#: ../midori/midori-searchentry.c:581 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:669 -msgid "_Folder:" -msgstr "_Kataloog:" - -#: ../midori/midori-browser.c:673 -msgid "Root" -msgstr "Juur" - -#: ../midori/midori-browser.c:1104 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Ootamatu toiming \"%s\"." -#: ../midori/midori-browser.c:1250 -msgid "Menubar" -msgstr "Menüüriba" +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Uus järjehoidja" -#: ../midori/midori-browser.c:1251 -msgid "The menubar" -msgstr "Menüüriba" +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Muuda järjehoidjat" -#: ../midori/midori-browser.c:1259 -#: ../midori/midori-preferences.c:385 -msgid "Navigationbar" -msgstr "Navigatsiooniriba" +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Pealkiri:" -#: ../midori/midori-browser.c:1260 -msgid "The navigationbar" -msgstr "Navigatsiooniriba" +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Kirjeldus:" -#: ../midori/midori-browser.c:1268 -#: ../katze/katze-item.c:90 -msgid "URI" -msgstr "URI" +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" -#: ../midori/midori-browser.c:1269 -msgid "The current URI" -msgstr "Käesolev URI" +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Kataloog:" -#: ../midori/midori-browser.c:1277 -msgid "Tab" -msgstr "Kaart" +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Juur" -#: ../midori/midori-browser.c:1278 -msgid "The current tab" -msgstr "Käesolev kaart" - -#: ../midori/midori-browser.c:1286 -msgid "Statusbar" -msgstr "Olekuriba" - -#: ../midori/midori-browser.c:1287 -msgid "The statusbar" -msgstr "Olekuriba" - -#: ../midori/midori-browser.c:1306 -msgid "Statusbar Text" -msgstr "Olekuriba tekst" - -#: ../midori/midori-browser.c:1307 -#: ../midori/midori-webview.c:265 -msgid "The text that is displayed in the statusbar" -msgstr "Olekuribal näidatav tekst" - -#: ../midori/midori-browser.c:1379 -msgid "The list of search engines to be used for web search" -msgstr "Loetelu veebiotsinguks kasutatavatest otsingumootoritest" - -#: ../midori/midori-browser.c:2364 -msgid "Separator" -msgstr "Eraldaja" - -#: ../midori/midori-browser.c:2532 -msgid "A lightweight web browser." -msgstr "Kergekaaluline veebibrauser." - -#: ../midori/midori-browser.c:2540 -msgid "translator-credits" -msgstr "" -"Kristjan Siimson " - -#: ../midori/midori-browser.c:2757 -msgid "_File" -msgstr "_Fail" - -#: ../midori/midori-browser.c:2760 -msgid "Open a new window" -msgstr "Ava uus aken" - -#: ../midori/midori-browser.c:2763 -msgid "Open a new tab" -msgstr "Ava uus kaart" - -#: ../midori/midori-browser.c:2766 -msgid "Open a file" -msgstr "Ava fail" - -#: ../midori/midori-browser.c:2769 -msgid "Save to a file" +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" msgstr "Salvesta faili" -#: ../midori/midori-browser.c:2771 -msgid "_Close Tab" -msgstr "_Sulge kaart" +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "Ava fail" -#: ../midori/midori-browser.c:2772 -msgid "Close the current tab" -msgstr "Sulge käesolev kaart" - -#: ../midori/midori-browser.c:2774 -msgid "C_lose Window" -msgstr "S_ulge aken" - -#: ../midori/midori-browser.c:2775 -msgid "Close this window" -msgstr "Sulge see aken" - -#: ../midori/midori-browser.c:2777 -msgid "Pa_ge Setup" -msgstr "Lehekülje _seadistamine" - -#: ../midori/midori-browser.c:2781 -msgid "Show a preview of the printed page" -msgstr "Näita trükitava lehekülje eelvaadet" - -#: ../midori/midori-browser.c:2784 -msgid "Print the current page" -msgstr "Trüki käesolev lehekülg" - -#: ../midori/midori-browser.c:2787 -msgid "Quit the application" -msgstr "Välju rakendusest" - -#: ../midori/midori-browser.c:2789 -msgid "_Edit" -msgstr "_Redigeerimine" - -#: ../midori/midori-browser.c:2792 -msgid "Undo the last modification" -msgstr "Võta viimane muudatus tagasi" - -#: ../midori/midori-browser.c:2795 -msgid "Redo the last modification" -msgstr "Tee viimane muudatus uuesti" - -#: ../midori/midori-browser.c:2798 -msgid "Cut the selected text" -msgstr "Lõika valitud tekst" - -#: ../midori/midori-browser.c:2801 -#: ../midori/midori-browser.c:2804 -msgid "Copy the selected text" -msgstr "Kopeeri valitud tekst" - -#: ../midori/midori-browser.c:2807 -msgid "Paste text from the clipboard" -msgstr "Aseta tekst lõikepuhvrist" - -#: ../midori/midori-browser.c:2810 -msgid "Delete the selected text" -msgstr "Kustuta valitud tekst" - -#: ../midori/midori-browser.c:2813 -msgid "Select all text" -msgstr "Vali kõik tekst" - -#: ../midori/midori-browser.c:2816 -msgid "Find a word or phrase in the page" -msgstr "Leia leheküljelt sõna või fraas" - -#: ../midori/midori-browser.c:2818 -msgid "Find _Next" -msgstr "Otsi _järgmist" - -#: ../midori/midori-browser.c:2819 -msgid "Find the next occurrence of a word or phrase" -msgstr "Leia järgmine sõna või fraasi esinemine" - -#: ../midori/midori-browser.c:2821 -msgid "Find _Previous" -msgstr "Otsi _eelmist" - -#: ../midori/midori-browser.c:2822 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Leia eelmine sõna või fraasi esinemine" - -#: ../midori/midori-browser.c:2824 -msgid "_Quick Find" -msgstr "_Kiirotsing" - -#: ../midori/midori-browser.c:2825 -msgid "Quickly jump to a word or phrase" -msgstr "Kiirelt hüppa sõna või fraasini" - -#: ../midori/midori-browser.c:2828 -msgid "Configure the application preferences" -msgstr "Seadista rakenduse eelistused" - -#: ../midori/midori-browser.c:2830 -msgid "_View" -msgstr "_Vaade" - -#: ../midori/midori-browser.c:2831 -msgid "_Toolbars" -msgstr "_Tööriistaribad" - -#: ../midori/midori-browser.c:2843 -msgid "Increase the zoom level" -msgstr "Tõsta suurendusastet" - -#: ../midori/midori-browser.c:2846 -msgid "Decrease the zoom level" -msgstr "Kahanda suurendusastet" - -#: ../midori/midori-browser.c:2849 -msgid "Reset the zoom level" -msgstr "Tühista suurendusaste" - -#: ../midori/midori-browser.c:2851 -msgid "View _Source" -msgstr "Vaata _lähtekoodi" - -#: ../midori/midori-browser.c:2852 -msgid "View the source code of the page" -msgstr "Vaata lehekülje lähtekoodi" - -#: ../midori/midori-browser.c:2854 -msgid "View Selection Source" -msgstr "Vaata valiku lähtekoodi" - -#: ../midori/midori-browser.c:2855 -msgid "View the source code of the selection" -msgstr "Vaata valiku lähtekoodi" - -#: ../midori/midori-browser.c:2858 -msgid "Toggle fullscreen view" -msgstr "Vaheta täisekraanivaadet" - -#: ../midori/midori-browser.c:2860 -msgid "_Go" -msgstr "_Mine" - -#: ../midori/midori-browser.c:2863 -msgid "Go back to the previous page" -msgstr "Mine tagasi eelmisele leheküljele" - -#: ../midori/midori-browser.c:2866 -msgid "Go forward to the next page" -msgstr "Mine edasi järgmisele leheküljele" - -#: ../midori/midori-browser.c:2869 -msgid "Go to your homepage" -msgstr "Mine oma koduleheküljele" - -#: ../midori/midori-browser.c:2871 -msgid "_Web Search..." -msgstr "_Veebiotsing..." - -#: ../midori/midori-browser.c:2872 -msgid "Run a web search" -msgstr "Käivita veebiotsing" - -#: ../midori/midori-browser.c:2874 -msgid "Open in Page_holder..." -msgstr "Ava lehe_hoidjas..." - -#: ../midori/midori-browser.c:2875 -msgid "Open the current page in the pageholder" -msgstr "Ava käesolev lehekülg lehehoidjas" - -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2879 -msgid "Reopen a previously closed tab or window" -msgstr "Ava uuesti varem suletud kaart või aken" - -#: ../midori/midori-browser.c:2881 -msgid "Empty Trash" -msgstr "Tühjenda prügi" - -#: ../midori/midori-browser.c:2882 -msgid "Delete the contents of the trash" -msgstr "Kustuta prügi sisu" - -#: ../midori/midori-browser.c:2884 -msgid "Undo Close Tab" -msgstr "Võta tagasi kaardi sulgemine" - -#: ../midori/midori-browser.c:2885 -msgid "Open the last closed tab" -msgstr "Ava viimati suletud kaart" - -#: ../midori/midori-browser.c:2890 -msgid "Add a new bookmark" -msgstr "Lisa uus järjehoidja" - -#: ../midori/midori-browser.c:2892 -msgid "_Manage Bookmarks" -msgstr "_Halda järjehoidjaid" - -#: ../midori/midori-browser.c:2893 -msgid "Add, edit and remove bookmarks..." -msgstr "Lisa, muuda ja eemalda järjehoidjaid..." - -#: ../midori/midori-browser.c:2896 -msgid "Open the selected bookmark" -msgstr "Ava valitud järjehoidja" - -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Ava uuel _kaardil" -#: ../midori/midori-browser.c:2899 -msgid "Open the selected bookmark in a new tab" -msgstr "Ava valitud järjehoidja uuel kaardil" - -#: ../midori/midori-browser.c:2901 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Ava uues _aknas" -#: ../midori/midori-browser.c:2902 -msgid "Open the selected bookmark in a new window" -msgstr "Ava valitud järjehoidja uues aknas" +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Eraldaja" -#: ../midori/midori-browser.c:2905 +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "Kergekaaluline veebibrauser." + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "Kristjan Siimson " + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Fail" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "Ava uus aken" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Ava uus kaart" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "Ava fail" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Salvesta faili" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "_Sulge kaart" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "Sulge käesolev kaart" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "S_ulge aken" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "Sulge see aken" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "Trüki käesolev lehekülg" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Välju rakendusest" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "_Redigeerimine" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "Lõika valitud tekst" + +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "Kopeeri valitud tekst" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Aseta tekst lõikepuhvrist" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "Kustuta valitud tekst" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Vali kõik tekst" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "Leia leheküljelt sõna või fraas" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "Otsi _järgmist" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "Leia järgmine sõna või fraasi esinemine" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "Otsi _eelmist" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Leia eelmine sõna või fraasi esinemine" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "_Kiirotsing" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "Kiirelt hüppa sõna või fraasini" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "Seadista rakenduse eelistused" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Vaade" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "_Tööriistaribad" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "Tõsta suurendusastet" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "Kahanda suurendusastet" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "Tühista suurendusaste" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +msgid "View _Source" +msgstr "Vaata _lähtekoodi" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "Vaata lehekülje lähtekoodi" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Vaata valiku lähtekoodi" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "Vaata valiku lähtekoodi" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Vaheta täisekraanivaadet" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "_Mine" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "Mine tagasi eelmisele leheküljele" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "Mine edasi järgmisele leheküljele" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "Mine oma koduleheküljele" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Tühjenda prügi" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "Kustuta prügi sisu" + +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Võta tagasi kaardi sulgemine" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "Ava viimati suletud kaart" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "Lisa uus järjehoidja" + +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Muuda valitud järjehoidjat" -#: ../midori/midori-browser.c:2908 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Kustuta valitud järjehoidja" -#: ../midori/midori-browser.c:2910 +#: ../midori/midori-browser.c:3185 +#, fuzzy +msgid "Delete the selected history item" +msgstr "Kustuta valitud tekst" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "Kopeeri valitud tekst" + +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Tööriistad" -#: ../midori/midori-browser.c:2912 -#: ../midori/midori-searchentry.c:160 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Halda otsingumootoreid" -#: ../midori/midori-browser.c:2913 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Lisa, muuda ja eemalda otsingumootoreid" -#: ../midori/midori-browser.c:2916 -msgid "_Window" -msgstr "_Aken" - -#: ../midori/midori-browser.c:2918 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Eelmine kaart" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Lülitu eelmisele kaardile" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Järgmine kaart" -#: ../midori/midori-browser.c:2922 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Lülitu järgmisele kaardile" -#: ../midori/midori-browser.c:2924 -msgid "Tab _Overview" -msgstr "Kaardi _ülevaade" - -#: ../midori/midori-browser.c:2925 -msgid "Show an overview of all open tabs" -msgstr "Näita ülevaadet kõikidest avatud kaartidest" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2927 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Abi" -#: ../midori/midori-browser.c:2929 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Sisukord" -#: ../midori/midori-browser.c:2930 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Näita dokumentatsiooni" -#: ../midori/midori-browser.c:2933 +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Näita teavet programmi kohta" -#: ../midori/midori-browser.c:2939 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "_Isiklik lehitsemine" -#: ../midori/midori-browser.c:2940 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Ära salvesta lehitsemisel isiklike andmeid" -#: ../midori/midori-browser.c:2943 -msgid "_Work Offline" -msgstr "_Tööta ühenduseta" +#: ../midori/midori-browser.c:3231 +#, fuzzy +msgid "_Menubar" +msgstr "Menüüriba" -#: ../midori/midori-browser.c:2944 -msgid "Work without a network connection" -msgstr "Tööta ilma võrguühenduseta." +#: ../midori/midori-browser.c:3232 +#, fuzzy +msgid "Show menubar" +msgstr "Menüüriba" -#: ../midori/midori-browser.c:2948 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Navigatsiooniriba" -#: ../midori/midori-browser.c:2949 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Näita navigatsiooniriba" -#: ../midori/midori-browser.c:2952 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Külg_paneel" -#: ../midori/midori-browser.c:2953 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Näita külgpaneeli" -#: ../midori/midori-browser.c:2956 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Järjehoidjariba" -#: ../midori/midori-browser.c:2957 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Näita järjehoidjariba" -#: ../midori/midori-browser.c:2960 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Ülekanderiba" -#: ../midori/midori-browser.c:2961 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Näita ülekanderiba" -#: ../midori/midori-browser.c:2964 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Olekuriba" -#: ../midori/midori-browser.c:2965 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Näita olekuriba" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Asukoht..." -#: ../midori/midori-browser.c:3293 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Ava kindel asukoht" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3481 -#: ../midori/midori-preferences.c:282 -msgid "Transfers" -msgstr "Ülekanded" +#: ../midori/midori-browser.c:3695 +msgid "_Web Search..." +msgstr "_Veebiotsing..." -#: ../midori/midori-browser.c:3490 -msgid "Console" -msgstr "Konsool" +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "Käivita veebiotsing" -#: ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Ava uuesti varem suletud kaart või aken" + +#: ../midori/midori-browser.c:3729 +#, fuzzy +msgid "_Recently visited pages" +msgstr "Jäta meelde viimati külastatud leheküljed" + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Ava valitud järjehoidja" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Aken" + +#: ../midori/midori-browser.c:3761 +#, fuzzy +msgid "Show a list of all open tabs" +msgstr "Näita ülevaadet kõikidest avatud kaartidest" + +#: ../midori/midori-browser.c:3883 +msgid "Bookmarks" +msgstr "Järjehoidjad" + +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Ajalugu" -#: ../midori/midori-browser.c:3506 -msgid "Pageholder" -msgstr "Lehehoidja" - -#: ../midori/midori-browser.c:3555 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Reasisene otsing:" -#: ../midori/midori-browser.c:3590 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Tõusutundlik" -#: ../midori/midori-browser.c:3598 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Tõsta sobivused esile" -#: ../midori/midori-browser.c:3607 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Sulge otsinguriba" -#: ../midori/midori-browser.c:3842 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Ootamatu seade \"%s\"" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "Varju liik" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Varju väljanägemine iga paneeli ümber" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Menüü" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Menüü paneelielementide hoidmiseks" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "Lehekülg" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "Käesoleva lehekülje indeks" - -#: ../midori/midori-panel.c:206 -#: ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Sulge paneel" -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Tühi lehekülg" -#: ../midori/midori-websettings.c:131 -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Kodulehekülg" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Viimati avatud leheküljed" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Hiina (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Jaapani (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Vene (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Lääne (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Kohandatud..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Uus kaart" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Uus aken" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Käesolev kaart" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Vaikimisi" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Ikoonid" -#: ../midori/midori-websettings.c:186 -#: ../katze/katze-item.c:81 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Mõlemad" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Mõlemad rõhtsed" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Kõik küpsised" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Sessiooni küpsised" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Pole" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Jäta meelde viimane akna suurus" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Kas salvestada viimane akna suurus" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Viimane akna laius" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Viimati salvestatud akna suurus" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Viimane akna kõrgus" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Viimati salvestatud akna kõrgus" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Viimane paneeli asukoht" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Viimati salvestatud paneeli asukoht" -#: ../midori/midori-websettings.c:278 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Viimane paneeli lehekülg" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Viimati salvestatud paneeli lehekülg" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Viimane veebiotsing" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Viimati salvestatud veebiotsing" -#: ../midori/midori-websettings.c:296 -msgid "Last pageholder URI" -msgstr "Viimase lehehoidja URI" +#: ../midori/midori-websettings.c:302 +#, fuzzy +msgid "Show Menubar" +msgstr "Menüüriba" -#: ../midori/midori-websettings.c:297 -msgid "The URI last opened in the pageholder" -msgstr "Viimati lehehoidjas avatud URI" +#: ../midori/midori-websettings.c:303 +#, fuzzy +msgid "Whether to show the menubar" +msgstr "Kas näidata olekuriba" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Näita navigatsiooniriba" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Kas näidata navigatsiooniriba" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Näita järjehoidjariba" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Kas näidata järjehoidjariba" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Näita paneeli" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Kas näidata paneeli" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Näita olekuriba" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Kas näidata olekuriba" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Tööriistariba stiil" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Tööriistariba stiil" -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Näita uut kaarti" +#: ../midori/midori-websettings.c:358 +#, fuzzy +msgid "Toolbar Items" +msgstr "Tööriistariba stiil" -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "Näita tööriistaribas uue kaardi nuppu" +#: ../midori/midori-websettings.c:359 +#, fuzzy +msgid "The items to show on the toolbar" +msgstr "Tööriistariba stiil" -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "Näita kodulehekülge" +#: ../midori/midori-websettings.c:367 +#, fuzzy +msgid "Compact Sidepanel" +msgstr "Külg_paneel" -#: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "Näita tööriistaribas kodulehekülje nuppu" +#: ../midori/midori-websettings.c:368 +#, fuzzy +msgid "Whether to make the sidepanel compact" +msgstr "Kas näidata paneeli" -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Näita veebiotsingut" - -#: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "Näita tööriistaribas veebiotsingu sissekannet" - -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Näita prügi" - -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "Näita tööriistaribas prügi nuppu" - -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Laadi tööleminekul" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Mida tööleminekul laadida" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Kodulehekülg" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Allalaadimise kataloog" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Kataloog kuhu salvestatakse allalaaditud failid" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Allalaadimise haldur" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Väline allalaadimise haldur" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Asukoha sissekande otsing" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Otsing mida viia läbi asukoha sissekandes" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Eelistatud kodeering" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Eelistatud märkide kodeering" -#: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "Kaardimärgendi suurus" +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "" -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "Soovitud kaardimärgendi suurus" +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Sulgemisnupud kaartidel" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Kas kaartidel on sulgemisnupud" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Ava uued leheküljed" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Kus avada uued leheküljed" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:473 +#, fuzzy +msgid "Open external pages in" +msgstr "Ava uued leheküljed" + +#: ../midori/midori-websettings.c:474 +#, fuzzy +msgid "Where to open externally opened pages" +msgstr "Kus avada uued leheküljed" + +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Keskmine klõps avab valiku" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Laadi keskmise klõpsuga valikust URL" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Ava kaardid taustal" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Kas avada uued kaardid taustal" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Ava kaardid käesoleva kõrval" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Kas avada uued kaardid käesoleva või viimase kaardi kõrval" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Ava hüpikaknad kaartides" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Kas avada hüpikaknad kaartides" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Võta küpsised vastu" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Mis liiki küpsised vastu võtta" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Ainult algupärased küpsised" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Võta vastu küpsised ainult algupäraselt veebileheküljelt" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Suurim küpsise vanus" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Suurim arv päevasid küpsiste salvestamiseks" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Jäta meelde viimati külastatud leheküljed" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Kas viimati külastatud leheküljed on salvestatud" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Suurim ajaloo vanus" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Suurim arv päevasid ajaloo salvestamiseks" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Jäta meelde viimased ankeedisisendid" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Kas viimased ankeedisisendid salvestatakse" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Jäta meelde viimati allalaaditud failid" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Kas viimati allalaaditud failid on salvestatud" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP proksi" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "HTTP ühendusteks kasutatav proksi" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Vahemälu suurus" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Lubatud vahemälu suurus" -#: ../midori/midori-webview.c:65 -msgid "Load Provisional" -msgstr "Laadi esialgne" +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" -#: ../midori/midori-webview.c:66 -msgid "Load Committed" -msgstr "Laadi üleantud" - -#: ../midori/midori-webview.c:67 -msgid "Load Finished" -msgstr "Laadimine lõpetatud" - -#: ../midori/midori-webview.c:225 -msgid "The URI of the currently loaded page" -msgstr "Käesoleva laaditud lehekülje URI" - -#: ../midori/midori-webview.c:235 -msgid "The title of the currently loaded page" -msgstr "Käesoleva laaditud lehekülje pealkiri" - -#: ../midori/midori-webview.c:245 -msgid "The current loading progress" -msgstr "Käesoleva laadimise edenemine" - -#: ../midori/midori-webview.c:254 -msgid "The current loading status" -msgstr "Käesoleva laadimise olek" - -#: ../midori/midori-webview.c:699 +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Ava link uues _kaardis" -#: ../midori/midori-webview.c:727 -msgid "Download Link with Download _Manager" -msgstr "Laadi link allalaadimise halduriga" +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" -#: ../midori/midori-webview.c:745 +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Ava URL uues _kaardis" -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "Omadustega varustav seadistuste instants" - -#: ../midori/midori-preferences.c:84 +#: ../midori/midori-view.c:1365 #, c-format -msgid "%s Preferences" +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1503 +msgid "Source" +msgstr "Lähtekood" + +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Näita dokumentatsiooni" + +#: ../midori/midori-preferences.c:87 +#, fuzzy, c-format +msgid "Preferences for %s" msgstr "%s eelistused" #. Page "General" -#: ../midori/midori-preferences.c:270 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Üldine" -#: ../midori/midori-preferences.c:271 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Tööleminek" #. Page "Appearance" -#: ../midori/midori-preferences.c:304 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Välimus" -#: ../midori/midori-preferences.c:305 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Fondi seadistused" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:325 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Käitumine" -#: ../midori/midori-preferences.c:326 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Võimalused" +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#, fuzzy +msgid "Enable scripts" +msgstr "Kasutajaskriptid" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Liides" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Navigatsiooniriba" + +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Lehitsemine" -#. Page "Network" -#: ../midori/midori-preferences.c:416 -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Võrk" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "Käesolev element" +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" +msgstr "" -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "Hetkel valitud element" +#: ../midori/midori-preferences.c:500 +#, fuzzy +msgid "Web Cookies" +msgstr "Võta küpsised vastu" -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "Dialoog" +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +msgid "days" +msgstr "" -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "Dialoog otsingumootorite haldamiseks" - -#: ../midori/midori-searchentry.c:151 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Tühi" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Lisa otsingumootor" -#: ../midori/midori-searchentry.c:524 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Muuda otsingumootorit" -#: ../midori/midori-searchentry.c:551 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nimi:" -#: ../midori/midori-searchentry.c:595 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Ikoon (nimi või fail):" -#: ../midori/midori-searchentry.c:609 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Luba:" -#: ../midori/midori-searchentry.c:790 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Halda otsingumootoreid" -#: ../midori/sokoke.c:60 -#: ../midori/sokoke.c:72 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Välist programmi ei saanud käivitada" -#: ../midori/sokoke.c:348 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Hoiatus: Sa kasutad superkasutaja kontot!" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Juhtus tundmatu viga." -#: ../midori/gjs.c:739 -#: ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s ei ühtegi väärtust \"%s\"" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s ei saa määrata %s.%s" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s ei saa ligi" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" -msgstr "Ikooni suurus" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Kasutajaskriptid" -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Sümboolne suurus animeerimisel kasutamiseks" +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Kasutajastiilid" -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" -msgstr "Ikooni nimi" +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Lülita sisse" -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "Animatsioonikaadreid sisaldava ikooni nimi" +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Lülita välja" -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" -msgstr "Pixbuf" +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsool" -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "Animatsioonikaadreid sisaldav GdkPixpuf" +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Laiendid" -#: ../katze/katze-throbber.c:162 -msgid "Animated" -msgstr "Animeeritud" - -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "Kas tuksuja peaks olema animeeritud" - -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "Staatilise ikooni nimi" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Staatilise pildina kasutatava ikooni nimi" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "Staatiline Pixbuf" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "Staatilise pildina kasutatav GdkPixbuf" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "Staatilise varutunnus" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "Staatilise pildina kasutatava ikooni varutunnus" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Nimetatud ikooni \"%s\" ei saanud laadida" -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Varuikooni \"%s\" ei saanud laadida" -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "Ikooni \"%s\" ei saanud laadida" - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Animatsioonikaadrid on vigased" -#: ../katze/katze-utils.c:137 -#: ../katze/katze-utils.c:322 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Omadus \"%s\" ei ole õige %s jaoks" -#: ../katze/katze-utils.c:159 -#: ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Vali fail" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Vali kataloog" -#: ../katze/katze-item.c:72 -msgid "Name" -msgstr "Nimi" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Lehehoidja" -#: ../katze/katze-item.c:73 -msgid "The name of the item" -msgstr "Elemendi nimi" +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Lehehoidja" -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" -msgstr "Elemendi kirjeldav tekst" +#: ../extensions/statusbar-features.c:30 +#, fuzzy +msgid "Images" +msgstr "Lehekülg" -#: ../katze/katze-item.c:91 -msgid "The URI of the item" -msgstr "Elemendi URI" +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Kasutajaskriptid" -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "Ikoon" +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "Elemendi ikoon" +#~ msgid "Select _All" +#~ msgstr "Vali _kõik" -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "Luba" +#~ msgid "_Fullscreen" +#~ msgstr "_Täisekraan" -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "Elemendi luba" +#~ msgid "_Leave Fullscreen" +#~ msgstr "_Lahku täisekraanist" -#: ../katze/katze-xbel.c:708 -#: ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 -#: ../katze/katze-xbel.c:760 -msgid "Malformed document." -msgstr "Väärvormistatud dokument." +#~ msgid "Unknown argument." +#~ msgstr "Tundmatu argument." -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "Faili ei leitud." +#~ msgid "Failed to setup interface." +#~ msgstr "Liidese seadistamine ei õnnestunud." + +#~ msgid "Settings" +#~ msgstr "Seadistused" + +#~ msgid "The associated settings" +#~ msgstr "Seostatud seadistused" + +#~ msgid "The bookmarks folder, containing all bookmarks" +#~ msgstr "Järjehoidjate kataloog, sisaldab kõiki järjehoidjaid" + +#~ msgid "Trash" +#~ msgstr "Prügi" + +#~ msgid "The trash, collecting recently closed tabs and windows" +#~ msgstr "Prügi, kogub hiljuti suletud kaarte ja aknaid" + +#~ msgid "Search Engines" +#~ msgstr "Otsingumootorid" + +#~ msgid "The list of search engines" +#~ msgstr "Otsingumootorite loetelu" + +#~ msgid "Browser" +#~ msgstr "Brauser" + +#~ msgid "The current browser" +#~ msgstr "Praegune brauser" + +#~ msgid "Browser Count" +#~ msgstr "Brausereid" + +#~ msgid "The current number of browsers" +#~ msgstr "Praegune brauserite arv" + +#~ msgid "Web Widget" +#~ msgstr "Veebividin" + +#~ msgid "The assigned web widget" +#~ msgstr "Määratud veebividin" + +#~ msgid "Kind" +#~ msgstr "Liik" + +#~ msgid "The kind of addons" +#~ msgstr "Lisandite liik" + +#~ msgid "The navigationbar" +#~ msgstr "Navigatsiooniriba" + +#~ msgid "URI" +#~ msgstr "URI" + +#~ msgid "The current URI" +#~ msgstr "Käesolev URI" + +#~ msgid "Tab" +#~ msgstr "Kaart" + +#~ msgid "The current tab" +#~ msgstr "Käesolev kaart" + +#~ msgid "Statusbar" +#~ msgstr "Olekuriba" + +#~ msgid "The statusbar" +#~ msgstr "Olekuriba" + +#~ msgid "Statusbar Text" +#~ msgstr "Olekuriba tekst" + +#~ msgid "The text that is displayed in the statusbar" +#~ msgstr "Olekuribal näidatav tekst" + +#~ msgid "The list of search engines to be used for web search" +#~ msgstr "Loetelu veebiotsinguks kasutatavatest otsingumootoritest" + +#~ msgid "Pa_ge Setup" +#~ msgstr "Lehekülje _seadistamine" + +#~ msgid "Show a preview of the printed page" +#~ msgstr "Näita trükitava lehekülje eelvaadet" + +#~ msgid "Undo the last modification" +#~ msgstr "Võta viimane muudatus tagasi" + +#~ msgid "Redo the last modification" +#~ msgstr "Tee viimane muudatus uuesti" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Ava lehe_hoidjas..." + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Ava käesolev lehekülg lehehoidjas" + +#~ msgid "_Manage Bookmarks" +#~ msgstr "_Halda järjehoidjaid" + +#~ msgid "Add, edit and remove bookmarks..." +#~ msgstr "Lisa, muuda ja eemalda järjehoidjaid..." + +#~ msgid "Open the selected bookmark in a new tab" +#~ msgstr "Ava valitud järjehoidja uuel kaardil" + +#~ msgid "Open the selected bookmark in a new window" +#~ msgstr "Ava valitud järjehoidja uues aknas" + +#~ msgid "Tab _Overview" +#~ msgstr "Kaardi _ülevaade" + +#~ msgid "_Work Offline" +#~ msgstr "_Tööta ühenduseta" + +#~ msgid "Work without a network connection" +#~ msgstr "Tööta ilma võrguühenduseta." + +#~ msgid "Shadow Type" +#~ msgstr "Varju liik" + +#~ msgid "Appearance of the shadow around each panel" +#~ msgstr "Varju väljanägemine iga paneeli ümber" + +#~ msgid "Menu" +#~ msgstr "Menüü" + +#~ msgid "Menu to hold panel items" +#~ msgstr "Menüü paneelielementide hoidmiseks" + +#~ msgid "The index of the current page" +#~ msgstr "Käesoleva lehekülje indeks" + +#~ msgid "Last pageholder URI" +#~ msgstr "Viimase lehehoidja URI" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Viimati lehehoidjas avatud URI" + +#~ msgid "Show New Tab" +#~ msgstr "Näita uut kaarti" + +#~ msgid "Show the New Tab button in the toolbar" +#~ msgstr "Näita tööriistaribas uue kaardi nuppu" + +#~ msgid "Show Homepage" +#~ msgstr "Näita kodulehekülge" + +#~ msgid "Show the Homepage button in the toolbar" +#~ msgstr "Näita tööriistaribas kodulehekülje nuppu" + +#~ msgid "Show Web search" +#~ msgstr "Näita veebiotsingut" + +#~ msgid "Show the Web search entry in the toolbar" +#~ msgstr "Näita tööriistaribas veebiotsingu sissekannet" + +#~ msgid "Show Trash" +#~ msgstr "Näita prügi" + +#~ msgid "Show the Trash button in the toolbar" +#~ msgstr "Näita tööriistaribas prügi nuppu" + +#~ msgid "Tab Label Size" +#~ msgstr "Kaardimärgendi suurus" + +#~ msgid "The desired tab label size" +#~ msgstr "Soovitud kaardimärgendi suurus" + +#~ msgid "Load Provisional" +#~ msgstr "Laadi esialgne" + +#~ msgid "Load Committed" +#~ msgstr "Laadi üleantud" + +#~ msgid "Load Finished" +#~ msgstr "Laadimine lõpetatud" + +#~ msgid "The URI of the currently loaded page" +#~ msgstr "Käesoleva laaditud lehekülje URI" + +#~ msgid "The title of the currently loaded page" +#~ msgstr "Käesoleva laaditud lehekülje pealkiri" + +#~ msgid "The current loading progress" +#~ msgstr "Käesoleva laadimise edenemine" + +#~ msgid "The current loading status" +#~ msgstr "Käesoleva laadimise olek" + +#~ msgid "Download Link with Download _Manager" +#~ msgstr "Laadi link allalaadimise halduriga" + +#~ msgid "Settings instance to provide properties" +#~ msgstr "Omadustega varustav seadistuste instants" + +#~ msgid "Current Item" +#~ msgstr "Käesolev element" + +#~ msgid "The currently selected item" +#~ msgstr "Hetkel valitud element" + +#~ msgid "Dialog" +#~ msgstr "Dialoog" + +#~ msgid "A dialog to manage search engines" +#~ msgstr "Dialoog otsingumootorite haldamiseks" + +#~ msgid "Icon size" +#~ msgstr "Ikooni suurus" + +#~ msgid "Symbolic size to use for the animation" +#~ msgstr "Sümboolne suurus animeerimisel kasutamiseks" + +#~ msgid "Icon Name" +#~ msgstr "Ikooni nimi" + +#~ msgid "The name of an icon containing animation frames" +#~ msgstr "Animatsioonikaadreid sisaldava ikooni nimi" + +#~ msgid "Pixbuf" +#~ msgstr "Pixbuf" + +#~ msgid "A GdkPixbuf containing animation frames" +#~ msgstr "Animatsioonikaadreid sisaldav GdkPixpuf" + +#~ msgid "Animated" +#~ msgstr "Animeeritud" + +#~ msgid "Whether the throbber should be animated" +#~ msgstr "Kas tuksuja peaks olema animeeritud" + +#~ msgid "Static Icon Name" +#~ msgstr "Staatilise ikooni nimi" + +#~ msgid "The name of an icon to be used as the static image" +#~ msgstr "Staatilise pildina kasutatava ikooni nimi" + +#~ msgid "Static Pixbuf" +#~ msgstr "Staatiline Pixbuf" + +#~ msgid "A GdkPixbuf to be used as the static image" +#~ msgstr "Staatilise pildina kasutatav GdkPixbuf" + +#~ msgid "Static Stock ID" +#~ msgstr "Staatilise varutunnus" + +#~ msgid "The stock ID of an icon to be used as the static image" +#~ msgstr "Staatilise pildina kasutatava ikooni varutunnus" + +#~ msgid "Icon '%s' couldn't be loaded" +#~ msgstr "Ikooni \"%s\" ei saanud laadida" + +#~ msgid "Name" +#~ msgstr "Nimi" + +#~ msgid "The name of the item" +#~ msgstr "Elemendi nimi" + +#~ msgid "The descriptive text of the item" +#~ msgstr "Elemendi kirjeldav tekst" + +#~ msgid "The URI of the item" +#~ msgstr "Elemendi URI" + +#~ msgid "Icon" +#~ msgstr "Ikoon" + +#~ msgid "The icon of the item" +#~ msgstr "Elemendi ikoon" + +#~ msgid "Token" +#~ msgstr "Luba" + +#~ msgid "The token of the item" +#~ msgstr "Elemendi luba" diff --git a/po/fi.po b/po/fi.po index 7d17aaf0..95db7c43 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-26 14:27+0200\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-10-30 21:20+0200\n" "Last-Translator: Elias Julkunen \n" "Language-Team: Finnish \n" @@ -19,11 +19,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Kevyt verkkoselain" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1100 -#: ../midori/main.c:1109 -#: ../midori/main.c:1120 -#: ../midori/main.c:1144 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -31,1363 +28,1366 @@ msgstr "Midori" msgid "Web Browser" msgstr "Verkkoselain" -#: ../midori/main.c:71 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Kirjanmerkki" -#: ../midori/main.c:72 -#: ../midori/midori-browser.c:3509 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Kirjanmerkit" -#: ../midori/main.c:73 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Lisää kirjanmerkki" -#: ../midori/main.c:74 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konsoli" -#: ../midori/main.c:75 -msgid "_Disable" -msgstr "_Poista käytöstä" - -#: ../midori/main.c:76 -msgid "_Enable" -msgstr "_Ota käyttöön" - -#: ../midori/main.c:77 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Liitännäiset" -#: ../midori/main.c:78 +#: ../midori/main.c:91 msgid "_History" msgstr "_Historia" -#: ../midori/main.c:79 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Kotisivu" -#: ../midori/main.c:80 -msgid "_Pageholder" -msgstr "_Sivupidike" - -#: ../midori/main.c:81 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "Käyttäjän _skriptit" -#: ../midori/main.c:82 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Käyttäjän _tyylit" -#: ../midori/main.c:83 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Uusi _välilehti" -#: ../midori/main.c:84 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Siirrot" -#: ../midori/main.c:85 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Suljetut välilehdet ja ikkunat" -#: ../midori/main.c:86 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Uusi _ikkuna" -#: ../midori/main.c:136 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "Asetuksia ei voitu ladata. %s\n" -#: ../midori/main.c:191 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Arvo ”%s” ei kelpaa kohteelle %s" -#: ../midori/main.c:198 -#: ../midori/main.c:267 -#, c-format -msgid "Unhandled settings value '%s'" +#: ../midori/main.c:205 ../midori/main.c:275 +#, fuzzy, c-format +msgid "Invalid configuration value '%s'" msgstr "Käsittelemätön asetusarvo ”%s”" -#: ../midori/main.c:526 -#: ../midori/main.c:534 -#: ../midori/main.c:564 -#: ../midori/main.c:573 -msgid "Malformed document." -msgstr "Virheellinen dokumentti." - -#: ../midori/main.c:556 +#: ../midori/main.c:532 msgid "File not found." msgstr "Tiedostoa ei löytynyt" -#: ../midori/main.c:594 -#: ../midori/main.c:626 -#, c-format -msgid "Error opening database: %s\n" +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Virheellinen dokumentti." + +#: ../midori/main.c:571 ../midori/main.c:603 +#, fuzzy, c-format +msgid "Failed to open database: %s\n" msgstr "Virhe avattaessa tietokantaa: %s\n" -#: ../midori/main.c:681 -#, c-format -msgid "Failed to remove history item. %s\n" +#: ../midori/main.c:657 +#, fuzzy, c-format +msgid "Failed to remove history item: %s\n" msgstr "Historiatietuetta ei voitu poistaa. %s\n" -#: ../midori/main.c:705 -#, c-format -msgid "Failed to clear history. %s\n" +#: ../midori/main.c:681 +#, fuzzy, c-format +msgid "Failed to clear history: %s\n" msgstr "Historiaa ei voitu tyhjentää. %s\n" -#: ../midori/main.c:738 -#: ../midori/main.c:753 -#, c-format -msgid "Failed to add history item. %s\n" +#: ../midori/main.c:714 ../midori/main.c:728 +#, fuzzy, c-format +msgid "Failed to add history item: %s\n" msgstr "Historiatietuetta ei voitu lisätä. %s\n" -#: ../midori/main.c:870 -#, c-format -msgid "Failed to remove old history items. %s\n" +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 +#, fuzzy, c-format +msgid "Failed to remove old history items: %s\n" msgstr "Vanhoja historiatietueita ei voitfu poistaa. %s\n" -#: ../midori/main.c:1002 -#: ../midori/sokoke.c:457 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Kirjoitus epäonnistui." -#: ../midori/main.c:1027 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Siirrot" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Istuntoa ei voitu tallentaa. %s" -#: ../midori/main.c:1059 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Suorita annettu tiedostonimi javascriptinä" -#: ../midori/main.c:1061 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Näytä sovelluksen versio" -#: ../midori/main.c:1063 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URI-osoitteet" -#: ../midori/main.c:1097 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URI-osoitteet]" -#: ../midori/main.c:1121 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" -msgstr "Voit lähettää kommentteja, ehdotuksia ja tietoa ohjelmavirheistä osoitteeseen:" +msgstr "" +"Voit lähettää kommentteja, ehdotuksia ja tietoa ohjelmavirheistä " +"osoitteeseen:" -#: ../midori/main.c:1123 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Kaäy katsomassa uusia versioita osoittesta:" -#: ../midori/main.c:1144 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Tiedostonimeä ei annettu" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:1162 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori on jo käynnissä, muttei vastaa.\n" -#: ../midori/main.c:1196 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Kirjanmerkkejä ei voitu ladata. %s\n" -#: ../midori/main.c:1210 -#, c-format -msgid "The session couldn't be loaded. %s\n" +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" msgstr "Istuntoa ei voitu ladata. %s\n" -#: ../midori/main.c:1222 -#, c-format -msgid "The trash couldn't be loaded. %s\n" +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" msgstr "Roskakoria ei voitu ladata. %s\n" -#: ../midori/main.c:1235 -#, c-format -msgid "The history couldn't be loaded. %s\n" +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" msgstr "Historiaa ei voitu ladata. %s\n" -#: ../midori/main.c:1248 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Seuraavat virheet tapahtuivat:" -#: ../midori/main.c:1407 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Hakukoneita ei voitu tallentaa. %s" -#: ../midori/main.c:1417 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Kirjanmerkkejä ei voitu tallentaa. %s" -#: ../midori/main.c:1426 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Roskakoria ei voitu tallentaa. %s" -#: ../midori/main.c:1434 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Asetuksia ei voitu tallentaa. %s" -#: ../midori/midori-addons.c:87 -#: ../midori/midori-websettings.c:207 -msgid "None" -msgstr "Ei mitään" - -#: ../midori/midori-addons.c:88 -#: ../midori/midori-browser.c:3750 -msgid "Extensions" -msgstr "Liitännäiset" - -#: ../midori/midori-addons.c:89 -#: ../midori/midori-browser.c:3733 -msgid "Userscripts" -msgstr "Käyttäjän skriptit" - -#: ../midori/midori-addons.c:90 -#: ../midori/midori-browser.c:3741 -msgid "Userstyles" -msgstr "Käyttäjän tyylit" - -#: ../midori/midori-browser.c:246 -#: ../midori/midori-browser.c:3041 -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Lataa nykyinen sivu uudelleen" -#: ../midori/midori-browser.c:258 -#: ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Keskeytä nykyisen sivun lataaminen" -#: ../midori/midori-browser.c:315 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d %% ladattu" -#: ../midori/midori-browser.c:338 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Odottamaton toimenpide ”%s”." -#: ../midori/midori-browser.c:507 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Uusi kirjanmerkki" -#: ../midori/midori-browser.c:507 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Muokkaa kirjanmerkkiä" -#: ../midori/midori-browser.c:529 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Nimi:" -#: ../midori/midori-browser.c:542 -#: ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Kuvaus:" -#: ../midori/midori-browser.c:561 -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL-osoite:" -#: ../midori/midori-browser.c:577 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Kansio:" -#: ../midori/midori-browser.c:581 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Juuri" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" +msgstr "Tallenna tiedostoon" + +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "Avaa tiedosto" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Avaa uudessa _välilehdessä" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Avaa uudessa _ikkunassa" + +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Erotin" -#: ../midori/midori-browser.c:2534 +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "%d päivää sitten" -#: ../midori/midori-browser.c:2541 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Tänään" -#: ../midori/midori-browser.c:2543 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Eilen" -#: ../midori/midori-browser.c:2632 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Kevyt verkkoselain" -#: ../midori/midori-browser.c:2640 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "Elias Julkunen, " -#: ../midori/midori-browser.c:2909 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Haluatko varmasti tyhjentää koko historian?" -#: ../midori/midori-browser.c:2976 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Tiedosto" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Avaa uusi ikkuna" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Avaa uusi välilehti" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Avaa tiedosto" -#: ../midori/midori-browser.c:2988 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Tallenna tiedostoon" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "Sulje _välilehti" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Sulje nykyinen välilehti" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "Sulje _ikkuna" -#: ../midori/midori-browser.c:2994 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Sulje tämä ikkuna" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Tulosta nykyinen sivu" -#: ../midori/midori-browser.c:3000 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Poistu sovelluksesta" -#: ../midori/midori-browser.c:3002 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Muokkaa" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Leikkaa valittu teksti" -#: ../midori/midori-browser.c:3008 -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Kopioi valittu teksti" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Liitä teksti leikepöydältä" -#: ../midori/midori-browser.c:3017 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Poista valittu teksti" -#: ../midori/midori-browser.c:3020 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Valitse kaikki tekstit" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Etsi sana tai lause sivulta" -#: ../midori/midori-browser.c:3025 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Etsi _seuraava" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Etsi seuraavan sanan tai lauseen esiintymä" -#: ../midori/midori-browser.c:3028 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Etsi _edellinen" -#: ../midori/midori-browser.c:3029 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Etsi edellisen sanan tai lauseen esiintymä" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "_Pikahaku" -#: ../midori/midori-browser.c:3032 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Hyppää nopeasti sanaan tai lauseeseen" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Muokkaa sovelluksen asetuksia" -#: ../midori/midori-browser.c:3037 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Näytä" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Työkalupalkit" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Suurenna" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Pienennä" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Palauta suurennustaso" -#: ../midori/midori-browser.c:3058 -#: ../midori/midori-view.c:901 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Näytä _lähdekoodi" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Näytä sivun lähdekoodi" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Näytä valinnan lähdekoodi" -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Näytä valinnan lähdekoodi" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Vaihda kokonäyttötilan välillä" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Siirry" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Siirry takaisin edelliselle sivulle" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Siirry eteenpäin seuraavalle sivulle" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Siirry kotisivulle" -#: ../midori/midori-browser.c:3078 -msgid "Open in Page_holder..." -msgstr "Avaa _sivun pitäjässä" - -#: ../midori/midori-browser.c:3079 -msgid "Open the current page in the pageholder" -msgstr "Avaa nykyinen sivu sivun pitäjässä" - -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Tyhjennä roskakori" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Poista roskakorin sisältö" -#. FIXME: Make this sensitive only when there is a tab to undo -#: ../midori/midori-browser.c:3084 -#: ../midori/midori-view.c:876 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Kumoa välilehden sulkeminen" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Avaa viimeisin suljettu välilehti" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Lisää uusi kirjanmerkki" -#: ../midori/midori-browser.c:3092 -msgid "Open the selected bookmark" -msgstr "Avaa valittu kirjanmerkki" - -#: ../midori/midori-browser.c:3094 -#: ../midori/midori-browser.c:3115 -msgid "Open in New _Tab" -msgstr "Avaa uudessa _välilehdessä" - -#: ../midori/midori-browser.c:3095 -msgid "Open the selected bookmark in a new tab" -msgstr "Avaa valittu kirjanmerkki uudessa välilehdessä" - -#: ../midori/midori-browser.c:3097 -msgid "Open in New _Window" -msgstr "Avaa uudessa _ikkunassa" - -#: ../midori/midori-browser.c:3098 -msgid "Open the selected bookmark in a new window" -msgstr "Avaa valittu kirjanmerkki uudessa ikkunassa" - -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Muokkaa valittua kirjanmerkkiä" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Poista valittu kirjanmerkki" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Poista valittu historiatietue" -#: ../midori/midori-browser.c:3110 -msgid "Clear the enitre history" +#: ../midori/midori-browser.c:3188 +#, fuzzy +msgid "Clear the entire history" msgstr "Tyhjennä koko historia" -#: ../midori/midori-browser.c:3113 -msgid "Open the selected history item" +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" msgstr "Avaa valittu historiatietue" -#: ../midori/midori-browser.c:3116 -msgid "Open the selected history item in a new tab" -msgstr "Avaa valittu historiatietue uudessa välilehdessä" - -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Työkalut" -#: ../midori/midori-browser.c:3119 -#: ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Hallitse hakukoneita" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Lisää, muokkaa ja poista hakukoneita..." -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Edellinen välilehti" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Vaihda edelliseen välilehteen" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Seuraava välilehti" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Vaihda seuraavaan välilehteen" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Ohje" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Sisältö" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Näyttä dokumentaatio" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Usein kysytyt kysymykset" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Näytä usein kysytyt kysymykset" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "_Ilmoita ohjelmavirheestä" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Avaa Midorin ohjelmavirhehallinta" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Näytää tietoja sovelluksesta" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "_Yksityinen selaaminen" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Ei tallenna mitään yksityisyystietoja selatessa" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "_Valikkopalkki" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Näytä valikkopalkki" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Navigointipalkki" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Näytä navigointipalkki" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "_Sivupaneeli" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Näytä sivupaneeli" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Kirjanmerkkipalkki" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Näytä kirjanmerkkipalkki" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Siirtopalkki" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Näytä siirtopalkki" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Tilapalkki" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Näytä tilapalkki" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Sijainti..." -#: ../midori/midori-browser.c:3434 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Avaa tarkka sijainti" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "_WWW-haku" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Suorita WWW-haku" -#: ../midori/midori-browser.c:3479 -#: ../midori/midori-browser.c:3511 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Avaa uudelleen aikaisemmin suljettu välilehti tai ikkuna" -#: ../midori/midori-browser.c:3493 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Usein vieraillut sivut" -#: ../midori/midori-browser.c:3495 -msgid "Revisit pages that you opened before" +#: ../midori/midori-browser.c:3731 +#, fuzzy +msgid "Reopen pages that you visited earlier" msgstr "Vieraile uudelleen sivuilla, jotka avasit aiemmin" -#: ../midori/midori-browser.c:3525 -msgid "Window" +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Avaa valittu kirjanmerkki" + +#: ../midori/midori-browser.c:3759 +#, fuzzy +msgid "_Window" msgstr "Ikkuna" -#: ../midori/midori-browser.c:3527 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Näytä luettelo kaikista avoimista välilehdistä" -#: ../midori/midori-browser.c:3661 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Kirjanmerkit" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3668 -#: ../midori/midori-preferences.c:347 -msgid "Transfers" -msgstr "Siirrot" - -#: ../midori/midori-browser.c:3677 -msgid "Console" -msgstr "Konsoli" - -#. FRAME_NEW (_("Web Cookies")); -#. TABLE_NEW (3, 2); -#. label = katze_property_label (settings, "accept-cookies"); -#. INDENTED_ADD (label, 0, 1, 0, 1); -#. button = katze_property_proxy (settings, "accept-cookies", NULL); -#. FILLED_ADD (button, 1, 2, 0, 1); -#. button = katze_property_proxy (settings, "original-cookies-only", "blurb"); -#. SPANNED_ADD (button, 0, 2, 1, 2); -#. label = katze_property_label (settings, "maximum-cookie-age"); -#. INDENTED_ADD (label, 0, 1, 2, 3); -#. hbox = gtk_hbox_new (FALSE, 4); -#. entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); -#. gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); -#. gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), -#. FALSE, FALSE, 0); -#. FILLED_ADD (hbox, 1, 2, 2, 3); -#: ../midori/midori-browser.c:3715 -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Historia" -#: ../midori/midori-browser.c:3724 -msgid "Pageholder" -msgstr "Sivupidike" - -#: ../midori/midori-browser.c:3773 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Haku:" -#: ../midori/midori-browser.c:3808 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Kirjainkoko merkitsee" -#: ../midori/midori-browser.c:3816 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Korosta osumat" -#: ../midori/midori-browser.c:3825 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Sulje hakupalkki" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Odottamaton asetus ”%s”" -#: ../midori/midori-panel.c:207 -#: ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Sulje paneeli" -#: ../midori/midori-websettings.c:132 -#: ../midori/midori-view.c:1415 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Tyhjä sivu" -#: ../midori/midori-websettings.c:133 -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Kotisivu" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Viimeisimmät avoinna olleet sivut" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Kiinalainen (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japanilainen (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Venäläinen (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Läntinen (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Muokattu..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Uusi välilehti" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Uusi ikkuna" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Nykyinen välilehti" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Oletus" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Kuvakkeet" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Teksti" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Molemmat" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Molemmat vaakasuorassa" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Kaikki evästeet" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Istunnon evästeet" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Ei mitään" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Muista viimeisin ikkunan koko" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Tallennetaanko viimeisin ikkunan koko" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Viimeisin ikkunan leveys" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Viimeisin tallennettu ikkunan leveys" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Viimeisin ikkunan korkeus" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Viimeisin tallennettu ikkunan korkeus" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Viimeisin paneelin paikka" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Viimeisin tallennettu paneelin paikka" -#: ../midori/midori-websettings.c:280 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Viimeisin paneelin sivu" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Viimeisin tallennettu paneelin sivu" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Viimeisin verkkohaku" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Viimeisin tallennettu verkkohaku" -#: ../midori/midori-websettings.c:298 -msgid "Last pageholder URI" -msgstr "Viimeisin sivupidike URL-osoite" - -#: ../midori/midori-websettings.c:299 -msgid "The URI last opened in the pageholder" -msgstr "Viimeisin avoinna ollut URL-osoite sivupipidike" - -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Näytä valikkopalkki" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Näytetäänkö valikkopalkki" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Näytä navigointipalkki" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Näytetäänkö navigointipalkki" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Näytä kirjanmerkkipalkki" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Näytetäänkö kirjanmerkkipalkki" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Näytä paneeli" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Näytetäänkö paneeli" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Näytä tilapalkki" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Näytetäänkö tilapalkki" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Työkalupalkin tyyli" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Työkalupalkin tyyli" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Työkakupalkin painikkeet" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Työkalupalkissa näytettävät painikkeet" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Kompakti sivupaneeli" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Tehdäänkö sivupaneelista kompakti" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Lataa käynnistettäessä" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Mitä ladataan käynnistyksessä" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Kotisivu" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Latauskansio" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Kansio, jonne ladatut tiedostot tallennetaan" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Latauksien hallinta" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Ulkoinen latauksien hallinta" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Tekstieditori" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Ulkoinen tekstieditori" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Käytettävä merkkikoodaus" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Oletuksena käytettävä merkkikoodaus" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Näytä aina välilehtipalkki" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Näytä aina välilehtipalkki" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Sulkemispainikkeet välilehdissä" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Onko välilehdissä sulkemispainikkeet" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Avaa uudet sivut" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Miten uudet sivut avataan" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Avaa ulkoiset sivut" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Miten ulkoisesti avatut sivut avataan" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Keskinapsautus avaa valinnan" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Lataa URL-osoitteen valinnasta keskinapsautuksella" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Avaa välilehdet taustalla" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Avataanko uudet välilehdet taustalla" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Avaa välilehdet nykyisestä seuraavaksi" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi" +msgstr "" +"Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Avaa ponnahdusikkunat välilehdissä" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Avataanko ponnahdusikkunat välilehdissä" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Salli evästeet" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Minkälaiset evästeet sallitaan" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Alkuperäiset evästeet" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Sallii vain alkuperäisen sivuston evästeet" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Evästeiden enimmäisikä" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Evästetietojen säilytysaika päivinä" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Muista sivut, joilla on vierailtu" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Tallennetaanko sivut, joilla on vierailtu" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Historian enimmäisikä" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Historiatietojen säilytysaika päivinä" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Muista lomakkeisiin annetut tiedot" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Tallennetaanko lomakkeisiin annetut tiedot" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Muista ladatut tiedostot" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Tallennetaanko ladattujen tiedostojen lista" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP-välityspalvelin" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "HTTP-yhteyksille käytettävä välityspalvelin" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Välimuistin koko" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Välimuistin enimmäiskoko" -#: ../midori/midori-view.c:82 -msgid "Load Provisional" +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:83 -msgid "Load Committed" -msgstr "" - -#: ../midori/midori-view.c:84 -msgid "Load Finished" -msgstr "" - -#: ../midori/midori-view.c:814 +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Avaa linkki uudessa _välilehdessä" -#: ../midori/midori-view.c:838 -msgid "Download Link with Download _Manager" -msgstr "Lataa linkin kohde _latauksien hallinnalla" +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" -#: ../midori/midori-view.c:860 +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Avaa URL-osoite uudessa _välilehdessä" -#: ../midori/midori-view.c:1287 +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Lähdekoodi" -#: ../midori/midori-preferences.c:86 +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Näyttä dokumentaatio" + +#: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Kohteen %s asetukset" #. Page "General" -#: ../midori/midori-preferences.c:335 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Yleiset" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Käynnistys" #. Page "Appearance" -#: ../midori/midori-preferences.c:383 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Ulkoasu" -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Kirjasinasetukset" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:389 msgid "Default Font Family" msgstr "Oletuskirjasinperhe" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" msgstr "Kirjasimen vähimmäiskoko" #. Page "Behavior" -#: ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Käyttäytyminen" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Ominaisuudet" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Lataa kuvat automaattisesti" -#: ../midori/midori-preferences.c:411 +#: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" msgstr "Pienennä kuvat automaattisesti" -#: ../midori/midori-preferences.c:414 -msgid "Print backgrounds" +#: ../midori/midori-preferences.c:417 +#, fuzzy +msgid "Print background images" msgstr "Näytä taustakuvat" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:420 -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Salli skriptit" +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#, fuzzy +msgid "Enable plugins" +msgstr "Salli skriptit" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Käyttöliittymä" -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Navigointipalkki" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Selaaminen" -#. Page "Network" -#. PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); -#. FRAME_NEW (_("Network")); -#. TABLE_NEW (2, 2); -#. label = katze_property_label (settings, "http-proxy"); -#. INDENTED_ADD (label, 0, 1, 0, 1); -#. button = katze_property_proxy (settings, "http-proxy", NULL); -#. FILLED_ADD (button, 1, 2, 0, 1); -#. label = katze_property_label (settings, "cache-size"); -#. INDENTED_ADD (label, 0, 1, 1, 2); -#. hbox = gtk_hbox_new (FALSE, 4); -#. entry = katze_property_proxy (settings, "cache-size", NULL); -#. gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); -#. gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), -#. FALSE, FALSE, 0); -#. FILLED_ADD (hbox, 1, 2, 1, 2); +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#, fuzzy +msgid "Network" +msgstr "Uusi kirjanmerkki" + +#: ../midori/midori-preferences.c:492 +msgid "MB" +msgstr "" + #. Page "Privacy" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Yksityisyys" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:500 +#, fuzzy +msgid "Web Cookies" +msgstr "Salli evästeet" + +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "päivää" -#: ../midori/midori-searchaction.c:459 -#: ../katze/katze-arrayaction.c:284 -#: ../katze/katze-arrayaction.c:351 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Tyhjä" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Lisää hakukone" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Muokkaa hakukonetta" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nimi:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Kuvake (nimi tai tiedosto):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Merkki:" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Hallitse hakukoneita" -#: ../midori/sokoke.c:63 -#: ../midori/sokoke.c:75 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Ulkoista ohjelmaa ei voitu suorittaa" -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Varoitus: Käytät pääkäyttäjän tiliä!" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Tapahtui tuntematon virhe." -#: ../midori/gjs.c:739 -#: ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "Asialla %s ei ole ominaisuutta ”%s”" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../katze/katze-throbber.c:807 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Käyttäjän skriptit" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Käyttäjän tyylit" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Ota käyttöön" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Poista käytöstä" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsoli" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Liitännäiset" + +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Nimettyä kuvaketta ”%s” ei voitu ladata" -#: ../katze/katze-throbber.c:820 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Vakiokuvaketta ”%s” ei voitu ladata" -#: ../katze/katze-throbber.c:883 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Animaatiokehykset ovat rikki" -#: ../katze/katze-utils.c:147 -#: ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Ominaisuus ”%s” on epäkelpo kohteelle %s" -#: ../katze/katze-utils.c:169 -#: ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Valitse tiedosto" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Valitse kansio" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Sivupidike" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Sivupidike" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Käyttäjän skriptit" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Avaa _sivun pitäjässä" + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Avaa nykyinen sivu sivun pitäjässä" + +#~ msgid "Open the selected bookmark in a new tab" +#~ msgstr "Avaa valittu kirjanmerkki uudessa välilehdessä" + +#~ msgid "Open the selected bookmark in a new window" +#~ msgstr "Avaa valittu kirjanmerkki uudessa ikkunassa" + +#~ msgid "Open the selected history item in a new tab" +#~ msgstr "Avaa valittu historiatietue uudessa välilehdessä" + +#~ msgid "Last pageholder URI" +#~ msgstr "Viimeisin sivupidike URL-osoite" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Viimeisin avoinna ollut URL-osoite sivupipidike" + +#~ msgid "Download Link with Download _Manager" +#~ msgstr "Lataa linkin kohde _latauksien hallinnalla" diff --git a/po/fr.po b/po/fr.po index ba17898d..38991dab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-29 22:03+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-02 22:11+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: French \n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 -#: ../midori/main.c:1161 ../midori/main.c:1185 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -31,235 +31,211 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:81 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/main.c:82 ../midori/midori-browser.c:3719 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/main.c:83 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/main.c:84 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:85 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:86 +#: ../midori/main.c:91 msgid "_History" msgstr "_Historique" -#: ../midori/main.c:87 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:88 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/main.c:89 +#: ../midori/main.c:94 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/main.c:90 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/main.c:91 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/main.c:92 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/main.c:93 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/main.c:138 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée: %s\n" -#: ../midori/main.c:193 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:200 ../midori/main.c:270 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:527 +#: ../midori/main.c:532 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/main.c:535 ../midori/main.c:544 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "Document mal formé" -#: ../midori/main.c:566 ../midori/main.c:598 +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:652 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:676 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:709 ../midori/main.c:723 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:971 ../midori/sokoke.c:459 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Transferts" -#: ../midori/main.c:1024 -msgid "Console" -msgstr "Console" - -#: ../midori/main.c:1034 ../midori/midori-addons.c:88 -msgid "Userscripts" -msgstr "Scripts utilisateur" - -#: ../midori/main.c:1042 ../midori/midori-addons.c:89 -msgid "Userstyles" -msgstr "Styles utilisateur" - -#: ../midori/main.c:1051 -msgid "Extensions" -msgstr "Extensions" - -#: ../midori/main.c:1071 +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1100 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1102 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1104 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1138 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1162 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1164 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1185 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Aucun nom de fichier indiqué" -#: ../midori/main.c:1202 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1238 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés: %s\n" -#: ../midori/main.c:1254 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:1268 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:1282 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargée. %s\n" -#: ../midori/main.c:1295 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1479 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1489 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content -#: ../midori/main.c:1498 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1506 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Aucun" - -#: ../midori/midori-addons.c:964 -msgid "_Enable" -msgstr "_Activer" - -#: ../midori/midori-addons.c:973 -msgid "_Disable" -msgstr "_Désactiver" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" @@ -306,433 +282,433 @@ msgstr "Racine" msgid "Save file as" msgstr "Enregistrer fichier dans" -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Ouvrir fichier" -#: ../midori/midori-browser.c:2304 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2577 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:2688 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "Avant une semaine" -#: ../midori/midori-browser.c:2694 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "Avant %d jours" -#: ../midori/midori-browser.c:2701 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Aujourd'hui" -#: ../midori/midori-browser.c:2703 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Hier" -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin " -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3057 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou d'une phrase" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Supprimer l'element sélectionné de la historique" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Vider l'historique entier" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'element sélectionné de la historique" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Questions couramment" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Afficher les foire aux questions" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "_Adviser un problème" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Ouvrir le persécuteur de problèmes de Midori" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3646 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3672 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Lance une recherche toile" -#: ../midori/midori-browser.c:3691 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:3704 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Réouvre des pages déjà visitées" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauveguardées" -#: ../midori/midori-browser.c:3734 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3736 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Signets" -#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Historique" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4237 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" @@ -741,412 +717,426 @@ msgstr "Paramètre inattendu « %s »" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Aucun" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Elements de la barre d'outils" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Les elements pour afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau compact" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Editeur texte" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Un editeur texte externe" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Codage favori" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Codage des caractères favori" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Toujours afficher barre d'onglets" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Type de témoins à accepter" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Taille de l'antémémoire (cache)" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" -#: ../midori/midori-view.c:818 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:841 -#, fuzzy +#: ../midori/midori-view.c:925 msgid "_Save Link destination" -msgstr "_Télécharger la cible du lien" +msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:849 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:871 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Ouvrir l'URL dans un nouvel _onglet" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Source" +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "Pas de documentation installé" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" @@ -1187,7 +1177,7 @@ msgstr "Comportement" msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Charger les images automatiquement" @@ -1196,57 +1186,56 @@ msgid "Shrink images automatically" msgstr "Diminuer les images automatiquement" #: ../midori/midori-preferences.c:417 -#, fuzzy msgid "Print background images" -msgstr "Imprimer les arrière-plans" +msgstr "Imprimer les images d'arrière-plan" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "On peut agrandir champs de texte" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Activer scripts" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Activer greffons" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:429 msgid "Enable developer tools" msgstr "Activer les outils développeur" #. Page "Interface" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Témoins de toile" -#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "jours" @@ -1305,6 +1294,30 @@ msgstr "%s ne peut être assigné à %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s ne peut être accédé" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Scripts utilisateur" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Styles utilisateur" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Activer" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Désactiver" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Console" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensions" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1319,7 +1332,7 @@ msgstr "L'icône de catalogue « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:345 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" @@ -1340,3 +1353,15 @@ msgstr "Cadre de pages" #: ../extensions/page-holder.c:128 msgid "_Pageholder" msgstr "C_adre de pages" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "Images" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "Scripts" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "Greffons" diff --git a/po/gl.po b/po/gl.po index a870d7fe..8fe65709 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori-0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 00:20+0200\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-07-20 13:42+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: GALPon MiniNo \n" @@ -19,8 +19,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador lixeiro" -#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 -#: ../midori/main.c:419 ../midori/main.c:433 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -28,1463 +28,1567 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:52 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Marcapáxina" -#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Marcapáxinas" -#: ../midori/main.c:54 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Engadir marcapáxinas" -#: ../midori/main.c:55 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Consola" -#: ../midori/main.c:56 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Extensións" -#: ../midori/main.c:57 +#: ../midori/main.c:91 msgid "_History" msgstr "_Histórico" -#: ../midori/main.c:58 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "P_áxina de inicio" -#: ../midori/main.c:59 -msgid "_Pageholder" -msgstr "C_adro de páxinas" - -#: ../midori/main.c:60 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/main.c:61 +#: ../midori/main.c:94 msgid "User_styles" msgstr "_Estilos de usuario" -#: ../midori/main.c:62 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Nova lingüe_ta" -#: ../midori/main.c:63 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/main.c:64 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/main.c:65 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Nova _ventá" -#: ../midori/main.c:67 -msgid "Select _All" -msgstr "Seleccion_ar todo" - -#: ../midori/main.c:70 -msgid "_Fullscreen" -msgstr "_Pantalla completa" - -#: ../midori/main.c:71 -msgid "_Leave Fullscreen" -msgstr "_Saír de pantalla completa" - -#: ../midori/main.c:122 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "Non se puido cargar a configuración. %s\n" -#: ../midori/main.c:177 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor «%s» non é válido para %s" -#: ../midori/main.c:184 ../midori/main.c:253 -#, c-format -msgid "Unhandled settings value '%s'" +#: ../midori/main.c:205 ../midori/main.c:275 +#, fuzzy, c-format +msgid "Invalid configuration value '%s'" msgstr "Non se poden axustar as propiedades «%s»" -#: ../midori/main.c:368 +#: ../midori/main.c:532 +msgid "File not found." +msgstr "Non se atopa o ficheiro." + +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Documento defectuoso" + +#: ../midori/main.c:571 ../midori/main.c:603 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#: ../midori/main.c:657 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +#: ../midori/main.c:681 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:714 ../midori/main.c:728 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:976 ../midori/sokoke.c:459 +#, c-format +msgid "Writing failed." +msgstr "Fallou a escritura." + +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Transferencias" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Non se puido gardar a sesión. %s" -#: ../midori/main.c:396 +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Amosar a versión do programa" -#: ../midori/main.c:413 -msgid "[URL]" +#: ../midori/main.c:1301 +#, fuzzy +msgid "URIs" +msgstr "URI" + +#: ../midori/main.c:1335 +#, fuzzy +msgid "[URIs]" msgstr "[URL]" -#: ../midori/main.c:417 -msgid "Unknown argument." -msgstr "Argumento descoñecido." - -#: ../midori/main.c:419 -msgid "Failed to setup interface." -msgstr "Fallou a configuración da interface." - -#: ../midori/main.c:434 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envíe comentarios, suxerencias e problemas a:" -#: ../midori/main.c:436 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Comprobar se existen novas versións en:" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:467 +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:501 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcapáxinas non puideron ser cargados. %s\n" -#: ../midori/main.c:515 -#, c-format -msgid "The session couldn't be loaded. %s\n" +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" msgstr "Non se puido cargar a sesión. %s\n" -#: ../midori/main.c:527 -#, c-format -msgid "The trash couldn't be loaded. %s\n" +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" msgstr "Non se puido cargar a «Cesta do lixo». %s\n" -#: ../midori/main.c:539 +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Non se puido cargar a «Cesta do lixo». %s\n" + +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Producíronse os seguinte erros:" -#: ../midori/main.c:688 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Non se puido gardar o motor de busca. %s" -#: ../midori/main.c:698 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Non se puideron gardar os marcapáxinas. %s" -#: ../midori/main.c:707 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Non se puido gardar a «cesta do lixo». %s" -#: ../midori/main.c:715 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Non se puido gardar a configuración. %s" -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 -msgid "Settings" -msgstr "Configuración" - -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 -msgid "The associated settings" -msgstr "Axustes asociados" - -#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 -msgid "Trash" -msgstr "Cesta do lixo" - -#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Lixo, recollido recentemente pechando lingüetas e ventás" - -#: ../midori/midori-app.c:141 -msgid "Browser" -msgstr "Navegador" - -#: ../midori/midori-app.c:142 -msgid "The current browser" -msgstr "Navegador actual" - -#: ../midori/midori-app.c:150 -msgid "Browser Count" -msgstr "Contador do navegador" - -#: ../midori/midori-app.c:151 -msgid "The current number of browsers" -msgstr "Número actual de navegadores" - -#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "Motores de busca" - -#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "Lista de motores de busca" - -#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Ningunha" - -#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 -msgid "Extensions" -msgstr "Extensións" - -#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 -msgid "Userscripts" -msgstr "Scripts de usuario" - -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 -msgid "Userstyles" -msgstr "Estilos de usuario" - -#: ../midori/midori-addons.c:113 -msgid "Web Widget" -msgstr "" - -#: ../midori/midori-addons.c:114 -msgid "The assigned web widget" -msgstr "" - -#: ../midori/midori-addons.c:122 -msgid "Kind" -msgstr "" - -#: ../midori/midori-addons.c:123 -msgid "The kind of addons" -msgstr "" - -#: ../midori/midori-browser.c:192 -msgid "Source" -msgstr "Código fonte" - -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Cargar novamente a páxina actual" -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:349 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:573 -msgid "New bookmark" -msgstr "Novo marcapáxinas" - -#: ../midori/midori-browser.c:573 -msgid "Edit bookmark" -msgstr "Editar o marcapáxinas" - -#: ../midori/midori-browser.c:597 -msgid "_Title:" -msgstr "_Título:" - -#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 -msgid "_Description:" -msgstr "_Descrición" - -#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:646 -msgid "_Folder:" -msgstr "_Cartafol:" - -#: ../midori/midori-browser.c:650 -msgid "Root" -msgstr "Raiz" - -#: ../midori/midori-browser.c:1082 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Acción non esperada «%s»" -#: ../midori/midori-browser.c:1228 -msgid "Menubar" -msgstr "Barra do menú" +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Novo marcapáxinas" -#: ../midori/midori-browser.c:1229 -msgid "The menubar" -msgstr "Barra de menu" +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Editar o marcapáxinas" -#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 -msgid "Navigationbar" -msgstr "Barra de navegación" +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Título:" -#: ../midori/midori-browser.c:1238 -msgid "The navigationbar" -msgstr "Barra de navegación" +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Descrición" -#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 -msgid "URI" -msgstr "URI" +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" -#: ../midori/midori-browser.c:1247 -msgid "The current URI" -msgstr "" +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Cartafol:" -#: ../midori/midori-browser.c:1255 -msgid "Tab" -msgstr "Lingüeta" +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Raiz" -#: ../midori/midori-browser.c:1256 -msgid "The current tab" -msgstr "Lingüeta actual" +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" +msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:1264 -msgid "Statusbar" -msgstr "Barra de estado" +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:1265 -msgid "The statusbar" -msgstr "Barra de estado" +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Abrir nunha nova _lingüeta " -#: ../midori/midori-browser.c:1301 -msgid "Statusbar Text" -msgstr "Texto da barra de estado" +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Abrir nunha nova _ventá" -#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 -msgid "The text that is displayed in the statusbar" -msgstr "O texto amosase na barra de estado" - -#: ../midori/midori-browser.c:1335 -msgid "The list of search engines to be used for web search" -msgstr "Lista de motores de busca que pode utilizar para buscas na web" - -#: ../midori/midori-browser.c:2313 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Separador" -#: ../midori/midori-browser.c:2478 +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:2486 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada\n" "Antonio Sanchez" -#: ../midori/midori-browser.c:2699 +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Abrir unha nova ventá" -#: ../midori/midori-browser.c:2705 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Abrir unha nova lingüeta" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:2711 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:2713 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "Pechar _lingüeta" -#: ../midori/midori-browser.c:2714 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Pechar a lingüeta actual" -#: ../midori/midori-browser.c:2716 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "_Pechar a ventá" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Pechar esta ventá" -#: ../midori/midori-browser.c:2719 -msgid "Pa_ge Setup" -msgstr "Configuración da páxina" - -#: ../midori/midori-browser.c:2723 -msgid "Show a preview of the printed page" -msgstr "Amosar previsualización da páxina á imprimir" - -#: ../midori/midori-browser.c:2726 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Sair da aplicación" -#: ../midori/midori-browser.c:2731 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:2734 -msgid "Undo the last modification" -msgstr "Desfacer a última modificación" - -#: ../midori/midori-browser.c:2737 -msgid "Redo the last modification" -msgstr "Refacer a última modificación" - -#: ../midori/midori-browser.c:2740 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:2749 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Pegar o texto seleccionado no porta papeis" -#: ../midori/midori-browser.c:2752 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Borrar o texto seleccionado" -#: ../midori/midori-browser.c:2755 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Seleccionar todo o texto" -#: ../midori/midori-browser.c:2758 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Buscar palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:2760 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:2761 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar a seguinte coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:2764 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar a anterior coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:2766 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "Busca _rapida" -#: ../midori/midori-browser.c:2767 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Salto rápido a unha palabra ou frase" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Configurar as preferencias da aplicación" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:2785 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:2788 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Diminuir o nivel de zoom" -#: ../midori/midori-browser.c:2791 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Reiniciar o nivel de zoom" -#: ../midori/midori-browser.c:2793 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Amosar _código fonte" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Ver o código fonte da páxina" -#: ../midori/midori-browser.c:2796 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Amosar código fonte da páxina seleccionada" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Ver o código fonte da selección" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:2805 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:2808 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Avanzar á seguinte páxina" -#: ../midori/midori-browser.c:2811 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Ir a súa páxina de inicio" -#: ../midori/midori-browser.c:2813 -msgid "_Web Search..." -msgstr "Buscar na _web..." - -#: ../midori/midori-browser.c:2814 -msgid "Run a web search" -msgstr "Proceder a busca na web" - -#: ../midori/midori-browser.c:2816 -msgid "Open in Page_holder..." -msgstr "Abrir no _cadro de páxinas" - -#: ../midori/midori-browser.c:2817 -msgid "Open the current page in the pageholder" -msgstr "Abrir a páxina actual no cadro de páxinas" - -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2821 -msgid "Reopen a previously closed tab or window" -msgstr "Voltar a abrir ventás ou lingüetas pechadas" - -#: ../midori/midori-browser.c:2823 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Baleirar a cesta do lixo" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Borrar o contido do lixo" -#: ../midori/midori-browser.c:2826 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Desfacer o peche de lingüeta" -#: ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Abrir a última lingüeta pechada" -#: ../midori/midori-browser.c:2832 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Engadir novo marcapáxinas" -#: ../midori/midori-browser.c:2834 -msgid "_Manage Bookmarks" -msgstr "_Xestionar marcapáxinas" - -#: ../midori/midori-browser.c:2835 -msgid "Add, edit and remove bookmarks..." -msgstr "Engadir, editar ou eliminar marcapáxinas..." - -#: ../midori/midori-browser.c:2838 -msgid "Open the selected bookmark" -msgstr "Abrir o marcapáxinas seleccionado" - -#: ../midori/midori-browser.c:2840 -msgid "Open in New _Tab" -msgstr "Abrir nunha nova _lingüeta " - -#: ../midori/midori-browser.c:2841 -msgid "Open the selected bookmark in a new tab" -msgstr "Abrir o marcapáxinas seleccionado nunha lingüeta nova" - -#: ../midori/midori-browser.c:2843 -msgid "Open in New _Window" -msgstr "Abrir nunha nova _ventá" - -#: ../midori/midori-browser.c:2844 -msgid "Open the selected bookmark in a new window" -msgstr "Abrir o marcapáxinas seleccionado nunha ventá nova" - -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Editar o marcapáxinas seleccionado" -#: ../midori/midori-browser.c:2850 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Borrar o marcapáxinas seleccionado" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:3185 +#, fuzzy +msgid "Delete the selected history item" +msgstr "Borrar o texto seleccionado" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "Copiar o texto seleccionado" + +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:2855 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Engadir, editar ou eliminar motores de busca..." -#: ../midori/midori-browser.c:2858 -msgid "_Window" -msgstr "_Ventá" - -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "Lingüeta _anterior" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Cambiar a lingüeta anterior" -#: ../midori/midori-browser.c:2863 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "Lingüeta _seguinte" -#: ../midori/midori-browser.c:2864 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Cambiar a lingüeta seguinte" -# comprobar -#: ../midori/midori-browser.c:2866 -msgid "Tab _Overview" -msgstr "_Descrición de lingüetas" - -#: ../midori/midori-browser.c:2867 -msgid "Show an overview of all open tabs" -msgstr "Amosar unha visión xeral de todas as lingüetas abertas" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Contido" -#: ../midori/midori-browser.c:2872 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Amosar a documentación" -#: ../midori/midori-browser.c:2875 +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Amosar información sobre o programa" -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:2882 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Non gardar datos privados durante a navegación" -#: ../midori/midori-browser.c:2885 -msgid "_Work Offline" -msgstr "Traballar desconectado" +#: ../midori/midori-browser.c:3231 +#, fuzzy +msgid "_Menubar" +msgstr "Barra do menú" -#: ../midori/midori-browser.c:2886 -msgid "Work without a network connection" -msgstr "Traballar sin conexión de rede" +#: ../midori/midori-browser.c:3232 +#, fuzzy +msgid "Show menubar" +msgstr "Barra de menu" -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:2891 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Amosar a barra de navegación" -#: ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:2895 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Amosar panel lateral" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "Barra de marcapáxinas" -#: ../midori/midori-browser.c:2899 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Amosar a barra de marcapáxinas" -#: ../midori/midori-browser.c:2902 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Amosar a barra de transferencias" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Amosar a barra de estado" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "Ubicación..." -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Abrir un enderezo determinado" -#: ../midori/midori-browser.c:3453 +#: ../midori/midori-browser.c:3695 +msgid "_Web Search..." +msgstr "Buscar na _web..." + +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "Proceder a busca na web" + +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Voltar a abrir ventás ou lingüetas pechadas" + +#: ../midori/midori-browser.c:3729 +#, fuzzy +msgid "_Recently visited pages" +msgstr "Recordar as últimas páxinas visitadas" + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Abrir o marcapáxinas seleccionado" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Ventá" + +#: ../midori/midori-browser.c:3761 +#, fuzzy +msgid "Show a list of all open tabs" +msgstr "Amosar unha visión xeral de todas as lingüetas abertas" + +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Marcapáxinas" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 -msgid "Transfers" -msgstr "Transferencias" - -#: ../midori/midori-browser.c:3469 -msgid "Console" -msgstr "Consola" - -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:3485 -msgid "Pageholder" -msgstr "Cadro de páxinas" - -#: ../midori/midori-browser.c:3534 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Busca en liña:" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Sensible a maiúsculas" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:4012 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Pechar barra de buscas" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Axuste non esperado «%s»" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Aspecto das sombras arredor de cada panel" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Menú" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Menu para conter os elementos dos paneis" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "Indice da páxina actual" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Perchar o panel" -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Páxina baleira" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Inicio" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Páxinas abertas recentemente" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chinés (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Xaponés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Nova lingüeta" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Nova ventá" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Lingüeta actual" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Todas as «cookies»" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "As «cookies» de esta sesión" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Ningunha" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Recordar último tamaño de ventá" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Gardar (ou non) o último tamaño de ventá" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Última largura da ventá" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Última largura da ventá gardada" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Última altura da ventá" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Última altura da ventá gardada" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Última posición do panel" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Uñtima posición gardada do panel" -#: ../midori/midori-websettings.c:278 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Última páxina do panel" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Última páxina gardada do panel" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Última busca na web" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Última busca na web gardada" -#: ../midori/midori-websettings.c:296 -msgid "Last pageholder URI" -msgstr "Última URI do cadro de páxinas" +#: ../midori/midori-websettings.c:302 +#, fuzzy +msgid "Show Menubar" +msgstr "Barra do menú" -#: ../midori/midori-websettings.c:297 -msgid "The URI last opened in the pageholder" -msgstr "Última URI aberta no cadro de páxinas" +#: ../midori/midori-websettings.c:303 +#, fuzzy +msgid "Whether to show the menubar" +msgstr "Amosar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Amosar a barra de navegación" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Amosar (ou non) a barra de navegación" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Amosar a barra de marcapáxinas" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Amosar (ou non) a barra de marcapáxinas" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Amosar o panel" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Amosar (ou non) o panel" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Amosar a barra de estado" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Amosar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Amosar nova lingüeta" +#: ../midori/midori-websettings.c:358 +#, fuzzy +msgid "Toolbar Items" +msgstr "Estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "Amosar o botón de «Nova lingüeta» na barra de ferramentas" +#: ../midori/midori-websettings.c:359 +#, fuzzy +msgid "The items to show on the toolbar" +msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "Amosar páxina de inicio" +#: ../midori/midori-websettings.c:367 +#, fuzzy +msgid "Compact Sidepanel" +msgstr "_Panel lateral" -#: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "Amosar o botón de «Páxina de Inicio» na barra de ferramentas" +#: ../midori/midori-websettings.c:368 +#, fuzzy +msgid "Whether to make the sidepanel compact" +msgstr "Amosar (ou non) o panel" -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Amosar o buscador web" - -#: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "Amosar a caixa se buscas na web na barra de ferramentas" - -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Amosar «Cesta do lixo»" - -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "Amosar o botón «Cesta do lixo» na barra de ferramentas" - -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Cargar ao inicio" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Que cargar no inicio" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Páxina de inicio" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Cartafol de descargas" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Xestor de descargas" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Xestor de descargas externo" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Facer unha busca a partir do contido da barra de enderezos" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Codificación prefereida" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Codificación de carácteres preferida" -#: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "Tamaño da etiqueta de lingüetas" +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "" -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "Tamaño desexado da etiqueta das lingüetas" +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lingüetas" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Cada unha das lingüetas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Abrir as páxinas novas en" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Donde se van a abrir as páxinas novas" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:473 +#, fuzzy +msgid "Open external pages in" +msgstr "Abrir as páxinas novas en" + +#: ../midori/midori-websettings.c:474 +#, fuzzy +msgid "Where to open externally opened pages" +msgstr "Donde se van a abrir as páxinas novas" + +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Clic no botón do medio abre a selección" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Cargar unha URL na selección empregando o botón de medio do rato" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Abrir lingüetas en segundo plano" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lingüetas en segundo plano" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Abrir «emerxentes» en lingüetas" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Abrir (ou non) as ventas emerxentes en lingüetas" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Aceptar as «cookies»" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Que tipos de «cookies» van ser aceptadas" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Só as «cookies» do sitio orixinal" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Só se aceptan as «cookies» do sitio orixe" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Persistencia máxima das «cookies»" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Tempo máximo, en dias, durante os que se gardaran as «cookies»" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Recordar as últimas páxinas visitadas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Recordar (ou non) as últimas páxinas que foron visitadas" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Persistencia máxima do histórico" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Tempo máximo, en dias, durante os que se gardará un dato do histórico" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Recordar as últimas sesións de formularios" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Recordar (ou non) as últimas sesións cos seus datos de formularios" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Recordar últimos ficheiros descargados" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "" "Recordar (ou non) a lista de descargas de ficheiros realizadas últimamente" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Servidor proxy para conexións HTTP" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Tamaño da caché" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Tamaño asignado á memoria caché" -#: ../midori/midori-webview.c:64 -msgid "Load Provisional" +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" msgstr "" -#: ../midori/midori-webview.c:65 -msgid "Load Committed" -msgstr "" - -#: ../midori/midori-webview.c:66 -msgid "Load Finished" -msgstr "" - -#: ../midori/midori-webview.c:224 -msgid "The URI of the currently loaded page" -msgstr "URI da páxina actualmente cargada" - -#: ../midori/midori-webview.c:234 -msgid "The title of the currently loaded page" -msgstr "Título da páxina actualmente cargada" - -#: ../midori/midori-webview.c:244 -msgid "The current loading progress" -msgstr "" - -#: ../midori/midori-webview.c:253 -msgid "The current loading status" -msgstr "" - -#: ../midori/midori-webview.c:695 +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Abrir a ligazón nunha nova _lingüeta" -#: ../midori/midori-webview.c:723 -msgid "Download Link with Download _Manager" -msgstr "Descargar a ligazón con un _xestor de descargas" +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" -#: ../midori/midori-webview.c:741 +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Abrir a URL nunha nova _lingüeta" -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "Configuración exemplo para fornecer propiedades" - -#: ../midori/midori-preferences.c:84 +#: ../midori/midori-view.c:1365 #, c-format -msgid "%s Preferences" +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1503 +msgid "Source" +msgstr "Código fonte" + +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Amosar a documentación" + +#: ../midori/midori-preferences.c:87 +#, fuzzy, c-format +msgid "Preferences for %s" msgstr "%s Preferencias" #. Page "General" -#: ../midori/midori-preferences.c:267 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Xeral" -#: ../midori/midori-preferences.c:268 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Inicio" #. Page "Appearance" -#: ../midori/midori-preferences.c:301 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Aparencia" -#: ../midori/midori-preferences.c:302 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Axustes de fontes" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Funcionalidades" +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#, fuzzy +msgid "Enable scripts" +msgstr "Scripts de usuario" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Barra de navegación" + +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Navegación" -#. Page "Network" -#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "Elemento actual" +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" +msgstr "" -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "Elemento seleccionado actualmente" +#: ../midori/midori-preferences.c:500 +#, fuzzy +msgid "Web Cookies" +msgstr "Aceptar as «cookies»" -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "Dialogo" +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +msgid "days" +msgstr "" -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "Caixa de dialogo para xestionar os motores de busca" - -#: ../midori/midori-searchentry.c:151 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Baleiro" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Engadir un motor de busca" -#: ../midori/midori-searchentry.c:523 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Editar o motor de busca" -#: ../midori/midori-searchentry.c:550 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchentry.c:594 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Icona (nome ou ficheiro):" -#: ../midori/midori-searchentry.c:608 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "«_Marca»" -#: ../midori/midori-searchentry.c:789 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Xestionar os motores de busca" -#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Non se puido executar o programa externo." -#: ../midori/sokoke.c:348 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Aviso: Estas conectado como super usuario!" -#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 -#, c-format -msgid "Writing failed." -msgstr "Fallou a escritura." - -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Atopouse un erro descoñecido:" -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s non ten a propiedade «%s»" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s non pode ser asignado a %s.%s" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s non se pode acceder" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Scripts de usuario" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Estilos de usuario" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" msgstr "" -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Tamaño simbólico a usar para animacións" +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#, fuzzy +msgid "_Disable" +msgstr "_Ficheiro" -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" -msgstr "" +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Consola" -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "O nome da icona contén cadros animados" +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensións" -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" -msgstr "" - -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "O «GdkPixbuf» conten cadros de animación" - -#: ../katze/katze-throbber.c:162 -msgid "Animated" -msgstr "" - -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "Animar (ou non) a icona" - -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Nome a usar para a icona non animada" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "O «GdkPixbuf» vai ser usada como imaxe estática" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "ID da icona para ser usada como imaxe estática" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propiedade «%s» non é válida para %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Escoller un ficheiro" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Escoller un cartafol" -#: ../katze/katze-item.c:72 -msgid "Name" -msgstr "Nome:" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Cadro de páxinas" -#: ../katze/katze-item.c:73 -msgid "The name of the item" +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "C_adro de páxinas" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" msgstr "" -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Scripts de usuario" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" msgstr "" -#: ../katze/katze-item.c:91 -msgid "The URI of the item" -msgstr "" +#~ msgid "Select _All" +#~ msgstr "Seleccion_ar todo" -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "Icona" +#~ msgid "_Fullscreen" +#~ msgstr "_Pantalla completa" -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "" +#~ msgid "_Leave Fullscreen" +#~ msgstr "_Saír de pantalla completa" -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "«Marca»" +#~ msgid "Unknown argument." +#~ msgstr "Argumento descoñecido." -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "«Marca» do elemento" +#~ msgid "Failed to setup interface." +#~ msgstr "Fallou a configuración da interface." -#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -#: ../katze/katze-xbel.c:789 -msgid "Malformed document." -msgstr "Documento defectuoso" +#~ msgid "Settings" +#~ msgstr "Configuración" -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "Non se atopa o ficheiro." +#~ msgid "The associated settings" +#~ msgstr "Axustes asociados" + +#~ msgid "Trash" +#~ msgstr "Cesta do lixo" + +#~ msgid "The trash, collecting recently closed tabs and windows" +#~ msgstr "Lixo, recollido recentemente pechando lingüetas e ventás" + +#~ msgid "Browser" +#~ msgstr "Navegador" + +#~ msgid "The current browser" +#~ msgstr "Navegador actual" + +#~ msgid "Browser Count" +#~ msgstr "Contador do navegador" + +#~ msgid "The current number of browsers" +#~ msgstr "Número actual de navegadores" + +#~ msgid "Search Engines" +#~ msgstr "Motores de busca" + +#~ msgid "The list of search engines" +#~ msgstr "Lista de motores de busca" + +#~ msgid "The navigationbar" +#~ msgstr "Barra de navegación" + +#~ msgid "Tab" +#~ msgstr "Lingüeta" + +#~ msgid "The current tab" +#~ msgstr "Lingüeta actual" + +#~ msgid "Statusbar" +#~ msgstr "Barra de estado" + +#~ msgid "The statusbar" +#~ msgstr "Barra de estado" + +#~ msgid "Statusbar Text" +#~ msgstr "Texto da barra de estado" + +#~ msgid "The text that is displayed in the statusbar" +#~ msgstr "O texto amosase na barra de estado" + +#~ msgid "The list of search engines to be used for web search" +#~ msgstr "Lista de motores de busca que pode utilizar para buscas na web" + +#~ msgid "Pa_ge Setup" +#~ msgstr "Configuración da páxina" + +#~ msgid "Show a preview of the printed page" +#~ msgstr "Amosar previsualización da páxina á imprimir" + +#~ msgid "Undo the last modification" +#~ msgstr "Desfacer a última modificación" + +#~ msgid "Redo the last modification" +#~ msgstr "Refacer a última modificación" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Abrir no _cadro de páxinas" + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Abrir a páxina actual no cadro de páxinas" + +#~ msgid "_Manage Bookmarks" +#~ msgstr "_Xestionar marcapáxinas" + +#~ msgid "Add, edit and remove bookmarks..." +#~ msgstr "Engadir, editar ou eliminar marcapáxinas..." + +#~ msgid "Open the selected bookmark in a new tab" +#~ msgstr "Abrir o marcapáxinas seleccionado nunha lingüeta nova" + +#~ msgid "Open the selected bookmark in a new window" +#~ msgstr "Abrir o marcapáxinas seleccionado nunha ventá nova" + +# comprobar +#~ msgid "Tab _Overview" +#~ msgstr "_Descrición de lingüetas" + +#~ msgid "_Work Offline" +#~ msgstr "Traballar desconectado" + +#~ msgid "Work without a network connection" +#~ msgstr "Traballar sin conexión de rede" + +#~ msgid "Appearance of the shadow around each panel" +#~ msgstr "Aspecto das sombras arredor de cada panel" + +#~ msgid "Menu" +#~ msgstr "Menú" + +#~ msgid "Menu to hold panel items" +#~ msgstr "Menu para conter os elementos dos paneis" + +#~ msgid "The index of the current page" +#~ msgstr "Indice da páxina actual" + +#~ msgid "Last pageholder URI" +#~ msgstr "Última URI do cadro de páxinas" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Última URI aberta no cadro de páxinas" + +#~ msgid "Show New Tab" +#~ msgstr "Amosar nova lingüeta" + +#~ msgid "Show the New Tab button in the toolbar" +#~ msgstr "Amosar o botón de «Nova lingüeta» na barra de ferramentas" + +#~ msgid "Show Homepage" +#~ msgstr "Amosar páxina de inicio" + +#~ msgid "Show the Homepage button in the toolbar" +#~ msgstr "Amosar o botón de «Páxina de Inicio» na barra de ferramentas" + +#~ msgid "Show Web search" +#~ msgstr "Amosar o buscador web" + +#~ msgid "Show the Web search entry in the toolbar" +#~ msgstr "Amosar a caixa se buscas na web na barra de ferramentas" + +#~ msgid "Show Trash" +#~ msgstr "Amosar «Cesta do lixo»" + +#~ msgid "Show the Trash button in the toolbar" +#~ msgstr "Amosar o botón «Cesta do lixo» na barra de ferramentas" + +#~ msgid "Tab Label Size" +#~ msgstr "Tamaño da etiqueta de lingüetas" + +#~ msgid "The desired tab label size" +#~ msgstr "Tamaño desexado da etiqueta das lingüetas" + +#~ msgid "The URI of the currently loaded page" +#~ msgstr "URI da páxina actualmente cargada" + +#~ msgid "The title of the currently loaded page" +#~ msgstr "Título da páxina actualmente cargada" + +#~ msgid "Download Link with Download _Manager" +#~ msgstr "Descargar a ligazón con un _xestor de descargas" + +#~ msgid "Settings instance to provide properties" +#~ msgstr "Configuración exemplo para fornecer propiedades" + +#~ msgid "Current Item" +#~ msgstr "Elemento actual" + +#~ msgid "The currently selected item" +#~ msgstr "Elemento seleccionado actualmente" + +#~ msgid "Dialog" +#~ msgstr "Dialogo" + +#~ msgid "A dialog to manage search engines" +#~ msgstr "Caixa de dialogo para xestionar os motores de busca" + +#~ msgid "Symbolic size to use for the animation" +#~ msgstr "Tamaño simbólico a usar para animacións" + +#~ msgid "The name of an icon containing animation frames" +#~ msgstr "O nome da icona contén cadros animados" + +#~ msgid "A GdkPixbuf containing animation frames" +#~ msgstr "O «GdkPixbuf» conten cadros de animación" + +#~ msgid "Whether the throbber should be animated" +#~ msgstr "Animar (ou non) a icona" + +#~ msgid "The name of an icon to be used as the static image" +#~ msgstr "Nome a usar para a icona non animada" + +#~ msgid "A GdkPixbuf to be used as the static image" +#~ msgstr "O «GdkPixbuf» vai ser usada como imaxe estática" + +#~ msgid "The stock ID of an icon to be used as the static image" +#~ msgstr "ID da icona para ser usada como imaxe estática" + +#~ msgid "Name" +#~ msgstr "Nome:" + +#~ msgid "Icon" +#~ msgstr "Icona" + +#~ msgid "Token" +#~ msgstr "«Marca»" + +#~ msgid "The token of the item" +#~ msgstr "«Marca» do elemento" diff --git a/po/hu.po b/po/hu.po index 6813e080..fd67e1f0 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 00:20+0200\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-05-10 19:33+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Pehelysúlyú webböngésző" -#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 -#: ../midori/main.c:419 ../midori/main.c:433 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -29,1459 +29,1466 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webböngésző" -#: ../midori/main.c:52 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "" -#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "Könyv_jelzők" -#: ../midori/main.c:54 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:55 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konzol" -#: ../midori/main.c:56 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "K_iterjesztések" -#: ../midori/main.c:57 +#: ../midori/main.c:91 msgid "_History" msgstr "_Történet" -#: ../midori/main.c:58 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "H_onlap" -#: ../midori/main.c:59 -msgid "_Pageholder" -msgstr "_Mappa:" - -#: ../midori/main.c:60 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "" -#: ../midori/main.c:61 +#: ../midori/main.c:94 msgid "User_styles" msgstr "" -#: ../midori/main.c:62 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Új _lap" -#: ../midori/main.c:63 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Letöltések" -#: ../midori/main.c:64 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Bezárt lapok és ablakok" -#: ../midori/main.c:65 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Új _ablak" -#: ../midori/main.c:67 -msgid "Select _All" -msgstr "Mindent ki_jelöl" - -#: ../midori/main.c:70 -msgid "_Fullscreen" -msgstr "_Teljes képernyő" - -#: ../midori/main.c:71 -msgid "_Leave Fullscreen" -msgstr "Teljes képernyő elhagyása" - -#: ../midori/main.c:122 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "A beállítást nem sikerült betölteni. %s\n" -#: ../midori/main.c:177 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' érték érvénytelen ehhez: %s" -#: ../midori/main.c:184 ../midori/main.c:253 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format -msgid "Unhandled settings value '%s'" +msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:368 +#: ../midori/main.c:532 +msgid "File not found." +msgstr "A fájl nem található." + +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Hibás dokumentum." + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format -msgid "The session couldn't be saved. %s" -msgstr "A folyamatot nem tudtam elmenteni. %s" - -#: ../midori/main.c:396 -msgid "Display program version" -msgstr "Program verzió kiírása" - -#: ../midori/main.c:413 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:417 -msgid "Unknown argument." +msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:419 -msgid "Failed to setup interface." -msgstr "" - -#: ../midori/main.c:434 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Véleményeket, javaslatokat és hibákat ide:" - -#: ../midori/main.c:436 -msgid "Check for new versions at:" -msgstr "Új verziók keresése itt:" - -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:467 +#: ../midori/main.c:657 #, c-format -msgid "An instance of Midori is already running but not responding.\n" +msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:501 +#: ../midori/main.c:681 #, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "A könyvjelzőket nem tudtam betölteni. %s\n" +msgid "Failed to clear history: %s\n" +msgstr "" -#: ../midori/main.c:515 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "A folyamatot nem tudtam betölteni. %s\n" +msgid "Failed to add history item: %s\n" +msgstr "" -#: ../midori/main.c:527 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 #, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "A kukát nem tudtam betölteni. %s\n" - -#: ../midori/main.c:539 -msgid "The following errors occured:" -msgstr "Az alábbi hibák történtek:" - -#: ../midori/main.c:688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "A keresőmotorokat nem tudtam elmenteni. %s" - -#: ../midori/main.c:698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "A könyvjelzőket nem tudtam elmenteni. %s" - -#: ../midori/main.c:707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "A kukát nem tudtam elmenteni. %s" - -#: ../midori/main.c:715 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "A beállítást nem tudtam elmenteni. %s" - -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 -msgid "Settings" -msgstr "Beállítások" - -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 -msgid "The associated settings" -msgstr "Társított beállítások" - -#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 -msgid "Trash" -msgstr "Kuka" - -#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "A legutóbb bezárt lapokat és ablakokat gyűjtő kuka." - -#: ../midori/midori-app.c:141 -msgid "Browser" -msgstr "Böngésző" - -#: ../midori/midori-app.c:142 -msgid "The current browser" -msgstr "" - -#: ../midori/midori-app.c:150 -msgid "Browser Count" -msgstr "" - -#: ../midori/midori-app.c:151 -msgid "The current number of browsers" -msgstr "" - -#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "" - -#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "" - -#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Semmi" - -#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 -msgid "Extensions" -msgstr "Kiterjesztések" - -#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 -msgid "Userscripts" -msgstr "" - -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 -msgid "Userstyles" -msgstr "" - -#: ../midori/midori-addons.c:113 -msgid "Web Widget" -msgstr "" - -#: ../midori/midori-addons.c:114 -msgid "The assigned web widget" -msgstr "" - -#: ../midori/midori-addons.c:122 -msgid "Kind" -msgstr "" - -#: ../midori/midori-addons.c:123 -msgid "The kind of addons" -msgstr "" - -#: ../midori/midori-browser.c:192 -msgid "Source" -msgstr "" - -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 -#: ../midori/midori-browser.c:2782 -msgid "Reload the current page" -msgstr "Oldal újratöltése" - -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 -msgid "Stop loading the current page" -msgstr "Betöltés leállítása" - -#: ../midori/midori-browser.c:349 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% betöltve" - -#: ../midori/midori-browser.c:573 -msgid "New bookmark" -msgstr "Új könyvjelző" - -#: ../midori/midori-browser.c:573 -msgid "Edit bookmark" -msgstr "Könyvjelző szerkesztése" - -#: ../midori/midori-browser.c:597 -msgid "_Title:" -msgstr "_Cím:" - -#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 -msgid "_Description:" -msgstr "_Leírás:" - -#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:646 -msgid "_Folder:" -msgstr "_Mappa:" - -#: ../midori/midori-browser.c:650 -msgid "Root" -msgstr "Gyökér" - -#: ../midori/midori-browser.c:1082 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Ismeretlen '%s' művelet" - -#: ../midori/midori-browser.c:1228 -msgid "Menubar" -msgstr "Menüsáv" - -#: ../midori/midori-browser.c:1229 -msgid "The menubar" -msgstr "A menüsáv" - -#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 -msgid "Navigationbar" -msgstr "Címsáv" - -#: ../midori/midori-browser.c:1238 -msgid "The navigationbar" -msgstr "A címsáv" - -#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 -msgid "URI" -msgstr "" - -#: ../midori/midori-browser.c:1247 -msgid "The current URI" -msgstr "" - -#: ../midori/midori-browser.c:1255 -msgid "Tab" -msgstr "Lap" - -#: ../midori/midori-browser.c:1256 -msgid "The current tab" -msgstr "Jelenlegi lap" - -#: ../midori/midori-browser.c:1264 -msgid "Statusbar" -msgstr "Állapotsáv" - -#: ../midori/midori-browser.c:1265 -msgid "The statusbar" -msgstr "Az állapotsáv" - -#: ../midori/midori-browser.c:1301 -msgid "Statusbar Text" -msgstr "Állapotsáv szöveg" - -#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 -msgid "The text that is displayed in the statusbar" -msgstr "Az állapotsávra írt szöveg" - -#: ../midori/midori-browser.c:1335 -msgid "The list of search engines to be used for web search" -msgstr "" - -#: ../midori/midori-browser.c:2313 -msgid "Separator" -msgstr "Elválasztó" - -#: ../midori/midori-browser.c:2478 -msgid "A lightweight web browser." -msgstr "Egy pehelysúlyú webböngésző" - -#: ../midori/midori-browser.c:2486 -msgid "translator-credits" -msgstr "SZERVÁC Attila " - -#: ../midori/midori-browser.c:2699 -msgid "_File" -msgstr "_Fájl" - -#: ../midori/midori-browser.c:2702 -msgid "Open a new window" -msgstr "Új ablak megnyitása" - -#: ../midori/midori-browser.c:2705 -msgid "Open a new tab" -msgstr "Új lap megnyitása" - -#: ../midori/midori-browser.c:2708 -msgid "Open a file" -msgstr "Fájl megnyitása" - -#: ../midori/midori-browser.c:2711 -msgid "Save to a file" -msgstr "Mentés fájlba" - -#: ../midori/midori-browser.c:2713 -msgid "_Close Tab" -msgstr "_Lap bezárása" - -#: ../midori/midori-browser.c:2714 -msgid "Close the current tab" -msgstr "A jelenlegi lap bezárása" - -#: ../midori/midori-browser.c:2716 -msgid "C_lose Window" -msgstr "_Ablak bezárása" - -#: ../midori/midori-browser.c:2717 -msgid "Close this window" -msgstr "A jelenlegi ablak bezárása" - -#: ../midori/midori-browser.c:2719 -msgid "Pa_ge Setup" -msgstr "_Oldal beállítása" - -#: ../midori/midori-browser.c:2723 -msgid "Show a preview of the printed page" -msgstr "" - -#: ../midori/midori-browser.c:2726 -msgid "Print the current page" -msgstr "" - -#: ../midori/midori-browser.c:2729 -msgid "Quit the application" -msgstr "Kilépés a programból" - -#: ../midori/midori-browser.c:2731 -msgid "_Edit" -msgstr "Sz_erkesztés" - -#: ../midori/midori-browser.c:2734 -msgid "Undo the last modification" -msgstr "Utolsó módosítás visszavonása" - -#: ../midori/midori-browser.c:2737 -msgid "Redo the last modification" -msgstr "Utolsó módosítás ismétlése" - -#: ../midori/midori-browser.c:2740 -msgid "Cut the selected text" -msgstr "" - -#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 -msgid "Copy the selected text" -msgstr "A kijelölt szöveg másolása" - -#: ../midori/midori-browser.c:2749 -msgid "Paste text from the clipboard" -msgstr "Szöveg beillesztése a vágólapról" - -#: ../midori/midori-browser.c:2752 -msgid "Delete the selected text" -msgstr "A kijelölt szöveg törlése" - -#: ../midori/midori-browser.c:2755 -msgid "Select all text" -msgstr "Minden szöveg kijelölése" - -#: ../midori/midori-browser.c:2758 -msgid "Find a word or phrase in the page" -msgstr "" - -#: ../midori/midori-browser.c:2760 -msgid "Find _Next" -msgstr "_Következő" - -#: ../midori/midori-browser.c:2761 -msgid "Find the next occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2763 -msgid "Find _Previous" -msgstr "_Előző" - -#: ../midori/midori-browser.c:2764 -msgid "Find the previous occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2766 -msgid "_Quick Find" -msgstr "_Gyors keresés" - -#: ../midori/midori-browser.c:2767 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2770 -msgid "Configure the application preferences" -msgstr "" - -#: ../midori/midori-browser.c:2772 -msgid "_View" -msgstr "_Nézet" - -#: ../midori/midori-browser.c:2773 -msgid "_Toolbars" -msgstr "Eszköz_sávok" - -#: ../midori/midori-browser.c:2785 -msgid "Increase the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2788 -msgid "Decrease the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2791 -msgid "Reset the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2793 -msgid "View _Source" -msgstr "" - -#: ../midori/midori-browser.c:2794 -msgid "View the source code of the page" -msgstr "" - -#: ../midori/midori-browser.c:2796 -msgid "View Selection Source" -msgstr "Kijelölés forrásnak megtekintése" - -#: ../midori/midori-browser.c:2797 -msgid "View the source code of the selection" -msgstr "" - -#: ../midori/midori-browser.c:2800 -msgid "Toggle fullscreen view" -msgstr "Teljes képernyős váltás" - -#: ../midori/midori-browser.c:2802 -msgid "_Go" -msgstr "_Ugrás" - -#: ../midori/midori-browser.c:2805 -msgid "Go back to the previous page" -msgstr "" - -#: ../midori/midori-browser.c:2808 -msgid "Go forward to the next page" -msgstr "" - -#: ../midori/midori-browser.c:2811 -msgid "Go to your homepage" -msgstr "" - -#: ../midori/midori-browser.c:2813 -msgid "_Web Search..." -msgstr "_Web-keresés..." - -#: ../midori/midori-browser.c:2814 -msgid "Run a web search" -msgstr "" - -#: ../midori/midori-browser.c:2816 -msgid "Open in Page_holder..." -msgstr "" - -#: ../midori/midori-browser.c:2817 -msgid "Open the current page in the pageholder" -msgstr "" - -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2821 -msgid "Reopen a previously closed tab or window" -msgstr "Egy korábban bezárt lap vagy ablak megnyitása" - -#: ../midori/midori-browser.c:2823 -msgid "Empty Trash" -msgstr "Üres kuka" - -#: ../midori/midori-browser.c:2824 -msgid "Delete the contents of the trash" -msgstr "" - -#: ../midori/midori-browser.c:2826 -msgid "Undo Close Tab" -msgstr "Lap bezárásának visszavonása" - -#: ../midori/midori-browser.c:2827 -msgid "Open the last closed tab" -msgstr "" - -#: ../midori/midori-browser.c:2832 -msgid "Add a new bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2834 -msgid "_Manage Bookmarks" -msgstr "Könyvjelzők _kezelése" - -#: ../midori/midori-browser.c:2835 -msgid "Add, edit and remove bookmarks..." -msgstr "" - -#: ../midori/midori-browser.c:2838 -msgid "Open the selected bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2840 -msgid "Open in New _Tab" -msgstr "Megnyitás új _lapon" - -#: ../midori/midori-browser.c:2841 -msgid "Open the selected bookmark in a new tab" -msgstr "" - -#: ../midori/midori-browser.c:2843 -msgid "Open in New _Window" -msgstr "Megnyitás új _ablakban" - -#: ../midori/midori-browser.c:2844 -msgid "Open the selected bookmark in a new window" -msgstr "" - -#: ../midori/midori-browser.c:2847 -msgid "Edit the selected bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2850 -msgid "Delete the selected bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2852 -msgid "_Tools" -msgstr "Esz_közök" - -#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 -msgid "_Manage Search Engines" -msgstr "Kereső-motorok kezelése" - -#: ../midori/midori-browser.c:2855 -msgid "Add, edit and remove search engines..." -msgstr "Kereső-motorok hozzáadása, szerkesztése és eltávolítása..." - -#: ../midori/midori-browser.c:2858 -msgid "_Window" -msgstr "_Ablak" - -#: ../midori/midori-browser.c:2860 -msgid "_Previous Tab" -msgstr "_Előző lap" - -#: ../midori/midori-browser.c:2861 -msgid "Switch to the previous tab" -msgstr "" - -#: ../midori/midori-browser.c:2863 -msgid "_Next Tab" -msgstr "_Következő lap" - -#: ../midori/midori-browser.c:2864 -msgid "Switch to the next tab" -msgstr "" - -#: ../midori/midori-browser.c:2866 -msgid "Tab _Overview" -msgstr "Lapok át_tekintése" - -#: ../midori/midori-browser.c:2867 -msgid "Show an overview of all open tabs" -msgstr "" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2869 -msgid "_Help" -msgstr "_Súgó" - -#: ../midori/midori-browser.c:2871 -msgid "_Contents" -msgstr "_Tartalom" - -#: ../midori/midori-browser.c:2872 -msgid "Show the documentation" -msgstr "" - -#: ../midori/midori-browser.c:2875 -msgid "Show information about the program" -msgstr "" - -#: ../midori/midori-browser.c:2881 -msgid "P_rivate Browsing" -msgstr "_Személyes böngészés" - -#: ../midori/midori-browser.c:2882 -msgid "Don't save any private data while browsing" -msgstr "" - -#: ../midori/midori-browser.c:2885 -msgid "_Work Offline" -msgstr "_Kapcsolat nélküli munka" - -#: ../midori/midori-browser.c:2886 -msgid "Work without a network connection" -msgstr "" - -#: ../midori/midori-browser.c:2890 -msgid "_Navigationbar" -msgstr "_Címsáv" - -#: ../midori/midori-browser.c:2891 -msgid "Show navigationbar" -msgstr "" - -#: ../midori/midori-browser.c:2894 -msgid "Side_panel" -msgstr "Oldal_panel" - -#: ../midori/midori-browser.c:2895 -msgid "Show sidepanel" -msgstr "" - -#: ../midori/midori-browser.c:2898 -msgid "_Bookmarkbar" -msgstr "_Könyvjelzősáv" - -#: ../midori/midori-browser.c:2899 -msgid "Show bookmarkbar" -msgstr "" - -#: ../midori/midori-browser.c:2902 -msgid "_Transferbar" -msgstr "_Letöltési sáv" - -#: ../midori/midori-browser.c:2903 -msgid "Show transferbar" -msgstr "" - -#: ../midori/midori-browser.c:2906 -msgid "_Statusbar" -msgstr "_Állapotsáv" - -#: ../midori/midori-browser.c:2907 -msgid "Show statusbar" -msgstr "" - -#: ../midori/midori-browser.c:3228 -msgid "_Location..." -msgstr "_Hely..." - -#: ../midori/midori-browser.c:3230 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:3453 -msgid "Bookmarks" -msgstr "Könyvjelzők" - -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 -msgid "Transfers" -msgstr "Letöltések" - -#: ../midori/midori-browser.c:3469 -msgid "Console" -msgstr "Konzol" - -#: ../midori/midori-browser.c:3476 -msgid "History" -msgstr "Történet" - -#: ../midori/midori-browser.c:3485 -msgid "Pageholder" -msgstr "" - -#: ../midori/midori-browser.c:3534 -msgid "_Inline find:" +msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/midori-browser.c:3569 -msgid "Match Case" -msgstr "Nagybetű-érzékeny" - -#: ../midori/midori-browser.c:3586 -msgid "Close Findbar" -msgstr "Keresősáv bezárása" - -#: ../midori/midori-browser.c:3817 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Ismeretlen '%s' beállítás" - -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Panelek körüli árnyékok megjelenése" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Menü" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Panel-elemek menüje" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 -msgid "Close panel" -msgstr "Panel bezárása" - -#: ../midori/midori-websettings.c:130 -msgid "Blank page" -msgstr "Üres lap" - -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 -msgid "Homepage" -msgstr "Honlap" - -#: ../midori/midori-websettings.c:132 -msgid "Last open pages" -msgstr "Legutóbb megnyitott lapok" - -#: ../midori/midori-websettings.c:147 -msgid "Chinese (BIG5)" -msgstr "Kínai (BIG5)" - -#: ../midori/midori-websettings.c:148 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japán (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:149 -msgid "Russian (KOI8-R)" -msgstr "Orosz (KOI8-r)" - -#: ../midori/midori-websettings.c:150 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:151 -msgid "Western (ISO-8859-1)" -msgstr "Nyugati (ISO-8859-1)" - -#: ../midori/midori-websettings.c:152 -msgid "Custom..." -msgstr "Egyéni..." - -#: ../midori/midori-websettings.c:167 -msgid "New tab" -msgstr "Új lap" - -#: ../midori/midori-websettings.c:168 -msgid "New window" -msgstr "Új ablak" - -#: ../midori/midori-websettings.c:169 -msgid "Current tab" -msgstr "Jelenlegi lap" - -#: ../midori/midori-websettings.c:184 -msgid "Default" -msgstr "Alap" - -#: ../midori/midori-websettings.c:185 -msgid "Icons" -msgstr "Ikonok" - -#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 -msgid "Text" -msgstr "Szöveg" - -#: ../midori/midori-websettings.c:187 -msgid "Both" -msgstr "Mindkettő" - -#: ../midori/midori-websettings.c:188 -msgid "Both horizontal" -msgstr "Mindkettő vízszintesen" - -#: ../midori/midori-websettings.c:203 -msgid "All cookies" -msgstr "Minden süti" - -#: ../midori/midori-websettings.c:204 -msgid "Session cookies" -msgstr "Munkafolyamat sütik" - -#: ../midori/midori-websettings.c:242 -msgid "Remember last window size" -msgstr "Legutóbbi ablak méretének megjegyzése" - -#: ../midori/midori-websettings.c:243 -msgid "Whether to save the last window size" -msgstr "Mentésre kerüljön-e a legutóbbi ablak mérete" - -#: ../midori/midori-websettings.c:251 -msgid "Last window width" -msgstr "Legutóbbi ablak szélessége" - -#: ../midori/midori-websettings.c:252 -msgid "The last saved window width" -msgstr "A legutóbb elmentett ablak-szélesség" - -#: ../midori/midori-websettings.c:260 -msgid "Last window height" -msgstr "Legutóbbi ablak magassága" - -#: ../midori/midori-websettings.c:261 -msgid "The last saved window height" -msgstr "A legutóbb mentett ablak-magasság" - -#: ../midori/midori-websettings.c:269 -msgid "Last panel position" -msgstr "A panel helyzete" - -#: ../midori/midori-websettings.c:270 -msgid "The last saved panel position" -msgstr "A legutóbb mentett panel-helyzet" - -#: ../midori/midori-websettings.c:278 -msgid "Last panel page" -msgstr "Legutóbbi panel-lap" - -#: ../midori/midori-websettings.c:279 -msgid "The last saved panel page" -msgstr "A legutóbb mentett panel-lap" - -#: ../midori/midori-websettings.c:287 -msgid "Last Web search" -msgstr "Legutóbbi web-keresés" - -#: ../midori/midori-websettings.c:288 -msgid "The last saved Web search" -msgstr "A legutóbb mentett web-keresés" - -#: ../midori/midori-websettings.c:296 -msgid "Last pageholder URI" -msgstr "" - -#: ../midori/midori-websettings.c:297 -msgid "The URI last opened in the pageholder" -msgstr "" - -#: ../midori/midori-websettings.c:307 -msgid "Show Navigationbar" -msgstr "Címsáv mutatása" - -#: ../midori/midori-websettings.c:308 -msgid "Whether to show the navigationbar" -msgstr "Megjelenjen-e a címsáv" - -#: ../midori/midori-websettings.c:316 -msgid "Show Bookmarkbar" -msgstr "Könyvjelzősáv mutatása" - -#: ../midori/midori-websettings.c:317 -msgid "Whether to show the bookmarkbar" -msgstr "Megjelenjen-e a könyvjelzősáv" - -#: ../midori/midori-websettings.c:325 -msgid "Show Panel" -msgstr "Panel mutatása" - -#: ../midori/midori-websettings.c:326 -msgid "Whether to show the panel" -msgstr "Megjelenjen-e a panel" - -#: ../midori/midori-websettings.c:334 -msgid "Show Statusbar" -msgstr "Állapotsáv mutatása" - -#: ../midori/midori-websettings.c:335 -msgid "Whether to show the statusbar" -msgstr "Megjelenjen-e az állapotsáv" - -#: ../midori/midori-websettings.c:344 -msgid "Toolbar Style" -msgstr "Eszközsáv stílus" - -#: ../midori/midori-websettings.c:345 -msgid "The style of the toolbar" -msgstr "Az eszközsáv stílusa" - -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Új lap mutatása" - -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "Új lap gomb mutatása az eszközsávon" - -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "" - -#: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Web-keresés mutatása" - -#: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "A Web-kereső mező mutatása az eszközsávon" - -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Kuka mutatása" - -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "A kuka gomb mutatása az eszközsávon" - -#: ../midori/midori-websettings.c:392 -msgid "Load on Startup" -msgstr "Betöltés induláskor" - -#: ../midori/midori-websettings.c:393 -msgid "What to load on startup" -msgstr "Az induláskor betöltendő" - -#: ../midori/midori-websettings.c:403 -msgid "The homepage" -msgstr "A honlap" - -#: ../midori/midori-websettings.c:411 -msgid "Download Folder" -msgstr "Letöltő mappa" - -#: ../midori/midori-websettings.c:412 -msgid "The folder downloaded files are saved to" -msgstr "A fájlok alapértelmezett letöltési mappája" - -#: ../midori/midori-websettings.c:420 -msgid "Download Manager" -msgstr "" - -#: ../midori/midori-websettings.c:421 -msgid "An external download manager" -msgstr "" - -#: ../midori/midori-websettings.c:429 -msgid "Location entry Search" -msgstr "A hely-beviteli Kereső" - -#: ../midori/midori-websettings.c:430 -msgid "The search to perform inside the location entry" -msgstr "A keresés a hely-beviteli mezőben" - -#: ../midori/midori-websettings.c:438 -msgid "Preferred Encoding" -msgstr "Alapértelmezett kódolás" - -#: ../midori/midori-websettings.c:439 -msgid "The preferred character encoding" -msgstr "Az alapértelmezett karakter-kódolás" - -#: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "A címke mérete" - -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "A lapok címkéinek kívánt mérete" - -#: ../midori/midori-websettings.c:459 -msgid "Close Buttons on Tabs" -msgstr "Bezáró gombok a lapokon" - -#: ../midori/midori-websettings.c:460 -msgid "Whether tabs have close buttons" -msgstr "Legyenek-e bezáró gombok a lapokon" - -#: ../midori/midori-websettings.c:468 -msgid "Open new pages in" -msgstr "Új lapok megnyitása itt:" - -#: ../midori/midori-websettings.c:469 -msgid "Where to open new pages" -msgstr "Hol nyíljanak az új lapok" - -#: ../midori/midori-websettings.c:478 -msgid "Middle click opens Selection" -msgstr "Középső gombra megnyitás" - -#: ../midori/midori-websettings.c:479 -msgid "Load an URL from the selection via middle click" -msgstr "URL betöltése a kijelölésből középső gombbal" - -#: ../midori/midori-websettings.c:487 -msgid "Open tabs in the background" -msgstr "Lapok megnyitása a háttérben" - -#: ../midori/midori-websettings.c:488 -msgid "Whether to open new tabs in the background" -msgstr "Az új lapok a háttérben nyíljanak-e" - -#: ../midori/midori-websettings.c:496 -msgid "Open Tabs next to Current" -msgstr "" - -#: ../midori/midori-websettings.c:497 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" - -#: ../midori/midori-websettings.c:505 -msgid "Open popups in tabs" -msgstr "Felugrók megnyitása lapokon" - -#: ../midori/midori-websettings.c:506 -msgid "Whether to open popup windows in tabs" -msgstr "Megnyíljanak-e a felugró ablakok lapokon" - -#: ../midori/midori-websettings.c:516 -msgid "Accept cookies" -msgstr "Sütik fogadása" - -#: ../midori/midori-websettings.c:517 -msgid "What type of cookies to accept" -msgstr "Milyen sütiket fogadjunk el" - -#: ../midori/midori-websettings.c:526 -msgid "Original cookies only" -msgstr "Csak eredeti sütiket" - -#: ../midori/midori-websettings.c:527 -msgid "Accept cookies from the original website only" -msgstr "Csak az eredeti lapról való sütiket fogadjuk el" - -#: ../midori/midori-websettings.c:535 -msgid "Maximum cookie age" -msgstr "Sütik maximális kora" - -#: ../midori/midori-websettings.c:536 -msgid "The maximum number of days to save cookies for" -msgstr "A napok száma, melyre a sütiket legfeljebb elmentsük" - -#: ../midori/midori-websettings.c:546 -msgid "Remember last visited pages" -msgstr "Legutóbbi lapok megjegyzése" - -#: ../midori/midori-websettings.c:547 -msgid "Whether the last visited pages are saved" -msgstr "Mentsük-e a legutóbb meglátogatott lapokat" - -#: ../midori/midori-websettings.c:555 -msgid "Maximum history age" -msgstr "Történet maximális kora" - -#: ../midori/midori-websettings.c:556 -msgid "The maximum number of days to save the history for" -msgstr "A legtöbb nap, melyre a történetet elmentsük" - -#: ../midori/midori-websettings.c:564 -msgid "Remember last form inputs" -msgstr "Űrlapok megjegyzése" - -#: ../midori/midori-websettings.c:565 -msgid "Whether the last form inputs are saved" -msgstr "Mentsük-e az űrlapokba bevitt adatokat" - -#: ../midori/midori-websettings.c:573 -msgid "Remember last downloaded files" -msgstr "Legutóbbi letöltések megjegyzése" - -#: ../midori/midori-websettings.c:574 -msgid "Whether the last downloaded files are saved" -msgstr "Jegyezzük-e a legutóbbi letöltéseket" - -#: ../midori/midori-websettings.c:584 -msgid "HTTP Proxy" -msgstr "HTTP Proxy" - -#: ../midori/midori-websettings.c:585 -msgid "The proxy used for HTTP connections" -msgstr "A HTTP-kapcsolatok proxy kiszolgálója" - -#: ../midori/midori-websettings.c:593 -msgid "Cache size" -msgstr "Gyorstár mérete" - -#: ../midori/midori-websettings.c:594 -msgid "The allowed size of the cache" -msgstr "Az engedélyezett gyorstár-méret" - -#: ../midori/midori-webview.c:64 -msgid "Load Provisional" -msgstr "" - -#: ../midori/midori-webview.c:65 -msgid "Load Committed" -msgstr "" - -#: ../midori/midori-webview.c:66 -msgid "Load Finished" -msgstr "" - -#: ../midori/midori-webview.c:224 -msgid "The URI of the currently loaded page" -msgstr "A jelenlegi lap URI-ja" - -#: ../midori/midori-webview.c:234 -msgid "The title of the currently loaded page" -msgstr "A jelenlegi lap címe" - -#: ../midori/midori-webview.c:244 -msgid "The current loading progress" -msgstr "" - -#: ../midori/midori-webview.c:253 -msgid "The current loading status" -msgstr "" - -#: ../midori/midori-webview.c:695 -msgid "Open Link in New _Tab" -msgstr "Hivatkozás megnyitása új _lapon" - -#: ../midori/midori-webview.c:723 -msgid "Download Link with Download _Manager" -msgstr "" - -#: ../midori/midori-webview.c:741 -msgid "Open URL in New _Tab" -msgstr "URL megnyitása új _lapon" - -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "" - -#: ../midori/midori-preferences.c:84 -#, c-format -msgid "%s Preferences" -msgstr "%s beállításai" - -#. Page "General" -#: ../midori/midori-preferences.c:267 -msgid "General" -msgstr "Általános" - -#: ../midori/midori-preferences.c:268 -msgid "Startup" -msgstr "Indulás" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:301 -msgid "Appearance" -msgstr "Megjelenés" - -#: ../midori/midori-preferences.c:302 -msgid "Font settings" -msgstr "Betű beállítások" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:322 -msgid "Behavior" -msgstr "Viselkedés" - -#: ../midori/midori-preferences.c:323 -msgid "Features" -msgstr "Képességek" - -#. Page "Interface" -#: ../midori/midori-preferences.c:373 -msgid "Interface" -msgstr "Felület" - -#: ../midori/midori-preferences.c:387 -msgid "Browsing" -msgstr "Böngészés" - -#. Page "Network" -#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 -msgid "Network" -msgstr "Hálózat" - -#: ../midori/midori-preferences.c:417 -msgid "MB" -msgstr "MB" - -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "" - -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "" - -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "" - -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "" - -#: ../midori/midori-searchentry.c:151 -msgid "Empty" -msgstr "Üres" - -#: ../midori/midori-searchentry.c:523 -msgid "Add search engine" -msgstr "Kereső-motor hozzáadása" - -#: ../midori/midori-searchentry.c:523 -msgid "Edit search engine" -msgstr "Kereső-motor szerkesztése" - -#: ../midori/midori-searchentry.c:550 -msgid "_Name:" -msgstr "_Név:" - -#: ../midori/midori-searchentry.c:594 -msgid "_Icon (name or file):" -msgstr "_Ikon (Név vagy fájl):" - -#: ../midori/midori-searchentry.c:608 -msgid "_Token:" -msgstr "" - -#: ../midori/midori-searchentry.c:789 -msgid "Manage search engines" -msgstr "Kereső-motorok kezelése" - -#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 -msgid "Could not run external program." -msgstr "" - -#: ../midori/sokoke.c:348 -msgid "Warning: You are using a superuser account!" -msgstr "VESZÉLY! Rendszergazda hozzáférést használsz!" - -#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Az írás meghiúsult." -#: ../midori/gjs.c:512 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Letöltések" + +#: ../midori/main.c:1040 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "A folyamatot nem tudtam elmenteni. %s" + +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1299 +msgid "Display program version" +msgstr "Program verzió kiírása" + +#: ../midori/main.c:1301 +msgid "URIs" +msgstr "" + +#: ../midori/main.c:1335 +#, fuzzy +msgid "[URIs]" +msgstr "[URL]" + +#: ../midori/main.c:1371 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Véleményeket, javaslatokat és hibákat ide:" + +#: ../midori/main.c:1373 +msgid "Check for new versions at:" +msgstr "Új verziók keresése itt:" + +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1411 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "A könyvjelzőket nem tudtam betölteni. %s\n" + +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "A folyamatot nem tudtam betölteni. %s\n" + +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "A kukát nem tudtam betölteni. %s\n" + +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "A kukát nem tudtam betölteni. %s\n" + +#: ../midori/main.c:1504 +msgid "The following errors occured:" +msgstr "Az alábbi hibák történtek:" + +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "A keresőmotorokat nem tudtam elmenteni. %s" + +#: ../midori/main.c:1698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "A könyvjelzőket nem tudtam elmenteni. %s" + +#: ../midori/main.c:1707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "A kukát nem tudtam elmenteni. %s" + +#: ../midori/main.c:1715 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A beállítást nem tudtam elmenteni. %s" + +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 +msgid "Reload the current page" +msgstr "Oldal újratöltése" + +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +msgid "Stop loading the current page" +msgstr "Betöltés leállítása" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% betöltve" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ismeretlen '%s' művelet" + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Új könyvjelző" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Könyvjelző szerkesztése" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Cím:" + +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Leírás:" + +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Mappa:" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Gyökér" + +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" +msgstr "Mentés fájlba" + +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "Fájl megnyitása" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Megnyitás új _lapon" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Megnyitás új _ablakban" + +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Elválasztó" + +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "Egy pehelysúlyú webböngésző" + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "SZERVÁC Attila " + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Fájl" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "Új ablak megnyitása" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Új lap megnyitása" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "Fájl megnyitása" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Mentés fájlba" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "_Lap bezárása" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "A jelenlegi lap bezárása" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "_Ablak bezárása" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "A jelenlegi ablak bezárása" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Kilépés a programból" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "Sz_erkesztés" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "" + +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "A kijelölt szöveg másolása" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Szöveg beillesztése a vágólapról" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "A kijelölt szöveg törlése" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Minden szöveg kijelölése" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "_Következő" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "_Előző" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "_Gyors keresés" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Nézet" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "Eszköz_sávok" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +msgid "View _Source" +msgstr "" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Kijelölés forrásnak megtekintése" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Teljes képernyős váltás" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "_Ugrás" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Üres kuka" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Lap bezárásának visszavonása" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3179 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3182 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3185 +#, fuzzy +msgid "Delete the selected history item" +msgstr "A kijelölt szöveg törlése" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "A kijelölt szöveg másolása" + +#: ../midori/midori-browser.c:3193 +msgid "_Tools" +msgstr "Esz_közök" + +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +msgid "_Manage Search Engines" +msgstr "Kereső-motorok kezelése" + +#: ../midori/midori-browser.c:3196 +msgid "Add, edit and remove search engines..." +msgstr "Kereső-motorok hozzáadása, szerkesztése és eltávolítása..." + +#: ../midori/midori-browser.c:3200 +msgid "_Previous Tab" +msgstr "_Előző lap" + +#: ../midori/midori-browser.c:3201 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:3203 +msgid "_Next Tab" +msgstr "_Következő lap" + +#: ../midori/midori-browser.c:3204 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:3206 +msgid "_Help" +msgstr "_Súgó" + +#: ../midori/midori-browser.c:3208 +msgid "_Contents" +msgstr "_Tartalom" + +#: ../midori/midori-browser.c:3209 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3218 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:3225 +msgid "P_rivate Browsing" +msgstr "_Személyes böngészés" + +#: ../midori/midori-browser.c:3226 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:3231 +#, fuzzy +msgid "_Menubar" +msgstr "Menüsáv" + +#: ../midori/midori-browser.c:3232 +#, fuzzy +msgid "Show menubar" +msgstr "A menüsáv" + +#: ../midori/midori-browser.c:3235 +msgid "_Navigationbar" +msgstr "_Címsáv" + +#: ../midori/midori-browser.c:3236 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:3239 +msgid "Side_panel" +msgstr "Oldal_panel" + +#: ../midori/midori-browser.c:3240 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:3243 +msgid "_Bookmarkbar" +msgstr "_Könyvjelzősáv" + +#: ../midori/midori-browser.c:3244 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:3247 +msgid "_Transferbar" +msgstr "_Letöltési sáv" + +#: ../midori/midori-browser.c:3248 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:3251 +msgid "_Statusbar" +msgstr "_Állapotsáv" + +#: ../midori/midori-browser.c:3252 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:3669 +msgid "_Location..." +msgstr "_Hely..." + +#: ../midori/midori-browser.c:3671 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3695 +msgid "_Web Search..." +msgstr "_Web-keresés..." + +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Egy korábban bezárt lap vagy ablak megnyitása" + +#: ../midori/midori-browser.c:3729 +#, fuzzy +msgid "_Recently visited pages" +msgstr "Legutóbbi lapok megjegyzése" + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Könyvjelzősáv mutatása" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Ablak" + +#: ../midori/midori-browser.c:3761 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:3883 +msgid "Bookmarks" +msgstr "Könyvjelzők" + +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +msgid "History" +msgstr "Történet" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 +msgid "_Inline find:" +msgstr "" + +#: ../midori/midori-browser.c:4004 +msgid "Match Case" +msgstr "Nagybetű-érzékeny" + +#: ../midori/midori-browser.c:4012 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:4021 +msgid "Close Findbar" +msgstr "Keresősáv bezárása" + +#: ../midori/midori-browser.c:4262 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Ismeretlen '%s' beállítás" + +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "Panel bezárása" + +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +msgid "Blank page" +msgstr "Üres lap" + +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +msgid "Homepage" +msgstr "Honlap" + +#: ../midori/midori-websettings.c:133 +msgid "Last open pages" +msgstr "Legutóbb megnyitott lapok" + +#: ../midori/midori-websettings.c:148 +msgid "Chinese (BIG5)" +msgstr "Kínai (BIG5)" + +#: ../midori/midori-websettings.c:149 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japán (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:150 +msgid "Russian (KOI8-R)" +msgstr "Orosz (KOI8-r)" + +#: ../midori/midori-websettings.c:151 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:152 +msgid "Western (ISO-8859-1)" +msgstr "Nyugati (ISO-8859-1)" + +#: ../midori/midori-websettings.c:153 +msgid "Custom..." +msgstr "Egyéni..." + +#: ../midori/midori-websettings.c:168 +msgid "New tab" +msgstr "Új lap" + +#: ../midori/midori-websettings.c:169 +msgid "New window" +msgstr "Új ablak" + +#: ../midori/midori-websettings.c:170 +msgid "Current tab" +msgstr "Jelenlegi lap" + +#: ../midori/midori-websettings.c:185 +msgid "Default" +msgstr "Alap" + +#: ../midori/midori-websettings.c:186 +msgid "Icons" +msgstr "Ikonok" + +#: ../midori/midori-websettings.c:187 +msgid "Text" +msgstr "Szöveg" + +#: ../midori/midori-websettings.c:188 +msgid "Both" +msgstr "Mindkettő" + +#: ../midori/midori-websettings.c:189 +msgid "Both horizontal" +msgstr "Mindkettő vízszintesen" + +#: ../midori/midori-websettings.c:204 +msgid "All cookies" +msgstr "Minden süti" + +#: ../midori/midori-websettings.c:205 +msgid "Session cookies" +msgstr "Munkafolyamat sütik" + +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Semmi" + +#: ../midori/midori-websettings.c:246 +msgid "Remember last window size" +msgstr "Legutóbbi ablak méretének megjegyzése" + +#: ../midori/midori-websettings.c:247 +msgid "Whether to save the last window size" +msgstr "Mentésre kerüljön-e a legutóbbi ablak mérete" + +#: ../midori/midori-websettings.c:255 +msgid "Last window width" +msgstr "Legutóbbi ablak szélessége" + +#: ../midori/midori-websettings.c:256 +msgid "The last saved window width" +msgstr "A legutóbb elmentett ablak-szélesség" + +#: ../midori/midori-websettings.c:264 +msgid "Last window height" +msgstr "Legutóbbi ablak magassága" + +#: ../midori/midori-websettings.c:265 +msgid "The last saved window height" +msgstr "A legutóbb mentett ablak-magasság" + +#: ../midori/midori-websettings.c:273 +msgid "Last panel position" +msgstr "A panel helyzete" + +#: ../midori/midori-websettings.c:274 +msgid "The last saved panel position" +msgstr "A legutóbb mentett panel-helyzet" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 +msgid "Last panel page" +msgstr "Legutóbbi panel-lap" + +#: ../midori/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "A legutóbb mentett panel-lap" + +#: ../midori/midori-websettings.c:292 +msgid "Last Web search" +msgstr "Legutóbbi web-keresés" + +#: ../midori/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "A legutóbb mentett web-keresés" + +#: ../midori/midori-websettings.c:302 +#, fuzzy +msgid "Show Menubar" +msgstr "Menüsáv" + +#: ../midori/midori-websettings.c:303 +#, fuzzy +msgid "Whether to show the menubar" +msgstr "Megjelenjen-e az állapotsáv" + +#: ../midori/midori-websettings.c:311 +msgid "Show Navigationbar" +msgstr "Címsáv mutatása" + +#: ../midori/midori-websettings.c:312 +msgid "Whether to show the navigationbar" +msgstr "Megjelenjen-e a címsáv" + +#: ../midori/midori-websettings.c:320 +msgid "Show Bookmarkbar" +msgstr "Könyvjelzősáv mutatása" + +#: ../midori/midori-websettings.c:321 +msgid "Whether to show the bookmarkbar" +msgstr "Megjelenjen-e a könyvjelzősáv" + +#: ../midori/midori-websettings.c:329 +msgid "Show Panel" +msgstr "Panel mutatása" + +#: ../midori/midori-websettings.c:330 +msgid "Whether to show the panel" +msgstr "Megjelenjen-e a panel" + +#: ../midori/midori-websettings.c:338 +msgid "Show Statusbar" +msgstr "Állapotsáv mutatása" + +#: ../midori/midori-websettings.c:339 +msgid "Whether to show the statusbar" +msgstr "Megjelenjen-e az állapotsáv" + +#: ../midori/midori-websettings.c:348 +msgid "Toolbar Style" +msgstr "Eszközsáv stílus" + +#: ../midori/midori-websettings.c:349 +msgid "The style of the toolbar" +msgstr "Az eszközsáv stílusa" + +#: ../midori/midori-websettings.c:358 +#, fuzzy +msgid "Toolbar Items" +msgstr "Eszközsáv stílus" + +#: ../midori/midori-websettings.c:359 +#, fuzzy +msgid "The items to show on the toolbar" +msgstr "Az eszközsáv stílusa" + +#: ../midori/midori-websettings.c:367 +#, fuzzy +msgid "Compact Sidepanel" +msgstr "Oldal_panel" + +#: ../midori/midori-websettings.c:368 +#, fuzzy +msgid "Whether to make the sidepanel compact" +msgstr "Megjelenjen-e a panel" + +#: ../midori/midori-websettings.c:377 +msgid "Load on Startup" +msgstr "Betöltés induláskor" + +#: ../midori/midori-websettings.c:378 +msgid "What to load on startup" +msgstr "Az induláskor betöltendő" + +#: ../midori/midori-websettings.c:388 +msgid "The homepage" +msgstr "A honlap" + +#: ../midori/midori-websettings.c:396 +msgid "Download Folder" +msgstr "Letöltő mappa" + +#: ../midori/midori-websettings.c:397 +msgid "The folder downloaded files are saved to" +msgstr "A fájlok alapértelmezett letöltési mappája" + +#: ../midori/midori-websettings.c:405 +msgid "Download Manager" +msgstr "" + +#: ../midori/midori-websettings.c:406 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:423 +msgid "Location entry Search" +msgstr "A hely-beviteli Kereső" + +#: ../midori/midori-websettings.c:424 +msgid "The search to perform inside the location entry" +msgstr "A keresés a hely-beviteli mezőben" + +#: ../midori/midori-websettings.c:432 +msgid "Preferred Encoding" +msgstr "Alapértelmezett kódolás" + +#: ../midori/midori-websettings.c:433 +msgid "The preferred character encoding" +msgstr "Az alapértelmezett karakter-kódolás" + +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:452 +msgid "Close Buttons on Tabs" +msgstr "Bezáró gombok a lapokon" + +#: ../midori/midori-websettings.c:453 +msgid "Whether tabs have close buttons" +msgstr "Legyenek-e bezáró gombok a lapokon" + +#: ../midori/midori-websettings.c:462 +msgid "Open new pages in" +msgstr "Új lapok megnyitása itt:" + +#: ../midori/midori-websettings.c:463 +msgid "Where to open new pages" +msgstr "Hol nyíljanak az új lapok" + +#: ../midori/midori-websettings.c:473 +#, fuzzy +msgid "Open external pages in" +msgstr "Új lapok megnyitása itt:" + +#: ../midori/midori-websettings.c:474 +#, fuzzy +msgid "Where to open externally opened pages" +msgstr "Hol nyíljanak az új lapok" + +#: ../midori/midori-websettings.c:483 +msgid "Middle click opens Selection" +msgstr "Középső gombra megnyitás" + +#: ../midori/midori-websettings.c:484 +msgid "Load an URL from the selection via middle click" +msgstr "URL betöltése a kijelölésből középső gombbal" + +#: ../midori/midori-websettings.c:492 +msgid "Open tabs in the background" +msgstr "Lapok megnyitása a háttérben" + +#: ../midori/midori-websettings.c:493 +msgid "Whether to open new tabs in the background" +msgstr "Az új lapok a háttérben nyíljanak-e" + +#: ../midori/midori-websettings.c:501 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:510 +msgid "Open popups in tabs" +msgstr "Felugrók megnyitása lapokon" + +#: ../midori/midori-websettings.c:511 +msgid "Whether to open popup windows in tabs" +msgstr "Megnyíljanak-e a felugró ablakok lapokon" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies" +msgstr "Sütik fogadása" + +#: ../midori/midori-websettings.c:538 +msgid "What type of cookies to accept" +msgstr "Milyen sütiket fogadjunk el" + +#: ../midori/midori-websettings.c:547 +msgid "Original cookies only" +msgstr "Csak eredeti sütiket" + +#: ../midori/midori-websettings.c:548 +msgid "Accept cookies from the original website only" +msgstr "Csak az eredeti lapról való sütiket fogadjuk el" + +#: ../midori/midori-websettings.c:556 +msgid "Maximum cookie age" +msgstr "Sütik maximális kora" + +#: ../midori/midori-websettings.c:557 +msgid "The maximum number of days to save cookies for" +msgstr "A napok száma, melyre a sütiket legfeljebb elmentsük" + +#: ../midori/midori-websettings.c:567 +msgid "Remember last visited pages" +msgstr "Legutóbbi lapok megjegyzése" + +#: ../midori/midori-websettings.c:568 +msgid "Whether the last visited pages are saved" +msgstr "Mentsük-e a legutóbb meglátogatott lapokat" + +#: ../midori/midori-websettings.c:576 +msgid "Maximum history age" +msgstr "Történet maximális kora" + +#: ../midori/midori-websettings.c:577 +msgid "The maximum number of days to save the history for" +msgstr "A legtöbb nap, melyre a történetet elmentsük" + +#: ../midori/midori-websettings.c:585 +msgid "Remember last form inputs" +msgstr "Űrlapok megjegyzése" + +#: ../midori/midori-websettings.c:586 +msgid "Whether the last form inputs are saved" +msgstr "Mentsük-e az űrlapokba bevitt adatokat" + +#: ../midori/midori-websettings.c:594 +msgid "Remember last downloaded files" +msgstr "Legutóbbi letöltések megjegyzése" + +#: ../midori/midori-websettings.c:595 +msgid "Whether the last downloaded files are saved" +msgstr "Jegyezzük-e a legutóbbi letöltéseket" + +#: ../midori/midori-websettings.c:605 +msgid "HTTP Proxy" +msgstr "HTTP Proxy" + +#: ../midori/midori-websettings.c:606 +msgid "The proxy used for HTTP connections" +msgstr "A HTTP-kapcsolatok proxy kiszolgálója" + +#: ../midori/midori-websettings.c:614 +msgid "Cache size" +msgstr "Gyorstár mérete" + +#: ../midori/midori-websettings.c:615 +msgid "The allowed size of the cache" +msgstr "Az engedélyezett gyorstár-méret" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 +msgid "Open Link in New _Tab" +msgstr "Hivatkozás megnyitása új _lapon" + +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 +msgid "Open URL in New _Tab" +msgstr "URL megnyitása új _lapon" + +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1503 +msgid "Source" +msgstr "" + +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-preferences.c:87 +#, fuzzy, c-format +msgid "Preferences for %s" +msgstr "%s beállításai" + +#. Page "General" +#: ../midori/midori-preferences.c:338 +msgid "General" +msgstr "Általános" + +#: ../midori/midori-preferences.c:339 +msgid "Startup" +msgstr "Indulás" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:386 +msgid "Appearance" +msgstr "Megjelenés" + +#: ../midori/midori-preferences.c:387 +msgid "Font settings" +msgstr "Betű beállítások" + +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:407 +msgid "Behavior" +msgstr "Viselkedés" + +#: ../midori/midori-preferences.c:408 +msgid "Features" +msgstr "Képességek" + +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:437 +msgid "Interface" +msgstr "Felület" + +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Címsáv" + +#: ../midori/midori-preferences.c:453 +msgid "Browsing" +msgstr "Böngészés" + +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +msgid "Network" +msgstr "Hálózat" + +#: ../midori/midori-preferences.c:492 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" +msgstr "" + +#: ../midori/midori-preferences.c:500 +#, fuzzy +msgid "Web Cookies" +msgstr "Sütik fogadása" + +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "Üres" + +#: ../midori/midori-searchaction.c:797 +msgid "Add search engine" +msgstr "Kereső-motor hozzáadása" + +#: ../midori/midori-searchaction.c:797 +msgid "Edit search engine" +msgstr "Kereső-motor szerkesztése" + +#: ../midori/midori-searchaction.c:825 +msgid "_Name:" +msgstr "_Név:" + +#: ../midori/midori-searchaction.c:869 +msgid "_Icon (name or file):" +msgstr "_Ikon (Név vagy fájl):" + +#: ../midori/midori-searchaction.c:883 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1060 +msgid "Manage search engines" +msgstr "Kereső-motorok kezelése" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:282 +msgid "Warning: You are using a superuser account!" +msgstr "VESZÉLY! Rendszergazda hozzáférést használsz!" + +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" msgstr "" -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Az animációra használt jelképes méret" - -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" msgstr "" -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "Egy animációs kereteket tartalmazó ikon neve" - -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" msgstr "" -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "Egy animációs kereteket tartalmazó GdkPixbuf" +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#, fuzzy +msgid "_Disable" +msgstr "_Fájl" -#: ../katze/katze-throbber.c:162 -msgid "Animated" -msgstr "" +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konzol" -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "A betöltés-jelző animált legyen-e" +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Kiterjesztések" -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Egy állóképként használandó ikon neve" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "Egy állóképként használandó GdkPixbuf" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Érvénytelen '%s' tulajdonság ehhez: %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Válassz fájlt" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Válassz mappát" -#: ../katze/katze-item.c:72 -msgid "Name" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" msgstr "" -#: ../katze/katze-item.c:73 -msgid "The name of the item" +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Mappa:" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" msgstr "" -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" msgstr "" -#: ../katze/katze-item.c:91 -msgid "The URI of the item" +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" msgstr "" -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "" +#~ msgid "Select _All" +#~ msgstr "Mindent ki_jelöl" -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "" +#~ msgid "_Fullscreen" +#~ msgstr "_Teljes képernyő" -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "" +#~ msgid "_Leave Fullscreen" +#~ msgstr "Teljes képernyő elhagyása" -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "" +#~ msgid "Settings" +#~ msgstr "Beállítások" -#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -#: ../katze/katze-xbel.c:789 -msgid "Malformed document." -msgstr "Hibás dokumentum." +#~ msgid "The associated settings" +#~ msgstr "Társított beállítások" -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "A fájl nem található." +#~ msgid "Trash" +#~ msgstr "Kuka" + +#~ msgid "The trash, collecting recently closed tabs and windows" +#~ msgstr "A legutóbb bezárt lapokat és ablakokat gyűjtő kuka." + +#~ msgid "Browser" +#~ msgstr "Böngésző" + +#~ msgid "The navigationbar" +#~ msgstr "A címsáv" + +#~ msgid "Tab" +#~ msgstr "Lap" + +#~ msgid "The current tab" +#~ msgstr "Jelenlegi lap" + +#~ msgid "Statusbar" +#~ msgstr "Állapotsáv" + +#~ msgid "The statusbar" +#~ msgstr "Az állapotsáv" + +#~ msgid "Statusbar Text" +#~ msgstr "Állapotsáv szöveg" + +#~ msgid "The text that is displayed in the statusbar" +#~ msgstr "Az állapotsávra írt szöveg" + +#~ msgid "Pa_ge Setup" +#~ msgstr "_Oldal beállítása" + +#~ msgid "Undo the last modification" +#~ msgstr "Utolsó módosítás visszavonása" + +#~ msgid "Redo the last modification" +#~ msgstr "Utolsó módosítás ismétlése" + +#~ msgid "_Manage Bookmarks" +#~ msgstr "Könyvjelzők _kezelése" + +#~ msgid "Tab _Overview" +#~ msgstr "Lapok át_tekintése" + +#~ msgid "_Work Offline" +#~ msgstr "_Kapcsolat nélküli munka" + +#~ msgid "Appearance of the shadow around each panel" +#~ msgstr "Panelek körüli árnyékok megjelenése" + +#~ msgid "Menu" +#~ msgstr "Menü" + +#~ msgid "Menu to hold panel items" +#~ msgstr "Panel-elemek menüje" + +#~ msgid "Show New Tab" +#~ msgstr "Új lap mutatása" + +#~ msgid "Show the New Tab button in the toolbar" +#~ msgstr "Új lap gomb mutatása az eszközsávon" + +#~ msgid "Show Web search" +#~ msgstr "Web-keresés mutatása" + +#~ msgid "Show the Web search entry in the toolbar" +#~ msgstr "A Web-kereső mező mutatása az eszközsávon" + +#~ msgid "Show Trash" +#~ msgstr "Kuka mutatása" + +#~ msgid "Show the Trash button in the toolbar" +#~ msgstr "A kuka gomb mutatása az eszközsávon" + +#~ msgid "Tab Label Size" +#~ msgstr "A címke mérete" + +#~ msgid "The desired tab label size" +#~ msgstr "A lapok címkéinek kívánt mérete" + +#~ msgid "The URI of the currently loaded page" +#~ msgstr "A jelenlegi lap URI-ja" + +#~ msgid "The title of the currently loaded page" +#~ msgstr "A jelenlegi lap címe" + +#~ msgid "Symbolic size to use for the animation" +#~ msgstr "Az animációra használt jelképes méret" + +#~ msgid "The name of an icon containing animation frames" +#~ msgstr "Egy animációs kereteket tartalmazó ikon neve" + +#~ msgid "A GdkPixbuf containing animation frames" +#~ msgstr "Egy animációs kereteket tartalmazó GdkPixbuf" + +#~ msgid "Whether the throbber should be animated" +#~ msgstr "A betöltés-jelző animált legyen-e" + +#~ msgid "The name of an icon to be used as the static image" +#~ msgstr "Egy állóképként használandó ikon neve" + +#~ msgid "A GdkPixbuf to be used as the static image" +#~ msgstr "Egy állóképként használandó GdkPixbuf" diff --git a/po/id.po b/po/id.po index 135ae6c3..7ba6abcd 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-10 20:20+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-13 21:26+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" @@ -20,11 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Peramban web ringan" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1093 -#: ../midori/main.c:1102 -#: ../midori/main.c:1113 -#: ../midori/main.c:1137 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -32,1222 +29,1165 @@ msgstr "Midori" msgid "Web Browser" msgstr "Peramban Web" -#: ../midori/main.c:73 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "B_ookmark" -#: ../midori/main.c:74 -#: ../midori/midori-browser.c:3757 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "B_ookmark" -#: ../midori/main.c:75 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Tambah Bookmark" -#: ../midori/main.c:76 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konsol" -#: ../midori/main.c:77 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Ekstensi" -#: ../midori/main.c:78 +#: ../midori/main.c:91 msgid "_History" msgstr "_Riwayat" -#: ../midori/main.c:79 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Beranda" -#: ../midori/main.c:80 -msgid "_Pageholder" -msgstr "_Pageholder" - -#: ../midori/main.c:81 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Skrip pengguna" -#: ../midori/main.c:82 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Ga_ya pengguna" -#: ../midori/main.c:83 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Tab _Baru" -#: ../midori/main.c:84 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Transfer" -#: ../midori/main.c:85 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "Tutup Tab dan _Jendela" -#: ../midori/main.c:86 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Jendela _Baru" -#: ../midori/main.c:131 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurasi tak dapat dimuat: %s\n" -#: ../midori/main.c:186 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Nilai '%s' hanya sah untuk %s" -#: ../midori/main.c:193 -#: ../midori/main.c:263 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "Nilai konfigurasi '%s' tidak sah" -#: ../midori/main.c:522 -#: ../midori/main.c:530 -#: ../midori/main.c:560 -#: ../midori/main.c:569 -msgid "Malformed document." -msgstr "Dokumen salah bentuk." - -#: ../midori/main.c:552 +#: ../midori/main.c:532 msgid "File not found." msgstr "Berkas tak ditemukan." -#: ../midori/main.c:590 -#: ../midori/main.c:622 +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Dokumen salah bentuk." + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Gagal membuka basis data: %s\n" -#: ../midori/main.c:676 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Gagal menghapus item riwayat: %s\n" -#: ../midori/main.c:700 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Gagal membersihkan riwayat: %s\n" -#: ../midori/main.c:733 -#: ../midori/main.c:747 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Gagal menambah item riwayat: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:863 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Gagal menghapus item riwayat lama: %s\n" -#: ../midori/main.c:995 -#: ../midori/sokoke.c:457 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Penulisan gagal." -#: ../midori/main.c:1020 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Transfer" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesi tak dapat disimpan. %s" -#: ../midori/main.c:1052 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Jalankan nama berkas yang ditentukan sebagai javascript" -#: ../midori/main.c:1054 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Tampilkan versi program" -#: ../midori/main.c:1056 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URI" -#: ../midori/main.c:1090 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URI]" -#: ../midori/main.c:1114 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Silakan laporkan komentar, saran dan kutu ke:" -#: ../midori/main.c:1116 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Cek versi baru di:" -#: ../midori/main.c:1137 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Tak ada nama berkas yang ditentukan" -#: ../midori/main.c:1154 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Sebuah instansi Midori telah berjalan namun tidak merespon.\n" -#: ../midori/main.c:1189 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Bookmark tak dapat dimuat: %s\n" -#: ../midori/main.c:1203 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesi tak dapat dimuat: %s\n" -#: ../midori/main.c:1215 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Kotak sampah tak dapat dimuat: %s\n" -#: ../midori/main.c:1228 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Riwayat tak dapat dimuat: %s\n" -#: ../midori/main.c:1241 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Galat berikut terjadi:" -#: ../midori/main.c:1400 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Mesin pencari tak dapat disimpan. %s" -#: ../midori/main.c:1410 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bookmark tak dapat disimpan. %s" -#: ../midori/main.c:1419 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Kotak sampah tak dapat disimpan. %s" -#: ../midori/main.c:1427 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurasi tak dapat disimpan. %s" -#: ../midori/midori-addons.c:87 -#: ../midori/midori-websettings.c:207 -msgid "None" -msgstr "Tak ada" - -#: ../midori/midori-addons.c:88 -#: ../midori/midori-browser.c:3995 -msgid "Extensions" -msgstr "Ekstensi" - -#: ../midori/midori-addons.c:89 -#: ../midori/midori-browser.c:3978 -msgid "Userscripts" -msgstr "Skrip pengguna" - -#: ../midori/midori-addons.c:90 -#: ../midori/midori-browser.c:3986 -msgid "Userstyles" -msgstr "Gaya pengguna" - -#: ../midori/midori-addons.c:1043 -msgid "_Enable" -msgstr "_Aktifkan" - -#: ../midori/midori-addons.c:1052 -msgid "_Disable" -msgstr "_Non Aktifkan" - -#: ../midori/midori-browser.c:251 -#: ../midori/midori-browser.c:3138 -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Muat ulang halaman ini" -#: ../midori/midori-browser.c:263 -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Stop memuat halaman ini" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% termuat" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Aksi tak diharapkan '%s'." -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Bookmark baru" -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Sunting bookmark" -#: ../midori/midori-browser.c:533 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Judul:" -#: ../midori/midori-browser.c:546 -#: ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Keterangan:" -#: ../midori/midori-browser.c:565 -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:581 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Root" -#: ../midori/midori-browser.c:664 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Simpan berkas sebagai" -#: ../midori/midori-browser.c:1246 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Buka berkas" -#: ../midori/midori-browser.c:2316 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Buka di _Tab Baru" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Buka di _Jendela Baru" -#: ../midori/midori-browser.c:2590 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Pemisah" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "Seminggu yang lalu" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "%d hari yang lalu" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Hari Ini" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Kemarin" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Peramban web ringan." -#: ../midori/midori-browser.c:2814 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "Andhika Padmawan " -#: ../midori/midori-browser.c:2966 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Anda yakin ingin menghapus semua item riwayat?" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Berkas" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Buka di jendela baru" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Buka di tab baru" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Buka berkas" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Simpan ke berkas" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "_Tutup Tab" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Tutup tab saat ini" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "T_utup Jendela" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Tutup jendela ini" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Cetak halaman saat ini" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Keluar aplikasi" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Sunting" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Potong teks terpilih" -#: ../midori/midori-browser.c:3104 -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Salin teks terpilih" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Tempel teks dari papan klip" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Hapus teks terpilih" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Pilih semua teks" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Cari kata atau frasa di halaman" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Cari _Berikutnya" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Cari kejadian berikutnya dari kata atau frasa" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Cari _Sebelumnya" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Cari kejadian sebelumnya dari kata atau frasa" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "_Cari Cepat" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Lompat segera ke kata atau frasa" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Konfigurasi pilihan aplikasi" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Tampilan" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Batang Alat" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Naikkan level pembesaran" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Turunkan level pembesaran" -#: ../midori/midori-browser.c:3153 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Reset level pembesaran" -#: ../midori/midori-browser.c:3155 -#: ../midori/midori-view.c:962 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Tampilkan _Sumber" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Tampilkan kode program dari halaman" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Tampilkan Pemilihan Sumber" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Tampilkan kode program dari pemilihan" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Aktifkan tampilan layar penuh" -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Ke" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Mundur ke halaman sebelumnya" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Maju ke halaman berikutnya" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Ke laman anda" -#: ../midori/midori-browser.c:3176 -msgid "Open in Page_holder..." -msgstr "Buka di Page_holder..." - -#: ../midori/midori-browser.c:3177 -msgid "Open the current page in the pageholder" -msgstr "Buka halaman saat ini di pageholder" - -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Kosongkan Tempat Sampah" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Hapus isi tempat sampah" -#: ../midori/midori-browser.c:3182 -#: ../midori/midori-view.c:934 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Batalkan Menutup Tab" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Buka tab yang terakhir ditutup" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Tambah bookmark baru" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Sunting bookmark terpilih" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Hapus bookmark terpilih" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Hapus item riwayat terpilih" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Bersihkan seluruh riwayat" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Bookmark item riwayat terpilih" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Alat" -#: ../midori/midori-browser.c:3206 -#: ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Atur Mesin Pencari" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Tambah, sunting dan hapus mesin pencari..." -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Tab Sebelumnya" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Pindah ke tab sebelumnya" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "Tab _Berikutnya" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Pindah ke tab berikutnya" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "Ba_ntuan" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Isi" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Tampilkan dokumentasi" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Sering ditanyakan" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Tampilkan Pertanyaan Acapkali Diajukan" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "_Laporkan kutu" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Buka pelacak kutu Midori" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Tampilkan informasi tentang program" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "Meramban P_rivat" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Jangan simpan data privat ketika meramban" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "_Batang menu" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Tampilkan batang menu" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "Batang _navigasi" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Tampilkan batang navigasi" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Panel _sisi" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Tampilkan panel sisi" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "Batang _bookmark" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Tampilkan batang bookmark" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "Batang _transfer" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Tampilkan batang transfer" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "Batang stat_us" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Tampilkan batang status" -#: ../midori/midori-browser.c:3680 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Lokasi..." -#: ../midori/midori-browser.c:3682 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Buka lokasi khusus" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "Penelusuran _Web..." -#: ../midori/midori-browser.c:3708 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Jalankan penelusuran web" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Buka kembali tab atau jendela yang sebelumnya tertutup" -#: ../midori/midori-browser.c:3741 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Halaman yang baru dikunjungi" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Buka kembali halaman yang sebelumnya anda kunjungi" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Tampilkan bookmark tersimpan" -#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Jendela" -#: ../midori/midori-browser.c:3775 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Tampilkan senarai semua tab yang terbuka" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Bookmark" -#: ../midori/midori-browser.c:3906 -#: ../midori/midori-preferences.c:348 -msgid "Transfers" -msgstr "Transfer" - -#: ../midori/midori-browser.c:3915 -msgid "Console" -msgstr "Konsol" - -#: ../midori/midori-browser.c:3959 -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Riwayat" -#. i18n: A panel showing a user specified web page -#: ../midori/midori-browser.c:3969 -msgid "Pageholder" -msgstr "Pageholder" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Cari dalam baris:" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Cocokkan Huruf" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Sorot Kecocokan" -#: ../midori/midori-browser.c:4090 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Tutup batang cari" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Pengaturan tak diharapkan '%s'" -#: ../midori/midori-panel.c:207 -#: ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Tutup panel" -#: ../midori/midori-websettings.c:132 -#: ../midori/midori-view.c:1552 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Halaman kosong" -#: ../midori/midori-websettings.c:133 -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Beranda" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Halaman terakhir dibuka" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "China (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Jepang (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Rusia (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Barat (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Suai..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Tab baru" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Jendela baru" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Tab saat ini" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Standar" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Ikon" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Teks" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Keduanya" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Keduanya horizontal" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Semua kuki" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Kuki sesi" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Tak ada" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Ingat ukuran jendela terakhir" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Apakah ingin menyimpan ukuran jendela yang terakhir tersimpan" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Lebar jendela terakhir" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Lebar jendela terakhir tersimpan" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Tinggi jendela terakhir" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Tinggi jendela terakhir tersimpan" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Posisi panel terakhir" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Posisi panel terakhir tersimpan" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Halaman panel terakhir" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Halaman panel terakhir tersimpan" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Penelusuran Web terakhir" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Penelusuran Web terakhir tersimpan" -#: ../midori/midori-websettings.c:299 -msgid "Last pageholder URI" -msgstr "URI pageholder terakhir" - -#: ../midori/midori-websettings.c:300 -msgid "The URI last opened in the pageholder" -msgstr "URI terakhir dibuka di pageholder" - -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Tampilkan Batang Menu" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Apakah ingin menampilkan batang menu" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Tampilkan Batang Navigasi" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Apakah ingin menampilkan batang navigasi" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Tampilkan Batang Bookmark" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Apakah ingin menampilkan batang bookmark" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Tampilkan Panel" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Apakah ingin menampilkan panel" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Tampilkan Batang Status" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Apakah ingin menampilkan batang status" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Gaya Batang Alat" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Gaya dari batang alat" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Item Batang Alat" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Item yang akan ditampilkan di batang alat" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Panel Sisi Kompak" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Apakah ingin membuat panel sisi kompak" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Dimuat Saat Hidupkan" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Apa yang akan dimuat saat hidupkan" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Laman" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Folder Unduh" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Folder berkas terunduh disimpan di" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Manajer Unduh" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Manajer unduh eksternal" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Penyunting Teks" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Penyunting teks eksternal" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Pencari entri lokasi" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Pencarian yang dilakukan di dalam entri lokasi" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Penyandian Kesukaan" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Penyandian karakter kesukaan" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Selalu Tampilkan Batang Tab" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Selalu tampilkan batang tab" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Tutup Tombol di Tab" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Apakah tab memiliki tombol tutup" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Buka halaman baru di" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Dimana membuka halaman baru" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Buka halaman eksternal di" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Dimana ingin membuka halaman yang dibuka secara eksternal" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Klik Tengah Membuka Pilihan" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Muat URI dari pilihan via klik tengah" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Buka Tab di Latar Belakang" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Apakah ingin membuka tab baru di latar belakang" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Buka Tab di Samping Saat Ini" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Apakah ingin membuka tab baru di sebelah tab saat ini atau setelah tab terakhir" +msgstr "" +"Apakah ingin membuka tab baru di sebelah tab saat ini atau setelah tab " +"terakhir" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Buka popup di tab" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Apakah ingin membuka jendela popup di tab" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Terima kuki" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Tipe kuki apa yang diterima" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Hanya kuki asli" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Terima kuki hanya dari situs web asli" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Usia kuki maksimum" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Jumlah maksimum hari untuk menyimpan kuki" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Ingat halaman terakhir dikunjungi" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Apakah halaman terakhir dikunjungi tersimpan" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Usia riwayat maksimum" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Jumlah maksimum hari untuk tetap menyimpan riwayat" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Ingat bentuk terakhir masukan" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Apakah bentuk terakhir masukan disimpan" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Ingat berkas terakhir diunduh" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Apakah berkas terakhir diunduh akan disimpan" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "Proxy HTTP" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Proxy yang digunakan untuk koneksi HTTP" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Ukuran tembolok" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Ukuran tembolok yang diizinkan" -#: ../midori/midori-view.c:866 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Buka Taut di _Tab Baru" -#: ../midori/midori-view.c:889 +#: ../midori/midori-view.c:925 msgid "_Save Link destination" msgstr "_Simpan Taut tujuan" -#: ../midori/midori-view.c:897 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "_Unduh Taut tujuan" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Buka URL di _Tab Baru" -#: ../midori/midori-view.c:1286 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Periksa halaman - %s" -#: ../midori/midori-view.c:1424 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Sumber" +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Tampilkan dokumentasi" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Pengaturan untuk %s" #. Page "General" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Umum" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Mulai" #. Page "Appearance" -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Tampilan" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Pengaturan fonta" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:389 msgid "Default Font Family" msgstr "Keluarga Fonta Standar" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" msgstr "Ukuran Fonta Minimum" #. Page "Behavior" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Perilaku" -#: ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Fitur" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Muat citra secara otomatis" -#: ../midori/midori-preferences.c:412 +#: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" msgstr "Kecilkan citra secara otomatis" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "Print background images" msgstr "Cetak citra latar belakang" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Area teks dapat diubah ukurannya" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Aktifkan skrip" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Aktifkan plugin" @@ -1256,76 +1196,72 @@ msgid "Enable developer tools" msgstr "Aktifkan alat pengembang" #. Page "Interface" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Antarmuka" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Batang navigasi" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Meramban" -#: ../midori/midori-preferences.c:482 -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Jaringan" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Privasi" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Kuki Web" -#: ../midori/midori-preferences.c:515 -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "hari" -#: ../midori/midori-searchaction.c:459 -#: ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Kosong" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Tambah mesin pencari" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Sunting mesin pencari" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nama:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Ikon (nama atau berkas):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Atur mesin pencari" -#: ../midori/sokoke.c:63 -#: ../midori/sokoke.c:75 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Tak dapat menjalankan program eksternal." -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Peringatan: Anda menggunakan akun superuser!" @@ -1333,8 +1269,7 @@ msgstr "Peringatan: Anda menggunakan akun superuser!" msgid "An unknown error occured." msgstr "Galat tak diketahui terjadi." -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s tak memiliki properti '%s'" @@ -1349,6 +1284,30 @@ msgstr "%s tak dapat ditugaskan ke %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s tak dapat diakses" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Skrip pengguna" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Gaya pengguna" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Aktifkan" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Non Aktifkan" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsol" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Ekstensi" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1363,17 +1322,49 @@ msgstr "Stok ikon '%s' tak dapat dimuat" msgid "Animation frames are broken" msgstr "Bingkai animasi rusak" -#: ../katze/katze-utils.c:147 -#: ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Properti '%s' tidak sah untuk %s" -#: ../katze/katze-utils.c:169 -#: ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Pilih berkas" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Pilih folder" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Pageholder" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Pageholder" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Skrip pengguna" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Buka di Page_holder..." + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Buka halaman saat ini di pageholder" + +#~ msgid "Last pageholder URI" +#~ msgstr "URI pageholder terakhir" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "URI terakhir dibuka di pageholder" diff --git a/po/midori.pot b/po/midori.pot index e11e764c..5c4e8c54 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-25 23:40+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../midori.desktop.in.h:2 ../midori/main.c:1141 ../midori/main.c:1150 -#: ../midori/main.c:1161 ../midori/main.c:1185 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "" @@ -29,232 +29,208 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:81 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "" -#: ../midori/main.c:82 ../midori/midori-browser.c:3719 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "" -#: ../midori/main.c:83 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:84 +#: ../midori/main.c:89 msgid "_Console" msgstr "" -#: ../midori/main.c:85 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "" -#: ../midori/main.c:86 +#: ../midori/main.c:91 msgid "_History" msgstr "" -#: ../midori/main.c:87 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "" -#: ../midori/main.c:88 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "" -#: ../midori/main.c:89 +#: ../midori/main.c:94 msgid "User_styles" msgstr "" -#: ../midori/main.c:90 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "" -#: ../midori/main.c:91 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "" -#: ../midori/main.c:92 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/main.c:93 +#: ../midori/main.c:98 msgid "New _Window" msgstr "" -#: ../midori/main.c:138 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:193 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:200 ../midori/main.c:270 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:527 +#: ../midori/main.c:532 msgid "File not found." msgstr "" -#: ../midori/main.c:535 ../midori/main.c:544 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "" -#: ../midori/main.c:566 ../midori/main.c:598 +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:652 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:676 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:709 ../midori/main.c:723 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:971 ../midori/sokoke.c:457 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1015 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "" -#: ../midori/main.c:1024 -msgid "Console" -msgstr "" - -#: ../midori/main.c:1034 ../midori/midori-addons.c:88 -msgid "Userscripts" -msgstr "" - -#: ../midori/main.c:1042 ../midori/midori-addons.c:89 -msgid "Userstyles" -msgstr "" - -#: ../midori/main.c:1051 -msgid "Extensions" -msgstr "" - -#: ../midori/main.c:1071 +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1100 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1102 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "" -#: ../midori/main.c:1104 +#: ../midori/main.c:1301 msgid "URIs" msgstr "" -#: ../midori/main.c:1138 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "" -#: ../midori/main.c:1162 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1164 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1185 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1202 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1238 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1254 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1268 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1282 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1295 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1479 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1489 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1498 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1506 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "" - -#: ../midori/midori-addons.c:964 -msgid "_Enable" -msgstr "" - -#: ../midori/midori-addons.c:973 -msgid "_Disable" -msgstr "" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3106 -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "" @@ -300,430 +276,430 @@ msgstr "" msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2304 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2306 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2577 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "" -#: ../midori/midori-browser.c:2688 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "" -#: ../midori/midori-browser.c:2694 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "" -#: ../midori/midori-browser.c:2701 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "" -#: ../midori/midori-browser.c:2703 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "" -#: ../midori/midori-browser.c:2792 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3057 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3072 ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3123 ../midori/midori-view.c:914 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:886 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3171 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3646 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3672 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3691 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3704 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3734 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3736 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3901 ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "" -#: ../midori/midori-browser.c:3979 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4237 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -732,408 +708,423 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:130 ../midori/midori-view.c:1503 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:245 -msgid "Remember last window size" +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" msgstr "" #: ../midori/midori-websettings.c:246 +msgid "Remember last window size" +msgstr "" + +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-view.c:818 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:841 +#: ../midori/midori-view.c:925 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:849 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:871 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "" -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1375 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "" +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" @@ -1174,7 +1165,7 @@ msgstr "" msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:30 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "" @@ -1190,49 +1181,49 @@ msgstr "" msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:34 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:429 msgid "Enable developer tools" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:484 ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:517 ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "" @@ -1268,7 +1259,7 @@ msgstr "" msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:280 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "" @@ -1291,6 +1282,30 @@ msgstr "" msgid "%s.%s cannot be accessed" msgstr "" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1305,16 +1320,16 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:156 ../katze/katze-utils.c:347 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:219 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:200 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "" @@ -1326,3 +1341,15 @@ msgstr "" #: ../extensions/page-holder.c:128 msgid "_Pageholder" msgstr "" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" diff --git a/po/nl.po b/po/nl.po index 892bf9b0..7ce87910 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-10 20:20+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-10 02:02+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch\n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lichtgewicht webbrowser" -#: ../midori.desktop.in.h:2 ../midori/main.c:1093 ../midori/main.c:1102 -#: ../midori/main.c:1113 ../midori/main.c:1137 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -29,1201 +29,1166 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:73 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Bladwijzer" -#: ../midori/main.c:74 ../midori/midori-browser.c:3757 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Bladwijzers" -#: ../midori/main.c:75 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "Bladwijzer _toevoegen" -#: ../midori/main.c:76 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:77 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Extensies" -#: ../midori/main.c:78 +#: ../midori/main.c:91 msgid "_History" msgstr "_Geschiedenis" -#: ../midori/main.c:79 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Homepage" -#: ../midori/main.c:80 -msgid "_Pageholder" -msgstr "_Paginavak" - -#: ../midori/main.c:81 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "Gebruikers_scripts" -#: ../midori/main.c:82 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Gebruikers_opmaakprofielen" -#: ../midori/main.c:83 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Nieuw _tabblad" -#: ../midori/main.c:84 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "Bestands_overdrachten" -#: ../midori/main.c:85 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "Ge_sloten tabbladen en vensters" -#: ../midori/main.c:86 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Nieuw _venster" -#: ../midori/main.c:131 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Configuratie kan niet geladen worden: %s\n" -#: ../midori/main.c:186 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Waarde '%s' is ongeldig voor %s" -#: ../midori/main.c:193 ../midori/main.c:263 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ongeldige waarde '%s'" -#: ../midori/main.c:522 ../midori/main.c:530 ../midori/main.c:560 -#: ../midori/main.c:569 -msgid "Malformed document." -msgstr "Ongeldig document." - -#: ../midori/main.c:552 +#: ../midori/main.c:532 msgid "File not found." msgstr "Bestand niet gevonden." -#: ../midori/main.c:590 ../midori/main.c:622 +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Ongeldig document." + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Kan database niet openen: %s\n" -#: ../midori/main.c:676 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kan item in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:700 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kan geschiedenis niet wissen: %s\n" -#: ../midori/main.c:733 ../midori/main.c:747 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:863 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kan verjaarde items in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:995 ../midori/sokoke.c:457 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Fout bij schrijven." -#: ../midori/main.c:1020 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Bestandsoverdrachten" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "De sessie kan niet worden opgeslagen. %s" -#: ../midori/main.c:1052 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Voer de gegeven bestandsnaam uit als Javascript" -#: ../midori/main.c:1054 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Versie-informatie weergeven" -#: ../midori/main.c:1056 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URI's" -#: ../midori/main.c:1090 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URI's]" -#: ../midori/main.c:1114 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" -#: ../midori/main.c:1116 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" -#: ../midori/main.c:1137 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Geen bestandsnaam ingegeven" -#: ../midori/main.c:1154 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori is al actief maar reageert niet.\n" -#: ../midori/main.c:1189 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "De bladwijzers kunnen niet geladen worden: %s\n" -#: ../midori/main.c:1203 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "De sessie kan niet geladen worden: %s\n" -#: ../midori/main.c:1215 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "De prullenbak kan niet geladen worden: %s\n" -#: ../midori/main.c:1228 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "De geschiedenis kan niet geladen worden: %s\n" -#: ../midori/main.c:1241 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" -#: ../midori/main.c:1400 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" -#: ../midori/main.c:1410 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" -#: ../midori/main.c:1419 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "De prullenbak kan niet worden opgeslagen. %s" -#: ../midori/main.c:1427 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "De instellingen kunnen niet worden opgeslagen. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 -msgid "None" -msgstr "Geen" - -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3995 -msgid "Extensions" -msgstr "Extensies" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3978 -msgid "Userscripts" -msgstr "Gebruikersscripts" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3986 -msgid "Userstyles" -msgstr "Gebruikersopmaakprofielen" - -#: ../midori/midori-addons.c:1043 -msgid "_Enable" -msgstr "_Inschakelen" - -#: ../midori/midori-addons.c:1052 -msgid "_Disable" -msgstr "_Uitschakelen" - -#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3138 -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "De huidige pagina herladen" -#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Onverwachte actie '%s'." -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:533 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:546 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Beschrijving:" -#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:581 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Map:" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Hoofdmap" -#: ../midori/midori-browser.c:664 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:1246 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:2316 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-browser.c:2590 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Scheidingsteken" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "Eén week geleden" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "%d dagen geleden" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Vandaag" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Gisteren" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Een lichtgewicht webbrowser." -#: ../midori/midori-browser.c:2814 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "Vincent Tunru " -#: ../midori/midori-browser.c:2966 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Bestand" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Nieuw venster openen" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Opslaan naar bestand" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "Tabblad _sluiten" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Huidig tabblad sluiten" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "Venster _sluiten" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Dit venster sluiten" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Huidige pagina uitprinten" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Programma afsluiten" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Bewerken" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Geselecteerde tekst knippen" -#: ../midori/midori-browser.c:3104 ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Geselecteerde tekst kopiëren" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Tekst van het klembord plakken" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Geselecteerde tekst verwijderen" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Alle tekst selecteren" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Zoek naar een woord of zin in deze pagina" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Vo_lgende zoeken" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Volgende voorkomen van een woord of zin opzoeken" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Vorige voorkomen van een woord of zin opzoeken" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "_Snel zoeken" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Snel naar een woord of zin springen" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Voorkeuren instellen" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Beeld" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Werkbalken" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Zoomniveau verhogen" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Zoomniveau verlagen" -#: ../midori/midori-browser.c:3153 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Zoomniveau op beginwaarde" -#: ../midori/midori-browser.c:3155 ../midori/midori-view.c:962 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "_Bron bekijken" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Broncode van deze pagina bekijken" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Bron van selectie bekijken" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Bekijk de broncode van de geselecteerde tekst" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Volledig scherm" -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Ga naar" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Terug naar de vorige pagina" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Naar de volgende pagina" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Naar de homepage" -#: ../midori/midori-browser.c:3176 -msgid "Open in Page_holder..." -msgstr "Openen in _paginavak" - -#: ../midori/midori-browser.c:3177 -msgid "Open the current page in the pageholder" -msgstr "Open de huidige pagina in het paginavak" - -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Prullenbak leegmaken" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Verwijder de inhoud van de prullenbak" -#: ../midori/midori-browser.c:3182 ../midori/midori-view.c:934 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Tabblad sluiten ongedaan maken" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Open het laatst gesloten tabblad" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Geselecteerde bladwijzer bewerken" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Geselecteerde item uit geschiedenis verwijderen" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Volledige geschiedenis wissen" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Geselecteerde item uit geschiedenis toevoegen als bladwijzer" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Hulpmiddelen" -#: ../midori/midori-browser.c:3206 ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "Vo_rig tabblad" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Overschakelen naar het vorige tabblad" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Overschakelen naar het volgende tabblad" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Hulp" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Inhoud" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Documentatie weergeven" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Veelgestelde vragen" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Veelgestelde vragen weergeven" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "Fouten _melden" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Open Midori's foutmelder" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Informatie over dit programma weergeven" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "P_rivé browsen" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Geen privé-data opslaan tijdens het browsen" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "_Menubalk" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Navigatiebalk" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "_Paneel" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "_Paneel weergeven" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Bladwijzerbalk" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "Bestands_overdrachten-balk" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Bestandsoverdrachten-balk weergeven" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Statusbalk" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-browser.c:3680 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Locatie..." -#: ../midori/midori-browser.c:3682 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Open een locatie" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "Zoeken op het _web..." -#: ../midori/midori-browser.c:3708 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Doorzoek het web" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Heropen een eerder gesloten tabblad of venster" -#: ../midori/midori-browser.c:3741 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Recent bezochte pagina's" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Eerder bezochte pagina's heropenen" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Opgeslagen bladwijzers weergeven" -#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Venster" -#: ../midori/midori-browser.c:3775 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Geef een lijst met open tabbladen weer" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../midori/midori-browser.c:3906 ../midori/midori-preferences.c:348 -msgid "Transfers" -msgstr "Bestandsoverdrachten" - -#: ../midori/midori-browser.c:3915 -msgid "Console" -msgstr "Console" - -#: ../midori/midori-browser.c:3959 ../midori/midori-preferences.c:519 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Geschiedenis" -#. i18n: A panel showing a user specified web page -#: ../midori/midori-browser.c:3969 -msgid "Pageholder" -msgstr "Paginavak" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Ingebed zoeken:" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Hoofdlettergevoelig" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Gevonden items markeren" -#: ../midori/midori-browser.c:4090 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Zoekbalk sluiten" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" -#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Paneel sluiten" -#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1552 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Laatst geopende pagina's" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chinees (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Aangepast..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Nieuw tabblad" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Nieuw venster" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Huidig tabblad" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Standaard" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Pictogrammen" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Beide" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Beide horizontaal" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Sessie-cookies" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Geen" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Laatst gebruiken venstergrootte onthouden" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Laatst gebruikte positie van paneel" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Laatst gebruikte positie van paneel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:299 -msgid "Last pageholder URI" -msgstr "Laatst gebruikte URI in het paginavak" - -#: ../midori/midori-websettings.c:300 -msgid "The URI last opened in the pageholder" -msgstr "Laatst gebruikte URI in het paginavak" - -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Items in de werkbalk" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Items om weer te geven in de werkbalk" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Compact paneel" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Het paneel compact weergeven" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Laden bij opstarten" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Wat geladen moet worden tijdens het opstarten" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Downloadmap" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:397 #, fuzzy msgid "The folder downloaded files are saved to" msgstr "De map waar gedownloadede de bestanden worden opgeslagen" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Downloadbeheer" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Extern downloadbeheer" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Tekstbewerker" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Een externe tekstbewerker" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Zoeken vanuit locatieveld" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Balk met tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Nieuwe pagina's openen in" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Waar nieuwe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Externe pagina's openen in" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Waar externe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Middel-klikken opent selectie" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Laad een URL vanuit de selectie met een klik op de middelste muisknop" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Cookies accepteren" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Welke soorten cookies geaccepteerd moeten worden" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Alleen originele cookies" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Alleen cookies accepteren van de originele website" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Maximale leeftijd van cookies" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Hoeveel dagen een cookie maximaal bewaard mag worden" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Dagen in geschiedenis" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Laatst ingevoerde data in formulieren onthouden" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Laatst ingevoerde data in formulieren onthouden" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:594 #, fuzzy msgid "Remember last downloaded files" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:595 #, fuzzy msgid "Whether the last downloaded files are saved" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP proxy" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "De gebruikte proxy voor HTTP-verbindingen" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Cachegrootte" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Toegestane grootte voor de cache" -#: ../midori/midori-view.c:866 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Link in nieuw _tabblad openen" -#: ../midori/midori-view.c:889 +#: ../midori/midori-view.c:925 msgid "_Save Link destination" msgstr "Locatie _opslaan" -#: ../midori/midori-view.c:897 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "Locatie _downloaden" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "URL in nieuw _tabblad openen" -#: ../midori/midori-view.c:1286 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Pagina analyseren - %s" -#: ../midori/midori-view.c:1424 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Bron" +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Documentatie weergeven" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Voorkeuren voor %s" #. Page "General" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Algemeen" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Opstarten" #. Page "Appearance" -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Weergave" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Lettertype" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:389 msgid "Default Font Family" msgstr "Standaard lettertype" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" msgstr "Minimale lettergrootte" #. Page "Behavior" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Gedrag" -#: ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Opties" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-preferences.c:412 +#: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" msgstr "Afbeeldingen automatisch verkleinen" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Schaalbare tekstvlakken" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Scripts aanzetten" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Plugins aanzetten" @@ -1232,64 +1197,64 @@ msgid "Enable developer tools" msgstr "Ontwikkelaars-opties aanzetten" #. Page "Interface" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Gebruik" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Navigatiebalk" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Browsen" -#: ../midori/midori-preferences.c:482 ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Netwerk" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Cookies" -#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "dagen" -#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Leeg" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Zoekmachine toevoegen" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Zoekmachine bewerken" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Naam:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Pictogram (naam of bestand):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Trefwoord:" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Zoekmachines beheren" @@ -1297,7 +1262,7 @@ msgstr "Zoekmachines beheren" msgid "Could not run external program." msgstr "Kan externe applicatie niet uitvoeren." -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Waarschuwing: u bent ingelogd als root!" @@ -1320,6 +1285,30 @@ msgstr "%s kan niet toegewezen worden aan %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s is niet toegankelijk" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Gebruikersscripts" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Gebruikersopmaakprofielen" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Inschakelen" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Uitschakelen" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Console" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensies" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1334,15 +1323,49 @@ msgstr "Standaardpictogram '%s' kan niet geladen worden" msgid "Animation frames are broken" msgstr "Film-frames werken niet " -#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschap '%s' is ongeldig voor %s" -#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Bestand kiezen" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Map kiezen" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Paginavak" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Paginavak" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Gebruikersscripts" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Openen in _paginavak" + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Open de huidige pagina in het paginavak" + +#~ msgid "Last pageholder URI" +#~ msgstr "Laatst gebruikte URI in het paginavak" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Laatst gebruikte URI in het paginavak" diff --git a/po/pl.po b/po/pl.po index 354bf33d..5e8761f2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.17\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 16:06+0200\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-08-27 00:24+0100\n" "Last-Translator: Lukasz Romanowicz \n" "Language-Team: pl \n" @@ -20,7 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lekka przeglądarka internetowa" -#: ../midori.desktop.in.h:2 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -28,1386 +29,1487 @@ msgstr "Midori" msgid "Web Browser" msgstr "Przeglądarka Internetowa" -#: ../midori/main.c:45 -msgid "Bookmark" -msgstr "Zakładka" +#: ../midori/main.c:86 +#, fuzzy +msgid "_Bookmark" +msgstr "_Zakładki" -#: ../midori/main.c:46 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +msgid "_Bookmarks" +msgstr "_Zakładki" + +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Dodaj zakładkę" -#: ../midori/main.c:47 -msgid "_Form Fill" -msgstr "Wypełnij _formularz" +#: ../midori/main.c:89 +#, fuzzy +msgid "_Console" +msgstr "Konsola" -#: ../midori/main.c:48 +#: ../midori/main.c:90 +#, fuzzy +msgid "_Extensions" +msgstr "Rozszerzenia" + +#: ../midori/main.c:91 +#, fuzzy +msgid "_History" +msgstr "Historia" + +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Strona startowa" -#: ../midori/main.c:49 +#: ../midori/main.c:93 +#, fuzzy +msgid "_Userscripts" +msgstr "Skrypty użytkownika" + +#: ../midori/main.c:94 +#, fuzzy +msgid "User_styles" +msgstr "Skrypty użytkownika" + +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Nowa kar_ta" -#: ../midori/main.c:50 +#: ../midori/main.c:96 +#, fuzzy +msgid "_Transfers" +msgstr "Pobierania plików" + +#: ../midori/main.c:97 +#, fuzzy +msgid "_Closed Tabs and Windows" +msgstr "Zamknięte karty i okna" + +#: ../midori/main.c:98 msgid "New _Window" msgstr "_Nowe okno" -#: ../midori/main.c:52 -msgid "Select _All" -msgstr "Z_aznacz wszystko" - -#: ../midori/main.c:55 -msgid "_Fullscreen" -msgstr "Tryb _pełnoekranowy" - -#: ../midori/main.c:56 -msgid "_Leave Fullscreen" -msgstr "_Opuść tryb pełnoekranowy" - -#: ../midori/main.c:110 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "Ustawienia nie mogą być załadowane. %s\n" -#: ../midori/main.c:165 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wartość '%s' nie jest poprawna dla %s" -#: ../midori/main.c:172 -#: ../midori/main.c:241 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format -msgid "Unhandled settings value '%s'" +msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:334 -msgid "Display program version" -msgstr "Wyświetl wersję programu" +#: ../midori/main.c:532 +msgid "File not found." +msgstr "Nie znaleziono dokumentu" -#: ../midori/main.c:342 -#: ../midori/main.c:351 -#: ../midori/main.c:353 -#: ../midori/main.c:367 -msgid "midori" -msgstr "midori" - -#: ../midori/main.c:347 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:351 -msgid "Unknown argument." -msgstr "Nieznany argument" - -#: ../midori/main.c:353 -msgid "Failed to setup interface." +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." msgstr "" -#: ../midori/main.c:368 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów:" - -#: ../midori/main.c:370 -msgid "Check for new versions at:" -msgstr "Sprawdź nową wersję na:" - -#: ../midori/main.c:418 +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Zakładki nie mogą być załadowane. %s\n" +msgid "Failed to open database: %s\n" +msgstr "" -#: ../midori/main.c:432 +#: ../midori/main.c:657 #, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "Sesja nie może być załadowana. %s\n" +msgid "Failed to remove history item: %s\n" +msgstr "" -#: ../midori/main.c:444 +#: ../midori/main.c:681 #, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "Nie można załadować śmietnika. %s\n" +msgid "Failed to clear history: %s\n" +msgstr "" -#: ../midori/main.c:454 -msgid "The following errors occured:" -msgstr "Nastąpiły następujące błędy:" - -#: ../midori/main.c:583 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Wyszukiwarki internetowe nie mogą być zapisane. %s" +msgid "Failed to add history item: %s\n" +msgstr "" -#: ../midori/main.c:593 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 #, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Zakładki nie mogą zostać zapisane. %s" +msgid "Failed to remove old history items: %s\n" +msgstr "" -#: ../midori/main.c:602 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Kosz nie może zostać zapisany. %s" +msgid "Writing failed." +msgstr "Zapis nie powiódł się" -#: ../midori/main.c:614 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Pobierania plików" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesja nie może zostać zapisana. %s" -#: ../midori/main.c:623 +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1299 +msgid "Display program version" +msgstr "Wyświetl wersję programu" + +#: ../midori/main.c:1301 +#, fuzzy +msgid "URIs" +msgstr "URI" + +#: ../midori/main.c:1335 +#, fuzzy +msgid "[URIs]" +msgstr "[URL]" + +#: ../midori/main.c:1371 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów:" + +#: ../midori/main.c:1373 +msgid "Check for new versions at:" +msgstr "Sprawdź nową wersję na:" + +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1411 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Zakładki nie mogą być załadowane. %s\n" + +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sesja nie może być załadowana. %s\n" + +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Nie można załadować śmietnika. %s\n" + +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Nie można załadować śmietnika. %s\n" + +#: ../midori/main.c:1504 +msgid "The following errors occured:" +msgstr "Nastąpiły następujące błędy:" + +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Wyszukiwarki internetowe nie mogą być zapisane. %s" + +#: ../midori/main.c:1698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Zakładki nie mogą zostać zapisane. %s" + +#: ../midori/main.c:1707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Kosz nie może zostać zapisany. %s" + +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Ustawienia nie mogą zostać zapisane. %s" -#: ../midori/midori-app.c:114 -#: ../midori/midori-browser.c:1077 -msgid "Settings" -msgstr "Ustawienia" - -#: ../midori/midori-app.c:115 -#: ../midori/midori-browser.c:1078 -msgid "The associated settings" -msgstr "" - -#: ../midori/midori-app.c:123 -#: ../midori/midori-browser.c:1116 -msgid "Trash" -msgstr "Kosz" - -#: ../midori/midori-app.c:124 -#: ../midori/midori-browser.c:1117 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "" - -#: ../midori/midori-app.c:132 -msgid "Browser" -msgstr "Przeglądarka" - -#: ../midori/midori-app.c:133 -msgid "The current browser" -msgstr "Obecna przeglądarka" - -#: ../midori/midori-app.c:141 -msgid "Browser Count" -msgstr "" - -#: ../midori/midori-app.c:142 -msgid "The current number of browsers" -msgstr "" - -#: ../midori/midori-app.c:150 -#: ../midori/midori-browser.c:1130 -#: ../midori/midori-searchentry.c:71 -msgid "Search Engines" -msgstr "Wyszukiwarki" - -#: ../midori/midori-app.c:151 -#: ../midori/midori-searchentry.c:72 -msgid "The list of search engines" -msgstr "Lista wyszukiwarek" - -#: ../midori/midori-addons.c:40 -#: ../midori/midori-browser.c:3201 -msgid "Extensions" -msgstr "Rozszerzenia" - -#: ../midori/midori-addons.c:41 -#: ../midori/midori-browser.c:3108 -msgid "Userscripts" -msgstr "Skrypty użytkownika" - -#: ../midori/midori-addons.c:42 -msgid "Userstyles" -msgstr "" - -#: ../midori/midori-browser.c:202 -#: ../midori/midori-browser.c:2425 -#: ../midori/midori-browser.c:2431 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Odśwież bieżącą stronę" -#: ../midori/midori-browser.c:210 -#: ../midori/midori-browser.c:2428 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Zatrzymaj wczytywanie bieżącej strony" -#: ../midori/midori-browser.c:273 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% załadowano" -#: ../midori/midori-browser.c:418 -msgid "New bookmark" -msgstr "Nowa zakładka" - -#: ../midori/midori-browser.c:418 -msgid "Edit bookmark" -msgstr "Edytuj zakładkę" - -#: ../midori/midori-browser.c:445 -msgid "_Title:" -msgstr "_Tytuł:" - -#: ../midori/midori-browser.c:458 -#: ../midori/midori-searchentry.c:563 -msgid "_Description:" -msgstr "_Opis:" - -#: ../midori/midori-browser.c:477 -#: ../midori/midori-searchentry.c:577 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:494 -msgid "_Folder:" -msgstr "_Folder:" - -#: ../midori/midori-browser.c:498 -msgid "Root" -msgstr "Korzeń" - -#: ../midori/midori-browser.c:814 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Niespodziewana akcja '%s'." -#: ../midori/midori-browser.c:1033 -msgid "Menubar" -msgstr "Pasek menu" +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Nowa zakładka" -#: ../midori/midori-browser.c:1034 -msgid "The menubar" -msgstr "Pasek menu" +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Edytuj zakładkę" -#: ../midori/midori-browser.c:1042 -#: ../midori/midori-preferences.c:332 -msgid "Navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Tytuł:" -#: ../midori/midori-browser.c:1043 -msgid "The navigationbar" -msgstr "Pasek narzędzi nawigacyjnych" +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Opis:" -#: ../midori/midori-browser.c:1051 -msgid "Tab" -msgstr "Karta" +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" -#: ../midori/midori-browser.c:1052 -msgid "The current tab" -msgstr "Bieżącą karta" +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Folder:" -#: ../midori/midori-browser.c:1060 -msgid "Statusbar" -msgstr "Pasek stanu" +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Korzeń" -#: ../midori/midori-browser.c:1061 -msgid "The statusbar" -msgstr "Pasek stanu" - -#: ../midori/midori-browser.c:1097 -msgid "Statusbar Text" -msgstr "Tekst paska stanu" - -#: ../midori/midori-browser.c:1098 -#: ../midori/midori-webview.c:225 -msgid "The text that is displayed in the statusbar" -msgstr "Tekst wyświetlany na pasku stanu" - -#: ../midori/midori-browser.c:1131 -msgid "The list of search engines to be used for web search" -msgstr "" - -#: ../midori/midori-browser.c:1937 -msgid "Separator" -msgstr "Separator" - -#: ../midori/midori-browser.c:2114 -msgid "A lightweight web browser." -msgstr "Lekka przeglądarka internetowa" - -#: ../midori/midori-browser.c:2122 -msgid "translator-credits" -msgstr "Przemysław Sitek " - -#: ../midori/midori-browser.c:2348 -msgid "_File" -msgstr "_Plik" - -#: ../midori/midori-browser.c:2351 -msgid "Open a new window" -msgstr "_Nowe okno" - -#: ../midori/midori-browser.c:2354 -msgid "Open a new tab" -msgstr "Nowa kar_ta" - -#: ../midori/midori-browser.c:2357 -msgid "Open a file" -msgstr "_Otwórz plik" - -#: ../midori/midori-browser.c:2360 -msgid "Save to a file" +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" msgstr "Zapi_sz stronę jako" -#: ../midori/midori-browser.c:2362 -msgid "_Close Tab" -msgstr "_Zamknij kartę" +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "_Otwórz plik" -#: ../midori/midori-browser.c:2363 -msgid "Close the current tab" -msgstr "Zamknij bieżącą kartę" - -#: ../midori/midori-browser.c:2365 -msgid "C_lose Window" -msgstr "Zamknij okno" - -#: ../midori/midori-browser.c:2366 -msgid "Close this window" -msgstr "Zamknij okno" - -#: ../midori/midori-browser.c:2368 -msgid "Pa_ge Setup" -msgstr "_Ustawienia strony" - -#: ../midori/midori-browser.c:2372 -msgid "Show a preview of the printed page" -msgstr "Pokaż podgląd drukowanej strony" - -#: ../midori/midori-browser.c:2375 -msgid "Print the current page" -msgstr "Drukuj bieżącą stronę" - -#: ../midori/midori-browser.c:2378 -msgid "Quit the application" -msgstr "Za_kończ" - -#: ../midori/midori-browser.c:2380 -msgid "_Edit" -msgstr "_Edycja" - -#: ../midori/midori-browser.c:2383 -msgid "Undo the last modification" -msgstr "Cofnij" - -#: ../midori/midori-browser.c:2386 -msgid "Redo the last modification" -msgstr "Przywróć" - -#: ../midori/midori-browser.c:2389 -msgid "Cut the selected text" -msgstr "Wytnij zaznaczony tekst" - -#: ../midori/midori-browser.c:2392 -#: ../midori/midori-browser.c:2395 -msgid "Copy the selected text" -msgstr "Skopiuj" - -#: ../midori/midori-browser.c:2398 -msgid "Paste text from the clipboard" -msgstr "Wklej" - -#: ../midori/midori-browser.c:2401 -msgid "Delete the selected text" -msgstr "Usuń zaznaczony tekst" - -#: ../midori/midori-browser.c:2404 -msgid "Select all text" -msgstr "Zaznacz w_szystko" - -#: ../midori/midori-browser.c:2407 -msgid "Find a word or phrase in the page" -msgstr "Znajdź słowa lub frazy na stronie" - -#: ../midori/midori-browser.c:2409 -msgid "Find _Next" -msgstr "Znajdź poprzednie" - -#: ../midori/midori-browser.c:2410 -msgid "Find the next occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2412 -msgid "Find _Previous" -msgstr "Znajdź następne" - -#: ../midori/midori-browser.c:2413 -msgid "Find the previous occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2415 -msgid "_Quick Find" -msgstr "Szybkie wyszukiwanie" - -#: ../midori/midori-browser.c:2416 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2419 -msgid "Configure the application preferences" -msgstr "" - -#: ../midori/midori-browser.c:2421 -msgid "_View" -msgstr "_Widok" - -#: ../midori/midori-browser.c:2422 -msgid "_Toolbars" -msgstr "Paski _narzędziowe" - -#: ../midori/midori-browser.c:2434 -msgid "Increase the zoom level" -msgstr "Powiększ" - -#: ../midori/midori-browser.c:2437 -msgid "Decrease the zoom level" -msgstr "Zmniejsz" - -#: ../midori/midori-browser.c:2440 -msgid "Reset the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2442 -msgid "View Source" -msgstr "Ź_ródło strony" - -#: ../midori/midori-browser.c:2443 -msgid "View the source code of the page" -msgstr "Zobacz kod źródłowy strony" - -#: ../midori/midori-browser.c:2445 -msgid "View Selection Source" -msgstr "Pokaż źródło zaznaczenia" - -#: ../midori/midori-browser.c:2446 -msgid "View the source code of the selection" -msgstr "" - -#: ../midori/midori-browser.c:2449 -msgid "Toggle fullscreen view" -msgstr "Tryb pełnoekranowy" - -#: ../midori/midori-browser.c:2451 -msgid "_Go" -msgstr "P_rzejdź" - -#: ../midori/midori-browser.c:2454 -msgid "Go back to the previous page" -msgstr "Wróć do poprzedniej strony" - -#: ../midori/midori-browser.c:2457 -msgid "Go forward to the next page" -msgstr "Przejdź do następnej strony" - -#: ../midori/midori-browser.c:2460 -msgid "Go to your homepage" -msgstr "Przejdź do strony startowej" - -#: ../midori/midori-browser.c:2462 -msgid "Location..." -msgstr "_Położenie..." - -#: ../midori/midori-browser.c:2463 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:2465 -msgid "Web Search..." -msgstr "Znajdź w Internecie..." - -#: ../midori/midori-browser.c:2466 -msgid "Run a web search" -msgstr "" - -#: ../midori/midori-browser.c:2468 -msgid "Open in Page_holder..." -msgstr "" - -#: ../midori/midori-browser.c:2469 -msgid "Open the current page in the pageholder" -msgstr "" - -#: ../midori/midori-browser.c:2471 -msgid "Closed Tabs and Windows" -msgstr "Zamknięte karty i okna" - -#: ../midori/midori-browser.c:2472 -msgid "Reopen a previously closed tab or window" -msgstr "Otwórz wcześniej zamkniętą kartę lub okno" - -#: ../midori/midori-browser.c:2474 -msgid "Empty Trash" -msgstr "Opróżnij kosz" - -#: ../midori/midori-browser.c:2475 -msgid "Delete the contents of the trash" -msgstr "Usuń zawartość kosza" - -#: ../midori/midori-browser.c:2477 -msgid "Undo Close Tab" -msgstr "Cofnij zamknięcie karty" - -#: ../midori/midori-browser.c:2478 -msgid "Open the last closed tab" -msgstr "Otwórz ostatnio zamkniętą kartę" - -#: ../midori/midori-browser.c:2480 -msgid "_Bookmarks" -msgstr "_Zakładki" - -#: ../midori/midori-browser.c:2483 -msgid "Add a new bookmark" -msgstr "Dodaj nową zakładkę" - -#: ../midori/midori-browser.c:2485 -msgid "_Manage Bookmarks" -msgstr "_Modyfikuj zakładki" - -#: ../midori/midori-browser.c:2486 -msgid "Add, edit and remove bookmarks..." -msgstr "" - -#: ../midori/midori-browser.c:2489 -msgid "Open the selected bookmark" -msgstr "Otwórz wybraną zakładkę" - -#: ../midori/midori-browser.c:2491 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Otwórz odnośnik w nowej _karcie" -#: ../midori/midori-browser.c:2492 -msgid "Open the selected bookmark in a new tab" -msgstr "Otwórz wybraną zakładkę w nowej karcie" - -#: ../midori/midori-browser.c:2494 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Otwórz odnośnik w _nowym oknie" -#: ../midori/midori-browser.c:2495 -msgid "Open the selected bookmark in a new window" -msgstr "Otwórz wybraną zakładkę w nowym oknie" +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Separator" -#: ../midori/midori-browser.c:2498 +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2725 +#, fuzzy +msgid "Today" +msgstr "dni" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "Lekka przeglądarka internetowa" + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "Przemysław Sitek " + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Plik" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "_Nowe okno" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Nowa kar_ta" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "_Otwórz plik" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Zapi_sz stronę jako" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "_Zamknij kartę" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "Zamknij bieżącą kartę" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "Zamknij okno" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "Zamknij okno" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "Drukuj bieżącą stronę" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Za_kończ" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "_Edycja" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "Wytnij zaznaczony tekst" + +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "Skopiuj" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Wklej" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "Usuń zaznaczony tekst" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Zaznacz w_szystko" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "Znajdź słowa lub frazy na stronie" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "Znajdź poprzednie" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "Znajdź następne" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "Szybkie wyszukiwanie" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Widok" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "Paski _narzędziowe" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "Powiększ" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "Zmniejsz" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#, fuzzy +msgid "View _Source" +msgstr "Ź_ródło strony" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "Zobacz kod źródłowy strony" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Pokaż źródło zaznaczenia" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Tryb pełnoekranowy" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "P_rzejdź" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "Wróć do poprzedniej strony" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "Przejdź do następnej strony" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "Przejdź do strony startowej" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Opróżnij kosz" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "Usuń zawartość kosza" + +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Cofnij zamknięcie karty" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "Otwórz ostatnio zamkniętą kartę" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "Dodaj nową zakładkę" + +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Edytuj wybraną zakładkę" -#: ../midori/midori-browser.c:2501 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Skasuj wybraną zakładkę" -#: ../midori/midori-browser.c:2503 +#: ../midori/midori-browser.c:3185 +#, fuzzy +msgid "Delete the selected history item" +msgstr "Usuń zaznaczony tekst" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "Skopiuj" + +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Narzędzia" -#: ../midori/midori-browser.c:2505 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami" -#: ../midori/midori-browser.c:2506 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Zarządzaj wyszukiwarkami internetowymi..." -#: ../midori/midori-browser.c:2509 -msgid "_Window" -msgstr "_Okno" - -#: ../midori/midori-browser.c:2511 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../midori/midori-browser.c:2512 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Przełącz na poprzednią kartę" -#: ../midori/midori-browser.c:2514 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Następna karta" -#: ../midori/midori-browser.c:2515 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Przełącz na następną kartę" -#: ../midori/midori-browser.c:2517 -msgid "Tab _Overview" -msgstr "P_odgląd kart" - -#: ../midori/midori-browser.c:2518 -msgid "Show an overview of all open tabs" -msgstr "Pokaż wszystkie otwarte karty" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2520 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "Pomo_c" -#: ../midori/midori-browser.c:2522 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Zawartość" -#: ../midori/midori-browser.c:2523 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Pokaż dokumentację" -#: ../midori/midori-browser.c:2526 +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Pokaż informacje o programie" -#: ../midori/midori-browser.c:2532 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "P_rywatne przeglądanie" -#: ../midori/midori-browser.c:2533 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Nie zapisuj żadnych prywatnych danych podczas przeglądania" -#: ../midori/midori-browser.c:2536 -msgid "_Work Offline" -msgstr "Pracuj bez podłączenia" +#: ../midori/midori-browser.c:3231 +#, fuzzy +msgid "_Menubar" +msgstr "Pasek menu" -#: ../midori/midori-browser.c:2537 -msgid "Work without a network connection" -msgstr "" +#: ../midori/midori-browser.c:3232 +#, fuzzy +msgid "Show menubar" +msgstr "Pasek menu" -#: ../midori/midori-browser.c:2541 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:2542 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:2545 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Panel _boczny" -#: ../midori/midori-browser.c:2546 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:2549 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../midori/midori-browser.c:2550 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:2553 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Pasek pobierania plików" -#: ../midori/midori-browser.c:2554 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:2557 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../midori/midori-browser.c:2558 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Pokaż pasek stanu" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3669 +#, fuzzy +msgid "_Location..." +msgstr "_Położenie..." + +#: ../midori/midori-browser.c:3671 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3695 +#, fuzzy +msgid "_Web Search..." +msgstr "Znajdź w Internecie..." + +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Otwórz wcześniej zamkniętą kartę lub okno" + +#: ../midori/midori-browser.c:3729 +#, fuzzy +msgid "_Recently visited pages" +msgstr "Przechowuj adresy ostatnio odwiedzonych stron" + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Otwórz wybraną zakładkę" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Okno" + +#: ../midori/midori-browser.c:3761 +#, fuzzy +msgid "Show a list of all open tabs" +msgstr "Pokaż wszystkie otwarte karty" + +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Zakładki" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3074 -#: ../midori/midori-preferences.c:248 -msgid "Transfers" -msgstr "Pobierania plików" - -#: ../midori/midori-browser.c:3083 -msgid "Console" -msgstr "Konsola" - -#: ../midori/midori-browser.c:3090 -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Historia" -#: ../midori/midori-browser.c:3099 -msgid "Pageholder" -msgstr "" - -#: ../midori/midori-browser.c:3134 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "Wyszukaj:" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Uwzg_lędniaj wielkość liter" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:4012 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Zamknij" -#: ../midori/midori-browser.c:3382 -#: ../midori/midori-webview.c:556 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Niespodziewane ustawienie '%s'" -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "" - -#: ../midori/midori-panel.c:212 -#: ../midori/midori-panel.c:213 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Zamknij panel" -#: ../midori/midori-panel.c:391 -msgid "Untitled" -msgstr "Bez tytułu" - -#: ../midori/midori-trash.c:96 -msgid "Limit" -msgstr "Ograniczenie" - -#: ../midori/midori-trash.c:97 -msgid "The maximum number of items" -msgstr "" - -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Pusta strona" -#: ../midori/midori-websettings.c:133 -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Strona startowa" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Ostatnio otwarte strony" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Chiński tradycyjny (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Rosyjski (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Zachodni (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Dostosuj..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "nowej karcie" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "nowym oknie" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "bieżącej karcie" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Domyślnie" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Tylko ikony" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Tylko tekst" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Tekst pod ikonami" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Tekst obok ikon" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Wszystkie ciasteczka" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Ciasteczka sesji" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 msgid "None" msgstr "Żadne" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Pamiętaj ostatni rozmiar okna" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Ostatnia szerokość okna" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Ostatnia zapisana szerokość okna" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Ostatnia wysokość okna" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Ostatnia zapisana wysokość okna" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Ostatnia pozycja panelu" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Ostatnio zapisana pozycja panelu" -#: ../midori/midori-websettings.c:285 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "" +#: ../midori/midori-websettings.c:302 +#, fuzzy +msgid "Show Menubar" +msgstr "Pasek menu" + #: ../midori/midori-websettings.c:303 -msgid "Last pageholder URI" -msgstr "" +#, fuzzy +msgid "Whether to show the menubar" +msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:304 -msgid "The URI last opened in the pageholder" -msgstr "" - -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:323 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Pokaż panel" -#: ../midori/midori-websettings.c:333 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Pasek _stanu" -#: ../midori/midori-websettings.c:342 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Styl paska narzędzi" -#: ../midori/midori-websettings.c:361 -msgid "Small toolbar" +#: ../midori/midori-websettings.c:358 +#, fuzzy +msgid "Toolbar Items" +msgstr "Paski _narzędziowe" + +#: ../midori/midori-websettings.c:359 +#, fuzzy +msgid "The items to show on the toolbar" +msgstr "Styl paska narzędzi" + +#: ../midori/midori-websettings.c:367 +#, fuzzy +msgid "Compact Sidepanel" +msgstr "Panel _boczny" + +#: ../midori/midori-websettings.c:368 +msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:362 -msgid "Use small toolbar icons" -msgstr "" - -#: ../midori/midori-websettings.c:370 -msgid "Show New Tab" -msgstr "Pokazuj przycisk \"Nowa karta\"" - -#: ../midori/midori-websettings.c:371 -msgid "Show the New Tab button in the toolbar" -msgstr "Pokaż przycisk nowej karty na pasku narzędzi" - -#: ../midori/midori-websettings.c:379 -msgid "Show Homepage" -msgstr "Pokazuj stronę startową" - -#: ../midori/midori-websettings.c:380 -msgid "Show the Homepage button in the toolbar" -msgstr "Pokaż przycisk strony startowej na pasku narzędzi" - -#: ../midori/midori-websettings.c:388 -msgid "Show Web search" -msgstr "Pokazuj wyszukiwarki internetowe" - -#: ../midori/midori-websettings.c:389 -msgid "Show the Web search entry in the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:397 -msgid "Show Trash" -msgstr "Pokazuj kosz" - -#: ../midori/midori-websettings.c:398 -msgid "Show the Trash button in the toolbar" -msgstr "Pokaż kosz na pasku narzędzi" - -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Pokaż przy uruchomieniu" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Pokaż przy uruchomieniu" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Strona startowa" -#: ../midori/midori-websettings.c:427 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Katalog pobierania plików" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:436 -msgid "Show Download Notification" +#: ../midori/midori-websettings.c:405 +#, fuzzy +msgid "Download Manager" +msgstr "Katalog pobierania plików" + +#: ../midori/midori-websettings.c:406 +msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:437 -msgid "Show a notification window for finished downloads" -msgstr "Pokazuj powiadomienie dla zakończonych pobierań" +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Adres domyślnej wyszukiwarki internetowej" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Preferowane kodowanie znaków" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:466 -msgid "Tab Label Size" +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:467 -msgid "The desired tab label size" +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Pokazuj przyciski zamykania kart" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Otwieraj nowe strony w" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Otwieraj nowe strony w" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:473 +#, fuzzy +msgid "Open external pages in" +msgstr "Otwieraj nowe strony w" + +#: ../midori/midori-websettings.c:474 +#, fuzzy +msgid "Where to open externally opened pages" +msgstr "Otwieraj nowe strony w" + +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Środkowy przycisk myszy otwiera zaznaczoną stronę" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:501 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:502 +#, fuzzy +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Otwieraj nowe karty w tle" + +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Otwieraj wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Czy otwierać wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Akceptuj ciasteczka" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Przechowuj ciasteczka przez:" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Przechowuj adresy ostatnio odwiedzonych stron" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Przechowuj dane z formularzy" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Przechowuj informację o ostatnio pobranych plikach" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "Serwer proxy HTTP" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Rozmiar pamięci podręcznej" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-webview.c:198 -msgid "The icon of the currently loaded page" +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" msgstr "" -#: ../midori/midori-webview.c:207 -msgid "The URI of the currently loaded page" -msgstr "" - -#: ../midori/midori-webview.c:216 -msgid "The title of the currently loaded page" -msgstr "" - -#: ../midori/midori-webview.c:454 +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../midori/midori-webview.c:477 +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Otwórz URL w nowej karcie" -#: ../midori/midori-preferences.c:64 -msgid "Settings instance to provide properties" +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" msgstr "" +#: ../midori/midori-view.c:1503 +#, fuzzy +msgid "Source" +msgstr "Ź_ródło strony" + +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Pokaż dokumentację" + #: ../midori/midori-preferences.c:87 -#, c-format -msgid "%s Preferences" +#, fuzzy, c-format +msgid "Preferences for %s" msgstr "Preferencje %s" #. Page "General" -#: ../midori/midori-preferences.c:236 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Ogólne" -#: ../midori/midori-preferences.c:237 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Uruchomienie" #. Page "Appearance" -#: ../midori/midori-preferences.c:258 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Wygląd" -#: ../midori/midori-preferences.c:259 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Ustawienia czcionek" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:280 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Zachowanie" -#: ../midori/midori-preferences.c:281 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Treść" +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#, fuzzy +msgid "Enable scripts" +msgstr "Skrypty użytkownika" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interfejs" -#: ../midori/midori-preferences.c:345 +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Pasek narzędzi nawigacyjnych" + +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Przeglądanie" -#. Page "Network" -#: ../midori/midori-preferences.c:361 -#: ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Sieć" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:378 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Prywatność" -#: ../midori/midori-preferences.c:379 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Ciasteczka" -#: ../midori/midori-preferences.c:392 -#: ../midori/midori-preferences.c:402 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "dni" -#: ../midori/midori-webitem.c:70 -msgid "Name" -msgstr "Nazwa:" - -#: ../midori/midori-webitem.c:71 -msgid "The name of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:79 -msgid "Description" -msgstr "Opis:" - -#: ../midori/midori-webitem.c:80 -msgid "The description of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:88 -msgid "URI" -msgstr "URI" - -#: ../midori/midori-webitem.c:89 -msgid "The URI of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:97 -msgid "Icon" -msgstr "" - -#: ../midori/midori-webitem.c:98 -msgid "The icon of the web item" -msgstr "" - -#: ../midori/midori-webitem.c:106 -msgid "Token" -msgstr "" - -#: ../midori/midori-webitem.c:107 -msgid "The token of the web item" -msgstr "" - -#: ../midori/midori-searchentry.c:80 -msgid "Current Item" -msgstr "" - -#: ../midori/midori-searchentry.c:81 -msgid "The currently selected item" -msgstr "" - -#: ../midori/midori-searchentry.c:89 -msgid "Dialog" -msgstr "" - -#: ../midori/midori-searchentry.c:90 -msgid "A dialog to manage search engines" -msgstr "" - -#: ../midori/midori-searchentry.c:144 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Puste" -#: ../midori/midori-searchentry.c:520 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Dodaj wyszukiwarkę internetową" -#: ../midori/midori-searchentry.c:520 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Modyfikuj przeglądarkę internetową" -#: ../midori/midori-searchentry.c:547 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Nazwa:" -#: ../midori/midori-searchentry.c:591 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Ikona (nazwa albo plik):" -#: ../midori/midori-searchentry.c:605 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "" -#: ../midori/midori-searchentry.c:726 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "_Zarządzaj wyszukiwarkami" -#: ../midori/sokoke.c:294 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Uwaga: Używasz konta administratora!" -#: ../midori/sokoke.c:468 -#: ../katze/katze-xbel.c:952 -msgid "Writing failed." -msgstr "Zapis nie powiódł się" - -#: ../midori/gjs.c:90 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/gjs.c:310 -#: ../midori/gjs.c:384 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "" -#: ../midori/gjs.c:430 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:440 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../katze/katze-throbber.c:134 -msgid "Symbolic size to use for the animation" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Skrypty użytkownika" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" msgstr "" -#: ../katze/katze-throbber.c:143 -msgid "The name of an icon containing animation frames" +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" msgstr "" -#: ../katze/katze-throbber.c:152 -msgid "A GdkPixbuf containing animation frames" +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#, fuzzy +msgid "_Disable" +msgstr "_Plik" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsola" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Rozszerzenia" + +#: ../katze/katze-throbber.c:828 +#, fuzzy, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Sesja nie może być załadowana. %s\n" + +#: ../katze/katze-throbber.c:841 +#, fuzzy, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Sesja nie może być załadowana. %s\n" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-throbber.c:161 -msgid "Whether the throbber should be animated" -msgstr "" - -#: ../katze/katze-throbber.c:170 -msgid "The name of an icon to be used as the static image" -msgstr "" - -#: ../katze/katze-throbber.c:179 -msgid "A GdkPixbuf to be used as the static image" -msgstr "" - -#: ../katze/katze-throbber.c:188 -msgid "The stock ID of an icon to be used as the static image" -msgstr "" - -#: ../katze/katze-utils.c:137 -#: ../katze/katze-utils.c:297 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:159 -#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Wybierz plik" -#: ../katze/katze-utils.c:171 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Wybór katalogu" -#: ../katze/katze-xbel.c:723 -#: ../katze/katze-xbel.c:731 -#: ../katze/katze-xbel.c:767 -#: ../katze/katze-xbel.c:775 -#: ../katze/katze-xbel.c:804 -msgid "Malformed document." +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" msgstr "" -#: ../katze/katze-xbel.c:759 -msgid "File not found." -msgstr "Nie znaleziono dokumentu" +#: ../extensions/page-holder.c:128 +#, fuzzy +msgid "_Pageholder" +msgstr "_Folder:" +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Skrypty użytkownika" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" + +#~ msgid "Bookmark" +#~ msgstr "Zakładka" + +#~ msgid "_Form Fill" +#~ msgstr "Wypełnij _formularz" + +#~ msgid "Select _All" +#~ msgstr "Z_aznacz wszystko" + +#~ msgid "_Fullscreen" +#~ msgstr "Tryb _pełnoekranowy" + +#~ msgid "_Leave Fullscreen" +#~ msgstr "_Opuść tryb pełnoekranowy" + +#~ msgid "midori" +#~ msgstr "midori" + +#~ msgid "Unknown argument." +#~ msgstr "Nieznany argument" + +#~ msgid "Settings" +#~ msgstr "Ustawienia" + +#~ msgid "Trash" +#~ msgstr "Kosz" + +#~ msgid "Browser" +#~ msgstr "Przeglądarka" + +#~ msgid "The current browser" +#~ msgstr "Obecna przeglądarka" + +#~ msgid "Search Engines" +#~ msgstr "Wyszukiwarki" + +#~ msgid "The list of search engines" +#~ msgstr "Lista wyszukiwarek" + +#~ msgid "The navigationbar" +#~ msgstr "Pasek narzędzi nawigacyjnych" + +#~ msgid "Tab" +#~ msgstr "Karta" + +#~ msgid "The current tab" +#~ msgstr "Bieżącą karta" + +#~ msgid "Statusbar" +#~ msgstr "Pasek stanu" + +#~ msgid "The statusbar" +#~ msgstr "Pasek stanu" + +#~ msgid "Statusbar Text" +#~ msgstr "Tekst paska stanu" + +#~ msgid "The text that is displayed in the statusbar" +#~ msgstr "Tekst wyświetlany na pasku stanu" + +#~ msgid "Pa_ge Setup" +#~ msgstr "_Ustawienia strony" + +#~ msgid "Show a preview of the printed page" +#~ msgstr "Pokaż podgląd drukowanej strony" + +#~ msgid "Undo the last modification" +#~ msgstr "Cofnij" + +#~ msgid "Redo the last modification" +#~ msgstr "Przywróć" + +#~ msgid "_Manage Bookmarks" +#~ msgstr "_Modyfikuj zakładki" + +#~ msgid "Open the selected bookmark in a new tab" +#~ msgstr "Otwórz wybraną zakładkę w nowej karcie" + +#~ msgid "Open the selected bookmark in a new window" +#~ msgstr "Otwórz wybraną zakładkę w nowym oknie" + +#~ msgid "Tab _Overview" +#~ msgstr "P_odgląd kart" + +#~ msgid "_Work Offline" +#~ msgstr "Pracuj bez podłączenia" + +#~ msgid "Untitled" +#~ msgstr "Bez tytułu" + +#~ msgid "Limit" +#~ msgstr "Ograniczenie" + +#~ msgid "Show New Tab" +#~ msgstr "Pokazuj przycisk \"Nowa karta\"" + +#~ msgid "Show the New Tab button in the toolbar" +#~ msgstr "Pokaż przycisk nowej karty na pasku narzędzi" + +#~ msgid "Show Homepage" +#~ msgstr "Pokazuj stronę startową" + +#~ msgid "Show the Homepage button in the toolbar" +#~ msgstr "Pokaż przycisk strony startowej na pasku narzędzi" + +#~ msgid "Show Web search" +#~ msgstr "Pokazuj wyszukiwarki internetowe" + +#~ msgid "Show Trash" +#~ msgstr "Pokazuj kosz" + +#~ msgid "Show the Trash button in the toolbar" +#~ msgstr "Pokaż kosz na pasku narzędzi" + +#~ msgid "Show a notification window for finished downloads" +#~ msgstr "Pokazuj powiadomienie dla zakończonych pobierań" + +#~ msgid "Name" +#~ msgstr "Nazwa:" + +#~ msgid "Description" +#~ msgstr "Opis:" diff --git a/po/ru.po b/po/ru.po index 594222c5..03b1f955 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-10 23:33+0200\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-09-10 00:35+0300\n" "Last-Translator: Troitskiy Nikita \n" "Language-Team: Russian \n" @@ -19,8 +19,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный обозреватель интернет" -#: ../midori.desktop.in.h:2 ../midori/main.c:1063 ../midori/main.c:1073 -#: ../midori/main.c:1103 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -28,1584 +28,1508 @@ msgstr "Midori" msgid "Web Browser" msgstr "Обозреватель интернет" -#: ../midori/main.c:66 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "Закладка" -#: ../midori/main.c:67 ../midori/midori-browser.c:3353 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/main.c:68 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Добавить закладку" -#: ../midori/main.c:69 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Консоль" -#: ../midori/main.c:70 -msgid "_Disable" -msgstr "" - -#: ../midori/main.c:71 -msgid "_Enable" -msgstr "" - -#: ../midori/main.c:72 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/main.c:73 +#: ../midori/main.c:91 msgid "_History" msgstr "_История" -#: ../midori/main.c:74 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "Домашняя страница" -#: ../midori/main.c:75 -msgid "_Pageholder" -msgstr "" - -#: ../midori/main.c:76 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Скрипты пользователя" -#: ../midori/main.c:77 +#: ../midori/main.c:94 msgid "User_styles" msgstr "_Стили пользователя" -#: ../midori/main.c:78 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Новая Вкладка" -#: ../midori/main.c:79 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/main.c:80 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Закрытые вкладки и окна" -#: ../midori/main.c:81 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Новое окно" -#: ../midori/main.c:83 -msgid "Select _All" -msgstr "Пометить всё" - -#: ../midori/main.c:86 -msgid "_Fullscreen" -msgstr "Полноэкранный режим" - -#: ../midori/main.c:87 -msgid "_Leave Fullscreen" -msgstr "Выйти из полноэкранного режима" - -#: ../midori/main.c:138 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "Настройки не могут быть загружены. %s\n" -#: ../midori/main.c:193 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение '%s' недействительно для %s" -#: ../midori/main.c:200 ../midori/main.c:269 -#, c-format -msgid "Unhandled settings value '%s'" +#: ../midori/main.c:205 ../midori/main.c:275 +#, fuzzy, c-format +msgid "Invalid configuration value '%s'" msgstr "Неподдерживаемое значение параметра %s" -#: ../midori/main.c:524 ../midori/main.c:532 ../midori/main.c:562 -#: ../midori/main.c:571 -msgid "Malformed document." -msgstr "Плохо сформированный документ" - -#: ../midori/main.c:554 +#: ../midori/main.c:532 msgid "File not found." msgstr "Файл не найден" -#: ../midori/main.c:591 ../midori/main.c:623 +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Плохо сформированный документ" + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format -msgid "Error opening database: %s\n" +msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:677 +#: ../midori/main.c:657 #, c-format -msgid "Failed to remove history item. %s\n" +msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:701 +#: ../midori/main.c:681 #, c-format -msgid "Failed to clear history. %s\n" +msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:734 ../midori/main.c:749 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format -msgid "Failed to add history item. %s\n" +msgid "Failed to add history item: %s\n" msgstr "" -#: ../midori/main.c:978 ../midori/sokoke.c:474 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Запись завершилась неудачей" -#: ../midori/main.c:1003 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Передачи" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сессия не может быть сохранена. %s" -#: ../midori/main.c:1032 -msgid "Internal identifier" +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1034 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1036 +#: ../midori/main.c:1301 msgid "URIs" msgstr "" -#: ../midori/main.c:1070 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "" -#: ../midori/main.c:1104 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и соббщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1106 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:1139 +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Midory уже запущен, но неотвечает.\n" -#: ../midori/main.c:1173 -#, c-format -msgid "The bookmarks couldn't be loaded. %s\n" +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Закладки не могут быть загружены %s\n" -#: ../midori/main.c:1187 -#, c-format -msgid "The session couldn't be loaded. %s\n" +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" msgstr "Сессия не может быть загружена. %s\n" -#: ../midori/main.c:1199 -#, c-format -msgid "The trash couldn't be loaded. %s\n" +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" msgstr "Корзина не может быть загружена. %s\n" -#: ../midori/main.c:1209 -#, c-format -msgid "The history couldn't be loaded. %s\n" -msgstr "" +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Корзина не может быть загружена. %s\n" -#: ../midori/main.c:1221 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Обнаружены следующе ошибки:" -#: ../midori/main.c:1375 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Средства поиска не могут быть сохранены. %s" -#: ../midori/main.c:1385 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Закладки не могут быть сохранены. %s" -#: ../midori/main.c:1394 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Корзина не может быть сохранена. %s" -#: ../midori/main.c:1402 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Конфигурация не может быть сохранена. %s" -#: ../midori/midori-app.c:128 ../midori/midori-browser.c:1033 -#: ../midori/midori-view.c:392 ../midori/midori-preferences.c:61 -msgid "Settings" -msgstr "Установки" - -#: ../midori/midori-app.c:129 ../midori/midori-browser.c:1034 -#: ../midori/midori-view.c:393 -msgid "The associated settings" -msgstr "" - -#: ../midori/midori-app.c:137 ../midori/midori-browser.c:1050 -#: ../midori/midori-browser.c:3510 -msgid "Bookmarks" -msgstr "Закладки" - -#: ../midori/midori-app.c:138 ../midori/midori-browser.c:1051 -msgid "The bookmarks folder, containing all bookmarks" -msgstr "" - -#: ../midori/midori-app.c:146 ../midori/midori-browser.c:1069 -msgid "Trash" -msgstr "Корзина" - -#: ../midori/midori-app.c:147 ../midori/midori-browser.c:1070 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Корзина. Сохраняет закрытые вкладки и окна" - -#: ../midori/midori-app.c:155 ../midori/midori-browser.c:1086 -#: ../midori/midori-searchaction.c:168 -msgid "Search Engines" -msgstr "Средства поиска" - -#: ../midori/midori-app.c:156 ../midori/midori-searchaction.c:169 -msgid "The list of search engines" -msgstr "Список средств поиска" - -#: ../midori/midori-app.c:164 -msgid "Browser" -msgstr "Обозреватель" - -#: ../midori/midori-app.c:165 -msgid "The current browser" -msgstr "Данный браузер" - -#: ../midori/midori-app.c:173 -msgid "Browser Count" -msgstr "" - -#: ../midori/midori-app.c:174 -msgid "The current number of browsers" -msgstr "Текущее число обозревателей" - -#: ../midori/midori-app.c:182 ../midori/midori-browser.c:1103 -#: ../midori/midori-browser.c:3564 -msgid "History" -msgstr "История" - -#: ../midori/midori-app.c:183 ../midori/midori-browser.c:1104 -msgid "The list of history items" -msgstr "" - -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Ни один" - -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3597 -msgid "Extensions" -msgstr "Дополнения" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3580 -msgid "Userscripts" -msgstr "Скрипты пользователя" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3588 -msgid "Userstyles" -msgstr "Стили пользователя" - -#: ../midori/midori-addons.c:115 -msgid "Web Widget" -msgstr "" - -#: ../midori/midori-addons.c:116 -msgid "The assigned web widget" -msgstr "" - -#: ../midori/midori-addons.c:124 -msgid "Kind" -msgstr "Тип" - -#: ../midori/midori-addons.c:125 -msgid "The kind of addons" -msgstr "Тип дополнения" - -#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2884 -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:272 ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:331 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% загружен" -#: ../midori/midori-browser.c:355 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие '%s'." -#: ../midori/midori-browser.c:514 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:514 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Редактировать закладку" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:549 ../midori/midori-searchaction.c:819 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:568 ../midori/midori-searchaction.c:833 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:588 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Root" -#: ../midori/midori-browser.c:958 -msgid "Menubar" -msgstr "Вкладка меню" - -#: ../midori/midori-browser.c:959 -msgid "The menubar" -msgstr "Вкладка меню" - -#: ../midori/midori-browser.c:967 ../midori/midori-preferences.c:341 -msgid "Navigationbar" -msgstr "Панель навигации" - -#: ../midori/midori-browser.c:968 -msgid "The navigationbar" -msgstr "Панель навигации" - -#: ../midori/midori-browser.c:976 ../katze/katze-item.c:92 -msgid "URI" -msgstr "URI" - -#: ../midori/midori-browser.c:977 -msgid "The current URI" -msgstr "Данная URI" - -#: ../midori/midori-browser.c:985 -msgid "Tab" -msgstr "Вкладка" - -#: ../midori/midori-browser.c:986 -msgid "The current tab" -msgstr "Данная вкладка" - -#: ../midori/midori-browser.c:994 -msgid "Statusbar" -msgstr "Панель состояния" - -#: ../midori/midori-browser.c:995 -msgid "The statusbar" -msgstr "Панель состояния" - -#: ../midori/midori-browser.c:1014 ../midori/midori-view.c:383 -msgid "Statusbar Text" -msgstr "Текст вкладки статуса" - -#: ../midori/midori-browser.c:1015 -msgid "The text that is displayed in the statusbar" -msgstr "Текст отображаемый во вкладке статуса" - -#: ../midori/midori-browser.c:1087 -msgid "The list of search engines to be used for web search" -msgstr "Список средств поиска используемые для поиска в сети" - -#: ../midori/midori-browser.c:2219 -msgid "Separator" -msgstr "Разделитель" - -#: ../midori/midori-browser.c:2473 -msgid "A lightweight web browser." -msgstr "Легковесный·веб·браузер" - -#: ../midori/midori-browser.c:2481 -msgid "translator-credits" -msgstr "" -"Troitskiy Nikita " - -#: ../midori/midori-browser.c:2752 -msgid "Are you sure you want to remove all history items?" -msgstr "" - -#: ../midori/midori-browser.c:2819 -msgid "_File" -msgstr "_Файл" - -#: ../midori/midori-browser.c:2822 -msgid "Open a new window" -msgstr "Открыть в новом окне" - -#: ../midori/midori-browser.c:2825 -msgid "Open a new tab" -msgstr "Открыть в новой вкладке" - -#: ../midori/midori-browser.c:2828 -msgid "Open a file" -msgstr "Открыть файл" - -#: ../midori/midori-browser.c:2831 -msgid "Save to a file" +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:2833 -msgid "_Close Tab" -msgstr "Закрыть вкладку" +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "Открыть файл" -#: ../midori/midori-browser.c:2834 -msgid "Close the current tab" -msgstr "Закрыть данную вкладку" - -#: ../midori/midori-browser.c:2836 -msgid "C_lose Window" -msgstr "Закрыть окно" - -#: ../midori/midori-browser.c:2837 -msgid "Close this window" -msgstr "Закрыть данное окно" - -#: ../midori/midori-browser.c:2840 -msgid "Print the current page" -msgstr "Распечатать страницу" - -#: ../midori/midori-browser.c:2843 -msgid "Quit the application" -msgstr "Закрыть приложение" - -#: ../midori/midori-browser.c:2845 -msgid "_Edit" -msgstr "_Правка" - -#: ../midori/midori-browser.c:2848 -msgid "Cut the selected text" -msgstr "Вырезать выделенный текст" - -#: ../midori/midori-browser.c:2851 ../midori/midori-browser.c:2854 -msgid "Copy the selected text" -msgstr "Копировать выделенный текст" - -#: ../midori/midori-browser.c:2857 -msgid "Paste text from the clipboard" -msgstr "Вставить текст из буфера обмена" - -#: ../midori/midori-browser.c:2860 -msgid "Delete the selected text" -msgstr "Удалить выделенный текст" - -#: ../midori/midori-browser.c:2863 -msgid "Select all text" -msgstr "Выделить весь текст" - -#: ../midori/midori-browser.c:2866 -msgid "Find a word or phrase in the page" -msgstr "Поиск слова или фразы на странице" - -#: ../midori/midori-browser.c:2868 -msgid "Find _Next" -msgstr "Найти _Дальше" - -#: ../midori/midori-browser.c:2869 -msgid "Find the next occurrence of a word or phrase" -msgstr "Найти следующее местонахождение слова или фразы" - -#: ../midori/midori-browser.c:2871 -msgid "Find _Previous" -msgstr "Найти Предыдущее" - -#: ../midori/midori-browser.c:2872 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Найти предыдущее местонахождение слова или фразы" - -#: ../midori/midori-browser.c:2874 -msgid "_Quick Find" -msgstr "_Быстрый Поиск" - -#: ../midori/midori-browser.c:2875 -msgid "Quickly jump to a word or phrase" -msgstr "Перепрыгнуть на слово или фразу" - -#: ../midori/midori-browser.c:2878 -msgid "Configure the application preferences" -msgstr "Настройка приложения" - -#: ../midori/midori-browser.c:2880 -msgid "_View" -msgstr "_Вид" - -#: ../midori/midori-browser.c:2881 -msgid "_Toolbars" -msgstr "_Панели инструментов" - -#: ../midori/midori-browser.c:2893 -msgid "Increase the zoom level" -msgstr "Увеличить масштаб" - -#: ../midori/midori-browser.c:2896 -msgid "Decrease the zoom level" -msgstr "Уменьшить масштаб" - -#: ../midori/midori-browser.c:2899 -msgid "Reset the zoom level" -msgstr "Сбросить значение масштаба" - -#: ../midori/midori-browser.c:2901 ../midori/midori-view.c:1397 -msgid "View _Source" -msgstr "Просмотр исходного кода" - -#: ../midori/midori-browser.c:2902 -msgid "View the source code of the page" -msgstr "Просмотр исходного кода страницы" - -#: ../midori/midori-browser.c:2904 -msgid "View Selection Source" -msgstr "Просмотр исходного кода выделеного фрагмента" - -#: ../midori/midori-browser.c:2905 -msgid "View the source code of the selection" -msgstr "Просмотр исходного кода выделенного фрагмента" - -#: ../midori/midori-browser.c:2908 -msgid "Toggle fullscreen view" -msgstr "Переключить полноэкранный режим" - -#: ../midori/midori-browser.c:2910 -msgid "_Go" -msgstr "_Журнал" - -#: ../midori/midori-browser.c:2913 -msgid "Go back to the previous page" -msgstr "На предыдущую страницу" - -#: ../midori/midori-browser.c:2916 -msgid "Go forward to the next page" -msgstr "На следующую страницу" - -#: ../midori/midori-browser.c:2919 -msgid "Go to your homepage" -msgstr "На домашнюю страницу" - -#: ../midori/midori-browser.c:2921 -msgid "Open in Page_holder..." -msgstr "" - -#: ../midori/midori-browser.c:2922 -msgid "Open the current page in the pageholder" -msgstr "" - -#: ../midori/midori-browser.c:2924 -msgid "Empty Trash" -msgstr "Очистить" - -#: ../midori/midori-browser.c:2925 -msgid "Delete the contents of the trash" -msgstr "Очистить содержимое корзины" - -#. FIXME: Make this sensitive only when there is a tab to undo -#: ../midori/midori-browser.c:2927 ../midori/midori-view.c:1372 -msgid "Undo Close Tab" -msgstr "Отменить закрытие вкладок" - -#: ../midori/midori-browser.c:2928 -msgid "Open the last closed tab" -msgstr "Открыть последнюю закрытую вкладку" - -#: ../midori/midori-browser.c:2932 -msgid "Add a new bookmark" -msgstr "Новая закладка" - -#: ../midori/midori-browser.c:2935 -msgid "Open the selected bookmark" -msgstr "Открыть закладку" - -#: ../midori/midori-browser.c:2937 ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Открыть в новой _Вкладка" -#: ../midori/midori-browser.c:2938 -msgid "Open the selected bookmark in a new tab" -msgstr "Открыть выбранные закладки в новых вкладках" - -#: ../midori/midori-browser.c:2940 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2941 -msgid "Open the selected bookmark in a new window" -msgstr "Открыть выбранные закладки в новом окне" +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Разделитель" -#: ../midori/midori-browser.c:2944 +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "Легковесный·веб·браузер" + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "Troitskiy Nikita " + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Файл" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "Открыть в новом окне" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Открыть в новой вкладке" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "Открыть файл" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Сохранить в файл" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "Закрыть вкладку" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "Закрыть данную вкладку" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "Закрыть окно" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "Закрыть данное окно" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "Распечатать страницу" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Закрыть приложение" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "_Правка" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "Вырезать выделенный текст" + +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "Копировать выделенный текст" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Вставить текст из буфера обмена" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "Удалить выделенный текст" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Выделить весь текст" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "Поиск слова или фразы на странице" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "Найти _Дальше" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "Найти следующее местонахождение слова или фразы" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "Найти Предыдущее" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Найти предыдущее местонахождение слова или фразы" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "_Быстрый Поиск" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "Перепрыгнуть на слово или фразу" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "Настройка приложения" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Вид" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "_Панели инструментов" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "Увеличить масштаб" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "Уменьшить масштаб" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "Сбросить значение масштаба" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +msgid "View _Source" +msgstr "Просмотр исходного кода" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "Просмотр исходного кода страницы" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Просмотр исходного кода выделеного фрагмента" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "Просмотр исходного кода выделенного фрагмента" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Переключить полноэкранный режим" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "_Журнал" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "На предыдущую страницу" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "На следующую страницу" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "На домашнюю страницу" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Очистить" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "Очистить содержимое корзины" + +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Отменить закрытие вкладок" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "Открыть последнюю закрытую вкладку" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "Новая закладка" + +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../midori/midori-browser.c:2947 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:2953 -msgid "Clear the enitre history" +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:2956 -msgid "Open the selected history item" -msgstr "" +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:2959 -msgid "Open the selected history item in a new tab" -msgstr "" - -#: ../midori/midori-browser.c:2960 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Сервис" -#: ../midori/midori-browser.c:2962 ../midori/midori-searchaction.c:458 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:2967 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:2968 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:2970 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:2971 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:2973 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:2975 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:2976 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:2978 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:2981 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:2996 +#: ../midori/midori-browser.c:3231 +#, fuzzy +msgid "_Menubar" +msgstr "Вкладка меню" + +#: ../midori/midori-browser.c:3232 +#, fuzzy +msgid "Show menubar" +msgstr "Вкладка меню" + +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Панель навигации" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3000 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Боковая _панель" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Панель закладок" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3008 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Панель передачи" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3012 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Панель состояния" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Положение..." -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3323 ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или она" -#: ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3339 -msgid "Revisit pages that you opened before" +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3369 -msgid "Window" -msgstr "" +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Открыть закладку" -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:3759 +#, fuzzy +msgid "_Window" +msgstr "Новое окно" + +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3517 ../midori/midori-preferences.c:276 -msgid "Transfers" -msgstr "Передачи" +#: ../midori/midori-browser.c:3883 +msgid "Bookmarks" +msgstr "Закладки" -#: ../midori/midori-browser.c:3526 -msgid "Console" -msgstr "Консоль" +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +msgid "History" +msgstr "История" -#: ../midori/midori-browser.c:3571 -msgid "Pageholder" -msgstr "" - -#: ../midori/midori-browser.c:3620 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "_Встроенный поиск:" -#: ../midori/midori-browser.c:3655 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Условие совпадения" -#: ../midori/midori-browser.c:3663 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3672 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр '%s'" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "Тип тени" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Внешний вид тени вокруг панели" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "Меню" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Управление содержимым панелей" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "Страница" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:130 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Последние закрытые страницы" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-r)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Западная (ISO-8859-1)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Дополнительно..." -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "По-умолчанию" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:186 ../midori/midori-searchaction.c:186 -#: ../katze/katze-item.c:83 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Все куки" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Куки сессии" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Ни один" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Запомнить размер последнего окна" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Запомнить последний размер окна" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" -#: ../midori/midori-websettings.c:278 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:296 -msgid "Last pageholder URI" -msgstr "" +#: ../midori/midori-websettings.c:302 +#, fuzzy +msgid "Show Menubar" +msgstr "Вкладка меню" -#: ../midori/midori-websettings.c:297 -msgid "The URI last opened in the pageholder" -msgstr "" +#: ../midori/midori-websettings.c:303 +#, fuzzy +msgid "Whether to show the menubar" +msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Показать вкладку статуса" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Стиль панель инструментов" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:354 -msgid "Always Show Tabbar" -msgstr "" +#: ../midori/midori-websettings.c:358 +#, fuzzy +msgid "Toolbar Items" +msgstr "Стиль панель инструментов" -#: ../midori/midori-websettings.c:355 -msgid "Always show the tabbar" -msgstr "" +#: ../midori/midori-websettings.c:359 +#, fuzzy +msgid "The items to show on the toolbar" +msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:363 -msgid "Show New Tab" -msgstr "Показать новую вкладку" +#: ../midori/midori-websettings.c:367 +#, fuzzy +msgid "Compact Sidepanel" +msgstr "Боковая _панель" -#: ../midori/midori-websettings.c:364 -msgid "Show the New Tab button in the toolbar" -msgstr "Показать кнопку Новая Вкладка в панели инструментов" +#: ../midori/midori-websettings.c:368 +#, fuzzy +msgid "Whether to make the sidepanel compact" +msgstr "Показывать панель" -#: ../midori/midori-websettings.c:372 -msgid "Show Homepage" -msgstr "Показать домашнюю страницу" - -#: ../midori/midori-websettings.c:373 -msgid "Show the Homepage button in the toolbar" -msgstr "Показать кнопку Домашняя Страница в панели инструментов" - -#: ../midori/midori-websettings.c:381 -msgid "Show Web search" -msgstr "Показать поиск" - -#: ../midori/midori-websettings.c:382 -msgid "Show the Web search entry in the toolbar" -msgstr "Показывать запись сетевого поиска в панели инструментов" - -#: ../midori/midori-websettings.c:390 -msgid "Show Trash" -msgstr "Показать корзину" - -#: ../midori/midori-websettings.c:391 -msgid "Show the Trash button in the toolbar" -msgstr "Показать кнопку Корзина в панели инструментов" - -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который сохранялись файлы" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Администратор загрузок" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Открыть новую страницу в" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Где открыть новую страницу в" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:473 +#, fuzzy +msgid "Open external pages in" +msgstr "Открыть новую страницу в" + +#: ../midori/midori-websettings.c:474 +#, fuzzy +msgid "Where to open externally opened pages" +msgstr "Где открыть новую страницу в" + +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Действие по нажатию средней кнопки мыши" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Загружать выделенный URL средней кнопкой" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Открывать в следующей за данной вкладке" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Разрешить куки" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Тип принимаемых cookies" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Максимальный возраст cookies" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения cookies" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Запомнить страницы последних посещений" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Максимальный возраст истории" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения истории" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Использовать маленькие изображения в панели инструментов" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние данные формы" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Запомнить последние скачанные файлы" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP прокси" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Прокси сервер для HTTP соединений" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Размер кеша" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Разрешённый размер кеша" -#: ../midori/midori-view.c:103 -msgid "Load Provisional" +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:104 -msgid "Load Committed" -msgstr "" - -#: ../midori/midori-view.c:105 -msgid "Load Finished" -msgstr "Загрузка завершена" - -#: ../midori/midori-view.c:315 -msgid "Socket ID" -msgstr "" - -#: ../midori/midori-view.c:316 -msgid "The ID of a socket" -msgstr "" - -#: ../midori/midori-view.c:326 -msgid "Uri" -msgstr "" - -#: ../midori/midori-view.c:327 -msgid "The URI of the currently loaded page" -msgstr "URI загруженной страницы" - -#: ../midori/midori-view.c:335 -msgid "Title" -msgstr "" - -#: ../midori/midori-view.c:336 -msgid "The title of the currently loaded page" -msgstr "Заголовок загруженной страницы" - -#: ../midori/midori-view.c:344 ../katze/katze-item.c:101 -msgid "Icon" -msgstr "Значок" - -#: ../midori/midori-view.c:345 -msgid "The icon of the view" -msgstr "" - -#: ../midori/midori-view.c:353 -msgid "Load Status" -msgstr "" - -#: ../midori/midori-view.c:354 -msgid "The current loading status" -msgstr "Статус загрузки" - -#: ../midori/midori-view.c:363 -msgid "Progress" -msgstr "" - -#: ../midori/midori-view.c:364 -msgid "The current loading progress" -msgstr "Процесс загрузки" - -#: ../midori/midori-view.c:372 -msgid "Zoom Level" -msgstr "" - -#: ../midori/midori-view.c:373 -msgid "The current zoom level" -msgstr "" - -#: ../midori/midori-view.c:384 -msgid "The text displayed in the statusbar" -msgstr "" - -#: ../midori/midori-view.c:1310 +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _Вкладке" -#: ../midori/midori-view.c:1334 -msgid "Download Link with Download _Manager" -msgstr "Загрузить с помощью администратора загрузок" +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" -#: ../midori/midori-view.c:1356 +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Открыть URL в новой _Вкладке" -#: ../midori/midori-view.c:1841 +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Исходный код" -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "" +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Документация" -#: ../midori/midori-preferences.c:82 -#, c-format -msgid "%s Preferences" +#: ../midori/midori-preferences.c:87 +#, fuzzy, c-format +msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:264 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:265 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Настройки шрифта" +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:319 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:320 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Возможности" +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#, fuzzy +msgid "Enable scripts" +msgstr "Скрипты пользователя" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:340 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:356 +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Панель навигации" + +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Навигация" -#. Page "Network" -#: ../midori/midori-preferences.c:374 ../midori/midori-preferences.c:375 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "" -#: ../midori/midori-searchaction.c:177 -msgid "Current Item" +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" msgstr "" -#: ../midori/midori-searchaction.c:178 -msgid "The currently selected item" +#: ../midori/midori-preferences.c:500 +#, fuzzy +msgid "Web Cookies" +msgstr "Разрешить куки" + +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:187 -msgid "The current text typed in the entry" -msgstr "" - -#: ../midori/midori-searchaction.c:195 -msgid "Dialog" -msgstr "Диалог" - -#: ../midori/midori-searchaction.c:196 -msgid "A dialog to manage search engines" -msgstr "Диалог управления средствами поиска" - -#: ../midori/midori-searchaction.c:449 ../katze/katze-arrayaction.c:256 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:775 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:775 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:803 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:847 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Значок (имя файла):" -#: ../midori/midori-searchaction.c:861 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1038 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Управление средствами поиска" -#: ../midori/sokoke.c:86 ../midori/sokoke.c:98 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Не могу выполнить внешнюю программу." -#: ../midori/sokoke.c:300 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Внимание: Вы используете привилегированную учётную запись" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s не обладает свойством '%s'" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s не может быть назначен для %s.%s" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s недоступен" -#: ../katze/katze-throbber.c:134 -msgid "Icon size" -msgstr "Размер значков" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Скрипты пользователя" -#: ../katze/katze-throbber.c:135 -msgid "Symbolic size to use for the animation" +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Стили пользователя" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" msgstr "" -#: ../katze/katze-throbber.c:143 -msgid "Icon Name" -msgstr "Имя иконки" - -#: ../katze/katze-throbber.c:144 -msgid "The name of an icon containing animation frames" -msgstr "Имя иконки содержащей анимационные рамки" - -#: ../katze/katze-throbber.c:152 -msgid "Pixbuf" +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" msgstr "" -#: ../katze/katze-throbber.c:153 -msgid "A GdkPixbuf containing animation frames" -msgstr "" +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Консоль" -#: ../katze/katze-throbber.c:161 -msgid "Animated" -msgstr "" +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Дополнения" -#: ../katze/katze-throbber.c:162 -msgid "Whether the throbber should be animated" -msgstr "" - -#: ../katze/katze-throbber.c:170 -msgid "Static Icon Name" -msgstr "" - -#: ../katze/katze-throbber.c:171 -msgid "The name of an icon to be used as the static image" -msgstr "Имя иконки для статичного изобрадения" - -#: ../katze/katze-throbber.c:179 -msgid "Static Pixbuf" -msgstr "" - -#: ../katze/katze-throbber.c:180 -msgid "A GdkPixbuf to be used as the static image" -msgstr "" - -#: ../katze/katze-throbber.c:188 -msgid "Static Stock ID" -msgstr "" - -#: ../katze/katze-throbber.c:189 -msgid "The stock ID of an icon to be used as the static image" -msgstr "" - -#: ../katze/katze-throbber.c:807 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:820 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:843 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "Значок '%s' не может быть загружен" - -#: ../katze/katze-throbber.c:875 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Анимационные рамки неисправны" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:322 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Значение '%s' недействительно для %s" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Выберите каталог" -#: ../katze/katze-item.c:74 -msgid "Name" -msgstr "Имя" - -#: ../katze/katze-item.c:75 -msgid "The name of the item" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" msgstr "" -#: ../katze/katze-item.c:84 -msgid "The descriptive text of the item" -msgstr "Описание пункта" - -#: ../katze/katze-item.c:93 -msgid "The URI of the item" +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" msgstr "" -#: ../katze/katze-item.c:102 -msgid "The icon of the item" +#: ../extensions/statusbar-features.c:30 +#, fuzzy +msgid "Images" +msgstr "Страница" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Скрипты пользователя" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" msgstr "" -#: ../katze/katze-item.c:110 -msgid "Token" -msgstr "Признак" +#~ msgid "Select _All" +#~ msgstr "Пометить всё" -#: ../katze/katze-item.c:111 -msgid "The token of the item" -msgstr "" +#~ msgid "_Fullscreen" +#~ msgstr "Полноэкранный режим" -#: ../katze/katze-item.c:119 -msgid "Added" -msgstr "" +#~ msgid "_Leave Fullscreen" +#~ msgstr "Выйти из полноэкранного режима" -#: ../katze/katze-item.c:120 -msgid "When the item was added" -msgstr "" +#~ msgid "Settings" +#~ msgstr "Установки" -#: ../katze/katze-item.c:128 -msgid "Visits" -msgstr "" +#~ msgid "Trash" +#~ msgstr "Корзина" -#: ../katze/katze-item.c:129 -msgid "The number of visits of the item" -msgstr "" +#~ msgid "The trash, collecting recently closed tabs and windows" +#~ msgstr "Корзина. Сохраняет закрытые вкладки и окна" -#: ../katze/katze-arrayaction.c:123 -msgid "Array" -msgstr "" +#~ msgid "Search Engines" +#~ msgstr "Средства поиска" -#: ../katze/katze-arrayaction.c:124 -msgid "The array the action represents" -msgstr "" +#~ msgid "The list of search engines" +#~ msgstr "Список средств поиска" + +#~ msgid "Browser" +#~ msgstr "Обозреватель" + +#~ msgid "The current browser" +#~ msgstr "Данный браузер" + +#~ msgid "The current number of browsers" +#~ msgstr "Текущее число обозревателей" + +#~ msgid "Kind" +#~ msgstr "Тип" + +#~ msgid "The kind of addons" +#~ msgstr "Тип дополнения" + +#~ msgid "The navigationbar" +#~ msgstr "Панель навигации" + +#~ msgid "URI" +#~ msgstr "URI" + +#~ msgid "The current URI" +#~ msgstr "Данная URI" + +#~ msgid "Tab" +#~ msgstr "Вкладка" + +#~ msgid "The current tab" +#~ msgstr "Данная вкладка" + +#~ msgid "Statusbar" +#~ msgstr "Панель состояния" + +#~ msgid "The statusbar" +#~ msgstr "Панель состояния" + +#~ msgid "Statusbar Text" +#~ msgstr "Текст вкладки статуса" + +#~ msgid "The text that is displayed in the statusbar" +#~ msgstr "Текст отображаемый во вкладке статуса" + +#~ msgid "The list of search engines to be used for web search" +#~ msgstr "Список средств поиска используемые для поиска в сети" + +#~ msgid "Open the selected bookmark in a new tab" +#~ msgstr "Открыть выбранные закладки в новых вкладках" + +#~ msgid "Open the selected bookmark in a new window" +#~ msgstr "Открыть выбранные закладки в новом окне" + +#~ msgid "Shadow Type" +#~ msgstr "Тип тени" + +#~ msgid "Appearance of the shadow around each panel" +#~ msgstr "Внешний вид тени вокруг панели" + +#~ msgid "Menu" +#~ msgstr "Меню" + +#~ msgid "Menu to hold panel items" +#~ msgstr "Управление содержимым панелей" + +#~ msgid "Show New Tab" +#~ msgstr "Показать новую вкладку" + +#~ msgid "Show the New Tab button in the toolbar" +#~ msgstr "Показать кнопку Новая Вкладка в панели инструментов" + +#~ msgid "Show Homepage" +#~ msgstr "Показать домашнюю страницу" + +#~ msgid "Show the Homepage button in the toolbar" +#~ msgstr "Показать кнопку Домашняя Страница в панели инструментов" + +#~ msgid "Show Web search" +#~ msgstr "Показать поиск" + +#~ msgid "Show the Web search entry in the toolbar" +#~ msgstr "Показывать запись сетевого поиска в панели инструментов" + +#~ msgid "Show Trash" +#~ msgstr "Показать корзину" + +#~ msgid "Show the Trash button in the toolbar" +#~ msgstr "Показать кнопку Корзина в панели инструментов" + +#~ msgid "Load Finished" +#~ msgstr "Загрузка завершена" + +#~ msgid "The URI of the currently loaded page" +#~ msgstr "URI загруженной страницы" + +#~ msgid "The title of the currently loaded page" +#~ msgstr "Заголовок загруженной страницы" + +#~ msgid "Icon" +#~ msgstr "Значок" + +#~ msgid "The current loading status" +#~ msgstr "Статус загрузки" + +#~ msgid "The current loading progress" +#~ msgstr "Процесс загрузки" + +#~ msgid "Download Link with Download _Manager" +#~ msgstr "Загрузить с помощью администратора загрузок" + +#~ msgid "Dialog" +#~ msgstr "Диалог" + +#~ msgid "A dialog to manage search engines" +#~ msgstr "Диалог управления средствами поиска" + +#~ msgid "Icon size" +#~ msgstr "Размер значков" + +#~ msgid "Icon Name" +#~ msgstr "Имя иконки" + +#~ msgid "The name of an icon containing animation frames" +#~ msgstr "Имя иконки содержащей анимационные рамки" + +#~ msgid "The name of an icon to be used as the static image" +#~ msgstr "Имя иконки для статичного изобрадения" + +#~ msgid "Icon '%s' couldn't be loaded" +#~ msgstr "Значок '%s' не может быть загружен" + +#~ msgid "Name" +#~ msgstr "Имя" + +#~ msgid "The descriptive text of the item" +#~ msgstr "Описание пункта" + +#~ msgid "Token" +#~ msgstr "Признак" diff --git a/po/sv.po b/po/sv.po index b7e1718b..3096a930 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-26 00:20+0200\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-03-23 21:05+0100\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: Swedish\n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Liten webbläsare" -#: ../midori.desktop.in.h:2 ../midori/main.c:408 ../midori/main.c:417 -#: ../midori/main.c:419 ../midori/main.c:433 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -29,1459 +29,1457 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbläsare" -#: ../midori/main.c:52 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Bokmärk" -#: ../midori/main.c:53 ../midori/midori-browser.c:2829 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Bokmärken" -#: ../midori/main.c:54 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:55 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konsol" -#: ../midori/main.c:56 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "" -#: ../midori/main.c:57 +#: ../midori/main.c:91 msgid "_History" msgstr "_Historia" -#: ../midori/main.c:58 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Hemsida" -#: ../midori/main.c:59 -msgid "_Pageholder" -msgstr "_Sidhållare" - -#: ../midori/main.c:60 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Beskrivning" -#: ../midori/main.c:61 +#: ../midori/main.c:94 msgid "User_styles" msgstr "" -#: ../midori/main.c:62 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Ny _tabb" -#: ../midori/main.c:63 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Överföringar" -#: ../midori/main.c:64 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Stängda tabbar och fönster" -#: ../midori/main.c:65 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Nytt _fönster" -#: ../midori/main.c:67 -msgid "Select _All" -msgstr "Välj _alla" - -#: ../midori/main.c:70 -msgid "_Fullscreen" -msgstr "_Fullskärm" - -#: ../midori/main.c:71 -msgid "_Leave Fullscreen" -msgstr "_Lämna fullskärm" - -#: ../midori/main.c:122 -#, c-format -msgid "The configuration couldn't be loaded. %s\n" +#: ../midori/main.c:143 +#, fuzzy, c-format +msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurationsfilen kunde inte laddas. %s\n" -#: ../midori/main.c:177 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:184 ../midori/main.c:253 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format -msgid "Unhandled settings value '%s'" +msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:368 +#: ../midori/main.c:532 +msgid "File not found." +msgstr "Fil saknas." + +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Felaktigt dokument." + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format -msgid "The session couldn't be saved. %s" -msgstr "Sessionen kunde inte sparad. %s" - -#: ../midori/main.c:396 -msgid "Display program version" -msgstr "Visa programversion" - -#: ../midori/main.c:413 -msgid "[URL]" -msgstr "[URL]" - -#: ../midori/main.c:417 -msgid "Unknown argument." +msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:419 -msgid "Failed to setup interface." -msgstr "" - -#: ../midori/main.c:434 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" - -#: ../midori/main.c:436 -msgid "Check for new versions at:" -msgstr "Leta efter nya verioner på:" - -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:467 +#: ../midori/main.c:657 #, c-format -msgid "An instance of Midori is already running but not responding.\n" +msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:501 +#: ../midori/main.c:681 #, c-format -msgid "The bookmarks couldn't be loaded. %s\n" -msgstr "Bokmärkena kunde inte laddas. %s\n" +msgid "Failed to clear history: %s\n" +msgstr "" -#: ../midori/main.c:515 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format -msgid "The session couldn't be loaded. %s\n" -msgstr "Sessionen kunde inte laddas. %s\n" +msgid "Failed to add history item: %s\n" +msgstr "" -#: ../midori/main.c:527 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 #, c-format -msgid "The trash couldn't be loaded. %s\n" -msgstr "Papperskorgen kunde inte laddas. %s\n" - -#: ../midori/main.c:539 -msgid "The following errors occured:" -msgstr "Följande fel inträffade:" - -#: ../midori/main.c:688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Sökmotorer kunde inte sparad. %s" - -#: ../midori/main.c:698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Bokmärkena kunde inte sparad. %s" - -#: ../midori/main.c:707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Papperskorgen kunde inte sparad. %s" - -#: ../midori/main.c:715 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Konfigurationsfilen kunde inte sparad. %s" - -#: ../midori/midori-app.c:123 ../midori/midori-browser.c:1281 -msgid "Settings" -msgstr "Inställningar" - -#: ../midori/midori-app.c:124 ../midori/midori-browser.c:1282 -msgid "The associated settings" -msgstr "De associerade inställningarna" - -#: ../midori/midori-app.c:132 ../midori/midori-browser.c:1320 -msgid "Trash" -msgstr "Papperskorgen" - -#: ../midori/midori-app.c:133 ../midori/midori-browser.c:1321 -msgid "The trash, collecting recently closed tabs and windows" -msgstr "Soptunnan, samlar senast stängda tabbar och fönster" - -#: ../midori/midori-app.c:141 -msgid "Browser" -msgstr "Bläsare" - -#: ../midori/midori-app.c:142 -msgid "The current browser" -msgstr "" - -#: ../midori/midori-app.c:150 -msgid "Browser Count" -msgstr "" - -#: ../midori/midori-app.c:151 -msgid "The current number of browsers" -msgstr "" - -#: ../midori/midori-app.c:159 ../midori/midori-browser.c:1334 -#: ../midori/midori-searchentry.c:65 -msgid "Search Engines" -msgstr "Sökmotorer" - -#: ../midori/midori-app.c:160 ../midori/midori-searchentry.c:66 -msgid "The list of search engines" -msgstr "" - -#: ../midori/midori-addons.c:85 ../midori/midori-websettings.c:205 -msgid "None" -msgstr "Inga" - -#: ../midori/midori-addons.c:86 ../midori/midori-browser.c:3511 -msgid "Extensions" -msgstr "" - -#: ../midori/midori-addons.c:87 ../midori/midori-browser.c:3494 -msgid "Userscripts" -msgstr "" - -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3502 -msgid "Userstyles" -msgstr "" - -#: ../midori/midori-addons.c:113 -msgid "Web Widget" -msgstr "" - -#: ../midori/midori-addons.c:114 -msgid "The assigned web widget" -msgstr "" - -#: ../midori/midori-addons.c:122 -msgid "Kind" -msgstr "" - -#: ../midori/midori-addons.c:123 -msgid "The kind of addons" -msgstr "" - -#: ../midori/midori-browser.c:192 -msgid "Source" -msgstr "Källkod" - -#: ../midori/midori-browser.c:273 ../midori/midori-browser.c:2776 -#: ../midori/midori-browser.c:2782 -msgid "Reload the current page" -msgstr "Ladda om sidan" - -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:2779 -msgid "Stop loading the current page" -msgstr "Sluta ladda sidan" - -#: ../midori/midori-browser.c:349 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% laddat" - -#: ../midori/midori-browser.c:573 -msgid "New bookmark" -msgstr "Nytt bokmärke" - -#: ../midori/midori-browser.c:573 -msgid "Edit bookmark" -msgstr "Redigera bokmärke" - -#: ../midori/midori-browser.c:597 -msgid "_Title:" -msgstr "_Titel:" - -#: ../midori/midori-browser.c:610 ../midori/midori-searchentry.c:566 -msgid "_Description:" -msgstr "_Beskrivning" - -#: ../midori/midori-browser.c:629 ../midori/midori-searchentry.c:580 -msgid "_URL:" -msgstr "_URL:" - -#: ../midori/midori-browser.c:646 -msgid "_Folder:" -msgstr "_Mapp:" - -#: ../midori/midori-browser.c:650 -msgid "Root" -msgstr "Rot" - -#: ../midori/midori-browser.c:1082 -#, c-format -msgid "Unexpected action '%s'." -msgstr "" - -#: ../midori/midori-browser.c:1228 -msgid "Menubar" -msgstr "" - -#: ../midori/midori-browser.c:1229 -msgid "The menubar" -msgstr "" - -#: ../midori/midori-browser.c:1237 ../midori/midori-preferences.c:374 -msgid "Navigationbar" -msgstr "Navigeringsfält" - -#: ../midori/midori-browser.c:1238 -msgid "The navigationbar" -msgstr "" - -#: ../midori/midori-browser.c:1246 ../katze/katze-item.c:90 -msgid "URI" -msgstr "" - -#: ../midori/midori-browser.c:1247 -msgid "The current URI" -msgstr "" - -#: ../midori/midori-browser.c:1255 -msgid "Tab" -msgstr "" - -#: ../midori/midori-browser.c:1256 -msgid "The current tab" -msgstr "" - -#: ../midori/midori-browser.c:1264 -msgid "Statusbar" -msgstr "Statusrad" - -#: ../midori/midori-browser.c:1265 -msgid "The statusbar" -msgstr "" - -#: ../midori/midori-browser.c:1301 -msgid "Statusbar Text" -msgstr "" - -#: ../midori/midori-browser.c:1302 ../midori/midori-webview.c:264 -msgid "The text that is displayed in the statusbar" -msgstr "Texten som visas i statusraden" - -#: ../midori/midori-browser.c:1335 -msgid "The list of search engines to be used for web search" -msgstr "" - -#: ../midori/midori-browser.c:2313 -msgid "Separator" -msgstr "Avskiljare" - -#: ../midori/midori-browser.c:2478 -msgid "A lightweight web browser." -msgstr "En liten webbläsare." - -#: ../midori/midori-browser.c:2486 -msgid "translator-credits" -msgstr "Mikael Magnusson " - -#: ../midori/midori-browser.c:2699 -msgid "_File" -msgstr "_Fil" - -#: ../midori/midori-browser.c:2702 -msgid "Open a new window" -msgstr "Öppna i nytt fönster" - -#: ../midori/midori-browser.c:2705 -msgid "Open a new tab" -msgstr "Öppna i ny tabb" - -#: ../midori/midori-browser.c:2708 -msgid "Open a file" -msgstr "Öppna en fil" - -#: ../midori/midori-browser.c:2711 -msgid "Save to a file" -msgstr "Spara till fil" - -#: ../midori/midori-browser.c:2713 -msgid "_Close Tab" -msgstr "_Stäng tabb" - -#: ../midori/midori-browser.c:2714 -msgid "Close the current tab" -msgstr "Stäng den här tabben" - -#: ../midori/midori-browser.c:2716 -msgid "C_lose Window" -msgstr "S_täng fönster" - -#: ../midori/midori-browser.c:2717 -msgid "Close this window" -msgstr "Stäng det här fönstret" - -#: ../midori/midori-browser.c:2719 -msgid "Pa_ge Setup" -msgstr "_Sidinställningar" - -#: ../midori/midori-browser.c:2723 -msgid "Show a preview of the printed page" -msgstr "" - -#: ../midori/midori-browser.c:2726 -msgid "Print the current page" -msgstr "" - -#: ../midori/midori-browser.c:2729 -msgid "Quit the application" -msgstr "Avsluta programmet" - -#: ../midori/midori-browser.c:2731 -msgid "_Edit" -msgstr "_Redigera" - -#: ../midori/midori-browser.c:2734 -msgid "Undo the last modification" -msgstr "Ångra senaste ändringen" - -#: ../midori/midori-browser.c:2737 -msgid "Redo the last modification" -msgstr "Gör om senaste ändringen" - -#: ../midori/midori-browser.c:2740 -msgid "Cut the selected text" -msgstr "Klippa ut markerad text" - -#: ../midori/midori-browser.c:2743 ../midori/midori-browser.c:2746 -msgid "Copy the selected text" -msgstr "Kopiera markerad text" - -#: ../midori/midori-browser.c:2749 -msgid "Paste text from the clipboard" -msgstr "Klistra in text från klippbordet" - -#: ../midori/midori-browser.c:2752 -msgid "Delete the selected text" -msgstr "Ta bort markerad text" - -#: ../midori/midori-browser.c:2755 -msgid "Select all text" -msgstr "Markera all text" - -#: ../midori/midori-browser.c:2758 -msgid "Find a word or phrase in the page" -msgstr "" - -#: ../midori/midori-browser.c:2760 -msgid "Find _Next" -msgstr "Hitta _nästa" - -#: ../midori/midori-browser.c:2761 -msgid "Find the next occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2763 -msgid "Find _Previous" -msgstr "Hitta _förra" - -#: ../midori/midori-browser.c:2764 -msgid "Find the previous occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2766 -msgid "_Quick Find" -msgstr "_Snabbsök" - -#: ../midori/midori-browser.c:2767 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:2770 -msgid "Configure the application preferences" -msgstr "" - -#: ../midori/midori-browser.c:2772 -msgid "_View" -msgstr "_Visa" - -#: ../midori/midori-browser.c:2773 -msgid "_Toolbars" -msgstr "_Verktygsfält" - -#: ../midori/midori-browser.c:2785 -msgid "Increase the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2788 -msgid "Decrease the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2791 -msgid "Reset the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:2793 -msgid "View _Source" -msgstr "Visa _källkod" - -#: ../midori/midori-browser.c:2794 -msgid "View the source code of the page" -msgstr "" - -#: ../midori/midori-browser.c:2796 -msgid "View Selection Source" -msgstr "Visa källkod för markering" - -#: ../midori/midori-browser.c:2797 -msgid "View the source code of the selection" -msgstr "" - -#: ../midori/midori-browser.c:2800 -msgid "Toggle fullscreen view" -msgstr "Växla fullskärmsläge" - -#: ../midori/midori-browser.c:2802 -msgid "_Go" -msgstr "_Gå" - -#: ../midori/midori-browser.c:2805 -msgid "Go back to the previous page" -msgstr "" - -#: ../midori/midori-browser.c:2808 -msgid "Go forward to the next page" -msgstr "" - -#: ../midori/midori-browser.c:2811 -msgid "Go to your homepage" -msgstr "" - -#: ../midori/midori-browser.c:2813 -msgid "_Web Search..." -msgstr "_Webbsökning..." - -#: ../midori/midori-browser.c:2814 -msgid "Run a web search" -msgstr "" - -#: ../midori/midori-browser.c:2816 -msgid "Open in Page_holder..." -msgstr "Visa i sid_hållare..." - -#: ../midori/midori-browser.c:2817 -msgid "Open the current page in the pageholder" -msgstr "" - -#. N_("Reopen a previously closed tab or window"), G_CALLBACK (_action_trash_activate) }, -#: ../midori/midori-browser.c:2821 -msgid "Reopen a previously closed tab or window" -msgstr "Öppna en tidigare stängd tabb eller fönster" - -#: ../midori/midori-browser.c:2823 -msgid "Empty Trash" -msgstr "Töm papperskorgen" - -#: ../midori/midori-browser.c:2824 -msgid "Delete the contents of the trash" -msgstr "" - -#: ../midori/midori-browser.c:2826 -msgid "Undo Close Tab" -msgstr "Ångra stäng tabb" - -#: ../midori/midori-browser.c:2827 -msgid "Open the last closed tab" -msgstr "" - -#: ../midori/midori-browser.c:2832 -msgid "Add a new bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2834 -msgid "_Manage Bookmarks" -msgstr "_Hantera bokmärken" - -#: ../midori/midori-browser.c:2835 -msgid "Add, edit and remove bookmarks..." -msgstr "Lägg till, ändra och ta bort bokmärken..." - -#: ../midori/midori-browser.c:2838 -msgid "Open the selected bookmark" -msgstr "Kopiera markerad bokmärke" - -#: ../midori/midori-browser.c:2840 -msgid "Open in New _Tab" -msgstr "Öppna i ny _tabb" - -#: ../midori/midori-browser.c:2841 -msgid "Open the selected bookmark in a new tab" -msgstr "" - -#: ../midori/midori-browser.c:2843 -msgid "Open in New _Window" -msgstr "Öppna i nytt _fönster" - -#: ../midori/midori-browser.c:2844 -msgid "Open the selected bookmark in a new window" -msgstr "" - -#: ../midori/midori-browser.c:2847 -msgid "Edit the selected bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2850 -msgid "Delete the selected bookmark" -msgstr "Ta bort markerad bokmärke" - -#: ../midori/midori-browser.c:2852 -msgid "_Tools" -msgstr "_Verktyg" - -#: ../midori/midori-browser.c:2854 ../midori/midori-searchentry.c:160 -msgid "_Manage Search Engines" -msgstr "_Hantera sökmotorer" - -#: ../midori/midori-browser.c:2855 -msgid "Add, edit and remove search engines..." -msgstr "Lägg till, ändra och ta bort sökmotorer..." - -#: ../midori/midori-browser.c:2858 -msgid "_Window" -msgstr "_Fönster" - -#: ../midori/midori-browser.c:2860 -msgid "_Previous Tab" -msgstr "_Föregående tabb" - -#: ../midori/midori-browser.c:2861 -msgid "Switch to the previous tab" -msgstr "" - -#: ../midori/midori-browser.c:2863 -msgid "_Next Tab" -msgstr "_Nästa tabb" - -#: ../midori/midori-browser.c:2864 -msgid "Switch to the next tab" -msgstr "" - -#: ../midori/midori-browser.c:2866 -msgid "Tab _Overview" -msgstr "Tabbö_versikt" - -#: ../midori/midori-browser.c:2867 -msgid "Show an overview of all open tabs" -msgstr "" - -#. G_CALLBACK (_action_tab_overview_activate) -#: ../midori/midori-browser.c:2869 -msgid "_Help" -msgstr "_Hjälp" - -#: ../midori/midori-browser.c:2871 -msgid "_Contents" -msgstr "_Innehåll" - -#: ../midori/midori-browser.c:2872 -msgid "Show the documentation" -msgstr "" - -#: ../midori/midori-browser.c:2875 -msgid "Show information about the program" -msgstr "" - -#: ../midori/midori-browser.c:2881 -msgid "P_rivate Browsing" -msgstr "P_rivat läge" - -#: ../midori/midori-browser.c:2882 -msgid "Don't save any private data while browsing" -msgstr "" - -#: ../midori/midori-browser.c:2885 -msgid "_Work Offline" -msgstr "_Arbeta offline" - -#: ../midori/midori-browser.c:2886 -msgid "Work without a network connection" -msgstr "" - -#: ../midori/midori-browser.c:2890 -msgid "_Navigationbar" -msgstr "_Navigationsfält" - -#: ../midori/midori-browser.c:2891 -msgid "Show navigationbar" -msgstr "Visa navigeringsfält" - -#: ../midori/midori-browser.c:2894 -msgid "Side_panel" -msgstr "Sido_panel" - -#: ../midori/midori-browser.c:2895 -msgid "Show sidepanel" -msgstr "Visa sido_panel" - -#: ../midori/midori-browser.c:2898 -msgid "_Bookmarkbar" -msgstr "_Bokmärkesfält" - -#: ../midori/midori-browser.c:2899 -msgid "Show bookmarkbar" -msgstr "Visa bokmärkesfält" - -#: ../midori/midori-browser.c:2902 -msgid "_Transferbar" -msgstr "Ö_verföringsfält" - -#: ../midori/midori-browser.c:2903 -msgid "Show transferbar" -msgstr "Visa statusrad" - -#: ../midori/midori-browser.c:2906 -msgid "_Statusbar" -msgstr "_Statusrad" - -#: ../midori/midori-browser.c:2907 -msgid "Show statusbar" -msgstr "Visa statusrad" - -#: ../midori/midori-browser.c:3228 -msgid "_Location..." -msgstr "_Plats..." - -#: ../midori/midori-browser.c:3230 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:3453 -msgid "Bookmarks" -msgstr "Bokmärken" - -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3460 ../midori/midori-preferences.c:279 -msgid "Transfers" -msgstr "Överföringar" - -#: ../midori/midori-browser.c:3469 -msgid "Console" -msgstr "Konsol" - -#: ../midori/midori-browser.c:3476 -msgid "History" -msgstr "Historia" - -#: ../midori/midori-browser.c:3485 -msgid "Pageholder" -msgstr "Sidhållare" - -#: ../midori/midori-browser.c:3534 -msgid "_Inline find:" -msgstr "_Snabbsökning:" - -#: ../midori/midori-browser.c:3569 -msgid "Match Case" -msgstr "_Gör skillnad på skiftläge" - -#: ../midori/midori-browser.c:3586 -msgid "Close Findbar" -msgstr "Stäng sökfältet" - -#: ../midori/midori-browser.c:3817 -#, c-format -msgid "Unexpected setting '%s'" +msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/midori-panel.c:146 -msgid "Shadow Type" -msgstr "" - -#: ../midori/midori-panel.c:147 -msgid "Appearance of the shadow around each panel" -msgstr "Utseende på skuggan runt varje panel" - -#: ../midori/midori-panel.c:156 -msgid "Menu" -msgstr "" - -#: ../midori/midori-panel.c:157 -msgid "Menu to hold panel items" -msgstr "Meny för att visa panelföremål" - -#: ../midori/midori-panel.c:165 -msgid "Page" -msgstr "" - -#: ../midori/midori-panel.c:166 -msgid "The index of the current page" -msgstr "Indexet för nuvarande sida" - -#: ../midori/midori-panel.c:206 ../midori/midori-panel.c:207 -msgid "Close panel" -msgstr "Stäng panel" - -#: ../midori/midori-websettings.c:130 -msgid "Blank page" -msgstr "Tom sida" - -#: ../midori/midori-websettings.c:131 ../midori/midori-websettings.c:402 -msgid "Homepage" -msgstr "Hemsida" - -#: ../midori/midori-websettings.c:132 -msgid "Last open pages" -msgstr "" - -#: ../midori/midori-websettings.c:147 -msgid "Chinese (BIG5)" -msgstr "Kinesiska (BIG5)" - -#: ../midori/midori-websettings.c:148 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japanska (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:149 -msgid "Russian (KOI8-R)" -msgstr "Ryska (KOI8-R)" - -#: ../midori/midori-websettings.c:150 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:151 -msgid "Western (ISO-8859-1)" -msgstr "Västerländsk (ISO-8859-1)" - -#: ../midori/midori-websettings.c:152 -msgid "Custom..." -msgstr "" - -#: ../midori/midori-websettings.c:167 -msgid "New tab" -msgstr "Ny tabb" - -#: ../midori/midori-websettings.c:168 -msgid "New window" -msgstr "Nytt fönster" - -#: ../midori/midori-websettings.c:169 -msgid "Current tab" -msgstr "Nuvarande tabb" - -#: ../midori/midori-websettings.c:184 -msgid "Default" -msgstr "Standard" - -#: ../midori/midori-websettings.c:185 -msgid "Icons" -msgstr "Ikoner" - -#: ../midori/midori-websettings.c:186 ../katze/katze-item.c:81 -msgid "Text" -msgstr "Text" - -#: ../midori/midori-websettings.c:187 -msgid "Both" -msgstr "Både och" - -#: ../midori/midori-websettings.c:188 -msgid "Both horizontal" -msgstr "Båda horisontellt" - -#: ../midori/midori-websettings.c:203 -msgid "All cookies" -msgstr "Alla kakor" - -#: ../midori/midori-websettings.c:204 -msgid "Session cookies" -msgstr "Sessionskakor" - -#: ../midori/midori-websettings.c:242 -msgid "Remember last window size" -msgstr "" - -#: ../midori/midori-websettings.c:243 -msgid "Whether to save the last window size" -msgstr "" - -#: ../midori/midori-websettings.c:251 -msgid "Last window width" -msgstr "" - -#: ../midori/midori-websettings.c:252 -msgid "The last saved window width" -msgstr "" - -#: ../midori/midori-websettings.c:260 -msgid "Last window height" -msgstr "" - -#: ../midori/midori-websettings.c:261 -msgid "The last saved window height" -msgstr "" - -#: ../midori/midori-websettings.c:269 -msgid "Last panel position" -msgstr "" - -#: ../midori/midori-websettings.c:270 -msgid "The last saved panel position" -msgstr "" - -#: ../midori/midori-websettings.c:278 -msgid "Last panel page" -msgstr "" - -#: ../midori/midori-websettings.c:279 -msgid "The last saved panel page" -msgstr "" - -#: ../midori/midori-websettings.c:287 -msgid "Last Web search" -msgstr "" - -#: ../midori/midori-websettings.c:288 -msgid "The last saved Web search" -msgstr "" - -#: ../midori/midori-websettings.c:296 -msgid "Last pageholder URI" -msgstr "" - -#: ../midori/midori-websettings.c:297 -msgid "The URI last opened in the pageholder" -msgstr "" - -#: ../midori/midori-websettings.c:307 -msgid "Show Navigationbar" -msgstr "Visa Navigeringsfält" - -#: ../midori/midori-websettings.c:308 -msgid "Whether to show the navigationbar" -msgstr "" - -#: ../midori/midori-websettings.c:316 -msgid "Show Bookmarkbar" -msgstr "Visa Bokmärkesfält" - -#: ../midori/midori-websettings.c:317 -msgid "Whether to show the bookmarkbar" -msgstr "" - -#: ../midori/midori-websettings.c:325 -msgid "Show Panel" -msgstr "Visa Sidopanel" - -#: ../midori/midori-websettings.c:326 -msgid "Whether to show the panel" -msgstr "" - -#: ../midori/midori-websettings.c:334 -msgid "Show Statusbar" -msgstr "Visa Statusrad" - -#: ../midori/midori-websettings.c:335 -msgid "Whether to show the statusbar" -msgstr "" - -#: ../midori/midori-websettings.c:344 -msgid "Toolbar Style" -msgstr "Stil för verktygsfält" - -#: ../midori/midori-websettings.c:345 -msgid "The style of the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:354 -msgid "Show New Tab" -msgstr "Visa Ny tabb" - -#: ../midori/midori-websettings.c:355 -msgid "Show the New Tab button in the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:363 -msgid "Show Homepage" -msgstr "Visa Hemsida" - -#: ../midori/midori-websettings.c:364 -msgid "Show the Homepage button in the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:372 -msgid "Show Web search" -msgstr "Visa Webbsökning" - -#: ../midori/midori-websettings.c:373 -msgid "Show the Web search entry in the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:381 -msgid "Show Trash" -msgstr "Visa Papperskorgen" - -#: ../midori/midori-websettings.c:382 -msgid "Show the Trash button in the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:392 -msgid "Load on Startup" -msgstr "Ladda vid uppstart" - -#: ../midori/midori-websettings.c:393 -msgid "What to load on startup" -msgstr "" - -#: ../midori/midori-websettings.c:403 -msgid "The homepage" -msgstr "" - -#: ../midori/midori-websettings.c:411 -msgid "Download Folder" -msgstr "Nedladdningsmapp" - -#: ../midori/midori-websettings.c:412 -msgid "The folder downloaded files are saved to" -msgstr "" - -#: ../midori/midori-websettings.c:420 -msgid "Download Manager" -msgstr "" - -#: ../midori/midori-websettings.c:421 -msgid "An external download manager" -msgstr "" - -#: ../midori/midori-websettings.c:429 -msgid "Location entry Search" -msgstr "Sökmotor för Addressfältet" - -#: ../midori/midori-websettings.c:430 -msgid "The search to perform inside the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:438 -msgid "Preferred Encoding" -msgstr "" - -#: ../midori/midori-websettings.c:439 -msgid "The preferred character encoding" -msgstr "" - -#: ../midori/midori-websettings.c:450 -msgid "Tab Label Size" -msgstr "Tabbstorlek" - -#: ../midori/midori-websettings.c:451 -msgid "The desired tab label size" -msgstr "Önskad storlek på tabbetikett" - -#: ../midori/midori-websettings.c:459 -msgid "Close Buttons on Tabs" -msgstr "Stängknappar på tabbar" - -#: ../midori/midori-websettings.c:460 -msgid "Whether tabs have close buttons" -msgstr "Ifall tabbar har stängknappar" - -#: ../midori/midori-websettings.c:468 -msgid "Open new pages in" -msgstr "Öppna nya sidor i" - -#: ../midori/midori-websettings.c:469 -msgid "Where to open new pages" -msgstr "" - -#: ../midori/midori-websettings.c:478 -msgid "Middle click opens Selection" -msgstr "Mittenklick öppnar markering" - -#: ../midori/midori-websettings.c:479 -msgid "Load an URL from the selection via middle click" -msgstr "Ladda en URL från markeringen via mittenklick" - -#: ../midori/midori-websettings.c:487 -msgid "Open tabs in the background" -msgstr "Öppna tabbar i bakgrunden" - -#: ../midori/midori-websettings.c:488 -msgid "Whether to open new tabs in the background" -msgstr "" - -#: ../midori/midori-websettings.c:496 -msgid "Open Tabs next to Current" -msgstr "" - -#: ../midori/midori-websettings.c:497 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" - -#: ../midori/midori-websettings.c:505 -msgid "Open popups in tabs" -msgstr "Öppna popups i tabbar" - -#: ../midori/midori-websettings.c:506 -msgid "Whether to open popup windows in tabs" -msgstr "" - -#: ../midori/midori-websettings.c:516 -msgid "Accept cookies" -msgstr "Acceptera kakor" - -#: ../midori/midori-websettings.c:517 -msgid "What type of cookies to accept" -msgstr "" - -#: ../midori/midori-websettings.c:526 -msgid "Original cookies only" -msgstr "" - -#: ../midori/midori-websettings.c:527 -msgid "Accept cookies from the original website only" -msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" - -#: ../midori/midori-websettings.c:535 -msgid "Maximum cookie age" -msgstr "Maximal kakålder" - -#: ../midori/midori-websettings.c:536 -msgid "The maximum number of days to save cookies for" -msgstr "" - -#: ../midori/midori-websettings.c:546 -msgid "Remember last visited pages" -msgstr "" - -#: ../midori/midori-websettings.c:547 -msgid "Whether the last visited pages are saved" -msgstr "" - -#: ../midori/midori-websettings.c:555 -msgid "Maximum history age" -msgstr "" - -#: ../midori/midori-websettings.c:556 -msgid "The maximum number of days to save the history for" -msgstr "" - -#: ../midori/midori-websettings.c:564 -msgid "Remember last form inputs" -msgstr "" - -#: ../midori/midori-websettings.c:565 -msgid "Whether the last form inputs are saved" -msgstr "" - -#: ../midori/midori-websettings.c:573 -msgid "Remember last downloaded files" -msgstr "" - -#: ../midori/midori-websettings.c:574 -msgid "Whether the last downloaded files are saved" -msgstr "" - -#: ../midori/midori-websettings.c:584 -msgid "HTTP Proxy" -msgstr "" - -#: ../midori/midori-websettings.c:585 -msgid "The proxy used for HTTP connections" -msgstr "" - -#: ../midori/midori-websettings.c:593 -msgid "Cache size" -msgstr "Cache-storlek" - -#: ../midori/midori-websettings.c:594 -msgid "The allowed size of the cache" -msgstr "" - -#: ../midori/midori-webview.c:64 -msgid "Load Provisional" -msgstr "" - -#: ../midori/midori-webview.c:65 -msgid "Load Committed" -msgstr "" - -#: ../midori/midori-webview.c:66 -msgid "Load Finished" -msgstr "" - -#: ../midori/midori-webview.c:224 -msgid "The URI of the currently loaded page" -msgstr "URIn för den laddade sidan" - -#: ../midori/midori-webview.c:234 -msgid "The title of the currently loaded page" -msgstr "Titeln för den laddade sidan" - -#: ../midori/midori-webview.c:244 -msgid "The current loading progress" -msgstr "" - -#: ../midori/midori-webview.c:253 -msgid "The current loading status" -msgstr "" - -#: ../midori/midori-webview.c:695 -msgid "Open Link in New _Tab" -msgstr "Öppna länk i ny _tabb" - -#: ../midori/midori-webview.c:723 -msgid "Download Link with Download _Manager" -msgstr "" - -#: ../midori/midori-webview.c:741 -msgid "Open URL in New _Tab" -msgstr "Öppna URL i ny _tabb" - -#: ../midori/midori-preferences.c:62 -msgid "Settings instance to provide properties" -msgstr "" - -#: ../midori/midori-preferences.c:84 -#, c-format -msgid "%s Preferences" -msgstr "%s inställningar" - -#. Page "General" -#: ../midori/midori-preferences.c:267 -msgid "General" -msgstr "Allmänt" - -#: ../midori/midori-preferences.c:268 -msgid "Startup" -msgstr "Uppstart" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:301 -msgid "Appearance" -msgstr "Utseende" - -#: ../midori/midori-preferences.c:302 -msgid "Font settings" -msgstr "Typsnittinställningar" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:322 -msgid "Behavior" -msgstr "Beteende" - -#: ../midori/midori-preferences.c:323 -msgid "Features" -msgstr "Funktioner" - -#. Page "Interface" -#: ../midori/midori-preferences.c:373 -msgid "Interface" -msgstr "Gränssnitt" - -#: ../midori/midori-preferences.c:387 -msgid "Browsing" -msgstr "Bläddring" - -#. Page "Network" -#: ../midori/midori-preferences.c:405 ../midori/midori-preferences.c:406 -msgid "Network" -msgstr "Nätverk" - -#: ../midori/midori-preferences.c:417 -msgid "MB" -msgstr "MB" - -#: ../midori/midori-searchentry.c:74 -msgid "Current Item" -msgstr "" - -#: ../midori/midori-searchentry.c:75 -msgid "The currently selected item" -msgstr "" - -#: ../midori/midori-searchentry.c:83 -msgid "Dialog" -msgstr "" - -#: ../midori/midori-searchentry.c:84 -msgid "A dialog to manage search engines" -msgstr "" - -#: ../midori/midori-searchentry.c:151 -msgid "Empty" -msgstr "Tom" - -#: ../midori/midori-searchentry.c:523 -msgid "Add search engine" -msgstr "Lägg till sökmotor" - -#: ../midori/midori-searchentry.c:523 -msgid "Edit search engine" -msgstr "Redigera sökmotor" - -#: ../midori/midori-searchentry.c:550 -msgid "_Name:" -msgstr "_Namn:" - -#: ../midori/midori-searchentry.c:594 -msgid "_Icon (name or file):" -msgstr "_Ikon (namn eller fil):" - -#: ../midori/midori-searchentry.c:608 -msgid "_Token:" -msgstr "" - -#: ../midori/midori-searchentry.c:789 -msgid "Manage search engines" -msgstr "Hantera sökmotorer" - -#: ../midori/sokoke.c:60 ../midori/sokoke.c:72 -msgid "Could not run external program." -msgstr "" - -#: ../midori/sokoke.c:348 -msgid "Warning: You are using a superuser account!" -msgstr "Varning: Du använder ett administratörskonto!" - -#: ../midori/sokoke.c:522 ../katze/katze-xbel.c:935 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Kunde inte skriva." -#: ../midori/gjs.c:512 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Överföringar" + +#: ../midori/main.c:1040 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sessionen kunde inte sparad. %s" + +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1299 +msgid "Display program version" +msgstr "Visa programversion" + +#: ../midori/main.c:1301 +msgid "URIs" +msgstr "" + +#: ../midori/main.c:1335 +#, fuzzy +msgid "[URIs]" +msgstr "[URL]" + +#: ../midori/main.c:1371 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Var god skicka kommentarer, förslag och buggrapporter till:" + +#: ../midori/main.c:1373 +msgid "Check for new versions at:" +msgstr "Leta efter nya verioner på:" + +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1411 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1447 +#, fuzzy, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Bokmärkena kunde inte laddas. %s\n" + +#: ../midori/main.c:1463 +#, fuzzy, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sessionen kunde inte laddas. %s\n" + +#: ../midori/main.c:1477 +#, fuzzy, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Papperskorgen kunde inte laddas. %s\n" + +#: ../midori/main.c:1491 +#, fuzzy, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Papperskorgen kunde inte laddas. %s\n" + +#: ../midori/main.c:1504 +msgid "The following errors occured:" +msgstr "Följande fel inträffade:" + +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Sökmotorer kunde inte sparad. %s" + +#: ../midori/main.c:1698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bokmärkena kunde inte sparad. %s" + +#: ../midori/main.c:1707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Papperskorgen kunde inte sparad. %s" + +#: ../midori/main.c:1715 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Konfigurationsfilen kunde inte sparad. %s" + +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 +msgid "Reload the current page" +msgstr "Ladda om sidan" + +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +msgid "Stop loading the current page" +msgstr "Sluta ladda sidan" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% laddat" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Nytt bokmärke" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Redigera bokmärke" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Titel:" + +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Beskrivning" + +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Mapp:" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Rot" + +#: ../midori/midori-browser.c:668 +#, fuzzy +msgid "Save file as" +msgstr "Spara till fil" + +#: ../midori/midori-browser.c:1248 +#, fuzzy +msgid "Open file" +msgstr "Öppna en fil" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Öppna i ny _tabb" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Öppna i nytt _fönster" + +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Avskiljare" + +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "En liten webbläsare." + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "Mikael Magnusson " + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Fil" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "Öppna i nytt fönster" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Öppna i ny tabb" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "Öppna en fil" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Spara till fil" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "_Stäng tabb" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "Stäng den här tabben" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "S_täng fönster" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "Stäng det här fönstret" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Avsluta programmet" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "_Redigera" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "Klippa ut markerad text" + +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "Kopiera markerad text" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Klistra in text från klippbordet" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "Ta bort markerad text" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Markera all text" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "Hitta _nästa" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "Hitta _förra" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "_Snabbsök" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Visa" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "_Verktygsfält" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +msgid "View _Source" +msgstr "Visa _källkod" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Visa källkod för markering" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Växla fullskärmsläge" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "_Gå" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Töm papperskorgen" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Ångra stäng tabb" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3179 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3182 +msgid "Delete the selected bookmark" +msgstr "Ta bort markerad bokmärke" + +#: ../midori/midori-browser.c:3185 +#, fuzzy +msgid "Delete the selected history item" +msgstr "Ta bort markerad text" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "" + +#: ../midori/midori-browser.c:3191 +#, fuzzy +msgid "Bookmark the selected history item" +msgstr "Kopiera markerad text" + +#: ../midori/midori-browser.c:3193 +msgid "_Tools" +msgstr "_Verktyg" + +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +msgid "_Manage Search Engines" +msgstr "_Hantera sökmotorer" + +#: ../midori/midori-browser.c:3196 +msgid "Add, edit and remove search engines..." +msgstr "Lägg till, ändra och ta bort sökmotorer..." + +#: ../midori/midori-browser.c:3200 +msgid "_Previous Tab" +msgstr "_Föregående tabb" + +#: ../midori/midori-browser.c:3201 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:3203 +msgid "_Next Tab" +msgstr "_Nästa tabb" + +#: ../midori/midori-browser.c:3204 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:3206 +msgid "_Help" +msgstr "_Hjälp" + +#: ../midori/midori-browser.c:3208 +msgid "_Contents" +msgstr "_Innehåll" + +#: ../midori/midori-browser.c:3209 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3218 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:3225 +msgid "P_rivate Browsing" +msgstr "P_rivat läge" + +#: ../midori/midori-browser.c:3226 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:3231 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:3232 +#, fuzzy +msgid "Show menubar" +msgstr "Visa statusrad" + +#: ../midori/midori-browser.c:3235 +msgid "_Navigationbar" +msgstr "_Navigationsfält" + +#: ../midori/midori-browser.c:3236 +msgid "Show navigationbar" +msgstr "Visa navigeringsfält" + +#: ../midori/midori-browser.c:3239 +msgid "Side_panel" +msgstr "Sido_panel" + +#: ../midori/midori-browser.c:3240 +msgid "Show sidepanel" +msgstr "Visa sido_panel" + +#: ../midori/midori-browser.c:3243 +msgid "_Bookmarkbar" +msgstr "_Bokmärkesfält" + +#: ../midori/midori-browser.c:3244 +msgid "Show bookmarkbar" +msgstr "Visa bokmärkesfält" + +#: ../midori/midori-browser.c:3247 +msgid "_Transferbar" +msgstr "Ö_verföringsfält" + +#: ../midori/midori-browser.c:3248 +msgid "Show transferbar" +msgstr "Visa statusrad" + +#: ../midori/midori-browser.c:3251 +msgid "_Statusbar" +msgstr "_Statusrad" + +#: ../midori/midori-browser.c:3252 +msgid "Show statusbar" +msgstr "Visa statusrad" + +#: ../midori/midori-browser.c:3669 +msgid "_Location..." +msgstr "_Plats..." + +#: ../midori/midori-browser.c:3671 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3695 +msgid "_Web Search..." +msgstr "_Webbsökning..." + +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Öppna en tidigare stängd tabb eller fönster" + +#: ../midori/midori-browser.c:3729 +msgid "_Recently visited pages" +msgstr "" + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:3746 +#, fuzzy +msgid "Show the saved bookmarks" +msgstr "Kopiera markerad bokmärke" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Fönster" + +#: ../midori/midori-browser.c:3761 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:3883 +msgid "Bookmarks" +msgstr "Bokmärken" + +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +msgid "History" +msgstr "Historia" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 +msgid "_Inline find:" +msgstr "_Snabbsökning:" + +#: ../midori/midori-browser.c:4004 +msgid "Match Case" +msgstr "_Gör skillnad på skiftläge" + +#: ../midori/midori-browser.c:4012 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:4021 +msgid "Close Findbar" +msgstr "Stäng sökfältet" + +#: ../midori/midori-browser.c:4262 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "Stäng panel" + +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +msgid "Blank page" +msgstr "Tom sida" + +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +msgid "Homepage" +msgstr "Hemsida" + +#: ../midori/midori-websettings.c:133 +msgid "Last open pages" +msgstr "" + +#: ../midori/midori-websettings.c:148 +msgid "Chinese (BIG5)" +msgstr "Kinesiska (BIG5)" + +#: ../midori/midori-websettings.c:149 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanska (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:150 +msgid "Russian (KOI8-R)" +msgstr "Ryska (KOI8-R)" + +#: ../midori/midori-websettings.c:151 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:152 +msgid "Western (ISO-8859-1)" +msgstr "Västerländsk (ISO-8859-1)" + +#: ../midori/midori-websettings.c:153 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-websettings.c:168 +msgid "New tab" +msgstr "Ny tabb" + +#: ../midori/midori-websettings.c:169 +msgid "New window" +msgstr "Nytt fönster" + +#: ../midori/midori-websettings.c:170 +msgid "Current tab" +msgstr "Nuvarande tabb" + +#: ../midori/midori-websettings.c:185 +msgid "Default" +msgstr "Standard" + +#: ../midori/midori-websettings.c:186 +msgid "Icons" +msgstr "Ikoner" + +#: ../midori/midori-websettings.c:187 +msgid "Text" +msgstr "Text" + +#: ../midori/midori-websettings.c:188 +msgid "Both" +msgstr "Både och" + +#: ../midori/midori-websettings.c:189 +msgid "Both horizontal" +msgstr "Båda horisontellt" + +#: ../midori/midori-websettings.c:204 +msgid "All cookies" +msgstr "Alla kakor" + +#: ../midori/midori-websettings.c:205 +msgid "Session cookies" +msgstr "Sessionskakor" + +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Inga" + +#: ../midori/midori-websettings.c:246 +msgid "Remember last window size" +msgstr "" + +#: ../midori/midori-websettings.c:247 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:255 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:256 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:264 +msgid "Last window height" +msgstr "" + +#: ../midori/midori-websettings.c:265 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:273 +msgid "Last panel position" +msgstr "" + +#: ../midori/midori-websettings.c:274 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:292 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:302 +#, fuzzy +msgid "Show Menubar" +msgstr "Visa statusrad" + +#: ../midori/midori-websettings.c:303 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:311 +msgid "Show Navigationbar" +msgstr "Visa Navigeringsfält" + +#: ../midori/midori-websettings.c:312 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:320 +msgid "Show Bookmarkbar" +msgstr "Visa Bokmärkesfält" + +#: ../midori/midori-websettings.c:321 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:329 +msgid "Show Panel" +msgstr "Visa Sidopanel" + +#: ../midori/midori-websettings.c:330 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:338 +msgid "Show Statusbar" +msgstr "Visa Statusrad" + +#: ../midori/midori-websettings.c:339 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:348 +msgid "Toolbar Style" +msgstr "Stil för verktygsfält" + +#: ../midori/midori-websettings.c:349 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:358 +#, fuzzy +msgid "Toolbar Items" +msgstr "Stil för verktygsfält" + +#: ../midori/midori-websettings.c:359 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:367 +#, fuzzy +msgid "Compact Sidepanel" +msgstr "Sido_panel" + +#: ../midori/midori-websettings.c:368 +#, fuzzy +msgid "Whether to make the sidepanel compact" +msgstr "Ifall aktivitetssymbolen ska animeras" + +#: ../midori/midori-websettings.c:377 +msgid "Load on Startup" +msgstr "Ladda vid uppstart" + +#: ../midori/midori-websettings.c:378 +msgid "What to load on startup" +msgstr "" + +#: ../midori/midori-websettings.c:388 +msgid "The homepage" +msgstr "" + +#: ../midori/midori-websettings.c:396 +msgid "Download Folder" +msgstr "Nedladdningsmapp" + +#: ../midori/midori-websettings.c:397 +msgid "The folder downloaded files are saved to" +msgstr "" + +#: ../midori/midori-websettings.c:405 +msgid "Download Manager" +msgstr "" + +#: ../midori/midori-websettings.c:406 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:423 +msgid "Location entry Search" +msgstr "Sökmotor för Addressfältet" + +#: ../midori/midori-websettings.c:424 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:432 +msgid "Preferred Encoding" +msgstr "" + +#: ../midori/midori-websettings.c:433 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:452 +msgid "Close Buttons on Tabs" +msgstr "Stängknappar på tabbar" + +#: ../midori/midori-websettings.c:453 +msgid "Whether tabs have close buttons" +msgstr "Ifall tabbar har stängknappar" + +#: ../midori/midori-websettings.c:462 +msgid "Open new pages in" +msgstr "Öppna nya sidor i" + +#: ../midori/midori-websettings.c:463 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:473 +#, fuzzy +msgid "Open external pages in" +msgstr "Öppna nya sidor i" + +#: ../midori/midori-websettings.c:474 +msgid "Where to open externally opened pages" +msgstr "" + +#: ../midori/midori-websettings.c:483 +msgid "Middle click opens Selection" +msgstr "Mittenklick öppnar markering" + +#: ../midori/midori-websettings.c:484 +msgid "Load an URL from the selection via middle click" +msgstr "Ladda en URL från markeringen via mittenklick" + +#: ../midori/midori-websettings.c:492 +msgid "Open tabs in the background" +msgstr "Öppna tabbar i bakgrunden" + +#: ../midori/midori-websettings.c:493 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:501 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:510 +msgid "Open popups in tabs" +msgstr "Öppna popups i tabbar" + +#: ../midori/midori-websettings.c:511 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies" +msgstr "Acceptera kakor" + +#: ../midori/midori-websettings.c:538 +msgid "What type of cookies to accept" +msgstr "" + +#: ../midori/midori-websettings.c:547 +msgid "Original cookies only" +msgstr "" + +#: ../midori/midori-websettings.c:548 +msgid "Accept cookies from the original website only" +msgstr "Tillåt kakor enbart från den ursprungliga webbplatsen" + +#: ../midori/midori-websettings.c:556 +msgid "Maximum cookie age" +msgstr "Maximal kakålder" + +#: ../midori/midori-websettings.c:557 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:567 +msgid "Remember last visited pages" +msgstr "" + +#: ../midori/midori-websettings.c:568 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../midori/midori-websettings.c:576 +msgid "Maximum history age" +msgstr "" + +#: ../midori/midori-websettings.c:577 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:585 +msgid "Remember last form inputs" +msgstr "" + +#: ../midori/midori-websettings.c:586 +msgid "Whether the last form inputs are saved" +msgstr "" + +#: ../midori/midori-websettings.c:594 +msgid "Remember last downloaded files" +msgstr "" + +#: ../midori/midori-websettings.c:595 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../midori/midori-websettings.c:605 +msgid "HTTP Proxy" +msgstr "" + +#: ../midori/midori-websettings.c:606 +msgid "The proxy used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:614 +msgid "Cache size" +msgstr "Cache-storlek" + +#: ../midori/midori-websettings.c:615 +msgid "The allowed size of the cache" +msgstr "" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 +msgid "Open Link in New _Tab" +msgstr "Öppna länk i ny _tabb" + +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:955 +msgid "Open URL in New _Tab" +msgstr "Öppna URL i ny _tabb" + +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1503 +msgid "Source" +msgstr "Källkod" + +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-preferences.c:87 +#, fuzzy, c-format +msgid "Preferences for %s" +msgstr "%s inställningar" + +#. Page "General" +#: ../midori/midori-preferences.c:338 +msgid "General" +msgstr "Allmänt" + +#: ../midori/midori-preferences.c:339 +msgid "Startup" +msgstr "Uppstart" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:386 +msgid "Appearance" +msgstr "Utseende" + +#: ../midori/midori-preferences.c:387 +msgid "Font settings" +msgstr "Typsnittinställningar" + +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:407 +msgid "Behavior" +msgstr "Beteende" + +#: ../midori/midori-preferences.c:408 +msgid "Features" +msgstr "Funktioner" + +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#, fuzzy +msgid "Enable scripts" +msgstr "_Beskrivning" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:437 +msgid "Interface" +msgstr "Gränssnitt" + +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Navigeringsfält" + +#: ../midori/midori-preferences.c:453 +msgid "Browsing" +msgstr "Bläddring" + +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +msgid "Network" +msgstr "Nätverk" + +#: ../midori/midori-preferences.c:492 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" +msgstr "" + +#: ../midori/midori-preferences.c:500 +#, fuzzy +msgid "Web Cookies" +msgstr "Acceptera kakor" + +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "Tom" + +#: ../midori/midori-searchaction.c:797 +msgid "Add search engine" +msgstr "Lägg till sökmotor" + +#: ../midori/midori-searchaction.c:797 +msgid "Edit search engine" +msgstr "Redigera sökmotor" + +#: ../midori/midori-searchaction.c:825 +msgid "_Name:" +msgstr "_Namn:" + +#: ../midori/midori-searchaction.c:869 +msgid "_Icon (name or file):" +msgstr "_Ikon (namn eller fil):" + +#: ../midori/midori-searchaction.c:883 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1060 +msgid "Manage search engines" +msgstr "Hantera sökmotorer" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "" + +#: ../midori/sokoke.c:282 +msgid "Warning: You are using a superuser account!" +msgstr "Varning: Du använder ett administratörskonto!" + +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/gjs.c:739 ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../katze/katze-throbber.c:135 -msgid "Icon size" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" msgstr "" -#: ../katze/katze-throbber.c:136 -msgid "Symbolic size to use for the animation" -msgstr "Symbolisk storlek för animeringen" - -#: ../katze/katze-throbber.c:144 -msgid "Icon Name" +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" msgstr "" -#: ../katze/katze-throbber.c:145 -msgid "The name of an icon containing animation frames" -msgstr "Namn på en ikon som innehåller animeringsbilder" - -#: ../katze/katze-throbber.c:153 -msgid "Pixbuf" +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" msgstr "" -#: ../katze/katze-throbber.c:154 -msgid "A GdkPixbuf containing animation frames" -msgstr "En GdkPixbuf som innehåller animeringbilder" +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#, fuzzy +msgid "_Disable" +msgstr "_Fil" -#: ../katze/katze-throbber.c:162 -msgid "Animated" +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsol" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" msgstr "" -#: ../katze/katze-throbber.c:163 -msgid "Whether the throbber should be animated" -msgstr "Ifall aktivitetssymbolen ska animeras" - -#: ../katze/katze-throbber.c:171 -msgid "Static Icon Name" -msgstr "" - -#: ../katze/katze-throbber.c:172 -msgid "The name of an icon to be used as the static image" -msgstr "Namn på ikon att använda som statisk bild" - -#: ../katze/katze-throbber.c:180 -msgid "Static Pixbuf" -msgstr "" - -#: ../katze/katze-throbber.c:181 -msgid "A GdkPixbuf to be used as the static image" -msgstr "En GdkPixbuf att använda som statisk bild" - -#: ../katze/katze-throbber.c:189 -msgid "Static Stock ID" -msgstr "" - -#: ../katze/katze-throbber.c:190 -msgid "The stock ID of an icon to be used as the static image" -msgstr "Katalog-ID för en ikon att använda som statisk bild" - -#: ../katze/katze-throbber.c:808 +#: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:821 +#: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "" -#: ../katze/katze-throbber.c:844 -#, c-format -msgid "Icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:876 +#: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:137 ../katze/katze-utils.c:318 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:159 ../katze/katze-utils.c:195 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:177 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "" -#: ../katze/katze-item.c:72 -msgid "Name" -msgstr "Namn" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Sidhållare" -#: ../katze/katze-item.c:73 -msgid "The name of the item" +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Sidhållare" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" msgstr "" -#: ../katze/katze-item.c:82 -msgid "The descriptive text of the item" +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "_Beskrivning" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" msgstr "" -#: ../katze/katze-item.c:91 -msgid "The URI of the item" -msgstr "" +#~ msgid "Select _All" +#~ msgstr "Välj _alla" -#: ../katze/katze-item.c:99 -msgid "Icon" -msgstr "Ikone" +#~ msgid "_Fullscreen" +#~ msgstr "_Fullskärm" -#: ../katze/katze-item.c:100 -msgid "The icon of the item" -msgstr "" +#~ msgid "_Leave Fullscreen" +#~ msgstr "_Lämna fullskärm" -#: ../katze/katze-item.c:108 -msgid "Token" -msgstr "" +#~ msgid "Settings" +#~ msgstr "Inställningar" -#: ../katze/katze-item.c:109 -msgid "The token of the item" -msgstr "" +#~ msgid "The associated settings" +#~ msgstr "De associerade inställningarna" -#: ../katze/katze-xbel.c:708 ../katze/katze-xbel.c:716 -#: ../katze/katze-xbel.c:752 ../katze/katze-xbel.c:760 -#: ../katze/katze-xbel.c:789 -msgid "Malformed document." -msgstr "Felaktigt dokument." +#~ msgid "Trash" +#~ msgstr "Papperskorgen" -#: ../katze/katze-xbel.c:744 -msgid "File not found." -msgstr "Fil saknas." +#~ msgid "The trash, collecting recently closed tabs and windows" +#~ msgstr "Soptunnan, samlar senast stängda tabbar och fönster" + +#~ msgid "Browser" +#~ msgstr "Bläsare" + +#~ msgid "Search Engines" +#~ msgstr "Sökmotorer" + +#~ msgid "Statusbar" +#~ msgstr "Statusrad" + +#~ msgid "The text that is displayed in the statusbar" +#~ msgstr "Texten som visas i statusraden" + +#~ msgid "Pa_ge Setup" +#~ msgstr "_Sidinställningar" + +#~ msgid "Undo the last modification" +#~ msgstr "Ångra senaste ändringen" + +#~ msgid "Redo the last modification" +#~ msgstr "Gör om senaste ändringen" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Visa i sid_hållare..." + +#~ msgid "_Manage Bookmarks" +#~ msgstr "_Hantera bokmärken" + +#~ msgid "Add, edit and remove bookmarks..." +#~ msgstr "Lägg till, ändra och ta bort bokmärken..." + +#~ msgid "Tab _Overview" +#~ msgstr "Tabbö_versikt" + +#~ msgid "_Work Offline" +#~ msgstr "_Arbeta offline" + +#~ msgid "Appearance of the shadow around each panel" +#~ msgstr "Utseende på skuggan runt varje panel" + +#~ msgid "Menu to hold panel items" +#~ msgstr "Meny för att visa panelföremål" + +#~ msgid "The index of the current page" +#~ msgstr "Indexet för nuvarande sida" + +#~ msgid "Show New Tab" +#~ msgstr "Visa Ny tabb" + +#~ msgid "Show Homepage" +#~ msgstr "Visa Hemsida" + +#~ msgid "Show Web search" +#~ msgstr "Visa Webbsökning" + +#~ msgid "Show Trash" +#~ msgstr "Visa Papperskorgen" + +#~ msgid "Tab Label Size" +#~ msgstr "Tabbstorlek" + +#~ msgid "The desired tab label size" +#~ msgstr "Önskad storlek på tabbetikett" + +#~ msgid "The URI of the currently loaded page" +#~ msgstr "URIn för den laddade sidan" + +#~ msgid "The title of the currently loaded page" +#~ msgstr "Titeln för den laddade sidan" + +#~ msgid "Symbolic size to use for the animation" +#~ msgstr "Symbolisk storlek för animeringen" + +#~ msgid "The name of an icon containing animation frames" +#~ msgstr "Namn på en ikon som innehåller animeringsbilder" + +#~ msgid "A GdkPixbuf containing animation frames" +#~ msgstr "En GdkPixbuf som innehåller animeringbilder" + +#~ msgid "The name of an icon to be used as the static image" +#~ msgstr "Namn på ikon att använda som statisk bild" + +#~ msgid "A GdkPixbuf to be used as the static image" +#~ msgstr "En GdkPixbuf att använda som statisk bild" + +#~ msgid "The stock ID of an icon to be used as the static image" +#~ msgstr "Katalog-ID för en ikon att använda som statisk bild" + +#~ msgid "Name" +#~ msgstr "Namn" + +#~ msgid "Icon" +#~ msgstr "Ikone" diff --git a/po/tr.po b/po/tr.po index d2d90c31..01e7540d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-02 23:30+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-10 16:53+0200\n" "Last-Translator: Mirat Can Bayrak \n" "Language-Team: Turkish \n" @@ -19,11 +19,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Hafif web tarayıcı " -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1098 -#: ../midori/main.c:1107 -#: ../midori/main.c:1118 -#: ../midori/main.c:1142 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -31,1165 +28,1106 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web Tarayıcı" -#: ../midori/main.c:71 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Yer imi" -#: ../midori/main.c:72 -#: ../midori/midori-browser.c:3537 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Yer İmleri" -#: ../midori/main.c:73 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Yer İmi Ekle" -#: ../midori/main.c:74 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Konsol" -#: ../midori/main.c:75 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Eklentiler" -#: ../midori/main.c:76 +#: ../midori/main.c:91 msgid "_History" msgstr "_Geçmiş" -#: ../midori/main.c:77 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "_Anasayfa" -#: ../midori/main.c:78 -msgid "_Pageholder" -msgstr "_Sayfa tutucu" - -#: ../midori/main.c:79 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Kullanıcı betikleri" -#: ../midori/main.c:80 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Kullanıcı _stilleri" -#: ../midori/main.c:81 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Yeni _Tab" -#: ../midori/main.c:82 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Aktarımlar" -#: ../midori/main.c:83 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Kapatılmış Pencereler ve Tablar" -#: ../midori/main.c:84 +#: ../midori/main.c:98 msgid "New _Window" msgstr "Yeni _Pencere" -#: ../midori/main.c:134 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Ayarlar yüklenemedi: %s\n" -#: ../midori/main.c:189 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' değeri şunun için yanlış : %s" -#: ../midori/main.c:196 -#: ../midori/main.c:265 -#, c-format -msgid "Unhandled settings value '%s'" +#: ../midori/main.c:205 ../midori/main.c:275 +#, fuzzy, c-format +msgid "Invalid configuration value '%s'" msgstr "İşlenemeyen ayar değeri '%s'" -#: ../midori/main.c:524 #: ../midori/main.c:532 -#: ../midori/main.c:562 -#: ../midori/main.c:571 -msgid "Malformed document." -msgstr "Bozuk biçimli döküman" - -#: ../midori/main.c:554 msgid "File not found." msgstr "Dosya bulunamadı" -#: ../midori/main.c:592 -#: ../midori/main.c:624 +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Bozuk biçimli döküman" + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Şu veri tabanı açılamadı: %s\n" -#: ../midori/main.c:679 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Şu geçmiş öğesi silinemedi: %s\n" -#: ../midori/main.c:703 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Geçmiş temizlenemedi: %s\n" -#: ../midori/main.c:736 -#: ../midori/main.c:751 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Geçmiş öğesi eklenemedi: %s\n" -#: ../midori/main.c:868 +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Eski geçmiş öğeleri silinemedi: %s\n" -#: ../midori/main.c:1000 -#: ../midori/sokoke.c:457 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Yazma işlemi gerçekleştirilemedi" -#: ../midori/main.c:1025 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Aktarımlar" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Bu oturum kaydedilemedi. %s" -#: ../midori/main.c:1057 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Belirtilen dosyayı javascript olarak kabul et ve çalıştır" -#: ../midori/main.c:1059 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Program versiyonunu göster" -#: ../midori/main.c:1061 +#: ../midori/main.c:1301 msgid "URIs" msgstr "URIs" -#: ../midori/main.c:1095 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1119 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" -msgstr "Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya raporlayın:" +msgstr "" +"Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya " +"raporlayın:" -#: ../midori/main.c:1121 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Yeni versiyonlar için şurayı kontrol edin:" -#: ../midori/main.c:1142 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Dosya ismi belirtlilmedi" -#. FIXME: Do we want a graphical error message? -#: ../midori/main.c:1160 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Şu anda Midori'nin başka bir örneği çalışıyor fakat cevap vermiyor.\n" -#: ../midori/main.c:1194 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Yer imleri yüklenemedi: %s\n" -#: ../midori/main.c:1208 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Oturum yüklenemedi: %s\n" -#: ../midori/main.c:1220 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Çöp kutusu yüklenemedi: %s\n" -#: ../midori/main.c:1233 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Geçmiş yüklenemedi: %s\n" -#: ../midori/main.c:1246 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Şu hatalar ortaya çıktı:" -#: ../midori/main.c:1405 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Arama motorları kaydedilemedi. %s" -#: ../midori/main.c:1415 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Yer imleri kaydedilemedi. %s" -#: ../midori/main.c:1424 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Çöp kutusu kaydedilemedi. %s" -#: ../midori/main.c:1432 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Ayarlar kaydedilemedi. %s" -#: ../midori/midori-addons.c:87 -#: ../midori/midori-websettings.c:207 -msgid "None" -msgstr "Yok" - -#: ../midori/midori-addons.c:88 -#: ../midori/midori-browser.c:3768 -msgid "Extensions" -msgstr "Eklentiler" - -#: ../midori/midori-addons.c:89 -#: ../midori/midori-browser.c:3751 -msgid "Userscripts" -msgstr "Kullanıcı Betikleri" - -#: ../midori/midori-addons.c:90 -#: ../midori/midori-browser.c:3759 -msgid "Userstyles" -msgstr "Kullanıcı Stilleri" - -#: ../midori/midori-addons.c:1043 -msgid "_Enable" -msgstr "_Etkin" - -#: ../midori/midori-addons.c:1052 -msgid "_Disable" -msgstr "_Kapalı" - -#: ../midori/midori-browser.c:251 -#: ../midori/midori-browser.c:3075 -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Bu sayfayı yeniden yükle" -#: ../midori/midori-browser.c:263 -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Bu sayfayı yüklemeyi durdur" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% yüklendi" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "beklenmedik hareket '%s'." -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Yeni yer imi" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Yer imini düzenle" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Başlık:" -#: ../midori/midori-browser.c:547 -#: ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Açıklama:" -#: ../midori/midori-browser.c:566 -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL:" -#: ../midori/midori-browser.c:582 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Klasör:" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Root" -#: ../midori/midori-browser.c:1148 -msgid "Open file" -msgstr "Dosya aç" - -#: ../midori/midori-browser.c:1224 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:2301 +#: ../midori/midori-browser.c:1248 +msgid "Open file" +msgstr "Dosya aç" + +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Yeni tabda aç" -#: ../midori/midori-browser.c:2303 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Yeni Pencerede aç" -#: ../midori/midori-browser.c:2549 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Ayraç" -#: ../midori/midori-browser.c:2653 +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "%d gün önce" -#: ../midori/midori-browser.c:2660 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Bugün" -#: ../midori/midori-browser.c:2662 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Dün" -#: ../midori/midori-browser.c:2751 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Hafif bir web tarayıcısı" -#: ../midori/midori-browser.c:2759 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" -msgstr "" -"Mirat Can Bayrak " +msgstr "Mirat Can Bayrak " -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Bütün geçmiş öğelerini silmek istediğinizden emin misiniz?" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Dosya" -#: ../midori/midori-browser.c:3012 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Yeni bir pencerede aç" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Yeni bir tabda aç" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Bir dosya aç" -#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Bir dosyaya kaydet" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "_Tabı kapat" -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Geçerli tabı kapat" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "Pen_cereyi Kapat" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Bu pencereyi kapat" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Geçerli sayfayı yazdır" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Uygulamadan çık" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Düzenle" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Seçili metni kes" -#: ../midori/midori-browser.c:3041 -#: ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Seçili metni kopyala" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Metni panodan yapıştır" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Seçili metni sil" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Bütün metni seç" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Bir kelime yada ibareyi geçerli sayfada ara" -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "So_nrakini Bul" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Kelime ya da ibarenin sonraki örneğini bul" -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Öncekini Bu_l" -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Kelime ya da ibarenin sonraki örneğini bul" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "Ç_abuk Bul" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Hemen kelime yada ibarenin olduğu noktaya zıpla" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Uygulamanın ayarlarını düzenle" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Görünüm" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "_Araç Çubukları" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Yakınlaştırma seviyesini arttır" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Yakınlaşma seviyesini azalt" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Yakınlaşma oranını sıfırla" -#: ../midori/midori-browser.c:3092 -#: ../midori/midori-view.c:924 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Ka_ynağı Gör" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Geçerli sayfanın kaynak kodunu gör" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Seçim kaynağını gör" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Geçerli seçime ait kaynak kodu gör" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Tam ekran modunu aç/kapat" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Git" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Önceki sayfaya geri dön" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Sonraki sayfaya git" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Anasayfaya git" -#: ../midori/midori-browser.c:3113 -msgid "Open in Page_holder..." -msgstr "Sayfa_tutucu içerisinde aç" - -#: ../midori/midori-browser.c:3114 -msgid "Open the current page in the pageholder" -msgstr "Geçerli sayfayı sayfa tutucu içinde aç" - -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Çöp Kutusunu Boşalt" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" -#. FIXME: Make this sensitive only when there is a tab to undo -#: ../midori/midori-browser.c:3119 -#: ../midori/midori-view.c:899 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Tab kapatmayı geri al" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Son kapatılan tabı geri açar" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Yeni bir yer imi ekle" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Seçili yer imini düzenle" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Seçili yer imini sil" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Seçili geçmiş öğesini sil" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Bütün geçmişi sil" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Seçili geçmiş öğesini yer imlerine ekle" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Araçlar" -#: ../midori/midori-browser.c:3143 -#: ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "Arama _Motorlarını Yönet" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Arama motorlarını ekle, sil ve düzenle..." -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "Ön_ceki Tab" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Önceki taba geç" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "So_nraki Tab" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Sonraki taba geç" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Yardım" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_İçerik" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Dökümantasyonu göster" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Sıkça sorulan sorular" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Sıkça sorulan soruları gösterir" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "Hata _Raporla" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Midori'nin hata takip sistemini açar" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Program hakkında bilgi gösterir" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "G_izli Gezinti" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Gezinirken hiç bir özel veriyi kaydetme" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "_Menü Çubuğu" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Menü çubuğunu göster" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "_Gezinti araç Çubuğu" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Gezinti araç çubuğunu göster" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "Yan _panel" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Yan paneli göster" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "_Yer imi araç çubuğu" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Yer imi araç çubuğunu göster" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "_Aktarım araç çubuğu" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Aktarım araç çubuğunu göster" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "_Durum Çubuğu" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Durum çubuğunu göster" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "Kon_um..." -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Belirli bir konumu aç" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "_Ağ Araması..." -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Bir ağ araması gerçekleştir" -#: ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Daha önce kapatılmış bir pencereyi ya da tabı yeniden aç" -#: ../midori/midori-browser.c:3521 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Yeni ziyaret edilmiş sayfalar" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Daha önce ziyaret edilmiş sayfaları yeniden aç" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Kaydedilmiş yer imlerini göster" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Pencere" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Açık tabların bir listesini göster" -#: ../midori/midori-browser.c:3679 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Yer imleri" -#. TODO: We need something like "use current website" -#: ../midori/midori-browser.c:3686 -#: ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Aktarımlar" - -#: ../midori/midori-browser.c:3695 -msgid "Console" -msgstr "Konsole" - -#: ../midori/midori-browser.c:3733 -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Geçmiş" -#: ../midori/midori-browser.c:3742 -msgid "Pageholder" -msgstr "Sayfa Tutucu" - -#: ../midori/midori-browser.c:3810 +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "Sat_ıriçi bul:" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Duruma Eşle" -#: ../midori/midori-browser.c:3853 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Eşlemeleri Işıklandır" -#: ../midori/midori-browser.c:3862 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Arama çubuğunu Kapat" -#: ../midori/midori-browser.c:4108 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Beklenmedik ayar '%s'" -#: ../midori/midori-panel.c:207 -#: ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Paneli kapat" -#: ../midori/midori-websettings.c:132 -#: ../midori/midori-view.c:1514 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-websettings.c:133 -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Anasayfa" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Son açılmış sayfalar" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Çince (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Japonca (Shift_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Kiril (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Batı Avrupa (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Özel..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Yeni sekme" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Yeni pencere" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Geçerli sekme" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Öntanımlı" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Simgeler" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Metin" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Her ikiside" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "İkiside yatay" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Tüm kurabiyeler" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Oturum kurabiyeleri" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Yok" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Son pencerenin ölçülerini hatırla" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Son pencerenin eni" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Son kaydedilmiş pencere eni" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Son pencere yüksekliği" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Son kaydedilmiş pencere yüksekliği" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Son panel pozisyonu" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Son kaydedilen panel pozisyonu" -#: ../midori/midori-websettings.c:280 +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Son panel sayfası" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Son kaydedilmiş panel sayfası" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Son ağ araması" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Kaydedilmiş son ağ araması" -#: ../midori/midori-websettings.c:298 -msgid "Last pageholder URI" -msgstr "Son sayfa tutacı URI" - -#: ../midori/midori-websettings.c:299 -msgid "The URI last opened in the pageholder" -msgstr "Sayfa tutucu içinde son açılan URI" - -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Menü Çubuğunu Göster" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Gezinti Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Yer İmi Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Paneli Göster" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Durum Çubuğunu Göster" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Araç Çubuğu Sitili" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Araç çubuğunun sitili" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Araç Çubuğu Öğeleri" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Araç çubuğunun üzerinde gösterilecek öğeler" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Küçük Yan Panel" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Açılışta Yükle" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Açılışta ne yüklenecek" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "anasayfa" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "İndirilecek Klasör" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "İndirilen dosyaların kaydedileceği klasör" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "İndirme Yöneticisi" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Harici indirme yöneticisi" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Metin Düzenleyici" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Harici metin düzenleyici" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Konum girişi Arama" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Konum girişi içerisinde yapılacak arama" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Tercih Edilen Kodlama" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Tercih edilen karakter kodlaması" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Tab Çubuğunu Her Zaman Göster" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Tab Çubuğunu Her Zaman Göster" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Tablardaki Düğmeleri Kapat" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Yeni sayfaları aç" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Yeni sayfalar nereye açılacak" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Harici sayfaları şu şekilde aç" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Harici açılan sayfalar nereye açılacak" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Orta tuş seçimi açar" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" msgstr "Orta tuş ile seçim içinden bir url yükle" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Tabları arkaplanda aç" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Tabları geçerliden sonrakine aç" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Popup pencereleri tablarda aç" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Kurabiyeleri kabul et" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Hangi tür kurabiyeler kabul edilecek" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Sadece orjinal kurabiyeler" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Sadece orjinal web sitesine ait kurabiyeleri kabul et" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Azami kurabiye ömrü" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Kurabiyelerin saklanacağı azami gün sayısı" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Son ziyaret edilen sayfaları hatırla" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Eğer son ziyaret edilen sayfalar kaydedilmiş ise" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Azami geçmiş yaşı" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Geçmişin saklanacağı azami gün sayısı" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Son form girişlerini hatırla" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Son form girişlerinin saklanacağı azami gün sayısı" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Son indirilmiş dosyaları hatırla" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Eğer son indirilmiş dosyalar kaydedildiyse" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "HTTP vekil sunucu" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "HTTP bağlantıları için kullanılan vekil sunucu" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Önbellek boyutu" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "İzin verilen önbellek boyutu" -#: ../midori/midori-view.c:82 -msgid "Load Provisional" -msgstr "Koşullu Yükle" +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" -#: ../midori/midori-view.c:83 -msgid "Load Committed" -msgstr "İşlenmişi Yükle" - -#: ../midori/midori-view.c:84 -msgid "Load Finished" -msgstr "Tamamlananı Yükle" - -#: ../midori/midori-view.c:836 +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Bağlantıyı Yeni _Tabda Aç" -#: ../midori/midori-view.c:861 +#: ../midori/midori-view.c:925 +#, fuzzy +msgid "_Save Link destination" +msgstr "Bağlantı Konumunu İnd_ir" + +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "Bağlantı Konumunu İnd_ir" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "URL'yi Yeni _Tabda aç" -#: ../midori/midori-view.c:1248 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Sayfayı incele - %s" -#: ../midori/midori-view.c:1386 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Kaynak" -#: ../midori/midori-preferences.c:89 +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Dökümantasyonu göster" + +#: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "%s için tercihler" @@ -1229,7 +1167,7 @@ msgstr "Davranış" msgid "Features" msgstr "Özellikler" -#: ../midori/midori-preferences.c:411 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "İmajları otomatik yükle" @@ -1238,119 +1176,139 @@ msgid "Shrink images automatically" msgstr "İmajları otomatik küçült" #: ../midori/midori-preferences.c:417 -msgid "Print backgrounds" +#, fuzzy +msgid "Print background images" msgstr "Arkaplanları yazdır" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Yeniden boyutlandırılabilir metin alanları" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Betiklere izin ver" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Eklentilere İzin ver" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:429 msgid "Enable developer tools" msgstr "Geliştirici araçlarına izin ver" #. Page "Interface" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Arayüz" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Gezinti Araç Çubuğu" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Gözden Geçiriliyor" -#: ../midori/midori-preferences.c:484 -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Ağ" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Gizlilik" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Web Kurabiyeleri" -#: ../midori/midori-preferences.c:517 -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "günler" -#: ../midori/midori-searchaction.c:459 -#: ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Boş" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Arama motoru ekle" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Arama motoru düzenle" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_İsim:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_İkon (isim ya da dosya):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Alındı:" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Arama motorlarını yönet" -#: ../midori/sokoke.c:63 -#: ../midori/sokoke.c:75 +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Harici program çalıştırılamadı" -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Dikkat: Süperkullanıcı hesabı kullanıyorsunuz!" -#: ../midori/gjs.c:512 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Bilinmeyen hata oluştu" -#: ../midori/gjs.c:739 -#: ../midori/gjs.c:829 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s böyle bir özelliğe sahip değil '%s'" -#: ../midori/gjs.c:875 +#: ../midori/gjs.c:878 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s şuna eşitlenemiyor %s.%s" -#: ../midori/gjs.c:885 +#: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" msgstr "Erişilemiyor: %s.%s " +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Kullanıcı Betikleri" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Kullanıcı Stilleri" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Etkin" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Kapalı" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsole" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Eklentiler" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1365,18 +1323,58 @@ msgstr "'%s' stok ikonu yüklenemedi" msgid "Animation frames are broken" msgstr "Animasyon kareleri kırık" -#: ../katze/katze-utils.c:147 -#: ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' özelliği %s için geçersiz" -#: ../katze/katze-utils.c:169 -#: ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Dosya Seç" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Klasör seç" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Sayfa Tutucu" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Sayfa tutucu" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Kullanıcı Betikleri" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Sayfa_tutucu içerisinde aç" + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Geçerli sayfayı sayfa tutucu içinde aç" + +#~ msgid "Last pageholder URI" +#~ msgstr "Son sayfa tutacı URI" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Sayfa tutucu içinde son açılan URI" + +#~ msgid "Load Provisional" +#~ msgstr "Koşullu Yükle" + +#~ msgid "Load Committed" +#~ msgstr "İşlenmişi Yükle" + +#~ msgid "Load Finished" +#~ msgstr "Tamamlananı Yükle" diff --git a/po/uk.po b/po/uk.po index 46de8693..35be8a9e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,20 +8,20 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-10 20:53+0100\n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" "PO-Revision-Date: 2008-11-21 17:49+0200\n" "Last-Translator: Dmitry Nikitin \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: ../midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Легкий переглядач Веб" -#: ../midori.desktop.in.h:2 ../midori/main.c:1093 ../midori/main.c:1102 -#: ../midori/main.c:1113 ../midori/main.c:1137 +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 msgid "Midori" msgstr "Мідорі" @@ -29,1198 +29,1166 @@ msgstr "Мідорі" msgid "Web Browser" msgstr "Переглядач Веб" -#: ../midori/main.c:73 +#: ../midori/main.c:86 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/main.c:74 ../midori/midori-browser.c:3757 +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/main.c:75 +#: ../midori/main.c:88 msgid "_Add Bookmark" msgstr "_Додати закладку" -#: ../midori/main.c:76 +#: ../midori/main.c:89 msgid "_Console" msgstr "_Консоль" -#: ../midori/main.c:77 +#: ../midori/main.c:90 msgid "_Extensions" msgstr "_Розширення" -#: ../midori/main.c:78 +#: ../midori/main.c:91 msgid "_History" msgstr "_Історія" -#: ../midori/main.c:79 +#: ../midori/main.c:92 msgid "_Homepage" msgstr "Д_омашня" -#: ../midori/main.c:80 -msgid "_Pageholder" -msgstr "_Тримач сторінки" - -#: ../midori/main.c:81 +#: ../midori/main.c:93 msgid "_Userscripts" msgstr "_Скрипти користувача" -#: ../midori/main.c:82 +#: ../midori/main.c:94 msgid "User_styles" msgstr "Ст_илі користувача" -#: ../midori/main.c:83 +#: ../midori/main.c:95 msgid "New _Tab" msgstr "Нова _вкладка" -#: ../midori/main.c:84 +#: ../midori/main.c:96 msgid "_Transfers" msgstr "_Завантаження" -#: ../midori/main.c:85 +#: ../midori/main.c:97 msgid "_Closed Tabs and Windows" msgstr "_Закриті вкладки та вікна" -#: ../midori/main.c:86 +#: ../midori/main.c:98 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/main.c:131 +#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Конфігурація не може бути завантажена: %s\n" -#: ../midori/main.c:186 +#: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значення '%s' є неправильним для %s" -#: ../midori/main.c:193 ../midori/main.c:263 +#: ../midori/main.c:205 ../midori/main.c:275 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/main.c:522 ../midori/main.c:530 ../midori/main.c:560 -#: ../midori/main.c:569 -msgid "Malformed document." -msgstr "Неправильний документ." - -#: ../midori/main.c:552 +#: ../midori/main.c:532 msgid "File not found." msgstr "Файл не знайдений." -#: ../midori/main.c:590 ../midori/main.c:622 +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Неправильний документ." + +#: ../midori/main.c:571 ../midori/main.c:603 #, c-format msgid "Failed to open database: %s\n" msgstr "Не вдалось відкрити базу даних: %s\n" -#: ../midori/main.c:676 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" -#: ../midori/main.c:700 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Невдача при очищенні історії: %s\n" -#: ../midori/main.c:733 ../midori/main.c:747 +#: ../midori/main.c:714 ../midori/main.c:728 #, c-format msgid "Failed to add history item: %s\n" msgstr "Невдача при додаванні об'єкту історії: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:863 +#: ../midori/main.c:844 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Невдача видалення старого об'єкту історії: %s\n" -#: ../midori/main.c:995 ../midori/sokoke.c:457 +#: ../midori/main.c:976 ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Невдача при запису." -#: ../midori/main.c:1020 +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Завантаження" + +#: ../midori/main.c:1040 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" -#: ../midori/main.c:1052 +#: ../midori/main.c:1297 msgid "Run the specified filename as javascript" msgstr "Запустити визначений файл як джава-скрипт" -#: ../midori/main.c:1054 +#: ../midori/main.c:1299 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1056 +#: ../midori/main.c:1301 msgid "URIs" msgstr "посилання URIs" -#: ../midori/main.c:1090 +#: ../midori/main.c:1335 msgid "[URIs]" msgstr "[URIs]" -#: ../midori/main.c:1114 +#: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції баги для:" -#: ../midori/main.c:1116 +#: ../midori/main.c:1373 msgid "Check for new versions at:" msgstr "Перевірити наявність нової версії на:" -#: ../midori/main.c:1137 +#: ../midori/main.c:1394 msgid "No filename specified" msgstr "Не вказано назви файлу" -#: ../midori/main.c:1154 +#: ../midori/main.c:1411 #, c-format msgid "An instance of Midori is already running but not responding.\n" -msgstr "Один із екземплярів програми Midori вже працює але не відповідає на запити.\n" +msgstr "" +"Один із екземплярів програми Midori вже працює але не відповідає на запити.\n" -#: ../midori/main.c:1189 +#: ../midori/main.c:1447 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:1203 +#: ../midori/main.c:1463 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1215 +#: ../midori/main.c:1477 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:1228 +#: ../midori/main.c:1491 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:1241 +#: ../midori/main.c:1504 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:1400 +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Неможливо зберегти пошукову машину. %s" -#: ../midori/main.c:1410 +#: ../midori/main.c:1698 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Неможливо зберегти закладки. %s" -#: ../midori/main.c:1419 +#: ../midori/main.c:1707 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/main.c:1427 +#: ../midori/main.c:1715 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Неможливо зберегти конфігурацію. %s" -#: ../midori/midori-addons.c:87 ../midori/midori-websettings.c:207 -msgid "None" -msgstr "Нічого" - -#: ../midori/midori-addons.c:88 ../midori/midori-browser.c:3995 -msgid "Extensions" -msgstr "Розширення" - -#: ../midori/midori-addons.c:89 ../midori/midori-browser.c:3978 -msgid "Userscripts" -msgstr "Скрипти користувача" - -#: ../midori/midori-addons.c:90 ../midori/midori-browser.c:3986 -msgid "Userstyles" -msgstr "Стилі користувача" - -#: ../midori/midori-addons.c:1043 -msgid "_Enable" -msgstr "_Увімкнути" - -#: ../midori/midori-addons.c:1052 -msgid "_Disable" -msgstr "_Вимкнути" - -#: ../midori/midori-browser.c:251 ../midori/midori-browser.c:3138 -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:263 ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:321 +#: ../midori/midori-browser.c:319 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:342 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:511 +#: ../midori/midori-browser.c:508 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:533 +#: ../midori/midori-browser.c:530 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:546 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:862 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_Посилання:" -#: ../midori/midori-browser.c:581 +#: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:582 msgid "Root" msgstr "Адмін" -#: ../midori/midori-browser.c:664 +#: ../midori/midori-browser.c:668 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1246 +#: ../midori/midori-browser.c:1248 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2316 +#: ../midori/midori-browser.c:2328 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:2318 +#: ../midori/midori-browser.c:2330 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:2590 +#: ../midori/midori-browser.c:2601 msgid "Separator" msgstr "Роздільник" -#: ../midori/midori-browser.c:2702 +#: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" msgstr "Тижневої давності" -#: ../midori/midori-browser.c:2708 +#: ../midori/midori-browser.c:2718 #, c-format msgid "%d days ago" msgstr "%d днів тому" -#: ../midori/midori-browser.c:2715 +#: ../midori/midori-browser.c:2725 msgid "Today" msgstr "Сьогодні" -#: ../midori/midori-browser.c:2717 +#: ../midori/midori-browser.c:2727 msgid "Yesterday" msgstr "Вчора" -#: ../midori/midori-browser.c:2806 +#: ../midori/midori-browser.c:2816 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:2814 +#: ../midori/midori-browser.c:2824 msgid "translator-credits" msgstr "Dmitry Nikitin " -#: ../midori/midori-browser.c:2966 +#: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3064 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3067 msgid "Open a new window" msgstr "Відкрити в новому вікні" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3070 msgid "Open a new tab" msgstr "Відкрити в новій вкладці" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3073 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:3076 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3078 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:3087 +#: ../midori/midori-browser.c:3079 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3081 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3082 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3085 msgid "Print the current page" msgstr "Надрукувати поточну строрінку" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3088 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3090 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3093 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:3104 ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3102 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3105 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3108 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3111 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3113 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3114 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3116 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3117 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3120 msgid "_Quick Find" msgstr "_Швидкий пошук" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3121 msgid "Quickly jump to a word or phrase" msgstr "Швидкий перехід на слово або фразу" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3124 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3126 msgid "_View" msgstr "_Перегляд" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3127 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3139 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3142 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:3153 +#: ../midori/midori-browser.c:3145 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:3155 ../midori/midori-view.c:969 +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 msgid "View _Source" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3148 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3150 msgid "View Selection Source" msgstr "Переглянути вибраний код" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3151 msgid "View the source code of the selection" msgstr "Переглянути вихідний код вибраного" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3155 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3157 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3160 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3163 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3166 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:3176 -msgid "Open in Page_holder..." -msgstr "Відкрити в тримачі _сторінок..." - -#: ../midori/midori-browser.c:3177 -msgid "Open the current page in the pageholder" -msgstr "Відкрити поточну сторінку в тримачі сторінок" - -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3168 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3169 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:3182 ../midori/midori-view.c:941 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3172 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3176 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3179 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3182 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3185 msgid "Delete the selected history item" msgstr "Видалити вибраний об'єкт історії" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3188 msgid "Clear the entire history" msgstr "Очистити історію" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3191 msgid "Bookmark the selected history item" msgstr "Додати в закладки вибраний об'єкт історії" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:3206 ../midori/midori-searchaction.c:468 +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3196 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3200 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3201 msgid "Switch to the previous tab" msgstr "Перемкнути до попередньої вкладки" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3203 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3204 msgid "Switch to the next tab" msgstr "Перемкнути до наступної вкладки" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3206 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3208 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3209 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3211 msgid "_Frequent questions" msgstr "_Найуживаніші питання" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3212 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3214 msgid "_Report a bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3215 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Midori" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3218 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3225 msgid "P_rivate Browsing" msgstr "_Режим приватності" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3226 msgid "Don't save any private data while browsing" msgstr "Не зберізати будь яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3231 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3232 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3235 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3236 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3239 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3240 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3243 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3244 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3247 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3248 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3251 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3252 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:3680 +#: ../midori/midori-browser.c:3669 msgid "_Location..." msgstr "_Місцезнаходження..." -#: ../midori/midori-browser.c:3682 +#: ../midori/midori-browser.c:3671 msgid "Open a particular location" msgstr "Відкрити поточне місцезнаходження" -#: ../midori/midori-browser.c:3706 +#: ../midori/midori-browser.c:3695 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:3708 +#: ../midori/midori-browser.c:3697 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3716 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:3741 +#: ../midori/midori-browser.c:3729 msgid "_Recently visited pages" msgstr "_Останні відвідані сторінки" -#: ../midori/midori-browser.c:3743 +#: ../midori/midori-browser.c:3731 msgid "Reopen pages that you visited earlier" msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3746 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:3759 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:3775 +#: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3883 msgid "Bookmarks" msgstr "Закладки" -#: ../midori/midori-browser.c:3906 ../midori/midori-preferences.c:348 -msgid "Transfers" -msgstr "Завантаження" - -#: ../midori/midori-browser.c:3915 -msgid "Console" -msgstr "Консоль" - -#: ../midori/midori-browser.c:3959 ../midori/midori-preferences.c:519 +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 msgid "History" msgstr "Історія" -#. i18n: A panel showing a user specified web page -#: ../midori/midori-browser.c:3969 -msgid "Pageholder" -msgstr "Тримач сторінок" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:3969 msgid "_Inline find:" msgstr "Знайти _входження:" -#: ../midori/midori-browser.c:4073 +#: ../midori/midori-browser.c:4004 msgid "Match Case" msgstr "Входження" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:4012 msgid "Highlight Matches" msgstr "Підсвітити входження" -#: ../midori/midori-browser.c:4090 +#: ../midori/midori-browser.c:4021 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../midori/midori-browser.c:4336 +#: ../midori/midori-browser.c:4262 #, c-format msgid "Unexpected setting '%s'" msgstr "Невавершені властивості '%s'" -#: ../midori/midori-panel.c:207 ../midori/midori-panel.c:208 +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Закрити панель" -#: ../midori/midori-websettings.c:132 ../midori/midori-view.c:1559 +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-websettings.c:133 ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Домашня сторінка" -#: ../midori/midori-websettings.c:134 +#: ../midori/midori-websettings.c:133 msgid "Last open pages" msgstr "Останні відкриті сторінки" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:148 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:149 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:150 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:151 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:152 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-websettings.c:154 +#: ../midori/midori-websettings.c:153 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:168 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:169 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:170 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:185 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:186 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:187 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:188 msgid "Both" msgstr "Обидва" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:189 msgid "Both horizontal" msgstr "Обидва горизонтально" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:204 msgid "All cookies" msgstr "Всі куки" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:205 msgid "Session cookies" msgstr "Куки сесії" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Нічого" + +#: ../midori/midori-websettings.c:246 msgid "Remember last window size" msgstr "Запам'ятати останній розмір вікна" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:247 msgid "Whether to save the last window size" msgstr "Властивості збереження розміру вікна" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:255 msgid "Last window width" msgstr "Ширина останнього вікна" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:256 msgid "The last saved window width" msgstr "Остання збережена ширина вікна" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:264 msgid "Last window height" msgstr "Висота останнього вікна" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:265 msgid "The last saved window height" msgstr "Остання збережена висота вікна" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:273 msgid "Last panel position" msgstr "Остання позиція панелі" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:274 msgid "The last saved panel position" msgstr "Остання збережена позиція панелі" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "Last panel page" msgstr "Остання сторінка панелі" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:284 msgid "The last saved panel page" msgstr "Остання збережена сторінка панелі" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "Last Web search" msgstr "Останній пошук у Веб" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:293 msgid "The last saved Web search" msgstr "Останній збережений пошук у Веб" -#: ../midori/midori-websettings.c:299 -msgid "Last pageholder URI" -msgstr "Останнє посилання тримача сторінок" - -#: ../midori/midori-websettings.c:300 -msgid "The URI last opened in the pageholder" -msgstr "Останнє посилання відкрите у тримачі сторінок" - -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:302 msgid "Show Menubar" msgstr "Показати панель меню" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:303 msgid "Whether to show the menubar" msgstr "Налаштування відображення панелі меню" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:311 msgid "Show Navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:312 msgid "Whether to show the navigationbar" msgstr "Налаштування відображення панелі навігації" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:320 msgid "Show Bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:321 msgid "Whether to show the bookmarkbar" msgstr "Налаштування відображення панелі закладок" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:329 msgid "Show Panel" msgstr "Показати панель" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:330 msgid "Whether to show the panel" msgstr "Налаштування відображення панелі" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:338 msgid "Show Statusbar" msgstr "Показати панель стану" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:339 msgid "Whether to show the statusbar" msgstr "Налаштування відображення панелі стану" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:348 msgid "Toolbar Style" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:349 msgid "The style of the toolbar" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:358 msgid "Toolbar Items" msgstr "Об'єкти панелі інструментів" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:359 msgid "The items to show on the toolbar" msgstr "Об'єкти, що відображаються у панелі інструментів" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:367 msgid "Compact Sidepanel" msgstr "Компактна бічна панель" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:368 msgid "Whether to make the sidepanel compact" msgstr "Налаштування відображення компактної бічної панелі" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:377 msgid "Load on Startup" msgstr "Завантажити при старті" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:378 msgid "What to load on startup" msgstr "Що завантажувати при старті" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:388 msgid "The homepage" msgstr "Домашню сторінку" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:396 msgid "Download Folder" msgstr "Теку завантажень" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:397 msgid "The folder downloaded files are saved to" msgstr "Завантажені файли зберігати в" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:405 msgid "Download Manager" msgstr "Менеджер завантажень" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:406 msgid "An external download manager" msgstr "Зовнішній менеджер завантажень" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:414 msgid "Text Editor" msgstr "Текстовий редактор" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:415 msgid "An external text editor" msgstr "Зовнішній текстовий редактор" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:423 msgid "Location entry Search" msgstr "Місце початку пошуку" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:424 msgid "The search to perform inside the location entry" msgstr "Здійснювати пошук всередині місця входження" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:432 msgid "Preferred Encoding" msgstr "Улюблене кодування" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:433 msgid "The preferred character encoding" msgstr "Улюблене кодування символів" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:443 msgid "Always Show Tabbar" msgstr "Завжди відображати панель сторінок" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:444 msgid "Always show the tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:452 msgid "Close Buttons on Tabs" msgstr "Кнопки закриття на вкладках" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:453 msgid "Whether tabs have close buttons" msgstr "Чи матимуть вкладки кнопки закриття" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:462 msgid "Open new pages in" msgstr "Відкривати нові сторінки в" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:463 msgid "Where to open new pages" msgstr "Де відкривати нові сторінки" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:473 msgid "Open external pages in" msgstr "Відкривати зовнішні виклики сторінок в" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:474 msgid "Where to open externally opened pages" msgstr "Де відкривати сторінки зовнішнього виклику" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:483 msgid "Middle click opens Selection" msgstr "Середня кнопка відкриває виділене" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:484 msgid "Load an URL from the selection via middle click" -msgstr "Завантажувати посилання URL з виділеного через клацання середньої кнопки" +msgstr "" +"Завантажувати посилання URL з виділеного через клацання середньої кнопки" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:492 msgid "Open tabs in the background" msgstr "Відкривати вкладки в фонових" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:493 msgid "Whether to open new tabs in the background" msgstr "Чи відкривати нові вкладки в фоновому режимі" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:501 msgid "Open Tabs next to Current" msgstr "Відкривати вкладки у наступних після поточної" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" +msgstr "" +"Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" msgstr "Відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:511 msgid "Whether to open popup windows in tabs" msgstr "Чи відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:537 msgid "Accept cookies" msgstr "Приймати cookies" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:538 msgid "What type of cookies to accept" msgstr "Якого типу cookies приймати" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:547 msgid "Original cookies only" msgstr "Тільки оригінальніcookies" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:548 msgid "Accept cookies from the original website only" msgstr "Приймати cookies тільки з поточного сайту" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:556 msgid "Maximum cookie age" msgstr "Тривалість життя cookie" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:557 msgid "The maximum number of days to save cookies for" msgstr "Максимальне число днів зберігання cookies для" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:567 msgid "Remember last visited pages" msgstr "Запам'ятати останні відвідані сторінки" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:568 msgid "Whether the last visited pages are saved" msgstr "Чи зберігати останні відвідані сторінки" -#: ../midori/midori-websettings.c:565 +#: ../midori/midori-websettings.c:576 msgid "Maximum history age" msgstr "Тривалість життя історії" -#: ../midori/midori-websettings.c:566 +#: ../midori/midori-websettings.c:577 msgid "The maximum number of days to save the history for" msgstr "Максимальне число днів для зберігати історію для" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:585 msgid "Remember last form inputs" msgstr "Запам'ятовувати введене" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:586 msgid "Whether the last form inputs are saved" msgstr "Чи зберігати введене останнього разу" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:594 msgid "Remember last downloaded files" msgstr "Запам'ятовувати останні завантажені файли" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:595 msgid "Whether the last downloaded files are saved" msgstr "Чи зберігати останні завантажені файли" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:605 msgid "HTTP Proxy" msgstr "Проксі HTTP" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:606 msgid "The proxy used for HTTP connections" msgstr "Проксі, що використовується для HTTP з'єднань" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:614 msgid "Cache size" msgstr "Розмір кешу" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:615 msgid "The allowed size of the cache" msgstr "Дозволений розмір кешу" -#: ../midori/midori-view.c:873 +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" msgstr "Відкривати посилання у нових в_кладках" -#: ../midori/midori-view.c:896 +#: ../midori/midori-view.c:925 msgid "_Save Link destination" msgstr "Збер_ігати віддаленні посилання" -#: ../midori/midori-view.c:904 +#: ../midori/midori-view.c:933 msgid "_Download Link destination" msgstr "За_вантажувати віддалені посилання" -#: ../midori/midori-view.c:926 +#: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" msgstr "Відкривати URL у нових вкла_дках" -#: ../midori/midori-view.c:1293 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:1431 +#: ../midori/midori-view.c:1503 msgid "Source" msgstr "Вихідний код" +#: ../midori/midori-view.c:1527 +#, fuzzy, c-format +msgid "No documentation installed" +msgstr "Показати документацію" + #: ../midori/midori-preferences.c:87 #, c-format msgid "Preferences for %s" msgstr "Властивості для %s" #. Page "General" -#: ../midori/midori-preferences.c:336 +#: ../midori/midori-preferences.c:338 msgid "General" msgstr "Основні" -#: ../midori/midori-preferences.c:337 +#: ../midori/midori-preferences.c:339 msgid "Startup" msgstr "Початкові" #. Page "Appearance" -#: ../midori/midori-preferences.c:384 +#: ../midori/midori-preferences.c:386 msgid "Appearance" msgstr "Зовнішній вигляд" -#: ../midori/midori-preferences.c:385 +#: ../midori/midori-preferences.c:387 msgid "Font settings" msgstr "Властивості шрифту" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:389 msgid "Default Font Family" msgstr "Типове сімейство шрифтів" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:397 msgid "Minimum Font Size" msgstr "Мінімальний розмір шрифту" #. Page "Behavior" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:407 msgid "Behavior" msgstr "Заголовок" -#: ../midori/midori-preferences.c:406 +#: ../midori/midori-preferences.c:408 msgid "Features" msgstr "Опції" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Автоматично завантажувати зображення" -#: ../midori/midori-preferences.c:412 +#: ../midori/midori-preferences.c:414 msgid "Shrink images automatically" msgstr "Автоматично зменшувати зображення" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:417 msgid "Print background images" msgstr "Друкувати фонові зображення" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:420 msgid "Resizable text areas" msgstr "Межі тексту змінюють розмір" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Дозволити скрипти" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Дозволити розширення" @@ -1229,64 +1197,64 @@ msgid "Enable developer tools" msgstr "Дозволити утиліти розробника" #. Page "Interface" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Інтерфейс" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Панель навігації" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:453 msgid "Browsing" msgstr "Перегляд сторінок" -#: ../midori/midori-preferences.c:482 ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 msgid "Network" msgstr "Мережа" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:492 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:498 msgid "Privacy" msgstr "Приватність" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:500 msgid "Web Cookies" msgstr "Веб Cookies" -#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 msgid "days" msgstr "днів" -#: ../midori/midori-searchaction.c:459 ../katze/katze-arrayaction.c:289 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Порожня" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Add search engine" msgstr "Додати пошукову машину" -#: ../midori/midori-searchaction.c:804 +#: ../midori/midori-searchaction.c:797 msgid "Edit search engine" msgstr "Редагувати пошукову машину" -#: ../midori/midori-searchaction.c:832 +#: ../midori/midori-searchaction.c:825 msgid "_Name:" msgstr "_Назва:" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:869 msgid "_Icon (name or file):" msgstr "_Значок (назва або файл):" -#: ../midori/midori-searchaction.c:890 +#: ../midori/midori-searchaction.c:883 msgid "_Token:" msgstr "_Ознака:" -#: ../midori/midori-searchaction.c:1067 +#: ../midori/midori-searchaction.c:1060 msgid "Manage search engines" msgstr "Керувати пошуковими машинами" @@ -1294,7 +1262,7 @@ msgstr "Керувати пошуковими машинами" msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/sokoke.c:283 +#: ../midori/sokoke.c:282 msgid "Warning: You are using a superuser account!" msgstr "Попередження: Ви використовуєте права адміністратора!" @@ -1317,6 +1285,30 @@ msgstr "%s не може бути призначено для %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s неможливо отримати доступ" +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Скрипти користувача" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Стилі користувача" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Увімкнути" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Вимкнути" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Консоль" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Розширення" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1331,16 +1323,49 @@ msgstr "Значок лічильника '%s' не може бути заван msgid "Animation frames are broken" msgstr "Фрейми анімації пошкоджені" -#: ../katze/katze-utils.c:147 ../katze/katze-utils.c:334 +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Властивості '%s' неправильні для %s" -#: ../katze/katze-utils.c:169 ../katze/katze-utils.c:205 +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Вибрати файл" -#: ../katze/katze-utils.c:187 +#: ../katze/katze-utils.c:198 msgid "Choose folder" msgstr "Вибрати теку" +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Тримач сторінок" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Тримач сторінки" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +#, fuzzy +msgid "Scripts" +msgstr "Скрипти користувача" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" + +#~ msgid "Open in Page_holder..." +#~ msgstr "Відкрити в тримачі _сторінок..." + +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Відкрити поточну сторінку в тримачі сторінок" + +#~ msgid "Last pageholder URI" +#~ msgstr "Останнє посилання тримача сторінок" + +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Останнє посилання відкрите у тримачі сторінок" diff --git a/wscript b/wscript index 14891841..44b6d4e4 100644 --- a/wscript +++ b/wscript @@ -286,7 +286,7 @@ def shutdown (): size_old = os.stat (APPNAME + '.pot').st_size except: size_old = 0 - subprocess.call (['intltool-update', '--pot']) + subprocess.call (['intltool-update', '-p', '-g', APPNAME]) size_new = os.stat (APPNAME + '.pot').st_size if size_new <> size_old: Params.pprint ('YELLOW', "Updated po template.") From c94258fe67df6ee9b9dfcae3716ad00f907bf1e4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 05:43:24 +0100 Subject: [PATCH 0550/2970] Fix translation updating in build script --- wscript | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index 44b6d4e4..35b39722 100644 --- a/wscript +++ b/wscript @@ -260,15 +260,16 @@ def shutdown (): if not Params.g_options.destdir: # update the pixmap cache directory try: - uic = subprocess.Popen (['gtk-update-icon-cache', '-q', '-f', '-t', dir], - stderr=subprocess.PIPE) + uic = subprocess.Popen (['gtk-update-icon-cache', + '-q', '-f', '-t', dir], stderr=subprocess.PIPE) if not uic.wait (): Params.pprint ('YELLOW', "Updated Gtk icon cache.") icon_cache_updated = True except: Params.pprint ('RED', "Failed to update icon cache.") if not icon_cache_updated: - Params.pprint ('YELLOW', "Icon cache not updated. After install, run this:") + Params.pprint ('YELLOW', "Icon cache not updated. " + "After install, run this:") Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) elif Params.g_commands['check']: @@ -291,8 +292,8 @@ def shutdown (): if size_new <> size_old: Params.pprint ('YELLOW', "Updated po template.") try: - intltool_update = subprocess.Popen (['intltool-update', '-r'], - stderr=subprocess.PIPE) + intltool_update = subprocess.Popen (['intltool-update', + '-r', '-g', APPNAME], stderr=subprocess.PIPE) intltool_update.wait () Params.pprint ('YELLOW', "Updated translations.") except: From 24a2bdc7ca87189131d10d2b881729286c740c66 Mon Sep 17 00:00:00 2001 From: Evaggelos Balaskas Date: Sat, 6 Dec 2008 05:53:35 +0100 Subject: [PATCH 0551/2970] Add Greek translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/el.po | 1358 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1360 insertions(+), 1 deletion(-) create mode 100644 po/el.po diff --git a/AUTHORS b/AUTHORS index 7e7f0779..6b628c25 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,6 +22,7 @@ Graphics: Translations: de: Enrico Tröger de: Christian Dywan + el: Evaggelos Balaskas en_GB: Bastien Nocera en_GB: Abigail Brady es: Miguel Anxo Bouzada diff --git a/po/LINGUAS b/po/LINGUAS index 3e86930d..b0a83b7f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de en_GB es et fi fr gl hu id nl pl ru sv tr uk +de el en_GB es et fi fr gl hu id nl pl ru sv tr uk diff --git a/po/el.po b/po/el.po new file mode 100644 index 00000000..5144a86e --- /dev/null +++ b/po/el.po @@ -0,0 +1,1358 @@ +# Greek translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Evaggelos Balaskas 2008 +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-06 05:50+0100\n" +"PO-Revision-Date: 2008-12-03 13:14+0200\n" +"Last-Translator: Evaggelos Balaskas \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Ελαφρύς περιηγητής ιστού" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 +#: ../midori/main.c:1370 ../midori/main.c:1394 +msgid "Midori" +msgstr "Μιντόρι" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Περιηγητής Ιστού" + +#: ../midori/main.c:86 +msgid "_Bookmark" +msgstr "_Σελιδοδείκτης" + +#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +msgid "_Bookmarks" +msgstr "_Σελιδοδείκτες" + +#: ../midori/main.c:88 +msgid "_Add Bookmark" +msgstr "_Προσθήκη σελιδοδείκτη" + +#: ../midori/main.c:89 +msgid "_Console" +msgstr "_Τερματικό" + +#: ../midori/main.c:90 +msgid "_Extensions" +msgstr "_Επεκτάσεις" + +#: ../midori/main.c:91 +msgid "_History" +msgstr "_Ιστορικό" + +#: ../midori/main.c:92 +msgid "_Homepage" +msgstr "_Αρχική σελίδα" + +#: ../midori/main.c:93 +msgid "_Userscripts" +msgstr "_Δέσμες ενεργειών χρήστη" + +#: ../midori/main.c:94 +msgid "User_styles" +msgstr "_Θέματα χρήστη" + +#: ../midori/main.c:95 +msgid "New _Tab" +msgstr "Νέα _καρτέλα" + +#: ../midori/main.c:96 +msgid "_Transfers" +msgstr "_Μεταφορές" + +#: ../midori/main.c:97 +msgid "_Closed Tabs and Windows" +msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" + +#: ../midori/main.c:98 +msgid "New _Window" +msgstr "Νέο _παράθυρο" + +#: ../midori/main.c:143 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n" + +#: ../midori/main.c:198 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" + +#: ../midori/main.c:205 ../midori/main.c:275 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" + +#: ../midori/main.c:532 +msgid "File not found." +msgstr "Το αρχείο δεν βρέθηκε." + +#: ../midori/main.c:540 ../midori/main.c:549 +msgid "Malformed document." +msgstr "Κακοσχηματισμένο έγγραφο." + +#: ../midori/main.c:571 ../midori/main.c:603 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n" + +#: ../midori/main.c:657 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" + +#: ../midori/main.c:681 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Αποτυχία στον καθαρισμό του ιστορικού: %s\n" + +#: ../midori/main.c:714 ../midori/main.c:728 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Αποτυχία στην προσθήκη ενός αντικειμένου στο ιστορικό: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n" + +#: ../midori/main.c:976 ../midori/sokoke.c:459 +#, c-format +msgid "Writing failed." +msgstr "Αποτυχία εγγραφής." + +#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Μεταφορές" + +#: ../midori/main.c:1040 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Η συνεδρία δεν μπορεί να αποθηκευτεί. %s" + +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" + +#: ../midori/main.c:1299 +msgid "Display program version" +msgstr "Προβολή έκδοσης προγράμματος" + +#: ../midori/main.c:1301 +msgid "URIs" +msgstr "URIs" + +#: ../midori/main.c:1335 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1371 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" + +#: ../midori/main.c:1373 +msgid "Check for new versions at:" +msgstr "Έλεγχος για νέα έκδοση στο:" + +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "Δεν ορίστηκε όνομα αρχείου" + +#: ../midori/main.c:1411 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Όλα τα στιγμιότυπα του Μιντόρι τρέχουν ήδη αλλά δεν ανταποκρίνονται.\n" + +#: ../midori/main.c:1447 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" + +#: ../midori/main.c:1463 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" + +#: ../midori/main.c:1477 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Τα απορρίματα δεν μπορούν να φορτωθούν: %s\n" + +#: ../midori/main.c:1491 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Το ιστορικό δεν μπορεί να φορτωθεί: %s\n" + +#: ../midori/main.c:1504 +msgid "The following errors occured:" +msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" + +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Οι μηχανές αναζήτησης δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/main.c:1698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Οι σελιδοδείκτες δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/main.c:1707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Τα απορρίματα δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/main.c:1715 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 +msgid "Reload the current page" +msgstr "Ανανέωση της τρέχουσας σελίδας" + +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +msgid "Stop loading the current page" +msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% φορτώθηκε" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Αναπάντεχη ενέργεια '%s'." + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Νέος σελιδοδείκτης" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Επεξεργασία σελιδοδείκτη" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Τίτλος:" + +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Περιγραφή:" + +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_Διεύθυνση:" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Φάκελος:" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Ρίζα" + +#: ../midori/midori-browser.c:668 +msgid "Save file as" +msgstr "Αποθήκευση αρχείου ως" + +#: ../midori/midori-browser.c:1248 +msgid "Open file" +msgstr "Άνοιγμα αρχείου" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Άνοιγμα σε νέα_καρτέλα" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Άνοιγμα σε νέο _παραθύρο" + +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Διαχωριστικό" + +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "Μια βδομάδα πριν" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "%d μέρες πριν" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "Σήμερα" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "Χτές" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "Ένας ελαφρύς περιηγητής ιστού" + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "Ευάγγελος Μπαλάσκας 2008" + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "" +"Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Αρχείο" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "Άνοιγμα ενός νέου παραθύρου" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Άνοιγμα μίας νέας καρτέλας" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "Άνοιγμα αρχείου" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Αποθήκευση σε αρχείου" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "_Κλείσιμο καρτέλας" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "Κλείσιμο της τρέχουσας καρτέλας" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "Κ_λείσιμο παραθύρου" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "Κλείσιμο αυτού του παραθύρου" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "Εκτύπωση της τρέχουσας σελίδας" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Έξοδος από την εφαρμογή" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "_Επεξεργασία" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "Αποκοπή επιλεγμένου κειμένου" + +#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "Αντιγραφή επιλεγμένου κειμένου" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Επικόλληση κειμένου από το πρόχειρο" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "Διαγραφή του επιλεγμένου κειμένου" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Επιλογή όλου του κειμένου" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "Εύρεση επ_όμενο" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "Εύρεση _προηγούμενο" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "_Έξοδος αναζήτησης" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "Γρήγορα μεταπήδησε στον λέξη ή στην φράση" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Εμφάνιση" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "_Εργαλειοθήκες" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "Αύξηση του επίπεδου εστίασης" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "Μείωση του επιπέδου εστίασης" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "Επαναφορά του επιπέδου εστίασης" + +#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +msgid "View _Source" +msgstr "Προβολή _κώδικα" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Προβολή του επιλεγμένου κώδικα" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "Προβολή του πηγαίου κώδικα του επιλεγμένου" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Εναλλαγή σε πλήρη οθόνη" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "_Μετάβαση" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "Μετάβαση στην προηγούμενη σελίδα" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "Μετάβαση στην επόμενη σελίδα" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "Μετάβαση στην αρχική σελίδα" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Άδειασμα αποριμμάτων" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "Διαγραφή των περιεχομένων των απορριμάτων" + +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Αναίρεση κλείσιμο καρτέλας" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "Προσθήκη ενός νέου σελιδοδείκτη" + +#: ../midori/midori-browser.c:3179 +msgid "Edit the selected bookmark" +msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" + +#: ../midori/midori-browser.c:3182 +msgid "Delete the selected bookmark" +msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" + +#: ../midori/midori-browser.c:3185 +msgid "Delete the selected history item" +msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "Καθαρισμός ολόκληρου του ιστορικού" + +#: ../midori/midori-browser.c:3191 +msgid "Bookmark the selected history item" +msgstr "Σελιδοποίησε το επιλεγμένο αντικείμενο του ιστορικού" + +#: ../midori/midori-browser.c:3193 +msgid "_Tools" +msgstr "_Εργαλεία" + +#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +msgid "_Manage Search Engines" +msgstr "_Διαχείριση των μηχανών αναζήτησης" + +#: ../midori/midori-browser.c:3196 +msgid "Add, edit and remove search engines..." +msgstr "Προσθήξη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." + +#: ../midori/midori-browser.c:3200 +msgid "_Previous Tab" +msgstr "_Προηγούμενη καρτέλα" + +#: ../midori/midori-browser.c:3201 +msgid "Switch to the previous tab" +msgstr "Μετάβαση στην προηγούμενη καρτέλα" + +#: ../midori/midori-browser.c:3203 +msgid "_Next Tab" +msgstr "Επόμε_νη καρτέλα" + +#: ../midori/midori-browser.c:3204 +msgid "Switch to the next tab" +msgstr "Μετάβαση στην επόμενη καρτέλα" + +#: ../midori/midori-browser.c:3206 +msgid "_Help" +msgstr "_Βοήθεια" + +#: ../midori/midori-browser.c:3208 +msgid "_Contents" +msgstr "_Περιεχόμενα" + +#: ../midori/midori-browser.c:3209 +msgid "Show the documentation" +msgstr "Εμφάνιση της τεκμηρίωσης" + +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "_Συχνές ερωτήσεις" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "Εμφάνιση των συχνών απαντημένων ερωτήσεων" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "Αποστολή α_ναφοράς σφάλματος" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" + +#: ../midori/midori-browser.c:3218 +msgid "Show information about the program" +msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" + +#: ../midori/midori-browser.c:3225 +msgid "P_rivate Browsing" +msgstr "Π_ροσωπική περιήγηση" + +#: ../midori/midori-browser.c:3226 +msgid "Don't save any private data while browsing" +msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" + +#: ../midori/midori-browser.c:3231 +msgid "_Menubar" +msgstr "_Μπάρα μενού" + +#: ../midori/midori-browser.c:3232 +msgid "Show menubar" +msgstr "Προβολή μπάρας μενού" + +#: ../midori/midori-browser.c:3235 +msgid "_Navigationbar" +msgstr "_Μπάρα περιήγησης" + +#: ../midori/midori-browser.c:3236 +msgid "Show navigationbar" +msgstr "Εμφάνιση περιήγησης" + +#: ../midori/midori-browser.c:3239 +msgid "Side_panel" +msgstr "Πλαϊνό _ταμπλό" + +#: ../midori/midori-browser.c:3240 +msgid "Show sidepanel" +msgstr "Εμφάνιση πλαϊνού ταμπλό" + +#: ../midori/midori-browser.c:3243 +msgid "_Bookmarkbar" +msgstr "_Μπάρα σελιδοδείκτη" + +#: ../midori/midori-browser.c:3244 +msgid "Show bookmarkbar" +msgstr "Εμφάνιση μπάρα σελιδοδείκτη" + +#: ../midori/midori-browser.c:3247 +msgid "_Transferbar" +msgstr "_Μπάρα μεταφορών" + +#: ../midori/midori-browser.c:3248 +msgid "Show transferbar" +msgstr "Εμφάνιση μπάρα μεταφορών" + +#: ../midori/midori-browser.c:3251 +msgid "_Statusbar" +msgstr "_Γραμμή κατάστασης" + +#: ../midori/midori-browser.c:3252 +msgid "Show statusbar" +msgstr "Εμφάνιση γραμμής κατάστασης" + +#: ../midori/midori-browser.c:3669 +msgid "_Location..." +msgstr "_Τοποθεσία:" + +#: ../midori/midori-browser.c:3671 +msgid "Open a particular location" +msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" + +#: ../midori/midori-browser.c:3695 +msgid "_Web Search..." +msgstr "_Αναζήτηση ιστού..." + +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "Εκκίνηση μίας αναζήτησης ιστού" + +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" + +#: ../midori/midori-browser.c:3729 +msgid "_Recently visited pages" +msgstr "_Πρόσφατες επισκεπτόμενες σελίδες " + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "Ξανα-άνοιγμα σελίδεων που έχετε επισκεφτεί νωρίτερα" + +#: ../midori/midori-browser.c:3746 +msgid "Show the saved bookmarks" +msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Παράθυρο" + +#: ../midori/midori-browser.c:3761 +msgid "Show a list of all open tabs" +msgstr "Εμφάνιση μίας λίστας με όλα τις ανοιχτές καρτέλες" + +#: ../midori/midori-browser.c:3883 +msgid "Bookmarks" +msgstr "Σελιδοδείκτες" + +#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +msgid "History" +msgstr "Ιστορικό" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 +msgid "_Inline find:" +msgstr "Εν_σωματωμένη εύρεση:" + +#: ../midori/midori-browser.c:4004 +msgid "Match Case" +msgstr "Ταίριασμα πεζών" + +#: ../midori/midori-browser.c:4012 +msgid "Highlight Matches" +msgstr "Τονισμός των ταιριασμάτων" + +#: ../midori/midori-browser.c:4021 +msgid "Close Findbar" +msgstr "Κλείσιμο μπάρας εύρεσης" + +#: ../midori/midori-browser.c:4262 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Αναπάντεχη ρύθμιση '%s'" + +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "Κλείσιμο ταμπλού" + +#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +msgid "Blank page" +msgstr "Κενή σελίδα" + +#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +msgid "Homepage" +msgstr "Αρχική σελίδα" + +#: ../midori/midori-websettings.c:133 +msgid "Last open pages" +msgstr "Άνοιγμα τελευταίων σελίδων" + +#: ../midori/midori-websettings.c:148 +msgid "Chinese (BIG5)" +msgstr "Κινέζικα (BIG5)" + +#: ../midori/midori-websettings.c:149 +msgid "Japanese (SHIFT_JIS)" +msgstr "Ιαπωνικά (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:150 +msgid "Russian (KOI8-R)" +msgstr "Ρωσικά (KOI8-R)" + +#: ../midori/midori-websettings.c:151 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:152 +msgid "Western (ISO-8859-1)" +msgstr "Δυτικά (ISO-8859-1)" + +#: ../midori/midori-websettings.c:153 +msgid "Custom..." +msgstr "Προσαρμογή..." + +#: ../midori/midori-websettings.c:168 +msgid "New tab" +msgstr "Νέα καρτέλα" + +#: ../midori/midori-websettings.c:169 +msgid "New window" +msgstr "Νέο παράθυρο" + +#: ../midori/midori-websettings.c:170 +msgid "Current tab" +msgstr "Τρέχον καρτέλα" + +#: ../midori/midori-websettings.c:185 +msgid "Default" +msgstr "Προκαθορισμένο" + +#: ../midori/midori-websettings.c:186 +msgid "Icons" +msgstr "Εικονίδια" + +#: ../midori/midori-websettings.c:187 +msgid "Text" +msgstr "Κείμενο" + +#: ../midori/midori-websettings.c:188 +msgid "Both" +msgstr "Και τα δύο" + +#: ../midori/midori-websettings.c:189 +msgid "Both horizontal" +msgstr "Και τα δύο οριζόντια" + +#: ../midori/midori-websettings.c:204 +msgid "All cookies" +msgstr "Όλα τα cookies" + +#: ../midori/midori-websettings.c:205 +msgid "Session cookies" +msgstr "Cookies συνεδρίας" + +#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +msgid "None" +msgstr "Κανένα" + +#: ../midori/midori-websettings.c:246 +msgid "Remember last window size" +msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου" + +#: ../midori/midori-websettings.c:247 +msgid "Whether to save the last window size" +msgstr "Αποθήκευση του μεγέθους του τελευταίου παραθύρου όπως και να έχει" + +#: ../midori/midori-websettings.c:255 +msgid "Last window width" +msgstr "Πλάτος τελευταίου παραθύρου" + +#: ../midori/midori-websettings.c:256 +msgid "The last saved window width" +msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" + +#: ../midori/midori-websettings.c:264 +msgid "Last window height" +msgstr "Ύψος τελευταίου παραθύρου" + +#: ../midori/midori-websettings.c:265 +msgid "The last saved window height" +msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" + +#: ../midori/midori-websettings.c:273 +msgid "Last panel position" +msgstr "Θέση τελευταίου ταμπλό" + +#: ../midori/midori-websettings.c:274 +msgid "The last saved panel position" +msgstr "Η τελευταία αποθηκευμένη θέση ταμπλό" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 +msgid "Last panel page" +msgstr "Τελευταία σελίδα ταμπλό" + +#: ../midori/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "Η τελευταία αποθηκευμένη σελίδα ταμπλό" + +#: ../midori/midori-websettings.c:292 +msgid "Last Web search" +msgstr "Τελευταία αναζήτηση ιστού" + +#: ../midori/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" + +#: ../midori/midori-websettings.c:302 +msgid "Show Menubar" +msgstr "Εμφάνιση γραμμής μενού" + +#: ../midori/midori-websettings.c:303 +msgid "Whether to show the menubar" +msgstr "Εμφάνιση της μπάρας μενού όπως και να 'χει" + +#: ../midori/midori-websettings.c:311 +msgid "Show Navigationbar" +msgstr "Εμφάνιση της γραμμής πλοήγησης" + +#: ../midori/midori-websettings.c:312 +msgid "Whether to show the navigationbar" +msgstr "Εμφάνιση της γραμμής πλοήγησης όπως και να 'χει" + +#: ../midori/midori-websettings.c:320 +msgid "Show Bookmarkbar" +msgstr "Εμφάνιση μπάρας σελιδοδεικτών" + +#: ../midori/midori-websettings.c:321 +msgid "Whether to show the bookmarkbar" +msgstr "Εμφάνιση μπάρας σελιλοδεικτών όπως και να 'χει" + +#: ../midori/midori-websettings.c:329 +msgid "Show Panel" +msgstr "Εμφάνιση ταμπλό" + +#: ../midori/midori-websettings.c:330 +msgid "Whether to show the panel" +msgstr "Εμφάνιση ταμπλό όπως και να 'χει" + +#: ../midori/midori-websettings.c:338 +msgid "Show Statusbar" +msgstr "Εμφάνιση γραμμής κατάστασης" + +#: ../midori/midori-websettings.c:339 +msgid "Whether to show the statusbar" +msgstr "Εμφάνιση γραμμής κατάστασης όπως και να 'χει" + +#: ../midori/midori-websettings.c:348 +msgid "Toolbar Style" +msgstr "Στυλ εργαλειοθήκης" + +#: ../midori/midori-websettings.c:349 +msgid "The style of the toolbar" +msgstr "Το στυλ της εργαλειοθήκης" + +#: ../midori/midori-websettings.c:358 +msgid "Toolbar Items" +msgstr "Αντικείμενα εργαλειοθήκης" + +#: ../midori/midori-websettings.c:359 +msgid "The items to show on the toolbar" +msgstr "Τι αντικειμένα να εμφανίζονται στην εργαλειοθήκη" + +#: ../midori/midori-websettings.c:367 +msgid "Compact Sidepanel" +msgstr "Σύμπτυξη πλαϊνού ταμπλό" + +#: ../midori/midori-websettings.c:368 +msgid "Whether to make the sidepanel compact" +msgstr "Δημιουργία σύμπτυξης πλαϊνού ταμπλό όπως και να 'χει" + +#: ../midori/midori-websettings.c:377 +msgid "Load on Startup" +msgstr "Να φορτώνεται στην εκκίνηση" + +#: ../midori/midori-websettings.c:378 +msgid "What to load on startup" +msgstr "Τι να φορτώνει κατά την εκκίνηση" + +#: ../midori/midori-websettings.c:388 +msgid "The homepage" +msgstr "Η αρχική σελίδα" + +#: ../midori/midori-websettings.c:396 +msgid "Download Folder" +msgstr "Φάκελος μεταφορών" + +#: ../midori/midori-websettings.c:397 +msgid "The folder downloaded files are saved to" +msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" + +#: ../midori/midori-websettings.c:405 +msgid "Download Manager" +msgstr "Διαχειριστής μεταφορών" + +#: ../midori/midori-websettings.c:406 +msgid "An external download manager" +msgstr "Εξωτερικός διαχειριστής μεταφορών" + +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "Κειμενογράφος" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "Εξωτερικός κειμενογράφος" + +#: ../midori/midori-websettings.c:423 +msgid "Location entry Search" +msgstr "Διεύθυνση για αναζήτηση" + +#: ../midori/midori-websettings.c:424 +msgid "The search to perform inside the location entry" +msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" + +#: ../midori/midori-websettings.c:432 +msgid "Preferred Encoding" +msgstr "Προτιμώμενη κωδικοποίηση" + +#: ../midori/midori-websettings.c:433 +msgid "The preferred character encoding" +msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" + +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "Εμφάνιση πάντα της γραμμής καρτέλων" + +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "Εμφάνιση πάντα της γραμμής καρτέλων" + +#: ../midori/midori-websettings.c:452 +msgid "Close Buttons on Tabs" +msgstr "Κουμπιά κλεισίματος σε καρτέλες" + +#: ../midori/midori-websettings.c:453 +msgid "Whether tabs have close buttons" +msgstr "Οι καρτέλες έχουν κουμπιά κλεισίματος όπως και να 'χει" + +#: ../midori/midori-websettings.c:462 +msgid "Open new pages in" +msgstr "Άνοιγμα νέων σελίδων σε" + +#: ../midori/midori-websettings.c:463 +msgid "Where to open new pages" +msgstr "Που να ανοίγουν οι νέες σελίδες" + +#: ../midori/midori-websettings.c:473 +msgid "Open external pages in" +msgstr "Άνοιγμα εξωτερικών σελίδων σε" + +#: ../midori/midori-websettings.c:474 +msgid "Where to open externally opened pages" +msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" + +#: ../midori/midori-websettings.c:483 +msgid "Middle click opens Selection" +msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" + +#: ../midori/midori-websettings.c:484 +msgid "Load an URL from the selection via middle click" +msgstr "Φόρτωση ενός URL από την επιλογή μέσω του μεσαίου κλικ" + +#: ../midori/midori-websettings.c:492 +msgid "Open tabs in the background" +msgstr "Άνοιγμα καρτέλων στο παρασκήνιο" + +#: ../midori/midori-websettings.c:493 +msgid "Whether to open new tabs in the background" +msgstr "Άνοιγμα νέων καρτέλων στο παρασκήνιο όπως και να 'χει" + +#: ../midori/midori-websettings.c:501 +msgid "Open Tabs next to Current" +msgstr "Άνοιγμα καρτέλων δίπλα στο τρέχων" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" +"Άνοιγμα νέων καρτέλων δίπλα στην τρέχων καρτέλα ή πίσω από το τελευταίο όπως " +"και να 'χει" + +#: ../midori/midori-websettings.c:510 +msgid "Open popups in tabs" +msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" + +#: ../midori/midori-websettings.c:511 +msgid "Whether to open popup windows in tabs" +msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες όπως και να 'χει" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies" +msgstr "Αποδοχή cookies" + +#: ../midori/midori-websettings.c:538 +msgid "What type of cookies to accept" +msgstr "Τι τύπο cookies να γίνονται αποδεκτά" + +#: ../midori/midori-websettings.c:547 +msgid "Original cookies only" +msgstr "Πρωτότυπα cookies μόνο" + +#: ../midori/midori-websettings.c:548 +msgid "Accept cookies from the original website only" +msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους" + +#: ../midori/midori-websettings.c:556 +msgid "Maximum cookie age" +msgstr "Μέγιστος χρόνος cookie" + +#: ../midori/midori-websettings.c:557 +msgid "The maximum number of days to save cookies for" +msgstr "Το μέγιστο σε μέρες για να αποθηκεύονται τα cookies " + +#: ../midori/midori-websettings.c:567 +msgid "Remember last visited pages" +msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων" + +#: ../midori/midori-websettings.c:568 +msgid "Whether the last visited pages are saved" +msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων όπως και να 'χει" + +#: ../midori/midori-websettings.c:576 +msgid "Maximum history age" +msgstr "Μέγιστο χρόνος ιστορικού" + +#: ../midori/midori-websettings.c:577 +msgid "The maximum number of days to save the history for" +msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" + +#: ../midori/midori-websettings.c:585 +msgid "Remember last form inputs" +msgstr "Απομνημόνευση των τελευταίων εισαγωγών" + +#: ../midori/midori-websettings.c:586 +msgid "Whether the last form inputs are saved" +msgstr "Απομνημόνευση των τελευταίων εισαγωγών όπως και να 'χει" + +#: ../midori/midori-websettings.c:594 +msgid "Remember last downloaded files" +msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" + +#: ../midori/midori-websettings.c:595 +msgid "Whether the last downloaded files are saved" +msgstr "Που αποθηκεύτηκαν τα τελευταία αρχεία που κατέβηκαν" + +#: ../midori/midori-websettings.c:605 +msgid "HTTP Proxy" +msgstr "Μεσολαβητής http" + +#: ../midori/midori-websettings.c:606 +msgid "The proxy used for HTTP connections" +msgstr "Χρησιμοποιείται μεσολαβητής για http συνδέσεις" + +#: ../midori/midori-websettings.c:614 +msgid "Cache size" +msgstr "Μέγεθος προσωρινής μνήμης" + +#: ../midori/midori-websettings.c:615 +msgid "The allowed size of the cache" +msgstr "Το επιτρεπόμενο μέγεθος της προσωρινής μνήμης" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:902 +msgid "Open Link in New _Tab" +msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" + +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "Απ_οθήκευση συνδέσμου προορισμού" + +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "Κ_ατέβασμα συνδέσμου προορισμού" + +#: ../midori/midori-view.c:955 +msgid "Open URL in New _Tab" +msgstr "Άνοιγμα URL σε νέα κ_αρτέλα" + +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" +msgstr "Εξέταση σελίδα -%s" + +#: ../midori/midori-view.c:1503 +msgid "Source" +msgstr "Πηγή" + +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "Προτιμήσεις για %s" + +#. Page "General" +#: ../midori/midori-preferences.c:338 +msgid "General" +msgstr "Γενικά" + +#: ../midori/midori-preferences.c:339 +msgid "Startup" +msgstr "Εκκίνηση" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:386 +msgid "Appearance" +msgstr "Εμφάνιση" + +#: ../midori/midori-preferences.c:387 +msgid "Font settings" +msgstr "Ρυθμίσεις γραμματοσειράς" + +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "Προεπιλεγμένη οικογένεια γραμματοσειράς" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "Ελάχιστο μέγεθος γραμματοσειράς" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:407 +msgid "Behavior" +msgstr "Συμπεριφορά" + +#: ../midori/midori-preferences.c:408 +msgid "Features" +msgstr "Χαρακτηριστικά" + +#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "Αυτόματη φόρτωση εικόνων" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "Αυτόματη σμίκρυνσης εικόνων" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "Εκτύπωση εικόνων παρασκηνίου" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "Αυξομείωση περιοχών κειμένου" + +#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +msgid "Enable scripts" +msgstr "Ενεργοποίηση δεσμών ενεργειών" + +#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "Ενεργοποίηση αρθρωμάτων" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "Ενεργοποίηση εργαλείων ανάπτυξης" + +#. Page "Interface" +#: ../midori/midori-preferences.c:437 +msgid "Interface" +msgstr "Διεπαφή" + +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Γραμμή πλοηγήσης" + +#: ../midori/midori-preferences.c:453 +msgid "Browsing" +msgstr "Περιήγηση" + +#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +msgid "Network" +msgstr "Δίκτυο" + +#: ../midori/midori-preferences.c:492 +msgid "MB" +msgstr "ΜΒ" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" +msgstr "Προσωπικό απόρρητο" + +#: ../midori/midori-preferences.c:500 +msgid "Web Cookies" +msgstr "Cookies ιστού" + +#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +msgid "days" +msgstr "ημέρες" + +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "Άδειο" + +#: ../midori/midori-searchaction.c:797 +msgid "Add search engine" +msgstr "Προσθήκη μηχανής αναζήτησης" + +#: ../midori/midori-searchaction.c:797 +msgid "Edit search engine" +msgstr "Επεξεργασία μηχανής αναζήτησης" + +#: ../midori/midori-searchaction.c:825 +msgid "_Name:" +msgstr "_Όνομα:" + +#: ../midori/midori-searchaction.c:869 +msgid "_Icon (name or file):" +msgstr "Ει_κονίδιο (όνομα ή αρχείο):" + +#: ../midori/midori-searchaction.c:883 +msgid "_Token:" +msgstr "_Μορφότυπο:" + +#: ../midori/midori-searchaction.c:1060 +msgid "Manage search engines" +msgstr "Διαχείριση μηχανών αναζήτησης" + +#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." + +#: ../midori/sokoke.c:282 +msgid "Warning: You are using a superuser account!" +msgstr "Προειδοποίηση: Χρησιμοποιείται λογαριασμό με δικαιώματα διαχειριστή" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Συνέβει ένα άγνωστο σφάλμα." + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s δεν έχει ιδιότητα '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s δεν μπορεί να οριστεί στο %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s δεν μποορεί να προσπελαστεί" + +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Δέσμες ενεργειών χρήστη" + +#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Θέματα χρήστη" + +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Ενεργοποίηση" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Απενεργοποίηση" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Τερματικό" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Επεκτάσεις" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Το εικονίδο Named '%s' δεν μπορεί να φορτωθεί" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Το εικονίδο Stock '%s' δεν μπορεί να φορτωθεί" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" + +#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s" + +#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +msgid "Choose file" +msgstr "Επιλογή αρχείου" + +#: ../katze/katze-utils.c:198 +msgid "Choose folder" +msgstr "Επιλογή φακέλου" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Αποθήκευση Σελίδων" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "_Αποθήκευση σελίδων" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "" From 6f4b895dfb8cb0f6246bd23b38d0f1a9b85512b9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 14:25:42 +0100 Subject: [PATCH 0552/2970] Fix view context menu items such as View source --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 500e3509..a125d5ec 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -864,7 +864,7 @@ midori_web_view_menu_action_activate_cb (GtkWidget* widget, MidoriView* view) { const gchar* action = g_object_get_data (G_OBJECT (widget), "action"); - g_signal_emit (view, ACTIVATE_ACTION, 0, action); + g_signal_emit (view, signals[ACTIVATE_ACTION], 0, action); } static void From 3cbe78e5ee5165b1fc0df239ac07387a07377a8c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 6 Dec 2008 14:35:54 +0100 Subject: [PATCH 0553/2970] Escape page uri and title when inserting into database --- midori/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index 2bed84d5..2722f97d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -716,13 +716,13 @@ midori_history_add_item_cb (KatzeArray* array, return; } } - sqlcmd = g_strdup_printf ("INSERT INTO history VALUES" - "('%s', '%s', %" G_GUINT64_FORMAT ", -1)", + sqlcmd = sqlite3_mprintf ("INSERT INTO history VALUES" + "('%q', '%q', %" G_GUINT64_FORMAT ", -1)", katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item)); success = db_exec (db, sqlcmd, &error); - g_free (sqlcmd); + sqlite3_free (sqlcmd); if (!success) { g_printerr (_("Failed to add history item: %s\n"), error->message); From 23a4ba1a8df36f74cfe0a612737bf42fcd5df97a Mon Sep 17 00:00:00 2001 From: Evaggelos Balaskas Date: Sat, 6 Dec 2008 14:38:18 +0100 Subject: [PATCH 0554/2970] Update Greek translation --- po/el.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/el.po b/po/el.po index 5144a86e..16c51151 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-06 05:50+0100\n" -"PO-Revision-Date: 2008-12-03 13:14+0200\n" +"PO-Revision-Date: 2008-12-06 09:57+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ msgstr "_Αρχική σελίδα" #: ../midori/main.c:93 msgid "_Userscripts" -msgstr "_Δέσμες ενεργειών χρήστη" +msgstr "_Σενάρια χρήστη" #: ../midori/main.c:94 msgid "User_styles" @@ -203,7 +203,7 @@ msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" #: ../midori/main.c:1520 msgid "_Ignore" -msgstr "" +msgstr "Α_γνόησε" #: ../midori/main.c:1688 #, c-format @@ -1096,7 +1096,7 @@ msgstr "Το επιτρεπόμενο μέγεθος της προσωρινής #: ../midori/midori-view.c:632 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Δεν βρέθηκε - %s" #: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" @@ -1126,7 +1126,7 @@ msgstr "Πηγή" #: ../midori/midori-view.c:1527 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" #: ../midori/midori-preferences.c:87 #, c-format @@ -1186,7 +1186,7 @@ msgstr "Αυξομείωση περιοχών κειμένου" #: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 msgid "Enable scripts" -msgstr "Ενεργοποίηση δεσμών ενεργειών" +msgstr "Ενεργοποίηση σεναρίων" #: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 msgid "Enable plugins" @@ -1287,7 +1287,7 @@ msgstr "%s.%s δεν μποορεί να προσπελαστεί" #: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 msgid "Userscripts" -msgstr "Δέσμες ενεργειών χρήστη" +msgstr "Σενάρια χρηστών" #: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 msgid "Userstyles" @@ -1347,12 +1347,12 @@ msgstr "_Αποθήκευση σελίδων" #: ../extensions/statusbar-features.c:30 msgid "Images" -msgstr "" +msgstr "Εικόνες" #: ../extensions/statusbar-features.c:37 msgid "Scripts" -msgstr "" +msgstr "Σενάρια" #: ../extensions/statusbar-features.c:44 msgid "Plugins" -msgstr "" +msgstr "Αρθρώματα" From 09a334c3e22f1d8201353817818139d2283ef2d6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 01:56:42 +0100 Subject: [PATCH 0555/2970] Refactor waf options to allow enable/disable consistently Particularly Gentoo's way of packaging allows users to specify all features of a package manually, therefore we allow enabling options and cause a fatal error if the dependency is not satisfied. --- wscript | 84 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/wscript b/wscript index 35b39722..5622ceab 100644 --- a/wscript +++ b/wscript @@ -27,29 +27,43 @@ except: srcdir = '.' blddir = '_build_' +def option_enabled (option): + if eval ('Params.g_options.enable_' + option): + return True + if eval ('Params.g_options.disable_' + option): + return False + return True + def configure (conf): + def option_checkfatal (option, desc): + if eval ('Params.g_options.enable_' + option): + Params.pprint ('RED', desc + ' not available') + sys.exit (1) + conf.check_tool ('compiler_cc') - if not Params.g_options.disable_docs: + if option_enabled ('user_docs'): conf.find_program ('rst2html.py', var='RST2HTML') # debian renames the executable, check that as well :( if not conf.env['RST2HTML']: conf.find_program ('rst2html', var='RST2HTML') if conf.env['RST2HTML']: - docs = 'yes' + user_docs = 'yes' else: - docs = 'not available' + option_checkfatal ('user_docs', 'user documentation') + user_docs = 'not available' else: - docs = 'no' - conf.check_message_custom ('generate', 'user documentation', docs) + user_docs = 'no' + conf.check_message_custom ('generate', 'user documentation', user_docs) - if not Params.g_options.disable_nls: + if option_enabled ('nls'): conf.check_tool ('intltool') if conf.env['INTLTOOL'] and conf.env['POCOM']: nls = 'yes' conf.define ('ENABLE_NLS', 1) conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) else: + option_checkfatal ('nls', 'localization') nls = 'not available' else: nls = 'no' @@ -75,7 +89,7 @@ def configure (conf): docdir = Params.g_options.docdir conf.define ('DOCDIR', docdir) - if Params.g_options.enable_api_docs: + if option_enabled ('api_docs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') conf.find_program ('gtkdoc-mktmpl', var='GTKDOC_MKTMPL') conf.find_program ('gtkdoc-mkdb', var='GTKDOC_MKDB') @@ -84,31 +98,35 @@ def configure (conf): and conf.env['GTKDOC_MKDB'] and conf.env['GTKDOC_MKHTML']: api_docs = 'yes' else: + option_checkfatal ('api_docs', 'API documentation') api_docs = 'not available' else: api_docs = 'no' conf.check_message_custom ('generate', 'API documentation', api_docs) - if not Params.g_options.disable_unique: + if option_enabled ('unique'): conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) single_instance = ['not available','yes'][conf.env['HAVE_UNIQUE'] == 1] else: + option_checkfatal ('unique', 'single instance') single_instance = 'no' conf.check_message_custom ('single instance', 'support', single_instance) - if not Params.g_options.disable_libsoup: + if option_enabled ('libsoup'): conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP', mandatory=False) conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP_2_25_2', vnum='2.25.2', mandatory=False) libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] else: + option_checkfatal ('libsoup', 'libsoup') libsoup = 'no' conf.check_message_custom ('libsoup', 'support', libsoup) - if not Params.g_options.disable_sqlite: + if option_enabled ('sqlite'): conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] else: + option_checkfatal ('sqlite', 'history database') sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) @@ -155,33 +173,32 @@ def configure (conf): print def set_options (opt): + def add_enable_option (option, desc): + option_ = option.replace ('-', '_') + opt.add_option ('--enable-' + option, action='store_true', + default=False, help='Enable ' + desc, dest='enable_' + option_) + opt.add_option ('--disable-' + option, action='store_true', + default=False, help='Disable ' + desc, dest='disable_' + option_) + opt.tool_options ('compiler_cc') opt.tool_options ('intltool') - opt.add_option ('--docdir', type='string', default='', - help='Documentation root', dest='docdir') - opt.add_option ('--disable-docs', action='store_true', default=False, - help='Disables user documentation', dest='disable_docs') - - opt.add_option ('--disable-nls', action='store_true', default=False, - help='Disables native language support', dest='disable_nls') - - opt.add_option ('--disable-unique', action='store_true', default=False, - help='Disables Unique support', dest='disable_unique') - opt.add_option ('--disable-libsoup', action='store_true', default=False, - help='Disables libsoup support', dest='disable_libsoup') - opt.add_option ('--disable-sqlite', action='store_true', default=False, - help='Disables sqlite support', dest='disable_sqlite') - - opt.add_option ('--enable-api-docs', action='store_true', default=False, - help='Enables API documentation', dest='enable_api_docs') - + add_enable_option ('nls', 'native language support') opt.add_option ('--update-po', action='store_true', default=False, help='Update localization files', dest='update_po') + opt.add_option ('--docdir', type='string', default='', + help='Documentation root', dest='docdir') + add_enable_option ('docs', 'informational text files') + add_enable_option ('user-docs', 'user documentation') + add_enable_option ('api-docs', 'API documentation') + + add_enable_option ('unique', 'single instance support') + add_enable_option ('libsoup', 'libSoup support') + add_enable_option ('sqlite', 'history database support') + opt.add_option ('--libdir', type='string', default='', help='Library root', dest='libdir') - opt.add_option ('--disable-extensions', action='store_true', default=False, - help='Disables building of extensions', dest='disable_extensions') + add_enable_option ('extensions', 'building of extensions') def build (bld): def mkdir (path): @@ -196,11 +213,12 @@ def build (bld): bld.add_subdirs ('katze midori icons') - if not Params.g_options.disable_extensions: + if option_enabled ('extensions'): bld.add_subdirs ('extensions') - install_files ('DOCDIR', '/' + APPNAME + '/', \ - 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') + if option_enabled ('docs'): + install_files ('DOCDIR', '/' + APPNAME + '/', \ + 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') if bld.env ()['RST2HTML']: # FIXME: Build only if needed From ae2b0c1700d9d60c000a0da17e3685924dd4b5d3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 04:00:00 +0100 Subject: [PATCH 0556/2970] Group build options and warn if docutils or gtk-doc is missing --- wscript | 67 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/wscript b/wscript index 5622ceab..bb6da46e 100644 --- a/wscript +++ b/wscript @@ -42,7 +42,7 @@ def configure (conf): conf.check_tool ('compiler_cc') - if option_enabled ('user_docs'): + if option_enabled ('userdocs'): conf.find_program ('rst2html.py', var='RST2HTML') # debian renames the executable, check that as well :( if not conf.env['RST2HTML']: @@ -50,7 +50,7 @@ def configure (conf): if conf.env['RST2HTML']: user_docs = 'yes' else: - option_checkfatal ('user_docs', 'user documentation') + option_checkfatal ('userdocs', 'user documentation') user_docs = 'not available' else: user_docs = 'no' @@ -89,7 +89,7 @@ def configure (conf): docdir = Params.g_options.docdir conf.define ('DOCDIR', docdir) - if option_enabled ('api_docs'): + if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') conf.find_program ('gtkdoc-mktmpl', var='GTKDOC_MKTMPL') conf.find_program ('gtkdoc-mkdb', var='GTKDOC_MKDB') @@ -98,7 +98,7 @@ def configure (conf): and conf.env['GTKDOC_MKDB'] and conf.env['GTKDOC_MKHTML']: api_docs = 'yes' else: - option_checkfatal ('api_docs', 'API documentation') + option_checkfatal ('apidocs', 'API documentation') api_docs = 'not available' else: api_docs = 'no' @@ -171,34 +171,55 @@ def configure (conf): print "History storage on disk is unavailable in this build." print " Install sqlite3 and reconfigure to enable it." print + if user_docs == 'not available': + print "User documentation is unavailable in this build." + print " Install docutils and reconfigure to enable it." + print + if api_docs == 'not available': + print "API documentation is unavailable in this build." + print " Install gtk-doc and reconfigure to enable it." + print def set_options (opt): - def add_enable_option (option, desc): + def add_enable_option (option, desc, group=None, disable=False): + if group == None: + group = opt option_ = option.replace ('-', '_') - opt.add_option ('--enable-' + option, action='store_true', + group.add_option ('--enable-' + option, action='store_true', default=False, help='Enable ' + desc, dest='enable_' + option_) - opt.add_option ('--disable-' + option, action='store_true', - default=False, help='Disable ' + desc, dest='disable_' + option_) + group.add_option ('--disable-' + option, action='store_true', + default=disable, help='Disable ' + desc, dest='disable_' + option_) opt.tool_options ('compiler_cc') opt.tool_options ('intltool') - add_enable_option ('nls', 'native language support') - opt.add_option ('--update-po', action='store_true', default=False, - help='Update localization files', dest='update_po') - opt.add_option ('--docdir', type='string', default='', + group = opt.add_option_group ('Directories', '') + if (opt.parser.get_option ('--prefix')): + opt.parser.remove_option ('--prefix') + group.add_option ('--prefix', type='string', default='/usr/local', + help='installation prefix (configuration only)', dest='prefix') + if (opt.parser.get_option ('--datadir')): + opt.parser.remove_option ('--datadir') + group.add_option ('--datadir', type='string', default='', + help='read-only application data', dest='prefix') + group.add_option ('--docdir', type='string', default='', help='Documentation root', dest='docdir') - add_enable_option ('docs', 'informational text files') - add_enable_option ('user-docs', 'user documentation') - add_enable_option ('api-docs', 'API documentation') - - add_enable_option ('unique', 'single instance support') - add_enable_option ('libsoup', 'libSoup support') - add_enable_option ('sqlite', 'history database support') - - opt.add_option ('--libdir', type='string', default='', + group.add_option ('--libdir', type='string', default='', help='Library root', dest='libdir') - add_enable_option ('extensions', 'building of extensions') + + group = opt.add_option_group ('Localization and documentation', '') + add_enable_option ('nls', 'native language support', group) + group.add_option ('--update-po', action='store_true', default=False, + help='Update localization files', dest='update_po') + add_enable_option ('docs', 'informational text files', group) + add_enable_option ('userdocs', 'user documentation', group) + add_enable_option ('apidocs', 'API documentation', group, disable=True) + + group = opt.add_option_group ('Optional features', '') + add_enable_option ('unique', 'single instance support', group) + add_enable_option ('libsoup', 'libSoup support', group) + add_enable_option ('sqlite', 'history database support', group) + add_enable_option ('addons', 'building of extensions', group) def build (bld): def mkdir (path): @@ -213,7 +234,7 @@ def build (bld): bld.add_subdirs ('katze midori icons') - if option_enabled ('extensions'): + if option_enabled ('addons'): bld.add_subdirs ('extensions') if option_enabled ('docs'): From 588744fdda36d9619310641ab1a80ea2eb1093d7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 05:10:08 +0100 Subject: [PATCH 0557/2970] Generate and install desktop file also without intltool --- wscript | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index bb6da46e..39958919 100644 --- a/wscript +++ b/wscript @@ -271,11 +271,26 @@ def build (bld): obj.inst_var = 'DATADIR' obj.inst_dir = 'applications' obj.flags = '-d' - else: - # FIXME: process desktop.in without intltool - Params.pprint ('BLUE', "File " + APPNAME + ".desktop not generated") - if bld.env ()['INTLTOOL']: install_files ('DATADIR', 'applications', APPNAME + '.desktop') + else: + folder = os.path.dirname (bld.env ()['waf_config_files'][0]) + desktop = APPNAME + '.desktop' + pre = open (desktop + '.in') + after = open (folder + '/' + desktop, 'w') + try: + for line in pre: + if line != '': + if line[0] == '_': + after.write (line[1:]) + else: + after.write (line) + after.close () + Params.pprint ('BLUE', desktop + '.in -> ' + desktop) + _install_files ('DATADIR', 'applications', folder + '/' + desktop) + except: + Params.pprint ('BLUE', 'File ' + desktop + ' not generated') + finally: + pre.close () if bld.env ()['RSVG_CONVERT']: mkdir (blddir + '/data') From 7e68ef90c0dde5c927dc3e742daf602034d44243 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 05:58:40 +0100 Subject: [PATCH 0558/2970] Fix prefix and datadir usage --- wscript | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wscript b/wscript index 39958919..18aa8010 100644 --- a/wscript +++ b/wscript @@ -196,12 +196,12 @@ def set_options (opt): group = opt.add_option_group ('Directories', '') if (opt.parser.get_option ('--prefix')): opt.parser.remove_option ('--prefix') - group.add_option ('--prefix', type='string', default='/usr/local', - help='installation prefix (configuration only)', dest='prefix') + group.add_option ('--prefix', type='string', default='/usr/local', + help='installation prefix (configuration only)', dest='prefix') if (opt.parser.get_option ('--datadir')): opt.parser.remove_option ('--datadir') - group.add_option ('--datadir', type='string', default='', - help='read-only application data', dest='prefix') + group.add_option ('--datadir', type='string', default='', + help='read-only application data', dest='datadir') group.add_option ('--docdir', type='string', default='', help='Documentation root', dest='docdir') group.add_option ('--libdir', type='string', default='', @@ -255,7 +255,7 @@ def build (bld): '../../../docs/user/midori.txt', 'midori.html',]) os.chdir ('../../..') - install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') + _install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') if bld.env ()['INTLTOOL']: obj = bld.create_obj ('intltool_po') @@ -264,6 +264,7 @@ def build (bld): if bld.env ()['GTKDOC_SCAN'] and Params.g_commands['build']: bld.add_subdirs ('docs/api') + _install_files ('DOCDIR', '/midori/api/', blddir + '/docs/api/*') if bld.env ()['INTLTOOL']: obj = bld.create_obj ('intltool_in') @@ -271,7 +272,7 @@ def build (bld): obj.inst_var = 'DATADIR' obj.inst_dir = 'applications' obj.flags = '-d' - install_files ('DATADIR', 'applications', APPNAME + '.desktop') + _install_files ('DATADIR', 'applications', APPNAME + '.desktop') else: folder = os.path.dirname (bld.env ()['waf_config_files'][0]) desktop = APPNAME + '.desktop' From 86dcb8b284ad98a4b605aab3863c38665c4174fc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 15:12:42 +0100 Subject: [PATCH 0559/2970] Implement Accept Cookies and Maximum Cookie Age preferences --- midori/main.c | 62 +++++++++++++++++++++++++------------ midori/midori-preferences.c | 12 ++++++- midori/midori-websettings.c | 4 +-- 3 files changed, 56 insertions(+), 22 deletions(-) diff --git a/midori/main.c b/midori/main.c index 2722f97d..cfd01acb 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1234,6 +1234,10 @@ cookie_jar_changed_cb (SoupCookieJar* jar, SoupCookie* new_cookie, gchar* filename) { + MidoriApp* app; + MidoriWebSettings* settings; + MidoriAcceptCookies accept_cookies; + if (old_cookie) delete_cookie (filename, old_cookie); @@ -1241,15 +1245,31 @@ cookie_jar_changed_cb (SoupCookieJar* jar, { FILE *out; - out = fopen (filename, "a"); - if (!out) - return; + app = g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-app")); + settings = katze_object_get_object (G_OBJECT (app), "settings"); + accept_cookies = katze_object_get_enum (settings, "accept-cookies"); + if (accept_cookies == MIDORI_ACCEPT_COOKIES_NONE) + { + soup_cookie_jar_delete_cookie (jar, new_cookie); + } + else if (accept_cookies == MIDORI_ACCEPT_COOKIES_SESSION + && new_cookie->expires) + { + soup_cookie_jar_delete_cookie (jar, new_cookie); + } + else if (new_cookie->expires) + { + gint age = katze_object_get_int (settings, "maximum-cookie-age"); + soup_cookie_set_max_age (new_cookie, + age * SOUP_COOKIE_MAX_AGE_ONE_DAY); - if (new_cookie->expires) + if (!(out = fopen (filename, "a"))) + return; write_cookie (out, new_cookie); - - if (fclose (out) != 0) - return; + if (fclose (out) != 0) + return; + } } } @@ -1268,6 +1288,8 @@ cookie_jar_constructed_cb (GObject* object) if (old_jar_constructed_cb) old_jar_constructed_cb (object); + g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-has-jar"), (void*)1); config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); @@ -1346,18 +1368,6 @@ main (int argc, stock_items_init (); g_set_application_name (_("Midori")); - #if HAVE_LIBSOUP_2_25_2 - /* This is a nasty trick that allows us to manipulate cookies - even without having a pointer to the jar. */ - soup_cookie_jar_get_type (); - SoupCookieJarClass* jar_class = g_type_class_ref (SOUP_TYPE_COOKIE_JAR); - if (jar_class) - { - old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; - G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; - } - #endif - if (version) { g_print ( @@ -1413,6 +1423,20 @@ main (int argc, return 1; } + #if HAVE_LIBSOUP_2_25_2 + /* This is a nasty trick that allows us to manipulate cookies + even without having a pointer to the jar. */ + soup_cookie_jar_get_type (); + SoupCookieJarClass* jar_class = g_type_class_ref (SOUP_TYPE_COOKIE_JAR); + if (jar_class) + { + g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-app"), app); + old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; + G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; + } + #endif + /* Load configuration files */ GString* error_messages = g_string_new (NULL); gchar* config_path = g_build_filename (g_get_user_config_dir (), diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 5785773a..5d35664f 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -20,6 +20,10 @@ #include #include +#if HAVE_LIBSOUP + #include +#endif + struct _MidoriPreferences { GtkDialog parent_instance; @@ -496,12 +500,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); - #if 0 + #if HAVE_LIBSOUP_2_25_2 FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "accept-cookies", NULL); + /* If a cookie jar was created, WebKit is using Soup */ + gtk_widget_set_sensitive (button, g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-has-jar")) != NULL); FILLED_ADD (button, 1, 2, 0, 1); button = katze_property_proxy (settings, "original-cookies-only", "blurb"); SPANNED_ADD (button, 0, 2, 1, 2); @@ -509,6 +516,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 2, 3); hbox = gtk_hbox_new (FALSE, 4); entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); + /* If a cookie jar was created, WebKit is using Soup */ + gtk_widget_set_sensitive (entry, g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-has-jar")) != NULL); gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index dd735ce7..36bcfeca 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -538,7 +538,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("What type of cookies to accept"), MIDORI_TYPE_ACCEPT_COOKIES, MIDORI_ACCEPT_COOKIES_ALL, - G_PARAM_READABLE)); + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_ORIGINAL_COOKIES_ONLY, @@ -556,7 +556,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Maximum cookie age"), _("The maximum number of days to save cookies for"), 0, G_MAXINT, 30, - G_PARAM_READABLE)); + G_PARAM_READWRITE)); From 191a613fc89f443cbb11160948723adc7d9ab48e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 21:36:42 +0100 Subject: [PATCH 0560/2970] Share one session among all KatzeNet instances --- katze/katze-net.c | 20 ++++++++++++++------ midori/midori-view.c | 4 +--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 0df4e2dc..d8b0a405 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -61,13 +61,19 @@ katze_net_object_maybe_unref (gpointer object) static void katze_net_init (KatzeNet* net) { + #if HAVE_LIBSOUP + static SoupSession* session = NULL; + #endif + net->memory = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, katze_net_object_maybe_unref); net->cache_path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, NULL); #if HAVE_LIBSOUP - net->session = soup_session_async_new (); + if (!session) + session = soup_session_async_new (); + net->session = session; #endif } @@ -85,17 +91,19 @@ katze_net_finalize (GObject* object) /** * katze_net_new: * - * Instantiates a new #KatzeNet singleton. - * - * Subsequent calls will ref the initial instance. + * Instantiates a new #KatzeNet instance. * * Return value: a new #KatzeNet **/ KatzeNet* katze_net_new (void) { - KatzeNet* net = g_object_new (KATZE_TYPE_NET, - NULL); + static KatzeNet* net = NULL; + + if (!net) + net = g_object_new (KATZE_TYPE_NET, NULL); + else + g_object_ref (net); return net; } diff --git a/midori/midori-view.c b/midori/midori-view.c index a125d5ec..9e03bdf3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -502,7 +502,7 @@ midori_view_class_init (MidoriViewClass* class) "Net", "The associated net", KATZE_TYPE_NET, - G_PARAM_READWRITE)); + flags)); } static void @@ -1098,8 +1098,6 @@ midori_view_init (MidoriView* view) view->download_manager = NULL; - view->net = katze_net_new (); - g_object_connect (view, "signal::notify::icon", midori_view_notify_icon_cb, NULL, From 716fe0e9c5caf45d5dab919409da9e38f03a1e92 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 7 Dec 2008 21:38:00 +0100 Subject: [PATCH 0561/2970] Implement HTTP authentication with libSoup --- midori/main.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index cfd01acb..b54330cc 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1053,6 +1053,8 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } +typedef void (*GObjectConstructed) (GObject*); + #if HAVE_LIBSOUP_2_25_2 /* Cookie jar saving to Mozilla format Copyright (C) 2008 Xan Lopez @@ -1277,9 +1279,8 @@ cookie_jar_changed_cb (SoupCookieJar* jar, load and save cookies. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its network backend and we can pass our own jar. */ -typedef void (*GObjectConstructed) (GObject*); static GObjectConstructed old_jar_constructed_cb; -void +static void cookie_jar_constructed_cb (GObject* object) { gchar* config_path; @@ -1303,6 +1304,148 @@ cookie_jar_constructed_cb (GObject* object) } #endif +#if HAVE_LIBSOUP +static void +authentication_dialog_response_cb (GtkWidget* dialog, + gint response, + SoupAuth* auth) +{ + GtkWidget* username; + GtkWidget* password; + SoupSession* session; + SoupMessage* msg; + + if (response == GTK_RESPONSE_OK) + { + + username = g_object_get_data (G_OBJECT (dialog), "username"); + password = g_object_get_data (G_OBJECT (dialog), "password"); + + soup_auth_authenticate (auth, + gtk_entry_get_text (GTK_ENTRY (username)), + gtk_entry_get_text (GTK_ENTRY (password))); + } + + session = g_object_get_data (G_OBJECT (dialog), "session"); + msg = g_object_get_data (G_OBJECT (dialog), "msg"); + gtk_widget_destroy (dialog); + if (g_object_get_data (G_OBJECT (msg), "paused")) + soup_session_unpause_message (session, msg); + g_object_unref (auth); +} + +static void +soup_session_authenticate_cb (SoupSession* session, + SoupMessage* msg, + SoupAuth* auth, + gboolean retrying, + MidoriApp* app) +{ + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + GtkWidget* hbox; + GtkWidget* image; + GtkWidget* label; + GtkWidget* align; + GtkWidget* entry; + + /* We want to ask for authentication exactly once, so we + enforce this with a tag. There might be a better way. */ + if (!retrying && g_object_get_data (G_OBJECT (msg), "midori-session-tag")) + return; + + if (soup_message_is_keepalive (msg)) + { + /* We use another tag to indicate whether a message is paused. + There doesn't seem to be API in libSoup to find that out. */ + soup_session_pause_message (session, msg); + g_object_set_data (G_OBJECT (msg), "paused", (void*)1); + } + g_object_set_data (G_OBJECT (msg), "midori-session-tag", (void*)1); + + dialog = gtk_dialog_new_with_buttons (_("Authentication Required"), + katze_object_get_object (app, "browser"), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), + GTK_STOCK_DIALOG_AUTHENTICATION); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5); + hbox = gtk_hbox_new (FALSE, 6); + image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, + GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + label = gtk_label_new (_("A username and a password are required\n" + "to open this location:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + label = gtk_label_new (soup_auth_get_host (auth)); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), label); + /* If the realm is merely the host, omit the realm label */ + if (g_strcmp0 (soup_auth_get_host (auth), soup_auth_get_realm (auth))) + { + label = gtk_label_new (soup_auth_get_realm (auth)); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), label); + } + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + hbox = gtk_hbox_new (FALSE, 6); + label = gtk_label_new (_("Username")); + align = gtk_alignment_new (0, 0.5, 0, 0); + gtk_container_add (GTK_CONTAINER (align), label); + gtk_size_group_add_widget (sizegroup, align); + gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); + entry = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + g_object_set_data (G_OBJECT (dialog), "username", entry); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + hbox = gtk_hbox_new (FALSE, 6); + label = gtk_label_new (_("Password")); + align = gtk_alignment_new (0, 0.5, 0, 0); + gtk_container_add (GTK_CONTAINER (align), label); + gtk_size_group_add_widget (sizegroup, align); + gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); + entry = gtk_entry_new_with_max_length (32); + gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + g_object_set_data (G_OBJECT (dialog), "password", entry); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + + g_object_set_data (G_OBJECT (dialog), "session", session); + g_object_set_data (G_OBJECT (dialog), "msg", msg); + g_signal_connect (dialog, "response", + G_CALLBACK (authentication_dialog_response_cb), g_object_ref (auth)); + gtk_widget_show (dialog); +} + +/* The following code hooks up to any created soup session in order to + modify preferences. This is *not* a generally advisable technique + but merely a preliminary workaround until WebKit exposes its session. */ +static GObjectConstructed old_session_constructed_cb; +static void +soup_session_constructed_cb (GObject* object) +{ + MidoriApp* app; + SoupSession* session; + + if (old_session_constructed_cb) + old_session_constructed_cb (object); + app = g_type_get_qdata (SOUP_TYPE_SESSION, + g_quark_from_static_string ("midori-app")); + + session = SOUP_SESSION (object); + g_signal_connect (session, "authenticate", + G_CALLBACK (soup_session_authenticate_cb), app); +} +#endif + int main (int argc, char** argv) @@ -1436,6 +1579,19 @@ main (int argc, G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; } #endif + #if HAVE_LIBSOUP + /* This is a nasty trick that allows us to manipulate preferences + even without having a pointer to the session. */ + soup_session_get_type (); + SoupSessionClass* session_class = g_type_class_ref (SOUP_TYPE_SESSION); + if (session_class) + { + g_type_set_qdata (SOUP_TYPE_SESSION, + g_quark_from_static_string ("midori-app"), app); + old_session_constructed_cb = G_OBJECT_CLASS (session_class)->constructed; + G_OBJECT_CLASS (session_class)->constructed = soup_session_constructed_cb; + } + #endif /* Load configuration files */ GString* error_messages = g_string_new (NULL); From e1075f1aae5cc3ab2e8790b7aa0cb726923f1bb6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 8 Dec 2008 23:15:05 +0100 Subject: [PATCH 0562/2970] Link to GThread, to fix non-soup Midori with soup-WebKit --- midori/wscript_build | 2 +- wscript | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/wscript_build b/midori/wscript_build index 4c4f17cb..4423f43f 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -6,5 +6,5 @@ obj = bld.create_obj ('cc', 'program') obj.target = 'midori' obj.includes = '. .. ../panels' obj.find_sources_in_dirs ('. ../panels') -obj.uselib = 'UNIQUE LIBSOUP GMODULE GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 18aa8010..3ea523e0 100644 --- a/wscript +++ b/wscript @@ -131,6 +131,7 @@ def configure (conf): conf.check_message_custom ('history database', 'support', sqlite) conf.check_pkg ('gmodule-2.0', destvar='GMODULE', vnum='2.8.0', mandatory=False) + conf.check_pkg ('gthread-2.0', destvar='GTHREAD', vnum='2.8.0', mandatory=False) conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) From 219c6bdf4c368f1fda1e8a6886d3579fbba5830c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 8 Dec 2008 23:18:14 +0100 Subject: [PATCH 0563/2970] Provide identification string and proxy server preferences This works with libSoup stable, if WebKit uses libSoup. --- midori/main.c | 20 ++++- midori/midori-preferences.c | 45 +++++++--- midori/midori-websettings.c | 164 +++++++++++++++++++++++++++++++++++- midori/midori-websettings.h | 16 +++- 4 files changed, 228 insertions(+), 17 deletions(-) diff --git a/midori/main.c b/midori/main.c index b54330cc..32cea376 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1274,7 +1274,9 @@ cookie_jar_changed_cb (SoupCookieJar* jar, } } } +#endif +#if HAVE_LIBSOUP /* The following code hooks up to any created cookie jar in order to load and save cookies. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its @@ -1283,15 +1285,18 @@ static GObjectConstructed old_jar_constructed_cb; static void cookie_jar_constructed_cb (GObject* object) { + #if HAVE_LIBSOUP_2_25_2 gchar* config_path; gchar* config_file; SoupCookieJar* jar; + #endif if (old_jar_constructed_cb) old_jar_constructed_cb (object); g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"), (void*)1); + #if HAVE_LIBSOUP_2_25_2 config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); g_mkdir_with_parents (config_path, 0700); @@ -1301,6 +1306,7 @@ cookie_jar_constructed_cb (GObject* object) g_signal_connect_data (jar, "changed", G_CALLBACK (cookie_jar_changed_cb), config_file, (GClosureNotify)g_free, 0); + #endif } #endif @@ -1433,12 +1439,22 @@ static void soup_session_constructed_cb (GObject* object) { MidoriApp* app; + MidoriWebSettings* settings; SoupSession* session; + SoupURI* proxy_uri; if (old_session_constructed_cb) old_session_constructed_cb (object); app = g_type_get_qdata (SOUP_TYPE_SESSION, g_quark_from_static_string ("midori-app")); + settings = katze_object_get_object (app, "settings"); + proxy_uri = soup_uri_new (katze_object_get_string (settings, "http-proxy")); + g_object_set (object, + "user-agent", katze_object_get_string (settings, "ident-string"), + "proxy-uri", proxy_uri, + NULL); + if (proxy_uri) + soup_uri_free (proxy_uri); session = SOUP_SESSION (object); g_signal_connect (session, "authenticate", @@ -1566,7 +1582,7 @@ main (int argc, return 1; } - #if HAVE_LIBSOUP_2_25_2 + #if HAVE_LIBSOUP /* This is a nasty trick that allows us to manipulate cookies even without having a pointer to the jar. */ soup_cookie_jar_get_type (); @@ -1578,8 +1594,6 @@ main (int argc, old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; } - #endif - #if HAVE_LIBSOUP /* This is a nasty trick that allows us to manipulate preferences even without having a pointer to the session. */ soup_session_get_type (); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 5d35664f..444c99a7 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -220,6 +220,16 @@ proxy_download_manager_icon_cb (GtkWidget* entry, return FALSE; } +static void +midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + GtkWidget* entry) +{ + MidoriIdentity identify_as = katze_object_get_enum (settings, "identify-as"); + + gtk_widget_set_sensitive (entry, identify_as == MIDORI_IDENT_CUSTOM); +} + #ifdef HAVE_OSX static void midori_preferences_help_clicked_cb (GtkWidget* button, @@ -480,35 +490,52 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ - #if 0 + #if HAVE_LIBSOUP + /* If a cookie jar was created, WebKit is using Soup */ + if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-has-jar"))) + { PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); - TABLE_NEW (2, 2); + TABLE_NEW (4, 2); label = katze_property_label (settings, "http-proxy"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "http-proxy", NULL); FILLED_ADD (button, 1, 2, 0, 1); - label = katze_property_label (settings, "cache-size"); + label = katze_property_label (settings, "identify-as"); INDENTED_ADD (label, 0, 1, 1, 2); + button = katze_property_proxy (settings, "identify-as", NULL); + FILLED_ADD (button, 1, 2, 1, 2); + label = katze_property_label (settings, "ident-string"); + INDENTED_ADD (label, 0, 1, 2, 3); + entry = katze_property_proxy (settings, "ident-string", NULL); + g_signal_connect (settings, "notify::identify-as", + G_CALLBACK (midori_preferences_notify_identify_as_cb), entry); + midori_preferences_notify_identify_as_cb (settings, NULL, entry); + FILLED_ADD (entry, 1, 2, 2, 3); + label = katze_property_label (settings, "cache-size"); + INDENTED_ADD (label, 0, 1, 3, 4); hbox = gtk_hbox_new (FALSE, 4); entry = katze_property_proxy (settings, "cache-size", NULL); gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 1, 2); + FILLED_ADD (hbox, 1, 2, 3, 4); + } #endif /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); #if HAVE_LIBSOUP_2_25_2 + /* If a cookie jar was created, WebKit is using Soup */ + if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-has-jar"))) + { FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "accept-cookies", NULL); - /* If a cookie jar was created, WebKit is using Soup */ - gtk_widget_set_sensitive (button, g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar")) != NULL); FILLED_ADD (button, 1, 2, 0, 1); button = katze_property_proxy (settings, "original-cookies-only", "blurb"); SPANNED_ADD (button, 0, 2, 1, 2); @@ -516,13 +543,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 2, 3); hbox = gtk_hbox_new (FALSE, 4); entry = katze_property_proxy (settings, "maximum-cookie-age", NULL); - /* If a cookie jar was created, WebKit is using Soup */ - gtk_widget_set_sensitive (entry, g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar")) != NULL); gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 2, 3); + } #endif FRAME_NEW (_("History")); TABLE_NEW (3, 2); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 36bcfeca..d61b704a 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -16,6 +16,10 @@ #include #include +#if HAVE_CONFIG_H + #include +#endif + struct _MidoriWebSettings { WebKitWebSettings parent_instance; @@ -64,9 +68,16 @@ struct _MidoriWebSettings gboolean remember_last_downloaded_files; gchar* http_proxy; + MidoriIdentity identify_as; + gchar* ident_string; gint cache_size; }; +struct _MidoriWebSettingsClass +{ + WebKitWebSettingsClass parent_class; +}; + G_DEFINE_TYPE (MidoriWebSettings, midori_web_settings, WEBKIT_TYPE_WEB_SETTINGS) enum @@ -118,6 +129,8 @@ enum PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_HTTP_PROXY, + PROP_IDENTIFY_AS, + PROP_IDENT_STRING, PROP_CACHE_SIZE }; @@ -150,7 +163,7 @@ midori_preferred_encoding_get_type (void) { MIDORI_ENCODING_RUSSIAN, "MIDORI_ENCODING_RUSSIAN", N_("Russian (KOI8-R)") }, { MIDORI_ENCODING_UNICODE, "MIDORI_ENCODING_UNICODE", N_("Unicode (UTF-8)") }, { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_WESTERN", N_("Western (ISO-8859-1)") }, - { MIDORI_ENCODING_WESTERN, "MIDORI_ENCODING_CUSTOM", N_("Custom...") }, + { MIDORI_ENCODING_CUSTOM, "MIDORI_ENCODING_CUSTOM", N_("Custom...") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriPreferredEncoding", values); @@ -211,6 +224,25 @@ midori_accept_cookies_get_type (void) return type; } +GType +midori_identity_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("Midori") }, + { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") }, + { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") }, + { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", N_("Internet Explorer") }, + { MIDORI_IDENT_CUSTOM, "MIDORI_IDENT_CUSTOM", N_("Custom...") }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriIdentity", values); + } + return type; +} + static void midori_web_settings_finalize (GObject* object); @@ -538,7 +570,11 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("What type of cookies to accept"), MIDORI_TYPE_ACCEPT_COOKIES, MIDORI_ACCEPT_COOKIES_ALL, + #if HAVE_LIBSOUP G_PARAM_READWRITE)); + #else + G_PARAM_READABLE)); + #endif g_object_class_install_property (gobject_class, PROP_ORIGINAL_COOKIES_ONLY, @@ -605,7 +641,52 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("HTTP Proxy"), _("The proxy used for HTTP connections"), NULL, + #if HAVE_LIBSOUP + G_PARAM_READWRITE)); + #else G_PARAM_READABLE)); + #endif + + /** + * MidoriWebSettings:identify-as: + * + * What to identify as to web pages. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_IDENTIFY_AS, + g_param_spec_enum ( + "identify-as", + _("Identify as"), + _("What to identify as to web pages"), + MIDORI_TYPE_IDENTITY, + MIDORI_IDENT_MIDORI, + #if HAVE_LIBSOUP + G_PARAM_READWRITE)); + #else + G_PARAM_READABLE)); + #endif + + /** + * MidoriWebSettings:ident-string: + * + * The browser identification string. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_IDENT_STRING, + g_param_spec_string ( + "ident-string", + _("Identification string"), + _("The application identification string"), + NULL, + #if HAVE_LIBSOUP + G_PARAM_READWRITE)); + #else + G_PARAM_READABLE)); + #endif g_object_class_install_property (gobject_class, PROP_CACHE_SIZE, @@ -659,6 +740,69 @@ midori_web_settings_finalize (GObject* object) G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); } +static gchar* +generate_ident_string (MidoriIdentity identify_as) +{ + const gchar* platform = + #ifdef GDK_WINDOWING_X11 + "X11"; + #elif defined(GDK_WINDOWING_WIN32) + "Windows"; + #elif defined(GDK_WINDOWING_QUARTZ) + "Macintosh"; + #elif defined(GDK_WINDOWING_DIRECTFB) + "DirectFB"; + #else + "Unknown"; + #endif + + const gchar* os = + #if defined (HAVE_OSX) + /* #if defined (HAVE_X86) */ + "Intel Mac OS X"; + /* #else + "PPC Mac OS X"; + #endif */ + #elif defined (G_OS_UNIX) + /* struct utsname name; + if (uname (&name) != -1) + String::format ("%s %s", name.sysname, name.machine); + else + "Unknown";*/ + "Linux"; + #elif defined (G_OS_WIN32) + // FIXME: Windows NT version + "Windows"; + #else + "Unknown"; + #endif + + const gchar* appname = "Midori/" PACKAGE_VERSION; + + const gchar* lang = pango_language_to_string ( gtk_get_default_language ()); + + switch (identify_as) + { + case MIDORI_IDENT_MIDORI: + return g_strdup_printf ("%s (%s; %s; U; %s) WebKit/532+", + appname, platform, os, lang); + case MIDORI_IDENT_SAFARI: + return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) " + "AppleWebKit/532+ (KHTML, like Gecko) Safari/419.3 %s", + platform, os, lang, appname); + case MIDORI_IDENT_FIREFOX: + return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s; rv:1.8.1) " + "Gecko/20061010 Firefox/2.0 %s", + platform, os, lang, appname); + case MIDORI_IDENT_EXPLORER: + return g_strdup_printf ("Mozilla/4.0 (compatible; " + "MSIE 6.0; Windows NT 5.1; %s) %s", + lang, appname); + default: + return g_strdup_printf ("%s", appname); + } +} + static void midori_web_settings_set_property (GObject* object, guint prop_id, @@ -807,6 +951,18 @@ midori_web_settings_set_property (GObject* object, case PROP_HTTP_PROXY: katze_assign (web_settings->http_proxy, g_value_dup_string (value)); break; + case PROP_IDENTIFY_AS: + web_settings->identify_as = g_value_get_enum (value); + if (web_settings->identify_as != MIDORI_IDENT_CUSTOM) + { + gchar* string = generate_ident_string (web_settings->identify_as); + g_object_set (object, "ident-string", string, NULL); + g_free (string); + } + break; + case PROP_IDENT_STRING: + katze_assign (web_settings->ident_string, g_value_dup_string (value)); + break; case PROP_CACHE_SIZE: web_settings->cache_size = g_value_get_int (value); break; @@ -947,6 +1103,12 @@ midori_web_settings_get_property (GObject* object, case PROP_HTTP_PROXY: g_value_set_string (value, web_settings->http_proxy); break; + case PROP_IDENTIFY_AS: + g_value_set_enum (value, web_settings->identify_as); + break; + case PROP_IDENT_STRING: + g_value_set_string (value, web_settings->ident_string); + break; case PROP_CACHE_SIZE: g_value_set_int (value, web_settings->cache_size); break; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index b71e920b..96e58166 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -104,10 +104,20 @@ midori_accept_cookies_get_type (void) G_GNUC_CONST; #define MIDORI_TYPE_ACCEPT_COOKIES \ (midori_accept_cookies_get_type ()) -struct _MidoriWebSettingsClass +typedef enum { - WebKitWebSettingsClass parent_class; -}; + MIDORI_IDENT_MIDORI, + MIDORI_IDENT_SAFARI, + MIDORI_IDENT_FIREFOX, + MIDORI_IDENT_EXPLORER, + MIDORI_IDENT_CUSTOM +} MidoriIdentity; + +GType +midori_identity_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_IDENTITY \ + (midori_identity_get_type ()) GType midori_web_settings_get_type (void); From e20193a0b9c125daba955404edb4997932e4df91 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 8 Dec 2008 23:32:05 +0100 Subject: [PATCH 0564/2970] Add entry for Custom character encoding --- midori/midori-preferences.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 444c99a7..7f419941 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -220,6 +220,17 @@ proxy_download_manager_icon_cb (GtkWidget* entry, return FALSE; } +static void +midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + GtkWidget* entry) +{ + MidoriPreferredEncoding preferred_encoding; + + preferred_encoding = katze_object_get_enum (settings, "preferred-encoding"); + gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); +} + static void midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -399,7 +410,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Appearance" */ PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); FRAME_NEW (_("Font settings")); - TABLE_NEW (5, 2); + TABLE_NEW (6, 2); label = gtk_label_new (_("Default Font Family")); INDENTED_ADD (label, 0, 1, 0, 1); hbox = gtk_hbox_new (FALSE, 4); @@ -416,6 +427,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 2, 3); button = katze_property_proxy (settings, "preferred-encoding", NULL); FILLED_ADD (button, 1, 2, 2, 3); + label = katze_property_label (settings, "default-encoding"); + gtk_label_set_label (GTK_LABEL (label), _("Encoding")); + INDENTED_ADD (label, 0, 1, 3, 4); + entry = katze_property_proxy (settings, "default-encoding", NULL); + gtk_widget_set_tooltip_text (entry, _("The character encoding to use by default")); + g_signal_connect (settings, "notify::preferred-encoding", + G_CALLBACK (midori_preferences_notify_preferred_encoding_cb), entry); + midori_preferences_notify_preferred_encoding_cb (settings, NULL, entry); + FILLED_ADD (entry, 1, 2, 3, 4); /* Page "Behavior" */ PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); From 426eb74c91500c4be0f67cd694ce1ae908676d78 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 8 Dec 2008 23:45:38 +0100 Subject: [PATCH 0565/2970] Support Mouse Back and Forward buttons --- midori/midori-view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 9e03bdf3..1e5bbbd3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -795,6 +795,12 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, } } break; + case 8: + midori_view_go_back (view); + return TRUE; + case 9: + midori_view_go_forward (view); + return TRUE; } return FALSE; From aeb71dd7b4ec2e88b999a033e777a445dff714ef Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 9 Dec 2008 00:02:38 +0100 Subject: [PATCH 0566/2970] Add support for javascript: bookmarklets --- midori/midori-view.c | 4 ++++ midori/sokoke.c | 3 +++ tests/magic-uri.c | 1 + 3 files changed, 8 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 1e5bbbd3..8a89b137 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1551,6 +1551,10 @@ midori_view_set_uri (MidoriView* view, return; } } + else if (g_str_has_prefix (uri, "javascript:")) + { + midori_view_execute_script (view, &uri[11], NULL); + } else { katze_assign (view->uri, g_strdup (uri)); diff --git a/midori/sokoke.c b/midori/sokoke.c index 970b54bd..305261ce 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -97,6 +97,9 @@ sokoke_magic_uri (const gchar* uri, g_return_val_if_fail (!search_engines || katze_array_is_a (search_engines, KATZE_TYPE_ITEM), NULL); + /* Just return if it's a javascript: uri */ + if (g_str_has_prefix (uri, "javascript:")) + return g_strdup (uri); /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) return g_strconcat ("file://", uri, NULL); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 18bfa86e..3a8dbafa 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -83,6 +83,7 @@ main (int argc, test_input ("verbose de.po", NULL); test_input ("g de.po verbose", NULL); test_input ("sm de.po verbose", SM "de.po verbose"); + test_input ("javascript:alert(1)", "javascript:alert(1)"); return 0; } From 108954273a89264569d0be808895e3ce442893ee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 9 Dec 2008 00:25:59 +0100 Subject: [PATCH 0567/2970] Don't pass NULL to soup_uri_new and free the proxy string properly --- midori/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index 32cea376..e6b5956d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1441,6 +1441,7 @@ soup_session_constructed_cb (GObject* object) MidoriApp* app; MidoriWebSettings* settings; SoupSession* session; + gchar* http_proxy; SoupURI* proxy_uri; if (old_session_constructed_cb) @@ -1448,7 +1449,10 @@ soup_session_constructed_cb (GObject* object) app = g_type_get_qdata (SOUP_TYPE_SESSION, g_quark_from_static_string ("midori-app")); settings = katze_object_get_object (app, "settings"); - proxy_uri = soup_uri_new (katze_object_get_string (settings, "http-proxy")); + http_proxy = katze_object_get_string (settings, "http-proxy"); + /* soup_uri_new expects a non-NULL string */ + proxy_uri = soup_uri_new (http_proxy ? http_proxy : ""); + g_free (http_proxy); g_object_set (object, "user-agent", katze_object_get_string (settings, "ident-string"), "proxy-uri", proxy_uri, From fd6574c91f1214d4f9f517d154084d877afb1071 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 9 Dec 2008 00:53:30 +0100 Subject: [PATCH 0568/2970] Update proxy and identification string immediately --- midori/main.c | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/midori/main.c b/midori/main.c index e6b5956d..7a330ef3 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1431,6 +1431,31 @@ soup_session_authenticate_cb (SoupSession* session, gtk_widget_show (dialog); } +static void +soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + SoupSession* session) +{ + gchar* http_proxy; + SoupURI* proxy_uri; + + http_proxy = katze_object_get_string (settings, "http-proxy"); + /* soup_uri_new expects a non-NULL string */ + proxy_uri = soup_uri_new (http_proxy ? http_proxy : ""); + g_free (http_proxy); + g_object_set (session, "proxy-uri", proxy_uri, NULL); +} + +static void +soup_session_settings_notify_ident_string_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + SoupSession* session) +{ + gchar* ident_string = katze_object_get_string (settings, "ident-string"); + g_object_set (session, "user-agent", ident_string, NULL); + g_free (ident_string); +} + /* The following code hooks up to any created soup session in order to modify preferences. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its session. */ @@ -1441,26 +1466,21 @@ soup_session_constructed_cb (GObject* object) MidoriApp* app; MidoriWebSettings* settings; SoupSession* session; - gchar* http_proxy; - SoupURI* proxy_uri; if (old_session_constructed_cb) old_session_constructed_cb (object); app = g_type_get_qdata (SOUP_TYPE_SESSION, g_quark_from_static_string ("midori-app")); settings = katze_object_get_object (app, "settings"); - http_proxy = katze_object_get_string (settings, "http-proxy"); - /* soup_uri_new expects a non-NULL string */ - proxy_uri = soup_uri_new (http_proxy ? http_proxy : ""); - g_free (http_proxy); - g_object_set (object, - "user-agent", katze_object_get_string (settings, "ident-string"), - "proxy-uri", proxy_uri, - NULL); - if (proxy_uri) - soup_uri_free (proxy_uri); - session = SOUP_SESSION (object); + + soup_session_settings_notify_http_proxy_cb (settings, NULL, session); + soup_session_settings_notify_ident_string_cb (settings, NULL, session); + g_signal_connect (settings, "notify::http-proxy", + G_CALLBACK (soup_session_settings_notify_http_proxy_cb), object); + g_signal_connect (settings, "notify::ident-string", + G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); + g_signal_connect (session, "authenticate", G_CALLBACK (soup_session_authenticate_cb), app); } From 94cb65d6ad686093f6ba830231256ceefcf73497 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 9 Dec 2008 01:23:35 +0100 Subject: [PATCH 0569/2970] Make proxies for string and boolean properties truly synchronous --- katze/katze-utils.c | 47 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index faed5d34..ff7a9a8b 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -16,7 +16,8 @@ #include static void -proxy_toggle_button_toggled_cb (GtkToggleButton* button, GObject* object) +proxy_toggle_button_toggled_cb (GtkToggleButton* button, + GObject* object) { gboolean toggled = gtk_toggle_button_get_active (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); @@ -51,7 +52,8 @@ proxy_uri_file_set_cb (GtkFileChooser* button, } static gchar* -proxy_combo_box_text_changed_cb (GtkComboBox* button, GObject* object) +proxy_combo_box_text_changed_cb (GtkComboBox* button, + GObject* object) { gchar* text = gtk_combo_box_get_active_text (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); @@ -80,7 +82,8 @@ proxy_entry_focus_out_event_cb (GtkEntry* entry, } static gboolean -proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) +proxy_spin_button_changed_cb (GtkSpinButton* button, + GObject* object) { GObjectClass* class = G_OBJECT_GET_CLASS (object); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); @@ -99,13 +102,35 @@ proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) } static void -proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) +proxy_combo_box_changed_cb (GtkComboBox* button, + GObject* object) { gint value = gtk_combo_box_get_active (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); g_object_set (object, property, value, NULL); } +static void +proxy_object_notify_boolean_cb (GObject* object, + GParamSpec* pspec, + GtkWidget* proxy) +{ + const gchar* property = g_object_get_data (G_OBJECT (proxy), "property"); + gboolean value = katze_object_get_boolean (object, property); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (proxy), value); +} + +static void +proxy_object_notify_string_cb (GObject* object, + GParamSpec* pspec, + GtkWidget* proxy) +{ + const gchar* property = g_object_get_data (G_OBJECT (proxy), "property"); + gchar* value = katze_object_get_string (object, property); + gtk_entry_set_text (GTK_ENTRY (proxy), value); + g_free (value); +} + /** * katze_property_proxy: * @object: a #GObject @@ -130,6 +155,9 @@ proxy_combo_box_changed_cb (GtkComboBox* button, GObject* object) * * Any other values for @hint are silently ignored. * + * Since 0.1.2 strings without hints and booleans are truly synchronous + * including property changes causing the proxy to be updated. + * * Return value: a new widget **/ GtkWidget* @@ -164,12 +192,17 @@ katze_property_proxy (gpointer object, string = NULL; if (type == G_TYPE_PARAM_BOOLEAN) { + gchar* notify_property; gboolean toggled = katze_object_get_boolean (object, property); widget = gtk_check_button_new_with_label (gettext (nick)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); g_signal_connect (widget, "toggled", G_CALLBACK (proxy_toggle_button_toggled_cb), object); + notify_property = g_strdup_printf ("notify::%s", property); + g_signal_connect (object, notify_property, + G_CALLBACK (proxy_object_notify_boolean_cb), widget); + g_free (notify_property); } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("file")) { @@ -257,6 +290,8 @@ katze_property_proxy (gpointer object, } else if (type == G_TYPE_PARAM_STRING) { + gchar* notify_property; + widget = gtk_entry_new (); g_object_get (object, property, &string, NULL); if (!string) @@ -266,6 +301,10 @@ katze_property_proxy (gpointer object, G_CALLBACK (proxy_entry_activate_cb), object); g_signal_connect (widget, "focus-out-event", G_CALLBACK (proxy_entry_focus_out_event_cb), object); + notify_property = g_strdup_printf ("notify::%s", property); + g_signal_connect (object, notify_property, + G_CALLBACK (proxy_object_notify_string_cb), widget); + g_free (notify_property); } else if (type == G_TYPE_PARAM_FLOAT) { From 89ac82d0d633b84131e9dad2f2df502c725df233 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 9 Dec 2008 02:22:58 +0100 Subject: [PATCH 0570/2970] Assemble a version without git revision for ident strings --- midori/midori-websettings.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index d61b704a..b050021f 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -777,9 +777,12 @@ generate_ident_string (MidoriIdentity identify_as) "Unknown"; #endif - const gchar* appname = "Midori/" PACKAGE_VERSION; + const gchar* appname = "Midori/" + G_STRINGIFY (MIDORI_MAJOR_VERSION) "." + G_STRINGIFY (MIDORI_MINOR_VERSION) "." + G_STRINGIFY (MIDORI_MICRO_VERSION); - const gchar* lang = pango_language_to_string ( gtk_get_default_language ()); + const gchar* lang = pango_language_to_string (gtk_get_default_language ()); switch (identify_as) { From 270822a0c49e3984c48722b418f1f50d8bca4eb9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 9 Dec 2008 20:04:04 +0100 Subject: [PATCH 0571/2970] Perform more fine grained libSoup version checks --- midori/main.c | 6 ++++-- midori/midori-preferences.c | 4 +++- wscript | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index 7a330ef3..4a268f59 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1276,7 +1276,7 @@ cookie_jar_changed_cb (SoupCookieJar* jar, } #endif -#if HAVE_LIBSOUP +#if HAVE_LIBSOUP_2_23_1 /* The following code hooks up to any created cookie jar in order to load and save cookies. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its @@ -1606,7 +1606,7 @@ main (int argc, return 1; } - #if HAVE_LIBSOUP + #if HAVE_LIBSOUP_2_23_1 /* This is a nasty trick that allows us to manipulate cookies even without having a pointer to the jar. */ soup_cookie_jar_get_type (); @@ -1618,6 +1618,8 @@ main (int argc, old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; } + #endif + #if HAVE_LIBSOUP /* This is a nasty trick that allows us to manipulate preferences even without having a pointer to the session. */ soup_session_get_type (); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 7f419941..fc6d2aa3 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -231,6 +231,7 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); } +#if HAVE_LIBSOUP_2_23_1 static void midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -240,6 +241,7 @@ midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, identify_as == MIDORI_IDENT_CUSTOM); } +#endif #ifdef HAVE_OSX static void @@ -510,7 +512,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ - #if HAVE_LIBSOUP + #if HAVE_LIBSOUP_2_23_1 /* If a cookie jar was created, WebKit is using Soup */ if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) diff --git a/wscript b/wscript index 3ea523e0..441afc20 100644 --- a/wscript +++ b/wscript @@ -114,6 +114,8 @@ def configure (conf): if option_enabled ('libsoup'): conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP', mandatory=False) + conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP_2_23_1', + vnum='2.23.1', mandatory=False) conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP_2_25_2', vnum='2.25.2', mandatory=False) libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] From df6afd7caa7e27ac37ce4f09daed08bf346ad8db Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 12 Dec 2008 10:10:10 +0100 Subject: [PATCH 0572/2970] Add a --run switch to wscript, to run Midori after building --- wscript | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/wscript b/wscript index 441afc20..51175f0c 100644 --- a/wscript +++ b/wscript @@ -195,6 +195,8 @@ def set_options (opt): opt.tool_options ('compiler_cc') opt.tool_options ('intltool') + opt.add_option ('--run', action='store_true', default=False, + help='Run application after building it', dest='run') group = opt.add_option_group ('Directories', '') if (opt.parser.get_option ('--prefix')): @@ -360,3 +362,12 @@ def shutdown (): Params.pprint ('RED', "Failed to generate po template.") Params.pprint ('RED', "Make sure intltool is installed.") os.chdir ('..') + elif Params.g_options.run: + folder = os.path.dirname (Params.g_build.env ()['waf_config_files'][0]) + try: + application = subprocess.Popen ([ + folder + os.sep + APPNAME + os.sep + APPNAME], + stderr=subprocess.PIPE) + application.wait () + except: + Params.pprint ('RED', "Failed to run application.") From 08af3f67738c057d19311280db19d9cf2eb2d3ad Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 12 Dec 2008 10:11:45 +0100 Subject: [PATCH 0573/2970] Allow xfce_header_new to use a default icon --- midori/sokoke.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 305261ce..adcddb73 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -219,21 +219,34 @@ sokoke_get_desktop (void) gchar *out = NULL; gboolean success = g_spawn_command_line_sync ("xprop -root _DT_SAVE_MODE", &out, NULL, &result, NULL); - if (success && ! result && out != NULL && strstr(out, "xfce4") != NULL) + if (success && ! result && out != NULL && strstr (out, "xfce4") != NULL) desktop = SOKOKE_DESKTOP_XFCE; else desktop = SOKOKE_DESKTOP_UNKNOWN; - g_free(out); + g_free (out); } return desktop; #endif } +/** + * sokoke_xfce_header_new: + * @icon: an icon name + * @title: the title of the header + * + * Creates an Xfce style header *if* Xfce is running. + * + * Return value: A #GtkWidget or %NULL + * + * Since 0.1.2 @icon may be NULL, and a default is used. + **/ GtkWidget* sokoke_xfce_header_new (const gchar* icon, const gchar* title) { + g_return_val_if_fail (title, NULL); + /* Create an xfce header with icon and title This returns NULL if the desktop is not Xfce */ if (sokoke_get_desktop () == SOKOKE_DESKTOP_XFCE) @@ -251,7 +264,11 @@ sokoke_xfce_header_new (const gchar* icon, &entry->style->base[GTK_STATE_NORMAL]); hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_DIALOG); + if (icon) + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_DIALOG); + else + image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, + GTK_ICON_SIZE_DIALOG); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); label = gtk_label_new (NULL); gtk_widget_modify_fg (label, GTK_STATE_NORMAL @@ -262,7 +279,7 @@ sokoke_xfce_header_new (const gchar* icon, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER (xfce_heading), hbox); g_free (markup); - gtk_widget_destroy(entry); + gtk_widget_destroy (entry); return xfce_heading; } return NULL; From 6b40913361167ed187077e4d42d0c1c27cdac787 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 12 Dec 2008 10:12:33 +0100 Subject: [PATCH 0574/2970] Actually emit "quit" even if a function quit the app --- midori/midori-app.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 525b8f2a..76250823 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -171,6 +171,12 @@ _midori_app_add_browser (MidoriApp* app, #endif } +void +_midori_app_quit (MidoriApp* app) +{ + gtk_main_quit (); +} + static void midori_app_class_init (MidoriAppClass* class) { @@ -203,7 +209,7 @@ midori_app_class_init (MidoriAppClass* class) gobject_class->get_property = midori_app_get_property; class->add_browser = _midori_app_add_browser; - class->quit = midori_app_quit; + class->quit = _midori_app_quit; g_object_class_install_property (gobject_class, PROP_SETTINGS, @@ -666,11 +672,13 @@ midori_app_add_browser (MidoriApp* app, * @app: a #MidoriApp * * Quits the #MidoriApp singleton. + * + * Since 0.1.2 the "quit" signal is always emitted before quitting. **/ void midori_app_quit (MidoriApp* app) { g_return_if_fail (MIDORI_IS_APP (app)); - gtk_main_quit (); + g_signal_emit (app, signals[QUIT], 0); } From c7a544877ce10ea0f80ac88e13b18cba02cc3c27 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 12 Dec 2008 10:14:17 +0100 Subject: [PATCH 0575/2970] Allow a NULL parent with MidoriPreferences --- midori/midori-preferences.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index fc6d2aa3..adde258e 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -95,6 +95,7 @@ midori_preferences_init (MidoriPreferences* preferences) "title", dialog_title, "has-separator", FALSE, NULL); + g_free (dialog_title); #ifndef HAVE_OSX gtk_dialog_add_buttons (GTK_DIALOG (preferences), GTK_STOCK_HELP, GTK_RESPONSE_HELP, @@ -103,9 +104,6 @@ midori_preferences_init (MidoriPreferences* preferences) #endif g_signal_connect (preferences, "response", G_CALLBACK (midori_preferences_response_cb), NULL); - - /* TODO: Do we want tooltips for explanations or can we omit that? */ - g_free (dialog_title); } static void @@ -126,14 +124,6 @@ midori_preferences_set_property (GObject* object, { case PROP_SETTINGS: { - GtkWidget* xfce_heading; - GtkWindow* parent; - g_object_get (object, "transient-for", &parent, NULL); - if ((xfce_heading = sokoke_xfce_header_new ( - gtk_window_get_icon_name (parent), - gtk_window_get_title (GTK_WINDOW (object))))) - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), - xfce_heading, FALSE, FALSE, 0); midori_preferences_set_settings (preferences, g_value_get_object (value)); break; @@ -165,6 +155,8 @@ midori_preferences_get_property (GObject* object, * * Creates a new preferences dialog. * + * Since 0.1.2 @parent may be %NULL. + * * Return value: a new #MidoriPreferences **/ GtkWidget* @@ -173,7 +165,7 @@ midori_preferences_new (GtkWindow* parent, { MidoriPreferences* preferences; - g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); + g_return_val_if_fail (!parent || GTK_IS_WINDOW (parent), NULL); g_return_val_if_fail (MIDORI_IS_WEB_SETTINGS (settings), NULL); preferences = g_object_new (MIDORI_TYPE_PREFERENCES, @@ -286,11 +278,16 @@ midori_preferences_add_toolbutton (GtkWidget* toolbar, * Assigns a settings instance to a preferences dialog. * * Note: This must not be called more than once. + * + * Since 0.1.2 this is equal to setting #MidoriPreferences:settings:. **/ void midori_preferences_set_settings (MidoriPreferences* preferences, MidoriWebSettings* settings) { + GtkWidget* header; + GtkWindow* parent; + const gchar* icon_name; GtkSizeGroup* sizegroup; GtkWidget* toolbar; GtkWidget* toolbutton; @@ -309,6 +306,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_return_if_fail (!preferences->notebook); + g_object_get (preferences, "transient-for", &parent, NULL); + icon_name = parent ? gtk_window_get_icon_name (parent) : NULL; + if ((header = sokoke_xfce_header_new (icon_name, + gtk_window_get_title (GTK_WINDOW (preferences))))) + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), + header, FALSE, FALSE, 0); + preferences->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); From 1b4a0160f19e3a3f0430dc70f21d7ba86cbdab0e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 12 Dec 2008 10:20:19 +0100 Subject: [PATCH 0576/2970] Save config files dynamically and show a Diagnostic dialog after crashes --- midori/main.c | 387 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 281 insertions(+), 106 deletions(-) diff --git a/midori/main.c b/midori/main.c index 4a268f59..e4d29ac4 100644 --- a/midori/main.c +++ b/midori/main.c @@ -21,16 +21,17 @@ #include "midori-extension.h" #include "midori-extensions.h" #include "midori-panel.h" +#include "midori-preferences.h" #include "midori-stock.h" #include "midori-view.h" #include "midori-websettings.h" - #include "sokoke.h" #include "gjs.h" #include #include +#include #include #ifdef HAVE_LIBXML @@ -119,6 +120,17 @@ stock_items_init (void) g_object_unref (factory); } +static gchar* +build_config_filename (const gchar* filename) +{ + static gchar* path = NULL; + + if (!path) + path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); + g_mkdir_with_parents (path, 0700); + return g_build_filename (path, filename, NULL); +} + static MidoriWebSettings* settings_new_from_file (const gchar* filename) { @@ -360,21 +372,6 @@ search_engines_save_to_file (KatzeArray* search_engines, return saved; } -static void -midori_web_list_add_item_cb (KatzeArray* trash, - GObject* item) -{ - guint n; - GObject* obsolete_item; - - n = katze_array_get_length (trash); - if (n > 10) - { - obsolete_item = katze_array_get_nth_item (trash, 0); - katze_array_remove_item (trash, obsolete_item); - } -} - #ifdef HAVE_LIBXML static KatzeItem* katze_item_from_xmlNodePtr (xmlNodePtr cur) @@ -850,6 +847,78 @@ midori_history_terminate (sqlite3* db, } #endif +static void +midori_app_quit_cb (MidoriApp* app) +{ + gchar* config_file = build_config_filename ("running"); + g_unlink (config_file); + g_free (config_file); +} + +static void +settings_notify_cb (MidoriWebSettings* settings, + GParamSpec* pspec) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("config"); + error = NULL; + if (!settings_save_to_file (settings, config_file, &error)) + { + g_warning (_("The configuration couldn't be saved. %s"), error->message); + g_error_free (error); + } + g_free (config_file); +} + +static void +accel_map_changed_cb (GtkAccelMap* accel_map, + gchar* accel_path, + guint accel_key, + GdkModifierType accel_mods) +{ + gchar* config_file = build_config_filename ("accels"); + gtk_accel_map_save (config_file); + g_free (config_file); +} + +static void +midori_search_engines_add_item_cb (KatzeArray* search_engines, + GObject* item) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("search"); + error = NULL; + if (!search_engines_save_to_file (search_engines, config_file, &error)) + { + g_warning (_("The search engines couldn't be saved. %s"), + error->message); + g_error_free (error); + } + g_free (config_file); +} + +static void +midori_search_engines_remove_item_cb (KatzeArray* search_engines, + GObject* item) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("search"); + error = NULL; + if (!search_engines_save_to_file (search_engines, config_file, &error)) + { + g_warning (_("The search engines couldn't be saved. %s"), + error->message); + g_error_free (error); + } + g_free (config_file); +} + static gchar* _simple_xml_element (const gchar* name, const gchar* value) @@ -982,6 +1051,83 @@ katze_array_to_file (KatzeArray* array, return TRUE; } +static void +midori_bookmarks_add_item_cb (KatzeArray* bookmarks, + GObject* item) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("bookmarks.xbel"); + error = NULL; + if (!katze_array_to_file (bookmarks, config_file, &error)) + { + g_warning (_("The bookmarks couldn't be saved. %s"), error->message); + g_error_free (error); + } + g_free (config_file); +} + +static void +midori_bookmarks_remove_item_cb (KatzeArray* bookmarks, + GObject* item) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("bookmarks.xbel"); + error = NULL; + if (!katze_array_to_file (bookmarks, config_file, &error)) + { + g_warning (_("The bookmarks couldn't be saved. %s"), error->message); + g_error_free (error); + } + g_free (config_file); +} + +static void +midori_trash_add_item_cb (KatzeArray* trash, + GObject* item) +{ + gchar* config_file; + GError* error; + guint n; + GObject* obsolete_item; + + config_file = build_config_filename ("tabtrash.xbel"); + error = NULL; + if (!katze_array_to_file (trash, config_file, &error)) + { + g_warning (_("The trash couldn't be saved. %s"), error->message); + g_error_free (error); + } + g_free (config_file); + + n = katze_array_get_length (trash); + if (n > 10) + { + obsolete_item = katze_array_get_nth_item (trash, 0); + katze_array_remove_item (trash, obsolete_item); + } +} + +static void +midori_trash_remove_item_cb (KatzeArray* trash, + GObject* item) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("tabtrash.xbel"); + error = NULL; + if (!katze_array_to_file (trash, config_file, &error)) + { + g_warning (_("The trash couldn't be saved. %s"), error->message); + g_error_free (error); + } + g_free (config_file); +} + static void midori_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -1023,26 +1169,20 @@ midori_app_add_browser_cb (MidoriApp* app, static void midori_browser_session_cb (MidoriBrowser* browser, - gpointer arg1, + gpointer pspec, KatzeArray* session) { - gchar* config_path; gchar* config_file; GError* error; - config_path = g_build_filename (g_get_user_config_dir (), - PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0700); - config_file = g_build_filename (config_path, "session.xbel", NULL); + config_file = build_config_filename ("session.xbel"); error = NULL; if (!katze_array_to_file (session, config_file, &error)) { g_warning (_("The session couldn't be saved. %s"), error->message); g_error_free (error); } - g_free (config_file); - g_free (config_path); } static void @@ -1286,7 +1426,6 @@ static void cookie_jar_constructed_cb (GObject* object) { #if HAVE_LIBSOUP_2_25_2 - gchar* config_path; gchar* config_file; SoupCookieJar* jar; #endif @@ -1297,10 +1436,7 @@ cookie_jar_constructed_cb (GObject* object) g_quark_from_static_string ("midori-has-jar"), (void*)1); #if HAVE_LIBSOUP_2_25_2 - config_path = g_build_filename (g_get_user_config_dir (), - PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0700); - config_file = g_build_filename (config_path, "cookies.txt", NULL); + config_file = build_config_filename ("cookies.txt"); jar = SOUP_COOKIE_JAR (object); cookie_jar_load (jar, config_file); g_signal_connect_data (jar, "changed", @@ -1486,6 +1622,22 @@ soup_session_constructed_cb (GObject* object) } #endif +static void +button_modify_preferences_clicked_cb (GtkWidget* button, + MidoriWebSettings* settings) +{ + GtkWidget* dialog = midori_preferences_new (NULL, settings); + gtk_dialog_run (GTK_DIALOG (dialog)); +} + +static void +button_reset_session_clicked_cb (GtkWidget* button, + KatzeArray* session) +{ + katze_array_clear (session); + gtk_widget_set_sensitive (button, FALSE); +} + int main (int argc, char** argv) @@ -1508,6 +1660,9 @@ main (int argc, }; JSGlobalContextRef js_context; gchar* exception; + GString* error_messages; + MidoriWebSettings* settings; + gchar* config_file; MidoriStartup load_on_startup; gchar* homepage; KatzeArray* search_engines; @@ -1525,6 +1680,11 @@ main (int argc, sqlite3* db; gint max_history_age; #endif + KatzeArray* extensions; + gchar* extension_path; + GDir* extension_dir; + const gchar* filename; + MidoriExtension* extension; #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); @@ -1590,6 +1750,8 @@ main (int argc, } app = midori_app_new (); + /* FIXME: The app might be 'running' but actually showing a dialog + after a crash, so running a new window isn't a good idea. */ if (midori_app_instance_is_running (app)) { /* TODO: Open as many tabs as we have uris, seperated by pipes */ @@ -1602,7 +1764,7 @@ main (int argc, return 0; g_print (_("An instance of Midori is already running but not responding.\n")); - /* FIXME: Do we want a graphical error message? */ + /* FIXME: Show a dialog which allows killing the existing instance */ return 1; } @@ -1634,16 +1796,13 @@ main (int argc, #endif /* Load configuration files */ - GString* error_messages = g_string_new (NULL); - gchar* config_path = g_build_filename (g_get_user_config_dir (), - PACKAGE_NAME, NULL); - g_mkdir_with_parents (config_path, 0700); - gchar* config_file = g_build_filename (config_path, "config", NULL); + error_messages = g_string_new (NULL); + config_file = build_config_filename ("config"); error = NULL; - MidoriWebSettings* settings = settings_new_from_file (config_file); - katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); + settings = settings_new_from_file (config_file); + katze_assign (config_file, build_config_filename ("accels")); gtk_accel_map_load (config_file); - katze_assign (config_file, g_build_filename (config_path, "search", NULL)); + katze_assign (config_file, build_config_filename ("search")); error = NULL; search_engines = search_engines_new_from_file (config_file, &error); if (error) @@ -1657,8 +1816,7 @@ main (int argc, } bookmarks = katze_array_new (KATZE_TYPE_ARRAY); #ifdef HAVE_LIBXML - katze_assign (config_file, g_build_filename (config_path, "bookmarks.xbel", - NULL)); + katze_assign (config_file, build_config_filename ("bookmarks.xbel")); error = NULL; if (!katze_array_from_file (bookmarks, config_file, &error)) { @@ -1667,14 +1825,13 @@ main (int argc, _("The bookmarks couldn't be loaded: %s\n"), error->message); g_error_free (error); } - g_free (config_file); #endif _session = katze_array_new (KATZE_TYPE_ITEM); #ifdef HAVE_LIBXML g_object_get (settings, "load-on-startup", &load_on_startup, NULL); if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { - config_file = g_build_filename (config_path, "session.xbel", NULL); + katze_assign (config_file, build_config_filename ("session.xbel")); error = NULL; if (!katze_array_from_file (_session, config_file, &error)) { @@ -1683,12 +1840,11 @@ main (int argc, _("The session couldn't be loaded: %s\n"), error->message); g_error_free (error); } - g_free (config_file); } #endif trash = katze_array_new (KATZE_TYPE_ITEM); #ifdef HAVE_LIBXML - config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); + katze_assign (config_file, build_config_filename ("tabtrash.xbel")); error = NULL; if (!katze_array_from_file (trash, config_file, &error)) { @@ -1697,10 +1853,9 @@ main (int argc, _("The trash couldn't be loaded: %s\n"), error->message); g_error_free (error); } - g_free (config_file); #endif #ifdef HAVE_SQLITE - config_file = g_build_filename (config_path, "history.db", NULL); + katze_assign (config_file, build_config_filename ("history.db")); #endif history = katze_array_new (KATZE_TYPE_ARRAY); #ifdef HAVE_SQLITE @@ -1711,7 +1866,6 @@ main (int argc, _("The history couldn't be loaded: %s\n"), error->message); g_error_free (error); } - g_free (config_file); #endif /* In case of errors */ @@ -1774,23 +1928,22 @@ main (int argc, i++; } - if (katze_array_is_empty (_session)) - { - item = katze_item_new (); - if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) - katze_item_set_uri (item, ""); - else - { - g_object_get (settings, "homepage", &homepage, NULL); - katze_item_set_uri (item, homepage); - g_free (homepage); - } - katze_array_add_item (_session, item); - } - g_free (config_path); - + g_signal_connect_after (settings, "notify", + G_CALLBACK (settings_notify_cb), NULL); + g_signal_connect_after (gtk_accel_map_get (), "changed", + G_CALLBACK (accel_map_changed_cb), NULL); + g_signal_connect_after (search_engines, "add-item", + G_CALLBACK (midori_search_engines_add_item_cb), NULL); + g_signal_connect_after (search_engines, "remove-item", + G_CALLBACK (midori_search_engines_remove_item_cb), NULL); + g_signal_connect_after (bookmarks, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), NULL); + g_signal_connect_after (bookmarks, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); g_signal_connect_after (trash, "add-item", - G_CALLBACK (midori_web_list_add_item_cb), NULL); + G_CALLBACK (midori_trash_add_item_cb), NULL); + g_signal_connect_after (trash, "remove-item", + G_CALLBACK (midori_trash_remove_item_cb), NULL); #ifdef HAVE_SQLITE g_signal_connect_after (history, "add-item", G_CALLBACK (midori_history_add_item_cb), db); @@ -1798,13 +1951,57 @@ main (int argc, G_CALLBACK (midori_history_clear_cb), db); #endif - /* Load extensions */ - KatzeArray* extensions; - gchar* extension_path; - GDir* extension_dir; - const gchar* filename; - MidoriExtension* extension; + /* We test for the presence of a dummy file which is created once + and deleted during normal runtime, but persists in case of a crash. */ + katze_assign (config_file, build_config_filename ("running")); + if (g_file_test (config_file, G_FILE_TEST_EXISTS)) + { + GdkScreen* screen; + GtkIconTheme* icon_theme; + GtkWidget* dialog; + GtkWidget* box; + GtkWidget* button; + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, + _("Midori seems to have crashed after it was opened for the last " + "time. If this happend repeatedly, try one of the " + "following options to solve the problem.")); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); + screen = gtk_widget_get_screen (dialog); + if (screen) + { + icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, "midori")) + gtk_window_set_icon_name (GTK_WINDOW (dialog), "midori"); + else + gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + } + box = gtk_hbox_new (FALSE, 0); + button = gtk_button_new_with_mnemonic (_("Modify _preferences")); + g_signal_connect (button, "clicked", + G_CALLBACK (button_modify_preferences_clicked_cb), settings); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + button = gtk_button_new_with_mnemonic (_("Reset the last _session")); + g_signal_connect (button, "clicked", + G_CALLBACK (button_reset_session_clicked_cb), _session); + gtk_widget_set_sensitive (button, !katze_array_is_empty (_session)); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + button = gtk_button_new_with_mnemonic (_("Disable all _extensions")); + gtk_widget_set_sensitive (button, FALSE); + /* FIXME: Disable all extensions */ + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + gtk_widget_show_all (box); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } + else + g_file_set_contents (config_file, "RUNNING", -1, NULL); + g_signal_connect (app, "quit", G_CALLBACK (midori_app_quit_cb), NULL); + + /* Load extensions */ extensions = katze_array_new (MIDORI_TYPE_EXTENSION); extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); if (g_module_supported ()) @@ -1868,6 +2065,20 @@ main (int argc, midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); + if (katze_array_is_empty (_session)) + { + item = katze_item_new (); + if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) + katze_item_set_uri (item, ""); + else + { + g_object_get (settings, "homepage", &homepage, NULL); + katze_item_set_uri (item, homepage); + g_free (homepage); + } + katze_array_add_item (_session, item); + } + session = midori_browser_get_proxy_array (browser); n = katze_array_get_length (_session); for (i = 0; i < n; i++) @@ -1893,51 +2104,15 @@ main (int argc, gtk_main (); /* Save configuration files */ - config_path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, - NULL); - g_mkdir_with_parents (config_path, 0700); g_object_unref (history); #ifdef HAVE_SQLITE g_object_get (settings, "maximum-history-age", &max_history_age, NULL); midori_history_terminate (db, max_history_age); #endif - config_file = g_build_filename (config_path, "search", NULL); - error = NULL; - if (!search_engines_save_to_file (search_engines, config_file, &error)) - { - g_warning (_("The search engines couldn't be saved. %s"), - error->message); - g_error_free (error); - } g_object_unref (search_engines); - g_free (config_file); - config_file = g_build_filename (config_path, "bookmarks.xbel", NULL); - error = NULL; - if (!katze_array_to_file (bookmarks, config_file, &error)) - { - g_warning (_("The bookmarks couldn't be saved. %s"), error->message); - g_error_free (error); - } g_object_unref (bookmarks); - g_free (config_file); - config_file = g_build_filename (config_path, "tabtrash.xbel", NULL); - error = NULL; - if (!katze_array_to_file (trash, config_file, &error)) - { - g_warning (_("The trash couldn't be saved. %s"), error->message); - g_error_free (error); - } g_object_unref (trash); - katze_assign (config_file, g_build_filename (config_path, "config", NULL)); - error = NULL; - if (!settings_save_to_file (settings, config_file, &error)) - { - g_warning (_("The configuration couldn't be saved. %s"), error->message); - g_error_free (error); - } - katze_assign (config_file, g_build_filename (config_path, "accels", NULL)); - gtk_accel_map_save (config_file); + g_object_unref (settings); g_free (config_file); - g_free (config_path); return 0; } From 58b40bce3829758578a92823e685fcc2a9b01bb2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 12 Dec 2008 21:06:33 +0100 Subject: [PATCH 0577/2970] Optimize location action, so Midori starts up twice as fast --- midori/midori-browser.c | 8 +- midori/midori-locationaction.c | 143 +++++++++++++++++++++++++++------ midori/midori-locationaction.h | 9 ++- 3 files changed, 129 insertions(+), 31 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c925b2a3..6431e849 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3544,9 +3544,6 @@ _location_action_insert_history_item (MidoriLocationAction* action, const gchar* uri; GdkPixbuf* pixbuf = NULL; - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (action)); - g_return_if_fail (KATZE_IS_ITEM (item)); - if (KATZE_IS_ARRAY (item)) { n = katze_array_get_length (KATZE_ARRAY (item)); @@ -3588,9 +3585,10 @@ midori_browser_load_history (MidoriBrowser* browser) NULL, KATZE_ITEM (browser->history)); action = _action_by_name (browser, "Location"); + midori_location_action_freeze (MIDORI_LOCATION_ACTION (action)); _location_action_insert_history_item (MIDORI_LOCATION_ACTION (action), - browser, - KATZE_ITEM (browser->history)); + browser, KATZE_ITEM (browser->history)); + midori_location_action_thaw (MIDORI_LOCATION_ACTION (action)); } static void diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index f3a952ff..74a894e1 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -32,6 +32,7 @@ struct _MidoriLocationAction GtkTreeModel* filter_model; GtkTreeModel* sort_model; GdkPixbuf* default_icon; + GHashTable* items; }; struct _MidoriLocationActionClass @@ -215,29 +216,110 @@ midori_location_action_class_init (MidoriLocationActionClass* class) } static void -midori_location_action_init (MidoriLocationAction* location_action) +midori_location_action_set_model (MidoriLocationAction* location_action, + GtkTreeModel* model) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + + g_object_set (location_entry, "model", model, NULL); + g_object_set (gtk_entry_get_completion (GTK_ENTRY (entry)), + "model", model ? location_action->sort_model : NULL, NULL); + } + while ((proxies = g_slist_next (proxies))); +} + +static gboolean +midori_location_action_is_frozen (MidoriLocationAction* location_action) +{ + return location_action->filter_model == NULL; +} + +/** + * midori_location_action_freeze: + * @location_action: a #MidoriLocationAction + * + * Freezes the action, which essentially means disconnecting models + * from proxies and skipping updates of the current state. + * + * Freezing is recommended if you need to insert a large amount + * of items at once, which is faster in the frozen state. + * + * Use midori_location_action_thaw() to go back to normal operation. + * + * Since: 0.1.2 + **/ +void +midori_location_action_freeze (MidoriLocationAction* location_action) +{ + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (!midori_location_action_is_frozen (location_action)); + + katze_object_assign (location_action->sort_model, NULL); + katze_object_assign (location_action->filter_model, NULL); + midori_location_action_set_model (location_action, NULL); +} + +/** + * midori_location_action_thaw: + * @location_action: a #MidoriLocationAction + * + * Thaws the action, ie. after freezing it. + * + * Since: 0.1.2 + **/ +void +midori_location_action_thaw (MidoriLocationAction* location_action) { - GtkTreeModel* liststore; GtkTreeModel* sort_model; GtkTreeModel* filter_model; - location_action->uri = NULL; - location_action->progress = 0.0; + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + g_return_if_fail (midori_location_action_is_frozen (location_action)); - liststore = (GtkTreeModel*)gtk_list_store_new (N_COLS, - GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INT, G_TYPE_BOOLEAN); - sort_model = (GtkTreeModel*)gtk_tree_model_sort_new_with_model (liststore); + sort_model = (GtkTreeModel*)gtk_tree_model_sort_new_with_model ( + location_action->model); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), VISITS_COL, GTK_SORT_DESCENDING); filter_model = gtk_tree_model_filter_new (sort_model, NULL); gtk_tree_model_filter_set_visible_column ( GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL); + midori_location_action_set_model (location_action, location_action->model); - location_action->model = liststore; location_action->filter_model = filter_model; location_action->sort_model = sort_model; +} + +static void +midori_location_action_init (MidoriLocationAction* location_action) +{ + location_action->uri = NULL; + location_action->progress = 0.0; location_action->default_icon = NULL; + + location_action->model = (GtkTreeModel*)gtk_list_store_new (N_COLS, + GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INT, G_TYPE_BOOLEAN); + + location_action->filter_model = NULL; + location_action->sort_model = NULL; + midori_location_action_thaw (location_action); + + location_action->items = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); } static void @@ -252,6 +334,8 @@ midori_location_action_finalize (GObject* object) katze_object_assign (location_action->filter_model, NULL); katze_object_assign (location_action->default_icon, NULL); + g_hash_table_destroy (location_action->items); + G_OBJECT_CLASS (midori_location_action_parent_class)->finalize (object); } @@ -525,7 +609,7 @@ midori_location_action_set_item (MidoriLocationAction* location_action, gtk_tree_model_get (model, iter, FAVICON_COL, &icon, -1); if (item->favicon) new_icon = item->favicon; - else if (!icon && !item->favicon) + else if (!icon) new_icon = location_action->default_icon; else new_icon = NULL; @@ -619,12 +703,19 @@ midori_location_action_item_iter (MidoriLocationAction* location_action, const gchar* uri, GtkTreeIter* iter) { + gchar* path; GtkTreeModel* model; gchar* tmpuri; gboolean found; - g_return_val_if_fail (MIDORI_IS_LOCATION_ACTION (location_action), FALSE); - g_return_val_if_fail (uri != NULL, FALSE); + if ((path = g_hash_table_lookup (location_action->items, uri))) + { + if (gtk_tree_model_get_iter_from_string (location_action->model, + iter, path)) + return TRUE; + else + g_hash_table_remove (location_action->items, uri); + } found = FALSE; model = location_action->model; @@ -636,11 +727,14 @@ midori_location_action_item_iter (MidoriLocationAction* location_action, gtk_tree_model_get (model, iter, URI_COL, &tmpuri, -1); found = !g_ascii_strcasecmp (uri, tmpuri); katze_assign (tmpuri, NULL); - - if (found) - break; } - while (gtk_tree_model_iter_next (model, iter)); + while (!found && gtk_tree_model_iter_next (model, iter)); + if (found) + { + path = gtk_tree_model_get_string_from_iter (location_action->model, + iter); + g_hash_table_insert (location_action->items, g_strdup (uri), path); + } } return found; } @@ -1013,9 +1107,6 @@ midori_location_action_append_item (MidoriLocationAction* location_action, gint n; gint visits = 0; - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (item->uri != NULL); - model = location_action->model; if (!midori_location_action_item_iter (location_action, item->uri, &iter)) @@ -1023,13 +1114,12 @@ midori_location_action_append_item (MidoriLocationAction* location_action, gtk_list_store_append (GTK_LIST_STORE (model), &iter); n = gtk_tree_model_iter_n_children (model, NULL); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISIBLE_COL, - (n <= MAX_ITEMS), -1); } else gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, -1); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + VISITS_COL, ++visits, VISIBLE_COL, n <= MAX_ITEMS, -1); midori_location_action_set_item (location_action, &iter, item); } @@ -1067,20 +1157,23 @@ midori_location_action_add_item (MidoriLocationAction* location_action, g_return_if_fail (title != NULL); g_return_if_fail (!icon || GDK_IS_PIXBUF (icon)); - katze_assign (location_action->uri, g_strdup (uri)); - item.favicon = icon; item.uri = uri; item.title = title; midori_location_action_append_item (location_action, &item); + if (midori_location_action_is_frozen (location_action)) + return; + + katze_assign (location_action->uri, g_strdup (uri)); + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); if (!proxies) return; do if (GTK_IS_TOOL_ITEM (proxies->data) && - !g_strcmp0 (location_action->uri, uri)) + !strcmp (location_action->uri, uri)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); location_entry = gtk_bin_get_child (GTK_BIN (alignment)); diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index 5d2d1d23..beefb3cf 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -44,8 +44,14 @@ struct _MidoriLocationEntryItem GType midori_location_action_get_type (void); +void +midori_location_action_freeze (MidoriLocationAction* location_action); + +void +midori_location_action_thaw (MidoriLocationAction* location_action); + const gchar* -midori_location_action_get_uri (MidoriLocationAction* action); +midori_location_action_get_uri (MidoriLocationAction* location_action); void midori_location_action_set_uri (MidoriLocationAction* location_action, @@ -64,6 +70,7 @@ midori_location_action_add_item (MidoriLocationAction* location_acti const gchar* uri, GdkPixbuf* icon, const gchar* title); + void midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, GdkPixbuf* icon, From 0fb55faf377fda83d24547431d29acb36b1b7888 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Mon, 15 Dec 2008 20:12:51 +0100 Subject: [PATCH 0578/2970] Actually remove history items with the Delete tool button --- midori/midori-browser.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6431e849..4bc3ec5c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2491,6 +2491,7 @@ midori_browser_model_remove_item (GtkTreeModel* model, { GtkTreeIter child_iter; KatzeItem* child; + KatzeArray* parent; gint i, n; if (KATZE_IS_ARRAY (item)) @@ -2504,6 +2505,11 @@ midori_browser_model_remove_item (GtkTreeModel* model, while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); } + else + { + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + } gtk_tree_store_remove (GTK_TREE_STORE (model), iter); g_object_unref (item); From 2c1f0574a66bf764b471f1daa682389af40118a2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 15 Dec 2008 20:43:05 +0100 Subject: [PATCH 0579/2970] Remove a hack which lead to a crash after the last change --- midori/midori-browser.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4bc3ec5c..23d3d5ff 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2505,14 +2505,12 @@ midori_browser_model_remove_item (GtkTreeModel* model, while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); } - else - { - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - } gtk_tree_store_remove (GTK_TREE_STORE (model), iter); g_object_unref (item); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); } static gboolean @@ -2534,9 +2532,9 @@ midori_panel_history_key_release_event_cb (GtkWidget* widget, { location_action = _action_by_name (browser, "Location"); gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_browser_model_remove_item (model, item, &iter); midori_location_action_delete_item_from_uri ( MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); + midori_browser_model_remove_item (model, item, &iter); } return FALSE; @@ -2937,9 +2935,9 @@ _action_history_delete_activate (GtkAction* action, { location_action = _action_by_name (browser, "Location"); gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_browser_model_remove_item (model, item, &iter); midori_location_action_delete_item_from_uri ( MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); + midori_browser_model_remove_item (model, item, &iter); } } @@ -3060,9 +3058,6 @@ _action_bookmark_delete_activate (GtkAction* action, gtk_tree_model_get (model, &iter, 0, &item, -1); parent = katze_item_get_parent (item); katze_array_remove_item (parent, item); - /* FIXME: This is a preliminary hack, until we fix it properly again */ - gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - g_object_unref (item); } } From 0f78896660f8d908864d728b9346f9a433c3c520 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 15 Dec 2008 21:20:39 +0100 Subject: [PATCH 0580/2970] Reimplement custom search engine icons --- midori/midori-searchaction.c | 50 ++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 8ebe1bdd..328ea368 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -411,6 +411,37 @@ midori_search_action_manage_activate_cb (GtkWidget* menuitem, gtk_widget_show (dialog); } +static GdkPixbuf* +midori_search_action_get_icon (MidoriSearchAction* search_action, + KatzeItem* item, + GtkWidget* widget) +{ + const gchar* icon; + + if ((icon = katze_item_get_icon (item)) && *icon) + { + GdkScreen* screen; + GtkIconTheme* icon_theme; + gint width, height; + + if (G_UNLIKELY (!(screen = gtk_widget_get_screen (widget)))) + return gtk_widget_render_icon (widget, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); + icon_theme = gtk_icon_theme_get_for_screen (screen); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), + GTK_ICON_SIZE_MENU, &width, &height); + return gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, height), + GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + } + + if ((icon = katze_item_get_uri (item)) && strstr (icon, "://")) + return katze_net_load_icon (search_action->net, + icon, NULL, widget, NULL); + + return gtk_widget_render_icon (widget, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL); +} + static void midori_search_action_icon_released_cb (GtkWidget* entry, GtkIconEntryPosition icon_pos, @@ -439,8 +470,8 @@ midori_search_action_icon_released_cb (GtkWidget* entry, menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); image = gtk_image_new (); - icon = katze_net_load_icon (MIDORI_SEARCH_ACTION (action)->net, - katze_item_get_uri (item), NULL, entry, NULL); + icon = midori_search_action_get_icon (MIDORI_SEARCH_ACTION (action), + item, entry); gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); g_object_unref (icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); @@ -493,9 +524,8 @@ midori_search_action_set_entry_icon (MidoriSearchAction* search_action, if (search_action->current_item) { - icon = katze_net_load_icon (search_action->net, - katze_item_get_uri (search_action->current_item), - NULL, entry, NULL); + icon = midori_search_action_get_icon (search_action, + search_action->current_item, entry); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); g_object_unref (icon); @@ -723,19 +753,16 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, GtkTreeIter* iter, GtkWidget* treeview) { - KatzeNet* net; KatzeItem* item; + MidoriSearchAction* search_action; GdkPixbuf* icon; gtk_tree_model_get (model, iter, 0, &item, -1); - /* FIXME: Use the net of the MidoriSearchAction */ - net = katze_net_new (); - icon = katze_net_load_icon (net, katze_item_get_uri (item), - NULL, treeview, NULL); + search_action = g_object_get_data (G_OBJECT (treeview), "search-action"); + icon = midori_search_action_get_icon (search_action, item, treeview); g_object_set (renderer, "pixbuf", icon, NULL); g_object_unref (icon); - g_object_unref (net); } static void @@ -1096,6 +1123,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + g_object_set_data (G_OBJECT (treeview), "search-action", search_action); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, (GtkTreeCellDataFunc)midori_search_action_dialog_render_icon_cb, treeview, NULL); From 1dc1744f7d80343f7afbcfae2e60b6b1d06737b4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 15 Dec 2008 23:17:12 +0100 Subject: [PATCH 0581/2970] Move location action iters completely to hash lookups The startup of Midori is now about 10 times as fast as it was without any hash table lookups. --- midori/midori-locationaction.c | 89 +++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 74a894e1..dcb868d3 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -689,54 +689,67 @@ midori_location_action_set_active_iter (MidoriLocationAction* location_action, } /** - * midori_location_action_item_iter: + * midori_location_action_iter_lookup: * @location_action: a #MidoriLocationAction * @uri: a string - * @iter: a GtkTreeIter + * @iter: a #GtkTreeIter * - * Retrieves the iter of the item matching @uri. + * Retrieves the iter of the item matching @uri if it was + * inserted with midori_location_action_iter_insert(). * * Return value: %TRUE if @uri was found, %FALSE otherwise **/ static gboolean -midori_location_action_item_iter (MidoriLocationAction* location_action, - const gchar* uri, - GtkTreeIter* iter) +midori_location_action_iter_lookup (MidoriLocationAction* location_action, + const gchar* uri, + GtkTreeIter* iter) { gchar* path; - GtkTreeModel* model; - gchar* tmpuri; - gboolean found; if ((path = g_hash_table_lookup (location_action->items, uri))) { if (gtk_tree_model_get_iter_from_string (location_action->model, iter, path)) return TRUE; - else - g_hash_table_remove (location_action->items, uri); + + g_hash_table_remove (location_action->items, uri); } - found = FALSE; - model = location_action->model; - if (gtk_tree_model_get_iter_first (model, iter)) + return FALSE; +} + +/** + * midori_location_action_iter_insert: + * @location_action: a #MidoriLocationAction + * @uri: a string + * @iter: a #GtkTreeIter + * @position: position to insert the new row + * + * Creates a new row for @uri if it doesn't exist, or sets @iter + * to the existing iter for @uri. + * + * Return value: %TRUE if @uri was found, %FALSE otherwise + **/ +static gboolean +midori_location_action_iter_insert (MidoriLocationAction* location_action, + const gchar* uri, + GtkTreeIter* iter, + gint position) +{ + if (!midori_location_action_iter_lookup (location_action, uri, iter)) { - tmpuri = NULL; - do - { - gtk_tree_model_get (model, iter, URI_COL, &tmpuri, -1); - found = !g_ascii_strcasecmp (uri, tmpuri); - katze_assign (tmpuri, NULL); - } - while (!found && gtk_tree_model_iter_next (model, iter)); - if (found) - { - path = gtk_tree_model_get_string_from_iter (location_action->model, - iter); - g_hash_table_insert (location_action->items, g_strdup (uri), path); - } + GtkTreeModel* model; + gchar* path; + + model = location_action->model; + gtk_list_store_insert (GTK_LIST_STORE (model), iter, position); + path = gtk_tree_model_get_string_from_iter (model, iter); + g_hash_table_insert (location_action->items, g_strdup (uri), path); + + return FALSE; } - return found; + + return TRUE; } /** @@ -790,7 +803,7 @@ midori_location_action_set_item_from_uri (MidoriLocationAction* location_action, g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - if (midori_location_action_item_iter (location_action, uri, &iter)) + if (midori_location_action_iter_lookup (location_action, uri, &iter)) midori_location_action_set_active_iter (location_action, &iter); else midori_location_action_reset (location_action); @@ -984,7 +997,7 @@ midori_location_action_set_text (MidoriLocationAction* location_action, entry = gtk_bin_get_child (GTK_BIN (location_entry)); gtk_entry_set_text (GTK_ENTRY (entry), text); - if (midori_location_action_item_iter (location_action, text, &iter)) + if (midori_location_action_iter_lookup (location_action, text, &iter)) { model = location_action->model; gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); @@ -1066,14 +1079,13 @@ midori_location_action_prepend_item (MidoriLocationAction* location_action, filter_model = location_action->filter_model; model = location_action->model; - if (midori_location_action_item_iter (location_action, item->uri, &iter)) + if (midori_location_action_iter_insert (location_action, + item->uri, &iter, 0)) { gtk_tree_model_get_iter_first (model, &index); gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); } - else - gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); n = gtk_tree_model_iter_n_children (filter_model, NULL); if (n > MAX_ITEMS) @@ -1109,12 +1121,9 @@ midori_location_action_append_item (MidoriLocationAction* location_action, model = location_action->model; - if (!midori_location_action_item_iter (location_action, item->uri, &iter)) - { - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - + if (!midori_location_action_iter_insert (location_action, + item->uri, &iter, G_MAXINT)) n = gtk_tree_model_iter_n_children (model, NULL); - } else gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); @@ -1330,7 +1339,7 @@ midori_location_action_delete_item_from_uri (MidoriLocationAction* location_acti g_return_if_fail (uri != NULL); model = location_action->model; - if (midori_location_action_item_iter (location_action, uri, &iter)) + if (midori_location_action_iter_lookup (location_action, uri, &iter)) { gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); if (visits > 1) From 88c7fbbb98a051d4e9490d43d91bfb63c7dd8988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Wed, 17 Dec 2008 22:17:36 +0100 Subject: [PATCH 0582/2970] Allow adding separators to the navigationbar --- midori/midori-browser.c | 7 +++++++ midori/midori-preferences.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 23d3d5ff..52fdb748 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4146,6 +4146,13 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), GTK_TOOL_ITEM (toolitem), -1); } + else if (!strcmp (*name, "Separator")) + { + toolitem = GTK_WIDGET (gtk_separator_tool_item_new ()); + gtk_widget_show (toolitem); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (toolitem), -1); + } name++; } g_strfreev (names); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index adde258e..1c0e99c6 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -486,7 +486,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (button), "" - "TabNew, Open, Print, Find, Location, Preferences, Window, Bookmarks\n" + "Separator, TabNew, Open, Print, Find, Location, Preferences, Window, Bookmarks\n" "ReloadStop, ZoomIn, ZoomOut, Back, Forward, Homepage, Search, Trash" ""); FILLED_ADD (button, 0, 2, 2, 3); From 517e67cc0aa6a36ef1a72ee27307f817a7b008fe Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 17 Dec 2008 22:21:14 +0100 Subject: [PATCH 0583/2970] Allow for loading of https favicon files --- katze/katze-net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index d8b0a405..0777a2bb 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -521,7 +521,8 @@ katze_net_load_icon (KatzeNet* net, g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); pixbuf = NULL; - if (uri && g_str_has_prefix (uri, "http://")) + if (uri && (g_str_has_prefix (uri, "http://") || + g_str_has_prefix (uri, "https://"))) { i = 8; while (uri[i] != '\0' && uri[i] != '/') From c6865304ba657aad1e19d1965c2f607dcae2d855 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 18 Dec 2008 05:02:52 +0100 Subject: [PATCH 0584/2970] Simplify the completion and make it work properly again --- midori/midori-locationaction.c | 242 +++++---------------------------- 1 file changed, 37 insertions(+), 205 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index dcb868d3..30b28d04 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -225,10 +225,8 @@ midori_location_action_set_model (MidoriLocationAction* location_action, GtkWidget* entry; proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); @@ -239,7 +237,6 @@ midori_location_action_set_model (MidoriLocationAction* location_action, g_object_set (gtk_entry_get_completion (GTK_ENTRY (entry)), "model", model ? location_action->sort_model : NULL, NULL); } - while ((proxies = g_slist_next (proxies))); } static gboolean @@ -371,10 +368,8 @@ midori_location_action_activate (GtkAction* action) GtkWidget* entry; proxies = gtk_action_get_proxies (action); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); @@ -384,7 +379,6 @@ midori_location_action_activate (GtkAction* action) Yet we can't predict which one that is, can we? */ gtk_widget_grab_focus (entry); } - while ((proxies = g_slist_next (proxies))); if (GTK_ACTION_CLASS (midori_location_action_parent_class)->activate) GTK_ACTION_CLASS (midori_location_action_parent_class)->activate (action); @@ -598,15 +592,13 @@ midori_location_action_set_item (MidoriLocationAction* location_action, GtkTreeIter* iter, MidoriLocationEntryItem* item) { - GtkTreeModel* model; GdkPixbuf* icon; GdkPixbuf* new_icon; - model = location_action->model; - gtk_list_store_set (GTK_LIST_STORE (model), iter, + gtk_list_store_set (GTK_LIST_STORE (location_action->model), iter, URI_COL, item->uri, TITLE_COL, item->title, -1); - gtk_tree_model_get (model, iter, FAVICON_COL, &icon, -1); + gtk_tree_model_get (location_action->model, iter, FAVICON_COL, &icon, -1); if (item->favicon) new_icon = item->favicon; else if (!icon) @@ -614,80 +606,10 @@ midori_location_action_set_item (MidoriLocationAction* location_action, else new_icon = NULL; if (new_icon) - gtk_list_store_set (GTK_LIST_STORE (model), iter, + gtk_list_store_set (GTK_LIST_STORE (location_action->model), iter, FAVICON_COL, new_icon, -1); } -static gboolean -midori_location_action_child_iter_to_iter (MidoriLocationAction* location_action, - GtkTreeIter* iter, - GtkTreeIter* child_iter) -{ - GtkTreeModel* filter_model; - GtkTreeModel* sort_model; - GtkTreeIter sort_iter; - GtkTreeIter* temp_iter; - - temp_iter = child_iter; - - filter_model = location_action->filter_model; - sort_model = location_action->sort_model; - gtk_tree_model_sort_convert_child_iter_to_iter - (GTK_TREE_MODEL_SORT (sort_model), &sort_iter, child_iter); - temp_iter = &sort_iter; - - return gtk_tree_model_filter_convert_child_iter_to_iter - (GTK_TREE_MODEL_FILTER (filter_model), iter, temp_iter); -} - -static void -midori_location_action_set_active_iter (MidoriLocationAction* location_action, - GtkTreeIter* iter) -{ - GdkPixbuf* pixbuf; - GtkTreeModel* model; - GSList* proxies; - GtkWidget* alignment; - GtkWidget* location_entry; - GtkWidget* entry; - GtkTreeIter parent_iter; - - model = location_action->model; - - /* The filter iter must be set, not the child iter, - * but the row must first be set as visible to - * convert to a filter iter without error. - */ - gtk_list_store_set (GTK_LIST_STORE (model), iter, VISIBLE_COL, TRUE, -1); - - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - location_entry = gtk_bin_get_child (GTK_BIN (alignment)); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - - if (midori_location_action_child_iter_to_iter ( - location_action, &parent_iter, iter)) - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (location_entry), - &parent_iter); - - /* When setting the active iter (when adding or setting an item) - * the icon may have changed, so we must update the entry icon. - */ - gtk_tree_model_get (model, iter, FAVICON_COL, &pixbuf, -1); - - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, pixbuf); - g_object_unref (pixbuf); - } - while ((proxies = g_slist_next (proxies))); -} - /** * midori_location_action_iter_lookup: * @location_action: a #MidoriLocationAction @@ -752,64 +674,6 @@ midori_location_action_iter_insert (MidoriLocationAction* location_action, return TRUE; } -/** - * midori_location_action_reset: - * @location_action: a #MidoriLocationAction - * - * Clears the text in the entry and resets the icon. - **/ -static void -midori_location_action_reset (MidoriLocationAction* location_action) -{ - GSList* proxies; - GtkWidget* alignment; - GtkWidget* location_entry; - GtkWidget* entry; - - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - location_entry = gtk_bin_get_child (GTK_BIN (alignment)); - entry = gtk_bin_get_child (GTK_BIN (location_entry)); - - gtk_entry_set_text (GTK_ENTRY (entry), ""); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE); - } - while ((proxies = g_slist_next (proxies))); -} - -/** - * midori_location_action_set_item_from_uri: - * @location_action: a #MidoriLocationAction - * @uri: a string - * - * Finds the item from the list matching @uri - * and sets it as the active item. - * If @uri is not found it clears the active item. - **/ -static void -midori_location_action_set_item_from_uri (MidoriLocationAction* location_action, - const gchar* uri) -{ - GtkTreeIter iter; - - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - - if (midori_location_action_iter_lookup (location_action, uri, &iter)) - midori_location_action_set_active_iter (location_action, &iter); - else - midori_location_action_reset (location_action); - -} - static gboolean midori_location_entry_match_selected_cb (GtkEntryCompletion* completion, GtkTreeModel* model, @@ -817,9 +681,10 @@ midori_location_entry_match_selected_cb (GtkEntryCompletion* completion, MidoriLocationAction* location_action) { gchar* uri; - gtk_tree_model_get (model, iter, URI_COL, &uri, -1); - midori_location_action_set_item_from_uri (location_action, uri); + + midori_location_action_set_uri (location_action, uri); + g_signal_emit (location_action, signals[SUBMIT_URI], 0, uri, FALSE); g_free (uri); return FALSE; @@ -903,12 +768,16 @@ midori_location_action_connect_proxy (GtkAction* action, GTK_ACTION_CLASS (midori_location_action_parent_class)->connect_proxy ( action, proxy); + location_action = MIDORI_LOCATION_ACTION (action); + katze_object_assign (location_action->default_icon, + gtk_widget_render_icon (proxy, GTK_STOCK_FILE, + GTK_ICON_SIZE_MENU, NULL)); + if (GTK_IS_TOOL_ITEM (proxy)) { alignment = gtk_bin_get_child (GTK_BIN (proxy)); entry = gtk_bin_get_child (GTK_BIN (alignment)); - location_action = MIDORI_LOCATION_ACTION (action); midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), MIDORI_LOCATION_ACTION (action)->progress); gtk_combo_box_set_model (GTK_COMBO_BOX (entry), @@ -979,17 +848,18 @@ midori_location_action_set_text (MidoriLocationAction* location_action, GtkWidget* location_entry; GtkWidget* entry; GtkTreeIter iter; - GtkTreeModel* model; GdkPixbuf* icon; - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (text != NULL); - - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) + if (!(proxies = gtk_action_get_proxies (GTK_ACTION (location_action)))) return; - do + if (midori_location_action_iter_lookup (location_action, text, &iter)) + gtk_tree_model_get (location_action->model, + &iter, FAVICON_COL, &icon, -1); + else + icon = g_object_ref (location_action->default_icon); + + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); @@ -997,19 +867,12 @@ midori_location_action_set_text (MidoriLocationAction* location_action, entry = gtk_bin_get_child (GTK_BIN (location_entry)); gtk_entry_set_text (GTK_ENTRY (entry), text); - if (midori_location_action_iter_lookup (location_action, text, &iter)) - { - model = location_action->model; - gtk_tree_model_get (model, &iter, FAVICON_COL, &icon, -1); - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, icon); - } - /* FIXME: Due to a bug in GtkIconEntry we can't reset the icon - else - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_PRIMARY, location_action->default_icon);*/ + gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, icon); } - while ((proxies = g_slist_next (proxies))); + + if (icon) + g_object_unref (icon); } void @@ -1034,13 +897,11 @@ midori_location_action_set_icon (MidoriLocationAction* location_action, GtkWidget* entry; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (icon && GDK_IS_PIXBUF (icon)); + g_return_if_fail (GDK_IS_PIXBUF (icon)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); @@ -1050,7 +911,6 @@ midori_location_action_set_icon (MidoriLocationAction* location_action, gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); } - while ((proxies = g_slist_next (proxies))); } /** @@ -1073,9 +933,6 @@ midori_location_action_prepend_item (MidoriLocationAction* location_action, gint n; gint visits = 0; - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (item->uri != NULL); - filter_model = location_action->filter_model; model = location_action->model; @@ -1141,12 +998,15 @@ midori_location_action_add_uri (MidoriLocationAction* location_action, g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - katze_assign (location_action->uri, g_strdup (uri)); + if (midori_location_action_is_frozen (location_action)) + return; item.favicon = NULL; item.uri = uri; item.title = NULL; midori_location_action_prepend_item (location_action, &item); + + katze_assign (location_action->uri, g_strdup (uri)); } void @@ -1177,10 +1037,8 @@ midori_location_action_add_item (MidoriLocationAction* location_action, katze_assign (location_action->uri, g_strdup (uri)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data) && !strcmp (location_action->uri, uri)) { @@ -1191,7 +1049,6 @@ midori_location_action_add_item (MidoriLocationAction* location_action, gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); } - while ((proxies = g_slist_next (proxies))); } void @@ -1215,10 +1072,8 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, midori_location_action_prepend_item (location_action, &item); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data) && !g_strcmp0 (location_action->uri, uri)) { @@ -1229,7 +1084,6 @@ midori_location_action_set_icon_for_uri (MidoriLocationAction* location_action, gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); } - while ((proxies = g_slist_next (proxies))); } void @@ -1270,10 +1124,8 @@ midori_location_action_set_progress (MidoriLocationAction* location_action, location_action->progress = CLAMP (progress, 0.0, 1.0); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); @@ -1282,7 +1134,6 @@ midori_location_action_set_progress (MidoriLocationAction* location_action, midori_location_entry_set_progress (MIDORI_LOCATION_ENTRY (entry), location_action->progress); } - while ((proxies = g_slist_next (proxies))); } void @@ -1299,10 +1150,8 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action g_return_if_fail (!stock_id || gtk_stock_lookup (stock_id, &stock_item)); proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - do + for (; proxies != NULL; proxies = g_slist_next (proxies)) if (GTK_IS_TOOL_ITEM (proxies->data)) { alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); @@ -1316,7 +1165,6 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), GTK_ICON_ENTRY_SECONDARY, NULL); } - while ((proxies = g_slist_next (proxies))); } /** @@ -1353,23 +1201,7 @@ midori_location_action_delete_item_from_uri (MidoriLocationAction* location_acti void midori_location_action_clear (MidoriLocationAction* location_action) { - GSList* proxies; - GtkWidget* alignment; - GtkWidget* entry; - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); - if (!proxies) - return; - - do - if (GTK_IS_TOOL_ITEM (proxies->data)) - { - alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); - entry = gtk_bin_get_child (GTK_BIN (alignment)); - - gtk_list_store_clear (GTK_LIST_STORE (location_action->filter_model)); - } - while ((proxies = g_slist_next (proxies))); + gtk_list_store_clear (GTK_LIST_STORE (location_action->filter_model)); } From 2b188c4743d4162236f4ab4ef37044d1361ee1e3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 18 Dec 2008 21:15:05 +0100 Subject: [PATCH 0585/2970] Don't connect to search buttons twice, and fix a pixbuf leak --- midori/midori-browser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 52fdb748..da62db43 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3541,14 +3541,13 @@ _location_action_insert_history_item (MidoriLocationAction* action, KatzeItem* item) { KatzeItem* child; - guint i, n; + guint i; const gchar* uri; GdkPixbuf* pixbuf = NULL; if (KATZE_IS_ARRAY (item)) { - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = n; i > 0; i--) + for (i = katze_array_get_length (KATZE_ARRAY (item)); i > 0; i--) { child = katze_array_get_nth_item (KATZE_ARRAY (item), i - 1); _location_action_insert_history_item (action, browser, child); @@ -3561,6 +3560,7 @@ _location_action_insert_history_item (MidoriLocationAction* action, NULL, GTK_WIDGET (browser), NULL); midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); + g_object_unref (pixbuf); } } @@ -3988,15 +3988,11 @@ midori_browser_init (MidoriBrowser* browser) (_action_by_name (browser, "FindPrevious")); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (_action_find_previous_activate), browser); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); toolitem = (GtkToolItem*)gtk_action_create_tool_item (_action_by_name (browser, "FindNext")); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); gtk_tool_item_set_is_important (toolitem, TRUE); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (_action_find_next_activate), browser); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_case = gtk_toggle_tool_button_new_from_stock ( GTK_STOCK_SPELL_CHECK); From b88ba4094fb850f9a8bf04a6cfeb0ed91875a8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 18 Dec 2008 21:19:13 +0100 Subject: [PATCH 0586/2970] Make the tool item label in the preferences selectable --- midori/midori-preferences.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 1c0e99c6..c1071e13 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -489,6 +489,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, "Separator, TabNew, Open, Print, Find, Location, Preferences, Window, Bookmarks\n" "ReloadStop, ZoomIn, ZoomOut, Back, Forward, Homepage, Search, Trash" ""); + gtk_label_set_selectable (GTK_LABEL (button), TRUE); FILLED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Browsing")); TABLE_NEW (5, 2); From 993fb526440bb5db8d45ff0b90367231db8f1596 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Sat, 20 Dec 2008 00:24:35 +0100 Subject: [PATCH 0587/2970] Allow relative localhost URIs --- midori/sokoke.c | 2 +- tests/magic-uri.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index adcddb73..e425b9d2 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -121,7 +121,7 @@ sokoke_magic_uri (const gchar* uri, if (search && search[0] && !g_ascii_isalpha (search[1])) if (!strchr (search, '.')) return g_strconcat ("http://", uri, NULL); - if (!strcmp (uri, "localhost")) + if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) return g_strconcat ("http://", uri, NULL); parts = g_strsplit (uri, ".", 0); if (!search && parts[0] && parts[1]) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 3a8dbafa..7fda317a 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -60,6 +60,7 @@ main (int argc, g_free (b); test_input ("localhost", "http://localhost"); test_input ("localhost:8000", "http://localhost:8000"); + test_input ("localhost/rss", "http://localhost/rss"); test_input ("192.168.1.1", "http://192.168.1.1"); test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); test_input ("sm midori", SM "midori"); From f059882742042da64093edeb8e4fa1ee813e7457 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 20 Dec 2008 00:25:31 +0100 Subject: [PATCH 0588/2970] Show even broken (not linking) extensions in the panel --- midori/main.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/midori/main.c b/midori/main.c index e4d29ac4..19c07047 100644 --- a/midori/main.c +++ b/midori/main.c @@ -2020,20 +2020,17 @@ main (int argc, fullname = g_build_filename (extension_path, filename, NULL); module = g_module_open (fullname, G_MODULE_BIND_LOCAL); g_free (fullname); - if (!module) - { - g_warning ("%s", g_module_error ()); - continue; - } - ; - if (!g_module_symbol (module, "extension_init", - (gpointer) &extension_init)) - { - g_warning ("%s", g_module_error ()); - continue; - } - extension = extension_init (); + + if (module && g_module_symbol (module, "extension_init", + (gpointer) &extension_init)) + extension = extension_init (); + else + extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", filename, + "description", g_module_error (), + NULL); katze_array_add_item (extensions, extension); + g_object_unref (extension); } g_dir_close (extension_dir); } From e633787b19b55ceacb7236761a7752ca1d51cde7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 20 Dec 2008 00:31:16 +0100 Subject: [PATCH 0589/2970] Remove forgotten debugging output from MidoriViewable --- midori/midori-viewable.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c index d83c2c64..7d43ea28 100644 --- a/midori/midori-viewable.c +++ b/midori/midori-viewable.c @@ -110,13 +110,11 @@ midori_viewable_new_from_uri (const gchar* uri) g_return_val_if_fail (uri != NULL, NULL); - g_debug ("size: %d", g_hash_table_size (iface->p)); if (!g_hash_table_size (iface->p)) return NULL; if ((parts = g_strsplit (uri, "://", 2))) { - g_debug ("%s, %s", parts[0], uri); if (!(type_name = g_hash_table_lookup (iface->p, parts[0]))) { /* FIXME: Support midori://dummy/foo */ @@ -134,7 +132,6 @@ midori_viewable_new_from_uri (const gchar* uri) } else if ((parts = g_strsplit_set (uri, ":", 2))) { - g_debug (parts[0]); type_name = g_hash_table_lookup (iface->p, parts[0]); g_strfreev (parts); if (type_name) From d8ace082776b404627ef2cfb504a6981d491242c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 21 Dec 2008 17:52:10 +0100 Subject: [PATCH 0590/2970] Miscellaneous improvements and cleanup in MidoriView --- midori/midori-view.c | 79 ++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 32 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 8a89b137..91c402c4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -506,9 +506,15 @@ midori_view_class_init (MidoriViewClass* class) } static void -midori_view_notify_icon_cb (MidoriView* view, - GParamSpec pspec) +midori_view_update_icon (MidoriView* view, + GdkPixbuf* icon) { + if (!icon) + icon = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + katze_object_assign (view->icon, icon); + g_object_notify (G_OBJECT (view), "icon"); + if (view->tab_icon) katze_throbber_set_static_pixbuf (KATZE_THROBBER (view->tab_icon), view->icon); @@ -522,26 +528,28 @@ static void midori_view_icon_cb (GdkPixbuf* icon, MidoriView* view) { - katze_object_assign (view->icon, icon); - g_object_notify (G_OBJECT (view), "icon"); + midori_view_update_icon (view, icon); } static void _midori_web_view_load_icon (MidoriView* view) { - GdkPixbuf* pixbuf; - - pixbuf = katze_net_load_icon (view->net, view->uri, + GdkPixbuf* pixbuf = katze_net_load_icon (view->net, view->uri, (KatzeNetIconCb)midori_view_icon_cb, GTK_WIDGET (view), view); - katze_object_assign (view->icon, pixbuf); - g_object_notify (G_OBJECT (view), "icon"); + midori_view_update_icon (view, pixbuf); } static void -midori_view_notify_load_status_cb (MidoriView* view, - GParamSpec pspec) +midori_view_update_load_status (MidoriView* view, + MidoriLoadStatus load_status) { + if (view->load_status == load_status) + return; + + view->load_status = load_status; + g_object_notify (G_OBJECT (view), "load-status"); + if (view->tab_icon) katze_throbber_set_animated (KATZE_THROBBER (view->tab_icon), view->load_status != MIDORI_LOAD_FINISHED); @@ -555,11 +563,13 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, MidoriView* view) { - view->load_status = MIDORI_LOAD_PROVISIONAL; - g_object_notify (G_OBJECT (view), "load-status"); + g_object_freeze_notify (G_OBJECT (view)); + midori_view_update_load_status (view, MIDORI_LOAD_PROVISIONAL); view->progress = 0.0; g_object_notify (G_OBJECT (view), "progress"); + + g_object_thaw_notify (G_OBJECT (view)); } static void @@ -568,20 +578,19 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, MidoriView* view) { const gchar* uri; - GdkPixbuf* icon; + + g_object_freeze_notify (G_OBJECT (view)); uri = webkit_web_frame_get_uri (web_frame); katze_assign (view->uri, g_strdup (uri)); g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); - icon = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); - katze_object_assign (view->icon, icon); - g_object_notify (G_OBJECT (view), "icon"); + midori_view_update_icon (view, NULL); - view->load_status = MIDORI_LOAD_COMMITTED; - g_object_notify (G_OBJECT (view), "load-status"); + midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED); + + g_object_thaw_notify (G_OBJECT (view)); } static void @@ -646,8 +655,7 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, g_free (data); } - view->load_status = MIDORI_LOAD_FINISHED; - g_object_notify (G_OBJECT (view), "load-status"); + midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); } static void @@ -660,8 +668,13 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, GjsValue* document; GjsValue* links; */ + g_object_freeze_notify (G_OBJECT (view)); + view->progress = 1.0; g_object_notify (G_OBJECT (view), "progress"); + midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); + + g_object_thaw_notify (G_OBJECT (view)); /* js_context = webkit_web_frame_get_global_context (web_frame); value = gjs_value_new (js_context, NULL); @@ -1103,14 +1116,6 @@ midori_view_init (MidoriView* view) view->item = NULL; view->download_manager = NULL; - - g_object_connect (view, - "signal::notify::icon", - midori_view_notify_icon_cb, NULL, - "signal::notify::load-status", - midori_view_notify_load_status_cb, NULL, - NULL); - view->web_view = NULL; /* Adjustments are not created automatically */ @@ -1178,7 +1183,7 @@ midori_view_set_property (GObject* object, katze_assign (view->statusbar_text, g_value_dup_string (value)); break; case PROP_SETTINGS: - midori_view_set_settings (view, g_value_dup_object (value)); + midori_view_set_settings (view, g_value_get_object (value)); break; case PROP_NET: katze_object_assign (view->net, g_value_dup_object (value)); @@ -1242,6 +1247,8 @@ midori_view_get_property (GObject* object, GtkWidget* midori_view_new (KatzeNet* net) { + g_return_val_if_fail (!net || KATZE_IS_NET (net), NULL); + return g_object_new (MIDORI_TYPE_VIEW, "net", net, NULL); } @@ -1306,6 +1313,12 @@ void midori_view_set_settings (MidoriView* view, MidoriWebSettings* settings) { + g_return_if_fail (MIDORI_IS_VIEW (view)); + g_return_if_fail (!settings || MIDORI_IS_WEB_SETTINGS (settings)); + + if (view->settings == settings) + return; + if (view->settings) g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); @@ -1495,12 +1508,14 @@ midori_view_set_uri (MidoriView* view, g_return_if_fail (MIDORI_IS_VIEW (view)); + if (!uri) uri = ""; + if (!view->web_view && view->uri && g_str_has_prefix (view->uri, "view-source:")) { g_signal_emit (view, signals[NEW_TAB], 0, uri); } - else if (!view->web_view && uri && g_str_has_prefix (uri, "view-source:")) + else if (!view->web_view && g_str_has_prefix (uri, "view-source:")) { katze_assign (view->uri, g_strdup (uri)); g_object_notify (G_OBJECT (view), "uri"); From 127632f48617848d415a64452860dab974d1eb03 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 21 Dec 2008 18:11:21 +0100 Subject: [PATCH 0591/2970] Update translation template --- po/midori.pot | 797 +++++++++++++++++++++++++++----------------------- 1 file changed, 435 insertions(+), 362 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index 5c4e8c54..7159c28e 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" +"POT-Creation-Date: 2008-12-20 19:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,8 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 ../midori/main.c:1703 ../midori/main.c:1712 +#: ../midori/main.c:1723 ../midori/main.c:1747 +#: ../midori/midori-websettings.c:234 msgid "Midori" msgstr "" @@ -29,208 +30,244 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:86 +#: ../midori/main.c:87 msgid "_Bookmark" msgstr "" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:88 ../midori/midori-browser.c:3743 msgid "_Bookmarks" msgstr "" -#: ../midori/main.c:88 +#: ../midori/main.c:89 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Console" msgstr "" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Extensions" msgstr "" -#: ../midori/main.c:91 +#: ../midori/main.c:92 msgid "_History" msgstr "" -#: ../midori/main.c:92 +#: ../midori/main.c:93 msgid "_Homepage" msgstr "" -#: ../midori/main.c:93 +#: ../midori/main.c:94 msgid "_Userscripts" msgstr "" -#: ../midori/main.c:94 +#: ../midori/main.c:95 msgid "User_styles" msgstr "" -#: ../midori/main.c:95 +#: ../midori/main.c:96 msgid "New _Tab" msgstr "" -#: ../midori/main.c:96 +#: ../midori/main.c:97 msgid "_Transfers" msgstr "" -#: ../midori/main.c:97 +#: ../midori/main.c:98 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/main.c:98 +#: ../midori/main.c:99 msgid "New _Window" msgstr "" -#: ../midori/main.c:143 +#: ../midori/main.c:155 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:198 +#: ../midori/main.c:210 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:217 ../midori/main.c:287 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:532 +#: ../midori/main.c:529 msgid "File not found." msgstr "" -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:537 ../midori/main.c:546 msgid "Malformed document." msgstr "" -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:568 ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:657 +#: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:681 +#: ../midori/main.c:678 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:711 ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:841 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "" - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:1715 +#: ../midori/main.c:869 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:897 ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1045 ../midori/sokoke.c:479 +#, c-format +msgid "Writing failed." +msgstr "" + +#: ../midori/main.c:1065 ../midori/main.c:1082 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1101 ../midori/main.c:1125 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1146 ../midori/midori-preferences.c:381 +msgid "Transfers" +msgstr "" + +#: ../midori/main.c:1182 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1508 +msgid "Authentication Required" +msgstr "" + +#: ../midori/main.c:1524 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../midori/main.c:1538 +msgid "Username" +msgstr "" + +#: ../midori/main.c:1549 +msgid "Password" +msgstr "" + +#: ../midori/main.c:1654 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1656 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1658 +msgid "URIs" +msgstr "" + +#: ../midori/main.c:1700 +msgid "[URIs]" +msgstr "" + +#: ../midori/main.c:1724 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:1726 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1747 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1766 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1825 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1840 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1853 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1866 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1878 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:1894 +msgid "_Ignore" +msgstr "" + +#: ../midori/main.c:1967 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:1982 +msgid "Modify _preferences" +msgstr "" + +#: ../midori/main.c:1986 +msgid "Reset the last _session" +msgstr "" + +#: ../midori/main.c:1991 +msgid "Disable all _extensions" +msgstr "" + +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3137 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3134 msgid "Stop loading the current page" msgstr "" @@ -256,11 +293,11 @@ msgstr "" msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:868 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:882 msgid "_URL:" msgstr "" @@ -288,418 +325,418 @@ msgstr "" msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2605 msgid "Separator" msgstr "" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2716 #, c-format msgid "A week ago" msgstr "" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2722 #, c-format msgid "%d days ago" msgstr "" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2729 msgid "Today" msgstr "" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2731 msgid "Yesterday" msgstr "" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2820 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2828 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:2962 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3065 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3068 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3071 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3074 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3077 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3079 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3080 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3082 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3083 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3086 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3089 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3091 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3094 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3097 ../midori/midori-browser.c:3100 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3103 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3106 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3109 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3112 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3114 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3115 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3117 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3118 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3121 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3122 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3125 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3127 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3128 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3140 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3143 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3146 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3148 ../midori/midori-view.c:1004 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3149 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3151 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3152 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3156 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3158 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3161 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3164 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3167 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3169 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3170 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:976 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3173 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3177 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3180 msgid "Edit the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3183 msgid "Delete the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3186 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3189 msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3192 msgid "Bookmark the selected history item" msgstr "" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3194 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3196 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3197 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3201 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3202 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3204 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3205 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3207 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3209 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3210 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3212 msgid "_Frequent questions" msgstr "" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3213 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3215 msgid "_Report a bug" msgstr "" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3216 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3219 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3226 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3227 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3232 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3233 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3236 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3237 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3240 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3241 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3244 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3245 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3248 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3249 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3252 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3253 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3668 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3670 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3694 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3696 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3715 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3728 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3730 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3745 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3758 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3760 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:3882 msgid "Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3925 ../midori/midori-preferences.c:579 msgid "History" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:3968 msgid "_Inline find:" msgstr "" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:3999 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4007 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4016 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4264 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -708,384 +745,412 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:144 ../midori/midori-view.c:1643 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:145 ../midori/midori-websettings.c:419 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:146 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:161 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:162 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:163 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:164 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:165 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:166 ../midori/midori-websettings.c:238 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:181 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:182 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:183 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:198 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:199 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:200 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:201 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:202 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:217 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:218 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:219 ../panels/midori-addons.c:97 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:235 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:236 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:237 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:278 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:279 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:287 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:288 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:296 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:297 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:305 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:306 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:315 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:316 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:324 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:325 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:334 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:335 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:343 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:344 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:352 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:353 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:361 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:362 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:370 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:371 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:380 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:381 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:390 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:391 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:399 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:400 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:409 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:410 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:420 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:428 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:429 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:437 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:438 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:446 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:447 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:455 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:456 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:464 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:465 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:475 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:476 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:484 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:485 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:494 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:495 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:505 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:506 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:515 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:516 msgid "Load an URL from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:524 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:525 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:533 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:534 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:542 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:543 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:569 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:570 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:583 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:584 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:592 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:593 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:603 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:604 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:612 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:613 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:621 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:622 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:630 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:631 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:641 msgid "HTTP Proxy" msgstr "" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:642 msgid "The proxy used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:661 +msgid "Identify as" +msgstr "" + +#: ../midori/midori-websettings.c:662 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:682 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:683 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:695 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:696 msgid "The allowed size of the cache" msgstr "" @@ -1095,163 +1160,171 @@ msgstr "" msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:908 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:931 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:939 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:955 +#: ../midori/midori-view.c:961 msgid "Open URL in New _Tab" msgstr "" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1369 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1507 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:1531 #, c-format msgid "No documentation installed" msgstr "" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:369 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:370 msgid "Startup" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:417 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:418 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:420 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:428 msgid "Minimum Font Size" msgstr "" +#: ../midori/midori-preferences.c:437 +msgid "Encoding" +msgstr "" + +#: ../midori/midori-preferences.c:440 +msgid "The character encoding to use by default" +msgstr "" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:447 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:448 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:451 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:454 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:457 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:460 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:463 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:466 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:469 msgid "Enable developer tools" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:477 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:478 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:494 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:525 ../midori/midori-preferences.c:526 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:548 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:555 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:561 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:574 ../midori/midori-preferences.c:586 msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:852 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:896 msgid "_Icon (name or file):" msgstr "" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:910 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1060 +#: ../midori/midori-searchaction.c:1087 msgid "Manage search engines" msgstr "" @@ -1259,7 +1332,7 @@ msgstr "" msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:282 +#: ../midori/sokoke.c:302 msgid "Warning: You are using a superuser account!" msgstr "" @@ -1320,16 +1393,16 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:231 msgid "Choose folder" msgstr "" From b8c2139d3f10004ce9f176b05e93815c105886b8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 21 Dec 2008 19:21:04 +0100 Subject: [PATCH 0592/2970] Revamp clearing of the history --- midori/midori-browser.c | 50 ++++++++++++++++++++++------------ midori/midori-locationaction.c | 2 +- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index da62db43..5df6afd0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2965,19 +2965,7 @@ _action_history_clear_activate (GtkAction* action, if (result != GTK_RESPONSE_YES) return; - location_action = _action_by_name (browser, "Location"); - tree_view = GTK_TREE_VIEW (browser->panel_history); - store = GTK_TREE_STORE (gtk_tree_view_get_model (tree_view)); - gtk_tree_store_clear (store); - - n = katze_array_get_length (browser->history); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (browser->history, i); - katze_array_clear (KATZE_ARRAY (item)); - } katze_array_clear (browser->history); - midori_location_action_clear (MIDORI_LOCATION_ACTION (location_action)); } static void @@ -3565,13 +3553,43 @@ _location_action_insert_history_item (MidoriLocationAction* action, } static void -midori_browser_load_history (MidoriBrowser* browser) +midori_browser_history_clear_cb (KatzeArray* history, + MidoriBrowser* browser) +{ + GtkTreeView* treeview; + GtkTreeStore* store; + GtkAction* location_action; + + treeview = GTK_TREE_VIEW (browser->panel_history); + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + gtk_tree_store_clear (store); + + location_action = _action_by_name (browser, "Location"); + midori_location_action_clear (MIDORI_LOCATION_ACTION (location_action)); +} + +static void +midori_browser_set_history (MidoriBrowser* browser, + KatzeArray* history) { GtkTreeView* treeview; GtkTreeModel* treemodel; GtkAction* action; - /* FIXME: Clear current items */ + if (browser->history == history) + return; + + if (browser->history) + g_signal_handlers_disconnect_by_func (browser->history, + midori_browser_history_clear_cb, + browser); + if (history) + g_object_ref (history); + katze_object_assign (browser->history, history); + g_signal_connect (browser->history, "clear", + G_CALLBACK (midori_browser_history_clear_cb), browser); + + midori_browser_history_clear_cb (browser->history, browser); g_object_set (_action_by_name (browser, "RecentlyVisited"), "array", browser->history, NULL); @@ -3581,7 +3599,6 @@ midori_browser_load_history (MidoriBrowser* browser) treeview = GTK_TREE_VIEW (browser->panel_history); treemodel = gtk_tree_view_get_model (treeview); - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, KATZE_ITEM (browser->history)); @@ -4453,8 +4470,7 @@ midori_browser_set_property (GObject* object, break; case PROP_HISTORY: /* FIXME: Disconnect handlers */ - katze_object_assign (browser->history, g_value_dup_object (value)); - midori_browser_load_history (browser); + midori_browser_set_history (browser, g_value_get_object (value)); /* FIXME: Connect to updates */ break; default: diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 30b28d04..c3b004bf 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1203,5 +1203,5 @@ midori_location_action_clear (MidoriLocationAction* location_action) { g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - gtk_list_store_clear (GTK_LIST_STORE (location_action->filter_model)); + gtk_list_store_clear (GTK_LIST_STORE (location_action->model)); } From a495cc7a5adac21f6850b3af28975fced6821adc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 21 Dec 2008 20:33:00 +0100 Subject: [PATCH 0593/2970] Update TODO file --- TODO | 7 ------- 1 file changed, 7 deletions(-) diff --git a/TODO b/TODO index 58e019ac..af50c86e 100644 --- a/TODO +++ b/TODO @@ -4,17 +4,11 @@ TODO: . Revamp bookmarks UI, including creating of bookmark folders . Use an update timeout in KatzePropertyProxy instead of only focus-out . Show a loading mouse pointer - . Support bookmarklets . Scroll tabs w/o switching tabs . Import and export of the bookmarks file, or using one from a specific path - . Save files on change as opposed to on quit - . Middle click toolbuttons or menuitems should open new tabs . Custom context menu actions, like in Thunar or Epiphany . Custom tab names . Open an auto-vanishing findbox with '.' - . Custom panels, loaded from (x)htm(l) files or websites - . Drag tabs onto the panel to add them to the sidebar - . Save completion stores . Analogus to blocked popups, blocked scripts moving layers on load (extension) . Per-site blocking of individual elements on a page . Statusbar icon 'cookies blocked', icon 'popups blocked' @@ -30,7 +24,6 @@ TODO: . Spell check support . Check specific bookmarks for updates automatically (extension) . Mark "new" as well as "actually modified" tabs specially (even over sessions) - . Customizable toolbars, custom buttons (uri, title, icon)? . SearchEngine: "Show in context menu" . Use libnotify for events, e.g. download finished . Save screenshot of a document? From 995be8e6da4b60d968a205abfffebb9b1d19aa03 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 21 Dec 2008 20:44:31 +0100 Subject: [PATCH 0594/2970] Clean up handling of bookmarks like the history before --- midori/midori-browser.c | 48 ++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5df6afd0..6ae4d153 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3586,8 +3586,6 @@ midori_browser_set_history (MidoriBrowser* browser, if (history) g_object_ref (history); katze_object_assign (browser->history, history); - g_signal_connect (browser->history, "clear", - G_CALLBACK (midori_browser_history_clear_cb), browser); midori_browser_history_clear_cb (browser->history, browser); @@ -3597,6 +3595,9 @@ midori_browser_set_history (MidoriBrowser* browser, if (!browser->history) return; + g_signal_connect (browser->history, "clear", + G_CALLBACK (midori_browser_history_clear_cb), browser); + treeview = GTK_TREE_VIEW (browser->panel_history); treemodel = gtk_tree_view_get_model (treeview); _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), @@ -4370,13 +4371,41 @@ bookmarks_model_insert_folder (GtkTreeStore* treestore, } static void -midori_browser_load_bookmarks (MidoriBrowser* browser) +midori_browser_bookmarks_clear_cb (KatzeArray* bookmarks, + MidoriBrowser* browser) +{ + GtkTreeView* treeview; + GtkTreeStore* store; + GtkAction* location_action; + + treeview = GTK_TREE_VIEW (browser->panel_bookmarks); + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + gtk_tree_store_clear (store); +} + +static void +midori_browser_set_bookmarks (MidoriBrowser* browser, + KatzeArray* bookmarks) { guint i, n; KatzeItem* item; GtkTreeModel* treestore; - // FIXME: Clear bookmark panel + if (browser->bookmarks == bookmarks) + return; + + if (browser->bookmarks) + g_signal_handlers_disconnect_by_func (browser->bookmarks, + midori_browser_bookmarks_clear_cb, + browser); + if (bookmarks) + g_object_ref (bookmarks); + katze_object_assign (browser->bookmarks, bookmarks); + + midori_browser_bookmarks_clear_cb (browser->bookmarks, browser); + + g_object_set (_action_by_name (browser, "Bookmarks"), "array", + browser->bookmarks, NULL); _action_set_sensitive (browser, "BookmarkAdd", FALSE); @@ -4393,6 +4422,8 @@ midori_browser_load_bookmarks (MidoriBrowser* browser) G_CALLBACK (browser_bookmarks_add_item_cb), browser); g_signal_connect (browser->bookmarks, "remove-item", G_CALLBACK (browser_bookmarks_remove_item_cb), browser); + g_signal_connect (browser->bookmarks, "clear", + G_CALLBACK (midori_browser_bookmarks_clear_cb), browser); treestore = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); bookmarks_model_insert_folder (GTK_TREE_STORE (treestore), @@ -4437,12 +4468,7 @@ midori_browser_set_property (GObject* object, (GtkCallback) midori_view_set_settings, browser->settings); break; case PROP_BOOKMARKS: - /* FIXME: Disconnect handlers */ - katze_object_assign (browser->bookmarks, g_value_dup_object (value)); - g_object_set (_action_by_name (browser, "Bookmarks"), "array", - browser->bookmarks, NULL); - midori_browser_load_bookmarks (browser); - /* FIXME: Connect to updates */ + midori_browser_set_bookmarks (browser, g_value_get_object (value)); break; case PROP_TRASH: /* FIXME: Disconnect handlers */ @@ -4469,9 +4495,7 @@ midori_browser_set_property (GObject* object, } break; case PROP_HISTORY: - /* FIXME: Disconnect handlers */ midori_browser_set_history (browser, g_value_get_object (value)); - /* FIXME: Connect to updates */ break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); From 1b1d2f6e5f7a5e36e588c6baa2b2eaaf982bc3f0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 23 Dec 2008 23:14:20 +0100 Subject: [PATCH 0595/2970] Don't install icon signals if GtkEntry has them already --- midori/gtkiconentry.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 6faa9845..428fb216 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -185,8 +185,9 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) * * The ::icon-pressed signal is emitted when an icon is clicked. */ + if (!(signals[ICON_PRESSED] = g_signal_lookup ("icon-pressed", GTK_TYPE_ENTRY))) signals[ICON_PRESSED] = - g_signal_new ("icon_pressed", + g_signal_new ("icon-pressed", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconEntryClass, icon_pressed), @@ -205,8 +206,9 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) * The ::icon-released signal is emitted on the button release from a * mouse click. */ + if (!(signals[ICON_RELEASED] = g_signal_lookup ("icon-released", GTK_TYPE_ENTRY))) signals[ICON_RELEASED] = - g_signal_new ("icon_released", + g_signal_new ("icon-released", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconEntryClass, icon_released), From 394eb4b002c0a29b342abb9c76bbb691a0286a3c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 23 Dec 2008 23:15:36 +0100 Subject: [PATCH 0596/2970] Add the Enforce 96 DPI preference to the dialog --- midori/midori-preferences.c | 3 +++ midori/midori-websettings.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c1071e13..ec9a15e7 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -468,6 +468,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "enable-developer-extras", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); SPANNED_ADD (button, 0, 1, 3, 4); + button = katze_property_proxy (settings, "enforce-96-dpi", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 DPI")); + SPANNED_ADD (button, 1, 2, 3, 4); label = katze_property_label (settings, "location-entry-search"); INDENTED_ADD (label, 0, 1, 4, 5); entry = katze_property_proxy (settings, "location-entry-search", NULL); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index b050021f..30a02c09 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -118,6 +118,7 @@ enum PROP_OPEN_TABS_NEXT_TO_CURRENT, PROP_OPEN_POPUPS_IN_TABS, + PROP_ENFORCE_96_DPI, PROP_ENABLE_DEVELOPER_EXTRAS, PROP_ACCEPT_COOKIES, PROP_ORIGINAL_COOKIES_ONLY, @@ -545,6 +546,23 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE)); + if (!g_object_class_find_property (gobject_class, "enforce-96-dpi")) + /** + * MidoriWebSettings:enforce-96-dpi: + * + * Whether to enforce a resolution of 96 DPI. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_ENFORCE_96_DPI, + g_param_spec_boolean ( + "enforce-96-dpi", + "Enforce 96 DPI", + "Whether to enforce a resolution of 96 DPI", + FALSE, + G_PARAM_READABLE)); + if (!g_object_class_find_property (gobject_class, "enable-developer-extras")) /** * MidoriWebSettings:enable-developer-extras: @@ -1077,6 +1095,9 @@ midori_web_settings_get_property (GObject* object, g_value_set_boolean (value, web_settings->open_popups_in_tabs); break; + case PROP_ENFORCE_96_DPI: + g_value_set_boolean (value, FALSE); + break; case PROP_ENABLE_DEVELOPER_EXTRAS: g_value_set_boolean (value, FALSE); break; From 7c3cb9a1bd86ac72714a0b1fb3f38106e5db4e1a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 24 Dec 2008 04:07:08 +0100 Subject: [PATCH 0597/2970] Add "parent" property to KatzeItem --- katze/katze-item.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/katze/katze-item.c b/katze/katze-item.c index 787995d8..3423cfe5 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -35,7 +35,8 @@ enum PROP_URI, PROP_ICON, PROP_TOKEN, - PROP_ADDED + PROP_ADDED, + PROP_PARENT }; static void @@ -122,6 +123,21 @@ katze_item_class_init (KatzeItemClass* class) 0, flags)); + /** + * KatzeItem:parent: + * + * The parent of the item. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_PARENT, + g_param_spec_object ( + "parent", + "Parent", + "The parent of the item", + G_TYPE_OBJECT, + flags)); } @@ -174,6 +190,9 @@ katze_item_set_property (GObject* object, case PROP_ADDED: item->added = g_value_get_int64 (value); break; + case PROP_PARENT: + katze_item_set_parent (item, g_value_get_object (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -208,6 +227,9 @@ katze_item_get_property (GObject* object, case PROP_ADDED: g_value_set_int64 (value, item->added); break; + case PROP_PARENT: + g_value_set_object (value, item->parent); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -433,6 +455,8 @@ katze_item_set_added (KatzeItem* item, * * Determines the parent of @item. * + * Since 0.1.2 you can monitor the "parent" property. + * * Return value: the parent of the item **/ gpointer @@ -450,18 +474,21 @@ katze_item_get_parent (KatzeItem* item) * * Sets the parent of @item. * - * This is intended for item container implementations and - * should not be used otherwise. + * This is intended for item container implementations. Notably + * the new parent will not be notified of the change. + * + * Since 0.1.2 you can monitor the "parent" property, so unsetting + * the parent is actually safe if the parent supports it. **/ void katze_item_set_parent (KatzeItem* item, gpointer parent) { g_return_if_fail (KATZE_IS_ITEM (item)); + g_return_if_fail (!parent || G_IS_OBJECT (parent)); if (parent) g_object_ref (parent); katze_object_assign (item->parent, parent); - /* g_object_notify (G_OBJECT (item), "parent"); */ + g_object_notify (G_OBJECT (item), "parent"); } - From 770b6d9e1108f79b0a92f377b855d0accf40564b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 24 Dec 2008 04:44:02 +0100 Subject: [PATCH 0598/2970] Optimize KatzeArray a little --- katze/katze-array.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/katze/katze-array.c b/katze/katze-array.c index 66dfcc0c..32e7b892 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -47,8 +47,11 @@ _katze_array_add_item (KatzeList* list, { if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) { + GType type = G_OBJECT_TYPE (item); + + g_return_if_fail (katze_array_is_a ((KatzeArray*)list, type)); g_object_ref (item); - if (KATZE_IS_ITEM (item)) + if (g_type_is_a (type, KATZE_TYPE_ITEM)) katze_item_set_parent (item, list); } KATZE_LIST_CLASS (katze_array_parent_class)->add_item (list, item); @@ -111,14 +114,15 @@ katze_array_finalize (GObject* object) * Creates a new #KatzeArray for @type items. * * You may only add items of the given type or inherited - * from it to this array. - * + * from it to this array *if* @type is an #GObject type. * The array will keep a reference on each object until * it is removed from the array. * - * Note: While you *can* (currently) use #KatzeList accessors - * to circumvent type safety, you are *encouraged* to use - * only #KatzeArray accessors, or behaviour is undefined. + * If @type is *not* a #GObject type, #KatzeArray behaves + * pretty much like #KatzeList. + * + * Note: Since 0.1.2 you may use #KatzeList accessors to + * work with #KatzeArray if you want to. * * Return value: a new #KatzeArray **/ @@ -164,11 +168,9 @@ void katze_array_add_item (KatzeArray* array, gpointer item) { - g_return_if_fail (KATZE_IS_ARRAY (array)); - if (katze_array_is_a (array, G_TYPE_OBJECT)) - g_return_if_fail (katze_array_is_a (array, G_OBJECT_TYPE (item))); + /* g_return_if_fail (KATZE_IS_ARRAY (array)); */ - g_signal_emit_by_name (array, "add-item", item); + katze_list_add_item (KATZE_LIST (array), item); } /** @@ -184,11 +186,9 @@ void katze_array_remove_item (KatzeArray* array, gpointer item) { - g_return_if_fail (KATZE_IS_ARRAY (array)); - if (katze_array_is_a (array, G_TYPE_OBJECT)) - g_return_if_fail (katze_array_is_a (array, G_OBJECT_TYPE (item))); + /* g_return_if_fail (KATZE_IS_ARRAY (array)); */ - g_signal_emit_by_name (array, "remove-item", item); + katze_list_remove_item (KATZE_LIST (array), item); } /** @@ -204,7 +204,7 @@ gpointer katze_array_get_nth_item (KatzeArray* array, guint n) { - g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); + /* g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); */ return katze_list_get_nth_item (KATZE_LIST (array), n); } @@ -220,7 +220,7 @@ katze_array_get_nth_item (KatzeArray* array, gboolean katze_array_is_empty (KatzeArray* array) { - g_return_val_if_fail (KATZE_IS_ARRAY (array), TRUE); + /* g_return_val_if_fail (KATZE_IS_ARRAY (array), TRUE); */ return katze_list_is_empty (KATZE_LIST (array)); } @@ -238,9 +238,7 @@ gint katze_array_get_item_index (KatzeArray* array, gpointer item) { - g_return_val_if_fail (KATZE_IS_ARRAY (array), -1); - if (katze_array_is_a (array, G_TYPE_OBJECT)) - g_return_val_if_fail (katze_array_is_a (array, G_OBJECT_TYPE (item)), -1); + /* g_return_val_if_fail (KATZE_IS_ARRAY (array), -1); */ return katze_list_get_item_index (KATZE_LIST (array), item); } @@ -297,7 +295,7 @@ katze_array_find_token (KatzeArray* array, guint katze_array_get_length (KatzeArray* array) { - g_return_val_if_fail (KATZE_IS_ARRAY (array), 0); + /* g_return_val_if_fail (KATZE_IS_ARRAY (array), 0); */ return katze_list_get_length (KATZE_LIST (array)); } @@ -311,7 +309,7 @@ katze_array_get_length (KatzeArray* array) void katze_array_clear (KatzeArray* array) { - g_return_if_fail (KATZE_IS_ARRAY (array)); + /* g_return_if_fail (KATZE_IS_ARRAY (array)); */ katze_list_clear (KATZE_LIST (array)); } From be9c907c7ec9ea93e65f0090e911b03eca8c6068 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 25 Dec 2008 00:39:35 +0100 Subject: [PATCH 0599/2970] Implement and make use of midori_app_create_browser --- midori/midori-app.c | 57 +++++++++++++++++++++++++-------------------- midori/midori-app.h | 3 +++ 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 76250823..fe091136 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -108,17 +108,11 @@ midori_browser_new_window_cb (MidoriBrowser* browser, const gchar* uri, MidoriApp* app) { - MidoriBrowser* new_browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", app->settings, - "bookmarks", app->bookmarks, - "trash", app->trash, - "search-engines", app->search_engines, - "history", app->history, - NULL); + MidoriBrowser* new_browser = midori_app_create_browser (app); + midori_app_add_browser (app, new_browser); + midori_browser_add_uri (new_browser, uri); gtk_widget_show (GTK_WIDGET (new_browser)); - - g_signal_emit (app, signals[ADD_BROWSER], 0, new_browser); } static gboolean @@ -307,17 +301,11 @@ midori_browser_message_received_cb (UniqueApp* instance, response = UNIQUE_RESPONSE_OK; break; case UNIQUE_NEW: - browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", app->settings, - "bookmarks", app->bookmarks, - "trash", app->trash, - "search-engines", app->search_engines, - "history", app->history, - NULL); + browser = midori_app_create_browser (app); + midori_app_add_browser (app, browser); /* FIXME: Should open the homepage according to settings */ midori_browser_add_uri (browser, ""); midori_browser_activate_action (browser, "Location"); - midori_app_add_browser (app, browser); gtk_window_set_screen (GTK_WINDOW (app->browser), unique_message_data_get_screen (message)); gtk_widget_show (GTK_WIDGET (browser)); @@ -336,13 +324,7 @@ midori_browser_message_received_cb (UniqueApp* instance, &open_external_pages_in, NULL); if (open_external_pages_in == MIDORI_NEW_PAGE_WINDOW) { - browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", app->settings, - "bookmarks", app->bookmarks, - "trash", app->trash, - "search-engines", app->search_engines, - "history", app->history, - NULL); + browser = midori_app_create_browser (app); midori_app_add_browser (app, browser); gtk_window_set_screen (GTK_WINDOW (app->browser), unique_message_data_get_screen (message)); @@ -649,7 +631,7 @@ midori_app_instance_send_uris (MidoriApp* app, * @app: a #MidoriApp * @browser: a #MidoriBrowser * - * Adds a #MidoriBrowser to the #MidoriApp singleton. + * Adds a #MidoriBrowser to the #MidoriApp. * * The app will take care of the browser's new-window and quit signals, as well * as watch window closing so that the last closed window quits the app. @@ -667,6 +649,31 @@ midori_app_add_browser (MidoriApp* app, g_signal_emit (app, signals[ADD_BROWSER], 0, browser); } +/** + * midori_app_create_browser: + * @app: a #MidoriApp + * + * Creates a #MidoriBrowser which inherits its settings, + * bookmarks, trash, search engines and history from @app. + * + * Return value: a new #MidoriBrowser + * + * Since: 1.0.2 + **/ +MidoriBrowser* +midori_app_create_browser (MidoriApp* app) +{ + g_return_val_if_fail (MIDORI_IS_APP (app), NULL); + + return g_object_new (MIDORI_TYPE_BROWSER, + "settings", app->settings, + "bookmarks", app->bookmarks, + "trash", app->trash, + "search-engines", app->search_engines, + "history", app->history, + NULL); +} + /** * midori_app_quit: * @app: a #MidoriApp diff --git a/midori/midori-app.h b/midori/midori-app.h index c42e1cd3..a2f197e9 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -58,6 +58,9 @@ void midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser); +MidoriBrowser* +midori_app_create_browser (MidoriApp* app); + void midori_app_quit (MidoriApp* app); From 0b066778a5ebab136a793f47075238e26c304d76 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 25 Dec 2008 00:41:11 +0100 Subject: [PATCH 0600/2970] Refactor main.c and move _eval_script to sokoke The diagnostic dialog actually performs better now because we do the extension loading and session setup in idle callbacks, aside from the code being more easily readable in smaller units. --- midori/main.c | 392 +++++++++++++++++++++++++++--------------------- midori/sokoke.c | 38 +++++ midori/sokoke.h | 7 + 3 files changed, 270 insertions(+), 167 deletions(-) diff --git a/midori/main.c b/midori/main.c index 19c07047..3a01d7a7 100644 --- a/midori/main.c +++ b/midori/main.c @@ -27,12 +27,12 @@ #include "midori-websettings.h" #include "sokoke.h" -#include "gjs.h" #include #include #include #include +#include #ifdef HAVE_LIBXML #include @@ -1638,6 +1638,211 @@ button_reset_session_clicked_cb (GtkWidget* button, gtk_widget_set_sensitive (button, FALSE); } +static GtkWidget* +midori_create_diagnostic_dialog (MidoriWebSettings* settings, + KatzeArray* _session) +{ + GtkWidget* dialog; + GdkScreen* screen; + GtkIconTheme* icon_theme; + GtkWidget* box; + GtkWidget* button; + + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, + _("Midori seems to have crashed after it was opened " + "for the last time. If this happend repeatedly, " + "try one of the following options to solve the problem.")); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); + screen = gtk_widget_get_screen (dialog); + if (screen) + { + icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, "midori")) + gtk_window_set_icon_name (GTK_WINDOW (dialog), "midori"); + else + gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + } + box = gtk_hbox_new (FALSE, 0); + button = gtk_button_new_with_mnemonic (_("Modify _preferences")); + g_signal_connect (button, "clicked", + G_CALLBACK (button_modify_preferences_clicked_cb), settings); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + button = gtk_button_new_with_mnemonic (_("Reset the last _session")); + g_signal_connect (button, "clicked", + G_CALLBACK (button_reset_session_clicked_cb), _session); + gtk_widget_set_sensitive (button, !katze_array_is_empty (_session)); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + button = gtk_button_new_with_mnemonic (_("Disable all _extensions")); + gtk_widget_set_sensitive (button, FALSE); + /* FIXME: Disable all extensions */ + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); + gtk_widget_show_all (box); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); + return dialog; +} + +static gboolean +midori_load_extensions (gpointer data) +{ + MidoriApp* app = MIDORI_APP (data); + KatzeArray* extensions; + gchar* extension_path; + GDir* extension_dir; + const gchar* filename; + MidoriExtension* extension; + guint n, i; + + /* Load extensions */ + extensions = katze_array_new (MIDORI_TYPE_EXTENSION); + extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); + if (g_module_supported ()) + extension_dir = g_dir_open (extension_path, 0, NULL); + else + extension_dir = NULL; + if (extension_dir) + { + while ((filename = g_dir_read_name (extension_dir))) + { + gchar* fullname; + GModule* module; + typedef MidoriExtension* (*extension_init_func)(void); + extension_init_func extension_init; + + fullname = g_build_filename (extension_path, filename, NULL); + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); + g_free (fullname); + + if (module && g_module_symbol (module, "extension_init", + (gpointer) &extension_init)) + extension = extension_init (); + else + extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", filename, + "description", g_module_error (), + NULL); + g_warning ("%s", g_module_error ()); + katze_array_add_item (extensions, extension); + g_object_unref (extension); + } + g_dir_close (extension_dir); + } + + g_object_set (app, "extensions", extensions, NULL); + + n = katze_array_get_length (extensions); + for (i = 0; i < n; i++) + { + extension = katze_array_get_nth_item (extensions, i); + g_signal_emit_by_name (extension, "activate", app); + } + + return FALSE; +} + +static gboolean +midori_load_session (gpointer data) +{ + KatzeArray* _session = KATZE_ARRAY (data); + MidoriBrowser* browser; + MidoriApp* app = katze_item_get_parent (KATZE_ITEM (_session)); + KatzeArray* session; + KatzeItem* item; + guint n, i; + + browser = midori_app_create_browser (app); + midori_app_add_browser (app, browser); + gtk_widget_show (GTK_WIDGET (browser)); + + if (katze_array_is_empty (_session)) + { + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); + MidoriStartup load_on_startup; + gchar* homepage; + item = katze_item_new (); + + g_object_get (settings, "load-on-startup", &load_on_startup, NULL); + if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) + katze_item_set_uri (item, ""); + else + { + g_object_get (settings, "homepage", &homepage, NULL); + katze_item_set_uri (item, homepage); + g_free (homepage); + } + katze_array_add_item (_session, item); + } + + session = midori_browser_get_proxy_array (browser); + n = katze_array_get_length (_session); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (_session, i); + midori_browser_add_item (browser, item); + } + /* FIXME: Switch to the last active page */ + item = katze_array_get_nth_item (_session, 0); + if (!strcmp (katze_item_get_uri (item), "")) + midori_browser_activate_action (browser, "Location"); + g_object_unref (_session); + + g_signal_connect_after (browser, "notify::uri", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "add-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "remove-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_object_weak_ref (G_OBJECT (session), + (GWeakNotify)(midori_browser_weak_notify_cb), browser); + + return FALSE; +} + +static gint +midori_run_script (const gchar* filename) +{ + if (!(filename)) + { + g_print ("%s - %s\n", _("Midori"), _("No filename specified")); + return 1; + } + + JSGlobalContextRef js_context; + gchar* exception; + gchar* script; + GError* error = NULL; + + #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 3) + js_context = JSGlobalContextCreateInGroup (NULL, NULL); + #else + js_context = JSGlobalContextCreate (NULL); + #endif + #endif + + if (g_file_get_contents (filename, &script, NULL, &error)) + { + if (sokoke_js_script_eval (js_context, script, &exception)) + exception = NULL; + g_free (script); + } + else if (error) + { + exception = g_strdup (error->message); + g_error_free (error); + } + else + exception = g_strdup (_("An unknown error occured.")); + + JSGlobalContextRelease (js_context); + if (!exception) + return 0; + + g_print ("%s - Exception: %s\n", filename, exception); + return 1; +} + int main (int argc, char** argv) @@ -1658,21 +1863,16 @@ main (int argc, N_("URIs"), NULL }, { NULL } }; - JSGlobalContextRef js_context; - gchar* exception; GString* error_messages; MidoriWebSettings* settings; gchar* config_file; MidoriStartup load_on_startup; - gchar* homepage; KatzeArray* search_engines; KatzeArray* bookmarks; KatzeArray* history; KatzeArray* _session; KatzeArray* trash; - MidoriBrowser* browser; - KatzeArray* session; - guint n, i; + guint i; gchar* uri; KatzeItem* item; gchar* uri_ready; @@ -1680,11 +1880,6 @@ main (int argc, sqlite3* db; gint max_history_age; #endif - KatzeArray* extensions; - gchar* extension_path; - GDir* extension_dir; - const gchar* filename; - MidoriExtension* extension; #if ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); @@ -1728,26 +1923,9 @@ main (int argc, return 0; } - /* Standalone gjs support */ + /* Standalone javascript support */ if (run) - { - if (uris && *uris) - { - js_context = gjs_global_context_new (); - exception = NULL; - gjs_script_from_file (js_context, *uris, &exception); - JSGlobalContextRelease (js_context); - if (!exception) - return 0; - g_print ("%s - Exception: %s\n", *uris, exception); - return 1; - } - else - { - g_print ("%s - %s\n", _("Midori"), _("No filename specified")); - return 1; - } - } + return midori_run_script (uris ? *uris : NULL); app = midori_app_new (); /* FIXME: The app might be 'running' but actually showing a dialog @@ -1956,44 +2134,7 @@ main (int argc, katze_assign (config_file, build_config_filename ("running")); if (g_file_test (config_file, G_FILE_TEST_EXISTS)) { - GdkScreen* screen; - GtkIconTheme* icon_theme; - GtkWidget* dialog; - GtkWidget* box; - GtkWidget* button; - - dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, - _("Midori seems to have crashed after it was opened for the last " - "time. If this happend repeatedly, try one of the " - "following options to solve the problem.")); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); - gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); - screen = gtk_widget_get_screen (dialog); - if (screen) - { - icon_theme = gtk_icon_theme_get_for_screen (screen); - if (gtk_icon_theme_has_icon (icon_theme, "midori")) - gtk_window_set_icon_name (GTK_WINDOW (dialog), "midori"); - else - gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); - } - box = gtk_hbox_new (FALSE, 0); - button = gtk_button_new_with_mnemonic (_("Modify _preferences")); - g_signal_connect (button, "clicked", - G_CALLBACK (button_modify_preferences_clicked_cb), settings); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); - button = gtk_button_new_with_mnemonic (_("Reset the last _session")); - g_signal_connect (button, "clicked", - G_CALLBACK (button_reset_session_clicked_cb), _session); - gtk_widget_set_sensitive (button, !katze_array_is_empty (_session)); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); - button = gtk_button_new_with_mnemonic (_("Disable all _extensions")); - gtk_widget_set_sensitive (button, FALSE); - /* FIXME: Disable all extensions */ - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); - gtk_widget_show_all (box); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); + GtkWidget* dialog = midori_create_diagnostic_dialog (settings, _session); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -2001,115 +2142,32 @@ main (int argc, g_file_set_contents (config_file, "RUNNING", -1, NULL); g_signal_connect (app, "quit", G_CALLBACK (midori_app_quit_cb), NULL); - /* Load extensions */ - extensions = katze_array_new (MIDORI_TYPE_EXTENSION); - extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); - if (g_module_supported ()) - extension_dir = g_dir_open (extension_path, 0, NULL); - else - extension_dir = NULL; - if (extension_dir) - { - while ((filename = g_dir_read_name (extension_dir))) - { - gchar* fullname; - GModule* module; - typedef MidoriExtension* (*extension_init_func)(void); - extension_init_func extension_init; - - fullname = g_build_filename (extension_path, filename, NULL); - module = g_module_open (fullname, G_MODULE_BIND_LOCAL); - g_free (fullname); - - if (module && g_module_symbol (module, "extension_init", - (gpointer) &extension_init)) - extension = extension_init (); - else - extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", filename, - "description", g_module_error (), - NULL); - katze_array_add_item (extensions, extension); - g_object_unref (extension); - } - g_dir_close (extension_dir); - } - g_object_set (app, "settings", settings, "bookmarks", bookmarks, "trash", trash, "search-engines", search_engines, "history", history, - "extensions", extensions, NULL); - g_signal_connect (app, "add-browser", - G_CALLBACK (midori_app_add_browser_cb), NULL); - - n = katze_array_get_length (extensions); - for (i = 0; i < n; i++) - { - extension = katze_array_get_nth_item (extensions, i); - g_signal_emit_by_name (extension, "activate", app); - } - - browser = g_object_new (MIDORI_TYPE_BROWSER, - "settings", settings, - "bookmarks", bookmarks, - "trash", trash, - "search-engines", search_engines, - "history", history, - NULL); - midori_app_add_browser (app, browser); - gtk_widget_show (GTK_WIDGET (browser)); - - if (katze_array_is_empty (_session)) - { - item = katze_item_new (); - if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) - katze_item_set_uri (item, ""); - else - { - g_object_get (settings, "homepage", &homepage, NULL); - katze_item_set_uri (item, homepage); - g_free (homepage); - } - katze_array_add_item (_session, item); - } - - session = midori_browser_get_proxy_array (browser); - n = katze_array_get_length (_session); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (_session, i); - midori_browser_add_item (browser, item); - } - /* FIXME: Switch to the last active page */ - item = katze_array_get_nth_item (_session, 0); - if (!strcmp (katze_item_get_uri (item), "")) - midori_browser_activate_action (browser, "Location"); - g_object_unref (_session); - - g_signal_connect_after (browser, "notify::uri", - G_CALLBACK (midori_browser_session_cb), session); - g_signal_connect_after (browser, "add-tab", - G_CALLBACK (midori_browser_session_cb), session); - g_signal_connect_after (browser, "remove-tab", - G_CALLBACK (midori_browser_session_cb), session); - g_object_weak_ref (G_OBJECT (session), - (GWeakNotify)(midori_browser_weak_notify_cb), browser); - - gtk_main (); - - /* Save configuration files */ g_object_unref (history); - #ifdef HAVE_SQLITE - g_object_get (settings, "maximum-history-age", &max_history_age, NULL); - midori_history_terminate (db, max_history_age); - #endif g_object_unref (search_engines); g_object_unref (bookmarks); g_object_unref (trash); g_object_unref (settings); + g_signal_connect (app, "add-browser", + G_CALLBACK (midori_app_add_browser_cb), NULL); + + g_idle_add (midori_load_extensions, app); + katze_item_set_parent (KATZE_ITEM (_session), app); + g_idle_add (midori_load_session, _session); + + gtk_main (); + + #ifdef HAVE_SQLITE + settings = katze_object_get_object (app, "settings"); + g_object_get (settings, "maximum-history-age", &max_history_age, NULL); + midori_history_terminate (db, max_history_age); + #endif + g_object_unref (app); g_free (config_file); return 0; } diff --git a/midori/sokoke.c b/midori/sokoke.c index e425b9d2..2071f734 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -24,6 +24,44 @@ #include #include +static gchar* +sokoke_js_string_utf8 (JSStringRef js_string) +{ + size_t size_utf8; + gchar* string_utf8; + + g_return_val_if_fail (js_string, NULL); + + size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); + string_utf8 = g_new (gchar, size_utf8); + JSStringGetUTF8CString (js_string, string_utf8, size_utf8); + return string_utf8; +} + +JSValueRef +sokoke_js_script_eval (JSContextRef js_context, + const gchar* script, + gchar** exception) +{ + g_return_val_if_fail (js_context, FALSE); + g_return_val_if_fail (script, FALSE); + + JSStringRef js_script = JSStringCreateWithUTF8CString (script); + JSValueRef js_exception = NULL; + JSValueRef js_value = JSEvaluateScript (js_context, js_script, + JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); + if (!js_value && exception) + { + JSStringRef js_message = JSValueToStringCopy (js_context, + js_exception, NULL); + *exception = sokoke_js_string_utf8 (js_message); + JSStringRelease (js_message); + js_value = JSValueMakeNull (js_context); + } + JSStringRelease (js_script); + return js_value; +} + static void error_dialog (const gchar* short_message, const gchar* detailed_message) diff --git a/midori/sokoke.h b/midori/sokoke.h index 6e769ed9..d9230594 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -16,6 +16,13 @@ #include +#include + +JSValueRef +sokoke_js_script_eval (JSContextRef js_context, + const gchar* script, + gchar** exception); + /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON From c59e040055451947a804de4ea30fa144efaa909b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 25 Dec 2008 00:43:57 +0100 Subject: [PATCH 0601/2970] Switch MidoriAddons to sokoke_js_script_eval --- panels/midori-addons.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/panels/midori-addons.c b/panels/midori-addons.c index a8dc3155..8cc55172 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -18,7 +18,6 @@ #include "midori-stock.h" #include "sokoke.h" -#include "gjs.h" #include #include @@ -790,7 +789,7 @@ _js_script_from_file (JSContextRef js_context, wrapped_script = g_strdup_printf ( "window.addEventListener ('DOMContentLoaded'," "function () { %s }, true);", script); - if (gjs_script_eval (js_context, wrapped_script, exception)) + if (sokoke_js_script_eval (js_context, wrapped_script, exception)) result = TRUE; g_free (wrapped_script); g_free (script); @@ -839,7 +838,7 @@ _js_style_from_file (JSContextRef js_context, "else document.documentElement.insertBefore(mystyle, document.documentElement.firstChild);" "}, true);", style); - if (gjs_script_eval (js_context, style_script, exception)) + if (sokoke_js_script_eval (js_context, style_script, exception)) result = TRUE; g_free (style_script); g_free (style); @@ -892,7 +891,7 @@ midori_web_widget_context_ready_cb (GtkWidget* web_widget, !_js_script_from_file (js_context, fullname, &exception)) { message = g_strdup_printf ("console.error ('%s');", exception); - gjs_script_eval (js_context, message, NULL); + sokoke_js_script_eval (js_context, message, NULL); g_free (message); g_free (exception); } @@ -900,7 +899,7 @@ midori_web_widget_context_ready_cb (GtkWidget* web_widget, !_js_style_from_file (js_context, fullname, &exception)) { message = g_strdup_printf ("console.error ('%s');", exception); - gjs_script_eval (js_context, message, NULL); + sokoke_js_script_eval (js_context, message, NULL); g_free (message); g_free (exception); } From 428f396b1839fe0ec505f7ff7085c92916f18fe5 Mon Sep 17 00:00:00 2001 From: Elias Julkunen Date: Sat, 27 Dec 2008 20:53:12 +0100 Subject: [PATCH 0602/2970] Update Finnish translation --- po/fi.po | 231 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 124 insertions(+), 107 deletions(-) diff --git a/po/fi.po b/po/fi.po index 95db7c43..ea932e92 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-10-30 21:20+0200\n" +"PO-Revision-Date: 2008-12-20 20:16+0200\n" "Last-Translator: Elias Julkunen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -19,8 +19,11 @@ msgstr "" msgid "Lightweight web browser" msgstr "Kevyt verkkoselain" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1338 +#: ../midori/main.c:1347 +#: ../midori/main.c:1370 +#: ../midori/main.c:1394 msgid "Midori" msgstr "Midori" @@ -32,7 +35,8 @@ msgstr "Verkkoselain" msgid "_Bookmark" msgstr "_Kirjanmerkki" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:87 +#: ../midori/midori-browser.c:3744 msgid "_Bookmarks" msgstr "_Kirjanmerkit" @@ -81,60 +85,66 @@ msgid "New _Window" msgstr "Uusi _ikkuna" #: ../midori/main.c:143 -#, fuzzy, c-format +#, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Asetuksia ei voitu ladata. %s\n" +msgstr "Asetuksia ei voitu ladata: %s\n" #: ../midori/main.c:198 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Arvo ”%s” ei kelpaa kohteelle %s" -#: ../midori/main.c:205 ../midori/main.c:275 -#, fuzzy, c-format +#: ../midori/main.c:205 +#: ../midori/main.c:275 +#, c-format msgid "Invalid configuration value '%s'" -msgstr "Käsittelemätön asetusarvo ”%s”" +msgstr "Epäkelpo asetusarvo ”%s”" #: ../midori/main.c:532 msgid "File not found." msgstr "Tiedostoa ei löytynyt" -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:540 +#: ../midori/main.c:549 msgid "Malformed document." msgstr "Virheellinen dokumentti." -#: ../midori/main.c:571 ../midori/main.c:603 -#, fuzzy, c-format +#: ../midori/main.c:571 +#: ../midori/main.c:603 +#, c-format msgid "Failed to open database: %s\n" -msgstr "Virhe avattaessa tietokantaa: %s\n" +msgstr "Tietokantaa ei voitu avata: %s\n" #: ../midori/main.c:657 -#, fuzzy, c-format +#, c-format msgid "Failed to remove history item: %s\n" -msgstr "Historiatietuetta ei voitu poistaa. %s\n" +msgstr "Historiatietuetta ei voitu poistaa: %s\n" #: ../midori/main.c:681 -#, fuzzy, c-format +#, c-format msgid "Failed to clear history: %s\n" -msgstr "Historiaa ei voitu tyhjentää. %s\n" +msgstr "Historiaa ei voitu tyhjentää: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 -#, fuzzy, c-format +#: ../midori/main.c:714 +#: ../midori/main.c:728 +#, c-format msgid "Failed to add history item: %s\n" -msgstr "Historiatietuetta ei voitu lisätä. %s\n" +msgstr "Historiatietuetta ei voitu lisätä: %s\n" #. i18n: Couldn't remove items that are older than n days #: ../midori/main.c:844 -#, fuzzy, c-format +#, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Vanhoja historiatietueita ei voitfu poistaa. %s\n" +msgstr "Vanhoja historiatietueita ei voitfu poistaa: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 +#: ../midori/main.c:976 +#: ../midori/sokoke.c:459 #, c-format msgid "Writing failed." msgstr "Kirjoitus epäonnistui." -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1000 +#: ../midori/midori-preferences.c:350 msgid "Transfers" msgstr "Siirrot" @@ -161,9 +171,7 @@ msgstr "[URI-osoitteet]" #: ../midori/main.c:1371 msgid "Please report comments, suggestions and bugs to:" -msgstr "" -"Voit lähettää kommentteja, ehdotuksia ja tietoa ohjelmavirheistä " -"osoitteeseen:" +msgstr "Voit lähettää kommentteja, ehdotuksia ja tietoa ohjelmavirheistä osoitteeseen:" #: ../midori/main.c:1373 msgid "Check for new versions at:" @@ -179,24 +187,24 @@ msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori on jo käynnissä, muttei vastaa.\n" #: ../midori/main.c:1447 -#, fuzzy, c-format +#, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Kirjanmerkkejä ei voitu ladata. %s\n" +msgstr "Kirjanmerkkejä ei voitu ladata: %s\n" #: ../midori/main.c:1463 -#, fuzzy, c-format +#, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "Istuntoa ei voitu ladata. %s\n" +msgstr "Istuntoa ei voitu ladata: %s\n" #: ../midori/main.c:1477 -#, fuzzy, c-format +#, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Roskakoria ei voitu ladata. %s\n" +msgstr "Roskakoria ei voitu ladata: %s\n" #: ../midori/main.c:1491 -#, fuzzy, c-format +#, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Historiaa ei voitu ladata. %s\n" +msgstr "Historiaa ei voitu ladata: %s\n" #: ../midori/main.c:1504 msgid "The following errors occured:" @@ -204,7 +212,7 @@ msgstr "Seuraavat virheet tapahtuivat:" #: ../midori/main.c:1520 msgid "_Ignore" -msgstr "" +msgstr "_Ohita" #: ../midori/main.c:1688 #, c-format @@ -226,12 +234,14 @@ msgstr "Roskakoria ei voitu tallentaa. %s" msgid "The configuration couldn't be saved. %s" msgstr "Asetuksia ei voitu tallentaa. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:249 +#: ../midori/midori-browser.c:3130 #: ../midori/midori-browser.c:3136 msgid "Reload the current page" msgstr "Lataa nykyinen sivu uudelleen" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:261 +#: ../midori/midori-browser.c:3133 msgid "Stop loading the current page" msgstr "Keskeytä nykyisen sivun lataaminen" @@ -257,11 +267,13 @@ msgstr "Muokkaa kirjanmerkkiä" msgid "_Title:" msgstr "_Nimi:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:543 +#: ../midori/midori-searchaction.c:841 msgid "_Description:" msgstr "_Kuvaus:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:562 +#: ../midori/midori-searchaction.c:855 msgid "_URL:" msgstr "_URL-osoite:" @@ -274,12 +286,10 @@ msgid "Root" msgstr "Juuri" #: ../midori/midori-browser.c:668 -#, fuzzy msgid "Save file as" -msgstr "Tallenna tiedostoon" +msgstr "Tallenna tiedosto nimellä" #: ../midori/midori-browser.c:1248 -#, fuzzy msgid "Open file" msgstr "Avaa tiedosto" @@ -298,7 +308,7 @@ msgstr "Erotin" #: ../midori/midori-browser.c:2712 #, c-format msgid "A week ago" -msgstr "" +msgstr "Viikko sitten" #: ../midori/midori-browser.c:2718 #, c-format @@ -319,7 +329,7 @@ msgstr "Kevyt verkkoselain" #: ../midori/midori-browser.c:2824 msgid "translator-credits" -msgstr "Elias Julkunen, " +msgstr "Elias Julkunen " #: ../midori/midori-browser.c:2958 msgid "Are you sure you want to remove all history items?" @@ -377,7 +387,8 @@ msgstr "_Muokkaa" msgid "Cut the selected text" msgstr "Leikkaa valittu teksti" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3099 msgid "Copy the selected text" msgstr "Kopioi valittu teksti" @@ -445,7 +456,8 @@ msgstr "Pienennä" msgid "Reset the zoom level" msgstr "Palauta suurennustaso" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3147 +#: ../midori/midori-view.c:998 msgid "View _Source" msgstr "Näytä _lähdekoodi" @@ -489,7 +501,8 @@ msgstr "Tyhjennä roskakori" msgid "Delete the contents of the trash" msgstr "Poista roskakorin sisältö" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3171 +#: ../midori/midori-view.c:970 msgid "Undo Close Tab" msgstr "Kumoa välilehden sulkeminen" @@ -514,20 +527,19 @@ msgid "Delete the selected history item" msgstr "Poista valittu historiatietue" #: ../midori/midori-browser.c:3188 -#, fuzzy msgid "Clear the entire history" msgstr "Tyhjennä koko historia" #: ../midori/midori-browser.c:3191 -#, fuzzy msgid "Bookmark the selected history item" -msgstr "Avaa valittu historiatietue" +msgstr "Lisää valittu histoariatietue kirjanmerkkeihin" #: ../midori/midori-browser.c:3193 msgid "_Tools" msgstr "_Työkalut" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3195 +#: ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Hallitse hakukoneita" @@ -664,19 +676,16 @@ msgid "_Recently visited pages" msgstr "_Usein vieraillut sivut" #: ../midori/midori-browser.c:3731 -#, fuzzy msgid "Reopen pages that you visited earlier" -msgstr "Vieraile uudelleen sivuilla, jotka avasit aiemmin" +msgstr "Avaa uudelleen sivut, joilla vierailit aikaisemmin" #: ../midori/midori-browser.c:3746 -#, fuzzy msgid "Show the saved bookmarks" -msgstr "Avaa valittu kirjanmerkki" +msgstr "Näytä tallennetut kirjanmerkit" #: ../midori/midori-browser.c:3759 -#, fuzzy msgid "_Window" -msgstr "Ikkuna" +msgstr "_Ikkuna" #: ../midori/midori-browser.c:3761 msgid "Show a list of all open tabs" @@ -686,7 +695,8 @@ msgstr "Näytä luettelo kaikista avoimista välilehdistä" msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3926 +#: ../midori/midori-preferences.c:517 msgid "History" msgstr "Historia" @@ -712,15 +722,18 @@ msgstr "Sulje hakupalkki" msgid "Unexpected setting '%s'" msgstr "Odottamaton asetus ”%s”" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:223 +#: ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Sulje paneeli" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:131 +#: ../midori/midori-view.c:1635 msgid "Blank page" msgstr "Tyhjä sivu" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:387 msgid "Homepage" msgstr "Kotisivu" @@ -792,7 +805,8 @@ msgstr "Kaikki evästeet" msgid "Session cookies" msgstr "Istunnon evästeet" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:206 +#: ../panels/midori-addons.c:97 msgid "None" msgstr "Ei mitään" @@ -1015,8 +1029,7 @@ msgstr "Avaa välilehdet nykyisestä seuraavaksi" #: ../midori/midori-websettings.c:502 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi" +msgstr "Avataanko uudet välilehdet nykyistä välilehteä seuraavaksi vai viimeiseksi" #: ../midori/midori-websettings.c:510 msgid "Open popups in tabs" @@ -1102,7 +1115,7 @@ msgstr "Välimuistin enimmäiskoko" #: ../midori/midori-view.c:632 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Ei löydy - %s" #: ../midori/midori-view.c:902 msgid "Open Link in New _Tab" @@ -1110,11 +1123,11 @@ msgstr "Avaa linkki uudessa _välilehdessä" #: ../midori/midori-view.c:925 msgid "_Save Link destination" -msgstr "" +msgstr "_Tallenna linkin kohde" #: ../midori/midori-view.c:933 msgid "_Download Link destination" -msgstr "" +msgstr "_Lataa linkin kohde" #: ../midori/midori-view.c:955 msgid "Open URL in New _Tab" @@ -1123,16 +1136,16 @@ msgstr "Avaa URL-osoite uudessa _välilehdessä" #: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Tutkii sivua - %s" #: ../midori/midori-view.c:1503 msgid "Source" msgstr "Lähdekoodi" #: ../midori/midori-view.c:1527 -#, fuzzy, c-format +#, c-format msgid "No documentation installed" -msgstr "Näyttä dokumentaatio" +msgstr "Dokumentaatiota ei ole asennettu" #: ../midori/midori-preferences.c:87 #, c-format @@ -1174,7 +1187,8 @@ msgstr "Käyttäytyminen" msgid "Features" msgstr "Ominaisuudet" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:411 +#: ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Lataa kuvat automaattisesti" @@ -1183,26 +1197,26 @@ msgid "Shrink images automatically" msgstr "Pienennä kuvat automaattisesti" #: ../midori/midori-preferences.c:417 -#, fuzzy msgid "Print background images" msgstr "Näytä taustakuvat" #: ../midori/midori-preferences.c:420 msgid "Resizable text areas" -msgstr "" +msgstr "Tekstialueiden kokoa voidaan muuttaa" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:423 +#: ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Salli skriptit" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 -#, fuzzy +#: ../midori/midori-preferences.c:426 +#: ../extensions/statusbar-features.c:46 msgid "Enable plugins" -msgstr "Salli skriptit" +msgstr "Salli liitännäiset" #: ../midori/midori-preferences.c:429 msgid "Enable developer tools" -msgstr "" +msgstr "Ota kehittäjän työkalut käyttöön" #. Page "Interface" #: ../midori/midori-preferences.c:437 @@ -1217,14 +1231,14 @@ msgstr "Navigointipalkki" msgid "Browsing" msgstr "Selaaminen" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 -#, fuzzy +#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:481 msgid "Network" -msgstr "Uusi kirjanmerkki" +msgstr "Verkko" #: ../midori/midori-preferences.c:492 msgid "MB" -msgstr "" +msgstr "MB" #. Page "Privacy" #: ../midori/midori-preferences.c:498 @@ -1232,15 +1246,16 @@ msgid "Privacy" msgstr "Yksityisyys" #: ../midori/midori-preferences.c:500 -#, fuzzy msgid "Web Cookies" -msgstr "Salli evästeet" +msgstr "Verkkoevästeet" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:524 msgid "days" msgstr "päivää" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:456 +#: ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Tyhjä" @@ -1268,7 +1283,8 @@ msgstr "_Merkki:" msgid "Manage search engines" msgstr "Hallitse hakukoneita" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 msgid "Could not run external program." msgstr "Ulkoista ohjelmaa ei voitu suorittaa" @@ -1280,7 +1296,8 @@ msgstr "Varoitus: Käytät pääkäyttäjän tiliä!" msgid "An unknown error occured." msgstr "Tapahtui tuntematon virhe." -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "Asialla %s ei ole ominaisuutta ”%s”" @@ -1295,19 +1312,23 @@ msgstr "" msgid "%s.%s cannot be accessed" msgstr "" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:144 msgid "Userscripts" msgstr "Käyttäjän skriptit" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:99 +#: ../panels/midori-addons.c:146 msgid "Userstyles" msgstr "Käyttäjän tyylit" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1006 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Ota käyttöön" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1015 +#: ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Poista käytöstä" @@ -1333,12 +1354,14 @@ msgstr "Vakiokuvaketta ”%s” ei voitu ladata" msgid "Animation frames are broken" msgstr "Animaatiokehykset ovat rikki" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:154 +#: ../katze/katze-utils.c:352 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Ominaisuus ”%s” on epäkelpo kohteelle %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:178 +#: ../katze/katze-utils.c:217 msgid "Choose file" msgstr "Valitse tiedosto" @@ -1347,7 +1370,8 @@ msgid "Choose folder" msgstr "Valitse kansio" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:109 +#: ../extensions/page-holder.c:144 msgid "Pageholder" msgstr "Sivupidike" @@ -1357,37 +1381,30 @@ msgstr "_Sivupidike" #: ../extensions/statusbar-features.c:30 msgid "Images" -msgstr "" +msgstr "Kuvat" #: ../extensions/statusbar-features.c:37 -#, fuzzy msgid "Scripts" -msgstr "Käyttäjän skriptit" +msgstr "Skriptit" #: ../extensions/statusbar-features.c:44 msgid "Plugins" -msgstr "" +msgstr "Liitännäiset" #~ msgid "Open in Page_holder..." #~ msgstr "Avaa _sivun pitäjässä" - #~ msgid "Open the current page in the pageholder" #~ msgstr "Avaa nykyinen sivu sivun pitäjässä" - #~ msgid "Open the selected bookmark in a new tab" #~ msgstr "Avaa valittu kirjanmerkki uudessa välilehdessä" - #~ msgid "Open the selected bookmark in a new window" #~ msgstr "Avaa valittu kirjanmerkki uudessa ikkunassa" - #~ msgid "Open the selected history item in a new tab" #~ msgstr "Avaa valittu historiatietue uudessa välilehdessä" - #~ msgid "Last pageholder URI" #~ msgstr "Viimeisin sivupidike URL-osoite" - #~ msgid "The URI last opened in the pageholder" #~ msgstr "Viimeisin avoinna ollut URL-osoite sivupipidike" - #~ msgid "Download Link with Download _Manager" #~ msgstr "Lataa linkin kohde _latauksien hallinnalla" + From e30b30d37d9c8d937584719cf9a0935ac4e8d9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sat, 27 Dec 2008 21:14:13 +0100 Subject: [PATCH 0603/2970] Add Portuguese translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/pt_PT.po | 1393 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1395 insertions(+), 1 deletion(-) create mode 100644 po/pt_PT.po diff --git a/AUTHORS b/AUTHORS index 6b628c25..a7fb53b7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,6 +38,7 @@ Translations: nl: Vincent Tunru pl: Przemysław Sitek pl: Lukasz Romanowicz + pt_PT: Sérgio Marques ru: Troitskiy Nikita sv: Mikael Magnusson tr: Mirat Can Bayrak diff --git a/po/LINGUAS b/po/LINGUAS index b0a83b7f..1dbaa96e 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de el en_GB es et fi fr gl hu id nl pl ru sv tr uk +de el en_GB es et fi fr gl hu id nl pl pt_PT ru sv tr uk diff --git a/po/pt_PT.po b/po/pt_PT.po new file mode 100644 index 00000000..84cddab9 --- /dev/null +++ b/po/pt_PT.po @@ -0,0 +1,1393 @@ +# Portuguese translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Sérgio Marques 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.1.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-06 05:25+0100\n" +"PO-Revision-Date: \n" +"Last-Translator: Sérgio Marques \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Navegador Web leve" + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1338 +#: ../midori/main.c:1347 +#: ../midori/main.c:1370 +#: ../midori/main.c:1394 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Navegador Web" + +#: ../midori/main.c:86 +msgid "_Bookmark" +msgstr "_Marcador" + +#: ../midori/main.c:87 +#: ../midori/midori-browser.c:3744 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/main.c:88 +msgid "_Add Bookmark" +msgstr "_Adicionar Marcador" + +#: ../midori/main.c:89 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/main.c:90 +msgid "_Extensions" +msgstr "_Extensões" + +#: ../midori/main.c:91 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/main.c:92 +msgid "_Homepage" +msgstr "_Página Inicial" + +#: ../midori/main.c:93 +msgid "_Userscripts" +msgstr "Scripts de _Utilizador" + +#: ../midori/main.c:94 +msgid "User_styles" +msgstr "E_stilos de Utilizador" + +#: ../midori/main.c:95 +msgid "New _Tab" +msgstr "Nova _Separador" + +#: ../midori/main.c:96 +msgid "_Transfers" +msgstr "_Transferências" + +#: ../midori/main.c:97 +msgid "_Closed Tabs and Windows" +msgstr "Separadores e Janelas Fe_chadas" + +#: ../midori/main.c:98 +msgid "New _Window" +msgstr "Nova _Janela" + +#: ../midori/main.c:143 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Não foi possível carregar a configuração: %s\n" + +#: ../midori/main.c:198 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "O valor '%s' é inválido para %s" + +#: ../midori/main.c:205 +#: ../midori/main.c:275 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Valor de configuração inválido '%s'" + +#: ../midori/main.c:532 +msgid "File not found." +msgstr "Ficheiro não encontrado." + +#: ../midori/main.c:540 +#: ../midori/main.c:549 +msgid "Malformed document." +msgstr "Documento mal formado" + +#: ../midori/main.c:571 +#: ../midori/main.c:603 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Falha ao abrir base de dados: %s\n" + +#: ../midori/main.c:657 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falha ao remover histórico: %s\n" + +#: ../midori/main.c:681 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Falha ao limpar histórico: %s\n" + +#: ../midori/main.c:714 +#: ../midori/main.c:728 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Falha ao adicionar histórico: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:844 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Falha ao remover histórico antigo: %s\n" + +#: ../midori/main.c:976 +#: ../midori/sokoke.c:459 +#, c-format +msgid "Writing failed." +msgstr "Falhou escrita." + +#: ../midori/main.c:1000 +#: ../midori/midori-preferences.c:350 +msgid "Transfers" +msgstr "Transferências" + +#: ../midori/main.c:1040 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Não foi possível gravar a sessão. %s" + +#: ../midori/main.c:1297 +msgid "Run the specified filename as javascript" +msgstr "Executar o ficheiro especificado como javascript" + +#: ../midori/main.c:1299 +msgid "Display program version" +msgstr "Apresentar versão do programa" + +#: ../midori/main.c:1301 +msgid "URIs" +msgstr "URIs" + +#: ../midori/main.c:1335 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1371 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor, relate comentários, sugestões e erros para:" + +#: ../midori/main.c:1373 +msgid "Check for new versions at:" +msgstr "Verificar por novas versões a:" + +#: ../midori/main.c:1394 +msgid "No filename specified" +msgstr "Nenhum nome especificado" + +#: ../midori/main.c:1411 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Já existe uma instância de Midori em execução mas que não está respondendo.\n" + +#: ../midori/main.c:1447 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Os marcadores não foram carregados: %s\n" + +#: ../midori/main.c:1463 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "A sessão não foi carregada: %s\n" + +#: ../midori/main.c:1477 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "O lixo não foi carregado: %s\n" + +#: ../midori/main.c:1491 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "O histórico não foi carregado: %s\n" + +#: ../midori/main.c:1504 +msgid "The following errors occured:" +msgstr "Ocorreram os seguintes erros:" + +#: ../midori/main.c:1520 +msgid "_Ignore" +msgstr "_Ignorar " + +#: ../midori/main.c:1688 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Os motores de busca não foram gravados. %s" + +#: ../midori/main.c:1698 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Os marcadores não foram gravados. %s" + +#: ../midori/main.c:1707 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "O lixo não foi gravado. %s" + +#: ../midori/main.c:1715 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A configuração não foi gravada. %s" + +#: ../midori/midori-browser.c:249 +#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3136 +msgid "Reload the current page" +msgstr "Recarregar página actual" + +#: ../midori/midori-browser.c:261 +#: ../midori/midori-browser.c:3133 +msgid "Stop loading the current page" +msgstr "Parar o carregamento da página actual" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% carregado" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acção inesperada '%s'." + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Novo marcador" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Editar marcador" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:543 +#: ../midori/midori-searchaction.c:841 +msgid "_Description:" +msgstr "_Descrição:" + +#: ../midori/midori-browser.c:562 +#: ../midori/midori-searchaction.c:855 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Pasta:" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Administrador" + +#: ../midori/midori-browser.c:668 +msgid "Save file as" +msgstr "Gravar como" + +#: ../midori/midori-browser.c:1248 +msgid "Open file" +msgstr "Abrir ficheiro" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Abrir em Novo _Separador" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Abrir em Nova _Janela" + +#: ../midori/midori-browser.c:2601 +msgid "Separator" +msgstr "Separador" + +#: ../midori/midori-browser.c:2712 +#, c-format +msgid "A week ago" +msgstr "Uma semana atrás" + +#: ../midori/midori-browser.c:2718 +#, c-format +msgid "%d days ago" +msgstr "%d dias atrás" + +#: ../midori/midori-browser.c:2725 +msgid "Today" +msgstr "Hoje" + +#: ../midori/midori-browser.c:2727 +msgid "Yesterday" +msgstr "Ontem" + +#: ../midori/midori-browser.c:2816 +msgid "A lightweight web browser." +msgstr "Navegador Web leve." + +#: ../midori/midori-browser.c:2824 +msgid "translator-credits" +msgstr "Sérgio Marques " + +#: ../midori/midori-browser.c:2958 +msgid "Are you sure you want to remove all history items?" +msgstr "Tem a certeza que quer remover todo o histórico?" + +#: ../midori/midori-browser.c:3064 +msgid "_File" +msgstr "_Ficheiro" + +#: ../midori/midori-browser.c:3067 +msgid "Open a new window" +msgstr "Abrir uma nova janela" + +#: ../midori/midori-browser.c:3070 +msgid "Open a new tab" +msgstr "Abrir novo separador" + +#: ../midori/midori-browser.c:3073 +msgid "Open a file" +msgstr "Abrir ficheiro" + +#: ../midori/midori-browser.c:3076 +msgid "Save to a file" +msgstr "Gravar para ficheiro" + +#: ../midori/midori-browser.c:3078 +msgid "_Close Tab" +msgstr "_Fechar Separador" + +#: ../midori/midori-browser.c:3079 +msgid "Close the current tab" +msgstr "Fechar separador actual" + +#: ../midori/midori-browser.c:3081 +msgid "C_lose Window" +msgstr "Fechar Jane_la" + +#: ../midori/midori-browser.c:3082 +msgid "Close this window" +msgstr "Fechar esta janela" + +#: ../midori/midori-browser.c:3085 +msgid "Print the current page" +msgstr "Imprimir página actual" + +#: ../midori/midori-browser.c:3088 +msgid "Quit the application" +msgstr "Sair da aplicação" + +#: ../midori/midori-browser.c:3090 +msgid "_Edit" +msgstr "_Editar" + +#: ../midori/midori-browser.c:3093 +msgid "Cut the selected text" +msgstr "Cortar o texto seleccionado" + +#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3099 +msgid "Copy the selected text" +msgstr "Copiar o texto seleccionado" + +#: ../midori/midori-browser.c:3102 +msgid "Paste text from the clipboard" +msgstr "Colar itens da área de transferência" + +#: ../midori/midori-browser.c:3105 +msgid "Delete the selected text" +msgstr "Eliminar o texto seleccionado" + +#: ../midori/midori-browser.c:3108 +msgid "Select all text" +msgstr "Seleccionar tudo" + +#: ../midori/midori-browser.c:3111 +msgid "Find a word or phrase in the page" +msgstr "Localizar uma palavra ou frase na página" + +#: ../midori/midori-browser.c:3113 +msgid "Find _Next" +msgstr "Localizar _Próxima" + +#: ../midori/midori-browser.c:3114 +msgid "Find the next occurrence of a word or phrase" +msgstr "Localizar próxima ocorrência da palavra ou frase" + +#: ../midori/midori-browser.c:3116 +msgid "Find _Previous" +msgstr "Localizar _Anterior" + +#: ../midori/midori-browser.c:3117 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Localizar a ocurrência anterior de uma palavra ou frase" + +#: ../midori/midori-browser.c:3120 +msgid "_Quick Find" +msgstr "Localização _Rápida" + +#: ../midori/midori-browser.c:3121 +msgid "Quickly jump to a word or phrase" +msgstr "Avanço rápido para palavra ou frase" + +#: ../midori/midori-browser.c:3124 +msgid "Configure the application preferences" +msgstr "Configurar preferências da aplicação" + +#: ../midori/midori-browser.c:3126 +msgid "_View" +msgstr "_Ver" + +#: ../midori/midori-browser.c:3127 +msgid "_Toolbars" +msgstr "_Barra de Ferramentas" + +#: ../midori/midori-browser.c:3139 +msgid "Increase the zoom level" +msgstr "Aumentar Zoom" + +#: ../midori/midori-browser.c:3142 +msgid "Decrease the zoom level" +msgstr "Diminuir Zoom" + +#: ../midori/midori-browser.c:3145 +msgid "Reset the zoom level" +msgstr "Restaurar Zoom" + +#: ../midori/midori-browser.c:3147 +#: ../midori/midori-view.c:998 +msgid "View _Source" +msgstr "Ver _fonte" + +#: ../midori/midori-browser.c:3148 +msgid "View the source code of the page" +msgstr "Ver código fonte da página" + +#: ../midori/midori-browser.c:3150 +msgid "View Selection Source" +msgstr "Ver Fonte da Selecção" + +#: ../midori/midori-browser.c:3151 +msgid "View the source code of the selection" +msgstr "Ver código fonte da selecção" + +#: ../midori/midori-browser.c:3155 +msgid "Toggle fullscreen view" +msgstr "Alternar para ecrã completo" + +#: ../midori/midori-browser.c:3157 +msgid "_Go" +msgstr "_Ir" + +#: ../midori/midori-browser.c:3160 +msgid "Go back to the previous page" +msgstr "Ir para página anterior" + +#: ../midori/midori-browser.c:3163 +msgid "Go forward to the next page" +msgstr "Ir para página seguinte" + +#: ../midori/midori-browser.c:3166 +msgid "Go to your homepage" +msgstr "Ir para página inicial" + +#: ../midori/midori-browser.c:3168 +msgid "Empty Trash" +msgstr "Esvaziar Lixo" + +#: ../midori/midori-browser.c:3169 +msgid "Delete the contents of the trash" +msgstr "Eliminar conteúdo do lixo" + +#: ../midori/midori-browser.c:3171 +#: ../midori/midori-view.c:970 +msgid "Undo Close Tab" +msgstr "Desfazer Fecho de Separador" + +#: ../midori/midori-browser.c:3172 +msgid "Open the last closed tab" +msgstr "Abrir último separador fechado" + +#: ../midori/midori-browser.c:3176 +msgid "Add a new bookmark" +msgstr "Adicionar novo marcador" + +#: ../midori/midori-browser.c:3179 +msgid "Edit the selected bookmark" +msgstr "Editar marcador seleccionado" + +#: ../midori/midori-browser.c:3182 +msgid "Delete the selected bookmark" +msgstr "Eliminar marcador seleccionado" + +#: ../midori/midori-browser.c:3185 +msgid "Delete the selected history item" +msgstr "Eliminar item de histórico seleccionado" + +#: ../midori/midori-browser.c:3188 +msgid "Clear the entire history" +msgstr "Limpar todo o histórico" + +#: ../midori/midori-browser.c:3191 +msgid "Bookmark the selected history item" +msgstr "Marcar o item de histórico seleccionado" + +#: ../midori/midori-browser.c:3193 +msgid "_Tools" +msgstr "_Ferramentas" + +#: ../midori/midori-browser.c:3195 +#: ../midori/midori-searchaction.c:465 +msgid "_Manage Search Engines" +msgstr "_Gerir Motores de Procura" + +#: ../midori/midori-browser.c:3196 +msgid "Add, edit and remove search engines..." +msgstr "Adicionar, editar e remover motores de procura" + +#: ../midori/midori-browser.c:3200 +msgid "_Previous Tab" +msgstr "Separador _Anterior" + +#: ../midori/midori-browser.c:3201 +msgid "Switch to the previous tab" +msgstr "Mudar para separador anterior" + +#: ../midori/midori-browser.c:3203 +msgid "_Next Tab" +msgstr "_Próximo Separador" + +#: ../midori/midori-browser.c:3204 +msgid "Switch to the next tab" +msgstr "Trocar para próximo separador" + +#: ../midori/midori-browser.c:3206 +msgid "_Help" +msgstr "_Ajuda" + +#: ../midori/midori-browser.c:3208 +msgid "_Contents" +msgstr "_Conteúdos" + +#: ../midori/midori-browser.c:3209 +msgid "Show the documentation" +msgstr "Mostrar documentação" + +#: ../midori/midori-browser.c:3211 +msgid "_Frequent questions" +msgstr "Questões _Frequentes" + +#: ../midori/midori-browser.c:3212 +msgid "Show the Frequently Asked Questions" +msgstr "Mostrar Questões Frequentes" + +#: ../midori/midori-browser.c:3214 +msgid "_Report a bug" +msgstr "_Reportar erros" + +#: ../midori/midori-browser.c:3215 +msgid "Open Midori's bug tracker" +msgstr "Abrir Midori's bug tracker" + +#: ../midori/midori-browser.c:3218 +msgid "Show information about the program" +msgstr "Mostrar informação sobre o programa" + +#: ../midori/midori-browser.c:3225 +msgid "P_rivate Browsing" +msgstr "Navegação P_rivada" + +#: ../midori/midori-browser.c:3226 +msgid "Don't save any private data while browsing" +msgstr "Não gravar dados privados ao navegar" + +#: ../midori/midori-browser.c:3231 +msgid "_Menubar" +msgstr "Barra de _Menu" + +#: ../midori/midori-browser.c:3232 +msgid "Show menubar" +msgstr "Mostrar barra de menu" + +#: ../midori/midori-browser.c:3235 +msgid "_Navigationbar" +msgstr "Barra de _Navegação" + +#: ../midori/midori-browser.c:3236 +msgid "Show navigationbar" +msgstr "Mostrar barra de navegação" + +#: ../midori/midori-browser.c:3239 +msgid "Side_panel" +msgstr "Pai_nel lateral" + +#: ../midori/midori-browser.c:3240 +msgid "Show sidepanel" +msgstr "Mostrar painel lateral" + +#: ../midori/midori-browser.c:3243 +msgid "_Bookmarkbar" +msgstr "Barra de Ma_rcadores" + +#: ../midori/midori-browser.c:3244 +msgid "Show bookmarkbar" +msgstr "Mostrar barra de marcadores" + +#: ../midori/midori-browser.c:3247 +msgid "_Transferbar" +msgstr "Barra de _Transferências" + +#: ../midori/midori-browser.c:3248 +msgid "Show transferbar" +msgstr "Mostrar barra de transferências" + +#: ../midori/midori-browser.c:3251 +msgid "_Statusbar" +msgstr "Barra de _Estado" + +#: ../midori/midori-browser.c:3252 +msgid "Show statusbar" +msgstr "Mostrar barra de estado" + +#: ../midori/midori-browser.c:3669 +msgid "_Location..." +msgstr "_Localização..." + +#: ../midori/midori-browser.c:3671 +msgid "Open a particular location" +msgstr "Abrir localização específica" + +#: ../midori/midori-browser.c:3695 +msgid "_Web Search..." +msgstr "Procura _Web..." + +#: ../midori/midori-browser.c:3697 +msgid "Run a web search" +msgstr "Executar uma procura web" + +#: ../midori/midori-browser.c:3716 +msgid "Reopen a previously closed tab or window" +msgstr "Reabrir janela ou separador anteriormente fechado" + +#: ../midori/midori-browser.c:3729 +msgid "_Recently visited pages" +msgstr "Páginas _Recentes" + +#: ../midori/midori-browser.c:3731 +msgid "Reopen pages that you visited earlier" +msgstr "Reabrir páginas visitadas anteriormente" + +#: ../midori/midori-browser.c:3746 +msgid "Show the saved bookmarks" +msgstr "Mostrar os marcadores gravados" + +#: ../midori/midori-browser.c:3759 +msgid "_Window" +msgstr "_Janela" + +#: ../midori/midori-browser.c:3761 +msgid "Show a list of all open tabs" +msgstr "Mostrar lista de separadores abertos" + +#: ../midori/midori-browser.c:3883 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../midori/midori-browser.c:3926 +#: ../midori/midori-preferences.c:517 +msgid "History" +msgstr "Histórico" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3969 +msgid "_Inline find:" +msgstr "Localizar _Inline:" + +#: ../midori/midori-browser.c:4004 +msgid "Match Case" +msgstr "Maiúsculas e Minúsculas" + +#: ../midori/midori-browser.c:4012 +msgid "Highlight Matches" +msgstr "Realçar Correspondências" + +#: ../midori/midori-browser.c:4021 +msgid "Close Findbar" +msgstr "Fechar" + +#: ../midori/midori-browser.c:4262 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Definição inesperada '%s'" + +#: ../midori/midori-panel.c:223 +#: ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "Fechar painel" + +#: ../midori/midori-websettings.c:131 +#: ../midori/midori-view.c:1635 +msgid "Blank page" +msgstr "Página em branco" + +#: ../midori/midori-websettings.c:132 +#: ../midori/midori-websettings.c:387 +msgid "Homepage" +msgstr "Página Inicial" + +#: ../midori/midori-websettings.c:133 +msgid "Last open pages" +msgstr "Últimas páginas abertas" + +#: ../midori/midori-websettings.c:148 +msgid "Chinese (BIG5)" +msgstr "Chinês (BIG5)" + +#: ../midori/midori-websettings.c:149 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonês (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:150 +msgid "Russian (KOI8-R)" +msgstr "Russo (KOI8-R)" + +#: ../midori/midori-websettings.c:151 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:152 +msgid "Western (ISO-8859-1)" +msgstr "Ocidental (ISO-8859-1)" + +#: ../midori/midori-websettings.c:153 +msgid "Custom..." +msgstr "Personalizar..." + +#: ../midori/midori-websettings.c:168 +msgid "New tab" +msgstr "Novo separador" + +#: ../midori/midori-websettings.c:169 +msgid "New window" +msgstr "Nova janela" + +#: ../midori/midori-websettings.c:170 +msgid "Current tab" +msgstr "Separador actual" + +#: ../midori/midori-websettings.c:185 +msgid "Default" +msgstr "Padrão" + +#: ../midori/midori-websettings.c:186 +msgid "Icons" +msgstr "Ícones" + +#: ../midori/midori-websettings.c:187 +msgid "Text" +msgstr "Texto" + +#: ../midori/midori-websettings.c:188 +msgid "Both" +msgstr "Texto e Ícones" + +#: ../midori/midori-websettings.c:189 +msgid "Both horizontal" +msgstr "Ambos na horizontal" + +#: ../midori/midori-websettings.c:204 +msgid "All cookies" +msgstr "Todos os cookies" + +#: ../midori/midori-websettings.c:205 +msgid "Session cookies" +msgstr "Cookies da sessão" + +#: ../midori/midori-websettings.c:206 +#: ../panels/midori-addons.c:97 +msgid "None" +msgstr "Nenhum" + +#: ../midori/midori-websettings.c:246 +msgid "Remember last window size" +msgstr "Lembrar último tamanho de janela" + +#: ../midori/midori-websettings.c:247 +msgid "Whether to save the last window size" +msgstr "Se grava o último tamanho de janela" + +#: ../midori/midori-websettings.c:255 +msgid "Last window width" +msgstr "Largura da última janela" + +#: ../midori/midori-websettings.c:256 +msgid "The last saved window width" +msgstr "Última largura de janela gravada" + +#: ../midori/midori-websettings.c:264 +msgid "Last window height" +msgstr "Altura da última janela" + +#: ../midori/midori-websettings.c:265 +msgid "The last saved window height" +msgstr "Última altura de janela gravada" + +#: ../midori/midori-websettings.c:273 +msgid "Last panel position" +msgstr "Última posição do painel" + +#: ../midori/midori-websettings.c:274 +msgid "The last saved panel position" +msgstr "Última posição de painel gravada" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:283 +msgid "Last panel page" +msgstr "Última página do painel" + +#: ../midori/midori-websettings.c:284 +msgid "The last saved panel page" +msgstr "Última posição de painel de página gravada" + +#: ../midori/midori-websettings.c:292 +msgid "Last Web search" +msgstr "Última procura na web" + +#: ../midori/midori-websettings.c:293 +msgid "The last saved Web search" +msgstr "Última procura Web gravada" + +#: ../midori/midori-websettings.c:302 +msgid "Show Menubar" +msgstr "Mostrar Barra de Menu" + +#: ../midori/midori-websettings.c:303 +msgid "Whether to show the menubar" +msgstr "Se mostra a barra de menu" + +#: ../midori/midori-websettings.c:311 +msgid "Show Navigationbar" +msgstr "Mostrar Barra de Navegação" + +#: ../midori/midori-websettings.c:312 +msgid "Whether to show the navigationbar" +msgstr "Se mostra a barra de navegação" + +#: ../midori/midori-websettings.c:320 +msgid "Show Bookmarkbar" +msgstr "Mostrar Barra de Marcadores" + +#: ../midori/midori-websettings.c:321 +msgid "Whether to show the bookmarkbar" +msgstr "Se mostra a barra de marcadores" + +#: ../midori/midori-websettings.c:329 +msgid "Show Panel" +msgstr "Mostrar Painel" + +#: ../midori/midori-websettings.c:330 +msgid "Whether to show the panel" +msgstr "Se mostra o painel" + +#: ../midori/midori-websettings.c:338 +msgid "Show Statusbar" +msgstr "Mostrar Barra de Estado" + +#: ../midori/midori-websettings.c:339 +msgid "Whether to show the statusbar" +msgstr "Se mostra a barra de estado" + +#: ../midori/midori-websettings.c:348 +msgid "Toolbar Style" +msgstr "Estilo da Barra de Ferramentas" + +#: ../midori/midori-websettings.c:349 +msgid "The style of the toolbar" +msgstr "Estilo da barra de ferramentas" + +#: ../midori/midori-websettings.c:358 +msgid "Toolbar Items" +msgstr "Itens da Barra de Ferramentas" + +#: ../midori/midori-websettings.c:359 +msgid "The items to show on the toolbar" +msgstr "Itens a mostrar na barra de ferramentas" + +#: ../midori/midori-websettings.c:367 +msgid "Compact Sidepanel" +msgstr "Compactar Painel Lateral" + +#: ../midori/midori-websettings.c:368 +msgid "Whether to make the sidepanel compact" +msgstr "Se implica compactação do painel lateral" + +#: ../midori/midori-websettings.c:377 +msgid "Load on Startup" +msgstr "Carregar ao iniciar" + +#: ../midori/midori-websettings.c:378 +msgid "What to load on startup" +msgstr "Carregar ao iniciar" + +#: ../midori/midori-websettings.c:388 +msgid "The homepage" +msgstr "A página inicial" + +#: ../midori/midori-websettings.c:396 +msgid "Download Folder" +msgstr "Pasta de Transferências" + +#: ../midori/midori-websettings.c:397 +msgid "The folder downloaded files are saved to" +msgstr "Pasta para gravar transferências" + +#: ../midori/midori-websettings.c:405 +msgid "Download Manager" +msgstr "Gestor de Transferências" + +#: ../midori/midori-websettings.c:406 +msgid "An external download manager" +msgstr "Gestor de transferências externo" + +#: ../midori/midori-websettings.c:414 +msgid "Text Editor" +msgstr "Editor de Texto" + +#: ../midori/midori-websettings.c:415 +msgid "An external text editor" +msgstr "Editor de texto externo" + +#: ../midori/midori-websettings.c:423 +msgid "Location entry Search" +msgstr "Procura de entrada local" + +#: ../midori/midori-websettings.c:424 +msgid "The search to perform inside the location entry" +msgstr "Procura a executar dentro da entrada local" + +#: ../midori/midori-websettings.c:432 +msgid "Preferred Encoding" +msgstr "Codificação Preferida" + +#: ../midori/midori-websettings.c:433 +msgid "The preferred character encoding" +msgstr "A codificação de caracteres preferida" + +#: ../midori/midori-websettings.c:443 +msgid "Always Show Tabbar" +msgstr "Mostrar sempre Barra de Separadores" + +#: ../midori/midori-websettings.c:444 +msgid "Always show the tabbar" +msgstr "Mostrar sempre barra de separadores" + +#: ../midori/midori-websettings.c:452 +msgid "Close Buttons on Tabs" +msgstr "Ìcone \"Fechar\" nos Separadores" + +#: ../midori/midori-websettings.c:453 +msgid "Whether tabs have close buttons" +msgstr "Se separadores têm botões para fechar" + +#: ../midori/midori-websettings.c:462 +msgid "Open new pages in" +msgstr "Abrir novas páginas em" + +#: ../midori/midori-websettings.c:463 +msgid "Where to open new pages" +msgstr "Onde abrir novas páginas" + +#: ../midori/midori-websettings.c:473 +msgid "Open external pages in" +msgstr "Abrir páginas externas em" + +#: ../midori/midori-websettings.c:474 +msgid "Where to open externally opened pages" +msgstr "Onde abrir páginas abertas externamente" + +#: ../midori/midori-websettings.c:483 +msgid "Middle click opens Selection" +msgstr "Clique na roda do rato abre Selecção" + +#: ../midori/midori-websettings.c:484 +msgid "Load an URL from the selection via middle click" +msgstr "Carregar URL seleccionada através do clique na roda do rato" + +#: ../midori/midori-websettings.c:492 +msgid "Open tabs in the background" +msgstr "Abrir separadores em segundo plano" + +#: ../midori/midori-websettings.c:493 +msgid "Whether to open new tabs in the background" +msgstr "Se mostra novos separadores em segundo plano" + +#: ../midori/midori-websettings.c:501 +msgid "Open Tabs next to Current" +msgstr "Abrir Separadores perto do Actual" + +#: ../midori/midori-websettings.c:502 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Se abre novos separadores perto do actual ou após o último " + +#: ../midori/midori-websettings.c:510 +msgid "Open popups in tabs" +msgstr "Abrir popups em separadores" + +#: ../midori/midori-websettings.c:511 +msgid "Whether to open popup windows in tabs" +msgstr "Se abre janelas popup em separadores" + +#: ../midori/midori-websettings.c:537 +msgid "Accept cookies" +msgstr "Aceitar cookies" + +#: ../midori/midori-websettings.c:538 +msgid "What type of cookies to accept" +msgstr "Tipo de cookies a aceitar" + +#: ../midori/midori-websettings.c:547 +msgid "Original cookies only" +msgstr "Apenas cookies originais" + +#: ../midori/midori-websettings.c:548 +msgid "Accept cookies from the original website only" +msgstr "Aceitar cookies apenas do website original" + +#: ../midori/midori-websettings.c:556 +msgid "Maximum cookie age" +msgstr "Antiguidade máxima de cookies" + +#: ../midori/midori-websettings.c:557 +msgid "The maximum number of days to save cookies for" +msgstr "Número máximo de dias para guardar cookies" + +#: ../midori/midori-websettings.c:567 +msgid "Remember last visited pages" +msgstr "Lembrar últimas páginas visitadas" + +#: ../midori/midori-websettings.c:568 +msgid "Whether the last visited pages are saved" +msgstr "Onde últimas páginas visitadas são gravadas" + +#: ../midori/midori-websettings.c:576 +msgid "Maximum history age" +msgstr "Antiguidade máxima do histórico" + +#: ../midori/midori-websettings.c:577 +msgid "The maximum number of days to save the history for" +msgstr "O número máximo de dias para guardar histórico" + +#: ../midori/midori-websettings.c:585 +msgid "Remember last form inputs" +msgstr "Lembrar dados de formulários" + +#: ../midori/midori-websettings.c:586 +msgid "Whether the last form inputs are saved" +msgstr "Se os dados de formulário são gravados" + +#: ../midori/midori-websettings.c:594 +msgid "Remember last downloaded files" +msgstr "Lembrar últimas transferências " + +#: ../midori/midori-websettings.c:595 +msgid "Whether the last downloaded files are saved" +msgstr "Se as últimas transferências são gravados" + +#: ../midori/midori-websettings.c:605 +msgid "HTTP Proxy" +msgstr "HTTP Proxy" + +#: ../midori/midori-websettings.c:606 +msgid "The proxy used for HTTP connections" +msgstr "Proxy usada para ligações HTTP" + +#: ../midori/midori-websettings.c:614 +msgid "Cache size" +msgstr "Tamanho de cache" + +#: ../midori/midori-websettings.c:615 +msgid "The allowed size of the cache" +msgstr "Tamanho de cache permitido" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "Não encontrada(o) - %s" + +#: ../midori/midori-view.c:902 +msgid "Open Link in New _Tab" +msgstr "Abrir Ligação em Novo _Separador" + +#: ../midori/midori-view.c:925 +msgid "_Save Link destination" +msgstr "De_stino para Gravar Ligação" + +#: ../midori/midori-view.c:933 +msgid "_Download Link destination" +msgstr "_Destino de Gravar Ligação" + +#: ../midori/midori-view.c:955 +msgid "Open URL in New _Tab" +msgstr "Abrir URL em Novo _Separador" + +#: ../midori/midori-view.c:1365 +#, c-format +msgid "Inspect page - %s" +msgstr "Inspeccionar página - %s" + +#: ../midori/midori-view.c:1503 +msgid "Source" +msgstr "Fonte" + +#: ../midori/midori-view.c:1527 +#, c-format +msgid "No documentation installed" +msgstr "Nenhuma documentação instalada" + +#: ../midori/midori-preferences.c:87 +#, c-format +msgid "Preferences for %s" +msgstr "Preferências para %s" + +#. Page "General" +#: ../midori/midori-preferences.c:338 +msgid "General" +msgstr "Geral" + +#: ../midori/midori-preferences.c:339 +msgid "Startup" +msgstr "Início" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:386 +msgid "Appearance" +msgstr "Aparência" + +#: ../midori/midori-preferences.c:387 +msgid "Font settings" +msgstr "Definições de fontes" + +#: ../midori/midori-preferences.c:389 +msgid "Default Font Family" +msgstr "Família de Fontes Padrão" + +#: ../midori/midori-preferences.c:397 +msgid "Minimum Font Size" +msgstr "Tmanho Mínimo de Fonte" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:407 +msgid "Behavior" +msgstr "Comportamento" + +#: ../midori/midori-preferences.c:408 +msgid "Features" +msgstr "Funções" + +#: ../midori/midori-preferences.c:411 +#: ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "Carregar imagens automaticamente" + +#: ../midori/midori-preferences.c:414 +msgid "Shrink images automatically" +msgstr "Compactar imagens automaticamente" + +#: ../midori/midori-preferences.c:417 +msgid "Print background images" +msgstr "Imprimir imagens de segundo plano" + +#: ../midori/midori-preferences.c:420 +msgid "Resizable text areas" +msgstr "Áreas de texto dimensionáveis" + +#: ../midori/midori-preferences.c:423 +#: ../extensions/statusbar-features.c:39 +msgid "Enable scripts" +msgstr "Activar scripts" + +#: ../midori/midori-preferences.c:426 +#: ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "Activar plugins" + +#: ../midori/midori-preferences.c:429 +msgid "Enable developer tools" +msgstr "Activar ferramentas de desenvolvimento" + +#. Page "Interface" +#: ../midori/midori-preferences.c:437 +msgid "Interface" +msgstr "Interface" + +#: ../midori/midori-preferences.c:438 +msgid "Navigationbar" +msgstr "Barra de Navegação" + +#: ../midori/midori-preferences.c:453 +msgid "Browsing" +msgstr "Navegar" + +#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:481 +msgid "Network" +msgstr "Rede" + +#: ../midori/midori-preferences.c:492 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:498 +msgid "Privacy" +msgstr "Privacidade" + +#: ../midori/midori-preferences.c:500 +msgid "Web Cookies" +msgstr "Web Cookies" + +#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:524 +msgid "days" +msgstr "dias" + +#: ../midori/midori-searchaction.c:456 +#: ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "Vazio" + +#: ../midori/midori-searchaction.c:797 +msgid "Add search engine" +msgstr "Adicionar motor de procura" + +#: ../midori/midori-searchaction.c:797 +msgid "Edit search engine" +msgstr "Editar motor de procura" + +#: ../midori/midori-searchaction.c:825 +msgid "_Name:" +msgstr "_Nome:" + +#: ../midori/midori-searchaction.c:869 +msgid "_Icon (name or file):" +msgstr "_Ícone (nome ou ficheiro):" + +#: ../midori/midori-searchaction.c:883 +msgid "_Token:" +msgstr "_Token:" + +#: ../midori/midori-searchaction.c:1060 +msgid "Manage search engines" +msgstr "Gerir motores de procura" + +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Não é possível executar o programa externo." + +#: ../midori/sokoke.c:282 +msgid "Warning: You are using a superuser account!" +msgstr "Aviso: Está a utilizar uma conta de super utilizador!" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Ocorreu um erro desconhecido." + +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s não tem a propriedade '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "Não pode assinar %s para %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "Não pode aceder a %s.%s" + +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Scripts de utilizador" + +#: ../panels/midori-addons.c:99 +#: ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Estilos de utilizador" + +#: ../panels/midori-addons.c:1006 +#: ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Activar" + +#: ../panels/midori-addons.c:1015 +#: ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Desactivar" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Consola" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensões" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "O ícone '%s' não foi carregado" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "O ícone '%s' não foi carregado" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "As frames de animação estão corrompidas" + +#: ../katze/katze-utils.c:154 +#: ../katze/katze-utils.c:352 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Propriedade %s' é inválida para %s" + +#: ../katze/katze-utils.c:178 +#: ../katze/katze-utils.c:217 +msgid "Choose file" +msgstr "Escolha ficheiro" + +#: ../katze/katze-utils.c:198 +msgid "Choose folder" +msgstr "Escolha pasta" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 +#: ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "Titular de Página" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "Titular de _Página" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "Imagens" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "Scripts" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "Plugins" + From 4e1deaee05758226dc5e49cfeaf30f53689629b3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 30 Dec 2008 03:00:08 +0100 Subject: [PATCH 0604/2970] Optimizations in main and MidoriApp --- midori/main.c | 17 ++++++++--------- midori/midori-app.c | 11 +++++------ panels/midori-extensions.c | 10 ++++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/midori/main.c b/midori/main.c index 3a01d7a7..d04f76ce 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1208,7 +1208,7 @@ parse_cookie (gchar* line, SoupCookie *cookie = NULL; gboolean http_only; time_t max_age; - gchar* host, *is_domain, *path, *secure, *expires, *name, *value; + gchar* host/*, *is_domain*/, *path, *secure, *expires, *name, *value; if (g_str_has_prefix (line, "#HttpOnly_")) { @@ -1231,7 +1231,7 @@ parse_cookie (gchar* line, goto out; host = result[0]; - is_domain = result[1]; + /* is_domain = result[1]; */ path = result[2]; secure = result[3]; @@ -1689,7 +1689,6 @@ midori_load_extensions (gpointer data) MidoriApp* app = MIDORI_APP (data); KatzeArray* extensions; gchar* extension_path; - GDir* extension_dir; const gchar* filename; MidoriExtension* extension; guint n, i; @@ -1698,11 +1697,9 @@ midori_load_extensions (gpointer data) extensions = katze_array_new (MIDORI_TYPE_EXTENSION); extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); if (g_module_supported ()) - extension_dir = g_dir_open (extension_path, 0, NULL); - else - extension_dir = NULL; - if (extension_dir) { + GDir* extension_dir = g_dir_open (extension_path, 0, NULL); + while ((filename = g_dir_read_name (extension_dir))) { gchar* fullname; @@ -1715,14 +1712,16 @@ midori_load_extensions (gpointer data) g_free (fullname); if (module && g_module_symbol (module, "extension_init", - (gpointer) &extension_init)) + (gpointer) &extension_init)) extension = extension_init (); else + { extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", filename, "description", g_module_error (), NULL); - g_warning ("%s", g_module_error ()); + g_warning ("%s", g_module_error ()); + } katze_array_add_item (extensions, extension); g_object_unref (extension); } diff --git a/midori/midori-app.c b/midori/midori-app.c index fe091136..11a9f895 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -160,8 +160,7 @@ _midori_app_add_browser (MidoriApp* app, app->browsers = g_list_prepend (app->browsers, browser); #if HAVE_UNIQUE - if (app->instance) - unique_app_watch_window (app->instance, GTK_WINDOW (browser)); + unique_app_watch_window (app->instance, GTK_WINDOW (browser)); #endif } @@ -369,7 +368,7 @@ midori_app_init (MidoriApp* app) app->accel_group = gtk_accel_group_new (); - app->settings = midori_web_settings_new (); + app->settings = NULL; app->bookmarks = NULL; app->trash = NULL; app->search_engines = NULL; @@ -552,7 +551,7 @@ midori_app_instance_send_activate (MidoriApp* app) UniqueResponse response; #endif - g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); #if HAVE_UNIQUE @@ -579,7 +578,7 @@ midori_app_instance_send_new_browser (MidoriApp* app) UniqueResponse response; #endif - g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); #if HAVE_UNIQUE @@ -611,7 +610,7 @@ midori_app_instance_send_uris (MidoriApp* app, UniqueResponse response; #endif - g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); + /* g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); */ g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); g_return_val_if_fail (uris != NULL, FALSE); diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index b7887850..c615c0d7 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -177,10 +177,11 @@ midori_extensions_add_item_cb (KatzeArray* array, MidoriExtensions* extensions) { GtkTreeIter iter; - GtkListStore* liststore = GTK_LIST_STORE (gtk_tree_view_get_model ( - GTK_TREE_VIEW (extensions->treeview))); - gtk_list_store_append (liststore, &iter); - gtk_list_store_set (liststore, &iter, 0, extension, -1); + GtkTreeModel* model; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (extensions->treeview)); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, extension, -1); } static void @@ -198,6 +199,7 @@ midori_extensions_set_property (GObject* object, KatzeArray* array; guint i, n; + /* FIXME: Handle NULL and subsequent assignments */ extensions->app = g_value_get_object (value); array = katze_object_get_object (extensions->app, "extensions"); g_signal_connect (array, "add-item", From d3d6f8dab7d17d36b40d6cdba31cef0ce8318bc9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 30 Dec 2008 04:16:10 +0100 Subject: [PATCH 0605/2970] Monitor bookmark subfolders for saving --- midori/main.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index d04f76ce..0c622dac 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1052,8 +1052,18 @@ katze_array_to_file (KatzeArray* array, } static void -midori_bookmarks_add_item_cb (KatzeArray* bookmarks, - GObject* item) +midori_bookmarks_add_item_cb (KatzeArray* folder, + GObject* item, + KatzeArray* bookmarks); + +static void +midori_bookmarks_remove_item_cb (KatzeArray* bookmarks, + GObject* item); + +static void +midori_bookmarks_add_item_cb (KatzeArray* folder, + GObject* item, + KatzeArray* bookmarks) { gchar* config_file; GError* error; @@ -1066,6 +1076,14 @@ midori_bookmarks_add_item_cb (KatzeArray* bookmarks, g_error_free (error); } g_free (config_file); + + if (folder == bookmarks && KATZE_IS_ARRAY (item)) + { + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect_after (item, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + } } static void @@ -1083,6 +1101,10 @@ midori_bookmarks_remove_item_cb (KatzeArray* bookmarks, g_error_free (error); } g_free (config_file); + + if (KATZE_IS_ARRAY (item)) + g_signal_handlers_disconnect_by_func (item, + midori_bookmarks_add_item_cb, bookmarks); } static void @@ -2114,9 +2136,25 @@ main (int argc, g_signal_connect_after (search_engines, "remove-item", G_CALLBACK (midori_search_engines_remove_item_cb), NULL); g_signal_connect_after (bookmarks, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), NULL); + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect_after (bookmarks, "remove-item", G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + if (!katze_array_is_empty (bookmarks)) + { + guint i, n; + n = katze_array_get_length (bookmarks); + for (i = 0; i < n; i++) + { + KatzeItem* item = katze_array_get_nth_item (bookmarks, i); + if (KATZE_IS_ARRAY (item)) + { + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect_after (item, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + } + } + } g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_trash_add_item_cb), NULL); g_signal_connect_after (trash, "remove-item", From 58cd6ddcc93c896c26103b6cef4daeb14fffc80b Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Wed, 31 Dec 2008 22:25:22 +0100 Subject: [PATCH 0606/2970] Add Japanese translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/ja.po | 1438 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1440 insertions(+), 1 deletion(-) create mode 100644 po/ja.po diff --git a/AUTHORS b/AUTHORS index a7fb53b7..73e22467 100644 --- a/AUTHORS +++ b/AUTHORS @@ -35,6 +35,7 @@ Translations: gl: Miguel Anxo Bouzada hu: SZERVÁC Attila id: Andhika Padmawan + ja: Masato Hashimoto nl: Vincent Tunru pl: Przemysław Sitek pl: Lukasz Romanowicz diff --git a/po/LINGUAS b/po/LINGUAS index 1dbaa96e..3a42c776 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de el en_GB es et fi fr gl hu id nl pl pt_PT ru sv tr uk +de el en_GB es et fi fr gl hu id ja nl pl pt_PT ru sv tr uk diff --git a/po/ja.po b/po/ja.po new file mode 100644 index 00000000..cca3b10e --- /dev/null +++ b/po/ja.po @@ -0,0 +1,1438 @@ +# Japanese translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Masato Hashimoto 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-30 10:14+0900\n" +"PO-Revision-Date: 2008-12-29 18:15+0900\n" +"Last-Translator: Masato Hashimoto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "軽量級ウェブブラウザ" + +#: ../midori.desktop.in.h:2 ../midori/main.c:1807 ../midori/main.c:1898 +#: ../midori/main.c:1907 ../midori/main.c:1918 +#: ../midori/midori-websettings.c:235 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "ウェブブラウザ" + +#: ../midori/main.c:87 +msgid "_Bookmark" +msgstr "ブックマーク(_B)" + +#: ../midori/main.c:88 ../midori/midori-browser.c:3761 +msgid "_Bookmarks" +msgstr "ブックマーク(_B)" + +#: ../midori/main.c:89 +msgid "_Add Bookmark" +msgstr "ブックマークに追加(_A)" + +#: ../midori/main.c:90 +msgid "_Console" +msgstr "コンソール(_C)" + +#: ../midori/main.c:91 +msgid "_Extensions" +msgstr "エクステンション(_E)" + +#: ../midori/main.c:92 +msgid "_History" +msgstr "履歴(_H)" + +#: ../midori/main.c:93 +msgid "_Homepage" +msgstr "ホームページ(_H)" + +#: ../midori/main.c:94 +msgid "_Userscripts" +msgstr "ユーザスクリプト(_U)" + +#: ../midori/main.c:95 +msgid "User_styles" +msgstr "ユーザスタイル(_S)" + +#: ../midori/main.c:96 +msgid "New _Tab" +msgstr "新しいタブ(_T)" + +#: ../midori/main.c:97 +msgid "_Transfers" +msgstr "転送(_T)" + +#: ../midori/main.c:98 +msgid "_Closed Tabs and Windows" +msgstr "閉じたタブとウィンドウ(_C)" + +#: ../midori/main.c:99 +msgid "New _Window" +msgstr "新しいウィンドウ(_W)" + +#: ../midori/main.c:155 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "設定を読み込めませんでした: %s\n" + +#: ../midori/main.c:210 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "'%s' は %s の値として無効です" + +#: ../midori/main.c:217 ../midori/main.c:287 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "無効な設定値 '%s'" + +#: ../midori/main.c:529 +msgid "File not found." +msgstr "ファイルが見つかりません。" + +#: ../midori/main.c:537 ../midori/main.c:546 +msgid "Malformed document." +msgstr "不正な形式のドキュメントです。" + +#: ../midori/main.c:568 ../midori/main.c:600 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "データベースのオープンに失敗しました: %s\n" + +#: ../midori/main.c:654 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "履歴アイテムの削除に失敗しました: %s\n" + +#: ../midori/main.c:678 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "履歴のクリアに失敗しました: %s\n" + +#: ../midori/main.c:711 ../midori/main.c:725 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "履歴アイテムの追加に失敗しました: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:841 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "古い履歴アイテムの削除に失敗しました: %s\n" + +#: ../midori/main.c:869 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "設定を保存できませんでした。%s" + +#: ../midori/main.c:897 ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "検索エンジンを保存できませんでした。%s" + +#: ../midori/main.c:1045 ../midori/sokoke.c:517 +#, c-format +msgid "Writing failed." +msgstr "書き込みに失敗しました。" + +#: ../midori/main.c:1065 ../midori/main.c:1082 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "ブックマークを保存できませんでした。%s" + +#: ../midori/main.c:1101 ../midori/main.c:1125 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "ゴミ箱を保存できませんでした。%s" + +#: ../midori/main.c:1146 ../midori/midori-preferences.c:381 +msgid "Transfers" +msgstr "転送" + +#: ../midori/main.c:1182 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "セッションは保存できませんでした。%s" + +#: ../midori/main.c:1508 +msgid "Authentication Required" +msgstr "認証が要求されました" + +#: ../midori/main.c:1524 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"この場所を開くためにはユーザ名とパスワードが\n" +"必要です:" + +#: ../midori/main.c:1538 +msgid "Username" +msgstr "ユーザ名" + +#: ../midori/main.c:1549 +msgid "Password" +msgstr "パスワード" + +#: ../midori/main.c:1653 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" +"ようであれば、問題解決のために以下のオプションを試してみてください。" + +#: ../midori/main.c:1668 +msgid "Modify _preferences" +msgstr "設定を変更する(_P)" + +#: ../midori/main.c:1672 +msgid "Reset the last _session" +msgstr "最後のセッションをリセットする(_S)" + +#: ../midori/main.c:1677 +msgid "Disable all _extensions" +msgstr "すべてのエクステンションを無効にする(_E)" + +#: ../midori/main.c:1807 +msgid "No filename specified" +msgstr "ファイル名が指定されていません" + +#: ../midori/main.c:1836 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "未知のエラーが発生しました。" + +# CLI --help +#: ../midori/main.c:1859 +msgid "Run the specified filename as javascript" +msgstr "指定されたファイル名を javascript として実行する" + +# CLI --help +#: ../midori/main.c:1861 +msgid "Display program version" +msgstr "プログラムのバージョンを表示する" + +#: ../midori/main.c:1863 +msgid "URIs" +msgstr "URIs" + +#: ../midori/main.c:1895 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1919 +msgid "Please report comments, suggestions and bugs to:" +msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" + +#: ../midori/main.c:1921 +msgid "Check for new versions at:" +msgstr "新しいバージョンのチェックはこちら:" + +#: ../midori/main.c:1944 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" + +#: ../midori/main.c:2003 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "ブックマークを読み込めませんでした: %s\n" + +#: ../midori/main.c:2018 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "セッションを読み込めませんでした: %s\n" + +#: ../midori/main.c:2031 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "ゴミ箱を読み込めませんでした: %s\n" + +#: ../midori/main.c:2044 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "履歴を読み込めませんでした: %s\n" + +#: ../midori/main.c:2056 +msgid "The following errors occured:" +msgstr "次のエラーが発生しました:" + +#: ../midori/main.c:2072 +msgid "_Ignore" +msgstr "無視(_I)" + +#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3125 +msgid "Reload the current page" +msgstr "現在のページを再読み込みします" + +#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3122 +msgid "Stop loading the current page" +msgstr "現在のページの読み込みを中止します" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% ロードしました" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "'%s' は想定外のアクションです。" + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "新しいブックマーク" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "ブックマークの編集" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "タイトル(_T):" + +#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:868 +msgid "_Description:" +msgstr "説明(_D):" + +#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:882 +msgid "_URL:" +msgstr "URL(_U):" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "フォルダ(_F):" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "ルート" + +#: ../midori/midori-browser.c:668 +msgid "Save file as" +msgstr "名前を付けて保存" + +#: ../midori/midori-browser.c:1248 +msgid "Open file" +msgstr "ファイルを開く" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "新しいタブで開く(_T)" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "新しいウィンドウで開く(_W)" + +#: ../midori/midori-browser.c:2605 +msgid "Separator" +msgstr "セパレータ" + +#: ../midori/midori-browser.c:2716 +#, c-format +msgid "A week ago" +msgstr "一週間前" + +#: ../midori/midori-browser.c:2722 +#, c-format +msgid "%d days ago" +msgstr "%d 日前" + +#: ../midori/midori-browser.c:2729 +msgid "Today" +msgstr "今日" + +#: ../midori/midori-browser.c:2731 +msgid "Yesterday" +msgstr "昨日" + +#: ../midori/midori-browser.c:2820 +msgid "A lightweight web browser." +msgstr "軽快なウェブブラウザ" + +#: ../midori/midori-browser.c:2828 +msgid "translator-credits" +msgstr "Masato Hashimoto " + +#: ../midori/midori-browser.c:2962 +msgid "Are you sure you want to remove all history items?" +msgstr "すべての履歴アイテムを削除してよろしいですか?" + +#: ../midori/midori-browser.c:3053 +msgid "_File" +msgstr "ファイル(_F)" + +#: ../midori/midori-browser.c:3056 +msgid "Open a new window" +msgstr "新しいウィンドウを開きます" + +#: ../midori/midori-browser.c:3059 +msgid "Open a new tab" +msgstr "新しいタブを開きます" + +#: ../midori/midori-browser.c:3062 +msgid "Open a file" +msgstr "ファイルを開きます" + +#: ../midori/midori-browser.c:3065 +msgid "Save to a file" +msgstr "ファイルへ保存します" + +#: ../midori/midori-browser.c:3067 +msgid "_Close Tab" +msgstr "タブを閉じる(_C)" + +#: ../midori/midori-browser.c:3068 +msgid "Close the current tab" +msgstr "現在のタブを閉じます" + +#: ../midori/midori-browser.c:3070 +msgid "C_lose Window" +msgstr "ウィンドウを閉じる(_L)" + +#: ../midori/midori-browser.c:3071 +msgid "Close this window" +msgstr "このウィンドウを閉じます" + +#: ../midori/midori-browser.c:3074 +msgid "Print the current page" +msgstr "現在のページを印刷します" + +#: ../midori/midori-browser.c:3077 +msgid "Quit the application" +msgstr "このアプリケーションを終了します" + +#: ../midori/midori-browser.c:3079 +msgid "_Edit" +msgstr "編集(_E)" + +#: ../midori/midori-browser.c:3082 +msgid "Cut the selected text" +msgstr "選択された文字を切り取ります" + +#: ../midori/midori-browser.c:3085 ../midori/midori-browser.c:3088 +msgid "Copy the selected text" +msgstr "選択された文字をコピーします" + +#: ../midori/midori-browser.c:3091 +msgid "Paste text from the clipboard" +msgstr "クリップボードから文字を貼り付けます" + +#: ../midori/midori-browser.c:3094 +msgid "Delete the selected text" +msgstr "選択された文字を削除します" + +#: ../midori/midori-browser.c:3097 +msgid "Select all text" +msgstr "すべての文字を選択します" + +#: ../midori/midori-browser.c:3100 +msgid "Find a word or phrase in the page" +msgstr "ページ内の単語やフレーズを検索します" + +#: ../midori/midori-browser.c:3102 +msgid "Find _Next" +msgstr "次を検索(_N)" + +#: ../midori/midori-browser.c:3103 +msgid "Find the next occurrence of a word or phrase" +msgstr "指定文字列に一致する次の候補を検索します" + +#: ../midori/midori-browser.c:3105 +msgid "Find _Previous" +msgstr "前を検索(_P)" + +#: ../midori/midori-browser.c:3106 +msgid "Find the previous occurrence of a word or phrase" +msgstr "指定文字列に一致する前の候補を検索します" + +#: ../midori/midori-browser.c:3109 +msgid "_Quick Find" +msgstr "クイック検索(_Q)" + +#: ../midori/midori-browser.c:3110 +msgid "Quickly jump to a word or phrase" +msgstr "単語やフレーズにすぐに移動します" + +#: ../midori/midori-browser.c:3113 +msgid "Configure the application preferences" +msgstr "アプリケーションの設定を行います" + +#: ../midori/midori-browser.c:3115 +msgid "_View" +msgstr "表示(_V)" + +#: ../midori/midori-browser.c:3116 +msgid "_Toolbars" +msgstr "ツールバー(_T)" + +#: ../midori/midori-browser.c:3128 +msgid "Increase the zoom level" +msgstr "ズームレベルを大きくします" + +#: ../midori/midori-browser.c:3131 +msgid "Decrease the zoom level" +msgstr "ズームレベルを小さくします" + +#: ../midori/midori-browser.c:3134 +msgid "Reset the zoom level" +msgstr "ズームレベルをリセットします" + +#: ../midori/midori-browser.c:3136 ../midori/midori-view.c:1017 +msgid "View _Source" +msgstr "ソースを表示(_S)" + +#: ../midori/midori-browser.c:3137 +msgid "View the source code of the page" +msgstr "ページのソースコードを表示します" + +#: ../midori/midori-browser.c:3139 +msgid "View Selection Source" +msgstr "選択領域のソースを表示" + +#: ../midori/midori-browser.c:3140 +msgid "View the source code of the selection" +msgstr "選択した領域のソースを表示します" + +#: ../midori/midori-browser.c:3144 +msgid "Toggle fullscreen view" +msgstr "全画面表示/解除を切り替えます" + +#: ../midori/midori-browser.c:3146 +msgid "_Go" +msgstr "移動(_G)" + +#: ../midori/midori-browser.c:3149 +msgid "Go back to the previous page" +msgstr "前のページへ戻ります" + +#: ../midori/midori-browser.c:3152 +msgid "Go forward to the next page" +msgstr "次のページへ進みます" + +#: ../midori/midori-browser.c:3155 +msgid "Go to your homepage" +msgstr "ホームページに移動します" + +#: ../midori/midori-browser.c:3157 +msgid "Empty Trash" +msgstr "ゴミ箱を空にする" + +#: ../midori/midori-browser.c:3158 +msgid "Delete the contents of the trash" +msgstr "ゴミ箱の中身を削除します" + +#: ../midori/midori-browser.c:3160 ../midori/midori-view.c:989 +msgid "Undo Close Tab" +msgstr "閉じたタブを元に戻します" + +#: ../midori/midori-browser.c:3161 +msgid "Open the last closed tab" +msgstr "最後に閉じたタブを開きます" + +#: ../midori/midori-browser.c:3165 +msgid "Add a new bookmark" +msgstr "新しいブックマークを追加します" + +#: ../midori/midori-browser.c:3168 +msgid "Edit the selected bookmark" +msgstr "選択されたブックマークを編集します" + +#: ../midori/midori-browser.c:3171 +msgid "Delete the selected bookmark" +msgstr "選択されたブックマークを削除します" + +#: ../midori/midori-browser.c:3174 +msgid "Delete the selected history item" +msgstr "選択された履歴アイテムを削除します" + +#: ../midori/midori-browser.c:3177 +msgid "Clear the entire history" +msgstr "すべての履歴をクリアします" + +#: ../midori/midori-browser.c:3180 +msgid "Bookmark the selected history item" +msgstr "選択された履歴アイテムをブックマークに追加します" + +#: ../midori/midori-browser.c:3182 +msgid "_Tools" +msgstr "ツール(_T)" + +#: ../midori/midori-browser.c:3184 ../midori/midori-searchaction.c:496 +msgid "_Manage Search Engines" +msgstr "検索エンジンの管理(_M)" + +#: ../midori/midori-browser.c:3185 +msgid "Add, edit and remove search engines..." +msgstr "検索エンジンの追加、編集、または削除します" + +#: ../midori/midori-browser.c:3189 +msgid "_Previous Tab" +msgstr "前のタブ(_P)" + +#: ../midori/midori-browser.c:3190 +msgid "Switch to the previous tab" +msgstr "前のタブへ切り替えます" + +#: ../midori/midori-browser.c:3192 +msgid "_Next Tab" +msgstr "次のタブ(_N)" + +#: ../midori/midori-browser.c:3193 +msgid "Switch to the next tab" +msgstr "次のタブへ切り替えます" + +#: ../midori/midori-browser.c:3195 +msgid "_Help" +msgstr "ヘルプ(_H)" + +#: ../midori/midori-browser.c:3197 +msgid "_Contents" +msgstr "目次(_C)" + +#: ../midori/midori-browser.c:3198 +msgid "Show the documentation" +msgstr "ドキュメントを表示します" + +#: ../midori/midori-browser.c:3200 +msgid "_Frequent questions" +msgstr "よくある質問(_F)" + +#: ../midori/midori-browser.c:3201 +msgid "Show the Frequently Asked Questions" +msgstr "よくある質問とその答えを表示します" + +#: ../midori/midori-browser.c:3203 +msgid "_Report a bug" +msgstr "バグを報告(_R)" + +#: ../midori/midori-browser.c:3204 +msgid "Open Midori's bug tracker" +msgstr "Midori のバグトラッカーを開きます" + +#: ../midori/midori-browser.c:3207 +msgid "Show information about the program" +msgstr "このプログラムについての情報を表示します" + +#: ../midori/midori-browser.c:3214 +msgid "P_rivate Browsing" +msgstr "プライベートブラウジング(_R)" + +#: ../midori/midori-browser.c:3215 +msgid "Don't save any private data while browsing" +msgstr "閲覧する中で個人データを保存しません" + +#: ../midori/midori-browser.c:3220 +msgid "_Menubar" +msgstr "メニューバー(_M)" + +#: ../midori/midori-browser.c:3221 +msgid "Show menubar" +msgstr "メニューバーを表示します" + +#: ../midori/midori-browser.c:3224 +msgid "_Navigationbar" +msgstr "ナビゲーションバー(_N)" + +#: ../midori/midori-browser.c:3225 +msgid "Show navigationbar" +msgstr "ナビゲーションバーを表示します" + +#: ../midori/midori-browser.c:3228 +msgid "Side_panel" +msgstr "サイドパネル(_P)" + +#: ../midori/midori-browser.c:3229 +msgid "Show sidepanel" +msgstr "サイドパネルを表示します" + +#: ../midori/midori-browser.c:3232 +msgid "_Bookmarkbar" +msgstr "ブックマークバー(_B)" + +#: ../midori/midori-browser.c:3233 +msgid "Show bookmarkbar" +msgstr "ブックマークバーを表示します" + +#: ../midori/midori-browser.c:3236 +msgid "_Transferbar" +msgstr "転送バー(_T)" + +#: ../midori/midori-browser.c:3237 +msgid "Show transferbar" +msgstr "転送バーを表示します" + +#: ../midori/midori-browser.c:3240 +msgid "_Statusbar" +msgstr "ステータスバー(_S)" + +#: ../midori/midori-browser.c:3241 +msgid "Show statusbar" +msgstr "ステータスバーを表示します" + +#: ../midori/midori-browser.c:3686 +msgid "_Location..." +msgstr "場所(_L)..." + +#: ../midori/midori-browser.c:3688 +msgid "Open a particular location" +msgstr "指定された場所を開きます" + +#: ../midori/midori-browser.c:3712 +msgid "_Web Search..." +msgstr "ウェブ検索(_W)" + +#: ../midori/midori-browser.c:3714 +msgid "Run a web search" +msgstr "ウェブ検索を実行します" + +#: ../midori/midori-browser.c:3733 +msgid "Reopen a previously closed tab or window" +msgstr "これまでに閉じられたタブやウィンドウを再び開きます" + +#: ../midori/midori-browser.c:3746 +msgid "_Recently visited pages" +msgstr "最近訪れたページ(_R)" + +#: ../midori/midori-browser.c:3748 +msgid "Reopen pages that you visited earlier" +msgstr "以前に訪れたページを再び開きます" + +#: ../midori/midori-browser.c:3763 +msgid "Show the saved bookmarks" +msgstr "保存されたブックマークを表示します" + +#: ../midori/midori-browser.c:3776 +msgid "_Window" +msgstr "ウィンドウ(_W)" + +#: ../midori/midori-browser.c:3778 +msgid "Show a list of all open tabs" +msgstr "開いているすべてのタブのリストを表示します" + +#: ../midori/midori-browser.c:3900 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: ../midori/midori-browser.c:3943 ../midori/midori-preferences.c:582 +msgid "History" +msgstr "履歴" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3986 +msgid "_Inline find:" +msgstr "インライン検索(_I)" + +#: ../midori/midori-browser.c:4017 +msgid "Match Case" +msgstr "大文字・小文字を区別" + +#: ../midori/midori-browser.c:4025 +msgid "Highlight Matches" +msgstr "強調表示" + +#: ../midori/midori-browser.c:4034 +msgid "Close Findbar" +msgstr "検索バーを閉じる" + +#: ../midori/midori-browser.c:4282 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "'%s' は予想外の設定です" + +#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "パネルを閉じます" + +#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1658 +msgid "Blank page" +msgstr "空白ページ" + +#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 +msgid "Homepage" +msgstr "ホームページ" + +#: ../midori/midori-websettings.c:147 +msgid "Last open pages" +msgstr "最後に開いたページ" + +#: ../midori/midori-websettings.c:162 +msgid "Chinese (BIG5)" +msgstr "中国語 (BIG5)" + +#: ../midori/midori-websettings.c:163 +msgid "Japanese (SHIFT_JIS)" +msgstr "日本語 (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:164 +msgid "Russian (KOI8-R)" +msgstr "ロシア語 (KOI8-R)" + +#: ../midori/midori-websettings.c:165 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:166 +msgid "Western (ISO-8859-1)" +msgstr "西欧 (ISO-8859-1)" + +#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 +msgid "Custom..." +msgstr "カスタム..." + +#: ../midori/midori-websettings.c:182 +msgid "New tab" +msgstr "新しいタブ" + +#: ../midori/midori-websettings.c:183 +msgid "New window" +msgstr "新しいウィンドウ" + +#: ../midori/midori-websettings.c:184 +msgid "Current tab" +msgstr "現在のタブ" + +#: ../midori/midori-websettings.c:199 +msgid "Default" +msgstr "デフォルト" + +#: ../midori/midori-websettings.c:200 +msgid "Icons" +msgstr "アイコン" + +#: ../midori/midori-websettings.c:201 +msgid "Text" +msgstr "文字" + +#: ../midori/midori-websettings.c:202 +msgid "Both" +msgstr "アイコンと文字" + +#: ../midori/midori-websettings.c:203 +msgid "Both horizontal" +msgstr "アイコンと文字 (横方向)" + +#: ../midori/midori-websettings.c:218 +msgid "All cookies" +msgstr "すべての Cookie" + +#: ../midori/midori-websettings.c:219 +msgid "Session cookies" +msgstr "セッションの Cookie" + +#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 +msgid "None" +msgstr "なし" + +#: ../midori/midori-websettings.c:236 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:237 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:238 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:279 +msgid "Remember last window size" +msgstr "最後のウィンドウサイズを記憶する" + +#: ../midori/midori-websettings.c:280 +msgid "Whether to save the last window size" +msgstr "最後のウィンドウサイズを記憶するかどうか指定します" + +#: ../midori/midori-websettings.c:288 +msgid "Last window width" +msgstr "最後のウィンドウの幅" + +#: ../midori/midori-websettings.c:289 +msgid "The last saved window width" +msgstr "最後に保存されたウィンドウ幅" + +#: ../midori/midori-websettings.c:297 +msgid "Last window height" +msgstr "最後のウィンドウの高さ" + +#: ../midori/midori-websettings.c:298 +msgid "The last saved window height" +msgstr "最後に保存されたウィンドウの高さにします" + +#: ../midori/midori-websettings.c:306 +msgid "Last panel position" +msgstr "最後のパネルの位置" + +#: ../midori/midori-websettings.c:307 +msgid "The last saved panel position" +msgstr "最後に保存されたパネルの位置にします" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:316 +msgid "Last panel page" +msgstr "最後のパネルページ" + +#: ../midori/midori-websettings.c:317 +msgid "The last saved panel page" +msgstr "最後に保存されたパネルのページです" + +#: ../midori/midori-websettings.c:325 +msgid "Last Web search" +msgstr "最後のウェブ検索" + +#: ../midori/midori-websettings.c:326 +msgid "The last saved Web search" +msgstr "最後に保存されたウェブ検索です" + +#: ../midori/midori-websettings.c:335 +msgid "Show Menubar" +msgstr "メニューバーを表示する" + +#: ../midori/midori-websettings.c:336 +msgid "Whether to show the menubar" +msgstr "メニューバーを表示するかどうか指定します" + +#: ../midori/midori-websettings.c:344 +msgid "Show Navigationbar" +msgstr "ナビゲーションバーを表示する" + +#: ../midori/midori-websettings.c:345 +msgid "Whether to show the navigationbar" +msgstr "ナビゲーションバーを表示するかどうか指定します" + +#: ../midori/midori-websettings.c:353 +msgid "Show Bookmarkbar" +msgstr "ブックマークバーを表示する" + +#: ../midori/midori-websettings.c:354 +msgid "Whether to show the bookmarkbar" +msgstr "ブックマークバーを表示するかどうか指定します" + +#: ../midori/midori-websettings.c:362 +msgid "Show Panel" +msgstr "パネルを表示する" + +#: ../midori/midori-websettings.c:363 +msgid "Whether to show the panel" +msgstr "パネルを表示するかどうか指定します" + +#: ../midori/midori-websettings.c:371 +msgid "Show Statusbar" +msgstr "ステータスバーを表示する" + +#: ../midori/midori-websettings.c:372 +msgid "Whether to show the statusbar" +msgstr "ステータスバーを表示するかどうか指定します" + +#: ../midori/midori-websettings.c:381 +msgid "Toolbar Style" +msgstr "ツールバー方式" + +#: ../midori/midori-websettings.c:382 +msgid "The style of the toolbar" +msgstr "ツールバーの表示方式を指定します" + +#: ../midori/midori-websettings.c:391 +msgid "Toolbar Items" +msgstr "ツールバーアイテム" + +#: ../midori/midori-websettings.c:392 +msgid "The items to show on the toolbar" +msgstr "ツールバーに表示するアイテムを指定します" + +#: ../midori/midori-websettings.c:400 +msgid "Compact Sidepanel" +msgstr "サイドパネルをコンパクトにする" + +#: ../midori/midori-websettings.c:401 +msgid "Whether to make the sidepanel compact" +msgstr "コンパクトなサイドパネルを表示します" + +#: ../midori/midori-websettings.c:410 +msgid "Load on Startup" +msgstr "起動時に読み込む" + +#: ../midori/midori-websettings.c:411 +msgid "What to load on startup" +msgstr "起動時に読み込むページを指定します" + +#: ../midori/midori-websettings.c:421 +msgid "The homepage" +msgstr "ホームページを指定します" + +#: ../midori/midori-websettings.c:429 +msgid "Download Folder" +msgstr "ダウンロードフォルダ" + +#: ../midori/midori-websettings.c:430 +msgid "The folder downloaded files are saved to" +msgstr "ダウンロードファイルの保存先を指定します" + +#: ../midori/midori-websettings.c:438 +msgid "Download Manager" +msgstr "ダウンロードマネージャ" + +#: ../midori/midori-websettings.c:439 +msgid "An external download manager" +msgstr "外部ダウンロードマネージャを指定します" + +#: ../midori/midori-websettings.c:447 +msgid "Text Editor" +msgstr "テキストエディタ" + +#: ../midori/midori-websettings.c:448 +msgid "An external text editor" +msgstr "外部テキストエディタを指定します" + +#: ../midori/midori-websettings.c:456 +msgid "Location entry Search" +msgstr "ロケーションエントリの検索" + +#: ../midori/midori-websettings.c:457 +msgid "The search to perform inside the location entry" +msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" + +#: ../midori/midori-websettings.c:465 +msgid "Preferred Encoding" +msgstr "文字のエンコーディング" + +#: ../midori/midori-websettings.c:466 +msgid "The preferred character encoding" +msgstr "文字のエンコーディングを指定します" + +#: ../midori/midori-websettings.c:476 +msgid "Always Show Tabbar" +msgstr "常にタブバーを表示する" + +#: ../midori/midori-websettings.c:477 +msgid "Always show the tabbar" +msgstr "常にタブバーを表示します" + +#: ../midori/midori-websettings.c:485 +msgid "Close Buttons on Tabs" +msgstr "タブに閉じるボタンを表示する" + +#: ../midori/midori-websettings.c:486 +msgid "Whether tabs have close buttons" +msgstr "タブに閉じるボタンを表示します" + +#: ../midori/midori-websettings.c:495 +msgid "Open new pages in" +msgstr "新しくページを開くとき" + +#: ../midori/midori-websettings.c:496 +msgid "Where to open new pages" +msgstr "新しいページをどこに開くか指定します" + +#: ../midori/midori-websettings.c:506 +msgid "Open external pages in" +msgstr "外部ページを開くとき" + +#: ../midori/midori-websettings.c:507 +msgid "Where to open externally opened pages" +msgstr "外部のページをどこに開くか指定します" + +#: ../midori/midori-websettings.c:516 +msgid "Middle click opens Selection" +msgstr "選択範囲のミドルクリックで開く" + +#: ../midori/midori-websettings.c:517 +msgid "Load an URL from the selection via middle click" +msgstr "URL を選択してミドルクリックするとその場所を開きます" + +#: ../midori/midori-websettings.c:525 +msgid "Open tabs in the background" +msgstr "タブをバックグラウンドで開く" + +#: ../midori/midori-websettings.c:526 +msgid "Whether to open new tabs in the background" +msgstr "新しいタブをバックグラウンドで開きます" + +#: ../midori/midori-websettings.c:534 +msgid "Open Tabs next to Current" +msgstr "現在のタブの隣に開く" + +#: ../midori/midori-websettings.c:535 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "新しいタブを現在または最後のタブの隣に開きます" + +#: ../midori/midori-websettings.c:543 +msgid "Open popups in tabs" +msgstr "ポップアップをタブに開く" + +#: ../midori/midori-websettings.c:544 +msgid "Whether to open popup windows in tabs" +msgstr "ポップアップウィンドウをタブに開きます" + +#: ../midori/midori-websettings.c:587 +msgid "Accept cookies" +msgstr "Cookie の受け入れ" + +#: ../midori/midori-websettings.c:588 +msgid "What type of cookies to accept" +msgstr "Cookie を受け入れる方式を選択してください" + +#: ../midori/midori-websettings.c:601 +msgid "Original cookies only" +msgstr "オリジナルの Cookie のみ" + +#: ../midori/midori-websettings.c:602 +msgid "Accept cookies from the original website only" +msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" + +#: ../midori/midori-websettings.c:610 +msgid "Maximum cookie age" +msgstr "Cookie の最大保存日数" + +#: ../midori/midori-websettings.c:611 +msgid "The maximum number of days to save cookies for" +msgstr "Cookie を保存する最大の日数です" + +#: ../midori/midori-websettings.c:621 +msgid "Remember last visited pages" +msgstr "最後に訪れたページを記憶する" + +#: ../midori/midori-websettings.c:622 +msgid "Whether the last visited pages are saved" +msgstr "最後に訪れたページを記憶します" + +#: ../midori/midori-websettings.c:630 +msgid "Maximum history age" +msgstr "履歴の最大保存日数" + +#: ../midori/midori-websettings.c:631 +msgid "The maximum number of days to save the history for" +msgstr "履歴を保存する最大の日数です" + +#: ../midori/midori-websettings.c:639 +msgid "Remember last form inputs" +msgstr "最後のフォーム入力を記憶する" + +#: ../midori/midori-websettings.c:640 +msgid "Whether the last form inputs are saved" +msgstr "最後にフォーム入力した内容を記憶します" + +#: ../midori/midori-websettings.c:648 +msgid "Remember last downloaded files" +msgstr "最後のダウンロードファイルを記憶する" + +#: ../midori/midori-websettings.c:649 +msgid "Whether the last downloaded files are saved" +msgstr "最後にダウンロードしたファイルを記憶します" + +#: ../midori/midori-websettings.c:659 +msgid "HTTP Proxy" +msgstr "HTTP プロキシ" + +#: ../midori/midori-websettings.c:660 +msgid "The proxy used for HTTP connections" +msgstr "HTTP 接続でプロキシを使用する場合に設定します" + +#: ../midori/midori-websettings.c:679 +msgid "Identify as" +msgstr "User-Agent" + +#: ../midori/midori-websettings.c:680 +msgid "What to identify as to web pages" +msgstr "ウェブページに報告する User-Agent 識別名を指定します" + +#: ../midori/midori-websettings.c:700 +msgid "Identification string" +msgstr "識別文字列" + +#: ../midori/midori-websettings.c:701 +msgid "The application identification string" +msgstr "User-Agent アプリケーション識別文字列です" + +#: ../midori/midori-websettings.c:713 +msgid "Cache size" +msgstr "キャッシュサイズ" + +#: ../midori/midori-websettings.c:714 +msgid "The allowed size of the cache" +msgstr "キャッシュのサイズを指定します" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:641 +#, c-format +msgid "Not found - %s" +msgstr "ページが見つかりません - %s" + +#: ../midori/midori-view.c:921 +msgid "Open Link in New _Tab" +msgstr "リンクを新しいタブで開く(_T)" + +#: ../midori/midori-view.c:944 +msgid "_Save Link destination" +msgstr "リンク先を保存(_S)" + +#: ../midori/midori-view.c:952 +msgid "_Download Link destination" +msgstr "リンク先をダウンロード(_D)" + +#: ../midori/midori-view.c:974 +msgid "Open URL in New _Tab" +msgstr "URL を新しいタブで開く(_T)" + +#: ../midori/midori-view.c:1382 +#, c-format +msgid "Inspect page - %s" +msgstr "ページの調査 - %s" + +#: ../midori/midori-view.c:1522 +msgid "Source" +msgstr "ソース" + +#: ../midori/midori-view.c:1546 +#, c-format +msgid "No documentation installed" +msgstr "ドキュメントはインストールされていません" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "%s の設定" + +#. Page "General" +#: ../midori/midori-preferences.c:369 +msgid "General" +msgstr "一般" + +#: ../midori/midori-preferences.c:370 +msgid "Startup" +msgstr "起動" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:417 +msgid "Appearance" +msgstr "外観" + +#: ../midori/midori-preferences.c:418 +msgid "Font settings" +msgstr "フォント設定" + +#: ../midori/midori-preferences.c:420 +msgid "Default Font Family" +msgstr "デフォルトフォントファミリ" + +#: ../midori/midori-preferences.c:428 +msgid "Minimum Font Size" +msgstr "最大フォントサイズ" + +#: ../midori/midori-preferences.c:437 +msgid "Encoding" +msgstr "エンコーディング" + +#: ../midori/midori-preferences.c:440 +msgid "The character encoding to use by default" +msgstr "デフォルトで使用する文字エンコーディングです" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:447 +msgid "Behavior" +msgstr "振る舞い" + +#: ../midori/midori-preferences.c:448 +msgid "Features" +msgstr "機能" + +#: ../midori/midori-preferences.c:451 ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "画像を自動的に読み込む" + +#: ../midori/midori-preferences.c:454 +msgid "Shrink images automatically" +msgstr "画像を自動的に縮小する" + +#: ../midori/midori-preferences.c:457 +msgid "Print background images" +msgstr "背景画像を印刷する" + +#: ../midori/midori-preferences.c:460 +msgid "Resizable text areas" +msgstr "テキストエリアのサイズを変更可能にする" + +#: ../midori/midori-preferences.c:463 ../extensions/statusbar-features.c:39 +msgid "Enable scripts" +msgstr "スクリプトを有効にする" + +#: ../midori/midori-preferences.c:466 ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "プラグインを有効にする" + +#: ../midori/midori-preferences.c:469 +msgid "Enable developer tools" +msgstr "開発ツールを有効にする" + +#: ../midori/midori-preferences.c:472 +msgid "Enforce 96 DPI" +msgstr "強制的に 96DPI にする" + +#. Page "Interface" +#: ../midori/midori-preferences.c:480 +msgid "Interface" +msgstr "インターフェイス" + +#: ../midori/midori-preferences.c:481 +msgid "Navigationbar" +msgstr "ナビゲーションバー" + +#: ../midori/midori-preferences.c:497 +msgid "Browsing" +msgstr "ブラウジング" + +#: ../midori/midori-preferences.c:528 ../midori/midori-preferences.c:529 +msgid "Network" +msgstr "ネットワーク" + +#: ../midori/midori-preferences.c:551 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:558 +msgid "Privacy" +msgstr "プライバシー" + +#: ../midori/midori-preferences.c:564 +msgid "Web Cookies" +msgstr "ウェブ Cookie" + +#: ../midori/midori-preferences.c:577 ../midori/midori-preferences.c:589 +msgid "days" +msgstr "日" + +#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "空" + +#: ../midori/midori-searchaction.c:824 +msgid "Add search engine" +msgstr "検索エンジンの追加" + +#: ../midori/midori-searchaction.c:824 +msgid "Edit search engine" +msgstr "検索エンジンの編集" + +#: ../midori/midori-searchaction.c:852 +msgid "_Name:" +msgstr "名前(_N):" + +#: ../midori/midori-searchaction.c:896 +msgid "_Icon (name or file):" +msgstr "アイコン名/ファイル(_I):" + +#: ../midori/midori-searchaction.c:910 +msgid "_Token:" +msgstr "トークン(_T):" + +#: ../midori/midori-searchaction.c:1087 +msgid "Manage search engines" +msgstr "検索エンジンの管理" + +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +msgid "Could not run external program." +msgstr "外部プログラムを実行できませんでした。" + +#: ../midori/sokoke.c:340 +msgid "Warning: You are using a superuser account!" +msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s にはプロパティ '%s' はありません" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s は %s.%s に割り当てることはできません" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s にアクセスできません" + +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +msgid "Userscripts" +msgstr "ユーザスクリプト" + +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +msgid "Userstyles" +msgstr "ユーザスタイル" + +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "有効(_E)" + +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "無効(_D)" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "コンソール" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "エクステンション" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "アイコン名 '%s' を読み込めませんでした" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "ストックアイコン '%s' を読み込めませんでした" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "アニメーションフレームは壊れています" + +#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "'%s' は %s のプロパティとして無効です" + +#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 +msgid "Choose file" +msgstr "ファイルの選択" + +#: ../katze/katze-utils.c:231 +msgid "Choose folder" +msgstr "フォルダの選択" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "ページホルダ" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "ページホルダ(_P)" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "画像" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "スクリプト" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "プラグイン" From 5d7dc29842dc38da01152aebf0f3588b180817aa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jan 2009 03:52:43 +0100 Subject: [PATCH 0607/2970] Allow choosing a folder when adding a bookmark --- midori/midori-browser.c | 75 +++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6ae4d153..f98577eb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -502,7 +502,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* combo_folder; GtkTreeView* treeview; GtkTreeModel* treemodel; - GtkTreeIter iter; dialog = gtk_dialog_new_with_buttons ( new_bookmark ? _("New bookmark") : _("Edit bookmark"), @@ -573,6 +572,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, combo_folder = NULL; if (new_bookmark) { + guint i, n; + hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); label = gtk_label_new_with_mnemonic (_("_Folder:")); @@ -580,7 +581,19 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); combo_folder = gtk_combo_box_new_text (); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Root")); - gtk_widget_set_sensitive (combo_folder, FALSE); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); + if ((n = katze_array_get_length (browser->bookmarks))) + for (i = 0; i < n; i++) + { + KatzeItem* item = katze_array_get_nth_item (browser->bookmarks, i); + if (KATZE_IS_ARRAY (item)) + { + const gchar* name = katze_item_get_name (item); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), name); + } + } + else + gtk_widget_set_sensitive (combo_folder, FALSE); gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); gtk_widget_show_all (hbox); @@ -589,6 +602,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { + gchar* selected; + KatzeArray* folder; + GtkTreeIter iter; + GtkTreeIter* piter; + katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); katze_item_set_text (bookmark, @@ -597,18 +615,44 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); - /* FIXME: We want to choose a folder */ + selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); + if (g_strcmp0 (selected, _("Root"))) + { + treeview = GTK_TREE_VIEW (browser->panel_bookmarks); + treemodel = gtk_tree_view_get_model (treeview); + if (gtk_tree_model_iter_children (treemodel, &iter, NULL)) + { + KatzeItem* item; + + do + { + gtk_tree_model_get (treemodel, &iter, 0, &item, -1); + + if (!g_strcmp0 (katze_item_get_name (item), selected)) + break; + } + while (gtk_tree_model_iter_next (treemodel, &iter)); + + folder = KATZE_ARRAY (item); + } + else + folder = browser->bookmarks; + } + else + folder = browser->bookmarks; + g_free (selected); + + piter = (folder == browser->bookmarks ? NULL : &iter); + if (new_bookmark) { - katze_array_add_item (browser->bookmarks, bookmark); + katze_array_add_item (folder, bookmark); treeview = GTK_TREE_VIEW (browser->panel_bookmarks); treemodel = gtk_tree_view_get_model (treeview); gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), - &iter, NULL, G_MAXINT, 0, bookmark, -1); + &iter, piter, G_MAXINT, 0, bookmark, -1); g_object_ref (bookmark); } - - /* FIXME: Update panel in other windows */ } gtk_widget_destroy (dialog); } @@ -2596,7 +2640,7 @@ midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); - g_assert (KATZE_IS_ITEM (item)); + g_assert (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) g_object_set (renderer, "markup", NULL, @@ -2946,11 +2990,6 @@ _action_history_clear_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* dialog; - GtkTreeView* tree_view; - GtkTreeStore* store; - KatzeItem* item; - GtkAction* location_action; - gint i, n; gint result; if (!browser->history) @@ -4376,7 +4415,6 @@ midori_browser_bookmarks_clear_cb (KatzeArray* bookmarks, { GtkTreeView* treeview; GtkTreeStore* store; - GtkAction* location_action; treeview = GTK_TREE_VIEW (browser->panel_bookmarks); store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); @@ -4461,9 +4499,12 @@ midori_browser_set_property (GObject* object, midori_browser_settings_notify, browser); katze_object_assign (browser->settings, g_value_dup_object (value)); - _midori_browser_update_settings (browser); - g_signal_connect (browser->settings, "notify", - G_CALLBACK (midori_browser_settings_notify), browser); + if (browser->settings) + { + _midori_browser_update_settings (browser); + g_signal_connect (browser->settings, "notify", + G_CALLBACK (midori_browser_settings_notify), browser); + } gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) midori_view_set_settings, browser->settings); break; From dcd6714d236cd40b256e844673867d7560c38026 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jan 2009 04:05:26 +0100 Subject: [PATCH 0608/2970] Don't use GJS types here, it isn't actually used --- midori/midori-browser.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f98577eb..290cc771 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -27,7 +27,6 @@ #include "gtkiconentry.h" #include "compat.h" #include "sokoke.h" -#include "gjs.h" #include #include @@ -2068,7 +2067,7 @@ _action_location_secondary_icon_released (GtkAction* action, KatzeArray* news_feeds; GtkWidget* menu; guint n, i; - GjsValue* feed; + KatzeItem* feed; const gchar* uri; const gchar* title; GtkWidget* menuitem; @@ -2086,12 +2085,9 @@ _action_location_secondary_icon_released (GtkAction* action, if (!(feed = katze_array_get_nth_item (news_feeds, i))) continue; - uri = gjs_value_get_attribute_string (feed, "href"); - if (gjs_value_has_attribute (feed, "title")) - title = gjs_value_get_attribute_string (feed, "title"); - else - title = uri; - if (!*title) + uri = katze_item_get_uri (feed); + title = katze_item_get_name (feed); + if (!(title && *title)) title = uri; menuitem = sokoke_image_menu_item_new_ellipsized (title); /* FIXME: Get the real icon */ From b494c1b5e6c84bb8167ddb27fc4cd80d4c258ef3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jan 2009 04:29:45 +0100 Subject: [PATCH 0609/2970] Update German translation --- po/de.po | 847 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 463 insertions(+), 384 deletions(-) diff --git a/po/de.po b/po/de.po index dbadcc63..d97bd720 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-11-29 22:04+0100\n" +"POT-Creation-Date: 2009-01-01 04:07+0100\n" +"PO-Revision-Date: 2009-01-01 04:18+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,8 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 +#: ../midori/main.c:1928 ../midori/main.c:1939 +#: ../midori/midori-websettings.c:235 msgid "Midori" msgstr "Midori" @@ -30,238 +31,280 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:86 +#: ../midori/main.c:87 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:88 ../midori/midori-browser.c:3796 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/main.c:88 +#: ../midori/main.c:89 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Console" msgstr "_Konsole" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/main.c:91 +#: ../midori/main.c:92 msgid "_History" msgstr "_Verlauf" -#: ../midori/main.c:92 +#: ../midori/main.c:93 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:93 +#: ../midori/main.c:94 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/main.c:94 +#: ../midori/main.c:95 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/main.c:95 +#: ../midori/main.c:96 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:96 +#: ../midori/main.c:97 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/main.c:97 +#: ../midori/main.c:98 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/main.c:98 +#: ../midori/main.c:99 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:143 +#: ../midori/main.c:155 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:210 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:217 ../midori/main.c:287 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:532 +#: ../midori/main.c:529 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:537 ../midori/main.c:546 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:568 ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:678 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:711 ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:841 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "Schreiben fehlgeschlagen." - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Übertragungen" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "Die Sitzung konnte nicht geladen werden. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "Angegebenen Dateinamen als Javaskript ausführen" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Programmversion anzeigen" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URIs" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URIs]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Informieren Sie sich über neue Versionen unter:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "Kein Dateiname angegeben" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Die Sitzung konnte nicht geladen werden: %s\n" - -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" - -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "Der Verlauf konnte nicht geladen werden: %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "Folgende Fehler sind aufgetreten:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "_Ignorieren" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Die Lesezeichen konnten nicht geladen werden. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Der Papierkorb konnte nicht geladen werden. %s" - -#: ../midori/main.c:1715 +#: ../midori/main.c:869 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:897 ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" + +#: ../midori/main.c:1045 ../midori/sokoke.c:517 +#, c-format +msgid "Writing failed." +msgstr "Schreiben fehlgeschlagen." + +#: ../midori/main.c:1075 ../midori/main.c:1100 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Die Lesezeichen konnten nicht geladen werden. %s" + +#: ../midori/main.c:1123 ../midori/main.c:1147 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Der Papierkorb konnte nicht geladen werden. %s" + +#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 +msgid "Transfers" +msgstr "Übertragungen" + +#: ../midori/main.c:1204 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Die Sitzung konnte nicht geladen werden. %s" + +#: ../midori/main.c:1530 +msgid "Authentication Required" +msgstr "Authentifizierung erforderlich" + +#: ../midori/main.c:1546 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "Ein Benutzername und ein Kennwort\n" +"werden zum öffnen dieses Ortes benötigt:" + +#: ../midori/main.c:1560 +msgid "Username" +msgstr "Benutzername" + +#: ../midori/main.c:1571 +msgid "Password" +msgstr "Kennwort" + +#: ../midori/main.c:1675 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet " +"wurde. Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." + +#: ../midori/main.c:1690 +msgid "Modify _preferences" +msgstr "_Einstellungen bearbeiten" + +#: ../midori/main.c:1694 +msgid "Reset the last _session" +msgstr "Die letzte _Sitzung zurücksetzen" + +#: ../midori/main.c:1699 +msgid "Disable all _extensions" +msgstr "Alle Er_weiterungen ausschalten" + +#: ../midori/main.c:1828 +msgid "No filename specified" +msgstr "Kein Dateiname angegeben" + +#: ../midori/main.c:1857 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Ein unbekannter Fehler ist aufgetreten." + +#: ../midori/main.c:1880 +msgid "Run the specified filename as javascript" +msgstr "Angegebenen Dateinamen als Javaskript ausführen" + +#: ../midori/main.c:1882 +msgid "Display program version" +msgstr "Programmversion anzeigen" + +#: ../midori/main.c:1884 +msgid "URIs" +msgstr "URIs" + +#: ../midori/main.c:1916 +msgid "[URIs]" +msgstr "[URIs]" + +#: ../midori/main.c:1940 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" + +#: ../midori/main.c:1942 +msgid "Check for new versions at:" +msgstr "Informieren Sie sich über neue Versionen unter:" + +#: ../midori/main.c:1965 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" + +#: ../midori/main.c:2024 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" + +#: ../midori/main.c:2039 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Die Sitzung konnte nicht geladen werden: %s\n" + +#: ../midori/main.c:2052 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" + +#: ../midori/main.c:2065 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Der Verlauf konnte nicht geladen werden: %s\n" + +#: ../midori/main.c:2077 +msgid "The following errors occured:" +msgstr "Folgende Fehler sind aufgetreten:" + +#: ../midori/main.c:2093 +msgid "_Ignore" +msgstr "_Ignorieren" + +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3160 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3157 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 msgid "_Description:" msgstr "_Beschreibung" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 msgid "_URL:" msgstr "_URL:" @@ -269,440 +312,440 @@ msgstr "_URL:" msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:582 +#: ../midori/midori-browser.c:582 ../midori/midori-browser.c:618 msgid "Root" msgstr "Wurzel" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:711 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1291 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2368 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2370 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2645 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2756 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2762 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2769 msgid "Today" msgstr "Heute" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2771 msgid "Yesterday" msgstr "Gestern" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2860 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2868 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:2997 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3088 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3091 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3094 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3097 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3100 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3103 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3106 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3109 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3112 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3120 ../midori/midori-browser.c:3123 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3129 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3132 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3135 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3137 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3138 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3140 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3141 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3144 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:1017 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3174 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3175 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3181 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3184 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3187 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3190 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3192 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3195 ../midori/midori-view.c:989 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3215 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3217 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3219 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3220 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3224 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3227 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3228 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3230 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3233 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Frequent questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3238 msgid "_Report a bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3242 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3249 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3250 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3255 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3256 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3259 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3260 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3263 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3264 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3267 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3268 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3271 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3272 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3275 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3276 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3721 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3723 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3747 msgid "_Web Search..." msgstr "_Netzsuche…" -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3749 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3768 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3781 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3783 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3798 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3811 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3813 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:3935 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3978 ../midori/midori-preferences.c:582 msgid "History" msgstr "Verlauf" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:4021 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:4052 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4060 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4069 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4317 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -711,565 +754,601 @@ msgstr "Unerwartete Einstellung »%s«" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1658 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:147 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:162 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:163 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:164 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-r)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:165 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:166 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 msgid "Custom..." -msgstr "Benutzerdefinidert…" +msgstr "Benutzerdefiniert…" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:182 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:183 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:184 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:199 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:200 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:201 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:202 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:203 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:218 msgid "All cookies" msgstr "Alle Kekse" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Session cookies" msgstr "Sitzungskekse" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:236 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:237 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:238 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:279 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:280 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:288 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:289 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:297 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:298 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:306 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:307 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:316 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:317 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:325 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:326 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:335 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:344 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:353 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:354 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:362 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:363 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:371 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:372 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:381 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:382 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:391 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:392 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:400 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:401 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:411 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:421 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:429 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:430 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:438 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:439 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:447 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:448 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:456 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:457 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:465 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:466 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:476 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:477 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:485 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:486 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:495 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:496 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:506 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:507 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:516 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:517 msgid "Load an URL from the selection via middle click" msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:525 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:526 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:534 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:535 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:543 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:544 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:587 msgid "Accept cookies" msgstr "Kekse annehmen" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:588 msgid "What type of cookies to accept" msgstr "Welche Art von Keksen akzeptiert werden" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:601 msgid "Original cookies only" msgstr "Nur ursprüngliche Kekse" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:602 msgid "Accept cookies from the original website only" msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:610 msgid "Maximum cookie age" msgstr "Maximales Keksalter" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:611 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:621 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:622 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:630 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:631 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:639 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:640 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:648 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:649 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:659 msgid "HTTP Proxy" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:660 msgid "The proxy used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:679 +msgid "Identify as" +msgstr "Ausgeben als" + +#: ../midori/midori-websettings.c:680 +msgid "What to identify as to web pages" +msgstr "Wie gegenüber Netzseiten identifiziert werden soll" + +#: ../midori/midori-websettings.c:700 +msgid "Identification string" +msgstr "Identifikationskennung" + +#: ../midori/midori-websettings.c:701 +msgid "The application identification string" +msgstr "Die Identifikationskennung der Anwedung" + +#: ../midori/midori-websettings.c:713 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:714 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:641 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:921 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:944 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:952 msgid "_Download Link destination" msgstr "Verweisziel _herunterladen" -#: ../midori/midori-view.c:955 +#: ../midori/midori-view.c:974 msgid "Open URL in New _Tab" msgstr "URL in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1382 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1522 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:1546 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:369 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:370 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:417 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:418 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:420 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:428 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" +#: ../midori/midori-preferences.c:437 +msgid "Encoding" +msgstr "Zeichensatz" + +#: ../midori/midori-preferences.c:440 +msgid "The character encoding to use by default" +msgstr "Der voreingestellte Zeichensatz" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:447 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:448 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:451 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:454 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:457 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:460 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:463 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:466 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:469 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" +#: ../midori/midori-preferences.c:472 +msgid "Enforce 96 DPI" +msgstr "Erzwinge 96 DPI" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:480 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:481 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:497 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:528 ../midori/midori-preferences.c:529 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:551 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:558 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:564 msgid "Web Cookies" msgstr "Netzkekse" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:577 ../midori/midori-preferences.c:589 msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:852 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:896 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:910 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1060 +#: ../midori/midori-searchaction.c:1087 msgid "Manage search engines" msgstr "Suchmaschinen verwalten" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:282 +#: ../midori/sokoke.c:340 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Ein unbekannter Fehler ist aufgetreten." - #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1285,19 +1364,19 @@ msgstr "%s kann %s.%s nicht zugewiesen werden" msgid "%s.%s cannot be accessed" msgstr "Auf %s.%s kann nicht zugegriffen werden" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Benutzerstile" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Einschalten" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Auschalten" @@ -1323,16 +1402,16 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:231 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" From 6821cb4bd6c83ec26f480d267569a56e0bb4b394 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 2 Jan 2009 01:38:23 +0100 Subject: [PATCH 0610/2970] Allow for a NULL widget in katze_net_load_icon --- katze/katze-net.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 0777a2bb..fcfed106 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -391,7 +391,8 @@ static void katze_net_icon_priv_free (KatzeNetIconPriv* priv) { g_free (priv->icon_file); - g_object_unref (priv->widget); + if (priv->widget) + g_object_unref (priv->widget); g_free (priv); } @@ -462,8 +463,16 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, } if (!pixbuf) - pixbuf = gtk_widget_render_icon (priv->widget, - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + { + if (priv->widget) + pixbuf = gtk_widget_render_icon (priv->widget, + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + else + { + priv->icon_cb (NULL, priv->user_data); + katze_net_icon_priv_free (priv); + } + } gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR); @@ -478,7 +487,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, * @net: a #KatzeNet * @uri: an URI string, or %NULL * @icon_cb: function to call upon completion - * @widget: a related #GtkWidget + * @widget: a related #GtkWidget, or %NULL * @user_data: data to pass to the callback * * Requests a transfer of an icon for @uri. This is @@ -489,7 +498,9 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, * the same over multiple requests, plus it may * be scaled to fit the menu icon size. * - * The @widget is needed for theming information. + * Pass a valid #GtkWidget to @widget if you want + * a themed default icon in case of a missing icon, + * otherwise %NULL will be returned in that case. * * The caller is expected to use the returned icon * and update it if @icon_cb is called. @@ -501,6 +512,10 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, * Note that both the returned #GdkPixbuf and the * icon passed to @icon_cb are newly allocated and * the caller owns the reference. + * + * Since 0.1.2 @widget can be %NULL. + * + * Return value: a #GdkPixbuf, or %NULL **/ GdkPixbuf* katze_net_load_icon (KatzeNet* net, @@ -518,7 +533,7 @@ katze_net_load_icon (KatzeNet* net, GdkPixbuf* pixbuf_scaled; g_return_val_if_fail (KATZE_IS_NET (net), NULL); - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); + g_return_val_if_fail (!widget || GTK_IS_WIDGET (widget), NULL); pixbuf = NULL; if (uri && (g_str_has_prefix (uri, "http://") || @@ -554,7 +569,7 @@ katze_net_load_icon (KatzeNet* net, priv->net = net; priv->icon_file = icon_file; priv->icon_cb = icon_cb; - priv->widget = g_object_ref (widget); + priv->widget = widget ? g_object_ref (widget) : NULL; priv->user_data = user_data; katze_net_load_uri (net, icon_uri, @@ -565,8 +580,13 @@ katze_net_load_icon (KatzeNet* net, } if (!pixbuf) - pixbuf = gtk_widget_render_icon (widget, - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + { + if (widget) + pixbuf = gtk_widget_render_icon (widget, + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + else + return NULL; + } gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR); From 813a29de94ece51d3e95e0f333649ba61cdee9f6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 2 Jan 2009 02:28:04 +0100 Subject: [PATCH 0611/2970] Obtain the MIME type from WebKit, for the icon and View Source --- midori/midori-view.c | 107 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 99 insertions(+), 8 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 91c402c4..f984abbb 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -19,7 +19,6 @@ #include "compat.h" #include "sokoke.h" -/* #include "gjs.h" */ #include #include @@ -38,6 +37,7 @@ struct _MidoriView gchar* uri; gchar* title; + gchar* mime_type; GdkPixbuf* icon; gdouble progress; MidoriLoadStatus load_status; @@ -115,6 +115,7 @@ enum PROP_URI, PROP_TITLE, + PROP_MIME_TYPE, PROP_ICON, PROP_LOAD_STATUS, PROP_PROGRESS, @@ -429,6 +430,22 @@ midori_view_class_init (MidoriViewClass* class) NULL, G_PARAM_READWRITE)); + /** + * MidoriView:mime-type: + * + * The MIME type of the currently loaded page. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_MIME_TYPE, + g_param_spec_string ( + "mime-type", + "MIME Type", + "The MIME type of the currently loaded page", + "text/html", + G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_ICON, g_param_spec_object ( @@ -493,7 +510,7 @@ midori_view_class_init (MidoriViewClass* class) "Settings", "The associated settings", MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_READWRITE)); + flags)); g_object_class_install_property (gobject_class, PROP_NET, @@ -505,13 +522,56 @@ midori_view_class_init (MidoriViewClass* class) flags)); } +static GdkPixbuf* +midori_view_mime_icon (GtkIconTheme* icon_theme, + const gchar* format, + const gchar* part1, + const gchar* part2) +{ + gchar* name; + GdkPixbuf* icon; + + name = part2 ? g_strdup_printf (format, part1, part2) + : g_strdup_printf (format, part1); + icon = gtk_icon_theme_load_icon (icon_theme, name, 16, 0, NULL); + g_free (name); + return icon ? g_object_ref (icon) : NULL; +} + static void midori_view_update_icon (MidoriView* view, GdkPixbuf* icon) { if (!icon) - icon = gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + { + GdkScreen* screen; + GtkIconTheme* icon_theme; + gchar** parts; + + if ((screen = gtk_widget_get_screen (GTK_WIDGET (view)))) + { + icon_theme = gtk_icon_theme_get_for_screen (screen); + parts = g_strsplit (view->mime_type, "/", 2); + } + else + parts = NULL; + + if (parts && parts[0] && parts[1]) + icon = midori_view_mime_icon (icon_theme, "%s-%s", + parts[0], parts[1]); + if (!icon && parts && parts[0] && parts[1]) + icon = midori_view_mime_icon (icon_theme, "gnome-mime-%s-%s", + parts[0], parts[1]); + if (!icon && parts && parts[0]) + icon = midori_view_mime_icon (icon_theme, "%s-x-generic", + parts[0], NULL); + if (!icon && parts && parts[0]) + icon = midori_view_mime_icon (icon_theme, "gnome-mime-%s-x-generic", + parts[0], NULL); + if (!icon) + icon = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); + } katze_object_assign (view->icon, icon); g_object_notify (G_OBJECT (view), "icon"); @@ -535,7 +595,7 @@ static void _midori_web_view_load_icon (MidoriView* view) { GdkPixbuf* pixbuf = katze_net_load_icon (view->net, view->uri, - (KatzeNetIconCb)midori_view_icon_cb, GTK_WIDGET (view), view); + (KatzeNetIconCb)midori_view_icon_cb, NULL, view); midori_view_update_icon (view, pixbuf); } @@ -1072,6 +1132,27 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, return MIDORI_VIEW (new_view)->web_view; } +static gboolean +webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + gpointer request, + const gchar* mime_type, + gpointer decision, + MidoriView* view) +{ + if (web_frame != webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) + return FALSE; + + katze_assign (view->mime_type, g_strdup (mime_type)); + midori_view_update_icon (view, NULL); + g_object_notify (G_OBJECT (view), "mime-type"); + + /* TODO: Display contents with a Viewable if WebKit can't do it */ + /* TODO: Offer to download file if it cannot be displayed at all */ + + return TRUE; +} + static void webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* message, @@ -1105,6 +1186,7 @@ midori_view_init (MidoriView* view) { view->uri = NULL; view->title = NULL; + view->mime_type = g_strdup ("text/html"); view->icon = gtk_widget_render_icon (GTK_WIDGET (view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); view->progress = 0.0; @@ -1112,7 +1194,6 @@ midori_view_init (MidoriView* view) view->statusbar_text = NULL; view->link_uri = NULL; view->selected_text = NULL; - view->settings = midori_web_settings_new (); view->item = NULL; view->download_manager = NULL; @@ -1467,8 +1548,11 @@ midori_view_construct_web_view (MidoriView* view) g_object_connect (view->web_view, "signal::create-web-view", webkit_web_view_create_web_view_cb, view, - /*"signal::web-view-ready", - webkit_web_view_web_view_ready_cb, view,*/ + NULL); + if (g_signal_lookup ("mime-type-policy-decision-requested", WEBKIT_TYPE_WEB_VIEW)) + g_object_connect (view->web_view, + "signal::mime-type-policy-decision-requested", + webkit_web_view_mime_type_decision_cb, view, NULL); g_object_connect (web_frame, "signal::load-done", @@ -2140,8 +2224,15 @@ midori_view_can_zoom_out (MidoriView* view) gboolean midori_view_can_view_source (MidoriView* view) { + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + const gchar* uri = view->uri; + /* FIXME: Consider other types that are also text */ + if (!g_str_has_prefix (view->mime_type, "text/") + && !g_strrstr (view->mime_type, "xml")) + return FALSE; + #if HAVE_LIBSOUP if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) return TRUE; From ac146cbd78034e6a8d4dc556e7016e8b6770d0dd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 2 Jan 2009 23:15:01 +0100 Subject: [PATCH 0612/2970] Append the search term if a search lacks a '%s' --- midori/sokoke.c | 7 ++++++- tests/magic-uri.c | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 2071f734..54f946e8 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -187,7 +187,12 @@ sokoke_magic_uri (const gchar* uri, } g_free (parts); if (search_uri) - search = g_strdup_printf (search_uri, parts[1]); + { + if (strstr (search_uri, "%s")) + search = g_strdup_printf (search_uri, parts[1]); + else + search = g_strdup_printf ("%s%s", search_uri, parts[1]); + } return search; } return g_strdup (uri); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 7fda317a..5192fac3 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -32,6 +32,12 @@ main (int argc, "uri", "http://www.searchmash.com/search/%s", "token", "sm", NULL); katze_array_add_item (search_engines, item); + g_object_unref (item); + item = g_object_new (KATZE_TYPE_ITEM, + "uri", "http://www.searchmash.com/search/", + "token", "se", NULL); + katze_array_add_item (search_engines, item); + g_object_unref (item); #define test_input(input, expected) \ uri = sokoke_magic_uri (input, search_engines); \ @@ -65,6 +71,7 @@ main (int argc, test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); test_input ("sm midori", SM "midori"); test_input ("sm cats dogs", SM "cats dogs"); + test_input ("se cats dogs", SM "cats dogs"); test_input ("dict midori", NULL); test_input ("cats", NULL); test_input ("cats dogs", NULL); From ef57dfb59459d70c023da904b74e4922970c97ba Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 4 Jan 2009 17:51:33 +0100 Subject: [PATCH 0613/2970] Update Russian translation --- AUTHORS | 1 + po/ru.po | 1231 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 648 insertions(+), 584 deletions(-) diff --git a/AUTHORS b/AUTHORS index 73e22467..68f24229 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,6 +41,7 @@ Translations: pl: Lukasz Romanowicz pt_PT: Sérgio Marques ru: Troitskiy Nikita + ru: Anton Shestakov sv: Mikael Magnusson tr: Mirat Can Bayrak uk: Dmitry Nikitin diff --git a/po/ru.po b/po/ru.po index 03b1f955..03ac73e1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,15 +1,16 @@ -# Russian translation for midori package. +# Russian translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Troitskiy Nikita 2008 +# Anton Shestakov 2008 # msgid "" msgstr "" -"Project-Id-Version: midori 0.0.21\n" +"Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-09-10 00:35+0300\n" -"Last-Translator: Troitskiy Nikita \n" +"POT-Creation-Date: 2009-01-04 18:58+0800\n" +"PO-Revision-Date: 2009-01-04 19:44+0800\n" +"Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,8 +20,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный обозреватель интернет" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1828 +#: ../midori/main.c:1919 +#: ../midori/main.c:1928 +#: ../midori/main.c:1939 +#: ../midori/midori-websettings.c:235 msgid "Midori" msgstr "Midori" @@ -28,238 +33,293 @@ msgstr "Midori" msgid "Web Browser" msgstr "Обозреватель интернет" -#: ../midori/main.c:86 +#: ../midori/main.c:87 msgid "_Bookmark" msgstr "Закладка" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:88 +#: ../midori/midori-browser.c:3796 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/main.c:88 +#: ../midori/main.c:89 msgid "_Add Bookmark" msgstr "_Добавить закладку" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Console" msgstr "_Консоль" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/main.c:91 -msgid "_History" -msgstr "_История" - #: ../midori/main.c:92 +msgid "_History" +msgstr "_Журнал" + +#: ../midori/main.c:93 msgid "_Homepage" msgstr "Домашняя страница" -#: ../midori/main.c:93 -msgid "_Userscripts" -msgstr "_Скрипты пользователя" - #: ../midori/main.c:94 -msgid "User_styles" -msgstr "_Стили пользователя" +msgid "_Userscripts" +msgstr "_Сценарии пользователя" #: ../midori/main.c:95 -msgid "New _Tab" -msgstr "Новая Вкладка" +msgid "User_styles" +msgstr "С_тили пользователя" #: ../midori/main.c:96 +msgid "New _Tab" +msgstr "Но_вая вкладка" + +#: ../midori/main.c:97 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/main.c:97 -msgid "_Closed Tabs and Windows" -msgstr "_Закрытые вкладки и окна" - #: ../midori/main.c:98 +msgid "_Closed Tabs and Windows" +msgstr "З_акрытые вкладки и окна" + +#: ../midori/main.c:99 msgid "New _Window" -msgstr "Новое окно" +msgstr "_Новое окно" -#: ../midori/main.c:143 -#, fuzzy, c-format +#: ../midori/main.c:155 +#, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Настройки не могут быть загружены. %s\n" +msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:210 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "Значение '%s' недействительно для %s" +msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:205 ../midori/main.c:275 -#, fuzzy, c-format +#: ../midori/main.c:217 +#: ../midori/main.c:287 +#, c-format msgid "Invalid configuration value '%s'" -msgstr "Неподдерживаемое значение параметра %s" +msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:532 +#: ../midori/main.c:529 msgid "File not found." -msgstr "Файл не найден" +msgstr "Файл не найден." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:537 +#: ../midori/main.c:546 msgid "Malformed document." -msgstr "Плохо сформированный документ" +msgstr "Плохо сформированный документ." -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:568 +#: ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:678 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:711 +#: ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" -msgstr "" +msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:841 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 +#: ../midori/main.c:869 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Не удалось сохранить настройки. %s" + +#: ../midori/main.c:897 +#: ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Не удалось сохранить средства поиска. %s" + +#: ../midori/main.c:1045 +#: ../midori/sokoke.c:522 #, c-format msgid "Writing failed." -msgstr "Запись завершилась неудачей" +msgstr "Ошибка записи." -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 +#: ../midori/main.c:1075 +#: ../midori/main.c:1100 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Не удалось сохранить закладки. %s" + +#: ../midori/main.c:1123 +#: ../midori/main.c:1147 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Не удалось сохранить содержимое корзины. %s" + +#: ../midori/main.c:1168 +#: ../midori/midori-preferences.c:381 msgid "Transfers" msgstr "Передачи" -#: ../midori/main.c:1040 +#: ../midori/main.c:1204 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Сессия не может быть сохранена. %s" +msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" +#: ../midori/main.c:1530 +msgid "Authentication Required" +msgstr "Требуется авторизация" + +#: ../midori/main.c:1546 +msgid "" +"A username and a password are required\n" +"to open this location:" msgstr "" +"Для просмотра этой страницы требуются\n" +"имя пользователя и пароль:" -#: ../midori/main.c:1299 +#: ../midori/main.c:1560 +msgid "Username" +msgstr "Имя пользователя" + +#: ../midori/main.c:1571 +msgid "Password" +msgstr "Пароль" + +#: ../midori/main.c:1675 +msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." + +#: ../midori/main.c:1690 +msgid "Modify _preferences" +msgstr "Изменить _параметры" + +#: ../midori/main.c:1694 +msgid "Reset the last _session" +msgstr "Удалить _данные последнего сеанса" + +#: ../midori/main.c:1699 +msgid "Disable all _extensions" +msgstr "Отключить все _расширения" + +#: ../midori/main.c:1828 +msgid "No filename specified" +msgstr "Имя файла не задано" + +#: ../midori/main.c:1857 +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Обнаружена неизвестная ошибка" + +#: ../midori/main.c:1880 +msgid "Run the specified filename as javascript" +msgstr "Выполнить указанный файл как javascript" + +#: ../midori/main.c:1882 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1301 +#: ../midori/main.c:1884 msgid "URIs" -msgstr "" +msgstr "Идентификаторы URI" -#: ../midori/main.c:1335 +#: ../midori/main.c:1916 msgid "[URIs]" -msgstr "" +msgstr "[Идентификаторы URI]" -#: ../midori/main.c:1371 +#: ../midori/main.c:1940 msgid "Please report comments, suggestions and bugs to:" -msgstr "Предложения, комментарии и соббщения об ошибках направляйте по адресу:" +msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1373 +#: ../midori/main.c:1942 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "" - -#: ../midori/main.c:1411 +#: ../midori/main.c:1965 #, c-format msgid "An instance of Midori is already running but not responding.\n" -msgstr "Midory уже запущен, но неотвечает.\n" +msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1447 -#, fuzzy, c-format +#: ../midori/main.c:2024 +#, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Закладки не могут быть загружены %s\n" +msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1463 -#, fuzzy, c-format +#: ../midori/main.c:2039 +#, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "Сессия не может быть загружена. %s\n" +msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1477 -#, fuzzy, c-format +#: ../midori/main.c:2052 +#, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Корзина не может быть загружена. %s\n" +msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1491 -#, fuzzy, c-format +#: ../midori/main.c:2065 +#, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "Корзина не может быть загружена. %s\n" +msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1504 +#: ../midori/main.c:2077 msgid "The following errors occured:" -msgstr "Обнаружены следующе ошибки:" +msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1520 +#: ../midori/main.c:2093 msgid "_Ignore" -msgstr "" +msgstr "_Игнорировать" -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Средства поиска не могут быть сохранены. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Закладки не могут быть сохранены. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Корзина не может быть сохранена. %s" - -#: ../midori/main.c:1715 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Конфигурация не может быть сохранена. %s" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:248 +#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3160 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:260 +#: ../midori/midori-browser.c:3157 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" -msgstr "%d%% загружен" +msgstr "%d%% загружено" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." -msgstr "Неожиданное действие '%s'." +msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" -msgstr "Редактировать закладку" +msgstr "Изменение закладки" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:541 +#: ../midori/midori-searchaction.c:868 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:560 +#: ../midori/midori-searchaction.c:882 msgid "_URL:" msgstr "_URL:" @@ -268,1025 +328,1065 @@ msgid "_Folder:" msgstr "_Папка:" #: ../midori/midori-browser.c:582 +#: ../midori/midori-browser.c:618 msgid "Root" msgstr "Root" -#: ../midori/midori-browser.c:668 -#, fuzzy +#: ../midori/midori-browser.c:711 msgid "Save file as" -msgstr "Сохранить в файл" +msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1248 -#, fuzzy +#: ../midori/midori-browser.c:1291 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2368 msgid "Open in New _Tab" -msgstr "Открыть в новой _Вкладка" +msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2370 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2645 msgid "Separator" msgstr "Разделитель" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2756 #, c-format msgid "A week ago" -msgstr "" +msgstr "Неделю назад" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2762 #, c-format msgid "%d days ago" -msgstr "" +msgstr "%d дней назад" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2769 msgid "Today" -msgstr "" +msgstr "Сегодня" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2771 msgid "Yesterday" -msgstr "" +msgstr "Вчера" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2860 msgid "A lightweight web browser." -msgstr "Легковесный·веб·браузер" +msgstr "Легковесный обозреватель интернет." -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2868 msgid "translator-credits" -msgstr "Troitskiy Nikita " - -#: ../midori/midori-browser.c:2958 -msgid "Are you sure you want to remove all history items?" msgstr "" +"Troitskiy Nikita \n" +"Anton Shestakov " -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:2997 +msgid "Are you sure you want to remove all history items?" +msgstr "Удалить все записи в журнале?" + +#: ../midori/midori-browser.c:3088 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3091 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3094 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3097 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3100 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3102 msgid "_Close Tab" -msgstr "Закрыть вкладку" +msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3103 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3105 msgid "C_lose Window" -msgstr "Закрыть окно" +msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3106 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3109 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3112 msgid "Quit the application" -msgstr "Закрыть приложение" +msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3114 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3117 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3123 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3126 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3129 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3132 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3135 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3137 msgid "Find _Next" -msgstr "Найти _Дальше" +msgstr "Найти _далее" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3138 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3140 msgid "Find _Previous" msgstr "Найти Предыдущее" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3141 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3144 msgid "_Quick Find" msgstr "_Быстрый Поиск" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "Quickly jump to a word or phrase" msgstr "Перепрыгнуть на слово или фразу" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3148 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3150 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3163 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3166 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3169 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3171 +#: ../midori/midori-view.c:1077 msgid "View _Source" -msgstr "Просмотр исходного кода" +msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3172 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3174 msgid "View Selection Source" -msgstr "Просмотр исходного кода выделеного фрагмента" +msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3175 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3179 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3181 msgid "_Go" -msgstr "_Журнал" +msgstr "_Перейти" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3184 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3187 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3190 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3192 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "Delete the contents of the trash" -msgstr "Очистить содержимое корзины" +msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3195 +#: ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3196 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3200 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3203 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3206 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3209 msgid "Delete the selected history item" -msgstr "" +msgstr "Удалить запись из журнала" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3212 msgid "Clear the entire history" -msgstr "" +msgstr "Очистить весь журнал" -#: ../midori/midori-browser.c:3191 -#, fuzzy +#: ../midori/midori-browser.c:3215 msgid "Bookmark the selected history item" -msgstr "Копировать выделенный текст" +msgstr "Добавить выделенную запись в закладки" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3217 msgid "_Tools" -msgstr "_Сервис" +msgstr "_Инструменты" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3219 +#: ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3220 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3224 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3227 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3228 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3230 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3232 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3233 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3235 msgid "_Frequent questions" -msgstr "" +msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "Show the Frequently Asked Questions" -msgstr "" +msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3238 msgid "_Report a bug" -msgstr "" +msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3242 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3249 msgid "P_rivate Browsing" -msgstr "" +msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3250 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3231 -#, fuzzy +#: ../midori/midori-browser.c:3255 msgid "_Menubar" -msgstr "Вкладка меню" +msgstr "Панель _меню" -#: ../midori/midori-browser.c:3232 -#, fuzzy +#: ../midori/midori-browser.c:3256 msgid "Show menubar" -msgstr "Вкладка меню" +msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3259 msgid "_Navigationbar" -msgstr "_Панель навигации" +msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3260 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3263 msgid "Side_panel" -msgstr "Боковая _панель" +msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3264 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3267 msgid "_Bookmarkbar" -msgstr "_Панель закладок" +msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3268 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3271 msgid "_Transferbar" -msgstr "_Панель передачи" +msgstr "П_ередачи" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3272 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3275 msgid "_Statusbar" -msgstr "_Панель состояния" +msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3276 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3721 msgid "_Location..." -msgstr "_Положение..." +msgstr "_Адрес..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3723 msgid "Open a particular location" -msgstr "" +msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3747 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3749 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3768 msgid "Reopen a previously closed tab or window" -msgstr "Открыть ранее закрытые вкладки или она" +msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3781 msgid "_Recently visited pages" -msgstr "" +msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3783 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3746 -#, fuzzy +#: ../midori/midori-browser.c:3798 msgid "Show the saved bookmarks" -msgstr "Открыть закладку" +msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3759 -#, fuzzy +#: ../midori/midori-browser.c:3811 msgid "_Window" -msgstr "Новое окно" +msgstr "_Окно" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3813 msgid "Show a list of all open tabs" -msgstr "" +msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:3935 msgid "Bookmarks" msgstr "Закладки" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3978 +#: ../midori/midori-preferences.c:582 msgid "History" -msgstr "История" +msgstr "Журнал" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" -msgstr "_Встроенный поиск:" - -#: ../midori/midori-browser.c:4004 -msgid "Match Case" -msgstr "Условие совпадения" - -#: ../midori/midori-browser.c:4012 -msgid "Highlight Matches" -msgstr "" - #: ../midori/midori-browser.c:4021 +msgid "_Inline find:" +msgstr "_Найти:" + +#: ../midori/midori-browser.c:4052 +msgid "Match Case" +msgstr "Учитывать регистр" + +#: ../midori/midori-browser.c:4060 +msgid "Highlight Matches" +msgstr "Подсветить совпадения" + +#: ../midori/midori-browser.c:4069 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4317 #, c-format msgid "Unexpected setting '%s'" -msgstr "Неожиданный параметр '%s'" +msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:223 +#: ../midori/midori-panel.c:224 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:145 +#: ../midori/midori-view.c:1742 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:420 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:147 msgid "Last open pages" msgstr "Последние закрытые страницы" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:162 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:163 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:164 msgid "Russian (KOI8-R)" -msgstr "Кириллица (KOI8-r)" +msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:165 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:166 msgid "Western (ISO-8859-1)" -msgstr "Западная (ISO-8859-1)" +msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:239 msgid "Custom..." -msgstr "Дополнительно..." +msgstr "Другая..." -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:182 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:183 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:184 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:199 msgid "Default" -msgstr "По-умолчанию" +msgstr "По умолчанию" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:200 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:201 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:202 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:203 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:218 msgid "All cookies" msgstr "Все куки" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Session cookies" msgstr "Куки сессии" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:220 +#: ../panels/midori-addons.c:96 msgid "None" -msgstr "Ни один" +msgstr "Нет" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:236 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:237 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:238 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:279 msgid "Remember last window size" -msgstr "Запомнить размер последнего окна" +msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:280 msgid "Whether to save the last window size" -msgstr "Запомнить последний размер окна" +msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:288 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:289 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:297 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:298 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:306 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:307 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:316 msgid "Last panel page" -msgstr "" +msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:317 msgid "The last saved panel page" -msgstr "" +msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:325 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:326 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:302 -#, fuzzy +#: ../midori/midori-websettings.c:335 msgid "Show Menubar" -msgstr "Вкладка меню" +msgstr "Показать меню" -#: ../midori/midori-websettings.c:303 -#, fuzzy +#: ../midori/midori-websettings.c:336 msgid "Whether to show the menubar" -msgstr "Показывать панель состояния" +msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:344 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:353 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:354 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:362 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:363 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:371 msgid "Show Statusbar" msgstr "Показать вкладку статуса" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:372 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:381 msgid "Toolbar Style" -msgstr "Стиль панель инструментов" +msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:382 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:358 -#, fuzzy +#: ../midori/midori-websettings.c:391 msgid "Toolbar Items" -msgstr "Стиль панель инструментов" +msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:359 -#, fuzzy +#: ../midori/midori-websettings.c:392 msgid "The items to show on the toolbar" -msgstr "Стиль панели инструментов" +msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:367 -#, fuzzy +#: ../midori/midori-websettings.c:400 msgid "Compact Sidepanel" -msgstr "Боковая _панель" +msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:368 -#, fuzzy +#: ../midori/midori-websettings.c:401 msgid "Whether to make the sidepanel compact" -msgstr "Показывать панель" +msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:411 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:421 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:429 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:430 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который сохранялись файлы" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:438 msgid "Download Manager" -msgstr "Администратор загрузок" +msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:439 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:447 msgid "Text Editor" -msgstr "" +msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:448 msgid "An external text editor" -msgstr "" +msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:456 msgid "Location entry Search" -msgstr "" +msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:457 msgid "The search to perform inside the location entry" -msgstr "" +msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:465 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:466 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:476 msgid "Always Show Tabbar" -msgstr "" +msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:477 msgid "Always show the tabbar" -msgstr "" +msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:485 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:486 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:495 msgid "Open new pages in" msgstr "Открыть новую страницу в" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:496 msgid "Where to open new pages" msgstr "Где открыть новую страницу в" -#: ../midori/midori-websettings.c:473 -#, fuzzy +#: ../midori/midori-websettings.c:506 msgid "Open external pages in" -msgstr "Открыть новую страницу в" +msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:474 -#, fuzzy +#: ../midori/midori-websettings.c:507 msgid "Where to open externally opened pages" -msgstr "Где открыть новую страницу в" +msgstr "Расположение сторонних страницы при открытии" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:516 msgid "Middle click opens Selection" -msgstr "Действие по нажатию средней кнопки мыши" +msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:517 msgid "Load an URL from the selection via middle click" msgstr "Загружать выделенный URL средней кнопкой" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:525 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:526 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:534 msgid "Open Tabs next to Current" -msgstr "Открывать в следующей за данной вкладке" +msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:535 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:543 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:544 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:587 msgid "Accept cookies" msgstr "Разрешить куки" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:588 msgid "What type of cookies to accept" -msgstr "Тип принимаемых cookies" +msgstr "Тип принимаемых куки" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:601 msgid "Original cookies only" -msgstr "" +msgstr "Только оригинальные куки" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:602 msgid "Accept cookies from the original website only" -msgstr "" +msgstr "Принимать куки только с оригинального веб-сайта" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:610 msgid "Maximum cookie age" -msgstr "Максимальный возраст cookies" +msgstr "Максимальный возраст куки" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:611 msgid "The maximum number of days to save cookies for" -msgstr "Максимальное число дней хранения cookies" +msgstr "Максимальное число дней хранения куки" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:621 msgid "Remember last visited pages" -msgstr "Запомнить страницы последних посещений" +msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:622 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:630 msgid "Maximum history age" -msgstr "Максимальный возраст истории" +msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:631 msgid "The maximum number of days to save the history for" -msgstr "Максимальное число дней хранения истории" +msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:639 msgid "Remember last form inputs" -msgstr "Использовать маленькие изображения в панели инструментов" +msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:640 msgid "Whether the last form inputs are saved" -msgstr "Сохранять последние данные формы" +msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:648 msgid "Remember last downloaded files" -msgstr "Запомнить последние скачанные файлы" +msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:649 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:659 msgid "HTTP Proxy" -msgstr "HTTP прокси" +msgstr "HTTP-прокси" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:660 msgid "The proxy used for HTTP connections" -msgstr "Прокси сервер для HTTP соединений" +msgstr "Прокси-сервер для HTTP соединений" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:679 +msgid "Identify as" +msgstr "Представляться как" + +#: ../midori/midori-websettings.c:680 +msgid "What to identify as to web pages" +msgstr "Строка, которая будет посылаться на запросы идентификации браузера" + +#: ../midori/midori-websettings.c:700 +msgid "Identification string" +msgstr "Строка идентификации" + +#: ../midori/midori-websettings.c:701 +msgid "The application identification string" +msgstr "Строка идентификатора приложения" + +#: ../midori/midori-websettings.c:713 msgid "Cache size" -msgstr "Размер кеша" +msgstr "Размер кэша" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:714 msgid "The allowed size of the cache" -msgstr "Разрешённый размер кеша" +msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:701 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:981 msgid "Open Link in New _Tab" -msgstr "Открыть ссылку в новой _Вкладке" +msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:1004 msgid "_Save Link destination" -msgstr "" +msgstr "_Сохранить объект" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:1012 msgid "_Download Link destination" -msgstr "" +msgstr "_Загрузить объект" -#: ../midori/midori-view.c:955 +#: ../midori/midori-view.c:1034 msgid "Open URL in New _Tab" -msgstr "Открыть URL в новой _Вкладке" +msgstr "Открыть URL в новой _вкладке" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1463 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1606 msgid "Source" msgstr "Исходный код" -#: ../midori/midori-view.c:1527 -#, fuzzy, c-format +#: ../midori/midori-view.c:1630 +#, c-format msgid "No documentation installed" -msgstr "Документация" +msgstr "Документация не установлена" -#: ../midori/midori-preferences.c:87 -#, fuzzy, c-format +#: ../midori/midori-preferences.c:91 +#, c-format msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:369 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:370 msgid "Startup" -msgstr "" +msgstr "Запуск" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:417 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:418 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:420 msgid "Default Font Family" -msgstr "" +msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:428 msgid "Minimum Font Size" -msgstr "" +msgstr "Минимальный размер шрифта" + +#: ../midori/midori-preferences.c:437 +msgid "Encoding" +msgstr "Кодировка" + +#: ../midori/midori-preferences.c:440 +msgid "The character encoding to use by default" +msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:447 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:448 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:451 +#: ../extensions/statusbar-features.c:32 msgid "Load images automatically" -msgstr "" +msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:454 msgid "Shrink images automatically" -msgstr "" +msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:457 msgid "Print background images" -msgstr "" +msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:460 msgid "Resizable text areas" -msgstr "" +msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 -#, fuzzy +#: ../midori/midori-preferences.c:463 +#: ../extensions/statusbar-features.c:39 msgid "Enable scripts" -msgstr "Скрипты пользователя" +msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:466 +#: ../extensions/statusbar-features.c:46 msgid "Enable plugins" -msgstr "" +msgstr "Использовать модули" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:469 msgid "Enable developer tools" -msgstr "" +msgstr "Включить средства разработчика" + +#: ../midori/midori-preferences.c:472 +msgid "Enforce 96 DPI" +msgstr "Всегда использовать 96 DPI" #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:480 msgid "Interface" -msgstr "Внешний вид" +msgstr "Интерфейс" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:481 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:497 msgid "Browsing" msgstr "Навигация" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:529 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:551 msgid "MB" -msgstr "" +msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:558 msgid "Privacy" -msgstr "" +msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:500 -#, fuzzy +#: ../midori/midori-preferences.c:564 msgid "Web Cookies" msgstr "Разрешить куки" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:577 +#: ../midori/midori-preferences.c:589 msgid "days" -msgstr "" +msgstr "дней" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:487 +#: ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:852 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:896 msgid "_Icon (name or file):" -msgstr "_Значок (имя файла):" +msgstr "_Значок (имя или файл):" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:910 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1060 +#: ../midori/midori-searchaction.c:1087 msgid "Manage search engines" msgstr "Управление средствами поиска" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 +#: ../midori/sokoke.c:113 msgid "Could not run external program." -msgstr "Не могу выполнить внешнюю программу." +msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/sokoke.c:282 +#: ../midori/sokoke.c:345 msgid "Warning: You are using a superuser account!" -msgstr "Внимание: Вы используете привилегированную учётную запись" +msgstr "Внимание: используется учётная запись суперпользователя!" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Обнаружена неизвестная ошибка" - -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" -msgstr "%s не обладает свойством '%s'" +msgstr "%s не обладает свойством «%s»" #: ../midori/gjs.c:878 #, c-format @@ -1298,21 +1398,25 @@ msgstr "%s не может быть назначен для %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s недоступен" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 +#: ../panels/midori-addons.c:143 msgid "Userscripts" -msgstr "Скрипты пользователя" +msgstr "Сценарии" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Стили пользователя" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 +#: ../panels/midori-extensions.c:144 msgid "_Enable" -msgstr "" +msgstr "_Включить" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 +#: ../panels/midori-extensions.c:153 msgid "_Disable" -msgstr "" +msgstr "_Отключить" #: ../panels/midori-console.c:87 msgid "Console" @@ -1325,211 +1429,170 @@ msgstr "Дополнения" #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "" +msgstr "Не удалось загрузить именованный значок «%s»" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "" +msgstr "Не удалось загрузить системный значок «%s»" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "Анимационные рамки неисправны" +msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:182 +#: ../katze/katze-utils.c:391 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Значение '%s' недействительно для %s" +msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:211 +#: ../katze/katze-utils.c:250 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:231 msgid "Choose folder" -msgstr "Выберите каталог" +msgstr "Выберите папку" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:109 +#: ../extensions/page-holder.c:144 msgid "Pageholder" -msgstr "" +msgstr "Контейнер" #: ../extensions/page-holder.c:128 msgid "_Pageholder" -msgstr "" +msgstr "К_онтейнер" #: ../extensions/statusbar-features.c:30 -#, fuzzy msgid "Images" -msgstr "Страница" +msgstr "Изображения" #: ../extensions/statusbar-features.c:37 -#, fuzzy msgid "Scripts" -msgstr "Скрипты пользователя" +msgstr "Сценарии" #: ../extensions/statusbar-features.c:44 msgid "Plugins" -msgstr "" +msgstr "Модули" +#~ msgid "Open in Page_holder..." +#~ msgstr "Открыть в _контейнере..." +#~ msgid "Open the current page in the pageholder" +#~ msgstr "Открыть страницу в контейнере" + +#, fuzzy +#~ msgid "Last pageholder URI" +#~ msgstr "Текущий индекс URI" +#~ msgid "The URI last opened in the pageholder" +#~ msgstr "Последняя открытая ссылка в хранилище" #~ msgid "Select _All" #~ msgstr "Пометить всё" - #~ msgid "_Fullscreen" #~ msgstr "Полноэкранный режим" - #~ msgid "_Leave Fullscreen" #~ msgstr "Выйти из полноэкранного режима" - #~ msgid "Settings" #~ msgstr "Установки" - #~ msgid "Trash" #~ msgstr "Корзина" - #~ msgid "The trash, collecting recently closed tabs and windows" #~ msgstr "Корзина. Сохраняет закрытые вкладки и окна" - #~ msgid "Search Engines" #~ msgstr "Средства поиска" - #~ msgid "The list of search engines" #~ msgstr "Список средств поиска" - #~ msgid "Browser" #~ msgstr "Обозреватель" - #~ msgid "The current browser" #~ msgstr "Данный браузер" - #~ msgid "The current number of browsers" #~ msgstr "Текущее число обозревателей" - #~ msgid "Kind" #~ msgstr "Тип" - #~ msgid "The kind of addons" #~ msgstr "Тип дополнения" - #~ msgid "The navigationbar" #~ msgstr "Панель навигации" - #~ msgid "URI" #~ msgstr "URI" - #~ msgid "The current URI" #~ msgstr "Данная URI" - #~ msgid "Tab" #~ msgstr "Вкладка" - #~ msgid "The current tab" #~ msgstr "Данная вкладка" - #~ msgid "Statusbar" #~ msgstr "Панель состояния" - #~ msgid "The statusbar" #~ msgstr "Панель состояния" - #~ msgid "Statusbar Text" #~ msgstr "Текст вкладки статуса" - #~ msgid "The text that is displayed in the statusbar" #~ msgstr "Текст отображаемый во вкладке статуса" - #~ msgid "The list of search engines to be used for web search" #~ msgstr "Список средств поиска используемые для поиска в сети" - #~ msgid "Open the selected bookmark in a new tab" #~ msgstr "Открыть выбранные закладки в новых вкладках" - #~ msgid "Open the selected bookmark in a new window" #~ msgstr "Открыть выбранные закладки в новом окне" - #~ msgid "Shadow Type" #~ msgstr "Тип тени" - #~ msgid "Appearance of the shadow around each panel" #~ msgstr "Внешний вид тени вокруг панели" - #~ msgid "Menu" #~ msgstr "Меню" - #~ msgid "Menu to hold panel items" #~ msgstr "Управление содержимым панелей" - #~ msgid "Show New Tab" #~ msgstr "Показать новую вкладку" - #~ msgid "Show the New Tab button in the toolbar" #~ msgstr "Показать кнопку Новая Вкладка в панели инструментов" - #~ msgid "Show Homepage" #~ msgstr "Показать домашнюю страницу" - #~ msgid "Show the Homepage button in the toolbar" #~ msgstr "Показать кнопку Домашняя Страница в панели инструментов" - #~ msgid "Show Web search" #~ msgstr "Показать поиск" - #~ msgid "Show the Web search entry in the toolbar" #~ msgstr "Показывать запись сетевого поиска в панели инструментов" - #~ msgid "Show Trash" #~ msgstr "Показать корзину" - #~ msgid "Show the Trash button in the toolbar" #~ msgstr "Показать кнопку Корзина в панели инструментов" - #~ msgid "Load Finished" #~ msgstr "Загрузка завершена" - #~ msgid "The URI of the currently loaded page" #~ msgstr "URI загруженной страницы" - #~ msgid "The title of the currently loaded page" #~ msgstr "Заголовок загруженной страницы" - #~ msgid "Icon" #~ msgstr "Значок" - #~ msgid "The current loading status" #~ msgstr "Статус загрузки" - #~ msgid "The current loading progress" #~ msgstr "Процесс загрузки" - #~ msgid "Download Link with Download _Manager" #~ msgstr "Загрузить с помощью администратора загрузок" - #~ msgid "Dialog" #~ msgstr "Диалог" - #~ msgid "A dialog to manage search engines" #~ msgstr "Диалог управления средствами поиска" - #~ msgid "Icon size" #~ msgstr "Размер значков" - #~ msgid "Icon Name" #~ msgstr "Имя иконки" - #~ msgid "The name of an icon containing animation frames" #~ msgstr "Имя иконки содержащей анимационные рамки" - #~ msgid "The name of an icon to be used as the static image" #~ msgstr "Имя иконки для статичного изобрадения" - #~ msgid "Icon '%s' couldn't be loaded" #~ msgstr "Значок '%s' не может быть загружен" - #~ msgid "Name" #~ msgstr "Имя" - #~ msgid "The descriptive text of the item" #~ msgstr "Описание пункта" - #~ msgid "Token" #~ msgstr "Признак" + From 6bb3fb442ebd7350e6b45077dcfdabc1c82976eb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jan 2009 19:21:25 +0100 Subject: [PATCH 0614/2970] Various string changes and additions --- midori/main.c | 4 +- midori/midori-browser.c | 7 +- midori/midori-preferences.c | 16 +- midori/midori-searchaction.c | 2 +- midori/midori-view.c | 2 +- midori/midori-websettings.c | 7 +- midori/sokoke.c | 1 + po/midori.pot | 736 +++++++++++++++++++---------------- 8 files changed, 417 insertions(+), 358 deletions(-) diff --git a/midori/main.c b/midori/main.c index 0c622dac..e4f97219 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1881,7 +1881,7 @@ main (int argc, { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, - N_("URIs"), NULL }, + N_("Addresses"), NULL }, { NULL } }; GString* error_messages; @@ -1913,7 +1913,7 @@ main (int argc, version = FALSE; uris = NULL; error = NULL; - if (!gtk_init_with_args (&argc, &argv, _("[URIs]"), entries, + if (!gtk_init_with_args (&argc, &argv, _("[Addresses]"), entries, GETTEXT_PACKAGE, &error)) { g_print ("%s - %s\n", _("Midori"), error->message); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 290cc771..d4fb7ea4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -557,7 +557,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_URL:")); + label = gtk_label_new_with_mnemonic (_("_Address:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = gtk_entry_new (); @@ -579,7 +579,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); combo_folder = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Root")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), + _("Toplevel folder")); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); if ((n = katze_array_get_length (browser->bookmarks))) for (i = 0; i < n; i++) @@ -615,7 +616,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_uri))); selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - if (g_strcmp0 (selected, _("Root"))) + if (g_strcmp0 (selected, _("Toplevel folder"))) { treeview = GTK_TREE_VIEW (browser->panel_bookmarks); treemodel = gtk_tree_view_get_model (treeview); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index ec9a15e7..c11f9869 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -423,11 +423,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "default-font-family", "font"); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); entry = katze_property_proxy (settings, "default-font-size", NULL); + gtk_widget_set_tooltip_text (entry, _("The default font size used to display text")); gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); FILLED_ADD (hbox, 1, 2, 0, 1); label = gtk_label_new (_("Minimum Font Size")); INDENTED_ADD (label, 0, 1, 1, 2); entry = katze_property_proxy (settings, "minimum-font-size", NULL); + gtk_widget_set_tooltip_text (entry, _("The minimum font size used to display text")); INDENTED_ADD (entry, 1, 2, 1, 2); label = katze_property_label (settings, "preferred-encoding"); INDENTED_ADD (label, 0, 1, 2, 3); @@ -449,27 +451,35 @@ midori_preferences_set_settings (MidoriPreferences* preferences, TABLE_NEW (6, 2); button = katze_property_proxy (settings, "auto-load-images", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); + gtk_widget_set_tooltip_text (button, _("Load and display images automatically")); INDENTED_ADD (button, 0, 1, 0, 1); button = katze_property_proxy (settings, "auto-shrink-images", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Shrink images automatically")); + gtk_widget_set_tooltip_text (button, _("Automatically shrink standalone images to fit")); SPANNED_ADD (button, 1, 2, 0, 1); button = katze_property_proxy (settings, "print-backgrounds", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Print background images")); + gtk_widget_set_tooltip_text (button, _("Whether background images should be printed")); INDENTED_ADD (button, 0, 1, 1, 2); button = katze_property_proxy (settings, "resizable-text-areas", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Resizable text areas")); + gtk_widget_set_tooltip_text (button, _("Whether text areas are resizable")); SPANNED_ADD (button, 1, 2, 1, 2); button = katze_property_proxy (settings, "enable-scripts", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); + gtk_widget_set_tooltip_text (button, _("Enable embedded scripting languages")); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable plugins")); + gtk_widget_set_tooltip_text (button, _("Enable embedded plugin objects")); SPANNED_ADD (button, 1, 2, 2, 3); + button = katze_property_proxy (settings, "enforce-96-dpi", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch")); + gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI")); + SPANNED_ADD (button, 0, 1, 3, 4); button = katze_property_proxy (settings, "enable-developer-extras", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); - SPANNED_ADD (button, 0, 1, 3, 4); - button = katze_property_proxy (settings, "enforce-96-dpi", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 DPI")); + gtk_widget_set_tooltip_text (button, _("Enable special extensions for developers")); SPANNED_ADD (button, 1, 2, 3, 4); label = katze_property_label (settings, "location-entry-search"); INDENTED_ADD (label, 0, 1, 4, 5); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 328ea368..b32d30e9 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -879,7 +879,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_URL:")); + label = gtk_label_new_with_mnemonic (_("_Address:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_uri = gtk_entry_new (); diff --git a/midori/midori-view.c b/midori/midori-view.c index f984abbb..cbe74a4b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1031,7 +1031,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, && !strchr (view->selected_text, ' ')) { menuitem = gtk_image_menu_item_new_with_mnemonic ( - _("Open URL in New _Tab")); + _("Open Address in New _Tab")); icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 30a02c09..98f0c457 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -514,7 +514,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_boolean ( "middle-click-opens-selection", _("Middle click opens Selection"), - _("Load an URL from the selection via middle click"), + _("Load an address from the selection via middle click"), FALSE, flags)); @@ -656,8 +656,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_HTTP_PROXY, g_param_spec_string ( "http-proxy", - _("HTTP Proxy"), - _("The proxy used for HTTP connections"), + _("Proxy Server"), + _("The proxy server used for HTTP connections"), NULL, #if HAVE_LIBSOUP G_PARAM_READWRITE)); @@ -676,6 +676,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) PROP_IDENTIFY_AS, g_param_spec_enum ( "identify-as", + /* i18n: This refers to an application, not the 'user agent' string */ _("Identify as"), _("What to identify as to web pages"), MIDORI_TYPE_IDENTITY, diff --git a/midori/sokoke.c b/midori/sokoke.c index 54f946e8..67b7d465 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -342,6 +342,7 @@ sokoke_superuser_warning_new (void) hbox = gtk_event_box_new (); gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL, &hbox->style->bg[GTK_STATE_SELECTED]); + /* i18n: A superuser, or system administrator, may not be 'root' */ label = gtk_label_new (_("Warning: You are using a superuser account!")); gtk_misc_set_padding (GTK_MISC (label), 0, 2); gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, diff --git a/po/midori.pot b/po/midori.pot index 7159c28e..ed5cda77 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 19:49+0100\n" +"POT-Creation-Date: 2009-01-04 19:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../midori.desktop.in.h:2 ../midori/main.c:1703 ../midori/main.c:1712 -#: ../midori/main.c:1723 ../midori/main.c:1747 -#: ../midori/midori-websettings.c:234 +#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 +#: ../midori/main.c:1928 ../midori/main.c:1939 +#: ../midori/midori-websettings.c:235 msgid "Midori" msgstr "" @@ -34,7 +34,7 @@ msgstr "" msgid "_Bookmark" msgstr "" -#: ../midori/main.c:88 ../midori/midori-browser.c:3743 +#: ../midori/main.c:88 ../midori/midori-browser.c:3797 msgid "_Bookmarks" msgstr "" @@ -141,602 +141,606 @@ msgstr "" msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1045 ../midori/sokoke.c:479 +#: ../midori/main.c:1045 ../midori/sokoke.c:523 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1065 ../midori/main.c:1082 +#: ../midori/main.c:1075 ../midori/main.c:1100 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1101 ../midori/main.c:1125 +#: ../midori/main.c:1123 ../midori/main.c:1147 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1146 ../midori/midori-preferences.c:381 +#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 msgid "Transfers" msgstr "" -#: ../midori/main.c:1182 +#: ../midori/main.c:1204 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1508 +#: ../midori/main.c:1530 msgid "Authentication Required" msgstr "" -#: ../midori/main.c:1524 +#: ../midori/main.c:1546 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -#: ../midori/main.c:1538 +#: ../midori/main.c:1560 msgid "Username" msgstr "" -#: ../midori/main.c:1549 +#: ../midori/main.c:1571 msgid "Password" msgstr "" -#: ../midori/main.c:1654 -msgid "Run the specified filename as javascript" -msgstr "" - -#: ../midori/main.c:1656 -msgid "Display program version" -msgstr "" - -#: ../midori/main.c:1658 -msgid "URIs" -msgstr "" - -#: ../midori/main.c:1700 -msgid "[URIs]" -msgstr "" - -#: ../midori/main.c:1724 -msgid "Please report comments, suggestions and bugs to:" -msgstr "" - -#: ../midori/main.c:1726 -msgid "Check for new versions at:" -msgstr "" - -#: ../midori/main.c:1747 -msgid "No filename specified" -msgstr "" - -#: ../midori/main.c:1766 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:1825 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1840 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1853 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1866 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1878 -msgid "The following errors occured:" -msgstr "" - -#: ../midori/main.c:1894 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1967 +#: ../midori/main.c:1675 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1982 +#: ../midori/main.c:1690 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1986 +#: ../midori/main.c:1694 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1991 +#: ../midori/main.c:1699 msgid "Disable all _extensions" msgstr "" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3131 -#: ../midori/midori-browser.c:3137 +#: ../midori/main.c:1828 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1857 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/main.c:1880 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1882 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1884 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1916 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:1940 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:1942 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1965 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:2024 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2039 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2052 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2065 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:2077 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:2093 +msgid "_Ignore" +msgstr "" + +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3161 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:882 -msgid "_URL:" +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 +msgid "_Address:" msgstr "" #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:582 -msgid "Root" +#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1292 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2369 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2371 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2605 +#: ../midori/midori-browser.c:2646 msgid "Separator" msgstr "" -#: ../midori/midori-browser.c:2716 +#: ../midori/midori-browser.c:2757 #, c-format msgid "A week ago" msgstr "" -#: ../midori/midori-browser.c:2722 +#: ../midori/midori-browser.c:2763 #, c-format msgid "%d days ago" msgstr "" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2770 msgid "Today" msgstr "" -#: ../midori/midori-browser.c:2731 +#: ../midori/midori-browser.c:2772 msgid "Yesterday" msgstr "" -#: ../midori/midori-browser.c:2820 +#: ../midori/midori-browser.c:2861 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2828 +#: ../midori/midori-browser.c:2869 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2962 +#: ../midori/midori-browser.c:2998 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3089 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3092 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3095 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3074 +#: ../midori/midori-browser.c:3098 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3077 +#: ../midori/midori-browser.c:3101 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3103 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3080 +#: ../midori/midori-browser.c:3104 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3106 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3083 +#: ../midori/midori-browser.c:3107 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3110 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3113 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3091 +#: ../midori/midori-browser.c:3115 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3118 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3097 ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3127 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:3133 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3136 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3138 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3139 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3141 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3142 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3145 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3146 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3149 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3151 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3152 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3164 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3167 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3170 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3148 ../midori/midori-view.c:1004 +#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3173 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3175 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3176 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3180 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3182 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3185 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3188 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3191 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3193 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3194 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:976 +#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3197 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3201 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3204 msgid "Edit the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3207 msgid "Delete the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3186 +#: ../midori/midori-browser.c:3210 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:3213 msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3216 msgid "Bookmark the selected history item" msgstr "" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3218 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3196 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3221 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3225 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3226 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3228 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3229 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3231 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3233 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3234 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3236 msgid "_Frequent questions" msgstr "" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3237 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3239 msgid "_Report a bug" msgstr "" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3240 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3243 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3250 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3251 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3256 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3257 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3260 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3261 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3264 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3241 +#: ../midori/midori-browser.c:3265 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3268 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3269 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3272 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3273 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3276 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3277 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3668 +#: ../midori/midori-browser.c:3722 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3724 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3694 +#: ../midori/midori-browser.c:3748 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3696 +#: ../midori/midori-browser.c:3750 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3715 +#: ../midori/midori-browser.c:3769 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3728 +#: ../midori/midori-browser.c:3782 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3730 +#: ../midori/midori-browser.c:3784 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3745 +#: ../midori/midori-browser.c:3799 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3758 +#: ../midori/midori-browser.c:3812 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3760 +#: ../midori/midori-browser.c:3814 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:3882 +#: ../midori/midori-browser.c:3936 msgid "Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3925 ../midori/midori-preferences.c:579 +#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 msgid "History" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3968 +#: ../midori/midori-browser.c:4022 msgid "_Inline find:" msgstr "" -#: ../midori/midori-browser.c:3999 +#: ../midori/midori-browser.c:4053 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4061 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4016 +#: ../midori/midori-browser.c:4070 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4318 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -745,447 +749,448 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:144 ../midori/midori-view.c:1643 +#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:145 ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:147 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:161 +#: ../midori/midori-websettings.c:162 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:163 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:164 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:165 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:166 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:166 ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:182 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:183 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:184 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:199 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:200 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:201 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:202 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:203 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:218 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:219 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:219 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:236 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:237 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:238 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:279 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:288 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:289 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:305 +#: ../midori/midori-websettings.c:306 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:307 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:325 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:326 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:335 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:344 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:353 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:354 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:362 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:363 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:382 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:391 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:392 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:400 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:401 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:410 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:411 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:421 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:429 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:430 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:438 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:439 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:447 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:448 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:456 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:457 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:465 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:466 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:476 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:477 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:485 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:486 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:495 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:516 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:516 -msgid "Load an URL from the selection via middle click" -msgstr "" - -#: ../midori/midori-websettings.c:524 -msgid "Open tabs in the background" +#: ../midori/midori-websettings.c:517 +msgid "Load an address from the selection via middle click" msgstr "" #: ../midori/midori-websettings.c:525 +msgid "Open tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:526 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:534 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:535 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:543 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:544 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:587 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:588 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:601 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:602 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:610 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:611 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:621 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:622 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:630 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:631 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:639 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:640 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:648 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:649 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:641 -msgid "HTTP Proxy" +#: ../midori/midori-websettings.c:659 +msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:642 -msgid "The proxy used for HTTP connections" +#: ../midori/midori-websettings.c:660 +msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:661 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:680 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:681 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:701 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:702 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:714 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:715 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:701 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:908 +#: ../midori/midori-view.c:981 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:931 +#: ../midori/midori-view.c:1004 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:939 +#: ../midori/midori-view.c:1012 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:961 -msgid "Open URL in New _Tab" +#: ../midori/midori-view.c:1034 +msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1369 +#: ../midori/midori-view.c:1463 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1606 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1531 +#: ../midori/midori-view.c:1630 #, c-format msgid "No documentation installed" msgstr "" @@ -1217,86 +1222,130 @@ msgstr "" msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:426 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:429 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:432 +msgid "The minimum font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:439 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:442 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:449 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:450 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:451 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "" #: ../midori/midori-preferences.c:454 -msgid "Shrink images automatically" +msgid "Load and display images automatically" msgstr "" #: ../midori/midori-preferences.c:457 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:458 +msgid "Automatically shrink standalone images to fit" +msgstr "" + +#: ../midori/midori-preferences.c:461 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:462 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-preferences.c:465 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:463 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:466 +msgid "Whether text areas are resizable" +msgstr "" + +#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:466 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:470 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:469 -msgid "Enable developer tools" +#: ../midori/midori-preferences.c:474 +msgid "Enable embedded plugin objects" msgstr "" -#. Page "Interface" #: ../midori/midori-preferences.c:477 -msgid "Interface" +msgid "Enforce 96 dots per inch" msgstr "" #: ../midori/midori-preferences.c:478 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:481 +msgid "Enable developer tools" +msgstr "" + +#: ../midori/midori-preferences.c:482 +msgid "Enable special extensions for developers" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:490 +msgid "Interface" +msgstr "" + +#: ../midori/midori-preferences.c:491 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:525 ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:555 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:574 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:574 ../midori/midori-preferences.c:586 +#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 msgid "days" msgstr "" @@ -1328,18 +1377,15 @@ msgstr "" msgid "Manage search engines" msgstr "" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "" -#: ../midori/sokoke.c:302 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:346 msgid "Warning: You are using a superuser account!" msgstr "" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "" - #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1355,19 +1401,19 @@ msgstr "" msgid "%s.%s cannot be accessed" msgstr "" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "" From fc072bf9dccada5bbdcd13bc125f115d9d546ecf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jan 2009 19:27:35 +0100 Subject: [PATCH 0615/2970] Update German translation --- po/de.po | 406 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 234 insertions(+), 172 deletions(-) diff --git a/po/de.po b/po/de.po index d97bd720..b385578a 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-01 04:07+0100\n" +"POT-Creation-Date: 2009-01-04 19:06+0100\n" "PO-Revision-Date: 2009-01-01 04:18+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -35,7 +35,7 @@ msgstr "Netznavigator" msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:88 ../midori/midori-browser.c:3796 +#: ../midori/main.c:88 ../midori/midori-browser.c:3797 msgid "_Bookmarks" msgstr "_Lesezeichen" @@ -142,7 +142,7 @@ msgstr "Die Konfiguration konnte nicht geladen werden. %s" msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1045 ../midori/sokoke.c:517 +#: ../midori/main.c:1045 ../midori/sokoke.c:523 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." @@ -174,7 +174,8 @@ msgstr "Authentifizierung erforderlich" msgid "" "A username and a password are required\n" "to open this location:" -msgstr "Ein Benutzername und ein Kennwort\n" +msgstr "" +"Ein Benutzername und ein Kennwort\n" "werden zum öffnen dieses Ortes benötigt:" #: ../midori/main.c:1560 @@ -189,8 +190,9 @@ msgstr "Kennwort" msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." -msgstr "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet " -"wurde. Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." +msgstr "" +"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " +"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." #: ../midori/main.c:1690 msgid "Modify _preferences" @@ -221,12 +223,12 @@ msgid "Display program version" msgstr "Programmversion anzeigen" #: ../midori/main.c:1884 -msgid "URIs" -msgstr "URIs" +msgid "Addresses" +msgstr "Adressen" #: ../midori/main.c:1916 -msgid "[URIs]" -msgstr "[URIs]" +msgid "[Addresses]" +msgstr "[Adressen]" #: ../midori/main.c:1940 msgid "Please report comments, suggestions and bugs to:" @@ -269,12 +271,12 @@ msgstr "Folgende Fehler sind aufgetreten:" msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3154 -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3161 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" @@ -305,447 +307,447 @@ msgid "_Description:" msgstr "_Beschreibung" #: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 -msgid "_URL:" -msgstr "_URL:" +msgid "_Address:" +msgstr "_Adresse:" #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:582 ../midori/midori-browser.c:618 -msgid "Root" -msgstr "Wurzel" +#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +msgid "Toplevel folder" +msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1291 +#: ../midori/midori-browser.c:1292 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2368 +#: ../midori/midori-browser.c:2369 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2370 +#: ../midori/midori-browser.c:2371 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2645 +#: ../midori/midori-browser.c:2646 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2757 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2763 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../midori/midori-browser.c:2769 +#: ../midori/midori-browser.c:2770 msgid "Today" msgstr "Heute" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2772 msgid "Yesterday" msgstr "Gestern" -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:2861 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:2869 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:2998 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3089 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3091 +#: ../midori/midori-browser.c:3092 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3095 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3098 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3101 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3103 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3104 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3106 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3107 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:3110 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3113 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3115 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3118 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3120 ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3127 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3133 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3136 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3138 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3139 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3141 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3142 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3145 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3146 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3149 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3151 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3152 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3164 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3167 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3170 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:1017 +#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3173 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3175 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3176 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3180 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3181 +#: ../midori/midori-browser.c:3182 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3185 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3188 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3191 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3193 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3194 msgid "Delete the contents of the trash" msgstr "Inhalt des Mülls löschen" -#: ../midori/midori-browser.c:3195 ../midori/midori-view.c:989 +#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3197 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3201 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3204 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3207 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3210 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3213 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3216 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3218 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3219 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3221 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3225 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3226 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3228 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3229 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3231 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3233 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3234 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3236 msgid "_Frequent questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3237 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3238 +#: ../midori/midori-browser.c:3239 msgid "_Report a bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3240 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3243 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3250 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3251 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3256 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3257 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3260 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3261 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3264 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3265 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3268 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3269 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3272 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3273 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3276 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3277 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3722 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3723 +#: ../midori/midori-browser.c:3724 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3747 +#: ../midori/midori-browser.c:3748 msgid "_Web Search..." msgstr "_Netzsuche…" -#: ../midori/midori-browser.c:3749 +#: ../midori/midori-browser.c:3750 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3769 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3782 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3784 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3798 +#: ../midori/midori-browser.c:3799 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3811 +#: ../midori/midori-browser.c:3812 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:3814 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:3936 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../midori/midori-browser.c:3978 ../midori/midori-preferences.c:582 +#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 msgid "History" msgstr "Verlauf" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4022 msgid "_Inline find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:4053 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4060 +#: ../midori/midori-browser.c:4061 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4069 +#: ../midori/midori-browser.c:4070 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4318 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -754,7 +756,7 @@ msgstr "Unerwartete Einstellung »%s«" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1658 +#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 msgid "Blank page" msgstr "Leere Seite" @@ -776,7 +778,7 @@ msgstr "Japanisch (SHIFT_JIS)" #: ../midori/midori-websettings.c:164 msgid "Russian (KOI8-R)" -msgstr "Russisch (KOI8-r)" +msgstr "Russisch (KOI8-R)" #: ../midori/midori-websettings.c:165 msgid "Unicode (UTF-8)" @@ -1048,8 +1050,8 @@ msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" #: ../midori/midori-websettings.c:517 -msgid "Load an URL from the selection via middle click" -msgstr "Lade eine ausgewählte URL mit der mittleren Maustaste" +msgid "Load an address from the selection via middle click" +msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" #: ../midori/midori-websettings.c:525 msgid "Open tabs in the background" @@ -1132,69 +1134,70 @@ msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" #: ../midori/midori-websettings.c:659 -msgid "HTTP Proxy" -msgstr "HTTP-Zwischenrechner" +msgid "Proxy Server" +msgstr "Zwischenrechner" #: ../midori/midori-websettings.c:660 -msgid "The proxy used for HTTP connections" +msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:679 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:680 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:681 msgid "What to identify as to web pages" msgstr "Wie gegenüber Netzseiten identifiziert werden soll" -#: ../midori/midori-websettings.c:700 +#: ../midori/midori-websettings.c:701 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:702 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:714 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:715 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:641 +#: ../midori/midori-view.c:701 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:921 +#: ../midori/midori-view.c:981 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:944 +#: ../midori/midori-view.c:1004 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:952 +#: ../midori/midori-view.c:1012 msgid "_Download Link destination" msgstr "Verweisziel _herunterladen" -#: ../midori/midori-view.c:974 -msgid "Open URL in New _Tab" -msgstr "URL in neuem _Reiter öffnen" +#: ../midori/midori-view.c:1034 +msgid "Open Address in New _Tab" +msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1382 +#: ../midori/midori-view.c:1463 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1522 +#: ../midori/midori-view.c:1606 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-view.c:1546 +#: ../midori/midori-view.c:1630 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1226,90 +1229,130 @@ msgstr "Schrifteinstellungen" msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:426 +msgid "The default font size used to display text" +msgstr "Die Standardschriftgröße, in der Text angezeigt wird" + +#: ../midori/midori-preferences.c:429 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:432 +msgid "The minimum font size used to display text" +msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" + +#: ../midori/midori-preferences.c:439 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:442 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:449 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:450 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:451 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Bilder automatisch laden" #: ../midori/midori-preferences.c:454 +msgid "Load and display images automatically" +msgstr "Bilder automatisch laden und anzeigen" + +#: ../midori/midori-preferences.c:457 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:458 +msgid "Automatically shrink standalone images to fit" +msgstr "Einzelne Bilder automatisch angemessen verkleinern" + +#: ../midori/midori-preferences.c:461 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:462 +msgid "Whether background images should be printed" +msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" + +#: ../midori/midori-preferences.c:465 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:463 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:466 +msgid "Whether text areas are resizable" +msgstr "Sollen Textfelder vergrößerbar sein oder nicht" + +#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:466 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:470 +msgid "Enable embedded scripting languages" +msgstr "Eingebettete Skriptsprachen einschalten" + +#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:474 +msgid "Enable embedded plugin objects" +msgstr "Eingebettete Zusatzmodule einschalten" + +#: ../midori/midori-preferences.c:477 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:472 -msgid "Enforce 96 DPI" -msgstr "Erzwinge 96 DPI" +#: ../midori/midori-preferences.c:478 +msgid "Enable special extensions for developers" +msgstr "Besondere Erweiterungen für Entwickler einschalten" + +#: ../midori/midori-preferences.c:481 +msgid "Enforce 96 dots per inch" +msgstr "Erzwinge 96 Punkte pro Zoll" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Erzwinge eine Punktdichte von 96 DPI" #. Page "Interface" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:490 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:491 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:507 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:528 ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:558 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:574 msgid "Web Cookies" msgstr "Netzkekse" -#: ../midori/midori-preferences.c:577 ../midori/midori-preferences.c:589 +#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 msgid "days" msgstr "Tage" @@ -1345,7 +1388,8 @@ msgstr "Suchmaschinen verwalten" msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/sokoke.c:340 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:346 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" @@ -1435,3 +1479,21 @@ msgstr "Skripte" #: ../extensions/statusbar-features.c:44 msgid "Plugins" msgstr "Zusatzmodule" + +#~ msgid "Root" +#~ msgstr "Wurzel" + +#~ msgid "[URIs]" +#~ msgstr "[URIs]" + +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP-Zwischenrechner" + +#~ msgid "URIs" +#~ msgstr "URIs" + +#~ msgid "_URL:" +#~ msgstr "_URL:" + +#~ msgid "Open URL in New _Tab" +#~ msgstr "URL in neuem _Reiter öffnen" From 2fc060037d563bb64a9c5a3377b8fe38b25295ce Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jan 2009 19:34:32 +0100 Subject: [PATCH 0616/2970] Update Dutch translation --- po/nl.po | 954 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 549 insertions(+), 405 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7ce87910..ce8db9b7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" +"POT-Creation-Date: 2009-01-04 19:06+0100\n" "PO-Revision-Date: 2008-11-10 02:02+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch\n" @@ -20,8 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lichtgewicht webbrowser" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 +#: ../midori/main.c:1928 ../midori/main.c:1939 +#: ../midori/midori-websettings.c:235 msgid "Midori" msgstr "Midori" @@ -29,677 +30,717 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:86 +#: ../midori/main.c:87 msgid "_Bookmark" msgstr "_Bladwijzer" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:88 ../midori/midori-browser.c:3797 msgid "_Bookmarks" msgstr "_Bladwijzers" -#: ../midori/main.c:88 +#: ../midori/main.c:89 msgid "_Add Bookmark" msgstr "Bladwijzer _toevoegen" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Extensions" msgstr "_Extensies" -#: ../midori/main.c:91 +#: ../midori/main.c:92 msgid "_History" msgstr "_Geschiedenis" -#: ../midori/main.c:92 +#: ../midori/main.c:93 msgid "_Homepage" msgstr "_Homepage" -#: ../midori/main.c:93 +#: ../midori/main.c:94 msgid "_Userscripts" msgstr "Gebruikers_scripts" -#: ../midori/main.c:94 +#: ../midori/main.c:95 msgid "User_styles" msgstr "Gebruikers_opmaakprofielen" -#: ../midori/main.c:95 +#: ../midori/main.c:96 msgid "New _Tab" msgstr "Nieuw _tabblad" -#: ../midori/main.c:96 +#: ../midori/main.c:97 msgid "_Transfers" msgstr "Bestands_overdrachten" -#: ../midori/main.c:97 +#: ../midori/main.c:98 msgid "_Closed Tabs and Windows" msgstr "Ge_sloten tabbladen en vensters" -#: ../midori/main.c:98 +#: ../midori/main.c:99 msgid "New _Window" msgstr "Nieuw _venster" -#: ../midori/main.c:143 +#: ../midori/main.c:155 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Configuratie kan niet geladen worden: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:210 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Waarde '%s' is ongeldig voor %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:217 ../midori/main.c:287 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ongeldige waarde '%s'" -#: ../midori/main.c:532 +#: ../midori/main.c:529 msgid "File not found." msgstr "Bestand niet gevonden." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:537 ../midori/main.c:546 msgid "Malformed document." msgstr "Ongeldig document." -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:568 ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "Kan database niet openen: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kan item in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:678 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kan geschiedenis niet wissen: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:711 ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:841 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kan verjaarde items in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "Fout bij schrijven." - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Bestandsoverdrachten" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "De sessie kan niet worden opgeslagen. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "Voer de gegeven bestandsnaam uit als Javascript" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Versie-informatie weergeven" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URI's" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URI's]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Controleer op nieuwe versies op:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "Geen bestandsnaam ingegeven" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Midori is al actief maar reageert niet.\n" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "De bladwijzers kunnen niet geladen worden: %s\n" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "De sessie kan niet geladen worden: %s\n" - -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "De prullenbak kan niet geladen worden: %s\n" - -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "De geschiedenis kan niet geladen worden: %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "De volgende fouten hebben plaatsgevonden:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "De prullenbak kan niet worden opgeslagen. %s" - -#: ../midori/main.c:1715 +#: ../midori/main.c:869 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "De instellingen kunnen niet worden opgeslagen. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:897 ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" + +#: ../midori/main.c:1045 ../midori/sokoke.c:523 +#, c-format +msgid "Writing failed." +msgstr "Fout bij schrijven." + +#: ../midori/main.c:1075 ../midori/main.c:1100 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" + +#: ../midori/main.c:1123 ../midori/main.c:1147 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "De prullenbak kan niet worden opgeslagen. %s" + +#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 +msgid "Transfers" +msgstr "Bestandsoverdrachten" + +#: ../midori/main.c:1204 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "De sessie kan niet worden opgeslagen. %s" + +#: ../midori/main.c:1530 +msgid "Authentication Required" +msgstr "" + +#: ../midori/main.c:1546 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../midori/main.c:1560 +msgid "Username" +msgstr "" + +#: ../midori/main.c:1571 +msgid "Password" +msgstr "" + +#: ../midori/main.c:1675 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:1690 +msgid "Modify _preferences" +msgstr "" + +#: ../midori/main.c:1694 +msgid "Reset the last _session" +msgstr "" + +#: ../midori/main.c:1699 +msgid "Disable all _extensions" +msgstr "" + +#: ../midori/main.c:1828 +msgid "No filename specified" +msgstr "Geen bestandsnaam ingegeven" + +#: ../midori/main.c:1857 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Onbekende fout." + +#: ../midori/main.c:1880 +msgid "Run the specified filename as javascript" +msgstr "Voer de gegeven bestandsnaam uit als Javascript" + +#: ../midori/main.c:1882 +msgid "Display program version" +msgstr "Versie-informatie weergeven" + +#: ../midori/main.c:1884 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1916 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:1940 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" + +#: ../midori/main.c:1942 +msgid "Check for new versions at:" +msgstr "Controleer op nieuwe versies op:" + +#: ../midori/main.c:1965 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori is al actief maar reageert niet.\n" + +#: ../midori/main.c:2024 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "De bladwijzers kunnen niet geladen worden: %s\n" + +#: ../midori/main.c:2039 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "De sessie kan niet geladen worden: %s\n" + +#: ../midori/main.c:2052 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "De prullenbak kan niet geladen worden: %s\n" + +#: ../midori/main.c:2065 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "De geschiedenis kan niet geladen worden: %s\n" + +#: ../midori/main.c:2077 +msgid "The following errors occured:" +msgstr "De volgende fouten hebben plaatsgevonden:" + +#: ../midori/main.c:2093 +msgid "_Ignore" +msgstr "" + +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3161 msgid "Reload the current page" msgstr "De huidige pagina herladen" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." msgstr "Onverwachte actie '%s'." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 msgid "_Description:" msgstr "_Beschrijving:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 +msgid "_Address:" +msgstr "" #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Map:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Hoofdmap" +#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +msgid "Toplevel folder" +msgstr "" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1292 msgid "Open file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2369 msgid "Open in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2371 msgid "Open in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2646 msgid "Separator" msgstr "Scheidingsteken" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2757 #, c-format msgid "A week ago" msgstr "Eén week geleden" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2763 #, c-format msgid "%d days ago" msgstr "%d dagen geleden" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2770 msgid "Today" msgstr "Vandaag" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2772 msgid "Yesterday" msgstr "Gisteren" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2861 msgid "A lightweight web browser." msgstr "Een lichtgewicht webbrowser." -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2869 msgid "translator-credits" msgstr "Vincent Tunru " -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:2998 msgid "Are you sure you want to remove all history items?" msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3089 msgid "_File" msgstr "_Bestand" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3092 msgid "Open a new window" msgstr "Nieuw venster openen" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3095 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3098 msgid "Open a file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3101 msgid "Save to a file" msgstr "Opslaan naar bestand" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3103 msgid "_Close Tab" msgstr "Tabblad _sluiten" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3104 msgid "Close the current tab" msgstr "Huidig tabblad sluiten" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3106 msgid "C_lose Window" msgstr "Venster _sluiten" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3107 msgid "Close this window" msgstr "Dit venster sluiten" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3110 msgid "Print the current page" msgstr "Huidige pagina uitprinten" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3113 msgid "Quit the application" msgstr "Programma afsluiten" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3115 msgid "_Edit" msgstr "_Bewerken" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3118 msgid "Cut the selected text" msgstr "Geselecteerde tekst knippen" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 msgid "Copy the selected text" msgstr "Geselecteerde tekst kopiëren" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3127 msgid "Paste text from the clipboard" msgstr "Tekst van het klembord plakken" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected text" msgstr "Geselecteerde tekst verwijderen" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3133 msgid "Select all text" msgstr "Alle tekst selecteren" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3136 msgid "Find a word or phrase in the page" msgstr "Zoek naar een woord of zin in deze pagina" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3138 msgid "Find _Next" msgstr "Vo_lgende zoeken" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3139 msgid "Find the next occurrence of a word or phrase" msgstr "Volgende voorkomen van een woord of zin opzoeken" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3141 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3142 msgid "Find the previous occurrence of a word or phrase" msgstr "Vorige voorkomen van een woord of zin opzoeken" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3145 msgid "_Quick Find" msgstr "_Snel zoeken" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3146 msgid "Quickly jump to a word or phrase" msgstr "Snel naar een woord of zin springen" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3149 msgid "Configure the application preferences" msgstr "Voorkeuren instellen" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3151 msgid "_View" msgstr "_Beeld" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3152 msgid "_Toolbars" msgstr "_Werkbalken" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3164 msgid "Increase the zoom level" msgstr "Zoomniveau verhogen" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3167 msgid "Decrease the zoom level" msgstr "Zoomniveau verlagen" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3170 msgid "Reset the zoom level" msgstr "Zoomniveau op beginwaarde" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "_Bron bekijken" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3173 msgid "View the source code of the page" msgstr "Broncode van deze pagina bekijken" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3175 msgid "View Selection Source" msgstr "Bron van selectie bekijken" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3176 msgid "View the source code of the selection" msgstr "Bekijk de broncode van de geselecteerde tekst" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3180 msgid "Toggle fullscreen view" msgstr "Volledig scherm" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3182 msgid "_Go" msgstr "_Ga naar" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3185 msgid "Go back to the previous page" msgstr "Terug naar de vorige pagina" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3188 msgid "Go forward to the next page" msgstr "Naar de volgende pagina" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3191 msgid "Go to your homepage" msgstr "Naar de homepage" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3193 msgid "Empty Trash" msgstr "Prullenbak leegmaken" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3194 msgid "Delete the contents of the trash" msgstr "Verwijder de inhoud van de prullenbak" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Tabblad sluiten ongedaan maken" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3197 msgid "Open the last closed tab" msgstr "Open het laatst gesloten tabblad" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3201 msgid "Add a new bookmark" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3204 msgid "Edit the selected bookmark" msgstr "Geselecteerde bladwijzer bewerken" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3207 msgid "Delete the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3210 msgid "Delete the selected history item" msgstr "Geselecteerde item uit geschiedenis verwijderen" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3213 msgid "Clear the entire history" msgstr "Volledige geschiedenis wissen" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3216 msgid "Bookmark the selected history item" msgstr "Geselecteerde item uit geschiedenis toevoegen als bladwijzer" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3218 msgid "_Tools" msgstr "_Hulpmiddelen" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3221 msgid "Add, edit and remove search engines..." msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3225 msgid "_Previous Tab" msgstr "Vo_rig tabblad" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3226 msgid "Switch to the previous tab" msgstr "Overschakelen naar het vorige tabblad" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3228 msgid "_Next Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3229 msgid "Switch to the next tab" msgstr "Overschakelen naar het volgende tabblad" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3231 msgid "_Help" msgstr "_Hulp" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3233 msgid "_Contents" msgstr "_Inhoud" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3234 msgid "Show the documentation" msgstr "Documentatie weergeven" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3236 msgid "_Frequent questions" msgstr "_Veelgestelde vragen" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3237 msgid "Show the Frequently Asked Questions" msgstr "Veelgestelde vragen weergeven" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3239 msgid "_Report a bug" msgstr "Fouten _melden" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3240 msgid "Open Midori's bug tracker" msgstr "Open Midori's foutmelder" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3243 msgid "Show information about the program" msgstr "Informatie over dit programma weergeven" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3250 msgid "P_rivate Browsing" msgstr "P_rivé browsen" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3251 msgid "Don't save any private data while browsing" msgstr "Geen privé-data opslaan tijdens het browsen" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3256 msgid "_Menubar" msgstr "_Menubalk" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3257 msgid "Show menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3260 msgid "_Navigationbar" msgstr "_Navigatiebalk" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3261 msgid "Show navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3264 msgid "Side_panel" msgstr "_Paneel" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3265 msgid "Show sidepanel" msgstr "_Paneel weergeven" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3268 msgid "_Bookmarkbar" msgstr "_Bladwijzerbalk" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3269 msgid "Show bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3272 msgid "_Transferbar" msgstr "Bestands_overdrachten-balk" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3273 msgid "Show transferbar" msgstr "Bestandsoverdrachten-balk weergeven" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3276 msgid "_Statusbar" msgstr "_Statusbalk" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3277 msgid "Show statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3722 msgid "_Location..." msgstr "_Locatie..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3724 msgid "Open a particular location" msgstr "Open een locatie" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3748 msgid "_Web Search..." msgstr "Zoeken op het _web..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3750 msgid "Run a web search" msgstr "Doorzoek het web" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3769 msgid "Reopen a previously closed tab or window" msgstr "Heropen een eerder gesloten tabblad of venster" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3782 msgid "_Recently visited pages" msgstr "_Recent bezochte pagina's" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3784 msgid "Reopen pages that you visited earlier" msgstr "Eerder bezochte pagina's heropenen" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3799 msgid "Show the saved bookmarks" msgstr "Opgeslagen bladwijzers weergeven" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3812 msgid "_Window" msgstr "_Venster" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3814 msgid "Show a list of all open tabs" msgstr "Geef een lijst met open tabbladen weer" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:3936 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 msgid "History" msgstr "Geschiedenis" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:4022 msgid "_Inline find:" msgstr "_Ingebed zoeken:" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:4053 msgid "Match Case" msgstr "Hoofdlettergevoelig" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4061 msgid "Highlight Matches" msgstr "Gevonden items markeren" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4070 msgid "Close Findbar" msgstr "Zoekbalk sluiten" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4318 #, c-format msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" @@ -708,568 +749,654 @@ msgstr "Onverwachte configuratie-optie '%s'" msgid "Close panel" msgstr "Paneel sluiten" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 msgid "Homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:147 msgid "Last open pages" msgstr "Laatst geopende pagina's" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:162 msgid "Chinese (BIG5)" msgstr "Chinees (BIG5)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:163 msgid "Japanese (SHIFT_JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:164 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:165 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:166 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 msgid "Custom..." msgstr "Aangepast..." -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:182 msgid "New tab" msgstr "Nieuw tabblad" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:183 msgid "New window" msgstr "Nieuw venster" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:184 msgid "Current tab" msgstr "Huidig tabblad" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:199 msgid "Default" msgstr "Standaard" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:200 msgid "Icons" msgstr "Pictogrammen" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:201 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:202 msgid "Both" msgstr "Beide" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:203 msgid "Both horizontal" msgstr "Beide horizontaal" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:218 msgid "All cookies" -msgstr "Alle cookies" +msgstr "Alle koekies" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Session cookies" -msgstr "Sessie-cookies" +msgstr "Sessie-koekies" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 msgid "None" msgstr "Geen" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:236 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:237 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:238 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:279 msgid "Remember last window size" msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:280 msgid "Whether to save the last window size" msgstr "Laatst gebruiken venstergrootte onthouden" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:288 msgid "Last window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:289 msgid "The last saved window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:297 msgid "Last window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:298 msgid "The last saved window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:306 msgid "Last panel position" msgstr "Laatst gebruikte positie van paneel" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:307 msgid "The last saved panel position" msgstr "Laatst gebruikte positie van paneel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:316 msgid "Last panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:317 msgid "The last saved panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:325 msgid "Last Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:326 msgid "The last saved Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:335 msgid "Show Menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:344 msgid "Show Navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:353 msgid "Show Bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:354 msgid "Whether to show the bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:362 msgid "Show Panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:363 msgid "Whether to show the panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:371 msgid "Show Statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:372 msgid "Whether to show the statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:381 msgid "Toolbar Style" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:382 msgid "The style of the toolbar" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:391 msgid "Toolbar Items" msgstr "Items in de werkbalk" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:392 msgid "The items to show on the toolbar" msgstr "Items om weer te geven in de werkbalk" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:400 msgid "Compact Sidepanel" msgstr "Compact paneel" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:401 msgid "Whether to make the sidepanel compact" msgstr "Het paneel compact weergeven" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "Load on Startup" msgstr "Laden bij opstarten" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:411 msgid "What to load on startup" msgstr "Wat geladen moet worden tijdens het opstarten" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:421 msgid "The homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:429 msgid "Download Folder" msgstr "Downloadmap" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:430 #, fuzzy msgid "The folder downloaded files are saved to" msgstr "De map waar gedownloadede de bestanden worden opgeslagen" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:438 msgid "Download Manager" msgstr "Downloadbeheer" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:439 msgid "An external download manager" msgstr "Extern downloadbeheer" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:447 msgid "Text Editor" msgstr "Tekstbewerker" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:448 msgid "An external text editor" msgstr "Een externe tekstbewerker" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:456 msgid "Location entry Search" msgstr "Zoeken vanuit locatieveld" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:457 msgid "The search to perform inside the location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:465 msgid "Preferred Encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:466 msgid "The preferred character encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:476 msgid "Always Show Tabbar" msgstr "Tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:477 msgid "Always show the tabbar" msgstr "Balk met tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:485 msgid "Close Buttons on Tabs" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:486 msgid "Whether tabs have close buttons" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:495 msgid "Open new pages in" msgstr "Nieuwe pagina's openen in" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:496 msgid "Where to open new pages" msgstr "Waar nieuwe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:506 msgid "Open external pages in" msgstr "Externe pagina's openen in" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:507 msgid "Where to open externally opened pages" msgstr "Waar externe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:516 msgid "Middle click opens Selection" msgstr "Middel-klikken opent selectie" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" +#: ../midori/midori-websettings.c:517 +#, fuzzy +msgid "Load an address from the selection via middle click" msgstr "Laad een URL vanuit de selectie met een klik op de middelste muisknop" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:525 msgid "Open tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:526 msgid "Whether to open new tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:534 msgid "Open Tabs next to Current" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:535 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:543 msgid "Open popups in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:544 msgid "Whether to open popup windows in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:587 msgid "Accept cookies" -msgstr "Cookies accepteren" +msgstr "Koekies accepteren" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:588 msgid "What type of cookies to accept" -msgstr "Welke soorten cookies geaccepteerd moeten worden" +msgstr "Welke soorten koekies geaccepteerd moeten worden" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:601 msgid "Original cookies only" -msgstr "Alleen originele cookies" +msgstr "Alleen originele koekies" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:602 msgid "Accept cookies from the original website only" -msgstr "Alleen cookies accepteren van de originele website" +msgstr "Alleen koekies accepteren van de originele website" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:610 msgid "Maximum cookie age" -msgstr "Maximale leeftijd van cookies" +msgstr "Maximale leeftijd van koekies" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:611 msgid "The maximum number of days to save cookies for" -msgstr "Hoeveel dagen een cookie maximaal bewaard mag worden" +msgstr "Hoeveel dagen een koekie maximaal bewaard mag worden" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:621 msgid "Remember last visited pages" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:622 msgid "Whether the last visited pages are saved" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:630 msgid "Maximum history age" msgstr "Dagen in geschiedenis" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:631 msgid "The maximum number of days to save the history for" msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:639 msgid "Remember last form inputs" msgstr "Laatst ingevoerde data in formulieren onthouden" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:640 msgid "Whether the last form inputs are saved" msgstr "Laatst ingevoerde data in formulieren onthouden" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:648 #, fuzzy msgid "Remember last downloaded files" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:649 #, fuzzy msgid "Whether the last downloaded files are saved" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "HTTP proxy" +#: ../midori/midori-websettings.c:659 +msgid "Proxy Server" +msgstr "" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" +#: ../midori/midori-websettings.c:660 +#, fuzzy +msgid "The proxy server used for HTTP connections" msgstr "De gebruikte proxy voor HTTP-verbindingen" -#: ../midori/midori-websettings.c:614 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:680 +msgid "Identify as" +msgstr "" + +#: ../midori/midori-websettings.c:681 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:701 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:702 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:714 msgid "Cache size" msgstr "Cachegrootte" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:715 msgid "The allowed size of the cache" msgstr "Toegestane grootte voor de cache" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:701 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:981 msgid "Open Link in New _Tab" msgstr "Link in nieuw _tabblad openen" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:1004 msgid "_Save Link destination" msgstr "Locatie _opslaan" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:1012 msgid "_Download Link destination" msgstr "Locatie _downloaden" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "URL in nieuw _tabblad openen" +#: ../midori/midori-view.c:1034 +#, fuzzy +msgid "Open Address in New _Tab" +msgstr "In nieuw _tabblad openen" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1463 #, c-format msgid "Inspect page - %s" msgstr "Pagina analyseren - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1606 msgid "Source" msgstr "Bron" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:1630 #, fuzzy, c-format msgid "No documentation installed" msgstr "Documentatie weergeven" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Voorkeuren voor %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:369 msgid "General" msgstr "Algemeen" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:370 msgid "Startup" msgstr "Opstarten" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:417 msgid "Appearance" msgstr "Weergave" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:418 msgid "Font settings" msgstr "Lettertype" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:420 msgid "Default Font Family" msgstr "Standaard lettertype" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:426 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:429 msgid "Minimum Font Size" msgstr "Minimale lettergrootte" +#: ../midori/midori-preferences.c:432 +msgid "The minimum font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:439 +#, fuzzy +msgid "Encoding" +msgstr "Voorkeurs-codering" + +#: ../midori/midori-preferences.c:442 +#, fuzzy +msgid "The character encoding to use by default" +msgstr "Voorkeurs-codering" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:449 msgid "Behavior" msgstr "Gedrag" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:450 msgid "Features" msgstr "Opties" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:454 +#, fuzzy +msgid "Load and display images automatically" +msgstr "Afbeeldingen automatisch laden" + +#: ../midori/midori-preferences.c:457 msgid "Shrink images automatically" msgstr "Afbeeldingen automatisch verkleinen" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:458 +msgid "Automatically shrink standalone images to fit" +msgstr "" + +#: ../midori/midori-preferences.c:461 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:462 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-preferences.c:465 msgid "Resizable text areas" msgstr "Schaalbare tekstvlakken" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:466 +#, fuzzy +msgid "Whether text areas are resizable" +msgstr "Laatst bezochte pagina's onthouden" + +#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Scripts aanzetten" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:470 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Plugins aanzetten" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:474 +#, fuzzy +msgid "Enable embedded plugin objects" +msgstr "Plugins aanzetten" + +#: ../midori/midori-preferences.c:477 msgid "Enable developer tools" msgstr "Ontwikkelaars-opties aanzetten" +#: ../midori/midori-preferences.c:478 +msgid "Enable special extensions for developers" +msgstr "" + +#: ../midori/midori-preferences.c:481 +msgid "Enforce 96 dots per inch" +msgstr "" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:490 msgid "Interface" msgstr "Gebruik" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:491 msgid "Navigationbar" msgstr "Navigatiebalk" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:507 msgid "Browsing" msgstr "Browsen" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 msgid "Network" msgstr "Netwerk" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:574 msgid "Web Cookies" -msgstr "Cookies" +msgstr "Koekies" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 msgid "days" msgstr "dagen" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Leeg" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Add search engine" msgstr "Zoekmachine toevoegen" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Edit search engine" msgstr "Zoekmachine bewerken" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:852 msgid "_Name:" msgstr "_Naam:" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:896 msgid "_Icon (name or file):" msgstr "_Pictogram (naam of bestand):" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:910 msgid "_Token:" msgstr "_Trefwoord:" -#: ../midori/midori-searchaction.c:1060 +#: ../midori/midori-searchaction.c:1087 msgid "Manage search engines" msgstr "Zoekmachines beheren" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "Kan externe applicatie niet uitvoeren." -#: ../midori/sokoke.c:282 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:346 msgid "Warning: You are using a superuser account!" msgstr "Waarschuwing: u bent ingelogd als root!" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Onbekende fout." - #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1285,19 +1412,19 @@ msgstr "%s kan niet toegewezen worden aan %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s is niet toegankelijk" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "Gebruikersscripts" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Gebruikersopmaakprofielen" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Inschakelen" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Uitschakelen" @@ -1323,16 +1450,16 @@ msgstr "Standaardpictogram '%s' kan niet geladen worden" msgid "Animation frames are broken" msgstr "Film-frames werken niet " -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschap '%s' is ongeldig voor %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 msgid "Choose file" msgstr "Bestand kiezen" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:231 msgid "Choose folder" msgstr "Map kiezen" @@ -1347,16 +1474,33 @@ msgstr "_Paginavak" #: ../extensions/statusbar-features.c:30 msgid "Images" -msgstr "" +msgstr "Afbeeldingen" #: ../extensions/statusbar-features.c:37 -#, fuzzy msgid "Scripts" -msgstr "Gebruikersscripts" +msgstr "Scripts" #: ../extensions/statusbar-features.c:44 msgid "Plugins" -msgstr "" +msgstr "Plugins" + +#~ msgid "Root" +#~ msgstr "Hoofdmap" + +#~ msgid "[URIs]" +#~ msgstr "[URI's]" + +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP proxy" + +#~ msgid "URIs" +#~ msgstr "URI's" + +#~ msgid "_URL:" +#~ msgstr "_URL:" + +#~ msgid "Open URL in New _Tab" +#~ msgstr "URL in nieuw _tabblad openen" #~ msgid "Open in Page_holder..." #~ msgstr "Openen in _paginavak" From 266771b969d52e6276e7628c65d60714f97bd927 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jan 2009 19:40:22 +0100 Subject: [PATCH 0617/2970] Update British translation --- po/en_GB.po | 940 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 538 insertions(+), 402 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 0db7c1bf..dff3f95e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" +"POT-Creation-Date: 2009-01-04 19:06+0100\n" "PO-Revision-Date: 2008-11-29 23:39+0100\n" "Last-Translator: Abigail Brady \n" "Language-Team: British English \n" @@ -20,8 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lightweight web browser" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 +#: ../midori/main.c:1928 ../midori/main.c:1939 +#: ../midori/midori-websettings.c:235 msgid "Midori" msgstr "Midori" @@ -29,679 +30,719 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web Browser" -#: ../midori/main.c:86 +#: ../midori/main.c:87 msgid "_Bookmark" msgstr "_Bookmark" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:88 ../midori/midori-browser.c:3797 msgid "_Bookmarks" msgstr "_Bookmarks" -#: ../midori/main.c:88 +#: ../midori/main.c:89 msgid "_Add Bookmark" msgstr "_Add Bookmark" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:91 +#: ../midori/main.c:92 msgid "_History" msgstr "_History" -#: ../midori/main.c:92 +#: ../midori/main.c:93 msgid "_Homepage" msgstr "_Homepage" -#: ../midori/main.c:93 +#: ../midori/main.c:94 msgid "_Userscripts" msgstr "_Userscripts" -#: ../midori/main.c:94 +#: ../midori/main.c:95 msgid "User_styles" msgstr "User_styles" -#: ../midori/main.c:95 +#: ../midori/main.c:96 msgid "New _Tab" msgstr "New _Tab" -#: ../midori/main.c:96 +#: ../midori/main.c:97 msgid "_Transfers" msgstr "_Transfers" -#: ../midori/main.c:97 +#: ../midori/main.c:98 msgid "_Closed Tabs and Windows" msgstr "_Closed Tabs and Windows" -#: ../midori/main.c:98 +#: ../midori/main.c:99 msgid "New _Window" msgstr "New _Window" -#: ../midori/main.c:143 +#: ../midori/main.c:155 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "The configuration couldn't be loaded: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:210 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Value '%s' is invalid for %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:217 ../midori/main.c:287 #, c-format msgid "Invalid configuration value '%s'" msgstr "Invalid configuration value '%s'" -#: ../midori/main.c:532 +#: ../midori/main.c:529 msgid "File not found." msgstr "File not found." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:537 ../midori/main.c:546 msgid "Malformed document." msgstr "Malformed document." -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:568 ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "Failed to open database: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Failed to remove history item: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:678 #, c-format msgid "Failed to clear history: %s\n" msgstr "Failed to clear history: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:711 ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" msgstr "Failed to add history item: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:841 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Failed to remove old history items: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "Writing failed." - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Transfers" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "The session couldn't be saved. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "Run the specified filename as javascript" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Display program version" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URIs" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URIs]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Please report comments, suggestions and bugs to:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Check for new versions at:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "No filename specified" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "An instance of Midori is already running but not responding.\n" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "The bookmarks couldn't be loaded: %s\n" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "The session couldn't be loaded: %s\n" - -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "The wastebasket couldn't be loaded: %s\n" - -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "The history couldn't be loaded: %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "The following errors occured:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "The search engines couldn't be saved. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "The bookmarks couldn't be saved. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "The wastebasket couldn't be saved. %s" - -#: ../midori/main.c:1715 +#: ../midori/main.c:869 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "The configuration couldn't be saved. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:897 ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "The search engines couldn't be saved. %s" + +#: ../midori/main.c:1045 ../midori/sokoke.c:523 +#, c-format +msgid "Writing failed." +msgstr "Writing failed." + +#: ../midori/main.c:1075 ../midori/main.c:1100 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "The bookmarks couldn't be saved. %s" + +#: ../midori/main.c:1123 ../midori/main.c:1147 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "The wastebasket couldn't be saved. %s" + +#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 +msgid "Transfers" +msgstr "Transfers" + +#: ../midori/main.c:1204 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "The session couldn't be saved. %s" + +#: ../midori/main.c:1530 +msgid "Authentication Required" +msgstr "Authentication Required" + +#: ../midori/main.c:1546 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../midori/main.c:1560 +msgid "Username" +msgstr "Username" + +#: ../midori/main.c:1571 +msgid "Password" +msgstr "Password" + +#: ../midori/main.c:1675 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:1690 +msgid "Modify _preferences" +msgstr "Modify _preferences" + +#: ../midori/main.c:1694 +msgid "Reset the last _session" +msgstr "Reset the last _session" + +#: ../midori/main.c:1699 +msgid "Disable all _extensions" +msgstr "Disable all _extensions" + +#: ../midori/main.c:1828 +msgid "No filename specified" +msgstr "No filename specified" + +#: ../midori/main.c:1857 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "An unknown error occured." + +#: ../midori/main.c:1880 +msgid "Run the specified filename as javascript" +msgstr "Run the specified filename as javascript" + +#: ../midori/main.c:1882 +msgid "Display program version" +msgstr "Display program version" + +#: ../midori/main.c:1884 +msgid "Addresses" +msgstr "Addresses" + +#: ../midori/main.c:1916 +msgid "[Addresses]" +msgstr "[Addresses]" + +#: ../midori/main.c:1940 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Please report comments, suggestions and bugs to:" + +#: ../midori/main.c:1942 +msgid "Check for new versions at:" +msgstr "Check for new versions at:" + +#: ../midori/main.c:1965 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "An instance of Midori is already running but not responding.\n" + +#: ../midori/main.c:2024 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "The bookmarks couldn't be loaded: %s\n" + +#: ../midori/main.c:2039 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "The session couldn't be loaded: %s\n" + +#: ../midori/main.c:2052 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "The wastebasket couldn't be loaded: %s\n" + +#: ../midori/main.c:2065 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "The history couldn't be loaded: %s\n" + +#: ../midori/main.c:2077 +msgid "The following errors occured:" +msgstr "The following errors occured:" + +#: ../midori/main.c:2093 +msgid "_Ignore" +msgstr "_Ignore" + +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3161 msgid "Reload the current page" msgstr "Reload the current page" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 msgid "Stop loading the current page" msgstr "Stop loading the current page" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" msgstr "%d%% loaded" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." msgstr "Unexpected action '%s'." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "New bookmark" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" msgstr "Edit bookmark" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "_Title:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 msgid "_Description:" msgstr "_Description:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 +msgid "_Address:" +msgstr "_Address:" #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Root" +#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +msgid "Toplevel folder" +msgstr "Toplevel folder" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "Save file as" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1292 msgid "Open file" msgstr "Open file" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2369 msgid "Open in New _Tab" msgstr "Open in New _Tab" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2371 msgid "Open in New _Window" msgstr "Open in New _Window" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2646 msgid "Separator" msgstr "Separator" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2757 #, c-format msgid "A week ago" msgstr "A week ago" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2763 #, c-format msgid "%d days ago" msgstr "%d days ago" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2770 msgid "Today" msgstr "Today" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2772 msgid "Yesterday" msgstr "Yesterday" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2861 msgid "A lightweight web browser." msgstr "A lightweight web browser." -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2869 msgid "translator-credits" msgstr "" "Bastien Nocera \n" "Abigail Brady " -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:2998 msgid "Are you sure you want to remove all history items?" msgstr "Are you sure you want to remove all history items?" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3089 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3092 msgid "Open a new window" msgstr "Open a new window" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3095 msgid "Open a new tab" msgstr "Open a new tab" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3098 msgid "Open a file" msgstr "Open a file" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3101 msgid "Save to a file" msgstr "Save to a file" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3103 msgid "_Close Tab" msgstr "_Close Tab" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3104 msgid "Close the current tab" msgstr "Close the current tab" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3106 msgid "C_lose Window" msgstr "C_lose Window" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3107 msgid "Close this window" msgstr "Close this window" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3110 msgid "Print the current page" msgstr "Print the current page" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3113 msgid "Quit the application" msgstr "Quit the application" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3115 msgid "_Edit" msgstr "_Edit" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3118 msgid "Cut the selected text" msgstr "Cut the selected text" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 msgid "Copy the selected text" msgstr "Copy the selected text" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3127 msgid "Paste text from the clipboard" msgstr "Paste text from the clipboard" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected text" msgstr "Delete the selected text" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3133 msgid "Select all text" msgstr "Select all text" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3136 msgid "Find a word or phrase in the page" msgstr "Find a word or phrase in the page" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3138 msgid "Find _Next" msgstr "Find _Next" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3139 msgid "Find the next occurrence of a word or phrase" msgstr "Find the next occurrence of a word or phrase" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3141 msgid "Find _Previous" msgstr "Find _Previous" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3142 msgid "Find the previous occurrence of a word or phrase" msgstr "Find the previous occurrence of a word or phrase" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3145 msgid "_Quick Find" msgstr "_Quick Find" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3146 msgid "Quickly jump to a word or phrase" msgstr "Quickly jump to a word or phrase" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3149 msgid "Configure the application preferences" msgstr "Configure the application preferences" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3151 msgid "_View" msgstr "_View" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3152 msgid "_Toolbars" msgstr "_Toolbars" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3164 msgid "Increase the zoom level" msgstr "Increase the zoom level" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3167 msgid "Decrease the zoom level" msgstr "Decrease the zoom level" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3170 msgid "Reset the zoom level" msgstr "Reset the zoom level" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "View _Source" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3173 msgid "View the source code of the page" msgstr "View the source code of the page" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3175 msgid "View Selection Source" msgstr "View Selection Source" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3176 msgid "View the source code of the selection" msgstr "View the source code of the selection" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3180 msgid "Toggle fullscreen view" msgstr "Toggle fullscreen view" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3182 msgid "_Go" msgstr "_Go" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3185 msgid "Go back to the previous page" msgstr "Go back to the previous page" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3188 msgid "Go forward to the next page" msgstr "Go forward to the next page" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3191 msgid "Go to your homepage" msgstr "Go to your homepage" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3193 msgid "Empty Trash" msgstr "Empty Wastebasket" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3194 msgid "Delete the contents of the trash" msgstr "Delete the contents of the wastebasket" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Undo Close Tab" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3197 msgid "Open the last closed tab" msgstr "Open the last closed tab" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3201 msgid "Add a new bookmark" msgstr "Add a new bookmark" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3204 msgid "Edit the selected bookmark" msgstr "Edit the selected bookmark" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3207 msgid "Delete the selected bookmark" msgstr "Delete the selected bookmark" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3210 msgid "Delete the selected history item" msgstr "Delete the selected history item" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3213 msgid "Clear the entire history" msgstr "Clear the entire history" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3216 msgid "Bookmark the selected history item" msgstr "Bookmark the selected history item" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3218 msgid "_Tools" msgstr "_Tools" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 msgid "_Manage Search Engines" msgstr "_Manage Search Engines" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3221 msgid "Add, edit and remove search engines..." msgstr "Add, edit and remove search engines..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3225 msgid "_Previous Tab" msgstr "_Previous Tab" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3226 msgid "Switch to the previous tab" msgstr "Switch to the previous tab" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3228 msgid "_Next Tab" msgstr "_Next Tab" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3229 msgid "Switch to the next tab" msgstr "Switch to the next tab" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3231 msgid "_Help" msgstr "_Help" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3233 msgid "_Contents" msgstr "_Contents" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3234 msgid "Show the documentation" msgstr "Show the documentation" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3236 msgid "_Frequent questions" msgstr "_Frequent questions" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3237 msgid "Show the Frequently Asked Questions" msgstr "Show the Frequently Asked Questions" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3239 msgid "_Report a bug" msgstr "_Report a bug" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3240 msgid "Open Midori's bug tracker" msgstr "Open Midori's bug tracker" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3243 msgid "Show information about the program" msgstr "Show information about the program" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3250 msgid "P_rivate Browsing" msgstr "P_rivate Browsing" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3251 msgid "Don't save any private data while browsing" msgstr "Don't save any private data while browsing" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3256 msgid "_Menubar" msgstr "_Menubar" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3257 msgid "Show menubar" msgstr "Show menubar" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3260 msgid "_Navigationbar" msgstr "_Navigationbar" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3261 msgid "Show navigationbar" msgstr "Show navigationbar" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3264 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3265 msgid "Show sidepanel" msgstr "Show sidepanel" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3268 msgid "_Bookmarkbar" msgstr "_Bookmarkbar" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3269 msgid "Show bookmarkbar" msgstr "Show bookmarkbar" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3272 msgid "_Transferbar" msgstr "_Transferbar" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3273 msgid "Show transferbar" msgstr "Show transferbar" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3276 msgid "_Statusbar" msgstr "_Statusbar" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3277 msgid "Show statusbar" msgstr "Show statusbar" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3722 msgid "_Location..." msgstr "_Location..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3724 msgid "Open a particular location" msgstr "Open a particular location" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3748 msgid "_Web Search..." msgstr "_Web Search..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3750 msgid "Run a web search" msgstr "Run a web search" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3769 msgid "Reopen a previously closed tab or window" msgstr "Reopen a previously closed tab or window" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3782 msgid "_Recently visited pages" msgstr "_Recently visited pages" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3784 msgid "Reopen pages that you visited earlier" msgstr "Reopen pages that you visited earlier" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3799 msgid "Show the saved bookmarks" msgstr "Show the saved bookmarks" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3812 msgid "_Window" msgstr "_Window" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3814 msgid "Show a list of all open tabs" msgstr "Show a list of all open tabs" -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:3936 msgid "Bookmarks" msgstr "Bookmarks" -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 msgid "History" msgstr "History" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 +#: ../midori/midori-browser.c:4022 msgid "_Inline find:" msgstr "_Inline find:" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:4053 msgid "Match Case" msgstr "Match Case" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4061 msgid "Highlight Matches" msgstr "Highlight Matches" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4070 msgid "Close Findbar" msgstr "Close Findbar" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4318 #, c-format msgid "Unexpected setting '%s'" msgstr "Unexpected setting '%s'" @@ -710,565 +751,643 @@ msgstr "Unexpected setting '%s'" msgid "Close panel" msgstr "Close panel" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 msgid "Homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:147 msgid "Last open pages" msgstr "Last open pages" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:162 msgid "Chinese (BIG5)" msgstr "Chinese (BIG5)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:163 msgid "Japanese (SHIFT_JIS)" msgstr "Japanese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:164 msgid "Russian (KOI8-R)" msgstr "Russian (KOI8-R)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:165 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:166 msgid "Western (ISO-8859-1)" msgstr "Western (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 msgid "Custom..." msgstr "Custom..." -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:182 msgid "New tab" msgstr "New tab" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:183 msgid "New window" msgstr "New window" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:184 msgid "Current tab" msgstr "Current tab" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:199 msgid "Default" msgstr "Default" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:200 msgid "Icons" msgstr "Icons" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:201 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:202 msgid "Both" msgstr "Both" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:203 msgid "Both horizontal" msgstr "Both horizontal" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:218 msgid "All cookies" msgstr "All cookies" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:219 msgid "Session cookies" msgstr "Session cookies" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 msgid "None" msgstr "None" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:236 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:237 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:238 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:279 msgid "Remember last window size" msgstr "Remember last window size" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:280 msgid "Whether to save the last window size" msgstr "Whether to save the last window size" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:288 msgid "Last window width" msgstr "Last window width" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:289 msgid "The last saved window width" msgstr "The last saved window width" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:297 msgid "Last window height" msgstr "Last window height" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:298 msgid "The last saved window height" msgstr "The last saved window height" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:306 msgid "Last panel position" msgstr "Last panel position" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:307 msgid "The last saved panel position" msgstr "The last saved panel position" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:316 msgid "Last panel page" msgstr "Last panel page" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:317 msgid "The last saved panel page" msgstr "The last saved panel page" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:325 msgid "Last Web search" msgstr "Last Web search" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:326 msgid "The last saved Web search" msgstr "The last saved Web search" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:335 msgid "Show Menubar" msgstr "Show Menubar" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:336 msgid "Whether to show the menubar" msgstr "Whether to show the menubar" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:344 msgid "Show Navigationbar" msgstr "Show Navigationbar" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:345 msgid "Whether to show the navigationbar" msgstr "Whether to show the navigationbar" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:353 msgid "Show Bookmarkbar" msgstr "Show Bookmarkbar" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:354 msgid "Whether to show the bookmarkbar" msgstr "Whether to show the bookmarkbar" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:362 msgid "Show Panel" msgstr "Show Panel" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:363 msgid "Whether to show the panel" msgstr "Whether to show the panel" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:371 msgid "Show Statusbar" msgstr "Show Statusbar" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:372 msgid "Whether to show the statusbar" msgstr "Whether to show the statusbar" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:381 msgid "Toolbar Style" msgstr "Toolbar Style" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:382 msgid "The style of the toolbar" msgstr "The style of the toolbar" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:391 msgid "Toolbar Items" msgstr "Toolbar Items" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:392 msgid "The items to show on the toolbar" msgstr "The items to show on the toolbar" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:400 msgid "Compact Sidepanel" msgstr "Compact Sidepanel" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:401 msgid "Whether to make the sidepanel compact" msgstr "Whether to make the sidepanel compact" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:410 msgid "Load on Startup" msgstr "Load on Startup" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:411 msgid "What to load on startup" msgstr "What to load on startup" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:421 msgid "The homepage" msgstr "The homepage" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:429 msgid "Download Folder" msgstr "Download Folder" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:430 msgid "The folder downloaded files are saved to" msgstr "The folder downloaded files are saved to" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:438 msgid "Download Manager" msgstr "Download Manager" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:439 msgid "An external download manager" msgstr "An external download manager" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:447 msgid "Text Editor" msgstr "Text Editor" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:448 msgid "An external text editor" msgstr "An external text editor" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:456 msgid "Location entry Search" msgstr "Location entry Search" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:457 msgid "The search to perform inside the location entry" msgstr "The search to perform inside the location entry" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:465 msgid "Preferred Encoding" msgstr "Preferred Encoding" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:466 msgid "The preferred character encoding" msgstr "The preferred character encoding" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:476 msgid "Always Show Tabbar" msgstr "Always Show Tabbar" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:477 msgid "Always show the tabbar" msgstr "Always show the tabbar" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:485 msgid "Close Buttons on Tabs" msgstr "Close Buttons on Tabs" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:486 msgid "Whether tabs have close buttons" msgstr "Whether tabs have close buttons" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:495 msgid "Open new pages in" msgstr "Open new pages in" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:496 msgid "Where to open new pages" msgstr "Where to open new pages" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:506 msgid "Open external pages in" msgstr "Open external pages in" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:507 msgid "Where to open externally opened pages" msgstr "Where to open externally opened pages" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:516 msgid "Middle click opens Selection" msgstr "Middle click opens Selection" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "Load an URL from the selection via middle click" +#: ../midori/midori-websettings.c:517 +msgid "Load an address from the selection via middle click" +msgstr "Load an address from the selection via middle click" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:525 msgid "Open tabs in the background" msgstr "Open tabs in the background" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:526 msgid "Whether to open new tabs in the background" msgstr "Whether to open new tabs in the background" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:534 msgid "Open Tabs next to Current" msgstr "Open Tabs next to Current" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:535 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Whether to open new tabs next to the current tab or after the last one" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:543 msgid "Open popups in tabs" msgstr "Open popups in tabs" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:544 msgid "Whether to open popup windows in tabs" msgstr "Whether to open popup windows in tabs" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:587 msgid "Accept cookies" msgstr "Accept cookies" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:588 msgid "What type of cookies to accept" msgstr "What type of cookies to accept" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:601 msgid "Original cookies only" msgstr "Original cookies only" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:602 msgid "Accept cookies from the original website only" msgstr "Accept cookies from the original website only" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:610 msgid "Maximum cookie age" msgstr "Maximum cookie age" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:611 msgid "The maximum number of days to save cookies for" msgstr "The maximum number of days to save cookies for" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:621 msgid "Remember last visited pages" msgstr "Remember last visited pages" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:622 msgid "Whether the last visited pages are saved" msgstr "Whether the last visited pages are saved" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:630 msgid "Maximum history age" msgstr "Maximum history age" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:631 msgid "The maximum number of days to save the history for" msgstr "The maximum number of days to save the history for" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:639 msgid "Remember last form inputs" msgstr "Remember last form inputs" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:640 msgid "Whether the last form inputs are saved" msgstr "Whether the last form inputs are saved" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:648 msgid "Remember last downloaded files" msgstr "Remember last downloaded files" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:649 msgid "Whether the last downloaded files are saved" msgstr "Whether the last downloaded files are saved" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "HTTP Proxy" +#: ../midori/midori-websettings.c:659 +msgid "Proxy Server" +msgstr "Proxy Server" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "The proxy used for HTTP connections" +#: ../midori/midori-websettings.c:660 +msgid "The proxy server used for HTTP connections" +msgstr "The proxy server used for HTTP connections" -#: ../midori/midori-websettings.c:614 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:680 +msgid "Identify as" +msgstr "Identify as" + +#: ../midori/midori-websettings.c:681 +msgid "What to identify as to web pages" +msgstr "What to identify as to web pages" + +#: ../midori/midori-websettings.c:701 +msgid "Identification string" +msgstr "Identification string" + +#: ../midori/midori-websettings.c:702 +msgid "The application identification string" +msgstr "The application identification string" + +#: ../midori/midori-websettings.c:714 msgid "Cache size" msgstr "Cache size" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:715 msgid "The allowed size of the cache" msgstr "The allowed size of the cache" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:701 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Not found - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:981 msgid "Open Link in New _Tab" msgstr "Open Link in New _Tab" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:1004 msgid "_Save Link destination" msgstr "_Save Link destination" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:1012 msgid "_Download Link destination" msgstr "_Download Link destination" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Open URL in New _Tab" +#: ../midori/midori-view.c:1034 +msgid "Open Address in New _Tab" +msgstr "Open Address in New _Tab" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1463 #, c-format msgid "Inspect page - %s" msgstr "Inspect page - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1606 msgid "Source" msgstr "Source" -#: ../midori/midori-view.c:1527 -#, fuzzy, c-format +#: ../midori/midori-view.c:1630 +#, c-format msgid "No documentation installed" -msgstr "Show the documentation" +msgstr "No documentation installed" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Preferences for %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:369 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:370 msgid "Startup" msgstr "Startup" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:417 msgid "Appearance" msgstr "Appearance" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:418 msgid "Font settings" msgstr "Font settings" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:420 msgid "Default Font Family" msgstr "Default Font Family" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:426 +msgid "The default font size used to display text" +msgstr "The default font size used to display text" + +#: ../midori/midori-preferences.c:429 msgid "Minimum Font Size" msgstr "Minimum Font Size" +#: ../midori/midori-preferences.c:432 +msgid "The minimum font size used to display text" +msgstr "The minimum font size used to display text" + +#: ../midori/midori-preferences.c:439 +msgid "Encoding" +msgstr "Encoding" + +#: ../midori/midori-preferences.c:442 +msgid "The character encoding to use by default" +msgstr "The character encoding to use by default" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:449 msgid "Behavior" msgstr "Behaviour" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:450 msgid "Features" msgstr "Features" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 msgid "Load images automatically" msgstr "Load images automatically" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:454 +msgid "Load and display images automatically" +msgstr "Load and display images automatically" + +#: ../midori/midori-preferences.c:457 msgid "Shrink images automatically" msgstr "Shrink images automatically" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:458 +msgid "Automatically shrink standalone images to fit" +msgstr "Automatically shrink standalone images to fit" + +#: ../midori/midori-preferences.c:461 msgid "Print background images" msgstr "Print background images" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:462 +msgid "Whether background images should be printed" +msgstr "Whether background images should be printed" + +#: ../midori/midori-preferences.c:465 msgid "Resizable text areas" msgstr "Resizable text areas" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:466 +msgid "Whether text areas are resizable" +msgstr "Whether text areas are resizable" + +#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 msgid "Enable scripts" msgstr "Enable scripts" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:470 +msgid "Enable embedded scripting languages" +msgstr "Enable embedded scripting languages" + +#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 msgid "Enable plugins" msgstr "Enable plugins" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:474 +msgid "Enable embedded plugin objects" +msgstr "Enable embedded plugin objects" + +#: ../midori/midori-preferences.c:477 msgid "Enable developer tools" msgstr "Enable developer tools" +#: ../midori/midori-preferences.c:478 +msgid "Enable special extensions for developers" +msgstr "Enable special extensions for developers" + +#: ../midori/midori-preferences.c:481 +msgid "Enforce 96 dots per inch" +msgstr "Enforce 96 dots per inch" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Enforce a video dot density of 96 DPI" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:490 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:491 msgid "Navigationbar" msgstr "Navigationbar" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:507 msgid "Browsing" msgstr "Browsing" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 msgid "Network" msgstr "Network" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:574 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 msgid "days" msgstr "days" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 msgid "Empty" msgstr "Empty" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Add search engine" msgstr "Add search engine" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:824 msgid "Edit search engine" msgstr "Edit search engine" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:852 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:896 msgid "_Icon (name or file):" msgstr "_Icon (name or file):" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:910 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1060 +#: ../midori/midori-searchaction.c:1087 msgid "Manage search engines" msgstr "Manage search engines" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "Could not run external program." -#: ../midori/sokoke.c:282 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:346 msgid "Warning: You are using a superuser account!" msgstr "Warning: You are using a superuser account!" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "An unknown error occured." - #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1284,19 +1403,19 @@ msgstr "%s cannot be assigned to %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s cannot be accessed" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "Userscripts" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Userstyles" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Enable" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Disable" @@ -1322,16 +1441,16 @@ msgstr "Stock icon '%s' couldn't be loaded" msgid "Animation frames are broken" msgstr "Animation frames are broken" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Property '%s' is invalid for %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 msgid "Choose file" msgstr "Choose file" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:231 msgid "Choose folder" msgstr "Choose folder" @@ -1346,13 +1465,30 @@ msgstr "_Pageholder" #: ../extensions/statusbar-features.c:30 msgid "Images" -msgstr "" +msgstr "Images" #: ../extensions/statusbar-features.c:37 -#, fuzzy msgid "Scripts" -msgstr "Userscripts" +msgstr "Scripts" #: ../extensions/statusbar-features.c:44 msgid "Plugins" -msgstr "" +msgstr "Plugins" + +#~ msgid "Root" +#~ msgstr "Root" + +#~ msgid "[URIs]" +#~ msgstr "[URIs]" + +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP Proxy" + +#~ msgid "URIs" +#~ msgstr "URIs" + +#~ msgid "_URL:" +#~ msgstr "_URL:" + +#~ msgid "Open URL in New _Tab" +#~ msgstr "Open URL in New _Tab" From ee9e8d77e52702986986388e860e3a116b870916 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jan 2009 21:38:06 +0100 Subject: [PATCH 0618/2970] Update Waf to 1.5.1 and update build scripts accordingly --- extensions/wscript_build | 5 +- icons/wscript_build | 39 ++++--- katze/wscript_build | 4 +- midori/wscript_build | 4 +- tests/wscript_build | 2 +- waf | Bin 103019 -> 75065 bytes wscript | 221 +++++++++++++++++++-------------------- 7 files changed, 135 insertions(+), 140 deletions(-) diff --git a/extensions/wscript_build b/extensions/wscript_build index 4b75ea7b..aa93727a 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -20,11 +20,10 @@ for extension in extensions: source = extension includes = '..' - obj = bld.create_obj ('cc', 'shlib') + obj = bld.new_task_gen ('cc', 'shlib') obj.target = target obj.includes = includes obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' - obj.inst_var = 'LIBDIR' - obj.inst_dir = 'midori' + obj.install_path = '${LIBDIR}/midori' diff --git a/icons/wscript_build b/icons/wscript_build index 2896e0cf..05d22639 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -2,24 +2,22 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. -def add_image (bld, install_files, category, name): - import os - import pproc as subprocess +def add_image (bld, category, name): srcdir = os.getcwd () - blddir = bld.m_bdir + blddir = bld.bdir def mkdir (path): if not os.access (path, os.F_OK): os.mkdir (path) - def _install_files (folder, destination, source): + def install_files (folder, destination, source): try: - install_files (folder, destination, source) + bld.install_files (folder, destination, source) except: pass - rsvg_convert = bld.env ()['RSVG_CONVERT'] + rsvg_convert = bld.env['RSVG_CONVERT'] if rsvg_convert: mkdir (blddir + '/icons') @@ -27,24 +25,23 @@ def add_image (bld, install_files, category, name): for size in [16, 22, 32, 48]: format = str (size) + 'x' + str (size) if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): - _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, - srcdir + '/icons/' + format + '/' + name + '.png') + install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, + srcdir + '/icons/' + format + '/' + name + '.png') elif not rsvg_convert: pass elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): mkdir (blddir + '/icons/' + format) - convert = subprocess.Popen ([rsvg_convert, - '-w', str (size), '-h', str (size), - '-o', blddir + '/icons/' + format + '/' + name + '.png', - srcdir + '/icons/scalable/' + name + '.svg'], - stderr=subprocess.PIPE) - if not convert.wait (): - _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, - blddir + '/icons/' + format + '/' + name + '.png') + command = rsvg_convert + ' -w ' + str(size) + \ + ' -h ' + str(size) + \ + ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ + ' ' + srcdir + '/icons/scalable/' + name + '.svg' + if not Utils.exec_command (command): + install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, + blddir + '/icons/' + format + '/' + name + '.png') else: - Params.pprint ('BLUE', "Optimized icons could not be created.") + Utils.pprint ('BLUE', "Optimized icons could not be created.") break -add_image (bld, install_files, 'categories', 'extension') -add_image (bld, install_files, 'apps', 'midori') -add_image (bld, install_files, 'status', 'news-feed') +add_image (bld, 'categories', 'extension') +add_image (bld, 'apps', 'midori') +add_image (bld, 'status', 'news-feed') diff --git a/katze/wscript_build b/katze/wscript_build index aad466c1..4d1ba61c 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -4,13 +4,13 @@ import platform -obj = bld.create_obj ('cc', 'staticlib') +obj = bld.new_task_gen ('cc', 'staticlib') obj.name = 'katze' obj.target = 'katze' obj.includes = '.' obj.find_sources_in_dirs ('.') obj.uselib = 'GMODULE LIBSOUP GTK LIBXML' -obj.inst_var = 0 +obj.install_path = None if platform.architecture ()[0] == '64bit': obj.env.append_value ('CCFLAGS', '-fPIC') diff --git a/midori/wscript_build b/midori/wscript_build index 4423f43f..3e4aa9b4 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -2,7 +2,9 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. -obj = bld.create_obj ('cc', 'program') +obj = bld.new_task_gen ('cc', 'program') +# After waf 1.4.4 this additional link flag is needed for extensions +obj.env.append_value ('LINKFLAGS', '-Wl,--export-dynamic') obj.target = 'midori' obj.includes = '. .. ../panels' obj.find_sources_in_dirs ('. ../panels') diff --git a/tests/wscript_build b/tests/wscript_build index f0b93d35..e3cd8d4d 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -2,7 +2,7 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. -obj = bld.create_obj ('cc', 'program') +obj = bld.new_task_gen ('cc', 'program') obj.target = 'magic-uri' obj.includes = '.. ../midori' obj.source = 'magic-uri.c ../midori/compat.c ../midori/sokoke.c' diff --git a/waf b/waf index 85f66f3feaecfd0e8a647c18141a3b4107800551..935acbf50cf0859f79f8cff6d06df2310db051ea 100755 GIT binary patch delta 72324 zcmY&R6Pj*g3IXErM zIiQ^EoZMzmZaz~Es43Kf*V2NA4{DL9izZ1-7dFmtlQOu zC0=meH}+tO&LBLY4a*uE5hDLU{8HEkgo&PAc-*2H3ENRhNg!xE%z0k~To;OHwIk+L zeF~ZMM-)?zs3wzPMxq;}pfFA8@(aOM1U`*YFZSmSo$^Wd(K&0~^^M5CMppfF+O zXid9bn}8rlWP4Lj!_7+w$-*}=c>(Iw5{zg)sD{CRDb1#;m-XG*ch9|@J&%2b!(=^u zhh`R=eI}!B$-RB=@6>(0$3YOG6_U;k7Tt3P=*{x9R89MSwg|+huF%!v{z7i?!8;=t zGR)iJ>bCghBN;;JK1)z<8#A!Z*pS<(J{to$XXE0} zx{PNU2|uZ9u9a^dP!c>$oh;pWFK%4ecRJK|u6w(EbIp6B|Ywom_f@UDM)*!oJTf0r4?>+mL|lOO+j-QoKpU~G)N6JBv~ zEYaK7z3}OL2sCIC5k8-4YNYc$%Wls!d@xf{m{{i%aBjO0Sp8l-x$p4P;QapT`-LNG zSG!iQ^>xC%cfblU2oejJt^f3DX*Q#6{OGa* zhn^b*Y4$!VkaAA$tY0_!TDno=-B8oi<^AQLqw^T%>-#Y69-2Xgj)Xvkkb!_?jgKJd zufR#L60Lw3hcFLNk)j4L=82(G(FK|#$Yd}cCH18%F`kzBC837ql=!n-d-)?+&mbU3 z)56}q5s{SiXY!O!$5xPBAdbqgwnmopHz)nysTPaJ5wppovX17oHRZIXKF(RlQNE6) z#b#hfJbvp2fe{c;WN$p~h@`>uDEN0Eh-K&^nS7p*5Un)`3<8sqTEESP{V(U{HLsvI;PVC3?;u59-!T>v z*dng0ihViU7z82kcaTsAKPk;W@xG8e=|IREG|Z-#J3L)G9e#ILZ+-2UFEx7Db0OPBMy%wQ;Vyq zpuoUjd3oiGHP!<@{N-+I2>x6D7ETIs>-l|nOPKN4p`5C@*>+T3XX~jl#rQ_RzgBU zUS3{;bAS^^Tmni>FiIdT->4?80#j38P{CD~@0XXyQGJ^Yz*E8OnUq%%QBxt{R8>${ zk-^24P~*Um!30BLDiQ>f%Ie9O@`HrxFkCivHJo`als9VC-@TDRt3acQ3qomv;p3^} zNT6`S24t93IB=EY21KE9_&6|HSUd_rl5#wl10qVOfhapKP6$K9)j;7~z+qE?62#+* zzGIYt0$lH4c(9pwh&WX$cr%TSP!u_FQ3(w&vWl{VnEHggvN$0kp$0yzPEp%bwhleNRF(QGJ;!DuMjMNoxc8JbWmkzz8 zKvm4tJTFi?A}>F#LKdlb#*hHcvq*!dl;}oO1Q*-VmaE#* z*(Mcbpj+Y;6bG78rnhelxFj2Q`FYbO7Kq>^$t2!fYFomXUIgPwt&7FQwmMgu|xsxFubPD_JOQGm{% zONvTOn=dP!kid{vmJ-fHVo6mH9>J7Cg^|Qmkdne^T7d$GGlC#MIcYeRF-^KZJVTlW z0|b!{X9x#D7~o75=r$k-+$I8@ju;+cl99()KxI=BiVpLqF=muCRi(<$r(&RDED1D` zh8GZr7F3{9SHKHob<+#pmY!cwkroPq(1sU*Ao&cc@g=5t8RaH{HsSCBI8y=KG`!qa zx+t8qIG-v4cw-(CF}Nh@ZAoP`bml232=Ki8q6kL+JO(-@;{sY6ZLq9ySxQ6&4FjVw z9G;&Jf>h+AGnKvl$GoT@u&BTv&RASfkf5HB5dfz#l?6dE!b1~6nWRgo!b|cs!!cxK zb?IzMObX(Pm;!9knf!|@WZ|aiOz=P%8XDySfXcLp(K;e8LR&h$7%oy0UceO0Pz(>Z zDGN_aNQjHDL^m!s4wj~Vlbm?}0P6^y5^4q-gkpw>H1u+F2D~^%(l^PnM51N{hlk|L z%H~CYt(Eh2k}xXF!KT3(p)?V6Omy(%f^@JfQgR>?9R^i`4s}9sT0u&Ib%8}idI1n> zYfT+!%xFm?NmT$(L(hZ7Nt?d$E-#Npml2*9&d9)&z$BAmX_1T`ftb(82%`!_l7)qf zL|`D$+Ej>@A%#lA-;PWK+#jx6KwOkZOcgHMZE9IwR>l+&SVB`)z>qsf7WJC-d6Ifz z4a8*m`W=1i>GKKDXup#l^jdQT?3rHWRyXOUWN-~8*YhVn^619IF`HSr%^*g`rLn7BDXirPTfJ9)a_Dfhc_JxnaHf)gUKDdxsn zjcJFK@pn2I6*`nxjgp_~Y6BNFl$cJ%=IbzII+1dk(@r8&np7+Vbw+;zX?RSu#Ho9J z;}%q|{qLs*L<<6uLQ1Ff1MwkxHF{ME!MMcbYyFZ#j@He2g^-wmP7txvF;J~e7KFWie-b{VyQ zSYH51mswCNwKAedhbRK)q}*O!6)bN&{3kbbCpOGDAgA1OVa2R$Hni=_Pzk0d4OwmL zi_@lSQsJY6>%!b=1tZw-Rc`jdh=c^UJwq9cf@bga4nOyvO!ja8_-&^%rl%pntUW06 zZmvu+^PLV~Fh#wA=7J}9hYl&mlOfq7cUwSa0LjYN^>(OC~Yy$Is7wqVKHXCVDkkpSpUM~TEY zS|pZuM{zEkXbESwH|^jcC3se#UneRItcZW}vZuH}kh6-q>sH2CE{2%4_->?%d1h;)h9ydh|SK}A2yVZm6++`iKGx4 zijM!$jG&F*%_U%>a9Q;xr7+OAW-b&scL7Xql`OH)J|Oj~PPe zIrMx~{TPCOC+5R_V}x}w(~l4x0&rSG3fA%z;)-sPjuJzhV}P?f&pK7j7xG zW~U9Gxj_Mlf57vfjU@+V7vkc4T@evzoRe(L$&Ec~C#orMIfXf~x|DunnCv6KQhl4a zM>Y2)yg`3T*RfoIki|{8+m}D74{MBR<##cL+KK7?ak5PxejX*%kt-u`y0b4q+JJ*x zk;u1`7JDZ`>CGNRN-oQ|C_9)KZ0O%4LM@{u86I5mUe=l=?q!skf-lxjlc0^>&!U8t z=6`f_HXpTBFRRO);(f(j1ttLNYfJCjItqNtIf*;|nhzPi8KvG{zn(>Yk9=G$?(c0} z^>MD+cDgfY`K~(UQM>PEIY}6pcW&n^#yKxOj?{G9hYY+yF*>Yr0#E7@gXQ0!+D?MJ z`1iV&w#gQ9doLQvM4MBal3!P`?>bzd!9Q10AxES zTTxM0iY(m%&A&WXrI~YV+Q6qr9=mFv3|LCLnhc0*tJ_ZGOh2|ethSb9xrF=X0kNSs z(nYlERBq{h3}xf992hiiNsmojC!4<)!HZjzZYhvqZjQ4=aruS60+QjYkW^Q^^P+7{ zrqcTx9-Y0*42%NhgnghONKPdu;gOx(dB|l}V2~m^n@i}fYdx4Yjv>*ZsoUzb`{JUG z0(}Ql%i39!Z#iEf7STvz*?&$a7X-!=pOl$sEFGT|FakleNCK3z_r$(E1TNd;ZbQc> z99mX?Y@rn-)4t+8?ccVpRO%6IaBmODHg)YyfJ0S5;KubYoq(s_l?#+^zOPi+`#kfa zyyCpzJs9f+1Yz!m)Ey;Ebr7yEXn$H%WzvvcJ&_Z|^)9Osm>B8Mcd6(7hgJ{v{+*WY zi5D`q)b?G-MFrbg+Ll$e=s0go6&>TKNhiI=4Fn;a@)n)u>!*$7k505v#pArGTiTk+ zmP&mrp*JA12Br_@73fQRNSJbq<=lCJBlKUJ4l~)?=l51_5clFaQBma14Hr`C&B2RQ zhM{B??;@W9IR#r`>|?5;er9!F&MSeHxrGhZ`O5Z72jogCy{;@C6WK@6ElI*w8>Z)( z7p0~PB#pI~q?}-WjzYr|dPk7<5FbNd2Kjbba^H0>U_K23JB%h#-6?)JTMRr?ZELm7HEo&T0KP$a1H72{#q)&+^ zbC;?`=537C2OA_@8(GrTnPF0EuM?B2Mhpp(MrIL=+;NYKV{EzUv$vL+5vZGj1!ClZ z#^I>bz7x$0tY$k+_62WuWJ4e)ha~(ucNL^8b(&iC&ukF z*A~z2@N}udz$^)D_ae<*pMCP%38@1j&T>P)t>=s7`Z4JW9+q0QZh9`uZ_iS4tX6`+ zTjpHB+r3qN(2^n2uT#{El_wuogiZZkEJ2GAC82jqd8L@0&X~8BKWVzl88>1k(8zwR z9cJ^{U{UER^uT4lP8VG{L))#Tvjy4zm#0e=(EVgzh49(8U?<2jod_x(R`?0osv=ht( zeT+42vf8gVQQ4l4L$Dr`EJ#9>u^8cHYg!k|1k0g{FM_RpdU|F@D_ z%FC`+wlA;utOP@Yvie&nFNYDdL&@R<_CWA~|g(37jf+EEqYEy7=A| zv9^Mel=2P_r$o?;M$V1SK$G`n?zY9;;!aUxc&{3gAh1vDq%TlUMz-J(5v{xc^27Bx zQ}I;mSctr2h!CYdH_|y`q*6;^Z#H@CP6{LV$4NGvRn4gCPc^VMc$&bSq*_u@29GSv zVKyKk_}I#l@X%`mG`sN%>Tr{XCL1N#@+gRz{$Ts@7X-No5uCPys65#SB8F%re>!p=kl(bP&vG;wmpTC`rOnY0)MP*NayF5 zOY(krn2mMEYWw5T*5nOhm8LTLh`d;P+xk@>T_BoGKL=`HLV4)(-e&1{fb&8U7?IQ} z+}6bFpm|72LXC=dk)4{@X0&vL);nk!E!>%+xc#sPuxpQbS=P~rkc%y@zZ3|4Pm*?H zpgo*&Vx}SnBc#aL?U`KthS^qBhxHNh+^tdbcL1lvzT#{h}FD|2_<#wB1J?i4W zdVI<9t4?o-rtB@m;+huD=?KvJBZ8a|`C-GplFQ2!m=7-(A;W2ktS?X$loWS#&O7&I zHx8Tx+Lj7eo_(={?3DeN=X;ym(Vl3YchIWQ&^vL((aB5dKZH$@Z*Xp%3}A$cpFGf| zXwAqH(tpS(NJ-Qq#x8wvOdWN_(l_)GXhNiQC8Eqe>y%MOJ# zto>{Bok?TI(UiF)F)=;ag$hO9wwF_W4F5v~=wO~9Wasgpo}KL_-VI6#x)Z5*{dzSSPE}&h%&6yTWespv z=RJT#DxXc@&yq@In~6?6X8y^oih)wO8cbQ~OAI58w1im`?Tp%L!&;Obm&rH* z*?!kg#oH(BWvE%*qbB^gJH~!FaSbT*%j3RJ`F*0jNjt=$K`AMpey*$ir3s9qL%IWj zm7l`AF78d7Z;7+DLX4D|_`)@m%QtDZ=Tx-0&Ih%8|8yOeE@l+yoiTj0aRLK7{PB84(e zDB4a=j-F6%P0;7G_ajuZE3WSwb#qvCohzd-dyFW$_a3{CN4l))M_i6KjOl+I*E5DS z91N;%kC@}13t*q!?9JycyRqBRHmjGA#pO#F2UZNo<4C9%$ql{|Np?j{Lw8d}r*jh(|NL_SgkfW{|okM^pAY z0qHIrHrR|zOft!ImMc#ecW>Hn!tph=QEt=T%CW%=(fQ{mHA_~^<2R`7=c4)c^BZ0s zN6P3sqf|zQ-7W@$%B&QM+JE%P_0Ba8Uuovw20=B&!I%L)TdHF3c1nnlF3i->vU<8-&uwQ)lGc?F7>$v-oTVR+`c3{mGvQ)8e9h|{b#lpOX- z55}5r%Xe41PH0`NDq@!M+_5*$Q7%0eQ1(X?R$Nj>ALp+I$^o1g!bTA{kCS^*WPEiE zt<0Uv-IraMCaYr$0qb^E$(4mBvU$`ycT$ZbBuMm@g_1sY<3_r*TUb=`VI$(yx#|0* zW4hFApRun!+o(;X`5&;=>Qb86hbW%Cv{2bbtBSsDo3-Q0%fW9xymn7zsM(PV-(sqW z+$3GpK(<5F;sML=X=JSz<0XX8nuzvG*6^mL2@1hMY-Nz#v zJ^Ni>ukVr`q2H;smxCMM+GP%3BZ7|1`OBVsB1d^#M(}QbDoyF zFJUbdIx>ol1Mt_Hr)`b#qnkHxuTOCiZ|P;ygyu@$j(pn^Z7zOz3qZX8x?PVy(|Nk8 z!ICSKP&ES9%521meGQ+mYL->CbR%>|=R3URLO|f_bthObKy;{@xEo9-bU^p08cm2} z9m4VgaD~z37kZUqBKL^l;`-aA9N8Lh;PL#ZsmfM8gJg3OM5j{4`KKcrJIqXZJ#p9D zv7}dM)hPR$FQR_3-j__s2Pp^vmvmXsnM_laPneu;T=ap6@gRsRuH8LE@1&t)!Yq4; zu2jq(AL0D6!1q!9S=;9KnX%nYeZc4%TSU443^)+5w z5jJ!I2wi^(g_x;s&o8zsqI!}hmC;1NSy)PQ=*gD;#h(#z{<;{*%6y%A=}PZmGk2){ z`(qt`d$mCB`C(HQ^L4)ri+g`$r@>rg5FcTt|Kr!*y6%1#{J7{@^aunrq%R-{2eJe( zZancTd!E1g zJ&Xg<%zXs}B`G3Tr?`b9>-6R)ROM#T1l&ZY^0F`8xUC3Lab$+*2CU(25|nQ8tOKz~ z&Wf&w2aZg=mLPE5sJaNKjeA@0BV-V8%K`zhxaj*GaKSysUH7Y6DQx!Ldl0y@M8or` z1JAR>&--F4q`Lj-s)2Z@aFQV5chb{-L~doMchY_bV2u;1|*4c83IG%dD&~r%t*ybW(!A4J42KeO@Ye>J4ZC4y(9V;{$fY6Zjv9 zDOPZ+^dcXA@Y7H6$ZBRbv<3FiS`mJ;FxHSUIb|{3uUl?Ng2w?$<>#TRAjpRq!Yk209BeAS7XAMD>eP zCzz)IqC?m%_S_JJ_#ZZz zCLXsJH*?!8wU^uCXZ7i+@A0SvE|d`NPmNx&QwqQ6)g)Q-tV|jDsQ{R<7@TG&AP5M2 z^si9|XZ`%gO~urC+B;jKj3_e$4rIn$hf9GveOi6q!n6=(@h(62Fl*JnOr#Ip`h+yc zqnb-jc=}QXI(gGuKe z)l!w2fIdPFp-E1HjbsEmQ)EIr!}_*2xbq2xMp|S5x1rtmQVLsgvc}151q69JT_DH+ zHuZ&r12Mn?m|P9OY>PwKcB^9e&zGWC^KOWy>ZLzQ;!?}kK-g1Y#3kz<5!0cdhI>!j zrc58AeD*SDF{Zg_ma1rIzQoxg*JQ|3i^dU;4#8hWq!+Itdm8JgNmJ0H#+Pf%dGFH) zkBpkr9PwHKmw5zl#1KX@N;NTP{Cx2qGV*d2H%}5!lIYft5%ZzehsMNRDp%o4?|L+8 zOfk`ScZZZ*w6Wpe>vh?V3hZgP!(rAXOT`x1!kNOlhnfj^IH%7XouBPqn(DDnzK3$f z#BI>uGVwI6O^OdkR3~z$c|*|~Q3q$E8h+}DxFQ~B;Z8|%9~USkvWjdm?@;E5tegbW zbKSszxNi@`6qg|mph!XKOiHHrH>)w;+o23kW8`V##fQ87od@ZToHk1R0dXjo@a-g%!|Bd}Gg} z%TAaHBCw$@>w(+E7ud!L`*Q8mDOVCzgVF)C9+@?9R(=RbvLG__$Y!;Ldp`N$aB3{x zz|+XMncB2wbfs-S0DXtRzeqYyW!vhpdq>$mt+Ds;Tnvf&*7yQ-Ot!EcNA`%#vl2AL zW9e+1^|aTas=0VttrLJaM-n7cLl;o%m6368EdjNOA4h$-Y$3^&eAvEBZaxuz-37F~ zH7UBKOye@m-+fAzkyF$80dr6z~6MZ zZW;CCvS;CB(u7@2ton*y^KVk18Uk?W8=PixIlz0^KOb+<_Bq=7!oh1d3PTs#G~sHN zA>>@(&CAf``ISpzK_t?)7?b9^Dg}sPGm1Q_5z|Jd$4eyQi&n+OZA_SA? z65rO*KX=#=DrZ0NBdJXX+5!(I7%J`=9zRJH#KIA3>q_` z>juoOcY1GyR2LyBerDWmE3~rwGTkN9GKcdd*Yn!VZzr-rb38}LG^++UYd7gpvM?Lu zeqn5IKO9_=B-i(#F&qnjyZ;XoJt_M@4TAMTPMwEX`=-=J!Pc@&6Dm?_B~1f{G0V;|2*320*QRF*%f& z`Pdo-mpL^-A~@@!ALv4?y6A0vgU_Bg8`@=w=c~4ELN7%d)q#9d%N0qI zaX7=I)pGH7gI)pW`tDWqT&z-|oymh#1qHXQO3@dipI*n_#_qss6w*^3J_3yivBWgC zF0*^Dl-s&gv6Km3G@)ya!?zpc9lAdV3E0276W}{l93$=G{8}h){|A zscEr|LM3`H2&e1cEz->$&z0Dkjq|54s+;Bc(cz^lX#wA?4~V5el3W>f*tRy<7(_iv zb$=-RbMWc?f~F79>1Wt=yzyr`mec#SB{KinyW{ttEUBOLXl6xOe5hdpGDfOpn9>>y z#rZ|nvPteO_JXk-q|{m8Grwy;bM{(>6G;h2JKhsJ*_%i6;%sq5%@qU%+ER}&i0-QI zqY^c$U^PCq#Z8e?)26aoR^fLe9b6it{qo%XTfzD=#@e?IP_8dN6C3raVag`p^*5Q@2rA(VuS6pxv{5O1U5XVgCJ$RjJ}%x4iO!y%+oFj2qH`OkKpPq^}g+;ZFOdkZz8KH zM35PEowGK!+UlRw3ve>F{|*CPbPNQR0nA+mq|!?5iF!ua7`vkrQkk! zWy8fhqJdWW&U#){mMx10zF9kqC0-8#i_MT?tzbvVP%I-Q9zUq2P^0`>Dz`tm|5(w> zs%&)~=<@XH>3ESn9E`3UP(frZHRBYtGUgX6C@6Cqa%+BqV!*mIM!D!h%ddoEUm5Vv z^$73^jGce;e(+3MKwvcfr=D2-`~>`a-nQ@2J6ilR7d!%W2OL8JT$2X^@?#44wpch>>z2A;?9-u9COexlDXrl4~oJ(X({_ zY9<568C)mP_Bt!)oAVoX=&h_FG?3G^o+qrh4i0jGDp9_G?-*Yv%rHx%-tZ4yWJA-B zoLDW+E5hfB?(ZY`^?=AwF;B8#Ls&wz1B?1hs?W$R+oXvJiPfHF*1P?XlsZ4!}_surYru?{rGk9!7akYp@z&8;|K(P)iRphFnCR5 zW{Kij#Vz$K&7#MS6b@&2;l8{cZO)>(*n3d(t9C2|fpwdgcX&!3Rl)#+w)seg1{5Hdsm{LU>R_5C2iYY{R?>b42^9O)M}aP;)!#{KaA zblSRjvIyVr{9K^(N_KAgy`ii8KNkG3s8eLZztA<-&#{@x4J365w}=-!h4P!54i(9!f@g_l zev^sOQW}0774puX^XJahj2KANW~a217b1HQj7m(YQKFq@!mF>3U474dZOocb>IxJP!FB6cvbg^hmwpiRYLG;Zd{(|?&;dc6OF6}ssc?_1lQ zGfj(nwcb(=5EHR3?$rbZI*|njH)a@&)?@GgcCeYz7FMD;rb(^Q`FWvx?|3-RLH>i+ zXZaCjqrvGxa#A48;-Ld=k?cEVceQfrPxBF|^Xt8IiRc92)UAJaXb~{IZiq3Mc+GF; zVkG6E{c0rFqLPlz5MEb=j1;t<@|iMl?>q|_-8i@hc8YFJ9EtQ^@TA4NfA()heH6~P z+OP6(uR{O5xUA?NWj1;L=U1FZ!pT{h*2PD|8?LX16v3Xz_Rl7(EU!Y8QrNMF^N)9^ zAAj*lh?+bN^Il^GbeLufN}6>e!W(r95rH-X>@!LL0M~LFrF?@*<#> zubwFhi1_;Tw}jE7k`DxiOg->AfFL`bqZIwJ7GCc;0h->kpTk5* zpuYp@ywdhxKS6JHToew5j`rb?EuN(UGKR~Mwn6C#3_fyH0Z)E-SlH73vPeGKtT`Wa z&cCg7E$ywrF*QS9eSB}KHKLEP*ygSZjJ&XB5&ZU6PZo*uZgEd&V0s;IIR{0RYo%vmu(Ws**kF2psS%bqI#Kf%pZc>h3u=Jm-^EbmT(dSc zl;dB&ax2Viq#V7(KpMMuxP?0dw&sTEmNPON+Wf2JS2{b!6NhcFKg?msKi{K+$AXM4q;PDr%TLY#W%ZLCSFhLD zVylMHR6k83L^vz2cj@Q&=T^II1Dxi##ohqQ&as|Q2O2Xkm>0l`b+Nc{_wqTcO)5?> ztXng4h_s`_8!avM@N%huto-(&cZ>JY)5qPwoiR>BrTcRCMwbbl_xLf?e+{kWy$6Fu zxH)2aC6h|evz~msO>#7VRHYi#L?HG;&0cA|$%7gt9Z?Jd6BFnE;0=q);f4;^VxX$(qK$cJN= zSb`v&?+KkTB$O^zovW*9_{f~tF;Q8lR^GB{E8H#Gc?9wG6%5$Cm9`-1_g08CsOD}f zi{3iKk$sreWut&+S2pWIb!@{rlhpbw*Y=Qr(0va_d>4O2(Q>u z{V;^&`fwx(2~>B{C8KlSW~!I8)1BWB&lM;j@ETw#b)*vQDs7w4fVQ=l&6Vus=jpTA z7WBjP)av0KXa8RIl7&9ZeTOK?+0A*`4hq*JgEmH)}N6Dfjc6R|oGVZ3@ z!f}GWi32J7$wSioTbbi}WOQK?2NPVz0h@*t&ZREjxnahDV9!r6nx9BflU{!8wlSbYjC>5KY)JZX{a{fM@QsAJmTb>M{SOo7UCdjGGjU!YxAVIe<-<9fQK+|d zGmx$6YIY9Vx^ALuM{L|8Gk+14dXG|T5njlF85bQhoL84tHeybt($c;6(mnYK0()59 zJ>en5Y{%flBjV$#tKzEt{FWSc)&D@y+svVg&G??2_DiW6Ll}ji$tyl)k1vTv9F0OV zCqw^HeJe4q;`=wDw25R7Q8BeB8_`!H0w5^HH=kg3oG(mkoV(hX=$92Fjh6b#Dyk`$ zgj${Jq!=dO>B4Oebci(JZ3juvL~?p7Q7Y2hA!`4aIR)>Ui6mvJdEl`4PW zYYfd*&Fp^&ELj;c<#?Qzo_a!73Nkf6oGV2Ejb4Vd&X|!%VTi8mDr8$*yEu~C0~3u? zxN^##Z1a}H(z<+{Jgw?tY{_0_>Ja_Q)$Oal$mh?JkN6D5V1z(S=*pSh^8HMsuxnLm z?!q6mjT)w>*FA*_mxVlSv2k|AEjnW{&FZd*kzs09koa?P(;m@qN>?K0<1) z`dAZ3)h!$SPvllM154Ovi&^#YdlH;UT(YX=wRI^>n2vH3SA>Ot3WxQtuS@Uc)1o-P z(6ABjRSa@v?33V>sb9F~VgwM2E0xxqpwuaz`Y4uyAXYLBN^>e{rtxHC`g3gQ74)>f zP|`6i&&eqFCcjM9B{Vy6OD;UZ=|8{Eo?wT6`;ZPwzvQL}C%|aWACEU*@0h)~T((Rv z4v#Rk{{B7cS6p2kFfcJZlNULzsFF@7o4FE7{rh zTfkV9zW|-FLbi;dv(PvzU$AcdrNW8#6OYScOrq^(e|tn=IR|rI|LA-a0!rXvJ_Uj& zOB_Jpfi+DQf==;ueLm}z{$=m>EKYVsx-pK!j>7lmOWh+)rLwskcp3Pa@fyl8ZazkT z6y-PI_htV_%6{Wk$1stLVmt@Ng9TQOEGuXD*EW3T zzVAO*fzQZy-FrNK-OnYfko>DJseW;F$qzuV{@Oh$ zVi|4bgudjbP9dTNJ^Q%2=Pu=0o_F&i_bv*5*pU77;LslZ z-uF>-J*Y*f^=Xp5x_U%o%baLvpkELLWUbQk6}V%hc>c-ZB2vclo{%f(M_4`xYzRv5 z%A(~rocw!ly};bW`c+vL#A4^aul{zifQ#s{b1?klXkJAE$_XY=RuPq#fQb_4(J&PB zx-Q;X2{K_0>bQ8m)UPYL$WmXnK6S6>t^Dl08`iEuJ1j5fYidXpNZ6{`abfNWx-;|~ z1?n~LX7h9NI2V=nzwGGfC}Mrl?Z}`eoP8?sZ7Mp*a+q!OZGgaH1rduSrJQ3p=_J9rfO}ylp6ti5 zL4NGFi@|VJA6^lc=`yEVhmpI#ZcEsnYhLrt0*X9c>S9W}YPIIlE58{{Tn$I%_EW~e zD(oJ7l(csT+i7NPud=Jrued?h^dS=KvgRhgVw0U}hrtgA?qqih>-T>FOuO>$Tpg7L z)u%x?+7t4Qhy0Y}h{4drBC&ZrrSywM7j5x8kW)$WC&s_5l>&Sl9D z3X`^WT;!UkB-R+Ko?9y5Y+dA}!?(08NNV9=>`E6~z$|@E%)hK8S9bPwoX2iE&+rI=kJ?2{H5;ku z>6rGO$tsFVAf3N(E?rwn2;-y@eH(nY@_XTJVIf$+b7_V?cG%9}YZxVoGDGRfIyM>g z8Vzx4c1?TMN{H|RE%Bc6K4g8e=H_2}IZFp@fXMMMPm>7GGJ&5Ej1Jjr>W|g{NU_(A z*Vxu-I#@_#*I@VZP@fMKb=MoQm@Cs4)4#y_3H2S-|5~v6+M?%_4;Hmi=aQD*F;?*T zkI_;bc4WHSs^+ybHZ&9^;*jl2X@`}^WgBD^786gfeCP%qIDoprz(k;KZ5ElUqkk0N zoB7CMlw}DzyG~C%VYTYlHr)Qi^z7Aw{VPu5F9@O?U&lgHwy&}ekWn?JsWmYT zznq{)D#Gz?=JNld@?9b@{q_F9w#fQ7zyFa5vr1L=5D4<9bQW1(i1V`N>QbnUkqgpc zZuAN{S>`<8KpA{G8d*kjswMf(< z^ctzN(u<{cGRDucH*H<$c7lLi28@*xvne4B1-!NlRpEvAZZ;R}SN| zH8I(M0dZ#_T9Q$d;wmJHW1TH5pRM(JZJ_ic_d~4t6YnSMJ5$?svF?1f+nzj|mK7TK zqQM_2X(u|V&N`GUpesn;`L+)tCqBwGx3jdC_aVvQN_7t|WsZVfNeN?)Mf?i#y?|WM z1(63g45W!hd{U^u3Sj(!lxIQFm>vZkW?+W{zb~xN4wQp~Dpcpv)Fuk5Td!SWQ#M$C z;sHqWAtMzob9d)YR6AfNwf>z^4t{5|?Y#Cb&U;o$5)Gb;5FFeHl}EOS{?;JVD@ZH3>gAP+HX@Cm{2Ff;4 zy9AHLJ@nz*8CWN(%@Ic`*j(E${Nc~q+ZgaCj(F`FUeg_ZZjq~iQ_O>UoASe?k!{Yp zCQ_L4;AjHe$#}jSWtiTBR6R=ciG>-idiwefT0EK>Y{kS4`gzM?iz_q3L{t_f^lsYI zY4NfNmD&dJ$cbXqHL}&f(3<;L067k6j5=QYJdaSMJn*m2n`to zGh2@b5oW=F;#OR?wJE~UXuOQTBoXP<$|I_7@RQtqtX>Qh@BqFs6K_G7YA)6Tf)7$WZ({*fnHxnvMbv&7lBD;mCExo5$oOSQvg7kkMO_!LF# zvt*kR3-Pu)I!lOBGh&k1%mJo_QuBDSO=IF-Va?MJ8HQ!!%y>!ctQj_gn!elhO{Zrq z6ZIN_KP8G4lod{vIA2AD`PDNk4t)s8(C)7=TT=804_eaoNKC0bJ=p#;%y0Jp2MqQ5}JlB^CxZ4wis5!e~xui(FLpudMT_evmSb3%d zs?0??3^kJ|de=;<1>kGRQNTP)!$foT$c@cI#Y|x!{xpODy2QuU=#|w-zNN znlDaG9+caDd`Dc++J8-Xf|H4BF;-RoU_zC{+ zYfP)s5;!==w6_}7$~Gx2%SeORDtS8t_dC&-R>ttMhB$r zVk0Zt|B&orcq|3QZ>vJJ8Y*tF)<=}H%wOh=YV@q6a-ngJ=$4nttmM;#L#5jAh#-rY ztaMhK_SBp~F;EMT`CYI8loV>!bHoyU{fo`A*hx&+BTg|Ayk#bOP6`X|MQROi_Z< z*x8l`qD@X~a;my@oF>DnZ)IISrA=yU^lh&*1MBGL*2Wbj`=2U9WWQMu|}i}`-GE&$Xas5HJq)gYlDuRT%t`(3#|T3|2Qa0 zgKslrB411!nGd51#k&evH+2Y;JHAR>m%QPM_aD`)qgN9+M;woOHN&@(g3Xm!lr-B$ z`CxuYi{N9eh|uAaI6E&C3?mm|<5W|89wKQ05ga0(KU`+b(w}%E)8f4ISwg5k&S?CFkRZ=P_xI^I}0FN~#dLcpTkJAXo*uyAmY1Z_LN!+3*N# zT;UO=!Zf#^5*JVZahgtUC4DP|4OI4fUm06CRy2xxc zeE`um7PQePtn!@i(F0?|Gc{L~+)GrFtN z?iE=qEBgaCq7pO}vfIS1R!TW;!rPLe-0_Hax>0$w zpfkx*&6%p#l9k^X?7~$)c1k9X$c7K%@F;GmUUk*D-yoM&3D+gC2^uIw4sC zdz^!3A!J1lclSHJz(i_T#B>1)EEzbQqMav=dA(YiFUo3~KjD1n)!QEEDK(f}&rg5r zw-{e}h%)ijZIs^x#$VQ&Ulg^~yz2f$nE2u6#}R~_o$ zvMOGllr=oZd+gIWg9HBJ=xxgqxHfmJlg=-Rqa8f|#n6%K^+p~0&O{x(?)klEDkJpJ zZIf1?=JGVRummH$aF9ZfPQF34=J6MgQK;P>iWWL?8AM)_pe|I9g*IxnlN`{PO&2I) z*^^1SPmyniN6y#SBU|=YXp75<>mj%Soich&Y!<6yPy!~F6$Cieymag^Rf<0m*Fy?` z8H$)6o-W>*#ZJ*dOHvGR|3?{)BF$M^?IQ69#dqM1lfoKb^v3)Be^e^2Q?~3Mn+B;z zt){yse3$AcDlw*jpFQO-iHRc3g$<=~ANPEx^>5{<$QDklo*6kl$w0ceX^ttNAj+$>aNLG*(zrr>+gpSO_P$j9C-=p;ibw6$cWN?cKVI z^>CIDlpqeQ9)r$xkaetWLN6WUY_vKH_rq)V46Rd&XXl1>>Qw-nzLifhE)m&cJxdl9 zExk@w;)!2zVv~3B_Ov9d{1GmWz}$6Gb1{SePTgzZB%t-jk-sifYMF84Yv;aSRGQRu z;F<2Iq#IX@MF~pH{uYP-bYS9#PDN;d;BgAeddh>~%TV5=6~%9==-&&L=j31D*aL5zW8Sqnknlla{kuDUA9p zuu`@l3Ai-3)?{7R-E45Z*DHpl$F$dFk>%jomg*|uy3zN06ZY_%>=7bc6mAQJ<1cjB zMo*KaAhW3#n)1o_CC|#KdQzU6lD(8!SUSz42 zz)+XJAoA7?^4MutUg~#O{}{;qZ@lb-g1eMhKnjvNDN@)55q`n?=KO}s2E&A4^dhhX z9zTuX#syQ^3JM3Ar>UaI6;lK%CA#8q?}nQ#`J;k@%Zv^fh2HP8>GT$NGKLz0s<}`Q zK%RsMB0mp}yTtS6@C3 zM-|h-s;rJmA?&Z2(x=~{AX#Yq@~ICs3@d3=ZMP4gms2jQ>NE ziT%B6LtGIFTNa%m?)ciXdOpr%t?`7oZ2QV4lN-(L^mz!jL4G5e{Q75u6lZt#=Iryt z4Lz(&p`(pypg$_CUy_l8L{d;M*Zf)mlz|=9I2!}{}4GPxplsrg<} zRpq~(M6Xk53TilGGNgvFiE9FQqEu1(O)Uc#y0iG%tH=DmhPO!jLH*1B=$0?1ogQvD zd~r%}b)#p0I$cC;+w&1)QF?!;;O-(W)Id_JN*X3~HbF=YjO&%cl8OgqcF2Ws${?h> z>PGcz*V*!`hJat3xq*z-3Q+sBT#MXcDJ z((s3nkoXN;wk7`XrCwksT56tgPa?5X&b*7YdstOPRn-VK8{u!k`5gO;>jSZpj2_y| zHH=)f31_E`I3j5iUhX;5)9miltA|9DTCxGMz;W{5_?&+z#SMdf zgEoXJhL0D2d>}OrmH}RDn?Q%!k#P2Jvh&JzIveIjvG$~(Fs4&=m}yU zWz~2dmVKPe9srzb8ttPuRxZ*Q9=^7%@X_icRnq5${L0YD3G(orG!-QGggjy5txX+# z-IuEo_0zx~;D2v(j12{41DpnFN;i%KFOR$B*+|zjvv3PZ)7UYHGj9K0LeG8pjW2g@ zeRXL4zXk21xuD9o+x(x|%vei{*_F_(N@~ z76sS-z75vD)P@DD?g$qTjkd z;*U!NJK>LY2_StDJ?E?teP~Yco5@Qjo9oV-SJD($oh^`LJjCGNi^BhAP~6UTcVNXe z1wP+==EgY|F3}onFMhkn=x_=o5YS{H z*UZw>=fgCLvk~~R&KP|W81V~nIC0cW!SJGmf#9mx3mked20COKjM|OlIDP+kT{#Ky znzrhi)W}RtRCoF@Q_7rd=L6Lp&&a|Kfp%-DE~O_;(`ho()eF9isb@m%QuH33=YiY% z6#`C{PX$)9y=c)er0-DS2-Snma8{K^zRmRW`xeNp+6wkRZ?~g*k#N*WZ!9?S{b?aj z_zzf-qAsXy_BB!J7C67DXO-xvA((Ni4VC0Mc~t{~EY>1_LON4iwmIqpqu@XOyV;f1 zBlyfpnOA4Kh^qD*`7rtxRQRo^$NmI)nt*@S#Niy-MV!ZbTsjoL%Q|iV|8+88|?FM!0%NP~?Ii*+B z?&V?;c~k$1*;H}syBt~P2qx(K1EdbNX&6YdtD)=JoDGZG=QKOGG+390DNxka+O+7v z^5s!LwEZC3I7}7j`h3m{v{BeP!Mu`s>kn~13DiS;{}<(SwZmN2Ysd0)s;nYDRJkN$ z5&D(~WT5mcu(p>uyW@_vdoiwBAoC_lVuE(-Bnz9dUN`~0v%_=fBW%YC7>}=AlaFQ9 zUrSbV-S(Vv;QjhD8>Djam?nAggS{LJKRAWln95@4-2JBJ6F*MMuhO-Y)TAaChtd-6 z6G66yTpU6VK@!o^jl=ohT(tk13O7@%DjR%0QmlY%{VHwZ zC@O#S^N*6}ezyt+D;KN}(A_p3M_ZdvyhP%*L7hX$Yl0{eqo4!Xpy6i{u1OIy7SXxZ zBkG4+R67WhdCEZap?Gr^EStlP#_!ZNeApKlmE+|c^3}16Y`$Y&jInhg$tR_?TVq|C z|1p^HT{8TaHE)IvH8*31X0)hu3kUYIgF=2lu+${t=D1xy8MKTq@GH9%m*gCkrX zM6eZ!TBJ}4Gxb~mOy~0;-s(xQKsx;EPolKU8@E7ViTaCm$lnJLkG&MW(w7JO{(I!i zp#zJg`ZNt9w+DE@`n2w#ph$zBtWX5MXuZY&&IIL&Hh5oKi z*gpJ|g)wi9&!vBU0zgqYecIe9;m`#n% zR?-IQJhI?!k>SYqebAx3bb^u?%gQ0oNQpTh{?S0AF$vS2K@P_?Ozo$b4)H2cS%GMa zMBnhx71RKr3UREfUAaaSAGx}W?&tirh`=ELLq2hAe1v0>Dkw;;S&vl5MBJPVKu}2(^R^{s?{dg`T=q*pOGg}W z?Dyo`?C5cmbHZ2(je(#e@&|Lr9u$KfkOJFPL-lw?Nv4HFw3oMdR<>BoMhdHKNQuWl ztg^*at?M)}Zio;IQbuh%U3XpFga>dwJqhk1rL6-{PBG{Um9Af6u-G;e&ihTe#$euq zM{U==cxp-`rrt?v%9b&O$l@VE_eXqQ@;U@5Es!2F8 zM~PQ4$8e)tiMf9+)8u}0L`KxC%%zO#91e3Heb?62y1ZO8m3IqGyU6Ht= zj-;GeiVYGT1JnmQq(<)gF`LgRKeUp=N=4lGc_D;2h!!&L6*UxT#uoPxA05*bg;_P& zt=W1rIIxV<=nB$KHLHXlPtp>6p{>35ga(rXM1CUoH)I=G{MT;&IGADtM3L%H`I&Jr z+xenpK^%X9Eb$!81Ea+nB>)}umrQknN1l#@`kLZ08DCQ_~Q4Kf!S+q&R27+?M4+*Eo|;5js<2I66R^K?BFckhUg zf5aLI$#d?o9-?eRNEjCF$TVnjBNcWa@^{(vc@xpXII_!OI_}nzqV`7Zuna{{!r8iU zj;lpDm?dSDfZ(H_>wrRTM8ekQB%Ytjuj{@Gy{!!t;dmi$y2lJa){;(Nl@$C4?ZEpp z>3V-5yk{0@3!38wm?%`!@k`SI41VZ+rR6Bg9VspZZu!Nu$=%8XnCjM`d{%P_`L>`9 zrYh6(B+~cpXXrv$48E`@l zt52fFqB8FKfH52ill(RNOg~9zZ*P{HVgdXFQ3~gv;JgCDXY!Tsy!ftN>(RDkZA`KgUNT4*X4Ht`B`LD7GGN$& z1R+v86{<3|9$x<5&i0vk5-NnUIH{~eavu|=Y-vF~x)D;I_kswC*w#~Hcqr?-r0%{0TEL#TAYR4^>9Ex}k6kJ$= zsBBLDj0VzaATf@uF{xku_y;!K=T?1IHI?n_|N?RU+b~)zuJ#Y2nt{ zuZ}mN)vSUD{Zs~3OO=jMPPsS#QJ>A;nXI4uuqC8Z-(E(5Aq$FifAusy!IZbL?aK`t zQP^60MII5VD?{6ItYbA}B}HvQs6-#%tOamDVsh-Qoj@4*>^O~K_)_Cya=kwEMl@3AGJehYV9sudaK-ykqr zeaYY{h=vX4EJ(6i=GBai_m7?(5LRqDmkosoKnxAzAB?|^%|+&K!giT=aaPHJ`48YG ztR~<`XXNw7M<(4IfVD`avIwS;S#XPi7bf^eOx+tS`kVj_?NCe@RmWH$m*J&>KQB_5 zjhpFr9vmSG?^mX!RKQ4sq{5~kP0p+QF+Vj(+~6h@@`wQ+-G%hnRFW92XwY>vSm_&P z-~9*H!e_)=vhZJo=`_}lk?^!A&I=eH8*rtvv=;9;cQZurGlHiy&AZ^-oxAlFLsA@E z_V~j5#am9}Y$@j*89ZUzsSnc%V&0U@vxm$Bc{IgNrIYMq?A|K({xYDB{t9f@*6?4qYJlv27#9aF#sYNFNoX< zCAD#-NSIL9=HRS4?hG82B`PLzz@G)oAfh?UA9c^QBBX<)r)fT50lXf;Z050Y# zWf#$uTEOl_8br=4yg)jfA{*Ku&bi>kZ3p8cspqbL@OjM6isoJ zrDaf@)fh18X;DJ8Kwg0SVx^|(oc{@oIW2N2_5Aed&*I?nssx?^0Qp_|`&*zPN}v*V z^hc#~u(-O5V%4{yGWZp3MaNy!|Vh=YUhnFgx(_1IDT)FaZWc?(1CnTKS-> zDorK(&A4EJ)Q~p`aPAWIKfZsxaYM`M`yCe1%u1SPPIW%xo5^{0ElyPQA)&;7K9e+7 zCMfKn;#Rj(8`B8OtCCgs&X#c5QsboS3uE6zZ(u93jRD$Tx}nQ)@SZ>@t%Ii z2hsAxpj-j356-6CziGwdAzW6<1HhQRPxQZF5I4b4`i2|^?_RI)Xgb5g(l@jbwdYTI zf(J+~){{Q-QzF>HEGy3kjH3FK?9TUg?vYgl{?({?$SQNay7>|pX@J1Rl8Y)_U6Fcn zimomt9(MtGgn5%aU*dfwK`P;7;)rn^N<hr9J39zB6au-e0~8D_1Xl z43&hg$2(?$&)*|7)14S$A*co$Xdc8sl<-!eOxD|^0H4#>`&ZwhRv(TCC!W=}B?Ppw zDZ*aO;u&o~{E=SCNkP@z+c^o@TjfEy_P=_;2|d7{d0fZ3N30A==*P7Z@^pb0{3UE4 zz~>j8(~BKy$7%HZy(2L6rmEj;1i4XkPILn%fY()J#+a0)_-i^$sI�`Eb_as~``I zzVgSu_q(f8BBg-(K#<+^YWGKJFj`u`+j(`*BKwOcGhTRS!m9el@0tiqqFzt{yvWP= zQw(6rk_OSzMz>r3&Xj6LeN*W^KraT7W48v-K-IALAu1eE2&lXG_~!o2_L|h@*HAf$ zc8Egubc%16sC7!z`b~7cb+*KizfX*!hS4jbo_vc1cENhRQaQZefcyMgQr=*;@UgX1 zB(N6{3~ipm+$dEOu=*_ew&zdoe#wJ>3IP0BR+jq^cq@3dN4hVXgeFIwzUd2TL%jma z#9o#Mz#zbvBJ-IJj&B0oyLEfuV4;-R%~7M4ng9Mg&6^a?k4id8nqD_QHA=Vr%YVAQ z*S!d6e5gNC2)6%%dDG9Cnf^0TB0buf05G{6z3NGMO4{qeH*QH7e zsc2{OVSvCo+fk~U2_m)hA|v#Ak`-{pUFDo!4Pp{^!L<9VT4#IHPxpB)UOfFT=>TW% zaN*9Y4N6vo=e%A`fmDQPa(4tvp2_Jl*XJ_~OlC|-<#u2&Bs=;0YH5q;H}`t#yPzB} z!`M3F$(L*QJHT5YB2FKn%hU8faBwuqY!GcioQQ=g)vg{wvc^(M#U017lOiDK4ogj~ zbVW~EpB?#y-0{w4hUneZc>p)Ukxf*1pAqU=K1tSkL}2y%%aiiCE8L04uyA;~N{mXt z4M{#UViKr)eQ+Ap-Hn!ZTL0?_V8r{bT$4GcmWI@W+~`C*vtEkYtc6gjg=4=W*fJ6S zb8wq5v5l}~?gm;QmeH7Y-2fiiJj`oL(MD*kFf%2pA}iQv4)$U*r2;n3YTse+P!bjw zSz(!Ya(d{|Vs|mSrXEv&?III)$Gi2sDDG>q6NT8*NN(YpuM9DfeGChin{Kgc*m&-C z+Wt43D#HT;yF`nqrg-BWx-YMRMeT`&3^eIn619iY^RL2pNQ0F~ z?XYZGl@t~zG+0!%M|yES&pWx;$1CmBrQO;A!gd{kW(MxKuif>Vb%)o2)oE%)tRZR* z;X*{PT=pFRGw7;PM2->bX8o9(h2%=j>6k-*Vd<4iGmwaVmttN2gm`I%lmgQ_qn1!zr1l+2r33km6L#25gt?Ir0R~gF^J2oy8^hfGHj4?Y z@h=@)UeIP~_m8N7xq*uMPDI%BNDJqSwjGCdXx>q=aD=%t_QG0&tx#w4$}Sk^vXB}l zo*UrN^ql<>LxQO1UdUZkpPU@1(guQ))*XhK1j)2=UKpLVE`NN8(5Hv0gC0BsW2tu1 z`zh{MWXE%0%0-jHOg1m^cr#O3r=x3m1XqP9>(!{E*_)8H=4b<-c?`TL%r)h4r*hPH zm8m73(KZlkGyP_%&RfbwoN{gSKO_Q`6ELQS5ZIcE%{j`Nd_7F~!NTEgddM=fIe?y!`GNvd3~rbbEoOOeKY*;% zt%5DFmAg70=7L7ufRGW54QrlB-ucBDL(8M;^B*_Ip>&DKj&zR^0(O)p5^K$^2jF#s z1%6OeUo@z*Ql{M?3YX!tHfhw_m^##@&;BJc9as&{m*(}+PZio)>2nQZtjcq7&p(Dn zf%Ea!!AxvOXzXbc*z_L~$Ab9RiVT4&WUEj$-{nU|L<(eTv;-Xw0tx7Skw$VX7*zB( zS_m>r2ZQhUif{O&2uEs=OpxmA34pp1n)c66|3a$1CMc&3hOSL?Iy(!`#~EMI<*brh zr@e~JA3dph3y;0H>DcpfwII88{iCo9p8m2KK?namNLbh41=@Ommfv9dOZVqTdZ)9*9DE{WZlys_L%1CF3h21RGP zxO9FxLS#=jg9MtR+q0z-6Sx7e>Z#d7h4O*)6p|$D4YLMTXuSHN|6@l z?R&5AnDEv{L(~oOLhxc680ED_|Cf$F+@t!=ASk04N>m)iJ%K7`c33kR?m$&G_?HDQ z!*|QhZZ_Tos=G1E zAYX=WO9RgvW@XMukr;?pW@qB}PrEMu`Q75yq0jAU#S!)=3<{A9y&aDXlS8pCAz6R5 zqLXL#kT)yR9aHsUtoAQU!i#%h$BF3~1HPdiDorRLFQJ&puQ7=zsL(T}OTZcm4Hc}b zLdHdDWtqwd&^v>X7&6kz45-M@3qetOQ|B?Eplmd`&&~BHoUBZ`H%o0Dm59_MY@~Dun##urKj5a2K1;JiLNgvu9g@SLVW$80 z%R69#U`A<2LH8fiv&LYo=sApUnt*&X@eTX4`DP*~z=M!KRmSM6N~E%A)FH=AO3Y4v z^n`-c>03+Hi_K3`$Tub9Ly$>!`Db#z_R)Rl#&i2ni(ZCaHR{zs00py&tPxS?u-HOy*Hibsr{Le}!qAHwCiAUNUU zvXf={gx`2E{*F~&COI1HWl|O+Sx@-g1}}30Bs!4|Vf@vjdw1m_{8G=L{PbbsW2U^S z^rAotIeGZdekRe-NI=2=ZE|;?B10&nOWxd!H8IzVBGOba@pw@2eDWA2eEXiW|86pD zwW^eKiNvq%(#jhSLGa0I$*ChUm=+>zU7sq573Lb`LmRblpNqA#?YaG<(4Dih>9yK6N3;uLS+ij&&^0_YR;2aewR`b{6@*2 zK29ma9NT#Q=RdV!1h;{KX5k-eaSq=3=qQ?Xz%UV2h|MgG6V-WUkn74lKVuPNuZJVG2GoU#)H?UqXlQ0`fHCk0uE~zep(cvNsIUS@HH)bW`o?}7ebg6^{jWdZu3uo^ERjq(^JT1FD_NqVl0i3M*{bQ_8 zo*%a2)MHlCK)j2G$n(11x7w>tkP-DDlb;o}x561;V4>Hf&yfN13( ze- zR;{$|Noj80hlFmH;nO$W@L@VTvU*-U{NmFqqrA?^eMchBJ_T$>!#s9CZ`Xp;S@Ed7zNt9Ygxw8nh}mI~-GDTR@)#u8-WQ4A&pA^C_Oc`L{5{XoR z96%kjGjaVWv`Nmx^mGuVPxA>C(#@06vCR;ro}ps$rnGh1Tnsc9n(7dQTTyhdoRJ}^ zZ;K4x4fv@L=_S!XY^3hcxlFX+X@%K2w&^RS7MeZJ8$A zCZnkQ?xB?I9^|ls~$44fQ5*mogkMLkny+pzQ*() zFGDgWE{13Dog~w(3sLlCPT^`y;6cGb;SkrYGiYDX+6ONcg?a0+8&oD%LLEc^c6N>$ znQBB8wax6PnE*_;)<7^0D|5^d8E_v2sY(W$pvsJKnTle~N>pZ`#$l@N+av^o$WLqB zCiRp_od!$c;%0}n19S4n%#;tBY}d8#tX0?i@i3Ri_yBva{I>)85KwgC;!E}_&KpS! zztT~Uv(}d5BxLc$%S5*x9cczPmtQV6!ukfWY0tr~RDt%cN9^`r2OoDQZKgMzqq~vr zjr0rpig|2;#o~XBtpJ&wvgqf7bxG{S_Cqc)8Z&3m=6`U^&}?v`Z!J%fPt(YuO7CRha@4`w+8B=7 ztpvHH7BD!_)?bm2U2``d zXdK6N?WXAls5={Qj1^7hRUpVUs&@-<;USci6&ZX1u3f#g!`u8h23vQ_9H`B(+JH(b zu>V_S8XTNwNqLKGqSvhT=$~76*3?*54#Re8i;2{U?FlRiIXKjAt3?+=V5cNzsUzX} zT5U)qoh5;YJ5+9uHtqTeCxP3w)6U)5n&`@o&Ry9GA;n$SS8ftlr`5vsl^!aHJRR~L zmjse=2rMV9^y0gJWPGsj4dK0)tj})^@V%M2g}Zr~JQN5b+UGz&CGXV-D5O$iSBWN> ziT0X^ZV@#?A42a_Fcklj?*frSQ$C6=#%!Yy=)peOT6bV$A|MSk{50DQL#V${7e;hu$w1x$K#)cHPxZJ2Qt-I0sp{WR}mzXw{M){kDF~7;*^v zY?D9~f%r_cQLyiO<+I`HiW{3$vpzi}|NZlKN2tD~o2AU zKAEM(?^Y%56a#sYaT550XO6LHE<3UcadlB?%5!l2`l^(*41d_EBU1Awf<$bnaKKxoDcy7%Nwd(IEGiZ6 zLl1MjdWUbg_lR)Wk(5OIRb$#1OuZ`yI#F04Q`;`GefJ7B}13t+2lCXS>SQfSFd?VR_=+Z;NAZlfx#a<~;~G$z_8*}1`LPfXGjaARQXnw_?- zpNVBhq2uzot;RCpy6r}N5VgtyXKklN6|37+Wrz2N$OXp6>!=11?!v5wZ z!2VQ~p{V#W=IasJNKltrC;Nv2^AMEKCh7l9k`G z3niIy^w@;h^vYdYpUGD8#4+Lu$Ffygj)RfHJY* z6s*r#_`*|rh(xW#yvV}I$_rOa+2@M;2dS6YY<90fExwVp1K-Oiy9f)Fmm!)YCBt8F zhn9x__>x@6+0C6FJ+*OY@|;8L#Fb!8g0RxVOL@)v{p~f%O)NmP^utf72@}*$w>|cj zKl!mtVe_(x3V-6SUt*^-GPMe(K$|Bm3Bm}YR_gB@;@jkfBm>92Q}gAz440PEq5)ZM zZO+4k!rRYnJ+8T&nc0hKD+PokZr_kK!9dF2^SB%BZ}PKOpQ9GsFhP$7aYej5+f4WO z4{EwKzo;=WHO7d74?>SZ@4rSjVpTsApJBIw&O@BKW+JJr`ze(=;FX{V{ZR0p zSa{{S%{#K-;xqQ|5r0pufIDwr;l*F^o>2fNQ=x*Crg$1FBzr0gsg{=bPd|q95TvS- zPbRZDDii6|yj9m>+|O*24Jd-1ZM7@}iGwEoPy^}{0d6Q_Z0qGpRCG3uQD2b&4i zcgH*Z3X4DZh%11)?}mYq*t(su)KEJZP>q)~#g^0j(YK_m2903?+)ud9q@q8^IxOXt zp%mX=5=?OC^hhqigE?mgrcY$?I8rKJTKS6;gSp)jh7u!us*^vtR8-&G^7foxA5t=1 zKoq|T6Qe-^Lc@?k3c^jeK`IQM%$%ij$B!2fc2vh5q+yfwY=@o;86JgoF&+Czg6FU6VWb()MnBfPTL#aQ}D%cguC|%x$M% z-;%?g9)7A9Yhln6_@nO7;4rNDM^pcoWtiIuJt3ZUgW3`(T9C59FoNDhGKFV zcA+M!qkzIbHK-zFNF0_9aX2u{67fH$HXqFH?j4BS14Mqf_?B6NpVu)4Ucm-!*g*a3 zPr~9%9UDNwmeyaF?!eT~O%+G%LO>-z)&oU|uVCRAK~<4ZQBi5C&0))FBHp@pv6-?R zC}_zHBJWs$I^{$NPt`Qo>aY<#tgISm&;C1>33m27p;*}SBZji=Yo;8LE7Y^d0FCe_ zxQO~4DRWm}=nF}aPMY)nO})%hJGHe1RQm-DqE${)1<`V5`I3zh@$t*{X7wc_>I*{&N{Y_F#>%Jc zHqLa&l!JQdIvB00oYC;QTjY3dd{0o=Tqy!Y-jHfRHteA)<4N%z&)(MkI0>t42BMmY0`wNO^#}_jFxEsHVtv_|1wj_6^cSaU@wI!l52r?}X=?4$_RD&CJt?|=r+FP}(vdU^`Caa zyf0DE&K{SAPqOVUx1lo@i<UOV;!zY58C0I}FBGP)2U=e@JN5KEz75{#<(;C-oE6fO z`k$eEotl*A-r?jMZNo(+s6kQsf0}z=0n)SJzemn#8Eu^w>kIZ@aP5(mwo)EF8=jkMa zYIlV-qz6&lJVC$DNc@S>%oE;I3MV|7(%4D4Kk2kAJFL*uZFZ=eluCz&JL;1gn8{56mef%i)WPku(u*pE| zq7k{;s+FjVV*)-FRpw>u3^QZu5Ad7pSF(qKqk)4VQ45S3UalHWlu!Sg{+sj%O1(}M zS{5rTE4?ENSJ7;hONvTTevb-j`ys$X|CIBs%UtORNzNk72o(b*_nL9i3ssohx&jjh zz!dM#42efh-5iY)oDi-Ez#TOHG4>)Ez3G`y;d}FA?8~g$xlAR>^;kex*l%LeafPd> z&*-Z3h_K$u^{y}s(t&8_B2!E+mc8FEc1VAKegsrWLAgBTzUDTF#^)@X10%QWuoj3l zyvOW-SUQM{%EoQLMgl_}<>iRyvJ+s^74DR?$jzDe4&(G{gN##x!lB9Mw&wXcqW$A6 zIUut#7t?%z=wA=&>ADIer46@Y4s^YROPZ93O-tO}`RrI12D&c$zA=fOzPM9a0fQKO zlfv4fq=*4i{v4@;W)o$-zK*dY#z$0dMzkLIj&nh3>+H)BT-yoD?3bd01R)H?lQb6B zIao|zPX-T$=;(o@T<#rOj_3W!1mlPkt|&$`wy61Jfu>{=(wr{x_hq@Qh9~50PLFK zLgEYWyyEhfho)Ts!#HlsNZ6Te5I1C??!}(lkj&~)kUx(gehIOQ2UBF1>6$^cFLNUW zFG0z&C_-_W(@J!3o&cQB1ccf+`{-0tzsVF^ibB|z&xa# z|JlccWF1Gy?hc?tT17kUXyic~gA&kvD~qye;s$^91CW^b-eZAXD6aF zZgi1IqVHI;ZKxsj?H2*ECRHe2t=<2cNykqXUwSmG8In!3~&B^CxIDIJ(ij@K=M zJIziZ+z?oZ0~$w8T!svU`-ZTRd`D@a}hqAR~VQ0wFVYGyUeW5=SowXz% zerV|oQcx>!dX2 zm*0}~) zKYfT)oBmFP8!(bMJWLN3H@yBu-$j=rJfR9j8YBmhuZjfKZ~s=zG^CI|Mxq^>s1Wc1 z@k0J?Ht>Q_Pr(>5QH3=BuJzpUF#b@OG8B!6MSWdOlJ=+3u0PxOank%jPoIJhk$RE= z6K!m7KJSWSjR8A$8Bw%kNcb*re1PArB^ON0iPQ7Ch;dh_;-20j?(%bC_y2-+nv~~l zoeDdBpR;D%!Q2NTW~%uPDYBAhogUrI)B!UW!RKy$w0>*rhl`}bO?v$B+e5u~hlInZ z;-v|P&tbhgIP#5#H4v;sm}PqEuuXWIjTyHhrZpn3H>Yn_V6!o5G6*W>O$*1( z*9Lm>&m^heF8wNQgOt}kJNCiC%8hw^yuk|IR zL=(=eB*naY+p)f!HngQc75Ss!kJ*20!9Z~eUR(9R&3_-iJ2>T+6=@Ep#xC`d_`b3J zDd%V6uB$)wtG9g@-zi3=0v-U2ZBqlmK-{x<#_A~2&5gRae?76U(>OF!qrid~p*rD$u)S1si3mdHsTttgowOKN&FL984fpwP7f9mwB! zsk_f6o*CW*qnxY@r*yR*YMkCKHi8)SvR?}FVzC|mRJs<1fZ4X(_LwE8pF}a3XTBOA zwwU&y@hx7yj*ZDf@I1u4v+KZ{S9xD1a+m-8z3a=a%LOzDZLKK5j1Yx=&pT%wDn7Cq zcpac;)$0=_0sTQDQ^NnCs6`_MDvaBSZFSQ4JAk@#AE1-i@5kb%9oD=nS^nnpF}n*v z>ruIsA-zTj$!cQ)9}uwN>K=|IXC;!Tp~&GGKD$_jzoP%iwp7+8kPrbKk$7)f zPAtel3cMiC+kA!n-F6<9o<7RH9%U&Rw{qpbU$@jV~keT`3L~W~l)>MX& zy>d+0o!SS9{ihoChqG(A*@khHgy+t7aQrAvVT!DrSAVJ+e?Q(8J&8DriR*)i!0O3F zUTVf*SIZ6i5k7DSowgzS0=^U!=BnH-w9{k`GA{l^J4ynJv_&!u7TFha+ptgcid&fc z%L?@j<;nZxCiU23_s=qNy}mW~Jc~5j8Piypd1r&?05&ZnJA^9(1-b@5RK)sTNDE19 z%X`p_Ea(%z#)KDFQ@OeCsXx4&CEe$&>5r0g#cEuj{Yaw3Pr(zGU!rT}WWL>4O^TeE z2~^m-Z1;fKG7n)bKS{2=e!Y(5hE@F{CMW9KZ+_9)Kj3dfP*N$ic2IwJ;|$y%evbq* zlvufAtxGyo=vfFtP*(=_>G5JJrDUU1{?IuXAvlx>5N)$PYV`w*I!9i|?{2;!1q-jd z`XD~Ea4%RD%+~(BZK5V9ZsDw(^-SHI?sg6J1p*6xz&pfO0HoeUTCqpOff+upp+`Mn zJm$E8DB?1-vO+f9aGH!323Wi# zEP;v0R4}s$IQWM=QzAOd&(fI}esWl|FdWR{+MLOd5++aK2;{fO(9lvEQ7X_Or`@4P zs{xO?LM&H$J!;6XU2S;NFttLS>sc=k8lpxx`uvz96Io@3N7EcydeKswsjBO6iee==p;pP%M z_goyFFI@pKip1ve$EZ5n-&Y6%n3f&#+ppIB|BGTw*CIf?bvygxZ?2f(QD*E5ayS%{ z16B!$0l7hTx*T*^%{=_ZFtFVT@AU1zU-XM9^Ub;g?AmCB>gd|vV9`pnV|J%Ou(cL- zV2YeMYSCgi)z0pM0PV~@*p=Ircjn%?Rq-B1L`SAk=#Qbi_6N9n5Msq#MJ6-!E3wz$ z{H;Vz_dmWLpssRPbuW#*loRmmp+BHoZ!sHCLP;ayHBiMPOr-!Qr;^iX@Wm41J<1CR zOP`ecNKC=pQ}!?)hkm`x&p+M+>ndnoCQ84GwX^5`unuy>ce?ZQe%!a?YiqUyI`t=P zTjpI(2BOMPkUjlGll@XIo2*4mQeKjj+^#I6I^dk5z2T}9O0O5QOVL_YRTmWW+^g*= zOs-FJ-P=G^8laxY|Bn7ndmr(lMWe@&HltmB!-BGk(Q1WHt- zpD+~=OdjPH*}DfEnhaD2r$||QD(Y{KZ=Df-oFl(~>50NczzoC|sRi&&wXX@=Hy=n5 zwvOEn#{C-Tc$!#*+!s#ojbhe2QpM4|FnD3ip(=Co%jw|kg z6Qk5)=>q#m+8MJ`rzexCJRz_b=pR9?GFLI08K=HV6tM)Gk5A_|_@GH+U_s&QB2-Un zmyrq>?l1ybB6CLU<;qW#|I$t%N1dFbt8zE0@WS(Or_RDOl|Dw^HOTy>>olGJIXq(_ zs#}+sEDYOI0YlDs+!1piKox+#nHpxanxo{^{adIk#=uMq6DT_ALJV>PM()Sj%Iav% z5fQ6cHZH;VaRV)i=%Zs;M=rjn2P3c_ROWn`BUD;P1uh}o$5?LTKOIO8v=hI#we*a< zK0c++A7S#uFB@KNW7~b7>+xNBOyT1%&3T8%s%MC47J%Lm9_MN=But8ZIL)s|s2n!g zPik+D_*V6M0(G#RB56`l<;*iOrXR2l9KXDX!Iu3BR$4p~#Z!9dc87Ig}PwCh@&?*rnAX*YoxuY1&&WT$#pxEk% z@SW1f6eR{Ml6Q;2CxUVHgd?T0$DxyZeKU?iJKqrmNzDm|LPH_-qD5Y55$V_p7#Ak1 z05)pBEBO+?RW5*#5WcE8oQw@-kk+HVl^M#K6URKNd#2}2GAVD# z___lfk#3_S1G+nXmlM(N{n)%ce^T4+(!ykS%b2Ws6Z67jzj6JPo9cnZGZjt3-j>dm3gZ@SC<$zs3HEYkW?25Px2cNE*WQF#d

EpG|II8L1iEuEsN2M8ChI1@t8NrlGuQvc!2%J!FTiKQT^G4Q%L}C5s6$X%RKwePUM3?0WLVzz{u3swA*9mQwtm7aXYWyj zYC&f@h7GyrY#^c=PYC=4*N~uTqT@pVQnEROMOP5<7{=+?!3^Kc$H{-{L3Ii&aqoJ} z)5XUy=nCUWbhRp82=yi|77@L=Or@4=aFVTH8>&Y-O+(>o=5S*=jw+ zSQ+)b-uy;d;2QSXhd%+rRGR9~l$3@;)QFZ$pfd3ne#8Qj$DdkIhb;MHqbMRp4}I@8 zqStE2uCps7kmF|{7~%m+!n$WAr7Zp<3OVp+>f@1s!~H2_yw zfQ!=0A~B3}$&B9xrQBau?-luWz8jk~(-70xa#=e<$zeu03BKIU970fiS3Nj2w(7is zJ}z(tTTxWQ%(t$+-c&=Q60qZ&2OP4eJwb#oBKKb=dbQ^ZKE0z#mC+5aE6v}@);$v+6BI-|CVFL19} zZ0-CCU^LRmV1`Wr%SBL>Yl#$Ov!WLww{S`^pgl|czMiIADyM>Dr5i0}PA=;TeD$8` zwMzP96?VU8K|1Z9BTJl{&M-_ipKd{#L^Nz>&WT>;891z?1mAq6ejXtJq`t!Hf*+-N zG>IwV5?0;842$_W1Dhgri*CYQG@OuqFvA^eN8=fsf+qz*$TdYYOzq=h?Tm}V;{N}k ziCZk8E6Ji0*w3;&GHF9)cH>dqgpB#YCjj+8jBPzCH7)Ui@Teb8>Fjz0!A@w~H3mvU z@L{!q-NCF1NlUzsw>0ZJb>;z7A+1?PAphQ-v{p%)zR{M0JJ8qYLiuPF(|X<4aub-1 zLjW>RD8gQ%7Q4Pa$ludMCYz<02%b<)pF$v`3~`3$&_gHzW4VL57&sL6WjX9TLxeb! zd^}0cP^g?TL|bkX3$Q3+u10>bJ99#L`|)DDzngW&UB*;#FZAE@gv4dU67P9zgu9Ye z9}k8y_c;yv`Sw9fb{0{Cw`>Ah5saq=7!ofC_*=-#kdsK`&A;=LnGF(pA>dotTbbL( zKLgvqp*`gN`_=3pUTquQ?{n&0y2l2h2(qTHmeM?>!KA^T(awDaic;DZ*4#JWTlp~) z_j%^-e?_fTTn3U#){->qj=){tUnwnP$=jVZ{>xG7iz+^_j~w&p*>R#wqJs54sjL!) zPyc3N!C=a`m14OSA@ya)61(P(=-K+{68a=1GKSzpWMSqZ;|(z&dR0$-5p)(UO_tx$ z0b&4p2<;cU=(|C*pZq}y`K9cN!xFxxvp>j105hMPMk>I~c|GODZ{NUsS<*Fx#QvCh zLx02vWr^ZVH<8>+O0|>VAefzUGCc#3wIBjT6Jo{yOwuQoI~5Uye-@@EyXw(2@c5XC z(GW8R2}YB%LRbHD|8P&MOEiph7_zGKd{wPE@0w(t=wa87kdmY&wEQg&*6t31FiTYBoxe&2{nn95cVfIB5L*|?_n=)Xb_#37)_(N zE2fk@mP|Qw@0}Ek&tzq4fho8CJA7~F`)lA}#}_+1O;;ttY;ge+IjN^(&7qG?u*9JM zs*hfSzVE$%->dWprZG)Jxf4?UV$#n=;Bn~|F?IGZk`+!`ydMN1>=(_p- zu{3{2-Mt5brvQ8(6CKp<+a)8z(faTMN9+CNWQu38aIu>U_VcYUJiLG=9F9gupd_VZ zy^T-Xyf(VgEn5+i|H#daXKt7NE0I7#WFnPXpV{g1>+kqwqtczTmS@>vI$!4Oo6X(E z(AXhTcfSLxZJEw!hwOwl#WWL2=GjlE=8SswBeh>{4<1&QK}|z7 z>Z)`0OGzsWYe z+7#Or3`a+Jwd@hP;U0bKz-3k*UGlU?+z6gg?2?%mYoT<~rO@pInYiN3E8Z$Hmo~{EKq%X~spv$0lTndepLUKk*h(YP+lpViY_;gk)q*Y{O z?UMi#-h_U|L>u+CgFgS|bMiS3MX(zvaNCswFvYG2?&oT6RkXfE-VIBB1T%a)Sx%NdWkuSgVvBAcK<6%Ka@BEL zsu$IITG``wULmQ3I`OLwLADH2Wu>;2J>6hkWnr}4_uboEIoK*aPm<($WeTMqR>S;9kEnn5cu5a-TL8)Vc2G zdKm0up*)uB^>I*MR*I{qTeI@K(LxI=`bFrCu3QHMs}wr6Z+t5%T0^rxO8+dp)dxeM z4^cmXXI7k?GIaUK0Li%mW%i40HLIk?MlUaZvg&pH#hi3*2m6DXn}a@y85Q|t{0qv# zX6RRXm}<;NFJ8ZIHhLQmTG@$3`X_`PE9(g-PD*e}_yi(Bt`rks2FSTdMve|@juBD% zo=_H4;Y9zHb_ccEGG0;0k$BPF9d@>CHx31Qz<&>EpB=hCK6H4YqOxk{`_OY;QN4hV02JaPIyb(Kec3F+e}Vyoc>0 z-$sW*kxNLcBkFjvxKfcwUee|0^RnW!N7XofNJz*P} zCAr)%<4aLHXI=cvKr#&4j}1UGW>B8+`q9Ff8z#~BIh6kcg4wqzSb#=^3KL~S5)C8) z3-Yi9AxZo_KqX};7iLVkqvsgT8J1D5^3vD(G{jSx`6D)WoPT~Qg0(H6F|gM*Jdz8D zuf85fetz8C+xWaolXgxG(_)4%W-PQxL-NQeHvMr)lBT%wL!io#giFEpLm|l@2RCOZ zn2vp>QCg%nPn2tOwhGiXCx#em2mdBhk-4u*M79MA4s_+Z36cwV+;PH?ER25*PmV>q zYu9Lw=%+_XU%7cBzxW-lo+42rGy72pb2^1JPO2gkpdyQ7s81)u_^D0M7stf^*dE)r zsQSPE9b{aNN4x^lLIk?WJjka~UWl4Uh^FP4K0itJp!li9a#o12>H8EbhN<$!M-8^`JFU93|QYi=Lh*JHw>&Tu9ftG@rnC@0$-+{kCVC2jd|^)H-)i zYJO(LsaW0FMfE2bX~0EZ-Ugop)$B1ai1JlyA|%|*SFXUKBpho}ds|Y$!bu*26d!_G z$Zwn2e`xL)1LSumO;ZW}K_Dk=5=f6-#!*K}iUN3t;R$i=>B}u79|sCttL1cAAKVWe zirndf8K4q%57hLD2+Tn3_?~8(JG*BAEoP2SKyQKUbv6uuD11~33Zt3-{Jog}!!>-f zkQmuL)FokC`mI_|gDC~MKT$uPk;2Y=I)AKbsAN*Gk*puIF7V-m+I;BHO2LTBr@7$( zesP6YMNhah3dg-ZYa1$kSY#@o>A&*-*yom&sdXRFNRF_rFma!9n4~-Vij9I(l*TeU z>&6j*OfV0;9S|-^YH|Y_9#4>En)lYG{`SLn`D(<8j*z*CZ>H#I-9f^}W8(ny-tjstP`AI^Ck(#pS4_)^3__btLo$hb3EDs^N@;*rxH#jua3tNpQFDxrW6;4Rc zsOC8HF(Q?{kd1{;Xl}79mzA7?w617md(v980p{$94^$-7Vi=!-5QUh;=rXE){m#j_ z+i3K#vK9(cl+=X^;(<$0qB-s8v;-Z|ZognDf*=Gs(UXG*ykLf}95;5BxZQ2VMr|dV zz5Afb6y`FEykYq`w4`R`hf6TqQhi$`bFhnhmf=R+!tl7Sr;(U6@yfiyWd|AwDSdAb ztiWE0W0aR-C8TVFj7(TRQ*=;@+E&wD^@3`3k6PnTFgmaWBn9gIn?Nu7@tL;#kqKv1qmTVbe=SkFPksb3Bw3hN0K<3B{;Q@84*l)vyWOj%YIp(IUW?G=5 zo8~m$^-I0L-3$2g-^0@r4PA}3k;~r?yaIWNOK80z?f1nr@*Tby4 z75%!Twa^z1#468ITmhr5M3Dj_l)t`DFGq1~XGZy2g?C9wJW!-cE)v&y=0VpLOj*a} z$8y08Y+9vX$o_pfXjp+!YCM~YKA2Z^Ffu@IP!c%a(kEB58x62p_zkX&S` zX+$ZDn=LNtmm(PENtSiEC{ejimuX(B;K=Vnz|+_yA#Nq$iiLxZWt`wasJz0~c8F;# zNZ%&pFaSNU%@-fc_B`o)k<<_$BZvQ`yNAMUV)$octR|1!oB~c)^oZSNL74!jC)GkI zqF9&B5*B?lc$^9;SC{N^kZU<}qKKp;0St*K>T{OEXJF7UzZ<%6e%z#GXKbiJc(h!1 zu9}#^F834#j#0R>5S;|XP_;BgNc_a7%jQ!0ENP5oISs+nIgCdyO6_!wlt9K9xaStm z{bCbcT|gj(9&WLz5}bluZ?p9@FBF3tDU#7VaIv@N|8%sl$Q)YLf3_n-9dhxjzzI`S zT_h+Z9fpY*MtoYEdLf-}#YNkj$(&+16mw7ywQ!>A1U4)N!epWc|Ge3O+(h+NqV#yAuzxSszMTmsEekW5>MsR|W z49s;Wr8Vb?B3P2DB2|WAalp=R_A2O$q3ytS*jR7a-Sx_cdak^Kxp!is`c7V@l_>#g zJ1b*#W(?VQ+d5G`}@lN_y(M+=*Zi{KMA`fyS@~(en3+zsX`X3l*(v&Wfovj zfZGT?3Z_{oW?4#bNhre9msQDHRaH>ISQ(AjEv||Nv1XMhhbl$K04uFxDj13i7*iZz zc99iX(X1)aEL_cmpcsl!5|kL$;39{t=;-LGP@ufWH$UXjWPqnXP2LHaBgn!A0y-;* zp#?MCOh3dRa_VZ_BKRcIa{2B5+qA-^(9z9d)jLwNY06r9;rwJ?fD;9=aCYs;GV}r0 zhGuB*wiULn5jO0vt&YkGZn>`$`^(v?+|{~b#*;T=R*ra%^I+B<`-?W4LSP3n7iKs6xSY#@C%Zm zg@KL2t@;@soQX4F@etBkJF9+yL!3^n;rng_bM&a!QYz}F?TGs43a6;d>R)(3>%pyipqR@E4CgtIS^Ff>aX25$ zre#1=J{I3P`z*xb-0e{Jq%6Ng#&=PddLH*B5kb()r4~>xw&fYOfgK_~b|4&Kf)C?_ zx9p=PXLdn9dpR^HnRga4p$HlZeAz4ZqbR8X2OU|s+D7j;)P(_ALlOu7X0amk)s?(&ivT~r=9&39p;TU{JSH)N3 z#E;BYF4>G7BA!^~>a$1pLmX80{%$1$nE}G0+z9b^__35a7!?l68SoNm_kUt|TS(MStpQk+>Lnp!#4PBP z;-v0RV6eHV1+bCD4!+&70@)lDW6QRYYou--`&qcNO(k3BhT$iE(G7nenZ~o-Yg)o= zhJ{Tz1x#6d9<0;(j?SE@3WprWaqZk3ITJE>7L`Go^M%>Sp3zEbP|55;nKG&P0ru}y zK#ZpLKE`$~1GnOO9f#Y*(MevO1&`=q-6ln3It)?kw?cs?LX*ppHkeY{yYg~D+U-LF z0JQLNlCa!u`L65Zv8nmm26krW=Ekm3DYuqICWXB3pA6+vrNIn1_DSifE&#Vs6LSVC zresFDCA4M77~Y)KZwo@W1S*?l`(jPevJYH~G^9_L&V{boUv=%62sV$-wx(BqV&Rx8 zT(6n98NqYa6)i7^6e-Use>NdXy4x>9he7bp15q!c;eYD;R|)9=(Q?C{Rodv)Ei^HH z(PyC*vg+xA@?2@3He-DNZ>ExbmmxLCE(OA6i1@^ z6RR0lrpOYhp3;!4ej^%zr(`+~pA46zyXt^jozYwCPOuic$S<5bMdQV68kELbOn?i9v86Q4 zwc;#;8B)Q}!h75;&yTfQ?t=oRpK7SWFpR%mYH;&EC$VAB=R~tXr_l2K0teP~$}RIx z>|6I5*`=`)47SMHz--1z5iJfS@pmW_-!$T@%WS-r8{+8X7;Eo*hphRUq(BCZCmPDh z%T#;L%0Fsj_RGBk&&?Y}Z)eFx6C?LvpoGBn^AfD|C9(v$p4>!ND8^yad)|0)@fM>z zCmwwMR5=OSKatby7d}yYbni;641+zu7unlHLwkE66bjR<3GPf z-5)31MxZ*)L%cHTej5SbQUQM*%J8$2%@;HTQ-NXZ@x)c1tiP@}eenI9(|r`+e(HWZ zb<8Cp@%4%HO znQeVR%CD`I zk_EjVcg$~n;b0YMrn)F;grcfP7Y%_nD+?<#w{uDwlyp{?zzj8MQWw}**O}qTWk%b% zrDGbXX$6)DEP6A#j*jtA_z#Pzn(Xa5qHo^%Q==4RGV{ZHk(p*Ki_AW?V%tSPgMvsZ z1wN(fQgn2ZHF{Wh3j(-HPUm#>L&Q1#mk_NoL!%sSA*4>?#+lKiu7+w!i`*BXk}fYM^dA^B^5{2;JOPx|9X!Y2wyu@nT{en`iCuf$Y|CE6rkD}smNlOVBdkTB!czjN4HbUm#<3jzn~C&e zO^mxNTxj-7ArFlp7IpcStGZtG#8Qv2kSZ;f>zUoXS-*w*2S&4@;!n%J>%r>xKldgy zsO;v9UE}es%i z5|jlH{+lUqZ>nJ_rdDf?e-v)6ELH0!{oYyT(?ZEceA8ONWoF!Zh4Jz-p0|o%0uj4R zhy72B{_aKUt-#qg7ybA%nI@k|i6-i7W6H_9QiR~kIOxMKO>kYzqMViEQwV)>AkR@= ztD}mXQj#mPV)Q12@(J}gv-Uu{^o)JawMOIOU~*h4tvt$=OLUb#E}$~uXSprvL%HQ! zzvL2rDN@!b23D*+^|rjkY&UXj)TWN4+FL1)3f@Gok9H`fpc16G2_5t)BIE%FxiUG{ zZ6i-NLklt|WIHc0x(pJ}MRiW(6l*)r!8>dX9k6MX_4qV~Q)uC77Mqlpg>l?S%(Orx z?6DT$g1f<)thp$9tY*BbLw~=o_Qox0cG2=Z!P6~dPnc}jsv{k^R7)mT*BOaV<`VDW zG0`G=>mmS=$;|Uo6k$I7sXs%$H%jIkZ+*v1yJBDjR;3`6RV?tsq?e8(o+b82dSl1K z*NZ8u8kXSzm4)l}AIan|6pmRSB;XzxG2R%M0mDm#3xcMnrzfX3Fnds3s6)>X_3fLG z5)){pA+oSBSqOj5lU}M_WH2uz*hFv+f`~kKN>Nd5T)!Oq7(dKd9KB=XI;JspXp7n} zg09-MFK7~G*FQbD)}>>wlT2wXXF*28I>FuT4Bq0aBt(KKs-xid zFKe-C1UIKp#FsWgiOMu=XiR{7vT&bS36K&xIue=;T4+)|7}SY&%0&h*m3x(znmKzw z`r`$p35-|XBTk8w$}IR0Vb3j#yj+ElXwuP#fX#T9jvu#?{Y#Fq6nSK8$q~d%Jnq?> za3$@8j6o>@Hl#$eb4c-7JM5R5*eQox00wmIWq;3F9NR8YfITSP$3}&}k#R1ZR`<13 zO#>^6Z(}_B7m)FX887sUp|JW3=z`I-Z~@$bx_Zxf8CMD3NWxy^Pe!mhKezDpOuQY?B+Am5&*8pdgunw$XzoO{xu)$wwXrN5lVjN8w zl&mZ;TcrGwSDY(C8N`u!6QXO+GcQ+=8yO$u zL|OSvcoW(pGd95e4e@p9_YR!zJJ{YuQBPyY&u2P?I=%yn+Ii&U%pyp97|MTFq&@?~ zw5eo)Y3TV9zX|(cqQ1zFB(&O2yXixjK3U&AwnCAube@i30W3H)H>w^_|Ec_{7ZLf8 zST3kZ?>{PCwHDeWcgc*Dt`B$;<9>h)(YGu7cf20<&OQMM`+55cDEv!g565W)8! z%LPER7Nw`Ak+-e3pk!MRHq45@9<&9(4bRJ`!szo9ZFE}+?^gcc|zuE15w&egaV{^*)y`kbM9N4`;iR~pHo zR39P0fh4(0)r4aQ+vI`V z`w1^BII%=iztYj*U91_5nS5CzVUVR`$ zH-L>&34(b>8V(rz2>dho_abZ!3J-?L-h3aYnR{AfSjn|%f*+9=_S3ILb1>)B34$Fa z_FGkgn$ozn2hnNWRKv9-u`8IeV?=T{@tp(z%jglHqtbT&i2t}p!Zja+%DMc5bm!cG zKvub#6q`u#)P$}0O5dEw_0akw!fh!S#111Dl{O5CLt0S~j7x3%_$@2#EYocu)9fV# zzxIn9m|-Fdo9Vc}nu3;n#gdagWg4%8q*h0~lJhL0SD z{#IH8t~lvVME-8LZ?^>HwI-i@9<-Q?cR-js-4D@|;j(Z`Ps80$pgiFitN!cUVc4{t zpBA8Yo)wx`rqlbJsM8$D)9hFWW=pFh#O<{h>fgKMDYjIF&-#nv==hZ z!OcRz+{8`Slb(Pp11syyQK@-KO#va)qd%`tk~k2Rzc!Ik4Z+^2vmH_r6`5ooYy^^Z zcPUB7bf^lCozBxO)w@b0dwRe7!)_wY8gt8Ye|1!YWIkf?{9}~=yz@-?V0cHWVFBtq z^`DPjCn;7gNpLv>dKOoJ8T>0hpnZ^;2vvfKpar9Ws_A2%m}z`$&Ah)?ye@DE+uzyx zcs)*6uB@l{RdDEP+uQx>H!1qpk!?>R5lOzr|DO@5ATuo#ukE(FRE2QU7`9?dGq+)6 zro+tm!;q+Kx~$zm+Z$_gDOtMq2gQiWzM7L|bATGZxw3JS(nXP_<~%hv)!<0FC9ZQu zNo7+le#u;xEjM3-iMvC*0n4Y775-3EM02&`WIzc@23}$T7P$Gw@+iskgkC=NNca?e z8y=VU=^XxPJala3pW}H(0E@tELy(~Io#8&3hy0Ys3{gN~tuMpWY+7~H5^?MP+eIc6 zLR~eCI8IB!J5H@i1=CZG@s4y|E!MLMf=xbpW@nG+^x3)iO3D1ZssmpLVtL{iAb9Ls z_xxPg?T)tAi$#B^XT^%|l@QGW-bcnX2pwi6VHF%?hu8K@^{Xoc0nB|~{1o4Y0U?Oe ziiYq?Y2xowCF+>nEcP?eHImlosxuzYon>Yd4DoFn`A1CKy;|k;f56k^^k8;z{%>##rb{HHX8c!#@{hRT}`}2;~WI=x}t|KxrzC z^n*!FEG+Cea)Gok#p6KR>Y@DT`5(Nq#r&!SllV_>vF%P0;91?n&fv=h>K2RELJ)Tx z1(Bv?TL*7LQgClQE11DMzulcWB;)P2ln%Bs#O;jAOyV`5=$j~eQd)Q=N$+d}ErX|q z;tjhx{|Hd|=4@{*rAH(@6fb-7{O)e`K9lSLe|~G2oY90imMt8xB5bST22?v|{B=im zh(h+(2T&AFUs?i6+A-Z?ye-fTL^J$@rcC(ory!%3e{%powF4s;Y2K5dpUccM<&P=? z)Gtqcq$by1R6&odG=1awXSS3nWLk-lpdhUIleupT+wK@zMQ?$OTa2mE#qx_WrqyBE z0KGnk%oc2F*g~*?e9ETwgtM$-07uo)cM@rl&fVMykRCzDw9HEv#EQ0 zOsyS(*<-hm5oe|@E|K^0oBqu>y46NpZs%<)JN%j=DI^5?=S6^x2pIYLHcb<9qt*{* z$Xop!2(87aejr@H_Dw?~2{rl{1VVPFSBkSJ(SxB?8Cxc+QQ2tL%%OpK5Lw;3he-qU z+R{oo5H>Y=KO1~tDItd{dkUi2CI}(sspJ(T!OX0A$V?;PcIfBh7UhWnek8+{L(;}k zNh9tU&N7#T6eg<45+L?E<+3op5!taIZSLwi@;ko&cy~TF&(ak*GoMC@ zgUqKC_6vz2&5k)3VjeUj{S!m8Xi^ygh)(7v%PxV(1cQ)DQMBRo1guIap^%c$@JIsd zbb5*iL=q`lBtuE54HhGDA&A7pFv;}yuWLobzYMViFlde$DJKTXu;0^Qn)0 zmdepv#6sXLh%nS&9Uai0=7dd z+O9K4$ksa+<6l_#JNq-lf^akXhGe@sQEPq$MCj+Q3)F+zE<`7p6FOnpZ928}G_QEV zg=fl9L487s^2Om|B!B}}3!)K-zrKm~9nVW35QAWHgV_>488K`a1P6dg z*pp>;qvpSAxqE$IoLs-#!9av%b8cNDWVyYHelDHSRXytI2Uwf2d9)NFMa!DJjykW# z#HH$t&CJ92)%>n4If(-OsQYfIO(OCpbtd%a5V;0n0Pr6w;kaC;$V4&(jHUhMQ^;#B z*1KBK4LQns-`NyQ*}ftJWH!?H%b;C+(UbnX~NgvkN$u{&m3YAFU}) zBLK}vetm>679}GyrM>jaOa+KJ8wC<`;fYU50W;{kDcL;h zITrjwQG&35+18|`ctE*-Vq^CqnaP16_b5@Hb2{)~yYw;M^fcyp@KO!KUqLXwSk-|) z-jCF+SBx4qdUZd#f1SYNp6&ZS)vU6Jqy%LO&${3sM3*l~&OPzF_(?Z$RbV6s9sN~2OOu1&?%ai8|Jq1Z zx&sHsr{GdfrgP*F(2ce zXMSjo|L_m*D+w_{?1Ciw(lQqm10$7U38uL}-aTS9E=p&OdD3|w`j^nm_c#&y{Q5*F zw$o`wO3tkhXNebDIEgrxyfO+!LPESTZf$+vV0`Yhx{NZGRjPMCzFaW z@S^m1+T%ldQec5Ds2?W;0Pqy9K+YsEPjWzu3^v8x!Cfi&Vo<#_A8+)d(*LW2mvF8a z?N~n^k_gflBmm}zjHEw#=wS1jbDl5ov2mUkvG?XgyBLT+$o)X!8X3RN58aQ%Nq(N;pq|50?-VNJhX7^h_8f(u4BY>dI^lokgJ7zjv8cSuWz3L^)jTe`cX zOQcIcq`SLI5fSzG?){fPcCqc*^F8O>_x(Am00cUBCCx}zSJT+hbEMtYjbwcw;)x14 zarJaxU-RUHf<9aK#KX-^JR#}*_i)uYFl*8Dj&U-zKB)?#h$ccDCcwx`gOjUU5*;is^abeo%RQTAnvqo~An?azEr;Z(QlQ z9J=yPJb-W!6wgUx&GaLoMhYzwyF|`hIoAj(7RCbTLiH;;FyKHu_e&Uru>%E^UXit`b3UN$hD%Op?i9th?Fk z-;6`8_@z3$!l4MYY&`z{1S@WCW^cO?^T?N0JvElC--(N)cr zZF8ZkLGqhyG>`GY=ln{uPNOTXkd*wsXj(k|oZVhr*{~oIm#@P8UUwXAJFjs%-@{~1A5Dh z(I*@AkCByJ&7xtBH-;6a>yE)__WbL=<9cVm^`0m}C@sc#Z0DbF2wf&2fXEjSC?(;L z$z!bjxGk4ST@5e&I8UOw7wnd7;G#p zBaj@G#RFPg-{$vydK0w{iSuzr1xg-Zowv^*HJ9ntlcqN zLiw7H2X+cbC{*gJa8rE+uV0m&Y#>SZ2w+HZrL_H-%ws}rcX!7X8!kuSkV0%Oji zeUnd7)RB|8RaE6=W5t_j#!P2X7cp0Nuxr&CR?mpT*v37*3>lOfQt z)CD)DV|yAR9^zf+-5})vb9IxWunBnO}Lhs7~;%}suCWB@;RrHb&(X3v@$Zoq)DT<;bj#-fmT!BQi&1{ zD``hjf!8co?-E@%!qseP8dXL49M)NrjKnkQFB8D6#?J~ptcD2+4g9z7qz_f?`%YBE1g`c-CIIRey#FeGhua1KzJI*A!B05v9~ z>qTa##7STat_CtFCK*GXn}_2e@mz$}DZ_Ntn#(V_%G0{3<-{V|h^?9pZ&HO7Q&OB! zN+A(G2xkqPAEJSDI~Snz-KEr-Y7>7JExD{5YO?&FxNcR$=J#~_NikmU<4f)c$;$qF zHUNZrxyWKzgnIdNFF%bdzfRa%@2b8(UJqN~01xUh+a4nRHVDU-FGadp8Nx{1P6zv6>t+oJU#$F6pT^GfEmO+Ka`; zylWk96WStD&bAr>8VP*rYbdmOhn&|4XGyl6gI$mtewQes6AxSFA0;-=hX0FIGNN5b z{93hrqZA)%Az(m@+YUVN#6VOjQ*lgx6`~fa~LvlOL_hV}u2hfx}pW zesw9@S482Hjsr>Qrzhiz@I&0Bd_;t-Njxc79?^Bw&_x(@;lK6%$0_=|=enft@3&65 z#jNEpTJinSa(j|(M8&#$D4ikcL_ zqkt$&`<|s19(Oi!z)MRILw`v9*5og2TBfW^qR5t&hXw(4MO~=MMoPV&(7^nn)bYPV zm1|HZN3 z(ODrJD92)k!r~a6GBw3Q_7WhJp(sWj13FQPB5Zp@v&8JL%N%)`C zLXxv}&?4|jyze$v<;AFk>FH^fN=2hIn*ZccC8aD>$yUPpI48>2M7I#VG+J(_<)3Wp zA)%ZifyiB2a#k@r9wnn0IbH5tftG?uCA#|OLO;avi zlaybaOEKSAulR=t==RegGC6@fgtB+mI2xyVEn(A;lH>5qKb}gHd^gR z;BNcD9MAq@-QqVz+nnOyRzDi%APZzlg{+iDQeK92HhJKN% zLt>v92WWg6EIDV4)fEssDy#l*wBowAqg>tOJMElvx8cA7yxz2g^10&x6s5ivlk+(K z-eB?oR@z;04m=GK$)Xiwa^p&PU{nO8CJs_w*|-ty3Y3S|+mxvEuamfRt#;Kt{|0^1 zWi9g`osl3f8O`Kq@RNEi;*@-%A=uK2BmN&Z&SGmbCd!fMP?j@CUi?jk&dHO|ryTWP z5JwYlk9fToVhvil^e%Rx3&J@slhx28B9{4jqzeykN-i?AvNdvEyY7Y~=RmL8JfG_1 zSvMz`=o0RY@SMb8F@r?8Nbquh$T6@`1&ShHOd@Q5?fJMcaQGoR0ZBC~Keg*gjqh81 z>=%0ZsaBM&*-54^lr*J?^K>(p`Z!PV3Q*3-LKgl)JCZ!-z`)1{|1*27UKJYgww{8i z!H6xHykRVPS~c$$ARmZw){kb0(6Z2{_~?)*l&o}G922?7fUU;HxEeCvn{p}ZxjLJK zPz2pAgxJsVP>209ygheFeH;JAp0hK9#XelZ5m<@~m1($HG7Fn-4PPLiQV20*J%Hc& zyY&~2thFosS}LfP$ z>|j82+9V^RR166QQs~lC`;BL8-QDACdWqBs=LOlAVwQ5-pogw-)1cGOwClV6)2Kx* z&Nw+ZkI>BtF4CnoKEuA&X8V#M*kmKk{m9r!{d6x)&r16RL(w6T?aY9{6cL>%$3lGb z3k4eQXoq>=&)*3W8MgfSySfBF&eo!x8r%He`(uouad)B2JbFEcA4U55X{1E6;%gYH zzD#Mxl|PA4^)ClxD0QJ7UoXtjwi7fzJ|8LgbUMJU*1+#9oji|d7*EnHatM{A(Or?8 zkB1Dnvf+MTB%(PMESkWsI4Cj%!nke2D4y@|=~O-F7r*uP6ABZ@^f?c^&BEP*Ix_X! zy9APNK0ZKq{9UKJuLauCtlGLF&7Tt403CfTnJ=_zEJZ(#@;#uh#e2X!e?(LiMezJz zXG}|-MH|IfRPH8j!ALk+9@r~KSCsWnA3j>=weCDhFVoI_!vayX(A7_IB_9_G`;G(I zC`wKc_myr*Jzs)DA|m-0#cAxMUf?H(4efF9M=Mei=)wrqXNyR5vv4h3nSCq>f!I?3 zRRhz+4y<18ccB4h2Y5MRt->U(`xgBKKPl(!i~0DUH(I@(%kS`0v*IImx)UG;s5_eRK4O}XrJ#gbv& zA2%%efbNH@x>|IU0VgOyU&TvNy4u?Oh{xdflogC$8Rk-E%HbNtuV^BLpJ+uaFQw~9 z0wx*_zpwb@zaH^AHvmxu62U`P+cLFv>2C^N`O2SOKa<=Zayec=)l$`c_}Z68e(60x2=_ zD9fW=Ip~r4d473cBh!c`cO_RpUElH||BCIB<(AvB;p*^X<|INB8G%25@Wgd?nC_n` zI%QMu#0G}diYy3RrrBk^{G;Ez)IWSYz5DV@EJM`?@p{@oJxmMtv`lKY{XzsH_mSlj zMh`*xRA0Dbje4EQVuf-uM`wf}SG}tn`pMDF^+#HB!Aka&64mElFtkcBuy^&Ws)=eP zk=sI+o{*oSZ)#%MO*{rko^bnHFOs7_1-?kgl=5d?e;?>R?`lNBmf}WV8Q%;#Pfs>j z{`qh4M*b%J@=?Whhu@tDGLiT(&v*M;0qwHQ_~ddNSSWYbShG|K%{U zu7gi}NRm;Xu#tL4{qrr=h;6x4NiVTD-N($XL7yEPUAOrR`suyYq95bMg+4aau2wkz zSz$+M^8NRr1_lGVPW6Hmd%!Vbp8WI5s;2l$Ye^f25IKq`q76R_$dxJwIy)b`X>o4J zh(8*)_TA1{E1P2Mc;U;2Bo$j)6)!1k6-M>r+~RQKIJ*of0uOZ_PC1-dI~!WAL=@5& zgN9{yC&9D$UtXS_O0pgy^tyWo>d=jn<<~L3)-4Ou$Fj#&U|aoDyyDMe@25$7xd_2g zbLMY7M_;|Uaec3uy5W|Ko4P+Lh6{mYRQ5=w6FLC=a+85B74A(QUk^y`x&lro#GbK2 zX8n$lnk4taoHRkB7FMGLgTh6`X_vivmvZmllW+w0IXZ&JcEU}>C_N&m#L%=}NMAwD zS#eHWYMavuIaWcF#hV9aR8&+Zfb;RkzYAvRXpVns0QMC)x+rX#Ef1<>o3bYc z{e1OiKJbw&<26jl@S-hEvnk;y_&u&b1^AVT9>AJwL0zq(Fa zV#`5{(M2o#x>l;eX+AwhXy#JQ0JqNmRT~hrNqah>7%Y=c6PaIh^KY% zhi6Aiy1Uo4I;lQWTLRt4JV1k?73QFfr?Ktgoz*TL^?S=@gGM=j^Pl$L{q^sj`}n3( z85}M8Sa#1&Phmxss363S-npbee`R(_j2LQ-F47*r<48sjQ|g1!%4N|+&di^KUW<*| zTNq{hbncz_Zf$!S0z9hD{d7Y>QAHx&w7oCWV7Sm9z!3_L>HETGx6ds<5iP!gL5@xGZL_w@e>Em@seiOgXzK-(glEf~?Z3;^ zh1%Pn<=MAq+eZv#z-3^}Y;81-c zcw(`i?YgaIB)2|-#RO6t4&mSOE&&RAVYKq-KW=dWN|s$)j;69Qr%T$( zoZTT-{kHzkjfri?uX2uR6WWe`cY9HNGkY&q+07Kbk%7+$g$;itB>gwt>^q<1ZM^T-a{HzN*b)htFe-U*7 z=6+O_Ro*fOeXX-N1n<>|wkw+n#&cA1#cz5dlv5sc{>+L~lPTFObxL2Di-0&S3`7u# zD21~sg-V01kVHE`K`L!95-+pVMnTi$tEtZ_02%KXoWZS*SgmkQB%AoM&_!TqWW=d2e&XXVt_;_oQ<2FOb8hHA9;HnVfYJnYEf;? zd61d|11dr!>1(EKL?h7?qn&R|z75uua5!8N!@9rbC`QQ0k>(BT^I)_AHsjh>66+l*x5CnUZI`tS6k#ir>*5<#1E!E*HUX>#bv0<>sx4H?6Fz zA5uBcvMkzY4nn*k^QeqQ7vg5IOkM?2K4kX<|K$*1wk=!%SuC1BH?54^=JrJ2P+Be3(A z<@s2RNvx$C6o&OodJ*+5bJLdV(0dpm^)P>cNsyx}czYPrjEq7n4pa|;TpjDE2VOt3 zl5jy(1X*2g&)^Jb^9N9vRZTRR(-UA}1C#ITzAWt^oPeA#5b_ue!;-ZGKcnwQmPbc_ zf)4#XVn;<|2~zPk{R39xWwf^ct|u95={lHbqo&-5qxfg6OUM_@=ASVzL7cgXz^Mq8 zYOLHbDpGVxgT+Qy^cXbhbtVFz(g+mBx~#boE^czMCFv>sLk%FcF&ccPOAQ&n}nz_DO9&nAeSzedF3)FC@t>sF$(-%!rm zx0&I==vcY-Eqwm!Bx;W7>U{#7lTTE*tI+HOH>M#El#*;Hi@2e4x56+d zdx=Vx%ow-XLBPAZdU1<(@nx~Egyn6y5$cnjGrmcaxa3EES@+kRLILTy=$li2p?QlS z_qY&6MY{x`K0%QvgoftB6i@utW(#4}0#z~k#IG?rMeUVZ+?r_0rg^8zS+f9xLG~_f zo^3vo8AZXEN-skGPJV4>cVYfrFsxG7I!N~G{T=2n z+JvkLZ=6oFe1q3^JHlVLV_rajSB?MSAA(B$2ygnrj{$H+1r8)BjSMwgRwpXLt&d@> zdBtEgw%-97w@yGwlf>a!r-oUH(<1bVTQeD-@bPOCjZ5=DcyY@C979`38fpokFewuP zpz!xOhqNsF>aY4L!f_XTc@9(jS>uIh+(sQ+Q|+B=*L4Sr_3N4DG^=EFg;5skQP39- zN-T|or%xrwX4{E1ShSE2l|u#&LgwwJ^FpG-G87|uL)96>(BMjiq{MMH z42_vp*Gs+Kw>JYvA;$oY&qU@j7+i2u9f^$vz2c80K>J^vt+A_)KRzA@evp26?VBZp z<1yxabi(id-Z#PAMqW7Ndxb!PksSCpV7|RFB_esM{9`>5(EI^{5sOX2roeT1IND14 zIBggr`$OLfRbG!>Z*ibidnPF``4-pD3q;ddq0Sy-v}8mdhWq8H#^ynG`o><#xVGCG zt!chC;d5!KGg>wl#c9&lCaZ^Mp5Nqx-{5MZI}@Tkjg;DdU+B%Ns4=udNO-hM^IL-l zvpKmd{QDuJoeruimR0!|MDm>g{^zN{tdU&KtPlmAM$s^sy#?)J4E*mo==9f{Td64E z8%k!MAWa-_MrC96G&$H#z+ph&5ps;afe?MpB zw+WY>fhbuak*8=OaqG+jyblWNr;z>kpNeL9Wxl7xJvG#{9i zY1^f5kf+}nDY;)*Qc}Qx%sweoq@G14^4+!ygVltTb=1N^1>_&&;m%K4zXr-5OYvYf zE}Q4K6ruYF`VBk=MJh@| zNf?pEC!>jV@FyHij5T#rP8{ub%#4NiSq(^9V)~$@q7%&FDYh#7qHR|DRO2_Yd0dl( zZ=tY0>;Az$J7Q?g|DW7^jTqodD#__KZ0#&7Xu%YoVg~FZ{rp6iLp(fUxe;NVj(ZPdnfh5Gjjh$LN_C$sxDxZJ4z?WZy zl=INx5@5H=IgHcfUT%)|J?D63ld1gR3U1}W z@+;Lo#dC~zP^ZyXtI;4Yk5P;$&kczc?i(wdmx-8{+KCkJfZ)+0WO5hJmK-vHe*VNw%n)(M- zFeofXL^#Lrzidz$9*=^!rT=yhqR{n@D^hDKnV2A8kho#Er-;x7v|aTbq216#vNyrN zqTb57%5GV+QbJ{WKB^k?1bqj#jeCiC>D5_pk@k@bT zMv&Se&5gv12_R-+X)-9Zo0UxfWV;+(!nLql zYD+NmimKiO(c@b9bjXTlfQa7+?uCtJ(18+=Qo(M;p8LPJR5sU88@y=$SX;zAq~ERY z49A%yXcd^&gA+HhNsfld(yu9;;NS_4NCVDzP~QMZmtQG_hQQKp=G-onb;kmRzY-#Z zIK@K}#EVc^lc9~m?`@}-XV)QA_@J^Hcx(#86-J{GV z3C5u%C%vPu@j_kkpXBkr3HV>#vEEu-i;Om@^crfB@Fdi45g)G`(3Qro?UT%` z5Vdb7gcFtSj?flrOqO}!#ZAFRT3MV#Pg4juLW&(u^~hXO4m}n^ct?zxG{fFTOVp|X zM*z)e(VM!zy{vgqSnxlwgsgfc?xqSgM4_HXUKcGE(3;PngBbQ-T?%@oWhsrz^&q z&C?YGKjs4BzA1vsgIR{ySNcXsevn;)8u|&>`FwDBjIObLSib_HV90sKBN~rvx91e! zr&O<4MThVubrmCZbamE{VahPxJhbaMn_#)W0w+yUyD#0t+b;HciY)c#+XFf)#4NXi zyCd6N9M3;jPDF64ps9t2H@cPfuQUebqJs1@F2a)eBdC?EtPxF6SPWTnGfdjr0=)|{ z!6@Tn+a%V~x(39_l8mO9Qu7a|vSVFILZ@@+V=0GdIJHy-El(4IMblQDs&+r`EpiN_ zA|Xi`1?&@-4Xg#a`j{g5Uo3V&lzf~=MD*`x6nK9+wy$%G#d$+fu_(SX4gF`KY)QHD zdvxC_e~--uvRmW1{2;h7pZx#8;a?7$4?8@Q^#J&)z{Kd?VVEvQ3vYwxJqqQ`8?(x zFJ~q&RwJXQzetwg^!Nby5Bh9{OejnY-B%!Vrr%IcLVOR}@3yW=8jSfijLv%GJjzbT zOvwr+YRpZCs>LTixTk_78py1vFE75%Y)dKKop;K2Xl)aI%C8d^dTbg0<$b|)wSVz7x zuTPyhY)~=L&&gZlgT@m=OlMCuteA|nHXWb8<31d$ZLOwR68Wj`?Rk?gdA<^aIsQah z8t^BZ19e+!bXZKykncmr{7`@9a||Z+A`i)_!@Xr|pLd-T)lb53-V?0(cG9Jm5u9C z$C?=N*|=Dku*A~4fzNL?V){2!>-zG1;q!&n%jF9Ogi@Dz=n;+2>DoX4E)=o8Xb*O= z-j}A~ki$Mki$X;z_{CTnDu~BI)6#66$`z;p(+&j9aP?Pd5a6DYZzlmjd2i?7=w|Y< znc`WWbiHkzZkF+z3VSZC@{Qkge4c!Dq}Z@3CF*n&7}LL64UX?{9zaS_tE^R@u&Ezi zn{TU=&KJcrw3Bu~Y72!_%z&TxIi3vQ*<3o zwrt_p&f}`)DoC|=-61A1S+yc>Vb_KIS?<)Fi+&z!fbXtEHGd!rKgkRODr%SPW9<|3 zMnWgb;jk4OSxr1Ew`Eq$+yPcb5MHJ4)ofabe&j8CHhrgA6|`Z`UVI>x?&W;lOTU6` zYt8)je9}nX%ih$@wpXo zbh(e!_EJYee6NQQ@96MIy(00*r-48hlf8K9!D^{+$qtPYJ@3C2?rPj!`ZTFd3dZ_^ zvksJWqZ7A3dm=bx>E@!h-e)Q*w6E!meTDL|J~#dC2PqA%Kk`sAabPAaeNc$7R!}I^ z!P5B34PWs$5>Nxbj5;9{`y)4X>fqMa=$+=f$Gd`*Pdy2%`hbZn1MBR%T@!XLU4ZKV zIQCf9x)}9&-L^W+X1=3z!;^I5WAC!Su^RZ&nYt$67*KCRId|ED_h4iF7T0q+HipWL z#iHEwi00A(V*cE!0s4q!{8%aWfVaxzVT7!WO#44g7Z7W_d>pI$hSxc-s z%r@HcLt${gvN8aL{1xFCgXN0JfMI#VIKjmg$*H{X>X@)%u4+3qU7UCoQ(jaaQ^nyJ zR>=kAE#?hlbS4R7z-4ba9C3W8Dh%#VHQ&45DU2gpdJob>$4d0!y&o8y{R-S#sGAXf_ndGl@F^t`644unC>lymX`U9i zP-1B}XKd3U>8Jon7T&yN)(R7M_zsz)pqhsnvF>Q1eGx`A_uP= zrG2K1L=jD8{K`k0DDg9k29}_QeV>kB%WC}coU~4K@ZCFx!cw@oaxypV!s|6W#rv!E zrPjq@yU$X(b2wyPgDsA-JVKfPs^(=hsSplE1$7*MgSUYtl`NO5U78rNU$|l>pjcnd z`9nA`u66)}*>|r3fM=M-ieG6v+9emuvT$fNHpmg@E}0=)y$!kk6N z)*x20&RzrD$dEXDjZhM!6$Kh5W`@i&e%~ybG3D|D#`3~%{n?I={zY@K#z&C0qTEet z5sk9+;{WKQ%anC^JuYH8!%hXH6j2qKf5)X&$kvJJnZ5w@&B$}!cT1Ra+wm@OblCc^ zsoy$rpb2y_Q@K=;Yo5i)){U`}iKx}Qx{81iaY$#K z8s1c#H|LFm2i}I`eAI9gdnMpb%-(x4PfVe#8d{X)OJwJnET7SLgDJkxc52^dBn0x+2{7SHhM~lFxoAM1;*twX=ndNT2n6Di$T)i*x1D)<}&=F5Q2ZPqH%m z12Sx@?&CqID3=)_lT4$~O}tYmOa=*28P*mEi{@5?3@~ZYiSNmh6B7DzzEC7YMnN74 zU>ARi9#oHUL^z54hDd8;J7%|05?*FCbc#sT3pD|^b|t)dVtu-14k+BFa{0%p(B&+? zA{0i{k4&bf0vK5CeC2riiM+RilS0dHDWipD5WQMxbD_kx)hl}!)|W&%BuRdb8#QNr zgP02~34fe(Fqn?|5Ls zo54wI-aw}ZkGlw%7S^v}-u^VVkwTW$G#Vonof7rhNkx`5JQ@c(Qe<-EoZd~~NCq;j z&{{1TXE-px7_8KFbkzj=_EhhR#Dy-*9M367AUVp_6XJqU*seerlQp++zvw}cisCx8 zA#Y0Rn5(M6@NOBw6fmywjS^aRh===nQGP3>=0Ph=7x~piZ)*9vLzZ)ri=?50Bl;We z++3L`Kz+ydJW_ZAnSmO9!tIqmGcEO!wUvyPx)hVHkpe>#W6SIv!Ujp^hZRhiId`n{ zq@?w`y|<+-A}u9oUGCAMLnCKzW>Y9%NsCbOM|1bl5Ny{$9^%h`{^&fE81uUw+zV%| zk-Me=J|tF63o{@egFc%7g9V)79Z;BS+nQ?K28zTXpV%sMkFp@5;bl0(9S;N^#>K@M z<_Ly4d9SlAYY{Hfi~%&-zG}gL6;Ep98teZQoAb7xdy^NQ>jnxC5!Qn{@#T-la9ytc zWOTkK&A5~{c3_b}&%e$0v5BaREV}*jynu8sQw6~ZfbvbAfAJH;MRaf3q-=5(=a6da zGhe*j4^P)Gs%4Dz41SF0D;q$IHMrEGX14FqrukZ46%)b>_tt4$jV(sX;?7V$jY^V> z%;1jxm@4D&z_fbM|8FH}a;oX?a%XhbH33|E+S7vRb{)ye| z^qT94_@mKst%`cQ+PXt}AOobX_Ouc{VzNa{qYkfGmzI-{>IrW$o|t|$yJ|;*vbZkE ztLP$1+D2NkhXGtCJj}=2pi>dA$54Vy!jIoqr^hSPh&fcq%+aab$q09BqKpsOuX}~& z_l)mM$5*iu(J7pyq+$?;Be;dDQmAF`0%lxe$$| z#2F@YbDF=QXQjQ1s&O=NP6^eTR6N)sVu*-SIHwm(9V`jN3457?8SMQ9ZGWaPG~o<$ ziHer+SE&lQBg6MjJ<--ANvAU|3FK(j<^~CFyj_UB@ep`gh1tf%;;T%!J(-AgvMmE1 z24xqk@WPsbD(P`k_{Yz!p)>q{>^SxrlG*lMgMm9`D8{_oYTifCa_US(3y^ePdH(dn zNZp^V{WaHRv+DKKJEOe%i-YDU$&LSv#oWJ8=lE?oycSPuBzX3h1?xXyw(X5pv5a(S zIbO_5B`@H~CuCn0Nt4ha;9A){{cyju(QZpn%zg|>aqYQY*YxKCO$>9^I8G~2IeOO! zhB|~%_Y(!05ky@S%9O8Q95fXje3pWwX1nE-1>p(ZL;g2=^zUtzucAg)JB2yb5GfI$=D9Y(FCBc;+)cpu-1vhl%PRt{-019A62#NNX%9J3Rx|k)_*ch zC%7(p)e4Xzy~}dELu{bOpb;rNIOyBvG#8q-!#NqO_v z%d?U=$%?!m?JH~VUuOK-u5}6(24ym*iBaauWiOgAzrLtnQ%dPHDPlvruLr~)kc~vp z0ogyW2X%se*@tiysuPar6j8kYU3NL;)D(FfHSr@+kOcjHe$Dd}xl!1Y_0ADG#8YsR~ZYz0I$A7mRYfpen53eR=z( z-ZR$7F1f#E8^&OvsA&AbQTN(;8}=QuR_Yq`zNuk_!(_Zfd`jvA&Av;{%;RQ`xy{hf zs|ZS1D_yD=exEvbK-ucf9WxHmlgT=f^)}{gsnI84WjWlCP2U#%o_6I?rSLrD7)Ljy z*YQ@0efysO*c+E5;3r!nABlBxn3W*fkX%uB`)&tSiYdHLkvqSc_uJdDS^_xyXtYJu zQj4fr-F=cxiOQUU@+nniH-Hzhp&ZAzSh6o#`}g7U`rR_a_KaVI06x+{MSqh@@nx?u z&)1Wpp`ClA(qZVurz9?`W-*&9tRr3tz0KFSBxUD`Dt6jL{K`$-QgL#ecefYcy;CF7ZcdR@+ytYBxGm0xv)5f&#orfOu}_7EYNMvb^a;iV91Ac zw5{=tM4Ji{w&{1QsgMqb2}L04yzQ#H6yjFgtdYa618)=@$2oWwSI=_ zR%!vaqX=Xng!&e-3 z<ItNYg}P_EEnK`0Ol5JFE({N%10QnkK*4G{PWgEL|-h~w3 zmBJ#GumYvO(skpeQ&BQMb-~t?F_zv8Gc|nGRqsv}$iT*n)q8$+zr0u4-CiBOqePQL zx+TqrhmrX-Yd#}8C4;Ps(68owG(HLcD0Gw>M`QiB@LS?b3NpiXu{RX?3_h@nm;i~~ z$jd`{_&e6}Cg<^bNrJNeA?mK*BpVMG8+H`bygDN-L(EAkCv`6<*k!AIm5SJ&^Xs&l zN*rfOJOkpanKk^qG?By3!tmFx<;u|_vQXxs3nNGv*G6S3f7fS*2A&}~aD<8+MtWy_ z`Aoz~qiMaZg2A3Csyg=X25qKliBuC<2KXy&mL=boC2IqyZykm6`6PK{@bn1qzaw)U z77_m-)^9!5;K9$>MI*+7H@pONE;ejFHJ@Z{qs;TlWN7Ii-(Y6z5sF?94@cKd-E)g_ z?az`c-*}J{`Ft33c7Y<4DwhN2*`jn=$ml#72CpRcl%G_TJZ+u@P^2xY=)~bTe zIZCiR+Fa$b;JMS$(_yYs2z*)OBPa=%r)@G{ut<8yvU2N5u)vP|irN)u0?c>5i}+8b z!JN4E+b2FtiwR$+6SfJR({MDW-CdtfMhWao@QYiCn9hEOTCv!;_?xt|c%ngC18pQv za*|!A9V5nZ0LrH_=>hh2K+iAw2`3yX@F@OT&psKc#jBKV=O@TX5bxnh5j%MAiT z>}L@TNw!6Pzdf=ai_>L}ng#bVPM|4%Dqf3?hphN?N zH|>vIz#b{gYLMWy7=E0q1*18$)Pnj!r;R1mwNU8ULQgORDmF0VJKnQwU1O zrf=VgBE6CRz3T~<>8NHmr5WIvpo_Zwz%&&(-k2Z@lX^{f+_2_mNQ`UTiTIVvFL;I) zZARF4{i@@$dRR5_hE?WLrjO6WbZb^Frj3iIn;4Eo#eH{agokTLp)k!U=7d!2 zGg6GxTC=z^<)u>VKRzZicSysrM{MEA0-}5{s>N5hyxFGaEl`!RuUI@&3}avCDOGmn zPDP4w3MGivAEtNj5<+Fj62> z#!=EhE+VXJJyguGJFe0$k%?pR6mk=E@Wk8vC__tYVvvoIE~2!dvQIr%OGXfvepYU- zi%sLU2NyrB8zbV5fFh$tQfFL1Cq4&h8anH^3F@@y!FDphRy?K`Pwr>6p@cyLmF z_uCFs4M!6Z{L^IqG3}f};RLVm=76(|h^wi!1(`IYZ)SwG zK+@H^cu)UCtslPUGFh6?K)1sJ+)nCH#)U@OFlJ= zQ9mT!vrYyzGE-)OR7Nr0*8ZAMm`aF$@FHH6q1`uz!1v-e^M$tG@@Exx>19G*d_)Wz zKZ(G%2BMM>2L4l{y3LAJIZfw|d<{A^uPPOh+qdP%CIpiz6cqV91z$q9ze28m2+X zLx}{v;N-+oAq{XVCH1jXx*D~8v)afaDs5e`5}~3tvQ#lClrsff?Jn-#RP6$=`B4xM z*x!%WIe5NuarAB}y<6z}#-fzbZ;~ZU<0#t@kH-M$JgP$wf0vWnv#{{pP-Dw!y5_w4 z?OG*TewdC1TQeD#fgOiVmU2-D0|i*zr`KcN2-ijafL@}5qaie$BocLB zQg?YOXbg|!zp@Z=4XpRRk)8b&t=}ejcURw9|F~ylK=HyzgEYMttC&9<*SB9&~YMaU9Z9Swb{ zj;|V5S|ox#45I8b3Rci}R!m{xekfL6FW+o^IiJq+9h^4J%K^-EMUuHk&7O?h=^0bX zw~$!_$wEMsTF?B8LCO^K75KEmTEN9X|_#zG%BUpQg7Qud1){j@4)b+gDQ~>0Y5zwsnHs^w_{;xv_kx6;jR4C z(ZghcEZ2E}7vcGvI@}x}=$$Fo^S)<2&kK&Sl8UjnS4T@n57MPJ&5pBrsM1Oqpdw2X zA4hBsD$yHsdkcu@TlUo+bBeMG3KLhZei`0IYWoXuO?zz(W9;`9^|VrS)$~}?c&n48 zuuLp4S~Nb@g9Ze~mx4vD}Q{q zs4e3&AcW$^YE3_Nfy5XI&OW@xe9BjS0dPE&`g$^E+RitAm~-Ai@1=_Bk}OJ{d6)Rv zJ$k)Bq?oPRDfG06WaUc*S8zot{M*<)>RDsGR^Z;Z8nm<$^&tdRT&kayTR}Sg)I+=k zU)K1tz)~nx6JZvQzg#4rJji644t^R-%mWA&R3j_>Xx3GF8&?yWaeW_DQq)iHut#LP1@lj zBZA47e^D@pv^X26rb5r&Vkz34+vbm^MY}%?0o@59fQVIt!z2O)!w@?2+jJ)qj6dq) znaqusfJ4>6@Z2WZn{0+UG%lBPGp52Stu(eIq44Ekj1gRoBdTBpy-9y@YKA*ug~l!s z6GvG(Jh<)^A|9t1T9QzyqbwFJ>^UwWoWwz)8)ko=_X23m-ZiTuB}gHiBP+q2qK9`u zosaRyG&&e*;o&2E#3A2U#y5@ClVllpwuWrO_gOJn=1LkENPQZ7V|L40@Stpxr4%42OTn9ONom_sc;u1d#K?uRW-9ug?Gaq{gqeN7;RpJjcJ1+oRx&tV_$V8U^oaIyX%+Y9jfrQYs9NF25RdT@M~@s?uq67a zaORwj`?i?Rbaf4lo|oa|UIt_9 z;3yUo5yVV32))+R8tBN@nr$TLO|XB|%fUr&+=A$YD}<=Lwcbi`g{vt6WHIj}o54tmdN zqptaxC^lFbWVCLUMWmU!BP)MN+onqil(9HPhN9VOLdGs;1XSY}?RaWVvrfgnJA}qI zZ&6-}amE80F`alE!(>qoDWlJ>nr4J!VWGnwH&k5Oe4Jgn@X?%!BAKy~$!=(I;Ak<3 zr@E285Na60LZM+kr2WGek2I4?EKie0!s8<=a4b@T`8?(a111YMfRcaSFOc4ph#hP( zbc_`u#G_8bXIy>$>ECKiF0wbq)|K|aB3llD%j7B(5_*TYc?X@xu!?HH?B)dWVX)bP zbTGisN=U$vF~ii~V|F(Q+}pYubdr05Hes|hz0OT)6eH0d0T2vZBP$(FxV|QAshV9x zFBhS=gj2=>Q)3Pi8ccrx?hto612r@7Cs%92XRs}| zmYXuwZ&+gpM6lL7k3xIx#KP1jt9raW!+>zq7@h&e5s{FBoRI)HL0;UkvWw50mYd~z zx0o+&-juSLMfM2qd4V#TH67WRWd?|2@xA`wQH!()+I28t*zn%T>Jvd-F;$f1p{+7M=xNbwNvBYYTC+tUk9 zU?lOiij59k#F4F^jl{z(C+C5424`Eh4`V0J+&hxrrG`dk1VaJn2nsZ zW}j_r(1dG893+>Tx@$*qHFeB?N!;>m(ctGMA;_RHOmTmEAaP4U0tCHs$xKdBM;BqE z&$BHSiUIEi0S0w?A@^-G#Xko?XF*Ih# zwv~=S%yoajLd*1~lHgm+_tnGrgn)^>NTTe7g6-!??1k8ujXUY9P1dMLc11z>@;w94 zX(06Xnsk>28I_o(=TH#o0~v~{BASSjVIgFwurnm2Vv?paFqrW)YSFkis>A!=gffO>Ns1aH zE4Uu^qf$`(ZtUa_C4|sN%oj0Z(XI`C%L*}Y(MCmzj^@DlQ6imA7FqX1Puv-Au zYe?!MauSD|V~;ynkn;~t{${-*K+iyG?0XJ$QMwxka2RbVMnj;ZtBBIp>k#)GQ>eIN zIc9&fRsldjgMO+2`)QK2s|!R_x^rM=FXzYH-XkSqYB5tVFKT(D{3<>FpWLG0QIVqg z_e})V1fxJJ#O-+yDl&10M$2AeDU?TMxKf1_l%E(^5(pWUkRvM*M*$Q( zdT=~#%IWXDEv6GP{>{Js#tBJ)PqX>f`Ctf9vO)4rbRQPcouyq21O#2 zhR`sLK=e;7`&rKDB0CO&dYH0tCUSqzrw^%dQk&A>jy^ULh3gn>Y4_ClJlOnABPAo6 z;ly{BjKHK10j?p4>(0%(<0p6^#^7VgJ3?6SeWav?JmnhBS|WV*;#FmDC#rg(lNDhR zB!H%aC$KFEfipyEQTEfK?=Fp=!l__;y(YfBu?q&;4({HeH~B>%92z@92PA)0c2Hze zQY=M4M1uhl4201YECQ4e#1KMD1tlo`^Fc`kpo+8__(&az_3k?{%0eNlzRT0Zfj*hL zA>R&jU`xr>k_$XLx)2aVAa543sku~=EmV%JJ5TzKeReG>zTSc|}j!cq{0 z9;g@IPat-mtKIMke4vG(9!h`p`%4HWE)?zS>_* z_t=okBXyaHsf-l*x0=+}J)N|w$y{a(F^w8&#RxE^6D$dHFPe08m7v|MGMM7ZCXR1q ztkN6YO0%v?X+kuXVR~`*u9?E+gFrx(3iA}X)osMgwH>z3+ZTSud0lsJ*clCOYUC$!xYLqWRk^PXscC}FBIZ&tc}QT zaBxA?dIgzsAW^tI_CQnc5FjQu;|HTgfz3l`aPA`|AS0O-OjSe(i=I%?b)lZFhvId^ zf+!q&PS`fx6-q;=1owZOr8aqWlV3FSi$P?Pz!4FOPF%Ejoq9s4E)yLKhApLiAf8!L z2amU}OP+Yxkqo8ePB17cP$HxKY>4KN1#B= zV2J$wnCr*gtJ#lX&_VP$xE?{&Nn8Ve5r0zqDWZWOVwnVr23bpJ_V)OS@>NWdFpoC? zkPQ9-2?)r{gHeAqAVNfp5fF@11P~$dup=eV49f%~D{x2na7U}U+#8wT2mtNbiUy6C zU{O;L!a+?e!2=^D6+tRMMvt4@ukV85uKz!Tv}YenE5bdVArh_Df9G$CSX zpr|h-8kayJ5KvK2FccD&g98+$18zOdBP)m+C?D-gvm+}MXfCzu83ls1R5FlZP(A*g zns#sZ{HuR12MK??d#^LJChU-}-${}&5yYC72q!eVlVz+63oDmnM!+PH`;ZgS9)GNV z@u;|bMm_`kZA3pD#zGvif+|J{LYhh6BR;CG{lx+ zkrGk_1wjl{B#{RQ{ym-=0z$z8ct~@_McQu>0B{3u)-!R8@`>f!-c97pX?%Zm%lNL*8})ubS{Kz(R<0nI%_R6z{u`yU!3C6ZA&4y}Es@#~K%)Le!` zMHbL`P4JCiHrfLeLBG(noiN)8kPF$`@(i$oSgNd+8`YzWfGh$AaO zM%=5FB8r#{Oc^69)KpLeYd51fu?X2#^qIU|)+X&C3^YVh5VDaXZ!t)e$uV`}xP(9& zAT_;d^Bv|4yT~)T1lyUvURfvRLqiCNa5oPodfO1S%~@=i{5#W*ggZ+he*BksHavfK z65bkJ&#UhuCsyoqc^>;%9&HXU1*X8i`{_a5p?# zJGkCTsy-9g2hssBFrT{gzg~ubf}L-~xXFa7sVqgz=Vcj-K}AG{npFsGgZ_U%wGtE2 zvH1LDcvtXv`meVmJ-P^B*|7tdba&9`A@)To{4^1M-;?(jxQB2}Jsrreu7j8H5a-K4 z$(cnmD~d$X?fc-gZ$t+rQlpW_CTT~Dlc$6q7)XDIPyc^E&Y%8v|EIhC zU-bXw+fVcVyZ?f%*`2T;2AUM8k`FNxJ`H?h<+#@CULH!5$^ubjlE5%V$5?}VD;y|zq zC-Xx1%PM!)^Ru$>`zg2gJ2c#4fx!OlT6Q6c`$$fN3(>ebuC&QNW+@l~yfZlWQ9}5% zIl%zId^1%`0HlryrCq8?ByuJ}G7ej6X1mv4^t(-H7+esLglT`t*AN+hfe)&naA_2k z@fZyMSNV*;rm?j{`x35RITjD^{@+#G&yJl?remlB7$}ZeIOu%m-tnWvi{-hdOxOMN zE(`E?U3KlmmYP%jN{*b(?M9mh$U_?UuzAU*ICs^cob0mNcc;_SLp=%V>_Vd$2*+9@ zC8`#=S*epF=+l34Q(R#3Hfe$GY_HwH?87SC1SWzUNOm2HL{3P;^szIKPQMnnizIK-o#dfdTViAM^IXL~^21 z7vTs7N;we7)M?CHh?sZx8P)`o66qJkT~SVMN{o2O*ms zf+?%Lj_h+zL4(LXZGDZm!dAiz=-GtAz7VkiNv3~t6nx}UyDx=|)|q6Wfe{ENq`U#;xJ4|DX@a$>f5c+ms}(}_3W^B z?4aq@y*yb))%nzQVC<0`f18=n8f74RZs8SLviyedsAP!4+<<+79Qdfe0xBSuK!}3T5IVY!`H7;w#q$L88q1MkMdjh)fiQ24!qE3a zQDi&E>VugH5Bq+E|AMNvh*hW;c2Q*PF#&&@*wOsB|Il0hxw0Rt-ha2IMsNSJ$`TXQ z;O7sM+g)Z7=mS#7Fqsd&NF4tm8Vu!oF!6tQbNL=txBI?7Y5v?O!u3BFx?2yzVV93l zxBkJXKKQ92=@9Q2C){d&{ysWZg-TJ^{qI-!zd!q*YM+vy^wIy@ z^mDC@-z)y;xiVoVAI;-g^1a>a%4uK(&sK~^svb^p85&p*qkG5dXAtWgjD;_gVNBP$Xb0xPZH J3L`u{Jqjzagtq_y literal 103019 zcmcG$XSb@#(kT3SuU}yX6%;dy2@HTDq6j8X$)F@rPx|$@oonxN&V8Oc#{21AV@)Ta zyK+}mca<}nPE|jzq^f&i)e8TXivRg`qwrTYWrap$dZE)xecm>TgC{#T3ba>>*PMSM zsXB(WQ1F5O`jyFKer+w&d%Y7+|Gd2@OlhH+`n;@^7p7j(Co!y_Cjf_*{4-@oN$^5a zfA`*QDoTESN1ykv0HCuyL;C_iQd(lAVk-%}_uDd4aT5K_Gr`5%)!yL40ziB}`a7U6 zWkjLreJ8zseJ2IhyZ7r?t&;k`NqVIs`!8AmV_@9p^-d+$TLUzH0cv{mHwyrZ|CxA> z`~HB4)>j(e5!wfs%ooT%zYrjFRS~cuGfIFNfVY6hAbJCx{_y&K{ZIsu{tb+@ z!Moo=ens~C?_Vu`(F3DMy<*GwS_PQreQhQA+C%u;GF~sBbU@OMVa1fVp6~YLc9sIy z!gejQ)7dmd9aB4ImLjDcv)-mMqzK+-QY1eGKgZPUAZ%x%m|Aatu`7XN!2|$dOY%E* zCL$@8pK#KYD& zLd^gvB*o2s!vnlb+3jqyLw>RRpI2Y6!Qo{{LVcNOvM_XR9w|fLl?b#2vencC!?{UQd6-DbBVsJDG_@id%mL zJWomD3;`H+;T~X+7zJb_vL@t9*{54SBjmd$f*oq0Fr+O z{{k8o**~oTJQAe|^QX8gKi>0~7sOEl+zW7vuYbONdB9cu^Hp)JfBel#zE3!sRHAucNoDq$4cyoB<0aNBCH#2p)NqihR~ngLUjUFG9w+NPIfuSJAbM4RclVMg z?EU)Vo&2-+C&u{oPa`6JJ}dUe_u=BNKdgTkR{ZY8+Uxb}7tnzS6f(%vD$Pn0IQkjj z?B@Y)Yo^}q7$(;4nmC3TxMo=$z1}psmQk~`43L}%%#RyOKG z=9}bXI zSo|XSdtLnv$onsp7?O%>Na_b3h((_yOhM2OYw+1{6Bzzy^&iDlAysd+eoy}Ack&nW zm-v7Dz^$pp-*T{$1P*?Lka*!c1u0mgaqiZFS&~FaFO`4&Jir1dl}`mgIzTJdKfE_w z`*Z#$j5XtN{kvwHUIK%kFDx7I7{y4w!57*OZQp_QpMg4H;_>VM38?`Fd>2;gH}XG?65O0?J+!6*_Q4V` zEExJ1g#2ZcMKI^j)%I^hO`wfG{#>0e7o<}@NIYF%ymH+cZ`w7yPrUL^2m@MNRCI8F-34RR@s)F8? zxBjm>SfyXZ{n#6Lfk1!%v9ovO8}}_32=goCis47EuNnOw{ikp$f6W3z{=GPWrr*HG z--%|t;eY&($v>2Utn;^2{!1W#$pcAY9kB3z6a5K+sXbso769{aCV*=K@4sH?ZN1(< zJOK;*u>&yX1(L1*r_75*;+uPZ*E<;YzFkjzf4*tsb_u_`Wl>hN} zK;sXVFTFsd-x>c6?vFoyZ13N*{uAuLqaPQLLWe2qA3uTfH)VtBZ+`)N!>>O8-vC3V z3Pe@?0?EI?|LWHe;Xh*Kcg1%6ON$YzpB5Z61a)tH>Cbw^n2wW z%l=;s{3VZXJp0BXVC9v669Oz9@cZ9^F*N`Keuu_h>O1-c90v$9zxnuCxL-+u1mXY9 z0^s4_BK=L!{}3pk=l2T!^~eAA^uPZ2Q;%TkuU~-7-)R41Y~Pe3gZ}MrnQzSbD;D&= zX*mcrnLj6hZBqXA74h$T00{8$L;CLr|Lt~)zrIWT_sjpdpkF^C0qX#~JO3ScJ~dVT zEhg~n*I#*(Xe3_z2H^ln30k5BuV24^Rh;V^xU%20pWo_#9)opy^|eoEd;xHV9FN(_Pn*!6r}+Bb~-%C`GT{)#!`(Xg86)2d#kE6h8ti+(_;!6Q^SM`AURF^h7f;l>Vw~zW7gq|_m7JfAbf$2A z21A9R()b7to}7@Mqlq0{G6~X*hxwr8+Wt}tj%};c$=544)fUtN-Aso8=dX_!z)$DoW;*ATlHF2qVpO5lf^>LPqS9imi zxk#90f>WH^NB(2Fg?4tnQcnBV=kg<7Z?zSd9M-OjFDjOMn499k$UTx#?N;EcnrY-q z&kf#F2Xg;|_p%56L3j1N3YEt$W0enecgD_1Ny0L{$7~x1&C1c$BxYr7pR>*=S6>=* z+Bv5eC1E{WGySAq;S?wwrso;CmYn0_wmqF0@lI_WUOXQ!the+gYK`g9-`AS{2Ab>yh5OX>tCVZD2+Uq2i;=)OG&V5LZ z_@h7R%u5UMahc5Kgm+bfS9*KAKg3(;_V>cZ9UV6DDNXf>V@+*e?=yrSO}B&FajkJ9 zIhIEEi*w{OuD48^&2b+6oY_TIIUYwsTq!l^=R20v^r*R+;d4r9@a1-`u%xDDovzf| z%?VKss~LRZJKawd3=2)t)N;OYBN~G<9Sj!vE%DHU&T|apbPzOupTxZ(CumGGc$8(W zFojyN(WRFH8=+O^(kv3O3>kU#b>6PpPW^T2#F(FVt!R{HODaD?j{~IwI<2 zG&{-FUop3Bk+izY9X}714i>kEBC1qty}GChkM;fC`~&+PM#;^s4peiuSE4prF^4Ck z)e5L9!+}wqn(w#auQ_W}<)Eh%3}9OPM4lVy*Q9=<>J6M_cCEpFObe6#>nb)EXzNkP z!B0Y@=&U7BGwO*_tQ_xbm%Zk<;p+{_TtcTIdgKuWCT5`SF1Fq|IFST8PKczr%(ED^ zRCWqAt0McFy5;t*c=RaO{JqCzMRD9KPd8+Nh_jnTvADW_T5hHpQUcz&eI00C{LtN} zX4mN0;!g{7-@)3QdgkI?@)$~1{`IfyX;2_qH(HyMm2U0rly<#IYgDP`gWOJ@(w{Y{ zM4B)1B|9FMxhBY?7rxSBX2v* zK{Htxo>cRCt%RSRENoVTW-aQf&qLLH+l7c2!0m1hbGMCoiCvF8bsq?x?%Lx=MKYXa ze(1T4E_xtJ&AjJbi9+)|c;Vc`sZZuxpOT+-^|H97k7!GPTkn>|8{_qkzVl-uH_%!I zufNQS2iMDZm>lZ0|=T2uNyEEBqWrmK1=2IdOTw*z7FP2M-)tlSZFOPJ5#*NDq zuvyKoo1yV$%Ht}2S>UI2p&w%jrV#kn@5TLcR6BK11^bZ9yt*Qtg8wdm zdgy{!+O2164xR4`9;~s`!e+(VD{bhk>gqZs=A}C$=&v4=$DC2MUXTxK32%I? zRePsbG-o!C@_7D@2;%Um3I~2C^*cv4;D@*}sJ6N7wR0NeD>u#I$|%Ic=W!?dYGMh# zoL^USx{D6S)o~YO+eD{CcB%DQy27obh;(%u&mzOFUnt0M3FCzvTyF?lVRWGAGTSH? z1uMxFdxa{wfMLouib`HUv%z#5U+3^r-aW{hvLNQ^N>5 zf_UH6s>E2Ov|ZD_!0{uWNSafiGi;sTxA!f7)je|sxHx_Fpu@hf-i_hnvO;+yW>1cS zBYQiRF9N^L+|OOhOsm2p=lepdIfyj1o2R$@ky->~>fb zuMifcwKV0l*m7duu z+u~94vhRE{!&|r-5aw`lxD82Fs20)8neOg-EsHcC5OcFzPyTeAt#nhmo6AX?o~hN7 zykp=R@mLI)vYy*_UL~_nZf1-uRPIJUTT2)j&U_Yf3oGh`wV!ket7GFwB|kj0q4wp8 zM??k~j_^XjQhO{arKD|ljrK}et=`uzUu308_blqoPJw-H`DI}E)0<@z$n`N+W%U32|gu+Pn;H|$TfW0%@iayaClGUauUAKf)( zwR7YA+E%wj2f7IB2~tU$l;s`w$bjDLJ6po!53(8Yg}%ndZN|al13TH6TYaJSPxvm; zPML=?zw#p_saYbgOIn7VYWmgB=90;NS}cwi-5Un-U}=gQ=@pFl4cuN1jiC{K;f&#f9wX@5O zm62;{?V^Lv>f1IS1D7&PL-lr7uTXJ9u2!3*H+DYZ7#*%x1UefJ(aI2Lblerj+d5y& zKL#(VajqWJ<7^<{6I8qAW9&@rFDto@*X}Y?4bbAXS`O-Pznz@hS42KH?vt{-BNB%w zoP_lu{f1-V`PQKIv@^@%VzYbYxtWU-dU`Xc4xQ72n8uj`f+@<2T(7ABJF#7-=8hBj zG#m}@+ud+S?_pc-Q0Z_n72*(ADGMHV$d${Tbvqcpi1}MlR&8lLE5Ep)F2l&FW%bYb zMt?fm5yunxf$Q|--Kz_mXNa^ddah0Vd!EZXn@@>zAzb1%4)*$)26|^h|g# zc9r}@(&Ku$HCAzCeXWfOj&FwTmi^3XSAo$lI7v4|wwG0*Xwk?s*1j-Y$^5K_><4S- zh&RpQNTDye3-&G~N77#AZy&h0c~szsGdU@CO>L2p!}hF_Ejf?T!Gt$9`iSZKM&Ayn z$$^S;NGU#D3y8;ZWnRj)gBk8+Uxo7L3SHF0N0rjkosz-2`Fg9L9xhsse700!4nrO> z)Ltt+soodUyvqi)bV+xa(qRa}UCxo`nP*qj$y$k&fkzm6Dyisasy668FYU{rv})Y+ zKIOciCVyut+r#^Q;WVTjHxB zu5mz|4^!Q;8S9~!6nXE!gOCZ$o!%B;_O0V{T0w&&JL=D?>ce#nRW zp5!vfh`ZFiHQw(mK2_MAed-^ltY8-_%q});X?1vyDAYe=AmtvE+ffO|>C@)GCC+G1 z;@i*RDQEMC2fK{lrQ~=JxEO{)2o_&y1X#iOle+aU)fFa z5$k!c{2Xlc2M|kcx$&a1Y#T=1gEpP49?q0CCaa4>X*fS&E^FFUEnC(3cFp5Psy>1} z(QLo#dz@atx~;#$fj?-DG4|QwJf#iMpLxPEQ%Y7GrLZ`;7nG5V!u!x$KH5EF{fzX( zjlQ-FD|yG|A&dt7hv1v2iyW^9hT$HKkU}gi8{qvr;$kRsqQ7D z)fi&SWXdJ7nDjZ0cvqGxv&{zH#)V|6y|KIMFuaV;PuSv_BU9^d`*9uTmuZsnFBfT& z+q87*d>_&{Q@&xVfSMMj-CD13US;CDMA$h`IKR(xP-W-)K`%o^gxg~DQ~#s5i+y=T zyqG7^tH{X;%1Y}_rm&iKA>GUr^|Xa|&o;RmUir$hkHYc3h@!IR?APEVDl%*LzI3Q~ zVpE`^Ww%?8MrOMx?f6~W%XlS9?7DjX>Eu6%=eoRi&d+YGbnfyQSwUe(rH4bCZEg*| zUjt!0G?{{79^Pk zWr10hv&Jy(%TeYziSJniU0mdry>OQaoa5HiqgTr7Qxe&A^V^1VI3O*6`U+XL(Rp&F3HzMkD_r(pUJJu=yI^F2Eh zaH5$LRuyRU=2qF}0Pi379rtlkQGwmO(OtNLM_!Q|InJZDxuqKvKdE=0Gzu}Kv&k%G z_LRk+!=xaQ*h5G9^>~yiVRQPGBZ{}7a%kNQ9PSP=C}ezMe}d(>wVq`;59W9>w;-1o zNULMc9?Zs8x}LKHDZw#%DzZ0{IxaP~uzYq(NQBq-$HAG8a$1rv+>dWz&pG?6hg?Pk zUu^f7xUJlsa((ScxkRj#+e#W!O6;iVMIRK}I*gLN$8$kf2~;2R$ZS8KmYcm;ClWh~ zg1Pp*4sKg|;}UAOV5xB4?PEv1m}Q_DHM*zMwcGSnpkiW~;n7QHIBUgJ)@Pgjl4Djo zhQNX|=7%%-P)~Lql!&7Fq;5~WKHIOjiJLjS_QPcbZP?9gK{5Oz)uQ_a%bj;ND)mx& z?=8}wM`L z*I-hB3X$E`PVwo4>gO$f?wY13sdCTulwyAV^n00ZPw)GUZ<`n&b(t0TFIY- z^XhhqkJ*GP^yW&TH}%?7MVUb;jdI-QDaH>RQN zBGTRntM|vu?rwBJJNk(Cc#PUcx%h5tduuVj>)VyF14rZF40O^fv<7YF`F?5hCO1GO z{G??2_&#kOCk0rj*SrJ1DUY?MULc*1GEh&fNO{(l#f_$rX?su`1?O32mE8`v;kg^b_Q|vU?C3*GC6r8w- zK8e^%mg7@{mgyr%x6nHQaCMHzH^zYvdOk%~u}ZFCArX{x5jc>UZn zMHYEJv{SDY8fx&KQAB2#&~KH-R#TfiuHJs(A-3$ZIU%haad#2E&#%sAbp~tO10r(smvj9SV2yKDcKdwYi3P1EwoHa#&6ckCbwA>2MSVo8b)AhZM72Dz$dV z&#oUf7B2fWejF41tv;&>T^(RfSS_e4Jy zx<%F`#Zd6ea&xs}iC~~EtCzaf5p|pc9aEyS^?(yjPOQbc`1~{<9%*%Oj%8AL&Z-1$ zPh`Prt(d|2gu(A(f^Oer|J{G1`|Qw%pPG&W=d|X7pbh+?vG?b(*5UJ&T4U5Z38|VP}sJE>hA5nirv%AVweSCk1=qPkt^tQIaIUddYO&**0O0i zGE$pth=tq@K&#_{?((oXxt8~`8gf`3#FFCR`7l(g#*L^qw}R4l z*NL?KBuH^KszSm7b>85p{`igvI2QNujb@IMbL(-E$YyU!Kgg1KY}^}?Rg!D`1k1H6 z1@VqGu61W|za!IZHXvi)AH(_Vwh5mm3e{3?=)r{M>*95g3B*fjNc!^eQ?QigJFBD@ z_F*a$o~ciHZbHgId8#dn3f|0!44bX?O!Q1d9<_zrXY*7b_-Ru67}sh}pYPrpB zcP>b+;(~c$_;s}zosC-MTvdmqx@n}lt6Fewa3ewDwWsecKhydpJ9wl~p2@1i%o|o`QzOOFfk4{iWq?*LWp-NOxv_!196tMK(-^baO))=r)#u$n zj9$sb#!aRguE54eGrL3K)A)4UsEnJn(H(A7r&XRFuDjBzN(-mtG+Gwz(M2W>@QaGX zcrZg~)LWCMHU2~==kE0iBe#OybkvirKN7gF*dbnKeCb-M(1(GF2d&}jp6O*fv+#zX z+!EejB(XNUI@7EM7p$Y$cHq8S(57G;Mjd6kSg{D|vO8v4+v95_1iitrT3_a?nOy5> z964Y9U}*j5NX#+Vl^VI}rP@3^Gp(|AGS=%RcYd)+9zq$aB`#ZagO546N>U6+xwKAG z$U2i70MiZR#%#zISyfvw)y8ZMQ}Es=jpgHo-Udap1}np8yk}w$50$Kb6^3pMidu%9 zIr8sewx3&FpWXLxHrn^9TtAoXz@{sEqT%v6t{NNKW76ywJ7g4OazWE9XWH2lGd~cV z9ch%o?Vei=H7yjZLw4FlhNsmv!H-jg6?%VW{0UeI@g8)QCH5rSCO%RbPbr zoeF_pqnP)UW@+N+%k6mwsV4Mz)QOGNFd#+1;bn9mYJ3Uph z&C@2nO%8eNE#GRN!qYr27oqyRl^U4tcdvcTFW5%o6z4|}b*tAfM7&=|fTc96Iv#*hf1AgI6Q;oQHF=Tj?@$I3qOYbx6OKJoZYWVps(( z2vx2JtnU_;TC>xq$-%=~aS>SA!g%A0VNSY6+XvKhTZ%IT2dTom98)iT2{(}sLrAwr zS4v{0dkEB(zRn$|dMU$i^Xa}^?YEkrg>}*;4%GLwePF#w7JL($pMmEJZ_fKXf;b!e~6ZS5gB@gvyIOnYo- zdl_?2oUY7rRom9GlGNxrr4uy018p2enGFativ~W(fz_s1-j{=l zcF=Cs!AvS2TtN}FT+nm!w+wvlww3b4Xu3;iFeq~yyK~{?BJ(_*aAnmbk#)DL;;?uq zU|oW#rZuKIAZwr@-Q`_Awg!fDcZ&z;ek))-%H zwsQ(`HBauH%33oH1P2^LJA1gh0H%P0N)X&%StR-!FR$^xG( zT{>|2UMO%#mtHL=5(#VRem9v-s3Jo}YGc|ykI&u$9MN;bd$BmeZ9&$z&(Y>m>3@i4 z_h_R`bl>L^`Oc^yE9;;yBodl18kOn>QikqlP*7~g6La;xjM?J)cz4!eW)68?IZIzh ze8VN*%W@8r^WIxx(jy+;vk-qxq+wpo3S;A6rj8NCn9R=7-#pQp!iYE<^( z2pX*nMm(2n<53hx1^oi4V;?#_tYBroGIu_A;)iKrMSli5?NSDZ9fkY zb+?Cg1yyo~bnZ}P$D6UlW{-1YS8qT_v*ggsW^;_V$$&(ee6E^ZK>@nC_LNT-T(;8}4mGKy>G^ z_s`1Q$v-L&;^MP8WO`KZX0#ZLMO=FsGCL%qC1ePLcm|sACy{dGM(v*VP8temDY3_6 zd`jZ9f{e!ecCa>*`}{GxOt!7gZAs_va5tAW4vn7Vkb`?Tl>AevzBc4}^=WzRI6CJx zaKv{IDQnblayE>+kTl5!bHk)jr0&8Wjmx!CyCU?s4U{f|a53DA$%S}TUqKRDZnvYtw;57#zziJ?G z+RSPeMHe>?-;++Ws@1Er`{BCCD0F9TEBk_q>NBm-?9t8gX&&_#)~cH2*OIa?&xvU% z8jp7y8qE#USuZQo`>+wz{8DAUdeths+IrYI?F+SbVZYn8sn=<$%!PW(ZxRjPo4Yec zXr|r#kte;$;*wwv|7j|I7kFs&r3jnSp@j^HxS6R`oKB^$pZRwW?Z7vAmO&SVw1Kzi zHRajiGB3YQuWb9RuE?Ra#$I0ItnxcWe}aUm=Jc%LY4%{r@RT$Mt@WqN6K##Z+!^qV zor8RgchTl{RI&Yv6{#33qzRMF4nCa)iAr;S-c2|6{ugBGy!n5sq z#6BhT)Q6k;;?S?a%cuzVZc^biz?P*nJ1ug8baJX@_q83jmlR&Fo*+7;aR0K-z{By` z9I23bf*7o)LhH8k7HIR9fcRuDh|J+CDlv$>P9? zyQSDlEBh%P(56Y;Cds1GtL*RQ3NfoxPLE*cDBtdBqN>ju^I_XQ&ua}?Ehy8B+^#3} zN8@y_LZ)NPxH2XeA#YwKil3FKuX1Fe(0>=K;eG+v*46x{TS%xS3|atKqV<{-_*S^y zJ}G(&rZwOB&h6p{<}P-kbMihZ9w^sPTRhE(%?X-04t9F%*IE1Y>1S3*zwx|qLve8K zUk_L6TpDgOy~P0`l>TLLt$!eEam=IQPRTWheeY@$uYo;3n;1&$cFHYs4!}-OG%ebr zCJB1KxbE#H61Q`N1uC$^Hl0;q2_GDMpf!7$Dfv5>ADXs%3v-@6{bZr$<3(-gqH(fT z%>90El$ME&WlCeb+pXOB(7F@q`Z88FL(op-6pyFDVYV0aqEjKp5U2zk@^iL(8WHOi za+OwEb=T@B%d4d~qGG$Ts28?Pam)AYTAyq9mF6Tswm9EBwHOBG@;zq;7ux$po4qa6 z2}_Vpc5BaR4h!p>*R8aUkL)RZXN*TI zQ4rl8taJ?D#)Ely-DQd&lW!H>-a~mL?vg83hQVclO|r+)fVp;CZdU5o*Q#$%;heE* z53ls$ST<2q+AfdH=~gVY3wfk0t??;V_Ydw8B^dNxdQImpd0p(Sdi4Q{1Lb;Ed2QC~ zg|L@SeSNk@ANVqYFQINQL}Yg*N>9x zQmf~qAck}OrW@LIqK{jrTgQBIUIx@?9;Kq8v<~5#&Q9^i`Pl)*0V;OR<*9L((!v^* z-p$gL^0#9e4w^}4FIKX{O{tPUsmo)d#|cjF77X?olebReG{5d`u*tHt7h|(!cIDlG%44xfIi?Lf7WwPK@g*tVL(;28TUg&LCZ1sW1Ih`P< zhqsJLIhj6?*{OqFH|^dM@+*60=i0kjeN|S2y+%=LF2cH-I}^I;%4*qkyLdblCiCK@ zp&+;5^sbMm(|iyFTzxD~>Z2m4LN|wGYtZSLyXU%@R^l6FP5Lv22{^%9#AvVi3CpYi z&U4=_+X8{G;WuKXm@OMLS@Zk7uq7S#b854fs-4wvV3tYgs&UJHw~c--6{}V}_e=4W zwc)a=>%~wb7b@h`ghx-Hw01K5%xlgN=Qm(8E^P{(LiadWO}sf%zel#a;ABB$`#Ou| z@C(28`n+d%!tfxzoaZ(?N>b;xS~CN;O+LWMoWC42o8g``(_(pelU%FtDQcw84cxkV z@1M5wMk(&Wt;%J|)&|oxdK+J)>2bR0!g94OulOfE2W7Fv1UU%Nu)^+NhhFtQKY}j{ zfR5wwymoVX19WP(UKRX;T%Nmj9klHY$T}^Y9apDgge>(R_QwoM!(nr)o>_X+pwb_G zQ0K85H`iX8mt8%Gyp{e`UHPzBoD5@&6yWDE?0uOeI2t#bFroL%-JLWB8!43TEFyb8v{&^AefmgxJCA>QV^lg}6o)9@ei z%sic=LfDmtKGUPubS-ZRkE5$MKcxI}t?A^$6fRWay45LOL)zJ@ymE@|F-has>$KhO zbdAA7zq-v+-)d(Z%dJqdbknz0M@y3>8rpChoJ#V&F-p8O4sG4Ziqoi`im?m>ov9Wlt!!v^EUSX; z?O3`U*kk*Ux#DS;8$LvI6sN(4?B%>bWgO|&ZBR?K4moUk`>f6O;+UJ8otF8W*Drgl zPFPwnYu@g_<{E2ja(fMEyJ>Zgr*_;959bUnt&7gPyO^w)6{pCs)i3SI>Yh?4)R4Nh zj8w9#>IG-L54$E_#c?L*nD{ZRDV_1N7w)qoQ?Z{!_tbvOENHcWZs*0^J!^H)vA!Yp zBv#1YTaQh?vu;51%B{T0URUd4+P%bRvuE3Hb|5U*vq|H{lnXCL90YfP%9f8(=bAtE z(7ab{^TY6|CZN<7HsH7#6styl!1KBJ1=Hin$e)sZy(2$^0KY53RCxDW$pU^BDur30 z*4>v-Q1+;t@40>xVxcs4Qkp$$UGcQ*XpuYbx8-eqVQV$#4Yj7(x2h_v(ulg;plX)y zlJio-c+}%8&~4VJ-u!A@yGIvy+Sy##H=!Smhagdk=(ROyC-YQ=23!2r7@0iuZNakr zBPi>LFp1pCdg3S#aQJleKkfJxy=MKFR)1(`q~@M_*U2(c$7)hR%zfKx6EkkzW-3Ih zeV-04Q?FY%5B1!qCv8Z)rW|X0uxr#*)k5rX$>3{q`i@|%8tcO1f*c9{c_qBjwIC49 z_9u(RS4hrg7SDy&xN1~+R*D9TMC#JSwIV~lK4-NI6f~ck@{C^z`Nngf*kP79$)h^@ zItKI#J3oYNDax3qEAM@l7enielzu1g;s?L*u8nWYRVKK$9Cn(Hof%Adn<(YtmVtriKgI1bfZaR&=55je8Sy_zKiudgmi;j5l@@#W=Kg z4X9r{RE@}cY_0jSg%*l?&@(ngGnVJ7!$ZF7#@MSq_r-_ZbdBMrih`aT=COH2=fiYb zg9?YScGs%@YQF8Axb_0HTxS|L$My=fi}Gq!e7rHdn9W2!ER&ByHngkZV!NaG+`2n@ z^JuNdIfz_a2Q-acCS&n4rpO+GACNM0kXu$|edL@rGZGPjy-W}N;%GMqt#R(YEkW7N z{_SB-zT~%_s}GIMqnya+h6TIGGB+QkjQcj~d3453nzuMpJ5#yLxU1$siN{SktNDjC zV)%W;r4yxlt1?fTXl*;_GSg=i33RT3%l%9h$qsh~HIa`GqWz>=`hu0~;tlkV7i1%Y z!+6Eix-olEcN4h2sbUv1x5?ua9kgmj34_Yg6cMZM{1T)ZpR2>P=O_7ntAFOW??a2y z(i`^Vjln&vwC>dUZ7YK;G0u=~7>bumjok;1?Y>h(%H@gTI4+|)QCe9JFQY}w9-$2Q zu3$Mi41$&NC=c%I%CR(NLTxcDfQ?dLFm^rYjC1vKvOaHTUd9=1;=N*t&~|9XwcCpW zr#_8E4!B}xT6m>zR(WF=2kSk5Ij?I|i0Ne6Am&>UTgjpng@pwY6>8rO!c^oZW& zde5aVm==QW8Vjs)89h2#8C_quosPR;b*a8txewupCQuBuSgpozaWH*#htE6LShv&X zH-TI?b=p!J`nV%y8_y&z5`OvCZ&1b)iHIi|p%VK!9WRPAxFtb)(?r0Z$jI~4EX_(j zoXgCwx|6RDMjxwF`9Bn$Y1^r67=?ceA`LQ!ltL;br6iSR86x8G|M$JW?GNuh_KSw= zUe{XZ68th)xJ{A?ym==V_-}Goec`qNteut%jP-vCJ{(ihy4ef`HAIbBm3ba(H{!at z;W^JYRtpp?R_JH6&wRP%^?c*i5Zq=oH|o_oH7@m&GAv{u*7F`VREhnP!1{Lgs$K8C z8ds9uxG5f!ZywY`f3@u-yVgUb$gHt#E~J~h=&6)!oFzBw}VZ#MYdcUU!We z$}T^324qJ=^>qW81#zTdGRc!D*4)J3;=|G3M(jY>1(a_+7l3k(UJaM==4ly{a`8L5 zvs&^!yF+(@y>!~-O!-t=V37cepK-Zf^M^VTj1=i{n|ii~UZi^oi|3?1yp5v!;kdoX zZLI?q2Yt314YeKy1;NXXvc)iF+01M&0f zozbS(Z+b?RMvLpc9^n;il|NK|6T^v&>`O*b*2>I>RiqF&s>7tp1>2-bB z`J69vIu>!RjQU3x3<<46p!%tLO)jlz3tZa`Ba&xa7tNOBi8Y+NG=3lq!Ga9I`drLY zHrtpN5C?mCkLIa*<$;?1??S9>@cZ3yOI7KoaVmDxJ~DD|~GpY;6maZ+~kPrB+HA-qKkVbcdP zDo(WIOK7g}!`o%7ja~ihras?9nyAtnW)n7K>7R9ZcYU0f9>NX4KJZ}1nV$!E3yj=q z2f&*yL+P(ta`zpdHaFMTd8m1t1MTgD?z5(u^GB&R=E4OL-Yf7-XRv2^UW>lu<%W8l z?O3AqZrGeG7Uf7delA3sEey_Fx~D0@)20u$mdStce zd`1<=9etfc@c2yPwEsgJv{|P@F(zKEy47!pQlAa%UZ*=^Pfv%$t-eh^IJr0n=Rl00 z_7!RkQpdSL*GlOL=FV^?ws;V|ZIsI5a!yg!qy333R0P82v+U~B(oSrCa#=Tr+sVvo z|4dF5K9{ujd+YGf(=S9#UGjx4v`6KOe?hMkWqr>kDsj;_vKTajIu-XzZ+rrLblXd@ zQnY#eo*k7_8A8tH_q%GnzM{U_o@-2JlRW=!sk43WkM|c=-6H~|ft*Cs<7)JhvdVQW z7MpkoGKUJ4;nq(!kQvd96sWWtBH`lr;+#eMTzUK%x;>P32X)hnmPA64J!p4**JY+U zJi*6b^}_R1EI+;*~IC>>aAmqT#{r4lCG~%_r!JdJl0{^S&n2r9bv$_P*mTn zFTtj>s!R`mzOs0!r^wuTlsBBmS^sc2F^As+T^Iy1=)l9kcONv=YCl?2E6&E36xJ65 z;xG4EwVZ#>_ObbAz&QSu{)9pYuH~bsQ~c+`qx4eTMh&m=HI65Bd|b2ay34%Wz}4RM z-xvaFA6r70UR7lZ&iS>@3z%#V8guX~R!wewgr24n8+`rgY+8#l5G2H(K(zMR3L~NSPwrAd7uWsqlh3Xv@ci$8HVZRA zxmz-{>#vxIjunkf4n|v;eVM4DUDv|s5#{AN2+S4nQ_70=0{w}v!3TH`Yp05Ra#DOp z#cE6PsCPwTrB|T7I;9m!NEfACFm*yJcAYSIPq4s=_O8uJzb|H?s*CR#FjO#M}I_?X}%5 zdcTilcUt187)_i@NBpC3@pP$GHyYQ&{hVm-Kg;>a86h^&oJ%#F*odRYxB)ZlQyYD; zR$5=yPqnyZpUFi5^QKCJ7{Zr$jId4z=b_gwrMRL#11;qXc!{+dq=ww#`T1! ztQ{LIn&FU?$9tb>QNrmEtJ%NPxG3crwf=h*>js?Z7xq~Lak&&E&b%9-DU8S5XK}6j zZ;qedNZKO6g)Vn9*7#x0HD(X@Ca@7VA2W|OuJY{KJY(ZJRS=_PssDWa0JhxT-nTN)0XV!vhfr)R?``RNNRB*=2!jiQXZ9;+hIO4 z$Jg7z{y-z)JCN??>-0J-1b;o2k5_k>VN;BHw5p56NOjxJ@&4{TS8y6sUJ@|3VfY_q zmuw8%4cFcTtN)odJ~G74$(GsfKr9#DY&L8H>j>x+=n1W$Z5LLnSDJJl?NP4x z49_fmC|N6Ov%iZ=nl1b1zvPT#=*PI(kX;&v@XHmkS2KRtY@SZ(%~R{OnX)nxY%6ns zSv4M6A58G?gWG=g7n`EAMT z*Ei4A_i|3K@@C@^6DO@C_2W;vIP98V zYFOj%d9^GqYBx0ZOQ!b?9rUj!fWSet_gkg{;^Ft&jnw|8>zLeC``-H|hs>(771LOW_9z}py4%g*b{6J--gD%N{AZp=SV?PwwVDbn!;xdisrq1+nZEJi%_^9e6v z${I+Uj#O1^%b>f!2W8houwby8C$Urs=-mK>TtPxX8D|9YzAwcc;!+rpm)*wmdAr=G zJTgwS><6{KWv+J}Q^zZqOdF%3&+9NQ_!kSf!$Kr3Zv7ej5c99J-x_o;Lto8?eU^S0 zf!8;LZ7}7H=x=lCRK=bNzRqsIq~Amq>mi#0bM>8{K039!bx1%ij~3h8_IyZuQKUA^=EvfI?6Nt zP6sb*8i4Vw_X6yc`Ey@i#XMcC?7nWVPxI+@Gm+Rg_a}!64GPh5+?GdN?rZUH02*D!U#(s8$Pdmpnw0~3ywh(^JR65m= z(5GLB?O@965V&(Q)Vq1V7XLN&dwymw>DgPRn$g(DwR|089Qh<5qV-jHZ??=v)S%_w zu9Y7c;+Quupu({F3}@E=M*y@hAs2l)(ZUfa&ko1tp}F*jsdKR;SEDzVX{|Lwnv%Kc zG;YJKomMzWouVCK-d(2d3erXh%pl%V*`CQIR|m$VdAU}u$e;OZWNesiw31={^ zVWt>Z&L#NblL4({&Nte(w`Bj&94h^uTHQD!-QBK9N2py(Vi(0#^#wl3ef*wui>1HH zvQ2-mF>kf##y6LD-D{{J2$dX*WaTEWDq~>82dwcp+B1=e#@y8<3JU`w|Biz5~O<-W~c| za|m)N;h@o;UiLW14XsS2{j}vqI<1OfQzrn)3J9Sw4+TBv_RrQ_`m`u_b1UvUjc_7wm1w&L+0U~Izu75C<^Mr z5!Ji#<>ee~+NkI!%R~I8U@IVUL+hpp_#D%Ot5suM4qr-{YauIwECD2hxrgXh4~}~V zu=fP*!@|qp>9lsS)0GQRLZ8~5=lp|eq}GHZXZ|*|MAobnOQM`q>chjTF@;ZHF9}k| z=92Da^{jCauW0dY^8BnV(n^xp@9E$9=nFy72=>P}2<&9ayVg@ZWKh~2`Y9svv#u}f z$a?Cb*AH=p6^2;``^C^Ip}qI-Pa_`z`Lvd~hpCYJI`x6AdvO&&c4-LjJML60%r<<3 z7t6ATmxf8>eFl4EgIm>W<{xoli1Uos?&q6}HHBNTO@FIQ{bH7B&gVq5D!YuP>@27~SL2UW1fe5MRc1=uZc)y8FO|Tt%Yv z(qrN#3o!nSrw^hMWY632_+?mNQnK$vavg0+pM9L7R@@2ts=GKG0~n)+}{qyvd9{+1MK3VQ3$5&b~&0~u6wM5vf>wN@Q(=%Ah6sl+=U9V4m`-na1m ze*D=|{!F3idWhnr1bk~Dp%RZaAyPlC2HuMG7f2n+q*^_OSS8@+kGJ4HKW6p(DDAmb z&eqLWFCF`%E`CUjmpgUu`&C}K)+$l9A*n^T-yD>RZ9eFC0I*9d+{OObtT82HdLJ&4 zi$;zMM7lE_=XC3BqtUGXlrejQd4SV1}R{Hv3-+Fa8{62@zMw+>Z z`Uy6(g>m$DdcE=8Zo#?YyWg{m?8K~rX4L<*K1t^)g!G#~acc~jt@nU3R$1&ozFy3Y z+oyACTQ#WV<cSmM4&77%<+w&HHpxw%|r^u`nKQ5V|k_4>J0dqFWaHe<4>R6Y%| z-MuNiX%`a?U*FG=M)Frj>GkA=&qj^9l)=O@s4R^t_1gjqZ*j6|Ih(H}gx?<`azB~p zbXardFMOi?W#ODf%LyeR<-3prnchb-VEc2CCc_WI;YkD8&8+w4x$Ak_zw1?os}JX=TwS>Cigvdj0O@_r#o9Mr7tl=^O`+~W0ojz-(Z zh7PW4a#5Mgql*(6(fs%t+IMK9btqkV=}Un9s<hW|3C|~LepB4xXY)6(Og<@k#kZrLZvr08>38j zyau<@KK02soaPEWO1s8sdcS3e$vG1EERvs`%CGDA_l`Imwuvfzsjdq0{i!V;TgL+s z!+p{4v0JD5+o&G1e3*Zw0yvaD)RNy0k|sAN*Il_eNqDV4ec;~o*`mDZsm0Y9I-aFp z)-DFW3bE=9F5g+_7fxWw++BBVp!~=5G--!W5AN_4xm)A+(@|$53Xg3|9`t;tyEmES zN^H=TLd|aT%_N^4dC;Ne5}<|%S&M0pu}hAp zo!9tLxt58tSchlJ>coA&b)y9Iz4Ku@scgoz-#7vc^xFLObrjd{TeGU$J=Y#F=eMlN zT&o%|GsV)o&VM@H%^r?+LH#^$#^mAnI4cM{DlkH%@EDE0e}gVuSGxj{uadG168k>V28w%_Rk=?f#G_}TKhx%w4H z1FYZO;~?C4KNqv8+_6^J9(r}mhp`zXkA2d>jvP|npoAL(AOn{62dw5OepnfX+bOSt zSe~CkyO)O%-m)i+tG-itqzSx9yX18=Ido zZ_uGsUl`@q;Ngyi)-3wdPFJY0CBrlGR!w}T; zIn?Qj+I;T0(x9qX@5|dEOaiyR%II)_Y#_I-%kIlI_vE7hk=t|o@KB7_=LBI-uku7 zLw|5PU+q)H1aF;Q_@ugJk!cB%=o*sj7T!dk4E`^@hZc4k8OPmjO9jfw`=3!R#c4&SyC!OC4mN{q>Jgz zM4y9x3*^1)kKTS4HOYXINZpXGj?hp6nd{NHe)#08wq~8dvp=6;s*OF5Ad?R3_uY|r zblF%rtrffe#?Z-P{W!JvP!rejRK+3Hh*;9p`}{>CNQI6R<@jxOgMZ&pzQ{Nq43H&+iWmk%M^sSA;=7VSR) zNx;-2_e@Ii@w88j(%>l##=9=+2|J&xtwz8@CKao{z`iT~-{0xmU=*L(m#_Yiy0w@5 zpc9)fIJ`_UN*-oGYdxdY5?Ej8D^^>?e?Bxcl;txYvMaGErX<<8?A~8lTy=4jg~q2B zJi8wx&pNavFfNy$!sAyWEJ|Co3OFgf`or65^!MVt&yY&Qni}yN+&8%l5_k znE7_gF0r>{9wsm-^l_iGQU7a_9)yxwS8lUuc(Dh&0({c;A4wzRZBxAMyEANeRb_e) zS8X#k4C92;J*-WH2%n1gX>+jDbr7ch^H;T=6?Cnz{`;)4#%#M4$-;fnNS(pnZ|6XW z%B$>U`JNG%zzQ7mMgF(1Grxh9rR5(rb0HSJssqM!B?0Qwl5@``B-srbn(1H`F}CdS zyJj8=ExSnC>2F^oTmu_4qse*>KIkBCP1HBaO?Li5uR4?E9mt6&`Z?gK2xb(5&O=We3AV-+B-L`9kOdGeC z?t8rZOB%*U>`AJ19=ugli9tGwvp@%w3U zPD?MT*9|RCuJP>6DZjV*mO6gg>R}q@<%F4>b0*!aPg)&+Rao7ca}9Q$ z$DG*X3@$y{-rx=ZTxw5*nAR{pe{t>phO-Vz*%I*=jJ|xAix^C=q7zhX+x$7WvEZ;c z1%F7&9duAK++@4DjkONRi^(|Z&L{fdaf0gjp|Iw_ptt^%=12To*@sZ!M^|J(9lM6v z<+alIcGBRT-IG?wshUDF4Zvo9WNQVGE67X}PQ&PKLjEn`I4XzWETG#yM-GK0SgPK+?TM7Vz+zge=c-&Pm2LKJw|6fPvlwq zoHR+gcnAOjNH48EavU}K>+u1!Y8|xAIJhZg{ct-EsaC&|+>KZ1FJYa#oPsNTO_M}V zGebe%jE5%rM?U7+w25ugK5*(Gb+HN5uk9*mJU^vtOQ`ce^~IA`2Rre39Zwzu{JZv! zW^-55g(A(CTs32*zWCP1OYhcWmkH8ClkhKMd>p7Dw4)u%J%v0g#`MC1cAfCBe~f!|dZ?d8N9+xHWxfFx!h zT|W4$(MnsV^fTU|V4Wj&s_yp0kFYH6*XOt1akIE1ANFC{o~|W<;gE-bo~HfU(ujKl z*l!PlKd2|<_3_(n(>b7f3XO%SSN6CzpL`n%(5I)2cDuUn^PQgvb2kl>K&}^qol77!Zqkc`qGI=-fp35KOVW| z3PIWjUASMH?$v>QCDAZXAC`LxHasE56?3#{NmmX@UI1%#2b>dq6HkmQ+lm=9!I3U; z>jq|*xKCYxYRiVLYGtzMNIpF~!^HY`>>vPycq8a#KQAk_4y-d1qf!>Ya7GNRd<3zv zP;*ZB>TAc*#5>{))tmqv0-$xe@Oso~&U(y@1h0TI&rX(56SK%zDbhb63YvrJ5`J(` zQ$WCpFPM!d<AdWc7r7tD#`0TOTLykPGiTAc z=U{`QwimC4cC1~_tM+r7TP|{c@%?6>f>bBDWhq>r3-yW2kNI*Aq!g3ABc}$=>3k zL;~O5F&sSd90jqL3z`AL11<cj zP8YrR%3U>fupv~Mkov5~aljDR)e7Ud5?;W+`RBnQ{P8e%DH>qUw?||E&p4pv5$*py zTd%9I-I|Y)t+>b6#;Rb=8J(|x==-#+F!<9dgQetf?0gpv$_2I*+`nu?WIw7~_e9fX zZ~KnCV7Pum??&XjavdRNJMob=Kvu_}>hGi-Idk2Y9&K}VYM1=iqS)SgmPk|G+n>)s z5ARuGU)w#BkIkTU=tK1e1yuksQa=kIHrVme3Y2 za{<_!rz8nb6PsE$;WLW5dUqcK>G@Go9h|y?b8enryD_>t?D~I`tv6Zjr>HYrsE|Q= z{+qehBdF0gdElyX-ql8XxvsytqrVuwx{t<^MjG}P7Ar(YP+I%*9Aq2{`ME5CS_3jX#{&pjj zVxILwSvaA?gN4|d?bqu_du%Dr`~6^F)1asFq&Yjwj@k5p_mMH2 z9OKc=2AGp*Jy5S;;I2)l*l6yY%!X=aU=~IaraD-;*-$mB!~OheI@5T{MCk0I2898% zcPZi$An0`&??=C8v-yyAOLy?s-{WAs3E%p(%Pnf|6ao%_%5Eoe!1+|-JGhr~#^3#$ z0BQ5j9$d|0YLQab)e$RfT9^l}t1qh@P5{-ov_|JD=UKtncs zjH+Bai1=Bkn%l!4rf{+GyCoCR;z#9jcR1ODz9eA@KusIPIF_V6fJuuEoR*ineRZuE z^YVb$Y|exv(KBifaNP4Y0=H(T93PL?v0;w)Uiulj)oJaV2Y1Wd&-=C^O@ZSGF0sF2 z_r^uw*lDc3O+j_0%}i@nLAWJ9g8`0OypfiHs%o^O8UU)Mv6Jr9KmhJIl4`*aoU@~1 zSAD$!M|$$M&u)WAoI?u`v-m;jxA_#K;?YEe&BYc(&QIM?^?!nOe_U_z{Yc&F5^?=r z(NoVX-uGu>*#KA)hDxC3d(^3!g#@;N#iwn^oMmvQSEsZ!R<6=x4AQNYsj(BZ9%T0d@4NZJcY4LF~)qa z;*7eoWtSxTZyB%&xRDSCY*C}#se$(~_bVlv5-46ERwzd`&>59Er4wi7rU=ouFvRTA z?Ug|EZY^-$Sgkri^J4Cd#|aE`zisbSxMx$^Ld`Ndg6CVgI~v;#%Paht>RPn}oh{zi zVbJf)+egmhz~OiVZoSS;F+VoiYywfENfx`&i=_+(?6o zb8uKngnEXGrxm<+prt;vb)Ys9y=BpVrLRCF7T(D_^p$=#s84W>18B`ybJ1}RHzhM+h^(?~swKZju^f78nh>lHL|0Lj$lBB%WBjrL1rVCXv7 zQ;>cHcgk={MDxI+j($-bas0h4!}m`gX5n=W>dqQfczvnjTu*LDqh#zA^GE#X%zGuJ z0MFBQsZrVAz$MjK_7Pwc@L1Yh={4JA+d43I*x3EJ)~DYR zH=Q0o{^MH7;?2+w8m}P5o<*=4TFCJV#|v!m*H@a8WO`OOtLq1SNk1Gw3)K2?lJfs9s#1MXx<_ z8Vq>rRytNMr&QtOjyJDxo#ofF0I9NR2-PHQq-DuXn5DfWm~-pwtC198wl8QwN9NUd zTP~eAt~yKnCl{(fq@Y@(|e_h-ED5Fp7eNDXsvjM+VRbJ zkhK2Y^;OC06Uh;xYr6*c4)`HyaXS{E4#4EWRz7rk+fS8X+pGnZ%R(AU$R6MSeLgT* zKedFT(7vfBM~iWSA5Vjn*o0`q1P;3)feOFH&SAFXrsceg+fXTqc};Ea3vi=<&y4m-f( zo6WUO@3T47PucFTTobq4Q={(Bk$$5ptV`0tzzvLe#~+R3Z)zK;x%j+5{7LIh_APYZ zPa?5BKa*#xX6r-lWOw}X&zOwL&$7bL59xz3#=ALmznQzou7CxX{C2xkEPoPJokWeD(pN)7S_o_2`&3VV%hxh8MF&=})9``TeAyAUqB>Jc% za8eo8E>O3#KR^NkI0#`-T38#iHoE4^(NdB`Q>j`*`{s{24`?>a)%U7{CE%#Zoq@Z* zn;@qr71i?$zr&^*9rg|ZtetN)A8cnMoKv^&&yM|$&Lu5pa==a_`tQAl4Y4F?ZA_Jn zkLp_^yX0YTnfR6n?mGSDjDV@Ce=^94XsX~Bn)j&y7Odf>BvxvlKh_!v{O^{o`l=R8 zkHvPq0Q|YC*1qA-skY9D?dtG3a@+eOTxI>68Y~dBF$@}mxSaJG5&-tG|$ucjv$pYj`WG(MistIodPOkk-XIvh+n#hyu(mV}$WAIUyC zok2;jvq~}fKICrrFtE;NRypr~hxvYU?^2cOT!LB`Cnz~hxH0mvq4zllzrXDc_z0Yq z!xNQr3=lT{gO1Mc-sM$q12V?YwL6c~(O^yERMuWTZne2PwWR$azS;fe1z8$*fuqo; zlZ%(X42V`;4N+`0>Vz=9^=^UIOP=ANntZfYO{yZ(RV&-?n{~vT_Q$X6EOUoRH`5LP zuk-^RX*MH(W$pR78MzN6=P1f5YrWuPIUHFGFkW)y-8YWo#vU9uT5Ue@up89@{?p0= zP33i{Cr!ie!{ModuROf~5yDYQ+m;-+mzCD6v4w(m`g!j@`2LZC=AOkx4qKrW7~{!d z==2a{1^~+aaf_^b-_amkHNC7^PO?Xvy&`hG$-aX91{*BGpBr9?8NY#n@-|*fXXOhV z2}5qZhfU6_x}U6V4*_(09t{bcGZx0uqi3CniPX9_Lm~9rZ_jv!>@>gkco4WSo0pEA zfoY8^gKOiyf4-mh&R;9*?GW%JYJ66=zHZ&Dl0Cj6XgDL+ z8n@T7f;RNQUYssITNQ&BFw0@MWylF)}W=r}pU`L)|p=iUzl0~TB_RnzZi zXoukag1C!y)E8cnKHNrsMOaAK1*DO*B&_7NxM90Ox}e1Lwi;|-=BD-YyeB(XVBG->fxAlx_(dIxSDyN~=LoPbH@3{PM`0*+!6q};UNRt77+QZk-Hf68g@lJck)Rq`5khe|jz z6}nA)*4T)=QrMN~(%hFt2S0l1=yGyq2&moo&q4WBYwr#Xf$BkieRh?$-wD2Sb))Zo zrpGV-cJr=kpN`TMwr05pb1|>f5dLU?kU%?3mJ@K!Bhark(i*b*iSqT9nvG9+ZGays zeI;`Bd0m&x0i;mhZ5Z*d$s$gXJJqT?&u#~6&eu0o;owDkpbta`h36{aF6ue8dp>*% zpaUj(>tih!O`?!<7tisd1d!57;(8@Rzvi$0J*_;TX#&|zk~^inxq7fSb9g$kFT`^n z`%hqp#?Ybh>e_o@u{_TpZvI&AeS$CF`|ov&Y6{&2szAgE!HxY0SnPUhNn@*?Yn}n0 zZTwl|!4E)ILZ8!{r6B zAQb)H+&EqV{3mPCYt5cN5trX0(n{tgzXR@$Y2!1MzUN)sYeWF+&_h|6>3Y}pb9B?t z^?4OvL4|{HnpM7L!SvBEV}|s)nxIdJ1KzF1Dj-BwL@*s zMXlW-Wdc;KOsUn0I|K9%wi|zt?D?ok&I&{lHuebDjh^p?7U(Ymn|Hk0P*&wr@XC#j zA9d;SO)Q~-U=v+>YSiTdb&TNBJTe#vM}bT*oV;KWQFrxd8SBJ?d>jc3W-+FM#dxTE3gVaKc! zuSm4*eMnDUK!cF_iv$38uaj|uUO#}tm6~{J7_6V(4&nok2F@%Pda(#x!&GgDG4E)Px zP!33HQaUk*19?ZcKc%!7`7CfQ+UpB&Z4&5fnc@_W`G}Zueycg0f zCfGb< zjj;v&;={EoPmZx05vbR`tgYhA*1u|0_3 zmGWCTCA8Ig{3<*Ht(aBE?xmMT$Q{Kc_B4l<}l{IdIYBN-BnoZ@o$ z;(;SEMenv1G>)d@&g)hos{4WYy1nZTFt#t^z_|*~rtE0ba52AVZT5$-Pe#|uIm-RS}Ho~e)P z=f5Kz*E^G@5l&dTwqfoOj-}&kI61_|VF5_Rg~{`4WS%-EKP213(V356T*}d*XTK(m}lr-Z}g0M zQ0b2RaU$$4db#S!&S%r+H!@)hl#XyVT{1A!K1L1LJ4}9#3hN2wb3N!Y!Ovy|JTV{6 zY~r^;9`3a^smr@{x@C^B&;~SMdEd#|9R>IDSpnwe)g+__Xu&p>7Z9Nyku4HCkm^|L zL0c_I=+8jgvvO{dQw*4o&fJ!qw0RQSiQQE433RdTVr*r;r=MH`aAnFI< z(42eTIIiLq1=^}uy@0j{W_3OWEC^hW9;|RmG2thY!%k5d*S7Y}SXpWKN{6%7@J$Vw zJ_-dV5^U(GZ4JCYX2Od8aQsqUX#t3gMC)i=b=!+kgjm!VK1>pi)rp4ss-U0)2YAAd zS?}5}5HFaDp}|pT3#>o_q(52Hk5YOPX?*bqdPd6kYq=g+?MNp#Y!h6@Dn5(z)JvZL zeNrz_kGUvDAv-K)RcC+}|4e(WP~GIcC!;Fha^QFS2M(p=CTuyJ2m?aYea`{K2zZGF zc77k9eXV%+enW0`p7o+DI!E;ga7DP$a|m*Kb-f*}vht~k|4kLIeGi(1D_(Z!{PlxP5VdqrRn-TE`Pz=J%Kq2}^W`Uu{{(hl=J)Md`L)W(K_qAE zid!{s4JTFYf2Lcq;u>k&ptNSP@lfAdpnKcy`$m;bG1Aa;-K3 zbjUzT7bvB;-0^W$-e z8@~1)x*m4&28`(g?)FZN!DrIAFZZCS?XNMvVm)E(Ubf-Ab9?h`->c{0Sdgk-8z}?! zY#FSe<24AC?t_OiD03{5*%2U8_*IGR zZR-|2IuF-LD*(NH#;u3B(N$-R2~+A|fc>S68$GRKg4#q;Tzux0flUT~Utc$J)t3l4$yj?_I>S`Cat)u5^_g%W`>WpZd)`^2`;&m53;O`qXJj8pv$u8z>OK`# zr#`wf)QSYqA|Zqs9O|pt`nOq@{jTO@g8QW3?|aLGqYJZsiLANzPWRc|9*H%$;KI|wLbl$=v>K{in`|fV^ zaQXQ+ca}NV(JxoK>(~E=6Zm!qH5&OWkM$n&g-vZrIrKqY`cJ>@QI)CP+RgB%u20~m zdLnz8`nA=LSOZ8|bQ|P8i!el1u4~r|_vY}CZ&7RBi)sL!md#77p6$^ zS4GzR<*i*#TUd^5UtxEU6mEI^k9j59yrsFuj9|gfSO28M?Sak5nRD> zdf60~dNKdE!JbZk#OEw_As0Uz^mc3poiJ349$TOJ?Zspt4x1X@@?O33Ag=azs_GAb zKR7rB^V0lN7}58mPc0L@i=m~DGo`hA+%xU!N(ua4d3XOKYhZ{Sx1~X}wA(G>H>ea} zYzx=lAas5emxB>=6%Utlt&vxw0Wbnr-w@9&+Y~NUo(B{6Bkvd{@3-4cXU}zWt=e`q z_bfPu6T6jo21-wJH9fZcW;)+=OPp@Jav=mCr9Mp^4sWcQ?MJ&AX*z5E#jKVGVzC~y zw|PE?ocEwBKlCFi=w_?Ns;{PpYeaGoskk(^xJho}AG!%PVWlQb2m+As=oePSGj(vH zR_x49s&$`EbdGB4ZLB_JIOQ07}%Ctct;rZuE{aL7f z8OY7X+md@N_Vfru&7ks0$;xQ!9-@5uM56ZrK-y}xvuTV>dmu-KJD-KWgN?Xbti~K0 zt%nE_1G+5VOSJ8j#^Z$S0fbL0joItvkhFqm(~*oyR%z4;X7}9QSt}n;3Z22z77yQD zzchA&pV_(-3m|!+iQ}O!n(IM9L)FU-^d{MyG?gPG>9Iiokpv*I=t_pV`+EO&IsSgO>_oLxC zvwXiK9y#~W+78G&J?Nf0=&z)!%N+Y!u!VXoCrNReFXp@=?8b`hElS+3}&OMz0aw+#nT-Z+6Dc2 zBpL`;?lIDXiiah4rBol3@{Et{>%O{{wzn{p-j7ABKQof;EFj$2K79#pAUyNES#9g~ zqr9}s`Hy*>?}=@e#WeRN8W!YU`xkNk>&H7+YINFt?$mBJ?sDulzNZqjuhJ#*P+L58 z+iE{-A_*0R-?3HQeawnv?40*%ey7jX6;C$uW5Ri0){(zRZ&8D;;e0&qN9oxJ>LUTK zKL&keV8BP|T;2G=m2kL)T~0?`-|ozTQxU6%?|FVZ|lxMH_E?)7xY1>`g52Yf3#Z~BDFLajjYCCmZlnk+9U(cLKyAx_=Olk4fPu28LQ>VC!SlS02ZPnv&y5u^}l?`O+^XK?Mc0=37;Fti?j$MF7nJcy=iInVF0$L&tMjAu@rp1XaT|B&T?%h zgLO}3HYF_>3^=}=U&J}^`AVx1;7)uwL!I|&S;d;{{x6Qt&hdL)<5YosF1mkEG~Be_ zx93g}a6A>x#a#}Exf<1o`nST$Fj`APq89DqC5i6+d06oFck=JIJ#2%_t6}3!$}NYd z1~q|~)!i!XzQ~-OxBnoU6H}koPpF;9?r)Q<3q(8l5(f_&)uI9gF1$Y0wAXFV8K7_P zm_7X3d-SRcgmeqJv%0pA2N)vdd*Sp_2i~L5s(NJYyct$ih$u8D8S5^ITBYZ-y~Bm< zfU8Ne*<4VXz&{e68XhnwfrQxKF-Ngrj<3#-?N>f1!R_i9-=LQohVRZ>yV300BF&?5 z8J3mxZmQ512V0`+Ero7SSwQPH^DPgg-yT_*d3;j+13mZaa;OgVvpCZBc1N!5*mACQ zIl-cGS02yrHWMu2EcTkV=0|XFE(@+J|3EbRcT?KSGXS&4sMTp%6SZ1*-X^^_WxBsr z1)2j zrC-4d<8)F69*)dh&-2IWO0tS!?YA9MIDD^s5s#7fkC|kKRK-Q5!t(JscZ{voJHEaq zpU$rGW<%}vdS$ddJEwe7=7+^gwTNrjS2Et0Ao$CQZ~9Sb0`0}H1t;uhaG-pvj3MPV zWb?5^ZfV?K(Qj-bQg0dtGQokCK1BrW&yI6W};Lo82+mH|a}(bNn@RXV7JJ_TJq4CT5dzd%G_@ZkI~N zl{TA6aKhaJe#vT3&zXK9mD_New5Ajm;-%6mK5nn=(=9D+<7HhBJ1JcP0!o%eVdOHq z-=ey)8i(uUC;y^JX?vc%_%YRdKo#}-q1KN%iEE$ts`#C|W~CQT;^n20)w$rW6!FS? zdov!{xmBdvdyuNM2+te~qm{ASv4b(r46l8xadM$UVqOP5Lot-zi|~9!CZFF4ROzUB zV;X*lzxQXOrpMzxqiI~2t(tpqB@#{K)9{+5iPa~_*)l2q+Wq?8x{|fSo+|!n>*Bn7 zW+H7x=5umm*U2fcBq=|+SMO)9N`Jw&`M7QVCZF88*r^nj=28o`L^k5rjk13#KOi_X z{m2iuK$n>H=hlg8t=4xJwGNCcCIM{QDk%rDmib|r;&JB`W(YZM9#&yjJ;K-FGyh5}&U6@|Us;Q};f2=+Ok39Wg!?V#?QSyI zSE?d$-yXN4JnU(3;;k_Ogb|UWX-;G#4LaVe?m!6aS z^r7F&XXkPIvqR)ugX8`%H(V*q6-6(d>dlq(=8+|3wyidIABJp7Sh=+tnI8&E`2vbtBYqog&?3%-%R45^ZKt2_kH@wh--LdVD@vPs;k7329K&~1;{lOj zbZRcrXXsX?$xG|;>wJ!AvZ4LQUXX~HuHs~L6K!(oJYOXx$AWZ(OS_#cS~T~_1Uw2)r3#~wzMxTeZLvu4l z^#)YR-v@aPh4igfoxOhK-1`nw*GA4C6}had+{)WVT9X#JRvNg8WVl(?gbC+DpG$2I0Sdit|Wdw zSZ=M_(%i#b;9wa0q)}?!7KeO#p1edq^aeHiCU$9@7RQeo^eG!R#lE&T)ZapBye9Xo zIu!|RKmj?o{>Pht;bq*34#XhgkRz%um~F;x4brk!AkOGb-hcjdN78rFe!$rpx<)^I z#x0czJAZ!0TM%2jMHV6Er~S=ck+-0ne0?3G&LL@`%T%)p%*nK0+i zKKy&|k4RPu{%Pa1+5|z1;ri-uUg1`%sd?=CAfsO15?7BgrK7(fj*WaDB*8&c;e$xE9%e}ty8KJ7s znOT-F_(n!6l2=!pm$k_f*YQ`AZ?-N|^=d@=eCfeKs7Px6rTIhouhI0wB8Io)zs?3V z`ctaVZ?Vtj{q5bA(^A2O^|&|8fgl~~By+dka{ijc(rjJrSx>lg_c{xo&h@Kf>Du0( zg#8-cmz$TX6WP6N85>!V9)>T|>0Z&`!YwC@z7O`KaYArNUV1+HaiE?Gjy6ChYN9l~ zQ{~hcHy&L0V{`53!u#uU4uK5+qSGvCuoj4`26u=l}HapYhFT7O2 zJzvSy@GXmHLs}2JKYW1H$rXyu2GiActoelWn!A@Qhe*M{~{4!41qt;WVR z6qtsP?}Q?_us2o0m=|@3@h>Mc;bHuWeNVXEsnTtBe?23kx>@g35(jBeQ(tAo0z%x| zMSIXwP8*-*1g}v4l3N)dF9YU;j&@)ADM~vr*uSI_*W<7Fs+TaAe6!;S_|V#{NfrFV z&8+X8*0Xhu9*Wi-uh0oyz*hCY;5IN!fC_}@>F-@>xSwO-1iCV8Pm@AfzMN6@!Op+8 z<(B$E%0Um^ZMrz0^r>|$;@=$J#l})i)1$;+LV2x$X&tZJt!U$t`%o z^hfHl?Cn(}CFI+5H5BczZvbdq_Mu>nEE;$C5nR34{f^asa6(>+07tv1xVEHDsutm% z^;Fudj(j(<{a^W`*)@&%Z${Kp*u)-T*VdJb^vD0ig|rt7-jJxc5N`|4((YaHp--DNMn-u3<`A)+tSK)vyM z_wbfoZmZ<7V*{s?j?o<%i8*vDqw(Ylv9j)y5UZPtu!r=$oUraSUNysQoddEJPnhpD zDb+^B65j}0mh{t-ODVC-IxodnltzZT!BJeFkePO8_+3<0l%v@yv`+SA4kys*bY~6@ zU%6rG5^=nlIsb@H?p1DEvE9La9+$P*bMq0;-QQRJI#Pr9a_yAfUy3u3-|s?+xtVh)vs6mL%$(JnA$H*XxVanz;e z0^9MDdEh#GwEyX$PILwVYD&O#i{o`rz&~H#($Gf8?;!ea^w(uA7pxe7&ox5M7>vuHCs&PtX zg9GIx`=7P_f-7aXIQ|8NHeIV$YvK=hAh*UY=`Z_q{}BUrlB(SXqhMTcxKiTdy3bvF zVXM%g(x`pjl|tBr&Zx+b;n~4H-|Ii~6{qG{?bp$tZs*p;$Q%`; zH(ANp4=%@h8KwRXnKH7%!kJl-lULEMA%hZxdv&WtuOGS1dQ4Co*{`dR!P)d1`t38^ zeprZ?sC>NIe%{U9;9gFs!qL#OJOULDxTox{xjA1T0=ec1zK^Nr=DuuhJ7lh4wG-`I%yk7I;8-`imlF0)vEd&mDed`20#(T%*J0--OGZr*q|F$CR~Zee*H5a99R67q3fJyra)zsTHG1}0aTY^4 zKCWI?+T<&_c-fm{lc?}n$aD*W*j~&QKZ@Qd{k9=4>(c`NMTZwab`24qVk^1m2c`VN zcuVVEHuBER+8$HtSGw?SclN~Yxk@*$_g~G}wZA67_}Z;5l2U(6e?qu;yR_FKwe)hP zZAW<;bFbW=@J}ZY&OYRnnDWhn) z&?HwR6~N9d*3s{w8k*4T>8vq9=TKTnF(2Dp`SPdKhnRS&@@qV~DG=D^!tev#;+?8D z6=d)#e4*A0x!CLRYJKMYd1vW&HoT7%{E1c}n%Fi1w3@p(?eEy74ZXA!x~%PZ)rdRv zf2gA0r;N^E56yoa5h?IBK~H>?Y?`;%;8N(fZ&wm2)H(gw+P(VkYrb$EU0dbpx_V@& zvo+InVa_ih2wJ=Kc1BMZ%4vUS>-d_-{26Ge2<7D!(xo4T>+v$Y-MAHxosC~aCkIGE z&M`7sI=f=mupTWDp^PuZ61#mw7Tn#;+|BD`3;ZPc%jfGx=TD;!f-E!eS72b&Hk$8g7Ynv!p)%5 z$o*~>HN6T;hvHwY))s4L)6oHHg{z&y$yFwLmw_-oLD;4CD{0^CWOPBn^rYU)+G2Gr*vPY0DA737JK)`Vp(l# zu(<>T(o()L`ttMJk>Xc9wolcys+r>ZzT#xecQ0mfF>mx4e2ufC>EaN?>0~dSe!Nx| zPxnsRL%iUq7WYf~z*17&JGy*}oqN)KSl>PU*KyzayPXPmliVNcN#pYi=D6EX&G1$n z>`IAy%{|*M4^h4*S*ftsO3Vhd<3SB7&L7?^%>d`<#s%(|`WyG4AKQ0#?AI|4!#|Hs z&+`NK*)H3i`ehr?Q-#lFzAW5+H3nR1!&fV*N98WuvXA0io*)AN*C<_gozvHL4KpP&iYr|Z4G@xEslz>5B}q_#cd-Ktiau%r0aiTlA8%2vF) zZ>w?OS8JW#&^+DMjdW!5Bu&6LCS2RKI_x8+eys|3_FHZCEeF@qXa8*2V7P`@^mDCz zI7A7y%Y$+YqUd2@&j)tIreNz`_@_%$Pjhi(&ESECg@4CV%U^u+#J=(77N;_YGF$lb zX3}~$!@p+hUNyTNic1*ceHBmY)M@|t5C-_9bTgIUS;X(;>+3hJjVk>|nU&`-9=4XR zE=B|QHO-BxiA73OzjPbsKe9QtnbUlK*m!20Z}WXntIhaP*l>|~ii+3HqbE9FBif=R z>GTw^_84W?3`{7S+-%@2FT+(nk&g1DJKjfFw;N5gwlM#UlIniq)gI@075T3g>fiPv zCw^9AacQxYF5HhhDKTFwVb?mIZPxaJdIVWY~+ zSUxI5pRegXBeyAZR&l+b*G;Ys?TCHl4mYeqNbfS7JFOpX*i@Fy1aQs(L8x;ln-d>y60~v-DmsB!*nDvyeFmFh0{o^*uyuR*@o3a{qsUUe*}NW z!M3X-Nfnq=nRtmd)7l+!JG+RViJXhhzyp~zC;PbXOvEQ!Xb1FUwRY<&+mn=OoMYP-{}@9bb}QkuRz&b31LaSQP35U`$qxYatp1y72? z)j>#DK=*eKbH69bd0{P!?~h?p2*TiIDcKB`${<~|&=WMln8H0BB095@-pk`qbA$Y& z1#BSy6(dt)bA^G{`|ZIk0~=QMphozs=%EBZYPp8@x^oM_QFFW_Mf4!3Hi2t3fXWlG z@eg&wXbOuzbxyu>ezCwbvR{ZOQG56fwT7d`7prV?cOhPD)_rjKn;)0W>o@^O)!E*7 z&lzag0OZW+Lwk#14Q8hvD7R8&R-pB0yGzeqY4jiXIauubUYwTRq0=_Thwy{tnDHlI zT(`L}esurdNKG|+u1?bi?E?g3FjW|$X7|SS*e82DmV0%8Y##>-H*MU}%v9lq{dwfj zay0L^kn5lcM>Y0Nww5}WBXdYzfoT!GG%j_zSZzJH<9U0lTgw-2%n@Z?_{@@GkTE^U zDR&puEGV}iO*fXc6h}|%wAuUJPE_bi-HBYSJdcd`tmYujK3WZy@ALBq(?NvW|K7`O zf`&j$e>I>1#Ephhittp+LnkSRu#47o+^M!Fww4PMmx+~J>u*-GSKqBgd>n3s*BWZ! z-V20VuW&j1q2;00iwbLPaCl1jiuDy*R%7gGV5&0j}<8eXq83 zi3D!%pFY8)WweBc&ZqUhBw1Kn*u`a24=r#0l3)+yWVSj9=@>%Lx7O z_FEb;U`tokWu{D{T`7eoc78800h~(HZ))Es<0SMf;`SBLJV zyi_2Xv>C6g=ZAQ=A#>0&yK}Xi7#CtKmj#S}^7mN;?}+y3nJ2oLH_Nt6Aotgx7TT_- z>lR=9&UANopo>9U3+)%RIqbK|MB?k+<~j5lf6IyQC^Sh9zftqtAL;7ogp;*=0Rl>J z88*XQZID_j7yee$2fpWD*DIeBp@yG2+x#*GHkM;2f=99SGIWV4g>zuM8u%J_|v3ml~~iWv=lFg@-#93 zZhOP=FRo_Hn!5i%``MeEmjH_ZhFJ?&k0Fq@Cr1n64e^bmtF`}{cHr&d&H?Nig%dCX zQ#ZNhQ~9Rv20O_(2i>l_G3UrPnG$6IsSMV4+11uNf6hBy#sMAttp(%aAcwBvsYt$! zoLn92{csB@94@b+wGcL%Uax_&I36AEBMFW zKB}WNu~o~>!E2kQ=2;<<&rnZS)ftOaEbBPr%1yX&ON)7u??8Bu8k0o^vu)=7lIw-G zCeOzQ$dZ=(uPvx%9mhQR{Oegf4(x$tiB0maGfT8b!G6OQ1|p-;vNGNp-(l|>k5hC~ zjNV_j@qCtZVW<9Zky~$wYLYU#IWM z_OfZGJGJ=Z)M|Orz^p<361>bDzxcYv<+Sb|)8|1BPUeQ~V)k>MQZ+pCColJd-d3N4{D8~SN4>s^+I5to?wkR+9Qtz`?~SSm3G4gyFR(BA7OH0UtE$1_!a1az+PeuXzA zZBHxPEN^&f4JAsoek>5L(tWzd*Ufx`I>wdYzK2at1B0OoRNG* z?dU94bCT=8Xu5tS_aDJJa|E5qy^-E1WukyBO_c069 zuAEab0?=KIObCxFrNxwyV~_I9x>Gu09N!(lnwi@-)`I`nl%zcc=-cPfoE!G zm#&Nc&YInF`pu5^w{`ZRFR=G0v<~*Q7=O6e?XxNKc{D3lil3;8^iSW8a;ALc11}3z zS}VCbowTvTQkr;enmubD zbdv9wBjfb=i*mMk@f&J+SG3$YLhj0DZ)cmy1ZiB3>+Gj!S@5KibWoK<|QYcf!n&xbZ3`*73 z*6L&1^Qqd)AXrvt<^;OOsaFA*$c+5{({``GEEefAthBZLM;x)(N|DS)(3Xf*^VT8EzAG$qItjguh=PPLzZxQUX@dJ+oAGSY6l3>xJAoZj2;vRqhr z_(ds`Zj0W4q`wGJ9hZcZ%=^0A(6Z%J{##A4*(q&G^>DojheM%ITUeSi(QXy9-dYuI zO~sOO?Z4k(@;YD1VKS41obj`%+deW2w)J&_uRl>hd3cQFYyd$>er^z7@)C^}jmY`K zW)lz%mahUu`m^$Z3Kx9JgHXMFkDF&UzEXtrmLPR-6{A|Bn(NJU*X_dOP7#|HbbwUFK#j z`4fJ>^-8Y}aJ17mT;7%T=201r`Td>u`NPv0et(>~!$@YfJ*w8A)seTk&6sZ@bnni! zYWg86MV>|*`n_-t*^0A-E4kLp^@z{*rW9vIy40h&D>4s3J}QvB7Ls zFkG%-o7SSRT9heizh3Q9%38Oj_Cv&Eywung@X7A03nfoblmJL(Lve9x-u#tuDksax z3i|PQbb)yu%!6GEA)B7m{YC247{(KOIUVoSJEDRRpAq6%b<%cT|+ zE2G@T%Yu3WP)pjjqc2vsVGXh<*PQ7zlgO{NbaL(>ALN@0v^(GbadJ0ztVHW_yi|v? zyxpu1BCjmYfeA8;Rh?A{^ng{8^QkQ~{OPr&P1GyeF33K$h}MVfmT-Lz3YTI zov)SCg1U#NnD9DM8P~J*A}!EsZOTyBIpjHn<4b-w#qemuEXNq<9-|*|mK&dHvE-Uu z`STF+-U>*#mwJ0MbD1Cll)BR^e98vs*hXKV{jOv`7E+rmfNj(IL2Q6)Og^FBgv06{Q1bR}(4G=H#qPwSZg0b6WfX$vQ(l2^6u{*NhXf(hB9V)T zrEcxYcZ$r0KmBiicbB+yZ39RH%UD5TGYAh}>}PMeqLWgyaNKQjb~?KnH4W{uqP=cD zl0p41L0h#TwitO~Wjp6oF4ri0cR5K+RyuOz;PVX}QCr}_V4Hsesf8FV=+}XL3h!9( zw9ax%Ci~0vJwH?ovWNUt#+$qur>1a%%V9xe;2`FWw?)IgNW6+kpLum0<>O*Z^m;Ye z=ibu?{O+AoWpzMVxkSdr$MjgMsnE|DLjzNqd<`-;t&FB)>&Q;>M|y1p?XumD99&*;|FG$2x6+pBH9$9|i#nua1D3 zGAnKA&J%N=^I!=RACv#PE;5gr4v%Y=ilg^4Yub!gp2pra<;^9Q+fG2fc9B#JV5z2@P1+2+8Lrj{D#(?oA^~G!XbwgEX z(!a?vDu33wVyjuZPFS{H0Z2BIOn_`cghny^iD>)X820wu@A60Wzs&c@uBGE>HZQWj z^T4006rj27`$%`4n8b_C4&eIWCtOK|=gvF)7HR1)ehF88ndO!3dVkD}9|En7cBzFL z*#*Y6odfF`jcpg*IxP=u+-A?oHvRK^#ckV@gO*!D9IPe&_(Rc#CL=@oJMNdyV|~1BznSYWXSz#w`+}}X>2808)n#>G=h;cgkoaaL z;{Q6m>V|B0GxubSDqpI#=*qiH$#=?}X@Wwh7QUh$xIKJkXXbfTwO`J^d-Z+d;2#Nyu(&0{FsYPd68gG8`QM!gijar|tUwxr80jDBQqF zf8<~gYFT^;ohl7=FEF~JtLS_69AW@i+R+_aTZ39No}9yJ9!b%$(m@|`|29|=4R8B+ zRPOLw>l~_@_-fGJsqFv$3fgit!EWxyA73W1eAy|(uc6(4J2;=;y2Sdm-N6#BX-o8_tNk{S4wA)}v>MtRdStlmNj>=JwE4bXlb^d#Tr)66FG2X|}00aNw! z*M~B{1lrnSG}Nn?d8z;H?mydTgrTEu=QBJolbU&)Q8{J!$L`aL1>-?72ut1a1MfCB z%B7i_6LO#N!Uu$DL>@uS{36@XRl3#GmW6p+owUi#CwFL(gWT=IbC^R8kA)omY}`gB zQ7X7dY3+HTvH)tGCVqSW72_R9k3khhIdHlDZndd^1f9=M6(a>u@;lEp8`KG^PR@v* zL$_P%=xnYZ!vWf~Azg|3)92v4Q}(ayvDv|CX8i42mAiA^73AN$dniaw%YF10JAO1d zrUMj(RRa1|er&C_?4In#RvtO!jZR3D@CVZm^*c@_McH0&%f-qOKfObvn*0^guW12~ z_8oi?{4Uer!xVP&>sAGJ=TzxvO$zoA(?S~WntdJ~eYo1Y+j4pm7R?O6tU2nva{wac zUCAdjJtqcc96C#(KGz$q8ma5-UO5$@1j5mHc13!ZXXONB4#$MjY4h)`Po1uydl6bb z7H2ggS)%lDR*B;h+u1-)5$3A=be9Y}>08ueQ}r8_f-(Po`!BV8=yoPcxdM~;X4P<6 zYShZsMDr##6rv}xd~RlsSgtLsv*{Ss)*v)my>Y+$%zwfT@}dlB#&2(smu><$NP5(S z=iUoxWU?~0^Ord6DB8U({+57zsEuyJuw+>`Qth|h@6@6ZI)bWYbpG2jf-t7{h&_`B zVYT+W7DV|N(-SFG+Y48p_P2O=trwce?;}2E*=jhhAAq%x|1_WPn^uBK#8?`!;qUqj zEf`@eK&rm3Q-(_1T2*Ptp{vhiNp;gfu_a7^o(6##V(>f;iUW+b++s~o;X~H&a~g7} z>}QjMUXlyO?tVN+-lslo-R`Qe=+BVtaq1w8+~=~ry43MLUlS|5e3_;zz0)7kG#5Xb zGlT6N7q94@C{OvGst=FSFzEq(lV=GeAHLh7$&0YjicH$#tR7&1w1Cy?JWFAqfy{B--BN@c@+ zyVnuzLqvA6a|`X^ZDz^uF^+4Z(Wvk^KSX~-K?mISA{c&78UEgR%mI4+`b=*1ds|!z zinVh*qt=&Wwa5JRV`!)V11isw*Brl}GULfbj?iGWoD88+KWdvG$*Kn9)liLB+8!7~ z;j&*SxqYth`9e}XOq%;eSF5Y7QO5cmxxxHJi#pK-1c+J3{YQ;*4pY0Fe3zYS^@efC z6oTEo?b6#^pW97ydAfE80ga2p3#$N56i66Ysn>b8)BSOLtxP@y&nCZf?4i0UI@s)X zJ8PPzY?`ZtC?-!B1Je>jo)M5zpaVl_T%|j-t;p{8*~jM9*_nBhH->Fjz}nb{zJ$Z2 zaVM1PD?@L7N^olNyUDy}6Hnyl9MX>S!pP62cVU^Y2=ZL=`nV15j}gTn-+|LXDl8cE$G)r;tHyRLfvwZ~crgs!P1cIRAq<&ttUx#PluaBTo-D&wF zk9g#1E^n8}5X5*Pv7fCoXDF0@aswbGwYe{k5}Mos8kjfL;Udzv!{_wRH6rw>)(7i) z6}TL8MgQv!yoI~>IvsKRZYqDx!{XMf{H;LCUWU~C5Nd75S~LyP^nqj^+pRT=0Tm&s z0v`LRWO@#Je>MLmdS9hDYOCnSVb#jz?#p_8P;Dmn;&YJTXJKV2gUM}F?26kO$85jF z^fAnxM!fglY}Q+^mN~D#uVs2sp28Ey`cLBY%e+0(e)v!Tqs^58x@*r|(wl z2iCOdqE&$S;q-Ir?nRF)1buiY^!j(g#=hCY_+DZ?zH7~E<+;Z{zwUb!n>kotvj+b- z&-NtoNpHW0@ku6vN~2O{Im$Md*j3>P2Gwj{Ya0N7yo7 z1|La$?h?J_+iU=h)ET*ejL%9=tW{Zb6Sb#&{Y z#RmmBh8l-Fv3m~KNLxS91i!z0ru_+8rJI5ZX7IA$3~?LA4Yca3UH#8oLGM@x6cDgH z*Vr8#>r(A2(-fF^W{{!ab9sQHFaDn07HgaewK*G)f$l-{#$We?H$UKyUFdI|1vCqJ zS*$@aepI@pPA5CRe$o-&%@k4lv%i>LJtOQVATq#9$lw!P+lOD2^gGg{DK(S@ZC7`AVR&In+NP`G2=oVnRp`niUK`!P>0T#_PbQZuU%2=;VE!=ZG3N%q#b$Ot zsU5%d08#1i`nBldwH&lRzqci~ z$!^HQj6>_!zefTvVf}k>7l_j*qaac51T%(*iY#|S*t8Yrgh#OTa=F*EyF-b4bdQD+ zq*n?L&10ScKQ(Zu{^l?G5G>3+wrq~-pAf^wvRZ|NLT}x0+Vf%+{n(YJK}E62mYV0A zKAe4a9e`WYD!I#2F=TtLzNq}R9~FXxW;naJ0@`o~vrYx{bY@o}F@uOQeE7gZ4W#4I z&^)r#7)nypxY;e+CZMA~K+$Bj827{)Y=P>cfA)X^caDu$<>QRhz3q7S8IBC&&nuz| z#g-41!MujgZ)|oZ5~h-7Y37#X2UCKgcUsKPl2fMMgs~_)-@)zJpY>{G@YOmhph$!K zU#r`J%T)4gbklTTFY~Eq+;$NjHeSNyHn(+MoS%5{55K8s7IT$QTTsD3NuK!&^Zu0} zJWvRm)B)hT!Gls|8(PP)iBjeucmDw%u!4>1M1OUeP1y}xE3pM@~4Fzvrr@McTu zmf(>dQdujBr46aC5>k#^IfBz{}7L!a41ysxY4_}cS~?!4YS7Sud0VI*(o3o3NHNW zlB{n~y%B^nnogET6Cbfvz;vDx^$=cDTI-ab;b;$d7Z zIJx7&R6Ef*2woWTytKM|sRsnvzsyf^tr!5mn{!gav!EN#sVLh_jQ=5grZBKpv3vZi z(Q!)xq(QK+;umd9Y^*(~D1<_b3&djXIy+UaEo6P$ej$CcF7EU%^&Zb;t;nB*q_|lL z<9ElBJ*i1F^lsQzpyj=P*A~~tBuLLQM<5nE%X&=r+kp#+!C-XRjXxb-f1ZaS8ldS^ zLk*BdJ_^?DkcI@JKSJkh6#L9HtoO^E?Y`%dxm@Ma$qu96v@0X00K&o3r@AoTIDPWv z6*dV6Fl0&jL$t+4^Fx{Km9G^HGMMv$9w+2`_P#tu2CU1Z)nBG`YrD9X2Ul!gf$`Cw zQO+~r`tSVi_Ti~Q&SBb8qQAd9AbchgyR9(VG}JzIH;uqPbZeyTMg9E4ov3s8)aE2m zQ;EfmNpbBbS^BV$?;?AG`-S##g)G+Gc{zrb{2YbiYsK3cRe#v0<4dQ0zIINTa+21e zoFIJ8Qx96ne$?Hzd4|U5xQaX8Y=j-6Kggr}C?M$EaYJ3t~7YcvF7&O1S^#!Va zk4DG{5B15MDW;#G76sH{8REqXV9w}OL6Wrokcx9to422Z-lg)B9&k&0p^h-O&_a7! zWzy2(S1`pXxzfoeiWj-U=su`Rz|d*ka@*_!;bF=``i^I+^IwRY++ZT?Z> zX4iediv>gqmjNS}6_FzWYz8dm)@k!J$mu_h&b8fCH44MOrO+82R7z5)REm%@A;*}` z{{J3pf7#cyKkRGGJs0)9V?57&7y8c(@K!CBE8M{8_dd+@yH@TUuwgVBAgY?1)f6YU zqw=5r_@Y;ZTd8J}MnOm+&*0YZCNLCm5Jzi2K8v?M$jpL#qU4EX0_OzEQs~A-WA;I+ zWK`KI)4LVMg|$9w)@(u_p?~6d&^&qKlRp$czLxc5Mh(xX&RF_ z=RAhi)EUA$uv1%HTE)?uN>G#;1lxL3oTTcn078&o|J46E+w|SYSGqBBDHR!ac*x8B=2~m)H*@S%*@^fJeV>89&=f( zZX`9E;bR%nMbLpg#y=xt^2-dnn9gB*yVLv`e{|=*P4kPc-^JsuI4HF%_;PirXDxG} z+4I{ansvCixNPTT`GqtV^7c#Kke<~Ib6jpG*{^&SLtUma_uY1w3Ddki5FIX<2bE&4 z#7^*A2S%n0Gp{5zsdhdZP1DAiVtLD_Rrw?KyJpAOEN`1-xXB2LR@||q@c4Q@uw>{Tg0#8SqD~-(TK-U>wfwNU zco@s)ccXdPA6g3FLzm2&G>b0fT=mm+y=w0IX`iMH_rQed?N^*%BikuD-fq8x?eS)C z_myg}P4fwlz6OGk|8rK%5&e|7r<(9i;d16STs!^)*pIkZV6X;xtOLeRN0xB|b^zb7 zHP{hU-*jnv9+zv$%_OMABMKG1Ux54YXvc0ipnLq{9xjBli!uWYP;k)kz0!Y6vs!YP zD_L<+kfkVB59V8Nw3eldd}4ekT~$%k{&^PL%S#WwHnk~LV5D(QjYzhEKkdp?H$sDp z*7Z#}+(rHpm-IcldF4vOG%FQ3<}~8ji%JntCGO;t@w@9CSpgD?p}ISslhSCXT$;t%`af~WSxgapU&Mbg;rOrd7jA-V6U^a6mQqObn3dR3lO zM}sAD9U+y$RM&@>9*pQw;k>9^odtQ9?^09_Ht*6#LFd7|7&n|-5HJ2xL>W*lad^1bX05LN?Y1nHFDS(y!8XVD{pcol zMjvxSoI88hY^L7LK}!P2e@ft=p6m4d6y2?QviuEYe{Oar@Cv)S4!OBQcky1bw`Bq&wlUY%4H-#YaJek*mTnwfyqMeyJm$oPL0wu$p;=R_OW(6D*5z1nM5M{~3UpN9pvZ#iu~+?-J@}x6 zOt$X{CwX+gRJ4J5-%Pp$)ImBq-`!6}7XX5V$hB__MvVp|HQT(hS+ZL2q@Trf1cbFL`gDScWl zBO1%GFri>pXW|tXBmFrr5gZZ$_ss%{WgrKCso*oe?}%%M0LOH4%pMj;#gVE?ZU0># zY^?%Y(nlxurjT*`oh2AR@GLlXmPRk)9Sm9s^H8gn>FN@|7URC)6dXF#LL+HbmJE$@R+*Em}Af?g@#J*+P22epdw-|RIvZrnK%6FNLTwQEZJ3W zm6qAwVp-Ga-6%EDNmApiyjP)MJW5}4m64qvH-dCIO168=Lf|4`jmzb2r=uLRo)vU* z=p#+6n)pUPRi>NRz4$K{yDqw^7)rHj&_j$0!NGWDQMz9{wr}X^r`2&y7zXU8v;FxrF4pzcY$@oTYvl(1 zDnH{IwjmVD&lTEeuc08azzdY%uBJ#oQ=h$Vn=t~I(EKoS(>nB0>{ERIg2FcD8F0tW zLABFm(W!lCGXs8G8C0BV2LtKPT}Ea74IPI2-j}r5#nc`*xRNlw)y$q%1WcWM1)tzE#riml+{C=PR!AR$CuUsx8a{^^p zJb=tMO6rYw8h4g=p_Fvab;&)S;Psq;zZ0dXcM6Q9d6LUqmS=)2sRO87?z&A8X#`%_ z_p=?oceiWwsU0Co1(%-Dq}%l`SRR*<> z0*}h}CIsA4XT6faau7DPng^JN)#cb-?T$~oY)USh#=Fadtak}vL06pTLhq+_t30~3 z3eia}ED8`iFtI7)$i_a~sGiT{>PrdqQU3Sbn!B0GCf9x6>j5tB z;x?Ss&qsKD)R6W)m)I{(_Y1s|>VCWStxT{heSkTT1B&SAT!4Hq2aaFxng^ z_^b^XtS3gJHNI8l9B8`h9`;6Sa@JKg!|0SwEVPTwSLlz&S$$SU@A>iQE=Dm>a#FG7 zz0^-@IzQ?6LOF+W?@w#@r%^wTIY-Z~@I~pBRNJWzI+(XFy;uAG9jAr%;e$H;_ur$* zBM7^nocddgcg54mu)`aYpMfDN=!}(le%@fcsnjxOP~k;s4+DE8OQo#=c|y`g$JnsayU z58zGm$|>9W8z++F{buQ#2XFui6+hh~7O%U-L9M2h+UrgS_Fqfe*YR+n1>Z-%Odl3j zIA79c)g;YqTDj&c?3t+7bFqM@*`K-Xc)5ts{(|V$?Rnf&{QiyqRG)(Q=Svw}Zfl8i zBCsgZvv;-6^5IEDz|dkAua|0nim&2mP9c>fS&qK9wy;UPD(+@p~Wf|hi?7g}ip`HXWN z*^+iggwG!wi~IaB(^10FGkGXnHm2*Cof)YPPe~H^6!W3!K%fotk(_gLF=+4l_gv9i zYqjAi>{8`rjez(xa@}ozbPIx_`yu5m(#>-X*zS7-8d9hA*Qs{1@wQQNn^KJeq-L$? z9nLT)HH@Sg)GiPC?}FOVx?)Sece7eL**?>2wkC1#W+q=Q zFSiYitW@a!8$vYovi7Fd7*#BdUE+DkZBJ`@TWrqvz4o6&AHKthbPx8;*RkmCX{59P zO;Uk77LuL=Sies{X(XEcF{;R8Z{(-+t+?t0MWyB+#(6Z=kF7E@@p9y+J%aAgmbo1t zdX~s5zcTncRUdrAi1Ue3^`hvSmO}r7o8M}UmE&G^nVI%(6Y{|^>)J6gdq2aiR_o^N z3D;e!xx6qzhMM>5FYBSX9KbPmu2BJT%Kgz(ZCuWj10ZAw*=me!voUs?@<&4BXhgoZ zPZ25y0GvHuaS6U|hIuXwY5*L8z}&dkViQCZ+mwG)Z?Fm(gErx~ctcv}EL4W`(Off5 zKdm{tu#@`e3~;k*l6!XEdQU5ziEUSzx*HgqF&{^5KmSJ4wlPfg-10j5+-^ufp;)Po zLqa8v_(hdr_{`|!G&r9)6_w*Qf0YSayn^L};}6I3dry4FQ$(4T8|}S$+h9Yf`z>3! z37FjU>`m;q8)vc)l;!zKgSgwc-tSC|Wq{QWHT9^Vc!7l6T&Udadh~XqYY|KD>%$97 z29I#5UM~Zns2v2i#Wf0Xa{ntPffi0_5E&u0!!146cz19OKSM|Lc7t$I@t>tdYvz;H zYImKF+M8+JXkORo{7wxP8=bhe3p~Fs7(6^k>nRj#6svu;!6W3(VSqZWZEnBB3)4-P zI`+dC^l)+l)B2nOtfyiFl2<=sr9eku{FNJaVGb<*@c}=BUPD-)s8}i|MfkMpc{Q3URWdz`O64Y!JR&a=ACHJ`Uq9urILq?F*5!N6!R5FCLmP>EcQ2^68({w;}6^Q{a3 z-H}OsaX?K8Huhl@7BKKOhCsMiHPx;;`5uZpg65SM)#|CGfHoxa1}pw zhzmTvbDcoA**zu6$L)6B%Pd*>4&IYXMo*9J*dE-iZ)Y)`6xPiE`x#K^%xdnY?r*i?jxs)eDY`ex6iod z0LyX2Y2Yu4Y@4ZX+R)x_8VOq7<}DE>fDzfE2F)UvleKJqME!OMQQMXMn=#O!*N@f9 zQ#HOhIu_>Qk#%ycPN@hN;OoZ`WR6ezQ&XB`_F5Y14iD+ZY#8%fau-}q;sUF~Xq^2_ ziU8QTuW!8zH~hM8_pxV{VK2oGr0x|Hne6Yi2Nw0kOt@-7Ba zU>7+iuz1Wp+buVG99a|@ah>dr?E<(s`Zyg^b0F)r$82#!A7*OR+SNA~ZgVxjI$0R- zRC$#?Hoc?x);)W71r5tFQsnmEcsCc=>rzCunfa=4t`$YM=NR9&jVfr)n$^p>uzI7= zcUQM|EeEmev*zQOY<*p^>WPs<}3qfI`%5j}obb!8#V z{KsBC<2HRU-X1H!pU`-%<2pk^Ch_qh*eNIGhZ(lrKSbKHN@H*}M_8EUHjXZmOX#ON_z-PONW_&M6zp!oO%` z+&$eN+xZ<+FBOYj?6lj{Ibb3hb#S?PykFbP9dP&x(^j!{DVN%P70^EJtNH>s_4Dz% zNRyL!Z01Vd5$+ewweE|TY*2G>5m34M*3+wr();bY<0$JTdzO63mSt^r>94E~|EkLy z)D2t8f$jZK;T_m$A@+dZm;i*gcWc;;-Olt`xS!{RrvFKE!I*_e+6~9$O~)C$tI{%V zFXP`PyK|`^Z9Ir@YNReKJ9-^X`4088l;r$9-1h*`!8X`TI^q!|L;P#x&^~mi&F9x} z`uwj|Ra@5kSZck#^XcIOh#Jj!0{Z$JUcv$vgnRNSGU;rQ&i!N)c72L8Efj31OxYBB zuT!^n|6p%1fwy`>DDN-u?i`kH z#zuD;C>2;hSB#`FG2Sv4|IR=_Sm*lD?c^Rl-~4KJt0}f6_g9}nmr5)3d@!q$9{earyG|s6 zpR{qU>>sGX@m3`f_Kz#vMnY_;(}U z?!r4_X4%NDG&MzIg;t)Cv^FHEKYhrY&<^sH0uPc zd0HRdu}dGBuNseA7i&?{a?)LuIUpEy-{&2TCoO)N^5KI<_~B*#I+WHwI$(brzptWa z9pNqZOAcq^o~uZu(z?qnRxuRz(!24ZVOT9h`9vXm7E{#Di0oZ#H$4*m%=qB3z2t2d{cxFfS8_epy5Fm%p@w6)^hgx%Q18)JUd||Gd+(EmGBB9=X zW!rCa#VA*igV{KJWv4yu%EMjlFDx_nuv}-6rB#~^M=spKqRy8Z6{3ZZuF9o@R8@sW zn!^`6rBA1Do_{z+h-cDIu_V2Z$dTQbc&Wdipv<3(sp>!4kc-@>UX}1(^Q%>Yqx*6+ zKlJ~08J7Z;>9d-8%Or!7VbnYFGSMHFiP`sDZ_#VMwv9Pdb2+7JX33jeAL<$R29Y4Z+2SzDU({a zb_Wcpjvn8LaLfLpLsGh((&1;EAstE@Q%9{nZV?|xS5D!MO{;mVGS5-luM$tHTLl2z z3r|=w)2P;XE(%rfAL66x>&Q&+&0K_OJ+pAz#kXEB%x$O4p^la+Zo%8VJKchx$n#R0 z7~52`WBP1fls;s@4+{4St3YB_o}WWVs*jyp&LulOw{hpaXtCf&)kX`Fnx*;VKHTNT z{*ii+`*D54;i*-;Bqb%1=igp4ISmJ)!JY@xLY19&`Re^!u9G7J^ftLI;AI{gh7K)n zByrjStuQGuEx~~d{WLH%u>uiYRrrG1To~Z^NDuYTTWV2Pg=AjUk8Zw8kJgf;Ra|%| zwcS~AKDol!v13hCTIs)SVZTBs2e-9Qz>3j!Ys9pL+`vi#6~sQuh0>f+Q z(yakeuuWM0vRfng@ZEsww2F2uzuNSmMjh1AYkvy8ovU5WlQlCafFpdcbvJh|yA|BT z&nN7-wjYXT*FJ3ihKm(*hQjjjF*eH)VsL|8lF#}r2L~`PQU1_(Dwxdu{9xo>oT4zu zU|m9c72o(Q-K;Q`9FEebH|dXwx(CW!>q^r37An=SnLMi>J3G%|``wr1G1-;?C%+7S zR|I>QfKDPY<~?1Rt6EhZW%)$7#FNRFA&5f7>B&nOAqG3SR13mw%JecJ7f2$t!YI z)FU_GHbZzR<{V#u7W4Q%y47xd02;f{38n_^-;Jz2)GdQ;zmRL!(-%V=aRQa@k32!a(6Di ziPc)vtK^60F9_nb*^DU)j}OW{^au=$v*~4J;!1^empYn0|HmyIvYXnpa3+ zG+LVwcVz(Av99@)(lJ^}8R@CF1hd`_JCtDkQRUY#?xVgj-4dPM35;NPWaJQekSD`2 z0Afjyiz}n`=+L&S+LgOiqfnuF)!2#3ME^?1Cmdwsxhm0X=!Qu7wRs*jtOXr%(PSe& zdKlJj68P~FfuU&J$%fEB09(w6G1?z_pJv+rm zyMhAY-#%j3QIJ%eL!pNHqkD+;7#3yad76`E#jofRAM^ZE!yx zT@Ue53A4)LYBB;4Bd@$UF<{m6DL6ajT&=GPNVn>=n#12u-~gF#_WuU6s7M%n~;f{h+z=@F3`DndrU8nn~J;L_TT&kS;E}Y%6=Sz*eA<=2;0M=DWZm+&@LFiR~JCp04 zReKPrV|(sI_%25m%j4x~TNS7n*|zteW_9)VCdL(E@4MGa?KvcfZDBYle-|U7^oceK z#fWXDcJ89>7j-}-dW0b44(+xTh9EBHU_xq+l1p0qXCLoN%n5#3mGM%0F@SNn%ITyC z8Uf91-Ga&@wh#C!ijLOA_%5|o8@|A%bgN~xWiYK2`~`irLyNtSXQE_&1jj!=q$5|$ z4j=VzuJnMgs+V4BZ1xSH$hZHAqME%&1iSm8*BK|D+Y+|(QN%nu=55vv;8)Fpe~Y@F zO1q9w(irSn`-!^abp?qoT~2NF{9(Vfx;FeFS&OQZ|K<*$8naC0pvhVx;|J`9%) zrty2%H^U7gwQCm*x|?ve2~s<7N7ka$guQE8xG%nQypu&4G`iu?)O*$E3{&u!EpME2 zbo5cXyW}Fzu54A2O6vx5^898J&VA++lQ#4W&npl93&hJE!9Mxwo0H3dd!YB}GIWqr zM!LfqzZv&t!(ZcLL7A6^h`HyCv|A|MxFhR@$!V4};)c+K*$F3c0v(lEl=-YAFmbK7 zz3AE>>(6=B!=`Gr;e`XJxNe!Cvok;HxiDGbQ%-3=Mzab%-WHjt z-I*cn@iAIYDBQF~Nk<+@@jAB$Ru&YTT>gBR;w7d8K1$*ETVG`Qiym6kN3uJHc1eq! z%zcDYGwlqf*lzLIwx91oFp6OE-he`PxGVJ%dBYV{5*t|ZZ3h7iFe8`r;tX>0J8zj0 zckajW0!t5b7OIts>fbIo-+D$3|`yyQ-gW%UlmC42t{$4F2 zlCGU>RzN-=gzt>t1nhab&U8k=rC1q%&*C_qqD8y@@w^YK?YFfH;*7b?g|4=|Sp(7z z^%V|;_1rh3&*yi`$kN>6l5U9&>?d5yu#| z*m)E3h~-n5@4kvkHXdYuCn9W?=+8#Zn-<$n$Ze;K3UQUn?B<=8^RxZ@a=r?AbJL{8 zgyC&0s@^K;JJ4JHMb&N2zIgcqGb_(k-}ye#%KnZcyRm;Bt^<8z;ZukSV7C#UnlA(x zA-i_-5tcqj*jrJ*S?UTGduinMA^BJpC*ziOF!E(TKSiB=)RfxAygxqIw}}@eUT&+h zh4&;Q+M8|ny(!9Tp?Q9sjc+UT$?tS-T~G7B{)2WV(hUo|E-$y{pS{#1(mq)iZxwCQ zJDeuNrqp%eyEDKa%?~vj^C5p9udh%=GJBP0L15Hd^t9^W9mbVGULB7njfLI#{!ada zHLl;q;a%)pwyPQ_03`=jha;n3^?5_FeHPHuu!b!B;UkM)mmZtdA%rh;s{84a%K&dEc^OZ!$-+%Si>de zci$yk!uBy~L>$Xrwry?6Whc$fuz%Q1%f012erq~et6mSuCZF&BO{q+V1r)nf*D~L% zzzeDPyGo|YblaVtXvLbhIl|JPpVIQ*cK1-iL3rnyzf?j)uG0}Ib3s+~fX@Yxv|nWU zrrz#PT@LO4g~o+;2?8c}BvK3&XEatz98n>m?&yBK!C?C1YKA>oeZEXKwX0o-1Hoss z!%l?VeAgBO3oSgC3OoSR62ai)wD#+Dh|RLLO1~xNx`*#63mBj4oW11x`n0&6EQ{M? zCGK~mN(WTf&GA5~6q_ns`}|jN**pfXYfmz~DYWS2x8SqxwyrYNPu~YD*%~zI`6UHr z;hW|HlE0-xG~_CR@pt(^vJr?Mx?;S; zRk9BVdftxlqi{HEp}sX`7Lu{`8)y4NZ~vq$s|^NOR&E##$@^jP$}_fYJM{N2qDqU9 zL_T#+6Fe2l@5S~hGbwgaaDn1Enbyqyz3iHUlOD>}@$8DM@h%w9%haI*R_-uaF?zi7 z!?b7aTlc~P!;azZqBdYkJsV}!IhlM5S7((Ib4b5Xs?)fz z4N`)5{%gF4Q?kvh5)C$S9rfK)g6W{@x%g&wmz`a=z9*LB!X-RI>tea{*JQPX)(5YK z#GA}dG=63WIMlFIK9&}L0m_DP zF4Bj~h?r$s5kY>x!T!}wyOQ@Ut?KNswbmpY+fQzoH(@%JX#s-15QMmQ``G0SnaC)Y z?2ngNte#Hbj$JM=>mgn@di{-T%~QBW^RL&$Vp4ca4|>h&7Jby*(P2_A$@wOtG#-r| zKpmvdaPKD0%2cPAgT4#X6fFbP^hPQ@wl|%8CP%ICXl+}Ii&8zn+7a?kCEWFAPIjyH zCu^hPy-K22xN;~1pcoGtOs;#=*`~X89ClV|K6_ZlDZS5cLi!Z6zb2HUx&taG)tk;+ zN58P>oDKLJ!o3bQ?`OkkwuUqiQ$mP=!xHh8m9jYy`4%lfs&^SVf14AvQ$!TS$^N=k+|hevesd20iGax%T-MhQl$9>?Dj5c#8*b(5 zFWYNgB*E!c=1qO{>bSp3=q{2DMt45B(X(Cl+pWJPl&>E)2~65TuqS&v#vuBavUcv3 z{Yw5&^NyyYtsJjRt#9l6pqi@`(Hmd-SarHN{^-i&PVoUsmfW(td20=WXG8 zTJ#-gtBl5PCEpXt41*bVpD=IKv4llN-&51IU4mPgv3oK>*LRdUZv@qEKM-T=VzT@6YM;Yd%g%tcWv`V`=h%w>+xOP@w6iHHdQ8~WUQ z*Ow|BG3mi+|E6#oEDfq?HLq;A0S4xHx19`w#nuX9&`UmqZ`g>-f4HY?h^8_Si- zs$6Tyu@7t80|1Rz0&|%_QKfx)k8b^ZD(|c1?v+c$f$nc+sbt+-yTSC^_$p^>1}TD1 zeoV}cOG`f`3w$2SI50&~}@sM>DOW z=L$N)T?QTkfY&9~fwj;I#C8BngX63{SsfRz_JW@?Re8-msM9YD+XzG5TR^N6pBNzh z&zr@YSP>;V(t_6L^~hf_)#Rn^z;EP+-Cx+*1skf|O z^<83bygJqgzga_^C4O`HZ{|=PEtlou;yA4QR2o3sT`M*(hfi^D-IuZ-ghoOAfZuZI z5tp$7qnzg~SqfpFaD)Ye8V}Ft+@joj+jE+7r9oHe8l|?3!nb(t55VI*X?iT z?udh5*@%9X%Qy!?5j#nbX>p1%V1JtXy>n>(fMNwBi88S>o`(`y>`@l+f~xp>8Nyfp zaX-ftcxX|Va-e(%-3n~FH0{SYKasf)2rs^6=sKI;ry8H3a>>v(|OM0NPX5~%`B=dFB-O3n^Ew6BE82;OY-%0|4WrH?$OT9$OEtu0bpu+C0 zm+s?qDwtta~4DLsXAVor)&4+`(SK|!UhcCJAFTBin&f>O{EDeJ`uBgq`HH{131>|$LkrOKhT)r1u zji3TS|4(Ed?As6#Xi=BVYUGCS#xcFN$xjq`M+W`1| z?t}AUKR>Y!GAyhg#nb67OS{(rIl8#lsU4I_qsx_6Zi&vu@sip{*u^fN*<1jOLIEQ> zr!LKp$~C;`2c12FojG`13W(wVIoVl$Rk;NQa9)70)%EuNE|;XMi&pK(q@~QH69jwmvqF<1!dX42}g(%(j}`Ug>O5W zzFys6hxc|MD+rF0Jaw;*)VsAh-CaZ&9Ys;T*b`b7OXg{~9M1Bja+ngu>}*yyfR?MX zWEr>GTtNx;ZK`1!0IVn3kVbM=iNH4d@ia_fu`3Z=55WatH_P^x!wn>S`EIAIW z&8Obf2bEtj(EbXG?fLT{lUtR$tJcII3kUhf--FJd z5FKl^fbSlUy#csqme=?AgR1g?fF@s0TDPd(ZfK&WtAjyrzFG<`9ng$$d6{IL1_9_K zv^nGTQe(y`SXK#W>@%*dXHTpqZquM%D3!+J>gRgZD){U%tq^Cp(u~moiu?lQ)yAXQ z?w_ix@)70RBUq96^nr#hP z2wz-(wG%xdsM7uKy)H3Mu_r!sBO1iFO<~$OH;X(xeggASDCAYZ7;B-#LqjERh5WUW zS0!rIDbSZXZiC^l@MunIarG40L;07q`nBTn;Bj`LuuxGb7p~Fxy*hE1K1YwSf-)O4 zjzzVe3qHqQooxeEq*F8|(pmO_3XVCY?!rPNs$1f(<(b4nT1ZWc*6Thu#Nkiv6;mWf z)IKv5{Ayij0t<3~`7i&_zwGWy2m5gdS50J?TzZ|oD&k5d z$J(8=I>g1;X*Pxj%FE|=$u67ttKPNrH{(R)Uk zjqO7~{NAy+n$}@Ft$*c%dLg16#jQWyHs+{? z`=WexO_*P9YY%tfAfHs-q`vJ}vL53woPii2hDe}^6)+{yx_Xt9$K?v zeWf*f9^iWWdf^l}dd@zGmi80MdZyHer(wD7RVm_14R;^^t~$k0!whpiI_+3)Uh5Jb zKk@mkJc*m{t6s3*y&tTP{@QB>Jem&;b^id^1gz3CMnt-s-G232<$Uz3eKpx!{Z`n` zMbF#fTVbXwZQAQ=Z+EcFOs$4!e#bz-(W)XC9!!fQNFi3*eHvyn*_rCRe%uI0qF3LC zNR{j>s*AE9WbE=fM?41(_L`HTz8u!|bwQFJy*&gkNZ3&|m+y?i?_w)1>2#c;j&N9e zEr=Phzx27k?0XJ2?0)j=kB;D!KX`jlL#vLmpbYulN!BIxL>ZBP{e zup$>#NYd4wo67vz^0y6r`}@>y_uR;HM?X3LtFei~7?26nphnWYVzi*ElOEei* z;m4llxD7q^rtYa@uD!!-TTCC_{`E7C^MIU*aff|b3~H9UvhCVF;lecvE&YAQDO7Ca zhonfk-Rt!P=%`;55qy(UhlVo5x<|RT+{yRR`h;5A4x7zarS#c2AIrbXrna zGg_IN-yI^_$X^!>Si@XlB38^T?C=c)9_%mNY^0AbZ_P5dMtf>~<@s>F#>V^ze19}K z?e?s;ypDvllq+yRa2b>I$8VpOY6X8(s-<5;vxEWy|B%bvemBYw11!1<#M^@^*RYyT zdv^2^YW>EhUjUccG*RoxNx@e&aEZkiGeu4Ron)KhS*sYBF{s=GL=E=n^v=~VmV5BD%l(|U# z>Wdwhwe@G!78Td7#)BSMV{zuW7Hk!&tVfeQ+ zYcf>kp@gDPA+tgylp&k{f7bc-etY-Xn|hwL?)$og{bm^rU;9amLZ}2~I+ajIOlp>V zjJ5qq6RH`QUGBy0^ElKnRQ?%b$M)ZCF#1GrJB!`*ri+?k7mtX0Wr@rK@A|zyq0|Dt z_BT*{^S_G6)_cp>tXymRQO8X#4tu|pdiO^DNMw2wzC|%rJ1nd=f6ae-?uhy87ba*9 zg0f(3`GcA`-o7|hozrH>d$8M3i=b3=V3;u0i2skt>SBL0LH$h3n)%J? zIs8Mqns%xEI7VzW^9IcK-o^6lF%;ZYvD=U63(kj9t#|u7!S)D_FhTuHows?{d`Ol@ ze|#GGyY%azzzSA>#|Js4!dH8@?zRn8YfX)2-9SsVa)W3GU2domlk(cD);~}Z7&d58 zP`s_xy8O;!5BjX7;Wl?)ulc_Xjo({4jh|0B*owgk?c42n6_y;e!a@dkEByR|u({VU zIOKJ#CR441A+_ct4w$9*Df7p5?!d^6s(XZ7{PEG+eJVw(c^Fm-+9L$rj1y5CxanY;TM&=Ha^GC30EGb1DG9}#+qnA!FBy=xY#Ln~h8 zXWwK8rurWF*|)V&5bybYKSz|HG&_Y|VD;OL*JtVxvngK88GjCESDLLKQO{~1zZwinJ{rQ67CgV$!KSCsWzU;wWy9@9w00Yy;!J`b=c1 zj51GU>WJUp^d>yAQKtp^$0pQq%?>bs_O<}N>&UHb(*k|p3Uh6J#OiMU>-%+M-hsj% z#|qGqZMQ+AR7nN|G5;u+$A&mrZ4Yu$*Y?^DxA*p%QhlSxxAovg?KR}Uw`w{*`ZEVi zrK?=K(egT!Pm?QtM9Ezpkd3FoY-dDiPQ%tKXEJYOeg{Yn2RPU(axUw+gFB@ z-y*k6C#E@=Z#3mq%^OQirA%gr9EsBQMe*g^>oSgv4N?q*TislH$_x!_*=8U95a6zK zA_aMG^+oEszNAp5b0{y4U%sjTEoGwFHe;th%x!YtPH(NWuiffwyN@^Six`Y6wEaTy zKUD1+!Wgc z%PkwjiC+xpo!`4Q^kMCO&RTs+vn{u~9=3PP694^rfFzq0O1~}Ih%ZEqs`v=`nJok; z#w7K;r|_rI>ohZO;;qjcBO=bFjmLW(Fh80oYP(iXpB4paJeRL$8ta6ObAco}cj_b$ zQ0tFg_3X#!oro=6DUEI$a^d;j;by=2ejCbaPm$adz}(X1_uI|rwY8>yBp1}{Rz+yj zM{sW!-bam+{_F^qM~?^6Q1iSREb~M54P1v_><1ge`J`t!E7!nCP?l<{dk*~4SGu0x zxj%dr)})R&H5$Er6iQf4`75+4Nax;H{mY=0v@K7AGZodEGNQ@fUp0PsuDJI`c4+1Q zZUPPamp7W0hIvr1Q5Ih^feBkaQ-BI-5A4V4qgejE$5&6Zm#$yE03i3R+{~K~xj;5= z`n&>X1OL_j^UUBj5avfi^^;l}QUtuGCqFpPFo4eAg8Y%l!rN)NnyPNOkiXD_^bZsp zoPz=ti<%M={z%G?)$1@-a-2=hA$_@BCt9&L2rB8etlcS!|8zqCxW2h>B@oXe{M^oO zI+dl9ScRfCZD88_a~Z!osv>5G=rcF|WV0yu-@Ajz=h!196}B)~@#J}ba-u2X3h$lo zgFv||Z~fq(``3E|5yO^1 z;?}hyhd(BmbXu(?9#>EKZp7U!gNT*?g12DUAtKU?hEI~TwyM?fD!|Eb*oL!8o;0i-W@9qiLRo$5H>C7jtywU9dB zoT+1!#kPM0%gEBK4Wzi&vZWmWjy4Wzi*$kj=892C-Zu=qlzSW`iH`xf3^}_+u~KNi z@VkDEwyFR0AN%FDh)nTL#ZM6ET|VpMRvp9jbp$M?X_O9~W`A1=sV6PX%Km(+H@m%| z&BN9OV$HF1V7rfi+X44(9FV&En}}U4sP=1wbUHp4>aN@&)4f@&Qr9N2aKO^`mP@Ce z*LBeg1F?hk+vn_e#lw3KhAcImcDc`Af+KszUOAx-nz7xE+SPugxYcKs=M@&=PoEmp zr8@Ix7k&WxFuOOSB3+v6wyu1R=wIvaWXC_r|BhtjpiaOu$R;Q05y^Y_Y`{7E9!nX(H5aX^BcXUz~=&#T>b*9lreO z?M)>v`XhIx^*=_gooh<@!$9+|M zDot!(mD3F^7mVqd);6cR7ET4E);oATt+k<2Pbsc?~LRfFp!m=yPiVq0p- ze%&_7kBLq9D{Q}Mn3^fr&EmLA9TrDhoU*X=gMYgLMVF}eIdbYGyx7K?-Okp@G)K=G z-NWKTsMz%C<>kp%TBU=w-RSHG`RlX0%HY63b+Jf{|ML4MA{>wP@q*ZaJ5bx*@KFV= zOU?3ywDz4}eqQeC*1D=_%GWH>((3tDQ#k8va%FJeVAGm3N|I_vWXD z(E?=lUPbQPxIHwP^|t_|G=Q>GFpOaML~0PNh6r!onKaa#amn-gd)&Qvb*clD(D3^% ztRIC3mXSohGaVLM%*wBeeVSaL1PWK1_BmAO z_jrTZ5qv>dINzU`k2x8s za)y|WiPZE@D<03yK@&U9*47`gB|1gpR>BLlrf&&Z7?$(8qCBZBbsEn3MR{G6Wp!aC z{xN(r)grlQRGL$Axt@*=_MWbV zZginOYdyJT?sElf$Y@rtee+)|crl&)$LzoSS-=&@3VO~rr|WtapH-x zxV%C})X*b+{g2G9n4Pg57BVoy6XnJ_v-EKk>VKPx_6NbUh=zz$Jwjn>S{A!G^ zy->SZriHJ$*-uCS4z*wEkH;V=Vh^xk=P_}=t0dvFINRiLFT-!npn+r6`x{4bz`3a+ zIk*n{za#$4yy`h8tO{Qu9NPGI`UjFox>F*lt_fpdO-G0RU99r$dRavKY9HFK&!SYa zrD$Ux=Cf3;y>;%(DdY!R9CeQN`ojJBZ8>M~G|f81hJB5PpFn?YaOWKg;VcXcr8o3%&x=ZtEX zhdN%9^-*|wVmIPRnTy`~(1gwBo^IUrepG2MXVaaRXCDPB-4G<;ZgmwO)qNkDo!e$` zH}KodV%s0ju`9QDf`M2ge(iT*t5Rm~)6zTen)J3z>-uH(`|CT3peG7O%xbQGTHY?t zFf!-scpVB`y!z`mj~u_uUAv7m7ACveeRH9kY48dhY*T9uRVh1+F5f*&wI1$PaN_-B zRxET5!Xopeb){b?Mu*Axcw(^E*{?y0HBtz;l`i-2btVQc$c&%iTOgxJ^2%cuD{ELk z|H_P(zsAE^z)Px&7qa2FxjAbcPu9rQyZkn*pAfLL_tF8NjIaA#G-{;O>z2673HGN> z6^df!jjck>YlOe8$a{lQsEG=rrU*Q%4}JR-+Rdz7{wCzM0;zkFC32;z zpz zIxV1NAm=sYHh$e$bZ4hCr_crxbHPtq`r59Ctj6l*8y#Ue_`Ghf2B~hDofj<}a#~<# zRq+3SF@ye0V!*eNG~rsPkf%%C37^FeVsVPuPWq^y@3*AaJ=L@%XiqNe?s3~c-%iOv z!S~?irdEAb4zPkc#N|$~5A$Mq^5u-U0<;epqtsu|oc3|m`u4H;9~tNs=JsYaxZKjf zp+}jsJ!B?CVdRr=UH?&&6 zayFU&ezuiICO%E}cY~8dj(aqo(rMb5lvD^km(Fw2A|I;%A%pxm-G3&dPOw>Rc8~O= zo!4^fKAX(ypq$T!V1Q@Y##0VacW}ErI$|;2=gmk5KeA)iYakYk6p>a5(utYuZN)zGI-rNp;pJ-hth={X2X z&h%xK#e={3R<<81QY@wSo;s_+!yGriaY1SZ`74&HqyRv+CD>Vr_vmrUfsm>w4}{j$ zc7%{UI{3%qPq*px+G@h+&%9MrD9s#S3H#b#a&;%Edm&*X3%{&2Kn11db~pXMaj?Dy?|YF9hx_F($f#EP^nzkrn*G7R=(h*4aA5l7XE|+4^zzP#weK4+zm0Eg(vHshA^%O8y`kmKAd6q`_xQUbW z`#dz8Ill3WdN$L*mzVZr{2Z;8H?p>rkmiWY+5-ot^XE${l#5a>!$rt`EI$ilw-8GO z=Z`U;<(Vw4dVh8lEYwdy#8;b$6AQdAOzG z=pYBl5nVfoSad(tVlj3B};-a%8g3AUKux z_E(Q9&RLjH+-pA0vAF}wV7Euq7B*X~dpyGTqcL4`ZY%oDAW$HLtv~*o2Q(YgwX3U-`gF~FH#E*@)vwY-@qYrCn_xP*s z=eBIWjv8~8+wYH?t#%tjZux1RRq}kV)J^jla;fEW4)>{$w}7W$Q8m(Wx3V>0FU~t#PoFatSt*AaT>Qb*yaT^ ze0F;fH@UEoQz3-6@0TUvs4VD>j=0V*nBLt-v%ns=Pp+Z18dbi7AAZ#oFU%Z(Lf%@i zBJANH+~@%lbX^Ir7zyo?!(_2ZeGtG+mBoGFL-*PUg64_)4VW&Ci(@xG7O*KS|LLJ- z>%Y&%kDVA(_OEI4IjfUEqvp~-w?{CN3J{uZV(vwSY zc7H%{`$<+RyK$4Px4&c-97k1G zZvMTnlLz8>5bp-2UvbdwEPB~rdl67|C)T@#Ay62Vqlhb03)(3av4E~jBsg=s6Q0NX zE`J2_-FHBD>Fg6-=}990&>}wdPU}BR{$I}e6-x+NIIS%1_<3{6bye*N&BxDnNb@-u z+;`B8R!(p9VmSh0+~>GaZPuxh!`ms-O*V61Ph+EOTEQkGR{Su&#B=FLnvmf@lj(S!hSlZFoD@Jg0La{$;4WTYE z4@l}(ya^ULdcC+Z9UaAbH9Hp^Ha9jWh%~z^4xI#s!Rt=aWU1}Qe@x3&n%5m$etk?Q=l*Qt>Y;ec>fta{X>mHep_7p=v1AgI%OW?mM;adg z{x(;1fGF)tKVQ21<`U9r^B7*)HgW~~{GMf%r4jWdqST>5xZ72pbZfB#z+l7o6Ikb- z?GtVth*IlSuL{>wKsVP>^L@H1e*>HB6aKiSmXFna^Uj#X_21cZnu>I~xb)VE)71jb zs`H;^MkR<9%x>jxd}Yw(YX-&i`} zmT6O?Y8JTKMRopm-EIlyx3%el8D5J3j#j6Bg;k91>5vCO#k#3~XJqswQ|BVM!}*`} zRN}w;$GLI?;ifbPx)N!?omzD&e1$M_*NeY;>*dp##k(yS%u>=mDoy-q@%g?C=C>=} zER0!gr3&zpv%k+$G7&ERQFRGp!#sD#sin`~oP9tfN{itN^B+4xZO4-(+D$bS(!Ws! zCq~)6azui?P|omI4n$n~4F&3~jz-dKK@13%eWCsOwNBjrKipT?J>i{Y8F z!A^D-@~dy*XjZ7do|X&R5nVd?FtO@=yoZ~VI)ls&Ayd&TPI8|>EG;^Z!;Z78E|sfB z9+<@Q@tnP#KWL?EXM;z#UH@x6TT97r45iuhu_+-Z`?=~Vxy}n)$*eJww~LY(RcFtp zjX)atxR4+PQbz1czkw^@W^94~&0~3Tx*Be!K{QLcOPjurBR4H-g@KP!S%Mj5-nwG?t;jCUC#(yw#Of7>1uVAA3I3+$!~o8$@RO)4`is)|KEXMswD&KUQ_ek zwbVs)JO>{PdNd+d>i%A09-{dS51G<;JH5>rj_d(QtHGYUn|>S7rq?W?-s@~Yh*@Z( z?<4ZMi_uGqxLzj&A^HyGSb*fFt;fr+w%I0b7Txb)SHJF!*L7F_PD{&}>Xg~W-^-OX z+L?v{dX3uMzt=2?=>_95YmG`xZRp;WU-$g*e$=o8r>hL{>6o79gr zcAsn27~Q;Ql_G>hPto66n?G}obX&on`Z&mSZY5RQ=s($1kjc+Du#p{)Th!2PRXWZ- zuRukmaP(F(9nO;TV}i`Sa})V_7glCYbJF>gt3~}yeyu$aJ@zY@5QR@sq@!{vK1ve4 z_;XK94uVMXXu7z;i~zf;wd}Ef z+Wa}`dx5wE$6_r{QcT5yH2Z$J_wsFMpE&D+_+rPCqu}MMQj>Ll0LBoJP_d!GTLzmG;PAaQ@aaXQ0c(LZ>meqT>t(~T8 z=Ikv%WlP^~YLVC&`?Hug5}0<;x(FPCAm$$2k@N5u>dAPJI`==_=JSQt znY>AlPe8&WlSxnRo7~xPi{y74BBkUPGds0}6f)sV`K{^w?s?vUcoZKCtHa?5g?ZDG zm}7C%_B{bsN7(9w5GYJ)>u8~})#zehZN%N}`?)&7ZJ&X!YP-~!0 znWZUiIfZK7EMMuBwU|6CwDW7WJIa-n`!{;df6iB9YqX7bo@2e&o80;JJ{bs9yYe=B zLo0BL2eTD>@~sFzM|_@J_J}zd{3beJ(6OpzU^L!5v2XccdL7pdzk>Jb!m3S3?Z@*y z{~&9M<_x{RJT)=;&e$&k2Y8{J-+N+Y5>#nzz}aD4NN0dFvCd64_jjEoyYuGB72iD} zF?aPH-1563Qrx`fit{$x?#KLywYXW2DyJO!u4Qz9B5|kZRn5}TD0NE2FMmedrE4yn-TZJe*Nw`SFJvbTnxsF5M@Zb z!hC5-<*@h1@1O*t_6PaX>|p|VGD%MU|sn~B$yJ=!iIXyWQua@49@I%)N zl5e#$PKsRBRhQ|a^akmBDROp$>SIL?xn1N`$xAbEPRGu0S8sIT2&vO;1-$NGeYfhL zJ&l@;*jJ&LyLVof*GJv6D(O~#?1zJlf$FM*zjc2s4tMg{_+6i?LNvT;6lB`5BBrKt z*CuECXscn1hSWYm5M#z)lseP8Z2#uhuzMX;NJribfAOzR^`y1j4>Ab6`-NLMnLPsS zWn-dZAR2!vm5MEI^t-FqF0k@Y;bk`@olO+Qyex{P1(O`B^|Q2?&9+nHa}3_gp0|)1 z)GXJMewBQhAG|lzZkKmJ)0O4b(x=&@8a%fEMufKcxW#?Hi4wK6G3agybkpy=385Lz zc4fTZQGNoMn#N|cbeXAH$Qd9^xOHTMrPQlvbAd2uv_-X&;izW$!RgabqUh?CzrNE2 zw8esdPbGn+6oikwX=6OXEacND#p$m5?t5)2$G+U+cWts(UNcrpRA2QdJ9nM5PP^Cd zKASIBX1V*abC8d{WmLaSsSXr|DL27q&9z?}k0GrPW<@wDLq2mRIYhiKr|~rVj^&)i zyz1InUkqV5Xnki1UiJ<>Q(WgyLh14ZgkNhWfnv($&0+kIr;R%T71H-Il3ipvB#6K9 zGyeR!M_-fuHg%24@Gz{_%I)rW{~T(Gugrn89t$m{ z?5dgE$`0qjy1vd;snJ>`(DC*UdnUurOgwq2eldz>(AELH8Mf}ZEvoh(yMc1bmo@w{ z!eR4Ttu?M}y%f>;wK24@3&ucAyCS?1s6EdduhC4`!F`Y_YZx|=UYY00-8}wxZA=SG zRLteCqpFz6G%N3szg(>$bsi{Wnscpot!$vQc_{Um*6rdZ)@a}+uVi`~cjf1F@^f1s zRS9S(yyLB!c@5{p_h2)5SKUyjUNlC*NDZC3EB|gB4lvHf-(_Mtne?+te&hb9kemIt zQY@7P(h4M)aln%W(3rKc5;EU9+gn~|fBEoD0idVBpSHmU>+;-OaigCPWv@k>g%{k= z@U&)IM_S)&KkNO_&&3QXOeH84F1gQkf7(~zC+dY8v+-QL(mZ$Fx39_~EEYV!&PwJu zpAI_M&ZM{R&gz)+nBi0+vUz*_G4c+cj|HKdR$*Nt7yv^tgh&B3?2am zA1mck7r8(8c&F8*_9vjSJQi#a`KW&9HmeC;kqapMd7CBQpsQl33cK1|NnhVtY$Ulj zY#_GLpMD=!8e^@fwJmiqpOVbUn@{1?I;*YTw`Z+%9WAgU@^?3aUiCY;VOh4@(m5!*$Dg!jBDs{5Vklkib z0g#2&Vhd%wcH_GK#q?-{n&~1Rx--cjB8w zDGyZD{iTV_=#elVmlAEYo2t?+)jEe^R^ALd*fz>J$=J;OEr2Z7plF2TCgjAM2cn2Y?dqvkn5NQe|I{IvFEjOTahw z{#?jPmdv&`t+5L@%)Fy(Tq%ADl$$`@fC3mIoUT zUMe)c1cDv_TsY_F6(+H5@&ul+ZgI7(RQQ@SLhXvX3_l;Por}b^m2$n?Elttk*8$w2 zg`e+Ux<%e^w9Oo$&hp)DH^$kX403hGAAckEgGHckE!)#zkzSZvm-&=UKTYq^#`+Ot z*fY=9ciZ8-$a;#~^rFg3{K#=o=I4QI5nmPy^3Vx8YqlBfp|w|U-#UR|8P!+Xb$nWun(&ohoDHSTel|L%YZ39UDiOM3BVlKJ^c{c!) zRW11dqy#TE?>D>4u<_1wT?$>K50_6``;JN9m;;9ir`0w!#BnutUeFiV>PkYM7VWB9 z_?*Dpk%!(KVCOCn^(E#PMw~D9F){I4yWED*%EH`!6W*uy4w?8|jro$UHGrNYTN?M(dQXDb90&&{q*w%OPDYPyHg#h*(7+D&OduwcmD=Sy5WJ0s7G^^?A z;duc5V=>U5e}Phbo{E{kP2gwDw47Hv)PHyn>VzmqnsA6qz=+*cQpssaFZ)OI;`O_+ z;q+*o9bT_C%nEv>v!HN$jv=D9Tcg@ii9}=3EB1QVHH8t+S$;qO_*OS|Pl1L_4|v*aZ<$q@@1MeFZIi~HVpIA<95+Id{`EBTkFvDKQ$?Q;EjbL#;W z=e8KbL?}x5TJIx*TUh|t#r$2v`U5Ha8PnVH%%#^o6i1+pEX`I!eI+j>#&TMGkT36s zsXzT<{_Pt=CuTe;E_mzlpm&qMR{qPe z$$-5BbNAet3m$MFzUw976LVPhJ)WD^$m!i)jrm}wSGr7GUfzR^^OUa3%qRT6hl)%Z zd^f^vU^>oa?z=l50IZ6#Puls&QgH593ucyOG=NY0TuZVf#C?x&y;R;d98jjJXnQzz znS*Or1a4c}U)V@~ZNokm=>yjsl^pT>GLXA*O|yU!Na{r-=s8Eqed zxi1K68|NH1{vF8?!G9oF&>kUUxk{8%sL#KzpSoMFKYOfsh<$3j@w%FH7=CJyUzstx zv~}3@*eCKQ6**E2`)Q;WZ!%Raed{G;1(oa$4gcA|`hxOM*9NP#=O`6WkN0+hDi#=? zziUSZBV*%GBdYxyJG4gihf#K{#jn}tbd{)+W>+d4z@c>6`v?aXr*fyUE3^O?`Xu_! z8m-se{~r${RjqaIZ-(!glu`uI)As3DuRabzGDrxvq+vOvU?m-oE9=GkdwbK?5Y#1M zxt0+pR;t^UbqYuA+(d2o)wkN0%Xwh}A`^B$IrV#=%cUp{XLfGeo8_maU8A_XdV`@P zzlQ~}_G*p6&057QC2oh}V&2bJ3likB3x^Uro2+VCWZ>0hoFO)ne;%!K=Z{ zm(%pij~Ep8IB#JYt?zRDFUGaU$opH=XQww)KP^HY=~jP16rEXl#Gb?E;0ji~pVf!9$Y38=yEWFa09bV{!fM&P8GEhN#QNuNRS`*; zi>B@N;BHO^!}bA&+uKHp9mHNLsDbSrLC9<#nm8bG=GMD7+DLmO$UxOT-209D`!s@4 z=*nB6(^-?rZEi}qvZk<8eh_R6e8{!pIwDV}tMMu%xqY6=_b}eCXT?_joZBGM-P-CS_c~t1bZNUS67##oP9EYWTKZYobu|yFgvT9idKL+_bec zYI`6o7bf_oZS-GDxKPK5m4TvTeI2tEB0s!l4-F~K;rF;3Bep=7DoEpc6wfeK17!q% zZ%Aesdc#xHhi>&8G~|;C7E$2qz5^*v@U%VBZ4nS2d0stOh9ZdUiE zRu#9ob*NdBhtza z7wvZ;Iw@E6dj&^|Biufs{y0`wJ6+W^*@m3uk{)BmA*6QWK zp_G^T;g7mz>!%=gS_kg8uWUA>+{)Qpui_nX=f@v?nA6;#c^z2g^UZ&0QC}67 z)wNPws*6YYn6#M#zzw#aR9fq80J5>CX|$gQ>I`8iv1E;()van2_sz*{(zv3C&7t%d z64i~c$j&taU=JEVR2 zn};v2#LwVGf4&5NHMlV6)W3oNMsEh!ndw!&9?|D(657R#22g^q)WxZ=5u|E4_8+Mx zE5lL%I||ytIt5Ut=n!D%jP{_9!ciF%iCTuuMm zV#ngUx87lNuE6UnM21BqCmhXgOXI+kxogih>@BQ^K*rCad&aeE>Un$^Hi>Ib&EnaW z%bzA#*fG-6s{a?MTQdxHdl)C>x5ZIEsm@+c84{Iy%icpqDz+%K4_%YnLc+E@gu~V0 z6AV#(T5pzDpkqV*QD^&yIw)_{r3i`shEp~>Edjm17wGG8rNN5va6>cB`aSQ%Cv)C^ z{!S*~Xw`My{M@X3lRa0^D@#}V*F3!(2drKVoCsdNuJ<&FP}`dv@k^^ZQwJ>$Wmb7}Lt9L2Yw{+ZSLe72YibDBNHYg8I@Eo?WF0EAGLo5qBE zH}VY=h|m%`i;S&W6+mNPTpYtiaz_Z8Duh67xXJAFt!k0*S-Z~TT*z~kuh_#V3Eqap!v0jw#eC|Hym)&yyHvA2) z&`@7&DU4g#3$OAq8#VFaj=QM4nyA^B19U;@{sl8ACNbAbF5?PoLU~2&5`XoQ!H~So zE4KRDci+;ag|3YE`RqdH@6-ZZYV0Rf|jCzIzQdZZoV3p`f=JM`Ij zY;HVZ{n8xgt6WggzIuo{$tu1W#mM9Rz<`>t{?ozle)wsGxTGPIWzR?L@1zkAzRM%% zw&u}K=~vemTZv!@TTPY1dbLRLk`!1|r&f_G_-u6)H+-HxT)a*}uh*Pf?UK7s*QNB8 zLDW4y;{G)qhkOUD!f-~PSlEohK2G&rPURm6Z##iCZd>T%0d?03-|NhB$aqy_@=!4F zV&GaA#oj0}F6G{}N6%9OR{V|!Q;n1$y#vlT%Gwgp`}_gCoC#&z83DgwZiv4?XPEF`m*Ov`kjnH)V9B> zv*GSfI4vtT$l_+c{1FDwdcxG^T>TTWT$9sGIgQd&f?220fJ>D{OZ`r9#Qwk}5khiL zU4OKm(^9@lPk8S~-^Ql{{ReQb0f0OJf_iKwer>0P*0$U)h0e@^QQN-We;8QX?DdvF zZSA9JwX%clGN~a$V^|iZW#-P&3CKqwV6ol0;j=g5v;OtJwI!USG~WaA@XZZ*}X*-(0CFP4}&4Cc=VuRMNP=WxHwIt0lPH6O%^o z(EKyO>hf^P$n%6gV`#433i76V`g^9F!rof6%k7@`+^oumn=HLMBd8Q?+5O{t@Te8G zhOL^7uFCGbbY(VzPJFh@HIG4Zi>VR4)mzwyv$;QKZm)3Fa0U{sb?=Y$6-Ei(#iv@@ z>$0srMWfCuNxmg^#-f$r4zN?56@kV0XR5+vyc?7Fb1B2Qt-ahWLt95pBgJW*c)!Xu9IF5RPFErpRwD0(Yx*SPP zXS*FXbC+er)yiYZ@LNs#H3o{KwZ9aKI%&T@PzqOTI@vOCn2D{Xmyxd5n*fWC=AU`* zV88H^S>*@;WL8S_9*OS8Zs8kob+4x(S=phxC|MT876ezW%$z;pS-pCE${!h7EV1Q4 zMYboKI!|HHHU%<=F{`fWCadrd_!SVCjOBBiaw^oY(lY9DL0{hjaOK8J=zcr%p}l_) zsz3oyK|OVBau#;QRHqB%fdZBV!FK`~n*yJ%p~`b1>p#O^Xn*hbGB`ZRDKrepK1t7k zTLCd*KN*OP*FiR@^LKSnsbc#w2s^qZ^{UUQ3G}4$hsv_2r+hMW@61;HoXIU;qtiLO z#2M<1K2=Bi4y)(-(hY=O19*yO%%!8_SULRBCZmQ)Lnjo<8Q;=Yl+>K(4wGC@!djQc z7fmJRr`{(%{Zjd^myUCr2Fu ze;;Aj8)NS-AE_Ct?gzncpZTd%cnqsW-*nlYHu2snj@B>)mxkJG_#67}R;lA3Y#8%} z({;@_ivaHEblY>xdL;{#;dt2_q%k#Dv{+1<*MdlC!tyS?sCf?zwrAYnIhGsAk5zl^ zn>RUW?&GsIDVY1ixrSf1`gom=?AbYJIt*O(@1eXX*WBFYxF6dky)uU@)&*pW{NLr$ zP|!l@yJ(r>_WM4#hhRz7?x&Y=V6sJ4y_l5_sELZIf+L)u4VHq`xQFP#IQXYt-2z3r zVavbTx|x*kqgAi_ERUjme+C7q7gM8V{{Cs4cGFY^GX0=*AzOJE!vq_^C{@4A+>o{n z90FC%q`B^G!>FRAXC|N7e@FO+TJ?9M2>jX?H>a@V>2)kXP{uUnUG z%!#{L@x#rodI2Ork+Fv9{#k6eXqdZi_M>hvHJ4`)m46riCCO+i0vK~y*+0kkw2mL3 zVU5l?q>*WGhU zpWkA=Y%*8km-BMUNrdF`5RERwDQ`cGzfA{R5Xe@E4!xUIA?|Vh-CJPs_&%%GKgWB! z_bor+`D4DSl|$)O59fb%;?h_(e44xaZy=kGUYIxNlzWp)vr}UPF!%tKknb?F@A$6N z+x9SL=#{9ep=poH)@Y|vg-71Miq5TFH8u*v=ik4mNc)6r(oUjKi6SMmQxa)6|Nl4E z={i`~TFvI`HOBMYcY|n-mkXL2+^!4#IVer@oVNPg1;8=+l;oXN&#hrKTR3+j?v5hl zpG-Q*GBLK_pvfaTllNH7Nz%b{>z!8a@jU-m zfW;@tPc#lG6PH8jcbu*Ny4`*>TEb`Ia-aL^sFrX(d)7wn*@s`v`I(_Ts=~H*T?KSL zZu|*YXS(s$X?Fx#sV5I<9)+z=t!B*M$Lqs_j<5(~X$RDOrDVDBBpe=Z#KD zTSI-N2&MwKZd7Z*Rj^Ol{63${!%mTT449hJc-HdNpW4WK4WUC_ikBuB?h_9@66G#g zOvy@+?*^jOoZXr*%$69%gGhz^=dMZy31`!kFD=2{|I_&A`ri z9bj>)J^E%9&=bEgbo&~J>-87AY7HqvubkK3*T6;SJY~K%{EPH-7}xo>Dh>OG+uycl z^!5+PrJe=hf_cM-eILs5=`(KDgKJ*}4RjLBzAEv1N!V_atR|Va0x02V{5{*fn7)to zY|eVUu3rMJQFa4%hgScT2Eq#m!!PuDD=rjn5W5nU(?Vy~XW^uuctF}~ zyCkN<2}c+)r4-hH)!b9LHvQ-3*mJlCJnw@|yV`(=Pw(%+ z(~w}8IpTRXlZI(*hmNA97vaq(FB+_P7rQ~fovuQMKxd%!h9?fST~dW~i-Kq18l-cJ z9z25fJu(rBh-Z9r+-D!yrRHI^()O#UVB!9aon_c$t0o;f;WGElO>DGQjV^NuaD>s} zo3Ad5?ZBuTi0{K7{k*s>B?rhi(*Zb&)$uP!etM_tvE)Y zP+A|1#uVLKvXmpEZ5Co!A7j+7lTLOqZiY5-a0H8 zPyaagrxz>DlQ&oh+d`~-KQi&KLt~2Lm?+_bw_ zoo9cNy!qe_7DI>mwMjChR2;`hb^ExE`Ahb&?Up_`OxInJKf{F-+f#p(jxqTyR2_|T zS!)R-t3e8c9*2_am#3pm;Ik{Zbx8}iNbGI70bKf`7k+kc9 zZMjhTC57A5Y)yfKZc)|cyvpwjGuu_H-k18KdwnM=f<2|Z zVS6+OPgCXHT7hnz^8<*z@x|BTiPOY2}0 z`&$6j|1gF~z)AF6Unt7$!}rQvj#}=tZaj2f2v2SK*C4A$v~shdnT$9nVJOOs@{ecWw-53>ckn!mcMK>Ml*- z{20uEcqK4lMP~=MRtZ<1)swo;H)Y6HFj9HWvDA)Mqjo6VfD-u$W6fIU{DXn?t_<+A}iYo}jy7xY`~A2~g)Lo82UcW1%3g=Njm z{~hOKbt6noyHZ`PKb0~dB#~LEe3wgfQ^H!;CepBO zl@^_l9;Po(E=Jbh=cju!&fqRAD7TiG)FnFCw8z*Tr~?W8mz_XK(*bf;u%6_AJGBO$ zI`vX<`J*wMxE+!5H|Cm4yJQA4>w>Kq-JcHX>+qv>%tLtEa;qC|bW|XMVa9Z8RKw;LmJaPe zqAR(WF8jXmM;%K=ET7Y{K#=74KrhE}o!K@QDW;TG+frlIrHC~5_nV9%4v_ToiyQKX zKi%4I5z|Z4{Jq@Gluy=L;E0iU&LP4>6NvY`6KdAt+fVI>HM%pJ99V`Vrf z4YC99@Lbt~%k`bd^toSrhT^D!->5gzo?SYFPK>*0NHe%ccr^3?8_emm zE@!7>F@LPxt|yy8iDC2afo61_YZr@uLXqCq&DWn}YRip~C#+pg_wb#z8M&s=>Y!)h zCj(c*V1|QcDVSHNAJJy-_?Th2l{&#juRRiVER+YnyZF1~{Kh1;QI_97HsfSQiHGOb zAAF8IRj7H`Q*1K#)qSS`8Y)Q~p88gyzm)G05#YoX!6|UHulFl+UQ=El zeFKq(!gG7`t)AR6{q|#c8;*u%Sa^;jz`SXVG37_phKDIwp^)Z};nD7@x0UkO71}&$!S;LT zk)3z<70<2@zJd%#~`{g_c#M}~zVVbhf z^vuaw{g9b-)Kg?Zc*xLf<7$g;7 z^4J`9gFfBFEO;DPbC>Vi%fUUPJ1{ouiUQhNWlq1Y5)NApVogcJL;JQMf9rROq1;NV z7kICHfaRywPx#*;zk+*ug83(qmG*NfVAnZnm-sa~cbsDVj;@r?W~McmE@#UG9*mR` z2U(9fnoG2Dm}kB$5*NS9?(huo`MX^5flI*e=_e4&smyEcnJmBg^w#&KQHo#+E^c`j zda*AWEGviG^pwBAA=ESqlbJgcd8Qe@INJN&zv#Sff@&KAWudfrhoGW|tH!NiSQW%X zZL+buSD$LhHmm=7MspO#9BTdg>gFKBZRf3(Q=&(93j5T^l*xKRA4$Zg$fMTK$pp3% z`}yUi*4?Ocr(UIP{?h?S%UfAAs0&4?r)g?c^S$$HxO&vTO40e;8j`y6>U^u>8M)8l z@&4`x`8=d&cJ)!8Ug-0kKpkPvq0}2|u3p`ouf}ZGzcpfbjlGBpU_KhF4Uf#6rk2S< zr?R=dzN~qleu+^~T_jFGoq&BdB=V#5=c?j-Mi1MaMhbIbPJ;f>?NY}}j9OjP^Q0+$0x`fN4Sby z2mMUrZF02Lnz);kX*M5R67IB+^0-o92ryXY1S)^ppI^>+Jvs8!5Wf!R79l#_ay~WG z`X%{Z8fiDvpX(QOtM~tCq096=WismKL1bvvtWG@41$+1BD(>!xLEE+RQ@zslO{=$V zH*ZV7xYE0E+Y79{mQ|EqArA7CLcDmK*A6~z<|{aJv4EEYx#DnXp>|06oY~R3%bQTA%VkyGh@!NOA!x7JQ{02L zyxP(y%(Np@M{<38E~9}6xHYm|GS*{I?$+GeqF1O~2>MBl{@!2pB1v`qu6CuB!w75X z8S^7eRr;o%2b4=E`x{QuS9$9ksM(7cTqk}Hoj|>nZl=F}q0t$&cP`WEeuCEF2mXRW zZVJ%SPj0mdNGu zDeZiM%)-Y9n_>L(S-Ivp(7Dtp-?YRYRK+Hx$4+d!(v)HJ3zMu$-CLT7`-Pr)V_{Go z^qI*501AsTAOl|UP`u`6-b_;CjmFHFxx8QeK~kVpr`v4;xg0-(@<-n6FN@2NNo!GT z>AJdK?l6Te2kAYc7vt0JDocP-ok?hApZD!7Ebz>(-Lu1QxhFJh1A$1u2mZ2Iu0F*= z`j_qFB3Y4I=;)bF<4M4Z0nU=nn6O|y?;Iak%CdpV&YNA7eC;-qcAUL z2#1-gyLlFzcIjkRvCQWUT8`1M+bVTCkbizJ_3V8PRX7D}TK9NK8y9AExy}%!wl;~$ zv4uR{vpIe&kJT=!GTUvioMG87SqNqeC}o%HRK})ry=RoHWt>^;&+CNLx0}Y@=vEmo zS$*je@tON;_N7li)-;M%xN;}>D+w?VDxihW_15a;9_X5YIWWZ&#&10WNWSsGcZ0^E zHD|JH3)zq*E>~a6*6HIv)qH7oyY98tuJk=f+{nR^^x87Tj>V%M%4F}sc};TtT4VLu zPFP=Y5*Qnl)P?5u!fZQCNPOn@{}Gj!D^us{MW^h#1CERvL{@iQ1-=^a(7< zZgF)rM;GV2e+_59x97Cu)hhQ;MglZ#PbiInj9^QFEPbjx3+VLic)ecI&BCD|$EboD z-JPOT)!K7KNV2u7T_m@k^hYrDLt^1P_dLQ~pOMLaI9dPh(W$!QGNv85d7q`t_dc=E za+(v!CY`~yr-;Cq&=HxQq)cX~bD_VIr~LJ~eEwW23v%bNS~!WLCoteze&f*V7R(lJ z#+0ryg1H(spEqj4%fGf1%~3$Zryth?_WS8It&Dsa&Y6$%}kk-+|B&rTclI zxS7{(58`*hH`cQBhTopde+}R5iBS2fk@m73o()Fu8nOK`=KXj45FV~=_I7=O%=4=s zLQgJ-Z|MRLlF}Xl+W7Pi$88#pJ}c184msK>-WDB`!FB@PvuF)C-DCJ^H+_q?Rs*kd5iLTH}33L-vOgPE_EOR z*uPOhtL1`Ii-Ug_zzOH~?fPUtW*-t#Xm-~5s?*r+m(}RPv_5egXZXG}s*MZnZtid3 zl#^nKqHEclQ{<++Ea)DUot`gt7#9j<-e^lVlD^~%ANPRLK#vS9+jT3&Zg)^zml=Ch zIFaxa_r#rw=nX{+YD{Q3Xf@FogUDlFG2CSDbqZL&KaoThZYLzIs%Vt9dfvbu){X z@82sg$JLx8w6*5`iixMD43Z+zT8`VgH{q8-1cn7fc5d|iDu*<95Wov~HZQ(Vc0VaR zE3Q+1b-)I~dk&!84gBd?Cd&+_uGJkQ`Fbqp#r6T(fuvw+-xrM~QW^S6(z*fM`6gB^ z@v|88S52m`mgWMNQ#Oxr6C7A#R2BLg4FzwDYmFYlwe$IC{l@z7xW<~#q9r`xCrVnQq50^Ar`5Y~$wc_xN}-QO1ZoaK%>nAJw1GSHfAt4uha;%BiN>%w+^=Yd+<6_LyOYNglrUwx{O z*zi=Rnck>{P>uDpDl41HOWC^T#V@DzTf+3PuS??o z(ll=voW7O0h{AUS3|M{ow8_`hAKXMqtXJsl#NMGe&qc?Avbs*@RQ>HFuFS8x9XR2d z9={rX)asPKYky>nUy;wa?>bs|zgGSIbJcx~?r~`L4gYj|>ezGF7XI)}e^UO_+;=pM zDQq^%7wsZRqkCG5_Z_e`Z#F%%e`u66bAQLDN$j7PU{={*WTQ5uVDl>H_Re=jr4NeL zQuBVTZIk--2TYDyv(#u%gTIzrc?Rqrwk{)T_08prxz(TY908qX_ac4)^v3QpS}EVD z+m6}p9^2E>^h}7unhAuLST9S<))lwrs}>sDMell~cK}40hAbos%ERYemF*4q;5X5J z;(QOz>Mb2N)h}Z=?fy=^rC5L5|ESICeI`D(jWnuRtz#s!n}csR*^@aMmHGbmK=dR_ zsujlQBp4G#sMBw(3LFA}#A0Vegcwsf)jeJ`^NmIAfeXiUD4kW0WpckEh>0qLEufZI z;#Y$bTA&JjSY*-trFE$*&aEop=3CL1*u9lps7{ZsU`>E5=No=u=3YnnF|u9jD%(H+M%z9jCd zt>vWf5J-<&K!3JY>}Uji`_}Jr9y90hZ5(wThcG#h=Xt_bbPLwF&G(k~XIl6yVWw3F z7QLzn1)v9U?)@kHRu^zax_b~scjU`?FCrR3t$xLZ8ZVs*IJ3rnHtz8&bIiz0O7!32 z_gZjzNn#v{)1-qR8?6d4yPc{KJrh8)P##x*$BJsM^>txX{HZ$B0JJHn=qgA+ja4o< z1HGSp?ruBUX-(GwGB|>|BWYD#2q6}xQPCQj*710{mftT7axi&$Z9rT8^`{d3paOqe zMVE*iI538J%l^`K{ZzaSW&?j&Bs^Lkbtfn2P&}S5B(Bt5<@c?WEBv$PLIX-wJHruv zX_-0|)YkR184L~i!b$grQYn+D%1#Cv9YXrYFyUST!LHrP$1vhkhQqo5V#{>ZJb zcoXG2%d=|Qee8psgoD9%J@5V50!W?QADd9}%y?}k{dxc&C3t9Gc@>b25(fJ%?h_^; z>8V#9*}U&{T#fEo+jee~_4o;oDfR6rpV=@t_75}(*00`ipq8pY6FgAl>4G`H;2f}f z8+0b8i88sC34iOz9q})$&TDFiu!>JQKn=T=&+e}5(wOh5;-JXsDENAYs2#vz`C7Li z$oFPmzK`U`GqXjaBv4vg=(jW+&Cqf-UEyS_JY<9U5}del6E?bnbLxp;t@WYZ5HorqW8e`EJ#+JHcwb zh?B{}sg?`)T;29s=jCjzETFXj&Y)766BvjKpwDBs$zRT`%5hvyKVYvWH_OxZdk1F{ z#=Ow6MZ;S>HuUCV+k7_X%W-4KqO5u0&NRts4G7nN2}YpArH@4x#~%NTY3=?R+7G+Y z-a@JGF#ux3w6Ixqw8)b=P~U!6mA;Pj-@)m4np5NjK^E-+;3pOmQuiyXJdE}lh25(l zQOM~I8*LOM&)wuw*Tej}{F*4%#VQT${KFoj9a*nWQbZeK6Y{yB^u+>rNj~(i@eplH z4u@_*TXj4NtEB*34HryotO|^dlnM|3R=>ML$j--Z-CYZVml#j9KC+bPPOWtbBm?Z5 zFzudZYsk!#;zh^OoC*nXgu6l8wNlK5Ee)-X$_v^@}m}f;7`ny*caT_OvBl5&= z4?M&6{Mar*1Akh3jcJ#%3;D0C>nHMsL_BdvXo^9M_y+EHzN>Hd0auTUayEUGUa9xK z-#@k?AN$F5FzG$g=GWQ{n%#-6Orl)%+IiP6m$auHHtQ)w31i>J!CvTeHN(u=wMId_ z!f_|JN{yqn)TSrrd|H~InAzA_^j}f!2YcEwk#a_>aVWVmO--oTY0G7VbJu70(;C9 z?#048Cgyn$lh=b*B(yyYC>36bV>22>dUV>5VVG$(W`FN?((IQvHatdPbWz%VI-CMn z)1Lo>jn(ZJbx6bWH|J>UqRz1|jH~5)myGrUWq1s?n?j{MpS&hlsT@nVS_DFHG43y0 zO8#2NW&PT4@I}f$hIm2p^a>LTg0CLirDhlJ<-`YQ%C~T22W0(V#l9CV!m)2Cy<$ry zx!IL!>RdANm#48KdZiWeMkM?1!0W4Mvufw6+EKpkODeSUhnCCsysYq%*w4|AkJ5cs z-Qan~h-O<5s731%v_tFZro9enC->e1M$#2eF+0n@E2EIf&QAANF0jcXLoEop0-x$U z%FP~-0tGo}r!c^t+IYu>#8}M<{bpy`!^3Zs7%@Qr1ORnj$~S9wZ#o6M&T{>)Fn6YT z@IUyr?{BiLSK3$m)53b!HYZ;$&=j11>>P+S*41xodF+#xtfb5`$%Ee-Y1RJ1khx-Z zU>tNx!D*Y-XS0-f_3G~gZ4fx}dEzg5f`m*|1^UY01~NsAzrVCjbrqE!hfxL1M>Qk0 zv*G&>j>F?myUM1HcT3_spPDFXH~fO{v9{v zt!^Q%IIKPgh|?0+h*WyId!^zoi`x^X4bGIM z%oL(3Weux_;G@6iwvHZ_?`(bD3h5&pO7p*(n6^nRq&vA6$b6v+`0m7g$mgDenLYyh zDqZJU3~}p0RlHKBjg*|z6nhJMN7+m%wsAovO{p+NRoOnUW|4tvY^iu`nf7(5Ka#h4 z>I=)eXZU9ZCT4OvoGddyOdr)69Dg>Ts-^VbRjka^EH(j~8~kcKv$!IZNxObn{Ip+9go^uAU(^{yCD_O`Q~loMHG}YD?GjcVW`iJB(le zd|J4Aby}*QY9QkE=Xz-GBX_S|fcsU%OczwFS1sL<70*L&$Y|Z|Y4n}m&SbwueyE+q zIMa&q7%jF(fZ;p#x@-o)s2^|f;hgP2v8vIG5cT-;4*qIq`&uD5+&bQ@7`Ej%)!lqY zU_g?o!=Ru}d&5)jHcC&QaR1qnlGx}#fUI47@uzDrOBN1ixOq|kr zKi}N<44jDpJ!^Y;r@GBM(6TBncdVP#h;OSkJQAHJn!0zILB6XlIr_UE_f~hWGZ3B% zxHuCUyQJp(88fLxVL^tiLZuZQLeT-6-EiE6??)}^uDTR z;iukwh{@pD>BWPdv8U`5K=2d6VyzC@u^u5k?<<>`3&{CeyGrCL0#_G;xBD&hrjyHH z+Rr9W9y^TLi8}X!{U%8&E*eTVJ6s7iHXK=8DaGnOnnOE2 zkv`q&9T8E(`YwlHntquO-8sC36BZN3UuOC4oSb~3g1-Fx@}J7Sx~y5RH~@*Vfv__e z>Kfm*ln0!EcVl;tWqK)ozSnRZM0;-bt$eM)mm1coyOlQMH|S_P4NX|!cxwx9KE=p1 zvvlt~+sphN_)c!l3Tu-eSD4AiuGwTRFsdTeQB5*O=&exebXFB-Uz%N-J8)m$mx?e$ z{#h*(C8{O04aaEYd6sQCsj;KS=LudVnsh&l0zeOVE=Us;%Pq~r`SM#8mHr^K9s^q( z(#4svYUT0+uK_IfTE|;~LeDt2@6_ph3wW~tG@a>!v(RSMmAI4UIOaEXKJScH0+%Qn{?v9ccdU6KNZOHNmmwVqhoHC1E=xDO$rF6kE_4Mge}u= zpDU|fbsj>Jeth}+(5t95s2>rl@nqN<)YDvdruSPm_pU*X?vjladnw6R5ZaM(6~5M4 zq#1GNFwn|0vO507%{pn0HfOexSBQrQ9d0mNwHu4_Y)#iy@$r4Wa)slmkERR`{=kbJ z|B1|cgwoYik0sOljXP-4oR~B=Q(%Q5C<6v^6fc9*bG!XeqD6so|hR7&HK%Jt#Wv4^sv!hq&59!pI>w67bmlgIB8zbTRm!wcM+!$ zSr|&DqK^ycLoF7kvkg*P15d5@3d?S;)*t8vg@K=SIqj5Or6qZQK>nIe%ea1d!u>Ae zrt33B_%Q&#=-%K42has|c>Q~3#ocqE9+0h~UT6cTgt3b43f8wzePWJ34qA58eJ`ci zbXW6}ckh|@(es2UlQXvUobJ_X&fIh#!{Y~}t{X9%{k4JZB5mzyC&``f3;Lz|%cWIK zj$>Y~-9O>CPN;{$F3INyN%VR?yy&m`iZ+3E9uKr$ed%D2`O0`8Eo+H9X2a`FrSYXX zki!$~2O@0QcBseOAFcT+}stEb@JcJjQ9}f>-#9C{;(SSxwp#)yw}T|&z(C9YRF zTPU2C7w0p7W=oHpYfbVC5+{O5qSjj}-ll6}Tiwy^Z@~I|(HRjSJyNU72Ng>kB1Vu_ zq^-A`E)bsjRpou(3Hv+q4J;whK#qA;V!$9SyqEcYoEtR4xTj#Ww-DZqdF6GgXh*42 jD~`vn`NmWB^)=Go4SmPsDBIP{uRItL!heNsulL{o2+CS| diff --git a/wscript b/wscript index 51175f0c..73756c0a 100644 --- a/wscript +++ b/wscript @@ -2,9 +2,10 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. -import Params +import Build +import Options +import Utils import pproc as subprocess -import Common import sys import os import UnitTest @@ -28,18 +29,26 @@ srcdir = '.' blddir = '_build_' def option_enabled (option): - if eval ('Params.g_options.enable_' + option): + if eval ('Options.options.enable_' + option): return True - if eval ('Params.g_options.disable_' + option): + if eval ('Options.options.disable_' + option): return False return True def configure (conf): def option_checkfatal (option, desc): - if eval ('Params.g_options.enable_' + option): - Params.pprint ('RED', desc + ' not available') + if eval ('Options.options.enable_' + option): + Utils.pprint ('RED', desc + ' not available') sys.exit (1) + def dirname_default (dirname, default): + if eval ('Options.options.' + dirname) == '': + dirvalue = default + else: + dirvalue = eval ('Options.options.' + dirname) + conf.define (dirname, dirvalue) + return dirvalue + conf.check_tool ('compiler_cc') if option_enabled ('userdocs'): @@ -69,25 +78,9 @@ def configure (conf): nls = 'no' conf.check_message_custom ('localization', 'support', nls) - if Params.g_options.libdir == '': - libdir = os.path.join (conf.env['PREFIX'], 'lib') - else: - libdir = Params.g_options.libdir - conf.define ('LIBDIR', libdir) - - # We support building without intltool - # Therefore datadir may not have been defined - if not conf.is_defined ('DATADIR'): - if Params.g_options.datadir != '': - conf.define ('DATADIR', Params.g_options.datadir) - else: - conf.define ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) - - if Params.g_options.docdir == '': - docdir = "%s/doc" % conf.env['DATADIR'] - else: - docdir = Params.g_options.docdir - conf.define ('DOCDIR', docdir) + dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) + dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) + dirname_default ('DOCDIR', os.path.join (conf.env['DATADIR'], 'doc')) if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') @@ -104,8 +97,14 @@ def configure (conf): api_docs = 'no' conf.check_message_custom ('generate', 'API documentation', api_docs) + def check_pkg (name, version='', mandatory=True, var=None): + if not var: + var = name.split ('-')[0].upper () + conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs', + atleast_version=version, mandatory=mandatory) + if option_enabled ('unique'): - conf.check_pkg ('unique-1.0', destvar='UNIQUE', vnum='0.9', mandatory=False) + check_pkg ('unique-1.0', '0.9', False) single_instance = ['not available','yes'][conf.env['HAVE_UNIQUE'] == 1] else: option_checkfatal ('unique', 'single instance') @@ -113,11 +112,9 @@ def configure (conf): conf.check_message_custom ('single instance', 'support', single_instance) if option_enabled ('libsoup'): - conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP', mandatory=False) - conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP_2_23_1', - vnum='2.23.1', mandatory=False) - conf.check_pkg ('libsoup-2.4', destvar='LIBSOUP_2_25_2', - vnum='2.25.2', mandatory=False) + check_pkg ('libsoup-2.4', '2.23.0', False) + check_pkg ('libsoup-2.4', '2.23.1', False, var='LIBSOUP_2_23_1') + check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2') libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] else: option_checkfatal ('libsoup', 'libsoup') @@ -125,21 +122,21 @@ def configure (conf): conf.check_message_custom ('libsoup', 'support', libsoup) if option_enabled ('sqlite'): - conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) + check_pkg ('sqlite3', '3.0', False, var='SQLITE') sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] else: option_checkfatal ('sqlite', 'history database') sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) - conf.check_pkg ('gmodule-2.0', destvar='GMODULE', vnum='2.8.0', mandatory=False) - conf.check_pkg ('gthread-2.0', destvar='GTHREAD', vnum='2.8.0', mandatory=False) - conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False) - conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True) - conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) - conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) + check_pkg ('gmodule-2.0', '2.8.0', False) + check_pkg ('gthread-2.0', '2.8.0', False) + check_pkg ('gio-2.0', '2.16.0', False) + check_pkg ('gtk+-2.0', '2.10.0', var='GTK') + check_pkg ('webkit-1.0', '0.1') + check_pkg ('libxml-2.0', '2.6') - conf.check_header ('unistd.h', 'HAVE_UNISTD_H') + conf.check (header_name='unistd.h') if sys.platform == 'darwin': conf.define ('HAVE_OSX', 1) @@ -160,6 +157,17 @@ def configure (conf): conf.write_config_header ('config.h') conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') + debug_level = Options.options.debug_level + if debug_level != '': + compiler = conf.env['CC_NAME'] + if compiler == 'gcc': + if debug_level == 'debug': + conf.env.append_value ('CCFLAGS', '-Wall -O0 -g') + else: + conf.env.append_value ('CCFLAGS', '-O2') + else: + Utils.pprint ('RED', 'No debugging level support for ' + compiler) + sys.exit (1) print if single_instance == 'not available': @@ -194,24 +202,20 @@ def set_options (opt): default=disable, help='Disable ' + desc, dest='disable_' + option_) opt.tool_options ('compiler_cc') + opt.get_option_group ('--check-c-compiler').add_option('-d', '--debug-level', + action = 'store', default = '', + help = 'Specify the debugging level. [\'debug\', \'release\']', + choices = ['', 'debug', 'release'], dest = 'debug_level') + opt.tool_options ('gnu_dirs') + opt.parser.remove_option ('--oldincludedir') + opt.parser.remove_option ('--htmldir') + opt.parser.remove_option ('--dvidir') + opt.parser.remove_option ('--pdfdir') + opt.parser.remove_option ('--psdir') opt.tool_options ('intltool') opt.add_option ('--run', action='store_true', default=False, help='Run application after building it', dest='run') - group = opt.add_option_group ('Directories', '') - if (opt.parser.get_option ('--prefix')): - opt.parser.remove_option ('--prefix') - group.add_option ('--prefix', type='string', default='/usr/local', - help='installation prefix (configuration only)', dest='prefix') - if (opt.parser.get_option ('--datadir')): - opt.parser.remove_option ('--datadir') - group.add_option ('--datadir', type='string', default='', - help='read-only application data', dest='datadir') - group.add_option ('--docdir', type='string', default='', - help='Documentation root', dest='docdir') - group.add_option ('--libdir', type='string', default='', - help='Library root', dest='libdir') - group = opt.add_option_group ('Localization and documentation', '') add_enable_option ('nls', 'native language support', group) group.add_option ('--update-po', action='store_true', default=False, @@ -222,7 +226,7 @@ def set_options (opt): group = opt.add_option_group ('Optional features', '') add_enable_option ('unique', 'single instance support', group) - add_enable_option ('libsoup', 'libSoup support', group) + add_enable_option ('libsoup', 'icon and view source support', group) add_enable_option ('sqlite', 'history database support', group) add_enable_option ('addons', 'building of extensions', group) @@ -231,9 +235,9 @@ def build (bld): if not os.access (path, os.F_OK): os.mkdir (path) - def _install_files (folder, destination, source): + def install_files (folder, destination, source): try: - install_files (folder, destination, source) + bld.install_files (folder, destination, source) except: pass @@ -246,7 +250,7 @@ def build (bld): install_files ('DOCDIR', '/' + APPNAME + '/', \ 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') - if bld.env ()['RST2HTML']: + if bld.env['RST2HTML']: # FIXME: Build only if needed if not os.access (blddir, os.F_OK): os.mkdir (blddir) @@ -255,31 +259,30 @@ def build (bld): if not os.access (blddir + '/docs/user', os.F_OK): os.mkdir (blddir + '/docs/user') os.chdir (blddir + '/docs/user') - subprocess.call ([bld.env ()['RST2HTML'], '-stg', - '--stylesheet=../../../docs/user/midori.css', - '../../../docs/user/midori.txt', - 'midori.html',]) + command = bld.env['RST2HTML'] + ' -stg ' + \ + '--stylesheet=../../../docs/user/midori.css ' + \ + '../../../docs/user/midori.txt ' + 'midori.html' + Utils.exec_command (command) os.chdir ('../../..') - _install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') + install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') - if bld.env ()['INTLTOOL']: - obj = bld.create_obj ('intltool_po') + if bld.env['INTLTOOL']: + obj = bld.new_task_gen ('intltool_po') obj.podir = 'po' obj.appname = APPNAME - if bld.env ()['GTKDOC_SCAN'] and Params.g_commands['build']: + if bld.env['GTKDOC_SCAN'] and Options.commands['build']: bld.add_subdirs ('docs/api') - _install_files ('DOCDIR', '/midori/api/', blddir + '/docs/api/*') + install_files ('DOCDIR', '/midori/api/', blddir + '/docs/api/*') - if bld.env ()['INTLTOOL']: - obj = bld.create_obj ('intltool_in') + if bld.env['INTLTOOL']: + obj = bld.new_task_gen ('intltool_in') obj.source = APPNAME + '.desktop.in' - obj.inst_var = 'DATADIR' - obj.inst_dir = 'applications' + obj.install_path = '${DATADIR}/applications' obj.flags = '-d' - _install_files ('DATADIR', 'applications', APPNAME + '.desktop') + install_files ('DATADIR', 'applications', APPNAME + '.desktop') else: - folder = os.path.dirname (bld.env ()['waf_config_files'][0]) + folder = os.path.dirname (bld.env['waf_config_files'][0]) desktop = APPNAME + '.desktop' pre = open (desktop + '.in') after = open (folder + '/' + desktop, 'w') @@ -291,48 +294,45 @@ def build (bld): else: after.write (line) after.close () - Params.pprint ('BLUE', desktop + '.in -> ' + desktop) - _install_files ('DATADIR', 'applications', folder + '/' + desktop) + Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) + install_files ('DATADIR', 'applications', folder + '/' + desktop) except: - Params.pprint ('BLUE', 'File ' + desktop + ' not generated') + Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') finally: pre.close () - if bld.env ()['RSVG_CONVERT']: + if bld.env['RSVG_CONVERT']: mkdir (blddir + '/data') - convert = subprocess.Popen ([bld.env ()['RSVG_CONVERT'], - '-o', blddir + '/data/logo-shade.png', - srcdir + '/data/logo-shade.svg'], - stderr=subprocess.PIPE) - if not convert.wait (): - _install_files ('DATADIR', APPNAME, - blddir + '/data/logo-shade.png') + command = bld.env['RSVG_CONVERT'] + \ + ' -o ' + blddir + '/data/logo-shade.png ' + \ + srcdir + '/data/logo-shade.svg' + if not Utils.exec_command (command): + install_files ('DATADIR', APPNAME, blddir + '/data/logo-shade.png') else: - Params.pprint ('BLUE', "logo-shade could not be rasterized.") + Utils.pprint ('BLUE', "logo-shade could not be rasterized.") - if Params.g_commands['check']: + if Options.commands['check']: bld.add_subdirs ('tests') def shutdown (): - if Params.g_commands['install'] or Params.g_commands['uninstall']: - dir = Common.path_install ('DATADIR', 'icons/hicolor') + if Options.commands['install'] or Options.commands['uninstall']: + dir = Build.bld.get_install_path ('${DATADIR}/icons/hicolor') icon_cache_updated = False - if not Params.g_options.destdir: + if not Options.options.destdir: # update the pixmap cache directory try: - uic = subprocess.Popen (['gtk-update-icon-cache', - '-q', '-f', '-t', dir], stderr=subprocess.PIPE) - if not uic.wait (): - Params.pprint ('YELLOW', "Updated Gtk icon cache.") + command = 'gtk-update-icon-cache -q -f -t %s' % dir + if not Utils.exec_command (command): + Utils.pprint ('YELLOW', "Updated Gtk icon cache.") icon_cache_updated = True except: - Params.pprint ('RED', "Failed to update icon cache.") + Utils.pprint ('RED', "Failed to update icon cache.") if not icon_cache_updated: - Params.pprint ('YELLOW', "Icon cache not updated. " + Utils.pprint ('YELLOW', "Icon cache not updated. " "After install, run this:") - Params.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) + Utils.pprint ('YELLOW', "gtk-update-icon-cache -q -f -t %s" % dir) - elif Params.g_commands['check']: + elif Options.commands['check']: test = UnitTest.unit_test () test.change_to_testfile_dir = True test.want_to_see_test_output = True @@ -340,7 +340,7 @@ def shutdown (): test.run () test.print_results () - elif Params.g_options.update_po: + elif Options.options.update_po: os.chdir('./po') try: try: @@ -350,24 +350,21 @@ def shutdown (): subprocess.call (['intltool-update', '-p', '-g', APPNAME]) size_new = os.stat (APPNAME + '.pot').st_size if size_new <> size_old: - Params.pprint ('YELLOW', "Updated po template.") + Utils.pprint ('YELLOW', "Updated po template.") try: - intltool_update = subprocess.Popen (['intltool-update', - '-r', '-g', APPNAME], stderr=subprocess.PIPE) - intltool_update.wait () - Params.pprint ('YELLOW', "Updated translations.") + command = 'intltool-update -r -g %s' % APPNAME + Utils.exec_command (command) + Utils.pprint ('YELLOW', "Updated translations.") except: - Params.pprint ('RED', "Failed to update translations.") + Utils.pprint ('RED', "Failed to update translations.") except: - Params.pprint ('RED', "Failed to generate po template.") - Params.pprint ('RED', "Make sure intltool is installed.") + Utils.pprint ('RED', "Failed to generate po template.") + Utils.pprint ('RED', "Make sure intltool is installed.") os.chdir ('..') - elif Params.g_options.run: - folder = os.path.dirname (Params.g_build.env ()['waf_config_files'][0]) + elif Options.options.run: + folder = os.path.dirname (Build.bld.env['waf_config_files'][0]) try: - application = subprocess.Popen ([ - folder + os.sep + APPNAME + os.sep + APPNAME], - stderr=subprocess.PIPE) - application.wait () + command = folder + os.sep + APPNAME + os.sep + APPNAME + Utils.exec_command (command) except: - Params.pprint ('RED', "Failed to run application.") + Utils.pprint ('RED', "Failed to run application.") From 167af260296a1361a4f9c9ed7770fa0e58cc9db4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jan 2009 21:50:07 +0100 Subject: [PATCH 0619/2970] Correct handling of settings in MidoriView --- midori/midori-view.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index cbe74a4b..9bd03bec 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1210,8 +1210,9 @@ midori_view_finalize (GObject* object) view = MIDORI_VIEW (object); - g_signal_handlers_disconnect_by_func (view->settings, - midori_view_settings_notify_cb, view); + if (view->settings) + g_signal_handlers_disconnect_by_func (view->settings, + midori_view_settings_notify_cb, view); katze_assign (view->uri, NULL); katze_assign (view->title, NULL); @@ -1401,14 +1402,17 @@ midori_view_set_settings (MidoriView* view, return; if (view->settings) + { g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); - katze_object_assign (view->settings, g_object_ref (settings)); - if (view->web_view) - g_object_set (view->web_view, "settings", view->settings, NULL); - _midori_view_update_settings (view); - g_signal_connect (settings, "notify", - G_CALLBACK (midori_view_settings_notify_cb), view); + g_object_ref (settings); + if (view->web_view) + g_object_set (view->web_view, "settings", view->settings, NULL); + _midori_view_update_settings (view); + g_signal_connect (settings, "notify", + G_CALLBACK (midori_view_settings_notify_cb), view); + } + katze_object_assign (view->settings, settings); g_object_notify (G_OBJECT (view), "settings"); } From 001945d86b2f69434efc67ff74e568c15c596fea Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Jan 2009 18:40:19 +0100 Subject: [PATCH 0620/2970] Revisit the failed attempt to correct MidoriView --- midori/midori-view.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 9bd03bec..0ee35119 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1402,17 +1402,19 @@ midori_view_set_settings (MidoriView* view, return; if (view->settings) - { g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); + + katze_object_assign (view->settings, settings); + if (settings) + { g_object_ref (settings); if (view->web_view) - g_object_set (view->web_view, "settings", view->settings, NULL); + g_object_set (view->web_view, "settings", settings, NULL); _midori_view_update_settings (view); g_signal_connect (settings, "notify", G_CALLBACK (midori_view_settings_notify_cb), view); } - katze_object_assign (view->settings, settings); g_object_notify (G_OBJECT (view), "settings"); } From aebd813c687c8b36fd9032f113341c71315b597e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Jan 2009 20:23:56 +0100 Subject: [PATCH 0621/2970] Update Waf to 1.5.2 and update build scripts accordingly --- katze/wscript_build | 2 +- midori/wscript_build | 2 -- waf | Bin 75065 -> 75695 bytes 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/katze/wscript_build b/katze/wscript_build index 4d1ba61c..128fd357 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -7,7 +7,7 @@ import platform obj = bld.new_task_gen ('cc', 'staticlib') obj.name = 'katze' obj.target = 'katze' -obj.includes = '.' +obj.includes = '. ../.' obj.find_sources_in_dirs ('.') obj.uselib = 'GMODULE LIBSOUP GTK LIBXML' obj.install_path = None diff --git a/midori/wscript_build b/midori/wscript_build index 3e4aa9b4..3e3b1324 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -3,8 +3,6 @@ # This file is licensed under the terms of the expat license, see the file EXPAT. obj = bld.new_task_gen ('cc', 'program') -# After waf 1.4.4 this additional link flag is needed for extensions -obj.env.append_value ('LINKFLAGS', '-Wl,--export-dynamic') obj.target = 'midori' obj.includes = '. .. ../panels' obj.find_sources_in_dirs ('. ../panels') diff --git a/waf b/waf index 935acbf50cf0859f79f8cff6d06df2310db051ea..a22ad09a741dadb0c3341468d8b636d1dc055f14 100755 GIT binary patch delta 72714 zcmY&KL4yPm3KS@=r4)BkTuO0wC|-(NaknDHibE;I z-JSm5y$^S-dmhf?k$q;*nlrQK`v`v31b#ISA+HeI|L7p}RCQIgG^N?Ztb_%{tgJ<> zV8Wsjf)-*TqA)=LaVu+>g$T?-049)VK&XfdP0S{Q<8mgh6Efj))%_!+#KVJ02-i{n zPaz(boeBT`nOYh4-#@`_h5zRNH%{1b6iCBqNbzyB0g1RQ;${I1%infz{=b3eXZKBX z@yEia^w2Mwt)g=)g`e7+jlNi89K8;o9UCj7D~e0j2&=e!#kgmycih!F-uQY$aQ9{O z>Q*j%mv&&7Yi!otd0mF{Hox9+d#|TY`%-G#nNnRfRh6gHTZ&8vkG&4YCI9hkEpeO+ zoM#_BOY*xiKr}dOPG8pi!$OU1e3!``*9`XGS|DTs+gsoAUdMd4-2p?GILwOj2<<4QE^_~Nk1MD43a7l4k`$SgYi#?<;gmvxZe#o9;jup$a_!l1 zzvgeJ>r`}Ak=-t}I(yi-+`5=J(J_12n!T`}>o+&yxp;K9D08GxPQn>g#$E00L1g{&mi&9$*Mrs1KHHktjn`HF zGG!M+^w_0U+RLK4a@Nbh?exkT=C__r5Ipwu9&6CM+WgV_X(^V8ZoRH@o44gkTJ!2Y*JNfPq+`Xces|^SSm%c; zBgJyppQ7Ev)nkAE^TXBmw(#MG&q7-A)P0+M9Isr~gjVlbS35}j8{|zqZLAmFV|*7l*4}r#=cdY9{I&I_a&FCA zW^v7bCGzi}$F*m;$+B@&bF6=C$709z>WNP&pt8pQ)phe%pTo<>oQZ1xbDZ}*(tqy{ zu75QBT1@Vh4xS6dT;Rqtb@*?!I#_Pg#~m49kG4HMb{&0|ma?0iI&h9{JioV3dyWTs zUmoZBGaV$)vAF1Zw;)Xpd|x>vE(R}*OOeu&8%wP^esuGfp5Ku^xZ4`L+Ak?6yBIq6 zZC(RIPbTws8%0{iv$s_npZVl$H>x}NNFMVv`iS|w(HUNM$xutsteu}~IgIzXE_t(z z_3t>}XkN5if)`5rt{GqWFEzFLUD7eI<2z6(q>MXI7;j&l1dteAt@ukv7TU)FUEe;(H4heolAb}u^juIJ|M`2g^4?T0HQRoPR z+QFtZ=)e#>jsHvgP&Sqb7*6q|P!6asw+Q9~&B#%(J5;St7bFaxx%_V#I@~-QoJclG z4IDX=L>6LPSehJ+(sGi{Clh@sl%s36$71^v#})^NeFn}#{LB^?HiflIy3~C{Civta zGtrB&O6=y2&jR1Wg9?B{jcT`oLw1bC&hldhUcIvurc@fdd`ER$QWj z$~r4Q@yUH{4&^HZG4@DBMX!O&D6Jctr#&2 zG4bTVvA-lE3fhUc@i?v3w7hK9Rq2TMAzX?;TU?3{N$ga3IEC7t2)Uji7;#RVBEbuN z(~7S*8xipRECMR!nTTf)RggRYu7L|eK{$tyV*(g}PBKLZ7D1%|&{YQkkZ977J_7cB zI0gfTP_kg)AycqPZS<%Hl_CNN3q|4A!y_q1;h?@gDm0o0E(}rxDI(E2KPc4H&=_?# zp$NDRhDV+gUO&dAs0hT@07KaEfjV$`3<(}P5Ht+LM6$lVAlm~=>!$U#If`Y1O z5H_Al0|JN5k^n&3qkW?&B!wUfiR`9;vyvdyNq|5ez^I}s?lX9_Jg6Um;(@CoXF^bl zRKmz)oNjnB{!evb9gw0h`>+T?RaI3Wlz}q9Q>daoH6?KuXXwP(`~QgrPt{kg!So z`aT^v&&(Ju4;2KI1Qdk9e7j4mZ5rG_9Ff=_`$Dgr_M zg7AOu8W>Q0jU5;SYJ23DiWp&7si935g-B)pdx~O7K^R{f-u4Yu(%#w5CVik z&Jw6<|AzwxjzktF#Y2R(tP^WRk;~7P&*0P*RM;8#>b#FDEbL7+UTSt5J+1Afvc{I3(&=&1x0ibR3LVw z1_6oyEyT)}r~#xvPE+WFLIf}n5E{cdCJ0DIVlcWOID0Y`h4w5M!b*t%ebe=yw*o^z z@+4qh015~c6zI{xSLfnJ0@QS{8Y1!vy#fdkiUdl^|G*o?5RgK2w5e1n{yU?9FtQ&d zLV|`*suSRA$iw4#@p$^+4MH;*G=v)kkrPGb8R zL(tP)TmqB4q}sLh@nEE&2tZvCsFt9nqYaP;vQtn3eMwXzl>b>56}v6~ zKCO*|V&zg*hmXNVVLG5G%(EE)23H;ZALobBaKJD^ClrWB#i|aZk_T0T;A1=r1pmf+O*@gXGvj*nS?6wl)wKfvr(*vhC_s@pkQU}gly@* z-sSUex1Col3V+{w<^K9deg48NEQ9o{t))8m*Uuj63pMmRTcxb(e}rIYn#M5i;Xvv~ zv{5AD7hhhf}**XGo@-=8P0;_-7sciSZ^2C_~E z$L!f?;lUJb#|>T8V2Ex0?i*HfY|yhFo}FPNP^e+#vSoo&9vGE93VY}9HMjyyYqWl0 z_C)*CZur!wduwEt6IWRcmk>?K-c?|b{ql%C{w>tEixA{0{RFVKh))%3)hFQaliKx8 z)E(XaO5}YRpbvY^g+wTFfua7pD)4tNJx?a<=JrZkO1U4&>1UralmL0Lig@i=HS)3k zi1UyECC`ZZT?N=8ZC_*#Z6j5*alQ;8O=RiK76C35=%Q;NnVLZ-?D{9R=3uOMqxr9c z!N?m7f=7Q~K5q3d&9v!P4uRlC_40-19LU-MMACXaX+hw~uG8bjZM2zbU+>F2PVP*l z7SAgNDK^%~v@Mr(CmuX3MlZsh5HNab1uz_CZE{`0weGbbL_Sphdr9uE?KAN#gf@OQ ziCjKg4}09PvbrF=rkbFe_e4CWl*`*!k9cj)5Hdz5`y@BVgp?zQRUw<_}8`b;Pe7>ue=0msB%bjKedZuOQ_xabftEFP;UJ? zs~%XH)7AsqW>4e`XJPqy5ih+O?+?iLbi~Y{q^T9sNhn<;j9p87({u>n z5LH=dl}0mkdZ!{xV}*7cP-l1HqAEhOtWBRi2_IZJ*cP-!_$w8l}WH zXK_Cs3_O&g@iD#No6*SGS-_(7vO9JrVrn`{bVQ)etWXO49*y0U z)e5l>MFi;;jsFL&YY161=a!&y{lM?P*HiNosNQtK4spgc278ZBqf?88JeXBkvAopFGO4|PBJ2< z!@rUnY8t$-jTo9mWvOsMT;IWN62WKw&%r}gf99NC{CLi1&9=If31QMqq<#dW@sCevPZPj7EB zexn)pz}|HCd3DjcvDFCNU%}loZSwENT+3wayUkxJ9b{koi*v2ZR#%&40TPfYC+v&j zo_MI5cm=#jy6!FRs=6;uLCF4=tE@hNa*wVVOKQ$0-&B*-PhmtMp?)@QU?Q6b0$eO+Q z>x>53@6wv+{GkNxRL}`YMmFQy^qss3+Kl|i6=fS64J~)4#&wcV#@?#pRv&Et6JPuD z-}Q%~gZi$b5^D*WOn>T%*OO{wXrWB@nvf#d*BKripi1Fq`BEbx8^;8db+SDcsc9=t zHMQ#}K4m&u+x(SI>e*5KH3Z#0UP8as-hF@%T`TeA>z7x0uiVxPLU+P>?<+IU$_mc$ zMU$8{;)-q^nUkcsWcY=GJyfs*8@k~;vv$!=3nYhY62Uk5^nXKcG*X!-(p^m8`5zie z_O9L*hX=-%htN>$9YuUd@|63i{6mYN;a263;e@Tkwzy^dHmcU~rGk3lcuCH7D{9T@ z!ev{FV^R2~d`wsd*Eh9&X`MqZG9 zBEW*7vP7TH^S);BuUmP5+-#KE8#PyzYNB0|z`?(SIHZh)&+CjE1_Y4#MBfNkE)DXu ziz7`Um0}(GU&OpDij7Xe@)@Y6k3-~)eXQ4?5#rlPKI&%gocZq#jL7KdHI)CpQR8#R zWkdE$f}!ygWsA1cN`_2P1o%bwGXCQ@tMz+mc6GHw)~y2~ox zMN*1%xj}j<(Ykm7BEYmNurb8D!F}N{=B;1~# zUAO*m?Z>u&zj>BDk2ylehU_L6yFpbnREK*rG$cJ5i0qjj79?xYrp;>~cxL$n1S|?{ zNBJ+}_U(>Y``+hsD?LK3jXSi*6DZugyQleK=^jh6p&W-v1w#9l-YoH}G- zSkEg}`u3y@~B#c{UCzMsgDqyRc4rnT$-Jk$SPL2-^Vqu4y z4tt49ctfIOM6@Tz@AkbK2Hm-AwhcK5ykzSCq%%Fr{MnN2d%Eo&C@TXgQ6pF@--Rlj zc3#l?XVafbo}>Jm9cFLzsyp%dP%^Gxu(|M$K-KugPWjZ-)$Yfr}3J`T|!7V*2&E7 zifW1Ej)@V1vutNk?eg&rhk5btXpwH)Tzr;C>kSI8|6`#Zr#x{oN#54475CuU!11qt zn93QCCk^m`jpZ>s>Y8PmkG2bBTp?l*Z~ynSOpN#6)ZeM^A6C8R{SGfaXS^#e+T{~n zHhDs?z_w6<_)rMrBq#mu-~6l3Vew{3Q*- z-cz~~>>Q6VP+Qk0?q7Ar`Zxblc<>0}M*jLF@1JG+`dvBMr&+^{TZs^@Z4N>1%;SgM zEjLN^QU52+QTA|6rdH^GiQ_o^d}s=}%V{X|p!k^4?!xyW-r!6llQ+~=7h5$3*s3+w z&{A>LI6bQ!suCBBnn~E>e@)53m$1$ZhCG2R=EC1xZ|%(GyYnGQ`j5P24aE?XQi5t zPXv^s+PFh<1N?C99wLeA(EJTBWSYVK#+dL_3p+qFUloz`Qj=E%!3%AalX_y_@%69L z-d5ZgDYwM!t|nZKkLt4#VW`dw34GPur~l`&gs0qGUAppia6yokn4A5E)Tze(G%crp z)nKn!oV7vDN_($#6k8yUh2Ex*S~!HH*;MSTfFZ>RHdMB*nAH z+ZKhNlyBei(b$KR5E1IenbVPBiavXa&O8apt5D+lgq8X$wx>Sa7(Ehl82>K24EmCm zjCmn&OyRZ5SwT-^-mu=ALVt$+V#T-igOa4mW&Izjxg-6wu~6XU$Ioo(BL;q}$tvL= zJ-`r!AWZl~aUXUY3`KMjf116$dsN;+`Dy#4 z9R#jiV!PB?7yuvJT7JF`QX)y&T&*?@F4y3%tXLmK_o)*({oa0({qmHPJK`_v4{vXG zH#vT*!c2DSK{e+&@>^0@h5jdwjC4Y(;Y>Ap`<}wanaR zxo3}!vsi!Ax}DBV*wd7$(IeAu>K|oi>z!4osCW0Z#LKocUM@zx)2So{V955UZucI( z-1W{+9~@IKq(#O9_r`~e$aRc8EEz+x$*q{x@=6$wJq8T5N%uA3`ANx`gSk)q4i9ir z1w$szP8yHsKc4cnzWz3c^Y4P=t|1IgOqi!ChZWov zoO%Bi3f3sie!AzT=NnfNSH#($EGhwo7{yU6>3$k;S8(C?u3T>thmxA&WMIdR(c=fMravcj%|S65z6+vB2sj@ZpX zBjPtKtfNz;3{Vwbr$2i5tkvUWJMM$zoq!+{%(Su#FDq#xsk;P|noX=zYo+6468C>@ zjQ=6FL0x&7W#3~E+r)M$c-jC`=hu;L{KY$u2m zC3l{5Tva%Wk)XD3`M5qi2rj02?5J42{0Vd>j$fIYZx8W)jB(XiKGTvE^iKDQ_4;&K zOVv7EJ%$hX8}tPXvEQH%ijrXiLoA_eLR=kyy|lO-sr;Ug2Jt%VUsGo7c^dyS0k_QZ z{kPH@+>TjJRTxb7-GM((6^SjD(Ry`vg0Su8mXFy-;q6=98y>Qqy|!p_yi`_b4-vUftyHI2sGuTojuG!G74~^Z11S^Y}A?nx?#RI*V^R7)7fH^ zih-#b7M@t?GnQv)4=|Hw%5OcoL)=S?va+QH+nTi(=L1=pe?H`zCvIZFiG=5geq~B8 zBVY=t0U5oC+LP_NQFID`h-f^cCUu?NwD|UZ|ClmI?raz+I~A9eK$u?&?_M$MhX1Pr zv~~{znJbkOvj0R~?+RAcjzgCn{Bwr=w#XOlrR)}`*Z00K90`g@ zP@1L@d4^J+jM)6?dBmoef}ydm{U7oc7~)LT#7#XXL*fmqPh6NN6cwuqSRPTk)`y`Z z2r~&v2I)ty;YJ$2G}f3kFvMhYO@2`I83l!cx!KYNdRbHOQMrfDu6r#~LgXR)-v4`- zfaUw@`{t#H%hMSK?-ansB~SiRiGOP2_XP~F_$;VYxiRmW8B0FVK{BFr6M~S#?aEY$ z?wWLCI1=|yix6v@=a5dGxZrFJ5Zqj6S`;Q!UwjogKfQ?cZ}@HSRfFRuzI^oso_bQI zji!R!4J++d-YFIN|z-8`97kC>6G=i%v&Nu`!ZMkffV5;L&^NfZizHb zT+`usz3Aq6^WnxvFy!9CSaj3-*nJ5wW6AvbH=Qw`-a=5QjInPAy`dA`qMIC0Rc$eg zjZ7dwYQ083NNK&;F?4%wyZ_yyYcd$hY^W==jx~o9h0UChzwiIIzKv@9Ha8BVKd|AK z6%SMPhRxqA1p8o*so|pcmC`Tk*5g9$l{2C(jD_)7E}igNsd^B|gT5X{1&)VYN6Nju z=H-|Mlg7iyHNJ6o;2wz-&+)EmN#4zROmdpOz^yL%L>V7iXWHOU;eHmQ zj^(h;+f3l3t&^oc;z(1-4{C8_(H2(xVqi)0l~X7eh9I;iP)W|w%zQ;WE68rzM$^px zIx_45ty{mELs~*$G%np!Cs7xOC&~elj-i&==R{!CD&CrL@cUy<2AdO zghj)bb0}KOel9Z{_zX{bJ=t9j1(fX$Vs&`r=JBsBul)&*KXpq#r4b|#yfMFO%^#V$t#}^D;{30$XBy18rQ8{*3UA${%$y*{5py7?`ZAF*wIU% z031BjwaYp@&emGom+whBZ@wuhk(72tM8AZXnFn{i5+_Njc+rTLPBg=Q z%$iz65Rt49j_YmFvfEfu)v4rxjyf2*C#ZQ&6`duwBz$==gC*gETOvrXr<@Xl@|E?#zs7*@$ug|lYNx^5|s zr>{`b%bEKEMGXJzZ~%dzZCA}pk>q8t#f6viBG?0!m* zaGSfRfSEaWeJ}oo;j67YB{SsxtYjG~6v4+2%xvm6_Tiy@1#m3*H7jW@_Z1>9=8O*0`8<=qw*Tjo;aZvhcWh@S7qA#vxc3@xK_|^e z1~oUrU-7U9k09hu9#_i5&*zu_xs->JiaoZbixixSiAzmecV*;7wL;1w>2-h&-U#nb z=19-Z5_gBVbtRSoeDlvLd7>d<66|p<-FmOxfmKAZ)?HJ7i2!q4O9KApWqpGx&C?Kd z@@h9o=Svniwz09V(wsu1(aWQnyb{KX$h(T&X5hD+M_e=FK3Py1Te5kkxt%(8<& zQ{u8k0xve&^LPoLs`&m*_C9~Se;(w!y7iH@Ip}5XGi==&FrM*ubjwIWdbhknG0)ok zbLV^SWq$qh-q&?vSef-td*ZB*23N*X-BL0Vk4IEmU*~u#rF$3`g}0*a%(O-eb}gbG zU!!KvR{#>F9a5$FEQhA zo?W+B%vjXC?y{T=ciG}Y12(3yE1YviN#9(j!`(|j;w&4gOB?wN*7 z_UcQMPrn;Y2zSK|Jv-vrF;siMzd9`EH=P4nRQT9=Uv1YscF69$I@#*gcYHM1iI_dk z6!n#U>veV`8FtUxoBQ*qTBTpody789(d3Ot3)_G7&#d>+lI>D-|0<ym9EeHGV%MD!d0NUE1Zq zcNJtx+k7#j;pftgK|isP|Gut_ml!KdfGEvQ?WjvmwkJK0hUCCdhEMoVFf`@&C@5Sg zFRT_D82eIFbU@0U`?+}qW3{gNRo6T1bYW5v? z`qIpsgfX}Gpk`1(ATWJUz%$H=^(Qq3JX(9iFn@5r|$3@m?K8wo)=$g(1= zg4SQ^T${EnyQ8dn(nG7QmCiz#k6(q;<%*=E$G6$%R1pzuvGUKdU+PHZnnagJ6tE<; zX!;8D#WeD!=>&bDwyog;D&1%q-P#SFU)kL+#lG0mc@6q49$KAOm^-Z&O%N1~t#;m% z{n0dXWN9uwtIQjyMURWrSKbi8_CCpC&t1L;DkuOh!XYj+OBXQX;{VczA z94Fm-=a^A1N8vp|ts=!ID(n*WoOl5${x45@yri?|%lk|EtTM_wFx2<2CoqzPQ|wP} z?auSQJ|%FK&Dy)^5x3k0{Rd{XjRMd8Me1#RtCQcS&K&a*R~t6`~PKqX($A(>p^IP7P(HV_~8-qWw3 z_g==p|7p1Hw0HmL=|R@mGH8@*%etnbZu86jpLMQ?{xm!6POSKop&c)MIeGI=Naq6f z7h&Q~26TqOSE||l!EG@yUxE@_f4+s5{j{0Wyp?V?NnUj97)p4UF!MK)Q=Y%f#kKX$ z1ZL>K%71Z&fZ?&>n?^;q@a?Q7&YgeB&6aX74M>G&KK-i+`oZZwMs#TM%Wg$`;f%7W znJS)2Bu`o?5(=i=(O)qgrutx~03TBNmCv|vd`18GY>*$hkP~nmL-r0kuv&FwdML)& zPF`YPY8I~tJXqsWQ76$S$uH&{`b&&QroudN{V$OY*6vkgft!dhYe?GS_rVo8w=OQnA}?td_s$-Dq`-z?`L0_Vwu;#Z2tb zM7gG{$g*GIQjFl#zqQNPVdL0L#!T+FaUV3v>rNdnUt?ckE$+TahNYiBnI*SVt`%SF z8xN1Ux+xA8d%e!nx&lL|9YX(n#Deg^$`=i?4t~dx(-+R3VgcCL_oG))%Zu`2*Un3q z@-HxUHla0=rPzQw9U0d`QoSd~FT{4`j|L`$U;4LyygmvNsCctK=}__{I9Yyp9gAqz z>As`GuW|DdDG->r>xi#~Tp3h1&RNwfmtcSe{xX=|60u$PK1=>YGlgwMvv%K>QhraW(PQ5Sl-wJY#@E$YF*$)$^*C+pz zY7N_b#N1hQB=#6FG^A_!h`PN0d*iur0{rCedVlYs>qPc=Gx>r~b#FP?sI|$DIK~6; z%Rn;<49RGO%ShP}(P<-;Qr=(e*$r67>6zXu)R&>akX&rhhB(iRWhbj+OtUMayY)EQ zou!+R>B!D<>rI&>Gv4#Jc2FlDA})OmQ*#;4PDphXdH>~$x2e)LJI1u$bI%KP{_sr; z6Se#qe?)DTM)ZuIdS=Oqg(?BAjR;bRN$1WE-pM?$^&XXc-QEiS8%^&dtJ1S$HsKUa zpfsMOZ4iLGmVI`_V_SMboSxB>Q8-Hj%+tj(f*W&)O`CJ@A?U6=1+pykBL|B zO@?1_4== z&PQh|VdeauZkKu!gUQV06}HJ8!hTnRPal87{r<4ADoc^Yqtqm1e410pKjcZSZJ!+s z>2ngUe}g@Ch7S(bu>ur@KK*F>hu_M)Tf_(P&EcydlEl%z;RzzUakxgll4r-|Bsm%O z*KS-cKm7Y7MF@A5*qfm-`?m0<-j%7GNNh-k2b;S3yk(H=TiEwChxKh^%_&vM$Jc(j z%u3lAQanFJd>hTrWcFJX$J~7xCvF<%^iiiBfR2I+*dT+wVKXH*LH8UUB~+DSX_!xrJhY{2q87t}<7RW&M*-7C30s zm5wFGi@+C&`xWC-?5ic}TfW}pMfWqilo-Mqwk?|UpMH{`p^vtTR!*Gzfz~uF-~Y#! zGshT|jNyy9ON>HP<@%Y+iIA(edNGaonBmgZ!MA!c<$MEqhNyNbI+YhqPz_H z4Tc0NGf;(rzc{oc;_v_Yott6dto*@80gTx=1}hKr*&hcKr|ffZj$ zX79GAZ-7CS2uC>=Fm!N=ulxRqxqai7JI&msfzf-RwJ;zaQtQxK-+vKH zbRH7~7qnWSFx2n*ubn{qgW0oE>Nqr)n0nY7oqCQ$$2xuMh`?aLLVT2()Hx<6yD@&= zj_yk~M@Hm(8@!0Pp;~j%ebnWFNN|tiv|!k`{CI`6Gx1wL2Id&SnX|+ZqwYqA$`#du zGaVku#(bc>;Ai;AU#?Zk*rnt9M;RvU8I$abigPI@RN3!y))b=|LpOMzPOmox}Qq6WBE4>4o-h`azFpr_aaM%WMcWrsNuLW;*E;^pRU+no2H6lK*4r4 zS@O=_)^ksPX0fHi_`l?=$Fs$!VO7dZ-G9|Dyd3`XY%{m5zmJprvO0V#Ta$)fmabi$ zKIlaSkx6y}e$va`NWb!9wIR!E#9ljBFdsLjvrTi;5f~QH+H;2923hHMH|Ipb2f&cV z5FPP0xl=;YfQJ8!NfTI2C2MTu$aT8~(^A!f2NLO3%i9?SQOCXBR(Nw!r5N0lB5t zo$*R~@A4KztjT*v+~zU6x97M1cfoCz2R2_zjn+RU1>mkL+Dr+)Ai{D8(A9@tU16}` z@3CR~ZV&VG+-uaoC%PnBKA4?&O8uahPIn_x${$`|FDDsytAa0Nw;mZQIE~Vy^`7N9 z=8}Cbl zp?pk2wF)@bhm^Vtf!Ho3**6a!snxApm%T*V;vO+Ip_2375tBtOz-SG;eql@mke#{Z zK7_?+ySuwMb$4%7B>&QAn2AmxpEWpGU7aq-yM-iI(-fnG&mgd*gt=2XJ^4u@9XIJIrS(%r>8S76kgJ9gdW^W|52e)L|jBE3hd zea<}qx8x@n8i<1;HZ9E{P5&Cx0WZqs_b@Dd0ZgFB?RXuk z<&rm{|GPXe3QG#M5qRTH_8FR$_@eQX-K>qC%#;ihB;q;(x0|s-gV{^ePQWh28I(Yw zAS%Ta)Yn(T`JbAdASxqZyYu1g#H++Rv7UryPGD$~0z5>X60HN&U9J@&x~P6oGo2r> zm)~Ty2>D#UX9d_OiIy$w6<}7vSQ5vI(OW1~$oO){V}nEfR=cC8sST+RA%Z1bY0;s5 zr*8W3!J`q5M$@ajU*3y+?1}|L^MB0Y7B=SWeu6T!zcpUdt2HU6eFJ*Tk1ApDVbRBW z@gBcF|v5N$JYrC*!u`E zvd1a5DhKq&P5d4Es`>B~=qc4lxo{}GajX@A<%!mcB!Aguo|PHb+(fIUQD2bhR!gEz z#FBxcA66Pt8Hkt+=B-?!dYM2&W%%pOc6_m3y)|CdNZ6^js1h&6$Q-^HP5etgPka1H z)^-1+0MD{llqOhCbC{$w8q>As@DT8?Z1LuEXUzDxPC-|QVPsIzdYmXfZuf8QUP`iC z>=IazvCDjOW?_Ph(yjlU{u|S2kEZANzykPwa!7a`xYs&a5I}R1X3CO&lqtBikS6-! zCvdWw6f>!#4vNY)v%rhW8v`S?i@?8F+U$N{v5Kk z3oQalH<2IznHs7NtWNlyrjS=e`dR7-`xsy?-hAV5ld5lo=yl-hr+qTS&{D!O_A?&8 zoCh}G#KmbQ>vE0~2+{1T7yP5S_Y!``MgLZIJ5AI_`bx@BZ1;VlNU>0`uh}9{rH6D{ z{#kEQ8015gbaJk$Qv5g_zJ{gjm%4s(8WT^z@q+E{_f_TKlUIKB@GK@EqdJ`!R(eT` zlnG=a$n@slSI@6IG25KjTHVirvVa&NGNqx#OhoihsbD*gXP@3@IqUeY^$O~=8kplR zxSU1GSI{qqG)ski-R@OCXLI{RCYc+wWyI|SxNdZ_Qsk9|MCmlY;%nN*6oYQjXUOzu z<6eu0bZ(&BH4~qx;~T{6nr2Cwku+7BdD_IZeQ49+!fTTMj-{r=C~b;( zO>5*W_34hr0s%7Tv42`OX#Rw!f2MOOEZ$5v{n(F`n;Snt`KZpTo|45S#_URXiL4of z4d{ex4}!(%Y*(!@CJmCGUr0qkgWk9(%?V8L&ZUZx$*;DZSZ8c&d8isN#DBN3co?ep zACA$)U*dV5%&&dp5Y9`VhV?o2bPWqr?ORZ?nS3aDZn^N|Uqu67vWztZ#v#U5p7yD< zCj3a-84P85D-=cE`JCGi!u&mFuHWdkTxhsrLa>pVxv)KBq4CYH>fPDy(y8c<{OOKH zuVq*0xzPJWE11TziKj=ejoae%7Pn{Qz>U`%r#XlA8V2jtp8VxEnb^U8iqg{HyGMs_ zIvjnEHA}v`GB3q7X4YX^?{#N0Dqg?Xq>D}mL>}XF`Sl{$o4ww2j(MxTx|grzRa1>= zB3h`|d}JmU$V~h*M~0SIr}+}5edIQHl2s62k7j*!v@VIXgZ7 zhi0ts9M$9Z+qFH?jy&R5%o~HRac@|TSile!9J3EYt`jhV1Sag~PrKU}Ybnly9V)q@ zGX-k__su_>){_|LrRu&d+=C&WFXy=%se%uKZsvy?aeC_;V)1$pO8wdc7>?s?=|ibR zf}6wtOOl#^6MVARB~8Zeu54#`8u&kGtAY95-DRj=DM7;(m!eC&D;uMDFa#`L{_E;O zp(o`5A_$O|6f97PU$X@g!39BfDXpE=XUrpt3ZfUl=6UEZNy_ zeHVhBvdkYPRPAl%P^^A);nS8^!uYPP0WWoHU4d+zGOgt_xZwG&YcP(Ah>&@QW*fC~ z)@(s7wO9t0>sc~anW6QqVs~#uucTue@zp9=f5z&LB-nOC)Ldq2lhW@`{_{=eJ&HqN znvQIL&KEqgS_#1H@kacOI}T1N!S$4p*&EX3DOE;-c#E-{^(FQDI{*1;B>i`hfrp1p zZd^1%C9eP(mtwn+t!W~W)A9PXH$DAs(to-Zt%F1CR7{pcb2ufLgCO3c1Q;r5WE#zR zbD?!o^I!B^i`5G2W_qH@(wB2hpflwVRp-)WSEd(>XB4uaMVlA3*ROs%^xkcixz8dz zQd_jP{qTlK_lN0f|KH=I$c4rdN+)D*nMauPL>P}+;(8BWv43#t7Z2s8wZ>{c&FNp6 z>5IHa1y|hkhPc}cIfwS2_p!uq zDtA=S2OkN_e+YFfa|Z+Yc_If$p?x~?X%RGXfvm8^CX~Th7mXsVB%D{I{x%m3d5s8> z`u?3~;V)K1eYL%0mTDsWl7U&nleTu?G>H*AzO8e*@oHS^3SC zM2+QX_u~o8$*CLI$j)_z(Z_iT~>d?Mfp99c?w`~Ki z@%Nt9X|#QgeDRvL^R`S(q*M(4yN;=+m|&RB0LgaWFS4uct!vQ4q>z##((81m-PMwa zHz-8;!+-i~fcAN8WILud?P?3mD%YRb>VznXo+1N&^*$0o***@73uI_ju1rLe!aHNO<(z6G>+Lfy z&VOdtg0{uI_$u{&yA#)FL?9ARneuy=OSbs!ZJ$hJ-Rd4A3-a*r@|r=1>rl}7w!We$MxZ1)_ zb&Vs519{&piej#Gfpxx41uCp|^Gu!lu@ZT~vFj@ku=5@NEE)=_4i~$7Q9g z4kMX!bXoX!YQ@yxr#DsvdXeYt3Z81J9BkL9pD_0ZVa@TL(WzX_DY*LHXh zF8M9-t|hB2U#sG{a^u5dI&+kNU&)bI8He zTbn#odPf&G1;d$qPYdk6CR{&6p`DN1kZBj%umk2xF zYBzq+&8*oqg3bj;n{)R&M69c}5aNfaUsA5#Lc1lyP<#4YcSj>8+J7lLa2V)zeU{+h znKQ*5IWIZVUv15x=whli!p%+L+sEYvflln@}8 z<;&9@5QyrV?t0xewbC0*w8%z#ffl*IM@(vtX>N%2jr_FU{5A{6tZh0vZL;iEAj8Vt z+QAyeClQZ&s+v1}@qZ&G--Ux^*oQ^@%x&M-Cb6$~GhTk)Z?qGyCTHgea#>e;BpU4W z*s(BpRm~e&7&PsR+0o9QzoCyCILn$U9_6b%w7G5X(j~h3@8V>^H;v8myBB=l9jQ(? z);I_0meZ;C$hu7`RhLDjgh{_0o)etb>}cwA;?NE+V->%B&3}A1Gd52aJ@JEnSac&M zIe{9MMlw7}*hmm||w7z4s^dlQ~_-hFD=L?L{Z^ccNi}3b_;@g#H!MIpa}}_BNKUb6A7JeQdlr=8r0D>G)DT5W}Ff&#laT2d~|oPs>-) zy=d>RPmXt-ynh~|B*;X|Y`QC5apASrOu~6he|6}eC0?k0N^eL#(dC{qTMrMCdp>QH zLx`{0TAV=YpX0L6(-`*0fs{@pPp;G2ia48ynf$67x@kD_qwV=s?Dno_%33GNBW!R& zV;M$;ni}Bvm+P_JkG(R{S6eL}9th!UhFvbsi%t%^7k}Hrs@b+Il+9^XD-y&m zAlTR4O>umZ_p~a3+`?BPHNF_##YpuHP5D{huQx=NO?Y-V#mABb3kGt25Ro=9`tBB(CvsPYdjtON;i+W@E`4EhA%ZD2;a(4@&Dl15v!tnTbr^PUWRGJrw~d5}B@r#?b-3 zB!!xa5|ndsmW?J^&O&sX@H&#z4RCLFuqO&d;BY$^rN^{S`r-9FI*^gm38*iLe|FY{0d!hHw zjLX!3W3HkTip~#RxLnwAvR1Jame^K0nW0D2OfLn#&NR9#Si*FeeF5Q=r9e{N5oqj> z2Pw66HG)CHj$J}8$2jc!wb>ff5+K^0rp0s=zAar^|FXy2aWY1zZQ)q_CZCYGTz}&$ zSb~GWeD=6#?&m1)akQD)^<$V+r$+%6191ZLdsbGfjnKLGG45Ig}o`0uAFV8l!8)Z{1FOuqY>y?oZXgq|>f<()eK!x5F z(Vtb%JWJM((Dl&mS-irm=&igYkLr?DORiQd_lM`-L0)|LxbI%Esn0uKq`P2}z!yZQ zI4jPGT_MoB^~QNBoO9Xc!rxR!GOA48Ah&E$o>xLV&w;-t5@a5+?>44iTF@mX^x5VcTP#uGuQ$oJ#2I zYu+nt#GA4t(a)sETpaPCWXO2TP9@?4r?6By%aB#piKx8U&Nb6O%z5{1Yu8y_i}sNE zTCZ{DT28QF?bXn3!EDLe@_&e9-6JKsp7=Q)&sgiExUTqJh9f3p^cwIP>KD`Vi)1iS zzB zaF9UriGk_*{lAw5Q{sdd`+BE*P&k1W{fq_tnDTP-s_i^IY8lJvVSi(B;Ovane)a2b zGf~QEZ0bWYl6c9N8&Z9C!Hkt&7ONv0Bj_SnO(GgFvLfe2VHO@tqpPbxGqwF*x5x=T z$(*i&#@!Y)!ih%Es$yLnwo>b6CNXs*CHkN)bc8RAFK-+j3tHW65ov0p332?F#TOHA z-vn}PiS(X7mmKq+RDYWT>2ljKV=(ILo2RM_k-ncESoUI(*+$FI_}O|RCCh;$Cc$4Q zGd8+OaC~0*Cj_)#X zA%er1k%um)wVpza3)F(d4EzC!BPFAkqf^D6e<@%pK{g@P_kX-df>Fgii>5npgZ3B6 z!82guCwux_{jwT!l?+za*(B#WwEH>7S)($9QwS%)eTU14qmOLI1@7kbDCq7EA|Txw zgD#CTSGW))gw(Y`gqUC*?CFfKS>6=o4sCBiA|V?&2$=7N&0_v)d*03iO~OSXvbLQB zLmU95ymtn`i+_;9Wd_m4BPHHDPQAFZh#-gq0PDtUqU*(x@aZe`z&!}na->Vs=J!0U z&ROd3ZL(j(1WZJ1eUPZp1_N5GR#SxqW2={zdtfPK?H?6)vyuVRx!cMkCiHuyEon>3 zghyfV9%9lgUpB2g1I7qMq8HR#gOl7EOItA~KW_eK_3SZH0FL`0W3 z%uPnL07tJ%TZL$Ymb6B2U5;YOSMv}pliDgHCZ)rS_`^{xjiC93Hr81x5VsE%6pF%R z4z9ehgA3MC3qz!g-nE62R55!5b2}Km1Q18J#{iC`I;Ql?mEi90+Zg*XP>7k1xv-oh zo{4U~PJgk?*kkM%Q52T zc<8e&9+C!Cr=e&~p@BMY7k^iI(`-?ccOR|}n13V=?m@#ykUC~{8~e(dhIvDJtR|N) z-e;uoEw=iOi6g-yC8f$>y>nf2anO7sNpm;HjL)UVO=GOWqr4XG%b`3nbj5Z<3z8fD z^oy=eO!E0Ro?HL{L#7(H+eAvqq>{SJ`&p$;lBy7IR6rt72s-oq*E&v7<9Ir`$iSws z2!Gkbqa!A~>IG_1fkza05$oM$<3Jcw;S@mE;TYafY{oiHNzk`9BsBDQc=laEe=7q% zf&@j05a=f>BC@WVni%$cOc)-xmDM%dxM|n=I^)Y#odH!wZb~v^UyRyUNA7T={e}!D zsc26(OEaA9jt~b7F500Sj`A>W`p?SO@qetmrvU&^m{CAObAlD9B%R)hd3e8;FUuZL z$#T4)xj_s8h<^u0J*jg^=0XNtBbI~1b=4s-Fy64GzH5MD3-zlDgVpn#9g{S)0KQsY z8vfIJbu5b7=>Kju^(W~+cledHAP^`6Q4t<9C-)LudA`$W1yoo)WNgwim&ElJ$A42I zI7l!!0+C7cnkCQDojLww0NW++M3wt1ZIKLcXm|Af!QaI3E5!UW!cEdlu_Xxk#T>%{ z^!-H6TZEVfi<&n;L(qxW)&S%J3{++mX3N?@>s|e>+}y6DK;MzC%_AkpOu-1+;ytLo zO8Mo)K>Ay-_qVf$$7Poy2lp3ri+==<2U{q!S~g~vZqg)q+@%B=hUh#`;vYob(u&B8 zUSG`<@Hlx@Cxhn7gTp=fyI!d4?(ecla#x}8D`{ep70R-O1O^Lhg||uu-SCmqsq7#}rfSaA%_Aivwlry~eN(G{ z#~PETdHGTAwc*K>*i!DvFn<>V?<%A@tDA$2vOjdLLGL_R#2^CfYm>XhN+=TXtHmS^ zncWrT8_i<{`eC*mI{$Tn?;?jx56Kg3Mb`oDiX7^X)*6}Uw+T321=I9WM4#8&$5#G~Y<6G6<7DW7 zn_`BzyQ{VYBZ324w!wB)9Dz5HoMJN|h^mORf}IXm-1O(q?SugclVaSV!eD||#79fL zFTNK%wP&UeKjXZ3qfOcdn5cOS4zr8L`97@Pktp-Xqw`{xWq(+}i=VOK1^>K`8T_H8 zL_xx!INyUX#P~%(+k@Lsk4i^G8OQ_tIdnU=sQIv6i=aWlQ8?C^D+q64l+}dR>S(7F zDEjzwGnj{F)VPehs>JQHyX-wQ?Z{NHo4EbzJ;MwjdZ62)ECk}L;NT-Aik89%?*yuQ zUZw4Jf!RO2On=Mms-fuvtNbG+%(qV26yV*kZSTaBE?N(UU7Cd=>gm_%8RyhGsNkbN z0h2RrMD!96nKMb%0ZpF2E3C2E@v7$|=_34hBW-B&!|TKI1?Z8-mX;Z|g zuwZh2bA<@Mowj`ThBv!6>%Q=)X$FbH9X<=3;nA#PW`C3RL!MN5oJmJ|<~fmf{CjkN z(>@wv*9a?3qRrUBogaFLDta9LZ%?0<+g$>mrcY82+ps|{_)=PT$uhA;DBS9O16#-e;L*v`2cxvwJqiXRf0K$5vbD=!J_q(UN%d<3l03PA>G~$=Mtx z-EW?vkAHxh2;p?CVx76tTOA`Mbnnw=LIlCnh~DF00Flfl5S}Cm6p|abMJqe26sbc( zC~+~&rUX!=r$->;172ep7hML4zh666h6!3Mi6X6VxX9XDSk zdVhKNJR(ds;vqY+u9!6`bHg0%?1W}C?IFiE3CiIy!9~}6{3R=tpizocPRJ1VUaw%J zWH#j}BPB6J#Ebz)gdjM9GIKnUY?aSA4oU>F%Q27Js@PPRkbyVG*HQ9KZwx$dl#1P0 zbU^CL**t+Hxs;Q?xKvz2JCy~oG<0I5xqs1Fx*%m>&sP+fL0?XLa&QTge5`mGItO;_ z{6*^?rhE3N7;!hLZ2Ja)M-k#V1Ma0VtH~_uT%)9-HzKBzk4X_ALK)9M8+7+XUA9ds zU1ObCJ;5C1fn5t%#kff8(I|*(DmN@tLU(shd7Kfw2FoS`BV*ZAo@T+bD#hPz>wm1* zmpaxueDu(SW&cbmgo^EO-h;14IyG#~f{WfLkoLgR9_P@nW5biN8snyFMShL?GXvv z>zS0TyuSWENn`nwRg4FqD3^?PR?#CR$B}qg5AKRy&UgWzvGkr^IAeuW znrl&iZ@uw4_x9t*eWyN`{(ne6=!vg!?rMoYdQMEE(RZF(=SF1}Q z;^)}N8W_9CcKf?uXK`&UDAvf!s_n zqzNEPDfQqRH|5d>rI&0RWRpsec_6RrNeK^%8l*{o2qPw}H;EoKUCZoACxUDxPHBh& zjmB{A@O)EX_xK%W@2ndsOl0{u3CE(rk>H_1C&3eY3qqPqBPBx8{o>0VzFOBqhp~rg z#2O`z@CU08M%~#BPFFEqVsZrc%qbLc2E}?tx_fvW((2o<<;}L zYnZ00hmHa)AAtaPN95)P0aOmcsATf?h|^g!reWm|#-YE2J-tq-+mX1&HU^tcqDa~; zXriPdEFzGN$41q$Hv&dK9*2B@(wiX0It2@8)O&mfEPrXaCDnq-=0G>tE<1Mj_`^2{ zdw_cEoNA6CR3j#=13YVO+Z&D3qD6r~P*6Ob#FQwKMKUMc@M%jZN~)xw#CI&8c01T3 z92~lBg9)9RV}`q5Mq3?olN92#0OX!HB@mY*CDQDNel+;i5wTy1>NIx|=t%R)v?C>? z`VJ9KSATqojp2ejweBnb}BJBPIYa2t-wZT@tg6 z1jr^4o}e{$F4q2fl*j{rL1$mKR4Qy6&YHg?CA?mYGr>cW0HG8Gf>h9@d08P%I<*?8 zp%2JOgc>1UVeJtcB;c`%5n4q&z`;8P(VL3n>3^X~R%oem8@H7wl&-nSGX^xB#1d+N ztwYbDI+-hXE4{hKNKPggqu~0yxLzRU z6UOK$#;upf&4|gAZ648>(y}&AqjpT4xknp{KI!LNjKwk__Vf#{DjXgsI205?B_R;? z+T@G_!N$P#wqmK}Gdq`9-Y7HL7=c!h(L+uPJY zn`)rKGYLp*6C)*@JU4C67ChoSqqkbbKZSf+0N(irvQJ#4Ozb2eeZ$V?+DLWp>5=5^ z#NWpJT1`edVsdL3soa#9AH<`r7}dU#e}AB*Yh>rDqYlQ`qZyJJtB!4LlYpIjHMO>3 zSk2WaMfCVt3q}qh2O$@ffXA~ubUSwM$9{rqNr6NaC-PIDJ!d4g;1UMsbKwk;Od_2J z$!_k@7&usHcbv*6uOgx-if*!%iy><%9C8{VX(NMZk^u0Lp{6FpHUbccMYk%`KYydQ z$?A8-o#-S8WnP_FqwH5Zo`q0t2!jZ-+6)9wVgX?jvz>98oCAY<>$=g^l&BG0r%w*- z^dUI73*3um`N-*bFm&_p#e6qHJQO)GpG`tAx`X;Xb7?qJ0Z);mHHeQl)@Qjm5WaGrr`ORRZxql-iLT&*! z%qlr|sonT`o)X3f`By1tb#mz%q|UKzK?M&@qBCmd$=aWFf#Vou2& ziDsZ2>T+zj^QC^(?(S=SFl?asJCk@}9i6g;qK8xCBXWyjT%h~b`8}T1&DvXG%eW(g zoN(0%E_4CUWnG7%UaaqGJbzj%UD!A99*~Vc%)k<~qjq+id>c=Zhu}@(ZMSKtbDMZ^ zQqsuZyr}@h4v5;=oDyYSi*&kXfQMprP=yQGX#s~}HiY;jyq3__Y!nN(x1SKXTImjK ziy_~)0=jS}s1Zq~bI7`m=s3pJM?})}#~t^xoI?cyhO%fwvj;`}zJGXLSLfSAad+ye z$%gOXgcB0j{j?o>3^O+YaeeCeFyaf9|HUlq&i86y!y*E2zMed7H{yVp5j2Dt~8_3 zmje1SY}4Gp=8_$G(W$r#I>Q2y0f-|ei%7IZ=Ah*>MD(Il#Wn4X9SKE~z6>{@piFJz zcqOGYoN9wQbu;Mr^?2H<=W%`Je25Fqie}z6BPQ^Wf3(>E3)B}l{8dHj{I$>m8?qf%?-E*CAj?SOo^tviVn4ghonZ!IJ9!vP=8 zXnt}$54PPs3xoeTbC4t>CTJ)$!E!i!eV+cGOQsaY+*mRueCmNqI9ML!*ASz$#sMH| ziC6c2i-qD(Reuy|5l*8jx@!D?9+Mn>8r#p)TOrZ{B4rsJ7li_30K*k)5dtH^(eGq~ z$ZxeaP=sS_a6cc+?-Ol}*ov#m?WZSF<%nO%W~6TE0GrEMl7H1HzOJmVZT{R$lwa5RPquze z&&y#&s{Z((ukWu?76>9cwp>6M#8iJb_e>)t6C))ulwrN4iYM~zbN89QI&skNcX`p= zRcGrj-+u`2888_I83frKy4%$5%6!!%6YqB}T@Zu|{*&P(njIkjFY!8HIdS~NAg;Lp ziX$e&|9=}|ige#;_cAjz-0`Iy9dk$(Qym-gOZTywcwD> zbK}BpGwjLS=NTcaBtK$7P3=`zUYPt!%( z?cGPU;YcJ9H<+{H=4mo3d|x5>;vE7M1q<@@H^4Nj!c0X-9~oi>q9Y|Aq&~1-gb%|0 zaet_L`Ls}QvLh}hyZEpCmm_~3IQ($`KFPD&(0e9WpnJX4rw{m2d;!jcc4lL%fFH7X z&*@X8(f|wTF;h6L)$OFgiKWktE0k9#IpSx%F6@T5YX)VO7r3I}SF4AI%sm=+ z6CclAU(H{{6JcsV!W!Ukuk=s>BPPhq7sFkt&{q{B(7i3qMYX7q(XfP@=&zQ=Z+}G^ zNF26viVjOMw+R-Y5d7<7q*{QChJbMyN<{N0^F2ac(6Up!u@5UbdhWmaDh z1RoOzn1BGQr6@!?4_8Jk%7agIq*e0d&}saGkOhq*)h(mZKyObv0joFf0B=q`J9;I` z*7&ka89SSiLf^}4t?z*D9^gmgL4Q9v(tD))%8-QQP*Gg1&qIN@o6#SgJRVUxP}O^N zLP!H!8UQZ-vA^W#_WAp;uVwM}9(eZ3P4K5V8@%j2d)}K7xj&BodtAE5fdGQ2rTBIE zJ_5iUXMW!!B_0*jLv;k_9V$O7dvb7h>*)~q9MN5Q=%?y`kw2aX*0;X&K!2Y=C=;`> zKo#;);j4Dd-ezGF-rM2vww&(_fB@4Xlt3#2_Jv-T)!v@@Cx^4Q!2sZjMy&!dn#L>P zuiKRF!$Rn1I609K09QLTa_G$%jCK+DcQ4C-76hiUg7HO9;;E$%Fo1vgl|d+u%KUNA zh%`fnlyl*DCQtK84t3J!RDY@+A>*7*AZLmvGLycF>DR#7#+c=y-vQzLKz-95WFx-^ z3(k11OMpP*q(TudcOriYW}R5nxKI!;_jGjlnrhaly7f!P@d6fE80Xby_nXn%bwnZ> zW`+N3x}V`pc4GE++j`e903rw;M!oRNTs>O;H~lNV)+X!5rB3id8h#3)lOePdP#^;lD$LySR6ZOuC z$1F3cR;jnlJv)rUGs_8h5OI_(iroR>hbjOQ5)e52Sy1JxZhy~z#b*h6x>isSxjld; zpW&C)gos&qYQtu0Recp{n<1w*k?j_P~ z&+Sp2JZ3n5`Zd$8(HX-NMBb0ZnuV|IMKZ;1dYxN{_m*3&6NZrd3E`R4Zyqgj%8I7n>|D{Hf zCHNNkYWiBEQH{&|zhp(O6EWg_bXub3}P`O0^UD79T9C^`mz%c+!Sec55Yyv z2a!7*mE!wL)_)@=#v0!i(;4X^$-W=7vF?>Dsp5Ytbl5etmhO!Ac}BxkeGHjKZ>{UH zwE8JY{40ctR9@4e2iG_l@6J$;5(0_`*^EF)fZ#9~QAjN07mN39W z?1W4F9w1v&EZlnfmF`rkG*Gy6?t_VdWx&$R!btUr?IuO9f5s|#+e=(xf5%w;n$(6$ zCkF*+$JCQ@doLC_KR?;Yqa)}NkDT+fGgAzMe7L&uu71e5i}K$H-#Q5CFD7^zwNyWt z8j#>$+kZ*Ub?8ScHGh)WBUe4KQ`AmVzCC+rng=sv$qO73MES>ll4P?`xrFb_B+O>j zuC)&Po$s2lwS^gnb8H401+3i6Vm&j*S-d9o%ZUjsVP!&*(_zgh=aJh1DUq{|pFOqG z4DW+F`w-NmRxOh$an`1=N=Uf5KNS03RQBRBzJKVAyN8KRcnf#=qB3`MKvNg_j>iQA zT~^**m{ld+O|=H~2uFe4zHz_!Bp4DwD#u@lTK35Dg zq<;|*Km~vUHB#ho1sc^r*AMKu*9fX@j%=mFHpRmN+8SfKWMfSgX#u)RSv^Pv2{tAl z!Pz^T_;n)J;;<$y8qcrWbZo95hj@FPAYPRnF2pD|O__O%ek3(+B)we4;ydD+7|=&W z10!8EB)gxg?H(=TCQx=kmB!=3Z*5n5rhg+QKxWZFPl_57H!9G_@>g;&SBa$Lp+}5k zcOTcb0|PZ9ZkV0zdO0h>0ZfKRWwT}LK}aZ!r$&3yyDJ@cS-@Oo_HEwHoE%dG0!69t zxqG75cid1fM2J z_tXQgX~@;ce5@wiikqF8v`Q?j%JR9hlqiS5aVR@#4s0N9-%=P!?qcIK5H%1tVt|LWfOJbhb4L~sI?A0V z%t9x7ysyUMK-36lN6ve!@ZIu44}Vd;MsAO{53QvaQ6iflxxt2ugY+s}UTYf1#&2%7 zBPQ4hcPpK#nuZ*q0hDDJ22hG}Z9DK5f#;;Mq{D8vBPKXoe>E4Y@95TY?)Uk8>t-ik z>OR!>Bt5u%JOL<&yQ_un24qw`EAqbB5+)e@I^9^1F;6l*GQe&h$0nkTFMo0d8k7K+ zNLYil52;isupGSVAJ}=CQh$Dmn>!^Z&!=Yr4~fo<<>%q|IeufN*gIqe9X_C)s5#Iy zG#|+7-r?GkxKLX8H$I!9=Yk_4eD1OFbRa|eTbNnjIcWt4yBeDg+!4XU5r>M@BPKrp z*uKlZL)o{uth=usBsQjyqFBrpQ6%f!f;e#r(sS3g*$3UWNhKpC$EI5st+OYQGaTAe zjh_8!dD`0;8v}LovKTNJdxfT-=H_>`aLjUobK#-XFAi4=0*O6)=15ea^9e zjx)*f#y)v;JC1nqSU&zv?Nh*qIyn}lFp6>!YsS$@128TVZW4c(eAE}-p(I5lpz(pX ztgCBFI|6+djCI1XP<7^Am_K=cyb)8fGhHr zVEDdO&Qgx73w_$7MRB;qfW-;_6!P!klKuQ})S2zQjJWGddg0N(^KV4r$Xb)9OBNR{ z{_;P$>FCeaCFdh08Vthz`Jm^Li@zB{p@%Yj!EuaM&K5i8wn4%2uUEqcACfH<^7TQ% z;pl%GRa`;#!2|POO(P|G^|#5iIn@KJaX8KWT9IhqZvSWMV1zCmx~SI>`Qxc^00jN(7(cg+fgAb0 zJNRgFc7h@!BRokIPiSJS%7j-c+u**`apcV(qm1r5B*!tdvVH#g|4-Me zm)$gN!VwIV1|UjA9QZ4{5U*Qde9 z0pHnO=o~bJBPLWAdN4grJdMz9P#V=jgC`tLwc+KEr8Y$D%g?2k3uuJUj8u+zMJty!@3U&`h>q8I&B*({pQ(ec{!{QC&wH1k zeLY-&dCDH}cr_(`K6*#^?^~fZr9S$o)1ihqKULF5?`kyC9-NJq%Gn%%`FVfaoTzbEeXePSM5JM#r3 zQXQ!ydw`U_xi>O%5Lu4A==*ybJ{qqyPxkb{^u(XbR`yICBPGx5``h-RSXhz}95-e1 z@|IZgTIo%#sJ32>`T`xL7GI|wR@;0UEOO*n^vUwQ>I_cc(`6_Eg_?g@Yjwbo2v_m) zuLDh7u4&=TLm@H5ZSMy^!ds>J*i6eP_K2C@Ppm!q_5IzmD7x0s==&FS9*#yPt{yAX zLJwv4m@Tu0*z=QI+OuT@(hep8-%vzLt3+2?!32#>%uIaxn3^_gct&JdJKrawGR<(r z1d_7Wm_h=K@u|84JraM%X?8e190p1S<;&{NONg)^*=H`GA`n4JjIYz6GSgf`==e)d z#L6P#q#K~474EQn{uzeK85-T^+tr_C>}hquW7F(K{_{@*-631!DZq9Y7Q4|acUN24C{qnc6<7eGcm zJcbL&26#1Cn3xxkC&gJgBf>5eA)w#3?oJ5ijgzA_MKnQV+?rJ!oG392v}V6e(sE?V zCD5ZIC2IsZ@S@JH_Z*r|CKdi?$iZUH>C55<4k(e!+x!5Kh!pchdD!44Qc*h(SR>c#cTRA~Ew0-mn_ha)DY7ta-- zU@sm#C9q%PImt#5ss~o=wzF0 zdp1FB7;6lVyrs~O9h@Q_^5E>n?ii=9FkY(b0nG1Vcr9g)VlPlbmclMMLyJ!X!V$=C zWe(qTZL+iiuTCh1vk$Q7E3^q~jnhblIpqcqgzbOMdzz4K2syV%0UGKKEm`SgHa8J) zybwX6g{cBWW`s`wv*rb0GZb^P&wmG_>5ZAlGi!neae8n*%PHBXk{48`$!{3Pe3$WY zC8uwpFDWBrOznFnb<@{>ZB@U&ziF>mx+5j+=#KoXK?9cLl4l^Mm+5?~nX=b~(xRh6 zk63@gD8eek0Jc^E*Nv?ZMd4+6w)JLFy+|W~U@AG1=MXaAzY?LT(Rdc># z@{tps9XLdWhAP}#^$tRCelrhu2fnRM@S1;~fQE=iwC8qsj5ooBTW*)U#xe$~6e7%P z&5%J|pXey37R5PE>z&BMI+q=zcGBOAVy4Up*siug>x0@Ko-){CINCi=f!%?Rnj2&1 z9$V)^x7~8g1EuTu%e`JLh^CH?U_4M>)Y$_S_#Y9%fyumS3yYSZ^TkByfn*R`v9f=A zDkauiRirLEXQK<^c{iWYsOqd8o8jd?BPRCZ4^JlqfcDwUyR{gU0;K|!-7y)5TJ;bq zDdmu;BPJ6>B4~F}n#yzUBn#|Z@*JX-GrAG({}?d^GzdicHuXXqB@wFdw-Q5&ID|O4 zBJpT~rI;<;R_XDxTi>Z|<+iW{%J6?$0GQbUn`zS;Zd!&gQ>ZvK7hN_= zKrP5uAgqqvU|_(M)sqYe;LCD3bG1=2ZG5-!5VjT0HJJt1QgQO0#vriqt}uUUs733- z`Q$gM6nd(YYNEXAlU8p`vNqH?JhxUu)Ek#0X?+zGj6bXE*`M`!yT{GUJH9=GX&aDr zxAi%GF}|LV2npV*mgy#4`#ukoDc<&TH!5=V_VqopDo;CiImDqQ0R)T|?KgpNcWDB& z?f~~z&3rUjV^HcFz$E>W*FO+0$7M35JCC? zcj+g8G`d%iZX3U{ZvJGOcc*D2F*bOI&(Jh89>k51fE|sHVpq#TUhT#Nm3@y(V`zVm zL-{#&ohCIRL6JMS|yqW2l{{C^UJ%q=v;|r#%3B1)#~EtJ3~i)in|?kO~D@{%U;yD!VJ1o z-Xpoh@|7~Sp!Fflbt5JR^MHN9yY^5TBPF+#l*mJ1gr2i;tEu2r7!UgFlgkrEN6WNa|8q~#aL6-=I+E6e9ZnRGRyJkf=CScQ6 zq(3b5-Tw!?>x6%ORB<#NQA3GTj>s;vUn=mfvwg?fz6T{YDQF^UCK*B* z4^A!^L`YLjh8|=(uqSp>F!`QjG4sXnUpnQ3B*P-jq-N+q<+O%?@3)Qb<{tiEp#1JR z|Cy-PzW94i#l5ndHs?i%n3N@Rqm|EwxkK-ANh_0d8%dZwpqie|9R{ZH1FBxkK=u zG9S#vdrz}K!G$Yyhk5$EVi*JL2db*}ygl{o)F}NaFRxG2>lI$!QdNqsKPf8LAkvVW z!$XKWI2eE9B^F(&9zP|{%bwaWG<60mG8{f6BPBA$jX7ne^(3aLr+cYhCzc&_DIc{s zI5?78F8<=NemG_-iA(q!?av0!%S^BrP0gSkwme{1v?YVHus^uTH7-fw8(l|^wk;ng zIycSPiD)ngH!KwtIOFHeNhH}t5d+cn_^JFybNGKR$J%NqEt7YDiLm0@nt^HqODJwu zdn*KET^BhhRaNkGmTd56E3_d~_>KUh6_IVHf@;xJnGxjlIqsWan$2M8&`( z@)3U^Q6vmLtEGT%`~-Mv)NLJR0GNh8vq&M??oORd1HkxfNf$GK81~;;4iI}%F9(q7 zNW=(2j*Qi$M}FQM4Ecf@&@~-bbiGHBPQdv>Zg)&lpC;^E9wH^0Mc&z)fdL~Wq!)Vv z$xZd^E;@@E#|cxvm*NM|RaI40RaI40_Xc!c)ciZ% zf)_4g+o*-Q2~MJ^D5RjlkHPnReLFn3wC~~8d42C!QXoLh2YS#zY4J&c5z{XsM@NRwQcNXEeG9;Su=^wLl{>z(W;n*! z;(RZTR?Se%iXPa4sSe-C?C<1b^z(nC#c`byn#tp&H8YzjN#hGJ#KeIDh#d79(Sriu zu~Q(_HyBo4Hd$Yzh4Z-B-`i1oXJ&VHXK{9cyCbyMZzCqcq7dVeiC(oXX}Uw2xkee7 zLm}vB&0#d_ZP7=O-c3Y4GGkA}^LcpZMteU)uC=W^E>P+E8)gI}B}UwLS;c?ieP=M| z_MFFfVm5o+kO{ql8bue`w-$ea69O*phKAfHI0X;zf)4+ub$tu@VyL2l8Aj3DK(t z$epl22Cl>>M-lHI5YE~1G4Lz8-$jT!921+%pd$g^K`N{ILe-6L^ILyaz2Qg!VkiV+ zpj%Rq)-Z*R|2rriY!d^-^E@CNvk%g0`_B`+proDO1lX;WemqrZH>sLyJ&)iTRFy$R z8GQ2Jx97L(PiHh~gn&EFf#i323F)Z#lVe;XCNU(EcyJzvAPf8M zOY7LGx4*>m`q!_xhme1HflfP-fFmXh{qvB9qMn6lG!aa?^;bmw%^1VF}WD9#nfhMGTI?drUA7hNpKR zu{{jC0MJuGRP4m=8FuIvNC0*8ghU+VZv7*)ZI5`kk!bjDi+_J!on7+EdCfxwLlg-Xp(%eTDyur7^!6&EE+>#0=HaQJu@FQ|fpTWbjT96c`_6&cJ4247!tk8z z9H6=o0`?-dgKDNyS@c{g{vm+EEFee|E=Cw9K|uqk=@I#*@F4Nzd6yvwNZgW1|-Ptj32k|wJLr@*L*M{{+uXJZOXH4yS=sCaGl|M?^4CnCO?rfN->xn?`TJa zFq*{v6H$n#Xcr?U;k@LP>-#Rdw*)#N#P|JV>+pF%@$E$xK}9J_e}G|7Q^Dix7J&R) z`&oY>fhvC(z=Q~Zswsx!cO30&jreR;(Idw!x^HW&brKvs_Dy^*e+LjXcP67#{0CpG z)s9KRZH+;bcQ0j&jA7K4^i)JcAdxT{kE_;Vbd8T!xZ*63IFwG9L(bWtKM>Zmy2ovh zi=__;5ai)-m?I_5*iEOH=RyE(QUnqv(Vq|gH6m?^-aiav?`SLz@?N%o&;`6u3T;$ssO z%n(KE3=UZQ`V0)z_D03bF+uiR((8exwe}GEdcurdm<;+ieaVN^V5^fco7K-MVIu%w z*=*?E!6IA>;0B43^{<>x%pH7QG!h4IvW$Pie}$Ab4<+kl++|cQ0O`K(S)QT^lqI+=@eShvLQE-QB%NfntTy{x|nI zc}UI}XYV!Fn(Lcs{XAb{Fp_Du1A=?AURv%XcWhp2BTIU8q8|DZ0$HSIK0n^|NxtH4 z*r>m=>zfG`fY)c&zdA+r5l6UMzjtqlv({|wAIG)P0AcA47PvZK{8dW6|C-puSP(*O zVRS^Fl|^V-?T(C1!IeHSNB?Qiv-fKb)QW!2n9wC!R;zTd@*z2jC~VXv+pb;OwO223 z#SgiBM#}Sx6gwm$Yw4U5Tiz2m7{UMz5;}0D7nbvpfP<-2gbjyrWv<@gI&_qfu>r>D z$HoObmn8qy_16A|Kzrmvbavwvn8iPLXDBY&j0J9gU?lvkBQqcl)_awjb=f}A0pd+V z889HQf@R+IQqbI=F1v`^!;dLR6@=9CXjMf;W-1I$;qQFd%V?a7OkeRk+$8VJ5B_x! znKDT5!&{jGa1 zAfL1sf^xhqj#lT8+L8!gw68#5%AVpH59Y;5CeBBe>IIUv2Z>X&+?lj`+US6)tiitAGhFLE+7*nJi zFo;Pa*{dM1`bQ>rQVb&ofdC4m=w~x{Z?hNKb7J}4X5UM%B?fN!%I8WI2J>&XlNXvV z?sq4QY^(dS8|r-(&;1yM7{opG*LTH-$5(+qP7RSCt@dW}zQ@yA6h+A7V8_!iDBPhI z9oFvuMOms#oV63W#(IYYVjw~=^JObOPa>4=Q(6_@R6YX@OdUl2N-Qy4ln>y-Cwkxc zuyE|hxc(58w4`zYpQAAqPNOtdF8u8nS(_MIzYj1C+?{aP=KaLrV~RG^4qD5c3r-iY z#?YX-K{R0(BHrqG8qc%tz9*+Y@)+Xid!UW?OloInZyp+(V>&>pDe|m>oY!mQEi8r6 zMCaBAw7WE;K@qB%)x`2UY`@_zA8J2;F7Qf)z@k&ak3Jj>tJ=7^@*m@{tTJO0jsr#> zX0>uQhW<%FV7GdT0+Qq%+h}5Fu66&#imZO>Sw8nm%l(2P1^)T(bA3{sfExrl##&WS zF%zWlg#!3l<4697j7KuPaLhaFZBhA}U4CctBiFWc24k{-u7I8<#QP`mnv zf0td#HHSmmdaG0Yna(e8wXbx+*W-vIjO)z5Po^9Wpo6S@@wpj-a^NhM`Sco)tck0e zucQti`6TIIiWd0H}@4b7#;sNN9Li$7~6NDn}XJPS|{A1A_Iu@C|S^rKu*B+_Dd z>;rQp+7K8)1>EHAx(<4r5|5nIixP)Q=zR!EX~gwVeukDNYU)V;JddtKHC2glF00 zEt`^HQN+`Cc&ztcnM^kRhw;y@cNL47Q)*e~NdhbfUtWJ+JU}%>C5uAxzN-JGa>+G4 zVk-ZtdI7eT<8$6=U;nyI{nsZz;O|`O3uFDkgRSe2a4Gjf6#C-}Fx~)X(D|fSD(#xJf zOLeRP__VqInttGE+ZOIY*=IW>l6N%OI)8Be^}qd)1Ri4?MGY&o=YtLGvLZI^h19)` z;WXl-C_)Gnb1w0NFMB&~_^XNe$D;A@sK8BBQcyvd8=(-TuQ_tqZ-@R^^aGO*;v4%s z%TYQ~6$FAnNw-lQ69MjE;3C&s?bQNEW?C7yY<1Cb_#M#!{0I{m*b)Z)MgyE=0aPXhXc@5$kPx zdmfA03h#&7%>O(KMXh)EH($DH>WVvY4Q7mz0ooy)$WXuDo7RDE^#VWseh7}i2-?yUPY&H914hJ4DPRe2rT92fI#}7hzdt9#CBl$y4aVs z!Z$%X$n<9kSZ+sFhU}MD%+F&*G4{@EpYzi{2LJzv_R*9LXlCEu zhU21!Wh8`kv8oe~5=(y4SGQUGcoFTw58Qp)o<9|eNf+Dpmfz5vnDyXI5HK3$*Qb^S@Tc@QK;kms6r-WtBk z7|o|55BtZZai1K1kIxK#0j*b`jf~%sx_~;N_X!!_4XVxx0mFr=%z!oghW}67Kq{#{ zf!!=WZxU5YzUPTf2bpjDo<&Fd9QIWeNj502q!@tuTHNH^u>9;u5q#;_$fj5%-`n~n zV!?;pz;6k_Tf+=lO6sVOot}dIS96=^ELH;>J&vX?>`C43`z+CeJ);)K)YqSK(_>c) z5CJjS>`8?>1~PMsE$~BXw(KN z&*pSb(HrL+ktz-+3GgD^G%Rx7oLir1Fr_)?Zw0SI67R)xlL3Ks|Y}b-ZSsgA?Hx352>qZoHdiT4My2dUq4?p3E1@u zVxC>Jis;;4E;_Sn#Nb31e4gn2T6S1+y`gDEAP!gj8+Dj}0>{Cj)2apc+wy*#{wI*1 z;}CwQ@lO4TxBK{0`L`~0oR>3tNw(e?3}HGxge7duUDmhkKJ=eOUsK}XF_J}~Y4A&a z@IPN7IL*!KP*a+=d>s1cj;eLh+&6Qs_`*>fPx2_bdFJobm(u=D06`LQTq46ask*mC zpPNt&F9hyOIN5$}<(fI#NBcc#=5u11-GJ!2F zyPv^ScBp)Q`b9@yz7KJ@xVdhN94?dyDR0U*}FT!In zNpHDbejBkf0I}+;kuTjeqes(Hp9bpER!AAHlB69~h(Uiw;!yYR5sezR!#{x0=ehsh zzQjKRAaImYRxhmSn{!}o4-)}wH)>uI#tlACrmtw)Sf+ZrEDI8EhWXrxV~4mG2`Xe- z)i54*d)<6By5!2viWgv#Mw8&PZu*Zlwjz-`*73cGeE5JDoqYI9Z065R2#f`{>Lyfn zDU-G{;s;R@s`x|200{(y{wC4%AeK7T@!@_r zY)Zny(O-+x%1_~jJCduVhsp1)4G8Yc!-K(FFroi~O>>6u8F@Zy^=4x?NL0z4-|0*V|qEH~$Jv%n}%7YgX zWi=B1-afRS(~|{9bwa7@!I6SUzhQe$STc4SA72I3$^VT zLtyL(K>c0uO}bcb2ofLk_f#Yzs~hb&?F_uW;hUp%Gm6g%fm((}VjTRb&l`8q!s-u4 z+CbVQuyUzAW@cn3ZNVHd@#N-<{ujmQfgM7W>f4)3i#LRtK?Q>JGh|O=68dm6iTvR0 z%Kl$?3+Rrp?Cb~u*nU?!s#hYAY7K4zB_(kyVOi^SAqBf1~KbxQ&U>wDLt zI?Evkq7=3BH1BZ+o4#5;&%n3jq4ZI1PXN88_<9pXW%ocp({Ar&nrkTu#>XZsxy{s? z3si8TL|{;_W$Q*cD#s;;L9@V)-|q(X`k13LVK|u*XoNtg26+;E^6I;3lf*#vNycjgcobvcLOK!t`MvxlwRZkB z5NNOV^|y(G7_T8@*nFr0lXxs`UVmP+!rV;6pv)@E+~r|A_e_fMjO*py>Uu5y!Ke2w zt8UE7BQc4DdGd5cvTmAbBfnS93L~6yj$*P~3G0RGL3k zL=_ZW$m2wcxbSTF0Qa5?riB1v)Hn-@8v+6%MuTdKV6R1LBc*2JVlf~*#c2FF+8O#t zy#s?N-YIYKOM6u&ce4l(tv(xUpLl!)C`HC1;-RVfiC@(2@al~EIv|&yPPB?LY0Gw) zMV72B^HDr7z^~)?HTJkLl^gP30dQ915XxFkuNbU7yXK+HspF*KrEZ0q&w zmANNZ@}Qt%2>8B;M+|(TZlr|Yh=FwC-TvAH6T^FO)o5wRuvJnc!IB_!pf z6ynYkfvmG39;Sm8Gx#03~#jgLl)a|!)zPTx2zOmz5x5SNfTR=SDmDAntYW{Rc zoKn^ATFr^zD`zc~t3rGs7odB*SpLErlp628_T9}b{wwKXjt7kF!?e@ZnA<360bP>)}Y-m7>N2XINjCV#kK+4-+a&Tn&CRJ2N zU(=S@I7FOqo_ASA6|>6hJf6VdG#xk6T|i!t{!?uurCEHGz03oh-#Bw)8Sp+rF}Z?t zm~I9FjmHbKu+LCOw-uIKU#pi?weo?h4vxYA^QT88Nv`h-3C|38-#gh)-S+32exosU zKvZc9$Z1p|KWSyvqL(-6ewW|k9t69;|r)o)u9 z;cWubtbuY)Wd|2OA0nt(gYq;!48C$blz~>RDZ~g{%gBezJ;mrCu#Yj0cvkTCVN^AQ zLqIpDg|Vfg8gxZWci~oRIr)J(mC6_Yeh z(roN&job=|#Us$&PK)QqB;Z64=ynu1y5GWx4_n_ijFN5!dBH753u@AhakJBW0m`L= zNfMY(+d|wx^kQCj_uD70B9A@Srdy93ed!WU6Bf+{3j+G>doIjlp!y$R{4bZ6tM$>{ zCf$l>YN`tib3*oPWeyhpF$_a2K^V*WJ-cb5LMfNTX-wz*Q*5LXD0A)0tbr5Zri;^M z62oAco6-y+7F`jnUtg+6=He(eEUv{t@ZHu9%_ASu&F3@kjR0}%h-X}i#jrKzkO6A` zyC5G$o4m>i!fC~g;JKCi%Jt*WL=;k#5mETSc}@nz-JSbgiClkEeQF6lR=?HZcePeM z^O#n;avs~tS8jBIFCqa^3OHr`O7-drnkT<&e*LjzzOWyv{}6kmuutBleY&bWO6O`| z>};=UGyxL-*k(udgftW$md=y{RyBraGdSR5uqL=opy@N%YL@qt%y{6}V`c|^T}SmcG( z-2FYhB_>NVV4V#x7hdnhnuActe%+RxJ!Tt1@UAA}b=pd>ORNV}8`n>4ZF%-LX2hcI zA@~dg)&MDV2vC{mAE4Q{KP71;(7Yo(9~xRp;=V_wkeh-2K1dIuhV7fyTHJdq#>Ezoi&K|t`ftGdK|wn{I}7E zF|mPyji~MFbE1E$c7Fa946@iLoggq;0oNybP{H%{{t$E!*2Ao@c}BaWJBKEnpn~E^ zfs3@QF-qhx@g^9UShn}2ek4WBGBbW90QB&$YyfMH8n^%zRmRcg7HrXd1EvHTXMa?+ z&RC`&7$xt>>HquwcMEe9=Z=a6mQ=8;dQrh?RZL-{l|1@Hw4HV^kbjA%CKN zT`c*U`Q#7kjFlj}64koT9Yo&wYuZT4 zNPgVw`H%CJnxN|AG8O)%J##MxQHte~1i@_gD1{&&n`NA3h&kn?Su9*eV;hkzr%q*- z`*^_*#|Kx|FOF+bXq-Nm1xc-0{AZc5xs7`p9N(TuFPo#lKxjgmYb@zrkh#zodql_5 ze*bK7R*~Nj)b;^|Ay7!_b=#Hp1$=PLT6^Y(J961p#z!HggYiM)YFv|chqq;ro6Cmg zK^xJXYgFX*7}1A7DBKBuz%GD1Ej)GhHxqT@+@0;^AkVwihUh%(VQ_t9NQn%4K?H_2h?%KG zCe2V$;Y>_?{DVR=p|5!br)UVOha8=Pp~57qB!j;HRazSK(63?OU*MDWkG9%KBwt@B zv45#Qe`}G3F{JWO0oNGUHRm9(gMtxCe>=P&QI~JTR(^qY9y+2PMS-km#IH~q$+pd6 zk6>J&2(K zYinExl0emMyX5*YrbufiPMp_x{7vLk$QfnUMC0?Op5loC>%Y8 zZ374|ekuMcXI<$FS?h9L`)e5yQNW;p!~#($u=_tgAHf-2-}s^v72yQw_w`AZ7QJVe zQ2Bkyt>M)m@0s@K3S)Nd@P770ZBt-aQV8z0_giCAX|V3GB~67dE6?QbV{A;}6qN-W zOP({B%*`FRu_gGGO;G=6(n@XO|5|vS^(6*A34v8eV-_9uM^cW~1UjGYbi8U^v|;M(Z1singNKdZN%Usm}WURd27_)ub528$B??; zbO<13`$3b$r^b`=K$$J?oyY`Ts+6G4lKMRtSRBkICxG8XMB=O^TCP5lrU0Gk9s-Bq zYLh73h%fZL2?$7OY7xbDk#mz#`W-$Whm{mfKx>J#0kq@M6L0~Ra(Q1kGZ!SGY;QzAEj&tm3 z7PE<2Yzx)kT&0|;c>Cs^o2}L- zu@+jfw$1B`Id<%eu_1IH-|_Vshvzn+gB8STsy= z4H3okE|?W8*WGDyqB7ll_Vbt5tlKN*2Dxtz*%Y=Tq!gZBaW}JcOXWdHyxuAa_CNp5 zN)vUxtmJkYq9$-|Y{DY_3B;}gYixviQowWwbm%5?L92A#zl8@b+R~uvLWWHJ$l+NX z{PqyDhIiz&5&{kDgh2N*w8SA$lT>${Td64lv!Hm%JYR0dz;t;W5I&yrx+o>62`ZRv z*(q>+y}M9z9M3~k^Ea@(_DY5N9Ao4pJziCYN*-dH=w=%z@{3@Mt?#;r^`>OOgMieg z!1Cu8mdQ%0Omg_xoG5jh2lpXTWq>Uc2Sc(c6Te1QU`d3Ase@J0cX0dIaHN#-YWw4i zDt|?_PEZP0wCphDZ@f0O)bxu__GY3u!3@1L0xW}(F0=!v87z8lUc}rU=F_qbzbEPU zJ}Hx6x9EhL7FIu2{HNT z=mowK?xr&{@}b?1rsvOieTHFJZmal6RO?JsApJ@qGFC^_I83@j?O%{t$$+C$BV(yNC&Npb&nmZdKKpk$UE4F{W=@nC&MicxU(L^^nTvcthry0%Ou+$tz01v8UUrD{N6RmuSywvj0w1e)CNUM#_m zW}^`IgGf(1pLPkK8r@g(ZGabh1YQ~}*~SY9Ae(H`lMmdZp4Hw^7I-9Qi&3k+ooK;< z|5FRC8(rM9uF<*Z+uF)6%l{aSooK(~1mTqJwIdS_`WGU9m5mbvfhlV1qRx?k@4FxG zzUn1h1$oZpM;T_B{uF4<7YPq#sHM>mm>bNKO#T?9n(1oK6QW%|{k6}vxanFDxYO&p zelG4M^*Qu6PsppN2WWR!IH2Q$B-TA9e2MPl<>AC)FD;PelHHh_tvb}DIvg64X2vGaY|m7epb6-x^xMG%P36)~?$hL@y^hmIp!u-mLw_Zuy^ca$6EH#e+ma`Hnq&jV=3)Kh<%VCPm*g_ z(G{W0BWtqEG^(S%yy}5I?r2PRjY*S|0pGn|`4B9s1;9SiO1nkKE+qbI3flCp=6~&Sv=g?%i{1<%Mxhu z<`L^9oSpKj&So1Nzwdl8^{buM$jD}B zCIt#30J;0fs5j|OCqEJG+|Zb;ThyRkBAk==y#H=hUUfbK^3%TC3LCI+D#BKi?9rA6 zfj}vSl%bS*wo(==2W57+kI!!ef8AT3{k>lBVF1 z6y&!kE9vUWSPO`q;@TOn(U}}Tx{`}XnGQkd&Lbt+7da59@@DL&@ji~s-y>k7FTaTx z&nX7YCoNvTG4nKbm)SxCNa{gR!Ia1LZ6i*g-^uh~;|pBMX`XeVnx~^W=8Zk>j`e`X zfA)qQ4q}@sGbLaA*nr7wWF=JswTFzee>eq4ezY&0_6nn>#i5vovEG&|xmxYngUgsb z(dJVFSeGh4&tz3Xj|A8jxSEt&q;Ton+#3=$PARO_BMuoF+#-0bea-Xeahp5G&fm4j zZ}f71DjtUuM7FdW{a#Bab~TG)_F5xAZg;4yn`!vnze2GeW9sU zx|r5{E4LONa(0YP$P^tejNX%i#eAGJPCd_85F;VZW4e7-!wYH1UWko98S>5~6Bbj@ zDW;6+axbGR9h>gyCka(akFb=9FR&f#u>{NzJMqF*LM!%kJ=^8Z1Pm%mxiDV3SKdh~ z%Bv|w!)$}GAFs|+UVJQz#{0fw9xrlyV6`^9 ze`Jm7{{*m%yBzRl6?+V3AUym<9O$@Dy4 z{`3LaM7Vtjz>+8evDEZ2T9?$E8^*xt2DFXG;TmAh1?1U4Q-0Va5QpwwZ}tKLZ1^BB zAJmvfjKwh*0##)3+9wRcAoe`r5zTcqghy8kpJ* z$Y-GX=3*wPTToRm<~xUL;cZnxD@Sx_-doStkD9=1T%NqDU&!_Uda3uv<|yRGPNKq= zPe{o{4-dGcCz?r1%Ns+}v_OEs08zGO;}cs%a02efi2!!-ZnueHhC3prAG}aDL;caDh<<0 z>E$>=3F0`;8Fn%|g2j5?FuXm~k^94$%5pSglEV8VR|Mzd71uH`j>THP(i)C|g1nzc zuyq@o2m|iBYY^3z966LT#ef$Zu8@LM_@7iJ=u@a$evdC}%)&O`oN=|Ow^&6WLleG&8Q34YmG_#pXSL;2^vLua` z-tf+C30QNW#s? zz25AM<-VLDj1y^p{TE0-< zUyU9ez4&d<{DV_pi)ok6GOQvc$cySF-zL*K7yfk9-Sk^FyG)6#;;~ybV_637GSFOz zh&kpc%~+>Qk2BDE&{(-%q_7+qCv+~%{f!MW$raM+E$4B9^qi8_Tu|2eaMzp2@#1BD z4`y!v&4q&4I%T;&BW%4Sg-TA#V# zM~d?0o#MBD9=@*0Dqa86JY1`&sD0p<+IQ}FgUW%Y6Y*L794r|hZI(TqPZzQ$^WAzj z<6Sb2t*z6B!>nCo2LJ-Ko?a`SU?m~T0^r3?#Yg-|k~i-xoZUs3wCmm<%7*j&zVq3m z*+*WgiNp1ANo7Uw&VG!pw{We0zFA6IoHX`WQx70L&epDya5?K}RV9f&^AM5QEazWI z z>a({b&`|H(P#^YV#I|{A3J_A-7Zd##>KYZz!wdp1(j9*T@3ISf+I%9fy5ZpYwW&37 zO^-gZsGXxdTT=_R4Wj`rg1BH?gnO~7a3PVmV2$~@((sQ>S|-98QGrXu%H`&nhVP79 zmCtV1WUC4^H8^pV^oYK_cg-=LB`(Sp(NG^$%c89r8eQ+%C~Il`xz$Pg-}g-_)_;DP zw!RlD)3wdqWN#hgu@2tncB6DJun-i-y1mI!$KlS8thfwbvp)=Gb)_8p(NV|e4xcgh z){J`)j^4cg$lBwCf0<`zi#-ybO7w@%ERo*b+kc7t*IL-M%lB9}r!rC!m-&g$1XT?i z?Y_=-=APBYoZq9Bgln+qnh+4^+#MD$*sxK*&*X%t1-h)uGv{!Bpl9+XS72?IcHJ`4 zk;K>+15++TPj`Nd%o<`dX-Ub(2RBgfB9@2v2_h0<4DD3ZR*uh1qSmT;G$cSG%FU`n z9!;3{S)V`;3+-G7O9?0<#di?@7H^;mM!FuGYvi*&;&eqrb3!~O_AqbWqBx1S>~CA| zK}hd@9UL3Ia)sJS9VjJ1_-*G4Gu9G@Gltt4#ktBe4OWNV%6moKoA0HB_YsqXIeLP z5j;P>69`O5l{C(BKf&IJ(N_7*le>iB%Xp3lCna=IUCloqKekY{?U+-WrWhjhK`PJ= z{ZWfUoG!KS(5#8h$DQL~!nGHBQc%lFgV{cME54y>C$CXJfa|74jMa+Y)KHj*<`O_a){Q@xIXWMbSu;3bCxL zV8VV8S8n_@(U&RJhQmrJl(wk)>@-|N_%Hisd_+6o)ie# z_$*o$Su)w;12-L=gw#4zEgrH?WsV4!H>6LCnEd=k9Y;hnnwzRj(~S5^EN|l64Z!0& zKm3xr=;J8m=V7|Ie9jKt>rU-W(*MCPhOcQ#k%d1VKFjQ0zl6Vo1sv_i6Cb+wAK^0m zwWzuwZ0ADdj4l9+vc0K43_?Xg`0jV8V?|2FYi}JD!Eud@YJ1EXfg&0|ujK94Lgb zu_@PCSIjiVzCmC)_hqiW-zUDaU-KDjR{aRN#z^0h;`8FM$E7Di3vCf#(dHRVcQ5F9RlSTh*No+$@=4Zl8Kk#e$c(jOW-7FT#2SC4-~v;R<9R`foDaf z-nNMz5&^r&=v%1d%a3?kVH(&vxKNEPSwXZAMfFkc=@Qubke6cllf_mykRL^nx)rh&f#-nxrP<%&F<5Gl;{AhZ}fm;JK)|_tMr5^ZKa#s&p8Pr{NH9 zbWcGURtwekw<4H@4Aa{g0cO{-gF^ERpAtxtD{el~(=ZWMf2E3A^502&L*h2xCXb(u zN=c5$quE@n(P_;Ih$70Br)&O>*B0RS*uUUBvLPg8tS6e}>fzD<$4kEAw!RquFnEQN z06uN8FSkb}bd%X(2O=I!Y4sJ>SQE}VRM)5Bcd)ZAR8J9~^z+PW7ZBXEQ%gBJcn=y+ zpBz&tvw`^l)}{^~nyc#X zyM#YFO;^DVw-nu0@4vriiH9v7xd5&%;KLVZ zE0&PY#bnY|=&gB)5~}Rt$K%}VOEa;0tE^~ZVWCzT72d(hywg<)qtl5d$ zG^t<%vadP{`6R|*8~m_{V1t@|LNcog@+u=LLb)mF{#t1?!em;D1#%=VS4vn2;0^+N zBVJnwhE8tE$b;(uxyYYWCCA*Kc*7mg7XaP3LVeE%C||2$vvPL2wC$*mO|d$uGhMLg z_1GeHe80>|peVmFTn=lc21jZ7Jg(6+L2Nvu!fWiO%%enX*@AZ5I)210?3DL zk&IzO$AiFZZSbY?&2lytnQBu|rhi$4UzaGa6yN+{A|5o!Lz6HBi?Pior$8z&dAz?)dMT~} zxBvr$OeyFbb}IM;ImqL7E^G#W=uxU}P1wG? z&nc7PxrV`+tCmSsYDCgFjI{JJEk!;W#Ybim=`NfA+dihuha(fPJ{nnABDjH}beSGV zSP9B5ae%A#4Np`POQMxFf>%3=t5g+dMigf-J_AT2!8|a7v}N}Fhdz7l^94I0sQ`Ug zDtn2VrG}!yC2SHHT9pg};fguJoUztC6h%8tH^FXyO-R z-dK`FF9XgCfA2h|>LASa-N+hXq%vyFVpIR$I3;OT2&MRp*@9A`t4lH$n$?dHcYi+A z--?f8zIjI!z=*@wOR$@D&v0V?!Odp=NhY3DTOXg~4=0WGxysW|ZPb7J$y zjg_K5f4<;@O4ef|V<3-IYG;3zGZpDXsSO6wRvr2+#y23aIba_uF2kYACaLLGKo?NN(4pae}>wGd7ZGO zVs?0vi58AW3%0E%H(&APJ#_`-BW{3PA+8>YHzikPqC;X?Xvm3FXZmEn%eC#L<^!=pe zfID|c)_d-ul&YS4zhnWfEbJ96rn7_sdM)I$<~L4;DfC_yFjGWO*yxxqW6t9EM7h77 zE@kf0{*C+jvuAx-?9akmLG1Fhx#cei?s>S=v;gwRH-KL6>8#X{(w0gKyxfJO{Mta>cO0D^kr>w6 z3-knZ10(6yM9vu{m5sF|B^!BqB8{SLif0v?L;|uJIohs-{056=R(nw_@yLVu3$cQs3ja^~ZH^0F#wF`6efK z8=`ZkE}!aZrsm;9!a!R>r{$2{xK@>dndwh4mG1oea|uF4J_Z&)?y$izZi--qxtz}g zerd*WmTXM^w%6fuKfA);i*uJUA`jkViyKP^G0l%XYGi9CMX*t) z&kz>F43q;_80xcrvBFLUeI(Vz&;?6N-!h^P^})zHZHCcSvODqQ_+?CuR77f8&^fZZ-Tf) zx$w5M@JgD`*;c3|ObbuQVWMnOxEN5yDxufI^8N6-ukSUOKpOLKU(p~SY~4)kpd^G( z41t;Rw@HRJ2^GnbaN~!;cMxZTd`?Pg)Jki@U4cJj%_3wzEzz1rhf zD_*YOHvHBA5>M!65W}HJ>o-!hSRzv$R zlFSrRIyVm$i)1#Y61EhIGH};=gaVtwBwU+xoEb2rhNVAJGPY#|wqm}^Oe5uS?BnMV zZ-@cB0}?5O=*GziP_z$aSxP<2Gh`x|708i%Buo`^+M(@z6)V;p%%r?BCoM%r*}(J| z&;hS*rZIjHp#dFsv_l0RlN_r~6)3o==F=zI!jG?9dOBoF;7xE>t+ zrBtn+^?<8KtMI}Qt#P!MJ*)+IJT?F;4*kKOh)FEO&`L#i3mG!B%&ei0j)%=e%BMi6 zpA5xPRmH~VWS-bNG~CyL-T0UI-FkY#SxB^jQ>V;&KWw-BgX zp1v;~8U2s#`D|CYmx!%Udwf|La&laaxjnZf^Bm@)WC0O+hkC7qy)QsL*q9K}zSsU- zlx=;pfPeD*Iy#XG%75V=GN`)pS?vf{^h!wYENVNfypD(QLtT9Tz1Fg9w0+-=zW6M| zYlZW3TD~+tZiK$z$3f{5?2O=8Xje&_KZ)n$!H>XKFY!NnVu%l!Rg2q7Er(`Np^+pb zgseV4zphRX?yY>PwbJVi$TTOyEK_&6lJeYnKcvL+APtWa{tj0a|Mb>|fpT9eBkECO z?lX?Zms5*3Q|%4*Z#F80k%+4FTOaKf(iky0UIRPADph)K@zk29xAQD()3-zY^bea( zd0N}yvn4-B!N6675W}&RSzr=f`gI)M06$JmD7B4PVbqMxP5zQ-j=bD{P>A47yw>Gx z3n15x%`C-2RTi!ko>k^>K5@ysl%h$}QJ=YtO8G(YBGCACV0}7aJ3oI%#bvGSLk7@s z(DlyvYd#q|V_w*18-}amZvEvoWl-MDYB}s7%B3;u+#>%ps1ssdo>)?4dM)lf0*t`N zPZiS1-e2DsUOBHzX~h*fT_le0iVInKBZZrg({$$YEC~;K_l5}q4Kci1qX)UV^v#E0 z7dRu|eiv}q78B_1WDk*Odb|Ax@#{ly8fuw4eyLU6hT~YVq?I&TA3_S@EgC}`3AH;% zWLncMyQLboE@)=`nAtgjH^sMc%XP#_VP&#!oZO+Rh(*(68?Oz%d{eNHeUrb}EA9N@`1||C ze5js#e)7efBratK@m7dA5Wm^Plr263U7H81<|(1trBp+ur|%hE{`<-e<_lg-UUXCq z=vJ_DzP|kQPE?@lLx!($l=sWH9Y6cptDL0D1H3V>Aj=u@PSbGhFJ`sO`!Z|%qOttB zOE7;nQ#GAETuIKUH!G! z$(xhM!hCLGoASM8vg3)Ht@*Tw?shD|@cL&`%@ZmVwCboOf$mS~krN=+DonBF@+e?%X3#HLL zeN0j-3I7cSW{b{_4K3Z~12AfPAnVX_7SZDV0rb^YRO);?rROwFIXvJFRM@+{k z-HR&ZtAFRUvFIKG{zuVS#KAhnUXM=6;*Y9uBqF8z&%KBCUUBfus$YjF-hDk-a&-OQwUw-2qqT0{Cw-9>$RePk{dtj@T=tW<5 zGetE1)(%H=_i~UQmFs<>a^tGRH^Je<}21Qw4~yCcj!rr~u>T z!jrPZgHiV%l20@pu*dX9s!jS~HracD}@(Ga{0Ih@pWDh5eDQ?WL1?I2Wj@H(j4& zlvj1t0}5AHVV9Kj-1cH#ISMSzgE*1oz6zT^DzOXqKLrn*@=I`3#}HuHDqdvl(rT*A zWGG?zmnqntA`K=R;x**KY*`ps=TGv2xi2M3)lXz>S>c=jTb0!090lP}rauor*9F90JZ*sY?@OS&s1iw~1!%`+aYQ774ukMk8&$ z-32%KpEGzIG=6i9{J9pow@5T@sE21S&XZj`YaHAg|9%5pEOUY^ORH&gQ*1uN$)f!g z7mlY|KtKVf;7DBeYjZUf{VJ!3+5?-iyhc`o4AfurExQo^2p#>}&d!8V`AlN&6HNAT zzg%$tITA0!Wq$;Wz-3dSq4W|DTZo_eXZ}ofieZ+e2kHcItBP)BvO>qt=3aVy)W^BB z3&>6vdXC2}#QmIZc6d9r-BUFd83{0c_&h&ANc>R?X+nBw>m?L%LrUX};#+BS3|h*` z$>ArNW6P?^0 zj9Dx}Kx*X$F4_qh)S~VnL8q3&L!eBCA<1sNotKNpE2sR*rR_32#^VP7X{~}e#2N|C zRG{*#G5R-ST;rganp)P%K}N1R4dIzcRVo)iazF#I@Vt3 z^W{>e)gQ{vo}@R-IQFr?%U|AlTGY-e(5FXefm_M>AO95(;o9ct8+}3Gg6dsChyKd9 z6_b$I`=V5diQSvv3hWJ>GNLA@kyfHOB%(BOjL~ZlJ30cRf=Tr3 zC(2fj|Akohf0W+Eh)sc1U2)ss;MhB*Xvovx#d=m&3)N6UV{nvcLc=%QWH1aEz=0%3kyQ ztx4S9V1N@GinS(&kY9;dD*jhLcpV8_TM|5aV!e|k=ZHalF=AW-Bv2i$qA^@xG%*C6 z7YRq`hOME?M6)1i_ylq)c&xeufUKx!-#E*p1!gC;ckoJohn6(BPSWwl*~7_Kcz@F2 zzxUIFtJ^dokBu|JJ(7V%A;iLdH6YN-$yr8BQX42qUX52UCAK5 z;V;se#)A`6mkvNsOr@Fn2g}Bf(5+s+)IWGac~5vp{LXpA4Kq&U&QqusyL@;&kin4L zFt$oA+X6(}_c1H#pe}0Gy(w)LH~0oQpcTpXP9dU9bhHX<^pyD@#8VZ) z+Z&9u$IH=qEoIg3mdv^=CS3?%3i|YR1NPpgM(YT}{{3trb{c2Ry!87vf?wk}2RN|y z9VW+m8TmUViRjLkqW946KbNu68&NcM33Xg`HaK=cXd0lWC$BgMASc%WDhjcw zLv(pW0ZKw#P(cb2eM)>bJOy%OGixFl#}&$I0g3l3_V|&_mf^W0#`=KOP0>q7R>+=0 z=P!lg9~74>TjYHHCw1_T8VdQJxVB`M3eOoj9Q*JIbo?ALt7|^jH*i_5Zp1laBwIU>07=i|jopSOw6e3}&|nMpv8{D=xoXPn>?~uAJTDRoLwTrH)H6~>SPL3l zW1JqTerfuJnEzkz^@rl~@CY`cprHe5Qke{!8ZUjJ7N^L6kRpcSw^4x%nxiDNu3_To zlAosY+jSSd5n^qNupUx4`^QHdpfl;51nYE~(y1&;t<$PjcDvxCZ^LwOBftmGUyB(; ztNH$n=!QA>|K$AiY0ir9IM(O>(rMy1-bQS>U3q~Cgbqash2?kBogN2#L!^_|;I#lL zaW}hV(1g=*x6UD^B$si$P4D_U!Rr(2JV5&5=ac%OT79mQs=Az$4Y$2tRdp@?IxYqG z-yIl<0|Uf%lfBV~Bz5-=@3So#Q-Erd^n?aca&jZ~T)7L*q5)$Q>F%@WSdaxHDbi-Hoc<)e&Rlo~o_P32+ zNIk)>!tIIj$y>m2k+(>T_*M{n#O;{PXEcAJ{UI*ZV8C5gi32no=2lJn;bvQ{+C=KK zBGY68UOFc>O#QJZnRBLTV}j0Am4#VIo7X@?90g+AgYb_42;~r2pk$&K`P3mDk0q1l z9ta7O`%i94dVxZPB<#Q|fCPr_M?wG=}z@)YFFp1?w@cI-?I zs`R>Cgpt?LIMC6zBgdZ%rfHM%{o6aDP!jOtkj> zdW+6JMPwPztcEXEzXpuvG%$2U}tr}xT(h5PwprIK0SIwHP)i&-Cc48>I!LQ_f|~FqrLw+q7gWnyzuI$BTC|~O!yyPAS%}Ix@co&n zJ&2zqEmwA~N%;xGp*wKF(z%_iAODPJoozEA82Wtqc5QzSr7NjTP@V*-i5?;Y{ZNV?YuO2iq_v zumMIYRyvykA>8`HB9Ky7UgJm{LPjD$UnbU9*@%}d$4r@pIPNoxee547e2Ad=d}T(0 zi6R`2HGQe$#ku|n%OnL);e_x|Sd} zG-M5B*UjF1r9lvn+3XTTd-)UjUPj!e9^V!n>_e*V={i>0CVDdr*d#=4`s9rTc;>B zF7wgVckLs~g~J6dK#ATj-&x8z+$UVQrKv>)JJJ=Y#=~7}FGeEwlvtW;L+;vsC7`aV z0R@E>{P`t@H>H(LoqG>Dn=emzg0f2&Taa%soZr`LplptXLP`iZBAiBMm4n3U zzIle#F|4atRsKAFH7i0+We^=PAa?`8CgJd6SE6*R^R%uU#{xyusFD#(8Rm((a`TvM zb-#qY8M}-FV33bm9ko7rJsP(la3oHO<0}PYX>IWMYm*81jb+|X?KhDZ zig>j8%;N5)jl`Yj%Txg|aj7si@B)`M&f+9ILT=?y{C~<$spy^8gn9;;;;gl8qHZ+HK~ayyNV4OUl-30zzE*Y_FEX`jk<4!8YKl$HUf=YW z48e4M;JhxK+>*{B5j6lb$0whS(+>z9CSjyf@t)k|3ca0=mi@=24tSXQA8oG5~ngU)v6*HWgi|kkgzr7 zg+Wlc4l#*MXIQQRynON|TWwD*V@U|;))3pE@OmAi;F)Vq$5r5ZS^XyvvV<<)#^_?^ zVcnX4+NJg`@J>7Vq=;>1r%{JYp9ot#ZHih4_OIw#(75MvfV8Q8@s(vb@7pWMsO#B7 z6d2lQXJ`GnRYMboAqs!W)R~KO4Q}k4TRASc=0AAc$5mnzSiSAN-P^su(LHA0@qPAt zFX#IR(_LD6WzL^Xg1N&2)q%5kL|AEHU^7;-0;;v?Ogg~uFrM!MHNP#evm{F{ml9n2 ztx_19a4|aHWQ3k6)+ok9IMz*wh6d$;o@U5$ZT7iEwLbh;^00C-X-uzJe^qeQNH;I* zMCO*daNaNWE?zZ==6&vl$yuTCXeRrs#;;~pu5C04#$*LR!|GV*WMg$#5VH}B>;(gu$w+0+TFQIWn9QY?ZZIs@2q@ZkK@{s zR`QXvBkTRJ&G0#pM{LuW=Da8rHawK{A}lknL|N$fz%vdNDli~W9V1#vY3|#$Ibepqz|s2pig5H5pLB0nH->La zODpkJoJ&$ch7C z!yiB@5-I6aVaD$;=cWa}FB_rCUn?8D4*L1!TqbROXq~kqKA7wV1Y%vD%JuxLGq~ga z(PiVY1Bmfb_!(altJP37Y+2#_hFp3&kC_HC{?zAu%6Ke&)1{Flc>R+4 ztHvOqYr$L2sR%c34YSVCmC+$xKY9H$TV@Ftg}S;(X|0P~+hoZxA|ATHY8=k$z0gOZo$X~qGq@TZl2saxch%5zbcrE_N+BUfFhsuKsj zawoFn^!uf?&{4njy`$e+4)R?{^_C(#KN1S-!VMwo6Y~{}R3kxz6KI07S=_ORJ7!%|a~}u`L?##wW7g^kf7*8`ZX7g;qGjGe78lHT^2(ItmQ(i>IKyO0 z1m<49Z47-KYK3JK=|XR(%IAQBgFdQDl4 zJt$%jK$pl%KEXksRb6Kj_wTwDo*5YkgXS@LO5m$Qs`17Q7Cu2-=;cu)FLr`D&`t?} z-F(|&iM(*ZK~;P9H{N31UDf>+&edar&U9cAe+8gIr{a`0yVKNEe=oBbdLpkrqg`Py zZm(|^Ill#;OSu+A8MwB#n%=N)YhmvZt*3vSf~P`AK%0w(r)K60a-tLl@4)Kh9h~fy zJy}?`30d4+8FfTX8Ymdx6DFNE51LS(ZiVvA@@636T6HCyqTUClp&#XdXYfBdZQDf3xbFH%J= z#e>$D+xrGMwV6a$!Za7#^NF29yBf%UzSPEW#q$rsM>_>L07NZ@bdsS~q@mwV_Wz>C zPv?SKW*z9HGc9tXoTwwX(hZySmugK3^n(UjZ}hFxlNQ9PO$OaKau7TKn~GVdr^pB2 z&=ZbLY<*L51pJC-Wke#q^QY3=nq5W+$HoV6j9$+q)}!qW^cC;|gTNd5QXRUl7 z!~DJaGsYY6(PctM4^yS)Mp4__idv@IW~n@FvG<5xK*3ug@Z5sq8w-?K2~|aX#oiv{ z52skpi?hEh^bdzuP8+$WceMo8-;ph^E8c2kB$6Lg7!)*_M@|BlTq-d_9MKu-c`(Dm37g!79t&zoV;FBdwCZ#`fxY)E|M#z}F zL#gg4$a_dwHOrQouF!%T57b3ZYvrxCoGuQM`#lcVca;R-$vO1R&yuV2_Ot#AT77Ae zI24CaIA)R)EeBTO=~I#e6{wYP78KJ3l~{G~4akR@vD%f`DS#B*^P)hMq7b>>m`;@* zmx7=oWfX)ZS2~HaYsj}aVCZf?<{S1bsZucOCybpzblw1*lnAQFP|q*FJo>w*Rvd*9 zj~yO`m_$DEv0aA5k&+dY8h>x{MMJCa@DO+iIhi5+khU7@Sj?QB)rOV6u-1HNXk2j| z$OTL{)3c@&0w8w!zM!yfi|Lpd4pbjZB2vkmSmyE&{ORp*`*Jjn`p!=N{JXm z4B3t@{aW37arpU>uV#PtKp}(A+Kg#DGG*IFoM=`2BbQSjrxWWs(;5q$$(_=H0|a7G ziPJw3EREF;WwW`zEUR`-yb6XEvFf@#d>LyD+^LNZ;_MDH4J5ys8byEm4;ufq%BtfM%P zpgW2o=xVLlLcvml9TYNfYNwDb?cAjS9Gbm)Z#qyM0$<_?tq(ulduil?U#@2=KAUP` z;0O5au+$BDJrgejzNU-&^3%GiZ03w9Ian>YRtW|`ybbO(C@U-5T>1FezpEwvFK6iK z`@LdV1~BY5c3c81!q=b^PUKdExC;-A!9><%f{^PdFf}A1A>6Ew@0KlqaPS>S zyAJCExC~2xaP~@0mUndW(8lQ+wu+OQ#Z#of42Hk6Kyv-IP6Z@}@V5**69vwo!DsRW z5xQ(-(Il!IO2q7ytN!6)dLl%g!!dE3^uqD^SvBSSdS$OM+saH)ad4i2YAw=$qNUH? z%^Fom-qlV}p<#W-L%e*t75l~m%DyBoo({sZaWJv-dV^7Mp^c^(BTXzhd@9$%J>|Oq zaCjgfe8|T}zRF*)pLkFCiDphLUx5={x2Bk}ql{&7%$-hA$p~9Yzy;K+Gxo7sd&yiT zQ3u>`%>R0zug9h&Q`|FgwmDV!Vxfdzj~Xsbfz&>%YNAIX^tbVG$5{d!dXLC*r57uo>vY6n^bzob0SmrRUbe^klj73D@`J0{ki+L?#*F9uN zI5Bk|{zDR$c%?~!sBy9r>J-@sQQs-tRzU$@T&g1^3lni~>a4Sc#dP{y{6=AqX}E!* z`8D*xC3?=kTgWt>bWqq88VC|L))Ab*l5eAZvUl~vf{C}r@-F(6#<9jObQzh7uEIKX z@nX&qi~6cMK;S{M1BebtpQ)E0%P3f#gU3c0VXEUKm~M@pqk<^{_3_zJO2i6ytlNv; zOsb!hi8I($A;5l|2#c-bPgAk@c>f-7LNZ-$G|N5WFJx^)!~W}(KV12s7sIMEKl!&u zXBdl%Ld@#g3ald@yuhyYGmikrnSh{axHkgVmVBr7D!k0bp6cY@Cm}LnLSoGK)(?pV z@IdTZT}^zVYSFwgWPzQHq|6Jp0+QKy`qJ&D6w?v z0<@y!^RF-406>(npH&CGNg6$;fm22qD<0A^3Hy-_^2pgzeEfzc3J25r8YgBWgiU$6 zoMaqbCcro#E%6agRfmGBLQpndXHPEv6}XBtgTWY7jAph|o}EJ#b}t}3Fb=`?_!<#y zV}svHkOnAF3lC!3uaKo7HxLg3dqnCf4(ckm{<;f2PHZ6tWu|U;I@%y4;-G=7ixh0w z+>z2`3x9lcrGH0E^kScb73r*X>MGOAK_CP$TVa*}tKilmY`L^V)p6dMc?%fKVSvM? z=o}ZqX*W+BWxUjB&Ao zC)Imjoc-P*HFo~(`mElfGXGMxC7(0gfSABnlAoPx%BCM))Z4c9bxlJq08kQO)-O&A zDj4qSYraGx{z)AFFva>;2;c`z(#zxXN#{SIGlXV!P@77Ro-drBT8OY+a6Q5+!|llH z=C7lB62rdA2P*m}MQEF2UL^C*yXKc|Rxp&yA%h?w!BxJX`UIXVzRSfJzHH4frJpCf z5s`(X=WWM53va3Z%ZK51RC)e1}QsA@qAf!G9?jVFZB>2wXjX_ zz^#5nWrM!)_W&mU<{8l$HrI@uQcQ5SU`a%}?s%|L_y0fTm>xQBQ$YFyLZzdo@{DmR ztG6js!bNNJ5p9re?8SNn^+1&Gxau&vv*Nnpin@*2ow+ENWHNn>oF`0Fktj>e6Hw94I3!1qV)Ga(%-)-e`Op03*;U- zjTT=cV>69bHF|gZx>{IQisK4`=Knk->v1>u&|*gQ02uuw%RwJ`q#nYUGzjFUHc()EhBg__dvVg>yB-baS8g< zz(&k%teF53=S%hK$G_O^QrVYnc?vou(WJt7*o2de5LQ`BmGCe(uRtwbdO7k+r8K2L zb|S_|83_FE2w#cGJw@e>Yzx-P2@3yocH@X@GW3GSfB%j9LfZrB&$(sh!{2HU0-d*b z=6mml;+R2kwA313x2X2B)LJHq z&0lJ6V~D{@RhPULoMb>|h~T^cK6B))st9(q+uz!oe=!(m@*cUTH>vsvJqoQr%JULx z^2Byjz&=;jNZdW~di++79Wj!5_d(i~E@ zfu#N?W@Rq=%3h^aMWWll3Z)%x{&sdbgNc9KrWDS5h~}=I=4St~Xadv$nd8$zg8yCI zt#U4ES{S=l_S}9G@bh0QR-(zCdFZ)_<*j9!v0&tL9U5b(d|w&y&=Qu-RP|A(I>qj? zW^eyc+Hm$gQ??f+tlhwPNMp6HH^SsKI(IqLH4)G-oByJ zCAH?;;IcGYuF~>7oy&9*2wMieSoyg1@ifzO^CR|gNPH@*#rMCv9B-HuL$?;<{=;wP ze27J+&!t)kSTPc$IiZ44Cr@(iCfowfqcx2J-%=#U=DrPmeeZP%A@f`4$~xtKR4Fyq$$p_EV9!4(WWI9R|F^lul_tZAt*DcmgN7-!9OD14RyHR znhllb1o+FARIEP`bDmY<#fVe5=Nx&#C4+;68vQvWn7^~c4UU>Zk<+~~( zB}ONYPB7fL`}XAGRC|Nm?>%N>m#0m9L7I1>VuiiLWN}uOZWeD5XRbkw1QpiJajrZH z2_{aJRx%?|=*5dDto{^whW=LfaYD=nT&a{|Pit2CZiR_gYZcvjz7RioJ+#zmmUkP> z?w^}5&jfk>Nk-?8h%x~QWiM;Tc|MSIpQ|WSyx~bYz5m7iI5{G?X&-ohkdsa({U~<4 zCu3J!8Qp@M7M3|(n$%Bu3eFjDRP9D2>R?_C8B)}iqmOw&7+V~JUd}=u4))zfxw5P0 z_?ApH_)6su9=@D1mH(aJT4?!Lja+(os4lh>YqZwxv+7g06zzWe9Zu|h6GKgDkWxC1 z;-lC1rAQcGXST3TtTQc%&xD%v?YGTG?7I@bn^3z{?`;EPNEv$eNBK2rrpW_S6aIfT zj-IH4h4d?rUk|%>oJY;n%so>nOm(!hEHd&J3QbQPO!^&0oBZeJB%abZY}DZdsZ6hV z;sTo5P4qAgB~^pVE3(qaa3#Ey>*~u= zX2|t3w$7vK@c|h2A#2}HjYKK%tAGXj8lQoRz&USz9QiSoHrA(v7#ukO5z$BNw1V{S ztjuo>YEo0QxF|y@8N@E+i19_kEFvyizW3;o+lqHHj#jn2!JhrLS-JS9=Z{N|Ra0*m zN?-e!$KqDAum#pEw&Ob?SC znd{|iw9L&NY8H3??SIx8dp?w-lgOfehq!<>#dXM#o>X;Z88Rh04~71ahJZINY7QJ? zNK1sbFa{`RW7F-Q3<&3Y*z=SW|g9Bc>(3eLUon8 zY02~=xKAcD<&a6$1oHT}A4h>N;=&WsedP`*afD3LOWE{V+!Na`zboyLR8kBZP-wW# z#@AGhv9vY{m01#5IHEM>>4W;U=E|wOPuszs0Q|By1_LK(Ou7vt!`^x;sm0dj_FHM@ zztN5vEhTd8YTuK1qlLl{{FL*e6OOFP9B)LPDwJK&@72u(qjLw=O(a-~r5`6WFefc|+aqqlVK3u*@Cx98R^eG(R-k$#GbQM?P{G#p zVe;DH&d1-+88)dT1zRUAG8fA+7MC-4twhJ@pqdF#;RVbOW@Cg+ZX~u{4tezkSmz;BE~KK(n8GS3JC13?q9Nzd2`LLo3{D|KpWetQx6)ArKXMqgQp^BA z(LBjlLL>Cy7i?obFq)(K^N)7ZhEomq>4egtlZct_a-1VX4(a>NG`r_4g4@>O zL=JA}=Nm0;P6-j@KTS%x&2oe3Xk;d(rwcJT#236Ci$V@e*w5l;d2?aJZRtSy9)jIc zK>#FNd02-p(w?d^Z5PVUK|=3c6pJ1436;Ttz*UTeJmIjP|AG8cIX=fE6%U$XY)tGK z+((HyGuiC)vNKFKJfd-RsMAcR;*!b|D(n{OzRuKPamttGa%QmF%AJ1rLsvyMx$Ym@ z4-WR*a4;kHA!TvFPV5GRdVp&C0^}liTt!(XJa+#YP$B_9skiZ5v43d zs4eB*k{Z+g=PoT8-RYBoe)KgV#t=wM1h}eCSVUOQWj_SdCCwjxxTTT9ngYa}wM99d zNRyS%h{;DOD0R*+I7jW8yj1J@6g22Wg~IU?6v1}(hVdp2uT!|RK*CuD8R|{&x#y;Q z+TYnM6wGWd;I5*bhNqYKvnqj&s6ekG={FS+58@B+)YJ~dp>=!LdJ&Fz%Ep~#m2rC7 zoAsf+pBi_ih}EdXK5D?A;CWvRE?B9+h5M|Rl^Hr*jY>zG9TrcEeg zLL>vhmm6SgEqNzY0P2JS^&80t(!&=e7}^m_`JMxhBloIsJ7*QrO6?q!!m_c8U-HKo z-OZe_wU*BPVZ}4{BDue)oS90x1y7F2m2~3%vpdAK}AlF4^;priC@ia8l@Mh(Z^G8iGUWKvXOfb`%4PS4SVH#We zy@~g2#RVJupF?R#yVg-y*Vfk6I?JytU$|py{$08dbN)%o_otp z2x`c_k6L=}x$$`?>o)jm1Fd&DGG_yvtK|}|Dqf4d8UYx}Q4yeSxy-?D01;zv7}=|S z1TFIp8eMCSl$NnNIdO5)6p>5nn^4$?)p+M6#96yno+a1Z+wzE|+kvJM#Er5VybL)L zYQK=m&v6)0k)KYT2T>C2%(COYM?PqKAIEzM%nB+z`j-<$>-1B|c_mA za0ZqCK0Ex8J=a0ic-SUhg4G`(CL`0q9&EJs+DkSL|#AEeWf$6c2Oj)A|p|HcKNFqjd9Z~T$ZpskkbOqb0 zB`nPr>lqjqIVNeW{X_POoc|PG1UCo?uipQ*vSNF-GK4DUJLJvPU2+)zZ0q^nC4p>I zUvOcy?4Pc(ynfMdvQ}EV-w{|uUgM+1{b8}?9*~V|fhMlL|y_6{nN?zB2kjAiZ73 z+Z7g<%|jZonns^?cE7(+aPcOU%Qh^G#E%48#D8>M>hy9d&$S(79T7ADgpcc#Ry8HL zP_np=Fk60p@-G$W+~2yB?~wS6ulz{VH^{#(q(X4_pKJXvoLQlzqG{QRyYr!aykqUF zz7UGP^W!ViDbD~O;;7+%1b zWHY4+M1>}SKjib;VRrwDLksW!Rx&5P#2Q-v;s5?^@!}w$#~9hsMy^cHcsf~XQW|}Y zkZ!uDlvp*HsQ@uzz6$$n5riXqfA^665~vw!4a(E54MhjJ_TY;hWP{2dboS0=7*oxVh! zRboK>lOra+Cr>E*i0foZu23tEHItx(q6kIG+X6RPQ!~eXkBz~$20z5D|Iv^YoM1Mx zpCG6ywBtbGdp1^n7AG0V;Ne@bxg{)td0VV5rcg+r+NqHxjA`g)~lrehvleV_bF0W-! za*%1hPm?4}2^V{dS3xqSsxExMR<*O#XMYs4Qt1}@w${68jrA3G(gJ+XTt6Mv@aZDN zgX?F?swR?vWHJ>KDH4#I#xUKHd`+K{o6%FGhu^4aB~}`3-7bp8#Jmrc;llx8*EKIn zr8oy-R?TPkwn|8(7=K2oV{P({*-_TXI_wp!fdB?F>m`n}B3nEP+~4oQ&AYyYiO z1*fJ4bGi1UI#7@yw+I?(Ar574{wg1{h7Y*Fc`DRnb7@GGwGjEq>lv{oJW8h4Y2#sL z71htX5wq2I_xeQGKAM&}&t2%1N4|mJ=(`cx-)F?I{#K(+bp=Tu2}jB;0^sI&C1)To zqV!Bo{pQLOP_WwE#Eg1wzs%UY2P+7OdfKH$+N^qK3Ao>n$Q!@54M>Kx7;%2!Va+g!f+Tt=kXT9;B8iGPU}UbF~sQ9a-xe` zW_$$4EaQpHw`P%sNSaI?2l8Zmfr5!UCHy9u{`I%dp4UBZE`>^O@EEIKexCY!U>2ro zX=G3y3k^F*o(*Ya4QcQ>u%6qzI!!H6!($LDdV{v18aaBhtiu|l0 z4Wr(gQZowFI3w|%sWX{BzX z6o5)fqbQ`+J5|wzDioX%zurzp(CLR}Whe1(E#*n&|S zD!Ol+dp3HiOUFX+EyH`K`~?D7%a1@_nHVy?SfvU1aOVKK7xLc{cRqt&xIv|CrwCvU zWnVK=-WEB#pwUHxGCn3%Y4u>*-i!K_333daPFyhkLw~@nj6LO8E~bxFI!C$@b4IuzJ2~oGky(bV7so z^|Z&JWP`$&%Ahn^MVtjg)GIVVtw(AXbdoQv2fx>wSvcAKqNZZ)Vtwf%LX z1w43tj0XbWVY-jNtwJ?OM6zAevFbY9j3S^S(^hQs)h8vBsIE~iwjh*xvLpUvlAHG$ z*C3pQ2g=^D%iAz2JEa1)gw(enzNs@|_{6b-I%_O@|4iezxotSKPc?O*=lupkQff2zWQsP2eb! zn6>`HV4BaR9Hdy#)P!0z-|aeqXU=vx6nz#^)Xjnaxc&$CosOo-RTZ^njWQEy!N*5a zH!lw4PbYjlhA^t&#LZjJ&}Fv|?d5!|Y9OoMQP{792QCD*$W~Dg#;)y&G*Vk+0KC#{ zDhf%AS8WJhspu-$=j9pWi2yaegWV<+cn56~joU?H6LsM(l&HMS7~LEO_fG$EDvQnU zf`$dJR72#@%V6Eum>h4)p9oeJo3#x;M}tZO|L}b(d>A8=m7mv_V?J7S)esv_-LK(F zTg5fuCd{71^LEEIVrXg9C0X#Nl|$R?z(-f!YFW$k^FceJ@h-sx9(?L#L0fmsq-c~i za!M$}xF8fRg;JVp+B>rq-X>A80e*tOoCe#VHDV3uWVS)xd7Io%z4bj#Ozj=F{#zYC z5+p+@RV{}C9y6^(dP)MXKD9+AI{9*bBm90O`<`1zRh1Y#zdWbyMeZMMBuk&QyM5*v zD1HQf9Jo4qlkuMsTUQ4AE1}73f_8UeSKBuHY>7Z~PL$ER(j@WXo9BHCQTn8o_pi^{ z+oXg%%$zM%{Tah=@y$EW(&rV7#uIO@Pkf5U2(8I!yUiF_ub7L8e*I4Mv5UN1sr>ot zpI41q368M1TB&ye6sC%1k2qzKU8y*}SSTSVvAO;Y60wx?m84H1p|gW2QZ(-tu39W8 zXq3WGhNxLB#w2kL$Kqa7PSE}RB^$H6Pc7d1Gl5~LEw&AjYWjd+d={WacYx(R>gCSw z+AZ1A7v=u~6~WcSr8Q2b@tC+1G7bxzVQhk~Cd!H{$A}>_;)xNt8LV}2@0_{QS&?e* za*;@)Xx9G^`SFOXouM$y_w-=gmDHL)K0ctZn8GhCGq1?ta4;5MTZd)*s8NNPYZGGSzFOxvH9@t3D{ zO&?q0soO(O@)&WsBEPbGLY!<#YNuUShUL07$fwC?d+>ch_s18B0v<2e#%H3PZj?}Q zN=uuNuvU@Z3jgQ^S~_K)`Zh)$e`8vNj_{qAXIKj`Jy~hu)K-;h9AjzLX{<`obzHIY zHqm|95Xz(pJ^)r<2-bPf?_XpD>4>)^&pi1wc|aPE`6TNb_Sdy~e|f%VhTE^2<(wV` zTVCVyCI4k|>A0UZhWoDdXjBfT%!Q+)~X!hxU z9A*ZLwv7R0UU3>Dj4lrFvi9mJabtEXWPq?e$sU;`-T^@&02c#RngZH`EdkGkTGglp z9!xLyC)tVwq7RCWH}(k7#k^Yk_H1<@FArep3#r*HnKosPe?VIF)KF9*>+O zC6kedUmTd9tUP-D?`{qOMHA=a)3?)q@aB<<&7(<8B9fst5fi^swJ5u|i11*ZUO@4f z8&0YjBPDcb6F{hx>XYMk!EApV4*_2W5>cENGba`VCdPVH#lw-k1*`*aIdEB7*TC;F zOGWbtT&#y(xx90*(Z1%0uGmyzlw&u0xsfHYzU=N5@L?qwxGrW+7<;sYUX>4j5}n{_ zu!bpMyG!Ms8!mYrEFHs`<2VN}3%4uE=DY2<7jj2gH$6t9s&*df)a?wxkw!=#?sjw>t=HszagfUL3=?Hh0A7I#X%V z?swlE^4xOrPhwUkI{=n7ZSn|zFSZLSj?Rrn?L0V0#Bm2<670edBPH?Oau(Z-`V;}R z1HQGqbg=m?im?Zcw?=1O_~&kV%FhLb1CcZ^@!|sB?Zc94OyW!^{%jAk;NY-^LG#yh z#vnLFcIZ-iZu3Ba2?-K7c46cJIX+tX>#a!-FUx{^RxA3~!gK{C4q)|vBC!3Qn}z#y zk)uBjmB9uv5=1ut95ZU)oasBBOz}oehrB(oN7v+Ep<;X!@U!I0eoU863;11LX{RhT zcCMMM_h_G1_w#+%SWU87FF|F)?dCf+^xGpP?$-$!I?63h4nC5nra(6Jnn>&PF?p$) zsqasQ(cdeK0N(+EL(6bpClZW5>)DnzVL%I6 zs0QhVvOA2r-TM%zYEg;Ts<S7KCs>6arpMhXL_TN>5&gWz)xe8?x>$c560&kg-)alr)y$ZJk;%=-w0q zqXnVq@cTqX+(6NJ;;3*CX}7*p1s1v1l1fv_E?J9+Gy|a7N8C$85Y>M8q-94C>tcGB7_AAtJ=={o%pKsD^(k6Q3y8E(L--X#M1|l zy@NDpik8Z}Mo5}=bk7?#6SLlCgiDWw&D_pCH6uu^#@|P4Vw<>nbM6Bj=CedGhdD=@o9Yg25AjW?=6nOD}#hU_8s+SIF$nU#pjQ2-UMLkJ4 zX!w!2rsVmOJ0(hJ>fF|Le_ zX{ORt9@uJS;G(zfVZ9pK;cM{7SX(CXi~_l78cOi_4$QnvWJcqZ3oTx2_M2NBPP-!| z3rx9xQ5&~`BN39>U?qvCFxQ*L(7VGJsc?Dl;ygY51pTg8uG%o)x>D_SJ4Syh%%9^p znEIYHz&Zx+-j0MmQ0Qd&Qw3OCG0cW!3q8?C@nP&|BPHE%U}F<Hqa=%BRCjs@E3cFR&0F>^2?rx?F`!%}scb}eIoc|t|hSE5{TfX0kxUI#IM zY>ElRGWiCCmBrhy3|YwAG?yHZ#mx>pBP9kg6!%g$#v>&|7)Vqp zALPr(Lvz)e1kgo^@@UvxVNL~#P=71dfb3|)M|6i*jqojVkpbl<^^qkhtX!JIXIy>% z1n;#bmsuO*YfAed5iN%Swctqu5r;B=Zw^7x&uEJkpxr8gBPAmyFdHyVh8P+NNf;6a zIC`7xZpPs{n6a@osv13@%pr&=W{Gd%)CY4V5Uq6K=4Q*dYGbg0%XpAr(iiC zx(8!W!Ht*CAbX|y`*|3i~ zg$qyK{ofq^yq@`wj#Y@tkjkxScu{1L?3Th{==tqXqmd6EN!ae>7tgzW#_IlIq9Y3> z9S@NGcXpY&6H9viUh%*<=op@VpyY_jAq6>t0C9@F*<)oFudYi@61{v37rO0qj0Y$O zw1*sX44F+Dj_k~`gG2}Cd;T7!hQF-HM7h&m zz_M2AEJNa$Y;r0QqKXUVwsPNWv##u1j-#&js}6MRvSb+!+#Ebzv?tPk90ndXu~D$) z+({bQqHKI%+D6&mMYeMzB@XV8V8~U%2w$2Qqu)?y+5R1mEUl@SjhwY+w${ZV8qvoI zB_ky$>?ZT;i2jqgDiT<3jhX?FbFfN z(GRMdqxZQdvPsVb*DKtAhsqinbY#Us11mfr5873V)&gOpNg|PI9gcq5l)2#5==Khu zon+XeQ2W|4(>0|s*rTc%>8^2M#+#KLm@DHUAat*Ys1&QPK1;~N)te&PRyhY)?0|)r z?52|IZ!_Un59$&ECk2Ww*hnt!icf4V#Jp+YOvm0-02tk#9pMC2t8Hpd=zu_@>eF8+hZSdcT+8cmOD+E-nRe-?((-Ub_rQIO~; z>f|)FzR>ralc>02IcBt00YE^5eyRZd8f2|1!qF8joY)zQ`Qz%|BPC*LF=H?``zi$kBXvO$5~hqfmfyJDy}CCXAe+(YDu^sAUn`vKXNeNlEX8aUhYISpcCB zp#Y#ykphPhW?%!vf4$D80Be%~QQ`#Tgf>a^K$#;ZJTj38DC-B9XG#^(Kt1?|zzcHH z&vnQCoOE#v1W@tm!11?~hYsL8Hdh%W>FYW=>)WZw;vwY$0Spkdl%*MJV53i{)x2Qd3#QBe?*+vZRc3Y%#!vh3Di~O z;*U9mL6Gu8nk>i*GC|7{AdJC`QU)lL<}uPU80mC@j7Evk7zTtg5f|7$Bd-SpL_`aJ zQ=gIFz>YA*$?kMhtK(GoPs|{JBPd+u@(G@LhLzFnSDm9;Dh7i%p(7@v&P8gPb|!=9 z>I>+`kou!te`CP2(12u8sYqf146GL@@t;dxRsv(>dkevoUInc`PCsdJQk&A=SoqjV z7ws5qY4=q4yx9DWBPAJA@4&VqX@Srl16)H9*PWYn#!m1-jljoyQrBME--9YR@@V3B zY{T^P(5lw`^Tqfku^=e|IfLsmQ944=(pF3?n8ZCDa}L z-9m8kiaP(u(y2_Xd|B`E$ALX<89tAXNr zQ{tXCjj)LzpcUZAnld0yrf$f0!<^U>@^<8c&kpW{1Wh!09ImP7RH)lfoes|)0pXt# z5a?i?f4fJ=*>HM{>VbX)@&;ErM=|K3J=#saQ9rgW7o3?2aJZNz9fw zVFd`8frFW7%QZ<9Fx?cfGSbB(C9j0eGX>J1e^zzLO(;f^%q8i^*t%wyEH$`eLD8;5 zq%h-)y{XRPFlL%UuTpJN81t!zFA_%OQF@mPh6V!jDaBvShD_C-9hqz@l=W?{2DY)A%I9kH~ijTrLPm7s6SPr&4O zdd~luHgV(U{#=y%cbTb2KvzbKk9kGUe^sm&sASj3xs5$eK+mY0J|f@10P-R!@{8h< zbMJjw&_z2SZbFihjF&4jB7-vthVJRcB+DX;>@qNSq<5);sv-y?NSP**9g&45s0k^S zNs@*kpaP0iXhJL)3HY@SsYf7zn8j53KFqdb@6+3lY0$y+I@}K+>Ljis!;n9me|bpA zNC^RoU=k=9Wi6xf`F$Y1v!z7|K+qE+6ICKfF+TTzpgVrZMH5WOH4{<}%Rv4g!3f7{p7f0w7UpAX@=+K*^O(Cj=wz%)ZfqIf6~0<9QBg_Ze3 z-rSX|?3LQ1{^cVc#@TH!k4k}wYev0vsbIP%2dg1WQN|N)s(3 zCekAbAh8L^&f9n4>71!4Z{KhS$|#$s^4WKg^&=*f2?WYzl1Y|#e<5$J)MmBs)0vSk z??MJhP^N1Dpor&s(7J&#QwdB-2lW_Zy8d%GFI}by$kr-KHQk9LNug~tE}9}QEV!_| zz$*lChoG~g7;P{D#c%CYl}QG&!vSqF88_HX|j2O-Vt*fJPyWsBvh5$cZ4Mk|QO78d(tmNGO`Cm61hE z0wG$8ia?EK^k)_!8!FzDH;bCY-J~Igh>9XoAe4y_jUpzIe;OiJx={ld1sE4CH7A(i zR55jl9)uis8uHtK{jf1F2td%xn^Sz02qAM;TP8m)^y8rp(#RjbCEg~f z{7l~#dj9bf=3R?#XM;19BPA)k(;dZG-{VS*B<&=Ud3qf%V(k$@29ZWM(jkmd(0)iD zwW2|^y-u&Pe~;q2Ss5etXb9T|(FsojH8>}3=%3C{11C@P;H0>Be~+hZ1CHr*?$ceN z9b}M=sk3OmLr6qS+rM=fdH)@HwtPbZAWnmGOD!XHTe^0qI|C+I6;nt)c5(~l!-WC1 zbU05phBSlKBj`VZW6Vq(C_!i?GY>C0> zyRlgwzfT@lUlBXx2zX>*K-QW#RGSI-vJ~UDVUzCtKdpPncZAc{??ru-9KV1^myL#v zClYPtekuQC)sOX z5uX&ejQaW<`EWbztX8=-0%5b-+Z-zz>dWq@#&GE{JIeJKQsSr-9p|$x+l)>Q*SL`- z5Q|R}z{69MN37vWHLssmA4EO8dHy3MdgtxAe^V@I?|C8CnWBgCBt+Cf9<%Sym$ByC zk@E2RYycfJanLdFlEz>Tz}CUGcj#qhRJ8=sj~6FT2tF{7{-59e-}UJKC;Tb@FZj#< zkM~pU?EabmhwJ~({y*&d|G)oVkNSVd?Eg3Wf2ZZ={-5C9&-edN>Hqiof7{#rKmGrQ zfBV1Q|D*n0-}3(t^Z$ppxDSZ}dqDtwiQv+EKaoQWWJ~@$AMdoXmp^7GpT^A7TVJpY zzg+@;$SPrn>QCtgmxCSoqy2SIjEI{6-=+`kAIVIWQB^fXM%Q1hd_gn;Vf~41jf#4! zThY;MKhaIUbGKdA0vu2EX|HM+pR`HPe}Q^8hh4y^ukXD=AW1aA+0jKKCHveSu^=$L zwIprY^(uA02f)2(J$;UTvPIg&sJJZm~j%4%fLMX^1B?B6Jfy70w zR%&F(`DwW|#T|{9#Csbn_HcUP&d9@sTBV7yA|pyCBw=~kN0byIXI*nvU=TZWP7rYL zkCwOdYbI}5jdFNGe{vD(LE|GOe@5N=m1`Bc77@j>D(UN3FY-=W$(AM?tW-N_s364C zb?zNY^SQ=ty;MmBt!b%X!6LiE4t8DZ1bOwP=t!%m8!0$&AU+re{JpUi9H^9q_eg<| zFG4yV2Y$=36Ofuj)33w-+;$n=>G3K^x2`=nSkogWDMN5TPyZmo><;INfA{syu6`JE z-;R2Mr>zKLMx=s-rh*_zl#e1%z!mjEC*^-Ps~6KK|9(K$@Cz_Nva10I7>|7RW7+Rf zaQGEHvZMNmY2~dd_|%m~yj!+u!OQ^VB`ceeS}~_7}&KP`mwr z1%vR4k{*#xk|aI`NAO?M8pNigCSUb-|JV0_@&C($D`ilRfA@7iw-r9|!i|xg+;zrW{?&9O<{h0Of9%G`6xwTazu(=)l*Ym%CQKU= z=Cg?=(ES%1e}{eZefmLO_Ko*r`|lX>`+IrcqyH~zNW;45*|V+8n9LqLe#+0QZMI_t zRSZ$JwGSM1F!$}bPIYSU_aT5JlqSf>|9*~n`)UL|Jl|MEKnMTg?ntL2CK3dLz@K0W IBRoAl3dui6;s5{u delta 72110 zcmY&Y_>_LK3r4p_B{;>|9*>0vrxf-@iM37o-L||KAtv z4h+;_YKI0yG<;+fc0L}S2BQBdLI!4W4V{pr8UFqI=SnC6yg&Y5x#mVdCr3pQK){K^ z@ke1NHudtk^nLV4`2Pw;UyU8<>>Y=JLrKMnf>VR?dO4Yf?hl8H(;3?^5ZG)&Ny^*z z$|*#y-P>;KvLg$!u(2&N(LEj8A>($iWYt~{6oVklZK4OqTj!4>orc|AtN%?m-d}cK zR$WkeuOPM9iELiqt+Z@z*wut3UUEM)_F{?8B0Qsw$eS1wBDW$s6t;(npI>_1p&5(X zQOQUlXgCmsh&C4yJt9w)K4&y2alJ7GL6FGyr=Lffml2XhZ)5TTG-#xl(0Wmgg8x#P zPgk!PxO47ZcsqNZ_=<+fd-@K~E;aiAQ&D&1-o6j_8ou5WAc)8+N!KQ;-i0H_?aGWy zO~*mD7{sTp(ADGNQeo-QJ0lk|!r$WRw&ZY{b2~jlmObK1{)p|?HB;lhInmU8(NcV# zpwT{VXq~aCuvvXR4sy=M#h-JT$TSvxhHb5vZyiz*JWii3-+C`?UfOp#)^-6K-fmxA zvo;4jIkGiH%r_9XPBNpnwNP&xE=4lLtdV`!dYOwNs-jOlyId>hQr*eCo4@IA<=mfY zc8#e0uzeudFJe8JapJROzCzqTekk?wK*)|peBi#w^+D~JX?^sre}3HlN@Z}L8OHDU z)x~Ct@~_uDzApmC=J*HERTn3qME^kV(x>Y&(6C8N^kTZHk>2+_yCc)+(Hy2Uxgj9r z+|0!11Ty#l!WFODDGO4((v;n}i4NfK_4;B-VW6r&mkI(nI6(*00A^L^s?^ zW(UECV>?KYH`aLoL0EO0hS$kq^Xb-4@6wLZ$C%6RC(*T*IN!;w=`94nJyWK}z3c1< zf7|Hk+V{UC&kyNJ7bl8Je9mNB-w-c$`a!`CmX`#KN6((5WUKmnzK)l63#TdBtItg` z{ar((NFm-;6FEm!CQ8ElXAcwek1Zlr&D_`1SGFm<8}4Swbkq*X)ewEVk*ct5-@{=d zB_ZoTaIRaMuU+@)@!kY*d{u$Nzzc#jd!HA`I45`2Zy0|q-K_C$sA=lBLeAy6Y^ARt-eBS`xzaTBaYDiiX zmH8#1hUS#`b6R`(BUsNOAjr}|-@g%)miA}%R7}TKl3pZ^$^fjbk){1DNdI?NOT^-o(;jGjbxHyjO$32nZ;0I2i~uc^Gj>r1TjW`GwS_83@v) z`65bW@(7gqaomWz8D8S_1vCi$_|%A`!3!w(_aKO6=n|P?o`?vYH3$p>lagA$H-`N$ z=k_hHpbrT6e98PfNSWVvoRtK+gzE~kFNd3eAO!x7QX1fAm4#>iSCVI42zi61`OHeE zr)!tv@1E){%A(=rW}Z-@W?jFv^qobtd#mpV7ci3wdzcG3t}^Yna1BCPHG&06(jN{i zFxg%3VN!*uu!cOdBdx*U9Fa#KPCX!x2{1S-N%#BsUnl<+0k@wpTU zp#&f>G#^(}7Druy07p@SE?Dsc-4Ik$69mRb(1ZrhbI+-2OezsdNf$gEm`4H{LcpPp&mqMwJ0!)y^*(XI zU=9{KD703R0|Z7v!NB7{Q70q>pmn%lE;U>!OpOV!d>jlc&W+b62E&|8q+22cgX#JS z2o#h0pz64qII4@V4>UO9cyba1RZJX8TpUmyNlhhU$YFvxpfD+dDOHVROvNEW4Ja-1EuFb;xvT=5S~QXD)Vpm@;P4~RHbFud8uMh+AONpUGnFfvS4NX{7BS_?i z641yg63R&t63TNZLc!{Uni@m6G$61PG>J!23<`seF7f@YXDmRMld}$l!{Olxc}z&) zr1%naFcVG1yC0&r)T2i)DNvIzv&ak7iO9>3tB^-3rGB1Te@;JTYB51q6~CPoPy#&GnzCriG-v)8r9GU44ixrL=^-fl@3hv zuRzFCgBRsdTcj}Bnw1w=6cra06(!Noq9&L`1k2+|U?hK%qN~6QjgauSElHP?3k|n6 z3rQ{tCr+oerA`T@4WWyB|2vRY4h*CPqN7_!fFLCW%y9)Kp`^655@~U8V)POaBrlyF z9vHz$Pp^|#P+pdTo>5dl%b1s7Mq5!}o4{;lV+MkxMMR*-6&F{SB%}nQ)6>#cm;}<= zT0|hxqQfK7{VOEQ$};4^7zLj!;1vaN6-*fkU~6Xof~1miI0%B5LX%en*w~ zr!`@cH&dg|&!=Xj2AE0$O=aN)#GwTh=rk4Z0(rgkg7=~47gVH$f*^F^MIcB%qgs54 zSzboDX`oFwya3Kz05=OSx0NjlCoRsW{$Jf85ra#T-iK61OK*{qf&kCUFN$FD&ts%# zHYuR9(E-bwl%+&e&@wWaz~TAnAV@_%I&;~3Hx@-eL10mVKb)z!pddjbAtL}zYbFnZ zWQ2z%gfh#PP=}Y~YlUOT%j?nGl$aL86)^|cqBHv!SIEQ7(wX6badlW)6nyvak6Ibs>{ox)nkI^g)=cSCos#U zSbj-Hk3h_4VuDf!BFRI;#Ud~e=xizgi87>6S$G8q5&`#z>lF|ey1&p#$MDs}{pLgM%b#zs)!P z=pb94Vm1BOsMWmqAa2=h-0^8+5hPpog+`@~2|YSQ`GSJdj45T4z?fr2&^i41Udbl3colZD{9Updk07fJv0PcE+Gnjy`gNv@sgO2z-qRqJ`n<0IiINXW}-rU2hE z+{_yM`MJ?)qZy(k90+BW)V`$Ifadbv=cg)zZCf=DO2)n->{iCHr{UMpTOIZ#9T~nc83B?$U`4xgx5fUf z%!-dv7Y1r4nS`p|%e>C$H0rT<6u$(NE`QeGcR5pZlMAyNmSu{JuEDgjyGJ(~+&cNp z-RSXI>a;)*OoFWpaF-n4*WwT9mCcz)APDeKEGU$2#Sy|<{83W#7{#DpD11sNymPZn zcj`0N{1>!LHi}y^U6H2@k&7G#0qOw^;lGm$;l44Vx|!+6Qyq?r56AscM*{iTq*BRh zVO9Aen)Tl7YMnNd1an#w%T4o>U%H?P5d{O-Z)Qoz=tAFC{d|*=Hvs470$Y zc1@`BYnz~Q7OU;S$PN!~DYjOZjevz=0Z4Gr^Pi0+7gaan(n4Jk5om&&Z2h|%XVh*~ zQ{YMpOJa2?!{!JXC2RFv;y(4fLwJM1w4PJB5+SRbYLBmAQa{!>^Xl(n4E0m9hm&NR ze*8Qt4kw%k#x)=3s-5rmhAltTrafv8+$^UE1M@EId?mOSBqso*rn`P* zfB^*7Wm6D()`%D?|MA>@8ssIo-@Uv;wwT*@*+?edoZ6K9wuXJ*>B15Gb2Syxyq^~+ z`k(2^ftKiV@+Vh2Bi6R^o9*qWsB2}`9--!6o@=r!IX3O!vty4v_5Tc6OS_v4iEFFd zPZi84I~>>AO0rzSee;0W&|5&Zh;D=0E!~f?Y+{ZJgVrtSsfp)w>-Q3PX`9L|1v0|R zb)G1xxcFB{I(!Y1>WX(!w4=pb`f$sqyML8|QJ|V|P!Oa5%Sm|RBzGQmnG+hK$j;^w zx$oWxri)`tbZqLeI_tT-tfN5R#niTT))H9BSBgb6mRj+j*Uf#$&Vb~U++<_v#FUUR z2%=3Apqjle@$E5i#U^)$V`9>=Wvz7^tst514e$Bju5GnapJ0=BXHdSWdw&ufss;i# zZa8##>R-EX&@c3tih5sUUY1u}6nq3@y@DVtJ&?NNgy~MgjYXaRmeiOv<=0LX#BsgL zYJ?_7I}Kdw`TwES17PppY3ZJLA>+&KKSW$$*v_)HZ1P1XdE;v67{^Vz={0U32;sE1 z_>8~+U94bqqKz6J_if$s_H?#P>Qf1WA(8dW;erxFi4O^LZn1(pKX8oxYs+yqd*|Z8 z$_?UPJTESe+_mXKO0zX|naVhv4D&AXDNsjZPVyKsv($jQttpJ7vlJH@Oxw zAh6?D67{{R!=`4&2lQVBz<)F57sG#_M^9gUlsUgofa0h|wx`MNDomscYi8t4Vj1RS zH)O`;SDOp~Dh#RVJUY3wQUNtuO`-Sj*m^>8PAo5Jz-g|lmuxvJA~@XEa8UR%3`@I4 zMwW(Bl&qNW%DGq+{GxgVL5E3c)dq^vigtR1cQqK3kW z$8mZc-!e{bCYRYWGZ<=l60Lt094cY5&;1RGR)1o${izI3!q96|RX`adg_c*1 zj>JIg>a%;}IQciMi!pF%mu*r^%Sw@=cKP&OFdlfX>>M-$<-o;g-Ii`2uAOD zCnPbp-3&O}%FGEg%)ml1ij5;tXZ@#ImsrhqTAYjC?#MI+EA;JRMT)2Mp5txCJd)-I>Mc>+TdD{?D z+}OwGhhKiT^?shfNx+lf^_g#v=X89&f-$m413P_4^Ec=J`R#_(MV#k`e%r{G$n|5^ z6Fw@nYTNQ$QQVoM;##W&fwwJqf_M6=`Z-F5Nxx3hELEOrm%tQ!D<)%a~fO3^?NEcX70s}8jJ@MmsFVPdhhJ7H*c zR(?O}jpaMZxH5pX?W2=mF6?8X1=wVD+-#w;znp|%Jtci12~ovjf|sppU#b$Uget!Z zxB2Pon;(-W|LaqbEZn1313{>+y4%%%GpbRItvNDP% z&_oiKu6=Fq8$Zzq2Y-iA)}?05iQ3GRc#l?>lU*?7<3-nJcqQPmwN;)^ATe6RH}$P- zi|#!C83xpUFjk<`WazKE?2l%$e(bTlo7UNm}Pd=8p=D08naDC`3fj3F5q@oNSS(w9ONJ2o_#+vZhXVdJ)FRaT;9-3^NV9Tc@Vb;pt`WFPb z3=y8eO7M5$Zdz>3WLBuev^iRNv`;h#$?P89r$)xl< zfO59=Pg{6@A1|}rwb?VE4Vt%xeepsQ@#)Po7_Ley8It0W>yaHVYCI_ zx*tT7&_^t9#{eDeEti!cPY&o>X-Rtjp}4wnu|LHVyuO&Z3$)+;?uoUbLCCIpLc#L#f($Gdo-96t3wc`e-VmFx2(go#Vsa z-j{fzujYj1;HB}q)^tHZg(UCC$GKQ{toA=H?M>bwHd%n$oDzAd_O9)#0lH8$yFm_z zp()jo&qtf(-vQ2xNnk`$t8iOWufyhH87XyY{v}QtVw6@(n~fjBPs?M+!%uq(pJ1EZ z;F1g*crj2$Psi&vvv%Aqc>VO68>XbU>ie+HrBh-XQ=SoDCzjoze zGn0Mt9W)Uv6(jU(X+Jv@+OYnw(RVhD6Guz#ip13HbdN(M@~)$tiZc8UwJzp4wzC5E znekqmN9-{9!Zxkvwq+{cUyfC0OC`;|rWMKhuBuK#f@jO1&FnnEv-9))#QPx`VRs^! z*Dv7BbR<=UGc%)}r;RPZS%d!&5~+GVi9bgwlWmcF-?F!<*qHezwa;?}EkEG;U-8ZgU(zmd zXi!SZe?K?W|I!A=(Ief1z^cz-UY8H1&UXNDwswfIDziYirfT^X?an+*hv#BQ+xJiR zQRz}ff&MuorOkIRuq%k)-7&1g=#I!$d#XDV_5^r0gCHL+L_pxEOYBmm@KpjCscfv9 zW~H@K<-~u&-W?v2r?+;drNew!MPlJUc52`+<81I)b&9V-em&2@^%Q3y$jw1U2k^7b z<6*^BJP@m#yL-GLj6)rlg`y`Y_s%c&Nf5w4d|?J(oQiB!$BF#iTh%t~5%ND)qIMEP z_;Z%jP8lc{w>>S;fk>f>6Njwge)#!$|SI2P!UH; zqezZGQe5kCEYG;M%V9o4tG*wZ{o8IW2V59*bA0>kbI$NiTZR9+w66J$i5xbzjI`z| z>ci)H%<=L~tdpMD=Y?12uZP<~sr{48VF;@Dl3Cv_G6L)BRT5gyH~%f-C;+d&(*M?u z$j(;qD>4S+d<~|$iA_Tq6p13HsbMv}Hg(|;ljj_?N) zk0m_Xk@ctU$_!HXmkl-(GqYSWz2)lj<^8+$n{;|hZB*E@w{mJQM|A%A zpSmR*=E=LrKbI_aUf%g~AdZyDcUGm047)=D$|1K}C~i;blk1&p6296jxC4SnX^4Jq z5ImslA{BT!I}_qPFC>m!BkUEP{5ova^LgbxFy(Jx?~FOwkAm`zQX3nDexeKaZm;o4 z-pKf25xf^rE+XbvjMLjr*TD$|2Ka@FSI9rJNMLy8 zx(w6g$?rnByH09fuPI}e^4)Vb&r>Zw6;KUC6INVNMW5ua z1uAe~iW*1UK27aMkqOi_w6S!p^jvjgny!s625i_>C07=j%IDGS-pe$Ok{~fy7E1fr zO&IIdZevj^hK))BG`Z;qrQ>=u?4Pl3JlknZWd$Fx)$3B4IEN`-ytGl-$Eu3H?U;Aq zDk{KlKfU!#XQhYF8(#YB_CrSukwn*ACtkGM8WzUaolB_z; z!lK!Xo#|cpw*?Zl4;|mUAwM(V@^O+y3_@O=)q%X3%>11|nlQePyse)}8=5P7H~MW` zyt(-CJpci`|GM2wywH2PszZ}2R8Tbo*2`=piG7Wpv1(S-wDlr%#}+!h6+%GZn~m?# zV1VdIEpacHUgVJeNiCWX$2x@dl_!ioztF1`6S-Fc7uVk|<=EDc3y-h0rYc+Q9FomV z5S>aL=bw&j;y63)^~_su$C_TDU8Cx6v4r}c^#LHAkPlK40j}t?IA$}=VEqTC_{%Y0g)SrP>8wO&cafMGO8zOQW@-1F0xJm%X$85Zxs=x&3B*bqL#>;UE0zPg?P z7yP*BIrInwG$aQQgbP_}*16U6ahG~4rB9%;8mO9R*`qYVy_iemG@ARZJe;%e*P#Y! zO3&tV9ck5$8(;kDzUQw250gMN3tu5&X@DYfZJJj!vQB?tQcYnFO~_4rIxqXmjn|40 z6-REEe$X1;E=A?0$Tk>@y(tO&n-G0~JWJ!3UHs9R}B zI;=|Z2_Ph{;_*R=tQ;)mL+xZ>V+N&MO^ZNAEk9gEVmnsMkXU1>XDTNODHA&Wd ztJ6k)Fw9sCZu3(R1Oz_**QkrLanX8PF@2Ht!Imf^%G{6(nJL%tN~q3&&Vau#Erdm~ z+s{4BTJ0}0>0^%pAuVt+rnUSXFFjk8tfq2~qG&L%_YE^ppU1FKp7=wrJ=1Tq@9a(D zRjhTJ&ar5dPj=>qC10=M-LGF$XS+rzT}kk9v23{4P?^UuOQ&grxR8qEXBd=n`gf_l znI~H5w97;PE~+&quRXMRVi>Qs+xNQz6eSn#X*)1b>;3UcH9x zX|1EC%s@|?4mX$!-e-><88v4)lC?rE3kcqbAxvac>Jl9B3&s1$$SYO6d`TsVZUY!G zpK5(*P2FX3l^psuqDfeS45y}%2x5;qF%-6I&B{>pNoyeQ!&4J#CIy4v6@KayR74akscUqeF zq(CK+O>CQGmnuhW^)!%y=N20G?Qw+SD#Q^KDJ+{w#r*Mh&1S8umqMGqzpq6+I=`{T z#($YVlp{D4rk0-3{z>-TdhF1LQ~!)6jN_gK;5X9z1yQ69AgC0pC9ff7tR%Iy?T1AW zWJnq}f|nB)T0kfDjWdrvJ7G46z=o!*7j6?@U>hgu%X2`lT1iw5N=NIJTbE=Lgn*?QMk{^$z$Kwq>jZK8# zg(O${apx+z`Bd_4Pup9IqDRIo9wV4yYvFU7a1xh+CNZO?6eBwMW#J8ul*`HkYZNP& zuC*19PWO1nBbkQaRgB*KUVwZdsT=SIQmwwn5Xf~Xpicj=ab72MRMbsdDX;hEWjg>} z?(37{CO&ClpbuJuVAIitWmM}`@8ao{DW|$b^|heZ-=siwgd^YJG}Eg={-c3~c*FM3 z(cYJiUVBj(dK^uYuI3pc&IR85jNP7Jd88J_B5jK?X@96ufEc%;$TU+3My&uJu66V9 zlC)t`2k2F;F9+0uGs&?S>z}(UX~kdMJ%PS+HH(`?K_e%|65$?Q@P8zKNV8uwWa1(M zcHby$_-}Q7ZU=O+L+6Osv9%k#GRv%M5 zdu99Uv-3vQAE_*Hd0Qi$9s8VqCW`89lNsA|Uq0akPP|gd0L|a+_5rH#{}8SoTmlD! zij9Qhh6oS_L2UvtIaHYW*qQ}bIW<9II2+=h=tHc!8Ek!n&!4#)I^>BLscXBf=$t>(MB6 z+WBPMz0`hB#Ber_W*tEEt9WYGGUL|9a@=0KgtaAKHSZ%9ty@=zs7qp6*`Zw9mtMUxCO5G!u|;mfI)?bECVBJ3 zC~{BlCmII7nWwRA0&~Ru*RhO4oK7$F;QlxxS-q!^9k01Z!k557kB-Bur!{=(kk|gf z3!oX9OhU%eN} zz7~b_oQIDAyX`4iWg1jTI2Zb7I~Nc4?+U=ubu?>ZWY&Phh(|T za+KB2KLWj;%NT$dwb-AU7TYLPqL0FG`hmS7z1)dhsqMKqe+uKeIlk6TFFolm@U8lQ zSPCTR)e*-XYs1YU)ZOR^0GZV}0{niqh|Ki>G`%jk4PX;ve zqAUT_Fd;c(wK7auO~&H zgutNjE(Q4TPLSx<(H_DsC6o62X6C$o6(DmRrn4xapc}%&fg?p!88?yjonod#S`!Mx zkuziv`C}%d|7nsvuPix(MIH+4=9>3$*?VfY`Qr!(Q^m^}sQd2{(WA;e?~#BY^7Q`* zuJ2PH+F#q(X7>dqvzkJLSx`5)Yh$ae{>i)or{f17Fwn)vL0~yBos{OqdJPD?q~c{7 z5?%xisTE$Ai-HwAB(H9|SVT0?$=+Kph|9BQ(ZaWC=ddK}L12klQmj?%C^?E1q{Nd) zH6Vos<=1k#{pkZ`MIW20)lHzw^P8vBW%fugx@tfLk+sb1_n_5rzgS^mxx0`%i&GRs zw&iiEB^NqD6&(A@fPb#XUV*U-@8}25v;_o46MXKCHONoEf8cNb5xuJ|ID5$_RCmZV zEW|TKkK&KeTmAoGk7ZqV$pi&lv zjMdS@j(Z?RTWV_Ne1n46#da~h=GekD*11w`^B~f{|Je8$yGZ`2Zsry7#{2mEx5xI7 z^dmF$tv+Wy2ni2ztFY$8LJ&C;C2Jw%{-!l0XeIZ0AKP(eNNS}&Jm!ey8@A(L1$2NA zWE+JNl^{1Br}AtdNT|hP1zy}(c~+~m93p)w%^q`q6H&Chf+#A^Pi!)2ziqT5%|4fldY;$AXKh6v1r!P&I+`fOm8#f>MpX@w)YIzrB-=b?1iMxeS ztGTLaF5U?4(xD?SeCmP?JQy8p0Qn|D8ZJ8ezeU|>G(cIzCQ9-)VUKh7fB5CiI4ntx zpUvk*UFP-pG^kAHKK_MV`?4#JE8*K>iFlmvEdA9xuusw`qaB8-5;76wY3gcT9M}8p zdO9;xjoi#=3FQB&z(l8r`C-qktsSNH}7$ezY2NpOB?B`si z@3M251-hlzSE-`s=>OGB1x_%!PND60RW3B=H|#Q4SwmA0s%iT zzD}BBmcEmfddNm*l-yV?&a0vq%I+T{1oeT)Pzg`65hG|qv?Hs=Y^u-b9s882zo1+g zh^4m|=clR%K*PZ^KLJGnjt7V~Gj~5lFcP$P==sknuq~b4gYtGg>=?j>Y2*crrD|%~ z5D5B~C{?6#PMM)Nl)}LDZ`+V4veati6W|n?K-Jy>{fE`Mdaft=*z@#t>Cr91#j%FW z6XO^Je$zId+cbPjWMPfsS;H;$E6rlSjuZ`NeC55m8Eej>z1#;L)%~iS3PE7K=9OK( zlE<~1^O6f409!_>RCPgg3z)QWm*ThWTTcCcyR|$pwjd0dWqA4E7LodK2;r>=86so$(=A)6T;y+gWu&6U+!oM8rY@r!!Ytg;7 z!m*;h#&am9ntuV$^P+#XE+-u!dsB`CwSL2txX$}SD;Sb8_pj#m3g<004%0JVV~yHD z&}XJ4QK$9agZe6xgKk#3 z)#sMdFT7XRPQ&oF?q;L10@7PkZmOh=-BND(it97?r;7T&1=2@}&W` zv{L!)Z6{2+so+JbSQZbUf>DVnGe)%AOnCkE zsk{G0pdDZ-O?Nr?+7AAYc9WCcyNcyn9y*F5?MvKfZyh z+|rYSSFF%2zj)u;o}3vv)a#9wa$+L3rTvZ^nY&LvAX_3n34HG{ zxIg+5FtcHVF_d^CXy;-qYN5biOn)W57(Jjx{BZ^>8WcwG> zHP$ykgh~cG_Gsbh9+mQ!fRwoD^9cV9RzRm&wy?B$4{IxA%$LS(b!VY=Md;i| zm`J@bLAk@vIF>is^In^ybf*R_{?9MAQygBKyN=9*r7uXaF?JW7I(wUhi6D`kms6l% zlxvcYwZnMhV?C2S=~!NX9AZq(@K+z-+iK0|6D;=m>jGmhtT_a~{k792;=DWDQ(CBg zCt!V3RLL%2lZH=&@C_kKNUOH^=qksLWcBhIt6BLjI7Z0lKkpm)$i`d$DUWHyKI6SF zfhHl3Y(e3ocqTiOJPeG#V454KPfdm8~tWOQfvJ52LCD zF^q+uckYe6MdJ0R6r#6{CUTKCUj!oA5#i#kK z%8D8w{dXx8IoG^h9p&WLuiOfA8yP1r36SRAJ#OLdpzVcUNoqwFHMt>zTRs3E}aGwX-G9p2-#0j=55e5cz#Pfz4jQRe0Q4B6wn1IZiZ z+(z7Fie|YcF?EZC?f(Vq?zA-5Yb=n>!TNKcjOcK7ty$G#)BmVgj9XuXn@*7q5kV=EgwA?zl2*LrdKk$`R(!nQ;Z=htz z?ya&7Nq?|HtUY|53y>8{rLGW&nziTpx}kC57rPzHEHq+f4nM2Au8wetfAw0fE;6OPOO>w5zOb zLIc|Nel}0Cm!GH4R(nvZ*_qYj2h#SClYvLH_q_4KJTq1-WmTTzj~8bZZ(+{w1mp7Y z#c-d|Q46Xc;wG_3SVPmBf&H*H?B=_O&`vH3RE5cYO;g`^w;g3Wj<>Ax1HzIR$;|pD zm=y&Vuo_A=<+!?N6})|p;6|dFdvu~?o++7Y6V{t`;SEufqf0RRvCuDx5+XhIWv52U zd=LKhH^^ij{TGO;?M;tQ>a>-JIuQak>i`k?}Uw7ETcKPaewHPaTow-^rcSBcqFwIGW-z4cauMa4&cJ&W|t!1bYJi z#c2IUikkG=y4TLQrrhqde(IY>7cfd0QrVEydh__DBH$YdO)c5JhsGaf%=?)49B1OZ zeqQGfEviTJHe(##*3H>kuI3k@?VBd54#dW7GK*JnnU5&7U&0HyFyo?QM)K;?%0?}y zVJ$uTuRT+5Ah3tk{WBgy%uWnWJR&}TtD%Og{_|UM*!938L0>bM8aC5Mayo}nb;d9X zVbeE!%wAs-%{W@6W^TrT;n<}Ut0+q?x-Fs1*L9~hts(BX6ib-;SfZ+4eT-QAa24?F_M{$PoD zV*Ei$0bOBSPlew6I!Db|5cp3a#$kRG%t9V$2H%p1jte%2TKA=_I7Gyx;p#2xAI6tx zHOhh@uVtLz26PmM=6jrV*EkZ(5gCo#_}kMqlNmv&F;+`dVp$oaVI5%3{^>1u;Ns-! zv+}m}bb+t`O=KU;=Z@H#KH{fveY1uuVq}=Q6*-;K0%4u0Ly*$?PZk{MaQtd5Jg?s# z_VXpQ$dve)DEK0o9GeX~ykBQ==NeI&kIKOjQqsy%SnokLsaXgUW!;B8Wqpz#WCr8x zlN4}rNwa)dz}Bx}nmQnZ&1y;Y2#$(D117Oz0Y}oq9`LjSAg%bDAy=W+=!0v+(m%v?y)|T6W_7iXoni0}`AvjZ61ji~wRumC~A1lse@zALUXI#7eF~WgeDh z7EeZIFwdS|0Wi@0LP^K8ydb06pK_S0OKASiE4}yxXZZXvdy*6W?Nd4^{fd_&oB*RE zeX*UdjYzjM@euXFxvZqt}tWO*LC zP@kvhNT<5qFzI@~sAJLLqI5Vfg*f*qQ@|r&E~*7nCJ@k}ope_~`DK-3+9D&ux8qTy zhUOUborS(4dffK9BvZW2v1s%f7x_{Y*y`kna_*QM9-h`n+CcV!MO2$;_-YLmukN~*claC$-!JO zIKCKzfPe%(mNOuDs>Bfl9$eRACFqjeFc7d_9a!=1$l~TyrXS}z>MZ4#jF5#R8u6aPQ-veU4Pg+@{Hs9Q2q(`SVZJIggEy@66~ z)IxdA=P>2x_vEG<@mdPqvu_Bxg?%DeCok-B5f*KW_1R}Nw%C85)7R<#kU|ZwsI;q#9i1V zMud9)KY6*BRI~}0(Dy%{!9OV{k20M*&0e#{qI5FX(E8Y$77=2;s=g5)yP0hhgYbHRvCcAa*=_P!dRq#7`3a|#o?EXH$W zI$UJq%Cd5Xe{IKi?*H*~?KARy&pw}DPxOm#kJgnNeo{DddFW4OTe~DhBt<4>B>(Cw z>R&wFih~fWzjn{cSjJm9p|AO=(}-w6FFt^)d+u^BI-1&t=u-R{Q8|{q`}>uJnFTj5 za_^$>$4&YF9vwTPKl(n2Zv?f7v^`I8R#%T|Zd(uy4-N>UfUIG?U+%!6-bZ_K2RaD=4zlMzqT2K#aA%TGq}bvOuYeZ0=j)NSD}tIr|<0LxxjReXH> zg4;_?GO?u3Ekj8BZbAI8>YR{gKKL>Zi66AD@mnSbmG1ZO?r*9g*R8i0->HZeYLb!m z!;Y^dxayXBvjCEDQ+3LBL#pjRHGNFy@<}R|VOPuXGjl9SYolG#i%e;Qpj-f5uto%9 z9gbnWQ_`Mow@&+PYKP7aKz;hT)X4fUj1Onmbjp$%$fc2~8vby3l)Dd#B5io~;Riu9 zFX-s_>q+y&hcUh|Tfn!Ke#;1OL{)I8ZJqP|@U9WfY`AReb^KjbVj1?K!BgeGAaA0? z9+y5L-o@Q`vepyB{Mc`oL*Z&Z{9-OMW#8`{NALf-En|DGdo4H%0m^*c8WJjd>a`ZK ztG}5{U5&;R4pJt-FisBvD!Ti_oiy|IH~F>bH{2j=h7hR@c?;8DvB}?SN5GGV?qv6i z8xMam?aF`fbXFQxp9SIQOe#7Z2~v?G26H49Ni68Aq+c$%=tv$=|IBY1eX~tjIdiM0 zax>~P+0Pygrz5n%0XT@a(GN}y$?dhiaG=ahTdmM@OYkL^Zbvcj(HA+Hg9Mg|r2i{b zzuvo4RujKk$hj(Mr7&&pz(uZkPGXC(>b;{r-w-?P^et@QcJ4lmO>vggy;C19tw8!p)o%3uLZM9}d24 z+cv(PzxF!pvsGQy{r3Ib*Y!MU$A^1@7Wq#2?lV8wa`LV`on`#jL0|&xlSJav zjBf@;m*OSmyNCoN+v~+?ZfQ5}&nIwba(MpLmmy%K$RlCW_wwF6oa(Vi6!*&8aE$iT7pim(o&AuzUNOmMq3})9zELdza_~0gg|s- zYd9z>_LcVjvT7!@HKt}^7vl^lg?K(q+=os7+I4oE|=oBP6&Ocv+CW2 z$QpcX^9MN4j1LCiXlSwMrIp`*i#T4*@$UTB?{${?k0}+=31Q&Q1YJhF5dJ(@Xh*8 z*R-CmIiK#dCC#K}h6Fro3PecRiA`v*4dw{y0Yc!8*F6xJ^f1TV&eB@Jn=G3<#XYEm zB@%u)Ig}*^`7_Yx9C}_41P-e2PZbOQpj3qy#QFuTz>20hH3B+F#|`^=ZiTV05)@dj zHk+zGo?q2+SUcKASPj5il?ms>*zWf;#}6>Nqp?BoiYyl+qF%HQ-ha^;MJEW ztWn3VI+S^1?^u>7$cVL=-cr`9(zcgz%i*;pY?W0VIh*4{U>lKrgigzqMUhNn<-H7| z9S5sl-QC^wk_V56JfdKGZ`o*g{Z}}UJ7vA{r&5Sosr@!k&lIL!=}pPhxFzo28EUrC zo2gGbJ+^paKQ|s6jBSKYF#)T4$o-cyutrjoErF81vAS0<#nslzNH~7TXIKA{=J0)o zTm_w??=@Og?k9|Gv)8mxLRAJv;t`I=^4zFG_3x$Y(4vkl{@`n*t!-n(VWS|w zXUzxAt}Kk>k(pGmJE@N+MN6jC>g%M#$4Ze`s8;=htL~%zU_A0@4T88k-W!K2R{|>Q z(b1QygvR%%gfC#pV;sig2@JVegL7iH+?Cn%`sBstlf}& zVub#Ioua;;vBxUB0&_fd#sWQ-x@jbXYXRiv4jX!9=jd z-nPak{5~7klr7ULK0GH|^?w9%kZri#`39wv!;=3UZ5Q)ix&R5x*{Z)+^ZC@?@?L2= zcb+7p-6kFR1f(xso0U;$Kj~CMiBvy0wO;p$TW?sySSYhe8lUo`DYuMoQt?6Hk3y%m zJEgm4UMdhTrS<+d_`jz)rA9~O;2ho7Vq7EFsJtXA8RE}nV?SNAM%}n`UgzCOTiHsh z2+q!6KMxK31%N|!A$6*ay(rvuJy>O9fg)&y2G5rPW>E9G3iD_Q3iQjg)M zddzR_cbV4YJJ&Rwdv5On0e^DPIv%D8a?1)k`zeMoGqd0Y*keg zc;w^~Wonjh^=s5DVnJcp@YqgH>!~KvECB#`4r6(kFcAn24LM_C_tD^ikK+z886!rM7WmYf# ziZeDV$~~JQhWQ2NTp8s5YXx6?Hg<3po%%2*9w@4;2Bk;9*|i9wV+=nPhp?#pt%w~B zeDm{-%ZcL)zQ*PGXsn(o#kPH^JT*>L^;qy8tNj|n5fX4JD4hfs2{L|a zT3zY;y6y6QK|h>BB?$`}ZWm3gl%xWzT{Ey}R9>1~tiIk!T8eL=GY?O{o?kehej{dv?W+9TNNq*9_liMXeea3J=mkC$|{Y2-<3wjn|*%p8I5C9 z&25hwK-is>d(6mQeEZ2NK{L5KX0CCfHaptROTj#qj6QA*2TI%ECnSdMlO;AA$IuyB z$6)A;m*TlLA5~x{AhK~qM3xTK+Imb_IQhqAHfhF^7o8&R!gKhq4$Yh|aKaxD8&47n z>c*Z;QJ?0MU5c4J&uB8c2hla;H{Zq!mP@NMwrMtOk;uKD(H~DoL?4F!A&UOdp&8zb zdrpf2qPx!rfzhY+R%G1EGg+7S`me<#Y0KrdNL#Fwv)x3tq(nYarIBU2hpm47C#l`` zFLR4~$8o9sf#77l;&5Jfg0%|ZO3`o5%{D4lPy9#%p$T9vtfq0`<|R*qtq{8yX0FkaymshPnhs|HaDG@RyTbh zcr$3U-ZM~XGP|Cg{4{7bx%?}}%wM}+b{!CRQDc5y*joLf_l?LKKc)jWKhE$}9}yxM z3HB@Htj#A=jznt-5lG`GNtFI-Aas;?Hn2hQESS0kw7b&!bitj?&r?bK7uM!8pR^C6 zr~U&a{F^J4IJ;+j?ExX+AQ1P1;sHb_1l%Yw>;uFKrpi5Y1x_i`HASsAF&6pr>;9Wl z3y$e}JaNXEBUu{BQ7(WLul}%1tqzW3NMh(NMW`iQkP)Nj61w4$DUrqz@+F{Ab|)<` zmRapTym4U>gb|geHrUQ>RkSoAXLLsJ(5rij@EcEmOOD93seO%nZczeb|LHfDu6&Od z`sh~%`p8xH&s{TF;rlL|)Vfrc$JzNsIGOqVWTG_iI`!(`-vj`YaGO009c;o92wWYn zA)KFyF=DlyM5-x@f zZKpF8*dv4U8)|b#hLxTXUd&j!^?s-mYUn-Fi&0IL$ z)AIaM0ras){guKSIj8UT#&J`&$14v%&=Hms!=hizml%&9-d>_`LK8dmYRts}$JoaA&;!sjQ5vi~_b*-3bWX`09qZO9 zm;USqR^CbYBoqsEteMnw47!;K$G$}gjb2GxQ&R8>hxmAcvsZ~tMT~yiwJ!k^+P@qH zYD1)#nAShH@A|}K$j$nn=nsp#@U>Z$Vbtw!@B~i!$G_XDNcB*>PNA8PxlsJ+DjRfS zgpCzkjKBzsNyTd@&OaM!|1$f11?B~V>fs$PSk7TBTC|oJ@^EoO)+{}De(`ZU*tC1e zD1qf}y<}Rr)a;cC5%e#?<qKw%SaJYy#U7J!O11hCVOi zZUNI>VpNNQE#WZ2`F7i=DT-uNc8$UuEf5_!2*8A+Fp7pvz%A?Gm?>92nm1R!Xz0B!f~@`g+vFH&XqvMCb?6+kt5g7zN3x$z^SkAdOtvQ<~qP3LQb^jKTVug5*K$|fs>bToIf{6er^X7X!U@`I(NOwjNH zDAG}Zg!1Kp0u7t|hansDbH|3XJOaKnDqX_yrF-RUjM-ZA5qZh>gc#XXg6!_QkZf=g-Jo&qzocNZhgCP40Nj(Kb_KU zQ1pg%_X&aRL;LFjPRw>m*nMzt+&Vt{qCnVU&vumb9Mi63LWjJ0CtKH$nyQ+bF?<%% z@BFh_j%U|a*NkHO>9He3a%W&_r37!w0*`4C1dctO z|6G!64JTq2B$SWCm4k1lb}Sc647CYJgLiJ!O?}@paZjl)IuzCHrA|b<%bMZp<<-|5 zY`tKi`$(_S`=@>~Cyy9Y|}L*ZXxjbMrp<0KyL$xVV}foI!B(1A__f_=%2dE>zk)as7ET&KLB z-7v974aWnR#P6vLL@^I?>b&<$-cEn+@v3Nb4qw^0$)kDsTQ|c-st(o2pXT!_LMFz+ zVcV&yDDLsOBBYxex`cYqm%|z-0pET9-HlOpG_-X{S^#BIFP4lTm#6v3SkEJ)U=u~l z#4(U7cJEG7-+kznKWBDrWpHiZeioWW4v-o*M9fa+)Qm~0!xva<7L#W-nZ-sW^ILFm z|IhPs@)RS6FI?~!jhT8RLfhLGM9(XFk6BXkNU@U!3xKj5BxQWO=FXug_O^UQowuZs$3=tnG<)v zl30|~5@-`-j$*?*m8TEzp;;pm5^-2JEEIC|VGBa&Now|b3jW#g^St|})B^4cj`l7@ z5e{)lj{tA@lIkLaYSM#nOftxcaI{kp<&)%oIy$wfA3-hw?HR=nUsnVcVE~c|hma!4 z3m8D9ttLm^Y!t@0_K;OXr0jE$+)ruY{ksCUoxm#pt~Dv}M?ogZTyM_2g0`sgbe=5z zKAP}O4DlzU(pHwc0~@~C$E)}3nAjLnXf}hFFzFdAxp?vO6q8!J$&5agkA^b#H?!ap zrOE#6yK{tzphyMQZPj=`?`xdjIjcauE|WZq_!cQ<#~mZTDd(mpa+b1!y>)QiL9~Sxa{+KWdpxQJAfq z^QTWf5$lv-cI!U%-`p(|aj||Vvi;eO5(`E73K0oc+wTZtQ+?pyNISc0hTg0x2RMGc z-i+u+AkZYfvf?T9r3OC|-s41wxuCb&S4V1C;QgeTQKqMXV!^L6QdZ#NQ}YkBSdI9G zbSAlNvo-ohAko=pmRAlDGb&_XobAFZ+pZNt8Jf`%HzObV;uUE9|5=lUab^{A9qn@K zQvNJ$zpe-@a!dr#vB-q2LJ^-Y0=M=?tc0tI&W&T3Hjg=4d~UCGAa3S$t15O%F>}`z>47LTr^_#&x9RINj!PCN5K*NIYgo zyT{;r=(g2ZT+OON44c7flDg}b$D{+_=dYPS)$@l`sq^pJ%aO>vQ}DH!9G33wPa1xS zqr|*QJxeJq8n6V6wn(oifSe;E5eD`V#?$&CFM87l8w6cc6wClc7T(>3$MxTAl;5f< z4|9wfJ7OM6jG$cI3SGhoxrxFe)2clPR%VZ2=bzJEJg~tYc7Adz8s!*Jg z9%O?-m_fWMP0CbA?^=g!5N1*3AVT3G3)PF}#g)HgjxZ9pT~q%K*ykIU5o90m*K&w% zykVb@vUj2=B&N1m<6M~kGMx5VH2Rl0_XiVZcKQ#7@q+RV0>t+S1-wtR*eL4g>^RB& ztr~C$=F5wBD*gAZucMA}%TPf!X6vxecIxJW$Ms{;C*ecdKOYHRClDwmDzkq0s!Z8l z2zieB=~RKX=nvWfW@JQyW2q@e{h6uj2bc%mUjE!cqNv#F#)rJ;9M4ZzG%?O)ZKy^F znhDl?oaDx7f*?o-hPnTez?Uazlfx)Z*KxyjJPi=692W_uA-;SQrKMi@`HG7)pKODE z-hf2Rg~+9W0>szvLuXE1coenADG=Bm;DzYbzJ-Ay4}1iy(1bqeAa{2`;P>@JM!*ld zJDO-^Lqre~-Xr|nU`ID}5Ao5$gs(3+=5>2}Xt7?Zszwikz*9=sWl$X*X zx$KLOI$+otdRKn++en&E)j%e5MhMH6EhN0niofev`rQgHv6$6M7iNFfVDv^Q4|6B1 zEARj=&d~d3fQDUi(d59=K;sPx2<*2l(X3vN(C<^ile9F{TAi6@aR{~5$bpWVD9_?&XsTLzdttzGezP=?YcmM|;KQcMQvq%vV zqR}d26@ukLiLvlx`$=nziwvqAV~!U?xffVXFXT3hDd3Q+bQV-rUcjcwirI*4}~1ha3gt6T``jmvszbLT=?Y^JM#MU`a@<4(pv1wW97- zB>@D^FH*~O2K-5@N zUmC0Tg%3Z>6j5C*5ij~M;WGLNVPrEQ=hsE5{7=q^@apB+ zy}UQkx{ompWUJ-P_OY1uoRitx)9WxT>j(QP<~eA zJust*gYU`J`>V8bOM3Jz)`(ATTEymm6bc^$jwRl2quE(4O<<7GCc0s{ z@0J{8Z6STRh(n5o*kC5fx*p1F7j_NvHk_!l)3DLSR9zAaa730=*cX3LchFYSurY(c z$+g* z0DY)&1D2f~Bj*;^a?N5(M_B8;{$p`uK77agf$X+blx9$c3D zj0}z3+FfmQAm_TM;j@lkx1L=%R~^L!#VcS@(bEq$5zkoc#KIFl`=JO^jFYUuC(l&6 z1ftW4T_`>f_3F<*w*pby9RC^#pw~oU9)W3OGdnNW`z;fk#abRfnDR?UFQsod6qSb@ zTj35kdIfF_A3B02nGN_?lsX0V-A2d5h!R%I3pmlb5p zgkjrTIZ2B*<7;UBbi+j!vDR5uK!)i|*RdRJUrAq1Rv#BGHX!`d?0~}T*i$o(H2l$i z63zIj&duz4b>M|;+@x9-MZ(*nCFw5+`Vr+QxYh(Wv)JJBY%Qti%X6B(~Or}O4V!H03>Ct5A>X~o3(Ma}e!C^eqRg+TcuhlC0Y#NEW? zpb9kNy3Dyat7gOf$3t92B!J1p??s48zR?eFkwR?|L@PV*7L6!E^pBLLCrIom9v0T2 zh&ZyADPKO_QX!}lyGTns?;E!9@eXQD+>Wml8|^QpYgO%9OOy9ozBU?E0z zqC7MfCqyY3c3uut_=MVb{erjf9`=$d_!n+Ah4XDBJSmLz92@O-rM9$|Xg_l^Lh?06 zq%zAr=h~UQ@exN+8d&=KiT#7GjMmvw-YX(#+_u92t_8%hA(d+noeTQg7z0eY*Mu4{R4J6U(* zst9^iUGIm_vwMcM?V!5;Z@`9|Cxu?*GuTq%PN)E&DLbFgjOr2IFKp?|KIdy+5IW~8 zk~T~J&rUF8xyyN%z8hg4V-FkQF!fKdE?H|+8iPv4$=ScB&5O^CZ*3ye-6KiL-SlZW z*6)!n1iBBpnIM0J=*#3CWHTB;yJr~?m_=lsmf{z6&Un@I&L8BjXJ9vP=jy(ov%Kbj zWGBaDD{&A+CoCfzMR}R2ZCI4q;6LGEQA|A#&PRQ=QrB|M`v69r7PytWzjON2ScKe4 z!6yLqP3G%Mus%|-0)OOFY~8ETl>N^m*HLB48`ar=iht*bTH^0N2^dkeUcCnH3lYBd zM3gk9sB0?nl)b|}0cXX%v^470aHb2#ZV*Xw?(>(E8yZC z&Z;>e9u5Tdajtl&xYtvYp_cn%nzuly&z<1fA?bT~`+Vhrl{4@?D5RZ{GS8Uocq05G z@6ow1Ufzp>7WeT))=&|zxQ&iq)k0%JE25xo9tg^Z{SLnXwZn+<-p z>?^Ib4Z#|)^tyOWy%B=wc%#uSftPz{GoGJx;&D(e%Vqu$%wNX_pK!<<5NN%F4g3=+;MkMKe@$P;zwR`ID4pN#aX{`WUsQ_+3xlos;c0>YW2TzD%>w_ zKBR@3AV~3~!g5zvljke&y`z85zZE#eSL2zdE6DeLt2lUF&Y~ zQW)WH*Gll?IYH2;h@l|AZ&Y>k9*&GKi4bQ}7sYS%ty5eSUi;!g`x&FYJ+ct|Oz z;o|L+^E=CPLPtPT^*G8Q64k>gu1&JWDFM*_NpiM%y2zNfM~bG7)g!5qbb|wN&UUq2 zF|=2Y|MXKz!EmPFp`}AKpa&2NX_~}dFHsk?`Y8Oe7f9-Q&P9Cm_hVgN>P6x!=hGSP zI&T!77;*YyD4+}R3@8qdZwQQ&UEY?pA_K z)~dV$g+{T@!hPk1$vWuuXF=?Rd|^rj{ueVPuAlbma>l#FeKIJ{^Nz(ulgV*bK? z{!h_cDLug#VfePkrBWNEaC_svpU67PQM!v6Dy8H+J>+VF%@u!zYicEsS;7U|?xS*z z{na4N`>AN*IQRa!AVH^c!r;8l#k5CBNQDH#!rhgzf zE9vWUag*dH&sxfxkUTKW)H3YBpJVsa-%Bt&)&Qx~!|XpuNDQeg5M6w%sD&E!jy_V7 z=3;XBE$5Mwl8`$*4UO_819@Fm#3yR|8~Yz*ug;ErgkjDsl7hSR5RbA6ik3qntDm19 zR8O5@PP|41LsOOF)Pim(3L!xF1W@sE?=+&f6D8xc_S*x%it|~%qHsGvpOQ#_A#`A{z&0fE_7v7q@HdHuKXdH05x-UCWK+xdOzG6=O~!ctol{ z)5S&iuq<4zyTq&D<9OQW`d;xWjrNJ`5-cJc<4m?u_cUJ)Wog|>hT1vTXf#60Gs+V9 z+IwR|NK?}=0}c7)2f3Dsp^q8oyR4%^Aa(&Pb;e%ikejhA__)!3M(0uwr@T~;B(_!K%}${nnD?6~R6G7|YCH#9t@9DKt2cQ`R%6pJ z)fa>D{ZdiAG8Y$}SXGFp+ij$12~dMls2J;xLsiH($rrz;2_*4jPI?#_Y5-Ov^47*< zD%xi)Q5!X-n`78M1eQ)UtlU}^?@N97ZI|I`XM6}FB{tYXN7iXU*@)y`1wGQNTBVBP zJ@g4I8Nb>Wc(2^LEr*w|%!npy@yu}=oLEBdr-{s_<+x(w7b~e%c&wagxer`>WlU`M zOQvm{1Gu*-fm{nETATzLhb6Ph#LxiYfx^mN^7FGfzKMliJ{hM@otAbGuInHy3vkPG z%alKfU<#4qCpi_meX;7}IUTxpl%s{qY&r;&n>v{8Tlm%sy0%iE# z;nteQRU^XOedxzxKIQe*QDEu-!#k)w2Ybpgk3%NhZaqGsb4ym?0KRs@4ZRLGHx?$s zVvYiw7vis98E5ylSWV$ge(2irfi_CIzD*4*_0%-Cq9SI8+IXLIZFqEpbB;;{!z>*! z=hm9+1-cuTc0qU-1vGeZJiJ;SGv8iF5Y6l}*hTHp$$>hxKPYj{VTf6XLOc7J$yxj2 z+lL5ya-cTwm$!d3#ZG1~+5M8@Xcj`HZ~_ovwt0>tn4Zi$8ClIGx-39jt3n^i+JLSx z$LRmaW#mI+sV<8>k*B$>NGbM+vVmHi?)#JCys1*iCEv>M-9(^v8r4S%Xi3548evPi z8X|sY<#abYV4Yr>(_2H|&4c%ODc*gjY#AmeLO@yX#XKZ63F_n{6D=&8Af_O9?Es`c zp3&fnAdQlv#4Y#l`caj;RB|2}5VU57?OBaQS)#tbnv-fyfCw*@oqbSyik!##)p2!xPaI#R~^n5Hjwz4*iWLcgXHRv_O zEsoiqxVGF)J%l+P5S!`b*8L8IC?2m1Iybo_3q2RJ^73H|7ZQ}*d4ch%NvL8ZGi@Q? z;UBclh@qD4k*%@T(gA-H7FCAOu2C#SkU3e|HzXVcMl^eRejL2)lhC&ljqtfwlGstX zmhFgU5k{z_igP10?VA_+rQ)Jk@<#6Nk%&v+QA?w1Q6Knq?0?~7J}5dL?&G_(Z3PNv zO95khZducu?JMnJlfbI+R?p_)<-vM00{7(;A2*76FZSy=v)6ChV;ad{ustBKa(?TE zk&uz^e@XC+ALL=DLwCZwy8T?U&`#(D3dA31q+^K4xt8^dLFYZ4F}EInojn3O4GV;G zneNh2{!(|GP^&Q?DHbyFnNl__@t!pc_ubWKbR!FjY117&2m^h)Cj{!c!q37m&}#L% zzCt>PE9DS%2kaq5rr-E_O+Ep?@v-~HPa!!YPuDZGR!~8qyJ0qt!h^>404Ti(Moa?EJ)Syy zW=JauVP8!y2>4;a$N1H}y^}@o$|iZV&l^2PIc`m#6S4Vw_F?wszIS(88m0~h9YI*$ z;d=!M-&x)Ain|Hx0Drnqb3N}Xc18AZp*V<6c6*oHs&z%wNimrS%QU8}I>B%#{4LC7BVIkJn!K4cN=f)Q?`!*z! z1QvKicM4j=V4y>Emdm;*FE3FW>z~3&4jOA`_?PG92BRszYVaDZ8=_-VNn=ePV=ZmZ zWLTSKaEf*)1x6|l$ozS9plUF^%gOm$Fj0|s_a~)gL^493xPi(ca54`oY@dfx<}}q3 z1;b=41sIgaqh(?E_ruG7oM>8kTT$;H^ONR4jMy2RPpY6o6zMg`llevh7cWxYWGR!6 z8j0$Hal1SVIVlJD@DUBA!>5M22UmcsfPYffn<#_g;@8An&4U{csyrm0TB?e$n5$B! z4vI-e(lc9INZyw`eUuvGna7&rRri)=ilXfbH(+>+qVRP(XhiE+cT#ctrWcz7_z_ z_){aD>cg9vpM~nO!jlpu`1t-^=ZQ>HGailbr|IoovMjNz9=NFqXMDB?O|&t8{9(WR z>G&a1>b?HN<)R+BGa);k!~MudBSA7jMAm8+XzSO)fR95|kq z4Xq{FHj5=ij9 zJCncWPA6p27F7#1Psm7*AZAlh;?N8(LgBZI& z8SkZAL;p+R8bqh?@V(-08Yo6ER_@Cwxaf@V32Tb4Ul_9=t#C3c6wxBbIEz80tABfW z`7;m^#U$58y=d2QX4OLHo|x+9bwKQ988&s@g&3;4EvN6DZK)F=nF-1t73t+;d_(`hG*8=$0-~YS#ePqZ!hoo&k5(1ruy# z-Gnf1L2^GMw`hbSbU*s2ovG`4flX2_wugflL#lU(uwJgLu5G#)%``Q$7nQBk#zKI( z@MOCX!m^Ts<+LmrP}dp}wBru~V=+i!fY{01VRM-2AX5vnvTf70`)R&4-bX*0dPxU~ zeg);lsYz<%ZOJy`HyTIgbqywGb(?hNflTBsJt<%&(X8;#)Mc^qUc zop||7|McHQchzS9_!yJ0@v%IDZl#!STu7oWvI|zC1NQTQ{enU68)wj-khM2K3L4Ai zK^Lf0yqG4C2;%e%JtD=JI&zD}Q7e9`r5cK9NQHBj#E@q{P)#bx6kT?d+e{2+MzSIu zJr-MS&n7+y1U{*Do6uJwcN!=`h@BbI3CPYHRX`m!yxMwRESp9wJ3%lH^nvGX7&Pog zrd@aLI${B0Ih689Bx@pB?6|+cSbHlaG@DLscz;y(8*SHgZmrc;{Rps^M)~bM^IrEE zfkAZ)BbS=ZTyG80?Upd_S*a?^*DtZ zqWne?CQlQzrGw?D(?XO}GWMnzmA>_9WyjFuOR3>M12a5|ysnTs@3_F?pC#&UlIN<} z8}|%!Z$k?c@$^{2OYgWo=4gSVUY7yke^DEAS?d?5xenrl4q1wGNk0>r&rc$eqM%pP zt7kBM`_oVBSs-m?7wbWE2Tsr0gm~QQ*y0EFA%{gDT=u-pKD_P-Iv~1ZJYPMwx{+az zRR4kg*1qyQ-0Iu80FzkmD>p4SK*QOPa}+3?$Sp^bZ_wxx<|aTYE-f_t1YA3NYKFE1 zvJE$HmpIXz;B^4il)ay-Q;?9niz=HG<2`>`4*$7zWloM}W;1T3G@D8v+aAM{fgxdb zS}Zz|0y?CyOB{*MR%?PI=q-sv-C=UNb?DZPxrp4ZoVIUISH+gMb#F_Ti79V8KY^S? z?hdQ@t4n=!5I7C`4xbE~X%HeiwdDM(Z+L8=;1%huhoaYa)#rNp2I2a7;y^HvWRDZ` z1l(f)P)aAqtdLBwknA>++#qX)+=tvHV=4Wo&BB$TTDRk3Bcb%y ze~0Eq!8D&_z*$0%evF=bR*BskaNqOEDxWpo*=EvB1sW)2!#Zz0L4uSnhSSJ;jd$fE zmDX5#Xy$}}eIpr&F`P42VN|E`$A7#aMTOE`$U(Me&(Jl`E(tydin6GmT68O;nO8-B2O28?ozi-qDL7UhV77n=;HC|lcMX1}yOhunV_uYEKfI{v|$!##W zhOjB{=|5s70c%m9+8wj`d%kaa(d?f!&@feVIKP3htc9~i^ZKy|67FS~Y`EFATta;` zs%l=*Vtro_pvokfGU^JM7U~P4a}IHM^CHKCK0;L~f8wLtbSCZ+nI4XRYxfZpR=+p| zYnJan9aQKB$bi-eQED@tlFGRHvH%OtHqLzs`TJUiv{+#GhSVaN-eR2LXBn77o_AB` zj?ex)PwFdhXJ=2^yyN@pc<5y}wH(Z}W7on*AjsfZs>j*v>#BL{XEc+H(p~!%Krz!s z73#Rk=Tc|>(l*h*(z;m>9jj7ew z#DVR1T?_QsET-HO3A*4S&kI=;-}y|~0d6D%>$1G5!R-DHB_urbQ|wiga|Rph3!Abs zQVnFCx&hepS5x?#d+BDoJpO0FV#q(Gspe(r1(m~CqPVaJ?27U!BowbRW^;#~ZLaM1 zsd#nYC>bG1!Z2Vlga$6#HQ}zi;C%vTtcfTgQh{KB0yVVrrxJx=$Su#u!iY{}UWT;p zfI9MP_vpY#p+M@BNo^R{^Uc=jSh6B$;YBy~Grn*Ca>y{Ijhc+=!DfWz$M0I08~1)Ka#8zNTVgzor)L~uwkI2q5{adf`m`0-_+T# z*4%E+`MPr?RY-*<;k{48<{#UFC2J(-MCXr}pShz;KbGC!$vywfWc3)<5E@%M@IQ}m zh_X_98evFLG5(ftXs-W{KhXuuVeb6kp@T=8>l|z+p$u;th?5pp!e`#+2iR+tnOcD8 z7=|8G;>T$oZ@TR*ze%tR5%bdUazE0~AL1v|vNeiktsZn_NW)CpDL=DGZ<6K{4IOt+ z%$I7@U7Ak{`{j6axDNIUZa%j3xo5MdXU?mv6p<2ne1cbn0;qn@;jg#7D$HDdj9Bo% z1wI(Y7V`0KG2h+YtN%b32MmV2K54MAHAhK;_CpRs?mkD>W7Iwpp5V8Djsv{fCKBn* zyGhmB7otMU1ED)ok>#sauZaBfkC@+w0^K!&?tHxk=f5SoM*zGG#d31mqA8rbhzH}-e>+YZG{bbwLbgZ9Iqp%1?q6!tI7QgcRvR1N`Vx zUUhxL*L`+%K*f9xRrD%CiU9)%4?znniZtQ}sxo@8aFxsgM-S&vcGO4hUOW>LdWJqMCUuTMd~7poBkp^N^E7;qe>n_N`i zgji*YtG6zI%426x*PP9f7IvZ^V`11G@GarcDW>FBj3%b9FIYMKq4d0aalm($F-hgZ?3aHT-{eY<{?%om&w2F9>|F@S0Ig znA<)ISHk%-58G*#>8 zbQyrm9pX`Fh(UZER7mrNlCfhT{E4DOFT-{Bs!{5pk!nnMKtCwpkW-G|A4Qned(~wY za+yYypXIAd=d-^$KAmikk!!`*b#eCG>3egb{sR_7r;@4$qT|Z+p%^9M7m(}8>`g*8 z5P=br5}SsPQApltm~NLX1NG3iGg(zSV*mtQ&GNk0KF4V6u9N|yuP8Mj8;%gwvBbE) zPhQr2c=0RjhGJr22;`*No}MznW&ZA7Q?=nCTB2KF*UKij*C^)^8(xj^14XC^Xa~FY zsVE?8%K7muD9AIF?-i$srxVW5Y653RSMFKfT$(LrDK(E<&ue9M=C$aFlYsr$ zlQ&2@d!l!Q?VnEkoDWIh_Aa-DcarT6kC8JDtGd_jZgqMCo64N8*!RYVU%tU=3rPmG}3nY z*ZHQFwhJ$^m&uRozPIajXi=Scg#i!zA+@e0twV*y=z)<2LV;UYE=^2` zKUXR5CM9lLQe(CcP;{(%eOx#{$3m72D!!)*Nz=53AP9q1>oYrpI7ZkTXcd!g*|V_g zzWKggVNwr|lLO~w;LPVjLx*ev z;!#FZMG%TYgti8ep7AADd;p)Z9#*%qx|bj{w}j_gxFBV2?jz7lV{Zow(zAxwga$w72=^ZuH@y4Y!@m6iUL*KQR;EfuD6Rjc_plNc{1lovy1yQQ7b);l?yrxTH&s+_c8uozIDLV`k`b z>>HEr>5D&A5H^Z+G%KntPL3RanG5C09yFV&8uWFH9kD#3`?6s4Aa+~}(^_X=ju5&o zI2J#ZourA;yvgJ6ZKH~gvnkCUy?Vd>>MvkdHt&D)ctFF@LPu(^svuR?AaorJ1`F}Z zD~^l$v!M$SoIfWs+Z)|CuYHziSQX159V&G71P@0~EPsQ7#nBJM-`FHzs{SN1;j-*N z)yJCGf8N3W{wsYr7@1sdwIKFGI#O8qAP~?z7G{mBM@e5M^WIw$A}+YyG)m-0XTKD3 z-hhI|6(ReVhmtx~ZHc5edf(E(qjc}l6ZqNfD>gmH-{AJVPf_e$rTY)qUHs&-sF?Wb zh5CE1(z5wQvjE(h;UZGlg>QaIMax6eE`WI)zhxxi%szyVX`t@Kk}cgf8bcB>{i|TbIdt)ZKl=eFtb%`M zbjn&kuDOegsbVJl?JK9Ssr7ck+m%QDwAfe6a^?KeDO*u96_3H}A7|pRQ{-rbtU=xb zH)*R<k@Z_r%EaXm{>^kd7z7M-4 zXn0O=_n`k=n2ioQDN;_RpSN-es(!C1ZPt89G*&oPSwsxxY>i*Uw|@J#y8)#S!e2~_ z^Rj3^Hw|Z6aMarA&k1qO>edfYbv7{x{UmMQ_bU99HhghGLh|d_ViNKe`3}zeP>>=R zO4d66xz_lbd_}CC|254%ppGzqk2O;=o1QzsujTt96@4+x|Jnp2gso9J$A>t}tM$!` zTL8@I;TkbJ+7;ahva?AFlm>G`%-R0ge62JmW{iFbfqgrZd_c#G5X|mp59cNWC@I?5 z*^rf(=zFJA z11-X?=o(@Dp+FID;_)e`fPd0)mxhfymUZ}b4B@Tp%wd)@!s8$eakL|@ zWV;_~6!1d%^DZDppnrMTp}XPdLKNgw-@-vLjU{cg6w%jq429H3@3d<8!?<@*gKQ8}0+VS2$VZh|g*{_cLNfH_6Bwh+rWeO?gV;6U*{wt%v=@|L% z10L+RQfeuOzJ;(p)p*5>jVV*~WBR);<2a%?R|QerF!cd7M{RQB^D_J*%t4pz__;%A zkpw?WN05qcbqeY{1LB7tiF(tYDYy{}nbX7cU`fO4AIx1$DDeqRILaU;fO1tlq<;IC za+Wcb+%XFM&_t!M4@iLN&t`)F2>ld{6$^_lqWgDk;7Ne>o64NIcswHd^J=nOAf0ag z*~a&i=642$RD#I-l1z!l_U7}hc#c@GbC(HKOQy8{0{1(_-C9cF#GDkPfSV*=r8@rU zE%GWq7xVltWT#1W-rl9C)Bibp#uLnUAa0>v;FPK$bJpqA-Ao%aa}j#((MKP!whlX7 zBo}Kk5JKD@8vJ!iJd7?`n(!!HyYng%zlM)CocIeK*%=^We1$k!On+$yAd<5OVWUU! z=_eX)(}agfucQvo>R%tO2C(T{9ahhczTM(ySg>++tzq@ODMKGq=IG})ssq=q8(-L5A_rW$Hf27_X z{sj-B#fn#7NdC73AQ1Z8z)1O#EbYr>K;>N@*fgC#8~N2yU^ZXGhRP>F?*FaJI? zikPQMlEHiFv24Ve@`JQrSY;!@KvCR}zK)#Yforek&Vbi43GMHcpy*Tn_v%sh;H@wY)_NFiVE%2N=w` zY-KK9$q0!#%XQTGlv=8dU{jH0+r8~rUrry|Qlg3aUijPMKh98~6qSIzX7J{}_g|e{ z3d)PM2h-w~`pEp>IDQxQrRhmAS?m;hs`R$|I=%8Y1uf>rxQz#c%dTKcPMtAOen%oA zS!$v`6fwh)>M*M^{V)Z5(u3uYYfFgLzz^55k9j3-Y`3!XH5IE?(7Po{@<$tLR;DEl z1G*3n?spK#TA?1(p9I;vk7nMPzC@!u91EumwO$%LzHW9RSoI2@3iIP|oqkuj7lna2 zw>cE><`JX28mjC^^>&vOj12l+k zt*DqF3;UkGJay=Vs21RLfPqb~U$ivjJDGf`(1WrLoh+y*ekZQgMeEN1`p$ijUQ&Mm zyN7N>^R7(Ao8SAKE+lqG?NXjN*Sf9i%f~01jR`_P(1yDw90vxq5l_-m=JtlqE>;t+ z7=ExXQ?LsrM$$v1|28cr73QJ@Ur^?6zW&*E9oCgKCbIiaVsztXZl%jnIEL%;&&SEX zbz2|{%e{%(R>kb8Oi@SG*oZrgchdV$HCzv8*9eOZ(`ae$o$b(sQM{s51*lJdnubt6 z!4)H!6uX)GgE&lh^<*MHEpxD|<%a8s5V(U$-;i^GSPF@7S8W&FX|e>FmVBTeC5y60 zF%A{q7xmb1O!A3enEb;5@eb$D|KK6}*yHfeI%>VXHSau|JjWH=RE%wBgZ}_FEw3DzC9(c3=|YDCgb zsdaYHe|6&x+#i080yCG|c;c+fI8_>0i7=tB4D2%!#8$~F#H9Xaa56#iB#}VbW=HgI z4=~zXMVMZ|-F!nT4nf7YgM{#+y-;;9XZzQ-iJFl3g|lvsGfhi|+coqTrqBn1Lqa7$ z+Fg_lS7bbx`QsX9^aIvot_O%JK2s+^PEuuE!lC&Nlvy~QF? z-=f09%jhI%K!-dIhhD8l{F+K}yczZAVZ#o!@TOr}rF{3ZUVaQ@jc_L9;6%bKajUHZ z3xzglN&Q_Fa2e_aRKWK~SiQCOPjxp;_OY0rM z9h%H-Zk~P1(XVhz>79FCZts__pjc&6%Yw*78vt;NHA>X>4 z{qZ+kn}0Viaj& z>VAR6sL+o&oQABmXaZBAmgvQcaGIUn1!4M`d$2p7yTHu7Ype1-jD&$gt0)jlb?rBB z^&rfKt(ro9=x0)|(fL~`RR2H0@1U*|r3F+h8#VP)bcF?gJaB<`<(; z0#wjIwHo|!L|2 zd>{861lyXefiC@t+t&G)lfmfnR1{A?FcdyjD5U7nl2w!@r?jies}H!Q>TbBJgfkk% z?ozc@SJ#DvJooB)i%}ZVUBh}?#mEc$Z*deF+9BK=?$fIt6dPrEiiVmB<`;zTov1i2 zZ}RbfN(yM=q!^p2%&!XP2X)R&`&vr-i>MU1%(#1n$y4Hl|KuPVBg~?B>i` zI1Xl}uN8TJ=%FZX#5c}1F3%*E;gvV!6I0}w0&lE)m%TRXX_n8_oVT-d^5|O2hN!hS znq^4tp{cwbU!=gXfi0R zGKb%f#*WBMS(3YpqmEH4vlh>5VRbXJ;8%1UDAK+pH|I5fg1%7bU<*JoPQlD0|C*}q zIL5P%#c7v?iBxFFKVT~%;X0}<3U?29beZT*E>Q}OG_+qHVQ-z00X!qWei}$1#KFv@ zR%wNZO^wfq+c)pXk-m=I4wn5JG>QlX3}MI==6zaTJVUoXu#v}VwIM3u7p>`+#@P?XyLyE$)#S%j~iCT`Em*vd1Lc%H=bwacbI^zQF$Ww@)Rd3e(EMtqEF5-RC}6K`Ve?|(q?0u%N?Wc z8fE>|cbP8u2+v%I?$#%zh`{w$!h)KPJ7W(7sRJ-!n`sdytGOyZ-M>W3V~s3yuz?bj zZloX&VAOt`y@H<390{qKb>or{ey~+BV@xc^$i>%;P$a*D#!?V_ghuD6&@HU{7{_D$ zhZEU>ZqnDbmY$K<$EURUBW(VJW#h|jT!*i7J^l-qsVzD*OEY}M6t05ExQGQi_R0u^jU^3_paNQ7t}FP4(WK6&joc3fuHLQO;xFvP`Y2nLlQKW6*y%J2P<9 zOAJQVbPLJ)(Jj9Wa438f717GOKmy6lng!R^7DMidxQ`xnnojpEl(D)on0OJ)C>nR4T zR;U`x>AbL+i8D-*o$iNeWi*m6CCOGyYH=}d_E)A{%Q42wk1-!GJguk3%XI6SfN)f3 zO)-GDL^I?8_86FMM@U@*&eY2-f8Z(ecO2kvkD15j-B?-YuuM>toicEBU{oPXK#XLd zYDWo}iwD1aK)E#l=^tf`Elvtrq=a=#A|^ud4aA~kbH*W)dwny`qB~!aEJ*DMry^rf z&EiD?IdQqTN?vRZVO;cncgiIpn>+w9F=ADFI0YBXEN4J_D?gMyCxx4=%q8X_FDcyH z#gEMXi%}9qFStkTAEH|Bd}^Nz@;Gca$od+q?ont4vDaWam2KkU6Z$hf2)hOPa5KpX z^yKF}6B5|=M9kv?O!05|Y`A{fS%?!Qt}4A?R#ye@fDYHy8>F=(Drfjg33uNw2Y$1# z+wiitKwtMv#9kXffQ|?u$Y|`FV=!|UsW6v%N4DVC^vkV7ml#1Bp9c~2XA#$Wc^|;(>-~e)VV54Juv^Y*)0>nJkNd*= z13J}{z*;mRO#Qu$>Clf(V?&7DQPr~3g~S=71-ktyw)^jH-P14^QNXl~<}L0IeA9D^ zgM{;M$iyIQFVlZmUB|FQ{^0oe>l>;6Xd*_vc)r^o%W*X=Uo)x(z~17O=}+{3_O4UrGqt=W%6;lWZ0!<5J3zd6#giC*PA)pWr#NjN zY%P9m)+)mtRGIJ~w8S}#D5M=IT%ba?$9s)=Oumc5V=FrAIfst>AUGEk)s*0dlU4{I8PLuYLOuCN0a<(9=`S>{q$zKY0tzO3FW3+{Y1HEX6LrL*U?b%s!yDs(e9ssY_u(!cBJ`ejfx zJRAKOSxZU3ril%a_`__Jr%^} zD=qAKgb0xK3abl!l7F!KnnYOh~n+ zn2xo5T(X^IaabzwKMX0WB}^3sOd`iw_D5D-i2QB>x`(K#5cmY38H}}UK%=1}RS1v% z{*=LGKoshNv0Y=NGK3h`7}y=mu9UGRfW5z^Ti>a(45A5Z%{BoA_U@#&%Fy+VwjA7n zKF1U(#;BRs>%Uf***OKF0!1SorE78P>q7#)&E#{~OGprj-xyPg-Ab-NXSbid$+>UhK}CP~X1481L`qnDLZ{nJe#w z|9hU0zKmQFIFF0;RI%yf$5Q1xr^7toK8Vf9CTZ|hNW>`SZvloShyeZ+u`%Z+(fJDP z{9xl`3cnEcuj;MJ>l2!RZQ#)#3jFzO@sFUkjp5fhZ63p814$%B(`Rcr{<2W=(2p4B zegnm+Z3}Cjn}1t{u#@)r=k9+-!`3P?5bl3psjcHE+g-K(%T?)%E;(?F z8uRMeaiLD8>3vdLC5BJ`VrR!<&AgRmzZEC<=faV^=8NpvdhZtgBr86K}=CD#6Y9 zJryNyU%-3Way7)Hf!O&&zoiBhND|C9Q9Mh_bdwPv2h|itW*|plB$_sp1v4<&kQ90< zE`j(c#z=A1qiy8%J`1ZMc8n<$18Re*`TPFio?f41809c*Rqy%goA$hWvTc%=LqAeU z!X+?5{KohYBluaJZ-gfjru;)W$iq8{U3-8Vrh=tEEnwtfl#6|r8M0{$J77}V|CrJ%smdG{Sp=kLqO6#rt;VmI%P zw<0*akPeQ(U?5VF)wA6uq;Fmu-RM@R3@do#<0G(i$oQE=BrQIXMr+9Ca{2jJ!m>%( z&RNT|!Z3qBTh7hqZew`dkdP0mFu3MP=cV!ip4r{+#9YDRX+R8q?6&UDm+4aq_O=91)&7F<@6oe5j?$@J402_V z?F0Gvl1gxb`{v+t(cN~snFi_#Qs|G8+9L_=YhSAY! zT0cQWELfn*xZ$f`P+8<$ClfS`F$`#r#}dtPD?|Hv+gp`wZ&7z6QXav~Urv@&ETj6J^YS<`}FkmLgrDo2pG6G zpd2RQWTV=rO9OGO`>`GYdtao8<9>Y{0?W@%b@%pYR-HFlXyL%T2*1&Xb}-?TLB{q? zZzUvZ==Mh$pT)NNkPJig58#;<7ne+ZK?*=ho^ZM2Vq48Bxv9y^OMrrAU4ID=gU7-C zp!VjVUs7ge0fo?lYN!R~l>xQ}+tG{9ubYkD#)DQaQt|!?G3Tm!;)#<|yi!47SQN;e zY68s6bZ(ZJtB0OzLXxp3nhjApF?^-pLH}l*pe*W4y6EY7w(Kwt0eT^R4e6d8dOkjM zcqyzmQSf7{$V*p^H6j%}_8R0du~iZB_bGI}RpXpv@gpe%##K_`FM(eom{yhFHv8Xp>{gr=;2p#3xIh;w=b+ zs4^v9inJe!%6vb#IYYyC?lX_pA-8*?UYoO5qP06Q#?mFmMWIDy3!oC?afxW0R7WL3N0q|T zoK6vJ(cxA);ywgEzgVv$qEN0Pc7E7 zqQp&Kr#P_8RWIIaX(Y4AWEO9m1>15nxfy;Nv_*-h#@JvtFz|+PF;BYAg>|jV2?~Gp zy?JNTZ-1tJFdimKt9J*X6=GAKiqoH6)O;cjy2#Jp5R|5wJqCtQzv@hc!7coug;u3- zoJrkn86_(hMJAMlF!UlJ`=tIuOXpaikSlq*TIhEosF+zWBW^i&9W^-`;4h3oly}b% zx{z`lEPSnz+Xb^dxF0$cztaaZL!|2-Xc?1`z<}EEJ?(T)F7HBm>|DQ~-a>`z900QL zQ7bHpVf+2(V*WSp@XbO}RQFJqw0+r^Zw6Ydsi^%)h6yZG4wlmeV@*S)lOl~2{h)Q> zcPF%#Lx(m>CcJ*l4F`yeD}ri9;+;_h{`FbgP}##GE3A;N|0?i(pGS6<&V5iLCDOOT z%6H0bmf`9zISNiy8O!Rd8%HK9c@gY@@IkVZ8xVK`QMP&hTbt(FcmL(95f=txwqn7V z;-hsZX*;itqnfHb%X^x8p%(Ym>WIn(3UGF^50za+E0L>VgjWY|3r zkTf4$mkM5GrpId~ud zX8z25<6w>7-Bx1KR=U}{52{LKE4RuYR*c7hB{!=+T!J~5>f5T=Lft&GjW^;KhR6NA zO(f+=SLT&2J21$|8GCyQ9aXqT1*lfS$~Pz|#0;|}24!jOwLR4@Xjb=VwSHH9(zyk5 z+Wh;x2%jzib0Ur^M;HShRw_kRIfHQ`2KOS_mxA!87*KUewyWn}mjDC!* zGxRZR*SM@UCMwNTT@Yq{2Qx1EL*cHAGs}6*+6U>K3Q}dCvz5HOYDJnytJT8gE{xpe z7S;nuB1!W1{O_+3jRBS{TGyW1&=M}K2EVf$9k%nZ1-SHoj9-g)`ris1CZuwi@bbM>%X5t!J9X-V zcTIV_U&I*xG?HuC$URZucJAX!)q;0F(mhlxHB7FEA@|LG;QL( z3>Q&2Ak*O3nzEbefzBS<(*)Nq^}=^A;LCpxPfv6VHMY)|!f1owvLq$lR6sT@Y|VeJ z{6+Ye5A$dDs*>7;D)?8;_$x3>S+LCDm_vMxl5#NTe<>C7MdndA$9GZmxz5gncwfrX zS#M3W-x-&bu(N~sb7;LHnrklc0qrq2OcwG`8XHje>SCIimt|#Ar}_E}wgA>W(5m5F z#oKZU+gj*AIXb?FO@AxqbxCKT4-Uks$X8wgqpw7h10q#F|D9fr=7w!&Mf=;pyJV#w zsM2H>N$b4xA?r%!9OH^(d0=Kvow839|2`cwtWaw`n@c=cR`P*@_}yy6t14aJyVAyJ zIHO)y1EcofLzNL$vH^I+US*YoHm?ac5ef0WE22dSfe^(J9$*xg+r>gj;d5pHt;$m= zB=uF&@-T96eY2&m0d{G*`;HL&?13S@dJUd|v-m0GlBjvzl6gyCe`lr@=c3M?MV_1&vEN{t%tyc~Xm{~so zs4@A9dwI9S{NyqOjVd#bEMxbu$4CEEjD3=A3zs0N(CaeKZxtE&RRnk%nLw;vkO^Ml@`TaP0Eb&{9}9($$w;#Zg^dSjkcqgWM9XjsbCGm#T)V z#KZ!tY+@^!iwjv&ogAVnvtu|?W7v6{i9xYc;bdsB9HGTd*)cIO)!{%zuP*_pqbUII zK)U=B3TKd&9TVuRFqR(7d^7zJiwvBr@rV?ZPR|o^{BP3+pGr?Zm&4#l!>%cN3HHMC z!Lkr9n#s!5y(8P$4_q6bsk_@&)VfC8u)nrC3KiM%TscnF4WAp8D@kmI*)^jJq#u`q z@`ocQS@ss)=iiY|snLDi9Ylyo-WtA--Mv@RK=5<*&Dx3%M&1)I$^=RkHw>9D>WfRLFQ;`l0z(T+1hzIhO)md(@eY^!Ek_JoBW7K?MU(^VVq;a9 zvyD=UvNE#S*(<{tt#^C>j6aT_6cN+EdsneAGCIby=p$} zzsrocp=k10?qRN=Aj&_+26TPI^agb85Ss`}ya65kWK;lEPau47jPvHPQpZ1P`vwc- z&(UB=+k3G>jdK7X(NrWYpveQDSHkx_2Id&iuVvLVPur38&lO&Axy?U#Q0u|1XRxH( z2@LN!pH259$$7W{%&7x2qN^B7Xq|l)Wq0j%s(VsZT%r)Xs7pJK|CEGe;pNc^YnIsa zkJ}w0KXo7tVImLX#J60dW@io|KYF>fsM&TFvLHyT31ZnN?!5%L5jO(`Tw|m6i|N3A zv9$5Ipgn-BB_qtQf#PgA1sVE|UMkG`eLWoPF? za=g~|+~8P(M^`0RxY>A1i6lLBtX z^Ub0wUY3O`m8&6vr)#eFhrYw+W`d-TD!VETKAHmz{SXy~2^5(ciO1D5NrkTZdoX8E zP-WYGfr>R&j_p908DloPaC!iX=tx_a4&0!YZ*hJbrqnXFY5Nw>S2DXovUqS+jq|pU zq?=X)uqrc1Mh1deF{s4L-k-qcrWU{^Ry%|a$4V4)G%PLKChk%C`CMmkSGy|C&JE)a zLJ}K+e)5fHyVvx@Im`>2P$g^yLVldn`Hs%q=t`$t=W*S!Q~pKrx4aagxW6_tUk^;;o8GttTA zC_8Lf-Cad!h;IAP0009%P8N~3t=M&aJT^67+rY)<+T7SRD(lg*$f}h8^@A}qO%BYA z=a`(4<_7QxH?w4>VNGFiSi)F#jupsV{Q_GM#joJ*ke}bsBr2!?Gtcfj*ke_s($G?B zi1)bmy4p)h$GY$F^MaWd0u|{cj97N@&X+a>@#n5buDtw`K<52 zO0;=&wl%%_0|(Di>3Yq~!vvA1scd~Yq)dHI{i6w4(cOL;It)Q{9!U6*4FA*Izk(%Z z03<4mdsgXVR<|%Dg(RLuS17(s7gprS`L&rE0tB*D6uXq!UwEoVosPD?=LbyJGbgX^ zh+>P`TLVr5!ttcPec-U*%@SWCH&7W;Fl@vil6lX}GFZ%)J?ijT4wR)Q3}&VYg9vPt zwDI@H$4N@Rq1hj;&z0Wn$>@KsVN?Ltta{pYZ5rt zsF~}=DztU z(J=^A6{NNeW6J~ES`lBeVe%=KrF<6sYp1UKtqJYyc^HzEUd+@?2*dnD8$;=A5#A>c zi505x={;Y9_yns_{u3|3K$_e{-5;pwjtd`Xy}Ea$SBAk};ESAXlA*mlis+>Z>NrVrA7UWH_N$Iv?F-Qj>Tw<8z%1*wth)%9P_#AF|m;uWO8u( zAsE)Xl#No^Gw@Ok^t!8zE33-f4Db<0Qbk3=O}P$DEFYtkjTa0mx=RGCt?foMr$mjf z>nRg3{ZcJ^j1{!5VGb5spOC}*&T_F2KSbG5@ZG@m}#uN{MHmi!NvbJ+e8&vdGm%z+5 z>9QBNIM-S5lyZ~pys|MZ^z=e&B;ULlQ%}!y2>#t_swQU}R!8#1*Klf-s$714STHKf zqGgfIuU2xq7-&=&MWZCB@~sRLlWdI<-hw3OQZl$)eHVAl_$f-S%G?OWFJh__LlBwx zzl_fg6w-K$q5+oG8n-mDmAfh=>koH#XsvKSs7RfMpBAX!&Nj$E8^$oVl_6_Iej2p^ zJ$Ia9NQJ|uZOpO@-qp@4yN0R7zO{9&gzj=uJxuI6>gQPZB3H#ssJCnd%~)E5E4`&r z+Rzb49^A_@zgWrN*Ti}%AVge8*xj zRPtf@S3Ows{>R>g7LCK4se1yUZFxeY`&~6R8MOo~e;enANbfrS2CEY}uV@f@FSBBJkSqA-tTP+6-EQRGs7)J5bF@(%6}gF7AMH>{MJG!2 z5IyKqM#=+D&~hlpwu!fgu@!|2s)LUt11yuwdr^}IHPzO^d+-idOAl-wZ96`VxM=yB=8>R41u)SlWUokQPt5Xpxz?2IE zuo>mzNoPp|QQo)+2n}M(tB2*eLFI7${v-KZMTILaiw1I41agF(agKYxy)03aYe> zS)p5kRm3RDnrMXm%Q_rdq0OmO31y8Cl5#COIy0c40>W=r8l-}WiGm@I5uRKR26bYb z@=_qmps#YWGiMJdzkPso!3nB+q^VJ|S%vQ+9r+Ycm#dKyO$O!=uo*^h>HK~hHL&y; zN10!tmJ-RnB;cF9fve~yW)8{?Re3=h7Ghl+ z19)nxY%+Ef7mX`=BaCaHO;)%|$B0V;e!mh0zgX=?R9PU<9T(*wYk;#VSO-pMKyl31 z!Jilype%(FJZ*Wj>})V+l;V<4ygO1D#FKv$WoXa0tk8@$`#}PxL#qi`!n2~F2uc3+ zE2N{09~6iu5zli%K{81mt=yhFoGlsJKvcGz5g`?W&Jsrb>*zxFY z)V-emQ~OyjF8(g5LPVP}a8#~(ExZYO$%c~b1StiLDebajF_O5b$ur|Mp~cf^xPv){ z(D6Lnhp`V~L+Pr*Aoou|aRYz3pAHO14Vw(Ha4}a76^O?egvO=4e{PS3%!fHEW$QUw zdEZx<1c9lC@me{?uO(ZD-jD6ihv2JHSz;3sz;!^8$-k8F`MsBw=5!y6#E#Ob+7wBJ z;WG3&FcfZx69$gu0V<;n2nL^9a_|Iha6|JEe5EjEV_G{*OC7=%Xc+0|QR{H(PlaJq z5Z-m-nX8bfW{qTlNB5JW2mUY5J2W$uF9P>(=qyPK7!Il7g(^ua2(|Ka4Zeln`es>v zXXw6BZ?s=kMsle&M~Lv4l09W>;JBf7d7wdo(GOKcv36BVv8as+#Z0pCgu}H7nM`#* zM}ERC3a?*~$LycGLF|1EL0m45JPo`N8U;0s4Du+NGqdIspNyXWtP>;U8cEyt2{?dH zHx;%=4pw2AesZAJl9FYUFbtSYRbi%JJmECBi8v+;) zrkZ>U@pGWZ*ZX=+ZgxuzrzbFH)exV9h9j)DC(ly2@%q%E8g`MvtTq-_N8@T}Q96}Q z$rL1*UqQnIUVR|OG#aH50rQVE954qE1!f8DMcNw`9SoJf`9Dsx^|Z)yQ0mf!KB6w{ zXIx9=9<5(e->!_z2r0 zCqG&yPRiOYj%~&^z?oWyos`C%&W-z+3^h|{~m|`AB*D0 zooDI?<2!OKD^TZY;C$RVS&3?CqT3nJyQC7#99Z=ZB z!uMjJl!q&*OB}3T!A}NIT|RY^J$ot zQ>TtrI(|KHyV#6Mw5x^%&t)le$E8)JaC*u)!I`0}#dbDPq{+{~;_MNVF(;2uB}GU; zec%&O9Dh7B69L!OJxqufx82#^cCq+3?W|OVhh z+c-?H!?BB#V`cL#5tux3`U`~CiAL7hl<~w-lmI)N1Tuq4*cdw_x%Mzz4*szy`-9xj{#4g6O^vj$T*nX#Lmuz2MwlIJ`T43HdGKZ|6O3VL`a=zlJMy*uH8i%Jga}$ z8G5-u+hWyP1mcUQBGHy<>kw#24(+Yy05kg*w0qKqWxm~(F~C-a_*~K1$b1Hr{gV_< z%8IUJ7+vjPka9#?IKi;H>-QkFFRqTZvIZn#LkS8e&wo8_{?4R$A)enFCTFyr%NGtf zkhWDRBbuEvp}HdnWFdR&2PlR!mX(5%cg(j~ZVUB;F^qp>s1iT?F3ju|+8iKE>%huG znfE5@=e6)o{jH89?kmzBX+YbHD;ZH$rfINvHg%7WX|w~1%DAlLrPydoN)>$qrhl=FZncqCIQZHt48Nwzh>C*#`4HhE zgF;}R-=^upZZ!JA%=xPygCVt8-yVn;aQ)L!$ihwDhk#H$8CBw~N)0foO|4TjXza9W z<}kqg$jt5C!{h-*T{#s!CQc2-06Rip88NpyS1PjECJH0vuM!X;!_KOC$Vw;TbLto5 zli-g9zNf&4qUhqOrIU6HXIsiJ6(wmX5W$d(ozQITFC-4^D4Vj$1W^XLL@U5DR>Gc0|*IL z|1$@CbgNMZ{G2rp&kF8ArpZ`i2p7DeZ9OX$r#h7uYb%6^X#J~K`~1(xb#5S10Oo-0 z_j+M(NSPMTe|~i=F_S1Pz6;Yexfj^JFtZ^S%%EW{lL;Lo>WDWo>TZJa!L`gp&*npG+hKE z5r;}@I8$jjJc`IRgOMr{nJ9_@i()PVt2=Y_;1 zTViKUn_g`_-7A4uQCGRokiklx$(pV%ZXbznrq$sjA-P`?#BeZE)KVl|ATadGAoh|i zUL0P!{rl}N%1p|fTnV++xl{)@fB~>?!!S=6`%TnVSLLE=WyKu!`w!EfwO-LIaBpX> zSJg&Cz^{Bpr~=jP$k29;dc7xl>egKtg_6ZmGMFn`pYK(pfOtJx(7~epqb!&?Sf^?$ z`-PD>5tFk?1BZ=m)=Owg>Vp|PCsnmr#E_V(VsW?x1>l6!f@}m5u5V)e$MX}3B$=@J zz??}ROqe%}LW5vnGOiT)-RSwxI-WjX7bn;6cCe7C*F0O-NLg;LvY%IPbk%@%`k~F# zGDa4ehGk1xN1I<`=2m^iY2ju1YI)a|l1znp)P1+qCLMK?HWPkyh+2a*00a(|a$hb} zWuX`Y#?t=?D&;qq7+kIBhaF}A-PsgL-M*p#WHr+m?{{3>K2ugoaM(Rs^vB!|f?dW~Uq(7h z0z{dX@y`&LV4V8EZ{J7S)+-h*JA=CK-9Jwd2@qaCQSa@H*7m;)$CYmUG{U~nr>G49 z+c-zAjXW>ufR zqA;FGyS;f&Ra}J0yzNr3?VzjJDJSnd5Z#2)W#CH(CpN1X9>-Arhhz>gXW+lB3s(hK z@1SmsG$Sn&of1KoJ@10>+`!@QzE{$cBDjUgj%DR;XhtS#CDN>OzkPcoYur@M8uR7y z-}NtHSnly4_4)OQa9o$u%+%alKb}$_3>chD3P({DjVduQ!4$u?zHcz0{mapO3x?Ex z(%VA;OsVp!tam4q%HT!0@$|=sjO5@#eNaDM7y#fcR*9NLWSQ)Q5fy5Vzk|P0`pM`U za!j_nQFV~nOUY=r7+{EgGR=1uZDE&V9$DDFkShl(O@HmN|K zWZgoMPb!Tf=oOABrML#dK3pF&VA0jC6U0;-S3^m7+=rG}?&QM7ymrfx_r3vjO!^VL z@F-`zs+_FUe1F1@ZiN#m3CqwY5Mm`VK?uSs)!JjL(uCUJ z%3_$MR2;4`Bq*S-&x|H;5Md1vu4&;EK^ROu6yG5-CY7Y?(;*0@&bsqXm;;I3b8(}l57zPT!@*Ql7j>(SGOcNXnes- z9+!O{7_Qhtoz%`dhB1ThSj%3(Ogf<{Sh@EqR5FE!!Q~0*`CfSWnr`UO|D)(E!-Q9|Si2rBLTVCv9+r9hu zjdMO{Klof{OkP^D;%^)PcM%lFLT*X>E52G3$se;r!ax%rB6$y<%PhCgtif9S#6Bf) zA+s!}JY(_(;m^dG()B_z^v#YqSetl`)OBYE|I^l+^mkf%RmqxA+@qU=4zPUR^O^U4ATCOyxCu?d!IEE7m8eus4^w!%|xzLwt$v zZir8iL2anL+2h-UL9O_t*uBG`2-U6Jo__;nf4`t)$9}rOFFUq5S*aO$*?8rTV^2!Z z#jHi^lL-9B7&$;Q0g6H}qjup)n*MFAn&-Km(n~da7aY5(Y^0N*jE6$MQyxu4ZEZywg9!%A+z#p5Z$o@%t z3~4z;<9T*}d_^>(pp#YaHUTK^I^PHp3qarnZR!ygk{jCE5T2->;}0UcDWR-1bd7tY z2?vL$=bdsrD)aP_7aMg?5fyAr0-^Rd`sK#!_CZW}*Uw`*XMc2F$U{iXMmenKUoi7t zCdvTeZ^IGte8Cgno`g+TJU;fZli*B0&R3!RAukzTrXV)?Ai=uz@ z`YGeHOvp(4QD73R5XPvyXXr%6;!vIAp+bv&f@OD2s}Hm2iO0{A%?&Y}lC z#E}zG$u|P!a!euYBq$(gp`l|Hdl|J2D=h~id0LFUON5J=EyU~vc;3@r1td6cgehB- zHz)~k*{w4q8VIUUFKyE~#0p#O^CZm0VS9V?gbstb4f@<;XSBs!mK<~CpA_G}YIvOh z1MOYc=0rFuKuORobb5D6$*xstp+t`C6Vi{BMr{y|Vzgh>TAO0xO2_!{otGF2dk( zJXLUg{{RP*Xeulz6Ew*|Z&#Eksu^puG<8z;7m6>Kbt|z&)*TynA_LOwX$OU6+ZBYLQRxt#-$ z|LIiXNV1MgW9txzK&-@Ug6U;KuG3 zKy0nl+49k%^k5gL8&5XS2isoXGA?I4V%eW@LsH3&2pK3gp z${IqYUD9Kir8rB+&L+?WyHh}>0}Ea18!0%?i2cAI65hrubgk63QGyLML&y*^Vz<f!-x3^8-)^sq+~je>N{}*FMPK?{W|^WzAobZ=c7YT5kna(h0y*;nJvM#y@4^V z+vgHVeAR*`9V6VcnlfeVN+QrkX~rQ9yAPR)>TO5oqJa8t!0E3XYv+(@p|;q9Ma6g~cTsCW(PV2-kZvPxwYq_0tQ zD28jf?ADtt%)-gklZNwV^yhbdl_MMkZ>f~p1f3<&G$i5hsLWtygnbcpK~c0;sj^%F zQ!x-qjVz2-LBO&gp%}gaP85m-jX9<=7}chgwxSKQT^Z)~K>$(UBr82iMvbMvo1Gxu z;Gm@zC}?A?o(prd48lS~u49;^BQF%luKz~VB)?R#Kj99`C{O^jLs^4+dRTFS=Jz<6 zdezY{DFio)rT(KuJU-vn;4*&xrB&Es9)VQ(kZ3QDEG65-#3|^^$IGx|wNYmSp)=w*ovLZzM z^z<}+g`7bu`F~P~;u3n&Bnv)WjNIf$f=jSYDh0d4@^8lV;1CvmfA}s15rc;%vcOHA zztK?_i8UGb2aMWVp0`K7TEyFv}FR*mb!(O%xu{* zeUP{1Jr*Al;6ePj{vgLU=6;%=S-Jl#!yecG0&?~)R_bj>L`&zZGikR3O~mjK?Q9wd z4Jl`qaOUyEQs6F+Ah3Lhruwu4icF&L~HX1 z9+g&oK3Z|!+fk@$^qzLizT2>)2VQTQL%Ccrl!+2=vx)iJ@qwg%w3w^h9C#YUpGhG| z>%tcQNFxVGNf;oxvU0)OZ~b%yANpMh)QQ zz`@IX!N?^L~3%^oebN%>ewgb@@tI%W0Qk;Z^+B! zLYC9b9J1qFxhp^!4LxDlTg?cf>;pXmFYIqjH9D0tAM1!|>kSx_i0Vg^rj>GU0aE@5 zN8KpuaCI|X;xBdyyh-w>MbQz9)aWX7w6i|Vy)m1DjGZZ?!uG%tjCD-a#hi}Mcx&ha{+gJVI`a`6;Oo*?Fuc|#|FD!_C7!8T zzWMaiv^>BdkItas%@)teGv#}JcU{*i;-Md65T?z?_YI_$<41%OpM%r7Jnx6TnUYn! zms(qqZvu`$>rar>iV&JrgVbR>GzW|wFTMDzJtoS0BL(u?cy_=qDs_T}Ml_lL1u1aq zu9@N(U3Yamn_hZpfDwFbOwx(EY*0a0*vZq*H0wJ5Q>}q7&N$dP4pYv(TBJ;Ac!Peg z$@o3}Ril*{`x8wE+3USj9ShC3)P;w5)-(M)lX#TI%nQi4rnj=>o>6x5z~6u3h10FM z^LDjyex0pFIW)BTe)2^bLSyej=s0w`55MsD_K}MUWX4rfSAL&Vi!FN*uH;(=NSE)l zf4?wC(T3CXBt4w}^|YT!xt`lmENNb*ek@U~&@M!TTzf@iJ`U3F%!v7U5eQ_P(W?PF zW1;Y12n}-Eibg2U?(3;a-~+ei_6uSo`?NVXo6UmV{#rtn+q-yzDK9UeEB3C#-H&|D zC~J=XlG&?wNl#{kc`ZpET{^YDtKU_vEKC%#2kQ8ytmJccCb9LMuesO%w%} z;2|l6X_E~sR1PerZNe-)2o#mcEM&#GqlGGN;s+Z(6IQe;<19y?xo~DxFh_d~4i~GZ zjt(EXh~?}Z%eSNon`q!!+J~>vrnENjtQc8TaX0f+msMpNL$o@>VUB#%&lrKI5xqFf zG_wfY(okO+HBA}Sx}EhNK8p&I5tYCbNBYVv^r&ww6)L+5by zwSzfX5(1Rti?XKCZ|OE~+UoZ_c>J};@KIOG9IC-y4i_GNlHky+7;sDZHov^Dnqfem zvy!8mrfYtYcg1)~f6H!Oe|7jJ134k11`o&XmvP6mZ>X-{$y%k80fPNQ%7tb)PSZ>h z9==f@G;|N2PVc@y2&OA}$-JM|QwdeaJS`KOtiR)dh`c1Y_y(a|N^f1!20f01F}yh$ zBQv~^tDe;j-K40dx+C?uAbDF7;i~iRC<^&#)_^(&r3B^Th;3eTcgSx69yoYTLPl21RIeaT~~XRKDGk z4qKOr7Wd!_QGUtj9Prw)(sr3or<&eNDf~57RN!Sr=4=6FEod)Ey8k&?PpwDUp^~3$ z3pkdUC;GOsswSjiDPm<8EJ^%Ap#FD0k$gpeN5@ka1x6AX{#W(ZwhQTqwy-Kfj}>Ut zCn{P~D0+xmD$=MN=M;q*#@eKd;<%}But;K7va=y&@_50$(MZ;;u0&WSx5nk!sR+Z7 zj80cie{F+E*>$wHW%I)HvBYsD*jo1#tLWS4r|FkHY`EaaIn$5sBkw-kIDb-0*>K6h zjMksz!gxXAihBgp@yK=nx8#JsQ@LxS+m8c+yH3B;altnXkXfH&xEjGd9}9Wlh?&Jm z{s3Pge(Gh9&ZXq1PXx?Cz4rFt(VZ|OK@zucQb7t2xc4iTSs@mTHJil&K3Yzm$(akL zk&{!vfpKxi1q9KzH^sfy1AFrvT@*CVasO3|k^)sQPTJywkiXx3nD>7oOn=WRuYb{+ zs@53)9>otYAf+5|eda^CGml?W%I?Z1FYuE)*G0C<+pext6k9XnqqLE-57+Y5n9WYN z0bPljpG!yIsuc*@s5u>91Qt&tkH{;$aY>=bIm>zuJq`uLV%bo<+}-P3olu#nDTZ!j z93a8aa#Ij8{dG*6P)C)MTixDr>3~7@bKdK|yJz37xi23o6u?mePo?)vRKymf39`IQ z$el}Ko4^AF^7Oq8ncevReV~CL`=j;47+CJr}+{s7N;ineBth$R&-Mc{v|(1_JQ+>9Y;h{;&6#}! z>wZuFGN>dm?2+MuR=ys*b#JHeHsEZqx5x(bpUW z-RHX^lg2qlM`w*>REV}WWd&I3JJ!~Q2k=#31hQ?if9{0XJH(TvirDgu#dK#*qO85| z3`DlRfCYI{>JMR4xt9Rhy-*6Nzb>(U^5&ge_Qn$8r%Rd&EM37Ceb&CxhWOTFSJ_83 z@vTRHx;#jyOg;%#bkT-wq+`=SS%-e$5;2<~r+>e#tX!prvc7)uODf+ebM0__^7ATe za&~t182nFG<4Hg(dU+FGbjVsO^lyxzeSX%7iL5{jlTt*MkGdaGVvsV=zSdeCg!QOK z*_6%%VcE+&V>iCw%`S^Pe`CR-Mw?`kGO5eQhJ&9P3c`tyDS!$3ucP_)>Uoz}asb03Sj(yAbHF%ny2e7l_iN_|x1d3g&#M5M4v+}9#oWGF2-~|4o#BJ)J<#hL)+QZD7 z*=%8~4>hcaC`Bcy&4%VMz`)i<&LN6ot7zpYj;bew!8ok#^dc}=f-hUmj$#EVw+Z_c zRDS#T_Va-kE0{%`1F2w&%_Q<%2*-*zx zH9q|goT}ek#5l)c8$A(f2FUM*@Bm@-~abkMD*t8o_~?ir0yvDM-$ z7tHZz;a?Uw@eB?RJM_kle>uy^0V+lehKf?dkC7C5p*}$BS!;6lD5N8vCh`2Z;g1?| z8p3+McQSqbW|Y)#TJW2<*EdUPN9Um0qCy!tV8TSd>97H6fwF=l7Oo0@x)83AQ(IH$1WaI~ zXyqYXDd^fCL&6x;nVPU{*o$Ob5gUHEgqP~z?Yr2C2|DCX#)Po$51X{qH%ascv;;=R zw9Z3GBphR<-C>j#-1fEzyPFDE$#8CKPc8jQ7f&^;X$5WF;EMj{Wq}4$kjw`{w~D9& z%%I#p&UyJ%n>h*3Yd!;%NvhV+f`}6pibmBgq@Zd|=uF+|-p9WTo}C=b7>G2GvCmOS zF58r(7(_P7X4QFxFTev_uF*k0&mfYs%0{h^Xxp+OOI9?#hAN5S<&u^ZzBUT zHm%tXJ%?mOALkEH@sgDJ9}lCO;E{6uRf8aB`&zR8_irqOon*=bEv~m`FenI&s22gF>5bg2{?8K{S?DywU_l!4qEAI0e^x)xn9xB@QdzVn$kkK++qWe zIci;h?rOui81OhN3I>_$x;PSx<7q?G8!{?VNaoi4Ig<=CEvZAg zy(W{p@;zH#+DnxW-9aHOeN4`O)6jQIOoj%z*AlPHIT^oF5I0d_j*8Fw4%@Iumc?D_-g-_VJJt=Cmit=Xf6t+K@W8THEKu%|aTJ zm6>myhEEPT3@abI{YQfs-5Vh`zN+DilZQ-#<0}}0^UVx>%=bF z#FfUpo_;EA9G`UBDwY7j<*$%R6rt=o%X=Cub86)Wse(7M zc&ha2T)j+ZY_8NCU#%MtWPgHe>S+0$y7?-Jg<(H}^4m_Tq~(`|Z%;f1=xC#*>hV!Q z{8POY9=ctdRD(!X+LDXl=ZPOpOipxv@`n^_TLuUpKHZ_7jR+gD#wZ2KHaM-f!+o{e z=XrQImAN1P$&gANVNGB7Py?<=!Ttm#5g{haDtLvMh!~pcchnZ6`|Tj)m}NXdj35@v zG9}bPh(bmeza@j_1sAs_-k2B%gcB11U?0*$QOIT zm1{T2ojF#3iOsP#*4(*vUbiz_zn*DIwMbHt9ig`z0expCL6h6LdsTp}wjCIP1PZti z*@WOgcn(KP4hjb>XoYmJ2eO7*Bq4>)nFg$Gm_dn;@r5cJcpMn>RVWw?LvcoHl|_fL z5oo7Xg;Jxy_{_-}(ad_KFiuERXu4bkXNU?-D7Zp4F=31mMQ&ozsiCv`@uvSM_!z+a z4bM~@g)wKUz|k?Fcib^JNZ+foH72F8r>A58&ti}7y)$`{80uo~7YFRVpS|OBtwaTb z-d8ekFq|3t2F$frDvu{cns=;20GdCLp+Tb)(aA7v4(8U9UKT6rh`x}IycO4@*IUd= z-4n#9JhN-*e1S9usH58`1tH$&p*~5{(Rq-KuAxT~rtP*ws+q2hdtDl9jg*c?vKaNY zO6Xvj<{=xMuV1Hlp%o<2$&+-yesum7`nVOvpf&WQ^P9HwpibeuIkdR@V8PV;hc7Zdla*X-K z`KCT4XH}-VosyeTC*89IjV7uL{B7<+nKBt-zQ|8vnStQ2S?Ito|K1T1-i)iS4Aa9M zQ|giR^}oWQc;@5w5hZt%=7KGQzt5IWZ-3-}hO&;)`T97*r^cOj`XeQH`Cs!2S!Nty zeU@E6h3tR&S~$Zg{xdoDwZ5A52q_PwWve@s|0UqhE4%kIt-Dn9QdB#`#rF$K^0Fw9 z$ycNTamral0@rN|A6S`JK}$Idluz^}4(9lp;fKG}u_y;>?ufPzVazI5KPM{I|wtB zdg&>=e#;LCJQk9b@f4M`P9q~RQD=)KVh%&tp{B_=(G(mip~41)aY^`E*yHv_hHBc$ zC-$~GCWd_b40;63(Y?@@0^@XH$<~V80<9MNq+>S{xoi`-AEB(hmVE=gHu%tNC=&DN z=4wCzHAqFKThTSM44?&LSh5MQ_vN=2+RQ>>;mZv&mT73~3_MjLz|c%+-M`R3`HW2p z!OSwpIWKv*B|(?^va(M6_RuK%z*aKD+5+8sS(!vl?BZDRQnEW`AYqhJF=^_D;s2&# z-93y2^Ne9&Y2c2dcA$@YZ2uPtWEta6#v+rU2u7yqk)c;q?2lD)84ChttG9o@tvQ{E z^AG&9+EKpv&ZS?cMd3Ba@$&wBfT&-h{D|E0;vTnSx~fw%qpr&M#)m^tW-F~jTHz!r z_mk`d53ml{TH(MN_EeR-Q!vZN?JdNab*D|mjH;0SdVwvq2r1*B#MsONk?V3!&y!ES za1mQ57sna5R?*NvZuc3JCC*GMwz;d>XVsDN<1&qkkT8(<+L?EY+cb93?_?1u7r^!r z85(l3ULUY5KxiV!FH?Y|k13ZKng2V6I42&x)|CDfM_8;p8cRg1dVQsdHA{b+2xT=R z4t4yy0w_y`Npn<|K`=Tt@M~tnR7s7^kzQ%$cUBn+kIvv04m7uX&1)?CI6D<`UFB+3 zqOxeY@UooX7{1=of_d@qdC{E+p>_zy;xrp38_p%L%FNOaF3RBGS3MwEN#o9$o$*7yA#)$=ci!k<(Fr*bwe@!-(-`F>xh(aRJ%;90oL;tcsrC1!Y zLgv2P-7*EvcWe>rTS@phegpXRL*0eAR-o<5pE8>DjRbq+)buJX4697$)horM*5@Ni z(J$`6*0CC>C-#AP`gr>A`GJxnclct7g)(y`wVcu=DYqy{BmAWe+|)p*P%>c!TAV-f zH=j5g7re-zkGu?dXMrD0PRmk(NG1JTj1?rvBBjDz-cKJ<&>Lo31Z6c)m4V~e8p=Si z5t5GKJ2CZ&IKk+bCcS?O$j~?tlh9Oggo}lhA7r}>T+FtxTVjnf_>Q#BNT%Dl;Ps#d zM?W670n7s(MXd$Jc}dE8D=6*z_EN!ARe9i|?MqD|l5SA9OV<&GkwQ?&(yj+3Y-AA} z4HBkZ6Fb1b&l^33#V2GimlVtED!2acA28iI@KDYC0k6j!w`k4Vzu-{kx=z)h#^ zVMQYOeGq??4kn5!f^`Wf3*qgl<@}L&yFPz(?EX`+!fm&C65k|1*)?aUwf8n$sL1^j zIo>w{|BEGjMLkXpkxS203oORAE+}k|x!UxZRwR-`5`b$FW1Q7wib5`bXdA%F=>Q;K zLNvi(f?=rCAjfD=4W>m#8dZ1LQzk#%lYu#jtC7MKa0-Y};^QcqO~T6a}gi zr5;$ZldQun^bP{2$vDixMRun;gigtaZVSPj!-lkKp&z4!Ym|Y*fF^;P+UFjITqtYM zKf(CSI(hcSa%GtU9k<+03N)%gB-Qc0{6Np+0o8aKCu=A*yI|j5K_lB&Di@6fL*ja% zD}AEQ>_T9y+g?IxUO^bcirDV)oL zS?ZW~x(0A=kWIYu3%2w5pt5LfL)*|kS=?8_=jl&KEW+LHQ*5siogzgoTn(~H8nURW z%t8I+A*^|5r!?cMGGAF1^29czH|68UPNq8IOcm+veytUJ`rCos;cYf%>2DR|;p~b? zGQOdWF8Tc{)d9)KK;86<&?N3~GIfQ@byUQ6xl7a~kF zn50d~JDkjlaV7|v&ZdeX86;;>S9)cB8XqK(y6RB5`)zNLc?b~!NlZuPGmT%?GvsUQ zq6(!R=xu-qsaUu0s6TIrvHrGiU*{AFafTpb5L{=fx^F@l6LX~YD5om^jL!NqSz4!%lykhC5l>SEkDC52QjFQh z`@w!uWyxkhSp|{3`MhVk^>qaJ_n`eQ%gV%o=&7O1CzhkEG}NTTs|3}#=@8|(q(|2j zkZ?VrCE4Z0kC|;z`MdKDsdn{k+^>1He6KzN1kX=kzp%c#AZd|A$D#)4WfB}#{G_@k z2^UE4c^nT5ew*T=>vNKqm61AGSa0CEhM>Lz>~T9fkG@%)W{y$!eaNcu!6@66H_b$t z?FuU@c)KZ`y2yDJ_BnYdNdY^eS1Xz7%hi@zXdHZDfj`EctJLFbM>Zo=P~cnA7SVv= zI4|wlYgG$c19jx4y>tNk;XqAG75NhXZ(UFKn>>;8l|a<-SCSIHzwvr?GZcX3{Qcz# zM*+<~$I7T$wa2``K;Hq8C5=~KB*!u;|1>QtN61`S1&0sus-zSHRo5JquD`FER*GIU z9h5mE%y@_oSYV>E?|mJ;iluC>DL>jS?{v5RQpDc^gs(Qgm*Hi?_#O;Kfz2eK$f1BZ=9!URaL(@A^6=b2u60`W>glpudbv&9@ z^nvQ8*$TRtFitfX^8S7wWZFPNkA*un_(ontXy z%vzW}tsyxntu1oBzqlIQ;V_5lwmje2~ zeb|WZ+fb_Q&Gm-O7gQ~mE$HEjUgi#~eoNE*{k%}f@U|_;$#P$eoLLh66eR%VFXtAd zuP?_R4M|P4b|{l21x(xFG{IEfr9yyv^4=Xd0Hng+&cV^m#8VUTn_jUx>sswh!w==Q zZ0cnje<-=!xoTgcLo4OU(u`PX|JA56|AcV>k_%fTEPDBjeJESKTO72$%cVMK`lU1z zi$?eR2%VEiX)fpV(5o4HcjSu{={rQ#LS`At#V1t+z-`L1&B6ud&XGKwLSC>uR zJ*26x&$rprg&`e36}O|DoH23hZ@FsFMX^)FTNVr&YqRw}Ml+>kkqlMrvR z`9ZLwPNIi2#-w$_=P?%WN9=ZN?);ev_f{3Xx$_`Xg8F;4zU68zYop7Ic}hi3D*$tg ze_3y1Pj~;-NRC31VYf#EQVq#jG+dv*Aq|+V*4(XGfj%T|ZQLa(Q}{bOtg3s^y$K1-rtbmwVRZ55=1$x*P2 zPDoNJ&t2GcVtSJ^Ip?IC%i!m|D_q6xPtQ#-Lyd^sCHzwJ!n6U`fn+Fj#Y#dA%fe-u z0X27k7Jmh+)b(gGE_mWBeKUQhRvEZq%T#nAn&#nn-9xp4Zf(h!lAdr72Pw6i{io?n zA&(6v0+O5H7Idrl>)b0Gv&ww(K)NHo|F#!@{0)IHemOYjYcrdidZ7-mT{ph%o{)Li z{B&HiH1&bNmHm*nTzveTC&xWaSjE~$9AVZyJv42kB_K4nB2?yOvAxtDAJ^k%z&SEB zTqlP={I%cT$!IT5Y@kXsOr%}4SjY3Z+*O&qQpt>VBc_TYI+>%Gxa7$U)0xdMTx8%?jcLNR?@cW2^ zj9g#DrdBP?(sHNi?&&T+`D=IlsxDwWQ_nK1cGrlBO&j3c4~{vOuq;A+Teq$XwVH1) z*>Hck@ug>(=U5qh=}1=Xhdc(V; z)MA8tu|D+=%>DpwE!58N1xVvg`oAW@gUj^9$`lSJB{xm;T*%Y6nbNds5ww?sL<(*` z(y50E*?kVvL;}lfTWTUv<$AlGgafe^0EbCeD$Ejs$@lHJv0n9U_V~uSe%hhypFAsK z_3N7j#k1n$^96ks9trOm|L#skCD$!8GYo)6;GnW+4Tnd1=xv$3_n;hKqLcOpq>yF& z8x>->Dltw@$bN!&f3$@p(oogb%1W$bljt~|Q(*=dnTjBJElG*h{2pL>rgw3HYE2tc z=&E4OSScaXdYhc@vXs$hN~ki)D*J9bX(rW*KX07W5E!0~RffGUY!hl3br6ze;4zPIR10y|C!9mR zj*gFc+j^JTZaQEDUCdA@kz<>ucd&M$si4JcF|De^p^-VHv`h(WEXtkp#2^B1!!T-T zn31hKa3^~26QMh*Ktfr7{(D5nnFN=?PrXU5Z#K$P_~JI6b@o|mB48iys;v!24q?q5 z^uDqL#;$Wbz^}mXabgi`0Q8RWPeWSRlUgx(Qh`FyVkzWDG3x8?>lo+#F}lm6Vr(T& z480&AM*VEmm&5mC+}fD=;#I8nCGE$6#f>fh7?$MMVMMWnF`OC^lieB9l~=g?zVhgj z38LBW1u~)YqHTUyB6r_hOydG*wf=lS=jj@(5ODe?f+|GD5&fr<}}R`Bs_7rA;1d9$%NTi5UvBs#yMY%6mDBEeB=A>w_nekplG0cYZK` z{7Tf*&O)s2vy|RUKY&~-b52Gp8!j(? zuf`~n0Q7T(mz26!gN#ZbkkZxt!j3gc6)Y&1j5r~F(oZZf?#;l2C8xi`quX6Lt2)}J ze%|&pr-4|4!8i&f8kHRR-a%1QoOC9auiGV9CfEq-+nJ-LFvsS~NEYfny62Y6=}!k# z_2Fx)_?=;{lcb51H(2VFOT32j433X3Gqv;SC7K?V)1u~F(T)=$mH~SoOX&HVi;>#w zBZY?sj-GUwc=FA_VCIb}%oTxklui3izB*In756e+v9! z`j6G`4C{c{RMXm6{nnp97XHFofqjHtCJI)H(c5uAV8~E5HkMF(Fsp;-I^(iB?lSo( zK(+OUI_#lnLN&)w_qX7jr|sN_+^`%MkRLyv4$OfoZ!DVaa`iWjrrmw7tYLpJ5x3epv<}_9pE?$VLSyYI%7J#i7 zv3iCo4s(|M5(B_<5vuZ)naekrRe4{53P2s1w)v1-ACcH*Z=&&|C_Efrro9i#RY5Nb z)ecA=cO-ZlVp;5Sk>bPT1Jf05P`K~)fpR6u+yk@1?q6U9+bR+qFTcBvkE+xnihpqt z7M25Q{li(|XhFvpO8$G>;)z1&8;B9Kho#31;^#o%M~E#(O;uYxD34%$62sH(Ns*LufK{69vWi%P2=MymQX> zE<5!Bg8vE$VkSB*#E-kNq2*jROlGgzZY3Rx)Ss@ad!RUW59T?|jej@wtE!YWmbK9tSK)~eV^53_G1i3{GZeaGz{*O7*;Xu+>lFhN2} z%?FcV=c`Jl!`=MkM-<92fh#~{Au6(!zjT(JNS#P)97gMeH<}!)pTy2$iu^#uKyepY zZExh59HKrUcd&&=9Ud!tPW38fpx7S?<;oaHXX?vu{X2;w52Kz-kTZw9OOeeP9=dnv zj?cZQ)8hJHZihqEvZQppEmh^ z{oWcp!~XYwz!{v*I-p(;=}HoUGVQXM_j+YMdB(2}NIb7NfBkv5_HXC@n)9+r)q2XE zL2li}K~tp2#(#!_uHVVBeYWi03#B&Tym_Wa`;MDzdn%eoI5i(H=B5zkbL8PNt@5V| zYvHi1Y@U9;U)pH1#wlVth9o<8U$3kAvVq2jSgP%(Wl8Nlt6zoKAw$Xf@cd11A}I(ahj}MU%5T!E_wV(S@CSX4gB>A-Q=c~t&I?t;EFUlM9R|dc!7!frG5Tz&!7F}cIZU5X*ZLF1%9CQjdGIj?VM?XtDIfFk6Zf$v#z??T zxJEP_<6t){jJF}OqT=$?1}Yz2aGxxBelzd0w`H*eK-&FkutwC7@he;0eU(U#%$S67 z$ya98gBQ^u%*VHA!td()_hC}HUE)KwG~amvUSdEwU!w}4Wsgz!_Y(pk9eXduLKl;o z723iVpawpoE@2K<$AQEL9|YJLKI}xmA1xOwl%QNEgVJxWx*^x%2FH>lpXqN*DcFz~ zbd6T~$g?l_?{_|m-?5WEvC;PHR$o4o|2FM`rmnJEaHZ+mY7PunYUKzR`fKW%HN2d5 z&&gefw(r`pxvlD5lm#Bd-Ab?-?2M_EQM~q(#tUgTz3{QC6|f1XPI&9WukV_r%QuoX zOm)Az+}EVV&3pkpx!1t*dEqN=Dh+-6Od(2@oV+gQ*P}Yf#olFS+g8>jD>2>K77V{LtR6#9pl0 zva*YDbU|6AYDOZwBh8dg2*qVnon#{HycX*3GUq)1nr0yQ^SaBDz$-c(MYMN?i}t&p z$Y6Y5`k%$glEf-G?KH86m9k@M5t@~J>VfeInmO#)b+%;czeBaFG@D+^RahvH=X7qO z6KBZ~3K)gek~zBDA2m|`J}*@QkzW5VO02u_vK1407;q)8jv`4_;*!iFyJ4h= zd&b*>#e4r0dPfQNz9Sm><;mx@g$p(*+S?BuWM6AXRQnI6xHsRwmb~91@$(6eVx|Ak zG8Rgf(KgY~?Cv6@epWW=@?#mwbrCk_>Ibs?CG1(~C;nlA|6)&kZ+J)K4WAMo@{p&s z#-9fA2b1{Mz~DLsGfus-E|1&Ao@`K9)c=@KJhVY-yN0n7!uYFA!?%xn zIr72Yzn3iImw?g@UKl_^*)}RtxI4d5*K-U?g2NRhQDQq|%V+!!s*UTd<Z2hs}K1PpVfS5x>6}+W5JK=aqi{rbQ8%eT0lRKiXVnGvm0^($S); zl=asr^m-)%lcH!eT`)_0%(QUnjyFROKSb{GGy>*30>b|juQ$c7nfl6QZZ_`iaKbpQ zbsENEbJwetUd;ME=6Aoy;G&@fN(v8Gxe{H-`-1BivgVXg4nUn zB45^$%6kiorcA?s5H^i#|T4bI0RWD7)YoT(lZy+V!c5%j{-Q!x~bY zOP)SH6V$F=xtKOAnr@^%77+5%b|R>0;9pb8Wh{(bEAg2S*1C;+XWuAVP8hhYLsGJ$ zg{h>6$-kND5vEOc;J+7)NnJhE{lViH&Nozzd8;ET7<|}Kms{RO6BIzv>$`C}^*1C(9o;f&$or%gkoDeYz4O@-= zN!2HZpHzKe38QDBw%=70CJ*DEnXj;z$xI8Dryz%qKG_+vkJ0f zD!k%X7-<*A-tg^8qzuZ{iQOkaJe ze)WoHwNB{kw|l?u*7^$&f;FPcU8h?K^g}pih{cO1PP6^=seIj|6i)%j0ZSWA{DTd! zP_W)AV7$_Cl5OJvbW-KGYMY-8W|O7}PJav#eRF!sV~hoR$?baEj;LmC#DgKfPUIa^ z%*hsvb9!&~JBsr=8(W$oymMrJ>Y21TB`rXTO@O zRD=4v9Oh$!r^7R^p-`JF0ChoOlod4t_D;^mR-VDB%}1iiS(M5l{+?wLsDX|o6QnqT z^0f3-gR&|H`vxsyMe5s3Q6v373Ej*WSWo56%I;E$2fzIyGi3N89NQ9zNb2W9rxI3Z z^)r1z@-E%#bOi?czW6&GC96s%t2r$MkI-XtpPFC^8}2Fv5hX~Ik75<^&$!Bwt8u8mbr0IOg5e*S%ZNUV;5^OcLEfTgr9 z-k%$bq6U8mmQW2NjDs9*{h;&6_E*@uEbQ(D1p$K%&8KN<^D4J%6)5VhaK3R>p%+hX z?MFSHB#PK9=J-?AgR59s$q!S6VvtYmO8JWab>9);b!aM}N<&tdXia znu^lVTa6WTfwUy2%6Q+jTM8+6sJJv)zjup}w<6;wjAyXd_a;5QYFKF&4*WcTuu;ul zxwD`R4f8=TaC&%W=}LNaobO;()11t}3}-l@Yvk<7@STn!iDVAf<&nfjU-L40Ce$_n zg>Q_X*!Tqriz6AP0=OCSer9>=fMQGDFRYhRBvWqv7E;h#B%)9kjam$g@9q5f_C1(| z*UE|{Kd9lwpeU>z#gPW8fK&VZc1s{r#k?IebAuK9zY8CwCXXH`@+H{L{XB5bKh$F8 z0D%F zlsm8yzxd%z`+9i>%K8(31-M63y)qGMOm{xnXO2&*Ri^MIU{O=ttDhIaj#i(3?F5N7 zc!ivOe2@B?r}P$Je<=FnWYoBgYwR%lyq(HJ3DGH1m@*TP@Xa-9J)ggbvC1Ljw2)xs zdpTQBc?xW5^d9l1p-$a@Z>m~Mp6n2UC@RrSmgO1ir*%v`4xmDUFEF5!8FBU0Wv{QM zOCw%wgk33%Y3TTR);K!JQ0RH+*v^+?S!A1j&?9v`MET`xV(^>QvfiP2X+cxXX1>w(v=o{)DaGKLP8MpiwC!S3emY zVBHS|_OdNaJRky*G?2##CX4-jb+KhEEB-t$--Tzs_|Vv^4bvmDq)g~BVab;qMcQN$ z1<}5pzy(t1Lb;yp7xg~U>62x7G^7+>5SNhry5XH@cysc|{m{4-gZ(x9sirfX!&&HZ zeopA;Mp59`nV--425OClyl~rr>q80Q`}SqE)g34_^!sO|7GGquC|yOF+|;HO$7=4{ zVM3Y0S7}1*{{f)KqjhBE!)xqTN-@hTy z40KEMyD1|V0s0mCM%rOJRYxBmE}%x&P*{Z#O@vuZ@h85N54!^ zcO4mZ3*0e|Msa_3cRo8i&hV#pu^hEmeD1+iX*76t*~K(4o?pgJk6Gp0k!0QyRodr& zL4YGA%|r)9j%a-&B|a@fM#xpy%y=XoQOdnwI!bDWJ7I;!E)f$)Svowp?iC^)rx{w3 zP^qIV7A@>KE+L%6L7^LFp7#Q1&E7SuBPB>7og*v3oT7(!L7k8B$22+^Y2o1`e8eH& zSjIPv)stiyceaLX!}nP+S>{R_7)X788hm4R;&aVc%Uub@yPM!;!Z(^+AsW(#$jzLN zFkvp-3!9BulIXw*0D#vOdCnF%DpN2MXI2|x-pQgyIP*t#o|fdwh^JmcyqOLI;+mA6y$;K#j`%0hEMwV)&7>?5mG^k`-V&H2{5%8dFlBEUV3Riir1^P^b_!+s|BKALf;RN_l2At9epCv5!atGEt{m_y~% ziB>W=Uic^*jP!{1a%mO!=Z%SHqo`Wp#}JS45l4?4S+FGfsc`0;j{CNMn9p=|BvaIr zhL3?(#A-OKG~Vc4F&r%4BP%l5;n*Or21Y%HIfkB>;pAQhW9#53784P~Og0F;*3%m3 z$kv)|B@+Ph$`S=iq;chTvjO(|sS$waywnkQtr*s-I3BkcCu1{`O?qM)q< zXxn$BGnpVV5Rh?1X&QCm!8+yHs}OX=USzXfq+2<#J2eh^&uOEs`I#s-SQ%urZk9!) znYtq@N!zAN36!xoMTVl;YC^^?W&~8@7wvdzPP0zMzB`1*Hg8d0iE+jQ8Zn)C9K&Q$ z4k@G0u9{|qV_~6x!yY$OT-tn`UApkmoQWctv60DcXmQ|ZF^H$Sk-iXW7{WrKVLqh& z!xxV}?fy?A76B2rdxOoSi$FPcO!0hG(@?o%l*@AR1z|cxaz>qP+)Zb%v zHwoO^x*BwndxAD$v^2fWO==V)(H;R13|k{B9ZtBuCTyviT|_Szp|^xn#sX7g4iXwn z0PYZXIs-K{GGx>Y$u%w$Ad|e_Zz-rPQ^W&(f|)QS1HmAL>S8I-36nWG0kMV9I~s-z zY+Z&BT1Yg1us5JV0_06dVActjQ+DCnO*VbD8^RVHgGUAfQNuo{pZ~YeF=pwRWDmE+Z=*P36qtJ{*)N*e6$O!e_88x0ahS)o)m12t=^fJC8zp z?Zm>=CaZe9J;Q)-)EJ%t#SxK^f}D{6I6+?Av9gPQ&zzQ<<$AZ6FKynGvYAEp2=94; zGMY6V*_mYqh-2}+{_j%5U(Covxzkl08_`-T8TFoIvfdnM$1B4tsJwR+RXPx~t=3q4 z5W{1USq6$IFPhoQeX`ElmdK%vuG$c0lt}Rq?jw8{RNK=FPGBVQwTg`nUBr>CnkL7_ zBPFGOjh*ycXE4z2=>`miTp)$`p^81VBPFKU{r!(Dt*MxeoV8}3ZEVnlYeyU;mzuh3 zM{zZE%zsJT@@&!I=O!V@pfOBwdmwR3K>`H5a>-0iQAZbHqtCM~7K#Dy1_1_jdLj1H zbbl8l_Q^Tmn&o@Y`lOO{WW_=Q4Df(IWdMqQ)*@kL!D7K`9d3TLDalortaJJ6CZz=o z_cUduCaIRi9Z=UzbBhiX+@N+~uYw~h9V_Ah1tRMYitsTsX2`acjzP?Iz(ULPrjp=W z%=gv9_=JFoyhx(#go5qoN$iE#myJ8=t4-FZNOna*`0_mi&}ks__nLH<1{sx@rsq%u z5a|OMmvtBcD1Vh_hesnTZBmlyLXC#T(*RsWOCCwqI$-Dt?JEh6c7tW?8s21tGKOPG ziW(y;xFle)0vx%4@#D*^J+v4Pcy^ebH>MqDUY&?T=BjQ)={a!qgL%;uOuFkZmaMIdk%C_x_=u7a2RbVMnj;ZtBBIp>k#)G zQ>eINIcBt00YE^5eyRZbX_B<73q(}9b6{pK=f~XMBPC*LF;g%vYI&smDn0+7+@j!7 zk)rwcO$5~hqd+Uf?RgL?GI57S%U)tBlt*T`QiT+hpBPsX2pN@-BP$gnD?lSFQ2GcI zID<0)9)Bh7bua^5m?)1BCnO=VPpSmSQQ?%3g07S~26PEs6ocJ}YXIXlN4F9GZaSPt z0TeuXa6E10A-}W^{dK}gI(eNO>)D~m;32{R0DzJVfXJz*e_qprf}rfS{*w%aKPm)B z0IVXfu*lQq8$ibZ^u%}p$UWT?VYKr09HfakFn`&~v6GP{>{Js#tBJ)PqX>f`!g=8HnztMKh#$7JVoN zMSmichR`sLK=e;7`&rKDB0CO&dYH0tCUVcG52lkcl_tf}2*!)c+ zB_o>Q#CMmBz@!fWt|5r)&ds{xCwL&n;A6=afB7FAZRb_7{s(PW5 z6=4x1fTn{duq_FJGel}p_S2&8E{&eTsefR5y(YfBu?q&;4({HeH~B>%92z@92P9Q? zP-Ie4EJZ*>g8>l?gwYi&0+bNM5JF1@B`E##K}iLminJQ|NF9mw?mIEcLLsZZ%hSYx zKAF2A-wtzNOUc!e3p_iz5D-KlZx*ttxm1!ZRF30^R-oy_sSw;;c<5by69b7@i+{j~ z!cq{09;g@IPat-mtKIMke4vG(9!mB5O9&?9fhFR$g+vJp)nFZcT|(U4_Q%yzrR!(D z+Fwlf*pSR4b(x8&j1>B}n$*@kowTaSTxJY0jT&ji2r#7+ED3WjnsjuPpxvx8nBvMN zj&EhG(i_}Lv#v^MLNu0PdU5xznSa9Ng1b)Ms*I#PsIMVQ?q2-E6v{kglEqwTt5uXQ6ykBL zjmU3sa6#011(|XnQMf(!KvVD#ASO5C2ct%T%|mE#?jt22BbgOURYVAjo_|o$b)lZF zhvId^f+!q&PS`fx6-q;=1oxb!HhFcEUo`ZKL1dD^5fO?`T(o$ddP1o#6CDeNEv0=R zo>@`{kGHQ&o_N@i45j2wFeoZeBBU~uSb=KP6k!+(eyF~^_z0bLrG z9^#9h7O+~OlV1|%H1#G;! zBPHF_j7gS76(+G9)i6~=K?F$?1ky=;rejH}0!n14CQ2BFhft9KWKg4_31O5!fj?&M-z*^gn+LG(Ge9zoPeTmyd*e^UD?qJbb{nFNXkS$|7t_V)OS@>NWd zFpoC?kPQ9-2?)r{gHbggLPU%a5R6j<5FzofBPGxb%LF4Ua7XxXN2|Kr8=2q;0PWd| z2920tQBx4YK}{^d10y9BK`KB;CMa`=mk5IgHTwEaSRwp@2XKi0qn}P*p2H(6_x|1o zV!eR_QPy~_0j(n?ZGS}X03roiFoydp@rSv&D@W2-Vh{RMjC$K_FCLWx0@!&1-G4W9 zC{G9y)FZm6kR=_~d{_mg?ps;i%h_OhVpUwLPK~Buzo?+V6X8f}Mc^KEkP;qAMHxBBY!ItXfCzu83ls1R5FlZ zP(A*gns#sZ{Hrbp34gqMuQRkJ?2xbDNs=)U#F~}}Cp5d0WvmMeE0<$Nz$B3SkQ31! zf2@D;sJMJaJ_Gx0L_ZwHLL9MzDnf;OL4OQXB#{RQ{ym-=0z$z8ct~@_Mc6qoZE3*`{e~59fj* zAtH?@q(X5sw$0djXDUit_kLUeA5>8{Pu{V2pm~av2?WYz zl1Y|#A#bhJX0`9PGa^ALBP$f`tO9}~o$EsCRLM*wF@Gc<-!R8@`>f!-c9sq#(9HeQ0yIha zT!uqM7SMT3@Qq+L+5;3pztGGn{8Y7Qv#SuXjili%8@tLIj`-qNm{57+u-au3Zwx4C z7%3dqfPXZsnqBGJu*xQl#zUEn4r@SYmKr7~C>m-?4io}03~fV;L>5Fz1ssrU2-3)i zBP&5h+^dx$ikJ*c86zvyR8RzKH={VQ2-#NjnY>)qChZ{%G(=GlvXLThF-VljF?Hg& zgg_b~HN9!`9p((X$TPYG+nK*!StsU0LkNg)H-8T%dfO1S%~@=i{5#W*ggZ+he*Bks zHavF{-WpxctM4;>S?l_UpEB%Qd!7u=R5YgZOm`F`k49(^N!m#y^5pa}L3V*sL8MWP zj6^YtIuFSN7PLquCsyoqc^>;%D(^#%mn(g83qpStwFUWR~zoqun{xXFa7sVqgz=Vcj-K}AG{npFsGgZ@9Y z5);v}`21yfSMYfHueT#Tx(Hy|u>+WNchKk|_C+fEG!cH^llK?6hj2|j9mub)gO~9T z=gUCJnME=yibT=v`{1;1LW`&U#&78`JBsiyrNmGuJC9ylc9@&p zk7*)GArhVkd4`83k5RsqYfmn$KB#*59KRV}sr>gUWsM!r6gj3~A^K7XXpCYcA_CTT~Dlc$6q7)XDIPyav8pZ<3L zr@Q@M^#A4CPxJq~|BXNYe*gQw-PQl!`#;t2|7ZKY@ACie{@?ifzuW(Z^Zrlx|I7XV z@BfGU|J}#`$MS!}|L^>Ni~j%n|Kf%*`2UF@IKFK8c%%IJku-_iBPIAj{RjEc%tU4N=cByuJ}G7ej6X1mv4^t(-H7+esLglWmw5E*}g52~PW zX%v<57!3bc`Ha7&v9&|{60Tl377y?K-&Nbsj-61ZW2gfdD2`b;=zQni@uS3x<+-Lz z*ZuS^3-EVcb?wBKnp6Esj-1WyMw_Vd$ z2*+9@C8`#=S*epF=+kmjTwwAxX@Tx+uie4y!z$YZCW0JDb{&dDPDsM^vX3|jjdsms z)DWr7ptFrydpB<$c{7bn>yyG0_Ch^G9C4RU#I2Mnnhhe*-68J0rOxV^Y+0+ za-vcf;RpswIS|OyY0O)Qn1pE)S3dvv$61};pAw{tdF$`hJ8BUi@&STB&jiG<4ySYT z^Ep%ThWqi)P(8H>Bm^{#Nd+NI1VsqJA;5|h0=!^}+3J2gsDBO-2mN#c@jx|10i{|9 z2u1FU4j)mOr7&Ygk5QBL&em!~sv%lOZe#bgH?1kvJQ~g<}Oyu51ynb0%V#4Z?xcl(^Ar?QhyRGiyBFhFmH{* z(Dy@8WIM;|gP92r`+kJ~f~vNNRj3zsQDp2f0e_p=(fqjo&|ChwvLCD7f48PaZ~wB& z5);(m=YJ2A+g)Z7=mS#7Fqsd&NF4tm8Vu!oF!6YE`5soc`@TPE{@f_S^*SJS?^pQ0Kl`8K%q>flQ~I-C+{*51pOT;S z(f`}@bFGZuEB@%YGGQkl&Er|}z1`}}?&Gd9=YRDpp(ilx=?ne*Y;jGdw@dz3?lh)0 z5K>^+mo=P8HiziA+x=bl&G*xd97G9lh45&&xah6z$NxPDh#V|Qk{~F~a=3>hC02DS z_R3NyV5*^tHnySRj<0sxl;>8i|LR9URxcfO|GU%AKg*~w`+Z-mQ4jy(?ntL2D-s$4 ND+sON3L`u{JqoG3Fo^&F From 25e07232acd7f2e70b3202f15e3f3370c3303f1f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Jan 2009 22:08:52 +0100 Subject: [PATCH 0622/2970] Rewrite try: except: finally: so it is python 2.4 friendly --- wscript | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/wscript b/wscript index 73756c0a..8acddcc2 100644 --- a/wscript +++ b/wscript @@ -287,17 +287,18 @@ def build (bld): pre = open (desktop + '.in') after = open (folder + '/' + desktop, 'w') try: - for line in pre: - if line != '': - if line[0] == '_': - after.write (line[1:]) - else: - after.write (line) - after.close () - Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) - install_files ('DATADIR', 'applications', folder + '/' + desktop) - except: - Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') + try: + for line in pre: + if line != '': + if line[0] == '_': + after.write (line[1:]) + else: + after.write (line) + after.close () + Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) + install_files ('DATADIR', 'applications', folder + '/' + desktop) + except: + Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') finally: pre.close () From 8370b2f2c9556d99117e83f6b1891a684afe0730 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 6 Jan 2009 00:23:09 +0100 Subject: [PATCH 0623/2970] Add a missing return in KatzeNet to fix a crasher --- katze/katze-net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/katze/katze-net.c b/katze/katze-net.c index fcfed106..ee45cfd8 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -471,6 +471,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, { priv->icon_cb (NULL, priv->user_data); katze_net_icon_priv_free (priv); + return; } } gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, &icon_height); From 2c1b05913ae108a1e09d2e9e2dae4d12abe5aca8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 6 Jan 2009 02:09:35 +0100 Subject: [PATCH 0624/2970] Propagate mime icons from views to proxy items --- katze/katze-arrayaction.c | 27 ++++++++++++++++++++------- midori/midori-view.c | 33 +++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 5ab26c09..fe3657d2 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -226,6 +226,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, guint n, i; KatzeItem* item; GtkWidget* menuitem; + const gchar* icon_name; GdkPixbuf* icon; GtkWidget* image; GtkWidget* submenu; @@ -245,14 +246,19 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, } menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - if (KATZE_IS_ARRAY (item)) - icon = gtk_widget_render_icon (menuitem, - GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + if ((icon_name = katze_item_get_icon (item)) && *icon_name) + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); else - icon = katze_net_load_icon (array_action->net, - katze_item_get_uri (item), NULL, proxy, NULL); - image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); + { + if (KATZE_IS_ARRAY (item)) + icon = gtk_widget_render_icon (menuitem, + GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + else + icon = katze_net_load_icon (array_action->net, + katze_item_get_uri (item), NULL, proxy, NULL); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + } gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); @@ -405,6 +411,13 @@ katze_array_action_item_notify_cb (KatzeItem* item, gtk_widget_show (image); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } + else if (!strcmp (property, "icon")) + { + image = gtk_image_new_from_icon_name (katze_item_get_icon (item), + GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + } } /** diff --git a/midori/midori-view.c b/midori/midori-view.c index 0ee35119..89b5e600 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -526,15 +526,15 @@ static GdkPixbuf* midori_view_mime_icon (GtkIconTheme* icon_theme, const gchar* format, const gchar* part1, - const gchar* part2) + const gchar* part2, + gchar** name) { - gchar* name; GdkPixbuf* icon; - name = part2 ? g_strdup_printf (format, part1, part2) + *name = part2 ? g_strdup_printf (format, part1, part2) : g_strdup_printf (format, part1); - icon = gtk_icon_theme_load_icon (icon_theme, name, 16, 0, NULL); - g_free (name); + if (!(icon = gtk_icon_theme_load_icon (icon_theme, *name, 16, 0, NULL))) + g_free (*name); return icon ? g_object_ref (icon) : NULL; } @@ -547,31 +547,36 @@ midori_view_update_icon (MidoriView* view, GdkScreen* screen; GtkIconTheme* icon_theme; gchar** parts; + gchar* icon_name; if ((screen = gtk_widget_get_screen (GTK_WIDGET (view)))) { icon_theme = gtk_icon_theme_get_for_screen (screen); - parts = g_strsplit (view->mime_type, "/", 2); + if ((parts = g_strsplit (view->mime_type, "/", 2))) + parts = (parts[0] && parts[1]) ? parts : NULL; } else parts = NULL; - if (parts && parts[0] && parts[1]) + if (parts) icon = midori_view_mime_icon (icon_theme, "%s-%s", - parts[0], parts[1]); - if (!icon && parts && parts[0] && parts[1]) + parts[0], parts[1], &icon_name); + if (!icon && parts) icon = midori_view_mime_icon (icon_theme, "gnome-mime-%s-%s", - parts[0], parts[1]); - if (!icon && parts && parts[0]) + parts[0], parts[1], &icon_name); + if (!icon && parts) icon = midori_view_mime_icon (icon_theme, "%s-x-generic", - parts[0], NULL); - if (!icon && parts && parts[0]) + parts[0], NULL, &icon_name); + if (!icon && parts) icon = midori_view_mime_icon (icon_theme, "gnome-mime-%s-x-generic", - parts[0], NULL); + parts[0], NULL, &icon_name); + katze_item_set_icon (view->item, icon && view->item ? icon_name : NULL); if (!icon) icon = gtk_widget_render_icon (GTK_WIDGET (view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); } + else + katze_item_set_icon (view->item, NULL); katze_object_assign (view->icon, icon); g_object_notify (G_OBJECT (view), "icon"); From e1701be96dfce9e7476f80e62a75b460e782ecaa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 6 Jan 2009 02:26:19 +0100 Subject: [PATCH 0625/2970] Implement 'deactivate' in Statusbar Features extension --- extensions/statusbar-features.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index fb8cada1..86f21bfe 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -11,9 +11,17 @@ #include -void -statusbar_features_app_add_browser_cb (MidoriApp* app, - MidoriBrowser* browser) +static void +statusbar_features_deactivate_cb (MidoriExtension* extension, + GtkWidget* bbox) +{ + gtk_widget_destroy (bbox); +} + +static void +statusbar_features_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) { GtkWidget* statusbar; GtkWidget* bbox; @@ -49,6 +57,9 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, gtk_widget_show (button); gtk_widget_show (bbox); gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); + + g_signal_connect (extension, "deactivate", + G_CALLBACK (statusbar_features_deactivate_cb), bbox); } static void @@ -56,7 +67,7 @@ statusbar_features_activate_cb (MidoriExtension* extension, MidoriApp* app) { g_signal_connect (app, "add-browser", - G_CALLBACK (statusbar_features_app_add_browser_cb), NULL); + G_CALLBACK (statusbar_features_app_add_browser_cb), extension); } MidoriExtension* From 0c7034f69ccc004ff8eaedd5b0550aa8bdf26ccc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jan 2009 01:43:36 +0100 Subject: [PATCH 0626/2970] Warn in red font if unique 1.0.4 is used --- wscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 8acddcc2..6f9a9147 100644 --- a/wscript +++ b/wscript @@ -105,7 +105,11 @@ def configure (conf): if option_enabled ('unique'): check_pkg ('unique-1.0', '0.9', False) - single_instance = ['not available','yes'][conf.env['HAVE_UNIQUE'] == 1] + single_instance = ['not available', 'yes'][conf.env['HAVE_UNIQUE'] == 1] + if single_instance == 'yes': + if conf.check_cfg (modversion='unique-1.0') == '1.0.4': + Utils.pprint ('RED', 'unique 1.0.4 has a fatal bug.') + Utils.pprint ('RED', 'Please use an older or newer version.') else: option_checkfatal ('unique', 'single instance') single_instance = 'no' From a74fa5b3cd39a05d43f6b806d11cac0d41723ae7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jan 2009 01:49:54 +0100 Subject: [PATCH 0627/2970] Fix incorrect version conditionals for context groups --- midori/gjs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/gjs.c b/midori/gjs.c index 99e4ec5f..057b9e39 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -1024,11 +1024,14 @@ gjs_global_context_new (void) { #ifdef WEBKIT_CHECK_VERSION #if WEBKIT_CHECK_VERSION (1, 0, 3) + #define HAVE_JSCONTEXTGROUP 1 + #endif + #endif + #if HAVE_JSCONTEXTGROUP JSGlobalContextRef js_context = JSGlobalContextCreateInGroup (NULL, NULL); #else JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); #endif - #endif JSObjectRef js_object = gjs_object_new (js_context, "GJS", NULL); _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), "gjs", js_object); From 4e84376e2865d8f59f4e630ad7d201fcf86f8b3e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jan 2009 01:54:08 +0100 Subject: [PATCH 0628/2970] Require libSoup 2.23.1 instead of 2.23.0 --- midori/main.c | 4 ++-- midori/midori-preferences.c | 4 ++-- wscript | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index e4f97219..9614245a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1438,7 +1438,7 @@ cookie_jar_changed_cb (SoupCookieJar* jar, } #endif -#if HAVE_LIBSOUP_2_23_1 +#if HAVE_LIBSOUP /* The following code hooks up to any created cookie jar in order to load and save cookies. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its @@ -1967,7 +1967,7 @@ main (int argc, return 1; } - #if HAVE_LIBSOUP_2_23_1 + #if HAVE_LIBSOUP /* This is a nasty trick that allows us to manipulate cookies even without having a pointer to the jar. */ soup_cookie_jar_get_type (); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c11f9869..0d1b4fe6 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -223,7 +223,7 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); } -#if HAVE_LIBSOUP_2_23_1 +#if HAVE_LIBSOUP static void midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -530,7 +530,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ - #if HAVE_LIBSOUP_2_23_1 + #if HAVE_LIBSOUP /* If a cookie jar was created, WebKit is using Soup */ if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) diff --git a/wscript b/wscript index 6f9a9147..31383330 100644 --- a/wscript +++ b/wscript @@ -116,8 +116,7 @@ def configure (conf): conf.check_message_custom ('single instance', 'support', single_instance) if option_enabled ('libsoup'): - check_pkg ('libsoup-2.4', '2.23.0', False) - check_pkg ('libsoup-2.4', '2.23.1', False, var='LIBSOUP_2_23_1') + check_pkg ('libsoup-2.4', '2.23.1', False) check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2') libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] else: From 43f48a9b43e3c7d8dbc6e05f8fe5eeb850fb6ae8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jan 2009 02:29:07 +0100 Subject: [PATCH 0629/2970] Let glib-genmarshal write our marshallers --- midori/marshal.list | 4 ++ midori/midori-locationaction.c | 37 +---------- midori/midori-panel.c | 38 +---------- midori/midori-searchaction.c | 37 +---------- midori/midori-view.c | 111 +-------------------------------- midori/wscript_build | 1 + wscript | 1 + 7 files changed, 12 insertions(+), 217 deletions(-) create mode 100644 midori/marshal.list diff --git a/midori/marshal.list b/midori/marshal.list new file mode 100644 index 00000000..53e9849d --- /dev/null +++ b/midori/marshal.list @@ -0,0 +1,4 @@ +BOOLEAN:VOID +VOID:OBJECT,ENUM +VOID:STRING,BOOLEAN +VOID:STRING,INT,STRING diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c3b004bf..7fcf7867 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -13,6 +13,7 @@ #include "midori-locationaction.h" #include "gtkiconentry.h" +#include "marshal.h" #include "sokoke.h" #include @@ -95,42 +96,6 @@ static void midori_location_action_disconnect_proxy (GtkAction* action, GtkWidget* proxy); -static void -midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void(*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, - const gchar* arg_1, - gboolean arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_BOOLEAN callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data - ? marshal_data : cc->callback); - callback (data1, - g_value_get_string (param_values + 1), - g_value_get_boolean (param_values + 2), - data2); -} - static void midori_location_action_class_init (MidoriLocationActionClass* class) { diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 9794d257..4129d825 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -12,8 +12,10 @@ #include "midori-panel.h" #include "midori-view.h" -#include "sokoke.h" + #include "compat.h" +#include "marshal.h" +#include "sokoke.h" #include @@ -81,40 +83,6 @@ midori_panel_close (MidoriPanel* panel) return FALSE; } -static void -midori_cclosure_marshal_BOOLEAN__VOID (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef gboolean(*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, - gpointer data2); - register GMarshalFunc_BOOLEAN__VOID callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 1); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data - ? marshal_data : cc->callback); - v_return = callback (data1, data2); - g_value_set_boolean (return_value, v_return); -} - static void midori_panel_class_init (MidoriPanelClass* class) { diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index b32d30e9..6a9d21c4 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -12,6 +12,7 @@ #include "midori-searchaction.h" #include "gtkiconentry.h" +#include "marshal.h" #include "sokoke.h" #include @@ -90,42 +91,6 @@ static void midori_search_action_disconnect_proxy (GtkAction* action, GtkWidget* proxy); -static void -midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void(*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, - const gchar* arg_1, - gboolean arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_BOOLEAN callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data - ? marshal_data : cc->callback); - callback (data1, - g_value_get_string (param_values + 1), - g_value_get_boolean (param_values + 2), - data2); -} - static void midori_search_action_class_init (MidoriSearchActionClass* class) { diff --git a/midori/midori-view.c b/midori/midori-view.c index 89b5e600..bd114f78 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -18,6 +18,7 @@ #include "midori-stock.h" #include "compat.h" +#include "marshal.h" #include "sokoke.h" #include @@ -163,116 +164,6 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, MidoriView* view); -static void -midori_cclosure_marshal_VOID__STRING_BOOLEAN (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void(*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, - gpointer arg_1, - gboolean arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_BOOLEAN callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data - ? marshal_data : cc->callback); - callback (data1, - (gchar*)g_value_get_string (param_values + 1), - g_value_get_boolean (param_values + 2), - data2); -} - -static void -midori_cclosure_marshal_VOID__OBJECT_ENUM (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void(*GMarshalFunc_VOID__OBJECT_ENUM) (gpointer data1, - gpointer arg_1, - gint arg_2, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_ENUM callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_ENUM) (marshal_data - ? marshal_data : cc->callback); - callback (data1, - g_value_get_object (param_values + 1), - g_value_get_enum (param_values + 2), - data2); -} - -static void -midori_cclosure_marshal_VOID__STRING_INT_STRING (GClosure* closure, - GValue* return_value, - guint n_param_values, - const GValue* param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void(*GMarshalFunc_VOID__STRING_INT_STRING) (gpointer data1, - gpointer arg_1, - gint arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_INT_STRING callback; - register GCClosure* cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_INT_STRING) (marshal_data - ? marshal_data : cc->callback); - callback (data1, - (gchar*)g_value_get_string (param_values + 1), - g_value_get_int (param_values + 2), - (gchar*)g_value_get_string (param_values + 3), - data2); -} - static void midori_view_class_init (MidoriViewClass* class) { diff --git a/midori/wscript_build b/midori/wscript_build index 3e3b1324..9c8d1273 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -6,5 +6,6 @@ obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' obj.includes = '. .. ../panels' obj.find_sources_in_dirs ('. ../panels') +obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/wscript b/wscript index 31383330..a1565052 100644 --- a/wscript +++ b/wscript @@ -50,6 +50,7 @@ def configure (conf): return dirvalue conf.check_tool ('compiler_cc') + conf.check_tool ('glib2') if option_enabled ('userdocs'): conf.find_program ('rst2html.py', var='RST2HTML') From b6e33e5399915379af1ad74a5c3ed54795c9a7fd Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Fri, 9 Jan 2009 22:54:40 +0100 Subject: [PATCH 0630/2970] Implement 'full' debug-level and fix according warnings --- katze/katze-net.c | 4 ++-- katze/katze-throbber.c | 10 +++++----- katze/katze-utils.c | 2 +- midori/gjs.c | 12 ++++++------ midori/gtkiconentry.c | 2 -- midori/main.c | 34 +++++++++++++++++----------------- midori/midori-app.c | 6 +++--- midori/midori-browser.c | 22 +++++++++++----------- midori/midori-extension.c | 2 +- midori/midori-locationaction.c | 10 +++++----- midori/midori-locationentry.c | 2 +- midori/midori-panel.c | 1 + midori/midori-preferences.c | 8 ++++---- midori/midori-searchaction.c | 2 +- midori/midori-view.c | 5 +++-- midori/sokoke.c | 2 +- panels/midori-addons.c | 2 +- wscript | 26 ++++++++++++++++++++------ 18 files changed, 83 insertions(+), 69 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index ee45cfd8..363ad9d1 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -239,7 +239,7 @@ katze_net_finished_cb (SoupMessage* msg, } #endif -gboolean +static gboolean katze_net_local_cb (KatzeNetPriv* priv) { KatzeNetRequest* request; @@ -288,7 +288,7 @@ katze_net_local_cb (KatzeNetPriv* priv) return FALSE; } -gboolean +static gboolean katze_net_default_cb (KatzeNetPriv* priv) { KatzeNetRequest* request; diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index 68b61bb1..faaea53a 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -885,17 +885,17 @@ katze_throbber_expose_event (GtkWidget* widget, if (G_LIKELY (cols > 0 && rows > 0)) { - gint index; + gint idx; guint x, y; katze_throbber_aligned_coords (widget, &ax, &ay); - index = throbber->index % (cols * rows); + idx = throbber->index % (cols * rows); if (G_LIKELY (throbber->timer_id >= 0)) - index = MAX (index, 1); + idx = MAX (idx, 1); - x = (index % cols) * throbber->width; - y = (index / cols) * throbber->height; + x = (idx % cols) * throbber->width; + y = (idx / cols) * throbber->height; gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf, x, y, ax, ay, diff --git a/katze/katze-utils.c b/katze/katze-utils.c index ff7a9a8b..fa685d03 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -335,7 +335,7 @@ katze_property_proxy (gpointer object, } else if (type == G_TYPE_PARAM_ENUM) { - gint i; + guint i; GEnumClass* enum_class = G_ENUM_CLASS ( g_type_class_ref (pspec->value_type)); gint value = katze_object_get_enum (object, property); diff --git a/midori/gjs.c b/midori/gjs.c index 057b9e39..372f3de3 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -198,7 +198,7 @@ gjs_value_get_string (GjsValue* value) return value->string; } -void +static void gjs_value_weak_notify_cb (GjsValue* attribute, GjsValue* value) { @@ -542,7 +542,7 @@ _js_class_get_property_names_cb (JSContextRef js_context, guint n; GParamSpec** pspecs = g_object_class_list_properties ( G_OBJECT_GET_CLASS (object), &n); - gint i; + guint i; for (i = 0; i < n; i++) { const gchar* property = g_param_spec_get_name (pspecs[i]); @@ -556,8 +556,8 @@ _js_class_get_property_names_cb (JSContextRef js_context, guint* signals = g_signal_list_ids (type, &n); for (i = 0; i < n; i++) { - const gchar* signal = g_signal_name (signals[i]); - JSStringRef js_signal = JSStringCreateWithUTF8CString (signal); + const gchar* signal_ = g_signal_name (signals[i]); + JSStringRef js_signal = JSStringCreateWithUTF8CString (signal_); JSPropertyNameAccumulatorAddName (js_properties, js_signal); JSStringRelease (js_signal); } @@ -622,7 +622,7 @@ _js_object_call_as_function_cb (JSContextRef js_context, GValue* values = g_new0 (GValue, n_arguments + 1); g_value_init (&values[0], G_OBJECT_TYPE (object)); g_value_set_instance (&values[0], object); - gint i; + guint i; for (i = 0; i < n_arguments; i++) { GValue value = {0, }; @@ -1002,7 +1002,7 @@ _js_module_get_property_cb (JSContextRef js_context, return result; } -JSObjectRef +static JSObjectRef gjs_module_new (JSContextRef js_context, const gchar* namespace) { diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 428fb216..8e189932 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -97,9 +97,7 @@ enum PROP_SENSITIVITY_SECONDARY }; -static void gtk_icon_entry_class_init (GtkIconEntryClass *klass); static void gtk_icon_entry_editable_init (GtkEditableClass *iface); -static void gtk_icon_entry_init (GtkIconEntry *entry); static void gtk_icon_entry_finalize (GObject *obj); static void gtk_icon_entry_dispose (GObject *obj); static void gtk_icon_entry_map (GtkWidget *widget); diff --git a/midori/main.c b/midori/main.c index 9614245a..17e340ca 100644 --- a/midori/main.c +++ b/midori/main.c @@ -65,11 +65,11 @@ stock_items_init (void) { typedef struct { - gchar* stock_id; - gchar* label; + const gchar* stock_id; + const gchar* label; GdkModifierType modifier; guint keyval; - gchar* fallback; + const gchar* fallback; } FatStockItem; GtkIconSource* icon_source; GtkIconSet* icon_set; @@ -143,7 +143,7 @@ settings_new_from_file (const gchar* filename) GParamSpec* pspec; GType type; const gchar* property; - gchar* string; + gchar* str; gint integer; gfloat number; gboolean boolean; @@ -167,11 +167,11 @@ settings_new_from_file (const gchar* filename) property = g_param_spec_get_name (pspec); if (type == G_TYPE_PARAM_STRING) { - string = sokoke_key_file_get_string_default (key_file, + str = sokoke_key_file_get_string_default (key_file, "settings", property, G_PARAM_SPEC_STRING (pspec)->default_value, NULL); - g_object_set (settings, property, string, NULL); - g_free (string); + g_object_set (settings, property, str, NULL); + g_free (str); } else if (type == G_TYPE_PARAM_INT) { @@ -200,17 +200,17 @@ settings_new_from_file (const gchar* filename) g_type_class_ref (pspec->value_type)); GEnumValue* enum_value = g_enum_get_value (enum_class, G_PARAM_SPEC_ENUM (pspec)->default_value); - gchar* string = sokoke_key_file_get_string_default (key_file, + str = sokoke_key_file_get_string_default (key_file, "settings", property, enum_value->value_name, NULL); - enum_value = g_enum_get_value_by_name (enum_class, string); + enum_value = g_enum_get_value_by_name (enum_class, str); if (enum_value) g_object_set (settings, property, enum_value->value, NULL); else g_warning (_("Value '%s' is invalid for %s"), - string, property); + str, property); - g_free (string); + g_free (str); g_type_class_unref (enum_class); } else @@ -243,9 +243,9 @@ settings_save_to_file (MidoriWebSettings* settings, property = g_param_spec_get_name (pspec); if (!(pspec->flags & G_PARAM_WRITABLE)) { - gchar* comment = g_strdup_printf ("# %s", property); - g_key_file_set_string (key_file, "settings", comment, ""); - g_free (comment); + gchar* prop_comment = g_strdup_printf ("# %s", property); + g_key_file_set_string (key_file, "settings", prop_comment, ""); + g_free (prop_comment); continue; } if (type == G_TYPE_PARAM_STRING) @@ -747,7 +747,7 @@ midori_history_add_items (void* data, /* Test whether have the right number of columns */ g_return_val_if_fail (argc % ncols == 0, 1); - for (i = 0; i <= (argc - ncols); i++) + for (i = 0; i < (argc - ncols) + 1; i++) { if (argv[i]) { @@ -2141,11 +2141,11 @@ main (int argc, G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); if (!katze_array_is_empty (bookmarks)) { - guint i, n; + guint n; n = katze_array_get_length (bookmarks); for (i = 0; i < n; i++) { - KatzeItem* item = katze_array_get_nth_item (bookmarks, i); + item = katze_array_get_nth_item (bookmarks, i); if (KATZE_IS_ARRAY (item)) { g_signal_connect_after (item, "add-item", diff --git a/midori/midori-app.c b/midori/midori-app.c index 11a9f895..8ce5d205 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -141,7 +141,7 @@ midori_browser_quit_cb (MidoriBrowser* browser, midori_app_quit (app); } -void +static void _midori_app_add_browser (MidoriApp* app, MidoriBrowser* browser) { @@ -164,7 +164,7 @@ _midori_app_add_browser (MidoriApp* app, #endif } -void +static void _midori_app_quit (MidoriApp* app) { gtk_main_quit (); @@ -282,7 +282,7 @@ static UniqueResponse midori_browser_message_received_cb (UniqueApp* instance, UniqueCommand command, UniqueMessageData* message, - guint time, + guint timestamp, MidoriApp* app) { UniqueResponse response; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d4fb7ea4..5cfe5f55 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1990,12 +1990,12 @@ _action_location_activate (GtkAction* action, static void _action_location_active_changed (GtkAction* action, - gint index, + gint idx, MidoriBrowser* browser) { const gchar* uri; - if (index > -1) + if (idx > -1) { uri = midori_location_action_get_uri (MIDORI_LOCATION_ACTION (action)); midori_browser_set_current_uri (browser, uri); @@ -2163,16 +2163,16 @@ _action_search_notify_current_item (GtkAction* action, { MidoriSearchAction* search_action; KatzeItem* item; - guint index; + guint idx; search_action = MIDORI_SEARCH_ACTION (action); item = midori_search_action_get_current_item (search_action); if (item) - index = katze_array_get_item_index (browser->search_engines, item); + idx = katze_array_get_item_index (browser->search_engines, item); else - index = 0; + idx = 0; - g_object_set (browser->settings, "last-web-search", index, NULL); + g_object_set (browser->settings, "last-web-search", idx, NULL); } static void @@ -2827,23 +2827,23 @@ static const gchar* license = static void _action_about_activate_link (GtkAboutDialog* about, - const gchar* link, + const gchar* uri, gpointer user_data) { MidoriBrowser* browser; gint n; browser = MIDORI_BROWSER (user_data); - n = midori_browser_add_uri (browser, link); + n = midori_browser_add_uri (browser, uri); midori_browser_set_current_page (browser, n); } static void _action_about_activate_email (GtkAboutDialog* about, - const gchar* link, + const gchar* uri, gpointer user_data) { - gchar* command = g_strconcat ("xdg-open ", link, NULL); + gchar* command = g_strconcat ("xdg-open ", uri, NULL); g_spawn_command_line_async (command, NULL); g_free (command); } @@ -4070,7 +4070,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close Findbar")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); - #ifdef HAVE_OSX + #if HAVE_OSX gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, 0); #else gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 04228bd1..dc540754 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -140,7 +140,7 @@ midori_extension_class_init (MidoriExtensionClass* class) g_type_class_add_private (class, sizeof (MidoriExtensionPrivate)); } -void +static void midori_extension_activate_cb (MidoriExtension* extension, MidoriApp* app) { diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 7fcf7867..631cfc74 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -894,7 +894,7 @@ midori_location_action_prepend_item (MidoriLocationAction* location_action, GtkTreeModel* filter_model; GtkTreeModel* model; GtkTreeIter iter; - GtkTreeIter index; + GtkTreeIter idx; gint n; gint visits = 0; @@ -904,17 +904,17 @@ midori_location_action_prepend_item (MidoriLocationAction* location_action, if (midori_location_action_iter_insert (location_action, item->uri, &iter, 0)) { - gtk_tree_model_get_iter_first (model, &index); + gtk_tree_model_get_iter_first (model, &idx); gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); - gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &index); + gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &idx); } n = gtk_tree_model_iter_n_children (filter_model, NULL); if (n > MAX_ITEMS) { - gtk_tree_model_iter_nth_child (model, &index, NULL, n - 1); + gtk_tree_model_iter_nth_child (model, &idx, NULL, n - 1); gtk_list_store_set (GTK_LIST_STORE (model), - &index, VISIBLE_COL, FALSE, -1); + &idx, VISIBLE_COL, FALSE, -1); } /* Only increment the visits when we add the uri */ diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index eceb4b56..92a34277 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -134,7 +134,7 @@ _gtk_entry_effective_inner_border (GtkEntry *entry, *border = default_inner_border; } -void +static void gtk_entry_borders (GtkEntry* entry, gint* xborder, gint* yborder, diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 4129d825..160266b9 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -595,6 +595,7 @@ typedef struct GtkAlignmentClass parent_class; } MidoriDummyViewableClass; +GType midori_dummy_viewable_get_type (void) G_GNUC_CONST; #define MIDORI_TYPE_DUMMY_VIEWABLE (midori_dummy_viewable_get_type ()) #define MIDORI_DUMMY_VIEWABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ MIDORI_TYPE_DUMMY_VIEWABLE, MidoriDummyViewable)) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 0d1b4fe6..8ac296ed 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -235,7 +235,7 @@ midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, } #endif -#ifdef HAVE_OSX +#if HAVE_OSX static void midori_preferences_help_clicked_cb (GtkWidget* button, GtkDialog* dialog) @@ -260,7 +260,7 @@ midori_preferences_add_toolbutton (GtkWidget* toolbar, const gchar* label, GtkWidget* page) { -#ifdef HAVE_OSX +#if HAVE_OSX *toolbutton = GTK_WIDGET (*toolbutton ? gtk_radio_tool_button_new_from_widget ( GTK_RADIO_TOOL_BUTTON (*toolbutton)) : gtk_radio_tool_button_new (NULL)); gtk_tool_button_set_label (GTK_TOOL_BUTTON (*toolbutton), label); @@ -316,7 +316,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, preferences->notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (preferences->notebook), 6); - #ifdef HAVE_OSX + #if HAVE_OSX gtk_notebook_set_show_tabs (GTK_NOTEBOOK (preferences->notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (preferences->notebook), FALSE); toolbar = gtk_toolbar_new (); @@ -607,7 +607,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_object_unref (sizegroup); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (preferences)->vbox), preferences->notebook, FALSE, FALSE, 4); - #ifdef HAVE_OSX + #if HAVE_OSX GtkWidget* icon; hbox = gtk_hbox_new (FALSE, 0); button = gtk_button_new (); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 6a9d21c4..d9852d4f 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1144,7 +1144,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_widget_set_sensitive (button, FALSE); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - #ifdef HAVE_OSX + #if HAVE_OSX GtkWidget* icon; hbox = gtk_hbox_new (FALSE, 0); button = gtk_button_new (); diff --git a/midori/midori-view.c b/midori/midori-view.c index bd114f78..b85c79c9 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -692,7 +692,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, case 1: if (!link_uri) return FALSE; - #ifdef HAVE_OSX + #if HAVE_OSX /* FIXME: Test for Command key */ if (0) #else @@ -1891,8 +1891,9 @@ midori_view_tab_label_parent_set (GtkWidget* tab_label, { GtkWidget* parent; + /* FIXME: Disconnect orientation notification if (old_parent) - /* FIXME: Disconnect orientation notification */; + ; */ if (!(parent = gtk_widget_get_parent (tab_label))) return; diff --git a/midori/sokoke.c b/midori/sokoke.c index 67b7d465..84903b3a 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -251,7 +251,7 @@ typedef enum static SokokeDesktop sokoke_get_desktop (void) { - #ifdef HAVE_OSX + #if HAVE_OSX return SOKOKE_DESKTOP_OSX; #else static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 8cc55172..67823f6c 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -308,7 +308,7 @@ _addons_get_files (MidoriAddons* addons) return files; } -GtkTreePath* +static GtkTreePath* _treeview_first_selected_path (GtkTreeView *treeview) { GtkTreeSelection* selection; diff --git a/wscript b/wscript index a1565052..3469c4b9 100644 --- a/wscript +++ b/wscript @@ -141,8 +141,7 @@ def configure (conf): check_pkg ('libxml-2.0', '2.6') conf.check (header_name='unistd.h') - if sys.platform == 'darwin': - conf.define ('HAVE_OSX', 1) + conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): icons = 'yes' @@ -162,11 +161,26 @@ def configure (conf): conf.write_config_header ('config.h') conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') debug_level = Options.options.debug_level - if debug_level != '': + if debug_level != 'no': compiler = conf.env['CC_NAME'] if compiler == 'gcc': if debug_level == 'debug': conf.env.append_value ('CCFLAGS', '-Wall -O0 -g') + elif debug_level == 'full': + # -Wdeclaration-after-statement + # -Wmissing-declarations -Wmissing-prototypes + # -Wwrite-strings + conf.env.append_value ('CCFLAGS', + '-Wall -Wextra -O1 -g ' + '-Waggregate-return -Wno-unused-parameter ' + '-Wno-missing-field-initializers ' + '-Wunsafe-loop-optimizations ' + '-Wredundant-decls -Wmissing-noreturn ' + '-Wshadow -Wpointer-arith -Wcast-align ' + '-Winline -Wformat-security ' + '-Winit-self -Wmissing-include-dirs -Wundef ' + '-Wmissing-format-attribute -Wnested-externs ' + '-DG_ENABLE_DEBUG') else: conf.env.append_value ('CCFLAGS', '-O2') else: @@ -207,9 +221,9 @@ def set_options (opt): opt.tool_options ('compiler_cc') opt.get_option_group ('--check-c-compiler').add_option('-d', '--debug-level', - action = 'store', default = '', - help = 'Specify the debugging level. [\'debug\', \'release\']', - choices = ['', 'debug', 'release'], dest = 'debug_level') + action = 'store', default = 'debug', + help = 'Specify the debugging level. [\'no\', \'debug\', \'full\']', + choices = ['no', 'debug', 'full'], dest = 'debug_level') opt.tool_options ('gnu_dirs') opt.parser.remove_option ('--oldincludedir') opt.parser.remove_option ('--htmldir') From 626c5c904fad13a9cd615517e5733bfb620f3b18 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Fri, 9 Jan 2009 23:59:39 +0100 Subject: [PATCH 0631/2970] Make Xfce headers look like the real thing --- midori/sokoke.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 84903b3a..861a3b5e 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -300,6 +300,8 @@ sokoke_xfce_header_new (const gchar* icon, GtkWidget* hbox; GtkWidget* image; GtkWidget* label; + GtkWidget* vbox; + GtkWidget* separator; xfce_heading = gtk_event_box_new (); entry = gtk_entry_new (); @@ -323,7 +325,14 @@ sokoke_xfce_header_new (const gchar* icon, gtk_container_add (GTK_CONTAINER (xfce_heading), hbox); g_free (markup); gtk_widget_destroy (entry); - return xfce_heading; + + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), xfce_heading, FALSE, FALSE, 0); + + separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0); + + return vbox; } return NULL; } From 89fbbaca46248f959c8a9aa83150d9a0d11f9c15 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Sat, 10 Jan 2009 00:16:07 +0100 Subject: [PATCH 0632/2970] Fix extension folder handling in the failing case --- midori/main.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/midori/main.c b/midori/main.c index 17e340ca..4de785d1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1717,37 +1717,40 @@ midori_load_extensions (gpointer data) /* Load extensions */ extensions = katze_array_new (MIDORI_TYPE_EXTENSION); - extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); if (g_module_supported ()) { + extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); GDir* extension_dir = g_dir_open (extension_path, 0, NULL); - - while ((filename = g_dir_read_name (extension_dir))) + if (extension_dir != NULL) { - gchar* fullname; - GModule* module; - typedef MidoriExtension* (*extension_init_func)(void); - extension_init_func extension_init; - - fullname = g_build_filename (extension_path, filename, NULL); - module = g_module_open (fullname, G_MODULE_BIND_LOCAL); - g_free (fullname); - - if (module && g_module_symbol (module, "extension_init", - (gpointer) &extension_init)) - extension = extension_init (); - else + while ((filename = g_dir_read_name (extension_dir))) { - extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", filename, - "description", g_module_error (), - NULL); - g_warning ("%s", g_module_error ()); + gchar* fullname; + GModule* module; + typedef MidoriExtension* (*extension_init_func)(void); + extension_init_func extension_init; + + fullname = g_build_filename (extension_path, filename, NULL); + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); + g_free (fullname); + + if (module && g_module_symbol (module, "extension_init", + (gpointer) &extension_init)) + extension = extension_init (); + else + { + extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", filename, + "description", g_module_error (), + NULL); + g_warning ("%s", g_module_error ()); + } + katze_array_add_item (extensions, extension); + g_object_unref (extension); } - katze_array_add_item (extensions, extension); - g_object_unref (extension); + g_dir_close (extension_dir); } - g_dir_close (extension_dir); + g_free (extension_path); } g_object_set (app, "extensions", extensions, NULL); From 266e3194513da34d830636fb19431f9ec29bd9bd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 10 Jan 2009 00:35:10 +0100 Subject: [PATCH 0633/2970] Apply the default debug level dependend on the compiler --- wscript | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index 3469c4b9..a124cad1 100644 --- a/wscript +++ b/wscript @@ -161,8 +161,13 @@ def configure (conf): conf.write_config_header ('config.h') conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') debug_level = Options.options.debug_level - if debug_level != 'no': - compiler = conf.env['CC_NAME'] + compiler = conf.env['CC_NAME'] + if debug_level == '': + if compiler == 'gcc': + debug_level = 'debug' + else: + debug_level = 'none' + if debug_level != 'none': if compiler == 'gcc': if debug_level == 'debug': conf.env.append_value ('CCFLAGS', '-Wall -O0 -g') @@ -221,9 +226,9 @@ def set_options (opt): opt.tool_options ('compiler_cc') opt.get_option_group ('--check-c-compiler').add_option('-d', '--debug-level', - action = 'store', default = 'debug', - help = 'Specify the debugging level. [\'no\', \'debug\', \'full\']', - choices = ['no', 'debug', 'full'], dest = 'debug_level') + action = 'store', default = '', + help = 'Specify the debugging level. [\'none\', \'debug\', \'full\']', + choices = ['', 'none', 'debug', 'full'], dest = 'debug_level') opt.tool_options ('gnu_dirs') opt.parser.remove_option ('--oldincludedir') opt.parser.remove_option ('--htmldir') From 4a59af2c5fe35491b705f1225e062839227fdd3e Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sat, 10 Jan 2009 00:46:59 +0100 Subject: [PATCH 0634/2970] Update Japanese translation --- po/ja.po | 582 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 340 insertions(+), 242 deletions(-) diff --git a/po/ja.po b/po/ja.po index cca3b10e..d8c7d971 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-30 10:14+0900\n" -"PO-Revision-Date: 2008-12-29 18:15+0900\n" +"POT-Creation-Date: 2009-01-08 15:33+0900\n" +"PO-Revision-Date: 2009-01-08 15:41+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,8 +20,11 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../midori.desktop.in.h:2 ../midori/main.c:1807 ../midori/main.c:1898 -#: ../midori/main.c:1907 ../midori/main.c:1918 +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1828 +#: ../midori/main.c:1919 +#: ../midori/main.c:1928 +#: ../midori/main.c:1939 #: ../midori/midori-websettings.c:235 msgid "Midori" msgstr "Midori" @@ -34,7 +37,8 @@ msgstr "ウェブブラウザ" msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/main.c:88 ../midori/midori-browser.c:3761 +#: ../midori/main.c:88 +#: ../midori/midori-browser.c:3797 msgid "_Bookmarks" msgstr "ブックマーク(_B)" @@ -92,7 +96,8 @@ msgstr "設定を読み込めませんでした: %s\n" msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:217 ../midori/main.c:287 +#: ../midori/main.c:217 +#: ../midori/main.c:287 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" @@ -101,11 +106,13 @@ msgstr "無効な設定値 '%s'" msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:537 ../midori/main.c:546 +#: ../midori/main.c:537 +#: ../midori/main.c:546 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/main.c:568 ../midori/main.c:600 +#: ../midori/main.c:568 +#: ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" @@ -120,7 +127,8 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:711 ../midori/main.c:725 +#: ../midori/main.c:711 +#: ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" @@ -136,40 +144,45 @@ msgstr "古い履歴アイテムの削除に失敗しました: %s\n" msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:897 ../midori/main.c:915 +#: ../midori/main.c:897 +#: ../midori/main.c:915 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1045 ../midori/sokoke.c:517 +#: ../midori/main.c:1045 +#: ../midori/sokoke.c:523 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1065 ../midori/main.c:1082 +#: ../midori/main.c:1075 +#: ../midori/main.c:1100 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" -#: ../midori/main.c:1101 ../midori/main.c:1125 +#: ../midori/main.c:1123 +#: ../midori/main.c:1147 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1146 ../midori/midori-preferences.c:381 +#: ../midori/main.c:1168 +#: ../midori/midori-preferences.c:381 msgid "Transfers" msgstr "転送" -#: ../midori/main.c:1182 +#: ../midori/main.c:1204 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1508 +#: ../midori/main.c:1530 msgid "Authentication Required" msgstr "認証が要求されました" -#: ../midori/main.c:1524 +#: ../midori/main.c:1546 msgid "" "A username and a password are required\n" "to open this location:" @@ -177,589 +190,599 @@ msgstr "" "この場所を開くためにはユーザ名とパスワードが\n" "必要です:" -#: ../midori/main.c:1538 +#: ../midori/main.c:1560 msgid "Username" msgstr "ユーザ名" -#: ../midori/main.c:1549 +#: ../midori/main.c:1571 msgid "Password" msgstr "パスワード" -#: ../midori/main.c:1653 -msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " -"happend repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" -"ようであれば、問題解決のために以下のオプションを試してみてください。" +#: ../midori/main.c:1675 +msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1668 +#: ../midori/main.c:1690 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1672 +#: ../midori/main.c:1694 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1677 +#: ../midori/main.c:1699 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1807 +#: ../midori/main.c:1828 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1836 ../midori/gjs.c:514 +#: ../midori/main.c:1857 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1859 +#: ../midori/main.c:1880 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1861 +#: ../midori/main.c:1882 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1863 -msgid "URIs" -msgstr "URIs" +#: ../midori/main.c:1884 +msgid "Addresses" +msgstr "アドレス" -#: ../midori/main.c:1895 -msgid "[URIs]" -msgstr "[URIs]" +#: ../midori/main.c:1916 +msgid "[Addresses]" +msgstr "[アドレス]" -#: ../midori/main.c:1919 +#: ../midori/main.c:1940 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1921 +#: ../midori/main.c:1942 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1944 +#: ../midori/main.c:1965 #, c-format msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:2003 +#: ../midori/main.c:2024 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:2018 +#: ../midori/main.c:2039 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:2031 +#: ../midori/main.c:2052 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:2044 +#: ../midori/main.c:2065 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:2056 +#: ../midori/main.c:2077 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2072 +#: ../midori/main.c:2093 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3119 -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:248 +#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3161 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:260 +#: ../midori/midori-browser.c:3158 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:541 +#: ../midori/midori-searchaction.c:833 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:882 -msgid "_URL:" -msgstr "URL(_U):" +#: ../midori/midori-browser.c:560 +#: ../midori/midori-searchaction.c:847 +msgid "_Address:" +msgstr "アドレス(_A):" #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "ルート" +#: ../midori/midori-browser.c:583 +#: ../midori/midori-browser.c:619 +msgid "Toplevel folder" +msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1292 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2369 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2371 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2605 +#: ../midori/midori-browser.c:2646 msgid "Separator" msgstr "セパレータ" -#: ../midori/midori-browser.c:2716 +#: ../midori/midori-browser.c:2757 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../midori/midori-browser.c:2722 +#: ../midori/midori-browser.c:2763 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../midori/midori-browser.c:2729 +#: ../midori/midori-browser.c:2770 msgid "Today" msgstr "今日" -#: ../midori/midori-browser.c:2731 +#: ../midori/midori-browser.c:2772 msgid "Yesterday" msgstr "昨日" -#: ../midori/midori-browser.c:2820 +#: ../midori/midori-browser.c:2861 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2828 +#: ../midori/midori-browser.c:2869 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:2962 +#: ../midori/midori-browser.c:2998 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3089 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3092 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3095 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:3098 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3101 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3103 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3104 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3106 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3107 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3074 +#: ../midori/midori-browser.c:3110 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3077 +#: ../midori/midori-browser.c:3113 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3115 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3118 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3085 ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3124 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3091 +#: ../midori/midori-browser.c:3127 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3130 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3133 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3136 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3138 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3139 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3141 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3142 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:3145 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3146 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3149 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3151 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3152 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3164 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3167 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3170 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3136 ../midori/midori-view.c:1017 +#: ../midori/midori-browser.c:3172 +#: ../midori/midori-view.c:973 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3173 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3175 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3176 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3180 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3182 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3185 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3188 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3191 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3193 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3194 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3160 ../midori/midori-view.c:989 +#: ../midori/midori-browser.c:3196 +#: ../midori/midori-view.c:945 msgid "Undo Close Tab" -msgstr "閉じたタブを元に戻します" +msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3197 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3201 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3204 msgid "Edit the selected bookmark" msgstr "選択されたブックマークを編集します" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3207 msgid "Delete the selected bookmark" msgstr "選択されたブックマークを削除します" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3210 msgid "Delete the selected history item" msgstr "選択された履歴アイテムを削除します" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3213 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3216 msgid "Bookmark the selected history item" msgstr "選択された履歴アイテムをブックマークに追加します" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3218 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3184 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3220 +#: ../midori/midori-searchaction.c:461 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3221 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:3225 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3226 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3228 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3229 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3231 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3233 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3198 +#: ../midori/midori-browser.c:3234 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3236 msgid "_Frequent questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3237 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3239 msgid "_Report a bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3240 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3243 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3250 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3251 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3256 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3257 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3260 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3261 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3264 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3265 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3268 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3269 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3272 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3273 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3276 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3241 +#: ../midori/midori-browser.c:3277 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3722 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3688 +#: ../midori/midori-browser.c:3724 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3712 +#: ../midori/midori-browser.c:3748 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3714 +#: ../midori/midori-browser.c:3750 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3733 +#: ../midori/midori-browser.c:3769 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3782 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3784 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3763 +#: ../midori/midori-browser.c:3799 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3776 +#: ../midori/midori-browser.c:3812 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3778 +#: ../midori/midori-browser.c:3814 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:3900 +#: ../midori/midori-browser.c:3936 msgid "Bookmarks" msgstr "ブックマーク" -#: ../midori/midori-browser.c:3943 ../midori/midori-preferences.c:582 +#: ../midori/midori-browser.c:3979 +#: ../midori/midori-preferences.c:592 msgid "History" msgstr "履歴" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3986 +#: ../midori/midori-browser.c:4022 msgid "_Inline find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4017 +#: ../midori/midori-browser.c:4053 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4025 +#: ../midori/midori-browser.c:4061 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4070 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:4318 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:191 +#: ../midori/midori-panel.c:192 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1658 +#: ../midori/midori-websettings.c:145 +#: ../midori/midori-view.c:1644 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:420 msgid "Homepage" msgstr "ホームページ" @@ -787,7 +810,8 @@ msgstr "Unicode (UTF-8)" msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:239 msgid "Custom..." msgstr "カスタム..." @@ -831,7 +855,8 @@ msgstr "すべての Cookie" msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:220 +#: ../panels/midori-addons.c:96 msgid "None" msgstr "なし" @@ -1049,8 +1074,8 @@ msgid "Middle click opens Selection" msgstr "選択範囲のミドルクリックで開く" #: ../midori/midori-websettings.c:517 -msgid "Load an URL from the selection via middle click" -msgstr "URL を選択してミドルクリックするとその場所を開きます" +msgid "Load an address from the selection via middle click" +msgstr "選択したアドレスをミドルクリックすると読み込みます" #: ../midori/midori-websettings.c:525 msgid "Open tabs in the background" @@ -1133,69 +1158,70 @@ msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" #: ../midori/midori-websettings.c:659 -msgid "HTTP Proxy" -msgstr "HTTP プロキシ" +msgid "Proxy Server" +msgstr "プロキシサーバ" #: ../midori/midori-websettings.c:660 -msgid "The proxy used for HTTP connections" -msgstr "HTTP 接続でプロキシを使用する場合に設定します" +msgid "The proxy server used for HTTP connections" +msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:679 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:680 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:681 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:700 +#: ../midori/midori-websettings.c:701 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:702 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:714 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:715 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:641 +#: ../midori/midori-view.c:597 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:921 +#: ../midori/midori-view.c:877 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:944 +#: ../midori/midori-view.c:900 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:952 +#: ../midori/midori-view.c:908 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:974 -msgid "Open URL in New _Tab" -msgstr "URL を新しいタブで開く(_T)" +#: ../midori/midori-view.c:930 +msgid "Open Address in New _Tab" +msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1382 +#: ../midori/midori-view.c:1365 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1522 +#: ../midori/midori-view.c:1508 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1546 +#: ../midori/midori-view.c:1532 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1227,130 +1253,179 @@ msgstr "フォント設定" msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:428 -msgid "Minimum Font Size" -msgstr "最大フォントサイズ" +#: ../midori/midori-preferences.c:426 +msgid "The default font size used to display text" +msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:429 +msgid "Minimum Font Size" +msgstr "最小フォントサイズ" + +#: ../midori/midori-preferences.c:432 +msgid "The minimum font size used to display text" +msgstr "文字表示で使用される最小のフォントサイズを指定します" + +#: ../midori/midori-preferences.c:439 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:442 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:449 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:450 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:451 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:453 +#: ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "画像を自動的に読み込む" #: ../midori/midori-preferences.c:454 +msgid "Load and display images automatically" +msgstr "画像を自動的に読み込んで表示します" + +#: ../midori/midori-preferences.c:457 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:458 +msgid "Automatically shrink standalone images to fit" +msgstr "画像を単独表示するときに自動的に縮小します" + +#: ../midori/midori-preferences.c:461 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:462 +msgid "Whether background images should be printed" +msgstr "印刷するときに背景画像も印刷します" + +#: ../midori/midori-preferences.c:465 msgid "Resizable text areas" msgstr "テキストエリアのサイズを変更可能にする" -#: ../midori/midori-preferences.c:463 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:466 +msgid "Whether text areas are resizable" +msgstr "テキストエリアのサイズ変更を有効にします" + +#: ../midori/midori-preferences.c:469 +#: ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:466 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:470 +msgid "Enable embedded scripting languages" +msgstr "組み込まれたスクリプト言語を有効にします" + +#: ../midori/midori-preferences.c:473 +#: ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:474 +msgid "Enable embedded plugin objects" +msgstr "組み込みプラグインオブジェクトを有効にします" + +#: ../midori/midori-preferences.c:477 +msgid "Enforce 96 dots per inch" +msgstr "強制的に 96DPI にする" + +#: ../midori/midori-preferences.c:478 +msgid "Enforce a video dot density of 96 DPI" +msgstr "ドット密度を強制的に 96DPI にします" + +#: ../midori/midori-preferences.c:481 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:472 -msgid "Enforce 96 DPI" -msgstr "強制的に 96DPI にする" +#: ../midori/midori-preferences.c:482 +msgid "Enable special extensions for developers" +msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:490 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:491 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:507 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:528 ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:539 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:558 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:574 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:577 ../midori/midori-preferences.c:589 +#: ../midori/midori-preferences.c:587 +#: ../midori/midori-preferences.c:599 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:452 +#: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "空" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:789 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:789 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:852 +#: ../midori/midori-searchaction.c:817 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:861 msgid "_Icon (name or file):" msgstr "アイコン名/ファイル(_I):" -#: ../midori/midori-searchaction.c:910 +#: ../midori/midori-searchaction.c:875 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1087 +#: ../midori/midori-searchaction.c:1052 msgid "Manage search engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/sokoke.c:101 +#: ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/sokoke.c:340 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:346 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s にはプロパティ '%s' はありません" @@ -1365,19 +1440,23 @@ msgstr "%s は %s.%s に割り当てることはできません" msgid "%s.%s cannot be accessed" msgstr "%s.%s にアクセスできません" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:97 +#: ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 +#: ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "無効(_D)" @@ -1403,12 +1482,14 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:182 +#: ../katze/katze-utils.c:391 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:211 +#: ../katze/katze-utils.c:250 msgid "Choose file" msgstr "ファイルの選択" @@ -1417,7 +1498,8 @@ msgid "Choose folder" msgstr "フォルダの選択" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:109 +#: ../extensions/page-holder.c:144 msgid "Pageholder" msgstr "ページホルダ" @@ -1425,14 +1507,30 @@ msgstr "ページホルダ" msgid "_Pageholder" msgstr "ページホルダ(_P)" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" msgstr "画像" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "スクリプト" -#: ../extensions/statusbar-features.c:44 +#: ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "プラグイン" + +#~ msgid "URIs" +#~ msgstr "URIs" +#~ msgid "[URIs]" +#~ msgstr "[URIs]" +#~ msgid "_URL:" +#~ msgstr "URL(_U):" +#~ msgid "Root" +#~ msgstr "ルート" +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP プロキシ" +#~ msgid "Open URL in New _Tab" +#~ msgstr "URL を新しいタブで開く(_T)" +#~ msgid "Enforce 96 DPI" +#~ msgstr "強制的に 96DPI にする" + From 4ad55618f6b23b96cacef0b029553dd067de1e71 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 10 Jan 2009 20:13:08 +0100 Subject: [PATCH 0635/2970] Correct conditionals for OS X and JavaScriptCore --- midori/main.c | 5 ++++- midori/midori-preferences.c | 2 +- midori/midori-searchaction.c | 2 +- midori/midori-websettings.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/midori/main.c b/midori/main.c index 4de785d1..7466595e 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1839,11 +1839,14 @@ midori_run_script (const gchar* filename) #ifdef WEBKIT_CHECK_VERSION #if WEBKIT_CHECK_VERSION (1, 0, 3) + #define HAVE_JSCONTEXTGROUP 1 + #endif + #endif + #if HAVE_JSCONTEXTGROUP js_context = JSGlobalContextCreateInGroup (NULL, NULL); #else js_context = JSGlobalContextCreate (NULL); #endif - #endif if (g_file_get_contents (filename, &script, NULL, &error)) { diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 8ac296ed..b825a459 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -96,7 +96,7 @@ midori_preferences_init (MidoriPreferences* preferences) "has-separator", FALSE, NULL); g_free (dialog_title); - #ifndef HAVE_OSX + #if !HAVE_OSX gtk_dialog_add_buttons (GTK_DIALOG (preferences), GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index d9852d4f..9a451549 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1054,7 +1054,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) dialog = gtk_dialog_new_with_buttons (dialog_title, toplevel ? GTK_WINDOW (toplevel) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - #ifndef HAVE_OSX + #if !HAVE_OSX GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 98f0c457..39d6e175 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -776,7 +776,7 @@ generate_ident_string (MidoriIdentity identify_as) #endif const gchar* os = - #if defined (HAVE_OSX) + #if HAVE_OSX /* #if defined (HAVE_X86) */ "Intel Mac OS X"; /* #else From d55b6ddd0058a3c207e0f07a526a33498949f284 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 10 Jan 2009 20:18:26 +0100 Subject: [PATCH 0636/2970] Only set the proxy icon of the View if we have an item --- midori/midori-view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index b85c79c9..5d035569 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -461,12 +461,13 @@ midori_view_update_icon (MidoriView* view, if (!icon && parts) icon = midori_view_mime_icon (icon_theme, "gnome-mime-%s-x-generic", parts[0], NULL, &icon_name); - katze_item_set_icon (view->item, icon && view->item ? icon_name : NULL); + if (view->item) + katze_item_set_icon (view->item, icon ? icon_name : NULL); if (!icon) icon = gtk_widget_render_icon (GTK_WIDGET (view), GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); } - else + else if (view->item) katze_item_set_icon (view->item, NULL); katze_object_assign (view->icon, icon); g_object_notify (G_OBJECT (view), "icon"); From 6753a9ade39baf87e52f439c25f71da780eeca25 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sun, 11 Jan 2009 19:30:43 +0100 Subject: [PATCH 0637/2970] Store history dates in 'token' to avoid locatime() and revamp deleting Loading history items used to involve frequent calls to localtime() and g_memdup(). We avoid this by storing the date strings in parent items now, which can even be used to display items in the treeview. Deleting of treeview items was also reworked so it should work from menu items and the panel. --- midori/main.c | 29 ++++----- midori/midori-browser.c | 119 ++++++++++++++++++++--------------- midori/midori-searchaction.c | 1 + midori/sokoke.c | 29 --------- midori/sokoke.h | 4 -- 5 files changed, 82 insertions(+), 100 deletions(-) diff --git a/midori/main.c b/midori/main.c index 7466595e..2d0c7b08 100644 --- a/midori/main.c +++ b/midori/main.c @@ -597,7 +597,7 @@ db_exec_callback (sqlite3* db, { *error = g_error_new (MIDORI_HISTORY_ERROR, MIDORI_HISTORY_ERROR_EXEC_SQL, - _("Failed to open database: %s\n"), + _("Failed to execute SQL statement: %s\n"), errmsg); } sqlite3_free (errmsg); @@ -642,9 +642,9 @@ midori_history_remove_item_cb (KatzeArray* history, g_return_if_fail (KATZE_IS_ITEM (item)); - sqlcmd = g_strdup_printf ( - "DELETE FROM history WHERE uri = '%s' AND" - " title = '%s' AND date = %" G_GINT64_FORMAT, + sqlcmd = sqlite3_mprintf ( + "DELETE FROM history WHERE uri = '%q' AND" + " title = '%q' AND date = %" G_GINT64_FORMAT, katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item)); @@ -655,7 +655,7 @@ midori_history_remove_item_cb (KatzeArray* history, g_error_free (error); return ; } - g_free (sqlcmd); + sqlite3_free (sqlcmd); } static void @@ -738,9 +738,9 @@ midori_history_add_items (void* data, KatzeArray* parent = NULL; KatzeArray* array = KATZE_ARRAY (data); gint64 date; - time_t newdate; - gint i, j, n; + gint i; gint ncols = 3; + gchar token[50]; g_return_val_if_fail (KATZE_IS_ARRAY (array), 1); @@ -761,18 +761,15 @@ midori_history_add_items (void* data, date = g_ascii_strtoull (argv[i + 2], NULL, 10); katze_item_set_added (item, date); - n = katze_array_get_length (array); - for (j = 0; j < n; j++) - { - parent = katze_array_get_nth_item (array, j); - newdate = katze_item_get_added (KATZE_ITEM (parent)); - if (sokoke_same_day ((time_t *)&date, (time_t *)&newdate)) - break; - } - if (j == n) + strftime (token, sizeof (token), "%Y-%m-%d", + localtime ((time_t *)&date)); + parent = katze_array_find_token (array, token); + + if (!parent) { parent = katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_added (KATZE_ITEM (parent), date); + katze_item_set_token (KATZE_ITEM (parent), token); katze_array_add_item (array, parent); } katze_array_add_item (parent, item); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5cfe5f55..88f2545d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2332,6 +2332,62 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); } +static void +midori_browser_model_remove_item (GtkTreeModel* model, + KatzeItem* item, + GtkTreeIter* iter) +{ + GtkTreeIter child_iter; + KatzeItem* child; + KatzeArray* parent; + gint i, n; + + if (KATZE_IS_ARRAY (item)) + { + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) + { + child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); + katze_array_remove_item (KATZE_ARRAY (item), child); + } + while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) + gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); + } + + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); + g_object_unref (item); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); +} + +static void +midori_browser_history_delete (MidoriBrowser* browser) +{ + GtkTreeView* treeview; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + GtkAction* location_action; + + treeview = GTK_TREE_VIEW (browser->panel_history); + if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + { + location_action = _action_by_name (browser, "Location"); + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_browser_model_remove_item (model, item, &iter); + midori_location_action_delete_item_from_uri ( + MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); + } +} + +static void +midori_browser_history_delete_activate_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + midori_browser_history_delete (browser); +} + static void midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) @@ -2377,10 +2433,15 @@ midori_browser_bookmark_popup (GtkWidget* widget, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); if (!history_item) + { midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL, item, midori_browser_bookmark_edit_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, - item, midori_browser_bookmark_delete_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, + item, midori_browser_bookmark_delete_activate_cb, browser); + } + else + midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, + item, midori_browser_history_delete_activate_cb, browser); sokoke_widget_popup (widget, GTK_MENU (menu), event, SOKOKE_MENU_POSITION_CURSOR); @@ -2525,35 +2586,6 @@ midori_panel_history_button_release_event_cb (GtkWidget* widget, return FALSE; } -static void -midori_browser_model_remove_item (GtkTreeModel* model, - KatzeItem* item, - GtkTreeIter* iter) -{ - GtkTreeIter child_iter; - KatzeItem* child; - KatzeArray* parent; - gint i, n; - - if (KATZE_IS_ARRAY (item)) - { - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); - katze_array_remove_item (KATZE_ARRAY (item), child); - } - while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) - gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); - } - - gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - g_object_unref (item); - - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); -} - static gboolean midori_panel_history_key_release_event_cb (GtkWidget* widget, GdkEventKey* event, @@ -2733,8 +2765,6 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { KatzeItem* item; - time_t date; - gchar datebuf[50]; char* sdate; gint age; @@ -2748,9 +2778,7 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, if (age > 7) { - date = (time_t)katze_item_get_added (item); - strftime (datebuf, sizeof (datebuf), "%Y-%m-%d", localtime (&date)); - g_object_set (renderer, "text", datebuf, NULL); + g_object_set (renderer, "text", katze_item_get_token (item), NULL); } else if (age > 6) { @@ -2965,21 +2993,7 @@ static void _action_history_delete_activate (GtkAction* action, MidoriBrowser* browser) { - GtkTreeView* treeview; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - GtkAction* location_action; - - treeview = GTK_TREE_VIEW (browser->panel_history); - if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) - { - location_action = _action_by_name (browser, "Location"); - gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_location_action_delete_item_from_uri ( - MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); - midori_browser_model_remove_item (model, item, &iter); - } + midori_browser_history_delete (browser); } static void @@ -3518,6 +3532,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, time_t date_; gint age; gint newage; + gchar token[50]; if (!katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) return; @@ -3550,8 +3565,10 @@ midori_browser_new_history_item (MidoriBrowser* browser, } if (!found) { + strftime (token, sizeof (token), "%Y-%m-%d", localtime (&now)); parent = katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_added (KATZE_ITEM (parent), now); + katze_item_set_token (KATZE_ITEM (parent), token); katze_array_add_item (browser->history, parent); katze_array_add_item (parent, item); _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 9a451549..dbf5c23d 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -15,6 +15,7 @@ #include "marshal.h" #include "sokoke.h" +#include #include #include diff --git a/midori/sokoke.c b/midori/sokoke.c index 861a3b5e..543b2630 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -663,35 +663,6 @@ sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, return FALSE; } -/** - * sokoke_same_day: - * @day1: a time_t timestamp value - * @day2: a time_t timestamp value - * - * Compares two timestamps to see if their values are on the - * same day. - * - * Return value: %TRUE if the day of the timestamps match. - **/ -gboolean -sokoke_same_day (const time_t* day1, - const time_t* day2) -{ - struct tm* tm1; - struct tm* tm2; - gboolean same; - - tm2 = localtime (day1); - tm1 = (struct tm*) g_memdup (tm2, sizeof (struct tm)); - tm2 = localtime (day2); - - same = (tm1->tm_year == tm2->tm_year && - tm1->tm_mon == tm2->tm_mon && - tm1->tm_mday == tm2->tm_mday) ? TRUE : FALSE; - g_free (tm1); - return same; -} - /** * sokoke_days_between: * @day1: a time_t timestamp value diff --git a/midori/sokoke.h b/midori/sokoke.h index d9230594..578e04ce 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -126,10 +126,6 @@ sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, GtkTreeModel** model, GtkTreeIter* iter); -gboolean -sokoke_same_day (const time_t* day1, - const time_t* day2); - gint sokoke_days_between (const time_t* day1, const time_t* day2); From 88474b45fb983b72d971f86d913efe9e9cba1583 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 11 Jan 2009 20:51:18 +0100 Subject: [PATCH 0638/2970] Destroy and set parent of Preferences from Diagnostic dialog --- midori/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index 2d0c7b08..c1d728f9 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1645,8 +1645,10 @@ static void button_modify_preferences_clicked_cb (GtkWidget* button, MidoriWebSettings* settings) { - GtkWidget* dialog = midori_preferences_new (NULL, settings); - gtk_dialog_run (GTK_DIALOG (dialog)); + GtkWidget* dialog = midori_preferences_new ( + GTK_WINDOW (gtk_widget_get_toplevel (button)), settings); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_DELETE_EVENT) + gtk_widget_destroy (dialog); } static void From e23ed6234e64d765aa7fd0aee06236fc330911b4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 11 Jan 2009 21:16:02 +0100 Subject: [PATCH 0639/2970] Show a dialog if Midori is running but not responding --- midori/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index c1d728f9..88ac4b35 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1958,6 +1958,8 @@ main (int argc, after a crash, so running a new window isn't a good idea. */ if (midori_app_instance_is_running (app)) { + GtkWidget* dialog; + /* TODO: Open as many tabs as we have uris, seperated by pipes */ if (uris) result = midori_app_instance_send_uris (app, uris); @@ -1967,8 +1969,12 @@ main (int argc, if (result) return 0; - g_print (_("An instance of Midori is already running but not responding.\n")); - /* FIXME: Show a dialog which allows killing the existing instance */ + dialog = gtk_message_dialog_new (NULL, + 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", + _("An instance of Midori is already running but not responding.\n")); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_DELETE_EVENT) + gtk_widget_destroy (dialog); + /* FIXME: Allow killing the existing instance */ return 1; } From 0d24549112b2c2656812a8dacb07e10bec208c5e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 12 Jan 2009 00:26:45 +0100 Subject: [PATCH 0640/2970] Display a message if a document cannot be displayed --- midori/midori-view.c | 46 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5d035569..847d7b9e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -26,6 +26,10 @@ #include #include +#ifndef WEBKIT_CHECK_VERSION + #define WEBKIT_CHECK_VERSION(a,b,c) 0 +#endif + /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); @@ -1037,6 +1041,10 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, gpointer decision, MidoriView* view) { + #if WEBKIT_CHECK_VERSION (1, 0, 0) + gchar* uri; + #endif + if (web_frame != webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) return FALSE; @@ -1045,7 +1053,25 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, g_object_notify (G_OBJECT (view), "mime-type"); /* TODO: Display contents with a Viewable if WebKit can't do it */ - /* TODO: Offer to download file if it cannot be displayed at all */ + /* TODO: Offer downloading file if it cannot be displayed at all */ + + #if WEBKIT_CHECK_VERSION (1, 1, 0) + if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) + #else + if (g_str_has_prefix (mime_type, "image/") || + g_strrstr (mime_type, "script") || + g_str_has_prefix (mime_type, "text/") || g_strrstr (mime_type, "xml")) + #endif + return TRUE; + + #if WEBKIT_CHECK_VERSION (1, 0, 0) + uri = g_strdup_printf ("error:nodisplay %s", + webkit_network_request_get_uri (request)); + midori_view_set_uri (view, uri); + g_free (uri); + #else + midori_view_set_uri (view, "error:nodisplay "); + #endif return TRUE; } @@ -1525,7 +1551,23 @@ midori_view_set_uri (MidoriView* view, if (g_str_has_prefix (uri, "error:")) { data = NULL; - if (!strncmp (uri, "error:nodocs ", 13)) + if (!strncmp (uri, "error:nodisplay ", 16)) + { + gchar* title; + + katze_assign (view->uri, g_strdup (&uri[16])); + title = g_strdup_printf (_("Document cannot be displayed")); + data = g_strdup_printf ( + "%s" + "

%s

" + "" + "

The document %s cannot be displayed." + "", + title, title, view->uri); + g_free (title); + } + else if (!strncmp (uri, "error:nodocs ", 13)) { gchar* title; From c2f33d01b6d7a34766138eb6a58b29a76e24dc02 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 12 Jan 2009 03:17:37 +0100 Subject: [PATCH 0641/2970] Add Show a dialog after Midori crashes to Preferences --- midori/main.c | 3 ++- midori/midori-preferences.c | 4 +++- midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index 88ac4b35..31a3e06c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -2180,7 +2180,8 @@ main (int argc, /* We test for the presence of a dummy file which is created once and deleted during normal runtime, but persists in case of a crash. */ katze_assign (config_file, build_config_filename ("running")); - if (g_file_test (config_file, G_FILE_TEST_EXISTS)) + if (katze_object_get_boolean (settings, "show-crash-dialog") + && g_file_test (config_file, G_FILE_TEST_EXISTS)) { GtkWidget* dialog = midori_create_diagnostic_dialog (settings, _session); gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index b825a459..f067ca25 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -368,7 +368,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "General" */ PAGE_NEW (GTK_STOCK_HOME, _("General")); FRAME_NEW (_("Startup")); - TABLE_NEW (2, 2); + TABLE_NEW (3, 2); label = katze_property_label (settings, "load-on-startup"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "load-on-startup", NULL); @@ -378,6 +378,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* TODO: We need something like "use current website" */ entry = katze_property_proxy (settings, "homepage", NULL); FILLED_ADD (entry, 1, 2, 1, 2); + button = katze_property_proxy (settings, "show-crash-dialog", "blurb"); + SPANNED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (3, 2); label = katze_property_label (settings, "download-folder"); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 39d6e175..b0e5607f 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -43,6 +43,7 @@ struct _MidoriWebSettings MidoriStartup load_on_startup; gchar* homepage; + gboolean show_crash_dialog; gchar* download_folder; gchar* download_manager; gchar* text_editor; @@ -103,6 +104,7 @@ enum PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, + PROP_SHOW_CRASH_DIALOG, PROP_DOWNLOAD_FOLDER, PROP_DOWNLOAD_MANAGER, PROP_TEXT_EDITOR, @@ -422,6 +424,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "http://www.google.com", flags)); + /** + * MidoriWebSettings:show-crash-dialog: + * + * Show a dialog after Midori crashed. + * + * Since: 0.1.2 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_CRASH_DIALOG, + g_param_spec_boolean ( + "show-crash-dialog", + _("Show crash dialog"), + _("Show a dialog after Midori crashed"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_DOWNLOAD_FOLDER, g_param_spec_string ( @@ -886,6 +904,9 @@ midori_web_settings_set_property (GObject* object, case PROP_HOMEPAGE: katze_assign (web_settings->homepage, g_value_dup_string (value)); break; + case PROP_SHOW_CRASH_DIALOG: + web_settings->show_crash_dialog = g_value_get_boolean (value); + break; case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; @@ -1055,6 +1076,9 @@ midori_web_settings_get_property (GObject* object, case PROP_HOMEPAGE: g_value_set_string (value, web_settings->homepage); break; + case PROP_SHOW_CRASH_DIALOG: + g_value_set_boolean (value, web_settings->show_crash_dialog); + break; case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); break; From 3520fff9230730b1c3f2dc016b6bd0ca5d7f91dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 12 Jan 2009 21:17:38 +0100 Subject: [PATCH 0642/2970] Fix signal prototypes and translation typos --- katze/katze-utils.c | 6 ++---- po/de.po | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index fa685d03..02960b79 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -51,14 +51,13 @@ proxy_uri_file_set_cb (GtkFileChooser* button, g_object_set (object, property, file, NULL); } -static gchar* +static void proxy_combo_box_text_changed_cb (GtkComboBox* button, GObject* object) { gchar* text = gtk_combo_box_get_active_text (button); const gchar* property = g_object_get_data (G_OBJECT (button), "property"); g_object_set (object, property, text, NULL); - return FALSE; } static void @@ -81,7 +80,7 @@ proxy_entry_focus_out_event_cb (GtkEntry* entry, return FALSE; } -static gboolean +static void proxy_spin_button_changed_cb (GtkSpinButton* button, GObject* object) { @@ -98,7 +97,6 @@ proxy_spin_button_changed_cb (GtkSpinButton* button, gdouble value = gtk_spin_button_get_value (button); g_object_set (object, property, value, NULL); } - return FALSE; } static void diff --git a/po/de.po b/po/de.po index b385578a..33b2d403 100644 --- a/po/de.po +++ b/po/de.po @@ -176,7 +176,7 @@ msgid "" "to open this location:" msgstr "" "Ein Benutzername und ein Kennwort\n" -"werden zum öffnen dieses Ortes benötigt:" +"werden zum Öffnen dieses Ortes benötigt:" #: ../midori/main.c:1560 msgid "Username" @@ -304,7 +304,7 @@ msgstr "_Titel:" #: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 msgid "_Description:" -msgstr "_Beschreibung" +msgstr "_Beschreibung:" #: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 msgid "_Address:" From 39d2b36b0059482f340ad6ab0eb850397b5364b3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 12 Jan 2009 21:23:32 +0100 Subject: [PATCH 0643/2970] Always define HAVE_FOO for unique, libsoup and sqlite --- wscript | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wscript b/wscript index a124cad1..cccd3f82 100644 --- a/wscript +++ b/wscript @@ -113,6 +113,7 @@ def configure (conf): Utils.pprint ('RED', 'Please use an older or newer version.') else: option_checkfatal ('unique', 'single instance') + conf.define ('HAVE_UNIQUE', 0) single_instance = 'no' conf.check_message_custom ('single instance', 'support', single_instance) @@ -122,6 +123,8 @@ def configure (conf): libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] else: option_checkfatal ('libsoup', 'libsoup') + conf.define ('HAVE_LIBSOUP', 0) + conf.define ('HAVE_LIBSOUP_2_25_2', 0) libsoup = 'no' conf.check_message_custom ('libsoup', 'support', libsoup) @@ -130,6 +133,7 @@ def configure (conf): sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] else: option_checkfatal ('sqlite', 'history database') + conf.define ('HAVE_SQLITE', 0) sqlite = 'no' conf.check_message_custom ('history database', 'support', sqlite) From 6e11fad8656f83368a340af7ef853d0b1dfab9c1 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Mon, 12 Jan 2009 21:27:05 +0100 Subject: [PATCH 0644/2970] Correct titled case in Manage Search Engines dialog --- midori/midori-searchaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index dbf5c23d..3d8d8ded 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1050,7 +1050,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) if (search_action->dialog) return search_action->dialog; - dialog_title = _("Manage search engines"); + dialog_title = _("Manage Search Engines"); toplevel = gtk_widget_get_toplevel (search_action->last_proxy); dialog = gtk_dialog_new_with_buttons (dialog_title, toplevel ? GTK_WINDOW (toplevel) : NULL, From a82dfb3f40af0751f6828b93cbd52ee8c89ed3bd Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Mon, 12 Jan 2009 21:52:33 +0100 Subject: [PATCH 0645/2970] Add 2px space between tool buttons --- AUTHORS | 1 + midori/midori-browser.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/AUTHORS b/AUTHORS index 68f24229..6535fe07 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,7 @@ Contributors: Anders F Björklund Alexander Hesse Brian Vuyk + Nick Schermer Graphics: extension: Nancy Runge diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 88f2545d..8d9bbf15 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1261,6 +1261,15 @@ midori_browser_class_init (MidoriBrowserClass* class) "The list of history items", KATZE_TYPE_ARRAY, flags)); + + /* Add 2px space between tool buttons */ + gtk_rc_parse_string ( + "style \"tool-button-style\"\n {\n" + "GtkToolButton::icon-spacing = 2\n }\n" + "widget \"MidoriBrowser.*.MidoriBookmarkbar.Gtk*ToolButton\" " + "style \"tool-button-style\"\n" + "widget \"MidoriBrowser.*.MidoriFindbar.Gtk*ToolButton\" " + "style \"tool-button-style\"\n"); } static void @@ -3883,6 +3892,7 @@ midori_browser_init (MidoriBrowser* browser) /* Bookmarkbar */ browser->bookmarkbar = gtk_toolbar_new (); + gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar"); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), @@ -4030,6 +4040,7 @@ midori_browser_init (MidoriBrowser* browser) /* Incremental findbar */ browser->find = gtk_toolbar_new (); + gtk_widget_set_name (browser->find, "MidoriFindbar"); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ); toolitem = gtk_tool_item_new (); From 2376e20f4ccd529cd681df7704ee8a9539930cfb Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Mon, 12 Jan 2009 22:58:15 +0100 Subject: [PATCH 0646/2970] Add Danish translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/da.po | 1474 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1476 insertions(+), 1 deletion(-) create mode 100644 po/da.po diff --git a/AUTHORS b/AUTHORS index 6535fe07..9cea5ec6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,6 +21,7 @@ Graphics: logo-shade: Nancy Runge Translations: + da: Per Kongstad de: Enrico Tröger de: Christian Dywan el: Evaggelos Balaskas diff --git a/po/LINGUAS b/po/LINGUAS index 3a42c776..0754d608 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de el en_GB es et fi fr gl hu id ja nl pl pt_PT ru sv tr uk +da de el en_GB es et fi fr gl hu id ja nl pl pt_PT ru sv tr uk diff --git a/po/da.po b/po/da.po new file mode 100644 index 00000000..2c2e8e57 --- /dev/null +++ b/po/da.po @@ -0,0 +1,1474 @@ +# Danish translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Per Kongstad 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-20 19:49+0100\n" +"PO-Revision-Date: 2009-01-04 13:08+0100\n" +"Last-Translator: Per Kongstad \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Letvægts-webbrowser" + +#: ../midori.desktop.in.h:2 +#: ../midori/main.c:1703 +#: ../midori/main.c:1712 +#: ../midori/main.c:1723 +#: ../midori/main.c:1747 +#: ../midori/midori-websettings.c:234 +msgid "Midori" +msgstr "Midori" + +#: ../midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Webbrowser" + +#: ../midori/main.c:87 +msgid "_Bookmark" +msgstr "_Bogmærke" + +#: ../midori/main.c:88 +#: ../midori/midori-browser.c:3743 +msgid "_Bookmarks" +msgstr "_Bogmærker" + +#: ../midori/main.c:89 +msgid "_Add Bookmark" +msgstr "_Tilføj bogmærke" + +#: ../midori/main.c:90 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/main.c:91 +msgid "_Extensions" +msgstr "_Udvidelser" + +#: ../midori/main.c:92 +msgid "_History" +msgstr "_Historik" + +#: ../midori/main.c:93 +msgid "_Homepage" +msgstr "_Hjemmeside" + +#: ../midori/main.c:94 +msgid "_Userscripts" +msgstr "_Brugerskripter" + +#: ../midori/main.c:95 +msgid "User_styles" +msgstr "Bruger_grænseflader" + +#: ../midori/main.c:96 +msgid "New _Tab" +msgstr "Nyt _faneblad" + +#: ../midori/main.c:97 +msgid "_Transfers" +msgstr "_Overførsler" + +#: ../midori/main.c:98 +msgid "_Closed Tabs and Windows" +msgstr "_Lukkede faneblade og vinduer" + +#: ../midori/main.c:99 +msgid "New _Window" +msgstr "Nyt _vindue" + +#: ../midori/main.c:155 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Indstillingen kunne ikke indlæses: %s\n" + +#: ../midori/main.c:210 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Værdien '%s' er ikke gyldig til %s" + +#: ../midori/main.c:217 +#: ../midori/main.c:287 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Ugyldig indstillingsværdi '%s'" + +#: ../midori/main.c:529 +msgid "File not found." +msgstr "Fil blev ikke fundet." + +#: ../midori/main.c:537 +#: ../midori/main.c:546 +msgid "Malformed document." +msgstr "Misdannet dokument." + +#: ../midori/main.c:568 +#: ../midori/main.c:600 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Kunne ikke åbne databasen: %s\n" + +#: ../midori/main.c:654 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kunne ikke fjerne historikelementet: %s\n" + +#: ../midori/main.c:678 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Kunne ikke rydde historikken: %s\n" + +#: ../midori/main.c:711 +#: ../midori/main.c:725 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Kunne ikke tilføje historikelementet: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:841 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" + +#: ../midori/main.c:869 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Indstillingen kunne ikke gemmes. %s" + +#: ../midori/main.c:897 +#: ../midori/main.c:915 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Søgemaskinerne kunne ikke gemmes. %s" + +#: ../midori/main.c:1045 +#: ../midori/sokoke.c:479 +#, c-format +msgid "Writing failed." +msgstr "Skrivning fejlede." + +#: ../midori/main.c:1065 +#: ../midori/main.c:1082 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Bogmærkerne kunne ikke gemmes. %s" + +#: ../midori/main.c:1101 +#: ../midori/main.c:1125 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Papirkurven kunne ikke fyldes. %s" + +#: ../midori/main.c:1146 +#: ../midori/midori-preferences.c:381 +msgid "Transfers" +msgstr "Overførsler" + +#: ../midori/main.c:1182 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sessionen kunne ikke gemmes. %s" + +#: ../midori/main.c:1508 +msgid "Authentication Required" +msgstr "Godkendelse påkrævet" + +#: ../midori/main.c:1524 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Et brugernavn samt en adgangskode er påkrævet\n" +"for at åbne dette sted:" + +#: ../midori/main.c:1538 +msgid "Username" +msgstr "Brugernavn" + +#: ../midori/main.c:1549 +msgid "Password" +msgstr "Adgangskode" + +#: ../midori/main.c:1654 +msgid "Run the specified filename as javascript" +msgstr "Kør det angivne filnavn som javascript" + +#: ../midori/main.c:1656 +msgid "Display program version" +msgstr "Vis programversion" + +#: ../midori/main.c:1658 +msgid "URIs" +msgstr "URI'erne" + +#: ../midori/main.c:1700 +msgid "[URIs]" +msgstr "[URI'erne]" + +#: ../midori/main.c:1724 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Rapportér venligst kommentarer, forslag og fejl til:" + +#: ../midori/main.c:1726 +msgid "Check for new versions at:" +msgstr "Tjek for nye versioner hos:" + +#: ../midori/main.c:1747 +msgid "No filename specified" +msgstr "Intet filnavn givet" + +#: ../midori/main.c:1766 +#, c-format +msgid "An instance of Midori is already running but not responding.\n" +msgstr "En instans af Midori kører allerede men reagerer ikke.\n" + +#: ../midori/main.c:1825 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Bogmærkerne kunne ikke indlæses: %s\n" + +#: ../midori/main.c:1840 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sessionen kunne ikke indlæses: %s\n" + +#: ../midori/main.c:1853 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Papirkurven kunne ikke indlæses: %s\n" + +#: ../midori/main.c:1866 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Historikken kunne ikke indlæses: %s\n" + +#: ../midori/main.c:1878 +msgid "The following errors occured:" +msgstr "De følgende fejl opstod:" + +#: ../midori/main.c:1894 +msgid "_Ignore" +msgstr "_Ignorér" + +#: ../midori/main.c:1967 +msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette sker gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." + +#: ../midori/main.c:1982 +msgid "Modify _preferences" +msgstr "Ændre _indstillinger" + +#: ../midori/main.c:1986 +msgid "Reset the last _session" +msgstr "Nulstil den sidste _session" + +#: ../midori/main.c:1991 +msgid "Disable all _extensions" +msgstr "Slå alle _udvidelser fra" + +#: ../midori/midori-browser.c:249 +#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3137 +msgid "Reload the current page" +msgstr "Genindlæs nuværende side" + +#: ../midori/midori-browser.c:261 +#: ../midori/midori-browser.c:3134 +msgid "Stop loading the current page" +msgstr "Stop indlæsning af nuværende side" + +#: ../midori/midori-browser.c:319 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% indlæst" + +#: ../midori/midori-browser.c:342 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Uventet handling '%s'." + +#: ../midori/midori-browser.c:508 +msgid "New bookmark" +msgstr "Nyt bogmærke" + +#: ../midori/midori-browser.c:508 +msgid "Edit bookmark" +msgstr "Redigér bogmærke" + +#: ../midori/midori-browser.c:530 +msgid "_Title:" +msgstr "_Titel:" + +#: ../midori/midori-browser.c:543 +#: ../midori/midori-searchaction.c:868 +msgid "_Description:" +msgstr "_Beskrivelse:" + +#: ../midori/midori-browser.c:562 +#: ../midori/midori-searchaction.c:882 +msgid "_URL:" +msgstr "_URL:" + +#: ../midori/midori-browser.c:578 +msgid "_Folder:" +msgstr "_Mappe:" + +#: ../midori/midori-browser.c:582 +msgid "Root" +msgstr "Rod" + +#: ../midori/midori-browser.c:668 +msgid "Save file as" +msgstr "Gem fil som" + +#: ../midori/midori-browser.c:1248 +msgid "Open file" +msgstr "Åbn fil" + +#: ../midori/midori-browser.c:2328 +msgid "Open in New _Tab" +msgstr "Åbn i nyt _faneblad" + +#: ../midori/midori-browser.c:2330 +msgid "Open in New _Window" +msgstr "Åbn i nyt _vindue" + +#: ../midori/midori-browser.c:2605 +msgid "Separator" +msgstr "Separator" + +#: ../midori/midori-browser.c:2716 +#, c-format +msgid "A week ago" +msgstr "For en uge siden" + +#: ../midori/midori-browser.c:2722 +#, c-format +msgid "%d days ago" +msgstr "For %d dage siden" + +#: ../midori/midori-browser.c:2729 +msgid "Today" +msgstr "I dag" + +#: ../midori/midori-browser.c:2731 +msgid "Yesterday" +msgstr "I går" + +#: ../midori/midori-browser.c:2820 +msgid "A lightweight web browser." +msgstr "En letvægt-webbrowser." + +#: ../midori/midori-browser.c:2828 +msgid "translator-credits" +msgstr "" +"Per Kongstad \n" +"\n" +"Dansk-gruppen \n" +"Mere info: http://www.dansk-gruppen.dk" + +#: ../midori/midori-browser.c:2962 +msgid "Are you sure you want to remove all history items?" +msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" + +#: ../midori/midori-browser.c:3065 +msgid "_File" +msgstr "_Fil" + +#: ../midori/midori-browser.c:3068 +msgid "Open a new window" +msgstr "Åbn et nyt vindue" + +#: ../midori/midori-browser.c:3071 +msgid "Open a new tab" +msgstr "Åbn et nyt faneblad" + +#: ../midori/midori-browser.c:3074 +msgid "Open a file" +msgstr "Åbn en fil" + +#: ../midori/midori-browser.c:3077 +msgid "Save to a file" +msgstr "Gem til en fil" + +#: ../midori/midori-browser.c:3079 +msgid "_Close Tab" +msgstr "_Luk faneblad" + +#: ../midori/midori-browser.c:3080 +msgid "Close the current tab" +msgstr "Luk nuværende faneblad" + +#: ../midori/midori-browser.c:3082 +msgid "C_lose Window" +msgstr "L_uk vinduet" + +#: ../midori/midori-browser.c:3083 +msgid "Close this window" +msgstr "Luk dette vindue" + +#: ../midori/midori-browser.c:3086 +msgid "Print the current page" +msgstr "Udskriv nuværende side" + +#: ../midori/midori-browser.c:3089 +msgid "Quit the application" +msgstr "Afslut programmet" + +#: ../midori/midori-browser.c:3091 +msgid "_Edit" +msgstr "_Redigér" + +#: ../midori/midori-browser.c:3094 +msgid "Cut the selected text" +msgstr "Udklip markeret tekst" + +#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3100 +msgid "Copy the selected text" +msgstr "Kopiér markeret tekst" + +#: ../midori/midori-browser.c:3103 +msgid "Paste text from the clipboard" +msgstr "Indsæt tekst fra klippebordet" + +#: ../midori/midori-browser.c:3106 +msgid "Delete the selected text" +msgstr "Slet markeret tekst" + +#: ../midori/midori-browser.c:3109 +msgid "Select all text" +msgstr "Markér hele teksten" + +#: ../midori/midori-browser.c:3112 +msgid "Find a word or phrase in the page" +msgstr "Find et ord eller sætning på siden" + +#: ../midori/midori-browser.c:3114 +msgid "Find _Next" +msgstr "Find _næste" + +#: ../midori/midori-browser.c:3115 +msgid "Find the next occurrence of a word or phrase" +msgstr "Find næste forekomst af et ord eller sætning" + +#: ../midori/midori-browser.c:3117 +msgid "Find _Previous" +msgstr "Find _forrige" + +#: ../midori/midori-browser.c:3118 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Find forrige forekomst af et ord eller sætning" + +#: ../midori/midori-browser.c:3121 +msgid "_Quick Find" +msgstr "_Find hurtigt" + +#: ../midori/midori-browser.c:3122 +msgid "Quickly jump to a word or phrase" +msgstr "Hop hurtigt til et ord eller sætning" + +#: ../midori/midori-browser.c:3125 +msgid "Configure the application preferences" +msgstr "Indstil programindstillingerne" + +#: ../midori/midori-browser.c:3127 +msgid "_View" +msgstr "_Vis" + +#: ../midori/midori-browser.c:3128 +msgid "_Toolbars" +msgstr "_Værktøjsbjælker" + +#: ../midori/midori-browser.c:3140 +msgid "Increase the zoom level" +msgstr "Forøg forstørrelsesniveauet" + +#: ../midori/midori-browser.c:3143 +msgid "Decrease the zoom level" +msgstr "Formindsk forstørrelsesniveauet" + +#: ../midori/midori-browser.c:3146 +msgid "Reset the zoom level" +msgstr "Nulstil forstørrelsesniveauet" + +#: ../midori/midori-browser.c:3148 +#: ../midori/midori-view.c:1004 +msgid "View _Source" +msgstr "Vis _kilde" + +#: ../midori/midori-browser.c:3149 +msgid "View the source code of the page" +msgstr "Vis kildekode for siden" + +#: ../midori/midori-browser.c:3151 +msgid "View Selection Source" +msgstr "Vis kilde for markerede" + +#: ../midori/midori-browser.c:3152 +msgid "View the source code of the selection" +msgstr "Vis kildekode for markering" + +#: ../midori/midori-browser.c:3156 +msgid "Toggle fullscreen view" +msgstr "Slå fuldskærmstilstande til/fra" + +#: ../midori/midori-browser.c:3158 +msgid "_Go" +msgstr "_Gå til" + +#: ../midori/midori-browser.c:3161 +msgid "Go back to the previous page" +msgstr "Gå til forrige side" + +#: ../midori/midori-browser.c:3164 +msgid "Go forward to the next page" +msgstr "Gå til næste side" + +#: ../midori/midori-browser.c:3167 +msgid "Go to your homepage" +msgstr "Gå til din hjemmeside" + +#: ../midori/midori-browser.c:3169 +msgid "Empty Trash" +msgstr "Tøm papirkurven" + +#: ../midori/midori-browser.c:3170 +msgid "Delete the contents of the trash" +msgstr "Slet indhold af papirkurven" + +#: ../midori/midori-browser.c:3172 +#: ../midori/midori-view.c:976 +msgid "Undo Close Tab" +msgstr "Fortryd luk faneblad" + +#: ../midori/midori-browser.c:3173 +msgid "Open the last closed tab" +msgstr "Åbn sidste lukkede faneblad" + +#: ../midori/midori-browser.c:3177 +msgid "Add a new bookmark" +msgstr "Tilføj et nyt bogmærke" + +#: ../midori/midori-browser.c:3180 +msgid "Edit the selected bookmark" +msgstr "Redigér det valgte bogmærke" + +#: ../midori/midori-browser.c:3183 +msgid "Delete the selected bookmark" +msgstr "Slet det valgte bogmærke" + +#: ../midori/midori-browser.c:3186 +msgid "Delete the selected history item" +msgstr "Slet det valgte historikelement" + +#: ../midori/midori-browser.c:3189 +msgid "Clear the entire history" +msgstr "Ryd hele historikken" + +#: ../midori/midori-browser.c:3192 +msgid "Bookmark the selected history item" +msgstr "Bogmærk det valgte historikelement" + +#: ../midori/midori-browser.c:3194 +msgid "_Tools" +msgstr "_Værktøjer" + +#: ../midori/midori-browser.c:3196 +#: ../midori/midori-searchaction.c:496 +msgid "_Manage Search Engines" +msgstr "_Håndtér søgemaskiner" + +#: ../midori/midori-browser.c:3197 +msgid "Add, edit and remove search engines..." +msgstr "Tilføj, redigér og fjern søgemaskiner..." + +#: ../midori/midori-browser.c:3201 +msgid "_Previous Tab" +msgstr "_Forrige faneblad" + +#: ../midori/midori-browser.c:3202 +msgid "Switch to the previous tab" +msgstr "Skift til det forrige faneblad" + +#: ../midori/midori-browser.c:3204 +msgid "_Next Tab" +msgstr "_Næste faneblad" + +#: ../midori/midori-browser.c:3205 +msgid "Switch to the next tab" +msgstr "Skift til det næste faneblad" + +#: ../midori/midori-browser.c:3207 +msgid "_Help" +msgstr "_Hjælp" + +#: ../midori/midori-browser.c:3209 +msgid "_Contents" +msgstr "_Indhold" + +#: ../midori/midori-browser.c:3210 +msgid "Show the documentation" +msgstr "Vis dokumentationen" + +#: ../midori/midori-browser.c:3212 +msgid "_Frequent questions" +msgstr "_Ofte stillede spørgsmål" + +#: ../midori/midori-browser.c:3213 +msgid "Show the Frequently Asked Questions" +msgstr "Vis ofte stillede spørgsmål" + +#: ../midori/midori-browser.c:3215 +msgid "_Report a bug" +msgstr "_Rapportér en fejl" + +#: ../midori/midori-browser.c:3216 +msgid "Open Midori's bug tracker" +msgstr "Åbn Midoris fejlsystem" + +#: ../midori/midori-browser.c:3219 +msgid "Show information about the program" +msgstr "Vis information om dette program" + +#: ../midori/midori-browser.c:3226 +msgid "P_rivate Browsing" +msgstr "P_rivat browsing" + +#: ../midori/midori-browser.c:3227 +msgid "Don't save any private data while browsing" +msgstr "Undlad at gemme private data under browsing" + +#: ../midori/midori-browser.c:3232 +msgid "_Menubar" +msgstr "_Menubjælke" + +#: ../midori/midori-browser.c:3233 +msgid "Show menubar" +msgstr "Vis menubjælke" + +#: ../midori/midori-browser.c:3236 +msgid "_Navigationbar" +msgstr "_Navigeringsbjælke" + +#: ../midori/midori-browser.c:3237 +msgid "Show navigationbar" +msgstr "Vis navigeringsbjælke" + +#: ../midori/midori-browser.c:3240 +msgid "Side_panel" +msgstr "Side_panel" + +#: ../midori/midori-browser.c:3241 +msgid "Show sidepanel" +msgstr "Vis sidepanel" + +#: ../midori/midori-browser.c:3244 +msgid "_Bookmarkbar" +msgstr "_Bogmærkebjælke" + +#: ../midori/midori-browser.c:3245 +msgid "Show bookmarkbar" +msgstr "Vis bogmærkebjælke" + +#: ../midori/midori-browser.c:3248 +msgid "_Transferbar" +msgstr "_Overførselsbjælke" + +#: ../midori/midori-browser.c:3249 +msgid "Show transferbar" +msgstr "Vis overførselsbjælke" + +#: ../midori/midori-browser.c:3252 +msgid "_Statusbar" +msgstr "_Statusbjælke" + +#: ../midori/midori-browser.c:3253 +msgid "Show statusbar" +msgstr "Vis statusbjælke" + +#: ../midori/midori-browser.c:3668 +msgid "_Location..." +msgstr "_Sted..." + +#: ../midori/midori-browser.c:3670 +msgid "Open a particular location" +msgstr "Åbn et særligt sted" + +#: ../midori/midori-browser.c:3694 +msgid "_Web Search..." +msgstr "_Websøgning..." + +#: ../midori/midori-browser.c:3696 +msgid "Run a web search" +msgstr "Kør en websøgnig" + +#: ../midori/midori-browser.c:3715 +msgid "Reopen a previously closed tab or window" +msgstr "Genåbn et tidligere lukket faneblad eller vindue" + +#: ../midori/midori-browser.c:3728 +msgid "_Recently visited pages" +msgstr "_Nyligt besøgte sider" + +#: ../midori/midori-browser.c:3730 +msgid "Reopen pages that you visited earlier" +msgstr "Genåbn sider som du tidligere har besøgt" + +#: ../midori/midori-browser.c:3745 +msgid "Show the saved bookmarks" +msgstr "Vis gemte bogmærker" + +#: ../midori/midori-browser.c:3758 +msgid "_Window" +msgstr "_Vindue" + +#: ../midori/midori-browser.c:3760 +msgid "Show a list of all open tabs" +msgstr "Vis en liste med alle åbne faneblade" + +#: ../midori/midori-browser.c:3882 +msgid "Bookmarks" +msgstr "Bogmærker" + +#: ../midori/midori-browser.c:3925 +#: ../midori/midori-preferences.c:579 +msgid "History" +msgstr "Historik" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3968 +msgid "_Inline find:" +msgstr "_Indlejret søgning:" + +#: ../midori/midori-browser.c:3999 +msgid "Match Case" +msgstr "Versalfølsom" + +#: ../midori/midori-browser.c:4007 +msgid "Highlight Matches" +msgstr "Fremhæv fundne" + +#: ../midori/midori-browser.c:4016 +msgid "Close Findbar" +msgstr "Luk søgebjælke" + +#: ../midori/midori-browser.c:4264 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Uventet indstilling '%s'" + +#: ../midori/midori-panel.c:223 +#: ../midori/midori-panel.c:224 +msgid "Close panel" +msgstr "Luk panel" + +#: ../midori/midori-websettings.c:144 +#: ../midori/midori-view.c:1643 +msgid "Blank page" +msgstr "Blank side" + +#: ../midori/midori-websettings.c:145 +#: ../midori/midori-websettings.c:419 +msgid "Homepage" +msgstr "Hjemmeside" + +#: ../midori/midori-websettings.c:146 +msgid "Last open pages" +msgstr "Sidste åbne sider" + +#: ../midori/midori-websettings.c:161 +msgid "Chinese (BIG5)" +msgstr "Kinesisk (BIG5)" + +#: ../midori/midori-websettings.c:162 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japansk (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:163 +msgid "Russian (KOI8-R)" +msgstr "Russisk (KOI8-R)" + +#: ../midori/midori-websettings.c:164 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:165 +msgid "Western (ISO-8859-1)" +msgstr "Vestlig (ISO-8859-1)" + +#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:238 +msgid "Custom..." +msgstr "Tilpasset..." + +#: ../midori/midori-websettings.c:181 +msgid "New tab" +msgstr "Nyt faneblad" + +#: ../midori/midori-websettings.c:182 +msgid "New window" +msgstr "Nyt vindue" + +#: ../midori/midori-websettings.c:183 +msgid "Current tab" +msgstr "Nuværende faneblad" + +#: ../midori/midori-websettings.c:198 +msgid "Default" +msgstr "Standard" + +#: ../midori/midori-websettings.c:199 +msgid "Icons" +msgstr "Ikoner" + +#: ../midori/midori-websettings.c:200 +msgid "Text" +msgstr "Tekst" + +#: ../midori/midori-websettings.c:201 +msgid "Both" +msgstr "Begge" + +#: ../midori/midori-websettings.c:202 +msgid "Both horizontal" +msgstr "Begge vandrette" + +#: ../midori/midori-websettings.c:217 +msgid "All cookies" +msgstr "Alle cookies" + +#: ../midori/midori-websettings.c:218 +msgid "Session cookies" +msgstr "Session-cookies" + +#: ../midori/midori-websettings.c:219 +#: ../panels/midori-addons.c:97 +msgid "None" +msgstr "Ingen" + +#: ../midori/midori-websettings.c:235 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:236 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:237 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:278 +msgid "Remember last window size" +msgstr "Husk sidste vinduesstørrelse" + +#: ../midori/midori-websettings.c:279 +msgid "Whether to save the last window size" +msgstr "Skal sidste vinduesstørrelse gemmes" + +#: ../midori/midori-websettings.c:287 +msgid "Last window width" +msgstr "Sidste vinduesbredde" + +#: ../midori/midori-websettings.c:288 +msgid "The last saved window width" +msgstr "Sidste gemte vinduesbredde" + +#: ../midori/midori-websettings.c:296 +msgid "Last window height" +msgstr "Sidste vindueshøjde" + +#: ../midori/midori-websettings.c:297 +msgid "The last saved window height" +msgstr "Sidste gemte vindueshøjde" + +#: ../midori/midori-websettings.c:305 +msgid "Last panel position" +msgstr "Sidste panelplacering" + +#: ../midori/midori-websettings.c:306 +msgid "The last saved panel position" +msgstr "Sidste gemte panelplacering" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:315 +msgid "Last panel page" +msgstr "Sidste panelside" + +#: ../midori/midori-websettings.c:316 +msgid "The last saved panel page" +msgstr "Sidste gemte panelside" + +#: ../midori/midori-websettings.c:324 +msgid "Last Web search" +msgstr "Sidste websøgning" + +#: ../midori/midori-websettings.c:325 +msgid "The last saved Web search" +msgstr "Den sidste gemte websøgning" + +#: ../midori/midori-websettings.c:334 +msgid "Show Menubar" +msgstr "Vis menubjælke" + +#: ../midori/midori-websettings.c:335 +msgid "Whether to show the menubar" +msgstr "Om menubjælke vises" + +#: ../midori/midori-websettings.c:343 +msgid "Show Navigationbar" +msgstr "Vis navigeringsbjælke" + +#: ../midori/midori-websettings.c:344 +msgid "Whether to show the navigationbar" +msgstr "Om navigeringsbjælke vises" + +#: ../midori/midori-websettings.c:352 +msgid "Show Bookmarkbar" +msgstr "Vis bogmærkebjælke" + +#: ../midori/midori-websettings.c:353 +msgid "Whether to show the bookmarkbar" +msgstr "Om bogmærkebjælke vises" + +#: ../midori/midori-websettings.c:361 +msgid "Show Panel" +msgstr "Vis panel" + +#: ../midori/midori-websettings.c:362 +msgid "Whether to show the panel" +msgstr "Om panel vises" + +#: ../midori/midori-websettings.c:370 +msgid "Show Statusbar" +msgstr "Vis statusbjælke" + +#: ../midori/midori-websettings.c:371 +msgid "Whether to show the statusbar" +msgstr "Om statusbjælke vises" + +#: ../midori/midori-websettings.c:380 +msgid "Toolbar Style" +msgstr "Værktøjsbjælkestil" + +#: ../midori/midori-websettings.c:381 +msgid "The style of the toolbar" +msgstr "Stilen for værktøjsbjælke" + +#: ../midori/midori-websettings.c:390 +msgid "Toolbar Items" +msgstr "Værktøjsbjælkes elementer" + +#: ../midori/midori-websettings.c:391 +msgid "The items to show on the toolbar" +msgstr "Elementer der vises på værktøjsbjælken" + +#: ../midori/midori-websettings.c:399 +msgid "Compact Sidepanel" +msgstr "Kompakt sidepanel" + +#: ../midori/midori-websettings.c:400 +msgid "Whether to make the sidepanel compact" +msgstr "Om sidepanelet skal være kompakt" + +#: ../midori/midori-websettings.c:409 +msgid "Load on Startup" +msgstr "Indlæs ved opstart" + +#: ../midori/midori-websettings.c:410 +msgid "What to load on startup" +msgstr "Hvad der skal indlæses under opstart" + +#: ../midori/midori-websettings.c:420 +msgid "The homepage" +msgstr "Hjemmesiden" + +#: ../midori/midori-websettings.c:428 +msgid "Download Folder" +msgstr "Download-mappen" + +#: ../midori/midori-websettings.c:429 +msgid "The folder downloaded files are saved to" +msgstr "Mappen hvor downloadede filer skal gemmes" + +#: ../midori/midori-websettings.c:437 +msgid "Download Manager" +msgstr "Håndtering for download" + +#: ../midori/midori-websettings.c:438 +msgid "An external download manager" +msgstr "En ekstern håndtering for download" + +#: ../midori/midori-websettings.c:446 +msgid "Text Editor" +msgstr "Tekstbehandler" + +#: ../midori/midori-websettings.c:447 +msgid "An external text editor" +msgstr "En ekstern tekstbehandler" + +#: ../midori/midori-websettings.c:455 +msgid "Location entry Search" +msgstr "Søg for stedindgang" + +#: ../midori/midori-websettings.c:456 +msgid "The search to perform inside the location entry" +msgstr "Søgningen som skal foretages i placeringsindgang" + +#: ../midori/midori-websettings.c:464 +msgid "Preferred Encoding" +msgstr "Foretrukne tegnsæt" + +#: ../midori/midori-websettings.c:465 +msgid "The preferred character encoding" +msgstr "Foretrukne tegnsæt" + +#: ../midori/midori-websettings.c:475 +msgid "Always Show Tabbar" +msgstr "Vis altid fanebladsbjælke" + +#: ../midori/midori-websettings.c:476 +msgid "Always show the tabbar" +msgstr "Vis altid fanebladsbjælken" + +#: ../midori/midori-websettings.c:484 +msgid "Close Buttons on Tabs" +msgstr "Lukkeknapper på faneblade" + +#: ../midori/midori-websettings.c:485 +msgid "Whether tabs have close buttons" +msgstr "Om faneblade har lukkeknapper" + +#: ../midori/midori-websettings.c:494 +msgid "Open new pages in" +msgstr "Åbn nye vinduer i" + +#: ../midori/midori-websettings.c:495 +msgid "Where to open new pages" +msgstr "Hvor skal nye sider åbnes" + +#: ../midori/midori-websettings.c:505 +msgid "Open external pages in" +msgstr "Åbn eksterne sider i" + +#: ../midori/midori-websettings.c:506 +msgid "Where to open externally opened pages" +msgstr "Hvor skal eksterne sider åbnes" + +#: ../midori/midori-websettings.c:515 +msgid "Middle click opens Selection" +msgstr "Midterklik åbner for markering" + +#: ../midori/midori-websettings.c:516 +msgid "Load an URL from the selection via middle click" +msgstr "Indlæs en URL fra markeringen med midterklik" + +#: ../midori/midori-websettings.c:524 +msgid "Open tabs in the background" +msgstr "Åbn faneblade i baggrunden" + +#: ../midori/midori-websettings.c:525 +msgid "Whether to open new tabs in the background" +msgstr "Om nye faneblade skal åbnes i baggrunden" + +#: ../midori/midori-websettings.c:533 +msgid "Open Tabs next to Current" +msgstr "Åbn faneblad ved siden af nuværende" + +#: ../midori/midori-websettings.c:534 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" + +#: ../midori/midori-websettings.c:542 +msgid "Open popups in tabs" +msgstr "Åbn pop op i faneblade" + +#: ../midori/midori-websettings.c:543 +msgid "Whether to open popup windows in tabs" +msgstr "Om pop op-vinduer skal åbnes i faneblade" + +#: ../midori/midori-websettings.c:569 +msgid "Accept cookies" +msgstr "Tillad cookies" + +#: ../midori/midori-websettings.c:570 +msgid "What type of cookies to accept" +msgstr "Hvilke typer af cookes skal tillades" + +#: ../midori/midori-websettings.c:583 +msgid "Original cookies only" +msgstr "Kun for originale cookies" + +#: ../midori/midori-websettings.c:584 +msgid "Accept cookies from the original website only" +msgstr "Tillad kun cookies fra original web-side" + +#: ../midori/midori-websettings.c:592 +msgid "Maximum cookie age" +msgstr "Maksimal cookie-levetid" + +#: ../midori/midori-websettings.c:593 +msgid "The maximum number of days to save cookies for" +msgstr "Maksimal antal dage cookies skal gemmes" + +#: ../midori/midori-websettings.c:603 +msgid "Remember last visited pages" +msgstr "Husk sidste besøgte sider" + +#: ../midori/midori-websettings.c:604 +msgid "Whether the last visited pages are saved" +msgstr "Om sidste besøgte sider skal gemmes" + +#: ../midori/midori-websettings.c:612 +msgid "Maximum history age" +msgstr "Maksimal historik-levetid" + +#: ../midori/midori-websettings.c:613 +msgid "The maximum number of days to save the history for" +msgstr "Maksimale antal dage som historik skal gemmes" + +#: ../midori/midori-websettings.c:621 +msgid "Remember last form inputs" +msgstr "Husk sidste formularindtastninger" + +#: ../midori/midori-websettings.c:622 +msgid "Whether the last form inputs are saved" +msgstr "Om sidste formularindtastninger skal gemmes" + +#: ../midori/midori-websettings.c:630 +msgid "Remember last downloaded files" +msgstr "Husk sidste downloadede filer" + +#: ../midori/midori-websettings.c:631 +msgid "Whether the last downloaded files are saved" +msgstr "Om sidste downloadede filer skal gemmes" + +#: ../midori/midori-websettings.c:641 +msgid "HTTP Proxy" +msgstr "HTTP-Proxy" + +#: ../midori/midori-websettings.c:642 +msgid "The proxy used for HTTP connections" +msgstr "Proxy'en som bruges til HTTP-forbindelser" + +#: ../midori/midori-websettings.c:661 +msgid "Identify as" +msgstr "Identificér som" + +#: ../midori/midori-websettings.c:662 +msgid "What to identify as to web pages" +msgstr "Hvad skal genkendes som web-sider" + +#: ../midori/midori-websettings.c:682 +msgid "Identification string" +msgstr "Identifikationsstreng" + +#: ../midori/midori-websettings.c:683 +msgid "The application identification string" +msgstr "Programmets identifikationsstreng" + +#: ../midori/midori-websettings.c:695 +msgid "Cache size" +msgstr "Størrelse af mellemlager" + +#: ../midori/midori-websettings.c:696 +msgid "The allowed size of the cache" +msgstr "Den tilladte størrelse af mellemlager" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:632 +#, c-format +msgid "Not found - %s" +msgstr "Ikke fundet - %s" + +#: ../midori/midori-view.c:908 +msgid "Open Link in New _Tab" +msgstr "Åbn henvisning i nyt _faneblad" + +#: ../midori/midori-view.c:931 +msgid "_Save Link destination" +msgstr "_Gem henvisningsadressen" + +#: ../midori/midori-view.c:939 +msgid "_Download Link destination" +msgstr "_Download henvisningsadressen" + +#: ../midori/midori-view.c:961 +msgid "Open URL in New _Tab" +msgstr "Åbn URL i nyt _faneblad" + +#: ../midori/midori-view.c:1369 +#, c-format +msgid "Inspect page - %s" +msgstr "Undersøg side - %s" + +#: ../midori/midori-view.c:1507 +msgid "Source" +msgstr "Kilde" + +#: ../midori/midori-view.c:1531 +#, c-format +msgid "No documentation installed" +msgstr "Ingen dokumentation installeret" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Indstillinger for %s" + +#. Page "General" +#: ../midori/midori-preferences.c:369 +msgid "General" +msgstr "Generel" + +#: ../midori/midori-preferences.c:370 +msgid "Startup" +msgstr "Opstart" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:417 +msgid "Appearance" +msgstr "Udseende" + +#: ../midori/midori-preferences.c:418 +msgid "Font settings" +msgstr "Indstillinger for skrifttype" + +#: ../midori/midori-preferences.c:420 +msgid "Default Font Family" +msgstr "Standard for skrifttypefamilie" + +#: ../midori/midori-preferences.c:428 +msgid "Minimum Font Size" +msgstr "Minimal skriftstørrelse" + +#: ../midori/midori-preferences.c:437 +msgid "Encoding" +msgstr "Tegnsæt" + +#: ../midori/midori-preferences.c:440 +msgid "The character encoding to use by default" +msgstr "Tegnsæt som bruges standard" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:447 +msgid "Behavior" +msgstr "Opførsel" + +#: ../midori/midori-preferences.c:448 +msgid "Features" +msgstr "Funktionalitet" + +#: ../midori/midori-preferences.c:451 +#: ../extensions/statusbar-features.c:32 +msgid "Load images automatically" +msgstr "Indlæs billeder automatisk" + +#: ../midori/midori-preferences.c:454 +msgid "Shrink images automatically" +msgstr "Formindsk billeder automatisk" + +#: ../midori/midori-preferences.c:457 +msgid "Print background images" +msgstr "Udskriv baggrundsbilleder" + +#: ../midori/midori-preferences.c:460 +msgid "Resizable text areas" +msgstr "Justerbare tekstområder" + +#: ../midori/midori-preferences.c:463 +#: ../extensions/statusbar-features.c:39 +msgid "Enable scripts" +msgstr "Brug skripter" + +#: ../midori/midori-preferences.c:466 +#: ../extensions/statusbar-features.c:46 +msgid "Enable plugins" +msgstr "Brug udvidelsesmoduler" + +#: ../midori/midori-preferences.c:469 +msgid "Enable developer tools" +msgstr "Brug udvikler-værktøjer" + +#. Page "Interface" +#: ../midori/midori-preferences.c:477 +msgid "Interface" +msgstr "Grænseflade" + +#: ../midori/midori-preferences.c:478 +msgid "Navigationbar" +msgstr "Navigeringsbjælke" + +#: ../midori/midori-preferences.c:494 +msgid "Browsing" +msgstr "Browsing" + +#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:526 +msgid "Network" +msgstr "Netværk" + +#: ../midori/midori-preferences.c:548 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:555 +msgid "Privacy" +msgstr "Beskyttelse af privatliv" + +#: ../midori/midori-preferences.c:561 +msgid "Web Cookies" +msgstr "Web-cookies" + +#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:586 +msgid "days" +msgstr "dage" + +#: ../midori/midori-searchaction.c:487 +#: ../katze/katze-arrayaction.c:273 +msgid "Empty" +msgstr "Tom" + +#: ../midori/midori-searchaction.c:824 +msgid "Add search engine" +msgstr "Tilføj søgemaskine" + +#: ../midori/midori-searchaction.c:824 +msgid "Edit search engine" +msgstr "Redigér søgemaskine" + +#: ../midori/midori-searchaction.c:852 +msgid "_Name:" +msgstr "_Navn:" + +#: ../midori/midori-searchaction.c:896 +msgid "_Icon (name or file):" +msgstr "_Ikon (navn eller fil):" + +#: ../midori/midori-searchaction.c:910 +msgid "_Token:" +msgstr "_Symbol:" + +#: ../midori/midori-searchaction.c:1087 +msgid "Manage search engines" +msgstr "Håndtering af søgemaskiner" + +#: ../midori/sokoke.c:63 +#: ../midori/sokoke.c:75 +msgid "Could not run external program." +msgstr "Kunne ikke køre eksternt program." + +#: ../midori/sokoke.c:302 +msgid "Warning: You are using a superuser account!" +msgstr "Advarsel: Du bruger en superbruger-konto!" + +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "En ukendt fejl opstod." + +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s har ingen egenskab '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s kan ikke blive tildelt til %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s kan ikke tilgås" + +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:144 +msgid "Userscripts" +msgstr "Brugerskripter" + +#: ../panels/midori-addons.c:99 +#: ../panels/midori-addons.c:146 +msgid "Userstyles" +msgstr "Brugerstile" + +#: ../panels/midori-addons.c:1006 +#: ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Slå til" + +#: ../panels/midori-addons.c:1015 +#: ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Slå fra" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konsol" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Udvidelser" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Angivet ikon '%s' blev ikke indlæst" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Lagerikon '%s' kunne ikke indlæses" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Animeringsrammer er ødelagt" + +#: ../katze/katze-utils.c:182 +#: ../katze/katze-utils.c:391 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Egenskab '%s' er ikke gyldig for %s" + +#: ../katze/katze-utils.c:211 +#: ../katze/katze-utils.c:250 +msgid "Choose file" +msgstr "Vælg fil" + +#: ../katze/katze-utils.c:231 +msgid "Choose folder" +msgstr "Vælg mappe" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:109 +#: ../extensions/page-holder.c:144 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:128 +msgid "_Pageholder" +msgstr "" + +#: ../extensions/statusbar-features.c:30 +msgid "Images" +msgstr "Billeder" + +#: ../extensions/statusbar-features.c:37 +msgid "Scripts" +msgstr "Skripter" + +#: ../extensions/statusbar-features.c:44 +msgid "Plugins" +msgstr "Udvidelsesmoduler" + From 7601ff88655ac1b6d8693ef7079a1287f34f8218 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 13 Jan 2009 00:50:01 +0100 Subject: [PATCH 0647/2970] Fix installing of data files --- icons/wscript_build | 14 ++++---------- wscript | 18 ++++++------------ 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/icons/wscript_build b/icons/wscript_build index 05d22639..72a2326f 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -11,12 +11,6 @@ def add_image (bld, category, name): if not os.access (path, os.F_OK): os.mkdir (path) - def install_files (folder, destination, source): - try: - bld.install_files (folder, destination, source) - except: - pass - rsvg_convert = bld.env['RSVG_CONVERT'] if rsvg_convert: @@ -25,8 +19,8 @@ def add_image (bld, category, name): for size in [16, 22, 32, 48]: format = str (size) + 'x' + str (size) if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): - install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, - srcdir + '/icons/' + format + '/' + name + '.png') + bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, + srcdir + '/icons/' + format + '/' + name + '.png') elif not rsvg_convert: pass elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): @@ -36,8 +30,8 @@ def add_image (bld, category, name): ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ ' ' + srcdir + '/icons/scalable/' + name + '.svg' if not Utils.exec_command (command): - install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, - blddir + '/icons/' + format + '/' + name + '.png') + bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, + blddir + '/icons/' + format + '/' + name + '.png') else: Utils.pprint ('BLUE', "Optimized icons could not be created.") break diff --git a/wscript b/wscript index cccd3f82..4a5a16d9 100644 --- a/wscript +++ b/wscript @@ -262,19 +262,13 @@ def build (bld): if not os.access (path, os.F_OK): os.mkdir (path) - def install_files (folder, destination, source): - try: - bld.install_files (folder, destination, source) - except: - pass - bld.add_subdirs ('katze midori icons') if option_enabled ('addons'): bld.add_subdirs ('extensions') if option_enabled ('docs'): - install_files ('DOCDIR', '/' + APPNAME + '/', \ + bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') if bld.env['RST2HTML']: @@ -291,7 +285,7 @@ def build (bld): '../../../docs/user/midori.txt ' + 'midori.html' Utils.exec_command (command) os.chdir ('../../..') - install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') + bld.install_files ('${DOCDIR}/midori/user/', blddir + '/docs/user/midori.html') if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_po') @@ -300,14 +294,14 @@ def build (bld): if bld.env['GTKDOC_SCAN'] and Options.commands['build']: bld.add_subdirs ('docs/api') - install_files ('DOCDIR', '/midori/api/', blddir + '/docs/api/*') + bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*') if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_in') obj.source = APPNAME + '.desktop.in' obj.install_path = '${DATADIR}/applications' obj.flags = '-d' - install_files ('DATADIR', 'applications', APPNAME + '.desktop') + bld.install_files ('${DATADIR}/applications', APPNAME + '.desktop') else: folder = os.path.dirname (bld.env['waf_config_files'][0]) desktop = APPNAME + '.desktop' @@ -323,7 +317,7 @@ def build (bld): after.write (line) after.close () Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) - install_files ('DATADIR', 'applications', folder + '/' + desktop) + bld.install_files ('${DATADIR}/applications', folder + '/' + desktop) except: Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') finally: @@ -335,7 +329,7 @@ def build (bld): ' -o ' + blddir + '/data/logo-shade.png ' + \ srcdir + '/data/logo-shade.svg' if not Utils.exec_command (command): - install_files ('DATADIR', APPNAME, blddir + '/data/logo-shade.png') + bld.install_files ('${DATADIR}/' + APPNAME, blddir + '/data/logo-shade.png') else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") From be224ba5f18aa8ec7d92dacf1a4df2886ddde5f6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 13 Jan 2009 01:05:15 +0100 Subject: [PATCH 0648/2970] Clarify 'Trash couldn't be saved' in an i18n comment --- midori/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/main.c b/midori/main.c index 31a3e06c..260e3b91 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1117,6 +1117,7 @@ midori_trash_add_item_cb (KatzeArray* trash, error = NULL; if (!katze_array_to_file (trash, config_file, &error)) { + /* i18n: Trash, or wastebin, containing closed tabs */ g_warning (_("The trash couldn't be saved. %s"), error->message); g_error_free (error); } From 02a1b2a71ad42dc52e9a2cf2937856c4bef96743 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 13 Jan 2009 01:05:50 +0100 Subject: [PATCH 0649/2970] Correct two mistakes in the German translation --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 33b2d403..9fdd52bd 100644 --- a/po/de.po +++ b/po/de.po @@ -155,7 +155,7 @@ msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #: ../midori/main.c:1123 ../midori/main.c:1147 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Der Papierkorb konnte nicht geladen werden. %s" +msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" #: ../midori/main.c:1168 ../midori/midori-preferences.c:381 msgid "Transfers" @@ -532,7 +532,7 @@ msgstr "Papierkorb leeren" #: ../midori/midori-browser.c:3194 msgid "Delete the contents of the trash" -msgstr "Inhalt des Mülls löschen" +msgstr "Inhalt des Papierkorbs löschen" #: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 msgid "Undo Close Tab" From 6448ad338688a268d311df64c4b1cc09f1aee105 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Tue, 13 Jan 2009 20:50:17 +0100 Subject: [PATCH 0650/2970] Open new tabs by double or middle clicking on the tabbar --- midori/midori-browser.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8d9bbf15..37f7413b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2998,6 +2998,24 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_update_progress (browser, MIDORI_VIEW (view)); } +static gboolean +gtk_notebook_button_press_event_cb (GtkNotebook* notebook, + GdkEventButton* event, + MidoriBrowser* browser) +{ + /* Open a new tab on double click or middle mouse click */ + if (event->window == notebook->event_window + && ((event->type == GDK_2BUTTON_PRESS && event->button == 1) + || (event->type == GDK_BUTTON_PRESS && event->button == 2))) + { + gtk_action_activate (_action_by_name (browser, "TabNew")); + + return TRUE; + } + + return FALSE; +} + static void _action_history_delete_activate (GtkAction* action, MidoriBrowser* browser) @@ -4020,6 +4038,9 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect_after (browser->notebook, "switch-page", G_CALLBACK (gtk_notebook_switch_page_cb), browser); + g_signal_connect (browser->notebook, "button-press-event", + G_CALLBACK (gtk_notebook_button_press_event_cb), + browser); gtk_widget_show (browser->notebook); /* Inspector container */ From b146350d58ccf04b41022f80b364504da10b59b8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 14 Jan 2009 00:23:35 +0100 Subject: [PATCH 0651/2970] Bump version to 0.1.2 --- ChangeLog | 15 +++++++++++++++ wscript | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index add8b40c..7d0831fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.2: + + Open new tabs by clicking on the tabbar + + Refactor and speed up location completion + + Show a Crash dialog after crashes + + Dynamically save files when needed + + Support Back/ Forward mouse buttons + + Support javascript: bookmarklets + + Implement Proxy and Identification string + + Implement cookie storage on disk + + Remove autotooled build system + + Add a new Extensions panel + + Support javascript bookmarklets + + Implement opening of new windows + + Display tooltips in Preferences + v0.1.1: + Reimplement page holder as an extension + Introduce a C extension interface diff --git a/wscript b/wscript index 4a5a16d9..26fbf2b9 100644 --- a/wscript +++ b/wscript @@ -12,7 +12,7 @@ import UnitTest major = 0 minor = 1 -micro = 1 +micro = 2 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From 0939bab342cfc137f6bf86b1c2cdf9cb0fa196e8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 14 Jan 2009 21:38:45 +0100 Subject: [PATCH 0652/2970] Disable and hide Open external pages in if unique is unavailable --- midori/midori-preferences.c | 2 ++ midori/midori-websettings.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index f067ca25..6db69ba0 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -512,10 +512,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "open-new-pages-in", NULL); FILLED_ADD (button, 1, 2, 0, 1); + #if HAVE_UNIQUE label = katze_property_label (settings, "open-external-pages-in"); INDENTED_ADD (label, 0, 1, 1, 2); button = katze_property_proxy (settings, "open-external-pages-in", NULL); FILLED_ADD (button, 1, 2, 1, 2); + #endif button = katze_property_proxy (settings, "always-show-tabbar", NULL); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "compact-sidepanel", NULL); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index b0e5607f..f74f0263 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -525,7 +525,11 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open externally opened pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, + #if HAVE_UNIQUE G_PARAM_READWRITE)); + #else + G_PARAM_READABLE)); + #endif g_object_class_install_property (gobject_class, PROP_MIDDLE_CLICK_OPENS_SELECTION, From b7a9d724b092ac10b707c1fbbaa5098701e82c47 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 15 Jan 2009 03:26:15 +0100 Subject: [PATCH 0653/2970] Add a function to obtain the session from a net --- katze/katze-net.c | 25 +++++++++++++++++++++++++ katze/katze-net.h | 3 +++ katze/katze-throbber.c | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 363ad9d1..cf169c15 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -101,13 +101,38 @@ katze_net_new (void) static KatzeNet* net = NULL; if (!net) + { net = g_object_new (KATZE_TYPE_NET, NULL); + /* Since this is a "singleton", keep an extra reference */ + g_object_ref (net); + } else g_object_ref (net); return net; } +/** + * katze_net_get_session: + * + * Retrieves the session of the net. + * + * Return value: a session, or %NULL + * + * Since: 0.1.3 + **/ +gpointer +katze_net_get_session (KatzeNet* net) +{ + g_return_val_if_fail (KATZE_IS_NET (net), NULL); + + #if HAVE_LIBSOUP + return net->session; + #else + return NULL; + #endif +} + typedef struct { KatzeNet* net; diff --git a/katze/katze-net.h b/katze/katze-net.h index 0da0c287..13f50266 100644 --- a/katze/katze-net.h +++ b/katze/katze-net.h @@ -40,6 +40,9 @@ katze_net_get_type (void); KatzeNet* katze_net_new (void); +gpointer +katze_net_get_session (KatzeNet* net); + typedef enum { KATZE_NET_VERIFIED, diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index faaea53a..0698ccb0 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -35,7 +35,7 @@ struct _KatzeThrobber gint height; }; -G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC) +G_DEFINE_TYPE (KatzeThrobber, katze_throbber, GTK_TYPE_MISC); enum { From 03678a16b16792ba5e4edec4d96ebb640d5399b9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 15 Jan 2009 03:29:47 +0100 Subject: [PATCH 0654/2970] Use WebKitWebView:session property if it exists --- midori/main.c | 31 +++++++++++++++++++++++++++---- midori/midori-preferences.c | 10 ++++++++-- midori/midori-view.c | 3 +++ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index 260e3b91..9a31a0f6 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1464,9 +1464,7 @@ cookie_jar_constructed_cb (GObject* object) (GClosureNotify)g_free, 0); #endif } -#endif -#if HAVE_LIBSOUP static void authentication_dialog_response_cb (GtkWidget* dialog, gint response, @@ -1903,6 +1901,11 @@ main (int argc, gchar* uri; KatzeItem* item; gchar* uri_ready; + #if HAVE_LIBSOUP + GObjectClass* webkit_class; + KatzeNet* net; + SoupSession* s_session; + #endif #ifdef HAVE_SQLITE sqlite3* db; gint max_history_age; @@ -1980,6 +1983,9 @@ main (int argc, } #if HAVE_LIBSOUP + webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); + if (!g_object_class_find_property (webkit_class, "session")) + { /* This is a nasty trick that allows us to manipulate cookies even without having a pointer to the jar. */ soup_cookie_jar_get_type (); @@ -1991,8 +1997,6 @@ main (int argc, old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; } - #endif - #if HAVE_LIBSOUP /* This is a nasty trick that allows us to manipulate preferences even without having a pointer to the session. */ soup_session_get_type (); @@ -2004,6 +2008,7 @@ main (int argc, old_session_constructed_cb = G_OBJECT_CLASS (session_class)->constructed; G_OBJECT_CLASS (session_class)->constructed = soup_session_constructed_cb; } + } #endif /* Load configuration files */ @@ -2121,6 +2126,24 @@ main (int argc, } g_string_free (error_messages, TRUE); + #if HAVE_LIBSOUP + webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); + if (g_object_class_find_property (webkit_class, "session")) + { + net = katze_net_new (); + s_session = katze_net_get_session (net); + soup_session_settings_notify_http_proxy_cb (settings, NULL, s_session); + soup_session_settings_notify_ident_string_cb (settings, NULL, s_session); + g_signal_connect (settings, "notify::http-proxy", + G_CALLBACK (soup_session_settings_notify_http_proxy_cb), s_session); + g_signal_connect (settings, "notify::ident-string", + G_CALLBACK (soup_session_settings_notify_ident_string_cb), s_session); + g_signal_connect (s_session, "authenticate", + G_CALLBACK (soup_session_authenticate_cb), app); + g_object_unref (net); + } + #endif + /* Open as many tabs as we have uris, seperated by pipes */ i = 0; while (uris && uris[i]) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 6db69ba0..20aade79 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -300,6 +300,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; + #if HAVE_LIBSOUP + GObjectClass* webkit_class; + #endif g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -535,8 +538,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Network" */ #if HAVE_LIBSOUP + webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); + if (g_object_class_find_property (webkit_class, "session") || /* If a cookie jar was created, WebKit is using Soup */ - if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) { PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); @@ -571,8 +576,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); #if HAVE_LIBSOUP_2_25_2 + if (g_object_class_find_property (webkit_class, "session") || /* If a cookie jar was created, WebKit is using Soup */ - if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, + g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) { FRAME_NEW (_("Web Cookies")); diff --git a/midori/midori-view.c b/midori/midori-view.c index 847d7b9e..e87b857b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1442,6 +1442,9 @@ midori_view_construct_web_view (MidoriView* view) gpointer inspector; view->web_view = webkit_web_view_new (); + if (g_object_class_find_property (G_OBJECT_GET_CLASS (view->web_view), "session")) + g_object_set (view->web_view, "session", + katze_net_get_session (view->net), NULL); web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); From 1b0e649968c335398752b45b80d609b21ff1f905 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 15 Jan 2009 03:39:32 +0100 Subject: [PATCH 0655/2970] Use a proper SoupCookieJarText if we have "session" --- midori/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/midori/main.c b/midori/main.c index 9a31a0f6..0a84b1e8 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1906,6 +1906,9 @@ main (int argc, KatzeNet* net; SoupSession* s_session; #endif + #if HAVE_LIBSOUP_2_25_2 + SoupCookieJar* jar; + #endif #ifdef HAVE_SQLITE sqlite3* db; gint max_history_age; @@ -2132,6 +2135,12 @@ main (int argc, { net = katze_net_new (); s_session = katze_net_get_session (net); + #if HAVE_LIBSOUP_2_25_2 + katze_assign (config_file, build_config_filename ("cookies.txt")); + jar = soup_cookie_jar_text_new (config_file, FALSE); + soup_session_add_feature (s_session, SOUP_SESSION_FEATURE (jar)); + g_object_unref (jar); + #endif soup_session_settings_notify_http_proxy_cb (settings, NULL, s_session); soup_session_settings_notify_ident_string_cb (settings, NULL, s_session); g_signal_connect (settings, "notify::http-proxy", From e247529b6bf93c652f6ba8d8485703f016967cee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Jan 2009 05:04:42 +0100 Subject: [PATCH 0656/2970] Do monitor changes of bookmarks and save on any change --- midori/main.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/midori/main.c b/midori/main.c index 0a84b1e8..f15f6304 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1048,6 +1048,24 @@ katze_array_to_file (KatzeArray* array, return TRUE; } +static void +midori_bookmarks_notify_item_cb (KatzeArray* folder, + GParamSpec* pspec, + KatzeArray* bookmarks) +{ + gchar* config_file; + GError* error; + + config_file = build_config_filename ("bookmarks.xbel"); + error = NULL; + if (!katze_array_to_file (bookmarks, config_file, &error)) + { + g_warning (_("The bookmarks couldn't be saved. %s"), error->message); + g_error_free (error); + } + g_free (config_file); +} + static void midori_bookmarks_add_item_cb (KatzeArray* folder, GObject* item, @@ -1081,6 +1099,9 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, g_signal_connect_after (item, "remove-item", G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); } + + g_signal_connect_after (item, "notify", + G_CALLBACK (midori_bookmarks_notify_item_cb), NULL); } static void @@ -2197,6 +2218,8 @@ main (int argc, g_signal_connect_after (item, "remove-item", G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); } + g_signal_connect_after (item, "notify", + G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); } } g_signal_connect_after (trash, "add-item", From 8f2c5befb2019d2cc223ad90078673475b34433e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Jan 2009 05:05:50 +0100 Subject: [PATCH 0657/2970] Introduce Zoom Text and Images preference --- midori/midori-preferences.c | 8 +++++--- midori/midori-view.c | 16 ++++++++++++++++ midori/midori-websettings.c | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 20aade79..ca944130 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -453,7 +453,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Behavior" */ PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); FRAME_NEW (_("Features")); - TABLE_NEW (6, 2); + TABLE_NEW (7, 2); button = katze_property_proxy (settings, "auto-load-images", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); gtk_widget_set_tooltip_text (button, _("Load and display images automatically")); @@ -486,10 +486,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); gtk_widget_set_tooltip_text (button, _("Enable special extensions for developers")); SPANNED_ADD (button, 1, 2, 3, 4); + button = katze_property_proxy (settings, "zoom-text-and-images", NULL); + SPANNED_ADD (button, 0, 1, 4, 5); label = katze_property_label (settings, "location-entry-search"); - INDENTED_ADD (label, 0, 1, 4, 5); + INDENTED_ADD (label, 0, 1, 5, 6); entry = katze_property_proxy (settings, "location-entry-search", NULL); - FILLED_ADD (entry, 1, 2, 4, 5); + FILLED_ADD (entry, 1, 2, 5, 6); /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); diff --git a/midori/midori-view.c b/midori/midori-view.c index e87b857b..dede4dab 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1260,13 +1260,20 @@ midori_view_new (KatzeNet* net) static void _midori_view_update_settings (MidoriView* view) { + gboolean zoom_text_and_images; + g_object_get (view->settings, "download-manager", &view->download_manager, + "zoom-text-and-images", &zoom_text_and_images, "close-buttons-on-tabs", &view->close_buttons_on_tabs, "open-new-pages-in", &view->open_new_pages_in, "middle-click-opens-selection", &view->middle_click_opens_selection, "open-tabs-in-the-background", &view->open_tabs_in_the_background, NULL); + + if (view->web_view) + g_object_set (view->web_view, "full-content-zoom", + zoom_text_and_images, NULL); } static void @@ -1285,6 +1292,12 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, { katze_assign (view->download_manager, g_value_dup_string (&value)); } + else if (name == g_intern_string ("zoom-text-and-images")) + { + if (view->web_view) + g_object_set (view->web_view, "full-content-zoom", + g_value_get_boolean (&value), NULL); + } else if (name == g_intern_string ("close-buttons-on-tabs")) { view->close_buttons_on_tabs = g_value_get_boolean (&value); @@ -1492,6 +1505,9 @@ midori_view_construct_web_view (MidoriView* view) NULL); g_object_set (view->web_view, "settings", view->settings, NULL); + if (katze_object_has_property (view->web_view, "full-content-zoom")) + g_object_set (view->web_view, "full-content-zoom", + katze_object_get_boolean (view->settings, "zoom-text-and-images"), NULL); gtk_widget_show (view->web_view); gtk_container_add (GTK_CONTAINER (view), view->web_view); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index f74f0263..b803cae4 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -59,6 +59,7 @@ struct _MidoriWebSettings gboolean open_tabs_next_to_current; gboolean open_popups_in_tabs; + gboolean zoom_text_and_images; MidoriAcceptCookies accept_cookies; gboolean original_cookies_only; gint maximum_cookie_age; @@ -122,6 +123,7 @@ enum PROP_ENFORCE_96_DPI, PROP_ENABLE_DEVELOPER_EXTRAS, + PROP_ZOOM_TEXT_AND_IMAGES, PROP_ACCEPT_COOKIES, PROP_ORIGINAL_COOKIES_ONLY, PROP_MAXIMUM_COOKIE_AGE, @@ -602,6 +604,24 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) FALSE, G_PARAM_READABLE)); + if (!g_object_class_find_property (gobject_class, "zoom-text-and-images")) + /** + * MidoriWebSettings:zoom-text-and-images: + * + * Whether to zoom text and images. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_ZOOM_TEXT_AND_IMAGES, + g_param_spec_boolean ( + "zoom-text-and-images", + _("Zoom Text and Images"), + _("Whether to zoom text and images"), + FALSE, + g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW), + "full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, PROP_ACCEPT_COOKIES, g_param_spec_enum ( @@ -972,6 +992,9 @@ midori_web_settings_set_property (GObject* object, web_settings->open_popups_in_tabs = g_value_get_boolean (value); break; + case PROP_ZOOM_TEXT_AND_IMAGES: + web_settings->zoom_text_and_images = g_value_get_boolean (value); + break; case PROP_ACCEPT_COOKIES: web_settings->accept_cookies = g_value_get_enum (value); break; @@ -1130,6 +1153,9 @@ midori_web_settings_get_property (GObject* object, case PROP_ENABLE_DEVELOPER_EXTRAS: g_value_set_boolean (value, FALSE); break; + case PROP_ZOOM_TEXT_AND_IMAGES: + g_value_set_boolean (value, web_settings->zoom_text_and_images); + break; case PROP_ACCEPT_COOKIES: g_value_set_enum (value, web_settings->accept_cookies); break; From f02f9fd118280b46db377b11e7ba8ce7c69d950c Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Fri, 16 Jan 2009 05:19:43 +0100 Subject: [PATCH 0658/2970] Make property strings static to save some memory --- midori/compat.h | 6 +++++ midori/midori-app.c | 16 ++++++------ midori/midori-browser.c | 26 +++++++++---------- midori/midori-extension.c | 2 +- midori/midori-locationaction.c | 4 +-- midori/midori-panel.c | 4 +-- midori/midori-preferences.c | 2 +- midori/midori-searchaction.c | 8 +++--- midori/midori-view.c | 20 +++++++-------- midori/midori-websettings.c | 47 +++++++++++++++++----------------- 10 files changed, 71 insertions(+), 64 deletions(-) diff --git a/midori/compat.h b/midori/compat.h index 68cda360..42789bf6 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -17,6 +17,12 @@ #endif #include + +#if !GLIB_CHECK_VERSION (2, 14, 0) + #define G_PARAM_STATIC_STRINGS \ + (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) +#endif + #if GLIB_CHECK_VERSION (2, 16, 0) #include #endif diff --git a/midori/midori-app.c b/midori/midori-app.c index 8ce5d205..4d3eb4d7 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -211,7 +211,7 @@ midori_app_class_init (MidoriAppClass* class) "Settings", "The associated settings", MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_BOOKMARKS, @@ -220,7 +220,7 @@ midori_app_class_init (MidoriAppClass* class) "Bookmarks", "The bookmarks folder, containing all bookmarks", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_TRASH, @@ -229,7 +229,7 @@ midori_app_class_init (MidoriAppClass* class) "Trash", "The trash, collecting recently closed tabs and windows", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_SEARCH_ENGINES, @@ -238,7 +238,7 @@ midori_app_class_init (MidoriAppClass* class) "Search Engines", "The list of search engines", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_HISTORY, @@ -247,7 +247,7 @@ midori_app_class_init (MidoriAppClass* class) "History", "The list of history items", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_EXTENSIONS, @@ -256,7 +256,7 @@ midori_app_class_init (MidoriAppClass* class) "Extensions", "The list of extensions", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_BROWSER, @@ -265,7 +265,7 @@ midori_app_class_init (MidoriAppClass* class) "Browser", "The current browser", MIDORI_TYPE_BROWSER, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_BROWSER_COUNT, @@ -274,7 +274,7 @@ midori_app_class_init (MidoriAppClass* class) "Browser Count", "The current number of browsers", 0, G_MAXUINT, 0, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } #if HAVE_UNIQUE diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 37f7413b..0f74fc17 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1078,7 +1078,7 @@ midori_browser_class_init (MidoriBrowserClass* class) gobject_class->set_property = midori_browser_set_property; gobject_class->get_property = midori_browser_get_property; - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS; g_object_class_install_property (gobject_class, PROP_MENUBAR, @@ -1087,7 +1087,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Menubar", "The menubar", GTK_TYPE_MENU_BAR, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_NAVIGATIONBAR, @@ -1096,7 +1096,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Navigationbar", "The navigationbar", GTK_TYPE_TOOLBAR, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_NOTEBOOK, @@ -1105,7 +1105,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Notebook", "The notebook containing the views", GTK_TYPE_NOTEBOOK, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_PANEL, @@ -1114,7 +1114,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Panel", "The side panel embedded in the browser", MIDORI_TYPE_PANEL, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_URI, @@ -1123,7 +1123,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "URI", "The current URI", "about:blank", - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_TAB, @@ -1132,7 +1132,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Tab", "The current tab", GTK_TYPE_WIDGET, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_LOAD_STATUS, @@ -1142,7 +1142,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "The current load status", MIDORI_TYPE_LOAD_STATUS, MIDORI_LOAD_FINISHED, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_STATUSBAR, @@ -1151,7 +1151,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Statusbar", "The statusbar", GTK_TYPE_STATUSBAR, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** * MidoriBrowser:statusbar-text: @@ -1190,7 +1190,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Settings", "The associated settings", MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * MidoriBrowser:bookmarks: @@ -1207,7 +1207,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Bookmarks", "The bookmarks folder, containing all bookmarks", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * MidoriBrowser:trash: @@ -1226,7 +1226,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Trash", "The trash, collecting recently closed tabs and windows", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * MidoriBrowser:search-engines: @@ -1243,7 +1243,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "Search Engines", "The list of search engines to be used for web search", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * MidoriBrowser:history: diff --git a/midori/midori-extension.c b/midori/midori-extension.c index dc540754..22eee820 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -99,7 +99,7 @@ midori_extension_class_init (MidoriExtensionClass* class) gobject_class->set_property = midori_extension_set_property; gobject_class->get_property = midori_extension_get_property; - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS; g_object_class_install_property (gobject_class, PROP_NAME, diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 631cfc74..6c966b48 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -168,7 +168,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class) "Progress", "The current progress of the action", 0.0, 1.0, 0.0, - G_PARAM_WRITABLE)); + G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, @@ -177,7 +177,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class) "Secondary", "The stock ID of the secondary icon", NULL, - G_PARAM_WRITABLE)); + G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 160266b9..de821617 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -118,7 +118,7 @@ midori_panel_class_init (MidoriPanelClass* class) class->close = midori_panel_close; - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS; g_object_class_install_property (gobject_class, PROP_SHADOW_TYPE, @@ -137,7 +137,7 @@ midori_panel_class_init (MidoriPanelClass* class) "Menu", "Menu to hold panel items", GTK_TYPE_MENU, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_PAGE, diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index ca944130..8d85ca96 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -70,7 +70,7 @@ midori_preferences_class_init (MidoriPreferencesClass* class) "Settings", "Settings instance to provide properties", MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_WRITABLE)); + G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 3d8d8ded..a9b1e814 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -136,7 +136,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class) "Search Engines", "The list of search engines", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_CURRENT_ITEM, @@ -145,7 +145,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class) "Current Item", "The currently selected item", KATZE_TYPE_ITEM, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_TEXT, @@ -154,7 +154,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class) "Text", "The current text typed in the entry", NULL, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_DIALOG, @@ -163,7 +163,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class) "Dialog", "A dialog to manage search engines", GTK_TYPE_DIALOG, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index dede4dab..74733e8a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -305,7 +305,7 @@ midori_view_class_init (MidoriViewClass* class) gobject_class->set_property = midori_view_set_property; gobject_class->get_property = midori_view_get_property; - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS; g_object_class_install_property (gobject_class, PROP_URI, @@ -314,7 +314,7 @@ midori_view_class_init (MidoriViewClass* class) "Uri", "The URI of the currently loaded page", "about:blank", - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_TITLE, @@ -323,7 +323,7 @@ midori_view_class_init (MidoriViewClass* class) "Title", "The title of the currently loaded page", NULL, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * MidoriView:mime-type: @@ -339,7 +339,7 @@ midori_view_class_init (MidoriViewClass* class) "MIME Type", "The MIME type of the currently loaded page", "text/html", - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_ICON, @@ -348,7 +348,7 @@ midori_view_class_init (MidoriViewClass* class) "Icon", "The icon of the view", GDK_TYPE_PIXBUF, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_LOAD_STATUS, @@ -358,7 +358,7 @@ midori_view_class_init (MidoriViewClass* class) "The current loading status", MIDORI_TYPE_LOAD_STATUS, MIDORI_LOAD_FINISHED, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_PROGRESS, @@ -367,7 +367,7 @@ midori_view_class_init (MidoriViewClass* class) "Progress", "The current loading progress", 0.0, 1.0, 0.0, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_ZOOM_LEVEL, @@ -378,7 +378,7 @@ midori_view_class_init (MidoriViewClass* class) G_MINFLOAT, G_MAXFLOAT, 1.0f, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* g_object_class_install_property (gobject_class, PROP_NEWS_FEEDS, @@ -387,7 +387,7 @@ midori_view_class_init (MidoriViewClass* class) "News Feeds", "The list of available news feeds", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE)); */ + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); */ g_object_class_install_property (gobject_class, PROP_STATUSBAR_TEXT, @@ -396,7 +396,7 @@ midori_view_class_init (MidoriViewClass* class) "Statusbar Text", "The text displayed in the statusbar", "", - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_SETTINGS, diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index b803cae4..1ddf110a 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -274,7 +274,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) gobject_class->set_property = midori_web_settings_set_property; gobject_class->get_property = midori_web_settings_get_property; - flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS; g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_WINDOW_SIZE, @@ -516,8 +516,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open new pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, - g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW) - ? G_PARAM_READWRITE : G_PARAM_READABLE)); + (g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW) + ? G_PARAM_READWRITE : G_PARAM_READABLE) | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_OPEN_EXTERNAL_PAGES_IN, @@ -528,9 +528,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, #if HAVE_UNIQUE - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #else - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif g_object_class_install_property (gobject_class, @@ -567,7 +567,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Open popups in tabs"), _("Whether to open popup windows in tabs"), TRUE, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); if (!g_object_class_find_property (gobject_class, "enforce-96-dpi")) @@ -585,7 +585,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "Enforce 96 DPI", "Whether to enforce a resolution of 96 DPI", FALSE, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); if (!g_object_class_find_property (gobject_class, "enable-developer-extras")) /** @@ -602,7 +602,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "Enable Developer Extras", "Whether to enable extra developer tools", FALSE, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); if (!g_object_class_find_property (gobject_class, "zoom-text-and-images")) /** @@ -619,8 +619,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Zoom Text and Images"), _("Whether to zoom text and images"), FALSE, - g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW), - "full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE)); + (g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW), + "full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE) + | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_ACCEPT_COOKIES, @@ -631,9 +632,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TYPE_ACCEPT_COOKIES, MIDORI_ACCEPT_COOKIES_ALL, #if HAVE_LIBSOUP - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #else - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif g_object_class_install_property (gobject_class, @@ -643,7 +644,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Original cookies only"), _("Accept cookies from the original website only"), FALSE, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_MAXIMUM_COOKIE_AGE, @@ -652,7 +653,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Maximum cookie age"), _("The maximum number of days to save cookies for"), 0, G_MAXINT, 30, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); @@ -681,7 +682,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Remember last form inputs"), _("Whether the last form inputs are saved"), TRUE, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_DOWNLOADED_FILES, @@ -690,7 +691,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Remember last downloaded files"), _("Whether the last downloaded files are saved"), TRUE, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); @@ -702,9 +703,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("The proxy server used for HTTP connections"), NULL, #if HAVE_LIBSOUP - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #else - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif /** @@ -724,9 +725,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TYPE_IDENTITY, MIDORI_IDENT_MIDORI, #if HAVE_LIBSOUP - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #else - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif /** @@ -744,9 +745,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("The application identification string"), NULL, #if HAVE_LIBSOUP - G_PARAM_READWRITE)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #else - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif g_object_class_install_property (gobject_class, @@ -756,7 +757,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Cache size"), _("The allowed size of the cache"), 0, G_MAXINT, 100, - G_PARAM_READABLE)); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void From ac707d6f438f1b0dd0bf2ae91590b7260bbb4075 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Fri, 16 Jan 2009 05:50:01 +0100 Subject: [PATCH 0659/2970] Correct capitalizations in Help menu and Inline Find --- midori/midori-browser.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0f74fc17..ab2539ab 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3274,10 +3274,10 @@ static const GtkActionEntry entries[] = { N_("_Contents"), "F1", N_("Show the documentation"), G_CALLBACK (_action_help_link_activate) }, { "HelpFAQ", NULL, - N_("_Frequent questions"), NULL, + N_("_Frequent Questions"), NULL, N_("Show the Frequently Asked Questions"), G_CALLBACK (_action_help_link_activate) }, { "HelpBugs", NULL, - N_("_Report a bug"), NULL, + N_("_Report a Bug"), NULL, N_("Open Midori's bug tracker"), G_CALLBACK (_action_help_link_activate) }, { "About", GTK_STOCK_ABOUT, NULL, "", @@ -4068,7 +4068,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_add (GTK_CONTAINER (toolitem), /* i18n: A panel at the bottom, to search text in pages */ - gtk_label_new_with_mnemonic (_("_Inline find:"))); + gtk_label_new_with_mnemonic (_("_Inline Find:"))); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_text = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), @@ -4089,12 +4089,12 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); toolitem = (GtkToolItem*)gtk_action_create_tool_item (_action_by_name (browser, "FindPrevious")); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Previous")); gtk_tool_item_set_is_important (toolitem, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); toolitem = (GtkToolItem*)gtk_action_create_tool_item (_action_by_name (browser, "FindNext")); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), NULL); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Next")); gtk_tool_item_set_is_important (toolitem, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); browser->find_case = gtk_toggle_tool_button_new_from_stock ( From 50a5711b86a8adbe5ed4b3ba788f7a2124b66543 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Fri, 16 Jan 2009 06:36:15 +0100 Subject: [PATCH 0660/2970] Update Japanese translation --- po/ja.po | 706 +++++++++++++++++++++++++++---------------------------- 1 file changed, 346 insertions(+), 360 deletions(-) diff --git a/po/ja.po b/po/ja.po index d8c7d971..63e6c5b5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-08 15:33+0900\n" -"PO-Revision-Date: 2009-01-08 15:41+0900\n" +"POT-Creation-Date: 2009-01-14 15:43+0900\n" +"PO-Revision-Date: 2009-01-14 15:17+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,12 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1828 -#: ../midori/main.c:1919 -#: ../midori/main.c:1928 -#: ../midori/main.c:1939 -#: ../midori/midori-websettings.c:235 +#: ../midori.desktop.in.h:2 ../midori/main.c:1831 ../midori/main.c:1925 +#: ../midori/main.c:1934 ../midori/main.c:1945 +#: ../midori/midori-websettings.c:237 msgid "Midori" msgstr "Midori" @@ -37,8 +34,7 @@ msgstr "ウェブブラウザ" msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/main.c:88 -#: ../midori/midori-browser.c:3797 +#: ../midori/main.c:88 ../midori/midori-browser.c:3841 msgid "_Bookmarks" msgstr "ブックマーク(_B)" @@ -96,8 +92,7 @@ msgstr "設定を読み込めませんでした: %s\n" msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:217 -#: ../midori/main.c:287 +#: ../midori/main.c:217 ../midori/main.c:287 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" @@ -106,17 +101,20 @@ msgstr "無効な設定値 '%s'" msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:537 -#: ../midori/main.c:546 +#: ../midori/main.c:537 ../midori/main.c:546 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" #: ../midori/main.c:568 -#: ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" +#: ../midori/main.c:600 +#, c-format +msgid "Failed to execute SQL statement: %s\n" +msgstr "SQL 文の実行に失敗しました: %s\n" + #: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" @@ -127,62 +125,57 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:711 -#: ../midori/main.c:725 +#: ../midori/main.c:711 ../midori/main.c:725 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:841 +#: ../midori/main.c:838 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:869 +#: ../midori/main.c:866 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:897 -#: ../midori/main.c:915 +#: ../midori/main.c:894 ../midori/main.c:912 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1045 -#: ../midori/sokoke.c:523 +#: ../midori/main.c:1042 ../midori/sokoke.c:532 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1075 -#: ../midori/main.c:1100 +#: ../midori/main.c:1072 ../midori/main.c:1097 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" -#: ../midori/main.c:1123 -#: ../midori/main.c:1147 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1121 ../midori/main.c:1145 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1168 -#: ../midori/midori-preferences.c:381 +#: ../midori/main.c:1166 ../midori/midori-preferences.c:385 msgid "Transfers" msgstr "転送" -#: ../midori/main.c:1204 +#: ../midori/main.c:1202 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1530 +#: ../midori/main.c:1528 msgid "Authentication Required" msgstr "認証が要求されました" -#: ../midori/main.c:1546 +#: ../midori/main.c:1544 msgid "" "A username and a password are required\n" "to open this location:" @@ -190,17 +183,21 @@ msgstr "" "この場所を開くためにはユーザ名とパスワードが\n" "必要です:" -#: ../midori/main.c:1560 +#: ../midori/main.c:1558 msgid "Username" msgstr "ユーザ名" -#: ../midori/main.c:1571 +#: ../midori/main.c:1569 msgid "Password" msgstr "パスワード" #: ../midori/main.c:1675 -msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." -msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションを試してみてください。" +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" +"ようであれば、問題解決のために以下のオプションを試してみてください。" #: ../midori/main.c:1690 msgid "Modify _preferences" @@ -214,82 +211,78 @@ msgstr "最後のセッションをリセットする(_S)" msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1828 +#: ../midori/main.c:1831 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1857 -#: ../midori/gjs.c:514 +#: ../midori/main.c:1863 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1880 +#: ../midori/main.c:1886 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1882 +#: ../midori/main.c:1888 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1884 +#: ../midori/main.c:1890 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1916 +#: ../midori/main.c:1922 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1940 +#: ../midori/main.c:1946 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1942 +#: ../midori/main.c:1948 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1965 -#, c-format +#: ../midori/main.c:1975 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:2024 +#: ../midori/main.c:2036 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:2039 +#: ../midori/main.c:2051 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:2052 +#: ../midori/main.c:2064 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:2065 +#: ../midori/main.c:2077 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:2077 +#: ../midori/main.c:2089 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2093 +#: ../midori/main.c:2105 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:248 -#: ../midori/midori-browser.c:3155 -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3202 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:260 -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3199 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" @@ -315,13 +308,11 @@ msgstr "ブックマークの編集" msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:541 -#: ../midori/midori-searchaction.c:833 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:560 -#: ../midori/midori-searchaction.c:847 +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 msgid "_Address:" msgstr "アドレス(_A):" @@ -329,8 +320,7 @@ msgstr "アドレス(_A):" msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:583 -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 msgid "Toplevel folder" msgstr "トップレベルフォルダ" @@ -338,890 +328,893 @@ msgstr "トップレベルフォルダ" msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1301 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2369 +#: ../midori/midori-browser.c:2434 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2371 +#: ../midori/midori-browser.c:2436 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2646 +#: ../midori/midori-browser.c:2687 msgid "Separator" msgstr "セパレータ" -#: ../midori/midori-browser.c:2757 +#: ../midori/midori-browser.c:2794 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:2800 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2807 msgid "Today" msgstr "今日" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:2809 msgid "Yesterday" msgstr "昨日" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:2898 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:2906 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3039 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3130 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3133 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3136 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3139 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3142 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3144 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3145 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3147 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3148 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3151 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3154 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3156 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3159 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3121 -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3162 ../midori/midori-browser.c:3165 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3168 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3171 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3174 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3177 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3179 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3180 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3182 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3183 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3186 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3187 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3190 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3192 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3193 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3205 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3208 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3211 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3172 -#: ../midori/midori-view.c:973 +#: ../midori/midori-browser.c:3213 ../midori/midori-view.c:978 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3214 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3216 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3217 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3221 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3223 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3226 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3229 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3232 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3234 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3235 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3196 -#: ../midori/midori-view.c:945 +#: ../midori/midori-browser.c:3237 ../midori/midori-view.c:950 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3238 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3242 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3245 msgid "Edit the selected bookmark" msgstr "選択されたブックマークを編集します" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3248 msgid "Delete the selected bookmark" msgstr "選択されたブックマークを削除します" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3251 msgid "Delete the selected history item" msgstr "選択された履歴アイテムを削除します" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3254 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3257 msgid "Bookmark the selected history item" msgstr "選択された履歴アイテムをブックマークに追加します" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3259 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3220 -#: ../midori/midori-searchaction.c:461 +#: ../midori/midori-browser.c:3261 ../midori/midori-searchaction.c:462 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3262 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3266 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3267 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3269 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3270 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3272 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3274 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3275 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3277 msgid "_Frequent questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3278 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3280 msgid "_Report a bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3281 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3284 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3291 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3292 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3297 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3298 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3301 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3302 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3305 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3306 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3309 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3269 +#: ../midori/midori-browser.c:3310 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3313 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3273 +#: ../midori/midori-browser.c:3314 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3317 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3318 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3766 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3724 +#: ../midori/midori-browser.c:3768 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3792 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3794 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3769 +#: ../midori/midori-browser.c:3813 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:3826 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3784 +#: ../midori/midori-browser.c:3828 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3799 +#: ../midori/midori-browser.c:3843 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3812 +#: ../midori/midori-browser.c:3856 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3814 +#: ../midori/midori-browser.c:3858 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:3936 +#: ../midori/midori-browser.c:3981 msgid "Bookmarks" msgstr "ブックマーク" -#: ../midori/midori-browser.c:3979 -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-browser.c:4024 ../midori/midori-preferences.c:596 msgid "History" msgstr "履歴" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:4071 msgid "_Inline find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:4102 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4110 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4119 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4367 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:191 -#: ../midori/midori-panel.c:192 +#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:145 -#: ../midori/midori-view.c:1644 +#: ../midori/midori-websettings.c:147 ../midori/midori-view.c:1687 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:146 -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:148 ../midori/midori-websettings.c:422 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:149 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:164 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:165 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:166 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:167 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:168 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-websettings.c:167 -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:169 ../midori/midori-websettings.c:241 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:184 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:185 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:201 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:202 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:203 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:204 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:220 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:220 -#: ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:222 ../panels/midori-addons.c:96 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:238 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:281 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:282 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶するかどうか指定します" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:290 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:291 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:299 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:300 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:308 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:309 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:318 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:319 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:327 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:328 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:337 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:338 msgid "Whether to show the menubar" msgstr "メニューバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:346 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:347 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:355 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:356 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:364 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:365 msgid "Whether to show the panel" msgstr "パネルを表示するかどうか指定します" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:373 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:374 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:383 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:384 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:393 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:402 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:403 msgid "Whether to make the sidepanel compact" msgstr "コンパクトなサイドパネルを表示します" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:412 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:438 ../midori/midori-preferences.c:382 +msgid "Show crash dialog" +msgstr "クラッシュダイアログを表示する" + +#: ../midori/midori-websettings.c:439 ../midori/midori-preferences.c:383 +msgid "Show a dialog after Midori crashed" +msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" + +#: ../midori/midori-websettings.c:447 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:448 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:456 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:457 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:465 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:466 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:474 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:475 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:483 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:484 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:494 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:495 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:503 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:504 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:513 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:514 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:524 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:525 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:534 msgid "Middle click opens Selection" msgstr "選択範囲のミドルクリックで開く" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:535 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをミドルクリックすると読み込みます" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:543 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:544 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:552 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:553 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:561 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:562 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:605 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:606 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:619 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:620 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:628 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:629 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:639 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:640 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:648 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:649 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:657 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:658 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:666 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:667 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:677 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:678 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:698 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:699 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:719 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:720 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:732 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:733 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:597 +#: ../midori/midori-view.c:602 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:877 +#: ../midori/midori-view.c:882 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:900 +#: ../midori/midori-view.c:905 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:908 +#: ../midori/midori-view.c:913 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:930 +#: ../midori/midori-view.c:935 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1392 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1508 +#: ../midori/midori-view.c:1535 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1532 +#: ../midori/midori-view.c:1559 +#, c-format +msgid "Document cannot be displayed" +msgstr "ドキュメントを表示できません" + +#: ../midori/midori-view.c:1575 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1241,191 +1234,183 @@ msgid "Startup" msgstr "起動" #. Page "Appearance" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:421 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:422 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:424 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:430 msgid "The default font size used to display text" msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:433 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:436 msgid "The minimum font size used to display text" msgstr "文字表示で使用される最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:443 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:446 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:453 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:454 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:453 -#: ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:457 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:458 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:461 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:462 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:465 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:466 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:469 msgid "Resizable text areas" msgstr "テキストエリアのサイズを変更可能にする" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:470 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を有効にします" -#: ../midori/midori-preferences.c:469 -#: ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:474 msgid "Enable embedded scripting languages" msgstr "組み込まれたスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:473 -#: ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:477 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:478 msgid "Enable embedded plugin objects" msgstr "組み込みプラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:481 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:482 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:485 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:486 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:494 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:495 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:511 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:538 -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:572 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:578 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:587 -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:591 ../midori/midori-preferences.c:603 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:452 -#: ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "空" -#: ../midori/midori-searchaction.c:789 +#: ../midori/midori-searchaction.c:790 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:789 +#: ../midori/midori-searchaction.c:790 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:817 +#: ../midori/midori-searchaction.c:818 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:861 +#: ../midori/midori-searchaction.c:862 msgid "_Icon (name or file):" msgstr "アイコン名/ファイル(_I):" -#: ../midori/midori-searchaction.c:875 +#: ../midori/midori-searchaction.c:876 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1052 -msgid "Manage search engines" +#: ../midori/midori-searchaction.c:1053 +msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:101 -#: ../midori/sokoke.c:113 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:355 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 +#: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s にはプロパティ '%s' はありません" @@ -1440,23 +1425,19 @@ msgstr "%s は %s.%s に割り当てることはできません" msgid "%s.%s cannot be accessed" msgstr "%s.%s にアクセスできません" -#: ../panels/midori-addons.c:97 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:1005 -#: ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:1014 -#: ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "無効(_D)" @@ -1482,24 +1463,21 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:182 -#: ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:211 -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:231 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "フォルダの選択" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 -#: ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 msgid "Pageholder" msgstr "ページホルダ" @@ -1519,18 +1497,26 @@ msgstr "スクリプト" msgid "Plugins" msgstr "プラグイン" +#~ msgid "Manage search engines" +#~ msgstr "検索エンジンの管理" + #~ msgid "URIs" #~ msgstr "URIs" + #~ msgid "[URIs]" #~ msgstr "[URIs]" + #~ msgid "_URL:" #~ msgstr "URL(_U):" + #~ msgid "Root" #~ msgstr "ルート" + #~ msgid "HTTP Proxy" #~ msgstr "HTTP プロキシ" + #~ msgid "Open URL in New _Tab" #~ msgstr "URL を新しいタブで開く(_T)" + #~ msgid "Enforce 96 DPI" #~ msgstr "強制的に 96DPI にする" - From 75c54edabd3e2934246a3e84c094fcc8889cff18 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Jan 2009 20:22:01 +0100 Subject: [PATCH 0661/2970] Implement MIDORI_EXTENSION_PATH environment variable --- midori/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index f15f6304..a4dadad3 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1729,7 +1729,6 @@ midori_load_extensions (gpointer data) { MidoriApp* app = MIDORI_APP (data); KatzeArray* extensions; - gchar* extension_path; const gchar* filename; MidoriExtension* extension; guint n, i; @@ -1738,8 +1737,13 @@ midori_load_extensions (gpointer data) extensions = katze_array_new (MIDORI_TYPE_EXTENSION); if (g_module_supported ()) { - extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); - GDir* extension_dir = g_dir_open (extension_path, 0, NULL); + /* FIXME: Read extensions from system data dirs */ + gchar* extension_path; + GDir* extension_dir; + + if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH")))) + extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); + extension_dir = g_dir_open (extension_path, 0, NULL); if (extension_dir != NULL) { while ((filename = g_dir_read_name (extension_dir))) @@ -1749,6 +1753,10 @@ midori_load_extensions (gpointer data) typedef MidoriExtension* (*extension_init_func)(void); extension_init_func extension_init; + /* Ignore files which don't have the correct suffix */ + if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) + continue; + fullname = g_build_filename (extension_path, filename, NULL); module = g_module_open (fullname, G_MODULE_BIND_LOCAL); g_free (fullname); From 07bcc0acfaebbb1108dd59fc5ca10559dba35ddb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Jan 2009 20:27:56 +0100 Subject: [PATCH 0662/2970] Load extensions from the build folder if ./waf --run is used --- wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 26fbf2b9..0f924741 100644 --- a/wscript +++ b/wscript @@ -387,6 +387,7 @@ def shutdown (): folder = os.path.dirname (Build.bld.env['waf_config_files'][0]) try: command = folder + os.sep + APPNAME + os.sep + APPNAME - Utils.exec_command (command) + Utils.exec_command ('MIDORI_EXTENSION_PATH=' + folder + \ + os.sep + 'extensions' + ' ' + command) except: Utils.pprint ('RED', "Failed to run application.") From 93bb9f6c5b44ec694605ab8012594f8752841be5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 17 Jan 2009 19:38:00 +0100 Subject: [PATCH 0663/2970] Notify URI even before it is "committed" and add an error check --- midori/midori-view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 74733e8a..7f0da994 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -543,6 +543,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, g_object_freeze_notify (G_OBJECT (view)); uri = webkit_web_frame_get_uri (web_frame); + g_return_if_fail (uri != NULL); katze_assign (view->uri, g_strdup (uri)); g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); @@ -1621,6 +1622,7 @@ midori_view_set_uri (MidoriView* view, else { katze_assign (view->uri, g_strdup (uri)); + g_object_notify (G_OBJECT (view), "uri"); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } } From 97c80d0190d41f032e3aaccdb73e141e4a82b66d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 17 Jan 2009 23:52:09 +0100 Subject: [PATCH 0664/2970] Build Midori core as library, for easier use in tests --- midori/wscript_build | 21 ++++++++++++++++++--- tests/wscript_build | 4 ++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/midori/wscript_build b/midori/wscript_build index 9c8d1273..e15561fc 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -2,10 +2,25 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import platform + +obj = bld.new_task_gen ('cc', 'staticlib') +obj.name = 'midori' +obj.target = 'midori' +obj.includes = '. ..' +obj.find_sources_in_dirs ('.', excludes=['main.c']) +obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') +obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib_local = 'katze' +obj.install_path = None + +if platform.architecture ()[0] == '64bit': + obj.env.append_value ('CCFLAGS', '-fPIC') + obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' obj.includes = '. .. ../panels' -obj.find_sources_in_dirs ('. ../panels') -obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') +obj.source = 'main.c' +obj.find_sources_in_dirs ('../panels') obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' -obj.uselib_local = 'katze' +obj.uselib_local = 'midori' diff --git a/tests/wscript_build b/tests/wscript_build index e3cd8d4d..1a9ebc81 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -5,7 +5,7 @@ obj = bld.new_task_gen ('cc', 'program') obj.target = 'magic-uri' obj.includes = '.. ../midori' -obj.source = 'magic-uri.c ../midori/compat.c ../midori/sokoke.c' +obj.source = 'magic-uri.c' obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' -obj.uselib_local = 'katze' +obj.uselib_local = 'midori' obj.unit_test = 1 From 2f63822b60d79b96a61de7c814328a7158706322 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 17 Jan 2009 23:56:23 +0100 Subject: [PATCH 0665/2970] Implement a not yet functional menu for adding and removing tool items --- midori/midori-browser.c | 86 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 77 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ab2539ab..d649efca 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1575,8 +1575,24 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, } } +static void +midori_browser_toolbar_add_item_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + /* FIXME: Implement adding widgets */ +} + +static void +midori_browser_toolbar_remove_item_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + GtkWidget* widget = g_object_get_data (G_OBJECT (menuitem), "widget"); + gtk_container_remove (GTK_CONTAINER (browser->navigationbar), widget); + /* FIXME: Save the new list of items */ +} + static gboolean -midori_browser_toolbar_popup_context_menu_cb (GtkWidget* toolbar, +midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, gint x, gint y, gint button, @@ -1589,25 +1605,76 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* toolbar, menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Menubar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Navigationbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Bookmarkbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Transferbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Statusbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - katze_widget_popup (toolbar, GTK_MENU (menu), NULL, + if (widget == browser->navigationbar || + gtk_widget_is_ancestor (widget, browser->navigationbar)) + { + GtkAction* widget_action = gtk_widget_get_action (widget); + const gchar* actions[] = { "TabNew", "Open", "Print", "Find", + "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", + "ZoomOut", "Back", "Forward", "Homepage", "Trash", "Search" }; + GtkWidget* submenu; + gsize i; + + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + submenu = gtk_menu_new (); + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_ADD, NULL); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REMOVE, NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + if (widget_action && + strcmp (gtk_action_get_name (widget_action), "Location")) + { + g_object_set_data (G_OBJECT (menuitem), "widget", widget); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_toolbar_remove_item_cb), browser); + } + else + gtk_widget_set_sensitive (menuitem, FALSE); + + for (i = 0; i < G_N_ELEMENTS (actions); i++) + { + GtkAction* action = _action_by_name (browser, actions[i]); + gchar* stock_id = katze_object_get_string (action, "stock-id"); + gchar* label = katze_object_get_string (action, "label"); + + if (stock_id && label) + { + GtkWidget* icon; + + menuitem = gtk_image_menu_item_new_with_mnemonic (label); + icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + } + else if (stock_id) + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + else + menuitem = gtk_image_menu_item_new_with_mnemonic (label); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "widget", widget); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_browser_toolbar_add_item_cb), browser); + /* FIXME: Implement adding widgets */ + gtk_widget_set_sensitive (menuitem, FALSE); + } + } + + sokoke_container_show_children (GTK_CONTAINER (menu)); + katze_widget_popup (widget, GTK_MENU (menu), NULL, button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR); return TRUE; } @@ -3903,7 +3970,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->navigationbar), TRUE); gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0); g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); - sokoke_container_show_children (GTK_CONTAINER (browser->navigationbar)); gtk_widget_hide (browser->navigationbar); g_signal_connect (browser->navigationbar, "popup-context-menu", G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); @@ -4210,7 +4276,8 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, { if (event->button == 3) { - midori_browser_toolbar_popup_context_menu_cb (browser->navigationbar, + midori_browser_toolbar_popup_context_menu_cb ( + gtk_widget_get_parent (toolitem), event->x, event->y, event->button, browser); return TRUE; @@ -4728,6 +4795,7 @@ midori_browser_add_item (MidoriBrowser* browser, view = g_object_new (MIDORI_TYPE_VIEW, "title", title, "settings", browser->settings, + "net", browser->net, NULL); midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); From 60fd9b19d1a6f1d6849583163661127501309748 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 18 Jan 2009 03:58:05 +0100 Subject: [PATCH 0666/2970] Items can be added via the new toolbar menu now --- midori/midori-browser.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d649efca..599057e8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1575,11 +1575,33 @@ midori_browser_navigationbar_notify_style_cb (GObject* object, } } +static gboolean +midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser); + static void midori_browser_toolbar_add_item_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - /* FIXME: Implement adding widgets */ + GtkWidget* widget = g_object_get_data (G_OBJECT (menuitem), "widget"); + GtkAction* action = g_object_get_data (G_OBJECT (menuitem), "action"); + GtkWidget* toolitem = gtk_action_create_tool_item (action); + if (widget) + { + gint i = gtk_toolbar_get_item_index (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (widget)); + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (toolitem), i ? i : 0); + } + else + gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), + GTK_TOOL_ITEM (toolitem), 0); + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + /* FIXME: Save the new list of items */ } static void @@ -1665,11 +1687,11 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, else menuitem = gtk_image_menu_item_new_with_mnemonic (label); gtk_menu_shell_append (GTK_MENU_SHELL (submenu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "widget", widget); + if (widget_action) + g_object_set_data (G_OBJECT (menuitem), "widget", widget); + g_object_set_data (G_OBJECT (menuitem), "action", action); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_toolbar_add_item_cb), browser); - /* FIXME: Implement adding widgets */ - gtk_widget_set_sensitive (menuitem, FALSE); } } @@ -3564,11 +3586,6 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, gtk_entry_set_text (GTK_ENTRY (entry), ""); } -static gboolean -midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, - GdkEventButton* event, - MidoriBrowser* browser); - static void _tree_store_insert_history_item (GtkTreeStore* treestore, GtkTreeIter* parent, From 0255edba43233b8632e1fddaba599af403cbc809 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 18 Jan 2009 04:38:46 +0100 Subject: [PATCH 0667/2970] Save toolbar changes via the menu and remove the Toolbar Items entry --- midori/midori-browser.c | 33 ++++++++++++++++++++++++++++----- midori/midori-preferences.c | 13 +------------ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 599057e8..b19813cb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1580,13 +1580,36 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser); +static void +_midori_browser_save_toolbar_items (MidoriBrowser* browser) +{ + GString* toolbar_items; + GList* children; + gchar* items; + + toolbar_items = g_string_new (NULL); + children = gtk_container_get_children (GTK_CONTAINER (browser->navigationbar)); + for (; children != NULL; children = g_list_next (children)) + { + GtkAction* action = gtk_widget_get_action (GTK_WIDGET (children->data)); + if (strcmp (gtk_action_get_name (action), "Fullscreen")) + { + g_string_append (toolbar_items, gtk_action_get_name (action)); + g_string_append (toolbar_items, ","); + } + } + items = g_string_free (toolbar_items, FALSE); + g_object_set (browser->settings, "toolbar-items", items, NULL); + g_free (items); +} + static void midori_browser_toolbar_add_item_cb (GtkWidget* menuitem, MidoriBrowser* browser) { GtkWidget* widget = g_object_get_data (G_OBJECT (menuitem), "widget"); - GtkAction* action = g_object_get_data (G_OBJECT (menuitem), "action"); - GtkWidget* toolitem = gtk_action_create_tool_item (action); + GtkAction* widget_action = g_object_get_data (G_OBJECT (menuitem), "action"); + GtkWidget* toolitem = gtk_action_create_tool_item (widget_action); if (widget) { gint i = gtk_toolbar_get_item_index (GTK_TOOLBAR (browser->navigationbar), @@ -1601,7 +1624,7 @@ midori_browser_toolbar_add_item_cb (GtkWidget* menuitem, "button-press-event", G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); - /* FIXME: Save the new list of items */ + _midori_browser_save_toolbar_items (browser); } static void @@ -1610,7 +1633,7 @@ midori_browser_toolbar_remove_item_cb (GtkWidget* menuitem, { GtkWidget* widget = g_object_get_data (G_OBJECT (menuitem), "widget"); gtk_container_remove (GTK_CONTAINER (browser->navigationbar), widget); - /* FIXME: Save the new list of items */ + _midori_browser_save_toolbar_items (browser); } static gboolean @@ -1644,7 +1667,7 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, gtk_widget_is_ancestor (widget, browser->navigationbar)) { GtkAction* widget_action = gtk_widget_get_action (widget); - const gchar* actions[] = { "TabNew", "Open", "Print", "Find", + const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", "ZoomOut", "Back", "Forward", "Homepage", "Trash", "Search" }; GtkWidget* submenu; diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 8d85ca96..d8a389ec 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -496,21 +496,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); FRAME_NEW (_("Navigationbar")); - TABLE_NEW (3, 2); + TABLE_NEW (1, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); - INDENTED_ADD (katze_property_label (settings, "toolbar-items"), 0, 1, 1, 2); - button = katze_property_proxy (settings, "toolbar-items", NULL); - FILLED_ADD (button, 1, 2, 1, 2); - button = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (button), - "" - "Separator, TabNew, Open, Print, Find, Location, Preferences, Window, Bookmarks\n" - "ReloadStop, ZoomIn, ZoomOut, Back, Forward, Homepage, Search, Trash" - ""); - gtk_label_set_selectable (GTK_LABEL (button), TRUE); - FILLED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Browsing")); TABLE_NEW (5, 2); label = katze_property_label (settings, "open-new-pages-in"); From 08c122a0bace04d50081e1852f521416be0f8eca Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 18 Jan 2009 14:44:12 +0100 Subject: [PATCH 0668/2970] Update Russian translation --- po/ru.po | 804 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 447 insertions(+), 357 deletions(-) diff --git a/po/ru.po b/po/ru.po index 03ac73e1..f9ae5bb0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-04 18:58+0800\n" -"PO-Revision-Date: 2009-01-04 19:44+0800\n" +"POT-Creation-Date: 2009-01-17 22:32+0800\n" +"PO-Revision-Date: 2009-01-17 22:37+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Легковесный обозреватель интернет" #: ../midori.desktop.in.h:2 -#: ../midori/main.c:1828 -#: ../midori/main.c:1919 -#: ../midori/main.c:1928 -#: ../midori/main.c:1939 -#: ../midori/midori-websettings.c:235 +#: ../midori/main.c:1858 +#: ../midori/main.c:1960 +#: ../midori/main.c:1969 +#: ../midori/main.c:1980 +#: ../midori/midori-websettings.c:239 msgid "Midori" msgstr "Midori" @@ -35,10 +35,10 @@ msgstr "Обозреватель интернет" #: ../midori/main.c:87 msgid "_Bookmark" -msgstr "Закладка" +msgstr "_Закладка" #: ../midori/main.c:88 -#: ../midori/midori-browser.c:3796 +#: ../midori/midori-browser.c:3841 msgid "_Bookmarks" msgstr "_Закладки" @@ -60,7 +60,7 @@ msgstr "_Журнал" #: ../midori/main.c:93 msgid "_Homepage" -msgstr "Домашняя страница" +msgstr "Д_омашняя страница" #: ../midori/main.c:94 msgid "_Userscripts" @@ -80,7 +80,7 @@ msgstr "_Передачи" #: ../midori/main.c:98 msgid "_Closed Tabs and Windows" -msgstr "З_акрытые вкладки и окна" +msgstr "Закрытые _вкладки и окна" #: ../midori/main.c:99 msgid "New _Window" @@ -112,11 +112,15 @@ msgid "Malformed document." msgstr "Плохо сформированный документ." #: ../midori/main.c:568 -#: ../midori/main.c:600 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" +#: ../midori/main.c:600 +#, c-format +msgid "Failed to execute SQL statement: %s\n" +msgstr "Не удалось выполнить SQL-запрос: %s\n" + #: ../midori/main.c:654 #, c-format msgid "Failed to remove history item: %s\n" @@ -134,55 +138,57 @@ msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:841 +#: ../midori/main.c:838 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:869 +#: ../midori/main.c:866 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:897 -#: ../midori/main.c:915 +#: ../midori/main.c:894 +#: ../midori/main.c:912 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:1045 -#: ../midori/sokoke.c:522 +#: ../midori/main.c:1042 +#: ../midori/sokoke.c:532 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/main.c:1075 -#: ../midori/main.c:1100 +#: ../midori/main.c:1063 +#: ../midori/main.c:1090 +#: ../midori/main.c:1118 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/main.c:1123 -#: ../midori/main.c:1147 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1142 +#: ../midori/main.c:1166 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:1168 -#: ../midori/midori-preferences.c:381 +#: ../midori/main.c:1187 +#: ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "Передачи" -#: ../midori/main.c:1204 +#: ../midori/main.c:1223 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1530 +#: ../midori/main.c:1547 msgid "Authentication Required" msgstr "Требуется авторизация" -#: ../midori/main.c:1546 +#: ../midori/main.c:1563 msgid "" "A username and a password are required\n" "to open this location:" @@ -190,104 +196,103 @@ msgstr "" "Для просмотра этой страницы требуются\n" "имя пользователя и пароль:" -#: ../midori/main.c:1560 +#: ../midori/main.c:1577 msgid "Username" msgstr "Имя пользователя" -#: ../midori/main.c:1571 +#: ../midori/main.c:1588 msgid "Password" msgstr "Пароль" -#: ../midori/main.c:1675 +#: ../midori/main.c:1694 msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1690 +#: ../midori/main.c:1709 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1694 +#: ../midori/main.c:1713 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1699 +#: ../midori/main.c:1718 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1828 +#: ../midori/main.c:1858 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1857 +#: ../midori/main.c:1890 #: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1880 +#: ../midori/main.c:1913 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1882 +#: ../midori/main.c:1915 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1884 -msgid "URIs" -msgstr "Идентификаторы URI" +#: ../midori/main.c:1917 +msgid "Addresses" +msgstr "Адреса" -#: ../midori/main.c:1916 -msgid "[URIs]" -msgstr "[Идентификаторы URI]" +#: ../midori/main.c:1957 +msgid "[Addresses]" +msgstr "[Адреса]" -#: ../midori/main.c:1940 +#: ../midori/main.c:1981 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1942 +#: ../midori/main.c:1983 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1965 -#, c-format +#: ../midori/main.c:2010 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:2024 +#: ../midori/main.c:2073 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:2039 +#: ../midori/main.c:2088 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:2052 +#: ../midori/main.c:2101 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:2065 +#: ../midori/main.c:2114 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:2077 +#: ../midori/main.c:2126 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2093 +#: ../midori/main.c:2142 msgid "_Ignore" msgstr "_Игнорировать" #: ../midori/midori-browser.c:248 -#: ../midori/midori-browser.c:3154 -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3202 msgid "Reload the current page" msgstr "Обновить страницу" #: ../midori/midori-browser.c:260 -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3199 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" @@ -314,913 +319,943 @@ msgid "_Title:" msgstr "_Заголовок:" #: ../midori/midori-browser.c:541 -#: ../midori/midori-searchaction.c:868 +#: ../midori/midori-searchaction.c:834 msgid "_Description:" msgstr "_Описание:" #: ../midori/midori-browser.c:560 -#: ../midori/midori-searchaction.c:882 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-searchaction.c:848 +msgid "_Address:" +msgstr "_Адрес:" #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:582 -#: ../midori/midori-browser.c:618 -msgid "Root" -msgstr "Root" +#: ../midori/midori-browser.c:583 +#: ../midori/midori-browser.c:619 +msgid "Toplevel folder" +msgstr "Корневая папка" -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1291 +#: ../midori/midori-browser.c:1301 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2368 +#: ../midori/midori-browser.c:2434 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2370 +#: ../midori/midori-browser.c:2436 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2645 +#: ../midori/midori-browser.c:2687 msgid "Separator" msgstr "Разделитель" -#: ../midori/midori-browser.c:2756 +#: ../midori/midori-browser.c:2794 #, c-format msgid "A week ago" msgstr "Неделю назад" -#: ../midori/midori-browser.c:2762 +#: ../midori/midori-browser.c:2800 #, c-format msgid "%d days ago" msgstr "%d дней назад" -#: ../midori/midori-browser.c:2769 +#: ../midori/midori-browser.c:2807 msgid "Today" msgstr "Сегодня" -#: ../midori/midori-browser.c:2771 +#: ../midori/midori-browser.c:2809 msgid "Yesterday" msgstr "Вчера" -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:2898 msgid "A lightweight web browser." msgstr "Легковесный обозреватель интернет." -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:2906 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3039 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3130 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3091 +#: ../midori/midori-browser.c:3133 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3136 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3139 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3142 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3144 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3145 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3147 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3148 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:3151 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3154 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3156 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3159 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3120 -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3165 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3168 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3171 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3174 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3177 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3179 msgid "Find _Next" -msgstr "Найти _далее" +msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3180 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3182 msgid "Find _Previous" -msgstr "Найти Предыдущее" +msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3183 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3186 msgid "_Quick Find" msgstr "_Быстрый Поиск" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3187 msgid "Quickly jump to a word or phrase" msgstr "Перепрыгнуть на слово или фразу" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3190 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3192 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3193 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3205 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3208 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3211 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3171 -#: ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3213 +#: ../midori/midori-view.c:978 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3214 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3216 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3217 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3221 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3181 +#: ../midori/midori-browser.c:3223 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3226 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3229 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3232 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3234 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3235 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3195 -#: ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3237 +#: ../midori/midori-view.c:950 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3238 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3242 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3245 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3248 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3251 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3254 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3257 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3259 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3219 -#: ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3261 +#: ../midori/midori-searchaction.c:462 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3262 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3266 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3267 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3269 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3270 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3272 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3274 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3275 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3235 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3277 +msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3278 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3238 -msgid "_Report a bug" +#: ../midori/midori-browser.c:3280 +msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3281 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3284 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3291 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3292 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3297 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3298 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3301 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3302 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3305 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3306 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3309 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3310 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3313 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3314 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3317 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3318 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3766 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3723 +#: ../midori/midori-browser.c:3768 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3747 +#: ../midori/midori-browser.c:3792 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3749 +#: ../midori/midori-browser.c:3794 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3813 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3826 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3828 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3798 +#: ../midori/midori-browser.c:3843 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3811 +#: ../midori/midori-browser.c:3856 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:3858 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:3981 msgid "Bookmarks" msgstr "Закладки" -#: ../midori/midori-browser.c:3978 -#: ../midori/midori-preferences.c:582 +#: ../midori/midori-browser.c:4024 +#: ../midori/midori-preferences.c:604 msgid "History" msgstr "Журнал" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4021 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4071 +msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:4092 +msgid "Previous" +msgstr "Назад" + +#: ../midori/midori-browser.c:4097 +msgid "Next" +msgstr "Далее" + +#: ../midori/midori-browser.c:4102 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4060 +#: ../midori/midori-browser.c:4110 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4069 +#: ../midori/midori-browser.c:4119 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4317 +#: ../midori/midori-browser.c:4367 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:223 -#: ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:191 +#: ../midori/midori-panel.c:192 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:145 -#: ../midori/midori-view.c:1742 +#: ../midori/midori-websettings.c:149 +#: ../midori/midori-view.c:1706 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:146 -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:424 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:151 msgid "Last open pages" msgstr "Последние закрытые страницы" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:166 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:167 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:168 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:169 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:170 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-websettings.c:167 -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:243 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:186 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:187 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:188 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:203 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:204 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:205 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:206 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:207 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "All cookies" msgstr "Все куки" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:223 msgid "Session cookies" msgstr "Куки сессии" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:224 #: ../panels/midori-addons.c:96 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:242 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:283 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:284 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:292 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:293 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:301 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:302 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:310 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:311 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:320 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:321 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:340 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:349 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:357 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:358 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:366 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:367 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:375 msgid "Show Statusbar" msgstr "Показать вкладку статуса" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:376 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:385 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:386 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:395 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:404 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:405 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:414 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:440 +msgid "Show crash dialog" +msgstr "Показывать окно после сбоя" + +#: ../midori/midori-websettings.c:441 +msgid "Show a dialog after Midori crashed" +msgstr "Показывать окно действий после аварийного завершения работы" + +#: ../midori/midori-websettings.c:449 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:450 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который сохранялись файлы" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:458 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:459 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:467 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:468 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:476 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:477 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:485 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:486 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:496 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:497 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:505 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:506 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Open new pages in" msgstr "Открыть новую страницу в" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Where to open new pages" msgstr "Где открыть новую страницу в" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:526 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:527 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страницы при открытии" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:540 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:517 -msgid "Load an URL from the selection via middle click" -msgstr "Загружать выделенный URL средней кнопкой" +#: ../midori/midori-websettings.c:541 +msgid "Load an address from the selection via middle click" +msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:549 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:550 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:558 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:559 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:567 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:568 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:619 +msgid "Zoom Text and Images" +msgstr "Масштабировать текст и изображения" + +#: ../midori/midori-websettings.c:620 +msgid "Whether to zoom text and images" +msgstr "Изменять масштаб текста и изображений" + +#: ../midori/midori-websettings.c:630 msgid "Accept cookies" msgstr "Разрешить куки" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:631 msgid "What type of cookies to accept" msgstr "Тип принимаемых куки" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:644 msgid "Original cookies only" msgstr "Только оригинальные куки" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:645 msgid "Accept cookies from the original website only" msgstr "Принимать куки только с оригинального веб-сайта" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:653 msgid "Maximum cookie age" msgstr "Максимальный возраст куки" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:654 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения куки" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:664 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:665 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:673 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:674 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:682 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:683 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:691 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:692 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:659 -msgid "HTTP Proxy" -msgstr "HTTP-прокси" +#: ../midori/midori-websettings.c:702 +msgid "Proxy Server" +msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:660 -msgid "The proxy used for HTTP connections" -msgstr "Прокси-сервер для HTTP соединений" +#: ../midori/midori-websettings.c:703 +msgid "The proxy server used for HTTP connections" +msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:679 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:723 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:724 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации браузера" -#: ../midori/midori-websettings.c:700 +#: ../midori/midori-websettings.c:744 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:745 msgid "The application identification string" msgstr "Строка идентификатора приложения" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:757 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:758 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:701 +#: ../midori/midori-view.c:602 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:981 +#: ../midori/midori-view.c:882 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:905 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:1012 +#: ../midori/midori-view.c:913 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:1034 -msgid "Open URL in New _Tab" -msgstr "Открыть URL в новой _вкладке" +#: ../midori/midori-view.c:935 +msgid "Open Address in New _Tab" +msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1463 +#: ../midori/midori-view.c:1405 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1606 +#: ../midori/midori-view.c:1554 msgid "Source" msgstr "Исходный код" -#: ../midori/midori-view.c:1630 +#: ../midori/midori-view.c:1578 +#, c-format +msgid "Document cannot be displayed" +msgstr "Не удалось отобразить документ" + +#: ../midori/midori-view.c:1594 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" @@ -1231,154 +1266,195 @@ msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "Запуск" #. Page "Appearance" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:423 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:431 +msgid "The default font size used to display text" +msgstr "Размер шрифта для отображения текста по умолчанию" + +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" #: ../midori/midori-preferences.c:437 +msgid "The minimum font size used to display text" +msgstr "Наименьший размер шрифта для отображения текста" + +#: ../midori/midori-preferences.c:444 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:447 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:455 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:451 -#: ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:458 +#: ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:459 +msgid "Load and display images automatically" +msgstr "Загружать и отображать изображения автоматически" + +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:463 +msgid "Automatically shrink standalone images to fit" +msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" + +#: ../midori/midori-preferences.c:466 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:467 +msgid "Whether background images should be printed" +msgstr "Должны ли быть выведены на печать фоновые изображения" + +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:463 -#: ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:471 +msgid "Whether text areas are resizable" +msgstr "Текстовые поля могут изменять размер" + +#: ../midori/midori-preferences.c:474 +#: ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:466 -#: ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:475 +msgid "Enable embedded scripting languages" +msgstr "Выполнять встроенные сценарии на страницах" + +#: ../midori/midori-preferences.c:478 +#: ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Использовать модули" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:479 +msgid "Enable embedded plugin objects" +msgstr "Разрешить встроенные объекты модулей на страницах" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce 96 dots per inch" +msgstr "Всегда использовать разрешение 96 точек на дюйм" + +#: ../midori/midori-preferences.c:483 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Принудительно использовать разрешение 96 точек на дюйм" + +#: ../midori/midori-preferences.c:486 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:472 -msgid "Enforce 96 DPI" -msgstr "Всегда использовать 96 DPI" +#: ../midori/midori-preferences.c:487 +msgid "Enable special extensions for developers" +msgstr "Включить особые расширения для разработчиков" #. Page "Interface" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:498 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:514 msgid "Browsing" msgstr "Навигация" -#: ../midori/midori-preferences.c:528 -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:550 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:551 +#: ../midori/midori-preferences.c:572 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:558 +#: ../midori/midori-preferences.c:579 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:586 msgid "Web Cookies" msgstr "Разрешить куки" -#: ../midori/midori-preferences.c:577 -#: ../midori/midori-preferences.c:589 +#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:611 msgid "days" msgstr "дней" -#: ../midori/midori-searchaction.c:487 -#: ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:453 +#: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:790 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:790 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:852 +#: ../midori/midori-searchaction.c:818 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:862 msgid "_Icon (name or file):" msgstr "_Значок (имя или файл):" -#: ../midori/midori-searchaction.c:910 +#: ../midori/midori-searchaction.c:876 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1087 -msgid "Manage search engines" -msgstr "Управление средствами поиска" +#: ../midori/midori-searchaction.c:1053 +msgid "Manage Search Engines" +msgstr "Управление поисковыми сервисами" #: ../midori/sokoke.c:101 #: ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/sokoke.c:345 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:355 msgid "Warning: You are using a superuser account!" msgstr "Внимание: используется учётная запись суперпользователя!" @@ -1440,18 +1516,18 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:182 -#: ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:211 -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:231 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "Выберите папку" @@ -1465,18 +1541,34 @@ msgstr "Контейнер" msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" msgstr "Изображения" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "Сценарии" -#: ../extensions/statusbar-features.c:44 +#: ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "Модули" +#~ msgid "URIs" +#~ msgstr "Идентификаторы URI" +#~ msgid "[URIs]" +#~ msgstr "[Идентификаторы URI]" +#~ msgid "_URL:" +#~ msgstr "_URL:" +#~ msgid "Root" +#~ msgstr "Root" +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP-прокси" +#~ msgid "Open URL in New _Tab" +#~ msgstr "Открыть URL в новой _вкладке" +#~ msgid "Enforce 96 DPI" +#~ msgstr "Всегда использовать 96 DPI" +#~ msgid "Manage search engines" +#~ msgstr "Управление средствами поиска" #~ msgid "Open in Page_holder..." #~ msgstr "Открыть в _контейнере..." #~ msgid "Open the current page in the pageholder" @@ -1557,8 +1649,6 @@ msgstr "Модули" #~ msgstr "Показать поиск" #~ msgid "Show the Web search entry in the toolbar" #~ msgstr "Показывать запись сетевого поиска в панели инструментов" -#~ msgid "Show Trash" -#~ msgstr "Показать корзину" #~ msgid "Show the Trash button in the toolbar" #~ msgstr "Показать кнопку Корзина в панели инструментов" #~ msgid "Load Finished" From ab57a447848ed0fcd3fe04978892983211426a54 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sun, 18 Jan 2009 16:59:02 +0100 Subject: [PATCH 0669/2970] Update Japanese translation --- po/ja.po | 606 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 311 insertions(+), 295 deletions(-) diff --git a/po/ja.po b/po/ja.po index 63e6c5b5..069966f5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.0\n" +"Project-Id-Version: Midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-14 15:43+0900\n" -"PO-Revision-Date: 2009-01-14 15:17+0900\n" +"POT-Creation-Date: 2009-01-19 00:13+0900\n" +"PO-Revision-Date: 2009-01-16 15:53+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../midori.desktop.in.h:2 ../midori/main.c:1831 ../midori/main.c:1925 -#: ../midori/main.c:1934 ../midori/main.c:1945 -#: ../midori/midori-websettings.c:237 +#: ../midori.desktop.in.h:2 ../midori/main.c:1858 ../midori/main.c:1960 +#: ../midori/main.c:1969 ../midori/main.c:1980 +#: ../midori/midori-websettings.c:239 msgid "Midori" msgstr "Midori" @@ -34,7 +34,7 @@ msgstr "ウェブブラウザ" msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/main.c:88 ../midori/midori-browser.c:3841 +#: ../midori/main.c:88 ../midori/midori-browser.c:3948 msgid "_Bookmarks" msgstr "ブックマーク(_B)" @@ -151,31 +151,31 @@ msgstr "検索エンジンを保存できませんでした。%s" msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1072 ../midori/main.c:1097 +#: ../midori/main.c:1063 ../midori/main.c:1090 ../midori/main.c:1118 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1121 ../midori/main.c:1145 +#: ../midori/main.c:1142 ../midori/main.c:1166 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1166 ../midori/midori-preferences.c:385 +#: ../midori/main.c:1187 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "転送" -#: ../midori/main.c:1202 +#: ../midori/main.c:1223 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1528 +#: ../midori/main.c:1547 msgid "Authentication Required" msgstr "認証が要求されました" -#: ../midori/main.c:1544 +#: ../midori/main.c:1563 msgid "" "A username and a password are required\n" "to open this location:" @@ -183,15 +183,15 @@ msgstr "" "この場所を開くためにはユーザ名とパスワードが\n" "必要です:" -#: ../midori/main.c:1558 +#: ../midori/main.c:1577 msgid "Username" msgstr "ユーザ名" -#: ../midori/main.c:1569 +#: ../midori/main.c:1588 msgid "Password" msgstr "パスワード" -#: ../midori/main.c:1675 +#: ../midori/main.c:1694 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." @@ -199,90 +199,90 @@ msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" "ようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1690 +#: ../midori/main.c:1709 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1694 +#: ../midori/main.c:1713 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1699 +#: ../midori/main.c:1718 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1831 +#: ../midori/main.c:1858 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1863 ../midori/gjs.c:514 +#: ../midori/main.c:1890 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1886 +#: ../midori/main.c:1913 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1888 +#: ../midori/main.c:1915 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1890 +#: ../midori/main.c:1917 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1922 +#: ../midori/main.c:1957 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1946 +#: ../midori/main.c:1981 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1948 +#: ../midori/main.c:1983 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1975 +#: ../midori/main.c:2010 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:2036 +#: ../midori/main.c:2073 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:2051 +#: ../midori/main.c:2088 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:2064 +#: ../midori/main.c:2101 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:2077 +#: ../midori/main.c:2114 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:2089 +#: ../midori/main.c:2126 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2105 +#: ../midori/main.c:2142 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3196 -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3314 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3311 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" @@ -332,426 +332,434 @@ msgstr "名前を付けて保存" msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2434 +#: ../midori/midori-browser.c:2546 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2436 +#: ../midori/midori-browser.c:2548 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2687 +#: ../midori/midori-browser.c:2799 msgid "Separator" msgstr "セパレータ" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:2906 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2912 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2919 msgid "Today" msgstr "今日" -#: ../midori/midori-browser.c:2809 +#: ../midori/midori-browser.c:2921 msgid "Yesterday" msgstr "昨日" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:3010 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3018 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3151 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3242 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3245 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3248 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3251 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3254 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3256 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3257 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3259 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3260 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3263 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3266 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3268 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3271 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3162 ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3274 ../midori/midori-browser.c:3277 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3280 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3283 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3286 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3289 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3291 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3292 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3294 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3295 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3186 +#: ../midori/midori-browser.c:3298 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3299 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3302 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3304 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3305 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3317 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3320 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3323 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3213 ../midori/midori-view.c:978 +#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:979 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3326 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3328 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3329 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3333 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3335 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3338 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3341 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3344 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3346 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3347 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3237 ../midori/midori-view.c:950 +#: ../midori/midori-browser.c:3349 ../midori/midori-view.c:951 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3238 +#: ../midori/midori-browser.c:3350 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3354 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3357 msgid "Edit the selected bookmark" msgstr "選択されたブックマークを編集します" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3360 msgid "Delete the selected bookmark" msgstr "選択されたブックマークを削除します" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3363 msgid "Delete the selected history item" msgstr "選択された履歴アイテムを削除します" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3366 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3369 msgid "Bookmark the selected history item" msgstr "選択された履歴アイテムをブックマークに追加します" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3371 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3261 ../midori/midori-searchaction.c:462 +#: ../midori/midori-browser.c:3373 ../midori/midori-searchaction.c:462 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3374 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3266 +#: ../midori/midori-browser.c:3378 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3379 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3269 +#: ../midori/midori-browser.c:3381 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3382 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3384 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3386 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3387 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3277 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3389 +msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3390 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3280 -msgid "_Report a bug" +#: ../midori/midori-browser.c:3392 +msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3393 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3284 +#: ../midori/midori-browser.c:3396 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3403 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3404 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3297 +#: ../midori/midori-browser.c:3409 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3298 +#: ../midori/midori-browser.c:3410 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3301 +#: ../midori/midori-browser.c:3413 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3414 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3417 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3306 +#: ../midori/midori-browser.c:3418 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3421 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3310 +#: ../midori/midori-browser.c:3422 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3313 +#: ../midori/midori-browser.c:3425 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3426 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3429 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3318 +#: ../midori/midori-browser.c:3430 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3766 +#: ../midori/midori-browser.c:3873 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3875 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3792 +#: ../midori/midori-browser.c:3899 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:3901 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:3920 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3826 +#: ../midori/midori-browser.c:3933 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3935 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3843 +#: ../midori/midori-browser.c:3950 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3963 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3965 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:3981 +#: ../midori/midori-browser.c:4087 msgid "Bookmarks" msgstr "ブックマーク" -#: ../midori/midori-browser.c:4024 ../midori/midori-preferences.c:596 +#: ../midori/midori-browser.c:4130 ../midori/midori-preferences.c:593 msgid "History" msgstr "履歴" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4071 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4177 +msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4198 +msgid "Previous" +msgstr "前を検索" + +#: ../midori/midori-browser.c:4203 +msgid "Next" +msgstr "次を検索" + +#: ../midori/midori-browser.c:4208 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4216 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:4225 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4474 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -760,461 +768,469 @@ msgstr "'%s' は予想外の設定です" msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:147 ../midori/midori-view.c:1687 +#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:148 ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:151 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:166 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:167 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:168 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:169 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:170 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-websettings.c:169 ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:186 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:188 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:203 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:204 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:205 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:206 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:207 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:222 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:283 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:284 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶するかどうか指定します" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:292 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:291 +#: ../midori/midori-websettings.c:293 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:301 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:300 +#: ../midori/midori-websettings.c:302 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:310 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:311 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:320 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:321 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:329 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:330 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:337 +#: ../midori/midori-websettings.c:339 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Whether to show the menubar" msgstr "メニューバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:346 +#: ../midori/midori-websettings.c:348 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:357 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:358 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:366 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:367 msgid "Whether to show the panel" msgstr "パネルを表示するかどうか指定します" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:396 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to make the sidepanel compact" msgstr "コンパクトなサイドパネルを表示します" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:415 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:438 ../midori/midori-preferences.c:382 +#: ../midori/midori-websettings.c:440 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:439 ../midori/midori-preferences.c:383 +#: ../midori/midori-websettings.c:441 msgid "Show a dialog after Midori crashed" -msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" +msgstr "Midori がクラッシュした後の起動時にダイアログを表示する" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:449 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:450 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:458 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:476 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:477 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:496 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:497 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:506 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:515 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:516 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:526 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:527 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:540 msgid "Middle click opens Selection" msgstr "選択範囲のミドルクリックで開く" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:541 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをミドルクリックすると読み込みます" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:549 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:550 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:558 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:559 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:567 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:568 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:619 +msgid "Zoom Text and Images" +msgstr "文字や画像を拡大/縮小する" + +#: ../midori/midori-websettings.c:620 +msgid "Whether to zoom text and images" +msgstr "文字や画像の拡大/縮小を可能にするかどうか指定します" + +#: ../midori/midori-websettings.c:630 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:631 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:644 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:645 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:628 +#: ../midori/midori-websettings.c:653 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:654 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:664 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:665 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:673 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:674 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:682 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:683 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:691 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:692 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:702 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:678 +#: ../midori/midori-websettings.c:703 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:698 +#: ../midori/midori-websettings.c:723 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:699 +#: ../midori/midori-websettings.c:724 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:744 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:745 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:757 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:758 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:602 +#: ../midori/midori-view.c:603 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:882 +#: ../midori/midori-view.c:883 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:905 +#: ../midori/midori-view.c:906 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:913 +#: ../midori/midori-view.c:914 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:935 +#: ../midori/midori-view.c:936 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1392 +#: ../midori/midori-view.c:1406 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1535 +#: ../midori/midori-view.c:1555 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1559 +#: ../midori/midori-view.c:1579 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1575 +#: ../midori/midori-view.c:1595 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1225,151 +1241,151 @@ msgid "Preferences for %s" msgstr "%s の設定" #. Page "General" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "一般" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "起動" #. Page "Appearance" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:423 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:430 +#: ../midori/midori-preferences.c:431 msgid "The default font size used to display text" msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:433 +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:437 msgid "The minimum font size used to display text" msgstr "文字表示で使用される最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:444 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:447 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:455 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:457 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:459 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:463 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:466 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:467 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" msgstr "テキストエリアのサイズを変更可能にする" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:471 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を有効にします" -#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:475 msgid "Enable embedded scripting languages" msgstr "組み込まれたスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:477 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:479 msgid "Enable embedded plugin objects" msgstr "組み込みプラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:482 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:483 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:486 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:487 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:498 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:503 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:575 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:591 ../midori/midori-preferences.c:603 +#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 msgid "days" msgstr "日" From 0fbc478a8a2c9d41696e04c62c3571b3b866ad74 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 18 Jan 2009 20:34:50 +0100 Subject: [PATCH 0670/2970] Implement Plugins panel, not quite finished but already useful --- midori/main.c | 6 + panels/midori-plugins.c | 329 ++++++++++++++++++++++++++++++++++++++++ panels/midori-plugins.h | 43 ++++++ po/POTFILES.in | 1 + 4 files changed, 379 insertions(+) create mode 100644 panels/midori-plugins.c create mode 100644 panels/midori-plugins.h diff --git a/midori/main.c b/midori/main.c index a4dadad3..5749577c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -22,6 +22,7 @@ #include "midori-extensions.h" #include "midori-panel.h" #include "midori-preferences.h" +#include "midori-plugins.h" #include "midori-stock.h" #include "midori-view.h" #include "midori-websettings.h" @@ -1202,6 +1203,11 @@ midori_app_add_browser_cb (MidoriApp* app, gtk_widget_show (addon); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + /* Plugins */ + addon = g_object_new (MIDORI_TYPE_PLUGINS, "app", app, NULL); + gtk_widget_show (addon); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + /* Extensions */ addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL); gtk_widget_show (addon); diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c new file mode 100644 index 00000000..d0a440de --- /dev/null +++ b/panels/midori-plugins.c @@ -0,0 +1,329 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-plugins.h" + +#include "midori-app.h" +#include "midori-stock.h" +#include "midori-viewable.h" + +#include "sokoke.h" +#include + +struct _MidoriPlugins +{ + GtkVBox parent_instance; + + GtkWidget* toolbar; + GtkWidget* treeview; + MidoriApp* app; +}; + +struct _MidoriPluginsClass +{ + GtkVBoxClass parent_class; +}; + +static void +midori_plugins_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriPlugins, midori_plugins, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_plugins_viewable_iface_init)); + +enum +{ + PROP_0, + + PROP_APP +}; + +static void +midori_plugins_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_plugins_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_plugins_class_init (MidoriPluginsClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_plugins_set_property; + gobject_class->get_property = midori_plugins_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_APP, + g_param_spec_object ( + "app", + "App", + "The app", + MIDORI_TYPE_APP, + flags)); +} + +static const gchar* +midori_plugins_get_label (MidoriViewable* viewable) +{ + return _("Plugins"); +} + +static const gchar* +midori_plugins_get_stock_id (MidoriViewable* viewable) +{ + /* FIXME: We need a dedicated stock id */ + return GTK_STOCK_CONVERT /* STOCK_PLUGINS */; +} + +static GtkWidget* +midori_plugins_get_toolbar (MidoriViewable* plugins) +{ + if (!MIDORI_PLUGINS (plugins)->toolbar) + { + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + toolitem = gtk_tool_item_new (); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + + MIDORI_PLUGINS (plugins)->toolbar = toolbar; + } + + return MIDORI_PLUGINS (plugins)->toolbar; +} + +static void +midori_plugins_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_plugins_get_stock_id; + iface->get_label = midori_plugins_get_label; + iface->get_toolbar = midori_plugins_get_toolbar; +} + +static void +midori_plugins_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriPlugins* plugins = MIDORI_PLUGINS (object); + + switch (prop_id) + { + case PROP_APP: + plugins->app = g_value_get_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_plugins_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriPlugins* plugins = MIDORI_PLUGINS (object); + + switch (prop_id) + { + case PROP_APP: + g_value_set_object (value, plugins->app); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_plugins_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + g_object_set (renderer, "stock-id", GTK_STOCK_EXECUTE, NULL); +} + +static void +midori_plugins_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + gchar* name; + gchar* text; + gchar* description; + + gtk_tree_model_get (model, iter, 0, &name, 1, &description, -1); + + text = g_strdup_printf ("%s\n%s", name, description); + g_free (name); + g_free (description); + g_object_set (renderer, "text", text, NULL); + g_free (text); +} + +static void +midori_plugins_add_item (MidoriPlugins* plugins, + const gchar* name, + const gchar* description) +{ + gchar* desc; + GtkTreeIter iter; + GtkTreeModel* model; + + desc = g_strdup (description); + if (desc) + { + gsize i, n; + + n = strlen (desc); + for (i = 0; i < n; i++) + if (desc[i] == ';') + desc[i] = '\n'; + } + model = gtk_tree_view_get_model (GTK_TREE_VIEW (plugins->treeview)); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, name, 1, desc, -1); + g_free (desc); +} + +static void +midori_plugins_init (MidoriPlugins* plugins) +{ + /* Create the treeview */ + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_text; + GtkCellRenderer* renderer_pixbuf; + GtkListStore* liststore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + plugins->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (plugins->treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_plugins_treeview_render_icon_cb, + plugins->treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_plugins_treeview_render_text_cb, + plugins->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (plugins->treeview), column); + g_object_unref (liststore); + gtk_widget_show (plugins->treeview); + gtk_box_pack_start (GTK_BOX (plugins), plugins->treeview, TRUE, TRUE, 0); + + /* FIXME: Monitor folders for newly added and removes files */ + if (g_module_supported ()) + { + /* FIXME: WebKit is also looking in legacy folders, + we should have API to obtain that same list. */ + gchar** plugin_dirs; + gsize i = 0; + + if (g_getenv ("MOZ_PLUGIN_PATH")) + plugin_dirs = g_strsplit (g_getenv ("MOZ_PLUGIN_PATH"), ":", 0); + else + plugin_dirs = g_strsplit ("/usr/lib/mozilla/plugins", ":", 0); + + while (plugin_dirs[i]) + { + gchar* plugin_path; + GDir* plugin_dir; + + plugin_path = g_build_filename (plugin_dirs[i], NULL); + plugin_dir = g_dir_open (plugin_path, 0, NULL); + if (plugin_dir != 0) + { + const gchar* filename; + + while ((filename = g_dir_read_name (plugin_dir))) + { + gchar* fullname; + GModule* module; + typedef int (*NP_GetValue_func)(void* instance, + int variable, + void* value); + NP_GetValue_func NP_GetValue; + const gchar* plugin_name; + const gchar* plugin_description; + + fullname = g_build_filename (plugin_path, filename, NULL); + module = g_module_open (fullname, G_MODULE_BIND_LOCAL); + g_free (fullname); + + if (module && g_module_symbol (module, "NP_GetValue", + (gpointer) &NP_GetValue)) + { + typedef const gchar* (*NP_GetMIMEDescription_func)(void); + NP_GetMIMEDescription_func NP_GetMIMEDescription; + + NP_GetValue (NULL, 2, &plugin_name); + if (g_module_symbol (module, "NP_GetMIMEDescription", + (gpointer) &NP_GetMIMEDescription)) + plugin_description = NP_GetMIMEDescription (); + else + plugin_description = g_module_error (); + } + else + { + plugin_name = filename; + plugin_description = g_module_error (); + } + + midori_plugins_add_item (plugins, plugin_name, plugin_description); + } + g_dir_close (plugin_dir); + } + g_free (plugin_path); + i++; + } + g_strfreev (plugin_dirs); + } +} + +/** + * midori_plugins_new: + * + * Creates a new empty plugins. + * + * Return value: a new #MidoriPlugins + * + * Since: 0.1.3 + **/ +GtkWidget* +midori_plugins_new (void) +{ + MidoriPlugins* plugins = g_object_new (MIDORI_TYPE_PLUGINS, NULL); + + return GTK_WIDGET (plugins); +} diff --git a/panels/midori-plugins.h b/panels/midori-plugins.h new file mode 100644 index 00000000..00ee00c3 --- /dev/null +++ b/panels/midori-plugins.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_PLUGINS_H__ +#define __MIDORI_PLUGINS_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_PLUGINS \ + (midori_plugins_get_type ()) +#define MIDORI_PLUGINS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_PLUGINS, MidoriPlugins)) +#define MIDORI_PLUGINS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_PLUGINS, MidoriPluginsClass)) +#define MIDORI_IS_PLUGINS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_PLUGINS)) +#define MIDORI_IS_PLUGINS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_PLUGINS)) +#define MIDORI_PLUGINS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_PLUGINS, MidoriPluginsClass)) + +typedef struct _MidoriPlugins MidoriPlugins; +typedef struct _MidoriPluginsClass MidoriPluginsClass; + +GType +midori_plugins_get_type (void); + +GtkWidget* +midori_plugins_new (void); + +G_END_DECLS + +#endif /* __MIDORI_PLUGINS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 692b8864..1b11da2e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,6 +15,7 @@ midori/gjs.c panels/midori-addons.c panels/midori-console.c panels/midori-extensions.c +panels/midori-plugins.c katze/katze-throbber.c katze/katze-utils.c katze/katze-item.c From 235df3f04d5c1459888af0e483b2c83bb7af9e1b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jan 2009 01:12:43 +0100 Subject: [PATCH 0671/2970] Catch incompatible waf early, ie. with a globally installed waf --- wscript | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 0f924741..f3eb8c09 100644 --- a/wscript +++ b/wscript @@ -2,11 +2,21 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import sys + +# Waf version check, for global waf installs +try: + from Constants import WAFVERSION +except: + WAFVERSION='1.0.0' +if WAFVERSION[:3] != '1.5': + print 'Incompatible Waf, use 1.5' + sys.exit (1) + import Build import Options import Utils import pproc as subprocess -import sys import os import UnitTest From 9f6174150355c3d4438affeeaf4360971727ff6b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jan 2009 22:30:42 +0100 Subject: [PATCH 0672/2970] Update translation template --- midori/main.c | 2 +- po/midori.pot | 816 ++++++++++++++++++++++++++------------------------ 2 files changed, 426 insertions(+), 392 deletions(-) diff --git a/midori/main.c b/midori/main.c index 5749577c..7ad1ef0f 100644 --- a/midori/main.c +++ b/midori/main.c @@ -598,7 +598,7 @@ db_exec_callback (sqlite3* db, { *error = g_error_new (MIDORI_HISTORY_ERROR, MIDORI_HISTORY_ERROR_EXEC_SQL, - _("Failed to execute SQL statement: %s\n"), + _("Failed to execute database statement: %s\n"), errmsg); } sqlite3_free (errmsg); diff --git a/po/midori.pot b/po/midori.pot index ed5cda77..b2106a59 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: midori 0.1.1\n" +"Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-04 19:18+0100\n" +"POT-Creation-Date: 2009-01-19 22:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 -#: ../midori/main.c:1928 ../midori/main.c:1939 -#: ../midori/midori-websettings.c:235 +#: ../midori.desktop.in.h:2 ../midori/main.c:1864 ../midori/main.c:1966 +#: ../midori/main.c:1975 ../midori/main.c:1986 +#: ../midori/midori-websettings.c:239 msgid "Midori" msgstr "" @@ -30,248 +30,253 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:87 +#: ../midori/main.c:88 msgid "_Bookmark" msgstr "" -#: ../midori/main.c:88 ../midori/midori-browser.c:3797 +#: ../midori/main.c:89 ../midori/midori-browser.c:3821 msgid "_Bookmarks" msgstr "" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Console" msgstr "" -#: ../midori/main.c:91 +#: ../midori/main.c:92 msgid "_Extensions" msgstr "" -#: ../midori/main.c:92 +#: ../midori/main.c:93 msgid "_History" msgstr "" -#: ../midori/main.c:93 +#: ../midori/main.c:94 msgid "_Homepage" msgstr "" -#: ../midori/main.c:94 +#: ../midori/main.c:95 msgid "_Userscripts" msgstr "" -#: ../midori/main.c:95 +#: ../midori/main.c:96 msgid "User_styles" msgstr "" -#: ../midori/main.c:96 +#: ../midori/main.c:97 msgid "New _Tab" msgstr "" -#: ../midori/main.c:97 +#: ../midori/main.c:98 msgid "_Transfers" msgstr "" -#: ../midori/main.c:98 +#: ../midori/main.c:99 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/main.c:99 +#: ../midori/main.c:100 msgid "New _Window" msgstr "" -#: ../midori/main.c:155 +#: ../midori/main.c:156 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:210 +#: ../midori/main.c:211 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:217 ../midori/main.c:287 +#: ../midori/main.c:218 ../midori/main.c:288 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:529 +#: ../midori/main.c:530 msgid "File not found." msgstr "" -#: ../midori/main.c:537 ../midori/main.c:546 +#: ../midori/main.c:538 ../midori/main.c:547 msgid "Malformed document." msgstr "" -#: ../midori/main.c:568 ../midori/main.c:600 +#: ../midori/main.c:569 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:654 +#: ../midori/main.c:601 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../midori/main.c:655 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:678 +#: ../midori/main.c:679 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:711 ../midori/main.c:725 +#: ../midori/main.c:712 ../midori/main.c:726 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:841 +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:869 +#: ../midori/main.c:867 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:897 ../midori/main.c:915 +#: ../midori/main.c:895 ../midori/main.c:913 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1045 ../midori/sokoke.c:523 +#: ../midori/main.c:1043 ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1075 ../midori/main.c:1100 +#: ../midori/main.c:1064 ../midori/main.c:1091 ../midori/main.c:1119 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1123 ../midori/main.c:1147 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1143 ../midori/main.c:1167 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 +#: ../midori/main.c:1188 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "" -#: ../midori/main.c:1204 +#: ../midori/main.c:1229 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1530 +#: ../midori/main.c:1553 msgid "Authentication Required" msgstr "" -#: ../midori/main.c:1546 +#: ../midori/main.c:1569 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -#: ../midori/main.c:1560 +#: ../midori/main.c:1583 msgid "Username" msgstr "" -#: ../midori/main.c:1571 +#: ../midori/main.c:1594 msgid "Password" msgstr "" -#: ../midori/main.c:1675 +#: ../midori/main.c:1700 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1690 +#: ../midori/main.c:1715 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1694 +#: ../midori/main.c:1719 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1699 +#: ../midori/main.c:1724 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1828 +#: ../midori/main.c:1864 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1857 ../midori/gjs.c:514 +#: ../midori/main.c:1896 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1880 +#: ../midori/main.c:1919 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1882 +#: ../midori/main.c:1921 msgid "Display program version" msgstr "" -#: ../midori/main.c:1884 +#: ../midori/main.c:1923 msgid "Addresses" msgstr "" -#: ../midori/main.c:1916 +#: ../midori/main.c:1963 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1940 +#: ../midori/main.c:1987 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1942 +#: ../midori/main.c:1989 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1965 -#, c-format +#: ../midori/main.c:2016 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:2024 +#: ../midori/main.c:2079 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2039 +#: ../midori/main.c:2094 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2052 +#: ../midori/main.c:2107 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2065 +#: ../midori/main.c:2120 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2077 +#: ../midori/main.c:2132 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:2093 +#: ../midori/main.c:2148 msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 +#: ../midori/midori-browser.c:3192 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3189 msgid "Stop loading the current page" msgstr "" @@ -297,11 +302,11 @@ msgstr "" msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 msgid "_Address:" msgstr "" @@ -317,880 +322,905 @@ msgstr "" msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1301 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2369 +#: ../midori/midori-browser.c:2500 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2371 +#: ../midori/midori-browser.c:2502 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2646 +#: ../midori/midori-browser.c:2677 msgid "Separator" msgstr "" -#: ../midori/midori-browser.c:2757 +#: ../midori/midori-browser.c:2784 #, c-format msgid "A week ago" msgstr "" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:2790 #, c-format msgid "%d days ago" msgstr "" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2797 msgid "Today" msgstr "" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:2799 msgid "Yesterday" msgstr "" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:2888 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:2896 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3029 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3120 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3123 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3126 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3129 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3132 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3134 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3135 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3137 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3138 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3141 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3144 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3146 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3149 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3152 ../midori/midori-browser.c:3155 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3158 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3164 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3167 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3169 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3170 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3172 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3173 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3176 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3177 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3180 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3182 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3183 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3195 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3198 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3201 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3203 ../midori/midori-view.c:979 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3204 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3206 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3207 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3211 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3213 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3216 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3219 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3222 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3224 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3225 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3227 ../midori/midori-view.c:951 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3228 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3232 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3235 msgid "Edit the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3238 msgid "Delete the selected bookmark" msgstr "" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3241 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3244 msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3247 msgid "Bookmark the selected history item" msgstr "" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3249 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3251 ../midori/midori-searchaction.c:462 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3252 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3256 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3257 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3259 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3260 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3262 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3264 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3265 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3236 -msgid "_Frequent questions" -msgstr "" - -#: ../midori/midori-browser.c:3237 -msgid "Show the Frequently Asked Questions" -msgstr "" - -#: ../midori/midori-browser.c:3239 -msgid "_Report a bug" -msgstr "" - -#: ../midori/midori-browser.c:3240 -msgid "Open Midori's bug tracker" -msgstr "" - -#: ../midori/midori-browser.c:3243 -msgid "Show information about the program" -msgstr "" - -#: ../midori/midori-browser.c:3250 -msgid "P_rivate Browsing" -msgstr "" - -#: ../midori/midori-browser.c:3251 -msgid "Don't save any private data while browsing" -msgstr "" - -#: ../midori/midori-browser.c:3256 -msgid "_Menubar" -msgstr "" - -#: ../midori/midori-browser.c:3257 -msgid "Show menubar" -msgstr "" - -#: ../midori/midori-browser.c:3260 -msgid "_Navigationbar" -msgstr "" - -#: ../midori/midori-browser.c:3261 -msgid "Show navigationbar" -msgstr "" - -#: ../midori/midori-browser.c:3264 -msgid "Side_panel" -msgstr "" - -#: ../midori/midori-browser.c:3265 -msgid "Show sidepanel" +#: ../midori/midori-browser.c:3267 +msgid "_Frequent Questions" msgstr "" #: ../midori/midori-browser.c:3268 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:3270 +msgid "_Report a Bug" +msgstr "" + +#: ../midori/midori-browser.c:3271 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3274 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:3281 +msgid "P_rivate Browsing" +msgstr "" + +#: ../midori/midori-browser.c:3282 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:3287 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:3288 +msgid "Show menubar" +msgstr "" + +#: ../midori/midori-browser.c:3291 +msgid "_Navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:3292 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:3295 +msgid "Side_panel" +msgstr "" + +#: ../midori/midori-browser.c:3296 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:3299 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3269 +#: ../midori/midori-browser.c:3300 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3303 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3273 +#: ../midori/midori-browser.c:3304 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3307 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3308 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3746 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3724 +#: ../midori/midori-browser.c:3748 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3772 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3774 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3769 +#: ../midori/midori-browser.c:3793 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:3806 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3784 +#: ../midori/midori-browser.c:3808 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3799 +#: ../midori/midori-browser.c:3823 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3812 +#: ../midori/midori-browser.c:3836 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3814 +#: ../midori/midori-browser.c:3838 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:3936 -msgid "Bookmarks" -msgstr "" - -#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 +#: ../midori/midori-browser.c:3961 ../midori/midori-preferences.c:593 msgid "History" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4022 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4008 +msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:4029 +msgid "Previous" +msgstr "" + +#: ../midori/midori-browser.c:4034 +msgid "Next" +msgstr "" + +#: ../midori/midori-browser.c:4039 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4047 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4056 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4305 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 +#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:151 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:166 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:167 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:168 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:169 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:170 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:186 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:187 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:188 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:203 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:204 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:205 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:206 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:207 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:223 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:242 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:283 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:284 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:292 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:293 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:301 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:302 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:310 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:311 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:320 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:321 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:340 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:349 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:357 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:358 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:366 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:367 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:375 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:376 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:385 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:386 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:395 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:404 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:405 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:414 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:440 +msgid "Show crash dialog" +msgstr "" + +#: ../midori/midori-websettings.c:441 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#: ../midori/midori-websettings.c:449 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:450 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:458 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:459 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:467 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:468 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:476 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:477 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:485 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:486 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:496 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:497 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:505 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:506 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:526 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:527 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:540 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:541 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:549 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:550 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:558 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:559 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:567 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:568 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:587 -msgid "Accept cookies" +#: ../midori/midori-websettings.c:619 +msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:588 -msgid "What type of cookies to accept" -msgstr "" - -#: ../midori/midori-websettings.c:601 -msgid "Original cookies only" -msgstr "" - -#: ../midori/midori-websettings.c:602 -msgid "Accept cookies from the original website only" -msgstr "" - -#: ../midori/midori-websettings.c:610 -msgid "Maximum cookie age" -msgstr "" - -#: ../midori/midori-websettings.c:611 -msgid "The maximum number of days to save cookies for" -msgstr "" - -#: ../midori/midori-websettings.c:621 -msgid "Remember last visited pages" -msgstr "" - -#: ../midori/midori-websettings.c:622 -msgid "Whether the last visited pages are saved" +#: ../midori/midori-websettings.c:620 +msgid "Whether to zoom text and images" msgstr "" #: ../midori/midori-websettings.c:630 -msgid "Maximum history age" +msgid "Accept cookies" msgstr "" #: ../midori/midori-websettings.c:631 +msgid "What type of cookies to accept" +msgstr "" + +#: ../midori/midori-websettings.c:644 +msgid "Original cookies only" +msgstr "" + +#: ../midori/midori-websettings.c:645 +msgid "Accept cookies from the original website only" +msgstr "" + +#: ../midori/midori-websettings.c:653 +msgid "Maximum cookie age" +msgstr "" + +#: ../midori/midori-websettings.c:654 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:664 +msgid "Remember last visited pages" +msgstr "" + +#: ../midori/midori-websettings.c:665 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../midori/midori-websettings.c:673 +msgid "Maximum history age" +msgstr "" + +#: ../midori/midori-websettings.c:674 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:682 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:683 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:691 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:692 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:702 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:703 msgid "The proxy server used for HTTP connections" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:723 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:724 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:744 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:745 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:757 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:758 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:701 +#: ../midori/midori-view.c:603 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:981 +#: ../midori/midori-view.c:883 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:906 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1012 +#: ../midori/midori-view.c:914 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1034 +#: ../midori/midori-view.c:936 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1463 +#: ../midori/midori-view.c:1406 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1606 +#: ../midori/midori-view.c:1555 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1630 +#: ../midori/midori-view.c:1579 +#, c-format +msgid "Document cannot be displayed" +msgstr "" + +#: ../midori/midori-view.c:1595 #, c-format msgid "No documentation installed" msgstr "" @@ -1201,130 +1231,130 @@ msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:423 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:437 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:444 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:447 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:455 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:459 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:463 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:467 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:471 msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:475 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:479 msgid "Enable embedded plugin objects" msgstr "" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:482 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:483 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:486 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:487 msgid "Enable special extensions for developers" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:498 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:503 msgid "Browsing" msgstr "" @@ -1341,40 +1371,40 @@ msgstr "" msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:575 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:790 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:790 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:852 +#: ../midori/midori-searchaction.c:818 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:862 msgid "_Icon (name or file):" msgstr "" -#: ../midori/midori-searchaction.c:910 +#: ../midori/midori-searchaction.c:876 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1087 -msgid "Manage search engines" +#: ../midori/midori-searchaction.c:1053 +msgid "Manage Search Engines" msgstr "" #: ../midori/sokoke.c:101 ../midori/sokoke.c:113 @@ -1382,7 +1412,7 @@ msgid "Could not run external program." msgstr "" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" msgstr "" @@ -1417,6 +1447,10 @@ msgstr "" msgid "_Disable" msgstr "" +#: ../panels/midori-bookmarks.c:89 +msgid "Bookmarks" +msgstr "" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "" @@ -1425,6 +1459,10 @@ msgstr "" msgid "Extensions" msgstr "" +#: ../panels/midori-plugins.c:86 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1439,16 +1477,16 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:231 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "" @@ -1461,14 +1499,10 @@ msgstr "" msgid "_Pageholder" msgstr "" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" msgstr "" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "" - -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "" From 6c445e9f2a03495c3869cbfaf80a9303e33ca3d6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jan 2009 22:32:55 +0100 Subject: [PATCH 0673/2970] Update German translation --- po/de.po | 760 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 388 insertions(+), 372 deletions(-) diff --git a/po/de.po b/po/de.po index 9fdd52bd..0d5bdbd2 100644 --- a/po/de.po +++ b/po/de.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.1\n" +"Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-04 19:06+0100\n" -"PO-Revision-Date: 2009-01-01 04:18+0100\n" +"POT-Creation-Date: 2009-01-19 22:22+0100\n" +"PO-Revision-Date: 2009-01-19 22:24+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 -#: ../midori/main.c:1928 ../midori/main.c:1939 -#: ../midori/midori-websettings.c:235 +#: ../midori.desktop.in.h:2 ../midori/main.c:1864 ../midori/main.c:1966 +#: ../midori/main.c:1975 ../midori/main.c:1986 +#: ../midori/midori-websettings.c:239 msgid "Midori" msgstr "Midori" @@ -31,146 +31,152 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:87 +#: ../midori/main.c:88 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:88 ../midori/midori-browser.c:3797 +#: ../midori/main.c:89 ../midori/midori-browser.c:3821 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/main.c:89 +#: ../midori/main.c:90 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:90 +#: ../midori/main.c:91 msgid "_Console" msgstr "_Konsole" -#: ../midori/main.c:91 +#: ../midori/main.c:92 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/main.c:92 +#: ../midori/main.c:93 msgid "_History" msgstr "_Verlauf" -#: ../midori/main.c:93 +#: ../midori/main.c:94 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:94 +#: ../midori/main.c:95 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/main.c:95 +#: ../midori/main.c:96 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/main.c:96 +#: ../midori/main.c:97 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:97 +#: ../midori/main.c:98 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/main.c:98 +#: ../midori/main.c:99 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/main.c:99 +#: ../midori/main.c:100 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:155 +#: ../midori/main.c:156 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:210 +#: ../midori/main.c:211 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:217 ../midori/main.c:287 +#: ../midori/main.c:218 ../midori/main.c:288 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:529 +#: ../midori/main.c:530 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:537 ../midori/main.c:546 +#: ../midori/main.c:538 ../midori/main.c:547 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/main.c:568 ../midori/main.c:600 +#: ../midori/main.c:569 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:654 +#: ../midori/main.c:601 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" + +#: ../midori/main.c:655 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:678 +#: ../midori/main.c:679 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:711 ../midori/main.c:725 +#: ../midori/main.c:712 ../midori/main.c:726 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:841 +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:869 +#: ../midori/main.c:867 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:897 ../midori/main.c:915 +#: ../midori/main.c:895 ../midori/main.c:913 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1045 ../midori/sokoke.c:523 +#: ../midori/main.c:1043 ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/main.c:1075 ../midori/main.c:1100 +#: ../midori/main.c:1064 ../midori/main.c:1091 ../midori/main.c:1119 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" -#: ../midori/main.c:1123 ../midori/main.c:1147 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1143 ../midori/main.c:1167 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 +#: ../midori/main.c:1188 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/main.c:1204 +#: ../midori/main.c:1229 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1530 +#: ../midori/main.c:1553 msgid "Authentication Required" msgstr "Authentifizierung erforderlich" -#: ../midori/main.c:1546 +#: ../midori/main.c:1569 msgid "" "A username and a password are required\n" "to open this location:" @@ -178,15 +184,15 @@ msgstr "" "Ein Benutzername und ein Kennwort\n" "werden zum Öffnen dieses Ortes benötigt:" -#: ../midori/main.c:1560 +#: ../midori/main.c:1583 msgid "Username" msgstr "Benutzername" -#: ../midori/main.c:1571 +#: ../midori/main.c:1594 msgid "Password" msgstr "Kennwort" -#: ../midori/main.c:1675 +#: ../midori/main.c:1700 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." @@ -194,89 +200,88 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1690 +#: ../midori/main.c:1715 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1694 +#: ../midori/main.c:1719 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1699 +#: ../midori/main.c:1724 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1828 +#: ../midori/main.c:1864 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1857 ../midori/gjs.c:514 +#: ../midori/main.c:1896 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1880 +#: ../midori/main.c:1919 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1882 +#: ../midori/main.c:1921 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1884 +#: ../midori/main.c:1923 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1916 +#: ../midori/main.c:1963 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1940 +#: ../midori/main.c:1987 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1942 +#: ../midori/main.c:1989 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1965 -#, c-format +#: ../midori/main.c:2016 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:2024 +#: ../midori/main.c:2079 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:2039 +#: ../midori/main.c:2094 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2052 +#: ../midori/main.c:2107 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2065 +#: ../midori/main.c:2120 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2077 +#: ../midori/main.c:2132 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:2093 +#: ../midori/main.c:2148 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 +#: ../midori/midori-browser.c:3192 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3189 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" @@ -302,11 +307,11 @@ msgstr "Lesezeichen bearbeiten" msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 msgid "_Address:" msgstr "_Adresse:" @@ -322,882 +327,907 @@ msgstr "Oberster Ordner" msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1301 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2369 +#: ../midori/midori-browser.c:2500 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2371 +#: ../midori/midori-browser.c:2502 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2646 +#: ../midori/midori-browser.c:2677 msgid "Separator" msgstr "Trennlinie" -#: ../midori/midori-browser.c:2757 +#: ../midori/midori-browser.c:2784 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:2790 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2797 msgid "Today" msgstr "Heute" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:2799 msgid "Yesterday" msgstr "Gestern" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:2888 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:2896 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3029 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3120 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3123 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3126 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3129 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3132 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3134 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3135 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3137 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3138 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3141 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3144 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3146 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3149 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3152 ../midori/midori-browser.c:3155 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3158 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3164 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3167 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3169 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3170 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3172 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3173 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3176 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3177 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3180 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3182 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3183 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3195 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3198 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3201 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3203 ../midori/midori-view.c:979 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3204 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3206 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3207 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3211 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3213 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3216 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3219 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3222 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3224 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3225 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3227 ../midori/midori-view.c:951 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3228 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3232 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3235 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3238 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3241 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3244 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3247 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3249 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3251 ../midori/midori-searchaction.c:462 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3252 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3256 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3257 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3259 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3260 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3262 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3264 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3265 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3236 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3267 +msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3268 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3239 -msgid "_Report a bug" +#: ../midori/midori-browser.c:3270 +msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3271 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3274 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3281 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3282 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3287 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3288 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3291 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3292 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3295 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3296 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3299 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3269 +#: ../midori/midori-browser.c:3300 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3303 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3273 +#: ../midori/midori-browser.c:3304 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3307 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3308 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3746 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3724 +#: ../midori/midori-browser.c:3748 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3772 msgid "_Web Search..." msgstr "_Netzsuche…" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3774 msgid "Run a web search" msgstr "Starte eine Netzsuche" -#: ../midori/midori-browser.c:3769 +#: ../midori/midori-browser.c:3793 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:3806 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3784 +#: ../midori/midori-browser.c:3808 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3799 +#: ../midori/midori-browser.c:3823 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3812 +#: ../midori/midori-browser.c:3836 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3814 +#: ../midori/midori-browser.c:3838 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:3936 -msgid "Bookmarks" -msgstr "Lesezeichen" - -#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 +#: ../midori/midori-browser.c:3961 ../midori/midori-preferences.c:593 msgid "History" msgstr "Verlauf" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4022 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4008 +msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:4029 +msgid "Previous" +msgstr "Zurück" + +#: ../midori/midori-browser.c:4034 +msgid "Next" +msgstr "Weiter" + +#: ../midori/midori-browser.c:4039 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4047 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4056 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4305 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 +#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:151 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:166 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:167 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:168 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:169 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:170 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:186 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:187 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:188 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:203 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:204 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:205 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:206 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:207 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "All cookies" -msgstr "Alle Kekse" +msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:223 msgid "Session cookies" -msgstr "Sitzungskekse" +msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:242 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:283 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:284 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:292 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:293 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:301 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:302 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:310 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:311 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:320 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:321 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Last Web search" msgstr "Letzte Netzsuche" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Netzsuche" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:340 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:349 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:357 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:358 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:366 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:367 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:375 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:376 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:385 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:386 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:395 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:404 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:405 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:414 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:440 +msgid "Show crash dialog" +msgstr "Absturzdialog anzeigen" + +#: ../midori/midori-websettings.c:441 +msgid "Show a dialog after Midori crashed" +msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" + +#: ../midori/midori-websettings.c:449 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:450 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:458 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:459 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:467 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:468 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:476 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:477 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:485 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:486 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:496 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:497 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:505 msgid "Close Buttons on Tabs" msgstr "Schließenknöpfe auf Reitern" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:506 msgid "Whether tabs have close buttons" msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:526 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:527 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:540 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:541 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:549 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:550 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:558 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:559 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:567 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:568 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:619 +msgid "Zoom Text and Images" +msgstr "Text und Bilder vergrößern" + +#: ../midori/midori-websettings.c:620 +msgid "Whether to zoom text and images" +msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" + +#: ../midori/midori-websettings.c:630 msgid "Accept cookies" -msgstr "Kekse annehmen" +msgstr "Profildateien annehmen" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:631 msgid "What type of cookies to accept" -msgstr "Welche Art von Keksen akzeptiert werden" +msgstr "Welche Art von Profildateien angenommen werden" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:644 msgid "Original cookies only" -msgstr "Nur ursprüngliche Kekse" +msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:645 msgid "Accept cookies from the original website only" -msgstr "Nur Kekse von der ursprünglichen Netzseite annehmen" +msgstr "Nur Profildateien von der ursprünglichen Netzseite annehmen" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:653 msgid "Maximum cookie age" -msgstr "Maximales Keksalter" +msgstr "Maximales Alter von Profildateien" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:654 msgid "The maximum number of days to save cookies for" -msgstr "Die maximale Anzahl an Tagen, für die Kekse gespeichert werden" +msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:664 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:665 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:673 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:674 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:682 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:683 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:691 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:692 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:702 msgid "Proxy Server" msgstr "Zwischenrechner" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:703 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:723 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:724 msgid "What to identify as to web pages" msgstr "Wie gegenüber Netzseiten identifiziert werden soll" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:744 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:745 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:757 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:758 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:701 +#: ../midori/midori-view.c:603 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:981 +#: ../midori/midori-view.c:883 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:906 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1012 +#: ../midori/midori-view.c:914 msgid "_Download Link destination" msgstr "Verweisziel _herunterladen" -#: ../midori/midori-view.c:1034 +#: ../midori/midori-view.c:936 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1463 +#: ../midori/midori-view.c:1406 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1606 +#: ../midori/midori-view.c:1555 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-view.c:1630 +#: ../midori/midori-view.c:1579 +#, c-format +msgid "Document cannot be displayed" +msgstr "Dokument kann nicht angezeigt werden" + +#: ../midori/midori-view.c:1595 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1208,130 +1238,130 @@ msgid "Preferences for %s" msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:423 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:437 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:444 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:447 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:455 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:459 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:463 msgid "Automatically shrink standalone images to fit" msgstr "Einzelne Bilder automatisch angemessen verkleinern" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:467 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:471 msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:475 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:479 msgid "Enable embedded plugin objects" msgstr "Eingebettete Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:477 -msgid "Enable developer tools" -msgstr "Entwicklerwerkzeuge einschalten" - -#: ../midori/midori-preferences.c:478 -msgid "Enable special extensions for developers" -msgstr "Besondere Erweiterungen für Entwickler einschalten" - -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:482 msgid "Enforce 96 dots per inch" msgstr "Erzwinge 96 Punkte pro Zoll" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:483 msgid "Enforce a video dot density of 96 DPI" msgstr "Erzwinge eine Punktdichte von 96 DPI" +#: ../midori/midori-preferences.c:486 +msgid "Enable developer tools" +msgstr "Entwicklerwerkzeuge einschalten" + +#: ../midori/midori-preferences.c:487 +msgid "Enable special extensions for developers" +msgstr "Besondere Erweiterungen für Entwickler einschalten" + #. Page "Interface" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:498 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:503 msgid "Browsing" msgstr "Navigation" @@ -1348,40 +1378,40 @@ msgstr "MB" msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:575 msgid "Web Cookies" -msgstr "Netzkekse" +msgstr "Netzprofile" -#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:790 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:790 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:852 +#: ../midori/midori-searchaction.c:818 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:862 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchaction.c:910 +#: ../midori/midori-searchaction.c:876 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1087 -msgid "Manage search engines" +#: ../midori/midori-searchaction.c:1053 +msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" #: ../midori/sokoke.c:101 ../midori/sokoke.c:113 @@ -1389,7 +1419,7 @@ msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" @@ -1424,6 +1454,10 @@ msgstr "_Einschalten" msgid "_Disable" msgstr "_Auschalten" +#: ../panels/midori-bookmarks.c:89 +msgid "Bookmarks" +msgstr "Lesezeichen" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Konsole" @@ -1432,6 +1466,10 @@ msgstr "Konsole" msgid "Extensions" msgstr "Erweiterungen" +#: ../panels/midori-plugins.c:86 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "Zusatzmodule" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1446,16 +1484,16 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:231 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -1468,32 +1506,10 @@ msgstr "Seitenhalter" msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" msgstr "Bilder" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "Skripte" - -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "Zusatzmodule" - -#~ msgid "Root" -#~ msgstr "Wurzel" - -#~ msgid "[URIs]" -#~ msgstr "[URIs]" - -#~ msgid "HTTP Proxy" -#~ msgstr "HTTP-Zwischenrechner" - -#~ msgid "URIs" -#~ msgstr "URIs" - -#~ msgid "_URL:" -#~ msgstr "_URL:" - -#~ msgid "Open URL in New _Tab" -#~ msgstr "URL in neuem _Reiter öffnen" From 4df6dcfda14e50b723d235c87c9efdfcbd460e6e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jan 2009 23:14:52 +0100 Subject: [PATCH 0674/2970] Update French translation --- po/fr.po | 959 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 556 insertions(+), 403 deletions(-) diff --git a/po/fr.po b/po/fr.po index 38991dab..4312f3ff 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-11-02 22:11+0100\n" +"POT-Creation-Date: 2009-01-19 22:22+0100\n" +"PO-Revision-Date: 2009-01-19 23:06+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -22,8 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../midori.desktop.in.h:2 ../midori/main.c:1864 ../midori/main.c:1966 +#: ../midori/main.c:1975 ../midori/main.c:1986 +#: ../midori/midori-websettings.c:239 msgid "Midori" msgstr "Midori" @@ -31,1254 +32,1402 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:86 +#: ../midori/main.c:88 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:89 ../midori/midori-browser.c:3821 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/main.c:88 +#: ../midori/main.c:90 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/main.c:89 +#: ../midori/main.c:91 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:90 +#: ../midori/main.c:92 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:91 +#: ../midori/main.c:93 msgid "_History" msgstr "_Historique" -#: ../midori/main.c:92 +#: ../midori/main.c:94 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/main.c:93 +#: ../midori/main.c:95 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/main.c:94 +#: ../midori/main.c:96 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/main.c:95 +#: ../midori/main.c:97 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/main.c:96 +#: ../midori/main.c:98 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/main.c:97 +#: ../midori/main.c:99 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/main.c:98 +#: ../midori/main.c:100 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/main.c:143 +#: ../midori/main.c:156 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:211 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:218 ../midori/main.c:288 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:532 +#: ../midori/main.c:530 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:538 ../midori/main.c:547 msgid "Malformed document." msgstr "Document mal formé" -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:569 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:657 +#: ../midori/main.c:601 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../midori/main.c:655 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:681 +#: ../midori/main.c:679 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:712 ../midori/main.c:726 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:839 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:976 ../midori/sokoke.c:459 +#: ../midori/main.c:867 #, c-format -msgid "Writing failed." -msgstr "L'écriture a échoué." +msgid "The configuration couldn't be saved. %s" +msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Transferts" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "La session n'a pu être enregistrée. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Afficher la version du programme" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URIs" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URIs]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Vérifier l'existence de nouvelles versions à :" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "Aucun nom de fichier indiqué" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Les signets n'ont pu être chargés: %s\n" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "La session n'a pu être chargée: %s\n" - -# pas très content -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "La corbeille n'a pu être chargée: %s\n" - -# pas très content -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "L'historique n'a pu être chargée. %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "Les erreurs suivantes ont eu lieu :" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 +#: ../midori/main.c:895 ../midori/main.c:913 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1698 +#: ../midori/main.c:1043 ../midori/sokoke.c:531 +#, c-format +msgid "Writing failed." +msgstr "L'écriture a échoué." + +#: ../midori/main.c:1064 ../midori/main.c:1091 ../midori/main.c:1119 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content -#: ../midori/main.c:1707 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1143 ../midori/main.c:1167 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1715 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "La configuration n'a pu être enregistrée. %s" +#: ../midori/main.c:1188 ../midori/midori-preferences.c:386 +msgid "Transfers" +msgstr "Transferts" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:1229 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "La session n'a pu être enregistrée. %s" + +#: ../midori/main.c:1553 +msgid "Authentication Required" +msgstr "Authentification obligatoire" + +#: ../midori/main.c:1569 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../midori/main.c:1583 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: ../midori/main.c:1594 +msgid "Password" +msgstr "Mot de passe" + +#: ../midori/main.c:1700 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:1715 +msgid "Modify _preferences" +msgstr "Modifier les _préférences" + +#: ../midori/main.c:1719 +msgid "Reset the last _session" +msgstr "Réinitialiser la dernière session" + +#: ../midori/main.c:1724 +msgid "Disable all _extensions" +msgstr "Désactiver tout les _extensions" + +#: ../midori/main.c:1864 +msgid "No filename specified" +msgstr "Aucun nom de fichier indiqué" + +#: ../midori/main.c:1896 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Une erreur inconnu est survenue." + +#: ../midori/main.c:1919 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1921 +msgid "Display program version" +msgstr "Afficher la version du programme" + +#: ../midori/main.c:1923 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1963 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:1987 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" + +#: ../midori/main.c:1989 +msgid "Check for new versions at:" +msgstr "Vérifier l'existence de nouvelles versions à :" + +#: ../midori/main.c:2016 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" + +#: ../midori/main.c:2079 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Les signets n'ont pu être chargés: %s\n" + +#: ../midori/main.c:2094 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "La session n'a pu être chargée: %s\n" + +# pas très content +#: ../midori/main.c:2107 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "La corbeille n'a pu être chargée: %s\n" + +# pas très content +#: ../midori/main.c:2120 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "L'historique n'a pu être chargée. %s\n" + +#: ../midori/main.c:2132 +msgid "The following errors occured:" +msgstr "Les erreurs suivantes ont eu lieu :" + +#: ../midori/main.c:2148 +msgid "_Ignore" +msgstr "" + +#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 +#: ../midori/midori-browser.c:3192 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3189 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:318 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:341 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:528 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL :" +#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 +msgid "_Address:" +msgstr "" # manque un raccourcis Alt+X #: ../midori/midori-browser.c:578 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Racine" +#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +msgid "Toplevel folder" +msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:712 msgid "Save file as" msgstr "Enregistrer fichier dans" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1301 msgid "Open file" msgstr "Ouvrir fichier" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2500 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2502 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2677 msgid "Separator" msgstr "Séparateur" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2784 #, c-format msgid "A week ago" msgstr "Avant une semaine" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2790 #, c-format msgid "%d days ago" msgstr "Avant %d jours" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2797 msgid "Today" msgstr "Aujourd'hui" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2799 msgid "Yesterday" msgstr "Hier" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2888 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2896 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin " -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3029 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3120 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3123 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3126 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3129 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3132 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3134 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3135 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3137 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3138 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3141 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3144 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3146 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3149 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3152 ../midori/midori-browser.c:3155 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3158 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3161 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3164 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3167 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3169 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3170 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3172 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3173 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3176 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3177 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou d'une phrase" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3180 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3182 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3183 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3195 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3198 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3201 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3203 ../midori/midori-view.c:979 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3204 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3206 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3207 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3211 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3213 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3216 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3219 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3222 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3224 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3225 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3227 ../midori/midori-view.c:951 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3228 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3232 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3235 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3238 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3241 msgid "Delete the selected history item" msgstr "Supprimer l'element sélectionné de la historique" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3244 msgid "Clear the entire history" msgstr "Vider l'historique entier" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3247 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'element sélectionné de la historique" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3249 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3251 ../midori/midori-searchaction.c:462 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3252 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3256 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3257 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3259 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3260 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3262 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3264 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3265 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3267 +msgid "_Frequent Questions" msgstr "_Questions couramment" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3268 msgid "Show the Frequently Asked Questions" msgstr "Afficher les foire aux questions" -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" +#: ../midori/midori-browser.c:3270 +msgid "_Report a Bug" msgstr "_Adviser un problème" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3271 msgid "Open Midori's bug tracker" msgstr "Ouvrir le persécuteur de problèmes de Midori" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3274 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3281 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3282 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3287 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3288 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3291 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3292 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3295 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3296 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3299 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3300 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3303 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3304 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3307 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3308 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3746 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3748 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3772 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3774 msgid "Run a web search" msgstr "Lance une recherche toile" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3793 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3806 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3808 msgid "Reopen pages that you visited earlier" msgstr "Réouvre des pages déjà visitées" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3823 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauveguardées" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3836 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3838 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Signets" - -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:3961 ../midori/midori-preferences.c:593 msgid "History" msgstr "Historique" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4008 +msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:4029 +msgid "Previous" +msgstr "Précedent" + +#: ../midori/midori-browser.c:4034 +msgid "Next" +msgstr "Suivant" + +#: ../midori/midori-browser.c:4039 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4047 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4056 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4305 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:151 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:166 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:167 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:168 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:169 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:170 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:186 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:187 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:188 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:203 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:204 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:205 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:206 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:207 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:222 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:223 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:240 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:241 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:242 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:283 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:284 msgid "Whether to save the last window size" msgstr "Enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:292 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:293 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:301 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:302 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:310 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:311 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:320 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:321 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:329 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:330 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:339 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:340 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:348 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:349 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:357 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:358 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:366 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:367 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:375 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:376 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:385 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:386 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:395 msgid "Toolbar Items" msgstr "Elements de la barre d'outils" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:396 msgid "The items to show on the toolbar" msgstr "Les elements pour afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:404 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:405 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau compact" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:414 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:415 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:425 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:440 +msgid "Show crash dialog" +msgstr "" + +#: ../midori/midori-websettings.c:441 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#: ../midori/midori-websettings.c:449 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:450 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:458 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:459 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:467 msgid "Text Editor" msgstr "Editeur texte" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:468 msgid "An external text editor" msgstr "Un editeur texte externe" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:476 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:477 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:485 msgid "Preferred Encoding" msgstr "Codage favori" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:486 msgid "The preferred character encoding" msgstr "Codage des caractères favori" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:496 msgid "Always Show Tabbar" msgstr "Toujours afficher barre d'onglets" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:497 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:505 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:506 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:515 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:516 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:526 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:527 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:540 msgid "Middle click opens Selection" msgstr "Clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "Charger l'URL sous la sélection avec le bouton central de la souris" +#: ../midori/midori-websettings.c:541 +msgid "Load an address from the selection via middle click" +msgstr "Charger l'addresse sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:549 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:550 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:558 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:559 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:567 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:568 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:619 +msgid "Zoom Text and Images" +msgstr "Agrandir texte et images" + +#: ../midori/midori-websettings.c:620 +msgid "Whether to zoom text and images" +msgstr "Indique s'il faut agrandir texte et images" + +#: ../midori/midori-websettings.c:630 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:631 msgid "What type of cookies to accept" msgstr "Type de témoins à accepter" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:644 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:645 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:653 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:654 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:664 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:665 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:673 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:674 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:682 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:683 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:691 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:692 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "Serveur mandataire HTTP" +#: ../midori/midori-websettings.c:702 +msgid "Proxy Server" +msgstr "" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" +#: ../midori/midori-websettings.c:703 +msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" -#: ../midori/midori-websettings.c:614 -msgid "Cache size" -msgstr "Taille de l'antémémoire (cache)" +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:723 +msgid "Identify as" +msgstr "Identifier comme" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:724 +msgid "What to identify as to web pages" +msgstr "Comme s'identifier a pages toiles" + +#: ../midori/midori-websettings.c:744 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:745 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:757 +msgid "Cache size" +msgstr "Taille de l'antémémoire" + +#: ../midori/midori-websettings.c:758 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:603 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:883 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:906 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:914 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Ouvrir l'URL dans un nouvel _onglet" +#: ../midori/midori-view.c:936 +msgid "Open Address in New _Tab" +msgstr "Ouvrir adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1406 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1555 msgid "Source" msgstr "Source" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:1579 +#, c-format +msgid "Document cannot be displayed" +msgstr "Ne peut pas afficher le document" + +#: ../midori/midori-view.c:1595 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installé" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Préférences de %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:423 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:431 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" msgstr "Taille minimum de police" +#: ../midori/midori-preferences.c:437 +msgid "The minimum font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:444 +msgid "Encoding" +msgstr "Codage" + +#: ../midori/midori-preferences.c:447 +msgid "The character encoding to use by default" +msgstr "Codage des caractères par défaut" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:455 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:459 +msgid "Load and display images automatically" +msgstr "Charger et afficher les images automatiquement" + +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" msgstr "Diminuer les images automatiquement" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:463 +msgid "Automatically shrink standalone images to fit" +msgstr "Diminuer convenablement les images automatiquement" + +#: ../midori/midori-preferences.c:466 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:467 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" msgstr "On peut agrandir champs de texte" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:471 +msgid "Whether text areas are resizable" +msgstr "Indique s'il faut agrandir champs de texte" + +#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Activer scripts" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:475 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Activer greffons" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:479 +msgid "Enable embedded plugin objects" +msgstr "" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce 96 dots per inch" +msgstr "" + +#: ../midori/midori-preferences.c:483 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:486 msgid "Enable developer tools" msgstr "Activer les outils développeur" +#: ../midori/midori-preferences.c:487 +msgid "Enable special extensions for developers" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:498 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:503 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:561 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:568 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:575 msgid "Web Cookies" msgstr "Témoins de toile" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 msgid "days" msgstr "jours" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:790 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:790 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:818 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:862 msgid "_Icon (name or file):" msgstr "_Icône (nom ou fichier) :" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:876 msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" -msgstr "Gérer les moteurs de recherche" +#: ../midori/midori-searchaction.c:1053 +msgid "Manage Search Engines" +msgstr "Gestion des moteurs de recherche" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" -#: ../midori/sokoke.c:282 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous êtes connecté en tant que superutilisateur !" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Une erreur inconnu est survenue." - #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1294,22 +1443,26 @@ msgstr "%s ne peut être assigné à %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s ne peut être accédé" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activer" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Désactiver" +#: ../panels/midori-bookmarks.c:89 +msgid "Bookmarks" +msgstr "Signets" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Console" @@ -1318,6 +1471,10 @@ msgstr "Console" msgid "Extensions" msgstr "Extensions" +#: ../panels/midori-plugins.c:86 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "Greffons" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1332,16 +1489,16 @@ msgstr "L'icône de catalogue « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "Choisissez un répertoire" @@ -1354,14 +1511,10 @@ msgstr "Cadre de pages" msgid "_Pageholder" msgstr "C_adre de pages" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "Scripts" - -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "Greffons" From a81405dcf00b8411994752b22fd70e0eaa86eae9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 20 Jan 2009 04:53:01 +0100 Subject: [PATCH 0675/2970] Show optional dependency summary at the end of configuration --- wscript | 79 +++++++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/wscript b/wscript index f3eb8c09..3ad01795 100644 --- a/wscript +++ b/wscript @@ -48,7 +48,7 @@ def option_enabled (option): def configure (conf): def option_checkfatal (option, desc): if eval ('Options.options.enable_' + option): - Utils.pprint ('RED', desc + ' not available') + Utils.pprint ('RED', desc + ' N/A') sys.exit (1) def dirname_default (dirname, default): @@ -71,10 +71,9 @@ def configure (conf): user_docs = 'yes' else: option_checkfatal ('userdocs', 'user documentation') - user_docs = 'not available' + user_docs = 'N/A' else: - user_docs = 'no' - conf.check_message_custom ('generate', 'user documentation', user_docs) + user_docs = 'no ' if option_enabled ('nls'): conf.check_tool ('intltool') @@ -84,10 +83,9 @@ def configure (conf): conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) else: option_checkfatal ('nls', 'localization') - nls = 'not available' + nls = 'N/A' else: - nls = 'no' - conf.check_message_custom ('localization', 'support', nls) + nls = 'no ' dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) @@ -103,10 +101,9 @@ def configure (conf): api_docs = 'yes' else: option_checkfatal ('apidocs', 'API documentation') - api_docs = 'not available' + api_docs = 'N/A' else: - api_docs = 'no' - conf.check_message_custom ('generate', 'API documentation', api_docs) + api_docs = 'no ' def check_pkg (name, version='', mandatory=True, var=None): if not var: @@ -116,36 +113,31 @@ def configure (conf): if option_enabled ('unique'): check_pkg ('unique-1.0', '0.9', False) - single_instance = ['not available', 'yes'][conf.env['HAVE_UNIQUE'] == 1] - if single_instance == 'yes': - if conf.check_cfg (modversion='unique-1.0') == '1.0.4': - Utils.pprint ('RED', 'unique 1.0.4 has a fatal bug.') - Utils.pprint ('RED', 'Please use an older or newer version.') + unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] else: option_checkfatal ('unique', 'single instance') conf.define ('HAVE_UNIQUE', 0) - single_instance = 'no' - conf.check_message_custom ('single instance', 'support', single_instance) + unique = 'no ' if option_enabled ('libsoup'): check_pkg ('libsoup-2.4', '2.23.1', False) check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2') - libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] + libsoup = ['N/A','yes'][conf.env['HAVE_LIBSOUP'] == 1] + libsoup_25_2 = ['N/A','yes'][conf.env['HAVE_LIBSOUP_2_25_2'] == 1] else: option_checkfatal ('libsoup', 'libsoup') conf.define ('HAVE_LIBSOUP', 0) conf.define ('HAVE_LIBSOUP_2_25_2', 0) - libsoup = 'no' - conf.check_message_custom ('libsoup', 'support', libsoup) + libsoup = 'no ' + libsoup_25_2 = 'no ' if option_enabled ('sqlite'): check_pkg ('sqlite3', '3.0', False, var='SQLITE') - sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] + sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1] else: option_checkfatal ('sqlite', 'history database') conf.define ('HAVE_SQLITE', 0) - sqlite = 'no' - conf.check_message_custom ('history database', 'support', sqlite) + sqlite = 'no ' check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) @@ -160,8 +152,7 @@ def configure (conf): if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): icons = 'yes' else: - icons = 'no' - conf.check_message_custom ('icon optimization', 'support', icons) + icons = 'no ' conf.define ('PACKAGE_VERSION', VERSION) conf.define ('PACKAGE_NAME', APPNAME) @@ -207,26 +198,24 @@ def configure (conf): sys.exit (1) print - if single_instance == 'not available': - print "Single instance support is unavailable in this build." - print " Install libUnique and reconfigure to enable it." - print - if libsoup == 'not available': - print "Icons, view source and Save as are unavailable in this build." - print " Install libSoup and reconfigure to enable these features." - print - if sqlite == 'not available': - print "History storage on disk is unavailable in this build." - print " Install sqlite3 and reconfigure to enable it." - print - if user_docs == 'not available': - print "User documentation is unavailable in this build." - print " Install docutils and reconfigure to enable it." - print - if api_docs == 'not available': - print "API documentation is unavailable in this build." - print " Install gtk-doc and reconfigure to enable it." - print + print "Optional build time dependencies:" + print "Localization: " + nls + " (intltool)" + print "Icon optimizations: " + icons + " (rsvg-convert)" + print "User documentation: " + user_docs + " (docutils)" + print "API documentation: " + api_docs + " (gtk-doc)" + print + print "Optional run time dependencies:" + print "Single instance: " + unique + " (unique)" + if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': + Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') + Utils.pprint ('RED', 'Please use an older or newer version.') + print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)" + print "Persistent cookies: " + libsoup_25_2 + " (libSoup 2.25.2)" + if 'soup-2.4' in conf.env['LIB_WEBKIT']: + Utils.pprint ('GREEN', 'WebKit was built with libsoup') + else: + Utils.pprint ('RED', 'WebKit was NOT built with libsoup') + print "Persistent history: " + sqlite + " (sqlite3)" def set_options (opt): def add_enable_option (option, desc, group=None, disable=False): From 92fd37ad613d1abd7038d76f38d3c6abfba5a3bf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 20 Jan 2009 22:17:04 +0100 Subject: [PATCH 0676/2970] Remove panel pages implicitly as viewables are destroyed For this to work smoothly, from now on the browser destroys the panel eary, as it does with the tabs, and the panel in turn destroys its pages early. --- extensions/page-holder.c | 9 ++++++ midori/midori-browser.c | 4 ++- midori/midori-panel.c | 59 ++++++++++++++++++++++++++++++++++------ 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/extensions/page-holder.c b/extensions/page-holder.c index b396b059..2902b78a 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -64,6 +64,13 @@ page_holder_button_add_clicked_cb (GtkWidget* button, midori_view_set_uri (MIDORI_VIEW (view), uri); } +static void +page_holder_deactivate_cb (MidoriExtension* extension, + GtkWidget* notebook) +{ + gtk_widget_destroy (notebook); +} + static void page_holder_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, @@ -107,6 +114,8 @@ page_holder_app_add_browser_cb (MidoriApp* app, midori_panel_append_widget (MIDORI_PANEL (panel), notebook, /* i18n: A panel showing a user specified web page */ STOCK_PAGE_HOLDER, _("Pageholder"), toolbar); + g_signal_connect (extension, "deactivate", + G_CALLBACK (page_holder_deactivate_cb), notebook); } static void diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b19813cb..e8c215e6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3477,7 +3477,9 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, static void midori_browser_destroy_cb (MidoriBrowser* browser) { - /* Destroy tabs first, so child widgets don't need special care */ + /* Destroy panel first, so panels don't need special care */ + gtk_widget_destroy (browser->panel); + /* Destroy tabs second, so child widgets don't need special care */ gtk_container_foreach (GTK_CONTAINER (browser->notebook), (GtkCallback) gtk_widget_destroy, NULL); } diff --git a/midori/midori-panel.c b/midori/midori-panel.c index de821617..59dd78b7 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -157,6 +157,14 @@ midori_panel_button_close_clicked_cb (GtkWidget* toolitem, g_signal_emit (panel, signals[CLOSE], 0, &return_value); } +static void +midori_panel_destroy_cb (MidoriPanel* panel) +{ + /* Destroy pages first, so they don't need special care */ + gtk_container_foreach (GTK_CONTAINER (panel->notebook), + (GtkCallback) gtk_widget_destroy, NULL); +} + static void midori_panel_init (MidoriPanel* panel) { @@ -215,18 +223,14 @@ midori_panel_init (MidoriPanel* panel) gtk_container_add (GTK_CONTAINER (panel->frame), panel->notebook); gtk_box_pack_start (GTK_BOX (vbox), panel->frame, TRUE, TRUE, 0); gtk_widget_show_all (panel->frame); + + g_signal_connect (panel, "destroy", + G_CALLBACK (midori_panel_destroy_cb), NULL); } static void midori_panel_finalize (GObject* object) { - MidoriPanel* panel = MIDORI_PANEL (object); - - if (panel->menu) - { - /* FIXME: Remove all menu items */ - } - G_OBJECT_CLASS (midori_panel_parent_class)->finalize (object); } @@ -342,6 +346,26 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, } } +static void +midori_panel_viewable_destroy_cb (GtkWidget* viewable, + MidoriPanel* panel) +{ + gint i = gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), viewable); + if (i > -1) + gtk_notebook_remove_page (GTK_NOTEBOOK (panel->notebook), i); + g_signal_handlers_disconnect_by_func ( + viewable, midori_panel_viewable_destroy_cb, panel); +} + +static void +midori_panel_widget_destroy_cb (GtkWidget* viewable, + GtkWidget* widget) +{ + gtk_widget_destroy (widget); + g_signal_handlers_disconnect_by_func ( + viewable, midori_panel_widget_destroy_cb, widget); +} + /** * midori_panel_append_page: * @panel: a #MidoriPanel @@ -353,6 +377,9 @@ midori_panel_menu_item_activate_cb (GtkWidget* widget, * Appends a new page to the panel. If @toolbar is specified it will * be packed above @viewable. * + * Since 0.1.3 destroying the @viewable implicitly removes + * the page including the menu and eventual toolbar. + * * In the case of an error, -1 is returned. * * Return value: the index of the new page, or -1 @@ -401,6 +428,8 @@ midori_panel_append_page (MidoriPanel* panel, toolbar = midori_viewable_get_toolbar (viewable); gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); + g_signal_connect (viewable, "destroy", + G_CALLBACK (midori_panel_widget_destroy_cb), toolbar); n = midori_panel_page_num (panel, scrolled); label = midori_viewable_get_label (viewable); @@ -421,6 +450,8 @@ midori_panel_append_page (MidoriPanel* panel, G_CALLBACK (midori_panel_menu_item_activate_cb), panel); gtk_widget_show_all (GTK_WIDGET (toolitem)); gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), toolitem, -1); + g_signal_connect (viewable, "destroy", + G_CALLBACK (midori_panel_widget_destroy_cb), toolitem); if (panel->menu) { @@ -432,8 +463,13 @@ midori_panel_append_page (MidoriPanel* panel, G_CALLBACK (midori_panel_menu_item_activate_cb), panel); gtk_menu_shell_append (GTK_MENU_SHELL (panel->menu), menuitem); + g_signal_connect (viewable, "destroy", + G_CALLBACK (midori_panel_widget_destroy_cb), menuitem); } + g_signal_connect (viewable, "destroy", + G_CALLBACK (midori_panel_viewable_destroy_cb), panel); + return n; } @@ -669,8 +705,8 @@ midori_dummy_viewable_finalize (GObject* object) static GtkWidget* midori_dummy_viewable_new (const gchar* stock_id, - const gchar* label, - GtkWidget* toolbar) + const gchar* label, + GtkWidget* toolbar) { GtkWidget* viewable = g_object_new (MIDORI_TYPE_DUMMY_VIEWABLE, NULL); @@ -695,6 +731,9 @@ midori_dummy_viewable_new (const gchar* stock_id, * Actually implementing #MidoriViewable instead of using * this convenience is recommended. * + * Since 0.1.3 destroying the @widget implicitly removes + * the page including the menu and eventual toolbar. + * * In the case of an error, -1 is returned. * * Return value: the index of the new page, or -1 @@ -717,5 +756,7 @@ midori_panel_append_widget (MidoriPanel* panel, viewable = midori_dummy_viewable_new (stock_id, label, toolbar); gtk_widget_show (viewable); gtk_container_add (GTK_CONTAINER (viewable), widget); + g_signal_connect (widget, "destroy", + G_CALLBACK (midori_panel_widget_destroy_cb), viewable); return midori_panel_append_page (panel, MIDORI_VIEWABLE (viewable)); } From b89fbb98f297b021cbbb83b02b28fdb1b576e097 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 20 Jan 2009 22:40:25 +0100 Subject: [PATCH 0677/2970] Implement MidoriApp::browsers and deprecate MidoriApp::browser-count --- midori/midori-app.c | 47 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 4d3eb4d7..4579f845 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -27,7 +27,6 @@ struct _MidoriApp { GObject parent_instance; - GList* browsers; MidoriBrowser* browser; GtkAccelGroup* accel_group; @@ -37,6 +36,7 @@ struct _MidoriApp KatzeArray* search_engines; KatzeArray* history; KatzeArray* extensions; + KatzeArray* browsers; gpointer instance; }; @@ -65,6 +65,7 @@ enum PROP_SEARCH_ENGINES, PROP_HISTORY, PROP_EXTENSIONS, + PROP_BROWSERS, PROP_BROWSER, PROP_BROWSER_COUNT }; @@ -127,8 +128,8 @@ static gboolean midori_browser_destroy_cb (MidoriBrowser* browser, MidoriApp* app) { - app->browsers = g_list_remove (app->browsers, browser); - if (g_list_nth (app->browsers, 0)) + katze_array_remove_item (app->browsers, browser); + if (!katze_array_is_empty (app->browsers)) return FALSE; midori_app_quit (app); return TRUE; @@ -157,7 +158,7 @@ _midori_app_add_browser (MidoriApp* app, "signal::quit", midori_browser_quit_cb, app, NULL); - app->browsers = g_list_prepend (app->browsers, browser); + katze_array_add_item (app->browsers, browser); #if HAVE_UNIQUE unique_app_watch_window (app->instance, GTK_WINDOW (browser)); @@ -258,6 +259,29 @@ midori_app_class_init (MidoriAppClass* class) KATZE_TYPE_ARRAY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * MidoriApp:browsers: + * + * The list of browsers. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_BROWSERS, + g_param_spec_object ( + "browsers", + "Browsers", + "The list of browsers", + KATZE_TYPE_ARRAY, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + + /** + * MidoriApp:browser: + * + * The current browser, that is the one that was last used. + * + * Since: 0.1.3 + */ g_object_class_install_property (gobject_class, PROP_BROWSER, g_param_spec_object ( @@ -267,6 +291,13 @@ midori_app_class_init (MidoriAppClass* class) MIDORI_TYPE_BROWSER, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * MidoriApp:browser-count: + * + * The number of browsers. + * + * Deprecated: 0.1.3 Use MidoriApp:browsers instead. + */ g_object_class_install_property (gobject_class, PROP_BROWSER_COUNT, g_param_spec_uint ( @@ -374,6 +405,7 @@ midori_app_init (MidoriApp* app) app->search_engines = NULL; app->history = NULL; app->extensions = NULL; + app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); #if HAVE_UNIQUE display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); @@ -397,7 +429,6 @@ midori_app_finalize (GObject* object) { MidoriApp* app = MIDORI_APP (object); - g_list_free (app->browsers); g_object_unref (app->accel_group); katze_object_assign (app->settings, NULL); @@ -406,6 +437,7 @@ midori_app_finalize (GObject* object) katze_object_assign (app->search_engines, NULL); katze_object_assign (app->history, NULL); katze_object_assign (app->extensions, NULL); + katze_object_assign (app->browsers, NULL); katze_object_assign (app->instance, NULL); @@ -479,11 +511,14 @@ midori_app_get_property (GObject* object, case PROP_EXTENSIONS: g_value_set_object (value, app->extensions); break; + case PROP_BROWSERS: + g_value_set_object (value, app->browsers); + break; case PROP_BROWSER: g_value_set_object (value, app->browser); break; case PROP_BROWSER_COUNT: - g_value_set_uint (value, g_list_length (app->browsers)); + g_value_set_uint (value, katze_array_get_length (app->browsers)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); From 89a205bd599cc259da3a3f9137d8531804f27ed9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 20 Jan 2009 23:27:19 +0100 Subject: [PATCH 0678/2970] Remember the last window state, ie. whether Midori was maximized or minimized --- midori/midori-browser.c | 25 +++++++++++++++++++++ midori/midori-websettings.c | 45 ++++++++++++++++++++++++++++++++++++- midori/midori-websettings.h | 14 ++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e8c215e6..222101e8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3436,6 +3436,15 @@ static void midori_browser_window_state_event_cb (MidoriBrowser* browser, GdkEventWindowState* event) { + MidoriWindowState window_state = MIDORI_WINDOW_NORMAL; + if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) + window_state = MIDORI_WINDOW_MINIMIZED; + else if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) + window_state = MIDORI_WINDOW_MAXIMIZED; + else if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) + window_state = MIDORI_WINDOW_FULLSCREEN; + g_object_set (browser->settings, "last-window-state", window_state, NULL); + if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) { if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) @@ -4379,6 +4388,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) { gboolean remember_last_window_size; gint last_window_width, last_window_height; + MidoriWindowState last_window_state; gboolean compact_sidepanel; gint last_panel_position, last_panel_page; gboolean show_menubar, show_navigationbar, show_bookmarkbar; @@ -4395,6 +4405,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "remember-last-window-size", &remember_last_window_size, "last-window-width", &last_window_width, "last-window-height", &last_window_height, + "last-window-state", &last_window_state, "compact-sidepanel", &compact_sidepanel, "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, @@ -4421,6 +4432,20 @@ _midori_browser_update_settings (MidoriBrowser* browser) else gtk_window_set_default_size (GTK_WINDOW (browser), default_width, default_height); + switch (last_window_state) + { + case MIDORI_WINDOW_MINIMIZED: + gtk_window_iconify (GTK_WINDOW (browser)); + break; + case MIDORI_WINDOW_MAXIMIZED: + gtk_window_maximize (GTK_WINDOW (browser)); + break; + case MIDORI_WINDOW_FULLSCREEN: + gtk_window_fullscreen (GTK_WINDOW (browser)); + break; + default: + ;/* Do nothing. */ + } } _midori_browser_set_toolbar_style (browser, toolbar_style); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 1ddf110a..fadfe88a 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -27,6 +27,7 @@ struct _MidoriWebSettings gboolean remember_last_window_size; gint last_window_width; gint last_window_height; + MidoriWindowState last_window_state; gint last_panel_position; gint last_panel_page; gint last_web_search; @@ -89,6 +90,7 @@ enum PROP_REMEMBER_LAST_WINDOW_SIZE, PROP_LAST_WINDOW_WIDTH, PROP_LAST_WINDOW_HEIGHT, + PROP_LAST_WINDOW_STATE, PROP_LAST_PANEL_POSITION, PROP_LAST_PANEL_PAGE, PROP_LAST_WEB_SEARCH, @@ -139,6 +141,24 @@ enum PROP_CACHE_SIZE }; +GType +midori_window_state_get_type (void) +{ + static GType type = 0; + if (!type) + { + static const GEnumValue values[] = { + { MIDORI_WINDOW_NORMAL, "MIDORI_WINDOW_NORMAL", "Normal" }, + { MIDORI_WINDOW_MINIMIZED, "MIDORI_WINDOW_MINIMIZED", "Minimized" }, + { MIDORI_WINDOW_MAXIMIZED, "MIDORI_WINDOW_MAXIMIZED", "Maximized" }, + { MIDORI_WINDOW_FULLSCREEN, "MIDORI_WINDOW_FULLSCREEN", "Fullscreen" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static ("MidoriWindowState", values); + } + return type; +} + GType midori_startup_get_type (void) { @@ -303,6 +323,23 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) 0, G_MAXINT, 0, flags)); + /** + * MidoriWebSettings:last-window-state: + * + * The last saved window state. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_LAST_WINDOW_STATE, + g_param_spec_enum ( + "last-window-state", + "Last window state", + "The last saved window state", + MIDORI_TYPE_WINDOW_STATE, + MIDORI_WINDOW_NORMAL, + flags)); + g_object_class_install_property (gobject_class, PROP_LAST_PANEL_POSITION, g_param_spec_int ( @@ -887,6 +924,9 @@ midori_web_settings_set_property (GObject* object, case PROP_LAST_WINDOW_HEIGHT: web_settings->last_window_height = g_value_get_int (value); break; + case PROP_LAST_WINDOW_STATE: + web_settings->last_window_state = g_value_get_enum (value); + break; case PROP_LAST_PANEL_POSITION: web_settings->last_panel_position = g_value_get_int (value); break; @@ -1062,6 +1102,9 @@ midori_web_settings_get_property (GObject* object, case PROP_LAST_WINDOW_HEIGHT: g_value_set_int (value, web_settings->last_window_height); break; + case PROP_LAST_WINDOW_STATE: + g_value_set_enum (value, web_settings->last_window_state); + break; case PROP_LAST_PANEL_POSITION: g_value_set_int (value, web_settings->last_panel_position); break; diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 96e58166..72b692cc 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -34,6 +34,20 @@ G_BEGIN_DECLS typedef struct _MidoriWebSettings MidoriWebSettings; typedef struct _MidoriWebSettingsClass MidoriWebSettingsClass; +typedef enum +{ + MIDORI_WINDOW_NORMAL, + MIDORI_WINDOW_MINIMIZED, + MIDORI_WINDOW_MAXIMIZED, + MIDORI_WINDOW_FULLSCREEN, +} MidoriWindowState; + +GType +midori_window_state_get_type (void) G_GNUC_CONST; + +#define MIDORI_TYPE_WINDOW_STATE \ + (midori_startup_get_type ()) + typedef enum { MIDORI_STARTUP_BLANK_PAGE, From 33508720695182fa2dcfdf753ef2a43ec06d84dd Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Wed, 21 Jan 2009 00:42:46 +0100 Subject: [PATCH 0679/2970] Implement Mouse Gestures extension --- AUTHORS | 1 + extensions/mouse-gestures/main.c | 229 +++++++++++++++++++++ extensions/mouse-gestures/mouse-gestures.h | 37 ++++ 3 files changed, 267 insertions(+) create mode 100644 extensions/mouse-gestures/main.c create mode 100644 extensions/mouse-gestures/mouse-gestures.h diff --git a/AUTHORS b/AUTHORS index 9cea5ec6..0934b10e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ Contributors: Alexander Hesse Brian Vuyk Nick Schermer + Matthias Kruk Graphics: extension: Nancy Runge diff --git a/extensions/mouse-gestures/main.c b/extensions/mouse-gestures/main.c new file mode 100644 index 00000000..2777ca4d --- /dev/null +++ b/extensions/mouse-gestures/main.c @@ -0,0 +1,229 @@ +/* + Copyright (C) 2009 Matthias Kruk + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include +#include "mouse-gestures.h" + +#define MOUSE_GESTURES_VERSION "0.1" +#define DEVIANCE 20 // the deviance to determine if a line is straight or not +#define MINLENGTH 50 // the minimal length of a line to be treated as a gesture + +// #define __MOUSE_GESTURES_DEBUG__ // uncomment for debugging purposes + +MouseGesture *gesture; + +void mouse_gesture_clear(MouseGesture *g) +{ + g->start.x = 0; + g->start.y = 0; + g->middle.x = 0; + g->middle.y = 0; + g->end.x = 0; + g->end.y = 0; + g->last = MOUSE_BUTTON_UNSET; + return; +} + +MouseGesture* mouse_gesture_new(void) +{ + MouseGesture *g = NULL; + if((g = g_new(MouseGesture, 1)) == NULL) + return(NULL); + mouse_gesture_clear(g); + return(g); +} + +static gboolean mouse_gestures_handle_events(GtkWidget *widget, GdkEvent *event, MidoriBrowser *browser) +{ + if(event->type == GDK_BUTTON_PRESS) // a button was pressed + { + if(gesture->last == MOUSE_BUTTON_UNSET) // if the gesture was previously cleaned -> new gesture -> new start coordinates + { + gesture->start.x = event->button.x; + gesture->start.y = event->button.y; + gesture->last = event->button.button; + } + return(TRUE); + } + else if(event->type == GDK_MOTION_NOTIFY) // the mouse was moved + { + if(gesture->last != MOUSE_BUTTON_UNSET) + { + guint x, y; + x = event->motion.x; + y = event->motion.y; + if((gesture->start.x - x < DEVIANCE && gesture->start.x - x > -DEVIANCE) || + (gesture->start.y - y < DEVIANCE && gesture->start.y - y > -DEVIANCE)) + { + gesture->middle.x = x; + gesture->middle.y = y; + } + else if((gesture->middle.x - x < DEVIANCE && gesture->middle.x - x > -DEVIANCE) || + (gesture->middle.y - y < DEVIANCE && gesture->middle.y - y > -DEVIANCE)) + { + gesture->end.x = x; + gesture->end.y = y; + } + } + return(TRUE); + } + else if(event->type == GDK_BUTTON_RELEASE) + { + if(gesture->last == MOUSE_BUTTON_MIDDLE) // all mouse gestures will use the middle mouse button + { + // middle mouse button has been released + if(gesture->middle.x - gesture->start.x < DEVIANCE && gesture->middle.x - gesture->start.x > -DEVIANCE) + { + // StartNode to MiddleNode is a straight vertical line + if(gesture->middle.y > gesture->start.y + MINLENGTH) + { + // StartNode to MiddleNode is drawn downwards + if(gesture->middle.y - gesture->end.y < DEVIANCE && gesture->middle.y - gesture->end.y > -DEVIANCE && gesture->end.x > gesture->middle.x + MINLENGTH) + { + // MiddleNode to EndNode is a straight horizontal line (to the right) -> close tab + midori_browser_activate_action(browser, "TabClose"); + #ifdef __MOUSE_GESTURES_DEBUG__ + g_print("TabClose gesture\n"); + #endif + } + else if(gesture->middle.y - gesture->end.y < DEVIANCE && gesture->middle.y - gesture->end.y > -DEVIANCE && gesture->end.x < gesture->middle.x - MINLENGTH) + { + // MiddleNode to EndNode is a straight horizontal line (to the left) -> reload + midori_browser_activate_action(browser, "Reload"); + #ifdef __MOUSE_GESTURES_DEBUG__ + g_print("Reload gesture\n"); + #endif + } + else if(gesture->end.y == 0 && gesture->end.x == 0) + { + // no EndNode, just a vertical line -> new tab + midori_browser_activate_action(browser, "TabNew"); + #ifdef __MOUSE_GESTURES_DEBUG__ + g_print("TabNew gesture\n"); + #endif + } + } + if(gesture->middle.y < gesture->start.y - MINLENGTH) + { + // StartNode to MiddleNode is drawn upwards + if(gesture->end.y == 0 && gesture->end.x == 0) + { + // no EndNode, just a vertical line -> stop + midori_browser_activate_action(browser, "Stop"); + #ifdef __MOUSE_GESTURES_DEBUG__ + g_print("Stop gesture\n"); + #endif + } + } + } + else if(gesture->middle.y - gesture->start.y < DEVIANCE && gesture->middle.y - gesture->start.y > -DEVIANCE) + { + // Start Node to MiddleNode is a straight horizontal line + if(gesture->middle.x > gesture->start.x + MINLENGTH) + { + // the line was drawn from left to right + if(gesture->end.x == 0 && gesture->end.y == 0) + { + // we only have one horizontal line from left to right -> forward gesture + midori_browser_activate_action(browser, "Forward"); + #ifdef __MOUSE_GESTURES_DEBUG__ + g_print("Forward gesture\n"); + #endif + } + } + else if(gesture->middle.x < gesture->start.x - MINLENGTH) + { + // the line was drawn from right to left + if(gesture->end.x == 0 && gesture->end.y == 0) + { + // we only have one horizontal line from right to left -> backwards gesture + midori_browser_activate_action(browser, "Back"); + #ifdef __MOUSE_GESTURES_DEBUG__ + g_print("Back gesture\n"); + #endif + } + } + } + } + mouse_gesture_clear(gesture); // gesture finished, clear it + return(TRUE); + } + else + return(FALSE); // this event is supposed to be handled again (by someone else's code) since it was irrelevant to us +} + +static void mouse_gestures_tab_cb(MidoriBrowser* browser, GtkWidget *view) // this is performed when a new tab is created +{ + g_signal_connect(view, "event", G_CALLBACK(mouse_gestures_handle_events), browser); // perform the above callback when an event from the view is received + return; +} + +static void mouse_gestures_browser_cb(MidoriApp *app, MidoriBrowser *browser) // this is performed when ever a new window is created +{ + g_signal_connect(browser, "add-tab", G_CALLBACK(mouse_gestures_tab_cb), NULL); // connect the above callback to the "add-tab" signal of browser + return; +} + +/* this is performed when the extension is deactivated. + disconnect all signal handlers, so that mouse gestures are no longer handled */ +static void mouse_gestures_deactivate(MidoriExtension *extension, MidoriApp *app) +{ + gulong signal_id = g_signal_handler_find(app, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, mouse_gestures_browser_cb, NULL); // get the signal handler id + if(signal_id != 0) // if that id is valid + g_signal_handler_disconnect(app, signal_id); // disconnect the signal + KatzeArray *browsers = katze_object_get_object(app, "browsers"); // get the array that contains all browsers + guint i; // our counter variable :) + for(i = 0; i < katze_array_get_length(browsers); i++) // from the first to the last browser + { + MidoriBrowser *browser = katze_array_get_nth_item(browsers, i); // get a pointer on the current browser + signal_id = g_signal_handler_find(browser, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, mouse_gestures_tab_cb, NULL); // search forthe signal handler id + if(signal_id != 0) // and if its not invalid.. + g_signal_handler_disconnect(browser, signal_id); // disconnect it + + GtkWidget *notebook = katze_object_get_object(browser, "notebook"); // get a pointer on the notebook + gint j; // another counter + for(j = 0; j < gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)); j++) // from the first to the last tab + { + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), j); // get a pointer on the tab's view + signal_id = g_signal_handler_find(page, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, mouse_gestures_handle_events, NULL); // find the signal id of the event handler + if(signal_id != 0) // if the id is valid + g_signal_handler_disconnect(page, signal_id); // disconnect the handler + } + } + g_free(gesture); // free the structure that contains the gesture information + return; +} + +static void mouse_gestures_activate(MidoriExtension *extension, MidoriApp *app) // this is performed on extension-activation +{ + g_signal_connect(app, "add-browser", G_CALLBACK(mouse_gestures_browser_cb), NULL); // connect the above callback to the "add-browser" signal of app + g_signal_connect(extension, "deactivate", G_CALLBACK(mouse_gestures_deactivate), app); // connect the deactivate callback to the extension + return; +} + +MidoriExtension* extension_init(void) +{ + MidoriExtension* extension = NULL; + extension = g_object_new(MIDORI_TYPE_EXTENSION, + "name", "Mouse gestures", + "description", "Control Midori by moving the mouse", + "version", MOUSE_GESTURES_VERSION, + "authors", "Matthias Kruk ", NULL); + g_signal_connect(extension, "activate", G_CALLBACK(mouse_gestures_activate), NULL); // connect the callback that's executed on activation + gesture = NULL; // initialise gesture pointer; initialising pointers is always a good choice + if((gesture = mouse_gesture_new()) == NULL) // allocate space for the gesture + { + // no space could be allocated + g_free(extension); // free the space used by this extension + return(NULL); + } + return(extension); +} diff --git a/extensions/mouse-gestures/mouse-gestures.h b/extensions/mouse-gestures/mouse-gestures.h new file mode 100644 index 00000000..945c05ab --- /dev/null +++ b/extensions/mouse-gestures/mouse-gestures.h @@ -0,0 +1,37 @@ +/* + Copyright (C) 2009 Matthias Kruk + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MOUSE_GESTURES_H__ +#define __MOUSE_GESTURES_H__ + +typedef struct _MouseGesture MouseGesture; +typedef enum _MouseButton MouseButton; + +enum _MouseButton { + MOUSE_BUTTON_LEFT = 1, + MOUSE_BUTTON_RIGHT = 3, + MOUSE_BUTTON_MIDDLE = 2, + MOUSE_BUTTON_UNSET = 0 +}; + +struct MouseGestureNode { + double x; + double y; +} MouseGestureNode_t; + +struct _MouseGesture { + struct MouseGestureNode start; + struct MouseGestureNode middle; + struct MouseGestureNode end; + MouseButton last; +}; + +#endif From a63942cd790f3d1a46342a88b3223068b608b959 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 Jan 2009 01:59:23 +0100 Subject: [PATCH 0680/2970] Respect NLSPATH in Midori and use it for ./waf build --run --- INSTALL | 9 +++++++-- TRANSLATE | 13 ++++++------- midori/main.c | 6 +++++- wscript | 26 +++++++++++++++++++++++--- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/INSTALL b/INSTALL index 89dd7340..a771fae9 100644 --- a/INSTALL +++ b/INSTALL @@ -12,7 +12,12 @@ Run './waf configure' Run './waf build' -You can now run Midori from _build_/default/midori +You can now run Midori from the build folder like so + +'./waf build --run' + +This is a convenience that will load extensions as well as +localizations from the build folder. You can install it with './waf install' @@ -20,7 +25,7 @@ For further options run './waf --help' +++ Debugging Midori +++ -Run './waf configure -d debug' from the Midori folder. +Run './waf configure -d full' from the Midori folder. Run './waf build' diff --git a/TRANSLATE b/TRANSLATE index e620cb65..9b2bbffb 100644 --- a/TRANSLATE +++ b/TRANSLATE @@ -21,20 +21,19 @@ To check your language 'aa' for errors, do this: msgfmt -c --check-accelerators=_ aa.po -To test your changes, make sure you install Midori: +To test your changes, run Midori like so: -./waf install +./waf build --run -And of course you can uninstall it again after testing: - -./waf uninstall +This is a convenience command that will setup localization in +the build folder so you don't need to install translations. To run Midori in a particular language, run it like this: -LANG=fr_FR.utf8 midori +LANG=fr_FR.utf8 ./waf build --run As a general rule, your localization should be based off of the -current state of the git repository. +current git repository or the latest midori.pot in git. Some strings have comments, starting with 'i18n', which are meant to describe the role of a string to translators. diff --git a/midori/main.c b/midori/main.c index 7ad1ef0f..1afd87e1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1950,7 +1950,11 @@ main (int argc, #endif #if ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + setlocale (LC_ALL, ""); + if (g_getenv ("NLSPATH")) + bindtextdomain (GETTEXT_PACKAGE, g_getenv ("NLSPATH")); + else + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif diff --git a/wscript b/wscript index 3ad01795..73be9cc6 100644 --- a/wscript +++ b/wscript @@ -80,7 +80,6 @@ def configure (conf): if conf.env['INTLTOOL'] and conf.env['POCOM']: nls = 'yes' conf.define ('ENABLE_NLS', 1) - conf.define ('MIDORI_LOCALEDIR', 'LOCALEDIR', 0) else: option_checkfatal ('nls', 'localization') nls = 'N/A' @@ -383,10 +382,31 @@ def shutdown (): Utils.pprint ('RED', "Make sure intltool is installed.") os.chdir ('..') elif Options.options.run: + def mkdir (path): + if not os.access (path, os.F_OK): + os.mkdir (path) + folder = os.path.dirname (Build.bld.env['waf_config_files'][0]) try: + ext = 'MIDORI_EXTENSION_PATH=' + folder + os.sep + 'extensions' + nls = 'NLSPATH=' + folder + os.sep + 'po' + lang = os.environ['LANG'] + try: + for lang in os.listdir (folder + os.sep + 'po'): + if lang[3:] == 'mo': + lang = lang[:-3] + else: + continue + mkdir (folder + os.sep + 'po' + os.sep + lang) + mkdir (folder + os.sep + 'po' + os.sep + lang + \ + os.sep + 'LC_MESSAGES') + os.symlink (folder + os.sep + 'po' + os.sep + lang + '.mo', + folder + os.sep + 'po' + os.sep + lang + os.sep + \ + 'LC_MESSAGES' + os.sep + APPNAME + '.mo') + except: + pass command = folder + os.sep + APPNAME + os.sep + APPNAME - Utils.exec_command ('MIDORI_EXTENSION_PATH=' + folder + \ - os.sep + 'extensions' + ' ' + command) + print ext + ' ' + nls + ' ' + command + Utils.exec_command (ext + ' ' + nls + ' ' + command) except: Utils.pprint ('RED', "Failed to run application.") From 34c0f65026f236438973cf820646c678e12add21 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 Jan 2009 02:01:33 +0100 Subject: [PATCH 0681/2970] Update German translation --- po/de.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 0d5bdbd2..d6c5c117 100644 --- a/po/de.po +++ b/po/de.po @@ -697,11 +697,11 @@ msgstr "Öffne einen bestimmten Ort" #: ../midori/midori-browser.c:3772 msgid "_Web Search..." -msgstr "_Netzsuche…" +msgstr "Im _Netz suchen…" #: ../midori/midori-browser.c:3774 msgid "Run a web search" -msgstr "Starte eine Netzsuche" +msgstr "Starte eine Suche im Netz" #: ../midori/midori-browser.c:3793 msgid "Reopen a previously closed tab or window" @@ -900,11 +900,11 @@ msgstr "Die zuletzt gespeicherte Leistenseite" #: ../midori/midori-websettings.c:329 msgid "Last Web search" -msgstr "Letzte Netzsuche" +msgstr "Letzte Suche im Netz" #: ../midori/midori-websettings.c:330 msgid "The last saved Web search" -msgstr "Die zuletzt gespeicherte Netzsuche" +msgstr "Die zuletzt gespeicherte Suche im Netz" #: ../midori/midori-websettings.c:339 msgid "Show Menubar" @@ -1040,11 +1040,11 @@ msgstr "Die Reiterleiste immer anzeigen" #: ../midori/midori-websettings.c:505 msgid "Close Buttons on Tabs" -msgstr "Schließenknöpfe auf Reitern" +msgstr "Schließenschaltflächen auf Reitern" #: ../midori/midori-websettings.c:506 msgid "Whether tabs have close buttons" -msgstr "Schließenknöpfe auf Reitern anzeigen oder verbergen" +msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" #: ../midori/midori-websettings.c:515 msgid "Open new pages in" @@ -1108,7 +1108,7 @@ msgstr "Profildateien annehmen" #: ../midori/midori-websettings.c:631 msgid "What type of cookies to accept" -msgstr "Welche Art von Profildateien angenommen werden" +msgstr "Welche Art von Profildateien (Cookies) angenommen werden" #: ../midori/midori-websettings.c:644 msgid "Original cookies only" @@ -1116,7 +1116,7 @@ msgstr "Nur ursprüngliche Profildateien" #: ../midori/midori-websettings.c:645 msgid "Accept cookies from the original website only" -msgstr "Nur Profildateien von der ursprünglichen Netzseite annehmen" +msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" #: ../midori/midori-websettings.c:653 msgid "Maximum cookie age" @@ -1173,7 +1173,7 @@ msgstr "Ausgeben als" #: ../midori/midori-websettings.c:724 msgid "What to identify as to web pages" -msgstr "Wie gegenüber Netzseiten identifiziert werden soll" +msgstr "Wie gegenüber Seiten im Netz identifiziert werden soll" #: ../midori/midori-websettings.c:744 msgid "Identification string" From 455ad57d0f26dc3dff4c69ea74afd0bdbf4f3c12 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 Jan 2009 03:26:06 +0100 Subject: [PATCH 0682/2970] Update French translation --- po/fr.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4312f3ff..47ad773f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-19 22:22+0100\n" -"PO-Revision-Date: 2009-01-19 23:06+0100\n" +"PO-Revision-Date: 2009-01-22 03:07+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -110,12 +110,12 @@ msgstr "Document mal formé" #: ../midori/main.c:569 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Échec d'ouvrir la banque de données: %s\n" #: ../midori/main.c:601 #, c-format msgid "Failed to execute database statement: %s\n" -msgstr "" +msgstr "Échec d'exécuter une intruction de la banque de données: %s\n" #: ../midori/main.c:655 #, c-format @@ -125,7 +125,7 @@ msgstr "" #: ../midori/main.c:679 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "Échec de vider l'historique: %s\n" #: ../midori/main.c:712 ../midori/main.c:726 #, c-format @@ -228,11 +228,11 @@ msgstr "Afficher la version du programme" #: ../midori/main.c:1923 msgid "Addresses" -msgstr "" +msgstr "Adresses" #: ../midori/main.c:1963 msgid "[Addresses]" -msgstr "" +msgstr "[Adresses]" #: ../midori/main.c:1987 msgid "Please report comments, suggestions and bugs to:" @@ -274,7 +274,7 @@ msgstr "Les erreurs suivantes ont eu lieu :" #: ../midori/main.c:2148 msgid "_Ignore" -msgstr "" +msgstr "_Ignorer" #: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 #: ../midori/midori-browser.c:3192 @@ -313,7 +313,7 @@ msgstr "_Description :" #: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 msgid "_Address:" -msgstr "" +msgstr "_Adresse :" # manque un raccourcis Alt+X #: ../midori/midori-browser.c:578 @@ -752,7 +752,7 @@ msgstr "Sensible à la casse" #: ../midori/midori-browser.c:4047 msgid "Highlight Matches" -msgstr "" +msgstr "Marquer les résultats" #: ../midori/midori-browser.c:4056 msgid "Close Findbar" @@ -849,15 +849,15 @@ msgstr "Aucun" #: ../midori/midori-websettings.c:240 msgid "Safari" -msgstr "" +msgstr "Safari" #: ../midori/midori-websettings.c:241 msgid "Firefox" -msgstr "" +msgstr "Firefox" #: ../midori/midori-websettings.c:242 msgid "Internet Explorer" -msgstr "" +msgstr "Explorateur Internet" #: ../midori/midori-websettings.c:283 msgid "Remember last window size" @@ -986,11 +986,11 @@ msgstr "La page d'accueil" #: ../midori/midori-websettings.c:440 msgid "Show crash dialog" -msgstr "" +msgstr "Afficher dialogue de panne" #: ../midori/midori-websettings.c:441 msgid "Show a dialog after Midori crashed" -msgstr "" +msgstr "Afficher un dialogue en cas d'une panne" #: ../midori/midori-websettings.c:449 msgid "Download Folder" @@ -1165,7 +1165,7 @@ msgstr "" #: ../midori/midori-websettings.c:702 msgid "Proxy Server" -msgstr "" +msgstr "Serveur mandataire" #: ../midori/midori-websettings.c:703 msgid "The proxy server used for HTTP connections" @@ -1182,11 +1182,11 @@ msgstr "Comme s'identifier a pages toiles" #: ../midori/midori-websettings.c:744 msgid "Identification string" -msgstr "" +msgstr "Indicatif de l'application" #: ../midori/midori-websettings.c:745 msgid "The application identification string" -msgstr "" +msgstr "L'indicatif de l'application" #: ../midori/midori-websettings.c:757 msgid "Cache size" @@ -1266,7 +1266,7 @@ msgstr "Police par défaut" #: ../midori/midori-preferences.c:431 msgid "The default font size used to display text" -msgstr "" +msgstr "La taille de police utilisé pour afficher texte par défaut" #: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" @@ -1274,7 +1274,7 @@ msgstr "Taille minimum de police" #: ../midori/midori-preferences.c:437 msgid "The minimum font size used to display text" -msgstr "" +msgstr "La taille minimum de police utilisé pour afficher texte" #: ../midori/midori-preferences.c:444 msgid "Encoding" @@ -1343,11 +1343,11 @@ msgstr "" #: ../midori/midori-preferences.c:482 msgid "Enforce 96 dots per inch" -msgstr "" +msgstr "Forcer 96 points par pouce" #: ../midori/midori-preferences.c:483 msgid "Enforce a video dot density of 96 DPI" -msgstr "" +msgstr "Forcer une résolution de 96 DPI" #: ../midori/midori-preferences.c:486 msgid "Enable developer tools" From 1a69bc9d2d55a43087ace74cdc0acfaa7913fdbd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 Jan 2009 13:12:05 +0100 Subject: [PATCH 0683/2970] Include locale.h, it may not be pulled in automatically --- midori/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/main.c b/midori/main.c index 1afd87e1..31efc1ca 100644 --- a/midori/main.c +++ b/midori/main.c @@ -50,6 +50,7 @@ #if ENABLE_NLS #include + #include #endif #define MIDORI_HISTORY_ERROR g_quark_from_string("MIDORI_HISTORY_ERROR") From 2b463946a859f67018160066e246af484f5c68d1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 22 Jan 2009 22:59:47 +0100 Subject: [PATCH 0684/2970] Fix local copy of g_strcmp0 --- midori/compat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/compat.c b/midori/compat.c index 20fdc2df..6eb1c96c 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -11,6 +11,8 @@ #include "compat.h" +#include + #if !GLIB_CHECK_VERSION(2, 16, 0) /* Glib string function @@ -21,7 +23,7 @@ g_strcmp0 (const gchar* string1, const gchar* string2) { if (!string1) - return -(str1 != str2); + return -(string1 != string2); if (!string2) return string1 != string2; return strcmp (string1, string2); From 1829780e62a9f4b8ff41ec29baed06a5f6c47863 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 Jan 2009 21:36:04 +0100 Subject: [PATCH 0685/2970] Adapt extension and test build scripts, test files are picked up dynamically now --- extensions/wscript_build | 13 +++++++------ tests/wscript_build | 33 ++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/extensions/wscript_build b/extensions/wscript_build index aa93727a..8ce7027f 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -4,25 +4,26 @@ extensions = os.listdir ('extensions') for extension in extensions: - try: - folder = 'extensions' + os.sep + extension + folder = 'extensions' + os.sep + extension + if os.path.isdir (folder): files = os.listdir (folder) target = extension source = '' for fila in files: if fila[-2:] == '.c': source += ' ' + extension + os.sep + fila - includes = '.' + os.sep + '..' - except: + if not source: + Utils.pprint ('RED', folder + ': No source files found') + continue + else: if extension[-2:] != '.c': continue target = extension[:-2] source = extension - includes = '..' obj = bld.new_task_gen ('cc', 'shlib') obj.target = target - obj.includes = includes + obj.includes = '..' obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'katze' diff --git a/tests/wscript_build b/tests/wscript_build index 1a9ebc81..e167569b 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -2,10 +2,29 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. -obj = bld.new_task_gen ('cc', 'program') -obj.target = 'magic-uri' -obj.includes = '.. ../midori' -obj.source = 'magic-uri.c' -obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' -obj.uselib_local = 'midori' -obj.unit_test = 1 +tests = os.listdir ('tests') +for test in tests: + folder = 'tests' + os.sep + test + if os.path.isdir (folder): + files = os.listdir (folder) + target = test + source = '' + for fila in files: + if fila[-2:] == '.c': + source += ' ' + test + os.sep + fila + if not source: + Utils.pprint ('RED', folder + ': No source files found') + continue + else: + if test[-2:] != '.c': + continue + target = test[:-2] + source = test + + obj = bld.new_task_gen ('cc', 'program') + obj.target = 'test-' + target + obj.includes = '.. ../midori' + obj.source = source + obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' + obj.uselib_local = 'midori' + obj.unit_test = 1 From c5070bfcaccb820f2e23a2e5cbbe22c10ae9a4f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 Jan 2009 21:41:15 +0100 Subject: [PATCH 0686/2970] Correct documentation of katze_object_get_string and _get_enum --- katze/katze-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 02960b79..df5be8f3 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -668,7 +668,7 @@ katze_object_get_float (gpointer object, * * Retrieve the enum value of the specified property. * - * Return value: an enum + * Return value: an enumeration **/ gint katze_object_get_enum (gpointer object, @@ -690,7 +690,7 @@ katze_object_get_enum (gpointer object, * * Retrieve the string value of the specified property. * - * Return value: a float + * Return value: a newly allocated string **/ gchar* katze_object_get_string (gpointer object, From 2083433739aedc20266d80d5e8b5455584d1a353 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 Jan 2009 21:43:28 +0100 Subject: [PATCH 0687/2970] Merge two g_file_test calls into one --- midori/sokoke.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 543b2630..e0f29b97 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -142,8 +142,7 @@ sokoke_magic_uri (const gchar* uri, if (g_path_is_absolute (uri)) return g_strconcat ("file://", uri, NULL); /* Construct an absolute path if the file is relative */ - if (g_file_test (uri, G_FILE_TEST_EXISTS) - && g_file_test (uri, G_FILE_TEST_IS_REGULAR)) + if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { current_dir = g_get_current_dir (); result = g_strconcat ("file://", current_dir, From 5b5e6bd71acbdfaccfff246c04764c76ea85a6df Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 Jan 2009 21:45:40 +0100 Subject: [PATCH 0688/2970] Spare a separate g_file_test, let GdkPixbuf handle missing files --- katze/katze-net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index cf169c15..a40c1e3f 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -585,8 +585,8 @@ katze_net_load_icon (KatzeNet* net, if (pixbuf) g_object_ref (pixbuf); } - else if (g_file_test (icon_file, G_FILE_TEST_EXISTS)) - pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL); + else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL))) + ; /* If the called doesn't provide an icon callback, we assume there is no interest in loading an un-cached icon. */ else if (icon_cb) From fb2a962ad4d4a0976307e532cfe16316fde8dbcc Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Fri, 23 Jan 2009 22:38:39 +0100 Subject: [PATCH 0689/2970] Store the 'day' of history items to reduce even more calls to localtime By storing the timestamp of the day in the database we can significantly reduce the calls to localtime, which should result in a noticible speedup. We are changing the database format. For the convenience of the user the code automatically converts from the old format. --- midori/main.c | 92 ++++++++++++++++++++++++++++++++++------- midori/midori-browser.c | 44 +++++++++++--------- midori/sokoke.c | 31 ++++++-------- midori/sokoke.h | 5 +-- 4 files changed, 116 insertions(+), 56 deletions(-) diff --git a/midori/main.c b/midori/main.c index 31efc1ca..6d0fe3b1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -716,10 +716,11 @@ midori_history_add_item_cb (KatzeArray* array, } } sqlcmd = sqlite3_mprintf ("INSERT INTO history VALUES" - "('%q', '%q', %" G_GUINT64_FORMAT ", -1)", + "('%q', '%q', %" G_GUINT64_FORMAT ", %" G_GUINT64_FORMAT ")", katze_item_get_uri (item), katze_item_get_name (item), - katze_item_get_added (item)); + katze_item_get_added (item), + katze_item_get_added (KATZE_ITEM (array))); success = db_exec (db, sqlcmd, &error); sqlite3_free (sqlcmd); if (!success) @@ -737,13 +738,17 @@ midori_history_add_items (void* data, char** colname) { KatzeItem* item; - KatzeArray* parent = NULL; - KatzeArray* array = KATZE_ARRAY (data); + KatzeArray* parent; + KatzeArray* array; gint64 date; + gint64 day; gint i; - gint ncols = 3; + gint j; + gint n; + gint ncols = 4; gchar token[50]; + array = KATZE_ARRAY (data); g_return_val_if_fail (KATZE_IS_ARRAY (array), 1); /* Test whether have the right number of columns */ @@ -755,22 +760,29 @@ midori_history_add_items (void* data, { if (colname[i] && !g_ascii_strcasecmp (colname[i], "uri") && colname[i + 1] && !g_ascii_strcasecmp (colname[i + 1], "title") && - colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "date")) + colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "date") && + colname[i + 3] && !g_ascii_strcasecmp (colname[i + 3], "day")) { item = katze_item_new (); katze_item_set_uri (item, argv[i]); katze_item_set_name (item, argv[i + 1]); date = g_ascii_strtoull (argv[i + 2], NULL, 10); + day = g_ascii_strtoull (argv[i + 3], NULL, 10); katze_item_set_added (item, date); - strftime (token, sizeof (token), "%Y-%m-%d", - localtime ((time_t *)&date)); - parent = katze_array_find_token (array, token); - - if (!parent) + n = katze_array_get_length (array); + for (j = n - 1; j >= 0; j--) + { + parent = katze_array_get_nth_item (array, j); + if (day == katze_item_get_added (KATZE_ITEM (parent))) + break; + } + if (j < 0) { parent = katze_array_new (KATZE_TYPE_ARRAY); - katze_item_set_added (KATZE_ITEM (parent), date); + katze_item_set_added (KATZE_ITEM (parent), day); + strftime (token, sizeof (token), "%Y-%m-%d", + localtime ((time_t *)&date)); katze_item_set_token (KATZE_ITEM (parent), token); katze_array_add_item (array, parent); } @@ -781,6 +793,31 @@ midori_history_add_items (void* data, return 0; } +static int +midori_history_test_day_column (void* data, + int argc, + char** argv, + char** colname) +{ + gint i; + gboolean* has_day; + + has_day = (gboolean*)data; + + for (i = 0; i < argc; i++) + { + if (argv[i] && + !g_ascii_strcasecmp (colname[i], "name") && + !g_ascii_strcasecmp (argv[i], "day")) + { + *has_day = TRUE; + break; + } + } + + return 0; +} + static sqlite3* midori_history_initialize (KatzeArray* array, const gchar* filename, @@ -789,18 +826,45 @@ midori_history_initialize (KatzeArray* array, sqlite3* db; KatzeItem* item; gint i, n; + gboolean has_day; + + has_day = FALSE; if ((db = db_open (filename, error)) == NULL) return db; if (!db_exec (db, "CREATE TABLE IF NOT EXISTS " - "history(uri text, title text, date integer, visits integer)", + "history(uri text, title text, date integer, day integer)", error)) return NULL; if (!db_exec_callback (db, - "SELECT uri, title, date FROM history " + "PRAGMA table_info(history)", + midori_history_test_day_column, + &has_day, error)) + return NULL; + + if (!has_day) + { + if (!db_exec (db, + "BEGIN TRANSACTION;" + "CREATE TEMPORARY TABLE backup (uri text, title text, date integer);" + "INSERT INTO backup SELECT uri,title,date FROM history;" + "DROP TABLE history;" + "CREATE TABLE history (uri text, title text, date integer, day integer);" + "INSERT INTO history SELECT uri,title,date," + "julianday(date(date,'unixepoch','start of day','+1 day'))" + " - julianday('0001-01-01','start of day')" + "FROM backup;" + "DROP TABLE backup;" + "COMMIT;", + error)) + return NULL; + } + + if (!db_exec_callback (db, + "SELECT uri, title, date, day FROM history " "ORDER BY date ASC", midori_history_add_items, array, diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 222101e8..256621ce 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3623,25 +3623,24 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, static void _tree_store_insert_history_item (GtkTreeStore* treestore, GtkTreeIter* parent, - KatzeItem* item) + KatzeItem* item, + gint64 day) { GtkTreeIter iter; KatzeItem* child; guint i, n; GtkTreeIter* piter; - time_t now; - gint64 date; - gint age = -1; + gint64 pday; + gint64 age = -1; g_return_if_fail (KATZE_IS_ITEM (item)); if (KATZE_IS_ARRAY (item)) { piter = parent; - if ((date = katze_item_get_added (item))) + if ((pday = katze_item_get_added (item))) { - now = time (NULL); - age = sokoke_days_between ((time_t *)&date, (time_t *)&now); + age = day - pday; gtk_tree_store_insert_with_values (treestore, &iter, parent, 0, 0, item, 1, age, -1); g_object_unref (item); @@ -3651,7 +3650,7 @@ _tree_store_insert_history_item (GtkTreeStore* treestore, for (i = 0; i < n; i++) { child = katze_array_get_nth_item (KATZE_ARRAY (item), i); - _tree_store_insert_history_item (treestore, piter, child); + _tree_store_insert_history_item (treestore, piter, child, day); } } else @@ -3673,10 +3672,10 @@ midori_browser_new_history_item (MidoriBrowser* browser, gint i; gboolean found; time_t now; - gint64 date; - time_t date_; - gint age; - gint newage; + gint64 day; + gint64 pday; + gint64 age; + gint64 newage; gchar token[50]; if (!katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) @@ -3687,20 +3686,20 @@ midori_browser_new_history_item (MidoriBrowser* browser, now = time (NULL); katze_item_set_added (item, now); + day = sokoke_time_t_to_julian (&now); found = FALSE; i = 0; while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) { gtk_tree_model_get (treemodel, &iter, 0, &parent, 1, &age, -1); - date = katze_item_get_added (KATZE_ITEM (parent)); - date_ = (time_t)date; - newage = sokoke_days_between ((time_t *)&date, (time_t *)&now); + pday = katze_item_get_added (KATZE_ITEM (parent)); + newage = day - pday; if (newage == 0) { found = TRUE; _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), - &iter, item); + &iter, item, day); katze_array_add_item (parent, item); } if (age != newage) @@ -3712,12 +3711,12 @@ midori_browser_new_history_item (MidoriBrowser* browser, { strftime (token, sizeof (token), "%Y-%m-%d", localtime (&now)); parent = katze_array_new (KATZE_TYPE_ARRAY); - katze_item_set_added (KATZE_ITEM (parent), now); + katze_item_set_added (KATZE_ITEM (parent), day); katze_item_set_token (KATZE_ITEM (parent), token); katze_array_add_item (browser->history, parent); katze_array_add_item (parent, item); _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, - KATZE_ITEM (parent)); + KATZE_ITEM (parent), day); } } @@ -3773,6 +3772,8 @@ midori_browser_set_history (MidoriBrowser* browser, GtkTreeView* treeview; GtkTreeModel* treemodel; GtkAction* action; + time_t now; + gint64 day; if (browser->history == history) return; @@ -3796,10 +3797,13 @@ midori_browser_set_history (MidoriBrowser* browser, g_signal_connect (browser->history, "clear", G_CALLBACK (midori_browser_history_clear_cb), browser); + now = time (NULL); + day = sokoke_time_t_to_julian (&now); + treeview = GTK_TREE_VIEW (browser->panel_history); treemodel = gtk_tree_view_get_model (treeview); - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), - NULL, KATZE_ITEM (browser->history)); + _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, + KATZE_ITEM (browser->history), day); action = _action_by_name (browser, "Location"); midori_location_action_freeze (MIDORI_LOCATION_ACTION (action)); diff --git a/midori/sokoke.c b/midori/sokoke.c index e0f29b97..3aa80561 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -663,32 +663,25 @@ sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, } /** - * sokoke_days_between: - * @day1: a time_t timestamp value - * @day2: a time_t timestamp value + * sokoke_time_t_to_julian: + * @timestamp: a time_t timestamp value * - * Calculates the number of days between two timestamps. + * Calculates a unix timestamp to a julian day value. * * Return value: an integer. **/ -gint -sokoke_days_between (const time_t* day1, - const time_t* day2) +gint64 +sokoke_time_t_to_julian (const time_t* timestamp) { - GDate* date1; - GDate* date2; - gint age; + GDate* date; + gint64 julian; - date1 = g_date_new (); - date2 = g_date_new (); + date = g_date_new (); - g_date_set_time_t (date1, *day1); - g_date_set_time_t (date2, *day2); + g_date_set_time_t (date, *timestamp); + julian = (gint64)g_date_get_julian (date); - age = g_date_days_between (date1, date2); + g_date_free (date); - g_date_free (date1); - g_date_free (date2); - - return age; + return julian; } diff --git a/midori/sokoke.h b/midori/sokoke.h index 578e04ce..3f1fbb30 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -126,8 +126,7 @@ sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, GtkTreeModel** model, GtkTreeIter* iter); -gint -sokoke_days_between (const time_t* day1, - const time_t* day2); +gint64 +sokoke_time_t_to_julian (const time_t* timestamp); #endif /* !__SOKOKE_H__ */ From 08f2c028ca41cdfa9d0e45b100850a28fe3c5b22 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Fri, 23 Jan 2009 22:47:07 +0100 Subject: [PATCH 0690/2970] Include string.h in MidoriPlugins --- panels/midori-plugins.c | 1 + 1 file changed, 1 insertion(+) diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c index d0a440de..20b5ab03 100644 --- a/panels/midori-plugins.c +++ b/panels/midori-plugins.c @@ -16,6 +16,7 @@ #include "midori-viewable.h" #include "sokoke.h" +#include #include struct _MidoriPlugins From af610d48e471870487902085ef6866c5f9a4dd79 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Sat, 24 Jan 2009 15:02:06 +0100 Subject: [PATCH 0691/2970] Fix 32bit build after the history changes --- midori/midori-browser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 256621ce..4fc00dc8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2887,7 +2887,7 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, { KatzeItem* item; char* sdate; - gint age; + gint64 age; gtk_tree_model_get (model, iter, 0, &item, 1, &age, -1); @@ -2909,7 +2909,7 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, } else if (age > 1) { - sdate = g_strdup_printf (_("%d days ago"), age); + sdate = g_strdup_printf (_("%" G_GINT64_FORMAT " days ago"), age); g_object_set (renderer, "text", sdate, NULL); g_free (sdate); } @@ -4103,7 +4103,7 @@ midori_browser_init (MidoriBrowser* browser) /* History */ box = gtk_vbox_new (FALSE, 0); - treestore = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT); + treestore = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT64); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); From 78bcb6d3cbedb376a6f206a1e8153546374d53ab Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 24 Jan 2009 15:22:45 +0100 Subject: [PATCH 0692/2970] Monitor accelerators only after creating the first browser --- midori/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index 6d0fe3b1..4be09b13 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1877,6 +1877,9 @@ midori_load_session (gpointer data) midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); + g_signal_connect_after (gtk_accel_map_get (), "changed", + G_CALLBACK (accel_map_changed_cb), NULL); + if (katze_array_is_empty (_session)) { MidoriWebSettings* settings = katze_object_get_object (app, "settings"); @@ -2277,8 +2280,6 @@ main (int argc, g_signal_connect_after (settings, "notify", G_CALLBACK (settings_notify_cb), NULL); - g_signal_connect_after (gtk_accel_map_get (), "changed", - G_CALLBACK (accel_map_changed_cb), NULL); g_signal_connect_after (search_engines, "add-item", G_CALLBACK (midori_search_engines_add_item_cb), NULL); g_signal_connect_after (search_engines, "remove-item", From 808a03136d85278ec72c985a14bc1cfee5a9c283 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Sat, 24 Jan 2009 15:34:31 +0100 Subject: [PATCH 0693/2970] Open or focus Inline Find on activation, close it with Escape --- midori/midori-browser.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4fc00dc8..cddf9447 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1486,24 +1486,15 @@ static void _action_find_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* view; - - if (GTK_WIDGET_VISIBLE (browser->find)) - { - view = midori_browser_get_current_tab (browser); - midori_view_unmark_text_matches (MIDORI_VIEW (view)); - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight), FALSE); - gtk_widget_hide (browser->find); - } - else + if (!GTK_WIDGET_VISIBLE (browser->find)) { gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); gtk_widget_show (browser->find); - gtk_widget_grab_focus (GTK_WIDGET (browser->find_text)); } + + gtk_widget_grab_focus (GTK_WIDGET (browser->find_text)); } static void @@ -1550,6 +1541,19 @@ _find_highlight_toggled (GtkToggleToolButton* toolitem, midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); } +static gboolean +midori_browser_find_key_press_event_cb (GtkWidget* toolbar, + GdkEventKey* event) +{ + if (event->keyval == GDK_Escape) + { + gtk_widget_hide (toolbar); + return TRUE; + } + + return FALSE; +} + static void midori_browser_find_button_close_clicked_cb (GtkWidget* widget, MidoriBrowser* browser) @@ -4185,6 +4189,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_set_name (browser->find, "MidoriFindbar"); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ); + g_signal_connect (browser->find, "key-press-event", + G_CALLBACK (midori_browser_find_key_press_event_cb), NULL); toolitem = gtk_tool_item_new (); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_add (GTK_CONTAINER (toolitem), From d6cdac407267fba718beabb8cc083d75031d0be5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 24 Jan 2009 22:15:37 +0100 Subject: [PATCH 0694/2970] Unmark the matches when hiding the findbar again --- midori/midori-browser.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cddf9447..604ccf5e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1509,9 +1509,6 @@ _midori_browser_find (MidoriBrowser* browser, case_sensitive = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); view = midori_browser_get_current_tab (browser); - - if (GTK_WIDGET_VISIBLE (browser->find)) - midori_view_unmark_text_matches (MIDORI_VIEW (view)); midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); } @@ -1542,11 +1539,14 @@ _find_highlight_toggled (GtkToggleToolButton* toolitem, } static gboolean -midori_browser_find_key_press_event_cb (GtkWidget* toolbar, - GdkEventKey* event) +midori_browser_find_key_press_event_cb (GtkWidget* toolbar, + GdkEventKey* event, + MidoriBrowser* browser) { if (event->keyval == GDK_Escape) { + GtkWidget* view = midori_browser_get_current_tab (browser); + midori_view_unmark_text_matches (MIDORI_VIEW (view)); gtk_widget_hide (toolbar); return TRUE; } @@ -4190,7 +4190,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ); g_signal_connect (browser->find, "key-press-event", - G_CALLBACK (midori_browser_find_key_press_event_cb), NULL); + G_CALLBACK (midori_browser_find_key_press_event_cb), browser); toolitem = gtk_tool_item_new (); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_add (GTK_CONTAINER (toolitem), From cf9ec7755f570f75eec2f6fe63dc51689ec677b2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 24 Jan 2009 22:28:07 +0100 Subject: [PATCH 0695/2970] Properly synchronize the proxy item of the view --- midori/midori-view.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7f0da994..5bfe9007 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -545,6 +545,8 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, uri = webkit_web_frame_get_uri (web_frame); g_return_if_fail (uri != NULL); katze_assign (view->uri, g_strdup (uri)); + if (view->item) + katze_item_set_uri (view->item, uri); g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); @@ -1552,6 +1554,8 @@ midori_view_set_uri (MidoriView* view, { katze_assign (view->uri, g_strdup (uri)); g_object_notify (G_OBJECT (view), "uri"); + if (view->item) + katze_item_set_uri (view->item, uri); data = g_strdup_printf ("%s - %s", _("Source"), &uri[12]); g_object_set (view, "title", data, NULL); g_free (data); @@ -1612,6 +1616,8 @@ midori_view_set_uri (MidoriView* view, WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); g_object_notify (G_OBJECT (view), "uri"); + if (view->item) + katze_item_set_uri (view->item, uri); return; } } @@ -1623,6 +1629,8 @@ midori_view_set_uri (MidoriView* view, { katze_assign (view->uri, g_strdup (uri)); g_object_notify (G_OBJECT (view), "uri"); + if (view->item) + katze_item_set_uri (view->item, uri); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } } From 2323c57d7eeab7426a0934093b6e570c6612a427 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 26 Jan 2009 00:54:12 +0100 Subject: [PATCH 0696/2970] Save size and panel position with a delay of 5 seconds --- midori/midori-browser.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 604ccf5e..f7d096b7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -65,6 +65,9 @@ struct _MidoriBrowser GtkWidget* progressbar; gchar* statusbar_text; + guint alloc_timeout; + guint panel_timeout; + MidoriWebSettings* settings; KatzeArray* proxy_array; KatzeArray* bookmarks; @@ -3066,13 +3069,24 @@ _action_panel_activate (GtkToggleAction* action, sokoke_widget_set_visible (browser->panel, active); } +static gboolean +midori_browser_panel_timeout (GtkWidget* hpaned) +{ + gboolean position = gtk_paned_get_position (GTK_PANED (hpaned)); + MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (hpaned)); + g_object_set (browser->settings, "last-panel-position", position, NULL); + browser->panel_timeout = 0; + return FALSE; +} + static void -midori_panel_notify_position_cb (GObject* object, - GParamSpec* arg1, +midori_panel_notify_position_cb (GObject* hpaned, + GParamSpec* pspec, MidoriBrowser* browser) { - gboolean position = gtk_paned_get_position (GTK_PANED (object)); - g_object_set (browser->settings, "last-panel-position", position, NULL); + if (!browser->panel_timeout) + browser->panel_timeout = g_timeout_add_full (G_PRIORITY_LOW, 5000, + (GSourceFunc)midori_browser_panel_timeout, hpaned, NULL); } static gboolean @@ -3469,6 +3483,16 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser, } } +static gboolean +midori_browser_alloc_timeout (MidoriBrowser* browser) +{ + g_object_set (browser->settings, + "last-window-width", GTK_WIDGET (browser)->allocation.width, + "last-window-height", GTK_WIDGET (browser)->allocation.height, NULL); + browser->alloc_timeout = 0; + return FALSE; +} + static void midori_browser_size_allocate_cb (MidoriBrowser* browser, GtkAllocation* allocation) @@ -3478,11 +3502,12 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, if (GTK_WIDGET_REALIZED (widget)) { GdkWindowState state = gdk_window_get_state (widget->window); - if (!(state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + if (!(state & + (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) + && !browser->alloc_timeout) { - g_object_set (browser->settings, - "last-window-width", allocation->width, - "last-window-height", allocation->height, NULL); + browser->alloc_timeout = g_timeout_add_full (G_PRIORITY_LOW, 5000, + (GSourceFunc)midori_browser_alloc_timeout, browser, NULL); } } } From 3e18b780ac3076d36016e7002f5f4290339f72e6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 26 Jan 2009 03:41:12 +0100 Subject: [PATCH 0697/2970] Implement katze_item_copy and a virtual method for subclasses --- katze/katze-item.c | 36 ++++++++++++++++++++++++++++++++++++ katze/katze-item.h | 6 ++++++ 2 files changed, 42 insertions(+) diff --git a/katze/katze-item.c b/katze/katze-item.c index 3423cfe5..006adc4b 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -138,6 +138,8 @@ katze_item_class_init (KatzeItemClass* class) "The parent of the item", G_TYPE_OBJECT, flags)); + + class->copy = NULL; } @@ -492,3 +494,37 @@ katze_item_set_parent (KatzeItem* item, katze_object_assign (item->parent, parent); g_object_notify (G_OBJECT (item), "parent"); } + +/** + * katze_item_copy: + * @item: a #KatzeItem + * + * Creates an exact copy of @item. + * + * Note that subclass specific features will only + * be preserved if the class implements it. + * + * Return value: a new #KatzeItem + * + * Since: 0.1.3 + **/ +KatzeItem* +katze_item_copy (KatzeItem* item) +{ + KatzeItem* copy; + KatzeItemClass* class; + + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + copy = g_object_new (G_OBJECT_TYPE (item), + "name", item->name, + "text", item->text, + "uri", item->uri, + "icon", item->icon, + "token", item->token, + "added", item->added, + "parent", item->parent, + NULL); + class = KATZE_ITEM_GET_CLASS (item); + return class->copy ? class->copy (copy) : copy; +} diff --git a/katze/katze-item.h b/katze/katze-item.h index add88de1..8e40110a 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -49,6 +49,9 @@ struct _KatzeItem struct _KatzeItemClass { GObjectClass parent_class; + + gpointer + (*copy) (KatzeItem* item); }; GType @@ -106,6 +109,9 @@ void katze_item_set_parent (KatzeItem* item, gpointer parent); +KatzeItem* +katze_item_copy (KatzeItem* item); + G_END_DECLS #endif /* __MIDORI_WEB_ITEM_H__ */ From 6b2d8df6afd9d84c1cbe1c083f2d6476b8d25ac7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 26 Jan 2009 03:43:59 +0100 Subject: [PATCH 0698/2970] Instead of adding multiple same history items, update the original item --- midori/main.c | 31 ++++++++++++++++++++++++++++++- midori/midori-browser.c | 19 ++++++++++++++----- midori/midori-view.c | 3 +++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index 4be09b13..d6c29e81 100644 --- a/midori/main.c +++ b/midori/main.c @@ -682,6 +682,30 @@ midori_history_clear_cb (KatzeArray* history, } } +static void +midori_history_notify_item_cb (KatzeItem* item, + GParamSpec* pspec, + sqlite3* db) +{ + gchar* sqlcmd; + gboolean success = TRUE; + GError* error = NULL; + + sqlcmd = sqlite3_mprintf ("UPDATE history SET title='%q' WHERE " + "uri='%q' AND date=%" G_GUINT64_FORMAT, + katze_item_get_name (item), + katze_item_get_uri (item), + katze_item_get_added (item)); + success = db_exec (db, sqlcmd, &error); + sqlite3_free (sqlcmd); + if (!success) + { + g_printerr (_("Failed to add history item: %s\n"), error->message); + g_error_free (error); + return ; + } +} + static void midori_history_add_item_cb (KatzeArray* array, KatzeItem* item, @@ -716,7 +740,8 @@ midori_history_add_item_cb (KatzeArray* array, } } sqlcmd = sqlite3_mprintf ("INSERT INTO history VALUES" - "('%q', '%q', %" G_GUINT64_FORMAT ", %" G_GUINT64_FORMAT ")", + "('%q', '%q', %" G_GUINT64_FORMAT "," + " %" G_GUINT64_FORMAT ")", katze_item_get_uri (item), katze_item_get_name (item), katze_item_get_added (item), @@ -729,6 +754,10 @@ midori_history_add_item_cb (KatzeArray* array, g_error_free (error); return ; } + + /* The title is set after the item is added */ + g_signal_connect_after (item, "notify::name", + G_CALLBACK (midori_history_notify_item_cb), db); } static int diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f7d096b7..df41a9e4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -437,7 +437,6 @@ midori_view_notify_title_cb (GtkWidget* view, const gchar* title; GtkAction* action; gchar* window_title; - KatzeItem* item; uri = midori_view_get_display_uri (MIDORI_VIEW (view)); title = midori_view_get_display_title (MIDORI_VIEW (view)); @@ -447,13 +446,23 @@ midori_view_notify_title_cb (GtkWidget* view, MIDORI_LOCATION_ACTION (action), title, uri); if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) { + KatzeItem* item; + KatzeItem* proxy; + if (!browser->history) return; - item = katze_item_new (); - katze_item_set_uri (item, uri); - katze_item_set_name (item, title); - midori_browser_new_history_item (browser, item); + item = g_object_get_data (G_OBJECT (view), "history-item-added"); + proxy = midori_view_get_proxy_item (MIDORI_VIEW (view)); + if (item && katze_item_get_added (item) == katze_item_get_added (proxy)) + katze_item_set_name (item, katze_item_get_name (proxy)); + else + { + katze_object_assign (item, katze_item_copy (proxy)); + midori_browser_new_history_item (browser, g_object_ref (item)); + g_object_set_data_full (G_OBJECT (view), "history-item-added", + item, (GDestroyNotify)g_object_unref); + } } if (view == midori_browser_get_current_tab (browser)) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5bfe9007..7d15e412 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -546,7 +546,10 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, g_return_if_fail (uri != NULL); katze_assign (view->uri, g_strdup (uri)); if (view->item) + { katze_item_set_uri (view->item, uri); + katze_item_set_added (view->item, time (NULL)); + } g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); From 181aa10b9d342eb25739a30ed8039bd996023f9f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 27 Jan 2009 02:57:40 +0100 Subject: [PATCH 0699/2970] Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled. --- data/com.nokia.midori.service | 3 + midori.desktop.in => data/midori.desktop.in | 2 + midori/midori-browser.c | 81 +++++++++++++++++++-- midori/midori-browser.h | 7 ++ midori/midori-panel.c | 3 + midori/midori-preferences.c | 8 +- midori/midori-websettings.c | 2 +- midori/wscript_build | 2 +- wscript | 38 +++++++--- 9 files changed, 124 insertions(+), 22 deletions(-) create mode 100644 data/com.nokia.midori.service rename midori.desktop.in => data/midori.desktop.in (81%) diff --git a/data/com.nokia.midori.service b/data/com.nokia.midori.service new file mode 100644 index 00000000..f8d1df0f --- /dev/null +++ b/data/com.nokia.midori.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=com.nokia.midori +Exec=/usr/bin/midori diff --git a/midori.desktop.in b/data/midori.desktop.in similarity index 81% rename from midori.desktop.in rename to data/midori.desktop.in index 487d7f8f..fc28df34 100644 --- a/midori.desktop.in +++ b/data/midori.desktop.in @@ -10,3 +10,5 @@ Exec=midori %u Icon=midori Terminal=false StartupNotify=true +X-Osso-Type=application/x-executable +X-Osso-Service=midori diff --git a/midori/midori-browser.c b/midori/midori-browser.c index df41a9e4..6123046b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -38,7 +38,11 @@ struct _MidoriBrowser { + #if HAVE_HILDON + HildonWindow parent_instance; + #else GtkWindow parent_instance; + #endif GtkActionGroup* action_group; GtkWidget* menubar; @@ -78,7 +82,11 @@ struct _MidoriBrowser KatzeNet* net; }; +#if HAVE_HILDON +G_DEFINE_TYPE (MidoriBrowser, midori_browser, HILDON_TYPE_WINDOW) +#else G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW) +#endif enum { @@ -1596,6 +1604,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser); +#if !HAVE_HILDON static void _midori_browser_save_toolbar_items (MidoriBrowser* browser) { @@ -1651,6 +1660,7 @@ midori_browser_toolbar_remove_item_cb (GtkWidget* menuitem, gtk_container_remove (GTK_CONTAINER (browser->navigationbar), widget); _midori_browser_save_toolbar_items (browser); } +#endif static gboolean midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, @@ -1679,23 +1689,27 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, _action_by_name (browser, "Statusbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + #if !HAVE_HILDON if (widget == browser->navigationbar || gtk_widget_is_ancestor (widget, browser->navigationbar)) { GtkAction* widget_action = gtk_widget_get_action (widget); const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", - "ZoomOut", "Back", "Forward", "Homepage", "Trash", "Search" }; + "ZoomOut", "Back", "Forward", "Homepage", "Panel", "Trash", "Search" }; GtkWidget* submenu; gsize i; menuitem = gtk_separator_menu_item_new (); + gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); submenu = gtk_menu_new (); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_ADD, NULL); + gtk_widget_show (menuitem); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REMOVE, NULL); + gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); if (widget_action && strcmp (gtk_action_get_name (widget_action), "Location")) @@ -1732,9 +1746,10 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_browser_toolbar_add_item_cb), browser); } + sokoke_container_show_children (GTK_CONTAINER (submenu)); } + #endif - sokoke_container_show_children (GTK_CONTAINER (menu)); katze_widget_popup (widget, GTK_MENU (menu), NULL, button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR); return TRUE; @@ -1874,7 +1889,9 @@ _action_menubar_activate (GtkToggleAction* action, { gboolean active = gtk_toggle_action_get_active (action); g_object_set (browser->settings, "show-menubar", active, NULL); + #if !HAVE_HILDON sokoke_widget_set_visible (browser->menubar, active); + #endif } static void @@ -1901,7 +1918,9 @@ _action_statusbar_activate (GtkToggleAction* action, { gboolean active = gtk_toggle_action_get_active (action); g_object_set (browser->settings, "show-statusbar", active, NULL); + #if !HAVE_HILDON sokoke_widget_set_visible (browser->statusbar, active); + #endif } static void @@ -3858,6 +3877,10 @@ midori_browser_init (MidoriBrowser* browser) GError* error; GtkAction* action; GtkWidget* menuitem; + #if HAVE_HILDON + GtkWidget* menu; + GList* children; + #endif GtkSettings* gtk_settings; GtkWidget* hbox; GtkWidget* hpaned; @@ -4029,26 +4052,47 @@ midori_browser_init (MidoriBrowser* browser) /* Create the menubar */ browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar"); + #if HAVE_HILDON + menu = gtk_menu_new (); + children = gtk_container_get_children (GTK_CONTAINER (browser->menubar)); + while (children) + { + menuitem = GTK_WIDGET (children->data); + gtk_widget_reparent (menuitem, menu); + children = g_list_next (children); + } + browser->menubar = menu; + hildon_window_set_menu (HILDON_WINDOW (browser), GTK_MENU (browser->menubar)); + hildon_program_add_window (hildon_program_get_instance (), + HILDON_WINDOW (browser)); + #else + gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); + gtk_widget_hide (browser->menubar); + g_signal_connect (browser->menubar, "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); + #endif menuitem = gtk_menu_item_new (); + #if !HAVE_HILDON gtk_widget_show (menuitem); + #endif browser->throbber = katze_throbber_new (); gtk_widget_show (browser->throbber); gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber); gtk_widget_set_sensitive (menuitem, FALSE); gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem); - gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); browser->menu_tools = gtk_menu_item_get_submenu (GTK_MENU_ITEM ( gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); - gtk_widget_hide (browser->menubar); - g_signal_connect (browser->menubar, "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); _action_set_sensitive (browser, "PrivateBrowsing", FALSE); _action_set_sensitive (browser, "FindQuick", FALSE); + #if HAVE_HILDON + g_object_set (_action_by_name (browser, "Menubar"), "visible", FALSE, NULL); + g_object_set (_action_by_name (browser, "Statusbar"), "visible", FALSE, NULL); + #endif _action_set_sensitive (browser, "Transferbar", FALSE); _action_set_sensitive (browser, "SelectionSourceView", FALSE); @@ -4061,11 +4105,16 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (gtk_settings, "notify::gtk-toolbar-style", G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->navigationbar), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0); g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL); gtk_widget_hide (browser->navigationbar); g_signal_connect (browser->navigationbar, "popup-context-menu", G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); + #if HAVE_HILDON + hildon_window_add_toolbar (HILDON_WINDOW (browser), + GTK_TOOLBAR (browser->navigationbar)); + #else + gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0); + #endif /* Bookmarkbar */ browser->bookmarkbar = gtk_toolbar_new (); @@ -4074,7 +4123,12 @@ midori_browser_init (MidoriBrowser* browser) GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); + #if HAVE_HILDON + hildon_window_add_toolbar (HILDON_WINDOW (browser), + GTK_TOOLBAR (browser->bookmarkbar)); + #else gtk_box_pack_start (GTK_BOX (vbox), browser->bookmarkbar, FALSE, FALSE, 0); + #endif g_signal_connect (browser->bookmarkbar, "popup-context-menu", G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser); @@ -4286,7 +4340,12 @@ midori_browser_init (MidoriBrowser* browser) gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); #endif sokoke_container_show_children (GTK_CONTAINER (browser->find)); + #if HAVE_HILDON + hildon_window_add_toolbar (HILDON_WINDOW (browser), + GTK_TOOLBAR (browser->find)); + #else gtk_box_pack_start (GTK_BOX (vbox), browser->find, FALSE, FALSE, 0); + #endif /* Statusbar */ browser->statusbar = gtk_statusbar_new (); @@ -4338,6 +4397,9 @@ static void _midori_browser_set_toolbar_style (MidoriBrowser* browser, MidoriToolbarStyle toolbar_style) { + #if HAVE_HILDON + GtkToolbarStyle gtk_toolbar_style = GTK_TOOLBAR_ICONS; + #else GtkToolbarStyle gtk_toolbar_style; GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) @@ -4360,6 +4422,7 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ; } } + #endif gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar), gtk_toolbar_style); } @@ -4389,6 +4452,10 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, GtkAction* action; GtkWidget* toolitem; + #if HAVE_HILDON + items = "Bookmarks,Window,Back,Forward,ReloadStop,Location,Panel,Trash"; + #endif + gtk_container_foreach (GTK_CONTAINER (browser->navigationbar), (GtkCallback)gtk_widget_destroy, NULL); diff --git a/midori/midori-browser.h b/midori/midori-browser.h index b0d45835..cc2781b1 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -13,6 +13,9 @@ #define __MIDORI_BROWSER_H__ #include +#if defined(HAVE_HILDON) && HAVE_HILDON + #include +#endif #include @@ -36,7 +39,11 @@ typedef struct _MidoriBrowserClass MidoriBrowserClass; struct _MidoriBrowserClass { + #if defined(HAVE_HILDON) && HAVE_HILDON + HildonWindowClass parent_class; + #else GtkWindowClass parent_class; + #endif /* Signals */ void diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 59dd78b7..ac3a52e5 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -315,6 +315,9 @@ midori_panel_set_compact (MidoriPanel* panel, { g_return_if_fail (MIDORI_IS_PANEL (panel)); + #if HAVE_HILDON + compact = TRUE; + #endif gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), compact ? GTK_TOOLBAR_ICONS : GTK_TOOLBAR_BOTH); } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index d8a389ec..c17e6c7a 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -495,11 +495,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); + #if !HAVE_HILDON FRAME_NEW (_("Navigationbar")); TABLE_NEW (1, 2); INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); + #endif FRAME_NEW (_("Browsing")); TABLE_NEW (5, 2); label = katze_property_label (settings, "open-new-pages-in"); @@ -514,12 +516,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences, #endif button = katze_property_proxy (settings, "always-show-tabbar", NULL); INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "compact-sidepanel", NULL); + button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); INDENTED_ADD (button, 1, 2, 2, 3); + #if !HAVE_HILDON button = katze_property_proxy (settings, "middle-click-opens-selection", NULL); INDENTED_ADD (button, 0, 1, 3, 4); - button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); + button = katze_property_proxy (settings, "compact-sidepanel", NULL); WIDGET_ADD (button, 1, 2, 3, 4); + #endif /* button = katze_property_proxy (settings, "open-popups-in-tabs", NULL); SPANNED_ADD (button, 0, 1, 4, 5);*/ button = katze_property_proxy (settings, "open-tabs-next-to-current", NULL); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index fadfe88a..1a729b4f 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -431,7 +431,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "toolbar-items", _("Toolbar Items"), _("The items to show on the toolbar"), - "Back,Forward,ReloadStop,Location,Trash", + "Back,Forward,ReloadStop,Location,Panel,Trash,Search", flags)); g_object_class_install_property (gobject_class, diff --git a/midori/wscript_build b/midori/wscript_build index e15561fc..5d0ddf3c 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -10,7 +10,7 @@ obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.', excludes=['main.c']) obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') -obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON' obj.uselib_local = 'katze' obj.install_path = None diff --git a/wscript b/wscript index 73be9cc6..018ce5f6 100644 --- a/wscript +++ b/wscript @@ -79,12 +79,12 @@ def configure (conf): conf.check_tool ('intltool') if conf.env['INTLTOOL'] and conf.env['POCOM']: nls = 'yes' - conf.define ('ENABLE_NLS', 1) else: option_checkfatal ('nls', 'localization') nls = 'N/A' else: nls = 'no ' + conf.define ('ENABLE_NLS', [0,1][nls == 'yes']) dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) @@ -115,8 +115,8 @@ def configure (conf): unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] else: option_checkfatal ('unique', 'single instance') - conf.define ('HAVE_UNIQUE', 0) unique = 'no ' + conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes']) if option_enabled ('libsoup'): check_pkg ('libsoup-2.4', '2.23.1', False) @@ -125,18 +125,18 @@ def configure (conf): libsoup_25_2 = ['N/A','yes'][conf.env['HAVE_LIBSOUP_2_25_2'] == 1] else: option_checkfatal ('libsoup', 'libsoup') - conf.define ('HAVE_LIBSOUP', 0) - conf.define ('HAVE_LIBSOUP_2_25_2', 0) libsoup = 'no ' libsoup_25_2 = 'no ' + conf.define ('HAVE_LIBSOUP', [0,1][libsoup == 'yes']) + conf.define ('HAVE_LIBSOUP_2_25_2', [0,1][libsoup_25_2 == 'yes']) if option_enabled ('sqlite'): check_pkg ('sqlite3', '3.0', False, var='SQLITE') sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1] else: option_checkfatal ('sqlite', 'history database') - conf.define ('HAVE_SQLITE', 0) sqlite = 'no ' + conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes']) check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) @@ -145,6 +145,14 @@ def configure (conf): check_pkg ('webkit-1.0', '0.1') check_pkg ('libxml-2.0', '2.6') + if option_enabled ('hildon'): + check_pkg ('hildon-1', mandatory=False, var='HILDON') + hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1] + else: + option_checkfatal ('hildon', 'Maemo integration') + hildon = 'no ' + conf.define ('HAVE_HILDON', [0,1][hildon == 'yes']) + conf.check (header_name='unistd.h') conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) @@ -215,6 +223,7 @@ def configure (conf): else: Utils.pprint ('RED', 'WebKit was NOT built with libsoup') print "Persistent history: " + sqlite + " (sqlite3)" + print "Maemo integration: " + hildon + " (hildon)" def set_options (opt): def add_enable_option (option, desc, group=None, disable=False): @@ -254,6 +263,7 @@ def set_options (opt): add_enable_option ('libsoup', 'icon and view source support', group) add_enable_option ('sqlite', 'history database support', group) add_enable_option ('addons', 'building of extensions', group) + add_enable_option ('hildon', 'Maemo integration', group) def build (bld): def mkdir (path): @@ -294,14 +304,20 @@ def build (bld): bld.add_subdirs ('docs/api') bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*') + if bld.env['HAVE_HILDON']: + appdir = '${DATADIR}/applications/hildon' + bld.install_files ('${DATADIR}/dbus-1/services', + 'data/com.nokia.' + APPNAME + '.service') + else: + appdir = '${DATADIR}/applications' if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_in') - obj.source = APPNAME + '.desktop.in' - obj.install_path = '${DATADIR}/applications' - obj.flags = '-d' - bld.install_files ('${DATADIR}/applications', APPNAME + '.desktop') + obj.source = 'data/' + APPNAME + '.desktop.in' + obj.install_path = '${DATADIR}/applications/hildon' + obj.flags = '-d' + bld.install_files (appdir, 'data/' + APPNAME + '.desktop') else: - folder = os.path.dirname (bld.env['waf_config_files'][0]) + folder = os.path.dirname (bld.env['waf_config_files'][0]) + '/data' desktop = APPNAME + '.desktop' pre = open (desktop + '.in') after = open (folder + '/' + desktop, 'w') @@ -315,7 +331,7 @@ def build (bld): after.write (line) after.close () Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) - bld.install_files ('${DATADIR}/applications', folder + '/' + desktop) + bld.install_files (appdir, folder + '/' + desktop) except: Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') finally: From 3c75e9eb20d9ff12150c65eeeab0a1187324bc45 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 27 Jan 2009 18:56:21 +0100 Subject: [PATCH 0700/2970] Prevent duplicate entries by looking for trailing slashes --- midori/midori-locationaction.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 6c966b48..bdcfce06 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -592,17 +592,28 @@ midori_location_action_iter_lookup (MidoriLocationAction* location_action, GtkTreeIter* iter) { gchar* path; + gchar* new_uri; + gboolean found; - if ((path = g_hash_table_lookup (location_action->items, uri))) + found = FALSE; + new_uri = NULL; + + if (!g_str_has_suffix (uri, "/")) + new_uri = g_strconcat (uri, "/", NULL); + + if ((path = g_hash_table_lookup (location_action->items, + new_uri ? new_uri : uri))) { - if (gtk_tree_model_get_iter_from_string (location_action->model, - iter, path)) - return TRUE; - - g_hash_table_remove (location_action->items, uri); + if (!(found = gtk_tree_model_get_iter_from_string (location_action->model, + iter, path))) + { + g_hash_table_remove (location_action->items, + new_uri ? new_uri : uri); + } } + g_free (new_uri); - return FALSE; + return found; } /** From 7f5ad69b86b31e080d362e967e3c5dbecdbd9881 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 28 Jan 2009 01:03:16 +0100 Subject: [PATCH 0701/2970] Correct POTFILES.in and non-hildon installation path --- po/POTFILES.in | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1b11da2e..ccba854c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of source files containing translatable strings. -midori.desktop.in +data/midori.desktop.in midori/main.c midori/midori-app.c midori/midori-browser.c diff --git a/wscript b/wscript index 018ce5f6..234a96da 100644 --- a/wscript +++ b/wscript @@ -313,7 +313,7 @@ def build (bld): if bld.env['INTLTOOL']: obj = bld.new_task_gen ('intltool_in') obj.source = 'data/' + APPNAME + '.desktop.in' - obj.install_path = '${DATADIR}/applications/hildon' + obj.install_path = appdir obj.flags = '-d' bld.install_files (appdir, 'data/' + APPNAME + '.desktop') else: From 7d3ac8fa3791e4f5a9e07dda32c2e14596693641 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 28 Jan 2009 01:08:51 +0100 Subject: [PATCH 0702/2970] Move {sokoke,katze}_tree_view_get_selected_iter proper --- katze/katze-utils.c | 34 ++++++++++++++++++++++++++++++++++ katze/katze-utils.h | 5 +++++ midori/midori-browser.c | 22 +++++++++++----------- midori/sokoke.c | 33 --------------------------------- midori/sokoke.h | 5 ----- panels/midori-extensions.c | 2 +- 6 files changed, 51 insertions(+), 50 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index df5be8f3..cebbf074 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -572,6 +572,40 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, return pixbuf; } +/** + * katze_tree_view_get_selected_iter: + * @treeview: a #GtkTreeView + * @model: a pointer to store the model, or %NULL + * @iter: a pointer to store the iter, or %NULL + * + * Determines whether there is a selection in @treeview + * and sets the @iter to the current selection. + * + * If there is a selection and @model is not %NULL, it is + * set to the model, mainly for convenience. + * + * Either @model or @iter or both can be %NULL in which case + * no value will be assigned in any case. + * + * Return value: %TRUE if there is a selection + * + * Since: 0.1.3 + **/ +gboolean +katze_tree_view_get_selected_iter (GtkTreeView* treeview, + GtkTreeModel** model, + GtkTreeIter* iter) +{ + GtkTreeSelection* selection; + + g_return_val_if_fail (GTK_IS_TREE_VIEW (treeview), FALSE); + + if ((selection = gtk_tree_view_get_selection (treeview))) + if (gtk_tree_selection_get_selected (selection, model, iter)) + return TRUE; + return FALSE; +} + /** * katze_object_has_property: * @object: a #GObject diff --git a/katze/katze-utils.h b/katze/katze-utils.h index d38f8c92..f5f73b6c 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -84,6 +84,11 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, const gchar* mime_type, GError** error); +gboolean +katze_tree_view_get_selected_iter (GtkTreeView* treeview, + GtkTreeModel** model, + GtkTreeIter* iter); + gboolean katze_object_has_property (gpointer object, const gchar* property); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6123046b..229e053c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2371,7 +2371,7 @@ midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, KatzeItem* item; gboolean is_separator; - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); @@ -2527,7 +2527,7 @@ midori_browser_history_delete (MidoriBrowser* browser) GtkAction* location_action; treeview = GTK_TREE_VIEW (browser->panel_history); - if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) { location_action = _action_by_name (browser, "Location"); gtk_tree_model_get (model, &iter, 0, &item, -1); @@ -2617,7 +2617,7 @@ midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, if (event->button != 2 && event->button != 3) return FALSE; - if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); uri = katze_item_get_uri (item); @@ -2644,7 +2644,7 @@ midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, GtkTreeIter iter; KatzeItem* item; - if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); midori_browser_bookmark_popup (widget, NULL, item, FALSE, browser); @@ -2684,7 +2684,7 @@ midori_panel_history_cursor_or_row_changed_cb (GtkTreeView* tree_view, KatzeItem* item; gboolean is_page; - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); @@ -2720,7 +2720,7 @@ midori_panel_history_button_release_event_cb (GtkWidget* widget, if (event->button != 2 && event->button != 3) return FALSE; - if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); @@ -2757,7 +2757,7 @@ midori_panel_history_key_release_event_cb (GtkWidget* widget, return FALSE; treeview = GTK_TREE_VIEW (widget); - if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) { location_action = _action_by_name (browser, "Location"); gtk_tree_model_get (model, &iter, 0, &item, -1); @@ -2777,7 +2777,7 @@ midori_panel_history_popup_menu_cb (GtkWidget* widget, GtkTreeIter iter; KatzeItem* item; - if (sokoke_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); @@ -3213,7 +3213,7 @@ _action_history_add_bookmark_activate (GtkAction* action, KatzeItem* item; tree_view = GTK_TREE_VIEW (browser->panel_history); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); if (!KATZE_IS_ARRAY (item)) @@ -3257,7 +3257,7 @@ _action_bookmark_edit_activate (GtkAction* action, KatzeItem* item; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) @@ -3276,7 +3276,7 @@ _action_bookmark_delete_activate (GtkAction* action, KatzeArray* parent; tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (sokoke_tree_view_get_selected_iter (tree_view, &model, &iter)) + if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) { gtk_tree_model_get (model, &iter, 0, &item, -1); parent = katze_item_get_parent (item); diff --git a/midori/sokoke.c b/midori/sokoke.c index 3aa80561..78f822cd 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -629,39 +629,6 @@ sokoke_image_menu_item_new_ellipsized (const gchar* label) return katze_image_menu_item_new_ellipsized (label); } -/** - * sokoke_tree_view_get_selected_iter: - * @tree_view: a #GtkTreeView - * @model: a pointer to store the model, or %NULL - * @iter: a pointer to store the iter, or %NULL - * - * Determines whether there is a selection in the tree view - * and sets the @iter to the current selection. - * - * If there is a selection and @model is not %NULL, it is - * set to the model, mainly for convenience. - * - * Either @model or @iter or both can be %NULL in which case - * no value will be assigned in any case. - * - * Return value: %TRUE if there is a selection - **/ -gboolean -sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, - GtkTreeModel** model, - GtkTreeIter* iter) -{ - GtkTreeSelection* selection; - - g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE); - - selection = gtk_tree_view_get_selection (tree_view); - if (selection) - if (gtk_tree_selection_get_selected (selection, model, iter)) - return TRUE; - return FALSE; -} - /** * sokoke_time_t_to_julian: * @timestamp: a time_t timestamp value diff --git a/midori/sokoke.h b/midori/sokoke.h index 3f1fbb30..13190475 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -121,11 +121,6 @@ sokoke_action_create_popup_menu_item (GtkAction* action); GtkWidget* sokoke_image_menu_item_new_ellipsized (const gchar* label); -gboolean -sokoke_tree_view_get_selected_iter (GtkTreeView* tree_view, - GtkTreeModel** model, - GtkTreeIter* iter); - gint64 sokoke_time_t_to_julian (const time_t* timestamp); diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index c615c0d7..3a9e96df 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -104,7 +104,7 @@ midori_extensions_button_status_clicked_cb (GtkToolItem* toolitem, treeview = GTK_TREE_VIEW (extensions->treeview); - if (sokoke_tree_view_get_selected_iter (treeview, &model, &iter)) + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) { GtkToolItem* button_enable = gtk_toolbar_get_nth_item ( GTK_TOOLBAR (extensions->toolbar), 1); From a89a178a051a5954a5a7ff7564d65b2f39e6ab68 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 29 Jan 2009 00:52:27 +0100 Subject: [PATCH 0703/2970] Implement KatzeSeparatorAction --- katze/katze-arrayaction.c | 2 +- katze/katze-separatoraction.c | 134 ++++++++++++++++++++++++++++++++++ katze/katze-separatoraction.h | 43 +++++++++++ katze/katze.h | 1 + 4 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 katze/katze-separatoraction.c create mode 100644 katze/katze-separatoraction.h diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index fe3657d2..0ff5f1c4 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -31,7 +31,7 @@ struct _KatzeArrayActionClass GtkActionClass parent_class; }; -G_DEFINE_TYPE (KatzeArrayAction, katze_array_action, GTK_TYPE_ACTION) +G_DEFINE_TYPE (KatzeArrayAction, katze_array_action, GTK_TYPE_ACTION); enum { diff --git a/katze/katze-separatoraction.c b/katze/katze-separatoraction.c new file mode 100644 index 00000000..1b86a8c2 --- /dev/null +++ b/katze/katze-separatoraction.c @@ -0,0 +1,134 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "katze-separatoraction.h" + +struct _KatzeSeparatorAction +{ + GtkAction parent_instance; +}; + +struct _KatzeSeparatorActionClass +{ + GtkActionClass parent_class; +}; + +G_DEFINE_TYPE (KatzeSeparatorAction, katze_separator_action, GTK_TYPE_ACTION); + +static void +katze_separator_action_finalize (GObject* object); + +static void +katze_separator_action_activate (GtkAction* object); + +static GtkWidget* +katze_separator_action_create_tool_item (GtkAction* action); + +static GtkWidget* +katze_separator_action_create_menu_item (GtkAction* action); + +static void +katze_separator_action_connect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +katze_separator_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy); + +static void +katze_separator_action_class_init (KatzeSeparatorActionClass* class) +{ + GObjectClass* gobject_class; + GtkActionClass* action_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_separator_action_finalize; + + action_class = GTK_ACTION_CLASS (class); + action_class->activate = katze_separator_action_activate; + action_class->create_menu_item = katze_separator_action_create_menu_item; + action_class->create_tool_item = katze_separator_action_create_tool_item; + action_class->connect_proxy = katze_separator_action_connect_proxy; + action_class->disconnect_proxy = katze_separator_action_disconnect_proxy; +} + +static void +katze_separator_action_init (KatzeSeparatorAction* separator_action) +{ + /* Nothing to do. */ +} + +static void +katze_separator_action_finalize (GObject* object) +{ + G_OBJECT_CLASS (katze_separator_action_parent_class)->finalize (object); +} + +static void +katze_separator_action_activate (GtkAction* action) +{ + GSList* proxies; + + proxies = gtk_action_get_proxies (action); + if (!proxies) + return; + + do + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + + } + while ((proxies = g_slist_next (proxies))); + + if (GTK_ACTION_CLASS (katze_separator_action_parent_class)->activate) + GTK_ACTION_CLASS (katze_separator_action_parent_class)->activate (action); +} + +static GtkWidget* +katze_separator_action_create_menu_item (GtkAction* action) +{ + GtkWidget* menuitem; + + menuitem = gtk_separator_menu_item_new (); + return menuitem; +} + +static GtkWidget* +katze_separator_action_create_tool_item (GtkAction* action) +{ + GtkWidget* toolitem; + + toolitem = GTK_WIDGET (gtk_separator_tool_item_new ()); + return toolitem; +} + +static void +katze_separator_action_connect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + GTK_ACTION_CLASS (katze_separator_action_parent_class)->connect_proxy ( + action, proxy); + + if (GTK_IS_TOOL_ITEM (proxy)) + { + } + else if (GTK_IS_MENU_ITEM (proxy)) + { + } +} + +static void +katze_separator_action_disconnect_proxy (GtkAction* action, + GtkWidget* proxy) +{ + GTK_ACTION_CLASS (katze_separator_action_parent_class)->disconnect_proxy + (action, proxy); +} diff --git a/katze/katze-separatoraction.h b/katze/katze-separatoraction.h new file mode 100644 index 00000000..396b83d8 --- /dev/null +++ b/katze/katze-separatoraction.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_SEPARATOR_ACTION_H__ +#define __KATZE_SEPARATOR_ACTION_H__ + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_SEPARATOR_ACTION \ + (katze_separator_action_get_type ()) +#define KATZE_SEPARATOR_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_SEPARATOR_ACTION, \ + KatzeSeparatorAction)) +#define KATZE_SEPARATOR_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_SEPARATOR_ACTION, \ + KatzeSeparatorActionClass)) +#define KATZE_IS_SEPARATOR_ACTION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_SEPARATOR_ACTION)) +#define KATZE_IS_SEPARATOR_ACTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_SEPARATOR_ACTION)) +#define KATZE_SEPARATOR_ACTION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_SEPARATOR_ACTION, \ + KatzeSeparatorActionClass)) + +typedef struct _KatzeSeparatorAction KatzeSeparatorAction; +typedef struct _KatzeSeparatorActionClass KatzeSeparatorActionClass; + +GType +katze_separator_action_get_type (void); + +G_END_DECLS + +#endif /* __KATZE_SEPARATOR_ACTION_H__ */ diff --git a/katze/katze.h b/katze/katze.h index a4cf626a..474a8b4a 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -18,6 +18,7 @@ #include "katze-list.h" #include "katze-array.h" #include "katze-arrayaction.h" +#include "katze-separatoraction.h" #include "katze-net.h" #endif /* __KATZE_H__ */ From badc48c1fd70f0740f2e35bf172091713d5a89f5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 29 Jan 2009 00:56:07 +0100 Subject: [PATCH 0704/2970] Support separators in navigationbar and bookmarkbar --- midori/midori-browser.c | 75 +++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 229e053c..17b44d07 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1617,7 +1617,9 @@ _midori_browser_save_toolbar_items (MidoriBrowser* browser) for (; children != NULL; children = g_list_next (children)) { GtkAction* action = gtk_widget_get_action (GTK_WIDGET (children->data)); - if (strcmp (gtk_action_get_name (action), "Fullscreen")) + /* If a widget has no action that is actually a bug, so warn about it */ + g_warn_if_fail (action != NULL); + if (action && strcmp (gtk_action_get_name (action), "Fullscreen")) { g_string_append (toolbar_items, gtk_action_get_name (action)); g_string_append (toolbar_items, ","); @@ -1645,10 +1647,19 @@ midori_browser_toolbar_add_item_cb (GtkWidget* menuitem, else gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), GTK_TOOL_ITEM (toolitem), 0); - g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), - "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), - browser); + if (gtk_bin_get_child (GTK_BIN (toolitem))) + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + else + { + gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (toolitem), TRUE); + g_signal_connect (toolitem, + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + } _midori_browser_save_toolbar_items (browser); } @@ -1695,7 +1706,7 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, { GtkAction* widget_action = gtk_widget_get_action (widget); const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", - "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", + "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", "Separator", "ZoomOut", "Back", "Forward", "Homepage", "Panel", "Trash", "Search" }; GtkWidget* submenu; gsize i; @@ -2558,11 +2569,8 @@ midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, /* FIXME: Even toplevel items should technically have a parent */ g_return_if_fail (katze_item_get_parent (item)); - if (KATZE_IS_ARRAY (item) || (uri && *uri)) - { - parent = katze_item_get_parent (item); - katze_array_remove_item (KATZE_ARRAY (parent), item); - } + parent = katze_item_get_parent (item); + katze_array_remove_item (KATZE_ARRAY (parent), item); } static void @@ -3944,6 +3952,13 @@ midori_browser_init (MidoriBrowser* browser) /* Hide the 'Dummy' which only holds otherwise unused actions */ g_object_set (_action_by_name (browser, "Dummy"), "visible", FALSE, NULL); + action = g_object_new (KATZE_TYPE_SEPARATOR_ACTION, + "name", "Separator", + "label", _("_Separator"), + NULL); + gtk_action_group_add_action (browser->action_group, action); + g_object_unref (action); + action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, "name", "Location", "label", _("_Location..."), @@ -4435,7 +4450,8 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, if (event->button == 3) { midori_browser_toolbar_popup_context_menu_cb ( - gtk_widget_get_parent (toolitem), + gtk_bin_get_child (GTK_BIN (toolitem)) ? + gtk_widget_get_parent (toolitem) : toolitem, event->x, event->y, event->button, browser); return TRUE; @@ -4467,17 +4483,19 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser, if (action) { toolitem = gtk_action_create_tool_item (action); - g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), - "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), - browser); - gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), - GTK_TOOL_ITEM (toolitem), -1); - } - else if (!strcmp (*name, "Separator")) - { - toolitem = GTK_WIDGET (gtk_separator_tool_item_new ()); - gtk_widget_show (toolitem); + if (gtk_bin_get_child (GTK_BIN (toolitem))) + g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + else + { + gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (toolitem), TRUE); + g_signal_connect (toolitem, + "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), + browser); + } gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar), GTK_TOOL_ITEM (toolitem), -1); } @@ -4637,8 +4655,15 @@ browser_bookmarks_add_item_cb (KatzeArray* array, g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))), "KatzeItem", item); } - /* FIXME: Work around the inability to apply button events - to separator tool items */ + else + { + gtk_tool_item_set_use_drag_window (toolitem, TRUE); + g_signal_connect (toolitem, + "button-press-event", + G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), + browser); + g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); + } gtk_widget_show (GTK_WIDGET (toolitem)); gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), toolitem, -1); } From 2c9b0110486cdfdcf23c59699fbf8a0b486b7767 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Thu, 29 Jan 2009 01:06:27 +0100 Subject: [PATCH 0705/2970] Check if the pixbuf of the search engine is valid before returning it --- midori/midori-searchaction.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index a9b1e814..ea5b40c0 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -389,6 +389,7 @@ midori_search_action_get_icon (MidoriSearchAction* search_action, GdkScreen* screen; GtkIconTheme* icon_theme; gint width, height; + GdkPixbuf* pixbuf; if (G_UNLIKELY (!(screen = gtk_widget_get_screen (widget)))) return gtk_widget_render_icon (widget, GTK_STOCK_FILE, @@ -396,8 +397,9 @@ midori_search_action_get_icon (MidoriSearchAction* search_action, icon_theme = gtk_icon_theme_get_for_screen (screen); gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), GTK_ICON_SIZE_MENU, &width, &height); - return gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, height), - GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + if ((pixbuf = gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, height), + GTK_ICON_LOOKUP_USE_BUILTIN, NULL))) + return pixbuf; } if ((icon = katze_item_get_uri (item)) && strstr (icon, "://")) From a995a66d02b61c590605a4119441865cf77531ca Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 30 Jan 2009 14:15:15 +0100 Subject: [PATCH 0706/2970] Fix non-localized build after move of midori.desktop.in --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 234a96da..5fa22764 100644 --- a/wscript +++ b/wscript @@ -319,7 +319,7 @@ def build (bld): else: folder = os.path.dirname (bld.env['waf_config_files'][0]) + '/data' desktop = APPNAME + '.desktop' - pre = open (desktop + '.in') + pre = open ('data/' + desktop + '.in') after = open (folder + '/' + desktop, 'w') try: try: From e9460d3ed44a3833ea18d17e8f21ead2c314f4a6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 30 Jan 2009 18:06:40 +0100 Subject: [PATCH 0707/2970] Use ldd and grep when checking if WebKit was built with libsoup --- wscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 5fa22764..4375e4d2 100644 --- a/wscript +++ b/wscript @@ -218,7 +218,9 @@ def configure (conf): Utils.pprint ('RED', 'Please use an older or newer version.') print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)" print "Persistent cookies: " + libsoup_25_2 + " (libSoup 2.25.2)" - if 'soup-2.4' in conf.env['LIB_WEBKIT']: + # if 'soup-2.4' in conf.env['LIB_WEBKIT']: + wkbin = conf.env['LIBPATH_WEBKIT'][0] + '/libwebkit-1.0.so' + if not Utils.exec_command ('ldd ' + wkbin + ' | grep libsoup > /dev/null'): Utils.pprint ('GREEN', 'WebKit was built with libsoup') else: Utils.pprint ('RED', 'WebKit was NOT built with libsoup') From a1e8089ad39ee69c52cce2aeb947c478621aff0f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 30 Jan 2009 18:33:04 +0100 Subject: [PATCH 0708/2970] Do not use grep for the libsoup check --- wscript | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index 4375e4d2..70def3c4 100644 --- a/wscript +++ b/wscript @@ -219,11 +219,21 @@ def configure (conf): print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)" print "Persistent cookies: " + libsoup_25_2 + " (libSoup 2.25.2)" # if 'soup-2.4' in conf.env['LIB_WEBKIT']: - wkbin = conf.env['LIBPATH_WEBKIT'][0] + '/libwebkit-1.0.so' - if not Utils.exec_command ('ldd ' + wkbin + ' | grep libsoup > /dev/null'): - Utils.pprint ('GREEN', 'WebKit was built with libsoup') - else: - Utils.pprint ('RED', 'WebKit was NOT built with libsoup') + webkit_binary = conf.env.get_flat ('LIBPATH_WEBKIT') + '/libwebkit-1.0.so' + try: + ldd = subprocess.Popen (['ldd', webkit_binary], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + if not ldd.wait (): + found = False + for library in ldd.stdout.read ().split ('\n'): + if library[:8] == '\tlibsoup': + found = True + if found: + Utils.pprint ('GREEN', 'WebKit was built with libsoup') + else: + Utils.pprint ('RED', 'WebKit was NOT built with libsoup') + except: + pass print "Persistent history: " + sqlite + " (sqlite3)" print "Maemo integration: " + hildon + " (hildon)" From 5ad8c7eb0b7bf91c5ac3ff0ecdfd4fc5b0c295bb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jan 2009 04:09:35 +0100 Subject: [PATCH 0709/2970] Refactor bookmarks panel into a separate panel widget --- midori/main.c | 6 + midori/midori-browser.c | 361 ++--------------- panels/midori-bookmarks.c | 816 ++++++++++++++++++++++++++++++++++++++ panels/midori-bookmarks.h | 43 ++ po/POTFILES.in | 1 + 5 files changed, 889 insertions(+), 338 deletions(-) create mode 100644 panels/midori-bookmarks.c create mode 100644 panels/midori-bookmarks.h diff --git a/midori/main.c b/midori/main.c index d6c29e81..96df6fae 100644 --- a/midori/main.c +++ b/midori/main.c @@ -16,6 +16,7 @@ #include "midori-addons.h" #include "midori-app.h" +#include "midori-bookmarks.h" #include "midori-browser.h" #include "midori-console.h" #include "midori-extension.h" @@ -1274,6 +1275,11 @@ midori_app_add_browser_cb (MidoriApp* app, panel = katze_object_get_object (browser, "panel"); + /* Bookmarks */ + addon = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, NULL); + gtk_widget_show (addon); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + /* Transfers */ #if 0 addon = midori_view_new (net); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 17b44d07..dd04d30c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan Copyright (C) 2008 Dale Whittaker This library is free software; you can redistribute it and/or @@ -53,7 +53,6 @@ struct _MidoriBrowser GtkWidget* bookmarkbar; GtkWidget* panel; - GtkWidget* panel_bookmarks; GtkWidget* panel_history; GtkWidget* notebook; @@ -504,7 +503,8 @@ midori_view_notify_statusbar_text_cb (MidoriView* view, g_free (text); } -static void +/* Private function, used by MidoriBookmarks */ +/* static */ void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark) @@ -519,8 +519,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* entry_desc; GtkWidget* entry_uri; GtkWidget* combo_folder; - GtkTreeView* treeview; - GtkTreeModel* treemodel; dialog = gtk_dialog_new_with_buttons ( new_bookmark ? _("New bookmark") : _("Edit bookmark"), @@ -624,8 +622,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { gchar* selected; KatzeArray* folder; - GtkTreeIter iter; - GtkTreeIter* piter; katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); @@ -635,43 +631,28 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); - selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - if (g_strcmp0 (selected, _("Toplevel folder"))) - { - treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - treemodel = gtk_tree_view_get_model (treeview); - if (gtk_tree_model_iter_children (treemodel, &iter, NULL)) - { - KatzeItem* item; - - do - { - gtk_tree_model_get (treemodel, &iter, 0, &item, -1); - - if (!g_strcmp0 (katze_item_get_name (item), selected)) - break; - } - while (gtk_tree_model_iter_next (treemodel, &iter)); - - folder = KATZE_ARRAY (item); - } - else - folder = browser->bookmarks; - } - else - folder = browser->bookmarks; - g_free (selected); - - piter = (folder == browser->bookmarks ? NULL : &iter); - + folder = browser->bookmarks; if (new_bookmark) { + selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); + if (g_strcmp0 (selected, _("Toplevel folder"))) + { + guint i, n; + + if ((n = katze_array_get_length (browser->bookmarks))) + for (i = 0; i < n; i++) + { + KatzeItem* item = katze_array_get_nth_item (browser->bookmarks, i); + if (KATZE_IS_ARRAY (item)) + if (!g_strcmp0 (katze_item_get_name (item), selected)) + { + folder = KATZE_ARRAY (item); + break; + } + } + } + g_free (selected); katze_array_add_item (folder, bookmark); - treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - treemodel = gtk_tree_view_get_model (treeview); - gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), - &iter, piter, G_MAXINT, 0, bookmark, -1); - g_object_ref (bookmark); } } gtk_widget_destroy (dialog); @@ -2351,52 +2332,6 @@ _action_search_focus_out (GtkAction* action, gtk_widget_hide (browser->navigationbar); } -static void -midori_panel_bookmarks_row_activated_cb (GtkTreeView* treeview, - GtkTreePath* path, - GtkTreeViewColumn* column, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - - model = gtk_tree_view_get_model (treeview); - - if (gtk_tree_model_get_iter (model, &iter, path)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri && *uri) - midori_browser_set_current_uri (browser, uri); - } -} - -static void -midori_panel_bookmarks_cursor_or_row_changed_cb (GtkTreeView* tree_view, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - gboolean is_separator; - - if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - - is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); - _action_set_sensitive (browser, "BookmarkEdit", !is_separator); - _action_set_sensitive (browser, "BookmarkDelete", TRUE); - } - else - { - _action_set_sensitive (browser, "BookmarkEdit", FALSE); - _action_set_sensitive (browser, "BookmarkDelete", FALSE); - } -} - static void midori_browser_bookmark_popup_item (GtkWidget* menu, const gchar* stock_id, @@ -2611,54 +2546,6 @@ midori_browser_bookmark_popup (GtkWidget* widget, event, SOKOKE_MENU_POSITION_CURSOR); } -static gboolean -midori_panel_bookmarks_button_release_event_cb (GtkWidget* widget, - GdkEventButton* event, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - gint n; - - if (event->button != 2 && event->button != 3) - return FALSE; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (event->button == 2) - { - if (uri && *uri) - { - n = midori_browser_add_uri (browser, uri); - midori_browser_set_current_page (browser, n); - } - } - else - midori_browser_bookmark_popup (widget, event, item, FALSE, browser); - return TRUE; - } - return FALSE; -} - -static void -midori_panel_bookmarks_popup_menu_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_browser_bookmark_popup (widget, NULL, item, FALSE, browser); - } -} - static void midori_panel_history_row_activated_cb (GtkTreeView* treeview, GtkTreePath* path, @@ -2794,54 +2681,6 @@ midori_panel_history_popup_menu_cb (GtkWidget* widget, } } -static void -midori_browser_bookmarks_item_render_icon_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - KatzeItem* item; - GdkPixbuf* pixbuf; - - gtk_tree_model_get (model, iter, 0, &item, -1); - - g_assert (KATZE_IS_ITEM (item)); - - /* TODO: Would it be better to not do this on every redraw? */ - pixbuf = NULL; - if (KATZE_IS_ARRAY (item)) - pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, - GTK_ICON_SIZE_MENU, NULL); - else if (katze_item_get_uri (item)) - pixbuf = katze_net_load_icon ( - MIDORI_BROWSER (gtk_widget_get_toplevel (treeview))->net, - katze_item_get_uri (item), NULL, treeview, NULL); - g_object_set (renderer, "pixbuf", pixbuf, NULL); - if (pixbuf) - g_object_unref (pixbuf); -} - -static void -midori_browser_bookmarks_item_render_text_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - KatzeItem* item; - - gtk_tree_model_get (model, iter, 0, &item, -1); - - g_assert (KATZE_IS_ITEM (item)); - - if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) - g_object_set (renderer, "markup", NULL, - "text", katze_item_get_name (item), NULL); - else - g_object_set (renderer, "markup", _("Separator"), NULL); -} - static void midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, MidoriBrowser* browser) @@ -3255,43 +3094,6 @@ _action_trash_empty_activate (GtkAction* action, _midori_browser_update_actions (browser); } -static void -_action_bookmark_edit_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); - } -} - -static void -_action_bookmark_delete_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - KatzeArray* parent; - - tree_view = GTK_TREE_VIEW (browser->panel_bookmarks); - if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); - } -} - static const GtkActionEntry entries[] = { { "File", NULL, N_("_File") }, { "WindowNew", STOCK_WINDOW_NEW, @@ -3406,12 +3208,6 @@ static const GtkActionEntry entries[] = { { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, - { "BookmarkEdit", GTK_STOCK_EDIT, - NULL, "", - N_("Edit the selected bookmark"), G_CALLBACK (_action_bookmark_edit_activate) }, - { "BookmarkDelete", GTK_STOCK_DELETE, - NULL, "", - N_("Delete the selected bookmark"), G_CALLBACK (_action_bookmark_delete_activate) }, { "HistoryDelete", GTK_STOCK_DELETE, NULL, "", N_("Delete the selected history item"), G_CALLBACK (_action_history_delete_activate) }, @@ -3644,11 +3440,6 @@ static const gchar* ui_markup = "" "" "" - "" - "" - "" - "" - "" "" "" "" @@ -4166,48 +3957,6 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_panel_close_cb), browser); gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); - /* Bookmarks */ - box = gtk_vbox_new (FALSE, 0); - treestore = gtk_tree_store_new (1, KATZE_TYPE_ITEM); - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); - column = gtk_tree_view_column_new (); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)midori_browser_bookmarks_item_render_icon_cb, - treeview, NULL); - renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_text, - (GtkTreeCellDataFunc)midori_browser_bookmarks_item_render_text_cb, - treeview, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - g_object_unref (treestore); - g_object_connect (treeview, - "signal::row-activated", - midori_panel_bookmarks_row_activated_cb, browser, - "signal::cursor-changed", - midori_panel_bookmarks_cursor_or_row_changed_cb, browser, - "signal::columns-changed", - midori_panel_bookmarks_cursor_or_row_changed_cb, browser, - "signal::button-release-event", - midori_panel_bookmarks_button_release_event_cb, browser, - "signal::popup-menu", - midori_panel_bookmarks_popup_menu_cb, browser, - NULL); - midori_panel_bookmarks_cursor_or_row_changed_cb (GTK_TREE_VIEW (treeview), - browser); - gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); - browser->panel_bookmarks = treeview; - gtk_widget_show_all (box); - toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_bookmarks"); - _action_set_sensitive (browser, "BookmarkAdd", FALSE); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); - gtk_widget_show_all (toolbar); - midori_panel_append_widget (MIDORI_PANEL (browser->panel), - box, STOCK_BOOKMARKS, _("Bookmarks"), toolbar); - /* History */ box = gtk_vbox_new (FALSE, 0); treestore = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT64); @@ -4450,7 +4199,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, if (event->button == 3) { midori_browser_toolbar_popup_context_menu_cb ( - gtk_bin_get_child (GTK_BIN (toolitem)) ? + GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? gtk_widget_get_parent (toolitem) : toolitem, event->x, event->y, event->button, browser); @@ -4676,9 +4425,6 @@ browser_bookmarks_remove_item_cb (KatzeArray* array, GList* children; GtkWidget* toolitem; KatzeItem* item; - GtkTreeModel* model; - GtkTreeIter iter; - gsize i = 0; children = gtk_container_get_children (GTK_CONTAINER (browser->bookmarkbar)); while (children != NULL) @@ -4689,52 +4435,6 @@ browser_bookmarks_remove_item_cb (KatzeArray* array, gtk_widget_destroy (toolitem); children = g_list_next (children); } - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); - i = 0; - item = NULL; - while (item != removed_item && - gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (item == removed_item) - midori_browser_model_remove_item (model, item, &iter); - i++; - } -} - -static void -bookmarks_model_insert_folder (GtkTreeStore* treestore, - GtkTreeIter* parent, - KatzeArray* array) -{ - guint n, i; - KatzeItem* item; - GtkTreeIter iter; - - n = katze_array_get_length (array); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (array, i); - g_object_ref (item); - gtk_tree_store_insert_with_values (treestore, &iter, parent, n, - 0, item, -1); - g_object_ref (item); - if (KATZE_IS_ARRAY (item)) - bookmarks_model_insert_folder (treestore, &iter, KATZE_ARRAY (item)); - } -} - -static void -midori_browser_bookmarks_clear_cb (KatzeArray* bookmarks, - MidoriBrowser* browser) -{ - GtkTreeView* treeview; - GtkTreeStore* store; - - treeview = GTK_TREE_VIEW (browser->panel_bookmarks); - store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); - gtk_tree_store_clear (store); } static void @@ -4743,21 +4443,14 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, { guint i, n; KatzeItem* item; - GtkTreeModel* treestore; if (browser->bookmarks == bookmarks) return; - if (browser->bookmarks) - g_signal_handlers_disconnect_by_func (browser->bookmarks, - midori_browser_bookmarks_clear_cb, - browser); if (bookmarks) g_object_ref (bookmarks); katze_object_assign (browser->bookmarks, bookmarks); - midori_browser_bookmarks_clear_cb (browser->bookmarks, browser); - g_object_set (_action_by_name (browser, "Bookmarks"), "array", browser->bookmarks, NULL); @@ -4776,14 +4469,6 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, G_CALLBACK (browser_bookmarks_add_item_cb), browser); g_signal_connect (browser->bookmarks, "remove-item", G_CALLBACK (browser_bookmarks_remove_item_cb), browser); - g_signal_connect (browser->bookmarks, "clear", - G_CALLBACK (midori_browser_bookmarks_clear_cb), browser); - - treestore = gtk_tree_view_get_model (GTK_TREE_VIEW (browser->panel_bookmarks)); - bookmarks_model_insert_folder (GTK_TREE_STORE (treestore), - NULL, browser->bookmarks); - midori_panel_bookmarks_cursor_or_row_changed_cb ( - GTK_TREE_VIEW (browser->panel_bookmarks), browser); _action_set_sensitive (browser, "BookmarkAdd", TRUE); } diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c new file mode 100644 index 00000000..1f09e2f4 --- /dev/null +++ b/panels/midori-bookmarks.c @@ -0,0 +1,816 @@ +/* + Copyright (C) 2008-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-bookmarks.h" + +#include "midori-app.h" +#include "midori-browser.h" +#include "midori-stock.h" +#include "midori-view.h" +#include "midori-viewable.h" + +#include "sokoke.h" + +#include + +#include + +void +midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, + KatzeItem* bookmark, + gboolean new_bookmark); + +struct _MidoriBookmarks +{ + GtkVBox parent_instance; + + GtkWidget* toolbar; + GtkWidget* edit; + GtkWidget* delete; + GtkWidget* treeview; + MidoriApp* app; + KatzeArray* array; + KatzeNet* net; +}; + +struct _MidoriBookmarksClass +{ + GtkVBoxClass parent_class; +}; + +static void +midori_bookmarks_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriBookmarks, midori_bookmarks, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_bookmarks_viewable_iface_init)); + +enum +{ + PROP_0, + + PROP_APP +}; + +static void +midori_bookmarks_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_bookmarks_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_bookmarks_class_init (MidoriBookmarksClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_bookmarks_set_property; + gobject_class->get_property = midori_bookmarks_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_APP, + g_param_spec_object ( + "app", + "App", + "The app", + MIDORI_TYPE_APP, + flags)); +} + +static const gchar* +midori_bookmarks_get_label (MidoriViewable* viewable) +{ + return _("Bookmarks"); +} + +static const gchar* +midori_bookmarks_get_stock_id (MidoriViewable* viewable) +{ + return STOCK_BOOKMARKS; +} + +static void +midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) +{ + GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + /* FIXME: Take selected folder into account */ + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), + NULL, TRUE); +} + +static void +midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), + &model, &iter)) + { + KatzeItem* item; + gboolean is_separator; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); + if (!is_separator) + { + GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), + item, FALSE); + } + } +} + +static void +midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), + &model, &iter)) + { + KatzeItem* item; + KatzeArray* parent; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + /* FIXME: Even toplevel items should technically have a parent */ + g_return_if_fail (katze_item_get_parent (item)); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + } +} + +static void +midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + gboolean is_separator; + + if (!bookmarks->edit) + return; + + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + + is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); + gtk_widget_set_sensitive (bookmarks->edit, !is_separator); + gtk_widget_set_sensitive (bookmarks->delete, TRUE); + } + else + { + gtk_widget_set_sensitive (bookmarks->edit, FALSE); + gtk_widget_set_sensitive (bookmarks->delete, FALSE); + } +} + +static GtkWidget* +midori_bookmarks_get_toolbar (MidoriViewable* viewable) +{ + MidoriBookmarks* bookmarks = MIDORI_BOOKMARKS (viewable); + + if (!bookmarks->toolbar) + { + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + bookmarks->toolbar = toolbar; + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Add a new bookmark")); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_bookmarks_add_clicked_cb), bookmarks); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Edit the selected bookmark")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_bookmarks_edit_clicked_cb), bookmarks); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + bookmarks->edit = GTK_WIDGET (toolitem); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Delete the selected bookmark")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_bookmarks_delete_clicked_cb), bookmarks); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + bookmarks->delete = GTK_WIDGET (toolitem); + midori_bookmarks_cursor_or_row_changed_cb ( + GTK_TREE_VIEW (bookmarks->treeview), bookmarks); + g_signal_connect (bookmarks->edit, "destroy", + G_CALLBACK (gtk_widget_destroyed), &bookmarks->edit); + g_signal_connect (bookmarks->delete, "destroy", + G_CALLBACK (gtk_widget_destroyed), &bookmarks->delete); + } + + return bookmarks->toolbar; +} + +static void +midori_bookmarks_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_bookmarks_get_stock_id; + iface->get_label = midori_bookmarks_get_label; + iface->get_toolbar = midori_bookmarks_get_toolbar; +} + +static void +midori_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* added_item, + MidoriBookmarks* bookmarks); + +static void +midori_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* removed_item, + MidoriBookmarks* bookmarks); + +static void +midori_bookmarks_clear_cb (KatzeArray* array, + MidoriBookmarks* bookmarks); + +static void +midori_bookmarks_disconnect_folder (MidoriBookmarks* bookmarks, + KatzeArray* array) +{ + guint i, n; + + g_assert (KATZE_IS_ARRAY (array)); + + g_signal_handlers_disconnect_by_func (array, + midori_bookmarks_add_item_cb, bookmarks); + g_signal_handlers_disconnect_by_func (array, + midori_bookmarks_remove_item_cb, bookmarks); + g_signal_handlers_disconnect_by_func (array, + midori_bookmarks_clear_cb, bookmarks); + + n = katze_array_get_length (array); + for (i = 0; i < n; i++) + { + KatzeItem* item = katze_array_get_nth_item (bookmarks->array, i); + if (KATZE_IS_ARRAY (item)) + midori_bookmarks_disconnect_folder (bookmarks, KATZE_ARRAY (item)); + g_object_unref (item); + } +} + +static void +midori_bookmarks_add_item_cb (KatzeArray* array, + KatzeItem* added_item, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + guint i; + + g_assert (KATZE_IS_ARRAY (array)); + g_assert (KATZE_IS_ITEM (added_item)); + + if (KATZE_IS_ARRAY (added_item)) + { + g_signal_connect (added_item, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect (added_item, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); + g_signal_connect (added_item, "clear", + G_CALLBACK (midori_bookmarks_clear_cb), bookmarks); + } + + g_object_ref (added_item); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + + if (array == bookmarks->array) + { + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + &iter, NULL, G_MAXINT, 0, added_item, -1); + return; + } + + i = 0; + /* FIXME: Recurse over children of folders, too */ + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (item == (KatzeItem*)array) + { + GtkTreeIter child_iter; + + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + &child_iter, &iter, G_MAXINT, 0, added_item, -1); + break; + } + i++; + } +} + +static void +midori_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* removed_item, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + guint i; + GtkTreeIter iter; + + g_assert (KATZE_IS_ARRAY (array)); + g_assert (KATZE_IS_ITEM (removed_item)); + + if (KATZE_IS_ARRAY (removed_item)) + midori_bookmarks_disconnect_folder (bookmarks, KATZE_ARRAY (removed_item)); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + i = 0; + /* FIXME: Recurse over children of folders, too */ + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (item == removed_item) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + g_object_unref (item); + break; + } + i++; + } + g_object_unref (removed_item); +} + +static void +midori_bookmarks_clear_cb (KatzeArray* array, + MidoriBookmarks* bookmarks) +{ + GtkTreeView* treeview; + GtkTreeStore* store; + + g_assert (KATZE_IS_ARRAY (array)); + + /* FIXME: Clear folders */ + if (array == bookmarks->array) + { + treeview = GTK_TREE_VIEW (bookmarks->treeview); + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + gtk_tree_store_clear (store); + } + + midori_bookmarks_disconnect_folder (bookmarks, array); +} + +static void +midori_bookmarks_insert_folder (MidoriBookmarks* bookmarks, + GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeArray* array) +{ + guint n, i; + KatzeItem* item; + GtkTreeIter iter; + + g_assert (KATZE_IS_ARRAY (array)); + + g_signal_connect (array, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect (array, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); + g_signal_connect (array, "clear", + G_CALLBACK (midori_bookmarks_clear_cb), bookmarks); + + n = katze_array_get_length (array); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (array, i); + g_object_ref (item); + gtk_tree_store_insert_with_values (treestore, &iter, parent, n, + 0, item, -1); + if (KATZE_IS_ARRAY (item)) + midori_bookmarks_insert_folder (bookmarks, treestore, + &iter, KATZE_ARRAY (item)); + } +} + +static void +midori_bookmarks_set_app (MidoriBookmarks* bookmarks, + MidoriApp* app) +{ + GtkTreeModel* model; + + if (bookmarks->array) + { + midori_bookmarks_disconnect_folder (bookmarks, bookmarks->array); + g_object_unref (bookmarks->array); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + gtk_tree_store_clear (GTK_TREE_STORE (model)); + } + katze_assign (bookmarks->app, g_object_ref (app)); + bookmarks->array = katze_object_get_object (app, "bookmarks"); + if (bookmarks->array) + { + /* FIXME: Dereference the app on finalization */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + midori_bookmarks_insert_folder (bookmarks, GTK_TREE_STORE (model), + NULL, g_object_ref (bookmarks->array)); + } +} + +static void +midori_bookmarks_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriBookmarks* bookmarks = MIDORI_BOOKMARKS (object); + + switch (prop_id) + { + case PROP_APP: + midori_bookmarks_set_app (bookmarks, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_bookmarks_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriBookmarks* bookmarks = MIDORI_BOOKMARKS (object); + + switch (prop_id) + { + case PROP_APP: + g_value_set_object (value, bookmarks->app); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + GdkPixbuf* pixbuf; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + /* TODO: Would it be better to not do this on every redraw? */ + pixbuf = NULL; + if (KATZE_IS_ARRAY (item)) + pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, + GTK_ICON_SIZE_MENU, NULL); + else if (katze_item_get_uri (item)) + pixbuf = katze_net_load_icon ( + MIDORI_BOOKMARKS (gtk_widget_get_parent (treeview))->net, + katze_item_get_uri (item), NULL, treeview, NULL); + g_object_set (renderer, "pixbuf", pixbuf, NULL); + if (pixbuf) + g_object_unref (pixbuf); +} + +static void +midori_bookmarks_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) + g_object_set (renderer, "markup", NULL, + "text", katze_item_get_name (item), NULL); + else + g_object_set (renderer, "markup", _("Separator"), NULL); +} + +static void +midori_bookmarks_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + + model = gtk_tree_view_get_model (treeview); + + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (uri && *uri) + { + GtkWidget* browser; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + } + } +} + +static void +midori_bookmarks_popup_item (GtkWidget* menu, + const gchar* stock_id, + const gchar* label, + KatzeItem* item, + gpointer callback, + MidoriBookmarks* bookmarks) +{ + const gchar* uri; + GtkWidget* menuitem; + + uri = katze_item_get_uri (item); + + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); + if (!strcmp (stock_id, GTK_STOCK_EDIT)) + gtk_widget_set_sensitive (menuitem, + KATZE_IS_ARRAY (item) || uri != NULL); + else if (strcmp (stock_id, GTK_STOCK_DELETE)) + gtk_widget_set_sensitive (menuitem, uri != NULL); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +midori_bookmarks_open_activate_cb (GtkWidget* menuitem, + MidoriBookmarks* bookmarks) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + } +} + +static void +midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, + MidoriBookmarks* bookmarks) +{ + KatzeItem* item; + const gchar* uri; + guint n; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser; + MidoriWebSettings* settings; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + n = midori_browser_add_item (MIDORI_BROWSER (browser), item); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } +} + +static void +midori_bookmarks_open_in_window_activate_cb (GtkWidget* menuitem, + MidoriBookmarks* bookmarks) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + g_signal_emit_by_name (browser, "new-window", uri); + } +} + +static void +midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, + MidoriBookmarks* bookmarks) +{ + KatzeItem* item; + gboolean is_separator; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); + + if (!is_separator) + { + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, FALSE); + } +} + +static void +midori_bookmarks_delete_activate_cb (GtkWidget* menuitem, + MidoriBookmarks* bookmarks) +{ + KatzeItem* item; + KatzeArray* parent; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + + /* FIXME: Even toplevel items should technically have a parent */ + g_return_if_fail (katze_item_get_parent (item)); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); +} + +static void +midori_bookmarks_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeItem* item, + MidoriBookmarks* bookmarks) +{ + GtkWidget* menu; + GtkWidget* menuitem; + + menu = gtk_menu_new (); + midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL, + item, midori_bookmarks_open_activate_cb, bookmarks); + midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), + item, midori_bookmarks_open_in_tab_activate_cb, bookmarks); + midori_bookmarks_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), + item, midori_bookmarks_open_in_window_activate_cb, bookmarks); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + midori_bookmarks_popup_item (menu, GTK_STOCK_EDIT, NULL, + item, midori_bookmarks_edit_activate_cb, bookmarks); + midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL, + item, midori_bookmarks_delete_activate_cb, bookmarks); + + sokoke_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); +} + +static gboolean +midori_bookmarks_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + gint n; + + if (event->button != 2 && event->button != 3) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (event->button == 2) + { + if (uri && *uri) + { + GtkWidget* browser = gtk_widget_get_toplevel (widget); + n = midori_browser_add_uri (MIDORI_BROWSER (browser), uri); + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } + } + else + midori_bookmarks_popup (widget, event, item, bookmarks); + return TRUE; + } + return FALSE; +} + +static void +midori_bookmarks_popup_menu_cb (GtkWidget* widget, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_bookmarks_popup (widget, NULL, item, bookmarks); + } +} + +static void +midori_bookmarks_init (MidoriBookmarks* bookmarks) +{ + GtkTreeStore* model; + GtkWidget* treeview; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_text; + + bookmarks->net = katze_net_new (); + /* FIXME: Dereference the net on finalization */ + + /* Create the treeview */ + model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_bookmarks_treeview_render_icon_cb, + treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_bookmarks_treeview_render_text_cb, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + g_object_unref (model); + g_object_connect (treeview, + "signal::row-activated", + midori_bookmarks_row_activated_cb, bookmarks, + "signal::cursor-changed", + midori_bookmarks_cursor_or_row_changed_cb, bookmarks, + "signal::columns-changed", + midori_bookmarks_cursor_or_row_changed_cb, bookmarks, + "signal::button-release-event", + midori_bookmarks_button_release_event_cb, bookmarks, + "signal::popup-menu", + midori_bookmarks_popup_menu_cb, bookmarks, + NULL); + gtk_widget_show (treeview); + gtk_box_pack_start (GTK_BOX (bookmarks), treeview, TRUE, TRUE, 0); + bookmarks->treeview = treeview; +} + +/** + * midori_bookmarks_new: + * + * Creates a new empty bookmarks. + * + * Return value: a new #MidoriBookmarks + * + * Since: 0.1.3 + **/ +GtkWidget* +midori_bookmarks_new (void) +{ + MidoriBookmarks* bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, NULL); + + return GTK_WIDGET (bookmarks); +} diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h new file mode 100644 index 00000000..96797183 --- /dev/null +++ b/panels/midori-bookmarks.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_BOOKMARKS_H__ +#define __MIDORI_BOOKMARKS_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_BOOKMARKS \ + (midori_bookmarks_get_type ()) +#define MIDORI_BOOKMARKS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_BOOKMARKS, MidoriBookmarks)) +#define MIDORI_BOOKMARKS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_BOOKMARKS, MidoriBookmarksClass)) +#define MIDORI_IS_BOOKMARKS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_BOOKMARKS)) +#define MIDORI_IS_BOOKMARKS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_BOOKMARKS)) +#define MIDORI_BOOKMARKS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_BOOKMARKS, MidoriBookmarksClass)) + +typedef struct _MidoriBookmarks MidoriBookmarks; +typedef struct _MidoriBookmarksClass MidoriBookmarksClass; + +GType +midori_bookmarks_get_type (void); + +GtkWidget* +midori_bookmarks_new (void); + +G_END_DECLS + +#endif /* __MIDORI_BOOKMARKS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index ccba854c..c7aed162 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,6 +13,7 @@ midori/midori-searchaction.c midori/sokoke.c midori/gjs.c panels/midori-addons.c +panels/midori-bookmarks.c panels/midori-console.c panels/midori-extensions.c panels/midori-plugins.c From 2be81621d8211860934042ab6abc5365055f776e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jan 2009 04:13:25 +0100 Subject: [PATCH 0710/2970] Make Mouse Gestures extension translatable --- extensions/mouse-gestures/main.c | 4 ++-- po/POTFILES.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/mouse-gestures/main.c b/extensions/mouse-gestures/main.c index 2777ca4d..fa73887f 100644 --- a/extensions/mouse-gestures/main.c +++ b/extensions/mouse-gestures/main.c @@ -213,8 +213,8 @@ MidoriExtension* extension_init(void) { MidoriExtension* extension = NULL; extension = g_object_new(MIDORI_TYPE_EXTENSION, - "name", "Mouse gestures", - "description", "Control Midori by moving the mouse", + "name", _("Mouse Gestures"), + "description", _("Control Midori by moving the mouse"), "version", MOUSE_GESTURES_VERSION, "authors", "Matthias Kruk ", NULL); g_signal_connect(extension, "activate", G_CALLBACK(mouse_gestures_activate), NULL); // connect the callback that's executed on activation diff --git a/po/POTFILES.in b/po/POTFILES.in index c7aed162..4ab957ed 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -23,5 +23,6 @@ katze/katze-item.c katze/katze-list.c katze/katze-array.c katze/katze-arrayaction.c +extensions/mouse-gestures/main.c extensions/page-holder.c extensions/statusbar-features.c From 135b1be01e2b4e6d8dfaf1f721e18ab1703eeeed Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jan 2009 19:07:27 +0100 Subject: [PATCH 0711/2970] Provide default search engines --- data/search | 21 +++++++++++++++++++++ midori/main.c | 27 ++++++++++++++++++++++++--- wscript | 6 +++++- 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 data/search diff --git a/data/search b/data/search new file mode 100644 index 00000000..b650d9f9 --- /dev/null +++ b/data/search @@ -0,0 +1,21 @@ + +[Google] +name=Google +text=Web Search +uri=http://www.google.com/search?q=%s +icon= +token=g + +[Wikipedia] +name=Wikipedia +text=The free encyclopedia +uri=http://en.wikipedia.org/wiki/%s +icon= +token=wp + +[TheFreeDictionary] +name=The Free Dictionary +text=Dictionary, Encyclopedia and Thesaurus +uri=http://www.thefreedictionary.com/%s +icon= +token=fd diff --git a/midori/main.c b/midori/main.c index 96df6fae..8f4c6bb1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -2166,13 +2166,34 @@ main (int argc, katze_assign (config_file, build_config_filename ("search")); error = NULL; search_engines = search_engines_new_from_file (config_file, &error); - if (error) + if (!error && katze_array_is_empty (search_engines)) + { + const gchar* const * config_dirs = g_get_system_config_dirs (); + i = 0; + while (config_dirs[i]) + { + g_object_unref (search_engines); + katze_assign (config_file, + g_build_filename (config_dirs[i], PACKAGE_NAME, "search", NULL)); + search_engines = search_engines_new_from_file (config_file, NULL); + if (!katze_array_is_empty (search_engines)) + continue; + i++; + } + if (katze_array_is_empty (search_engines)) + { + g_object_unref (search_engines); + katze_assign (config_file, + g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, "search", NULL)); + search_engines = search_engines_new_from_file (config_file, NULL); + } + } + else if (error) { - /* FIXME: We may have a "file empty" error, how do we recognize that? if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, _("The search engines couldn't be loaded. %s\n"), - error->message); */ + error->message); g_error_free (error); } bookmarks = katze_array_new (KATZE_TYPE_ARRAY); diff --git a/wscript b/wscript index 70def3c4..96dde91b 100644 --- a/wscript +++ b/wscript @@ -86,9 +86,10 @@ def configure (conf): nls = 'no ' conf.define ('ENABLE_NLS', [0,1][nls == 'yes']) - dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) dirname_default ('DOCDIR', os.path.join (conf.env['DATADIR'], 'doc')) + dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) + dirname_default ('SYSCONFDIR', os.path.join (conf.env['PREFIX'], 'etc')) if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') @@ -291,6 +292,9 @@ def build (bld): bld.install_files ('${DOCDIR}/' + APPNAME + '/', \ 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') + # Install default configuration + bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search') + if bld.env['RST2HTML']: # FIXME: Build only if needed if not os.access (blddir, os.F_OK): From 9baa905f1db329757dab5658374f7a0e9cfe1703 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jan 2009 19:31:50 +0100 Subject: [PATCH 0712/2970] Monitor changes to search engines and not only adding and removing --- midori/main.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/midori/main.c b/midori/main.c index 8f4c6bb1..fe9ade11 100644 --- a/midori/main.c +++ b/midori/main.c @@ -977,26 +977,9 @@ accel_map_changed_cb (GtkAccelMap* accel_map, } static void -midori_search_engines_add_item_cb (KatzeArray* search_engines, - GObject* item) -{ - gchar* config_file; - GError* error; - - config_file = build_config_filename ("search"); - error = NULL; - if (!search_engines_save_to_file (search_engines, config_file, &error)) - { - g_warning (_("The search engines couldn't be saved. %s"), - error->message); - g_error_free (error); - } - g_free (config_file); -} - -static void -midori_search_engines_remove_item_cb (KatzeArray* search_engines, - GObject* item) +midori_search_engines_modify_cb (KatzeArray* array, + gpointer item, + KatzeArray* search_engines) { gchar* config_file; GError* error; @@ -2166,6 +2149,12 @@ main (int argc, katze_assign (config_file, build_config_filename ("search")); error = NULL; search_engines = search_engines_new_from_file (config_file, &error); + /* We ignore for instance empty files */ + if (error && error->code == G_KEY_FILE_ERROR_PARSE) + { + g_error_free (error); + error = NULL; + } if (!error && katze_array_is_empty (search_engines)) { const gchar* const * config_dirs = g_get_system_config_dirs (); @@ -2337,17 +2326,26 @@ main (int argc, g_signal_connect_after (settings, "notify", G_CALLBACK (settings_notify_cb), NULL); g_signal_connect_after (search_engines, "add-item", - G_CALLBACK (midori_search_engines_add_item_cb), NULL); + G_CALLBACK (midori_search_engines_modify_cb), search_engines); g_signal_connect_after (search_engines, "remove-item", - G_CALLBACK (midori_search_engines_remove_item_cb), NULL); + G_CALLBACK (midori_search_engines_modify_cb), search_engines); + if (!katze_array_is_empty (search_engines)) + { + guint n = katze_array_get_length (search_engines); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (search_engines, i); + g_signal_connect_after (item, "notify", + G_CALLBACK (midori_search_engines_modify_cb), search_engines); + } + } g_signal_connect_after (bookmarks, "add-item", G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect_after (bookmarks, "remove-item", G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); if (!katze_array_is_empty (bookmarks)) { - guint n; - n = katze_array_get_length (bookmarks); + guint n = katze_array_get_length (bookmarks); for (i = 0; i < n; i++) { item = katze_array_get_nth_item (bookmarks, i); From 77c04066c1eb2b454df7676ac6c33d1a296cc4fc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Feb 2009 19:08:53 +0100 Subject: [PATCH 0713/2970] Fix "%d days ago" to be translated again --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index dd04d30c..b48df84a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2791,7 +2791,7 @@ midori_browser_history_render_text_cb (GtkTreeViewColumn* column, } else if (age > 1) { - sdate = g_strdup_printf (_("%" G_GINT64_FORMAT " days ago"), age); + sdate = g_strdup_printf (_("%d days ago"), (gint)age); g_object_set (renderer, "text", sdate, NULL); g_free (sdate); } From 0cf9279045992ff851c7bd3f86908207f3a46381 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Feb 2009 19:14:18 +0100 Subject: [PATCH 0714/2970] Update translation template --- po/midori.pot | 663 ++++++++++++++++++++++++++------------------------ 1 file changed, 340 insertions(+), 323 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index b2106a59..9ea12736 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-19 22:25+0100\n" +"POT-Creation-Date: 2009-02-01 19:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,1211 +16,1208 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "" -#: ../midori.desktop.in.h:2 ../midori/main.c:1864 ../midori/main.c:1966 -#: ../midori/main.c:1975 ../midori/main.c:1986 -#: ../midori/midori-websettings.c:239 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 +#: ../midori/main.c:2065 ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "" -#: ../midori/main.c:88 +#: ../midori/main.c:90 msgid "_Bookmark" msgstr "" -#: ../midori/main.c:89 ../midori/midori-browser.c:3821 +#: ../midori/main.c:91 ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "" -#: ../midori/main.c:90 +#: ../midori/main.c:92 msgid "_Add Bookmark" msgstr "" -#: ../midori/main.c:91 +#: ../midori/main.c:93 msgid "_Console" msgstr "" -#: ../midori/main.c:92 +#: ../midori/main.c:94 msgid "_Extensions" msgstr "" -#: ../midori/main.c:93 +#: ../midori/main.c:95 msgid "_History" msgstr "" -#: ../midori/main.c:94 +#: ../midori/main.c:96 msgid "_Homepage" msgstr "" -#: ../midori/main.c:95 +#: ../midori/main.c:97 msgid "_Userscripts" msgstr "" -#: ../midori/main.c:96 +#: ../midori/main.c:98 msgid "User_styles" msgstr "" -#: ../midori/main.c:97 +#: ../midori/main.c:99 msgid "New _Tab" msgstr "" -#: ../midori/main.c:98 +#: ../midori/main.c:100 msgid "_Transfers" msgstr "" -#: ../midori/main.c:99 +#: ../midori/main.c:101 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/main.c:100 +#: ../midori/main.c:102 msgid "New _Window" msgstr "" -#: ../midori/main.c:156 +#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:211 +#: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:218 ../midori/main.c:288 +#: ../midori/main.c:220 ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:530 +#: ../midori/main.c:532 msgid "File not found." msgstr "" -#: ../midori/main.c:538 ../midori/main.c:547 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "" -#: ../midori/main.c:569 +#: ../midori/main.c:571 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:601 +#: ../midori/main.c:603 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:655 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:679 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:712 ../midori/main.c:726 +#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:934 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:867 +#: ../midori/main.c:962 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:895 ../midori/main.c:913 +#: ../midori/main.c:991 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1043 ../midori/sokoke.c:531 +#: ../midori/main.c:1121 ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1064 ../midori/main.c:1091 ../midori/main.c:1119 +#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1143 ../midori/main.c:1167 +#: ../midori/main.c:1221 ../midori/main.c:1245 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1188 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "" -#: ../midori/main.c:1229 +#: ../midori/main.c:1312 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1553 +#: ../midori/main.c:1636 msgid "Authentication Required" msgstr "" -#: ../midori/main.c:1569 +#: ../midori/main.c:1652 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -#: ../midori/main.c:1583 +#: ../midori/main.c:1666 msgid "Username" msgstr "" -#: ../midori/main.c:1594 +#: ../midori/main.c:1677 msgid "Password" msgstr "" -#: ../midori/main.c:1700 +#: ../midori/main.c:1783 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1715 +#: ../midori/main.c:1798 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1719 +#: ../midori/main.c:1802 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1724 +#: ../midori/main.c:1807 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1864 +#: ../midori/main.c:1950 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1896 ../midori/gjs.c:514 +#: ../midori/main.c:1982 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1919 +#: ../midori/main.c:2005 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1921 +#: ../midori/main.c:2007 msgid "Display program version" msgstr "" -#: ../midori/main.c:1923 +#: ../midori/main.c:2009 msgid "Addresses" msgstr "" -#: ../midori/main.c:1963 +#: ../midori/main.c:2053 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1987 +#: ../midori/main.c:2077 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1989 +#: ../midori/main.c:2079 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:2016 +#: ../midori/main.c:2106 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:2079 +#: ../midori/main.c:2184 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:2196 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2094 +#: ../midori/main.c:2211 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2107 +#: ../midori/main.c:2224 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2120 +#: ../midori/main.c:2237 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2132 +#: ../midori/main.c:2249 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:2148 +#: ../midori/main.c:2265 msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:328 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:341 +#: ../midori/midori-browser.c:351 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:528 +#: ../midori/midori-browser.c:546 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 +#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:596 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:712 +#: ../midori/midori-browser.c:713 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1302 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2500 +#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2502 +#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2677 -msgid "Separator" -msgstr "" - -#: ../midori/midori-browser.c:2784 +#: ../midori/midori-browser.c:2788 #, c-format msgid "A week ago" msgstr "" -#: ../midori/midori-browser.c:2790 +#: ../midori/midori-browser.c:2794 #, c-format msgid "%d days ago" msgstr "" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:2801 msgid "Today" msgstr "" -#: ../midori/midori-browser.c:2799 +#: ../midori/midori-browser.c:2803 msgid "Yesterday" msgstr "" -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2896 +#: ../midori/midori-browser.c:2900 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:3029 +#: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3098 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3101 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3104 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3107 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3110 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3112 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3113 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3115 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3116 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3119 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3122 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3124 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3127 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3152 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3136 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3139 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3142 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3145 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3147 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3148 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3150 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3151 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3154 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3155 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3158 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3160 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3161 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3198 +#: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3203 ../midori/midori-view.c:979 +#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3182 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3184 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3185 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3189 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3191 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3200 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3202 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3203 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3227 ../midori/midori-view.c:951 +#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3206 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3235 -msgid "Edit the selected bookmark" -msgstr "" - -#: ../midori/midori-browser.c:3238 -msgid "Delete the selected bookmark" -msgstr "" - -#: ../midori/midori-browser.c:3241 +#: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" msgstr "" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3216 msgid "Clear the entire history" msgstr "" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" msgstr "" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3221 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3251 ../midori/midori-searchaction.c:462 +#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3224 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3228 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3231 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3232 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3234 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3236 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3237 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3239 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3240 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3242 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3243 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3246 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3253 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3282 +#: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3287 +#: ../midori/midori-browser.c:3259 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3288 +#: ../midori/midori-browser.c:3260 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3263 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3264 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3267 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3296 +#: ../midori/midori-browser.c:3268 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3299 +#: ../midori/midori-browser.c:3271 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3300 +#: ../midori/midori-browser.c:3272 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3303 +#: ../midori/midori-browser.c:3275 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3276 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3307 +#: ../midori/midori-browser.c:3279 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3280 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3748 +msgid "_Separator" +msgstr "" + +#: ../midori/midori-browser.c:3755 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3757 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3772 +#: ../midori/midori-browser.c:3781 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:3783 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3793 +#: ../midori/midori-browser.c:3802 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3808 +#: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3823 +#: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3836 +#: ../midori/midori-browser.c:3845 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3838 +#: ../midori/midori-browser.c:3847 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:3961 ../midori/midori-preferences.c:593 +#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 msgid "History" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4050 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4071 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4076 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:4039 +#: ../midori/midori-browser.c:4081 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4047 +#: ../midori/midori-browser.c:4089 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:4098 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 +#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 +#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:171 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:186 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:187 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:188 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:189 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:190 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:206 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:207 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:208 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:223 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:224 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:225 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:226 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:227 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:242 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:243 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:260 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:261 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:262 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:303 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:312 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:313 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:321 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:322 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:347 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:348 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:357 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:358 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:366 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:367 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:376 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:403 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:412 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:422 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:432 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:451 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:452 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:462 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:477 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:478 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:486 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:495 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:496 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:504 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:505 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:513 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:514 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:522 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:523 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:533 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:534 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:542 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:543 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:552 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:553 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:563 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:564 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:577 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:578 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:587 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:595 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:605 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:656 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:657 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:667 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:668 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:681 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:682 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:690 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:691 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:701 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:702 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:673 +#: ../midori/midori-websettings.c:710 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:719 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:720 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:728 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:729 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:739 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:740 msgid "The proxy server used for HTTP connections" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:760 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:761 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:781 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:782 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:794 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:603 +#: ../midori/midori-view.c:608 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:888 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:906 +#: ../midori/midori-view.c:911 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:914 +#: ../midori/midori-view.c:919 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:936 +#: ../midori/midori-view.c:941 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1406 +#: ../midori/midori-view.c:1411 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1555 +#: ../midori/midori-view.c:1562 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1586 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1595 +#: ../midori/midori-view.c:1602 #, c-format msgid "No documentation installed" msgstr "" @@ -1350,60 +1347,60 @@ msgstr "" msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:499 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:505 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:572 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:579 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 +#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:792 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:792 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:818 +#: ../midori/midori-searchaction.c:820 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-searchaction.c:864 msgid "_Icon (name or file):" msgstr "" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:878 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1053 +#: ../midori/midori-searchaction.c:1055 msgid "Manage Search Engines" msgstr "" @@ -1447,10 +1444,22 @@ msgstr "" msgid "_Disable" msgstr "" -#: ../panels/midori-bookmarks.c:89 +#: ../panels/midori-bookmarks.c:100 msgid "Bookmarks" msgstr "" +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "" @@ -1459,7 +1468,7 @@ msgstr "" msgid "Extensions" msgstr "" -#: ../panels/midori-plugins.c:86 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "" @@ -1490,12 +1499,20 @@ msgstr "" msgid "Choose folder" msgstr "" +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "" From b86a3cce50221255e96c3c701552689fa1e0f9eb Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sun, 1 Feb 2009 19:17:16 +0100 Subject: [PATCH 0715/2970] Update Japanese translation --- po/ja.po | 684 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 352 insertions(+), 332 deletions(-) diff --git a/po/ja.po b/po/ja.po index 069966f5..29ed5074 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-19 00:13+0900\n" -"PO-Revision-Date: 2009-01-16 15:53+0900\n" +"POT-Creation-Date: 2009-02-01 19:06+0100\n" +"PO-Revision-Date: 2009-02-01 11:58+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,166 +16,166 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../midori.desktop.in.h:2 ../midori/main.c:1858 ../midori/main.c:1960 -#: ../midori/main.c:1969 ../midori/main.c:1980 -#: ../midori/midori-websettings.c:239 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 +#: ../midori/main.c:2065 ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/main.c:88 ../midori/midori-browser.c:3948 +#: ../midori/main.c:91 ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "_Add Bookmark" msgstr "ブックマークに追加(_A)" -#: ../midori/main.c:90 +#: ../midori/main.c:93 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/main.c:92 +#: ../midori/main.c:95 msgid "_History" msgstr "履歴(_H)" -#: ../midori/main.c:93 +#: ../midori/main.c:96 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/main.c:95 +#: ../midori/main.c:98 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/main.c:96 +#: ../midori/main.c:99 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/main.c:98 +#: ../midori/main.c:101 msgid "_Closed Tabs and Windows" msgstr "閉じたタブとウィンドウ(_C)" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../midori/main.c:155 +#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:210 +#: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:217 ../midori/main.c:287 +#: ../midori/main.c:220 ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:529 +#: ../midori/main.c:532 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:537 ../midori/main.c:546 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/main.c:568 +#: ../midori/main.c:571 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:600 +#: ../midori/main.c:603 #, c-format -msgid "Failed to execute SQL statement: %s\n" -msgstr "SQL 文の実行に失敗しました: %s\n" +msgid "Failed to execute database statement: %s\n" +msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:654 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:678 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:711 ../midori/main.c:725 +#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:838 +#: ../midori/main.c:934 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:866 +#: ../midori/main.c:962 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:894 ../midori/main.c:912 +#: ../midori/main.c:991 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1042 ../midori/sokoke.c:532 +#: ../midori/main.c:1121 ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1063 ../midori/main.c:1090 ../midori/main.c:1118 +#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1142 ../midori/main.c:1166 +#: ../midori/main.c:1221 ../midori/main.c:1245 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1187 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "転送" -#: ../midori/main.c:1223 +#: ../midori/main.c:1312 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1547 +#: ../midori/main.c:1636 msgid "Authentication Required" msgstr "認証が要求されました" -#: ../midori/main.c:1563 +#: ../midori/main.c:1652 msgid "" "A username and a password are required\n" "to open this location:" @@ -183,15 +183,15 @@ msgstr "" "この場所を開くためにはユーザ名とパスワードが\n" "必要です:" -#: ../midori/main.c:1577 +#: ../midori/main.c:1666 msgid "Username" msgstr "ユーザ名" -#: ../midori/main.c:1588 +#: ../midori/main.c:1677 msgid "Password" msgstr "パスワード" -#: ../midori/main.c:1694 +#: ../midori/main.c:1783 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." @@ -199,1038 +199,1031 @@ msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" "ようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1709 +#: ../midori/main.c:1798 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1713 +#: ../midori/main.c:1802 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1718 +#: ../midori/main.c:1807 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1858 +#: ../midori/main.c:1950 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1890 ../midori/gjs.c:514 +#: ../midori/main.c:1982 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1913 +#: ../midori/main.c:2005 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1915 +#: ../midori/main.c:2007 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1917 +#: ../midori/main.c:2009 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1957 +#: ../midori/main.c:2053 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1981 +#: ../midori/main.c:2077 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1983 +#: ../midori/main.c:2079 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2106 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:2073 +#: ../midori/main.c:2184 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "検索エンジンを読み込めませんでした。%s\n" + +#: ../midori/main.c:2196 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:2088 +#: ../midori/main.c:2211 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:2101 +#: ../midori/main.c:2224 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:2114 +#: ../midori/main.c:2237 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:2126 +#: ../midori/main.c:2249 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2142 +#: ../midori/main.c:2265 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3308 -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:328 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:341 +#: ../midori/midori-browser.c:351 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:528 +#: ../midori/midori-browser.c:546 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 +#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:596 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:712 +#: ../midori/midori-browser.c:713 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1302 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2546 +#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2548 +#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2799 -msgid "Separator" -msgstr "セパレータ" - -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2788 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:2794 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:2801 msgid "Today" msgstr "今日" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:2803 msgid "Yesterday" msgstr "昨日" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:2900 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3098 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3101 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3104 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3107 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3110 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3112 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3113 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3115 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3116 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3119 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3266 +#: ../midori/midori-browser.c:3122 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3124 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3127 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3274 ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3136 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3283 +#: ../midori/midori-browser.c:3139 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3286 +#: ../midori/midori-browser.c:3142 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3289 +#: ../midori/midori-browser.c:3145 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3147 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3148 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3294 +#: ../midori/midori-browser.c:3150 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3151 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3298 +#: ../midori/midori-browser.c:3154 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3299 +#: ../midori/midori-browser.c:3155 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3158 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3160 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3161 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:979 +#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3182 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3184 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3329 +#: ../midori/midori-browser.c:3185 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3333 +#: ../midori/midori-browser.c:3189 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3335 +#: ../midori/midori-browser.c:3191 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3200 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3202 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3203 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3349 ../midori/midori-view.c:951 +#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3206 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3357 -msgid "Edit the selected bookmark" -msgstr "選択されたブックマークを編集します" - -#: ../midori/midori-browser.c:3360 -msgid "Delete the selected bookmark" -msgstr "選択されたブックマークを削除します" - -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" msgstr "選択された履歴アイテムを削除します" -#: ../midori/midori-browser.c:3366 +#: ../midori/midori-browser.c:3216 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" msgstr "選択された履歴アイテムをブックマークに追加します" -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:3221 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3373 ../midori/midori-searchaction.c:462 +#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3224 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3228 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3379 +#: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3231 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3232 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3234 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3236 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3387 +#: ../midori/midori-browser.c:3237 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3239 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3240 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3392 +#: ../midori/midori-browser.c:3242 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3393 +#: ../midori/midori-browser.c:3243 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3396 +#: ../midori/midori-browser.c:3246 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3403 +#: ../midori/midori-browser.c:3253 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:3259 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3260 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3413 +#: ../midori/midori-browser.c:3263 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3414 +#: ../midori/midori-browser.c:3264 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3267 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3418 +#: ../midori/midori-browser.c:3268 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3421 +#: ../midori/midori-browser.c:3271 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3422 +#: ../midori/midori-browser.c:3272 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3425 +#: ../midori/midori-browser.c:3275 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3276 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3279 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3430 +#: ../midori/midori-browser.c:3280 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3873 +#: ../midori/midori-browser.c:3748 +msgid "_Separator" +msgstr "セパレータ(_S)" + +#: ../midori/midori-browser.c:3755 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3757 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3781 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3901 +#: ../midori/midori-browser.c:3783 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:3802 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3950 +#: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3963 +#: ../midori/midori-browser.c:3845 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3965 +#: ../midori/midori-browser.c:3847 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:4087 -msgid "Bookmarks" -msgstr "ブックマーク" - -#: ../midori/midori-browser.c:4130 ../midori/midori-preferences.c:593 +#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 msgid "History" msgstr "履歴" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:4050 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4198 +#: ../midori/midori-browser.c:4071 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4203 +#: ../midori/midori-browser.c:4076 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4208 +#: ../midori/midori-browser.c:4081 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4089 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4225 +#: ../midori/midori-browser.c:4098 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 +#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 +#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:171 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:186 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:187 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:188 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:189 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:190 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:206 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:207 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:208 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:223 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:224 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:225 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:226 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:227 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:242 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:243 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:260 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:261 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:262 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:303 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶するかどうか指定します" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:312 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:313 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:321 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:322 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:347 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:348 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:357 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:358 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:366 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:367 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:376 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" msgstr "メニューバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:403 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" msgstr "パネルを表示するかどうか指定します" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:412 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:422 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:432 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" msgstr "コンパクトなサイドパネルを表示します" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:451 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:452 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:462 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:477 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:478 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示する" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:486 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:495 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:496 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:504 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:505 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:513 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:514 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:522 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:523 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:533 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:534 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:542 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:543 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:552 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:553 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:563 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:564 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:577 msgid "Middle click opens Selection" msgstr "選択範囲のミドルクリックで開く" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:578 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをミドルクリックすると読み込みます" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:587 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:595 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:605 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:656 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:657 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にするかどうか指定します" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:667 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:668 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:681 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:682 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:690 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:691 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:701 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:702 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:673 +#: ../midori/midori-websettings.c:710 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:719 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:720 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:728 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:729 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:739 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:740 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:760 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:761 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:781 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:782 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:794 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:603 +#: ../midori/midori-view.c:608 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:888 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:906 +#: ../midori/midori-view.c:911 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:914 +#: ../midori/midori-view.c:919 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:936 +#: ../midori/midori-view.c:941 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1406 +#: ../midori/midori-view.c:1411 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1555 +#: ../midori/midori-view.c:1562 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1586 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1595 +#: ../midori/midori-view.c:1602 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1360,60 +1353,60 @@ msgstr "開発者用特殊エクステンションを有効にします" msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:499 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:505 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:572 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:579 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 +#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "空" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:792 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:792 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:818 +#: ../midori/midori-searchaction.c:820 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-searchaction.c:864 msgid "_Icon (name or file):" msgstr "アイコン名/ファイル(_I):" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:878 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1053 +#: ../midori/midori-searchaction.c:1055 msgid "Manage Search Engines" msgstr "検索エンジンの管理" @@ -1422,7 +1415,7 @@ msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:355 +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" @@ -1457,6 +1450,22 @@ msgstr "有効(_E)" msgid "_Disable" msgstr "無効(_D)" +#: ../panels/midori-bookmarks.c:100 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "選択されたブックマークを編集します" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "選択されたブックマークを削除します" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "セパレータ" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "コンソール" @@ -1465,6 +1474,10 @@ msgstr "コンソール" msgid "Extensions" msgstr "エクステンション" +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "プラグイン" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1492,12 +1505,20 @@ msgstr "ファイルの選択" msgid "Choose folder" msgstr "フォルダの選択" +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "マウスジェスチャ" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "マウスの操作で Midori を制御します" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "ページホルダ" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "ページホルダ(_P)" @@ -1509,9 +1530,8 @@ msgstr "画像" msgid "Scripts" msgstr "スクリプト" -#: ../extensions/statusbar-features.c:52 -msgid "Plugins" -msgstr "プラグイン" +#~ msgid "%" +#~ msgstr "%" #~ msgid "Manage search engines" #~ msgstr "検索エンジンの管理" From 18537ec134b1b47140709c233f11c076f37d1b66 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sun, 1 Feb 2009 19:38:17 +0100 Subject: [PATCH 0716/2970] Always insert completion addresses with a trailing slash --- midori/midori-locationaction.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index bdcfce06..ea95cfdd 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -642,7 +642,11 @@ midori_location_action_iter_insert (MidoriLocationAction* location_action, model = location_action->model; gtk_list_store_insert (GTK_LIST_STORE (model), iter, position); path = gtk_tree_model_get_string_from_iter (model, iter); - g_hash_table_insert (location_action->items, g_strdup (uri), path); + g_hash_table_insert (location_action->items, + g_str_has_suffix (uri, "/") ? + g_strdup (uri) : + g_strconcat (uri, "/", NULL), + path); return FALSE; } From b9da37f8c93421b0218546b944440e21d1748a3b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Feb 2009 20:01:23 +0100 Subject: [PATCH 0717/2970] Update German translation --- po/de.po | 667 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 342 insertions(+), 325 deletions(-) diff --git a/po/de.po b/po/de.po index d6c5c117..53a640b2 100644 --- a/po/de.po +++ b/po/de.po @@ -2,14 +2,14 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Enrico Tröger 2008 -# Christian Dywan 2008 +# Christian Dywan 2008-2009 # msgid "" msgstr "" "Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-19 22:22+0100\n" -"PO-Revision-Date: 2009-01-19 22:24+0100\n" +"POT-Creation-Date: 2009-02-01 19:06+0100\n" +"PO-Revision-Date: 2009-02-01 19:56+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -17,166 +17,166 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../midori.desktop.in.h:2 ../midori/main.c:1864 ../midori/main.c:1966 -#: ../midori/main.c:1975 ../midori/main.c:1986 -#: ../midori/midori-websettings.c:239 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 +#: ../midori/main.c:2065 ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:88 +#: ../midori/main.c:90 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/main.c:89 ../midori/midori-browser.c:3821 +#: ../midori/main.c:91 ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/main.c:90 +#: ../midori/main.c:92 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/main.c:91 +#: ../midori/main.c:93 msgid "_Console" msgstr "_Konsole" -#: ../midori/main.c:92 +#: ../midori/main.c:94 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/main.c:93 +#: ../midori/main.c:95 msgid "_History" msgstr "_Verlauf" -#: ../midori/main.c:94 +#: ../midori/main.c:96 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/main.c:95 +#: ../midori/main.c:97 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/main.c:96 +#: ../midori/main.c:98 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/main.c:97 +#: ../midori/main.c:99 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/main.c:98 +#: ../midori/main.c:100 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/main.c:99 +#: ../midori/main.c:101 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/main.c:100 +#: ../midori/main.c:102 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/main.c:156 +#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:211 +#: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:218 ../midori/main.c:288 +#: ../midori/main.c:220 ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:530 +#: ../midori/main.c:532 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:538 ../midori/main.c:547 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/main.c:569 +#: ../midori/main.c:571 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:601 +#: ../midori/main.c:603 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:655 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:679 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:712 ../midori/main.c:726 +#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:934 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:867 +#: ../midori/main.c:962 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:895 ../midori/main.c:913 +#: ../midori/main.c:991 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1043 ../midori/sokoke.c:531 +#: ../midori/main.c:1121 ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/main.c:1064 ../midori/main.c:1091 ../midori/main.c:1119 +#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1143 ../midori/main.c:1167 +#: ../midori/main.c:1221 ../midori/main.c:1245 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:1188 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/main.c:1229 +#: ../midori/main.c:1312 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1553 +#: ../midori/main.c:1636 msgid "Authentication Required" msgstr "Authentifizierung erforderlich" -#: ../midori/main.c:1569 +#: ../midori/main.c:1652 msgid "" "A username and a password are required\n" "to open this location:" @@ -184,15 +184,15 @@ msgstr "" "Ein Benutzername und ein Kennwort\n" "werden zum Öffnen dieses Ortes benötigt:" -#: ../midori/main.c:1583 +#: ../midori/main.c:1666 msgid "Username" msgstr "Benutzername" -#: ../midori/main.c:1594 +#: ../midori/main.c:1677 msgid "Password" msgstr "Kennwort" -#: ../midori/main.c:1700 +#: ../midori/main.c:1783 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." @@ -200,1034 +200,1031 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1715 +#: ../midori/main.c:1798 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1719 +#: ../midori/main.c:1802 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1724 +#: ../midori/main.c:1807 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1864 +#: ../midori/main.c:1950 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1896 ../midori/gjs.c:514 +#: ../midori/main.c:1982 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1919 +#: ../midori/main.c:2005 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1921 +#: ../midori/main.c:2007 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1923 +#: ../midori/main.c:2009 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1963 +#: ../midori/main.c:2053 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1987 +#: ../midori/main.c:2077 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1989 +#: ../midori/main.c:2079 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:2016 +#: ../midori/main.c:2106 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:2079 +#: ../midori/main.c:2184 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" + +#: ../midori/main.c:2196 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:2094 +#: ../midori/main.c:2211 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2107 +#: ../midori/main.c:2224 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2120 +#: ../midori/main.c:2237 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2132 +#: ../midori/main.c:2249 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:2148 +#: ../midori/main.c:2265 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:328 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:341 +#: ../midori/midori-browser.c:351 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:528 +#: ../midori/midori-browser.c:546 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 +#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:596 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:712 +#: ../midori/midori-browser.c:713 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1302 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2500 +#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2502 +#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2677 -msgid "Separator" -msgstr "Trennlinie" - -#: ../midori/midori-browser.c:2784 +#: ../midori/midori-browser.c:2788 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../midori/midori-browser.c:2790 +#: ../midori/midori-browser.c:2794 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../midori/midori-browser.c:2797 +#: ../midori/midori-browser.c:2801 msgid "Today" msgstr "Heute" -#: ../midori/midori-browser.c:2799 +#: ../midori/midori-browser.c:2803 msgid "Yesterday" msgstr "Gestern" -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2896 +#: ../midori/midori-browser.c:2900 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3029 +#: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3098 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3101 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3104 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3107 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3110 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3112 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3113 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3115 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3116 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3119 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3122 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3124 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3127 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3152 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3136 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3139 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3142 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3145 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3147 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3148 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3150 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3151 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3154 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3155 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3158 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3160 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3161 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3198 +#: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3203 ../midori/midori-view.c:979 +#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3182 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3184 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3185 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3189 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3191 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3200 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3202 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3203 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3227 ../midori/midori-view.c:951 +#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3206 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3235 -msgid "Edit the selected bookmark" -msgstr "Markiertes Lesezeichen bearbeiten" - -#: ../midori/midori-browser.c:3238 -msgid "Delete the selected bookmark" -msgstr "Markiertes Lesezeichen löschen" - -#: ../midori/midori-browser.c:3241 +#: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3216 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3221 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3251 ../midori/midori-searchaction.c:462 +#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3224 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3228 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3231 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3232 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3234 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3236 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3237 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3239 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3240 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3242 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3243 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3246 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3253 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3282 +#: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3287 +#: ../midori/midori-browser.c:3259 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3288 +#: ../midori/midori-browser.c:3260 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3263 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3264 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3267 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3296 +#: ../midori/midori-browser.c:3268 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3299 +#: ../midori/midori-browser.c:3271 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3300 +#: ../midori/midori-browser.c:3272 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3303 +#: ../midori/midori-browser.c:3275 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3276 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3307 +#: ../midori/midori-browser.c:3279 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3280 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3748 +msgid "_Separator" +msgstr "_Trennlinie" + +#: ../midori/midori-browser.c:3755 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3757 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3772 +#: ../midori/midori-browser.c:3781 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:3783 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3793 +#: ../midori/midori-browser.c:3802 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3808 +#: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3823 +#: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3836 +#: ../midori/midori-browser.c:3845 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3838 +#: ../midori/midori-browser.c:3847 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:3961 ../midori/midori-preferences.c:593 +#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 msgid "History" msgstr "Verlauf" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4050 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4071 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4076 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4039 +#: ../midori/midori-browser.c:4081 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4047 +#: ../midori/midori-browser.c:4089 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:4098 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 +#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 +#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:171 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:186 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:187 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:188 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:189 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:190 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:206 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:207 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:208 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:223 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:224 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:225 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:226 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:227 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:242 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:243 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:260 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:261 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:262 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:303 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:312 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:313 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:321 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:322 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:347 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:348 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:357 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:358 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:366 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:367 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:376 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:403 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:412 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:422 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:432 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:451 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:452 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:462 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:477 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:478 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:486 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:495 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:496 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:504 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:505 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:513 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:514 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:522 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:523 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:533 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:534 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:542 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:543 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:552 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:553 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:563 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:564 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:577 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:578 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:587 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:595 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:605 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:656 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:657 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:667 msgid "Accept cookies" msgstr "Profildateien annehmen" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:668 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:681 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:682 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:690 msgid "Maximum cookie age" msgstr "Maximales Alter von Profildateien" -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:691 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:701 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:702 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:673 +#: ../midori/midori-websettings.c:710 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:719 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:720 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:728 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:729 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:739 msgid "Proxy Server" msgstr "Zwischenrechner" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:740 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:760 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:761 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Netz identifiziert werden soll" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:781 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:782 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:794 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:603 +#: ../midori/midori-view.c:608 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:888 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:906 +#: ../midori/midori-view.c:911 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:914 +#: ../midori/midori-view.c:919 msgid "_Download Link destination" msgstr "Verweisziel _herunterladen" -#: ../midori/midori-view.c:936 +#: ../midori/midori-view.c:941 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1406 +#: ../midori/midori-view.c:1411 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1555 +#: ../midori/midori-view.c:1562 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1586 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1595 +#: ../midori/midori-view.c:1602 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1357,60 +1354,60 @@ msgstr "Besondere Erweiterungen für Entwickler einschalten" msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:499 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:505 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:572 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:579 msgid "Web Cookies" msgstr "Netzprofile" -#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 +#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:792 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:792 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:818 +#: ../midori/midori-searchaction.c:820 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-searchaction.c:864 msgid "_Icon (name or file):" msgstr "_Symbol (Name oder Datei):" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:878 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1053 +#: ../midori/midori-searchaction.c:1055 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" @@ -1454,10 +1451,22 @@ msgstr "_Einschalten" msgid "_Disable" msgstr "_Auschalten" -#: ../panels/midori-bookmarks.c:89 +#: ../panels/midori-bookmarks.c:100 msgid "Bookmarks" msgstr "Lesezeichen" +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "Markiertes Lesezeichen bearbeiten" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "Markiertes Lesezeichen löschen" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "Trennlinie" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Konsole" @@ -1466,7 +1475,7 @@ msgstr "Konsole" msgid "Extensions" msgstr "Erweiterungen" -#: ../panels/midori-plugins.c:86 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "Zusatzmodule" @@ -1497,12 +1506,20 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Mausgesten" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Steuere Midori durch Bewegen der Maus" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "Seitenhalter" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "_Seitenhalter" From 81ae0f064f2a927c19457e41fdf0c8526c5fa8bd Mon Sep 17 00:00:00 2001 From: Elega Date: Sun, 1 Feb 2009 22:06:23 +0100 Subject: [PATCH 0718/2970] Update Spanish translation --- AUTHORS | 2 + po/es.po | 1360 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 782 insertions(+), 580 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0934b10e..b403de58 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,7 +29,9 @@ Translations: en_GB: Bastien Nocera en_GB: Abigail Brady es: Miguel Anxo Bouzada + es: Antonio Sanchez es: Christian Dywan + es: Elega et: Kristjan Siimson fi: Elias Julkunen fr: Christian Dywan diff --git a/po/es.po b/po/es.po index 91f7bbae..03bf66b7 100644 --- a/po/es.po +++ b/po/es.po @@ -4,1274 +4,1430 @@ # Miguel Anxo Bouzada 2008 # Antonio Sanchez 2008 # Christian Dywan 2008 +# Elega 2009 # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.0\n" +"Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-11-29 22:13+0100\n" -"Last-Translator: Christian Dywan 2008\n" +"POT-Creation-Date: 2009-02-01 20:25+0100\n" +"PO-Revision-Date: 2009-01-27 01:52-0300\n" +"Last-Translator: Elega \n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 +#: ../midori/main.c:2065 ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:86 +#: ../midori/main.c:90 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 +#: ../midori/main.c:91 ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/main.c:88 +#: ../midori/main.c:92 msgid "_Add Bookmark" msgstr "_Añadir Marcador" -#: ../midori/main.c:89 +#: ../midori/main.c:93 msgid "_Console" msgstr "_Consola" -#: ../midori/main.c:90 +#: ../midori/main.c:94 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/main.c:91 +#: ../midori/main.c:95 msgid "_History" -msgstr "_Histórico" +msgstr "_Historial" -#: ../midori/main.c:92 +#: ../midori/main.c:96 msgid "_Homepage" -msgstr "Página de _inicio" +msgstr "_Página de inicio" -#: ../midori/main.c:93 +#: ../midori/main.c:97 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/main.c:94 +#: ../midori/main.c:98 msgid "User_styles" -msgstr "Estilos de _usuario" +msgstr "_Estilos de usuario" -#: ../midori/main.c:95 +#: ../midori/main.c:99 msgid "New _Tab" -msgstr "Nueva pes_taña" +msgstr "Nueva _pestaña" -#: ../midori/main.c:96 +#: ../midori/main.c:100 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/main.c:97 +#: ../midori/main.c:101 msgid "_Closed Tabs and Windows" -msgstr "Ventanas y pestañas _cerradas" +msgstr "_Pestañas y ventanas cerradas" -#: ../midori/main.c:98 +#: ../midori/main.c:102 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/main.c:143 +#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:220 ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" -msgstr "" +msgstr "Valor de configuración inválido «%s»" #: ../midori/main.c:532 msgid "File not found." -msgstr "No se encuentra el archivo." +msgstr "Archivo no encontrado." #: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." -msgstr "Documento defectuoso" +msgstr "Documento defectuoso." -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:571 #, c-format msgid "Failed to open database: %s\n" -msgstr "Falló a abrir la banco de datos: %s\n" +msgstr "No se ha podido abrir la base de datos: %s\n" + +#: ../midori/main.c:603 +#, fuzzy, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "No se ha podido abrir la base de datos: %s\n" #: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "Falló a borrar elemento del histórico: %s\n" +msgstr "No se ha podido quitar los elementos del historial: %s\n" #: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" -msgstr "Falló a vaciar el histórico: %s\n" +msgstr "No se ha podido vaciar el historial: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" -msgstr "Falló a añadir un elemento al histórico: %s\n" +msgstr "No se ha podido añadir un elemento al historial: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:934 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Falló a eliminar elementos viejos del histórico: %s\n" +msgstr "No se ha podido quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "Falló la escritura." - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Transferencias" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "No se pudo guardar la sesión. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Mostrar la versión del programa" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URIs" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URIs]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, envíe comentarios, sugerencias y problemas a:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Comprobar si existen nuevas versiones en:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "Ninguna nombre de archivo indicado" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Los marcadores no pudieron ser cargados: %s\n" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "No se pudo cargar la sesión: %s\n" - -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "No se pudo cargar la papelera: %s\n" - -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "No se pudo cargar el histórico: %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "Se produjeron los siguientes errores:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "No se pudo guardar el motor de busqueda. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "No se pudieron guardar los marcadores. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "No se pudo guardar la papelera. %s" - -#: ../midori/main.c:1715 +#: ../midori/main.c:962 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 -msgid "Reload the current page" -msgstr "Cargar nuevamente la página actual" +#: ../midori/main.c:991 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "No se pudo guardar los motores de búsqueda. %s" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/main.c:1121 ../midori/sokoke.c:531 +#, c-format +msgid "Writing failed." +msgstr "Falló la escritura." + +#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "No se pudieron guardar los marcadores. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1221 ../midori/main.c:1245 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "No se pudo guardar la papelera. %s" + +#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 +msgid "Transfers" +msgstr "Transferencias" + +#: ../midori/main.c:1312 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "No se pudo guardar la sesión. %s" + +#: ../midori/main.c:1636 +msgid "Authentication Required" +msgstr "Se requiere autentificación" + +#: ../midori/main.c:1652 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Nombre de usuario y contraseña son requeridos\n" +"para abrir ésta ubicación:" + +#: ../midori/main.c:1666 +msgid "Username" +msgstr "Nombre de usuario" + +#: ../midori/main.c:1677 +msgid "Password" +msgstr "Contraseña" + +#: ../midori/main.c:1783 +msgid "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." +msgstr "" +"Parece que Midori se cerró insperadamente la última vez. Si esto sucede " +"repetidamente, pruebe una de las siguientes opciones para resolver el " +"problema." + +#: ../midori/main.c:1798 +msgid "Modify _preferences" +msgstr "Modificar _preferencias" + +#: ../midori/main.c:1802 +msgid "Reset the last _session" +msgstr "Restaurar la última _sesión" + +#: ../midori/main.c:1807 +msgid "Disable all _extensions" +msgstr "Deshabilitar todas las _extensiones" + +#: ../midori/main.c:1950 +msgid "No filename specified" +msgstr "No se especificó el nombre del archivo" + +#: ../midori/main.c:1982 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Se produjo un error desconocido." + +#: ../midori/main.c:2005 +msgid "Run the specified filename as javascript" +msgstr "Ejecute el nombre de archivo especificado como javascript" + +#: ../midori/main.c:2007 +msgid "Display program version" +msgstr "Mostrar la versión del programa" + +#: ../midori/main.c:2009 +msgid "Addresses" +msgstr "Direcciones" + +#: ../midori/main.c:2053 +msgid "[Addresses]" +msgstr "[Direcciones]" + +#: ../midori/main.c:2077 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor envíe comentarios, sugerencias y errores a:" + +#: ../midori/main.c:2079 +msgid "Check for new versions at:" +msgstr "Buscar nuevas versiones en:" + +#: ../midori/main.c:2106 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" + +#: ../midori/main.c:2184 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "No se pudieron cargar los motores de búsqueda. %s\n" + +#: ../midori/main.c:2196 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Los marcadores no pudieron ser cargados: %s\n" + +#: ../midori/main.c:2211 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "No se pudo cargar la sesión: %s\n" + +#: ../midori/main.c:2224 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "No se pudo cargar la papelera: %s\n" + +#: ../midori/main.c:2237 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "No se pudo cargar el historial: %s\n" + +#: ../midori/main.c:2249 +msgid "The following errors occured:" +msgstr "Se produjeron los siguientes errores:" + +#: ../midori/main.c:2265 +msgid "_Ignore" +msgstr "_Ignorar" + +#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 +msgid "Reload the current page" +msgstr "Recargar la página actual" + +#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "Detener la carga de la página" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:328 #, c-format msgid "%d%% loaded" -msgstr "%d%% cargada" +msgstr "%d%% cargado" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:351 #, c-format msgid "Unexpected action '%s'." -msgstr "Acción no esperada «%s»" +msgstr "Acción inesperada «%s»." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:524 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:524 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:546 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 msgid "_Description:" -msgstr "_Descripción" +msgstr "_Descripción:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 +msgid "_Address:" +msgstr "_Dirección:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:596 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Raíz" +#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 +msgid "Toplevel folder" +msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:713 msgid "Save file as" -msgstr "Guardar archivo en" +msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1302 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:2601 -msgid "Separator" -msgstr "Separador" - -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:2788 #, c-format msgid "A week ago" msgstr "Hace una semana" -#: ../midori/midori-browser.c:2718 +#: ../midori/midori-browser.c:2794 #, c-format msgid "%d days ago" msgstr "Hace %d días" -#: ../midori/midori-browser.c:2725 +#: ../midori/midori-browser.c:2801 msgid "Today" msgstr "Hoy" -#: ../midori/midori-browser.c:2727 +#: ../midori/midori-browser.c:2803 msgid "Yesterday" msgstr "Ayer" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2900 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" "Antonio Sanchez \n" -"Christian Dywan " +"Christian Dywan \n" +"Elega " -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" msgstr "" +"¿Estás seguro de que quieres quitar todos los elementos del historial?" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3098 msgid "_File" -msgstr "_Fichero" +msgstr "_Archivo" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3101 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3104 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3107 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3110 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3112 msgid "_Close Tab" -msgstr "Cerrar _pestaña" +msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3113 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3115 msgid "C_lose Window" -msgstr "_Cerrar la ventana" +msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3116 msgid "Close this window" msgstr "Cerrar esta ventana" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3119 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3122 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3124 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3127 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3136 msgid "Paste text from the clipboard" -msgstr "Pegar el texto seleccionado al portapapeles" +msgstr "Pegar texto del portapapeles" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3139 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3142 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3145 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3147 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3148 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "Buscar la siguiente aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3150 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3151 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Buscar la anterior aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3154 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3155 msgid "Quickly jump to a word or phrase" -msgstr "" +msgstr "Saltar rápidamente a una palabra o una frase" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3158 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3160 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3161 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" -msgstr "" +msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" -msgstr "" +msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" -msgstr "" +msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 +#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 msgid "View _Source" -msgstr "Mostrar _código fuente" +msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3182 msgid "View the source code of the page" -msgstr "Mostrar el código fuente de la página" +msgstr "Ver el código fuente de la página" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3184 msgid "View Selection Source" -msgstr "Mostrar código fuente de la seleccionada" +msgstr "Ver código fuente de la selección" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3185 msgid "View the source code of the selection" -msgstr "Mostrar el código fuente de la seleccionada" +msgstr "Ver el código fuente de la selección" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3189 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3191 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" -msgstr "Ir a la última pagina" +msgstr "Retroceder una página" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" -msgstr "Ir a la siguiente pagina" +msgstr "Avanzar una página" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3200 msgid "Go to your homepage" -msgstr "Ir a la página de inicio" +msgstr "Abrir página de inicio" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3202 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3203 msgid "Delete the contents of the trash" -msgstr "Borrar el conenido de la papelera" +msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3206 msgid "Open the last closed tab" -msgstr "" +msgstr "Abrir la última pestaña cerrada" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3179 -msgid "Edit the selected bookmark" -msgstr "Editar el marcador seleccionado" - -#: ../midori/midori-browser.c:3182 -msgid "Delete the selected bookmark" -msgstr "Borrar el marcador seleccionado" - -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" -msgstr "Borrar el elemento seleccionado del histórico" +msgstr "Borrar del historial el elemento seleccionado" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3216 msgid "Clear the entire history" -msgstr "Vaciar el histórico completo" +msgstr "Vaciar el historial completo" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" -msgstr "Añadir un marcador pour el elemento seleccionado del histórico" +msgstr "Añadir a marcadores el elemento seleccionado del historial" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3221 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" -msgstr "_Gestionar los motores de busqueda" +msgstr "_Administrar los motores de búsqueda" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3224 msgid "Add, edit and remove search engines..." -msgstr "Añadir, editar o eliminar motores de busqueda..." +msgstr "Añadir, editar y quitar motores de búsqueda..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3228 msgid "_Previous Tab" -msgstr "Pestaña _anterior" +msgstr "_Pestaña anterior" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3231 msgid "_Next Tab" -msgstr "Pestaña _siguiente" +msgstr "_Pestaña siguiente" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3232 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3234 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3236 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3237 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3239 +msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3240 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" -msgstr "_Reportar un probléma" +#: ../midori/midori-browser.c:3242 +msgid "_Report a Bug" +msgstr "_Reportar un error" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3243 msgid "Open Midori's bug tracker" -msgstr "Abrir el perseguidor de problemas de Midori" +msgstr "Abrir el rastreador de errores de Midori" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3246 msgid "Show information about the program" -msgstr "Mostrar informationes sobre el programa" +msgstr "Mostrar información sobre el programa" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3253 msgid "P_rivate Browsing" -msgstr "Navegación p_rivada" +msgstr "_Navegación privada" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" -msgstr "No guardar datos privados mientras de la navegación" +msgstr "No guardar datos durante la navegación privada" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3259 msgid "_Menubar" -msgstr "Barra del _menú" +msgstr "_Barra de menú" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3260 msgid "Show menubar" -msgstr "Mostrar barra del menu" +msgstr "Mostrar la barra de menú" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3263 msgid "_Navigationbar" -msgstr "Barra de _navegación" +msgstr "_Barra de navegación" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3264 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3267 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3268 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3271 msgid "_Bookmarkbar" -msgstr "Barra de _marcadores" +msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3272 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3275 msgid "_Transferbar" -msgstr "Barra de _transferencias" +msgstr "_Barra de transferencias" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3276 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3279 msgid "_Statusbar" -msgstr "Barra de es_tado" +msgstr "_Barra de estado" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3280 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3748 +msgid "_Separator" +msgstr "_Separador" + +#: ../midori/midori-browser.c:3755 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3757 msgid "Open a particular location" -msgstr "Abrir un lugar específico" +msgstr "Abrir un lugar" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3781 msgid "_Web Search..." -msgstr "Buscar en la _red..." +msgstr "_Buscar en la red..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3783 msgid "Run a web search" -msgstr "" +msgstr "Realizar una búsqueda en la red" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3802 msgid "Reopen a previously closed tab or window" msgstr "Volver a abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "Vuelve a abrir las páginas que usted visitó anteriormente" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" -msgstr "Mostrar los marcadores guardos." +msgstr "Mostrar los marcadores guardados." -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3845 msgid "_Window" msgstr "_Ventana" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3847 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pesañas abiertas" -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Marcadores" - -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 msgid "History" -msgstr "Histórico" +msgstr "Historial" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4050 +msgid "_Inline Find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:4004 -msgid "Match Case" -msgstr "Sensible a mayúsculas" - -#: ../midori/midori-browser.c:4012 -msgid "Highlight Matches" +#: ../midori/midori-browser.c:4071 +msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4021 -msgid "Close Findbar" -msgstr "Cerrar barra de busquedas" +#: ../midori/midori-browser.c:4076 +msgid "Next" +msgstr "" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4081 +msgid "Match Case" +msgstr "Sensible mayúsculas " + +#: ../midori/midori-browser.c:4089 +msgid "Highlight Matches" +msgstr "Destacar coincidencias" + +#: ../midori/midori-browser.c:4098 +msgid "Close Findbar" +msgstr "Cerrar la barra de búsqueda" + +#: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 msgid "Close panel" -msgstr "Cerrar el panel" +msgstr "Cerrar panel" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 msgid "Blank page" -msgstr "Página vacía" +msgstr "Página en blanco" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:171 msgid "Last open pages" -msgstr "Páginas abiertas recientemente" +msgstr "Últimas páginas visitadas" -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-websettings.c:186 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" -#: ../midori/midori-websettings.c:149 +#: ../midori/midori-websettings.c:187 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-websettings.c:188 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:189 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-websettings.c:190 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 +#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:206 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:207 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:208 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:223 msgid "Default" -msgstr "Predeterminada" +msgstr "Predeterminado" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:224 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:225 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:226 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:227 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:242 msgid "All cookies" msgstr "Todas las galletas" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:243 msgid "Session cookies" -msgstr "Las galletas de esta sesión" +msgstr "Galletas de la sesión" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 msgid "None" msgstr "Ninguna" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:260 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:261 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:262 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:303 msgid "Remember last window size" -msgstr "Recordar último tamaño de ventana" +msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" -msgstr "Guardar (o no) el último tamaño de ventana" +msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:312 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:313 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:321 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:322 msgid "The last saved window height" -msgstr "Última altura de la ventana guardada" +msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:347 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:348 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:357 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:358 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:366 msgid "Last Web search" -msgstr "Última busqueda en la red" +msgstr "Última búsqueda en la red" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:367 msgid "The last saved Web search" -msgstr "Última busqueda en la red guardada" +msgstr "Última búsqueda red guardada" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:376 msgid "Show Menubar" -msgstr "Mostrar barra del menú" +msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" -msgstr "Mostrar (o no) la barra de menú" +msgstr "Si se desea mostrar la barra de menú" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" -msgstr "Mostrar (o no) la barra de navegación" +msgstr "Si se desea mostrar la barra de navegación" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" -msgstr "Mostrar (o no) la barra de marcadores" +msgstr "Si se desea mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:403 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" -msgstr "Mostrar (o no) el panel" +msgstr "Si se desea mostrar el panel" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:412 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" -msgstr "Mostrar (o no) la barra de estado" +msgstr "Si se desea mostrar la barra de estado" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:422 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" -msgstr "El estilo de la barra de herramientas" +msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:432 msgid "Toolbar Items" -msgstr "Elementos de herramientas" +msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" -msgstr "Hacer (o no) el panel compacto" +msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:451 msgid "Load on Startup" -msgstr "Cargar al inicio" +msgstr "Al iniciar Midor cargar:" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:452 msgid "What to load on startup" -msgstr "Qué cargar en el inicio" +msgstr "Página que se carga al inicio" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:462 msgid "The homepage" -msgstr "La página de inicio" +msgstr "Página de inicio" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:477 +msgid "Show crash dialog" +msgstr "" + +#: ../midori/midori-websettings.c:478 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#: ../midori/midori-websettings.c:486 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" -msgstr "La carpeta de descargas fue guardada en" +msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:495 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:496 msgid "An external download manager" -msgstr "Un gestor de descargas externo" +msgstr "Gestor de descargas externo" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:504 msgid "Text Editor" -msgstr "Editor de textos" +msgstr "Editor de texto" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:505 msgid "An external text editor" -msgstr "Un editor de textos externo" +msgstr "Editor de textos externo" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:513 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:514 msgid "The search to perform inside the location entry" -msgstr "Hacer una busqueda a partir del contenido de la barra de direcciones" +msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:522 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:523 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:533 msgid "Always Show Tabbar" -msgstr "Siempre mostrar barra de pestañas" +msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:534 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:542 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:543 msgid "Whether tabs have close buttons" -msgstr "Cada una de las pestañas tendrá su botón para cerrarla" +msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:552 msgid "Open new pages in" -msgstr "Abrir las páginas nuevas en" +msgstr "Abrir páginas nuevas en" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:553 msgid "Where to open new pages" -msgstr "Donde se van a abrir las páginas nuevas" +msgstr "Donde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:563 msgid "Open external pages in" msgstr "Abrir las páginas externas en" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:564 msgid "Where to open externally opened pages" -msgstr "Donde se van a abrir las páginas externas" +msgstr "Donde abrir las páginas externas" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:577 msgid "Middle click opens Selection" -msgstr "Clic medio abre la selección" +msgstr "Clic del medio abre la selección" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "Cargar una URL en la selección empleando el botón del medio del ratón" +#: ../midori/midori-websettings.c:578 +msgid "Load an address from the selection via middle click" +msgstr "" +"Cargar una dirección desde la selección a través del botón del medio del " +"ratón" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:587 msgid "Whether to open new tabs in the background" -msgstr "Abrir (o no) las pestañas nuevas en segundo plano" +msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:595 msgid "Open Tabs next to Current" -msgstr "Abrir pestañas a lado de la actual" +msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Abrir las pestañas nuevas al lado de la pestaña actual o la última" +msgstr "" +"Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o " +"después de la última" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:605 msgid "Whether to open popup windows in tabs" -msgstr "Abrir (o no) las ventanas emergentes en pestañas" +msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:656 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:657 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:667 msgid "Accept cookies" -msgstr "Aceptar las galletas" +msgstr "Aceptar galletas" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:668 msgid "What type of cookies to accept" msgstr "Qué tipos de galletas van a ser aceptadas" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:681 msgid "Original cookies only" -msgstr "Solo las galletas del sitio original" +msgstr "Sólo galletas originales" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:682 msgid "Accept cookies from the original website only" -msgstr "Solo se aceptan las galletas del sitio de origen" +msgstr "Sólo se aceptan las galletas del sitio red original" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:690 msgid "Maximum cookie age" -msgstr "Persistencia máxima de las galletas" +msgstr "Duración máxima de las galletas" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:691 msgid "The maximum number of days to save cookies for" -msgstr "Tiempo máximo, en días, durante los que se guardaran las galletas" +msgstr "Número máximo de días para conservar las galletas" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:701 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:702 msgid "Whether the last visited pages are saved" -msgstr "Recordar (o no) las últimas páginas que fueron visitadas" +msgstr "Si se desea que las últimas páginas visitadas sean recordadas" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:710 msgid "Maximum history age" -msgstr "Persistencia máxima del histórico" +msgstr "Duración máxima del historial" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save the history for" -msgstr "" -"Tiempo máximo, en días, durante los que se guardará un dato del histórico" +msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:719 msgid "Remember last form inputs" -msgstr "Recordar las últimas sesiones de formularios" +msgstr "Recordar lo que se haya ingresado en formularios" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:720 msgid "Whether the last form inputs are saved" -msgstr "Recordar (o no) las últimas sesiones con sus datos de formularios" +msgstr "Si se desea que las últimas entradas de formulario sean recordadas" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:728 msgid "Remember last downloaded files" -msgstr "Recordar últimos ficheros descargados" +msgstr "Recordar los últimos archivos descargados" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:729 msgid "Whether the last downloaded files are saved" -msgstr "" -"Recordar (o no) la lista de descargas de ficheros realizadas últimamente" +msgstr "Si se desea que los archivos descargados sean recordados" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "Servidor proxy HTTP" +#: ../midori/midori-websettings.c:739 +msgid "Proxy Server" +msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "Servidor proxy para conexiones HTTP" +#: ../midori/midori-websettings.c:740 +msgid "The proxy server used for HTTP connections" +msgstr "Servidor proxy utilizado para conexiones HTTP" -#: ../midori/midori-websettings.c:614 +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:760 +msgid "Identify as" +msgstr "Identificar como:" + +#: ../midori/midori-websettings.c:761 +msgid "What to identify as to web pages" +msgstr "Identificar como páginas red" + +#: ../midori/midori-websettings.c:781 +msgid "Identification string" +msgstr "Cadena de identificación" + +#: ../midori/midori-websettings.c:782 +msgid "The application identification string" +msgstr "Aplicación de identificación de cadenas" + +#: ../midori/midori-websettings.c:794 msgid "Cache size" -msgstr "Tamaño de la caché" +msgstr "Tamaño del caché" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:608 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "No se ha encontrado - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:888 msgid "Open Link in New _Tab" -msgstr "Abrir el enlace en una pestaña _nueva" +msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:911 msgid "_Save Link destination" -msgstr "_Guardar el destino del enlace" +msgstr "_Guardar enlace" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:919 msgid "_Download Link destination" -msgstr "_Descargar el destino del enlace" +msgstr "_Descargar enlace" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Abrir la URL en una pestaña _nueva" +#: ../midori/midori-view.c:941 +msgid "Open Address in New _Tab" +msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1411 #, c-format msgid "Inspect page - %s" -msgstr "Examinar la pagina - %s" +msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1562 msgid "Source" msgstr "Código fuente" -#: ../midori/midori-view.c:1527 -#, fuzzy, c-format -msgid "No documentation installed" -msgstr "Mostrar la documentación" +#: ../midori/midori-view.c:1586 +#, c-format +msgid "Document cannot be displayed" +msgstr "" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-view.c:1602 +#, c-format +msgid "No documentation installed" +msgstr "No se dispone de documentación instalada" + +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Preferencias de %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "Inicio" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "Apariencia" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:423 msgid "Font settings" -msgstr "Ajustes de las fuentes" +msgstr "Configuración de las fuentes" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" -msgstr "Fuente estándar" +msgstr "Fuente por defecto" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:431 +msgid "The default font size used to display text" +msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto" + +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" -msgstr "Tamaño de fuente mínimo" +msgstr "Tamaño mínimo de fuente" + +#: ../midori/midori-preferences.c:437 +msgid "The minimum font size used to display text" +msgstr "Mínimo tamaño de fuente utilizado para mostrar texto" + +#: ../midori/midori-preferences.c:444 +msgid "Encoding" +msgstr "Codificación" + +#: ../midori/midori-preferences.c:447 +msgid "The character encoding to use by default" +msgstr "Codificación de caracteres a utilizar por defecto" #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:455 msgid "Features" -msgstr "Funcionalidades" +msgstr "Características" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 msgid "Load images automatically" -msgstr "Cargar imagenes automáticamente" +msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:459 +msgid "Load and display images automatically" +msgstr "Cargar y mostrar imágenes automáticamente" + +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" -msgstr "Reducir imagenes automáticamente" +msgstr "Reducir imágenes automáticamente" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:463 +msgid "Automatically shrink standalone images to fit" +msgstr "Reducir imágenes automáticamente independientemente si caben" + +#: ../midori/midori-preferences.c:466 msgid "Print background images" -msgstr "Imprimir imagenes de trasfondo" +msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:467 +msgid "Whether background images should be printed" +msgstr "Si se desea imprimir las imágenes de fondo" + +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" -msgstr "Pido agrandar los campos de textos" +msgstr "Áreas de texto dimensionables" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:471 +msgid "Whether text areas are resizable" +msgstr "Si se desea que las áreas de texto sean dimensionables" + +#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 msgid "Enable scripts" -msgstr "Activar guiónes" +msgstr "Habilitar scripts" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:475 +msgid "Enable embedded scripting languages" +msgstr "Habilitar script de lenguajes embebidos" + +#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 msgid "Enable plugins" -msgstr "Activar complementos" +msgstr "Habilitar complementos" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:479 +msgid "Enable embedded plugin objects" +msgstr "Habilitar el complemento de objetos embebidos" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce 96 dots per inch" +msgstr "Aplicar 96 puntos por pulgada" + +#: ../midori/midori-preferences.c:483 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Aplicar una densidad de puntos de video de 96 DPI" + +#: ../midori/midori-preferences.c:486 msgid "Enable developer tools" -msgstr "Activar accesorios de desarrolladores" +msgstr "Habilitar herramientas desarrollado" + +#: ../midori/midori-preferences.c:487 +msgid "Enable special extensions for developers" +msgstr "Habilitar extensiones especiales para desarrolladores" #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:499 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:505 msgid "Browsing" msgstr "Navegación" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:572 msgid "Privacy" -msgstr "Esfera privada" +msgstr "Privacidad" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:579 msgid "Web Cookies" -msgstr "Galletas red" +msgstr "Galletas de informacion" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 msgid "days" -msgstr "dias" +msgstr "días" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:792 msgid "Add search engine" msgstr "Añadir un motor de búsqueda" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:792 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:820 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-searchaction.c:864 msgid "_Icon (name or file):" -msgstr "_Icono (nombre o fichero):" +msgstr "_Icono (nombre o archivo):" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:878 msgid "_Token:" -msgstr "_Abreviatura" +msgstr "_Abreviatura:" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" -msgstr "Gestionar los motores de busqueda" +#: ../midori/midori-searchaction.c:1055 +msgid "Manage Search Engines" +msgstr "Administrar los motores de búsqueda" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." -#: ../midori/sokoke.c:282 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" -msgstr "Aviso: Estás conectado como super usuario!" - -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Se produjo un error desconocido." +msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format @@ -1286,24 +1442,40 @@ msgstr "%s no puede ser asignado a %s.%s" #: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" -msgstr "%s.%s non se puede accede" +msgstr "%s.%s no se puede acceder" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activar" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Desactivar" +#: ../panels/midori-bookmarks.c:100 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "Editar el marcador seleccionado" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "Borrar el marcador seleccionado" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "Separador" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Consola" @@ -1312,51 +1484,79 @@ msgstr "Consola" msgid "Extensions" msgstr "Extensiones" +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "Complementos" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "No se pudo cargar el icono nombrado «%s»" +msgstr "No se pudo cargar el ícono llamado «%s»" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "No se pudo cargar el icono stock «%s»" +msgstr "No se pudo cargar el ícono stock «%s»" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "" +msgstr "Los cuadros de animación estan rotos" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" -msgstr "Escoger un fichero" +msgstr "Elegir archivo" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:229 msgid "Choose folder" -msgstr "Escoger una carpeta" +msgstr "Elegir carpeta" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 msgid "Pageholder" -msgstr "Cuadro de páginas" +msgstr "Anclar página" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" -msgstr "Cu_adro de páginas" +msgstr "_Anclar página" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" -msgstr "" +msgstr "Imágenes" -#: ../extensions/statusbar-features.c:37 -#, fuzzy +#: ../extensions/statusbar-features.c:45 msgid "Scripts" -msgstr "Scripts de usuario" +msgstr "Scripts" -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "" +#~ msgid "Manage search engines" +#~ msgstr "Administrar los motores de búsqueda" + +#~ msgid "URIs" +#~ msgstr "URIs" + +#~ msgid "[URIs]" +#~ msgstr "[URIs]" + +#~ msgid "_URL:" +#~ msgstr "_URL " + +#~ msgid "Root" +#~ msgstr "Raíz" + +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP Proxy" + +#~ msgid "Open URL in New _Tab" +#~ msgstr "Abrir URL en una pestaña _nueva" From ddef47a205f5d12797d11038648d186c69019c9e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Feb 2009 22:38:14 +0100 Subject: [PATCH 0719/2970] Update British English translation --- po/en_GB.po | 801 ++++++++++++++++++++++++++++------------------------ 1 file changed, 433 insertions(+), 368 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index dff3f95e..cec5fe2b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.1\n" +"Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-04 19:06+0100\n" +"POT-Creation-Date: 2009-02-01 20:25+0100\n" "PO-Revision-Date: 2008-11-29 23:39+0100\n" "Last-Translator: Abigail Brady \n" "Language-Team: British English \n" @@ -16,1183 +16,1220 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Lightweight web browser" -#: ../midori.desktop.in.h:2 ../midori/main.c:1828 ../midori/main.c:1919 -#: ../midori/main.c:1928 ../midori/main.c:1939 -#: ../midori/midori-websettings.c:235 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 +#: ../midori/main.c:2065 ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Web Browser" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "_Bookmark" msgstr "_Bookmark" -#: ../midori/main.c:88 ../midori/midori-browser.c:3797 +#: ../midori/main.c:91 ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "_Bookmarks" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "_Add Bookmark" msgstr "_Add Bookmark" -#: ../midori/main.c:90 +#: ../midori/main.c:93 msgid "_Console" msgstr "_Console" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/main.c:92 +#: ../midori/main.c:95 msgid "_History" msgstr "_History" -#: ../midori/main.c:93 +#: ../midori/main.c:96 msgid "_Homepage" msgstr "_Homepage" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "_Userscripts" msgstr "_Userscripts" -#: ../midori/main.c:95 +#: ../midori/main.c:98 msgid "User_styles" msgstr "User_styles" -#: ../midori/main.c:96 +#: ../midori/main.c:99 msgid "New _Tab" msgstr "New _Tab" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "_Transfers" msgstr "_Transfers" -#: ../midori/main.c:98 +#: ../midori/main.c:101 msgid "_Closed Tabs and Windows" msgstr "_Closed Tabs and Windows" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "New _Window" msgstr "New _Window" -#: ../midori/main.c:155 +#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "The configuration couldn't be loaded: %s\n" -#: ../midori/main.c:210 +#: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Value '%s' is invalid for %s" -#: ../midori/main.c:217 ../midori/main.c:287 +#: ../midori/main.c:220 ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" msgstr "Invalid configuration value '%s'" -#: ../midori/main.c:529 +#: ../midori/main.c:532 msgid "File not found." msgstr "File not found." -#: ../midori/main.c:537 ../midori/main.c:546 +#: ../midori/main.c:540 ../midori/main.c:549 msgid "Malformed document." msgstr "Malformed document." -#: ../midori/main.c:568 ../midori/main.c:600 +#: ../midori/main.c:571 #, c-format msgid "Failed to open database: %s\n" msgstr "Failed to open database: %s\n" -#: ../midori/main.c:654 +#: ../midori/main.c:603 +#, fuzzy, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Failed to open database: %s\n" + +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Failed to remove history item: %s\n" -#: ../midori/main.c:678 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Failed to clear history: %s\n" -#: ../midori/main.c:711 ../midori/main.c:725 +#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" msgstr "Failed to add history item: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:841 +#: ../midori/main.c:934 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Failed to remove old history items: %s\n" -#: ../midori/main.c:869 +#: ../midori/main.c:962 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "The configuration couldn't be saved. %s" -#: ../midori/main.c:897 ../midori/main.c:915 +#: ../midori/main.c:991 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "The search engines couldn't be saved. %s" -#: ../midori/main.c:1045 ../midori/sokoke.c:523 +#: ../midori/main.c:1121 ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "Writing failed." -#: ../midori/main.c:1075 ../midori/main.c:1100 +#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "The bookmarks couldn't be saved. %s" -#: ../midori/main.c:1123 ../midori/main.c:1147 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1221 ../midori/main.c:1245 #, c-format msgid "The trash couldn't be saved. %s" msgstr "The wastebasket couldn't be saved. %s" -#: ../midori/main.c:1168 ../midori/midori-preferences.c:381 +#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "Transfers" -#: ../midori/main.c:1204 +#: ../midori/main.c:1312 #, c-format msgid "The session couldn't be saved. %s" msgstr "The session couldn't be saved. %s" -#: ../midori/main.c:1530 +#: ../midori/main.c:1636 msgid "Authentication Required" msgstr "Authentication Required" -#: ../midori/main.c:1546 +#: ../midori/main.c:1652 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"A username and a password are required\n" +"to open this location:" -#: ../midori/main.c:1560 +#: ../midori/main.c:1666 msgid "Username" msgstr "Username" -#: ../midori/main.c:1571 +#: ../midori/main.c:1677 msgid "Password" msgstr "Password" -#: ../midori/main.c:1675 +#: ../midori/main.c:1783 msgid "" "Midori seems to have crashed after it was opened for the last time. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" +"Midori seems to have crashed after it was opened for the last time. If this " +"happend repeatedly, try one of the following options to solve the problem." -#: ../midori/main.c:1690 +#: ../midori/main.c:1798 msgid "Modify _preferences" msgstr "Modify _preferences" -#: ../midori/main.c:1694 +#: ../midori/main.c:1802 msgid "Reset the last _session" msgstr "Reset the last _session" -#: ../midori/main.c:1699 +#: ../midori/main.c:1807 msgid "Disable all _extensions" msgstr "Disable all _extensions" -#: ../midori/main.c:1828 +#: ../midori/main.c:1950 msgid "No filename specified" msgstr "No filename specified" -#: ../midori/main.c:1857 ../midori/gjs.c:514 +#: ../midori/main.c:1982 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "An unknown error occured." -#: ../midori/main.c:1880 +#: ../midori/main.c:2005 msgid "Run the specified filename as javascript" msgstr "Run the specified filename as javascript" -#: ../midori/main.c:1882 +#: ../midori/main.c:2007 msgid "Display program version" msgstr "Display program version" -#: ../midori/main.c:1884 +#: ../midori/main.c:2009 msgid "Addresses" msgstr "Addresses" -#: ../midori/main.c:1916 +#: ../midori/main.c:2053 msgid "[Addresses]" msgstr "[Addresses]" -#: ../midori/main.c:1940 +#: ../midori/main.c:2077 msgid "Please report comments, suggestions and bugs to:" msgstr "Please report comments, suggestions and bugs to:" -#: ../midori/main.c:1942 +#: ../midori/main.c:2079 msgid "Check for new versions at:" msgstr "Check for new versions at:" -#: ../midori/main.c:1965 -#, c-format +#: ../midori/main.c:2106 msgid "An instance of Midori is already running but not responding.\n" msgstr "An instance of Midori is already running but not responding.\n" -#: ../midori/main.c:2024 +#: ../midori/main.c:2184 +#, fuzzy, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "The search engines couldn't be saved. %s" + +#: ../midori/main.c:2196 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "The bookmarks couldn't be loaded: %s\n" -#: ../midori/main.c:2039 +#: ../midori/main.c:2211 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "The session couldn't be loaded: %s\n" -#: ../midori/main.c:2052 +#: ../midori/main.c:2224 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "The wastebasket couldn't be loaded: %s\n" -#: ../midori/main.c:2065 +#: ../midori/main.c:2237 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "The history couldn't be loaded: %s\n" -#: ../midori/main.c:2077 +#: ../midori/main.c:2249 msgid "The following errors occured:" msgstr "The following errors occured:" -#: ../midori/main.c:2093 +#: ../midori/main.c:2265 msgid "_Ignore" msgstr "_Ignore" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3155 -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 msgid "Reload the current page" msgstr "Reload the current page" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "Stop loading the current page" -#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:328 #, c-format msgid "%d%% loaded" msgstr "%d%% loaded" -#: ../midori/midori-browser.c:341 +#: ../midori/midori-browser.c:351 #, c-format msgid "Unexpected action '%s'." msgstr "Unexpected action '%s'." -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "New bookmark" msgstr "New bookmark" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "Edit bookmark" msgstr "Edit bookmark" -#: ../midori/midori-browser.c:528 +#: ../midori/midori-browser.c:546 msgid "_Title:" msgstr "_Title:" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 msgid "_Description:" msgstr "_Description:" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:882 +#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 msgid "_Address:" msgstr "_Address:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:596 msgid "_Folder:" msgstr "_Folder:" -#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 msgid "Toplevel folder" msgstr "Toplevel folder" -#: ../midori/midori-browser.c:712 +#: ../midori/midori-browser.c:713 msgid "Save file as" msgstr "Save file as" -#: ../midori/midori-browser.c:1292 +#: ../midori/midori-browser.c:1302 msgid "Open file" msgstr "Open file" -#: ../midori/midori-browser.c:2369 +#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "Open in New _Tab" -#: ../midori/midori-browser.c:2371 +#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "Open in New _Window" -#: ../midori/midori-browser.c:2646 -msgid "Separator" -msgstr "Separator" - -#: ../midori/midori-browser.c:2757 +#: ../midori/midori-browser.c:2788 #, c-format msgid "A week ago" msgstr "A week ago" -#: ../midori/midori-browser.c:2763 +#: ../midori/midori-browser.c:2794 #, c-format msgid "%d days ago" msgstr "%d days ago" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2801 msgid "Today" msgstr "Today" -#: ../midori/midori-browser.c:2772 +#: ../midori/midori-browser.c:2803 msgid "Yesterday" msgstr "Yesterday" -#: ../midori/midori-browser.c:2861 +#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "A lightweight web browser." -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:2900 msgid "translator-credits" msgstr "" "Bastien Nocera \n" "Abigail Brady " -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" msgstr "Are you sure you want to remove all history items?" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3098 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:3092 +#: ../midori/midori-browser.c:3101 msgid "Open a new window" msgstr "Open a new window" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3104 msgid "Open a new tab" msgstr "Open a new tab" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3107 msgid "Open a file" msgstr "Open a file" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3110 msgid "Save to a file" msgstr "Save to a file" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3112 msgid "_Close Tab" msgstr "_Close Tab" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3113 msgid "Close the current tab" msgstr "Close the current tab" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3115 msgid "C_lose Window" msgstr "C_lose Window" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3116 msgid "Close this window" msgstr "Close this window" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3119 msgid "Print the current page" msgstr "Print the current page" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3122 msgid "Quit the application" msgstr "Quit the application" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3124 msgid "_Edit" msgstr "_Edit" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3127 msgid "Cut the selected text" msgstr "Cut the selected text" -#: ../midori/midori-browser.c:3121 ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "Copy the selected text" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3136 msgid "Paste text from the clipboard" msgstr "Paste text from the clipboard" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3139 msgid "Delete the selected text" msgstr "Delete the selected text" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3142 msgid "Select all text" msgstr "Select all text" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3145 msgid "Find a word or phrase in the page" msgstr "Find a word or phrase in the page" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3147 msgid "Find _Next" msgstr "Find _Next" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3148 msgid "Find the next occurrence of a word or phrase" msgstr "Find the next occurrence of a word or phrase" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3150 msgid "Find _Previous" msgstr "Find _Previous" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3151 msgid "Find the previous occurrence of a word or phrase" msgstr "Find the previous occurrence of a word or phrase" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3154 msgid "_Quick Find" msgstr "_Quick Find" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3155 msgid "Quickly jump to a word or phrase" msgstr "Quickly jump to a word or phrase" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3158 msgid "Configure the application preferences" msgstr "Configure the application preferences" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3160 msgid "_View" msgstr "_View" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3161 msgid "_Toolbars" msgstr "_Toolbars" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" msgstr "Increase the zoom level" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" msgstr "Decrease the zoom level" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" msgstr "Reset the zoom level" -#: ../midori/midori-browser.c:3172 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 msgid "View _Source" msgstr "View _Source" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3182 msgid "View the source code of the page" msgstr "View the source code of the page" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3184 msgid "View Selection Source" msgstr "View Selection Source" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3185 msgid "View the source code of the selection" msgstr "View the source code of the selection" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3189 msgid "Toggle fullscreen view" msgstr "Toggle fullscreen view" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3191 msgid "_Go" msgstr "_Go" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" msgstr "Go back to the previous page" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" msgstr "Go forward to the next page" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3200 msgid "Go to your homepage" msgstr "Go to your homepage" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3202 msgid "Empty Trash" msgstr "Empty Wastebasket" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3203 msgid "Delete the contents of the trash" msgstr "Delete the contents of the wastebasket" -#: ../midori/midori-browser.c:3196 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "Undo Close Tab" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3206 msgid "Open the last closed tab" msgstr "Open the last closed tab" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "Add a new bookmark" -#: ../midori/midori-browser.c:3204 -msgid "Edit the selected bookmark" -msgstr "Edit the selected bookmark" - -#: ../midori/midori-browser.c:3207 -msgid "Delete the selected bookmark" -msgstr "Delete the selected bookmark" - -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" msgstr "Delete the selected history item" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3216 msgid "Clear the entire history" msgstr "Clear the entire history" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" msgstr "Bookmark the selected history item" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3221 msgid "_Tools" msgstr "_Tools" -#: ../midori/midori-browser.c:3220 ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Manage Search Engines" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3224 msgid "Add, edit and remove search engines..." msgstr "Add, edit and remove search engines..." -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3228 msgid "_Previous Tab" msgstr "_Previous Tab" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" msgstr "Switch to the previous tab" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3231 msgid "_Next Tab" msgstr "_Next Tab" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3232 msgid "Switch to the next tab" msgstr "Switch to the next tab" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3234 msgid "_Help" msgstr "_Help" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3236 msgid "_Contents" msgstr "_Contents" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3237 msgid "Show the documentation" msgstr "Show the documentation" -#: ../midori/midori-browser.c:3236 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3239 +#, fuzzy +msgid "_Frequent Questions" msgstr "_Frequent questions" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3240 msgid "Show the Frequently Asked Questions" msgstr "Show the Frequently Asked Questions" -#: ../midori/midori-browser.c:3239 -msgid "_Report a bug" +#: ../midori/midori-browser.c:3242 +#, fuzzy +msgid "_Report a Bug" msgstr "_Report a bug" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3243 msgid "Open Midori's bug tracker" msgstr "Open Midori's bug tracker" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3246 msgid "Show information about the program" msgstr "Show information about the program" -#: ../midori/midori-browser.c:3250 +#: ../midori/midori-browser.c:3253 msgid "P_rivate Browsing" msgstr "P_rivate Browsing" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" msgstr "Don't save any private data while browsing" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3259 msgid "_Menubar" msgstr "_Menubar" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3260 msgid "Show menubar" msgstr "Show menubar" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3263 msgid "_Navigationbar" msgstr "_Navigationbar" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3264 msgid "Show navigationbar" msgstr "Show navigationbar" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3267 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3268 msgid "Show sidepanel" msgstr "Show sidepanel" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3271 msgid "_Bookmarkbar" msgstr "_Bookmarkbar" -#: ../midori/midori-browser.c:3269 +#: ../midori/midori-browser.c:3272 msgid "Show bookmarkbar" msgstr "Show bookmarkbar" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3275 msgid "_Transferbar" msgstr "_Transferbar" -#: ../midori/midori-browser.c:3273 +#: ../midori/midori-browser.c:3276 msgid "Show transferbar" msgstr "Show transferbar" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3279 msgid "_Statusbar" msgstr "_Statusbar" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3280 msgid "Show statusbar" msgstr "Show statusbar" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3748 +#, fuzzy +msgid "_Separator" +msgstr "Separator" + +#: ../midori/midori-browser.c:3755 msgid "_Location..." msgstr "_Location..." -#: ../midori/midori-browser.c:3724 +#: ../midori/midori-browser.c:3757 msgid "Open a particular location" msgstr "Open a particular location" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3781 msgid "_Web Search..." msgstr "_Web Search..." -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3783 msgid "Run a web search" msgstr "Run a web search" -#: ../midori/midori-browser.c:3769 +#: ../midori/midori-browser.c:3802 msgid "Reopen a previously closed tab or window" msgstr "Reopen a previously closed tab or window" -#: ../midori/midori-browser.c:3782 +#: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" msgstr "_Recently visited pages" -#: ../midori/midori-browser.c:3784 +#: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" msgstr "Reopen pages that you visited earlier" -#: ../midori/midori-browser.c:3799 +#: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" msgstr "Show the saved bookmarks" -#: ../midori/midori-browser.c:3812 +#: ../midori/midori-browser.c:3845 msgid "_Window" msgstr "_Window" -#: ../midori/midori-browser.c:3814 +#: ../midori/midori-browser.c:3847 msgid "Show a list of all open tabs" msgstr "Show a list of all open tabs" -#: ../midori/midori-browser.c:3936 -msgid "Bookmarks" -msgstr "Bookmarks" - -#: ../midori/midori-browser.c:3979 ../midori/midori-preferences.c:592 +#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 msgid "History" msgstr "History" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4022 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4050 +#, fuzzy +msgid "_Inline Find:" msgstr "_Inline find:" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:4071 +#, fuzzy +msgid "Previous" +msgstr "_Previous Tab" + +#: ../midori/midori-browser.c:4076 +#, fuzzy +msgid "Next" +msgstr "Text" + +#: ../midori/midori-browser.c:4081 msgid "Match Case" msgstr "Match Case" -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4089 msgid "Highlight Matches" msgstr "Highlight Matches" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4098 msgid "Close Findbar" msgstr "Close Findbar" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" msgstr "Unexpected setting '%s'" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 msgid "Close panel" msgstr "Close panel" -#: ../midori/midori-websettings.c:145 ../midori/midori-view.c:1742 +#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 msgid "Blank page" msgstr "Blank page" -#: ../midori/midori-websettings.c:146 ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:147 +#: ../midori/midori-websettings.c:171 msgid "Last open pages" msgstr "Last open pages" -#: ../midori/midori-websettings.c:162 +#: ../midori/midori-websettings.c:186 msgid "Chinese (BIG5)" msgstr "Chinese (BIG5)" -#: ../midori/midori-websettings.c:163 +#: ../midori/midori-websettings.c:187 msgid "Japanese (SHIFT_JIS)" msgstr "Japanese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:164 +#: ../midori/midori-websettings.c:188 msgid "Russian (KOI8-R)" msgstr "Russian (KOI8-R)" -#: ../midori/midori-websettings.c:165 +#: ../midori/midori-websettings.c:189 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:190 msgid "Western (ISO-8859-1)" msgstr "Western (ISO-8859-1)" -#: ../midori/midori-websettings.c:167 ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "Custom..." -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:206 msgid "New tab" msgstr "New tab" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:207 msgid "New window" msgstr "New window" -#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:208 msgid "Current tab" msgstr "Current tab" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:223 msgid "Default" msgstr "Default" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:224 msgid "Icons" msgstr "Icons" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:225 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:226 msgid "Both" msgstr "Both" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:227 msgid "Both horizontal" msgstr "Both horizontal" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:242 msgid "All cookies" msgstr "All cookies" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:243 msgid "Session cookies" msgstr "Session cookies" -#: ../midori/midori-websettings.c:220 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 msgid "None" msgstr "None" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:260 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:261 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:262 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:303 msgid "Remember last window size" msgstr "Remember last window size" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" msgstr "Whether to save the last window size" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:312 msgid "Last window width" msgstr "Last window width" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:313 msgid "The last saved window width" msgstr "The last saved window width" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:321 msgid "Last window height" msgstr "Last window height" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:322 msgid "The last saved window height" msgstr "The last saved window height" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:347 msgid "Last panel position" msgstr "Last panel position" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:348 msgid "The last saved panel position" msgstr "The last saved panel position" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:357 msgid "Last panel page" msgstr "Last panel page" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:358 msgid "The last saved panel page" msgstr "The last saved panel page" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:366 msgid "Last Web search" msgstr "Last Web search" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:367 msgid "The last saved Web search" msgstr "The last saved Web search" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:376 msgid "Show Menubar" msgstr "Show Menubar" -#: ../midori/midori-websettings.c:336 +#: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" msgstr "Whether to show the menubar" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" msgstr "Show Navigationbar" -#: ../midori/midori-websettings.c:345 +#: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" msgstr "Whether to show the navigationbar" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" msgstr "Show Bookmarkbar" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" msgstr "Whether to show the bookmarkbar" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:403 msgid "Show Panel" msgstr "Show Panel" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" msgstr "Whether to show the panel" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:412 msgid "Show Statusbar" msgstr "Show Statusbar" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" msgstr "Whether to show the statusbar" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:422 msgid "Toolbar Style" msgstr "Toolbar Style" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" msgstr "The style of the toolbar" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:432 msgid "Toolbar Items" msgstr "Toolbar Items" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" msgstr "The items to show on the toolbar" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" msgstr "Compact Sidepanel" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" msgstr "Whether to make the sidepanel compact" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:451 msgid "Load on Startup" msgstr "Load on Startup" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:452 msgid "What to load on startup" msgstr "What to load on startup" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:462 msgid "The homepage" msgstr "The homepage" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:477 +msgid "Show crash dialog" +msgstr "Show crash dialogue" + +#: ../midori/midori-websettings.c:478 +msgid "Show a dialog after Midori crashed" +msgstr "Show a dialogue after Midori crashed" + +#: ../midori/midori-websettings.c:486 msgid "Download Folder" msgstr "Download Folder" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" msgstr "The folder downloaded files are saved to" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:495 msgid "Download Manager" msgstr "Download Manager" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:496 msgid "An external download manager" msgstr "An external download manager" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:504 msgid "Text Editor" msgstr "Text Editor" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:505 msgid "An external text editor" msgstr "An external text editor" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:513 msgid "Location entry Search" msgstr "Location entry Search" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:514 msgid "The search to perform inside the location entry" msgstr "The search to perform inside the location entry" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:522 msgid "Preferred Encoding" msgstr "Preferred Encoding" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:523 msgid "The preferred character encoding" msgstr "The preferred character encoding" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:533 msgid "Always Show Tabbar" msgstr "Always Show Tabbar" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:534 msgid "Always show the tabbar" msgstr "Always show the tabbar" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:542 msgid "Close Buttons on Tabs" msgstr "Close Buttons on Tabs" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:543 msgid "Whether tabs have close buttons" msgstr "Whether tabs have close buttons" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:552 msgid "Open new pages in" msgstr "Open new pages in" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:553 msgid "Where to open new pages" msgstr "Where to open new pages" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:563 msgid "Open external pages in" msgstr "Open external pages in" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:564 msgid "Where to open externally opened pages" msgstr "Where to open externally opened pages" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:577 msgid "Middle click opens Selection" msgstr "Middle click opens Selection" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:578 msgid "Load an address from the selection via middle click" msgstr "Load an address from the selection via middle click" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" msgstr "Open tabs in the background" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:587 msgid "Whether to open new tabs in the background" msgstr "Whether to open new tabs in the background" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:595 msgid "Open Tabs next to Current" msgstr "Open Tabs next to Current" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Whether to open new tabs next to the current tab or after the last one" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" msgstr "Open popups in tabs" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:605 msgid "Whether to open popup windows in tabs" msgstr "Whether to open popup windows in tabs" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:656 +msgid "Zoom Text and Images" +msgstr "Zoom Text and Images" + +#: ../midori/midori-websettings.c:657 +msgid "Whether to zoom text and images" +msgstr "Whether to zoom text and images" + +#: ../midori/midori-websettings.c:667 msgid "Accept cookies" msgstr "Accept cookies" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:668 msgid "What type of cookies to accept" msgstr "What type of cookies to accept" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:681 msgid "Original cookies only" msgstr "Original cookies only" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:682 msgid "Accept cookies from the original website only" msgstr "Accept cookies from the original website only" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:690 msgid "Maximum cookie age" msgstr "Maximum cookie age" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:691 msgid "The maximum number of days to save cookies for" msgstr "The maximum number of days to save cookies for" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:701 msgid "Remember last visited pages" msgstr "Remember last visited pages" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:702 msgid "Whether the last visited pages are saved" msgstr "Whether the last visited pages are saved" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:710 msgid "Maximum history age" msgstr "Maximum history age" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save the history for" msgstr "The maximum number of days to save the history for" -#: ../midori/midori-websettings.c:639 +#: ../midori/midori-websettings.c:719 msgid "Remember last form inputs" msgstr "Remember last form inputs" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:720 msgid "Whether the last form inputs are saved" msgstr "Whether the last form inputs are saved" -#: ../midori/midori-websettings.c:648 +#: ../midori/midori-websettings.c:728 msgid "Remember last downloaded files" msgstr "Remember last downloaded files" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:729 msgid "Whether the last downloaded files are saved" msgstr "Whether the last downloaded files are saved" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:739 msgid "Proxy Server" msgstr "Proxy Server" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:740 msgid "The proxy server used for HTTP connections" msgstr "The proxy server used for HTTP connections" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:680 +#: ../midori/midori-websettings.c:760 msgid "Identify as" msgstr "Identify as" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:761 msgid "What to identify as to web pages" msgstr "What to identify as to web pages" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:781 msgid "Identification string" msgstr "Identification string" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:782 msgid "The application identification string" msgstr "The application identification string" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:794 msgid "Cache size" msgstr "Cache size" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" msgstr "The allowed size of the cache" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:701 +#: ../midori/midori-view.c:608 #, c-format msgid "Not found - %s" msgstr "Not found - %s" -#: ../midori/midori-view.c:981 +#: ../midori/midori-view.c:888 msgid "Open Link in New _Tab" msgstr "Open Link in New _Tab" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:911 msgid "_Save Link destination" msgstr "_Save Link destination" -#: ../midori/midori-view.c:1012 +#: ../midori/midori-view.c:919 msgid "_Download Link destination" msgstr "_Download Link destination" -#: ../midori/midori-view.c:1034 +#: ../midori/midori-view.c:941 msgid "Open Address in New _Tab" msgstr "Open Address in New _Tab" -#: ../midori/midori-view.c:1463 +#: ../midori/midori-view.c:1411 #, c-format msgid "Inspect page - %s" msgstr "Inspect page - %s" -#: ../midori/midori-view.c:1606 +#: ../midori/midori-view.c:1562 msgid "Source" msgstr "Source" -#: ../midori/midori-view.c:1630 +#: ../midori/midori-view.c:1586 +#, c-format +msgid "Document cannot be displayed" +msgstr "Document cannot be displayed" + +#: ../midori/midori-view.c:1602 #, c-format msgid "No documentation installed" msgstr "No documentation installed" @@ -1203,188 +1240,189 @@ msgid "Preferences for %s" msgstr "Preferences for %s" #. Page "General" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:372 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:373 msgid "Startup" msgstr "Startup" #. Page "Appearance" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:422 msgid "Appearance" msgstr "Appearance" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:423 msgid "Font settings" msgstr "Font settings" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Default Font Family" msgstr "Default Font Family" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:431 msgid "The default font size used to display text" msgstr "The default font size used to display text" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" msgstr "Minimum Font Size" -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:437 msgid "The minimum font size used to display text" msgstr "The minimum font size used to display text" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:444 msgid "Encoding" msgstr "Encoding" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:447 msgid "The character encoding to use by default" msgstr "The character encoding to use by default" #. Page "Behavior" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:454 msgid "Behavior" msgstr "Behaviour" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:455 msgid "Features" msgstr "Features" -#: ../midori/midori-preferences.c:453 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Load images automatically" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:459 msgid "Load and display images automatically" msgstr "Load and display images automatically" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:462 msgid "Shrink images automatically" msgstr "Shrink images automatically" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:463 msgid "Automatically shrink standalone images to fit" msgstr "Automatically shrink standalone images to fit" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:466 msgid "Print background images" msgstr "Print background images" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:467 msgid "Whether background images should be printed" msgstr "Whether background images should be printed" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:470 msgid "Resizable text areas" msgstr "Resizable text areas" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:471 msgid "Whether text areas are resizable" msgstr "Whether text areas are resizable" -#: ../midori/midori-preferences.c:469 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Enable scripts" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:475 msgid "Enable embedded scripting languages" msgstr "Enable embedded scripting languages" -#: ../midori/midori-preferences.c:473 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Enable plugins" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:479 msgid "Enable embedded plugin objects" msgstr "Enable embedded plugin objects" -#: ../midori/midori-preferences.c:477 -msgid "Enable developer tools" -msgstr "Enable developer tools" - -#: ../midori/midori-preferences.c:478 -msgid "Enable special extensions for developers" -msgstr "Enable special extensions for developers" - -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:482 msgid "Enforce 96 dots per inch" msgstr "Enforce 96 dots per inch" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:483 msgid "Enforce a video dot density of 96 DPI" msgstr "Enforce a video dot density of 96 DPI" +#: ../midori/midori-preferences.c:486 +msgid "Enable developer tools" +msgstr "Enable developer tools" + +#: ../midori/midori-preferences.c:487 +msgid "Enable special extensions for developers" +msgstr "Enable special extensions for developers" + #. Page "Interface" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:497 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:499 msgid "Navigationbar" msgstr "Navigationbar" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:505 msgid "Browsing" msgstr "Browsing" -#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 msgid "Network" msgstr "Network" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:572 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:579 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:587 ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 msgid "days" msgstr "days" -#: ../midori/midori-searchaction.c:487 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Empty" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:792 msgid "Add search engine" msgstr "Add search engine" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:792 msgid "Edit search engine" msgstr "Edit search engine" -#: ../midori/midori-searchaction.c:852 +#: ../midori/midori-searchaction.c:820 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:864 msgid "_Icon (name or file):" msgstr "_Icon (name or file):" -#: ../midori/midori-searchaction.c:910 +#: ../midori/midori-searchaction.c:878 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1087 -msgid "Manage search engines" -msgstr "Manage search engines" +#: ../midori/midori-searchaction.c:1055 +#, fuzzy +msgid "Manage Search Engines" +msgstr "_Manage Search Engines" #: ../midori/sokoke.c:101 ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "Could not run external program." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:346 +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" msgstr "Warning: You are using a superuser account!" @@ -1419,6 +1457,22 @@ msgstr "_Enable" msgid "_Disable" msgstr "_Disable" +#: ../panels/midori-bookmarks.c:100 +msgid "Bookmarks" +msgstr "Bookmarks" + +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "Edit the selected bookmark" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "Delete the selected bookmark" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "Separator" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Console" @@ -1427,6 +1481,10 @@ msgstr "Console" msgid "Extensions" msgstr "Extensions" +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "Plugins" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1441,39 +1499,46 @@ msgstr "Stock icon '%s' couldn't be loaded" msgid "Animation frames are broken" msgstr "Animation frames are broken" -#: ../katze/katze-utils.c:182 ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Property '%s' is invalid for %s" -#: ../katze/katze-utils.c:211 ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Choose file" -#: ../katze/katze-utils.c:231 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "Choose folder" +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Mouse Gestures" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Control Midori by moving the mouse" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "Pageholder" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "_Pageholder" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:38 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "Scripts" -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "Plugins" +#~ msgid "Manage search engines" +#~ msgstr "Manage search engines" #~ msgid "Root" #~ msgstr "Root" From acaa1741bdaa762e04b409fb0ff7309de28b1d3c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Feb 2009 23:13:00 +0100 Subject: [PATCH 0720/2970] Show tokens in Manage Search Engines dialog --- midori/midori-searchaction.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index ea5b40c0..a5ec24e3 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -729,7 +729,7 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, search_action = g_object_get_data (G_OBJECT (treeview), "search-action"); icon = midori_search_action_get_icon (search_action, item, treeview); - g_object_set (renderer, "pixbuf", icon, NULL); + g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL); g_object_unref (icon); } @@ -753,6 +753,24 @@ midori_search_action_dialog_render_text (GtkTreeViewColumn* column, g_free (markup); } +static void +midori_search_action_dialog_render_token (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + const gchar* token; + gchar* markup; + + gtk_tree_model_get (model, iter, 0, &item, -1); + token = katze_item_get_token (item); + markup = g_markup_printf_escaped ("%s", token ? token : ""); + g_object_set (renderer, "markup", markup, "yalign", 0.0, NULL); + g_free (markup); +} + static void midori_search_action_editor_name_changed_cb (GtkWidget* entry, GtkWidget* dialog) @@ -1100,6 +1118,11 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_search_action_dialog_render_text, treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_search_action_dialog_render_token, + treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), From 8d3d76ed8fcf37b5b5384e07b7a7e6479aca0286 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 2 Feb 2009 01:10:30 +0100 Subject: [PATCH 0721/2970] Default sysconfdir to /etc if the prefix is /usr --- wscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 96dde91b..c8518dda 100644 --- a/wscript +++ b/wscript @@ -89,7 +89,10 @@ def configure (conf): dirname_default ('DATADIR', os.path.join (conf.env['PREFIX'], 'share')) dirname_default ('DOCDIR', os.path.join (conf.env['DATADIR'], 'doc')) dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) - dirname_default ('SYSCONFDIR', os.path.join (conf.env['PREFIX'], 'etc')) + if conf.env['PREFIX'] == '/usr': + dirname_default ('SYSCONFDIR', '/etc') + else: + dirname_default ('SYSCONFDIR', os.path.join (conf.env['PREFIX'], 'etc')) if option_enabled ('apidocs'): conf.find_program ('gtkdoc-scan', var='GTKDOC_SCAN') From 98b2d61b9d04d6565f93f9e98b94ebcd58b26eb8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 3 Feb 2009 22:59:57 +0100 Subject: [PATCH 0722/2970] Rephrase "opened for the last time" to "the last time it was opened" The translations are not changed, the English string is merely replaced. --- midori/main.c | 6 +++--- po/da.po | 2 +- po/de.po | 2 +- po/en_GB.po | 4 ++-- po/es.po | 2 +- po/fr.po | 2 +- po/ja.po | 2 +- po/midori.pot | 22 +++++++++++----------- po/nl.po | 2 +- po/ru.po | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/midori/main.c b/midori/main.c index fe9ade11..c1045911 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1780,9 +1780,9 @@ midori_create_diagnostic_dialog (MidoriWebSettings* settings, dialog = gtk_message_dialog_new ( NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, - _("Midori seems to have crashed after it was opened " - "for the last time. If this happend repeatedly, " - "try one of the following options to solve the problem.")); + _("Midori seems to have crashed the last time it was opened. " + "If this happend repeatedly, try one of the following options " + "to solve the problem.")); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); screen = gtk_widget_get_screen (dialog); diff --git a/po/da.po b/po/da.po index 2c2e8e57..5c1f42bb 100644 --- a/po/da.po +++ b/po/da.po @@ -259,7 +259,7 @@ msgid "_Ignore" msgstr "_Ignorér" #: ../midori/main.c:1967 -msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette sker gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." #: ../midori/main.c:1982 diff --git a/po/de.po b/po/de.po index 53a640b2..1c63dfc1 100644 --- a/po/de.po +++ b/po/de.po @@ -194,7 +194,7 @@ msgstr "Kennwort" #: ../midori/main.c:1783 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " diff --git a/po/en_GB.po b/po/en_GB.po index cec5fe2b..068890e8 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -193,10 +193,10 @@ msgstr "Password" #: ../midori/main.c:1783 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." #: ../midori/main.c:1798 diff --git a/po/es.po b/po/es.po index 03bf66b7..afe5d6af 100644 --- a/po/es.po +++ b/po/es.po @@ -195,7 +195,7 @@ msgstr "Contraseña" #: ../midori/main.c:1783 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" "Parece que Midori se cerró insperadamente la última vez. Si esto sucede " diff --git a/po/fr.po b/po/fr.po index 47ad773f..b3c05bca 100644 --- a/po/fr.po +++ b/po/fr.po @@ -194,7 +194,7 @@ msgstr "Mot de passe" #: ../midori/main.c:1700 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" diff --git a/po/ja.po b/po/ja.po index 29ed5074..a47601e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -193,7 +193,7 @@ msgstr "パスワード" #: ../midori/main.c:1783 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" diff --git a/po/midori.pot b/po/midori.pot index 9ea12736..34b8800e 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-01 19:06+0100\n" +"POT-Creation-Date: 2009-02-03 22:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -191,8 +191,8 @@ msgstr "" #: ../midori/main.c:1783 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " -"happend repeatedly, try one of the following options to solve the problem." +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." msgstr "" #: ../midori/main.c:1798 @@ -307,11 +307,11 @@ msgstr "" msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 +#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:854 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 +#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:868 msgid "_Address:" msgstr "" @@ -1380,27 +1380,27 @@ msgstr "" msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:810 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:810 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:820 +#: ../midori/midori-searchaction.c:838 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:864 +#: ../midori/midori-searchaction.c:882 msgid "_Icon (name or file):" msgstr "" -#: ../midori/midori-searchaction.c:878 +#: ../midori/midori-searchaction.c:896 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1055 +#: ../midori/midori-searchaction.c:1073 msgid "Manage Search Engines" msgstr "" diff --git a/po/nl.po b/po/nl.po index ce8db9b7..81f5da15 100644 --- a/po/nl.po +++ b/po/nl.po @@ -185,7 +185,7 @@ msgstr "" #: ../midori/main.c:1675 msgid "" -"Midori seems to have crashed after it was opened for the last time. If this " +"Midori seems to have crashed the last time it was opened. If this " "happend repeatedly, try one of the following options to solve the problem." msgstr "" diff --git a/po/ru.po b/po/ru.po index f9ae5bb0..f3aa3786 100644 --- a/po/ru.po +++ b/po/ru.po @@ -205,7 +205,7 @@ msgid "Password" msgstr "Пароль" #: ../midori/main.c:1694 -msgid "Midori seems to have crashed after it was opened for the last time. If this happend repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." #: ../midori/main.c:1709 From aff3affc23c6576679d0d48fabafaf3e048118a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Feb 2009 00:09:44 +0100 Subject: [PATCH 0723/2970] Introduce MidoriExtension setting API, strings only for now --- midori/midori-extension.c | 153 +++++++++++++++++++++++++++++++++++++- midori/midori-extension.h | 14 ++++ 2 files changed, 165 insertions(+), 2 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 22eee820..c48a5847 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -30,8 +30,45 @@ struct _MidoriExtensionPrivate gboolean active; gchar* config_dir; + GList* lsettings; + GHashTable* settings; }; +typedef struct +{ + gchar* name; + GType type; + gchar* default_value; + gchar* value; +} MESettingString; + +void me_setting_free (gpointer setting) +{ + MESettingString* string_setting = (MESettingString*)setting; + + g_free (string_setting->name); + if (string_setting->type == G_TYPE_STRING) + { + g_free (string_setting->default_value); + g_free (string_setting->value); + } +} + +#define me_setting_install(stype, _name, gtype, _default_value, _value) \ + setting = g_new (stype, 1); \ + setting->name = _name; \ + setting->type = gtype; \ + setting->default_value = _default_value; \ + setting->value = _value; \ + g_hash_table_insert (extension->priv->settings, setting->name, setting); \ + extension->priv->lsettings = g_list_prepend \ + (extension->priv->lsettings, setting); + +#define me_setting_type(setting, gtype, rreturn) \ +if (setting->type != gtype) { \ +g_critical ("%s: The setting '%s' is not a string.", G_STRFUNC, name); \ +rreturn; } + enum { PROP_0, @@ -144,6 +181,19 @@ static void midori_extension_activate_cb (MidoriExtension* extension, MidoriApp* app) { + GList* lsettings = g_list_first (extension->priv->lsettings); + while (lsettings) + { + MESettingString* setting = (MESettingString*)lsettings->data; + + if (setting->type == G_TYPE_STRING) + setting->value = g_strdup (setting->default_value); + else + g_assert_not_reached (); + + lsettings = g_list_next (lsettings); + } + extension->priv->active = TRUE; /* FIXME: Disconnect all signal handlers */ } @@ -156,6 +206,9 @@ midori_extension_init (MidoriExtension* extension) extension->priv->active = FALSE; extension->priv->config_dir = NULL; + extension->priv->lsettings = NULL; + extension->priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, me_setting_free); g_signal_connect (extension, "activate", G_CALLBACK (midori_extension_activate_cb), NULL); @@ -172,6 +225,8 @@ midori_extension_finalize (GObject* object) katze_assign (extension->priv->authors, NULL); katze_assign (extension->priv->config_dir, NULL); + g_list_free (extension->priv->lsettings); + g_hash_table_destroy (extension->priv->settings); } static void @@ -302,7 +357,6 @@ midori_extension_deactivate (MidoriExtension* extension) const gchar* midori_extension_get_config_dir (MidoriExtension* extension) { - g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), NULL); g_return_val_if_fail (midori_extension_is_prepared (extension), NULL); if (!extension->priv->config_dir) @@ -313,3 +367,98 @@ midori_extension_get_config_dir (MidoriExtension* extension) g_mkdir_with_parents (extension->priv->config_dir, 0700); return extension->priv->config_dir; } + +/** + * midori_extension_install_string: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @default_value: the default value + * + * Installs a string that can be used to conveniently + * store user configuration. + * + * Note that all settings have to be installed before + * the extension is activated. + * + * Since: 0.1.3 + **/ +void +midori_extension_install_string (MidoriExtension* extension, + const gchar* name, + const gchar* default_value) +{ + MESettingString* setting; + + g_return_if_fail (midori_extension_is_prepared (extension)); + + /* This is not strictly a technical requirement but we want + to ensure that a running extension is in a reliable state. */ + if (extension->priv->active) + { + g_critical ("%s: Settings have to be installed before " + "the extension is activated.", G_STRFUNC); + return; + } + + if (g_hash_table_lookup (extension->priv->settings, name)) + { + g_critical ("%s: A setting with the name '%s' is already installed.", + G_STRFUNC, name); + return; + } + + me_setting_install (MESettingString, g_strdup (name), G_TYPE_STRING, + g_strdup (default_value), NULL); +} + +/** + * midori_extension_get_string: + * @extension: a #MidoriExtension + * @name: the name of the setting + * + * Retrieves the value of the specified setting. + * + * Since: 0.1.3 + **/ +const gchar* +midori_extension_get_string (MidoriExtension* extension, + const gchar* name) +{ + MESettingString* setting; + + g_return_val_if_fail (midori_extension_is_prepared (extension), NULL); + g_return_val_if_fail (name != NULL, NULL); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_STRING, return NULL); + + return setting->value; +} + +/** + * midori_extension_set_string: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @value: the new value + * + * Assigns a new value to the specified setting. + * + * Since: 0.1.3 + **/ +void +midori_extension_set_string (MidoriExtension* extension, + const gchar* name, + const gchar* value) +{ + MESettingString* setting; + + g_return_if_fail (midori_extension_is_active (extension)); + g_return_if_fail (name != NULL); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_STRING, return); + + katze_assign (setting->value, g_strdup (value)); +} diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 3e21056a..00cc808d 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -60,6 +60,20 @@ midori_extension_deactivate (MidoriExtension* extension); const gchar* midori_extension_get_config_dir (MidoriExtension* extension); +void +midori_extension_install_string (MidoriExtension* extension, + const gchar* name, + const gchar* default_value); + +const gchar* +midori_extension_get_string (MidoriExtension* extension, + const gchar* name); + +void +midori_extension_set_string (MidoriExtension* extension, + const gchar* name, + const gchar* value); + G_END_DECLS #endif /* __MIDORI_EXTENSION_H__ */ From b4ba0888bf9a398cd289fafbd88cfeaec929faac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Feb 2009 00:11:36 +0100 Subject: [PATCH 0724/2970] Flag deactivated extensions as not active --- midori/midori-extension.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index c48a5847..9a576003 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -337,6 +337,7 @@ midori_extension_deactivate (MidoriExtension* extension) { g_return_if_fail (MIDORI_IS_EXTENSION (extension)); + extension->priv->active = FALSE; g_signal_emit (extension, signals[DEACTIVATE], 0); g_signal_handlers_destroy (extension); g_object_run_dispose (G_OBJECT (extension)); From f78a0472751f1db98593350e1f214a17f091eee6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Feb 2009 00:12:26 +0100 Subject: [PATCH 0725/2970] Add an extension test --- tests/extensions.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 tests/extensions.c diff --git a/tests/extensions.c b/tests/extensions.c new file mode 100644 index 00000000..c8b95e78 --- /dev/null +++ b/tests/extensions.c @@ -0,0 +1,101 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori.h" + +#if GLIB_CHECK_VERSION(2, 16, 0) + +const gpointer magic = (gpointer)0xdeadbeef; + +static void +extension_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + g_object_set_data (G_OBJECT (extension), "activated", magic); +} + +static void +extension_deactivate_cb (MidoriExtension* extension) +{ + g_object_set_data (G_OBJECT (extension), "deactivated", magic); +} + +static void +extension_create (void) +{ + MidoriExtension* extension; + + extension = g_object_new (MIDORI_TYPE_EXTENSION, NULL); + g_assert (!midori_extension_is_prepared (extension)); + g_object_set (extension, "name", "TestExtension", + "version", "1.0", NULL); + g_assert (!midori_extension_is_prepared (extension)); + g_object_set (extension, "description", "Nothing but a test.", + "authors", "John Doe", NULL); + /* FIXME: We should require to connect to "activate" + g_assert (!midori_extension_is_prepared (extension)); */ + g_signal_connect (extension, "activate", + G_CALLBACK (extension_activate_cb), NULL); + g_assert (midori_extension_is_prepared (extension)); + g_assert (!midori_extension_is_active (extension)); + g_signal_emit_by_name (extension, "activate", NULL); + g_assert (midori_extension_is_active (extension)); + g_assert (g_object_get_data (G_OBJECT (extension), "activated") == magic); + g_signal_connect (extension, "deactivate", + G_CALLBACK (extension_deactivate_cb), NULL); + midori_extension_deactivate (extension); + g_assert (!midori_extension_is_active (extension)); + g_assert (g_object_get_data (G_OBJECT (extension), "deactivated") == magic); +} + +static void +extension_settings (void) +{ + MidoriExtension* extension; + const gchar* lastname; + + extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", "TestExtension", + "version", "1.0", + "description", "Nothing but a test.", + "authors", "John Doe", + NULL); + midori_extension_install_string (extension, "lastname", "Thomas Mann"); + lastname = midori_extension_get_string (extension, "lastname"); + g_assert_cmpstr (lastname, ==, NULL); + g_signal_connect (extension, "activate", + G_CALLBACK (extension_activate_cb), NULL); + g_signal_emit_by_name (extension, "activate", NULL); + lastname = midori_extension_get_string (extension, "lastname"); + g_assert_cmpstr (lastname, ==, "Thomas Mann"); + midori_extension_set_string (extension, "lastname", "Theodor Fontane"); + lastname = midori_extension_get_string (extension, "lastname"); + g_assert_cmpstr (lastname, ==, "Theodor Fontane"); +} + +int +main (int argc, + char** argv) +{ + g_test_init (&argc, &argv, NULL); + gtk_init (&argc, &argv); + + g_test_add_func ("/extensions/create", extension_create); + g_test_add_func ("/extensions/settings", extension_settings); + + return g_test_run (); +} + +#endif From 019075842b63ae25fe2d821b138c4a3e5d7e71fe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Feb 2009 22:43:24 +0100 Subject: [PATCH 0726/2970] Resize the label in the crash dialogue for proper wrapping --- midori/main.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/midori/main.c b/midori/main.c index c1045911..e728215c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1810,6 +1810,30 @@ midori_create_diagnostic_dialog (MidoriWebSettings* settings, gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4); gtk_widget_show_all (box); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); + if (1) + { + /* GtkLabel can't wrap the text properly. Until some day + this works, we implement this hack to do it ourselves. */ + GtkWidget* content_area; + GtkWidget* hbox; + GtkWidget* vbox; + GtkWidget* label; + GList* ch; + GtkRequisition req; + + content_area = GTK_DIALOG (dialog)->vbox; + ch = gtk_container_get_children (GTK_CONTAINER (content_area)); + hbox = (GtkWidget*)g_list_nth_data (ch, 0); + g_list_free (ch); + ch = gtk_container_get_children (GTK_CONTAINER (hbox)); + vbox = (GtkWidget*)g_list_nth_data (ch, 1); + g_list_free (ch); + ch = gtk_container_get_children (GTK_CONTAINER (vbox)); + label = (GtkWidget*)g_list_nth_data (ch, 0); + g_list_free (ch); + gtk_widget_size_request (content_area, &req); + gtk_widget_set_size_request (label, req.width * 0.9, -1); + } return dialog; } From cd2700ff0d5b28d038b1be9bd601593b5333c93e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 6 Feb 2009 03:00:14 +0100 Subject: [PATCH 0727/2970] Add a completion test --- tests/completion.c | 190 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 tests/completion.c diff --git a/tests/completion.c b/tests/completion.c new file mode 100644 index 00000000..5d087b37 --- /dev/null +++ b/tests/completion.c @@ -0,0 +1,190 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori.h" + +#if GLIB_CHECK_VERSION(2, 16, 0) + +typedef struct +{ + const gchar* uri; + const gchar* name; +} CompletionItem; + +static const CompletionItem items[] = { + { "http://one.com", "One" }, + { "http://one.com/", "One" }, /* Duplicate */ + { "http://one.com/", "One One" }, /* Duplicate */ + { "http://one.com", "One Two" }, /* Duplicate */ + { "http://two.com", "Two" }, + { "http://three.com", "Three" }, + { "http://one.com/one", "One one" }, + { "http://one.com/one/", "One off" }, /* Duplicate */ + { "http://four.org", "One" }, + { "https://four.org", "Four" }, + { "ftp://four.org/", "Five" }, + }; +static const guint items_n = 7; + +static void +completion_count (void) +{ + MidoriLocationAction* action; + GtkWidget* toolitem; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + GtkTreeModel* model; + guint n, i; + + action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, NULL); + toolitem = gtk_action_create_tool_item (GTK_ACTION (action)); + alignment = gtk_bin_get_child (GTK_BIN (toolitem)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); + midori_location_action_add_item (action, "http://one.com", NULL, "One"); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 1); + midori_location_action_clear (action); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); + for (i = 0; i < G_N_ELEMENTS (items); i++) + midori_location_action_add_item (action, items[i].uri, + NULL, items[i].name); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, items_n); + /* Adding the exact same items again shouldn't increase the total amount */ + for (i = 0; i < G_N_ELEMENTS (items); i++) + midori_location_action_add_item (action, items[i].uri, + NULL, items[i].name); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, items_n); +} + +/* Components to construct test addresses, the numbers take into account + how many items minus duplicates are unique. */ +static const gchar* protocols[] = { + "http", "https", "ftp" + }; +static const guint protocols_n = 3; +static const gchar* subs[] = { + "", "www.", "ww2.", "ftp.", "sub." + }; +static const guint subs_n = 5; +static const gchar* slds[] = { + "one", "two", "four", "six", "seven"/*, "Seven", "SEVEN"*/ + }; +static const guint slds_n = 5; +static const gchar* tlds[] = { + "com", "org", "net", "de", "co.uk", "com.au"/*, "Com.Au", "COM.AU"*/ + }; +static const guint tlds_n = 6; +static const gchar* files[] = { + "", "/", "/index.html", "/images", "/images/", "/Images", "/IMAGES" + }; +static const guint files_n = 5; + +static void location_action_fill (MidoriLocationAction* action) +{ + guint i, j, k, l, m; + + for (i = 0; i < G_N_ELEMENTS (protocols); i++) + for (j = 0; j < G_N_ELEMENTS (subs); j++) + for (k = 0; k < G_N_ELEMENTS (slds); k++) + for (l = 0; l < G_N_ELEMENTS (tlds); l++) + for (m = 0; m < G_N_ELEMENTS (files); m++) + { + gchar* uri = g_strdup_printf ("%s://%s%s.%s%s", + protocols[i], subs[j], slds[k], tlds[l], files[m]); + midori_location_action_add_item (action, uri, NULL, uri); + g_free (uri); + } +} + +static void +completion_fill (void) +{ + MidoriLocationAction* action; + GtkWidget* toolitem; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + GtkTreeModel* model; + guint i, items_added, items_added_effective, n; + gdouble elapsed; + + action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, NULL); + toolitem = gtk_action_create_tool_item (GTK_ACTION (action)); + alignment = gtk_bin_get_child (GTK_BIN (toolitem)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + + g_print ("...\n"); + + /* Since adding items when the action is frozen is very fast, + we run it 10 times and take the average time. */ + elapsed = 0.0; + for (i = 0; i < 10; i++) + { + midori_location_action_clear (action); + midori_location_action_freeze (action); + g_test_timer_start (); + location_action_fill (action); + elapsed += g_test_timer_elapsed (); + midori_location_action_thaw (action); + } + items_added = G_N_ELEMENTS (protocols) * G_N_ELEMENTS (subs) + * G_N_ELEMENTS (slds) * G_N_ELEMENTS (tlds) * G_N_ELEMENTS (files); + items_added_effective = protocols_n * subs_n * slds_n * tlds_n * files_n; + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, items_added_effective); + g_print ("Added %d items, effectively %d items, in %f seconds (frozen)\n", + items_added, items_added_effective, elapsed / 10.0); + + midori_location_action_clear (action); + g_test_timer_start (); + location_action_fill (action); + elapsed = g_test_timer_elapsed (); + items_added = G_N_ELEMENTS (protocols) * G_N_ELEMENTS (subs) + * G_N_ELEMENTS (slds) * G_N_ELEMENTS (tlds) * G_N_ELEMENTS (files); + items_added_effective = protocols_n * subs_n * slds_n * tlds_n * files_n; + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, items_added_effective); + g_print ("Added %d items, effectively %d items, in %f seconds\n", + items_added, items_added_effective, elapsed); + + g_print ("..."); +} + +int +main (int argc, + char** argv) +{ + g_test_init (&argc, &argv, NULL); + gtk_init (&argc, &argv); + + g_test_add_func ("/completion/count", completion_count); + g_test_add_func ("/completion/fill", completion_fill); + + return g_test_run (); +} + +#endif From ca4d5cb52049ba46a6bb5857cb1645aeeba4225b Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Fri, 6 Feb 2009 03:01:35 +0100 Subject: [PATCH 0728/2970] Include string.h in MidoriBookmarks --- panels/midori-bookmarks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 1f09e2f4..2f0b728d 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -20,6 +20,7 @@ #include "sokoke.h" #include +#include #include From 75c83f12243be8236c2ffff3f1ffbe7de8b967c7 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Mon, 9 Feb 2009 21:37:10 +0100 Subject: [PATCH 0729/2970] Differentiate hash table/ frozen and manual/ normal completion Adding and looking up items based on a hash table is incredibly fast, so it's vital for startup, however at runtime we want to prepend which invalidates the contents of the hash table. So now we use the hash based lookup only for frozen operation, which is used at startup and has to be fast, but manual string comparisons are used at runtime. --- midori/midori-locationaction.c | 113 ++++++++++++++++++++++++--------- 1 file changed, 84 insertions(+), 29 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index ea95cfdd..9a5cb3a5 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -233,6 +233,9 @@ midori_location_action_freeze (MidoriLocationAction* location_action) katze_object_assign (location_action->sort_model, NULL); katze_object_assign (location_action->filter_model, NULL); midori_location_action_set_model (location_action, NULL); + + if (location_action->items) + g_hash_table_remove_all (location_action->items); } /** @@ -248,6 +251,9 @@ midori_location_action_thaw (MidoriLocationAction* location_action) { GtkTreeModel* sort_model; GtkTreeModel* filter_model; + GtkTreeIter iter; + GtkTreeIter child_iter; + gint i; g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (midori_location_action_is_frozen (location_action)); @@ -263,6 +269,15 @@ midori_location_action_thaw (MidoriLocationAction* location_action) location_action->filter_model = filter_model; location_action->sort_model = sort_model; + + i = MAX_ITEMS; + while (gtk_tree_model_iter_nth_child (sort_model, &iter, NULL, i++)) + { + gtk_tree_model_sort_convert_iter_to_child_iter ( + GTK_TREE_MODEL_SORT (sort_model), &child_iter, &iter); + gtk_list_store_set (GTK_LIST_STORE (location_action->model), + &child_iter, VISIBLE_COL, FALSE, -1); + } } static void @@ -575,6 +590,20 @@ midori_location_action_set_item (MidoriLocationAction* location_action, FAVICON_COL, new_icon, -1); } +static gchar* +midori_location_action_format_uri (const gchar* uri) +{ + gchar* new_uri; + size_t len; + + new_uri = g_ascii_strdown (uri, -1); + len = strlen (new_uri); + + if (new_uri [len - 1] == '/') + new_uri [len - 1] = '\0'; + return new_uri; +} + /** * midori_location_action_iter_lookup: * @location_action: a #MidoriLocationAction @@ -591,24 +620,43 @@ midori_location_action_iter_lookup (MidoriLocationAction* location_action, const gchar* uri, GtkTreeIter* iter) { + GtkTreeModel* model; gchar* path; gchar* new_uri; + gchar* tmp_uri; gboolean found; + model = location_action->model; found = FALSE; - new_uri = NULL; - if (!g_str_has_suffix (uri, "/")) - new_uri = g_strconcat (uri, "/", NULL); + new_uri = midori_location_action_format_uri (uri); - if ((path = g_hash_table_lookup (location_action->items, - new_uri ? new_uri : uri))) + if (midori_location_action_is_frozen (location_action)) { - if (!(found = gtk_tree_model_get_iter_from_string (location_action->model, - iter, path))) + if ((path = g_hash_table_lookup (location_action->items, new_uri))) { - g_hash_table_remove (location_action->items, - new_uri ? new_uri : uri); + if (!(found = gtk_tree_model_get_iter_from_string (model, iter, path))) + { + g_hash_table_remove (location_action->items, new_uri); + } + } + } + else + { + if (gtk_tree_model_get_iter_first (model, iter)) + { + tmp_uri = NULL; + do + { + + gtk_tree_model_get (model, iter, URI_COL, &tmp_uri, -1); + found = !g_ascii_strncasecmp (new_uri, tmp_uri, strlen (new_uri)); + katze_assign (tmp_uri, NULL); + + if (found) + break; + } + while (gtk_tree_model_iter_next (model, iter)); } } g_free (new_uri); @@ -638,16 +686,16 @@ midori_location_action_iter_insert (MidoriLocationAction* location_action, { GtkTreeModel* model; gchar* path; + gchar* new_uri; model = location_action->model; gtk_list_store_insert (GTK_LIST_STORE (model), iter, position); - path = gtk_tree_model_get_string_from_iter (model, iter); - g_hash_table_insert (location_action->items, - g_str_has_suffix (uri, "/") ? - g_strdup (uri) : - g_strconcat (uri, "/", NULL), - path); - + if (midori_location_action_is_frozen (location_action)) + { + new_uri = midori_location_action_format_uri (uri); + path = gtk_tree_model_get_string_from_iter (model, iter); + g_hash_table_insert (location_action->items, new_uri, path); + } return FALSE; } @@ -907,13 +955,16 @@ midori_location_action_prepend_item (MidoriLocationAction* location_action, MidoriLocationEntryItem* item) { GtkTreeModel* filter_model; + GtkTreeModel* sort_model; GtkTreeModel* model; GtkTreeIter iter; + GtkTreeIter sort_iter; GtkTreeIter idx; gint n; gint visits = 0; filter_model = location_action->filter_model; + sort_model = location_action->sort_model; model = location_action->model; if (midori_location_action_iter_insert (location_action, @@ -924,18 +975,25 @@ midori_location_action_prepend_item (MidoriLocationAction* location_action, gtk_list_store_move_before (GTK_LIST_STORE (model), &iter, &idx); } - n = gtk_tree_model_iter_n_children (filter_model, NULL); - if (n > MAX_ITEMS) - { - gtk_tree_model_iter_nth_child (model, &idx, NULL, n - 1); - gtk_list_store_set (GTK_LIST_STORE (model), - &idx, VISIBLE_COL, FALSE, -1); - } - /* Only increment the visits when we add the uri */ if (!item->title && !item->favicon) gtk_list_store_set (GTK_LIST_STORE (model), &iter, VISITS_COL, ++visits, VISIBLE_COL, TRUE, -1); + + if (filter_model) + { + n = gtk_tree_model_iter_n_children (filter_model, NULL); + if (n > MAX_ITEMS) + { + gtk_tree_model_iter_nth_child (filter_model, &idx, NULL, n - 1); + gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model), + &sort_iter, &idx); + gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (sort_model), + &idx, &sort_iter); + gtk_list_store_set (GTK_LIST_STORE (model), + &idx, VISIBLE_COL, FALSE, -1); + } + } midori_location_action_set_item (location_action, &iter, item); } @@ -953,19 +1011,16 @@ midori_location_action_append_item (MidoriLocationAction* location_action, { GtkTreeModel* model; GtkTreeIter iter; - gint n; gint visits = 0; model = location_action->model; - if (!midori_location_action_iter_insert (location_action, + if (midori_location_action_iter_insert (location_action, item->uri, &iter, G_MAXINT)) - n = gtk_tree_model_iter_n_children (model, NULL); - else gtk_tree_model_get (model, &iter, VISITS_COL, &visits, -1); gtk_list_store_set (GTK_LIST_STORE (model), &iter, - VISITS_COL, ++visits, VISIBLE_COL, n <= MAX_ITEMS, -1); + VISITS_COL, ++visits, VISIBLE_COL, TRUE, -1); midori_location_action_set_item (location_action, &iter, item); } From c0c4d6f1cbdcedc9255a429188dfce41d1acdd68 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 9 Feb 2009 21:43:08 +0100 Subject: [PATCH 0730/2970] Tweak the completion test and add a 'match' test case --- tests/completion.c | 131 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 119 insertions(+), 12 deletions(-) diff --git a/tests/completion.c b/tests/completion.c index 5d087b37..1932f6bf 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -96,9 +96,16 @@ static const gchar* tlds[] = { }; static const guint tlds_n = 6; static const gchar* files[] = { - "", "/", "/index.html", "/images", "/images/", "/Images", "/IMAGES" + "", "/", "/index.html", "/img.png", "/images", "/images/"/*, "/Images", "/IMAGES"*/ + }; +static const guint files_n = 4; /* 6; */ + +static const gchar* inputs[] = { + "http://www.one.com/index", "http://two.de/images", "http://six.com.au/img" + }; +static const gchar* additions[] = { + "http://www.one.com/invention", "http://two.de/island", "http://six.com.au/ish" }; -static const guint files_n = 5; static void location_action_fill (MidoriLocationAction* action) { @@ -137,6 +144,12 @@ completion_fill (void) g_print ("...\n"); + items_added = G_N_ELEMENTS (protocols) * G_N_ELEMENTS (subs) + * G_N_ELEMENTS (slds) * G_N_ELEMENTS (tlds) * G_N_ELEMENTS (files); + items_added_effective = protocols_n * subs_n * slds_n * tlds_n * files_n; + g_print ("Adding %d items, effectively %d items:\n", + items_added, items_added_effective); + /* Since adding items when the action is frozen is very fast, we run it 10 times and take the average time. */ elapsed = 0.0; @@ -149,31 +162,124 @@ completion_fill (void) elapsed += g_test_timer_elapsed (); midori_location_action_thaw (action); } - items_added = G_N_ELEMENTS (protocols) * G_N_ELEMENTS (subs) - * G_N_ELEMENTS (slds) * G_N_ELEMENTS (tlds) * G_N_ELEMENTS (files); - items_added_effective = protocols_n * subs_n * slds_n * tlds_n * files_n; model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); n = gtk_tree_model_iter_n_children (model, NULL); g_assert_cmpint (n, ==, items_added_effective); - g_print ("Added %d items, effectively %d items, in %f seconds (frozen)\n", - items_added, items_added_effective, elapsed / 10.0); + g_print ("%f seconds, the action is frozen\n", elapsed / 10.0); midori_location_action_clear (action); g_test_timer_start (); location_action_fill (action); elapsed = g_test_timer_elapsed (); - items_added = G_N_ELEMENTS (protocols) * G_N_ELEMENTS (subs) - * G_N_ELEMENTS (slds) * G_N_ELEMENTS (tlds) * G_N_ELEMENTS (files); - items_added_effective = protocols_n * subs_n * slds_n * tlds_n * files_n; model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); n = gtk_tree_model_iter_n_children (model, NULL); g_assert_cmpint (n, ==, items_added_effective); - g_print ("Added %d items, effectively %d items, in %f seconds\n", - items_added, items_added_effective, elapsed); + g_print ("%f seconds, the action updates normally\n", elapsed); + + /* We don't clear the action intentionally in order to see + how long adding only duplicates takes. */ + g_test_timer_start (); + location_action_fill (action); + elapsed = g_test_timer_elapsed (); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, items_added_effective); + g_print ("%f seconds, adding exact duplicates\n", elapsed); g_print ("..."); } +static guint matches = 0; +static guint matches_expected = 0; + +static gboolean +entry_completion_insert_prefix_cb (GtkEntryCompletion* completion, + const gchar* prefix, + MidoriLocationAction* action) +{ + GtkWidget* entry = gtk_entry_completion_get_entry (completion); + const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); + + if (!g_strrstr (prefix, text)) + g_print ("Match failed, input: %s, result: %s\n", + text, prefix); + g_assert (g_strrstr (prefix, text)); + midori_location_action_delete_item_from_uri (action, text); + midori_location_action_add_uri (action, text); + + matches++; + + return FALSE; +} + +static void +completion_match (void) +{ + MidoriLocationAction* action; + GtkWidget* toolitem; + GtkWidget* alignment; + GtkWidget* location_entry; + GtkWidget* entry; + GtkEntryCompletion* completion; + guint i; + + action = g_object_new (MIDORI_TYPE_LOCATION_ACTION, NULL); + + midori_location_action_freeze (action); + location_action_fill (action); + midori_location_action_thaw (action); + + toolitem = gtk_action_create_tool_item (GTK_ACTION (action)); + alignment = gtk_bin_get_child (GTK_BIN (toolitem)); + location_entry = gtk_bin_get_child (GTK_BIN (alignment)); + entry = gtk_bin_get_child (GTK_BIN (location_entry)); + completion = gtk_entry_get_completion (GTK_ENTRY (entry)); + g_signal_connect (completion, "insert-prefix", + G_CALLBACK (entry_completion_insert_prefix_cb), action); + gtk_entry_completion_set_inline_completion (completion, TRUE); + gtk_entry_completion_set_popup_single_match (completion, FALSE); + + for (i = 0; i < G_N_ELEMENTS (inputs); i++) + { + matches_expected++; + gtk_entry_set_text (GTK_ENTRY (entry), inputs[i]); + gtk_entry_completion_complete (completion); + gtk_entry_completion_insert_prefix (completion); + if (matches != matches_expected) + g_print ("Match failed, input: %s, result: %s\n", + inputs[i], gtk_entry_get_text (GTK_ENTRY (entry))); + g_assert_cmpint (matches, ==, matches_expected); + } + for (i = 0; i < G_N_ELEMENTS (additions); i++) + { + midori_location_action_add_uri (action, additions[i]); + midori_location_action_delete_item_from_uri (action, additions[i]); + midori_location_action_add_uri (action, additions[i]); + } + for (i = 0; i < G_N_ELEMENTS (inputs); i++) + { + matches_expected++; + gtk_entry_set_text (GTK_ENTRY (entry), inputs[i]); + gtk_entry_completion_complete (completion); + gtk_entry_completion_insert_prefix (completion); + if (matches != matches_expected) + g_print ("Match failed, input: %s, result: %s\n", + inputs[i], gtk_entry_get_text (GTK_ENTRY (entry))); + g_assert_cmpint (matches, ==, matches_expected); + } + for (i = 0; i < G_N_ELEMENTS (additions); i++) + { + matches_expected++; + gtk_entry_set_text (GTK_ENTRY (entry), additions[i]); + gtk_entry_completion_complete (completion); + gtk_entry_completion_insert_prefix (completion); + if (matches != matches_expected) + g_print ("Match failed, input: %s, result: %s\n", + additions[i], gtk_entry_get_text (GTK_ENTRY (entry))); + g_assert_cmpint (matches, ==, matches_expected); + } +} + int main (int argc, char** argv) @@ -183,6 +289,7 @@ main (int argc, g_test_add_func ("/completion/count", completion_count); g_test_add_func ("/completion/fill", completion_fill); + g_test_add_func ("/completion/match", completion_match); return g_test_run (); } From 60e81f734b5eb61219df25cf61f11d2d1a594f8b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 9 Feb 2009 22:03:04 +0100 Subject: [PATCH 0731/2970] Tweak magic URI and add a test string --- midori/sokoke.c | 3 ++- tests/magic-uri.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 78f822cd..8b409f24 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -155,7 +155,8 @@ sokoke_magic_uri (const gchar* uri, { /* Do we have a domain, ip address or localhost? */ search = strchr (uri, ':'); - if (search && search[0] && !g_ascii_isalpha (search[1])) + if (search && search[0] && + !g_ascii_isalpha (search[1]) && search[1] != ' ') if (!strchr (search, '.')) return g_strconcat ("http://", uri, NULL); if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 5192fac3..3fd83367 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -92,6 +92,8 @@ main (int argc, test_input ("g de.po verbose", NULL); test_input ("sm de.po verbose", SM "de.po verbose"); test_input ("javascript:alert(1)", "javascript:alert(1)"); + test_input ("sm warning: configure /dev/net: virtual", + SM "warning: configure /dev/net: virtual"); return 0; } From e727e714da2e463a1c32ec54631d6dc2a2cc5e64 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 11 Feb 2009 23:41:09 +0100 Subject: [PATCH 0732/2970] Add a Preference Show progress in location entry Disabling the preference will suppress the progress bar inside the location entry and also prevent the navigationbar from showing up during loads if it was otherwise hidden. --- midori/midori-browser.c | 16 +++++++++++----- midori/midori-preferences.c | 6 ++++-- midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b48df84a..0d2bd919 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -269,12 +269,16 @@ _midori_browser_update_interface (MidoriBrowser* browser) "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); gtk_widget_show (browser->progressbar); - if (!GTK_WIDGET_VISIBLE (browser->statusbar) - && !GTK_WIDGET_VISIBLE (browser->navigationbar)) + if (!GTK_WIDGET_VISIBLE (browser->statusbar) && + !GTK_WIDGET_VISIBLE (browser->navigationbar) && + katze_object_get_boolean (browser->settings, "progress-in-location")) gtk_widget_show (browser->navigationbar); - action = _action_by_name (browser, "Location"); - midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), - midori_view_get_progress (MIDORI_VIEW (view))); + if (katze_object_get_boolean (browser->settings, "progress-in-location")) + { + action = _action_by_name (browser, "Location"); + midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), + midori_view_get_progress (MIDORI_VIEW (view))); + } } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); @@ -329,6 +333,8 @@ _midori_browser_update_progress (MidoriBrowser* browser, gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), message); g_free (message); + if (!katze_object_get_boolean (browser->settings, "progress-in-location")) + progress = 0.0; midori_location_action_set_progress (action, progress); } else diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c17e6c7a..8a18e17b 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -495,13 +495,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); - #if !HAVE_HILDON FRAME_NEW (_("Navigationbar")); - TABLE_NEW (1, 2); + TABLE_NEW (2, 2); + #if !HAVE_HILDON INDENTED_ADD (katze_property_label (settings, "toolbar-style"), 0, 1, 0, 1); button = katze_property_proxy (settings, "toolbar-style", NULL); FILLED_ADD (button, 1, 2, 0, 1); #endif + button = katze_property_proxy (settings, "progress-in-location", NULL); + FILLED_ADD (button, 1, 2, 1, 2); FRAME_NEW (_("Browsing")); TABLE_NEW (5, 2); label = katze_property_label (settings, "open-new-pages-in"); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 1a729b4f..69be9118 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -39,6 +39,7 @@ struct _MidoriWebSettings gboolean show_statusbar; MidoriToolbarStyle toolbar_style; + gboolean progress_in_location; gchar* toolbar_items; gboolean compact_sidepanel; @@ -102,6 +103,7 @@ enum PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, + PROP_PROGRESS_IN_LOCATION, PROP_TOOLBAR_ITEMS, PROP_COMPACT_SIDEPANEL, @@ -425,6 +427,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_TOOLBAR_DEFAULT, flags)); + /** + * MidoriWebSettings:progress-in-location: + * + * Whether to show loading progress in the location entry. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_PROGRESS_IN_LOCATION, + g_param_spec_boolean ( + "progress-in-location", + _("Show progress in location entry"), + _("Whether to show loading progress in the location entry"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_TOOLBAR_ITEMS, g_param_spec_string ( @@ -956,6 +974,9 @@ midori_web_settings_set_property (GObject* object, case PROP_TOOLBAR_STYLE: web_settings->toolbar_style = g_value_get_enum (value); break; + case PROP_PROGRESS_IN_LOCATION: + web_settings->progress_in_location = g_value_get_boolean (value); + break; case PROP_TOOLBAR_ITEMS: katze_assign (web_settings->toolbar_items, g_value_dup_string (value)); break; @@ -1134,6 +1155,9 @@ midori_web_settings_get_property (GObject* object, case PROP_TOOLBAR_STYLE: g_value_set_enum (value, web_settings->toolbar_style); break; + case PROP_PROGRESS_IN_LOCATION: + g_value_set_boolean (value, web_settings->progress_in_location); + break; case PROP_TOOLBAR_ITEMS: g_value_set_string (value, web_settings->toolbar_items); break; From 647debf64216f05abbd3463b2df992fc30a3080b Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Wed, 11 Feb 2009 23:59:25 +0100 Subject: [PATCH 0733/2970] Update Russian translation --- po/ru.po | 745 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 383 insertions(+), 362 deletions(-) diff --git a/po/ru.po b/po/ru.po index f3aa3786..09c028f9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,187 +8,187 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-17 22:32+0800\n" -"PO-Revision-Date: 2009-01-17 22:37+0800\n" +"POT-Creation-Date: 2009-02-03 22:54+0100\n" +"PO-Revision-Date: 2009-02-08 17:51+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Легковесный обозреватель интернет" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1858 -#: ../midori/main.c:1960 -#: ../midori/main.c:1969 -#: ../midori/main.c:1980 -#: ../midori/midori-websettings.c:239 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1950 +#: ../midori/main.c:2056 +#: ../midori/main.c:2065 +#: ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Обозреватель интернет" -#: ../midori/main.c:87 +#: ../midori/main.c:90 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/main.c:88 -#: ../midori/midori-browser.c:3841 +#: ../midori/main.c:91 +#: ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/main.c:89 +#: ../midori/main.c:92 msgid "_Add Bookmark" msgstr "_Добавить закладку" -#: ../midori/main.c:90 +#: ../midori/main.c:93 msgid "_Console" msgstr "_Консоль" -#: ../midori/main.c:91 +#: ../midori/main.c:94 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/main.c:92 +#: ../midori/main.c:95 msgid "_History" msgstr "_Журнал" -#: ../midori/main.c:93 +#: ../midori/main.c:96 msgid "_Homepage" msgstr "Д_омашняя страница" -#: ../midori/main.c:94 +#: ../midori/main.c:97 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/main.c:95 +#: ../midori/main.c:98 msgid "User_styles" msgstr "С_тили пользователя" -#: ../midori/main.c:96 +#: ../midori/main.c:99 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/main.c:97 +#: ../midori/main.c:100 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/main.c:98 +#: ../midori/main.c:101 msgid "_Closed Tabs and Windows" msgstr "Закрытые _вкладки и окна" -#: ../midori/main.c:99 +#: ../midori/main.c:102 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/main.c:155 +#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:210 +#: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:217 -#: ../midori/main.c:287 +#: ../midori/main.c:220 +#: ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:529 +#: ../midori/main.c:532 msgid "File not found." msgstr "Файл не найден." -#: ../midori/main.c:537 -#: ../midori/main.c:546 +#: ../midori/main.c:540 +#: ../midori/main.c:549 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/main.c:568 +#: ../midori/main.c:571 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:600 +#: ../midori/main.c:603 #, c-format -msgid "Failed to execute SQL statement: %s\n" -msgstr "Не удалось выполнить SQL-запрос: %s\n" +msgid "Failed to execute database statement: %s\n" +msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:654 +#: ../midori/main.c:657 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:678 +#: ../midori/main.c:681 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:711 -#: ../midori/main.c:725 +#: ../midori/main.c:704 +#: ../midori/main.c:738 +#: ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:838 +#: ../midori/main.c:934 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:866 +#: ../midori/main.c:962 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:894 -#: ../midori/main.c:912 +#: ../midori/main.c:991 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:1042 -#: ../midori/sokoke.c:532 +#: ../midori/main.c:1121 +#: ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/main.c:1063 -#: ../midori/main.c:1090 -#: ../midori/main.c:1118 +#: ../midori/main.c:1142 +#: ../midori/main.c:1169 +#: ../midori/main.c:1197 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1142 -#: ../midori/main.c:1166 +#: ../midori/main.c:1221 +#: ../midori/main.c:1245 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:1187 +#: ../midori/main.c:1271 #: ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "Передачи" -#: ../midori/main.c:1223 +#: ../midori/main.c:1312 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1547 +#: ../midori/main.c:1636 msgid "Authentication Required" msgstr "Требуется авторизация" -#: ../midori/main.c:1563 +#: ../midori/main.c:1652 msgid "" "A username and a password are required\n" "to open this location:" @@ -196,1066 +196,1062 @@ msgstr "" "Для просмотра этой страницы требуются\n" "имя пользователя и пароль:" -#: ../midori/main.c:1577 +#: ../midori/main.c:1666 msgid "Username" msgstr "Имя пользователя" -#: ../midori/main.c:1588 +#: ../midori/main.c:1677 msgid "Password" msgstr "Пароль" -#: ../midori/main.c:1694 +#: ../midori/main.c:1783 msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1709 +#: ../midori/main.c:1798 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1713 +#: ../midori/main.c:1802 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1718 +#: ../midori/main.c:1807 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1858 +#: ../midori/main.c:1950 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1890 +#: ../midori/main.c:1982 #: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1913 +#: ../midori/main.c:2005 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1915 +#: ../midori/main.c:2007 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1917 +#: ../midori/main.c:2009 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1957 +#: ../midori/main.c:2053 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1981 +#: ../midori/main.c:2077 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1983 +#: ../midori/main.c:2079 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2106 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:2073 +#: ../midori/main.c:2184 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Не удалось загрузить средства поиска. %s\n" + +#: ../midori/main.c:2196 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:2088 +#: ../midori/main.c:2211 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:2101 +#: ../midori/main.c:2224 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:2114 +#: ../midori/main.c:2237 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:2126 +#: ../midori/main.c:2249 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2142 +#: ../midori/main.c:2265 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-browser.c:248 -#: ../midori/midori-browser.c:3196 -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:258 +#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:260 -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:270 +#: ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:328 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:341 +#: ../midori/midori-browser.c:351 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:524 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:528 +#: ../midori/midori-browser.c:546 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:541 -#: ../midori/midori-searchaction.c:834 +#: ../midori/midori-browser.c:559 +#: ../midori/midori-searchaction.c:854 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:560 -#: ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:578 +#: ../midori/midori-searchaction.c:868 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:596 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:583 -#: ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:601 +#: ../midori/midori-browser.c:638 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:712 +#: ../midori/midori-browser.c:713 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1302 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2434 +#: ../midori/midori-browser.c:2524 +#: ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2436 +#: ../midori/midori-browser.c:2526 +#: ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2687 -msgid "Separator" -msgstr "Разделитель" - -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:2788 #, c-format msgid "A week ago" msgstr "Неделю назад" -#: ../midori/midori-browser.c:2800 +#: ../midori/midori-browser.c:2794 #, c-format msgid "%d days ago" msgstr "%d дней назад" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:2801 msgid "Today" msgstr "Сегодня" -#: ../midori/midori-browser.c:2809 +#: ../midori/midori-browser.c:2803 msgid "Yesterday" msgstr "Вчера" -#: ../midori/midori-browser.c:2898 +#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "Легковесный обозреватель интернет." -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:2900 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3098 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3101 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3104 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3107 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3110 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3112 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3113 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3115 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3116 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3119 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3122 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3124 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3127 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3162 -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3136 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3139 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3142 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3145 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3147 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3148 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3150 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3151 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3186 +#: ../midori/midori-browser.c:3154 msgid "_Quick Find" msgstr "_Быстрый Поиск" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3155 msgid "Quickly jump to a word or phrase" msgstr "Перепрыгнуть на слово или фразу" -#: ../midori/midori-browser.c:3190 +#: ../midori/midori-browser.c:3158 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:3160 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3161 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3213 -#: ../midori/midori-view.c:978 +#: ../midori/midori-browser.c:3181 +#: ../midori/midori-view.c:984 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3182 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3184 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3185 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3189 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3191 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3200 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3202 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3203 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3237 -#: ../midori/midori-view.c:950 +#: ../midori/midori-browser.c:3205 +#: ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3238 +#: ../midori/midori-browser.c:3206 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3210 +#: ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3245 -msgid "Edit the selected bookmark" -msgstr "Редактировать закладку" - -#: ../midori/midori-browser.c:3248 -msgid "Delete the selected bookmark" -msgstr "Удалить закладку" - -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3216 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3221 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3261 -#: ../midori/midori-searchaction.c:462 +#: ../midori/midori-browser.c:3223 +#: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3224 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3266 +#: ../midori/midori-browser.c:3228 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3269 +#: ../midori/midori-browser.c:3231 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3232 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3234 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3236 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3237 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3239 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3240 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3242 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3243 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3284 +#: ../midori/midori-browser.c:3246 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3253 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3297 +#: ../midori/midori-browser.c:3259 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3298 +#: ../midori/midori-browser.c:3260 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3301 +#: ../midori/midori-browser.c:3263 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3264 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3267 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3306 +#: ../midori/midori-browser.c:3268 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3271 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3310 +#: ../midori/midori-browser.c:3272 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3313 +#: ../midori/midori-browser.c:3275 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3276 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3279 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3318 +#: ../midori/midori-browser.c:3280 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3766 +#: ../midori/midori-browser.c:3748 +msgid "_Separator" +msgstr "_Разделитель" + +#: ../midori/midori-browser.c:3755 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3757 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3792 +#: ../midori/midori-browser.c:3781 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3794 +#: ../midori/midori-browser.c:3783 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3813 +#: ../midori/midori-browser.c:3802 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3826 +#: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3843 +#: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3845 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3858 +#: ../midori/midori-browser.c:3847 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:3981 -msgid "Bookmarks" -msgstr "Закладки" - -#: ../midori/midori-browser.c:4024 -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-browser.c:4001 +#: ../midori/midori-preferences.c:597 msgid "History" msgstr "Журнал" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:4050 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4092 +#: ../midori/midori-browser.c:4071 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:4097 +#: ../midori/midori-browser.c:4076 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4081 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4089 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:4098 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4367 +#: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:191 -#: ../midori/midori-panel.c:192 +#: ../midori/midori-panel.c:199 +#: ../midori/midori-panel.c:200 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:149 -#: ../midori/midori-view.c:1706 +#: ../midori/midori-websettings.c:169 +#: ../midori/midori-view.c:1719 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:150 -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:171 msgid "Last open pages" msgstr "Последние закрытые страницы" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:186 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:187 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:188 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:189 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:190 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-websettings.c:171 -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:191 +#: ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:206 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:207 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:208 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:223 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:224 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:225 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:226 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:227 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:242 msgid "All cookies" msgstr "Все куки" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:243 msgid "Session cookies" msgstr "Куки сессии" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:244 #: ../panels/midori-addons.c:96 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:260 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:261 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:262 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:303 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:312 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:313 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:321 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:322 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:347 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:348 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:357 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:358 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:366 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:367 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:376 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:403 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:412 msgid "Show Statusbar" msgstr "Показать вкладку статуса" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:422 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:432 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:451 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:452 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:462 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:477 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:478 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:486 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который сохранялись файлы" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:495 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:496 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:504 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:505 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:513 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:514 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:522 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:523 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:533 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:534 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:542 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:543 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:552 msgid "Open new pages in" msgstr "Открыть новую страницу в" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:553 msgid "Where to open new pages" msgstr "Где открыть новую страницу в" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:563 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:564 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страницы при открытии" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:577 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:578 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:587 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:595 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:605 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:656 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:657 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:667 msgid "Accept cookies" msgstr "Разрешить куки" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:668 msgid "What type of cookies to accept" msgstr "Тип принимаемых куки" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:681 msgid "Original cookies only" msgstr "Только оригинальные куки" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:682 msgid "Accept cookies from the original website only" msgstr "Принимать куки только с оригинального веб-сайта" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:690 msgid "Maximum cookie age" msgstr "Максимальный возраст куки" -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:691 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения куки" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:701 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:702 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:673 +#: ../midori/midori-websettings.c:710 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:719 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:720 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:728 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:729 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:739 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:740 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:760 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:761 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации браузера" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:781 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:782 msgid "The application identification string" msgstr "Строка идентификатора приложения" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:794 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:602 +#: ../midori/midori-view.c:608 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:882 +#: ../midori/midori-view.c:888 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:905 +#: ../midori/midori-view.c:911 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:913 +#: ../midori/midori-view.c:919 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:935 +#: ../midori/midori-view.c:941 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1405 +#: ../midori/midori-view.c:1411 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1554 +#: ../midori/midori-view.c:1562 msgid "Source" msgstr "Исходный код" -#: ../midori/midori-view.c:1578 +#: ../midori/midori-view.c:1586 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1594 +#: ../midori/midori-view.c:1602 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" @@ -1388,63 +1384,63 @@ msgstr "Включить особые расширения для разрабо msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:499 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:505 msgid "Browsing" msgstr "Навигация" -#: ../midori/midori-preferences.c:549 -#: ../midori/midori-preferences.c:550 +#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:543 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:565 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:572 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:586 +#: ../midori/midori-preferences.c:579 msgid "Web Cookies" msgstr "Разрешить куки" -#: ../midori/midori-preferences.c:599 -#: ../midori/midori-preferences.c:611 +#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:604 msgid "days" msgstr "дней" -#: ../midori/midori-searchaction.c:453 +#: ../midori/midori-searchaction.c:455 #: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:810 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:810 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:818 +#: ../midori/midori-searchaction.c:838 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:862 +#: ../midori/midori-searchaction.c:882 msgid "_Icon (name or file):" msgstr "_Значок (имя или файл):" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:896 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1053 +#: ../midori/midori-searchaction.c:1073 msgid "Manage Search Engines" msgstr "Управление поисковыми сервисами" @@ -1454,7 +1450,7 @@ msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:355 +#: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" msgstr "Внимание: используется учётная запись суперпользователя!" @@ -1494,6 +1490,22 @@ msgstr "_Включить" msgid "_Disable" msgstr "_Отключить" +#: ../panels/midori-bookmarks.c:100 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "Редактировать закладку" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "Удалить закладку" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "Разделитель" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Консоль" @@ -1502,6 +1514,11 @@ msgstr "Консоль" msgid "Extensions" msgstr "Дополнения" +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "Модули" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1531,13 +1548,21 @@ msgstr "Выберите файл" msgid "Choose folder" msgstr "Выберите папку" +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Жесты мышью" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Управление Midori с помощью движений мыши" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 -#: ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "Контейнер" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "К_онтейнер" @@ -1549,10 +1574,6 @@ msgstr "Изображения" msgid "Scripts" msgstr "Сценарии" -#: ../extensions/statusbar-features.c:52 -msgid "Plugins" -msgstr "Модули" - #~ msgid "URIs" #~ msgstr "Идентификаторы URI" #~ msgid "[URIs]" From 6f0fc8cf297cdb66198abece988a21275ab49d80 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 12 Feb 2009 00:30:56 +0100 Subject: [PATCH 0734/2970] Adjust 'Icon' label string in Manage Search Engines dialogue --- midori/midori-searchaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index a5ec24e3..e76d2f6f 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -879,7 +879,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - label = gtk_label_new_with_mnemonic (_("_Icon (name or file):")); + label = gtk_label_new_with_mnemonic (_("_Icon:")); gtk_size_group_add_widget (sizegroup, label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_icon = gtk_entry_new (); From 45b47478687b0ce4d0b9d689e6ed8192d8b7f865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 12 Feb 2009 22:37:08 +0100 Subject: [PATCH 0735/2970] Let midori_view_get_selected_text work as expected again --- midori/midori-view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7d15e412..697974ce 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1779,9 +1779,8 @@ midori_view_get_selected_text (MidoriView* view) g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); if (midori_view_has_selection (view)) - return midori_view_get_selected_text (view); - else - return NULL; + return view->selected_text; + return NULL; } /** From d1967241fdd0baeab2c0a934cd78ed9ade6bb9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 12 Feb 2009 22:43:31 +0100 Subject: [PATCH 0736/2970] Fix a memory leak when obtaining the selection from the web view --- midori/midori-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 697974ce..dc35fc61 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1757,8 +1757,8 @@ midori_view_has_selection (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - view->selected_text = webkit_web_view_get_selected_text ( - WEBKIT_WEB_VIEW (view->web_view)); + katze_assign (view->selected_text, webkit_web_view_get_selected_text ( + WEBKIT_WEB_VIEW (view->web_view))); if (view->selected_text && *view->selected_text) return TRUE; else From d810faf933cd9fce10848447355bdab3e958fa99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 12 Feb 2009 23:38:48 +0100 Subject: [PATCH 0737/2970] Implement a hack to make Search the Web menu item useful --- midori/midori-view.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index dc35fc61..6d16148a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -824,6 +824,29 @@ midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, g_signal_emit (view, signals[NEW_WINDOW], 0, view->link_uri); } +static void +midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, + MidoriView* view) +{ + gchar* uri; + gchar* location_entry_search; + + g_object_get (view->settings, "location-entry-search", + &location_entry_search, NULL); + if (strstr (location_entry_search, "%s")) + { + uri = g_strdup_printf (location_entry_search, view->selected_text); + g_free (location_entry_search); + } + else + uri = location_entry_search; + + g_signal_emit (view, signals[NEW_TAB], 0, uri, + view->open_tabs_in_the_background); + + g_free (uri); +} + static void midori_web_view_menu_save_as_activate_cb (GtkWidget* widget, MidoriView* view) @@ -872,6 +895,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, determine that the mouse is over a text area or selection. */ items = gtk_container_get_children (GTK_CONTAINER (menu)); menuitem = (GtkWidget*)g_list_nth_data (items, 0); + g_list_free (items); if (GTK_IS_IMAGE_MENU_ITEM (menuitem)) { icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); @@ -934,6 +958,12 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, if (!view->link_uri && has_selection) { + /* hack to implement Search the Web */ + items = gtk_container_get_children (GTK_CONTAINER (menu)); + menuitem = (GtkWidget*)g_list_nth_data (items, 0); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); + g_list_free (items); if (strchr (view->selected_text, '.') && !strchr (view->selected_text, ' ')) { From f1f27c9322027a63e8d83748d6de3c120ae6e7c2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 12 Feb 2009 23:52:14 +0100 Subject: [PATCH 0738/2970] Don't do any saving on configuration files which are not writable If you have a restricted setup where user configuration is not meant to be saved, Midori will not even monitor changes if the files are not writable. This does *not* prevent any changes at runtime, but nothing will be saved to disk. --- midori/main.c | 130 +++++++++++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 49 deletions(-) diff --git a/midori/main.c b/midori/main.c index e728215c..d0d1b865 100644 --- a/midori/main.c +++ b/midori/main.c @@ -30,6 +30,12 @@ #include "sokoke.h" +#if HAVE_UNISTD_H + #include + #define is_writable(_cfg_filename) !g_access (_cfg_filename, W_OK) +#else + #define is_writable(_cfg_filename) 1 +#endif #include #include #include @@ -1911,6 +1917,7 @@ midori_load_session (gpointer data) KatzeArray* _session = KATZE_ARRAY (data); MidoriBrowser* browser; MidoriApp* app = katze_item_get_parent (KATZE_ITEM (_session)); + gchar* config_file; KatzeArray* session; KatzeItem* item; guint n, i; @@ -1919,8 +1926,10 @@ midori_load_session (gpointer data) midori_app_add_browser (app, browser); gtk_widget_show (GTK_WIDGET (browser)); - g_signal_connect_after (gtk_accel_map_get (), "changed", - G_CALLBACK (accel_map_changed_cb), NULL); + config_file = build_config_filename ("accels"); + if (is_writable (config_file)) + g_signal_connect_after (gtk_accel_map_get (), "changed", + G_CALLBACK (accel_map_changed_cb), NULL); if (katze_array_is_empty (_session)) { @@ -1954,14 +1963,18 @@ midori_load_session (gpointer data) midori_browser_activate_action (browser, "Location"); g_object_unref (_session); - g_signal_connect_after (browser, "notify::uri", - G_CALLBACK (midori_browser_session_cb), session); - g_signal_connect_after (browser, "add-tab", - G_CALLBACK (midori_browser_session_cb), session); - g_signal_connect_after (browser, "remove-tab", - G_CALLBACK (midori_browser_session_cb), session); - g_object_weak_ref (G_OBJECT (session), - (GWeakNotify)(midori_browser_weak_notify_cb), browser); + katze_assign (config_file, build_config_filename ("session.xbel")); + if (is_writable (config_file)) + { + g_signal_connect_after (browser, "notify::uri", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "add-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_signal_connect_after (browser, "remove-tab", + G_CALLBACK (midori_browser_session_cb), session); + g_object_weak_ref (G_OBJECT (session), + (GWeakNotify)(midori_browser_weak_notify_cb), browser); + } return FALSE; } @@ -2347,52 +2360,71 @@ main (int argc, i++; } - g_signal_connect_after (settings, "notify", - G_CALLBACK (settings_notify_cb), NULL); - g_signal_connect_after (search_engines, "add-item", - G_CALLBACK (midori_search_engines_modify_cb), search_engines); - g_signal_connect_after (search_engines, "remove-item", - G_CALLBACK (midori_search_engines_modify_cb), search_engines); - if (!katze_array_is_empty (search_engines)) + katze_assign (config_file, build_config_filename ("config")); + if (is_writable (config_file)) + g_signal_connect_after (settings, "notify", + G_CALLBACK (settings_notify_cb), NULL); + + katze_assign (config_file, build_config_filename ("search")); + if (is_writable (config_file)) { - guint n = katze_array_get_length (search_engines); - for (i = 0; i < n; i++) + g_signal_connect_after (search_engines, "add-item", + G_CALLBACK (midori_search_engines_modify_cb), search_engines); + g_signal_connect_after (search_engines, "remove-item", + G_CALLBACK (midori_search_engines_modify_cb), search_engines); + if (!katze_array_is_empty (search_engines)) { - item = katze_array_get_nth_item (search_engines, i); - g_signal_connect_after (item, "notify", - G_CALLBACK (midori_search_engines_modify_cb), search_engines); - } - } - g_signal_connect_after (bookmarks, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect_after (bookmarks, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); - if (!katze_array_is_empty (bookmarks)) - { - guint n = katze_array_get_length (bookmarks); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (bookmarks, i); - if (KATZE_IS_ARRAY (item)) + guint n = katze_array_get_length (search_engines); + for (i = 0; i < n; i++) { - g_signal_connect_after (item, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + item = katze_array_get_nth_item (search_engines, i); + g_signal_connect_after (item, "notify", + G_CALLBACK (midori_search_engines_modify_cb), search_engines); } - g_signal_connect_after (item, "notify", - G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); } } - g_signal_connect_after (trash, "add-item", - G_CALLBACK (midori_trash_add_item_cb), NULL); - g_signal_connect_after (trash, "remove-item", - G_CALLBACK (midori_trash_remove_item_cb), NULL); + katze_assign (config_file, build_config_filename ("bookmarks.xbel")); + if (is_writable (config_file)) + { + g_signal_connect_after (bookmarks, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect_after (bookmarks, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + if (!katze_array_is_empty (bookmarks)) + { + guint n = katze_array_get_length (bookmarks); + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (bookmarks, i); + if (KATZE_IS_ARRAY (item)) + { + g_signal_connect_after (item, "add-item", + G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); + g_signal_connect_after (item, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + } + g_signal_connect_after (item, "notify", + G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); + } + } + } + katze_assign (config_file, build_config_filename ("tabtrash.xbel")); + if (is_writable (config_file)) + { + g_signal_connect_after (trash, "add-item", + G_CALLBACK (midori_trash_add_item_cb), NULL); + g_signal_connect_after (trash, "remove-item", + G_CALLBACK (midori_trash_remove_item_cb), NULL); + } #ifdef HAVE_SQLITE - g_signal_connect_after (history, "add-item", - G_CALLBACK (midori_history_add_item_cb), db); - g_signal_connect_after (history, "clear", - G_CALLBACK (midori_history_clear_cb), db); + katze_assign (config_file, build_config_filename ("history.db")); + if (is_writable (config_file)) + { + g_signal_connect_after (history, "add-item", + G_CALLBACK (midori_history_add_item_cb), db); + g_signal_connect_after (history, "clear", + G_CALLBACK (midori_history_clear_cb), db); + } #endif /* We test for the presence of a dummy file which is created once From 0d73df50d200fb87b6f8042002f894f9719097c4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 13 Feb 2009 00:49:30 +0100 Subject: [PATCH 0739/2970] Add Detect proxy server automatically to Preferences --- midori/main.c | 12 +++++++++++- midori/midori-preferences.c | 36 ++++++++++++++++++++++++++---------- midori/midori-websettings.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/midori/main.c b/midori/main.c index d0d1b865..b69a868e 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1706,14 +1706,22 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, GParamSpec* pspec, SoupSession* session) { + gboolean auto_detect_proxy; gchar* http_proxy; SoupURI* proxy_uri; - http_proxy = katze_object_get_string (settings, "http-proxy"); + auto_detect_proxy = katze_object_get_boolean (settings, "auto-detect-proxy"); + if (auto_detect_proxy) + http_proxy = g_strdup (g_getenv ("http_proxy")); + else + http_proxy = katze_object_get_string (settings, "http-proxy"); + g_debug (http_proxy); /* soup_uri_new expects a non-NULL string */ proxy_uri = soup_uri_new (http_proxy ? http_proxy : ""); g_free (http_proxy); g_object_set (session, "proxy-uri", proxy_uri, NULL); + if (proxy_uri) + soup_uri_free (proxy_uri); } static void @@ -1748,6 +1756,8 @@ soup_session_constructed_cb (GObject* object) soup_session_settings_notify_ident_string_cb (settings, NULL, session); g_signal_connect (settings, "notify::http-proxy", G_CALLBACK (soup_session_settings_notify_http_proxy_cb), object); + g_signal_connect (settings, "notify::auto-detect-proxy", + G_CALLBACK (soup_session_settings_notify_http_proxy_cb), object); g_signal_connect (settings, "notify::ident-string", G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 8a18e17b..5803cfb4 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -224,6 +224,17 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, } #if HAVE_LIBSOUP +static void +midori_preferences_notify_auto_detect_proxy_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + GtkWidget* entry) +{ + MidoriIdentity auto_detect_proxy = katze_object_get_enum (settings, + "auto-detect-proxy"); + + gtk_widget_set_sensitive (entry, !auto_detect_proxy); +} + static void midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -543,30 +554,35 @@ midori_preferences_set_settings (MidoriPreferences* preferences, { PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); - TABLE_NEW (4, 2); + TABLE_NEW (5, 2); label = katze_property_label (settings, "http-proxy"); INDENTED_ADD (label, 0, 1, 0, 1); - button = katze_property_proxy (settings, "http-proxy", NULL); - FILLED_ADD (button, 1, 2, 0, 1); - label = katze_property_label (settings, "identify-as"); - INDENTED_ADD (label, 0, 1, 1, 2); - button = katze_property_proxy (settings, "identify-as", NULL); + entry = katze_property_proxy (settings, "http-proxy", NULL); + FILLED_ADD (entry, 1, 2, 0, 1); + button = katze_property_proxy (settings, "auto-detect-proxy", NULL); FILLED_ADD (button, 1, 2, 1, 2); - label = katze_property_label (settings, "ident-string"); + g_signal_connect (settings, "notify::auto-detect-proxy", + G_CALLBACK (midori_preferences_notify_auto_detect_proxy_cb), entry); + midori_preferences_notify_auto_detect_proxy_cb (settings, NULL, entry); + label = katze_property_label (settings, "identify-as"); INDENTED_ADD (label, 0, 1, 2, 3); + button = katze_property_proxy (settings, "identify-as", NULL); + FILLED_ADD (button, 1, 2, 2, 3); + label = katze_property_label (settings, "ident-string"); + INDENTED_ADD (label, 0, 1, 3, 4); entry = katze_property_proxy (settings, "ident-string", NULL); g_signal_connect (settings, "notify::identify-as", G_CALLBACK (midori_preferences_notify_identify_as_cb), entry); midori_preferences_notify_identify_as_cb (settings, NULL, entry); - FILLED_ADD (entry, 1, 2, 2, 3); + FILLED_ADD (entry, 1, 2, 3, 4); label = katze_property_label (settings, "cache-size"); - INDENTED_ADD (label, 0, 1, 3, 4); + INDENTED_ADD (label, 0, 1, 4, 5); hbox = gtk_hbox_new (FALSE, 4); entry = katze_property_proxy (settings, "cache-size", NULL); gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); - FILLED_ADD (hbox, 1, 2, 3, 4); + FILLED_ADD (hbox, 1, 2, 4, 5); } #endif diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 69be9118..df1ceca4 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -72,6 +72,7 @@ struct _MidoriWebSettings gboolean remember_last_downloaded_files; gchar* http_proxy; + gboolean auto_detect_proxy; MidoriIdentity identify_as; gchar* ident_string; gint cache_size; @@ -138,6 +139,7 @@ enum PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_HTTP_PROXY, + PROP_AUTO_DETECT_PROXY, PROP_IDENTIFY_AS, PROP_IDENT_STRING, PROP_CACHE_SIZE @@ -763,6 +765,26 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif + /** + * MidoriWebSettings:auto-detect-proxy: + * + * Whether to detect the proxy server automatically from the environment + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_AUTO_DETECT_PROXY, + g_param_spec_boolean ( + "auto-detect-proxy", + _("Detect proxy server automatically"), + _("Whether to detect the proxy server automatically from the environment"), + TRUE, + #if HAVE_LIBSOUP + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + #else + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + #endif + /** * MidoriWebSettings:identify-as: * @@ -1083,6 +1105,9 @@ midori_web_settings_set_property (GObject* object, case PROP_HTTP_PROXY: katze_assign (web_settings->http_proxy, g_value_dup_string (value)); break; + case PROP_AUTO_DETECT_PROXY: + web_settings->auto_detect_proxy = g_value_get_boolean (value); + break; case PROP_IDENTIFY_AS: web_settings->identify_as = g_value_get_enum (value); if (web_settings->identify_as != MIDORI_IDENT_CUSTOM) @@ -1250,6 +1275,9 @@ midori_web_settings_get_property (GObject* object, case PROP_HTTP_PROXY: g_value_set_string (value, web_settings->http_proxy); break; + case PROP_AUTO_DETECT_PROXY: + g_value_set_boolean (value, web_settings->auto_detect_proxy); + break; case PROP_IDENTIFY_AS: g_value_set_enum (value, web_settings->identify_as); break; From e5000a48e038be8b9a4c50415ae1d7c85847ddd6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Feb 2009 02:32:01 +0100 Subject: [PATCH 0740/2970] Don't set the session unless we actually have libSoup --- midori/midori-view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 6d16148a..57cd01b4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1492,8 +1492,10 @@ midori_view_construct_web_view (MidoriView* view) view->web_view = webkit_web_view_new (); if (g_object_class_find_property (G_OBJECT_GET_CLASS (view->web_view), "session")) + #if HAVE_LIBSOUP g_object_set (view->web_view, "session", katze_net_get_session (view->net), NULL); + #endif web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); From e87f5f24554adaed2d907d742e6291cf66cfb1fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Feb 2009 02:34:56 +0100 Subject: [PATCH 0741/2970] Factor HTTP authentication into a soup feature --- katze/katze-http-auth.c | 200 ++++++++++++++++++++++++++++++++++++++++ katze/katze-http-auth.h | 42 +++++++++ katze/katze.h | 1 + midori/main.c | 127 +------------------------ po/POTFILES.in | 1 + 5 files changed, 246 insertions(+), 125 deletions(-) create mode 100644 katze/katze-http-auth.c create mode 100644 katze/katze-http-auth.h diff --git a/katze/katze-http-auth.c b/katze/katze-http-auth.c new file mode 100644 index 00000000..2ba53a56 --- /dev/null +++ b/katze/katze-http-auth.c @@ -0,0 +1,200 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "katze-http-auth.h" + +#if HAVE_LIBSOUP + #include +#endif + +#include +#include + +struct _KatzeHttpAuth +{ + GObject parent_instance; +}; + +struct _KatzeHttpAuthClass +{ + GObjectClass parent_class; +}; + +#if HAVE_LIBSOUP +static void +katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface, + gpointer data); + +G_DEFINE_TYPE_WITH_CODE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, + katze_http_auth_session_feature_iface_init)) + +static void +authentication_dialog_response_cb (GtkWidget* dialog, + gint response, + SoupAuth* auth) +{ + GtkWidget* username; + GtkWidget* password; + SoupSession* session; + SoupMessage* msg; + + if (response == GTK_RESPONSE_OK) + { + + username = g_object_get_data (G_OBJECT (dialog), "username"); + password = g_object_get_data (G_OBJECT (dialog), "password"); + + soup_auth_authenticate (auth, + gtk_entry_get_text (GTK_ENTRY (username)), + gtk_entry_get_text (GTK_ENTRY (password))); + } + + session = g_object_get_data (G_OBJECT (dialog), "session"); + msg = g_object_get_data (G_OBJECT (dialog), "msg"); + gtk_widget_destroy (dialog); + if (g_object_get_data (G_OBJECT (msg), "paused")) + soup_session_unpause_message (session, msg); + g_object_unref (auth); +} + +static void +katze_http_auth_session_authenticate_cb (SoupSession* session, + SoupMessage* msg, + SoupAuth* auth, + gboolean retrying) +{ + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + GtkWidget* hbox; + GtkWidget* image; + GtkWidget* label; + GtkWidget* align; + GtkWidget* entry; + + /* We want to ask for authentication exactly once, so we + enforce this with a tag. There might be a better way. */ + if (!retrying && g_object_get_data (G_OBJECT (msg), "katze-session-tag")) + return; + + if (soup_message_is_keepalive (msg)) + { + /* We use another tag to indicate whether a message is paused. + There doesn't seem to be API in libSoup to find that out. */ + soup_session_pause_message (session, msg); + g_object_set_data (G_OBJECT (msg), "paused", (void*)1); + } + g_object_set_data (G_OBJECT (msg), "katze-session-tag", (void*)1); + + dialog = gtk_dialog_new_with_buttons (_("Authentication Required"), + NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), + GTK_STOCK_DIALOG_AUTHENTICATION); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5); + hbox = gtk_hbox_new (FALSE, 6); + image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, + GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + label = gtk_label_new (_("A username and a password are required\n" + "to open this location:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + label = gtk_label_new (soup_auth_get_host (auth)); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), label); + /* If the realm is merely the host, omit the realm label */ + if (g_strcmp0 (soup_auth_get_host (auth), soup_auth_get_realm (auth))) + { + label = gtk_label_new (soup_auth_get_realm (auth)); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), label); + } + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + hbox = gtk_hbox_new (FALSE, 6); + label = gtk_label_new (_("Username")); + align = gtk_alignment_new (0, 0.5, 0, 0); + gtk_container_add (GTK_CONTAINER (align), label); + gtk_size_group_add_widget (sizegroup, align); + gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); + entry = gtk_entry_new (); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + g_object_set_data (G_OBJECT (dialog), "username", entry); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + hbox = gtk_hbox_new (FALSE, 6); + label = gtk_label_new (_("Password")); + align = gtk_alignment_new (0, 0.5, 0, 0); + gtk_container_add (GTK_CONTAINER (align), label); + gtk_size_group_add_widget (sizegroup, align); + gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); + entry = gtk_entry_new_with_max_length (32); + gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + g_object_set_data (G_OBJECT (dialog), "password", entry); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + + g_object_set_data (G_OBJECT (dialog), "session", session); + g_object_set_data (G_OBJECT (dialog), "msg", msg); + g_signal_connect (dialog, "response", + G_CALLBACK (authentication_dialog_response_cb), g_object_ref (auth)); + gtk_widget_show (dialog); +} + +static void +katze_http_auth_attach (SoupSessionFeature* feature, + SoupSession* session) +{ + g_signal_connect (session, "authenticate", + G_CALLBACK (katze_http_auth_session_authenticate_cb), NULL); +} + +static void +katze_http_auth_detach (SoupSessionFeature* feature, + SoupSession* session) +{ + g_signal_handlers_disconnect_by_func (session, + katze_http_auth_session_authenticate_cb, NULL); +} + +static void +katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface, + gpointer data) +{ + iface->attach = katze_http_auth_attach; + iface->detach = katze_http_auth_detach; +} +#else +G_DEFINE_TYPE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT) +#endif + +static void +katze_http_auth_class_init (KatzeHttpAuthClass* class) +{ + /* Nothing to do. */ +} + +static void +katze_http_auth_init (KatzeHttpAuth* http_auth) +{ + /* Nothing to do. */ +} diff --git a/katze/katze-http-auth.h b/katze/katze-http-auth.h new file mode 100644 index 00000000..908646fd --- /dev/null +++ b/katze/katze-http-auth.h @@ -0,0 +1,42 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_HTTP_AUTH_H__ +#define __KATZE_HTTP_AUTH_H__ + +#include "katze-utils.h" + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_HTTP_AUTH \ + (katze_http_auth_get_type ()) +#define KATZE_HTTP_AUTH(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_AUTH, KatzeHttpAuth)) +#define KATZE_HTTP_AUTH_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_AUTH, KatzeHttpAuthClass)) +#define KATZE_IS_HTTP_AUTH(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_AUTH)) +#define KATZE_IS_HTTP_AUTH_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_AUTH)) +#define KATZE_HTTP_AUTH_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_AUTH, KatzeHttpAuthClass)) + +typedef struct _KatzeHttpAuth KatzeHttpAuth; +typedef struct _KatzeHttpAuthClass KatzeHttpAuthClass; + +GType +katze_http_auth_get_type (void); + +G_END_DECLS + +#endif /* __KATZE_HTTP_AUTH_H__ */ diff --git a/katze/katze.h b/katze/katze.h index 474a8b4a..73030afa 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -12,6 +12,7 @@ #ifndef __KATZE_H__ #define __KATZE_H__ +#include "katze-http-auth.h" #include "katze-throbber.h" #include "katze-utils.h" #include "katze-item.h" diff --git a/midori/main.c b/midori/main.c index b69a868e..ce279e1e 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1581,126 +1581,6 @@ cookie_jar_constructed_cb (GObject* object) #endif } -static void -authentication_dialog_response_cb (GtkWidget* dialog, - gint response, - SoupAuth* auth) -{ - GtkWidget* username; - GtkWidget* password; - SoupSession* session; - SoupMessage* msg; - - if (response == GTK_RESPONSE_OK) - { - - username = g_object_get_data (G_OBJECT (dialog), "username"); - password = g_object_get_data (G_OBJECT (dialog), "password"); - - soup_auth_authenticate (auth, - gtk_entry_get_text (GTK_ENTRY (username)), - gtk_entry_get_text (GTK_ENTRY (password))); - } - - session = g_object_get_data (G_OBJECT (dialog), "session"); - msg = g_object_get_data (G_OBJECT (dialog), "msg"); - gtk_widget_destroy (dialog); - if (g_object_get_data (G_OBJECT (msg), "paused")) - soup_session_unpause_message (session, msg); - g_object_unref (auth); -} - -static void -soup_session_authenticate_cb (SoupSession* session, - SoupMessage* msg, - SoupAuth* auth, - gboolean retrying, - MidoriApp* app) -{ - GtkWidget* dialog; - GtkSizeGroup* sizegroup; - GtkWidget* hbox; - GtkWidget* image; - GtkWidget* label; - GtkWidget* align; - GtkWidget* entry; - - /* We want to ask for authentication exactly once, so we - enforce this with a tag. There might be a better way. */ - if (!retrying && g_object_get_data (G_OBJECT (msg), "midori-session-tag")) - return; - - if (soup_message_is_keepalive (msg)) - { - /* We use another tag to indicate whether a message is paused. - There doesn't seem to be API in libSoup to find that out. */ - soup_session_pause_message (session, msg); - g_object_set_data (G_OBJECT (msg), "paused", (void*)1); - } - g_object_set_data (G_OBJECT (msg), "midori-session-tag", (void*)1); - - dialog = gtk_dialog_new_with_buttons (_("Authentication Required"), - katze_object_get_object (app, "browser"), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_window_set_icon_name (GTK_WINDOW (dialog), - GTK_STOCK_DIALOG_AUTHENTICATION); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); - - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 5); - hbox = gtk_hbox_new (FALSE, 6); - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, - GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - label = gtk_label_new (_("A username and a password are required\n" - "to open this location:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - label = gtk_label_new (soup_auth_get_host (auth)); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), label); - /* If the realm is merely the host, omit the realm label */ - if (g_strcmp0 (soup_auth_get_host (auth), soup_auth_get_realm (auth))) - { - label = gtk_label_new (soup_auth_get_realm (auth)); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), label); - } - sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - hbox = gtk_hbox_new (FALSE, 6); - label = gtk_label_new (_("Username")); - align = gtk_alignment_new (0, 0.5, 0, 0); - gtk_container_add (GTK_CONTAINER (align), label); - gtk_size_group_add_widget (sizegroup, align); - gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); - entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - g_object_set_data (G_OBJECT (dialog), "username", entry); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - hbox = gtk_hbox_new (FALSE, 6); - label = gtk_label_new (_("Password")); - align = gtk_alignment_new (0, 0.5, 0, 0); - gtk_container_add (GTK_CONTAINER (align), label); - gtk_size_group_add_widget (sizegroup, align); - gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); - entry = gtk_entry_new_with_max_length (32); - gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - g_object_set_data (G_OBJECT (dialog), "password", entry); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - - g_object_set_data (G_OBJECT (dialog), "session", session); - g_object_set_data (G_OBJECT (dialog), "msg", msg); - g_signal_connect (dialog, "response", - G_CALLBACK (authentication_dialog_response_cb), g_object_ref (auth)); - gtk_widget_show (dialog); -} - static void soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -1715,7 +1595,6 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, http_proxy = g_strdup (g_getenv ("http_proxy")); else http_proxy = katze_object_get_string (settings, "http-proxy"); - g_debug (http_proxy); /* soup_uri_new expects a non-NULL string */ proxy_uri = soup_uri_new (http_proxy ? http_proxy : ""); g_free (http_proxy); @@ -1761,8 +1640,7 @@ soup_session_constructed_cb (GObject* object) g_signal_connect (settings, "notify::ident-string", G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); - g_signal_connect (session, "authenticate", - G_CALLBACK (soup_session_authenticate_cb), app); + soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); } #endif @@ -2346,8 +2224,7 @@ main (int argc, G_CALLBACK (soup_session_settings_notify_http_proxy_cb), s_session); g_signal_connect (settings, "notify::ident-string", G_CALLBACK (soup_session_settings_notify_ident_string_cb), s_session); - g_signal_connect (s_session, "authenticate", - G_CALLBACK (soup_session_authenticate_cb), app); + soup_session_add_feature_by_type (s_session, KATZE_TYPE_HTTP_AUTH); g_object_unref (net); } #endif diff --git a/po/POTFILES.in b/po/POTFILES.in index 4ab957ed..ab4d273c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,6 +17,7 @@ panels/midori-bookmarks.c panels/midori-console.c panels/midori-extensions.c panels/midori-plugins.c +katze/katze-http-auth.c katze/katze-throbber.c katze/katze-utils.c katze/katze-item.c From 79ed3a06c33df2ed7c58d1976eae2747ffe1eec7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Feb 2009 04:14:01 +0100 Subject: [PATCH 0742/2970] Factor persistent cookies into a soup feature --- katze/katze-http-cookies.c | 328 +++++++++++++++++++++++++++++++++++++ katze/katze-http-cookies.h | 42 +++++ katze/katze.h | 1 + midori/main.c | 271 ++---------------------------- 4 files changed, 381 insertions(+), 261 deletions(-) create mode 100644 katze/katze-http-cookies.c create mode 100644 katze/katze-http-cookies.h diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c new file mode 100644 index 00000000..9a7b6342 --- /dev/null +++ b/katze/katze-http-cookies.c @@ -0,0 +1,328 @@ +/* + Copyright (C) 2008-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "katze-http-cookies.h" + +#if HAVE_LIBSOUP + #include +#endif + +#include +#include +#include + +struct _KatzeHttpCookies +{ + GObject parent_instance; +}; + +struct _KatzeHttpCookiesClass +{ + GObjectClass parent_class; +}; + +#if HAVE_LIBSOUP_2_25_2 +static void +katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, + gpointer data); + +G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, + katze_http_cookies_session_feature_iface_init)); + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static SoupCookie* +parse_cookie (gchar* line, + time_t now) +{ + gchar** result; + SoupCookie *cookie = NULL; + gboolean http_only; + time_t max_age; + gchar* host/*, *is_domain*/, *path, *secure, *expires, *name, *value; + + if (g_str_has_prefix (line, "#HttpOnly_")) + { + http_only = TRUE; + line += strlen ("#HttpOnly_"); + } + else if (*line == '#' || g_ascii_isspace (*line)) + return cookie; + else + http_only = FALSE; + + result = g_strsplit (line, "\t", -1); + if (g_strv_length (result) != 7) + goto out; + + /* Check this first */ + expires = result[4]; + max_age = strtoul (expires, NULL, 10) - now; + if (max_age <= 0) + goto out; + + host = result[0]; + /* is_domain = result[1]; */ + path = result[2]; + secure = result[3]; + + name = result[5]; + value = result[6]; + + cookie = soup_cookie_new (name, value, host, path, max_age); + + if (strcmp (secure, "FALSE")) + soup_cookie_set_secure (cookie, TRUE); + if (http_only) + soup_cookie_set_http_only (cookie, TRUE); + + out: + g_strfreev (result); + + return cookie; +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static void +parse_line (SoupCookieJar* jar, + gchar* line, + time_t now) +{ + SoupCookie* cookie; + + if ((cookie = parse_cookie (line, now))) + soup_cookie_jar_add_cookie (jar, cookie); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static void +cookie_jar_load (SoupCookieJar* jar, + const gchar* filename) +{ + char* contents = NULL; + gchar* line; + gchar* p; + gsize length = 0; + time_t now = time (NULL); + + if (!g_file_get_contents (filename, &contents, &length, NULL)) + return; + + line = contents; + for (p = contents; *p; p++) + { + /* \r\n comes out as an extra empty line and gets ignored */ + if (*p == '\r' || *p == '\n') + { + *p = '\0'; + parse_line (jar, line, now); + line = p + 1; + } + } + parse_line (jar, line, now); + + g_free (contents); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Copied from libSoup 2.24, coding style preserved */ +static void +write_cookie (FILE *out, SoupCookie *cookie) +{ + fseek (out, 0, SEEK_END); + + fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n", + cookie->http_only ? "#HttpOnly_" : "", + cookie->domain, + *cookie->domain == '.' ? "TRUE" : "FALSE", + cookie->path, + cookie->secure ? "TRUE" : "FALSE", + (gulong)soup_date_to_time_t (cookie->expires), + cookie->name, + cookie->value); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Copied from libSoup 2.24, coding style preserved */ +static void +delete_cookie (const char *filename, SoupCookie *cookie) +{ + char *contents = NULL, *line, *p; + gsize length = 0; + FILE *f; + SoupCookie *c; + time_t now = time (NULL); + + if (!g_file_get_contents (filename, &contents, &length, NULL)) + return; + + f = fopen (filename, "w"); + if (!f) { + g_free (contents); + return; + } + + line = contents; + for (p = contents; *p; p++) { + /* \r\n comes out as an extra empty line and gets ignored */ + if (*p == '\r' || *p == '\n') { + *p = '\0'; + c = parse_cookie (line, now); + if (!c) + continue; + if (!soup_cookie_equal (cookie, c)) + write_cookie (f, c); + line = p + 1; + soup_cookie_free (c); + } + } + c = parse_cookie (line, now); + if (c) { + if (!soup_cookie_equal (cookie, c)) + write_cookie (f, c); + soup_cookie_free (c); + } + + g_free (contents); + fclose (f); +} + +/* Cookie jar saving to Mozilla format + Copyright (C) 2008 Xan Lopez + Copyright (C) 2008 Dan Winship + Mostly copied from libSoup 2.24, coding style adjusted */ +static void +cookie_jar_changed_cb (SoupCookieJar* jar, + SoupCookie* old_cookie, + SoupCookie* new_cookie, + gchar* filename) +{ + GObject* app; + GObject* settings; + guint accept_cookies; + + if (old_cookie) + delete_cookie (filename, old_cookie); + + if (new_cookie) + { + FILE *out; + + /* FIXME: This is really a hack */ + app = g_type_get_qdata (SOUP_TYPE_SESSION, + g_quark_from_static_string ("midori-app")); + settings = katze_object_get_object (G_OBJECT (app), "settings"); + accept_cookies = katze_object_get_enum (settings, "accept-cookies"); + if (accept_cookies == 2 /* MIDORI_ACCEPT_COOKIES_NONE */) + { + soup_cookie_jar_delete_cookie (jar, new_cookie); + } + else if (accept_cookies == 1 /* MIDORI_ACCEPT_COOKIES_SESSION */ + && new_cookie->expires) + { + soup_cookie_jar_delete_cookie (jar, new_cookie); + } + else if (new_cookie->expires) + { + gint age = katze_object_get_int (settings, "maximum-cookie-age"); + soup_cookie_set_max_age (new_cookie, + age * SOUP_COOKIE_MAX_AGE_ONE_DAY); + + if (!(out = fopen (filename, "a"))) + return; + write_cookie (out, new_cookie); + if (fclose (out) != 0) + return; + } + } +} + +static void +katze_http_cookies_session_request_queued_cb (SoupSession* session, + SoupMessage* msg, + SoupSessionFeature* feature) +{ + const gchar* filename; + SoupSessionFeature* cookie_jar; + + filename = g_object_get_data (G_OBJECT (feature), "filename"); + if (!filename) + return; + + cookie_jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); + if (!cookie_jar) + return; + + g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, + g_quark_from_static_string ("midori-has-jar"), (void*)1); + cookie_jar_load (SOUP_COOKIE_JAR (cookie_jar), filename); + g_signal_connect_data (cookie_jar, "changed", + G_CALLBACK (cookie_jar_changed_cb), g_strdup (filename), + (GClosureNotify)g_free, 0); + g_signal_handlers_disconnect_by_func (session, + katze_http_cookies_session_request_queued_cb, feature); +} + +static void +katze_http_cookies_attach (SoupSessionFeature* feature, + SoupSession* session) +{ + g_signal_connect (session, "request-queued", + G_CALLBACK (katze_http_cookies_session_request_queued_cb), feature); +} + +static void +katze_http_cookies_detach (SoupSessionFeature* feature, + SoupSession* session) +{ + g_signal_handlers_disconnect_by_func (session, + katze_http_cookies_session_request_queued_cb, feature); +} + +static void +katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, + gpointer data) +{ + iface->attach = katze_http_cookies_attach; + iface->detach = katze_http_cookies_detach; +} +#else +G_DEFINE_TYPE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT) +#endif + +static void +katze_http_cookies_class_init (KatzeHttpCookiesClass* class) +{ + /* Nothing to do. */ +} + +static void +katze_http_cookies_init (KatzeHttpCookies* http_cookies) +{ + /* Nothing to do. */ +} diff --git a/katze/katze-http-cookies.h b/katze/katze-http-cookies.h new file mode 100644 index 00000000..97caa271 --- /dev/null +++ b/katze/katze-http-cookies.h @@ -0,0 +1,42 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __KATZE_HTTP_COOKIES_H__ +#define __KATZE_HTTP_COOKIES_H__ + +#include "katze-utils.h" + +#include + +G_BEGIN_DECLS + +#define KATZE_TYPE_HTTP_COOKIES \ + (katze_http_cookies_get_type ()) +#define KATZE_HTTP_COOKIES(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookies)) +#define KATZE_HTTP_COOKIES_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookiesClass)) +#define KATZE_IS_HTTP_COOKIES(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_COOKIES)) +#define KATZE_IS_HTTP_COOKIES_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_COOKIES)) +#define KATZE_HTTP_COOKIES_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookiesClass)) + +typedef struct _KatzeHttpCookies KatzeHttpCookies; +typedef struct _KatzeHttpCookiesClass KatzeHttpCookiesClass; + +GType +katze_http_cookies_get_type (void); + +G_END_DECLS + +#endif /* __KATZE_HTTP_COOKIES_H__ */ diff --git a/katze/katze.h b/katze/katze.h index 73030afa..d2616768 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -13,6 +13,7 @@ #define __KATZE_H__ #include "katze-http-auth.h" +#include "katze-http-cookies.h" #include "katze-throbber.h" #include "katze-utils.h" #include "katze-item.h" diff --git a/midori/main.c b/midori/main.c index ce279e1e..a3d6d47b 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1329,257 +1329,8 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } -typedef void (*GObjectConstructed) (GObject*); - -#if HAVE_LIBSOUP_2_25_2 -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Mostly copied from libSoup 2.24, coding style adjusted */ -static SoupCookie* -parse_cookie (gchar* line, - time_t now) -{ - gchar** result; - SoupCookie *cookie = NULL; - gboolean http_only; - time_t max_age; - gchar* host/*, *is_domain*/, *path, *secure, *expires, *name, *value; - - if (g_str_has_prefix (line, "#HttpOnly_")) - { - http_only = TRUE; - line += strlen ("#HttpOnly_"); - } - else if (*line == '#' || g_ascii_isspace (*line)) - return cookie; - else - http_only = FALSE; - - result = g_strsplit (line, "\t", -1); - if (g_strv_length (result) != 7) - goto out; - - /* Check this first */ - expires = result[4]; - max_age = strtoul (expires, NULL, 10) - now; - if (max_age <= 0) - goto out; - - host = result[0]; - /* is_domain = result[1]; */ - path = result[2]; - secure = result[3]; - - name = result[5]; - value = result[6]; - - cookie = soup_cookie_new (name, value, host, path, max_age); - - if (strcmp (secure, "FALSE")) - soup_cookie_set_secure (cookie, TRUE); - if (http_only) - soup_cookie_set_http_only (cookie, TRUE); - - out: - g_strfreev (result); - - return cookie; -} - -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Mostly copied from libSoup 2.24, coding style adjusted */ -static void -parse_line (SoupCookieJar* jar, - gchar* line, - time_t now) -{ - SoupCookie* cookie; - - if ((cookie = parse_cookie (line, now))) - soup_cookie_jar_add_cookie (jar, cookie); -} - -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Mostly copied from libSoup 2.24, coding style adjusted */ -static void -cookie_jar_load (SoupCookieJar* jar, - const gchar* filename) -{ - char* contents = NULL; - gchar* line; - gchar* p; - gsize length = 0; - time_t now = time (NULL); - - if (!g_file_get_contents (filename, &contents, &length, NULL)) - return; - - line = contents; - for (p = contents; *p; p++) - { - /* \r\n comes out as an extra empty line and gets ignored */ - if (*p == '\r' || *p == '\n') - { - *p = '\0'; - parse_line (jar, line, now); - line = p + 1; - } - } - parse_line (jar, line, now); - - g_free (contents); -} - -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Copied from libSoup 2.24, coding style preserved */ -static void -write_cookie (FILE *out, SoupCookie *cookie) -{ - fseek (out, 0, SEEK_END); - - fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n", - cookie->http_only ? "#HttpOnly_" : "", - cookie->domain, - *cookie->domain == '.' ? "TRUE" : "FALSE", - cookie->path, - cookie->secure ? "TRUE" : "FALSE", - (gulong)soup_date_to_time_t (cookie->expires), - cookie->name, - cookie->value); -} - -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Copied from libSoup 2.24, coding style preserved */ -static void -delete_cookie (const char *filename, SoupCookie *cookie) -{ - char *contents = NULL, *line, *p; - gsize length = 0; - FILE *f; - SoupCookie *c; - time_t now = time (NULL); - - if (!g_file_get_contents (filename, &contents, &length, NULL)) - return; - - f = fopen (filename, "w"); - if (!f) { - g_free (contents); - return; - } - - line = contents; - for (p = contents; *p; p++) { - /* \r\n comes out as an extra empty line and gets ignored */ - if (*p == '\r' || *p == '\n') { - *p = '\0'; - c = parse_cookie (line, now); - if (!c) - continue; - if (!soup_cookie_equal (cookie, c)) - write_cookie (f, c); - line = p + 1; - soup_cookie_free (c); - } - } - c = parse_cookie (line, now); - if (c) { - if (!soup_cookie_equal (cookie, c)) - write_cookie (f, c); - soup_cookie_free (c); - } - - g_free (contents); - fclose (f); -} - -/* Cookie jar saving to Mozilla format - Copyright (C) 2008 Xan Lopez - Copyright (C) 2008 Dan Winship - Mostly copied from libSoup 2.24, coding style adjusted */ -static void -cookie_jar_changed_cb (SoupCookieJar* jar, - SoupCookie* old_cookie, - SoupCookie* new_cookie, - gchar* filename) -{ - MidoriApp* app; - MidoriWebSettings* settings; - MidoriAcceptCookies accept_cookies; - - if (old_cookie) - delete_cookie (filename, old_cookie); - - if (new_cookie) - { - FILE *out; - - app = g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-app")); - settings = katze_object_get_object (G_OBJECT (app), "settings"); - accept_cookies = katze_object_get_enum (settings, "accept-cookies"); - if (accept_cookies == MIDORI_ACCEPT_COOKIES_NONE) - { - soup_cookie_jar_delete_cookie (jar, new_cookie); - } - else if (accept_cookies == MIDORI_ACCEPT_COOKIES_SESSION - && new_cookie->expires) - { - soup_cookie_jar_delete_cookie (jar, new_cookie); - } - else if (new_cookie->expires) - { - gint age = katze_object_get_int (settings, "maximum-cookie-age"); - soup_cookie_set_max_age (new_cookie, - age * SOUP_COOKIE_MAX_AGE_ONE_DAY); - - if (!(out = fopen (filename, "a"))) - return; - write_cookie (out, new_cookie); - if (fclose (out) != 0) - return; - } - } -} -#endif - #if HAVE_LIBSOUP -/* The following code hooks up to any created cookie jar in order to - load and save cookies. This is *not* a generally advisable technique - but merely a preliminary workaround until WebKit exposes its - network backend and we can pass our own jar. */ -static GObjectConstructed old_jar_constructed_cb; -static void -cookie_jar_constructed_cb (GObject* object) -{ - #if HAVE_LIBSOUP_2_25_2 - gchar* config_file; - SoupCookieJar* jar; - #endif - - if (old_jar_constructed_cb) - old_jar_constructed_cb (object); - g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar"), (void*)1); - - #if HAVE_LIBSOUP_2_25_2 - config_file = build_config_filename ("cookies.txt"); - jar = SOUP_COOKIE_JAR (object); - cookie_jar_load (jar, config_file); - g_signal_connect_data (jar, "changed", - G_CALLBACK (cookie_jar_changed_cb), config_file, - (GClosureNotify)g_free, 0); - #endif -} +typedef void (*GObjectConstructed) (GObject*); static void soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, @@ -1623,6 +1374,8 @@ soup_session_constructed_cb (GObject* object) MidoriApp* app; MidoriWebSettings* settings; SoupSession* session; + SoupSessionFeature* feature; + gchar* config_file; if (old_session_constructed_cb) old_session_constructed_cb (object); @@ -1641,6 +1394,12 @@ soup_session_constructed_cb (GObject* object) G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); + + feature = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL); + config_file = build_config_filename ("cookies.txt"); + g_object_set_data_full (G_OBJECT (feature), "filename", + config_file, (GDestroyNotify)g_free); + soup_session_add_feature (session, feature); } #endif @@ -2039,17 +1798,6 @@ main (int argc, webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); if (!g_object_class_find_property (webkit_class, "session")) { - /* This is a nasty trick that allows us to manipulate cookies - even without having a pointer to the jar. */ - soup_cookie_jar_get_type (); - SoupCookieJarClass* jar_class = g_type_class_ref (SOUP_TYPE_COOKIE_JAR); - if (jar_class) - { - g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-app"), app); - old_jar_constructed_cb = G_OBJECT_CLASS (jar_class)->constructed; - G_OBJECT_CLASS (jar_class)->constructed = cookie_jar_constructed_cb; - } /* This is a nasty trick that allows us to manipulate preferences even without having a pointer to the session. */ soup_session_get_type (); @@ -2215,6 +1963,7 @@ main (int argc, #if HAVE_LIBSOUP_2_25_2 katze_assign (config_file, build_config_filename ("cookies.txt")); jar = soup_cookie_jar_text_new (config_file, FALSE); + /* FIXME: Handle "accept-cookies" preference */ soup_session_add_feature (s_session, SOUP_SESSION_FEATURE (jar)); g_object_unref (jar); #endif From fb8dedfaac0b000147bf6669fef32dcacb155c75 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Feb 2009 11:52:09 +0100 Subject: [PATCH 0743/2970] Cancel looking for default search engines properly --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index a3d6d47b..fcadcd1c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1839,7 +1839,7 @@ main (int argc, g_build_filename (config_dirs[i], PACKAGE_NAME, "search", NULL)); search_engines = search_engines_new_from_file (config_file, NULL); if (!katze_array_is_empty (search_engines)) - continue; + break; i++; } if (katze_array_is_empty (search_engines)) From 6af1840e75795670c94835cf1298ca073b5d9b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 14 Feb 2009 12:36:18 +0100 Subject: [PATCH 0744/2970] Convert source code for display from the locale encoding --- midori/midori-source.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/midori/midori-source.c b/midori/midori-source.c index 1bd98774..21524340 100644 --- a/midori/midori-source.c +++ b/midori/midori-source.c @@ -87,6 +87,7 @@ midori_source_transfer_cb (KatzeNetRequest* request, { gchar** mimev; gchar* charset; + const gchar* default_charset; gchar* contents_utf8; GtkTextBuffer* buffer; @@ -103,8 +104,14 @@ midori_source_transfer_cb (KatzeNetRequest* request, charset = g_strdup (&mimev[1][8]); g_strfreev (mimev); } + g_get_charset (&default_charset); contents_utf8 = g_convert (request->data, -1, "UTF-8", - charset ? charset : "ISO-8859-1", NULL, NULL, NULL); + charset ? charset : default_charset, NULL, NULL, NULL); + /* If conversion from the user's locale also failed, + try ISO-8859-1 as a last resort */ + if (!contents_utf8) + contents_utf8 = g_convert (request->data, -1, "UTF-8", + "ISO-8859-1", NULL, NULL, NULL); } else contents_utf8 = (gchar*)request->data; From 3535c6e767afce4a602a41e791ca02775a69afbe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Feb 2009 13:30:10 +0100 Subject: [PATCH 0745/2970] Localize menu items provided by WebKit --- midori/midori-view.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 57cd01b4..a6957b0c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -26,6 +26,14 @@ #include #include +#if GLIB_CHECK_VERSION (2, 18, 0) + #define D_(__domain, __message) g_dgettext (__domain, __message) +#elif ENABLE_NLS + #define D_(__domain, __message) dgettext (__domain, __message) +#else + #define D_(__domain, __message) __message +#endif + #ifndef WEBKIT_CHECK_VERSION #define WEBKIT_CHECK_VERSION(a,b,c) 0 #endif @@ -888,6 +896,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, GtkIconTheme* icon_theme; GList* items; gboolean has_selection; + GtkWidget* label; has_selection = midori_view_has_selection (view); @@ -908,6 +917,11 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, if (view->link_uri) { + items = gtk_container_get_children (GTK_CONTAINER (menu)); + menuitem = (GtkWidget*)g_list_nth_data (items, 0); + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), _("Open _Link")); menuitem = gtk_image_menu_item_new_with_mnemonic ( _("Open Link in New _Tab")); screen = gtk_widget_get_screen (GTK_WIDGET (view)); @@ -921,9 +935,13 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), view); gtk_widget_show (menuitem); - /* hack to implement New Window */ + g_list_free (items); items = gtk_container_get_children (GTK_CONTAINER (menu)); menuitem = (GtkWidget*)g_list_nth_data (items, 2); + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), _("Open Link in New _Window")); + /* hack to implement New Window */ g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_new_window_activate_cb), view); menuitem = (GtkWidget*)g_list_nth_data (items, 3); @@ -958,9 +976,12 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, if (!view->link_uri && has_selection) { - /* hack to implement Search the Web */ items = gtk_container_get_children (GTK_CONTAINER (menu)); menuitem = (GtkWidget*)g_list_nth_data (items, 0); + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), _("_Search the Web")); + /* hack to implement Search the Web */ g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); g_list_free (items); @@ -983,6 +1004,12 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, if (!view->link_uri && !has_selection) { + items = gtk_container_get_children (GTK_CONTAINER (menu)); + menuitem = (GtkWidget*)g_list_nth_data (items, 3); + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), D_("gtk20", "_Refresh")); + g_list_free (items); menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); icon = gtk_image_new_from_stock (GTK_STOCK_UNDELETE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); From 1c029e8948a9caf7dcf99a534794f61b9965d7b1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 15 Feb 2009 22:01:27 +0100 Subject: [PATCH 0746/2970] Build 'panels' as a static library to enable their use in tests --- midori/wscript_build | 15 +++++++++++++-- tests/wscript_build | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/midori/wscript_build b/midori/wscript_build index 5d0ddf3c..cae4674f 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -14,6 +14,18 @@ obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON' obj.uselib_local = 'katze' obj.install_path = None +if platform.architecture ()[0] == '64bit': + obj.env.append_value ('CCFLAGS', '-fPIC') + +obj = bld.new_task_gen ('cc', 'staticlib') +obj.name = 'panels' +obj.target = 'panels' +obj.includes = '. ..' +obj.find_sources_in_dirs ('../panels') +obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' +obj.uselib_local = 'midori' +obj.install_path = None + if platform.architecture ()[0] == '64bit': obj.env.append_value ('CCFLAGS', '-fPIC') @@ -21,6 +33,5 @@ obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' obj.includes = '. .. ../panels' obj.source = 'main.c' -obj.find_sources_in_dirs ('../panels') obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' -obj.uselib_local = 'midori' +obj.uselib_local = 'panels' diff --git a/tests/wscript_build b/tests/wscript_build index e167569b..2de915cb 100644 --- a/tests/wscript_build +++ b/tests/wscript_build @@ -23,8 +23,8 @@ for test in tests: obj = bld.new_task_gen ('cc', 'program') obj.target = 'test-' + target - obj.includes = '.. ../midori' + obj.includes = '.. ../midori ../panels' obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' - obj.uselib_local = 'midori' + obj.uselib_local = 'panels' obj.unit_test = 1 From 9d754d2d510e9a7311474c897a3539e99b4b12c8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Feb 2009 03:05:25 +0100 Subject: [PATCH 0747/2970] Fix config file writability test and search engine error workaround After the change to recognize read-only configuration files new files would never be written anymore. Also the default search engines wouldn't be used if no search engines file existed. --- midori/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index fcadcd1c..d412cd99 100644 --- a/midori/main.c +++ b/midori/main.c @@ -32,7 +32,9 @@ #if HAVE_UNISTD_H #include - #define is_writable(_cfg_filename) !g_access (_cfg_filename, W_OK) + #define is_writable(_cfg_filename) \ + !g_access (_cfg_filename, W_OK) || \ + !g_file_test (_cfg_filename, G_FILE_TEST_EXISTS) #else #define is_writable(_cfg_filename) 1 #endif @@ -1823,7 +1825,8 @@ main (int argc, error = NULL; search_engines = search_engines_new_from_file (config_file, &error); /* We ignore for instance empty files */ - if (error && error->code == G_KEY_FILE_ERROR_PARSE) + if (error && (error->code == G_KEY_FILE_ERROR_PARSE + || error->code == G_FILE_ERROR_NOENT)) { g_error_free (error); error = NULL; From f30dff433056e239ca775d16f343bdb249f1a338 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Feb 2009 03:24:49 +0100 Subject: [PATCH 0748/2970] Add WebBrowser sub-category to desktop file --- data/midori.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/midori.desktop.in b/data/midori.desktop.in index fc28df34..d5c3515f 100644 --- a/data/midori.desktop.in +++ b/data/midori.desktop.in @@ -4,7 +4,7 @@ Type=Application _Name=Midori _GenericName=Web Browser _Comment=Lightweight web browser -Categories=GTK;Network; +Categories=GTK;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;application/xml; Exec=midori %u Icon=midori From bbe809cacfe6a1c66c44c1ac700b7387a397cd7b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 17 Feb 2009 00:16:14 +0100 Subject: [PATCH 0749/2970] Support IDN by decoding domain names in magic_uri --- midori/sokoke.c | 55 ++++++++++++++++++++++++++++++++++++++++---- midori/wscript_build | 2 +- tests/magic-uri.c | 15 ++++++++++++ wscript | 10 ++++++++ 4 files changed, 77 insertions(+), 5 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 8b409f24..8a756e6e 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,19 @@ #if HAVE_UNISTD_H #include #endif +#include #include #include #include #include +#if HAVE_LIBIDN + #include + #include + #include +#endif + static gchar* sokoke_js_string_utf8 (JSStringRef js_string) { @@ -120,6 +127,46 @@ sokoke_spawn_program (const gchar* command, return TRUE; } +static gchar* +sokoke_idn_to_punycode (gchar* uri) +{ + #if HAVE_LIBIDN + gchar* hostname; + char *s; + uint32_t *q; + int rc; + gchar *result; + + if (g_str_has_prefix (uri, "http://")) + hostname = &uri[7]; + else if (g_str_has_prefix (uri, "https://")) + hostname = &uri[8]; + else + hostname = uri; + + if (!(q = stringprep_utf8_to_ucs4 (hostname, -1, NULL))) + return uri; + + rc = idna_to_ascii_4z (q, &s, IDNA_ALLOW_UNASSIGNED); + free (q); + if (rc != IDNA_SUCCESS) + return uri; + + if (g_str_has_prefix (uri, "http://")) + result = g_strdup_printf ("http://%s", s); + else if (g_str_has_prefix (uri, "https://")) + result = g_strdup_printf ("https://%s", s); + else + result = g_strdup (s); + g_free (uri); + free (s); + + return result; + #else + return uri; + #endif +} + gchar* sokoke_magic_uri (const gchar* uri, KatzeArray* search_engines) @@ -158,7 +205,7 @@ sokoke_magic_uri (const gchar* uri, if (search && search[0] && !g_ascii_isalpha (search[1]) && search[1] != ' ') if (!strchr (search, '.')) - return g_strconcat ("http://", uri, NULL); + return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) return g_strconcat ("http://", uri, NULL); parts = g_strsplit (uri, ".", 0); @@ -170,7 +217,7 @@ sokoke_magic_uri (const gchar* uri, search = g_strconcat ("http://", uri, NULL); g_free (parts); if (search) - return search; + return sokoke_idn_to_punycode (search); } /* We don't want to search? So return early. */ if (!search_engines) @@ -195,7 +242,7 @@ sokoke_magic_uri (const gchar* uri, } return search; } - return g_strdup (uri); + return sokoke_idn_to_punycode (g_strdup (uri)); } void diff --git a/midori/wscript_build b/midori/wscript_build index cae4674f..91f53026 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -10,7 +10,7 @@ obj.target = 'midori' obj.includes = '. ..' obj.find_sources_in_dirs ('.', excludes=['main.c']) obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') -obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON' +obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON' obj.uselib_local = 'katze' obj.install_path = None diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 3fd83367..38046f73 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -94,6 +94,21 @@ main (int argc, test_input ("javascript:alert(1)", "javascript:alert(1)"); test_input ("sm warning: configure /dev/net: virtual", SM "warning: configure /dev/net: virtual"); + #if HAVE_LIBIDN + test_input ("http://www.münchhausen.at", "http://www.xn--mnchhausen-9db.at"); + test_input ("http://www.خداوند.com/", "http://www.xn--mgbndb8il.com/"); + test_input ("айкидо.com", "http://xn--80aildf0a.com"); + test_input ("http://東京理科大学.jp", "http://xn--1lq68wkwbj6ugkpigi.jp"); + test_input ("https://青のネコ", "https://xn--u9jthzcs263c"); + #else + test_input ("http://www.münchhausen.at", "http://www.münchhausen.at"); + test_input ("http://www.خداوند.com/", "http://www.خداوند.com/"); + test_input ("айкидо.com", "http://айкидо.com"); + test_input ("http://東京理科大学.jp", "http://東京理科大学.jp"); + test_input ("https://青のネコ.co.jp", "https://青のネコ.co.jp"); + #endif + test_input ("sm Küchenzubehör", SM "Küchenzubehör"); + test_input ("sm 東京理科大学", SM "東京理科大学"); return 0; } diff --git a/wscript b/wscript index c8518dda..9107e96f 100644 --- a/wscript +++ b/wscript @@ -134,6 +134,14 @@ def configure (conf): conf.define ('HAVE_LIBSOUP', [0,1][libsoup == 'yes']) conf.define ('HAVE_LIBSOUP_2_25_2', [0,1][libsoup_25_2 == 'yes']) + if option_enabled ('libidn'): + check_pkg ('libidn', '1.0', False) + libidn = ['N/A','yes'][conf.env['HAVE_LIBIDN'] == 1] + else: + option_checkfatal ('libidn', 'international domain names') + libidn = 'no ' + conf.define ('HAVE_LIBIDN', [0,1][libidn == 'yes']) + if option_enabled ('sqlite'): check_pkg ('sqlite3', '3.0', False, var='SQLITE') sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1] @@ -238,6 +246,7 @@ def configure (conf): Utils.pprint ('RED', 'WebKit was NOT built with libsoup') except: pass + print "IDN support: " + libidn + " (libidn)" print "Persistent history: " + sqlite + " (sqlite3)" print "Maemo integration: " + hildon + " (hildon)" @@ -277,6 +286,7 @@ def set_options (opt): group = opt.add_option_group ('Optional features', '') add_enable_option ('unique', 'single instance support', group) add_enable_option ('libsoup', 'icon and view source support', group) + add_enable_option ('libidn', 'international domain name support', group) add_enable_option ('sqlite', 'history database support', group) add_enable_option ('addons', 'building of extensions', group) add_enable_option ('hildon', 'Maemo integration', group) From 55614c7ecaafdbc73fcf0452280188d39b4588c0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 17 Feb 2009 14:17:28 +0100 Subject: [PATCH 0750/2970] Print soup log if MIDORI_SOUP_DEBUG is set (levels 1-3) --- midori/main.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/midori/main.c b/midori/main.c index d412cd99..fe7f62ba 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1366,6 +1366,20 @@ soup_session_settings_notify_ident_string_cb (MidoriWebSettings* settings, g_free (ident_string); } +static void +midori_soup_session_debug (SoupSession* session) +{ + const char* soup_debug = g_getenv ("MIDORI_SOUP_DEBUG"); + + if (soup_debug) + { + gint soup_debug_level = atoi (soup_debug); + SoupLogger* logger = soup_logger_new (soup_debug_level, -1); + soup_logger_attach (logger, session); + g_object_unref (logger); + } +} + /* The following code hooks up to any created soup session in order to modify preferences. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its session. */ @@ -1396,6 +1410,7 @@ soup_session_constructed_cb (GObject* object) G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); + midori_soup_session_debug (session); feature = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL); config_file = build_config_filename ("cookies.txt"); @@ -1977,6 +1992,7 @@ main (int argc, g_signal_connect (settings, "notify::ident-string", G_CALLBACK (soup_session_settings_notify_ident_string_cb), s_session); soup_session_add_feature_by_type (s_session, KATZE_TYPE_HTTP_AUTH); + midori_soup_session_debug (s_session); g_object_unref (net); } #endif From 3763990c3ad038013a3db7052f67c4c516a53560 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 17 Feb 2009 17:55:18 +0100 Subject: [PATCH 0751/2970] Correct MidoriWindowState definition, this fixes window state saving --- midori/midori-websettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 72b692cc..84742759 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -46,7 +46,7 @@ GType midori_window_state_get_type (void) G_GNUC_CONST; #define MIDORI_TYPE_WINDOW_STATE \ - (midori_startup_get_type ()) + (midori_window_state_get_type ()) typedef enum { From 5aaff908cbc7772d27f232f45c0cdaca1be7bef9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 17 Feb 2009 18:34:27 +0100 Subject: [PATCH 0752/2970] Only add the Auth feature if WebKit didn't already --- katze/katze-http-auth.c | 4 ++-- midori/main.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/katze/katze-http-auth.c b/katze/katze-http-auth.c index 2ba53a56..fd15d87c 100644 --- a/katze/katze-http-auth.c +++ b/katze/katze-http-auth.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -39,7 +39,7 @@ katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface, G_DEFINE_TYPE_WITH_CODE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, - katze_http_auth_session_feature_iface_init)) + katze_http_auth_session_feature_iface_init)); static void authentication_dialog_response_cb (GtkWidget* dialog, diff --git a/midori/main.c b/midori/main.c index fe7f62ba..8c7d81f5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -216,10 +216,10 @@ settings_new_from_file (const gchar* filename) enum_value->value_name, NULL); enum_value = g_enum_get_value_by_name (enum_class, str); if (enum_value) - g_object_set (settings, property, enum_value->value, NULL); - else - g_warning (_("Value '%s' is invalid for %s"), - str, property); + g_object_set (settings, property, enum_value->value, NULL); + else + g_warning (_("Value '%s' is invalid for %s"), + str, property); g_free (str); g_type_class_unref (enum_class); @@ -1409,7 +1409,10 @@ soup_session_constructed_cb (GObject* object) g_signal_connect (settings, "notify::ident-string", G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); - soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); + /* Only add the Auth feature if WebKit didn't already */ + if (!g_signal_has_handler_pending (session, + g_signal_lookup ("authenticate", SOUP_TYPE_SESSION), 0, FALSE)) + soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); midori_soup_session_debug (session); feature = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL); From 4314623138d9b3a5d1a1ba3bd0c2d5cab83eb292 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 01:00:19 +0100 Subject: [PATCH 0753/2970] Update WAF to 1.5.3 rv5749, fixing --destdir with relative paths --- waf | Bin 75695 -> 78551 bytes wscript | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/waf b/waf index a22ad09a741dadb0c3341468d8b636d1dc055f14..1c16d7f2db46247ad2b96dc829fd24e670634eaf 100755 GIT binary patch delta 75698 zcmY&_m^W77EYS~qbj8dRf8%i3e#|M8*`cS7;~8L zn3?ghaq*ZK@o@5R@tPQMo3Zno@|h;+e31ALQkV6C0u^`=Ow2A)Kj>tKrrO zLfBZY>@&g3t!chrv0R?(di-=IED{2CeLOtoKA3Ku!T&U#VGpG4bZ>`#*O`ZkERP+N zec`oyXqsDGjc#AP^SjvR@)IO__weqWGU^I%`wH4S?EeOgR&U>th1|aP*=<1~_<~d; z_--Hb$2SrXMh>sX^AxX=~*2` zI%?I3H3*_Ai#lN)^rdCh)L40fdmb(cUX}?i%4&HR2v)b#t=9dZZ}M&S*Xr$2Q(XtE zVAkMSN!Mb#-|~{@oaM)rHBzr4`xX7WUli?4)lD9iE33d_lOSK|G55Gb$uFa(x@zIQ z`3@C*mii)^lBRja9O;g&3cm(QySwG~@tbQmGTm7U>2GeM&1(aaH(slAyQ?8?y;*sN z4th`8XHB`8cUbLPc4NLl+b&~`r+tuXgzws2$C`n|kEUs%jFB9nk&~nLJHMOdU69L} z$X&_G(>NgVlfgE9UEZB^pQ7se=s%w-hinf-$GWG$?#<$HWSA{d72CVqQWakNcZvMk zNrcc$w!>1sb}l2cOmFyx!ehSGz2UCiSLDZD-D*IS$;#8v7==aF zHSf9|+}01$esX*6vf2cK7`X2)*M;Ti?K;3jegHD=cQxZ{XL?b0i#w}#ELG%d$bKZe z%S1TWn``Imwh_lq>fR5Vk-}?dpS3DBmYd8@?sA+L9eg@6*6C}frYkJgJq&f942H}_ zen`Hf^pRPt_K^F2(&5no(gZPT8E}WF`1@FNiyHSYqqh0))XIGX{f_qF?RQhs zv5i%Vd>*!+vrEKbzG)no!GG_@?*34UOC;a5K8>6;|98#6P)@(@>$`m9O5t~M=e37A zO?uGNwA!xHux5AD*DKp^8Lp7Mds3#m1eB{k92_lpxQun^wF`x{ohh7Iw4WZG32xpQ z`q9k`E38w{q{uF>{^D6U=lXP(t+U)wkagNhsgz?&I<z zd4+dTQB)HO+&qad1iXcPT$V$J??B*p?_@2p1JRI>Cy=KlEfo}s6U0hygw*A5nH7OqY&YiXjH%8WrNuQ2hurwu+OdF(b*zFF7<5Rhv{&^H#Pxw7mQ= z@xPC8y~BDlq`xU&<`26Efxj;6t?J(~**1qTt$wp_?vkA2E-pH1$i;p4-K6<4U1@7u zVwi*Mf}V(#Q9RzObTm`mM8UqUjGY@kXMAcEyDeI=zKzPXSujHo*b3ZfE^oJAIt1>| zC@T~H7nd5t6d5TyyY!P^^YRAs^1SAZ6^j)qfjE7nVq#jsJd=k2sFsaos0o(=L3$?} z&Z}x?^%@$W6(n;^=3g{SB{TMQdbYk81Tj?)2hzD~>Nw3vER&c=P0Ltdw2aB@wUKIIk})VF*C-8suqMO8obm5) z<{IjV`JMmQ`}{o3@hR=wfn?81dUEm ztpjl-C~zmMnvW(%nRAVphF4L^z;v0TMx#-1J}^TolM|?cuW7+kYBU__@$7|Z@`VlT zP`VK)NKyw{Ry&g+U(10F<$xBjE#b(>o5$PgT84liB+)o#!QHj8^3z=X$;_4wBy`H= z=+wERdDMxPL$b`j8%X+@2P2IlcyI@e6BjH~#m!Y|f{5!>l({pghE1fRpx862>{1Mc zX;H>zmXkoBZREd`0*p3Fid6Qi<;+46!;E_BZw5Pdjxjk}ZLnlGNK%5jHiA~>1C+yr znAtoXBhfTIKAzF60KdDBh%JH>-Lw*xXe-49D@w5Kr3*5Spy@9*9zw?@k`J{Zv8{#1 z6`*w)<(ZC#({Px{ktpET)L|5>GL+7!)Thox0fH8pID_CpR_6`+trSlX3 zQV<9&(QG_S7vsnG(Xu=cM8*6QH?1*C5M`zPZ(?z-Mp;^z=?Dt}w9cxWBe9&hUqVW! zFfElWc})JRt(8JzU=%k7%@m2khu?B2X&jQW;6hxq#YlOEF}fakXw4`c!*7+EbUP^+ z^XR8&_GGit5n0n@VpVIFPntZX4RSbu0)a{csdZ$uaa4McHFv#CpYb;kM8^aKF~Ngy z*;-B(&r}ZgaT2J0lap1@EpEv8P#~tNJIFAiP^_Kt3EHUf$-Eu}k&(4#4k;_1q?=Y? zH{(%NO}6b%10l2gtCqvG2`b>+%KF;C#A#g12#Dk&Ni-=Wm4_-Gf136^x+(yL(G=DU zfxrot3k$faj9f(=P!jAqnI0}!VIoXSmTOE_jA4?em~JXrEZ!K8ZAycU8;A5O9$2bC zRhI{3qN@5;CHkY7ReWLoWTh0wESqGd7(=>jUScs%A3=f&!}8Yz6PW}F7TmE6+EN;G ztHNbY%TjFZMN%s5CE7G8e1IjMxw1arEZ>Bya7KO@HYAx&V^yF=yT}nKUkfEJ3$h#n zn-DF^Mr1(Cts|h83k9Sk>Z%1q(>#Te3TZ_0_#;Fz$slm3WbUN#dro2%9@!e>$wm-_ zCqE4YL0&XBp)-{kRZR>HP2h?rC5VnLLW(10SWNmbr5;IVmO;t`43U0~C;rNlhLO)0 zS;SJn9H=J#9$yDaYr;`ON)lW<6!BHNS9yucDiP&NG{>EibD--%9RF7AhHI5 zHSpBbaMF3`Oo%1EXmXM2mF<{O%#+Wqh*;l;6gM z3C5;Hv|sZJO}mwWMLAvNMv!GALn8rW{)gT?ZW4vBrLf_DT~l(jN&`XQZxb-I(yCT| zxUb$81~#7kFsGp2m7F9qXI@ws9NcRcKEl`^StturlS*P-+B{^-Zn~ho+T~o9 z(RN4ZuYeu%%*E!Iq`%M^7eV0plG*)=m-`Bih5dH<&3yEXGa zx(l^aMXpz(cCWU0Ov%%B&cv9=P)UPxLqTAR_PpCgt>JYW?+CS}1fq=tSZQA%BjhyG z2#CO;eZm|@?#=Q3*DoP4=EoK#iHxXc59xQLQl7mE{%{giN;{4HIZtLMZ|-K<7v6`& zELg9oT>0O!WQ)9saO=>B0>9N>3wzu*OSoNw4NAUdZVB=5wn_g_nx}p&BE5BE=UMZPw}5{H z;#haajHUH;dUG0*e>Q~|wjpYwq znq+SMH91*WpC2M2EFrf=@2^Der-7jyu-jMZSL8ZhbF?rSln6R50!jKK7Z79ws{Bdj zu}E~YeJAK0P9)Gg9GLB3=v9ni^VMq^|3vw>#ic#DKp(P9sk(Tb zjogw*FVP$;(T%6-^Qp=>z|S_9dK)n@oXXmjs1(A<+9&Ahbfkh?9TvZ)>?72pRS8=G zL8?S8^eI%x=+V$1DPi)KF_qKxJs)$449iP@7tyA%jmM9qIcO4K;%h9qYrupre2P62 zZ^su_)+lCeBAh2=0|p{6sRTe9T?PsePr;kBi;bfc_k7zImD+ruX5)lCv#WMkZL17} zuG{i~UR+WIB|A2ZG6D0&_LINQ0N&J})7|DC70@i!rV|)M?UoxIY`;W2M2sGB@koG*-b4K$(D%G!T) z_RV&e^z&kvJ~8jhOG_w51vG)yQ=(`0cv!6h1j$YmF;H_$e~m=#>gmxZIhW?yu$rFS zz@#nzEjlU2x0~t!f?x@@qT5X$pPio4Ok;9L-M9}g1cn3VSIZYeU&_gzo76^anpbEF zQZPaW=9!!^4Ec#)Rd>e^~ooVY5I5lTp7l*hI z-=gG86ZZ8pwTFmG`%w<7zZx#RdkD%O`h)y}Do>41Il!_W2*O(RFq$NNfw%ogdb*ia zPvK{eP6sqOnVqb5MCx*4>ym9a5eGQ$Fi#h*Im~R;=-uq}&GqfnVc8A(Wmq6b21=cP zO(<7-h6XZ+!lNV!PyEPs>eM(#SeapwW33ynZfk^!cXYmUcOk%@p9=~;s--Io5J`M< zIZ`B5o9s93gwtUx(@~BIgcLd}9j7DduTq%P0U~Jm&Mns|Ivy*v-&xU;pYURphxy2-od(|foZlr!FnLR9W3?1Ed|llBiP34 zq-%Tbi>GB3eMojfr^&?mpeAFXxc`)GgdT72r-h!c5RU4G`2-yvH>d*8yfa~ZTZ3^x zzFBURQ4;C?)AkXf!}9f$R>k(l$a!z0_-7dvx>dU9CqZDS0cQw%dB|yvY%IooyLh0v z@}Sv_S;=>lK7}tdrkc;aKF`4sg4b56_$1*L{;EbM)IUO}d1g_bL|G|f+Pw~QsNX2j zwaDt}qpm!g8JpVS1wohyH1;|y)(-%4ys@uZ%hL!DWN+C|XX;@Q1xzUk0YDIAUn_4? zCfym`w$Xc44dMqsPLa;gVjT*RIB~gJ3lSw+$6Wr{L>QRD-U)u^!@8`6%YF|Lqxn`M zqnsA=MH-1Aol#H~VJk3}pfVi)qJBy7WqI-yjBn_`h4|MDfOf!n^kmIyPU znf^Vu*_i(CI>v{E`L6NF7m&Zjffpx`2yJSw>uueaT$LCK#^6Pryz4Z>c&ge#36$G_ zOmAFEAog@-K0Dv1^ykxlY4_s>Q(fTfSKlJ0&5K_J2JA|^{r%`8dHd@)+aEf4w4ZH?+-a~(}V?`#*F+UkciRos~sSyW8HHY z#>8DmM$>cUQiob_zSIZu&CMj?%c|__mJ6Zlv(F{#neqxM)TqU)D9*U*`%!H+ld|>S zI*Gboh>`XG8^CrA1-Lw&nXC4M#;v%%$EAPa&ox9!7~xAJ$i@v&@wI~M*#D&|;S|D* zq$oQ;2#G+Z$%|M>)wQn%qV)~lKBm<_Aq<%n+eY=KG(HD=`q8~d7wWMn*l9EV0F9p5 z&k$=3;Mf`9{;1XmXzeNMGRt*gjyMf{c?;_1l~?yE4R%q(0wAl7LEN+wy`K5-HahDs zT7|2h{cHubL-XAK#%M$aQJff`4jRJz6WJspUe4^Mji&C5;Bq(h^3+@`<3ssi^2uNv z1r!R@DKMtpl`ylnJu!AE3T8k2Q=^>)9rv|#&^*QZs zXk2s{W5Qr8rU5qeWD5frPQl;Z)M^Umc@qzLUn_fbS@vw}q_nrpPH7_~YO{yO)a%`e zf$7`f${C@a79!4p(_3H|I_LN^8~+1*Qkc_ZndAYO?-GXwSErf>$=vK;78)?@aJ}ri zO*`;^3=`08r?1debKgfKrEal|3U^Rs3O^X6KDYC}Ksw*8?r<0A@k1sKrhN$ytGG0D zH!-j5`nD#E0LnAvUJ%%S04wI<$XehfVj~Ps6TSS?P_86(mtV|GXY71y7hMzeni&I!3 zKF$6pGgiofXKO7fDe=%R@67$fwe7{6(c94Y$_!b|i4(t>`8Ux<%I$~GQ8@>jIRF)h z_2d!IXL0rF=rAc_$&(%VeHQ{tR-B-=Q}K2CHm#`qs4s%=;;~HP#5f|bW6tx1U0GlD z+AQ5FH;|tGu3#dfknW^NOH)q0Zf<7*4h%^7yXmOfOk)uGo<+H~)66j^2)Oyc*f`bzsvBh7K z*XsFxC4-4aGrPVyV+Z1tDpZB)_}ccwZ8fi)2t`lPnC;Q?-#6I)*Og{JjJj2r}#CfR39hM(*bj%4stTbDsd=D}ZYit(AgOrtZ0c@N_!C5Uct! zURN)t1WtGx^XFxW;x)^F`zR0u{m-lxq%T&acE?dD`DR7OgvbKSm!-KgMyBT2O72KpC-dJ{U+<# zN!vVTgmEX6A8Xh1abN+k-nly_W~y$4{}W$XLs?mrQ*H08FLtGcz6AN|`nu=ZUpTta zIsO9hvy5=YXD-+cfRaRd1B9%q#)5kv$d%w}ylM_> z%WNkkjav?j(tKxprBSj=T5v#}juV#8_qL(i3nN>T=G9Qe5J#W^dsd{QZB?2P5^t(k zUPvTU#HuXx0neH4VeqK-C4RxXI#nV?l!9;FWvX~@9RxO{*-DsdP|Re>dW1}z`5HZL z#H|z8DUfJjyGZ-DT^;ziKk`_V2oit?aOh}YGNv#b>E{biSUEYVz@zW&{EN5dYZaXB zpek+NW9n9E3W)41dM6N|-R!|>{Eb;ZmV}H!_ph_rNA$nRL9tP06eq4h+-bJJETu0f zdCb85-lo}qKL=kAmyPDj&GZ;ylok=$7528`kw5kh&wR=+0(RtQfWe9shQ%k#C@uY8 zi>sfn7t4SCA`5W{RQKFo8HD_1y$d~d-HDx2hx1vT4WOG=&^Tot1;S3)_^RwF=kn1f z>``-Q%fL`feINRF)=|i@e=m%&yM4t7-O5v=fX7!q|5Wx)NR8`lA@;ntd%$3aB!}0@ z;M|xL(20~-5p}V6WMG^Um$uDnIm=#1EZ7#yqrNKz1mIZTQy-D0vDU?5tENdxb1rWcp( zw0N=n{a!Jo*Xu89V;Jn*G*XR;FK7R})yLQv?vpDRgmXyr$)se7G!%hdiD$H{>!Pf6&MMmuuY!36c0 zTTrH;!@8P`Zry|JuG#=-EXz$F0Qo9dt1zc8vY36EZ{+)gr_r>PA9vf3GdaW| zrnp9tvFSfsT$))sG(64LD^ZhZR(3hQI!MtwW12B3 z*u>noo=v0Jb46X;3e7atq-^M3>Jvf~1UbrZH3LDGL14-TJJre8k5pZ3=AvfkbVh!k zj8Y9UEvvMGF51-vF`(vIdm~p7f+xucl1gi|3gkO@Yg_w@irH3XCu6#!+O=!<&@aON z=POK4y47Hn*Q!1Uz`JCTc@Om z_T>_yEtc)kO*3A7_Np2+O3;?s>K>3Nowl9X6zUrYyP0I*8DQ;ukFPA!XC-lRlTqS6 zqf>tH9#F!F3D-I}9p#*tBgBrNun(OJ84167IW0)f$+r;1ipbTobWwO2e@UCj*{))(&8SNxXvH*c?^4U2!z z8wT35OFdrrkf|kUltI1}jxvT;&5qs$ak}ZMlw07n@cazL93TTK~n%%FW8#B+!=q)UjyF}s-vIX~fHXXfOUKdHWU_AKL12Cha zEUN`?3*1ET<-M}=^P%i+ezLR6l5kOfUc+xBanZ5|kw~S)7~D(;Jl-ccRq6 z4CF6@Z47s|gR4iA#GB|Z>~6ZtR^hhXVJ;BkFbX^c9NJ-T);pqTX* zvhOS1r$D^6;%CO!w(rXrB2m}_4t@rAeyHwWf`j8yQ{C@1c=4hDo%5gRjvkwe3SN6D z8tO)Yxvo5)Z{aBU7R$xWDK_O5__8lmeB22_{NLN_8bccCPo|3HLB@$C5l7D=E&h1( z$`;>0K@IqenyNfiRgMss3C~>S^KPXEfv2&X+W^D!-qwMtud6valjk+P$>fRc*Zz{e z%Gu(AC(R1yj~vZ0eMe>_>Rc^om~@9jYw^c;s`IS%Gj*REveq9~3zY9Te1*`nqTO1~ zIw|;_OhDj;b-%{H{?Rp0_9uAr-AXw3G?Tx^J<=IgX0I7@v0VjE`ZOpgutJtjnjh9V z8Gr+~d?iNcQ3imH?05x=UEsM()7UxOru9;OzFY77`0HrekKH5nNCz{HupfJa(2Au0%bGtzsOV!`rE*V8s&;X3ef zzTO%>&Sn7upO*~Xgauy~9H@>`NWs5L4-iLWr;X<(83kqq5YO^;CbSFUjh@}!p&n84(zsg&Ax{(iEbi*QKHwU2rScpz{ zD!%^mI;WVoLceB5EsSY;IxVO2;jsg^8=Xcn?u0P{1d`&LOLhN3ON-97xHMLW7kJgl ziD#(AiO9GJvimQ9Z6p;H`HYnf22L9kAvn1Dou^@;@`p;mkxB5JCgmbKs^r_8xVQBGreK)M_aG@fh6p!SQ5-c&>!V%?Jw2bI5+pn z>I;lnDL7L?U8+eU^^l6bm`>qe>SkG`*v9P{3aPU~VV$}bH~*xm@Qwu|TPL81OIT&rp6?3X zcASEpsA4~5qJ5B3DW2^%bp{tkJTVTm9?Q^}3!WtS}y4B z4>LJB3A$ABe49vsh#t7GiVinUj3+rCD7yC!I7Y-%E=}) zBVsX$n0*^`4d>t9)PpTQ>lZjQ61arWw@lmPlWW}y*^xnEp;y3IzI|vocj|2u&7`bU@0$OG~A&lK@sK;sZu^gWb`g&Q)JCq)#Vb=i zY)_F;yci_rPx4o-7~D0IMpi9sJsxS@cDVy`YLQEfs>aHj*uR#sZHvD5#cddc?n2sZ zlF!XBF@U@%+$j|hWJp~+S%;aGgUnIkhrV-KjCceS5=X5zjV4(!1!89;Sb(e>)mUj< zY~T{t@7L@wgOgZpZiZWZXxdIJ3;(J!2;5@fJ(8eN+aKw8gr%%7?d(v|Z%! zAD`cB**QzL>)U|~-_fL-qP2;Kn$sOlQe)P#i>=3>%IL<3YWm59TK28p9c$AdOO(^z}axKLdIx%ksgP z1`4J2ZzZAR1L6h9T2hqg2y&Xq2TPx?H+$@K_P0hAt1pB*E5sRR2-mbGY_R<>S=ef6 ztub$V#iWzBms>X37MEACAJSOVGDEl!(5@4IXh+GC*iXg?g(2rc!}y-cw{2Pk5f zJ8tZWCT>tr<}QJR0TwzU-O);Yz_|tlmQhdoXoeC%vup>E3l{$snLg6|MQpfl4 zO)pvM=Xfs3R)Z4Ro3e6>QgPC{&3%@BOJ;u1XCI*GcENcHe# zzXL(2Udl}*r8U+agFJqniGPXFMV^EfmULbIb#Z@1xKZ{F8GCqA1* zM8!3@)P~k}6`KK`ZQKt#uMO*5QezDL&s#aN0Yx$iedj6MNlC1EnPI_WZ4|?SaZLl+ zE|-x7qCZ!|9c#fy2jkvF8bi!Fhh8y{rVr4URm)}>bs3)*rh}B&mrl% z*947kGu2y{XU_+Kdt~< zKMG13<-iMv!2w-umvj??@;9}B2u+Ow%X|*M=zdDiJ?xd=cE3~ZJ6U@2r-wQnL{oeI zWDX=8s`6R8g0MF#KKP_x<^BKCjoBfJr)P)aPCkQJuO>!|w5W$vpPr)40g*m`l0ui;-CyyvpC!-ze{G!eNd=Y?UEm zUq52wsQ4efmLyHb*qgp;I^l3s35IuT`c=}D*1SI^Qh9&lAiBDsF(krg>}DG$t4q~e zF=@;qIT)Q=%MzWsKsmiG2Ks>`B&_&F{>R)*Fu(--{eEfuIgRp**8C)z#I8>WPWSO2 zWo?W9O2f)($tU6uFloI9W`0Ntic#cTZ{i)^QtyX_x{f+Ho(H^@SYC(t%czhIlZ@C4 zjF&(B2vg64;aphR(d-@)$>F?L8@5th@Ys(I{>fwdlH@vD_QqfLO|ePUDH$r<>S1EnCVAW`3#*TH~2bzBC%qp*-IFyZUx}34;Ix1&GQRtwKfB-OAi)ybUHS+umUJ$ zA7oQSY5-H&2TSYrDv6F$6&VSGDkwdGOdNX#i&HNvh-+X$ywvsH-#g0HDQ_%Olwq>K zUesgd=CrK*{m@mE`bJyaILvy_yr5NTM zj*_Oaq)C|;?85e@*u&0a(sLhVC?Wx8BsnySt2e}7xv|A z%jfl2y7y11Hq7kEspQiunHD9Q<)ur5tM%Q|@!A$Qr~f^k5!2d!1XD_zMr$xxGrqx- z%gey@kGe0cCk@@C0-Y(dyOP;rxi3hz>;+&IsGp=#SwM$4kS# z>K9)w1x7l3Jo$lM|mm%aThO`&3 zbn#!TzTwoT*MyHPre^c^hqsD3TRXkAhMmKgg6=srV1$U>tlR9EMULg$h32g{Z*p~- zj_b}=Wm*Bi>fTcIY4*_wa5`pDe`epko9!0jxt+UuU0c3)J6!He@2uIg7rJb^cDi1z za&g!)yeV;)1A+VEjvix(5IP3hw!fuIXv&QQydRH8K0f|*XmT)+4Av!>pMCDEz6m@0 z_0uervRay3z_;wG@80Hs#{%gMGlnv7g`{S~J;Zv|_>K9pNucc(5GmNv&9yrGYn`PM z-6UuKB}IsE5&kl5NvI0{hohRm$Q(uOnwNl}AqJ-Xk^%Mdl9M;3-psLBfzzeDRsjaJ zd>>}}G|jfEv!;?qAFwl5nidGsMrj_j8&I%6tF8$*$ZqF5$Z?p37o$Xb_-XqQm>u3~ zU0KAWuK#VG z4SQ1L?=RB1k=4y%oxCqKEAJHjc2q}3nW``ovEFzC?L7>5g_Vk|)`yvK)K4b+g1{8D z!C0CCyN{dhY0o)Z3645BQ{8N@dgrHht^0d>78Pe_IqT4#ik=Cx;L8{PDBms%W;P{L#DSQc?dG@b= z_mYdZfYCt{7DXwkC_i$i=RMaqg!=odqhI(P&Fph0tRpgyZ)0yRt}9SBt)C}SLm5-W zI}|A2kG8ka=)!~9WNkN1NI~G{mrj$Ni~YOjMF4B^7e&W`FQXM=^6Jl{V`l8Uz1Q94*m)6BbpbV-VEn+M18XJ3y5$N;u40Q56^CtHtgV205Q?+ zcQoXWQ#Tl1N*?{Sl1sVJ;C3MeR3H%O`Br z0-e0I&u(WDeCT&E1N-(WOL?aKlA%Q23O`${eC$ZIgoz3s&tFcL952^P&ua-0P84{x zD?--$i3PPFyy`1E)didSMj*&*%^nB>NcXSZC;3%gx*v>RO*1ck9cl#q8$SR+E2c7x zOwHqna^M^JP9o@H;R?$UCcMv+bB`sbWt4TRUbp!0;rfph5_QyVJ)X_q)~YRAg=YyL zZ~_{%B-tsnY4lLM>ftaRXXheltj>&?avZ|STPB^mvP!l|zBN)^kQl+sovJ;#Q}xi? zECR!^JV4P{w-rv&7-Tt0Ed&tt%9fm&qr07pk5|tfl$xg&O{A>rK7OlOS$oSDP0?!m zi#HZ&t;ba_%f9OwuR9xeo}OPRG_?!^)DRm^vh^ra`%pc|PQY4?{KW-PCsvy8np%b86>VB@V+ti2iK`fcYZ}^1O)lK zvIvp_2M41~f0WJdKV;JC^mFs`x37(Mx%U)B{6xz!U9_s0~@1Y{!CA`3-C1($iZQh%LB%ar?X}lh|m}yLhyF?aO_5W9RJ4 z{M2SaIpuZjpZ#-J5Uwgt&`LS;U3%p~;iL^Fm z2r4bsPFf2$%I}Sk@W9GA6MF1S@w_k)L=4hQpo}pHXasY8Hk~18N>!0kl~6EZD~p}C z?Jleg7K5o!VKn&^G@%gl>@XTdHAdxy;FJ1Yu_=hXXN;!32+4jLZO?oix7w>K1+k5? z1;+jPuKAUgCI8<&G&O2t2pIRkMkq}vi{An_IfPW6fdIe4aU_+Xv>D|$u}`jkRo<+p z)y_D;7Yyguqhsqm`-ri{F3+wZ=|cC3SjdzU3^!#DNnBmf6gR0;-ENk^LeJP6UC=16 zQjH3SBmco>sn|jE_D;;)C_V^!jZ?nKBkG5V62bFywInW3&cK;fn_v0YWUh+AEnnY08XiY^uTKxZ00tg}o~mT$gF$!v&ptvXC&2ic zANC2vYPeaUt#rOhSZPjG1eK1S_XSZ|D-~>Ai%Ku5$~Vs8hvs|nl=~n=D~**-#BiC^ zpk>eu7MK=CeNhfut?yof*YNUY7Yl5Zt4LxfY^gy(rW1;A*&(Fg=f8tAjC?&HtfXTc7(QwK@|pi zZ@${jlhM3r9__g3Vd^;1iW6Vx-L|>pz|j#6lJnsok4Ka9?=>}_!a&+g5|a=!j)Q4e z3ChZ4hX@FVZsq@MR7$}DfitAo`h4%kxBq0dTG>*hm)p!nUu-lD{UaTKKId50xJ059 z5-r+L>Wn^fI|)7TyS>U*TQu0&NA+bYMiytEpPEDR!!Fs`*wzHTjp{a?MH=>p65ACb z0$%CKWGLY!#cPq@stG4Gz#~LkFWftE71UP0sunM)Y6b-2)vPQKzp6vwc8ysEx{gUF zAaHTKR-x~4>1dGO=l&{SKsYW4r+wk){2VjivBtH!2}ZQW-M7`8@z{baZ0VN&a0(b| z!)^jI!`VTQ#SoR@%k&~%H9B;u{bCIs+E4?B_D7LhQl-Y&i+vPHQzQ};`*gN+4jncr zIo=UP?XY{RSFh00e0ml_#~vm*4aV*6IGeDJoZ}reTi?Y5mb5tFzPYs9nlf3>?)%g| zM~r+phrKC>P7!x>4|TfvfNyc!ho_BQXrPYGiaIzCz@Lw-`opb%EgY4 zc$D$8AJe@Af#ahHXH#oU+xg52Qy7*clgaJ6WObvM@aL(ET1j@zQcWc%hEhkok|Ls} z7UW-$d4}eqa?7ikabm#8BNM6o4eI=hzT#jwW5N2NO1gT;0)=x`e3CCw+x@VPJ7R7iRf4PCSqHuP&562Sk=WR~1I6Zf zCY1&|!kC*vQKqqTNOd4yDKkNF2TW6CavZC=lyGt$j^%n!aNtMwRc73pZin|j_u88z z?MRP4(-I@Jn5VA5x+%>y{7!5;lZ_dEywx{`+4hU$?#r|qk{SG}Y8J^OGUlh$86=~G zg*Dx4m!7i~Gvw{CWB6`5^wSGJFd60)&a8#D5p^%N;U375PL z1oO!xBd%07BlNtRRim?jY1d|~;+MkGo>E_dV_%ZJyD#^tLdK3U-C_RCuU;%DfY#B=sWXCcP)tR9li~m;_msyz6L>g)zLqvhjly=G7a3GD>H$+&}#lcO> ztx=n=hfSQ@>uW{?G@%vO(I1X%wnhJetjE%;pRjJA2-C(@I`a}RY#X_I7$`_-;xWOo zh6bM=N6{Y6xu~Ke!HB1fM5(g>NgLC@u;tH%YTyT7oo?PVZ+kANE|5Q4dAHnNWuq

c&Z;ZgS+6Hf$jy%Mf)$ZiHg}u zbve@JxvTE%WbEEG4?_u(li4zS&ZP5c?++{^qS?W<&5g3*L53_%=va9M; zW?x;yc!WdmE7_;-VlPYs{C2P=ej`Mic|@j@G3^UVdn(WpPW_A)x^@k1=t{tgE-ANI zx>fZ0dO|AwGhtbL^3}I4ka${@a;(cA?RT(eN2m5$SzUr4r)E(`AgV1J>_nKTLuUP7 zhi=-pBDlC50g)RYLmEj3MVm13_vs=u4(qB~CKLL{Dc+)XAvckXX7Q3*xIv$C^G*;(K&`y*053dou&y_UAZRf zbgGkWOtvO_vTg3kuF1CTnmpOI-N`n;zTf-r-p_up*1hs)G$9)vI{T-om4n7F=i4UF ze>DPnneekZVi05X)+v5#$~TMW3PSm1Jm@|6=&`Gj*$@J8Qrm0z2zkkuXKl8G@0WM3 zAAS7;(NR{SnT_7015Ka$h557J2^DH&8piMjMS$u`7#^lumnSm3wX#k;eysN6NIi5`r782e&TBT-< zMxD|q_Lnn!LEr=T%H317>t81+YQo`!bqWL4yWhg|w+pv_*$to-IU@w5sEHMR;p%jq zIsuSt%0k1}+lNj*?VK_A>?kHW&H6s8%jKIqN2BJup3pcR7)NzhRuTWbyTc`F5QKYq zvyRrZ)xmqdEkljeg3?msk-*!PssFQ7HktiC>-y{J#f^UPFp0lQC0$x{&_spXi6yMC zuY83ZMnD*3FfqCV(JXA96kBHV;2V*M1SE>X$KZdrmYZ_jMWzK`af@lxa+x5XLLZ0~ zGF>!`DjjBncm|L^NXV_*9@UgB4dKwp;x)NU+T3tZv&2Vmm(I|4TY{@?U8~Ba32+)_ zU0*rys=wTqGGHtc4JG0G{@khfQqupYK&LNB9F?BAC119FmeXo!f|wKFZ)w6B1GFPf zmJ2Tr_S+q3(z)UihVFGSBo^bZFuk1sI7`7LyP^wgOL+aOZ2tVxL!qi=RE>ls0Tl1r zBenUxAV?`cg{86i?H?C8evc&NgNE&I$~lj($G*qj&p50-n)>X-*xiQ{T9Tso-IsMW z>o|o!OzTCywcIY(O|WN2w(+Yp0b@obCimUVvTJ`IVu(FxaZ(<%^1|<&{59pfk2FVj z>-Szz&0g(Qa9QN{18rW*i7U+Pm(PBz_25ci&5BA~g4nLRAvRcXRV{BG zXJT)RgV}KuH?%t)I=PP!+Fm^|NEb_SphZ7mAtQ z6I_c=6ekx`i*nQ61m=ehU>d{2yrX%NJsdoEsT_XVk7>W94F5U{{O;8wb8y}xJAla~ zsLAbDF864q;#w-fAQi}o{e*MaD#?EukN&W*=#K!4xXLRjxRI<5vWs^+{VIyP3@Qg+IwB@Ja^6Qq$%{l1k7>5&(g}j!@!^ z=8ZB&*QNa)?pLNF4B;b+U5>sDLJ~ndjjOJ^ci|2p3}tlz?7?{tnl(pBMXu}c45C#I z`wSaw=`$)K?LG%^`{@(R3E6ByizCupY<(=8V=%6hm(v49gzFb0PGp@cy5sBcsSvUA zD9Oz-BI2sg5^jO@lKZG$dQ>~LsuA`^`CKYxX0>(JVKfWGAGhpkTpg$<>p1K#3c7qm zU*QWJUO|DTH>aX^8di4B1%ub@<4A|hy`;7xrxhVbXrD*1Vs2PemYO|WA2{VX7uOF1a~(Bcn{%o#I)DD)(!*7H>#;X6z0~eN1J|l z7=Rjk7UDXCw&>crE47I^?fWSav9G4HkHs3z-E|uD82{7~uX@Ll&zFXLi+o-@?`%N}o$^(aah}@BuIl$s3?+C4mu}Nd*o`ffEXiaPzlxZ#_jS3R2L}1T z9i|-7K_2d2XHYK-`F#BlwAXvCc!;Tm0^lpx)cfGga6GjB{*=Kzh&pac&NH1>c-8zt z|5h{$!*_!lyZshTn)fs3XIT}G8r3qi(i!yKxg9Fy(B;K+(c6ij%Kt_cDd72B@+2se z**w8^u&}#5@tvKDYg_C9-^bAm=<(%Vc6V45x2PYzEb#cvlb2_%R%+fdn4DNc)08q8 z$z&7Dx|qROKz+%&z^#V>~k}UzPY|e{cCf2&yb=)5^8^Ct+ zfgv*|KouiXEwAn&?dKlWJ!x0`P9X7wXymZZ_i1cw<)braHoX*2i{dI(Nm}sLx+J zJSGX#xwrTU&-JV1m4`Y&n;`Tr&t!z>8*L-;TW!+HfK4?7EwAiG=Pzw;Jkq1DWzVJ_Z=nm-3sL<|?X}o<m6QdbEc_$ zX#;x6y^{1e;WPSz8Af_&o$JQMtWxKPCdKg8-Cn=$Su<9C_-MSAm${8tUwP;YRpAby zw{ z*PoRr-|e9Mw6$cf2EJwM8ei&K`goIgmnOz9X0FFMy3wn6mjCM#AEi@3Ra)kjoA zhjE#?j_?qjxrBQpL`Em9*QdtZbpL76{76C!=-D_xkoBqh=|@4Orz2ox78Auiui(qt z*WqAWezURbKMQ>>`a|ohjFvXNR1QLrEK*PlJjsJO1<6i`mDLXCPkVJZCc`^t;r1Oz$S-+P%qa=XhAY&bh3<}>aC zY|@K|+A}yKd4p{B2a`kA8{JW_)n3+>A18}F)$A}spqum>9Ipwt?n)Go@4f`YKN~bMR6OXN23#@~OLklTS~!W9H9s@*CrHw&r?zzCnR!3$GlUF^ zENa}i*e?C@;?1VXY;CV-G-=yxcd4caYRB3Z37kuhIwum*Euw06?l#Hs-7D3l2^K0W z>jo2BFY2+Kvp5FTj#lCJvemtr5}Vby1qoKI^34O2BX(euqmf4PKImerzM8!tx7o)k|S$6$O5U0(SB`r_AJHBA}$1wPad%I}?)I_(Q zg20TtOlBK&Q_=B3mu%xmcZpP=652RY(Y4##pnCQDBN&Mp;f!bzb3Q!$?9ghr0Un)BMR$YH`ke-CI&`c zKzyd}NkCI}bkSNK*{n}m$dxy6#BKYgcjNUzxT!gQLa?`!s24Ls_zI9P+cihM$7mvM zx89y8`A~R^VjcGsD{7jxj@FizG00R67uFd~O^Xq1pAWDMYdp_iSZ=DaBm(TiBK^Lr zlhM-gHVOltA7=cuvy)B^0KcFNyd(cR_Pov^uBPAl%wxQqo~vDx()ooMp5f?ER@b)?IR~C>F7J-U zxu3ZUsUF_WauL(g)$L*-MeeRD-d&s^-stZF!-NUv-3~gc1_1ly0A5>SU6NEZJUf}2 z8$x;-3ucl!2#g+6IH9T5siH{DU8>1DO(~=QJwqP1BY1CoZ43Gf2n<7VfWr>>yVz z+WI-o;waTk05(&O{8i{WQ2&aeWj$S(7KHJ9cY76SGCC84)F2V9=Etka&}emDB`XKGK!m8RRTdro(V9|+-!{<**uZt zRGwL>|3vQ<&(C0+b%;PnR=GTbD6GI)qg?LRa z!bymCxB2H_*w#(5##eyj!gCQ8k(REOZ$iOGxE-gJ|42ohlEBc0j)52_jJ(v6>t z4oddwpUk}C+(aumJ{4}M6Hn#aY~REqEdx~39X=M$9TW(NiJS3yL12r_}rJcsN--J?{HFh5)Y>jG7o(-)>lYWg_*b1^%=IC zHW73>bq^L`P?5ZR$oApuB%L2aKuz3ah z^f1=q7PkfdmuvCGg2gpoe-TO-M`&b=PMdchQcqsAV5flS+{Cu3f{|K(@|*=zpY-+ z{cB0DtJ#X!0~64^vC0W7oo6`AmuO zqnY@;G^Ddl4JWa$pM(Adtn!4Et@aIXTe&6*&lSdNC<%=GWF^Q^N>k1nZ^d zY8veyKzY1xTG>pHhWk~{9M5Hzw#b+n%O}QRgDaVYp{{5`WJ|z-#~y29R$&KdU?S?8 zfzbyAYd2p^UewF2pNM`4^HZvla(n61eDGD$7L}M;rvEjQnaM%u=-+am7OHo6CkVoc zIeykEvMW_VvnjpMkqn3a#>@9sH8;a+Bsw^|zODVPF_+m+1(g`I>WznlQ@7RqSVFqx zZ8TwQR!O62zXE`=QQVkO)*q4JZ*IHwiSJ*HA!B94k9uE8^<0JI-8W2`;rD`vZzr#Q zcu68oV_XrDGn7;tD@(#7DZUkmSc~A!X&JhU{<~oOB{LG-E*^N5Q^OY}Y0I zEV~@Hg=}`{RY*X&Z3`=n&g%FFQHVR26ID3?Lj(sAg$!WLcYqI9#2EIgr8g#Gw5`6* zcLvAjTMYVza1zB_j!x*d=Al){3XUX#*G<8x;T z9+Zfa3pnfCkmr&A@C_pyH}Sac9n0u1i%)PB>}TgVe`7|-mK}ZtpRIhaz9`y91VI!k z-0_nb#sR(aA>|CxOPFxJz6^RhB6yXV9C?4QH^hxKKq711Nh0z2J;IsyXcx~JafH@! zm*TfdC&3>wwk3ngUgu3KooQUwj8WjrAoclAY?NGC&h=d`Y6r?T#}LF&uvh4l?t{KJ z1DECaExWH;uQ083j%EHZ8cu&k%Dlj?8(I(cAMq$8Tk5~Ia;V}D*plZcD zuod3F2~NAo4}R@xyp3(BuPvV~i;ahi9_ipuH}h&^H;Se(cXf{*8irz=psL9WSo>}F z9jQFBWVfyEIK_rkhaYL7xeL>miY~4=WQBcQOjLrtu6?>{(#|uu75~a`213w@PyDJ|tLm3`fjU8KS$=!Arl4X_TQy(H zFNgg!BpMB!ycByKG?dJE!S9v>Ac)@yfXjN+z}(4XR87#6TYyjE8Mr(YDPMC~7jLCS zmDR%(r?t?F5G^@PM;0iS-z(1OqeW|Im4KFN(PM;eNLm1eWFqFaVL#tLnKW0zVp{~V zLiksunn*-ctApe${4MmeLMvqatzdt+fdme10`3XUwbmr!`kHYz;(f7kkBS+AQ)y`5 z)k$wy$}A@m^){=U3H5G+^S?jsfs`7xo!<9r&%QLXdZD&f^zonRrjXTXL z({VH$^R@MGrYmJD)SNmkE05~sENP=Wzp^bXFvq%F)EE-n?i)5Rfgnpvk$y=D4SIX} zE@DNkP~nF2%z;4C^EKtA6_Rd%xw`)jv8bt$4Db4KFmOg90Pl!Ojc(%K^;(9}-2EVj z3TA@4Rdj|Ca~TwlR+j@k8u zyNXTIqa=-|jDdlYBjq%}Fns(Vz0urtq{^kFA_cc-BNTU1oHH%wHrxWB-pn*A09W49 zx6EyLsQM~5kx7r+TVwUjz>ZHR$H*kTw3B{r$N#1}>r7b)QY`l9iA>~lMDnz> z5|wkdM?m~EJBIuXZURU`;0yDM2*)dE*V$w;#YOTpUDJwe@`e8VAv28fH%-8o>G#la z=bJg*NHdD&x(FS?Dlz~%F`J8|o837jJhV8GXhuA*TlXH9c`2LB2Xad5@^c-o=$XVI zKy9@Br}}w=k2hn&k%$B=bOENAK5<}C&v z2po_xSTUo(YtwT?kxOU@H8c(3O-GX|6BEX>((PTGnE*yZ2Y{B1vZnCZBE8v4Ii0_W z&u%yUg@-DdhIyE6tzLawQ6&@_bo|#GK1oc8S)v?c<==gptLpXmT`F82cjfx)#d_a8 zyqGu0+E*u8%*w@~f)K*9fUusx&RYSiYI+^rG+vN1e@2Gi!kHFYQN_IR)V#zgp+BpD+Fl}21a0z-k-VDKT(*1{bC+QsHBCCv zAm((mI#=~K9@TVx++O*V&~K3|cN(#r#ESQwSdHrS0ApmW$3r7p+Xz%P?BWo)`lB{a z6+Nhh+;4WobWEOyRS&t!>2X6eib3wA2=`dalLjre_0hK`qjK^jdq&ftqmggS(0v?1ZO45@(h{5GA0329wXsP6nC^uhNUmbIj< zo~x@Fcx>$=oJKwSPFiSk)B^g%bIHD$T?_w6C6!|R^vn>$GyKfRoT*ep9)E3JMKN+S zzTLGLEf6e1Jq(exllUQw=KBi&v_na3?z;3crL9pDiud(Jf5rO#7F9p~>7wwK^`@q# zJE7f-V7WaVW8s?5`%yU}xe%xbEVHU|rAKQAVDaW;u)e9Z*@4|;XQ0f2o`lpQ_UCrb z7dz4%DD)+FtBB7Gp8f-$=4dVLwyL)&U3NUm*dx}dx#vus{+8G^5#}1Ue7pbFyBPkk z(_Q7sJ1f-{5KBcbz9Ev4vl{7yF&_Rd8}&dhtA_FTV?&*%&! z!!but*b7G!@dmTxL(Pi_r+S<<$XX^S=;RVz{bW*bk#PQV@9rkHE;6>o?9v=h?n%KC5xz{C65Y>@kud z3&P{nNFhTf2neEu;v>lkUPhTGo++E;s~5nU7Q_O9@%C@)(S)!fu8xN@f0m4%{TQ0W z$uHdt?0({x6O%A67^Qa1&03TI%!6Z{|3e8m9}V=E`jX>@M&J=hCaoNgS33w=#bM}< zw)txACK=9%Z1kg~W+WKyJ3=2Ofxo|+MgzUX_BH>#|F^@OaQd9k9d-d|pW`s8yOkOe zRW9=2l#aW*w}9dxB!=|6brsR-Z#US$_%AvFF7e{gp%5OJ-?_KKuAXQ=0HuJ>W+d{Z z*i>{Rbks(gfbVd4zj*qa#?jg3RZ($tZMY5N_$ywd7Zkb8?gz2d{Sh5$RMCaamOPL4 zh!n!F@8eVTzoQEzhl7~-)0vH`J3 zxXs+E%~52cWO-%ZpVAM=0LgpA0m$=zSC3yVxEGa~e;_xZS@A9}xt7o|=N*?@_KUIn zY$UZ>iOS2D3SEhNk+(Mb6;(O2&R#xWts&*Xe#DE2BlhPH8U>mMHPb10fERmkQaEmV z=K3@wc}Y{?`qg9j05q*Az2x&J6#8GB;uCkm#xJ$j9BUfzHhS>SJ!RhQ%fLE5mqI zr7N_>c2mCCb>xBHWRoXpNJZpiNr2}Mm&NF}Z{HTwgz)$r1f}6my7?8+$%o86XF`ik z5pi*N#qcx~ahl9qQUJ1s>6uR=>2ePa#|4KBTh6TjnZerA(<2iVj}{q4hGBP@ZZhpf zw|w8qV}k}wW~6{WH3{2Ce*jZ5CnPbCarae|EVO%- zIv>?bC`SCngW!S+cUOe8Np_0q2hvn^*2=KWU)UP=&pB!eHcggHszocaCe*3rT|<(F zBQ=^6j|D9cauoEPS`DLTVVaB5z)CFHO^Z=#oTXn1U5b%l;elZk0YDi+%`j}W98;8G zW2v@1Ra&lW2a*leSPBp#v&=pG$q?KIaxTfYkhv}@XSEaC_Kg&pr6hS27&dhu(J}|p zMu*(5een*cXmq?{Al4M5j@u>n%T&#}%8*9l!iG{1*m@k1;yqE;h5M1gO6a<{+g>z^`Y>txUtImNfv`Z;FBWH;f24l1zFgtMdgEf9eSyo zKQY2#@2BBPr;ewW$%ajH2#+1D|K5~%Jv=Cl8@}|<5B6?}7%e`S-gD@=WK`)MuC`A~ zbS7f+y33rqJ;2V4uj0(O`)#+4f-Xq*@dL>KOI(gqelk2D`o9rN1$y?{PWIS!-}ul|ZBqMKYLKE0_EAvR^ZGVsY+k|w3 z4~zUO1BS)hoZ+9S$BULIejm^0>afWcg#Lv_i}fOuwt~Q-ml>vJ8IaX_j*v)}@;)oT zu>cGMQ2Ex6^12QatiO~w8niv~5)pmLXP?o#|x3z4NnOQ9)?<3I{SAkbr$7LUGdT<+QZlqb@&k&D+MEbxO9W&^F) zLEv9&;VI7j!y(^bX@q|H;HrF!M=Sm0zusnc`!u%n;L|R`Q7rQk0Qu6O90-qKlm3 z_RvTp2h8|VV}pVpby`FnWl@pg!yf^bd6rH@0<7_esP{Oa*x)RoH092jR(&f* z`q_SY>6uM_9`aR*qkv<$vjB*Jp+2umD`Te=81Z)VGBST?9aS~(aFzO?dC|&;D(@dQ+p!+Yy&ULD zR?9ng`htSd&^+2F-oB)M@|LRmYbA22cG8W9#0?&!18(0#+{-i!kbq$F(zE-~Snld| zN?69FmR5qgZ@jOR#jOW);?N6X8tr2R|4D{MG@ePspPGf$voUsqo}4nMrW#@B#2;kC z!S^I3tekPiXj@uiNu_dk`}CYA_d8C<-+Yyi?tRo6|Eq3))6<9cBF%sxT^e|QaM6QD z0`pA16^W_=W)Hx>Uw~_d6-^kwR$kcqWRe2%T|u$;cz7p+HPPnf_l3by97;m?AAiob zPBR^wW=h1Ur2dwYKCX)-8k50%1YHip1P<=KT{QdV9OUapr@&N7!e0NtHlKg#;uCCt zkH4e7&Fh-|fTYHb>C*Pg5?1rT(o?>V+cde`QT^kdI{2u&Z5eX*7T(qKAunTt zroI32F}0z@9l>?cFUZ-ocei(}%IyE2aRJSgq-D^2W8Z-aV#$piuwKK-+1i7R(eaTCcOrxMPK~%_brxb7IQTVC8 z_tv`sge5ifHTuI&#g|HXDrY{C$F5Qcu4h?%Sx{daPR#{>GB{K&Jz2~J-vD7mFMZJ3M<})N;FXqZ24L{6RgUld)+UeliKGZYq{G1A zpZ|g9Z-Z%%!HAdPA|t($arKw7?ROQig0L%*s`9N`Qp17Cv4I|cCJD?6X*>l5#iZ~- z*yirxMRg;my1geKK0d}Ym-2Wo>#5nquAA*J_-qpY;n_)iDo^xBk|p??p?m(!NBpyy zz6JC$2JqOsybKJ&eRw75PSn`6;Gd=r2t;iRSp4sW9Oo3mOBFI06}9Q~_Pet@v^zDY zLR{fx4VDidjo;nwT(h}e!kd@QoBw-4BKbPUkjH;9t4|T%aA$c6UOh*G!1KsD zo$VEx_N!^O1fAtAWe?-Wsl2PdIl9i?w69N}1*z`^t520A)o29m=+!UidL(C0FPn*K zhUa>@6blD4cQ`%SNz|9>A5xstonBbWG6qqf)#ckvO)fDv>sJ_VF=GJ$%RU{`qleL` zQ2qWeX6u?hwvzvmulMX}fM*85K4#aBza+AA-;U(?y?8L`Qq<@=%wi6uSqf+KO!Z2j zKQ8X&mD!O4rcb8Jb}ktN4khO{|B*bit#HuvmNZhnwon@IQGHvM_k^Yb)hTx$PC}dh z!q;!GK{zG>pL8Fu<`M?v&xRjnYtUV57Q0kGd5<4H7nW`tOF2?p(EGj74lqU}_jPCYq$oM6sSQJ7tynpPmp)T2KwQY7iR#W_C+@VQp?dpWfrX_fiMEkJv^0F1Wa6KQT!IEHI|8moYJ20Qsb_tygRn0gPb z*`DU#JMFDome-{G?!e{ZXlMSonBrOn>gy9mNul>f=yh>>abK7{y7uNoq z9!8&=SA`QCWGs#GOQ%LpY+OQ>Bf^$|aX$Opdv0aSsf*}1-o?nCEEYkZjgN!fgG%e5 zkjc?m?Iycgp*7&us%o(K^Qe`;E_4=te&8Xt@;o#LA#(2t4`JUC%S`!dj0aft3j>WpW(@!h&C#ZTeGnM!D zyt3C?jXGjzoi<0U6_Whq6oWlskrU@+P~i-X!e)Hm}X^B0nomR$S1i08ug5$mN^OZ4+Dj z<&({BPfWN+=d781ALdx0KG99dQRgQc`8fM9xIwXoeiq_n5s5*Ob*|7Y@Q}#=6d5r9 zvV-}n4G_>5BW+Av-PL%zZyxQuFA<8J=WiAFxk>9UM_pk}owtSa^4*P#&O};zJ!&>t zpp}fqrriJJZ&OQ};#;FGneS9@&H~{F@9$FVE%u(VmR51tnTQcbSU5+=V!f|ZB5GSW zr`Z*&PHKdYVXopz@jH5CB(iy^%(lPU!2+IlT}N_SE;uAZZ9HTIjf< z9LYm)*eN#Nn0ei)aFAudG|kFKh0+H?DZ3@F{OG zaWH&OWpsXwT+bke%4fP&Pp|eM(Ue37P^smf?z~jyz`?ZmD$Nu<@kX??QstJXl4Jhk z=qV2_#MR|a)V(+{S_g%FOblg`!5h+DzvMcTK*Tm71X>kr#}@;Q$yt>lYRDe7QM5Rj zn`Us0s;5#>k`NKzeUFSkafrj7Xgrc2^tzJ{JDtQyPrj0(!PJCt+Zm3$m*|uPU<~^h zqi8axKLbMaPxB>9Oun!Le-_QuelPGA6`vw4mBT!(33Pi9PaNJ&R8F}Zy8O9uIwF8{ z+Ev+e7|IyMsju!jGbHNVPw-!Jb1H{rYeXf!!QnVLn+z%(-5jsMpH;Y3T6#oR86mTM zWwm}-u-QG_KDZxSevYvsMg{?co!(P>V`%7`^+@ZoLnSVYbI-nIpO=AXz4K;1N!;R$ z7}*;6*=P4nT|&-vx*tR>_{38&ogTS0F9|84f8LY%cApE`RH9Eg@uHRxb|G}$`^|rq z%P5O})v-U+yEkhK`&!*ec%xEQBVo@?C?$wW?>wJJZbQg7;(?+vOLSl{(Q^K`P|i|{ z7xBMpSw7^DR@F%>Z7%6%mz-9zMz$cFUoCkZf%+)t-hy<$K&CUoWX-puR#ww{vV*#D z8P*R1ovuv-U%x?b!b5Ez#uu|Bh9 zt7d=cN^$CPADR72+bm$m?qr)ufm9U)LUyEZ-o!0y{Q@m~<9g1mPXFE><;H5X?}Ss@ z9|u;Uyqh8R3KK&m;a=#GWl(iE8jS`;d|sOQ!DC=w`g0YT!WI?`LDo^!uCK!wU$k z%_M-_?}-P@9>(<0Q)m*F;;-g6ElYi@&Mrf%jVH?AJ}Te?mtN+dXy-n zLT#I<^+lIbkyHra5I-L>1+dR3mQ?58iHK)MF$S5$z&}}T-y{u%NjXHNaUA@#MS{n$ z<@lmm+jq`IPA|LfVp8Kofl{>NkPfXPuV@{?b+Nkx5@Wt&pPS}dEqcUK3k6%a)3$n+ zhs-W$j5C(mguvIEu1bKscf^^40{EnG6f&6ACc-YtXadBw6tp|qlXs%|LuEbxtP>GV zldml_kPf(*3dO|4e+UNYWl&gF938@t;~~Qukh5MjY&P%s^8V9s%C>taa2M#E?c%5j z3?$nE_T5J4l;Vt&s!AWI_h?ytv~>)R|0CLyi9-&d7GlV{sRZ@kL4Ah^-kk{$o>{E# zYqy*@00gR_XD2jYYJyFhYl_-XLd&&gyad}^pG0Mmw7U2BL_1+@7)-Sab6jmBh&HsZ z?=pmwcMwhSoC~Dw8ZPMLG{#T94+& z!&Xo1%{FOjPbv^Q*UODmTD8HAaZ5p?Y@{hJ%RpcpD_89V~ zQ*C745``A`+Gx}(IS6G$hE+oZ^R$zAb$EVxwP;Cb?g!%mYQ34-dL4CVa zOimiRNPZ==uB+D^3Dmptu}80#7XYR6_qA*XmDQCZ-u8&~NB(=n)&#;1jlcbXiL7r{ zvu{Ue_4!SfR7LXdwu7P@$5hIg`S#AuaX8su`h&qve>Z;#eHm~XK@mE<{^c075*aR@ zlstadhH7;ZP0Be{cI(@19@bQ=rVrdc=QF zf6Yf$Tzu>CB$JHvygpw;4ZE4)j%!q{1mEm}sBL_t*YupTuQkkv1)z{-;dQ933XLnx zRnW+>MBZmu9|kCqD|^@-nC-)EdzfH?`nc_E{wcekX+`{IFQ1S$=5d~8NkwRN&A2uh zzyz;lz$y)Vof$HHQpg{jzZvaa>YT|xq)&d+I}Rq$qp|(>V;nZWh{7Lf{4*N{B|CY7 z$x2naQ(gQ7AyF#I8_4f0R6P0EM?wA)M2(r9kKDe z2xpY+Tjzzsbmn-L>dHNu5sBUBOEKnC)R@ex_Z+6jT*U-n{V>LMHVcj;%lkyHbcxPS zR`HSjwG#$Xo3BiN9Z{|78Zy&55|4U{Drl9K=KIz=?drXh`-V5`n-CW=!-$<7|0 zx>>&J`<>INCC8rp`Qk4p%6f!V;(3Ks;yR*3M=pE-Kq?1xtZ1k zrtz5f>SXITvL|fvMy|vAozKGgrMm(b_1PN`-PrK}DbdE*up}R^fmxl}av3-#umcGE zV%Ky#*X2yxUX<7sJO**TJ889XZu(r)gTO{jKW7c_f>~Ruv~SyuAQ*Ed#!;Vu)Hz7o zz+I`mpJJ}dB$P^A-p1k5jYVrdwGtkWdwdk>DB`kdtJS7FWxkUMAupw}^fAbreqtcM zQUj2O&1z?!)D0fB^@((Dv&_NXZU_&$YjK%^T1N(wY3#1}7g!ow)t?+wb%89h86G3= z4mdCT^9_UP!MnBXCS0?|3@Q)X4;9c%Z#AO6q>0TrnGwl#Ow7j9)I|mQ*ZXon=h?0N z+FMz-gVR@y0iOHHy05l5%0o@?%9&dgETGUk7fjiy{u6x*E-@A@7{ z^p{7qibABc#{aWe2(+ftSKR7U(ECrMi08@K?s6wTilmIY%Q#>8*sZ^Q-n*LF(3W+? zY?C{A_Q!I!xD>ltW=kiY%wg{(Qz>YZ+id*9~=m%7zu5+~zo zsSXQkGbm2__^><2`O~Qf#ZhmxsV?z*qA((&s6%*ay3EUGF2_cy5 zej^O+%DtGB^D?2+Px>x`dLtt(E>&#_U9{n&bUe79Y?f6t;;IhJ0RYz!I*7|6&oGxum zdS^cU(^3P1&`D;zTHlDs0wiz|M;-sh%Xe-4K#*>2Db@QGO-dZKamn&5&BWxDFr79J zBg(y@h}A(y7Xw66r}cG{HNeb8bb&15yb6QH!63(f=8-gQ^yOXWMX)P7?7@{drrM*M zP~#%xA>z%9KtNoURtJ@uOP|QL{Q4+)@}6}uG9Mekxmf|oZ&d^VV93mINP=N1izEhm z{B||kzp$kkVTR_>A!2p?41@8q2kZ;WB}drgv)#@~+yU}UfCM5B=(`bU2emrYYznx< zu)JL#UDnq_KNKWxV>mMdQ{Lf9$2Fg7*gvHWX|ri7`(_scL?L!>_ z3-*)hf%jhB59$8vld&gIXpxU*ZP&eMk5 zb2a;f)i(<0oblFhKZ8+D>BRlMP zVdh)VqQRV+VNYZSUw8e7coIfd!}tB=$2GqGFz~kB8Oeu^w)z=ai${)wDZj!6+08rX z)f)bZu4@!;czGuSv zDzw7jHf3yO?W1;B%4!&4yNVBiB-C4KmLHzA?it7aNtEAXH4Kh~Au=#)INJbcp(PC; z0PvO<B|iUC|F>T%LDHNN;a_zh3->z6~_qiR|;Lo7AOqK-I`kA-I3Y zxG7Qe{!h=CjTU9DQqv;-{pQDl{Buip6ORp5kOj5XTk7O1aXn7+H~!tlBYA;~uT#vS zbu5qdSFaYdUu!b;;vXKk9U-qP*s3D*KqPy#YmIjxNy^0^(Qq-@f%whU+U}L#ZvMj* zaZ^=?K6hUe$#Q37ve7A$B9^mYq^Mu;vOb~A7zJ_iWV!#on%+4K$S};s{A(?BvCi*x zz2Zb>%nWsu@leNOF<9$?Ap*Fao?C~7@HC2+eac^V+Q|x;{;+(u~%C~1(cmGW4Jsn zN*JlQh-dTCS@k-xA)1u!pZJW_0HMaPnq5i5kc?D7V5jK_f)qQ(zLX>rf<-4$+A-5! zLWINZC$a_Y6fqLkM`NkRdw=0!P`DwuS`{r&^S=+~DvSWUi8Ljx(IA`rW;K+OY(MG$ zmp3$lli^erc-??|(tER1E-XITa7!E#&IGgJ#%7u7w z5$CuGVE%>9qg4hLWIDMw2cH*RB5us->)-3yHR$8CoqPFSjC{sNQ^YABB2g!;(?PqU z>%asSL?*Nd$RP$;hBp5JsXH6Q(SEI7TwPcw{-|(fpyI>nQ8%+;%H**vy`0@-@`e&^ z$w-ng8A6$#(fhQdD>6yKb#3#$1e>CtbAf&?*AwSRu;wmbyfHdo=1C=NaWdUUQPONP zd1_dy9t)I#D?Zi1DW8e`1C?f6W1O`&`1o-xy&A{mRg>%bni~Wp&8yAR!!;u8)>L`& zjwqykyE}OPo95X@JGvR;HvYhROS*yNDYMouej%fQ1v!yCzTx!J%B_$)GW};e=Na!t zrMP{<;Kw$VG4VLjWcnFO&E&=cN6*SK?Qq~qaXD8x`%ur4h~Zx(kB}bR zk`Ppy6cBjOuU&*#81;uAS`0#S?3W?IuhQ+tg5IzUK74N4|$895pPjA^Ke@fT_}@k!-f0{P_bP2-;BAiVLTC(EYi zyM?>8SC=*Fnctv4AO_a4FQ-F`l=GOePAV@f>==~H6gib*u=XFUL*tMl?bFC~6B3LY zN}Wlu=QrvIMY6jvt6%nBC=PP>RW`7CG(2gJddv_Wug?AwNyhN^;lq65!ny9>m+k}# z8n`6Qhk8Vgt|_M0RX%E8xZZ`J@>y7qvR4OkR_lcT!i$Hs1c%uo)gYg(`>CL&$j@kR z{%mYzcFpJ-fNXgF9bO~2p7;H*r-AE_iy?XMUa7Xb`Q9BPweL*jB$FCNmH4x!Mo4N=uS&H2w3q-JP)rKz4GDQ$A)cMS&V8_JBI-UezIY7|b2*s9n_5PLRB}_wZ1X`biB4 zeu$)}Qr=7qQPJq+GAs$m6jVP~bHF4?C41Q`SC<)%+eIh%?B`g9AsK^{COFjvl*7G& zc;k|i&`Pu3?qso3#SsqSCN4M^Njx$pRx>!nSoK41BT@H)2@9|tq^!OvjY+ai9vr_S zofx;Fz^LJ==rTLlZ+3)+F0R&$ z{;TdO!yej<)Se`P&r)R6j}KqeP+MyMDP9CKwV?9zxp=y7_p%$=*^VLEgnyX+9GI?$ z<28cE!?_wb`8OxdiTmAkr72>nwbWY9>qS;*0JiiibFojl8+7+d5>vF!x4w`1+MF-k z#I$#p=^%5?-^2H2t)0kYdan>KH+1-f!gga{MPlyv&g@y%NmPY{(&WfnV0Bb)JF4ai z1Q(?(wyqOdX0#efM+U`x1Q@oKe~9?u!uN*W`C@e!{Em)N4nWEch-C;jZd&UR&^fzB z^dBK%N;ox#ZOy(l7K~<9Rbrgq0?6$!T{!(JBZ%oYWS%Gmu%><^RK)RQjmNid_EtD# z$}Iua1T-= zC=o{JP8a?PWTazuG`}Bnv$)Fd{P%6qu-MDXLG53y|B6!HNn9esT}XrW>7>zWdQmvF z^}}31_n{Mn>G!+nw!6V}o3GeJaZ{>N%9qn!J~~&lA_9+W74f-0K*jt5sv1L}67ywj zuoWY;5Ajh=&~B05c)KdGT2iASENuXe8WYdgkwydUSurtXP=J7o03f$mS;!v`tF+ z_^KC)Gn?CYDSETIYZb8VwqmG__e)fgWx#JD`n>QP2WCj*=wU?~f>CcpZ)df+SryCt z;SyEHtj*}LQ!ttTq2&;SJ0SrhD;QQunWHa58dcck2y{VnW+oe)dw}=v0N|j%@oL@4 zl!>`X?yP%*0uwx&N@@$89cF%PY*vP*F=pO8ncdD6(o1k@Zch@1Xh~$8i2=sJ&duO$ zD=y~AuLLYfKTjXBB(3 z{VVm8N23f7e3L>#rvk%gM3d+N`e4>b`Gf&5I|w^IYx85^I%dw45g~sFsw^3o4sNsEKGF=`btYG z_(g5~eUYZ*>SLawh8dVPlt=Z-TxT9vkOjM%C+6oIM_oWX>``RaT4g! zd$TrLRVOZrNMXeK!itIfft(Mcc}Ve5E#N1rU5M>2wld=lW)khDt!E`nFyn7(Xx$lY z%>qMa{6=H)5sa$p#$bWkGsCJ;n`#<=wAsn@)_PtLS3S-j=fuBTp!qysD@S_^HLNki z#A2J>Q3n1w(-rI41ai#E3wR^0R?yM%@x4KIKHRjHsX#bM2Nfj;%R6IjW?J;4C!$ia z=R&>LHssP@|D}(ea4osw23k#Z&4-|d>KtxV$0ME-n7lUfI1|Jh%wR~TB-81k92na5CB#hZ=?Y+W_ zSIRzwa*?9g=xkKxyyA1B>4>enRFO^xB5Hdt$THg(EM z`qX~2us^l!{SEGqMqy#NgXe>rH8u6F>76`fP%-9ztouxb@R8F~@tBZ>8Uw+b*Lvdz zMyKmGm2FMSyM?>h7bY#?qWHwyL^M3?XvMG(#*=4JheprtiV=q}?5dpZXvGhsmGM9Q zJjLlPHFjcj*={#?U8EDhRd_*dnjxrV%;~}h#8Nd!XZ}|Um-iYKp*+BhW6TyDk!2tn z?$=^`zJm)NqYVGa51or9st5;KOH|jwtmi2&a+ovFg>zMCl06kIfAAN5RSfT}-5HGV zwxou%u{q$KMNIc%QHw@kE~WOZ5bvZa>^oW(uG8m{7$V zO}dBX!za>=xDp>ofM7}7;ZPp`mA5diA`Pzm=xEwjQGaTQIDBcT7*6Vs&ah*`rFX_% zjnIeqNM6z46`VmiCddc)pqaCD=%0tZSI!zI6_`m)+ja|wC>F{GWB-}=BbSgJ!Crrw zwMFT)kFT?iLLl8Ty44mUVkjp&jc3=nr#c4oW2gwXk(Pf4c0H|JI$4u0JD4S;7;5dB zl|9*q=j~Wc&;H4p(9AVf#R?Q0xF1K1c(NjsUu;t{R$$eYaT_u{I(s zyXhQYPGjnch+p$hN($nYx`0tjvu4GV2BvFAjfTnu1QUv2_W8>}Geg71Pgqofn-pZD zodb?uUlSLRD=42-fZ%C*7q5|r7u(NX#b=gm>!{Kgv09JlTZ6DbV}(pGum!mi!~Fc6 z?(Se4{0>Di=qZcFe$o(^EeT70q`{$%uJ~dGl3L7Zl2L`pP3D ze*X>GtB)()*1g`+Ira!j1SkiKAfzOvanL9|UN~VG)*Ei~0M9oIW?EC5Z{uTOE@9(D&?Bqt#d_TiRMU|*m zqq6y;3_$K8cMWZwYU$FXCC^@dS82lmJ&9n(R4L_9ME$!vzk-uW5TpN+)8Qcum0H-` zq&=@VxdRJ^eJlPSZXXyCGlnWo*T91#0;fEw8m1v4zG1A0|iILOd>@~y+ zNxQm!_K?p%v#&Z4VVB}e>6zY@C^WY0CA<144unDCpVp8T5~i5^kp~RP1hUJ^;Iq8r z)ch{$v=(Otl*~b)G~usYqDifH&kD0UE}4DlxkIW1N8YJOZ{zz31DHY&-F305W3t8x zl-h~*)HcJkQy!c~p7QeOBe;cnH_9+%b|S&Yoy1tqnBZV$N`My#mM|!B-!;AQesDk5 z1*5fOe9#Rc!HfzALNd<2GN2z;_T%`#c7HCkkwc!+U73&86%5fa_$c2#om5U67y!n8 z#nP=vP&rV-CMxHz{`(@Wz-N-TS=sR|HPTjr533na>t6V=x}~A~vbr=CM6GN-U&>`Y zWNn|397>O zl76W+({v+I*&TD`oGVz9o*DbAP(qSY4!QljdoBIDiT`t+Vzkjkxpy>T%%>N)dhO@9 zaXbC(zzXC#hgWJ*kH-UQ|LR@wchh_wm{@VX`2HZgR7EcYGfU%UHR*bkEwX9D)H4qVQG5uL3Zkl9JyoOE#>FX&K$V#Q7Gxx2p<0Z)d{aTyQ z_|sUHP_p+llnA$4TboP_#D35ZkqCRwV)iK)y~VaM{l?%`D~wq*>FeGaa28dQH!@IA zp#X`TcB)4&2qo)xzb{Ean27qT^SgCriW)a=4O33bFYZoO`;(sj__h&H!n{{8<(K~B z2z@zB6vlIYYX)|RtGRps1Al7%LQ3plkd^x0eP;Lg6*{$BXW5|{CdN(hcj~WOoQB){ zJ_$eLZh>`Yg12XZs!7Jj{yzw`et;|1yXOy0;y#OSWyB%p(d6wl3v2%ouT$NiJD$gd z29RywJJ~NR-v)Tn_v7EH`NF_k{3^>yV)HCFHR{ZY<7fM6?SgkOi*t$ei07V0{IwQ5 z!oAy!OhuqD6Gszn3Z{DHNuZ|N#rk@B5EV>ndi6iiqZZ<$#z$DmTgS%mdAqH#tIj%O zKt(&@gF}|?#MunGr{uT;fw*zG84#Q@6BbO%R+wMhoB1S~4-;oLge~`6Zz;wj{1f`p zS-Ex|)uVfq-(4LOyU@i&ObDwnxR&GQR6o@<38&%qy4~$Hz08eG!9Z&5Q$T>}12Y$UrhrFbe@ex(%wnW)W*5?oJQyklMXJ z+QU%iwePWuv?d$Hv2u>kKgnsJAY2O4*skc#vHmuch@2WB>KDv{4sJ=)Mao)*@fa=F zvj`BmH?IFSQSBuVg0VB0n_J3x^ZYqG1&6{tb7g^1Ev)>G_6je0Cad?=2ali@yxb=@ z;MAB3qkNVm@L%g}9v`(1XDA6`aBSM#6~*)e;`&a3)KeN+mDhEG2A2ny>1D(Mcu|uy zdG{@z&9bvGvYi$gq^()clehEz!#g#1aWPP)E6#E+2AwUftN3r^zAijFcwFAxvSE4r zleahG`sMPp?Mo$CvO0RRv)gFlX4nRVj1#NECRMC5yp0|B?zOOi7`EHcyar-k*8dP% zf?}wY3TccH5FEf-YMC46t$n0p|E==)CBPq~Rb!n3BuoRUFNf1}7hMvdo-zKo{-a)} z74sXP|4dr+#U=I2-}K*|%bR;y3;&idf5B>GFvUFa`EYAT-a0&i;Bl=aLeU_Gp5X!5 z6ywh?K4DmNCwwBHrAw&3g+B=**=CY+2Q=wSj>VYndM2Z;zi25sIDN{C9vmvYRNZ4~ zH-{-nc$J{yEr=&0N!U1-ARE!uQ|(X(VOc|Ja%9gM7TKjId0GEY3BkDdebItSZB*zm z`!y)`4EsZMs1JZtOs0Lm$HacWg`pT$Z)N|Xc_}4nm4kyi7EQeAYtA3^6=zu1-LIOW z&U;?gXV2H_`YZy}WtAYbTRID@p-`)%yj9H!6=eb3_he9eecRf$=%BgxxJ;L{L;9fH9afC=@y~dOROpwem`EqVB6#oJjz*k(31> zA8Jn>-qsN1$%SkYbe;rm!`xKVO;Y0&9#)hbGTT!pGuhJms|%NS2MwYG=!aJ6lAu^J zL18m=OD%1kU%`-Bc?JNT5)oRfe5^%i5=p>6Jel4S4JDyZb+H1BmNhJ@|4b3Uz+fU? z)@xKpZdB1l1o8tT5DAECTEEl=z>-%a7xiYiFZrJL&m%z$KLQ^Li*MbU*AUv%Lg=Jr zKLu=UL7of7m}1AoM5P#4Pw0l9=)?~YO~kJA&Hn2z7&gx1_yGd)qrvZH_t7N2IBZqk zGvn>eC&Q<)8I;z}yX$$>Ol7jxH&vbU_os%MsWUVaL()73Yc10DQlSX<4TCNvoFy9* z@c2r*-eZK~$b17!2`3g=B{8YrBIb96nwD%%l2Hl=r{kdlvz-9N?$%;#eC_@vHD<%E z9xagEOc;meB5o^c(*pkB=SO{+kUN6{O7?asGmo!T6Gizf%}Kun$yQ9i7{lq(=Rl** zbE5=ezWvpbBI5&O0-u!$t}VQgny4vAtbkz1ykS}wiZjf}GZmD;37~=&do?0hOZdS{ zt$qSYwCsr#s3YfbFCJcfqRMCgI81XHfDp~d?Li>Kigm!;@pzCQIM>Eb(ywQxyiFZC zxdG6FV-yDohT8~ZSU{&C6m1I?Z8lrC($a*4zEpSZ!pkfu#=At>bocSP{pfOZF(M;|o{6UBBeWuRD3WGUW zedR(B8JzawS$lp)|h) zHo(E#z|Y5=hV`(H#ULNX!SNNb_Lt#4uHTD$RQEs?o2u*XW``f`b5eHLGO0M$$RRp| zt;pO1#Xxm5qo(fqd3X!J1-xpL9bs{)!;GNx28kMACBsOFCz^3c)O2jl!dHo~2+S7QVa^U=h1_DsfTxbOgQ_}R{gCwabGa#u<0RNg}Q%)+PtV+xHGT~8i zHBD1cV8o-NFY^9MGVIyq`1S65H13SCO7q~w^MjJWtVeM|l$V2@Dif7%>)9lLx{6o> zL}#;oO0fOe_`R27NG2Z(wb(MJs_=Hz;V79eI{c`QM$k>E-kObqv7w>HO#laG@0Cuh z$7e}JdEwM%e@e%PT_;reU5E+csUHseONSi3*1%l%<&qU+$v6K_k9IDpT0H`K9Vyv;@=bP=<_!*4? zGE*SaF8fe$XD_2dP!O#qyAh14M~c`52$>VvUtw7~N7U<&yF_NFVYr<&iEl4dQbKd{ z=Gt4Q<(FQA7?YP&iSh#YsJ)EJc67`+KrklMwps7s-235%I|Py|)@*ZZKhHuo&OwW# z$)-f)rYfg|KOX-N?jc60AmWV4=NGs|w*N=`Vv61e-#S%;mbK^N80ItEdz$lpINmKG z`)8ZM!0r^(MRUi8M?Bayv~35^gi2%ar}8w!aV8)=vH z8GXSP8sq-I%4g%f8va!k*R@LAEDByP(mC@Bwrw;cHh1#lEu1|w-yB~ zv?c}7OZJY0#q`GEu*!m>p|cqX2n?NRIEuRRJr>ylDG;)r-!#b5_K;P`7;1x`t3eY? z6Kar{SMsKJp$f1UbM6L=fE`6;W~D;ALb*%?ZSRt~jP8Z&2miBzcTAZ7iWgnux(#$a7Q3GuGiR1Xmn86y z=sZ5VHv%G1dtMNP7$#EnROR`K#?oenvK~Gbpo7?=k}m=2c^{-m)Nb|ueS~^00KvrR zmPO_>sAhsu#;NY&)QWss)*L_`^!%FBA2?qb*}JjZ#LR*}NyCyD68=4nFFqKCZNc1I zIbaf#0{@0apN+HK!o-F0V+qr;lJ&bP5ly7C!Pj=roglr&>Ce=$IL#+48uuq5C>3VP zv$4&;PlL>)zk~(c1Hr{{==52VFkZJS3W1(UAjCaL)a_#Cb3U42ag6fWNeAaE?*{x25wHGEV=_06iGkGe)Zi|JoL8Si1d8vegY zZ8gN{`{_Qxf>HD}sXuP{es&syVTWW3nm{dBO8;gND{18bE`@s@R{k*2ml8J-`Jrja5LwlQBp29)sf@{)liVkz z3-@$aKM*S4ScAOCn!2-v89M#;$u{NbgXVv=NLW zJUM${kFvR#3WhgQtPHtU#%0x0!c?%|*Hv=5w3RjJj{lq{!QD`c z4b+iStZq6l;)KA;##;a^SQxe3J@=WJHTd&-OU^1Obq!uZpo&CsxEb8bM4AwhEKtUd zg&cn@%OH-?sa9!35Jba{O30w#YA*gr;iCPH3k6?EV|41Mp0btHZs(~ z2gCxThVHH!S@L-PZld1w%`G}ZHqUN6K&Gl6VqdUN9N`Q7#c`6r>GYtbKCFtpJ=!Jx z7+IhasR$mD)rF;qMv=QJAT5$wh;Nb`A^oV@YC{^LT!d2)e-t$F%csE!q#lG1BBe=) zPa(UlVCB2#2B2XMrRZrxG2;-kYSiiC&al^m&74=^o8HS}cI0x5^1W#Oa|~q)|6f|t zV(>X^z2dpcKTNd7btVu_=@@^SlaKbK2(~~t4)U$!4lHMp_K^V}QyM3nmRbn2*t~UN zY+>i?&V@j0^M4lA-{~>@9Hbk*mMGz-NyMNDX(zDePu@=4xI4UL;a$A^SNZ&{QiLPi zrT6ky8GCR80Mnyae5T6%Z2`UNwnD<|!wcL3l3_|ARjpd%Ws-};w~n}OeT~L8K`-VL z=arUX$AsCyrIDWy+MlYlv^Ef;@=Tk>uu!Vsn5s`Bh&Ar>Up75l0_ltf4KoaL2ow;_ zwQd=mWB&AY$Jac9P%#-?yYdVWzXP>>*+pm_HFF zMb70W#_QM}#cere^lftXlsKDQS4Ynw*McFpZGb;BkS}ZVeZOOU$y5*hNv=Urm z1(F~B`X`mIew51zqo4?1JS;4xcM241!%tve{&-A17tbr^^MkH2 zNkh}y899mAFuO?8&}#f%+AYeFjHvPVC$qA&&7-E(i==JQ9(HKqQqRna_Zo9ahz*mSMfa6;cH<+f<8LgnLQhtO@c>v1oBg3!d}_P? z3VWY1x11stC>Gu1Xf)%Ww<$Lo+$Cc!O+;}#+cPR8|K)4Flo3ZdW`U8UBcrl}Mlz4g zW9LsJyB5nzbMw|-Ncn-MhA2D$60KKGJ~+43KwB8^h=wy8fCkK>AkuZ~`XlA)P3d%V zc0C@-x#s61wbHXUZw$MUrZ^3i2n;ld?M!Wr^2u^JnFyQYwIn2QZdjrn!qM+C!TkX0 zC!{+6WuMfFN$DDQ{_^B~xJBvYk>9hFByvY8MD|BAnb`y{?#;`$o$I%?%CGYzK~Q|K zgigej>Uk`J%Hlc;nX@g=Z>B=pFn4O-K+E&>mOX!qt`zQ>lZMga>N_(3$f;D@`k-0E z@0uMI0hX1h)X*pgvj=#~@FWMt7S{kFW3}XA9K71StMSSJ4r2x3ha@%wj3q!Muln7I zU1mF={l%pnM%jxyDsYP7n!Y;b+aqi_&gK80eiX z)+9z8MTRvV3nyl!G{mv1WynzXGzr|jo?>R>?P-{8ux!8|0suA z4^3+wia=532;&k(Wx1p@$HSYgW)IeXO9z70cri*?SzFFWw|br5?G$E~+2%2zq(9Y- zyH##8XK+xlw(oGw65X`xciO!poMt{X6X_i^&~b3ud|#_+5P?^Ia)xTD+brZvD6IT~ zrRcSw)0Aml)+E_9xIPe_2tA*|AVyUbQUA|l@||^N8}&3reEzohB)_M5sd!7&=%ZKr z_aYnNd_>(jm7UOfF3k^)MVH3ZfQBVhuP9I8p2t+lWUhqRGy}or9pWE{!-(OPKP=01 z0%zP1_PM}|fu5;QA|B1|UMV#LS_j++3pmZcXE`1N(eCcu?+bMZ0q8@Mr4$a#eVNaU z*!UjmhV_BAC!gy|?v%=k9FS6=!^lGg0pjU=vmV40;03VLg8*2V(5vCU-TP!`xmFKm ztjo!dhD|U0NM8vwEi>Qe#cEaZnv466jN$=6qz-7+QR<|##ZdMX#@tHJ+$skd4yWJ! zDZRa8FNce4TTN$x6|RkCT^(#@l9Ncfdhb#L5d$(zl+hFz$gU9+9em8+!7&|)ad}dR zUd!;GK$bVZn519f0nm)nb zDAv+ajv#chVlr4%uyEVDe+k@_q~Cs3n)As&`!pfPK9@yLvKR`L{jsM%Dft6MJHeZp zmP7tHDy13$sih3m4fk_=c&gO6dG@aQFX#0j`;@E&dYd$^I<#wSK#|Pp3ELQ5!KF%h zc=|ITRVE;DEpl6SaU_Wsb|vZxR?NKV4^NvILaVjryGuSoIpv%& zfDvL*JTy>?2u%3qGg`{~p*s0d{)rvKY+NNWoY0?NW{F>x88-HQi(bH;lBdrzP9%v* zw-%8qavE1aJAHN@@f*rUey<^_Fvx5!O-PTyj@s%PB5(d~+Wvg%MKId`5U)kmpEoQP zhB6pJJEi~AQVXO?a1VH@B6Qjgq97hm)M( z#Oc&F5jjg}wUk7hL1&EVV<#I0G+s8`dexu;cOTIU8L zALsak!|sn^HD^rj!a9Ca3Ncb1S5Pcc5lC)yO-MB92Qp}ce(={ZhbSxH za_(Vu9ZmN4Rm#djVOLzN7J!o=blc!}y7LtqOtYU24@j!Orxds9L^_&auOCt{9+);M z?TnMT!tHIGo23}?qDc+ohM*sWYZ{7Q@!*3IIz>)LeZD>XtYj)w76L;azt#@aDHQ#x*7BbVoU$7!2#JF7Iy6I(syK=6 zr=W^s=3zIHLdJ^vNws_e_ixEO4N-Afc+Yh(wGPc-KD;6Pujq$-czb77LOd zMx_M}FVmXKSjj;M6HFx}6Q;^jLj16P2eXn)IO8OWZKr8DmuPH(vZNzu zqX}c^Di&M!%}`_6vABTz7;`i67{4G)85U34z8MpO{qz9~V1QYUJ34hwVF0}kM!S3U z0T42Ih@H9vgqZu32#|CB2Rmn@=TT%#Kh^}t?Z?N;U%kl{HZLkbRoSNVwU1v&u;_AX zb2<46W`MqzbNg`?tV3+GKd%VgZ}@X>-s%V!=N$zVlsN-!=4e)@FAY zuMn%|pYYvlNeUX7FpEd@=_Ij}*_4XYwnr}85sujc0q>tqoh~nM*sthjpEJ6)Q56XZ zl>oZAH6XaNy4dt*f6e|;AzIisM`T7siS7TAwe2rE+Q%k8ja8Qv!D=~zmIg}Oe`^1x z*0^9ZGm0bNesOhqbt?#$Jh!7QwO_Gb8J*(-C`;sotd4ol=ZB+4x&Hj~sdpI}Q7p5$ z+YmCZLgMKt7g#!Bi>Mrd#loGTb~K`Gm+~Xk_Xn zOA-*lHo<7lB+G8|JsAEX69P^%`A*Oznk~jTV-_(Fb!sXkxJJ}&N#dj z6tqb- z9QW_^0dQK}Hzua8Qk%4i1>-GG9XDN8<~)ws^Y)_+?`BY$>#>Ga<=FFTkXS9aSFuA1V%voxP$! z@K~OZFWMHS82r3#_pw|{&GH) z#KhZ^d(F=_I9g2Q;Dfvj@+L5^=v!Xu_iStYEkmkd7WVgF>@{2YvI!;?5r5&ML4%r( zR)Io%f|LIUdAL6id7rBVw^A4)!cKNSC}cd)(i?BFz%?*=SfGSW>Xi&geY3mp-mkB3Y#qNW)W)t7xs{xM zP`@wC$qZ}o{Yc|%ulFxfM1uc5;pC4E+<$_u?Ie--D9zY;#^oRh{?lAqS3@(C1l5P2 zJ)?kCYPFgqf;)=oq4(nFbNQ#0fUSJH6}#U-3jtdxX_%xYYFrgWh_9X4F~gRE9}@(N zv==Cx(G0GxGXa8W_7t>=own-Zy#YXQNGvxXOHze^i;2;?+eYD1|9&xLY-YMjPqi}C zI9C97DNp+_%t0^b+GA^&Gnlp$xMSR#;79gddFNg~HcqlErKZ(E}<r}SjWhT?GDJ#J`SALV_F=!1YHJ%#$&3JoAXzq51O?L;;6)Wru0RaO(Uc&LOLLX z`DhovxU?9K7i-q0lRon&6Q)mvb7kmf)DU0yb^mIALx@5Yr~cqOpmj7J->x{n3v-Pa zyKW+-2j9j;Fs%(Sp$$z6fg-q`zo)_-bDYIUWH=MqrKb{Q-e$FwltG@o{nYh zY$3x|KSIsj2-5L%oF#JBt`D$fxa;w%Ue)GTa@8Yno=mNG_tryNV7_$F{-3~WyAio1 zH_a<>(s^o7a4UcQc9dIeK9Mk4+E0qjZPvM5jv3c_o^Hx6*nNBl;t^9FuZXK6JtzMj8 z$A_q>Fc>Fdfn>al-rd!hGgtK=JhcU3J3n;I$ORZ@ltt>nGT4H&X0-nFsW9sO##iQt z42QW`C9BR~9-FB#^}QIdK1CL=U^Vz(mo=-9teK~#e^nV^u&k-EOx+#<92Zh83H36F zPZvSrY(E1yDYq(dPAW1bg!0TMZQXoiwwbyOP6!`fX_cX>|F>j zgXXUlg$aH*_lOIr+T6BcXK$P7tJQKFwB?(3`Ctt55sIgOJa+j^2Z&@f9!v9cpG%pt zYXj`2t!y>p2CW6l45dlT>D33vEYYWdtNf>zRy2=FtfcS~;-k zI=@`W&noR3S;ro{((ya|!rH!Pc!3{pR`0i;YZKG9{&oImuX^Lc1Q^(+)`GF-oQo_4 z-I0Ms*8K*mu>K&Ar*rnF$wG!n%;bzHIJMX9ZJVG9+GH5=N%7evl=!o*)c6`2>JlDq zE~{6ZAbtW);aA2x{}@D@Z@=dT1XIR%;*w7*pkv2)1}i!C`1Q<(2Me|(+Hx}zt$TZU zXwlOf7~A8NhyE(rg7_Nm!stx1J$pb$1}&WDbmk&=xkvsR@w2syQS5ziv-I8HssAVg z)tDC*p}B~LLdP__F#MDJv3RG-f(V);H?eGdjP?+sfdLPEawA*ZS50f?JN1u%&{1F{ z6ClNakT6A2P=Zt@jj&C~^HPZsqJ*b1e&zloYKL-w>A1A`G@&|7y||p3?V{YG{J*~- zc7;xARn&ke15_H=GE3vFpIvPs2&fzy%q*srt+q$MB`leKNbP64dXFT)9PmvPZ$>JC zyDuk0fVVAl$u!(@umOIzb`-tQyq01wc%D5cXnGpIF4`-7DiHNJ>Ty`Jk3x2w(}inN zJOiF|nwM{bWq}VmIW}*W;rGh8gx;}nMzfD-0G<9|X`c|Kkr?5x1WInwt zO@ao2pEU603J7@?tLPS+#Dn{NkpfyH$oybXiv-+l!09;fw-GpDygP`SuXvwu?VgcI^(w#<g-m~49}b2_e^)# zr@|U%UOTXCP(WgtWpG2o(r-utb{t%V@@9g)*$frYDCQ^0C@ZdeJGZ^F zt{PXild@oK(LM&qB~d=yWO%r{)&U2`0fc;Bs!+h%ykVO#<4x^(@@)DTzY1m{vNWXc zp(2u#f`#l}4GlRb+ptw<7@NVnK1Ji!wH`LQj(t=zTrSSl8{OYXU(Dsfm;xbL7_Ccq4W>6Lh>=zDlneSG{I@tXLxU8Awi5q|{_yQrdfAwYYIw+4 zQQL0F+i127f%4SDy@w3qkx6dSDt?n``p0sf7Tg2qk63n^>KV|DsrgPpQ6Kbi{4!km zqJ3zu&$7t$DXs=* zIJkWgif1DYo8*NFKUB34GRc9vz*@h_#5^ga#!a_Q}-y2 zpSAU_D{D+mXH!490%o5Jpudco_Lnd?@91x}D;aaki^r8&p5%mXo)FjSRexclD$Ti@cw4BhLi3Gb@pC zk1%ttH#)r=Xud0Y@xX>N?(%cC;w+eij@(lD8OPSd(59oZZRYcRw4jqUh2P(0Jlk(HWME zlU?`SwVM;>3xxjfJ_mJ`*jG`q8*NB%mvrE99gnjZ$)S`XRTDY7`hdW7nY+olu=T4N z08klWQet;+$D=>_?>m2=DWF7XJr8~8P&Gew;}0|h+Mt;D(I9+8&d!%r!=2)h z;}2MZb=K9~s;bnYGGSr_G}(SRM5Fvv@~BZ|1e`bwFaa?_f>rrF8+>4gqxhMJYvE_y-#&oq z_x~w6%dWN-EsEkYVBiv*kRZX`X^{ZI-6`(wPE*_|R@{nvafjmW?!~pZwm|R8`v>`u zoSePaTyuMtAKI9oXs?`RH!d|&E^NfKP75xz2&6Y}C=k;7JiX!F`(z%*M-M0fSdx;y zNMjSRiwBMueu7_6e^at>V3(CaYQk6KZIhM)n*;Ka8>D33W;Hg3rOjOGn3Ykn>R>B^ zjHcUo1E3fC8cHmdP)uR^XZmxez$*6WAgqZh>!A>0c7a!tiX2FmCtx!92NfzQ$-j?k zh@C=!N$TS7r(LsP8d-E(#0lsYQk_C0s_(0$=t)`~0Js*s7>jb85Lmx~Q9r^?!f;g0 z@MQ>b4%FXgs=SPR`j^-(0t)2s{biky&{VauX{me%v&^8|t-4vy)D33Zg57 zXzXh$yt>$T?D&JZnG0O;reVH#V;e4+KUR{64F%=HEOEh1AhE!w zo_5nnGMqQlz**+GK{z7i{$h&QEF+^5Xi8baiFhc`1q^=wz9{AGNi?!yWV7Z|obSV_3S@IAob)n4N+}BrpuKpvLhEB^H4NeSX z%<@S+{*~P~FIG*o>g8&q<(Bj8Fb+7(UZ4!ZWD~yZ`H9M&JlkO_Nt)Y|&?uS_O&bKs z-AA<|IyS3IGui+CV;*6aiA2hZhaRE-AZyjuw$KsC{?Ybye&KIZOSWk(xboo8p;FRc zlBM0cTAN&HIpD2-aOW)8 z+>nxV%CMmth;I-83qcc0n#_d)HAvTyqz|Q#hSBm&tufgnl0Si#}Zlq!+; zl|tAtaJm&rf((Q+O&3@w^_ZFXTNz=MKJ(Xrely+CDkjiBr%i%trlW%)5 zyZK%&Q%A5bv_NMG5AL#m_&pd(>=7O||9wR8RG5)m^g2YnvOmkIGCkkT_E_*$zEbrX zDtRw6^bwi)q*71ob9m`>qp`>4cNYRy%($T)qYUcSO%vIKJ@@IBOoZA63oVtuk$wqN zg-b!RokA;xVHZbDvt9a17wN-pe0(SodinZ`6ss8BI-klOd?*%|Wb>AYuk45q&B^lt zn9m&b%Sa1X5iNYoIk~X)yE_rIUZjmSGsy8bFRFSc&C9L*?9`(t=QVdHve8#bho-n8 zw#61fXt+i*UOUNOFS2}lE#koC!0O76u9r+8h^@Z*KaRps3&41^(%-ZA%<#(Z#>)#0 z0Rku9a=+Sg;HB3ZqW`w@O7^+@7Ith{VP%a}DcO;{h$K(B+img?%!wYWIHt|m%gu%O zE7HnRh90nFEh8``L<>1G#mo7XZXpRdX7%wP(^ssY=AgNHK*ZC#2s7t4EVxf^q-cx`f(NfH2cOt zjIL7xUHrJP-lP|#k}IZbu|7BtnpQo*eJG1xdK2X}P50Y0`|k}*qPv6kD8Lm7eN1)! z#nm5j~W8h>S4V)Ob+@~Y!9g>IsRb5A*?$adR_XA}RBp5>Y*`-EHuC+HZq{1SMp>VfVyO}E(kleIDT>hio(oeLodO)D%`SovAOc=fdAh^2|{sG@&-2L1(AGC1gaH4 zwd8q#@eimspis>Wt!mf-GqZi@BAa+I_-rn9G z_4R!x+T}6egSlADU5T%~3CEYAJhoNP5!?wofca!I-=>GmNc4M0D zO5xFbCdHb=RVS0QJ}RW~Oo=e~ZeSV`&zBULL00AhqA&x)f)S^b<8>oY_+zGdt5O6? zY_)WT6^9&c6&^7Nk}_g^6zL&^mOb2m*{^{??`O{9vBv1cU4FRF5byo&&w?1(DvG7* z%?Bw`5bb;_9yT}jZnGY?LVU(Y^3??_-(8bM&xzM1_U-gBH&iZ)Z7+Bp9npK+0WPHs z_h`(_3f4YzQ>K9AKBMmiPL5>E6kaz7LIz^Qbl(RtqKGQyqzpjouM*=gqZA;*Yat9r zvJaVpO~|Q2Bxu1(@Qaax z0)U1f22H;b6pdtO=S0zf%bT27C$?X27h?u`C42q2=Al@W0jlJ~$R zZSZtfUutwD<8(Btv{%+}c&_cx?Sw#~;>9UA&wc#y(e~OzILA^ee$quC$S^(20i6{| z!`ldGsOK=+p_z>*u992Hp1SdM!}Y2IeoqK<)C8e_6+5sYlAOM*CL`G}08m^2?R$JKUU% zjZ!sUf59n2#X}ki)m~S(y?Ul&w`B-7lhP1Pp?}(QI)p>Y_=whIQ29cBKON_^w{>z8u2f$@HYtkAsG12-3rSKvOd1dn zF5DuoC3|XBq%=W12$Mvqz&DuhVM^MBi&2b=pe*8T?jNof&)&_6&zIjbiks9rdM0tI zp-+s$$*dI&{WG7WBxq!sOtTEHJksk zC4h5!9@4T^#t)vcKucQLiJoX^=^> zF^&=VDKeFE10N>u!)U7R##c*QJFMBa5EKR5Y%_uoL?myXJ z6R2At?2i!q`Fmw`evfj8beX0?#5?W>q>68cv#N_fxP)?|xOd!Blv&k~o{Y-Nx<~#z ze3ivoQ_M9?J~v`}rWyX2#Y_Q3DdJ`WzX0I{FUA?KkY}GywxlF{EJceP6aRg{khg2> zOd2|M8ZN6rP774b{ZDs1UOiW344&Tu*swMMA8G48Tq*n;2(e|M8H!RIC*l*_N7?sD z0VKYRBX0l(ts!h2C93+mh;0QLvwdu+oJT@rQ=VqFwgRI$Z~?#&Z|2`vk9;7lI&?Pm zT~h>R^1E_GJ62j7^}!W4sPblgtMb7zrjR2R*V*@e06WkeKIWhg@7wu zjS7_(-uiUS1$G^i);rU3RykMp?hDaN>#~uotTxd$-D!_H2WK`oQ`J;kg7d`6S(~AK zbEW3e7zJP$D+E?tgMmtxM#h5M{yFUT?v@rey39Ssq8&_F+~?w;;k6LgxE12-K$YGy zK|P02gH-rCz!z7M{!}u0HR`5j~?OueRZDu3Dd3eRctyf8XbD)5QIi7W7BI(?aDfX zxLl|c5?EE7rc)D2WqIopoBj?~^i^o9$gx<_C-ieNf@R>iI(}s`S`Rz*?cjwk6GGFn z(KT7j=dp|f&o$rTG-EX78i|diomu>{Z?NQpuSX5S$z5ai#WahW_N&z!NAN>Vqq7{t z!1G=+oIGWTpLp#*wl++4(n!0y9~iIBo0u$P&(A{{@BeN7x&OjbMxCO=gb}_-D>cDz z^q6>oggydishm2$!>oTXeq1|SHwpUmE~dTl0d+SyzoCgCFa}2Fa%tMs-QJucIH8|V zVy)d=+9H^irJu5n8v2YygxqJ38!Q81~n&iE=xK7cQNq zc+^uYyE3csTW+*&ox@cac*sv+P&$rM+6ovl7)CFjs>!#%ksT*7!1RM2u5$ zBPkpU3UsK54fvDB{0UsdCA z&HS}+Ng8N7LIk2$_ZW4W?y`POP1EtgVb`hZ2 z9g@XBV36cj5aR?i(jOD)41vnoc8T+w!e2><$`?51nUc5|K5A#B6h5%MZpS9Pwi2Gw z0RSS-YP)}dOB)q6`H3N4E#h|fHdM4zng#wuET13M{1P*xU#nOq)`rfr$`TpLZ5Sq3 z2iK)_@ig+=E3h{yCdZ~V+O1cpG?5_;bWYPu=2@-$&1qFBRWi=;+K$eWV3nRW_!T_r zfwK8^`7d2unc1%Lyt*VhD_3hLYc6Hp@RE|%Me%v)+2v){QU_?+@{-;rc#xYbAj6t7owzKxQCK*6qDW=ut zB&PbyAbT7I=0NLqgxjLJktSOEEs8`SohJ6j!bNfB(U2I@skhMOV0tIqK|hd|smodZ zYZIqQlLu!#SGi0vBINt zaM!tgYsF6kUli$?j|w zAVU;qIf(Iv`t~<_N%|a|)LXU)c>Iz{R{*@VdhKDa6uK@etK%nav7WA9N|XL)aJ$nn z&flbU{}@~L84id-gc4PK&*hjUcVf3WrQ$ydY%b#_bcP+V_4Z^a=9_CoSgpVmpUgx! zkC@OWn-{&~7yu+J0WGg7bQ+<3JqB}Q%wGLbl4ssC-WlNkC`aH5^=HSDeQ`v)k)_mk zCfIXp<=?rH{1u}^C^Vz7bMvhWMbBRQ8c@S!vzMKvC>T)u`%w|FIf>v&>2!%>8TD3N zZGj8TS0>4)b*tNuVtaMitFG>c5%V{8*PIz%xk$Pox$F zW7aK|d$UGxQo@P&v84J&LRuma(r<;#qUdI;Y^%n z$)!uv(5q3%(iO8Ic~M--ckubIWm>P-%7q_DqUIoA#R)IsNc=iBmf`KpvQBD$p!U06 zzBGRNrf7Dt-*PzjP8epp6HpM1ToC=qE1DQfLwQpnA3n30!`LL?*=iK<3jEG|z8C)R z4uVwU>oOSWNb*c200FGBVOHtDs8ttki$o#7F*54aYzFV(*YPFdk4#w{)@dKU$q&`7 z_zp65bY(IQj$9HKC$Tq+PRCB&&LMmclaegC6LviK#Kfj73-%cvAjXiAso;x;M2jFF zs^n~2xbj7%H;3HPeVmg|7}nWkE!_rM2f4F&E&k4SZZ*&Q*YH1s#dr=D;|B;ZPJ&Sy ze(KZN$*ex}nY=N|M#Pg-3@jNYezNRpW>Q{cH)E`ScJ4N3wlONE@UiPUKSd z2QIVpH6%FuI7206T1#9a)Chd>bKMoQ_=q?Q9lsjv3`Q)_d(Pgbbp#O0Yi2uYN@*@6fhhO{T5G~K;fmsh`mc(GPlq;>p|E)O$=X+47#Qa?%5$v+6 zWI&riD#xjvN|FDQF9#B;y{F3Xr38&km?r&*pHqmys%EQbP;fwdstG`nAefyhZ;+ti z6L}OTxTTbq1Ab7%C1!g&p9tv4+0LGHQQ{ zZa`!r(o47LA_|BIoCWJ0Pb-(wUlDN!&|M`x#S90^*!;v>MuT^Y>Xi z!yu%D+VZsUAnUU7V!1v;p-Lk@05!P}H#d#j=RndeP_2RnRBp&NWMwh_sl6mI=% zBnBMmNx&zMAZ0D{ua9hu3RVAEcHGPCOlSY~h;lO+LD==50{>I1`_U%fFX7BldVMiG z-Z$s)cXtmS;OaZ**l9J_eNun_PwVEx*!yR@o;DRy=w_3>(AsGjV*t0pX!}S?tOIvQ zRdYiR`tQOW(+m;H8kdji=TA2OxkO8}V!{L*nfTBJoA+T}EOxB}KgM$&pzhrQDhBsz z*hky3-jX7+R(P#kC6UY@Blq|6Pn>R1JD+!`or@gczFBk3%)?`tSn0qYgfc9X)B*z2*N4u65WP^!3zou`dx75%CopLce;TH9gr>#ItU+J;9+?>x(x6OwCq z+kZAxysW-VXKC?ZA$Q+Qu`)K)ULE!+Q+}sqS@#TU&cs-6jkz?V0MNBt6-H3Zd}^Lb zD<=8|w^HYpuEbRgH8NL68zUF)N2$$4-B;MJV7|=cjmKP3lDsYV9LX@;L{s+Vh)W!vQFU zEWgP~;bxm{b||6{QB=u_Sgqy87pJkAGhh{>DVZsbqf2sPD+7jL{n5i@=vCjam*)l3 z7WBTgTtamkTPoDe3+k9Z7f))+oVz~}gxU#vWTyY8iMcZuCX?Rds;|9FOQX&a0fhhk zz!+J#;9rn&x(84~m(ja!{U$g$Rj~axJb}e=d^rNWkmw~uFXLsT{t=)Z+d!ydi{BAa zT*HQkZP8EvhHYy81@kIz>AW|OwbC8*{k>fNF&UBEZC*0==iV@lR$4px9>^QyGH*}DN%BQv|&vGfz0 zf>#oFv`LJ#?p&xD<%YhPP4fbYI}-yZh@?9nVUSUR6v7Bd=%q?S8!G&Q#lI5&5>-}m zy%_mdFq+>k!C_`;)Rf(3??w$X(o%?FQGcbkyUKMjk8aY^@%5o68x2~iu>?r zgI(LGyrykDZ^cox=o{(~klb_2sB)l8+4J%i6b?`(h#c^f+wfBk@(`1rj@BTZh|pIV46Pr>$QSp~=iz24 zr1bVAUhdVv*YxVm)S@HG=Mf1MMO+UwKK<$4fvP3qPb-6U*CXxL0C|1d1l*|R1ius@ z=eZfDs)whj9-+-G2l=l{?sVYtl%@0yRN&S8JX(~D6R+LV30D`Tf`{9M!(=MM%%eCj z_bDBWF0Gj|3bWpGfu!r`-WW#JssE#WHm)v+9B;TpDgoGFw0O}CD zx5bxWHgUR@pz!Zj0DS=^-El>T6C6MFg)RcYpN`T^*{=GjX@z&$G#!*u3*VLN57iv& zg<&62XA~~*xgR0L@&%-!MZ~FtPKek^JN~L`f6a)>n8%>1;^{;x&mXa6Ug+ChI*uWj zrL5#FF3uaX@s@7T)_N#ckjJY%J_f3@EY;LRT%>^uen}sQokt8ZnG{d5^-WF9s2?B0 zDc!6|6z7U_|7-PGcOW_^&KDD0!y$Z59oTzpW(F9Mk&=_1X-EtM4xQ zbN8Q(n9T@~c5g=3C{7~g6pS>qR>~|FRC@mAW`6UsPkj(p2-L<}nTX*(niO??;a2Jz zY^evnznA9O@jU-A>kVTnC%-B>Ajw9;)$5%jh$LZ~3YPZPuy`wNBQE1XL0F#@fL#Zn zmzE%M@-TGIB9(B>*k=VI>aOG5TN+cpnYs?Jlm_<2$OGJ8vWI!wN!4C&PMjUN}4 z2Yw}`E{>wOhdPDYH0G_^dla^%jb`vsjUbKN5Sd%?;97(N21U#q z5zC=T(19`S!SrmBE@9a1MssT#5B0v7j}fWItB3&x|{p zI^eszb9S^8d03)*x4j7abjh*<)wBrW*O~6z`TDWoo#XEAXd;^g<+f)z{CspLkS7;21TY(BUj7sECAg}~{13PA0nWT4Y@7|C8V|5A9(nPd$Q?Vkq^03?p;Qu4T!qLz zi+3&F%kDsPL)5R}>2euaP62jPg2w%xgjj%e`gCVSQu+wZV~+F`N+pmh=>i6;i|Hs} z3`*n@<6Jtxt=?u<8%ZuV!V=AZ{lzL%MLAv9JaphH`ghubG_L3C8eM2O{^&t{mosG) zifXr(<}-cNbMnRvODQ3yS9j}KU)DG}A25xspoQ?60nxu$YIqWZu@MBbX{H{Rza0F? z{72#R@B&bQm7vRCI9JRi;48l3oo$#Y_(NlZGP>V;m;jf;OAW6o&4Og#j9Lx|L?Pmn zno$EXU)|rpBiy4Ph)*rUgwf|FR6;uRVnPdVj+>`XTR%O5df<2lJ8%DfwU^+y>zHiM zQC@uFqhNp&Z=-_9+@}FatsFL?WBhnIQ3{j(ceV^pJU(bi2X}jddmt>1tuitw6w=hB zwMUELp{U$YWB-tRRg-WZ@iwVxvEq00YVfW>Fhfk&NM2xAj4K0f z6KE0&rG#$$hy63i^c|67eGJ`8bNDLq2x&Ndae@Ddi7_|2j1o_s%N(N)Hp_1Jl8tgzO3DKqrGX51<1q%Gu4PqHUi}!wgo=muw z9(Zm!!l0?tpyGFqNzt(L(8yK=e2ktx9R2lFm?Lf)OeIoX0AdXK4{tS6f4`2qAwlp= zs{@h$jQoX`AzV>o)mROWUzqW55myL6j4S=H&xpn-CJzTg18EH!0X;vSwW6_`q9)>N zTobDZwt^@y)J}Tpi1-Y{FBUNZCir=%Di(zDQsNJE{9vTdd20Ujm1EDL2x9tgk&y-l%f@e~`X#7C;cuHJvR zUY+`fvmu^5K7L7zmI}t%{e_IG72LeJl|+lHe|uhpB^fP+Iu*y95KHoX4;gXUw`I|x z+p$zG@%+-0Y@$Ux>C3f<|$M)|!kz2?(PlW|872RuN03`LBA!|`jJy- zpL|GljFQ$jtW7gDlxNdWmbObIm8r;GlXN(W)x(5yN^xV%>eV%>j^I29UiX;EqkSQZ z{1>+67F=C&A85L4=^|7N4CNofPW_1>G(M^-UWu&#bh7r{!G)B!+s2CTkDc`*dWgnT zG(44|PhsfftDQbCGGPOHYDdo{E1Rmtg#{C7>N1HV-a<=kmOUT!s1xLVs$_#~SLJg} z@`Y;4>jKzen>=h@l&X>NH2Fz^rl=XS^F)mi^NDy}gn9JNq^>Q6YES=LO_dCV#<~^F zu7YF1q6$9&UMdDhz6*9L8tS`+zI^zC57m%_(rjpwd{QZ~vbat{qbxSMUxbHW#KK#ct= zSzv@9D4Z2{)U87|q1Az0g(`WH(ISROmCqog6xB^2C09h46ll&FmJ$YD080VSnVtv+ z7?*3)2wml}<3sIT#NSXjX3`hBX3 zy+xD;=c9f@m5IpJY%f#;N6WLbKz^W3*`-WJ;h@lHrn^Xd5X~u`;o8gakKQThj)( zJxT{ycA*Sel1_K#z?Y&iTcQxOUFj4s1bLq5Tah#y3XRzUbY_?u|9Jk9m2)f{E7f({ zRo(z56piDDvP1|*W(^ga{c!`ImLE09l^pv-oJ>eyB)E)R+5oB96kM1#6(^}M#TE$2 zqL=s6^Oy9ph)Z#h1R`rB0g>|C* zVacH+5gkR)RIwjd&pKQ6@=zFCWj*=*BY%&n`N#D6{#3n`0HKCdOxu71(j05iinMMg zTMH632Me8oe{l%#n4J;dk)xu_HfjQ%4}P|{qrNuUBA5J(jMg{ds>ub&7-Or}@I5~E z<|6Jw<>W;C3tg}dPl?eN(*ylAAEEfhxQq;g({PQJWUZk~Uw`2f$Sqck+>3&7 z@weuXW%2?EEnna;KSWT1OCLWTmU+2p7^3yGxXZLcq|HK+#nUPkj_y!wdTB_Hjkt`J zVq`8|#Fwt?RGO4-U{2m)f{#&v-3AvVK4TRgZccjGG3cN5qoI_cv5b{MAi#ep+8DJ2C%^{5MhG5 z-+c6;t^U4uQwnR8`hXzscuw(_#pZL9I+GxsDv}6? z2Zf08LUx0!>|Bah=qdgsXKtHES%}uh6aVs$Ufmp;a{7=rUHR1u3?x$zL^9rwYL2Eg zhT>Gf%S<G=Jv*K?}m?~p+JCK^S@7esoW_%U8Ze!ik za{0GK>8ds#CCZzW6*i}=d8z4bjv$@kjcrW9$&U#ufiWG$IFW?-Gaoz8Vsq((C;U zs39z_aZpYr%c#~=0HgSs2JXPkrY@`KzU~>~E_LO48sSSVB@s% zAUe0ACCLCnBk&9$y4p1g(P(ZR20_-+nloD?@FCYX&#(Uu;JW5B|M1K;UC|~gVs$8@ zY`?`^CVAUhL)XG(fd7nJ7k z_2JQttcgiNox%u1V$Cno?vjP{Th)vo1>)Nfm$fVj+V6_j8pI`{(vu%yCFp_KMSh8P-F}De%`$-slzD~&Z&_+D%2eAU*6p%X$qrxdjlO=LRI_sgst#>1e zdErIT?MCUE3MVr^G4^Rw4-=>=>~BTHlB^6BZx#kAA{z(&d*Dbvo15BB7IUA30^c(A zCq#a$lUMVB;K|av2M6jt^)3>6RAdj&6C6Ifk-#xx6!Q=yGQVM5ljmW*gn}#kUqZ0r!fk|O6i$+rNr7UNY z3x5c5{7d4$uhSt)m?47uACt_R72VBRHUnB>b5~eY>Wbz2bfTNM+$3o+lNn(OAe$bU zgK<|sgCpb$goL4MMn$DqtL5L`Sv&0gu82KP5d>NJ9+?^~W%S{5YQodJ&QMp+C*xZU z_iaYFQy$Eg?cs+DI|8#kKX#HL=P@F`P&+P>W6)rZmS)M7nCV^k$82kXRUa#S$%3Un zaLuxkrfI%txqA1``>W|bT#<^qZsyXxVU6s!ydPTL4I!FOnHL7$J^}DE^S6F9b?^8?!`_#7!3DCo%nWeHs z4OA6|;f@`(H*a@r2XKnb!3W3q!nyqAr5SixA0xZ?wW*_rrclmWR<&tbk2+IH0(cyg z7&0epq%D)dP=a=d8ziKO^|0BQNY~!nYQl`C^}BJ09iYakD}0S@1nU%D4cT1zQ2fe0BL@Q*RWx@Z@DHPP4m1! zWr1T;<^tGR3}VfD%!jVzKJns{y4lA|30pF3GVj9;;2x>D0f+~G{E?rhcO zB!|GnEQ)1htFpP9Q~IMk>xv$3+;OXmh)hQ_zg1j@RNV!5K>L*Ga;7rJsltZ5J@Pa+ zx6Jr9dzZMdHL%nRxkmKOR-`Fp4i>H^J#NNL807@P>!KdD@y>}zDT|!a-t^EO&b%^r z!Ekm?G<;h`y8-qXPt3##`xVK@c_e9ewoq5t`TBaT5mV9gve$m3?f$9uS*9(Iyu(2w z+i#kek6jjy+vv3?j>G>e-OZV@#%S%8-VD1In0A%I%M{kPpVQizWUp_S-5g@qNw8}W zk%M&crFp;(i&D#~o*T6=I*b<=4>{>DCMA9`L)b|y zlh(u>Z1{gT9m}t)cAB)nGyl00YH=m)11EdIcVNdRFpg5cNX_;XZ;{=lTgm$I%hzIk z3v*T51TCCCF+ae$@hg?%3x860WLt4nlwJvnG!!WrY01JcPZFyzxabVg-1#aN{KqGj zfLuEVK2S$0D%sfA&^%Oc1cD%|iL+&bzD*jI7`Y(8M#gxEWNZmTh;l`3a_bE$&$u*u z=?Do!Y(EO8i*_5ven8&=ws;ui$LED75F-mHKNX^I zD98X}{1rDmfu5U8VX+hG>z?!XI}W^+>Z1YtP{BE7#^a5Tt<3JI&8t%ucL5;tdFR-B zMzY1drCP~pa5cZdEdRfX_i`b5hQi2^9uJZzH=v6r7fIW=E~dVe};0`XtaN)XWZ+SygBXJOz4d z+6h=BB$pOxq%x%qa|n(&77F+C;JKwTe)4EN-T#`YYhiXcQQn;Y$w(&RKlJi6P6nR_ z-m->Wz4Y8GhCIKI_BuUJOcXkav4tQA+<*V9RdAK5FOOS_R-5Y2(oPnyBp8gWR=ig) z%n|j?2?MpbX}}$pttactSh#SEp86>qd_OjcGOY6K~d!@<0&@{ucG8X0G#2 z(WQvlM;AL${z?6EB1_zXW0EM9uaN~iiclRZ48$sUJ;udS+cABwp?Wzm=we>oRPy{#{)J4KWhUf?$T-ygf8+*MoKVE$2==iQ&)6q zDfEkm&o?G}gxTIYs|(%)M7$m8l9p{rSxs8YBD;ei1v$klJe{&Yj z>7J5ACxMDVr!I|9vZ`_W=g5qXe8;!2m`&Ink+{3&*}=SkkDm2xE0bwT^Q0+%2c4)4 zGXOSncvg4n1VgGkHb(Izm^(zu-F#yWYp$)#^v%j}EQY7X8(I_99<`*h z#w~Jj{=Vq~Mj7_8NU6VHZT4o9AC%z(<62MN&)#JqNZhJ+rT`l%LIx*et3vuOZfoLJ zqFV=tA;1J)ck@h=m{swt0%F8(>)+LToBbBAE$s})k$CU9PhCiV89!n0-nKI`TgKnk*A(x>SOwz$RDesO)<3Xfu`QG--JU^za0-tYXaZtvhyXWe%JFMTAFQm3 zs~DKSMc%Fkwd&$9e}1%CYxLMY%F0iQ8ZTu(5bnFea&4!=k-Em_girt-4BATV`=Gbh8R!+6^Vg2^b6bAiA85@9VmOxTG^IHz%K7U3Avg|hhbM;Ao(xs;Y%{? zlF_g{jIha^-yMkj!l>`)<7;e9>L;Pbp;X547WIXMuyu9epzE3Ft&Jj`Syg0?1>C%-E5&hh|VD0v1-sM%@ zY-@{G+Xf8U#J9ZqSlT^SP(ZCUZ{p|e!(v<=GUWBY0D2^a+wtc;x#}&aLRR|i!@N;b zf5ys4oIhoVc>dA2Okz#y$@`y5ZSbBtycHwB4-d~~etE~-@fH`{J>Ot8Mr9a%EmUW( zMogrbOqXEd5z;C$f;6}?IhY)43*P|rW$7|V z5L|ods*tIpsntac$Ce{AgJzYtanXe)e;bX+^eZ6LWsuzqHyVM4C&R(JKm>++n z=^sX(huUgI`d&Vr7HccZVMbAYnepBNp~a8PYdn(eE)*>C*(J)Dkb$R7(bVb8py(tr z6!U-^7AeULiq|uXhZsX*lBrEtkwL+&VKQ(dB^JP}5nS^*;XYjVy_7f`6R=Ele>utQ z)WgtePJqq34j>xdI^y8Y2fDd%GRLHlpyUSRk}V@838!;sH!evF(kPagz^GeROHr>C z-8MF(7Ww{%&b@M&A->%k^z6qiwL`EuEF&ecZ2Dq6)={b(yEMeESc#B0iG_;<1v6nq z_{!DAxIp0O9JYxdu-j&?y^}`Fe-WVT9&h;DiLnMFDI+A)KqSaa)tUz^L%&^Eg?L>; zjww1iB99~5D8QM}y&OlGaaCku9&q65U)rZK;iDTmPg3slr*2?(+;~IlS(fLWp>pSz zb)5Q4S7Nu~-t^=|O1^gE73TX*C^pi35`-h7hke!*@|{RY*+_9f{vq33f5H}`>P}+YYR8e1It89K{V|&($71o)CIp^w5DrvPb(Pwu-pcWJD4j(1 z+=Rz|Bd2YyPC0l54~?bYeKQkz+!RdAo>_aVGnr@Bps~=-?j%mLb`@RxF1M$AI=2KR zPqH0C-+7IYgqar_iAe+Ie}y9@NPSFBn+3|Dabaxla^7r_rIAbC7=ri5@VRZ6y`-Ue z8qwpkl-)VDoX0UJjnk5pN#RjOXvrBTtU4`U%ynI2jh}eyySFv67RpQ}n&tcR;zx$Y z&51TK)trF9X51itXvcSYaVhh(Ds1m- ze5vX$sQo_VOGo?uCy6_4^s^vju&^JY_4rrsKAbb*;@m;B)G@@=gyphMu(rFPdHLe* z;RU)x_LPmOs7%|UVB6G%;3mvs@qr>w6d`Y0V0jSjFQ?kEsyte1zm}!VsA> zO1MI9VW7fg^l%<%@Jz8d7&pqpw70Om-IOo|HwZ@VC-3Upk|>CA(W!z$LYpHcw<#kj zyx!{DZSt>lt^8++rNnI z0MBLi(i4q%rUtNwYjAff`MndT{ST2&#y?jbZX#KS2~HnzEE3Hm@bfLSeNp?0qnYs2 zy^Rr=dq`k|$(o()--yhZYKv<U^GUIU*I=3mOS0Z}Ob0JMEiqWPc)ipfXVBj;haxrHo3y7t9wDio)%O^<2 zVk}Vbb2uJ6rGg8Gmtfn}FvAXS375wMBPrN+OCu$SCuzBi?)QdjAc#&c?>+_=H0Bhg ze=RV!AP5O;7VCH4H0m9Cd1TEk5v8IXooHqg=0MN^yP}6!zVep za(H^`hawLsg_e3!S(Ok-uwE8aP;DqMWJW#d+C9da_-IBYWgD>sP~*JOB%8q!!8NfZ zGa#6HWD_RKWMY9mLP<@;M$r>cm5!o&GXpn^8ucS3R^wAQkgh}^;K>O=1|yu;e^J>! z_V6!qk};|++jqlO{91{xg({oZVLrs|_2k}U8$F5X3`eJaOHANDPNc|^C0BUu-II#9 z33CFnEUBq1<3Q6Qtb)jpqbcG*p2{7KG^dsmqef7BNa6bvJksGJNKE?$znt=SZ5CJ|to zK6}pJUG>w8Bgpgj6f#$}4yQ9%g^7a>F&rOGQrm5f0rLKHWCP>&YVvYT{P$JImzN?% z>Dv-ca+)c+OZtzhK7l*x(gg!GYPQBqM|z zf0?zZsW#I!tXW#h zyU@w?)7rUoWC!cMLUWSuPNQ`9gq2@_!0EFzY9(8oDRGtXdZ&V#R*n4S{) zfT%`4Uiw1NByTDpXBv|(5(mCXew>6jfFhzWL|D#x{s`uTiy5u?GZQA%J@V-*&|=jBv$vEHne$V63u7f4njn1h5R6V07KLS3u(H z0pGH&>tGanm;jjjX9!_KfGdh(nNcGtgcata!@s;Znn0;uKOp8UBPEYpx%QPEGb1^V z2Ou4d$px!HExFMNkl($zaDdJIl z$R{%Z@9z_Se+JHpC}MeqJpuG1DZQ9mF_Dz=lz_3y}vb{=L3zEo7DYA0Fh-LiBqs(OY!%oSy(rQ;Z_ zV0**Elso|}x2l|Z5Ya3y()Z_v%bmwV2XN*%&EdoXf9=X1>zePj;7ehK*j*dY$>_X8 z@jbUVa=x`}MJt3Sg!4ZqmvK7lFzTCUgU0W}&$=Xno@^{0QWlz!xfCRjOL4LWx}Z5d zi@%6=2A&$})@x$(TS&%ur_O$+I~aMBD6RoSyzS{o9A>Djsl#V1jP>sF#v_PQLiCIv z4{5N$f6#9s?*Otu?_GAoMA-9YgTa#-!vt0?GqM_NA3O#lB?FT&Fz?`q-rVb`Ov};u z>j&lbHUbkM__Mp;6}z^cBcFvI8`-WSC0Wf7;3QZv2yIBLpyOm!fCVfAJLb+?Az28+ zfBpIr&V(areE~ulWuqyK8*MRw!FNo>?SR7w!-z~FwAwv-uG2=9HR`tZ)6Jm-t>FP@ zPLKg?!n8B6i*{{;bSc>tG^ZmacovFg8!-$(a2SN5m}`Hl9FHR<4pqyY%xxZ5&fQGL z+pcuKd<-U7oc808)qG_bK#y8#AS7-7ySUCWxl=nb0Ldb8 zA|J7!Jv61#UZw)f4MgdNJlNfKp*I%)6wsp#wWs`Njhb$y%}^ii0L~aY^?JcMQP@ zQgM9`f@de}mztuF_+UX?thvvhj!x>6k`Z9mh^IG$$b85(q8P-fl+l z>zqR~WOf!eal|9}5#Uc=Il-_cF{hUfX~^%E(An;erYL&qMI1EzORb-bHxo*yX%lpw zXE^6*B61pK%YiCb)4NiU4uxS?biB5H&r>@S(~v!fVci91QU-fYf8r;SR5-;XzToqM3oV1s_A_jBI&L&AGTlUO z-N_h;$!xF`6=~KPQ4^LT0#g(qQp5T1a3gemh(wQyx|uaqTH{ppj#S<8s#P|*pILn& z(rS}1*=Ui8m)3b)e@Ndec}$vSU2fBMnSRJX)xmM#?)Lz;K6dyVPYZ6{5cpEY$`>{z@EY(luMM&eygGcrJdraY{03}7re zT=Vk7nQa86Eo`viGc7Pa(nU2UBPBx;lf3Tk)M6YrOy;(Ke=JyyyR_k9;c5pwsuVA*~idc@KlsBnF-;O8r4o>_;wcH?{@r$CY^n;CJWHA9aBL2oZpAXlYb?`gb* z!HSjY&tV6Me+HcTk^>OKqO@ShM4*F1OFRPjDqIpdX3QbEUg9lB5`3AvDuI-!kzykp zrH7fW;Pc`l#cVvKpoc{^X++eb zg4m=+0!6wq>}PWlnWAto;YFAXK7g82vj~To+1}Fvf4vpZDFP0yhXaNmBN`UNFA*M2 zrW}ZzU<`(lB^VhaDFNmPd7X)8XGbvX25_7Z?8As6F=BNDpHs|y?2Bva1{BaFU{FC` zDFO?zKqmql0LB^Qd4br5a2%|snZnkmA{~fe+L|~F0BZsS7Q}|YV54NCGgF5GY-NF_ zv*BX!e?+jzK(i&I60p+ma#0{zxw%3|YDFqOx72wx{F;pCY@;siRgl7@NmU3GNXB_{ zmvnq}C{eIYy^i@^!3*?R22gl*1ki-U26KtfFC!`R5`&Ce4xVoDz&L0aox#os$Vfp> zDk2;ruVz@-73%7e(|oTZCFTbh9he1l4*CZHFvPwof*-`q!-fDfr4NStuAbhw z%qs-AY^bJm7^I=3d53`;&M=B?tYy2I32zHns7Tmy?oGA_yB`)n+Sq*-C7i=UyQDT7 ze<4>0A$Cj@d+H-48$ZLbn9J%IA{?bgb)6K1YexH|lr*ELo5!Xj`-fxEr0=7ZLM-e- zHhIbc6xfI+l%AQoqRxa=Xw9eFwrNB1m!}WC00Q z`HYkML`8A9U?{L#4};I!WnOrV&YytwfBhGp29amzvx$Q{g&CGZSQ_cA&~mAxOxh%q zy--f|_n-+tJcINvd7-xKi*mHoJQtKjEPpy^F1GMJb$9ZK00(#x7263qVuzv@U<_g^ zEFe$a^F4#uj@?58+vsG-J9XT5T(#)kDqGF1+GZfg!8Fa5%?Z`q(X5ROmeGmef5RL# zBPGRlWz!}COJxv2kRo7Ehy-%klrV!yhJ_s%V8OuAM^#eaRPrMwqq92PBPqnLG)P|_ zb-Qe(48SSEb~`LlL?a+4!|emnw{FnwaFE)AX*0Gi$l`Fa>&A1)0M?jb_`($Wb^JhX zm*{~G{`z?XnFiv9T7j9ENr;T8e+7qblL?VKf9ph)V0=Z)<~C~v26-ls*!DB3j>|(~ z%m&O#1S94S@!(`NP>kw8saBuT9&gg8e||JGx86xLZbYWf9dO*^Z<7H z&*0Jm#e&1{WRk(AvnxwfYSe1RwTjo^(O2UX9Uxpu1RWxAHz^#z(9WfTi-@6uE}<34 z3nTH0mu(`tF-U{~bVrbDpd%@af*sg9F@WEnO9z%Cf8(VZV@L)VwkJ#VBw@S`R=z1E zr&*(0^HkI~yW%nd5Q7#Ye;~-DgCGXKCsyNuf`aX~{){pd`{)rM2m~OhiR$qVi<=Lg zN40yy90Q5{1sVZ*IvPNbN!q&tw4qll~Os8pQ{E;gVxu(vyv(vsbEi#Cxqy;pB7 zqYGMA*h0wJBPjyVD2gKXf$cWVNJ0>bGxzE3IB_AGDQX-eB~;nve zlvEI4Mb;T;1agfKYyya4B5@4k;S+11VKzQBsu)zxBi;09wpFC5pl5a8pMe1+(1odJ zjqnC>Ftv_WT3`Cj5%6R`flS#u}IiLMTYXQ~+}^JR3o9CM7LZ6v9O$-;Vh-Ek>!N zcS(b*p{da!!xs-eJ4Q0=Ou_>;bBG|-R;u~EzEU+)OhZy?e^gAVKv`9>ktS+wEi_l- ztz6YzGFp<0T}^G<=CWghA3i4u(IEp{%?51sHGTERLF%7cxNK72p^LeBe9{opNz^&r z9WJE0PN#2=5b;$y6g|C1RoTX3a4R4l5lE3$%mRCe;s&_+bm$``%3iP{G644gc^_*5 zPOBLb5)g$=e`EzV-Ur?B@Geg;ok#DpFzXN0E6>ZnoQPusGKaR3=ID_5Z=1!v%Bg2E zdadEFf`LP}BPEompt3-;ES9H9hlW8(u2QT{+NLMo$IqTqdVe*Aday8?iF(x-Y7s(* zU>5rO+j^wdg3$^V$o@aXv5rgekPibz ze|DO%?(9dhL5%#^CKUE2J4`ZtC)ae@cL!MMrd6V@tP>F)SY{3*L z<_~p&5&DG)spr1EIa|UVI%tN~BPHR)?jt3tYlwpgBPn94h(H|jhOcG|0lfqEZdo>I zuTJT}f5Ty+g#`y4(iqP49fmDS9lS>_==ZWp3kc@eDK=xF&vcuS%wZr<_c*~|Q0q`& zI=nfmzR8dh2#yuuXUb-Db{yL{j`=_`rTO^mB!lDye@G`NBPm4@Qn2g0hL?94XMCA-1zhva zB7P;yt>>EFmF5{Nq_Sp|E7DyW^BPi9Y>bJc5J;#epO;ZAr!gam-XMkxsag8{ldot^c!uhuNrjl=t_EA^A@u?FPu_QH1Nvx!3)|yh4w)neOpaK#Im=OI?A-h`43&f5K01Wda z%$r5&b<_~bP}*rI*_uU)RE0LOq`hTZ;sLu52sy9G&~d>`H!7#~^zzHc&`)3DzfzrH z2f1Evk?%w6tIZB=MD!D!G8y3 zQ3Ue9mZTX80&^Xn`x6t`Rg$x%X3n9yFY}ZbLH!gaz+QBT;t3Bp ztOQz3Kv;&lXj^)##=N%FV?;HZMr}N*BPj+&Tr_YjRS>d3f1&^pf`iOTkIW_ne}N}X zCUnV%VCut^^jX!|^HCN0$}jaE7RBTaycDmV4g(lMU2-gul68h1TUyCr6-IS0+3q7L zIsqhy>kv<%J%6l!(jzI+)-dWHxJXF|J#|b%ElMK@)YPRK#xzMHLlP608yPJyqiE3; z@mHQ*83NNRQD=84nl*?c5)cfdfA`_zbpWI#BPkKfBPmWmuRcKP)G67%eLfU)?ATj3 zFtsQ0!2ps%*s8Vc+eWRRqRFvp8VEp(Ab}zPLP!A+oyPaiug_0j5~QWiA6$SxD57*kta{g`G445dJriWA64WBc^5hn<$k!yDn= zo6@+HlvzxhG;3~TlLdrff0Ax!Zl);3ic4u)B)NcK$dN`Of`b`u155y^1X)h-!c1yQ zY%6VoghL5@!oY_m-yL<2^$MMXt`CfvgDpeQ;kxeK(HEH9^Vsilb{St+!d z*Q0B(N{L8cC8Q(<$R=uzW0_H4@EGwy$ND2Bd4Bc_@0hoQAZ#-Uf3`g`#7(!u6BRM~ zcw3Gk4${aUza`!yC6Ci#E#aly`u=8bi#@-RC(NSu_jofoP|};-G2Bp&AJk-ol4g79 zZMOUP_=4#{PfHAvP6iBXDn&NQQvvsZNzN9FC&=@CC4PCyn~9eEOOTzQ+94_60-O`K zbWiS+z{%6s1tr6~fBbuCb@W3~wRP#Xn97AoY9lFcx(jT{$`8UDsqV?MK_oaEGa6vTMD0GK_#pHU9H>EQq(I9@tJq7F zYBpVv{4_9}h8cz^BHA<~CGaHyraPJiuMyqNXIpat+`|DOe=y$~>MoSAepS{85`3T7 z21FwzOK2D(@_aDCHgZgcLJ5%5QDKmfFVWD$=M0o_NLj_y8dyj0=IEAH7G+S05NHTC z8o4_)LOp0<)O6G)Zy!&}ma&as)84E?NaKIlF@^F8i6#D2!9cY2lZgM&X zzIZYKCt#W(uL;Lcg`@h})ulE0k{5F11Z~uSI{~z>!!{oQ)|940He=qy}f8+lT;{TWUe-HS7 zhOhZ~f4_Id^#|cc=_38F-f1}hDfdM&GE6@QS^BM2WvJZu;vx8%tu!Mk`-o(Gbcyqk zP{R+#9)&4*G1P5<{zz1k5<);vn%_;jKl-4(mBF_hWsf)2;}AMlBl zGAREj${O%6Y#*QKvuXOjPh}KAm}?VU9H0p5jcU#OFY!9VyG}ZnH~vhSv|;-j&nwTB ze~{xPf6J1I<>K|Sv1Fy1;Gbd-gNW(r%*Zp_3?Ka4nEEH+bZ_R0e7^9pwzkSb(w!qE zwhs40b==gsuZA|aFKe7K?KqJ7DX-Iz`S-!sD9OHB2`Zh;2?o$di3av0l7$G2N6S3?`ulxAu0FP-=#?M&iRSF9 zloO3VbCdMn^1si~)^+&zlkO3VfA}LMjYYo>PZ`ATeLP@SV#>-NQ=a_VCoB`}8GnV; zJv)q&biu5;ruKG=yHFXIxQIUi)_wlRV!Ch@XNxjLU4k~7(O_pMK0Ox0Y$(X+d>lKt z8e~=@L90VrKvzhtB9aA|l>}rEH^B#62T0QvKsCuMltxG(-q`1Hv8<@ke?WhF8HTge zLXm?NT8<+nniPQ*H-Q_$UPN$MfI*KDf?_~TghwAX-2+x#kdX6i;b8M^p!oUpu!gYO z<{#xEpTK?3>HXESQMeD6*6397cC2dJQqna= zi>}w-llKe=MvlM(*9^9Tf4))@LL^v$AfQnYJie~u(>-5zGfUWg%AG?iK9b-o)9Li! zOdI2N)8meXfV4dTeDHH2K59R|=qLVQirOJ)A-_}uxWGi}fPW9jSNk&l!r$kd(En%L zKjF0|S^v#JBPBZbM2t_vUAxrk?IR_x{v~B(ixEt$Vl()oTDGjAe*@9(-|9M{5B#2= zocbi>qU+1hp)ajUof`~4=dC1`f%vDv6_e8i>XHOK&T;;KvmAX@SrlPy_O+7ve`n_3 z>HnAhE=*GkU+;4N@7!}~_EZ0E5B#3}@^*jA-0YW;-t#f<8z|BYE%4{}l~9wG?CB#Z z^%!Y%ztzi)DU67vYLhv}D$x8bw*Ql^`M$bwqlken5%oflQCcm2U;K118ZJqzWnw~s zBPnXTvEd!Gc1$G@&lqK}`*-8|Ja|uggX{fq>L{uRFi~|W3H*OAjg3EV)g}NB|KjdQ Srz0s6A188@APOTqJv|Chph9E- delta 72820 zcmY&<5#pR>8I}|U)t+-o}V#T49 z;_gmw?|ryy{qt}hkL)vh)|{Dr<~H%GCh+5AaK&q64+waL*#1Wwp{t^!qNyRpCT1xt zC}wFTVhIx#eI;lvCL#(G6cD$xf|-lJ%mrWqiTZ>JxX`+6LM9?CI}`r>Gu1Ne-@k(0 z^8d#FZzt?H@}%K3r1&^mfJ9stank^X<*z$9|I6_FY`=;weqZ=6J@m6itLWTH;eYMT zhM%o4j$Vh)j*XPi6~!fMgjHO=V%)RUJMO9-Z+*QXxckz&bt@OXOFJ;kH8$(+ye`9e zn_u_1z1P#HeJQo=OtG$-s>;*p9Yv9PwUdhF6F?PXD2IqPNM zc6wzE^E=Nba^qatqg(OsMlKv)mzP&+O?rE{#^*TlbFIx0ZhTN1yK>EfBU=?nj>qOO)T4%KC3q+>c++ty~DM zW*i;@Km_lgI6(-qZ!cHWeS;N0NY5=_*Q;TVo`tmJsrfehI9|D| z39a6>u6B_4H^>=#T3ao;$M`OAtiA7e&rOxJ_;c%R<=mRL^x~TTO5~qGk896x<7K0$ z=2-vOj>V4a)f1mmKxK{p>+9w(K8Kf$ITO|X=Q!_sr2gC=Tz_x+xtQE56+9P+xxkHQ z>hRxcwYS)&k2})G9&LMi>^k}^EoC=3b>JLZdwy%5_8brNzC6zLXF5opV{y^(Zb2F! z_`bGJTnt_qmn5YnH+Db}@AB+q?#bo=oQNHj1>2XK$-C zKJ&@hZd7yfkvQgQ^bzxUt3AB#lA)TQQ9D1?av1M%UGjDr>)&y{(Y$E81TU2GT{F7y zUutUgyQE`a$G4}FPZ_tTFxtZC9(SCbUZ-E&AA7pp8=d{Y73iIrvpRq)c+stL)lm& zU^vB-LOGzm+#;9{G$Tje_E4ohU63$%=JMY(bhvpqIFW3W>Nv6_i7dppuryg1rNtzj zPbT_OC`ZS3kHzK(jtveD`wX0g_?ZnZYzk|ebgA=*Oz_D;W}+8k71_-kp&2-&AOEd~ z`}f)|_mY5GDEM)PFl11=pL*bT4`)m{pT)2WhJbAdSOlk0ru`@*eDP3otF%kS{FO@P zYu~KME1C@GOKN_x^nuG1=PawU_1p;wW|?O41A97xt++&a<#kqm;*>)b z4u-Jf1GV9D7!o{oAZQqfk3vo%D-a-LC=Un$hlhfa1qD^mAZ$F9Is^`zB>{l6M*Bul zND4s|64^}wXC*Qo}AP6RNcfKf-+qNzlvC;L`8x^;<77%fRvzVpt4py2t$E@AYqgE^?llKo|!RR9x4bZ2`C7I z$$_FL1q4ANNSGWx2#rLj5vTxB7#&JVN_9an1fK$hQ~-kd1>qsz5ik)nTn9aa0#X5x zu)c156(mdrE{q35BR~WqKm`Q*EEZh@1Yv{)U~xS2dJY8jBILj@B!V5TC8vr)s>`A9<6*3_a4-Z11LS?Krho;&>tP@r71b%5Df$U8TIi%C5J*cNfvcv23(&!!1x0iaR3LVwIsu9REyT)}s1Bq+PE%-y zLIf}n5E{cdCJ0DIVlX-&ID0Y`h1M(>!b*t%ebw=ww**5#awK40015~c6zI{$SL5PF z0#voJ>LPOTy#fdkiUdl^f8dQ`2uLB?T2v|&|Mn;#jO<5=kf7m{Y6SS|a`1RwJf1#y zgU}2H4dF&XWQ9?}=pyzX3Id@*-GYFbUJB4xQk=L+IW`chDz1X^4;>0BSr8bC0wv*- zCiH_LNDK^_lvJOTln}x$JB0*lN2+3#=cv$Inp{g^bA59gaq`$;qoXzJRYl7H=2@t5`aSBgT8}67!itY zN;C|P08t>}|A5p+ATeqHbRR~J0#x6Cq|p8$hu;TB>97L<=wT2(77heb2@?=#Q&PdF zP@L+3I(7sGR*wOVsZi8Y$)Z$s(0v3XYJeZwu=)^n&=?9HstwZ81~sVm{sRbwA0kVI zmLqtsAlt{D#HB)^jQ~*zO@bk6Ja8%mB?!Z#Oi7GE@Zy4MFwfv{P$>EnJWe1U-UU}@ zkH-%cq(EVXKqvqP4fqich6u{x_X2@P{8?OeAf7s`TArO1C6E*<$OX{SiUR>a({ciZ zCA>XBAlR%9pc@_!%SS`NP;J;Kni9h!pe`r~LJ=VF0SGm11iSJq zFA2UDMgY*w3oDex$N`1f>#Ok*Tq++)Z^lpA*le9|G0}FAO!+J!Xy}U zJ^=^cDWv=$DEl}kkpJ_Z|wX@jOP z&t?D^Ts8DR&JUyEfMJAoC=ic|RSifb2dW0a$9Uuk{?QP_f>HodV5d=(f)HL-&?ul= zyPG9Z>l0W`zDu?qqXz3E!2d@hgd8pvPbjB00T>O2{KE(rkd!bf{9HaM9v{Um9}0$! z=BewD;2^j}NdE;lv^tO*AtVc{uZRN*sNly@s6j}82woioB`&jZrZ0^%a@)$vtSD(al^*%ue;Rw@^Rj;dX2|8%)E@{6R>Drml>Y5qKL2{#dDSBS=e<|%&%e~? zFWka1NYC0@s&jw-=%Kz)MLXCiW>x%BN0FOLbJ4|epmW>3}|7} z%ZuXw`WFb^HiS@@m;1aiqt5;IJaH9|pBuW{E>SU%bvig^$3_berf55E=&A-oZ1Q*C zvYKIop7rqT3?qR;4I`H=3!HMmsO(XggZ-D_3NWqV`i1Ee?NhtKQ=`tUp=nNBWi|Yj zXiE03JcG>VN9^%0p}t*&AXn*s04wwORIye)0uDdPUGGGl(d{op-j@M-us2*tgaQ{B z>c6WDcX;V}GFdmbSK3m_{YXwf`<$T!$ct6LYtO2Yi}gpGhYTosM%3@h!xm}#B6DaP zsiKYYr3q;wOK-LaaH&8ST?5I~4BBDWKd?0iW4#;Af9&-~-eM3udIR%utAA*wO}=ml z1UIUcFFfZ!)(#+&*6T?N0!Mb89ye~IO-=fGU*>UgXDYUMUNK0ru|}qCxuiSs;9)Vk z5$=S5(Njx+!6<8!>k_V2uQ?&|q4Muba(^wKiDx0S@v~XHWXf%Ep2kUsev*FJrT71f9Gm;yJ}!-oARo8#9KGF*=#=IsU%mqC}yA1XR>Y?MZvHFTTHsT(%G!=qiaS z|C+(Su9XL;7npnPB~U|^L!$FvyC}AV+RaZ#a_2kc*3Yx*ft5Lp&Hk4hmkY(*&&q4| zL_TvCmY)~#(yQ`*hkQ#%%nVAHSR$Q-(nZ49HN`hgh5+_am4%jRG()F%%EC03XvYCH zb{8(HA~eg|^x2c}!IhKE#qN!>C4GphQ@J*`EpiQ=NRzLO4IS*~6nAY!sbDc+=srTF z?!=eS<&AK#wqS;%2OAyR2HwDBMptBp{EgLZQ|YK-N_=w`_v673L@(n>uZNTK(D_W% zCTL*5cMB$XTM@gk`mNE*0v@Uv2KA|(9(s~+MVmf7m5Z*3n`)t9-fmO( zXftUMlin2iouNM7$Y!cvF;vWR(uO;OHN{}Ha$G<_y{xKd|J}>f=XW!#{``h5krJN0 zk;^DyITfk_T4SSYy&k%wZ>Jx?&`i|G(fPXx!xL=_s>}=mG2QDmte~uSKqjBE0AM!f zN?Wg;RvtsLe30Gbd{>I8`*F!yDCrwZKj zE#@yD(+j>C^_-mrEJ`=KV`n0!rlUk#1nSHRrNHk|-%VMq5c^O>kY3UFf6=;zkVSKD z2`beO{Q7e}H9vvsO(*OSXIx{j^Z1W6@7!`@z@t{u^2EE8nsr$YuhW0kR#NO(qk43C zLc?*%ga3=a>DO2-`{4o6Lal%pFoY(4_`hHZhd0$a2vj__2qsK(f&yiPk{kUI+1v== zX}{FBALjD42dHU?>G;1%d^;^ov-BYHwnXEFh^zTYM#OaZ7jgp){TDV7<26j!b^Vau zqdc)jkNTiL-d4fB8X7Z2<1Z~MsM~5RvXdC^Y~%ZuS7(jO^W(L-a+2#_%oIlvNpikx z%vLoevZQjrx@d=#UDo)DsAgI?=Vh%R*CdK32JzGzW%!)@?5>C!C<@;LYrc5N5 zs0e0~2^PP%y%L7J{YjV?!M$#pqBfS@wnt?)Gkag@kmj25px#55czN$g5crwH?(NMi z^RCy9IZ4Y%D)+9-4>M_Xvlb3v=KNG@PkYZl`|i>c{0tV>3C`;FyY3&PcnYaC;VTqZ zZf(wG*p$kwpCvtC-OPGg?Q3`=e0j$O#>PYtTp4SYek<1@_4?&ND~&}FuMA;shipq} zkK%So!;Hd~){XtCfoLm6<~Kf+Y*}~j4=HQk@a;j??8M(>G{}6D(m>}AC1|CBPDnDc z8Q-Pv%4DYjDUx}U;n4xA6n>U3ITEsQOi)=T(_@~Rw&GM%yME$RrmeZnU+JWl9o1h$ z(CypU#H=1ybnD2RB*i7oFBI&d zj2+m}3E!EujdoffIb3@ce3MWAC*(#wm3boF#TcIdp`m2&>RoYoU~G8^4aMG3#D^qL z*^f%!H3=GSm46#d*u2^nw}{_H)jGbES1TMZ$=Pm2tvOw|Y-@5X3g48E$tfyNd`c+0 z=D(B^4j=hjENF$)Wy8I7ofv3LUD_ZEqrl=54czIGf4Jt%cV}~23Rx0Zdh5BL%hIb( zT7$Z_{q1h9rsEor>-MwG$f5_&LW*}iE9v*}tNekH7o`6YV8KusqEF{}U$XeuEj>VP z){5~M8&sA+&=465`>@OzGe*>jdm=;o?F?|J+;Zhy%tvF zGL?N`G~9m*2c4p{B8YVk@<;UFhD?&W1H>*YGTS zN62UUGF4icm&-rVI(2x%13?CcK=FbVn9!(}mFC~+w(&kik_vRWLAoi*+ulBZ94?0D z-Otjx#U@iNFCBNLp})p1SHF8BkgK8u&P|ZEgRi>|=d$T4IQVXqx~&lPvNc(5$)PZdE9+>Y)22X$pXL+#;>N(YXOWLp%>YwW#}b;JQN z`vX^Fh*x~<_FvMKnl$H@Hm0!|WKyk)k0DM@64k0qH#+kZwr-8}yppBwj=BMKdZ{)H@B5gK zd3SeNpMFL>8lTh(+x6S?dLc|dYYHJ zoy&ULfP=tGy8d@M)1&n7Et$Tj+wOs~GLRxQg0<2iRPnU)g5E!y{#4=|<=<>Sd!t+3 ziO+|UcKwXag?|L9#4mQrrKYZSKSm`lfFUEooNBii8WG6hyZ+ED^M-blH7dF%4keS6 zSLzq-iV#goTN(=#C`e(s<93gWMJGq7qW41P86VeUv(f~Kv33uRoR0mATIEHQYDW3T zk9;{1HEtGKzGrVIxHssIiz>;fCqu?w7Qh`6Lb|a|rnXm9OC)zpj1Zh#I5rcU9zo%tly#K1^ptgTl^`7?|y!f2)uDEEIPjuP%3B3Z_LIvVOA&ir-%hE{Q zmSwEOOI6k^FUp>x`)k)*s$cf5Uo>8}Q3gwF#lQBK&<}f0=}NG3JjOt6RiC(j)fwyG z{8RqHBZM3I^FKNNESonDva9;(S?y4jxM0*w!XEz{ zN)En+b!IT+31mJO{`PunZ}uR%oh2~ZlXd7ZyJg&v>otugbvuPW9)lw((Yjp-& zHENPymwW|gZGIIq$K_F!iYOckttiEw;VA%Um8JQ$X4)a|))(B$C&_CgOIc1+A@Z+1r7B)~ zO4en%V-5$nciqovx)=%2?=_h5*BqR}-iS636J$6m)_i;-pd8i09g-d3himl^y{Zn) z-vC3V8QgD-2v0S!12pqh5lJsKctsGr&_-FwC*~br|0=C*g^iJN3*7E%!qxbwK5G$% z>dcV9*Uf!;zb{L8%FWcIDsKlD1Zj!6*>6alYTQrLa{5>G_lm_?8)PlD_DV;w1>#uf zZThIWeMp)OM*dD97$V-v>Z}xzV3=UpX3-Y!0AK;}x33b$o)XW1CfZccs0z@2vXQ7a_SNibP}I`cc* zGGkgRAvFhzVnwdg&|#7r44G-friPCt<4mWX^~_38Jd3<-k^e#Y?j0YET{sC5p-!9` z9T}$Rlc(s+laQP;C9Y3cslP&d>cfrUBO!;;ud>Ua&uPh+7Xrr=Ub~zX^h9P2>%A%T zXV}k{d~4q+Nvd4d|Du{Z(oY);1zvvq#Fjpy@3)$)9RAS*43Q7QgijRrVYk6haKU)E z4?Xl?xim@z>!avCH6o{9+fOo|pK@|X{AK*%?d|Ty$M2Mx$!{Lp=MZhceSB-lEHKp?P|ncFn??6Gkc>u*xG)42(Inldqb zWco$@z3gngvkDdEa9>NjY(wMaV%R&KN>TuZY>(=6@8Qc{@BHw=F#$tbq&;wNe8`Ag z$JoP?F(jMZ3Rx|$h4I*9z)`a~o+AhT z?gSwJy8PzY9IPi&O-wb^8o-^%D-e^?7k`>nkE7%AKheOM_iv$Kjne3+dv0>RarNqo zIQu{IN_$>?T=oBdfRGHW5w=OnVXN}5RO{)$P}I@YPR(s440`(GI2e~4{RQ`)wmfszg$z}eG7 z&-DXCcL$=dvtHx_ms$tikPOdU{t@=$edF9>CoADeS0WC+KXp&p`%j8$q1e_`1sUNn&7^vHlK|$)t)0+NmR+Px zuXeiG%EPO#qo#>(l{b0@H7e9=G{8fKK3F4I@e%{J6GV!VJx@BWDxAfmD{`8^-?_b zi4B&~YIS#lu=NJmS<=UFq3D> zZ9Td}+)InHvLy%Gnza_^16i4WJmi`sZeqcSgy)HVWr{B&VDhN}8NG>GlkGZDbn<|R zXgtFvHSOKB`1XGPm@-H1Y#1mz6_=Gjm|qg_ULos-|BF4eb`JxYE0qkRv4o-f)@G4E09l}7_8L5X11zWBPY?|o)C5)^qwX_7|d8A^FFV*R`45u0KH zhQ_|}f5=;4h%-?YH}RYdi8rV|abcoRP^c{v5{l9eySiG;kZ(fSHJe^_iP62FO z^5id-_@_30TfhK|&w@&o8uPB1vE&mSBqNG9AqZLAu1xvpu1PnBBXR$<2(h+#4yojc z3(nR6!OeB1MPWj<#n+MZ(~DUDhF|($)H!bA%U56EsU>AvYba{+{720dTNP@sfZ9>w z*k6htwz0;Q9%mKQ zCQA&-@MjXAdjrra8^5nwf1(Dzr-itE1$d9>3>ANsfT*(q6~l@8RH=e62$+b~6PC z-1!>IpOYTuV2CRH+M4L34;Bo0--*UwhLMX+f`Vtd#FaYBmNI73z19@kU5=Uf)_ol* z3)ylzL&I&^R;KCiF8tpZ&x=?O^5+)5=169?R1@$@ISgdxv4Z++O9Ywq;K|{7;T z-S4pInhb_A8|VnFW6j`1VKXP>@B9C*Z=)K&&W*$953KoR#KV-lVe|L$!9LhyYPjfq zrPRy1^|(+wrHp8EBVjz2ODDWmsvZRLps$Bfp5r0ck#cXZc{!%RxbZM@jqjnaR{giT ztV2f~+#`|VIo?$*iNmbNB&W#>-0G75DC0xxOd9Mf+|OdvupBmdn+cq>bu#ov9BK0T zK`o9fTEYsS^(|<=a0=zZ5QJ6)%E>tznXidw1=&s7XqwsIM20<}b?R4hNJ|I|$EDiK z1@Mx_0+*&U*o)C|iNr{5GM&8|ogQ4eRUk7b4fpW$h* zC)>-RfU?~|tTvDAJpQ%CwLih}f8A0Kc}0RE=@pAF}epC=Li9jzT1JGu!JfP;s+b{YG}*;@1a@;wRX z?Ke68{fbwu`lVi{x>xmbjU7Dlyf|@*mS89q){XiHqpVK}zH9uameRyO-)G2ftpNvT zM3&dj_t!G-O{`1;ls5+emH5uq@szInd7W1K(%Ffu;wIkIbfU!7`uw3Lv|)J>Az@lY z!Xj=wadckFV`OsQ=(t&IgTTWyzoP_f>puZO-_jP`grrCV^Gjc7aZ}MKa?TGSC?YaS zv4c8-xPtQrJ91GllG3h-=$8;vv*6Cx;v`8GFBH+9>^!Z4t+MVm+qB;Z@9ak6;$?@3VHI7KIcvtO>Xzbo`U)kyoVhPh6cJagnTHUa8H^$4CgCPH_ zQ;D=h2IEn&mUH7HRsK3Y#dtRsxe?=;d^mf;>GPh?LU9^R4D{;w`y_{K-4#)!rX|hg zzCz^1oY7(0pJwvc_J99puvX^(4cnQ?1uRAu?!5tA&`I%;LCp;DS3K;%BM8}($CWbi z^ZDh!F6E)5VvnuqA_b>n;*!%=T^V^%t&p-vdTn5XH^RG{i4vc5s(=4pr;d9@p)^Cb%$+t}FbwGZ0# z{fk*5d*;i{#MNZHmP?*9)cap7KH^0(JghtKa^^W8zQ82;hT-(Tle(lc9Z4DCr%vUQ zRUzh;$r39W_>12Xq8pj94VSd<|5UV5p7yn_BZQbQm}Lfkq{L;51YT^k=kXFgRq_3u z?0x=t|2)Wdb?YN*bI{A&XV|(mU_9fm=$4U$^lmx%VxG16=g#-u%lvxhy>IHou+r=Q z?TNEK>R%a2c1udXdOV`i{4&Q=Db>TcD7+PQXR0|`uxlRu_y#q5z5;kv+96q*&!SNO z>~YVLfco~;`bbHCa|1l)22zMClwngzD^$_I{i%YW=PZF(*|Y2RiW!TV*IAa8<}O=& zXu!rac7=1!DC*fsFu6Yyc|pXTa(!C3d72M~tQk{l)IC$T&R%_K{NJxeW5Qi=1J90l zb_~_tuP^q?`Az3Q7G*wm-q+hTj~y~QuTQpm^&B7dcOqtwGev!+-g%wfNQB+<_U8UL zs#flo@ZO@&a5R1^(!%zy|C#kZTB2Q&?r){khuu2WPk3feM72#-ZW{aVaN4U$J^}@z z*|x*KQcLE2ZngY8^SL@wG0b(z!5fFZTm9EFqQZNS;-zg4d{~FaX&Y! zV2t*d7@D}7nkS54FVO@;vS2(9y`M8=Btxqn+dJUb&9N0ec?WKZ;Vj1kRF4?B-y`~J z3TV#g*L00c*7=_RL_mE}BbH ze&&@z`#1c_f8A?rnL~f|l|}cXVc>oEpysc*caL`b1IzE$r!P&tNf>i`4{8SG<z zTIno=`S?{hU9LztdVHOIP8AWs7AyBG`=z#Iu5omEL;*`ei-xa2UrZx!ns(4yn)J9x zJ*5p1Z10l{_T1%Lpu9ZbA{^pEQ(k3l`18<8CPfSyu^AFtEd{_=QGN%8HtwoY?5ZI# zIQ{e-#04T1FogtffF1S6AJ(6eP9wpcI9$?I{#<4N4PII`>vz?cKjY)0pKLU8mBvz@ zhL^o$Ly76~Jwp7#IeiLpQ$Lea_!au4OLV_byV0Y>-e1cr=vtCtN;Pks;iq8e6MKF% z!}<7NasUfQrUFVv=fCpiRfy|XvUAr~CfC>IHHO12B9j}fynn@aE*4XR%{nSPzD($8 z4}lMvH>PY&n#__^ez>w_a1})GfuS$TC&r%%ek3mYsh8!qj^m_r?;JDgjhA%xe13mPpH)VA2Zs9o@dQSaaEkrTt=)Ov*QW@svR-qT9&yWE z(0gE3-6-(fU!>mFvpo4lz2f|lU9alRh5OXl>MZC$=eECbfuSM_CYj z)1@kHv(wf;O;h;r+L3nok$LsLE=Rd*i~BhQt7Vkkl@sVW#I4YdC)FTTba-@!0 zy%ja<#MI!)c2*PT&Ohg7OWK4=G}Q<})rFU(r848{|hW#_IwP*0_|_Nc2eZi#dn>5aW?4Gf!OqO{9ahdli}E=47AUH~10I9Dwm!qcJxI zfs+dS6LULCa(yR1HPn;@Ucpfs5w;o)$staIhl5UNzQU4~i}M?|f0rD3ZHbNR&Ajw- z89YhO43!=qHaPSNzLB|}do#PtHQmzY_=lrZ>^2*#>F;?rTHPWrXQ7yVeL6=m6FW3f zt|23`>{qxHBRKVU?eb07I5v|pllxuV2MzMNQ^(6U*wE}7qf#-tRba`oh^$EFkv%=vCD6qMX>Z^U|f< z3yiIGXpKZEHsDTM+O?2W_sQ`yv2FRIzA@qF{_XE?j)DX#-tJG@mplnhmLFcnBAT_k z@96Mr+`L2z1Sak};%gyS`qhndmi0;{7+`_FG-kI%Y}dWdf*B;{f_i3@BG5P@BFM&_w)SMf?Pwq#|$&}!^G+J$$!eN zVe5~WJM)gj9z%wPbWI;om-l~eJU32&|GB%~-+Smdkv-l_zTi{YTMjmCZSo_I@c{hP z*N6f`G8*C1lGa3YS_rIS%KM8w+X1UMU6XtH`Z5$4l3TPP&NE}t$?6!>?8@kFHI8;? z>1Jd)vbETHTjt1&_xznL)X9g4OHbXzOq#P3Qe8#ffBE8Fs+9GP5v}*!^Fr<4eAB{2 zEx*SfQJbX^J>#dIS+ZiGihyfFf)rxXxw8WY=?AvnqmnP%TjAJ0(ezF-$~`-#6Hd_t zisMOI`T^dz=|p%Y5iwRCA7+WpKD<}?p(n$U?FK5^pYo8LZ-47uKjF;$pCI;Q;?;ZO z;WrvvwEnTUf3<2DB%JRhN=Sx=x4uS%N&{>OFZd&FcV(v-6*A z+57UZ8azym(}*wpjmeeTXub8m)^&8%{E}iKEMNaAIaDt?(ZV>jK5=t>-;vGyxlrKt z<0cbJ^&|M>DI=a&zl2xxU;rM_ra|%9UxyavMXB+7rOJQtABV2%{IB(_7qbn`{zL1V zd~~Lwtl!h^Qg31~nVFpYHo1M+uS)Rg<1e`1Z#GsXNwRp9>MLoV<`nV|c@k^eX9q)i zoP_INVUL~RgM)Rf00p7{zPJ6wZ)M&s;)D3+@YN7W;Aq|O1d-j?Un5`3vEy=*oDBPG zH7=JQ{&|ul#KK))?ak1beqH!n@5)q8BsL_?le+r6WsvM^*ta$N^=%`KDHVywH-5Ry zirE>GJU>Ky8_mw7_gfXl+o~ZVx;USDvfJvi?pe3mi1; zN+-sPz!!=88RJsyt10SRzTV_T_anQM7{VI1Et>RCPRY;EM_WZJE6)8uYm%1l|9#7u zV+=~h@Y&2IMn0-?{mkXW%g4E+o@~9yd87TKKB14ebmw#LHy=SeUVQSQAZG;a(?rhS zMp(#s+8=D(F4M&zJM+U6=Wp}d>Z5mG9yzK`FD|~d7Rd!X_w2ioH^%b0=T0S2UIzUF zLjsi;sKUUX?OPJ@_kaJ&%`kUX`rsoE#%vsel?M9kjsuEQ_C9?4u=AY$=W0Q9Z+~X9 zciYofz@T!3qpS-UIylAGegDMVzH!TO?DyhSK0yh~PBV9@Z}?tlEewc<)I7A(^Is%7 zj|qYcS}sr+=ym=3U7+>B^jRr&9GXi^E$pp!Jx8Krot{-hU@%}IK1x;c9FvpX7(Z`I z_c@y*Bl5j9UPRnbt(oXP>heG&xW{o?Fzjo7y!_gk_^lrUbBy53S>lLccOygPib}zm zHjf0hF&`)=_z6DphijEGcIo*3QJU$DN#;exxg-;+?AJMKis6ib8@x}uSC7qHs|*-I zh)1kX8lh`x@~bdh06%u$B(J{1u*d11E~j(ij^iC(0JYcUc6gj~Z0_}xH>vZ@+H1k{ zL8kDvcg(}5=l83Q?aS`rh@l<+w`^TbD{W%fwq^OVP8D*=zSi6d?0XS{5Q@fsn>q2)?|5&*UlBp$BpT1)7*3f21T@XoT0ZtmU`XIIZ^NdFr+a= zTf9y7lu+)o6&H<@1{yaI40TM`6>uCbm#b;)qe`cFIY=8|n6KPVCvUDI7eRzBU%v}SsM&y$k76usE!fdx9So=V>1MNDpm)I#lG>Cc^@tzJ7Q!THCUSwF zK>|O_xr1qjLq56OdfD*;f@wxjilXw`-{r*zc2x8UliqjDc$tpZ3)OS|hnm!l8k=GZ zaR|$Ftcgk1W~+S3t8JldDJ+1>)BBR9`ZD02&waK}3H)AB?&H8I*~dN=W_3w9tTxN= zvuiTBlh9_*q&)lXbjC&zMkNxc*;K0Pebi^_1WXA`St%`p~N@3>N$? zHf-PRVSb)_jr!L_*Q=HfrYD|~-|3~&-G~(Phu7E3Nygo(;0xKUM@I5aqx5LqXL*i! zq}wMB#LWPQTN+_UsI;_waFtBjXF2kT%VWmmT%%qWFMGL}MJg5c1dA^aV{8XyH!H9X z{66@`{0pU-MV$zOQa?45mOT?G4CBQS>ytYR>$iX#zX+wnOp8d zSPZwjyNgqI_f|#DG#*kh5{8W?j<1!$P@(7iL{NQF-l*65$3z|%pGOQKzo<~-D zu#Dq<2(uCBRRBgPK)z^9VH4JOI5hjlsciz5?k?uJ0;BHS*IhncezD_6?*%K+d!*Xs z+yih+et@BYI4EM1(hSn{fAzSKJcg@Oq#VW`w!|V3wa~EJpIuqiyZ($#Ct})~>yt=T ziCfKxtSOV4dGddXfhz`26}4;Z4!c$rViLz#Py$2uj=^_$Q7*p+)}ZtSFo7Po<4vfh zOWuUuukyesQn0naTX(Wg(5%E4jsMxsTI)(rNi#trt|M@}87tJ8y+myVY(tzu2^8|8 zl1xE;eKnl_#O(x883Eg!5AP;kC*FzmBs_BhLzCp;A##*xZJ^F_tq9RY^@FO({D7U@ zCaZbKr}{lhz(z?lR;I95fLRe^K^!YaZ!TXU?aLh>9P+2y9X(BLK!peqEa6Iv4(&U2 z(~A!tjc_!aUgiD#UgTp}EEt;qeGa#++UM%jSeZsboVF>pVl&<}y{)S!^+oX{873eWPs))shMIYoL&St%`i7zlOwf=sts5;Y>0 z3>5va;*jz{#AGmU7QLc0!Lk~|B&E@qu08vQfWKvnH=jCV#>cg>1zjNqkwHc4aiaXV-M_edDame^ zz=DijW}7n$6I_&T{SJC>O{P7Xp5p@x;QPrT;dS6%t7Jg{%}JUGOZri!;MPK#=!YM` z$!b!}q_!F;D%;c?FDh>gjMORu|72;i{cbK|ZlA758(f1I;eh6>VSG<&Mvwe4WMdmz z1eC%ykstq_8mbPgPWY83pI1csN%H71z)HON#{MQ%&k)gT&(}};WPqWigk|h!Jbpe8 zY`}?&(@56g93>E<*;gz0OLOlf?7&6;PG&nz)JN({(m-tYeWFOQP_VD*B2c-9bXx9N zZ&DcKLzGla-e|<4?G( zdCC{iPx~|r`Fx%3RX=AlyF@1G8?;5l?F6`PbhA?AwfU>kX?}$_w2dkH-J;Ks>Cr~m zUh{`^Zo{{<+}2w!cBi)5rteMTA_veN6${z>{?Y@3N zDuj_ap=?}DP2cF?fRmEm@6*O*uQS1#jzyv6#&77+8J;`Dkx?c@k{X*8Bho2g_#S6E%GOm|YWWmV_xuQ>Ce=bxhlbHf=7vCb@6alo-WL5wB_W zyrn*!(O4ir`aJe`>jus5@bph~E``OL=_Vihk+O5+Cnz74d6iSLxWt&p0UvQ_Gk6(Ylrz4v+-(BgK;_5T&FwOTmvl$g{UTo4urvoC7@wxnZ5$w%gZ#&1lRbJoA)$*#U#555t z)N4F4lM7@f{+=U4zgnmH9Hw>THh7X%5MPgGeSNeplk%y(Z00AAPV0{L5Y~ufHGPZr zbBF;|eQyDXO>Y_uc^RU=rX6S6KB3;YzGmRDPfos4ZCF>8lNnN!SSRrzpcUWpoby+2 znj<+u11*f=MTHl0+q( ztneJw4zcL2^c{F)2IJ-w=dRGoCiCUb3ANpG0scYeOjWS);GlB^&XV^wFfX9$Jx+_Qi%jN zhySaY8iNyjve+ez$L_9dW_TL-KWM3f`Q6>6sa`8W!xfgIOS~%^qp&;}0+!GJetDtL zlX3tN1V~$r#`yAWD@oC>@YhebjwKQhz>Q(9^^KOpdy{+f3f4D}*qP)<>Lrwpu3U%!~Mvo!{kQ75LOipoDJ{>Yz42JDfr z;uMqzS{HXS1p45=5yo!t-zZ+HXQeM>YKcALjbD@yG>q>|0S*7x>{-`%HmSX};0kxD z*nZV-Fo8Cg*npBh7xR5Q&oJm){>~P)N(=EMQt>0ZVVy2WUo@w(Fs5G^B-bd}*>80S zK~Guaj}of%HghOczrFBj%PV1YsB6GW-CCC?8>dWbISnp&zKeAY#!(g#GV9Q2qgKkA zEvTgy%iwyJ%vEM!b*s?b8__G_*hYM{3f7ykydw#=*$_38p4z1J`}GvQ?Y_=`ei}*tO=RHVVUrsd zjZn@jK*pumEMT)Wj9=w+ym{kIPrsY=Pv@d}a5xo{^{P3XlFVKZ@9`BFDq(06&3SX7 zc~bK)`>n-lhIKPN(PZh#x+c(>aEPjL>98x&i^VevnbV@pirVW}zaDz;wo2b;5gw^7 zTG@Pf%cS$&WVQd#@loVLV+o}bvbW45Oll&GM>TQ12M=59ADsHxL#b)4vD!~#`e$bP zqI3IM0R@&WJD5#zkX4O%uj5&A##^3b`0%eke$#WgL8F2zZn{IQwgh+n- z#0si&A=n9cyncHb|utL?38f6&CFkdh+O>vX5x)sl!e zC`9?g`fGspd2D1mrZ(+r3(VuaL&If`Lm18>eR<5wj`xoaIJI_|_ga#QeaQ7sI|rQS zIrz>`sqFUXl?9k+*snyO_L;e=s?*whDMaB<^=Ady6^-SqPCYp?^j0G!PTqC(q1mWj z#%a;0U`1f-e-@@ACgrgi(`)^`EjUhvV`{m}QvzbOA^6$dx#UDmrByp1`oHla(+R zwaYAGgpqC@&|`gLCkgu_e+f0jqonmd5<%HM4vPz9e`r;%Ohl8yJ7c!xoN6QM?K3aV zX4itY#l83{^?th(*Jwl_5>J`(dzVYL`0Z_<%I?NQcY zpRY4bOwE3W2h_k;u~9FP$ns1f>}kk7I2_&2r;bg8TrsnIhhys;c4opDe!RHa!cKLK zBZ&iefBVUF)kz1fl5rn(ZFn3Y6OI}ClI7%9Q0ZuGm?7F^*C(d&tQc$6g?vMY#UWW4 z9l1@jk|2=*DC^HX1{%blEULG-KU|@=b`!#;){R|Md#dqCJmTQ}6nh;|7r4l4eVF>=)qasa6nke~r#(NCSa@<}x8Y6ER#)@_jvZ1tHeY zc5 zE%B};t1aaHJl}TZY?(ogldWBqa_FmV`nt#0w#?LnL$sl>s-0;0bn{WZ0nc9pcNpUV zf779Ic;M^Pg{?tHvQ+uD??&p?SK;l7#bFNd9*P1{!!{+%9QNG6Ws$U40;wY=b?#(k zsA43hUV9za(Dv5_6As(PzI~-L4tru9rq=qPV;X}OwI5QT%etc~Ln-Z9TV;^3OJ{X4 zyPK8&Y$Veht!3FoJW9UD-AFELBPK*qf5F2eCE9c_bVV0O!{4sOjkf01Wd@XH#u~%| zg$u73Mb=PDC#5JdvxCPi2ji%oS8I~JR8qIcBLKjS(Q7orW-k!_AHt9N!}W8>!PHxu zJXCr|7dHjNnS4(R?7k*kKSZIOkKE(D)$SC$^BCKwww6Pp6tMB+f;sYNUCHJgfA~Pw zj6`LD+*!u9bh~5XQX)#Hs?0DG>bB&zb}=r`lJuL!BD_-`y*0kvInrNk&7kOFsy4#SPUsm(HryyNeRsT015Bjb3{34S++6GJJjyK8Go_ReAeiOL z(;X0q>YMI*-8Qw-8%(swMtgx4xxhzEYL01ci1v;AwBGzS3&*T&Iy!B#f9zHu!^+*- z!5YRV5s!MRnmc{*BPQR4gJsx2=(U+jL~n!O_Yo9_J-o#`uQmMzc)K#^3H0U zdvk>T71BB5QIGaEmalVIgTsAnygBBNDs1WaQaupEptR4e%zX#1f8Cwr*7@pB%U998 zXz#C2j(42A9-<`3M9XZtD_wEnwbo3+c};(H=$|ECsD4UsNIlWzo-l+rp~Zwk(v*X??miL_#YP#4aG% z*WFEVe7Kr!BPEOa)z@U)#S53JOiN*EBTx&wg;|!f3SJm5br2lEs`o;aNPI; zFL4guMPqAfJN$Xa9Cq43MqzP(6OJik8P2M-@zpOY37+*DBP^EHT7zlP2vA(;Fi7qf zG66Z-{6^}lp&W1~m>nY};5+ytOm?o{7rgzSBPHh@_sLuL?EPmn>eU`4T=vDm&Yi=3 zwp{o)P|iQn#B)e$WIf?iSD*Q(LPJmtQaaPV_CF#eSU zviKwQn7Q@0mpMm>ZJ72{Pji1k`$udy4`uDW-d~lsf7vmQyVs0W-n6`{h~o6*)~%d) zsFhC(?3zo9_RVHv$r~*rV{a&pcNPyy>pufgywI76Ox{lAr8Yek0Vxuhu7$?Y0lp-K znu-#Xb8(i9CRxryELP`3JY5Ups+|@neIU6-X*c7db1K@%W026z605aUrdZplXgah# zBC#p9f5su}%UC@(R!=8XbjPQnvo0AUcW_E`&%&pH&u-a|VK^IaoL2v`>kNCL_s@*W z)PQ5Iq7#bF4_&xi*m1H}u@sirRyvuXN7PI&1-{NSx-3}2beMes;gqF7Qr;10?2iX2 zwRJUuLBft*LNCWS?EAIZ8q^XX+MTAwbQHcVe_dMtvd7$UGDfIv;aL18pOCp+<11K# zgTZ|ExM=R@DDQE!nc4MYm{g}n0Tu&s0`q%TR;%RbFwDOzVQZD_@{`ru7$x%c&CFgv zwrYXJGxIt@(SnN^M6@gPDrn?g9g-PmOAjrK7|WUbJzO9I!ALyKmL#{Mwj^FIB#?C8 zf6;uD-$ztzeb#K5GbVBjqW7$xr$jH$HnSULQ!Ou&>UHatkq~G+gv^3O%auTd-WAcG zRnI(2){oHj(Ct~g!mQ}6yd;n6l2uEtRxJ02=ifnIeE7KUUa_gqJ71)`V3NQWM5s6` z&WK$h(7W}s@)9=-aF4*<8#rtvL&?TTW2j!n&N;!i4@_+5r0CS&v(@EPhC)ANgDFj2lb z#Ky*q+wmi82LcErNr%oJRl+Xm-t5f4jidz$S2z zK=X-#>H7V@mjzSegctjIr+iR2e}NYLj0OCd@^bU4?L0kd8O!NmV{zc@jMjej>u)nr z%4uxsLo$+h$(I{aeRjc&m0lLBBO4>=B3Ml#8ZfdV=S5)_9!#UFt3Wfg{a&}o2|mf3 zu7bwh7Bs?%M$oEaT^zPj>t-e~bt5JEpe}TTFN`m5932Z<-E9$RYNH8pfBcul7ZY#a z1afVO^qxPL9P^%3n*-@`+c9G>>g$`Qstl37pB`BDVv*TK%h34QdLt#vfg>itUnny+ zx=C<+Uil{kwfgtxDN1%dt=g}q$h&nEH6?7PP0_023+g+mE_XgMjV9uF-JD$kYpfxH z!)q~jIdeW6y*+WZ$Tm<8#xG=?}p7{{%U*Pf6fChEo`U&91UL~MPKsL=)kTC7%6g#}})mzH~ADP-**6?e0e0n@qL$|EN9d!;RDOUr~u zVeuYf(k$eB;SQ6me?xEiepU}6Q4=;7v1ctc=+e=Wh$5?pfWh}h7Fk$mU7JKimpIH# zMzjD&uS#2mXoHrtMsQt@V#!zY5G|A1DkCPP!;JXDQ7w(2`Gq#tSt<~>4;2)O!ekDv zys?7|)=>*Xq>SFRg_2Y;djxYk7`_A$N4LiSj-)!K^vjjtf9~(w82d3$h?$PLu$&~G ziEh14y0R_Yw*~Qf`FaMr!90$uW;^%ni zvn?Ky234n_e`rmifjVy&e^+_aY*CbVAFd9VBo6LD!$^=iW_26;%9@6GLwc+xmoMID zr134b`i_Ys!6PN5%3!^7U2}2Jd?HD6H^+?6rN>QUtiq$b7VgWTJTi2}c0&u28~*f* zu1-wy`8S?i00Bd$8n@d-O39>>y36}nrA?Bm5N}jKeKm-^mlmnT|s{<13rQT zMTrpTCo3YduA7<|_Iykj9=Mg&HQTsp*ZMl+%T=8LRYq<~GGkwi+E+*JaHIW(3@52* zPd7_5f1K@(5C;q{+Myhd@-S}t&&t>Fth}cI08p4wKtpqa6{sYg-imp6zm_k{9#P41 zyr8*33;~FL2Sz=qb4lhx23;eTgTr;zAuurBu%*6hfMN^vs|$nG^PC-%G_(M|T3#Cd z(|dI+irVP^ZZ`EN=|6Y)m9-!cC<9Ru9y2HRe-d1IzSC(1R9HP^Y|=BA#Pt@(QzAG> zFgOB{N%NW|&(fVa{$v2#CGSL)`zvjc3~*?7^!~x$#PKV{{4>H$(oC@>2>Hbv!vXaD zM9y1;mD6?8NW|wZ#BzfGW1Q~|tJWt{uMBdVh$c$cJ z%@goAc~vKa=E{S^J^8y{sO#?UvPg1Qq46teVv!hkjcuC0XKsVk+U12#4tF>qJ>)-| z+>d-xW|h$H$lvUzFGm3A6!h2682QQsB9Po z5`rF6z6U4=!MtuI$0aiYU+Ze4e^%|~!Oa>dMjR>=o(aA`wSb&LcPPRqBfx{bXg127 zHu7uqR<`LMDK|o1n$kK*!<-J^<(Hi~=7Pxw`Gw{wI;18<98=7Rk`*pL?ai%(e9LiR z+*_u&@o2(wBP9phUHsg1o&Nt4NOM_UoUt>_-AT$jALg2ycYc_kT-pATe_q|8dw$w( zP>`p=eUqqeJFZ>CD)DsY6t96$+&AmuI={CGI9>(Q^io8h*W1Td{)}vPU&G^M=zyDI zhPb<{wge-B16#Jic2yjKH<6rTGa!hnh_r&84p-dt=g;kg0SJ>~+@Zo?f>*>xOT90? z7d*9RrVl^kym+Hc+6I`Ye|ZcJvx~?1KCIr6DD%jp^J11|Sip;)vEc>(yp9?Cp`}DY z!k{?cgD}MSML^qw+fa{6M?@LO1N=F3JGQ9#uw9FwLBUZt)|e{@Z()?xgx2b4rxYmq z_;WLuhi25cjJvAD?X$b=Jv8meRIr=4{pvl#3?O=-+oCK4;;i7{ex0$BPGnYPT3UT-LP%%#FH*s4~AWug(B+d*XbGO)HR<* za(;7#2)~`SeD;Pnf4ev9zVN7N28qHQJ`0@T(X3-;llDWNRC%09M|$Qtk$3!ibbr%6 z8e-Q7D@~%!*ukA2dWb4|9R6=lpOxEP0-vT&QV-j(K`!`GT6f7d3yMYnV<|DqIM()1 zAZ{VSR5~2tuIJuonPs#`dc?DPHpXYJqXoxSTj=P8i#pMge|YrcLm|3OF7)Eb*&HU_ zZ=Rx$fSU;6bgg2Yxzbx5BPDe2(`P~i!PAJ|<6i)g%q9??BnT9e8@NR)JF66_LqaHV zG0dg}P^70vAmamGV;L7+28q94J647XS}cht8Kg=XgHZVSJ09+v;OOLTF*~E;}H@IMs6`)ro);hU!-w5#X*Bv;^@jT6!mw^G> z%;ch#IPT(1&s#>j1g=*a05#8pYLYNnJF%{qH7Rq$9PR9cW;E>~$2SSe;W5EQ*L?gXE0my7id0U>5cgiMV5DR= zdM(Xe}N>ql#{=>R9r(ll?AahbYi5r(OJ46Wnj-&6qrF@PJ42236p%Rco{kecI^B` z>mH_i_NW+fH>qs<27pHq;yDBEr829@EbCmOq@p(>rjn0I5g^%h;(Gov!fRu_2p=v8fQW5n0%)PSxtsIg>HCMPn&(l0=#!C ze-KTFyf7B`88Sq+GSV{+INBqWE`rb_CXp1Fu#I#YW5};;q>vZV7&x864D?GQB`7gM zodrRe9sCihWD$=uzh`atVMND7ZhMgSz|tP)(644et>Sq58%Iar=hiQM6IJaI3ES(L zl&!qJ{ys@#`IA+Q2cRgIjCWSiBPGevf6dE9C`t}-hCHE?bEwKgBPJ-1cb23b*)?lI zJ|iXO$dFSKB45%!1TK&3@~=&3()UbwrL))lNiUC7KhHGX&a6XL2#Zx7!zbc z7!+AynBn~l&*B0cq}?S+L;WAyr=MQryGnO)PAvZJKga&UC?r-15HYdzo?bX(e}z<< zYf*o1z41Et_T$HWr#_edNI&R_uW{~bi9dQ%`?JJ>eLpQ9y$iLGI0NA z;MWK9unYr(&=8h{_3IEo{VM_C;kzFfIZL15MQ@{raNI)tgdOTCm_Suaw(?i2OCjRt z*vJ|fyU2F?yI*HtOfjSh zAWJFr;2SsP(gvlMY#d~hN|1RVuj@$(4~iP3Nq-0`5nrY$Z-%N@R2f7e5Yv4?5o zU^XKq>8;hU5hVR?Uj#6~5-Ib1e+4#&ov+cO0Au%@G7rWRfW3q8m->I(PUqVpTX`FZ z?j7KG^Gp%!961D24r4b zseYIPsD=dmEupk3lYtEXe{eA_Su%1AG|QYI6s**lAOe*J2Qa~rMR};kK1PzpB$yuK zUqaN3JZc|nTBcSyAE>FGwVCwlSvAZmOtWjOb-61cj3ll6wvz{c=Zt8$IG4W>2MK z?eCWWQh!`2Ul!7BAr68j7a)EfFlx22M7a6TmCKF~0(eCBd^SW!8 zrmBaI0xTba0C-2_<^};&4#KEp^7e?+Su>_#_FxW+aHn@*xg+AV0J zq#`ULkd4Pi)v-4Me?~tZhkSt2n;^zI1q*1@dwd5hX}KlUg30DUH`p#acK7(hHwb%x zdhDEPjv-VdCaeQIYi-*bjnkqu_*n}^4j~627nFd~;iw?f}@d|=Q-H8T{HN_^v?6{sPKBPOzr>Mdf2c)&2ri|XbsM8|bi zcx|z(9l7d5O1d<>2<-YMuKyU7krr=je_Jp%UXpU~jFU-ZoYke?mp!hqJcwrr#vW23DQ{y9Yi(y=#`_}nAp4H9TTVcz%eijX%u5611ascAI<~Pmzb0E4s44d z-?sv~a3-h`Nv3nix{l~L#??nef70~F9rv@GLj?kcvS>rI2Sxq9cwSfM+eC49>Z!?w z@8INoOk=fEsf`@4f|(JSA1I8Pc7^FPVMa&MFWW%L0Dy#m&sj!nl)-`^Yp+b6PoZ|* zuS2_UR`aF$k3(_TnKu@l#cPu-?()9r4{50m2?Zdei!LQWpphU{93XiZe~z3e?Y9i+ zF72f1=%(6^|7(ruo<3_IZxVe6^#mUR{1K!&Nr=4q%QXmhA}|(j@Ti{RK%lNPqtTZF z`Z8?O+`#6N9eL5IxC=VN0+9iTBPNSTv_NmHXzYvnE%ExPT1e7LPUi4+b1bOdiLBlE)nAI@lg zay$>V-8~C~|2cDzBqJthC^W%xIDCDc{+~;x6vo_GGA4ZLflD}8e;(x55Tmrl0U&CL zSNDF4h2l?D6loDoqbj;;{C^&k9DN$w&(m8W(gGr7866je0%QQg6>AX!Bf`<|WP`|W zwKh(B0vhexx`+ht#f6t2TT9>*Qp&W_ILQe+(o6A{})hWKNtgmhU+)R{T*ZEJjeooKJ zVMVI`_@J-vuTmBWB0IKRKp4bSe>e9`BPA0fB{Gy@y`_pL^6hi?nZG)5(C>G7(cD#M z>o4Db2=5s%83h>x*&Vvu)b7fB)g%+|cP?EJgbV(Y;UtQLm!IR3nXLW)F#fn9 zAMd0j(7usHeSHFp?#8;5wZEzut7s!8U?{(_mDO0rAp9qP(s42TM|8pc`DQY)MLsJq z#IrKTsn(MLe^0mUZNIvH%OYeT$*;Tln8bRK4r8wX{*SZj_vGqTF@S@Tkm|MIkj``C z!frF{$=v4|A*>`nVnI#qRafOirdq906v`{vnt+LK*O_}beV^a`y&rf-W&BUmMcVD% zN44QdBoH^4v*PAyGAn#vA^74Q0u%)c^7J>rG^@f)e?>?i8Da*aBPAcCKCoVd55oR& zsC)UeP;jy%E+@PAul$!Ie;zpeaQ{BZv)j;nCRm_*z0{`<_)>fU&V+VmW2=B4vU$(x zQ>D@X3+XXaIIY#~q``@$&y6dTS138+XT2`$hPZ16WtJDXqTpAnhlk8P8U1SGSCqvj zem(zqe^M+FfTGILEKbhB*VEJoZ(={E0&iZEFAMPp5{dyr6sZJONW-P-B$z>{5)x@a zPy-{@k4yePzIFC`y?$P=Rmfq*;i^5J59t1`D$cs#q=<%5VcQaUAb-9gZqems(tQ&j z&s|^5U&Iq(YCyso;Bc?>Pyr(*$jleRU8&Gle-$Ipy)Df}wWyHMu!NiFua?DcMH)yP zwsVROOER|!7N8LXDk2;gsBai_iG=+70U2}i`#b#Iok0hVsc~OCUZ@bO*p_8hUl0Tz z69<@p0IQ`aL^=;wMl8yMPjsYJ^5oEI{DY7MjUv@8qtQTbPdWjsH}3#%PCYw%CCb+L zf3i#&JDZV0-^**Q?||+e;78*@KRMESr2EQ{gyc|BT&>STfw-H|ADuiNQ94l7dv!uc z16vvZF8;B<?NN@%A2g_R3B0r#TzE>^*zln-RG`j{kdHy2pV4f~ckVb@@I5 zz#V6P-yqVH4il;qkVd?+kzd(;}2WD+2a~UYFJ0p7|$-v$w$j;EG1A0x_D#E8(x( zl zc& z+~%|czg_0bz8QvYpvU!%rW3OfJiZug*A%laioffrr<_bC6g|f0lXb`JoOBcQ&WXn? zGpSaox6C~|jKed_33w23lr4(g0pW)#022}rIQ&^q<*ROg&ws^d33|F#e^3y)J%A>k z;g{9qdcD6_N1;AH+N2l)??$P=#6U!nCqks88FHPINT^cp3wV9rjYs1#v1jfj(rwS} zQJp+yIDh&z)2`7O!xQ7#?H78SpSAc+LaL0yHsKvBH~so2_q>U7J7S~3%IfGQ)E~{o z!AnHmr~E&!o1Jyu2-L4=f0eyIib%g}^(1tc-{GuC-OCX!=QzBZ5-b^ws8Ro=Mv^7? z7Wr!WTBA{o%lyA&MXnPu;&;0%;1%v_#Ip%ASTt4!N|21+HCWdbokob!>ZgD6?>D39 zmZyc0CCHMNg5%P>Vz}C0GeE7Y1BPPZg-xkvu=_1L#AGERVl`N^^e=Bs@HMExQjQ4p)!&Q9@nMQA|>$2q% zx9##j*HU?W9>~~maKDNwmtYt}_T8icvGSyCc@l@BPL&}TIn&Sq=iKz z38<)j$K2#maFZ+Ce_ZSgc2$@j(zUROg@U^iWKHVOiof$UT=;J_nuQ?6XStRzz(eeW zOZ*-nTT?9Ddis^_RH`&kxO47 z4*Q+&nz6No8HaOh1{wvd+{|JV)TCA|f0HS3)~2vZNVvH_6#HIO_Tnf!*V&n~5KNvEk!p*=JLi;ZCRBNchw>?44Vuh^^l%-_sF|5ZxX! zPDuO<#?`*Pl@xjHC(xHp^{;*>rfqS$?s)B=!>+ndf7S;#DL8VT)om-r8Tdp#R}3?x z5fDHHfCDvB=oET!Aiq^@0SnUZm&KoqG1e?nuz-SR>YQN2cPkGBu4r58~mn;^NthKqyrDqCJ_8pp$lovE6J9H9Y}Wf%rfigIl`@D_pRq_U*LZnq;QI9q=;7pw2+)^hIm`F!hUCtvD5 z)b}JkxO_YTD2KbNh3*DqR6Hy4zSt5be;E8a-B^$@Pcl6+z-}MMCZdclat0cd0GCKu zgS8K-R4K3=yy_p=d74sxeu|qrB`43PX8{k1&Wz>f;rBUyW2V?UWCa~Qpq;2W&@?n3 z$m-tV+LE|XTKP9Vo1*7}BO!e5vGH^uL;72oS>HKn1qZttn-1I&!NU=Uiqs<}e?I`& zzRSNu*|)f?yRRN3Hl~oG%ob53>)e7kaS76M*S6UQ-L^?3BPGYCTNkafCy_H8+Eb05 z{b_mH+ZY=Ib@Q?qFc^DNG(fae zT>Ie*^kj17=vO>DQ(wy0umgWof4Qjy=*%!SShu;b4jhkT4saFuuZ7$jP6nZ+R14cg z6D*e!CSf-_(ay~RrVD0TK!ERl4&QO2{W@(A-3x}$x~$W?aOM7_#@BFrLq?>G;(gAs ze~vTB^2R=SbUTiC@mN0oPVG~`hdMbHr7((e5o^ZLNdqu06K)cJn0(Y1f8L=aMI@l{ zfw$!T+|%ct+DpzfYID6vgFKM`Uzy&QJlgAG>L)KWI;>cQ)r%M(W zF8=aAx#{T7)+Og7B^nIEfByNP=aP%R8A73lGJL^tj8@JTJLk4R!Sb(H!v-IcEfwR^N}9lEI35c%V&e{lc={p%P%w~T=s z`Mx{&XmWOfA|oR_Nfb|LVyw!9S4~+|7GoRv>Oxh7n^Tu>cm(wuR#|biI%j71EB^Z|F489`E9p~tTmxuKn3L;qwkp z5pQuaSE8TK>%Eej%gfKDmkVfw(2P`$cttChHt(})?1+xnc+JTBzMrXsuKrW-9?yH1 zpnW}DfO*Ou@OU*PeLi|e`0rbxHl;rLsMDc_I6qsDe;#?qmf;d#rz0h@Y9^#D;y2AR zZzCn=_x^~%oE<-T$VuIguZn39$o+_V)7Zu!(cf6^PI_|Qm|^%%AHOH=^?hOr?EBmHp;%aw5F9sU z^758gfAU)CO|7W5UXA(!9iSlr9yT-vi`1kw&B0pCzWORGdze_Fu=jZMrkSE1iIU~X@6d|DBw(d>{=8co1HAOT*WZarn9GoaI476syP115? z$|caFBPDADIq;&+uJ;_8P9_!pXUM^0e+GDm!o}xBda1^^GNB+fmjVgdpwqOd3&`?; zZ4e)Ug7U55N-__{+0pcTqQMzJc%TcBq5~ma8X=^JXoE-a`KGRYap5B+!)v<(99i`Jf88P@ z+j1VudPGlJqH1X0tjCMbzUm*Mt=HK{sf>2Y%kkB3U7Nu4G})|6(uC|u-Qh{znzr#Z z=6!NQ8%HL-ue$Rs`li-O%Tp!GBCXAukqKmmCjv9m2nb=LIcH=VXE`Ww6Mbs4bMUm) zoJs{%&OzsPsGRQm(3pgCeKC3NfB5;EJ6{~}(pLkO33AbzVmXyc!_$k>w#Il|=OZOS z^xWs+pwkBhH;N_AJ0!oJ<+OM;2K-%-%gj%!9+_b81#m~VzZ>z4HC$hy>))-cqUdCs zYjBK~VR$WNj$$uRLzcoWe>p>oPXodc z$Zus1-*j!Vv;wbAD21~Ru;?qa32TkhNQF7&1`mYo&U>1WZ3sEHNC6t^4lP;fWHvVu zaJ&#fqJ^mfL}r9f0JG)=U^5hRv(JAAqv?&A$TMq#2XT6EKFcZDr;-;`r^#;^$9$LZ zaV4j3p)V;TWK8XQCUw)-e}8RNzrVj}uUEPwCGF^r{H#F(mgJIWAf}h;e5;wV*M-ue zqe72Z!YINj!vMBc0oRSK5Jll-dA9XtQN2hbfM6;)lIIXI-{XQuSXk)Wwexr=+tkiw z{o%}QM|p01A6xc*<}0JNIoYd(c1H-Pks~I-L{jpHEXab|gnId*e;EN)PD5;zC~sAB zzGCu`6P_J7M23bc++6hzLU4XF4|fN?txfQno`8mkN3`d5c#Jo}g!#bB8qju8Yi(;nC2-vQ+LF3hJ|iaf;tx+J1c3J0%)7N1lmev!l-)5Ihg$Uz zDJkWUs3Rs5L?UQ+QJTtg?<5QCT=E>El{2~#?*AAu1vCgmfBH7{LK`I!s_?fGLy9@}9;Zu<@=iYN$o) z!ujMksuX&vlWL;8>XTM)OtLoAIXt&kL)06WBWZmV6pTNs>)D_6dArBW%sak4gJ~O( zb+`37elfnDkO&Fhs+Q>{UHd){lPTWzb2ln-_4f5Wf3qr2J9jz6p(OzXj27)TfpB+e z0<`V`_g2k(G+AR%>Kni${gT;U=Q+UZzjL1dkEdl5Uz)k&QLa2q<9Ykv%h^tkgRytS zHbf7+X9yX6zy$S0KTr6_3nve_bbkSdSKgSA8$Z|izR-^UIhiBs6Z(zB`vkY_2!Cct zmao_!f7&r0>9imDLlzA#RkZv2lvTpuln|G&aBr!I4htJS7Gakf^kboVHkYZQMLSF601eJY{OJit% zk3;!6cAX|QBIQzgklC}4e|omtfV6KXF%{;Bf9P+rgQIiB=u_16DsETV*gd9;`6%zQ z0pbh(zVPZGSqEArng$2@-}B46xaeGoX2xb357p}8=sQD4eu}#tbxpw^BgE#}@c)(cdD8&#=rkz_r-5qVBW4AtsRQO!wFn8F3=D1>6Le<~B%k1HC~#cx5E2!`5FFavJ1PX4=QMK~s4 z(^jNEEcD&~2fXWqeN=HY9Z^GxRF23lvtKIkuCxq*=kGkHBZ1WK_UV>pd z?m7RNsMfytdrrl@vYR&NMTnatCI%#7J7OLmLKS$fH{e@-cx%u;N&R7oYsW2tJ>S=h z*Ve>4C#ap!Z{06tv=r|hzIA^tp755q5-qh;-Q7tV4gqd$pKl9Ruzz+c+iiuDFS$eT zpE4iJ#d}Y)K*5D8bccERykZywf9waUs`k7+_3YFr{V6Z6Pt)raUfxnwimpE?D%T*= zketIqh&wnK<0TedsUANi&dZ+KFf?@rD>58DBqJp<#f>>-ru8JIsi%9XUMH3vbSWRT zI5;?xS}y+Lv3@vaDv3+@8|}{q&&y1(7fsEe9kx7RShOXBv#>w7$u%xXf8rZmM~=2F zA169D&Dn`)FbFp+6%;t*=gvta*+mfp(e?PL{6};6FUQ(yCoPkAe~GZ-+M0oC14}4w zR(mUTiTW5MN+1p>OD~=T!0;QZEOP z>PW;0LXM2pq(^?<91Qt_8qhTzS9HBckxsz*LT-0VQlBR5TOJ}Mf0{+!*_(j@BPFC4 zdjiQ#_3JJ=iyFrXQ@`XM-oBUO7@0yt-}!9!$Xx5FUHpE#a8*@RRaI40RrdyTUex?M z-hvk{V%w;Nx(QCAsVJnN!H>cBe0@7S{#J;~C?8+1ug&iKzrFiUy>G+;v^erqx!lDr4k%?ZlE@`?$nz=?9 zm_s4xXw6|Xf9q}0N0Hu5L_RWOPs8(hc;`lYKSQpytvoJJ>G~UH1S2Iz+;>^U;(cc@ z=k}b(cw#;AFe4^`+0!;BzvJ<$C5kE;gYEp86%`Z`hws|@eQEms2g_#%>3_sNC;fjg z#f7Wvo&P-5J5Pz+K|W*;A_Ogd`@b^97O&&*`p(YZe;}JcqukfFSIFqnCe!GMim8LG zrv7r~PY-p#E0mB4y@DD=7umNKffE8Q?}molCpZNU@PZEir*(Y``C_hOuO<7B+B*9> z(FI8qo=l2CL%c2giD07OLGn3tT`urFnH(u{;Zd9Yc&?xng{Y+ED6!8 z2FRVTe?SJV#3x4)?;jA(+43>)E4trBh&vn;o6Ddh0p39>tNKFKjc@Z?RlVUz0b(cw zVxU`6kk&ATj{iF-9&8f>#Pd8L9J3G7YWvRpX@r0~f6jsAcXh_-~7UUY%X?%6ZL01w;kV zZ3Z$p_jJhI9K=e=cYjU^(|d)DwDGJ=PeS%PZjYLvhV(V1U6fT~zJ-c)<|j2GXWe4v zNq5B6DG)v&b>QxF5CZlhwu5S>Qd#s|D*hpW!Ym+26D~#=CqY32sOb^;rSKr}Dpov&|RKLiZF7=K;TNDbjKm6E4ET!-U?6(5tY?HXDDjHi6Q08fhP&tnEJ2 z_&)$Mpmc?zJj@MAv*UBL18xPi@MxZM(g-+;E-Yd+$=k(C ztksT5!flN~lXov=i;Q8^mh@CaLm-hb8jq{iVswpMRhu>Xp_mSDtfnwdd-p|#0-*TqZ zh)tsIqQFK|ENr7E-S)eI|DxoPVl7f(oofzSvuqr5v1Tq&u zB@07H2h1YB5?!mDaXq$kjmX`jY3oRb4y4cmkJN9{Q3+G)b>Wj%rQasT+-`-rM31D`+CBRU6>5|H+{*6f7D>BlQEms&njUf z0ASf{=-$C1Tnpd^iIVlNoKDOgd|osX2XC^B!sScarqDPM`HczQ7v5_gyB>eeLx#hM zmK2?3P@CNrg>e}e2p*gyBsj(0-HR6}P^?&S*9Hv)x8hLTp?Gn3cX!tU#R`@0=KfB8 zWZs$gRw(hJM^NPwwSgbjyrWv<`hI&_qfu>r>D z$HoObmn8qy_16A^Kzrmvbavwvn8iPLXDBY&j0J9gU?lvkBQqcl*83wh>#}{K1H_w# zGGIVp1MP@1tPT}u-*vn{~i%kFEceqL3n;-n^ zATni;;BRFLz)^g{?o;Q~ov*0wA}(Q+cQd+OZevbd!(XWg^ri1L`1)mbbh+V&CNP=k zFyOlr8^atPCzkyNP=tIVIX?3O$AfQD8$bvM#IV8kF&XOi}XAUqX7qQX*jGgzNgg09N}~IXeu^MVb`jK8 zgnZIo2r4MII9i=U3b!Q@zHCQXj>?|m8jtG-II0?(nArRt50AjxA5*>^-hCKKo72XQ z>~&v_9@4n)fxd|5xz?Y$w9j-B;TPL4L=h+)T3O2$Ee#uLN2-B84JE|O)kE7P__`;$aazT4-%wju+-tki?URgfS zVd2=1aXlB6w4`zYU!XA+PNOtdF8u8nS(_MIzYj1C+?{aP=KajzV~RG^4qD5c3r-iY z#?YX-MKoa-BHrqG8qc%tz9*+Y@)+Xid!&u`OloIJ-s%`qJy)f9PFLC)(n@)nlD zXrgoL1KM4h(Vz&`%xYr!9kySuA8J2;F7Qf)z@k&ak3Jj>tJ=7^@*m@{tTJO0jsr#> zXSH%RhW<%FV0U_o0+Qq%+h}5Fu66&#imZO>S-$W~%l(4l3;zD^bA3{sfExrl##&WS zF%zT!|3U%$tZ|#?o-bn%uTU6X5U{Jqc5fKzSG?2;9`_J;)#R7^U%=Ut}?f#VL z!2N9}|I{jjm?3~YP%9&2wrdUH7drF{cPVhBtu3)@Nd*0BsJNbZ$85=e@%_=~-uGXP z__Wn^KxFK#aZ5zje?IqZY6stn>uPaLhaFZB!o!#sITPS9##im?5lK(u92}}P5U5@K zpo6S@@wpj-a^NhM`Sco)tck0e zucQti`7G&QiWd0{f+-&cBhKiqd+8=M!gAkRJn&u*u7f#1+e9zUp1IPbENAbqDpaK5 z#oq_JcJ+Za)VVY08YDD4tYbBCQ+?^UyS50lkp2FF0{nDBQ_MusCFd54$ISO}OJUD= zZ=Sqp2y*?cwKkYT0*Ql&*()wtMSsYanh!|rZ-@d=-GM>8-;E1i2cp*hmcRZ9L`tuL zK#z>B^#iTH99gK8mbZ%Q;97S zsz?`)TpR^2Y^o!D+b0QE4=%zMNy?slXe!oCZRcIEF9C!hyt$V`Mm+G+e)t+8k+4od zU)!=N2^K{>eTT<-@3qNf<9`_c?0Q$Rm^r1Eb)F@_a?9&4iwCHAsAN${-dFWsR4%!u zM@;2kRWHG|a(vD^?dxB+ssH)}2>hK(ePygac(ipr50`Q;L=i*20OJjCMn2tdewo(z zcP72Osx(xzsXc?Sr+cfLtq;du>8O;ikaf#}Squ0R#~+%lnW&JGSCz4U=B= z3|gvV4NRN+ujvP#wr$}alzp~CB6&xXt@8)h|NOTflE7n(qo`qp_HwX+T~@@Vy^y-M zF`Pzx6h#PuV$LOg@MUku4gX_e{;_C0JSuP#)i+cS=0+$)>1&Q0_Ji-xAB%oq@|5}n!4gnT!R^-WPo-ECooclOPmH}Y+voiJkHP;xqJ1=F1De^l zcj34wvy6nW4j!vI@g%Y2Cr$p7{MQvwSy8Q$lHJU`v~GYGhlD5ZX9$9fyHf(>wftC+ zG$NQG-nTTt7${F?!S#o_hM4TB`(<0>uV?9ZIsYV9N9~?R!jW(O@V*buS6CE-&WUqc z4IJC8x-qHjjd&2=ZL>&O5_* z8Ke1Byfe&@rKFDf*y$ z01*(A&7M@KV<0o9*z&GHpN4?%ae1@smvSY%RbZV3umauo3U1V{-d(uZDkVd06 zNO>`*dyd|?;D}UlI7ukNO~WGR&AIcLM(+AC1xZtlWvhtJ-PNKqt40h?biwC|-mhhcB{v(IRs`a3#lKO9`6oCybXv9Gep}v;)BgnW za~#6&HQuQ|^L8J9D*x7{j`Mm(FUi&$gCR`Ehp>c=xy$;NJ%s+V=xa(GJVvqzG!1^q z5B}#%1gE)O9coI`mXAaK+)=eIn)?Pm=ZY^J#qlhUqM~R1N_{Qu?*tGe5yvGme3Pns zTU4&#|J6WgCP|6Enwyp3doAOXNb7R2*U40rxkEF^?Wh zK_Uct*#c^M*wv|j+7fL_vy8Y3{BZdDGnG70dg&ts78mp3*7&c$i^w!*@S&Wa%-^?| zSV1U;w8bOKr%kEyC&!rTx2lENfA}07@*GoOWR8CXjzwWlSeQ9e@`KOtl;Z-j%2(mB zn54JdF29V}8Gu;z)yUUwn$aWpwA818y0jHihU+A0M-^hw?~ypv|L+lv8n?qgfYIl< z|K7gFzW`858LD1b(>Le9+8!nX*lyIkB8(e+nM_~Nw6RR}c3BoA-VF1(6~_*7FA`M9 zw5nk|?Do3-YIMbwofR*@B#kD)XWjH4ZEQs%cdX-k6Z!A~FFN_~*Vs(>k4*@S1-I%p zRCXzowlm_KC<%4>L$wJB1cd$~(fqz-D+y{jizX}iml>0=;>L$lpAR@A$E}uC#8wl& za*OEWc0BRks^4TZ*&)YH1Wa4f@y=Wi@_a{_@@H&`Qk4*ea(b)S*g!0GtmDJ| zaM+ZDg`>X~rhVU7AIcxQ1V>jf`q02a= zOkc1Z{Tg8@jr+u1ak|bWt`^a4^roiG#((f-Oe!%jO@g{QYyXd!u!=%~T=(qQJq|zmR7#hafGWn7+2vzV`S3U3aWI! zU8UgO(TFjYtihsHlHvhkTq?5D|KdI6pZ<((5z-Mh{S~iG{`++qPl>G3Jaon9pT1Dr zo-qW*jsVo(7vH9f^@bqvL4Qw0BC@*Cj?>P->l?l~TDPP4oDisGXe7qL@A|xP7cH#* zaHI{SO#&;I8tySOBRgpe=7@EJhFP5TaDy-dtL|CDaTm5Tu_WdmfX}HbR>YedPJ2VaHn%~gkExejJBT5+hL0PJHnyqu6`fkRy+rY0NF{RFOC5-?cb zyAjn{4ml8|sGX;Ik2Bcx)$(O#OCCxe<@OBFTZ*qYQB-yh1T^jTUZuH~l3;vn!jjue zt+_Uk^;))Wl%v{UVi+_F?D+j|QE!i_%Z5k+4b}j3_AWPQeZbznI#Zq_9CnDB z|J=iycWJ>I#r%e_QOOU($&^4N1Ufayli-tA-));D25L|;UL(Mx7$c+;;h*2jUs7x5 zUju>mYTtaDIEe8YLWa$UDlm!1(&qK&MJvqBL=4KTvdmo_wsX&<7|*y~-LJ0K;val^ z@3QK~tUMBvNSG&2S0wAEnKtrk<*YEm`6v9@oTBY`qS18NE8sUTD_LKcREdY;u0x>G z{HY@9M$v^lPNawn&mQ33bHTI_K#Uq^L2*MsK*VTJO%d!*k=jV9*|=B?2v0E@e~xyB zK2q<%Ac}X&Tl~simC4;K0z|9N2HPhdUja&yv50tRs(#`ZwL82%qrM5q<);&^f>S1K z*$%VFlC@<%i3bMwb^N-)9v7za0}RmsLCqaiu7hs3pxE`kNTes_aD;$s!NpM>sVx>> zUJmVw>=e2Pm0wmBxy%-&Rm&l{m=^?^(0XXsJauA4o=8 zR;$HfrUzda52_DXP-81l+p7V7Wgb9F9o?<{2Qk_&+K@AZOxR@8v~7$vfqnUfezVn| zsAM}XIpkfI4zKBN*e4=iogx`pPbmHCq+5{8Bdvw)kX~?iuQX_$5Nf5eFFu4N| z2eEeYdOGvu6l&HDE1ys*`Kv`mbP+hFVc7HM68TjXBo1Z?9JKMbr!8<54KqESxK$df zLA)Q2n!LJs6WX&K9C7Ip0UWvH@^Qtk|GL!ew{)?&DPX>_<6F1HjdWW;yxf=5J?v`! za7dg|)$dx(iQp?|EriQeA-<3c&^=u)f8h;Ejdx%B?&cQ%m2@%314j1o^o=mGbE4}I zJkE`QcfMWO#2twnU}s!L&DnN$>BNxaOBA{YXDT){pv5E8sTIaMqZ}aR?JqevGJTUO zs-v%IOKcn>PB_oItfGopWp)uyU~rm_8|f|}FG&BXwvo~-J_>Fx^GN46&fHiAe27p? zt{@$zn}I;%@xmLpdJd{hTVVSxG5qmm@ocZGy!2E6Z`?5FPfb4|a| zm^vV;v<2ies*sk9foax2Ik;2V!R3#~2x``#JdF>7f4CmYKr1&CVuY<_tkSvwh`)}jFIBkw!M8M%Rr;6@+3@hg7Z+9?Yc_z4+RN-Hj7ErOudE` zlQd4!Z0u`|+zE)qBhcMWi|5BAh#=7IC~$PYg%KaNzHb;M-3;=QTaFggq#NUAr}+w$ zO9zuAFrT)CxPj=!yzU>iPyUEJ_1u_lJ#qAXErTiVcfvaS(jBwL|m7hjjD#%zG<996RC}mtrw&jX7k1 z@_!fPqiB;?IYBtBxDh;ea$mX54^2cNMH%pj!bi>vG9d2m+^Wn*jB!BqthZ15T$@q)~{5ruAq7HtLEo#OXf@aq52Q8M+*DoUD~Is+M{%? z2FA|zsz#1a^z@@wOuq(lBB>95W{_88#Zz+=<@5(=_adW7Y03?3LZ@1x7;d{e7NO?;yuK5p1FC^xyTqQAlL7nw0s3TfMuY zR#U+xW)XZX?EL=c@=wKo(l39U=N#dDFN|aXP?D%?XlVUw zg31hgWn&&D&`*gw#?g%$q)LvoR*P|y+TRbS^TR2Y)vqWVQsMswEZQk)8-u^u_*?!s zoOEG9u2ujj(Y{z{_9nhOdI(8B!(5*xK;j?U?5LiQhK8jxrGQn9;n@rh_!z7SF4^vH zP@p|~Qa^m)^FNGpGGZB8^S(k-?I9@XATK~Vs#$<|j2B+c6f8dQM;!l&S!o_ouOJqA zX*KuoKyQi3(hOK<1I&fj!@XE@5DM9Uwq<9J*@h6jtBH7>wi4_T>jBlq^%GlLp8bs( zv8ex{83?QaQs@w%GSNRkvu}S&(n_FtPkJ#lw3NjCfJ`Ab1O3M-V^7556nH)MY<>QM zGlU4;@T8hd4vkok#6RM|)BcREF2?E>bCa*rW$L@Yz?7sRncbZQA4GdsiQz>(j$au5 z%jm5pR&ZJsQ`lx_?m3*tYVeymJ0ID5$ev*( z%j(MyJyWw}kZ)v0m48?vR%wyd1@tRqqX?Cs7Xp(Tsj%#6kt6$+j3RtaXVMrIM^?xm zs9zV%GS@g!SO5)qM6*$}96Erl4F1UUTE~7(>4f_~1mD3mP{hxW=>_e+;NI!q(1wSr zKRF3-Fm6|jj+Giiuj#9uv#tFZYiLBV>Vv&mu=s<+JZkD_UzUqKRnEr-VrEWJT6Aax z%ho#~RfLM@MzT>KP4V&*^7BlU(+y;6CX=d?Cktc9wh(2rg-Zre|H1h~@%q#44FuM- zk(81A1mElVkMj>TLDk1)D*P*Z=3We<6w4(Eg4ym-3PCsOIc3q7Q*kC;S1s0P?i()Y)H5)QNNVwpW8Z?^YY4fB)U^0{>^Ko`4$&fpB}OMLLeMyM+oaEm^X5}~Fh2MR5O=_5l*WY`NLFtkC; zOeHdDhKdSjV&dZ;6p{&j%_}%XLr^2+=oAbUCRrsJ^!=~W(xAtF4FmrIpR|9p)kY%u z`a+5QOa1v8>gU-R#h#pWVM* zzdBPI%oRFatV`vxqA~X0O{|ux<*o4E!KlUie{Y-q^bY=MHa*BAk?3aAIdMzbnJm!q z5-W_q-dXu z!qH>cHh{&i#b4#DD}5nrU9M|?Eh8cd7!;6LAPNO`|EHHDIHT(uUv#1(oFM(aKFQLe z_v{iXzpl77yc*;^)1F*m%&r~YFP^9+3=B&O!QJ+LYiueF);+eQsc`tR@=X3d#>Ny* zQCYyT%b3x`pOnJ440Lsmm&vqtHqJEIS|Vd)}ZKfY{nb3_gNsmV=YGM*aPY$%K3i zsrzk*0AjWuG)a7FJPDTv%4~V>L?-A`r37`B)bF{#;$Sv80sJN+5@#*Za`llk1?Wr< zs4$l{iNdY;Lf@N!fRv^dQEV4EHyNd0;q!4=Nzp`3&1;S^RdE{-7DU1A^9%dtzepFeWf6 z_5?Gr+R4>emvYCh*Ch4NP<8;NeiHT-LdDFV%~Wulw)JZTetg(;*3@mdHR=v z&Hd}?hTUwuH8mlLdH24NFc0u+CIb^N%W->1VLv2`q`j-QuFo^V`6^x`8_R$`BdIs+ zf{BOVnk#u79vFefOp?sd(Af35z$&RILmM9HPDO%6K9H^jfw@pct0mIEx$+$Omwk4e zV^14rbug34*=}=ls^iK@D1|G&F)J*xe=!(wOg9X|4@e%qC{BEmVVZm2#%y?VI;* zwpyRWT4=@EHg78C*s(9eZeqZuDOd|RUY^{3^m!}9R-;@Ah;7C}jXV^}Ls!{M`22Fw zFvT@Q6w|w4RaUCnWbAQ4@%e zXLaz~L(Cf9k<&^DG^`T>-Otbxhd@nI-Er=urUcA_;wAHZxg7)3<#9mxc*^Udl%OW4 zV76taz|GC>Ld|hJ4^hqE!1CH_73vF&5%@`Zys8Y9Jj6E9%{EZvC&3t7-%SteZOMWM z0jW)a<&Q5cla*ANgO3!s{4`myM(tCnnw)F8)xMKdn`eG1R(I&+ z+ZFx!b)UpfGdh_9^eViN3R)#S-5W^ev$3_qIrnCSL(n6Bt17eae*Y+_|1X0yQ4$kk z^2yN)d@bBfXJ+I>yB$r>pYi7f2FI}6R`HRj)|se4`jtXttd6L0m~@BQzaX=c0Y{}q z$cS1lqVSc2E6mGN`IwMB(x}Y&es>n@OlSxaJtR-Q?o=f^p)R&EDTr@&YSljdDM$oM z^ZHZ0t3zK(2{M`(j9Foi-}g}7K>kyfg;tuD-H{s9A^$psdZ(JH8#~V6dT5#dTot=I zP)@Ij%2w^WhzWF{5Pqv}Rn?i1dgf*^rf*xA?I)?u?$7HXvkQfz8SF{9T1_`jyoGX7 zaVBMmV&OHj`%~r5TeFEK^p<3YgQawBnM$}-P)rJDCZ$T%fWWGh12$|UQ#=SXx#7K7 zf*s99A?^o}o_0R%5M<=|&K^ z)9bo^A?_vhIrJA#$RAM;(C)5qK*tA3tOv{`x|7$(6N|mHK$eed-_>10msAh%_(_9s z?T=FUVBFP>)?vAW&tupCCXU*vq!9|5o6W_}_hr|5&YxB+EtC{NAU;>bxbCDy(A4So zSz|qs!K2H$QQAeg#y|m!-Whc|fAek%b{2xT5wlVzq+9re|9zjWufRS2|paO@ndh#(tJU-LH{UBEV33AJP|5YML~sWR~A zEk8hEIOrp{M8!x(eKfmOW>Hp*FDYkVnnTH}xLou4_EMVS&M{xh_pEY$odg3yla^S^ z-UX$rb}ULNa8GxEg9_KkTmp4xjxuLBF8eBOhze%?1q2$j2!V#z#sj7nYAIdB!m^|j z9zgsR14VFuhpgzA05QL)u=ZX2^&bl^aUJj49=&A8W6Ev({)rS>%S_;LLb- zFw)c)rszTEezvBsKEEEBTy_5Zg|V37+#V_qIQzPAq13wA`!>&l4WJdLk6+cXo!UBn z-WPQ_{giVtTjb*YTE*uPI{h#&rWfSx^tW$zU^Te6@mq26+OS5H^i%fcr&JL$ zYsn4qx+DH_jKFD={I8Lvf_29Df_YIZp2!l9!=ZeNuaa>@3<5&QN`ta^xU*Nq;i;A- z(BjP_)+;=Lq@j^!&PKb&nh5d@^j3>te*#H*iMNR=R+r!9WX4wovK?9wIi)nu=GX(j ziSyw=#_HH^c`$KXpV=zF_{M>e^w%$Xsp+h&TK+Rn*f_cBX6MV!W*dIr#bWALJFStC z&CpB=6ny}4|B+E|(w$CzBHFp3F~No6-U$ADu!f)gy;<;K0M*#PYRW8u#dIa9)#Pxp=>NkS zi5KqwmRiaBw690?zFZIgeqv@pz*Ee?+-E+VCob+-Gg7*Bq0k(0b8tu~O}VlHrslAU zx=ty`Z&6m#)s?Xp5Ie=SGhU-JIe>H}7m+d@g3z5uO0q9=AW-Ga*iGYo9GSmIKzO4s zzlj*nDF)3aEndGd^E7ss*+K(I>OoP#l*jg6BTk^-$@F03tCZ6`>q0e8M|I2_d)yuC z0geCc4LcmfHdSUyzWA{LliA2hssw5e8E1cU3XYt&FP-)Zquk<9%)?l3%avTM_UyrB z%${iTsR67jl^CINcdu^YIU4htD<$@j2K9o_$BY)3Z7FSqZ2YkhYO?kq+l^0Cyi6j^A*HMi1V0kpVja}8nPE+?tpp(^PSmNM}Lwu3#EfEi*ZUX{>_JzdXsxibNS%2FhiFogY+Bq2pQIDl~R%V(?lm55^2TF+7W37(Ktc@FD|GgdWF?l!n20-*?R8MUD@w z)`s_wtWifQ%ecz{Z&tC#z}iy#oTnBkE$VIK^YF8?UKc`id;LdWp|n_9Z_kTYFO*Er zzA`nYWAER|i&ADL=oNhqdcpR<)=3GFY4K(E(Zj(S9x_h(P3ka~` zgTQ=HK93lSV=e@$$l|q67=%IWdBP)_>uMNXnM4AvO|#lkiy=jCa`{2IA{O@r$F4t6 zf+3%Q>YIz1q;5e~y_oMDu7$T%1+5&>p?PmTUq8x$*SI?QqkbvZ|MRupADg3)8#{># zTRtHr7d<@Sik=8Qla`h@hNfwO0D%FbY|F+cwus;a+>a9h?Bd;S6T=MmL`>(rT!Jkn zE$@Ei?O!m-p%j0DZd6MCha@t^`_Vq-*n34%d0R9}paDNX9|}^@&0?ysiBo<7aa0;7?RQPomr+@|M$0E^$qN`$&$MWkM80c&3>j-Md z=s@*l(ezSlUaZJmfn1*kt-sU@*8S zj49@n9sUzD5lndYASpfr9OO~ggW=E%kjU>z-gh0OU{uptYRrCNK`jcypVl!ES@8?U zixb|TLe~S}dP2O$n3$Fb4KK%3`E!z$e!WUJU7_aaIn@1_el9q3d$dfY6uUT~_#GD! zeGVbvgkG&WjueJMT1R~QpsK_>LDm3xI7&{!x9%4o?6^IxUtWT>BNq%Vk!@?Mn^A?BIp#6Ippj+;k>C(!NhNw| z0{8{=b!9pA<5cFRwHL9Wf~bsaV8*6@PNQ`V56|^(?_h6K)&cE!b9R-`=Gahkp^*~2 zDACwT?AqRn{9R&JVdJTZM53&dq=eZ<-c#V}A z$i3d|zrvXtUp;HDg%@?lRC^ ziikPpD9u=>Opi0rdeB(8UZ$`d7$9iGGRYOv=`H7Rg7ln{)m&26`Eb|6P2_m- zvc3niw}%g#{r>JHSle2=aWUUkk=x@upiXX&Suq{lXuM|8|Ex9SEnMXVF3M(68d{&Z zn&XCpKq6v7AK88*3<(?kF&L_BwWrqT2)D+&pbqAHp}@} z68W)?3xHIkyewqfWp`6nOeeOd2xS}Z4tcV-am%$)qu)y0n2p5B_Os&QgRGXgd>H?U z_#d(u{v`T0+oyMYs@ThXFOMfOVU9)MRB2QVYfNMw1+F|h^07Y*>Z$wFEJEBfu4S3Q zkKmHhvDA&p9L$_MD;gO>GsW{#u5lx4#)*8?k78F1A zVg9|zHqO?aV;h2TZ?ge+!_=QuC{pIVsVt<=&!TbR_b`=`&0ZzP;9NsxbI zp+0*{0uA-f4fSE?Beu;`Q-F}tzL@C0P}itv9%c}Dk?!~#co)tt>}m6fyy}*N=jW!@ z$PGRE$f9q(}7ay=#u~EOAk;h=%&0S{7~1(CB*4Mp;YikF8GH|GsZhvHtVR zwDrAQnXYZ-CVLBajK?~7pWBVny}&|H9P9QbM;(VdKeFN~c+LJWnAMeX?7X9n&wa+& zTQlxaIC}HpBWsTn{#BlxE%r!!D$#E~vqXA#Z~rCopKD<^F5hF_oXSW^T;?Y}6I3;9 zwEH^SnR`|nbAFFj60X6bYeGPvbN5)lV8cfJK9duo7ASmKmuJr5;Xu#iO|HP&F73Ky zq$7#3F9xPuhMw;H7@0N1X3~<9jn6>6i&!4wCx}RdF|<=rTRFZkiCU}X(U1U%C^xGP zc{E|(XMF-aEVOeSEG3|b6yHJoJG_A^80mU!u946Bh|@I<%?a_C*yFr;i{d2SvcGM; z2O+)t4LmqDdgU6mlsZ;+0D(>O%d+Huu=jz$K6y&ec7I1l+S#y@9;OQ`aSdcJgPh4Q zZ`?RV^?#mxExQ+IUQ+@Tks1E#vTV#+X992<-Ip^P)9(_wwU%tG47=;KUK6XMLf&;+ z9}v8L>*6D=wP_a7`kpOTj-zQS%v`0*MqA}K&+Zb2uj4r$oRrW-bv6Hd{MbU(wqs6hnqr912dO}~ z9r}|Nhd5no;h|X*osT=m!Gvos_N1Vemj<(a^j3UB)yPSEOJ_#i`vl(dypO64EjT+*T@?PY)ho&CQ3e>-j*D#Ws~ zf(iRYT)XK*V16OJj7B4jIw@ADN^UrT+T<5X?s;Z$!+E*~1FW@1`;_+1s8aQSm^>*E zvhhW#m97X5>o3>wRp%nl{q3@-jF^mV)Ek~bsQ1RXl|-9O*7&vvAl_MHvo_C z;_yrEqK~7LpNHw<@&!9|uRFCjN&lQ*3}4ffA`5>!e3se0ehGgE3pm=3Ck`Ka@E_qa z{JE&QA#CSD<%})>i?Y3~KMX=uNciq|sAEM+#%pgK72z5g$(P;^H?U< zV^glPu9#_zeS^Sq9?D#Ozr!cKv)}L;YgU~H-C(5eNbz~`*yGX@p@p^xuxRs)rn{H@ z_d!`w{NTi@PR<>F9RlSTh*No+$$EY>$;3Z^et5K6co4dh2rr0xZ~ za#j*9q~dP_lVcC{4`NOiiYBSaICE+`=?vnq;tf1C@Lbf~dueNjd3{uVRyqvE({PA4 zx~HJ>s)cI%TM^7chUx8$0J9s}L7{nuPYEQ+6}O-0X_yGBzfwgl`R}B?A#odTlgH0S zl`BW&(QGc(=(OepM8S!2<>{Kgs zB$&3?m)oNfy3Opc0}&6VwE7BbtO;iws_WD6JJ?wls;7ug`gvxx3kYu7simA9ya$b^ zPmU>+*}!}NYf}f0%~cN@*Lrs&xFV_}V9G@xO`eT_;DRGU0e;%La927%9=uhea#f-w z{4U|QPSbU;!yQGp)%)-7S>j=fM=pTt%i+sLS6ZIJ5uv?J~kVf+MG*`MW#|Hd4cj!OY) zXiXGVRSmtB>5Qv9d&#l zOw*QtZGbsjJ}Vx1bdg9c*`y({xeA@{P!j~WUv$PK)}?`ZlI$zqInXZ58&c>*)L(k* zUAk(q;iQiOl)o2tbY}N}I90^SV~(h-4R25qK5`HB3zb5k%-&U25U-gM4Rm@hJY`Hv zg-W;>#*B)+3m3AvR4^w-^b=Y&RCd==B%}`;8x1Q09~)$@BvK zCKYTz_EkqApTrn!gC7d4dc#Zv#d6I}NThNYM$B($<9c63smX%RT zP3pe_=E&TfVoK5x@^Oj}{ai$^e>C>>k{R);+u0O;z5%a#TfB4^_o`XDY=fY<2haRQs)`ab= zhnzAQo*Ni*)iS9{jYt}Yk(OSjrN~F4_{dBm-Gvii+sBmoaAX43Ms=mf&&}ZQ{K3}jCk_ym= zrLvc(S!yWy{Pc+_WnmO-z%&|aG%hsU`|c>0U2|%r@HY|GmHv}-HL^88Bb_h?P5ffa z8%wh2Wxz$@ubrn<9faAw8(9O4R7R~?Z0i3TrzFh^p%kAnTTm)=bxGz@v-&CG{`ZIa zJMnSMH}8l77;*S|3E;a~4-6;fAKYx_pJn1nwe|5ye)F>F@2Vnb{tH#yj6&3lIdvrv zT_~|OIH1@<5Li`VRY7x6xDk%S03n3aJ3AX#<_H7gj0i<1WAG@GwhEc1baK#g)P;BM zw{hH#;;|rkr#S1Y+%+3Z#jGJeA zd_jTvx!5c<9G@Vt%0V7`4Tsw9TuVXg?YVjV|F$7&Uy?CRMK)^sRdZPRRDNlFYB{Kb ztlg7g8;#Nl!||rvYedG)74pjdunhl38o4k&8#78k( zIyYOO6q8TI&aW*ekqkb{x5J@^0$kuWz5_PSy+0(5%lwx3;8 zv%`}NE?PJqE!ei6+Rj1(0`-JU-f><=$uP6*kOEwBP@s?jWUb z{2$z(Iuq@0q6L2FVp;Btq5>X34KZPoxdHTgPiLiul(tk_;MFcFuMO0F$I;mliD9k1 zKu6mK~Zsz0uS1DLGb$u~K< z-w>TUb@^0RGc`{n474S5S`OKbYgH+jnf?@0>CV4DmmpN+V_Kdwy+4d)Ge?rE14v}#LtZ} zWm*j^-iBr{GyV!NN%!cBCND+YF+wysvtPtA$ubirU~E{^hl#33}zVcx75ciq2Hqg zmE+zd>t#|#9v%H4He?jKKJnvof*~n@YV}yQadDlwn8OgT6jVZ6J?Xa#egbS3B4Yc?}s;ieSd-pq%jZo72yT}Ve4jM2PGkV zVhGHfzfCf$KE|+zF_FjJJkRdO?RHjgHw%-6Bz{e`lTS8Y*mLgb)gHfI z@pApP;kO1DA7={(8^XSGs@0uI#(V~9Kw4Is(aM!Ls{<`=*nU8ezL*6Yk=D+0wTw$9(MCHI-wUWQfT zEGlpBMP70H`O$=)_dkRkRAdg$&_lOd4hDxaS~bBbi6{sISAFykE3@{|$rvl`lm zkz}Tj(z$u4SR}JCm9V8yl!3d}BNW&aCbdb&nE^v;So$L+V_QaGE9U#mG*TYNK7JnY zh8Vy*Ady0dZk&t&Mf*^erPPZ&LneY*fgH(4!c;M*9opVkv0}}^Ov)>B(o$rU4NQ*# z9q{UA8si5M!VT!Kqa7;nnB-U;lGHHN{gDxSD#Nl^I4W%lvNG{xOiD^b<3mZ7fWL{a z^?bj*hU%Sb70=kBHaBI)3akMlUri%_^WtlS-BxJNv6%4^6ZLciNlmm~xLK;uU@$OD ztS=+%P|#JYn8ZR1tyE;UkRe0M%o_UWc-Ty&dj`R{TIy8?qt;6ZXUOl0b)+mSj!p`Y9Yqwj5c}Lya%;ei@ z2%fWp*EEYVEgLVhPhW+DOOsJil5?Fd)&T1f9KYCEjFj)(C>U3~w8*0OB0ec!FV_$PwbJVi$TTOyEK_&6mh#+rKcvL+C=HJi{;n$i>8%X|<-Sx#)RV^C zXB>|&rxtIf+8gZOY*Y#(5mo7TKH4p$F=BGO26lv1s`TFCsWs1U=ULXK?}qy6A2*%y zw6?=%OU_Bbz*U40!?BfFU=m&WO&lC=fFGwOl-fqDFlxr;Hh)PpM_z6}C`9l!Uh8VM z1(55;W|m^1DytNpRpxLpamBopqDj(GpSg@G2SVW@(D-#=eL7(~KYm5UWv%T)2GDWP z_0ITfJ{dY=UfO0GhO6Rk{pB@fP~OdIIqV_Ir7`Q=BL6g~6JlPTSW;zrBM$c-0Y>2C zrwZw0@2_tRuUyonwBib#E)vIg#f2=rk-|;LX*zRxkqmnGh6w@EV;omKKDKM2gSaN-{mQgWb%2ZZNZRj;#&&8?`CEYGt}I91<$o4?m9?fl{R`}@Uw zsGfU%^5vW)E@cPtR){$ezuCl;Ej|NXn+L1rIicF6R70hw?*(1{JACC9^A#^9FFL9Q zbSGFjUtfNDFDlUWA;Z@=%KLTPj-P$)kDR2+V`E-HmNVp?rs3LO%xanUW!CsbWBGHN zwjw(!tzW>$<f8ILyK%$8#Av#22tW$2 zPgZ*xg{dnp(1RcE)!{Pl`DTt)1*rVGNGJHL`hoErpZD3-w^6sU4QjCIr5xYwC-k4; zyBOLG6?;#L{WH7rSfXqOvhUMfT}fPdQbH$1ODcd@fX~XKdeV)Ze)*?hd+j;NxVQ*zQ3io2&Sjo_^PMdPS*jFHu4)lt%aT zF-ff?{5KewE&fN*Sp~J#c3~8kAp-#d1WyPAcMB9KF2S{UvEo`B3PFQA#odY(_fm>` zDelE7PH|dj`~CTEGiN4qX3oX??)|LweCk=((rerE6oh=;DN~)fDtnK2>^NtxT$j-r zpHM=R<*I{Ku623=CK7g`1MS{sqXLg& zg=#yWxb$^7Rq^QEx-hLhi^%kNHQC7-XPTU)IE8_45qhyaF=Z;a1!Jsp$S?0gI- z(k&693K00HyF^c_rLSKC>W<#LVNBS<-u{j!v1ti+u;{Kf{+eYcT3RLbQLX!wcg?-p zVw4swHKS=o%JNPeUCl7k$Y{+DflEfZ%?>mHFTe2&Q|@QoTL`}SqCMK}HMrGE^rFAJ znLM~tgm3xBeMM9n0e=+Q1yF;^%SkVWvE}DubUE3s0!(p{be{`+SychTEJ?4H;>#g; zIf%qev7r09q!Ueh>~X!(Dw6@Yb=IMh8VC9NgGgHf(fT&QG(cPJ>Ox#(IlW^Fi`65uvdKg)$66IRvWAl+#A*|i%&rltm$g(8g~vHQUj{X2`z_vBlMZmx)%=`ShF;8}q$tr#wWIUV>yp>(j71zt^^7$(n2 zWcuvb51qEVr0y7z4iWX9I%rDcF(Ekl!`hnzlg^0}O2%5QHqC5l3NSzH3J z2ZKKp{A_28VlAW^nu*Ezy;!)zc|iV?cn-%)GL5)vzL#L)2>>6>F6!74nw;cnTTH_X z49q`x-z@ihGRsM<$q}YcP_4*nl&TQgmo_V!UuHT<87-vg21e0qIBG`hj)4YP)Eyy& zmjrK32#9mQ#spj6P@OQg^+!r~Bjs5YOB=6$MnrNC(bUl4&_8lDeYBDf=lqrRrt5PI za;h$RAfc*C?Be3y+dj-EM~Hw3;G4 z6+&3{c^ZDFh@!@XLp+DwnJfzeYW+xFF!d)#s`?6#FDslAV5^dvoTH%Z%5>-cdHd*Y zKbJ)vQ>4VBhRtL)SHV(bCPROacx8SQJHHcF%F<+MrUPRCU4oh0e*fFyMFLOXu?XvL zcR@{l=k)Fejo(}%ey)Y=EfP%_>fzamac9-c8VB{op+0Otilk4FrK#18u8PfPIGHrR zV#DxM^9jfif>D6 z`e&sHqMqY$3vfTBnH}CvZ}(P?M??UOA3n_w5)yyZLYk0X+IR|v-;h!}@vbyF1TJM~ zXY-NFv1ZpuJ79nx-viH+Qd49>UfLNw&zWGF^qgms5=0M%dudk~YrA7pFD1fF94&tt zoisRM`)83WkYF)j)<^|Mz9X!F&z6<5Qj|{#MSV3rq?-;mfy@^-3PIQdq=XoF>qmH+ za1tJ`aI35ehPtN*k_Cm3ukwv*iEIOm3)$A3mBtk@EIv6NyW==fm?Irwdcd;j@Pw0k z!CNE}`vhWtMfZxxvBHHF24@nD=a*c0fs1xT2DYf%i_@wla}y|&VaT#uFQ?_Ai3-%T zZ<&;By8A@jARx6>Ae&et-iZ=imN`!McARqp99><*QZdB9S*sy56QN4!3`j~Zh#vL? z>5GA-W@;BJC6ckZuNt)u_fw_FpPi9_w5VEaDhw7=^x(} zH{sgm*js%8(1Pk+euw_bw-uA%n0r)V%Ikj3$Qe8d5J@uo_i*vuo1k*+4V+SkWxmJQ0kJV81D^?XE0E$A*3c^Ml zi=fSf0I)1mg{HzV`UV(V_4BtTF+YPr4oC>rny9?oO88RIzxtu;2>9BPz|j-SoeYpY z`m+(k5+I)Pa21W=1fz(dklYA_yl&_kx>O_+nu<>#tAfX(I|#^(jPi-KOk7}cRC|x8 z@Uw48Md&0RZ=5}xd_kZF5)c1<_}UjUk&>J3Ut6%(H$Gl?eW0wwb$US-ekYiGnS^v^hTf=2pV%w@&TN-9XkhNv&BWuOFeC#tvXds~m*f$_2D%9#}d zHx5~V#yuQ0zsIi!m=}qoEJU<77->(Gp>tbGtKKi6%(^V5oC)9x`gFE~c3!4N>+*&J z`&oi))J~eYY4>dezb0@FaNzAbj1KkEa(9g4QJpVE?qT15E@P!NQrE`Ua@Jbo)aIrB z0Jc!bwTa~`I5kx?6wb@jh>HgBYxgeEKuA%7N7Sq&_#8Wi#uQ|NDyWvhJ;sMT#`zZ-qF(=83kOpqGG%oo>mfiKfIM_ zjKFi{ANowfP^Ve3WIbaJ`SfWIxX#cji>>c5R!Se}2K{mE*lOisaKk5!Q#8*390&#C+#iosYy zjpe{!0eX6JigN%UPzR(a$f^$2&$c6PO@LBN`fXHT+1Tyw3)awN#9_m-j z@gu7Z{c}gO)d7pEqNk3GpdGo+UvkAiC{7pFi21x8b;yrua=D+lHe{Cy&*?hs`-n+& z+#F_To_pTX*JqG+_graAAnkvrTiX6Q3F(pQsDNsSS&qloUrbhI2X=DgFsuFueP%DW zVc#*JWtC@DEmeE=B#_NC#s@X2qDV7IwsxTY5+27JyA4ffWhceqp%(088>^}^)#TaP zS%zvk9weqG!Ckeyo`E9VO2FV6WBEw&P1P@;V)t5qC^`=dXB7+_KA<9%PPeZ1)E8`V zjQ9sFq%V3G89=W&MndBfDwZbE^EIzsci|f$*0wOqA-R)ZT=)SxgBFv2t<`BtqqHco zO08Vk?Lv&b3)R65ha5bADWVst;{7wK8|pOhlcT3+?ls|YjQ9Pemo*GYSN?Eg(ZjkFrC1w?_n*)5GG{2F`f6l_Xz8Qa(NexMVwKDo{fqAPknsUNP< z=RB#b%|6+1-TPHp+v2B#a?Zd1ZqGm*;4iwH}@gJWAN)?2HQ@kl1*~wj<06#$1P5z+vuQuz;3D0&`of-}f+gVsPB?B7M0am65 zd;WqqytR+__7zz9JP;;7o4AFP6YNUd-bnA<1srENi`4LM`9Vi0E{7~$qxloSJ#b$4t}4B&~}oGn1e;kAa35m~{`z zHwqw>mCpnx5xvNx3hsC;o-%iL30iy$$&!2yo*37_U#+XzB<#EFKNqKLA_6vZQeB^s zj)&@8MV%5xG;5-?s!IFx*eFA8YU?Gjwo(@37O|vF+a+jm#{lw^cSP@SyD4Xj{Kpxd zgfbUv$cN#;WaP~r|3a&F%uIF3b(t^&jj@Y-njDClJMoz}x0g|rGH*64*!OTG{DYa* z__*Ru=(%gK?tzObC);$>ma(vXSiJ1_;f+^&YXjY#x0fi>HjN~j7vZ_e@zo_ngW8Yt zyJw+=c2>Gb&L2|W%tzC^ie4BuOK(e`{GAfc>8cesBwVU*H_*TJ(^^!E;V%#tvcxgE z{ZKpA4W z&avKdG=%3vHM5qDaK^g;;U#`t^?*arDu`kf9$Q16qCzxOK*ZCbR7Y=rkznOEIaL_z z_bYczBg_WgQ`)-G9i8PB!C@{|dsa72U_W6af9`&4qUvpQ(pRPE&} zdlZitB|iTizY%Wok8D?a<7$vuqKR|$u`m{-B?cQ8*nV>y{pC~0;dag;)g8|d+IpJwsj#iI#%>G#2pE6OD<0o&Ks8FP#0aY{y#o~-`Vv|!P7fkQz z+R*Y$a$pL4t-K_O|IlSW*Je%^-!Z=%~C283jD~Sy^>SLSO zx?2aJte{!2dZAKCFp|E=>jt_$31(-SNsqxI z4)829be3aC<7w<2!%WxWWrv5YU~IZso3Ato;xMaTf+$ZvBA?6f+mz$m!h?Ni<(=Fn zPDDg$UsleXPF1yh7=PcJoqzyTu)yNWEl-*0?T;z-HKy_(=2{H*Ec+&uDo@v5gE#$4 z__IeiRD3MQE8>NQ6@@i9DL|PZ5}?eNWTJ({ABj#Ajtd~Tu1GGvA~Cermo8&%QcdQJ zy4s&9;e%rtB&C-kN}9D(gbJ7G=<2)nk>$eS0wMOvUxOPB?&uV|fCG9z;u=-&uDPZH)WN z3`?IER=R0{tsxbc=aK{8{g;e$s8Wk_u95vqY7x-+o#eiC7sHCj7(^>{y{}?Ni&5p^tIHAQF1i0;9Ev#(sJcgtO9C zMqJ~Iz1>sw5$9K{EAG(lrmdoMaNFFDJb!Q^V=X*k`8_JLYCE;k)#K2;A=Q6x`3JYK zO;Zjdm6U{%Nuu2PD5z+Qa(7c2Xq&s=js8;lObPRZ`ih*RnS1i>bl zm5xtI75Cipq&XHi&AIh@$!IlyAxKHmbJOYTqW_$p>}bs_PW&VER+jHi8M!Jm2AYn$ z(0w|1)+j%ZCgjBWubdRrg{yTEBO)2K^M+8*08_xVwoTNHW+M9S>+!=}>+GD*{vSTJXRj+!C%1C`cZ#jY_W6#jbH;Z51~k+ zU>EUIY3V9e;q=nFhYcirO?hDmT&6=zV%-^v%27a+P2FUv?Wv_N34&Z3Vj2|QtYe%! zbIobE3Y;&i{scgm&_&xAfy_L-Tk}u5kK zxhx=cdO&Pt8Nu`JN+R-l_7DYuHQL%*eQMRvgkuQ9pVGDFVw^)8`{u757F_Zk-0xAb z71#u?-}T+@?Ox#M9<%NEJo|o-^?8KrE-k$>=gT6&Tw+1$pjkX3tW*f787oNv)!K9> zD*tpUuA$TvE)eg>dK2#0D?aJPhXi&dl?1Kdvcm1&*E_S?z~zhRuQ9W17Y_=S5)fk>SJ_p&7Zw%7VWK zpK&My`~%dnqS7s81*|&UkA9}wOEvuN3mQLjN41VYdG5!?UZkUa#K%Cy>5}Pob^!pj ztcz@Y6;CViq0=?5FZM29^v6)Ic~?p6^-b#6v!9Ttg9&AB+dv1_7O3057`pV6=KgK# z118uD9IY>}2*+OWO7(?yV~EGp)M6h+E>0oK5*}y=)*46lP*u#SG)t5wU9@?|97hf% zHcVcQ0~<-C2O=%)FGv+&!2z)14GZ$EX$qV0;Rs@5_6AFm_O~w ze8=eA1UJMk_Nw0d?B)&xbG#b%*@bXP?MES8nPHJ}@`m%pbX{ys z?s$xU>a%;&A4}eLX`m7Xu3u7p(HJ6h$$!T&9q#I-Vb(deGB&L1E2p1o!zAvkP+J=z zrFD^me3*NT@L+qSNbSDYJEEQ3a*mRIGCB_G#mZ1vBnkRH>5ea>||pN2qi$|J<8*jUjI$?aiL36MJPVeEm1OJa_AOv|q^<)$QKD zaS{swY(P$GMBl^UDL=hx2h>JS)!6Cwc?r}?76kJME=yc^het=9`je&_FBu9T%F)9S z2(aRD=wHJKKO%6yEy%0H8Bd3-JF7L{*he_t1>$IglAYb<%K}UHOp1OWba?TVvNva9 zI*|=Mgq7I;qjuRW)(JNr-)3;SL{2#$GD58YVMbmn<)#OX4^<#LNxYrkmI`6EX#coJ>niHVCZEWcfzEK3Rf?UY_fU6ZCrCeV9m>0K(IW4MAT_<9M zy2aLA;H!0oH9dFZ=b~TC{r3yHE?1?^d_u&YW{_T*&+P*6RBMW)+W5(F>|>Ui!RFR2Bq!QDvVJKy?h0Ze_Z#IRfr~~ zRkv9ta=L!>aSn@l@Yc&AbXoWqfC5BircQd%2xaLR_*RJN@*q`mJc`aIk4UjDH78z! zK~qe?N+{eA@CLj$F&AzRzSA&QMLVFDte%Ih4lIPe!r-`{?z4~ZXk-=8w$&{t9QqnhVWT!cMWD2 zBjwg#Qb-=o{TB7x3#^mhW_V6WsFcfuM;}j z$;Sc6*I?KuX(~l(y6q&t&w6~c&dV%=owTNft`w8C1XsGDvwo7T$pOBwK&y@Zbvn}g z7`3Uu8wYlR2T)TH%hze(&|5mf@yV@kN)CWuQ7jBdq*vZFDy^;Ad6aN`Vi3pZ%}hc) z+Ri{<@t*gG>vwFYnF5s*{qE4R+cO_K912QSPx+|QYK>SWeD<68edcph?8Q^`d+KDQ2LfdxAIvlFW4||ul|hT26A*6-_grhp}A4m_O85!@wQnqS6lRhd>@PFj!{L?VM$YM74T05nWXqfKcN*ylz=Lvw z!Y1a)=?%fh-~IVg+kHv-XIXT=L+BNfzbczxy&<91cdwMv8Nb^h5G7GZ3aQH!f5z)A zU?g3!4ns+$;ZDQTjqts#Ie=)~p)|Df5*jQZ!AF5aS;vaNRS9Sjpsq@M9V+6F_5^as zDG;_$GE!B(n|PWIXiP4T5h;M@{BiJ!d?u$SM=Ub*c%n4Pn=#3(B7L9B`Q>~oA-pxR zxD9-=B#FedXLe`nHp~PW6M!hu9Rqs}3#n$>P|+4xaN&Ww=xAPh=`E*;fn|SBAoN`% z04O|J`~LY^pgPY0%fG*!BLCsL{pfGlv!qHvEIk-qgUGxA zBryS8kHMf{etz_GODR7JB_2OK3O0#AJ@T?%2FH?;6_FZ$Z}LIIs_yXQ@#JNthw+2k zs;y!$gL)Qg7P^8O^WotM#R(86D9udIib4<|ztjI2>$ZrNiT*(K!6ZC|%#nF6SDr7e z9bs37#!=td$(tWsq+%sEd5b~a(IsE1`YsMXJ@QuX&mJhG^IDlPPDCVcTZ^HHR>eMY zI`(rovaB<%F(Vk=DD2t6U}lwA{S$$b80`>N>-#%icOK;m2Vvc3An`2@$DelId1L9i z{mz&KxZwzdxx%^q!>?a4uZB?O#6+&ca>?L%C39clmw0BWF&_?(RxD~HPqPC)GI=Qa zY&+qt@xe)RRw09U14ExSa!gQi@}-4pPd=WR57)E0hg=-;uHP&e$Gz*4MHCd0XcH&< z)_4jrwx+(l@w9y%9w4-I5+?PG;sxlcfrYImpEvQBb4v>Er z)MrpyTDrON@o`{ROX^?t@YDBu#n5z6=x^-UczC#vK_`O9wNU;pEFc;aVv`O;u0yDR z#8hU(gart*e%@PFf5M^nVC`D0I!GxNKjG|^tPIcC)S?p2u^eeU(gS*$#zFB7T!Z`kL5JUO-M@ng7dM!MbND$eHl`I!FXOZ|(Vi-BSKwF9 zefkd`4%GF(A2RB=gn!332`UI~9`}E5lW{(2yWjs+z#+N5O5WT_-(~uOrfUWe9zG0m3*qV4+P1f9n>=C4WWcn39{5yFu%-w7(l*j$g{n;kGpu zEe!zornLBgvFkzl3*&FtoT|*R>JS(uB%}G&(2lh5(Npk zH?>w-LZUkT&c0*t$5h;aki2TTpkh6z-z{XCjyfppat(PBR+dqmfZ}gs{W5p;BLWGx z#wa;weG20kV`tj*3`G|qo!U52r|?C6RUHuMpxGWw3!=-=%Zp(UsLIA;r3g3GaTG|i zLeEjc6+!y=Y)Zrmcr4qCUW}?e%Eakxs!-4XPPoO^anE!NKHk3voZt-S8_hEJxCWpAvB19a=CN45I@m-Y##JHGODkci6yqX5u(sb4<%n8DjX_Qv zbDL@+0#DnA+fLEKScF(AWdT-R{OQ-{Z2%zB*!Oh@zDX(_hk;{yDGMIbG7xBj{dIZkLH z24|#fcsN+gi^swOSQg1yvAIwYQe+E%ymh61hfnrlpF*DP94ym!zZ3{*1rM(A9#vR4xd*l?+KkQIIFX% z^yu-z5vC;{x(lh7_e^&^^1S)$;Fd_guTn=z_oN7GbI6Tg+Iipnvh6h-<$Opl0El;y z%da{?B#G^EGK4K#(W9pIbA>j-Gja61Y`JFP_BuhOqFBnUxnANXJ#lt61cFWAQTGwB zvV$b|=VeDz5@EIycR^AMn|OEJs>dwwH@;rL)ZbhqTEph*@l*0it`;ou2$vmq7OH{& z#~#x{=B@Kde?Td9)Ks1^j%D>Wg$jg7wZ42Cv>SV|UY=?Y73njfI)d&jzi#;KDR-RO z8?Z~;g--{E+ARjW@sZpa{S){G_VH1-KYEEn08^lq2u2eG7HSQ7OZI0ocDb~rItc%_C7 z;$Knv`yVOl_pgdyS;qeYxJFN-#Ma1IO`}we-rv5d64I4qzk;IqJ`Kyb-%SgThu9(e zJQLrLeH(-ElhU|w78n|J-2Ah9kwqS3DX zVA_^Zyy$z7ZP0bcHpzrI-DyB0<~G($0FCvbeDwqMFJ`+$=4D&1f=+Q1sSqAE;S>Xu zMaEJkEY#IAKuecS7FeN_suaLR#1J73Mf@G*EjGC)uegzE!CE=NKb_q;qMQo3;P%^p z>$cGLK>BlTnd$Ji8k9ii9iI8#hv8Tza4Zd##+Pl%1LpGxlE?7vOLlYNb)BrUB+rs) zerpmGV^$r`pm|7*Ok8h`WuoZ(rRFwj3Z&dGVJ1(kNBL}XrH#bhlW!(&W!dCMGwxmp0+VJll_&wzwnCno zhc+=+d&b2E>;cg2l~z?6Y25m!r+8_qPj0AUF4A8J*Vh4MXOc|*O(gB;}(?Wy(UEHm5ENWU9yHxbve&hG`TPsqc&YF4Xy@=tdVVtpG;B`R_ zkJDFts0e>(3C&`x{HRlvYBndAPEYt55aPGT2(691;K!`gKHzfYH0D{-b@N-p?H`%uB)sw&Z~7`?@`eJ`*1utaflMF1 z_;KR|n@P4L{a+UT5$R^A!}ZQ=xGdY>Po}thbqY^@y%=U}JWZs66S@b8opzc6jPY=j z0Ed(vL)4QR}!I=7#!U@Aqc1L+mnk^?G2#s2h7MWSDW~PH1|a1HTDvt z#aU^ZS)4_zxds&yTu?j5vGOP=kT6|R!GuIFUPNLIB-7Ckw7N|YVm9DPCFFZrvr=~} zj67Pa=+5(nxT)*mrB1Wl+aNZ-ocMW0=$jsCokJpucqELiv>oU9043ozS6-@k!<~3~ z|BLH!YE)p;F5vzkJB>{0QS^9E+P0`7ss;H~NcwbXNMZkGGvxIbFoM=eAC)K2GzimEZ-xd4bgxIEd zZ5tRvOVP7G%C1Q>Odc4U@c*-R@HkjVyK?{auxrb4)J(yzp33s4^vrEIkfEjBQ=~#73J-C83~KIbwN0jGyNBs z2kB#DD)N7od$zXfPj6ard@Bk8 z?*PdNPnU042$p+s0$oiHlN^}p<*K#J&F!lfcmC~v(m{ z!~%1awO$}`r~!O8NlpsHf+z2PhvpPV`~PKZt0pTJsvQzF8*YmFqg1jpIV|W0j$|l_p8Dlh3!amxaetAWQiV8Ygv(@P z{dQbN5Nni9+?%S3#*t`N8#{S8^e!DsnOa#1i!r*I1#?>A3ZxY(i?6PYC_@p~=1_q0!s4q+%i?QT93!gXL|kQD z5g1o)&40}%LnkAHg+71&LQUV#o;Kuz~^2S=$B)Na~ z6Rd{et-J%mSZPzS{@~#5<0qEiXjdr~zZ}0U(o~cq2l5}sf)MFKMnU+Wt8KH+%Ed`h zmX+euFt%fhjgJ}lVAL~_a$j|R!7~dL-FiS zU5(t+-|uCX!5%W0tWcJC7wq_Av?0^f-?i*E+DB^UVr%;IV|ROW%i{J)ICb%X-bo&# z7f=hv=4@6W!kX(}b}U$1p_`gSCya}FGNCSmPN~KN<6?gt1-yt2i%;{BJ*2=9G)XIA z)oXD}Xutffv`11wK4L(w;W`^vT{+I&+9+6RNo3)mF;5pbpfy)U>2=x;@c`hLzBL#; zL1WTw7(4dXI|(h;HrL-uGyjcs%xEbAwX1wi;*1swg7K5j3s2ZHE3&=hb5&6=HUa1N zq~d^yfE2q%F%h3-$md3h66Gi|MW55%)T?qrpl(zHINAs|-8v(Rs(V~WAA;nLt~Oj8 zE<%&;zZoIWncYlUf*jDnOvou(A~n(llBYQJ+%jKT=$E%>KaLK(10Ktne{Xkbp7|E^ceg56Hq=in8< z9j(H>xU4|=R(e{%bD^BIsc!1p{?6Oa*9ktQBne+9Ei@O+HWrgLK)q3-Ww2Mx0I2W) z=7+K{3MW?*n=bp@dV{k0i{9x?zTJ=HXBsT?P)cV~k!DPV6^sqXv|-VZWB7!WSrkDo zO_$clAiL60h&Zwzd##ubfT6jQt^`Nv!Y)|Hz2VeH_2(aLzZyL_P1q8j9`0?Dn1Jy@&s(sW)Goy%>QU8oZ9RG1=)pc3a*_t zl3zs1eJ0mts1@q4Wf(rzNLGGn)Z_pVe!IFn{z<(Y^a)*5bl>T}Wi!E=WHnTd%QBg< z@7>rS!WG>An{jr}Nf@`S#SsW;=i?nKX-*Cn;5$uBzRg6r!gVw<64TNI8SUfp-;75h z2Pf@j@iV;BMIl1;7qg$zJ~d^haPfZn9c&e#dvfZ#8HpQ|J|N-Dsu7gu6c4wlHC z?ON;CQ!b`!-`(&ZO%s#_3AH8NT2i9h|Ji&uo$+8M@~ z*uP2U)B+1-8l zgVpX`>xDbuDI0f|R>bOQZ`OzO^)&8E601>)e$;+pJGgV6A&>(f+=++D$WU#yMJS)8 zp+MBctIsG#b>$68FcCtL7q1Q|ZAJMTe4j$7NxRmuuC1)9be3OPzHr0V{JV4^>hzO_ z_fJbV!-G#%z&9?DumzljpNqwZ4s`AWm{1BC?dti2pYSUf{Duj!S0KNjsJ4lkD>>es zTbH!q%4@5xJ3|^M87eYTSPN*#e283n?!EDTFXKA&Y6GozIyz?!nycXysw`TIxf%r+ z%2E>Ca+*Wl0>a1NGO$(t2wdhFGP>3rEh%MjbmZiqE(A*Gn~>XuR(s{f$6C2noF!G? z+i;7f*@CCz#f&l=JPkSGYd)h$<>uIpD1oQb=YbRiJF{%KACM2)UdM5s{IdcIkA7uD zQ91+UvhGTT5%6)s^eIP*Y@8wGzt8r6WX^S}-E9)C!Y-&F(4XWYWcvmS~aaaSD5IPk0kts_QAq;*P z89~IrrXwP@#zhf~{94YsY6(xZ!FmS8MvO}sYyXhB0`i^W3*!bN5mo!&R#t4zR)))X z4|#HQm+U7#*?4?#jwc(_7g$&={imxer(gJ+td++0x23@xd-SiR7pW(+*iQPL&3GaZ zl#OXAXOt6%e7vJ-Rt+kyqO=077oO{6pKA)rOGQ(~%D-2Qrme-&j%k`M*jd)=$zYh& z2sPWvaH1c=``;Q-B{0~! zzme6=0VuJGHw&uL>ZO5oeo*NtSOsgNu;&aV!tCXy2?_oPKcN`C-@+&&)je%Bt#T=J z!x-Wuu;{kWM-FkjpN@1V(64mXCVqZfvug*!=NBZshn&XFV>0M*a|wiKkSdn ziTNTnieHoZzcBbhp?zJ)+vOIQ&BGconnpc4yWd|ZID3)GW*HVl;75Qg;y$`8b$U9M z<=70dj0zY4!cY@BC6!Hy&J@fpqfC~cp8QJqJNLKl0iJZWiq4)LbnXH!%KxFT|S+RW(i$Wca=%r0zdt_O=$2^ zj_w2gS}!TO95jr1qiG)lh29j^5^>K|Y2{q~n50SmHEN;EmX!n-hPxXdhCXDBy#QYiZD%asM+WbBh0n zYdZG*7@7s$C5@6q`X(;PGe(?L@{`|teflY{PR2}@M&HTC(6*!4D_{EZ%c$3doU@6q z|CLeC#+`o`iqLoO^;_HYZKPwUC|_LGRk^yJs-WN7kYa#xkU)~=k(Vlon@d*6O!9ky zWH~5G;!xV?;ZN$?I-8u9LGeL``95``5CuZ?9bP%fxT?C)0c+*XQor3%^h$+m$h#V^ zrZtvVT!{;aJ#+oEhMtRHcg~;5tC~mxlBpC-q=;YkD+cn8;BD$jYDQ0!9)6>u5npMv zalI%U7xg++MvVA}URS>;k>nVRUNxWH+bTwpNHYA4RL9!n9k<2Mt~`2T$~*a?34wn5 zM)G0|hJ^j84YlpNdf#UW8oGZE@VuJm#+%leBK)|vDJ&{A>gA*L&wMa#8DNNUHU`E+lrgV}?3Y1n9SO%xA` zlOnh7YtF zZK^9sc#AtwY!QGqCn`7sK;b24vg$Wi9)SGS<|d}+_RI9mdx!$Rh=*-zg!QUdCcoSL zsGRW|8~-F|ixEd12bcSBdP4>bjxKnVclJKe@rLBW;02hCR6=TCX&AOy5{kaFD=*$T zb0Q8~J=btPDPpZOCQVq>d%F4VNH@!Bb@D}`wnE`DvAgk%LE_tKj#GDR(-(##^0e;n zEV?(VG{5RarqW02)Nr5+TV}ik#x3KB%(rHdhDhoR9eZFBK7an?of3W%^}zbOXOHXN zx0iw?H+T$HFF#HHJunMZwL}>il*Pb8&yi=t8kxfyy!I^T)~`-eiq-JwMGN1et!c-l zUeU zLg8xvyZl@-{K7}%4~s)dlJ+!w0Y7dfYL32uKkac*=b&c(_WY!;^x5}T z2ao#u=7*j!RUB7#l%RlT4XJRAP`LT}mCtsL?e?heSkj<-kX17Aw3(anjSvPJkqQk+ z?sUlHo%C;B7`?_iGA=vg{;Z+9cNr&iy9`$bjpfHfOz^~p`TEO>6 zn*E!1Az0+!l^ge1V+?I$sQnhR*<^FM(AgWJ1NDuAm%(J^?+49A*@GguVt`s_2kibw zoxZ738fD3%RZ;G8^i}QQ{7avmrO6W?{xUevyEOtf%B(i;p#j9L;9fBM2-Mq586R+d zlsU@oV;ftDiXQ-wi(M$@zWFqlfK#9_NTg^xZd=6gF}amGbG(zc@FQ5``03X`%=bCd zL4*Uf9HA~VMV>1Z;&7^O+MFeiW8 z7joYcc0Pe$xWXiDrU~HorC-vM-xWGJqtS&!(%vRrDC>E8TwOQlrsfZK`={pd+*W7%f*MjH zlx+UYf>2fSl@nxnf4;^ycwK*WAChRWxXnCE!W*J8)KiR0OSS8^qeVLo!r;`?03t?{ z^seetau$3iIvAWHjRUK~mWT;Mh1-yqWYHfW9%(Q z`F^uVz9q`=`n+?Ar6`80z&J>n%IHAIC;XUOfpXoC_ykz*kE+$bQN13eMh>9yX6$jn zs~)dEz)KMzF;&~hg+w=+3d7=&E=$(KmAtgi*sR= zwW3=Et!lT~dc{_Q3QXHiCyL*l$J=-?;60`c3DPQ9jg(KaZ8}z6N0^cOmuJ|Bj=kzp zGKuUO<75p~PjbMYN_6#F;~YXTbHms=mb?U9Q=vAz;!axdR)FJw-0g-QF_c&~tLtw~ z85!-J4TGh7NJLDj6&MMWlY~F3-V314qsj4v!u8WboRaPgNv+ZxwW&Ky81%Dbt~g`o zU8~#iF-`?bOGCi>nQj6H;e^cf9|m7}oy)+A`AtoW=DS@dh>Y1T`@&Dcin`f|AJ_j7 zK3}7#b5upFSR&1YTk!GGRLzTnd0*o{9zz*aaAN1JW@xk8hxf8SRyL5;?R6{Xqd%}%W7U=-bRO|8r65~~Cf>$cK3U;}<#(2UYjqecGNd=xE>jdL=;g|$n zgfm5MMzn4=y<4YW8KuSMcLBrvSE|9X=w*m*Omwyv#ZP$_73;MPUk8H<1HZ6+N_;p2 zl7)}QhkZUub=43XK{cS^LW8R0oOBgpOXPmH;}Sl+H0GQn@bk5O+w9;+7oI8^%k%Rg zTcU|Bfp~6wsw4p$H_W7Hj3r`PFx@ym1R<$3*R*$LBeYGTVh!qn!X1a&VAY}x=p@!5 zo_Xt>p1%5CN5=M!TfeQ2AMp|)6snfP{*M{2g?ozwu6o)c5*&RvzM%-eAIW^+(ot0< zhRiR|X?p_wqKstdGIzJnJOadyAdiDrM{m>rGh*#ZXL}_$l||6*M(kqKhMy%KV9sIm zz9dns=;nFfLWC}{<-?nEwl+yYcQYqTRX>KXTYU4*v$S~yqltu@>l5#yaY8E~O}806 z%N0`*(XZbr-nJ2!D;21pzy5hvs}f`Uc~9A!AG#gHh*?oiZc$^pK=zhq^S^RB^Lekcx1K)u}gU9%-q@}lftfFh)dxTM?=qjSj*fNYN zGChu1J|~@}Huk*}R~ida?R^dsNfgEM|0zEnk(Cn+j(JWG&Q(FB`QzgQ7Gv0jWyTd5 z0s*06XKwWP)bQBI9n^T|aZV>Q@Pg!mLDa8Q9Sw|el}aCHw9~!eg{D-;f?%yLs{It6 z9h&01FXK_8mmyV5P!t-#(*-rGYT z^1DC2NZ@yW!8$P$<#?kMtF*KU4Q&ql zM)kTvjeR`TDwRbks+Kcm-a4uu8%mKl$qT^h55_{B2mby=Mvx}|j^vp;k2)7b?LMDq zb;I_iM(;28_lz*RRkQ5Vqae#`eBPwLjLseRUyTtyYrPs3Bgu1NRNOoQ&ie2K;VN)> zxBgqYnL@%N(3J@zpDlL-aT3D?!<_Oc?*9Ty8MNl(-%*U)7Ue0n&5fPH6(c2xOvExc zb)j9kIXcZFCLC@`?aU#T0E&o$C}={13t{VY z<9eyAh@MUr_j8@@;M!DZ_URmE28_0i0cBos8Y7G@4)C(}>M3z!b}M9nusz8hnIzr; zK_LJa16G;>+Jh|t&xKmms0AKOK`-pW=v_mKi-=;GQGX*Qgb|02XmR9gfoWCc^$wtZ zQx2-vRDUt3^2EM4m1-;=kDMbVlaYsC9GIW1JbM1`ZVmxO6X)a8x6| zp*9f{zf!d*ySRw(V4hw;@t7M3k$=4ftOIX3a9LT`!0$0jMe_(;tcP8>ymPS8zUGLo*i>PZV>f%bktMOd?Curt zVI>&2E@n;`d$fdJl@Ah~;AyaiDPX%x<(?ZZc^xbr!G;IM{4^Vf66AUH*K=u&!a^FVMbOj|2VD%!f{hphJ`*e|`KMs|_1~C#uHvb$mYTumcJDyDOMox#kJ+MdDbuo8Ny&zCDbvFMsa^ucRl=`Ipc<(8Qa!$>%vnLY@Pb-;+hy9 zU&J!brybf7FvScN-05LJ3t6ZJ>4vg9jJnHBtFydj0MJu-lqHZx&4pX?oI+cv(g%Jod zx&4vRP%%6_CBC8%@2q1R#_Gwk47=MyHevi0Ojdc8p`nC_(Wk~YZYMm|bk{<0Zsm=~ z2J=gVBU(_|8MBeb2M`j@BPP{Ce3y-yK!6A%CF-w6V>Vd2G;d?AtDDGa6$Sgm6F<0$xmq0r5>rPhN**)5m-pvhFT+ zYc`OvRX3D0mf&rjS~2L}6a%9Lq3Q7ZL`B>{(Rt#ia1d#?zEcGjxz>_OQ^_t_i- zpxNakCQc(_c6@C;lspfmt$%LzwQmQzqH2TcGfgTP7TCBN(?onI8ziVAgarw!+Rpo( z_^R|PRU2wi2sYEvLvL>*CP+OQG>fFfeXE(X53F1j45&h59ONjLz4FjZ!6Thy+e4pz za}@?u<+x<)Z+xd`rfbC02ammjG-!&J%DhHMns#*08#NQN-e!bLkAH>D+|E5UBS@{r z-$!d=o49&&^=Q`jL&>Bva~y)KWN^LkP&XOrlwTJn(O-Uf+DknhL+898#(y~!c=5%X z0#B-!4r$2myJ?K~M^Z&SNjPZum25_%io;Frh0_tj&G4fEmRvgo5Trw)>^Yf+onLQ} zcpB@VCxT))iH6b(-G6N{u8fUorqWa%*lK0qqPOi~y&Br#Yw*ZeTPE?00=a1#O7Qs( z%)CrwM&pzVEnaK(n_C@DyCWqFOu11Tw}B%OlG$J-iKj5vo5s+)!x*V>dGO*qJ^cjz zu2-(wFyFdT?RGmxe=5wM<2ac5o;1KZ2JhaEgg#K{WcgDCSbtkF%!XtOJ<&(;VeDrk zCEajfV-s?aoJE##btq`ABPQ-5m}T3nc$VKAu9}*MGVfsb8@;w7;(tvLIc)}-RgT8eZZT@Wj9$&?ptQ}71={I$%Tg9Gb1)*O7{7bNQgxbk zEn|RrLPgY9qFix+#*AlP2Qh4l3B@#d_0vqyjBGSGW5()>n@^R++pi2+$lElR9FWD$ z4m=|z1~C-(Qa8pUB|{iUR4E_i%g94>)tdy+MTzog*neDMP6dike=F92>}bPBbca`s z@GWzZ0p%w3ktHdtT$;mYTz&rp@3khESsUYPO8X!YEr$WM;7J1!hca&tLDA1>ixr^V zDuE*(`VAh3^uPf|; z*cgD&LBWX0n{jkqh@jc9k2-}5Pu~6C9R9qX`G1d&Rfx)v%B^U4QDl+qmcn4@`R!1n zkq;k9*zV*P&%1rb>i%J(BMT)R50L$LcA2^pOM3lY@xVCf7@nZyh{+)ZIf4LjioMxm zWf!lmOHLBKd<+-5?R1O>CJkDc1&S`%NG|S*Pi!v4ylLT0T5q*N zL$(Ny%bCPDjEKY6+*MHYLPq3KpvIuUVxkBmC5oydnuwBNA!MkqGbE&9lBP2-nDI1f z(YQCNw(B-&&_kHvFfAsvL4f!Naf#DrdhcCjhw4=(fK}nOOj# z5TO8|PmuzL5N2Ql#J$d@0Do(f08!!uA>-~l!p%BJT_MuBJxgh7z)`t_)p9rfg>nfU1Pwr(0_nrQmIH{0t~DdDDj_5URDBQw08s^v;Yqr4uvHE5fuRt3 z5)kNMox4ZJ*?(|)jO1S;MkOH$QR;zy1o8%P@aXCYyI?_NROYW|xUvFoNXdB6h%lCx zkQBvML(i{KZf<*{>Z#K8v*8KS_}82WVuoc8O)Y|Mi9T4Xr>R&sri0pe*6fZT+)2!q zIAH|{nSq0uXv;N86foTsu`<%dBPFkd&NBtlpjLIsO@AmxlFTLP$Jn}Nmn=27V?oib zL!>a{i@mAN;xJ~KLa$P7QW*28hc6OF*$;l(@G^!9D9!FHr*9UL#G7z9HlmS_7h)3^~IpE zUAo*9s5UB!BOvX{`wlpyvN^4=3HC)ivZN0mcV=O;JZwk?R~@mmsEru%)s>)c%TK`M zczVwNnKp6b=l)!j`*)eCM?hCbi;sCl&sD4zsDEVF$hnO@PC(D7oIWDozyR_hDe{Zr zl5_8US}s^g7%RAnGKpBg2qCoOwvd zNPh_dieM5b8D%Y_^7(xrzO$u82|&;jA`?|2Nijb6fS@~m$VC%O$TbsE1SCko6qJc1 z5J-o<#5X`QAp|2Pa7XrFk3V&|H#5Kx0o$=tK+&@dYKoX7sYoUxCRu_;0xAgx0y!`f z-y&=zSbHz?J*TgPKe2&>iFpo-siEMmug$9pZ&vZby7%!3O&%5lv zPX-lPD%pX!%oq8}3xa%UBPEEuL(Y-{L(vv0E+1q4e-5K0p* zBPP-#2_Ufv$j;k$;pv>IDR19!2g)d$r}Ei%ko6-blnDgNWs*sjcOh@B)PH8R@6(x) zFYiJINKmG00HBEHdeFLoGE)gmNeA^9W4iuxI4@nM3CPweN;TbyBT1ocG%lJVFD$sQ zyud32afhI@qZn;4KDJ5(I!#rpN~8Vi*KluD8A&a_k^EPlOtf?(CP<==AT6Ubg;*mc zwt&SDZ}PJvCV!7hR*O2Z9e>3ugtTt&ybzyBF9<-;%$rkuln5bnR$C@NF7)G}4${aUza`!yC667%w}zK< z?EFmM7JB~i6XsouZ)bxul_Mo7ywe@US>NMIj3n(Ol6iU^Fk&m zwsbg8H-H5+wytWa83(tn|*GKY zz0p-it?&cdDBOttS-#!)n1l%qGt6woyk=tPisAF<(HnRpB@Trq9&MvE0r`0lE$kZt zLA$Y89=}f>S6>l3Vn__7q^w_%g+{XeaH$ajR(*6&4qlpMc+N0*I; zjVBUq6dmWYE!&Jv4%fJm zB@l~G6Trh$lSi!KN;R*aRv$z?ym|g3C3@%Wxl=4??|*qA)|sM*@+3smK_0X3&zG_0 z+mZ6{`fLClG;z=|@RG)04#3vIws+`dWmL5U(vKG>PY6CRkp7?F{@?ZJ|0nz@|1bE< z|Bv@m?d<-U|A*`U&;CE``~ScHUyu5K$L#+%`+uk9=l-AI-p}{{PwD^n`hVNo{XhNx zhx@hJ10N*l+8@&6+wAxy_W3}A|Cg=LxDUXt-P)jhb@5Sg##s^GrY zb${1h%t>jbKfhHO)0w_RBWBP9bGdx6A7 zu2yPf$oXlxHN_o`n8bSOtcpB}U!*m49m$x)u?|vnuK9STFKUTFI6s8?012Xs95> z({=70OY^zLZM{@U1+8hRV8J50!wz;`>jZiArRYejs2eFba3DSy2mHOU6&$FPh4)B- zkS{_y9tVEQu@jJ*MANUs|J-&N-RbcvNVl#%I9SsoCMiR3Ku`Z5!t4&`iTCx+u77?Q zbKj17f~TzrVn(EbgraH>(%ZDF1#y*6<53K(ea=2pEri_G8)a zQE>PbJ+hLP$%@E~CT4rB}#BPJY%DTxI(kX(IxwmP!ygomqU+kXeEZ70{u zOCoC{C9Z1aY{2?-LVzxb)I9%j6RbQTm|k5{V#VBZ_IhrT)% zL%@EhIgpV5&-Ro5(yF$IRez`#eoUf7{>c9`n>a%6;y_&-NF`lTf?; zfCYo_ijp3YPLd=(21oE;(;CF4q$XeWcK_G+fARmzf-7ZEkN0&yZAV8 z$jN`B<3BRA%E<~#}wLYbid!-#+1gwBPL86 z66UjsCeZyC8-Is=^L_e3UiOXmWBczI@%wvu-=qI8YDmMn=-IQa%$Up`Jbud0t8KPp z1yu}DwY3i%b@%PLPAqk5@An~qB$Ot|$NzqgdHZSvJv`r7L_i1s;_gVNBPJ3AgTS9) J3L`u{Jqm~eeZ&9& diff --git a/wscript b/wscript index 9107e96f..ca7f8fd9 100644 --- a/wscript +++ b/wscript @@ -194,7 +194,7 @@ def configure (conf): if debug_level != 'none': if compiler == 'gcc': if debug_level == 'debug': - conf.env.append_value ('CCFLAGS', '-Wall -O0 -g') + conf.env.append_value ('CCFLAGS', '-Wall -O0 -g'.split ()) elif debug_level == 'full': # -Wdeclaration-after-statement # -Wmissing-declarations -Wmissing-prototypes @@ -209,7 +209,7 @@ def configure (conf): '-Winline -Wformat-security ' '-Winit-self -Wmissing-include-dirs -Wundef ' '-Wmissing-format-attribute -Wnested-externs ' - '-DG_ENABLE_DEBUG') + '-DG_ENABLE_DEBUG'.split ()) else: conf.env.append_value ('CCFLAGS', '-O2') else: From 15cbd44f06a71438cef81ea50825fbe429c28e15 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 02:07:03 +0100 Subject: [PATCH 0754/2970] Use existing utility functions of WAF rather than our own --- docs/api/wscript_build | 8 ++++---- icons/wscript_build | 10 ++++------ wscript | 36 +++++++++++------------------------- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/docs/api/wscript_build b/docs/api/wscript_build index 7733da71..8e72edb4 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -7,11 +7,11 @@ import pproc as subprocess for module in ('midori', 'katze'): try: if not os.access ('_build_', os.F_OK): - os.mkdir ('_build_') + Utils.check_dir ('_build_') if not os.access ('_build_/docs', os.F_OK): - os.mkdir ('_build_/docs') + Utils.check_dir ('_build_/docs') if not os.access ('_build_/docs/api', os.F_OK): - os.mkdir ('_build_/docs/api') + Utils.check_dir ('_build_/docs/api') subprocess.call (['gtkdoc-scan', '--module=' + module, '--source-dir=' + module, '--output-dir=_build_/docs/api/' + module, '--rebuild-sections', '--rebuild-types']) @@ -24,7 +24,7 @@ for module in ('midori', 'katze'): '--default-includes=%s/%s.h' % (module, module), '--sgml-mode', '--main-sgml-file=%s.sgml' % module]) if not os.access ('html', os.F_OK): - os.mkdir ('html') + Utils.check_dir ('html') os.chdir ('html') subprocess.call (['gtkdoc-mkhtml', module, '../%s.sgml' % module]) Params.pprint ('YELLOW', "Created documentation for %s." % module) diff --git a/icons/wscript_build b/icons/wscript_build index 72a2326f..0687a70c 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -2,19 +2,17 @@ # WAF build script for midori # This file is licensed under the terms of the expat license, see the file EXPAT. +import Utils + def add_image (bld, category, name): srcdir = os.getcwd () blddir = bld.bdir - def mkdir (path): - if not os.access (path, os.F_OK): - os.mkdir (path) - rsvg_convert = bld.env['RSVG_CONVERT'] if rsvg_convert: - mkdir (blddir + '/icons') + Utils.check_dir (blddir + '/icons') for size in [16, 22, 32, 48]: format = str (size) + 'x' + str (size) @@ -24,7 +22,7 @@ def add_image (bld, category, name): elif not rsvg_convert: pass elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): - mkdir (blddir + '/icons/' + format) + Utils.check_dir (blddir + '/icons/' + format) command = rsvg_convert + ' -w ' + str(size) + \ ' -h ' + str(size) + \ ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ diff --git a/wscript b/wscript index ca7f8fd9..55b8f85a 100644 --- a/wscript +++ b/wscript @@ -28,10 +28,8 @@ APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: - git = subprocess.Popen (['git', 'rev-parse', '--short', 'HEAD'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if not git.wait (): - VERSION = (VERSION + '-' + git.stdout.read ()).strip () + git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True) + VERSION = (VERSION + '-' + git).strip () except: pass @@ -233,11 +231,10 @@ def configure (conf): # if 'soup-2.4' in conf.env['LIB_WEBKIT']: webkit_binary = conf.env.get_flat ('LIBPATH_WEBKIT') + '/libwebkit-1.0.so' try: - ldd = subprocess.Popen (['ldd', webkit_binary], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if not ldd.wait (): + ldd = Utils.cmd_output (['ldd', webkit_binary], silent=True) + if ldd != '': found = False - for library in ldd.stdout.read ().split ('\n'): + for library in ldd.split ('\n'): if library[:8] == '\tlibsoup': found = True if found: @@ -292,10 +289,6 @@ def set_options (opt): add_enable_option ('hildon', 'Maemo integration', group) def build (bld): - def mkdir (path): - if not os.access (path, os.F_OK): - os.mkdir (path) - bld.add_subdirs ('katze midori icons') if option_enabled ('addons'): @@ -310,12 +303,9 @@ def build (bld): if bld.env['RST2HTML']: # FIXME: Build only if needed - if not os.access (blddir, os.F_OK): - os.mkdir (blddir) - if not os.access (blddir + '/docs', os.F_OK): - os.mkdir (blddir + '/docs') - if not os.access (blddir + '/docs/user', os.F_OK): - os.mkdir (blddir + '/docs/user') + Utils.check_dir (blddir) + Utils.check_dir (blddir + '/docs') + Utils.check_dir (blddir + '/docs/user') os.chdir (blddir + '/docs/user') command = bld.env['RST2HTML'] + ' -stg ' + \ '--stylesheet=../../../docs/user/midori.css ' + \ @@ -367,7 +357,7 @@ def build (bld): pre.close () if bld.env['RSVG_CONVERT']: - mkdir (blddir + '/data') + Utils.check_dir (blddir + '/data') command = bld.env['RSVG_CONVERT'] + \ ' -o ' + blddir + '/data/logo-shade.png ' + \ srcdir + '/data/logo-shade.svg' @@ -427,10 +417,6 @@ def shutdown (): Utils.pprint ('RED', "Make sure intltool is installed.") os.chdir ('..') elif Options.options.run: - def mkdir (path): - if not os.access (path, os.F_OK): - os.mkdir (path) - folder = os.path.dirname (Build.bld.env['waf_config_files'][0]) try: ext = 'MIDORI_EXTENSION_PATH=' + folder + os.sep + 'extensions' @@ -442,8 +428,8 @@ def shutdown (): lang = lang[:-3] else: continue - mkdir (folder + os.sep + 'po' + os.sep + lang) - mkdir (folder + os.sep + 'po' + os.sep + lang + \ + Utils.check_dir (folder + os.sep + 'po' + os.sep + lang) + Utils.check_dir (folder + os.sep + 'po' + os.sep + lang + \ os.sep + 'LC_MESSAGES') os.symlink (folder + os.sep + 'po' + os.sep + lang + '.mo', folder + os.sep + 'po' + os.sep + lang + os.sep + \ From 95e629679b50d7074aef284485dbbcc152c0df04 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 02:10:02 +0100 Subject: [PATCH 0755/2970] Decrease the completion test items slightly --- tests/completion.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/completion.c b/tests/completion.c index 1932f6bf..cd947e36 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -84,9 +84,9 @@ static const gchar* protocols[] = { }; static const guint protocols_n = 3; static const gchar* subs[] = { - "", "www.", "ww2.", "ftp.", "sub." + "", "www.", "ww2.", "ftp." }; -static const guint subs_n = 5; +static const guint subs_n = 4; static const gchar* slds[] = { "one", "two", "four", "six", "seven"/*, "Seven", "SEVEN"*/ }; @@ -151,9 +151,9 @@ completion_fill (void) items_added, items_added_effective); /* Since adding items when the action is frozen is very fast, - we run it 10 times and take the average time. */ + we run it 5 times and take the average time. */ elapsed = 0.0; - for (i = 0; i < 10; i++) + for (i = 0; i < 5; i++) { midori_location_action_clear (action); midori_location_action_freeze (action); @@ -165,7 +165,7 @@ completion_fill (void) model = gtk_combo_box_get_model (GTK_COMBO_BOX (location_entry)); n = gtk_tree_model_iter_n_children (model, NULL); g_assert_cmpint (n, ==, items_added_effective); - g_print ("%f seconds, the action is frozen\n", elapsed / 10.0); + g_print ("%f seconds, the action is frozen\n", elapsed / 5.0); midori_location_action_clear (action); g_test_timer_start (); From d9cc5a659274d65bae6d6702033e26d4289645a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 02:22:00 +0100 Subject: [PATCH 0756/2970] Run tests without requiring a display --- tests/completion.c | 2 +- tests/extensions.c | 2 +- tests/magic-uri.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/completion.c b/tests/completion.c index cd947e36..e6ee0768 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -285,7 +285,7 @@ main (int argc, char** argv) { g_test_init (&argc, &argv, NULL); - gtk_init (&argc, &argv); + gtk_init_check (&argc, &argv); g_test_add_func ("/completion/count", completion_count); g_test_add_func ("/completion/fill", completion_fill); diff --git a/tests/extensions.c b/tests/extensions.c index c8b95e78..33b81e2d 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -90,7 +90,7 @@ main (int argc, char** argv) { g_test_init (&argc, &argv, NULL); - gtk_init (&argc, &argv); + gtk_init_check (&argc, &argv); g_test_add_func ("/extensions/create", extension_create); g_test_add_func ("/extensions/settings", extension_settings); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 38046f73..ed74c43a 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -25,7 +25,7 @@ main (int argc, gchar* uri; gchar* a, *b; - gtk_init (&argc, &argv); + gtk_init_check (&argc, &argv); search_engines = katze_array_new (KATZE_TYPE_ITEM); item = g_object_new (KATZE_TYPE_ITEM, From 19ee2c16bf61b14280d719f495b94cb085b063ba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 02:34:05 +0100 Subject: [PATCH 0757/2970] Handle running MidoriApp with no display --- midori/midori-app.c | 51 ++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 4579f845..0b832258 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -161,7 +161,8 @@ _midori_app_add_browser (MidoriApp* app, katze_array_add_item (app->browsers, browser); #if HAVE_UNIQUE - unique_app_watch_window (app->instance, GTK_WINDOW (browser)); + if (app->instance) + unique_app_watch_window (app->instance, GTK_WINDOW (browser)); #endif } @@ -392,6 +393,7 @@ static void midori_app_init (MidoriApp* app) { #if HAVE_UNIQUE + GdkDisplay* display; gchar* display_name; gchar* instance_name; guint i, n; @@ -408,7 +410,13 @@ midori_app_init (MidoriApp* app) app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); #if HAVE_UNIQUE - display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ())); + if (!(display = gdk_display_get_default ())) + { + app->instance = NULL; + return; + } + + display_name = g_strdup (gdk_display_get_name (display)); n = strlen (display_name); for (i = 0; i < n; i++) if (display_name[i] == ':' || display_name[i] == '.') @@ -562,10 +570,10 @@ midori_app_instance_is_running (MidoriApp* app) g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); #if HAVE_UNIQUE - return unique_app_is_running (app->instance); - #else - return FALSE; + if (app->instance) + return unique_app_is_running (app->instance); #endif + return FALSE; } /** @@ -590,9 +598,12 @@ midori_app_instance_send_activate (MidoriApp* app) g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); #if HAVE_UNIQUE - response = unique_app_send_message (app->instance, UNIQUE_ACTIVATE, NULL); - if (response == UNIQUE_RESPONSE_OK) - return TRUE; + if (app->instance) + { + response = unique_app_send_message (app->instance, UNIQUE_ACTIVATE, NULL); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + } #endif return FALSE; } @@ -617,9 +628,12 @@ midori_app_instance_send_new_browser (MidoriApp* app) g_return_val_if_fail (midori_app_instance_is_running (app), FALSE); #if HAVE_UNIQUE - response = unique_app_send_message (app->instance, UNIQUE_NEW, NULL); - if (response == UNIQUE_RESPONSE_OK) - return TRUE; + if (app->instance) + { + response = unique_app_send_message (app->instance, UNIQUE_NEW, NULL); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + } #endif return FALSE; } @@ -650,12 +664,15 @@ midori_app_instance_send_uris (MidoriApp* app, g_return_val_if_fail (uris != NULL, FALSE); #if HAVE_UNIQUE - message = unique_message_data_new (); - unique_message_data_set_uris (message, uris); - response = unique_app_send_message (app->instance, UNIQUE_OPEN, message); - unique_message_data_free (message); - if (response == UNIQUE_RESPONSE_OK) - return TRUE; + if (app->instance) + { + message = unique_message_data_new (); + unique_message_data_set_uris (message, uris); + response = unique_app_send_message (app->instance, UNIQUE_OPEN, message); + unique_message_data_free (message); + if (response == UNIQUE_RESPONSE_OK) + return TRUE; + } #endif return FALSE; } From f517e3c3c6ff18c76cb4538485b69d04e42b3b92 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 03:51:06 +0100 Subject: [PATCH 0758/2970] Patch WAF to run unit tests with a proper environment again --- waf | Bin 78551 -> 78475 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/waf b/waf index 1c16d7f2db46247ad2b96dc829fd24e670634eaf..fe588a031a7308e1fdf29ddfdb1c88501332e5b2 100755 GIT binary patch delta 74699 zcmYg%Wl)?=7c5CgfD0Fg;I@k{?oM!*#U;4AyF9_&7I%l>?iSqL{RM)%JKTK#?x~up z`89QBYNopT^qHkS_{cr@8lG=t#@uGyCM-Pc9A+G>+{Rq2#wLawENpCMoLt;2Je;h| z30mJokr=7}k0`4EH3(8)^bHq*TwAiq;Im;P@bOV2W%%*`1w7m=9GC*cn6UnT$$;M9 zAVv`5GaTHPv(vwob;`k*k(!Wt_QsX|5;Jib5agElN88xUv98(|g{iKaEi24K!O*

6c?nU=ya-n=Osm8+rD$WtzeiR?4Fo#P_94RL@pTYDTL z1r$p=-+x=!HQ>c{X{CLCW6+M&yvMbRYjdJ_-&~bpopsjsCbW6I=qm;61dPzxQSKXkXM4ZozR~&6>Aqz*kZNw@dg0ywKzO<& zeKfgY?$(;0zw+RU^RO{_egL%kUpSoUZJcygp4|w-j(yhbR&FoMZJTrS+(){6zBF&N zFK{vX+>qM4U9@g&?qwg?`(AWzZuw?kRabL4@Fi%9A)(p00 zjiCPiqMr5xM-0SBC5N2|Vr-hgzG=dX);Pu&ya%e6y#0sHTh{E&)0br~Z{Pbz`Lmt}^Rbc~b0?phR=1JnoF8C5 zd&7g~_9e!a7kj48ht16k7xymsms9rpkw39j1-}2C+X^iD#?s!b!W}ew-7Qv!E_s_L zjj5+hbaEA5v~POxZ2;yzeXW(GjOTD(VQ_*uAnlIzCK{iIE{csneVbGFE#dMFegpNf z>;t#O%}4JBoDKRz!A{03ucG}U!`qw9j*T_F=yUh%kPLf`2%Ncf9hLLbT%FC7z7m~N zRE3aV^$5OOio{(9_SXB)51UDh*Q<@(+ZkEYmw#0yX9|RKPXSWN%};;9Ja*5WQ`J9E zf1wq9b+4wjcK!O$^t71+7u%H)>Ce@7&Q2Fzf6mKevp9l$P~;xCyz}gO zzqZ`DPwnQlzvX-3sYaE*Vax^`M+BDgc&!=c0dg8P;F3nM;=0I4{d085ni_e{Yo9043$;xsutA|iRNJYLY8 zMCp+LRY-!Bkzr}V{7msLFaLrca29Z%rsMQURY0;il8r zKeNmKHYo|Zqb?3fl?WQOWsOyt^@{p&2RF<<-6usM_QM}8nz}S>fSr0eg=(jtBDVmeW4az?u(h;C|aYd>FHaRf1H^yt{N^oT8T6c?Q}=3>Gb z7y~Ug>56;%qLZvd*VK443RsZ?5|Wv6#`1Rcr7Rrni$>>`vB#u;-`@Y@*`g%*Q-QP8 zqhlZOXtH@X^E)?}^^4tk|CK9LTDu);PPeI-x2cCqytlpgpRzHVma7+mg*lNG-3Kup z|4uJC83apWsjF#B&1rFgs=`{cGVPOEJSJe5XC(~BOcSO0-9`;%IhrPRmO=@{xQnl$RNgnw4i?)RN9%Rc1+@V}MaK_)|z*)UmO$V~gR{Qq^h81rwNINy~+e zT8Rz9Oj%*`1Ka5RP~Rq>dzE$i^GFnEM2s?S24oF!en)-oTP#)@4$84JWXLdzyM zN1$1oKW~vHoC*#JWDN>|7EsdE0fY0_c=Z&tA>d_M@(2~fd_$x(sR$Ia3Gp9`Hi5L! zxGZ2%sMG*d$NFALF2pH%P)Hi^f0+ z83o6a;e$t_Ols3DSfMZp39-`TC>3OEgI@4BC9F;cT8lj^lPq74o(_N@5#UIIv`8>m z%8(Vm!m@6JN+b&OH6%EJl`L!|iQbZ3xp$m3O)9?tDlu!UO(!E?So1?!Q#oD+q#Un; zGQzH+L>r$#Ni{1^1<$e5p4IK|5F z+GAK$akCby(b$EBamMNr(iW_r0$GcLXvI@C=i|egQ2f|j!$vWR>Y(5RDlLmL`3!kz zViDAgm4I#nJl+%3WM#x=EMrrMZTQ;|_uoPs5t{TPFbXKZKo%!4u52h_$w^=&A7aQN z9uXZhXGI@xX3$_6RnH)ytpctYO@La|)i#QkX+~I-MgLw?Rkg-8nJ0u+=1V{@mzBrx zRPfTI3ydYAIg8BHX;aH!tJ=y|3mg^890VXn*rKq6wk>P_a-DqL?|P10Wf2vq34=Um zIA^+LBrQ+}ORP6zAHgHHP)>$|)596QnieHu7pEqONy|_T&s(g>_0+ELt;{K6z~Aq>O_Ew)ldk_c~P;Y_SUi9}BeftC9I4qIhT zqhla|&D0VSz+kLV7TU;i(UiE+Ml@!n0hC5afY_`WN)byFO+|XR#439Rfmk}eMY7Eb zr7#woJk?5u_>X|W;g!#WGvHC0JezP+(;_SeEc_y>d^6Q#8So62JV6@ONTRYSOlm@o zP(m7lH#n*)w<@oqDkCc~fVVuGpM*D<)<{8NGu&%Xtl2A8W5Y`MEfO6+bu_$AEf6;v zsDU;xmwnj~ys0z+DsQ;I=swCDF=0*gOE5-zSR?s5UW6hkBq zI0K84mVyHZM1>hLsy!QAODJ9|UQ?=u&Pj>%d)A6WEEy_g(_j_-y8aR=Wt_4&6-b=S62xdWo>s37V}Lfz7tz_MQ8rSfms#U+e61}GhapP9 zRHZ9~*`o>S5;G)sH`19y5MeNH5 z<+~do9%V$nyJymqI&&E;Huwk(9GO4kPhHs|yiw(KgBXp&G0?ojv-=byR0X;xK7jYZ zP`n%hb;`yt2(nG7UQV$RE=j}Ph}LYL)*Mvt1%ph#D)+Fe60@NsGFr|` zi1T9Ke5|?(#j|;P7yz+8*d=~LTy9Xi%39{c5{4zuLUjIQ0Dp~HG>Y0tw z-{1&WFW;PtFLXR=F)5@k#tCbSe?{&tH#jPU8lD~%t1;rmuE9mQ>bHg;&>T|stD%Z` zOggW*a|}_DsBEJO?%_he`+-b%`kfY9bcuqi+14%#Xw>uUlw_~FZr}RrT=r5Fuw!|_ zR8Qo~y6ua*AVE}D7P2|Sf=pNR3`zJyzz$qLzR%tH>bm4d{->>35~+GCQr=YdWKqF= z5^X31=6@K6O4~5CC8CYLT$LpIBrV{RKEfuhQYnbZaKWk5YUnw&;}8bQA6lT(#1Gg* zG76jo?fVNIh|x>HcQBQu6933XrBP%cXRO8L1RH~*J{jjpdAR)B=F4i6B_;NX=%VKzSyG*>#K%cjDQt|+T}IhD4Kh!)jdqdU#;Zy zq+pa9srNI8(R6!`094L?#@u`O?fY>Vy`?mj99yCDq0UOMXawCEU)cyLfY*h^AK`uA zV`q=%)7al?LHT31KNOu9I^` zRqz|?xJu7e* zXjr+mWodqN56OyJ7Dk!yGbS9nnbIx@mUA;ZMAB+T zKvjU_1oI}10OKKLvtoUB&$@UqkxAt7SyJs+^ogV9U6{Wr&kME6v~|lmML`Nm@X#9l z3r~C3i0WbuQx(rq;@snO--N1H=jj4g@p7X(G5T(ZicpSxS@vnrWGMUy;?>|N^;t`( z=hGa^8~qg5#@Q3#L{RhGMq~8ll~!xxS=-2W%hZ9UYw0+RF7`j_kvp!MJ6koL_DXSl0Jk z$?Fz#{dU%ENYkvCIxUWy%$j-N@5Q26e`drI%RomxCcaNd%IwsByS(E8I}XK@Q<&yP z872`Pzg)W>ZL#~kKo+jI$1VqKf_}#3%eToB-n)GySb<>V&9L1Lo(!V15&76(338;= zKwT1Prl3jh7RH<3GBm4!5iH>cm5;!?*1bIAbhXlX;`_cShXYvf1vvr+&pcbrkc zBPu2Kh&{Sc>6A<_J~uzXqst#(Q1+Ot!2Onc|CB@Y27Btv0p{R~Icbkjfa~2)hfH&e zug{0(YxXqsnEFTxIcQ}hIchO^&MEy}92gW|&rV8d5#nOifGWSv^o&Pq;-&(mr@L&L zErRjMJ2b?35&KqNTA{Mn|H5s^AqJ@t2qc=+otG>}*m{09OEkos+yevqesfi;;YcbZy_l1Zi zVCBw^LQ*DVO_nfogvwAw?b7e1dZ##MyuL|9) zFw7$stl=IsAq8T*%_y2G3bjU`XI#e^tyMDKsL)+OzE+$LL39*qKi}XaW^yBJ=#~`^ zq6%(ZVHYcCV-BD#qcAxxE8YH2y0fzHwtlUqleOd(cZVd31qD#^&U>IPKN(TWWKyXQIfEoonYX#_`?0&@)FUZ(Ta&%gLDi{d zfl~K}*M)jgd+cwAu5S^v^^K&)hWy0F^OZi?+^%>$+P&3slNNi`UX%09eA!~Ya(~dK@p>&1J4};m zLtPCo1P_gLcz<0fB8QAw5xswcPKc8!1snezxQ(WXv|E&;y z8-FVe1xAhsKkJWsZcj?!P79>Em>N^)xz0?=DAyR#guPRcYNiq@jNkVvjpA;|yv_-K zHl=P)$1dvc|7}VxOab~PH@ANENQJ|+V!2>{U@lo}8#p3qJ%hnZ64nZ0Ttbzh!MvtC z|Db530(A~)A$n0GHdTC;#k79U#_VPh__>^u0klg&3hMP@YtKLskQQemao*}nY4v-z ziBRXYF22yrfZz|4g@VP8fT{i0+^uw!te@;7m^WFaT!fXx>^j%Q#vU|XYZ?!TQyVZYB^@z8$p&? z;5JgTPVQ*o{B%&-9~|VL+kW)*pM0;3A(glD0mD7GvhR8dSN_9$Q$3&4I0KyiSm9dv+Y{NY{iyJL0i)aTFslT_7~UCg{u zoSAeS=NxX(JSUJZl5Q`Uib~7c*fw-qCFZ;lL+dwCQb2f5K6?YE@UbuAH)Ol(c#E$T zY7XpE60ypEEr${&ZY-3G7UQ4IMhnsLyYI4NcXZqbfm6%fh5d*sr7=}{lHynZ9o2<| z1BZa`iO8Y5-*3+E{Jl8Y} zOX77O#5i-tE;g30^V4v}7t4e(X=UfpJ_W6ZcRBH%cAL17l<%YOO%26xt>2cmKJ;ny zxBR`WR4G9=_lt1h+rslpHQ^fJv@DRxN42zx}h5h6V@tBrpnRavF_$n!a$yKI{eAZ=9Ocs83PmjHb`m1V>WD13IDdb@_`=y( zn$BlSWzoxmB#3Q_5N>B^@9?2(lg+VrlcW%o4T5NV8AGx2aH@c845BBe1Z%UI53Dl& zt#%$^Q+x~i(5AxWeW00t=8Jd;L|=Q6QzqGd$q-u1Etf_jt^?c-y1b3FGs;4vuYw

ttROLtR3gJ6dTBHxp5Ixm}{m_&h`#%X27UvrOiJh7lJ-B&yrnY;s ziJ|+b3Hg0>2$&h?p)c=`9V>P>Whjdnh&yNcm3b(=G4m6(0I}j9yQVdis1mKGn2HBM ztl5E^?0^&N!D1v#2Q1pXi~Dx58r=L~NXpS%hHHJ|oPCt9(j@V7qm_PscGV=-%UgyA zp#b%l2K)^BiT2bd;k5Q2tG}>F3rwlqXWjxd6~A?~0|@$o$%-V$7lT1}<~ASRYSl+E zzcn&FTlZcBNX<(+UQ?RS8mj-!8t;U8p#jd8Po7$biuHbgO<-$thz+yPotlP8YB_YQ zy1d^VETdU{`bas0FtsEi1VIz~-JP%5Q5s^dQy)dBM@Jr8r7G~&z4oqnxZDNn0$j-# z>V4yYM^8^==Z-?`3868Cv?^DP!(~>b#tc*(>1s*zL z4|~4T{3%J|*DtihT($V&k?=c7YpX(y9X!CwEA%*4ac?4oZ72oqu5@qhJVuzF{-d?~ z1o!h_l<}YhgpqYKY1U^Z*sMN?aSg;MsCnHZG<%9SONE(_NEcYPBcFO&690|R2(KNu z?QDz8b4ArSkCQ=DM`sG6i_bzD?GHWvr+z2iV%GLo%ZHGf*Tw}-mMY6EsA`9|u(T6p zshVW9#2e3Iz6LGWK3WtCRGMEq$;GKOhZaBPR9co%)7LpQjI*GhQsP_r)HgdJ)N@p?J6^0Q-!0@FKeUO`p^? z@9{lV@Uas!K93MgV|d38&)TUYcxr6s)4;4&?6IyYVu@&yYFs+g9b`ovM5&(q>r)Q`g~qFS6!IfI0`fT7dV) zhMwLzP2KgRezZI{?c;6lNY(ej=hjeus*ND%!oPALBYVd1%=Qj?4zxhfSAg?HEfmiY zJQ8=lg8wZ0%%@6)pi`}pd0(flhK587t6418Yz7#uo$*W-F}W{mr;pj!IJjel9e1Ch zG@L_B17EO}1P3fd&u%k-61Nev@(Ald%he4Q~M|r_veOnlhjVD zpFXyBpX5n8@5%k4QL^%)$RP$4?3U*x+yA%$n2W?Q9wm95&r4!W!F@iVzJbOdNAqrq z_?FO-oB!!UD%x>`5X6YSJHk9W*>Ebr7A}MN^lHK5=St}emF3|%Be~vHT3z-hCtZHc z(M~u3C48Nf9TNjejWiv?fD6(mk(V$^1vkTO}&pA_m$3$9IBn3d@|3Z$?25L+uvzyhmR`cSwtQA zcIK7w{BbFk4of9?&+niyZg{D~8Sp>&Iv{s$e;y8Itpfoz&7{~dA0G;XkV5o@6!@~F zsNT>f?2Tcg#qlKi0mDkp_kfs9skY!ETuaP+M_t<64UtjiyF{`@V$PA|g_9 za(q5k8R3IMc~_C?4(>Y&@_uQ13u<@crJU!cO&?phcpxaldx#Dzc79dN>%I zUgTw2k1EbT=FbR1TN8HwOIu#j$$q)oOTlH{hz1_k><|vu(3;L?1bn3b3c+i0tW4gB z6Q*|stA0ie^=&CD7z*t@b6fY-7$4=;wMdwR{j)^-1GqiohfWE7sMI`Pc#ue3gajTg zdQaN!w&Zm81+bJ_D1|WPeEYx5m$2=m6MlKhMmo_oZBZ1s_cL-cM>*?NSE$#~T*rhb zH@AJ29<@(9kNu7f-?*E*oI_{3M0v;VH-{|(pByO?t6rxoJ)2sL&7A(M)mh^Nz+}(S5bxs zYHBl0=+r9d^ZXGSxFXWD+pLR;(Iq*BuUDPgXTb~XCr$iKcwQwXt%u2o;BZV)PgQAr z0=kffzPeB3WYQs%i?*qm-?N@l)1P^=eMw`c6v^C}W7|Im+HDNT!&3c-UW6FKV*v!pCv;42YPDQEnj7RjTF-EH(W%D=o>itD48BX<$bMPUO9<#INdHrmqu{_93sMOi9z+v91U8#5F1nu2 zrLoYzc41y|B07jz$@s4X!wA5)KUj+r$omLm99cUBAE~znpW-_I*(Ni7>W3FhRp-5( zFXbj!EEa(QpEt0R&}o0M?Bva=W1%Y>lhxsHiOR*1C}SaUv*pdfEfp*6v~c*X*ff-j z$8jk9F+ffiB3Q4k}MyQrp2c~aycQDkbnd?2M3o9LfxPT3WFYiey# zbP;Y3djSvx%Y|LIVyFSy)6a#pLnDq*H#M;Hh1t?_CR+=fMmzL5$3G@va42y<=0WJp#{Wkj)M z6)NS()iiF-zijZsA}`aV<3pJ zzK{vw#3IVXefPl2Sh?4n50yotjiRlKQ59i7ZD*tU@2t>3Ke>vfrZ1*vI$-2=gf=J1NhHAr>yx7xtOu_wUpq}_C3$ijdU)g zwGB=Ia7>7=nL{4jkwr$$34B~!T1BVFgg>Q@1X5axjIXL#zQFlYKe)0kLv-(*@}yc} z<@H~6)(mVudX;i+mx*-orxGvL@Kn|LH{66E#K-BaG^ z>eqkqB{cbwbI?!bFh_5uac}|Awm6>vcfSyDaL(-gZQZlYbMp@u=~Bk?YS1rPcmAg>c>!2wJT(yv^3%d80Axo4*05 zmBqCdml>}odS?XrU6{?XH(H8RueW~-CwFTuGfa`G0SKpN3h$yojoZ z8oPXtN$Lt)#!FfJ*wuxP8h0Bn!VHYk|40S-44Vvg684ZYQ9?N#Vi6{_C*a&l|qdYmB^eR#tq1QV0jClr3o}}M4 zELx;grM%xDhbbvT4e&-LXU6*8(}zo};g9r}vV7q^37ET;obl z51Vbwbn0hL?lQ~E`=)^W5%X6-KAYoVuXU^`)9^JV>6vsvd?Kh=D06TcTcz*_AJdy8 zJG^ypcl{upQf9NPWn&(JI|E3C=V~2#+{D%8^vKWyF*3Fjm6eVIvm>@CXAteG@Czn0Ly^XhkxxPG^4k;;GIE}C;*N$-|Jwgu|?Rk z$gOX#w#(AZSEobV4nXo58R%j~Bo<+k29L)f;J_^24TPb@()s zFeH8FcIV$Zvp;qL4PdEoPas&NNfgSR3htzgu^>@u$B23h>4JY-bnm4^iso_&Qh{?@ zfFoum_l=w`|A>77rhbY^|GDg~!}*Fw|3h5-#s0<5F4NhW`i3nmJjrrh0<-?q5J&tM zsb+5&X^H0t@U6E>`l=7B+$2DG<{M=vF2%fD*eWu`@=~<_n;ES-J52=BgyMp9yIU?a-{3{&~1J3 z&iK2GncGu%R$Jf~yP%fm{ai?_AYHvNQxCh-E5EOhr8-WJ<&&&A#4pB^$TPFnFUGPb zKV;}%FH4Y+`9;N_JhF?8JHItgHC_F(k=Nx9#DobRJYcCrA$4h0rOI-sYt{2sM|F&W z0j6pRdZOf)p=sG3MKe5p&kk2M<{62b1o?5pF|y1i=W9Y2su;TWdq|Ri zXr=Eent*fn{;gW?I6aqti+ezUa0KOus>;oZuTW2wo8-X>+wGm(RW;pd$nCd>r+Tj8 zt#lXVCctaa??mPQciN9pY%!dQcV9a9MJ0|-EgrRA8}kFfF}FW~to!eb+RbQ;cBr}e z^aMrT+4jI5Mte8f*0bJ*-`AUW>}{tUxz_^K^>ni{#qZ0h8+GYB)`9iVulkXPi9X&m zH=|orz~0l-0S$Ac45kxC9pR&IBZ8uP-#BT0IzTwp%A5dtdh0eRqsh_C*xAG4PM%nv zZVAhts7R(Li9kqb5;exUo%o3^YsPL;&`v%iUG(i&7~k}ELr#r#fO2zsJZ-3kjiWq4 ztLV$Z2u?bE|5%@hG#mS@D3ZAg$!EvuEEf1ElYe%T5g0>JB=iOUQU4)4^rk4gi#8BG z6sUY|-n#!tNL%t1B#&rH`m(tw=Q~M;M~jJn``ByXm>Ddk8m}a-B^F6Oc@o*8qL^~4 zRX-$#&gem0jgEJ>@S10Tz}%iJp$mjmn;gA$`N&ef_*{UREuRB^-t2E^=>A;v;*m^S2uyVH2}3!$Nfg*F7s?C zTm9WmFr%@`_SO2`<$T1jrH&Yo?!!NUjDaA@G`D}%p!GOVeK@=N@10?l#-c#~QBs`&J8mF$gEkgo>x0lwWVqPBa3J9|J-R21gNhMf0 zqOLc_y_b(GN!RkWsjpx8FSKI*N6D#1z!)1Ilc6;+^MPFES)e;3FS-d3+jBnN*|mOb zm6N_lnZsvfE(KKVW?HG`$Q6}dzitJDXqVr5ZRw`|_u6Y$sPNWYra-NVcAX@AZ(GPm zn^YWC|DVObQh`_P64w$|!_?0EdPczbyE;bbQ~ZxF8Th1 zuO40VKhrwt?4bXtqjoVe2UvuO!WU0cvDB=^uH1F$Q%iR54f{m{4tEc-+bRlvLhNV- zNW*WO2RUP7IeOd+sJihzL?5ay3v*Kd-{M~UT>CN-vZRp`c?}!{h2|KP zs7cpJGb<`8PMqpy*Nhg0sX;d+C&=Vo=>nb4a;Q|h=4Wq0>OODhUJ+3SG72J!)VFF| z$2q-g?uGBlET@0a5x*B5#U;rd>T!K? zxJMyBVTQ}@Y3*mnh*lV+%`2?tzJg}D;Dqe8PYbY}VH2Pnu<=yi`DK2PhR(I8oehpX zY;M`B9eCdRBwv;J5(;MCaOoy>*W2ekb>A?dHTU&0-<0(!lniC7Wa$;`RQKZg$Xl9s zKm{Z%kx28!1Na&`{=sz{m#5UGcg zEkK>MPL8H^7RuxoW?Y)1>5Myt=hObU@uj()JtS0WnTtxc9iE&8shi6ZquoJu-+ zhjxW?*vmYgY=}N;@FyQfI3Jri*X&b3;$*XY@xDo#zwdGB#9Z*N0BjDCIoc#jMpWNH z`Bwois=_;IheYn*!&iwJp9?gro$1UEMFIBN&2+oG@$n4f@b^{Qj`-C>B^!W7LGat(_Qq$jmVU5($@Ll6d-4J zhh8oublJp_A9{JHmAseaQa*K~(D4y;)4njDvj6n98U60l9ABu-{ocJc`mg_C_txvo zPPPA{iRKt|)zVJ6J$@kIa8J6@*7GC5;M4`(E#kX>q?gX$+mP1&62Itr(?mkUT%sf3arJkQjBdQ+)iGO0gIiCqdXQ!$#oG;_2hhRK}G z<)+>ss*kxB#3=g7Ukfj;DS|Zwn_Mn9tT0iwsN!;DdoJ0L)&knl>kpM_Mrrlej{K#A zk@RcN7F9!@-#LbyaZ&>bh+^UG?c*L-K~aMejRc1%T;szw>hO9;?M@-&EGwl>KgmPy zitS6-4AsjTWmqZ35PzYgo+p>@h=3`HK-kM_sy?yjyg4vyX%nhi;)UK7kz=KPV+GuF z{hZU4QGoL>{-q0NO{1^4oZi{;(GV>~=fzu)RK7~>)g{$W@bnC*I?;KW2Kl9*#uVaN z7pZ>@U;Cox9K$`-y*u=c{rn)%$DP}UdF|D2SN1K&vfVZ0coUs6nf&x_&F%J<@|DAv zI3>9oH6)g;N_J8sA4$*6d`wSTI;&oQqFx8XzK?T zr`NH~e4e+W4Mji+-S$7ltk-ZSq$Tx8l$yD9FIYE%i%~XAl=+6Z%RO>Selv6y`1dlN zNKn(DU{rlU*XzH;6M00^>mb36V%&ud|JF`|)RT}B7nn3%*0KB9hHhG;ZUohh*#gSi zWfVncQi8znf3_II#V@Zmz12S#$ZQ_U(b!tXT1P<&OXEQ1S;a|O)0YQ^X#Z$V{nY!I%KRJ6cRig6%ATAjI`_+eP)j|+|GSLL_B!o7LRR_@-Ga| zlNLq(WSTT~PRp!yt1@-Xo9$xQ@aFk+b4Z)@{c7-$3VyFzt;Wl$v|5jA$ZvAQr`1}6 z=H?APw;yPkodL6;Y+AEf5p2^S2o%j3h^2UF7q5JREm5~L+9r;d@EmP_%hMP#m1uuf zQ$H{KNBMV4(n<~gXhwM19u~D-`Qj-5tc?*G)6)Vm*5RffZ{$!Qqd1r1a3=daA3s_* ztywM{lpyI%uUg`GNluOr+2{A7Sgkv+AhHl{gaMttMtv~@`r;DI!wdSZovVT-KCg!X z0>g;W_~Hqq|15DQvVMpejwEE%Dse+Dm6Bq&&fNluB8!yk^r^`6f#;3k(;P}1Vgqru zMX$w(Ne>SF7BP%%7XGS-A4qU;kfPwAqP?yNY8uby*TUm8(YCz5Dz<|z4NsrA0J z<_AP5hg}HoI{WI&^I`nCH866Q$21z%X5cHr84J4Mzx@0B%o}FgWGg`I#%HHPrDYr) z>?QTonkQqs&tcN8^JRby(HvVo{~ z(kfs#v(6r&(5(b#A+Z-;%3SXG&9Jgth~0r$8NofzA2s)D@KciZwwm! z`4K4Eu)!yd|1chadVA|ms?Qi$UOjz~;$-_AaZ`(2J2^w4hmgIOR&sL`+~jHL1R!qr z?|*0I{e&2$I4yeQX0;S&6J^jfK9E3p)W-mBm6!$Boc!~rl;;gKi(5euhUq0X`aTM( z5V=8}@d`P!|x3(QQ~IZ z&3_*x^+EP)Q)dsOyno_(QFyCe0d5ASZt_5KEk?CrZ^4eznyx>}9xi%+Njx~sw2IB3 zk*N)%q{`A!tV23s+P+>I3X^i2->pSPsT5Vobl0El&G>grS84ZtsdB(4h!Tb1?j=td zGW@up#4;R|G5BvNU6gNMgQ(Oa*>msaAPezG;c(Air0`F#JDSZ5CSoMFGW60Q#AF2d zrL#F?@|#u|NdP|lyl{<_BXbb7h6t(K4mZuM@+^jCN^BtNzT|n8lIEo6(^MBRjV+5l zU1_qO4k4aOaH(zW>o@VMRJl;~gYNx=Y$*_sx_>yjj`baMvCa(oUBRq3;-@C~>iagY_W^lFwo~ZcsCUAk_rpoUA}1ZwO!1 zf0hNFX=+~c$LtagHyyw8Z77?;mX*TBy6SdbV$wefd{WbYBCFS;ULd-hAMp!~{pz(} z{dKq=>o_AjE|9a>n$nw%GVo;lohL+YH(kP9aONZfW$$BFTe;yWH4*4767Ko#O6UxN ztderig?oY+lWfw4pPYxRy6*u!9{MagEZ8HlXKB8eXPLf%d2c$@p+ z6tUR;{uTFzPJMBBWGh?r;^<=3d4_38CcpeeN^pI~{p$U|RccFeqAeZ5g7y!3dxE+dyUoe+4p3}V9P zX5J?hT{raR_fpz#76Uw|I9}ws?ehhQI$P`UB9-N+-AxRs)$7yaq_E>A6Of+ZZ{qB- z90JV!4}!Nu*kY@nnwv=d5yHrwWf!KJGcP3uKjCMoPWJ}dAU$We*H?$&sxPR+&?4yj z;vQ?lx$yIEI#&)KR4U3q!)DP{{Aq4{C_7>UKf&YfTp&pQF3`Vw;^OJz*vmaXLN}yf zT!&$9>P0pj%CX*e=r3Bk^>n=yZl839z8|btX_T+IHrPzUep?elwcGU^Wu5GqAL6Nx z-=!Ng#r&6NXq%zoKrEkVNc1GmbEek#wk|L~IdPvMtI9>zkNV=j`p;m7cag<$HI6nq~ceA<>vZ4dS4bEKs8T*=jP7IUmHHRmqZ zI_^w%ZRTb5)au*1%p4G`6_=}{iP+HsSN%Kz{pa3;o(C9tp&NuuQe6ed6Im2s&LmvF z?ozTF(9lB=-TaklZj)u)v+bO##U||dsJGmanO1uHN!UJ>o-ALnLe>i7kZBhW=c!*y zO6@7Dxq|Z>|Ea9cO2m&L7dB z7K$^xKR{V3-dP;z8;JyeTtp>n0sO(!*inxP{+OwNC+9p&lA;gnRdUb8=K5mCzrQe2 zrE*0Ig8V^&*7H_$xa8RLm3KsUrHOD93FX+qT$XRv_rrPI%t-@1vmqY;kD+t$j;o8J zc#$^AYF3;!*2I%cY}>YN+j(D%#?~ZlY@3a3+nCtKmw(}%_0GNboV|bh8LKUoYoA3Z z0>4JS-)84qMDAApmVtdgYJm$vV5*vE{-;cRZotAdL_<|X)NVb^<>5G|04~mHVQ29Y7G8-qXP;UCze6!>Ywcj-s*Pe+n zR6vYAc`C}6qw>_9WhN`U!96Ua-mOID+U(^kU)4Fo==uRU%wufk7oMS-^Bqmu;xKH1 z5LuJ0$ zUz+8<>_6Gv_5X2w_jziFE-e1uYQmeNZ1B*0Jy5Q#o{m|NcN13}mpd;w$8x)`!JIx5 zge4cacdPO``*=%h9#qp|#RCqU%B+hGKMmY6HEf}i`ftoEpIpP*{R)qMsa^}P{C%B+vBe-VLZ8`_Vw=5eaJW_ogYGomJnv}ry)>qt zD${p&Yx<$->AamoNepHV+!Zg^HIL)3c{XHG{PjpwW5)++%QEehs@w;#HKXlBuMECV zF3q2OEBM+l(dat1?fWn<7a7e<6le)T`rA-0T0#dMO0_ZCOJ)?3XhaFZ-q0B82FUF9 zD4G&ovJ(@c6n+8Tz40&mwjOGWjUUdscA|>j+hw#LHD)epHr=aw{S;w#>g*ll|}I>|5oE%lY`t6sW7}Cv;OTu|5E80^0rjLI46B;tIC}|9Xo0 zUxPwv!^STJrQ)8=Zs;h0(yt1b-bDeq)V{seUJ-d>$y*a{9|%d85$s&fH!e7ZU;z&CcC}KN>AFMa)tw>NNYNX7VYyk zT&Bg)M!}IdaHgkpV-&?r66!g@rGK;8O{6L17^>@ad^8Bmh!l1G30nJn<5(P1+WshK z!oDKi-1_I5oT`1Q81Gg%cW#KSiHmzIIHA~q({JR(A>l+rP&reMUA*Qw(O z1{6G$YfPVV%q{TG@rcE=@HC%x>cBb!BFAKJQvvoT5Wcx5d7IbGO@ITvjGw*OaaPLm zo!)lCqOe$bpNjwITe~S8ho(|rk<+S%H%kJw?5yq9o8wZEwb6D~3ustgM8ZQ=! z>_*lDC?krsIi>JKnma z!+ZoSv{Py>ebSLTZm5lJtXh_Xd1N4nCayw+_>ZIT(Y^K+kY7h?58tI$;E*3M&NhH= z3E|s zP2oOqs>|X`;j)gX>s&?$u`$yHCv^(V*K12yDb{nJWDO>p3T0fRMP`k4yi=v`^X>9c zKhL*w{4O4(&#(LI>C2CI-P#LWa_?nZ>7`9%$@qZ4=_E5=^XW*?nat+X+zqoxIp?l{ zdPu(AB?0>si?jm0N7$k4 zZfWG1Strfo(M}fndM%!~P}_?S+f932p<-oEn4dSkWMVB#VP{W*ZPn|>kCqyCpu-&5 zvFBPdEV|CD*r)t`xwCHBK)k>hork}<7gI_F1W{ETkm`MIyR8T^I!noeLDciQ+pLc*y)z%~5AoGx&?54+YoXfJb_n^e{k3dn8 z1*}r1vokWjh@~xK+>gyRn07q=YZ}u7=NP{fq1aAc)VhNErJ}}+U`BsM3v;6MdVXb2 z@+^ke%dy#Mmw5*SY3;ZUQ3xXLTw@YB#rZqOdAUYY$#td#P%3ek-DT07tXJI30Vzk{sx`KnM5X{n%(m@nSnQ?Pw90pd8VgyA zZBmldSjahQ+R2RPF8=)f_L-thkB>!2?-k+IK0(9W?ssK(ndoj82)yUHz1-^K*_E&3 zIzIcY>Y^eA>yo+O)|_j0ORBM;rPFsvy{91#q!tR$d#0gCu09yzmXZ|r7hoy9;Uc3K z)kBpQyO5HDL}aP9`gTgQgX5^c({^xrIO3vG@f|vC3L8XoYT8wT zTCC!iRFba5!Yv3?Qdn;?onaR%1dJE61Ibe-5t>^>L?h`*jmFtam2yviWsE^!WVySK z0~??cZ*~4!|GUJCMz!7fzqB{!`Gih(@YJO}|JkWX%?*05Ro(lyhLN^a<5TUZv;7j6 zw>jzhstyM~t;o@p@mfliWrSJpqI|PxUx{PpaM@l>ZhQCRq75J~-sI8S$*AIPB|@>! zbf}!SjxA?fwbwUc`VyIsSI>AbFq$fgI|E=(p29Bgi+^SGmO;&;mmMlCcLHZ7JD@bENX(2KsBpsPSnmFp zCT~gN^sOP@2>kX{Yf`FEoQTS0O^q4|lI~${8m>dp6F9Cz3{$yFj-!d@8iZw~+q`;1 zp!MMxA%n+CQf^kQujTp2OywgBocKUH|aVajy&wB$!xj8hh`6_eG!N-0>Gl@0`fd9Qjsi7{< z&%RzM-C4KwdSLHywex{WSmP7j-)b{l1>5uSy!fuD`@dOjc$Wawx93u0+YT=;Oml(u zi-oz};glm+m+fl~`w^S31%pHO$<13$E2g4g(eOU;_yrzw%{dSxn!7Y4g~h5Ah&reV z|7LZ~&HZjE z4fuMkyTbBVB`{&HxhOS_t47^Bql$$7#iKQDgAd)%c?f#L(E#P1x2=mUYW$UtK>Ssg zr;7f`5bh=$P&JaRW7h6tGi$d}DShJpDgn|%L2j=U(*mqQ_!HT?}vAxxAGk7ppO|hS*22Tt_{?_v3Oa`9^`sW#9LIaGh%;|hPy@=U|FC|-V;OgJxfO~`GhT{ zECjTNeGn+#SkR#99h0nmu2r``zABD|gC;`(9`cbny>--}+{uyb@@{UA;F6i3zZq-? z8CqX7-z*zj4 zYtNmtogd2wLz&|~?HlI4p=Q>vDSAa#C?y4LzcNiIV8dSQVB8gC+Zt03J1ys-YE@ri0m5%Z_|Hm^dV@BtPrp#UL}+u;eC z$w2d}q$MC`3suMu@NKtv4p+whm9ZuKl6f>snRjD9u`srL;AK}nJ(*?moGokxf`sc( zBXVtLp|Hu-bs}(kl2v?lokO>sX5(%b(P1zFw{Xd;wlHgjf|tLu)MN!$WgHt|6kMEN zxI@`)O!3_!@i#;4#s#~Alo}BgLZov2Zc3-~bAVVCp}-|P;!yAob2ayfJ!f#1H#;WTCK})8R_nwv zz}X;2!~*%A49e17@rJcgG+1}{6JvmS1{3?Nz?+a%H=GZB?&A99QC~6O@G$)37=oHi z4xczRgSNvVY~a>iWZ5{egh=K-D&I1&Gq}=uuP>LOTUwnkjFe0Gn|NvEwsb?UQv5p3 zmycEDhib9wJ$a{S;_F29HufW@B10k_;OCyb$GW+6d6R>~+?rHdr%cFu*&W5nEyRw< zcAEO4=OJHE44au=T_%*Q7IMT@oFMkR9%i|;IVq9aKZQiPJaQIe3JvM~F=nrDbM1}SIUV&nPW2}V!F=ed#irwu&DB2LmVQ+!>>M0$vtZj*k5e&0VKqt4Eol`dgR265yQ;-Fy0(VIbY zFz;_K@hB+XZd3aWhjMfjt`lgZg9>IRkZRjIP#L=7XTTD&d9{PtmOVCu0gp+T2?A$| z{<$A4-OP35SzpQHV*%2;%Wul9mpCxRI|gEu>(W8>U=XtJ`8W3Sd`G4!LQ8xbD1M|e zrlPxvf7P#jcdKE2yJ8kq&+T{FWJaQBGk~I)0E9ei$K>hG7`j z)?{r(rdy>==3j~d^)U!)VX@&G2;90o5n#lNM88YmvA+=38|dX3$53ql=2>4AQ`Gn^ z)KU5S*#seuFkqZJMA3D(Vb4xL33Q6Y?$@+)8t%&(%}EY(6YZvFxcj9B$yb=XUfrGk zSh*?KLj*zO^E_B-9n;&_VhcG0H@{(ehI44GYatis3qaxS9|~y#F*4Qm`XxUVPu~*@SyuIEhrl}Kn{ybzXXdLM=YF|L!;=7+G@+$_^evbj2bI%Z^#$Ul)=T4_-2#kZRJ;GC38R zq}hWc0=9b6>t?E-Y7!IcmEcX@E*0s^W@9A(CXg8812>vFWj&5?X1PqVpw4}#al-^= zeMS7t1hhy1D`x~yttCwwroj$hTwt$mf1n}?M!0V&xiviHe;k; z3r+QnO%J{a+(zQuE@N+CGcH7JDNKXFDD6TvyJD0YF1EjIm*r<>Q}fz?6;F#(UFw4J zeh=*J0HxR2xJC<9Buq0w{iMBulH(lEIdo2X!0@TsGds~V{pHsCCEY)nw+e;o!ndkA?&^-0P`gx1yW?nY`~1s2(pT`b@wuBaZ<#% z`{HWiFSj|Bpbeq+^fB-1Nm zfR|S`f?7HHjBHH4>oPXFouw+L&KAo@A$m0{c`2vuc3bhm#u&TRyFDW?NjOApakjHW(~_ruC%9cY4MkW5)#?JJAo3f2GXu zcDTKEOWi{b&%t6_rke74>N?qYlqU0I*t1w{DlQN{(E^0{lxOUNAC~?2eO3$rk+MSH zlX;}&7t{@&%|}%VObiqW5LkLA(%3db>au&OmsUnZwyw9aS7Oozf1lSZ-gCw7mn1pD z&M$5Z7S7eh09hp()Zv!r(8lu2_xiB@=Jk?>h`0j1nQ~d3rlhC)o4))b6-}cYjMf(K z-p!~YG7VZj96Y{bY^ez*JTq0`cgMz%ee^&E9Q3YNw^m+PFJ z8SU29yCtOWMZ~(0Tmcy)h-)Dnm!q_;lnsx#U`fkQq3jePWASPZUr)q_?X|LlAmC57x=3_K0onYoPbDA*3HAc>Vh*li*(jOmwizmMW8M#&O1kH&Qjie(m}e|vL45bH zJu8}~j&l38eU)8wXQMnyTakFhL5E*so~LEmNj<>SCe8lCEcsZ2P~FM;Of|q{MAPkI zYgy_8K>T1P2!QSO-dY*w;-oo#wVJr>eMyZ&e{;MMT6;O@cT#BpVNQxKj@}srzJ#kf z|5Fhr`QhY90k8DihK9I52T@S0u8#VZ?Y-#>&aCcIrvA*cu70#d=*{m~rJ9@7U><@3 zzk~-8VwqU7w2(ZMuPM}Waxk^h?`CfVwxNuzHC~PZ2LKG^Fz|_F25)K-HHhd!07xb^ zJPZXB1^lr7iT0KF178OMXTAMBy#~~t^p*Lef zEa;qQk$505Cz3~eDba0=Z!NHNPR(vd#w2NSXMefB`q24+*#e;#@vm{*0dULfO@hK1 zE}pStfUPKYJzICH)WPD>KHX^aHcpg(KAr~%ymIH_Uu+(Q?wk{qM0_pd)_E+6h?ar7 zD+%a)Q_~)eQuUy3{yrT+{>y6d;}V0@BMzUJ9`g2`@g(U7rWL1v9B&K_;XdbCR~!31}_dmJwjr`#C2%6 z)H@K4`o8%CPEtse${ zq<|^CW->1mAK__7MU@_>E*`PtV7feaY#%xKj6-^ywx9;QVs2k|3As%n!VUvs=w`N| z`9?>z*%k=w)Ke>E(=$>_su4X1eYu5qS(1FuGnjJlJ8k#rz97J-pY!&X?vW*rd#zCP4g@5FAp0o0EYYqq{lwLriNSR6e7$(_C!un= z%c`2NWb^KH%1!@Vo|lteR8i6wuNrfe5~k-O9GvZ0SDwENe)8IbMW>i)rpPMH%ZI0^ z(~$o@PrfcW#7YvgAa8%QX9%K}ax!M)*!4E*TVx#jV~Y$!$hqie0YQEv6&V;h0Fi=> zO;qHjzlCP~h(H^4sPv+6ineg#XvGgiBqL=0Tjd(GS$WJv8cmlwJJ%tcGM@jnnmU}V zer+NnO9er;uFKL{Tm&VjL`8j$){l4UiqfsE6MXU3JVR8(w5=4DU}ExIK9j1^S?8fq ztURuf%9ehG=VpxOnM|kcpFHJj0ZBu+)Qt9fe@;t#PBN1J^wovN;ao|%EDYo=(&U19 z+|I)+H%M*6EMn|@e}6-EJf4o7d-PnikoXrXS>%aYD-NHe?=X!?#-b|pw*Q2n#2erk z;pf2PyXk$vuOH0xX>D3_=ERbElqGXXp7yDbrOl*A<-e0CJW;U(w0iOfJHW=+AgX+N zjkR>C(n8Xc6~_HTnsiVC0Ud#B7Tbu&)u9Jjv`nfSV|t# z;QUj(!qc5{(~yqp*9Tt6qmxnYWVb8rqOhA=08aX4U5m@v)ey?e06rTI-qsZ-?>Ac9 ziu#`_jzlR?|FRvDqZA1$z|^=0#PO0oxq2d|5lfrw9!D~(B_otwE922$ms(IVNb*9AL8z) z)s3Dtn)&dnJ^?*lx3|{@a*1_9W*mKi=&ca-jR0tP{iQ{fDmS(-93b03PSQof%-3}e z0%v@O?T!7&BC`GC9Cnj}AofiT=9C3p>QdnZb-HlTI#Qfz&Qpz7b0xkDs;&>qYcnI+ zdN8Juq&MxO2aPpFuU*1X#4&_si0Jp+nuLJhZE_-c?*a*J~v6knblkUsRs!Xw{NV?}u#a`r%wZVjzvO1M!v zi>mhd-_y=A)k-2t(*1WG@WWN1mrH`TV&Hs@(3tfJ6HS={9qOoFFgTRXtp0UC`ogkq_6XFaXs>PG7 z`8Mm*XFYo$mwVsM_H=c$Ke8y{w36b=QU)6YIi6_?8`9@7AZKCHA^Ijnc5ytx$&hBo zIXM1Xk}6z-!XhU0(%Y9Wjvh|)u)zou*!4K93Kp=1 z5j@=~4^DwVo^o2q?F?_;sg6uumaA$(>4@H1R`Uj+gdPERKlQzM@?>|2WUy8Oo{^qb z-8zxb`@Tq@MxH}XITRTVH^Zl-Jt`&N9Gv3CcFsI?o-Zo5PJYk*@|mU9t*}ahGw4H!7r^c5LjVAEG}));(|ti z?dv$e?v=8&-Xxp%I|XUGc81DwL_3JTX6*t%rLm}r| zi|4$N$GTNzMPsiXJzP}p%6O9B8SSSnXP1{XDB&TqJqrOnio`eRS$y$g-w$274G{xM zia`cVvHtZtn0XfG(z=-t=HNo~86h%j;wa;3O<4}HvB`N5c(6EBMkm!l0=4*?|FxmQ zPZ^;+7|Nvkw|ige1V4LxK+u_wapUJA?6_%4rR`EGCo8=m2J1`uoDwQE?i!)TK}97! zybk6@P2||Iaq5r$WM;a^2D)mN`=rxKdiEw#DBex*huB8+TJ8vOIPDvg{Ta7w0X1|3 z-YG4Pb!;k=a|e4>WcNrD+Y*)8%5lkd%b-Fz2L%NAdxPO0`43(hu+*kH>-+VoAMM9Z zlQ$uC=8Y}_QULP#!m=4E3Vs)Ans*mDhN7Fu?ChxC75uPPfqEavD6QkNb6EcRmbWH} znXn?*>Uj#LFNViWBo@A$Pi#do8?wYc8@DM+Ft4mCmN&2`BT1>`3iON!seUWW(b*l5f^*{wA)l^8G?JzRPLTl z2QwGW62AO8(pdw6m%c#Xn3dO@e}bHE2x+tr<%6?yt%zNLEcAF)N%bAKvttvjBtlae zAySgg*j1j)z@s;#2zxtn7!(*MyOiS7a=TQuTP0N zAMYag+B|gs;ZTe!Ar_wCZM^6uRC)5xToRXkaYD5dE|8@!5;S!@#pxmc`t0r97|Rc% zQtqK=FtewtzWHvpkb6H5up#aiE1^@T5292=rRmV_h*-t?QMFfA^*^jqD@0ED|JJF3?hj>b)5Ap;NzD1En zV`$GkQz>3KWd}K`ga2bHuLDX0iQRNUgU5@bf9okw_G`uwo0$bGZ0OzkztBJ-_(~A? zb%gEC;ylzeCNye~&W?(3_|!waebBz)Pwid2KfuHNJGzWvbbKki9%=G|Gm7y0SHDxr z&m)Eyg;*<{GbeYR_mT9bt`Eg>u`OmOYxZoUTRPEd7m|(N_gacL)&aSTUuy6ui4RI8a31%4DRTF()F5V0J z1Hc@nB@TjYtMk=5rg6p*WkDwpu%<&??TREnSsM$$X&X#E+`8P{x%KqZVNb)6zVUOr zxpFjl<%;+?ts;Ts z0D#s|e63VByF+ib(`BLgGMRSNx7%P2DF4^EQUhP;ch0-_3!40@aAQ4Vauj9JbwbxN z`OsE)_{gir7i(t*6FVL*ulYUGxjUyew!AH_JdF0;%!5v>*_tA<3DoCje=?9mDqD>m zVDm%gtzu@aO{K0P&Rz{Sf1hQBtG3_kRe@$CVT+2g}&N~ zXr|I6b>sv5G?sHU`b_EX#K|S&1$vP?)pwSXUPh7XLvJ5DTQ0MLFaP<+ELHDagB`Fo zB%WVyup)eCzo?FFXYQnzz1uZ{ZMn{Ky_68k#+Q>ziUM$P{P{qf4|CbO@~>Ghj-)on zAc)TLEk5zTC~oCGy;BoCHZfGd?1zJ=XxZ-#^}Pp_Vi7~N&jb5`G2TOrV~FtD0%(C5YO_=LpK1}Fu5{}V^TXF zctov7iBH|pz9MnSHoqYq6*Bg`EyEUUMmxTE-+7C!2RPAhMq?P+bBLa}l)Sy7J+F(_ zuoiZrFg*JyM%M-4gC4XetU&b5+5?ZB)t3itXxOiDbX@-PFw&J*5Tt{0wMI!Fh}4Pt zuNwV)rJlS;368{D2oC7@@X-KRjmHhDdi(VQ`(;|h!!SnG2)0Ih z9X!u1S&Jniz_!?0hnKD2K*$(Wm*74DVdJT2pRc80YB(@$U@9stsO*Vg~I)YQMC{oaN1 z+Oj^eE)XU){T-Cxa0ndEwqKVkwyu?L+fvYvYv-&6Q|AABEy zLTB^SFrHnOq?FT(${8!E-Dq}aLt=w5i7n+Tsqp8_TjHyS@oH=6Y=@A?!`H^Jri6VZ z$0B=Xi&H;*GZ&#;nL2VkZ<1S1fs1;%2%F|Iq}(Gi2Dz@n2i6mJGikCK!Q!RKV|Gg& z{qW8&>GKmYGv8G_d(Od^Pg(gZP>eXmd)G)>)VFUPwTPf)%3Nvdg^T-4T_{_U);2Iz z=I1pV6lbn%78P`Je}EDC44aK{c!alzuDV@e65ZMa8bxL96jd*KyDJIl`y1#y&xE9P zlP_Bna}UK1|3FO-{w}%&Ng6KL%*oDXT=D!oGoL8vo#ZP^BQXw;$VQtJ45*2FbaAeo z5JNYt4NjW>yAjAfru?h6i_=4H#en*c*4Su2!u3S-Os1)+7x&rO&_G$a^z`4p6gHi@ z2J9dNV9{}Ar^A(iy{p_8g*}-4~2=Pvwo&!L}T>3-uqyrgd9B zwC6<9@B>M28ql-^G4!wN!OR~45IDy%3Hjg>e0GR)#YkjQ477+26r zy`}BfvF?Z{?LF@&BgP^-JtjF>AHNx{^c}N%Kt=JWAw>d)CVxI{kkpVed38W!kMb9n zi*ns4;V5e&eIRCn&L_){t-#>a?2qG*WE5^kX$d+?DUT4)3IFLWG)5-28t-@kUSsrQ zGWkIi1bO<>imDy8#Cc_h`Vi~0a8O8Uq`DA54@Tvs&uas3W9ya|deCi3h(if!++@!I z`f-{8%#=$9Hds8U75lR2jtyt|03a_Rok3iy;>FeF|*F?+CZksQIOaVZnd)zLv3HIt&QU1@bWx#9Bu>-p~l3@~Qtad}QF(w8@ zc!k;gkhjc(AqMhzEu6q0AnrFL2Eqz61A!;58tsQS4=Ls8#&miyjLT%J1%6??xbzP& z57P<=u-?$|2(mZ3knSv=NHWB|LA*du*v zKVS`ZH!EX0D}|C@j{i#Z;D-~i_tRAT=LrMk_=>Fe`_4hSql=HLeI<@2;i@3WYiqAY zsB@*u1SKH*OxqyZ(%Uh)45~b4TLIHAG-c%_!z6J)Aeb;-`Mo|J8^+NP7E@Qgs z$TabbaaVF1KBjLAGfRgHHRh`CEMYZMc0xe4Yc~~Cx#CoHPByJ_p&^-5G$IFqEPGEL z31i^ydHffkUmC5YtXeb>o!7|2<<;0ZG;-yLd1w;O(f2~0@WjQxE?%oYuX=fYC)MHX z@TOM1W}N0bln~3EaT8OJ=-qM_v*s%zscQFLsLyeNXMHNrh%dU+{f1&+T>Xx#4?>%=qUxt$~>AXomqeAwT^}hAu&sL>CVjQ@I}}3TlzBFaPVfZ zEpy@>pqm*RW|94-oW?FS7rCFq63nHetY2TZz7)p`qu`aWi;lL4v$NJhHRh@%9vIqx z9{{%03lVWkxx7Aw#bG0KiV(ez&G*SaN*ly{l~vOqfl$>k-Vz+&8@~EALO!T$l`!9(B^)M!=r1 zz42trX4P_cgQZYv9=nPms)X($7R_?F;6V{uIkUf$g0K1a&s=A`Y2P;3^VW>z?tq zwS4zM(|=&}VNMutSfUKUL9+bi8=c}TaX9)4L%YCbSstn`+g_R)o;3P3VKI=ZYkxJj4EX$g- zecNDV&qy3%@v}X+dy`-?{_=*;oE9~SO3X3t*)_;ZD1)rfsu(9RJ^k1LG#cIm5^nq< z1INP0Xw*?luL+sGnDa$aKP0yISb~W|UtJt5V5s_fX?*bpcYR)@Ko@LWqJip#Ts&y@ zN8iu}OmXk+9%?;u%Y5^c*_n@d_iKS`9$|45w{}IREr7eF z;oGN->zJ=du1CaoXMe#qQ1JYQ41TF5Wq^M#Mh|<*iUns0S5mNKfnwH76cp8pOtsyI zufR`1?pKx~6OVB6-Rd{?n-GJCEKye0L@Y|tol8Qi2XF4XhLP=?l^JfVujby|l z&)0OHVvIGIxfS=L8O9u;@~{ui@`rXN3re1{A^V+V*v@aY==mg5WH=Z3ELL79zIhau zucu`R0pNx(d(BA3C#(z0E3fd34ehG7kN#5F-Z>Cg;C`f^t>p{oScJG}M}u>}U(irV zIpHD}4eVc?yz-|O&OfKhdoDCVFEJ*pzkhs@*QN5f)^yhI=XGx5-fR zD66fDwWBnWvCl>w{B2w-I)bPdCDqmZ5);Q_?1246Peem>7tbzVf*tsIpW>uP7nUxw z*mu;k?j-d}$-HYH3tV?Oa^3n-$p~@XwU>{wPYj%scpQw4O>{T-=VsvEcoL? zrYgaX7hINMwt2X?12*{u-ONblt~!k{kA5ZcqTwN2ysaW-_o!o~tuKFtjNZo3854-g{nmZi0n{g%pf`DZ zV^MloVhsbM{v>Tdp7)il6tH=^FTM6r)@^6^Q-i>BUfJ|kHzw9g<=a^u!$|Q~>t=V~ zzROKgT`&onP?269_38iaMqVYLSwJTNW)}s&M`!EGCeM38)P8oE%O%8T0M48# z4?U@49?7uXr;XMJ7PHk!VN*w}7HwFRoJ#0_Tf%T7a(QwOBt*z*GwBU2AaJ>%R%pwq zrn!MxM8rvoor?%%4*peylT5PHlqSTYzeA;XL1DO|E0o=lTLm)zXkE1b`%puSA+Z3c zaK|~coBB?19kZ_}NAKlU7~H>SK!JB~NnV<~=Db6zvh)`(TOGP38Iu_8T4A4F*w6ri z?rbgeAfcz;2;2BN!aAy3Je<*A{zHa7z3?Ntx6Q08qu3JY3|a|dXhAYG1d;Mr#zm@r zJJ1uRlOy4{&h8}|p%$lh!5oA0brPA$Yxa=t7iQEM%NrbEmN;|}O|M{TtHZU=`wVW0r+(=4Rvi91!x`B2)c;*Oh0@c5HE$J;QW&@x3 zl08_|WpiWEjm1*gsAk~1a-QrRn5`aG{s>j6O{@AQCrbt=)vA~uSL~VI<)}l}J%*Z@ zNbjy9C+*_l`H+ta9q+kID5{b4T^-_-e}lkqKU2Ek=JgjY50+ki3B^|yJzllP5w-_> z_{;QG%47D~rySg8aUG=kNIsp6ftTt2ZBH{cN?-%dv_!I+C+qZ@c|e8(AR!)yI8l54%_UeCL3A;^=J0+M!X-4ewyQdSAam zm+z;W&&J-)OYYcVRRU4d9A_y%#rMiBWi4lIowC=$o~qM#0z#s?X@6n;YvA?0IxPE+ zW}?^l7H{ZYr12P`@^FZ0;x_aEJIe3qUBal3U;9bY5ECip=-=pU_FsQuD{;Grf(|V$ zZ4>NIt8SR=pPARUgN@!1)K3ypO8HGa2@36Bo*;nE($FR!Jq!8 zWa-~qqEm*xzKlwC)m}7751?GkZcs$+*VrYn5^+pNpuZrg2g{gf(aD;Qk zpBHguzwn$q_x!h9Sy<-%q0YFS8XgS&kG?V1C4ST>BuSd}>m$+WNMqdr?qG?H1;Z@A zxZk~!4G1haR;;dFP~7t4kmPWtnwB9Dl6Zx-yzNDz3^pS~aKxYb3fwF32{zs;;3lL~ zxe>&pIZ(Rs-m~Ckvd`R`(@8d)!>>?<^bUm1wEsDV$`?Z|TfSa~l$NWF+h31N#@9ZkMH@y89ydSh5dkeawK z{~z%Ndxr)d1!kE}BvDQ^lb0y77{q;$Z^us;Hg0aH-sXRxlk{u!rgfO-g!Wwady`H- z*5XV$XkYjN5Jc+V38i}8Tl4`$l;15_RY7o_VV-lj>k`$^xZ@*x0*e_}9Ss2pE3sU+R6S{}G~#V56LiqABXWZSq=o4EJjXeLcJGQS^C$m-$6 z?n7pv>Yx7<4ex()c3W|Wc<}avAmpm#zeFmTXOKIA7?T7Nva-r1Z>Nfv(>X;%fCMks z{UFeMU&(~pfQw<{2VWhk5GK4S{3XtJ=?IVS1JQxePzr^Koc@K5#IEX8fqe@cCQZ|n z&MX;h5(NK;PX2bePz68AWp4TPp%4j~Hg6j&by|+=RI@mEc-hY%x!$q6zHtg!{22QE z-@Ew$>i_bFq~Dq}p3EPnx{(&Q5?S;VII82zHWV#mlM~<(eZ__mBw5k-BqbOSEISC& zj~I3ne>>iQzy+v>B7-q2(zN`M-8;BW;6%1(MFi1Ul+#Qh1!K+`DX^wPd7axy*Br(b zwcuYNcoi~9>d#Sv=LR9DAJ{PfZ z{#X2A`aG840j6bi8FIOI@6+Q~z2~`8?>L`M=>7}S6YhEI+4BbWr%z<@l4OZbUxvvW z0cpD6nfej%g7AUNaWmJ4d#$zG3DSFiyi-4x zU*$AEr$O-BN(1P#xy@38Z1H=sWfiyjA@@_}#q4|M#-3&=fK%Y%u%?ff;JQ8DsV2wM7A>(?uUap)3FX3& z+q&T#=O#i&SkiX4q&wSuX+9Xc^ah_8Sa;bc6OoM`KdzC)rA(3RT@wI~qb>sny17T8 z{k%i799|=TWLYSgJDAJU0;-V+M*V-wjMnLRp)5ACf?eK1%#?EE^PEuv1e)amK8CKi zqt!4EwC=K<`-2xio#QGB&)e^zow=5~mAR?q-V9`J7yCNx4p`$9s9X3z9B7O0FKYa6ZjJn;!$_! zMU)+1NrOU!-qYwTQon@mdU$RzJb87a8#FMBnR?&9zWbHVva``=ujzaO*o2AuTXrXL zq7e)}a?ekaTjjlOQKQcbeoSTuzqO{GhtJ$RiFKU^lB@cm)*I`rOItNoQ43aM3NfP6 zrN>S)1jo<_@TBHXd>sOi71{R*HU#yX4mhHbe*|@JA~3*5%Y52K(u`QFf^n^^|KgI{ z+(|rdn>(-zdpzcIx+)132>m*>*qTy&av+u}@ilLiz?@$bNiJ@%f0`j4p>k@bEVIAQ z_FB{SL;kfJFPCsj_;kKaso?6b^kRsHNHX3TwoUz~aIzf!V?hR(FXWE(yzWNHt&D~kvgZ{d$nL7(1lvgzP{{Kku4yt zB1-Ta*{}qCTUPe?8Hk&WPy%fx=wYxc|F9dl`83P@!x-m%iSb{9je&kX-pCOhw*ook zs>kJn$hH^^S9t*b?^YF#>&!HvRpMTyA$PzX4%T64Y|De&+k1E@M*KK~k{SWegsW6B zOj8#keFRZ1Rm#NtpP_S%i}Y`!c-ru6pPFpW#A&nbnrvH}ZB4do+qj!I+qP}nHny$* zGw<$seb4>FbNF=Q*JuVoSNAPDmU}=}k`S`pZ)u zm3)5|TEshs@+bJ5SyNq;M$=(JtE=Q+>GD6JoH2({At3WAnN|J_@YwrnsmJ{A{7Xe{Ds=t=~?be%0vS z3P|vM(lCu@*S*t@#nc1sNXvFE?J1q{$e&hiNYt zHNRLU-VV2Q#!QRCc(t1`zEy4SA}2tSQ(u*L1pFsmm2fu4`?L=pKH7>{Eyb^4I;&(f zDm&{}nTfojaRQ|tn@$9A9!O^$e?F#W3p`ZTxv_&?=o@Nt6Ydc_5R6`h6=cP0f){k^ zX#holU$sDko2V!y03HTRr8@9EjZ#YdSgq@PKcXMCVj*G$53>fzGX+VHNgBpb%uoN~)6o5Rzs_;9T3RYLkA3wlbCnxq?x65sG_YFnc zvv;75tT3hFMa*BxJh1lRz}WUP^HnbQr7u@f@Tz$%nvh z;@FxMYca(U$FvFD5_NSrPnt>GlK-HYL)Q&kujcD7M6#i`Z#;9<0m%pZ!_8+xS#*R| zFeb?aau=~toO1E%uokU62@)3XB zK!D(dOnf?3027kb0MH$^UZ!0#Da<(8xbT-!{)nuy&pKLAY`A^irC`Ot1O-4Wjv8b_ z9->9)A&An_QE@H2*D}fbg|w~|6luJ<;$kqFiD~Em@vmOQIaPI^28ub-Q@JROz>)Hs z?Td5smQZ-6Pw4QDai6{8#xNr{&&i+#8z$ zW3}+Ph>Fl+la5A6io`RiYo$|A1e!1#!koeou0ATW1gtu|Ml}33=LwFpr373e*8ST9 z`3Q2sp(7{8%XTP=SmWvLg#`RSmAljGShxu-Q_u+<@~>f6j=AsNM8$j>5u=3BeKQjS zWFLQJGFLX>EQml3wKGiP6@O-hXuiHVf%;pBBwS8`VD}_$f^9j8zyq97;do>JQ&=lA zJZJUp@|>*rJ~m^H4R>&dReMT>S7`DK?I9vjie()3NgK4)K-w4SN2tzJZ`gN%m}NT- zn=y9wj-$o!C#z~w6J>GtOUy0`P%w&je^H8Tq(7oAJe7%1nkRwbZ@0*K2b{})BXbXI z`+g$c!AK^$QAjR2oVy5sg}btD@sY`RbSA1==C_S$P~Z zQ4U?t3a*Awn~9_ze<}>g+ZE~;rO=CEi4*KO`ETVjetWYy9yp7AKk+`2}J^zzHQ9V+$O};;|8zsa>(uGnXh57X5!?hcV>x=Z|#MFMCyF{Y0c9>?O zSr${)5uqnQ01qGRAAfauOM6BuJ!CqGJ#m{&m0PYRyq$@EP@% zsqoQiMgdWNGR_=I+mQ+xx)vGSTCf@N`}JZbv$NHn{b*V@aXt`SHXj%&fh%;?4;{=K zH7tcB?+GEA5$b#VyR#m|wc*b1`~&`FA5$6e>MgzgUGN{0aU;$E{#=-n5!nfs#y3^9 z2M$ItN!;RCAoH@my@m3*qZpj%VNpRIx`p@{WX9*2+e+0{gUb+3uhA=K>1PWa<#Tv(}Ep-ot@d7x$R!Z*7EY1rnh{c z0T`G20*#GIB^^(l`+GE~S;iK);&FxEz7M7}fAn%jvqWn&+ss%A<+BmIwgsSsJi zwEwnWI1Zk+53ScIg1s{*-<`wP!X~qDbH;5rnSX4~2Q38H6T(+-I64$qqbgqx7NOb^ zp@dKcb&B^%OC{B=7ue3_(6Zd?W4{|Wy^m;|^qln$f5}Q%J3^@GP*X{PK+giuc zgCR%Cm}3SD$4=(`C3WG1%8=oN9a!X=bT{e$5q`7^uNr~QTrq}cUeqO+-h~QV&*D+3 z72%ghnv(_Up;ue+5A}3B7lH0E56t8LwzNePbb52*;Gc3PeSJO~XWNOx%UXOW;?zf8 zmRyd})aM6+k^ePjaA|EGA&jK9b4g^fdG?H-K&ly8!;=J<1$`-?y`z{vGHOcCX%#u| znI2$T3v??PN46fwZ1d#=d6z!G!)LHL3qK!mdpiwtBjP=4k}v>@k<~L8%=*^>roGN& zq^{?^BDRLntc?37X$BhkNnvFVbkULf!!o(}>1A4y_e|6&;^M@#=ts@TLbC4er-M+d*a(>;WpMgZ3yLdo-FAkqBI z<*xY+2OwRe6`NORNXgl#6Rb-={?)vXP!SDhtAYydrnohEUUb=yMg$wXrH zwA54||1z}Dx3XoemI2>wqB_=%q) zqp0%N%1`C_h~>1U{k)sjVV_U$`dWEyh(zSYYZ02elAaC(=beNXcPg${7-;1Bm7a`0 zNA?*)e;d}EITY_3_6)81KUaBoth~?778=jH9BnwAEl*LU#Aduie3gY1K&O4vIz5mD%A;8VZ{fPr4RRKcByjaoH-6+ zWv0U}xgY0NlF9gz7P8W^VzQE1H`{@eq0sI$OLhgY|3vq8X@W2T0uDEH!}&jA8s*5g zz|G_xBuInL7Iy4rV#*hil|M&4wH^8a=d*VYdYra>#5Aa@(luoIjVTq)Ev$8O-)X>F zNQE0yjH$S%)tnuKYos`N${$M`LTpRlMRIT>t`ix%>sPk^!`&7*M&H|_!9?QdriAWq zwQb#@ohb|kZu+ws|2V){UFR|XyUp!hofAd|6`9@qkMFDn>8#}yn)xAeFn--_Z|bhMjUH0nb^qcv zQ+4ue6DnBvohPY)b-5mS@@%j_l@OYXbe8%xlUI=^hBAK(?xAkot_jx`EfG%xXr4LF zTYb6*2JJJf2cPb0!J2+)uM?pLQv^Umg{2bNo_=zaYP|&{6@t}VG~{FD0u`IVIGIj0 zyIDux4Ma>jGfk_q+6rQP-5w^k48Ja6s=E_RnSbcZws?!eQQ{2)n67mJ+E4|RPuNNk z|0}SfLPo2D`M<2D)B?ERhIq>6q-SZw)rOG%@ZRJ+_8i5tRXK%$u)LKh;bdD!k3#F1 zT*_t%0{S(6vK>L%l15o%^G+5Zm~5^m9A{I`J=iV%JMDVR)s-YxyAwr^DqI(~mX3fK zRbEhAynCFR4&y8eWbx2z3pz-5#bDH|*k-mN_j4t&x}8{NW`#huTW(^&2KPXDp`Q20 zl^E=TgU(`?*j&gYR}^CT?rv1@Lnx~)mdCd^(Q+V+hmAFQ=99&#;8EJV^&t!;L=FWuj4qzpu2t`DI^4E9&%*%Xq|f(!V%% zX*@+-RTeuTu;R#bz;D?+39I3<6gGx>F2&M3P%`Ahl@iKl)l=DDJQR&Ohq&V&LULWD z7kGtW9qb1wGhPa#XASI`P7w#R)WVwKHa=<&B`ToR;n9@+c;-jnuhRVzHzmVTpGj}g zID7#U46{-Vjmxg+9uPKCL@b){t`}2*lueQ-dy)xYtE1>fNknK5)wD_ku+m21P6%_T zr2p-j(~hoaZFlVDi@ay=Hz1f6?RAuR2w}!=w@%yPdk`w||qIxq}~ zqxv6c$IY}(5LU$6n3|kV0R8hAnDVFhg_O|$Ls(~hCMx(k%@ke;vexfvy6$`Wg4eLB z0R&4JgQ-B-s`M2NQj$*2U3LW~P}8io3~m)(tgm#5 zFG>%kFfahSEvW(Ly%*wqfJ~7q8gIi-q*EKUhVudRA84v&l5*q=g}Z>>9^FNL&RAS$ zIeQTQZ?CeoDhi;}3Hg%D(s=XM8p9zDX27nyX&KMUp(R zP&l_T1D8IO=^iWvS!mFbGmDOjTBqg8yxAyQnej`3v~~2o2*_reX6bEshPnxnZLMR( z0sASG>B^C=hq=9J7a{`-Q)h<=7Lfo~$41~2?n5i4_WK>Mb-mNrx zt8MyQM90`CJzkJ#!<@o-5NF;t#fs1N7&RXz@=$@$FI`jHPT(or1a-dj!L2q(>Nn&1 zlcVCKB2LbM^7B#8$t2cV9rMDNr;gz_>)6stSIMEq?mssMmKlM}kq&d&WLPR{joKne?yTOuHt0zEGr1l36yt0ama8i?I#{RBx3bG!#v_!?6`R+k z>I$h^gn7ej1D2{i4h=eOLi9ya^?cP*hyt)ms{{`?yb6^ghoy2E2ZLZ*zq%G_XvP-n z1164_GbU*on>_}xxz0k z3V$#EEvv@fdEa|mbzHDBdUA&c`@+=HaW#T+M!#-wneS(4KTBqQ~;d(i~j zJ4eLR#@?`I+^6L7&}eG>5cCqPH+_7o&PIDNLSs~j=HP(Qmo9R>rVR%%&Kh45Mxj&R zIy$(cWV$_;-3?FaEII~d`AuzxR;^8T9nr&(2${Q#!l7*D;wZWy5L9d|fKm>su-6n5S^sprzB3*?wXCWwnLFIryhRa5HU!p%f2} z^f+QbEM$ZeC#VG*+t@JwprnOZ!W?SyVA8wsg~IIns~3)Pm-?8d0(n37z#98BFZEbN z?ymx8D+>WZWaXYmDI_rySqK#sPZzT(nb<1D8ah`QTQH>?G8kFfTw~MeB7-k6hUeRs#jf}jb~$dZHLoiPQi`~W^Z>N&io#5f zfhTWWUDL|_Kmyf+(ul#jR1QJ2Cf}|!e}q(S#C|7D_`Do^93K(vR^raCltd@)vQ9F& zrA~!trYFvt9CN+fgAK@i5g1znnfLEu(v0Ql@}&T>)+*rMhZAwVfXwT`Q_aRdd$~Ea zGZd3BBn3jowO6~g0)rAXwl=2t>GwyqqAx@8E{;gQK zjYh@*W>4J{L-d-&$6Rh$%nz19jn0i#NC+$lfk`-k!t;Ic(o<-K40@oN_xNu|_Q?lX zaUPScDIxGyTWBTB?GF&lQ5)UQ;0^ss+f*^){T= zQJPWy=U-;F^Ra7S7H8EEgkFSg$540)UE8wKN0n&4aQ)aOqWNN13(E7gHolah)LSK4`8jl&Ua4WZ`1GrJ4_Q&UBA*-;Ai}YnQl1 zIDss53Qx{Z5JUB*2WR;6za(p^L0&gV?L&v?33il6ilm%_a8gs=iWD7!5xCvgJj|d) zja(F(jNYnc)N#3h{>2bUWeVs?CcC&+R(~GJ7M5c{(m7 zsv(e#CaD~)1ln{-`J+ZREIwW1%J+)?tKHBWveQ#stFmEScd(QZ#kqfk$|oxiP%Dq* zCUqxnF%wQrri&i}nVCXuP`25d$46(|h$5kvM3|zeekY58`t!nR6!&@1AG%RMX5(V+ z)gpYk)T0&^%}6qATQdT^uZ(t7)zyDZW3I%DVv!&iy(TeeAj&;5AUNyN|RU9CDEqa@>cPJ#YlS_sQ#)|_H>(DS|lWhF>3E(A{VgCXIcXmE=K@(&tZ=D`+ z=sfkHQ{NMturasQ_YWi95S#Lg?9XAE869Aa9YG3YW9AYbI2NQ^D zfXsn}EIZFZxVnOGT8=mv!SUhL>X2=@&`BBnle} z<1y=bmYUqFAZetSU|cOAGr9??5Q>No_y8oawSgyQ)7t%nAqjzg0ZCF8Qb%3SjV$a7 ztD*o9qasXKb>H8u>pUl>4|moJl6={frJW!B6-r}D`#ezXZ6c6*bNVA0| z=u9@t_rj|e=%1JWiu1HGwhPi7uy||+x>E(jJz4pV2tRWyc z_a^Y&w9=-5GA9swef^z75Nm!k23zXKdV#0{h(>Qr5Y7Wq?p`?m+d}-6oeRlpU;U-P z|1rOG*O4J1PTdgw@nUJ-^OX0Q97jy2vc3Yb5!z>9Z7Oc>81c?^!sNu_oy2%JIf?QQ z2`(w(USNf3K=qK+v#Ayn;c&(7VO+2coYAA zXh1X^01*6^0I?)UeL}85RLYIZ8N<*?o$#c6Cj4c<_oS$($=xEYyGs=5)i4|D^nlP7 z(s@c(Q3h)g6G{Hq@qa%|YU9e4@7%0lDvCc6k|06QWaqZSqtz_1f$!A+%@Y$!#c;HZ4 zd3e8G8${s-f=NiIXr2fv<#@3KR$sxv>3&}2KP9laxf9*=CN;t_Sgo}SaHQf%KO#tf zo1r2e+;_U^|M}VP{6gs*anb(V_%Sy9r74R;U1#$USz>r?iB5+wb2at$_jr6dbc@Z7 zp?YLCH^niYAwTc&^im8GVggk!vZYUCp5w@lGE+DCX?jM({T64ATe|vPkSxdQmRYK3 zvzqfd*RA)2o<;pl{&CV`-DGnDKgl7id`%9)z|Sy3r15?UZ=9MqAh#BbdBFYy^%fN>838u`I(w9Y!jI2R=2jZmo7KfjgcKc z{pJWF^Z+~_Ha#?x?Ee4hs zRs*5z0dF=XDPojB6n84flri~Lrde$^%^#!`*-$q3W2K#%H=a^hbz2Vfx^f-C(*tqV zor`Y8u$;j}Q3E@@j|X`iD;HMp3{64NM`j7jUv4#O`~WqD_vu%FDeuQGqqH1u$88Agy$%Z zalz)nxC=Kv=6JjBAU0Ua_g9xg!^$Ynj-%JiL58TO>5hp&(ebg}LOxmx(&cyv#9aLN zS3#?|B76W*Vf*_goAJ=;i(9FrqV~nuyeL<;_=xa{pzjn6(d5(fc$k3}=|Hu7TluPq zg`i2?#dtiY2Ca(`)mZIF+kzE-IZRbFPSxv^2-2IW_-*Jbzy2`mb&Rlf56^3tuC_Nqs1<(IuzB%jlYL5FJ|1HQC{?_# zg~T(;=??2C@xpaao&7LMLZ$|$dEy2YT{%Ah>$r+hVY;cf+h zIy!O+bV))HpVDb$vh-DzgZa>h!b(|{xhkurgK?6tB?dX0Lc}Jv=*wyE`esg+cRD3L z?`6CupiIsnG`tk;s;KfigMgI(Xgxa`DpCq4nsQY5qo(_BPsWVm#ez_R`AgmFIsq%R zalcN(NAyX@a2k*Pz2%8>5*ODuIH_@|G z#7nRCRY}y~vCX6cGLHM+p09eFjM`o4*g>qLDcCr)duD2y+$fXNegRqInZp!xMiIQw z?X2$^AmsR&TFHUJ$YDY$rOO)D|BRNF2azA%_biGN`vRVYqakMQ<# z4-ZjzaU`lfKddb4 zw%=pm6Hs?|<=M!78xZF;@1C2WEM#0jah7G^%BA`fW2|!~I|q{~%NunZx|^YKJv4#Y zM-|gske}_KXy$igmcDCDYxxVwg{x81Cbruio2N%OE$Yg75>K@(47bRtF>Xk+G&YIE zcbJhmwv>MGwULi{L6Y&Y=Q0~A@(5=asNU3O~zMQ3p30NwqUS|*CWxJia~rF zvq*6&Ih2E^{rQbm=ditpm+?LEdaXXr??`MmeF{CcaI zCM<23Jvz*^5bG=*z)|ldqWiia@lN*CsSqW60PkfW_Pu{zSnBSMKfn)m-m*#JpF>vG zcv6)n|5YD&c2)^^j0Lj@X7EbkRtTH@E_ksz_8o^TC#8tXm}P%sE(U@l(J7`Xwi4V# zyk>&fMKqKDez~}4f~H&zku@P8oCPi)VGpg8g)?@BbUfY$g@pxPD|Q30LnhOgJG`Qad?r{ncE1=fCSz)`>G= znpBvvB5LA!D= z%`~XxMqkY5w=N^>W{#lwXjR(xIr>$qh4U7HFRdh>d6eND$Phf|AO)+#Zm2AHZ65n7 z_r77PiK8cAY zFqj^vC^xkTT5$5wvt!x~?BKMke(SgHL;A<&CQCN2QM7K@jpb5m1vJuBQFr~CnSvAp zKO1yCof>ifY2N+!(idxT_$5_`Y`Ab-JV`tqnRd?5!&-1`5N}&nVCA7*$BT<0v@E;cH zX+#8$q*$d4$+sL*m}3jNu1%j3KQwP3$?VZzBWN>k*Ss&yA@fKT$*gI^S zYv-JhzzKJNE-WO$-fCloY7o$@l6o}Q#Qi^Na#FX{%r@NLF=(jEW z$$$@-zvT$!wRn}}SF~wzh*a=o)Z@g!zTdO8z|3fbY3(&>LaCnKpalZxcwTiXLOiB^ z9l=5;lk(R+_6V8{X%EiEgZot;xhruvaEgb?A#{v)wLAe4kmQ<$NxQK5NY5G1(LXvR z8I9+F&s>ys@nPz#Qm6b;w)J1xD8@aUI2`P}4aJTO$$q2O$$h+&>U&wE z%@$}bTQSR|cOZ_JuGZIE;re-F*JQ+1*J#HbQz7=HD5?`h`gF4Mn*b?K@Z+G*kz8V5 zynHl}*`uDfx3J=O=kJSvja*I1?f+`ELUXVki1&y!MT0v~& z8L-pLrKHp5Qaw88p&M7O5&b{1X}&-xCr6{G3qmMkt}CwSY8sLKDS}`9XVL_cXv$I% zF|tteZz<4k%%}14X9>85aVOu7)f}CSH_cQWb29lgD&=XW=-4yQ{;nvx)ea*fm>0`7 zEIl(}D@%Nrw04s(k$&H+n3tVP#UY*U<{$UjvJ_pG5tH*^fX2`{j2lXC?iKw)d7!>1 z;(h!N9~aVh5z^TClP-((5`u&N+16N`)c#CsH^7nr1naX;J~JqN!tjPTzZWGQJ}S;^ zgkIRB@bIKjf6KV@APncnuMkgUmtekHo*J}dY0nrINg9WR+;8k zzyX;@Nkvf=FlmkW0Y*KD!{n}W92TKOKrkxIJ}C}0-&(re))2CIfZ@Q}a1IVmV{vf0 z$WbCEvfBFu>GjI%8SlIey1gQEfM+WCn@YU=HUNqc!n80yenZM{l5Gg8>ezu59y2Q= z>wm@_1$MmqBYi@J4eRK_#OV+ZntW2b!zG=PnO=|WEaMzgV#`@*yAF!p3rP+p4F900 zYpg@L-AL0NW&bs{AeU7;i6}-!3p-fN6`Kj*zSvf@bx5b?D6`)4?YMHpZGAg2JMbG7 zCY>xeVg7gTMmW`Xm~T8&a@^FsG~7PXU}w5<_6>gwO_VI^><&Rd;dA+t%6+UI@;B}b zjZh^|@7K%vadrw)^sjMf+*TIad+dvudAdv;72q=AcUMLd#a`NyZem6m zaXj~{JH$DR3Kg~`Z&cq%Plxd1OMwe7a@=!PmIPEpn{A%Rq zka&3GS)rQ755P_w#Nz~^bjqYo44ln@uVF8dRC~fTcCu$=UdwPwOLisCv zH|mbkd{XxhJoi=eaKBxj^W;<*YDO%qnQ7}YPRW?8#vYIq z7SS0~dVS(z??4zT+orC?Nb2oiu{|nbTBI2DeJ;)LfY&*zHfzD3`Q2XO`0PT5nL&HR zrGSrw^BDhBqH7`21GWn}L&L5Y-!tTZ07$UU`10I~;W-u$9_t;== z3`PsbRLm8>9i^3y>uWc_@P9AWdlV~Vdzm{m`dkiewf`*F-_5wu7MmN-Q`aZEelNYlw%2J!zr-_GdJ=#a?2fqkayd~2>56k5n@vW3Yi z7P(|cBUocWXb8G+H79ULcTHdQW{kR0M0=Ql>yq>?{(zb@o|e za@3OhvF*Qlf5eniBOcZpRVmp_%m|U8-x&v)G^aL#Pw$R*6iLL;n@+T;Iw#{%aXJc8 zk$~!=Aao zUmX&^SOQ)IIn1|G`Z$6wlw=zPx()VhXqWS!DPnv#+~tx@e=|84zH@_o(1ahz#plKcJL z^dV*i!`&XL75^)e%Fv1~nTc)Od>BGTPv5HJq$zRa0qMq2F^WA`+o)y^o>y!I#TD7>)4!0bbYkTu{ zDJ=ocY;Ki)W#O{37#P%u^{?kPsB2eSIq_d8ZMSMRaF8FROEW8F^fTF1%I}w^GfPL& zli?mowlz*N*m--fGoG zACDSp1EU(4+@a;20Kwkh4c%`W$Rr5gW6bE7@279sE*04yH%IuVTXfhWtsS2(ZRR35 zzHS?3r{C*XIgjEh?nSiV43oK*6yNzN6z+A}FU(cFMY4X$n0glUnZ5N4U|%kE__-X8 zMINJb5_{*>l{2(CKy}2`?L#}19E+Ptn=M5$o;NpkHU!aebrTyHC-h4_*ZQ7-6H9 zcOnNJ_LTsc8FAsUc5p2!nsAJXs&AfJ793&Uclno6S`&e2+aqZ#)JHT-mJZ^3H*PiY ze{*%!(X7fLguqstHTEi|$AO@cY~kp;7lmV{|V5faQ!BWd!%T%x#h|7w-rf zGcqX5FDyZcBcMN9Prr_yxs*%OWg79*r)?cMeIRaG*-aDANWBH)tZI^!LtelmE2UGe zjF+h-LfR_|P#^3=yQ(r}hSITBloW~R{vLX#j0#eU+*(}&f~C9IhAlu@7&uzTgjVZ& zC&tJ(TBp(gFGRAHrN5o)#*I7LI>|qmrAc^DrwQDq6{w?Cpi4x!;)W@Z1TcS_F`xo+Gvqu_SZ_uWlDxb z4mv3D@BU|YrVWM&7D8V*rVpYO&Z@-^L}GX+XB=k4VqTkg?lko@rqT3XZtI4@%{AwU zta^5g%x`omOuQ0m?v&K!4LwpK-@6WYH?q>u5D+OPI5F`63}+yI!e0r$}o5mJRl zVy7SyYfW#)RdbH^j`2fCxZL?7N(^grMkG&h8%M+xaapq$qmyM~;DD)_l4XJ+TPlYh zd;+!8BjRaWV+$7Ox)44cAvoKDm~wfIsWN8e-m? z6kU$3p;1~z$#z>sSNET=tVOn{Xb}n{|0VvwyOjGUE4n7XH0pRzwyb8qPM-P^{hqLN z&M9S({pJfC*-x>rlVb1gJ_Gi8L<uKC>&wus?ECPNu*vEF%8 zgz)Mh>s7h&F?jlOw&yz^^X|*3O+6$y(RGg`#b&W~TjTQ(71DmxKL=*Pa8X5YLB#<3 zf@FMzEcz0fAdfgl=F^H&mL6YX6u;Q1OknAZ9H0xSL{G*Z`%t-)yhi;Is>l%I9uMEe z4GLuCV~OeAXdo(GFx|kyd4)8kd(Qr&0)H zW>*WMlR5`TV8blSd1SHYkt)5AMVm4jR8(!*WFVMtRyt?y2wg~*A$6H>Fp*~mL&RrQ zLz+KdyevjJj{`k5hWUKE>0WM$!%A!6oAt7yMi840dMx#qymDwDUFGHDL4?V)Pz(yqCj-Fi~b??+#38WpCP;5rb2W|(0cvC|MlPLCQ z^W}qt5?HgW{)0M$7X)Hgbop|;^%hNv?TD!ys+!H^ED;V1+LZ+#CaZPf`ZLRDQdm{S zkozoh4V;VRn-6|sDYzP7ax6qKecI87@>`~>6;KYvl8VvG>UcGMjXp~h6q*aRzdqHN z{uzu@8%fF+HQiEvT*uN&3_&8 zW(~Zxwc@32WB-h9WXTvH!;zPP1|Hsxjk#vnvDM|8T152`Bz{dkAL%HuF8BR>lA`62 zs8B>e9u(lYsR;G4xQz@AKXejuYr(h}C^#OZrRFM`FKNo!*xvFSy=|xZQ=InVmxJlm zejIsW3xtBhm}IVwDT2sUN@r-cA87Lx>oTev@cl?DHJ$w}MD9;Tu-g^#-oBQba7_cQN zZOA_SzQ|}a*Nf=S>0)dNm50e0tTXx*+LZ@Cm=a#{9BE~i0Q?I0P%GZ z*H;OIFQsxOi9A}q6oeqkNWxKev{g|*$e}?V1!@MNvY_1n`!c$O?K>{}G`SUR@s?TJ zs7S+9%QN{Ek7?Py!2aP~s(t-|f=!&kKWKyEzs)D7T!9OS#4seM@wIr}`m`bQ2f+7F zFUBX{_cbgL9P|)boBzanRR|@eB>@6(%1lJ7WPgr@f$5b^-dxo0-{rdR1Q+p>b-ns{ zr9K)svFV!s5(>}*&UfC2+lOe$`<(uj6!Qn{m%Pu4;U_#G|H`o*_i~a_A6Uz+Ert4K z-w24RHZmW8xxU6HHvsd~2F4Cyq!z)j1kEC$~MY7uu?jwB#<){fd|!re#Y_ zmMO*AZLy7(QqnIzf(`pgyKaT-gHveEQHYtnaAM0~&?lw&GE8$rfWcSJl%kT4`(kIE z*Wv-YZ$y(524g6w-=QdUdwCQRLzM*#1g9{}wva}{%1LF9&B!)g9OJef&vHRCKgD@d zSWAKz_JPcJxRaMDhq()N*kKr=*JN}cSCvg3x#q2TPvWJc=6DYF#dqpZs^lU@){ta0 zkfxflI6xE}1hs)$N*kNdLr%V~R!DUk>P-NdH4rfn#TI*cFZ*zyqWy)9R8&L+ z=op(8{kWFG{RHldqgMXH2FHez3gEc)+NfH&VnM@V;x-xgb}wtW%gu{wX2UhbjcRST z<_J1WlB|pNG0pv?GH~0%y&LO8xt+VBt}X13Y2zTdVU=yGmock}e84l!zhl$-E zdarVCdr9Q^#Qir0WR^94@jgYKWe+yD0C-a#T6r$&0&anfW$96&7?LX&Y6bQsmXqep z(w+9`8nTxyp0Al~1m-OR!;*=K*1Jzbm4YS*9qWJ`9sd1%>J%sulN`&Fj`*F981v6O zt_U`he1dPfxX6??2Q&8LzPr!#t8c0iS;pV%hhZ|T6Cno@JjN%JpJ*IN>-rI6nIt%X zq}A3Jm(a2h6<#GVJpk^V=*y48#$~SfTK!zU0v|%G?lOHMzrm>~L>hEhqfS6HrQ7xo zWXX;k3G<_+xen;zv2f5OR%D+ble_hEqcqvvmL`$_Q5Ws;rgOHhSnM{q= zS^5T=9c?pkPFwfKw}9iNm5yo$PB}%JtW<{zGcN5y!y+RutF>Y<(E3L3UL#|HX>_oq z{HoHb0cy2Fw&CDdl~zP)tG1qO{>{3qaBls`BWsvVPIJP2-mED)TkTY3GaiH&X1usV zQM4ddLmE4)4l_2mW4>i?m6Awdd_OAltc-zxveZ$+~kkV+Rqf03kR4Xa7WSKDA8ly>UF|nf>D3Y2|)-9ISZR5qV z@gop16@Rz@NGj6=q9}zz3?VSFfIotD-QH%Ne82|h7$xNgU{Ev?YA7H@%K9Ml2J;soHP4o6J6h91h<^E!^nx8 zd4I{{!vgkdNqyo;BSa%EKDWr!MIlm!6kW1TY}DbsrdN!q6!FFpS-1|FDb zQ^@w)D&?7tQ0bWiMotsy%R1|WW6aMvG0!kM%5yM`p2)gL%hgp$ZOoKg5|r~wlO|r% z6k6kxH$4y6pSSf=7egFI`a|q*w{1S1n166WZcvbVv^dA7yr8*ruJ{!rE}R*b%9&~D z27Y62x;;vFdLjp+9wGOMKPr`VH|9!S`z6OMx)$LApm@AZ<+*XoZMEcB-WMF(S%>CH zDnJE!WLOfRI_o-XeGIA15pV^kv0Os#RscT$jEsU31*h5g!c3jV?#43sbHOas%YVzA z;A%Z0h46Ix$Y+V+_tw!OM9!}e(U4IDG)sN?(*sjXqiGRO76pD@!kFtf-@!#Eu@!~{ zAr6|ZR|3bB6u^j)BDzClG@0Rh;XQ$Vk6mBkw@cfj5~;Y)I`ic|LuWjX*ndEt<^)j8 zu4aj=n<0Q;16nzTw&*~_i|P-66rJST>35Is5Jfvd4@g5J-fB~$VNcET99mul5_~yz zmgRo3L?YJ@#3uJ6-;$jo2#I!lKBAhfvHOY+ts!e9?F{HFdV;B~a_(4l4;o-p6;K-H zqf!Wj%DK;?yRN$Ts>h#zaDNg;wWV!nY#?6c@Z{8fdK2d$XPF|DzWw*Gju9|98b>!W zV^)ET<36=QbT6R3$%Q$%3`)@|=jRgu&oH#;bwI?Bx2@0&K_sQ3>)jOaBSZj%1Hgt) zE7H!Ke2fs}rBw#@iz#n#=^+s;@QLvGjEd7?B!zSfDC)@hFd%E38RZ`6ea1h-38MSb5 z7vIuwp;s=mU5#tlW`DZO6po;fg2#waQb30>M;|+?HelWy&S5e7CtF1@&^7Q@$eU;$ zF7EE`JGb~=;*7Z8G`(Wpa=!hx)z_Rgz^sb;h*Vtcgx(ImSUh{L^ekvAj%VanMFDc=4onJydLgx;itq9VDdV*bJQ2 z7w+oNy#ohjq=b+L4$upfs>UG17JBKdeS_~jGvpJ@K^g0{$suSVyJbPk=#wF|0@_MQ z!C>F7FnPHlmVwYLiHu;vk|x`mGD1>gpJz8*v=I)TWq&m|mZMA$WdAd80 zV6BUrYJY~MlUT8HTHQ-ZVvAS8w5SlQg&08lS-~X!R1TQ1I%LC9tbu5J7$ZXWBAL;GzBGPk<;&)fhy!BP*c96om*w;py`ysCw7l!pauiOpVQk z6b`pu{8I#pEvQ9*nHj-k7$)Fm!3*~LeKXgNr0K1ra7T^A@BQpn56~#G9pn2nMyF_M z@qg2qj#p*h04|6OG=mxmQ#C=KhqUp&7$Ytbfdxe7BthSGv8?=OcgN}GFyLxT-r`8e zLMSEafgzYZJD6=e9~%#4*LXy-Y|Kkx3=GZ(v)h_(;@;@MM_R9}r)*}5m~PNO4uDck z$$G>#DU5y^Jq*`5rHwp%M-)q+cYQPT%zr{&PbE7qAf|=^WktNi&nXZqX>O@x9{q4mne6&BAGa+~vy{I-uPBgeWACB1x^-t{SI7Ve0wk zXSa9NAU-|;N};EDs6|)0B4Bz@q(%LrBQ605sc>Kks;L~4xTA`q?#n~u5qpRQz<=*U zvIjs#CV{zvjX*}zEKI@7y)op~wxj8H>H-`8oFGXi{qX`283IWWbec1-snqFxG{!p= zcE9Z%|Gk8YL?Z$$dxEKo2YsGRpQFOchur@jrO6xzSj)V?s5DW8`ydX~cJ3=nZTLEL z6cS)SkRt*>kS9FT3n&_#so15E?SJSKaf}auR7&j8tC6~$9U0;@R+N&HrP3Y{*|GWz zm&i7^7-$SS($6FATUqWkWIs$C#)tt>ghHadpjYty_a*+ieZ7}i#YGItD74FRzrzC~ zv{_w9VstiQ(^de=J*7^6hRKdAdacNw-5AnIj-f!s)RtbdUsGj1R* zCut#w?~ITgp^P?ClCs)F<%M9O;6iqos3d17*lRh}DWyb`RuUZ{f+)rZqbmR&G$ia! zoXQm=l!flfoMlL)B|tAJB9c*&MTA)bp~P~C$Vt{`TPGtFn!>#xyhY2kT!_~T6)5ne z!QQMZ9*eQ*F(q}7)=U{j9Dl6t>8_hxj8(c~D{`^9$~P+|Zw16OnAewXj8%mzdmyZl z5^8AHL!jpOr3DsvvRx@WP^28r#IyXL=j(LhWi3IHc9QpHZrPc9G)yffiP9Q}sBylT zrZ^jtV;|=C*^CvrW+Yg~NTdZipvg5d!Vb5M`pV6mMlKs#1Zr`HoPW=fLi%36u-{!P zd)3LCH0z<FWTgiVuRE*wPdDeB>%T0|lGj4Tmt(xUr)Y?`}Rhe%Z+m)@; zZnV>BQlNxk10xur5PvBYb%4NP(t^bSmk-W;oEwT}0H}VTZ8n61gJoFksQM5LT(&89 zY8#fd${f%JtN@_wdUp&;HOWFYyRB}Pf_`P*HoVbLtdU7jD?&ox*sfN}j3>o7lJE>I zqXbt&F(@)aZO%S_hVSUTO?KM8XM5;54{?}n?x#cr?T+#vwtqowIiMS&j9@0PHu~+7 zLjfhhPH|%Mq;N5aMoVbbi#D!WuR&JwjZK-WT(wN*l+#mGZMJEri9-~G6fUSq0-_HD zR?;%|fE+r&G3{`n1LsR-!tStnX&>2Sh z6j+MMl76_NTz@Zm$yl{0l_YB+G{h#thl!^Egm+&2beKVQc^*TtGc+Gu(JiM+A9(j% zjOeo?dW{p6^5Na%O;7z=9Lu59Cio8;=DxLgdsHV!MG%+O{rB~AfHmDHl2s;7MCGTD zc|=`*lzP|zU}B1#&V7OHK4(Uo9XjjNi@T>{n+L>vQhzhpHe}b|ov8blYW=0<#iWt8 zQp9Z|Dy5|@skEfZ#Fo&KFo7c?MVWkU)O4KNIGj2z^~`zs=x)obIE^WD-n;yIG)Y6? z{%T~6%_A;KG>KJEnt=x;&ckW`AG=hH>9H6_X-QRMmQi5I9}lDJcGPB!qvygJCW@5=m1F9dsS6c zO;ZFdrMJZ{TWwgP#TH?4&shlx;`m#|`u-5K!GbdAT_w#m0n7~D2H zK|;xT$DAqTTp>LmA;kPAQ*_HLBnxXXS`w&XO8fuvJA_!+#!1 zC)jjgV*|*U)IGulCP}bi*gs~I*4`$6^8jMPdwhV8860>49)*8%u~ENv!aW1y10yaqXI|RjZl={mWb||ldsJT+4n)q9R-;d# zT>ls6_^*}rkb`2QR83J6M5z=>Z5wH7My>dLDRyIIXws5dW|boqDP+;JP@86dEs_$l z*_uqlGi+&TDODv@hT9mZ*4ltbn|rU&{vXV0)A8f-deSi?E86x2VC0BvKyXk!(P!hJ zR7n(1zx9+hh|=>AG;|kK(g2VF?gJw(5ABQlVn~7fF{mh9Y>OzZ?61%E)Q{o$<-j8= z{BnNMa$6AvI@z36{Z>~t25M=4(kUAi&B7wXw!X_uq8c)e#^!sJt6iEW2 z5Q?lKh{*j>T8NSagjggJB64nlXZ2{S{(YVLYY1j;N@gV*MI$Thj7b>@Bw+`5G6aff zp#`!O6#tj1i14{eM1aH-&>Nc`%Lord6(=O+vK)?H!$QddNM<|(o*8FAcq$W z3}hiikkdQ%hWPVG;S{6dhs*Joc#%gKYI!vpfj zd|5ua$U+y3zuo8>lQ>XC{Xr)Yxbl*g9U+lv!Req z>4Oe|((9b-E=m4HjFSnZ&7px7CBY*rN;+h`6RELJQeXi0N{E3OQiutho~58V>HEO3 z1BiD{HpXyfu)j z+HCxP}F0p`w>;Yy)Pc7%-r5N8L=wkeZz6CL0d@!(yBFbiTa@Z{ldTKUMafW-b#Cg91pBGd zuJAfxBO#f<$TQVq5)iWL!#b+K=w0f4NS#6>EA5=N3^3k*RbdP_sKM|fD}*M%g66=! z&XwfSMKf(CdiLDeEt#vGqDj{T(3AA=!g~I7Rfn??Evldx=0=c=6(Yg1OAy29w-_-; z8;o-Rf%fOinPJD|>It8VOqR0BA3CGrS8F@rlHA?Q65-=^iP6XwS{-J^W_akc9?rI4 zIleWRcb7MRH=mn4vv$)XDswnOTZjr8{lEN;4p-?Dy+U z%Uf!Hd}viN&z=Xkd}&~cdax@G49utKbnt3mq@?zHK=>Ug?8*3xTrcX(641 z^p$?R@8!AF_#mFrC_kPm$p|Vt>*w4Dmq>;PrfQEQcZnd8AZgJ2WjrJ#k~W=lfm$uA z<602|PV=mTQazw^8Ao4^W(PaO?|mnxf$;>}9~xfPA)sX=Jv|*k7bA4pw=TA6xm~h< zrL>z-S~ZJNTT4T0s#?gTidK;jKtfqTC(!*q^XaBIu_-6bWKY#`4#|g20X5diQVD%4TMHF7 zWGYzEjC$(Npp!_*8ax@qqk{uT;}14f1@MYWsJjtj<8s=CspBkik`%O15&4{_I5hJq zr%*Y?Hd+?IjS!a7g|G`FAceM}Lx2Nb75KyXdcI4|O)sPU8cx z5yews&9kCaBP(a}7Du+S&Xju@7~ze?ukZIaQ=sEvbNfzbE^~TJ$+(l^Dn35crCw;g za9I>$!VrTQ86760MHRAY`Toah#_ZR5b^@ZwW)cHLWJ--d2_eimnWxC(>ylNMPr&*Q zFEmvVK0!yq$|EjYnV_UE;i|rWeHA`c-glcP*CJN>Yj{Qy9V!l6A9}&!<#t=%>ITj&evH#hj+5s9}Zfn^IE;axZzQ zu;9dqR5nKo($!IKiN{ukjB!&x15VX;j9~zbk|7W>5KS5Yhi9R|*>&TlF8!OB@l zY%>~WImmvo;NBsUX>IOax^td9rVXK!H1Kn-DsvDQaW3d zXZ1moD>){A6%@zgAHP!&m`sG5#GLt?P{tAvjJx?!B#_Qx258~240GN5?8|fs-_UnC zkn^!SMO!B$E-;fxJG%~lsA2HBDPJ=bT<$x#`1IYV*s-2E$+TXgHq1k^Rz+81;r_hq!?Dn94?Ir=XZK8Xu10w_Z#!3iLoaNh0$x1OPRz(8@Dv-peLaLIW36d(L zNSYCJU@?dVn1u-hxfG^aNEA#~5A*Z!J5I3N^BDLQeABXaNT;59pALRb=faAT2DMD) ztSih^8Q@32t2 zARQ4O4tfIBB_xP%N2;t4+?XdwZ^wJeiMMkTGWk!n&X1(f)W&wnGhtD4MUb|OP2Lkz z*p2UrDsLKLDvGQ6{P)kh|7Q zUMet{A`Y^y8)@e;^2qHAHX%e;DivWj4i$z-H2C=Qu+Ygx0MoZ(eY>R)`zNFIg)#gi zE_`Bh^6X9inRBB47UUx(D;OCTwA1=%aFcF>Soj?8I#Llj zyZ1gB@YU$}c#;{)LPCAWqErSz$$CJ4+hh!}10+!=ziV8GA0jdrDkCnn+JrZh&6>q! zHnyW%YAqGKZPeV=btcVpwyk!SwRWa~05FEFW~%k;2_+^_u`v?Qw%^aJF1l~d4-GvObl(vQxzN#`9#czPJK&=y(YrsAa$9*R=F5|6}NTS z;hFVLMff@J*CCBsrQ?OmX5-3-ZdEa9)em~u-UWMG6L(ko{5L@Zx@nH{icFRRt@atr*|E{2Le*cBt=;pg+ghU$!NfGOv(naT99I5jzf(;`cSye`k`>im#Ff}@G~zxpXM=c@Hg^nHO2(kl|kVXO|tw|MGC|FrPb)$!Qh#n&=@0qaS6gV{AOfY(J zm@|ztKx&ENd1L103yREST@3mAS7+1v9z<6OxQqj z|2e|+!-5vupyPC+RyHurhe z>dv8r5d?->2y-nEs#ixkj@(o=BP-f(cUip|6Pt4b1M0BvD117GYNXEigQC)>B+`*)xf-XCo^kE=F9jGiFf~3=oS) zZ08cS0g4wE*{FmOcsS=9#*>oF+D%rWywi}g} zgL1H(0TVBOg*57v{#oo{F*Ij_(sTC{TCVN{iAy2k{*L3%k57V2SCbn)1o%R?xZf z@unj#a?m);aY2muHX3{ROatsy+YiNo#~5CUQbtLCSi*E*!xH82=E_IvB#-)$eZK1HV zs@<;`fze6kT9iH#9D9%7CNYLMQ?+Rw9DP53cHqQE!Dz%-olAT@mv=APpD%B|PSlQ# zn@T{p6;^m9&2a!zk4rlk8Jt)$rZ(3}fXV7(P7sL}K>% z$3;_IMNx{pTf+70K6;(K{s`92pF(s%ki{uzVVh=5OK3ohL6~*@9QbnU2>3atiK&Pv z>*@Ud74qfqY;ya&pu@E)BW8`UGDUZI1l0 z#av-y8g0_2dK*pDiA<0JL6KGwW9$G;``8pVI9nqwL-r6*ItghNh^=5CfP|qrDpKQu zQkDo+WKvNhCD&VGw=K<7<=Yjy(H4f+o_AZN2G}VrGO<G;2w* zkjb(@$M<+;RC`wFYDMMd=tcxc#DKUr0Ru_8q}I;`hk|H4yC{MXA`n1-^&-jXVufvA zRa@#d*G;PNu9X@)tF_EqS1q+0Y_{26HPtnfC7Ku`k{eA_Lsjt-9Q_4a!A>Ta56x7l z+BZ!V5kRC!JjxT2SOrA}KoyuJ039PMg3n&ZMt652_Or)4$JKO2=kzBf3l3{aTwoPJ z2I1kc`gzx&Um=W;O!QuV4&6#l2*+({6ngCDOqz+sNLLmd%a!|`m`|7yN8_n(vcc5) zL}5uT?S~u>-ZL4e?Y$?X+WwmxalIJ~5vCwao%$M0BP;epJGkd&{c)Awcrd1(;hre; zizBA{NG8#9Fm%S61h9cHke3*93n(a5GpRo=jx?uta^s+%&XiDpLypFEH`FU*y+2nR zjYhw2%@MQfqs}i+8`jg;Jr*Qwn3cLCD#5{tTV+DwFiUVD85fLdB|YV^M7I0J^=&a=(fVWAQ6AfxVpEFlP@ zfiPgP?tmI0i6?|4;~^t1vH+ZFm9zjV0ul%X;v>eZygqWEZ6hmiv^~%QNfeP33w!;& z5ChXaQO$iUE)HN}io}WVfCj+>F$~34;wpUNQ7}wF&0^z!R1{IuUCb%Pq8SFoLFEBt z08LaPMUikD#0+E@hK(!Z9Fe#mIGFuP!iIza|7D$Q(D%e_uges zha!DGh-KQ+F<|!C>ZnLr@gpv9+k+UR>PaRHPcyEoVIwP$`_<%7U9l)3A*gbHD-*Ha zcQz`Yq9ZN@fPy0{bU<1Jc1Z}S97rQAkMRJlPTq}wp#ba|Aa69%_9pg}PBY2oxzyK@ zJ%WKYO#LVDWEOO^f=l{36M}aHr3>oe^B&R>)TIzZcKo~}E5C@KCR=Aj4o0*w_!%rL z-~E9z9J9Kbfz!+-2&AtN~giW^)XDPBIf#Kx?%s~XukUzyp z55(Ple^Cg+2CfL@f;_MFyqd$X2H3eH1mFHe1Iw@ooI*7Ml8UMkBnQ_8ZM0$VeFaWo zIvk4w^;JZLk!4auC}SKHECHIp?V?Q9@@_$YOMZ%jsw@s30c%V`3nU`O0&70*p*>*< zdP1Q+#Gr;!O9n(ql*UFRSYVlJ07SQCZbcf6jT@JZ$vo?;kzO_8w~KaklTo*AO4=>9 zDyXiS*-Jc(u1X^)(2B*B+gQ`|cU5@8*f1j!5K;sLN&qPp>YrE!lOfZH2!6sSdbS~d z!8ZL6a)IhQ)}Zrr*Shw|s>Udrey3KuTC25M_hI*t@I*sbp)wTg_#PBA39<|e(Mvm# z3y4G-6*}TbEEXU>8}aa>HEKJvJhggr#rEN!fQF4qnPU^(y2BQAT))sV~7zA%P}A}N#x&nzTA1X&E?P#~NHp^*4`{edjqr zMGzw{fgrjZmkCZ|4hh8V_ETp6buj_ZGJU^G!7vUnJ_6ieSoNhLe*5v@S^)kW3@#YU zcw&YIZhRTRgf+mF>cc-@TkF8DNx8UR;#DInsTnAhSsCL-->lV%0!*-fH?UyG!35w( zuJQ@srDp#ee~`Y|-p+Oez?Um41*T(3#Ie+Z$W&MtGazlGI$>2$Os*|x*Q>KyjZ#~? ziusu_ASPat7A_}P7c3z}P!Su`Wo2e>ie%kefGmn5E2UuvmO|Pcfrga9iJVzyteKDF zZ&vYcnIR`ApSGU?Hn5VR zK+MUFvJ4?wC%WJ z8Lj1#nuX<*5-6*GaL-ohSQ4CIGm7Lol%?mp?Cm{wL&xSykz|5=U^K)C0Ru%eK_L!YBP(ydntWJd znF2Bh1NB5y@_?&opa()wp~NHD6Qd#9Gt?$=x{p|ZXZi+zV|9idi0Z;HPkrViUvCpJ z+xU9kboatS5oHIo1<@2e#6a%EK)Q-${gFN4{P9$NKyvk+RZ~X7guhg1B6mcEFTIjk z@1Up`5UXqNfur`}jr=dA@3w4pljmGWFirNSOcc=;F(XyJ+Zi_z;5YfNKYw`+0zIF` zK3~wL8BAz@0pXVK7?PZqlMughY16)Q4AAA6_k9kLWaldmUi zdz|b|ks~fJeOwusIBmLUB6T*?*Zj5+FzXqn5wFR^k^)zzLwA78*BcCO@VPVtzGZhL z5W7bIEwr62Mr70-$KAy9HFZipm?EclEg#hm#Hr?gBG7tK#q}+vua{tTx8Y`*2}A;{ zyBiDxW{L3CVyA|xE1bnp6i^Vz2?%B*AK;GtbP#2rb1Nx~;jgwR>-H}sZLvXe_{IJ3 z^4gW``S0I*nSrnvB|ePk%IlzZtGg9h%zd?~=M(&=jrZ331i7puy$ZIAmfH-q)En7JBK}<-X?hMgWo7!$eTTBP-P;O~VEZ0TV}9 zXj&bPieug2pFlkiQYV=gcYW|l+=Hk?vwUfP5AaqIM)*2XMk8+7vsD7L8Y3>J`o17q ztd$qEqo}GajE@@}i`#|p^6X7yA?hbOH_R3PONGaqY^hUy`u36aW7 zy~iH}NLg<=n8}|;Y!vkLaInK^FHUl+Cw$E-ud^J3FxsQx*5m%N2q&c9O3Lav9vJs(}47>z`StAC;v2AI*9r*_itB z_$NWskP$tGe;|cKwk)lbrAjRu0+=N+ieUz@`%DRUa4o>7+FN3UY)V>8TSAAK@A!NE z@3h~fL0IaeBQBG8Osa^bQJ8jlSf1H`2Ud1eO^BHi{Fr2BmaG#?Q9Z(U{mq!qdCZv* zeaeT5_}x%r9cbp9`>wknRDwu}A}ordq$4ZtjvxlsZ;IYhX-v^B*BJEYo24z=6DO{fypAO0&aw9H1&63NZB(=077^p>m4x*)q z*bZYIizMu3>GLfvTX8s*>zzGm%3f!j>zB4wJJfTh8H(82WsbyFU7MFy%_QX&?F?+_ z8H4Y?RZ6$N>+wFxkvrTzxD=4xqWqif%kBdpAr?P8AACUz1W<{{e&HVkdKcY^^C*Ys zNFyuN1Uz8KtcmU4&DDY?Ew>hbGF0s)6h*=ssFGcE*Wlbk(tJ^)bt5Z2Cns_Yi%DJ@ zSYt5OX*&+c0{<~*XWrGo_P2aHFtL<$Yfu-fL6N($Lg3@&n0k=wK03~s*(+ujb@he0 zgSa9Q5P$}!ev*~MIWViI0sxTW*K7$g{JM?VpszE34qn4ZDn0|9 zeNkp=9XD>^E6oYu&=9xFQjzN1Z&D{WtaG5_U{0WZL6!Q&05`!SEAays3t@=w9LN;i zYp`@WAEp_)r7z00Au%H>GG-h6pB_P3YB8aqqhN5*>tc&a37ZOPeiBJ!gu7MdZWk$`W@iwo^aVT!Xe>*c7 z8{*Fswi+TdVIwQwEX&*w2Z82hYk82_uVDFeTizCXpfw5Sw~5WEv}$*Mzvvva1dp;*MU$AI ztg07jH3Sv0>E$(BeGc}JgedCgii?ivD`e_JIbWrFabU1-S2JP=)|wM%L_QQSj3GoE z(HRI}Z87O9w8)@=34}(5z`=|ax+C6;#vo55Z?ZJVOR9yIHsc_ z=WGwJ(`6hGx*J5K)tw90c4B1Sp*E!1u|r4YX4KY9+NDTrvo=yz&81SzrHoM|NQ97x z9h)@R9gg}CzOlDga(luNuX440dR{>@5UDJhBQ8x!A-$=8Zix_q2}}bvrnJJQn6Ze4 zlM;ZW%p)MBl_M@CEV4{uO%;-i(xeDLen#^6zO(CnimTwQx4uWPqE$tCFob~-)@(mr zS-48T#J7KbW%XeK8t}k|#hYOOKE#EG-)4g^^UB>#=es#)Z^)^mU!2U7)N&;_zqTMy z;z-!Ny9C|=YL_en0UCcE@00rdr+PJ_7DGSVeD{&O?d;tXpo@Lq@@mA z&JiS$JK@YNydy4|EtM^1Cn=%+-q7VGKb<6$Va4j*vS^S;DM^1Nl%$G`0gP0q2H*fG z=X#!bn7&fv7WE@8J5>Z&m|z2OkxGF5HqsW0n1OY*SQcqYo6RPSSva337zZyhq>&OM zE=)-bOcK(>VF@|bPq6!XgyKcRPr)9!{wHHN895Xc=LKn@GZdtl&V7Oh9i0^NB_!BU zF)ra%P(g-da@>DfZrtv@7Unb}ZW+QCyrZcR85Mg&U79KmM$LMtx@~pU2W`1-q{SYL zQWb#|##1sA9Elg^ zW;oLbsMeU`mnb=yHz`5MB!xuC%2MJfk_Ie6MhkM5xQTznmuY7fm?s%cr|n@_GmhhQ zYNUnMA}J0=V+p8C$r8%bU+s8`R8<#MiD|2tE~4GgLR9RYV!xBT@`p2U#|v05!bIj3 zJ$tw>ty9iQJz?O9nq5g-vofY7$CsOC#kD$anl$5rZDyuDe>OGL+Vpse$Zs)$uDmrO zQv)=IDx!bRxxHwm34&xWO4W|rBO@yhDL0c(EV2x@s2PP*G~PU7Y{Lo3?Rwk27dodm znDZ1Ua4fN9Hsd8$8ghpMPGd}AfpBXJh8TAF*wC@lmZ8%Q73T)CMGGq+=71PN6I(cy z)v%6J5*;!#sshPPq2bU$%R0+ZdSDrn$=3@o*1&)9t{6oot)%vGn7^kmm|M`3w2smP znqXjumvpl1@Zpq(mCy#T>+qcB&Idsv5j{&KfWSr_u%tTda~+x1ZWcK$S^ntLy{&+Gfo8~D-cBFMgVZM@E_R=C)4$Z>bK%9 zF;sADWfw5a!lg2{*eoMzGU1q8n5wu47{Gs8#~TqT5k)jR@Ndj&2C6EtLQyoylL45~ z0DmQ{iRH-b`=cUy`mL`mXgULT$pq2rg!q2l@E-J75+Jz_!P_T9=zFzA;5}+j_QDV$ zTtII3awrlIh8o_tXk6!1Ec3NO5*$5UR69Lj5)vQ;hz6q))a(F71ML?`Q3QHh_vL@u zC_r6OZwrZEdKOp~Hkg(RVL&PAg>wXQxod1B$&?_W7-15~10;en0b@~HBW>UYW0Hhf zON=N<2_iru;0HAp{1How@s-#kj9E42*v2C+BYUpln3n`&1C%8922)=hrR*9wCa#K- zlgw;H8^0HelnXf`GR3_N?&CN1@gIL*)ssJ2w1CdGjR;BH;53O+)qAtqYpt1Cpa807<8U7Tqo)gko;iOpHk`1R zc9vs)k=J|Gi{A+eD&Zttl)`&An1w+^H6t1NjeU;Y zRGK3zSfgZVXq05hr7=k&vMqE67$zaWB*|Ayt(u%s^dm0JOuDkE`-$%C+8kf-T6>{! z6TOL*HID^*wApBib9UFL&sTr5Oh#wT!#f1We>F#?>Z24TL?IuZ2LCNh>60V^LO>My zK05<~*m+jKb{_jIClW=9BM(z29QR(INcMNquQ);Wmm&lv*OOf`nU9?1M|8DN_gWY9 z-5qK|=lE`DIyB2zrxIff!sZl*O^=43-AY7NW~OK@UbvR#HAcB^8yJ5&PV$<8VntTj zSQ~6u2*m)=V%6hgT-`RiyO)yjNqH~L6~dAd$_AcyH+uHD9LqJ5ur9Z<)J(NU#SdWk zB>1qJo1=zCV>?52|s865B+~nYSU>J!HjV+{6 zi3r+2f}S#h3E&B9ssoTSK%y{&0>Bv{vIkj$WEqXiDFF_^#3Kn-i!9M_;sleKm^`9D zLHel#SrG(~GO(Yxe33x8nuDMYVv%%CzmLv~1F;B)x=@m0k2`;Dx2GiQNNWHQ#P?#% zbozlmstCxUaK7>LF?K&&zM3TEef3W=9QuV;l{)%_Lc#~?iwPEts~Rj@6h%p~lNvTO z($Q?qjhM}`wv@Eev~4A{ZCNc@ptiyD541~Jcx728Fr}*_E+2mGLqRr_RbiQiQdT<5 z)PjIfc9kY+BQAerWtqFPAxa}IRu!h)L1fEiMFDXmF3GJ#yNUsVXfQB9y~LqlF;Wo` zhz2o07=^&-PMiZJ0mcZ%2-Pb?J=OMSSAvWiZ58UfuA@4!G+kBgX>$NXyjas@pLlh` z7dc5t53YfO53nH+k$@+tJtHfj>FH31l48%5;Kn}rcbI?fhwqE6Vmo~hq$D4%}2pBG(O)KfnV`_tYV@QYxlc!=cH3^EG4syDY!y1cHux#`;- z6kTXr${!nXa#v?zE6D7q)-&j!l9C@}_^2SSTA44)r4qdO;~8a0VkMYJW56P0X2MzY zBPAVC5j?Cnmb>M$uvt6zt2V`xmhUXf?}W~Q){aRUs*D3IM+7-+I1c)V#^xOc95 z_i=RMbl)V8FR4AOO@ank70#E-6oPrwphDt=iOM4`9#QERhK=2$JocjMx<`%)e~i@I zaN)SsC5eP2t!a_6w?+>ON<7?j?_6yASdwAG$H(SJEypE}(}8fR9i{9ZJ^oXb?L(sQ z@R6kc78h01FL3@H*O7h6$AS2>RCBRiMOP8caI&T|j+(Si|C*y#RJCHas}PItgyQ>) zqH1Hqod$!?o9wx_k{esVSr}}tp?it51G#h8rOqp_Xp^PxL5jKaxZfRdj`Q9oDKm9Zg$uB` zp~by9oep=lp^l4U7|CtDAqA#!8zx-uvTW(>NOAk8cZ1?M;>dQtBQ6{)mJ`znmnuRT zQf+x^t13QNXLRBu*c)#5{j^+$J$5^<@3er8f9a9bO|Yk>DdPy6N1{3(V?l$d%MO&VXV< zH$+b=sUVw+A)=CDGF^lbV}G+bJUBw`V-Q1Jw#=vFZPezN<0I~!lt)OY$_Ucn$mU>i ztS@{6(U+vjAVG2P(^Vl;M^mbb8IL?hX9mqHZsVgPE=)HYk?K}KsLLU`7H%~I3{Q_E zE8iyeENln9?Py!4H$6#1CFbRq?Q<@nSu7@WMFowk?Qkt<-B#T2rY2ew>%aTI$iY4pQ z(%VI~WVIUcUDIP~F@HU~=V)lDlsm7_yO+aFdQ}fF@>m@r+x3X{wHl$r&z6OGXeOZO zCTy^PrtB!kjIF#}1P&bop3x*08*J6rl+m*UXgf!v`m_m|1Tu!`;{cI_T?YbWy3}`bbp?u-RDl+!0)*5ht{(# z&pSfp&phin^_Z^3Z^gao$cUAE?Zzw7_L@*_r1&KWM@0_%tSRL>kdv~I;(`2wwz-5R zKI1M`@@>p9>E}7$y~5*@5!9T;w$+a_Byj&N0!Coq)Z7s;vgKTqU$TQPr}Ob zcPO1i_S}TWewXkN0Tq9Fd#f{Ye$yOQ*`Fqa~#B? zH%>}XCyI(QMo7s$VbN;-q1APYHhtr+?%dYMTPZM_YnSiOksg0GHf%|;j;!Pc12*9U z^F~^EHr6D@W z@h5G*wqy(eHzCO0mKFo^KA$5l{m0LSd^}r-HkyVwnviODW^01l?t$m(#ofXSbcyXL z8&go3w?x6Wu?xVPF^k531c^M5g}rToW>MQCk7)c^04nM?k{&N!5~v`gl^(~{>`}}h=&~-m?R{BDX~30$~^i#)wbK_ zz0$Yvo+ptHgfu4(r@96KypK7vVW$*qMa&3v8>u5J=Aw*9jpty&ns3saK*Rx_%k88m z8u3gcD`5`S;O)o7gB=qgVJ3Kt;_4H-P3Orc@mL)d^GQ4L}nh+ z7$Eazr+YWxGbS2;qT0`8As&4%(~mXvy7|UHgoK2jNFQ z4?#8YFe^NaUh&L2!+>b%AZQW{GA6E6MSqbNNO=14S*=Wewi=m~8%T*DNEs&3qjJY3 z1Tap|BP&ntGmz--xsFqMniRP%AIod4LoLJ*(7WR3A}Dpw?rr5SWT!=@w0P7~XPRRk zt?kb1{rgkLi{DW=R^ezhwIeQeZbu7G-);!=BbH|#_!?9yVAXjdQAP$QXfH-holwNi zxMJ5Sg{>fe%p2#sfbx`hK$J^iN;%#d4(?6c;pyrd&|prG)&YY&PP&+0xtm*1dc?!F zVW#@{%HC=W<0LfJBQA^^Xfb3~Lg7vWVkCfU=mqB{#)xNLDzv2xO&rv27T0jyo7tN2 z-Uy{`xl4y>*}I-4I#y$2HK~*-wi$-zcyzqnte?|=>&bETfC$;~O*vGPY}Ix^PF;fpDd(Nyf% zZjjZE8EmFpZX#z^(eJmwjVAL_l3d-G1+U7L@g zfM9E2w_CpPC9!+z8YFiRoOcjlxd?>KE+#lR3?nNLwygm)LV`XiV;Y1~uq$c6H? zG^vB3NX6VLH_M5n?dAsdJz>as@2@VjdSmO$6+wnhb8_VH z_0!+iq?<&=I$N4NHWaw;nUj6D*jh+s<*LPUfZMS^Jh z?>qgs*G^22GuPly$zJq39^SWw0frN8b7?BDwKkI5$z3xwMM(h~B8Pj2cjoK|OgtBioqGTegh2%vOle}+ zN`fd#)hVXSWMwx8OMT$zMQAKK&Z5oRurdvsnG9aBs zp4$Qsfy@r&(0qf&4j=`|^lkNjc67z^g?rvm^kuwfEFoX8V|i?FBQCAr!0gkK5yB38 zCICI;Me;I82h5g2`ZZEr7e)H*;zJx{^;-F9hIhVw)q%g6h>HM{FN2fX@HT)WD{BdY zB4DtTAawHCu+SuzBQC}U9LO)u-x>9Oq#HYnPS|nTCQe|2BP$+=u_TCptGGh_(=+Q2 zhqt0OKH9M*DPQiNEV$Q3q44bXHIYP-ZNG>h`jAF30uUBRgcMTWO6|+!B`swdnx-tXx`8fR)_Jg4y@vqBVnW`()bi++JeX9nkBP(=n@qazE%TwM7y_=<< zpK?S36^t7|-u~Yz#qWwSakLW?Uo>eo20OggAgAqA)~Q&WKqxbNkPKeQ0MPel9~j?eW)H zqR3$r(Bf>~2UcS_y4`&WMa3()dZ$^5S6N6jEYA+3D%8pIjKp9GOt5P>^XHNJ1PiD~Uz) z5Kd+R;ov6h4t{b_$Z!;L3CJoXIkLRv-3y^S=sE^H%`O;rX71kdg)c;BYQ%XeZUdGE z&a24PzCBM?BFLhCAd*#WCzIR1BvY{TFh%o4N>-wEp3U2TCqnx}m|WGtR$6LaF^bj) z-X476<_TrJl;zBZDPX%x;iDrfcRS984$;s!&B4S1?aCjjO{bXxTMRbB=-#GJRpcLu z@43U3^s8biTp>Isnfa=Dgk8iI)+;0RftiyzGCk7w|tinGtA(8YKiwx%e%$IFnd*Gn~bu7Wm93 zRPj82enw+s1FfA8f3)v9v1WcWe6MD>YR-s<0!4!mhSZA64pv2208vO6u5jk5N{TT* zxj@sQ0h74&I zm-9fvWr@>nStBcCWC+BHZ~amQo#$MO!c0OWlWTy1nLDr%vrIaHU9Hm)#g0pF*(I6+ z9|Y_J%0t5;kr@+|qst{liU(7Yn8_f%XFOTtFF3}i$#sc2J>r)am{H2Hc&Rup(8FJ;SNQG8Oe2Z3)Hj-s+>r3 zSS(Ou@NAhmhiFQ})hC7p*!1K?DWfQV6|zw=8&kvK{TgDS>Vn>h;op8A9PZp+)iarf zAc$(Qf!Sb61YIL8gFy33ibHKpa&8!qj$4DvC~7;LICDB7DY26E)#k&fa>>&@5Z5NS zEnVU{Gh{5*a;lOM<{=jL(!!huz(YBgbe41=XKLR#z+ssyRzy)yWX`TBKH+YE;g}&K zE>1E=&x~VhC$tZ7hI%hOGbegI=L^gSz?@{j+d4_u&M>%M+5+97 zBP+~aU8iDGLl-VWBP$wup(btaB1k=1G>-4mUOv@v&0v;ws<@J#S=>;ajq}WDkg)Ab z3xsH?az`e*-gnyNGGv|K?|q_wq1MV_$%H2{4-0s6iCyLw-*w}7`#6dw^_^_5x{i-0 zPa`e`P((S!6_>wM&LjzrjP(qVET=e^COGDoDa&CP6$*w5=vgX@|0CAh$<( zxf{n^;u)JGu(7+2As@((1oh*b8v;`rd2r^Oj`?jPE1u};Vu!AzQNvGv$hz71!*MjK zc9Azp=5vmAf+r!ST(}aYjXSj|5mD$lcT3A>@_QNBp1gtX9fx!kok$t(oy1QmP~#Mn z0qG|$x!FmX{D^hKM$=X!^we@YG4a$frULLV&#?f~HQ|A)2F45m%V6~VOxqm}n~e)h zw^19naz-LDTPy_yT6KnhR7B;7fRx1u6tMoB90;`?2t<#OT}+y)t#PV)$0~04)he4@ znT=`~5AK0j9vftT8OxRJhXsm&AkQdJ$Yo~2VNGlS5>~ni@}YES0%`Q+)Js-W=IHizitx% z#sb5o&rdjWEufU8t(F`nWv6BI(>XZ6^N`iIeQlgO${wtzpG))ap*=ga;bGxw2Rzkd zF&(P`YQ@8Yp}g@#7KUq0fjbk1+Azy$2(gQ*giPYTHEh!_3lR9roCLZ>%uv^>1STat zdmY3&u&`{u4^3i!X%5slKI}L-%PFUOv({73mauWSNer&LP~bPoMOfLR%hbpZ@_3Cy z8c0%0r}?t;5Zi!XJw$<%1hul!gCP=vBP$~-Ebt5Bsc=Z;n=py)e(^d{#GfW^%AjQ` zBv^>YDC}%rd>s8NoU^_|cW_HO!&^?Bnc1)z3vPm;#RU+5dbS(~X`bQ|GD=O_pn;)H zno=Ewmn18*{UqSVeg4j_odiPRE(4?*;@Ew8W}AcBP%K4D9qI3 zf^21hrnBQ>@QGoNfo4laC0(V_a#0{zxwS$^Vnr%G$JTaf`ZF|6QjELvtcDdLN~l1h zMl-uayQ%WcLW_nk;Mpqf2w$SeGK0ggCWIy+Gn`I;fp}M-lqgMB@$dEy0l!dUcZUE* zLP8@haZwQ86?<~Vz^_+SmYbz`?l3sO?Z7LbcThSd5r<9MAke8}p9JA4mqtoeGc(qL z!U5w|{oCdmwPxD%ZPiCc^#G=^kocZOA$UU!Tx=^oKJu3MVTpWG1V2+Z4j2H^ls+5p zSvlf=6G2!d!(~M?pv5I4Du(d;SATR!06Tz)uECBP*XXCPC7ct))n7D1ehBC4(5SWMGlha0C~hixe|{p zKL9a;yr2oMzKz0Nq^poJ)C|nROhjc!EIV|VOo`k7Mk6?wG8wBeF0dH|bYj$8+!<|i zgb{Iw7tf#NYoN&4ut{#SjV|k2k73rGWy2H6ThMv+l9vL2f=+$(f&04Qdbk*Wh^dw4 z0m#1F{H|%-PR1%)57r+LM1Iw0+4Bh^BQ6yDD~O$?YFf;|X^?<@MrNfWKM-K8~|T3Vx4qgFMnfS+(hUzAXEfpH`dbcx8^q;ms9I+i0YE+U2q zx`bCGERV`6U9^hg#Uc;|)Q>oSX`mx6jDj8bI`M$thN}m4$Nc$Z;y3__s^^V)NNwx` zyH#^ZCmw@`MR(@pZg)gv0wD%0MnRED20#uyecev;Dhty4yz{81?m&qEKp_Q954YeQ zS2iDxN4G)UpUc+rTh2i2UYCf%sQwso9^k9oJXA$oC^jj*@RM0cJ@6W)1l4wHI zv_|*?L`kf3`fWJ+88Xh}>3q4)3&&GbEg%|su%ID`rBD}HtX$DzIwG+$?o!zs+wXNlTxB(N&?EQjEOT-X=$Rr zT(xsmbjfN;Ep+o%i2HK$BP+^Y&>}Jb_yBv4 zwScE(jF3eV6*Z6)+jt*u$H2Kf{Z${j%)_WYf=a$!{Uk#e8I(P=mp4R*&wSo3?o~@U z;QL=(op4YncEPfh6c$Jpg_6|iF!0DJHOf_q+f>B+nEG>n%-)~PSaoi}gxpKksKZc- z6gvR7*WTOJCbSlaLuCd*Y?@2dU9?-1oI4haOfyCvWYZgpKV8L{>Rn>xGBj9*er&KU@W077*;udAd zp+_)#>zkeN z*(#+0x1`{b($rN*CjF2+&Ss^KTt_bW_%cch2hR{O`zAn0A~;utpBb6a*mG>+JLLFwe_Yv*b|q|o!!ZAI~cx|XEO~9xmGeAf(5*IbscOxq>9K7Xq% zc>6VfdW?G$se|b{+z&u>l6TFw%k=Ah-(O8BD@w@Cq*hs5(_8HQpSN3keL#|;u_0Pb zvjb{rCi*w66?{K_kuh5mLsYby%0`W8r72r)wXiinfTSV8KgNQ4{Ums6269BI_n$)DX&0+G!}+nnj9Kg*LLJu^lsyvgkRm+Dij zAn;dX)OVrk$=HU*qIW0}8cR+VK=(ryWE?~ch zwy1)4K$fH#2?BE+zbqdXE;CWdeNVfY<@Lfok*djA(z9n^-52`B1<-xeCa_)!6UY*O z9+6lGw3&hAzAoJ@y_Mr$TWT?)8qJ}KOCv5LE(S$hG;mm|A!LC6L;xcNBQC^~D(@l^ z1eGX_MkOKTx4Rx1e7x%!a$l^X|6${7UT}2arG4l)3}Fd%$jC8YxHfk(OTz#yIoY2- zz$xzmRQ@6f<_}-&AM^sWb&NWP=_Dk7gdV!4AvWhsBU4h8YZ%cai3~_iTx?{t!i}Ru zSJ1CKx-tc(SfbAEQHdfX5s3%}2>UMTwLmEeLWFQ(Nvsv&kU8cl+q!*zG<56MTSK5N zN&HZ1g0?EHdhMfD&{1UAwG6c>v1*M~Aym}*X7|&#Wl4^Hv;A!6 zqcI+Wpe#^!1nL{Wn1F}|%LA`}sWij-@XQVwN`WyHCy^nK^l4!aODPxK7JIJEBQBx{ zf{_LzBL#%q$tDX3!zA3$-Aqx76qeGoNpk?fks^#m1qL$Q2ABa-2(q2wgqYNp*jC#G zBQC*Y+Y1S7DuW!JCfR11NQefFWQvN508P1t<3Lb!S8^A6-REn)JB>|$EJ+&4O{CT} zkg<@gEDZLNz)+YZIce@E8mt{79w<2fIj1k$!G2Q~@Ps2PW`LU`(=0|gnzGq3`+QrD zAr8{WAHOBuBP);Fu$J)B?tMQaH^rX+$rI>Ndwd=Y&Qvs}_$E7w5ySfokycB6ZMNTk zkBBam6!oylB;a7ivZPagY?Uw{d?PMSaI{%IN2BX2^=BqbA|3k|Av-~|LQ}v6I45rC zpWP>eCr@k`Nv^87Zq;@3hGxant7S2jBQBEE6(o*EDO19PN=Rzo!dRC4ck6QJ8X{@W zEknCeQl&Vfy%rZiZJ9a2_``KR88&DnhX%~Xl1gEY=g@x$Jwyj)DiB&}5Hiv1_7deD zbJ6&v;h}`&Fw8MQ7SW(@fhY;cQxXR6BfFl5+}}_iiwp$`hW?t##aCDS-h6^1E_|Ql z10n{cvJ{Vw|IJTCF7&=TN2?BpN$t%A5raMSZ{8YC%NAH)gECCsRFHgpnv5jEU z-mF4M{zR7!?xz>$@jwACD zc4>ex;l%1P%Hr?MR841$vKGXGdAFts%EZRg5qgD$9%lo8m|SV=jh7} zGd=x3>;Lz6;s3w;|N6ea^#7~V@&8Zy|JkqqZy$I6fB%2O-~Qi!{eQFj|KG3j`@h-z zfAIe|`~Hi5-}`z$;rqYt_J7I!|DXOp-~0dH{rUgL(fvO^*dK`>tc&@dz|wL4Bkqb~ zWSD*)v-R4l%Tc-V#6$8kN@^o6`cTOD(kI>`p@tu}9%@qWW0|r8`C(E>LMvY-y*^g{ z4*p4!WDqDJar~oytU{Nj1|$2)eT|A?rRV3!YY)wfhwOG~y1^59{982YLlg6fInXah zGId-dE`sv8NPsKr$?fx{7wu^CLPJdT<+W%STGBFOnJu=~*p!Jz=4M3ax3Am&P5OHJ z5Of(J5$WTl5dQ>L?!?AZXRZi4AMU^56Dnku{R1rC1|utfgZMuEn@`vJduXBz!$_K7 zt|m}EG|o2KZ-g)5EHN#}NF4lE-sZr5!ok_jxfCPSo9kJx0pX(nr@Q0pTu ze5<(biB?J$;f%Nl0gq2YSBY`KR zRSSYT9F88$li< z8`zS6N)#e79_i`frvM4C99EN~GB%E;2eF7Y_Y@=B$duXfxDlNFy%li<4-tGhDTcRr0M{ z;>&z(*|7uBT!k2^0&aEZNr$0XN(cUE9z%odLXm?NT8>+2QUp})0yu)ayK_CqazuW<<>5-dQF zP$-BV-*3G7&$sN{<%=KCsqPtD`WFFSpI55_VBZ_IpBU;a1)=6YdJcjU>ZAL<`9Jdn zR?!PVBP-d!JIn-5s0Z);1%InA>n;C(V#Oc({fGSaq{~10s3E6b=#h!{>$iHHU7@xA zw5+U=Vkwo3Mt>qTt7^&+Jbl~!M^qvIlhgAbJe-tWdHASH>QbjiNw@o!pngg4iplDN z^vMDq_c;GA+m1fEtcozV!!r{3{=dh6xBtKXPE1n^U+(h%?c8%|`sx3#2mW7we|(*v z{4m%hnstq;Q6Z}~d!o9m|< zIEWItA519)6{6SW|HnfCqU4&kRwO78rmMRi5!***BQA(%j564LoALbqJSV>3`+rn= qiYkH$go~+2Pvrc5OB#OPrc3}6AOFSNkxmpO7Lo0k016{KJv|DFw*`{` delta 74696 zcmYg%RaD%~6Kp<00^D$M2yV*)iv)KI&H{^jaCdk61()FN?j9T#3GVJ5+}-`=|90nL z&OFTNm+4be-BtZ-7ja=1v4-a}IU9!|yD6t3s}ZM(2{$u4r;!0C8z(!LkpYJZ3y(3k zalGbdQ4|Qx{}E*spaFsF3P0l^Q9SY`q;-$MK_{UMMN1c_h$zvRH5 zkCQ|l%^&`ggxAF={V-Rg4W+MRZ@6=Sd~GaK@S5b}P%}L!Un$FRK6ySD5DWr4KOLQL z9L}`P;^2*^+otSx?*!{>E2>8(1uab9@9yS zV5%a3ARzD^TGn!#Pcx(WZQ*=n`n))u0v-L~`ubr2{50!GcQjg{{d(;{U}4~g&xZH9 z)l`O;O~ds#_sY5}WzbYtEwI1Pp{T=HUr1Tpv_O|F*|A;j(?Di(ztTQ_d*ec^ zHAgD>!)3I2eL(EiV{LwKEyxAv&CJ!a(|*=CZ_3HIM{nP@8S@Ux0}(c(31g ztn1qSY?|RuAIat)IX!N__qko!138@w-WRVvj|={ywNBfRbtO6=t-Lw@&#Tfd%Wa}# z!<~2UcIhNM#2TTJ`9n^LBA4xl1RjmVuh0yaWe{YuX~psERM#-`xI7P-n@`Uu)gHbj zbz5k4ZMbju7W}zix8~PmwE8?WMrxLM!?j@pxAuXwpWadv< zXFD$0d3B_3(9}-Pl$!w?ZhBhJx+{HY^M5zAv}H6K-rg(6&ZIu4_a6I5Gen0yO>6Cn4eK_yeZA8C=Ap2xz0*>yqL(@dGuvEbK!>1o2GKe zBTH#Qn4MRAWFn+IC9mwMU~y!A^>gxnq1Zp5zw6Q5maXuFJb=IwE81&1_w?4yLG)`s zY=P!3v3ZW7!sCVGEUtg+z1qr7`<0#l!K{J;!GAF+QS{;A(sRqdc+{?L(XK9P&Y94e5aJ2a zM#?8=V5S+IxIndZG;K|&6bRBg)o@W+3(RRZG(gJ<=jlzqs~U@?A85sVNBsvnxS!T= zML9vzpqtPHgr-jxVlRhDm7V;mJ- z5=(8kGMI1-O24uzE){V18U4}_k(@)PD~ z253c6JcUGR;IuL&Yg#NzL8@#)0}GUT1PT(`I4 zAP8Y3rb%FTt+eb6dw&vxc>_R5tze2mku#c0kzhU~&G5T{u%BTt+#rk-YtS%Z(L6=O zREaWxpiWVNBb|KMNIU|HF{{KPPFs)~VQ6ALGS?*NOViV!D~mN1`PETo-PN%>7{ z!@@cyL!|*03k8XZQq+b~NqvU08WAv$mH;_PvS z@z%Z60fu3e{Y8dDC|LNi!B&LUwa}P+Y7LGJHfk)C zwvb3T9t8fxK1Kv6YSH;|(i0KJ^@Y<;nTy2K%MQhu`iu1bl!e89$6+@NXDKSs3Y=B^ zpz-H7!Zd0eE%+nMQmwXksDM3LzjKzdgNh!&?KNWASs;Wu{bkSA5oN`ag+r$Lm+Ux`Qjp$5*>RXE0hqUPO67Jt{@>!SekuIT9|f< zvxs^+NjTOJn|WH5nFEtZ0vjxzucXBZGE!0kBorgR2wTJ!(qZY)GRrWi`C>j1p^8#I{tRb<7%UZE7H0&& zmr4SGgT->D3_r3FC~`{I7)~{UAe?!rAPC};sS&lY)TmNIaBw_(ED>&GWFbNf5$#gq z=V_I2YLj##&LJX+SON*oRMb4W@IuCX27hIdk2so8DkIh!BErDhp)d)JUWH|Li-b?# zBROg*apR%!;;hPGWA@azczjC`SQWrlR>n-@q&6ZD{jSDNq-h$UNymwmmzoEGm=1j^ zN!8%MpEhL%Ddlw!8Lr@%gnjyLSP*Y$Tu3F6S76+&uq30U&#&S$gwY3BfO+|APts;DrWc{T zQ5Q0+pw1Jv*#P{n6*u46OEt>a%_D7&QQmAAW-qtK#C-YB*>U|ZmQ5a3JzQ5Y&1`qd zZWkhF#s2m-#HvI9eEPezuRaWYqR-X16z_yEgFQbz*J>_m#^3UQ3hG^(y;K5H zy=sdPW;Y?9KN4N0$)j@}dh91xHk}hIBeo$j;yR zemV%rr=CUsS|GNOHFYuX3++Q-;H#HYsQ7P1tVPyHpmhisf$>=Ex3I+gFo)YTSbfS< z%PA(fFy(pAc-LMFz-Lgl>>l*S*SI^(67Vgi4r547u3l_y)5v${lJPD(WaSmbsHN&t z{H%Sl@t=B&f7~};wXFBq&5}uO|A0B=hTo!bc#yfnJ7D;;ieov+H@!Q;<;31so8I$t62!G-!RrGoU+4;-%Hs}td={WaN{=-(d0A&fzHg&(g4A7+NK!7dV# zZ-{l?rpO^upTelwam8qkoj{Ngr~;nUQ=!mS`)hxVoqZ2$48(Ch00UA?<$88iGTC9i&zRTEH3`VUeyFXPSL-N zt9HE!of$cn71q^M*rqG;LH{~56TzPE1twLjADEAwMx(Ps80^OY0)lOr!&$f!flril zD&<$#t79c@yTJ&BUOfwJI4f^schhyTnwvSr;T}TS7DAiP)fdwhF+SEg6gv}>!zoN% z3GzW~OnrRL4#$dE)giI#3SRs@>J@RTAV{T@BsoOZJgQ=*zUNC0zFt|$ z??S3n=JD8(R68|XG#u4sSJgNH;L@weJ>hPAadn+^&MM4tQrd4I42_%@wArN#gShkE zo?mVrC%fiZzbe+|)oh-!WOUUID{q&gQg@p_(ujyDe#(jtA&WGMyeZy5jv7yfZT7R2R_CP zuyZG2Yelt$(vh^;nbGyhQKgqTQ;nY-BI6xAcG;UEX}a;NHSA*iej)o(MqK<*LFozJ zBn^kG$3Nvx2XvDJig1T;t%D}zTbcTg&wp6&5q(<<(IMb^eQgOwEr-Taxr_GfoeV3N zgCJQ6g1X8sX>Z|3T|GU34&j9)=cdKX)Fv8L*>9mKVeY*YI}ik&uNB2+=H&eBjB*Bz zRs7avpr-HQKkkee-?0b?7#OKIvwN;r`;MU?Z~Co}qz^q0k7iucto5yLHNJBTNi&;bX0v zZ!YU!F za?CYYH#9KA+{afB#I}RQKf5GPboKDHaXDyNUwC7yTj)m~5uZ}4(X%}&OPR?XJZBl8 z#M=6(qvXLtkzCN8p~K_4l>oA5MjZF{U`(D#PJ}@s(ZTc1@kEFD8=iXk&gRHPZ==XJ zDMjiv>d0q4V5k9e2xDc)VV!s^%5|q`pgH~<84XaDNLC?e+`SQJSHD@TWtQ2~M^SM; zJ2t(`1%lAys_u7~Z5*0nk4dPn%uIkF`zt=0(~nD^z+_?&00c4gw(umP*P7L88+}kx zC3y5<6YLBw(j*m(5s|4i6O^a2&*6zqhy#<_I>7I}m{!!WSRNq4ls}546jGzUOHOFS z0n4w<+)35-#Mc?DGP>)F6-7(>u)2NU`M2340pG*0`4KnC=gAp41hYGb&Fnj?ca=ma z_368UVMKBx<$o9Z#fdgdx(bJW$QY!*XpQ~9IM@$f`OnPc!MpF$T&MV~9);XP2tZ(~ zb>(Xh?Mw}+m^H}TiJ%#2^kVL`sC7so&ta2=DC~&S51l5c&y~BM{AD&FGn+S}6Z@L8 z-y9#3`}3&2xBGB_$uBVvs_!OdOpD%l2W(2ZeSK)cx%%ta+C{rLFw)QD!sQP-0gkql zVZ7sQ^DS7`JDj0l{M^i{P9+LCe0cdg(~oc6D2NW8v0JCTdI6ah_r*rY{CA^hkrWq? z?*4cOOCU&gp}@)GizOrTVbTQb;}IKHssNwEn1OE?0s#t6wH*X$ta~2Skf7_>U}nBd z{74;)KoPR6c$dH98QXmzreR9N7If!Vpnv$;n(TU&nN`R>I z-vEYlFuS`WL*+jIxCOg@Oxkyz96f~i5$;snEG$1oZwt7l?O)1bHh#2l($d2TenH3# zNg*SVipKRoq>k?Um(=>_2|Wh6wo&bA)o+3BKGYvk_@u560$y6XFOc9$#RaG7x z0e0*xq%7d|Wrhxb+fwWSJs5rJtz@2_f*FaL-MehJ_i_#|xElM~`_zEW&JbcJyP>;1?;=4TYo(8`N?)uUJ-xesoR6A0$ti&_SXZK89SaYA-r1c zH04^#t_Kr|Dcg*r0v)6o0*|^WFYR2fkj@WlyBzu2Jdnx58Sk%0mF%ioTWHrdecMxo z0NJ@hF9_^AfDS}G9$WIhhHZvmtD%(P4dsYYbooThb~bO{s5stP^QVU1j|6-sW4}4K zpZ9jYe6og9<@v&FiUg~C(G&P}-mJvYnRE#m%v+&Lw>>Hr~2gDcP9Ka;OXwRr}+myycR zA}Wk!##?!Yq}5QxG06r+Pq05)EM+xI6Ns#o>gAb}%NE@21wkBG=m?|~q(Zym+3(z6 zutAXI)B2;P8@BveFa0aU&dEw>=(%H(2&u&c-rUbpLs&LE zOMO{h9^j-|*`5CfY&%QYqj$lv73tDwlczqj3-3aWWIK=FBC-#+vdLL3r;dR>v+Fl| zyD33)&a80#JxE-V+$4pKqPNSB899X~9YGu?w-rJMx)I)8Q_k-!3Odp^CTSKq{xmfA z`IBJ<)Tf2&YBDNy^Sg_1U_jj0MN`RY2KB2qa30~@PC3sI&+Fm^XNl8?QjnW}dlDAO zJ~axN`;m=2ope-3C~ZoVBd%%nV&izUYQvO(LahzH>J41QJv`MEUaAtiQOWZu9!xl% z-Sf^KI}{;PBrj0G(Xb_Gt9fIakaHJ`+8Mq0{mWe(u$@2^5&Qv{4&>)qLMQ4$LDeDy z79K>2L6A8QI~1%OVGL7P&SV*<4GoA25JAr!*HmEr8Ss4_XxBq z7Vk=i__7Jh42+nIK*O7yzvd3l#)1KU0?m)O4KPhXH)IO;KTUe6I!%^yQ`Wf*6Na7i zK1^LNC;s^xoqJ=##wrFlzi<>(6%>Tnl=sj3qE}mJiV?4GZhCHf1tJ?AV=n<8^Dsvo zhWtH0C}FrK@Rdo)kZ=Dpi99^Dw~IjGsmj)K6D)-8E2w67URV9C9;RGYY7I<^8MYi1 zrh3nMOMc2KZovd~+E1FlJXi8W!7N2)b2N9GMm8q;-suxj=_ z$i~seVy66lJ2Un*LLHy@8e>Q9*cW4$b0N73mj&?!ptT^1L+6&J10*H?YjO7R_F(+a zS8y?A0?9R}S876btKNwQqwds3zQggn&Pppazj4|$0)!F2DWTvl?@aohUzz=VG5Vsndq8)WFq_Lk_rj0}&>6rqNSS_k+jZi0nW1)lZuXV4?37TPQ*2umNK8P8V|jt=C}UjfgpQm>i7!#ED$dc z@>NA#$IM1+s?Fwx%}muQRnCO7Q-gt2EhE~%MwzCn%y~Hidq5r8%`%-4FgU|v7s9<8 zxOV#JaoQihsfdMEOHLiQorlr*;>pSNG~d_ss@4T8X*}@&A>c&!*vIYLh5a^@fp?5sd{ABE~= zP}UcsV_e;U7URpS1y^>OV$}v;8%BWFMWk(eY=UWR|L)0aV$93;So)1u)(1Hx_5936 zh>MMU0bc$0`XmQ)jZnTx z4-qZ;XP>Dm&Hz^3lxyvTP%?RYfkkzG54fvOw6eoXooNWH;)1``!S7@sksykrE(_YW zx2XWw_zz!EZJ9wRH~7q4tl89{G#IJKorUw zyv9f>MLLwc46Qtj)2KF!3g0Hw@O=L6=vxpl%cIvSOe>)Ay#u36!kLC1i>z#si|c{U zF5R-4n0mvF`Mz4Wu{0-b0OSp`RAfk7Vl=^9XynGjR&CnOi@9sao*H5mmRl!H-}0R+ zD#@rF8lGY96|G4yDZLtB8zk+WHBMi!%GP=*U*TSy=r=ZGbzhp&QdPXW^PUrvH58&T zD#h-fF;5T_`B34548>OkYFXUa!ra~qt)CN9y1}VB3=9TIJm+dNis8G|){gLZ1zSE=$!U{{|a>RRh zYg_xOqRDnfCtaGo@{M!%P}SG|muob4>a{?{xnU>>!k*qc_4g84zGN!<&gdb9IW6-oDKr5diicvOxW#A`@xcMph`%vjHE@%Igc z+)mMQ4lwn7#8D9Jvk*PKO)qwx)hs*w2*{&Gg{mK(jj}Dse8mVOwGEyR8VS9A;u(Ui zDh9Xqj+8}v{JL!n{L#*bIyos?K*KVJkJIKjq>#Zm-a?%S0s|<`(}in_nrhxW8msP1 z&Zc^_8;cJrt3Jy-TX)xydPTn%^!#mE#Gfv`h?NsnOCjG2M(Khp=SJ@X*j%&}%gnG_ zIDZP=z;~k2<(@JAl=Op(a)Wx9F$vl4in|FVq-^=~DG3;xU9Te>GtNtC%*++K1Y-}g z_zpO?>^+>`mH@)-I8GdjfjEQ0Op8TNGpq#g)q{fL%aQb6UXr8JvOr;fZo_W`5uwsY z!EpJ6DA}((OpI8CVFtZuvU-;BU>@;VoS)E=pRT6nDW!%FbCr+ZOHFXz86;s1KcWhj zHe$wF4@$joAA>Ec$$HjC{c<#6+dM#9q~I~8|}UI;M(z&p|pl9|C?vFzoD4E=w|{Ed@p)} zAardAJf^QQl}w_v6HV^@5Ui?b4ciWPKdF&^vsu=j^ICFlxgMZ31TPbQzwkj*fk$$b@=7{I#(QmJ7 z3~Hn~oi36E8735m9lr>+_+l?8nCas|b$JS#D&3V7k0-9;U)W6-TuOBP&!V?>XkYfX z50$)~O;PCGZ)l9BPOT;Si~B0(it?Y;${oM30?ko<$0md->@CP>)JH?>u_xF{3rzL1 zb>A8?Hy+pW74BKR`B5?>U0TjNNqHQMK;XpYbkO5;00q(h8Wg?Ad7rAfd$dF4q409Q(fOqc zIG*ugaZ9;|iTq7?fwJ6Vpetoe1hI1>UGbwF>zFjli)B8$=7Yc{Ah0?QD|2R>A`c1? zCl6x6+MS5Qt&ge7`sH6lcI>jeWEoi|by4sV>*#xel*eYV}tn z5cqba_dMB*@rAmlZNSWV;LAe2C43xUHUoh#iid7P0(|y7BYcml zvR2M+#3LuIkTB`3K`5A?T5CGC{^};Xh^t(uW>-0cer6^$yW;Vw1FIW_QVfVWr3(Xr z#JT5FT)$IMp)fBkkJVxOUw5)$>#4I%q+bTu{O89!l7fVI&cqxCP8}4)J-q&%t7@kB zhg`wF>}#`PiQsxVTPYX0I&?Wk3wa_~P-W3n(%)I;SXv)Ov0$i+@99eaj?NQlx#j~B zwXI}~HxWd6lC8D9Qg&h6Isl04^9`9u*^+~ustLoj5emN>Pvcx^rEg7^c;@b7x+0&{ zq6^z_z1mDvx-B^2>X5!%Vl1sF9qfVQY>(P11W=vY>(s-CalYJP7`CUwQs($WIh1bzjxC|0zV0!%s%A?XL}~L@{P;1ZlunyWQr7&+Td) zHTf5B@Rl{k-@w_#k9A+D*r9trO=PG=sZ&Vutil0&noEnwP{V{+!i#~z2d`1bp3!RC zqb0;qE%LuVo5aClAONC|>aO9O7}$%GGRP1Fo1CFSN(l6$`RvTAPk1v-tp2%rg)u47 zy!LbHNO0@#(NvGXa8N|WR1>lRfv{-Qffb6X<8M!j!Ioe3i>#{g?EEO(#_h35wJrrL zh@g<*>#;oB;82c~yKrvq;7xvU{*Ow2^OG(EUbAZ9Ie{`2ATXHkN!UwzC^aOrS~qo9j% zTx{JI#!39EK?dlgw6#YnxF45yEx>MXC>?%*W_kP2ZszJlHs=dU;JIsey+Z26SIwkw z7cvqv0(Fux0*9uBf#a^khLO(VF5cQD=yPm+aJ|jDPHEeuz5NED={<&DG*l-`iTF=Q(@Mm?V;?qGPh&U`Uf& zGS42761DK==g)rs`8RWKcNC&spL9DkyfBsKV+^>A0qVNhG1_x_BD^55hU90WCc<}r z%OUnFDQ~f99ZJLN(r&)$fy>D(cfnxnCMM#MvuT+ zt3jy-5Eqe7?2ZKT5_cmR%8v^VTw(cC%?;B!2fvRk=B57aQxLd|qgRWWxq`U}B@PIe>oiwW{se z>^dQBRB9q|n`wQG8+!v`r_k*`ZlAf*3&t$x_rv%KHbQ`AD!!IwJ1v!~an+>~^KwR^ zGsR;)T7Bf&H~o0iQ1O$+abo;hNIG1On7`^&j{POW{xFqHfavW%K_6Wjar3gls0LE` z_8-N;Bm*M(i0a~GC=(=4LyI<>mJ@?!^3VU5#v4>SE8FkyV@}qBa~D zlT93;fQ&s{QC)PDi8Ol)l>x^Z5Likj@r%hPKY((@1|kzEQWc*3m3XWpRhc=sL}8|! zDcRQjSiYjD4pAeL?tJj5vxXq;*)F=+LAS$W;)R8k#yCpiG`;%ORZcsv8I2;gk9%g> zTqoOoS-KjOz|xdSaILm!cafM~x9EP(CUnf(nAVryZFj@yRc{&oAic&kX2SpDW+pD4 z4~QCg0}T}1|Iy0Qb!yLoAeib9y;&Qa)VB%Vm*}oj+BV8#nVMfEN7k(i|FhJAor)w#&`C@sV(XhCt8*41Ap*S855vfg1mB05>UNZc4t8~0PMEqwf< z8Y~JuOPlg7Kle6{$KAJv4R-M{+WwdAY-ztjsrbH&WRAo{rreB>z_B*cVgHz>fh?!1 z@O+_PYoYeF;N!!1VorSEFgg0Q6Rl;pZR#MZ>ecZExAA?pdi(19Wx{NrZP%CJ&I|OH z%G~y>bx`Hb`9~ugVAO&@w?Ko!GAG053sv;9^F$bBexdV`#O$G1rd?$Wzwo6GM7D8NWYg+n!a+~SH?q}^oN=B*Re`z;3przrIW`tYzuIv}4 zrkZb_$LbT=Pv#EnW32wR`JMdG$=H)OGt_A(l+yDjgFxbUuAG}ennK>kFVbT95nZTE zg=`e&@!GX9a|i`-c!^Ak-!#gZdfnyT2eSY5zq&h{;>Hd#GC-%7KbK8Z-8on_BreJD$R(t!RLv{!qU0$y+9#gPh{~}GCCV_>D zBEi!yGb=10kM_L&;a14btn)^1>-^%F&#a$B2$A$+55&j*@IPRoIO8tMUb$>7Ys~A-{ZI9#F;2t<2N-2Ox8-i z&~7!K3d)k2k0kXKvY8EG&`(T$ z0lDw8Kj&uy>4CrcSBBqG$-b*EOd*Tzc?Ds1pZrnKF#E40q_mb~GWHOS%5z}$rx>3w zY4*()_R$^1K}fLksGa?V-+Qt7O^~mYBJnWch%N7U+2hX;mE1VYOA8yyy(4@X%#X^$ z7IKSjz(Hi-FHYmvMCZBEcb>W*a!pDONl<}iPbjZtJu0R5XKzM`fdC22%VssO??3we z*6p)5py#2LvgFU^HWJkQ?!)9`;qHnYA%An(SVSkz)X3$Hr|(t;z5mQL-niN;{}uN& zkKwEKOn^8D9G$xuDCBlo@h6x3eC_t_*+W$a(5oGKd3dKa(Fw2g8ahpC@OHo>v|yp! zj~}USg*!i*RqHk{EGpMp4YV#ln%PimT3N^CL&^FeTZ-ZXXbN8F>UY|V;MrUQ~9<+ZmYLvrDY$7t|L@7+hWG!EcZ=; z{8sT@QNMFH3Q4>D5LIX~gPUbYNTlUwGTHPUo$aCsNlJ547}C}b%skGh$~Xb z6XTd8m+9J#5EaV$<&BrF!$WaI;pB9gpg={yo4YNK%We6=H@R9bqa(Y5Tf2Bh2!D=? zIu)+mcSp@-UDTZR_heRBedh^GCTR>rs?uB1y~C5r%7n#Wv{XBohC~ZIYqWG>$S))p!@Vk(->>+LIa!2M=DH9YjU*&Vme6=% zwCsq&>meX;!E1mvR$|+1m@F^cDBOH*m~5v?s$$BNT9*(DnpzZxFTT=w>E zZ>?VE@D-nHb`5w!&}PnMZVWKXHh;fVyYu8qs!r8(-rcT9%?FrVTPpG9o(vpL7*$?a z_U`Ap`8n_Auiw^J9$b!AI@3C9_HFsEnr<9!)+(Lsw)Jj{U1dPvzL?{uDEtXcT@CBs zlEsu|2E3k6CnH~;e%UqI>52tv;V#U*bXMPn998`?2_~zSTR*nUsu|GET!oiYEa1pkMlYE{Jc zLN?9IK)?_!{Xy}7N?GygyL@lPSTyh1a&9Xxt#Y0hgKer>TjhCE@sk(Wkv&x%1Zg8P z4cPO`KbTWdgX?Cs1Kfw%c60EePmyju8a}utM|bMiW>F~{f7^AGeTS^8Gk2>xhmAWT zRrsx{)r&^Jl8|mPAEizZ_|n@veGTSALUiwBrY@-`ak};{gwpu0AL-PtY0DRrV-rB+ zdVd~0%w7lrqs$N5*1*mB6cV{rY0DXC_q`=eFUu_4GdW?&Q1*Wmf-nDn67xU9=03e$qeQ*+!-g4P=(K-ZCNrftz1D zjdm{&?q8PBr>aOh4!!9tCZ?|cJlSVNFW7p#thU^4M=IK+3|so(-Bh60D9B-*@WcA%#*{?E58(3r<+E=qS!lj z#x=kfuEusvNK~9N>v_$NhtFdXJ*944eJ!|TC8#IpyOF{b@HQH`6mpJi_r}xtqg6e# zt3dEP*M4tjUrEFSErl38`F2DFW#9qnke;5NceSFvaj_u=I{32R+C6Aj6m91l|1qq2 z>G@r6AzR2RD=!}(D?TQE=;i4AR({h4J`Df__;>oqh+n2}Q9b0{`fJ6ObD)9k{4j+_ zNbpyYFdw|s{90Cb%!(qS0(0|2z7q=ciY~8^H8T{F);^ovDe#fcko-O6<4l@NR6ZWXV(wlBjMbSi zkc~r_xJo5+R@aEPNVZ3+^AmtDE{+t9sol!Q=4Qb-O!LD}svFh<$*O~l$0-F9^$O-} z8KZlhOHbD?9b{@}W=%v)8(uzZ>Y4j1mraq%2TQkRsjVlKuPfdg>2JH6_wMczq^cSg zvk%w9PUW-Si4P(Zv6T$>;WQ3R+c1YaSsuTIduBGnLBx7c?>7M=Gp7}?0fKQfyq?yKu3<9y@%r`BZq6F(0)A2@KG zieVQVRQn_Z>Q5{L_nfEE+zqGUv3y&$*4M#jrVUas4??9S_^DsWRykwQl1iw5!pC)%p*SyCYD2&*1{_P2nh0RbqOR64h%$|`68Xye?+g|>Eq(#Yg-%X z^x!Tu@q0qdC2;MZXRoJsB_YRPT|=~=xSKFlQ#NKa_orV11W4qJJJY}|*ID$&C?Y$5w9%gwVj?v+duJ^>^% z?pWYO2{qkc)q1)<31;h54yR<^^^u7As(&?ZFO649{(5WYZouzFEKa_~1$+xUFQf`jV@U zu;M|(nd9*#_ZQNqN zt^~w9%IqKWM_)~XiZL%DHwamo!Vm(+I<(?X<m`8>wSV&B5T{-#Z9qEtw_*f%P)Ca~bo1QjLk zKf5|+Pqb3`z6ZI^T^yE;5HI_3i|)<8txtr^StSAj)MUwUKC9OGw|eA_A~>k@GvT4C zpP}oYg^cYemh(r4u1LO?zZ;C>WT>3)LT%H)yH%R)nn7z*Ac{$-mw@Y9y8sHns3&i- zTRr$sLv@;S);MDgEBfYpB^tA^`j1Sm3B%3b-oNObM0jq@48H=pZeQJ%h%W{M?s;Ck z_>E4-*L^TfAr`~Uu(pzgN&)$KB|#)=8m`xgidykN%UUEFAtml{Rv%>V%jcX&ekwo` zJq@4sDzQObw;9YkBZBm*5VBU^y$rA6;>s%G-7HhW3~O6z5aoO^ zLasJ3o^a$Q5_5!fyo;x(9;f{?7H8cW?6?uQ@rYS0KgMS^WIAzfl;Q?isMLm>`dW`r z71Aojfj*k9wR5I7FPTQ#FS!}pPXeu&u?3!OTg!H=9g!dzFP`yOWEtOHW7BC=gsntj zQDMWFIE_j^X_>4bUV-54ykCv-$><<(x;S&6_xPoc#{>)}7DzfP%wNAR~_Id)^pDJ-fgm#)Zb26$tYEzBmWs)OM+ zjhVVy_KBw;a8ay!f%i$tXn@bR{>lM?m;lW7#a|2a4BRKGH!4P`k*fDU*0RT=^D{9d zTmHk$r>zaS_0I@p0YR366oKKZv_dXrY83HDP=D1)EXUUlp;fsljtooBlyXF&i%S2huVYHAYWz0Y$a&y`Z|v~%G9c% zLMa1c;Sl~q_6*vha4XJletL8!(ebr)zo*_Pspi9g6Q5#%|9aSJrU7y(Kg^<%$)kwn z44gnY7_nhbQa-k0T2~-&Y{b{Olv?9vR*GYX72GMU0da&_ceHH1izTGW&HpGg=>fk<42Aw9?I z2AQ+V6@Mqd)YPFkjTkm+Fy#g5vhZm^CHU9HbgZH&KO9c~a`cHNMEp#6Kfu%^&C~?H z<(F*kHIyY-12}g0B3~zcxHJ^peQK^LHgpj91)i;QGLRt)7w1p;B&q;qXBjlG)wI6F znnk-(Q>kN|O3*cFRdmI7sNGGwDU3Iq|rsSi{G({2ClX^DNI?;ar-1~6}sq=_Qb z`^!v{qvrc@HZ6bH_+G|(X~>4C?Kd682TFl}n7xDHRqU^zizWCk4u89|01ruSY1(gn zImY~wQ^+Vntys}i@qdSi8;EFbvGpJ zBz?+TjtQ&KP0^SOUMGWoSg7-s*!NMcl4axx$J)BQY%?GIx zS7#RyFGsAl)Hssn0{X+oQTIETT^|nrjffEEW@-$TmgULodeb-~V1!Y!_=o4^ZzY66 zPQ1T)>`!=JbIx8y{1ei=FPjHGKNA90wys5{xkeSby8>ui{1L{{^9XeyE^!k+5j!+v z1rkh)y5vw2PS%xrcd-8#mNf>fnr^#~zxLak#B7L;zfloPs54AogSC>IYj_-(cc&WD zeYmP`^|EZ2#$8vaRK?PHl$6bqMx;#7DAEZ>zZTSVuV0naH&`q0=(T z{C3%9OjUIocq1`0_|NHR(@|`O2(1(}7F5%-V*kzGZctMvBg|EZ!n;ZMTIJC%|1ziF ze0R2$Y(6O5Bb_+V9@&)tZ202vE2D?nVGP8Ut#LCJ?D&3K3DNQ%l@^*W6z=-!LgWMj zFOzZ4gt><&TBi;^Tn|`wUhxA1RvrZtGni4)4dqT1(YAGYYDrTS{B5G;qWkEn&gYR? zykTQwTMn&FW-#opj%GxaiIoIvoFnqw?&%v$U(C2p8%}?1vp6u~orBGkVc$ zK}k=EH}8oz;r{*ihZKH8`>5^^-{vUhvnz4<#IK-_`DVF3B$uzgc*;++AlOFa80sm8Ib;*!T%4+upfcbPq3=O$%R% zr#O;PV^VLk>$<@ONRM0+#XL}_8V2IO4H#rdrIZJzM(u4jX8`UQKDN=MQQVS*sbG!6 zQCAU$lWH*nj6HaY4+gC(-@C5XCF5m#74c;GT!o4ZQS@}KbhA-BNoU=5=sIy=kIxi=KZ<2zu(sV{&UBh^oUGEz)p1$xa{Q!?mToaGM zM4M??hJzv1EAXj3r6rW&1vz;A2HMaSj~!WDX107M=OJ-QB>5|TMP%yDyUw3rMu=>z z%NO}~pnFHB#(HU8JRh4{VY)w(HFMml0Dgzm#y_rY+_%cNv=Ro986QI!NdrY1(ew0a zO{gB#RklpU_m7jlN9;jv!|6<7#niEez>fQxWFI?_fuJwglL3gF4qOooq1)p4NfFuE z#{}F{KXYm-D3(7-{b2jZo+)$kMZQ7+Bc{1v%d+PZr1^$)~ETaIEedX)||ee4qv$bKW1 zuaT)AH6$1it*%7iWxjEFq##&54Mv%`89D4yCKxdhaBrNAlcemS@}#-tVsm-Y_JEbg zYZq?`+<#z^7(J@Joc8gqs=DHQGC`hCcx!Kk&KQk2rBUrJW%z=?d+wFnCu&#v$0=&@ zZ!kjOKkg3K$z#--ve59gw!!0n(~i-E9B3xmO?p2653@i_zuVcX-#Y2bXybb4k~#u% zS2Ht1g5>q+*eD|@IoaQ`D`vWJeAT<0Rv>96YFPLie0DI!WFsZEXMpX$xORIv5%2fU z8sjHQsix+(Cm6mILQmyW@eGL@9ED-d%i<|nrMJ&T*?%;7JjzFmN2iL+2Y|Y(W;peX znuhT?MOd*oWen`+_a0B3by#Dqanpr5#ti=-B5b?(R#R$X1`r{WSvY08cNPzxM#>o2 z?GfX-hOcgRuB%EL7PQlL{5Bb{0rsgb64xEbmKuIi;;aFv#gL?2#Fj=6Eit*HOtaHB zYuL^nH-CRUxwaI{TZ`-2rSRtEym2akSd`d44t%lcR@LN%DXBdqYGi2ikabNxd6o?3wBZF)p!odie(HSs7Bj+G zUo{>T!RXFfNJRF*@UpPo7NtODvqJ^B^x3k`HGiLsyFFC4%wwo!_QAJI+_?9T9(gMk znD<(uiuH4XSx&*}S7x5xApz;tz!N=%yy}l;bAPl2(KQ0cgm2k zX=cop(I;}ycpkD$-;jWZ{sGolyskrlW|ZNfBQs| z{N`rl_vnWmwd{XW&m<^r{fiF}Samw9n{J122caLil%n8{%6gcp0lOXlvvOvV#1KUq0} zt4;W8RCcLHE=hzp75NtEx=20jlL%2Ae-s}6XkNRed%~ENE1A9TYR?uJgt9p<$w(aR zwI#fi=GyJVB1?X9IP%WS?N~yV#@3W~qiGLFyc<9yIzotX*=cJ7qnUDt_3&>f#qIuI z@jv#8`{CW&oqHWR&RskgEc{StCbSExhWnP20XMM+*UvCvkn2z3FlhtPyH3>Jf7Zrr zvCLr*{<5LfIgDUF+_XWAYz`wO=dZki%CbM3@2?=;@NQx9y8PBD7A$#8rY9aO@LD#^ z7WmtlYRh@QR$DgL+D|_wz{VwEZ^~-=|$#Chlc* z@Q#|CtVbzA{gct6ME}$K*h_Hl_>;@7wK6v4lr?B`+H#CAPP5?;YUs03X`f43tg6`1;dneD&RtkxplVJ^|nBPCq&L;?orJQetLM=2Fh zPWIwYs>{nRbfJ$M+UXWi@a@rNinFFFTxT1wg}bq;(@sSpAX3QEgi<(PR8D6t?%5ml z^TrwXiqsw}^5blA#+UO|nSYHF;QV>JUy6wjk?n_e(h%2ny5mXTe-qJu?5VnNuPktp z6w9IGbH{o%LOfqgO>@hlHS}_>nlqv_YnHCL;~fZWW?Ks@eub@Swvg1LYIoT^ku1uE zH{mlGJ)3?0F*VG6$b3`xt$J}6Q;=UvX+rV({x{`!iQ;$5KGeMPpDdX7HfV=U=~`$q zcTRHWu8(b+F*(l%e;%~DmAl7G!NM@e+nnoHn4f8wpA3HZmC;@sxfF%+H@$jb>5Y52 zn)CJau0=Q7qIzzsT-Vp~SUoiBz3kBRnD3>bxf#ODDJVvot@mO}9#}Y>{&TS_FxRvl zZ>z+T-yYF3Oue(y%$vzq8Qjf&b@J86JSDwmHjagPczf;Ve|u?8qhE&*{PsALDQ0O; ze|}B2!}okH>d4*x`J6e&56xyGI?eeR5~QemU8A zao0v^v&-#uZc8ztk# zdk^j9nog%YC?S88Am?)cuprdfoAt+V`?s8;H0%&x?Bf zE43c|f3ddk{@$3CA1@DF2_#t2cRW**G3B(Ef5WfYHQ{*pQ3-o=Blf;cVV$}zzV%`+ zCJ1jE&lc6&;m#u^D&wwppe=`mbhxj9o-=DX)~6#WRlPOU{BBCV9khuWv^jgs$a+ra z!wA(`BPC8XFshgE&~TMStm>A=2xPP(B56kse=i+e{49w~iz+2%SU+m zfBx%jmwC9y+P53o%~a|AYL{zae4zaG8JV}8W=^TJ5vcZ2O3fVl5!PoCn~1V@-tW^< zzW-Sy$?^5%#a->U6r+mElUjRdZAHYZi2Em{;v9T>JjaO#98nr~Hg6rGF?$Nm6O+<-I8*5EmV4|z`sVzEKdwkZizwlLKIJ4=dwv#s9B2FuLtAXRM>nV%J{p( zl>cuPP4VY6m##eV_*U6l*M(OO;Fas2opWbh;FHPfJw)Jbh&J4sVJ=a8ZU;PaOV zI#oTTq)MZXvN~s`n?G*Lr)^?H;j%i^lAW5a|BbZ0WU6RfLdYy=M|g}WOI(S=eXwX| z<@wKO=|@Gv-sT8QeXdf0Bqv^6e?DtxkBvFiPkuARy>V`<^WNiv)93o8kSl&u5Sr20 zt0M?VrcYLc?Vl&*+fjy#FclDeXeo2SUUoHvX+g>B`>f0u{dwRjKm zR{Pyk_|K<$R&NuB=ie<@HvE+Icu^$y{(c+X*A8f|587;umicR*8;!P9QnXl{RCz6P z#&w-gsN=f0X>&%ZxB4$Vlt?RAnYqCkXMFkPE{DfM*I4s)ZrEUZJD)0@y1cBlWxL_1_{Ic&%4T8`i99vd5LW@3R$jo;Jr;>Dvb6pI3Y^ zmA6(oKO5U?qiBSei{b>Ajtk17|16QN184gTx%7hCVVF30#7^xtW)j=Jn4B`-TLXWlH(e~y!d@HEW}^_3@y zTzcsr!4|PZTEv{yjmJ&Y*Z01QcBQk2u--gv85v3@P?13HiSr(B(d+r}6+Z?z*ZTI? zjTnk*LECTmxMkC$mse+9AXoA^%1_;U^YWc~Wnp7`f0Lbl>w~tRj;7qAA=7=Dhw*&r zId1)4^Lzgs-&xJ;5gX*kkx{*RNXS}}h$$wS3{+s}?llWkANdjDrV zvD43UaeqBOO9yg2{uR|+=ondn?$Y>^Oxz~94xl@?V_Z+9(^jcGMt+7k& zfZXuS;FW*HT7l=)1T;6-&ST}z^pn0i_f47c8~BSz&28DLL{z<=*yMXrYPpu*-7+=0 zTLjZgwo8W|J|iVOxVsG6)>Pq@rd1jv-}QP zY|*8fg%bMp^zn>k%hH7ue#cq)X7k70#uu&6i#eS5`##S54$Rm2U3shxdXxhCIW)DspE`^pCwiWlz(n>??(GD(Tpc4Nf3=UX zR$idY0@m^Bog*nH9MNebDG3OT+oP~WlOE@PaV4c0wsk_53H9`&?j=lMUQdM&@pG$C zo|DnPKTdAfJJWS;mW1M&g$5j~w{!V<)w@|rqgJZA`O4%k&AB{uncAta9ZiT7Cic^h~C z3+dBqwRSRjL6l?BWE(qv#e3`3=lx_~PnA^y)oNXR$#2nRKXdGOhCVJ-Nb#?K*7N+R zrQmG%`q2!T-OAb8DUU~daHCF6(2c@PyJkNpmJ{i!dUW)+HiwdIP@G1TbI2Zi@{K(s zC7qQ?T-~M7j-MAbB8XWl)C^|z&aO0+qZrh+g7xZ=40o;Y*!3rc>YwR{JV;Bs;JB}kImsp_|d?P8K5Ts#DETK^Ij(HVD*pM6#Q z95xj`8weqjkI8}G+;ee%E4V}EgLC_3rMEp>UNlw`gfAstnW0%@<>u!)eDk_AWeds0 zRPA!^OW5EcF)ypm%>;(6Fhb{c5J4f>=6U2Zm7b-&BgW2+@-8oZ4iw{~MNUL}cf}no z$P*(axR~_teYfTVNNx`vF-yh#oiQ+RLFvHR#99x0ioPQ$Hxtc&?YcwbNvta0O4hxX z1`+)`JpHcJ(mP{B$J5>6TmD$ooxCUKN5^Z!lPQWQyRtyo3-mj+WiPi>nku~Uf2zwE zkIOSaj3otk3DFYq9U?BMuVhn5 z2MbXBq(f{&7}Q#SVt7Qr?=N6W%7(l~gz&*u5ctn@4%i-Vze@T{*^=N4XXtyS8z$jy z1WFMza*zo@IiWWXQ-cyi76}d^Gox__ick{Cfw3)Q9WQRL@}qPmlcQly*PGH8$@3F$kYb$^0el+83|yrsWAEDNn3;8kR22Uhc?KoFMQ5 ziaf-eEpHtMRMMbMf_wc5-rRpjp51dtmHPgRbUW$e8FUHCD{|u`fKb zYNN>z7R8*8^!&8RsG3We&(AiyMYNhEVLh`MvHv7-)A|TiYca;)ipAe0n)9QE{J*vI zk+ie1tJA8HlLn5;y*-;}d%HDbjwEPyc#g=)=Mw8q4^~b-Y=Pm#=~VbKpS#=QbCHLy zis@PqctS0yMAzDJo{0n3l~L#X-1U%hc#)ZWAVj!gF zDV+(SyA}HO`DM4Q1Qlt7GbugWNwyzDRj-9jX@Y5Ao`|eVf@=gocOyRNZG-k3?poYO zlEk+b-jjY680n`k>`Ldv@$18hnA0~4DB&}AWhmpcbik0jgeF+A&8s-!+l`XR$*mpv z+0q0tyX}8bpMXg)WMsZ*CYu&ma-&;b7SXLttX6ZrYOU$BO=>HRdIL1p)-jQF@33MU z^yOl-Fe540FpPngl(b&tUv)*My5~Z)?w!VjAnx2#*xDb#F|Wn-38uESAsO=U$Ar>H zgBj^3RxHlI^4y$b)b__VR1=hVYmS^_F{p8A8S$U|MI;t)%CN`MtgJO!!=9{%>cFL}GsH~V6rrwAc z&qgwjoN*aBLLB(ge-Xmyb=?+9I^%`@A5NBPF<* zbX_!d^qppuLPbxw;*zH@u4}fmyxCf?@N6ABP8}qoy3qtSj9#OPxkTqgi&E zrfs7^kdPr_je=&B8cW4_TzEXv?B1GVjyUg#$`qzyz7w~mO1F47M|oN|3o6Qb^19^s z**hk-XvUzavZJAK@hvb#DSxq!aJHOb%vOJ+0rP4YzdZ4cAVM4EoF5vb!i2-(2FEkj zXMMd*b?LpxY?zTZsnp-}5px@-}^zFqNJ}Hq3vk z7k#&`vtB)QtabR~O~tcC!~S`DG2S7(+s`s*t48NPDID#CiNb`w^ge5^EnHoiJ0o;G zoSaVEUYipY;53<~mnXkOBs6+CiQbeL>EpXMBPs9hIKQ{}y1yLJ5A7EqrDf^4BPn=0O#Nr_LO_`yNi!oQNFE0+QkdZ>f19(<3RDL!yL0M&_{)9qfmhshUy(})4-wWx> zI~*gbO8RY)nQ(rx_v9eqFW{Wnj_jQPhjtzYuCWCFW0D{vB8xgc$^r8IH~4hZ#PU3A z%|fI8Dt|l`%pb^U9O{{jL1J?$BPm)AeMmPY*$&kn(yGrqvpy8jKNKS+8Rhh|5J41+ z@#@K)QmD)AK*-M)qp9SC!TCK+MMr3)%P4Z8p4UfchLLmt4u|f`gn~%{pmz`(d4wTK zQ*cgYgP*KKDa@ybUf716vL@Jui1p>vuu$b5n`sQ6 zH${UIMg)RPgOLjuw>ed}jUhxKqN*49o8}=%_6f!*`T+6x0q;52Q!zjcwh(JO+1Pfd zEHR?$t7^qXGE%i5Yub&Xqe+O`lKW0?OuK701s)lHtjSI6q*VWZP7~h`DaxPN#Ot_dR9bI+n;(L+jW+I*>SN%LN4m)>c6oJaIot2kXH- zP!S@?XnN9!rtAqA7CS{5SWp(WXt|gnw9(QdB_Y|u7B=rTOEjSLJ|SV;`T6)TCpuao zB%ETwiCvc~@4-&Q+W53sDxHizf`2C45|H4KnV(?xhRuU?@#clk54O-b#CgkvBLb&% zxlc~);Hn&v-?|+ZIFolQ>l9~Lol1YGs_$hdrJ05{yco=o&0KQ{LT21YZuo)|NT7$6 zqA%n8Ss{qQ+bE+CdqIyz`*|DhCm7>HAht}G)Od(0R zTAi?nbGiOlNGdj&jyD-H5TYsRg%>DR62jKeI3{6hMVEJ4FGc=CQ3=6@$DTziixY$PCZ;iz!gC%0WwDYYJ@w5cN{Y|RNIfKBX= z6V@8%wL0;2mrm8W%MV^z!XJLV9RobC1oO0V%7wK)7VPUWnQSre!|4!Hu^@fJ=g-Vx z?9WjkdGJMzD?}ngb`l;05bo{B(6$)}Cf@2cI=dkZVfs2UebK)r#(z$&V;HblfTKSn zC3!cKN?^cOUY+DdO8Q0ttjNBn;P6d8b^3VlcE`qhcqLAib2Y&;M0`J!+voL(cp}d= zb4nUN23OH483wY>AhLd0WFl$?Fg1jR=>%4|Xjag~4m;X+GfaU!y0i*0@Zh zo)uN5tH)lwUYXxg5`T&W_R$8Z(CX3IA<1T-9O`mxxbvuc_xDlFV*AC_$HU-5W7qd) z_BLL1oUUEy+q}<5zLga_cuVeg_XN_-+ZNJzf#JK$Bkv#O8iXNg7&h!ZAsK&;0Lp4l zEj6*eHIdzZlaZ?1NbBNFI9{hMVanXx{6(a1?kYew1Hw0Ymw(;bxJ{&smki-q=ae+# zt)d^*Zh*^zZHK`n=%#|LgULp_bO-q;&8FBSfa=wuTr^Cih`8sDMZ*ZGx+5h-@SJ96 zoGIJ0HiwKdtHf(^q$L7>Cw{ZbJ9fz%-TSI?VY~P{9p|x~Yqk}Y8Na45&WbS1S&ybeHc^)lMtyoL-d`&eYLrhYHu8Wfpb?F z@QZA9_1tKxUQtS-o|>kQ1p=DVq##l?zC5F=WnNwm$SK2Z8jcHNm=8ls8J5Od7TB76 zBPsRQmz&!m6z1QIEYyNRFM@VZPBh3VlYb+xM`)&Zd>zVWMAtV)aOaF;aTAlNWMQO0 z&8f#{PU|Bn^qvrVs)yoE<4KTz9xck}N3MvuBPAe^z8idcV)u|fGSxD^2^$p6_l^FNf2U#Xl&P5YbSqcjk4pM*+1UCtPSq&` zQ8uJD$-bnI0x0gXnyNJ>KFWM|dt+$#y318zd3a2lHqN(U)#1pMWLjx|xY{}BQ$QpY zp`JbeTteAkL5IP|HbGO!XICA6Pt%#yej_DXqvuoQ=(le(>P`FRT}ZD^biRHgh7b^W zyw3drnW7^puf?%Pp(o;-WXMKg_>P10{)c#~SYZo>BB|~6%aJ*+-6jMt*txnJvIRT* zCa1dQEJo+=9x7YvPlC^XF0~Lk&k0glrLWVEZ^wE!OAlsPi4h+EA<2gJAE+}ol4KCz zTFjQIP4(q1H|zG|bLs_tQ|b17RLzQG90{?~Z$pVDO`;Z6nz+^Sbsw&hq8%ZTl%BWRW z8(D25DIgQ0_-$#&2mHQ|d+Q9Sv76X?Ss_@YzLZ2ka^k5S8PfPd`Lo0He6%AJNyr0^ z|8G=&CsWX%)s;GLt&^K_8h@r=OoY+v(K&ce{$0Jj+sGgF$`tU+$Qhf*Y<)qQwdVXQ zIMObBu~U=71-niem>r^r2`my4J=H)Nf^8FU5-%B?bxTUxobk9OyMV49PeOJbRa5j< zmbB(&>S10zogV_)Ad@5{B+o+TiQnVs@2|BtS8#ef8X6MOI8)8TGk@%7&f|A($tCU2 z8u$8hM$n=}K$dDH1!8!k(*KkCXJ2XO@Q-=q@bH9%829`i!IfCwX+6;>gM<&YgVzB2 zA{Oi^J12+7jg8-P{eZr!h{2hltVU1!+yp!t5IuNr?pe39M|?Xhd_5PGwYZ>rE4ATX z_aVO8g3sPc1n}-II)AXkGdpG`)H6fC<}`R1BPIMaoCht0PMlY6|4*~o<=!y8mDlJ} zogp~`AG+qmT`Q5w-U%)-O)+-7@#0R=uca+F{c@Ic)UBP9J+=ucx2z1~qaROT9K&>X zZ*JahQ1&}iQ=6--mrO|M>cTjA%zFM~LRqwi6ZYn>xfF?3mNf%16I&*SR!dO^9Hr5mp*w#qL~ z?~am-c0BhbG`_+!x#CfJNYHRY~ z(R4JAHytV;!COtRc#~NK0%;5?7qy$4*Zc7Y%0-!isefDQSM&0wom(aIsju`2YOLyI z=bUyv%_%LBaxc*S@phbWsc@hmU+(HTcomo zAL{<6$CmI!WAce<)DE{v7T@hv@jk_plKcEIayA0QOTTW^mm?*JA~|S4m(t-+=C=Ko z%73fe)~SR4uk@;-`4Cj+T&sA=mJrbaJjG$&9Lz@tmiCiYb%~?Xis+wMEb>{Wb+7q+ z&FK22so`WvawP99f&DASFN>GNy#=I=lX6d-U_nr(hbqbC>UrK*NV;p`XY$Ojrvc4z zwp!fr>o{$>hR+{c=&kVZy64vO8|P-@8-HzY{{(0B*7kpwkDt+|XYc53GFI+`UK0r$ zvo4$)Hp#JlwXXgyZ%&Z*@;=oQUiZ46dT1BEaBR8R-AY-JKgUg!r8%mK(;D)ZVy;a{ zX$Vn529)~pfz4KXsVf|zyE`J*+>q?(j_zo#iW}yf*vvgjnU2oh@aI#DiP(S5Jb!SZ z_Bm4%(C?0tJJ*cDo-#ju-v8#~=B;dnhtJE?TefepLEQXnuE(dHBPoNFFg*!v?5Cm zyJo6xq~DR?w{t#SHYS1fWXTI05=8h%RR$v|%17tX&d)s3_Z>C2Q)R z=!UdVur1Rmb7_ncB%bb1!9MquJ^74_#v^Y6xLX@7rwiWB@%6BLc;D&b{@5Hv?xWzR z#CJ+x*^TiO(C)j6J3RHxMAD3Ed-z$lX%MK(k(l;UJ-b$x&^+8IsMWq#x1J*!hUMcV z^)zr&Z5bip&$+7)d>Hd7PCrc~sN9)uPEW z22(Wyh+MFFTZ&piX*yHHF&|<7Z>;Qjrq;djCd#4+apI?B-qQTytZ_^(6Mtr&qYvjSV%$e} zF^BJYhHV6Lpk!;9X0$>YNO0=@BPHP_raGewm9U`)wyU+!6o9Oh5I#J6NZCx?7drG@ zFWhaT8op@u;M7fqyWP-2^+5r^==IqSuwjisV$w)yyJZVUH($(YjtANJkb7*FqILlX=Cng^q9Dnr}jFanek`>Oi=|>!U z^-78C&la1P@kuHZSps+B$&B_#zDNRM#4n91ozYUF!e8v8NT_82GKRt*9M(<3SA8!5hTu5dPDOJkB(+v9XDm0b4DJ@Pp>Q;DBg zjg|cd7ISoE$A3@h^Xl9O?W}jLYI%;XV+=F{Gi>+PZR6x8KpnXn9?*}zd7-fT zl$b=2{+B%C`lU2fj_fxXjo1j|DJ*>Dx42WPCZ=GrHGlWBc(+?Zerxqdd=DnC3l-GP zQIteV;`;84;VB~ClYgeFY7y6!YSn;2pxBsu9>A|mJPe1rRnKc%I7+v5pt>QoG=&ym zxuU&hkKP+G)X3|0-xAe_ zj#D(}!+%8Vs$Nap%{n#wpZRxtBPAF%m9w3>;IQS`@leq4mwx_NqdZ*9kiw=8dH@{hjI90Dt{d}k7$V_DfB|-uN@;L%!}l1ET~n6 z1#pL``)V-3+m5#x!ms9Afl{@P(f<8S_xmFyTQEKh#d;Zk)98=FEhJeSsT$j(w%JMl z+tb6a*Gv25KJ%lG2eoCem>)#>+^BT zT7PM3G2^0JlsbC2KeM;-aTMreFrkb1ODFT_|CEnrzp$(2-|Urq=HdKpW4gyO`_m^N zcQ@-FO(^$u-5YT@&i$cagDjhZ&*Qh#m>2NG^J0a>xc?l>YXOyzZDuyZ61rs8p% z=dL2Gy2==JZ}pXr7ZvVip=;N9ktjiiX?QETdaH-i)>zFis%?h{vu4{zBYfgUF@=LX zNfu9>F;>or@2V<;Mp{o>y}Xy=jy;G>dXU{69MK}&*0dnTb!I`2kCXpDgieA$}CZmWR|X}_bB8mGksfJ zV(I`Lb2fhnCx!ZR5Pm2d-)-_Fv4|XM z+_xE&ZlQgZQ$w1v{*#q&LKOlNR)4H$7+Yg0Tj#{Y@P{`$#}H8NI3rtjia&jGblWmD z6(pS~RbRp^w*ASr#zQtkyHJK=M}7ykn*X6}%b}A5ug>Jtwpm-xPabr$P0Fony9UfT zN#~7iN+j^ABPAAVK_PMx3lo{BbP#`Oeg4k7k7hx4&y%zZQFIPm-F8Sde19n|n)Yl@ z$zgrmK6F~L+w^Aph3cXAMf6jfbvYeCu{Lg8R5!o|D*nk;LZr*DuQsvWlVmaw|>2dukQ1nNvxNEyXL0za+xNN z)x5sn%?3{iuCnB{91{ zs&klvn$-zGX&hXpkfad*wvHnu9U=?s(o} zzQx@~qmhZLhl=#kxuTclLbqQN!>0Y+_pygW0JQNNfo*BJX+d<7y)T}B^GK}_|Z0LhgB2#&9=4a&u z;dx~fBg8pxZNO7_?OKa~HLK1_WIA-wGMNavcAWBM#uFvnoCHzE1JcN5`A?(E)$_~4 z*uK)E=q;E1UVrL_8(u1Iz(CCeqoyQ+3(a;_k`AAj&M<3LO1@V{>j;%ejeMR1=YK3o z&d%6Kck|{G(H>LDJ`C*?>55N2lFRQ+1|iCBe%z@0**J-nMjhQCo@E>A^RBJsrjqCI zOp#1RVjQgXx_Vmv(`;-`Gg>EA2{UiAfdz2TZtW@p<9|dmqTF$DFyEPygr^~(nv8yr z9?#eMBPohiGbku|c(7#x<}DHItg4vRWkhk)rdJ8I?xq&YAqBqgPtl#to>kiR5Mv*2 zKO-s3eWtaSJ6`&UUNNpPe-uDu6?A8Yk|ClaB_6*-)z7XxA-Hcsf0?)OW?<yodVfSuTB)g{ezSAqUi+(linm{79;PwdD=*Jgy>@Q{(9>qIFG>`*gu;`;nzr#Z z=6$&#zG&Wh8-3c2qUCxCTT3ByWN}j)?wS!PK@gX8d3s%*epltb(V3{~dOf2?`|DF) z9Ihf#XZk+04?GtWuSep9#3Qe3+SsM7^(}X*^=JBWa&5_>A@DH}8U@VumdxQaKp7KPTUexVR3ysRaOgGEmOIIzr=ff;i*`XVsKP$qM9~m6$T;DZM zZEQz7$G=|&7$q_0hS>T?p8Ce=;mk|&06KT;@Ayl-=AQDHduZzBL&*f55apx5xHCUr zfrEjE+;b~l?B7Ow_M?WWce0%xml#@A$umM*E>O>XeKm6$+h-1zk&@O92BI2PMh~~b zf@YV`VvDMC4#>LB5iUNMHQdKc(WE0KYLknF8h?ZHK*0qx2t@lE)%akKjs84&eLq^&#Nq& z+FB_k;;NSyp^^FvG@28-#vz|E`UZh<2y!COgH_S#t{7FNwjtDaevm)eP3 zyLn?Kzf zdBGf5?}zt`{bw6KMocSQ4=6Za9d4`g>3^5c_A}RvqZJ5rw@-hgx=i~;ja+DiP(=qF1O3b9#>zSVa=-d74K@;as-#{xur#{w>&HwDL2rutVSE z904>iJ0*ch!UuV_eRvUXZ3q&1UVqeR7l--kZ;p-TvTl<#9WG`IuFpV!Bx)BoVl5Ef zLa-1+h$ErRWJgB*?<6~(KyFvh);>c;`e^O4A>Iq@?GBPzj8N98W}tq@`?BopIU^-x zRW>s)(0)$t4vDlh4!l))JSv4E%?G28I-FWScM7s zv`Pj7kPb0C)>^gJ6C10n>OcG zBJ3#`kRdrH4qj{z6wK3(L@};bS{{J?fietI;9cJtG!H*A54wCw>jNIM7PkdGoSI}iyNNmQwGMMfw06f zWU|XIe+-x~LJ=V9ydk&ZctAS z;=g1DqBtf3Nq>@y`e>=sSF%OODwyF?8ZRguSjkpzsIAK;@%#Pfx3G*zZ4FF4+du=r|8kkcW22am(1W^ zpyQV!w5VH1j30?h97|G;rsDWDz`_>#YQ* zmn{FLmeaQ)nTeTRGUqNhlbLaIqcAo94=T-A&3`k)hU)m-o39pi{8>2i@;M`x)mGIl z2DJ#|u&#PL%1@dF_2&AxntHn{%ioW8&G$3(Al?glOWegq?@L$|DeFk;^EZ21p{z~m zX25RLdXsl2P~qz?fi%#Z&iKx@W+N%YFn2NrEi*FFapra;@YJo-_p>sU5`ANsd=dr9 zd4G7r2TRVWcUD7`&f5N+zn|aFUi;kP<@#?;+FGhwqII$B4zBa#^WNSVl%{;Va%6&X zle_IxU;s-7b$ zPf?(2!+zb>jYE#Z34w@y8vG&Gej+Lih<~wJ5Mut{$)+)6fh3Gk`}V${8h)Q?@NC|E zPwfwB|A)dDsD}?Km?I^}fxJT=LJvTJ5RVAAkpaj**~ezyW^4kFU80HOGu-WW_iK5&GXEsW8bUfutHzg6fPn-|N{xB!1P zLm-|T<$%m^LjY~>WVPCR*QkVdeNbL$_+RU}j`*EE&at2$j2SAc_XXCK*X~=Z`@)nP zB8WyJ1+^(7C1VI!@uUOAid^qJP=D=-!%%v^0iV3@J4z!d3E7Bj0I~t?-hfd9nM~7J z;B~jWE_9v2$0^@=tIFLG^45I?jI_t!XgqwlKvBjre!{5XgW|+SASl3hZN{_ zof`n1B79%OI*83E*-2xGjIU2mao`k{^r1YLO z>+dNE9fI~4U>^pjcM!2XCSE`^1kvw`so9a`8H06fkW?P%$#;Ku1nIs(V{JSd#Kh?6Mj-i9 zBPI8YC>>DXm4;DOz%^f~f}T87?o)3F7MdCR<*ign%97*;5gveWtOrJr44XXB!6Qo! z^C^1{7#1c-F!bY}G98i<$qtp*a;HW3ES0e;Z;)xmL-dRT<%JTZ3x97%X+KZRMlsOm z>ihufVZ8z%h?)jT;|m&4q4u9J`Olzw^ct$Za>MAzc_R`}f~M%nH70IkavMKw5?^z4 zYAk`=cbUp~Su7xV44qX}n@t#maXD~sDB2Q|;O<@^xO>r}#T|;%-~@MfEl}LOxVyU- zclZC#O>T0LoRj@FyYtRGLlX2NLq`4d_(cP`y}nKPGK8faSx~^$%VW2n)7ai_0>L%{ zb@p>mmI1c+7%m_8deHQr`~;{o?}yu3OXN&Pxs8JNtGvk2%CDT|0oh*A{ToT#?@fWt z1LU{XBGDF>fA=|#au-&%oG$d#x0HGi-o-x9t zWus3>@BB`ZFEm^QyY8s7)vwNy*}SGkg8OSAxjlv}w|{jc5&f3jGo=vbOf+2Wn@rPs zdjINRjZLQ79$1S{BY|y-TDUi@{sZf`QO!0YfTCzyCtEeFWX1n)oRgkm`e*lGeZ2^0 z|IkovST`3X+(z8(DhRDYL^$C@@&B}e|0si`>Uhvclrm3YgB|QY48D^ zEJ|HJ61T2lxGU%(Y>FW3VIR$IKZI`k4T~^gMqNhrYPQE$@0wOj=!v5$vET=&R8UA= zYXnqgv5Ez@W`+#FKdJ@NE7qTAUn5aZYCM9e3&7T3;bR(WhJM$bmyl2e1?ot~>5_BVF8I;?itG{!_6RC11HPLZilysxsk7b8C8g z>+S8DcvjRaD6*b;r}0y_aGKy_`w<9dN{Xy_R4sjhz5-!fX`d^|6~%>>YQw{~H#X;@eiySnB?3?$5ztZDbZ_?!%YU>ry4V0+Z$SB4Lb`M#P>P zVjk|^4%xNlVV!2eXG{5c_LwWJ`;2o*le5B15@g#2#S;7FMiwiy^k`IFvvNoG*Xgwl z>%?4=0o|)T9WEhIV9=1u_^9B#zBOE`FirJ#zY7~73uhG2aA={e@@aM#1lJwyQXIiP zEHuit2H+SfK$QX|WF$Rqki0of0Kw(;o2M^*$Rm1aO@IsOA;sW`HFR3Fe6qfW**9Dwnc;O}Q$L3A9aoVf}@#7}UV zn0TopXr#kp1c`%G97c(usle@y+qX1!|25CbE1KFhY6BbO@UVfOUQR#q8Lsa%enJ;HgMRcqnl z>U)qkT2kRJ8k?sVY?~UdZ2$ z^Zu>VAkY5Wjq#cWNpW}$ALbW!3`A6N0rb`p(02s+!yHOVnQ3*3G(9vv}jJ&SrNui^4dX2?5xr0lh-47ezYx zx;x0>&Do}wyPQsPu+KSem@lRbC+z%yccNM)Jsn@aTSS+mZ5z2NxQlaGS$ep#JKlD# z-7t14COvN<%x7auA?vLzYvPn=#SMxRWIfZf7>XRGceGWT2!Bu%brB~Ku+KYF3Cg!u z0yJ>u-6E$I%^+F}Q^L;`6eR6|h)HB1`-X*-g7V`VTseskg%S431JzBhpdTP0xcG@6 zZl|OF8aGiT?+C&}ieziJQ(F)h(ht(&pLIa~wUG?g{&)l?WlrPR$#D*1LS5I_S%D%* z@;wz6+Y(&a1GYTr4g2s1R_gjh;>G404m(}CAiPZF3sC^Ne{WHOY|prVi&!r;x=-eC zz0vv189V87*X`25%&yN@SO5xzrO_U)FHY{v%!js5+RXQ=iGUOR7b>`io1Ti#lq}2y z2;ROim^?H-+qA9jY+2ohmh59)nzl!X;}Pu=((rMjl%kqUpT`^-zj!D|9zn5c@_S>I zQOBzjfBJh#(pzcm#p!e0ZST9vCV^{kgFCfDktW%s?p`{zYFC z$3Jg>PVoAZHX!mG(SdN(XY$s$A5I+PO6wk8#B;_grlt(SwGG6PjHRYOuos7^nDpqg z0D^4);6nCge^o2o=Q=tmk?aT4O#5NsF3>Dz@otTze5nkg=`n_3IQ-o5$pd~ZjN6r9 z93Ud08W#P$pFINQ8*KL#2sPB6DWw1<&;p;jzO0mLHjVNMjsP*K@reL__E(t=V5z?> zj=3wZXwcvbBZk4y--GzQE_y}3@&OJDe(F`aP5UJT0(gr4tE?!{x@ z+cM@>q*X7SBh-09Ga3GCrlzOEU#W|kb+qf&%xIwc_S7iIEI=@U7{)+=0wgCaeDah{ zEu=+BKGr4h`0Xuu8L^7;Sq%uDrFZondwhl3efBOrx8m4DmPL=(c|zM64l+^70R!6+ ztI;hkKIrZbcflVJr0;zdu~^SqlJaHYX-_oR)Uj1x%t2C|(lTgBY6w7vltR5$L-{48 z3cZ2KNU7*Qq5m2a%6Ii|cJxj>gOdTOA!2YTNo5i=PLCTw5RUnd(>lcW)smIg%oh4} zaw6Ong?>E0ugjGZFCa~V={@^rv#E=r>G`*kAu2*Z{PJpix!JHSM`IId>3z&fW?(P+g^;o{fOp)GHu28uc)WI>5!g8ID4j?awM|x!$VNXSuGgK9I)bi zbOc4F7PT<#DlAR=Eg}g7`-m7hZgoozG6$yhxQjQS;wmc-rz}ad;dwR~rr|b{^|vGf z_x{!Ho!~L}0KOHEeJ+)}FBR!ommoOZ6QyVT`<0~tHnFpr7z@P_w^ z;?*bQO_C^elO3pSM`>p~xsAOP7173UN(^pQp@^J>!cTk2@!WACA*@hJfHw%5G%WSd zGrRS1_%P8!YsLJiA4-A|69Ht%K4)S?JE|VU_J!{MTFC@LPHmzeE)P> zJ^TGTVB%Li-I^2?+$lR%y?FiK7g;3%)57iQzh5(=?34sBTLJYRCB(JuO_f)* z{K_d1HICP;D~-99TdC^axNDaJ;kvAx_+KSb(v%8_T^GF@S>H?pUJ8|CjV~*GV&UUB zgP`>rf2Xax*{_GzAh!kFa?3_sK2R5vPt~7oi%np1)y4jMmKwDFKaZ}Wiw?IMdvswI zmR*Mdz1^bI4H;3s22pqg-@AzW-^!-c;C5(G&GWh5Rr}K0(UDs9X_n{1+KX$IfcI3n znZo79irJrdtl8&3Wu7rr{R|knTDR*dH{%>pEn8+@g+K=7#~_(ts_ON_4U_K`j1tE& zgnSvnJqMv7HmOi0rr`_IA%acXsS$s|CWhl31K;UBrIzLny4Shi+g8NKU8F@8_`d2|Gx z$J7;$4HZ`@F+|NeH=-4Xkqvr0l%>PnK7+MIz4~&$o425MM(Jmjm-naZgDKCcex3M~ zKI<5YEB|qYy&fft;<~)I0{=>Cc=)t|Kec`#C35_poAJ?mZvVstnb~i!`l}r-!HfTA z=8t=VmiyuXi6HZSu}yc9k5{p}X*Tg-Djd!p=!W^>^+TIz!18MaQRqc1c~{-i#(zYc zRJUkO7YSj|K(Z}7XNRTLyFf4cLA*N+Kk$yA+G>i#BHL}9Cadz~`9Wrv@IBP>LMkir zrLP%pqaByv-(7Z&GEkI-s|6<=L$mrcNZb8#b2BTL3Mw=4u-P11@@k`yfxPF8;GTrKvxiHq@G7kz^HjV)IZHXSM{iv!lFGK_DN z5`M^IuZ;)XMQXSfQ%GtaqSleNN{@`6J)7|G6o_$A?RZ+9MZcEjNdA`n#DCyyUs|=< zU?9?_4G$(rBHhX98lS^L1Cb7RW;rH||A;|9RbVMz>=Hgjd@D|L;BT5OzT3H95}OtM z?Admh-j`-ilV$DgE-vGY_sbhm3%S=n#h?K)0&&&umAN)Aa*?QloLR(o~m6R?$vK*&Cys@ zi2imO{dGTT}zBVm5@l z-JU+7_5V_JMltmy95?SHvTZ7UeRpmlN>5?*)$IMDjB_rG31@T5)( zfp{=u-{{Z`^Up87;h1!%0%D+*D~O?G013PtWtw{rH0?r;$(-eOE~ja@Y$ZNCd&Z9z z5+=J++h=9JfFVtAouuX?j4LNi(7cc&AKBAa>)61+wt>*%#F;xPwogy;y7`|9oCFbl z*^W$YT;e#-6dZq!1x2k5^97Jf$aNj`nK~S_GnO`5JD|3%q^GQNaZ$&kNVYKLr=qR7 zKy&YZ)&1^%;AemFdaG^B#YbLM3r4x4v&0+;vpz0d*Pc>S6~g&Q10~o?7F124mu=8r z4<898_v}U^Is(_W&c9;r_j5`uyO;D}Q6lA2r_sXSX>0uot*BF`V3D04=fLPK`P6t0 zG57U(`wLsMm-YLn26qCr4k}%HFG+Uy@wl?v<(ZQbwL@XH-dr2>&3IhkG(H|k(7Mx) z9y$`2?QA$LOWXIV4=kZ+qec*vm_JX@+de@EK?VYtLr8sE z_&{4}c>omgNO$Jwu8y!!A#?}7`!s0RT}{(8BSGnLO~o;%D`Pr`BXh8}WQBkDdyEkM z$U0pL1XC_Je2#9Vy|bGM%rLLW2%u9TMCnkBw+u@m32eia>o3z%5&6^*FT`wB$EMz9 z24~%c5c0F%AUp9Qi!Z~$80bL=KxDJVl}-SrB2<}N+=ua@>|0@*XOaY7BpxKOV`ouI zERS~9_qI3Xe|N56hXGx|g)c?iEm?7Q3^y#0b=VLweC62X~Zg6{Uj zrirED>xy34@9)0ZzRj(m%r5?Yuj5uK(~W_d+WbF1wKU9JAUWvL7IByxQFd2Kzj5Bt zp>*jHYUkTNSpg%EK|5-97|3AFK4jr^GAsyO=;S0B zG%#1)r4F0k0vN#1OM`_YY(>#6A+rn=ol8}nwmWySvIGQvRQFw?t8DorNvcpzb2Qb~ zKI0F?a@pon~FJ|ZqF}-Q6KOr3itJItRoMBvGtKd z)8=2XkMqyVkWkjQsU$u5(h}roJjheXPbOa&!@I{0%s)#XW!THgVcnGbn#hj6*e326 z0Ks?@pY%>aDM(|rE$3$2PCy1l0#2q3VF^ard2o_P(uE`;+VOG5?5|@@PVhA@tvqwZJMyQ4C%vCZRElwajM9 z?FipwL{4TajZYU1p~txOXNiQBz{N`~c)q{2#5!C>+f#rcMMISlL2U~7#{!FTS{Z3w zR?d$Fmx`xlmVyF35e;pb|5u7p-#*u`50~Rf7xZ09v^YB z-F1VP-7F*rodKEkID~<_`T4&r@Jos z{gp~aWMR=lcjv6~%6k}n`id%9Q3wyYpIOzOjx`?$#(>zh8XR8uJl^t#G89O(+MYNp zvXM=4(PC?Js1UlVE2!X2Cbq#mB`B4|TrdRugLa@~2dR>mGxWZAHW^y9?0uIfzVrQO z`5#A%ao->t$LBWctdhP>+8YzS{PU2 zxxPQoAR)$q5z8-W9Z4Gvj*Gq~J4>C39h1{`6I344+Z>eD&){ zXu`x;m$d(|>~IvdcdZZ>q56!drD6_|;kw5nSJl5|J*tPxxRC1zyTIW+MArOZEYvhz zAh?6)K7Jq4#EuW&G-h2_b0|zO?s?R9@p7Tv(nX}`xLkh(fO)fTaZP(~bC2*!0yn^a zmM?yv`E9vIn{1!Dkh9V99ud6%5>YbX>A^g|lyf}B8!`+AX+BYL{R!CY@}OAAd^Vh+LT46%q^bIVNw!1^WY{cf8D{Hz%q?LK zv&AdWq6wi1`<`4__HJ;g4seig8I){58bR67oP-;-8no5wG~~F~cpr?CjnMK?K!A$X zRkDX10!I~o344&7P1+SHAs$; zKhLI55|k>wh{x#z&+pe?6bHkHiBx?xg?{4kv^inyM^D9QAdZ-{D?nBustk$7ok1Hh z#A^u%Cd#t}@o6CL)4}1WEOB2xObETpD?$;DTebYb&k6>~4%el`*D8i+2s^_PF zxwi{C_a)bky&ogM+tkosax?{;NHh}M{gT0mvV{n|{yCGWH!cj1=5n|H%-J%JSxG0x zQzZ6*3?OwaOhNoI&3RpM?ZK&hqHToi&wE=j@wa*Z#UsB(jEkwiTQ?0**J=4bO0WVi zzNq*yN%y*Vo&z0LXr8bs#FDN2PcD&)PCnpDwC`~(m4&{XsD;oUMMsX%x*;^J*gjls zLcxOMAtg(+ueYiwE#yQ@O8|_9T>bB^RHYs|6Ht0XfQKC%VTH?<^g(v0@8n61VL?5d z123z3nmvMS`|d- z=-aatOgG5FJ;|0OpkQO8j?9#bBWo-Pj798;R6DWz`=K$S?_972G7fjadWkY4PN6v7 zAZ>@wL6_O^Y$tIPh+GHEoH2fV97<0<1TjGhoy;bWg68JPQlD~N5&CKH|EIY#anpzJ z0b$D=LqEnHQc>j^?Q0^+J=XY@i{o` zG+hnvL&Ge$kjKt2d+EH1l7gz6?*Jj9$dw)iFRbh#pEuj{*GZ}CaFc@6q)H>qVcw>) z1aPE%1t%tA;)y(?Bzm_-wK0A$4JU#NPh8xZnjShF5MD}wcZc4NwMtS*oBdsdoEs+O zeSUubcf?RhO-r4($VzNj#F;=0&XT^pLq;=$>T)!iHbwBDjSkN7&T$qrm6B;GHR;*X zNQp%-p`x*)d=5%=X4*>tEKGRk)mgCVg~D-8AW7;%8rbDjY;L!&DGoI{J`gOv&-_kN zTI)VG@>c+e3CIZBUpKbm^NMbv-u5f_eU506*L;Xb)i}brO~!QAZOx zs*bfg-Xr@IRjd}J3?7l!PZy6NcT+-GCbg8@CO1a-QM1#DFhaQuqaY#{HuW!}!49Gx zh7BWRN=eQjy02jtc@zYqV2q?2=t3|O;InGv+0yRtx5MrHH__Yvt5QzHO7zNqv4R)q zsuTggbYvx93s?rF3sCqfO-yAfIGIv$C?dK^>_yXeQ@0+DuerFFum4rQ ze61Gaig4|}x>Lm(-U2`k=#^in3Zg9`*S*#VxC6LBJ3ulF8HAd38{8anu|#OcnA;9h zES4!+semNEtPCfHEld{i8Ls`Q%gX8k8Pr~Aa~YS)4VyCzX@oH+egDg&he;uv)1Y94 zV~l_TV|g~MVlyo%-`C!SPpCjZaMpR>s+YcG(U`o@-d5NCSjGT+eu3+OWm4m;Lprp> zQdwQk)kDP$%LnNimV;1wp%PkUSn$;#nNGVZXnj*avS`eM;=06eA$heJ8Ya+DBCwlD zZ<%Y6O=n^G1+c}%M4X~!?5#9sGMR9vV*h+~bw2goQn1Hjvpf%4E{2K1cXA&|L**7o zY4UwzvkK=OaNa@+_ozWkHMr=tPz0MChi&cj(FI&7QVt0@4@8}zQe5DN_H+o;Y+jx- zR0192Cy;@AwT1a6eouKGnTWCxIT{B+KYa@FRgJr9=`0Qi4IO zpp_DgbcBFuBq8jzL{4fmvnAZHG9=wncXJzsq(@3>-UhUV&ak zXAYet*Lb0{$3FonmFvU``Qa245z9vzUno1VRLo>#3?5Q*e&(Gl6YTCU@1?Wz1vzC2+7_(}T50c>$P~iXEW_j# zxbOy&cip0;@b^|}U7fMz?Fi09KqXroQKrch*oOftgN}$UEVTcef4iOLpbLn5=S~`x zn98waRc&F>(a%tM=%pnN3uK5js3ad=SZSgyNpwQNo)1I;=28&qyZ5BZ zxcNXSoo~-?Cd0Tl{C#EC`u;7N+{#j%g-HbknZ|c#bj0}Px}HvjPxD(5khnCh(2igm z_L$pJe-SPw|_lR6~JYpB>I@b@g02y z5XG-~e`=r81?YNp?SfMFbBeZ#tjj@1_ULZO*OZ+ zm>d_aG{dn9XMACO)c9$;pHM(TzX|JXsqsR|`$#FBYVMSRtRx>DkC0h0{h=O`dB&W0 zK+U2~PH;pKv575y!;dUqoZXs0v8A*}MxKe%Ke@0f{lVAI6Z?gF)m}FFC6Rc1d;6L` zGhD3up1Bq(;;faav2(a_r`@VN%TMjthQ@5tXb1b}*1J0XI(tn#nqa%oaDgQBXFE2P z{lDR$4~}@#I7uWq_C!qVIOtk=s8dh-h>`wT3b=PO-TdMcJG5oDR?|!D3Uc@_Eq~o) z@C!My0&*iHvtuL@NtG*{M;w{$iqZlXcfOW0#PB@}2-e_7FJotKzZl=?cloeanp@>q zM2C?6)HLZ;yUUrwM#kK|$1zWK*KOSE@`-ew`_xKkaM(o0#clg-16tQ42CM$$0@2a5 zUCN(QTKko5(6vU4&_@#&m(JH`UiPC#)WUV`Y*BNP{aNsiWAJWHxQCkC!7q@Oic*xl zm(k;gSJ;ca>gbt@iWV7Vx$jR%FPf}*n2cQEPPaR!`jO;(c)4_!uirz)DW={?YbGxp zGGmCuKy%1tQgF8!3v^T7G|eoeF$j$it%%}#oVqxW;UcccMQ^^@KwHfBPrGm0N2a%$ zk5ru@T5Ui-qA@lx^4^*Jl+H_eQAj+REQS^&JgIg~bqePqu0}3rE!4IZ2)6huNjw@( z1grjGRiPI&=MJ~e1zisH&4dy1Y4`TaXnd!2#EG5Cl_xA38TWWv{K&UNN zGT0ug0_H>}4-j`uRNB5Go@<3ODr<5;da)ie9~A=-SMRIMFoqC6fRi2sz{G%DkN)XB zAUiLxel%xaO?xtGc@;!p!q>LS`B;>wS1W8S9XK{l1OO5KLTZjPrd=#Y@@CK%*7_FK zxyZ1&{U6St^bSt_T(0t+b=`s1IJQ;|4Rh1ngtE2&uC(A47NdkdVh#jFX>vQ<%75A7 z#NO@r8BmU-_C3ST7MF&G+!C_R!eVnS-VCTw$n#2zJ`aQuEAe{b!$8(I_r9@Y%`uHB zFeQ(OhF5-4jCDM{sbKs;Dx?i0%jdPF<5pB!~}WQ2okQPm;3PM#w~z6$SwRgpM~GkkWS2ku2E54d%w_E#SaJ_hHEl6tHUkE6YQ@EdoCyBq znvFugIxT_o`CwnTRNJel>o;db!Pi%Ue!LdsbJRZzurmwYf?-+w)%#cdvXo@x(UvYF zW&kKa+c)GZ#YSfOF$0~vgd8SSgk3{h5-%m`*I(5Z0*WubEr{_i6|vK7Mj{od4)mvG zsSuP?+?iPgMB;H7^+<+#${_s+f2YUiYOUKBpPK*j-wyN6$l4)yDU<3W`zGHh(zv~# zTjOguROye;sZ$bV8&yNDF?0;Bw+1Q-IzOQIh(d`H+}T&cbcSP(fxR_GVdNPvel!$?!2B!P}He;@< zu<9O#n0!q#F*o0D%~9;@yH>=Bv|-cy0|;wZ*s)I_Nxrl%(^Rr%<(m#$g$&ZUp?HT72su5uX0fKTXg7U1;iH|$9V&3#Z zL%vBuX$-oJ$PBTwgksv+^NYx62nYFtmblU|tA#89Jvt|Hhg+zk#fMqf%b7R+_~2ur z4%J}cs6;r@a47AJ;ZG}JOnCbH5(K5%f7UwHVRcE{;jY`6zW>cP)-flZRD!P|m|3Tx z9+t{aTkmMr%lR3JdC9=4bdl+WsfpDo_k9?M!p)vR0|cA$uh?zxs;U~N z$gYm2IKzmtsBI(jS5WFH3ArbiTWh0p#1FPqkPHM^j;oCA+6m?Q>Dfut_vI9)S-Ll3 zi^e4!AxZw^*&%f9K!#8LGvAaLoSmyz`*}e8>J8$&yyqN$MqT{jK~n55I8o!?EoT;9 z)+L$UTkvX^6I93jAEO$HUah={ONlkDU})yFtP6I|8n2H@L9TM>t2Q;1mjUfCLdTe0 zwuToUp4i%?`(6?ha0UqG!7<5i#Zu6T@|VoYkQZPdR@2rOQ;Z}85w1$;?63e+x4qxr zUXIX%L-S>Cl*TBGuazl?)w)dya5ThsSK;+laBschMIDzKjg-DrWa+*GhODpv^zN(+ z*jf%dYi||e+~?gAYyOddk|58sV}Pa;UFJM z!McOv5|r?-PKeC#jc)Ku?rwnm_yC9EEM`MWB)ioZN+u}t;JNFo2DEv}c5WP7$m8<* z>iSL?CVgQ~Tkf!Cvo^lK15lO94_%+|SuBb`j&b{$`l){v5x!^T@pi)1R;A?4H#cqR zo`6X&^lx?+rn1}B9q=O~9C}#!1w*Y=mu|^R#%TLw>=O`--^|iYmLepEWs2UKLzdU+ zcR2b*&Y9Odhzt(WpV2Er2%cLSd-<>!aIntp8DbgE{UVd4la_sSB`j*Uu!y-Mv7i-~ zbS%iUHB@4F{`DKjm~;{ox7d3)5UeJ8()C1AU=ToG7XI}|+u`xh>hD1Zp)JqeFs~p{ zky^Sy0AaxOYDf5%L;>G$imyP%iWx;w!Aayuwbilc@Zi%mbjiABet|bSYY3c~@Rfz7 zr`$GkYRP0*B~iD*S|?^eWVQUlVW#Mia9lXXV?An*Pr+-sW%C9%jElZ??5}XvAeWP8 zsoMRa^cR6D@>AA{$}pp%27M41;V1BSH`dwUSIDxs+en+-OVlwYscN3&sTT8kUUc-D z+?TM#@x)>t=nj96kf2A%QnZ z+-$h%acaEm`8e}@!uaO@)4R`lR0Yng-*u`0Ed9Njvwv-Byjlz+G4=7{-SD>yiIq@0 zL{*eS+y)l@{#uyvEzbsT$B1f_jq~FdXWdSbe3EGuH1ZE@Ja|~!$vQ|xKzO>1fR7iI z&>PJ#cIa1O2B#R&_{0=;BKs0H6%-RYYPRn9pFJkFLrmu_|}ybHH` z>WfIG#Q1BPg_;d8h_=N+@r~QzxFve53jV*2*T1gEAc5s$qptpW9+LP_FvAHW=#X>e z(v-P?Dhoq8QDVy0xp?JRe~h;(aZeS#cDQEKdae6%x-y^LGy=gUdf#1LIjxmO2(i*U z4ojF1bqprkEpfh^J}yyC8;>8qW*Jl~%*&VPUrEwN<(@d{|DOn47IJP_GU%DGynnsEpTu4YT5kJ;ZnI`7VXx-Jem zupR$%zrcUT-z3X^xv$q=%fuZttZo7tXDiq$mkDLpMxdmz(=U4OdJytw`1q~Psi3{m z+tn$}I0r?WhRky0gwBw@lPMbvks?9cerxwsWGFhlavH*ylFBFNY;i3jK7oSTzq*5} zXo;8@btb8jZz=cMHWURVYtqX%m9?zNskmr7Iv9dnp>U$-EeffhcAduPy?Ds1ax*Q5 z`-&xleOO>=%=~mpMV&^5wywnm+P#T5dh({{rm|1K%nIR*d64rMQ5s|MCOR}fzBjNa z?<8o}fMt2?3Un11mWZKAZXsBWHf-J{jI9>$l|B$@J_}cv2 zG4An2gra1bKPk3%*%u19=G+?jdMSGlhYhAP-Ti7!HD85rv$R`Wp@pUmc6S1B3z_{V z^Ri|)lU+QT5^wn}JOGA-CVfb_M7+MN?sOqAV^6OOwIv`2Fiuz#F7;b6D3jjfi-poy z^9F?y@ql$94*NU(Zq-|l}^$61^{SrPyK`YOGQH%en3nR@t zh+8JJ7XVDME20dtIf8ZObW#V@m<^)wR0SDE!(FY@)EBQ#%r#gB zUca+HM-{VSHU->Nw5pM8SY%`|sSPn&)zw*L?2Z9WN~l(#BK?e#v%eV<>^=jyDR-)| zPpfiB%u3C^n5Kn~HJrmRbnrnUzhP?5t_;B=QPk;On9P0YA(w1QV_wW${N_Lg+N(bO z@I9PX4fUta61A&MUh9L!cjPpraf_E6;Ra!!LxdiJ5>q+$Zvw!szYl<}rJY;arT9$$^Y6Ki6rDt5aPjBXcV1iJ@^v9A3q44yCU`>eWXTOe20+szJCK9|jA zk-}cn=f>-I^$_eo;~=}-g+3yi8 z0rI%=d2+xSPCE`H(Cr3u2hR8TtN#tJYx6mwE(-RUVG(B~h&sOMl@{hHf0^=Z)|f+{ z9Dm=3=tmeaDRf97T2XcurX+RMr}2Ar4qt9tIY+1~T|{H4>W2Ignha^+ph0Fnx$?#F z+DR0wFKVt}pS|Q05}RFi&KNmckouN%-q&X9ijF-yxnWUMO;E0k8)~jX(T|}k)}diX zZ&8c9aWN|k325`{dHNkpKnJ-vvkNW!?zzWFpoEV3#|4ANa9z0Z%HiH2YG*fShlvim z=N8IPL}i(f;FUI_ z9kH+%a2l7=`4>okR_ofzJ@Mq1P23X{)%82a4I;i>f7pGgPtM$dwsrsKpnmJh0vOt* z)?v@T5L*epCj*OZ`VZA$rXo&eaSvw7GmMg$D;QI7>ux&OwLp|~$`_hkRBE4J*zoM8&Dkzi%-jM7T5A zj+dEm)5qIWhn^n#-NXUAGVE8`4uhY`KAl;fS0Cv3dpq|9orTza!EwM=;(Yyb4CesM zJZnEXqm431gLPRMQUE`o>zU=1M0`>_k?dAm5<_v~C6Z5!(;b1|2*5+1+{u;?)H7QJ z&H^GC=qS+B@Dbub2pHl>NWp5;##pB0g&9QfE4h~{UN!V!8u_nkpxLCXd1jH-;rsct8C48{`U1HAfRek2&;rnp2k1=9Z~75BWi!U^#=qY z*1)ggxN|Z|yaV~!Lj0X!D`pW^!%eXJjpNv@){S%r;fuTlVY9QuP4Rx&GohHLanGZ= z10=GO{2nNdY3Uqz+Idm26Osps2n%qVPXZdUV!M*s*>Dcb|8%1Sf@$$Mm0l1FO_-QK zD21g%YXkpcUhDast?&?n@)yPVbkU9r{?jDzKfsd`ZKB7+h!Deo|F58pGT<9C6hv6* z;PgZfY!SO*U2TV&^$Z-$%O2S*2D6DXq{MHav_c6FaaD?+X&VLvrTw=vWvTOu(RKz@ zyhJ_oq>Jd~X_BJM&Pokz)COa9FL=r2o>@Bw8_W3wFAp2VvLgTP!acJ;83NsyV z5k#%YQSFq*5y((L#hLi@$l*(LJ0?xgjV~NZWZZ3nD6W{&8x2Pu2h)SFqY@tpSK;H{ zr3K_N-s%pz*v{wZ(3UvTwhWHp6BC(DU!T8dFLj&kCsk6<5uaqfacjR-0vVu0Ey(jb z!E=1?{@-#uK9$tD@Y{psg9DQ*tU{WaR-ze_uo7Tul($oyt>(z^`&m(nTtS_9jV|3c zN(S}wmVf;kl&Q$0Uf0sEooyQ4%?=wb@@5pp-ZUgs=MuZ#W@ET+#`;2S#9YPOH12qN zVeB{_UAzu1`WifW&Z@%ozYn13AlGEY2-DHg-g-xDE+E6_l`197?OTp1bN-CJXRj9G z#C0$mp_LJR9~Gg33^a8AdSt{U&6cA!+r%8!^C=dmq2s98ZGu?EXtlIx@aU&?p4f7j z#RsvIk`S+|C;xZp+c_bpiw;3nI|);uo;{+Njd|`(s)DCTL`^zah$x0mqIYA=%3QCY%Nj{%39(l`lI(> zSrrp%>Jgz6zdQFs-^cUh@Kt9XA3WvYk4##NPU*W`OB>roW=J1kFmly-rf*0;uI?KJ zMPo4W~W!K2R5@RS#qMZi>>ub82@PM%rpk^kGK^^*NYkU)9yt9wey8Nd0lyh2j z^=0^2(%rtFWAD?2$#RBgsS1#92s05zkD(r=*wvArM+6Vv)ZDa~QD-;BAAX(Tuo{G) z@IwT=)k&1WIAHyPCAc-?cwB>>#d`BHhG@NSj82zD=YS$i02;H!n~4bopIgoTBaZ$L zv8Q{irFR_L-^OO&jXkceyJe7E3CE{ScLN~_-weB8^?u#`bCzpu)d@tkft}hAQxX5* zWFd10B^Ymy3{6}(7`-M3Jc{@vIg)-i+ePuoB+t#L6JnTu$IV~GK?Xj+y?)k*Mm@~A zlji`tSXIb)p<}Gvo6XK2-?cxKz4=D7?~C$x5-eFnj@>f^nI|?RP-bKDY!{1sbs*Dq z@Z+lSM}~wLsid?dp0Gb%4E7DW$wMybzY;xpc|dUD!3Nzz4=Fut*c1U`5t7t zr3QAe!cSEf4m-}R_EkSrZ$|3ZYsVtzg%<{wecH8QqxOn*Bz51SQc+iL9>Dvur5znaYGx zLlTMJpyG3E*{Ay+`y02Xte0@V$O6Po>Of7!e!MBkL)wwgZ8E`fET2-2R733e8Wj$e zvT&Dogv?ua^VvAGUTs_rtVX_A*sz$qRmLsJKCpmg^b z`nWiM2}}ZJVV{va!&Ay+1ydVlDF{M6t~_V6ggD5AG&{al9P&1$wmKkT>`+Cgh>TGs zyT}VR+Q8`rK3P|gW6%ep^HV=kpV;}7GsAo_M$3Qn2M{vzyb_gWGNikbj>T6~AQKaP zd{u$p<-NZr&YeAM8~ag7p<2SbdmEv|T6y{u`Afv8aT=|p8qh)v@)3MM%_>^WATtro zzdtno{qWL9FZc1^C7&j?gs$P1IPR{kAJNhE<(upl7)Vs_*gj%WAnl8#P~x(^=&0ad0~b-#32&B$kpZn_Uj01eRhH-ZbRh{$;A;${RKWT-s4XJ@CyoSiZH7GS0yT=HY? zr*3mUcnalN$cmdRWS>0bSPCq98BOYvW|-6&Qlni;8VK;S^-)pcakyy`XTfoJ-+wx! z+t;Mj*_w(F|4dh3+ORkD@jjT7ELu!2<6Uh6YI*alN*%h}XQu5dAqP7$$LD8B%8!jmGrEO=uzT&d={DaiCnO&)| zq9LOH9{a|aeIn(7@tvot+p zPn$A1A;f8wU`ndNR}d)%+)FF=eL4`JM!bR`u`iA=fYQV9-;cDa6bG-S`zj&q;X9&it1YsDV{)55nD+&ajC?W;O)}Cx12a}Be;)I|19F)!xtI_A z1Jq}8BGgSpMBleW8Ya*!Y|bqW6YmxKvf)0dM(6n*HziI7p0-yoZ!WO)#I5A7WGo(& zHI|l7i;J^V#rPZx{))x@&o#L+PPz<{AnvxxU8@=jRQ^t(2{}k$Xm+FF)rEp;SOh~! zDq=6&bf)+yixzk>5^|ZFzI{04$3GDFGwJa|y=K30kAF+Zx1?!Xnwd^BB1*d}Q%L2q zkK=Hk$jP^bU;Ny7uaK!H*cY0ovkdOGfA~EVM(hz0{;OzI@Kl(QT=Y6ry=oxKsVY6+ z&GuOERlZ8~8Y+1&GyD;m`J_ru>vKfeb(68jMv)5vD`x!gwowLk+lGm3;-33VYbJtg zf`yjK-$cKNsluh8*+HR|!mx{@rr9BVrHk}oHz6SmPJ~{u_9De9Mz_YNvNs%uOR{lG z#8-aAhvww@0L*8O-Z9d`RYZ#zcTO&BD{?1-Hi)#-W(GO_=0#QSqItQs|2h5W$$8D) zg>3Xy(xEwim~Ej|5E`M;g4aRv*NZIQUW+(zDX^yMqw6IT2x6O+MA^LACuXLZwZ+_c`6;|Fvm69FBi_o!@d)%fD!JO!E zisRahecW7#zap(HW#|D*))K;`gUH}U#k%%+^)D{4tV6X%LQONOfGbsZJ9EXU%W*>} z1koyb&i#!C=-doo*z_{`X+yO}LWZBbsV97F3WqAvlV%;nIi@+&Ox(Gd&wwu+PXB4K zdjMC#PqTj<#OOLL(9Mqv>q~k;D!pR57VC%eplLM_+=sFFr8iSv)AYQ}u>W4iB)U83 zhz4Ad(8t!~Uwm!(;mRifwBCl)IR;MU(ZGp;OZ_^s-l2KuU)6O4>OW246&)xe=HKuG z>Zi7+Y!P%U~MVEhBB(w6{e0?8l)JWi6r1(IQi2aEe|50$SO1i|}n@M=NCQi2X| z5H{0CQYGZ`sCJjSCAja%3c|V&wrLWM|my`hw1X1ekUewK!a~NJ?H*9Zuem8lZ zju{vTXE&zVsuCW{XHpccJzQ}zN$aOVn#hz0-wjMd;t5HS8DeEFAPP4yEEsi4IbJgY zMLcGjw<$%U#MMY=SaHbFR^t&PlDc@y6!61+h6L|-e-^}YR#_s|U_L~Vg26HX9`H} zGx}cOPy09v;stUHI(5<_ThA{X9!aVUK){v zfrs$7ksbzIm@cm%Mi%0=(dCa3W+Bw3cOZ#Z+b{q;P~cl*FghqhnXAZEk2MRSec@9Ru_ zB^`t460?YXz2}vM&I6Rgq~-J|+s`VToY9|#07R6sG9s=*@*cRPjh@cxi%pJXoQ_6S z_R1O#&vl);T@WZ#yd(wZxt~8F#$KBU=U8glPr4Wc8KGx6ptB-re1ngIhI*CL`G|`m2^2=4|JKUU%k5M&Uhu{>W;vtQO zX|Ji1HV9;&lM=J5C*0bf+QP!)nh6(%+aAW z?`=Z%96q8|8C1T|-%rOm9qnD*gv&J-kPV9Ba;g>r)IyR}50gfO+tebjHG6tRq%2W9 z2$Mvqz&DuhVOrXRi&2b=pgi(z?jNof&)&_6Pss0C#SLm5J(GCVuqQ_0WY)^bS}i=i zvkUS}fism1xTV+V&dGw(=4QD4GfZ899-3;|YRsR99$mAauV(XKwq%gl;5QjlR4GzZ z{n*swNCvKZ0(C4|WmF^;9oS)BBsFV%HwS)<>~DH<)ayuY8f21ejAMk)5}8W5kq?vi zVJua5{i~&|9oEmcP!t8*Y%_vTgqm%hJ=j&y(%(l8pA|Z0Ic|TMrRy7%WgrYC6C13G z!^EM^{RsaFf)u3v%b(V@3v8U;CuM{*{JTSYj(C2_n6;fs{W)IPL!fSfz#KyGf88sq z^Ltb{q{}oHBF5PdNR{6Xf2uBg=Mu_^=H7NsQD#*`dNQgg?-~8`@KqLTRWa8v`P_)@ znP%i8Jd2qEic-wY27Up;3to&fULnsupKM7<_*jY;I41x5fFWNHYbi<}my znERjZM1p#*%6NV+VBOjTe59@WaHa5XFw~ZXW;j}Lf{0IWA7$Ss1@Pr%0(l)UWDQ~C zC{@+hMI0v3nC;`jpWwCeELbdjbA%;a~~sCJyR zHp*QJgpqyN~DLl z-B=BznX4zZIhL=0NL@1HHfvox5+^5&1`x{ulfcnN2}VcV@31DQLREf9=a>!;^;L;7i7<$*pGI7rRVD72;9>e942Ldu2Bv@aV^>Ya4Fe zqs(MW3Wg-w9xL5)eW~T!ANB^#F(X5cl8LI^3t6{GjTu$#K(ZIMR6+X{nNFru^>15@ z{2G$Op+xARWdAu3a&R+WCY~K#`3=Fp;IU$~O69A2WA2k-$wDLBjYtFOl zn6%xQRw^V5^j#B_eutH%a zwHT;mX=E(89iPL0?`~>wqs!c5EZD(>#eFUg8ea=>joTo;4pix_lhktRUjuU!8Iv55ak0vy0wNOV zi)zT6jayB^>W(OL_;foRvS#3r^76_Jrv;-!?;L`#$R%ugZK+*ZXAqYQbz&l`iqlML zVwo&&!>Dik;OjAi2y)lheKF1A=KUJ=rcwOR)0iyBa4`Ir*DNPb`Ik?; z_8;3Cr@LsRUEL3iSALn8EMfop1!cVdxAEsbgr}T3MTZF^Vu4m_lHus_%LNkpC`;A! z`5k7%i}B;?*_uhvr*|>!^$)1K$@z`V41uvQI+sh+=AMq06v0XT#8PYRma|;> z!_E6aF621DMUnx*Fk1ABcJsi|qa(R1IefH1O0GYyuCC55CtyW%DE2`-HXKICSekLZ z1i)Zwv}sU&$Bu>LkxfRd2vtjm{V=nHN|SOSqA-P9;sGSWuutWn93Y zG#;-kz?)nj6F*NriT2scf?++1?q}gBh zQ97oA49#Z@z!9d+!ZUe#&#;C#Or#&;%4#tJ1#v?sPfGnPDd@}J^XLNGQ~ z0}KqkbP2V6xv%+;Z2QtXqIYFw#kOu`!r4@gPmX@VHDDN4&PrfJP+0M&NrT2QOcRVj zpKrFk`nW0?Kwl-M)$Sywx?_+%fdX@&bvwdsRb5Ymi`IRMCJ{)diTgf(QIdHyEQWOI zEp$1Q-sPYlNXyjiEdRBc)1=vhvwaVlmSbJau5oSI!UYa7}+4bypbNkBw z8LNzrlJ>va?%_D$F*-yvYTsJ%(_n}qJ@avannI6l&*r(wUqI% zsWoO}xV!S5Rt^{hqCEvNL~~Yv7+{UY7<>mGK zq^;I74U1{g{|s)oJ16*?weBC|%0I&a(Fl#9y8pQXv-D2vHm6Mddx6bm{G`r^Beve2 z48^aOS`k(&FvTY`5zZqf^r@Bw?|23P2}=OH^)-b~BdovIU~Zh*Yam+k%zM^51Na!+-gM;HR3*_8DCf6Li3eL@@dWLHnhZE9rmiLyW(8oWsZn~*kS#mc2#7XK2nAI zZ=|+7)@KRuOwqu

X^w>lZ7$StB_qiTJUk`bR@sBN59Yx;-U$PhBJCdk52v~W-izp0V z!^Seaon6vN9SGEZx67BtPu~#DE`j?kMR0G2V|F+J1<}X_(Vx6xh_N)3Hx%+`H*y%8 z1w7k~0$zbd%;$R%5APsI4Zbdek&YzKbRrPIDjRN<4vb!L;kNi91UN=Uz51EKJM?v8 zk@zE17Ke4(hi~%3^~=6PjGf(?j6j=;@E8Dt|&qXb`@nzannFnV*o0#$Hv5ufu?b!nEOy?Su_ zri;oyZH)K7&BRYaDY-ddalV3hgYk(ivjU42*TV%Dc$vmAR1`X z0PKvy4<1n=N6qSROy2tM%4>Hh$P0uZDsf>?+9CT;|H1E~9KqJ6-*w)6yChDT8{+V9 zWetGn^5R`Wp;J!Mhgu*=Ns7pD5-f>lJ=j|O4jY_}<1r`U*1q`I&~K2{AtS2NkE_Vk zU0#BkI(!v$k{^15wnYbmn2Z85C!rZVg<+g>XU#63oEG37-PTI>g2gS4WW{aiQ7ax- zP6{M-4D=xpO<`(Pe|vw{=XnG4KMn!$pZG&x#9!_3>z*89S7ze^>8T~?F~XfsIVIJHwL@_+EV1Ta5h$3pkU5`c6~}z zoX}zJc*@?cExQf zrfO@K`diu8oFkr=<8ed@`nuZ4TDxkPG4TB0f>xs_gVg{`)d(Fz@d0^jL`cp^nFWIL z3_mj^^Oktr^uHa%4!z{4;0uzn{+JXax6+3Ww!&B55&5Tj9PM_6(%2i&oj&DQ22s=< zA0>!Lt;_pC)(bLal-R@dR-pG+qEt>u8p7EUEG@@7G+EFxABZKW^!(zkq$AtM_a&>v zGA_G&Ch*%PPXr1tEJAWzir)@}#>5si11?>bo6mOBhsfjhLirLhRs7`k(|U}Ge)ady+uPl39WeQ| z6{RR`!y}}3o+Zpl$yL0qKkF)9Rv|N4T0B_DJvY;=jE!|yhyBWwMYJqyp78LNOpLX* z*h@1C09}VwVI;-urfF**xQby$=IUq@q?%wAtS)ZAFv@BqHd-f1xgm^1 zSr`AoW8a6yy!V)ERi}-a*AuK&f-rE{%&OX2lY()pvl{jF3f0^~qi4P3un)Agx z;Zb8U_Sc=ZB4m9JrPEfAa1_KTY@HN*i92N)UGc3icKML&*y&HU2u0TUDPDN9da;9A z$0(G1&Oxj0{3h6N5Q-toZ*o$&(Qca^hH&>6SFs{4Ww{9@X>8^UScPaxW{MN&lAPGe zfMM7`%m^8J^*8LLUxI1#df!?vp*l^imFngN^~|43rZi>F-Jb~HVRphEnd$#&Vs6ic z%cS?Z>T562(x`Jp0{?zsjH;jaFUUCE11O=(=v}vc6P%hZ*!mlh$l^G$6p3C)^b)F< z@iN-*2+)peBvi4*?+h)eWy8a^7@&W{wzVHK#Zq%(;hWXdI*jH;UPG;kK_SSpBDt~K zML4T1DASeFj$Ux!El3|ut6^Be$7jobvq{_K5><1)=-r|$UaW7fatYeUmafhoECbDc zsnYgk?*>$l&hBc*(NAs&UP<85CNa{wbD?Hb82Vy1{}TAJJvn%S5UvvtG!!LBA&h{8 zUaBmtvC=PC{44Q}sIrpl#pu6+vHT7R4l_%m=InNRH)Mg5iD?kd;CJf>Mo z$M=t*6BFa?)EeYo;CRF~%H)MyD6sRzGv@|Bnyim3< ze<8+;!Nh`);IDjj{D(&y?7Al9Rc+&6Rvg6(zF`gl$-TFXDhJBM9oKZxD+YA=d_yL4 zMnd}?4H9y2mB(kbu)7WRybfXifX<-F;Uw9SP7!A_N zNPU%|u!aeYd~qLr9&VOGN^ei%r9KUOO|QO8Ejprn9+5y%L}i`v=@0KtR4oyIS{ban zUTL>R$m`Pv;6^nk_@w|j&&@bhJt9T*2yJdD$bStkx!sA&Q=Za4SczBr<7h!LUc7Ek zCqiA6D#9)TCQ}t|9?f~VPw8NEnawti$hqJZB;rwe>CPmol+OTQ4&|e=<+$?Gsecw> zrP;Ez5+xIr{o}3WKNe&na+(G4{U;97B2?=yuRqrZi|=5D0$WPK|G%e7BKU23!+7bT z>2P|hIPlY@V>0T#ob-{DZr5D6IiSv>DaS~ou9YlqTkzaPk_7}pAPhor&?0bn+F>8~MKDMh)*h{yU7FDG7=Ck^Hh0^; zmB-cav+7v%4c>fm(E@^0?(10kQ*imKWh3gH1_v&-Y`7yvS!mpdwM1U%2zd7RGIDZ) zSf)dr+?9>m$A+QE6@9?i&BC9+@AZM939{7KQepB{YbCH*!b(KoV#>Ej zx(8TSq_|&mFkFU{-M?_ux<~(39qBzYeoy4+jz^mhVq8bHj#$XR2^zIvG20l2;}0Hg zzVSs!5#I)ci>udfiohtuP*qS5Xv9}a`E0ie~^R!^1OqRXL|oe@!-VU z@)w$8dOx8)o1qBx-35Q{fwNJwSpm|Xji_41Da4+Fk%rbrndO2?&)?F*Z(jbXAHoWO z+E^z4ws>mXRk5=2fOhVEIUvQQ|}Bx6d129)1{QisgCQhftkn^90D!ijw; zrRi)vi}O?6@K$WCMU(;8LT}_*G@3AvYNqnmNEnI?0q5ZWe3k+NfLd`+ojc|4#(>0R z3`8^Pwh*d{2wG{!#@2~mjc61Bl!(F(INc&$^@;ji%w2s^$i8>W=D|wUc^Vf#FWO&b zZ;?-j$#;w)ow}jvawCQxfKttMHpa6 z#LQ7n1F8j&EG(u@j{LE;&%mh#-EQ>CRoR9}C_&?(RVz zL^k?aV*ha}C2|!i%2W$a)LYz03E&pu`3iy<6On)4s^?`<_gPbnpOqN95D8xK^)ntI z9#auGNR3p`CN1EiG^^l1O&B8q{0uj*_yGwCuI@Jf!!3M(^Ggvn!3I!G09Y80zW7e& zA`0*Hxr{8Q0J~{H;{i`XEWjFly0aoFeWd0w zM|ujS63CTw9)s1zbPO;KC31;%E*s=lZ#S!pB9|LwiDAGFvC33YPS-UL8@!77oi;Cx z>-oA$7Z!m(cF@r6Oc{-$+M}iUOdtK63}2sRDI>)6>S;Uc&zeBz1E$dxv=TluBtaVOJ@36tfJ@=U z##faVL9%Z~tp^065b-I^=s}sU?r-2x?lBO=r;cIL=yNkFAsu=Np@lcc&C{n%_z#bu zUO1k?_S?Umj#3!j%7=ErSz}4_eZ} z-Jakc2#aI0oD2$uG&gJQ(PDTgDmT{JKO|q(Cf-NBO=(&z``x@6ylW85QdMP_-wV0u z&x?A}N=!bI7Z{e{%7EJinuWsPl+gA6uzv)Zz9Yn{k70Xh4qrtcA&sXmE`OqUZofv* z;RO)_diw}}X|E7!TYM+G6%ROA>k|$P+WP^5eCuQ-gE84q$?gshbt035YSRQ6?*vwZ z0>AZuSO(D&ykDQE60fBPpIeVGXsR@*_?=@@H0(SyvQ+^eV`dJ=cAg61IpU_lR3bG6 zAjY8o@K&Pq_v^VE69vz-Izf!1f1%|F@X>e;R^wv`GafDisSjdY9)NvD#2+zvI2am9 zYtabk`SGk3jolPA5#Qq4I7P4(M1i4h%2P+gXT+sNwy5SfH(Uy87|g6ZO+LWDFx=i*ZKiXo^c^*T(TcrtWye{ zT*|($1#>SHLy6EdrKi{#l-Mhqzzpp4ETjBwF$54hcCvqiO`Ot{q+mfAtjT0#0#0N^ zXg!{cC+0_*8`q>pW(o@dpKD!vqWGsgLRDi`XwR zpRiX-K&hnP6l?p)sk2W$tU69f>l@y#nHt8kVJJ)64HrpeDt6Z-9f@Z3FyWk5Tpzc3 zb&akkI1j3S%;eF&kVXCr+jI-ADZLLgU9xl$DglP^4`ZkPK=>^_sw!TIto?AZ_T9#X zRCL(JiSLh}^&#SX#?v%BRbfxz=;SM1J})xigL-O5&!x*7swIU5lWFQQUq-!!7TGL& zKk88@!sULbWP@y1J#kl|&+KXr(Q3yXjT)fVI$B7zw$miMo)F;y>=7m7xsh^A> zA}I+I1Bdn$xfqb*C#}j$P^%7n(qXeh(nbRl;0((r>bV8UN^VjC-QEdM6iAXuaNgkf zSjhJU`p13gviyAvZ-75s% zgv6vs$S~fHyN_O+3>AMyB`^@Rj)t%@+?EbT^O7Om=r^HnvPVhpg|a4aS3@bAb|8%1jajd~wO~q3*=l7vy{2#GRRaCemDZ;C=VasOHMs*IJy`7I0QY8pY(IDc?Daptb8 z6Knn{3lR#Iz#g(4;R%?b)Qdi$_hTix_usdmu%QO4(4JJK)tq$=;h)UeCvYtj@DpNT zS>t;sm`F01pU390x@Ppg|^?sp;)(hNgg`N(1oT9&ipsZ zWSRacFAwu0QpOjaR|}&D7bhPSOJtHotaT1pz9b#k%4R zi|V+uy0qr;$-`paM66l^mDa?M^4@xh&PP^qVER%ltTZG|woVCd1lK|4I|0GFmHNY_ zOrB6sl1J#7SbE{TR}@^19gJjUg^l&2J`{p5yGklI{F%Fk%Bb;LK@MN={!*fCV4$Ct zKU1A|Pg=UV&||i4NsPy0PVP z6Ar)HTf*KQP#@9F`gjYQGysGH*2cvUO{0;M3`)g#wVW{W?vj3GCPPZQao-;6pFShodSj+|04QUEX{^OV>S<+ z9ihfQ{`JVp2_KKZN_Cxal{bJ1#o+j%EE0l|S;NGBe!rQKA2Z069REa|Oh{lPxP)BR z2&vr=oS!ijC#f{W76{0qm-o~2m-MoTPjQe0B5Nc8k!PgS2|nAoa`LxhK|>_z+18({ z-U=|y5~A+W&*LI@k>2L8j)a0u|2oe|%WqoVw5(gZvo{OIUFeQmNuF8vV| zqi@1hn+uRJ##XK6dwlH6MU))n6k(Wq4LSe=^c`Zu685?5-P<(eD-K9b}Zo-#{|csqJwb9w};v@ zy)rrIBBp-zc&GsIX!UZ?rj2UdGW+K-BKvp>mjE$>+4$MC9s%9dtds+#$s|c&on&Ao z+OQx&Y>Z>nCM!nnMZtvlTTAE?d4YtMFK~n(A}GP7kDma`yxcGh)p}akWm+cEW}(R9 zX_JaTcPKHvG^EEy)I6manM)V*rRzGCC8ZmfHK^N^iFQOAw@*FLJBIzOBK^gXTWSu6 zqN;k9CQ%UQYE$pWkC+wOh1|bZSb3SNQ=oIK$@bw3kspNb>Nor+mx0MaaQl?6OIJgw z2LzCdW&K^NnT?^U{@53$#h5ruX~YoLNjAGHJ>3P9lQtlNfEc-P9Uy#&%dpQT5AO2a zgo^atBsPgohi!>hEuxI64b4)V3JMoKk9TgGot7rH6`6&;sg!XZk!W}>n0(Gm%1xZi zdf_VcM`^$SHrfRuux9rgk3O_DMSC}8uqLSw2qPU23X4fyc1(}%p7 zs;^#PAenj~lJS0YOAM_s6sNM>bc1-4?iZ>2Hl}Okd3Dw$i_)W97}HBq*;A8}L<=d( zKB;ryuHAbF&kyhW-lv%_O+hsg;b=P!UIQwGmP7(ZmyM|Y(DfcKXu7J>#ilcA{v zl;DsVi8p)efJiH|mU8pW5}tV8w!VBix030KD}%WVf~2KOx0IxOn0=+z)N>`g7YW=iYJ!^ScrzTu*B<|YRzREb09a?dfTw`mI`C-{q8LP*E z)U0FA<~ugytI%~jD|}DO<=-ZytJ<$5gj|5^uap6Xdp<;WpLic5E~o@4=Fv47E+& z<&(8dQY4-N0DZr0ukKZ$z(+yVL!YQ$$&1&Mf6Rb$tOVY%6yLXG2hM?I*vXU1z0q`N zFauYS%!vX)J0ig~Df6g#liVX+)jtEmAh|~QmG7YDH&cl}KZKSSdDZ9`J4LT?#Xk{^ z%0WB2#bLj%;KRbxdVQY(wS*dxp4+-MOAd_)?2W zgc5R}5nD#AlYtT9fix6E=T@{N8AOEfp8-TyyGEfJEo~zp$ZA?kW?Ljax7f=hZ(D2VYJ?2%pE56;Pe~WMtTKPl_uYsm|Af~{>PcH% zZ}dDIa3Rlsvg5smQcB+t5!1x_B}u4D7(x51-68EMoln12&G=p*z6Ehv&61!kQoPn6 zE)|uY`Uopk&xT@4Er=D@+_*K-XNd7oZcyS;C4nVoQl^U79<#dZ9rR3su&=cCemLGb zeb9mbV3I~-QfmS}jrD4zk+SXyyMGatn)8%Z;4j+UAgL}UYHs6;W$-nf=D z>#koVFsCayZ88>6QmF2KI0ml;6^>)cejUNwB9I;+Vet7nDc?&Q`LrLz3Vc&Q?kbFq zpdd|_$Q9{ofR41?jVk6v6vuQJrE4mj%>IC5?9-+mCQ?<}--?JOSs5zc%nwmSH4XXq zBK>G-Za-PbeG&?M%haC~`K?Y~!v}&VOYa^WsQWayNa#_KJv>ix`0Pdj$B9wQLy^c3 z54ts5j88+WzGm6i5A*fe7yUnD2GNj#BlY7%)_?eg&ZSIjX!@G@6_FS8&IV!6ct8jNt|L*)v&-P5H)Lr>%o zgXwm8F<}HH4{LaIiUM$XRJe07pBe;_cycfmg>qmy<$tBb8J}<{7x^4EQJEkdTj6I+ zK$K+GK?pUJ0gAHC%idq&#DXJ-;gy(UdXfnR`D0&`dsJ%fHx;QGc4ntX_s+Z1d>^4m#a%yp>E5_X_FLW$E$@a9&8OT8 z18<)I_?h|J0Ghh@HxMBjJZ^a~IOp}lpm)E9a8_~REeC2{j4PajyXKFjaCr&CrT@pT zCk`SqSYAY_UlzGq?&p?9h@>G*GjWt3nFY(6Y?fGMth1U@+MHR_t=VVlunAHKQGXWT zVCHN{0}h3b&I@9JVDL(-Vc)-uB;{dNC8n@c%@|ihqhct%v=-6~ysD17s+`>dSUOw? z;lmn-SWCw$v8Mu3Wvxp1t568&>bFgq7ytIn=v>vc4+^by`N{_BOH0Q57A&Z)-DEVg zFzW8s2+EX<612jaz_1R%ABKhe8L(t|Cq7H{cbPTVxM#Inx!?moQpc)tT|q$*Y6U9t zcC+?YT#Kb;9bpl;=zdPF2wy<(&8nl}qaZ^Ip-maW(yei|L36qsW4@}5+OnVL|6^zG zk5`}JdYx(7w#n6gPldLvxM~}6Yn0S4B^aP3(`B^JmCOSta@N6_`QY-{^P^{ZM|Tz- z{Bmw$;dSstVPG_pk;UWKEfyTRgJ2DlzgMbyJL$#jN=^VBtF$xjokg%35aDcTyH%geUNL8e z32VGlEj0l(BTEw&i_Qd&V#2n!fXdFMzvLT&GIhUTUw+ z+k-1y2;5rr6S+!5vBjss>cVi`@uQBGtTbF)RZvnk$6DDVOZ~3up(B zmiJmV4EIgf7r{3%=FIPh*WyLf zn>>TdnCH`RVHFj==nvKYRwc`{SXpI@-@5r&EsXvB+nkKF%Fjwvg_)Kete*d=TsMz; z!^PJa@>S2ce&p8R5FCY`*+(01w`fKT@B$be#+;L*qEl237beoB(jQT|t8H?|5>ztH zMI>B}e2Y)CkMC(MBJt4E*~>Srs)tn7cNM1X6Sxt+NprU$yd92292yY^+V{DWdBpk^ zN2V(^gTx)d)aK4sV@`4i{E|hnglts~pSwAwKgzSN?B&Ltu)2uMbTso@!DUF*oe$`k zHeJe8<~UVYm$yfr;pUc^*kbP%7q$kLc_G(|zS)X2ht9zw)TAfOxCx`3Ab8!>V>aG7 zktyX-)7l#z+9R1)<}Mh{&R-1Q7SL{hy~dNX@xp$^^6?%?nq95bm3F?qUaQ1#Dtcb_ zx{tIyKh!?UwC9m`I%s73&G7QE%i=b9?TO>?@1(mqQ`Q=-zS5gv*8$V6Qh1rd`}cF& zx{~bm4YON9?Yand4I*=pE<#!c?XW1dtQxpc3uD50aq*Co4r5ai7D8p9gd&6?)EwfN ze+I1n{%iQh_L<>;R32kg!xMKJ&Z@=c95yIe!buU?8CMfgGg^{$(Dcbl_RM6*`-ea! zWo7jUHgthWMXzfM2~JuYd$8{R;dDH|zQ$?F0?+)%c9_MLv=5x@1>b=ko4`0){USBn zQ@mAnmu@-h`;M>0+9u|Twh3AU{g?az=ccbzjxYR45mD_W)zNyTDAG_QcrwzWg<+l~ zR$*}Q86t`ERV?_APaFZccFtfusiyq1UP;r7~%#{I3+J+|E-pzzw`DCd&M(zTjGKY4WJIdER=Wh`Xyp8Ik!J&e4?5xKdA6vQI zQM*@{Ebcr&=JWQk_pD^Aduxr7)6hzOqgnocmG2co@(hJhqrDy^(QZH&PcEL84+9~{ z^zD{D?ea3^8u;a+i!)Ol(^{)1u9B9|{z6r#qU-!XX3vm$MkO8i)lcjCHfx&@l&UNW zW zC)WNPDz~cC6nF~s*0d9_NK7s()<|Va8{rTfbu1Jf;K6fCW&GsPcDnyHQ`f@maI&H$ z|C5nS(stpUP!Q`+$ij>K+ zY0^bselm%wvNj8~40hJB=4YQX7Cp!&J-G2-rC)ql=Dega)1|G2}@W@BD zZTyV$DiuM(+7EQM5q+mGSVFVX5V`IT#^78z^V5RnweM-)1E-{P%2fM`2pU4)+|9v6 za-@l59B~Y#s}qS-l=gOQHlx!vs~d`j_J)Ef>w>lEwR1)ee;p6l4E(GOn7GSoKoGj9 zD;c@-8!qg8K{V8i6JfDl(L$#mPK|4K_=>;-Eqia zcHG>OTR>R9MJWS_0D-s);lV}T%}2;?+L!rGkvpi9E*|ZiG*T? zQK;Q=;=0ykjYl1+tZ}PcyuWX{fKi5h98&76IdR_M-d>vkw_!foh3Of4@}?pdd;5PYcf( z4~*j*dmpByxy6T%Z-I>|llKX}d|R2F9AswtxsB+e{$NxBG@ako#8?Fq{#1fXqt`yLVzJGaE8U(!zjF$Y8fXGy zZHNFjXvztzN*}DON~#%{zeU}y1hwhnFn@luS#9#zI?BpfL#Rcf8Y3XMjz)-e+#iR!J7$s-K2t>!Y%@E1q*X*HbX0?x?kY~_VTG;@-7k!9EtS(UV>tdIu0Ax-8e~Q zT6)9B+DAQl?YvaKqQxzoYU|gs`VTya)q(FpDyUmFl_wTmarL0=J!@rK8Uee!|0LvU zs~kpLb%EqN*dv!@*rj9Pc^KhSIlns*`h`*d(Z|=g+SE@%O~a`fy8nkv0ryK1U`@Yu zap_?k3O>KP;n<$B0nwc8LOJQFbL4fmC|E;QSw~HlP3jja?K^U~#WExUjQ6{qVnt03 z0W}3|iMK0&Yl(e}R3ROJdN)oswb4S>+)1DV;Is{xkiIcbpu!i^$lJF;tYb6{bH7); zMh!WL2d=-dxHajkDKmY7V_7S-9#z*?{xL7J*WE|>d?&X%w_Iu&N`-qwPxq**n=|}` zWp45OM7}eP`42Koi&K|qFu2s;y|QyemN_p>^JcnqXGF$4_sv_oy_t7=)wI~!;?=bS zgEsIjuRfObj29G8YyC3u^Y&pet_dCXx;>HTJm;v8*8O`q)T5yVADx8dezcD9`}eCu z*+S)f;h%z*ad1#>faC>AYlMY^bMkkjaz3w3U*W^PU znIqejxtzx5tlMprqLHuDj^ZhooFwdbYmAebNud=gzZTD?3s1qkB=;dyWRMBmxD~$m zXn>4GN|lO!veZDGIjG03W>=>h?^tP4;UUIh3Zj)4yTa2}h*JS)o+UlAztTuoN#i@|mY`q>*`I&Wv%Maf zz`iZ2hu>oytuhTF2*75e(_ahmWsPd8ZvNqV{n#Yo*vNP^bUt(0m&v7(4$0k9>b6+= zh7Ftg-c-41IAP%ht?SE1Y$FCDQwCm;1dl5(Wn;3-{P?6F>Gw(c3qreM_zGHQ>Cc+$ zrIycf*Risob=y5RU9aHXE1?oq)4aN`a53}U^pm+TNI%Id@;FKN&i$*bXVJdD{cs3X z?DIJwJ$_YT5u6VqiU1Wy2QQP{<-ruzVD6ItfE&hwgT!?18LWQ8Cf&_KG0Ub~Hw{CK~A-|HPz-EON?N1=Qn65F;#DSv3cJvdG=s>Dpu4DY-0J zX&VssJa*IRoY`Ai-|1lK5BF(R*+{YH>BTYlm4^alp53eaOU*5s^}~i>ukol_=9t5(b{`q zVo#9J@T)uIzJ=B4+A*l=oU8Kv!=aM=>p$jLG3SS7daH&8x}wJyz3UITe0%$wQZ0)- z!;29|O{xuT-G%;t_OJHPyP!{LiB*-#8^vZDi;=rb(-ybzPzE&;psSIYKf&b@SKJn5 zga{N((LQX==`WAdf;t0dF0s;A;VYieD-(s|^7)G7V;}DM`GzR3U~#kWCqr#g0@5}b zq>Epx2rh#n4xI-HviKD{q+QGl2dy96Xzgy48-)QvlS3`-4ZT}w+~`7Ba#zgP=Nl<3 zG48*r!lb3)2sc_gB8b?t{l5TuAcf!R+imi%bgleniR2;hhJ@kN_JP3p4CHOvYsDK8 zbpZ~8eIdZmqY@*0b%=0}>rNnI0MBLi(i4q%rUtNwYjAff`MndT{ST2&#y?jbZX#KS z2~HnzEE3Hm@bfLSeNp?0qnYs2y^Rr=dq`k|$(o()--yhZYJZDsJ(PrQz8fso&A-n3 zY*HdV;?cZs6&qiLx8YuGKwrVQ*?7F0)mfatVn!;f1VEK46_T_Nw73*v$VSky0L9#@ z?Y7=Eteb6$qK%@{A}oNyh^9;cQV_6gI0?(V$y%~8dxubUhd5`_K+H%m$eMQ189gwO zVdLz{X0Z6YLrAY_|DjmsRA5WzbOiZXkw* z-xomEkPTs56X^(^x7nZJ@~(NTea!Ln2`yGS&oD z87+dbv%R?C2$9W3;ca&#CE2~1uN~luR_m0wcAcBK;!~w&HZxk8LYrZjZfA!}&C1FB z|4vLR)PLNI-AwWo{vsQBeKx8Qy)DeDPs>gY2KHu%MnD(k|}`?PC@md z&|^hN<_Tq?l(ktFwqFccOooc5X2W!btZ>U^GUIU*I=3mOS0Z}Ob0JMEiqWPc)ipfX zVBj;haxrHo3y7t9wDio)%O^<2Vk}Vbb2uJ6rGJ78hnHa6)G)&iZwZ&j10yNec1t5A zh$m^ejPCb_Y9NSCFYi7E7BuD*r7bYFAP5O;7VCH4H0m9Cd1TEk5v8IXooHqCBODWE3;xG9Zd^rbmXhD5R3 z)8j*(jft9>g=0MN^yP}6!zVepa(H^`hawLsg_e3!S(Ok-uwE8aP;DqMWJW#d+C9da z_-IBYWgD>sP~*JOB%8q!!8NfZGa#6HWPcMT%Vc7KJwi!M#75B*P?e6Ndou$!iyHMK zC0658H;}GGAmGUfK?Wn7*HPI%_V6!qk};|++jqlO{91{xg({oZVLrs|_2k}U8$F5X z3`eJaOHANDPNc|^C0BUu-II#933CFnEUBq1<3Q6Qtb)jpqbcG*p2{7KG^dsKE?$znt=SZ5CJ|toK6}pJUG>w8Bgpgj6f#$}4yQ9%g^7a>F&rOGQrm5f z0rLKHWCP>&YVvYT{P$JImzN?%?0*a%API%;7-lL|Q7W*tHj>-PT{AUTBPr8FQ0{Q@ z{k}kT!@YRP*R%lmA_zc{fX0?Bgs38ftx}q7wq!DrvP6n$VG^ZjGFc!<)kT7=lxddC zv{zd)`p< z%XrRMLcd_f^4Q=NTfu?Zrz9hU9OT46HwlJsB7}hYiUdb2?vyzWN4|VSU8VR$Gq6TSQcz%sv%kKRQ>MLUWSuPNQ`9gq2@_!0 zEFzY9(8oDRGtXdZ&V#R*n4S{)fT%`4Uiw1NByTDpXBv|(5(mCXew>6jfFhzWL|D#< zSv7P0C%&{ZkiQopo`3D}*IA;-V8iXtGanm;jjjX9!_KfGdh(nNcGtgcata!@s;Z znn0;uKOp8UBPEYpx%QPEGb1^V2Ou4d$px!HExFMNkl($zQ9mF_Dz=lz_3y}vb{=L3zEo7D zYA0Fh-LiBqs(*ThJzePj;7ehK*j*dY$>_X8@jbUVa=x`}MJt3Sg!4ZqmvK7lFzTCUgU0W}&$=Xn zo@^{0QWlz!xfCRjOL4LWx}Z5di@%6=2A&$})@x$(TYpH#c&E;OraKsUlPInMM7-_k zNE~LUtf|9iER6N;^2Q^GQbP2MAP;Gj&lbHUbkM__Mp;6v-<*94SYk9h?n zDV3$@x&j*k`a_+BE;|Ttf;yD^aQ$q@^|Ef`Og~LIyJLd&E?SR7w!-z~F zwAwv-uG2=9HR`tZ)6Jm-t>FP@PLKg?!n8B6i*{{;bSc>tG^ZmacovFg8!-$(a2SN5 zn15@3s~nFbB@R`~oy=_>SI*r`#@nuRzkCcPSe*9bkk&>(j7X;c*&tckbjZ9CVi6>q zG_bK#y8#AS7-7ySUIx1#jd3{Uq$1^UU zIpy-Cqg;|hy|*N@YFzNQ(Vby&CdW)d8kk6Yl=;ss(sQb=y6R3X7B?Il&8{WKHKY*P zU^8QoD3f4%7!>CWxl=nb0Ldb8AwL2pFSjAdrAZZB$?%)<~wHCVvxuq6SLqQRhfCB-4Ornxr^NJlNfKp*I%)6wsp#wWs z`Njhb$y%}^ii0L~aY^?JcMQP@Qh#xhHhg0nSv{b8j5E=3v_oP=-f+CYd zos8oPh3;T=Zh9a$Qqnj!f~1^O;$UuK^6fhkni#oq5NOlY2{UhT5<%$6q<4Oj@%F2Z zYXq~cRm7C?&f|}A55nb zyUZ`W*Nx-q;wYQeb+W$Hba^^>a2{cqPhK4Hdiz;L1|IVBB7@6k`Z9mh^IG$$b85(q8P-fl+l>zqR~WOf!eal|9}5#Uc=Il-_cF{hUfX~^%E(An;e zrYL&qMI1EzORb-bHxo*yX@3)Ro@Y4cXd-eNWy^soSkt>wkq(7nS9H9#e$P`o6Vs4A zhhg0XXHo`xPU0t$R5-;XzToqM3oV1s_A_jBI&L&AGTlUO-N_h;$!xF`6=~KPQ4^LT0#g(qQh&qw@Ngq^eTYPl zin^IKRa)az^^R2C@v2oexu02mA<}A-FxhC4iI>)STu9$5c}$vSU2fBMnSRJX)xmM#?)Lz;K6dyVPYZ6{5cpEY$`>{z@E zY(luMM&eygGcrJdrhh!Fa13B9I$ZPe!uVA*~idc@KlsBnF-;D6^UWu94wx_0AyA*Vo+ zDVrH_q%}j213_;uQy^ERUGHhUgu#lH>d#>Zhz6Yck^>OKqO@ShM4*F1OFRPjDqIpd zX3QbEUg9lB5`3AvDuI-!kzykprH7fW;Pc`l#eZx(rJ#pJHfcoEqJr3@Mgm2;GVEt_5}BfKFyTd*3_gIGQ?m$%nc3dc z0=*T`DFP0yhXaNmBN`UNFA*M2rW}ZzU<`(lB^VhaDFNmPd7X)8XGbvX25_7Z?8As6 zF=BNDpHs|y?2Bva1{BaFU{FC`DFO?zKqmql0LB^Qd4GY}hHxCLrH zFvPwof*-`q!-fDfr4NStuAbhw%qs-AY^bJm7=NUpqBPGRlWz!}COJxv2kRo7Ehy-%klrV!yhJ_s%V8OuA zM^#eaRPrMwqq92PBPqnLG)P|_b-Qe(48SSEb~`LlL?a+4!|emnw{FnwaFE)AX@4`e zF393=vg^ik$N<)uVEDom`gQz3ZkOnR4*vRi1DOWmhFXD{m`R9?sRf5_lL?VKf9ph) zV0=Z)<~C~v26-ls*!DB3j>|(~%m&QX7`7)%^(0}u4pzP?C8t@VTk}-ZH@o680T6>0BOu76gCGXKCsyNuf`aX~ z{){pd`{)rM2m~OhiR$qVi<=LgN40yy90Q5{1sVZ*IvPNbN!q&tw4qll~Os8pQ{ zE;gVxu(vyv(vsbEi#Cxqy?lvEI4Mb;T;1agfKYyya4B5@4k;eQirpkX#XHL4g? z&LiFQXtq_Psi0?d-=Bd2B+!MaXpQg&aWJ)xe=ANOLnc|+eJ_tGz`S%dLec@Ju_cA1 za&B;q`HZpSO(r-4KB?Lg{aYs_Z$+dj_mpio>WT3`Cj5%6R`flS#u}IiLMTYXQ~+}^ zJR3o9CM7LZ6v9O$-+zwzG%ZG{q<2Y!tD&jUA;T9BK08J->rBD}Hgkv|)mEzcy}nX4 zQ%plrYE(?AKv`9>ktS+wEi_l-tz6YzGFp<0T}^G<=CWghA3i4u(IEp{%?51sHGTER zLF%7cxNK72p^LeBe9{opNz^&r9WJE0PN#2=5b;$y6g|C1Re#yWVsI-U9uY{9Rm=i= zh~fsg`E=+bCCXl~A~FE?0C^v40ZywK5)u%FO=JZ&-Ur?B@Geg;ok#DpFzXN0E6>Zn zoQPusGKaR3=ID_5Z=1!v%Bg2EdadEFf`LP}BPEompt3-;ES9H9hlW8(u2QT{+NLMo z$IqTqdVe*AdVjDmn~8eW7-|thhhP@^``db?)`HOpY@o<3lSz7uwu^FehhoubhG@gw zb|P9wVtJQp0d+*UP0S{>kPibze|DO%?(9dhL5%#^CKUE2J4`ZtC)ae@cL!MMrd6V@ ztP>F)SY{3*L<_~p&5&DG)spr1EIe%Ni9Xe=+)gvY0#O@;{s%waY z2qP(Cs)#@w@`kTw3jw_Y_HJ1=X|GP{z{6pog#`y4(iqP49fmDS9lS>_==ZWp3kc@e zDK=xF&vcuS%wZr<_c*~|Q0q`&I=nfmzR8dh2#yuuXUb-Db{yL{j`=?DKa1xP0- zBPm4@Qn2g0hL?94XMCA-1zhvaB7P;yt>>EFmF5{Nq_Sp|E7DyW^BPi9Y>bJc5J;#< zNGQ;;Vjoo_DMq34BPrxS*04oBFPklx`t#NNUZAA4@A~csftpnQ(TavYX$Wfpt_9+!D z!G8y3Q3Ue9mZTX80&^Xn`x6t`Rg$x%X3n9yFY}ZbLH!gaz<*wJ ziQ)+lIIIL(O+Z+Nx@cQ^tH!*x)MG?7n?`Lssv{`|MO-v+EL9M)K!2hD5rTuvN{`GY z1c4_`CUnV%VCut^^jX!|^HCN0$}jaE7RBTaycDmV4g(lMU2-gul68h1TUyCr6-IS0 z+3q7LIsqhy>kv<%J%6l!(jzI+)_*YSAGk!0YCkVf~n92Mnb^n2Hm~NMrl-u!o(N z$HN=p-kZ|6l$2Ran>1@~WRnGiVUliWZl);3ic4u)B)NcK$dN`Of`b`u155y^1X)h- z!c1yQY%6VoghL5@!oY_m-yL<2^$MMXt`CfvgDpeQ;kxql0^mn<)*ajB(= zBUvf5n%ARiu}Xgdl7)3AQ~l#7(!u z6BRM~cw3Gk4${aUza`!yC6Ci#E#aly`u=8bi#@-RC(NSu_jofoP|};-G2Bp&AJk-o zl4g79ZMOUP_=4#{Pk&1cl1>H;Ybr%H$x{LMfl1C5izmqQeIcx(jT{$`8UDsqV?MK_oaEGa6vTM1So*qxc~75FDsMX{12Q zN2}ONlxj9zko+_-oQ4^OC?eW4BPH-90j4{e1+Nj^&1YM40o=m@Au!(>>MoSAepS{8 z5`3T721FwzOK2D(@_aDCHgZgcLJ5%5QDKmfFVWD$=M0o_NLj_y8dyj0=IEAH7G+S0 z5NHTC8o4_)LYI6j0SJE|Ps*0DjbPK>tU^fRf7mgF@(GD15>QPhG{#XKkV!Dzrlg`J z7fN}0SDjf_RWg#b`tD{PdIm_tl@$4K)xmZ{>vC0B#J{91gf^dtnbV#R7(V!@)tMtH zhaxATC+3Sv?OeRSrGG=W(Rg|o9i?{|QsMxV9jA(A!*Pkh+ID}Ciz6u@A)GOzb`)wI zMouu!a?^JC`cYng23{-p>>e!iogP=5PNc_e&&xfBs9-X zTULREts^EmlG|-;{chq)94dH8gqAKewZu`!g{>w*r)`XBI# zl`<&*D9V2t@Gxv2pXjq``oB+Q6hWA46I>ji2Wn8I+r*8OqsM{`y0CDJ8+YBH4+nD+%;B;^1ihRECv9`9#LeiZh zCAJRtLv`HLxvz#cw=Zj)GVM5!`YEr|koot)>QsO3V=&Cf+mNv4({F>l`t(H}b0TRF z^E&ODycRNOZi*&B^th=~DOP&%HR&kHzL<4$orxw%(D6t5k%bBDsPs)EDOVe$lg{kU z99R_HuG&*15?O3ahe)9xk&^ACnXa8ftSRxX>zQ%(9fxGZCSgR9$5o32iu4@!+VxnA zuX=w@sjyT)(P7C!1Mi@He5eqTsv#In5_H8-v=PM6*NWUkz#~YSa_#?oBP9&(^mi2` zOV=}QB z)IB?ll61kWx~BGai@Q)6m$-;O0oHx~$6~s06=#bwMO}h6o6%rrCq6wE!)z$X=zM=1 zJGdHTRwF^HLs~#rNUS1~1(=ltWDqyO2U`b7(-uHA$t;vcNFd(W=W(&DsL?=wdKreZ z)IyPi6v0&*}Zuvr)JYm)7tS%FTbNxH)_$QlNi)QHu~5K_ew@nw2E@+PQYDYT8oL zHARcA*WZ)(3VSU_$XEL^{=$FX=bX_0 zXWT#GwI*5r%|Rn2I`>43Ps3fi)avacC9nP^Wn_yHOsrxv_@i33tf2$Z?%(PY3t#VY|L@#$Y4(3p|85Wbp8fK6f6LtLmyzD{G4C5F(hM!|=l7LRla}o1 zBPsP5X>`BU%Z(|Fh^3P`#wyVKEw=xYuKB*YaifTVE)n%YkWpGKeqa1_Fd8mNt7T$B zfg>quyRqRNw02A-5YHH8u={u8`aF0~dxPu!aq1|l2ryA~DGB_4FO3?FKX27001yA- U?ntL2DH0zia+DwnBRoAl3I{n+p#T5? From 33e5bb71347ce2c7255a1a1141d2bc7ab5039d3b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 22:26:56 +0100 Subject: [PATCH 0759/2970] Make LocationAction properties readable --- midori/midori-locationaction.c | 37 ++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 9a5cb3a5..3f6c8af9 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -28,6 +28,7 @@ struct _MidoriLocationAction gchar* uri; gdouble progress; + gchar* secondary_icon; GtkTreeModel* model; GtkTreeModel* filter_model; @@ -82,6 +83,12 @@ midori_location_action_set_property (GObject* object, const GValue* value, GParamSpec* pspec); +static void +midori_location_action_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + static void midori_location_action_activate (GtkAction* object); @@ -154,6 +161,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class) gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_location_action_finalize; gobject_class->set_property = midori_location_action_set_property; + gobject_class->get_property = midori_location_action_get_property; action_class = GTK_ACTION_CLASS (class); action_class->activate = midori_location_action_activate; @@ -168,7 +176,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class) "Progress", "The current progress of the action", 0.0, 1.0, 0.0, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, @@ -177,7 +185,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class) "Secondary", "The stock ID of the secondary icon", NULL, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -285,6 +293,7 @@ midori_location_action_init (MidoriLocationAction* location_action) { location_action->uri = NULL; location_action->progress = 0.0; + location_action->secondary_icon = NULL; location_action->default_icon = NULL; location_action->model = (GtkTreeModel*)gtk_list_store_new (N_COLS, @@ -340,6 +349,28 @@ midori_location_action_set_property (GObject* object, } } +static void +midori_location_action_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object); + + switch (prop_id) + { + case PROP_PROGRESS: + g_value_set_double (value, location_action->progress); + break; + case PROP_SECONDARY_ICON: + g_value_set_string (value, location_action->secondary_icon); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + static void midori_location_action_activate (GtkAction* action) { @@ -1184,6 +1215,8 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (!stock_id || gtk_stock_lookup (stock_id, &stock_item)); + katze_assign (location_action->secondary_icon, g_strdup (stock_id)); + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); for (; proxies != NULL; proxies = g_slist_next (proxies)) From ad13d2e8a2d2afee03450d63c4b6eabbfa53b564 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 22:57:51 +0100 Subject: [PATCH 0760/2970] Make Preferences property readable --- midori/midori-preferences.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 5803cfb4..bca63a0a 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -28,6 +28,7 @@ struct _MidoriPreferences { GtkDialog parent_instance; + MidoriWebSettings* settings; GtkWidget* notebook; }; @@ -70,7 +71,7 @@ midori_preferences_class_init (MidoriPreferencesClass* class) "Settings", "Settings instance to provide properties", MIDORI_TYPE_WEB_SETTINGS, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -86,6 +87,7 @@ midori_preferences_init (MidoriPreferences* preferences) { gchar* dialog_title; + preferences->settings = NULL; preferences->notebook = NULL; dialog_title = g_strdup_printf (_("Preferences for %s"), @@ -123,11 +125,9 @@ midori_preferences_set_property (GObject* object, switch (prop_id) { case PROP_SETTINGS: - { midori_preferences_set_settings (preferences, g_value_get_object (value)); break; - } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -140,8 +140,13 @@ midori_preferences_get_property (GObject* object, GValue* value, GParamSpec* pspec) { + MidoriPreferences* preferences = MIDORI_PREFERENCES (object); + switch (prop_id) { + case PROP_SETTINGS: + g_value_set_object (value, preferences->settings); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -320,6 +325,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_return_if_fail (!preferences->notebook); + katze_assign (preferences->settings, g_object_ref (settings)); + g_object_get (preferences, "transient-for", &parent, NULL); icon_name = parent ? gtk_window_get_icon_name (parent) : NULL; if ((header = sokoke_xfce_header_new (icon_name, From aebd1114531aa8dee35a29fe267194aa5d11b146 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 23:04:47 +0100 Subject: [PATCH 0761/2970] Fix mime-type and icon property lookup --- midori/midori-view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index a6957b0c..850806de 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1280,6 +1280,12 @@ midori_view_get_property (GObject* object, case PROP_TITLE: g_value_set_string (value, view->title); break; + case PROP_MIME_TYPE: + g_value_set_string (value, view->mime_type); + break; + case PROP_ICON: + g_value_set_object (value, view->icon); + break; case PROP_PROGRESS: g_value_set_double (value, midori_view_get_progress (view)); break; From 627e585db56458b01e1f0c1196dc008ef0032a5d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 23:30:08 +0100 Subject: [PATCH 0762/2970] Export midori_dummy_viewable_new for use in tests --- midori/midori-panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index ac3a52e5..7f4a914b 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -706,7 +706,7 @@ midori_dummy_viewable_finalize (GObject* object) G_OBJECT_CLASS (midori_dummy_viewable_parent_class)->finalize (object); } -static GtkWidget* +/* static */ GtkWidget* midori_dummy_viewable_new (const gchar* stock_id, const gchar* label, GtkWidget* toolbar) From b40b906e2ebe13b0e6956cf353abe5e0e8a91ba9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 23:34:16 +0100 Subject: [PATCH 0763/2970] Allow setting the SearchAction text to be set to NULL --- midori/midori-searchaction.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index e76d2f6f..67772f96 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -579,7 +579,6 @@ midori_search_action_set_text (MidoriSearchAction* search_action, GtkWidget* entry; g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); - g_return_if_fail (text != NULL); katze_assign (search_action->text, g_strdup (text)); g_object_notify (G_OBJECT (search_action), "text"); @@ -594,7 +593,7 @@ midori_search_action_set_text (MidoriSearchAction* search_action, alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); entry = gtk_bin_get_child (GTK_BIN (alignment)); - gtk_entry_set_text (GTK_ENTRY (entry), text); + gtk_entry_set_text (GTK_ENTRY (entry), text ? text : ""); search_action->last_proxy = proxies->data; } while ((proxies = g_slist_next (proxies))); From 4ab9bd74e7fef2d7bac50220bf9c276c494091d3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 23:36:04 +0100 Subject: [PATCH 0764/2970] Check if there really is a SearchAction proxy --- midori/midori-searchaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 67772f96..a7a16fc5 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1070,7 +1070,8 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) return search_action->dialog; dialog_title = _("Manage Search Engines"); - toplevel = gtk_widget_get_toplevel (search_action->last_proxy); + toplevel = search_action->last_proxy ? + gtk_widget_get_toplevel (search_action->last_proxy) : NULL; dialog = gtk_dialog_new_with_buttons (dialog_title, toplevel ? GTK_WINDOW (toplevel) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, From 514c6965c74276ff3c9542e166a034990bb5f1dc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 23:40:00 +0100 Subject: [PATCH 0765/2970] Check if 'search engines' are actually set --- midori/midori-searchaction.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index a7a16fc5..6b71f1ff 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1131,7 +1131,8 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); - n = katze_array_get_length (search_action->search_engines); + n = search_action->search_engines ? + katze_array_get_length (search_action->search_engines) : 0; for (i = 0; i < n; i++) { item = katze_array_get_nth_item (search_action->search_engines, i); @@ -1187,12 +1188,13 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) #endif gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - g_object_connect (search_action->search_engines, - "signal-after::add-item", - midori_search_action_dialog_engines_add_item_cb, search_action, - "signal-after::remove-item", - midori_search_action_dialog_engines_remove_item_cb, search_action, - NULL); + if (search_action->search_engines) + g_object_connect (search_action->search_engines, + "signal-after::add-item", + midori_search_action_dialog_engines_add_item_cb, search_action, + "signal-after::remove-item", + midori_search_action_dialog_engines_remove_item_cb, search_action, + NULL); search_action->dialog = dialog; return dialog; From 787dec54a8925da1d293db44516a970719f23c8b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Feb 2009 23:41:28 +0100 Subject: [PATCH 0766/2970] Add property test case, currently testing strings and enumerations --- tests/properties.c | 163 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 tests/properties.c diff --git a/tests/properties.c b/tests/properties.c new file mode 100644 index 00000000..6866ce41 --- /dev/null +++ b/tests/properties.c @@ -0,0 +1,163 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori.h" +#include "midori-bookmarks.h" + +#if GLIB_CHECK_VERSION(2, 16, 0) + +#define pspec_is_writable(pspec) (pspec->flags & G_PARAM_WRITABLE \ + && !(pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) + +static void +properties_object_get_set (GObject* object) +{ + GObjectClass* class; + GParamSpec** pspecs; + guint i, n_properties; + + class = G_OBJECT_GET_CLASS (object); + pspecs = g_object_class_list_properties (class, &n_properties); + for (i = 0; i < n_properties; i++) + { + GParamSpec *pspec = pspecs[i]; + GType type = G_PARAM_SPEC_TYPE (pspec); + const gchar* property = g_param_spec_get_name (pspec); + void* value = NULL; + + /* Skip properties of parent classes */ + if (pspec->owner_type != G_OBJECT_TYPE (object)) + continue; + + g_object_get (object, property, &value, NULL); + if (type == G_TYPE_PARAM_STRING) + { + g_free (value); + if (pspec_is_writable (pspec)) + { + g_object_set (object, property, + G_PARAM_SPEC_STRING (pspec)->default_value, NULL); + g_object_get (object, property, &value, NULL); + if (g_strcmp0 (value, G_PARAM_SPEC_STRING (pspec)->default_value)) + g_error ("Set %s.%s to %s, but returned '%s'", + G_OBJECT_TYPE_NAME (object), property, + G_PARAM_SPEC_STRING (pspec)->default_value, (gchar*)value); + g_free (value); + } + } + else if (type == G_TYPE_PARAM_ENUM) + { + GEnumClass* enum_class = G_ENUM_CLASS ( + g_type_class_ref (pspec->value_type)); + gint j; + + if (pspec_is_writable (pspec)) + { + g_object_set (object, property, + G_PARAM_SPEC_ENUM (pspec)->default_value, NULL); + for (j = enum_class->minimum; j < enum_class->maximum; j++) + { + GEnumValue* enum_value = g_enum_get_value (enum_class, j); + if (!enum_value) + g_error ("%s.%s has no value %d", + G_OBJECT_TYPE_NAME (object), property, j); + GEnumValue* enum_value_ = g_enum_get_value_by_name (enum_class, + enum_value->value_name); + if (!enum_value) + g_error ("%s.%s has no value '%s'", + G_OBJECT_TYPE_NAME (object), property, enum_value->value_name); + g_assert_cmpint (enum_value->value, ==, enum_value_->value); + g_object_set (object, property, j, NULL); + } + } + + g_type_class_unref (enum_class); + } + } + g_free (pspecs); +} + +static void +properties_object_test (gconstpointer object) +{ + if (GTK_IS_OBJECT (object)) + g_object_ref_sink ((GObject*)object); + + properties_object_get_set ((GObject*)object); + + if (GTK_IS_OBJECT (object)) + gtk_object_destroy (GTK_OBJECT (object)); + g_object_unref ((GObject*)object); +} + +static void +properties_type_test (gconstpointer type) +{ + GObject* object; + + object = g_object_new ((GType)type, NULL); + properties_object_test ((gconstpointer)object); +} + +GtkWidget* +midori_dummy_viewable_new (const gchar* stock_id, + const gchar* label, + GtkWidget* toolbar); + +GtkWidget* dummy_viewable_new (void) +{ + GtkWidget* toolbar = gtk_toolbar_new (); + return midori_dummy_viewable_new (GTK_STOCK_ABOUT, "Test", toolbar); +} + +int +main (int argc, + char** argv) +{ + /* libSoup uses threads, therefore if WebKit is built with libSoup + or Midori is using it, we need to initialize threads. */ + if (!g_thread_supported ()) g_thread_init (NULL); + g_test_init (&argc, &argv, NULL); + gtk_init_check (&argc, &argv); + + g_test_add_data_func ("/properties/app", + (gconstpointer)MIDORI_TYPE_APP, properties_type_test); + /* g_test_add_data_func ("/properties/browser", + (gconstpointer)MIDORI_TYPE_BROWSER, properties_type_test); */ + g_test_add_data_func ("/properties/extension", + (gconstpointer)MIDORI_TYPE_EXTENSION, properties_type_test); + g_test_add_data_func ("/properties/location-action", + (gconstpointer)MIDORI_TYPE_LOCATION_ACTION, properties_type_test); + g_test_add_data_func ("/properties/location-entry", + (gconstpointer)MIDORI_TYPE_LOCATION_ENTRY, properties_type_test); + g_test_add_data_func ("/properties/panel", + (gconstpointer)MIDORI_TYPE_PANEL, properties_type_test); + g_test_add_data_func ("/properties/preferences", + (gconstpointer)MIDORI_TYPE_PREFERENCES, properties_type_test); + g_test_add_data_func ("/properties/search-action", + (gconstpointer)MIDORI_TYPE_SEARCH_ACTION, properties_type_test); + g_test_add_data_func ("/properties/source", + (gconstpointer)MIDORI_TYPE_SOURCE, properties_type_test); + g_test_add_data_func ("/properties/view", + (gconstpointer)MIDORI_TYPE_VIEW, properties_type_test); + g_test_add_data_func ("/properties/viewable", + (gconstpointer)dummy_viewable_new (), properties_object_test); + g_test_add_data_func ("/properties/web-settings", + (gconstpointer)MIDORI_TYPE_WEB_SETTINGS, properties_type_test); + + return g_test_run (); +} + +#endif From f2d5d6e29ddfc4b87d626f9f9e49912ed825b7a6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Feb 2009 00:53:21 +0100 Subject: [PATCH 0767/2970] Fix build running with libSoup < 2.25.2 --- katze/katze-http-cookies.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c index 9a7b6342..f2b39733 100644 --- a/katze/katze-http-cookies.c +++ b/katze/katze-http-cookies.c @@ -33,7 +33,7 @@ struct _KatzeHttpCookiesClass GObjectClass parent_class; }; -#if HAVE_LIBSOUP_2_25_2 +#if HAVE_LIBSOUP static void katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, gpointer data); @@ -42,6 +42,8 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, katze_http_cookies_session_feature_iface_init)); +#if HAVE_LIBSOUP_2_25_2 + /* Cookie jar saving to Mozilla format Copyright (C) 2008 Xan Lopez Copyright (C) 2008 Dan Winship @@ -303,13 +305,16 @@ katze_http_cookies_detach (SoupSessionFeature* feature, g_signal_handlers_disconnect_by_func (session, katze_http_cookies_session_request_queued_cb, feature); } +#endif static void katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, gpointer data) { + #if HAVE_LIBSOUP_2_25_2 iface->attach = katze_http_cookies_attach; iface->detach = katze_http_cookies_detach; + #endif } #else G_DEFINE_TYPE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT) From 01c9ed152cddfb3e8638f7867060014375589619 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Feb 2009 13:56:44 +0100 Subject: [PATCH 0768/2970] Update WAF to fix --prefix installing to the source folder --- waf | Bin 78475 -> 78495 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/waf b/waf index fe588a031a7308e1fdf29ddfdb1c88501332e5b2..3de0239bbacadea9f7deebf3b9fba4033c228554 100755 GIT binary patch delta 74753 zcmY&fRZyHwu;owC3Wby4wy?-T7I$}dm*8%}oiDh%+v4sX+}%CMLI}a#9c~`(!@cu9 zGd0!KXZrN%6Sa$&yNg)IgG|A}#lgYKW6H|LYRb&P!DGs1ZehY~Y-Yk{#>~aV&d!yj zgDmzRv@r*n36VIF~+3IruYz)}8yK%vfU9P2yLy>No? z{};D15|SSR0$E%~V}dOWoeEuZWX@zW|AZ0hR`MXC`6NFGR z*~p?qeDLUym{dH6BzZ?=%_#1jJ9_aENi*DY<#>EchHpeap4HmjcAt@D5Z!m3U3GDs zvn8d?Zg#r69|JSqIlH)fHNWU8ijVO=u5>lc?%UPe!_Ix<+{1ps?KcJ}Q;AP&;_X`7 zwj8_fjhe4~I#%S)eWp)*{6-c|w}9 z&Qb4NZfT)6$mFbr^{e-D_X9u0*p4NRjqhYNM=JuE*z)YR{q`#^L%(jl&f|UiE}!30 zC6%}>&xJtEcuK(S@mzC998+X39ghf*J(KABchjQ7kn`>*;p3shC`*Vl$SgkJK z`@;2BO96w<=;rd^7HuLGJDp-N`$iks0}y`5M})I*V5%CKWWttM1OU+DEeImOK`hO_puk!3FX0f-1XPnV#S}!8 zY&?I+G?SM{5_$i)MPU87X!XCD|A9K3LY{&hEuI}jnI}GY%f1E%gEND~)D{=!(SOVm zB7h)l(p2KY0SLmSKV-;KgcRgqC8d$xHVCt~gdZ1C%03GJJIRXtts8m_XtX$^JTMX4 zySRC5RyX{?s|{>{I|W8m*(%7b*a}l4^p5=XZ%KN4UyNI}a=A}quJQ>hX4g;RVt%hd zf?yMEE!epT_6a+{?)Op^4Usd|1&n)e>&B~-=5Z)G$!=aGwZ8OQsVJ-uxZ^s zsiOXu7(OK8J)}GpJ|F&CK!Z@-r>i1l&R&ih%G@ceq7_IH7!RTjAjGEv$JjAWu1aRo z$gvSJ$eBfepvBR41<7NQjjFOSY^WiW_>r6(=~X6pY+#Cd919x&1dU)A`-fTK^2rD- zG8T3XG|_D4NeU&uVlvm6n(6Dbi;K$TGl(UkSXE8U7OO_5s23E>lQSA=K!h=@t5gta z9O~345F1EDTqFv|mZoS_rNo#$c{IADNZuN(M$aU#D$_78J@;AF#;zH>z!)8jBcEtB z$r-GQOIW1$ITN514J{PcF=nnxOk$s6DUKpyl8i_u43xHFqmwo#VpWY|w3n=pVx>wq zQ3!4zDCQ&rV`U_V=MCE}s)HaFqpaz3ra0mpc+o1d^k7qh3|)4kEUFSyf~0>>$CjK= z$mHOpm*v0*Gs+Un%QvcyeMVEELY>1JwJVUp`7cpE9T=7)ED53^q&72?&9E9`u9rlo zlJD1nP!|(pD^Qo4t+Sxz{VI^IFHdg}6%WOw%pA^QOf;kGXV$jTVWUEg&QKjrl3-*U zpihou;J~v7a}*R6t;r!G(S*?B6>!kwGfyT-aD2!hWL34No;N4LwE{s1D(DfKRJ1|j zRN9M)fEXhZvG@SBsw};l}E~^<~UVJ?TF0Pp} z(!c!$(bnak^EvQ@KQl85Hw95gq6shPrc~9lT7w|qn6f!pSs7#wGqcnn3Ia9;E74?~ zkQf<)D5H^CxCv{pwOz6d^;oJdLz2aUx;Z_dt`i*^*(k%tY|NCI9{p=Riyn!c=5@LI-k@O3KU8*O~&ntiWyg9SS3+)@rsjWzy)$5 zI@ab$^d;1DII0m197LRI%yuGF^d-{BI7La+5;De##NfI5I_e^IYgw~Ic1nwcP-_|) zdg{Pr>&)apl>&Qtg<{4aszI=EQ3YURL&X^lmW`4uYO<3YE-H#HB>Eh<0Fsd?)Q%*q zFpAI)RAEmMqnEdjgn$cFT4KP%3E)s&nk-HkW%0=cnHGyVWs3R+PT~3{8P-TTJt`d? zYw-#3VQZPPj1-#02zK!W$r70cbG!_*L^d_#xkTAvmWC8u&Ls6EoW!|$Nr02RtXPtz z#9lf)i%wq{3Qf!%{S9Bv~vGk~q{tH-YoXWJm@)I3_C{BOyH&oZpbzly4_FXQyJv zpdk)|M2On3XU3?|B&!lL5f$1%kW7YUle8DiGE$iBQQ`Y`Aa?g7)*?J>XeEsN+`qrX0-dkkf*kU4YUq*Rv0e!Z9 zs})fMvc(t+EM|$U3 zHtz&Vs2CGuynpsnj1=Cbi?h-|MEcJpUX?Sw?Kpd4;fw@_(G(k#oEVHg92d+0<{Ef2 z1e3$S^_>G!hw|Zrk|g>0;Vj+wY}udFvArFbiwjM#o)j z!s@HKYZB~Wc+@*~RAKO*Hzg5Zb7Co?y010;#+bULdk5FNbZmwo{fDn2H9wvUQHPBg zbf=SFzCQnO5)#TdlNvgXp?RW{@~;$5OgzI2yQtr4&%N}q>@mQ^(&xrN*ZSvh>nyxv(p)I zo`wV_Ale9lAdswG(P+yl#%o_%w+(^Z0+;2>xR)4#pM+OkotIMw>odu{S+_zI} z79GkR`{{a&hfUR(ivKV_+IU=7h~v3C*aCu7>cXB-qD$e9R^Q6imB6xLYl~5Qc5Y}F zuU~R6lrN@lVT4)Fb~B&V)h056>qD7)v2{p9z1T(=vZdGPUABEKCN-D@_;rfi+MxOa zDA6fCtwoYBLk$)rFLSZz3LxW#-;h?3c|PVO*?V|_+*?YTyS(!gh(P33-(o>Uk`^bg zNJ2KnU(hF`8RMm{SH0HLd(R{bnDT3?`m5<_MgIq;w9}M(^_q5XttlM}ai{q+jR~=g#54ZS#{xkTe0VYR zi+?vc8Cjc$4R~gWm;r)8wm>*Z%vda_8{cmSj!Sf9+vypSavH$OxeHA4NL9VOn?Z zK3XpCGwt{fR)$S5;^MB*A0B2L$nJt5{H`-=PD4Z;YR!vBz{u+xuP(6ywJGJcJ2|a| zYL2%0P5$LoR@KT?p3eq9$6Ph)-Ubt|H^1>}H5lH;C;4giRj|!+WeR>PThbih$1=lTlG`6jrlE3l z->9ybWwMkGxQfLR%D+C@tKXY}UAe*1QgOs|x$S?LauY3t@-ue*x&SgUP4cgi1V7%M zG(G$)<&|2GYmmMyzm&)p-bY;e{ewI1QhStKjXvt-Gsdot);T#zlTTvVUqQ@Y^@}rI zv!-vkPre9vIl0w)*$u2alM6HkN{CS1CDzAXGhaCY`>ZA)Y^0|xDIUAU$*YM8>Vigx zpMc5vr&6CJK{=oPo3{!*r9JHKEbX#DXB+iT&T(Ih({kE3^2?5tr6Xy~FrqQX(hcj;zrS;p9G( zl&nlM4cqK8^$2JATh=@}6HB$*m}-eqBwjdp@=e&$tc8B$?uwnydvS1c?`}ns?gu$D zs=pyP_VZR-jjbmHLn`OEYKZ(lD&o4J$Eo9~V&TepdX8Od`KuRKGO}Sy8qJ&6$`kuOelF(y==Te^{Y@i5lACiq zxfM^>-e6QriDXt0q@O>{Jc5dD4r+jlu9BQ4#kDugHOgTz-TUO1O-))&9BM9Epa(N! zr0|Z;HGZA)&~aXxo;%(o@BxDcZ_E)(sCY)SpOBlM=)twu4+QHGopEbj|7}?p17}a4 z+s7Gx+9&T4@^-uWxy?O2`{_DA*Ss^YPR5sp*Hm?^gbRQbwYeOaeX$4qNRmG$v zi+s0x<+O1;T;{Wv#JxV`SLx=+$T=dzE(_lBc2xx=9;^2)lw0-fNn{$g?*7p)_{pie zO+p{Gj-E8qvH33%idbl}7oXFYKl{3VhrjwU1sXpVO8W|aqX=o|6fHee@(~0WqU3qa z8yAG1q6bTq6gOP74GV-rMF9!O`nbr&wk763TqP{|Kamw{B~8oRZ{fYzEDg*rMFru07hW^Hb?jO`ctKA z-j613dnS8{<*uNSLuLY*Jz@cJrd=#nd519ZH4tPGE$u5$nJx_S+`}6WSsP5E+C}cg5N0R~Fr#Y&F(x3iu zwhx2${ngZ-Wg|^B$YcX|9(ZHgdBo#^k6~C9K2yJUJ%UkEqQZAgX zPUF@mJUY@uEyMQGtAzC)Q4>%Jbg+kzFzF6sZW6NH$%MN6&$&B$zA4 zOW7MqzpoCU@I)uWoN|pmYfaWgrXDp$Qj*(;(Qdy_`F+2A=}CH0_L+WL6A)~U5UKL3gZ35^^CNAkPiW(IY21wYDh=+1tv$=F z%b9QfpYziu<(r4`h&k2-SJGx&)pv=q)TG_jxpCk<5jApAZdye==2y@=tyZzjr)M?3 zQ?v7li9`@o%Di=ju1*^hdGr^j<)6X(eUBY`?E zx>LZLidJmy3#IP%n8b%~&fm6Zm3+T4F;-n^2 zJ#|A;&6|Z}K@X)668N2Dwrs<6n@&tTI-veVwTsXq(~2Tu>~-`)d>+?*zOs_0Lg(1| z#Gq$g!e2v2)ph~>i*IeTYZuirV-l~MPX|k)kqjk;6_kS_U+JcP;GlZO*ILd^Cx(U% z1ev9(YJQW`Z*L`*+x;MuhUV);$%W+Yqp9p}8^2r>hFv#lN$W&s(Wd)*xE`IF6_Cck z1wjV5e1(#)7hsr&8yT?AERLwP`;7xwaj9qX`Is2)V#62xVxPlq->^nLG#lIpM<`Ro zcDG&}+mEm1bc(x46m`*0A3pI+^MtN`jv^h9X)5Om*!?sx-M3-X%+Ag4T7Te zzK_GZx{uW9)|Jl+&YKBJ=4jPjfUmqpl5M?=6g%It`gEIkjbU)Qg{#7mf#_M)tMevG z>LI;$v;*g6Y8fSDP2nMXHBF_Qe$;QCpO3E~EvLHeOvyYMCt5p>#rHi?6lM2kFRNvY zk1(uNJ(A@8fI#rUF2)HrAwtB@`>&d$WxUpfaQ)& zET+ey{~jp6ci~P4F_3Fa&FE8?Zl8~gPrcr`ZB^r{A64kFV-wVPms=Qupn{;l8MTe@ zgsq=e?EdC<-=jm6x1CMUzSFBOTM7ssa6mgQdty=!4Z}4tn zwuPL?#GUXYY#C}+8Pviz?M@jDjF=ohK|NQ%q5{6q_>C05R>H$CPXEnS=eWSyA+jy&uXmW>ffQ5rruze6{S(kvO8tsPfKB0j zxc(&-5{-e2wXFErXS>ESwR^qd8`|l;7{Qt}A0=Hm;ZG1`qVRBM%<9wSop`7xUo$e5 zq_-u0VFq_duC0yVb(&w6?&1__OA@;=L2xbz${IARm#()VG~c2`boCfnDyoEB8L&S< z3?r!oLGPV{X^Meu&FIxj_o%k7`d9J`?+!v^xSvRUK~N4shd*7v2RYvw@xp!rA1(Kl zHHv~`SNUAF1nQX-mc;rW`k(9ZO|~pN4rJGhU&5FF^cH}idl*^-%KI$zJ|NU{9U8xp zp1=%SH!oLqO+QI1bcf$uf-H!c`*440sb1-^#VB?*&Jk1w5yuGD7- zH7F{pic<0xW@{%d;%~R9z`G z`U7@BZLOhp%)Uz+T4w2$DigJpy&lxE+O=oEeeoR1%#x^(4IfUyvw6spJacwxeaW7C zmpJsWPps1M1qiyeFqAQbHpCyUc8|I)Y-%LSvoE_Z?Al&cNTuTtEac6%qhGZ`@6Vf( z$J343L|6W`qe#)f*a%7VW(sD538t9l`$58(vqI7j+I3O76uNTUO^o7XW@OB%k#E3^ zoo!6sWLg3L3Jn#?%m$`A{tTG|JXdXT13+KRU$EuJB+EAPzTA~Gjj`L0bfo{OPHZI1 zVq}C&Y}Dfy4HlrE7Y;WP1|iOeOsLg)&ElaKxo#F&fEjTkwH&qIu07iT__0)pfKVDI z!3>%H$Hme##}*#My2iKV_ag02@ctP%3Re$Uxb1cLg{%IbpNBEFRB(Fcl})Iu6{4vuH;TbxVZxD~oL zjnBVT+pCFi#7aJ7E|yb`GbJsnw{)rW)@4?Azv6|}SG|3e`S-WEU)&ht-U8Je;=8Ge zni-)~q``$uN~!K=!gt_8>di|1XRUv#-HxdcVM6%WuBC*vh7^4DS_7LU{57^niC9l2 z=pp`-_go*7aW&hgnX%)ff>uPC zXdGKgyMw34{{pG8pG$_=0qp)u&2mytsUm?!lm6p4^8HVY1I%6AbGo%(cD&2n2@ZIrzIYu12pw#2{Ym{A zfFsbk{?jOd4ER?EbRrShR>`-Q-KY2HSxIy()J=gPh`gdMwO&CavG&?u1sv5g>pV*y zb|6<{g@WXmsZ%3Bh@5wgJ)R#rG8jYXTDh3WI7}E zZLRTHB%}Lul2d2!Oix(o`2_$$why;V2=EC8n--aWT6_RW!WMn1dq??SYE96yT}r1P zc8Hy~khx2C^W)@hX2|{tWk0h?AK&F;oW_VjP^_IX=6PVc=|q4nLKf%ImyXBZjmAYq zj)&)zY<@?1?N(_$9i6=ACZKGdX#c}ipF!KW=z>ek%nuz4eYeR^9meCuc_&6tw+ zd(GBmAs>*v&EmWxYTC!fYZgi&5#Ia?f+m~RoNEy58%IP()QNxW=#O)sjM@Gcg`?VU zynns;f{O$CK)^hXHPld_u6)~{)rPLSnpm7(#Zj^uFyhGjHQ!nyQ@ku&OV*D|xglD> z9F-;YY2SWJ1RhUGNeu>*cH=7y?vRf@NKA3_T_V!b`0FGkFcAW#itAv{{lL5Fwa>qD zhl=IXC5Pyh#I|2o2B5>vd2Dr`sB1~)*Oxo#>2CKQWL}@xY}*&1A|6s_&IJB0mpA2t zyljXmo!+?h2X`$XQ?knoT0+<_ondm0|M&NzItFAt8}{m1P$ zTk-~b{0quIX@qd({r>)gA+{X_5G3FkMtxh;ut8g(1Yp3+2JC}+FmzaaUQ}GEy}fzR zARaeSxu1{sPRX|(jy_Hlk|ixnPs!{GQd?z-9B6Y(wWfEt=r%%$4?Jpe_`$YgeFJ{Z zmwdac698e|Mf%BE`nLC7j8^at^7kze)Hm14Q;9(^g|Tm=)eiMxhlOo{XA!50S*;Gl zTl(b^@F+F$%9(0iKipj~C1$DO?+@TBM!8Z0K~0NpBkXeiz}GInTN`|W`>RCrAM-pt z4Sq@EU-Z8wN)?rX99o>Jd*{}k0FhpL9Vs!XLtU z+v?Eoh01GV z_FS)BGZl@)dkpOYkAEl|TZ-o<<)}A7(2if;1p7V~wKU0epKh^Cy0R3~m-xeabS-bH zLD2B-U&eM$#q0tqOAg%EXm-1WX|r9U5)@C1nOdyv;EnL0Tt3>V#~Q z&PVm#0R!zl`Oba`>|sr-^yzCaE|o5NN(=XZGH*Vyc;M+tgg_ArP5Ma%kh~fpY@F;2!cN!;;k?6L2mt_ zR+;jiNJhtcg+7!4PbHkHCI$km45x2x9)8C>lNb+Z@k6Ysf5&EkR zKlME}NwV@?TxH2G)@4i&M61+<*VIO({P$Gi*=qaZzkjGOzp-(LY;g-559j~B(O*u) zA*I2HDO3-qCguGTOX17WNkwkxe`Z~i67fM=ab|)q`L%YlMIH#PL7vAM=uwB8K1rKo zd3d?NjGL*?0BJWCXzQ}5y(*@w8!s3F_q(V#Ho^xf~9k-&S>=x-4_O zGTzxLt*dnT_TE`nIwZ?#eXHkRmer=WGP9F2Hr$1-VE#$)|7^Ux6z@EX&@x;dA51X~ zinpJ><@<0)w6F5ZWE6HPq}jMepD6NC#S3}zn=~zPQJR)*WPZ-e<}dlHXcCm0^j0Q= z1?1f=s<$7^nw!8>(3XDgqh+`iV9w<-pFNnK|zIlZ9F!nTiOkumovh;B8 z&*xdIQeXPgOqrX@?O9T8u{okNMdwIQ|-rvqJ?Zu%UUE8Jw=sCU|y$O-MkKVq(Oj8~#SC8X76Y@LS zk15qw=Nx`bwpylDE;`rLypz6Z$_Z^hF<#V8rS5-Sa|*ls=5r%d5|xD}4-m%W0d%D@ z^Q_c&0{kWW#BsJTx)g|a#g2zE$sY$Jtj!hj9ZwzC)j#&0bnPe36{YmUlxJSe#_XSV z*7lG|wy-_wAOY9MDW`85)&oz*8NzKAd93Q+8@>lgz$41QR&*kT>f$b}1fi75_EK!< zuRT_3hwq6#PavaY62ZUl&eqj>;N+Ink3GQ7m+y@_A8FsQcSKj)CDXKa{@ty2u##b} zNrh0*ewf^9A8VuDzCP`t=U>;TU}3DsP{=wgfSWbOR5bf+fIVLv`EzoF6k#BNp{#}I z961*?Za=;TOU*Kov9r>?kk}&-H}Mpp4V2+G+XLW^Ux`wNt%ooE+(aAz4&H#IH?%6i ztJr;DuD)Bx-H)#m$pOu`e5jihl~fceLp>Rf%6z=L+WsLwwaKhX%MJvMzALrHWFP=iM!u@>9(5qQgCp@!t}g8Zp`poR9V9p zabGACcjB6VzqW5bX!-ycpcsv~QqVt|alv3a+m%q)4yPKrn7Cg@ypjVkF+_rdMC?vY z)FnvoaxqFT?|gbfJa-?Oa{h5Uh#3cNav#khqkX{6r+R{!O@lncmKk;`<@5y)X$fW& zd*%NYK79GrnF1WYZCyPz$#9bqXo}_)B88)t^_ag~jvtP2u>t^uJ3K=(XV4fT*n+LD z{ogf#%Euc=q3vH9V}b-GZg%mqx)g&Q@`MnKVH4>FEYtCOn{gm%Y@E??$p; zB8%03yxnH$-8xHWs->Jm4o9)FGf`1KH6U2=GUra#85Ud8)p90k@+0Nu?B~nY>hrq` zq6Ps8|AlL6oHhu88Qke(Js=f_uT!74naSh#Mi$pp2?C(Mn_fOyLj3)`NW8M^{r#=` z3PMNvegz9zo>lecQ(QYd0mNP!28I=5FF)TN%nc%|ea22xn|+-=6IruR?I%stws*Kb zteB^Qfk{67s$6!)C4DCK;uvJy5_eobnRV%%1QH&R69J*^T?ToJB2+{I5fqLO+`*J( zWEO3F$bfZRS%~uC`Aajw!H!rKw?B5FSQYCP=Y z#+hjB)&NFDlA`w662`lL4Kg`@)}L?23zDD&c1&>4r8BrmhGm6S0c9;aK(#8|Eps;Q zp(6&FIs@q)99aufcU}}cT_Y?~7x3loEa3831Mc6#Y7L`pdcU_RmH2xuae*^B)Q0ZB zTy`ZtGk>2fifH|Qq9Ml^BdX9`)Ohz`(ohc!&s3Hfr5fa_tWaj&xbf`0QWNvM2jiFl zLaiq$61c~>zWN20IIA5*U$AkX-bSk=l<+V?En=p)HwyY#au)3J(|ipiu9?bKs6kyA z0I|%|@J||uS2<3)oBIgfTxGIQK^s-0M0$qDfehFpQ`(sEET~tJmt;BBVug#ZX3YA_ zkemPhO#N2kCK;-GODP2yYpAw>+y3oP)HSm_oI2^}0Xn`!+q^zPgGiuZt}`cLtZH5g zQY306U4j`8+{pt3wZ42!wY!`{LdKv!WJUUT(zI2=;lop3G<}b*V zu-^14^406wp|YmNmcK*l-Q3YK^lIrs(}2h8Hi_MF_jHA$V6BJ!tAKe$t~>wc(NC$+ z&9zNn`=lrATXn}{4W?@nn&?!J7dwS6Agy@jGoeYqjV4UTf*Y)2=gnhSop+v1Jjo{ZVSF zqO97zOF-9YL2#?kL;e%dIfu6IlKJ87%Eb&ROHY@#cgbtwsv+Nm0T4XqyH@6PT&qv6sTj+kyHPLThc z=jZdT{*!*c*gfK-sfDOUHuT5(AH+`WYU%nh)m`GX;n{Lv(LYu8nP)_QscVi+cPUYH z@9Rh-MP-%xb8qo&%fXF9Y05cq#;cxip8Sw|pD4w0j^4(%yQfQxN#oHw*C74(OTR;r z;%jS#BCR^+F+lU17=B(4gKpD7c6FdLs}YqidP<~3gFxHhP*tbFvb zgb#5NHC%=D)8-Z$X7a7b3i>OiOBD-uSLhuP)ZI*>(Y69$uBu zJpF0WrB_aG0Lbjc^8xegem+6`!E29Y3LHjWT6%5T`0zMN9(z`gQWfzM>oR&quRSwq zn`&Ca#5dO{f&Q>rE zMnnz7jX!g|xE?;WoMPWB%^+RVZ91w&dR!0C+U$alva*|h-$YeVDwSa97yiC!^rI?G zo>Kf}X!pH5vq(F$ccJyFC9yqzY{+3Wv-GBZk1?M-$#hbnK>D6y4OsLh>OenlD2C1S za+Q3b!$!Ak&dV}HT5=>dar{HP%9t*yz~2Z&b97s(;ycc$hsQw^F*&D_>j1iM?(Xl0$vCvF7ay+2T`GZj zUyb|znTTq}dk~bi=#&z4Jz6K_o)%D+CV9^P3WAj9uVeQR6NHKDs&Se5qpn^pp@2G8 zNx#=7>tB*-3v9~ld!ULf`cO{53kZ%Zmq~^ihsi;Z7rXap|8J-+H?fDae;k*?X=RIF zzSj{Xyb&`CB^;6OLgs>vGZ_0RlYzbfafTpqI%DCD?nPM1MY#4Hrkyr3rKj!C`QE!zCS z+`8h878FSkb zhBx8Uf^1>=cY#pqNt32AdeBJTf>3ieC=umqaw9YF*G2!Jh^914Qn(_e@<0eh^2Wcm zB(fPpKhYOf8xVATlCGefvZO9uedK7Jxg0`?WtJ@ck!kbbv`sgTZC0(r~b z05YFd0N#*`v`uKXh#0b}B7$HBe^E3?; z2+EnR%s{WXoyH7N`Tog-wT`4ZfBdjC)@hJtb$pv8lvZ2Yk}%RZvI3OBTsO8U#;VsM zMxdhr4>1GtaeS2vW`0Yay56&6Skf$)6gLPoLjAmSwZ93NSlM`&`sQ@*WA?uP7qOW+ zuY*=4<@UWrxjmVMU?HR=ZU33mId`I+8c^!)u(`ikGLN+ve4)Hpew&^F=4?~`wd29$ zVXb_&?aObjs9Pl+pmJoQLyZ6v_uiH4omiG@U(eseIU5&_vHO_*#6Z{~d(W@EtX6G@ z>g^9YCS*X5MysQes9}%R%&M2|71x0Nt-)u$=mP7g+z851+cWm`1cy9$6X4-jdn+m6 zc(Ci=Q_2_Bafsn*Ci0y93Ws?!IN9@s|5^O9YwtkuWKu?F%#zA=ZbH}$V|)Nyg8mhf(u!>JQx zOTBZRJ+v(BwM-&9SDVE+pLbAe4a{b2xQWG`>AT-QF;^~eND~W;4-B5Mo;imvG+)#5 z+4An$_ozZZ(D`z6%;lHWR2f<2Vrog`sSa;@E~kbmqV0yW(d~R!5J>vgOQLDh+>c1I z67c%Yi%7}zf}N0s%KRx(%F>74UGlXQTc7GZie$o8F<*P(nS8(KPOIB~`R4 zq@=yoax`#&*=&*&CT<$U#p2TQ{r2~btB9Aeq9hzE6JTGy5zkH)KI%_ zr(SDLC7P8(3-0J1mqO0POA%-DPoPnW7Rtl>D-y0b$q=iRyhPug!5s3XAVd9EB0%WX zgL3>rU?=z_RH=-Q9gk}B70zzVZq{HFnd<1q!-9ESdN;`-fz4yp5lX15TdoDh3(^-@ z1F{&hO!p=;>?Xtdh9q&7Us!i+k<BYa7uRM-&K5Wa>~6qQZ0n(D~p_U&H#F^z^Ib~d(&i6;atBgiM5@H{vxTY=q`Sj>YYT&Qv^_=9msFf3L5bGX+ zbI$LEx1Bd#Ae5m${Jd!s3SOm<_GcwY~2P*ORE$? zZ0x_B^BC(X*~3-Uq9rVPTL0dS7=j$vJv>-l5YbpXNBgp9t>R4xN2#RA#Bu+?YD*dH zpk;V4(l2c&Fc2go)jA{DWRHn8Y>axC(6oAxNzhwMaax}9i>)Xy4ptJUFxYr%Z6tGI zJ;l2+!vAL>pq?F}3~4iOT$EGh8x#NKl$g%VvKK%7m@>lfjRvOQ{Z0QsO4dV)5d_5t zBjf(`-V2Wx*Xd6SLSzF=8?GOBa(-u>6u!n91s9Nc<&sMb6Pq3=xT!`|w;VIJ;oD;I7rZXU!wTW9f5e3?DD%{;M^#+r zGJ`YDvV*}ldiaKV`9Aay9R$FADOj|CLQqPKr1KEDwK6#K%}A$AO7dAjf{&_r6{dGZ`;phIySXeBA9-@+@B$i{th_Sm$dBLSlE2# z9XeB+Jp;8xCp`6PnpqrFm0Bt6Oh$ezVB&PX{8%!q=N^YwCt|^m(+5EZUvhW*GPQ%O zwsf2*E_W(Zt-TVf4ywnJ>1 z4>4CJ*58?Q2l+ZF7dnbA-pM|q^@yWL{`HBC{APUeHZ<9dcVPjYAZVLpwIrEmYaulS6Aa5J;6KMPvezCw*-u$v`yIb z{o*Y^W*oKb4zSdpYVTCk>@q#j#kLXhY>vLixZy7kwX*dr>TyOJHF}jVi~7YF_KC= zG2z~ZVz{&5M9=CWs))H_6y0g|dm!CrB-_}B-&=XF6%hBD!GFl`7gRaeJ()@$)J-(z z>i`w=!n4l;15^p;jfF;`{XuKDSQ)=xy`8QLxu1Hnd?@eZJp;e6ckw@aP2boVVP`BU zpwn^o<`%blKRp4_g}eK>~O&I0Q)&b!v;Z zw**^tz{!KUK)1srC`LZ9%5{&A^0T{E0eZNL!K7d~9v|s@E|X{KfM?;Sq1yLvhYkf0<^Czo`Q`4>d^S80- z%MQu8zkly$n}D{|?_#``J5N8ML!X)BXjhJt=H&6H@B1@YJTUIu|H!IdHwriGh3{yO zPdjNgE_qiSJGh!%HHP&ZCZQ?N0N1ZBeZ$d6NFl};vkVesiDQb_<3r!ZGB@0ny3alv zR)&Q0yZl#v{Od9U|8!m&Df!sd2KUWnu{CkUBcz~tCo}*naDmGg69r?m#dX~?zN^Kv zvzt6GA5pBOFk1WFB%iR`Njc8)y*lC!%{?QC`@rosPfC(3wuc(Tms8ir1H7&JaWk0m z*p=3T*Ak`wYMaH0zm@Dc^vK0t+x%Uje~9zzMOXPBn$Gz-u7(Z6Z`-sQ zV_S`F+c}MG+s4L5W7{@2w)^FmZ)X33vvX$d^E~%;J@wp`9nLwrkLn(HKFonuQh@FT z*-7n|Q##qfN~SM}_Rzg*@3d;aCrY6*2%XC~Cvs&F0Yki7y7%u^B#F#13M^w~gbK{= z^O|rab8k5*t?MnQT85psbe;=Ha@_EFv@?ZxLrdrjqM+Fl$M7TC;}eJo2}=d~xl~7H zzQa}NCj+-?7Y@Ju3e(Drwr#GL`!HhJSF*n~eeA59?TdHs@LEM?(G+K-FJ~G)DZ&eQ z=7btcEbr4Iy6T}wP0)9FGK>_oj~9A~czV$Nb&n`-GK%>$JxA`8eKFMmK%#R zns;g@cwtuyTcow!NPk;AjfL0zD8Lkob3)a?=4}`}i~)Y$O{_k!ghXu(uCIZ>rt|~% zXR}XEj+<0c#gk-3%zQwKNZiBzTi_P{R!@4&9o|U?ebg`Lzc06|+}VM+=dt%;vH{yi zV}waII@3jLl!Z|;QH1e`WhD^ip3KEe;&NvqqAd9>`5d7^ck-lL#T{+J$b-T_d21qs zPh@e%QssvgE2CD$S#y$+MG5`4+|^{pOnHH1;(%$hASN?Hz8((>t&9k)){giwR%p` z6GEEaWn!z@?309+C} zpD=bYG=84>j{+lu2eh!>4ne7h`+5}r*??%Xv;H*vbzOP5(%z(8i!weQ-kW%0k7pdk zvz*t=Us+EJ9%RrkLMMx`e+Z`6LpirU{)UG*B z5;PLonaAs8PCzhhBD}6u58quWtEWSC5?G25R5z~0Ljdfn;;CXs`+Fpmpyy`~g2PyY zm-$1Y+35LqOPrTm)_E4alJ!>nziPFL;J6{BO9qCEk#&_!7R-Oz#x<_J2%S6Rw{8X$ zM)0Xbm6?ARir-wyc~lBg$a?X@-v`{!r9~;dgehOAbOV=sE^3Y4#k#jY*JHW+nWk&PX*Yl_$ z7u7bFyA@an!9Ti}Y+=Ra!@jI>4s z(H=qm`j6HLR9sc>v~REX9k@JKD$)JEWKPZWVCgYmW7OKSHL0LKeAlpEr>9Uf{Qbm= zM3t(=5JA_)J!<)l5<@1_5&z0n+>~b)o&G0fomAJ@%KRa|Bk{z--{go5)4pQOv^8h^ zR#c#MD6!pr)=p9p@%ECDgKpCyvhX<{v2(v5Kt>qk{g=}EABYxT9oxwxC-G3&r=dNg z4e66m-@uLQR^jI3O|bHxrG6B?fGF=7Xm}uHkz@16rq)HbKp|5~mGsOBh=vI+_$0CN5Xe>6w+{)I#qGGx;L_AkWKE z=lvv)iDT6R%pB^8Z01hOj**OV^*cz0$73aE+)0@W(yB8%=nnGA6|AEhPLK-t-@sd4 zYaUJB)Q+0k?H-O2ntKmjp3j8#jmXy@$GjL%F5=V}3UUv-^5tV=49l(H9_sQ<#TePB*aR?vw=#SdTIQ&S{rp7(4$C}ON>(9l#4xUhryJ4)ifXq zZTHQiU0x~-DeOGNbryNawQWyw3qb3AUr~16(fz$cN}VD+cocnS9q8VbntqfbVs(6= z!)hjCzC^F%G{}v-Jl=$<_Ku*rU_(+SHh)>?MXHem0^9YPGJCPVc3iWK`wV+4KPPwc zi9T|DziUbagPRY0F0Ogyp3PQMvYoal_$Jax<~-HXe`do^YTwVC*Nahd0o!|vDN4=m zC#jrbICxH3mbYlWgB+VR_3IqH=utv zSN&KoJZsdI9K3Iaz*v}vYuWtDofQ4Vnfc*VOUt;_KwwwVAHPL7!y?mJKR2E+qK>mZ z;p=j082WWVmA8dvzSMExl(nM!*K_Sjoc;p8IUP$L#WBe=w8CHDYK6SW< z9HbjP*~~@X`>u74#8gndrEmSD=f-u)>SGJPR%<3~+uq2NpDoF=~S4-V4gp;)*x^?wW z6CuXzZr2a@iOM6*Oq#j9DS?Ztco>8g&LnXWV`P5-?@+M}rxfh(ISlO+s$#cv4VVbsf5la_WtLb|w& zKCNgxE?*N?m3+dd1poQ|#*!~lsa~8v&?T+Ec$Y4#x&3b5u6tFI+1tm1N!`n4fNHmHe=&O% zPtk#9m%o1Y8j+um&}cXynktGXgCltcyJ{f*?b?^G>-!WxC!d=sf#xXg+aWK?dGJ~X z5J(ZY3UHkH(06G(%u~NQz*2Lt;VyNDPgU2sSJy>vAa$vXjzA|bM!0yA%lTBd^$JXq zDTAq+MRH&AKBwkO_2*<&^K=7NO940M<<|VjCf+(bqdgY6szr9XmRVVxau8Oz6=&?5Tm8|9oDzXtN%$pS zBDVUW!OYW=zQ}8^wpRJuqt|vL&c{h12)vcpPto8?Gu(?xov@I{V>a^aI&Y9auFeu& zX6^jSfrjXZzFQfjpm67=XlxiSw30|o%WEAqm3RmZ*z34S3XEu7y2u~!XQNkcQX)-tY1Y`hCf>O# zlAT=6*d*|25O9K{c`AZaSS>4nprh)r@0Pb5oFKZ(9Nwbor(;hjp>5ULPb5931LbD* zsN~9Kujc5+gC?#N&w_+_4Qk+47+z~IgmTZz#@Plr{>J-P{7sLCir&Qt?lwD6mcq58 z>iM)%y3wqgvV8dxE7n0s;H4Yc$+jkel3eisFJjnw*9!u-=Ey;qT)(&qGz=BL$_BbD z>05ZL1n^&*20CYg{ff=?a?5z7_Ld~xha1C57s(DQZMkiWyJuhMPk@91Ag;y31_wuq zLLu(gMc5so-4gVr27}*Y;$O3k`%GwYAwknW%Aak{j;CkP&qx13$tC#;@%2@P$W+qV zne`v?Ir$~oxss>kBRg+k^xSo-mQY+qOqQ*kmiw4-RN5tkt9lAZINiK;40LU(zwjAT z21DnnMDOCRk;zVbO-mFs%-Y6k%gPy~t4E6JjHYKq@pjG!nMZzqSfw=Dm8VH{m+$B8 zcH10{kxMp}?C}9TQ`XM6>+8BB{FsRQ-W&G|+Q--$e&@4K39`Dbc1=!GOCYd;F+sEd z2R>af26{R96j62pfff!R$Il@k=j*@+(uVf(+o~M0bPiEJ@?j>fL#>rw{%V?+JCjx? z&cjB}Bb#%`we%%@?6S|{lCJcBf8lCshZMWvU{qQz@5E7EM<6F^!;HL|Q@#w`we zn{#8kPg@2Jon%Zz*h9RyeBSqUW9#0ITmB0r?5?|fDTmPx|&h^8RqEv{c$=;2523CHOo_hq6$kkct z(+7U!1*i5anWJ+1_W=jhz$F1}(+jmx4GK>D`Jjz;Qd{$3ISp-AG5!!P6V0cYUw@BW z8gIglJ3hdU-rPVprJ65OmUmM%TWz%~sSM%L>)&JD=V6;gg!gj&>27P46tVrDOV;fQs`V87j06Lk_*;e~M$W z>8$k%`Fgrt*@}^^o(lOf%TNKjP50NQ-uu=YGnO2%*$S{_u#*1IWhujHtvB^mcLHIP zC~l(#(g`awwmZt5qY5dqj}JD>h44`9)zR})CCP4=D1m5wKZlPLt2WSu?0A^l-`f1k zTvhzclhLCwtV8T9i4RLsv4P%~N`Lgk>A@WJM~Zg+ml>FWUD*r~_rz zvuY-No=dlesVMP|K5$Fy3%4B>;N~%BC#E=L4)jdInV#+AV~f(-C&3w)b6geay3nKh z=c5yruE22V!DoeSYI%%1qvTK;B3s!1ajNX+-j0$EjT`ISJ(_&Vxaz0jZbz=Rjw_bu zxXRcg!;q@C6?op5q~0?cTHNC_sA8$R^HzuO-Lq&(sOw^xY{99TzEm0a4h-Td^!QqX z0MdBB(|)hKm6j3q?Xt&<^J=Bq3I8yZT%PrK=ef_AvQFEr7-s>cql{KArefNVdEgak zNA)JJ*xEb3-BR>FJ`RII8IY67VH0QOQ1&>5^<8^QEt-dx;K@9SDL0I+_ieUb?Mh^; z7nVm3ekjI>##*1hBwa$(Q*PsY_}Nqd1l2N^NAk-(69K<__h5bo6&Z2_y{e<93HJs}u=dAaQ5!|5B@aJ10bXpe7G*@`6rW+qDN z92U+-C6kARiU{PMevzB43xn~AM!3l}x>ZUf(f3_=goRg~$}d}U^IL0|z?A}UXu6)3 zXE%D3_scY|5qv2r`V0Cl8PCYKB{;@Rezj@yTIACUuEj2C5Bx9B;)?~dYk}T!)+f9g z54JjY;{U2SKf@mfvyc`R$F9UG7QE$Sxd4Z?AB4QZ={slJXFxF(Wf|syjba>YfNW^= zB^B18rw)ovI_0PG6+MzVD3Ka~8g&n}1t4eM5MAi%bt_Dob$h6nA|0M}q-@aZ4=*Gu*fe0@l9n|4K3=HNKNgpTTj9%JBhI-|*Qn`0?OK z5@JUDw$_~-s3(!11Y6(ZXVfn;WMrevb`Y=AixEa@STja;QCW zYRb%kslTvVDv47&9C6(8p~pT;Qg%@%XmB#>h5_t@h`yKapd3fIiCs|C`qiKrjW8SB z^!E2t#MN^!NbSL2A_K_aD|p(oJ75NEkU~78`ft5#W1nWNKD*VkjS%B)MM5YcpWLi@ z^n7I`*JB6z)`ZlqNj~o^=L$C$b}?1{#mF~(aMeZywNG2&jOtOuJLd0xU#@f*M}zNf zMv(N6J#Fe~RU~ilmsl|Ob_v|3Id;HRaO;Eo|VU&-OpS|wm| zGp92`ih9CGBEC~amK~GaYJ+Ga;WsBE`8GUWFAsN)BN7TMhWtV}2x4xeCw1ELkt<~c z#=&e1W$i zG|}w?dVMnKVTG-kZ}nCUT9Wxtl@J)2${eGvKIuzB2&{LH7qs7*(6m^7Pm_|;Ec;dmn3tw3T8bA= z=XUomPt6eUSkuh(8E^8*XAqb5CbI%&um3{9d!zC&b=DEN@(tbh7No8&{VOQGw^P4d{O*jmTKo)AgHOVF-7F9@)tcAaYUUq1u zw7(V1FE^%=K=z(@WuGyv(A(e1yKA#{17h43Q%?uZ`<|{xBFZjD>>-?;XZ>7{dODKu z`$8UoK?`c_fx|##ArVjc7&9vW@N8Srs zbEfI@>bQ45EUMOxNUt{xa@`zn>RLY)Sci;}eh?Z>CV#etw9=!QXt6L=n&8DonZAdu9Mh?nQ3ehCD6h+q98>CoQviVD9f~9% zY#6Sx*B-{AeC16>5{*$wRfQ+2hYo6{ENU``aNl~Sw!365;nH=?%Mz$!VWHv4xC+*a zn%>H;Ht?9JbI+^E{8Y9R`Ds>wH=*Du%9?05Sv!lm_=359YDZVzO}&O(WZJ?G0vlSw zOw6RD$S$puHtfH45GQ$v!~#f&g$D3oCa73b;x8R`Z>8%!EuuO1`cM+7W%|4+ z?PQWT+&RQktMG!7O!zc(9KEfx60}&26jW9er(2%KWKg8^PKP+P36Y)KyOKhrc5J0VO1<}^i3~bpzE0J!4&tmX_2JH!%L>-L|Vg@nZmQnOA3qqDW@?W;dN zcu8DKFZ-RhE`k90xAz-af5D5i9O|A$)!MRj^>h=sGqY|#Kv|wAT)|%hg8GGZ_P2)Y zVLmNwxEask!}rpm-sXTc3>fQ%4RxLoTq}z-nxo<5(0c7A3)@D&qxJ+n$4WE`&9UYo z#90OPFR0lTkz>`OcxY7+dM^aVU}y!1+A5GZt6|~OiaAw$exm55Q^fw?JcYFkbj#*| zy;+(JB;qkKn94?iy%Kird?mRZ-_9|wgGxZy-k#2;2`>kcM z*!+=$pJO?0WSAHN9sF*3Yz%vejgig(gZh-WI-NF7}-O|ACw_h}uCG>XzY-1YgFEbW2TxOHKs8rA|kgf;?J)4!pYky`kg6v9pv>2mF z5G@I_vHD0xB*KuI8lLnL>YVdKS6TKl0Tj4yiB-cSnJYGcLvjpX_NV&7nBY3kr{zOC zfS9V%Mu1NGm4hwx&!sUyCX^ffWnK8ecQIh73sI`T!aho7*VmZ|5z%rPM9WM-A*=AR z9TXfGl_+RV$}07Qa2~olK^7FDaix+sh$$$4Dep0lXZF+ zcwc|urq_!%LpmYc==#ZD$4}Vqv!UPN*v9^AFOD_ajU-%3x_F0;w8_5)F+n^aNJVNz z4rNdu4XKBJcBP~DNz{1Tec-56&`~$>AkuVX z8qUpNo3%C&?rqZiPh>dV@$)oN%n{JtUYt!Cx2J1~L3G1;rOpVT6grigGJOvlFQhi- zx+h*wF;**mNK*4SNV_Z!d(1VT0vDzF!xidtE~X58N4_}2Gwj1@_Ki!n{LmC1cFb7nm9UvT4ey&r)@bUGGV z69s%tiQLBZPq*Q;&m7sTJNq}Un$J@Sw;Rj@qJ_ssg=a$|#Wdf(skp!uiVY4g)mzCE zFgCWyCsn#tp1sl|5XohKx(E_tVhLiXfvrvR7H%!kjLXQjw}bY;_m@b6d?pm9=8m zj`WX;D$yi-@x6l@HXzfOk1z}_HU0ggf&Jn$X%VGn8n3BzySLhI$(6W{KJuAtaVHO} z2%nx25lG;(9{7n8Mokp1Z9jn9DsFjG2FvJ-uRgcAtc7IUnaZJV_LgW94&v^D*NcTe z4ccYs*qvo&2U!V1Qt9vsc|DfVOz4r7Yc8F*++2;2w!$>GvnfwEW&ROAI zJ>%d~08TtkMYI8x%v$LAPACa$B=Svz=$F_` zKUjHse2wvIfIYnatU1RoR13x+iUUj6UXsb9yIw)XhR?t_5*tpMovP>d_&+CPlMqcfyWV*B0n!e^jh(Yzs5b zdP?@x(a<_zawv~9B9-_{mT&>4xUrDI27#e-9ibxx{ePv*ja&E@;1ULwy!U%eQjb8~ z^knsHJuD*L0s(7B_aYrAX6da(AX*|X+T*030UBn=8UjD-P}sg<48pmF?=83EmeOk4~ zO|g38%ZC*E47VT|tW7J%)(BfX=}A|5>dyhW8cRyv1;$JRIj@>J0^}Zbg+>2D@~^%O z+9k4PO%j`z8_J&vZfEz*UEYX$$(oji1&}ewLI*0MYBVCX9@1Udo5Fg=8Uex>>>>Y-QQG~{gE4_Q1nhx}=q+)e&i+tpXbAi?yAX@$P z@Koo4k&yhPF)>J7wTjJdtDUOP+FE|MRwhY)r@f(ULTwwvs%P;J_Dm>ZMcDAg=^??s zJscLxLG)A8ki6<(c+p|FDu8~c%IZ#qzE~dXC$V^ZE6(TQ;m*BX{GMoPr-dhV$6A|a zZBlC!R?-2{@oK698p=g8a0ND>v#iH0=$XzHFwbemS|K zxZt>N>?PD$-gLBEyxUKzNWuJPV?`QJ+hsFj&cPt+i-gh_XwCW1Tj zta7Cv`8EE&z`{B7PG-ii%g8z$v79UT<18D>T`r&s$@b@Z(3Hu$$? zxu_uU^c3O0auVwrfVgk_0C&5re@2}^z-}$~L;%xcXtHEx%60-$#bKM~oZppUCmRFZA(!VtON% zdTWP`A0f3CFQ?{OY0J=C&BLYCZ_!;UeuCaN)5}+DrtP;Ez}znp`uL0}!%_1tsLMhe ze6wiWC}medZP6}Yj~1*CnfB?@^Iy!xc#&UQdp~3BB(8Y=Z~B+M815-*SR&>iY5hxg z>j&st!=8qUKJz(hd%`|eBXU4DPxpJP;lb%OL)eqVVe&V}rb zIi$X76Rw$1AmAfoUBQv^@U@%&tj`A5+W8lTLG|vl0=3)XKY2MWjuDx++s^qN4DX7OaBXuH$K+1V$}PI z*GfM83}e0aUDwj&7{4h64*0~&jx`EgBfQwj3NvSq=l+;TG%|c*k2T}y?I_5tu6na6Ik$+ zMbrGtv`*A-Z;G?D$ZyIZr>F}W^J8P2XFlmly7Bwn3*GbNS=Ct*oN$z{j&83=xi}e8 z8=ak*ggTwtKL{}sn0hVUAWuZXhcA|^2mA^@O?2nzRTW`aS-yIUIb8u20;4&voh`c} zE3&I}qkR_|`tpb@)}+?x_O_t$#$> z^{bwX8r;Xkrhv5`JY8o0)ip~<$?^}=hChaoT)sogs3(DnLVat6fw7a(fs{`_Me$Di zaeF$%d9y5`v*nxBKP2FAE5vN#Nxb%5Pbpj|wa}AI9ZYJ1Dr#rcqsgO~P!?>TCmqAn zZ+mCSKUHgXhwYr<^oFw_XB6^ITcT6X`~-h>_7Kqtv#&QBjb>=aDSGBy{^1FF;*Bu2 zlJ^BOzWO>uH~8a&UTlsUQBu~c_TIMEpDsI4u-|9sx&0PTNP)F?nl8%aIwif3Xa=#r zzr)y|7>xX<{X2KHm*jnGv06S zwmEA#SkZ^>8^pQ9mX@J4@lia>>iw8#mbWX&WQKk`#dHT z#LA^650;+10op|8^biDmO$YhEWjl3xv>q(luYJBA+5Ag0T01)~Q&oo?lM{pNt9EaB z>OrpK?F6=92$ zUHj~!h;BG%Og6EIt2}%T_a?=#T2{gWPEqJb;>(R6FrnsEMvI@<-e+O+B;o2TcVS)~ zj(3>3JkBST7CpInb)*~-whT=0+UGrRDWgqa4M`F}M-Ak0i2B^RA8K#aDuoIb#!Orr zm4|aLeD0Tw=0=00aC099+?;sx&wY#?Y4|^CgZzp5wV;gge1@K^O`QTn76U7D7OK^h zZ)`EZl4fi?-Kq6VO?LKc|IR-U*afuCFSrV-}>!)uk|@3#$yU)1#^2r(B)CUBil*^ul8_1GSI-7TlXE+mlA*-N7B5vX9(QWNEf z^YGpoP~dTD=vWdwv3M^qdGVs91fDm2P5%y5u8-?SKVP474XUYUbX}ZfdXCO_(%@@2 znT$yrg#L;OA>ij_DLv@|(ORA590xZj)X>jSJ6S}cl4W1W5AZ)G@#7DQ9-uUbY12m~ z&jnqY1#+7r$+BF{zLs)^t>*QJOI#%CIbqJCn)6f+AWrc)DY6#e<{;s*Pmp5ZII;kQ zqvFk$v#YQfK^VBrqYtlA-Xd z1TX2^@Y(^!7TI*qNP*1S2nRw$BcvUVU>g|6Tw|+L(*_}23H#Fz`aSYu?gE6QnmpL1 zipFX5Kb48d{JiZFD>BQp(B*1f$I($uX=PHZmdkSVfic?xbetL`QNl_77c1aK4p*TJ zZKdQ@=TLaWKQx%1)s=rZ2CI4wHq>@+q34}Y6+K#k0#z$F#8Kt3%-6heb8p0v#^m%6 z1qX6RJlvt4XWM=|>&(SRW9g{QVr`%{xU+_fr=~Bdpw^_#xk@@7PET+;Btw|x zWcazcPQlcai+g0WSyr>*3bnlia0l!8dGYjXSURJ|av zb?fmOU(GjT{o|C2LpdzxcU02*4@@U#lOg$&+tVf3{5CThXw=ofxIyqAQ=9D5i4Jd0 z559VKU#I0EFSy(1k_kkao-c$p@sVP*$m4i9+Z)}mu!7tkk8DoJveC8d1OI8u-^}6R zPf^u=`EO~u;Rhr#8e8c|9*E=VFf6La{$24l1`E;C>Bt6oeRw4?Zy=ipx)&<2kIW_ZQ;i-?$ z1o1aZ=$rB#qX*(_Yrzfdq0m>E)d6NN{pmWgM;u-r3mG}q5}GW;y{kbLZacymRE*=G z30-cyG_2uu4TXxIAn*>7%Win7{@06kl4)VX7+OTp$^n;+^0u;iwwH(5A*xyxL73iu z3HUcgC1;1Mq8Yn$(%4Oi^0Jk}O6)ch-7!QJ6603JVVnbR>q?R7FaM%>y}OgSf=psypH6pfl83`29ir0N50z{YU{P(^zi8CE&iSW=i7w9 z)|+k&QD(%O8X07hMNm#+SD1-BS%&A%BquC70rg53qHCcPd{nm4(dKcsR+`90-1Wpm zBfJ0lw$uyY@mGjl~q$F{FWqh_cv;+ z7kK)0@oVj@DUV$0mqUf)x~XDY(7mcGqUG4rq-rOe3Y@HFZLWb$WRYD8YFsO#rWr!6 zgd0AJPMVN-Vr!dC8g6*JTp|r*2UE-U?h_ZuAlWDtW&(A8TayL4t;g~bU?7wGb4?mr zQ}PVX^|GT?Ry_fx_=UHFO-1B)Rat+u3qXeD789E;A{hlqW-Vjd+{?00_(!mhjKH_V?=}fU{sMmPz}*(h zT4%T($X~%0L#cr<)UUTC1|R!AS() zKVau8Ct%qT12pHT?A!y)6F@#^mr#!$dg>68u^T3AeUXVkoQXYvru z)xIjc^h+7J0xCyL-`UDh{bxB_Wl1DR{@LK;a*JRs70WlI@;T_5=UjQ*D#F)-npE6n ze|6{~Hr>b+Vp-^sv!0YKxQ$fQ7Roj?2aux3#Q7kJYT3u{b=emWcV)W)J2hR5SS#zVSxKBA%3Qct<-2umUTxlbzNS#=4(HWXThx^QAGJ zTZ#6?nbTJ+7s6;UifTgIIdL~Tj3;&(_WD9wubFNcT3gdt;Xt0~D`=ow)+tdPnWZhr z{MnRjrRKQRU$W=GxAP}ZuNPS(5v&L?y&A|EATYWhO>51OIKojKp7{|?xZ#<9(EH)$ z@@Y%@!f{0S0~hdD(u=7_*$${!*pusQkIkNN9{>$f|y2ei{Iho+-cJDEQsf=vBV) zUjo~GV~07zroL!uL~GaM;yKoXv2=EV$_L~y;A6dDN5Q#A@4X+5DisILwl!fYsY@f< z{BAe>nP=yLK?0n9%|a!t(PcG(5i)VSFVf()^q<0s>mR(Oua%i1qXmc;vGUAO_Z~~? zTy!-W&EUtR3eaId0} zxX+5F7z3GFdEu|iPm&o0feHCtf97fr zw(Iu(G&(!l(TJ(3Zp$2XU4pA(tUe_y{6+Jf4rhD2-4>Xb(u;JOThc@D=n57v8XHi6 z2ApIsdG0#WpEVbX+?S`Pb3i%xRWI9`k1Jg63+4xTOiZ3no2w^wJ#noU$xnomuTz!W z=hQaEI;PsmI41C>gzdT&=d~e%v=+t;kTPnB~GDKNwJhxU_d`WI!Vr<4wwIwo-OueX+so%_*w8dF1fE?q1)k2fCa`R!RvK!LE=JqT=j-D#;!tU{&Z^ej1(kfH5O zFrM6KY9%-*=j7P?V)#bi!jNHk$YvM$m8zK5(w9UJ!KtzrZ4MYN`#rc{$%2UU-a{qv~^A=O-OpzgzH+M(R-q zH&r+5yZ!evH3%w^^;8*2ln z3JJ8IyFZ__1X%r6%R6sZ(^$sI&u=GR%R+%a4&lwuOd!u}P?Jt)f+W$n%rjTj7)-3o zEg&>@X`XWBzhI(7l2cb?4SEx9G7fa?y-HCJoXgE$wX9dd^m%u|G&-(TdppVx$fl#T z-d?&Z8SR0xtTGPE&Z|O?+#jL4eK5tm(`!T$w_CqAc)7xSf5FPV`~1Uk>zLbAMzSH$ z9(EI?Oy_J`4rGQ59ZS~IUvUu;vJoUm1Q7vX#$4Wr>#QNo``g^KqK7j@7de9sERBBY zs6ldCP+(^I=TX}G)A`gDAvFfxsz|$fL^25iBwvyl;<|^3 z!2JGN7=GqOu=C)G1!x%V9V<)gJ|etbSeSkmj;P?mrg%n4*DBQ!mfPR(|J zz+>kk)jI8a6#K&wYojcJZ4&sK7v*k5PHp*C$ODh+@EDvm(}EV>$g(CMKnVZT?aghD zox#rCB_}9?&>YCrJK$L0Z7vGvN+tsh0uudJw~%`vm`?ejdr}%M*Z5Q7l2#_5 z_4U_$48>D%*91L%-OvAQc|c&iKWUc^LbZUs`ej1>Tuya|94yj(HRTKKQ?mhP0G_0> zLeE44-46;8%hW%J1EH)*(nW#SHcRsi?_Gda4WoJ!C3onFqJKw&&ppqf|su?|0$;`EC<}WD%Yo@AhxG$wug`F+kjKA(z)^^}e)`vr1$u zHagPb4Atjyir9PE*E>FmXn~IWVzhnp?H6S=S#ZrbB#{E%v7NF3TuxyGhgF!568^VT zmggAQk(b3{$9)vxp8XOBErNwG4`0ailyn=X^nMNwe+vA)!M}>J!AqLw>H*OXD70<2 z$?}Xss{?=j+4hv&`Yh88@icE$1UtC)DM}5;!w`$XVCVfH*^(9&5+ySxS6%?oF6WK> z5njf;=GD$wj*s0J7HuUaVjd zlxR#@voAKH5$C^+Bap>Q3$^Dx&LgS>hsg13i^OY!O}#O6KE_k9{w%0IhvZ%VcmE{G zec~u@E`F<1=6WO^LfOBMTLtqq0?ETDlcJzSZK#YKwLCr|U)^a6vAd#9GB#dKeUq6f<}3}yDQhH`S7!*f~( z#2yFceon4^KhIr=*vr5qkYn8`Di=evqmfOAe&*%h_zgrRnZ88G1U95{N*@B&xq%6a z3@V8M{{?64tW*~uN=h^n{kn)PBsCVlE=ne9=-tD0q)lXhQ-l+ZMY_c`paKVD?}?hw zgTPZ*e3kfdyx|Jw3VwGTX$i!x%L3&A8`*)|dHcr73N;=Z_QLa-&y0w-V^Z-Hjc#9J z@Qz8_b6sF`V*X=+`wJ%&t@BB3&KB&{yY7k8_!WI)$-k(WcSnaJSyPg$$WXGh^l(WS z`zkWagJ@N$H-BUjThxkiB7XZ;>s6R0*V=Ku)n3-#Yl0k?GV)_Tu95LQ@v@ODUh@Ax zDW5MUsB1-;j}D6>1va3{A_IdUGG-aAAC!$Z4;~?XGb=i=G{E=rG0|rL32EZt1F|zR zbvezK%6TwcMT0pDg56dcLY*&Yl^SM`KZvcYzSr}8oZ;y>N|`}#$dN-nPn{)C6=E&E z5Ja@h>RuLZ&uT>B-x)N+QP&_SLGr4#b1*G54QTRaJR0hMgZ%gkCl2 z(@t4~vkQKmA@cEQ!h-5^YnJK1MIFu$(Jf1Ur6V(r_{!|rj%$P|fhsXT)Ms`2SaSP{ zDt@t`)G zJ7g${!oAM1&eh_~`|&+jokY>&ukx`?vfnoYtOdW*d23G5VF2~d`Q6+7Dg9BWMyJ-- zjU%GeolYM8Mwrt-!+9isw4P?iL|V}KjY9ZlflG00A?aizCR2oN@q>#Ik8gr$Hag7rymBuPbN&qv)yv+S;OQksZl5kG1Ia5W*v=H~E&?acP9 z*vv){N2gFI;yuo!W7&on|LjiZ6YaI=j8^wcR1#y)vtuU`D5SIWk(d4bj|MOSDJ;E3 zs*l*DM#O<361O6?xDAagK45>jC4=hP*SyVOmr|d^%ZvQXEd{S;cc)C6{Z&Wl$r@bM zLmGVGN`Gq66@OtteMuljbIQS52KBb~sN6-e^dbogc=*0Gn-jD1wmVW-7cYR$d@<5g z%`CRteukgbPOb?n7gqDS^wshrG&cbbY@fEFP~+4Fr%rpy)%%s;+Qp@Ba5wg|*9ehed`d zB(t+eqkeqT{JbWxjHEn>ExGYbCv2>xhg@{TG?@E+_&@oy_+(;eo>}d4xqhgOr7krI zCA_trH$oss{OedOflJYJNl}ueURppL0%4LeB~AoB4YXhl~<%*9YO%16Jsm$d&HfiRL zjnhI>h@e$T=M2~>O&cTnCxr_(@_oez@;*Fh`3Y5&B0y(`Z=@h5hTnZBNEafg#e9`j zbp|w9GVli!mt4l#nvHwi`(`A@;*j5Wr5mJZl; z4$o`GEh}!XjQ$(}3*kuSSN^(*y^L@(GvTo-4o!BwcJBZR#?Mzvo1&Pz;O3ELfl^%O zWg5Rn?OGqQ02@$bMc8?2rI`;#jGIpR`%Z3z{AN7lknq2JdvwQ4Vwp%0sLdwj_)M!> z99j8ukUIPKX*Pfi=esg(`H#;sIQ3s9W{!gVY>#~0G`DEN7M*;CY_V6v87`dm&i?ok z1w!r4zYE?I$*aZChkrME8{^GEgUH>(G{7mR zj?!Ed?unrLr2^RteBlr|!I?pvpm$rebaNunN=a>pH$LAVis&>;{T%z}vh@#gYv-*o$g3^8%m9-Vsa>8h*2S}8g$ z@S`uA;s`DtVvk_-`eik3j1wct&+UOjDAAt(qbOkOPAvDQXq;&2HWC#TyA=+cq|{f( z$D=gI?M?$Y7+TRiWtv_FsGPI5e4L79hR^h7Y=)j=#$79hebN0~s!rreaqovE)jXHI z(9ZA&S5O*TWhH5Nq2qjNZC8K?Cq_uSA`~==_(?)0(d^b;v!CEl2%%$y*Zp(VmjFo` zSP|wt(@ZN;vnPE3*03Fmd-a8=5R^9`sfEJf2M{Z&Iqn+2N0K;`l{v`2JqhU>xCkP6 z;F@?F%)xBB^fvTB^Yak*9-jxzR@|jEWM4;8wrcPo`o28YetG2ZcJ}j3X=pX=4AnOR z4^m(!qI4rPs+Y1gBfDrVI_|K1tDH4Yae7aC%M&ZyZfR&e3MpFuV!t^JK12;F>6s@s zp%gG*b1m8U5|;~TMNI-=LkklF)X@n-%DN`>Go9Ou+WICm(64PE3yA z(G>P50Ndo6%wDCa4dycV>^MS&uW$=uaw3Rer3O~d$WNl&3W2^@?@ol^{G;?3;L_TM`|isDY>0FK5R$K zickhl%2;MF77uCK|7QFz)NbC?4)L}e28;}e#s#ryAk?wmIZF)6T_Gk!c@jmOao3tp zVPyZPBaaTHe)?t5;omcC-U0uqNc@S%zG2Ry12J{pTSZ@*PB!TR5lQoX_AbyC4kz8H z3C&|Muudqk-Q0EF_KaI|kl;v^JxVti7V}Rv?bVvmz=)FKwKy3X28>`U?|br&D3N#_ z+K!$hdP_XL5wNxQl&LM5q!57$TsoW63=c9h{EFFidrHDHL|PQhG|$BPM-m!@$~ALy z#Z!DShJ{)us&Qq3M0MgB?e3U zDx{1lD(`Jd;bnSNAAH7jZYp%YR#L}YoP?dCcAu(|W9pE9+6pyCd2d+FW_7hbbev4@ zCxNTutCxerAp|0G!=pu$Mpg1D`yxo@00XbT54NKOcD&Hy(V0#o^U0b?m*_yJ3J=vm z>Gx2f2Pc5kUop1P-`f~kTHj}nm=CvSY!l=EAx##?5n!ONLL$a#E?&@Fy!6Uk zo%=oajdHQ*`@r1e*DO?=`}G)ix#G@slYuSMr!`p%iNpgEasFD$PlNVowwPmk?kT$= z8{w@!!N+gVrw6=$;fThqbx9zm{O(gsuF=?l5=^S321-w`G^dO#icXKVVLQp%^iQ20 zC-Zd{M}1}|L%sn2AG?f==q@+05%f;$c;=GuD1Z>cu)>(s>mu4`5ED+sf5hAT7w7k< zqq9yne~6n|O%>eAwod1{q#!ZzX@7%$rwzW#Z_~v={p}1!=WUK7SZ8T17t78x<%>NV z&eBnGuS^F)Oy1ibPWa-IP-_}0i0-5?E=FV{#%JO$k|Xx8S{c`@f#J=}li>58f_@%W zvef*7*s(E0T#h)Z3U(t`Cj`h!S_4hnVmlhe`g0K! z%(t^{I&%HnQ~TrSv&kCqN8Z*Gp8qPv!7Vkq*JB}=(4;V^Bxde#FD(g*6P3~MQlh%& zs34DyW+%v%dniEK7bN=yHv`Nco_Z zWb44n`0oyCxr1jNw&2xeW*T!*R1H0|(^KP<4)*1Egm!NjKigKGxGnZp`tbw;$i90F z`EDE%#SLS9Jw(gb09yzeeJnrZi=9W{%T&-{f!N-kUeyy|mDGG-UgziG4nFU-{x3Y5 zQgFE$=8rX*dVN;UTY>wDH5=gBLB4}}n^7U!ICKUO@{VHTZ0y`C`wUSqfhsxhOHH0# zJihU(WJq?&z*9Ww53`=68;6shy45N4R8-{#G=Zg9G$H#gX3q0W&EkI_DrM_@*83_0 z?Ux!PZv4dgUEVG!AKFp{?W32tHluS>O@JNlW3G(3!$dVtKAs zW|-Yx1;0ydZ5gVWnG#fqC@rt@HEmSPc-s1@=w*i#os+`$HR_9%lY|#o#^X%g+&UXiYMV;4t=p$JfFuHQxH!3i(KvY@h8V z+=;%yh`GXFJ7VK7sOHgA+^HYty;Lq={t|s()f<(1pMEgWFCqt*ZhZ<0CYc0XkW?`# z+S*~QcdEAc`q>vj=96;!!Sn#Xat-r*!tqQCQc##D`aeA@9fC3Kukq;AtuooFfVQXL zlOJ3)pS67CAw!sVG5np*K7o?{njDlBA`d3{$5@*`_{{%fg3?HyT;J}=e_t9P+IdUP z_U#v+zTnlvM(Y*^S&a4&+S!gTl5^rzo2;PR?DzE%qY3_V$?yJWvE+=t;&S(I;uYG+ z)brLHx#Zx>31aK{J+r+a+F7_&f%%w_x928hRu2#7%wB;-(sBr*uh0^4y5_hbOF()M zjxE|Y?CDqWp%m~KX_*PGbT^}=VIBEV&32@v!FqJeROMYtKEpX8kde|_h1@_t`FV~0 z3bGo}W?xrZiGj z(RygKvWEE^h_>o7mU1xM!lrb^%l2}^YX4EE#bXc$4rE&Yjh*n9S zqxS7Tw(}nx;s1Em)xSt{{ndpw6c+DkCtZ_(98iat|SuJ?l^j#(kwz!_YibllJx8^nJH!xDRFWtz@$6Cq_ZY7BaMo~ z-M9SrJ6~a`L2zJnQ2n4wWklwcJ!;#(Z~oFONCuD`l79K-tM`hyyokt9odi z9eqFA0mQhQ4~LT*^-QNNO&(x*GDD2Io_u(DK;7V|5PQZcm-biKY0R)e|94tSG9R?- zJHp`&i0RjwW=)Np!!}{nB(3>=UW%eCBr_`)9Dzj&7`#%QcPZXNlwNg65*L-y*e?Z% zzeMv!oOnr?EwwNwr#sRN&XFZji+deR$|I*ry3a`u!jKi(a*O3Ttyvf_rS(lOt_O;K zJ>?@=Ag=3H`#zHLjzm=rvkP@*@W^+9kK0(k} zsF&arAQ=E^RH+h0%M3z}`Tv2o#92tcvxE%6qR)vA}%hQ7RHCxsWJZ+?#pxI z;x>p%fhbb4`I_+9jIx7=>E>`_V&D8I&?AH^*@l1Uw{;@!T+hxxor$xP<-&l5go`ub zPTgXiFJfBNcOr?Hq6JVgC!0a>U+HEDBIsMg?q)yyZGRKChJsO$$PXmttwxVWDV$ax zRQ%P}c~Q4k6A*0l)@D|NL5b9FO}(*HN(@*(6Jz`u=YA*3$gFs zYZRHE@e9C?ZI&fC6y^EGjRw?$ZC%c|WLRCIvR+sxy@E3G4tfJFB0)UG!WMi97RoJd z$$ezr>S;%$H+UG8_Acozd9Qm-6bVL;a}!Z4&d#JBp7TkWE0)DUqrXKXom#i6MS&xS z;b}u9oKWF{!Aco1S4w&c92etQou z7|EirhS7kS&}7wqQq+%lAya!hA5eUT#h1$rKE9Xr-%>QIX$d*UZ(hWPeJkZ}LCjI& z*vb=Z!HRitQHpHNBqrdGKod$Urojy1$KfcRv-y5~;V=C;b7)l%+a)G8rY5G0+WOV0 z2yA^~4nv}akIF$L9T@C#YT)l!ZX0#l&_2yHl_w5DHCJc#qaJj(_B-6lL`06*ovG|h z?C$(Jw!iNMUU&12@(W>h#{gyiGlHpByJ<%Y4QqIsYWY@_t@ZV;X1ev34)?ZGnE?qW zsmF1Q0qT1D{P#F@K427-w(Yqb%=r#d*Y_K@zLP1$j*k=6h9QhJ#%b!1g=g*Ju|Hws z`?zA0rE@qEkXF3H@20emGE(TTY}D)?+FT7h$q)NNIStPKA1ALHep7HEov$%EO{l}% z;IqY(&~O?9G2t9VC?VJ$Z(3Nv2Z$c-d8>%Hc?e=6Q6}0n<2a=ebXKU<84v?arD4}z z^f=OO`+}=E!LzekQ%!Qj~`a)r-N-X@nASO&Q zctS~XNciWC4PT%-+dQ4fWZx9}za}~=8=bYrv%i;$vmi`vpY~$w^aoSI^TXKguV&W= zBNvoDyR>u~vei2^9@*DQ3^0{-k1m24f>l&;EDwlT(U3(B`k(;}ovpn1xT2E;Vqtna z6xsn|6Rj@XA5<1ygR0VKv-`&=5|w(Z4}DSMzJA6J=c3*^;0)R?pyy1G!WC_J^BGdU zZEQ5zFkVQq`&j}%!$T=qYkZ`Ctg$SPdfeoaSki9v<7H-8YH4LgsN zoYrxMEQr8)I!{f6qQgl?Jb82pQmpf~VB|Ip7m34`9f6HPsLbGRH0vz}^&&p-pV_qL zEZ%K9-J9IU=v{5;z?7y%R?qn;`DNsbbWN9(o(f5n(Y6RP5aI4nFqm5C)+en-ZX$A+ zLNQIe#RE*u)2f5;2PKIBuJHd6I@e*6*~QEKHA^`eOG+qg`s@2g;z%Kg?Rs~mZME8f zY!w@1x>}6^<)K1o(WK%{D>RLYpzbhi@OTdN`IRealqVO=@yNXpH|`NX6;2qhIl7yk zx-!aDvB7ynLp&%F3I|I>|32JI>}=l}_GQ`UXw$Nf-2Dt(9lb98_c}i;t&n-dXzX;& zYH65HJ9rw;>fqsohFE_Z(T+aP7=zHVJX!Od=$b$hL*xRk4kJ1*Xji@?h7u?-zDX- zh{+Z@Xx>HIaNPIkAPd0;qsZcY=QlJHxk`TK#AJLB8*!+aBMVmk-vG2Xoa=aGg|N0f z7L||W2!H*m#|XMJkOpSRLUBz!cs>4luMC3pPw`Lm`+q&S|Ji&5;Y`tU3H9&L(71qNVr!0&WP?9n+VU!SQ)wApz_-$m&9YmQ6vtQOLxLQf3on20-;T zjD~MG5tabyDk{sDDpI=T zWB|q}FOs1^T5+nG!RA`jfTU{{tfB+z2Rm6wmGmO{AYzSF+w&TcrXyk4Vii~9C@D%1 zD#4*6tK%U~sYlY#^PETL;J{q|yqCf$8CNED7+cO-fNB}gIPGh){Q&=8?}`R7wK$3p z!5!42QBR{!6so#(zH=A8atz?onIcS8*u`U54B`df% z`RP-1Phir7zwCVYKTqtZS`H|J;)|wJtb}E?sF1RR4ww|O-}*U@^0KIqzv9HWx&ai!{$3c@!z~@=gb~7M%+UWhmVav~Nxo1q z=B0)sY&`rSpxYWa8$1&kjX;Qq@Xw`;cdRZgP`}Qcis~V1jbx3Ys4Jhf~}I(CU)eLq!P7!SW;L1Bsk#sl$f%T zR0547zD_1qDp%n|OSpK*&+pp)AH04;_v1ZsKl$+>)`{3brWU5LZYt}CZ;O5 zLArQnIJ_@`rm+Eu>QrRpG5QdkY5dwdFO8H8QIS zXvC-uKtki6e+$3qS@Wck>M+@ssyWsSu5bC#%DDQJw>#Px zn1YqxS%X0v>YvVo3noax35$;f^~$mp4hEWIQK8aDLCr>6Umn$?X45YDPMD=tv_4wl zgPF;9NkF$ERq;-hpP>)#KPb&hl*3+DdSB|KsN{9tWb7AT`pHBN_j zQqD441dpf^qz!Sz&~42R2+wVZj@q3gwCz(88%EIf0y?Xx-E~#0{T% zEGQY(pb{u-BuCQ#snjf6if=MV*nZ>UZ-VhVN8wZ?YW@X|zHC$ip_2x|V8x2tjBfSX zeO7&?5!+D>d+v0n8>h~=WvhEbBBaHHQdpPrq81fSGBJUYxZjf6Vy{c_$}!Xao{#s% ze{87@YS^E4QXIc36p(+3qeAmo`O@l}r(CAbsa4@e!a9U1uKD1rU=O_>S`=_tgEagUSZ}Exw^$P(@`$ zgisb0m4hQ9lglX^?Cp7O(z?j`3-Kz_i=CG8+Fu7y`Zv%$V2Kfif2iXU-+cl9OoHcmxe%#b+8v>ij0gbq%ztPxA}ok`+cR-g4T33+8X?@ z3+s!bOTu!})YMk4U&!!9G26a+0&f33XfSQ$MBi=?-2}WDoShj?fh8E3(InMW5s_em z7Xz+=y!*;9UXHKZ2|izq){t)-U>fRrTox?uJ#tQgLya(j$LX}oMjGe`k>e3kWN0au zCAh!j1tyC~=Rxt}%DIr{U+qat8yfPPr*2G6?HDD}pPE~DX<^-L>K9drs2FOZgXiP# zd5TpmoLwK|^}=?6!H!lLdk50IkV)Tdze*#l3UBaVo2OE%P9^h&X479@x!(dX#>h*&fZrOw2RzYNo<3H&+z`fc4|@^I z8&Dcot^hI3Hrt_WD%7VJ(M+^&TD(tWR5hsMto*zQiK@g?^Y~7K*olSKp&#-#gGgZz zz5miNSD$=I&5~9=CIn&p@^2e3fo)D5qdY8-DMX(C@i?W&Hw0aA>)vM>4UgJnEgeIx zY|Y3kyTSED?PanW30i+0xgL*E(N+Gn5zhnE(hG}prZ&NRj!!p0PG9Gmz#Q7q^5ugv7^a&Vcu|jDtjXn}JZcIC z$UCI;GM=6;&Cq|k%uLZA?(Pep~IO$^dP3TG>5ua?jawXpsrtb zuWvd$)za@hn-AbTE$ylS8rDmk^$BIke4XhZiYbe5%*lr7?n!~E!s6mLAJd}%7n%}T z&w=3##JCb3^jmM~c_~5uMTdiBdOmPj$5hph_6aAI=Zl11hlM(=4F-R1sy#BTBSYoh z<2chO^v|RP7NLm$woPNQfm7!8S1+}Y>yiFJANjf2jY>&;XY{Ra$m!cD^%GeQIBDW0 zGPbwr6M0w9B!^msIPOgE5t%L|WXz#ObtL)~p6`a%`eTK3Pi zxzY;b3<#R$x0+t$J5!y!4J*8p%yG=cFo|m?s1rNF%Lf( zIYicM*#nlcG{VD)ZLKe?%nNgoZQ2<&3MUjhb;$kl^q8bu>j^t0Dv=^(t)Lh_8jL8$l&VOij$O~dB%6dAjgLi?9 zhG(-MOcDc;?bEX=q?)zD>R8Nq<6AScA6W;($lvi#LYnGAioQMXIuI&S7aoFG9Ie*YN zM!^KqQQsWdR1XG%I^I_-zN8i{m5lX6!xw7Lm-nR&FF%;72m4l7=MNqb|Fxsj%2R8G zrX-Qe(E9+~qKBjTf9cIumhTE(fS4rJZK%YpUNW_jWMLefk;cyRDAjpL%UMu>u|q4r z8`(f__Wd*L9BDSMKp@jO-Jed~8^QC!J8D>=J;TZOq2Or8YwT8PL*Nd!I7hPf>R6u) zWSZJZUMD1Z^%C?tdAw@7G<3Bd0$AhWD&KE0>N#R(=l%L~#b^Tv%=ZTz``Z*y1bRmrqDUlHdF6-(VvQ>pq2;9T$Zc$7UbJoK zDy%EdZZ-3BR%tOC`1U;}XJK0PPAO?(x^^^~4x6rqJFJ7)!0e(C(Pm{5_67}1RHE9u z{Yp^sKKj0rE!J>7#2C~p97fcU&2I(ppkH|mAZ9X7O*B4(MMrS~IdqrWG)<%vbHklv zE;xn>hd>%x9TNH(MFJh%D;Jn2+3s+4p#Z#b&(_~oCads0RqOB#V`?mG^*SMAW|a;K z5MNFCEXfD$c*rs*GHyUH;L6ogL1T4dd)l#mwOKD7M#I#bFvZ<6xD_|&OkbpxZ4 zq&(ghj>hD=Jp#W(L8&sOn9G0q>3+J5Nad&AC}-$C@eL-|EX%hvqh1yC)zGqTBg=lU z<(7EyzJLCWISzqq0z`7*b7md~=FW1D$gX0dg7A*OLnZv^r&uf;)z*Kn&7=Jl@&m6d zQ+|Pm?yCzf((k6dGW>j^tOxuVMdN?Q@-%|X(Mbij*M?NcP?DmmGK%)-*h*F?CkL9O zR9+Q-CZLmE2CbwNt_O(2S9Zi_XmFiH#S&vywkUV2X;K~XTJ zu)aY67EYdM!KEQRyl9hn$$BK}Pb*bZdQ{T z?cf&bc&nU4FU8>Ahv3cbGE0fySr|P>7$P^IBNIxb$`xy~dN?zao8jml&47-U=Wa50 zj7#M@x#}R4!7okF6&wcnWs@G57?6v)YswfW{Kd@9i{6pn^q+p;<~i5h+dYcxZHt&` zUr?`Z35nrVSk4rYZg66%E?R@RV7i`i)(Oc@7J>wHqQ`Uo_8)`jf?rjp+}<;VdG&Ct z(dXFvouSg1|0t|CU9T59XZ!sLRc^e6^2`X1C#DWbdn-8qgyc^Zlc?03WW$Y}bZ^V1 z7DHtJRNm%QPo~y~=en9I@4F=4F1{iUA1a{bxm`co`yja5tpY`g>$#JuX9y&)k-@#IXB$s7ZPK>LmjR-M#p@Q;Tf(oqA z?f>+VG;)>d3oB}LJ0M7up2KbAsebZpy@5cHW3^eC?=?jgCq!IebONLlBs-oGSmhgF z>_CTFN-_|lU^+r4HHR*RQyvOy`)Z_*&FS{pCl%` z6i(0gw08E?J?6<)xxn@=emM!n6fW^jByZ8Ttcbm6hEF^~v8tE^Y)H~Z+~s5A193R3 z$w%Kx(3?9$`JIW-ph%aN`HnG>E+95NZhLuf4*IkkjU!g!5o9FMSpsEOeLDbeY=!?w zCtB@p0S~oYS`%R(#cB5{Gs`z+aK)P=`QzC-%oK81d*A&X?HlPaS7)PgI1R8#(iVh0 z+DFQNdSqT7Z%!e@p5tCf({;p=O}_)j1Qqj9xernX)o)Os218$FgULZmR%fVB=E=_f zG*R%72vknc3L7@;daLM8OdfN@Y)61xt*t#~5?Ow(tTY!hlF+IRd9s;PLL`DF5pP)_ zm~Q0pa$8*ZgamwTt@-E>BB4fr3woC^Q@;d!QkwIeYPEsLd}2Fo2YJ|s6U}hphJd~KVtqTgKqogrMPydHiV@fF4lJyR?@+b6iNn-(pw9SBguRR7S=OXlQL1v8EdqTLCzW=DJ1+rIDz)K zZBE2e-5<@Kg@k)KWD3UF0n1L+*O-G59K|`rMZ+ZlP1pM^WLVr(ZapQTA;-lDl#`~RzPu0>>D#BM_~TL;lz1Kv zutvAH92}_#qYp&w_i2V}Ef+5^a^N*A)&a}j+;;yRT8>0z?WUftOovLg4_^0))#p6u z0R~N#JgdL>_m73iUpQVQVA*+X2Ctvb%PrO7D<|0`aTd~Ls|ln)cgjVyIsmWoidEZr z+-ZX!lRcMMB4R_4c&`4Y^v+YkDM*3YQ1-{a-J?a-$vIjUTF z+g6nLCixaQWv^|hH=Sb|Za5Ow*7<})rCC)Ni~HoaVa;4U1HYV#GDfsE_PyDi{^^tu zw}r+%R}Z=>l<+3&kRQ*yJiK26nwRuQQBVa=$c>t_VW6=7d!80u-nM{4nPSU=$x6P! zcRSv1b=*9r2zp2{2#(^vT1O-?*7kfMODy=javaHvv1?LLM1nV`-*=1@Eq?Di?mMuD z`^U1ZqN00W^8YZ`w$YDKu7sqG*)THa@8PL=H3UMi2~=eu(gOr9Iq9on+2^WEDg{P! z)h*}lKW@Jn9&?j0?&IlwvbavS@q9~g`6aWZv)=lDG_*Ej-hW)ctsF$mzBK z`xN>&{DL{qilx@9lU8@x)ABAJWe>l1M`8I#2i^oG+|9~fZDW)h5*0V$k;!v-^AK^5 z!Ti|x@8m#%Z0UKUx05rD+^9!&N@q{Ar_61DI!bZM#=Y7IH#+*DAgu8M**p6K-rBT6 zdr9|`s|;)=8H!)8)#@I`%jX0R7TKHjtPl2K&(DW~C;3HCo_M*&xG*WT-1q+4%N$|W zu$*QAVyL^@Y#NL5s4?`nZ;GF;-grHV7XyMk1GhkI{htJc%ekq6+RToo<90?Z~Q#!+p?^mhE0z2uy&;0qLFcX!+s2KY%NSt&4i;l4l!Vzlq(G_!QZE{(H zY5MHzt62^ui0>l>xdrEIk9U8!p8ssScKsRcEm4S|NpWKy>-=rIyW&QgX@r~al?`IL z5>(-j{#reu0QnK)9(SEd`9U> zxszx4g`t-4cJ@@Z^I$$Jw_a4^r@5c5njZUO4YgUE_UBdWQ+A7fA*MUpcOJn`7`L_ewCGW0=+zGu-%}qJ)f>YodG>D#HklyUV zR%7Mqv9N6{F#iwMW!qY@qZ1%pu3J-wk<8c0a&Ho1R+iYYezw>tZ9ps`|QgFq;DlUteosKza+IJ%LZkb8<_&U(s=wbL72VKShlhJDbv(-i4*fElx+^VyT~NT|Y34YzSe}a52|AsM%cWT?ji*r^}<%yv^}h03NUDL}Xdr>1lR^1FY~@ z*vFwplhmS*gh{3t$muPXf^v@a`%xDq4X2^rE?GJGJTU>Du5JBp1?$0iPd}Jq!+CK8 zzsTC<_D#hYY>#YLQIJP0(#gox&29%{<8-i#;g|3#rJL=V1K9#`+5e7AV3bNmE30S4 zvBgPWx#U*Bs<(s~cMo%RM{`N`6B3LLj$VYcAmx=qg8sH@lYMTEKZm1zWbhSen5v+# z+HUrSX!#$&FT_74$EH>Q(g{4UKyAFS$)(RoC3#huyxEZ~E?5=PoI57%$JklZ8uz)j zl#DaqaGloes)yUj+$-XkXkiV^Efh6oyWg%jj$9}-Q>?LZa~NvWULRChkp0XoU}nXAPZ4vT7!mfJef`LHq(N)7pUo~k zkS`&}uYExL>{Baoe`OL2Hmc29Mmxl@Kb=12Sz|)jB)sqXjP;Bd8@&GJt{eyYLjU7n z3@`qKPf)!iugxujy_>gB*2(p`C5GI}N@NA6g{n=dJHs*jux0j;A(l*;RtEaD$G5`) zYYTpo1m{ib*rHpkD9KeUMo&1RFa=s&vHr9QvUHXSr@FQj0Gjcc1?gy=h_v0;zd$TY z95aSd6>XdhD$2{rL^TwpaReh$yUxJ!PRGY|aJ3yf|Ai~^h`nL)5pfj9Npr=26pca} zgjyJCN`pRlYt!*S+zUJkW9ZxXjUw}CLB+fi$=aY z!5=2!2(JB#)4z8;r6(hWO>l+kIFu~69h4>|Oye^X*!%+y>ncqCfgXnR!^UjLpArf+ z83U+S)C1X9FMqX-YWU(;Cf-%3YQ0>2kLo*ByTOzTnGyU>iB#ZgIbV0la)rs=J2$_` z-9cvE62PObeJbR7o3k@C!rj`bSIsn9lNNrMjXzOgniN5qD?9dy>WaGf@CrrwRZMJt^0Zpt zQ?n&n1rp9x?t*#wn>H533eG2&Ehx-o0pIKIs%v5yt64NUD%M}J5H}%Ucp@NGr9C3y z2UIXb=m|&37Y~<5QX%#mVHt|ZOWDi7#S~^*GTibh?y5e+-irN`$z~P7zY;J+tVVsP zn4CdR@H)+}3ab=Eqax)K3BkmsirkU-V|xc;YPPjenP)TmrF)da$xX7dNpoDZC18>tex%&?iIZ5q7!E>2pj!OYv)UwEQ-0|0n2$CD(+>SI>mLch0fcLKN&4;~getc-3#D4~$(HTe#yPI5wsgXzE zs*aB#BH+p)ASh66mZW?^%&MxO3Gs?|X1%DbVjJ)$K@EuOEkS87WFL-9^j zt3*UI54kHC7P(QLHzhuQrWZgZ6b1h&2_?};E~QqKp<+P)aK!jH=*3kMf0ILac_Jk^ zM;6Ec3a*~a&Jivamm#S+h{>RR@|OfL9dr$X^$hbuDw=f&(Istq zs~P69F6(3inoU*lUXqcT1cjewc~l8>LMJ__sAQN;82~`Jcp!2Jhb|^G4*0pKCYY}3 z_#Dosh303De`=o%)EJNWi_EOD4J0L}b5Cl5?GQ?d&|q&9xjU+lt>Kc0M+ip|m=2mD zNGN3tCnyqUM9@=3W;Hf>^FmVJ1}~N49?*{;g2VMHz$mOvfD_NAYLT>x+NKNBqvy|( zkjqdoeQH>V9QNIXS~+x(VgjJd1%=n%KhK{O+-|Hs-M3c_DXeo#ZW}m`r$5!)@hMyi zKP_-}TOz@ixd^G4cmhs|COx{ZWDFWNU8kd(WSL0Qeh;4uXRL5+lv<{>qyWuUIIHTn zdwD@VyZbA>8(0(bKaz--A8>`x+(xoch1n8v^DRT)5EPU zm|XBkoUI0B^n)jk1xx;%kvG3C!n7T{OjsLRx>+KuymX+~-S_0ATZt!YbH1rXN{O0L z%P>htWS2`?bK^-%!@^UrZIQ|m(h3E!bG7u`yIANVmLYq!xxM02nOs z(vCC^5mY;VQlD$fpd)atj}4KTsFoU&wbe8FW@C?Eru~xrtaPUIVS*8xrb^5Dg;7ky znKkbH3>U3vcXE2~he4pE6#DOBYdIMBJe9S)zrbm$7aCz7hv9A%iVB z;~ci#HvJ#x$9t>c2>9Y)s3#4(Y-hvv06&;2I^L2P`AFP<>d3H&;x!APD#Np%?SMi( z+24-Y5xu#1(lu(CnO^Ahv-a9^D4v$Om7^VM(B4&%(=Ee2&KjJz0_77iI9K_ztoD#< z!y?Myog>IRw=0RfoH*$4qbvvj+0(Q8%o_YtQXC*9BZb2sQozp@<5lQ)M@o7OEfrL} z&1d|J{G_HYZMBblNc3B2QLbS7+Vr{zQVTufS!ZDXg#kV0VOY5%DU-^a0YQjk{qip<&EAx^DLIo%`pNAR}N-~!Oo(Hg$>`Ul=fGiA}&3}BiY zKe!&}luXfp*l<<7J7O_>H10Q{DTgsQCu3qbo-^k@`W$6X?IW{`XDo|KF$%?_iPqG+ z6JIXo&Tg}pmEJr-Fc2KqWeOMxA4%11Z0=8pvZq#J!S;UT+MImyKbK7#x)G?oyOPB> zzx-PgPF+2yW!jOGYs%8kq_6EUJ%IbWn=jB*Ep0}o7T<~nh)j@`PE8CYMns@uKj0=; zLQ0&)<;G+bk_54FSgxZwbDDwJI1BYKdh9K^ME;}jn16m6gIkvDhk-+k=?~uN_NU~_ zm%GJGtsV_s-9A=)&fP}yKLB~c&JGP%G+$#S%NovA=VwRetLv9|tg0<}%G>dsa-6EE zal^nG=(tqg-U0a&v~^H-87VVxJb|2?I5jft3x&wZDv^IQjm9%Cb8M94X28YtE;@2b zgt?E*a9H&3cUd6}wD99iUtIw>z@KP4K;I2iCcMIpylhSHS;BtlzRMV_~Cl9Tq6MuflkS{&z5hQ%9 zcOEj(4ZwyP2?iOr`#G3U@JuH{oUuMhnB)7!llFveMuM0U%gD$yWuzn(w77pYP|b2b zezg^q7lV~)d`i*9!F_z-_gerj*0#1{+zk&wGw=OQp2>)u&gco-5Px((AY+W!c35ZE zQ&rT8m@XKR4;YF>b{e0WCMxvaPkAGfolhX$H6#wRO`O z13c|sH&?mJcxn39W!v_f3ECGMc0~DG9d-(nKZF*9ztM8faB{F*8@0!;J8tiKZyVHF zF`$v8ca-VQ=rh_rdv_aIH^*yybKm98syB~UiHQx=XTj7)8%1HfFfb6@B?<2C?(PnyxVvkEYk&~kT}yGNxNCu8!3u40iaTw; zFEhyx$WGqfz2~0u9N9%yH_0|G2YY=r#>tF{K9nQHUz5-ts(veW{E7OsHS8V|3~DhG zsb6Pt4^K2}nD}{sVt!gMsxc#@V8J(%OaXb<-lo)!lm#JA^G^Qx_3g>e0sK)0RkH5U z);pw!%Dn6}5%qGdM$PdHZoeQFCMg!|?0oEbw(k-mNrWk)RoPoWmBCTEg=#Ts{PiAn zYg!JOiby9obF#W%TZV&tTcNNTvNoZ$K`>{Gnu@O?iLIK;7UALC&5bO3R2|1t@tpZ}$QcPMgMDhpfEQtBJN=Q5AtO>>Ut6o#7B7wtfXkP5On3!ou zMmZzZZV_u9102j@Awb*McV9y5*)X$5*``?9RM^>FrO!R; zlPl0DzbagKb$dt`=XuL}>cU=+^yxnSh(28G-#29UcC=u3s4W6-S#=4JK|c{jxr#D=mro<12 zC>6(Xut$DS$ET?+URwbw(>@lg_y0+i-Lz7f(jkKs|I=x9IKL%_k*>aBt)D!{MZB_z z!jeVM5oo1DK$qX_&Oy>Wqx~%R5LpB;)J*Pv0t4F;HziTy)diXtTQ{PM+^z#j)+wEF zS)SwdBw;Kc5bYgBN>@}C^Al<$>k7UGx|3>A%PzTTl;N>)!>wv&V4m3SNzDCnbw9Sm zB8UUA_!k9bIYq!S*OLD*QNjPdw!;U zkdXRkb4{dDbXd&QhfCfYEU_&&Pae*`w0wzzCKk!6xXs(Era69q!gi^2i9bo-E z&}OKlpbaBq8{zY`)*FrxH2+=C?UVX5u=`( zE7W=I%{CbZ6KV`O7A_4Yu2-H9q&0d4t%BJ0@mQ5s1(qP2k(h3icR}u!Ustr}q)E4rYLoUxz#(&+Ylm`NJpVg(}iP!$M!6mSV;@fMwY>8W;L)bxl?#g+E1qtyh|K? zL5=s!UwcBi`w%%q5DvH*9ymJw{9I?&&js7Z`%)XX5)gs=_@Ro|1zFIhLp;)0Syo!x z;(dVKWo(nhHe_d>2r z%*rFYKgNF|01_^ECJg4O(v^hqFVa#igm)Sl85$WGH;O8#Q)g}Cv*V(7*-1@b1xJka zJD1v$$Qs&_=pgdp>?{>N7bK?Ni@)9?F6PywUmx_s3SFO#@BD)pMl8sMkyJMg=2qLI z&c2+i39{xmkJ-+Jrh>IQkv5A6FwcOg0#zBzijk%k63foesE?M$cN?7t>G9Xe?`tF= zi*w`)V8-zP=X?mL`A=y2BOCrVjGv70cpUtHNc}RR#u)`DoCz0yX}I>;Of$MqL_0_# z(-^(kG_mg!_4PaM74m<>Sy(aBq6t{z>j=vxCm1f@hY)?;} z0Z95U)+u_LS8I47n*91tMEgcs)#>L-Zx!t*k$=V<@0LhR<8NMllxsHaPZ5oSpG^Dr zF_%#jP$r`d5xP#dVd*6T8S=agb%knxpj~%283^U})k{~Nw-B?J3!^=dgxFqQPT}xO zCAX>TRN5o-Pm{}p0evu>$_s)b5I<6 zeDP5^snupu)UkX9`SUa@2B-!#lDVPESNlgAdrChS0ZeH}mJ59Y%wuhcb}K9no0$f# zcy1w={rvYTnZ{e`7EaFCUtiHM;9muYAwYCS9M+Vo<>F9n1&1!Xu-~lPUT4TlNyG+# zVz=&)YU+w?9=V4Fo7M%&7%Nq!j=}lYM=|9ppe#?`?;51Sk`D&|eDTy(gJVQd5Me}# z)#RDUt{!Sna3*{ZEreQ!MSUX}><=!iUtTT&E4iq#iN6Pa2XhqCm(7I7xcS6G#_NBq zrZ;STH857Vi^*F?VFx4{t6jBY)%B zv}I-Itgvu$U=pAacTC8E#gxY&W{dS&?2Pah*eM>NGOr}U6y>Iz#n%5wx1OeoC(!UG zyAqHcHAIaBj%*wRO_Sn-vy|nv+r<%L6jke_rKfn`J+>Gw?~W<#1#|cBM|BgJ$gUan9gl!K)Mpi7T;( zW+PKpM+&LQ=P$W;hpG#Qxy4TJ8#^|?2?!q>pCOuz7PPAE*UWNmKKGjM3ZH8UXS18< zb08c&v`pOG!i-=O)tJfXTm&{}p3WqrD0Sh(2zGe|MTD^gyEMcfot!KA{Z{a>Q?l_4Y@Yz#%!RD&jeCMwR#aPGs9?_<1&Dg`X z$Z6%DUY%bz;{l;+bzGY>I$___Ln7|oa_Wm#3S3>GpNPQY<;lodncR>uO7C4XhYMwx z&-~^})%rX_%-qm`1N&SiIDmo_NlB`kz>6j9VH&SWv`KDe9OjpLoF$9abjGVh-e)}O=$^#nz{e3jLg8|DxM!sr+J;a{cE1P;P(PkEy+AUBdKwvNuyGZhxvS<;mVUxAYO z)H8vUpQ1M}5%u-|H7n%%i^uN$oa}9`_%hHyTv-uIbo9!y5P?$dE(#B_RjTL;jnTI$ zC{^8*Md9XC(rOAD1Yvci@Y80{=8KC)r$5U}IN57ah%~NQNc&F&H1DVaZi$=-A(e=qP6G7N> zJzPYPjdg{|NZu9OcMvLE`u*uFqgWV>y}-uaw(?&wfF#8^h9Y3Veg2#HoHe7m?>V_f zXFKnNyjm))8w^*n+)+_Nrj?cMQ9u#9z{J}hQUcte8F4+l(OwOH?Lc94>uvbtkuxrj zRMYeiyVjC9^&H8me^sRI^5hN<4t2fI>P~(%IP&w)G4xjd#KAfS!Nt6rb{+e6-=KQXg9#`I*jLjeUzWm;=&uVgK}a!gIvo zk)|%>WMwqE%hixPb9_wkP&bHA8@mX}*gOC6*7g0}=|7$1*YvhnYEr5S*Te!Q)d~&g zZ4G@Pug;ZRM`7huHl`dGeLnphEovd0E?WeUgDbykUO;#<2cE5Or0UU{oZ?Z3k<{Jw zcjM%*89?oVVCGD9T*PgYGzJd*j5-W>R4Pr2(qq(<9%?D?P|kHhR}l-)V!(l*&@FM7 z{q_0S17`>a>*{v6D`go!np}piQeHlHT2nl2Khtz-GN`)5-!Ya5u67MCXh~%aA`#X` z@8reME5JOXtkk1_K(^uKRey5mWwO4YB{3Mv69&$7HhQfK@2n>?&uM76U3AN~zX=-s zr@i=FC{{p(Nq{I76#uBq2$h4tzk_)usIB_-w`T$Z|H*W_X=jhH5upQgcs<=iFBl}R z4U3ZyZFG0vU#J^ljPYapbh;ZZSM>^==XMn|WRhzi4uUIN4}Z`O2S`vq9n8HC;FK&; z?)Ols&9NM)`SsqKi$IP)eE3i>7mHLrhY|42+1d_>JecwMyVKM^yQIZVs_E{fWuX1D zN;G!qQ|;$Iy!yGax;Tm$FPX~-LFEquD*8h9^+T141F?Mf9w0M%L>`!vyS<+>vw5FP z)3|{%F@e0SCCE%f>2ys?Zper{?pM2lyEC%F~ z|LLV@B33I@K;zVirpof431%^{{px*!`Y05On(7=YHg?I6Dslcg+!9p-nr~nLTgk z1xK|2nnb3wromBfV$?uv%6{_QAd9Ti5S-PxlZsz;YT`luQ_&G@OU=P_ungGdwGgsp z%M1tG{C088D03lf6-jtgq$|4fU1ch)W=j!a;S)pR(=)}3P45^Ul0);6 zyDa}%aK??Z{Jue&DX@Kzl51gSgqu#pxtJ!(p?uxl*eNZA@8aAMz3``5LWm#4FXW}I zV>zW4ZP+HB<)zx2&BGUo@2O4~Xd3XdXA?DG(d z18Ge&Om!f$`-tefsydy&X&WYrXOv$jA9Zi(R&O-GJhd)il9K(*Ehh#t^(Wtosq`Kf z_B@ZD`>7JXtIx0902A5TYV4CB6eFNfo+0Xp`Nq|CgOO&(pVI~k=v?^iVFsOk@g8R_ z-Cwxl_Z;}f{|p5QM3(T8wANW=$1}c4)lPm4pLUX@C)RW-_g|Qf=WD!;HREh8NEA3l zrSS8?(y*xtS`DG}wo1^d>->o!Rj8kDmTX=ver(yRh69dE-N_5mzD!$$;Ai0P?u(Jx zw~{JExC-YcpDgzkD|-dK`o|uND6Z5-+(Yo=zq> zO>RRznA2Wgo=^{0fYEFPl{2(IRC)8{B)(P!F2UexW!=cPU)%^D3p~vH!dM~jI@UMV z^XvKHqY&-m#gG$v6m8XK{fAZpkT4*~9L!UZO{SLtuV%E~X+l8sx3ua$Q%%%;t}gG~ z=`SRkSZvd;_S}^_mK4Je%lk22Rmzkh<1j8dFV2e7)TIuKq8XT`8-^95P~@jl<#fnY zYY_hVy3AZfUkuz(iX$QCo}`~!yR~w4i6~R>M$Wxt;@bJ57ZC9v3fjmt_CkD*Vxl@XnZ!1! z5|z>uos01)JWnP_PkwZ zVembvG(>18VoT&TezHq%&aQj!X6o(?)}1D>G7p=5dJ;~^~R@O_pUzutZH{V zLc$MSG6{Dtul)bnew`-Ps)9*l7S+_$*~DEI>KnZC-85sk!|Xk0qE5&^DcSEz&DkoFA5>AEMh-R z>Sg?-M5MqxH%h{dRskdcUqK-aIx4$j>#>>DYjd_llC+#d%D*uC*+sR|8700KmFv}U zW?~@oO=ii_Dqn0YnERih8lym7RDr0w0?o5b82>I>&>ij90=h@-mF`+R-c0?VKw9h5 zzmOeuOT-$DMB1galdIW@2yf4- z$Jn`iBR@_bzw3xMeoF!!@BNpBmHSb22LtSt*?t(atY{w5+qX(2>27kU_Z3862|iVM-Rirevwx$}qc?7l4x`OoLi zS#>wEyQbsUk&VKRrvpJ*mTvfxw?M@@bub4HTZf_JoEg1LqM~!v`N&mFf-3GcS~JfX z)!3?yKKrqM5QR4@`E*KVA_$~%#X5n z;?{??U=F_zu-;+xNp=Vv4Vje_4;-9~^H{4iX!_YC9r<3;-`kJ8>lArMaXOK*MG9Z) zUJv)icWcH%PiR$oSjIE$uzS%^*{le~aRQzpoP9d0`*n#BV{%bTqo$C0Z}jPIGsuLj9zNjQ_1RFIwFoX@<}URe^r#CG9^ ztILhXyxdBylv1yUkN;i#OaA*pCA)@IOrjiQ%K9FLADj*mLUo0YSch9b7)4WOVw{3G zp1nf!gfDFsr8CYdzK)nhy9u&K`Y&k9COQFAh3Bnba4PjPKQjl)2hsk#d2<8bO$NJd z;X3}wC3{ylGf2I6dTnLlklFo?fX9R<-xQ8Ti96b6r{xzq&YjtL28Mi;s0RFDseFp# zdnI`uKR(I^a}o3Pzudu!c9PJ%bEI@K7a1TGMkS1o=bG#`h?

7P7LKeMs57$r94d6P=XIPV^tyZA4t!4P|MXYttt@I+a4vK$r4R9PIU|s1 zuXgof(~r7a4v||~?WMET z@&t}8kMzsBw-i*GiT+><27cSpmULbCJ-La8tzrgP!SP~Eg%3~Da zAe|HD0M3v1>`@qr7{7dClwusML=MY;wz*KUCmePP`1$GsE%f5HMRtL&nSMnrtP8nX}giU`C>`xjS9kHJdQ-()E%eoSWn`j;jh{W3ul zF0ZmimOw&wWdMjS)2lZ#!`)z2lNpVh3|hmD*BnsEF^S60FDhS{7u=s^%`R6F`**X9 z?eDuni*0(aXPv?zriNh+QeVw5g2%;WK5mHyLGq&Z_g)I|2^C_revQ4WrHm0>HNNwt zYUSWkXJDk#CE9d#=)sFzSy@_+&ksVWs;ef<&*oK4d2NJ8k4&^2TB{S3moB^Et=go& zybiL8+o!J^=%R7*$Hlm_!qJqsG^jP$741M3h|nX-Hf1#I5!*Tswv$Xd_&4Zu13QR8 zjl7t9`x7CsQg@}Uol8D`Q@xz6%^hsx*qEKGy*lIj+mrc1%a)ac2n4A*2(=l($1|uQ z7V)t`iMB**^?=`6C=kZ#&ow!c*JV~;3PKKT_H>^f@Yd9dZ>FmgI62dw*zzoHh(d$+ zwRyE*n(GFAzqt*`Zu4%B?1G0WIY%`)yUrDWQbhscr*^Pa9+|#uc?%dEU$vc25iVn7sk12KfR-Ah>N%v}>O3i# zZ26yI^$0NZuh1lt7=!=DrWdLL8UA}$x^j7io5v_U*mw0Uq1ZzHcxp0_ZBF(l-vpMx z-logtAuqva6L%S`cQiJkY-*HDb~wv1cp7=%@m~z`X*KP}YP81GoY>3{S@(`}Lm}(| z8&NJXqife%{p~}|er|!42Ac18Fc1tm9_pkFar#GGIdCcsuou$`7Q5#MB%pL!k;pU2 zV~j9~!Ty@uCT_Vk8H62eP037bz?7Zm5|ytU9G8QgQS`4T0Uk@>RmkVJD3*mqD%CpY zKo%Fl^lHxZD>0_eO2U6%^H+4XBD>u8K1K0mMxbD}I4x3~7^hcXt$L~dSM(uq;9$4= zOm-z+)mjaAaa*sPiZ1&R!sWh0`s$eWm%bm8vfE1#|5R`HSm^A|#op~U$>6Ual2c6( zn?U#TSq&OQU=sfFtC%MIKhOPfl@aH0(_)QqsT{tT-^xK=nVsND#}ydYgi%|w!lw@eem##hLr6vCzaczsQnPS8?DJ_f%^tm|QI23Z8kVD=!5KybQpcMN? z0Iu(lYNu0`9$@cP#B*kzN!C7lwC z3$RRV@`~$M_1_l0@$zpI{y1NuDHrCNsY)k9idqWqsL{XJaV$=w;_L-K*r7&0_Q-3^ zuIjh9cc~EHPP7w=AQaVHcmnP-NgmjQi30dTnI(VvMx}PXjjxWA1l;}m9{POyEG!nW zr)#s7P1vryna@O)z(lGhs{4Sqm3MI_+jQpTmTUXU-=-8 zMWLUOSm1e0;=`e~+Wm4pwjm!vrpE$bVF3V6D4 zoa^S_vk;!Ho6*US*l3h86Pu7#C$A`F;h)iI64Bo{j^O=Pp-6ixwwi9nM5oKN3~-SduU}D|Ic7UdH09 z#&64M+F~k4Nd{7b<-@ULhKATHx4ISdd3Z$Rc|ppIm?J&dH1ssIraLX(nkvR?0C@~~ zY#Pa-VZuGA2mwNVf<+%+AV>(%8$2vgt@B`de5a@Ynk;Nx%7sPZc~e ztzxXEe&+f=Q5vvC2*5n))TP$)%TSo+?HAg#C*OGaSCC*&3x~N0YvOe z6v;>PoO4cEoepIZIOIyA8vO}6>GCJ2>MrcVvYn?$B`{iW94mfuJX0aUrg+D%{p05B z^&TEuZI4s34=LW6&ezIRw%whc6P7D=R^XJK zc;Ojo>w(VN6j-nMn`0v4VfmQ6Huc=)yd;H4cwT)ME3>?s5OTZVesGs3UfJhnv^(b* zOZ@`T{L-$jdXbR#h<`z>U2x8Dg{EQoFVv+h(m#*S{mvUIKlbYFZMR#Mm7W;-y{WhU z)KMq_+kOG77xstmZl!eM;f{=<-%Ue|P!{5acuPjDTMg_yj(~Z;!`E7DU%KF3N_+QU2F2hL#(7;rWa zE7{|V-!MVr+mz5_OOIGoJO>d=9||=FUW;fX7B8H>JdT!DZLVidKI`$y56t7^952_Z z8zO6lLTrScVXQ^Kj0%k*B#;^&C)3WinN?5x;=)@FnU9NQY_c2=^xk}QJhcF`t}iJ{;~UUJ9}+2|PR-AOgHlmd)exr( zfMP*PY9?5F0*R0A6u7%Gk~6QyF6wINVP@^jg&luwn+pD_^!M@-3rb|K>YC51W2@Rz zm2%*8?0LGgmu#{Up;Urj?sdB4tO~F@BtzJJlZ@uj8VvBaWPs`a;_&lunSguAow;aOEIQ2JXAv+r%w{lKhrM}rJP z8>Nooe%=9~4E8%|c!X~60;vx1bm`9zxP7y{wPTIAc(0flR z7JK5$Nq{gSB2&s%i(LJU%($Tj6AZTT@Wfn$IYJ=JBlmqIbaM4IKukEH9jZ{NcDa-s zP8eF{pD{VSsvNw;Og1P~wPhv*va<%VXzK>0Do>`4QR>lDgL#rE#sGQn$wVk-w}<)` zR~LI-QvpIl656B=W?f32$l5mjcK2iyyuN2_Aegg~{W-vBx)~H|O{JNj%>aCxESF(%^_hmArwUQWd>GD@ADm^AX~^VJV4Uk z3FwKHD>rChj2^K?|2{95@gWIYFS5d4(M&g%*&P>U@;Tj~=x{(Lrm`Wr%pAJ0Oo##{A(CfQLyZNf zk%Mqg>jYbvxaT0bTwnvN_ zG2X0T=~Vp#J9kekcBa#^mx`XMNFr`9+A1LZW<7IS+0RCqbNd7Wf2RKWdM*~ zgsuMFyKJQdb4=oXBgGv?ePsYZF&UWVkVq*Kv#w^TZ20rIgAHjnH-zcqk>fT}?#{Oy8@DyLw57RR_dv;FTd>E3$L(AI`gQVbAF|_=&!^TBX%vmEy zVP?dbTalj_KSw)^Wlcr{hq^a5F5GAqe)7i5kn8Xt1M?K;btPEaRP)+8k(r$`+r551 z+vD17xxm?G%&;cbr+c5a!|Y}=P$Sm(x9ecwU3pd9A!GKx<=$8XLm+&_hM}xYwI#lc z7_cc1VFor)d}2q95qG)`{*FeQ5$eAt;!Be$pK13!bT|T}IQ4N0dHNtEfxzU%PPEAW zuERDw1`Z>t|D-BV@|NnEx=7doX)bjK6q%ELv|T9l zP}YV|7_k)h+3^!AZW~FEU|RwL_w%$GQdAg3f7jn)_vkRJ>FWEgGyacI)MMNS`YC{q%M=@DJ6P+qqb2O*88&5&# zOPhi2m$qmnQcud0T@G|}kEr732gy4&D_R{HqG?;^MZcn?=R)=Ov#h@4Q#5}ZfZooK zfDg)EiT=?oSipRHv1I)_#N$KBr}BeaCe=1MscR}*43wyf0tQ%u6S~Fkno=x^8d+#G z%3nfKNo)2kR@B8TR^Qm**yHKikSnmlk8o`C594fWRln{Prr?j+?KT~Ot`{QdEH?p? zGrwbFL9+x5kK>P!glF5jKe87Ov_b~TqpOZ1IXq%^b)%dGYo)itTaQ@1Nrwg?H$JsGh z4^V&=q0G7kLDjT1W)eRP2%dfyi+A>&_oY*-uRT`-+C*E`pFP_$rXi4m8@D(Fuae(; zI_(Dn`24ztKUf?*-23Ccl;B{=bga=aPkBfpff1uwGyV=`euEm%^Qu=6eSv?F2>a*M z_ovq%H?9KAW!LmU#Pe%wtZ&xI#XB7k{Zl@^l`B=cET0Gs7q`PrT8}5QnrJK7B@a6B^ z^Sc&btq3b%_Bh1dmE2}B8u)8Lwx7h(`#L3mK%h5+uive6gZuAlIR1g23^#CCV?6yiz=Uif|w3#mj=y*Q}2WlDDeir`W3VrbFYlsgBC zv!#E)xInl0qUi>@yc)!jfCXR&dZhyYv5&HTe}{aBlK!fr!=(^Rovm~KuZ8N-vL72?zUJ4`J}4aBLK>Cr&A%Cw=KY{( z0K~UR!!hN_CbHYI>Xj<34KQl>G#S?EZKAj@F?&dL z(G$J3Cyf*^^qRQ_KR)T+Eq$0(aC3JS^^}D@32Si2!q=Cew&f(^$vI$aG3YDz%;vTK zKlGmK%j;x?PoGSfL?5V9YDZlaEak1>tGiO#mwT|CtGq&;a%H8$zYvApF_~a5Esp=ctKy39x8c$G5$iLa9@RW7EK4R zH&(p;-d&5KY2nFfU%#%-niALB2G@~JrPHwvuU!r=C7f#c-M~4f7e9QcxJPr8nKX$q zw9k3*+UYF`DIECY-J0d^rb}Kcm(iabH!?NFdtbg9_E1a={harHW0h=+9wkvx9)+gl zADG8P_Nk?>RXrynl+^#56;_&FEH;`#c2f_L!=JuXL|M~1ZArT-yVM~ag!)s)LG!1^ zLVTje&Dfs_g2PV_G>%xJ>(S|abJp6hkHGBLI20rY56p3cu8eC(c*VMjH_*OAt6h7x z7N(YbDwv07rS)x6_isb}hbH>i+fT33Ofuc@{zDsdLZPoJshGd)I}K=t%k>3z$sz6A>3sZlDl$?TJ&d5l8pTtX)5m@@ZZN z(q2=J5=_UK4P;Ete|e`gzw{X(T;?RdVZ!#gzR1-JG8*WNLvLA^!n_jQR`T1A``!$Fno_xr2MJ^6yHFK*liM)K-*2cLdhINFV3X4v(mMc|Ljk!_e->c9aP&m=$;jwZTrO~+_WUTb1}CQ)S7 zJeZ+68_dJR*`{f$MGA+mRAI}0gw%$Ff8aQL-N&+S8dXVBY)F3Ojg2B)cbD-n>tU&w ze))5&O^HpInvcdWmv4=JOT-}UZ8|HX_-eoV=C0o$#As-%^rdUhAGBkjp{q+6^M4{kW>2Q zX?Q2{N8E*k^(SA26b{zz4U6Oj5;Tc0oFP;$?pIot{dO1AS;n9I_ZR;C8cFiC{ap-k zz#Nci;r1`0an{#Q;C8}>s}^4$k?mn>=FH}_6K5^`=j7}QFP(?0^Zt04Uo;bCB%IY( zb6^8iqS%qLReGb4-0s!pLIlWXxaGWbD?4>#p`0yPKS9~3Zyr@#e0|j<9IXB7(P<-+Q4qI(_tL{M%?Nx(8r$TrB#^lHNX3@Y^4K<ZZ@~XBDKIAAD3vK ztStyNm}jIYi24^K#7{HgC4amoco8v@p_Q)Id>@=_Xhd$5yDLI?KYI8T7r3iFBk~Q1e$Fkl+in$$Xi+(u;TihihW<0% zFmPM`!2$d-iPd+#nxuzsN|%!tuyC%#s!0rtHf{_=P&kJ`827X!^X)0UbdmE%jmwwd zaYQ_E=K4c-D0hIi7vB-9?!KArtjDB!qu?PvM$u&67~1|iIUeut+Z=8DS@j^fZ}`Y- z&f%C$W-PaW!W%14uXJ84C#I?DKfPFo%OsqTAoq^*oJ;96(ouuOl5@-geX_@fq@XKv zZPNB1bkqjoC9l0Ap^EPk6-}po>VP;HV*_(=lz};HHol836yZlJf!JDk~q!nQTr@EXo3KU{ACH+SES2>=*`)1BzQF5!Knm`--cP#xeZrn_``DejIf zENgG3AI|f^(pmq(?x1+-hqp&CSL!z$v{QfY5(h|u*H=;DRAa8o@G@(h&%mr}I6rgD z$c%_b0K-a4r;rQUvOjRdk>UVdGd9a~9~%qI!`l%T>5RvqyaI%A@wap(?hLbX%f|BB z0Pw&(mAucGJTgU+u75Bm+0(!r(266^se##2MshdW8!cwp*+pbO3($q~ zCfTFHpo|6U8D2O$a7Xtl7Ny&P%|ULPD}Ug1v8&Ie-o~77CpKnquJoFrh~j( z3_J8J&;ytUsYB|)x-r(4_4R|O39+swejK7LY7AtmPp|0?bsdOBa1GV>bQ+F9#1;bk z>!a^|xBK3M;$857Lm&Laj~UE+w$>^d3aPHwr(wUYrIg86e;ESSH=5*Oml)vjsnuUH zI)}yYux11u4Hv~ZzD9QN-Bd2DtE*Ln%P!z+cqrt+htJ= z=b@2zuU+a4^Zv`36g2h~n*e*rw-XU!9*hOn>bffL?6}vkVg+EV$kpGQ)c)*cIR5x$ zgI9L>O6P{69X19G2=e*7rdGC=EUcW9q^yMv12f2h+PFdzpv1D*I6_80OtiHV|HL`Q zzc({{n>j~xhz_l}oZ}`IUuf1h26Jp^=Mrk~oxK(M{^?0v=nwX=5xj!@*1L~zUdGYG zO*pRmFT2R4pArQILl^43+-GIMv~`ZE3#iGMCsURu6eBwdxw60@$DNu&@92WyWDS4~6bR@a->CeOn6yK^(aRbO&1Fuki{+oIlaIUL3* zYUm3c2->H=SpgBcy>zI%w=-Y zCBK|)r<7uwSTD?Pr#xAJtRio1r|c45$tf^St?Eks1VrOCVvM>cXwfhWb}(b+t^Ne& zp%1)NkQ2@_vdNFvHx{2?jgHg{%w~2$!blwQ``dx)$VyRT(wZGP`#A?CR3D^2{Igk~|QMqRnt2kf5R@PcsuPBkj`v+*{-XryqlS z4AEYI@U|%PRZb&aK{d;&ad$Nnk53%o`}PHQExSYZ=UPd_()RIc;JXyS@Jb$63b_C? ze{H9MpOw7+hl>*ijPcQoTTuQRUxej z!U;r}r+yzBg^D65adXQtSyVdb2Q?cdD5X1irYvv*wtWuiT8|p;Y7NvaRXke7uO=b= zMpW@bDNhMk6AvYZ@0~4X>8X8uO`L2vrZ4K&1&+$#aC-aaI)-NTe4e>#qW+sn{#n?# z1}|(X5oGT;YIX-^qSYgmY!u1)!jCZJEP4O3^z%KQ`_q950;d@LGYwqGhyu$z4a2KW z_rv>H!wY0F(c73?&fS!Dyo(46_yl5O>(Y4n5OA zMI9{Rp)ziwJumsY^Io)AWClEUsS}sfB0GoHyYgZS(-F_Yw$#lKlT(tse7OK#tRGMX3h zUjB*L@tyB+vqq7L)iR65P7JBv-p}xWNlBJbW;Oxj1dQ9#TRt%$R*WBPp*yA2if7-o z2aEnDnwrTSgb?7}nSlNNNFr*+$x=hi9m`*}b-QM42np{C;b9swdHvk+ zIw*3rVua5_*C(oc)_Ayw5BQ@{!tK^?H|m|(PVkO(RkiTbm%%w)8y5@zJG>g|ro#hU zsjH5BOBo8!UH0FUh_O!|(;tM#Hs8`uz4%#<=Sc2NN@(9Fle6#p&`S1x^$bmMS;`*l z_r4-AylI285Fl*nWFUDv%zVrb_J6Ocg`ah3t-w4P`|lEt+j%Iem*$X@6MhPe3Cs_b z&S?&3u4yUsZF+Xn<=emz4rOF4Jc@t03XhMLidsCy zk=+#Q+}zo?mP?pWf#o##)!(eKnJbP`>D6g07|fGECIkHRg@eQ>i{vWK^^5`*Rr`K< z^?a%9jFF$@K9ZV@Z2>QNLm@MPLcun^UduE?ZsfBKzc&?Elqsn9#D6sW)hmqE+gw+F&@8KdDC zijghjT%hT4FvIWf!egYGfL+gst-hN%2i^G5|P1nNv5KRkmuw0h}JpxjuIStGbQK7(qf=&eSO%p!$A=TjP zzBn3vf9oWw)TInLfpT{rI)@3PjKq+!n0kn7(Of*#{ZvY$f3dhX>buVY!DmN{lEApR z;=9J<72AH&A+o1h5Xk7Ro1$4{%SEm$b3Y46OCoXEQk!)quRW`f{O%Ti>j;qdHs5P9 z1L@|SDh*luM~<7OsiN;kwrwnt4=yu1^!i5GCfUV93$j)_CPX<@A~$>A5OLAW;+wRp z<1wun>_aQz;p;Ou%o^^&{dSsHxVT^8Xn&R4*DjV5;fhO(clkr{T*Suc;Ag;q#KBq* zkUau+M)o%E9?Ll0v+7zN?(OTtlXLW<4VlZ9|1pZ#JN$y66up=sNCcvpR$sn&QUD+v1U$IK$qeCI;Q^SL;nXjA;;dB>bk`nKJnLgZfj&Ml$cF5 z%lLETM~=qLi8e9SoPfY)+#r5v%TFfS#F)&;PCCvnD$bYMJoIgoq1pYQjl8^f#QSk6 z^R#~|XvDgGIlz|!@9Km*llb;_U1e7)Z3}5B3FLY9sq8$mUu~+c1g9kgC`6%#r*>wz zEw1Puet5gML2i*fr6X!;6E^6WHuWKRiL)5IU`Uh62wT?J9z;8Lm&I<4LL8z3B{aco zwtX13X{ZqwP6?&QoOldzyO)xAskEu&d7XcZG_M zO=f&T6DEmQ2u;j17)-wR0qsYG%M*hJ`B-6ne)-~g5IZIT$)nK>hj||(r$dbqvM#_w%)3bLxN_4Eo#%oh3Q*1LME6niedAV6X!|BO|dYz>hM4gKx zFUxYzCsTU4GtueE1a?{$%46rDOkw9OJJR*JVmZ5}j^LM+!}M^dcjSL_N_K2~i0tP^ zTG@OtWilEnotq;o(i*YDEtJcR#7yekrkz}g>p9GYG_os3n2%J{^JRm8&e_PtoSZHq zmFm;eGdC=qBN>RXL&418XH4uMN+T;^6TPtn5LD36`JjQ*v4U7^K|4*%XLr0a%P`Dn z|3&PB-<3OcQqv1!0Dym%!EU#G;!9%p)HF!$Avo?K+17?*Cebm$$Y5xNwP*>V6cO=D z7}O$_fm==oCpL2LY0ebm!7})0Vq#KBB^J)YYrC7KBQLXh=?`c!d3T0X@!`!>O}B?e znc(qv%Ja6dkAfSfl`wQE7`uf=`8b+R-e7NHxG9Zd^rbmXhD3j{g=;bufjc545d*QF zc=~e1P+^mt+_^kGbwiN{ltRlrDJ;r}Bv>yCDkwIT7&0Rs^z9zwO?)&X7o&%yFwPXW zcxk5aM6gY4NleHl9+?Emve_7*Pf(ImcX!3!GjeEDymu%sih21C-owd%GINF90}*i# zc~8gJyBqgU$ykxjFb~MtSc(E^$_0hmw`629lK>7%- zoi~u;YSD}B@91<-L>?eTUd3!{i_$!IBdowVH_7$}hsJ+|Mt78cCr7XLKWZu~0gOD- zrN|Zrm`D;NAi^vY7mkU)w?4$pq z$ItJozY79ZrI+It0WyChFG4VqNTLbSY3r~c_nSf7x(|qWL8bsiUaUKJ?2F|iFZaBm z<(BcBu!VlHjpebxDz}0Zx@HjfT^|I%2e62~Mo9qqlE`00-6(P#k9_$EyG!wj#>mXh zeose-R!lI=fRZo8)%QLJPyytT3=s|t-Jd^)r=j3UCnGP$1{{CLFV5W+YvAmdU5Jp99aSM`J4M`?FT|Z<6oA!GgMc!bi++J zeiegMhPpR+kG6kqnb)u}s3u2mq{BG-Ow_oZ7Nww0Gp4%I_0S?kQD#f{jmWrGkp z%awy7Zy=zMVgM+)8uZZEYa=V$2pe6VA@Tx`1^^}fSX~RKZv}BoQz{`)g0?Pn^Yez1 z)DEAk)HQ!&G&VhM=h#$q%#7wd9DsH=Bo?g%w&z49Lw+sJmfvoYO(1dDn1;WvWB)&@ zMk_mwO4L$VPJ~4HaKAE}iLm|LX$R{AEl;+Cwb15f7^-%TJXhEF&wOSCOlHdLD=($fAFK0FqQ{Pb1gAA}QE;m?HU6QkAHS zjuXqXSeFRkAz`F=A&e0-FN7a3^Wq+0mRs3QT*zpa7-@bx=bjJHd9Zqp<28_J0EfYNY$S;wRSsk%quZ6@%?YM{o&HqbKsb=Lg1b%rLmcq>9?9#3 z9;JN4;*g&ILjBhdq87`eOah)}};SAx4Qo6E1&# zD{W3B)*X!IAtw+!<{)cxEuWbXos$NbbSA%pThf^v{Al@J&2ZJ75e@{41|cIWsTGtQ ztctJzqL43K;muN&6k>mFfu}+PDvIP1;LV%bCZ`-?^&=}zy5xsmeTQ&P=!_ANWEZLh zg9U;E4w6p6$pu7St{`-Kz1RWNgQR~NNNG#Ja)iea&M8hc;IvaP*@$5SNJ{KxnwnwkRuW)zxTuoJI=f$^Mk0tUp}xfk+uPz zb8@&nbowx~(4!A7=_c6$J3~+-E8v?&EreKRiafGZSfF(|DU6Z~WbE-w5;8*qu}aX3 zfzJkM6UBuY1ElFY>Vv8#=M?Fs+!-B7d}YUd;Bfx_-A9g!nV6nmQv7ku%cstHe5okc zB#`fI$t>EJJZ+a!904SMSPa>&WK8EWW9BHu<9JLbk8(3;og~lB=TW6a|FY;($z)g zAr|)1!kt5aEu(6wCfkr2bIWaY3^OHa$cicqnbpN7+%4QQ1R+VrNZIj>ZDjU=?l8|q z#?d1yi54Pi;1-r)RBP-Ojjw36esV5aUm>Zb9yH3QWhAv!$ z8Z`AnOxxT{syzjNj zWXU_f;QK{Gt(3(#5vO@^^vZE7yu$mgyl)>@5k%gy<(+ckkyBctfm9I=aYbeC(KCqx zW1~GoBnv6dCB}s#FC>21`q_BI2ZCl1mWOh*nK7mwsi22{RX#h`ljZO6-bp+b4}O$! z2>v8^lh=-LYza(h<-?kCJTlrFJ_zb!hpwbi!%xJz+4#e8G^%!yH%aDmj&_14A*Nio z5~YnhwJ8wjRuuCi)4P5=5rG@i2P3fVg0rauJ*ROK$toOTl3+a~}J^LblhlKWx9ynya^bH$!xF` z6=~KPQ4^LT0#g(qQp5T1a3gemP>Mg2;~kqh-Nwu4b1nO)Z0z~ye<{;j`JP!(?(oUj zy5{d!23GZ1qTCmETeRJ#U#^GGPoj3Y*Jg&ZrdKw9Q?_p2V@@X{FS~LT3(XwkTt{T% z-&pYF4r$)O?l-4pw4F9)dU$u%NEx;#A|G~YCNRqSJX8?te#|BTj0J~Fo_<(!EufU8 zt(F`nWv6BH(>XZ6^2lo2ySud*ha)S~Ijx_*EJoOOD0VWFpes(2W@0;50@fX6BQKNb z-wZl`Njhg^VZFA|hFeHQj9pYBXBF_PW|??chsIpsCDJZphP_xJF(}^xm_csCu$`Z- z(wP!5go1_46ey=o&f17Q)3+PpBP%)tkxbajjUlQWcp3|NdYJ+KFA=C?Nh2>wbpIw@ z$UJ~F>DZ7Mh8-EXsjyxkS-9b=2k&_Lnp2~H&IvuAxK5ODC&inxs2NIxGE9UfP~)+& zdGR^>S2<^VhVI~&b%wVa($eZ129H5d;(~}hTMh%X&v6MNwjNT@L!z5Bq&q1?BOt;d z227_XgPumVJwwddsw}`^^aRqKm@*?Pj2M?79a!o>b^#+RhJe`GThyB&hF(HE-Ap-u z5jj92m>4ufEhqzEL9u}j*es|p0%{tB7$BqwLTMOikbKSw#VnOmm>5$)k%2)4c_auf z#Q>ZT*a*bE&H&Vbc?opNd7Le3av|7;6C^sC8Ufk}BG{1F3>0jXW@>T4HZs7|S@E%W zM6k#}vn8Vvu+r~>Q6O7`s)Ub3id21nZ>Zy^;hCa#N;2-wvKUl}Dxm_27|(|D4=3re zg&f4`?t7;E!uoh|Y`VX&X$VAs&T%>g-(G@Haf@No&E^_GouM0TR*4p<#|BQNtF>IZp5N{`%u;Wgrq+bA=k&l#E7SFHtv1H!8^`?t(3 zwx)z!!q+wC%mD23Nc5dUp@>5|I#{dS)S|0smm@FQiy(a?i!xXOamNm`(J7ahApstL z+QmXf!y38Xessu-PLoxIqiDV58qqXxaW9jK*J3!4TytGpy*O zBU(4zB%skoB5gQQ9~qIcqGwrpp%!)^n>^(Jiflv}$%SRUrc-`J!%pQm;CWtHX_ ztwTh>qpICtud=l7x$=Y1Fk#4rkOU=vTjnxP=OQbO!vRHt*n8f89hG_FH#&Xe*YLdX zG>bngIG8iIQ;rGR9rfN&^{-7cIFe3PK{;2s07?PY9>wJ`GtkJkm5xEqy5cEe`Kh3~ z+rahJ-_9fe9n~$i_oL-)UwL_zGa-uAzW?bjVD=-oP{8*388Qx(wQVXxSwsbYyxQHS zVhoHEOxbMEjSE;TA}ke&Z5W;mF~d;YS7u!@U?jFt1R{eYDx_S485$Tt)+)C|nROhjc!EIXJR8)2;e z(*}r#aJ!w3d;0BOu76gCGW;Jv@f<1qIn{ z-1uZE_)sE15C}n2L-F(utD6t5N4$aI!rBNHUDOo*5>1fVQ|LtM7%fR8xb62BOh&)-l+OC*ioDLgUK!J;JAIsEN7`x!FM(BQLh6XeHv+7m&6@(iC^6FErGc^f#+24)sH^xG$tOU?B*hBO@!I1G%B| zZVQrVQq#EXgqei0o=I9k%9fGcCJwHKr$mPgTs*rvMBV3qian?hlzcq2t zdS}+I8x*(bV(wl&Y#|ex#4m%GLDGY!(|<;w=v6r*FCF_wCD+R_HK{g0JqoR+tntt7KlTCWd=cPnoHDOv|E#$I~^xXB+lr=+&tsD~cO~ljE0;jH_7q&#-FvsGd7JJq81y*-K4Y?fv;4)*5D$?BPrP0ciR#ye+JdCqBQJ)R zv#KmeT-ROPG`qOVJK~8&RRXz{MIX{sq|AiS$gD+_mQ2!xdP}2TV@gVGk&!fF8f~bH zYjv|R54MFPQ1~M+iLIfZr1`=j} z(km>j>8PjyiQ_&}FPG7<#Zb^LC3v2TS(0^EmYvzya&dLvbV zSYudN+8Pmml%To~vV_(P!6JBqL(VG!7L#BshZNBT(gnn^P?3=&B#6Z%Vv@ptf`O4& zBP$#hE3IBdZ^){dZC&dg-urV=M>>s0B_ZR<+m9nFK0b=ZT$k!7zuI_P7nmJ5DPL44 z2*gKZ?8q@+v^IA#OTz#yIoX`uVMibmNPPkc=m)F!kNn`R9YYS0`H3Md^Y><^-06gB zYEq438YGb+i3!V%jFy;Dv}lTd`IYCFMnJU76j|NMW{qiUG?jZbzK>1r@}Lxip+Yz? zq}C%Z@W>qV6zknS&m%87IrA@faJo(6KSpWpeq=+mOSvD<0ElO-!qf`)*07NH& zz4Yz%)8WLaDRax=kO$`!PSE_eD&I|H_Yt6oLl|QfTxZc9h&O@XGa2K5{2BVL!xYMh zKvEMB#EK&?9c>n%EyQSwQo&9|&|`Lrb)jgfLSTVLg=Ymk;;Fj?!vxnQE$s`zx#HA3 zHPi{?3?nNE#(f@j=u4^NoL- zEBq5j5P}XPD+1*=qJc5Y)t1SR)5hF!2zHi0{v4NhHa|^-w}zK4~XJ=->`}*$#12$+wSr31=50^mKh|R3>el_ifxjn1MY!I&K8L?cpEL* z*Njs{!Xe+Wauc+F8$=~M08@f?%@Om&&{Sczgp#@4_~mR_yAe@)HJ0A&nK~VEg;kxM zLcf(E3k3A|{G1&At@~$xLQzgO*O2#eDpaQwccQ}REwd*$KNxPOyCzw|By44r+>)4M z!21v4gU~>7p#`Rq11%n}VJ=aq*>*$GAp=toL=cc6HjM*+dLV*GBlmN3ODc;ps6>b~1REnOT%DSt9|$E&^5#YM{J&hB;&X$K8Kx3LvuETJlV$e<6vz z*me+$BQGF9pxcw^GIBgk)FVf4F1|SYu+hKjXSRNS?t-q?Skc<>6Qwa#Pq`v7P=;pO zcGPR!Y->nu(bZ!N1|u)B;{c}kk^mUUVr&$#ZF`{Z*RfkYk}z)0ib_=;eV_RM_si%1 zzyI(5INkog{QUm^_5bnz*1z?5dq4UA_x;}A_J8I5zuo@bf6MIu>-vA){(tuTE&QMC z=l^$q=l}cH{a@Ysf8YJz&HdlqpZomZ#q#~3Nd07A%>At=58Ql3F)~a)4@vtiRb{B$ z`Y{mvY|@&7z6fM|w2AbQP{R+nJnB;KWAI+}Z_iv1ir2?)PpIFMe;~;+2&#gpu9N!7 z>Oiu6Xmn5Zp}x}#6HCp_kk%iY7Z2!mX}ZCG6M6f#Y1D=%^9ebSFGs!~W`R;q!%Bz( zzMP)FN>P5sk2EAS&rVxbfrYIjCOMMZZEcB2lwKkskz8-<{`C3pu?Int0UmxmD2Mk& zZtP5DHhXd`Za-~$Eqlw{mi!OG=JPE`dUX;F+O%h9&;jT5c4|io4gh>Xl{ysCPDPLsZuFWe77;tIYzEqBP&&rDUx+P5&p_B zp**TRQ*vT+-DZ5>?rbr~R*qIKILO*em?WCEmokOfFc;~)!#TCIxOiPML zl341oV3A&GD!v=9$v0q4B{i&8=Z5x|quDuuxv4o4b)E(A=3 zX%m;1zx$9m8{zZ)1xXVX-{+e-W{Oej5d-^x#OpGrBcb@-w`=mFPFd4s6!6rhZ6hlq zQKFM-X43egg$RMdAUu592>Ur@0l#5LKjMlQVM0o$s{%o|BjQ2Dl1V~@MkDZ_T^4cf z24I`bZJF0yI370jnTP8uj+Nd z*z6HaU95LwlsSXVzRh1h1AGr-IBm$`AS=o%2&92*N`f*79neAHgUU32#gGmpmXty7iR$Iy~ER@*bEj0?O1=nN`7PJ{~z_%yv{&Ae_OmuD>f$}b9{$Npns+)#fS_b zhYu~4B=r!eQVfVG0cje4qQ%#1=WF^lQf|J*RrD`zz*n?{kck!`NGKFU4&PUC>7K8r zLCY3Dx~b|ixAZUqzMp@-NtYU7x%%VCur3~f`k?3`K8ion^^^YqMQsqY5Z#;uxWGm> zpg#{#|M*k=2!G^QqyGM zwPgq%9^L+vsu2Ir==o2YPD(Dkd=w@0sZ*n2hy59y2h_Y%GbP%FZHXX9ovKazzclCE z??K5!7(xho{*E#C|M35^O$3Mz>)|K=-54lKpL?JB;9vXtVw(s53^oaQ9q%(9@v@B| z!ru;mg;fbTZqAUG6*2)8V)(l6o9m|o&FISH5^8e%FzJ1tahY-%Gjp@Co3gWT8F8{085^)Ov$C3UaB?wobFeTaXu^qn zVQ9#LBZddGB$|JHHE04pKWiloKL5W43o{1;CI>O#!C)wUg&|epGKlu>-fUTi`M(Xm zuN1@pVt9dp`F4Kxuc}@t2qQuR(!kcVI#6ONCJlnz5&di*pFPo4{U$%%eYjoE;V=45OAGTg-5F`x86lBvR<~#+Hx?n$UPF)usKPRh{1o#GiPt+pgYSn%T7E=(&w{dw*-$ z>{#Sv@V+InbG>Za+}h7RwDY;_+S>NXzOJd^v(be+8}{{#?P2s!Om%_J-wPZ5C7&3Y+clWO7SH>onvi8L zv!rpgl*um6!pn{=Pu@*4@BX$b5{3&H&rleF9FSJ$Ml-edV>kI`fWGya+qO`}Cf_f$ z@$5s_rL8BgM(jpE5YX($JtRVPUrTx2IphPZ+=)=BpgJs4%QC>J!6#F7A%U>jTG?>zx_1-e}4kGr2kg~n3*)T zuWWLq#wCIGRK>xm;(=o}EHTP+o{>NAVMf?y`X$LlfBL~hQI&-bvH=tvqYCpXUeK}= zJ80?r0zS;lm;bf}V-7>|(am_O+U$gSg&)=2*4}ZkwCVt2Q18{YZS56ZVlOT_Z_34h z`DN64o35~bATq^5cteFtEsq&7C@zsHYb0meP{z#Ov1E8*5pzQF@BQO1_cjIbpGxfI zUTwSZC*!UA+0xux7T}xh#lW=-R7$G@YDT-Im$#*dL$trM|5wR~Rnx^2-`tGQlJ=8` zmT$L@j1+9JwNhVFSAe z^IlmxtYX!ZU0d7c?!H28E|n%uiQIgtZ(=ghB44F}Ili!25{NC=7#gFIO|)VMm(DYV zDxqr>7-@zNk%_PvBB4{7=9b1+rc3%!2af(kGEO!fC)eob&}3V)30^#0kUH*c3noue@IDjQE7+OF1?D9a)S&QG*~lV!u2XR{GA zFNa;Jw6>JNp)L^112G8CvQi4ABO+mZVdfBnQJf8@9!ih1#Dt1|G5R`yB*`L~n+Sri zmuZb-QpV1iuSH=M7RDN>iA$NYdud^K!Wi zIcQ=L)RYCEb`m_%8`x}V$Z8~QU5I5+YJl_KOzhzrbffX)P@d+gZaSIN7L%CoB zX0h<7z>0RoUJ;*wErMQe5eH z**I*9U`gu?@u5HQanK@~cu8O;C|w+{FbP~34`P58TPh)nhcz*CB-SHGprr-Jm-&^3 zt}&(2(&NX^))C;x$FoG5Yaz)-QQ$-wQk$0fQy3zO&Z#07F*j3JriY2Iv1Q zTdz_GVY13mu4ah+^dA~o{W>%Y9;42)4l^++!lcK1wzR^~{~m}9HP-J{@rhE7_(CWv-O6gS-%iqMvBoQa|y#J8}BRT85FiIG}>7)&S98noi+q0I|LwAQK=P2}n2R=Din>x#qT z5yazFq$-5~wkZ7i#0-hO&2*+kl_PoYgiv!Sd_DcO@L<7?SRjPg3FyU)3vt*o|T_6XiZr@dr3T?36zUIR5TF0S z-;n0%v*#}sX-KxWZ`_+Ydle))^aKnZo4w#oU)#dJQ|9%67>vTuQN6;l`xU}f_^jsyUaZIgeUJb;`Xc*pOFaPA@&6!Zo6z$Ydaa zgqpJ&?6lN>wV%E8qyhObewar1l|7gn41$=o&%DxA9Bf;8hAFQl;O?BpC*TV+dfr2~otAIW-w*!EB`>FbSyeu1lDd#SzX$$&hFooY3wz;5^%P*#acE*rTP(lo{*AZ!?Bz&c z*W!|~fzXF##|LLooUpz;cx#v$37{={fzZ0RaJnRXUE@#I>uCEPz-`VnrbOP*0o6K9 zo#JM>fV&7Ta(U81EVY%zuF|ndp6I9i{^RE9WB%Sp*Ev7pua-thgvy<8MRWPHc_r6r zlz||a?{NYuWzE>0h&u6lU6Smbw1`LY6hC>LN=`(I15TY$Ma!w1fY4L?1T;ZsiJ$S0 z$;dF`G#{_DAO=rq(UnP z!~h>zvTbLsSEiysmxS6@hU2<&g1Pr%C%B!rlXc3+%K507O;=iyZHh63+YcjV?0~qR z&8@O4J}Z+$u*YFoW^uX;OhT$gJr8jCj4L*~$k}f1ib-qeN*$7v1uIr9Mg40pBF!fOC^CsB~{%TP|iJiRnmp417DX#g}Z?pCJwL6#0nZ5O6%KK%=lzryU zCBmZ6@7XmWBnc?MdnJyqdNfs)p9}SMj-yM-fI+k&)RE%?FWE-~nqwuh%G2gfl((;C zrzVlTT&2c)9>%Z2G8W>1K$(4+$72Os}OVn9oMms1E&M0@LYgR?`QNHP~ zXxqUSsI@`!!jZkg^|X53<)Q$CNzsd3R)zLtS;#vp76c>{kr&95*#}g^Rv5zQmTeP zwZFq8(-t*9!x2S`LPJmQhFCG7am2}aQr&m7$>Wy2cs~{HS1RQhtJV$jf)wPS;dQ!K z?vCzJl_j8-v6}lhasFwhe^SM>>ueFTc%{jW2yHJ|SujVgJo_wgDg<^E;d*F{>by0? z<9VL>ooxuRj_NV@FDs?WeNMXX0g~H=U;!YF4 zj;YMsGn46R?MK)GJt!VfnZdX?x?^U(7DGGp-HzUJ5sPMAOB+*vp7VQ{%gyyUKH%Ot zp9E|dA6%S2WGe!^h24DZ)luS?b571i6m3NxNke&uEBo3igj*h zH+ISG%=FkXBM3XZ{B}F#a$hb61HEiM1xKYv`j7~`n;2`JnG5xOG4!_ZB!Flw09u_B zPfDtIPj9yZIY3&nL`o%E{8`#`#wZ~*iqRoBOrjvu_I+#oad9Bh7sQ|_nS4BlMQId^ zes6`LtzQj~vG@>>?G!9!wY`meYUkK>vSYhBNgA$LL;oif3an8(G{LfI={`IzKKv)= zKR%%BaT)%HZMT7G`>0K})Y(Ifp;t4KUO|7CdmZ~sGxP5+M`r7G)N~ktKB9aMYB_O^ zYIL4c%0M?eI{EkW(=r39g zwt-r^CV4N6!|P+BK7qF@t9nw2iyQ*6fa$XCKmel;o=7CLp!*V@Ds=JU3LQ89a<)JX z86QAv5g$=`r@1tn-h%=bA+pV$<|NS6#L?sRXe*?LLIh*5Qdego2_upQbEp}7RfvLC z*^e^4vt1+BP93F^9@^E*qUo^X5)T)Fvt2{Wuvkx<8FexW`OxvPF02Z%j_XL0VbX|P zu3ePaq39g)#eu7gDdhy%zqeWX9?DJNmnHGk+$AHz{0w*Ow40jnt(?uax zXbTJ*=wo$?Mw>vT?kdua!b~uNgJ8$SCI=CtD?wwAj94ILP}?e-XhA!ZKTSEg@kx2v z&R?mns{Xr%_1Z3$k~f@P;z(v>Rj<59s*2N5)l3FuL4D^#k}lO~mnlcHdp+4$nVY6p z&myJ3%m{x4Q+rwo4&rRvPP(s~mwI0z2}3c#D@&5o@@GIyIy35{rCdc%V_jeZ83Bqa zRU9$5yAV}RBJ(GYj&eqr-UnIB%NQ2QD5Pdp`DtZ0r{8+OXUW}nc#cv%^xhYj@YzR& zHB7}l3Acc~1jrd8j?BEvbvuaJo1hv^x!<1ZlM1X!H4Tt_IJzm+liX)}KXRG3lR^sN z;Vm-X;Q<^*Q{p(?%oWqNNDr&;oJ-Ww+_r&rxhJ?wnkxLAQTY)0jNKk~i~RCsG`9>} z2I45l6W|(5YIWc0?KZCsT|QMn=1Q-XQ*4&|N```T=34Y#Ehr|zXxcxT8WXI8h3g}A zy0ugJbi8+`=_)1qrnN5Xlli*MbnW)2MeX@k1c)A`Nw%Y`g_Qy23%XR}4FyS`@d)7y zGE-2|sFi>Zy&CEGAGfln8C1UBH$swU&95dnNMHW062MKomxYX;41Lv~@YtCW$C=?z zbv7{~*K?Vjl2)oUqz?TcC(%eHke_(yQyjzDlzy8R`f5Vek&aa~Fi>hjCPWT`lbzqV z2A(Lf8CNY9?GDW(>TCi=C9G!Ad5A;XKn%+$($p9?6c?Z5O_ZRnVNC>2Dum|B?=l!x zAK4f^%=|hlIT;<2kb(xin7VTi1f@Ejh zY<2Ge_>UoN<?C7vjvFYaZ5$hW?{PK6++;Rg=2M0V)O%l z7ULharo@7u6n?lTK*gwJ$a@G!q|iID`zx~4N1c=3K0YU=KPD^Vjl<<|DXiQ@l|CII zQk`F=fiXEI^l!t$BRSaZ0v`k+$pArOH`1N(J=Qe}OX74NMLBZDFE>|i^3!m{mdb@N zXk->pzXWcCbvyE$^#I1M#1#i<`_seGoEvv#ZIAux1Fiq=s+3ER%zVS0dAD(WQ;j)C zIV=jK^HIz%m$Q8sZMTWij;98t90sI93*+&?fzVGnJ#cx5_*8d}_}b^Zs_n^Y4NCfQ ze#b{kvu~p6JN1_Z5W`@9SNhzl6ECp}mtxbOe`7e9z4Y)T)W8`3+A*9J%gSfIz>@@h zdi(lL@yB&v5k?DjI$$|w(sx(<3Yq#f*@xSUC9k@*MGj`$i1N#)it z5Xl@Ux`+f#)l0uBgt)M*5Bs#pci6`V@Xt;y29b|60=y)?WhSbO-IWM)C=)>6tTMp| zWm<$c_b?shrQPtfE!%%GCp6Y2?h6|g5n52o-fUgZR5N|gaWm4#+VJcIH(kX*%y_Yz z34M9^VC)6s@602q%~>6k0))!{2sn*_c(q6a`E(ozV#NmBX8WI74HY9|*kjV{Up{n* z*5c#?L6DT=`3#qa#Cf|&AH^x6mnKX7{Osx}%-8n}cLIK@Z;f~vc9R{c&q8S(Ki7U^ zk`$Owxy`=&Ybd~VcEIZgBr6b~Tn+`^n^}K)sn#4vm#SxawC%t0lbDrszNNIBH`e@{ zGujRHLwvbFU~4AtdsTJ7IJE*gUQ;pP2A0;SIeVg*g`Zv)7KEUR zmiFXpbe091X*Wa?=+TnJRIBj6_pE;?9IbT6cLOeDiw!=pCnbL>s8cN}&r8;=u2o{V zB&mqu@s2nz7CT;j+9R1+MI&rfh{VbH|R->!v171>u?IpeHpO7ei1E1NB7y*bBgozAM!+C0{rNPsT9i#WBi;x zh+!SXAfR#6D>!$CJ4cC;k3btxzAKk{RuTtCV2Ims*VP`8=Ypbs5i5q;<#?(rbp=_4X6l*$<{vNn!^8}a|@>iMN zILgK6mQQof|%K45xPI0i_q~S(pt2wJB zsrYo|utPC%V-`+CubUcE1><0v0jzVLq06Y6cYP9<5?;GTJ@cVn zO%)Z9Ccbv5Sfd4CuyVpRUc%tIs+&1sTW9Br5pvjjfl_k}GY)>kQWO}p5IMigC~+M% zttbRRHhFJ&$n;BkewxqA{6GsMwhdki8V|jD+4xs{LEW!wXtF5LXZT)~hjS_4&&Gy! zj5yWp1jkLdR;vSe>6Nkny2{v(tQn?^e0+L)u;pX)XJt&ZyYRNO6*won_VN_3S=KnM z>E*=De{b!IX1<+Dq7A@tp73}*nLa?Ce7G>EpQ3VH`|`QH_bf-;^+4tajg*lSK??pw z&Sr5@vhyD|0CN&M#33hd@Op}`%eyTkG&EBG%F(!=Cb|O%9Ju(NKP96aMhQR+XnUhf zb5o6H{H$Tp7|(C!+`cXpPEZ+c?sMXsJ;k*ZKQfY)w;Zj6Lr}u^DVcH6GD8iAZwWuv z3PdTjrLz;?&;eWI3sthVj6di%aY=@rA5Pu%em z4<=s6O$UJD`LTVCxfB_#qFKiWwav(Jr5v+}1MlvF60RQ(`SMYjIM2mBG};w6 zbtD7!CvPX@-u2Jp;ha?ft431HxVJa?ui!$o#T3}`q{zOIW~|K-!=;HNx4emMI+l1cOkGHNC47cfa_50~*0*H{^HunWkUR$dPm>!{5a zv;5vt{{&&R*jJ}+#R$^7gH*nvg!r_U7Yv8=ox5)Ms85XX=$a=?#s3$m4)}9<#0{Sj zcvGr+ymBKFI}7qZUiO`~-*3z69`Iu-wo(XU$odR?TPR`OO(*#FoQ-&@YtpJ9n)T{h z@Ervy&|qXs*P=8i|Vn0=-_4 zTG%UCuDe4#kLNolJ-E2+s`aS6JGkw3t$8P0-DK^%I>akF_u%Ze@x5~--4$pB+LM3X z(yxCN(3p_Dn{t7zK*l;lm?|55%Q{}k2F#pn9$wzst&L3CLsAu~oO3_I4P>3O>*y1v z=r?PAz$MLeBV9)t9IC3$HltA~r!Vk@tK$eu(d@7+B}SFx6uw<|X`KfxvYj^bHRF1g zl(ZcsBY?v&L_Aca@bGDa8~f|OkdaCSPc7M`X8y=}PECK|&h{aRo>m}rWs2$e3Iy10 z4$8%+`VzhhGK9rIc%r|24G2=~>WdP3^gNp?-0-uMU+|w1_cl6|3pRF_5A(5*MJ(hw zlj%p59|ZOenX9yGs@XVB=2khB|K?PiB)G+Al;u#)a36~g=;@RQ@*V1_Vzqvk{ykbq zbI^DhA)I#>QYf|psvqJ1-njkf1_&f=+bLt~62CK}t*$E_9ZE@Hc4f$=F7k!+Xqny9|Hl)$R}8EjirDy}i?&?1h}KiYP~3{6lqJ1?s3jw*Ub2>m zQpiVUf(x!-be0+9tF$o^qOS<`HG{q6owA&}1<7{1^Ml#1%X$g^{RQcNfTA3EdyW{8 za_Gnqs?gC^%jISF%Y_ss+V^gZYYqf^VM}Sh)u4EM@ZC?Aq6D&jf@lYpE`cYi?V;z` zuK!Y(SzooIOUCMpzOL5_V@ziA0ROL>SV?F!znORQ=F~9Jl#EF0u{lL#V~Le85xH3N z=3$nL6?a?NeOIj;E5u^i0eKzv#c1R42{4q<#5Af^1Yr!sK=V+94M} zp~))pC!0fN70-%FO9V}r%iWG21i^G>6RI3;g!T?_BJNU)!56vTInI6%@c4F#wdgzb zt}B#qnO7%5=5~%T)b9lq$sW_CG%d>HlRymA1L*2fH7(&rLHp|fk0$gM}pQm+TT@?y&9 z#csecL}0jj>*rGdh@qj75&qOX(%5b9(9=k%&x{v^S-hRRy_-P={vd64v*zkmzlc-D z$!P;GW4#7HBw!J6(vp;PPUPW;QX-9YJ`LycyIQ&m_3>G6D{fZ4-)ZccO(3{YKHUs;@`@(*Ik5id)nvF^u}0LfHv$hsjin3 zs|C|47M6#8GCf3oE)O zDG-jCJUjM1$~MzE5!W|4_`%V^KBo40FvsQ@wWqMLv1yfE?vs8L+Tw_5DbhYFqWSz6 z&jaA9`V5i%4~o+o`PH}o%vw{h+1Pc;g>5F{s)=CB&h*@SxL{q!`><_(uB^qYCboC&^5iHgHp--z=aL+E#l z^Q45W{@KkE6k^+RdA2tl`{OhcIf9Sc9Ch`uSuNUs5?V2wTUGP@D0_KOe@K2z zV8k&-j>@QJ?3p1kHD-iD7;o%HjbSh)aMFft((bI1I63~_J(=C>uQm~o)zXHRcMlZ)@b<+qUJCypUs=_4RVZ?2p}uW)Lw?lbh}nEwi=BqiUi zVUSdIyZ{)FI$F_`TJKcsC2qtWX+SdaVr$n!N8z7g>{BvM4qg zSS*-1G=rsFc#MbPMVuYhHU#W#9Hvu9Z`dso}vr6yH) z5bX7@1^f%OhLi@>FH>`9eKg-umB0}=QW~m)L5XI;`dT>POr;W2RKbh!S6}z>ANfZo z%=B*rvrI|$WYo0XQ10pNFF)Ts^g2x;$r0G073g9lsefwJ0I#)sySmd6^!T_KzmBs< z3vWoXjC6kJ^qe-YMiRP&&-~uPdsp`79-s~^7w+>12{(&Cxl+Mh6w&6yiXG^Y@4?-$ z?@Mld6o^rr&VkA>u8S~4Ok_S0GZmjPufVj9sMMdUzIyEMxO6|o#9r-QeQh(HoTzSD zL&K6RHpDT2hBE_fvEL*beW4^J9-nZ1)l%2}m=(tUO0#ejT{z?mvY~58P5#^7Hy$X!ca0IOh z41E204(kc5hAI@Sgp?EG%`Z-fHs!9uNcmxG9f(`OEJRmArWL8w(ro z!3nMm`Zwh<3;7kdqo}|L4&(PE=f$#5`*CggWhKXCDgGzVQJ#}VWO8qDZyTCl{6unI zRU3hWUm(Z24v#%nmmdtJaNA!AvC!Z#G1-JeQl6)YYV7iSd0rdRd zV_Z(1qmi+@kI9uhxiZrlnmt*WOkNTWpU^B~gn2iqgC=9jW?axgHY`;H_dAq#W~VWy z*2-V0B|VNNMBUm!4!=$0b#W9soo-;fUs#HjZB7Ky%$fMB!%P-4Y^3pj*^(g`T|qeH z74J#^F)ZY^D7%{`02TqF*qxjM9tGKXLUW?eKHzXizm?Ts0Wb!!akw5$#q%KkSGFg47z>ZoMab^8EnZ z`gl2$bS>_h`v;W%K`R%2mYk{kkF(-38dwoA9m-~&2e>itpc%*XUQBd#Z=6`>r0-MY z@EV#)0+oB2mZ~|jMP)Z{+y22?6?dN7x~YHP`fLm3-&@M%sZ>yJl7t>?3VCUgiX$8T zn*V14c-Ad*E@L)M?|y7#_)mPOp@#rhhapZj%MyYRetkFZj}v(!Jz`1?1;+WkknW&i zPJKbR(8AB8ja&}c(WDe7+j;H>=l&YE!w!9Q^@rDz%|QIMZZr){S!QkCV zJ@^y)63!S|evX~}#cyW&q$%ela1oyDKLr`ucVtcjh-~NHoMURep?%fMI zXs0D~4?;M9Y zyjbNXU{xOyv1xFCaKiuSi9*L6TWn zS$XPMKeukUBt!+eB|b$W>rUtIdXYt;+%r3W7gY0pzwiu?{3R_ftN>8mscxU-^sT!U zekd`Y{Xs+cQFMZPn|&EyFS?d171+fmr}$JB{6jd*`ys8Mp2Z!#vY4RI-29mLj10B3 z*DGYx43VgP&}M&@;>72AAzu4~mgHLF-AjSKz2kDV^2ImQJYEoTwtPKba=P9qv8c}X zW2(TTOP*$X43Afxh7(ZP*sp;v)P;f=e3%^fNq!V%9AonpTe|kW8U@KNk`FAwW%VRA zCM^WZLtI4{1XGYJZJXlNiyeiEgUjNPMNV;}V~ zO(Ywjjs5zQk1dps#guFM#XoVXMXvb3IL*)Jq-=5?2>R`h#V$NglSILQ;xi=o#_vg4 zcrRt2$W=OWotW{pK%>Tq*6c`xZEh>wHg94g!zk=y&89PM?MTrYpq3Z;caO5 z-~N`4y2D8)3M&}{4J1oX8$n=R`Jr7=as9$G#y-8X^HDv_kG_QI3KmU3#k5uO3-K^O zMRP&`EKN*UL|B5q!YLN3tjV<5haRK<1_PDwc_Vt7emvsw)bcif`V7g z?D-*AN1Dm|NzN71xAL8zfwvut3n>TB?^{tH-Ys#3T3jDJ>tp{FHtgMbp4+MnTsBjm zfUa9RD0U_e`RyM_R@-}jCj2^cMsp4S;TPcvX#cxw&2n~Q5TrVO)$4j?J8JsLilwH{ zuj-?8F>QzBJoQS|kO&J{>;0E?i<#l%z2|hSZf+mH@qX&hE1iSGWK28dva@YJUAy$6 zsuhBA>=O5$rzdBhUl>y_&ZQ94j)25J(Qr=Zf>GJ2%Jdg2cxgFV#Vj%Rl`>{{p?^|= z36`pHcrfZgTHAj`syjiU{*|#tRA`yPc_APMA(~cfMdT6HKsE;B1?-kosF;$7oB>l= z%)E79VP&9DJd_l<#jBv@J08bAtwCgSWL^*!fzNX)Wv*Y6c)WYxwC^pW8LRVc!>`DG zralmZ$QM6N+}P%DmS8M0*`UzEM42L>@@jNvKG}iB9NO6D2bFF?Zu8TM_^pke^n2e1 zMO}{1DVmI7N*ythnWwLxYeE@W6-qc76fA#(7r$AL+c#!=1|ef!EpyZ%3%M`0D`7QI zD{qo!As)nIcKY5 z0LM|>Yd7|~dVg^Ros-3r0cwi&tCs+YT(#<(bE>bv*?IM;_VWzLH~lQS5Z9_m?R(hz zH$A6luHl}&VK}yn!vJqLE^nswH{U&(_h^d_m*A5vG>T-hv-@?|yE}?Eb|0dYuFh5qsKYyJ2mRvW~EMj`wp8s z&^k8@W=7t!VztEIp@!!#n*Sx5;;vP^`XzpusbrEU2^f379r^Q*AVlGb zC6N3Vb~};|KuobEAY+z^o3g1Ca8yA_x{?n~Z)=7m;vd!A^YhnBV@^gt9i7M2$U9!52fN_pL48KU^vF zQfSY~M_-N?{m!azTgOMt_M6DN!Ud5+lyKPQkl~-70V0i? zyi$0Nz=S`_-JKhWK0`o7&CFqnqs>eBZ5>kG)GWCkeD;1?$?b7avxkKv!p^|K4;G#; z2$2diBFCA`K{bKu(3|B@%A1p|%ZHV}k-( zKFDr;`uuT>=T96DGEa>Q7d>MSSpbYA5V4pDOrvmR>EVH3M!ne_m2x z0tQ3Uzy1!Vi|`((6PCFrd+gsHW+5EQAMN`I7yjvUL$#j8K#1T{y80DtJc{(%)e<}f zrx{A@j|aOTR4eJg6iB5mOyauBMSZ6mtRmaL~u zfU6u-W>fbDCw84G8=`jDb8s&;yK3aboDeFB4;(J19vqErVEzDIu69JQ``euact~(b zQ!@3Ncj=}671!ulYjqolX-_H>U!)!1 za)ZZA{zZPzKJ7AKpEu%8#9g~bIl$vUPHIY)t86g>b(&2NOuNVoq`cS0);F2yT6oKf z1iWcRV@pF((`JSld4$S-M{N@DJLgs=A(?edj4W%%n#NA0eY3ngq|do~9H|>tAN-ZO6#FZx{vm08#8MyvnSKbxVwn*&zLRkQUJmHJuWotmzLq*jM=iQs&3%qKYh zyU%Xz_t8d-!>r5%f6h`{N?$he;Iq*W?qJ!yba69*+0zW<{m(fqrN-yfM4+!osP~5p zffER_M#428<^f_zvQ8U$b{e(>dLHzQnmXsqjzfnf))w2ABw93QAu{Gm#Cl|ldAA`G z?QTQUM4|@=*Ib+04aH#*ZLCpCV@r`2873u}d~%m5K@AxXYY&6hsjbNoZgHE*ufx;z(#==djZDar8MS(0^foju)3wRMxz6 zD{77JoQlDM0FkQzz0+&1w=6M~OTs{;M+Z`;rG?Xs-Fh4eRpgW`qqY} z1)sV6E1jjk_DD9M9*Qa6P*|r>lmsh!YbQX=I$Se%xV&+5vso>){B*Y=Et@ry5OBW& zV#MQOIv^0)F!18@R6GD$L_Mb2UuApj^7#q7+8S^plw_&gj18#N8q#AWv0|qZ5T9Xh zV{NnS{muLigSLfPV``pTno0cNL&=uf&JG;AN@I^aWTWzGS#H)CA+GEvm(% zhST-OKGlYC;^p6VtsXrpSC)fDOrxs#(p-6wcSQ$vz!Pqq|8ekvy@9<`XAftGKCXpP z+F^O4dUP`rPtuVP_Kp4{Kasla=bPm)yQFipgCM;s!+eePp%!AcyV_vNz3!Jtt7MP- zU=Mw~Zr#9XrhnYSJM@i*qWOfwBB!w)vvo#y^#S?Gi3jvq)y^`$RF{7nzM>vzsoAy7eafki!6O-u5Wieo@mw5M2F~ zsPB@c-Lh?+YD6b(d8xMDkQi6{28da|l%1|zvq07hW07cp)Rb8y$OQt@Lg=@$!HBm9UjUd}0mVP7Hc(a0-@TO5?Bz3`6GY{m|*Y9=9LouP7 zyw;Ifw1pYzOPNNGN(cg33Pa4~HcnWfJPfe~X33lCziTaSJQHK6WArIfQNEp2r0%XT zTj3Aw16W3V+lef7IV;z`YV(HC4TJKSr#LLHyu-B@yP9$(VK{;zawgl!(6wLuwS zXSZ0B$!qtnez2s%WXI5CmeQM%eAQo47fvG!#F$Q#`*I1Oag1_YndQA6Jlow5{Biy8 zd2Wm@DuHb?;mcJqcx<^DtkBj-$1KdhjVp=ETM(LOy*v2Dl0F-RB_Ftdr}{ScbVp|% zRNHCA3l5yltd9+c25y@gw$e-gH*OY!=zLt;pJ^>XwgC3JtVNYjM0F(z#X# z=$S6HawG1Y12pBkPc=t(>-Jty++Q73ahT=z1?r0UF*w-p)u?(B>}F@i)Aiawz_Kq-wDfLv-aprk!%N`yh^Hw4K#mLR0RjTK_0^jX8HHb(o&Ou~{)C_y-zzlM7Na{GPC=0umA#9=tq`?Yd< z(6`F9)Nsx}(CF1<2WauLcVGPLfvt!7QqyNAuYvnV8N07_hxbcTfwnip|ny!&_ap2rg26;?Go!lmw@)LuowUjgRsgY zDX@{E@zhmi7dP%P7Y&q~g3iqBlt zZ4Q#MpO7HZT+S+kS6*6~iK=Cfz5Cr=|4k&HI+QRuxtg0Rg&MF2fe&%Aa_TODe3gml z^ToyHUYxn(EqS^JNih6K^{-+Mtr-K#dy;1_GbCn0%U4-E!CSl81`eR3Cd0-VM^vD` z*j3&b2c?M~)foSKpqKRpNo{$|?!#iL-6IF%ldfMugxGH)XPWTA1m2%fbw4`U5437G zV&;>_duB|3QpEfgybcepJ*pkuFE9MZ?5H|CNID5;;%3}IDm>NWONZe{LwKJElwU??m$EhuNFy$#PuypYQnS80jiwV+8fa(Af!$1?yTF!!Wr_qx3eaA1)2 zvllcdUZ^I#YZ3ue1V( z{U+E42`mA;I)>|99|5B1#l2jS9dE<+`XILT%H|n&pzo^7O?919Bbie&!gT7YWw!&L zl!&2_vSoi7@0m+O4tE-lZB#?&DmsXrg+4f`OL(C{ThdCYf#)oHDA`mv<1#HWd%W|5 zI{koukDumcp@Z{x$q++9{a;UC0sNb`zAK*n94o!F$!u945ICK5)@vahDQh;f1)8^M z7AfxxbPqN_3hb_C866^-*$=tr52!ZGs0IWilcx3XTQGxfI6Azxj-z}C#=X3~7RfT8 z(|jCi5bM*&a-wwCje83(S@)T#wa9I=Pj88w`b!N(3@?E^K(myTYQ2KoG`}NdpJI_# zsP}YyB)3-cbA)cGMRsRrQAXc@sz_*0C0K^(NR>zilG6 z)^Y%y=E#n{H=1G5^=2hL6(1{I^(zJvg~sT-0xf-*(yAbcn%bar-%I;lWsuQ%O8zl~ zU7IDm2PI<|Mo6ah~R}E`Med z%Dn#wm6TY)s`Wa%qZ3P5+Ooz2IP61drxVySm>#&N1ZD6gb{b;Vl{~MNwPu8~`m0)) zlVvvxtMgLlF??Q*ElztZyC6tg=S_%W5J}fMvnUkz?>yJlI&BsAxiXb9Px*Z|?b$~4 z9dSe|52ZiE=ae5#tcr-ukoIp76o@m4Of)S;?P;${j!>S5%RZ6rms?Mjgk~?SW=(gN z){6}3kYbf`msX;TaO{IyeqGKY{aMhvx11NFS#Tu3!;+BCyj$$X8yNO<)Z2Y|dNS|3 zGFzFHxhMo+t`*W$j;~d+z1J@(suO+6{ zzN<7?$Xe`EQe?)$&QUW?X1w?D7Y}zYl1 zZ9bme1v;)1b3dvtD^swpSO#p(x#zZ}n+jXIe1|o98{1Su?Kac-_;Qty>2hu`dHO6ubDNlWG(D-wIA^&^{`s%0 zF$jz-fB*Ror(k`1cRwxO1oGoep1hrm zD(_b#l=@AFEBNZ!b9dDGd=qA_koo!ajE4fFsiSx@IFhGvD*EH!nEZHrWU_q>?$=XY zt*NbVQ_o|3*f*R2)N~BXH{zPRRiB%SVwKw+WMw-mwyMzJ99xsi*0~oC-|Iqk1wD5+ zso}K-rIV^}Z}@aIyi8)P6mawKN_^hg!xVOZ&A@tV#4)xihL?fhy$fWOw{|s-(aagW zrQ5-6ZBu(a+Gcl{DxEjA@htZM1&-o-4F5)wRVT}!7O^X!Q?>P8@Z4koCS zjKaoHr$hjOl>27;Mw{2CWTMpjDx2c;x2t~g1HsQ6fn`>I?d#N_h3I}w9APnLuX-w* zCjrPxB&%k`f#W=VbdKGQ;S^b>T5Kr@LX>?%7pW|%%^XZ&o)y<}ow@GdW521HL>C12 zdztE&hJpacMwLug{r20Ty~p+Lr(VxY|qd8>bt7p|8BMET?)|LT}Y4b zIJ~|x&j;Es73KAWQ;l9+rFevs-=yFSO9lFX5HmU6gz~YKS0PAU`O#J zpa(ME3b%JHhDMZ_gCgL36pC;CV$3)GslIaV>L0G^u^Q2oz}a@KY^TUa>*{8?`0Mu_ z(g?U-Opdr7Ck01A-{oCjDv?+GxHFu>LgntQh=*_T_uKBg$1h%4e9bw^?Gqx@yaa5x z9^d%`HtoT0RhkIft+%I2zT`flm?u3&ih!nh>u60$DMY4nxS-Z}YFZ3``+R_T_}BCN zh1I4Sa}t0b9~$xIoABfA zI!`WxAciJ{(Eb*f=zYdk!R%H-)ZiS*Z&*rofwOc$Bu=DHm zE6$Fqblu=DqIJgI*iC%NE|a!%ZKUyy#m{E(pm0?G<9RRiiLirjZ&ROcUWYdcy$i>l zK;YLO`DTr0^JKJolQvF##SJ>6_Gf8$>+}JZh1wLoF~qRhI(o@x>?!3TpnaUfK#8Wp zMosUSWbF&B`h$rz2`pSRSxPW4>>~@kbNofMn=94r-O>@kEj!6@JJbO(w7zV)T`{&M zV8lVj;`p)uGI;-vHyjz=UUu`IP5*mZx~g3)w9vy%)dyez@kC?u4-+JwcRT8+8L~|d z;I<{zCQC)bv5~sF!)K&3Vy78``7Ywh;c(`J574n`?i*@m{g$E^<)=9uowhWkz4Z_cb!nY4RMkr$H*%qU+IN!1 z&5mzB%ZMJTf6P_m2*{FTdz@psN~oh4YBP+8Tb6-K+| zlm6;Ukgl~cS(*nQzEM=@fX0`|(i1o(DXyo9UZU}tQLyk?%vQRUy-PcDwH9D3PR%uHq5yyS>jfgs^J zGzi=~*(mJt^WotZjKa%{ zOZP1HTT=ozAd+A!#BM^UJ4m?+K`}%+&+oQurXV*~RXA`NpClB#%TmKLYR?rNz_NEH z3<5(?kzG?mbRK8HXYu_Sv?UuWoa3S=y57>Q#vNu6m-lc!W6+ z*rBPfdL9aeCC9TfYb!)jHNuW~N|Pj>HzTZ9HfN>M2T(|)%M(`#rtq-dA7hS6SI7JU zoPmOJ>?+kT;|}|f!4h5u)erEqSH|lH+&d6KFt(b&O8=C3TZ}ZvUhpF@*`dlFEHJg{e#%H^yYf zC7PQ{oT85P+e94Zv|5|ykZg^#a>j1&ElU%Xl<7dN&BP_o$oSk9qC6>QsHr51^CI%B zt1aUML`&FYFlAgARJk^@qNW?{zQCQvmBW(iqYX)jyZ|K}@ZZ6Xh9fZ@e$FaAeap$p zRc>`6sVD92I0!OI%pj6^d^2%0oyY)D*KO91(C_~zY}D0tyV@;c$tZz*MiLavG|Xl^)p}%*}C4vY|r@&+%e!Vi84Xp zOtC)?LuFfej=USI`TVTuJr%bV*2|oj5}kuFD)s501~3TO_u>b~MS&ypG?68NO%_3< z3Z{~~iGMZrfxFd+zFi5cn&-}kTrv}Jw3$DS6bN!YsL%Hf+pO}Zlo(#`JBglKw>(<= z6cgN0NXy;im7pgoMlQt;z?}qZ0&K5rh#j|1u2Y z-kz$f%yg@=$^1(>s4)&fEh;g52Z7smCIgK4kQnv|Jq{Mb`U1TG&p5^s`*+WV>X_oD zAEAyau;-IRxFW`R!<60koAw-pR6v(#>_Ke@m*IiD(Y(|M5Aj}lhPz*CkV2)&+x0yZ zarL%v9{~hW$oF8Qb4>48k1gU9+WLX%8P2J-p@m#hAeaU7@K|JX^+wd@HcoVU|9XGq zF+0M1gpsMfKOhBsDVcd75w@)E)ebrCTxiKcl2sGtb29!Z-Yj)u_m(v=@eGG$HZi$89nvM=^G|pP`$(B8SeHy&Spp z;l+9U+DF@vy6YfjbP+%9MZMj{aO_KNOLt~6WfNC~oq-;!#!Mz|xYm zqU}#8y43`9%6lDQ%<`D!KwSq;6NU*a`bq?SL8L6AmuV$USND42*WFr`20r;3_;ICq z?Kx5cjKPJ2taC#gJDDV|Ul9gPY{tpH7n$lCn;!lUyo`VE}4;_zS0Hd{~p}mExQ47@QfCzNttJZ2FUt^q$X6jF+|+J zH_)3=do6gDLe#PR2V2S|AE?7Z0~!2#0Se z%N2k?i4>VK7cgryimYmF-Lt}0k`yuFKCafmZdoDbSS4tdzA_;Dd(bt+e|>ahWX}Yg z+QSUnUScr-zu1{OtLyw%%Uym~7}ed5=FAplD|K=2IcQc}D>hiqk7>se)QfverA{~T z?|LoMcnrh4o^#z1>Isvg#(SH$?FGNL#@eij;Pd?X7m5(^y4RTbBW{>^r8@&O-UG34lJX z7m@3aGsF4uDX3=0o~A4aGJYy^2kR|$ar9DsCS&JbHYrBH(Ec>VvC0qH^^xD};|vdBHhEv>YJlw_+q#0Tlb6%_A+pp>FbSJ*iP*VxUNZz%sj$#}%*Bdsr?O%<6R4PgT<8>NjA zafN!b6>>VwNzV_r{RJngnnt-8ZLQvYTT#X2zv%dJ@%c}2q$ip2&D4H(0;`LfRgl&N z?$?^ao#ou^54w)j3)GFM<207}Jm;LuXt(aZZDD;cVz$NPO2{~2Tr1IpJe6&gTzJGK zYg$1HRhK9^t5-|-Mk3Dfej5h}a#4A9GnE5nLyzkU{RIg`@wDn|YL~9$K z%9c%>My~F-%}Z79&{FO{HiQfe?uS)Rxr*s=BUJK1uH@eyaaN~5y%yMR|GkZAK2C-c zyUoO9|66Jt`n%(;@cQfFfRkz?2y;qeY3$x0@HJe``Jbu?DWa1jC7kka8(NZqTm&KU z`g)o-_K)UoxO2M8nfkLYy86);p|`(dm1}R;f_VuG{SqEYNn~Tm(?ar5zNgU0%O9(k z!J54j+J-W<)p|Js0f)yZM}g0zv-s0fs6oV+f#GPv1&1IN31!-wUE9cL4_)6n6k#(+e`q48F6x|Vk$S+hBvM3tE7fg^Z!5HP zPR;2+#w2Za=Xia%{sfP}?15RA@o#ZF0Wd2Y%|ap>E}lT_xUCpY1A9-K^x@LU0sUC? z4sMix0lo(ayn65AUt%7G?wlKyL~5loVbzhO zoKB=jwg*5Zy2Gl0QT%2|2`%<&d`?LxWGr#vrWS>wIzLZDS+t3lVuk^t^&fBT>x3i)!CQ9ZKi-P?6x$p1k9@z?b zH;O>b!@imb}Aas)-4f&BM%>TTH}R*HlbdFQ)5V-StB zlQBEzp0`o|64Uq}TjXQ-+{*!05ac&fu>oM{5GlmeOif|>TX@co7_?cB${+@#WD6sK zR`N(pI!f-pUGa-9JD-L4SM$~G?o9}ntml7irVi(8-F)^Q$ zjnm!w;&f~41Yi7h&k$8{Z7ap)V{rv;pDDHI?2FJSHeT0A6-&RO3p1vROlD}u7f(Q; zPRbA_HKXIfpUcvoi=6a7eGTCW7*{fG3j+m%-q6?>xANx&uPJIr8`v#JTdA3Vb=^949Y_&MIpV%tB?VYeyp;y>h% zowBo*yH&YBT`t^oj+Ez`3)B-e+=(ATY8xX8+AK)69!zPZ>CFe|LF3KQ>sK(8ag3oE zqWZmeCLtg=o7_mg`#_?o2Twltghx7}qb#Z{GjQJtH&PvX zwJdZe4lXS3hp7{xeK_wYOkW*$BkZN?gOAJ(^ZG^#?;-x@f@}+k^Sq)?CSd)hrf4%i zpOC7pYt;{4;k%sa9v{HfMR1Fe1>uKl)kc6Pc%0*0rs~pFp=luMuP*_CAI*Z|1t}jS z;y(RG&MR4-+@nQSYx|*9yxWLH`pEv-_As~gP9wn${6Ei5nbK^SE_;XlNlRe(`gZyI zvp{131SUa|xdo`i4%JD*F)`3-SSJ#B zKNRcJDsalHgd)S>W%!hKM5Pp%gHycNFIc883dH0$C?0rTzp~c3_19+$daUoqJ;dBZ z38OY3;kyyVMs|&UF=eAtEH|0Xm^z5=RZ?ZZ(9Bmq#MUYYffWbEG*W~nVlwSxp|*T1H~tfBV(|t|Q zB!grem;5)TdJ3ECIibR`fC*jC5ShVM+hc1{M)wye*)4xCw}XalTx^vLhg@tgUGPPo z>QgD*`F9(WO!e3=J77g|(mU~D;2ebSs6eO_s}A@N1XnV)I%=hE?M^R#OFl{Ao> zon9D&^(}o~8I=Zaoyg;`vWfvt2XnJFa{Sad6>%V$g+8*8zJ~Q730lR#(M* z`iR}gpCF8+{b05~=W#8h$=ZZ-N{eF~pU&jk#aR>GJJH0kL}jsZT(;dds8q>C0YU!W zV)#e?gHy58rate-{xX1uxZCVaL<3~r>cS%hAYUx5n4zK&bfczucT->}xrxrrjp<#( zjc65W^n;AjIugTl2=xfU)x`=kqVlq7EnoubSq8gK!nEn&8G%R6{UOye zR<%Ke#k(W!nBHv1+mZ)v`q8wzLg*|cU!#Z*^%DVGUkn=4Ot@e>ZaJH@$ ziEB1`yqc88uG{&kiB=MkDIhCMM%op-XRsRDhnwLwMB3hvMz5T4JfdYcd)~L53VuMT zTD{kr`_=`zdjKFfda-J+1{NfYAQ0FUL39LB)}Z{o>rP;Skw=~_Ni=(0N%Vs_GaDBw z@9Hxi(Fw63+`Pb^8!Y)rNdPApd%ks+rPsmR-nXmn?JO%m)RK4zh?Ai_T{sF25JQ1a zPRop7&a!6qi(1K-tk@q~Eblp6p%27Uel7M|;McB8+OZ9_!?*PA_tQ3u;;O}W&Iu6s z(*XEB+Rdgf|CVqMf>6EvDHpp5D?6MD=pZ?SPTw7mX&(v)3$lFGAK0=OlAewe+ZRYp zez7k?F9~j!H@^Vddgf79Un9CYKkO+Q!{~3`h;KL&Lz&D8mx?ZYI%CY_tqK_hkrIQo z5RkTg*VcK?wY~l-_g@J;8=##3GhrPmrJZ9VP^*tBv3r%BH3Q(xJ(bWaxr%O^l5$7;o+UF zKPk=0ZO{T{(^5);J>717eop&SN=iy)2ajWPjShBp&aLZq?`};^C5QK9hayc@3c!{( z{t63Ua}3QY|0$%X1n*Bb_xXp>cP&xyL3}IUDUlNCgFH!0U{U<5DYW;2xeUL8s*?iM z!T%|h&jF>8)NUrB(c{(8zYPkMW6wI`u&`o<4SxXE|Aht$!&QO6Z=>w@78jwWF`-fW z^mf!lBTx^Gjv@QTKXv!<{=7WDqstk`CYHk+kftuVqKII>`$4I`jv8VVVXbz}p51#s zL^7DVK9qM(xN;yVY{%$yqA#;oJb*bMxQl3aps;f0`?51G9^UriK zK0X7!r`knBp{wH~M1xil&aSTU$Kiy0za&sZCs~fsuA3S1^YCBMA6de*BtVcI4gNaE zG_E+}?5s(6teFs3yJD#?*2aP`+6L2)cP_X0ZoLEaI5RM0?*cq-uAI$Yd7?hfxC9@I zpOr207AIXu|l1@ON8L%~aZ?&H_My)^fg9 zpE>=5B)N2=P%m<~=H61u%P3M~`290K<~A$*_Md;ua?Sn?*a2%(^5yLoE5di~o7(tJ z=5BiVhg}ocmir>lOBtbjVkNn>7zn___2&n1J*&-SxSTGiE9S88(E12{hv|QAHD-;-dkY%76%`b$?3Va#{jAwn}r606mc4eHvq;Wj-h}wvfn7*fbL*kZe zc}F@aV(NWgIbO6G>-^?@?=7|w;KZ;MjbUWZDR$;k`u>LYvLRN>R@8;U_~NG&T^~RI zdeok@0x`5`4?cC(TphLpXgF_i^xXan$7HK-AV??GTCK7^5UCUOUk&=jY6C^DG7PD= zFihuX!3V%%32AKkcbts9fe?i@VgpB=zj zCJO66RiXxQ*33OS12t?^Nv?+lqbA2F_MkH*whQl)2TFhML)g)*ths_Tj2D+>X_fTi z3Z^O=H`=|qkXRrXlf+V?ike{FyfwaN1i!A9-gX#yB7A)uYg)utYCN)ct|avgdKt={ zsUzR}F176xxTKc{zhy2<#xp8wkmo9LXgzs9n+-|vZ0M7X}ePJ?Y7FN}> z_X2$NoL#V*g%PLp;2KGX`u?M{4gs`6l_z7pc=?d2n+32ZY3%^h<$hjsL2>3PW>G=6 z4~H0`FUNB+4o`3v(badW%wpSHO=7b5N@`bqJyk>u1C8{a=fX0&$yaTOc}L<$f3i#u z|1P-&Nf|EM%*)MXT=V`sH=iu*o8m7|BQ*|?%t4zM3aE{Ha&fMk6h}9#3r<@2yBWwa zu7X|H%>{VKuNu(&(Hb8cfWMiHp3O8h_2M}{A08~PkeT`0pTe$F--r_gzvMW(+v!Tk z(Ouz-@n&HyhWKrrIfXs7n@s9_?-k?1Q)M%Cs6ChcQUlT0w0_%%?t)kbZZPS6lj`B$ z4udN(7QaZV^81;6SYfE^n$q%Nr4?nOvC3wDh8YkCf<(69#<+r38!Tr# z_sRBSFEoIf{c%K0M&WUkk))@R_6Px;2|(|%Vq{}$@J|=vevN(3H$NqYAWvU9G4+$y zIKV3>)Q3c$m6KBHSE>tP*5R0f%tc+`U2OfzVlTQ)DM=_1t()8h!vyUhX3sXek0GV4zUG9=%;HKKj5eOovE)7piq?>P3 zX!kqIs}lR1eL8C7#zX?b^EANS(uHIE9pDg??1jpd#kYe(5@|&rSU;TGhdd2(Nn@hu z1f!^DHwhu{mE4s0Su`9v?zLbs-#f#nq#BQJy4a=U)O%5A zhAv{!$-CIMV~z(0tq9IUg6g^?+}O*qj*_VHP`Ujq{Qs_J`Jxd??Hi|jk8(y60qRC` z@EmOJ3F`~sv-QvX5o&T z!?W!{qPO^5@3fs+r*{MjVQUik*Iz3QN*COCMn4U zuQGh)6#G`|mZe-7@odf|4(I-f5~-9OEYE@<$M`gz_LUCoMl#0n8ms#*kR*M*2Z7pX zxw#$l6_6?Lt7pP4vibPUud?EwU+bXPykjR$OC;kI(sZWIipVO9`4L~a2V)H6 z=|&`hQBcBfSR8~EW(ERJUN_l~Y#mW4(2wi%VHlUo)d*r^yt)hwvW(CHf`V+f^t?hG zEiPocOJ`Dyaqkc>&@%_(dq%}y0pT~a&F|x7 zJ^ijMiKb}i&7Xb{PHD-e{LSOi^dQ%Ltp)>B3wBDP!D{d<%6HQ9B%F3;00@I>N5kB8!Q$a<|fB(GPYGE01yn_pK zP7bWSLyQy0xvp~E)EFqw&9d;`6<*sqf=v-AY!2-_=(yZ?RatqtL_VDncDJkJI;%xe z-%kHZ_7a2>atzQ`{^xlN$nzIlAM{^-XPY{nypKa0lL5HY{waQfpZ6mv>opg*xd4~# z9*E}k1Z17@*gXK~BuZ+dsI*L^&2$rUg2OM)1jp*n1R|Qsu^Y|G99%{pm`38tff2dM z=7?pwpx9dml$U!nS2?pG>a~r93nQ_}bnDK}>+na{4p{oK*l_Y?u&;38AEKKX8)lRL zrkcSi1I$Gq=COqG=&2euHmt8C@WUwiB<-T3E#mB~wNQ<@>qrKN4?YIBHHr}M%DBD0 zgvH^&_lTNrTXvcEy>k3leaJug(s=3HYvn^_hyX9rn|@Fb$t)Xx^J0IcvedNN_B7er zcUb*(N3?}x$P87cs1GW6?c1uK_<8oxSn!7?z`QBb7MJRzD*RfzeGu{<2;4bpg|3

e!99TCeo1!68=% zQc{+h308aA8MR-_urXmV;c0+3BX{5Owyb)9rnxX1Bt7Y*yN!Z9kM}2%EnCzo+zpn2 zP#Rvl%3v% zj|lbo)|l1Xm0>wOJ-sYOqn~S%!fY0APW@TDUhdAQX)P)~h9|%IK0&gq_#;}IS|LbvOyOn#w-Th^0C?W$V5N&WRN|3Zj^S+R8f$!sLYo_CS59&4N^ph zUYf-Cvr^3!PWjEWT9mU!{iANKt^;#U3lH@cFqjzv+ZE8gdSC9Y7qcy~y;k^gjL!4s zhx+Dw`@N2C+%7xsheH-zq9%j!Z+jXKEMYiBnlF%>B{DA*-{L?jj`)DYBopO$sMr{~ zJPP>!$Ta;`1}4lD@4@b|&LgkfH(!N=<&^KB?uJ)H0>!OE$!QzlX>I)RCF3UMJCf@O z$^H3XuuT?tVN;f%Op_|WzYn9Aqjc4RtCTw_SgKGddp0Ty)rwrL!-v1nPf;E_TZx%h zB>8^r2S@UJar1Yr_C26bq)3j+noO5R_ulmSH~32a8{_WR=UUuOmcyGnpP9>hhU(&{ zQPU3w*U#Iv3X8*l#4JE*7G3Dak#3TzU~gACCb&{rd7tZNDH*L)#1rrLbe|H8^<#4@ zo+mSmc_Nh&AKaBsGABEWB4tw!mUP6{*{EK_tO5BWS+K^TZ{89Oe})3SsBFvFOA zW~397)$5k3 z)Zzja=77+g1Xx9g(KOM>NJ*5ssstgosY8a|iJ?s`s`mNq>(kouzHXHvEYo{c)oxzZ z9o~Wt)cb_O6A*9ientBlt2UjDCm9mP>g{V;mSf`)vfUx|PT!Tl0w=}4a*7tN9eb}m zL*_LvCx?HRkwg1vSMf}{?wjb1GiX!Z#ixF^+)h-O!4~eNSkNv@!>gjcA>M(~M9wi6 zb@;bwz4!#8QJhp?i!CmJ#ngHH7d;UT!CfM!V)^*c5AcTKrbic*t+3j6Hn8m`^-0Tq zXrBt+bUSk2`BBRXbKiGVL}+a)FM1vP+)V(1d!c9vMAqb^e8+E;D|A(ybf+@~QiHS0rIBDipK6H^)#_GvP2GTqD_nWrIC4NU5o^oIS1Wr{xK3#NKIkwHm z!yB{#3JQBzkj!0mnvOjNlqrfwhVk&Xi&fmCPL;R6{S`jVnWhq#w{^U9XV#ietANAh z8XrYG{(afF)oNRoI^W3%pPO1y@)+zxKQWM3@k<^iyPauLH)Pb#H`1le>JQd-eMInG zi|f>(O=J-1uiceE>Kha5y3-@7E*8ri{>R8W;DF;IAkQd-o?^eI-IR0I1fu$|{ZM|G z<&#Xv0>5Z)* zaD|~(Xe(6H+`ud%;w;6^MU*O+;5x!dHrZ)f6JjyYsamqAIMUc1%HhbP3R!rvE<-lbDr{)?ZZk+m%qlNjw< zX`f!y*a*tn-CpcPLQlOFvGH|0?yPC`a7KUq4>{}kRRF=geRe|y#gqr`v$&o|5P`jn} zCSgE3AF4Pch5qn4&R$(Op#2J>^-!8vVO&dpvMcOczNh0Vn}XlhJx7LFFlBv;sfib< z2Nf#Wok}$b#$)l^MQf5;k2sX@yYA4LfpF5*36nIV3AMejj%c;1>ykf&pLShlMz>aI z5&W%`RKim*Cy*=^oK&Z3ep+DRO+^DW$AI(sy-; zQ~3=7!~9I?hFQ>GygFQd^Cgm4UGjL-o`ByO^bsi6KjB=yVm8#;^6c(;JayI2k?pjv z$Zj{qDHbVc^?vm(_%f3PDfS$oNg($p#pTDlLW0i<1Fpmto}L0nPH!T)8uWHLpxVfS z@ozrv%lkNe+84WrG?ORiyVed(@^1Kt6Ez3=jk^3l-F!CpcVF|ykE#=ho9DU81Snyv zwpFy8wROthih8S|AB052^)vn=`ZsSMHDNjTw3B_tclg5(qD`mpRY$|jlXszqI8lBl zACgA>fPnV1lp!Wk%*ns8xtzcLBvul3kA;xNqz-yc(q?8Gm zdJ-1dzdl0%o#o*h$TD{%^C9ZR2?$J*nnE!1PubGHuT-ZTePacc{JNufiUH+vZj&RW1>k>a^6p|#v_Wg+%I@(l!h&NPfW5GBlAmR6*Yy$!djhAR>7nZal9+4i+*3dBq zLK3ghR(8BdRlsIM@Qwu2-yanDg_`aZ@e7`oC;Z~`E zkiNmt*^WP_SqddtmaX5fLdq)CC+u&=VC#(_EP}`RVbU*i!O?*{f!_>ugTtmol)A1D zJr;UF;I7O$WxN(F?KrxDIn~Je$j`-St$WmnFhSoV6~vMwf^IDFM$+S-^gUqiMPnCm zlWu~#AsRFnpS`Hmo*&25K}OZI7@sO|OO+z5p6=wMkQG5j!d69ZXS(RUF+3l3DIZAa zB4h7UR*@)ZU3}ja*+GPK&8!7!;is7Z+|oZq5E#y)Wm71wqUKIJx1ec8pK#S!jDk7Y zR))=Iy-5uLGcGnsevXw%MCD89FU>utHHz#KHWdx~>3-d>eH`qTi@F+CPbRvy%s-3z*nZqFI zhx|BwzO-?3L-jWQlQqS#&R|-Pc|l~)ZNER|gt#7O(nMK{%_g8;IobGQw?tALfu%Lqg^GqsgS`vFmtY z;+3A&D=5FxN|Ep2MQ!0dfTNi;-N^kAvmk3nmwS(yfogyLQ!;$`$<<@U6XL-)0D@4c zQDBQ!vCJZO#h4_Jl9yLCdplLWLg$qb08;!s_rpN*17#B$18&AmM1G(iRTvY_6z&Qa zRwlv&b}%|HI*U?qGIwCHGqJlSRq((9ms!&^r7K$&hZNrbu}h#sK2*_m=o zw%ywXOM{N{CebX)#nzFJ>NLRYyk}Y0oWdXn*Z{LW!{^AJ)1vH_aH58C$j1( za@NF`Zz@^FCMUol_=*D~@KS8(`%;pO@Rpr~=_ibPiN76hLEu8vBhjIlRT(;g$evw1 zCvYPBixRw8EDAJJSkahkRvN77P*Lx8);*7LO(XPI7*3U3isoyS(1n3bfk!!kwG>kS zx33F}q$pZ0CjWR*?2^dktj@m^jUJJ;{c#P_jrqa?{|{a`ni~r!kQg+B4n)(!CL&E_ zv{or?sg(0wW?1DKa;*;_^o2;&Qo?M<7jTmp7knoeVaR6<9%NoYm!**Z@P?kg>AlQD zz2khkvJPIEpYbl*&R;fhzI-8%mm*Jm{x(9*Q65B}%WIJyVvpaCEw8-O z4|$m8X+O-F$n-zW!t~(Q5>hiqp(USWOY7Np`S=<=%+qYa3Jj4Jx{Ia&YCH?uFRwaQF&na9&5@d;2|hu+;Ii zu{5{-TL+Zp<=n0~RfP$hcn;EWgH)o8@R6igK=Fr0;Uz?g!ty+k7ohgEFkg$A?Wb~H zhT5itxA!i_EzkbX`4ySeAYWW*me%+`mYn;jo_%@e|LRn>DF}!Bw|64aR%ZF z`jn~t@i6gB60biyt0Mez94{A}pEeIr96x|Rl)z9Z3U?|9Jm}vpLS%%3_KlPX&7S#t zEKn6a-ac0Ob@B_G$Rp9pGA7QM6d5I|m}@8pa%fJC1=f(No&)A92wXcw;zIUT>ve~Z zjOIk#_lI|*sztAMBV#^ezM6i^&G++>I9~rzOx5|FEGR_yBaPl7^;_tkhvzoqvsVwg z0no@IZtDH;_Tg7H$HC5!v##?6U>6}7Xx*E_jfOY)-12^w+@|1lhZ=oRh&YuK{N9#& z5k7nSEZ%()NTKG3+F-1+A!F54O(Rr;Da?dQpB_8I7#u?@$eUU)`F$8!iQ|B9Q%Jx0 zkTV(?F{oz?o)Iou_R9{EX2eqUG56{QHoz^vwVQa+K7VKz_H@ecbX^)M82WvBsqKG; z&N(i!zmMV>&-SXx=1iP6+qPX>n{B(vc5QAqZ{BR%c9U&u+xk88=l%QM`^D#+^FEms zmnSk=a)>2Ra%)k243(6zkp;F?v_JEU)p;Ysjt}~dFuT}cs!G}u#owEKdNt1wjen-t z=+ra4(ff=AzvpUDVLF=iYB69xA2Y3354W$l8e?~?IQr`3lQnWKi222f;4P_@4Kl=x zZ(RReVcmlSq;b!F@$0}v`x<4t^zrYY4z!8^MVAvgci;*~-q7?R2qXE0R+-;UKFH=& z1Is*k1+=U5;m!#EOA6UKn+6iRJ*rS%bV7=1v@dGLFdcE(?n}txI<@#7^0FnMR6`o$ z-Vkr3vmR4(M_ts<%ZfNLDN=2Z=`Q1XEL_;yH_El|~-kY!Px7TH|{tl3}jg&wK^q`gF>?d!?Y&p-ONf|C57w9FH^_3w1!33dF!Aw++9*1mA6 ziKc}wn4oWUu(8^Q4-}- z(q2_}1OukrRB)ja{kjJaAMGV|{a71ffc=Z5M(BuY6a%Kp~cP zD?CKbrKyuc_$yjVGu{zA5R6fS9c;yCf**Y9WrzU3W`PbjSyfI5JPe#pbL4*-qmulw zR^Ro0#4u*XO3VgU8(|ApWDb^z)6Fqi7UhGGDR`filQxc{nxFn9prfw9*+H8Qfa(#7G?x@YNaf=PcaF{r?<-}P`bH+16fm>p3j_1j%(t|(`vljmX~6lKvS8 zjuECm7KC;xzT*8C6*lTkYKB_E!CKFPrf))!AZ64SAim+KNcNUbHm=JF#feG!(RjcFsLs2a6GrJXCh z=Es${{{c~zzh9s7NF4KHwNDnt%wVlkIYYBDY^#53wx>X4k{65g?As%UzGyJ3RsXAg zkJs^NGwzE^h2drRUByJ{aLC3Yr9=~$HFYv5DT7Q{j9@lmdG3B{vqbEA{3djQc9%)c zv*koQVz&L;1I0)Rq2VKErppdg@ut(=3rYCF8iRtS@Yj(r$f%a{UvXQm32^vxM-wewbbQ5 z$!04)sH)Zu1nm?Bmk#azK#Ekxl2W5>HM3zR1wpi3YBy?a5Xl9P5sE z^a+MD*k~Ule?NGdtk{q$WTpOx!qiSofr!5Iw@aNe5_b#nz_@o)r-KZ7f?7^%YP%uem!up8M<*o*o#w^zz$go0gm&ur>QQiHhG_qNE9y|p@^eF=^1~jy4KB%}Q za?f{Bv|D|6>jkNR>^wm<)Mkr*KF8iTX3=jb(xLqT0Q92gMN9@lAsK^Kg{P+HP4()Z z>J8c<%&a~Ro~+!+38|H*F%wNYhI}dwE7})-D@kP#$Ce=6a}L-lWcvDMdpvj+_kQB{ zLS|#sSPPC$hPb0ztZ|X= zozZX}uK~f9fx}_yVGV`TyI%iEqN*P$+ojx}*pCt6An8*hh5Pmw!gUx)K)#9g=f&22 zp1Ve&v2~heqg$3z)e~bR$^#xgI6nUB^Og6GReQ>TE~k+|X!wz+sxOLpyu`;Kbb{*v zskJ{x#UW=jTc#pMYgt9ag(4*LdJ$5|_d&jRUf*d~>i+J$Dj^6FV#^D!{Oi7?+>*eJ1^?CoDs-!>Q%J zM5ufJP*shn#AhkRGgdf#$+~w9Lsb^n7mT{VMiAt&qeDE2QbZWTkZoyTC;T5&tLu-G zhm(EUj{}77gVjl2-n69@s^xwUz-aLA)XxJ_nji}o6Iwv!QTa-(u152sJwd&_*}S>k zUgy@z%9*y0Vvr#ikLLoNomwqI49L>2Iwqf`Mt({{jsAhTJ}N6}%|d5xFWQ`obBv~* zEg2PX%twvL7Owjj(sAK5blNez@kbf#lRfqB60sgWm4lZzVavtx1G*5r80bI*U%Tn# zSY(5ydO1{rW>1V7N*&xK(Jv#NT(?nVH=jqxdjAdQ-MIOERG0j6BF-FD{7#O0)!vXz1>*8pU(MLt2doNT)kJQI??1&hjfu-EHm^Ko0M(MxxPXLHW_tk^^x9U*C2S`EERWB; zR7Na5oc+rUOJ%{4FiZwDeW=f&?%Z-#8ubR3nsX-SdnK+snx4kq0AZ2r%T&0r1Nqng zpr7lIHqbQk&kL7J@uakmnU0rYX;ENe#FpTA)o$O>!B6l^FHzTb zfLkw-)OiY!c;V(UGwC(B$<_n4Z73wW;%}x2%iOsbucp6(Y|DYoep(HjvBXM}^CVa!0gw!D%SNHqT5Rqx>fbBiaB_XPA| zRS=`s?h=W_Nn8g17_sP?fRl{lXN2b#TBbvFq*s?;*N43rD2upGpE3Wgw%sNeaE}Sk zGN1y%|49Qs2~uU1)&5%ft34mFp0;+J_s}`+^BY`WtF8}|ioSR+<*#OB0Ko+(5v7nW z<+Un9t$hFTlZof3ej~^)qd#YkrTa#`!)pQ0H9noI@AGrT#tW`To6aZsu9GW)X(Yx$ z*OTOi(cfFA4U29gS%w(VekngdGw!F@Y%4qhS1L1oO9?E?QtN;-`sOMqFro^yjL#?~BId~316iN!F7s1T@Dn@AmAdQe^d zaDQf>reMyM=O|ubI^vrDac(7*LLg-!CnF~=CzW%v9W)izlWxhO1P++&*@l!SiVz~; z@<29S{v)APjcN~qrtBceH~Mbj#6go%kx5s7ANAICehWOGyL&L;vg;?IMO%~kL;kHP zwW_6+t$yB`7OaC*ygAL3hId-a)k(BYhFhTevAikFzHBX;hZlLB#MINUy7eF4w%{?w z-WDwu5@!$9{#N_e9r~HlP!I$fz;68G0CR1F*ZkL_UH^cWx3h%P>rUKtz?f2(F_onU zDRWe~;ZN-PeIp=CQlaOhv>n?b&rFo zhru>RXl?iXi~DTN$+K;kP_Z>{auM4~1IpCd&_EhdKGIp*mux;|-dG4#;TGIO{f2!r zo*jA;z826tdxEd_bPo*LXWR%m-PM5=4%1yHK@6t}fksNpWpcd(6sWZZi%4pOYx(FX z$ErnYwnOoH~F^)IMPgMZ(XZDoB;APAAKMIn8NBa3PHeR4vKRGKg!9p#u?pDFqyP%4cf|N`v7A ztI;AUc21tfHnI6sEs}%`>jLCELUd(Kawz6qtUxgNd~XCURKX*}J;R!ABlhY_3cJIZ zvR56h8%IY^(2TkuxIMum-d&Gr4pn~X(0gl${)+K?i*mc!CPX1~HL13PM0R$SP_9Q| za?lpAYM<0n%&brnYWeQ*z37Kbyt8>w# zjO||_crK;h_wCcT-PrZ)VkGcw;V*X(LR0i)a>S_aA~2O}4-O`J zCc(lyH-?&%Ge~K?NzTwzAJIFM+=99XGCTq|_E4XVP95>S+WziW;cLr*NJt-R9M$Uk z*R%C>tn%Dn_U?I4G-OOf_920Y1gqMXp(j%u{!{W*a_2KoaqTO= zU^PO=$`_#msL?93T?~{_G_kSe3)9klF-QtcxrOo^R$m!0qzz0?FMA8_R~$%CkgMx8 z?lv5bA+Xbvdbo-A4eXr4Esd{Lh}jsudnk?;3=7oHgS4_++0?cT!pEL1{DCYuY6XdK zM?Vtzvp?O`)DY+RP282z*N;grs0v#p-T;rn7!gzBioGs}bIT@Pry07f&(1z~7cWHN zT}E`gY$V&6is}P%Na~@olk}+{m&8jone4PxwGM+lCy)amL^f~aCT!Ez3NJT0;V*|Hxc>yRz{=|}`8v=QAerh=(Z(r5?LNno3k*k)N|STFUA zS|qUAR_RU{Yq)IS?V8J;zGQuO`~_LjtM4liOo#qDMly^r>pz-lMQ0V~(l$oOm<#jf z@5{YJgsu&a0OF}ZJMO0SLa;vACP=fb6LR}{b_SG_lPU#CstsJ2iL&Vi`TZD_`n&Ii zj40qkL~mm@I^;Ut6kb?=r4R)TzxT$8&Ez0}j%RGFh$ z@+*4G1L-H8f*D^a^tqCg0k?j0X--s?t{?U61hi&@Dy<6{pP& z6D}bEu8y7cQR{6}x?T*n3VX6%^2;KkPETM*u{zJAJ!IDHZQ`y-r@9P@_|8=`BbpO>pxYoH zP=o2?TWu}`{pCA4lTr*PCyWVok?%cYG=zE9^pZF>{k5}`Ct9}0bH&5xl-{CqNKU}i zc6iOkWY-BJ9Epgf`+GP|v~C>6Q+Q6LXdQJrt3qY!@74*tt^u}Andf?DbCp~;UD+?o zr3U@0C7lbD&YN`f2C~~POh2u*aJhzlHwr=1CmG8j_;6&$k%Qu)qg=SbtvEQwMui7u ztt67>CJ!cko5+-A*00{Us@9uOv%O9DAzH#E7(J*+)=XHsuNk z+J6e|%L_-z6h<9((nZcI!N&=aA?{@!94g8560RGhQ(KzUh-L;7Y$>tVyS+Go{1?IT zWsv#69v1C*fj)mKAZNV_?tLT)&l||H5i$*FG0yDc;nK}gPR5iH44u$@IXvg~3912H z{Rmk++{?n^qz+l2>I(*fQ?ucl^4^iSsA0;?k^8UyyPc&CqOus&14>S%*DhQiZqTm9|=0gIK-wPmD3^k{|Q=;jxe( ztV3E|n``o+uml7a(I6_X_0px6@GAL%dcotr9l0l86y*gh_U6Q(TV3JRaQELpFlSxN z0HY7Q4LNyYTyCcKjQ$8kqo1&d?0YEbrF1Khh5KzJy|X;4^7p^&T$f|Fpd7B6VR;5o z_8lXUWei=*YF~BYh2o84+sKxST^$I7_e)(uIb*qxT+H8nF(rWjGA>AQK5cGhz%+bv zN(zzKvza#mopg#Yz0yxEqYWP&&f23j0}6uMDh8w z8a)2{4>1&GJh*|o4n*VCplSx3itr>%;G{~Wgo6^`{*#hoZk#I0LfgVZ-m1cTF}DZ+EEmx}bTT5S2W+iB*zed>7h9C2+O{}eKmadn03>z60E@anuSg`~ zIkuRKYl3-(OBBKgK)3~wbaEUDTR7_090BSN)@vzD-6H=UnRF3(0Hn*bTpF{`Z>@>! z165CK{7Q{SwIc(-gXVzJ=1wmOn_Jdb0l`7(d+fN%4iDG{ZWz@fBGk4$2c_vr z7}uNn*0Jc>W_ik}7V@rL?n=(khwn`HsP@f>OTKhVSVR!YL8kE)jD#@NZ+dY@KL1O$ zksji6m#=&16g$C*hIpn*DL9HGHy5l*(<6Kbcleoy8@6gth^1h(>3r|JT*N>&LQjU|f$k*`SAK^W>HpGjS0Z3+4P$3PYzBylgNXH~s49)*!Dd^jRNIK&4Wu663@Ty1%U`4 zd1w9=bku&y_$u<^!56O|Ot_aj54(0kL*a-pXp#-)AL56ZiCM)`I7t|u%Uh2$DDdSN zD@0mdk&2+YWzyF1Ys)hB#&yDTtE;cBhf&LQbaX7_o5NQ|$FKU9MX`*gj!n%&dE`T} z1uK4Lax%#8$*?L* zUF!?A#vx{(Te)91Z#E%C>HGH4Ww2=HRDZ zf9bn_M{tSRj-aJFzIYSIdnLDTC!9GzQ-@q%bdc|bexZ5+*fBI?E2Us*$s>p>{fHFD zPwKC2TXt@D41}bX$yaL!ybPlQ!9VZ|JOcBD#nz&-{BOGp?Ko^_8z&OfQLT--w?|*? zD=L{PWtI}qh*2A8cLv_VIl1BzfQ5DlfU(b&&?u)3S0uZAkP1p3_-)-u>CT9-% zQo@s`B_CUfU{=>{b0;)DN}q~5Mm5Gk!vRM( zug)cA)G}a8ep(P5MwsAgi9sW;#D!&0j6i=Y@`ROJJw3y~0bhz*b21uwh04Yg`Y|TQ zlG|Z$B=aYr-IfywF2)IEBR~rs-vnjlunXaFVXdRg4?*cpnE+^V7_g2cDq*y8oA36g z9&ZY-ujC&aqJK83(h-MvLErF~ekUmx4I!d>n#V_(EjB}Db6Ks6uU;U(U;ZmC(8*3f zPy9Iw?>oIf@MI+6S~$b7LiF>!j1AV4v->DFB7xn<%u5n>7FmwtL+qG)dxe;bhJ*5S)J#^ln;h+enocgtM{n&MAbw zFcym={bQp@ObJA5FfIh=DPQSPyzt9H;+2CN$$MY(r6}OBuzVNd#F!YbX@v23vAp1Q z%J)oxE3Q}FP=(mkZ)jsG;oubc&V9n{%<7ZObT~DI`VR>%Ir8J@yoF>-vSd1Vr*pmk zphWluk=z}FO$Z21v;?vgMCnY!c%F`NCMPWBZqR)z!<+jVvJ{B+@9RYrf8ILfwNdV69!hzH^s*(iwzU#Btf!cc;&hRf}y`rq-fLqGX4Y&Nnm~*U};|g(>uIC zXRn`NQjJopj{2xA@IOI^jdjdaoOJ<1%_fdQ=bQR?muDKHa40a_y?%XXFGFFx2NRN; zF!SaFBI5)JIOYilzH~2~XIa%bElnc<4XhGMyN}mcI=;QzH@`^=%-m*n1M*pWhb#tH z7T1Cx9D#4PWvSv+KvWNE`DtT{t8BBnT-x7Asd8cL9>*#>f8Kb@VP$c7*VP*cUY>|^ z9^CY+MwN^v%33%X{k$j>*!i&bXb2<~^&4s{#lTT^&I6#VHUCH(g$Aum*saMPsB5*B zlcU@R;MCZapd@opcHBfUBA>r@om}nR%Eyf9gnPs4RZZgRTubJ%id+tJ=SXSG7MRZ2 zUhT9hws9?x(?1FX07XdF~{kurs;-nq(Tg4YW|zwl;DCO0wy-v3RLw72p-IH ziO1$BARq!d<2Kk+0U}8TiO9Upgx3m} zu!Y|{;3oY{$nO}4Fv8K68QGO$%qo!e42B$utywwys;Q#Auj!Y9>#Bnbbe{?}%td;X z0Gb#msmqee1XRwWQ{}JfoGgdFlvb+hEHyc;olH~wt+5c4TuM>fxDw>kz71$zj!y;^ z0pDeUHlRYmFf5`R{i>weno&?XV61@y9StcJ6hk#8^6{tVZ*SJD^2MTXqWMex>johk zq-noi%UA4H^86vI5Nax)ID@Z<*esdbH6Dkc#u>vcj>vjPrj00@&CU^F^pOVyYx1F1 zu(5SsPeJyE+&&#)d@uGD)Nz4NQX-f1K>DshxB)-mutHj+3`d{4UkFgo;cKZ?{+pP& zX_Dnvhni#>@HjNNh@A7julI`qlu5Tc11FemEENZrZqH0Zn+J7j#y>D;B720A{(B_f zc8+xx2qj^*PHM0?YJ^By2oCLi@@8Pxb z!kOs=y}N)HT|=?tG$-v(XPwwbJZ}Zksq~3Z`16_l!Kg!OK7r)qqPG_d00CASrKY8U zWj7dG_9yLHX({FR=<=PA)waNj0X2J&hiIrnXk`3<@&hIlYiz|?W`1uHb@lUTi}`}jwcFq(&_7o;x)r!d|uv=nTnmgwX}=Z zoEVRU8}U=7JciOay^0WjJ)8Ug2D4kp1UauCS<50cJB<=g$W$~=j@y2=)ZGQ_I#+bz zPJZ_+yK=MrPoEA&2z&PEChzdmFyDcB6J`T|kcLzKk!YhM1hS|}9VA&-X)ckdklmnP zIhtl0*70C06$;o?5cRM?B56O`RQ7$3ewORtzC{wqs3>M1W%&d#hRi!k!`ikRtBYP+ z#=j`MZ`x_&8Ym{xEB{9ZcQT5P67l2iC9-KjEQ(njNeGa71@}JX1Dbt77O%}wX<4X| zXSyW{VZbfPPb(=p`RLs-?E!Xj+1I`e*z_a)V|SM$U(hPqFzUe;b}hF8e%Dshbo-K> ziWCb!7koXF7J2_^-t+g;4|{6lB~6cfq4&LHhi z8x3SpGa_=`{n_4U;L~gKs#mfI!|^|CwA08)Tq*HtS<wY)v#~fi!Lo$&4jshEW6-aNGD~76*X_+gcuO4 zvY$4H{H1SRSDDe(_0Pr-H;Av)Ce*=k+Z>{scLFEU3A(V50{du;7i-9a=2SFez$PC5 z(NK`NyP@%%CvL7~uw;+oGzplKN)YjSfKuRogA}K>gvB!~;X#uOV?pPf;%wBn%P-Jv zB!z^#?9I)x{?rsbYA)=k{qG5RZg=cDBkWi}B4vKnRH!S_RJxN=4Eya8|PcAOhg1EyX9cfEkYj|xDq%A z#-^oW@Er+Qic{LCsqPm4c;1swL$qWqx5l?JsayUccQPk~Qq}(ugb>2KBu!G7A&4M> zJl8)L>U3WuHmO!nV@Oe`D1y35!dK26kWuhtEq_V*k0+0iwlr z!xr^dV%NaX1zstyrPIMuyxa!Ip|uvup-Ok_4IBZw9N}nK$;$-?{6X?0I6V#F0y)yHI6Lr@FohlJSN-4*4D_ zB=sjK#sFD7tD8Er+Jlmxt-f)@`C?Q?N3ppC$lA-dU303M;(bp=lLOf-Dj?ENu;UtX%uzq z%`3OafgicF$nsQEW6?B4p;WQgRaf+Xnot5LLtX=B(*=`hE7A}#bI=NJDKT!$XYdQ> z2)Re_rrwSs*=`HHtvdL zGVgm;3v%;mxMVXu0u#PlmSQWi;tHOOvGk4;Ml#U7lAov#G#4d&kN*+i$@gD`Hg#pv z=dfMM<6?ZaH@N#w@2jQGu*Fs)R>U}F>MRTjzZ-~Lzgk#d(a^b* z7(2Gc#y?ASeic6@Plo>zQj^->T)YPxe0~8vOY?W0Zpt@7YD^2O;D9V+WMXJaSajb7 z0N;BNM=0FpIW5A7fnYS4w^G7F5_?FsN)` zy7MvY@s7#^o~ac=RrmyK0hFOc>EZqYMpR#=+7Z+>ae}HmXIDozeor_F?)VHu`G$!Y z)zgPd&?7<)ntjuHBBY#Cm|u_WE#sY1<0@I{x(`a;i%AbAjeetQYHjeilVv!`{cCDP zsi<`pRgQ`gakQE*H50^pv8!tDlu64|WxMC!apR2N`g&q^;6ElpHdS=O^6%cAXuAKf z(0I1&xVdF{q+_zt-gNWqE5SIr7+i- z<(|@*X>MA+X9u^(3U=?YDBpzEanT?J`0M|o?8i5XSo@%+!8P?vCOG}u#%#ek}Az3p$C$FeT!%@zaR8l=eD? z+&Rv+cehKyVi3IY^wvYA6PY9{WuK&`ho8gp7pa)A3hrXqty(^^gNn6}|4hHXrKS4c z`iJo!Iy%lP(`@PTM2wuhcFvpm&a!=8mJSF|;DUp6#UsxZ^N(g?p5kJ*{JXkMwiNnz zPzX(hl*w@@#1Be2?sc-O!EPLwuqyZJ|Ls9C(A0H&Y_X7=N=L|c zv#6v$Q`esFHAB`ld{fI`(5{)77__7@S1~64;{ZqwkL-#qzdmtwa3l(o zYuD6aBJ**y*dCKKEm4lPo=-PA;1hAlsmoamV0m{?IzGG5V`0=CbuHp2l%2o2cG@3pT(^d`F zt#d=FTu zt}E{)#0o{`3}zc1W!5mM%=Dp%gyF=1EU96YSdBKGdXu-H+t8>CKsncx=XW4jV`I}a zmV;H2uiha?T!BVv9}?H`v+qZ2B@Nosx|6Id`? zn6)SSbi^wk__I^;Cu`t~5U2T8YCmVlg^FC0V2|ORE!|4tGlVkMZ_`5|#q<}mqhVg> z+^TcQsn1MFkaD}NKg+~6s9|eSEx9#HD^Go9fh*K{kkhF+fJ}y@Nyg79qwG~Oi;DkC z4zAN|3$wy6Ytx6=RZI^DorIrJ)JBd)mp^!}XjVjbmvBeO-kLIk zhehnvbnEur7jwir0ieaW4EYKT%}YNnmYP*midx~KmKDw9{=DDj=~g z-ALKebz=%d>_@>yKj$wJ6Q=_s9e)+)zLgnaFj8dzoz!0(o z`Z3B*qv%WlI_xh4vM}MnWAETuR5jxo6W886wJtir{@zODayk>i7`r1GY_vyoEY?mE z$h|v{hQz=5`q~(}$uDp)GF&r_M>8I$qr;pe_B8YY2o4UXJIfqIYDkp3QqkCn5Kz*h zGgEd{JV#j?h&`s(!^`9b})H2UntZ^QigS5d5E=hCmYN#7P6mj za+Sq_PU_swB{`rQaFgfNIH=JevSz{xsdUvJ4Fp=x{}3MYSTe@o76@F)id9AMxXa!q z4R`g4q%|XlIfW&ua0S23H85;oWH0B_cAG|K`nGSNWDLfysJd(8f7fiqJgb=^<5U#% z%t`H1sNiERi1~i2D(yggYo1u1Yl_W{yDgRUuM-a;=&)guhHrJ>!@U`!F*M%C1UMY*s9&aU7 z$~_*NClT-Zh(^|u#`RZR)=hJ+$O`fAAsu^in(V*&->!-U6+H;{wfILJi*qTC=cOhr zEJsl%_vI6lVloD31(T~vd8J$-24+M~Z-{8%O5#Q=8vqfK;1C_2r6a!^RkFANuR{`0 z=4^lfmjKGapQ7JKvoLZ>(*KoeV>$7}co!qh+x$bqhTk z%}XJT!N63?qF+rFUMgN_nR^byY47KyiWNZf$>YDi-^ofqX%~8t;qJ(znJJ zEim-u`Spb1?22M56}4(An!Bs3oSBJ%5wLDdWWi*>pMxd%y(~zmd0%o&C61O>c?}i& zZ4G_>et8nnw(KA~JcWRKX6=7dY}v z@h?;2?;gH`4hF=Fjd9Sx48F4XIGZHL?W_-8!N#wn`Aa0f;{#IzKx9&hgKanQqZx6m zE*#(88E6Ghu-GAiN8sH%-ycZD1A78DVIb~>-BI?)kz!^eSzYnI1yh8G+F+YCg^6)^ zhI97kJ74pj%W0?q5}eqEXR>mOc!!Zvkwt5p+C}k4^AV!V80(P$-^~LM7gvBuK(W7Q z0#6HMN*EOAR*e>!zBMt+c{26Nu5$&BRzoWY8a#-M~B?1#(c zlH|027OzM_31XhPel@xi_Nyv2nKHxUjt#^UVNfwJrmm@1m~+fUAcdrYugMdVHv@J( z>4x8s?%zb!s~2$)33+1XHpV=eH;W#pJ201XJFjILy6`kK&8!+ztVbvVS zQdEi$q1Ra*l4;|B`FXhuWjPmyC}Va<0Fop&ARbwO2$#)#78A#m6J4py&7H{8JzVyPJhvIM7}_%S0#p^u6@FfYH?u!Om^01CUb+x zfxK?UFZ4K3I5qS3Ar^xHi#;;PHG*4r1G!ng<130f{E>Sz=B@K(ML!{K3Z4lpZ=Yti zr*6J9rX_0J+-`hd@XC^_;*~HFh0PXg;J5%O$rE4yIF6cLObU`*mvDcPL_jWAFiGOo z@uMUHQAH7raiFh>`O6;~7Eq#P5vdB<4|1$vNZP&Qam-Ly(UoqQwU3E5PPaZ&T=AM# z>A{qDp3#J66@7RAK~ zm9za%qEC%TN=6DG2&c+Syhi@}SOl0+-R#3n^KPxsb0@S!kfQJ1&nNxS$c01S@|Q@E z0dT(aKGHEvN73*6udGxcaKG$*PMjd|0p(|&&4jnJwC3P?eqA}lFZV`JOudQa0L=X* zAqCIuX=@tF!uz#(s*)r!<5cfx_?*J-z(IJcO3IR_O#cgFZn%ye4SBXSSC7RudTQB# z#3&Bzk#55Z#TU2OoU<4!ck#rI(Xd}y`(=doh7gm#k~vka5bwp_rl8dmW+;!LAPT`$ z(!4`e>hbn0CV{958VXHgnr$JCg;$cv9h;FuU7g~$ozC(>vzZcnscdB-i~B$pe7vd4 z)WiJ6dYo`fv1@XAkeeEmSD|HV!HZ=1s3n1uW9gkHj5?)+i7hk*9i*+HDgh7!2SaQj zmNLdB4Du(|7~QhA$N-_o z(wJ3%h~cr(loB|8qb|Bmp;XAIl%!qOqr=-q;SzdL%VM;yyjiR3-V#ZVMVfQbF|NIz zTmf!hymx1NsI>P`*0+Own6{2mn^w7Y204@Hc%f2qWbFauBU^fh@zDeFL=4Hv!4l{= z%tBod^m3M`M1|6NPG)IIY6p>Xj#deAkSS6Ae7(5jKcm6?h;Z@yL!ULCZEwi}-}wK= zfh=;yFFvOza~vV&762crLo2T(eZVb{sUjmf3{z_LLZir`%yP<{MW)LELrda6~F8$!7OyxLU~MpmPI|rzfyqNRtX7W>#Q*(v!H;6KBaR;ErTBDJ1-=kB35K zdob%T;kWzDu=b`NnPY6-FalGBoryS+;4wd${l(%zI@gbwE2JTTq-}P7ctn=PXz*%D z8G&%`#K=Dmn^w3J>b~Xk7x@xl_f&i%_8*#_Mx@1n)&B&>P`PjaK#}UqlQchCp6`Sl z9*YEDVn_80F?-lNH_4FCk83d`+~%|#7Rl;_?)RbxYq$Pn2czJajJiO{;6jJ!9*KB8 z5$l00q~vmZu&q8iJiXlZ%1}JrasJa}CslP|fe}uw8V&6|Adw<%BM0BhZQ%X3&iLdX zMYhmn%Of7lN(k?0L==j=TM{~4X8%7q#{UD{KqJ4Z&tA^DQ!CYzkIy83MKbZKfWko` z8P%{*Nf6^gDLrCYsYkC?>6Y6GYbLfM(N|fOEq&(I*SoH5G)hfrnv-p-Vl`KzU8G)j zX4$1HBWUkD@>H19EXc&Ss_m?1vu58N+ih;Gl%ybPQreMYEoiBu(c0y8n#M6oRm*hJ zVzr5zQs_|JjU*L>U)0}!AEeVkuN;feQzI*#bPxHP-KZNy4rk@5cC3m?B$`rDJ@yoL z6O$S;;A-u7s5=&>J5(azP!Me8T;nF2gWZMe=uuwHTHejCWYigILrJYMNi#GitD5NB zNW8>Bs33%3#v->6N(iVGIz$G@CL=4sUQ}ZOp~upc8yEs^Gg|q7*45(H%8HCirn6P| zKIL6+EY+ghY^K`YjaMnOm^70rmfDR})>$+~kkV+Rqf03kR4Xa7WSKDA8ly>UF|nf> zD3Y2|)-9ISZR5qV@gop16}SLMD$@j_D1|}{1O|v8FCc;;Q5Dw!LgYb!ErBphf7xa$ zrJJ6Owm3R_@v$y{Jl(WRMzN?BQN#~8Y?VSFfIotD-QH%Ne82|h7$xNgU{Ev?YA7H@%K9Ml2J;soHP4o z6J6h91h<^E!^nx8dCB9$0`_W2ed0+YL?bRfx5(5*AyS1DU9wJW)Zx9RSB$9?@x~EZ zxDJ^sA`#Vplp8>bQ^@w)D&?7tQ0bWiMotsy%R1|WW6aMvG0!kM%5yM`p2)gL%hgp$ zZOoKg5|r~wlO|r%6k6kxH$4y6pSSf=7egFI`a|q*w{1S1m~cXFP>_1GILD{Fpt*Cd z_!T2AoEetNnQ7?;eq(RCJxX_aA_t-#A@_+tDwTDAH|9!S`z6OMx)$LApm@AZ<+*Xo zZMEcB-WMF(S%>CHDnJE!WLOfRI_o-XeGIA15pV^kv0Os#RscT$jEsU31*h5g!c3jV z?#43sbHOas%gdeMYCR%_@O1jfXNlqW*3`oifgv&*WN0m@Ttty94q0}}JuB!a1w%Eb zJoK}FwS6Niw-#(V25Ufk4#27oFA%R*#McrLM$kIoQ|i<$Jkq8n=c@OTc!&AF%uE!{ zu%Y_4f(eLYCLu5DrZ(|glR~+xrDF7J&gzZ7K1wH)3D^2oc9V#`<4bv%sUn)lZc1tx z$uK%CGV#MNks)v_QdUBtE%AYPC{motVka4YM9!}e(U4IDG)sN?(*sjXqiGRO76pD@ z!kFtf-@!#Eu@!~{Ar6|ZR|3bB6u^j)BDzClG@0Rh;XQ$Vk6mBkw@cfj5~;Y)I`ic| zLuWjX*g&4<1W?SbW{IntA%I{5S~-Tc=s?7a>JNYvo#fl;caQH7MLR(cNJAsuYEz?s zVNcET99mul5_~yzmgRo3L?YJ@#3uJ6-;$jo2#I!lKBAhfvHOY+ts!e9?F{HFdV;B~ za_(4l4;o-p6;K-Hqf!Wj%DK;?yRN$Ts>h#za1utfrEO?zAYSG0jHKR)LJ;KD9!0FQC4E$%Q$%3`)@|=jRgu&oH#;bwI?Bx2@0&K_sQ3 z>)jOaBSZj%1Hgt)E7H!Ke2fs}rBw#@iz#n#=^+s;@QLvGjEQVxq(Lc1T@K~oy)X;Fp|hP ze7}cXbjoxy)$r^jjN9Q#lXq`a&Tug4=LycAv$Sct7NSms>d7?B!zSfDC)@hFd%E38 zRZ`6ea1h-38MSb57vIuwp;s=mU5#tlX1dH2j-Zf&$B0ob~=;*7Z8G`(Wpa=!hx)$_^7FE|SJv<%V)M1e(Rc?ZHt7Ab4SaD00{(Y%r(d z;v$T7{dp)UGE%6cL9kOL#@k^cY;44>z_Rgz^sb;h*Vtcgx(ImSUh{L^ekvAj%VanM zFDc=4onJyd=JSUV-RaFC|EQd$A~lt=_+nZ2@=D) zIy1H%B&6fm44l;$?&{Egy#ohjq=b+L4$upfs>UG17JBKdeS_~jGvpJ@K^g0{$suSV zyJbPk=#wF|0@_MQ!C>F7FnPHlmVwYLiHu;vk|x`mGD1>gpJz8*v=I)TWi>dM3AvLp zv7|x46&TWCOlC$ynr@t>n+xtipg6qx`0gVs(-qb9Y1C{LNT7RvP$^P2TwSHz-QCA` zceYv)V+KsdD3VALVC|UCdOO}9c<$OK+Jz7m7{wF%GcrX)^-ev4iyQUa{}rC*VoChz z(jzW>ZMA$WdAd80V6BUrYKEngSg~_j-AhVhi&w(5s1U4$7(n}3!6g1v4w$eyv=m;# z4pYVz5LPJxM;QBmV5N`aF&-xBusm87n8nnXCA5xNefFFD_aXTtJ4_Rdk{B?o%kfpt zMhBuP#wLLr?nJh$rW}Gs%vdH<&N^#*nNi3^*o7r4PeeJMvP9(okSvq5b4ffGA3T)fhy!BP*c96om*w;py`y zsCw7l!pauiOpVQk6b`pu{8I#pEvQ9*nHj-k7$)Fm!3*~LeKXgNr0K1ra7T^A@BQpn z56~#G9pn2nMyF_M@za@(S7qM-E{F^?gBl4_H9?<;wDG#DU5y^Jq*`5rHwp%M-)q+cYQPT%tBsIB|9%5riJ`r{4w@1 z`G05D?E|wpTkPV_wc~T_IbyC!Gn2b+(I~I+z2f$N4mne6&BAGa+~vy{I-uPBgeWAC zB1x^-t{SI7Ve0wkXSa9NAU-|;N};EDs6|)0B4Bz@q(%LrBQ605sc>Kks;L~4xTA`q z?#n~u5qpRQ!0$t{2S7z8fw_W>Kt|InOu@{(G33>@qv?0*0vrFFAW0_u@d6MT0!a~c znlrC|snqFxG{!p=cE9Z%|Gk8YL?Z$$dxEKo2YsGRpQFOchur@jrO6xzSj)V?s5DW8 z`ydX~cJ3=nZTLEL6cS)SkRt*>kS9FT3n&_#so15E?dTJ6j1PcRO6<|Ak-D878R9fn zl#-LB(jE}mvHA>`$TqhaXbd{i&m-ghHadpjYty_a*+ieZ7}i z#YGItD74FRzrzC~v{_w9VstiQ(^de=J*7^6hRKdAdacNw-5AnIj- zf!s)RtdS!#ZXhlvX(5R3jF26nj5bn|vf4!Dg#x zyhY2kT!_~T6)5ne!QQMZ9*eQ*F(q}7)=U{j9IWo?uA5wpRk~s;a!I9}NvNV0kg}Aa7$Ct60h2$~fWskiKLl;7yS?Lo4mdcd z8dU~&1DJk6V1(bTzZ=rAMxi#;%EDPoNU>FWTgiVuRE*wPdDeB>%T0|lGj4Tmt(xUr z)Y?`}Rhe%Z+m)@;ZnV>BQlNxk10xur5GfROfWTtXg2e%s56*p@8;WKCsD7YrHiUzN zWmxQ}`Vb6UwkdaN8o7lJE>IqXbt&F(@)aZO%S_hVSUTO?KM8XM5;54{?}n?x#cr?T+#vwn1$< zpc|r$U?#9O`t6cK0VTmsabokNa50EROK8=LHm+K)L00mOO_{4)wM^!Jl+#mGZMJEr zi9-~G6fUSq0-_HDR?;%|fE+r&G3{`n1 zLsR-!tStnX&>2Sh6j+MMl76_NTrYabShXmXBx@lw#3sUriKhUBcV7H-m_c@V9z(G+ zG#^~iEvHH!c=ue4=(8h#dW{p6^5Na%O;7z=9Lu59Cio8;=DxLgdsHV!MG%+O{rB~A zfHmDHl2s;7MCGTDc|=`*lzP|zU}B1#&V7OHK4(Uo9XjjNi@T>{n+L>vQZv{#WY^!F zsQZ^{{iWr_q>;8##BC!grKK&Yw4}VCnS5>3be!9NIGj2z^~`zs=x)ob zIE^WD-n;yIG)Y6?{%T~6%_A;KG>KJEnt=x;&ckW`AG=hH>9H6_X-QR7~D2HK|;xT$DAqTTp>LmA;kPM?i6s^BGO<%nd? zk{VdBRYh6De;!IF*mPiH1IU@wJ;DVhNw8tqKW4IlBnG8_xI=Z84p9Iq=Y7G)G%X1U z5b%z7h;{c{?R!F&;o#xW_45E?!h3vxj~kSU4Dt>E)8v>O&vtldzw@XOQP~N)B+>=u zN9mI?R33$YbFopscEUXa;{ziuHD_Mh;clkYMP&4J40}{x7Y;U|6iICxX=+BT_55+ZVLfoJt-tNwkR`fCVgZc1h)8bu>3?2Jhn2_#_$crpZvXrTqN6cqoL zs)+D^xk^NU#1qgPn;y#u4@4CwB;~Rkj$Xq;$pT1bJOiE?XE{`%&e>RTLrG!Qs{L(_ zVrtSE0fC8LacMK*LIJ6*DOFBv)h3f-s}k!0XnF~g<_9UHxG<^|u^@*R3=Cu;MUc}w z_J;WLN8uEs;)l!emw1s!7~}Hg_uNbrrO*_A0#N}zl=I~@Mt7PHV%jt@F{j16R)J~p zcZL{$d$pIcPT1s`=BGwTMn*mmLPZXJjyK@xk0Q!RZ2?zQT0#fkKEng@$b4Bo-&-n8 z`>Cm`jRkF4b8Iyw5WkLmcdl|xEY$qE#Zx~o7>BDPE~>!y(}U7^JMo*PJl{^u+ZU7u ztBTeVufmfo;TnJTYxbl*g9U+lv!Req>4Oe|((9b-E=m4HjFSnZ&7px7CBY*rN;+h` z6RELJQeXi0N{E3OQiutho~58V>HEO31BiD{HpXyfu)j+HCxP}F z0p`w>;Yy)Pc7%-r5N8L=wkeZz6CL0d@!( zyBFbiTa@Z{ldTKUMafW-b#Cg91pBGduJAfxBO#f<$TQVq5)iWL!#b+K=w0f4NS#6> zEA5=N3^0G*RbdP_sKM|fD}*M%g66=!&XwfSMKf(CdiLDeEt#vGqDj{T(3AA=!g~I7 zRfn??Evldx=0=c=6(Yg1OAy29w-_-;8;o-Rf%fOinPJD|>It8VOqR0BA3CGrS8F@r zlHA?Q65-=^iP6XwS{-J^W_akc9?rI4IleWRcb9)RH=mn4vv$)XDswnOTZjr8{lEN;4p-?Dy+U%UgeHd}viN&z=Xkd}&~cdax@G49utKbnt3m zq@?zHK=>Ug?8*3xTrcX(641^p$?R@8!AF_#mFrC_kPm$p|Vt>*w4Dmq>;P zrfQEQcZnd8AZgJ2WjrJ#k~W=lfm$uA<602|PV=mTQazw^8Ao4^W(PaO?|mnxf$;>} z9~xfPA)sX=Jv|*k7bA4pw=TA6xm|yz-S~ZJNTT4T0s#?gTidK;jKtfqTC(!*q z^XaBIu_-6bWKY#`4#|g20X5diQVD%4TMHF7WGYzEjC$(Npp!_*8ax@qqk{uT;}14f1@MYW zsJjtj<8s=CspBkik`%O15&4{_I5hJqr%*Y?Hd+?IjS!a7g|G`FAceM}Lx2Nb75KyX zdcI4|O)sPU8cx5yews&9kCaBP(a}7Du+S&Xju@7~ze?ukZIa zQ=sEvbNfzbE^~TJ$+(l^Dn35crCw;ga9I>$!VrTQ86760MHRAY`Toah#_ZR5b^@Zw zW)cHLWJ--d2_eimnWxC(>ylNMPr&*QFEmvVK0!yq$|EjYnV_UE;i`YWeHA`c-glcP*CJN>Yj{Qy9V!l6A9}&!<#t z=%>ITj&evH#hj+5s9}Zfn^IE;axZzQu;9dqR5nKo($!IKiN{ukjB!&x15VX;j9~zb zk|7W>5KS5Yhi9R|Y>&TlF8!OB@lY%>~WImmvo;NBs zUX>IOax^td9rVXK!H1Kn-DsvDQaW3dXZ1moD>){A6%@zgAHP!&m`sG5#GLt?P{tAv zjJx?!B#_Qx258~240GN5?8|fs-_UnCkn^!SMO!B$E-;fxJG*}lsA2HBDPJ=bT<$x# z`1IYV*s-2E$+TXgHq1k^Rz+81;r_hq!?Dl`4?Ir=XZK8Xu10w_Z#!3iL zoaNh0$x1OPRz(8@Dv-peLaLIW36d(LNSYCJU@?dVn1u-hxfG^aNEA#~5A*Z!J5I3N z^BDLQeABXaNT;59pALRb=faAT2DMD)tSih^8Q@32t2ARQ4O4tfIBB_xP%N2;t4+?XdwZ^wJeiMMkT zGWk!n&X1(f)W&wnGhtD4MUb|OP2Lkz*p2UrDsLKLDvGQ6{P)kh|7QUMet{B9qSQBY%Cnr4aikqxFR`{39-WVsrBB zP5zm4qW%`-BP&eh=6i+_=X!+V!c*+eJKv!;=j^=j8O?IiOo9?gI4CA2OxrJj;NH0m zF{YBh!l(|czvI(Di#)C2RfJGF8{;@a5)sssBO{L*Oc#P1-CHwo6xa(Ieoi!6ofWfV zQ)#nC5`P-0v5{$m5%dy&MMR28q-sjkRwFAI85XqD`e<;IZi86(9Pc_(5jwl~J{j=U z==gY&8OlOJeaNCz20+PrK-**tu>&MgC%TWT#8 zylvFn)paJ#bhfQ_mbG@KfdDXut!AqA>*Q(q$$wm7y@*(X$zLYxa&wEcr@ZNQYS{PU zn}AacKrcJ0l`eUOi~~#zZOBs<91!_L%!f{WONhND!sH-znZQ=L7!|j5+2NV>PDS`R z@Yf-YTBYNK%Vy)shi+9dY1I#U*xm(uTN8Iz`usOR1G;IB^NLKCF)8_06}-4uJ-jT& z5Pz7(1FiyUXFn6<20Z3+^mlQZHy~b`CXO6w^Y8eouF+KR3`4@{PfURw=We_udZ_sV za}xVZEQSZhmic2##=%FsE#8GAF7YEPZ6hvM6<;nzC|uSA`f7w&L-MK>*Eb`~Nv*^< zdU!WzBP*5@PFyYX8H_;>cdIRwz%#GxMK!W5N z05xbpvHH-e1QH+@^3skubEjCutmapn3GR*su^L6?-G5-b zH`a2*gywP!{MRmqiayvCBje%c^TCGdjBbD_=dqc|^sqQJIif@}#;Q!H{U4s0@;_Eq zDvExD=_ujVyxhbp1sau=kiBw*lloA&&ibKn$(N||%J4HYGn6^GhMXBi60|7iKkJBP%T}BP$qbmvAF4N{Ue#nNtLazp}|FEF4=7Rs^8>nf+F< z%|;mim#gA~rbzvTH2@;RC|EYai6A6xq_MQKmQ2`3Zua%^^V4k9q|t)5lvMRevB_!1 zWK|Ur5CbTdOIV2`D;kECMVV?8Ho{d2O_O083pHe{x^|{Zmuqo1Vrv+oghc;2!t}#} z92loeCT`-v0U?MNa$x5Sl#C)W7-jZ0Pk58F?lgbuufh$R=wk-FBBM3wca=b1}SN43=Rg7DEumC?Sk9mIkzC6h$~%BQ7Dy7+n)M zU05juOe}>=IccFwv`cKl!;Lv+hzuDAiq=zHblEeBuxBGHBQ8cS-lVKFpkg3~4>BQ6Xvh4zWxnn#?3&t7Qh*~yv(>5ahVlNtf2g@re0 zV86_U$>~{Z(j#ev5dUW!siNm#;kV8asTH^aVZ%#Nlp;nODJq_dQ* za*ij%YZ87)yU3G}Djm|u((^5kT^WYUm^$3dLLMNH!^My)kS&vpm}C^`vNrNvAYy-} z<@~XXgh3|gmfBn+1_n<7b{Jh77@{DECIOORH7%y2W(y0tBeGLT2rL0%?p1%VLsT6>y{VlZ`44i*Ab;$0WrUaLqNTsSe;9JJ(qVc+Mh3PzE0GRjhjk9 zw-r_G-2tw((=n1EJW~|MAiP1-045|gO#*@1;Z%S9+T`-W7Y88^9*C<9~eG7_(Wp%_{T+4 zTt!ieyj#Nc>pps&z5WQ+&YyombU={BDQIDvW=uH%8h*0!y_v^K5dTtvBg|r zV;XJJr+OPr)QL=x0zr{h5o7ECP5amsHaJ@&E<^SZP&x@|6^N~1Ab@{_p*bp22ndJ6i#A=kmh#!QMMg?}W%u5&_GIT30VrOIeNJVPpJZ;Ouh)HW)1pKY1X4oF zEFwG;2w*kjb(@$M<+;RC`wFYDMMd=tcxc#DKUr0Ru_8q}I;` zhk|H4yC{MXA`n3JBFX7ug>7F|Tk1B~O{(#(l^Q#%wai;rEwvkLw%J}a)iskPniwOJ z8-GnyLsjt-9Q_4a!A>Ta56x7l+BZ!V5kRC!JjxT2SOrA}KoyuJ039PMg3n&ZMt652 z_Or)4$JKO2=kzBf3l3{aTwoPJ2I1kc`gzx&Um=W;O!Qt3-AYaf$8Bj8dhF&*nu*0o zR~8)0mHVBTPnZ!$dI2)GK4XKUW-$M!#;&5wq)~&M!|J*3;KL79?$$mAWGeZ zygqWEZ6hmiv^~%QNfeP33w!;&5ChXaQO$iUE)HN}io}WVfCj+>F$~34;wpUNQ7}wF z&0^zJ6j9S%%qhj983x5c>O;jR9k#HNt3}hIHdTs_FvUJN1QdC9bNq>b7WGn&T zv1ALlSqz240#z7cRERZXj~ro%h*Du_&DA#vrWPB5n=(kU6$n%rj^T2x8*J1rnl~es zO2rZ+oMy8FN(SI-B{*_$Dni0t2PFncq)37%G8oh$giEVfSdp_pwHHw^DV=aKTMzb$ zmO$|qNQwn2*jko>2*7FUY=2UVha!DGh-KQ+F<|!C>ZnLr@gpv9+k+UR>PaRHPcyEo zVIwP$`_<%7U9l)3A*gbHD-*HacQz`Yq9ZN@fPy0{bU<1Jc1Z}S97rQAkMRJlPTq~7 z0PGncZ#2^OCiaw0Gs)(;)Yp+cf`K+n{U`8b7Id_NOZqw!f_DU^3xDe2^B&R>)TIzZ zcKo~}E5C@KCR=Aj4o0*w_!%rL-~E9z9J9Kbfz!+-uoi07SQCZbcf6jT@JZ z$vo?;kzO_8w~KaklTnk+_ZffmcU5@8*f1j!5K;sLN&qPp>YrE!lOfZH2!6sSdbT0K zHvJHCf$BTfp!0Osy7tJb#weS9r&haKtF>D9VfT>mL_=4hG8F9i9uzbQvJ4B+OFNMZ zh(sC{I^swy79c(w@$jNGYCE$$wR&^K_Tis^hK)*@V-wxF$?fqDF86L8Q)d5lF#*sreZNb=Fb*+30^DF&^`#+x`|;pf0R9{dE*Q&r zVul88d>O%nHNbzA>cc-@TkF8DNx8UR;#DInsTnAhSsCL-->lV%0!*+suwci*1mH)m z@(JLjX8#<2kiOX7&UOUAmn$m;rejIOvDAXdR9F`?AZ?^NVO38|t}STStFu~-Qd_%< z`I#{wCSH;jE+<$QEFnZt5gXHGWoB=RWZheUEQ%v5rD1;umO|Pcfrga9iJVzyteKDF zZ&vYcnISaYMZ$ZNuf!x_g=6cNRc2Pw<4?wC%WJ z8Lj1#nuX<*5-6*1&sOPJ5}cP{jAw&rhaFLEwprPTLTu+b$e)S1FH~S)QEAI9oUb7@ znjcTKjedZ%yZxb=w z_mqx{77}kv-x3@l<|5a`l~6Q%1sszf@=k) zpr{uRt84FpqxRvA{4b^Nwrq8i=UhlIP4<7MOcc=;F(XyJ+Zi_z;5YfNKYw`+0zIF` zK3~wL8BAya;g;_hlAM>55WjM1)4p>I(B+uqG>Jr?f*L}@1ie$)@We?SvJ^m*uP1DK zoa{}JBQ7v~Tp5@+ZMtY8bvD!2{I(D<>lvmIugSxb0#~L(cYw^-8w_snxika5Wp{rh z5W7bIEwr62Mr70-$KAy9HFZipm?EclEg#hm#Hr>Y(0WnD^)02Zmtb|b;bxi%L;|e4 z8w>+xiSX58r-rI4oW)QSP!Pxo2xcQ6;Ew%t5M`iqD=CcOueK=b_AexDu|ab9#r^Q| z+Li42@85fwfv^}QK8)zf>!5b4yA^*~%zd?~=M(&=jrZ331i7Y@x2(xIU^?cO$> zG*sYp%GzJbNQYaX!R6XGWMUHD*O@jJdg<8ZzUK5s0Fl|lL{P*dE7c@T!v=p00TV}9 zXj&bPieug2pFlkiQYV=gcYW|l+=Hk?vwUd}@KzB<_&QQXBW~HVRRXjcBQB@`i1L>N8FV=M3W`k;etA8U|?>LH~Gk;+WH z#~%bpS#LR*$)84S6!i3Pu)}|8FHUl+Cw$fc-P;pIN6Lm8AV2&3Yr*nELYg zCqdMZ5j}=~AcaJ>EUlEKN-Y}#m?bfaVFs}KObK^zEx@SSTVjQ5N?LzRTSAAK@A!NE z@3h~fL0IaeBQBG8Osa^bQJ8jlSf1GjR(4cPh?x@nm}F*_tP@L7J;HbW&6v-5%$X2< z%7=>h-B4p4Xy%;zuDc*qf=G!XEQ+I~BP;HXAO_ZNir!LbOwlga81(0xr7hbNC#%#c zUFsrqhe%mx=@gC((FK3X%Tvd@-$T{fypAO0&aw9H1&63NZB(=077^p=KqNRw~ z4r3jQBJ}7o0nG2B;^(D3~cBb zgYUmpO1Ho3@jl6sJKR3F6p-Db{G08|?gJnp7C$^6d_fBYP>FxYe&HVkdKcY^^C*Ys zNFyuN1Uz8KtcmU4&DDY?Ew>gjRP7}cMZy}Wl3jJz;M_yfd{LuyBP%{9CvpsnNnRRQ zV=&ffI}XSK|1oE0-qpbNw|qM=v6OUcP#3E~k-M=%;N#_(dXVcrI?kEdD`ppU^@X{E zxFQh{fCi_2l9hkNIWViI0sxTW*K7$g{JM?VpszCyUc*Q#J_DV7 zQD$l#H*Vl7%?aSp5Vy-xk?P!UQYSa8bD-m3PN054mHNd1H^Cz-@dFkMVTkV>$Q0dc zuyi^frWv}WFUqwcF(WH7W*k2>l!Z=|6pB_P3YB8aqxqIFlSi|gJO5=je*P!E=_ff+AlM$M-2Hm}QZC~m`lJ2M#@ z;?EPd8X`1dBP;Gg59Lj51s;^4h3_TEf@@jXU!{9-V6bmjGhztVniFS4J`^yFAw(R} z83Vr1T-Hl*3HLr3Li)YeSerATbEHd0p2rBckLj8P;=gpi0G zn>2se9gg}CzOlDga(luNuX440dR{>@5UDJhBQ8x!A-$#=es#)Z^)^mU!2U7)N&;_zqTMy z;z-!Ny9C~93}V&RRX901;+vc~GkSgS*lSw#HX^hUW~CnQlluLqdNraLb`=2aIHz8Z z_xSytFP65eSLZjEyST4A%-!`q<^jC}uzi@^gR4^`EBCiH^3FoxbDEn;!uttB#YBIK zf>DGSVeD{&O?d;tXpo@Lq@@mA&JiS$JK@YNydy4|EtM^1Cn=%+-q7VGKb<6$Va4j* zvS^S;DM=-iq>79Ij8vxv-~cJ-dY*ZhzEb2C^&>7jRRma=U;}ZHN`U<~(iV%DfpxW5 z7HLYG%_fXlIG-mN2QM=Oi6zXOcK(>VF@|bPq6!XgyKcRPr)9!{wHHN895Xc z=LKn@GZdtl&V7Oh9i0^NB_!BUF)ra%P(g-da@<;O-0r;=<}@O18NwI5qp1-Y6?;Qn znko)P&3dT1ZFSWLZMklw#U6}O6@e7SQ!*1Ai6S6{!ApTmBP*F#C8KDPvrB&qCQ|{8 zwIeR&%Rt3rW!xsgHaddjN(>g^W;oLbsMeU`mnb=yHz`5MB!xuC%2MJfk_Ie6MhkM5 zxQWDX{(qnqTSF! zRP3H&zmvT3hcj@;3s^70MCN}LJ$tw>ty9iQJz?O9nq5g-vofY7$CsOC#kD$anl$5r zZDyuDe>OGL+Vpse$Zs)$uDmrOQv)=IDx%K0y=bKgf@CmC)sEXEBP$OnHEU{%a<0V!aa)$y=V@zRzaBF`Hh8TAF*wC@l zmZ8%Q73T)CMGGq+=71PN6I(cy)v%6J5*;!#sshPPq2bU$%R0+ZdSDrn$=3@o*1++u z7)2(nr1o)`zo#&mThNoVj?x2~U|@%rbh7O5;gp7z&<3#U@SNt(2SFkcJxe8kz(yUg zq&n<#9huf{7D}2MF;jnS$x{|%xrMkHwYE8H^(G16LwdQDofdms;ib;0#5ncNocB30 z+iN=*dLS|^sXjNavlOrMpYHHF2qUa}~hQ@3It^(5upde{YlEAbK%9F;sADWfw5a!lg2{*eoMzGU1q8n5wu47{FS`8xbiH zMKn9`Z_H{2sw%NUQ8dYu0hrMMe;5}+j_QDV$TtII3awrlIh8o_tXk6!1Ec3NO5*$5UR69Lj5)vQ; zhz6q))a(F71ML?`Q3QHh_vP9sKwVOA3yEKP7FZTGn3fA+Kq={ka|Cj^YiuORlpvuP zVG_s#B!V&lV^LcpZQurDl7v}Hj3`M7B0wVG2Q?P_5lerI@s-#kj9E42*v2C+BYUpl zn3n`&1C%8922)=hrR*9wCa#K-lgw;H8^0HelnXf`GR3_N?&CN1@gHB+lRsJHlG_uU z<@jb-Owr43>2!)2q%em4oy_Z;fokJxR+ia^w>_f58+=b$h4ncV1U0qnkfb}o3ve>@ z8w2ea011B#-HqDa9S)g9KA7uMH!kBbPh*|EL60p>w1CdGjR;BH;53O+)qAtqYpt1C zpa807<8U7Tqo)gko;fi#oUoU6mScXA*L&5A-w6pS;Urv?!h1KEg+W9&my{`Hq4rUM zuVb0rqwev28+Y01nJN^GeU9B!nj{!6TOL*HID^*wApBib9UFL&sVcdMrX~#I|RpnHAkiD zqZB1XAs?Ow|1C}FlOzH{Kot5uI|G8)c~-!79{VgO5=Dw54^t-`_gGc`wZs!jclo2A+2} zdiJ>-%Qcd)F1NDOOtnYF4`BEt_^_IrqlSM*1W#fis6NmHAmv60=Ga#3 zBb-pEPoK!#N&!Eu>M22--k`o-%?7;0bH01CTR7qA-L4z!@O22U&t-8I6C- zDFF_^#3Kn-i!9M_;sleKm^`9DLHel#SrG(~GO(Yxe33x8nuDMYVv%%CzmLv~1F;B) zx=@m0k2`I*rzGo0YXA|%_hQU+`hh>H2*{#vzVY)hc0XIbnk40Y^-nS!`h`}NI{Jh{ z!UyV$2^Ng28Z28BMM<%f8a6c2(QJRsjhM}`wv@Eev~4A{ZCNc@ptiyD541~Jcx728 zFr}*_E+2mGLqRr_RbiQiQdT<5)PjIfc9kY+BQ9iRnY*(gN+T{-6{g%lWXokm0dXTP z$*n}YiUERXFfc&9#Gzm@QV|h|1~EVwg}~@eoC75R#t6m;)hk0i)%Issf{cF~Z58Uf zuA@4!G+kBgX>$NXyjas@pLlh`7dc5t53YfO53nH+k$@+tJtHfj>FH31l48%5;Kn}r zcbM*n@!#Q|XJ(jKBN)--1)qJG$S^m>Y+swbTjv8L*PVv#`A*c>oCAoZm1h<)3?nNk zg4nThGGi!+v5^`zqjr?Q0#ttpC<1{}0I*VFaEl`@+`CLr1fO5oHx7J{nq&R;N}tKs z+t!#WFI`e#)T|6QH6tsXG*|fE<~pQvmq=L?()M?UxTJK=N5M2SKHnFCU-5jbVxkjk z_q%lGq*HF=zG1dzMd8zg2<(~R-C0wS$bazfCw|#9Y0^mpr{Od0A*O!=451NB?=rv1 zIp}0kL;Vanv^bD0-Y3!tO-pplRn~+F2ScS@*72yCk$oUvjDwI?U1(d%9~*IUS7%`>$n2=rGw7g_k{@LFs35OenJ>$w z61@218D&UfC74KKz#@NSX2MzYBPAVC5j?Cnmb>M$uvt6zt2V`xmhUXf?}W~Q){aRU zs*D3IM+7-Ar$aQGlacf=u{73sy&X<476oPrwphDt=iOM4` z9#QERhK=2$JocjMx<`%)e~i@IaN)SsC5eP2t!a_6w?+>ON<7?j?_6yASdzoX$L2>Z z$0d%_fpDrFrR*L({!^9hL!$8Tk)-|>7gf_QaQ+?Fk$uU>f%vmjbFp1TR}sx{vZgbR znzT;;nxj@!wPJs_s}PItgyQ>)qH1Hqod$!?o9wx_k{esVutgW@>i$acRYE*vbD6VnNoLK#wRd1|XF zK3Hj5Rk*)GvbU~xZ|Blg4lf;aaE;Yj%e)*R_=h|>uQtbd!XnH(9HUVpZm#nCEG>nl zZPU;)m~MZ&mxYMsN zsLBY^;K=4+ajY+V1JReH$sj>-@Y7WxQ%6&(iW!eQMrQ`iD{kYXBQ8ug8d;X4B+@zJ`AzzBq%w7xg?82LTTXH z(aVxT^ok|x)6&~TwPdv#@m#=V*Uusgygf&%2kyO?p)iF!ER(BHQ(d_O%+J z!_St5d1xk}=q7BifTrvy$BeDKTm%js1D??&78`8U*Obw-1ZX=)qx!T7nFKP1=;Hv9 zgk1*$jWDY8=gb;5@q-R3baX`?XS`8?GogC8k3!BxwceC@_7(e|29ZKU`m2uDQ@`>ZMDI*^mH zkm7;-gSNSZCO+dXRq}1jG3nc#V>>9wqo{@h30EVmd;aj=Gt={#G*G&N>L|@iZez?$vt7wYW|_sb&58B zedDg~+}6ljDKMIAm+#M!9yT^?NwJQs76>7#6& z4$todZRO*9Prn-99+>iHdt2t7!ut=;?L@SHr^N9mZN9c-43-uH^FE&=F8#;PhI~9* zh&GyrIGT`ZcV=sX+U|kp>c!o{3v`Kp?I{~mP?@(x!MCvsz?(6P#srBxkcGW%f#gHC zoW3h`Y7pfR5h8@YKWnwv_VN152eOG?5S(e?R3U)6_f zgmZCZMRg%)4yU>X0lbenvtg$cY(>ln zbQ`H7E9Rn%NR8)U!J2Qf^Jb@eH{dfS8lu|IWg#AYFVl}T^}6}S zK!k*ZpGYK)#^4eu_sRJgAOU{%<7MLVZ&hY<0f`u@tPuiKs8&kQLek(-iy<3Jva7}1 zs_nMkHLRO$ilU5ykc$ZvB2kdxpcVpPObUfy=^$u-5)3jXu2e;T zkrqgJ`tn(=Otu=Clp9EiAV?V|(4%t4B?K@|&m${O?lX|+@41dsdYTluE+5NltwSxu z5YW5g=pra}&+cvIFJz}hrnGp}QfHcD9;3yv$BW-lI9B0kHMJuyc5X)tPv33` z^COmL9{3tmDqz)lB2h+v1}A7QMopbi#Ll>4*C~aqAj})*yMXePctDg(VM;mP8V>GF z+u`Zz8_-}*kk$c%JWjfpUb&lFPhM4gKxF3WPyE~fQzXRFha2<)^il*iLTn8VUqcctrc#B+B|9lG6KY_>5S(`qV7Ul{%`PT5 zISeB!5VoxWG(v(tDPtOhQm`v&z~tu6UF|u;l(=r*=0kFSQb{Ei&cbWEo2DZ!vwG^HKEcK+bDj<6k8sha2X5@942Ho;?1;c#<2<4Q1 zM@P5ze{w1-0gOEorifrm5kf?S7)63;`tLjax7SWgk2BZcP|05OJ09b<1_^@>F&rOW zQrm4rjREugBP)<2E8K4;4z$tPp;rA}TFDo1THM{FN2fX@HT)WD{BdYB4DtTAawHCu+SuzBQC}U9Dm3! z&fgjJexw^ai%!^a*(Oe4f+H&)h_NJytGGh_(=+Q2hqt0OKH9M*DPQiNEV$Q3q44bX zHIYP-ZNG>h`jAF30uUBRgcMTWO6|+!B`swdnx-tXx`8fR)_Jg4y z@vqBVnW`()bi++JeX9nkBP(=n@qd3kw98Z83B8-8pPzD4`fl@R+S36^t7|-u~Yz#qWwSRzlWoBF? z4}M90e1tfFBBC%vSk8!9HFNvVeQ0MPel9~j?eW)HqR3$r(^XHNJ1PiD~Uz)5Kd+R;ov6h4t{b_$Z!;L3CJoX zIkLRv-3y^S=sE^H%`O;rX71kdg)c;BYQ%XeZUdGE&a24PzCBM?B7exDejt)nZ6}l4 zza&$z^e{#9MM_qpb)L=JCqnx}m|WGtR$6LaF^bj)-X476<_TrJl;zBZDPX%x;iDrf zcRS984$;s!&B4S1?aCjjO{bXxTMRbB=-#GJRpcLu@43U3^s8biTp>Isnfa=Dgk8iI z)+;0 zRfti zyzGCk7w|tinST*zg&HLUOu6_iwK$Vlb~BvCq89kfCsgq~enw+s1FfA8f3)v9v1WcW ze6MD>YR-s<0!4!mhSZA64pv2208vO6u5jk5N{TT*xj@sQ0h74(wBhbj`}Ay$a;6^ zWF$DABLh&H8jUPXZ}sDu=b_HI^tp|r&iY%anA>&Im-9fvWr@>nStBcCWC+BHZ~amQ zo#$MO!c0OWlWTy1nLDr%vrIaHU9Hm)#g0pF*(I6+9|Y_J%0t5;kr@+|qst{liU(7Y zn8_f$P-F0HnK_4OO2gGBh6UL4C>63%F&k6E;r$w7q3VL(iQ(UV9~|!7Uez<1 zh9HP)v4PoON(5aaE`vbxONv8nO>%A+kd9k}%P49)oH%njAt|wv_0{IXsB+2EJrLI> zxGjHO;yE*9EY@m@ZsC|A zBQ8!dM$e36YbUf1afW&?Ju@eIJ?9I|2f&GxUfKfP<8%h6etCiR_cuey$p zCr=|T1yDpe#TA#oRL&#`j*RsTkSwP-mnJyom*eB~bamf&A0|OOOth^gOlgO*Xdo}Q zM|rs$$6VqWn@_QNBp1gtX9fx!kok$t(oy1QmP~#Mn0qG|$x!FmX{D^hKM$=X!^we@Y zG4a$frULLV&#?f~HQ|A)2F45m%V6~VOxqm}n~e)hw^19naz-LDTPy_yT6Kn0MCFKp zl*I@Xu>PDJ2(=vuM30eOOq!~#ajJTM$0~04)he4@nT=`~5AK0j9vftT8OxRJhX zsm&AkQd zJ$Yo~2VNGlS5>~ni@}YES0%{YOR36cNCh=xPdIZepp>PpmK-L3Wv6BI z(>XZ6^N`iIeQlgO${wtzpG))ap*=ga;bGxw2RzkdF&(P`YQ@8Yp}g@#7KUq0fjbk1 z+Azy$2(gQ*giPYTHEh!_3lR9roCLZ>%uv^>1STatdmY3&u&`{u4^3ie4%9e4>^M2g zDW`k0)>F@xuyMFa46eIS;5W&CMOfLR%hbpZ@_3Cy8c0%0r}?t;5Zi!XJw$<%1hul! zgCP=vBP$~-Ebt5Bsc=Z;n=py)e(^d{#GfW^%AjQ`Bv^>YDC}%rd>s8NoU^_|cW_HO z!&^?Bnc1)z3vPm;#RU+0wj2j(p5hWRN=@3JfuT*BQXQ0`k&s~!gCwmn18 z*{UqSVeg4j_odiPRE(4?*;@Ew8W}AcBP%K4D9qI3f^21hrnBQ>@QGoNfo4laC0(V_ za#0{zxwS$^Vnr%G$JTaf`ZF|6QjELvtcDdLN~l1hMl-uayQ%WcLW_nk;Mpqf2w$Se zGK0ggCWIy+Gn`I=cvqm5C{0%J@AeJ>zffX#hX6)GLL)A5Q4rr@6?<~Vz^_+SmYbz` z?l3sO?Z7LbcThSd5r<9MAke8}p9JA4mqtoeGc(qL!U5w|{oCdmwPxD%ZPiCc^#G=^ zkocZOA$UU!Tx=^oKJu3MVTpWG1V2+Z4j2H^ls+5pS(mFJ0Um#~iiC}aF67%_d$I9k zBP*?k(PCN5G&{OOVX_r)f)`}LN5fEP+5SC@#$Qmu5alW}tmvd8S~uM!p`{%}-d!;t z+IBr!PWm}mC7p;(-@QOeZlViHpB>#{cfl(fuaE2ZcVos{zC#tLZ!%Huy)2S+l2NX& zf;|HU9Ee!}LREjhgCzdJ5nOHKPwR)C57%TP30XVOE0F(o)JxiX?>866~Zxh*9e{@IyJAjC; z$Vt-_JmF>m7{W+Mh(7KHz}PbNcoriopED*w(w42INNay6fRiL8gBY-6V47yjW`yeQ zXx0k_Vp~QhgA8!gHx=2JOqdBRltBof!$|>v4CKR*HUzNNg&i1R!NH=As-?ck?jtLs zvpZZPF2ugHQ$2as?Xr|J0H+Dq?6E}9QiOAffa|1&< zmLo1MB8CXMgjXaikIE`tw2I=zA`k`Ck2qE|Z~!#@45ER_AiM zQd_REX3{3skfz0qEooa}3nOGG3qYbMi{5_+yxTb;2tp{&->1CekqpsGP~g={n&gse zQ%8tQ7^PI`i~AY08Z{c9%hvK+&Oq#5mx#is{upxP`TN@sZIBMs$iFCa3~q9u^%L7E zW4xaTb|MU-po0P~u**Orl$1$;6is0dQ0D%29x{YS!O-+zi!x^s?)mgvD$-QYGrE88 z&%l6^XhPJqM)(6nNvw1FZ8-WFGS1`ae7VjG$5T`-AR2kFpdpCl+~FJZ8Dq+tOmGH$ zle8uIwoXXj0~rZ^$wtGDaXxqG-H}zDyx!U64A=-lC@fD11oCu#nTaO{qRDM6MUY>Q zUlgq%;>+Mp$dbL-{?(&hUnqnH0Qle!_0?Mt7 zi8E7aX`;VewR2T;$!bb1bwpZqo0GLa2Qk}@QV<B%jO1@qFBtsY(ls&YUH$;ce zeBLeYRZBVG`(Iq0a8M|A!LpSU7DyI_lGN!i@W?4O%2kQmRK)w3`g6?QpUqfxZo!1y zOV+5vP>K{g0JqoP+tntt7KndCWd=cPnoHDOv|E#$I~I#fGe#ccv3PJ&W1)7S7gS4x z+`?;F0P{3g`g&@^!?_;lk&m^IvW|mu6j^VR=ZqL@7EDH9!F04$)q-Lp;CNQ2R4{g9 zkzPmQ7G=nxM=*Qr2#?q(MNdui>gTtNI(2G8Vus-2cZS6@#6g4wF;#y=AP$V7pSK0D z`-=1Ho1O95Dy0Fpq~Ma$)Ky3({g6D)W~Gi?M=tpIGD-^w=xh|4@zij-EEsCWgn>ic z;{}03twDh5@aC%fCO}9cI9G+A8JW@8b8O-}we!~O(`o%$jyJGR#{uqTkQRxw_AIC zK$4=dAzDqd18Qj|`Zui=d_R7XF-BHS7U$FccJRZ*oMZUcPJ4WOHLL*_d^!stp1o$s1y3sjCvbou);kfE(RfM znD`?uV84g9sDgJumZTX80&^X|EFTswGf~NXPrI4r^};@ps>xZ>vu9x47y88o(0$Y< zuwDrh$PylrSO~P4f#kj}-7US9<6c{8F`^pHp^8f*E+c;~21Q&na9FA#WPtxf03!t> zF2s{6?;;Wel_-ryB_ZXvyB->Ryz3cqU#z14VdHFGaCG3Medst0VF`7}$T45IHg_^h z!vHNg*`GhaDenPP{vrwH4`1vb^a8YXj5>$uBqW3$x~3sE=S(A0Qj}{L(IklsNKRaA zWVFJKqeOpK(62nYG6kksqR#G7i6SHsi3kP=`!4FWKq(1Agm7U=tQFyqIp!(bx_y2$ zbnDhzL!d25{7`CwwkoZ9?W0!EQDoS)47Dk-YK>JPRMh%r_tUrIr?(QMrOz*HfIm2* zc8Bk>ul822-bR8U3}K8_ai3IrVBQCW%#MG8-gSR;w1ueF&=`TEKqg?>KnkAfQSam1Fxwx!}{>d4jD>;F%&0}A&>NFVGm0w7u^O}T~RKu~m7au<5t=WD$?jZG{` z8p%zh)-{l^kgO~W_L9I*m?SxA?k5_o9V34pC^-K)r!U&Uep43kgd;0vfSV)JEJit+ zve_~Fd|Qqo4${aUza`!yE05c-mhjT#zWR5YgeCOe7|!}|=8 zR!en`h%S^A^{~k#;9$nGq*H8_Fduv)E>3W?Sw2Uj>nrtVCQKq7`xhZQL9~BD zQ@{l{CvNDU-6w-5Piz=TuBy3i)phfRX2sL1Wigc_E|Sz0B#uTYQ^JHwNNV50SeE>E z>vHEBB5BVpL%UH@r8uL#78gNnnK{Au!*xCxHfSV=2F%8iN@0%Y(0>R$L{+h|fS6BSr ze1an`e4pe4A_k?j3=w%g7+{+?ww8$)I!q%80)IEjE57@tJ4jCaRJS-s@8;;1RTgDX zi4bTAHX6A*H9|dTVbpZgCT}lK#+I>-VAI~LLP+C()-i?h35g~WP)#N@?=*k01$Jgb zv7;j{Wsv)S8~5BU7RJK0`tD{Px&}zYofP}H)xmZ{>vC0B$iJj5f-=7^fzzH3C_eb8 z)tMtMhaxATC*+Gt?OeRR$$Oo-){TUYBl8k=X@D@{#Oh+1;7rZ0IEYNhaRM2`8aH7^ zq10sK4CgI3Z=a;z$5vA&Ib3#kKCWQ?WEPrvq!}=*tW>W<=+=uiO4j`g-~hbQvHK>Eopk{{&X<#Ku!+t_V9H?!Vy^ zDrA=Z11#PKBP)aWKK+|d*ZO;Cq71`GnqcJsN#U2rnfKq+>kfbIIO<&A`Eq8_hw?X` zZ$4H-jFta3N++Ket(A)qS9xmr7dYTyaWIO%gOsc6=(3X_w zZLoK`8?NT1&3rMnxqDpUmubX@%}suMht=N)sZ+U(!!sjpLc^O$e3+k0B9BRtG>Cbf zcFo=k88kOV6Ci*3TvVwPs6Km`=$xZhErzPdlA&}xSa0{3WH`s0rs&3nD~-}g=XPff zEF&&%*KH}12`siIL!?lT*krqDCTpiq>mx3FtGeb~eTQM%CB-C3EOl70NUu@Pjjv^h zy7;5;hk&sIMTaE>54wT$^FV}^Q3fM{C!|#if;t?IG+ciOnF!J*u6|$cfvC}Uqr9mi zUbpmNV^$PWj?jo7?gl2=f|`wouSIBU*+x3B$2An-gb2kXh>b>yO{tqp;+t1m)qOUh z?DS|O?&ByUEBhlZLH>xLh7=^KcCaKHK^`O<*pf;VA~7E6>EWlBtQE)D)O_Qn{-WsM z?*{})IpTky-4FfC)iQ9OBQ8OP|keUBS z)IB?ll61kWx~BJbi@Q)6m$-;Okgt!w^jKF;0<7_7NUN|$(|Rln;Xug&3&k%JXlj$3F_1XS(aS0(3EI^P@D2N{4Z@l`?x9r^IiyzRb?ipM97Xe{Pv{FKl-R4r(WohiTCTbdYxUNwf}##tgMk@DV2;yeHn_>{$GE5ouB+L*d^q5yv%$fWg0<+z8wEWRS7w6&X9Jm zQHGaG{M@+Gn8=D*Gn`_r55n7T`8w~L>!%txh!VLUOeqBwqSxjB$3p?4XLY Date: Fri, 20 Feb 2009 20:24:13 +0100 Subject: [PATCH 0769/2970] Add boolean and integer settings to MidoriExtension, with tests --- midori/midori-extension.c | 219 +++++++++++++++++++++++++++++++++++--- midori/midori-extension.h | 28 +++++ tests/extensions.c | 46 +++++++- 3 files changed, 273 insertions(+), 20 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 9a576003..7f8f01b1 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -34,6 +34,22 @@ struct _MidoriExtensionPrivate GHashTable* settings; }; +typedef struct +{ + gchar* name; + GType type; + gboolean default_value; + gboolean value; +} MESettingBoolean; + +typedef struct +{ + gchar* name; + GType type; + gint default_value; + gint value; +} MESettingInteger; + typedef struct { gchar* name; @@ -54,6 +70,20 @@ void me_setting_free (gpointer setting) } } +#define midori_extension_can_install_setting(extension, name) \ + if (extension->priv->active) \ + { \ + g_critical ("%s: Settings have to be installed before " \ + "the extension is activated.", G_STRFUNC); \ + return; \ + } \ + if (g_hash_table_lookup (extension->priv->settings, name)) \ + { \ + g_critical ("%s: A setting with the name '%s' is already installed.", \ + G_STRFUNC, name); \ + return; \ + } + #define me_setting_install(stype, _name, gtype, _default_value, _value) \ setting = g_new (stype, 1); \ setting->name = _name; \ @@ -186,7 +216,17 @@ midori_extension_activate_cb (MidoriExtension* extension, { MESettingString* setting = (MESettingString*)lsettings->data; - if (setting->type == G_TYPE_STRING) + if (setting->type == G_TYPE_BOOLEAN) + { + MESettingBoolean* setting_ = (MESettingBoolean*)setting; + setting_->value = setting_->default_value; + } + else if (setting->type == G_TYPE_INT) + { + MESettingInteger* setting_ = (MESettingInteger*)setting; + setting_->value = setting_->default_value; + } + else if (setting->type == G_TYPE_STRING) setting->value = g_strdup (setting->default_value); else g_assert_not_reached (); @@ -369,6 +409,166 @@ midori_extension_get_config_dir (MidoriExtension* extension) return extension->priv->config_dir; } +/** + * midori_extension_install_boolean: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @default_value: the default value + * + * Installs a boolean that can be used to conveniently + * store user configuration. + * + * Note that all settings have to be installed before + * the extension is activated. + * + * Since: 0.1.3 + **/ +void +midori_extension_install_boolean (MidoriExtension* extension, + const gchar* name, + gboolean default_value) +{ + MESettingBoolean* setting; + + g_return_if_fail (midori_extension_is_prepared (extension)); + midori_extension_can_install_setting (extension, name); + + me_setting_install (MESettingBoolean, g_strdup (name), G_TYPE_BOOLEAN, + default_value, FALSE); +} + +/** + * midori_extension_get_boolean: + * @extension: a #MidoriExtension + * @name: the name of the setting + * + * Retrieves the value of the specified setting. + * + * Since: 0.1.3 + **/ +gboolean +midori_extension_get_boolean (MidoriExtension* extension, + const gchar* name) +{ + MESettingBoolean* setting; + + g_return_val_if_fail (midori_extension_is_prepared (extension), FALSE); + g_return_val_if_fail (name != NULL, FALSE); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_BOOLEAN, return FALSE); + + return setting->value; +} + +/** + * midori_extension_set_boolean: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @value: the new value + * + * Assigns a new value to the specified setting. + * + * Since: 0.1.3 + **/ +void +midori_extension_set_boolean (MidoriExtension* extension, + const gchar* name, + gboolean value) +{ + MESettingBoolean* setting; + + g_return_if_fail (midori_extension_is_active (extension)); + g_return_if_fail (name != NULL); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_BOOLEAN, return); + + setting->value = value; +} + +/** + * midori_extension_install_integer: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @default_value: the default value + * + * Installs an integer that can be used to conveniently + * store user configuration. + * + * Note that all settings have to be installed before + * the extension is activated. + * + * Since: 0.1.3 + **/ +void +midori_extension_install_integer (MidoriExtension* extension, + const gchar* name, + gint default_value) +{ + MESettingInteger* setting; + + g_return_if_fail (midori_extension_is_prepared (extension)); + midori_extension_can_install_setting (extension, name); + + me_setting_install (MESettingInteger, g_strdup (name), G_TYPE_INT, + default_value, 0); +} + +/** + * midori_extension_get_integer: + * @extension: a #MidoriExtension + * @name: the name of the setting + * + * Retrieves the value of the specified setting. + * + * Since: 0.1.3 + **/ +gint +midori_extension_get_integer (MidoriExtension* extension, + const gchar* name) +{ + MESettingInteger* setting; + + g_return_val_if_fail (midori_extension_is_prepared (extension), 0); + g_return_val_if_fail (name != NULL, 0); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_INT, return 0); + + return setting->value; +} + +/** + * midori_extension_set_integer: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @value: the new value + * + * Assigns a new value to the specified setting. + * + * Since: 0.1.3 + **/ +void +midori_extension_set_integer (MidoriExtension* extension, + const gchar* name, + gint value) +{ + MESettingInteger* setting; + + g_return_if_fail (midori_extension_is_active (extension)); + g_return_if_fail (name != NULL); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_INT, return); + + setting->value = value; +} + /** * midori_extension_install_string: * @extension: a #MidoriExtension @@ -391,22 +591,7 @@ midori_extension_install_string (MidoriExtension* extension, MESettingString* setting; g_return_if_fail (midori_extension_is_prepared (extension)); - - /* This is not strictly a technical requirement but we want - to ensure that a running extension is in a reliable state. */ - if (extension->priv->active) - { - g_critical ("%s: Settings have to be installed before " - "the extension is activated.", G_STRFUNC); - return; - } - - if (g_hash_table_lookup (extension->priv->settings, name)) - { - g_critical ("%s: A setting with the name '%s' is already installed.", - G_STRFUNC, name); - return; - } + midori_extension_can_install_setting (extension, name); me_setting_install (MESettingString, g_strdup (name), G_TYPE_STRING, g_strdup (default_value), NULL); diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 00cc808d..3cab6ba6 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -60,6 +60,34 @@ midori_extension_deactivate (MidoriExtension* extension); const gchar* midori_extension_get_config_dir (MidoriExtension* extension); +void +midori_extension_install_boolean (MidoriExtension* extension, + const gchar* name, + gboolean default_value); + +gboolean +midori_extension_get_boolean (MidoriExtension* extension, + const gchar* name); + +void +midori_extension_set_boolean (MidoriExtension* extension, + const gchar* name, + gboolean value); + +void +midori_extension_install_integer (MidoriExtension* extension, + const gchar* name, + gint default_value); + +gint +midori_extension_get_integer (MidoriExtension* extension, + const gchar* name); + +void +midori_extension_set_integer (MidoriExtension* extension, + const gchar* name, + gint value); + void midori_extension_install_string (MidoriExtension* extension, const gchar* name, diff --git a/tests/extensions.c b/tests/extensions.c index 33b81e2d..69638fbd 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -60,11 +60,10 @@ extension_create (void) g_assert (g_object_get_data (G_OBJECT (extension), "deactivated") == magic); } -static void -extension_settings (void) +static MidoriExtension* +extension_mock_object (void) { MidoriExtension* extension; - const gchar* lastname; extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", "TestExtension", @@ -72,6 +71,46 @@ extension_settings (void) "description", "Nothing but a test.", "authors", "John Doe", NULL); + return extension; +} + +static void +extension_settings (void) +{ + MidoriExtension* extension; + gboolean nihilist; + gint age; + const gchar* lastname; + + extension = extension_mock_object (); + midori_extension_install_boolean (extension, "nihilist", TRUE); + nihilist = midori_extension_get_boolean (extension, "nihilist"); + g_assert (!nihilist); + g_signal_connect (extension, "activate", + G_CALLBACK (extension_activate_cb), NULL); + g_signal_emit_by_name (extension, "activate", NULL); + nihilist = midori_extension_get_boolean (extension, "nihilist"); + g_assert (nihilist); + midori_extension_set_boolean (extension, "nihilist", FALSE); + nihilist = midori_extension_get_boolean (extension, "nihilist"); + g_assert (!nihilist); + midori_extension_deactivate (extension); + + extension = extension_mock_object (); + midori_extension_install_integer (extension, "age", 88); + age = midori_extension_get_integer (extension, "age"); + g_assert_cmpint (age, ==, 0); + g_signal_connect (extension, "activate", + G_CALLBACK (extension_activate_cb), NULL); + g_signal_emit_by_name (extension, "activate", NULL); + age = midori_extension_get_integer (extension, "age"); + g_assert_cmpint (age, ==, 88); + midori_extension_set_integer (extension, "age", 66); + age = midori_extension_get_integer (extension, "age"); + g_assert_cmpint (age, ==, 66); + midori_extension_deactivate (extension); + + extension = extension_mock_object (); midori_extension_install_string (extension, "lastname", "Thomas Mann"); lastname = midori_extension_get_string (extension, "lastname"); g_assert_cmpstr (lastname, ==, NULL); @@ -83,6 +122,7 @@ extension_settings (void) midori_extension_set_string (extension, "lastname", "Theodor Fontane"); lastname = midori_extension_get_string (extension, "lastname"); g_assert_cmpstr (lastname, ==, "Theodor Fontane"); + midori_extension_deactivate (extension); } int From fb031a22a437369c47fa3854cf3a5f764cf8420a Mon Sep 17 00:00:00 2001 From: Sergio Durzu Date: Fri, 20 Feb 2009 21:59:04 +0100 Subject: [PATCH 0770/2970] Add Italian translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/it.po | 1573 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1575 insertions(+), 1 deletion(-) create mode 100644 po/it.po diff --git a/AUTHORS b/AUTHORS index b403de58..696c7c92 100644 --- a/AUTHORS +++ b/AUTHORS @@ -40,6 +40,7 @@ Translations: gl: Miguel Anxo Bouzada hu: SZERVÁC Attila id: Andhika Padmawan + it: Sergio Durzu ja: Masato Hashimoto nl: Vincent Tunru pl: Przemysław Sitek diff --git a/po/LINGUAS b/po/LINGUAS index 0754d608..2f2ab314 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da de el en_GB es et fi fr gl hu id ja nl pl pt_PT ru sv tr uk +da de el en_GB es et fi fr gl hu id it ja nl pl pt_PT ru sv tr uk diff --git a/po/it.po b/po/it.po new file mode 100644 index 00000000..899a92ff --- /dev/null +++ b/po/it.po @@ -0,0 +1,1573 @@ +# Italian translations for midori package. +# Copyright (C) YEAR THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Sergio Durzu 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-03 22:54+0100\n" +"PO-Revision-Date: 2009-02-19 15:27+0100\n" +"Last-Translator: Sergio Durzu \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Browser web leggero" + +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1950 +#: ../midori/main.c:2056 +#: ../midori/main.c:2065 +#: ../midori/main.c:2076 +#: ../midori/midori-websettings.c:259 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Browser web" + +#: ../midori/main.c:90 +msgid "_Bookmark" +msgstr "S_egnalibro" + +#: ../midori/main.c:91 +#: ../midori/midori-browser.c:3830 +msgid "_Bookmarks" +msgstr "S_egnlalibri" + +#: ../midori/main.c:92 +msgid "_Add Bookmark" +msgstr "A_ggiungi segnalibro" + +#: ../midori/main.c:93 +msgid "_Console" +msgstr "_Console" + +#: ../midori/main.c:94 +msgid "_Extensions" +msgstr "_Estensioni" + +#: ../midori/main.c:95 +msgid "_History" +msgstr "C_ronologia" + +#: ../midori/main.c:96 +msgid "_Homepage" +msgstr "_Pagina iniziale" + +#: ../midori/main.c:97 +msgid "_Userscripts" +msgstr "Script dell'_utente" + +#: ../midori/main.c:98 +msgid "User_styles" +msgstr "_Stili dell'utente" + +#: ../midori/main.c:99 +msgid "New _Tab" +msgstr "N_uova scheda" + +#: ../midori/main.c:100 +msgid "_Transfers" +msgstr "Sc_aricamenti" + +#: ../midori/main.c:101 +msgid "_Closed Tabs and Windows" +msgstr "_Finestre e schede chiuse" + +#: ../midori/main.c:102 +msgid "New _Window" +msgstr "_Nuova finestra" + +#: ../midori/main.c:158 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Le impostazioni non possono essere caricate: %s\n" + +#: ../midori/main.c:213 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Il valore '%s' non è valido per %s" + +#: ../midori/main.c:220 +#: ../midori/main.c:290 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Valore di configurazione '%s' non valido" + +#: ../midori/main.c:532 +msgid "File not found." +msgstr "File non trovato." + +#: ../midori/main.c:540 +#: ../midori/main.c:549 +msgid "Malformed document." +msgstr "Documento corrotto." + +#: ../midori/main.c:571 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Errore nella connessione al database: %s\n" + +#: ../midori/main.c:603 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Errore nell'esecuzione del comando del database: %s\n" + +#: ../midori/main.c:657 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" + +#: ../midori/main.c:681 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Errore nella cancellazione della cronologia: %s\n" + +#: ../midori/main.c:704 +#: ../midori/main.c:738 +#: ../midori/main.c:754 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Errore nell'inserimento dell'elemento nella cronologia: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:934 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Errore nella cancellazione dei vecchi elementi della cronologia: %s\n" + +#: ../midori/main.c:962 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Le impostazioni non possono essere salvate. %s" + +#: ../midori/main.c:991 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "I motori di ricerca non possono essere salvati. %s" + +#: ../midori/main.c:1121 +#: ../midori/sokoke.c:531 +#, c-format +msgid "Writing failed." +msgstr "Errore di scrittura." + +#: ../midori/main.c:1142 +#: ../midori/main.c:1169 +#: ../midori/main.c:1197 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "I segnalibri non possono essere salvati. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1221 +#: ../midori/main.c:1245 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Il cestino non può essere salvato. %s" + +#: ../midori/main.c:1271 +#: ../midori/midori-preferences.c:386 +msgid "Transfers" +msgstr "Download" + +#: ../midori/main.c:1312 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "La sessione non può essere salvata. %s" + +#: ../midori/main.c:1636 +msgid "Authentication Required" +msgstr "Autorizzazione richiesta" + +#: ../midori/main.c:1652 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Sono necessari un nome utente e una password\n" +"per aprire questo indirizzo:" + +#: ../midori/main.c:1666 +msgid "Username" +msgstr "Nome utente" + +#: ../midori/main.c:1677 +msgid "Password" +msgstr "Password" + +#: ../midori/main.c:1783 +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori sembra essersi chiuso inaspettatamente l'ultima volta che è stato usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per risolvere il problema." + +#: ../midori/main.c:1798 +msgid "Modify _preferences" +msgstr "Modifica _preferenze" + +#: ../midori/main.c:1802 +msgid "Reset the last _session" +msgstr "Reimpostare l'ultima _sessione" + +#: ../midori/main.c:1807 +msgid "Disable all _extensions" +msgstr "Disabilitare tutte le _estensioni" + +#: ../midori/main.c:1950 +msgid "No filename specified" +msgstr "Nessun file specificato" + +#: ../midori/main.c:1982 +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Si è presentato un errore sconosciuto" + +#: ../midori/main.c:2005 +msgid "Run the specified filename as javascript" +msgstr "Esegui il file specificato come javascript" + +#: ../midori/main.c:2007 +msgid "Display program version" +msgstr "Visualizza la versione dell'applicazione" + +#: ../midori/main.c:2009 +msgid "Addresses" +msgstr "Indirizzi" + +#: ../midori/main.c:2053 +msgid "[Addresses]" +msgstr "[Indirizzi]" + +#: ../midori/main.c:2077 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Segnalare commenti, suggerimenti e bug su:" + +#: ../midori/main.c:2079 +msgid "Check for new versions at:" +msgstr "Controlla nuove versioni su:" + +#: ../midori/main.c:2106 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n" + +#: ../midori/main.c:2184 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "I motori di ricerca non possono essere caricati. %s\n" + +#: ../midori/main.c:2196 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "I segnalibri non possono essere caricati: %s\n" + +#: ../midori/main.c:2211 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "La sessione non può essere caricata: %s\n" + +#: ../midori/main.c:2224 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Il cestino non può essere caricato: %s\n" + +#: ../midori/main.c:2237 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "La cronologia non può essere caricata: %s\n" + +#: ../midori/main.c:2249 +msgid "The following errors occured:" +msgstr "Si sono presentati i seguenti errori:" + +#: ../midori/main.c:2265 +msgid "_Ignore" +msgstr "_Ignora" + +#: ../midori/midori-browser.c:258 +#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3170 +msgid "Reload the current page" +msgstr "Ricarica la pagina corrente" + +#: ../midori/midori-browser.c:270 +#: ../midori/midori-browser.c:3167 +msgid "Stop loading the current page" +msgstr "Interrompi il caricamento della pagina corrente" + +#: ../midori/midori-browser.c:328 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% caricato" + +#: ../midori/midori-browser.c:351 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Azione inaspettata: '%s'" + +#: ../midori/midori-browser.c:524 +msgid "New bookmark" +msgstr "Nuovo segnalibro" + +#: ../midori/midori-browser.c:524 +msgid "Edit bookmark" +msgstr "Modifica segnalibro" + +#: ../midori/midori-browser.c:546 +msgid "_Title:" +msgstr "_Titolo:" + +#: ../midori/midori-browser.c:559 +#: ../midori/midori-searchaction.c:854 +msgid "_Description:" +msgstr "_Descrizione:" + +#: ../midori/midori-browser.c:578 +#: ../midori/midori-searchaction.c:868 +msgid "_Address:" +msgstr "_Indirizzo:" + +#: ../midori/midori-browser.c:596 +msgid "_Folder:" +msgstr "_Cartella:" + +#: ../midori/midori-browser.c:601 +#: ../midori/midori-browser.c:638 +msgid "Toplevel folder" +msgstr "Cartella superiore" + +#: ../midori/midori-browser.c:713 +msgid "Save file as" +msgstr "Salva come" + +#: ../midori/midori-browser.c:1302 +msgid "Open file" +msgstr "Apri file" + +#: ../midori/midori-browser.c:2524 +#: ../panels/midori-bookmarks.c:690 +msgid "Open in New _Tab" +msgstr "Apri in una nuova sc_heda" + +#: ../midori/midori-browser.c:2526 +#: ../panels/midori-bookmarks.c:692 +msgid "Open in New _Window" +msgstr "Apri in una nuova _finestra" + +#: ../midori/midori-browser.c:2788 +#, c-format +msgid "A week ago" +msgstr "Una settimana fa" + +#: ../midori/midori-browser.c:2794 +#, c-format +msgid "%d days ago" +msgstr "%d giorni fa" + +#: ../midori/midori-browser.c:2801 +msgid "Today" +msgstr "Oggi" + +#: ../midori/midori-browser.c:2803 +msgid "Yesterday" +msgstr "Ieri" + +#: ../midori/midori-browser.c:2892 +msgid "A lightweight web browser." +msgstr "Un browser web leggero" + +#: ../midori/midori-browser.c:2900 +msgid "translator-credits" +msgstr "Sergio Durzu " + +#: ../midori/midori-browser.c:3044 +msgid "Are you sure you want to remove all history items?" +msgstr "Cancellare la cronologia?" + +#: ../midori/midori-browser.c:3098 +msgid "_File" +msgstr "_File" + +#: ../midori/midori-browser.c:3101 +msgid "Open a new window" +msgstr "Apre una nuova finestra" + +#: ../midori/midori-browser.c:3104 +msgid "Open a new tab" +msgstr "Apre una nuova scheda" + +#: ../midori/midori-browser.c:3107 +msgid "Open a file" +msgstr "Apre un file" + +#: ../midori/midori-browser.c:3110 +msgid "Save to a file" +msgstr "Salva un file" + +#: ../midori/midori-browser.c:3112 +msgid "_Close Tab" +msgstr "_Chiudi scheda" + +#: ../midori/midori-browser.c:3113 +msgid "Close the current tab" +msgstr "Chiude la scheda corrente" + +#: ../midori/midori-browser.c:3115 +msgid "C_lose Window" +msgstr "Chiudi _finestra" + +#: ../midori/midori-browser.c:3116 +msgid "Close this window" +msgstr "Chiude la finestra" + +#: ../midori/midori-browser.c:3119 +msgid "Print the current page" +msgstr "Stampa la pagina corrente" + +#: ../midori/midori-browser.c:3122 +msgid "Quit the application" +msgstr "Esce dall'applicazione" + +#: ../midori/midori-browser.c:3124 +msgid "_Edit" +msgstr "_Modifica" + +#: ../midori/midori-browser.c:3127 +msgid "Cut the selected text" +msgstr "Taglia il testo selezionato" + +#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3133 +msgid "Copy the selected text" +msgstr "Copia il testo selezionato" + +#: ../midori/midori-browser.c:3136 +msgid "Paste text from the clipboard" +msgstr "Incolla il testo dagli appunti" + +#: ../midori/midori-browser.c:3139 +msgid "Delete the selected text" +msgstr "Elimina il testo selezionato" + +#: ../midori/midori-browser.c:3142 +msgid "Select all text" +msgstr "Seleziona tutto" + +#: ../midori/midori-browser.c:3145 +msgid "Find a word or phrase in the page" +msgstr "Cerca una parola o una frase nella pagina" + +#: ../midori/midori-browser.c:3147 +msgid "Find _Next" +msgstr "Trova _successivo" + +#: ../midori/midori-browser.c:3148 +msgid "Find the next occurrence of a word or phrase" +msgstr "Trova la parola o frase successiva" + +#: ../midori/midori-browser.c:3150 +msgid "Find _Previous" +msgstr "Trova _precedente" + +#: ../midori/midori-browser.c:3151 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Trova la parola o frase precedente" + +#: ../midori/midori-browser.c:3154 +msgid "_Quick Find" +msgstr "Ricerca _veloce" + +#: ../midori/midori-browser.c:3155 +msgid "Quickly jump to a word or phrase" +msgstr "Salta velocemente a una parola o frase" + +#: ../midori/midori-browser.c:3158 +msgid "Configure the application preferences" +msgstr "Imposta le preferenze dell'applicazione" + +#: ../midori/midori-browser.c:3160 +msgid "_View" +msgstr "_Visualizza" + +#: ../midori/midori-browser.c:3161 +msgid "_Toolbars" +msgstr "_Barre degli strumenti" + +#: ../midori/midori-browser.c:3173 +msgid "Increase the zoom level" +msgstr "Aumenta lo zoom" + +#: ../midori/midori-browser.c:3176 +msgid "Decrease the zoom level" +msgstr "Diminuisci lo zoom" + +#: ../midori/midori-browser.c:3179 +msgid "Reset the zoom level" +msgstr "Reimposta lo zoom" + +#: ../midori/midori-browser.c:3181 +#: ../midori/midori-view.c:984 +msgid "View _Source" +msgstr "Visualizza _sorgente" + +#: ../midori/midori-browser.c:3182 +msgid "View the source code of the page" +msgstr "Visualizza il codice sorgente della pagina" + +#: ../midori/midori-browser.c:3184 +msgid "View Selection Source" +msgstr "Visualizza sorgente selezione" + +#: ../midori/midori-browser.c:3185 +msgid "View the source code of the selection" +msgstr "Visualizza il codice sorgente della selezione" + +#: ../midori/midori-browser.c:3189 +msgid "Toggle fullscreen view" +msgstr "Schermo intero" + +#: ../midori/midori-browser.c:3191 +msgid "_Go" +msgstr "_Vai" + +#: ../midori/midori-browser.c:3194 +msgid "Go back to the previous page" +msgstr "Ritorna alla pagina precedente" + +#: ../midori/midori-browser.c:3197 +msgid "Go forward to the next page" +msgstr "Ritorna alla pagina successiva" + +#: ../midori/midori-browser.c:3200 +msgid "Go to your homepage" +msgstr "Vai alla pagina iniziale" + +#: ../midori/midori-browser.c:3202 +msgid "Empty Trash" +msgstr "Svuota cestino" + +#: ../midori/midori-browser.c:3203 +msgid "Delete the contents of the trash" +msgstr "Elimina il contenuto del cestino" + +#: ../midori/midori-browser.c:3205 +#: ../midori/midori-view.c:956 +msgid "Undo Close Tab" +msgstr "Annulla chiusura scheda" + +#: ../midori/midori-browser.c:3206 +msgid "Open the last closed tab" +msgstr "Apre l'ultima scheda chiusa" + +#: ../midori/midori-browser.c:3210 +#: ../panels/midori-bookmarks.c:209 +msgid "Add a new bookmark" +msgstr "Aggiungi un nuovo segnalibro" + +#: ../midori/midori-browser.c:3213 +msgid "Delete the selected history item" +msgstr "Elimina l'elemento selezionato dalla cronologia" + +#: ../midori/midori-browser.c:3216 +msgid "Clear the entire history" +msgstr "Cancella l'intera cronologia" + +#: ../midori/midori-browser.c:3219 +msgid "Bookmark the selected history item" +msgstr "Crea un segnalibro dall'elemento selezionato" + +#: ../midori/midori-browser.c:3221 +msgid "_Tools" +msgstr "S_trumenti" + +#: ../midori/midori-browser.c:3223 +#: ../midori/midori-searchaction.c:464 +msgid "_Manage Search Engines" +msgstr "Gestisci _motori di ricerca" + +#: ../midori/midori-browser.c:3224 +msgid "Add, edit and remove search engines..." +msgstr "Aggiunge, modifica e elimina motori di ricerca..." + +#: ../midori/midori-browser.c:3228 +msgid "_Previous Tab" +msgstr "Scheda _precedente" + +#: ../midori/midori-browser.c:3229 +msgid "Switch to the previous tab" +msgstr "Passare alla scheda precedente" + +#: ../midori/midori-browser.c:3231 +msgid "_Next Tab" +msgstr "Scheda _successiva" + +#: ../midori/midori-browser.c:3232 +msgid "Switch to the next tab" +msgstr "Passa alla scheda successiva" + +#: ../midori/midori-browser.c:3234 +msgid "_Help" +msgstr "_Aiuto" + +#: ../midori/midori-browser.c:3236 +msgid "_Contents" +msgstr "_Contenuti" + +#: ../midori/midori-browser.c:3237 +msgid "Show the documentation" +msgstr "Mostra la documentazione" + +#: ../midori/midori-browser.c:3239 +msgid "_Frequent Questions" +msgstr "Domande _frequenti" + +#: ../midori/midori-browser.c:3240 +msgid "Show the Frequently Asked Questions" +msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" + +#: ../midori/midori-browser.c:3242 +msgid "_Report a Bug" +msgstr "Segnala un _bug" + +#: ../midori/midori-browser.c:3243 +msgid "Open Midori's bug tracker" +msgstr "Apre lo strumento di segnalazione bug di Midori" + +#: ../midori/midori-browser.c:3246 +msgid "Show information about the program" +msgstr "Mostra le informazioni sull'applicazione" + +#: ../midori/midori-browser.c:3253 +msgid "P_rivate Browsing" +msgstr "Navigazione _privata" + +#: ../midori/midori-browser.c:3254 +msgid "Don't save any private data while browsing" +msgstr "Non vengono memorizzati i dati personali durante la navigazione" + +#: ../midori/midori-browser.c:3259 +msgid "_Menubar" +msgstr "Barra dei _menù" + +#: ../midori/midori-browser.c:3260 +msgid "Show menubar" +msgstr "Mostra la barra dei menù" + +#: ../midori/midori-browser.c:3263 +msgid "_Navigationbar" +msgstr "Barra di _navigazione" + +#: ../midori/midori-browser.c:3264 +msgid "Show navigationbar" +msgstr "Mostra la barra di navigazione" + +#: ../midori/midori-browser.c:3267 +msgid "Side_panel" +msgstr "_Pannello laterale" + +#: ../midori/midori-browser.c:3268 +msgid "Show sidepanel" +msgstr "Mostra il pannello laterale" + +#: ../midori/midori-browser.c:3271 +msgid "_Bookmarkbar" +msgstr "_Barra dei segnalibri" + +#: ../midori/midori-browser.c:3272 +msgid "Show bookmarkbar" +msgstr "Mostra la barra dei segnalibri" + +#: ../midori/midori-browser.c:3275 +msgid "_Transferbar" +msgstr "Barra dei _download" + +#: ../midori/midori-browser.c:3276 +msgid "Show transferbar" +msgstr "Mostra la barra dei download" + +#: ../midori/midori-browser.c:3279 +msgid "_Statusbar" +msgstr "Barra di _stato" + +#: ../midori/midori-browser.c:3280 +msgid "Show statusbar" +msgstr "Mostra la barra di stato" + +#: ../midori/midori-browser.c:3748 +msgid "_Separator" +msgstr "Sep_aratore" + +#: ../midori/midori-browser.c:3755 +msgid "_Location..." +msgstr "_Indirizzo..." + +#: ../midori/midori-browser.c:3757 +msgid "Open a particular location" +msgstr "Apre un indirizzo specifico" + +#: ../midori/midori-browser.c:3781 +msgid "_Web Search..." +msgstr "Ricerca sul _web..." + +#: ../midori/midori-browser.c:3783 +msgid "Run a web search" +msgstr "Esegue una ricerca sul web" + +#: ../midori/midori-browser.c:3802 +msgid "Reopen a previously closed tab or window" +msgstr "Riapre una scheda o una finestra chiusa precedentemente" + +#: ../midori/midori-browser.c:3815 +msgid "_Recently visited pages" +msgstr "Pagine viste _recentemente" + +#: ../midori/midori-browser.c:3817 +msgid "Reopen pages that you visited earlier" +msgstr "Riapre le pagine viste recentemente" + +#: ../midori/midori-browser.c:3832 +msgid "Show the saved bookmarks" +msgstr "Mostra i segnalibri salvati" + +#: ../midori/midori-browser.c:3845 +msgid "_Window" +msgstr "_Finestra" + +#: ../midori/midori-browser.c:3847 +msgid "Show a list of all open tabs" +msgstr "Mostra un elenco delle schede aperte" + +#: ../midori/midori-browser.c:4001 +#: ../midori/midori-preferences.c:597 +msgid "History" +msgstr "Cronologia" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4050 +msgid "_Inline Find:" +msgstr "Cerca nel _testo:" + +#: ../midori/midori-browser.c:4071 +msgid "Previous" +msgstr "Successivo" + +#: ../midori/midori-browser.c:4076 +msgid "Next" +msgstr "Precedente" + +#: ../midori/midori-browser.c:4081 +msgid "Match Case" +msgstr "Maiuscole/minuscole" + +#: ../midori/midori-browser.c:4089 +msgid "Highlight Matches" +msgstr "Evidenza risultati" + +#: ../midori/midori-browser.c:4098 +msgid "Close Findbar" +msgstr "Chiudi barra ricerca" + +#: ../midori/midori-browser.c:4379 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Impostazione '%s' non prevista" + +#: ../midori/midori-panel.c:199 +#: ../midori/midori-panel.c:200 +msgid "Close panel" +msgstr "Chiudi pannello" + +#: ../midori/midori-websettings.c:169 +#: ../midori/midori-view.c:1719 +msgid "Blank page" +msgstr "Pagina vuota" + +#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:461 +msgid "Homepage" +msgstr "Pagina iniziale" + +#: ../midori/midori-websettings.c:171 +msgid "Last open pages" +msgstr "Ultime pagine visitate" + +#: ../midori/midori-websettings.c:186 +msgid "Chinese (BIG5)" +msgstr "Cinese (BIGS)" + +#: ../midori/midori-websettings.c:187 +msgid "Japanese (SHIFT_JIS)" +msgstr "Giapponese (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:188 +msgid "Russian (KOI8-R)" +msgstr "Russo (KOI8-R)" + +#: ../midori/midori-websettings.c:189 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-websettings.c:190 +msgid "Western (ISO-8859-1)" +msgstr "Occidentale (ISO-8859-1)" + +#: ../midori/midori-websettings.c:191 +#: ../midori/midori-websettings.c:263 +msgid "Custom..." +msgstr "Personalizzato..." + +#: ../midori/midori-websettings.c:206 +msgid "New tab" +msgstr "Nuova scheda" + +#: ../midori/midori-websettings.c:207 +msgid "New window" +msgstr "Nuova finestra" + +#: ../midori/midori-websettings.c:208 +msgid "Current tab" +msgstr "Scheda corrente" + +#: ../midori/midori-websettings.c:223 +msgid "Default" +msgstr "Predefinito" + +#: ../midori/midori-websettings.c:224 +msgid "Icons" +msgstr "Icone" + +#: ../midori/midori-websettings.c:225 +msgid "Text" +msgstr "Testo" + +#: ../midori/midori-websettings.c:226 +msgid "Both" +msgstr "Entrambi" + +#: ../midori/midori-websettings.c:227 +msgid "Both horizontal" +msgstr "Entrambi orizzontalmente" + +#: ../midori/midori-websettings.c:242 +msgid "All cookies" +msgstr "Tutti i cookie" + +#: ../midori/midori-websettings.c:243 +msgid "Session cookies" +msgstr "Cookie di sessione" + +#: ../midori/midori-websettings.c:244 +#: ../panels/midori-addons.c:96 +msgid "None" +msgstr "Nessuno" + +#: ../midori/midori-websettings.c:260 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:261 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:262 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:303 +msgid "Remember last window size" +msgstr "Ricorda la dimensione dell'ultima finestra" + +#: ../midori/midori-websettings.c:304 +msgid "Whether to save the last window size" +msgstr "Salvare la dimensione dell'ultima finestra" + +#: ../midori/midori-websettings.c:312 +msgid "Last window width" +msgstr "Larghezza dell'ultima finestra" + +#: ../midori/midori-websettings.c:313 +msgid "The last saved window width" +msgstr "La larghezza dell'ultima finestra salvata" + +#: ../midori/midori-websettings.c:321 +msgid "Last window height" +msgstr "Altezza dell'ultima finestra" + +#: ../midori/midori-websettings.c:322 +msgid "The last saved window height" +msgstr "L'altezza dell'ultima finestra salvata" + +#: ../midori/midori-websettings.c:347 +msgid "Last panel position" +msgstr "Posizione del pannello" + +#: ../midori/midori-websettings.c:348 +msgid "The last saved panel position" +msgstr "La posizione dell'ultimo pannello salvato" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:357 +msgid "Last panel page" +msgstr "Pagina dell'ultimo pannello" + +#: ../midori/midori-websettings.c:358 +msgid "The last saved panel page" +msgstr "La pagina dell'ultimo pannello salvato" + +#: ../midori/midori-websettings.c:366 +msgid "Last Web search" +msgstr "Ultima ricerca web" + +#: ../midori/midori-websettings.c:367 +msgid "The last saved Web search" +msgstr "L'ultima ricerca web salvata" + +#: ../midori/midori-websettings.c:376 +msgid "Show Menubar" +msgstr "Mostra barra dei menù" + +#: ../midori/midori-websettings.c:377 +msgid "Whether to show the menubar" +msgstr "Mostra la barra dei menù" + +#: ../midori/midori-websettings.c:385 +msgid "Show Navigationbar" +msgstr "Mostra barra di navigazione" + +#: ../midori/midori-websettings.c:386 +msgid "Whether to show the navigationbar" +msgstr "Mostra la barra di navigazione" + +#: ../midori/midori-websettings.c:394 +msgid "Show Bookmarkbar" +msgstr "Mostra barra dei segnalibri" + +#: ../midori/midori-websettings.c:395 +msgid "Whether to show the bookmarkbar" +msgstr "Mostra la barra dei segnalibri" + +#: ../midori/midori-websettings.c:403 +msgid "Show Panel" +msgstr "Mostra pannello" + +#: ../midori/midori-websettings.c:404 +msgid "Whether to show the panel" +msgstr "Mostra il pannello" + +#: ../midori/midori-websettings.c:412 +msgid "Show Statusbar" +msgstr "Mostra barra di stato" + +#: ../midori/midori-websettings.c:413 +msgid "Whether to show the statusbar" +msgstr "Mostra la barra di stato" + +#: ../midori/midori-websettings.c:422 +msgid "Toolbar Style" +msgstr "Stile della barra degli strumenti" + +#: ../midori/midori-websettings.c:423 +msgid "The style of the toolbar" +msgstr "Stile della barra degli strumenti" + +#: ../midori/midori-websettings.c:432 +msgid "Toolbar Items" +msgstr "Elementi barra degli strumenti" + +#: ../midori/midori-websettings.c:433 +msgid "The items to show on the toolbar" +msgstr "Gli elementi da mostrare nella barra degli strumenti" + +#: ../midori/midori-websettings.c:441 +msgid "Compact Sidepanel" +msgstr "Pannello compatto" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to make the sidepanel compact" +msgstr "Rende il pannello compatto" + +#: ../midori/midori-websettings.c:451 +msgid "Load on Startup" +msgstr "Carica all'avvio" + +#: ../midori/midori-websettings.c:452 +msgid "What to load on startup" +msgstr "Cosa deve essere caricato all'avvio" + +#: ../midori/midori-websettings.c:462 +msgid "The homepage" +msgstr "Pagina iniziale" + +#: ../midori/midori-websettings.c:477 +msgid "Show crash dialog" +msgstr "Mostra finestra di errore" + +#: ../midori/midori-websettings.c:478 +msgid "Show a dialog after Midori crashed" +msgstr "Mostra una finestra dopo che Midori si è chiuso inaspettatamente" + +#: ../midori/midori-websettings.c:486 +msgid "Download Folder" +msgstr "Cartella download" + +#: ../midori/midori-websettings.c:487 +msgid "The folder downloaded files are saved to" +msgstr "La cartella dove devono essere salvati i file scaricati" + +#: ../midori/midori-websettings.c:495 +msgid "Download Manager" +msgstr "Gestione download" + +#: ../midori/midori-websettings.c:496 +msgid "An external download manager" +msgstr "Un gestore download esterno" + +#: ../midori/midori-websettings.c:504 +msgid "Text Editor" +msgstr "Editor di testo" + +#: ../midori/midori-websettings.c:505 +msgid "An external text editor" +msgstr "Inserire editor di testo esterno" + +#: ../midori/midori-websettings.c:513 +msgid "Location entry Search" +msgstr "Motore di ricerca predefinito" + +#: ../midori/midori-websettings.c:514 +msgid "The search to perform inside the location entry" +msgstr "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli indirizzi" + +#: ../midori/midori-websettings.c:522 +msgid "Preferred Encoding" +msgstr "Codifica preferita" + +#: ../midori/midori-websettings.c:523 +msgid "The preferred character encoding" +msgstr "Scegliere la codifica dei caratteri preferita" + +#: ../midori/midori-websettings.c:533 +msgid "Always Show Tabbar" +msgstr "Mostra sempre le schede" + +#: ../midori/midori-websettings.c:534 +msgid "Always show the tabbar" +msgstr "Abilitare per mostrare sempre le etichette delle schede" + +#: ../midori/midori-websettings.c:542 +msgid "Close Buttons on Tabs" +msgstr "Pulsante di chiusura schede" + +#: ../midori/midori-websettings.c:543 +msgid "Whether tabs have close buttons" +msgstr "Abilitare per visualizzare il pulsante di chiusura nelle schede" + +#: ../midori/midori-websettings.c:552 +msgid "Open new pages in" +msgstr "Apri nuova pagina in" + +#: ../midori/midori-websettings.c:553 +msgid "Where to open new pages" +msgstr "Scegliere dove aprire le nuove pagine" + +#: ../midori/midori-websettings.c:563 +msgid "Open external pages in" +msgstr "Apri pagine esterne in" + +#: ../midori/midori-websettings.c:564 +msgid "Where to open externally opened pages" +msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne" + +#: ../midori/midori-websettings.c:577 +msgid "Middle click opens Selection" +msgstr "Tasto centrale apre la selezione" + +#: ../midori/midori-websettings.c:578 +msgid "Load an address from the selection via middle click" +msgstr "Abilitare per caricare un indirizzo da una selezione tramite il clic col tasto centrale" + +#: ../midori/midori-websettings.c:586 +msgid "Open tabs in the background" +msgstr "Apri schede sullo sfondo" + +#: ../midori/midori-websettings.c:587 +msgid "Whether to open new tabs in the background" +msgstr "Abilitare per aprire le nuove schede sullo sfondo" + +#: ../midori/midori-websettings.c:595 +msgid "Open Tabs next to Current" +msgstr "Apri schede dopo quella corrente" + +#: ../midori/midori-websettings.c:596 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Abilitare per aprire le nuove schede dopo la scheda attuale o dopo l'ultima" + +#: ../midori/midori-websettings.c:604 +msgid "Open popups in tabs" +msgstr "Apri popup in schede" + +#: ../midori/midori-websettings.c:605 +msgid "Whether to open popup windows in tabs" +msgstr "Abilitare per aprire le finestre popup in schede" + +#: ../midori/midori-websettings.c:656 +msgid "Zoom Text and Images" +msgstr "Ingrandimento testo e immagini" + +#: ../midori/midori-websettings.c:657 +msgid "Whether to zoom text and images" +msgstr "Abilitare per ingrandire il testo e le immagini" + +#: ../midori/midori-websettings.c:667 +msgid "Accept cookies" +msgstr "Accetta cookie" + +#: ../midori/midori-websettings.c:668 +msgid "What type of cookies to accept" +msgstr "Indicare che tipo di cookie devono essere accettati" + +#: ../midori/midori-websettings.c:681 +msgid "Original cookies only" +msgstr "Cookie originali" + +#: ../midori/midori-websettings.c:682 +msgid "Accept cookies from the original website only" +msgstr "Accetta cookie solo dai siti visitati" + +#: ../midori/midori-websettings.c:690 +msgid "Maximum cookie age" +msgstr "Durata massima dei cookie" + +#: ../midori/midori-websettings.c:691 +msgid "The maximum number of days to save cookies for" +msgstr "Numero di giorni massimo per cui possono essere validi i cookie" + +#: ../midori/midori-websettings.c:701 +msgid "Remember last visited pages" +msgstr "Ricorda ultime pagine visitate" + +#: ../midori/midori-websettings.c:702 +msgid "Whether the last visited pages are saved" +msgstr "Abilitare per salvare l'elenco delle ultime pagine visitate" + +#: ../midori/midori-websettings.c:710 +msgid "Maximum history age" +msgstr "Durata cronologia" + +#: ../midori/midori-websettings.c:711 +msgid "The maximum number of days to save the history for" +msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" + +#: ../midori/midori-websettings.c:719 +msgid "Remember last form inputs" +msgstr "Ricorda i moduli compilati" + +#: ../midori/midori-websettings.c:720 +msgid "Whether the last form inputs are saved" +msgstr "Abilitare per salvare le informazioni inserite nei moduli." + +#: ../midori/midori-websettings.c:728 +msgid "Remember last downloaded files" +msgstr "Ricorda gli ultimi download" + +#: ../midori/midori-websettings.c:729 +msgid "Whether the last downloaded files are saved" +msgstr "Abilitare per salvare l'elenco degli ultimi file scaricati" + +#: ../midori/midori-websettings.c:739 +msgid "Proxy Server" +msgstr "Server proxy" + +#: ../midori/midori-websettings.c:740 +msgid "The proxy server used for HTTP connections" +msgstr "Server proxy usato per le connessioni HTTP" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:760 +msgid "Identify as" +msgstr "Identifica come" + +#: ../midori/midori-websettings.c:761 +#, fuzzy +msgid "What to identify as to web pages" +msgstr "Come identificarsi verso le pagine web" + +#: ../midori/midori-websettings.c:781 +msgid "Identification string" +msgstr "Stringa di identificazione" + +#: ../midori/midori-websettings.c:782 +msgid "The application identification string" +msgstr "Stringa di identificazione dell'applicazione" + +#: ../midori/midori-websettings.c:794 +msgid "Cache size" +msgstr "File temporanei" + +#: ../midori/midori-websettings.c:795 +msgid "The allowed size of the cache" +msgstr "Dimensione consentita per i file temporanei" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:608 +#, c-format +msgid "Not found - %s" +msgstr "Non trovato - %s" + +#: ../midori/midori-view.c:888 +msgid "Open Link in New _Tab" +msgstr "Apri collegamento in una nuova _scheda" + +#: ../midori/midori-view.c:911 +msgid "_Save Link destination" +msgstr "_Salva indirizzo collegamento" + +#: ../midori/midori-view.c:919 +msgid "_Download Link destination" +msgstr "Scarica _indirizzo collegamento" + +#: ../midori/midori-view.c:941 +msgid "Open Address in New _Tab" +msgstr "Apri indirizzi in una nuova _scheda" + +#: ../midori/midori-view.c:1411 +#, c-format +msgid "Inspect page - %s" +msgstr "Controlla pagina - %s" + +#: ../midori/midori-view.c:1562 +msgid "Source" +msgstr "Sorgente" + +#: ../midori/midori-view.c:1586 +#, c-format +msgid "Document cannot be displayed" +msgstr "Il documento non può essere visualizzato" + +#: ../midori/midori-view.c:1602 +#, c-format +msgid "No documentation installed" +msgstr "La documentazione non è installata" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Preferenze per %s" + +#. Page "General" +#: ../midori/midori-preferences.c:372 +msgid "General" +msgstr "Generale" + +#: ../midori/midori-preferences.c:373 +msgid "Startup" +msgstr "Avvio" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:422 +msgid "Appearance" +msgstr "Visualizzazione" + +#: ../midori/midori-preferences.c:423 +msgid "Font settings" +msgstr "Impostazioni caratteri" + +#: ../midori/midori-preferences.c:425 +msgid "Default Font Family" +msgstr "Famiglia di caratteri predefinita" + +#: ../midori/midori-preferences.c:431 +msgid "The default font size used to display text" +msgstr "Dimensione predefinita dei caratteri per visualizzare il testo" + +#: ../midori/midori-preferences.c:434 +msgid "Minimum Font Size" +msgstr "Dimensione minima caratteri" + +#: ../midori/midori-preferences.c:437 +msgid "The minimum font size used to display text" +msgstr "Dimensione minima dei caratteri per visualizzare il testo" + +#: ../midori/midori-preferences.c:444 +msgid "Encoding" +msgstr "Codifica" + +#: ../midori/midori-preferences.c:447 +msgid "The character encoding to use by default" +msgstr "Codifica predefinita dei caratteri" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:454 +msgid "Behavior" +msgstr "Comportamento" + +#: ../midori/midori-preferences.c:455 +msgid "Features" +msgstr "Opzioni" + +#: ../midori/midori-preferences.c:458 +#: ../extensions/statusbar-features.c:40 +msgid "Load images automatically" +msgstr "Carica immagini" + +#: ../midori/midori-preferences.c:459 +msgid "Load and display images automatically" +msgstr "Abilitare per caricare e visualizzare automaticamente le immagini" + +#: ../midori/midori-preferences.c:462 +msgid "Shrink images automatically" +msgstr "Ridimensiona immagini" + +#: ../midori/midori-preferences.c:463 +msgid "Automatically shrink standalone images to fit" +msgstr "Abilitare per ridimensionare automaticamente le immagini caricate da sole" + +#: ../midori/midori-preferences.c:466 +msgid "Print background images" +msgstr "Stampa immagini di sfondo" + +#: ../midori/midori-preferences.c:467 +msgid "Whether background images should be printed" +msgstr "Abilitare per stampare le immagini di sfondo" + +#: ../midori/midori-preferences.c:470 +msgid "Resizable text areas" +msgstr "Aree di testo ridimensionabili" + +#: ../midori/midori-preferences.c:471 +msgid "Whether text areas are resizable" +msgstr "Abilitare per rendere le aree di testo ridimensionabili" + +#: ../midori/midori-preferences.c:474 +#: ../extensions/statusbar-features.c:47 +msgid "Enable scripts" +msgstr "Abilita script" + +#: ../midori/midori-preferences.c:475 +msgid "Enable embedded scripting languages" +msgstr "Abilita linguaggi di scripting integrati" + +#: ../midori/midori-preferences.c:478 +#: ../extensions/statusbar-features.c:54 +msgid "Enable plugins" +msgstr "Abilita plugin" + +#: ../midori/midori-preferences.c:479 +msgid "Enable embedded plugin objects" +msgstr "Abilita oggetti integrati con plugin" + +#: ../midori/midori-preferences.c:482 +msgid "Enforce 96 dots per inch" +msgstr "Forza 96 punti per pollice" + +#: ../midori/midori-preferences.c:483 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Abilitare per forzare la densità dei punti a 96 DPI" + +#: ../midori/midori-preferences.c:486 +msgid "Enable developer tools" +msgstr "Abilita strumenti di sviluppo" + +#: ../midori/midori-preferences.c:487 +msgid "Enable special extensions for developers" +msgstr "Abilitare per utilizzare estensioni particolari per gli sviluppatori" + +#. Page "Interface" +#: ../midori/midori-preferences.c:497 +msgid "Interface" +msgstr "Interfaccia" + +#: ../midori/midori-preferences.c:499 +msgid "Navigationbar" +msgstr "Barra di navigazione" + +#: ../midori/midori-preferences.c:505 +msgid "Browsing" +msgstr "Navigazione" + +#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:543 +msgid "Network" +msgstr "Rete" + +#: ../midori/midori-preferences.c:565 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:572 +msgid "Privacy" +msgstr "Privacy" + +#: ../midori/midori-preferences.c:579 +msgid "Web Cookies" +msgstr "Cookie" + +#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:604 +msgid "days" +msgstr "giorni" + +#: ../midori/midori-searchaction.c:455 +#: ../katze/katze-arrayaction.c:279 +msgid "Empty" +msgstr "Vuoto" + +#: ../midori/midori-searchaction.c:810 +msgid "Add search engine" +msgstr "Aggiungi motore di ricerca" + +#: ../midori/midori-searchaction.c:810 +msgid "Edit search engine" +msgstr "Modifica motore di ricerca" + +#: ../midori/midori-searchaction.c:838 +msgid "_Name:" +msgstr "_Nome:" + +#: ../midori/midori-searchaction.c:882 +msgid "_Icon (name or file):" +msgstr "_Icona (nome o file):" + +#: ../midori/midori-searchaction.c:896 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1073 +msgid "Manage Search Engines" +msgstr "Gestisci motori di ricerca" + +#: ../midori/sokoke.c:101 +#: ../midori/sokoke.c:113 +msgid "Could not run external program." +msgstr "Non è possibile eseguire l'applicazione esterna." + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:354 +msgid "Warning: You are using a superuser account!" +msgstr "Attenzione: stai eseguendo l'applicazione come amministratore!" + +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s non ha la proprietà '%s'" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s non può essere assegnato a %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s non è accessibile" + +#: ../panels/midori-addons.c:97 +#: ../panels/midori-addons.c:143 +msgid "Userscripts" +msgstr "Script dell'utente" + +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:145 +msgid "Userstyles" +msgstr "Stili dell'utente" + +#: ../panels/midori-addons.c:1005 +#: ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Abilita" + +#: ../panels/midori-addons.c:1014 +#: ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "_Disabilita" + +#: ../panels/midori-bookmarks.c:100 +msgid "Bookmarks" +msgstr "Segnalibri" + +#: ../panels/midori-bookmarks.c:217 +msgid "Edit the selected bookmark" +msgstr "Modifica il segnalibro selezionato" + +#: ../panels/midori-bookmarks.c:225 +msgid "Delete the selected bookmark" +msgstr "Elimina il segnalibro selezionato" + +#: ../panels/midori-bookmarks.c:529 +msgid "Separator" +msgstr "Separatore" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Console" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Estensioni" + +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "Plugin" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "L'icona denominata '%s' non può essere caricata" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "L'icona '%s' non può essere caricata" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "La proprietà '%s' non è valida per %s" + +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 +msgid "Choose file" +msgstr "Scegli un file" + +#: ../katze/katze-utils.c:229 +msgid "Choose folder" +msgstr "Scegli una cartella" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Gestire Midori con i movimenti del mouse" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:137 +msgid "_Pageholder" +msgstr "" + +#: ../extensions/statusbar-features.c:38 +msgid "Images" +msgstr "Immagini" + +#: ../extensions/statusbar-features.c:45 +msgid "Scripts" +msgstr "Script" From 1c7a84ec9f49ac61da511a20906edaaa816d8688 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Feb 2009 22:38:18 +0100 Subject: [PATCH 0771/2970] Propagate the bookmarks to the callback, fixes editing bookmarks --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index 8c7d81f5..19310ac0 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1188,7 +1188,7 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, } g_signal_connect_after (item, "notify", - G_CALLBACK (midori_bookmarks_notify_item_cb), NULL); + G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); } static void From 3f75dc69e6b08995872f4033942886caf325ab52 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Feb 2009 22:43:08 +0100 Subject: [PATCH 0772/2970] Revise bookmark panel, along with a unit test --- panels/midori-bookmarks.c | 159 +++++++++++++++++++++++++++---------- tests/bookmarks.c | 161 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 278 insertions(+), 42 deletions(-) create mode 100644 tests/bookmarks.c diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 2f0b728d..e657d6a6 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -23,6 +23,7 @@ #include #include +#include void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, @@ -138,6 +139,8 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, FALSE); } + + g_object_unref (item); } } @@ -161,6 +164,8 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, parent = katze_item_get_parent (item); katze_array_remove_item (parent, item); + + g_object_unref (item); } } @@ -171,18 +176,21 @@ midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, GtkTreeModel* model; GtkTreeIter iter; KatzeItem* item; - gboolean is_separator; if (!bookmarks->edit) return; if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) { + gboolean is_separator; + gtk_tree_model_get (model, &iter, 0, &item, -1); is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); gtk_widget_set_sensitive (bookmarks->edit, !is_separator); gtk_widget_set_sensitive (bookmarks->delete, TRUE); + + g_object_unref (item); } else { @@ -266,9 +274,10 @@ static void midori_bookmarks_disconnect_folder (MidoriBookmarks* bookmarks, KatzeArray* array) { - guint i, n; + KatzeItem* item; + guint i; - g_assert (KATZE_IS_ARRAY (array)); + g_return_if_fail (KATZE_IS_ARRAY (array)); g_signal_handlers_disconnect_by_func (array, midori_bookmarks_add_item_cb, bookmarks); @@ -277,10 +286,9 @@ midori_bookmarks_disconnect_folder (MidoriBookmarks* bookmarks, g_signal_handlers_disconnect_by_func (array, midori_bookmarks_clear_cb, bookmarks); - n = katze_array_get_length (array); - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) { - KatzeItem* item = katze_array_get_nth_item (bookmarks->array, i); if (KATZE_IS_ARRAY (item)) midori_bookmarks_disconnect_folder (bookmarks, KATZE_ARRAY (item)); g_object_unref (item); @@ -296,8 +304,8 @@ midori_bookmarks_add_item_cb (KatzeArray* array, GtkTreeIter iter; guint i; - g_assert (KATZE_IS_ARRAY (array)); - g_assert (KATZE_IS_ITEM (added_item)); + g_return_if_fail (KATZE_IS_ARRAY (array)); + g_return_if_fail (KATZE_IS_ITEM (added_item)); if (KATZE_IS_ARRAY (added_item)) { @@ -334,6 +342,38 @@ midori_bookmarks_add_item_cb (KatzeArray* array, &child_iter, &iter, G_MAXINT, 0, added_item, -1); break; } + g_object_unref (item); + + i++; + } +} + +static void +midori_bookmarks_remove_iter (GtkTreeModel* model, + GtkTreeIter* parent, + KatzeItem* removed_item) +{ + guint i; + GtkTreeIter iter; + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, parent, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + if (item == removed_item) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + g_object_unref (item); + break; + } + + if (KATZE_IS_ARRAY (item)) + midori_bookmarks_remove_iter (model, &iter, removed_item); + + g_object_unref (item); i++; } } @@ -344,31 +384,15 @@ midori_bookmarks_remove_item_cb (KatzeArray* array, MidoriBookmarks* bookmarks) { GtkTreeModel* model; - guint i; - GtkTreeIter iter; - g_assert (KATZE_IS_ARRAY (array)); - g_assert (KATZE_IS_ITEM (removed_item)); + g_return_if_fail (KATZE_IS_ARRAY (array)); + g_return_if_fail (KATZE_IS_ITEM (removed_item)); if (KATZE_IS_ARRAY (removed_item)) midori_bookmarks_disconnect_folder (bookmarks, KATZE_ARRAY (removed_item)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); - i = 0; - /* FIXME: Recurse over children of folders, too */ - while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) - { - KatzeItem* item; - - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (item == removed_item) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - g_object_unref (item); - break; - } - i++; - } + midori_bookmarks_remove_iter (model, NULL, removed_item); g_object_unref (removed_item); } @@ -379,17 +403,23 @@ midori_bookmarks_clear_cb (KatzeArray* array, GtkTreeView* treeview; GtkTreeStore* store; - g_assert (KATZE_IS_ARRAY (array)); + g_return_if_fail (KATZE_IS_ARRAY (array)); - /* FIXME: Clear folders */ if (array == bookmarks->array) { treeview = GTK_TREE_VIEW (bookmarks->treeview); store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); gtk_tree_store_clear (store); } + else + { + KatzeItem* item; + guint i; - midori_bookmarks_disconnect_folder (bookmarks, array); + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) + midori_bookmarks_remove_item_cb (array, item, bookmarks); + } } static void @@ -398,11 +428,11 @@ midori_bookmarks_insert_folder (MidoriBookmarks* bookmarks, GtkTreeIter* parent, KatzeArray* array) { - guint n, i; KatzeItem* item; + guint i; GtkTreeIter iter; - g_assert (KATZE_IS_ARRAY (array)); + g_return_if_fail (KATZE_IS_ARRAY (array)); g_signal_connect (array, "add-item", G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); @@ -411,12 +441,11 @@ midori_bookmarks_insert_folder (MidoriBookmarks* bookmarks, g_signal_connect (array, "clear", G_CALLBACK (midori_bookmarks_clear_cb), bookmarks); - n = katze_array_get_length (array); - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) { - item = katze_array_get_nth_item (array, i); g_object_ref (item); - gtk_tree_store_insert_with_values (treestore, &iter, parent, n, + gtk_tree_store_insert_with_values (treestore, &iter, parent, i, 0, item, -1); if (KATZE_IS_ARRAY (item)) midori_bookmarks_insert_folder (bookmarks, treestore, @@ -437,7 +466,11 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); } - katze_assign (bookmarks->app, g_object_ref (app)); + katze_assign (bookmarks->app, app); + if (!app) + return; + + g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); if (bookmarks->array) { @@ -508,8 +541,11 @@ midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, MIDORI_BOOKMARKS (gtk_widget_get_parent (treeview))->net, katze_item_get_uri (item), NULL, treeview, NULL); g_object_set (renderer, "pixbuf", pixbuf, NULL); + if (pixbuf) g_object_unref (pixbuf); + + g_object_unref (item); } static void @@ -528,6 +564,8 @@ midori_bookmarks_treeview_render_text_cb (GtkTreeViewColumn* column, "text", katze_item_get_name (item), NULL); else g_object_set (renderer, "markup", _("Separator"), NULL); + + g_object_unref (item); } static void @@ -554,6 +592,8 @@ midori_bookmarks_row_activated_cb (GtkTreeView* treeview, browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); } + + g_object_unref (item); } } @@ -711,33 +751,65 @@ midori_bookmarks_button_release_event_cb (GtkWidget* widget, { GtkTreeModel* model; GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - gint n; if (event->button != 2 && event->button != 3) return FALSE; if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) { + KatzeItem* item; + gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); + if (event->button == 2) { + const gchar* uri = katze_item_get_uri (item); + if (uri && *uri) { - GtkWidget* browser = gtk_widget_get_toplevel (widget); + GtkWidget* browser; + gint n; + + browser = gtk_widget_get_toplevel (widget); n = midori_browser_add_uri (MIDORI_BROWSER (browser), uri); midori_browser_set_current_page (MIDORI_BROWSER (browser), n); } } else midori_bookmarks_popup (widget, event, item, bookmarks); + + g_object_unref (item); return TRUE; } return FALSE; } +static gboolean +midori_bookmarks_key_release_event_cb (GtkWidget* widget, + GdkEventKey* event, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->keyval != GDK_Delete) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + KatzeItem* item; + KatzeArray* parent; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + + g_object_unref (item); + } + + return FALSE; +} + static void midori_bookmarks_popup_menu_cb (GtkWidget* widget, MidoriBookmarks* bookmarks) @@ -750,6 +822,7 @@ midori_bookmarks_popup_menu_cb (GtkWidget* widget, { gtk_tree_model_get (model, &iter, 0, &item, -1); midori_bookmarks_popup (widget, NULL, item, bookmarks); + g_object_unref (item); } } @@ -791,6 +864,8 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) midori_bookmarks_cursor_or_row_changed_cb, bookmarks, "signal::button-release-event", midori_bookmarks_button_release_event_cb, bookmarks, + "signal::key-release-event", + midori_bookmarks_key_release_event_cb, bookmarks, "signal::popup-menu", midori_bookmarks_popup_menu_cb, bookmarks, NULL); diff --git a/tests/bookmarks.c b/tests/bookmarks.c new file mode 100644 index 00000000..8f759cd0 --- /dev/null +++ b/tests/bookmarks.c @@ -0,0 +1,161 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori.h" +#include "midori-bookmarks.h" + +#if GLIB_CHECK_VERSION(2, 16, 0) + +static void +bookmarks_panel_create (void) +{ + MidoriApp* app; + MidoriBookmarks* bookmarks; + gpointer value; + + app = g_object_new (MIDORI_TYPE_APP, NULL); + + bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, NULL); + value = katze_object_get_object (bookmarks, "app"); + g_assert (value == NULL); + gtk_widget_destroy (GTK_WIDGET (bookmarks)); + + bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, NULL); + value = katze_object_get_object (bookmarks, "app"); + g_assert (value == app); + gtk_widget_destroy (GTK_WIDGET (bookmarks)); + + bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, NULL); + g_object_set (bookmarks, "app", app, NULL); + value = katze_object_get_object (bookmarks, "app"); + g_assert (value == app); + gtk_widget_destroy (GTK_WIDGET (bookmarks)); +} + +static KatzeItem* +bookmark_new (const gchar* uri, + const gchar* title) +{ + return g_object_new (KATZE_TYPE_ITEM, "uri", uri, "name", title, NULL); +} + +static KatzeArray* +folder_new (const gchar* title) +{ + KatzeArray* folder; + + folder = katze_array_new (KATZE_TYPE_ARRAY); + g_object_set (folder, "name", title, NULL); + return folder; +} + +static void +bookmarks_panel_fill (void) +{ + MidoriApp* app; + KatzeArray* array; + MidoriBookmarks* bookmarks; + GList* children; + GtkWidget* treeview; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* bookmark; + KatzeArray* folder; + guint n; + gpointer value; + + app = g_object_new (MIDORI_TYPE_APP, NULL); + array = katze_array_new (KATZE_TYPE_ARRAY); + g_object_set (app, "bookmarks", array, NULL); + value = katze_object_get_object (app, "bookmarks"); + g_assert (value == array); + bookmarks = g_object_new (MIDORI_TYPE_BOOKMARKS, "app", app, NULL); + children = gtk_container_get_children (GTK_CONTAINER (bookmarks)); + treeview = g_list_nth_data (children, 0); + g_list_free (children); + g_assert (GTK_IS_TREE_VIEW (treeview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + g_assert (GTK_IS_TREE_MODEL (model)); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); + bookmark = bookmark_new ("http://www.example.com", "Example"); + katze_array_add_item (array, bookmark); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 1); + katze_array_remove_item (array, bookmark); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); + bookmark = bookmark_new ("http://www.example.com", "Example"); + katze_array_add_item (array, bookmark); + folder = folder_new ("Empty"); + katze_array_add_item (array, folder); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 2); + katze_array_remove_item (array, folder); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 1); + folder = folder_new ("Empty"); + katze_array_add_item (array, folder); + folder = folder_new ("Kurioses"); + katze_array_add_item (array, folder); + bookmark = bookmark_new ("http://www.ende.de", "Das Ende"); + katze_array_add_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 3); + folder = folder_new ("Miscellaneous"); + katze_array_add_item (array, folder); + gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 0); + bookmark = bookmark_new ("http://thesaurus.reference.com/", "Thesaurus"); + katze_array_add_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 1); + bookmark = bookmark_new ("http://en.wikipedia.org/", "Wikipedia"); + katze_array_add_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 2); + katze_array_remove_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 1); + katze_array_remove_item (array, folder); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 3); + katze_array_add_item (array, folder); + /* katze_array_clear (folder); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 0); */ + katze_array_clear (array); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); +} + +int +main (int argc, + char** argv) +{ + /* libSoup uses threads, therefore if WebKit is built with libSoup + or Midori is using it, we need to initialize threads. */ + if (!g_thread_supported ()) g_thread_init (NULL); + g_test_init (&argc, &argv, NULL); + gtk_init_check (&argc, &argv); + + g_test_add_func ("/bookmarks/panel/create", bookmarks_panel_create); + g_test_add_func ("/bookmarks/panel/fill", bookmarks_panel_fill); + + return g_test_run (); +} + +#endif From 04a65f0f90ab8b300f2e6033029ff3ff23f7bb9a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Feb 2009 01:10:21 +0100 Subject: [PATCH 0773/2970] Fix label of the userstyle panel --- panels/midori-addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 67823f6c..4d04b1dd 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -141,7 +141,7 @@ midori_addons_get_label (MidoriViewable* viewable) { if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_SCRIPTS) return _("Userscripts"); - else if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_SCRIPTS) + else if (MIDORI_ADDONS (viewable)->kind == MIDORI_ADDON_USER_STYLES) return _("Userstyles"); else return NULL; From f5e6006954e630da3d85aea7515cfe2b5d2055f5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Feb 2009 22:12:34 +0100 Subject: [PATCH 0774/2970] Remove destroy callback from web view --- midori/midori-view.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 850806de..d49c0374 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1159,14 +1159,6 @@ webkit_web_view_window_object_cleared_cb (GtkWidget* web_view, g_signal_emit (view, signals[CONTEXT_READY], 0, js_context); } -static void -webkit_web_view_destroy_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame) -{ - g_signal_handlers_disconnect_by_func (web_frame, - webkit_web_frame_load_done_cb, gtk_widget_get_parent (web_view)); -} - static void midori_view_init (MidoriView* view) { @@ -1557,8 +1549,6 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_console_message_cb, view, "signal::window-object-cleared", webkit_web_view_window_object_cleared_cb, view, - "signal::destroy", - webkit_web_view_destroy_cb, web_frame, NULL); if (g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW)) g_object_connect (view->web_view, From dffc14dee1d213cbee01a2eaf4bf7f772c74ae7d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Feb 2009 22:34:50 +0100 Subject: [PATCH 0775/2970] Correct path to Midori executable in INSTALL file --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index a771fae9..46d403fd 100644 --- a/INSTALL +++ b/INSTALL @@ -33,7 +33,7 @@ Midori is now built with debugging symbols. Make sure you have installed 'gdb', the GNU Debugger. -Run Midori as 'gdb _build_/default/midori'. +Run Midori as 'gdb _build_/default/midori/midori'. Try to reproduce a crash that you experienced earlier, this time Midori will freeze at the point of the crash. From 5f52e0d21fe57e1ddd880033aef2d6097f8898a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Feb 2009 22:36:03 +0100 Subject: [PATCH 0776/2970] Move stock item registrations to sokoke so it can be tested --- midori/main.c | 63 +--------------------------------------------- midori/sokoke.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ midori/sokoke.h | 3 +++ 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/midori/main.c b/midori/main.c index 19310ac0..80950642 100644 --- a/midori/main.c +++ b/midori/main.c @@ -24,7 +24,6 @@ #include "midori-panel.h" #include "midori-preferences.h" #include "midori-plugins.h" -#include "midori-stock.h" #include "midori-view.h" #include "midori-websettings.h" @@ -71,66 +70,6 @@ typedef enum } MidoriHistoryError; -static void -stock_items_init (void) -{ - typedef struct - { - const gchar* stock_id; - const gchar* label; - GdkModifierType modifier; - guint keyval; - const gchar* fallback; - } FatStockItem; - GtkIconSource* icon_source; - GtkIconSet* icon_set; - GtkIconFactory* factory = gtk_icon_factory_new (); - gsize i; - - static FatStockItem items[] = - { - { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, - { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, - { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, - { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, - { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, - - { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, - { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, - { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD }, - { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, - { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, - { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, - { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, - { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, - { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, - { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, - { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, - { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, - { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, - }; - - for (i = 0; i < G_N_ELEMENTS (items); i++) - { - icon_set = gtk_icon_set_new (); - icon_source = gtk_icon_source_new (); - if (items[i].fallback) - { - gtk_icon_source_set_icon_name (icon_source, items[i].fallback); - items[i].fallback = NULL; - gtk_icon_set_add_source (icon_set, icon_source); - } - gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); - gtk_icon_set_add_source (icon_set, icon_source); - gtk_icon_source_free (icon_source); - gtk_icon_factory_add (factory, items[i].stock_id, icon_set); - gtk_icon_set_unref (icon_set); - } - gtk_stock_add ((GtkStockItem*)items, G_N_ELEMENTS (items)); - gtk_icon_factory_add_default (factory); - g_object_unref (factory); -} - static gchar* build_config_filename (const gchar* filename) { @@ -1765,7 +1704,7 @@ main (int argc, /* libSoup uses threads, therefore if WebKit is built with libSoup or Midori is using it, we need to initialize threads. */ if (!g_thread_supported ()) g_thread_init (NULL); - stock_items_init (); + sokoke_register_stock_items (); g_set_application_name (_("Midori")); if (version) diff --git a/midori/sokoke.c b/midori/sokoke.c index 8a756e6e..98d9384d 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -10,6 +10,7 @@ */ #include "sokoke.h" +#include "midori-stock.h" #if HAVE_CONFIG_H #include @@ -700,3 +701,68 @@ sokoke_time_t_to_julian (const time_t* timestamp) return julian; } + +/** + * sokoke_register_stock_items: + * + * Registers several custom stock items used throughout Midori. + **/ +void +sokoke_register_stock_items (void) +{ + typedef struct + { + const gchar* stock_id; + const gchar* label; + GdkModifierType modifier; + guint keyval; + const gchar* fallback; + } FatStockItem; + GtkIconSource* icon_source; + GtkIconSet* icon_set; + GtkIconFactory* factory = gtk_icon_factory_new (); + gsize i; + + static FatStockItem items[] = + { + { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, + { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, + { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, + { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, + { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, + + { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, + { STOCK_BOOKMARKS, N_("_Bookmarks"), 0, 0, GTK_STOCK_DIRECTORY }, + { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, GTK_STOCK_ADD }, + { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, + { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, + { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, + { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, + { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, + { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, + { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, + { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, + { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, + { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, + }; + + for (i = 0; i < G_N_ELEMENTS (items); i++) + { + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + if (items[i].fallback) + { + gtk_icon_source_set_icon_name (icon_source, items[i].fallback); + items[i].fallback = NULL; + gtk_icon_set_add_source (icon_set, icon_source); + } + gtk_icon_source_set_icon_name (icon_source, items[i].stock_id); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, items[i].stock_id, icon_set); + gtk_icon_set_unref (icon_set); + } + gtk_stock_add ((GtkStockItem*)items, G_N_ELEMENTS (items)); + gtk_icon_factory_add_default (factory); + g_object_unref (factory); +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 13190475..4212f7e6 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -124,4 +124,7 @@ sokoke_image_menu_item_new_ellipsized (const gchar* label); gint64 sokoke_time_t_to_julian (const time_t* timestamp); +void +sokoke_register_stock_items (void); + #endif /* !__SOKOKE_H__ */ From a177ac67b9ca85c08daabaf0fb30a540418a2789 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Feb 2009 23:16:44 +0100 Subject: [PATCH 0777/2970] Emit a warning when trying to get or set a non-existing setting --- midori/midori-extension.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 7f8f01b1..96edfae5 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -95,6 +95,9 @@ void me_setting_free (gpointer setting) (extension->priv->lsettings, setting); #define me_setting_type(setting, gtype, rreturn) \ +if (!setting) { \ +g_critical ("%s: There is no setting with the name '%s' installed.", G_STRFUNC, name); \ +rreturn; } \ if (setting->type != gtype) { \ g_critical ("%s: The setting '%s' is not a string.", G_STRFUNC, name); \ rreturn; } From 3b9c63937c0b90d4459b5f86c280c94e2c806e1b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Feb 2009 23:59:02 +0100 Subject: [PATCH 0778/2970] Refactor History panel into a separate class This brings back the problem of address and title of items showing up in the history unfortunately. Now the history items are appended rather than prepended, we probably want to fix that in the future. --- midori/main.c | 6 + midori/midori-browser.c | 539 ++--------------------- panels/midori-history.c | 950 ++++++++++++++++++++++++++++++++++++++++ panels/midori-history.h | 43 ++ po/POTFILES.in | 1 + 5 files changed, 1037 insertions(+), 502 deletions(-) create mode 100644 panels/midori-history.c create mode 100644 panels/midori-history.h diff --git a/midori/main.c b/midori/main.c index 80950642..7306628d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -21,6 +21,7 @@ #include "midori-console.h" #include "midori-extension.h" #include "midori-extensions.h" +#include "midori-history.h" #include "midori-panel.h" #include "midori-preferences.h" #include "midori-plugins.h" @@ -1210,6 +1211,11 @@ midori_app_add_browser_cb (MidoriApp* app, gtk_widget_show (addon); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + /* History */ + addon = g_object_new (MIDORI_TYPE_HISTORY, "app", app, NULL); + gtk_widget_show (addon); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + /* Transfers */ #if 0 addon = midori_view_new (net); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0d2bd919..c5c228b6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -53,7 +53,6 @@ struct _MidoriBrowser GtkWidget* bookmarkbar; GtkWidget* panel; - GtkWidget* panel_history; GtkWidget* notebook; GtkWidget* inspector; @@ -462,19 +461,20 @@ midori_view_notify_title_cb (GtkWidget* view, KatzeItem* item; KatzeItem* proxy; - if (!browser->history) - return; - - item = g_object_get_data (G_OBJECT (view), "history-item-added"); - proxy = midori_view_get_proxy_item (MIDORI_VIEW (view)); - if (item && katze_item_get_added (item) == katze_item_get_added (proxy)) - katze_item_set_name (item, katze_item_get_name (proxy)); - else + if (browser->history && + katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) { - katze_object_assign (item, katze_item_copy (proxy)); - midori_browser_new_history_item (browser, g_object_ref (item)); - g_object_set_data_full (G_OBJECT (view), "history-item-added", - item, (GDestroyNotify)g_object_unref); + item = g_object_get_data (G_OBJECT (view), "history-item-added"); + proxy = midori_view_get_proxy_item (MIDORI_VIEW (view)); + if (item && katze_item_get_added (item) == katze_item_get_added (proxy)) + katze_item_set_name (item, katze_item_get_name (proxy)); + else + { + katze_object_assign (item, katze_item_copy (proxy)); + midori_browser_new_history_item (browser, g_object_ref (item)); + g_object_set_data_full (G_OBJECT (view), "history-item-added", + item, (GDestroyNotify)g_object_unref); + } } } @@ -2412,20 +2412,6 @@ midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem, g_signal_emit (browser, signals[NEW_WINDOW], 0, uri); } -static void -midori_browser_bookmark_bookmark_activate_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - KatzeItem* item; - const gchar* uri; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - - if (uri && *uri) - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE); -} - static void midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) @@ -2440,62 +2426,6 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); } -static void -midori_browser_model_remove_item (GtkTreeModel* model, - KatzeItem* item, - GtkTreeIter* iter) -{ - GtkTreeIter child_iter; - KatzeItem* child; - KatzeArray* parent; - gint i, n; - - if (KATZE_IS_ARRAY (item)) - { - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), 0); - katze_array_remove_item (KATZE_ARRAY (item), child); - } - while (gtk_tree_model_iter_nth_child (model, &child_iter, iter, 0)) - gtk_tree_store_remove (GTK_TREE_STORE (model), &child_iter); - } - - gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - g_object_unref (item); - - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); -} - -static void -midori_browser_history_delete (MidoriBrowser* browser) -{ - GtkTreeView* treeview; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - GtkAction* location_action; - - treeview = GTK_TREE_VIEW (browser->panel_history); - if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) - { - location_action = _action_by_name (browser, "Location"); - gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_browser_model_remove_item (model, item, &iter); - midori_location_action_delete_item_from_uri ( - MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); - } -} - -static void -midori_browser_history_delete_activate_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - midori_browser_history_delete (browser); -} - static void midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) @@ -2518,7 +2448,6 @@ static void midori_browser_bookmark_popup (GtkWidget* widget, GdkEventButton* event, KatzeItem* item, - gboolean history_item, MidoriBrowser* browser) { GtkWidget* menu; @@ -2531,162 +2460,18 @@ midori_browser_bookmark_popup (GtkWidget* widget, item, midori_browser_bookmark_open_in_tab_activate_cb, browser); midori_browser_bookmark_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), item, midori_browser_bookmark_open_in_window_activate_cb, browser); - if (history_item && !KATZE_IS_ARRAY (item)) - midori_browser_bookmark_popup_item (menu, STOCK_BOOKMARK_ADD, NULL, - item, midori_browser_bookmark_bookmark_activate_cb, browser); menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); - if (!history_item) - { - midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL, - item, midori_browser_bookmark_edit_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, - item, midori_browser_bookmark_delete_activate_cb, browser); - } - else - midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, - item, midori_browser_history_delete_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL, + item, midori_browser_bookmark_edit_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL, + item, midori_browser_bookmark_delete_activate_cb, browser); sokoke_widget_popup (widget, GTK_MENU (menu), event, SOKOKE_MENU_POSITION_CURSOR); } -static void -midori_panel_history_row_activated_cb (GtkTreeView* treeview, - GtkTreePath* path, - GtkTreeViewColumn* column, - MidoriBrowser* browser) -{ - KatzeItem* item; - GtkTreeModel* model; - GtkTreeIter iter; - const gchar* uri; - - model = gtk_tree_view_get_model (treeview); - if (gtk_tree_model_get_iter (model, &iter, path)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (KATZE_IS_ITEM (item)) - { - uri = katze_item_get_uri (item); - midori_browser_set_current_uri (browser, uri); - } - g_object_unref (item); - } -} - -static void -midori_panel_history_cursor_or_row_changed_cb (GtkTreeView* tree_view, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - gboolean is_page; - - if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - - is_page = !KATZE_IS_ARRAY (item) && katze_item_get_uri (item); - _action_set_sensitive (browser, "HistoryAddBookmark", is_page); - } - else - { - _action_set_sensitive (browser, "HistoryAddBookmark", FALSE); - } -} - -static void -_midori_panel_history_popup (GtkWidget* widget, - GdkEventButton* event, - KatzeItem* item, - MidoriBrowser* browser) -{ - midori_browser_bookmark_popup (widget, event, item, TRUE, browser); -} - -static gboolean -midori_panel_history_button_release_event_cb (GtkWidget* widget, - GdkEventButton* event, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - const gchar* uri; - gint n; - - if (event->button != 2 && event->button != 3) - return FALSE; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), - &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (event->button == 2) - { - if (uri && *uri) - { - n = midori_browser_add_uri (browser, uri); - midori_browser_set_current_page (browser, n); - } - } - else - _midori_panel_history_popup (widget, event, item, browser); - - g_object_unref (item); - return TRUE; - } - return FALSE; -} - -static gboolean -midori_panel_history_key_release_event_cb (GtkWidget* widget, - GdkEventKey* event, - MidoriBrowser* browser) -{ - GtkTreeView* treeview; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - GtkAction* location_action; - - if (event->keyval != GDK_Delete) - return FALSE; - - treeview = GTK_TREE_VIEW (widget); - if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) - { - location_action = _action_by_name (browser, "Location"); - gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_location_action_delete_item_from_uri ( - MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); - midori_browser_model_remove_item (model, item, &iter); - } - - return FALSE; -} - -static void -midori_panel_history_popup_menu_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), - &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - _midori_panel_history_popup (widget, NULL, item, browser); - g_object_unref (item); - } -} - static void midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, MidoriBrowser* browser) @@ -2723,7 +2508,7 @@ midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, else if (event->button == 3) { item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - midori_browser_bookmark_popup (toolitem, NULL, item, FALSE, browser); + midori_browser_bookmark_popup (toolitem, NULL, item, browser); return TRUE; } return FALSE; @@ -2736,86 +2521,6 @@ _action_bookmark_add_activate (GtkAction* action, midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE); } -static void -midori_browser_history_render_icon_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - KatzeItem* item; - GdkPixbuf* pixbuf = NULL; - - gtk_tree_model_get (model, iter, 0, &item, -1); - - g_assert (KATZE_IS_ITEM (item)); - - if (KATZE_IS_ARRAY (item)) - pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, - GTK_ICON_SIZE_MENU, NULL); - else - pixbuf = katze_net_load_icon ( - MIDORI_BROWSER (gtk_widget_get_toplevel (treeview))->net, - katze_item_get_uri (item), NULL, treeview, NULL); - - g_object_set (renderer, "pixbuf", pixbuf, NULL); - - if (pixbuf) - g_object_unref (pixbuf); - - g_object_unref (item); -} - -static void -midori_browser_history_render_text_cb (GtkTreeViewColumn* column, - GtkCellRenderer* renderer, - GtkTreeModel* model, - GtkTreeIter* iter, - GtkWidget* treeview) -{ - KatzeItem* item; - char* sdate; - gint64 age; - - gtk_tree_model_get (model, iter, 0, &item, 1, &age, -1); - - g_assert (KATZE_IS_ITEM (item)); - - if (KATZE_IS_ARRAY (item)) - { - g_assert (age >= 0); - - if (age > 7) - { - g_object_set (renderer, "text", katze_item_get_token (item), NULL); - } - else if (age > 6) - { - sdate = g_strdup_printf (_("A week ago")); - g_object_set (renderer, "text", sdate, NULL); - g_free (sdate); - } - else if (age > 1) - { - sdate = g_strdup_printf (_("%d days ago"), (gint)age); - g_object_set (renderer, "text", sdate, NULL); - g_free (sdate); - } - else - { - if (age == 0) - sdate = _("Today"); - else - sdate = _("Yesterday"); - g_object_set (renderer, "text", sdate, NULL); - } - } - else - g_object_set (renderer, "text", katze_item_get_name (item), NULL); - - g_object_unref (item); -} - static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) @@ -3027,54 +2732,6 @@ gtk_notebook_button_press_event_cb (GtkNotebook* notebook, return FALSE; } -static void -_action_history_delete_activate (GtkAction* action, - MidoriBrowser* browser) -{ - midori_browser_history_delete (browser); -} - -static void -_action_history_clear_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* dialog; - gint result; - - if (!browser->history) - return; - - dialog = gtk_message_dialog_new (GTK_WINDOW (browser), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - _("Are you sure you want to remove all history items?")); - result = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (result != GTK_RESPONSE_YES) - return; - - katze_array_clear (browser->history); -} - -static void -_action_history_add_bookmark_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkTreeView* tree_view; - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - tree_view = GTK_TREE_VIEW (browser->panel_history); - if (katze_tree_view_get_selected_iter (tree_view, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (!KATZE_IS_ARRAY (item)) - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE); - g_object_unref (item); - } -} - static void _action_undo_tab_close_activate (GtkAction* action, MidoriBrowser* browser) @@ -3214,16 +2871,6 @@ static const GtkActionEntry entries[] = { { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, - { "HistoryDelete", GTK_STOCK_DELETE, - NULL, "", - N_("Delete the selected history item"), G_CALLBACK (_action_history_delete_activate) }, - { "HistoryClear", GTK_STOCK_CLEAR, - NULL, "", - N_("Clear the entire history"), G_CALLBACK (_action_history_clear_activate) }, - { "HistoryAddBookmark", STOCK_BOOKMARK_ADD, - NULL, "", - N_("Bookmark the selected history item"), - G_CALLBACK (_action_history_add_bookmark_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", @@ -3446,12 +3093,6 @@ static const gchar* ui_markup = "" "" "" - "" - "" - "" - "" - "" - "" ""; static void @@ -3482,54 +3123,10 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, gtk_entry_set_text (GTK_ENTRY (entry), ""); } -static void -_tree_store_insert_history_item (GtkTreeStore* treestore, - GtkTreeIter* parent, - KatzeItem* item, - gint64 day) -{ - GtkTreeIter iter; - KatzeItem* child; - guint i, n; - GtkTreeIter* piter; - gint64 pday; - gint64 age = -1; - - g_return_if_fail (KATZE_IS_ITEM (item)); - - if (KATZE_IS_ARRAY (item)) - { - piter = parent; - if ((pday = katze_item_get_added (item))) - { - age = day - pday; - gtk_tree_store_insert_with_values (treestore, &iter, parent, - 0, 0, item, 1, age, -1); - g_object_unref (item); - piter = &iter; - } - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - child = katze_array_get_nth_item (KATZE_ARRAY (item), i); - _tree_store_insert_history_item (treestore, piter, child, day); - } - } - else - { - gtk_tree_store_insert_with_values (treestore, &iter, parent, - 0, 0, item, 1, age, -1); - g_object_unref (item); - } -} - static void midori_browser_new_history_item (MidoriBrowser* browser, KatzeItem* item) { - GtkTreeView* treeview; - GtkTreeModel* treemodel; - GtkTreeIter iter; KatzeArray* parent; gint i; gboolean found; @@ -3540,34 +3137,24 @@ midori_browser_new_history_item (MidoriBrowser* browser, gint64 newage; gchar token[50]; - if (!katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) - return; - - treeview = GTK_TREE_VIEW (browser->panel_history); - treemodel = gtk_tree_view_get_model (treeview); - now = time (NULL); katze_item_set_added (item, now); day = sokoke_time_t_to_julian (&now); found = FALSE; i = 0; - while (gtk_tree_model_iter_nth_child (treemodel, &iter, NULL, i++)) + while ((parent = katze_array_get_nth_item (browser->history, i++))) { - gtk_tree_model_get (treemodel, &iter, 0, &parent, 1, &age, -1); pday = katze_item_get_added (KATZE_ITEM (parent)); + age = katze_item_get_added (item); newage = day - pday; if (newage == 0) { found = TRUE; - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), - &iter, item, day); katze_array_add_item (parent, item); } if (age != newage) - gtk_tree_store_set (GTK_TREE_STORE (treemodel), - &iter, 1, newage, -1); - g_object_unref (parent); + katze_item_set_added (item, newage); } if (!found) { @@ -3577,11 +3164,22 @@ midori_browser_new_history_item (MidoriBrowser* browser, katze_item_set_token (KATZE_ITEM (parent), token); katze_array_add_item (browser->history, parent); katze_array_add_item (parent, item); - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, - KATZE_ITEM (parent), day); } } +static void +midori_browser_history_remove_item_cb (KatzeArray* folder, + KatzeItem* item, + MidoriBrowser* browser) +{ + GtkAction* location_action = _action_by_name (browser, "Location"); + midori_location_action_delete_item_from_uri ( + MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); + g_signal_handlers_disconnect_by_func (folder, + midori_browser_history_remove_item_cb, + browser); +} + static void _location_action_insert_history_item (MidoriLocationAction* action, MidoriBrowser* browser, @@ -3608,6 +3206,8 @@ _location_action_insert_history_item (MidoriLocationAction* action, midori_location_action_add_item (action, uri, pixbuf, katze_item_get_name (item)); g_object_unref (pixbuf); + g_signal_connect (katze_item_get_parent (item), "remove-item", + G_CALLBACK (midori_browser_history_remove_item_cb), browser); } } @@ -3615,15 +3215,7 @@ static void midori_browser_history_clear_cb (KatzeArray* history, MidoriBrowser* browser) { - GtkTreeView* treeview; - GtkTreeStore* store; - GtkAction* location_action; - - treeview = GTK_TREE_VIEW (browser->panel_history); - store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); - gtk_tree_store_clear (store); - - location_action = _action_by_name (browser, "Location"); + GtkAction* location_action = _action_by_name (browser, "Location"); midori_location_action_clear (MIDORI_LOCATION_ACTION (location_action)); } @@ -3631,8 +3223,6 @@ static void midori_browser_set_history (MidoriBrowser* browser, KatzeArray* history) { - GtkTreeView* treeview; - GtkTreeModel* treemodel; GtkAction* action; time_t now; gint64 day; @@ -3662,11 +3252,6 @@ midori_browser_set_history (MidoriBrowser* browser, now = time (NULL); day = sokoke_time_t_to_julian (&now); - treeview = GTK_TREE_VIEW (browser->panel_history); - treemodel = gtk_tree_view_get_model (treeview); - _tree_store_insert_history_item (GTK_TREE_STORE (treemodel), NULL, - KATZE_ITEM (browser->history), day); - action = _action_by_name (browser, "Location"); midori_location_action_freeze (MIDORI_LOCATION_ACTION (action)); _location_action_insert_history_item (MIDORI_LOCATION_ACTION (action), @@ -3690,13 +3275,6 @@ midori_browser_init (MidoriBrowser* browser) GtkWidget* hbox; GtkWidget* hpaned; GtkWidget* vpaned; - GtkWidget* box; - GtkTreeViewColumn* column; - GtkCellRenderer* renderer_text; - GtkCellRenderer* renderer_pixbuf; - GtkTreeStore* treestore; - GtkWidget* treeview; - GtkWidget* toolbar; GtkToolItem* toolitem; GtkRcStyle* rcstyle; GtkWidget* scrolled; @@ -3963,49 +3541,6 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_panel_close_cb), browser); gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); - /* History */ - box = gtk_vbox_new (FALSE, 0); - treestore = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT64); - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); - column = gtk_tree_view_column_new (); - renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, - (GtkTreeCellDataFunc)midori_browser_history_render_icon_cb, - treeview, NULL); - renderer_text = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer_text, FALSE); - gtk_tree_view_column_set_cell_data_func (column, renderer_text, - (GtkTreeCellDataFunc)midori_browser_history_render_text_cb, - treeview, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - g_object_unref (treestore); - g_object_connect (treeview, - "signal::row-activated", - midori_panel_history_row_activated_cb, browser, - "signal::cursor-changed", - midori_panel_history_cursor_or_row_changed_cb, browser, - "signal::columns-changed", - midori_panel_history_cursor_or_row_changed_cb, browser, - "signal::button-release-event", - midori_panel_history_button_release_event_cb, browser, - "signal::key-release-event", - midori_panel_history_key_release_event_cb, browser, - "signal::popup-menu", - midori_panel_history_popup_menu_cb, browser, - NULL); - midori_panel_history_cursor_or_row_changed_cb (GTK_TREE_VIEW (treeview), - browser); - gtk_box_pack_start (GTK_BOX (box), treeview, TRUE, TRUE, 0); - browser->panel_history = treeview; - gtk_widget_show_all (box); - toolbar = gtk_ui_manager_get_widget (ui_manager, "/toolbar_history"); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); - gtk_widget_show (toolbar); - midori_panel_append_widget (MIDORI_PANEL (browser->panel), - box, STOCK_HISTORY, _("History"), toolbar); - /* Notebook, containing all views */ vpaned = gtk_vpaned_new (); gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); diff --git a/panels/midori-history.c b/panels/midori-history.c new file mode 100644 index 00000000..4a416959 --- /dev/null +++ b/panels/midori-history.c @@ -0,0 +1,950 @@ +/* + Copyright (C) 2008-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-history.h" + +#include "midori-app.h" +#include "midori-browser.h" +#include "midori-stock.h" +#include "midori-view.h" +#include "midori-viewable.h" + +#include "sokoke.h" + +#include +#include + +#include +#include + +void +midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, + KatzeItem* bookmark, + gboolean new_bookmark); + +struct _MidoriHistory +{ + GtkVBox parent_instance; + + GtkWidget* toolbar; + GtkWidget* bookmark; + GtkWidget* delete; + GtkWidget* clear; + GtkWidget* treeview; + MidoriApp* app; + KatzeArray* array; + KatzeNet* net; +}; + +struct _MidoriHistoryClass +{ + GtkVBoxClass parent_class; +}; + +static void +midori_history_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriHistory, midori_history, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_history_viewable_iface_init)); + +enum +{ + PROP_0, + + PROP_APP +}; + +static void +midori_history_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_history_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_history_class_init (MidoriHistoryClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_history_set_property; + gobject_class->get_property = midori_history_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_APP, + g_param_spec_object ( + "app", + "App", + "The app", + MIDORI_TYPE_APP, + flags)); +} + +static const gchar* +midori_history_get_label (MidoriViewable* viewable) +{ + return _("History"); +} + +static const gchar* +midori_history_get_stock_id (MidoriViewable* viewable) +{ + return STOCK_HISTORY; +} + +static void +midori_history_add_clicked_cb (GtkWidget* toolitem) +{ + GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + /* FIXME: Take selected folder into account */ + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), + NULL, TRUE); +} + +static void +midori_history_delete_clicked_cb (GtkWidget* toolitem, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (history->treeview), + &model, &iter)) + { + KatzeItem* item; + KatzeArray* parent; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + /* FIXME: Even toplevel items should technically have a parent */ + g_return_if_fail (katze_item_get_parent (item)); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + + g_object_unref (item); + } +} + +static void +midori_history_clear_clicked_cb (GtkWidget* toolitem, + MidoriHistory* history) +{ + GtkWidget* browser; + GtkWidget* dialog; + gint result; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + dialog = gtk_message_dialog_new (GTK_WINDOW (browser), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, + _("Are you sure you want to remove all history items?")); + result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (result != GTK_RESPONSE_YES) + return; + + katze_array_clear (history->array); +} + +static void +midori_history_cursor_or_row_changed_cb (GtkTreeView* treeview, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + if (!history->bookmark) + return; + + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) + { + gboolean is_page; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + is_page = !KATZE_IS_ARRAY (item) && katze_item_get_uri (item); + gtk_widget_set_sensitive (history->bookmark, is_page); + gtk_widget_set_sensitive (history->delete, TRUE); + gtk_widget_set_sensitive (history->clear, TRUE); + + g_object_unref (item); + } + else + { + gtk_widget_set_sensitive (history->bookmark, FALSE); + gtk_widget_set_sensitive (history->delete, FALSE); + gtk_widget_set_sensitive (history->clear, FALSE); + } +} + +static GtkWidget* +midori_history_get_toolbar (MidoriViewable* viewable) +{ + MidoriHistory* history = MIDORI_HISTORY (viewable); + + if (!history->toolbar) + { + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + history->toolbar = toolbar; + toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Bookmark the selected history item")); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_history_add_clicked_cb), history); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + history->bookmark = GTK_WIDGET (toolitem); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Delete the selected history item")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_history_delete_clicked_cb), history); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + history->delete = GTK_WIDGET (toolitem); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Clear the entire history")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_history_clear_clicked_cb), history); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + history->clear = GTK_WIDGET (toolitem); + midori_history_cursor_or_row_changed_cb ( + GTK_TREE_VIEW (history->treeview), history); + g_signal_connect (history->bookmark, "destroy", + G_CALLBACK (gtk_widget_destroyed), &history->bookmark); + g_signal_connect (history->delete, "destroy", + G_CALLBACK (gtk_widget_destroyed), &history->delete); + g_signal_connect (history->clear, "destroy", + G_CALLBACK (gtk_widget_destroyed), &history->clear); + } + + return history->toolbar; +} + +static void +midori_history_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_history_get_stock_id; + iface->get_label = midori_history_get_label; + iface->get_toolbar = midori_history_get_toolbar; +} + +static void +midori_history_add_item_cb (KatzeArray* array, + KatzeItem* added_item, + MidoriHistory* history); + +static void +midori_history_remove_item_cb (KatzeArray* array, + KatzeItem* removed_item, + MidoriHistory* history); + +static void +midori_history_clear_cb (KatzeArray* array, + MidoriHistory* history); + +static void +midori_history_disconnect_folder (MidoriHistory* history, + KatzeArray* array) +{ + KatzeItem* item; + guint i; + + g_return_if_fail (KATZE_IS_ARRAY (array)); + + g_signal_handlers_disconnect_by_func (array, + midori_history_add_item_cb, history); + g_signal_handlers_disconnect_by_func (array, + midori_history_remove_item_cb, history); + g_signal_handlers_disconnect_by_func (array, + midori_history_clear_cb, history); + + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) + { + if (KATZE_IS_ARRAY (item)) + midori_history_disconnect_folder (history, KATZE_ARRAY (item)); + g_object_unref (item); + } +} + +static void +midori_history_add_item_cb (KatzeArray* array, + KatzeItem* added_item, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + guint i; + + g_return_if_fail (KATZE_IS_ARRAY (array)); + g_return_if_fail (KATZE_IS_ITEM (added_item)); + + if (KATZE_IS_ARRAY (added_item)) + { + g_signal_connect (added_item, "add-item", + G_CALLBACK (midori_history_add_item_cb), history); + g_signal_connect (added_item, "remove-item", + G_CALLBACK (midori_history_remove_item_cb), history); + g_signal_connect (added_item, "clear", + G_CALLBACK (midori_history_clear_cb), history); + } + + g_object_ref (added_item); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); + + if (array == history->array) + { + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + &iter, NULL, G_MAXINT, 0, added_item, -1); + return; + } + + i = 0; + /* FIXME: Recurse over children of folders, too */ + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (item == (KatzeItem*)array) + { + GtkTreeIter child_iter; + + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + &child_iter, &iter, G_MAXINT, 0, added_item, -1); + break; + } + g_object_unref (item); + + i++; + } +} + +static void +midori_history_remove_iter (GtkTreeModel* model, + GtkTreeIter* parent, + KatzeItem* removed_item) +{ + guint i; + GtkTreeIter iter; + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, parent, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + if (item == removed_item) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + g_object_unref (item); + break; + } + + if (KATZE_IS_ARRAY (item)) + midori_history_remove_iter (model, &iter, removed_item); + + g_object_unref (item); + i++; + } +} + +static void +midori_history_remove_item_cb (KatzeArray* array, + KatzeItem* removed_item, + MidoriHistory* history) +{ + GtkTreeModel* model; + + g_assert (KATZE_IS_ARRAY (array)); + g_assert (KATZE_IS_ITEM (removed_item)); + + if (KATZE_IS_ARRAY (removed_item)) + midori_history_disconnect_folder (history, KATZE_ARRAY (removed_item)); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); + midori_history_remove_iter (model, NULL, removed_item); + g_object_unref (removed_item); +} + +static void +midori_history_clear_cb (KatzeArray* array, + MidoriHistory* history) +{ + GtkTreeView* treeview; + GtkTreeStore* store; + + g_assert (KATZE_IS_ARRAY (array)); + + if (array == history->array) + { + treeview = GTK_TREE_VIEW (history->treeview); + store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); + gtk_tree_store_clear (store); + } + else + { + KatzeItem* item; + guint i; + + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) + midori_history_remove_item_cb (array, item, history); + } + + midori_history_disconnect_folder (history, array); +} + +static void +midori_history_insert_item (MidoriHistory* history, + GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeItem* item, + gint64 day) +{ + GtkTreeIter iter; + gint64 age = -1; + + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + GtkTreeIter* piter; + gint64 pday; + guint i, n; + + g_signal_connect (item, "add-item", + G_CALLBACK (midori_history_add_item_cb), history); + g_signal_connect (item, "remove-item", + G_CALLBACK (midori_history_remove_item_cb), history); + g_signal_connect (item, "clear", + G_CALLBACK (midori_history_clear_cb), history); + + piter = parent; + if ((pday = katze_item_get_added (item))) + { + age = day - pday; + gtk_tree_store_insert_with_values (treestore, &iter, parent, + 0, 0, item, 1, age, -1); + g_object_unref (item); + piter = &iter; + } + n = katze_array_get_length (KATZE_ARRAY (item)); + for (i = 0; i < n; i++) + { + KatzeItem* child; + + child = katze_array_get_nth_item (KATZE_ARRAY (item), i); + midori_history_insert_item (history, treestore, piter, child, day); + } + } + else + { + gtk_tree_store_insert_with_values (treestore, &iter, parent, + 0, 0, item, 1, age, -1); + } +} + +static void +midori_history_set_app (MidoriHistory* history, + MidoriApp* app) +{ + GtkTreeModel* model; + + if (history->array) + { + midori_history_disconnect_folder (history, history->array); + g_object_unref (history->array); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); + gtk_tree_store_clear (GTK_TREE_STORE (model)); + } + katze_assign (history->app, app); + if (!app) + return; + + g_object_ref (app); + history->array = katze_object_get_object (app, "history"); + if (history->array) + { + time_t now = time (NULL); + gint64 day = sokoke_time_t_to_julian (&now); + + /* FIXME: Dereference the app on finalization */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); + midori_history_insert_item (history, GTK_TREE_STORE (model), + NULL, KATZE_ITEM (g_object_ref (history->array)), day); + } +} + +static void +midori_history_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriHistory* history = MIDORI_HISTORY (object); + + switch (prop_id) + { + case PROP_APP: + midori_history_set_app (history, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_history_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriHistory* history = MIDORI_HISTORY (object); + + switch (prop_id) + { + case PROP_APP: + g_value_set_object (value, history->app); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_history_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + GdkPixbuf* pixbuf = NULL; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + g_assert (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, + GTK_ICON_SIZE_MENU, NULL); + else + pixbuf = katze_net_load_icon ( + MIDORI_HISTORY (gtk_widget_get_parent (treeview))->net, + katze_item_get_uri (item), NULL, treeview, NULL); + + g_object_set (renderer, "pixbuf", pixbuf, NULL); + + if (pixbuf) + g_object_unref (pixbuf); + + g_object_unref (item); +} + +static void +midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + gint64 age; + + gtk_tree_model_get (model, iter, 0, &item, 1, &age, -1); + + g_assert (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + gchar* sdate; + + g_assert (age >= 0); + + if (age > 7) + { + g_object_set (renderer, "text", katze_item_get_token (item), NULL); + } + else if (age > 6) + { + sdate = g_strdup_printf (_("A week ago")); + g_object_set (renderer, "text", sdate, NULL); + g_free (sdate); + } + else if (age > 1) + { + sdate = g_strdup_printf (_("%d days ago"), (gint)age); + g_object_set (renderer, "text", sdate, NULL); + g_free (sdate); + } + else + { + if (age == 0) + sdate = _("Today"); + else + sdate = _("Yesterday"); + g_object_set (renderer, "text", sdate, NULL); + } + } + else + g_object_set (renderer, "text", katze_item_get_name (item), NULL); + + g_object_unref (item); +} + +static void +midori_history_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + + model = gtk_tree_view_get_model (treeview); + + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (uri && *uri) + { + GtkWidget* browser; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + } + + g_object_unref (item); + } +} + +static void +midori_history_popup_item (GtkWidget* menu, + const gchar* stock_id, + const gchar* label, + KatzeItem* item, + gpointer callback, + MidoriHistory* history) +{ + const gchar* uri; + GtkWidget* menuitem; + + uri = katze_item_get_uri (item); + + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); + if (!strcmp (stock_id, GTK_STOCK_EDIT)) + gtk_widget_set_sensitive (menuitem, + KATZE_IS_ARRAY (item) || uri != NULL); + else if (strcmp (stock_id, GTK_STOCK_DELETE)) + gtk_widget_set_sensitive (menuitem, uri != NULL); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), history); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +midori_history_open_activate_cb (GtkWidget* menuitem, + MidoriHistory* history) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + } +} + +static void +midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, + MidoriHistory* history) +{ + KatzeItem* item; + const gchar* uri; + guint n; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser; + MidoriWebSettings* settings; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + n = midori_browser_add_item (MIDORI_BROWSER (browser), item); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } +} + +static void +midori_history_open_in_window_activate_cb (GtkWidget* menuitem, + MidoriHistory* history) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + g_signal_emit_by_name (browser, "new-window", uri); + } +} + +static void +midori_history_bookmark_activate_cb (GtkWidget* menuitem, + MidoriHistory* history) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, TRUE); + } +} + +static void +midori_history_delete_activate_cb (GtkWidget* menuitem, + MidoriHistory* history) +{ + KatzeItem* item; + KatzeArray* parent; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + + /* FIXME: Even toplevel items should technically have a parent */ + g_return_if_fail (katze_item_get_parent (item)); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); +} + +static void +midori_history_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeItem* item, + MidoriHistory* history) +{ + GtkWidget* menu; + GtkWidget* menuitem; + + menu = gtk_menu_new (); + midori_history_popup_item (menu, GTK_STOCK_OPEN, NULL, + item, midori_history_open_activate_cb, history); + midori_history_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), + item, midori_history_open_in_tab_activate_cb, history); + midori_history_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), + item, midori_history_open_in_window_activate_cb, history); + if (!KATZE_IS_ARRAY (item)) + midori_history_popup_item (menu, STOCK_BOOKMARK_ADD, NULL, + item, midori_history_bookmark_activate_cb, history); + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + midori_history_popup_item (menu, GTK_STOCK_DELETE, NULL, + item, midori_history_delete_activate_cb, history); + + sokoke_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); +} + +static gboolean +midori_history_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->button != 2 && event->button != 3) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + if (event->button == 2) + { + const gchar* uri = katze_item_get_uri (item); + + if (uri && *uri) + { + GtkWidget* browser; + gint n; + + browser = gtk_widget_get_toplevel (widget); + n = midori_browser_add_uri (MIDORI_BROWSER (browser), uri); + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } + } + else + midori_history_popup (widget, event, item, history); + + g_object_unref (item); + return TRUE; + } + return FALSE; +} + +static gboolean +midori_history_key_release_event_cb (GtkWidget* widget, + GdkEventKey* event, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->keyval != GDK_Delete) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + KatzeItem* item; + KatzeArray* parent; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + parent = katze_item_get_parent (item); + katze_array_remove_item (parent, item); + + g_object_unref (item); + } + + return FALSE; +} + +static void +midori_history_popup_menu_cb (GtkWidget* widget, + MidoriHistory* history) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + midori_history_popup (widget, NULL, item, history); + g_object_unref (item); + } +} + +static void +midori_history_init (MidoriHistory* history) +{ + GtkTreeStore* model; + GtkWidget* treeview; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_text; + + history->net = katze_net_new (); + /* FIXME: Dereference the net on finalization */ + + /* Create the treeview */ + model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_INT64); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_history_treeview_render_icon_cb, + treeview, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_history_treeview_render_text_cb, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + g_object_unref (model); + g_object_connect (treeview, + "signal::row-activated", + midori_history_row_activated_cb, history, + "signal::cursor-changed", + midori_history_cursor_or_row_changed_cb, history, + "signal::columns-changed", + midori_history_cursor_or_row_changed_cb, history, + "signal::button-release-event", + midori_history_button_release_event_cb, history, + "signal::key-release-event", + midori_history_key_release_event_cb, history, + "signal::popup-menu", + midori_history_popup_menu_cb, history, + NULL); + gtk_widget_show (treeview); + gtk_box_pack_start (GTK_BOX (history), treeview, TRUE, TRUE, 0); + history->treeview = treeview; +} + +/** + * midori_history_new: + * + * Creates a new empty history. + * + * Return value: a new #MidoriHistory + * + * Since: 0.1.3 + **/ +GtkWidget* +midori_history_new (void) +{ + MidoriHistory* history = g_object_new (MIDORI_TYPE_HISTORY, NULL); + + return GTK_WIDGET (history); +} diff --git a/panels/midori-history.h b/panels/midori-history.h new file mode 100644 index 00000000..fc496eee --- /dev/null +++ b/panels/midori-history.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_HISTORY_H__ +#define __MIDORI_HISTORY_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_HISTORY \ + (midori_history_get_type ()) +#define MIDORI_HISTORY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_HISTORY, MidoriHistory)) +#define MIDORI_HISTORY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_HISTORY, MidoriHistoryClass)) +#define MIDORI_IS_HISTORY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_HISTORY)) +#define MIDORI_IS_HISTORY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_HISTORY)) +#define MIDORI_HISTORY_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_HISTORY, MidoriHistoryClass)) + +typedef struct _MidoriHistory MidoriHistory; +typedef struct _MidoriHistoryClass MidoriHistoryClass; + +GType +midori_history_get_type (void); + +GtkWidget* +midori_history_new (void); + +G_END_DECLS + +#endif /* __MIDORI_HISTORY_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index ab4d273c..5fbbe2d1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -16,6 +16,7 @@ panels/midori-addons.c panels/midori-bookmarks.c panels/midori-console.c panels/midori-extensions.c +panels/midori-history.c panels/midori-plugins.c katze/katze-http-auth.c katze/katze-throbber.c From 75ab149f320508b90e0039735725501590507cd8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 00:01:35 +0100 Subject: [PATCH 0779/2970] Update translation template --- po/midori.pot | 904 ++++++++++++++++++++++++++------------------------ 1 file changed, 467 insertions(+), 437 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index 34b8800e..ab4ff5ee 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE midori'S COPYRIGHT HOLDER -# This file is distributed under the same license as the midori package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: midori 0.1.2\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-03 22:54+0100\n" +"POT-Creation-Date: 2009-02-21 23:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 -#: ../midori/main.c:2065 ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 +#: ../midori/main.c:1714 ../midori/main.c:1725 +#: ../midori/midori-websettings.c:263 msgid "Midori" msgstr "" @@ -30,723 +30,621 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "" - -#: ../midori/main.c:91 ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "" - -#: ../midori/main.c:94 -msgid "_Extensions" -msgstr "" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "" - -#: ../midori/main.c:96 -msgid "_Homepage" -msgstr "" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "" - -#: ../midori/main.c:158 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:213 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:220 ../midori/main.c:290 +#: ../midori/main.c:168 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:532 +#: ../midori/main.c:480 msgid "File not found." msgstr "" -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:488 ../midori/main.c:497 msgid "Malformed document." msgstr "" -#: ../midori/main.c:571 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:603 +#: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:657 +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:681 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 +#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:962 +#: ../midori/main.c:910 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:991 +#: ../midori/main.c:939 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1121 ../midori/sokoke.c:531 +#: ../midori/main.c:1069 ../midori/sokoke.c:580 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 +#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 ../midori/main.c:1245 +#: ../midori/main.c:1169 ../midori/main.c:1193 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "" -#: ../midori/main.c:1312 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "" - -#: ../midori/main.c:1652 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" - -#: ../midori/main.c:1666 -msgid "Username" -msgstr "" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "" - -#: ../midori/main.c:1783 +#: ../midori/main.c:1401 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1798 +#: ../midori/main.c:1416 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1802 +#: ../midori/main.c:1420 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1807 +#: ../midori/main.c:1425 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1950 +#: ../midori/main.c:1599 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1982 ../midori/gjs.c:514 +#: ../midori/main.c:1631 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:2005 +#: ../midori/main.c:1654 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:2007 +#: ../midori/main.c:1656 msgid "Display program version" msgstr "" -#: ../midori/main.c:2009 +#: ../midori/main.c:1658 msgid "Addresses" msgstr "" -#: ../midori/main.c:2053 +#: ../midori/main.c:1702 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:2077 +#: ../midori/main.c:1726 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:2079 +#: ../midori/main.c:1728 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:2106 +#: ../midori/main.c:1755 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:2184 +#: ../midori/main.c:1823 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:2196 +#: ../midori/main.c:1835 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2211 +#: ../midori/main.c:1850 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2224 +#: ../midori/main.c:1863 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2237 +#: ../midori/main.c:1876 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:2249 +#: ../midori/main.c:1888 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:2265 +#: ../midori/main.c:1904 msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:257 ../midori/midori-browser.c:2827 +#: ../midori/midori-browser.c:2833 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:269 ../midori/midori-browser.c:2830 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:331 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:356 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:530 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:530 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:552 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:854 +#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:853 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:584 ../midori/midori-searchaction.c:867 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:602 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:607 ../midori/midori-browser.c:644 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:719 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1308 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2459 ../panels/midori-bookmarks.c:731 +#: ../panels/midori-history.c:787 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2461 ../panels/midori-bookmarks.c:733 +#: ../panels/midori-history.c:789 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "" - -#: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "" - -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "" - -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "" - -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:2603 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:2611 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:2761 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:2764 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:2767 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:2770 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:2773 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:2775 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:2776 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:2778 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:2779 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:2782 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:2785 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:2787 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:2790 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:2793 ../midori/midori-browser.c:2796 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:2799 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:2802 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:2805 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:2808 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:2810 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:2811 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:2813 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:2814 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:2817 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:2818 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:2821 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:2823 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:2824 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:2836 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:2839 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:2842 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:2844 ../midori/midori-view.c:1041 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:2845 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:2847 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:2848 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:2852 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:2854 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:2857 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:2860 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:2863 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:2865 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:2866 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:2868 ../midori/midori-view.c:1013 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:2869 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:2873 ../panels/midori-bookmarks.c:218 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "" - -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "" - -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:2874 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:2876 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:2877 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:2881 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:2882 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:2884 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:2885 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:2887 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:2889 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:2890 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:2892 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:2893 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:2895 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:2896 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:2899 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:2906 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:2907 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:2912 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:2913 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:2916 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:2917 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:2920 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:2921 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:2924 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:2925 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:2928 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:2929 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:2932 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:2933 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3332 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:3339 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3341 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3365 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3367 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:3386 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:3399 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:3401 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:3414 ../midori/sokoke.c:735 +msgid "_Bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:3416 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3429 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3431 msgid "Show a list of all open tabs" msgstr "" -#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 -msgid "History" -msgstr "" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:3591 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:3612 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4076 +#: ../midori/midori-browser.c:3617 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:3622 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:3630 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:3639 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:3920 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -755,664 +653,744 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:173 ../midori/midori-view.c:1774 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:174 ../midori/midori-websettings.c:481 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:175 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:190 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:191 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:192 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:193 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:194 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:195 ../midori/midori-websettings.c:267 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:210 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:211 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:212 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:227 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:228 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:229 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:230 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:231 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:246 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:247 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:248 ../panels/midori-addons.c:96 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:264 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:265 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:266 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:307 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:308 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:316 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:317 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:325 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:326 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:352 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:361 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:362 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:370 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:371 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:380 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:381 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:389 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:390 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:398 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:407 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:416 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:426 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:427 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:432 -msgid "Toolbar Items" +#: ../midori/midori-websettings.c:443 +msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:433 -msgid "The items to show on the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:441 -msgid "Compact Sidepanel" -msgstr "" - -#: ../midori/midori-websettings.c:442 -msgid "Whether to make the sidepanel compact" -msgstr "" - -#: ../midori/midori-websettings.c:451 -msgid "Load on Startup" +#: ../midori/midori-websettings.c:444 +msgid "Whether to show loading progress in the location entry" msgstr "" #: ../midori/midori-websettings.c:452 -msgid "What to load on startup" +msgid "Toolbar Items" +msgstr "" + +#: ../midori/midori-websettings.c:453 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:461 +msgid "Compact Sidepanel" msgstr "" #: ../midori/midori-websettings.c:462 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:471 +msgid "Load on Startup" +msgstr "" + +#: ../midori/midori-websettings.c:472 +msgid "What to load on startup" +msgstr "" + +#: ../midori/midori-websettings.c:482 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:497 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:498 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:506 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:524 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:525 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:533 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:534 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:543 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:553 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:554 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:562 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:563 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:572 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:573 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:583 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:584 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:597 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:606 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:607 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:615 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:616 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:624 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:625 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:676 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:677 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:687 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:688 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:701 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:702 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:710 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:711 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:721 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:722 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:730 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:731 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:739 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:740 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:748 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:749 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:759 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:760 msgid "The proxy server used for HTTP connections" msgstr "" +#: ../midori/midori-websettings.c:779 +msgid "Detect proxy server automatically" +msgstr "" + +#: ../midori/midori-websettings.c:780 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:800 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:801 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:821 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:822 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:834 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:835 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#: ../midori/midori-view.c:616 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:924 +msgid "Open _Link" +msgstr "" + +#: ../midori/midori-view.c:926 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:943 +msgid "Open Link in New _Window" +msgstr "" + +#: ../midori/midori-view.c:953 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:961 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:983 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:992 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1466 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1617 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:1641 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:1657 #, c-format msgid "No documentation installed" msgstr "" -#: ../midori/midori-preferences.c:91 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:462 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:484 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:485 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" msgstr "" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:515 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:516 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:525 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:590 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:597 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:604 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 msgid "days" msgstr "" +#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:103 +msgid "History" +msgstr "" + #: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:810 +#: ../midori/midori-searchaction.c:809 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:810 +#: ../midori/midori-searchaction.c:809 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:838 +#: ../midori/midori-searchaction.c:837 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:882 -msgid "_Icon (name or file):" +#: ../midori/midori-searchaction.c:881 +msgid "_Icon:" msgstr "" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:895 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1073 +#: ../midori/midori-searchaction.c:1072 msgid "Manage Search Engines" msgstr "" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:403 msgid "Warning: You are using a superuser account!" msgstr "" +#: ../midori/sokoke.c:734 +msgid "_Bookmark" +msgstr "" + +#: ../midori/sokoke.c:736 +msgid "_Add Bookmark" +msgstr "" + +#: ../midori/sokoke.c:737 +msgid "_Console" +msgstr "" + +#: ../midori/sokoke.c:738 +msgid "_Extensions" +msgstr "" + +#: ../midori/sokoke.c:739 +msgid "_History" +msgstr "" + +#: ../midori/sokoke.c:740 +msgid "_Homepage" +msgstr "" + +#: ../midori/sokoke.c:741 +msgid "_Userscripts" +msgstr "" + +#: ../midori/sokoke.c:742 +msgid "User_styles" +msgstr "" + +#: ../midori/sokoke.c:743 +msgid "New _Tab" +msgstr "" + +#: ../midori/sokoke.c:744 +msgid "_Transfers" +msgstr "" + +#: ../midori/sokoke.c:745 +msgid "_Closed Tabs and Windows" +msgstr "" + +#: ../midori/sokoke.c:746 +msgid "New _Window" +msgstr "" + #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1444,19 +1422,19 @@ msgstr "" msgid "_Disable" msgstr "" -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-bookmarks.c:102 msgid "Bookmarks" msgstr "" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:226 msgid "Edit the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:234 msgid "Delete the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:566 msgid "Separator" msgstr "" @@ -1468,10 +1446,62 @@ msgstr "" msgid "Extensions" msgstr "" +#: ../panels/midori-history.c:158 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:215 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../panels/midori-history.c:224 +msgid "Delete the selected history item" +msgstr "" + +#: ../panels/midori-history.c:232 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-history.c:602 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:608 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../panels/midori-history.c:615 +msgid "Today" +msgstr "" + +#: ../panels/midori-history.c:617 +msgid "Yesterday" +msgstr "" + #: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "" +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" From 3d42b7453afa785850ac89e78a4dba2d0e67f381 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 00:04:28 +0100 Subject: [PATCH 0780/2970] Load documentation as a proper file:// URI --- midori/midori-browser.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c5c228b6..af7c66cb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2624,12 +2624,10 @@ _action_help_link_activate (GtkAction* action, if (!strncmp ("HelpContents", action_name, 12)) { #ifdef DOCDIR - uri = DOCDIR "/midori/user/midori.html"; - if (!g_file_test (uri, G_FILE_TEST_EXISTS)) - uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; - #else - uri = "error:nodocs " DATADIR "/doc/midori/user/midori.html"; + uri = "file://" DOCDIR "/midori/user/midori.html"; + if (!g_file_test (DOCDIR "/midori/user/midori.html", G_FILE_TEST_EXISTS)) #endif + uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; } else if (!strncmp ("HelpFAQ", action_name, 7)) uri = "http://wiki.xfce.org/_export/xhtml/midori_faq"; From 758d5e1a1b6a6767c23310722fad1202cc978007 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 00:12:18 +0100 Subject: [PATCH 0781/2970] Add a missing check whether 'settings' are set --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index af7c66cb..85c15cd0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -173,7 +173,7 @@ _toggle_tabbar_smartly (MidoriBrowser* browser) gboolean always_show_tabbar; n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)); - if (n < 2) + if (n < 2 && browser->settings) { g_object_get (browser->settings, "always-show-tabbar", &always_show_tabbar, NULL); From 3baab132b96e2753cdc0b61b9068d11fdeccd64c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 00:13:00 +0100 Subject: [PATCH 0782/2970] Don't try to setup search engines when unsetting --- midori/midori-searchaction.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 6b71f1ff..b789981b 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -648,6 +648,8 @@ midori_search_action_set_search_engines (MidoriSearchAction* search_action, if (search_engines) g_object_ref (search_engines); katze_object_assign (search_action->search_engines, search_engines); + if (!search_engines) + return; g_object_connect (search_engines, "signal-after::add-item", From 51c6fb1cdf37c1919ed9aa29c64f9e86cfe4b336 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 01:45:22 +0100 Subject: [PATCH 0783/2970] Implement a primitive find-as-you-type --- midori/marshal.list | 1 + midori/midori-browser.c | 10 ++++++++++ midori/midori-view.c | 44 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/midori/marshal.list b/midori/marshal.list index 53e9849d..c82c5639 100644 --- a/midori/marshal.list +++ b/midori/marshal.list @@ -1,4 +1,5 @@ BOOLEAN:VOID +VOID:BOOLEAN,STRING VOID:OBJECT,ENUM VOID:STRING,BOOLEAN VOID:STRING,INT,STRING diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 85c15cd0..cdc31652 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -855,12 +855,22 @@ midori_view_new_view_cb (GtkWidget* view, static void midori_view_search_text_cb (GtkWidget* view, gboolean found, + gchar* typing, MidoriBrowser* browser) { const gchar* text; gboolean case_sensitive; gboolean highlight; + if (typing) + { + gint position = -1; + + gtk_widget_show (browser->find); + gtk_window_set_focus (GTK_WINDOW (browser), browser->find_text); + gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position); + gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1); + } if (GTK_WIDGET_VISIBLE (browser->find)) { gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), diff --git a/midori/midori-view.c b/midori/midori-view.c index d49c0374..f029583d 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -275,6 +275,18 @@ midori_view_class_init (MidoriViewClass* class) MIDORI_TYPE_VIEW, MIDORI_TYPE_NEW_VIEW); + /** + * MidoriView::search-text: + * @view: the object on which the signal is emitted + * @found: whether the search was successful + * @typing: whether the search was initiated by typing + * + * Emitted when a search is performed. Either manually + * invoked or automatically by typing. The value of typing + * is actually the text the user typed. + * + * Note that in 0.1.3 the argument @typing was introduced. + */ signals[SEARCH_TEXT] = g_signal_new ( "search-text", G_TYPE_FROM_CLASS (class), @@ -282,9 +294,10 @@ midori_view_class_init (MidoriViewClass* class) 0, 0, NULL, - g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, 1, - G_TYPE_BOOLEAN); + midori_cclosure_marshal_VOID__BOOLEAN_STRING, + G_TYPE_NONE, 2, + G_TYPE_BOOLEAN, + G_TYPE_STRING); signals[ADD_BOOKMARK] = g_signal_new ( "add-bookmark", @@ -794,6 +807,27 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, return FALSE; } +static gboolean +gtk_widget_key_press_event_cb (WebKitWebView* web_view, + GdkEventKey* event, + MidoriView* view) +{ + guint character = gdk_unicode_to_keyval (event->keyval); + + if (!webkit_web_view_can_cut_clipboard (web_view) + && !webkit_web_view_can_paste_clipboard (web_view)) + { + gchar* text = g_strdup_printf ("%c", character); + + g_signal_emit (view, signals[SEARCH_TEXT], 0, + webkit_web_view_search_text (web_view, + text, FALSE, TRUE, TRUE), text); + g_free (text); + } + + return FALSE; +} + static gboolean gtk_widget_scroll_event_cb (WebKitWebView* web_view, GdkEventScroll* event, @@ -1541,6 +1575,8 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_hovering_over_link_cb, view, "signal::button-press-event", gtk_widget_button_press_event_cb, view, + "signal::key-press-event", + gtk_widget_key_press_event_cb, view, "signal::scroll-event", gtk_widget_scroll_event_cb, view, "signal::populate-popup", @@ -2434,7 +2470,7 @@ midori_view_search_text (MidoriView* view, g_signal_emit (view, signals[SEARCH_TEXT], 0, webkit_web_view_search_text (WEBKIT_WEB_VIEW (view->web_view), - text, case_sensitive, forward, TRUE)); + text, case_sensitive, forward, TRUE), NULL); } /** From fb48e0c647c817d6353a909a33b64a1e7f86d498 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 02:17:58 +0100 Subject: [PATCH 0784/2970] Actually search after every character in 'typing' search --- midori/midori-browser.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cdc31652..0834f539 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -62,6 +62,7 @@ struct _MidoriBrowser GtkWidget* find_text; GtkToolItem* find_case; GtkToolItem* find_highlight; + gboolean find_typing; GtkWidget* statusbar; GtkWidget* progressbar; @@ -866,10 +867,13 @@ midori_view_search_text_cb (GtkWidget* view, { gint position = -1; + browser->find_typing = TRUE; gtk_widget_show (browser->find); gtk_window_set_focus (GTK_WINDOW (browser), browser->find_text); gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position); gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + browser->find_highlight), TRUE); } if (GTK_WIDGET_VISIBLE (browser->find)) { @@ -1536,6 +1540,14 @@ _action_find_next_activate (GtkAction* action, _midori_browser_find (browser, TRUE); } +static void +midori_browser_find_text_changed (GtkWidget* entry, + MidoriBrowser* browser) +{ + if (browser->find_typing) + _midori_browser_find (browser, TRUE); +} + static void _action_find_previous_activate (GtkAction* action, MidoriBrowser* browser) @@ -1565,6 +1577,7 @@ midori_browser_find_key_press_event_cb (GtkWidget* toolbar, GtkWidget* view = midori_browser_get_current_tab (browser); midori_view_unmark_text_matches (MIDORI_VIEW (view)); gtk_widget_hide (toolbar); + browser->find_typing = FALSE; return TRUE; } @@ -1576,6 +1589,7 @@ midori_browser_find_button_close_clicked_cb (GtkWidget* widget, MidoriBrowser* browser) { gtk_widget_hide (browser->find); + browser->find_typing = FALSE; } static void @@ -3611,6 +3625,8 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_entry_clear_icon_released_cb), NULL); g_signal_connect (browser->find_text, "activate", G_CALLBACK (_action_find_next_activate), browser); + g_signal_connect (browser->find_text, "changed", + G_CALLBACK (midori_browser_find_text_changed), browser); toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); From d2c5d89defede0a3ab658b0dc356370f1c377858 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 02:18:46 +0100 Subject: [PATCH 0785/2970] Make sure we exclude control characters from search --- midori/midori-view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index f029583d..634c9be8 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -813,6 +813,9 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view, MidoriView* view) { guint character = gdk_unicode_to_keyval (event->keyval); + /* Skip control characters */ + if (character == (event->keyval | 0x01000000)) + return FALSE; if (!webkit_web_view_can_cut_clipboard (web_view) && !webkit_web_view_can_paste_clipboard (web_view)) From 440e3cf72b510ff82f9bd84658b2ed0842a43064 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 02:34:21 +0100 Subject: [PATCH 0786/2970] Hide find options and close button in 'typing' search --- midori/midori-browser.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0834f539..c866ce69 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -62,6 +62,7 @@ struct _MidoriBrowser GtkWidget* find_text; GtkToolItem* find_case; GtkToolItem* find_highlight; + GtkToolItem* find_close; gboolean find_typing; GtkWidget* statusbar; @@ -868,12 +869,17 @@ midori_view_search_text_cb (GtkWidget* view, gint position = -1; browser->find_typing = TRUE; + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + browser->find_highlight), TRUE); + gtk_widget_hide (GTK_WIDGET (browser->find_case)); + gtk_widget_hide (GTK_WIDGET (browser->find_highlight)); + gtk_widget_hide (GTK_WIDGET (browser->find_close)); + if (!GTK_WIDGET_VISIBLE (browser->find)) + gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); gtk_widget_show (browser->find); gtk_window_set_focus (GTK_WINDOW (browser), browser->find_text); gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position); gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( - browser->find_highlight), TRUE); } if (GTK_WIDGET_VISIBLE (browser->find)) { @@ -1512,6 +1518,9 @@ _action_find_activate (GtkAction* action, gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); + gtk_widget_show (GTK_WIDGET (browser->find_case)); + gtk_widget_show (GTK_WIDGET (browser->find_highlight)); + gtk_widget_show (GTK_WIDGET (browser->find_close)); gtk_widget_show (browser->find); } @@ -3659,14 +3668,15 @@ midori_browser_init (MidoriBrowser* browser) GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close Findbar")); - g_signal_connect (toolitem, "clicked", + browser->find_close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_close), + _("Close Findbar")); + g_signal_connect (browser->find_close, "clicked", G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); #if HAVE_OSX - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, 0); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_close, 0); #else - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); + gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_close, -1); #endif sokoke_container_show_children (GTK_CONTAINER (browser->find)); #if HAVE_HILDON From f022a72a42ff80d9f268ba87caceec516535cb0b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 02:47:30 +0100 Subject: [PATCH 0787/2970] Focus the web view after cancelling an inline find --- midori/midori-browser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c866ce69..ce4410e5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1587,6 +1587,9 @@ midori_browser_find_key_press_event_cb (GtkWidget* toolbar, midori_view_unmark_text_matches (MIDORI_VIEW (view)); gtk_widget_hide (toolbar); browser->find_typing = FALSE; + gtk_window_set_focus (GTK_WINDOW (browser), + gtk_bin_get_child (GTK_BIN (view)) ? + gtk_bin_get_child (GTK_BIN (view)) : view); return TRUE; } @@ -1597,8 +1600,14 @@ static void midori_browser_find_button_close_clicked_cb (GtkWidget* widget, MidoriBrowser* browser) { + GtkWidget* view; + gtk_widget_hide (browser->find); browser->find_typing = FALSE; + view = midori_browser_get_current_tab (browser); + gtk_window_set_focus (GTK_WINDOW (browser), + gtk_bin_get_child (GTK_BIN (view)) ? + gtk_bin_get_child (GTK_BIN (view)) : view); } static void From cbe3e75e801a226d319f076232301aef5645378e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 03:11:40 +0100 Subject: [PATCH 0788/2970] Add a "New folder" button to the bookmark panel --- midori/midori-browser.c | 36 +++++++++++++++++++++++++----------- panels/midori-bookmarks.c | 31 +++++++++++++++++++++++++++---- panels/midori-history.c | 7 ++++--- 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ce4410e5..b17a4f37 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -511,12 +511,14 @@ midori_view_notify_statusbar_text_cb (MidoriView* view, g_free (text); } -/* Private function, used by MidoriBookmarks */ +/* Private function, used by MidoriBookmarks and MidoriHistory */ /* static */ void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, - gboolean new_bookmark) + gboolean new_bookmark, + gboolean is_folder) { + const gchar* title; GtkWidget* dialog; GtkSizeGroup* sizegroup; GtkWidget* view; @@ -528,9 +530,12 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* entry_uri; GtkWidget* combo_folder; + if (is_folder) + title = new_bookmark ? _("New folder") : _("Edit folder"); + else + title = new_bookmark ? _("New bookmark") : _("Edit bookmark"); dialog = gtk_dialog_new_with_buttons ( - new_bookmark ? _("New bookmark") : _("Edit bookmark"), - GTK_WINDOW (browser), + title, GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, @@ -544,9 +549,16 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (!bookmark) { view = midori_browser_get_current_tab (browser); - bookmark = g_object_new (KATZE_TYPE_ITEM, - "uri", midori_view_get_display_uri (MIDORI_VIEW (view)), - "name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL); + if (is_folder) + { + bookmark = katze_array_new (KATZE_TYPE_ARRAY); + katze_item_set_name (bookmark, + midori_view_get_display_title (MIDORI_VIEW (view))); + } + else + bookmark = g_object_new (KATZE_TYPE_ITEM, + "uri", midori_view_get_display_uri (MIDORI_VIEW (view)), + "name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL); } hbox = gtk_hbox_new (FALSE, 8); @@ -677,7 +689,7 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem, item = katze_item_new (); katze_item_set_uri (item, uri); browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } static void @@ -2464,8 +2476,10 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); uri = katze_item_get_uri (item); - if (KATZE_IS_ARRAY (item) || (uri && *uri)) - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE); + if (KATZE_IS_ARRAY (item)) + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE); + else if (uri && *uri) + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } static void @@ -2560,7 +2574,7 @@ static void _action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) { - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index e657d6a6..9526a2d3 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -28,7 +28,8 @@ void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, - gboolean new_bookmark); + gboolean new_bookmark, + gboolean is_folder); struct _MidoriBookmarks { @@ -114,7 +115,7 @@ midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) GtkWidget* browser = gtk_widget_get_toplevel (toolitem); /* FIXME: Take selected folder into account */ midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), - NULL, TRUE); + NULL, TRUE, FALSE); } static void @@ -137,7 +138,7 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, { GtkWidget* browser = gtk_widget_get_toplevel (toolitem); midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), - item, FALSE); + item, FALSE, FALSE); } g_object_unref (item); @@ -169,6 +170,15 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, } } +static void +midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem) +{ + GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + /* FIXME: Take selected folder into account */ + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), + NULL, TRUE, TRUE); +} + static void midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, MidoriBookmarks* bookmarks) @@ -237,6 +247,19 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); bookmarks->delete = GTK_WIDGET (toolitem); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); + gtk_tool_item_set_expand (toolitem, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Add a new folder")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_bookmarks_folder_clicked_cb), bookmarks); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + midori_bookmarks_cursor_or_row_changed_cb ( GTK_TREE_VIEW (bookmarks->treeview), bookmarks); g_signal_connect (bookmarks->edit, "destroy", @@ -696,7 +719,7 @@ midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, if (!is_separator) { GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, FALSE); + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, FALSE, FALSE); } } diff --git a/panels/midori-history.c b/panels/midori-history.c index 4a416959..ca52924e 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -28,7 +28,8 @@ void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, - gboolean new_bookmark); + gboolean new_bookmark, + gboolean is_folder); struct _MidoriHistory { @@ -115,7 +116,7 @@ midori_history_add_clicked_cb (GtkWidget* toolitem) GtkWidget* browser = gtk_widget_get_toplevel (toolitem); /* FIXME: Take selected folder into account */ midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), - NULL, TRUE); + NULL, TRUE, FALSE); } static void @@ -752,7 +753,7 @@ midori_history_bookmark_activate_cb (GtkWidget* menuitem, if (uri && *uri) { GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, TRUE); + midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, TRUE, FALSE); } } From ca8d22b9b4cb8748a3660811f4ceee30ed540a94 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 03:51:10 +0100 Subject: [PATCH 0789/2970] Implement "right-align-sidepanel" to align the panel on the right --- midori/midori-browser.c | 22 +++++++++++++++++++++- midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b17a4f37..0e491acf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3865,7 +3865,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) gboolean remember_last_window_size; gint last_window_width, last_window_height; MidoriWindowState last_window_state; - gboolean compact_sidepanel; + gboolean compact_sidepanel, right_align_sidepanel; + GtkWidget* hpaned, *vpaned; gint last_panel_position, last_panel_page; gboolean show_menubar, show_navigationbar, show_bookmarkbar; gboolean show_panel, show_statusbar; @@ -3883,6 +3884,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "last-window-height", &last_window_height, "last-window-state", &last_window_state, "compact-sidepanel", &compact_sidepanel, + "right-align-sidepanel", &right_align_sidepanel, "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, "show-menubar", &show_menubar, @@ -3938,6 +3940,24 @@ _midori_browser_update_settings (MidoriBrowser* browser) } midori_panel_set_compact (MIDORI_PANEL (browser->panel), compact_sidepanel); + hpaned = gtk_widget_get_parent (browser->panel); + vpaned = gtk_widget_get_parent (browser->notebook); + g_object_ref (browser->panel); + g_object_ref (vpaned); + gtk_container_remove (GTK_CONTAINER (hpaned), browser->panel); + gtk_container_remove (GTK_CONTAINER (hpaned), vpaned); + if (right_align_sidepanel) + { + gtk_paned_pack1 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); + gtk_paned_pack2 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); + } + else + { + gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); + gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); + } + g_object_unref (browser->panel); + g_object_unref (vpaned); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index df1ceca4..8966fe61 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -42,6 +42,7 @@ struct _MidoriWebSettings gboolean progress_in_location; gchar* toolbar_items; gboolean compact_sidepanel; + gboolean right_align_sidepanel; MidoriStartup load_on_startup; gchar* homepage; @@ -107,6 +108,7 @@ enum PROP_PROGRESS_IN_LOCATION, PROP_TOOLBAR_ITEMS, PROP_COMPACT_SIDEPANEL, + PROP_RIGHT_ALIGN_SIDEPANEL, PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, @@ -463,6 +465,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) FALSE, flags)); + /** + * MidoriWebSettings:right-sidepanel: + * + * Whether to align the sidepanel on the right. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_RIGHT_ALIGN_SIDEPANEL, + g_param_spec_boolean ( + "right-align-sidepanel", + _("Align sidepanel on the right"), + _("Whether to align the sidepanel on the right"), + FALSE, + flags)); + g_object_class_install_property (gobject_class, PROP_LOAD_ON_STARTUP, @@ -1005,6 +1023,9 @@ midori_web_settings_set_property (GObject* object, case PROP_COMPACT_SIDEPANEL: web_settings->compact_sidepanel = g_value_get_boolean (value); break; + case PROP_RIGHT_ALIGN_SIDEPANEL: + web_settings->right_align_sidepanel = g_value_get_boolean (value); + break; case PROP_LOAD_ON_STARTUP: web_settings->load_on_startup = g_value_get_enum (value); @@ -1189,6 +1210,9 @@ midori_web_settings_get_property (GObject* object, case PROP_COMPACT_SIDEPANEL: g_value_set_boolean (value, web_settings->compact_sidepanel); break; + case PROP_RIGHT_ALIGN_SIDEPANEL: + g_value_set_boolean (value, web_settings->right_align_sidepanel); + break; case PROP_LOAD_ON_STARTUP: g_value_set_enum (value, web_settings->load_on_startup); From ba9d7d48e58b6e117062e38d4a2b9c6838a55b90 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 13:52:04 +0100 Subject: [PATCH 0790/2970] Fix browser properties along with enabling the property test --- midori/midori-browser.c | 25 +++++++++++++++++++------ tests/properties.c | 5 +++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0e491acf..b488052c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -551,7 +551,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, view = midori_browser_get_current_tab (browser); if (is_folder) { - bookmark = katze_array_new (KATZE_TYPE_ARRAY); + bookmark = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_name (bookmark, midori_view_get_display_title (MIDORI_VIEW (view))); } @@ -1161,7 +1161,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "uri", "URI", "The current URI", - "about:blank", + "", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, @@ -4191,6 +4191,16 @@ midori_browser_get_property (GObject* object, case PROP_TAB: g_value_set_object (value, midori_browser_get_current_tab (browser)); break; + case PROP_LOAD_STATUS: + { + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + g_value_set_enum (value, + midori_view_get_load_status (MIDORI_VIEW (view))); + else + g_value_set_enum (value, MIDORI_LOAD_FINISHED); + break; + } case PROP_STATUSBAR: g_value_set_object (value, browser->statusbar); break; @@ -4372,8 +4382,10 @@ midori_browser_set_current_uri (MidoriBrowser* browser, g_return_if_fail (MIDORI_IS_BROWSER (browser)); g_return_if_fail (uri != NULL); - view = midori_browser_get_current_tab (browser); - midori_view_set_uri (MIDORI_VIEW (view), uri); + if ((view = midori_browser_get_current_tab (browser))) + midori_view_set_uri (MIDORI_VIEW (view), uri); + else + midori_browser_add_uri (browser, uri); } /** @@ -4393,8 +4405,9 @@ midori_browser_get_current_uri (MidoriBrowser* browser) g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); - view = midori_browser_get_current_tab (browser); - return midori_view_get_display_uri (MIDORI_VIEW (view)); + if ((view = midori_browser_get_current_tab (browser))) + return midori_view_get_display_uri (MIDORI_VIEW (view)); + return NULL; } /** diff --git a/tests/properties.c b/tests/properties.c index 6866ce41..79a711d1 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -131,11 +131,12 @@ main (int argc, if (!g_thread_supported ()) g_thread_init (NULL); g_test_init (&argc, &argv, NULL); gtk_init_check (&argc, &argv); + sokoke_register_stock_items (); g_test_add_data_func ("/properties/app", (gconstpointer)MIDORI_TYPE_APP, properties_type_test); - /* g_test_add_data_func ("/properties/browser", - (gconstpointer)MIDORI_TYPE_BROWSER, properties_type_test); */ + g_test_add_data_func ("/properties/browser", + (gconstpointer)MIDORI_TYPE_BROWSER, properties_type_test); g_test_add_data_func ("/properties/extension", (gconstpointer)MIDORI_TYPE_EXTENSION, properties_type_test); g_test_add_data_func ("/properties/location-action", From 0d1a1edaaaefdb149f26636071d47af160aa0836 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sun, 22 Feb 2009 14:42:27 +0100 Subject: [PATCH 0791/2970] Save the normal window size, not the maximized size --- midori/midori-browser.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b488052c..d0f52b17 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3025,9 +3025,15 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser, static gboolean midori_browser_alloc_timeout (MidoriBrowser* browser) { - g_object_set (browser->settings, - "last-window-width", GTK_WIDGET (browser)->allocation.width, - "last-window-height", GTK_WIDGET (browser)->allocation.height, NULL); + GtkWidget* widget = GTK_WIDGET (browser); + GdkWindowState state = gdk_window_get_state (widget->window); + + if (!(state & + (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))) + g_object_set (browser->settings, + "last-window-width", widget->allocation.width, + "last-window-height", widget->allocation.height, NULL); + browser->alloc_timeout = 0; return FALSE; } From 2347045245416e4f326b5f44ffbde9465b09e3ab Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 15:36:41 +0100 Subject: [PATCH 0792/2970] Cancel 'typing' search when the entry loses its focus --- midori/midori-browser.c | 47 +++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d0f52b17..ecae0697 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1554,6 +1554,18 @@ _midori_browser_find (MidoriBrowser* browser, midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); } +static void +_midori_browser_find_done (MidoriBrowser* browser) +{ + GtkWidget* view = midori_browser_get_current_tab (browser); + midori_view_unmark_text_matches (MIDORI_VIEW (view)); + gtk_widget_hide (browser->find); + browser->find_typing = FALSE; + gtk_window_set_focus (GTK_WINDOW (browser), + gtk_bin_get_child (GTK_BIN (view)) ? + gtk_bin_get_child (GTK_BIN (view)) : view); +} + static void _action_find_next_activate (GtkAction* action, MidoriBrowser* browser) @@ -1562,13 +1574,23 @@ _action_find_next_activate (GtkAction* action, } static void -midori_browser_find_text_changed (GtkWidget* entry, - MidoriBrowser* browser) +midori_browser_find_text_changed_cb (GtkWidget* entry, + MidoriBrowser* browser) { if (browser->find_typing) _midori_browser_find (browser, TRUE); } +static gboolean +midori_browser_find_text_focus_out_event_cb (GtkWidget* entry, + GdkEventFocus* event, + MidoriBrowser* browser) +{ + if (browser->find_typing) + _midori_browser_find_done (browser); + return FALSE; +} + static void _action_find_previous_activate (GtkAction* action, MidoriBrowser* browser) @@ -1595,13 +1617,7 @@ midori_browser_find_key_press_event_cb (GtkWidget* toolbar, { if (event->keyval == GDK_Escape) { - GtkWidget* view = midori_browser_get_current_tab (browser); - midori_view_unmark_text_matches (MIDORI_VIEW (view)); - gtk_widget_hide (toolbar); - browser->find_typing = FALSE; - gtk_window_set_focus (GTK_WINDOW (browser), - gtk_bin_get_child (GTK_BIN (view)) ? - gtk_bin_get_child (GTK_BIN (view)) : view); + _midori_browser_find_done (browser); return TRUE; } @@ -1612,14 +1628,7 @@ static void midori_browser_find_button_close_clicked_cb (GtkWidget* widget, MidoriBrowser* browser) { - GtkWidget* view; - - gtk_widget_hide (browser->find); - browser->find_typing = FALSE; - view = midori_browser_get_current_tab (browser); - gtk_window_set_focus (GTK_WINDOW (browser), - gtk_bin_get_child (GTK_BIN (view)) ? - gtk_bin_get_child (GTK_BIN (view)) : view); + _midori_browser_find_done (browser); } static void @@ -3664,7 +3673,9 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect (browser->find_text, "activate", G_CALLBACK (_action_find_next_activate), browser); g_signal_connect (browser->find_text, "changed", - G_CALLBACK (midori_browser_find_text_changed), browser); + G_CALLBACK (midori_browser_find_text_changed_cb), browser); + g_signal_connect (browser->find_text, "focus-out-event", + G_CALLBACK (midori_browser_find_text_focus_out_event_cb), browser); toolitem = gtk_tool_item_new (); gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); From 30729676db03c6a2330abd15070ca49de1b7f60a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 16:03:08 +0100 Subject: [PATCH 0793/2970] Flip the toolbar of the panel as well when aligning it to the right --- midori/midori-browser.c | 2 ++ midori/midori-panel.c | 21 +++++++++++++++++++++ midori/midori-panel.h | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ecae0697..2ce320c7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3975,6 +3975,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) } g_object_unref (browser->panel); g_object_unref (vpaned); + midori_panel_set_right_aligned (MIDORI_PANEL (browser->panel), + right_align_sidepanel); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), last_panel_position); midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 7f4a914b..667a8295 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -322,6 +322,27 @@ midori_panel_set_compact (MidoriPanel* panel, compact ? GTK_TOOLBAR_ICONS : GTK_TOOLBAR_BOTH); } +/** + * midori_panel_set_right_aligned: + * @compact: %TRUE if the panel should be aligned to the right + * + * Determines if the panel should be right aligned. + * + * Since: 0.1.3 + **/ +void +midori_panel_set_right_aligned (MidoriPanel* panel, + gboolean right_aligned) +{ + GtkWidget* box; + + g_return_if_fail (MIDORI_IS_PANEL (panel)); + + box = gtk_widget_get_parent (panel->toolbar); + gtk_box_reorder_child (GTK_BOX (box), panel->toolbar, + right_aligned ? -1 : 0); +} + static void midori_panel_menu_item_activate_cb (GtkWidget* widget, MidoriPanel* panel) diff --git a/midori/midori-panel.h b/midori/midori-panel.h index 40caeee1..704fd95e 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -46,6 +46,10 @@ void midori_panel_set_compact (MidoriPanel* panel, gboolean compact); +void +midori_panel_set_right_aligned (MidoriPanel* panel, + gboolean right_aligned); + gint midori_panel_append_page (MidoriPanel* panel, MidoriViewable* viewable); From 9662e99354bc3ef147f60fa48e3f40f177d92597 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 16:12:58 +0100 Subject: [PATCH 0794/2970] Do not actually search less than 3 characters in 'typing' search --- midori/midori-browser.c | 8 ++++++-- midori/midori-view.c | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2ce320c7..8484a80c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -893,7 +893,7 @@ midori_view_search_text_cb (GtkWidget* view, gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position); gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1); } - if (GTK_WIDGET_VISIBLE (browser->find)) + if (GTK_WIDGET_VISIBLE (browser->find) && !typing) { gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); @@ -1578,7 +1578,11 @@ midori_browser_find_text_changed_cb (GtkWidget* entry, MidoriBrowser* browser) { if (browser->find_typing) - _midori_browser_find (browser, TRUE); + { + const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); + if (g_utf8_strlen (text, -1) > 2) + _midori_browser_find (browser, TRUE); + } } static gboolean diff --git a/midori/midori-view.c b/midori/midori-view.c index 634c9be8..928e39e8 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -822,9 +822,7 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view, { gchar* text = g_strdup_printf ("%c", character); - g_signal_emit (view, signals[SEARCH_TEXT], 0, - webkit_web_view_search_text (web_view, - text, FALSE, TRUE, TRUE), text); + g_signal_emit (view, signals[SEARCH_TEXT], 0, TRUE, text); g_free (text); } From e354f8e17b6996d5402cad8becd059c3b41d6231 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 16:17:32 +0100 Subject: [PATCH 0795/2970] Fix highlighted matches in 'typing' mode --- midori/midori-browser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8484a80c..03a974d6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1579,7 +1579,9 @@ midori_browser_find_text_changed_cb (GtkWidget* entry, { if (browser->find_typing) { + GtkWidget* view = midori_browser_get_current_tab (browser); const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); + midori_view_unmark_text_matches (MIDORI_VIEW (view)); if (g_utf8_strlen (text, -1) > 2) _midori_browser_find (browser, TRUE); } From 3b074844e30655a0442774d5ac53193e4082b556 Mon Sep 17 00:00:00 2001 From: Sergio Durzu Date: Sun, 22 Feb 2009 18:04:52 +0100 Subject: [PATCH 0796/2970] Update Italian translation --- po/it.po | 78 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/po/it.po b/po/it.po index 899a92ff..5867ca70 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-02-03 22:54+0100\n" -"PO-Revision-Date: 2009-02-19 15:27+0100\n" +"PO-Revision-Date: 2009-02-21 10:44+0100\n" "Last-Translator: Sergio Durzu \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -75,7 +75,7 @@ msgstr "N_uova scheda" #: ../midori/main.c:100 msgid "_Transfers" -msgstr "Sc_aricamenti" +msgstr "_Download" #: ../midori/main.c:101 msgid "_Closed Tabs and Windows" @@ -118,7 +118,7 @@ msgstr "Errore nella connessione al database: %s\n" #: ../midori/main.c:603 #, c-format msgid "Failed to execute database statement: %s\n" -msgstr "Errore nell'esecuzione del comando del database: %s\n" +msgstr "Errore nell'esecuzione della richiesta al database: %s\n" #: ../midori/main.c:657 #, c-format @@ -213,11 +213,11 @@ msgstr "Modifica _preferenze" #: ../midori/main.c:1802 msgid "Reset the last _session" -msgstr "Reimpostare l'ultima _sessione" +msgstr "Reimposta l'ultima _sessione" #: ../midori/main.c:1807 msgid "Disable all _extensions" -msgstr "Disabilitare tutte le _estensioni" +msgstr "Disabilita tutte le _estensioni" #: ../midori/main.c:1950 msgid "No filename specified" @@ -230,7 +230,7 @@ msgstr "Si è presentato un errore sconosciuto" #: ../midori/main.c:2005 msgid "Run the specified filename as javascript" -msgstr "Esegui il file specificato come javascript" +msgstr "Esegue il file specificato come javascript" #: ../midori/main.c:2007 msgid "Display program version" @@ -298,7 +298,7 @@ msgstr "Ricarica la pagina corrente" #: ../midori/midori-browser.c:270 #: ../midori/midori-browser.c:3167 msgid "Stop loading the current page" -msgstr "Interrompi il caricamento della pagina corrente" +msgstr "Interrompe il caricamento della pagina corrente" #: ../midori/midori-browser.c:328 #, c-format @@ -387,7 +387,7 @@ msgstr "Sergio Durzu " #: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" -msgstr "Cancellare la cronologia?" +msgstr "Cancellare completamente la cronologia?" #: ../midori/midori-browser.c:3098 msgid "_File" @@ -500,15 +500,15 @@ msgstr "_Barre degli strumenti" #: ../midori/midori-browser.c:3173 msgid "Increase the zoom level" -msgstr "Aumenta lo zoom" +msgstr "Aumenta il livello di ingrandimento" #: ../midori/midori-browser.c:3176 msgid "Decrease the zoom level" -msgstr "Diminuisci lo zoom" +msgstr "Diminuisce il livello di ingrandimento" #: ../midori/midori-browser.c:3179 msgid "Reset the zoom level" -msgstr "Reimposta lo zoom" +msgstr "Azzera il livello di ingrandimento" #: ../midori/midori-browser.c:3181 #: ../midori/midori-view.c:984 @@ -537,15 +537,15 @@ msgstr "_Vai" #: ../midori/midori-browser.c:3194 msgid "Go back to the previous page" -msgstr "Ritorna alla pagina precedente" +msgstr "Va alla pagina precedente" #: ../midori/midori-browser.c:3197 msgid "Go forward to the next page" -msgstr "Ritorna alla pagina successiva" +msgstr "Va alla pagina successiva" #: ../midori/midori-browser.c:3200 msgid "Go to your homepage" -msgstr "Vai alla pagina iniziale" +msgstr "Va alla pagina iniziale" #: ../midori/midori-browser.c:3202 msgid "Empty Trash" @@ -579,7 +579,7 @@ msgstr "Cancella l'intera cronologia" #: ../midori/midori-browser.c:3219 msgid "Bookmark the selected history item" -msgstr "Crea un segnalibro dall'elemento selezionato" +msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" #: ../midori/midori-browser.c:3221 msgid "_Tools" @@ -884,7 +884,7 @@ msgstr "Ricorda la dimensione dell'ultima finestra" #: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" -msgstr "Salvare la dimensione dell'ultima finestra" +msgstr "Salva la dimensione dell'ultima finestra" #: ../midori/midori-websettings.c:312 msgid "Last window width" @@ -892,7 +892,7 @@ msgstr "Larghezza dell'ultima finestra" #: ../midori/midori-websettings.c:313 msgid "The last saved window width" -msgstr "La larghezza dell'ultima finestra salvata" +msgstr "Salva la larghezza dell'ultima finestra salvata" #: ../midori/midori-websettings.c:321 msgid "Last window height" @@ -900,7 +900,7 @@ msgstr "Altezza dell'ultima finestra" #: ../midori/midori-websettings.c:322 msgid "The last saved window height" -msgstr "L'altezza dell'ultima finestra salvata" +msgstr "Salva l'altezza dell'ultima finestra salvata" #: ../midori/midori-websettings.c:347 msgid "Last panel position" @@ -908,7 +908,7 @@ msgstr "Posizione del pannello" #: ../midori/midori-websettings.c:348 msgid "The last saved panel position" -msgstr "La posizione dell'ultimo pannello salvato" +msgstr "Salva la posizione dell'ultimo pannello salvato" #. i18n: The internal index of the last opened panel #: ../midori/midori-websettings.c:357 @@ -917,7 +917,7 @@ msgstr "Pagina dell'ultimo pannello" #: ../midori/midori-websettings.c:358 msgid "The last saved panel page" -msgstr "La pagina dell'ultimo pannello salvato" +msgstr "Salva la pagina dell'ultimo pannello salvato" #: ../midori/midori-websettings.c:366 msgid "Last Web search" @@ -925,7 +925,7 @@ msgstr "Ultima ricerca web" #: ../midori/midori-websettings.c:367 msgid "The last saved Web search" -msgstr "L'ultima ricerca web salvata" +msgstr "Salva l'ultima ricerca web salvata" #: ../midori/midori-websettings.c:376 msgid "Show Menubar" @@ -933,7 +933,7 @@ msgstr "Mostra barra dei menù" #: ../midori/midori-websettings.c:377 msgid "Whether to show the menubar" -msgstr "Mostra la barra dei menù" +msgstr "Abilitare per mostrare la barra dei menù" #: ../midori/midori-websettings.c:385 msgid "Show Navigationbar" @@ -941,7 +941,7 @@ msgstr "Mostra barra di navigazione" #: ../midori/midori-websettings.c:386 msgid "Whether to show the navigationbar" -msgstr "Mostra la barra di navigazione" +msgstr "Abilitare per mostrare la barra di navigazione" #: ../midori/midori-websettings.c:394 msgid "Show Bookmarkbar" @@ -949,7 +949,7 @@ msgstr "Mostra barra dei segnalibri" #: ../midori/midori-websettings.c:395 msgid "Whether to show the bookmarkbar" -msgstr "Mostra la barra dei segnalibri" +msgstr "Abilitare per mostrare la barra dei segnalibri" #: ../midori/midori-websettings.c:403 msgid "Show Panel" @@ -957,7 +957,7 @@ msgstr "Mostra pannello" #: ../midori/midori-websettings.c:404 msgid "Whether to show the panel" -msgstr "Mostra il pannello" +msgstr "Abilitare per mostrare il pannello" #: ../midori/midori-websettings.c:412 msgid "Show Statusbar" @@ -965,7 +965,7 @@ msgstr "Mostra barra di stato" #: ../midori/midori-websettings.c:413 msgid "Whether to show the statusbar" -msgstr "Mostra la barra di stato" +msgstr "Abilitare per mostrare la barra di stato" #: ../midori/midori-websettings.c:422 msgid "Toolbar Style" @@ -973,7 +973,7 @@ msgstr "Stile della barra degli strumenti" #: ../midori/midori-websettings.c:423 msgid "The style of the toolbar" -msgstr "Stile della barra degli strumenti" +msgstr "Scegliere lo stile della barra degli strumenti" #: ../midori/midori-websettings.c:432 msgid "Toolbar Items" @@ -981,7 +981,7 @@ msgstr "Elementi barra degli strumenti" #: ../midori/midori-websettings.c:433 msgid "The items to show on the toolbar" -msgstr "Gli elementi da mostrare nella barra degli strumenti" +msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" #: ../midori/midori-websettings.c:441 msgid "Compact Sidepanel" @@ -989,7 +989,7 @@ msgstr "Pannello compatto" #: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" -msgstr "Rende il pannello compatto" +msgstr "Abilitare per il pannello compatto" #: ../midori/midori-websettings.c:451 msgid "Load on Startup" @@ -997,7 +997,7 @@ msgstr "Carica all'avvio" #: ../midori/midori-websettings.c:452 msgid "What to load on startup" -msgstr "Cosa deve essere caricato all'avvio" +msgstr "Scegliere cosa deve essere caricato all'avvio dell'applicazione" #: ../midori/midori-websettings.c:462 msgid "The homepage" @@ -1017,7 +1017,7 @@ msgstr "Cartella download" #: ../midori/midori-websettings.c:487 msgid "The folder downloaded files are saved to" -msgstr "La cartella dove devono essere salvati i file scaricati" +msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" #: ../midori/midori-websettings.c:495 msgid "Download Manager" @@ -1025,7 +1025,7 @@ msgstr "Gestione download" #: ../midori/midori-websettings.c:496 msgid "An external download manager" -msgstr "Un gestore download esterno" +msgstr "Inserire un gestore download esterno" #: ../midori/midori-websettings.c:504 msgid "Text Editor" @@ -1033,7 +1033,7 @@ msgstr "Editor di testo" #: ../midori/midori-websettings.c:505 msgid "An external text editor" -msgstr "Inserire editor di testo esterno" +msgstr "Inserire un editor di testo esterno" #: ../midori/midori-websettings.c:513 msgid "Location entry Search" @@ -1185,7 +1185,7 @@ msgstr "Server proxy" #: ../midori/midori-websettings.c:740 msgid "The proxy server used for HTTP connections" -msgstr "Server proxy usato per le connessioni HTTP" +msgstr "Inserire il server proxy usato per le connessioni HTTP" #. i18n: This refers to an application, not the 'user agent' string #: ../midori/midori-websettings.c:760 @@ -1203,7 +1203,7 @@ msgstr "Stringa di identificazione" #: ../midori/midori-websettings.c:782 msgid "The application identification string" -msgstr "Stringa di identificazione dell'applicazione" +msgstr "Inserire la stringa di identificazione dell'applicazione" #: ../midori/midori-websettings.c:794 msgid "Cache size" @@ -1211,7 +1211,7 @@ msgstr "File temporanei" #: ../midori/midori-websettings.c:795 msgid "The allowed size of the cache" -msgstr "Dimensione consentita per i file temporanei" +msgstr "Dimensione massima consentita per i file temporanei" #. i18n: The title of the 404 - Not found error page #: ../midori/midori-view.c:608 @@ -1283,7 +1283,7 @@ msgstr "Famiglia di caratteri predefinita" #: ../midori/midori-preferences.c:431 msgid "The default font size used to display text" -msgstr "Dimensione predefinita dei caratteri per visualizzare il testo" +msgstr "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" #: ../midori/midori-preferences.c:434 msgid "Minimum Font Size" @@ -1291,7 +1291,7 @@ msgstr "Dimensione minima caratteri" #: ../midori/midori-preferences.c:437 msgid "The minimum font size used to display text" -msgstr "Dimensione minima dei caratteri per visualizzare il testo" +msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo" #: ../midori/midori-preferences.c:444 msgid "Encoding" @@ -1299,7 +1299,7 @@ msgstr "Codifica" #: ../midori/midori-preferences.c:447 msgid "The character encoding to use by default" -msgstr "Codifica predefinita dei caratteri" +msgstr "Scegliere la codifica predefinita dei caratteri" #. Page "Behavior" #: ../midori/midori-preferences.c:454 From 94532ab9f8bb24d2b7599541d2ad48a6d0be8d94 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:23:45 +0100 Subject: [PATCH 0797/2970] Add a button to change the alignment to the panel --- midori/midori-browser.c | 56 +++++++++++++++++++++++++---------------- midori/midori-panel.c | 54 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 23 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 03a974d6..89065de3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2744,6 +2744,35 @@ midori_panel_notify_position_cb (GObject* hpaned, (GSourceFunc)midori_browser_panel_timeout, hpaned, NULL); } +static void +midori_panel_notify_right_aligned_cb (MidoriPanel* panel, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + gboolean right_aligned = katze_object_get_boolean (panel, "right-aligned"); + GtkWidget* hpaned = gtk_widget_get_parent (browser->panel); + GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook); + + g_object_set (browser->settings, "right-align-sidepanel", right_aligned, NULL); + + g_object_ref (browser->panel); + g_object_ref (vpaned); + gtk_container_remove (GTK_CONTAINER (hpaned), browser->panel); + gtk_container_remove (GTK_CONTAINER (hpaned), vpaned); + if (right_aligned) + { + gtk_paned_pack1 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); + gtk_paned_pack2 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); + } + else + { + gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); + gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); + } + g_object_unref (browser->panel); + g_object_unref (vpaned); +} + static gboolean midori_panel_close_cb (MidoriPanel* panel, MidoriBrowser* browser) @@ -3609,9 +3638,11 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); browser->panel = g_object_new (MIDORI_TYPE_PANEL, - "shadow-type", GTK_SHADOW_IN, - "menu", browser->menu_tools, - NULL); + "shadow-type", GTK_SHADOW_IN, + "menu", browser->menu_tools, + NULL); + g_signal_connect (browser->panel, "notify::right-aligned", + G_CALLBACK (midori_panel_notify_right_aligned_cb), browser); g_signal_connect (browser->panel, "close", G_CALLBACK (midori_panel_close_cb), browser); gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); @@ -3889,7 +3920,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint last_window_width, last_window_height; MidoriWindowState last_window_state; gboolean compact_sidepanel, right_align_sidepanel; - GtkWidget* hpaned, *vpaned; gint last_panel_position, last_panel_page; gboolean show_menubar, show_navigationbar, show_bookmarkbar; gboolean show_panel, show_statusbar; @@ -3963,24 +3993,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) } midori_panel_set_compact (MIDORI_PANEL (browser->panel), compact_sidepanel); - hpaned = gtk_widget_get_parent (browser->panel); - vpaned = gtk_widget_get_parent (browser->notebook); - g_object_ref (browser->panel); - g_object_ref (vpaned); - gtk_container_remove (GTK_CONTAINER (hpaned), browser->panel); - gtk_container_remove (GTK_CONTAINER (hpaned), vpaned); - if (right_align_sidepanel) - { - gtk_paned_pack1 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); - gtk_paned_pack2 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); - } - else - { - gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE); - gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, FALSE, FALSE); - } - g_object_unref (browser->panel); - g_object_unref (vpaned); midori_panel_set_right_aligned (MIDORI_PANEL (browser->panel), right_align_sidepanel); gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)), diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 667a8295..41574536 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -24,12 +24,15 @@ struct _MidoriPanel GtkHBox parent_instance; GtkWidget* toolbar; + GtkToolItem* button_align; GtkWidget* toolbar_label; GtkWidget* frame; GtkWidget* toolbook; GtkWidget* notebook; GSList* group; GtkMenu* menu; + + gboolean right_aligned; }; struct _MidoriPanelClass @@ -49,7 +52,8 @@ enum PROP_SHADOW_TYPE, PROP_MENU, - PROP_PAGE + PROP_PAGE, + PROP_RIGHT_ALIGNED, }; enum { @@ -147,6 +151,22 @@ midori_panel_class_init (MidoriPanelClass* class) "The index of the current page", -1, G_MAXINT, -1, flags)); + + /** + * MidoriWebSettings:right-aligned: + * + * Whether to align the panel on the right. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_RIGHT_ALIGNED, + g_param_spec_boolean ( + "right-aligned", + "Right aligned", + "Whether the panel is aligned to the right", + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void @@ -157,6 +177,13 @@ midori_panel_button_close_clicked_cb (GtkWidget* toolitem, g_signal_emit (panel, signals[CLOSE], 0, &return_value); } +static void +midori_panel_button_align_clicked_cb (GtkWidget* toolitem, + MidoriPanel* panel) +{ + midori_panel_set_right_aligned (panel, !panel->right_aligned); +} + static void midori_panel_destroy_cb (MidoriPanel* panel) { @@ -172,6 +199,8 @@ midori_panel_init (MidoriPanel* panel) GtkWidget* labelbar; GtkToolItem* toolitem; + panel->right_aligned = FALSE; + /* Create the sidebar */ panel->toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_BOTH); @@ -195,6 +224,19 @@ midori_panel_init (MidoriPanel* panel) gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), + _("Align sidepanel on the right")); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), + _("Whether to align the sidepanel on the right")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_panel_button_align_clicked_cb), panel); + #if HAVE_OSX + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, 0); + #else + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + #endif + panel->button_align = toolitem; toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close panel")); gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Close panel")); @@ -255,6 +297,9 @@ midori_panel_set_property (GObject* object, case PROP_PAGE: midori_panel_set_current_page (panel, g_value_get_int (value)); break; + case PROP_RIGHT_ALIGNED: + midori_panel_set_right_aligned (panel, g_value_get_boolean (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -281,6 +326,9 @@ midori_panel_get_property (GObject* object, case PROP_PAGE: g_value_set_int (value, midori_panel_get_current_page (panel)); break; + case PROP_RIGHT_ALIGNED: + g_value_set_boolean (value, panel->right_aligned); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -341,6 +389,10 @@ midori_panel_set_right_aligned (MidoriPanel* panel, box = gtk_widget_get_parent (panel->toolbar); gtk_box_reorder_child (GTK_BOX (box), panel->toolbar, right_aligned ? -1 : 0); + gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (panel->button_align), + right_aligned ? GTK_STOCK_GO_BACK : GTK_STOCK_GO_FORWARD); + panel->right_aligned = right_aligned; + g_object_notify (G_OBJECT (panel), "right-aligned"); } static void From 6e2b0872a0356db57f98e8e01be70b5a22fed949 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:24:52 +0100 Subject: [PATCH 0798/2970] Wrap lines in source views --- midori/midori-source.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-source.c b/midori/midori-source.c index 21524340..c3fcef22 100644 --- a/midori/midori-source.c +++ b/midori/midori-source.c @@ -50,6 +50,7 @@ static void midori_source_init (MidoriSource* source) { gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); + gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (source), TRUE); source->net = katze_net_new (); } From 254c4dd8461b0ebcf7be6654758f6e1c1c2064e7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:29:08 +0100 Subject: [PATCH 0799/2970] Correct default values of some preferences --- midori/midori-websettings.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 8966fe61..cf077e22 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -886,6 +886,10 @@ static void midori_web_settings_init (MidoriWebSettings* web_settings) { web_settings->http_proxy = NULL; + web_settings->open_popups_in_tabs = TRUE; + web_settings->remember_last_form_inputs = TRUE; + web_settings->remember_last_downloaded_files = TRUE; + web_settings->auto_detect_proxy = TRUE; g_signal_connect (web_settings, "notify::default-encoding", G_CALLBACK (notify_default_encoding_cb), NULL); From 35ae81c90aa88048f123eadccd6fa0a448093cf6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:29:42 +0100 Subject: [PATCH 0800/2970] Test boolean properties as well --- tests/properties.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tests/properties.c b/tests/properties.c index 79a711d1..0c163957 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -15,6 +15,7 @@ #include "midori.h" #include "midori-bookmarks.h" +#include "sokoke.h" #if GLIB_CHECK_VERSION(2, 16, 0) @@ -42,7 +43,31 @@ properties_object_get_set (GObject* object) continue; g_object_get (object, property, &value, NULL); - if (type == G_TYPE_PARAM_STRING) + if (type == G_TYPE_PARAM_BOOLEAN) + { + gboolean current_value = value ? TRUE : FALSE; + gboolean default_value = G_PARAM_SPEC_BOOLEAN (pspec)->default_value; + if (current_value != default_value) + g_error ("Set %s.%s to default (%d), but returned '%d'", + G_OBJECT_TYPE_NAME (object), property, + G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value); + if (pspec_is_writable (pspec)) + { + g_object_set (object, property, !default_value, NULL); + g_object_get (object, property, ¤t_value, NULL); + if (current_value == default_value) + g_error ("Set %s.%s to non-default (%d), but returned '%d'", + G_OBJECT_TYPE_NAME (object), property, + !G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value); + g_object_set (object, property, default_value, NULL); + g_object_get (object, property, ¤t_value, NULL); + if (current_value != default_value) + g_error ("Set %s.%s to default again (%d), but returned '%d'", + G_OBJECT_TYPE_NAME (object), property, + G_PARAM_SPEC_BOOLEAN (pspec)->default_value, current_value); + } + } + else if (type == G_TYPE_PARAM_STRING) { g_free (value); if (pspec_is_writable (pspec)) From e406aa7535fc98af3dce9b9c5c36e552277b1dc0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:31:24 +0100 Subject: [PATCH 0801/2970] Update translation template --- po/midori.pot | 532 ++++++++++++++++++++++++++------------------------ 1 file changed, 276 insertions(+), 256 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index ab4ff5ee..86c1980b 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-21 23:50+0100\n" +"POT-Creation-Date: 2009-02-22 19:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 #: ../midori/main.c:1714 ../midori/main.c:1725 -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:265 msgid "Midori" msgstr "" @@ -206,944 +206,960 @@ msgstr "" msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:257 ../midori/midori-browser.c:2827 -#: ../midori/midori-browser.c:2833 +#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:2931 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:269 ../midori/midori-browser.c:2830 +#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:331 +#: ../midori/midori-browser.c:333 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:356 +#: ../midori/midori-browser.c:358 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:534 +msgid "New folder" +msgstr "" + +#: ../midori/midori-browser.c:534 +msgid "Edit folder" +msgstr "" + +#: ../midori/midori-browser.c:536 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:536 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:566 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:565 ../midori/midori-searchaction.c:853 +#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:584 ../midori/midori-searchaction.c:867 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:616 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:607 ../midori/midori-browser.c:644 +#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1308 +#: ../midori/midori-browser.c:1340 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2459 ../panels/midori-bookmarks.c:731 -#: ../panels/midori-history.c:787 +#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:788 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2461 ../panels/midori-bookmarks.c:733 -#: ../panels/midori-history.c:789 +#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:790 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2603 +#: ../midori/midori-browser.c:2674 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2611 +#: ../midori/midori-browser.c:2682 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2761 +#: ../midori/midori-browser.c:2859 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:2764 +#: ../midori/midori-browser.c:2862 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:2767 +#: ../midori/midori-browser.c:2865 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:2770 +#: ../midori/midori-browser.c:2868 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:2773 +#: ../midori/midori-browser.c:2871 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:2775 +#: ../midori/midori-browser.c:2873 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:2776 +#: ../midori/midori-browser.c:2874 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:2778 +#: ../midori/midori-browser.c:2876 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:2779 +#: ../midori/midori-browser.c:2877 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:2782 +#: ../midori/midori-browser.c:2880 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:2785 +#: ../midori/midori-browser.c:2883 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:2787 +#: ../midori/midori-browser.c:2885 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:2790 +#: ../midori/midori-browser.c:2888 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:2793 ../midori/midori-browser.c:2796 +#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:2799 +#: ../midori/midori-browser.c:2897 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:2900 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:2805 +#: ../midori/midori-browser.c:2903 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:2808 +#: ../midori/midori-browser.c:2906 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2810 +#: ../midori/midori-browser.c:2908 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:2811 +#: ../midori/midori-browser.c:2909 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2813 +#: ../midori/midori-browser.c:2911 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:2814 +#: ../midori/midori-browser.c:2912 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2817 +#: ../midori/midori-browser.c:2915 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:2818 +#: ../midori/midori-browser.c:2916 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2821 +#: ../midori/midori-browser.c:2919 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:2823 +#: ../midori/midori-browser.c:2921 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2922 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:2836 +#: ../midori/midori-browser.c:2934 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:2839 +#: ../midori/midori-browser.c:2937 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:2842 +#: ../midori/midori-browser.c:2940 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:2844 ../midori/midori-view.c:1041 +#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:2845 +#: ../midori/midori-browser.c:2943 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:2847 +#: ../midori/midori-browser.c:2945 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:2848 +#: ../midori/midori-browser.c:2946 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:2852 +#: ../midori/midori-browser.c:2950 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:2854 +#: ../midori/midori-browser.c:2952 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:2857 +#: ../midori/midori-browser.c:2955 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2860 +#: ../midori/midori-browser.c:2958 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:2863 +#: ../midori/midori-browser.c:2961 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2865 +#: ../midori/midori-browser.c:2963 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:2866 +#: ../midori/midori-browser.c:2964 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:2868 ../midori/midori-view.c:1013 +#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:2869 +#: ../midori/midori-browser.c:2967 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:2873 ../panels/midori-bookmarks.c:218 +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:2874 +#: ../midori/midori-browser.c:2972 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:2876 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:2975 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:2881 +#: ../midori/midori-browser.c:2979 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:2882 +#: ../midori/midori-browser.c:2980 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:2884 +#: ../midori/midori-browser.c:2982 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:2983 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:2887 +#: ../midori/midori-browser.c:2985 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:2889 +#: ../midori/midori-browser.c:2987 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:2890 +#: ../midori/midori-browser.c:2988 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:2990 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:2893 +#: ../midori/midori-browser.c:2991 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:2895 +#: ../midori/midori-browser.c:2993 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:2896 +#: ../midori/midori-browser.c:2994 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:2899 +#: ../midori/midori-browser.c:2997 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3004 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:2907 +#: ../midori/midori-browser.c:3005 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3010 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:2913 +#: ../midori/midori-browser.c:3011 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:2916 +#: ../midori/midori-browser.c:3014 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:2917 +#: ../midori/midori-browser.c:3015 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:2920 +#: ../midori/midori-browser.c:3018 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3019 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:2924 +#: ../midori/midori-browser.c:3022 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:3023 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:3026 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:2929 +#: ../midori/midori-browser.c:3027 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:2932 +#: ../midori/midori-browser.c:3030 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:2933 +#: ../midori/midori-browser.c:3031 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3332 +#: ../midori/midori-browser.c:3436 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3443 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3445 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3469 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3367 +#: ../midori/midori-browser.c:3471 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3490 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:3503 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3505 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3414 ../midori/sokoke.c:735 +#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3416 +#: ../midori/midori-browser.c:3520 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3533 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3431 +#: ../midori/midori-browser.c:3535 msgid "Show a list of all open tabs" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3591 +#: ../midori/midori-browser.c:3697 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:3612 +#: ../midori/midori-browser.c:3722 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:3617 +#: ../midori/midori-browser.c:3727 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:3622 +#: ../midori/midori-browser.c:3732 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:3630 +#: ../midori/midori-browser.c:3740 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3639 +#: ../midori/midori-browser.c:3750 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4034 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:173 ../midori/midori-view.c:1774 +#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:174 ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:175 +#: ../midori/midori-websettings.c:177 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:192 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-websettings.c:191 +#: ../midori/midori-websettings.c:193 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-websettings.c:192 +#: ../midori/midori-websettings.c:194 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-websettings.c:193 +#: ../midori/midori-websettings.c:195 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-websettings.c:194 +#: ../midori/midori-websettings.c:196 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-websettings.c:195 ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 msgid "Custom..." msgstr "" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:212 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:213 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:214 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:229 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:230 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:231 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:232 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:248 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:249 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:248 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:266 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:267 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:307 +#: ../midori/midori-websettings.c:309 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:308 +#: ../midori/midori-websettings.c:310 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:318 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:319 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:327 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:328 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:353 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:354 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:363 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:364 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:372 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:373 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:382 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:383 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:391 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:392 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:400 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:401 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:409 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:410 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:418 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:419 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:428 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:427 +#: ../midori/midori-websettings.c:429 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:445 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:446 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:454 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:455 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:463 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:464 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:489 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:490 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:500 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:515 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:516 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:524 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:525 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:533 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:534 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:542 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:543 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:551 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:552 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:560 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:561 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:571 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:572 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:580 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:581 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:590 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:591 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:601 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:602 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:615 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:616 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:624 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:625 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:633 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:634 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:642 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:643 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:694 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:695 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:687 +#: ../midori/midori-websettings.c:705 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:706 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:719 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:720 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:728 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:729 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:739 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:740 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:748 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:749 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:757 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:758 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:766 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:767 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:777 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:778 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:779 +#: ../midori/midori-websettings.c:797 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:798 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:818 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:819 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:839 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:840 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:834 +#: ../midori/midori-websettings.c:852 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:853 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:616 +#: ../midori/midori-view.c:629 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:924 +#: ../midori/midori-view.c:959 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:926 +#: ../midori/midori-view.c:961 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:943 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:953 +#: ../midori/midori-view.c:988 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:996 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:983 +#: ../midori/midori-view.c:1018 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:992 +#: ../midori/midori-view.c:1027 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1466 +#: ../midori/midori-view.c:1501 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1617 +#: ../midori/midori-view.c:1654 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1641 +#: ../midori/midori-view.c:1678 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1657 +#: ../midori/midori-view.c:1694 #, c-format msgid "No documentation installed" msgstr "" @@ -1302,7 +1318,7 @@ msgstr "" msgid "days" msgstr "" -#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:103 +#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 msgid "History" msgstr "" @@ -1310,27 +1326,27 @@ msgstr "" msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:809 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:809 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:837 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:881 +#: ../midori/midori-searchaction.c:883 msgid "_Icon:" msgstr "" -#: ../midori/midori-searchaction.c:895 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1072 +#: ../midori/midori-searchaction.c:1074 msgid "Manage Search Engines" msgstr "" @@ -1422,19 +1438,23 @@ msgstr "" msgid "_Disable" msgstr "" -#: ../panels/midori-bookmarks.c:102 +#: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "" -#: ../panels/midori-bookmarks.c:226 +#: ../panels/midori-bookmarks.c:236 msgid "Edit the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:234 +#: ../panels/midori-bookmarks.c:244 msgid "Delete the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:566 +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:589 msgid "Separator" msgstr "" @@ -1446,37 +1466,37 @@ msgstr "" msgid "Extensions" msgstr "" -#: ../panels/midori-history.c:158 +#: ../panels/midori-history.c:159 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../panels/midori-history.c:215 +#: ../panels/midori-history.c:216 msgid "Bookmark the selected history item" msgstr "" -#: ../panels/midori-history.c:224 +#: ../panels/midori-history.c:225 msgid "Delete the selected history item" msgstr "" -#: ../panels/midori-history.c:232 +#: ../panels/midori-history.c:233 msgid "Clear the entire history" msgstr "" -#: ../panels/midori-history.c:602 +#: ../panels/midori-history.c:603 #, c-format msgid "A week ago" msgstr "" -#: ../panels/midori-history.c:608 +#: ../panels/midori-history.c:609 #, c-format msgid "%d days ago" msgstr "" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:616 msgid "Today" msgstr "" -#: ../panels/midori-history.c:617 +#: ../panels/midori-history.c:618 msgid "Yesterday" msgstr "" From c150b311c17826d6f21ca688f7fa8870b2b0d617 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:32:43 +0100 Subject: [PATCH 0802/2970] Update German translation --- po/de.po | 912 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 481 insertions(+), 431 deletions(-) diff --git a/po/de.po b/po/de.po index 1c63dfc1..2e514bf4 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-01 19:06+0100\n" +"POT-Creation-Date: 2009-02-22 19:30+0100\n" "PO-Revision-Date: 2009-02-01 19:56+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 -#: ../midori/main.c:2065 ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 +#: ../midori/main.c:1714 ../midori/main.c:1725 +#: ../midori/midori-websettings.c:265 msgid "Midori" msgstr "Midori" @@ -31,1395 +31,1387 @@ msgstr "Midori" msgid "Web Browser" msgstr "Netznavigator" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "_Lesezeichen" - -#: ../midori/main.c:91 ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "_Lesezeichen" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "Lesezeichen _hinzufügen" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "_Konsole" - -#: ../midori/main.c:94 -msgid "_Extensions" -msgstr "_Erweiterungen" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "_Verlauf" - -#: ../midori/main.c:96 -msgid "_Homepage" -msgstr "_Startseite" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "_Benutzerskripte" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "Benutzer_stile" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "Neuer _Reiter" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "Über_tragungen" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "_Geschlossene Reiter und Fenster" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "Neues _Fenster" - -#: ../midori/main.c:158 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:213 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:220 ../midori/main.c:290 +#: ../midori/main.c:168 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:532 +#: ../midori/main.c:480 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:488 ../midori/main.c:497 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/main.c:571 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:603 +#: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 +#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:962 +#: ../midori/main.c:910 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:991 +#: ../midori/main.c:939 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1121 ../midori/sokoke.c:531 +#: ../midori/main.c:1069 ../midori/sokoke.c:580 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 +#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 ../midori/main.c:1245 +#: ../midori/main.c:1169 ../midori/main.c:1193 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "Übertragungen" -#: ../midori/main.c:1312 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "Authentifizierung erforderlich" - -#: ../midori/main.c:1652 +#: ../midori/main.c:1401 msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" -"Ein Benutzername und ein Kennwort\n" -"werden zum Öffnen dieses Ortes benötigt:" - -#: ../midori/main.c:1666 -msgid "Username" -msgstr "Benutzername" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "Kennwort" - -#: ../midori/main.c:1783 -msgid "" -"Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1798 +#: ../midori/main.c:1416 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1802 +#: ../midori/main.c:1420 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1807 +#: ../midori/main.c:1425 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1950 +#: ../midori/main.c:1599 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1982 ../midori/gjs.c:514 +#: ../midori/main.c:1631 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:2005 +#: ../midori/main.c:1654 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:2007 +#: ../midori/main.c:1656 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:2009 +#: ../midori/main.c:1658 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:2053 +#: ../midori/main.c:1702 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:2077 +#: ../midori/main.c:1726 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:2079 +#: ../midori/main.c:1728 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:2106 +#: ../midori/main.c:1755 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:2184 +#: ../midori/main.c:1823 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:2196 +#: ../midori/main.c:1835 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:2211 +#: ../midori/main.c:1850 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2224 +#: ../midori/main.c:1863 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2237 +#: ../midori/main.c:1876 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:2249 +#: ../midori/main.c:1888 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:2265 +#: ../midori/main.c:1904 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:2931 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:333 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:358 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:534 +msgid "New folder" +msgstr "Neuer Ordner" + +#: ../midori/midori-browser.c:534 +msgid "Edit folder" +msgstr "Ordner bearbeiten" + +#: ../midori/midori-browser.c:536 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:536 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:566 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 +#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:616 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:733 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1340 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:788 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:790 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "Vor einer Woche" - -#: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "vor %d Tagen" - -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "Heute" - -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "Gestern" - -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:2674 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:2682 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:2859 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:2862 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:2865 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:2868 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:2871 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:2873 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:2874 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:2876 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:2877 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:2880 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:2883 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:2885 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:2888 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:2897 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:2900 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:2903 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:2906 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:2908 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:2909 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:2911 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:2912 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:2915 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:2916 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:2919 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:2921 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:2922 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:2934 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:2937 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:2940 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:2943 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:2945 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:2946 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:2950 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:2952 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:2955 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:2958 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:2961 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:2963 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:2964 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:2967 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "Ausgewählten Verlaufseintrag löschen" - -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "Den gesamten Verlauf löschen" - -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:2972 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:2975 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:2979 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:2980 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:2982 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:2983 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:2985 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:2987 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:2988 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:2990 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:2991 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:2993 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:2994 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:2997 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3004 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3005 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3010 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3011 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3014 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3015 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3018 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3019 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3022 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3023 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3026 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3027 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:3030 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3031 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3436 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:3443 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3445 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3469 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3471 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:3490 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:3503 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:3505 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +msgid "_Bookmarks" +msgstr "_Lesezeichen" + +#: ../midori/midori-browser.c:3520 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3533 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3535 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 -msgid "History" -msgstr "Verlauf" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:3697 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:3722 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4076 +#: ../midori/midori-browser.c:3727 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:3732 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:3740 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:3750 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:4034 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +msgid "Align sidepanel on the right" +msgstr "Seitenleiste rechts anordnen" + +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +msgid "Whether to align the sidepanel on the right" +msgstr "Die Seitenleiste auf der rechten Seite anordnen" + +#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:177 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:192 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:193 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:194 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:195 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:196 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:212 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:213 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:214 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:229 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:230 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:231 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:232 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:233 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:248 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:249 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:266 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:267 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:268 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:309 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:310 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:318 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:319 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:327 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:328 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:353 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:354 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:363 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:364 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:372 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:373 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:382 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:383 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:391 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:392 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:400 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:401 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:409 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:410 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:418 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:419 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:428 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:429 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:445 +msgid "Show progress in location entry" +msgstr "Fortschritt im Adressfeld anzeigen" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show loading progress in the location entry" +msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" + +#: ../midori/midori-websettings.c:454 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:455 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:463 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:464 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:489 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:490 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:500 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:515 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:516 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:524 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:525 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:533 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:534 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:542 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:543 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:551 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:552 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:560 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:561 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:571 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:572 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:580 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:581 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:590 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:591 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:601 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:602 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:615 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:616 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:624 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:625 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:633 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:634 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:642 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:643 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:694 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:695 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:705 msgid "Accept cookies" msgstr "Profildateien annehmen" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:706 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:719 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:720 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:728 msgid "Maximum cookie age" msgstr "Maximales Alter von Profildateien" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:729 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:739 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:740 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:748 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:749 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:757 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:758 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:766 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:767 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:777 msgid "Proxy Server" msgstr "Zwischenrechner" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:778 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" +#: ../midori/midori-websettings.c:797 +msgid "Detect proxy server automatically" +msgstr "Zwischenrechner automatisch erkennen" + +#: ../midori/midori-websettings.c:798 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Zwischenrechner automatisch über die Umgebung erkennen" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:818 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:819 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Netz identifiziert werden soll" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:839 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:840 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:852 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:853 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#: ../midori/midori-view.c:629 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:959 +msgid "Open _Link" +msgstr "Verweis ö_ffnen" + +#: ../midori/midori-view.c:961 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Window" +msgstr "Verweis in neuem _Fenster öffnen" + +#: ../midori/midori-view.c:988 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:996 msgid "_Download Link destination" -msgstr "Verweisziel _herunterladen" +msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:1018 +msgid "_Search the Web" +msgstr "Im Netz _suchen" + +#: ../midori/midori-view.c:1027 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1501 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1654 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:1678 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:1694 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-preferences.c:91 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "Programmstart" #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:462 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" msgstr "Einzelne Bilder automatisch angemessen verkleinern" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:484 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:485 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" msgstr "Eingebettete Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" msgstr "Erzwinge 96 Punkte pro Zoll" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" msgstr "Erzwinge eine Punktdichte von 96 DPI" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:515 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:516 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:525 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:590 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:597 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:604 msgid "Web Cookies" msgstr "Netzprofile" -#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 msgid "days" msgstr "Tage" +#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +msgid "History" +msgstr "Verlauf" + #: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:820 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:864 -msgid "_Icon (name or file):" -msgstr "_Symbol (Name oder Datei):" +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:878 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1055 +#: ../midori/midori-searchaction.c:1074 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:403 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" +#: ../midori/sokoke.c:734 +msgid "_Bookmark" +msgstr "_Lesezeichen" + +#: ../midori/sokoke.c:736 +msgid "_Add Bookmark" +msgstr "Lesezeichen _hinzufügen" + +#: ../midori/sokoke.c:737 +msgid "_Console" +msgstr "_Konsole" + +#: ../midori/sokoke.c:738 +msgid "_Extensions" +msgstr "_Erweiterungen" + +#: ../midori/sokoke.c:739 +msgid "_History" +msgstr "_Verlauf" + +#: ../midori/sokoke.c:740 +msgid "_Homepage" +msgstr "_Startseite" + +#: ../midori/sokoke.c:741 +msgid "_Userscripts" +msgstr "_Benutzerskripte" + +#: ../midori/sokoke.c:742 +msgid "User_styles" +msgstr "Benutzer_stile" + +#: ../midori/sokoke.c:743 +msgid "New _Tab" +msgstr "Neuer _Reiter" + +#: ../midori/sokoke.c:744 +msgid "_Transfers" +msgstr "Über_tragungen" + +#: ../midori/sokoke.c:745 +msgid "_Closed Tabs and Windows" +msgstr "_Geschlossene Reiter und Fenster" + +#: ../midori/sokoke.c:746 +msgid "New _Window" +msgstr "Neues _Fenster" + #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1451,19 +1443,23 @@ msgstr "_Einschalten" msgid "_Disable" msgstr "_Auschalten" -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:236 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:244 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "Einen neuen Ordner hinzufügen" + +#: ../panels/midori-bookmarks.c:589 msgid "Separator" msgstr "Trennlinie" @@ -1475,10 +1471,64 @@ msgstr "Konsole" msgid "Extensions" msgstr "Erweiterungen" +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "Ausgewählten Verlaufseintrag löschen" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "Den gesamten Verlauf löschen" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "Vor einer Woche" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "vor %d Tagen" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "Heute" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "Gestern" + #: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "Zusatzmodule" +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "Authentifizierung erforderlich" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Ein Benutzername und ein Kennwort\n" +"werden zum Öffnen dieses Ortes benötigt:" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "Benutzername" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "Kennwort" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" From 791c3ecaae350c970badec0a26efb0f498d374a1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 19:54:00 +0100 Subject: [PATCH 0803/2970] Update French translation --- po/fr.po | 954 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 511 insertions(+), 443 deletions(-) diff --git a/po/fr.po b/po/fr.po index b3c05bca..bdf8a62d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-19 22:22+0100\n" +"POT-Creation-Date: 2009-02-22 19:30+0100\n" "PO-Revision-Date: 2009-01-22 03:07+0100\n" "Last-Translator: Christian Dywan 2008\n" "Language-Team: French \n" @@ -18,1416 +18,1408 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../midori.desktop.in.h:2 ../midori/main.c:1864 ../midori/main.c:1966 -#: ../midori/main.c:1975 ../midori/main.c:1986 -#: ../midori/midori-websettings.c:239 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 +#: ../midori/main.c:1714 ../midori/main.c:1725 +#: ../midori/midori-websettings.c:265 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:88 -msgid "_Bookmark" -msgstr "_Signet" - -#: ../midori/main.c:89 ../midori/midori-browser.c:3821 -msgid "_Bookmarks" -msgstr "_Signets" - -#: ../midori/main.c:90 -msgid "_Add Bookmark" -msgstr "_Ajouter un signet" - -#: ../midori/main.c:91 -msgid "_Console" -msgstr "_Console" - -#: ../midori/main.c:92 -msgid "_Extensions" -msgstr "_Extensions" - -#: ../midori/main.c:93 -msgid "_History" -msgstr "_Historique" - -#: ../midori/main.c:94 -msgid "_Homepage" -msgstr "_Page d'accueil" - -#: ../midori/main.c:95 -msgid "_Userscripts" -msgstr "Scripts _utilisateur" - -#: ../midori/main.c:96 -msgid "User_styles" -msgstr "_Styles utilisateur" - -#: ../midori/main.c:97 -msgid "New _Tab" -msgstr "Nouvel _onglet" - -#: ../midori/main.c:98 -msgid "_Transfers" -msgstr "_Transferts" - -#: ../midori/main.c:99 -msgid "_Closed Tabs and Windows" -msgstr "Onglets et fenêtres _fermés" - -#: ../midori/main.c:100 -msgid "New _Window" -msgstr "Nouvelle _fenêtre" - -#: ../midori/main.c:156 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée: %s\n" -#: ../midori/main.c:211 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:218 ../midori/main.c:288 +#: ../midori/main.c:168 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:530 +#: ../midori/main.c:480 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/main.c:538 ../midori/main.c:547 +#: ../midori/main.c:488 ../midori/main.c:497 msgid "Malformed document." msgstr "Document mal formé" -#: ../midori/main.c:569 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" msgstr "Échec d'ouvrir la banque de données: %s\n" -#: ../midori/main.c:601 +#: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Échec d'exécuter une intruction de la banque de données: %s\n" -#: ../midori/main.c:655 +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:679 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "Échec de vider l'historique: %s\n" -#: ../midori/main.c:712 ../midori/main.c:726 +#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:839 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:867 +#: ../midori/main.c:910 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:895 ../midori/main.c:913 +#: ../midori/main.c:939 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1043 ../midori/sokoke.c:531 +#: ../midori/main.c:1069 ../midori/sokoke.c:580 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/main.c:1064 ../midori/main.c:1091 ../midori/main.c:1119 +#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1143 ../midori/main.c:1167 +#: ../midori/main.c:1169 ../midori/main.c:1193 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1188 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "Transferts" -#: ../midori/main.c:1229 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1553 -msgid "Authentication Required" -msgstr "Authentification obligatoire" - -#: ../midori/main.c:1569 +#: ../midori/main.c:1401 msgid "" -"A username and a password are required\n" -"to open this location:" +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1583 -msgid "Username" -msgstr "Nom d'utilisateur" - -#: ../midori/main.c:1594 -msgid "Password" -msgstr "Mot de passe" - -#: ../midori/main.c:1700 -msgid "" -"Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." -msgstr "" - -#: ../midori/main.c:1715 +#: ../midori/main.c:1416 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1719 +#: ../midori/main.c:1420 msgid "Reset the last _session" msgstr "Réinitialiser la dernière session" -#: ../midori/main.c:1724 +#: ../midori/main.c:1425 msgid "Disable all _extensions" msgstr "Désactiver tout les _extensions" -#: ../midori/main.c:1864 +#: ../midori/main.c:1599 msgid "No filename specified" msgstr "Aucun nom de fichier indiqué" -#: ../midori/main.c:1896 ../midori/gjs.c:514 +#: ../midori/main.c:1631 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Une erreur inconnu est survenue." -#: ../midori/main.c:1919 +#: ../midori/main.c:1654 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1921 +#: ../midori/main.c:1656 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1923 +#: ../midori/main.c:1658 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1963 +#: ../midori/main.c:1702 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1987 +#: ../midori/main.c:1726 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1989 +#: ../midori/main.c:1728 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:2016 +#: ../midori/main.c:1755 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:2079 +#: ../midori/main.c:1823 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" + +#: ../midori/main.c:1835 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés: %s\n" -#: ../midori/main.c:2094 +#: ../midori/main.c:1850 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:2107 +#: ../midori/main.c:1863 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée: %s\n" # pas très content -#: ../midori/main.c:2120 +#: ../midori/main.c:1876 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargée. %s\n" -#: ../midori/main.c:2132 +#: ../midori/main.c:1888 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:2148 +#: ../midori/main.c:1904 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-browser.c:248 ../midori/midori-browser.c:3186 -#: ../midori/midori-browser.c:3192 +#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:2931 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:260 ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:318 +#: ../midori/midori-browser.c:333 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:341 +#: ../midori/midori-browser.c:358 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:534 +msgid "New folder" +msgstr "Nouveau répertoire" + +#: ../midori/midori-browser.c:534 +msgid "Edit folder" +msgstr "Modifier le répertoire" + +#: ../midori/midori-browser.c:536 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:536 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:528 +#: ../midori/midori-browser.c:566 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:541 ../midori/midori-searchaction.c:834 +#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:560 ../midori/midori-searchaction.c:848 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:616 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:583 ../midori/midori-browser.c:619 +#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:712 +#: ../midori/midori-browser.c:733 msgid "Save file as" msgstr "Enregistrer fichier dans" -#: ../midori/midori-browser.c:1301 +#: ../midori/midori-browser.c:1340 msgid "Open file" msgstr "Ouvrir fichier" -#: ../midori/midori-browser.c:2500 +#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:788 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2502 +#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:790 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2677 -msgid "Separator" -msgstr "Séparateur" - -#: ../midori/midori-browser.c:2784 -#, c-format -msgid "A week ago" -msgstr "Avant une semaine" - -#: ../midori/midori-browser.c:2790 -#, c-format -msgid "%d days ago" -msgstr "Avant %d jours" - -#: ../midori/midori-browser.c:2797 -msgid "Today" -msgstr "Aujourd'hui" - -#: ../midori/midori-browser.c:2799 -msgid "Yesterday" -msgstr "Hier" - -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:2674 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2896 +#: ../midori/midori-browser.c:2682 msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" "Robert-André Mauchin " -#: ../midori/midori-browser.c:3029 -msgid "Are you sure you want to remove all history items?" -msgstr "" - -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:2859 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:2862 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:2865 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:2868 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:2871 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:2873 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:2874 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:2876 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:2877 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:2880 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:2883 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:2885 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:2888 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3152 ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:2897 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:2900 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:2903 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:2906 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:2908 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:2909 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:2911 msgid "Find _Previous" msgstr "Réchercher le _précédant" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:2912 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:2915 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:2916 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou d'une phrase" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:2919 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:2921 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:2922 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3195 +#: ../midori/midori-browser.c:2934 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3198 +#: ../midori/midori-browser.c:2937 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:2940 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3203 ../midori/midori-view.c:979 +#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:2943 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:2945 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:2946 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:2950 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:2952 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:2955 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:2958 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:2961 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:2963 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:2964 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3227 ../midori/midori-view.c:951 +#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:2967 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3235 -msgid "Edit the selected bookmark" -msgstr "Modifier le signet sélectionné" - -#: ../midori/midori-browser.c:3238 -msgid "Delete the selected bookmark" -msgstr "Supprimer le signet sélectionné" - -#: ../midori/midori-browser.c:3241 -msgid "Delete the selected history item" -msgstr "Supprimer l'element sélectionné de la historique" - -#: ../midori/midori-browser.c:3244 -msgid "Clear the entire history" -msgstr "Vider l'historique entier" - -#: ../midori/midori-browser.c:3247 -msgid "Bookmark the selected history item" -msgstr "Ajouter un signet pour l'element sélectionné de la historique" - -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:2972 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3251 ../midori/midori-searchaction.c:462 +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:2975 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:2979 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:2980 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:2982 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:2983 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:2985 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:2987 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:2988 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:2990 msgid "_Frequent Questions" msgstr "_Questions couramment" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:2991 msgid "Show the Frequently Asked Questions" msgstr "Afficher les foire aux questions" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:2993 msgid "_Report a Bug" msgstr "_Adviser un problème" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:2994 msgid "Open Midori's bug tracker" msgstr "Ouvrir le persécuteur de problèmes de Midori" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:2997 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3004 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3282 +#: ../midori/midori-browser.c:3005 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3287 +#: ../midori/midori-browser.c:3010 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3288 +#: ../midori/midori-browser.c:3011 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3291 +#: ../midori/midori-browser.c:3014 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3015 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3018 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3296 +#: ../midori/midori-browser.c:3019 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3299 +#: ../midori/midori-browser.c:3022 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:3300 +#: ../midori/midori-browser.c:3023 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3303 +#: ../midori/midori-browser.c:3026 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3027 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3307 +#: ../midori/midori-browser.c:3030 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3031 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3436 +msgid "_Separator" +msgstr "_Séparateur" + +#: ../midori/midori-browser.c:3443 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3445 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3772 +#: ../midori/midori-browser.c:3469 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3774 +#: ../midori/midori-browser.c:3471 msgid "Run a web search" msgstr "Lance une recherche toile" -#: ../midori/midori-browser.c:3793 +#: ../midori/midori-browser.c:3490 msgid "Reopen a previously closed tab or window" msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" -#: ../midori/midori-browser.c:3806 +#: ../midori/midori-browser.c:3503 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3808 +#: ../midori/midori-browser.c:3505 msgid "Reopen pages that you visited earlier" msgstr "Réouvre des pages déjà visitées" -#: ../midori/midori-browser.c:3823 +#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +msgid "_Bookmarks" +msgstr "_Signets" + +#: ../midori/midori-browser.c:3520 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauveguardées" -#: ../midori/midori-browser.c:3836 +#: ../midori/midori-browser.c:3533 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3838 +#: ../midori/midori-browser.c:3535 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" -#: ../midori/midori-browser.c:3961 ../midori/midori-preferences.c:593 -msgid "History" -msgstr "Historique" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:3697 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:3722 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:3727 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4039 +#: ../midori/midori-browser.c:3732 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4047 +#: ../midori/midori-browser.c:3740 msgid "Highlight Matches" msgstr "Marquer les résultats" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:3750 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4034 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:191 ../midori/midori-panel.c:192 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +msgid "Align sidepanel on the right" +msgstr "Arranger le panneau à droite" + +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +msgid "Whether to align the sidepanel on the right" +msgstr "Indique s'il faut arranger le panneau sur la droite" + +#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:149 ../midori/midori-view.c:1708 +#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:150 ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-websettings.c:177 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:166 +#: ../midori/midori-websettings.c:192 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-websettings.c:167 +#: ../midori/midori-websettings.c:193 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:194 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:195 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:196 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:171 ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:212 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:213 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:214 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:229 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:230 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:231 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:232 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:233 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:248 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:249 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:224 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:266 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:267 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:268 msgid "Internet Explorer" msgstr "Explorateur Internet" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:309 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:310 msgid "Whether to save the last window size" msgstr "Enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:318 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:319 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:327 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:328 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:353 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:354 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:363 msgid "Last panel page" msgstr "Dernière page de panneau" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:364 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:372 msgid "Last Web search" msgstr "Dernière recherche toile" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:373 msgid "The last saved Web search" msgstr "La dernière recherche toile enregistrée" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:382 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:383 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:391 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:392 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:400 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:401 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:409 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:410 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:418 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:419 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:428 msgid "Toolbar Style" msgstr "Style de barre d'outils" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:429 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:445 +msgid "Show progress in location entry" +msgstr "Afficher le progrès dans le champ d'adresse" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show loading progress in the location entry" +msgstr "Indique s'il faut afficher le progrès dans le champ d'adresse" + +#: ../midori/midori-websettings.c:454 msgid "Toolbar Items" msgstr "Elements de la barre d'outils" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:455 msgid "The items to show on the toolbar" msgstr "Les elements pour afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:463 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:464 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau compact" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:489 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:490 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:500 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:515 msgid "Show crash dialog" msgstr "Afficher dialogue de panne" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:516 msgid "Show a dialog after Midori crashed" msgstr "Afficher un dialogue en cas d'une panne" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:524 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:525 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:533 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:534 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:542 msgid "Text Editor" msgstr "Editeur texte" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:543 msgid "An external text editor" msgstr "Un editeur texte externe" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:551 msgid "Location entry Search" msgstr "Recherche de barre d'adresse" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:552 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:560 msgid "Preferred Encoding" msgstr "Codage favori" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:561 msgid "The preferred character encoding" msgstr "Codage des caractères favori" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:571 msgid "Always Show Tabbar" msgstr "Toujours afficher barre d'onglets" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:572 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:580 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:581 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:590 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:591 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:601 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:602 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:615 msgid "Middle click opens Selection" msgstr "Clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:616 msgid "Load an address from the selection via middle click" -msgstr "Charger l'addresse sous la sélection avec le bouton central de la souris" +msgstr "" +"Charger l'addresse sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:624 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:550 +#: ../midori/midori-websettings.c:625 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:633 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:634 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:642 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:643 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:694 msgid "Zoom Text and Images" msgstr "Agrandir texte et images" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:695 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir texte et images" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:705 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:706 msgid "What type of cookies to accept" msgstr "Type de témoins à accepter" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:719 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:720 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:728 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:729 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:739 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:740 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:673 +#: ../midori/midori-websettings.c:748 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:749 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:757 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:758 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:766 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:767 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:777 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:778 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire pour les connexions HTTP" +#: ../midori/midori-websettings.c:797 +msgid "Detect proxy server automatically" +msgstr "Reconnaître serveur mandateire automatiquement" + +#: ../midori/midori-websettings.c:798 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Indique s'il faut reconnaître serveur mandateire automatiquement" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:818 msgid "Identify as" msgstr "Identifier comme" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:819 msgid "What to identify as to web pages" msgstr "Comme s'identifier a pages toiles" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:839 msgid "Identification string" msgstr "Indicatif de l'application" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:840 msgid "The application identification string" msgstr "L'indicatif de l'application" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:852 msgid "Cache size" msgstr "Taille de l'antémémoire" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:853 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:603 +#: ../midori/midori-view.c:629 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:883 +#: ../midori/midori-view.c:959 +msgid "Open _Link" +msgstr "Ouvrir _lien" + +#: ../midori/midori-view.c:961 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:906 +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Window" +msgstr "Ouvrir le lien dans une nouvelle _fenêtre" + +#: ../midori/midori-view.c:988 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:914 +#: ../midori/midori-view.c:996 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:936 +#: ../midori/midori-view.c:1018 +msgid "_Search the Web" +msgstr "_Chercher sur la toile" + +#: ../midori/midori-view.c:1027 msgid "Open Address in New _Tab" msgstr "Ouvrir adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1406 +#: ../midori/midori-view.c:1501 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1555 +#: ../midori/midori-view.c:1654 msgid "Source" msgstr "Source" -#: ../midori/midori-view.c:1579 +#: ../midori/midori-view.c:1678 #, c-format msgid "Document cannot be displayed" msgstr "Ne peut pas afficher le document" -#: ../midori/midori-view.c:1595 +#: ../midori/midori-view.c:1694 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installé" -#: ../midori/midori-preferences.c:91 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "Préférences de %s" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "Démarrage" #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" msgstr "La taille de police utilisé pour afficher texte par défaut" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "Taille minimum de police" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" msgstr "La taille minimum de police utilisé pour afficher texte" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:462 msgid "Encoding" msgstr "Codage" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" msgstr "Codage des caractères par défaut" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" msgstr "Diminuer les images automatiquement" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" msgstr "Diminuer convenablement les images automatiquement" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:484 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:485 msgid "Whether background images should be printed" -msgstr "" +msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" msgstr "On peut agrandir champs de texte" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" msgstr "Indique s'il faut agrandir champs de texte" -#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Activer scripts" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Activer greffons" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" msgstr "" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" msgstr "Forcer une résolution de 96 DPI" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "Activer les outils développeur" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:515 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:516 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:525 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:538 ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:590 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:568 +#: ../midori/midori-preferences.c:597 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:604 msgid "Web Cookies" msgstr "Témoins de toile" -#: ../midori/midori-preferences.c:588 ../midori/midori-preferences.c:600 +#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 msgid "days" msgstr "jours" -#: ../midori/midori-searchaction.c:453 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +msgid "History" +msgstr "Historique" + +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:790 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:818 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:862 -msgid "_Icon (name or file):" -msgstr "_Icône (nom ou fichier) :" +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "_Icône :" -#: ../midori/midori-searchaction.c:876 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchaction.c:1053 +#: ../midori/midori-searchaction.c:1074 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:403 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous êtes connecté en tant que superutilisateur !" +#: ../midori/sokoke.c:734 +msgid "_Bookmark" +msgstr "_Signet" + +#: ../midori/sokoke.c:736 +msgid "_Add Bookmark" +msgstr "_Ajouter un signet" + +#: ../midori/sokoke.c:737 +msgid "_Console" +msgstr "_Console" + +#: ../midori/sokoke.c:738 +msgid "_Extensions" +msgstr "_Extensions" + +#: ../midori/sokoke.c:739 +msgid "_History" +msgstr "_Historique" + +#: ../midori/sokoke.c:740 +msgid "_Homepage" +msgstr "_Page d'accueil" + +#: ../midori/sokoke.c:741 +msgid "_Userscripts" +msgstr "Scripts _utilisateur" + +#: ../midori/sokoke.c:742 +msgid "User_styles" +msgstr "_Styles utilisateur" + +#: ../midori/sokoke.c:743 +msgid "New _Tab" +msgstr "Nouvel _onglet" + +#: ../midori/sokoke.c:744 +msgid "_Transfers" +msgstr "_Transferts" + +#: ../midori/sokoke.c:745 +msgid "_Closed Tabs and Windows" +msgstr "Onglets et fenêtres _fermés" + +#: ../midori/sokoke.c:746 +msgid "New _Window" +msgstr "Nouvelle _fenêtre" + #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1459,10 +1451,26 @@ msgstr "_Activer" msgid "_Disable" msgstr "_Désactiver" -#: ../panels/midori-bookmarks.c:89 +#: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Signets" +#: ../panels/midori-bookmarks.c:236 +msgid "Edit the selected bookmark" +msgstr "Modifier le signet sélectionné" + +#: ../panels/midori-bookmarks.c:244 +msgid "Delete the selected bookmark" +msgstr "Supprimer le signet sélectionné" + +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "Ajouter un nouveau répertoire" + +#: ../panels/midori-bookmarks.c:589 +msgid "Separator" +msgstr "Séparateur" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Console" @@ -1471,10 +1479,62 @@ msgstr "Console" msgid "Extensions" msgstr "Extensions" -#: ../panels/midori-plugins.c:86 ../extensions/statusbar-features.c:52 +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "Ajouter un signet pour l'element sélectionné de la historique" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "Supprimer l'element sélectionné de la historique" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "Vider l'historique entier" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "Avant une semaine" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "Avant %d jours" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "Aujourd'hui" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "Hier" + +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "Greffons" +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "Authentification obligatoire" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "Mot de passe" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1502,12 +1562,20 @@ msgstr "Choisissez un fichier" msgid "Choose folder" msgstr "Choisissez un répertoire" +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Gestes de souris" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Contrôler Midori par mouevements de la souris" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "Cadre de pages" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "C_adre de pages" From 1d8de6e72d29d687b7196589f0dd51b99c4e5f07 Mon Sep 17 00:00:00 2001 From: Johannes Reinhardt Date: Sun, 22 Feb 2009 22:39:08 +0100 Subject: [PATCH 0804/2970] Fix #ifdefs for building without libxml or sqlite --- AUTHORS | 1 + midori/main.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/AUTHORS b/AUTHORS index 696c7c92..07d8aedb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,6 +14,7 @@ Contributors: Brian Vuyk Nick Schermer Matthias Kruk + Johannes Reinhardt Graphics: extension: Nancy Runge diff --git a/midori/main.c b/midori/main.c index 7306628d..721ce469 100644 --- a/midori/main.c +++ b/midori/main.c @@ -44,12 +44,12 @@ #include #include -#ifdef HAVE_LIBXML +#if HAVE_LIBXML #include #include #endif -#ifdef HAVE_SQLITE +#if HAVE_SQLITE #include #endif @@ -323,7 +323,7 @@ search_engines_save_to_file (KatzeArray* search_engines, return saved; } -#ifdef HAVE_LIBXML +#if HAVE_LIBXML static KatzeItem* katze_item_from_xmlNodePtr (xmlNodePtr cur) { @@ -502,7 +502,7 @@ katze_array_from_file (KatzeArray* array, } #endif -#ifdef HAVE_SQLITE +#if HAVE_SQLITE /* Open database 'dbname' */ static sqlite3* db_open (const char* dbname, @@ -1679,7 +1679,7 @@ main (int argc, #if HAVE_LIBSOUP_2_25_2 SoupCookieJar* jar; #endif - #ifdef HAVE_SQLITE + #if HAVE_SQLITE sqlite3* db; gint max_history_age; #endif @@ -1825,7 +1825,7 @@ main (int argc, g_error_free (error); } bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - #ifdef HAVE_LIBXML + #if HAVE_LIBXML katze_assign (config_file, build_config_filename ("bookmarks.xbel")); error = NULL; if (!katze_array_from_file (bookmarks, config_file, &error)) @@ -1837,7 +1837,7 @@ main (int argc, } #endif _session = katze_array_new (KATZE_TYPE_ITEM); - #ifdef HAVE_LIBXML + #if HAVE_LIBXML g_object_get (settings, "load-on-startup", &load_on_startup, NULL); if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) { @@ -1853,7 +1853,7 @@ main (int argc, } #endif trash = katze_array_new (KATZE_TYPE_ITEM); - #ifdef HAVE_LIBXML + #if HAVE_LIBXML katze_assign (config_file, build_config_filename ("tabtrash.xbel")); error = NULL; if (!katze_array_from_file (trash, config_file, &error)) @@ -1864,11 +1864,11 @@ main (int argc, g_error_free (error); } #endif - #ifdef HAVE_SQLITE + #if HAVE_SQLITE katze_assign (config_file, build_config_filename ("history.db")); #endif history = katze_array_new (KATZE_TYPE_ARRAY); - #ifdef HAVE_SQLITE + #if HAVE_SQLITE error = NULL; if ((db = midori_history_initialize (history, config_file, &error)) == NULL) { @@ -2019,7 +2019,7 @@ main (int argc, g_signal_connect_after (trash, "remove-item", G_CALLBACK (midori_trash_remove_item_cb), NULL); } - #ifdef HAVE_SQLITE + #if HAVE_SQLITE katze_assign (config_file, build_config_filename ("history.db")); if (is_writable (config_file)) { @@ -2064,7 +2064,7 @@ main (int argc, gtk_main (); - #ifdef HAVE_SQLITE + #if HAVE_SQLITE settings = katze_object_get_object (app, "settings"); g_object_get (settings, "maximum-history-age", &max_history_age, NULL); midori_history_terminate (db, max_history_age); From 5e14715d2faaf5dfcb9fcdfc970d591fe98f3aa4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 23:17:36 +0100 Subject: [PATCH 0805/2970] Print actual libSoup version if found, otherwise required versions --- wscript | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 55b8f85a..55ae29f7 100644 --- a/wscript +++ b/wscript @@ -226,8 +226,18 @@ def configure (conf): if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') Utils.pprint ('RED', 'Please use an older or newer version.') - print "Icons, Source, Save: " + libsoup + " (libSoup 2.23.1)" - print "Persistent cookies: " + libsoup_25_2 + " (libSoup 2.25.2)" + Utils.pprint ('WHITE', 'Icons, Source, Save: ' + libsoup + ' (libSoup ', sep='') + if (libsoup == 'yes'): + Utils.pprint ('GREEN', conf.check_cfg (modversion='libsoup-2.4'), sep='') + else: + Utils.pprint ('RED', '2.23.1', sep='') + print ")" + Utils.pprint ('WHITE', 'Persistent cookies: ' + libsoup_25_2 + ' (libSoup ', sep='') + if (libsoup_25_2 == 'yes'): + Utils.pprint ('GREEN', conf.check_cfg (modversion='libsoup-2.4'), sep='') + else: + Utils.pprint ('RED', '2.25.2', sep='') + print ")" # if 'soup-2.4' in conf.env['LIB_WEBKIT']: webkit_binary = conf.env.get_flat ('LIBPATH_WEBKIT') + '/libwebkit-1.0.so' try: From 40a3eeb94d1a46978f25b862cc97e3cc981e824c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 22 Feb 2009 23:34:17 +0100 Subject: [PATCH 0806/2970] Cache libSoup version and remove an extra space --- wscript | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 55ae29f7..133b57e1 100644 --- a/wscript +++ b/wscript @@ -226,15 +226,16 @@ def configure (conf): if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') Utils.pprint ('RED', 'Please use an older or newer version.') - Utils.pprint ('WHITE', 'Icons, Source, Save: ' + libsoup + ' (libSoup ', sep='') + libsoup_version = conf.check_cfg (modversion='libsoup-2.4') + Utils.pprint ('WHITE', 'Icons, Source, Save: ' + libsoup + ' (libSoup', sep='') if (libsoup == 'yes'): - Utils.pprint ('GREEN', conf.check_cfg (modversion='libsoup-2.4'), sep='') + Utils.pprint ('GREEN', libsoup_version, sep='') else: Utils.pprint ('RED', '2.23.1', sep='') print ")" - Utils.pprint ('WHITE', 'Persistent cookies: ' + libsoup_25_2 + ' (libSoup ', sep='') + Utils.pprint ('WHITE', 'Persistent cookies: ' + libsoup_25_2 + ' (libSoup', sep='') if (libsoup_25_2 == 'yes'): - Utils.pprint ('GREEN', conf.check_cfg (modversion='libsoup-2.4'), sep='') + Utils.pprint ('GREEN', libsoup_version, sep='') else: Utils.pprint ('RED', '2.25.2', sep='') print ")" From e3485dfbfbd6c34d3f782bcaeada25a6ec4453d6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Feb 2009 23:37:51 +0100 Subject: [PATCH 0807/2970] Bump version to 0.1.3 --- ChangeLog | 14 +++++++++++++- README | 3 +-- TODO | 4 ---- wscript | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d0831fa..cdc16086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.3: + + Sidepanel can be aligned on the right + + Bookmarks can be organized in folders + + Support find as you type + + Support international domain names + + Tweak location completion + + Provide default search engines + + Integrate with Maemo if available + + Implement Mouse Gestures extension + + Implement a Plugins panel + + Editing the toolbar via a context menu + + Introduce Zoom Text and Images preference + v0.1.2: + Open new tabs by clicking on the tabbar + Refactor and speed up location completion @@ -11,7 +24,6 @@ v0.1.2: + Implement cookie storage on disk + Remove autotooled build system + Add a new Extensions panel - + Support javascript bookmarklets + Implement opening of new windows + Display tooltips in Preferences diff --git a/README b/README index 62995981..ab012d38 100644 --- a/README +++ b/README @@ -10,11 +10,10 @@ Midori is a lightweight web browser. * Straightforward bookmark management. * Customizable and extensible interface. * Extensions written in C. -* Custom context menu actions. Requirements: GTK+ 2.10, WebkitGtk, libXML2 -Optional: Unique 0.9, libsoup 2.4, sqlite 3.0, docutils, xdg-open +Optional: Unique 0.9, libsoup 2.23.1, libidn, sqlite 3.0, docutils, xdg-open For installation instructions read INSTALL. diff --git a/TODO b/TODO index af50c86e..a9852067 100644 --- a/TODO +++ b/TODO @@ -1,20 +1,17 @@ This file is licensed under the terms of the expat license, see the file EXPAT. TODO: - . Revamp bookmarks UI, including creating of bookmark folders . Use an update timeout in KatzePropertyProxy instead of only focus-out . Show a loading mouse pointer . Scroll tabs w/o switching tabs . Import and export of the bookmarks file, or using one from a specific path . Custom context menu actions, like in Thunar or Epiphany . Custom tab names - . Open an auto-vanishing findbox with '.' . Analogus to blocked popups, blocked scripts moving layers on load (extension) . Per-site blocking of individual elements on a page . Statusbar icon 'cookies blocked', icon 'popups blocked' . Per-site settings accessible via statusbar icons, ie. cookies, popups, plugins . CookieSafe like, a list of cookies, with type, block, allow - . Support mouse gestures (extension) . Automatic update checks (browser, extensions)? . Auto-group tabs by opener, with colors? . Mark (dogear) a selection so that it isn't cleared implicitly, multiply on one page @@ -44,4 +41,3 @@ TODO: . Shared bookmarks and config . Custom-mode, e.g. hide menubar and use help icon to have a help viewer . Prevent dead tabs: download, aborted page - . On url load, for big files, ask "Open or save?" diff --git a/wscript b/wscript index 133b57e1..2c0c4276 100644 --- a/wscript +++ b/wscript @@ -22,7 +22,7 @@ import UnitTest major = 0 minor = 1 -micro = 2 +micro = 3 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From d8bcecc99d56350ac0340f39c0bef58db7df0541 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 23 Feb 2009 01:03:59 +0100 Subject: [PATCH 0808/2970] Only add the git hash to the version if it's not empty --- wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 2c0c4276..3789ce84 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,8 @@ VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True) - VERSION = (VERSION + '-' + git).strip () + if git: + VERSION = (VERSION + '-' + git).strip () except: pass From d9bdaf0f8c14d829489c0d56a5bc0185a1a83868 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 23 Feb 2009 23:44:30 +0100 Subject: [PATCH 0809/2970] Restrict IDN conversion to hostname --- midori/sokoke.c | 38 ++++++++++++++++++++++++++++++-------- tests/magic-uri.c | 4 ++++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 98d9384d..c179692a 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -132,16 +132,35 @@ static gchar* sokoke_idn_to_punycode (gchar* uri) { #if HAVE_LIBIDN + gchar* proto; gchar* hostname; + gchar* path; char *s; uint32_t *q; int rc; gchar *result; - if (g_str_has_prefix (uri, "http://")) - hostname = &uri[7]; - else if (g_str_has_prefix (uri, "https://")) - hostname = &uri[8]; + if ((proto = g_utf8_strchr (uri, -1, ':'))) + { + gulong offset = g_utf8_pointer_to_offset (uri, proto); + gchar* buffer = g_malloc0 (offset + 1); + g_utf8_strncpy (buffer, uri, offset); + proto = buffer; + } + + path = NULL; + if ((hostname = g_utf8_strchr (uri, -1, '/'))) + { + if (hostname[1] == '/') + hostname += 2; + if ((path = g_utf8_strchr (hostname, -1, '/'))) + { + gulong offset = g_utf8_pointer_to_offset (hostname, path); + gchar* buffer = g_malloc0 (offset); + g_utf8_strncpy (buffer, hostname, offset); + hostname = buffer; + } + } else hostname = uri; @@ -153,10 +172,13 @@ sokoke_idn_to_punycode (gchar* uri) if (rc != IDNA_SUCCESS) return uri; - if (g_str_has_prefix (uri, "http://")) - result = g_strdup_printf ("http://%s", s); - else if (g_str_has_prefix (uri, "https://")) - result = g_strdup_printf ("https://%s", s); + if (proto) + { + result = g_strdup_printf ("%s://%s%s", proto, s, path ? path : ""); + g_free (proto); + if (path) + g_free (hostname); + } else result = g_strdup (s); g_free (uri); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index ed74c43a..0ada79c6 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -107,6 +107,10 @@ main (int argc, test_input ("http://東京理科大学.jp", "http://東京理科大学.jp"); test_input ("https://青のネコ.co.jp", "https://青のネコ.co.jp"); #endif + test_input ("http://en.wikipedia.org/wiki/Kölsch_language", + "http://en.wikipedia.org/wiki/Kölsch_language"); + test_input ("en.wikipedia.org/wiki/Kölsch_language", + "http://en.wikipedia.org/wiki/Kölsch_language"); test_input ("sm Küchenzubehör", SM "Küchenzubehör"); test_input ("sm 東京理科大学", SM "東京理科大学"); From 69aa3bfdd99161a39393f7ec4280144e0e14ea4a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Feb 2009 00:17:21 +0100 Subject: [PATCH 0810/2970] Enable changing the containing folder of bookmarks --- midori/midori-browser.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 89065de3..34580136 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -607,8 +607,9 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } combo_folder = NULL; - if (new_bookmark) + if (1) { + KatzeItem* item; guint i, n; hbox = gtk_hbox_new (FALSE, 8); @@ -620,17 +621,21 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Toplevel folder")); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); - if ((n = katze_array_get_length (browser->bookmarks))) - for (i = 0; i < n; i++) + + i = 0; + n = 1; + while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) { - KatzeItem* item = katze_array_get_nth_item (browser->bookmarks, i); if (KATZE_IS_ARRAY (item)) { const gchar* name = katze_item_get_name (item); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), name); + if (katze_item_get_parent (bookmark) == item) + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n); + n++; } } - else + if (!i) gtk_widget_set_sensitive (combo_folder, FALSE); gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); @@ -652,7 +657,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_uri))); folder = browser->bookmarks; - if (new_bookmark) + if (1) { selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); if (g_strcmp0 (selected, _("Toplevel folder"))) @@ -672,6 +677,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } } g_free (selected); + if (!new_bookmark) + katze_array_remove_item (katze_item_get_parent (bookmark), bookmark); katze_array_add_item (folder, bookmark); } } From faa5ecdaf57c73890a41050e64b9bc22ec2ab1cc Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Tue, 24 Feb 2009 00:45:07 +0100 Subject: [PATCH 0811/2970] Update Japanese translation --- po/ja.po | 955 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 489 insertions(+), 466 deletions(-) diff --git a/po/ja.po b/po/ja.po index a47601e3..cee68dd2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-01 19:06+0100\n" -"PO-Revision-Date: 2009-02-01 11:58+0900\n" +"POT-Creation-Date: 2009-02-23 21:29+0900\n" +"PO-Revision-Date: 2009-02-22 21:01+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 -#: ../midori/main.c:2065 ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 +#: ../midori/main.c:1714 ../midori/main.c:1725 +#: ../midori/midori-websettings.c:265 msgid "Midori" msgstr "Midori" @@ -30,1395 +30,1387 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "ブックマーク(_B)" - -#: ../midori/main.c:91 ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "ブックマーク(_B)" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "ブックマークに追加(_A)" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "コンソール(_C)" - -#: ../midori/main.c:94 -msgid "_Extensions" -msgstr "エクステンション(_E)" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "履歴(_H)" - -#: ../midori/main.c:96 -msgid "_Homepage" -msgstr "ホームページ(_H)" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "ユーザスクリプト(_U)" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "ユーザスタイル(_S)" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "新しいタブ(_T)" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "転送(_T)" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "閉じたタブとウィンドウ(_C)" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "新しいウィンドウ(_W)" - -#: ../midori/main.c:158 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:213 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:220 ../midori/main.c:290 +#: ../midori/main.c:168 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:532 +#: ../midori/main.c:480 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:488 ../midori/main.c:497 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/main.c:571 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:603 +#: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 +#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:962 +#: ../midori/main.c:910 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:991 +#: ../midori/main.c:939 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1121 ../midori/sokoke.c:531 +#: ../midori/main.c:1069 ../midori/sokoke.c:580 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 +#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 ../midori/main.c:1245 +#: ../midori/main.c:1169 ../midori/main.c:1193 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "転送" -#: ../midori/main.c:1312 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "認証が要求されました" - -#: ../midori/main.c:1652 +#: ../midori/main.c:1401 msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" -"この場所を開くためにはユーザ名とパスワードが\n" -"必要です:" - -#: ../midori/main.c:1666 -msgid "Username" -msgstr "ユーザ名" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "パスワード" - -#: ../midori/main.c:1783 -msgid "" -"Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" "ようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1798 +#: ../midori/main.c:1416 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1802 +#: ../midori/main.c:1420 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1807 +#: ../midori/main.c:1425 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1950 +#: ../midori/main.c:1599 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1982 ../midori/gjs.c:514 +#: ../midori/main.c:1631 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:2005 +#: ../midori/main.c:1654 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:2007 +#: ../midori/main.c:1656 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:2009 +#: ../midori/main.c:1658 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:2053 +#: ../midori/main.c:1702 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:2077 +#: ../midori/main.c:1726 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:2079 +#: ../midori/main.c:1728 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:2106 +#: ../midori/main.c:1755 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:2184 +#: ../midori/main.c:1823 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:2196 +#: ../midori/main.c:1835 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:2211 +#: ../midori/main.c:1850 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:2224 +#: ../midori/main.c:1863 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:2237 +#: ../midori/main.c:1876 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:2249 +#: ../midori/main.c:1888 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2265 +#: ../midori/main.c:1904 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:2931 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:333 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:358 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:534 +msgid "New folder" +msgstr "新しいフォルダ" + +#: ../midori/midori-browser.c:534 +msgid "Edit folder" +msgstr "フォルダの編集" + +#: ../midori/midori-browser.c:536 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:536 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:566 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 +#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:616 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:733 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1340 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:788 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:790 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "一週間前" - -#: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "%d 日前" - -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "今日" - -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "昨日" - -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:2674 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:2682 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "すべての履歴アイテムを削除してよろしいですか?" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:2859 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:2862 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:2865 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:2868 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:2871 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:2873 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:2874 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:2876 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:2877 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:2880 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:2883 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:2885 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:2888 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:2897 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:2900 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:2903 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:2906 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:2908 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:2909 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:2911 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:2912 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:2915 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:2916 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:2919 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:2921 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:2922 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:2934 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:2937 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:2940 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:2943 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:2945 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:2946 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:2950 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:2952 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:2955 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:2958 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:2961 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:2963 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:2964 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:2967 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "選択された履歴アイテムを削除します" - -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "すべての履歴をクリアします" - -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "選択された履歴アイテムをブックマークに追加します" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:2972 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:2975 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:2979 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:2980 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:2982 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:2983 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:2985 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:2987 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:2988 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:2990 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:2991 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:2993 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:2994 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:2997 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3004 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3005 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3010 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3011 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3014 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3015 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3018 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3019 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3022 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3023 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3026 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3027 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:3030 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3031 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3436 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:3443 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3445 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3469 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3471 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:3490 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:3503 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:3505 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +msgid "_Bookmarks" +msgstr "ブックマーク(_B)" + +#: ../midori/midori-browser.c:3520 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3533 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3535 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 -msgid "History" -msgstr "履歴" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:3697 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:3722 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4076 +#: ../midori/midori-browser.c:3727 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:3732 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:3740 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:3750 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:4034 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +msgid "Align sidepanel on the right" +msgstr "サイドパネルを右側に配置する" + +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +msgid "Whether to align the sidepanel on the right" +msgstr "サイドパネルを右側に表示します" + +#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:177 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:192 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:193 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:194 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:195 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:190 +#: ../midori/midori-websettings.c:196 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:212 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:213 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:214 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:229 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:230 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:231 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:232 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:233 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:248 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:249 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:266 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:267 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:268 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:309 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:310 msgid "Whether to save the last window size" -msgstr "最後のウィンドウサイズを記憶するかどうか指定します" +msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:318 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:319 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:327 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:328 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:353 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:354 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:363 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:364 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:372 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:373 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:382 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:383 msgid "Whether to show the menubar" msgstr "メニューバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:391 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:392 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:400 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:401 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:409 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:410 msgid "Whether to show the panel" msgstr "パネルを表示するかどうか指定します" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:418 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:419 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:428 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:429 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:445 +msgid "Show progress in location entry" +msgstr "ロケーションエントリに進捗を表示する" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show loading progress in the location entry" +msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" + +#: ../midori/midori-websettings.c:454 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:455 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:463 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:464 msgid "Whether to make the sidepanel compact" -msgstr "コンパクトなサイドパネルを表示します" +msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:489 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:490 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:500 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:515 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:516 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示する" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:524 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:525 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:533 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:534 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:542 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:543 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:551 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:552 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:560 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:561 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:571 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:572 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:580 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:581 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:590 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:591 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:601 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:602 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:615 msgid "Middle click opens Selection" -msgstr "選択範囲のミドルクリックで開く" +msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:616 msgid "Load an address from the selection via middle click" -msgstr "選択したアドレスをミドルクリックすると読み込みます" +msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:624 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:625 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:633 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:634 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:642 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:643 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:694 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:695 msgid "Whether to zoom text and images" -msgstr "文字や画像の拡大/縮小を可能にするかどうか指定します" +msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:705 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:706 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:719 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:720 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:728 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:729 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:739 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:740 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:748 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:749 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:757 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:758 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:766 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:767 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:777 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:778 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" +#: ../midori/midori-websettings.c:797 +msgid "Detect proxy server automatically" +msgstr "プロキシサーバを自動検出する" + +#: ../midori/midori-websettings.c:798 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "プロキシサーバをシステム環境から自動的に検出します" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:818 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:819 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:839 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:840 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:852 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:853 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#: ../midori/midori-view.c:629 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:959 +msgid "Open _Link" +msgstr "リンクを開く(_L)" + +#: ../midori/midori-view.c:961 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Window" +msgstr "リンクを新しいウィンドウで開く(_W)" + +#: ../midori/midori-view.c:988 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:996 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:1018 +msgid "_Search the Web" +msgstr "ウェブで検索(_S)" + +#: ../midori/midori-view.c:1027 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1501 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1654 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:1678 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:1694 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-preferences.c:91 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "%s の設定" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "一般" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "起動" #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" msgstr "文字表示で使用される最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:462 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:484 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:485 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" -msgstr "テキストエリアのサイズを変更可能にする" +msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" -msgstr "テキストエリアのサイズ変更を有効にします" +msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" -msgstr "組み込まれたスクリプト言語を有効にします" +msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" msgstr "組み込みプラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:515 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:516 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:525 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:590 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:597 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:604 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 msgid "days" msgstr "日" +#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +msgid "History" +msgstr "履歴" + #: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "空" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:820 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:864 -msgid "_Icon (name or file):" -msgstr "アイコン名/ファイル(_I):" +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "アイコン(_I):" -#: ../midori/midori-searchaction.c:878 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1055 +#: ../midori/midori-searchaction.c:1074 msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:403 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" +#: ../midori/sokoke.c:734 +msgid "_Bookmark" +msgstr "ブックマーク(_B)" + +#: ../midori/sokoke.c:736 +msgid "_Add Bookmark" +msgstr "ブックマークに追加(_A)" + +#: ../midori/sokoke.c:737 +msgid "_Console" +msgstr "コンソール(_C)" + +#: ../midori/sokoke.c:738 +msgid "_Extensions" +msgstr "エクステンション(_E)" + +#: ../midori/sokoke.c:739 +msgid "_History" +msgstr "履歴(_H)" + +#: ../midori/sokoke.c:740 +msgid "_Homepage" +msgstr "ホームページ(_H)" + +#: ../midori/sokoke.c:741 +msgid "_Userscripts" +msgstr "ユーザスクリプト(_U)" + +#: ../midori/sokoke.c:742 +msgid "User_styles" +msgstr "ユーザスタイル(_S)" + +#: ../midori/sokoke.c:743 +msgid "New _Tab" +msgstr "新しいタブ(_T)" + +#: ../midori/sokoke.c:744 +msgid "_Transfers" +msgstr "転送(_T)" + +#: ../midori/sokoke.c:745 +msgid "_Closed Tabs and Windows" +msgstr "閉じたタブとウィンドウ(_C)" + +#: ../midori/sokoke.c:746 +msgid "New _Window" +msgstr "新しいウィンドウ(_W)" + #: ../midori/gjs.c:742 ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" @@ -1450,19 +1442,23 @@ msgstr "有効(_E)" msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:236 msgid "Edit the selected bookmark" msgstr "選択されたブックマークを編集します" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:244 msgid "Delete the selected bookmark" msgstr "選択されたブックマークを削除します" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "新しいフォルダを追加します" + +#: ../panels/midori-bookmarks.c:589 msgid "Separator" msgstr "セパレータ" @@ -1474,10 +1470,64 @@ msgstr "コンソール" msgid "Extensions" msgstr "エクステンション" +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "すべての履歴アイテムを削除してよろしいですか?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "選択された履歴アイテムをブックマークに追加します" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "選択された履歴アイテムを削除します" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "すべての履歴をクリアします" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "一週間前" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "%d 日前" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "今日" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "昨日" + #: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "プラグイン" +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "認証が要求されました" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"この場所を開くためにはユーザ名とパスワードが\n" +"必要です:" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "ユーザ名" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "パスワード" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1529,30 +1579,3 @@ msgstr "画像" #: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "スクリプト" - -#~ msgid "%" -#~ msgstr "%" - -#~ msgid "Manage search engines" -#~ msgstr "検索エンジンの管理" - -#~ msgid "URIs" -#~ msgstr "URIs" - -#~ msgid "[URIs]" -#~ msgstr "[URIs]" - -#~ msgid "_URL:" -#~ msgstr "URL(_U):" - -#~ msgid "Root" -#~ msgstr "ルート" - -#~ msgid "HTTP Proxy" -#~ msgstr "HTTP プロキシ" - -#~ msgid "Open URL in New _Tab" -#~ msgstr "URL を新しいタブで開く(_T)" - -#~ msgid "Enforce 96 DPI" -#~ msgstr "強制的に 96DPI にする" From 3abace66ea81bb687acef88a88c70a58c976d15b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Feb 2009 22:49:51 +0100 Subject: [PATCH 0812/2970] Add more debugging tips to INSTALL file --- INSTALL | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/INSTALL b/INSTALL index 46d403fd..9eb4519c 100644 --- a/INSTALL +++ b/INSTALL @@ -41,6 +41,16 @@ Switch to your terminal, type bt ('backtrace') and hit Return. What you obtained now is a backtrace that should include function names and line numbers. +If the problem is a warning and not a crash, try this: + +'G_DEBUG=all gdb _build_/default/midori/midori' + +If you are interested in HTTP communication, try this: + +'MIDORI_SOUP_DEBUG=2 _build_/default/midori/midori' + +Where '2' can be a level between 0 and 3. + For further information a tutorial for gdb and reading up on how you can install debugging symbols for libraries used by Midori are recommended. From 1f00d2ed14d96c7be987db0c307387259e9f1d76 Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Tue, 24 Feb 2009 22:59:18 +0100 Subject: [PATCH 0813/2970] Remove any left timeouts if the browser is destroyed --- midori/midori-browser.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 34580136..2f68ef07 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3111,6 +3111,11 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, static void midori_browser_destroy_cb (MidoriBrowser* browser) { + if (G_UNLIKELY (browser->panel_timeout)) + g_source_remove (browser->panel_timeout); + if (G_UNLIKELY (browser->alloc_timeout)) + g_source_remove (browser->alloc_timeout); + /* Destroy panel first, so panels don't need special care */ gtk_widget_destroy (browser->panel); /* Destroy tabs second, so child widgets don't need special care */ From edce7d348b2f44094b05d81ae91e8e64b9cae527 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Feb 2009 23:56:28 +0100 Subject: [PATCH 0814/2970] Reflect completion selection directly in the entry --- midori/midori-locationaction.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 3f6c8af9..c4c8f818 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -762,6 +762,9 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, gtk_entry_completion_set_model (completion, location_action->sort_model); gtk_entry_completion_set_text_column (completion, URI_COL); + #if GTK_CHECK_VERSION (2, 12, 0) + gtk_entry_completion_set_inline_selection (completion, TRUE); + #endif gtk_cell_layout_clear (GTK_CELL_LAYOUT (completion)); renderer = gtk_cell_renderer_pixbuf_new (); From 498232b805b5a6b2c6e2a6dba673cc47e6143184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 27 Feb 2009 20:59:23 +0100 Subject: [PATCH 0815/2970] Fix memory leaks in IDN handling and exclude file:// URIs --- midori/sokoke.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index c179692a..c073e1fa 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -142,8 +142,15 @@ sokoke_idn_to_punycode (gchar* uri) if ((proto = g_utf8_strchr (uri, -1, ':'))) { - gulong offset = g_utf8_pointer_to_offset (uri, proto); - gchar* buffer = g_malloc0 (offset + 1); + gulong offset; + gchar* buffer; + + /* 'file' URIs don't have a hostname */ + if (!strcmp (proto, "file")) + return uri; + + offset = g_utf8_pointer_to_offset (uri, proto); + buffer = g_malloc0 (offset + 1); g_utf8_strncpy (buffer, uri, offset); proto = buffer; } @@ -156,21 +163,29 @@ sokoke_idn_to_punycode (gchar* uri) if ((path = g_utf8_strchr (hostname, -1, '/'))) { gulong offset = g_utf8_pointer_to_offset (hostname, path); - gchar* buffer = g_malloc0 (offset); + gchar* buffer = g_malloc0 (offset + 1); g_utf8_strncpy (buffer, hostname, offset); hostname = buffer; } } else - hostname = uri; + hostname = g_strdup (uri); if (!(q = stringprep_utf8_to_ucs4 (hostname, -1, NULL))) + { + g_free (proto); + g_free (hostname); return uri; + } rc = idna_to_ascii_4z (q, &s, IDNA_ALLOW_UNASSIGNED); free (q); if (rc != IDNA_SUCCESS) + { + g_free (proto); + g_free (hostname); return uri; + } if (proto) { From da2e4755e673ab7b9b31a790739a14cadb4ba816 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 27 Feb 2009 21:00:24 +0100 Subject: [PATCH 0816/2970] Add addtional file:// URI tests --- tests/magic-uri.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 0ada79c6..3b8554cc 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -113,6 +113,10 @@ main (int argc, "http://en.wikipedia.org/wiki/Kölsch_language"); test_input ("sm Küchenzubehör", SM "Küchenzubehör"); test_input ("sm 東京理科大学", SM "東京理科大学"); + test_input ("file:///home/mark/foo/bar.html", + "file:///home/mark/foo/bar.html"); + test_input ("file:///home/mark/frühstück", + "file:///home/mark/frühstück"); return 0; } From 0ddf1bd1b2a190c627a5ceea342375293d952284 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 27 Feb 2009 21:52:51 +0100 Subject: [PATCH 0817/2970] Implement 'Open all in Tabs' for bookmark folders and history --- midori/midori-browser.c | 49 ++++++++++++++++++++++-------- panels/midori-bookmarks.c | 63 +++++++++++++++++++++++++++----------- panels/midori-history.c | 64 ++++++++++++++++++++++++++++----------- 3 files changed, 129 insertions(+), 47 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2f68ef07..d078db7f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2434,7 +2434,7 @@ midori_browser_bookmark_popup_item (GtkWidget* menu, if (!strcmp (stock_id, GTK_STOCK_EDIT)) gtk_widget_set_sensitive (menuitem, KATZE_IS_ARRAY (item) || uri != NULL); - else if (strcmp (stock_id, GTK_STOCK_DELETE)) + else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (callback), browser); @@ -2465,12 +2465,28 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget* menuitem, guint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - - if (uri && *uri) + if (KATZE_IS_ARRAY (item)) { - n = midori_browser_add_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); + KatzeItem* child; + guint i = 0; + + while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) + { + if ((uri = katze_item_get_uri (child)) && *uri) + { + n = midori_browser_add_item (browser, child); + _midori_browser_set_current_page_smartly (browser, n); + } + i++; + } + } + else + { + if ((uri = katze_item_get_uri (item)) && *uri) + { + n = midori_browser_add_item (browser, item); + _midori_browser_set_current_page_smartly (browser, n); + } } } @@ -2532,12 +2548,21 @@ midori_browser_bookmark_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL, - item, midori_browser_bookmark_open_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), - item, midori_browser_bookmark_open_in_tab_activate_cb, browser); - midori_browser_bookmark_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), - item, midori_browser_bookmark_open_in_window_activate_cb, browser); + if (KATZE_IS_ARRAY (item)) + midori_browser_bookmark_popup_item (menu, + STOCK_TAB_NEW, _("Open all in _Tabs"), + item, midori_browser_bookmark_open_in_tab_activate_cb, browser); + else + { + midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL, + item, midori_browser_bookmark_open_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, + STOCK_TAB_NEW, _("Open in New _Tab"), + item, midori_browser_bookmark_open_in_tab_activate_cb, browser); + midori_browser_bookmark_popup_item (menu, + STOCK_WINDOW_NEW, _("Open in New _Window"), + item, midori_browser_bookmark_open_in_window_activate_cb, browser); + } menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 9526a2d3..d4150077 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -640,7 +640,7 @@ midori_bookmarks_popup_item (GtkWidget* menu, if (!strcmp (stock_id, GTK_STOCK_EDIT)) gtk_widget_set_sensitive (menuitem, KATZE_IS_ARRAY (item) || uri != NULL); - else if (strcmp (stock_id, GTK_STOCK_DELETE)) + else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks); @@ -674,18 +674,40 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, guint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - - if (uri && *uri) + if (KATZE_IS_ARRAY (item)) { - GtkWidget* browser; - MidoriWebSettings* settings; + KatzeItem* child; + guint i = 0; - browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - n = midori_browser_add_item (MIDORI_BROWSER (browser), item); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) + { + if ((uri = katze_item_get_uri (child)) && *uri) + { + GtkWidget* browser; + MidoriWebSettings* settings; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + n = midori_browser_add_item (MIDORI_BROWSER (browser), child); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } + i++; + } + } + else + { + if ((uri = katze_item_get_uri (item)) && *uri) + { + GtkWidget* browser; + MidoriWebSettings* settings; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + n = midori_browser_add_item (MIDORI_BROWSER (browser), item); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } } } @@ -749,12 +771,19 @@ midori_bookmarks_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL, - item, midori_bookmarks_open_activate_cb, bookmarks); - midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), - item, midori_bookmarks_open_in_tab_activate_cb, bookmarks); - midori_bookmarks_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), - item, midori_bookmarks_open_in_window_activate_cb, bookmarks); + if (KATZE_IS_ARRAY (item)) + midori_bookmarks_popup_item (menu, + STOCK_TAB_NEW, _("Open all in _Tabs"), + item, midori_bookmarks_open_in_tab_activate_cb, bookmarks); + else + { + midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL, + item, midori_bookmarks_open_activate_cb, bookmarks); + midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), + item, midori_bookmarks_open_in_tab_activate_cb, bookmarks); + midori_bookmarks_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), + item, midori_bookmarks_open_in_window_activate_cb, bookmarks); + } menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); diff --git a/panels/midori-history.c b/panels/midori-history.c index ca52924e..3ef50bba 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -674,7 +674,7 @@ midori_history_popup_item (GtkWidget* menu, if (!strcmp (stock_id, GTK_STOCK_EDIT)) gtk_widget_set_sensitive (menuitem, KATZE_IS_ARRAY (item) || uri != NULL); - else if (strcmp (stock_id, GTK_STOCK_DELETE)) + else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (callback), history); @@ -708,18 +708,40 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, guint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - - if (uri && *uri) + if (KATZE_IS_ARRAY (item)) { - GtkWidget* browser; - MidoriWebSettings* settings; + KatzeItem* child; + guint i = 0; - browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - n = midori_browser_add_item (MIDORI_BROWSER (browser), item); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) + { + if ((uri = katze_item_get_uri (child)) && *uri) + { + GtkWidget* browser; + MidoriWebSettings* settings; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + n = midori_browser_add_item (MIDORI_BROWSER (browser), child); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } + i++; + } + } + else + { + if ((uri = katze_item_get_uri (item)) && *uri) + { + GtkWidget* browser; + MidoriWebSettings* settings; + + browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + n = midori_browser_add_item (MIDORI_BROWSER (browser), item); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + } } } @@ -783,15 +805,21 @@ midori_history_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - midori_history_popup_item (menu, GTK_STOCK_OPEN, NULL, - item, midori_history_open_activate_cb, history); - midori_history_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), - item, midori_history_open_in_tab_activate_cb, history); - midori_history_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), - item, midori_history_open_in_window_activate_cb, history); - if (!KATZE_IS_ARRAY (item)) + if (KATZE_IS_ARRAY (item)) + midori_history_popup_item (menu, + STOCK_TAB_NEW, _("Open all in _Tabs"), + item, midori_history_open_in_tab_activate_cb, history); + else + { + midori_history_popup_item (menu, GTK_STOCK_OPEN, NULL, + item, midori_history_open_activate_cb, history); + midori_history_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), + item, midori_history_open_in_tab_activate_cb, history); + midori_history_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), + item, midori_history_open_in_window_activate_cb, history); midori_history_popup_item (menu, STOCK_BOOKMARK_ADD, NULL, item, midori_history_bookmark_activate_cb, history); + } menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); From 9c4d3ea62a19d4f54775563f20e01220a978e156 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 27 Feb 2009 23:09:36 +0100 Subject: [PATCH 0818/2970] Implement Encoding menu --- midori/midori-browser.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d078db7f..be6b919c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -237,6 +237,10 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_view_can_zoom_out (MIDORI_VIEW (view))); _action_set_sensitive (browser, "ZoomNormal", midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0); + _action_set_sensitive (browser, "Encoding", + midori_view_can_zoom_in (MIDORI_VIEW (view)) + && g_object_class_find_property ( + g_type_class_peek (WEBKIT_TYPE_WEB_VIEW), "custom-encoding")); _action_set_sensitive (browser, "SourceView", midori_view_can_view_source (MIDORI_VIEW (view))); _action_set_sensitive (browser, "Find", @@ -2051,6 +2055,40 @@ _action_zoom_normal_activate (GtkAction* action, midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } +static void +_action_view_encoding_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* view = midori_browser_get_current_tab (browser); + if (view) + { + const gchar* name; + GtkWidget* web_view; + + name = gtk_action_get_name (action); + web_view = gtk_bin_get_child (GTK_BIN (view)); + if (!strcmp (name, "EncodingAutomatic")) + g_object_set (web_view, "custom-encoding", NULL, NULL); + else + { + const gchar* encoding; + if (!strcmp (name, "EncodingChinese")) + encoding = "BIG5"; + else if (!strcmp (name, "EncodingJapanese")) + encoding = "SHIFT_JIS"; + else if (!strcmp (name, "EncodingRussian")) + encoding = "KOI8-R"; + else if (!strcmp (name, "EncodingUnicode")) + encoding = "UTF-8"; + else if (!strcmp (name, "EncodingWestern")) + encoding = "ISO-8859-1"; + else + g_assert_not_reached (); + g_object_set (web_view, "custom-encoding", encoding, NULL); + } + } +} + static gchar* midori_browser_get_uri_extension (const gchar* uri) { @@ -2970,6 +3008,28 @@ static const GtkActionEntry entries[] = { { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) }, + { "Encoding", NULL, N_("_Encoding") }, + { "EncodingAutomatic", NULL, + N_("_Automatic"), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, + { "EncodingChinese", NULL, + N_("Chinese (BIG5)"), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, + { "EncodingJapanese", NULL, + N_("Japanese (SHIFT_JIS)"), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, + { "EncodingRussian", NULL, + N_("Russian (KOI8-R)"), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, + { "EncodingUnicode", NULL, + N_("Unicode (UTF-8)"), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, + { "EncodingWestern", NULL, + N_("Western (ISO-8859-1)"), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, + { "EncodingCustom", NULL, + N_("Custom..."), "", + NULL, G_CALLBACK (_action_view_encoding_activate) }, { "SourceView", NULL, N_("View _Source"), "", N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, @@ -3197,6 +3257,15 @@ static const gchar* ui_markup = "" "" "" + "

" + "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -3625,6 +3694,7 @@ midori_browser_init (MidoriBrowser* browser) g_object_set (_action_by_name (browser, "Statusbar"), "visible", FALSE, NULL); #endif _action_set_sensitive (browser, "Transferbar", FALSE); + _action_set_sensitive (browser, "EncodingCustom", FALSE); _action_set_sensitive (browser, "SelectionSourceView", FALSE); /* Create the navigationbar */ From 823f8dbc3f0404519e0be883bc5f514b0dea3996 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 01:43:20 +0100 Subject: [PATCH 0819/2970] Handle activation and deactivation of Statusbar Features properly --- extensions/statusbar-features.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 86f21bfe..8362a4e9 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -16,6 +16,8 @@ statusbar_features_deactivate_cb (MidoriExtension* extension, GtkWidget* bbox) { gtk_widget_destroy (bbox); + g_signal_handlers_disconnect_by_func ( + extension, statusbar_features_deactivate_cb, bbox); } static void @@ -66,6 +68,14 @@ static void statusbar_features_activate_cb (MidoriExtension* extension, MidoriApp* app) { + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + statusbar_features_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (statusbar_features_app_add_browser_cb), extension); } From 7ff1a016f4e3c7e6fc39c281f6931c9d1b17926d Mon Sep 17 00:00:00 2001 From: Matthias Kruk Date: Sat, 28 Feb 2009 01:59:06 +0100 Subject: [PATCH 0820/2970] Implement activating and deactivating extensions in the panel --- midori/midori-extension.c | 2 -- panels/midori-extensions.c | 66 +++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 96edfae5..0e57fdfc 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -382,8 +382,6 @@ midori_extension_deactivate (MidoriExtension* extension) extension->priv->active = FALSE; g_signal_emit (extension, signals[DEACTIVATE], 0); - g_signal_handlers_destroy (extension); - g_object_run_dispose (G_OBJECT (extension)); } /** diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index 3a9e96df..45afa567 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -119,7 +119,7 @@ midori_extensions_button_status_clicked_cb (GtkToolItem* toolitem, gtk_widget_set_sensitive (GTK_WIDGET (button_enable), !midori_extension_is_active (extension)); - gtk_widget_set_sensitive (GTK_WIDGET (button_enable), + gtk_widget_set_sensitive (GTK_WIDGET (button_disable), midori_extension_is_active (extension)); } } @@ -254,13 +254,20 @@ midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column, GtkWidget* treeview) { MidoriExtension* extension; + gchar* name; + gchar* version; + gchar* desc; gchar* text; gtk_tree_model_get (model, iter, 0, &extension, -1); - text = g_strdup_printf ("%s\n%s", - katze_object_get_string (extension, "name"), - katze_object_get_string (extension, "description")); + name = katze_object_get_string (extension, "name"); + version = katze_object_get_string (extension, "version"); + desc = katze_object_get_string (extension, "description"); + text = g_strdup_printf ("%s %s\n%s", name, version, desc); + g_free (name); + g_free (version); + g_free (desc); g_object_set (renderer, "text", text, NULL); g_free (text); } @@ -271,24 +278,64 @@ midori_extensions_treeview_row_activated_cb (GtkTreeView* treeview, GtkTreeViewColumn* column, MidoriExtensions* extensions) { - GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkToolItem* button_enable; + GtkToolItem* button_disable; + GtkTreeModel* model; GtkTreeIter iter; + model = gtk_tree_view_get_model (treeview); + button_enable = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (extensions->toolbar), 1); + button_disable = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (extensions->toolbar), 2); if (gtk_tree_model_get_iter (model, &iter, path)) { MidoriExtension* extension; gtk_tree_model_get (model, &iter, 0, &extension, -1); if (midori_extension_is_active (extension)) - { midori_extension_deactivate (extension); - gtk_list_store_remove (GTK_LIST_STORE (model), &iter); - } else g_signal_emit_by_name (extension, "activate", extensions->app); + gtk_widget_set_sensitive (GTK_WIDGET (button_enable), + !midori_extension_is_active (extension)); + gtk_widget_set_sensitive (GTK_WIDGET (button_disable), + midori_extension_is_active (extension)); } } +static void +midori_extensions_treeview_cursor_changed_cb (GtkTreeView* treeview, + MidoriExtensions* extensions) +{ + GtkTreeModel* model; + GtkTreePath* path; + GtkTreeIter iter; + GtkToolItem* button_enable; + GtkToolItem* button_disable; + + gtk_tree_view_get_cursor (treeview, &path, NULL); + model = gtk_tree_view_get_model (treeview); + button_enable = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (extensions->toolbar), 1); + button_disable = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (extensions->toolbar), 2); + if (gtk_tree_model_get_iter (model, &iter, path)) + { + MidoriExtension* extension; + + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &extension, -1); + gtk_widget_set_sensitive (GTK_WIDGET (button_enable), + !midori_extension_is_active (extension)); + gtk_widget_set_sensitive (GTK_WIDGET (button_disable), + midori_extension_is_active (extension)); + } + } + return; +} + static void midori_extensions_init (MidoriExtensions* extensions) { @@ -315,6 +362,9 @@ midori_extensions_init (MidoriExtensions* extensions) g_signal_connect (extensions->treeview, "row-activated", G_CALLBACK (midori_extensions_treeview_row_activated_cb), extensions); + g_signal_connect (extensions->treeview, "cursor-changed", + G_CALLBACK (midori_extensions_treeview_cursor_changed_cb), + extensions); gtk_widget_show (extensions->treeview); gtk_box_pack_start (GTK_BOX (extensions), extensions->treeview, TRUE, TRUE, 0); } From 68f00fb31c8125190969dd20137a72eb15f6f0d4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 04:15:16 +0100 Subject: [PATCH 0821/2970] Add function to obtain the action group of the browser --- midori/midori-browser.c | 20 ++++++++++++++++++++ midori/midori-browser.h | 3 +++ 2 files changed, 23 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index be6b919c..8758de1f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4507,6 +4507,26 @@ midori_browser_activate_action (MidoriBrowser* browser, g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name); } +/** + * midori_browser_get_action_group: + * @browser: a #MidoriBrowser + * + * Retrieves the action group holding all actions used + * by the browser. It allows obtaining individual + * actions and adding new actions. + * + * Return value: the action group of the browser + * + * Since: 0.1.4 + **/ +GtkActionGroup* +midori_browser_get_action_group (MidoriBrowser* browser) +{ + g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL); + + return browser->action_group; +} + /** * midori_browser_set_current_uri: * @browser: a #MidoriBrowser diff --git a/midori/midori-browser.h b/midori/midori-browser.h index cc2781b1..92a61779 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -100,6 +100,9 @@ void midori_browser_activate_action (MidoriBrowser* browser, const gchar* name); +GtkActionGroup* +midori_browser_get_action_group (MidoriBrowser* browser); + void midori_browser_set_current_uri (MidoriBrowser* browser, const gchar* uri); From c02e181750bfe1deecd56ad0dc3d502795d2ff6b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 14:02:36 +0100 Subject: [PATCH 0822/2970] Only disconnect signals when we actually have search engines --- midori/midori-searchaction.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index b789981b..7a64e41a 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1024,12 +1024,15 @@ static void midori_search_action_treeview_destroy_cb (GtkWidget* treeview, MidoriSearchAction* search_action) { - g_signal_handlers_disconnect_by_func ( - search_action->search_engines, - midori_search_action_dialog_engines_add_item_cb, search_action); - g_signal_handlers_disconnect_by_func ( - search_action->search_engines, - midori_search_action_dialog_engines_remove_item_cb, search_action); + if (search_action->search_engines) + { + g_signal_handlers_disconnect_by_func ( + search_action->search_engines, + midori_search_action_dialog_engines_add_item_cb, search_action); + g_signal_handlers_disconnect_by_func ( + search_action->search_engines, + midori_search_action_dialog_engines_remove_item_cb, search_action); + } } /** From 5b2380433ba4b44113562c2c50b0a42b29beda8d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 14:03:23 +0100 Subject: [PATCH 0823/2970] Only apply settings on the web view if we actually have any --- midori/midori-view.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 928e39e8..2b0a2023 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1602,10 +1602,14 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_frame_load_done_cb, view, NULL); - g_object_set (view->web_view, "settings", view->settings, NULL); - if (katze_object_has_property (view->web_view, "full-content-zoom")) - g_object_set (view->web_view, "full-content-zoom", - katze_object_get_boolean (view->settings, "zoom-text-and-images"), NULL); + if (view->settings) + { + g_object_set (view->web_view, "settings", view->settings, NULL); + if (katze_object_has_property (view->web_view, "full-content-zoom")) + g_object_set (view->web_view, "full-content-zoom", + katze_object_get_boolean (view->settings, + "zoom-text-and-images"), NULL); + } gtk_widget_show (view->web_view); gtk_container_add (GTK_CONTAINER (view), view->web_view); From 8ec0e53441cbdaffc065edbb1f285859114fce82 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 14:05:01 +0100 Subject: [PATCH 0824/2970] Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon. --- midori/midori-browser.c | 182 ++++++++++++++++++++++++++++------------ 1 file changed, 127 insertions(+), 55 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8758de1f..db0cc9c0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -80,6 +80,11 @@ struct _MidoriBrowser KatzeArray* history; KatzeNet* net; + + gboolean show_navigationbar; + gboolean show_statusbar; + gboolean progress_in_location; + gboolean remember_last_visited_pages; }; #if HAVE_HILDON @@ -205,6 +210,17 @@ _midori_browser_update_actions (MidoriBrowser* browser) } } +static gboolean +midori_browser_view_can_set_encoding (MidoriView* view) +{ + static GParamSpec* pspec = NULL; + if (G_UNLIKELY (!pspec)) + pspec = g_object_class_find_property ( + g_type_class_peek (WEBKIT_TYPE_WEB_VIEW), "custom-encoding"); + /* Web views and zoom, source views can't, so zoom means encoding */ + return pspec && midori_view_can_zoom_in (view); +} + static void _midori_browser_update_interface (MidoriBrowser* browser) { @@ -238,9 +254,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomNormal", midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0); _action_set_sensitive (browser, "Encoding", - midori_view_can_zoom_in (MIDORI_VIEW (view)) - && g_object_class_find_property ( - g_type_class_peek (WEBKIT_TYPE_WEB_VIEW), "custom-encoding")); + midori_browser_view_can_set_encoding (MIDORI_VIEW (view))); _action_set_sensitive (browser, "SourceView", midori_view_can_view_source (MIDORI_VIEW (view))); _action_set_sensitive (browser, "Find", @@ -263,8 +277,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) "tooltip", _("Reload the current page"), "sensitive", can_reload, NULL); gtk_widget_hide (browser->progressbar); - if (!katze_object_get_boolean (browser->settings, "show-navigationbar") - && !katze_object_get_boolean (browser->settings, "show-statusbar")) + if (!browser->show_navigationbar && !browser->show_statusbar) gtk_widget_hide (browser->navigationbar); } else @@ -276,9 +289,9 @@ _midori_browser_update_interface (MidoriBrowser* browser) gtk_widget_show (browser->progressbar); if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !GTK_WIDGET_VISIBLE (browser->navigationbar) && - katze_object_get_boolean (browser->settings, "progress-in-location")) + browser->progress_in_location) gtk_widget_show (browser->navigationbar); - if (katze_object_get_boolean (browser->settings, "progress-in-location")) + if (browser->progress_in_location) { action = _action_by_name (browser, "Location"); midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), @@ -338,7 +351,7 @@ _midori_browser_update_progress (MidoriBrowser* browser, gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), message); g_free (message); - if (!katze_object_get_boolean (browser->settings, "progress-in-location")) + if (!browser->progress_in_location) progress = 0.0; midori_location_action_set_progress (action, progress); } @@ -372,7 +385,7 @@ midori_view_notify_icon_cb (MidoriView* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - if (katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) + if (browser->remember_last_visited_pages) midori_location_action_set_icon_for_uri ( MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); } @@ -391,8 +404,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) { - if (katze_object_get_boolean (browser->settings, - "remember-last-visited-pages")) + if (browser->remember_last_visited_pages) midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); } @@ -459,7 +471,7 @@ midori_view_notify_title_cb (GtkWidget* view, uri = midori_view_get_display_uri (MIDORI_VIEW (view)); title = midori_view_get_display_title (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); - if (katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) + if (browser->remember_last_visited_pages) midori_location_action_set_title_for_uri ( MIDORI_LOCATION_ACTION (action), title, uri); if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_COMMITTED) @@ -467,8 +479,7 @@ midori_view_notify_title_cb (GtkWidget* view, KatzeItem* item; KatzeItem* proxy; - if (browser->history && - katze_object_get_boolean (browser->settings, "remember-last-visited-pages")) + if (browser->history && browser->remember_last_visited_pages) { item = g_object_get_data (G_OBJECT (view), "history-item-added"); proxy = midori_view_get_proxy_item (MIDORI_VIEW (view)); @@ -534,6 +545,9 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* entry_uri; GtkWidget* combo_folder; + if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser)) + return; + if (is_folder) title = new_bookmark ? _("New folder") : _("Edit folder"); else @@ -740,6 +754,9 @@ midori_browser_save_uri (MidoriBrowser* browser, gchar* last_slash; gchar* folder; + if (!GTK_WIDGET_VISIBLE (browser)) + return; + dialog = gtk_file_chooser_dialog_new ( _("Save file as"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE, @@ -1011,7 +1028,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_browser_tab_leave_notify_event_cb, browser, NULL); - if (katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) + if (browser->settings && + katze_object_get_boolean (browser->settings, "open-tabs-next-to-current")) { n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook)); gtk_notebook_insert_page (GTK_NOTEBOOK (browser->notebook), view, @@ -1347,6 +1365,9 @@ _action_open_activate (GtkAction* action, gboolean folder_set = FALSE; GtkWidget* dialog; + if (!GTK_WIDGET_VISIBLE (browser)) + return; + dialog = gtk_file_chooser_dialog_new ( _("Open file"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN, @@ -1479,7 +1500,7 @@ _action_cut_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); - if (G_LIKELY (widget)) + if (G_LIKELY (widget) && g_signal_lookup ("cut-clipboard", G_OBJECT_TYPE (widget))) g_signal_emit_by_name (widget, "cut-clipboard"); } @@ -1488,7 +1509,7 @@ _action_copy_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); - if (G_LIKELY (widget)) + if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget))) g_signal_emit_by_name (widget, "copy-clipboard"); } @@ -1497,7 +1518,7 @@ _action_paste_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser)); - if (G_LIKELY (widget)) + if (G_LIKELY (widget) && g_signal_lookup ("paste-clipboard", G_OBJECT_TYPE (widget))) g_signal_emit_by_name (widget, "paste-clipboard"); } @@ -1527,7 +1548,7 @@ _action_select_all_activate (GtkAction* action, { if (GTK_IS_EDITABLE (widget)) gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); - else + else if (g_signal_lookup ("select-all", G_OBJECT_TYPE (widget))) g_signal_emit_by_name (widget, "select-all", TRUE); } } @@ -1558,10 +1579,12 @@ _midori_browser_find (MidoriBrowser* browser, gboolean case_sensitive; GtkWidget* view; + if (!(view = midori_browser_get_current_tab (browser))) + return; + text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); case_sensitive = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); - view = midori_browser_get_current_tab (browser); midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); } @@ -1947,18 +1970,23 @@ static void _action_preferences_activate (GtkAction* action, MidoriBrowser* browser) { - /* Show the preferences dialog. Create it if necessary. */ static GtkWidget* dialog = NULL; - if (GTK_IS_DIALOG (dialog)) - gtk_window_present (GTK_WINDOW (dialog)); - else + + if (!browser->settings || !GTK_WIDGET_VISIBLE (browser)) + return; + + if (!dialog) { dialog = midori_preferences_new (GTK_WINDOW (browser), browser->settings); g_signal_connect (dialog, "response", G_CALLBACK (midori_preferences_response_help_cb), browser); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_widget_show (dialog); } + else + gtk_window_present (GTK_WINDOW (dialog)); } static void @@ -1966,7 +1994,8 @@ _action_menubar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - g_object_set (browser->settings, "show-menubar", active, NULL); + if (browser->settings) + g_object_set (browser->settings, "show-menubar", active, NULL); #if !HAVE_HILDON sokoke_widget_set_visible (browser->menubar, active); #endif @@ -1977,7 +2006,8 @@ _action_navigationbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - g_object_set (browser->settings, "show-navigationbar", active, NULL); + if (browser->settings) + g_object_set (browser->settings, "show-navigationbar", active, NULL); sokoke_widget_set_visible (browser->navigationbar, active); } @@ -1986,7 +2016,8 @@ _action_bookmarkbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - g_object_set (browser->settings, "show-bookmarkbar", active, NULL); + if (browser->settings) + g_object_set (browser->settings, "show-bookmarkbar", active, NULL); sokoke_widget_set_visible (browser->bookmarkbar, active); } @@ -1995,7 +2026,8 @@ _action_statusbar_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - g_object_set (browser->settings, "show-statusbar", active, NULL); + if (browser->settings) + g_object_set (browser->settings, "show-statusbar", active, NULL); #if !HAVE_HILDON sokoke_widget_set_visible (browser->statusbar, active); #endif @@ -2011,8 +2043,10 @@ _action_reload_stop_activate (GtkAction* action, gint x, y; gboolean from_cache; + if (!(view = midori_browser_get_current_tab (browser))) + return; + g_object_get (action, "stock-id", &stock_id, NULL); - view = midori_browser_get_current_tab (browser); /* Refresh or stop, depending on the stock id */ if (!strcmp (stock_id, GTK_STOCK_REFRESH)) @@ -2060,7 +2094,7 @@ _action_view_encoding_activate (GtkAction* action, MidoriBrowser* browser) { GtkWidget* view = midori_browser_get_current_tab (browser); - if (view) + if (view && midori_browser_view_can_set_encoding (MIDORI_VIEW (view))) { const gchar* name; GtkWidget* web_view; @@ -2183,7 +2217,11 @@ _action_source_view_activate (GtkAction* action, if (!(view = midori_browser_get_current_tab (browser))) return; - g_object_get (browser->settings, "text-editor", &text_editor, NULL); + if (browser->settings) + g_object_get (browser->settings, "text-editor", &text_editor, NULL); + else + text_editor = NULL; + if (text_editor && *text_editor) { katze_net_load_uri (browser->net, @@ -2212,6 +2250,9 @@ static void _action_fullscreen_activate (GtkAction* action, MidoriBrowser* browser) { + if (!GTK_WIDGET (browser)->window) + return; + GdkWindowState state = gdk_window_get_state (GTK_WIDGET (browser)->window); if (state & GDK_WINDOW_STATE_FULLSCREEN) gtk_window_unfullscreen (GTK_WINDOW (browser)); @@ -2243,6 +2284,9 @@ _action_homepage_activate (GtkAction* action, { gchar* homepage; + if (!browser->settings) + return; + g_object_get (browser->settings, "homepage", &homepage, NULL); midori_browser_set_current_uri (browser, homepage); g_free (homepage); @@ -2252,7 +2296,7 @@ static void _action_location_activate (GtkAction* action, MidoriBrowser* browser) { - if (!katze_object_get_boolean (browser->settings, "show-navigationbar")) + if (!browser->show_navigationbar) gtk_widget_show (browser->navigationbar); } @@ -2274,7 +2318,7 @@ static void _action_location_focus_out (GtkAction* action, MidoriBrowser* browser) { - if (!katze_object_get_boolean (browser->settings, "show-navigationbar")) + if (!browser->show_navigationbar) gtk_widget_hide (browser->navigationbar); } @@ -2447,8 +2491,7 @@ static void _action_search_focus_out (GtkAction* action, MidoriBrowser* browser) { - if (GTK_WIDGET_VISIBLE (browser->statusbar) && - !katze_object_get_boolean (browser->settings, "show-navigationbar")) + if (GTK_WIDGET_VISIBLE (browser->statusbar) && !browser->show_navigationbar) gtk_widget_hide (browser->navigationbar); } @@ -2666,14 +2709,21 @@ static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* dialog; + static GtkWidget* dialog = NULL; - dialog = midori_search_action_get_dialog ( - MIDORI_SEARCH_ACTION (_action_by_name (browser, "Search"))); - if (GTK_WIDGET_VISIBLE (dialog)) - gtk_window_present (GTK_WINDOW (dialog)); - else + if (!GTK_WIDGET_VISIBLE (browser)) + return; + + if (!dialog) + { + dialog = midori_search_action_get_dialog ( + MIDORI_SEARCH_ACTION (_action_by_name (browser, "Search"))); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); gtk_widget_show (dialog); + } + else + gtk_window_present (GTK_WINDOW (dialog)); } static void @@ -2790,7 +2840,8 @@ _action_panel_activate (GtkToggleAction* action, MidoriBrowser* browser) { gboolean active = gtk_toggle_action_get_active (action); - g_object_set (browser->settings, "show-panel", active, NULL); + if (browser->settings) + g_object_set (browser->settings, "show-panel", active, NULL); sokoke_widget_set_visible (browser->panel, active); } @@ -2799,7 +2850,8 @@ midori_browser_panel_timeout (GtkWidget* hpaned) { gboolean position = gtk_paned_get_position (GTK_PANED (hpaned)); MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (hpaned)); - g_object_set (browser->settings, "last-panel-position", position, NULL); + if (browser->settings) + g_object_set (browser->settings, "last-panel-position", position, NULL); browser->panel_timeout = 0; return FALSE; } @@ -2823,7 +2875,9 @@ midori_panel_notify_right_aligned_cb (MidoriPanel* panel, GtkWidget* hpaned = gtk_widget_get_parent (browser->panel); GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook); - g_object_set (browser->settings, "right-align-sidepanel", right_aligned, NULL); + if (browser->settings) + g_object_set (browser->settings, "right-align-sidepanel", + right_aligned, NULL); g_object_ref (browser->panel); g_object_ref (vpaned); @@ -2908,6 +2962,9 @@ _action_undo_tab_close_activate (GtkAction* action, KatzeItem* item; guint n; + if (!browser->trash) + return; + /* Reopen the most recent trash item */ last = katze_array_get_length (browser->trash) - 1; item = katze_array_get_nth_item (browser->trash, last); @@ -2921,8 +2978,11 @@ static void _action_trash_empty_activate (GtkAction* action, MidoriBrowser* browser) { - katze_array_clear (browser->trash); - _midori_browser_update_actions (browser); + if (browser->trash) + { + katze_array_clear (browser->trash); + _midori_browser_update_actions (browser); + } } static const GtkActionEntry entries[] = { @@ -4028,8 +4088,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) MidoriWindowState last_window_state; gboolean compact_sidepanel, right_align_sidepanel; gint last_panel_position, last_panel_page; - gboolean show_menubar, show_navigationbar, show_bookmarkbar; - gboolean show_panel, show_statusbar; + gboolean show_menubar, show_bookmarkbar; + gboolean show_panel; MidoriToolbarStyle toolbar_style; gchar* toolbar_items; gint last_web_search; @@ -4048,14 +4108,16 @@ _midori_browser_update_settings (MidoriBrowser* browser) "last-panel-position", &last_panel_position, "last-panel-page", &last_panel_page, "show-menubar", &show_menubar, - "show-navigationbar", &show_navigationbar, + "show-navigationbar", &browser->show_navigationbar, "show-bookmarkbar", &show_bookmarkbar, "show-panel", &show_panel, - "show-statusbar", &show_statusbar, + "show-statusbar", &browser->show_statusbar, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, "close-buttons-on-tabs", &close_buttons_on_tabs, + "progress-in-location", &browser->progress_in_location, + "remember-last-visited-pages", &browser->remember_last_visited_pages, NULL); screen = gtk_window_get_screen (GTK_WINDOW (browser)); @@ -4107,10 +4169,10 @@ _midori_browser_update_settings (MidoriBrowser* browser) midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page); _action_set_active (browser, "Menubar", show_menubar); - _action_set_active (browser, "Navigationbar", show_navigationbar); + _action_set_active (browser, "Navigationbar", browser->show_navigationbar); _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); _action_set_active (browser, "Panel", show_panel); - _action_set_active (browser, "Statusbar", show_statusbar); + _action_set_active (browser, "Statusbar", browser->show_statusbar); g_free (toolbar_items); } @@ -4136,6 +4198,14 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_get_boolean (&value)); else if (name == g_intern_string ("always-show-tabbar")) _toggle_tabbar_smartly (browser); + else if (name == g_intern_string ("show-navigationbar")) + browser->show_navigationbar = g_value_get_boolean (&value); + else if (name == g_intern_string ("show-statusbar")) + browser->show_statusbar = g_value_get_boolean (&value); + else if (name == g_intern_string ("progress-in-location")) + browser->progress_in_location = g_value_get_boolean (&value); + else if (name == g_intern_string ("remember-last-visited-pages")) + browser->remember_last_visited_pages = g_value_get_boolean (&value); else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); @@ -4481,9 +4551,11 @@ midori_browser_add_uri (MidoriBrowser* browser, g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (uri != NULL, -1); - view = g_object_new (MIDORI_TYPE_VIEW, - "settings", browser->settings, - NULL); + if (browser->settings) + view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, + "net", browser->net, NULL); + else + view = midori_view_new (browser->net); midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); From f799af8c0c290f90ef7d51684f8ab11df4d91183 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 22:33:37 +0100 Subject: [PATCH 0825/2970] Report to the web view we didn't handle if the MIME type is fine This caused blank pages to erroneously look as thought they were loading infinitely. In fact it is due to a bug in WebKit that this ever worked at all. --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 2b0a2023..3dfa9540 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1160,7 +1160,7 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, g_strrstr (mime_type, "script") || g_str_has_prefix (mime_type, "text/") || g_strrstr (mime_type, "xml")) #endif - return TRUE; + return FALSE; #if WEBKIT_CHECK_VERSION (1, 0, 0) uri = g_strdup_printf ("error:nodisplay %s", From dc357a40aaabb2998aaa224af6918035600cedda Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 23:03:23 +0100 Subject: [PATCH 0826/2970] Use the date format of the user locale to display history dates --- midori/main.c | 2 +- midori/midori-browser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index 721ce469..c474f6a5 100644 --- a/midori/main.c +++ b/midori/main.c @@ -759,7 +759,7 @@ midori_history_add_items (void* data, { parent = katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_added (KATZE_ITEM (parent), day); - strftime (token, sizeof (token), "%Y-%m-%d", + strftime (token, sizeof (token), "%x", localtime ((time_t *)&date)); katze_item_set_token (KATZE_ITEM (parent), token); katze_array_add_item (array, parent); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index db0cc9c0..63c8989f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3428,7 +3428,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, } if (!found) { - strftime (token, sizeof (token), "%Y-%m-%d", localtime (&now)); + strftime (token, sizeof (token), "%x", localtime (&now)); parent = katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_added (KATZE_ITEM (parent), day); katze_item_set_token (KATZE_ITEM (parent), token); From ff9085b40038be5da112f77af3f4dfae66c860aa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 23:46:41 +0100 Subject: [PATCH 0827/2970] Disable WebKit's authentication dialog if needed We need to handle WebKit possibly having an authentication dialog more expressly. Obviously we only ever want to see one dialog and we choose our own simply because it is localized. --- katze/katze-http-auth.c | 23 +++++++++++++++++++++-- midori/main.c | 5 +---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/katze/katze-http-auth.c b/katze/katze-http-auth.c index fd15d87c..4e4cd8a1 100644 --- a/katze/katze-http-auth.c +++ b/katze/katze-http-auth.c @@ -160,12 +160,29 @@ katze_http_auth_session_authenticate_cb (SoupSession* session, gtk_widget_show (dialog); } +static void +katze_http_auth_session_request_queued_cb (SoupSession* session, + SoupMessage* msg, + gpointer data) +{ + /* WebKit has its own authentication dialog in recent versions. + We want only one, and we choose our own to have localization. */ + GType type = g_type_from_name ("WebKitSoupAuthDialog"); + if (type) + soup_session_remove_feature_by_type (session, type); + + g_signal_connect (session, "authenticate", + G_CALLBACK (katze_http_auth_session_authenticate_cb), NULL); + g_signal_handlers_disconnect_by_func (session, + katze_http_auth_session_request_queued_cb, NULL); +} + static void katze_http_auth_attach (SoupSessionFeature* feature, SoupSession* session) { - g_signal_connect (session, "authenticate", - G_CALLBACK (katze_http_auth_session_authenticate_cb), NULL); + g_signal_connect (session, "request-queued", + G_CALLBACK (katze_http_auth_session_request_queued_cb), NULL); } static void @@ -174,6 +191,8 @@ katze_http_auth_detach (SoupSessionFeature* feature, { g_signal_handlers_disconnect_by_func (session, katze_http_auth_session_authenticate_cb, NULL); + g_signal_handlers_disconnect_by_func (session, + katze_http_auth_session_request_queued_cb, NULL); } static void diff --git a/midori/main.c b/midori/main.c index c474f6a5..bf2eceae 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1354,10 +1354,7 @@ soup_session_constructed_cb (GObject* object) g_signal_connect (settings, "notify::ident-string", G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); - /* Only add the Auth feature if WebKit didn't already */ - if (!g_signal_has_handler_pending (session, - g_signal_lookup ("authenticate", SOUP_TYPE_SESSION), 0, FALSE)) - soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); + soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); midori_soup_session_debug (session); feature = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL); From 0380d8bd2ef3be9ab30068f31a1c8593eb08e7cd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Mar 2009 00:29:44 +0100 Subject: [PATCH 0828/2970] Use libSoup to percent decode scripts, ie. bookmarklets --- midori/midori-view.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 3dfa9540..79869c4a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2529,10 +2529,27 @@ midori_view_execute_script (MidoriView* view, const gchar* script, gchar** exception) { + WebKitWebFrame* web_frame; + JSContextRef js_context; + #if HAVE_LIBSOUP + gchar* script_decoded; + #endif + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); g_return_val_if_fail (script != NULL, FALSE); /* FIXME Actually store exception. */ - webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), script); + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); + js_context = webkit_web_frame_get_global_context (web_frame); + #if HAVE_LIBSOUP + if ((script_decoded = soup_uri_decode (script))) + { + webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), + script_decoded); + g_free (script_decoded); + } + else + #endif + webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), script); return TRUE; } From 047f086a534b699718d55b879f21d83c41c9ba24 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 1 Mar 2009 14:55:25 +0100 Subject: [PATCH 0829/2970] Update Russian translation --- po/ru.po | 1066 +++++++++++++++++++++++++++++------------------------- 1 file changed, 569 insertions(+), 497 deletions(-) diff --git a/po/ru.po b/po/ru.po index 09c028f9..1a849f11 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-03 22:54+0100\n" -"PO-Revision-Date: 2009-02-08 17:51+0800\n" +"POT-Creation-Date: 2009-02-28 12:50+0800\n" +"PO-Revision-Date: 2009-02-28 13:16+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -18,1442 +18,1456 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Легковесный обозреватель интернет" +msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1950 -#: ../midori/main.c:2056 -#: ../midori/main.c:2065 -#: ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../midori/main.c:1599 +#: ../midori/main.c:1705 +#: ../midori/main.c:1714 +#: ../midori/main.c:1725 +#: ../midori/midori-websettings.c:265 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Обозреватель интернет" +msgstr "Интернет-обозреватель" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "_Закладка" - -#: ../midori/main.c:91 -#: ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "_Закладки" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "_Добавить закладку" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "_Консоль" - -#: ../midori/main.c:94 -msgid "_Extensions" -msgstr "_Дополнения" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "_Журнал" - -#: ../midori/main.c:96 -msgid "_Homepage" -msgstr "Д_омашняя страница" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "_Сценарии пользователя" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "С_тили пользователя" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "Но_вая вкладка" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "_Передачи" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "Закрытые _вкладки и окна" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "_Новое окно" - -#: ../midori/main.c:158 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:213 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:220 -#: ../midori/main.c:290 +#: ../midori/main.c:168 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:532 +#: ../midori/main.c:480 msgid "File not found." msgstr "Файл не найден." -#: ../midori/main.c:540 -#: ../midori/main.c:549 +#: ../midori/main.c:488 +#: ../midori/main.c:497 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/main.c:571 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:603 +#: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:704 -#: ../midori/main.c:738 -#: ../midori/main.c:754 +#: ../midori/main.c:652 +#: ../midori/main.c:686 +#: ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:962 +#: ../midori/main.c:910 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:991 +#: ../midori/main.c:939 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:1121 -#: ../midori/sokoke.c:531 +#: ../midori/main.c:1069 +#: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/main.c:1142 -#: ../midori/main.c:1169 -#: ../midori/main.c:1197 +#: ../midori/main.c:1090 +#: ../midori/main.c:1117 +#: ../midori/main.c:1145 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 -#: ../midori/main.c:1245 +#: ../midori/main.c:1169 +#: ../midori/main.c:1193 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:1271 -#: ../midori/midori-preferences.c:386 +#: ../midori/main.c:1224 +#: ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "Передачи" -#: ../midori/main.c:1312 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "Требуется авторизация" - -#: ../midori/main.c:1652 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" -"Для просмотра этой страницы требуются\n" -"имя пользователя и пароль:" - -#: ../midori/main.c:1666 -msgid "Username" -msgstr "Имя пользователя" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "Пароль" - -#: ../midori/main.c:1783 +#: ../midori/main.c:1401 msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1798 +#: ../midori/main.c:1416 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1802 +#: ../midori/main.c:1420 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1807 +#: ../midori/main.c:1425 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1950 +#: ../midori/main.c:1599 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1982 +#: ../midori/main.c:1631 #: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:2005 +#: ../midori/main.c:1654 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:2007 +#: ../midori/main.c:1656 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:2009 +#: ../midori/main.c:1658 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:2053 +#: ../midori/main.c:1702 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:2077 +#: ../midori/main.c:1726 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:2079 +#: ../midori/main.c:1728 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:2106 +#: ../midori/main.c:1755 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:2184 +#: ../midori/main.c:1823 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:2196 +#: ../midori/main.c:1835 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:2211 +#: ../midori/main.c:1850 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:2224 +#: ../midori/main.c:1863 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:2237 +#: ../midori/main.c:1876 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:2249 +#: ../midori/main.c:1888 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2265 +#: ../midori/main.c:1904 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-browser.c:258 -#: ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:263 +#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3001 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:270 -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:275 +#: ../midori/midori-browser.c:2998 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:337 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:362 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:538 +msgid "New folder" +msgstr "Создание папки" + +#: ../midori/midori-browser.c:538 +msgid "Edit folder" +msgstr "Изменить папку" + +#: ../midori/midori-browser.c:540 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:540 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:570 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:559 -#: ../midori/midori-searchaction.c:854 +#: ../midori/midori-browser.c:583 +#: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:578 -#: ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:602 +#: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:621 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:601 -#: ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:626 +#: ../midori/midori-browser.c:667 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:744 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1351 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2524 -#: ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2591 +#: ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "Открыть всё в отдельных _вкладках" + +#: ../midori/midori-browser.c:2598 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2526 -#: ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2601 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "Неделю назад" - -#: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "%d дней назад" - -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "Сегодня" - -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "Вчера" - -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:2744 msgid "A lightweight web browser." -msgstr "Легковесный обозреватель интернет." +msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:2752 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "Удалить все записи в журнале?" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:2929 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:2932 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:2935 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:2938 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:2941 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:2943 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:2944 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:2946 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:2947 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:2950 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:2953 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:2955 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:2958 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:2961 +#: ../midori/midori-browser.c:2964 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:2967 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:2970 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:2973 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:2976 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:2978 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:2979 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:2981 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:2982 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:2985 msgid "_Quick Find" msgstr "_Быстрый Поиск" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:2986 msgid "Quickly jump to a word or phrase" -msgstr "Перепрыгнуть на слово или фразу" +msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:2989 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:2991 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:2992 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3004 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3007 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3010 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3181 -#: ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:3011 +msgid "_Encoding" +msgstr "_Кодировка" + +#: ../midori/midori-browser.c:3013 +msgid "_Automatic" +msgstr "_Автоматически" + +#: ../midori/midori-browser.c:3016 +#: ../midori/midori-websettings.c:192 +msgid "Chinese (BIG5)" +msgstr "Китайская (BIG5)" + +#: ../midori/midori-browser.c:3019 +#: ../midori/midori-websettings.c:193 +msgid "Japanese (SHIFT_JIS)" +msgstr "Японская (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3022 +#: ../midori/midori-websettings.c:194 +msgid "Russian (KOI8-R)" +msgstr "Кириллица (KOI8-R)" + +#: ../midori/midori-browser.c:3025 +#: ../midori/midori-websettings.c:195 +msgid "Unicode (UTF-8)" +msgstr "Юникод (UTF-8)" + +#: ../midori/midori-browser.c:3028 +#: ../midori/midori-websettings.c:196 +msgid "Western (ISO-8859-1)" +msgstr "Западно-европейская (ISO-8859-1)" + +#: ../midori/midori-browser.c:3031 +#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:269 +msgid "Custom..." +msgstr "Другая..." + +#: ../midori/midori-browser.c:3034 +#: ../midori/midori-view.c:1076 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3035 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3037 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3038 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:3042 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3044 msgid "_Go" -msgstr "_Перейти" +msgstr "П_ереход" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3047 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3050 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3053 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3055 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3056 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3205 -#: ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:3058 +#: ../midori/midori-view.c:1048 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3059 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3210 -#: ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:3063 +#: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "Удалить запись из журнала" - -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "Очистить весь журнал" - -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "Добавить выделенную запись в закладки" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3064 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3066 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3067 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3071 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3072 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3074 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3075 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3077 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3079 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3080 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3082 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3083 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3085 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3086 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3089 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3096 msgid "P_rivate Browsing" -msgstr "Кон_фиденциальный режим" +msgstr "Кон)фиденциальный режим" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3097 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3102 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3103 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3106 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3107 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3110 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3111 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3114 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3115 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3118 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3119 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:3122 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3123 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3542 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:3549 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3551 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3575 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3577 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:3596 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:3609 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:3611 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:3624 +#: ../midori/sokoke.c:772 +msgid "_Bookmarks" +msgstr "_Закладки" + +#: ../midori/midori-browser.c:3626 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3639 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3641 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:4001 -#: ../midori/midori-preferences.c:597 -msgid "History" -msgstr "Журнал" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:3804 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:3829 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:4076 +#: ../midori/midori-browser.c:3834 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:3839 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:3847 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:3857 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:4141 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:199 -#: ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:479 +msgid "Align sidepanel on the right" +msgstr "Расположить панель справа" + +#: ../midori/midori-panel.c:231 +#: ../midori/midori-websettings.c:480 +msgid "Whether to align the sidepanel on the right" +msgstr "Расположить боковую панель справа" + +#: ../midori/midori-panel.c:241 +#: ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:169 -#: ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:175 +#: ../midori/midori-view.c:1811 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:170 -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:176 +#: ../midori/midori-websettings.c:499 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:177 msgid "Last open pages" -msgstr "Последние закрытые страницы" +msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:186 -msgid "Chinese (BIG5)" -msgstr "Китайская (BIG5)" - -#: ../midori/midori-websettings.c:187 -msgid "Japanese (SHIFT_JIS)" -msgstr "Японская (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:188 -msgid "Russian (KOI8-R)" -msgstr "Кириллица (KOI8-R)" - -#: ../midori/midori-websettings.c:189 -msgid "Unicode (UTF-8)" -msgstr "Юникод (UTF-8)" - -#: ../midori/midori-websettings.c:190 -msgid "Western (ISO-8859-1)" -msgstr "Западно-европейская (ISO-8859-1)" - -#: ../midori/midori-websettings.c:191 -#: ../midori/midori-websettings.c:263 -msgid "Custom..." -msgstr "Другая..." - -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:212 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:213 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:214 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:229 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:230 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:231 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:232 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:233 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:248 msgid "All cookies" msgstr "Все куки" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:249 msgid "Session cookies" msgstr "Куки сессии" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:250 #: ../panels/midori-addons.c:96 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:266 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:267 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:268 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:309 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:310 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:318 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:319 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:327 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:328 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:353 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:354 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:363 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:364 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:372 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:373 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:382 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:383 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:391 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:392 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:400 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:401 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:409 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:410 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:418 msgid "Show Statusbar" msgstr "Показать вкладку статуса" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:419 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:428 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:429 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:445 +msgid "Show progress in location entry" +msgstr "Показывать прогресс загрузки страницы в адресной строке" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show loading progress in the location entry" +msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" + +#: ../midori/midori-websettings.c:454 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:455 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:463 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:464 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:489 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:490 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:500 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:515 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:516 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:524 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:525 msgid "The folder downloaded files are saved to" -msgstr "Каталог, в который сохранялись файлы" +msgstr "Каталог, в который будут сохраняться файлы" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:533 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:534 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:542 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:543 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:551 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:552 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:560 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:561 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:571 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:572 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:580 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:581 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:590 msgid "Open new pages in" -msgstr "Открыть новую страницу в" +msgstr "Открывать новую страницу в" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:591 msgid "Where to open new pages" -msgstr "Где открыть новую страницу в" +msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:601 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:602 msgid "Where to open externally opened pages" -msgstr "Расположение сторонних страницы при открытии" +msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:615 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:616 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:624 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:625 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:633 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:634 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:642 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:643 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:694 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:695 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:705 msgid "Accept cookies" msgstr "Разрешить куки" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:706 msgid "What type of cookies to accept" msgstr "Тип принимаемых куки" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:719 msgid "Original cookies only" msgstr "Только оригинальные куки" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:720 msgid "Accept cookies from the original website only" msgstr "Принимать куки только с оригинального веб-сайта" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:728 msgid "Maximum cookie age" msgstr "Максимальный возраст куки" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:729 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения куки" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:739 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:740 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:748 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:749 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:757 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:758 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:766 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:767 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:777 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:778 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" +#: ../midori/midori-websettings.c:797 +msgid "Detect proxy server automatically" +msgstr "Автоматически обнаруживать прокси-сервер" + +#: ../midori/midori-websettings.c:798 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Брать данные о прокси-сервере из переменных окружения" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:818 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:819 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации браузера" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:839 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:840 msgid "The application identification string" msgstr "Строка идентификатора приложения" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:852 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:853 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#: ../midori/midori-view.c:629 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:959 +msgid "Open _Link" +msgstr "_Открыть ссылку" + +#: ../midori/midori-view.c:961 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Window" +msgstr "Открыть ссылку в новом _окне" + +#: ../midori/midori-view.c:988 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:996 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:1018 +msgid "_Search the Web" +msgstr "_Поиск в сети" + +#: ../midori/midori-view.c:1027 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1501 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1654 msgid "Source" msgstr "Исходный код" -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:1678 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:1694 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-preferences.c:91 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "Запуск" #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:462 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:458 -#: ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 +#: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:484 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:485 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" msgstr "Текстовые поля могут изменять размер" -#: ../midori/midori-preferences.c:474 -#: ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 +#: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-preferences.c:478 -#: ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 +#: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Использовать модули" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" msgstr "Разрешить встроенные объекты модулей на страницах" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:515 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:516 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:525 msgid "Browsing" msgstr "Навигация" -#: ../midori/midori-preferences.c:542 -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:562 +#: ../midori/midori-preferences.c:563 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:590 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:597 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:604 msgid "Web Cookies" msgstr "Разрешить куки" -#: ../midori/midori-preferences.c:592 -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:617 +#: ../midori/midori-preferences.c:629 msgid "days" msgstr "дней" +#: ../midori/midori-preferences.c:622 +#: ../panels/midori-history.c:104 +msgid "History" +msgstr "Журнал" + #: ../midori/midori-searchaction.c:455 #: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:810 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:810 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:838 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:882 -msgid "_Icon (name or file):" -msgstr "_Значок (имя или файл):" +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "_Значок:" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1073 +#: ../midori/midori-searchaction.c:1074 msgid "Manage Search Engines" msgstr "Управление поисковыми сервисами" -#: ../midori/sokoke.c:101 -#: ../midori/sokoke.c:113 +#: ../midori/sokoke.c:109 +#: ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "Внимание: используется учётная запись суперпользователя!" +#: ../midori/sokoke.c:771 +msgid "_Bookmark" +msgstr "_Закладка" + +#: ../midori/sokoke.c:773 +msgid "_Add Bookmark" +msgstr "_Добавить закладку" + +#: ../midori/sokoke.c:774 +msgid "_Console" +msgstr "_Консоль" + +#: ../midori/sokoke.c:775 +msgid "_Extensions" +msgstr "_Дополнения" + +#: ../midori/sokoke.c:776 +msgid "_History" +msgstr "_Журнал" + +#: ../midori/sokoke.c:777 +msgid "_Homepage" +msgstr "Д_омашняя страница" + +#: ../midori/sokoke.c:778 +msgid "_Userscripts" +msgstr "_Сценарии пользователя" + +#: ../midori/sokoke.c:779 +msgid "User_styles" +msgstr "С_тили пользователя" + +#: ../midori/sokoke.c:780 +msgid "New _Tab" +msgstr "Но_вая вкладка" + +#: ../midori/sokoke.c:781 +msgid "_Transfers" +msgstr "_Передачи" + +#: ../midori/sokoke.c:782 +msgid "_Closed Tabs and Windows" +msgstr "Закрытые _вкладки и окна" + +#: ../midori/sokoke.c:783 +msgid "New _Window" +msgstr "_Новое окно" + #: ../midori/gjs.c:742 #: ../midori/gjs.c:832 #, c-format @@ -1490,19 +1504,23 @@ msgstr "_Включить" msgid "_Disable" msgstr "_Отключить" -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:236 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:244 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "Создать папку" + +#: ../panels/midori-bookmarks.c:589 msgid "Separator" msgstr "Разделитель" @@ -1514,11 +1532,65 @@ msgstr "Консоль" msgid "Extensions" msgstr "Дополнения" +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "Удалить все записи в журнале?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "Добавить выделенную запись в закладки" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "Удалить запись из журнала" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "Очистить весь журнал" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "Неделю назад" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "%d дней назад" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "Сегодня" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "Вчера" + #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:52 +#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "Модули" +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "Требуется авторизация" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Для просмотра этой страницы требуются\n" +"имя пользователя и пароль:" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "Имя пользователя" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "Пароль" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1566,14 +1638,16 @@ msgstr "Контейнер" msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "Изображения" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Сценарии" +#~ msgid "_Icon (name or file):" +#~ msgstr "_Значок (имя или файл):" #~ msgid "URIs" #~ msgstr "Идентификаторы URI" #~ msgid "[URIs]" @@ -1678,8 +1752,6 @@ msgstr "Сценарии" #~ msgstr "URI загруженной страницы" #~ msgid "The title of the currently loaded page" #~ msgstr "Заголовок загруженной страницы" -#~ msgid "Icon" -#~ msgstr "Значок" #~ msgid "The current loading status" #~ msgstr "Статус загрузки" #~ msgid "The current loading progress" From 73feaf9ae18d8cd968b0e5b2ffc1c24856313be2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Mar 2009 19:21:27 +0100 Subject: [PATCH 0830/2970] Add a Preference to disable automatic inline find while typing --- midori/midori-preferences.c | 2 ++ midori/midori-view.c | 8 +++++++- midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index bca63a0a..072d99d8 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -506,6 +506,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button, 1, 2, 3, 4); button = katze_property_proxy (settings, "zoom-text-and-images", NULL); SPANNED_ADD (button, 0, 1, 4, 5); + button = katze_property_proxy (settings, "find-while-typing", NULL); + SPANNED_ADD (button, 1, 2, 4, 5); label = katze_property_label (settings, "location-entry-search"); INDENTED_ADD (label, 0, 1, 5, 6); entry = katze_property_proxy (settings, "location-entry-search", NULL); diff --git a/midori/midori-view.c b/midori/midori-view.c index 79869c4a..5330122a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -67,6 +67,7 @@ struct _MidoriView gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; MidoriNewPage open_new_pages_in; + gboolean find_while_typing; GtkWidget* menu_item; GtkWidget* tab_label; @@ -817,7 +818,7 @@ gtk_widget_key_press_event_cb (WebKitWebView* web_view, if (character == (event->keyval | 0x01000000)) return FALSE; - if (!webkit_web_view_can_cut_clipboard (web_view) + if (view->find_while_typing && !webkit_web_view_can_cut_clipboard (web_view) && !webkit_web_view_can_paste_clipboard (web_view)) { gchar* text = g_strdup_printf ("%c", character); @@ -1365,6 +1366,7 @@ _midori_view_update_settings (MidoriView* view) "open-new-pages-in", &view->open_new_pages_in, "middle-click-opens-selection", &view->middle_click_opens_selection, "open-tabs-in-the-background", &view->open_tabs_in_the_background, + "find-while-typing", &view->find_while_typing, NULL); if (view->web_view) @@ -1412,6 +1414,10 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, { view->open_tabs_in_the_background = g_value_get_boolean (&value); } + else if (name == g_intern_string ("find-while-typing")) + { + view->find_while_typing = g_value_get_boolean (&value); + } g_value_unset (&value); } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index cf077e22..319ac612 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -63,6 +63,7 @@ struct _MidoriWebSettings gboolean open_popups_in_tabs; gboolean zoom_text_and_images; + gboolean find_while_typing; MidoriAcceptCookies accept_cookies; gboolean original_cookies_only; gint maximum_cookie_age; @@ -131,6 +132,7 @@ enum PROP_ENFORCE_96_DPI, PROP_ENABLE_DEVELOPER_EXTRAS, PROP_ZOOM_TEXT_AND_IMAGES, + PROP_FIND_WHILE_TYPING, PROP_ACCEPT_COOKIES, PROP_ORIGINAL_COOKIES_ONLY, PROP_MAXIMUM_COOKIE_AGE, @@ -698,6 +700,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE) | G_PARAM_STATIC_STRINGS)); + /** + * MidoriWebSettings:find-while-typing: + * + * Whether to automatically find inline while typing something. + * + * Since: 0.1.4 + */ + g_object_class_install_property (gobject_class, + PROP_FIND_WHILE_TYPING, + g_param_spec_boolean ( + "find-while-typing", + _("Find inline while typing"), + _("Whether to automatically find inline while typing"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_ACCEPT_COOKIES, g_param_spec_enum ( @@ -1104,6 +1122,9 @@ midori_web_settings_set_property (GObject* object, case PROP_ZOOM_TEXT_AND_IMAGES: web_settings->zoom_text_and_images = g_value_get_boolean (value); break; + case PROP_FIND_WHILE_TYPING: + web_settings->find_while_typing = g_value_get_boolean (value); + break; case PROP_ACCEPT_COOKIES: web_settings->accept_cookies = g_value_get_enum (value); break; @@ -1277,6 +1298,9 @@ midori_web_settings_get_property (GObject* object, case PROP_ZOOM_TEXT_AND_IMAGES: g_value_set_boolean (value, web_settings->zoom_text_and_images); break; + case PROP_FIND_WHILE_TYPING: + g_value_set_boolean (value, web_settings->find_while_typing); + break; case PROP_ACCEPT_COOKIES: g_value_set_enum (value, web_settings->accept_cookies); break; From 24330198561c361ae0adf7dde4fd613c094f51b4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Mar 2009 20:21:35 +0100 Subject: [PATCH 0831/2970] Mention the MIME type of a document that cannot be displayed. --- midori/midori-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5330122a..a4d6d830 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1691,9 +1691,9 @@ midori_view_set_uri (MidoriView* view, "

%s

" "" - "

The document %s cannot be displayed." + "

The document %s of type %s cannot be displayed." "", - title, title, view->uri); + title, title, view->uri, view->mime_type); g_free (title); } else if (!strncmp (uri, "error:nodocs ", 13)) From 7f250e9ee318ec7dfdcc3aee69072d14ff6c0f8a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Mar 2009 20:39:02 +0100 Subject: [PATCH 0832/2970] Update French translation --- po/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index bdf8a62d..cbf005ef 100644 --- a/po/fr.po +++ b/po/fr.po @@ -606,7 +606,7 @@ msgstr "Recherche _toile..." #: ../midori/midori-browser.c:3471 msgid "Run a web search" -msgstr "Lance une recherche toile" +msgstr "Lance une recherche sur la toile" #: ../midori/midori-browser.c:3490 msgid "Reopen a previously closed tab or window" @@ -813,11 +813,11 @@ msgstr "La dernière page enregistrée du panneau" #: ../midori/midori-websettings.c:372 msgid "Last Web search" -msgstr "Dernière recherche toile" +msgstr "Dernière recherche sur la toile" #: ../midori/midori-websettings.c:373 msgid "The last saved Web search" -msgstr "La dernière recherche toile enregistrée" +msgstr "La dernière recherche sur la toile enregistrée" #: ../midori/midori-websettings.c:382 msgid "Show Menubar" @@ -1032,7 +1032,7 @@ msgstr "Accepter les témoins" #: ../midori/midori-websettings.c:706 msgid "What type of cookies to accept" -msgstr "Type de témoins à accepter" +msgstr "Type de témoins (cookies) à accepter" #: ../midori/midori-websettings.c:719 msgid "Original cookies only" @@ -1106,7 +1106,7 @@ msgstr "Identifier comme" #: ../midori/midori-websettings.c:819 msgid "What to identify as to web pages" -msgstr "Comme s'identifier a pages toiles" +msgstr "Comme s'identifier a pages sur la toile" #: ../midori/midori-websettings.c:839 msgid "Identification string" @@ -1325,7 +1325,7 @@ msgstr "Vie privée" #: ../midori/midori-preferences.c:604 msgid "Web Cookies" -msgstr "Témoins de toile" +msgstr "Témoins de connexion" #: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 msgid "days" From c5c3e040d75fd258f5e1f587e4ee5f6f9f409358 Mon Sep 17 00:00:00 2001 From: Pascal Gervais Date: Sun, 1 Mar 2009 20:54:15 +0100 Subject: [PATCH 0833/2970] Update French translation --- AUTHORS | 1 + po/fr.po | 55 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/AUTHORS b/AUTHORS index 07d8aedb..5ad71dde 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,6 +38,7 @@ Translations: fr: Christian Dywan fr: Adrien Nader fr: Robert-André Mauchin + fr: Pascal Gervais gl: Miguel Anxo Bouzada hu: SZERVÁC Attila id: Andhika Padmawan diff --git a/po/fr.po b/po/fr.po index cbf005ef..cbb02c7a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,11 @@ # Christian Dywan 2008 # Adrien Nader 2008 # Robert-André Mauchin 2008 +# Pascal Gervais 2009 # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.2\n" +"Project-Id-Version: midori 0.1.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-02-22 19:30+0100\n" "PO-Revision-Date: 2009-01-22 03:07+0100\n" @@ -35,7 +36,7 @@ msgstr "Navigateur toile" #: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "La configuration n'a pu être chargée: %s\n" +msgstr "La configuration n'a pu être chargée : %s\n" #: ../midori/main.c:161 #, c-format @@ -53,38 +54,38 @@ msgstr "Fichier non trouvé." #: ../midori/main.c:488 ../midori/main.c:497 msgid "Malformed document." -msgstr "Document mal formé" +msgstr "Document mal formé." #: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" -msgstr "Échec d'ouvrir la banque de données: %s\n" +msgstr "Impossible d'ouvrir la base de données : %s\n" #: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" -msgstr "Échec d'exécuter une intruction de la banque de données: %s\n" +msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" #: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Impossible de supprimer de l'historique l'élément : %s\n" #: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" -msgstr "Échec de vider l'historique: %s\n" +msgstr "Impossible d'effacer l'historique : %s\n" #: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" -msgstr "" +msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #. i18n: Couldn't remove items that are older than n days #: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Impossible de supprimer de l'hitorique les anciens éléments : %s\n" #: ../midori/main.c:910 #, c-format @@ -127,6 +128,9 @@ msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." msgstr "" +"Midori semble s'être interrompu de façon inattendue lors de la dernière" +"utilisation. Si cela se produit de façon répétée, essayez l'une des options" +"suivantes pour résoudre le problème." #: ../midori/main.c:1416 msgid "Modify _preferences" @@ -134,15 +138,15 @@ msgstr "Modifier les _préférences" #: ../midori/main.c:1420 msgid "Reset the last _session" -msgstr "Réinitialiser la dernière session" +msgstr "Réinitialiser la dernière _session" #: ../midori/main.c:1425 msgid "Disable all _extensions" -msgstr "Désactiver tout les _extensions" +msgstr "Désactiver toutes les _extensions" #: ../midori/main.c:1599 msgid "No filename specified" -msgstr "Aucun nom de fichier indiqué" +msgstr "Aucun nom de fichier spécifié" #: ../midori/main.c:1631 ../midori/gjs.c:514 msgid "An unknown error occured." @@ -150,7 +154,7 @@ msgstr "Une erreur inconnu est survenue." #: ../midori/main.c:1654 msgid "Run the specified filename as javascript" -msgstr "" +msgstr "Exécutez le fichier spécifié en tant que javascript" #: ../midori/main.c:1656 msgid "Display program version" @@ -184,24 +188,24 @@ msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" #: ../midori/main.c:1835 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Les signets n'ont pu être chargés: %s\n" +msgstr "Les signets n'ont pu être chargés : %s\n" #: ../midori/main.c:1850 #, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "La session n'a pu être chargée: %s\n" +msgstr "La session n'a pu être chargée : %s\n" # pas très content #: ../midori/main.c:1863 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "La corbeille n'a pu être chargée: %s\n" +msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content #: ../midori/main.c:1876 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "L'historique n'a pu être chargée. %s\n" +msgstr "L'historique n'a pu être chargée: %s\n" #: ../midori/main.c:1888 msgid "The following errors occured:" @@ -294,7 +298,8 @@ msgid "translator-credits" msgstr "" "Christian Dywan \n" "Adrien Nader \n" -"Robert-André Mauchin " +"Robert-André Mauchin \n" +"Pascal Gervais " #: ../midori/midori-browser.c:2859 msgid "_File" @@ -768,7 +773,7 @@ msgstr "Firefox" #: ../midori/midori-websettings.c:268 msgid "Internet Explorer" -msgstr "Explorateur Internet" +msgstr "Internet Explorer" #: ../midori/midori-websettings.c:309 msgid "Remember last window size" @@ -1271,7 +1276,7 @@ msgstr "Activer scripts" #: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" -msgstr "" +msgstr "Active la prise en charge interne des scripts" #: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 msgid "Enable plugins" @@ -1279,7 +1284,7 @@ msgstr "Activer greffons" #: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" -msgstr "" +msgstr "Active la prise en charge interne des greffons" #: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" @@ -1287,7 +1292,7 @@ msgstr "Forcer 96 points par pouce" #: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" -msgstr "Forcer une résolution de 96 DPI" +msgstr "Force une densité visuelle de 96 DPI" #: ../midori/midori-preferences.c:504 msgid "Enable developer tools" @@ -1295,7 +1300,7 @@ msgstr "Activer les outils développeur" #: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" -msgstr "" +msgstr "Activer les extensions spécifiques pour les développeurs" #. Page "Interface" #: ../midori/midori-preferences.c:515 @@ -1481,7 +1486,7 @@ msgstr "Extensions" #: ../panels/midori-history.c:159 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" #: ../panels/midori-history.c:216 msgid "Bookmark the selected history item" @@ -1526,6 +1531,8 @@ msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"Un nom d'utilisateur et un mot de passe sont requis\n" +"pour l'ouverture de ce lieu :" #: ../katze/katze-http-auth.c:131 msgid "Username" From e12716c9176a7b44f7d3db34fd4f0d96927a7727 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Mar 2009 21:00:06 +0100 Subject: [PATCH 0834/2970] Update copyright year in --version and about dialog --- midori/main.c | 2 +- midori/midori-browser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index bf2eceae..1ca69190 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1714,7 +1714,7 @@ main (int argc, { g_print ( "%s %s\n\n" - "Copyright (c) 2007-2008 Christian Dywan\n\n" + "Copyright (c) 2007-2009 Christian Dywan\n\n" "%s\n" "\t%s\n\n" "%s\n" diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 63c8989f..0807e497 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2792,7 +2792,7 @@ _action_about_activate (GtkAction* action, "name", PACKAGE_NAME, "version", PACKAGE_VERSION, "comments", _("A lightweight web browser."), - "copyright", "Copyright © 2007-2008 Christian Dywan", + "copyright", "Copyright © 2007-2009 Christian Dywan", "website", "http://www.twotoasts.de", "authors", credits_authors, "documenters", credits_documenters, From 58920912fc1660d7f50f6f121c07513e0b1aee1f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 1 Mar 2009 21:11:31 +0100 Subject: [PATCH 0835/2970] Bump version to 0.1.4 --- ChangeLog | 9 +++++++++ wscript | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cdc16086..d626ad20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.4: + + Automatic inline find can be disabled + + Implement an Encoding menu + + Add Open all in Tabs for bookmarks and history + + Bookmarks can be moved to other folders + + Fix blank page 'loading' and HTTP authentication + + Display history dates in the local format + + Allow editing of completion items + v0.1.3: + Sidepanel can be aligned on the right + Bookmarks can be organized in folders diff --git a/wscript b/wscript index 3789ce84..b913591f 100644 --- a/wscript +++ b/wscript @@ -22,7 +22,7 @@ import UnitTest major = 0 minor = 1 -micro = 3 +micro = 4 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From c87ce08f62fb026a283f10f7fe8f264749e88eff Mon Sep 17 00:00:00 2001 From: Sergio Durzu Date: Mon, 2 Mar 2009 23:54:53 +0100 Subject: [PATCH 0836/2970] Update Italian translation --- po/it.po | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/po/it.po b/po/it.po index 5867ca70..01804b99 100644 --- a/po/it.po +++ b/po/it.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.2\n" +"Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-02-03 22:54+0100\n" -"PO-Revision-Date: 2009-02-21 10:44+0100\n" +"PO-Revision-Date: 2009-03-02 15:47+0100\n" "Last-Translator: Sergio Durzu \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "S_egnalibro" #: ../midori/main.c:91 #: ../midori/midori-browser.c:3830 msgid "_Bookmarks" -msgstr "S_egnlalibri" +msgstr "S_egnalibri" #: ../midori/main.c:92 msgid "_Add Bookmark" @@ -93,13 +93,13 @@ msgstr "Le impostazioni non possono essere caricate: %s\n" #: ../midori/main.c:213 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "Il valore '%s' non è valido per %s" +msgstr "Il valore «%s» non è valido per %s" #: ../midori/main.c:220 #: ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Valore di configurazione '%s' non valido" +msgstr "Valore di configurazione «%s» non valido" #: ../midori/main.c:532 msgid "File not found." @@ -185,7 +185,7 @@ msgstr "La sessione non può essere salvata. %s" #: ../midori/main.c:1636 msgid "Authentication Required" -msgstr "Autorizzazione richiesta" +msgstr "Autenticazione richiesta" #: ../midori/main.c:1652 msgid "" @@ -339,7 +339,7 @@ msgstr "_Cartella:" #: ../midori/midori-browser.c:601 #: ../midori/midori-browser.c:638 msgid "Toplevel folder" -msgstr "Cartella superiore" +msgstr "Livello principale" #: ../midori/midori-browser.c:713 msgid "Save file as" @@ -567,7 +567,7 @@ msgstr "Apre l'ultima scheda chiusa" #: ../midori/midori-browser.c:3210 #: ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" -msgstr "Aggiungi un nuovo segnalibro" +msgstr "Aggiunge un nuovo segnalibro" #: ../midori/midori-browser.c:3213 msgid "Delete the selected history item" @@ -600,7 +600,7 @@ msgstr "Scheda _precedente" #: ../midori/midori-browser.c:3229 msgid "Switch to the previous tab" -msgstr "Passare alla scheda precedente" +msgstr "Passa alla scheda precedente" #: ../midori/midori-browser.c:3231 msgid "_Next Tab" @@ -616,7 +616,7 @@ msgstr "_Aiuto" #: ../midori/midori-browser.c:3236 msgid "_Contents" -msgstr "_Contenuti" +msgstr "_Sommario" #: ../midori/midori-browser.c:3237 msgid "Show the documentation" @@ -648,7 +648,7 @@ msgstr "Navigazione _privata" #: ../midori/midori-browser.c:3254 msgid "Don't save any private data while browsing" -msgstr "Non vengono memorizzati i dati personali durante la navigazione" +msgstr "Non memorizza i dati personali durante la navigazione" #: ../midori/midori-browser.c:3259 msgid "_Menubar" @@ -724,11 +724,11 @@ msgstr "Riapre una scheda o una finestra chiusa precedentemente" #: ../midori/midori-browser.c:3815 msgid "_Recently visited pages" -msgstr "Pagine viste _recentemente" +msgstr "Pagine visitate _recentemente" #: ../midori/midori-browser.c:3817 msgid "Reopen pages that you visited earlier" -msgstr "Riapre le pagine viste recentemente" +msgstr "Riapre le pagine visitate recentemente" #: ../midori/midori-browser.c:3832 msgid "Show the saved bookmarks" @@ -766,7 +766,7 @@ msgstr "Maiuscole/minuscole" #: ../midori/midori-browser.c:4089 msgid "Highlight Matches" -msgstr "Evidenza risultati" +msgstr "Evidenzia risultati" #: ../midori/midori-browser.c:4098 msgid "Close Findbar" @@ -775,7 +775,7 @@ msgstr "Chiudi barra ricerca" #: ../midori/midori-browser.c:4379 #, c-format msgid "Unexpected setting '%s'" -msgstr "Impostazione '%s' non prevista" +msgstr "Impostazione «%s» non prevista" #: ../midori/midori-panel.c:199 #: ../midori/midori-panel.c:200 @@ -884,7 +884,7 @@ msgstr "Ricorda la dimensione dell'ultima finestra" #: ../midori/midori-websettings.c:304 msgid "Whether to save the last window size" -msgstr "Salva la dimensione dell'ultima finestra" +msgstr "Salva le dimensioni dell'ultima finestra" #: ../midori/midori-websettings.c:312 msgid "Last window width" @@ -892,7 +892,7 @@ msgstr "Larghezza dell'ultima finestra" #: ../midori/midori-websettings.c:313 msgid "The last saved window width" -msgstr "Salva la larghezza dell'ultima finestra salvata" +msgstr "L'ultima larghezza salvata per la finestra" #: ../midori/midori-websettings.c:321 msgid "Last window height" @@ -900,7 +900,7 @@ msgstr "Altezza dell'ultima finestra" #: ../midori/midori-websettings.c:322 msgid "The last saved window height" -msgstr "Salva l'altezza dell'ultima finestra salvata" +msgstr "L'ultima altezza salvata per la finestra" #: ../midori/midori-websettings.c:347 msgid "Last panel position" @@ -908,7 +908,7 @@ msgstr "Posizione del pannello" #: ../midori/midori-websettings.c:348 msgid "The last saved panel position" -msgstr "Salva la posizione dell'ultimo pannello salvato" +msgstr "L'ultima posizione salvata per il pannello" #. i18n: The internal index of the last opened panel #: ../midori/midori-websettings.c:357 @@ -917,7 +917,7 @@ msgstr "Pagina dell'ultimo pannello" #: ../midori/midori-websettings.c:358 msgid "The last saved panel page" -msgstr "Salva la pagina dell'ultimo pannello salvato" +msgstr "L'ultima pagina salvata per il pannello" #: ../midori/midori-websettings.c:366 msgid "Last Web search" @@ -925,7 +925,7 @@ msgstr "Ultima ricerca web" #: ../midori/midori-websettings.c:367 msgid "The last saved Web search" -msgstr "Salva l'ultima ricerca web salvata" +msgstr "L'ultima ricerca web salvata" #: ../midori/midori-websettings.c:376 msgid "Show Menubar" @@ -989,7 +989,7 @@ msgstr "Pannello compatto" #: ../midori/midori-websettings.c:442 msgid "Whether to make the sidepanel compact" -msgstr "Abilitare per il pannello compatto" +msgstr "Abilitare per la visualizzazione compatta del pannello" #: ../midori/midori-websettings.c:451 msgid "Load on Startup" @@ -1069,7 +1069,7 @@ msgstr "Abilitare per visualizzare il pulsante di chiusura nelle schede" #: ../midori/midori-websettings.c:552 msgid "Open new pages in" -msgstr "Apri nuova pagina in" +msgstr "Apri nuove pagine in" #: ../midori/midori-websettings.c:553 msgid "Where to open new pages" @@ -1193,9 +1193,8 @@ msgid "Identify as" msgstr "Identifica come" #: ../midori/midori-websettings.c:761 -#, fuzzy msgid "What to identify as to web pages" -msgstr "Come identificarsi verso le pagine web" +msgstr "Come essere identificati sul web" #: ../midori/midori-websettings.c:781 msgid "Identification string" @@ -1450,13 +1449,13 @@ msgstr "Non è possibile eseguire l'applicazione esterna." #. i18n: A superuser, or system administrator, may not be 'root' #: ../midori/sokoke.c:354 msgid "Warning: You are using a superuser account!" -msgstr "Attenzione: stai eseguendo l'applicazione come amministratore!" +msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore." #: ../midori/gjs.c:742 #: ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" -msgstr "%s non ha la proprietà '%s'" +msgstr "%s non ha la proprietà «%s»" #: ../midori/gjs.c:878 #, c-format @@ -1525,17 +1524,17 @@ msgstr "L'icona denominata '%s' non può essere caricata" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "L'icona '%s' non può essere caricata" +msgstr "L'icona «%s» dello stock non può essere caricata" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "" +msgstr "I fotogrammi dell'animazione sono danneggiati" #: ../katze/katze-utils.c:180 #: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "La proprietà '%s' non è valida per %s" +msgstr "La proprietà «%s» non è valida per %s" #: ../katze/katze-utils.c:209 #: ../katze/katze-utils.c:248 @@ -1548,11 +1547,11 @@ msgstr "Scegli una cartella" #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" -msgstr "" +msgstr "Gesti del mouse" #: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" -msgstr "Gestire Midori con i movimenti del mouse" +msgstr "Controllare Midori con i movimenti del mouse" #. i18n: A panel showing a user specified web page #: ../extensions/page-holder.c:116 @@ -1571,3 +1570,4 @@ msgstr "Immagini" #: ../extensions/statusbar-features.c:45 msgid "Scripts" msgstr "Script" + From f1950aeff6deef447059fb774a0e5e3278314624 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Mon, 2 Mar 2009 23:57:44 +0100 Subject: [PATCH 0837/2970] Update Japanese translation --- po/ja.po | 644 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 333 insertions(+), 311 deletions(-) diff --git a/po/ja.po b/po/ja.po index cee68dd2..69bac1aa 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-23 21:29+0900\n" -"PO-Revision-Date: 2009-02-22 21:01+0900\n" +"POT-Creation-Date: 2009-03-02 11:35+0900\n" +"PO-Revision-Date: 2009-03-02 11:33+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 -#: ../midori/main.c:1714 ../midori/main.c:1725 -#: ../midori/midori-websettings.c:265 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 +#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -94,7 +94,7 @@ msgstr "設定を保存できませんでした。%s" msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1069 ../midori/sokoke.c:580 +#: ../midori/main.c:1069 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" @@ -119,7 +119,7 @@ msgstr "転送" msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1401 +#: ../midori/main.c:1398 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." @@ -127,545 +127,583 @@ msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" "ようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1416 +#: ../midori/main.c:1413 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1420 +#: ../midori/main.c:1417 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1425 +#: ../midori/main.c:1422 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1599 +#: ../midori/main.c:1596 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1631 ../midori/gjs.c:514 +#: ../midori/main.c:1628 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1654 +#: ../midori/main.c:1651 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1656 +#: ../midori/main.c:1653 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1658 +#: ../midori/main.c:1655 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1702 +#: ../midori/main.c:1699 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1726 +#: ../midori/main.c:1723 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1728 +#: ../midori/main.c:1725 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1755 +#: ../midori/main.c:1752 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1823 +#: ../midori/main.c:1820 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:1832 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1850 +#: ../midori/main.c:1847 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1863 +#: ../midori/main.c:1860 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1876 +#: ../midori/main.c:1873 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1888 +#: ../midori/main.c:1885 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1904 +#: ../midori/main.c:1901 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 -#: ../midori/midori-browser.c:2931 +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:333 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:358 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:566 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 +#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:761 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1340 +#: ../midori/midori-browser.c:1372 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 -#: ../panels/midori-history.c:788 +#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "タブですべて開く(_T)" + +#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 -#: ../panels/midori-history.c:790 +#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2674 +#: ../midori/midori-browser.c:2794 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2682 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:2865 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:2874 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:2880 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:2908 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:2909 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:2916 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:2922 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:2937 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:2940 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "エンコーディング(_E)" + +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "自動(_A)" + +#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "中国語 (BIG5)" + +#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "日本語 (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "ロシア語 (KOI8-R)" + +#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "西欧 (ISO-8859-1)" + +#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "カスタム..." + +#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:2943 +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:2945 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:2946 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:2952 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:2961 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:2964 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 +#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:2967 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:2972 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:2975 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:2980 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:2983 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:2987 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:2988 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3142 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3145 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:2994 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3019 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3022 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:3602 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3686 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3864 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3889 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3894 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:3732 +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:3740 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" @@ -673,497 +711,481 @@ msgstr "サイドパネルを右側に表示します" msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 +#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:177 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:192 -msgid "Chinese (BIG5)" -msgstr "中国語 (BIG5)" - -#: ../midori/midori-websettings.c:193 -msgid "Japanese (SHIFT_JIS)" -msgstr "日本語 (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:194 -msgid "Russian (KOI8-R)" -msgstr "ロシア語 (KOI8-R)" - -#: ../midori/midori-websettings.c:195 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:196 -msgid "Western (ISO-8859-1)" -msgstr "西欧 (ISO-8859-1)" - -#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 -msgid "Custom..." -msgstr "カスタム..." - -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:269 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "メニューバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "パネルを表示するかどうか指定します" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示する" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:618 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:696 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "キー入力中に自動的に検索する" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "インライン検索において、キー入力に従い自動的に検索します" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:795 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:796 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:815 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:816 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:836 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:857 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:858 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:629 +#: ../midori/midori-view.c:630 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:960 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:962 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:979 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:989 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:996 +#: ../midori/midori-view.c:997 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:1019 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:1028 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:1507 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1654 +#: ../midori/midori-view.c:1664 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1678 +#: ../midori/midori-view.c:1688 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1694 +#: ../midori/midori-view.c:1704 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1224,7 +1246,7 @@ msgstr "振る舞い" msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "画像を自動的に読み込む" @@ -1256,7 +1278,7 @@ msgstr "可変サイズのテキストエリアにする" msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "スクリプトを有効にする" @@ -1264,7 +1286,7 @@ msgstr "スクリプトを有効にする" msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "プラグインを有効にする" @@ -1289,40 +1311,40 @@ msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:517 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:518 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:527 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:592 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:597 +#: ../midori/midori-preferences.c:599 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:606 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 msgid "days" msgstr "日" -#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 msgid "History" msgstr "履歴" @@ -1350,7 +1372,7 @@ msgstr "アイコン(_I):" msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" msgstr "検索エンジンの管理" @@ -1359,55 +1381,55 @@ msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:403 +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/sokoke.c:734 +#: ../midori/sokoke.c:771 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:736 +#: ../midori/sokoke.c:773 msgid "_Add Bookmark" msgstr "ブックマークに追加(_A)" -#: ../midori/sokoke.c:737 +#: ../midori/sokoke.c:774 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:738 +#: ../midori/sokoke.c:775 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:739 +#: ../midori/sokoke.c:776 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:740 +#: ../midori/sokoke.c:777 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:741 +#: ../midori/sokoke.c:778 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:742 +#: ../midori/sokoke.c:779 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/sokoke.c:743 +#: ../midori/sokoke.c:780 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:744 +#: ../midori/sokoke.c:781 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:745 +#: ../midori/sokoke.c:782 msgid "_Closed Tabs and Windows" msgstr "閉じたタブとウィンドウ(_C)" -#: ../midori/sokoke.c:746 +#: ../midori/sokoke.c:783 msgid "New _Window" msgstr "新しいウィンドウ(_W)" @@ -1504,7 +1526,7 @@ msgstr "今日" msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "プラグイン" @@ -1572,10 +1594,10 @@ msgstr "ページホルダ" msgid "_Pageholder" msgstr "ページホルダ(_P)" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "画像" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "スクリプト" From bd2e38e0f10642c0a73d96fcf6e7b0676883c7ee Mon Sep 17 00:00:00 2001 From: Pascal Gervais Date: Tue, 3 Mar 2009 00:30:25 +0100 Subject: [PATCH 0838/2970] Update French translation --- po/fr.po | 784 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 403 insertions(+), 381 deletions(-) diff --git a/po/fr.po b/po/fr.po index cbb02c7a..be0ec77e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,11 +8,11 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.3\n" +"Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-22 19:30+0100\n" +"POT-Creation-Date: 2009-03-02 12:34-0500\n" "PO-Revision-Date: 2009-01-22 03:07+0100\n" -"Last-Translator: Christian Dywan 2008\n" +"Last-Translator: Pascal Gervais 2009\n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -23,9 +23,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 -#: ../midori/main.c:1714 ../midori/main.c:1725 -#: ../midori/midori-websettings.c:265 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 +#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -97,7 +97,7 @@ msgstr "La configuration n'a pu être enregistrée. %s" msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1069 ../midori/sokoke.c:580 +#: ../midori/main.c:1069 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." @@ -123,177 +123,182 @@ msgstr "Transferts" msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1401 +#: ../midori/main.c:1398 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." msgstr "" -"Midori semble s'être interrompu de façon inattendue lors de la dernière" -"utilisation. Si cela se produit de façon répétée, essayez l'une des options" +"Midori semble s'être interrompu de façon inattendue lors de la dernière " +"utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1416 +#: ../midori/main.c:1413 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1420 +#: ../midori/main.c:1417 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1425 +#: ../midori/main.c:1422 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1599 +#: ../midori/main.c:1596 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1631 ../midori/gjs.c:514 +#: ../midori/main.c:1628 ../midori/gjs.c:514 msgid "An unknown error occured." -msgstr "Une erreur inconnu est survenue." +msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1654 +#: ../midori/main.c:1651 msgid "Run the specified filename as javascript" msgstr "Exécutez le fichier spécifié en tant que javascript" -#: ../midori/main.c:1656 +#: ../midori/main.c:1653 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1658 +#: ../midori/main.c:1655 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1702 +#: ../midori/main.c:1699 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1726 +#: ../midori/main.c:1723 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1728 +#: ../midori/main.c:1725 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1755 +#: ../midori/main.c:1752 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1823 +#: ../midori/main.c:1820 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:1832 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés : %s\n" -#: ../midori/main.c:1850 +#: ../midori/main.c:1847 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1863 +#: ../midori/main.c:1860 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1876 +#: ../midori/main.c:1873 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "L'historique n'a pu être chargée: %s\n" +msgstr "L'historique n'a pu être chargé: %s\n" -#: ../midori/main.c:1888 +#: ../midori/main.c:1885 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1904 +#: ../midori/main.c:1901 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 -#: ../midori/midori-browser.c:2931 +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:333 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:358 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:566 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 +#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:761 msgid "Save file as" -msgstr "Enregistrer fichier dans" +msgstr "Enregistrer le fichier dans" -#: ../midori/midori-browser.c:1340 +#: ../midori/midori-browser.c:1372 msgid "Open file" -msgstr "Ouvrir fichier" +msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 -#: ../panels/midori-history.c:788 +#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "Tout ouvrir dans des _onglets" + +#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 -#: ../panels/midori-history.c:790 +#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2674 +#: ../midori/midori-browser.c:2794 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2682 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -301,886 +306,903 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2865 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:2874 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:2880 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:2908 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:2909 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" -msgstr "Réchercher le _précédant" +msgstr "Rechercher le _précédant" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:2916 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" -msgstr "Saut rapide vers un mot ou d'une phrase" +msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:2922 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:2937 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:2940 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "_Encodage" + +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "_Automatique" + +#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "Chinois (BIG5)" + +#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonais (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "Russe (KOI8-R)" + +#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "Occidental (ISO-8859-1)" + +#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "Personnalisé..." + +#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:2943 +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:2945 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:2946 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:2952 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:2961 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:2964 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 +#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:2967 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:2972 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:2975 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:2980 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:2983 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:2987 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:2988 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3142 msgid "_Frequent Questions" -msgstr "_Questions couramment" +msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" -msgstr "Afficher les foire aux questions" +msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3145 msgid "_Report a Bug" -msgstr "_Adviser un problème" +msgstr "_Rapporter une anomalie" -#: ../midori/midori-browser.c:2994 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" -msgstr "Ouvrir le persécuteur de problèmes de Midori" +msgstr "Ouvrir le gestionnaire d'anomalies de Midori" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3019 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3022 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" -msgstr "Barre des _signets" +msgstr "Barre de _signets" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" -msgstr "Barre des _transferts" +msgstr "Barre de _transferts" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:3602 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" msgstr "Lance une recherche sur la toile" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" -msgstr "Réouvre un onglet ou une fenêtre fermée auparavant" +msgstr "Rouvre un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" -msgstr "Réouvre des pages déjà visitées" +msgstr "Rouvre des pages précédemment visitées" -#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3686 msgid "Show the saved bookmarks" -msgstr "Afficher les signets sauveguardées" +msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3864 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3889 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3894 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:3732 +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3740 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" -msgstr "Marquer les résultats" +msgstr "Résultats analogues en surbrillance" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 msgid "Align sidepanel on the right" -msgstr "Arranger le panneau à droite" +msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 msgid "Whether to align the sidepanel on the right" -msgstr "Indique s'il faut arranger le panneau sur la droite" +msgstr "Indique s'il faut aligner le panneau latéral sur la droite" #: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 +#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:177 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:192 -msgid "Chinese (BIG5)" -msgstr "Chinois (BIG5)" - -#: ../midori/midori-websettings.c:193 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japonais (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:194 -msgid "Russian (KOI8-R)" -msgstr "Russe (KOI8-R)" - -#: ../midori/midori-websettings.c:195 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:196 -msgid "Western (ISO-8859-1)" -msgstr "Occidental (ISO-8859-1)" - -#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 -msgid "Custom..." -msgstr "Personnalisé..." - -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:269 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" -msgstr "Enregistrer la dernière taille de la fenêtre" +msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" -msgstr "Dernière page de panneau" +msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" msgstr "Dernière recherche sur la toile" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" msgstr "La dernière recherche sur la toile enregistrée" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" -msgstr "Style de barre d'outils" +msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show progress in location entry" msgstr "Afficher le progrès dans le champ d'adresse" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher le progrès dans le champ d'adresse" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" -msgstr "Elements de la barre d'outils" +msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" -msgstr "Les elements pour afficher dans la barre d'outils" +msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" -msgstr "Indique s'il faut mettre le panneau compact" +msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Show crash dialog" -msgstr "Afficher dialogue de panne" +msgstr "Afficher le dialogue de fermeture inattendue" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Show a dialog after Midori crashed" -msgstr "Afficher un dialogue en cas d'une panne" +msgstr "Afficher un dialogue en cas de fermeture inattendue de Midori" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" -msgstr "Editeur texte" +msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" -msgstr "Un editeur texte externe" +msgstr "Un éditeur texte externe" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" -msgstr "Recherche de barre d'adresse" +msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" -msgstr "Codage favori" +msgstr "Encodage favori" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" -msgstr "Codage des caractères favori" +msgstr "Encodage des caractères favori" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" -msgstr "Toujours afficher barre d'onglets" +msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" -msgstr "Indique s'il faut afficher des boutons de fermeture sur les onglets" +msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" -msgstr "Clic milieu ouvre la sélection" +msgstr "Clic du milieu ouvre la sélection" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:618 msgid "Load an address from the selection via middle click" msgstr "" "Charger l'addresse sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:696 msgid "Zoom Text and Images" -msgstr "Agrandir texte et images" +msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir texte et images" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "Chercher en ligne en tapant" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "Indique s'il faut chercher automatiquement en ligne en tapant" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "Type de témoins (cookies) à accepter" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:795 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:796 msgid "The proxy server used for HTTP connections" -msgstr "Le serveur mandataire pour les connexions HTTP" +msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:815 msgid "Detect proxy server automatically" -msgstr "Reconnaître serveur mandateire automatiquement" +msgstr "Reconnaître le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:816 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Indique s'il faut reconnaître serveur mandateire automatiquement" +msgstr "Indique s'il faut reconnaître le serveur mandataire automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:836 msgid "Identify as" -msgstr "Identifier comme" +msgstr "S'dentifier comme" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" -msgstr "Comme s'identifier a pages sur la toile" +msgstr "S'identifier comme quoi, sur les pages de la toile" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:857 msgid "Identification string" -msgstr "Indicatif de l'application" +msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:858 msgid "The application identification string" -msgstr "L'indicatif de l'application" +msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "Taille de l'antémémoire" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" -msgstr "La taille de l'antémémoire permise" +msgstr "La taille de l'antémémoire (cache) permise" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:629 +#: ../midori/midori-view.c:630 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:960 msgid "Open _Link" -msgstr "Ouvrir _lien" +msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:962 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:979 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:989 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:996 +#: ../midori/midori-view.c:997 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:1019 msgid "_Search the Web" msgstr "_Chercher sur la toile" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:1028 msgid "Open Address in New _Tab" -msgstr "Ouvrir adresse dans un nouvel _onglet" +msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:1507 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1654 +#: ../midori/midori-view.c:1664 msgid "Source" msgstr "Source" -#: ../midori/midori-view.c:1678 +#: ../midori/midori-view.c:1688 #, c-format msgid "Document cannot be displayed" -msgstr "Ne peut pas afficher le document" +msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1694 +#: ../midori/midori-view.c:1704 #, c-format msgid "No documentation installed" -msgstr "Pas de documentation installé" +msgstr "Pas de documentation installée" #: ../midori/midori-preferences.c:93 #, c-format @@ -1211,23 +1233,23 @@ msgstr "Police par défaut" #: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" -msgstr "La taille de police utilisé pour afficher texte par défaut" +msgstr "La taille par défaut de la police utilisée pour afficher le texte" #: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" -msgstr "Taille minimum de police" +msgstr "Taille minimum de la police" #: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" -msgstr "La taille minimum de police utilisé pour afficher texte" +msgstr "La taille minimum de la police utilisée pour afficher le texte" #: ../midori/midori-preferences.c:462 msgid "Encoding" -msgstr "Codage" +msgstr "Encodage" #: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" -msgstr "Codage des caractères par défaut" +msgstr "Encodage des caractères par défaut" #. Page "Behavior" #: ../midori/midori-preferences.c:472 @@ -1238,7 +1260,7 @@ msgstr "Comportement" msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Charger les images automatiquement" @@ -1252,7 +1274,7 @@ msgstr "Diminuer les images automatiquement" #: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" -msgstr "Diminuer convenablement les images automatiquement" +msgstr "Réduire automatiquement les images pour les adapter" #: ../midori/midori-preferences.c:484 msgid "Print background images" @@ -1264,23 +1286,23 @@ msgstr "Indique s'il faut imprimer les images d'arrière-plan" #: ../midori/midori-preferences.c:488 msgid "Resizable text areas" -msgstr "On peut agrandir champs de texte" +msgstr "Zones de texte redimensionnables" #: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" -msgstr "Indique s'il faut agrandir champs de texte" +msgstr "Indique si les zones de texte peuvent être redimentionnés" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 msgid "Enable scripts" -msgstr "Activer scripts" +msgstr "Activer les scripts" #: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 msgid "Enable plugins" -msgstr "Activer greffons" +msgstr "Activer les greffons" #: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" @@ -1296,47 +1318,47 @@ msgstr "Force une densité visuelle de 96 DPI" #: ../midori/midori-preferences.c:504 msgid "Enable developer tools" -msgstr "Activer les outils développeur" +msgstr "Activer les outils de développement" #: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" #. Page "Interface" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:517 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:518 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:527 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:592 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:597 +#: ../midori/midori-preferences.c:599 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:606 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 msgid "days" msgstr "jours" -#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 msgid "History" msgstr "Historique" @@ -1364,7 +1386,7 @@ msgstr "_Icône :" msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" @@ -1373,55 +1395,55 @@ msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:403 +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" -msgstr "Attention : vous êtes connecté en tant que superutilisateur !" +msgstr "Attention : vous utilisez Midori avec un compte superutilisateur !" -#: ../midori/sokoke.c:734 +#: ../midori/sokoke.c:771 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:736 +#: ../midori/sokoke.c:773 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/sokoke.c:737 +#: ../midori/sokoke.c:774 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:738 +#: ../midori/sokoke.c:775 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:739 +#: ../midori/sokoke.c:776 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:740 +#: ../midori/sokoke.c:777 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/sokoke.c:741 +#: ../midori/sokoke.c:778 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:742 +#: ../midori/sokoke.c:779 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/sokoke.c:743 +#: ../midori/sokoke.c:780 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/sokoke.c:744 +#: ../midori/sokoke.c:781 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:745 +#: ../midori/sokoke.c:782 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/sokoke.c:746 +#: ../midori/sokoke.c:783 msgid "New _Window" msgstr "Nouvelle _fenêtre" @@ -1490,11 +1512,11 @@ msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" #: ../panels/midori-history.c:216 msgid "Bookmark the selected history item" -msgstr "Ajouter un signet pour l'element sélectionné de la historique" +msgstr "Ajouter un signet pour l'élément sélectionné de l'historique" #: ../panels/midori-history.c:225 msgid "Delete the selected history item" -msgstr "Supprimer l'element sélectionné de la historique" +msgstr "Supprimer l'élément sélectionné de l'historique" #: ../panels/midori-history.c:233 msgid "Clear the entire history" @@ -1503,12 +1525,12 @@ msgstr "Vider l'historique entier" #: ../panels/midori-history.c:603 #, c-format msgid "A week ago" -msgstr "Avant une semaine" +msgstr "Il y a une semaine" #: ../panels/midori-history.c:609 #, c-format msgid "%d days ago" -msgstr "Avant %d jours" +msgstr "Il y a %d jours" #: ../panels/midori-history.c:616 msgid "Today" @@ -1518,13 +1540,13 @@ msgstr "Aujourd'hui" msgid "Yesterday" msgstr "Hier" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "Greffons" #: ../katze/katze-http-auth.c:101 msgid "Authentication Required" -msgstr "Authentification obligatoire" +msgstr "Authentification requise" #: ../katze/katze-http-auth.c:117 msgid "" @@ -1550,7 +1572,7 @@ msgstr "L'icône nommée « %s » n'a pu être chargée." #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "L'icône de catalogue « %s » n'a pu être chargée." +msgstr "L'icône prédéfinie « %s » n'a pu être chargée." #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" @@ -1571,11 +1593,11 @@ msgstr "Choisissez un répertoire" #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" -msgstr "Gestes de souris" +msgstr "Mouvements de souris" #: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" -msgstr "Contrôler Midori par mouevements de la souris" +msgstr "Contrôler Midori par des mouvements de la souris" #. i18n: A panel showing a user specified web page #: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 @@ -1586,10 +1608,10 @@ msgstr "Cadre de pages" msgid "_Pageholder" msgstr "C_adre de pages" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Scripts" From f5f3262774688aacb3a7f1aa56cf897132bf3bb7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 3 Mar 2009 00:59:19 +0100 Subject: [PATCH 0839/2970] Update translation template --- po/midori.pot | 646 ++++++++++++++++++++++++++------------------------ 1 file changed, 334 insertions(+), 312 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index 86c1980b..27f85b84 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-22 19:30+0100\n" +"POT-Creation-Date: 2009-03-03 00:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 -#: ../midori/main.c:1714 ../midori/main.c:1725 -#: ../midori/midori-websettings.c:265 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 +#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "" @@ -94,7 +94,7 @@ msgstr "" msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1069 ../midori/sokoke.c:580 +#: ../midori/main.c:1069 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "" @@ -119,549 +119,587 @@ msgstr "" msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1401 +#: ../midori/main.c:1398 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1416 +#: ../midori/main.c:1413 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1420 +#: ../midori/main.c:1417 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1425 +#: ../midori/main.c:1422 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1599 +#: ../midori/main.c:1596 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1631 ../midori/gjs.c:514 +#: ../midori/main.c:1628 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1654 +#: ../midori/main.c:1651 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1656 +#: ../midori/main.c:1653 msgid "Display program version" msgstr "" -#: ../midori/main.c:1658 +#: ../midori/main.c:1655 msgid "Addresses" msgstr "" -#: ../midori/main.c:1702 +#: ../midori/main.c:1699 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1726 +#: ../midori/main.c:1723 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1728 +#: ../midori/main.c:1725 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1755 +#: ../midori/main.c:1752 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1823 +#: ../midori/main.c:1820 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1835 +#: ../midori/main.c:1832 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1850 +#: ../midori/main.c:1847 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1863 +#: ../midori/main.c:1860 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1876 +#: ../midori/main.c:1873 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1888 +#: ../midori/main.c:1885 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1904 +#: ../midori/main.c:1901 msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 -#: ../midori/midori-browser.c:2931 +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:333 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:358 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:566 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 +#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:761 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1340 +#: ../midori/midori-browser.c:1372 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 -#: ../panels/midori-history.c:788 +#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "" + +#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 -#: ../panels/midori-history.c:790 +#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2674 +#: ../midori/midori-browser.c:2794 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2682 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:2865 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:2874 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:2880 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:2908 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:2909 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:2916 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:2922 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:2937 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:2940 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "" + +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "" + +#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "" + +#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:2943 +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:2945 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:2946 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:2952 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:2961 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:2964 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 +#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:2967 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:2972 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:2975 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:2980 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:2983 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:2987 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:2988 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3142 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3145 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:2994 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3019 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3022 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:3602 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3686 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3864 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3889 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3894 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:3732 +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:3740 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 msgid "Whether to align the sidepanel on the right" msgstr "" @@ -669,497 +707,481 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 +#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:177 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:192 -msgid "Chinese (BIG5)" -msgstr "" - -#: ../midori/midori-websettings.c:193 -msgid "Japanese (SHIFT_JIS)" -msgstr "" - -#: ../midori/midori-websettings.c:194 -msgid "Russian (KOI8-R)" -msgstr "" - -#: ../midori/midori-websettings.c:195 -msgid "Unicode (UTF-8)" -msgstr "" - -#: ../midori/midori-websettings.c:196 -msgid "Western (ISO-8859-1)" -msgstr "" - -#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 -msgid "Custom..." -msgstr "" - -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:269 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:618 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:696 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:795 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:796 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:815 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:816 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:836 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:857 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:858 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:629 +#: ../midori/midori-view.c:630 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:960 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:962 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:979 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:989 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:996 +#: ../midori/midori-view.c:997 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:1019 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:1028 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:1507 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1654 +#: ../midori/midori-view.c:1664 msgid "Source" msgstr "" -#: ../midori/midori-view.c:1678 +#: ../midori/midori-view.c:1688 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1694 +#: ../midori/midori-view.c:1704 #, c-format msgid "No documentation installed" msgstr "" @@ -1220,7 +1242,7 @@ msgstr "" msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "" @@ -1252,7 +1274,7 @@ msgstr "" msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "" @@ -1260,7 +1282,7 @@ msgstr "" msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "" @@ -1285,40 +1307,40 @@ msgid "Enable special extensions for developers" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:517 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:518 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:527 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:592 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:597 +#: ../midori/midori-preferences.c:599 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:606 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 msgid "days" msgstr "" -#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 msgid "History" msgstr "" @@ -1346,7 +1368,7 @@ msgstr "" msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" msgstr "" @@ -1355,55 +1377,55 @@ msgid "Could not run external program." msgstr "" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:403 +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "" -#: ../midori/sokoke.c:734 +#: ../midori/sokoke.c:771 msgid "_Bookmark" msgstr "" -#: ../midori/sokoke.c:736 +#: ../midori/sokoke.c:773 msgid "_Add Bookmark" msgstr "" -#: ../midori/sokoke.c:737 +#: ../midori/sokoke.c:774 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:738 +#: ../midori/sokoke.c:775 msgid "_Extensions" msgstr "" -#: ../midori/sokoke.c:739 +#: ../midori/sokoke.c:776 msgid "_History" msgstr "" -#: ../midori/sokoke.c:740 +#: ../midori/sokoke.c:777 msgid "_Homepage" msgstr "" -#: ../midori/sokoke.c:741 +#: ../midori/sokoke.c:778 msgid "_Userscripts" msgstr "" -#: ../midori/sokoke.c:742 +#: ../midori/sokoke.c:779 msgid "User_styles" msgstr "" -#: ../midori/sokoke.c:743 +#: ../midori/sokoke.c:780 msgid "New _Tab" msgstr "" -#: ../midori/sokoke.c:744 +#: ../midori/sokoke.c:781 msgid "_Transfers" msgstr "" -#: ../midori/sokoke.c:745 +#: ../midori/sokoke.c:782 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/sokoke.c:746 +#: ../midori/sokoke.c:783 msgid "New _Window" msgstr "" @@ -1500,7 +1522,7 @@ msgstr "" msgid "Yesterday" msgstr "" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "" @@ -1549,11 +1571,11 @@ msgstr "" msgid "Choose folder" msgstr "" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:177 msgid "Control Midori by moving the mouse" msgstr "" @@ -1566,10 +1588,10 @@ msgstr "" msgid "_Pageholder" msgstr "" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "" From 3b8b96a52d3075ecd180a987f6d27f75c2502192 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 3 Mar 2009 01:01:57 +0100 Subject: [PATCH 0840/2970] Update German translation --- po/de.po | 649 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 336 insertions(+), 313 deletions(-) diff --git a/po/de.po b/po/de.po index 2e514bf4..0a3f75b6 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.2\n" +"Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-22 19:30+0100\n" +"POT-Creation-Date: 2009-03-03 00:58+0100\n" "PO-Revision-Date: 2009-02-01 19:56+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Netznavigator" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 -#: ../midori/main.c:1714 ../midori/main.c:1725 -#: ../midori/midori-websettings.c:265 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 +#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -95,7 +95,7 @@ msgstr "Die Konfiguration konnte nicht geladen werden. %s" msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1069 ../midori/sokoke.c:580 +#: ../midori/main.c:1069 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." @@ -120,7 +120,7 @@ msgstr "Übertragungen" msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1401 +#: ../midori/main.c:1398 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." @@ -128,545 +128,584 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1416 +#: ../midori/main.c:1413 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1420 +#: ../midori/main.c:1417 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1425 +#: ../midori/main.c:1422 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1599 +#: ../midori/main.c:1596 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1631 ../midori/gjs.c:514 +#: ../midori/main.c:1628 ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1654 +#: ../midori/main.c:1651 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1656 +#: ../midori/main.c:1653 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1658 +#: ../midori/main.c:1655 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1702 +#: ../midori/main.c:1699 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1726 +#: ../midori/main.c:1723 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1728 +#: ../midori/main.c:1725 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1755 +#: ../midori/main.c:1752 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1823 +#: ../midori/main.c:1820 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:1832 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1850 +#: ../midori/main.c:1847 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1863 +#: ../midori/main.c:1860 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1876 +#: ../midori/main.c:1873 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1888 +#: ../midori/main.c:1885 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1904 +#: ../midori/main.c:1901 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 -#: ../midori/midori-browser.c:2931 +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 +#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:333 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:358 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:534 +#: ../midori/midori-browser.c:552 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:536 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:566 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 +#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:761 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1340 +#: ../midori/midori-browser.c:1372 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 -#: ../panels/midori-history.c:788 +#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +#, fuzzy +msgid "Open all in _Tabs" +msgstr "In neuem _Reiter öffnen" + +#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 -#: ../panels/midori-history.c:790 +#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2674 +#: ../midori/midori-browser.c:2794 msgid "A lightweight web browser." msgstr "Ein kleiner Netznavigator." -#: ../midori/midori-browser.c:2682 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2859 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:2862 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:2865 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:2868 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:2871 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:2873 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:2874 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:2876 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:2877 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:2880 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:2883 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:2885 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:2888 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 +#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:2897 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:2903 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:2906 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:2908 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:2909 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2911 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:2912 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:2915 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:2916 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:2919 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:2921 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:2922 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:2934 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2937 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:2940 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "_Zeichensatz" + +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "_Automatisch" + +#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "Chinesisch (BIG5)" + +#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japanisch (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "Russisch (KOI8-R)" + +#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "Westlich (ISO-8859-1)" + +#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "Benutzerdefiniert…" + +#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:2943 +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:2945 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:2946 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:2952 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:2961 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:2963 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:2964 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 +#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:2967 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2972 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:2975 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:2980 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:2983 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:2987 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:2988 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3142 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3145 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:2994 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3019 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3022 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:3602 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3686 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3864 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3889 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3894 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:3732 +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3740 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:3750 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4034 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" @@ -674,497 +713,481 @@ msgstr "Die Seitenleiste auf der rechten Seite anordnen" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 +#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:177 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:192 -msgid "Chinese (BIG5)" -msgstr "Chinesisch (BIG5)" - -#: ../midori/midori-websettings.c:193 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japanisch (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:194 -msgid "Russian (KOI8-R)" -msgstr "Russisch (KOI8-R)" - -#: ../midori/midori-websettings.c:195 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:196 -msgid "Western (ISO-8859-1)" -msgstr "Westlich (ISO-8859-1)" - -#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 -msgid "Custom..." -msgstr "Benutzerdefiniert…" - -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:269 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:618 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:696 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "Inkrementelle Suche beim Eintippen" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "Profildateien annehmen" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "Maximales Alter von Profildateien" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:795 msgid "Proxy Server" msgstr "Zwischenrechner" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:796 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:815 msgid "Detect proxy server automatically" msgstr "Zwischenrechner automatisch erkennen" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:816 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:836 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Netz identifiziert werden soll" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:857 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:858 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:629 +#: ../midori/midori-view.c:630 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:960 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:962 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:979 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:989 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:996 +#: ../midori/midori-view.c:997 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:1019 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:1028 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:1507 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1654 +#: ../midori/midori-view.c:1664 msgid "Source" msgstr "Quelltext" -#: ../midori/midori-view.c:1678 +#: ../midori/midori-view.c:1688 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1694 +#: ../midori/midori-view.c:1704 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1225,7 +1248,7 @@ msgstr "Verhalten" msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Bilder automatisch laden" @@ -1257,7 +1280,7 @@ msgstr "Vergrößerbare Textfelder" msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Skripte einschalten" @@ -1265,7 +1288,7 @@ msgstr "Skripte einschalten" msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" @@ -1290,40 +1313,40 @@ msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" #. Page "Interface" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:517 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:518 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:527 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:592 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:597 +#: ../midori/midori-preferences.c:599 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:606 msgid "Web Cookies" msgstr "Netzprofile" -#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 msgid "days" msgstr "Tage" -#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 msgid "History" msgstr "Verlauf" @@ -1351,7 +1374,7 @@ msgstr "_Symbol:" msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" @@ -1360,55 +1383,55 @@ msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:403 +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:734 +#: ../midori/sokoke.c:771 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:736 +#: ../midori/sokoke.c:773 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:737 +#: ../midori/sokoke.c:774 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:738 +#: ../midori/sokoke.c:775 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:739 +#: ../midori/sokoke.c:776 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:740 +#: ../midori/sokoke.c:777 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:741 +#: ../midori/sokoke.c:778 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:742 +#: ../midori/sokoke.c:779 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/sokoke.c:743 +#: ../midori/sokoke.c:780 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:744 +#: ../midori/sokoke.c:781 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:745 +#: ../midori/sokoke.c:782 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/sokoke.c:746 +#: ../midori/sokoke.c:783 msgid "New _Window" msgstr "Neues _Fenster" @@ -1505,7 +1528,7 @@ msgstr "Heute" msgid "Yesterday" msgstr "Gestern" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "Zusatzmodule" @@ -1556,11 +1579,11 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "Mausgesten" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:177 msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" @@ -1573,10 +1596,10 @@ msgstr "Seitenhalter" msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "Bilder" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Skripte" From 5e458d2a5a06aaa324bd5d36478d3856454bc0d8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 3 Mar 2009 01:02:28 +0100 Subject: [PATCH 0841/2970] Disable Find inline while typing by default Some web pages make heavy use of hotkeys with a single letter. --- midori/midori-websettings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 319ac612..49723d1a 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -713,7 +713,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "find-while-typing", _("Find inline while typing"), _("Whether to automatically find inline while typing"), - TRUE, + FALSE, flags)); g_object_class_install_property (gobject_class, From d9f90f13e6d7e651115949e578a7e6ea83bb2782 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 4 Mar 2009 02:03:38 +0100 Subject: [PATCH 0842/2970] Avoid having no main frame, this fixes a g_signal_connect warning --- midori/midori-view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index a4d6d830..228b9fb4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1563,6 +1563,8 @@ midori_view_construct_web_view (MidoriView* view) katze_net_get_session (view->net), NULL); #endif + /* Load something to avoid a bug where WebKit might not set a main frame */ + webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), ""); web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); g_object_connect (view->web_view, From abf30976af231428f51d2cc879ae052aff4a996e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 4 Mar 2009 02:04:37 +0100 Subject: [PATCH 0843/2970] Always show Network and Cookie prefs if we have WebKitGTK+ 1.1.1 --- midori/midori-preferences.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 072d99d8..da4784e1 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -317,8 +317,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* hbox; gint icon_width, icon_height; #if HAVE_LIBSOUP + #if !WEBKIT_CHECK_VERSION (1, 1, 1) GObjectClass* webkit_class; #endif + #endif g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -555,12 +557,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Network" */ #if HAVE_LIBSOUP + #if !WEBKIT_CHECK_VERSION (1, 1, 1) webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); if (g_object_class_find_property (webkit_class, "session") || /* If a cookie jar was created, WebKit is using Soup */ g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) { + #endif PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); TABLE_NEW (5, 2); @@ -592,17 +596,21 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 4, 5); + #if !WEBKIT_CHECK_VERSION (1, 1, 1) } #endif + #endif /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); #if HAVE_LIBSOUP_2_25_2 + #if !WEBKIT_CHECK_VERSION (1, 1, 1) if (g_object_class_find_property (webkit_class, "session") || /* If a cookie jar was created, WebKit is using Soup */ g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) { + #endif FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); @@ -619,8 +627,10 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 2, 3); + #if !WEBKIT_CHECK_VERSION (1, 1, 1) } #endif + #endif FRAME_NEW (_("History")); TABLE_NEW (3, 2); button = katze_property_proxy (settings, "remember-last-visited-pages", NULL); From 40f36328c206102e3e6c95e18d4b4055ea1227a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Wed, 4 Mar 2009 23:07:29 +0100 Subject: [PATCH 0844/2970] Add WebKit version check to compat.h and use it in Preferences --- midori/compat.h | 2 ++ midori/midori-preferences.c | 1 + midori/midori-view.c | 4 ---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/midori/compat.h b/midori/compat.h index 42789bf6..74dd0bee 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -56,6 +56,8 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, #ifndef WEBKIT_CHECK_VERSION +#define WEBKIT_CHECK_VERSION(a,b,c) 0 + gfloat webkit_web_view_get_zoom_level (WebKitWebView* web_view); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index da4784e1..a1fd1082 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -16,6 +16,7 @@ #endif #include "sokoke.h" +#include "compat.h" #include #include diff --git a/midori/midori-view.c b/midori/midori-view.c index 228b9fb4..ee05743c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -34,10 +34,6 @@ #define D_(__domain, __message) __message #endif -#ifndef WEBKIT_CHECK_VERSION - #define WEBKIT_CHECK_VERSION(a,b,c) 0 -#endif - /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); From 7708e9021437690edae888c34c5128ef2ce79e35 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 4 Mar 2009 23:23:23 +0100 Subject: [PATCH 0845/2970] Implement bypassing cache when reloading with Shift --- midori/compat.h | 4 ++++ midori/midori-view.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/midori/compat.h b/midori/compat.h index 74dd0bee..261a2a7a 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -73,6 +73,10 @@ webkit_web_view_zoom_out (WebKitWebView* web_view); #endif +#if !WEBKIT_CHECK_VERSION (1, 1, 1) + #define webkit_web_view_reload_bypass_cache webkit_web_view_reload +#endif + G_END_DECLS #endif /* __COMPAT_H__ */ diff --git a/midori/midori-view.c b/midori/midori-view.c index ee05743c..a610d599 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2347,7 +2347,10 @@ midori_view_reload (MidoriView* view, { g_return_if_fail (MIDORI_IS_VIEW (view)); - webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); + if (from_cache) + webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); + else + webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view)); } /** From f64547f7234d1509a811ab8565ad0b38afc87dac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Mar 2009 22:22:18 +0100 Subject: [PATCH 0846/2970] Load and save extension settings automatically --- midori/main.c | 5 ++ midori/midori-extension.c | 106 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/midori/main.c b/midori/main.c index 1ca69190..ad9aa3e2 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1491,7 +1491,12 @@ midori_load_extensions (gpointer data) if (module && g_module_symbol (module, "extension_init", (gpointer) &extension_init)) + { extension = extension_init (); + /* FIXME: Validate the extension */ + /* Signal that we want the extension to load and save */ + midori_extension_get_config_dir (extension); + } else { extension = g_object_new (MIDORI_TYPE_EXTENSION, diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 0e57fdfc..ce02313b 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -18,6 +18,8 @@ #include "midori-app.h" #include +#include "sokoke.h" +#include G_DEFINE_TYPE (MidoriExtension, midori_extension, G_TYPE_OBJECT); @@ -32,6 +34,7 @@ struct _MidoriExtensionPrivate gchar* config_dir; GList* lsettings; GHashTable* settings; + GKeyFile* key_file; }; typedef struct @@ -215,6 +218,28 @@ midori_extension_activate_cb (MidoriExtension* extension, MidoriApp* app) { GList* lsettings = g_list_first (extension->priv->lsettings); + + /* If a configuration directory was requested before activation we + assume we should load and save settings. This is a detail that + extension writers shouldn't worry about. */ + extension->priv->key_file = lsettings && extension->priv->config_dir + ? g_key_file_new () : NULL; + if (extension->priv->key_file) + { + gchar* config_file; + GError* error = NULL; + + config_file = g_build_filename (extension->priv->config_dir, "config", NULL); + if (!g_key_file_load_from_file (extension->priv->key_file, config_file, + G_KEY_FILE_KEEP_COMMENTS, &error)) + { + if (error->code != G_FILE_ERROR_NOENT) + printf (_("The configuration of the extension '%s' couldn't be loaded: %s\n"), + extension->priv->name, error->message); + g_error_free (error); + } + } + while (lsettings) { MESettingString* setting = (MESettingString*)lsettings->data; @@ -222,15 +247,32 @@ midori_extension_activate_cb (MidoriExtension* extension, if (setting->type == G_TYPE_BOOLEAN) { MESettingBoolean* setting_ = (MESettingBoolean*)setting; - setting_->value = setting_->default_value; + if (extension->priv->key_file) + setting_->value = sokoke_key_file_get_boolean_default ( + extension->priv->key_file, + "settings", setting->name, setting_->default_value, NULL); + else + setting_->value = setting_->default_value; } else if (setting->type == G_TYPE_INT) { MESettingInteger* setting_ = (MESettingInteger*)setting; - setting_->value = setting_->default_value; + if (extension->priv->key_file) + setting_->value = sokoke_key_file_get_integer_default ( + extension->priv->key_file, + "settings", setting->name, setting_->default_value, NULL); + else + setting_->value = setting_->default_value; } else if (setting->type == G_TYPE_STRING) - setting->value = g_strdup (setting->default_value); + { + if (extension->priv->key_file) + setting->value = sokoke_key_file_get_string_default ( + extension->priv->key_file, + "settings", setting->name, setting->default_value, NULL); + else + setting->value = g_strdup (setting->default_value); + } else g_assert_not_reached (); @@ -252,6 +294,7 @@ midori_extension_init (MidoriExtension* extension) extension->priv->lsettings = NULL; extension->priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, me_setting_free); + extension->priv->key_file = NULL; g_signal_connect (extension, "activate", G_CALLBACK (midori_extension_activate_cb), NULL); @@ -270,6 +313,8 @@ midori_extension_finalize (GObject* object) katze_assign (extension->priv->config_dir, NULL); g_list_free (extension->priv->lsettings); g_hash_table_destroy (extension->priv->settings); + if (extension->priv->key_file) + g_key_file_free (extension->priv->key_file); } static void @@ -392,7 +437,8 @@ midori_extension_deactivate (MidoriExtension* extension) * files specific to the extension. For that purpose the 'name' * of the extension is actually part of the path. * - * The path is actually created if it doesn't already exist. + * If settings are installed on the extension, they will be + * loaded from and saved to a file "config" in this path. * * Return value: a path, such as ~/.config/midori/extensions/name **/ @@ -406,7 +452,6 @@ midori_extension_get_config_dir (MidoriExtension* extension) g_get_user_config_dir (), PACKAGE_NAME, "extensions", extension->priv->name, NULL); - g_mkdir_with_parents (extension->priv->config_dir, 0700); return extension->priv->config_dir; } @@ -488,6 +533,23 @@ midori_extension_set_boolean (MidoriExtension* extension, me_setting_type (setting, G_TYPE_BOOLEAN, return); setting->value = value; + if (extension->priv->key_file) + { + GError* error = NULL; + /* FIXME: Handle readonly folder/ file */ + gchar* config_file = g_build_filename (extension->priv->config_dir, + "config", NULL); + g_mkdir_with_parents (extension->priv->config_dir, 0700); + g_key_file_set_boolean (extension->priv->key_file, + "settings", name, value); + sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); + if (error) + { + printf (_("The configuration of the extension '%s' couldn't be saved: %s\n"), + extension->priv->name, error->message); + g_error_free (error); + } + } } /** @@ -568,6 +630,23 @@ midori_extension_set_integer (MidoriExtension* extension, me_setting_type (setting, G_TYPE_INT, return); setting->value = value; + if (extension->priv->key_file) + { + GError* error = NULL; + /* FIXME: Handle readonly folder/ file */ + gchar* config_file = g_build_filename (extension->priv->config_dir, + "config", NULL); + g_mkdir_with_parents (extension->priv->config_dir, 0700); + g_key_file_set_integer (extension->priv->key_file, + "settings", name, value); + sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); + if (error) + { + printf (_("The configuration of the extension '%s' couldn't be saved: %s\n"), + extension->priv->name, error->message); + g_error_free (error); + } + } } /** @@ -648,4 +727,21 @@ midori_extension_set_string (MidoriExtension* extension, me_setting_type (setting, G_TYPE_STRING, return); katze_assign (setting->value, g_strdup (value)); + if (extension->priv->key_file) + { + GError* error = NULL; + /* FIXME: Handle readonly folder/ file */ + gchar* config_file = g_build_filename (extension->priv->config_dir, + "config", NULL); + g_mkdir_with_parents (extension->priv->config_dir, 0700); + g_key_file_set_string (extension->priv->key_file, + "settings", name, value); + sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); + if (error) + { + printf (_("The configuration of the extension '%s' couldn't be saved: %s\n"), + extension->priv->name, error->message); + g_error_free (error); + } + } } From 1fb5222a3f601ec06c02be695e096785134dc506 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Mar 2009 22:45:34 +0100 Subject: [PATCH 0847/2970] Fix zooming, and make Zoom Normal work again --- midori/compat.c | 2 +- midori/gjs.c | 6 +----- midori/main.c | 6 +----- midori/midori-browser.c | 4 ++-- midori/midori-view.c | 17 ++++++----------- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index 6eb1c96c..253d93ed 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -73,7 +73,7 @@ webkit_web_view_get_zoom_level (WebKitWebView* web_view) { g_return_val_if_fail (WEBKIT_IS_WEB_VIEW (web_view), 1.0); - return 1.0; + return 1.0f; } void diff --git a/midori/gjs.c b/midori/gjs.c index 372f3de3..91490022 100644 --- a/midori/gjs.c +++ b/midori/gjs.c @@ -15,6 +15,7 @@ #include /* Needed for versioning macros */ #include +#include "compat.h" struct _GjsValue { @@ -1022,12 +1023,7 @@ gjs_module_new (JSContextRef js_context, JSGlobalContextRef gjs_global_context_new (void) { - #ifdef WEBKIT_CHECK_VERSION #if WEBKIT_CHECK_VERSION (1, 0, 3) - #define HAVE_JSCONTEXTGROUP 1 - #endif - #endif - #if HAVE_JSCONTEXTGROUP JSGlobalContextRef js_context = JSGlobalContextCreateInGroup (NULL, NULL); #else JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); diff --git a/midori/main.c b/midori/main.c index ad9aa3e2..2f3fb1a1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -29,6 +29,7 @@ #include "midori-websettings.h" #include "sokoke.h" +#include "compat.h" #if HAVE_UNISTD_H #include @@ -1607,12 +1608,7 @@ midori_run_script (const gchar* filename) gchar* script; GError* error = NULL; - #ifdef WEBKIT_CHECK_VERSION #if WEBKIT_CHECK_VERSION (1, 0, 3) - #define HAVE_JSCONTEXTGROUP 1 - #endif - #endif - #if HAVE_JSCONTEXTGROUP js_context = JSGlobalContextCreateInGroup (NULL, NULL); #else js_context = JSGlobalContextCreate (NULL); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0807e497..8bfa767d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -252,7 +252,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (MIDORI_VIEW (view))); _action_set_sensitive (browser, "ZoomNormal", - midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0); + midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0f); _action_set_sensitive (browser, "Encoding", midori_browser_view_can_set_encoding (MIDORI_VIEW (view))); _action_set_sensitive (browser, "SourceView", @@ -511,7 +511,7 @@ midori_view_notify_zoom_level_cb (GtkWidget* view, { if (view == midori_browser_get_current_tab (browser)) _action_set_sensitive (browser, "ZoomNormal", - midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0); + midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0f); } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index a610d599..c39d515c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2246,13 +2246,9 @@ midori_view_get_proxy_item (MidoriView* view) gfloat midori_view_get_zoom_level (MidoriView* view) { - g_return_val_if_fail (MIDORI_IS_VIEW (view), 1.0); + g_return_val_if_fail (MIDORI_IS_VIEW (view), 1.0f); - #ifdef WEBKIT_CHECK_VERSION - if (view->web_view != NULL) - return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); - #endif - return 1.0; + return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); } /** @@ -2268,10 +2264,9 @@ midori_view_set_zoom_level (MidoriView* view, { g_return_if_fail (MIDORI_IS_VIEW (view)); - #ifdef WEBKIT_CHECK_VERSION webkit_web_view_set_zoom_level ( WEBKIT_WEB_VIEW (view->web_view), zoom_level); - #endif + g_object_notify (G_OBJECT (view), "zoom-level"); } gboolean @@ -2279,7 +2274,7 @@ midori_view_can_zoom_in (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 1) return view->web_view != NULL; #else return FALSE; @@ -2291,7 +2286,7 @@ midori_view_can_zoom_out (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 1) return view->web_view != NULL; #else return FALSE; @@ -2440,7 +2435,7 @@ midori_view_print (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - #ifdef WEBKIT_CHECK_VERSION + #if WEBKIT_CHECK_VERSION (1, 0, 1) webkit_web_frame_print (webkit_web_view_get_main_frame ( WEBKIT_WEB_VIEW (view->web_view))); #else From 7c10d2078accf1fb345b4e9bd5c049da4df4f0d0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Mar 2009 23:09:22 +0100 Subject: [PATCH 0848/2970] Make sure there actually is a web view when returning the level --- midori/midori-view.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index c39d515c..5c903741 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2248,7 +2248,9 @@ midori_view_get_zoom_level (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), 1.0f); - return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); + if (view->web_view != NULL) + return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (view->web_view)); + return 1.0f; } /** From b91b8c5c4bdb7db715ca4733ec166d96637f319c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Mar 2009 23:10:05 +0100 Subject: [PATCH 0849/2970] Add unit test for the browser, it tests actions at this point --- tests/browser.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 tests/browser.c diff --git a/tests/browser.c b/tests/browser.c new file mode 100644 index 00000000..63e3fa11 --- /dev/null +++ b/tests/browser.c @@ -0,0 +1,66 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori.h" +#include "midori-stock.h" +#include "sokoke.h" + +#if GLIB_CHECK_VERSION (2, 16, 0) + +static void +browser_create (void) +{ + MidoriApp* app; + MidoriBrowser* browser; + GtkActionGroup* action_group; + GList* actions; + + app = midori_app_new (); + browser = midori_app_create_browser (app); + gtk_widget_destroy (GTK_WIDGET (browser)); + + app = midori_app_new (); + browser = midori_app_create_browser (app); + action_group = midori_browser_get_action_group (browser); + actions = gtk_action_group_list_actions (action_group); + while (actions) + { + GtkAction* action = actions->data; + if (g_strcmp0 (gtk_action_get_name (action), "WindowClose")) + if (g_strcmp0 (gtk_action_get_name (action), "EncodingCustom")) + gtk_action_activate (action); + actions = g_list_next (actions); + } + g_list_free (actions); + gtk_widget_destroy (GTK_WIDGET (browser)); +} + +int +main (int argc, + char** argv) +{ + /* libSoup uses threads, therefore if WebKit is built with libSoup + or Midori is using it, we need to initialize threads. */ + if (!g_thread_supported ()) g_thread_init (NULL); + g_test_init (&argc, &argv, NULL); + gtk_init_check (&argc, &argv); + sokoke_register_stock_items (); + + g_test_add_func ("/browser/create", browser_create); + + return g_test_run (); +} + +#endif From 60d5452b5e944a1f05317e4135e23a0b76c5ce20 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 5 Mar 2009 23:36:13 +0100 Subject: [PATCH 0850/2970] Implement a button to use the current page as homepage --- midori/midori-preferences.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index a1fd1082..c8894832 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -182,6 +182,21 @@ midori_preferences_new (GtkWindow* parent, return GTK_WIDGET (preferences); } +static void +midori_preferences_homepage_current_clicked_cb (GtkWidget* button, + MidoriWebSettings* settings) +{ + GtkWidget* preferences = gtk_widget_get_toplevel (button); + GtkWidget* browser = katze_object_get_object (preferences, "transient-for"); + + if (GTK_IS_WINDOW (browser)) + { + gchar* uri = katze_object_get_string (browser, "uri"); + g_object_set (settings, "homepage", uri, NULL); + g_free (uri); + } +} + static gboolean proxy_download_manager_icon_cb (GtkWidget* entry, GdkEventFocus* event, @@ -399,9 +414,20 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (button, 1, 2, 0, 1); label = katze_property_label (settings, "homepage"); INDENTED_ADD (label, 0, 1, 1, 2); - /* TODO: We need something like "use current website" */ + hbox = gtk_hbox_new (FALSE, 4); entry = katze_property_proxy (settings, "homepage", NULL); - FILLED_ADD (entry, 1, 2, 1, 2); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + if (parent && katze_object_has_property (parent, "uri")) + { + button = gtk_button_new (); + label = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), label); + gtk_widget_set_tooltip_text (button, _("Use current page as homepage")); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_preferences_homepage_current_clicked_cb), settings); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + } + FILLED_ADD (hbox, 1, 2, 1, 2); button = katze_property_proxy (settings, "show-crash-dialog", "blurb"); SPANNED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Transfers")); From abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 6 Mar 2009 20:29:40 +0100 Subject: [PATCH 0851/2970] Use session function in WebKitGTK+ 1.1.1 and prepare the session --- midori/main.c | 73 +++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/midori/main.c b/midori/main.c index 2f3fb1a1..05f6d149 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1326,34 +1326,21 @@ midori_soup_session_debug (SoupSession* session) } } -/* The following code hooks up to any created soup session in order to - modify preferences. This is *not* a generally advisable technique - but merely a preliminary workaround until WebKit exposes its session. */ -static GObjectConstructed old_session_constructed_cb; static void -soup_session_constructed_cb (GObject* object) +midori_soup_session_prepare (SoupSession* session, + MidoriWebSettings* settings) { - MidoriApp* app; - MidoriWebSettings* settings; - SoupSession* session; SoupSessionFeature* feature; gchar* config_file; - if (old_session_constructed_cb) - old_session_constructed_cb (object); - app = g_type_get_qdata (SOUP_TYPE_SESSION, - g_quark_from_static_string ("midori-app")); - settings = katze_object_get_object (app, "settings"); - session = SOUP_SESSION (object); - soup_session_settings_notify_http_proxy_cb (settings, NULL, session); soup_session_settings_notify_ident_string_cb (settings, NULL, session); g_signal_connect (settings, "notify::http-proxy", - G_CALLBACK (soup_session_settings_notify_http_proxy_cb), object); + G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session); g_signal_connect (settings, "notify::auto-detect-proxy", - G_CALLBACK (soup_session_settings_notify_http_proxy_cb), object); + G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session); g_signal_connect (settings, "notify::ident-string", - G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); + G_CALLBACK (soup_session_settings_notify_ident_string_cb), session); soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); midori_soup_session_debug (session); @@ -1364,6 +1351,29 @@ soup_session_constructed_cb (GObject* object) config_file, (GDestroyNotify)g_free); soup_session_add_feature (session, feature); } + +#if !WEBKIT_CHECK_VERSION (1, 1, 1) +/* The following code hooks up to any created soup session in order to + modify preferences. This is *not* a generally advisable technique + but merely a preliminary workaround until WebKit exposes its session. */ +static GObjectConstructed old_session_constructed_cb; +static void +soup_session_constructed_cb (GObject* object) +{ + MidoriApp* app; + MidoriWebSettings* settings; + SoupSession* session; + + if (old_session_constructed_cb) + old_session_constructed_cb (object); + app = g_type_get_qdata (SOUP_TYPE_SESSION, + g_quark_from_static_string ("midori-app")); + settings = katze_object_get_object (app, "settings"); + session = SOUP_SESSION (object); + + midori_soup_session_prepare (session, settings); +} +#endif #endif static void @@ -1670,7 +1680,9 @@ main (int argc, KatzeItem* item; gchar* uri_ready; #if HAVE_LIBSOUP + #if !WEBKIT_CHECK_VERSION (1, 1, 1) GObjectClass* webkit_class; + #endif KatzeNet* net; SoupSession* s_session; #endif @@ -1758,6 +1770,7 @@ main (int argc, } #if HAVE_LIBSOUP + #if !WEBKIT_CHECK_VERSION (1, 1, 1) webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); if (!g_object_class_find_property (webkit_class, "session")) { @@ -1774,6 +1787,7 @@ main (int argc, } } #endif + #endif /* Load configuration files */ error_messages = g_string_new (NULL); @@ -1918,27 +1932,24 @@ main (int argc, } g_string_free (error_messages, TRUE); - #if HAVE_LIBSOUP - webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); - if (g_object_class_find_property (webkit_class, "session")) + #if WEBKIT_CHECK_VERSION (1, 1, 1) + if (1) { + SoupSession* webkit_session = webkit_get_default_session (); + net = katze_net_new (); s_session = katze_net_get_session (net); #if HAVE_LIBSOUP_2_25_2 + g_type_set_qdata (SOUP_TYPE_SESSION, + g_quark_from_static_string ("midori-app"), app); katze_assign (config_file, build_config_filename ("cookies.txt")); - jar = soup_cookie_jar_text_new (config_file, FALSE); - /* FIXME: Handle "accept-cookies" preference */ + jar = soup_cookie_jar_new (); soup_session_add_feature (s_session, SOUP_SESSION_FEATURE (jar)); + soup_session_add_feature (webkit_session, SOUP_SESSION_FEATURE (jar)); g_object_unref (jar); #endif - soup_session_settings_notify_http_proxy_cb (settings, NULL, s_session); - soup_session_settings_notify_ident_string_cb (settings, NULL, s_session); - g_signal_connect (settings, "notify::http-proxy", - G_CALLBACK (soup_session_settings_notify_http_proxy_cb), s_session); - g_signal_connect (settings, "notify::ident-string", - G_CALLBACK (soup_session_settings_notify_ident_string_cb), s_session); - soup_session_add_feature_by_type (s_session, KATZE_TYPE_HTTP_AUTH); - midori_soup_session_debug (s_session); + midori_soup_session_prepare (s_session, settings); + midori_soup_session_prepare (webkit_session, settings); g_object_unref (net); } #endif From aa181a4a6fd30566c9a4684592882abfe674d972 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 7 Mar 2009 13:58:32 +0100 Subject: [PATCH 0852/2970] Make the proxy insensitive if the array is unset --- katze/katze-arrayaction.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 0ff5f1c4..7d704b84 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -223,7 +223,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, GtkWidget* menu, GtkWidget* proxy) { - guint n, i; + guint i; KatzeItem* item; GtkWidget* menuitem; const gchar* icon_name; @@ -231,11 +231,9 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, GtkWidget* image; GtkWidget* submenu; - n = katze_array_get_length (array); - if (n > 0) - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) { - item = katze_array_get_nth_item (array, i); /* FIXME: The menu item should reflect changes to the item */ if (!KATZE_IS_ARRAY (item) && !katze_item_get_uri (item)) { @@ -274,7 +272,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); gtk_widget_show (menuitem); } - else + if (!i) { menuitem = gtk_image_menu_item_new_with_label (_("Empty")); gtk_widget_set_sensitive (menuitem, FALSE); @@ -517,6 +515,7 @@ katze_array_action_connect_proxy (GtkAction* action, g_signal_connect (proxy, "select", G_CALLBACK (katze_array_action_proxy_clicked_cb), action); } + gtk_widget_set_sensitive (proxy, KATZE_ARRAY_ACTION (action)->array != NULL); } static void @@ -568,9 +567,8 @@ katze_array_action_set_array (KatzeArrayAction* array_action, return; do - if (GTK_IS_TOOL_ITEM (proxies->data)) { - + gtk_widget_set_sensitive (proxies->data, array != NULL); } while ((proxies = g_slist_next (proxies))); } From 1af23afbe8bb0a8b736ee1f410ee700f14dbbccd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 7 Mar 2009 14:00:14 +0100 Subject: [PATCH 0853/2970] Implement Last Visited Pages menu and toolbar item We use the name of history folders now to store dates instead of the token. This makes it possible to show history in an action. --- midori/main.c | 2 +- midori/midori-browser.c | 35 +++++++++++++++++++++++++---------- panels/midori-history.c | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/midori/main.c b/midori/main.c index 05f6d149..b5849c1c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -762,7 +762,7 @@ midori_history_add_items (void* data, katze_item_set_added (KATZE_ITEM (parent), day); strftime (token, sizeof (token), "%x", localtime ((time_t *)&date)); - katze_item_set_token (KATZE_ITEM (parent), token); + katze_item_set_name (KATZE_ITEM (parent), token); katze_array_add_item (array, parent); } katze_array_add_item (parent, item); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8bfa767d..1b13ee37 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1796,8 +1796,9 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, { GtkAction* widget_action = gtk_widget_get_action (widget); const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", - "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", "Separator", - "ZoomOut", "Back", "Forward", "Homepage", "Panel", "Trash", "Search" }; + "Preferences", "Window", "Bookmarks", "RecentlyVisited", + "ReloadStop", "ZoomIn", "Separator", "ZoomOut", "Back", "Forward", + "Homepage", "Panel", "Trash", "Search" }; GtkWidget* submenu; gsize i; @@ -3336,7 +3337,7 @@ static const gchar* ui_markup = "" "" "" - /* "" */ + "" "" "" "

" @@ -3431,7 +3432,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, strftime (token, sizeof (token), "%x", localtime (&now)); parent = katze_array_new (KATZE_TYPE_ARRAY); katze_item_set_added (KATZE_ITEM (parent), day); - katze_item_set_token (KATZE_ITEM (parent), token); + katze_item_set_name (KATZE_ITEM (parent), token); katze_array_add_item (browser->history, parent); katze_array_add_item (parent, item); } @@ -3442,12 +3443,18 @@ midori_browser_history_remove_item_cb (KatzeArray* folder, KatzeItem* item, MidoriBrowser* browser) { - GtkAction* location_action = _action_by_name (browser, "Location"); + GtkAction* action; + + action = _action_by_name (browser, "Location"); midori_location_action_delete_item_from_uri ( - MIDORI_LOCATION_ACTION (location_action), katze_item_get_uri (item)); + MIDORI_LOCATION_ACTION (action), katze_item_get_uri (item)); g_signal_handlers_disconnect_by_func (folder, midori_browser_history_remove_item_cb, browser); + + action = _action_by_name (browser, "RecentlyVisited"); + if ((KatzeArray*)item == katze_array_action_get_array (KATZE_ARRAY_ACTION (action))) + g_object_set (action, "array", NULL, NULL); } static void @@ -3487,12 +3494,15 @@ midori_browser_history_clear_cb (KatzeArray* history, { GtkAction* location_action = _action_by_name (browser, "Location"); midori_location_action_clear (MIDORI_LOCATION_ACTION (location_action)); + g_object_set (_action_by_name (browser, "RecentlyVisited"), + "array", NULL, NULL); } static void midori_browser_set_history (MidoriBrowser* browser, KatzeArray* history) { + KatzeItem* recently_visited; GtkAction* action; time_t now; gint64 day; @@ -3508,12 +3518,17 @@ midori_browser_set_history (MidoriBrowser* browser, g_object_ref (history); katze_object_assign (browser->history, history); - midori_browser_history_clear_cb (browser->history, browser); + midori_browser_history_clear_cb (history, browser); - g_object_set (_action_by_name (browser, "RecentlyVisited"), - "array", browser->history, NULL); + if (history && ((recently_visited = katze_array_get_nth_item (history, + katze_array_get_length (KATZE_ARRAY (history)) - 1)))) + g_object_set (_action_by_name (browser, "RecentlyVisited"), + "array", recently_visited, NULL); + else + g_object_set (_action_by_name (browser, "RecentlyVisited"), + "array", NULL, NULL); - if (!browser->history) + if (!history) return; g_signal_connect (browser->history, "clear", diff --git a/panels/midori-history.c b/panels/midori-history.c index 3ef50bba..b3687fcd 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -596,7 +596,7 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, if (age > 7) { - g_object_set (renderer, "text", katze_item_get_token (item), NULL); + g_object_set (renderer, "text", katze_item_get_name (item), NULL); } else if (age > 6) { From 8f8f00f8b8b6c7f55ef9ed6095d674be1a8ae770 Mon Sep 17 00:00:00 2001 From: Sergio Durzu Date: Sun, 8 Mar 2009 00:12:27 +0100 Subject: [PATCH 0854/2970] Update Italian translation --- po/it.po | 1051 +++++++++++++++++++++++++++++------------------------- 1 file changed, 567 insertions(+), 484 deletions(-) diff --git a/po/it.po b/po/it.po index 01804b99..1f7e72a3 100644 --- a/po/it.po +++ b/po/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-03 22:54+0100\n" -"PO-Revision-Date: 2009-03-02 15:47+0100\n" +"POT-Creation-Date: 2009-03-03 09:50+0100\n" +"PO-Revision-Date: 2009-03-03 10:06+0100\n" "Last-Translator: Sergio Durzu \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ msgid "Lightweight web browser" msgstr "Browser web leggero" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1950 -#: ../midori/main.c:2056 -#: ../midori/main.c:2065 -#: ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../midori/main.c:1596 +#: ../midori/main.c:1702 +#: ../midori/main.c:1711 +#: ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -32,1425 +32,1447 @@ msgstr "Midori" msgid "Web Browser" msgstr "Browser web" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "S_egnalibro" - -#: ../midori/main.c:91 -#: ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "S_egnalibri" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "A_ggiungi segnalibro" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "_Console" - -#: ../midori/main.c:94 -msgid "_Extensions" -msgstr "_Estensioni" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "C_ronologia" - -#: ../midori/main.c:96 -msgid "_Homepage" -msgstr "_Pagina iniziale" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "Script dell'_utente" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "_Stili dell'utente" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "N_uova scheda" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "_Download" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "_Finestre e schede chiuse" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "_Nuova finestra" - -#: ../midori/main.c:158 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Le impostazioni non possono essere caricate: %s\n" -#: ../midori/main.c:213 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Il valore «%s» non è valido per %s" -#: ../midori/main.c:220 -#: ../midori/main.c:290 +#: ../midori/main.c:168 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valore di configurazione «%s» non valido" -#: ../midori/main.c:532 +#: ../midori/main.c:480 msgid "File not found." msgstr "File non trovato." -#: ../midori/main.c:540 -#: ../midori/main.c:549 +#: ../midori/main.c:488 +#: ../midori/main.c:497 msgid "Malformed document." msgstr "Documento corrotto." -#: ../midori/main.c:571 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" msgstr "Errore nella connessione al database: %s\n" -#: ../midori/main.c:603 +#: ../midori/main.c:551 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Errore nell'esecuzione della richiesta al database: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "Errore nella cancellazione della cronologia: %s\n" -#: ../midori/main.c:704 -#: ../midori/main.c:738 -#: ../midori/main.c:754 +#: ../midori/main.c:652 +#: ../midori/main.c:686 +#: ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "Errore nell'inserimento dell'elemento nella cronologia: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Errore nella cancellazione dei vecchi elementi della cronologia: %s\n" -#: ../midori/main.c:962 +#: ../midori/main.c:910 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Le impostazioni non possono essere salvate. %s" -#: ../midori/main.c:991 +#: ../midori/main.c:939 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "I motori di ricerca non possono essere salvati. %s" -#: ../midori/main.c:1121 -#: ../midori/sokoke.c:531 +#: ../midori/main.c:1069 +#: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Errore di scrittura." -#: ../midori/main.c:1142 -#: ../midori/main.c:1169 -#: ../midori/main.c:1197 +#: ../midori/main.c:1090 +#: ../midori/main.c:1117 +#: ../midori/main.c:1145 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "I segnalibri non possono essere salvati. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 -#: ../midori/main.c:1245 +#: ../midori/main.c:1169 +#: ../midori/main.c:1193 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Il cestino non può essere salvato. %s" -#: ../midori/main.c:1271 -#: ../midori/midori-preferences.c:386 +#: ../midori/main.c:1224 +#: ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "Download" -#: ../midori/main.c:1312 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "Autenticazione richiesta" - -#: ../midori/main.c:1652 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" -"Sono necessari un nome utente e una password\n" -"per aprire questo indirizzo:" - -#: ../midori/main.c:1666 -msgid "Username" -msgstr "Nome utente" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "Password" - -#: ../midori/main.c:1783 +#: ../midori/main.c:1398 msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Midori sembra essersi chiuso inaspettatamente l'ultima volta che è stato usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per risolvere il problema." -#: ../midori/main.c:1798 +#: ../midori/main.c:1413 msgid "Modify _preferences" msgstr "Modifica _preferenze" -#: ../midori/main.c:1802 +#: ../midori/main.c:1417 msgid "Reset the last _session" msgstr "Reimposta l'ultima _sessione" -#: ../midori/main.c:1807 +#: ../midori/main.c:1422 msgid "Disable all _extensions" msgstr "Disabilita tutte le _estensioni" -#: ../midori/main.c:1950 +#: ../midori/main.c:1596 msgid "No filename specified" msgstr "Nessun file specificato" -#: ../midori/main.c:1982 +#: ../midori/main.c:1628 #: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Si è presentato un errore sconosciuto" -#: ../midori/main.c:2005 +#: ../midori/main.c:1651 msgid "Run the specified filename as javascript" msgstr "Esegue il file specificato come javascript" -#: ../midori/main.c:2007 +#: ../midori/main.c:1653 msgid "Display program version" msgstr "Visualizza la versione dell'applicazione" -#: ../midori/main.c:2009 +#: ../midori/main.c:1655 msgid "Addresses" msgstr "Indirizzi" -#: ../midori/main.c:2053 +#: ../midori/main.c:1699 msgid "[Addresses]" msgstr "[Indirizzi]" -#: ../midori/main.c:2077 +#: ../midori/main.c:1723 msgid "Please report comments, suggestions and bugs to:" msgstr "Segnalare commenti, suggerimenti e bug su:" -#: ../midori/main.c:2079 +#: ../midori/main.c:1725 msgid "Check for new versions at:" msgstr "Controlla nuove versioni su:" -#: ../midori/main.c:2106 +#: ../midori/main.c:1752 msgid "An instance of Midori is already running but not responding.\n" msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n" -#: ../midori/main.c:2184 +#: ../midori/main.c:1820 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "I motori di ricerca non possono essere caricati. %s\n" -#: ../midori/main.c:2196 +#: ../midori/main.c:1832 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "I segnalibri non possono essere caricati: %s\n" -#: ../midori/main.c:2211 +#: ../midori/main.c:1847 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La sessione non può essere caricata: %s\n" -#: ../midori/main.c:2224 +#: ../midori/main.c:1860 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Il cestino non può essere caricato: %s\n" -#: ../midori/main.c:2237 +#: ../midori/main.c:1873 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "La cronologia non può essere caricata: %s\n" -#: ../midori/main.c:2249 +#: ../midori/main.c:1885 msgid "The following errors occured:" msgstr "Si sono presentati i seguenti errori:" -#: ../midori/main.c:2265 +#: ../midori/main.c:1901 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-browser.c:258 -#: ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:277 +#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "Ricarica la pagina corrente" -#: ../midori/midori-browser.c:270 -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:288 +#: ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "Interrompe il caricamento della pagina corrente" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "%d%% caricato" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "Azione inaspettata: '%s'" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:552 +msgid "New folder" +msgstr "Nuova cartella" + +#: ../midori/midori-browser.c:552 +msgid "Edit folder" +msgstr "Modifica cartella" + +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "Nuovo segnalibro" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "Modifica segnalibro" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Titolo:" -#: ../midori/midori-browser.c:559 -#: ../midori/midori-searchaction.c:854 +#: ../midori/midori-browser.c:597 +#: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Descrizione:" -#: ../midori/midori-browser.c:578 -#: ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:616 +#: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Indirizzo:" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "_Cartella:" -#: ../midori/midori-browser.c:601 -#: ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:640 +#: ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "Livello principale" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:761 msgid "Save file as" msgstr "Salva come" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1372 msgid "Open file" msgstr "Apri file" -#: ../midori/midori-browser.c:2524 -#: ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2634 +#: ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "Apri _tutti in nuove schede" + +#: ../midori/midori-browser.c:2641 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Apri in una nuova sc_heda" -#: ../midori/midori-browser.c:2526 -#: ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2644 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Apri in una nuova _finestra" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "Una settimana fa" - #: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "%d giorni fa" - -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "Oggi" - -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "Ieri" - -#: ../midori/midori-browser.c:2892 msgid "A lightweight web browser." msgstr "Un browser web leggero" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "Sergio Durzu " -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "Cancellare completamente la cronologia?" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "Apre una nuova scheda" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "Apre un file" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" msgstr "Salva un file" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "Chiude la scheda corrente" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "Chiudi _finestra" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "Chiude la finestra" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "Stampa la pagina corrente" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "Esce dall'applicazione" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "_Modifica" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "Taglia il testo selezionato" -#: ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "Copia il testo selezionato" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "Incolla il testo dagli appunti" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "Elimina il testo selezionato" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "Seleziona tutto" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "Cerca una parola o una frase nella pagina" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "Trova _successivo" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "Trova la parola o frase successiva" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "Trova la parola o frase precedente" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "Ricerca _veloce" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" msgstr "Salta velocemente a una parola o frase" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "Imposta le preferenze dell'applicazione" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "_Visualizza" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "_Barre degli strumenti" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "Aumenta il livello di ingrandimento" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "Diminuisce il livello di ingrandimento" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "Azzera il livello di ingrandimento" -#: ../midori/midori-browser.c:3181 -#: ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "_Codifica" + +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "_Automatico" + +#: ../midori/midori-browser.c:3076 +#: ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "Cinese (BIGS)" + +#: ../midori/midori-browser.c:3079 +#: ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "Giapponese (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3082 +#: ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "Russo (KOI8-R)" + +#: ../midori/midori-browser.c:3085 +#: ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3088 +#: ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "Occidentale (ISO-8859-1)" + +#: ../midori/midori-browser.c:3091 +#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "Personalizzato..." + +#: ../midori/midori-browser.c:3094 +#: ../midori/midori-view.c:1077 msgid "View _Source" msgstr "Visualizza _sorgente" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "Visualizza il codice sorgente della pagina" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" msgstr "Visualizza sorgente selezione" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "Visualizza il codice sorgente della selezione" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "Schermo intero" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "_Vai" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "Va alla pagina precedente" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "Va alla pagina successiva" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "Va alla pagina iniziale" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "Svuota cestino" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" msgstr "Elimina il contenuto del cestino" -#: ../midori/midori-browser.c:3205 -#: ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:3118 +#: ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Annulla chiusura scheda" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "Apre l'ultima scheda chiusa" -#: ../midori/midori-browser.c:3210 -#: ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:3123 +#: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Aggiunge un nuovo segnalibro" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "Elimina l'elemento selezionato dalla cronologia" - -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "Cancella l'intera cronologia" - -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "S_trumenti" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3126 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "Gestisci _motori di ricerca" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." msgstr "Aggiunge, modifica e elimina motori di ricerca..." -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "Scheda _precedente" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "Passa alla scheda precedente" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "Scheda _successiva" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "Passa alla scheda successiva" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "_Aiuto" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "_Sommario" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "Mostra la documentazione" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3142 msgid "_Frequent Questions" msgstr "Domande _frequenti" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3145 msgid "_Report a Bug" msgstr "Segnala un _bug" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" msgstr "Apre lo strumento di segnalazione bug di Midori" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "Mostra le informazioni sull'applicazione" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "Navigazione _privata" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" msgstr "Non memorizza i dati personali durante la navigazione" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "Barra dei _menù" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "Mostra la barra dei menù" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "Barra di _navigazione" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "Mostra la barra di navigazione" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "_Pannello laterale" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "Mostra il pannello laterale" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" msgstr "_Barra dei segnalibri" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "Mostra la barra dei segnalibri" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" msgstr "Barra dei _download" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "Mostra la barra dei download" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "Barra di _stato" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "Mostra la barra di stato" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3602 msgid "_Separator" msgstr "Sep_aratore" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "_Indirizzo..." -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "Apre un indirizzo specifico" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." msgstr "Ricerca sul _web..." -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" msgstr "Esegue una ricerca sul web" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" msgstr "Riapre una scheda o una finestra chiusa precedentemente" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "Pagine visitate _recentemente" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" msgstr "Riapre le pagine visitate recentemente" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:3684 +#: ../midori/sokoke.c:772 +msgid "_Bookmarks" +msgstr "S_egnalibri" + +#: ../midori/midori-browser.c:3686 msgid "Show the saved bookmarks" msgstr "Mostra i segnalibri salvati" -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "_Finestra" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "Mostra un elenco delle schede aperte" -#: ../midori/midori-browser.c:4001 -#: ../midori/midori-preferences.c:597 -msgid "History" -msgstr "Cronologia" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:3864 msgid "_Inline Find:" msgstr "Cerca nel _testo:" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:3889 msgid "Previous" msgstr "Successivo" -#: ../midori/midori-browser.c:4076 +#: ../midori/midori-browser.c:3894 msgid "Next" msgstr "Precedente" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "Maiuscole/minuscole" -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" msgstr "Evidenzia risultati" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "Chiudi barra ricerca" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "Impostazione «%s» non prevista" -#: ../midori/midori-panel.c:199 -#: ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:481 +msgid "Align sidepanel on the right" +msgstr "Allinea a destra il pannello laterale" + +#: ../midori/midori-panel.c:231 +#: ../midori/midori-websettings.c:482 +msgid "Whether to align the sidepanel on the right" +msgstr "Abilitare per allineare il pannello laterale a destra" + +#: ../midori/midori-panel.c:241 +#: ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Chiudi pannello" -#: ../midori/midori-websettings.c:169 -#: ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:177 +#: ../midori/midori-view.c:1821 msgid "Blank page" msgstr "Pagina vuota" -#: ../midori/midori-websettings.c:170 -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:178 +#: ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "Pagina iniziale" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "Ultime pagine visitate" -#: ../midori/midori-websettings.c:186 -msgid "Chinese (BIG5)" -msgstr "Cinese (BIGS)" - -#: ../midori/midori-websettings.c:187 -msgid "Japanese (SHIFT_JIS)" -msgstr "Giapponese (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:188 -msgid "Russian (KOI8-R)" -msgstr "Russo (KOI8-R)" - -#: ../midori/midori-websettings.c:189 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:190 -msgid "Western (ISO-8859-1)" -msgstr "Occidentale (ISO-8859-1)" - -#: ../midori/midori-websettings.c:191 -#: ../midori/midori-websettings.c:263 -msgid "Custom..." -msgstr "Personalizzato..." - -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "Nuova scheda" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "Nuova finestra" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "Scheda corrente" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "Predefinito" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "Icone" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "Testo" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "Entrambi" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "Entrambi orizzontalmente" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "Tutti i cookie" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "Cookie di sessione" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:252 #: ../panels/midori-addons.c:96 msgid "None" msgstr "Nessuno" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:268 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:269 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:270 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "Ricorda la dimensione dell'ultima finestra" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" msgstr "Salva le dimensioni dell'ultima finestra" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "Larghezza dell'ultima finestra" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" msgstr "L'ultima larghezza salvata per la finestra" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "Altezza dell'ultima finestra" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" msgstr "L'ultima altezza salvata per la finestra" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "Posizione del pannello" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" msgstr "L'ultima posizione salvata per il pannello" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" msgstr "Pagina dell'ultimo pannello" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" msgstr "L'ultima pagina salvata per il pannello" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" msgstr "Ultima ricerca web" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" msgstr "L'ultima ricerca web salvata" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "Mostra barra dei menù" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "Abilitare per mostrare la barra dei menù" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "Mostra barra di navigazione" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "Abilitare per mostrare la barra di navigazione" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "Mostra barra dei segnalibri" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "Abilitare per mostrare la barra dei segnalibri" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "Mostra pannello" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "Abilitare per mostrare il pannello" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "Mostra barra di stato" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "Abilitare per mostrare la barra di stato" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" msgstr "Stile della barra degli strumenti" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" msgstr "Scegliere lo stile della barra degli strumenti" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:447 +msgid "Show progress in location entry" +msgstr "Mostra caricamento nella barra degli indirizzi" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show loading progress in the location entry" +msgstr "Abilitare per mostrare la percentuale di caricamento della pagina nella barra degli indirizzi" + +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" msgstr "Elementi barra degli strumenti" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "Pannello compatto" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" msgstr "Abilitare per la visualizzazione compatta del pannello" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" msgstr "Carica all'avvio" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "Scegliere cosa deve essere caricato all'avvio dell'applicazione" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "Pagina iniziale" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:517 msgid "Show crash dialog" msgstr "Mostra finestra di errore" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:518 msgid "Show a dialog after Midori crashed" msgstr "Mostra una finestra dopo che Midori si è chiuso inaspettatamente" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "Cartella download" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "Gestione download" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" msgstr "Inserire un gestore download esterno" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" msgstr "Editor di testo" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" msgstr "Inserire un editor di testo esterno" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" msgstr "Motore di ricerca predefinito" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" msgstr "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli indirizzi" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" msgstr "Codifica preferita" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" msgstr "Scegliere la codifica dei caratteri preferita" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" msgstr "Mostra sempre le schede" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "Abilitare per mostrare sempre le etichette delle schede" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" msgstr "Pulsante di chiusura schede" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" msgstr "Abilitare per visualizzare il pulsante di chiusura nelle schede" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "Apri nuove pagine in" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "Scegliere dove aprire le nuove pagine" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "Apri pagine esterne in" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" msgstr "Tasto centrale apre la selezione" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:618 msgid "Load an address from the selection via middle click" msgstr "Abilitare per caricare un indirizzo da una selezione tramite il clic col tasto centrale" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "Apri schede sullo sfondo" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" msgstr "Abilitare per aprire le nuove schede sullo sfondo" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "Apri schede dopo quella corrente" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abilitare per aprire le nuove schede dopo la scheda attuale o dopo l'ultima" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "Apri popup in schede" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "Abilitare per aprire le finestre popup in schede" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:696 msgid "Zoom Text and Images" msgstr "Ingrandimento testo e immagini" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" msgstr "Abilitare per ingrandire il testo e le immagini" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "Cerco direttamente nella pagina mentre si scrive" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "Abilitare per per cercare automaticamente nella pagina quando si scrive" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "Accetta cookie" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "Indicare che tipo di cookie devono essere accettati" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "Cookie originali" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" msgstr "Accetta cookie solo dai siti visitati" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "Durata massima dei cookie" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "Numero di giorni massimo per cui possono essere validi i cookie" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "Ricorda ultime pagine visitate" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" msgstr "Abilitare per salvare l'elenco delle ultime pagine visitate" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "Durata cronologia" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "Ricorda i moduli compilati" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" msgstr "Abilitare per salvare le informazioni inserite nei moduli." -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "Ricorda gli ultimi download" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" msgstr "Abilitare per salvare l'elenco degli ultimi file scaricati" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:795 msgid "Proxy Server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:796 msgid "The proxy server used for HTTP connections" msgstr "Inserire il server proxy usato per le connessioni HTTP" +#: ../midori/midori-websettings.c:815 +msgid "Detect proxy server automatically" +msgstr "Riconosci automaticamente il server proxy" + +#: ../midori/midori-websettings.c:816 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Abilitare per riconoscere automaticamente il server proxy di sistema" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:836 msgid "Identify as" msgstr "Identifica come" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" msgstr "Come essere identificati sul web" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:857 msgid "Identification string" msgstr "Stringa di identificazione" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:858 msgid "The application identification string" msgstr "Inserire la stringa di identificazione dell'applicazione" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "File temporanei" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" msgstr "Dimensione massima consentita per i file temporanei" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#: ../midori/midori-view.c:630 #, c-format msgid "Not found - %s" msgstr "Non trovato - %s" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:960 +msgid "Open _Link" +msgstr "Apri co_llegamento" + +#: ../midori/midori-view.c:962 msgid "Open Link in New _Tab" msgstr "Apri collegamento in una nuova _scheda" -#: ../midori/midori-view.c:911 +#: ../midori/midori-view.c:979 +msgid "Open Link in New _Window" +msgstr "Apri collegamento in una nuova _finestra" + +#: ../midori/midori-view.c:989 msgid "_Save Link destination" msgstr "_Salva indirizzo collegamento" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:997 msgid "_Download Link destination" msgstr "Scarica _indirizzo collegamento" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:1019 +msgid "_Search the Web" +msgstr "_Cerca nel web" + +#: ../midori/midori-view.c:1028 msgid "Open Address in New _Tab" msgstr "Apri indirizzi in una nuova _scheda" -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1507 #, c-format msgid "Inspect page - %s" msgstr "Controlla pagina - %s" -#: ../midori/midori-view.c:1562 +#: ../midori/midori-view.c:1664 msgid "Source" msgstr "Sorgente" -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:1688 #, c-format msgid "Document cannot be displayed" msgstr "Il documento non può essere visualizzato" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:1704 #, c-format msgid "No documentation installed" msgstr "La documentazione non è installata" -#: ../midori/midori-preferences.c:91 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "Preferenze per %s" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "Generale" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "Avvio" #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Visualizzazione" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Impostazioni caratteri" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Famiglia di caratteri predefinita" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:449 msgid "The default font size used to display text" msgstr "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "Dimensione minima caratteri" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:455 msgid "The minimum font size used to display text" msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:462 msgid "Encoding" msgstr "Codifica" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:465 msgid "The character encoding to use by default" msgstr "Scegliere la codifica predefinita dei caratteri" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "Opzioni" -#: ../midori/midori-preferences.c:458 -#: ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:476 +#: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Carica immagini" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" msgstr "Abilitare per caricare e visualizzare automaticamente le immagini" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" msgstr "Ridimensiona immagini" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" msgstr "Abilitare per ridimensionare automaticamente le immagini caricate da sole" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:484 msgid "Print background images" msgstr "Stampa immagini di sfondo" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:485 msgid "Whether background images should be printed" msgstr "Abilitare per stampare le immagini di sfondo" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" msgstr "Aree di testo ridimensionabili" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:489 msgid "Whether text areas are resizable" msgstr "Abilitare per rendere le aree di testo ridimensionabili" -#: ../midori/midori-preferences.c:474 -#: ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:492 +#: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Abilita script" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:493 msgid "Enable embedded scripting languages" msgstr "Abilita linguaggi di scripting integrati" -#: ../midori/midori-preferences.c:478 -#: ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:496 +#: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Abilita plugin" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:497 msgid "Enable embedded plugin objects" msgstr "Abilita oggetti integrati con plugin" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:500 msgid "Enforce 96 dots per inch" msgstr "Forza 96 punti per pollice" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:501 msgid "Enforce a video dot density of 96 DPI" msgstr "Abilitare per forzare la densità dei punti a 96 DPI" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "Abilita strumenti di sviluppo" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:505 msgid "Enable special extensions for developers" msgstr "Abilitare per utilizzare estensioni particolari per gli sviluppatori" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:517 msgid "Interface" msgstr "Interfaccia" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:518 msgid "Navigationbar" msgstr "Barra di navigazione" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:527 msgid "Browsing" msgstr "Navigazione" -#: ../midori/midori-preferences.c:542 -#: ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:565 msgid "Network" msgstr "Rete" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:592 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:599 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:606 msgid "Web Cookies" msgstr "Cookie" -#: ../midori/midori-preferences.c:592 -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:631 msgid "days" msgstr "giorni" +#: ../midori/midori-preferences.c:624 +#: ../panels/midori-history.c:104 +msgid "History" +msgstr "Cronologia" + #: ../midori/midori-searchaction.c:455 #: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Vuoto" -#: ../midori/midori-searchaction.c:810 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "Aggiungi motore di ricerca" -#: ../midori/midori-searchaction.c:810 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "Modifica motore di ricerca" -#: ../midori/midori-searchaction.c:838 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:882 -msgid "_Icon (name or file):" -msgstr "_Icona (nome o file):" +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "I_cona:" -#: ../midori/midori-searchaction.c:896 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" -msgstr "" +msgstr "Parame_tro:" -#: ../midori/midori-searchaction.c:1073 +#: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" msgstr "Gestisci motori di ricerca" -#: ../midori/sokoke.c:101 -#: ../midori/sokoke.c:113 +#: ../midori/sokoke.c:109 +#: ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "Non è possibile eseguire l'applicazione esterna." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore." +#: ../midori/sokoke.c:771 +msgid "_Bookmark" +msgstr "S_egnalibro" + +#: ../midori/sokoke.c:773 +msgid "_Add Bookmark" +msgstr "A_ggiungi segnalibro" + +#: ../midori/sokoke.c:774 +msgid "_Console" +msgstr "_Console" + +#: ../midori/sokoke.c:775 +msgid "_Extensions" +msgstr "_Estensioni" + +#: ../midori/sokoke.c:776 +msgid "_History" +msgstr "C_ronologia" + +#: ../midori/sokoke.c:777 +msgid "_Homepage" +msgstr "_Pagina iniziale" + +#: ../midori/sokoke.c:778 +msgid "_Userscripts" +msgstr "Script dell'_utente" + +#: ../midori/sokoke.c:779 +msgid "User_styles" +msgstr "_Stili dell'utente" + +#: ../midori/sokoke.c:780 +msgid "New _Tab" +msgstr "N_uova scheda" + +#: ../midori/sokoke.c:781 +msgid "_Transfers" +msgstr "_Download" + +#: ../midori/sokoke.c:782 +msgid "_Closed Tabs and Windows" +msgstr "_Finestre e schede chiuse" + +#: ../midori/sokoke.c:783 +msgid "New _Window" +msgstr "_Nuova finestra" + #: ../midori/gjs.c:742 #: ../midori/gjs.c:832 #, c-format @@ -1487,19 +1509,23 @@ msgstr "_Abilita" msgid "_Disable" msgstr "_Disabilita" -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Segnalibri" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:236 msgid "Edit the selected bookmark" msgstr "Modifica il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:244 msgid "Delete the selected bookmark" msgstr "Elimina il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "Aggiungi una nuova cartella" + +#: ../panels/midori-bookmarks.c:589 msgid "Separator" msgstr "Separatore" @@ -1511,11 +1537,65 @@ msgstr "Console" msgid "Extensions" msgstr "Estensioni" +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "Cancellare completamente la cronologia?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "Elimina l'elemento selezionato dalla cronologia" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "Cancella l'intera cronologia" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "Una settimana fa" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "%d giorni fa" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "Oggi" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "Ieri" + #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:52 +#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "Plugin" +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "Autenticazione richiesta" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Sono necessari un nome utente e una password\n" +"per aprire questo indirizzo:" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "Nome utente" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "Password" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1563,11 +1643,14 @@ msgstr "" msgid "_Pageholder" msgstr "" -#: ../extensions/statusbar-features.c:38 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "Immagini" -#: ../extensions/statusbar-features.c:45 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Script" +#~ msgid "_Icon (name or file):" +#~ msgstr "_Icona (nome o file):" + From a65e8c9aba53212db92cf92286066e5fd7b5a67a Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 8 Mar 2009 00:48:40 +0100 Subject: [PATCH 0855/2970] Update Russian translation --- po/ru.po | 726 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 368 insertions(+), 358 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1a849f11..d06aeb4a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,14 +2,14 @@ # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Troitskiy Nikita 2008 -# Anton Shestakov 2008 +# Anton Shestakov 2008-2009 # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.1\n" +"Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-28 12:50+0800\n" -"PO-Revision-Date: 2009-02-28 13:16+0800\n" +"POT-Creation-Date: 2009-03-07 14:12+0800\n" +"PO-Revision-Date: 2009-03-07 14:31+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1599 -#: ../midori/main.c:1705 -#: ../midori/main.c:1714 -#: ../midori/main.c:1725 -#: ../midori/midori-websettings.c:265 +#: ../midori/main.c:1612 +#: ../midori/main.c:1715 +#: ../midori/main.c:1724 +#: ../midori/main.c:1735 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -33,708 +33,708 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:106 +#: ../midori/main.c:107 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:162 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:168 -#: ../midori/main.c:238 +#: ../midori/main.c:169 +#: ../midori/main.c:239 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:480 +#: ../midori/main.c:481 msgid "File not found." msgstr "Файл не найден." -#: ../midori/main.c:488 -#: ../midori/main.c:497 +#: ../midori/main.c:489 +#: ../midori/main.c:498 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/main.c:519 +#: ../midori/main.c:520 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:552 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:606 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:630 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:652 -#: ../midori/main.c:686 -#: ../midori/main.c:702 +#: ../midori/main.c:653 +#: ../midori/main.c:687 +#: ../midori/main.c:703 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:883 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:911 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:939 +#: ../midori/main.c:940 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:1069 +#: ../midori/main.c:1070 #: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/main.c:1090 -#: ../midori/main.c:1117 -#: ../midori/main.c:1145 +#: ../midori/main.c:1091 +#: ../midori/main.c:1118 +#: ../midori/main.c:1146 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 -#: ../midori/main.c:1193 +#: ../midori/main.c:1170 +#: ../midori/main.c:1194 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:1224 -#: ../midori/midori-preferences.c:404 +#: ../midori/main.c:1225 +#: ../midori/midori-preferences.c:433 msgid "Transfers" msgstr "Передачи" -#: ../midori/main.c:1265 +#: ../midori/main.c:1266 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1401 +#: ../midori/main.c:1409 msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1416 +#: ../midori/main.c:1424 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1420 +#: ../midori/main.c:1428 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1425 +#: ../midori/main.c:1433 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1599 +#: ../midori/main.c:1612 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1631 -#: ../midori/gjs.c:514 +#: ../midori/main.c:1639 +#: ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1654 +#: ../midori/main.c:1662 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1656 +#: ../midori/main.c:1664 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1658 +#: ../midori/main.c:1666 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1702 +#: ../midori/main.c:1712 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1726 +#: ../midori/main.c:1736 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1728 +#: ../midori/main.c:1738 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1755 +#: ../midori/main.c:1765 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1823 +#: ../midori/main.c:1835 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:1847 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1850 +#: ../midori/main.c:1862 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1863 +#: ../midori/main.c:1875 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1876 +#: ../midori/main.c:1888 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1888 +#: ../midori/main.c:1900 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1904 +#: ../midori/main.c:1916 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-browser.c:263 -#: ../midori/midori-browser.c:2995 -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:277 +#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:275 -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:288 +#: ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:362 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:538 +#: ../midori/midori-browser.c:552 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:538 +#: ../midori/midori-browser.c:552 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:540 +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:540 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:570 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:583 +#: ../midori/midori-browser.c:597 #: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:602 +#: ../midori/midori-browser.c:616 #: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:621 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:626 -#: ../midori/midori-browser.c:667 +#: ../midori/midori-browser.c:640 +#: ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:744 +#: ../midori/midori-browser.c:761 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1351 +#: ../midori/midori-browser.c:1372 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2591 +#: ../midori/midori-browser.c:2634 #: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:2598 +#: ../midori/midori-browser.c:2641 #: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2601 +#: ../midori/midori-browser.c:2644 #: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2744 +#: ../midori/midori-browser.c:2794 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:2752 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:2929 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:2932 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:2935 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:2938 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2941 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:2943 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:2944 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:2946 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:2947 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:2950 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:2953 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:2955 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:2958 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:2961 -#: ../midori/midori-browser.c:2964 +#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:2967 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:2970 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:2973 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:2976 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:2978 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:2979 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:2981 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:2982 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:2985 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "_Быстрый Поиск" -#: ../midori/midori-browser.c:2986 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:2991 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3071 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3073 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:3016 -#: ../midori/midori-websettings.c:192 +#: ../midori/midori-browser.c:3076 +#: ../midori/midori-websettings.c:194 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-browser.c:3019 -#: ../midori/midori-websettings.c:193 +#: ../midori/midori-browser.c:3079 +#: ../midori/midori-websettings.c:195 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-browser.c:3022 -#: ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3082 +#: ../midori/midori-websettings.c:196 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:3025 -#: ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3085 +#: ../midori/midori-websettings.c:197 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:3028 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3088 +#: ../midori/midori-websettings.c:198 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:3031 -#: ../midori/midori-websettings.c:197 -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-browser.c:3091 +#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-browser.c:3034 -#: ../midori/midori-view.c:1076 +#: ../midori/midori-browser.c:3094 +#: ../midori/midori-view.c:1073 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3037 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3058 -#: ../midori/midori-view.c:1048 +#: ../midori/midori-browser.c:3118 +#: ../midori/midori-view.c:1045 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3063 +#: ../midori/midori-browser.c:3123 #: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:3126 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3074 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3077 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3080 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3142 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3083 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3145 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "Кон)фиденциальный режим" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3542 +#: ../midori/midori-browser.c:3602 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3551 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3575 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3577 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3596 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3684 #: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:3626 +#: ../midori/midori-browser.c:3686 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3639 +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3641 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3804 +#: ../midori/midori-browser.c:3864 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:3829 +#: ../midori/midori-browser.c:3889 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:3834 +#: ../midori/midori-browser.c:3894 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:3839 +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:3857 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4141 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" #: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:481 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" #: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:480 +#: ../midori/midori-websettings.c:482 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" @@ -743,640 +743,652 @@ msgstr "Расположить боковую панель справа" msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:175 -#: ../midori/midori-view.c:1811 +#: ../midori/midori-websettings.c:177 +#: ../midori/midori-view.c:1819 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:176 -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:178 +#: ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:177 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:212 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:213 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "Все куки" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "Куки сессии" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 #: ../panels/midori-addons.c:96 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:268 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:269 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:309 +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:327 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:328 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:364 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:382 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:418 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "Показать вкладку статуса" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:490 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который будут сохраняться файлы" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:560 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:580 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "Открывать новую страницу в" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:618 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:696 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "Искать текст на странице по мере его набора" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "Разрешить куки" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "Тип принимаемых куки" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "Только оригинальные куки" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" msgstr "Принимать куки только с оригинального веб-сайта" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "Максимальный возраст куки" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения куки" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:795 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:796 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:815 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:816 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:836 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации браузера" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:857 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:858 msgid "The application identification string" msgstr "Строка идентификатора приложения" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:629 +#: ../midori/midori-view.c:626 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:956 msgid "Open _Link" msgstr "_Открыть ссылку" -#: ../midori/midori-view.c:961 +#: ../midori/midori-view.c:958 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:975 msgid "Open Link in New _Window" msgstr "Открыть ссылку в новом _окне" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:985 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:996 +#: ../midori/midori-view.c:993 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:1015 msgid "_Search the Web" -msgstr "_Поиск в сети" +msgstr "_Найти в сети" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:1024 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:1503 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1654 +#: ../midori/midori-view.c:1662 msgid "Source" msgstr "Исходный код" -#: ../midori/midori-view.c:1678 +#: ../midori/midori-view.c:1686 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1694 +#: ../midori/midori-view.c:1702 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:94 #, c-format msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:408 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:409 msgid "Startup" msgstr "Запуск" +#: ../midori/midori-preferences.c:425 +msgid "Use current page as homepage" +msgstr "Установить текущую страницу в качестве домашней" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:469 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:470 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:472 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:478 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:481 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:484 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:491 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:494 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:501 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:502 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:505 #: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:506 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:509 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:510 msgid "Automatically shrink standalone images to fit" msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:513 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:514 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:517 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:518 msgid "Whether text areas are resizable" msgstr "Текстовые поля могут изменять размер" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:521 #: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:522 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:525 #: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Использовать модули" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:526 msgid "Enable embedded plugin objects" msgstr "Разрешить встроенные объекты модулей на страницах" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:529 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:530 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:533 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:534 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" #. Page "Interface" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:546 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:547 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:556 msgid "Browsing" msgstr "Навигация" -#: ../midori/midori-preferences.c:562 -#: ../midori/midori-preferences.c:563 +#: ../midori/midori-preferences.c:595 +#: ../midori/midori-preferences.c:596 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:623 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:597 +#: ../midori/midori-preferences.c:632 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:641 msgid "Web Cookies" msgstr "Разрешить куки" -#: ../midori/midori-preferences.c:617 -#: ../midori/midori-preferences.c:629 +#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:668 msgid "days" msgstr "дней" -#: ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:661 #: ../panels/midori-history.c:104 msgid "History" msgstr "Журнал" @@ -1406,7 +1418,7 @@ msgstr "_Значок:" msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1074 +#: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" msgstr "Управление поисковыми сервисами" @@ -1468,18 +1480,18 @@ msgstr "Закрытые _вкладки и окна" msgid "New _Window" msgstr "_Новое окно" -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 +#: ../midori/gjs.c:743 +#: ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s не обладает свойством «%s»" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s не может быть назначен для %s.%s" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s недоступен" @@ -1666,8 +1678,6 @@ msgstr "Сценарии" #~ msgstr "Управление средствами поиска" #~ msgid "Open in Page_holder..." #~ msgstr "Открыть в _контейнере..." -#~ msgid "Open the current page in the pageholder" -#~ msgstr "Открыть страницу в контейнере" #, fuzzy #~ msgid "Last pageholder URI" From 0b4dee48899c357e095bccbd198d4dd7e0297687 Mon Sep 17 00:00:00 2001 From: Wei-Lun Chao Date: Sun, 8 Mar 2009 02:18:32 +0100 Subject: [PATCH 0856/2970] Add Traditional Chinese translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/zh_TW.po | 1579 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1581 insertions(+), 1 deletion(-) create mode 100644 po/zh_TW.po diff --git a/AUTHORS b/AUTHORS index 5ad71dde..c358a563 100644 --- a/AUTHORS +++ b/AUTHORS @@ -53,6 +53,7 @@ Translations: sv: Mikael Magnusson tr: Mirat Can Bayrak uk: Dmitry Nikitin + zh_TW: Wei-Lun Chao Code from other projects: GTK+/ GdkPixbuf, Matthias Clasen diff --git a/po/LINGUAS b/po/LINGUAS index 2f2ab314..801c9169 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da de el en_GB es et fi fr gl hu id it ja nl pl pt_PT ru sv tr uk +da de el en_GB es et fi fr gl hu id it ja nl pl pt_PT ru sv tr uk zh_TW diff --git a/po/zh_TW.po b/po/zh_TW.po new file mode 100644 index 00000000..b03d9465 --- /dev/null +++ b/po/zh_TW.po @@ -0,0 +1,1579 @@ +# Traditional Chinese Messages for midori package. +# Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Wei-Lun Chao , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-22 19:30+0100\n" +"PO-Revision-Date: 2009-03-06 15:33+0800\n" +"Last-Translator: Wei-Lun Chao \n" +"Language-Team: Chinese (traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Midori 輕量網頁瀏覽器" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1599 ../midori/main.c:1705 +#: ../midori/main.c:1714 ../midori/main.c:1725 +#: ../midori/midori-websettings.c:265 +msgid "Midori" +msgstr "綠網頁瀏覽器" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "網頁瀏覽器" + +#: ../midori/main.c:106 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "無法載入組態：%s\n" + +#: ../midori/main.c:161 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "「%s」值對於 %s 無效" + +#: ../midori/main.c:168 ../midori/main.c:238 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "無效的組態值「%s」" + +#: ../midori/main.c:480 +msgid "File not found." +msgstr "找不到檔案。" + +#: ../midori/main.c:488 ../midori/main.c:497 +msgid "Malformed document." +msgstr "異常文件。" + +#: ../midori/main.c:519 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "開啟資料庫時失敗：%s\n" + +#: ../midori/main.c:551 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "執行資料庫敘述時失敗：%s\n" + +#: ../midori/main.c:605 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "移除歷史項目時失敗：%s\n" + +#: ../midori/main.c:629 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "清空歷史時失敗：%s\n" + +#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "加入歷史項目時失敗：%s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:882 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "移除舊的歷史項目時失敗：%s\n" + +#: ../midori/main.c:910 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "無法儲存組態。%s" + +#: ../midori/main.c:939 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "無法儲存搜尋引擎。%s" + +#: ../midori/main.c:1069 ../midori/sokoke.c:580 +#, c-format +msgid "Writing failed." +msgstr "寫入失敗。" + +#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "無法儲存書籤。%s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1169 ../midori/main.c:1193 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "無法儲存回收筒。%s" + +#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 +msgid "Transfers" +msgstr "傳送" + +#: ../midori/main.c:1265 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "無法儲存執行階段。%s" + +#: ../midori/main.c:1401 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori 似乎於上次開啟時發生當機。如果這種情況重複出現，請試著以下列選項之一來" +"解決問題。" + +#: ../midori/main.c:1416 +msgid "Modify _preferences" +msgstr "修改偏好設定(_P)" + +#: ../midori/main.c:1420 +msgid "Reset the last _session" +msgstr "重置上次執行階段(_S)" + +#: ../midori/main.c:1425 +msgid "Disable all _extensions" +msgstr "停用所有擴充功能(_E)" + +#: ../midori/main.c:1599 +msgid "No filename specified" +msgstr "未指定任何檔名" + +#: ../midori/main.c:1631 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "發生不明錯誤。" + +#: ../midori/main.c:1654 +msgid "Run the specified filename as javascript" +msgstr "將指定檔名當做 javascript 來執行" + +#: ../midori/main.c:1656 +msgid "Display program version" +msgstr "顯示程式版本" + +#: ../midori/main.c:1658 +msgid "Addresses" +msgstr "位址" + +#: ../midori/main.c:1702 +msgid "[Addresses]" +msgstr "[位址]" + +#: ../midori/main.c:1726 +msgid "Please report comments, suggestions and bugs to:" +msgstr "請回報意見、建議和錯誤給：" + +#: ../midori/main.c:1728 +msgid "Check for new versions at:" +msgstr "檢查看看新版本於：" + +#: ../midori/main.c:1755 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "一份 Midori 已經在執行中卻無反應。\n" + +#: ../midori/main.c:1823 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "無法載入搜尋引擎。%s\n" + +#: ../midori/main.c:1835 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "無法載入書籤：%s\n" + +#: ../midori/main.c:1850 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "無法載入執行階段：%s\n" + +#: ../midori/main.c:1863 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "無法載入回收筒：%s\n" + +#: ../midori/main.c:1876 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "無法載入歷史：%s\n" + +#: ../midori/main.c:1888 +msgid "The following errors occured:" +msgstr "發生下列錯誤：" + +#: ../midori/main.c:1904 +msgid "_Ignore" +msgstr "忽略(_I)" + +#: ../midori/midori-browser.c:259 ../midori/midori-browser.c:2925 +#: ../midori/midori-browser.c:2931 +msgid "Reload the current page" +msgstr "重新載入目前頁面" + +#: ../midori/midori-browser.c:271 ../midori/midori-browser.c:2928 +msgid "Stop loading the current page" +msgstr "停止載入目前頁面" + +#: ../midori/midori-browser.c:333 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% 已載入" + +#: ../midori/midori-browser.c:358 +#, c-format +msgid "Unexpected action '%s'." +msgstr "未預期的動作「%s」。" + +#: ../midori/midori-browser.c:534 +msgid "New folder" +msgstr "新資料夾" + +#: ../midori/midori-browser.c:534 +msgid "Edit folder" +msgstr "編輯資料夾" + +#: ../midori/midori-browser.c:536 +msgid "New bookmark" +msgstr "新書籤" + +#: ../midori/midori-browser.c:536 +msgid "Edit bookmark" +msgstr "編輯書籤" + +#: ../midori/midori-browser.c:566 +msgid "_Title:" +msgstr "標題(_T)：" + +#: ../midori/midori-browser.c:579 ../midori/midori-searchaction.c:855 +msgid "_Description:" +msgstr "描述(_D)：" + +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:869 +msgid "_Address:" +msgstr "位址(_A)：" + +#: ../midori/midori-browser.c:616 +msgid "_Folder:" +msgstr "資料夾(_F)：" + +#: ../midori/midori-browser.c:621 ../midori/midori-browser.c:658 +msgid "Toplevel folder" +msgstr "最上層資料夾" + +#: ../midori/midori-browser.c:733 +msgid "Save file as" +msgstr "檔案另存為" + +#: ../midori/midori-browser.c:1340 +msgid "Open file" +msgstr "開啟檔案" + +#: ../midori/midori-browser.c:2530 ../panels/midori-bookmarks.c:754 +#: ../panels/midori-history.c:788 +msgid "Open in New _Tab" +msgstr "在新分頁中開啟(_T)" + +#: ../midori/midori-browser.c:2532 ../panels/midori-bookmarks.c:756 +#: ../panels/midori-history.c:790 +msgid "Open in New _Window" +msgstr "在新視窗中開啟(_W)" + +#: ../midori/midori-browser.c:2674 +msgid "A lightweight web browser." +msgstr "輕量網頁瀏覽器。" + +#: ../midori/midori-browser.c:2682 +msgid "translator-credits" +msgstr "趙惟倫 " + +#: ../midori/midori-browser.c:2859 +msgid "_File" +msgstr "檔案(_F)" + +#: ../midori/midori-browser.c:2862 +msgid "Open a new window" +msgstr "開啟新視窗" + +#: ../midori/midori-browser.c:2865 +msgid "Open a new tab" +msgstr "開啟新分頁" + +#: ../midori/midori-browser.c:2868 +msgid "Open a file" +msgstr "開啟檔案" + +#: ../midori/midori-browser.c:2871 +msgid "Save to a file" +msgstr "儲存到檔案" + +#: ../midori/midori-browser.c:2873 +msgid "_Close Tab" +msgstr "關閉分頁(_C)" + +#: ../midori/midori-browser.c:2874 +msgid "Close the current tab" +msgstr "關閉目前分頁" + +#: ../midori/midori-browser.c:2876 +msgid "C_lose Window" +msgstr "關閉視窗(_L)" + +#: ../midori/midori-browser.c:2877 +msgid "Close this window" +msgstr "關閉這個視窗" + +#: ../midori/midori-browser.c:2880 +msgid "Print the current page" +msgstr "列印目前頁面" + +#: ../midori/midori-browser.c:2883 +msgid "Quit the application" +msgstr "退出應用程式" + +#: ../midori/midori-browser.c:2885 +msgid "_Edit" +msgstr "編輯(_E)" + +#: ../midori/midori-browser.c:2888 +msgid "Cut the selected text" +msgstr "剪下所選文字" + +#: ../midori/midori-browser.c:2891 ../midori/midori-browser.c:2894 +msgid "Copy the selected text" +msgstr "複製所選文字" + +#: ../midori/midori-browser.c:2897 +msgid "Paste text from the clipboard" +msgstr "從剪貼簿貼上文字" + +#: ../midori/midori-browser.c:2900 +msgid "Delete the selected text" +msgstr "刪除所選文字" + +#: ../midori/midori-browser.c:2903 +msgid "Select all text" +msgstr "選取所有文字" + +#: ../midori/midori-browser.c:2906 +msgid "Find a word or phrase in the page" +msgstr "在頁面中尋找字詞或片語" + +#: ../midori/midori-browser.c:2908 +msgid "Find _Next" +msgstr "找下一個(_N)" + +#: ../midori/midori-browser.c:2909 +msgid "Find the next occurrence of a word or phrase" +msgstr "尋找下一個出現的字詞或片語" + +#: ../midori/midori-browser.c:2911 +msgid "Find _Previous" +msgstr "找上一個(_P)" + +#: ../midori/midori-browser.c:2912 +msgid "Find the previous occurrence of a word or phrase" +msgstr "尋找上一個出現的字詞或片語" + +#: ../midori/midori-browser.c:2915 +msgid "_Quick Find" +msgstr "快速尋找(_Q)" + +#: ../midori/midori-browser.c:2916 +msgid "Quickly jump to a word or phrase" +msgstr "快速跳到字詞或片語" + +#: ../midori/midori-browser.c:2919 +msgid "Configure the application preferences" +msgstr "組配應用程式偏好設定" + +#: ../midori/midori-browser.c:2921 +msgid "_View" +msgstr "檢視(_V)" + +#: ../midori/midori-browser.c:2922 +msgid "_Toolbars" +msgstr "工具列(_T)" + +#: ../midori/midori-browser.c:2934 +msgid "Increase the zoom level" +msgstr "增加縮放等級" + +#: ../midori/midori-browser.c:2937 +msgid "Decrease the zoom level" +msgstr "減少縮放等級" + +#: ../midori/midori-browser.c:2940 +msgid "Reset the zoom level" +msgstr "重置縮放等級" + +#: ../midori/midori-browser.c:2942 ../midori/midori-view.c:1076 +msgid "View _Source" +msgstr "檢視原始碼(_S)" + +#: ../midori/midori-browser.c:2943 +msgid "View the source code of the page" +msgstr "檢視頁面的原始碼" + +#: ../midori/midori-browser.c:2945 +msgid "View Selection Source" +msgstr "檢視所選原始碼" + +#: ../midori/midori-browser.c:2946 +msgid "View the source code of the selection" +msgstr "檢視所選部份的原始碼" + +#: ../midori/midori-browser.c:2950 +msgid "Toggle fullscreen view" +msgstr "切換全螢幕檢視" + +#: ../midori/midori-browser.c:2952 +msgid "_Go" +msgstr "前往(_G)" + +#: ../midori/midori-browser.c:2955 +msgid "Go back to the previous page" +msgstr "回到上一頁" + +#: ../midori/midori-browser.c:2958 +msgid "Go forward to the next page" +msgstr "前往下一頁" + +#: ../midori/midori-browser.c:2961 +msgid "Go to your homepage" +msgstr "前往您的首頁" + +#: ../midori/midori-browser.c:2963 +msgid "Empty Trash" +msgstr "清空回收筒" + +#: ../midori/midori-browser.c:2964 +msgid "Delete the contents of the trash" +msgstr "刪除回收筒的內容" + +#: ../midori/midori-browser.c:2966 ../midori/midori-view.c:1048 +msgid "Undo Close Tab" +msgstr "復原關閉分頁" + +#: ../midori/midori-browser.c:2967 +msgid "Open the last closed tab" +msgstr "開啟上次關閉的分頁" + +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:228 +msgid "Add a new bookmark" +msgstr "加入新的書籤" + +#: ../midori/midori-browser.c:2972 +msgid "_Tools" +msgstr "工具(_T)" + +#: ../midori/midori-browser.c:2974 ../midori/midori-searchaction.c:464 +msgid "_Manage Search Engines" +msgstr "管理搜尋引擎(_M)" + +#: ../midori/midori-browser.c:2975 +msgid "Add, edit and remove search engines..." +msgstr "加入、編輯和移除搜尋引擎…" + +#: ../midori/midori-browser.c:2979 +msgid "_Previous Tab" +msgstr "上一個分頁(_P)" + +#: ../midori/midori-browser.c:2980 +msgid "Switch to the previous tab" +msgstr "切換至上一個分頁" + +#: ../midori/midori-browser.c:2982 +msgid "_Next Tab" +msgstr "下一個分頁(_N)" + +#: ../midori/midori-browser.c:2983 +msgid "Switch to the next tab" +msgstr "切換至下一個分頁" + +#: ../midori/midori-browser.c:2985 +msgid "_Help" +msgstr "求助(_H)" + +#: ../midori/midori-browser.c:2987 +msgid "_Contents" +msgstr "內容(_C)" + +#: ../midori/midori-browser.c:2988 +msgid "Show the documentation" +msgstr "顯示文件" + +#: ../midori/midori-browser.c:2990 +msgid "_Frequent Questions" +msgstr "常見問題(_F)" + +#: ../midori/midori-browser.c:2991 +msgid "Show the Frequently Asked Questions" +msgstr "顯示常見問題集" + +#: ../midori/midori-browser.c:2993 +msgid "_Report a Bug" +msgstr "回報錯誤(_R)" + +#: ../midori/midori-browser.c:2994 +msgid "Open Midori's bug tracker" +msgstr "開啟 Midori 錯誤追蹤器" + +#: ../midori/midori-browser.c:2997 +msgid "Show information about the program" +msgstr "顯示程式相關資訊" + +#: ../midori/midori-browser.c:3004 +msgid "P_rivate Browsing" +msgstr "私人瀏覽(_R)" + +#: ../midori/midori-browser.c:3005 +msgid "Don't save any private data while browsing" +msgstr "瀏覽時不儲存任何私人資料" + +#: ../midori/midori-browser.c:3010 +msgid "_Menubar" +msgstr "選單列(_M)" + +#: ../midori/midori-browser.c:3011 +msgid "Show menubar" +msgstr "顯示選單列" + +#: ../midori/midori-browser.c:3014 +msgid "_Navigationbar" +msgstr "導覽列(_N)" + +#: ../midori/midori-browser.c:3015 +msgid "Show navigationbar" +msgstr "顯示導覽列" + +#: ../midori/midori-browser.c:3018 +msgid "Side_panel" +msgstr "側邊欄(_P)" + +#: ../midori/midori-browser.c:3019 +msgid "Show sidepanel" +msgstr "顯示側邊欄" + +#: ../midori/midori-browser.c:3022 +msgid "_Bookmarkbar" +msgstr "書籤列(_B)" + +#: ../midori/midori-browser.c:3023 +msgid "Show bookmarkbar" +msgstr "顯示書籤列" + +#: ../midori/midori-browser.c:3026 +msgid "_Transferbar" +msgstr "傳送列(_T)" + +#: ../midori/midori-browser.c:3027 +msgid "Show transferbar" +msgstr "顯示傳送列" + +#: ../midori/midori-browser.c:3030 +msgid "_Statusbar" +msgstr "狀態列(_S)" + +#: ../midori/midori-browser.c:3031 +msgid "Show statusbar" +msgstr "顯示狀態列" + +#: ../midori/midori-browser.c:3436 +msgid "_Separator" +msgstr "分隔符號(_S)" + +#: ../midori/midori-browser.c:3443 +msgid "_Location..." +msgstr "位置(_L)…" + +#: ../midori/midori-browser.c:3445 +msgid "Open a particular location" +msgstr "開啟特定位置" + +#: ../midori/midori-browser.c:3469 +msgid "_Web Search..." +msgstr "網頁搜尋(_W)…" + +#: ../midori/midori-browser.c:3471 +msgid "Run a web search" +msgstr "執行網頁搜尋" + +#: ../midori/midori-browser.c:3490 +msgid "Reopen a previously closed tab or window" +msgstr "重新開啟之前關閉的分頁或視窗" + +#: ../midori/midori-browser.c:3503 +msgid "_Recently visited pages" +msgstr "最近造訪的頁面(_R)" + +#: ../midori/midori-browser.c:3505 +msgid "Reopen pages that you visited earlier" +msgstr "重新開啟您之前造訪過的頁面" + +#: ../midori/midori-browser.c:3518 ../midori/sokoke.c:735 +msgid "_Bookmarks" +msgstr "書籤(_B)" + +#: ../midori/midori-browser.c:3520 +msgid "Show the saved bookmarks" +msgstr "顯示已儲存書籤" + +#: ../midori/midori-browser.c:3533 +msgid "_Window" +msgstr "視窗(_W)" + +#: ../midori/midori-browser.c:3535 +msgid "Show a list of all open tabs" +msgstr "顯示所有開啟分頁的清單" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3697 +msgid "_Inline Find:" +msgstr "列內尋找(_I)：" + +#: ../midori/midori-browser.c:3722 +msgid "Previous" +msgstr "上一個" + +#: ../midori/midori-browser.c:3727 +msgid "Next" +msgstr "下一個" + +#: ../midori/midori-browser.c:3732 +msgid "Match Case" +msgstr "符合大小寫" + +#: ../midori/midori-browser.c:3740 +msgid "Highlight Matches" +msgstr "標識相符者" + +#: ../midori/midori-browser.c:3750 +msgid "Close Findbar" +msgstr "關閉尋找列" + +#: ../midori/midori-browser.c:4034 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "未預期的設定「%s」" + +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:479 +msgid "Align sidepanel on the right" +msgstr "側邊欄靠右對齊" + +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:480 +msgid "Whether to align the sidepanel on the right" +msgstr "是否要將側邊欄靠右對齊" + +#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +msgid "Close panel" +msgstr "關閉側邊欄" + +#: ../midori/midori-websettings.c:175 ../midori/midori-view.c:1811 +msgid "Blank page" +msgstr "空白頁面" + +#: ../midori/midori-websettings.c:176 ../midori/midori-websettings.c:499 +msgid "Homepage" +msgstr "首頁" + +#: ../midori/midori-websettings.c:177 +msgid "Last open pages" +msgstr "上次開啟頁面" + +#: ../midori/midori-websettings.c:192 +msgid "Chinese (BIG5)" +msgstr "中文 (BIG5)" + +#: ../midori/midori-websettings.c:193 +msgid "Japanese (SHIFT_JIS)" +msgstr "日文 (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:194 +msgid "Russian (KOI8-R)" +msgstr "俄文 (KOI8-R)" + +#: ../midori/midori-websettings.c:195 +msgid "Unicode (UTF-8)" +msgstr "萬國碼 (UTF-8)" + +#: ../midori/midori-websettings.c:196 +msgid "Western (ISO-8859-1)" +msgstr "西歐 (ISO-8859-1)" + +#: ../midori/midori-websettings.c:197 ../midori/midori-websettings.c:269 +msgid "Custom..." +msgstr "自訂…" + +#: ../midori/midori-websettings.c:212 +msgid "New tab" +msgstr "新分頁" + +#: ../midori/midori-websettings.c:213 +msgid "New window" +msgstr "新視窗" + +#: ../midori/midori-websettings.c:214 +msgid "Current tab" +msgstr "目前分頁" + +#: ../midori/midori-websettings.c:229 +msgid "Default" +msgstr "預設" + +#: ../midori/midori-websettings.c:230 +msgid "Icons" +msgstr "圖示" + +#: ../midori/midori-websettings.c:231 +msgid "Text" +msgstr "文字" + +#: ../midori/midori-websettings.c:232 +msgid "Both" +msgstr "兩者" + +#: ../midori/midori-websettings.c:233 +msgid "Both horizontal" +msgstr "水平並列" + +#: ../midori/midori-websettings.c:248 +msgid "All cookies" +msgstr "所有訊餅" + +#: ../midori/midori-websettings.c:249 +msgid "Session cookies" +msgstr "執行階段訊餅" + +#: ../midori/midori-websettings.c:250 ../panels/midori-addons.c:96 +msgid "None" +msgstr "無" + +#: ../midori/midori-websettings.c:266 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:267 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:268 +msgid "Internet Explorer" +msgstr "網路探險家" + +#: ../midori/midori-websettings.c:309 +msgid "Remember last window size" +msgstr "記住上次視窗大小" + +#: ../midori/midori-websettings.c:310 +msgid "Whether to save the last window size" +msgstr "是否要儲存上次視窗大小" + +#: ../midori/midori-websettings.c:318 +msgid "Last window width" +msgstr "上次視窗寬度" + +#: ../midori/midori-websettings.c:319 +msgid "The last saved window width" +msgstr "上次儲存的視窗寬度" + +#: ../midori/midori-websettings.c:327 +msgid "Last window height" +msgstr "上次視窗高度" + +#: ../midori/midori-websettings.c:328 +msgid "The last saved window height" +msgstr "上次儲存的視窗高度" + +#: ../midori/midori-websettings.c:353 +msgid "Last panel position" +msgstr "上次側邊欄位置" + +#: ../midori/midori-websettings.c:354 +msgid "The last saved panel position" +msgstr "上次儲存的側邊欄位置" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:363 +msgid "Last panel page" +msgstr "上次側邊欄頁面" + +#: ../midori/midori-websettings.c:364 +msgid "The last saved panel page" +msgstr "上次儲存的側邊欄頁面" + +#: ../midori/midori-websettings.c:372 +msgid "Last Web search" +msgstr "上次網頁搜尋" + +#: ../midori/midori-websettings.c:373 +msgid "The last saved Web search" +msgstr "上次儲存的網頁搜尋" + +#: ../midori/midori-websettings.c:382 +msgid "Show Menubar" +msgstr "顯示選單列" + +#: ../midori/midori-websettings.c:383 +msgid "Whether to show the menubar" +msgstr "是否要顯示選單列" + +#: ../midori/midori-websettings.c:391 +msgid "Show Navigationbar" +msgstr "顯示導覽列" + +#: ../midori/midori-websettings.c:392 +msgid "Whether to show the navigationbar" +msgstr "是否要顯示導覽列" + +#: ../midori/midori-websettings.c:400 +msgid "Show Bookmarkbar" +msgstr "顯示書籤列" + +#: ../midori/midori-websettings.c:401 +msgid "Whether to show the bookmarkbar" +msgstr "是否要顯示書籤列" + +#: ../midori/midori-websettings.c:409 +msgid "Show Panel" +msgstr "顯示側邊欄" + +#: ../midori/midori-websettings.c:410 +msgid "Whether to show the panel" +msgstr "是否要顯示側邊欄" + +#: ../midori/midori-websettings.c:418 +msgid "Show Statusbar" +msgstr "顯示狀態列" + +#: ../midori/midori-websettings.c:419 +msgid "Whether to show the statusbar" +msgstr "是否要顯示狀態列" + +#: ../midori/midori-websettings.c:428 +msgid "Toolbar Style" +msgstr "工具列樣式" + +#: ../midori/midori-websettings.c:429 +msgid "The style of the toolbar" +msgstr "工具列的樣式" + +#: ../midori/midori-websettings.c:445 +msgid "Show progress in location entry" +msgstr "在位置欄中顯示進度" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show loading progress in the location entry" +msgstr "是否要在位置欄中顯示載入進度" + +#: ../midori/midori-websettings.c:454 +msgid "Toolbar Items" +msgstr "工具列項目" + +#: ../midori/midori-websettings.c:455 +msgid "The items to show on the toolbar" +msgstr "顯示在工具列上的項目" + +#: ../midori/midori-websettings.c:463 +msgid "Compact Sidepanel" +msgstr "壓縮側邊欄" + +#: ../midori/midori-websettings.c:464 +msgid "Whether to make the sidepanel compact" +msgstr "是否要壓縮側邊欄" + +#: ../midori/midori-websettings.c:489 +msgid "Load on Startup" +msgstr "啟動時載入" + +#: ../midori/midori-websettings.c:490 +msgid "What to load on startup" +msgstr "啟動時要載入什麼" + +#: ../midori/midori-websettings.c:500 +msgid "The homepage" +msgstr "首頁" + +#: ../midori/midori-websettings.c:515 +msgid "Show crash dialog" +msgstr "顯示當機對話框" + +#: ../midori/midori-websettings.c:516 +msgid "Show a dialog after Midori crashed" +msgstr "Midori 當機之後顯示對話框" + +#: ../midori/midori-websettings.c:524 +msgid "Download Folder" +msgstr "下載資料夾" + +#: ../midori/midori-websettings.c:525 +msgid "The folder downloaded files are saved to" +msgstr "儲存下載檔案的資料夾" + +#: ../midori/midori-websettings.c:533 +msgid "Download Manager" +msgstr "下載管理員" + +#: ../midori/midori-websettings.c:534 +msgid "An external download manager" +msgstr "外部下載管理員" + +#: ../midori/midori-websettings.c:542 +msgid "Text Editor" +msgstr "文字編輯器" + +#: ../midori/midori-websettings.c:543 +msgid "An external text editor" +msgstr "外部文字編輯器" + +#: ../midori/midori-websettings.c:551 +msgid "Location entry Search" +msgstr "位置欄搜尋" + +#: ../midori/midori-websettings.c:552 +msgid "The search to perform inside the location entry" +msgstr "於位置欄之內進行的搜尋" + +#: ../midori/midori-websettings.c:560 +msgid "Preferred Encoding" +msgstr "偏好的編碼" + +#: ../midori/midori-websettings.c:561 +msgid "The preferred character encoding" +msgstr "偏好的字元編碼" + +#: ../midori/midori-websettings.c:571 +msgid "Always Show Tabbar" +msgstr "固定顯示頁標列" + +#: ../midori/midori-websettings.c:572 +msgid "Always show the tabbar" +msgstr "固定顯示分頁頁標列" + +#: ../midori/midori-websettings.c:580 +msgid "Close Buttons on Tabs" +msgstr "關閉按鈕位於頁標" + +#: ../midori/midori-websettings.c:581 +msgid "Whether tabs have close buttons" +msgstr "頁標上是否有關閉按鈕" + +#: ../midori/midori-websettings.c:590 +msgid "Open new pages in" +msgstr "開啟新頁面於" + +#: ../midori/midori-websettings.c:591 +msgid "Where to open new pages" +msgstr "何處開啟新頁面" + +#: ../midori/midori-websettings.c:601 +msgid "Open external pages in" +msgstr "開啟外部頁面於" + +#: ../midori/midori-websettings.c:602 +msgid "Where to open externally opened pages" +msgstr "何處開啟外部開啟的頁面" + +#: ../midori/midori-websettings.c:615 +msgid "Middle click opens Selection" +msgstr "按下滑鼠中鍵開啟所選" + +#: ../midori/midori-websettings.c:616 +msgid "Load an address from the selection via middle click" +msgstr "透過按下滑鼠中鍵以載入所選位址" + +#: ../midori/midori-websettings.c:624 +msgid "Open tabs in the background" +msgstr "在背景中開啟分頁" + +#: ../midori/midori-websettings.c:625 +msgid "Whether to open new tabs in the background" +msgstr "是否要在背景中開啟分頁" + +#: ../midori/midori-websettings.c:633 +msgid "Open Tabs next to Current" +msgstr "於目前之下開啟分頁" + +#: ../midori/midori-websettings.c:634 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "是否要開啟新分頁於目前分頁之下或最後一頁之後" + +#: ../midori/midori-websettings.c:642 +msgid "Open popups in tabs" +msgstr "在分頁中開啟對話框" + +#: ../midori/midori-websettings.c:643 +msgid "Whether to open popup windows in tabs" +msgstr "是否要在分頁中開啟彈出視窗" + +#: ../midori/midori-websettings.c:694 +msgid "Zoom Text and Images" +msgstr "縮放文字和圖像" + +#: ../midori/midori-websettings.c:695 +msgid "Whether to zoom text and images" +msgstr "是否要縮放文字和圖像" + +#: ../midori/midori-websettings.c:705 +msgid "Accept cookies" +msgstr "接受訊餅" + +#: ../midori/midori-websettings.c:706 +msgid "What type of cookies to accept" +msgstr "要接受什麼型態的訊餅" + +#: ../midori/midori-websettings.c:719 +msgid "Original cookies only" +msgstr "只限原本的訊餅" + +#: ../midori/midori-websettings.c:720 +msgid "Accept cookies from the original website only" +msgstr "只接受來自原始網站的訊餅" + +#: ../midori/midori-websettings.c:728 +msgid "Maximum cookie age" +msgstr "最大訊餅時限" + +#: ../midori/midori-websettings.c:729 +msgid "The maximum number of days to save cookies for" +msgstr "訊餅的最大儲存日數限制" + +#: ../midori/midori-websettings.c:739 +msgid "Remember last visited pages" +msgstr "記住上次造訪的頁面" + +#: ../midori/midori-websettings.c:740 +msgid "Whether the last visited pages are saved" +msgstr "是否要儲存上次造訪的頁面" + +#: ../midori/midori-websettings.c:748 +msgid "Maximum history age" +msgstr "最大造訪歷史時限" + +#: ../midori/midori-websettings.c:749 +msgid "The maximum number of days to save the history for" +msgstr "造訪歷史的最大儲存日數限制" + +#: ../midori/midori-websettings.c:757 +msgid "Remember last form inputs" +msgstr "記住上次表單輸入" + +#: ../midori/midori-websettings.c:758 +msgid "Whether the last form inputs are saved" +msgstr "是否要儲存上次表單輸入" + +#: ../midori/midori-websettings.c:766 +msgid "Remember last downloaded files" +msgstr "記住上次下載檔案" + +#: ../midori/midori-websettings.c:767 +msgid "Whether the last downloaded files are saved" +msgstr "是否要儲存上次下載的檔案" + +#: ../midori/midori-websettings.c:777 +msgid "Proxy Server" +msgstr "代理伺服器" + +#: ../midori/midori-websettings.c:778 +msgid "The proxy server used for HTTP connections" +msgstr "用於 HTTP 連接的代理伺服器" + +#: ../midori/midori-websettings.c:797 +msgid "Detect proxy server automatically" +msgstr "自動偵測代理伺服器" + +#: ../midori/midori-websettings.c:798 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "是否要自動從環境中偵測代理伺服器" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:818 +msgid "Identify as" +msgstr "識別為" + +#: ../midori/midori-websettings.c:819 +msgid "What to identify as to web pages" +msgstr "要讓網頁識別為什麼" + +#: ../midori/midori-websettings.c:839 +msgid "Identification string" +msgstr "識別字串" + +#: ../midori/midori-websettings.c:840 +msgid "The application identification string" +msgstr "應用程式識別字串" + +#: ../midori/midori-websettings.c:852 +msgid "Cache size" +msgstr "快取大小" + +#: ../midori/midori-websettings.c:853 +msgid "The allowed size of the cache" +msgstr "允許的快取大小" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:629 +#, c-format +msgid "Not found - %s" +msgstr "找不到 - %s" + +#: ../midori/midori-view.c:959 +msgid "Open _Link" +msgstr "開啟鏈結(_L)" + +#: ../midori/midori-view.c:961 +msgid "Open Link in New _Tab" +msgstr "在新分頁中開啟鏈結(_T)" + +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Window" +msgstr "在開新視窗中開啟鏈結(_W)" + +#: ../midori/midori-view.c:988 +msgid "_Save Link destination" +msgstr "儲存鏈結網址(_S)" + +#: ../midori/midori-view.c:996 +msgid "_Download Link destination" +msgstr "下載鏈結網址(_D)" + +#: ../midori/midori-view.c:1018 +msgid "_Search the Web" +msgstr "搜尋網頁(_S)" + +#: ../midori/midori-view.c:1027 +msgid "Open Address in New _Tab" +msgstr "在新分頁中開啟位址(_T)" + +#: ../midori/midori-view.c:1501 +#, c-format +msgid "Inspect page - %s" +msgstr "檢閱頁面 - %s" + +#: ../midori/midori-view.c:1654 +msgid "Source" +msgstr "原始碼" + +#: ../midori/midori-view.c:1678 +#, c-format +msgid "Document cannot be displayed" +msgstr "無法顯示文件" + +#: ../midori/midori-view.c:1694 +#, c-format +msgid "No documentation installed" +msgstr "沒有已安裝文件" + +#: ../midori/midori-preferences.c:93 +#, c-format +msgid "Preferences for %s" +msgstr "偏好設定用於 %s" + +#. Page "General" +#: ../midori/midori-preferences.c:390 +msgid "General" +msgstr "一般" + +#: ../midori/midori-preferences.c:391 +msgid "Startup" +msgstr "啟動" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:440 +msgid "Appearance" +msgstr "外觀" + +#: ../midori/midori-preferences.c:441 +msgid "Font settings" +msgstr "字型設定" + +#: ../midori/midori-preferences.c:443 +msgid "Default Font Family" +msgstr "預設字族" + +#: ../midori/midori-preferences.c:449 +msgid "The default font size used to display text" +msgstr "用來顯示文字的預設字型大小" + +#: ../midori/midori-preferences.c:452 +msgid "Minimum Font Size" +msgstr "最小字型尺寸" + +#: ../midori/midori-preferences.c:455 +msgid "The minimum font size used to display text" +msgstr "用來顯示文字的最小字型尺寸" + +#: ../midori/midori-preferences.c:462 +msgid "Encoding" +msgstr "編碼" + +#: ../midori/midori-preferences.c:465 +msgid "The character encoding to use by default" +msgstr "預設使用的字元編碼" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:472 +msgid "Behavior" +msgstr "行為" + +#: ../midori/midori-preferences.c:473 +msgid "Features" +msgstr "特徵" + +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:40 +msgid "Load images automatically" +msgstr "自動載入圖像" + +#: ../midori/midori-preferences.c:477 +msgid "Load and display images automatically" +msgstr "自動載入與顯示圖像" + +#: ../midori/midori-preferences.c:480 +msgid "Shrink images automatically" +msgstr "自動收縮圖像" + +#: ../midori/midori-preferences.c:481 +msgid "Automatically shrink standalone images to fit" +msgstr "自動收縮單獨圖像以符合頁面" + +#: ../midori/midori-preferences.c:484 +msgid "Print background images" +msgstr "列印背景圖像" + +#: ../midori/midori-preferences.c:485 +msgid "Whether background images should be printed" +msgstr "是否應該列印背景圖像" + +#: ../midori/midori-preferences.c:488 +msgid "Resizable text areas" +msgstr "可變更大小的文字區" + +#: ../midori/midori-preferences.c:489 +msgid "Whether text areas are resizable" +msgstr "是否文字區可變更大小" + +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:47 +msgid "Enable scripts" +msgstr "啟用命令稿" + +#: ../midori/midori-preferences.c:493 +msgid "Enable embedded scripting languages" +msgstr "啟用嵌入式命令稿語言" + +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:54 +msgid "Enable plugins" +msgstr "啟用外掛程式" + +#: ../midori/midori-preferences.c:497 +msgid "Enable embedded plugin objects" +msgstr "啟用嵌入式外掛程式物件" + +#: ../midori/midori-preferences.c:500 +msgid "Enforce 96 dots per inch" +msgstr "強制每英吋 96 點" + +#: ../midori/midori-preferences.c:501 +msgid "Enforce a video dot density of 96 DPI" +msgstr "強制畫面像點密度為 96 DPI" + +#: ../midori/midori-preferences.c:504 +msgid "Enable developer tools" +msgstr "啟用開發工具" + +#: ../midori/midori-preferences.c:505 +msgid "Enable special extensions for developers" +msgstr "啟用給開發者的特殊擴充功能" + +#. Page "Interface" +#: ../midori/midori-preferences.c:515 +msgid "Interface" +msgstr "介面" + +#: ../midori/midori-preferences.c:516 +msgid "Navigationbar" +msgstr "導覽列" + +#: ../midori/midori-preferences.c:525 +msgid "Browsing" +msgstr "瀏覽" + +#: ../midori/midori-preferences.c:562 ../midori/midori-preferences.c:563 +msgid "Network" +msgstr "網路" + +#: ../midori/midori-preferences.c:590 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:597 +msgid "Privacy" +msgstr "私密性" + +#: ../midori/midori-preferences.c:604 +msgid "Web Cookies" +msgstr "網頁訊餅" + +#: ../midori/midori-preferences.c:617 ../midori/midori-preferences.c:629 +msgid "days" +msgstr "天" + +#: ../midori/midori-preferences.c:622 ../panels/midori-history.c:104 +msgid "History" +msgstr "歷史" + +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +msgid "Empty" +msgstr "清空" + +#: ../midori/midori-searchaction.c:811 +msgid "Add search engine" +msgstr "加入搜尋引擎" + +#: ../midori/midori-searchaction.c:811 +msgid "Edit search engine" +msgstr "編輯搜尋引擎" + +#: ../midori/midori-searchaction.c:839 +msgid "_Name:" +msgstr "名稱(_N)：" + +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "圖示(_I)：" + +#: ../midori/midori-searchaction.c:897 +msgid "_Token:" +msgstr "符記(_T)：" + +#: ../midori/midori-searchaction.c:1074 +msgid "Manage Search Engines" +msgstr "管理搜尋引擎" + +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +msgid "Could not run external program." +msgstr "無法執行外部程式。" + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:403 +msgid "Warning: You are using a superuser account!" +msgstr "警告：您正在使用超級使用者帳號！" + +#: ../midori/sokoke.c:734 +msgid "_Bookmark" +msgstr "書籤(_B)" + +#: ../midori/sokoke.c:736 +msgid "_Add Bookmark" +msgstr "加入書籤(_A)" + +#: ../midori/sokoke.c:737 +msgid "_Console" +msgstr "主控臺(_C)" + +#: ../midori/sokoke.c:738 +msgid "_Extensions" +msgstr "擴充功能(_E)" + +#: ../midori/sokoke.c:739 +msgid "_History" +msgstr "歷史(_H)" + +#: ../midori/sokoke.c:740 +msgid "_Homepage" +msgstr "首頁(_H)" + +#: ../midori/sokoke.c:741 +msgid "_Userscripts" +msgstr "使用者命令稿(_U)" + +#: ../midori/sokoke.c:742 +msgid "User_styles" +msgstr "使用者樣式(_S)" + +#: ../midori/sokoke.c:743 +msgid "New _Tab" +msgstr "新分頁(_T)" + +#: ../midori/sokoke.c:744 +msgid "_Transfers" +msgstr "傳送(_T)" + +#: ../midori/sokoke.c:745 +msgid "_Closed Tabs and Windows" +msgstr "關閉的分頁和視窗(_C)" + +#: ../midori/sokoke.c:746 +msgid "New _Window" +msgstr "開新視窗(_W)" + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s 沒有任何「%s」屬性" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s 無法被指派為 %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s 無法被存取" + +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +msgid "Userscripts" +msgstr "使用者命令稿" + +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +msgid "Userstyles" +msgstr "使用者樣式" + +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "啟用(_E)" + +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "停用(_D)" + +#: ../panels/midori-bookmarks.c:103 +msgid "Bookmarks" +msgstr "書籤" + +#: ../panels/midori-bookmarks.c:236 +msgid "Edit the selected bookmark" +msgstr "編輯已選書籤" + +#: ../panels/midori-bookmarks.c:244 +msgid "Delete the selected bookmark" +msgstr "刪除已選書籤" + +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "加入新的資料夾" + +#: ../panels/midori-bookmarks.c:589 +msgid "Separator" +msgstr "分隔符號" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "主控臺" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "擴充功能" + +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "確定要移除所有歷史項目？" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "已選歷史項目加入書籤" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "刪除已選歷史項目" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "清空整個歷史" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "一週之前" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "%d 天之前" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "今天" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "昨天" + +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +msgid "Plugins" +msgstr "外掛程式" + +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "認證所需" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"需要使用者名稱和密碼\n" +"以開啟這個位置：" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "使用者名稱" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "密碼" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "無法載入名為「%s」的圖示" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "無法載入庫存圖示「%s」" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "動畫訊框不完整" + +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "屬性「%s」對於 %s 無效" + +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +msgid "Choose file" +msgstr "選擇檔案" + +#: ../katze/katze-utils.c:229 +msgid "Choose folder" +msgstr "選擇資料夾" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "滑鼠手勢" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "藉由移動滑鼠來控制 Midori" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +msgid "Pageholder" +msgstr "長駐頁面" + +#: ../extensions/page-holder.c:137 +msgid "_Pageholder" +msgstr "長駐頁面(_P)" + +#: ../extensions/statusbar-features.c:38 +msgid "Images" +msgstr "圖像" + +#: ../extensions/statusbar-features.c:45 +msgid "Scripts" +msgstr "命令稿" From 74cccb0aae98d31a39230995db11f87bf6b3ff26 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Mar 2009 19:35:11 +0100 Subject: [PATCH 0857/2970] Add tooltips to Enable and Disable buttons --- panels/midori-addons.c | 2 ++ panels/midori-console.c | 9 ++++++--- panels/midori-extensions.c | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 4d04b1dd..2e612313 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -1003,6 +1003,7 @@ midori_addons_get_toolbar (MidoriViewable* addons) /* enable button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable")); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Enable")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_status_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); @@ -1012,6 +1013,7 @@ midori_addons_get_toolbar (MidoriViewable* addons) /* disable button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable")); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Disable")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_status_clicked_cb), addons); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); diff --git a/panels/midori-console.c b/panels/midori-console.c index 4946caf2..59dddc2d 100644 --- a/panels/midori-console.c +++ b/panels/midori-console.c @@ -337,11 +337,14 @@ midori_console_add (MidoriConsole* console, gint line, const gchar* source_id) { + GtkTreeView* treeview; + GtkTreeModel* model; + g_return_if_fail (MIDORI_IS_CONSOLE (console)); - GtkTreeView* treeview = GTK_TREE_VIEW (console->treeview); - GtkTreeModel* treemodel = gtk_tree_view_get_model (treeview); - gtk_tree_store_insert_with_values (GTK_TREE_STORE (treemodel), + treeview = GTK_TREE_VIEW (console->treeview); + model = gtk_tree_view_get_model (treeview); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), NULL, NULL, G_MAXINT, 0, message, 1, line, 2, source_id, -1); } diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index 45afa567..fd4703b3 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -142,6 +142,7 @@ midori_extensions_get_toolbar (MidoriViewable* extensions) /* enable button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_YES); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Enable")); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Enable")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_extensions_button_status_clicked_cb), extensions); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); @@ -151,6 +152,7 @@ midori_extensions_get_toolbar (MidoriViewable* extensions) /* disable button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_NO); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("_Disable")); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Disable")); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_extensions_button_status_clicked_cb), extensions); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); From bc3e1408b73549abe4035d42a7a4aea514976012 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 12 Mar 2009 18:20:14 +0100 Subject: [PATCH 0858/2970] Check for and link with libm --- katze/wscript_build | 2 +- wscript | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/katze/wscript_build b/katze/wscript_build index 128fd357..b52eb015 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -9,7 +9,7 @@ obj.name = 'katze' obj.target = 'katze' obj.includes = '. ../.' obj.find_sources_in_dirs ('.') -obj.uselib = 'GMODULE LIBSOUP GTK LIBXML' +obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML' obj.install_path = None if platform.architecture ()[0] == '64bit': diff --git a/wscript b/wscript index b913591f..f3c23463 100644 --- a/wscript +++ b/wscript @@ -149,6 +149,7 @@ def configure (conf): sqlite = 'no ' conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes']) + conf.check (lib='m', mandatory=True) check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) check_pkg ('gio-2.0', '2.16.0', False) From 856082a7b9a3763b368556d65de73a923aeaadb0 Mon Sep 17 00:00:00 2001 From: Stanley Zhang Date: Sat, 14 Mar 2009 23:56:46 +0100 Subject: [PATCH 0859/2970] Add Simplified Chinese translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/zh_CN.po | 1599 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1601 insertions(+), 1 deletion(-) create mode 100644 po/zh_CN.po diff --git a/AUTHORS b/AUTHORS index c358a563..93290bf9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -53,6 +53,7 @@ Translations: sv: Mikael Magnusson tr: Mirat Can Bayrak uk: Dmitry Nikitin + zh_CN: Stanley Zhang zh_TW: Wei-Lun Chao Code from other projects: diff --git a/po/LINGUAS b/po/LINGUAS index 801c9169..4fae844d 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da de el en_GB es et fi fr gl hu id it ja nl pl pt_PT ru sv tr uk zh_TW +da de el en_GB es et fi fr gl hu id it ja nl pl pt_PT ru sv tr uk zh_CN zh_TW diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 00000000..9f03f257 --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,1599 @@ +# Simplified Chinese translations for midori package. +# Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Stanley Zhang 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-03-03 00:58+0100\n" +"PO-Revision-Date: 2009-02-11 11:19+0800\n" +"Last-Translator: Stanley Zhang \n" +"Language-Team: Simplified Chinese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "轻量的 Web 浏览器" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 +#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Web 浏览器" + +#: ../midori/main.c:106 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "设置无法加载: %s\n" + +#: ../midori/main.c:161 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "值 '%s' 在 '%s' 中无效" + +#: ../midori/main.c:168 ../midori/main.c:238 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "无效的设置值 '%s'" + +#: ../midori/main.c:480 +msgid "File not found." +msgstr "没有找到文件." + +#: ../midori/main.c:488 ../midori/main.c:497 +msgid "Malformed document." +msgstr "异常的文件." + +#: ../midori/main.c:519 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "打开数据库失败: %s\n" + +#: ../midori/main.c:551 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "执行数据库操作失败: %s\n" + +#: ../midori/main.c:605 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "移除历史项目失败: %s\n" + +#: ../midori/main.c:629 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "清空历史失败: %s\n" + +#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "添加历史项失败: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:882 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "删除旧的历史项目失败: %s\n" + +#: ../midori/main.c:910 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "配置无法保存. %s" + +#: ../midori/main.c:939 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "搜索引擎无法保存. %s" + +#: ../midori/main.c:1069 ../midori/sokoke.c:617 +#, c-format +msgid "Writing failed." +msgstr "写失败." + +#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "书签无法保存. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1169 ../midori/main.c:1193 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "垃圾箱无法保存. %s" + +#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 +msgid "Transfers" +msgstr "文件传输" + +#: ../midori/main.c:1265 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "会话无法保存. %s" + +#: ../midori/main.c:1398 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori 好像在上次运行时崩溃了. 如果这种情况反复出现，请尝试以下的选项来解决此问" +"题." + +#: ../midori/main.c:1413 +msgid "Modify _preferences" +msgstr "修改首选项(_p)" + +#: ../midori/main.c:1417 +msgid "Reset the last _session" +msgstr "重置最后的会话(_s)" + +#: ../midori/main.c:1422 +msgid "Disable all _extensions" +msgstr "关闭所有的扩展(_e)" + +#: ../midori/main.c:1596 +msgid "No filename specified" +msgstr "没有指定文件名" + +#: ../midori/main.c:1628 ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "发生了一个未知的错误." + +#: ../midori/main.c:1651 +msgid "Run the specified filename as javascript" +msgstr "将指定的文件当作Javascript执行" + +#: ../midori/main.c:1653 +msgid "Display program version" +msgstr "显示程序版本" + +#: ../midori/main.c:1655 +msgid "Addresses" +msgstr "地址" + +#: ../midori/main.c:1699 +msgid "[Addresses]" +msgstr "[地址]" + +#: ../midori/main.c:1723 +msgid "Please report comments, suggestions and bugs to:" +msgstr "请将意见、建议和问题反馈到:" + +#: ../midori/main.c:1725 +msgid "Check for new versions at:" +msgstr "在此检查新版本:" + +#: ../midori/main.c:1752 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "一个 Midori 的实例已经在运行但没有响应.\n" + +#: ../midori/main.c:1820 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "搜索引擎无法加载. %s\n" + +#: ../midori/main.c:1832 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "书签无法加载: %s\n" + +#: ../midori/main.c:1847 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "会话无法加载: %s\n" + +#: ../midori/main.c:1860 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "垃圾箱无法加载: %s\n" + +#: ../midori/main.c:1873 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "历史记录无法加载: %s\n" + +#: ../midori/main.c:1885 +msgid "The following errors occured:" +msgstr "发生以下错误:" + +#: ../midori/main.c:1901 +msgid "_Ignore" +msgstr "忽略(_I)" + +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 +msgid "Reload the current page" +msgstr "重新载入当前页" + +#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 +msgid "Stop loading the current page" +msgstr "停止载入当前页" + +#: ../midori/midori-browser.c:350 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% 已加载" + +#: ../midori/midori-browser.c:375 +#, c-format +msgid "Unexpected action '%s'." +msgstr "意外的活动 '%s'." + +#: ../midori/midori-browser.c:552 +msgid "New folder" +msgstr "新建目录" + +#: ../midori/midori-browser.c:552 +msgid "Edit folder" +msgstr "编辑目录" + +#: ../midori/midori-browser.c:554 +msgid "New bookmark" +msgstr "新建书签" + +#: ../midori/midori-browser.c:554 +msgid "Edit bookmark" +msgstr "编辑书签" + +#: ../midori/midori-browser.c:584 +msgid "_Title:" +msgstr "标题(_T): " + +#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 +msgid "_Description:" +msgstr "描述(_D):" + +#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 +msgid "_Address:" +msgstr "地址(_A):" + +#: ../midori/midori-browser.c:635 +msgid "_Folder:" +msgstr "目录(_F):" + +#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 +msgid "Toplevel folder" +msgstr "最上层目录" + +#: ../midori/midori-browser.c:761 +msgid "Save file as" +msgstr "文件另存为" + +#: ../midori/midori-browser.c:1372 +msgid "Open file" +msgstr "打开文件" + +#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "在新标签页中打开所有项(_T)" + +#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 +msgid "Open in New _Tab" +msgstr "在新标签页中打开(_T)" + +#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 +msgid "Open in New _Window" +msgstr "在新窗口中打开(_W)" + +#: ../midori/midori-browser.c:2794 +msgid "A lightweight web browser." +msgstr "一个轻量的 Web 浏览器." + +#: ../midori/midori-browser.c:2802 +msgid "translator-credits" +msgstr "张翼 " + +#: ../midori/midori-browser.c:2989 +msgid "_File" +msgstr "文件(_F)" + +#: ../midori/midori-browser.c:2992 +msgid "Open a new window" +msgstr "新建窗口" + +#: ../midori/midori-browser.c:2995 +msgid "Open a new tab" +msgstr "新建标签页" + +#: ../midori/midori-browser.c:2998 +msgid "Open a file" +msgstr "打开文件" + +#: ../midori/midori-browser.c:3001 +msgid "Save to a file" +msgstr "保存到文件" + +#: ../midori/midori-browser.c:3003 +msgid "_Close Tab" +msgstr "关闭标签页(_C)" + +#: ../midori/midori-browser.c:3004 +msgid "Close the current tab" +msgstr "关闭当前标签页" + +#: ../midori/midori-browser.c:3006 +msgid "C_lose Window" +msgstr "关闭窗口(_l)" + +#: ../midori/midori-browser.c:3007 +msgid "Close this window" +msgstr "关闭此窗口" + +#: ../midori/midori-browser.c:3010 +msgid "Print the current page" +msgstr "打印当前页" + +#: ../midori/midori-browser.c:3013 +msgid "Quit the application" +msgstr "退出程序" + +#: ../midori/midori-browser.c:3015 +msgid "_Edit" +msgstr "编辑(_E)" + +#: ../midori/midori-browser.c:3018 +msgid "Cut the selected text" +msgstr "剪切选中的文本" + +#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 +msgid "Copy the selected text" +msgstr "复制选中的文本" + +#: ../midori/midori-browser.c:3027 +msgid "Paste text from the clipboard" +msgstr "从剪贴板粘帖文本" + +#: ../midori/midori-browser.c:3030 +msgid "Delete the selected text" +msgstr "删除选中的文本" + +#: ../midori/midori-browser.c:3033 +msgid "Select all text" +msgstr "选取所有文本" + +#: ../midori/midori-browser.c:3036 +msgid "Find a word or phrase in the page" +msgstr "在页面中查找词或短语" + +#: ../midori/midori-browser.c:3038 +msgid "Find _Next" +msgstr "查找下一个(_N)" + +#: ../midori/midori-browser.c:3039 +msgid "Find the next occurrence of a word or phrase" +msgstr "查找下一处" + +#: ../midori/midori-browser.c:3041 +msgid "Find _Previous" +msgstr "查找上一个(_P)" + +#: ../midori/midori-browser.c:3042 +msgid "Find the previous occurrence of a word or phrase" +msgstr "查找上一处" + +#: ../midori/midori-browser.c:3045 +msgid "_Quick Find" +msgstr "快速查找(_Q)" + +#: ../midori/midori-browser.c:3046 +msgid "Quickly jump to a word or phrase" +msgstr "快速跳转到一个词或短语" + +#: ../midori/midori-browser.c:3049 +msgid "Configure the application preferences" +msgstr "设置程序首选项" + +#: ../midori/midori-browser.c:3051 +msgid "_View" +msgstr "查看(_V)" + +#: ../midori/midori-browser.c:3052 +msgid "_Toolbars" +msgstr "工具栏(_T)" + +#: ../midori/midori-browser.c:3064 +msgid "Increase the zoom level" +msgstr "提高放大倍数" + +#: ../midori/midori-browser.c:3067 +msgid "Decrease the zoom level" +msgstr "缩小放大倍数" + +#: ../midori/midori-browser.c:3070 +msgid "Reset the zoom level" +msgstr "重置放大倍数" + +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "编码(_E)" + +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "自动(_A)" + +#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "繁体中文 (BIG5)" + +#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "日语 (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "俄语 (KOI8-R)" + +#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "西方 (ISO-8859-1)" + +#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "定制 ..." + +#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 +msgid "View _Source" +msgstr "查看源码(_S)" + +#: ../midori/midori-browser.c:3095 +msgid "View the source code of the page" +msgstr "查看本页的源代码" + +#: ../midori/midori-browser.c:3097 +msgid "View Selection Source" +msgstr "查看选中部分的源代码" + +#: ../midori/midori-browser.c:3098 +msgid "View the source code of the selection" +msgstr "查看选中部分的源代码" + +#: ../midori/midori-browser.c:3102 +msgid "Toggle fullscreen view" +msgstr "全屏浏览" + +#: ../midori/midori-browser.c:3104 +msgid "_Go" +msgstr "位置(_G)" + +#: ../midori/midori-browser.c:3107 +msgid "Go back to the previous page" +msgstr "后退到上一个页" + +#: ../midori/midori-browser.c:3110 +msgid "Go forward to the next page" +msgstr "前进到下一页" + +#: ../midori/midori-browser.c:3113 +msgid "Go to your homepage" +msgstr "回到主页" + +#: ../midori/midori-browser.c:3115 +msgid "Empty Trash" +msgstr "清空垃圾箱" + +#: ../midori/midori-browser.c:3116 +msgid "Delete the contents of the trash" +msgstr "删除垃圾箱中的内容" + +#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 +msgid "Undo Close Tab" +msgstr "撤销关闭标签页" + +#: ../midori/midori-browser.c:3119 +msgid "Open the last closed tab" +msgstr "打开最后关闭的标签页" + +#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 +msgid "Add a new bookmark" +msgstr "添加一个新书签" + +#: ../midori/midori-browser.c:3124 +msgid "_Tools" +msgstr "工具(_T)" + +#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 +msgid "_Manage Search Engines" +msgstr "管理搜索引擎(_M)" + +#: ../midori/midori-browser.c:3127 +msgid "Add, edit and remove search engines..." +msgstr "添加, 编辑和移除搜索引擎" + +#: ../midori/midori-browser.c:3131 +msgid "_Previous Tab" +msgstr "上一个标签页(_P)" + +#: ../midori/midori-browser.c:3132 +msgid "Switch to the previous tab" +msgstr "转到上一个标签页" + +#: ../midori/midori-browser.c:3134 +msgid "_Next Tab" +msgstr "下一个标签页(_N)" + +#: ../midori/midori-browser.c:3135 +msgid "Switch to the next tab" +msgstr "转到上一个标签页" + +#: ../midori/midori-browser.c:3137 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../midori/midori-browser.c:3139 +msgid "_Contents" +msgstr "内容(_C)" + +#: ../midori/midori-browser.c:3140 +msgid "Show the documentation" +msgstr "显示文档" + +#: ../midori/midori-browser.c:3142 +msgid "_Frequent Questions" +msgstr "常见问题(_F)" + +#: ../midori/midori-browser.c:3143 +msgid "Show the Frequently Asked Questions" +msgstr "显示常见问题" + +#: ../midori/midori-browser.c:3145 +msgid "_Report a Bug" +msgstr "反馈错误(_R)" + +#: ../midori/midori-browser.c:3146 +msgid "Open Midori's bug tracker" +msgstr "打开 Midori 的错误跟踪器" + +#: ../midori/midori-browser.c:3149 +msgid "Show information about the program" +msgstr "显示此程序的信息" + +#: ../midori/midori-browser.c:3156 +msgid "P_rivate Browsing" +msgstr "隐私浏览(_r)" + +#: ../midori/midori-browser.c:3157 +msgid "Don't save any private data while browsing" +msgstr "在浏览时不保存任何隐私数据" + +#: ../midori/midori-browser.c:3162 +msgid "_Menubar" +msgstr "菜单栏(_M)" + +#: ../midori/midori-browser.c:3163 +msgid "Show menubar" +msgstr "显示菜单栏" + +#: ../midori/midori-browser.c:3166 +msgid "_Navigationbar" +msgstr "导航栏(_N)" + +#: ../midori/midori-browser.c:3167 +msgid "Show navigationbar" +msgstr "显示导航栏" + +#: ../midori/midori-browser.c:3170 +msgid "Side_panel" +msgstr "侧边栏(_p)" + +#: ../midori/midori-browser.c:3171 +msgid "Show sidepanel" +msgstr "显示侧边栏" + +#: ../midori/midori-browser.c:3174 +msgid "_Bookmarkbar" +msgstr "书签栏(_B)" + +#: ../midori/midori-browser.c:3175 +msgid "Show bookmarkbar" +msgstr "显示书签栏" + +#: ../midori/midori-browser.c:3178 +msgid "_Transferbar" +msgstr "传输栏(_T)" + +#: ../midori/midori-browser.c:3179 +msgid "Show transferbar" +msgstr "显示传输栏" + +#: ../midori/midori-browser.c:3182 +msgid "_Statusbar" +msgstr "状态栏(_S)" + +#: ../midori/midori-browser.c:3183 +msgid "Show statusbar" +msgstr "显示状态栏" + +#: ../midori/midori-browser.c:3602 +msgid "_Separator" +msgstr "分割符(_S)" + +#: ../midori/midori-browser.c:3609 +msgid "_Location..." +msgstr "位置(_L)" + +#: ../midori/midori-browser.c:3611 +msgid "Open a particular location" +msgstr "打开一个指定位置" + +#: ../midori/midori-browser.c:3635 +msgid "_Web Search..." +msgstr "搜索 Web(_W)" + +#: ../midori/midori-browser.c:3637 +msgid "Run a web search" +msgstr "执行 Web 搜索" + +#: ../midori/midori-browser.c:3656 +msgid "Reopen a previously closed tab or window" +msgstr "重新打开以前关闭的标签页或窗口" + +#: ../midori/midori-browser.c:3669 +msgid "_Recently visited pages" +msgstr "最近访问的页面(_R)" + +#: ../midori/midori-browser.c:3671 +msgid "Reopen pages that you visited earlier" +msgstr "重新打开以前访问过的页面" + +#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 +msgid "_Bookmarks" +msgstr "书签(_B)" + +#: ../midori/midori-browser.c:3686 +msgid "Show the saved bookmarks" +msgstr "显示保存的书签" + +#: ../midori/midori-browser.c:3699 +msgid "_Window" +msgstr "窗口(_W)" + +#: ../midori/midori-browser.c:3701 +msgid "Show a list of all open tabs" +msgstr "显示所有标签页的列表" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:3864 +msgid "_Inline Find:" +msgstr "查找(_I):" + +#: ../midori/midori-browser.c:3889 +msgid "Previous" +msgstr "上一个" + +#: ../midori/midori-browser.c:3894 +msgid "Next" +msgstr "下一个" + +#: ../midori/midori-browser.c:3899 +msgid "Match Case" +msgstr "区分大小写" + +#: ../midori/midori-browser.c:3907 +msgid "Highlight Matches" +msgstr "高亮显示匹配" + +#: ../midori/midori-browser.c:3917 +msgid "Close Findbar" +msgstr "关闭查找栏" + +#: ../midori/midori-browser.c:4211 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "意外的设置 '%s'" + +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 +msgid "Align sidepanel on the right" +msgstr "Align sidepanel on the right" + +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 +msgid "Whether to align the sidepanel on the right" +msgstr "让侧边栏排放到右侧" + +#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +msgid "Close panel" +msgstr "关闭侧边栏" + +#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 +msgid "Blank page" +msgstr "空白页面" + +#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 +msgid "Homepage" +msgstr "主页" + +#: ../midori/midori-websettings.c:179 +msgid "Last open pages" +msgstr "最后打开页面" + +#: ../midori/midori-websettings.c:214 +msgid "New tab" +msgstr "新建标签页" + +#: ../midori/midori-websettings.c:215 +msgid "New window" +msgstr "新建窗口" + +#: ../midori/midori-websettings.c:216 +msgid "Current tab" +msgstr "当前标签页" + +#: ../midori/midori-websettings.c:231 +msgid "Default" +msgstr "缺省" + +#: ../midori/midori-websettings.c:232 +msgid "Icons" +msgstr "图标" + +#: ../midori/midori-websettings.c:233 +msgid "Text" +msgstr "文字" + +#: ../midori/midori-websettings.c:234 +msgid "Both" +msgstr "图标及文字" + +#: ../midori/midori-websettings.c:235 +msgid "Both horizontal" +msgstr "水平摆放的图标和文字" + +#: ../midori/midori-websettings.c:250 +msgid "All cookies" +msgstr "所有 Cookies" + +#: ../midori/midori-websettings.c:251 +msgid "Session cookies" +msgstr "会话 Cookies" + +#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 +msgid "None" +msgstr "无" + +#: ../midori/midori-websettings.c:268 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:269 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:270 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:311 +msgid "Remember last window size" +msgstr "记住上次窗口的大小" + +#: ../midori/midori-websettings.c:312 +msgid "Whether to save the last window size" +msgstr "是否保存上次窗口的大小" + +#: ../midori/midori-websettings.c:320 +msgid "Last window width" +msgstr "上次窗口的宽度" + +#: ../midori/midori-websettings.c:321 +msgid "The last saved window width" +msgstr "上次保存的窗口宽度" + +#: ../midori/midori-websettings.c:329 +msgid "Last window height" +msgstr "上次窗口的高度" + +#: ../midori/midori-websettings.c:330 +msgid "The last saved window height" +msgstr "上次保存的窗口高度" + +#: ../midori/midori-websettings.c:355 +msgid "Last panel position" +msgstr "上次的侧边栏位置" + +#: ../midori/midori-websettings.c:356 +msgid "The last saved panel position" +msgstr "上次保存的侧边栏位置" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:365 +msgid "Last panel page" +msgstr "上次的侧边栏页" + +#: ../midori/midori-websettings.c:366 +msgid "The last saved panel page" +msgstr "上次保存的侧边栏页" + +#: ../midori/midori-websettings.c:374 +msgid "Last Web search" +msgstr "上次的 Web 搜索" + +#: ../midori/midori-websettings.c:375 +msgid "The last saved Web search" +msgstr "上次保存的 Web 搜索" + +#: ../midori/midori-websettings.c:384 +msgid "Show Menubar" +msgstr "显示菜单栏" + +#: ../midori/midori-websettings.c:385 +msgid "Whether to show the menubar" +msgstr "是否显示菜单栏" + +#: ../midori/midori-websettings.c:393 +msgid "Show Navigationbar" +msgstr "显示导航栏" + +#: ../midori/midori-websettings.c:394 +msgid "Whether to show the navigationbar" +msgstr "是否显示导航栏" + +#: ../midori/midori-websettings.c:402 +msgid "Show Bookmarkbar" +msgstr "显示书签栏" + +#: ../midori/midori-websettings.c:403 +msgid "Whether to show the bookmarkbar" +msgstr "是否显示书签栏" + +#: ../midori/midori-websettings.c:411 +msgid "Show Panel" +msgstr "显示侧边栏" + +#: ../midori/midori-websettings.c:412 +msgid "Whether to show the panel" +msgstr "是否显示侧边栏" + +#: ../midori/midori-websettings.c:420 +msgid "Show Statusbar" +msgstr "显示状态栏" + +#: ../midori/midori-websettings.c:421 +msgid "Whether to show the statusbar" +msgstr "是否显示状态栏" + +#: ../midori/midori-websettings.c:430 +msgid "Toolbar Style" +msgstr "工具栏样式" + +#: ../midori/midori-websettings.c:431 +msgid "The style of the toolbar" +msgstr "工具栏的样式" + +#: ../midori/midori-websettings.c:447 +msgid "Show progress in location entry" +msgstr "在地址输入框中显示进度" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show loading progress in the location entry" +msgstr "是否在地址输入框中显示加载进度" + +#: ../midori/midori-websettings.c:456 +msgid "Toolbar Items" +msgstr "工具栏中的项目" + +#: ../midori/midori-websettings.c:457 +msgid "The items to show on the toolbar" +msgstr "在工具栏中显示的项目" + +#: ../midori/midori-websettings.c:465 +msgid "Compact Sidepanel" +msgstr "紧凑侧边栏" + +#: ../midori/midori-websettings.c:466 +msgid "Whether to make the sidepanel compact" +msgstr "是否让侧边栏紧凑显示" + +#: ../midori/midori-websettings.c:491 +msgid "Load on Startup" +msgstr "启动时加载" + +#: ../midori/midori-websettings.c:492 +msgid "What to load on startup" +msgstr "启动时加载的项目" + +#: ../midori/midori-websettings.c:502 +msgid "The homepage" +msgstr "主页" + +#: ../midori/midori-websettings.c:517 +msgid "Show crash dialog" +msgstr "显示崩溃提示对话框" + +#: ../midori/midori-websettings.c:518 +msgid "Show a dialog after Midori crashed" +msgstr "当 Midori 崩溃后显示提示对话框" + +#: ../midori/midori-websettings.c:526 +msgid "Download Folder" +msgstr "下载目录" + +#: ../midori/midori-websettings.c:527 +msgid "The folder downloaded files are saved to" +msgstr "下载的文件将保存到此目录" + +#: ../midori/midori-websettings.c:535 +msgid "Download Manager" +msgstr "下载管理器" + +#: ../midori/midori-websettings.c:536 +msgid "An external download manager" +msgstr "外部的下载管理器" + +#: ../midori/midori-websettings.c:544 +msgid "Text Editor" +msgstr "文本编辑器" + +#: ../midori/midori-websettings.c:545 +msgid "An external text editor" +msgstr "外部的文本编辑器" + +#: ../midori/midori-websettings.c:553 +msgid "Location entry Search" +msgstr "地址栏查找" + +#: ../midori/midori-websettings.c:554 +msgid "The search to perform inside the location entry" +msgstr "在地址输入框中执行的查找" + +#: ../midori/midori-websettings.c:562 +msgid "Preferred Encoding" +msgstr "首选的编码" + +#: ../midori/midori-websettings.c:563 +msgid "The preferred character encoding" +msgstr "首选的字符编码集" + +#: ../midori/midori-websettings.c:573 +msgid "Always Show Tabbar" +msgstr "总是显示标签栏" + +#: ../midori/midori-websettings.c:574 +msgid "Always show the tabbar" +msgstr "总是显示标签栏" + +#: ../midori/midori-websettings.c:582 +msgid "Close Buttons on Tabs" +msgstr "标签栏上显示关闭按钮" + +#: ../midori/midori-websettings.c:583 +msgid "Whether tabs have close buttons" +msgstr "是否在标签栏上显示关闭按钮" + +#: ../midori/midori-websettings.c:592 +msgid "Open new pages in" +msgstr "打开新的页面在" + +#: ../midori/midori-websettings.c:593 +msgid "Where to open new pages" +msgstr "在那里打开新的页面" + +#: ../midori/midori-websettings.c:603 +msgid "Open external pages in" +msgstr "打开外部页面在" + +#: ../midori/midori-websettings.c:604 +msgid "Where to open externally opened pages" +msgstr "在那里打开外部页面" + +#: ../midori/midori-websettings.c:617 +msgid "Middle click opens Selection" +msgstr "鼠标中键打开地址" + +#: ../midori/midori-websettings.c:618 +msgid "Load an address from the selection via middle click" +msgstr "用鼠标中键单击打开选中地址" + +#: ../midori/midori-websettings.c:626 +msgid "Open tabs in the background" +msgstr "在后台打开标签页" + +#: ../midori/midori-websettings.c:627 +msgid "Whether to open new tabs in the background" +msgstr "是否在后台打开标签页" + +#: ../midori/midori-websettings.c:635 +msgid "Open Tabs next to Current" +msgstr "在当前标签页后打开新标签" + +#: ../midori/midori-websettings.c:636 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "是否在当前标签页后打开新标签或者在最后的标签页后打开" + +#: ../midori/midori-websettings.c:644 +msgid "Open popups in tabs" +msgstr "在标签页中打开弹出窗口" + +#: ../midori/midori-websettings.c:645 +msgid "Whether to open popup windows in tabs" +msgstr "是否在标签页中打开弹出窗口" + +#: ../midori/midori-websettings.c:696 +msgid "Zoom Text and Images" +msgstr "缩放文字和图像" + +#: ../midori/midori-websettings.c:697 +msgid "Whether to zoom text and images" +msgstr "是否缩放文字和图像" + +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "输入时自动补全" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "是否输入时自动补全地址" + +#: ../midori/midori-websettings.c:723 +msgid "Accept cookies" +msgstr "接收 Cookies" + +#: ../midori/midori-websettings.c:724 +msgid "What type of cookies to accept" +msgstr "接收什么类型的 Cookies" + +#: ../midori/midori-websettings.c:737 +msgid "Original cookies only" +msgstr "只接收原始 Cookies" + +#: ../midori/midori-websettings.c:738 +msgid "Accept cookies from the original website only" +msgstr "只接收原始网站的 Cookies" + +#: ../midori/midori-websettings.c:746 +msgid "Maximum cookie age" +msgstr "最长 Cookie 有效期" + +#: ../midori/midori-websettings.c:747 +msgid "The maximum number of days to save cookies for" +msgstr "最长保存 Cookie 多少天" + +#: ../midori/midori-websettings.c:757 +msgid "Remember last visited pages" +msgstr "记录上次访问的页面" + +#: ../midori/midori-websettings.c:758 +msgid "Whether the last visited pages are saved" +msgstr "是否记录上次访问的页面" + +#: ../midori/midori-websettings.c:766 +msgid "Maximum history age" +msgstr "最长历史有效期" + +#: ../midori/midori-websettings.c:767 +msgid "The maximum number of days to save the history for" +msgstr "最长保存历史多少天" + +#: ../midori/midori-websettings.c:775 +msgid "Remember last form inputs" +msgstr "记录上次的表格输入" + +#: ../midori/midori-websettings.c:776 +msgid "Whether the last form inputs are saved" +msgstr "是否记录上次的表格输入" + +#: ../midori/midori-websettings.c:784 +msgid "Remember last downloaded files" +msgstr "记录上次下载的文件" + +#: ../midori/midori-websettings.c:785 +msgid "Whether the last downloaded files are saved" +msgstr "是否保存上次下载的文件" + +#: ../midori/midori-websettings.c:795 +msgid "Proxy Server" +msgstr "代理服务器" + +#: ../midori/midori-websettings.c:796 +msgid "The proxy server used for HTTP connections" +msgstr "HTTP连接所使用的代理服务器" + +#: ../midori/midori-websettings.c:815 +msgid "Detect proxy server automatically" +msgstr "自动检测代理服务器" + +#: ../midori/midori-websettings.c:816 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "是否自动在环境中检测代理服务器" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:836 +msgid "Identify as" +msgstr "识别为" + +#: ../midori/midori-websettings.c:837 +msgid "What to identify as to web pages" +msgstr "让页面识别为什么" + +#: ../midori/midori-websettings.c:857 +msgid "Identification string" +msgstr "识别字符串" + +#: ../midori/midori-websettings.c:858 +msgid "The application identification string" +msgstr "应用程序识别字符串" + +#: ../midori/midori-websettings.c:870 +msgid "Cache size" +msgstr "缓存大小" + +#: ../midori/midori-websettings.c:871 +msgid "The allowed size of the cache" +msgstr "允许的缓存大小" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:630 +#, c-format +msgid "Not found - %s" +msgstr "没有找到 - %s" + +#: ../midori/midori-view.c:960 +msgid "Open _Link" +msgstr "打开链接(_L)" + +#: ../midori/midori-view.c:962 +msgid "Open Link in New _Tab" +msgstr "在新标签页中打开链接(_T)" + +#: ../midori/midori-view.c:979 +msgid "Open Link in New _Window" +msgstr "在新窗口中打开链接(_W)" + +#: ../midori/midori-view.c:989 +msgid "_Save Link destination" +msgstr "保存链接目标(_S)" + +#: ../midori/midori-view.c:997 +msgid "_Download Link destination" +msgstr "下载链接目标(_D)" + +#: ../midori/midori-view.c:1019 +msgid "_Search the Web" +msgstr "搜索 Web(_S)" + +#: ../midori/midori-view.c:1028 +msgid "Open Address in New _Tab" +msgstr "在新标签页中打开地址(_T)" + +#: ../midori/midori-view.c:1507 +#, c-format +msgid "Inspect page - %s" +msgstr "检查页面 - %s" + +#: ../midori/midori-view.c:1664 +msgid "Source" +msgstr "源码" + +#: ../midori/midori-view.c:1688 +#, c-format +msgid "Document cannot be displayed" +msgstr "文档无法显示" + +#: ../midori/midori-view.c:1704 +#, c-format +msgid "No documentation installed" +msgstr "没有安装文档" + +#: ../midori/midori-preferences.c:93 +#, c-format +msgid "Preferences for %s" +msgstr "%s 的设置项" + +#. Page "General" +#: ../midori/midori-preferences.c:390 +msgid "General" +msgstr "常规" + +#: ../midori/midori-preferences.c:391 +msgid "Startup" +msgstr "启动" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:440 +msgid "Appearance" +msgstr "外观" + +#: ../midori/midori-preferences.c:441 +msgid "Font settings" +msgstr "字体设置" + +#: ../midori/midori-preferences.c:443 +msgid "Default Font Family" +msgstr "缺省的字体" + +#: ../midori/midori-preferences.c:449 +msgid "The default font size used to display text" +msgstr "显示文字的缺省字体大小" + +#: ../midori/midori-preferences.c:452 +msgid "Minimum Font Size" +msgstr "最小字体尺寸" + +#: ../midori/midori-preferences.c:455 +msgid "The minimum font size used to display text" +msgstr "显示文字的最小字体尺寸" + +#: ../midori/midori-preferences.c:462 +msgid "Encoding" +msgstr "编码" + +#: ../midori/midori-preferences.c:465 +msgid "The character encoding to use by default" +msgstr "缺省的字符编码" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:472 +msgid "Behavior" +msgstr "行为" + +#: ../midori/midori-preferences.c:473 +msgid "Features" +msgstr "特性" + +#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 +msgid "Load images automatically" +msgstr "自动加载图像" + +#: ../midori/midori-preferences.c:477 +msgid "Load and display images automatically" +msgstr "自动加载和显示图像" + +#: ../midori/midori-preferences.c:480 +msgid "Shrink images automatically" +msgstr "自动缩小图像" + +#: ../midori/midori-preferences.c:481 +msgid "Automatically shrink standalone images to fit" +msgstr "自动缩小单独的图像以适合屏幕" + +#: ../midori/midori-preferences.c:484 +msgid "Print background images" +msgstr "打印背景图" + +#: ../midori/midori-preferences.c:485 +msgid "Whether background images should be printed" +msgstr "是否打印页面的背景图" + +#: ../midori/midori-preferences.c:488 +msgid "Resizable text areas" +msgstr "可缩放的文本区" + +#: ../midori/midori-preferences.c:489 +msgid "Whether text areas are resizable" +msgstr "文本区是否可被缩放" + +#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 +msgid "Enable scripts" +msgstr "启用脚本" + +#: ../midori/midori-preferences.c:493 +msgid "Enable embedded scripting languages" +msgstr "启用嵌入的脚本语言" + +#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 +msgid "Enable plugins" +msgstr "启用插件" + +#: ../midori/midori-preferences.c:497 +msgid "Enable embedded plugin objects" +msgstr "启用嵌入的插件对象" + +#: ../midori/midori-preferences.c:500 +msgid "Enforce 96 dots per inch" +msgstr "强制每英寸96点" + +#: ../midori/midori-preferences.c:501 +msgid "Enforce a video dot density of 96 DPI" +msgstr "强制画面点密度为96DPI" + +#: ../midori/midori-preferences.c:504 +msgid "Enable developer tools" +msgstr "启用开发工具" + +#: ../midori/midori-preferences.c:505 +msgid "Enable special extensions for developers" +msgstr "启用给开发者的特殊扩展" + +#. Page "Interface" +#: ../midori/midori-preferences.c:517 +msgid "Interface" +msgstr "界面" + +#: ../midori/midori-preferences.c:518 +msgid "Navigationbar" +msgstr "导航条" + +#: ../midori/midori-preferences.c:527 +msgid "Browsing" +msgstr "浏览" + +#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 +msgid "Network" +msgstr "网络" + +#: ../midori/midori-preferences.c:592 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:599 +msgid "Privacy" +msgstr "隐私" + +#: ../midori/midori-preferences.c:606 +msgid "Web Cookies" +msgstr "网页 Cookies" + +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 +msgid "days" +msgstr "天" + +#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 +msgid "History" +msgstr "历史" + +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +msgid "Empty" +msgstr "清空" + +#: ../midori/midori-searchaction.c:811 +msgid "Add search engine" +msgstr "添加搜索引擎" + +#: ../midori/midori-searchaction.c:811 +msgid "Edit search engine" +msgstr "编辑搜索引擎" + +#: ../midori/midori-searchaction.c:839 +msgid "_Name:" +msgstr "名称(_N)" + +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "图标(_I)" + +#: ../midori/midori-searchaction.c:897 +msgid "_Token:" +msgstr "记号(_T):" + +#: ../midori/midori-searchaction.c:1077 +msgid "Manage Search Engines" +msgstr "管理搜索引擎" + +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +msgid "Could not run external program." +msgstr "无法运行外部程序." + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:440 +msgid "Warning: You are using a superuser account!" +msgstr "警告: 你正在使用超级用户帐号!" + +#: ../midori/sokoke.c:771 +msgid "_Bookmark" +msgstr "书签(_B)" + +#: ../midori/sokoke.c:773 +msgid "_Add Bookmark" +msgstr "添加书签(_A)" + +#: ../midori/sokoke.c:774 +msgid "_Console" +msgstr "控制台(_C)" + +#: ../midori/sokoke.c:775 +msgid "_Extensions" +msgstr "扩展(_E)" + +#: ../midori/sokoke.c:776 +msgid "_History" +msgstr "历史(_H)" + +#: ../midori/sokoke.c:777 +msgid "_Homepage" +msgstr "主页(_H)" + +#: ../midori/sokoke.c:778 +msgid "_Userscripts" +msgstr "用户脚本(_U)" + +#: ../midori/sokoke.c:779 +msgid "User_styles" +msgstr "用户样式(_s)" + +#: ../midori/sokoke.c:780 +msgid "New _Tab" +msgstr "新建标签页(_T)" + +#: ../midori/sokoke.c:781 +msgid "_Transfers" +msgstr "传输(_T)" + +#: ../midori/sokoke.c:782 +msgid "_Closed Tabs and Windows" +msgstr "关闭的标签页和窗口(_C)" + +#: ../midori/sokoke.c:783 +msgid "New _Window" +msgstr "新建窗口(_W)" + +#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#, c-format +msgid "%s has no property '%s'" +msgstr "%s 没有 '%s' 属性" + +#: ../midori/gjs.c:878 +#, c-format +msgid "%s cannot be assigned to %s.%s" +msgstr "%s 不能被指定到 %s.%s" + +#: ../midori/gjs.c:888 +#, c-format +msgid "%s.%s cannot be accessed" +msgstr "%s.%s 不能访问" + +#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +msgid "Userscripts" +msgstr "用户脚本" + +#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +msgid "Userstyles" +msgstr "用户样式" + +#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "启用(_E)" + +#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +msgid "_Disable" +msgstr "关闭(_D)" + +#: ../panels/midori-bookmarks.c:103 +msgid "Bookmarks" +msgstr "书签" + +#: ../panels/midori-bookmarks.c:236 +msgid "Edit the selected bookmark" +msgstr "编辑选中的书签" + +#: ../panels/midori-bookmarks.c:244 +msgid "Delete the selected bookmark" +msgstr "删除选中的书签" + +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "添加一个新目录" + +#: ../panels/midori-bookmarks.c:589 +msgid "Separator" +msgstr "分隔符" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "控制台" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "扩展" + +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "确认删除所有的历史项目?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "将选中的历史项加入书签" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "删除选中的历史项目" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "清空全部历史" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "一周以前" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "%d 天以前" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "今天" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "昨天" + +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 +msgid "Plugins" +msgstr "插件" + +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "需要认证" + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "需要输入用户名和密码来打开此位置:" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "用户名" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "密码" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "图标 '%s' 无法加载" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "库存图标 '%s' 无法加载" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "动画帧损坏" + +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "属性 '%s' 在 '%s' 中无效" + +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +msgid "Choose file" +msgstr "选择文件" + +#: ../katze/katze-utils.c:229 +msgid "Choose folder" +msgstr "选择目录" + +#: ../extensions/mouse-gestures/main.c:176 +msgid "Mouse Gestures" +msgstr "鼠标手势" + +#: ../extensions/mouse-gestures/main.c:177 +msgid "Control Midori by moving the mouse" +msgstr "用鼠标移动控制 Midori" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +msgid "Pageholder" +msgstr "长驻页面" + +#: ../extensions/page-holder.c:137 +msgid "_Pageholder" +msgstr "长驻页面(_P)" + +#: ../extensions/statusbar-features.c:40 +msgid "Images" +msgstr "图像" + +#: ../extensions/statusbar-features.c:47 +msgid "Scripts" +msgstr "脚本" From 8054be90c3933d0c37973cc3ef717841821dc19c Mon Sep 17 00:00:00 2001 From: Pascal Gervais Date: Sun, 15 Mar 2009 00:10:03 +0100 Subject: [PATCH 0860/2970] Update French translation --- po/fr.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/fr.po b/po/fr.po index be0ec77e..7a816d23 100644 --- a/po/fr.po +++ b/po/fr.po @@ -888,11 +888,11 @@ msgstr "Le style de la barre d'outils" #: ../midori/midori-websettings.c:447 msgid "Show progress in location entry" -msgstr "Afficher le progrès dans le champ d'adresse" +msgstr "Progression dans le champ d'adresse" #: ../midori/midori-websettings.c:448 msgid "Whether to show loading progress in the location entry" -msgstr "Indique s'il faut afficher le progrès dans le champ d'adresse" +msgstr "Indique s'il faut afficher la progression dans le champ d'adresse" #: ../midori/midori-websettings.c:456 msgid "Toolbar Items" @@ -944,7 +944,7 @@ msgstr "Gestionnaire de téléchargements" #: ../midori/midori-websettings.c:536 msgid "An external download manager" -msgstr "Un gestionnaire de téléchargements externe" +msgstr "Utiliser un gestionnaire de téléchargements externe" #: ../midori/midori-websettings.c:544 msgid "Text Editor" @@ -952,7 +952,7 @@ msgstr "Éditeur de texte" #: ../midori/midori-websettings.c:545 msgid "An external text editor" -msgstr "Un éditeur texte externe" +msgstr "Utiliser un éditeur texte externe" #: ../midori/midori-websettings.c:553 msgid "Location entry Search" @@ -1043,7 +1043,7 @@ msgstr "Agrandir le texte et les images" #: ../midori/midori-websettings.c:697 msgid "Whether to zoom text and images" -msgstr "Indique s'il faut agrandir texte et images" +msgstr "Indique s'il faut agrandir le texte et les images" #: ../midori/midori-websettings.c:714 msgid "Find inline while typing" @@ -1120,11 +1120,11 @@ msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" #: ../midori/midori-websettings.c:815 msgid "Detect proxy server automatically" -msgstr "Reconnaître le serveur mandataire automatiquement" +msgstr "Détecter le serveur mandataire automatiquement" #: ../midori/midori-websettings.c:816 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Indique s'il faut reconnaître le serveur mandataire automatiquement" +msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string #: ../midori/midori-websettings.c:836 @@ -1262,7 +1262,7 @@ msgstr "Fonctionnalités" #: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 msgid "Load images automatically" -msgstr "Charger les images automatiquement" +msgstr "Charger les images" #: ../midori/midori-preferences.c:477 msgid "Load and display images automatically" @@ -1270,11 +1270,11 @@ msgstr "Charger et afficher les images automatiquement" #: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" -msgstr "Diminuer les images automatiquement" +msgstr "Réduire les images" #: ../midori/midori-preferences.c:481 msgid "Automatically shrink standalone images to fit" -msgstr "Réduire automatiquement les images pour les adapter" +msgstr "Réduire automatiquement les images pour les adapter à la fenêtre" #: ../midori/midori-preferences.c:484 msgid "Print background images" From a5015fa027ff2a60fd5f5c2c270db099d71ca4fe Mon Sep 17 00:00:00 2001 From: Pascal Gervais Date: Sun, 15 Mar 2009 00:21:44 +0100 Subject: [PATCH 0861/2970] Update French translation --- po/fr.po | 434 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 223 insertions(+), 211 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7a816d23..b355d209 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 12:34-0500\n" -"PO-Revision-Date: 2009-01-22 03:07+0100\n" +"POT-Creation-Date: 2009-03-11 15:04-0400\n" +"PO-Revision-Date: 2009-03-11 15:12-0400\n" "Last-Translator: Pascal Gervais 2009\n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -23,8 +23,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 -#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1612 ../midori/main.c:1715 +#: ../midori/main.c:1724 ../midori/main.c:1735 #: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -33,97 +33,97 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:106 +#: ../midori/main.c:107 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:162 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:168 ../midori/main.c:238 +#: ../midori/main.c:169 ../midori/main.c:239 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:480 +#: ../midori/main.c:481 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/main.c:488 ../midori/main.c:497 +#: ../midori/main.c:489 ../midori/main.c:498 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/main.c:519 +#: ../midori/main.c:520 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:552 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:606 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer de l'historique l'élément : %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:630 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#: ../midori/main.c:653 ../midori/main.c:687 ../midori/main.c:703 #, c-format msgid "Failed to add history item: %s\n" msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:883 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer de l'hitorique les anciens éléments : %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:911 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:939 +#: ../midori/main.c:940 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1069 ../midori/sokoke.c:617 +#: ../midori/main.c:1070 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#: ../midori/main.c:1091 ../midori/main.c:1118 ../midori/main.c:1146 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 ../midori/main.c:1193 +#: ../midori/main.c:1170 ../midori/main.c:1194 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 +#: ../midori/main.c:1225 ../midori/midori-preferences.c:433 msgid "Transfers" msgstr "Transferts" -#: ../midori/main.c:1265 +#: ../midori/main.c:1266 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1398 +#: ../midori/main.c:1409 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." @@ -132,95 +132,95 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1413 +#: ../midori/main.c:1424 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1417 +#: ../midori/main.c:1428 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1422 +#: ../midori/main.c:1433 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1596 +#: ../midori/main.c:1612 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1628 ../midori/gjs.c:514 +#: ../midori/main.c:1639 ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1651 +#: ../midori/main.c:1662 msgid "Run the specified filename as javascript" msgstr "Exécutez le fichier spécifié en tant que javascript" -#: ../midori/main.c:1653 +#: ../midori/main.c:1664 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1655 +#: ../midori/main.c:1666 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1699 +#: ../midori/main.c:1712 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1723 +#: ../midori/main.c:1736 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1725 +#: ../midori/main.c:1738 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1752 +#: ../midori/main.c:1765 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1835 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" -#: ../midori/main.c:1832 +#: ../midori/main.c:1847 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés : %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1862 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1860 +#: ../midori/main.c:1875 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1873 +#: ../midori/main.c:1888 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargé: %s\n" -#: ../midori/main.c:1885 +#: ../midori/main.c:1900 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1901 +#: ../midori/main.c:1916 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3062 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3059 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" @@ -279,26 +279,26 @@ msgstr "Enregistrer le fichier dans" msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2635 ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2642 ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2645 ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:2795 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:2803 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -306,405 +306,405 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:2990 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:2993 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:2996 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:2999 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3002 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3004 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3005 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3007 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3008 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3011 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3014 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3016 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3019 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3022 ../midori/midori-browser.c:3025 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3028 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3031 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3034 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3037 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3039 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3040 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3042 msgid "Find _Previous" msgstr "Rechercher le _précédant" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3043 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3046 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3047 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3050 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3052 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3053 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3065 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3068 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3071 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3072 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3074 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3077 ../midori/midori-websettings.c:194 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3080 ../midori/midori-websettings.c:195 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3083 ../midori/midori-websettings.c:196 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3086 ../midori/midori-websettings.c:197 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3089 ../midori/midori-websettings.c:198 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3092 ../midori/midori-websettings.c:199 #: ../midori/midori-websettings.c:271 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3095 ../midori/midori-view.c:1073 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3096 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3098 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3099 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3103 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3105 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3108 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3111 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3114 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3116 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3117 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:1045 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3120 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3124 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3125 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3127 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3128 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3132 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3133 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3135 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3136 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3138 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3140 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3141 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3143 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3144 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3146 msgid "_Report a Bug" msgstr "_Rapporter une anomalie" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3147 msgid "Open Midori's bug tracker" msgstr "Ouvrir le gestionnaire d'anomalies de Midori" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3150 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3157 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3158 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3163 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3164 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3167 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3168 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3171 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3172 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3175 msgid "_Bookmarkbar" msgstr "Barre de _signets" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3176 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3179 msgid "_Transferbar" msgstr "Barre de _transferts" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3180 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3183 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3184 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3617 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3624 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3626 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3650 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3652 msgid "Run a web search" msgstr "Lance une recherche sur la toile" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3671 msgid "Reopen a previously closed tab or window" msgstr "Rouvre un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3684 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3686 msgid "Reopen pages that you visited earlier" msgstr "Rouvre des pages précédemment visitées" -#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3699 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3701 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3714 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3716 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:3879 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:3904 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:3909 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3914 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:3922 msgid "Highlight Matches" msgstr "Résultats analogues en surbrillance" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:3932 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4226 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" @@ -721,7 +721,7 @@ msgstr "Indique s'il faut aligner le panneau latéral sur la droite" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1819 msgid "Blank page" msgstr "Page vierge" @@ -944,7 +944,7 @@ msgstr "Gestionnaire de téléchargements" #: ../midori/midori-websettings.c:536 msgid "An external download manager" -msgstr "Utiliser un gestionnaire de téléchargements externe" +msgstr "Un gestionnaire de téléchargements externe" #: ../midori/midori-websettings.c:544 msgid "Text Editor" @@ -952,7 +952,7 @@ msgstr "Éditeur de texte" #: ../midori/midori-websettings.c:545 msgid "An external text editor" -msgstr "Utiliser un éditeur texte externe" +msgstr "Un éditeur texte externe" #: ../midori/midori-websettings.c:553 msgid "Location entry Search" @@ -1152,217 +1152,221 @@ msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire (cache) permise" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#: ../midori/midori-view.c:626 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:956 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:958 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:975 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:989 +#: ../midori/midori-view.c:985 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:993 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1015 msgid "_Search the Web" msgstr "_Chercher sur la toile" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1024 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1503 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1664 +#: ../midori/midori-view.c:1662 msgid "Source" msgstr "Source" -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1686 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:1702 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:94 #, c-format msgid "Preferences for %s" msgstr "Préférences de %s" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:408 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:409 msgid "Startup" msgstr "Démarrage" +#: ../midori/midori-preferences.c:425 +msgid "Use current page as homepage" +msgstr "Utiliser la page courante comme page d'accueil" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:469 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:470 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:472 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:478 msgid "The default font size used to display text" msgstr "La taille par défaut de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:481 msgid "Minimum Font Size" msgstr "Taille minimum de la police" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:484 msgid "The minimum font size used to display text" msgstr "La taille minimum de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:491 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:494 msgid "The character encoding to use by default" msgstr "Encodage des caractères par défaut" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:501 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:502 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:505 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Charger les images" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:506 msgid "Load and display images automatically" -msgstr "Charger et afficher les images automatiquement" +msgstr "Charger et afficher les images" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:509 msgid "Shrink images automatically" -msgstr "Réduire les images" +msgstr "Diminuer les images" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:510 msgid "Automatically shrink standalone images to fit" -msgstr "Réduire automatiquement les images pour les adapter à la fenêtre" +msgstr "Réduire automatiquement les images pour les adapter" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:513 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:514 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:517 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:518 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimentionnés" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:521 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:522 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:525 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Activer les greffons" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:526 msgid "Enable embedded plugin objects" msgstr "Active la prise en charge interne des greffons" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:529 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:530 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:533 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:534 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:546 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:547 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:556 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:595 ../midori/midori-preferences.c:596 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:623 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:632 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:641 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:654 ../midori/midori-preferences.c:668 msgid "days" msgstr "jours" -#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:661 ../panels/midori-history.c:104 msgid "History" msgstr "Historique" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Vide" @@ -1447,17 +1451,17 @@ msgstr "Onglets et fenêtres _fermés" msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:743 ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s n'a pas de propriété « %s »" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s ne peut être assigné à %s.%s" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s ne peut être accédé" @@ -1474,10 +1478,18 @@ msgstr "Styles utilisateur" msgid "_Enable" msgstr "_Activer" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Activer" + +#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Désactiver" +#: ../panels/midori-addons.c:1016 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Désactiver" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Signets" From 80868219087818b79509d4e45950bceac9568948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Sun, 15 Mar 2009 18:31:43 +0100 Subject: [PATCH 0862/2970] Update Portuguese translation --- po/pt_PT.po | 1401 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 839 insertions(+), 562 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 84cddab9..acfc309e 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,13 +1,13 @@ # Portuguese translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Sérgio Marques 2008 +# Sérgio Marques 2008-2009 # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.1\n" +"Project-Id-Version: Midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" +"POT-Creation-Date: 2009-03-03 00:58+0100\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese \n" @@ -15,1286 +15,1463 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navegador Web leve" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1338 -#: ../midori/main.c:1347 -#: ../midori/main.c:1370 -#: ../midori/main.c:1394 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1596 +#: ../midori/main.c:1702 +#: ../midori/main.c:1711 +#: ../midori/main.c:1722 +#: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Navegador Web" -#: ../midori/main.c:86 -msgid "_Bookmark" -msgstr "_Marcador" - -#: ../midori/main.c:87 -#: ../midori/midori-browser.c:3744 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/main.c:88 -msgid "_Add Bookmark" -msgstr "_Adicionar Marcador" - -#: ../midori/main.c:89 -msgid "_Console" -msgstr "_Consola" - -#: ../midori/main.c:90 -msgid "_Extensions" -msgstr "_Extensões" - -#: ../midori/main.c:91 -msgid "_History" -msgstr "_Histórico" - -#: ../midori/main.c:92 -msgid "_Homepage" -msgstr "_Página Inicial" - -#: ../midori/main.c:93 -msgid "_Userscripts" -msgstr "Scripts de _Utilizador" - -#: ../midori/main.c:94 -msgid "User_styles" -msgstr "E_stilos de Utilizador" - -#: ../midori/main.c:95 -msgid "New _Tab" -msgstr "Nova _Separador" - -#: ../midori/main.c:96 -msgid "_Transfers" -msgstr "_Transferências" - -#: ../midori/main.c:97 -msgid "_Closed Tabs and Windows" -msgstr "Separadores e Janelas Fe_chadas" - -#: ../midori/main.c:98 -msgid "New _Window" -msgstr "Nova _Janela" - -#: ../midori/main.c:143 +#: ../midori/main.c:106 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "Não foi possível carregar a configuração: %s\n" +msgstr "A configuração não foi carregada: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:161 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:205 -#: ../midori/main.c:275 +#: ../midori/main.c:168 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração inválido '%s'" -#: ../midori/main.c:532 +#: ../midori/main.c:480 msgid "File not found." msgstr "Ficheiro não encontrado." -#: ../midori/main.c:540 -#: ../midori/main.c:549 +#: ../midori/main.c:488 +#: ../midori/main.c:497 msgid "Malformed document." -msgstr "Documento mal formado" +msgstr "Documento mal formado." -#: ../midori/main.c:571 -#: ../midori/main.c:603 +#: ../midori/main.c:519 #, c-format msgid "Failed to open database: %s\n" -msgstr "Falha ao abrir base de dados: %s\n" +msgstr "Falha ao abrir a base de dados: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:551 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Falha ao executar a declaração da base de dados: %s\n" + +#: ../midori/main.c:605 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:629 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falha ao limpar histórico: %s\n" -#: ../midori/main.c:714 -#: ../midori/main.c:728 +#: ../midori/main.c:652 +#: ../midori/main.c:686 +#: ../midori/main.c:702 #, c-format msgid "Failed to add history item: %s\n" msgstr "Falha ao adicionar histórico: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:882 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico antigo: %s\n" -#: ../midori/main.c:976 -#: ../midori/sokoke.c:459 +#: ../midori/main.c:910 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A configuração não foi guardada. %s" + +#: ../midori/main.c:939 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Os motores de pesquisa não foram guardados. %s" + +#: ../midori/main.c:1069 +#: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/main.c:1000 -#: ../midori/midori-preferences.c:350 +#: ../midori/main.c:1090 +#: ../midori/main.c:1117 +#: ../midori/main.c:1145 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Os marcadores não foram guardados. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1169 +#: ../midori/main.c:1193 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "O lixo não foi guardado. %s" + +#: ../midori/main.c:1224 +#: ../midori/midori-preferences.c:404 msgid "Transfers" msgstr "Transferências" -#: ../midori/main.c:1040 +#: ../midori/main.c:1265 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Não foi possível gravar a sessão. %s" +msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "Executar o ficheiro especificado como javascript" +#: ../midori/main.c:1398 +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Apresentar versão do programa" +#: ../midori/main.c:1413 +msgid "Modify _preferences" +msgstr "Modificar _preferências" -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URIs" +#: ../midori/main.c:1417 +msgid "Reset the last _session" +msgstr "Restaurar última _sessão" -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URIs]" +#: ../midori/main.c:1422 +msgid "Disable all _extensions" +msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, relate comentários, sugestões e erros para:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Verificar por novas versões a:" - -#: ../midori/main.c:1394 +#: ../midori/main.c:1596 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1411 -#, c-format +#: ../midori/main.c:1628 +#: ../midori/gjs.c:514 +msgid "An unknown error occured." +msgstr "Ocorreu um erro desconhecido." + +#: ../midori/main.c:1651 +msgid "Run the specified filename as javascript" +msgstr "Executar o ficheiro especificado como argumento java" + +#: ../midori/main.c:1653 +msgid "Display program version" +msgstr "Apresentar versão do programa" + +#: ../midori/main.c:1655 +msgid "Addresses" +msgstr "Endereços " + +#: ../midori/main.c:1699 +msgid "[Addresses]" +msgstr "[Endereços]" + +#: ../midori/main.c:1723 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor reporte comentários, sugestões e erros para:" + +#: ../midori/main.c:1725 +msgid "Check for new versions at:" +msgstr "Verificar por novas versões a:" + +#: ../midori/main.c:1752 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas que não está respondendo.\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1820 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Os motores de pesquisa não foram carregados. %s\n" + +#: ../midori/main.c:1832 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1463 +#: ../midori/main.c:1847 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1477 +#: ../midori/main.c:1860 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1491 +#: ../midori/main.c:1873 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1504 +#: ../midori/main.c:1885 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1520 +#: ../midori/main.c:1901 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Os motores de busca não foram gravados. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Os marcadores não foram gravados. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "O lixo não foi gravado. %s" - -#: ../midori/main.c:1715 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "A configuração não foi gravada. %s" - -#: ../midori/midori-browser.c:249 -#: ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:277 +#: ../midori/midori-browser.c:3055 +#: ../midori/midori-browser.c:3061 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:261 -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:288 +#: ../midori/midori-browser.c:3058 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:350 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:375 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:552 +msgid "New folder" +msgstr "Nova pasta" + +#: ../midori/midori-browser.c:552 +msgid "Edit folder" +msgstr "Editar pasta" + +#: ../midori/midori-browser.c:554 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:554 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:584 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:543 -#: ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:597 +#: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:562 -#: ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:616 +#: ../midori/midori-searchaction.c:869 +msgid "_Address:" +msgstr "_Endereço:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:635 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Administrador" +#: ../midori/midori-browser.c:640 +#: ../midori/midori-browser.c:681 +msgid "Toplevel folder" +msgstr "Pasta Superior" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:761 msgid "Save file as" -msgstr "Gravar como" +msgstr "Guardar como" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1372 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2634 +#: ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "Abrir todas em _Separadores" + +#: ../midori/midori-browser.c:2641 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2644 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:2601 -msgid "Separator" -msgstr "Separador" - -#: ../midori/midori-browser.c:2712 -#, c-format -msgid "A week ago" -msgstr "Uma semana atrás" - -#: ../midori/midori-browser.c:2718 -#, c-format -msgid "%d days ago" -msgstr "%d dias atrás" - -#: ../midori/midori-browser.c:2725 -msgid "Today" -msgstr "Hoje" - -#: ../midori/midori-browser.c:2727 -msgid "Yesterday" -msgstr "Ontem" - -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:2794 msgid "A lightweight web browser." -msgstr "Navegador Web leve." +msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:2824 +#: ../midori/midori-browser.c:2802 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:2958 -msgid "Are you sure you want to remove all history items?" -msgstr "Tem a certeza que quer remover todo o histórico?" - -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:2989 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:2992 msgid "Open a new window" -msgstr "Abrir uma nova janela" +msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:2995 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:2998 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3001 msgid "Save to a file" -msgstr "Gravar para ficheiro" +msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3003 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3004 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3006 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3007 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3010 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3013 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:3015 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3018 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:3096 -#: ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3024 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3027 msgid "Paste text from the clipboard" msgstr "Colar itens da área de transferência" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3030 msgid "Delete the selected text" msgstr "Eliminar o texto seleccionado" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3033 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3036 msgid "Find a word or phrase in the page" msgstr "Localizar uma palavra ou frase na página" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3038 msgid "Find _Next" msgstr "Localizar _Próxima" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3039 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar próxima ocorrência da palavra ou frase" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3041 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3042 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocurrência anterior de uma palavra ou frase" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3045 msgid "_Quick Find" msgstr "Localização _Rápida" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3046 msgid "Quickly jump to a word or phrase" msgstr "Avanço rápido para palavra ou frase" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3049 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3051 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3052 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3064 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3067 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3070 msgid "Reset the zoom level" msgstr "Restaurar Zoom" -#: ../midori/midori-browser.c:3147 -#: ../midori/midori-view.c:998 -msgid "View _Source" -msgstr "Ver _fonte" +#: ../midori/midori-browser.c:3071 +msgid "_Encoding" +msgstr "_Codificação" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3073 +msgid "_Automatic" +msgstr "_Automático" + +#: ../midori/midori-browser.c:3076 +#: ../midori/midori-websettings.c:194 +msgid "Chinese (BIG5)" +msgstr "Chinês (BIG5)" + +#: ../midori/midori-browser.c:3079 +#: ../midori/midori-websettings.c:195 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonês (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3082 +#: ../midori/midori-websettings.c:196 +msgid "Russian (KOI8-R)" +msgstr "Russo (KOI8-R)" + +#: ../midori/midori-browser.c:3085 +#: ../midori/midori-websettings.c:197 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3088 +#: ../midori/midori-websettings.c:198 +msgid "Western (ISO-8859-1)" +msgstr "Ocidental (ISO-8859-1)" + +#: ../midori/midori-browser.c:3091 +#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:271 +msgid "Custom..." +msgstr "Personalizar..." + +#: ../midori/midori-browser.c:3094 +#: ../midori/midori-view.c:1077 +msgid "View _Source" +msgstr "Ver _Origem" + +#: ../midori/midori-browser.c:3095 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3097 msgid "View Selection Source" -msgstr "Ver Fonte da Selecção" +msgstr "Ver Origem da Selecção" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3098 msgid "View the source code of the selection" msgstr "Ver código fonte da selecção" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3102 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3104 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3107 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3110 msgid "Go forward to the next page" msgstr "Ir para página seguinte" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3113 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3115 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3116 msgid "Delete the contents of the trash" -msgstr "Eliminar conteúdo do lixo" +msgstr "Eliminar conteúdos do lixo" -#: ../midori/midori-browser.c:3171 -#: ../midori/midori-view.c:970 +#: ../midori/midori-browser.c:3118 +#: ../midori/midori-view.c:1049 msgid "Undo Close Tab" msgstr "Desfazer Fecho de Separador" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3119 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3123 +#: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3179 -msgid "Edit the selected bookmark" -msgstr "Editar marcador seleccionado" - -#: ../midori/midori-browser.c:3182 -msgid "Delete the selected bookmark" -msgstr "Eliminar marcador seleccionado" - -#: ../midori/midori-browser.c:3185 -msgid "Delete the selected history item" -msgstr "Eliminar item de histórico seleccionado" - -#: ../midori/midori-browser.c:3188 -msgid "Clear the entire history" -msgstr "Limpar todo o histórico" - -#: ../midori/midori-browser.c:3191 -msgid "Bookmark the selected history item" -msgstr "Marcar o item de histórico seleccionado" - -#: ../midori/midori-browser.c:3193 +#: ../midori/midori-browser.c:3124 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:3195 -#: ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3126 +#: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" -msgstr "_Gerir Motores de Procura" +msgstr "Gerir _Motores de Pesquisa" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3127 msgid "Add, edit and remove search engines..." -msgstr "Adicionar, editar e remover motores de procura" +msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3131 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3132 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3134 msgid "_Next Tab" msgstr "_Próximo Separador" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3135 msgid "Switch to the next tab" msgstr "Trocar para próximo separador" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3137 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3139 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3140 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3142 +msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:3143 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" -msgstr "_Reportar erros" +#: ../midori/midori-browser.c:3145 +msgid "_Report a Bug" +msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:3146 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3149 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3156 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3157 msgid "Don't save any private data while browsing" -msgstr "Não gravar dados privados ao navegar" +msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3162 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3163 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3166 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3167 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3170 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3171 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3174 msgid "_Bookmarkbar" -msgstr "Barra de Ma_rcadores" +msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3175 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3178 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3179 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3182 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3183 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3602 +msgid "_Separator" +msgstr "_Separador" + +#: ../midori/midori-browser.c:3609 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3611 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:3695 +#: ../midori/midori-browser.c:3635 msgid "_Web Search..." -msgstr "Procura _Web..." +msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:3697 +#: ../midori/midori-browser.c:3637 msgid "Run a web search" -msgstr "Executar uma procura web" +msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3656 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3669 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:3731 +#: ../midori/midori-browser.c:3671 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:3746 -msgid "Show the saved bookmarks" -msgstr "Mostrar os marcadores gravados" +#: ../midori/midori-browser.c:3684 +#: ../midori/sokoke.c:772 +msgid "_Bookmarks" +msgstr "_Marcadores" -#: ../midori/midori-browser.c:3759 +#: ../midori/midori-browser.c:3686 +msgid "Show the saved bookmarks" +msgstr "Mostrar marcadores guardados" + +#: ../midori/midori-browser.c:3699 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3701 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Marcadores" - -#: ../midori/midori-browser.c:3926 -#: ../midori/midori-preferences.c:517 -msgid "History" -msgstr "Histórico" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" -msgstr "Localizar _Inline:" +#: ../midori/midori-browser.c:3864 +msgid "_Inline Find:" +msgstr "Localizar:" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:3889 +msgid "Previous" +msgstr "Anterior" + +#: ../midori/midori-browser.c:3894 +msgid "Next" +msgstr "Seguinte" + +#: ../midori/midori-browser.c:3899 msgid "Match Case" msgstr "Maiúsculas e Minúsculas" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:3907 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:3917 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4211 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" -#: ../midori/midori-panel.c:223 -#: ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:481 +msgid "Align sidepanel on the right" +msgstr "Alinhar painel lateral à direita" + +#: ../midori/midori-panel.c:231 +#: ../midori/midori-websettings.c:482 +msgid "Whether to align the sidepanel on the right" +msgstr "Se alinha painel lateral na direita" + +#: ../midori/midori-panel.c:241 +#: ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-websettings.c:131 -#: ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:177 +#: ../midori/midori-view.c:1821 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-websettings.c:132 -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:178 +#: ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "Página Inicial" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:179 msgid "Last open pages" msgstr "Últimas páginas abertas" -#: ../midori/midori-websettings.c:148 -msgid "Chinese (BIG5)" -msgstr "Chinês (BIG5)" - -#: ../midori/midori-websettings.c:149 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japonês (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:150 -msgid "Russian (KOI8-R)" -msgstr "Russo (KOI8-R)" - -#: ../midori/midori-websettings.c:151 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:152 -msgid "Western (ISO-8859-1)" -msgstr "Ocidental (ISO-8859-1)" - -#: ../midori/midori-websettings.c:153 -msgid "Custom..." -msgstr "Personalizar..." - -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:214 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:215 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:216 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:231 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:232 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:233 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:234 msgid "Both" msgstr "Texto e Ícones" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:235 msgid "Both horizontal" msgstr "Ambos na horizontal" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:250 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:251 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:206 -#: ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:252 +#: ../panels/midori-addons.c:96 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:268 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:269 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:270 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:311 msgid "Remember last window size" msgstr "Lembrar último tamanho de janela" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:312 msgid "Whether to save the last window size" -msgstr "Se grava o último tamanho de janela" +msgstr "Se guarda o último tamanho de janela" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:320 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:321 msgid "The last saved window width" -msgstr "Última largura de janela gravada" +msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:329 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:330 msgid "The last saved window height" -msgstr "Última altura de janela gravada" +msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:355 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:356 msgid "The last saved panel position" -msgstr "Última posição de painel gravada" +msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:365 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:366 msgid "The last saved panel page" -msgstr "Última posição de painel de página gravada" +msgstr "Última posição de painel de página guardada" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:374 msgid "Last Web search" -msgstr "Última procura na web" +msgstr "Última pesquisa na Web" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:375 msgid "The last saved Web search" -msgstr "Última procura Web gravada" +msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:384 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:385 msgid "Whether to show the menubar" msgstr "Se mostra a barra de menu" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:393 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:394 msgid "Whether to show the navigationbar" msgstr "Se mostra a barra de navegação" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:402 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the bookmarkbar" msgstr "Se mostra a barra de marcadores" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:411 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the panel" msgstr "Se mostra o painel" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:420 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the statusbar" msgstr "Se mostra a barra de estado" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:430 msgid "Toolbar Style" msgstr "Estilo da Barra de Ferramentas" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:431 msgid "The style of the toolbar" -msgstr "Estilo da barra de ferramentas" +msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:447 +msgid "Show progress in location entry" +msgstr "Mostrar evolução na entrada de localização" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show loading progress in the location entry" +msgstr "Se mostra evolução de carregamento na entrada de localização" + +#: ../midori/midori-websettings.c:456 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:457 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:465 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:466 msgid "Whether to make the sidepanel compact" msgstr "Se implica compactação do painel lateral" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:491 msgid "Load on Startup" -msgstr "Carregar ao iniciar" +msgstr "Carregar ao Iniciar" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:492 msgid "What to load on startup" msgstr "Carregar ao iniciar" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:502 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:517 +msgid "Show crash dialog" +msgstr "Mostrar diálogo sobre encerramento" + +#: ../midori/midori-websettings.c:518 +msgid "Show a dialog after Midori crashed" +msgstr "Mostrar diálogo após o encerramento do Midori" + +#: ../midori/midori-websettings.c:526 msgid "Download Folder" msgstr "Pasta de Transferências" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:527 msgid "The folder downloaded files are saved to" -msgstr "Pasta para gravar transferências" +msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:535 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:536 msgid "An external download manager" -msgstr "Gestor de transferências externo" +msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:544 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:545 msgid "An external text editor" -msgstr "Editor de texto externo" +msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:553 msgid "Location entry Search" -msgstr "Procura de entrada local" +msgstr "Pesquisa de entrada Local" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:554 msgid "The search to perform inside the location entry" -msgstr "Procura a executar dentro da entrada local" +msgstr "A pesquisa a executar dentro da entrada local" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:562 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:563 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:573 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:574 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:582 msgid "Close Buttons on Tabs" -msgstr "Ìcone \"Fechar\" nos Separadores" +msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:583 msgid "Whether tabs have close buttons" msgstr "Se separadores têm botões para fechar" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:592 msgid "Open new pages in" msgstr "Abrir novas páginas em" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:593 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:603 msgid "Open external pages in" msgstr "Abrir páginas externas em" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:604 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:617 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "Carregar URL seleccionada através do clique na roda do rato" +#: ../midori/midori-websettings.c:618 +msgid "Load an address from the selection via middle click" +msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:626 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:627 msgid "Whether to open new tabs in the background" -msgstr "Se mostra novos separadores em segundo plano" +msgstr "Se abre novos separadores em segundo plano" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:635 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:636 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Se abre novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:644 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:645 msgid "Whether to open popup windows in tabs" msgstr "Se abre janelas popup em separadores" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:696 +msgid "Zoom Text and Images" +msgstr "Zoom de Texto e Imagens" + +#: ../midori/midori-websettings.c:697 +msgid "Whether to zoom text and images" +msgstr "Se ajusta zoom de texto e imagens" + +#: ../midori/midori-websettings.c:714 +msgid "Find inline while typing" +msgstr "Encontrar ao escrever" + +#: ../midori/midori-websettings.c:715 +msgid "Whether to automatically find inline while typing" +msgstr "Se deve encontrar automaticamente ao escrever" + +#: ../midori/midori-websettings.c:723 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:737 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" -msgstr "Aceitar cookies apenas do website original" +msgstr "Aceitar cookies apenas do sítio web original" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:758 msgid "Whether the last visited pages are saved" -msgstr "Onde últimas páginas visitadas são gravadas" +msgstr "Se as últimas páginas visitadas são guardadas" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:766 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:767 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:775 msgid "Remember last form inputs" msgstr "Lembrar dados de formulários" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:776 msgid "Whether the last form inputs are saved" -msgstr "Se os dados de formulário são gravados" +msgstr "Se os dados de formulário são guardados" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:784 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:785 msgid "Whether the last downloaded files are saved" -msgstr "Se as últimas transferências são gravados" +msgstr "Se as últimas transferências são guardadas" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "HTTP Proxy" +#: ../midori/midori-websettings.c:795 +msgid "Proxy Server" +msgstr "Servidor Proxy" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "Proxy usada para ligações HTTP" +#: ../midori/midori-websettings.c:796 +msgid "The proxy server used for HTTP connections" +msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:815 +msgid "Detect proxy server automatically" +msgstr "Detectar servidor proxy automaticamente" + +#: ../midori/midori-websettings.c:816 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Se deve detectar automaticamente o servidor proxy do ambiente" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:836 +msgid "Identify as" +msgstr "Identificar como" + +#: ../midori/midori-websettings.c:837 +msgid "What to identify as to web pages" +msgstr "Identificar nas páginas web como" + +#: ../midori/midori-websettings.c:857 +msgid "Identification string" +msgstr "Linha de Identificação" + +#: ../midori/midori-websettings.c:858 +msgid "The application identification string" +msgstr "A linha de identificação da aplicação" + +#: ../midori/midori-websettings.c:870 msgid "Cache size" msgstr "Tamanho de cache" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:871 msgid "The allowed size of the cache" msgstr "Tamanho de cache permitido" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:630 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:960 +msgid "Open _Link" +msgstr "Abrir _Ligação" + +#: ../midori/midori-view.c:962 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:979 +msgid "Open Link in New _Window" +msgstr "Abrir Ligação em Nova _Janela" + +#: ../midori/midori-view.c:989 msgid "_Save Link destination" -msgstr "De_stino para Gravar Ligação" +msgstr "De_stino para Guardar Ligação" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:997 msgid "_Download Link destination" -msgstr "_Destino de Gravar Ligação" +msgstr "_Destino de Transferir Ligação" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Abrir URL em Novo _Separador" +#: ../midori/midori-view.c:1019 +msgid "_Search the Web" +msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1028 +msgid "Open Address in New _Tab" +msgstr "Abrir Endereço em Novo _Separador" + +#: ../midori/midori-view.c:1507 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1664 msgid "Source" -msgstr "Fonte" +msgstr "Origem" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:1688 +#, c-format +msgid "Document cannot be displayed" +msgstr "O documento não pode ser apresentado" + +#: ../midori/midori-view.c:1704 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:93 #, c-format msgid "Preferences for %s" msgstr "Preferências para %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:390 msgid "General" msgstr "Geral" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:391 msgid "Startup" msgstr "Início" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Definições de fontes" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Família de Fontes Padrão" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:449 +msgid "The default font size used to display text" +msgstr "O tamanho padrão de fonte para apresentar texto" + +#: ../midori/midori-preferences.c:452 msgid "Minimum Font Size" msgstr "Tmanho Mínimo de Fonte" +#: ../midori/midori-preferences.c:455 +msgid "The minimum font size used to display text" +msgstr "Tamanho mínimo de fonte para apresentar texto" + +#: ../midori/midori-preferences.c:462 +msgid "Encoding" +msgstr "Codificação" + +#: ../midori/midori-preferences.c:465 +msgid "The character encoding to use by default" +msgstr "A codificação de caracteres preferida" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:472 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:473 msgid "Features" msgstr "Funções" -#: ../midori/midori-preferences.c:411 -#: ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:476 +#: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:477 +msgid "Load and display images automatically" +msgstr "Carregar e apresentar automaticamente as imagens " + +#: ../midori/midori-preferences.c:480 msgid "Shrink images automatically" -msgstr "Compactar imagens automaticamente" +msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:481 +msgid "Automatically shrink standalone images to fit" +msgstr "Encolher imagens automaticamente" + +#: ../midori/midori-preferences.c:484 msgid "Print background images" -msgstr "Imprimir imagens de segundo plano" +msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:485 +msgid "Whether background images should be printed" +msgstr "Se imagens em segundo plano devem ser impressas" + +#: ../midori/midori-preferences.c:488 msgid "Resizable text areas" msgstr "Áreas de texto dimensionáveis" -#: ../midori/midori-preferences.c:423 -#: ../extensions/statusbar-features.c:39 -msgid "Enable scripts" -msgstr "Activar scripts" +#: ../midori/midori-preferences.c:489 +msgid "Whether text areas are resizable" +msgstr "Se as áreas de texto são redimensionáveis" -#: ../midori/midori-preferences.c:426 -#: ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:492 +#: ../extensions/statusbar-features.c:49 +msgid "Enable scripts" +msgstr "Activar argumentos" + +#: ../midori/midori-preferences.c:493 +msgid "Enable embedded scripting languages" +msgstr "Activar argumentos de idiomas incorporados" + +#: ../midori/midori-preferences.c:496 +#: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Activar plugins" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:497 +msgid "Enable embedded plugin objects" +msgstr "Activar plugin de objectos incorporados" + +#: ../midori/midori-preferences.c:500 +msgid "Enforce 96 dots per inch" +msgstr "Forçar 96 pontos por polegalda" + +#: ../midori/midori-preferences.c:501 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Forçar densidade de vídeo de 96 PPP" + +#: ../midori/midori-preferences.c:504 msgid "Enable developer tools" msgstr "Activar ferramentas de desenvolvimento" +#: ../midori/midori-preferences.c:505 +msgid "Enable special extensions for developers" +msgstr "Activar extensões especiais de desenvolvimento" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:517 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:518 msgid "Navigationbar" msgstr "Barra de Navegação" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:527 msgid "Browsing" msgstr "Navegar" -#: ../midori/midori-preferences.c:480 -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:564 +#: ../midori/midori-preferences.c:565 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:592 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:599 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:606 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:513 -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:631 msgid "days" msgstr "dias" -#: ../midori/midori-searchaction.c:456 -#: ../katze/katze-arrayaction.c:273 +#: ../midori/midori-preferences.c:624 +#: ../panels/midori-history.c:104 +msgid "History" +msgstr "Histórico" + +#: ../midori/midori-searchaction.c:455 +#: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" -msgstr "Adicionar motor de procura" +msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" -msgstr "Editar motor de procura" +msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:869 -msgid "_Icon (name or file):" -msgstr "_Ícone (nome ou ficheiro):" - #: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "_Icone:" + +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" -msgstr "Gerir motores de procura" +#: ../midori/midori-searchaction.c:1077 +msgid "Manage Search Engines" +msgstr "Gerir Motores de Pesquisa" -#: ../midori/sokoke.c:63 -#: ../midori/sokoke.c:75 +#: ../midori/sokoke.c:109 +#: ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/sokoke.c:282 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "Aviso: Está a utilizar uma conta de super utilizador!" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Ocorreu um erro desconhecido." +#: ../midori/sokoke.c:771 +msgid "_Bookmark" +msgstr "_Marcador" + +#: ../midori/sokoke.c:773 +msgid "_Add Bookmark" +msgstr "_Adicionar Marcador" + +#: ../midori/sokoke.c:774 +msgid "_Console" +msgstr "_Consola" + +#: ../midori/sokoke.c:775 +msgid "_Extensions" +msgstr "_Extensões" + +#: ../midori/sokoke.c:776 +msgid "_History" +msgstr "_Histórico" + +#: ../midori/sokoke.c:777 +msgid "_Homepage" +msgstr "_Página Inicial" + +#: ../midori/sokoke.c:778 +msgid "_Userscripts" +msgstr "Argumentos de _Utilizador" + +#: ../midori/sokoke.c:779 +msgid "User_styles" +msgstr "E_stilos de Utilizador" + +#: ../midori/sokoke.c:780 +msgid "New _Tab" +msgstr "Novo _Separador" + +#: ../midori/sokoke.c:781 +msgid "_Transfers" +msgstr "_Transferências" + +#: ../midori/sokoke.c:782 +msgid "_Closed Tabs and Windows" +msgstr "Separadores e Janelas Fe_chadas" + +#: ../midori/sokoke.c:783 +msgid "New _Window" +msgstr "Nova _Janela" #: ../midori/gjs.c:742 #: ../midori/gjs.c:832 @@ -1310,28 +1487,48 @@ msgstr "Não pode assinar %s para %s.%s" #: ../midori/gjs.c:888 #, c-format msgid "%s.%s cannot be accessed" -msgstr "Não pode aceder a %s.%s" +msgstr "%s. Não pode aceder a %s" + +#: ../panels/midori-addons.c:97 +#: ../panels/midori-addons.c:143 +msgid "Userscripts" +msgstr "Argumentos de Utilizador" #: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Scripts de utilizador" - -#: ../panels/midori-addons.c:99 -#: ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../panels/midori-addons.c:1006 +#: ../panels/midori-addons.c:1005 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activar" -#: ../panels/midori-addons.c:1015 +#: ../panels/midori-addons.c:1014 #: ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Desactivar" +#: ../panels/midori-bookmarks.c:103 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/midori-bookmarks.c:236 +msgid "Edit the selected bookmark" +msgstr "Editar marcador seleccionado" + +#: ../panels/midori-bookmarks.c:244 +msgid "Delete the selected bookmark" +msgstr "Eliminar marcador seleccionado" + +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "Adicionar nova pasta" + +#: ../panels/midori-bookmarks.c:589 +msgid "Separator" +msgstr "Separador" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Consola" @@ -1340,6 +1537,65 @@ msgstr "Consola" msgid "Extensions" msgstr "Extensões" +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "Tem a certeza que quer remover todo o histórico?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "Marcar o item de histórico seleccionado" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "Eliminar item de histórico seleccionado" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "Limpar todo o histórico" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "Uma semana atrás" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "%d dias atrás" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "Hoje" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "Ontem" + +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:54 +msgid "Plugins" +msgstr "Plugins" + +#: ../katze/katze-http-auth.c:101 +msgid "Authentication Required" +msgstr "Autenticação Necessária " + +#: ../katze/katze-http-auth.c:117 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Precisa de um nome de utilizador e uma palavra-passe\n" +"para abrir esta localização:" + +#: ../katze/katze-http-auth.c:131 +msgid "Username" +msgstr "Nome de Utilizador" + +#: ../katze/katze-http-auth.c:142 +msgid "Password" +msgstr "Palavra-passe" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1354,40 +1610,61 @@ msgstr "O ícone '%s' não foi carregado" msgid "Animation frames are broken" msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:154 -#: ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade %s' é inválida para %s" -#: ../katze/katze-utils.c:178 -#: ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Escolha ficheiro" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "Escolha pasta" +#: ../extensions/mouse-gestures/main.c:176 +msgid "Mouse Gestures" +msgstr "Gestos de Rato" + +#: ../extensions/mouse-gestures/main.c:177 +msgid "Control Midori by moving the mouse" +msgstr "Controlar Midori movendo o rato" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 -#: ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "Titular de Página" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" msgstr "Titular de _Página" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "Imagens" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" -msgstr "Scripts" +msgstr "Argumentos" -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "Plugins" +#~ msgid "URIs" +#~ msgstr "URIs" +#~ msgid "[URIs]" +#~ msgstr "[URIs]" +#~ msgid "_URL:" +#~ msgstr "_URL:" +#~ msgid "Root" +#~ msgstr "Administrador" +#~ msgid "HTTP Proxy" +#~ msgstr "HTTP Proxy" +#~ msgid "Open URL in New _Tab" +#~ msgstr "Abrir URL em Novo _Separador" +#~ msgid "_Icon (name or file):" +#~ msgstr "_Ícone (nome ou ficheiro):" +#~ msgid "Manage search engines" +#~ msgstr "Gerir motores de procura" From d30f7776a2f12d62b629b6b1e0d3d36ae4661289 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 15 Mar 2009 18:40:47 +0100 Subject: [PATCH 0863/2970] Update Russian translation --- po/ru.po | 268 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 139 insertions(+), 129 deletions(-) diff --git a/po/ru.po b/po/ru.po index d06aeb4a..cb95271a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-07 14:12+0800\n" -"PO-Revision-Date: 2009-03-07 14:31+0800\n" +"POT-Creation-Date: 2009-03-15 11:13+0800\n" +"PO-Revision-Date: 2009-03-15 11:36+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -218,13 +218,13 @@ msgid "_Ignore" msgstr "_Игнорировать" #: ../midori/midori-browser.c:277 -#: ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3062 msgid "Reload the current page" msgstr "Обновить страницу" #: ../midori/midori-browser.c:288 -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:3059 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" @@ -285,445 +285,445 @@ msgstr "Сохранить файл как" msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2634 +#: ../midori/midori-browser.c:2635 #: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:2641 +#: ../midori/midori-browser.c:2642 #: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2644 +#: ../midori/midori-browser.c:2645 #: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:2795 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:2803 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:2990 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:2993 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:2996 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:2999 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3002 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3004 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3005 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3007 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3008 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3011 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3014 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3016 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3019 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3021 -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3022 +#: ../midori/midori-browser.c:3025 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3028 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3031 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3034 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3037 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3039 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3040 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3042 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3043 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3045 -msgid "_Quick Find" -msgstr "_Быстрый Поиск" - #: ../midori/midori-browser.c:3046 +msgid "_Quick Find" +msgstr "_Быстрый поиск" + +#: ../midori/midori-browser.c:3047 msgid "Quickly jump to a word or phrase" msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3050 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3052 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3053 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3065 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3068 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3071 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3072 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3074 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3077 #: ../midori/midori-websettings.c:194 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3080 #: ../midori/midori-websettings.c:195 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3083 #: ../midori/midori-websettings.c:196 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:3086 #: ../midori/midori-websettings.c:197 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:3089 #: ../midori/midori-websettings.c:198 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 +#: ../midori/midori-browser.c:3092 #: ../midori/midori-websettings.c:199 #: ../midori/midori-websettings.c:271 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3095 #: ../midori/midori-view.c:1073 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3096 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3098 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3099 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3103 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3105 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3108 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3111 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3114 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3116 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3117 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3119 #: ../midori/midori-view.c:1045 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3120 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3124 #: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3125 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3127 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3128 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3132 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3133 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3135 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3136 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3138 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3140 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3141 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3143 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3144 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3146 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3147 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3150 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3156 -msgid "P_rivate Browsing" -msgstr "Кон)фиденциальный режим" - #: ../midori/midori-browser.c:3157 +msgid "P_rivate Browsing" +msgstr "Кон_фиденциальный режим" + +#: ../midori/midori-browser.c:3158 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3163 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3164 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3167 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3168 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3171 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3172 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3175 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3176 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3179 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3180 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3183 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3184 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3617 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3624 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3626 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3650 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3652 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3671 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3684 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3686 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3684 +#: ../midori/midori-browser.c:3699 #: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3701 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3714 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3716 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:3879 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:3904 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:3909 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3914 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:3922 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:3932 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4226 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -791,11 +791,11 @@ msgstr "Значки и текст горизонтально" #: ../midori/midori-websettings.c:250 msgid "All cookies" -msgstr "Все куки" +msgstr "Все" #: ../midori/midori-websettings.c:251 msgid "Session cookies" -msgstr "Куки сессии" +msgstr "С информацией о сеансе" #: ../midori/midori-websettings.c:252 #: ../panels/midori-addons.c:96 @@ -1077,27 +1077,27 @@ msgstr "По мере ввода текста на странице будет #: ../midori/midori-websettings.c:723 msgid "Accept cookies" -msgstr "Разрешить куки" +msgstr "Принимать фрагменты данных" #: ../midori/midori-websettings.c:724 msgid "What type of cookies to accept" -msgstr "Тип принимаемых куки" +msgstr "Разрешённый тип фрагментов данных" #: ../midori/midori-websettings.c:737 msgid "Original cookies only" -msgstr "Только оригинальные куки" +msgstr "Только оригинальные фрагменты данных" #: ../midori/midori-websettings.c:738 msgid "Accept cookies from the original website only" -msgstr "Принимать куки только с оригинального веб-сайта" +msgstr "Принимать фрагменты данных только с оригинального сайта" #: ../midori/midori-websettings.c:746 msgid "Maximum cookie age" -msgstr "Максимальный возраст куки" +msgstr "Хранить фрагменты данных" #: ../midori/midori-websettings.c:747 msgid "The maximum number of days to save cookies for" -msgstr "Максимальное число дней хранения куки" +msgstr "Максимальное число дней хранения фрагментов данных" #: ../midori/midori-websettings.c:757 msgid "Remember last visited pages" @@ -1154,7 +1154,7 @@ msgstr "Представляться как" #: ../midori/midori-websettings.c:837 msgid "What to identify as to web pages" -msgstr "Строка, которая будет посылаться на запросы идентификации браузера" +msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" #: ../midori/midori-websettings.c:857 msgid "Identification string" @@ -1162,7 +1162,7 @@ msgstr "Строка идентификации" #: ../midori/midori-websettings.c:858 msgid "The application identification string" -msgstr "Строка идентификатора приложения" +msgstr "Строка идентификации приложения" #: ../midori/midori-websettings.c:870 msgid "Cache size" @@ -1381,7 +1381,7 @@ msgstr "Конфиденциальность" #: ../midori/midori-preferences.c:641 msgid "Web Cookies" -msgstr "Разрешить куки" +msgstr "Фрагменты данных" #: ../midori/midori-preferences.c:654 #: ../midori/midori-preferences.c:668 @@ -1394,7 +1394,7 @@ msgid "History" msgstr "Журнал" #: ../midori/midori-searchaction.c:455 -#: ../katze/katze-arrayaction.c:279 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Очистить" @@ -1511,11 +1511,21 @@ msgstr "Стили пользователя" msgid "_Enable" msgstr "_Включить" -#: ../panels/midori-addons.c:1014 -#: ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1006 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Включить" + +#: ../panels/midori-addons.c:1015 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Отключить" +#: ../panels/midori-addons.c:1016 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Отключить" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Закладки" From cea8294a18ec822f25fac20aa6dc0421ff4025a6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 15 Mar 2009 18:44:16 +0100 Subject: [PATCH 0864/2970] Enclose MIME type in single quotes in the error message --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5c903741..7ca5bef6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1689,7 +1689,7 @@ midori_view_set_uri (MidoriView* view, "

%s

" "" - "

The document %s of type %s cannot be displayed." + "

The document %s of type '%s' cannot be displayed." "", title, title, view->uri, view->mime_type); g_free (title); From 5d41589437c92699d83dee01f5ce381deccb4d06 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 01:18:22 +0100 Subject: [PATCH 0865/2970] Bump requirements to WebKitGTK+, Glib 2.16 and libsoup 2.25.2 --- README | 4 ++-- wscript | 47 ++++------------------------------------------- 2 files changed, 6 insertions(+), 45 deletions(-) diff --git a/README b/README index ab012d38..fab2dc01 100644 --- a/README +++ b/README @@ -11,9 +11,9 @@ Midori is a lightweight web browser. * Customizable and extensible interface. * Extensions written in C. -Requirements: GTK+ 2.10, WebkitGtk, libXML2 +Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2 -Optional: Unique 0.9, libsoup 2.23.1, libidn, sqlite 3.0, docutils, xdg-open +Optional: Unique 0.9, libidn, sqlite 3.0, docutils For installation instructions read INSTALL. diff --git a/wscript b/wscript index f3c23463..9c835a71 100644 --- a/wscript +++ b/wscript @@ -121,18 +121,6 @@ def configure (conf): unique = 'no ' conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes']) - if option_enabled ('libsoup'): - check_pkg ('libsoup-2.4', '2.23.1', False) - check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2') - libsoup = ['N/A','yes'][conf.env['HAVE_LIBSOUP'] == 1] - libsoup_25_2 = ['N/A','yes'][conf.env['HAVE_LIBSOUP_2_25_2'] == 1] - else: - option_checkfatal ('libsoup', 'libsoup') - libsoup = 'no ' - libsoup_25_2 = 'no ' - conf.define ('HAVE_LIBSOUP', [0,1][libsoup == 'yes']) - conf.define ('HAVE_LIBSOUP_2_25_2', [0,1][libsoup_25_2 == 'yes']) - if option_enabled ('libidn'): check_pkg ('libidn', '1.0', False) libidn = ['N/A','yes'][conf.env['HAVE_LIBIDN'] == 1] @@ -152,9 +140,11 @@ def configure (conf): conf.check (lib='m', mandatory=True) check_pkg ('gmodule-2.0', '2.8.0', False) check_pkg ('gthread-2.0', '2.8.0', False) - check_pkg ('gio-2.0', '2.16.0', False) + check_pkg ('gio-2.0', '2.16.0') check_pkg ('gtk+-2.0', '2.10.0', var='GTK') - check_pkg ('webkit-1.0', '0.1') + check_pkg ('webkit-1.0', '1.1.1') + check_pkg ('libsoup-2.4', '2.25.2') + conf.define ('HAVE_LIBSOUP_2_25_2', 1) check_pkg ('libxml-2.0', '2.6') if option_enabled ('hildon'): @@ -228,34 +218,6 @@ def configure (conf): if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') Utils.pprint ('RED', 'Please use an older or newer version.') - libsoup_version = conf.check_cfg (modversion='libsoup-2.4') - Utils.pprint ('WHITE', 'Icons, Source, Save: ' + libsoup + ' (libSoup', sep='') - if (libsoup == 'yes'): - Utils.pprint ('GREEN', libsoup_version, sep='') - else: - Utils.pprint ('RED', '2.23.1', sep='') - print ")" - Utils.pprint ('WHITE', 'Persistent cookies: ' + libsoup_25_2 + ' (libSoup', sep='') - if (libsoup_25_2 == 'yes'): - Utils.pprint ('GREEN', libsoup_version, sep='') - else: - Utils.pprint ('RED', '2.25.2', sep='') - print ")" - # if 'soup-2.4' in conf.env['LIB_WEBKIT']: - webkit_binary = conf.env.get_flat ('LIBPATH_WEBKIT') + '/libwebkit-1.0.so' - try: - ldd = Utils.cmd_output (['ldd', webkit_binary], silent=True) - if ldd != '': - found = False - for library in ldd.split ('\n'): - if library[:8] == '\tlibsoup': - found = True - if found: - Utils.pprint ('GREEN', 'WebKit was built with libsoup') - else: - Utils.pprint ('RED', 'WebKit was NOT built with libsoup') - except: - pass print "IDN support: " + libidn + " (libidn)" print "Persistent history: " + sqlite + " (sqlite3)" print "Maemo integration: " + hildon + " (hildon)" @@ -295,7 +257,6 @@ def set_options (opt): group = opt.add_option_group ('Optional features', '') add_enable_option ('unique', 'single instance support', group) - add_enable_option ('libsoup', 'icon and view source support', group) add_enable_option ('libidn', 'international domain name support', group) add_enable_option ('sqlite', 'history database support', group) add_enable_option ('addons', 'building of extensions', group) From 13dc1502c82e8148f9fc27b701c02cab44fffb96 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 01:21:59 +0100 Subject: [PATCH 0866/2970] Use gtk_show_uri, GIO or Exo to open email adresses --- midori/compat.c | 17 ++++++++++++++++- midori/compat.h | 23 ++++++++++++++--------- midori/midori-browser.c | 10 +++++++--- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index 253d93ed..b3be7e89 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -31,6 +31,21 @@ g_strcmp0 (const gchar* string1, #endif +#if !GTK_CHECK_VERSION (2, 14, 0) + +gboolean +gtk_show_uri (GdkScreen* screen, + const gchar* uri, + guint32 timestamp, + GError** error) +{ + g_return_val_if_fail (uri != NULL, FALSE); + + return g_app_info_launch_default_for_uri (uri, NULL, NULL); +} + +#endif + #if !GTK_CHECK_VERSION(2, 12, 0) void diff --git a/midori/compat.h b/midori/compat.h index 261a2a7a..2cd58882 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,20 +16,15 @@ #include #endif -#include +#include + +G_BEGIN_DECLS #if !GLIB_CHECK_VERSION (2, 14, 0) #define G_PARAM_STATIC_STRINGS \ (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) #endif -#if GLIB_CHECK_VERSION (2, 16, 0) - #include -#endif -#include - -G_BEGIN_DECLS - #if !GLIB_CHECK_VERSION (2, 16, 0) gint @@ -38,6 +33,16 @@ g_strcmp0 (const gchar* string1, #endif +#if !GTK_CHECK_VERSION (2, 14, 0) + +gboolean +gtk_show_uri (GdkScreen* screen, + const gchar* uri, + guint32 timestamp, + GError** error); + +#endif + #if !GTK_CHECK_VERSION(2, 12, 0) void diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1b13ee37..05d367bb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2777,9 +2777,13 @@ _action_about_activate_email (GtkAboutDialog* about, const gchar* uri, gpointer user_data) { - gchar* command = g_strconcat ("xdg-open ", uri, NULL); - g_spawn_command_line_async (command, NULL); - g_free (command); + if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL)) + { + /* Fallback to Exo for example if GConf isn't setup */ + gchar* command = g_strconcat ("exo-open ", uri, NULL); + g_spawn_command_line_async (command, NULL); + g_free (command); + } } static void From 8e7c44548243ef514c8a5b1cae2ec43efcf251f1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 01:26:52 +0100 Subject: [PATCH 0867/2970] Drop Glib < 2.16 and WebKitGTK+ < 1.1.1 compat functions --- midori/compat.c | 49 ------------------------------------------------- midori/compat.h | 31 ------------------------------- 2 files changed, 80 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index b3be7e89..6e858f55 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -13,24 +13,6 @@ #include -#if !GLIB_CHECK_VERSION(2, 16, 0) - -/* Glib string function - Copyright (C) 2008 Tim Janik - Copied from Glib 2.16, coding style adjusted */ -gint -g_strcmp0 (const gchar* string1, - const gchar* string2) -{ - if (!string1) - return -(string1 != string2); - if (!string2) - return string1 != string2; - return strcmp (string1, string2); -} - -#endif - #if !GTK_CHECK_VERSION (2, 14, 0) gboolean @@ -80,34 +62,3 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, } #endif - -#ifndef WEBKIT_CHECK_VERSION - -gfloat -webkit_web_view_get_zoom_level (WebKitWebView* web_view) -{ - g_return_val_if_fail (WEBKIT_IS_WEB_VIEW (web_view), 1.0); - - return 1.0f; -} - -void -webkit_web_view_set_zoom_level (WebKitWebView* web_view, - gfloat zoom_level) -{ - g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); -} - -void -webkit_web_view_zoom_in (WebKitWebView* web_view) -{ - g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); -} - -void -webkit_web_view_zoom_out (WebKitWebView* web_view) -{ - g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); -} - -#endif diff --git a/midori/compat.h b/midori/compat.h index 2cd58882..b7df7047 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -25,14 +25,6 @@ G_BEGIN_DECLS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) #endif -#if !GLIB_CHECK_VERSION (2, 16, 0) - -gint -g_strcmp0 (const gchar* string1, - const gchar* string2); - -#endif - #if !GTK_CHECK_VERSION (2, 14, 0) gboolean @@ -59,29 +51,6 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, #endif -#ifndef WEBKIT_CHECK_VERSION - -#define WEBKIT_CHECK_VERSION(a,b,c) 0 - -gfloat -webkit_web_view_get_zoom_level (WebKitWebView* web_view); - -void -webkit_web_view_set_zoom_level (WebKitWebView* web_view, - gfloat zoom_level); - -void -webkit_web_view_zoom_in (WebKitWebView* web_view); - -void -webkit_web_view_zoom_out (WebKitWebView* web_view); - -#endif - -#if !WEBKIT_CHECK_VERSION (1, 1, 1) - #define webkit_web_view_reload_bypass_cache webkit_web_view_reload -#endif - G_END_DECLS #endif /* __COMPAT_H__ */ From 5eab5f5bdab0c6ddc09d7905af6aa923a5f0ab85 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 01:30:40 +0100 Subject: [PATCH 0868/2970] Drop Glib version guards from unit tests --- tests/bookmarks.c | 4 ---- tests/browser.c | 4 ---- tests/completion.c | 4 ---- tests/extensions.c | 4 ---- tests/properties.c | 4 ---- 5 files changed, 20 deletions(-) diff --git a/tests/bookmarks.c b/tests/bookmarks.c index 8f759cd0..b27138cf 100644 --- a/tests/bookmarks.c +++ b/tests/bookmarks.c @@ -16,8 +16,6 @@ #include "midori.h" #include "midori-bookmarks.h" -#if GLIB_CHECK_VERSION(2, 16, 0) - static void bookmarks_panel_create (void) { @@ -157,5 +155,3 @@ main (int argc, return g_test_run (); } - -#endif diff --git a/tests/browser.c b/tests/browser.c index 63e3fa11..f6b3ee37 100644 --- a/tests/browser.c +++ b/tests/browser.c @@ -17,8 +17,6 @@ #include "midori-stock.h" #include "sokoke.h" -#if GLIB_CHECK_VERSION (2, 16, 0) - static void browser_create (void) { @@ -62,5 +60,3 @@ main (int argc, return g_test_run (); } - -#endif diff --git a/tests/completion.c b/tests/completion.c index e6ee0768..c99edeac 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -15,8 +15,6 @@ #include "midori.h" -#if GLIB_CHECK_VERSION(2, 16, 0) - typedef struct { const gchar* uri; @@ -293,5 +291,3 @@ main (int argc, return g_test_run (); } - -#endif diff --git a/tests/extensions.c b/tests/extensions.c index 69638fbd..edc87492 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -15,8 +15,6 @@ #include "midori.h" -#if GLIB_CHECK_VERSION(2, 16, 0) - const gpointer magic = (gpointer)0xdeadbeef; static void @@ -137,5 +135,3 @@ main (int argc, return g_test_run (); } - -#endif diff --git a/tests/properties.c b/tests/properties.c index 0c163957..cdcacd60 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -17,8 +17,6 @@ #include "midori-bookmarks.h" #include "sokoke.h" -#if GLIB_CHECK_VERSION(2, 16, 0) - #define pspec_is_writable(pspec) (pspec->flags & G_PARAM_WRITABLE \ && !(pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) @@ -185,5 +183,3 @@ main (int argc, return g_test_run (); } - -#endif From b40c7b0f87b40371ad5972fb64456787b46a7c3a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 01:54:22 +0100 Subject: [PATCH 0869/2970] Drop compile time and runtime conditionals for libSoup and WebKit --- midori/midori-view.c | 75 ++++++++------------------------------------ 1 file changed, 13 insertions(+), 62 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7ca5bef6..57ac1c9b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -1129,16 +1129,14 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, } static gboolean -webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, - WebKitWebFrame* web_frame, - gpointer request, - const gchar* mime_type, - gpointer decision, - MidoriView* view) +webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + WebKitNetworkRequest* request, + const gchar* mime_type, + WebKitWebPolicyDecision* decision, + MidoriView* view) { - #if WEBKIT_CHECK_VERSION (1, 0, 0) gchar* uri; - #endif if (web_frame != webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) return FALSE; @@ -1150,23 +1148,13 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, /* TODO: Display contents with a Viewable if WebKit can't do it */ /* TODO: Offer downloading file if it cannot be displayed at all */ - #if WEBKIT_CHECK_VERSION (1, 1, 0) if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) - #else - if (g_str_has_prefix (mime_type, "image/") || - g_strrstr (mime_type, "script") || - g_str_has_prefix (mime_type, "text/") || g_strrstr (mime_type, "xml")) - #endif return FALSE; - #if WEBKIT_CHECK_VERSION (1, 0, 0) uri = g_strdup_printf ("error:nodisplay %s", webkit_network_request_get_uri (request)); midori_view_set_uri (view, uri); g_free (uri); - #else - midori_view_set_uri (view, "error:nodisplay "); - #endif return TRUE; } @@ -1553,11 +1541,6 @@ midori_view_construct_web_view (MidoriView* view) gpointer inspector; view->web_view = webkit_web_view_new (); - if (g_object_class_find_property (G_OBJECT_GET_CLASS (view->web_view), "session")) - #if HAVE_LIBSOUP - g_object_set (view->web_view, "session", - katze_net_get_session (view->net), NULL); - #endif /* Load something to avoid a bug where WebKit might not set a main frame */ webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), ""); @@ -1590,14 +1573,8 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_console_message_cb, view, "signal::window-object-cleared", webkit_web_view_window_object_cleared_cb, view, - NULL); - if (g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW)) - g_object_connect (view->web_view, "signal::create-web-view", webkit_web_view_create_web_view_cb, view, - NULL); - if (g_signal_lookup ("mime-type-policy-decision-requested", WEBKIT_TYPE_WEB_VIEW)) - g_object_connect (view->web_view, "signal::mime-type-policy-decision-requested", webkit_web_view_mime_type_decision_cb, view, NULL); @@ -1608,24 +1585,17 @@ midori_view_construct_web_view (MidoriView* view) if (view->settings) { - g_object_set (view->web_view, "settings", view->settings, NULL); - if (katze_object_has_property (view->web_view, "full-content-zoom")) - g_object_set (view->web_view, "full-content-zoom", - katze_object_get_boolean (view->settings, - "zoom-text-and-images"), NULL); + g_object_set (view->web_view, "settings", view->settings, + "full-content-zoom", katze_object_get_boolean (view->settings, + "zoom-text-and-images"), NULL); } gtk_widget_show (view->web_view); gtk_container_add (GTK_CONTAINER (view), view->web_view); - if (katze_object_has_property (view->web_view, "web-inspector")) - { - inspector = katze_object_get_object (view->web_view, "web-inspector"); - g_object_connect (inspector, - "signal::inspect-web-view", - webkit_web_inspector_inspect_web_view_cb, view, - NULL); - } + inspector = katze_object_get_object (view->web_view, "web-inspector"); + g_object_connect (inspector, "signal::inspect-web-view", + webkit_web_inspector_inspect_web_view_cb, view, NULL); } /** @@ -2276,11 +2246,7 @@ midori_view_can_zoom_in (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - #if WEBKIT_CHECK_VERSION (1, 0, 1) return view->web_view != NULL; - #else - return FALSE; - #endif } gboolean @@ -2288,11 +2254,7 @@ midori_view_can_zoom_out (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - #if WEBKIT_CHECK_VERSION (1, 0, 1) return view->web_view != NULL; - #else - return FALSE; - #endif } gboolean @@ -2307,10 +2269,8 @@ midori_view_can_view_source (MidoriView* view) && !g_strrstr (view->mime_type, "xml")) return FALSE; - #if HAVE_LIBSOUP if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) return TRUE; - #endif if (g_str_has_prefix (uri, "file://")) return TRUE; return FALSE; @@ -2437,13 +2397,8 @@ midori_view_print (MidoriView* view) { g_return_if_fail (MIDORI_IS_VIEW (view)); - #if WEBKIT_CHECK_VERSION (1, 0, 1) webkit_web_frame_print (webkit_web_view_get_main_frame ( WEBKIT_WEB_VIEW (view->web_view))); - #else - webkit_web_view_execute_script ( - WEBKIT_WEB_VIEW (view->web_view), "print();"); - #endif } /** @@ -2535,9 +2490,7 @@ midori_view_execute_script (MidoriView* view, { WebKitWebFrame* web_frame; JSContextRef js_context; - #if HAVE_LIBSOUP gchar* script_decoded; - #endif g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); g_return_val_if_fail (script != NULL, FALSE); @@ -2545,7 +2498,6 @@ midori_view_execute_script (MidoriView* view, /* FIXME Actually store exception. */ web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); - #if HAVE_LIBSOUP if ((script_decoded = soup_uri_decode (script))) { webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), @@ -2553,7 +2505,6 @@ midori_view_execute_script (MidoriView* view, g_free (script_decoded); } else - #endif webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), script); return TRUE; } From 424cca0b6668cf66af6be53a38d2d91eed727ad7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 02:05:45 +0100 Subject: [PATCH 0870/2970] Drop WebKit and libSoup version conditionals in WebSettings --- midori/midori-websettings.c | 88 +++++++------------------------------ 1 file changed, 15 insertions(+), 73 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 49723d1a..ddc8cee2 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -593,8 +593,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open new pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, - (g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW) - ? G_PARAM_READWRITE : G_PARAM_READABLE) | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_OPEN_EXTERNAL_PAGES_IN, @@ -647,58 +646,21 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - if (!g_object_class_find_property (gobject_class, "enforce-96-dpi")) /** - * MidoriWebSettings:enforce-96-dpi: - * - * Whether to enforce a resolution of 96 DPI. - * - * Since: 0.1.2 - */ - g_object_class_install_property (gobject_class, - PROP_ENFORCE_96_DPI, - g_param_spec_boolean ( - "enforce-96-dpi", - "Enforce 96 DPI", - "Whether to enforce a resolution of 96 DPI", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - - if (!g_object_class_find_property (gobject_class, "enable-developer-extras")) - /** - * MidoriWebSettings:enable-developer-extras: - * - * Whether to enable extra developer tools. - * - * Since: 0.1.2 - */ - g_object_class_install_property (gobject_class, - PROP_ENABLE_DEVELOPER_EXTRAS, - g_param_spec_boolean ( - "enable-developer-extras", - "Enable Developer Extras", - "Whether to enable extra developer tools", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - - if (!g_object_class_find_property (gobject_class, "zoom-text-and-images")) - /** - * MidoriWebSettings:zoom-text-and-images: - * - * Whether to zoom text and images. - * - * Since: 0.1.3 - */ - g_object_class_install_property (gobject_class, - PROP_ZOOM_TEXT_AND_IMAGES, - g_param_spec_boolean ( - "zoom-text-and-images", - _("Zoom Text and Images"), - _("Whether to zoom text and images"), - FALSE, - (g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW), - "full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE) - | G_PARAM_STATIC_STRINGS)); + * MidoriWebSettings:zoom-text-and-images: + * + * Whether to zoom text and images. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_ZOOM_TEXT_AND_IMAGES, + g_param_spec_boolean ( + "zoom-text-and-images", + _("Zoom Text and Images"), + _("Whether to zoom text and images"), + FALSE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * MidoriWebSettings:find-while-typing: @@ -724,11 +686,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("What type of cookies to accept"), MIDORI_TYPE_ACCEPT_COOKIES, MIDORI_ACCEPT_COOKIES_ALL, - #if HAVE_LIBSOUP G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif g_object_class_install_property (gobject_class, PROP_ORIGINAL_COOKIES_ONLY, @@ -795,11 +753,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Proxy Server"), _("The proxy server used for HTTP connections"), NULL, - #if HAVE_LIBSOUP G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif /** * MidoriWebSettings:auto-detect-proxy: @@ -815,11 +769,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Detect proxy server automatically"), _("Whether to detect the proxy server automatically from the environment"), TRUE, - #if HAVE_LIBSOUP G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif /** * MidoriWebSettings:identify-as: @@ -837,11 +787,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("What to identify as to web pages"), MIDORI_TYPE_IDENTITY, MIDORI_IDENT_MIDORI, - #if HAVE_LIBSOUP G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif /** * MidoriWebSettings:ident-string: @@ -857,11 +803,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Identification string"), _("The application identification string"), NULL, - #if HAVE_LIBSOUP G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - #else - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - #endif g_object_class_install_property (gobject_class, PROP_CACHE_SIZE, From d30c2aa62d8513bacf1fbaa33268eca9335002fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 02:13:35 +0100 Subject: [PATCH 0871/2970] Drop soup session hijacking --- midori/main.c | 71 ++------------------------------------------------- 1 file changed, 2 insertions(+), 69 deletions(-) diff --git a/midori/main.c b/midori/main.c index b5849c1c..b063b747 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan Copyright (C) 2008 Dale Whittaker This library is free software; you can redistribute it and/or @@ -42,8 +42,7 @@ #include #include #include -#include -#include +#include #if HAVE_LIBXML #include @@ -54,10 +53,6 @@ #include #endif -#if HAVE_LIBSOUP - #include -#endif - #if ENABLE_NLS #include #include @@ -1277,9 +1272,6 @@ midori_browser_weak_notify_cb (MidoriBrowser* browser, G_CALLBACK (midori_browser_session_cb), session, NULL); } -#if HAVE_LIBSOUP -typedef void (*GObjectConstructed) (GObject*); - static void soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -1352,30 +1344,6 @@ midori_soup_session_prepare (SoupSession* session, soup_session_add_feature (session, feature); } -#if !WEBKIT_CHECK_VERSION (1, 1, 1) -/* The following code hooks up to any created soup session in order to - modify preferences. This is *not* a generally advisable technique - but merely a preliminary workaround until WebKit exposes its session. */ -static GObjectConstructed old_session_constructed_cb; -static void -soup_session_constructed_cb (GObject* object) -{ - MidoriApp* app; - MidoriWebSettings* settings; - SoupSession* session; - - if (old_session_constructed_cb) - old_session_constructed_cb (object); - app = g_type_get_qdata (SOUP_TYPE_SESSION, - g_quark_from_static_string ("midori-app")); - settings = katze_object_get_object (app, "settings"); - session = SOUP_SESSION (object); - - midori_soup_session_prepare (session, settings); -} -#endif -#endif - static void button_modify_preferences_clicked_cb (GtkWidget* button, MidoriWebSettings* settings) @@ -1618,11 +1586,7 @@ midori_run_script (const gchar* filename) gchar* script; GError* error = NULL; - #if WEBKIT_CHECK_VERSION (1, 0, 3) js_context = JSGlobalContextCreateInGroup (NULL, NULL); - #else - js_context = JSGlobalContextCreate (NULL); - #endif if (g_file_get_contents (filename, &script, NULL, &error)) { @@ -1679,16 +1643,9 @@ main (int argc, gchar* uri; KatzeItem* item; gchar* uri_ready; - #if HAVE_LIBSOUP - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - GObjectClass* webkit_class; - #endif KatzeNet* net; SoupSession* s_session; - #endif - #if HAVE_LIBSOUP_2_25_2 SoupCookieJar* jar; - #endif #if HAVE_SQLITE sqlite3* db; gint max_history_age; @@ -1769,26 +1726,6 @@ main (int argc, return 1; } - #if HAVE_LIBSOUP - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); - if (!g_object_class_find_property (webkit_class, "session")) - { - /* This is a nasty trick that allows us to manipulate preferences - even without having a pointer to the session. */ - soup_session_get_type (); - SoupSessionClass* session_class = g_type_class_ref (SOUP_TYPE_SESSION); - if (session_class) - { - g_type_set_qdata (SOUP_TYPE_SESSION, - g_quark_from_static_string ("midori-app"), app); - old_session_constructed_cb = G_OBJECT_CLASS (session_class)->constructed; - G_OBJECT_CLASS (session_class)->constructed = soup_session_constructed_cb; - } - } - #endif - #endif - /* Load configuration files */ error_messages = g_string_new (NULL); config_file = build_config_filename ("config"); @@ -1932,14 +1869,12 @@ main (int argc, } g_string_free (error_messages, TRUE); - #if WEBKIT_CHECK_VERSION (1, 1, 1) if (1) { SoupSession* webkit_session = webkit_get_default_session (); net = katze_net_new (); s_session = katze_net_get_session (net); - #if HAVE_LIBSOUP_2_25_2 g_type_set_qdata (SOUP_TYPE_SESSION, g_quark_from_static_string ("midori-app"), app); katze_assign (config_file, build_config_filename ("cookies.txt")); @@ -1947,12 +1882,10 @@ main (int argc, soup_session_add_feature (s_session, SOUP_SESSION_FEATURE (jar)); soup_session_add_feature (webkit_session, SOUP_SESSION_FEATURE (jar)); g_object_unref (jar); - #endif midori_soup_session_prepare (s_session, settings); midori_soup_session_prepare (webkit_session, settings); g_object_unref (net); } - #endif /* Open as many tabs as we have uris, seperated by pipes */ i = 0; From a6ac02daf3afcefb2588fbcf0264a08a87d65887 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 02:20:58 +0100 Subject: [PATCH 0872/2970] Drop libSoup guards in KatzeHTTPAuth and Katze HTTPCookies --- katze/katze-http-auth.c | 9 +-------- katze/katze-http-cookies.c | 16 ++-------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/katze/katze-http-auth.c b/katze/katze-http-auth.c index 4e4cd8a1..ae7b2382 100644 --- a/katze/katze-http-auth.c +++ b/katze/katze-http-auth.c @@ -15,10 +15,7 @@ #include "katze-http-auth.h" -#if HAVE_LIBSOUP - #include -#endif - +#include #include #include @@ -32,7 +29,6 @@ struct _KatzeHttpAuthClass GObjectClass parent_class; }; -#if HAVE_LIBSOUP static void katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface, gpointer data); @@ -202,9 +198,6 @@ katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface, iface->attach = katze_http_auth_attach; iface->detach = katze_http_auth_detach; } -#else -G_DEFINE_TYPE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT) -#endif static void katze_http_auth_class_init (KatzeHttpAuthClass* class) diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c index f2b39733..e6d29d30 100644 --- a/katze/katze-http-cookies.c +++ b/katze/katze-http-cookies.c @@ -15,13 +15,10 @@ #include "katze-http-cookies.h" -#if HAVE_LIBSOUP - #include -#endif - #include -#include #include +#include +#include struct _KatzeHttpCookies { @@ -33,7 +30,6 @@ struct _KatzeHttpCookiesClass GObjectClass parent_class; }; -#if HAVE_LIBSOUP static void katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, gpointer data); @@ -42,8 +38,6 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, katze_http_cookies_session_feature_iface_init)); -#if HAVE_LIBSOUP_2_25_2 - /* Cookie jar saving to Mozilla format Copyright (C) 2008 Xan Lopez Copyright (C) 2008 Dan Winship @@ -305,20 +299,14 @@ katze_http_cookies_detach (SoupSessionFeature* feature, g_signal_handlers_disconnect_by_func (session, katze_http_cookies_session_request_queued_cb, feature); } -#endif static void katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, gpointer data) { - #if HAVE_LIBSOUP_2_25_2 iface->attach = katze_http_cookies_attach; iface->detach = katze_http_cookies_detach; - #endif } -#else -G_DEFINE_TYPE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT) -#endif static void katze_http_cookies_class_init (KatzeHttpCookiesClass* class) From ae6530c6208ab69cf6715ea1ed31c7d994ac2e78 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 23:53:51 +0100 Subject: [PATCH 0873/2970] Use Glib 2.16 unconditionally in the addons panel --- panels/midori-addons.c | 85 +----------------------------------------- 1 file changed, 1 insertion(+), 84 deletions(-) diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 2e612313..dd987e34 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -23,9 +23,7 @@ #include #include #include -#if GLIB_CHECK_VERSION (2, 16, 0) - #include -#endif +#include struct _MidoriAddons { @@ -347,7 +345,6 @@ _addons_toggle_disable_button (MidoriAddons* addons, gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive); } -#if GLIB_CHECK_VERSION (2, 16, 0) static void midori_addons_directory_monitor_changed (GFileMonitor* monitor, GFile* child, @@ -357,7 +354,6 @@ midori_addons_directory_monitor_changed (GFileMonitor* monitor, { midori_addons_update_elements (addons); } -#endif static void midori_addons_treeview_cursor_changed (GtkTreeView* treeview, @@ -432,11 +428,6 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, _addons_get_folder (addons)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - #if GLIB_CHECK_VERSION (2, 16, 0) - /* FIXME: Without GIO clicking this button is the only - way to update the list */ - midori_addons_update_elements (addons); - #endif } static void @@ -606,9 +597,6 @@ _metadata_from_file (const gchar* filename, return TRUE; } -#define HAVE_GREGEX GLIB_CHECK_VERSION (2, 14, 0) - -#if HAVE_GREGEX static gchar* _convert_to_simple_regexp (const gchar* pattern) { @@ -661,37 +649,6 @@ _convert_to_simple_regexp (const gchar* pattern) return dest; } -#else - -static bool -_match_with_wildcard (const gchar* str, - const gchar* pattern) -{ - gchar** parts; - gchar** parts_ref; - const gchar* subpart; - gchar* newsubpart; - - parts = g_strsplit (pattern, "*", 0); - parts_ref = parts; - subpart = str; - do - { - newsubpart = g_strstr_len (subpart, strlen (subpart), *parts); - if (!newsubpart) - { - g_strfreev (parts_ref); - return FALSE; - } - subpart = newsubpart + strlen (*parts); - parts++; - } - while (*parts); - g_strfreev (parts_ref); - return TRUE; -} -#endif - static gboolean _may_load_script (const gchar* uri, GSList** includes, @@ -699,12 +656,7 @@ _may_load_script (const gchar* uri, { gboolean match; GSList* list; - #if HAVE_GREGEX gchar* re; - #else - guint uri_len; - guint pattern_len; - #endif if (*includes) match = FALSE; @@ -712,12 +664,8 @@ _may_load_script (const gchar* uri, match = TRUE; list = *includes; - #if !HAVE_GREGEX - uri_len = strlen (uri); - #endif while (list) { - #if HAVE_GREGEX re = _convert_to_simple_regexp (list->data); if (g_regex_match_simple (re, uri, 0, 0)) { @@ -725,19 +673,6 @@ _may_load_script (const gchar* uri, break; } g_free (re); - #else - pattern_len = strlen (list->data); - if (!g_ascii_strncasecmp (uri, list->data, MAX (uri_len, pattern_len))) - { - match = TRUE; - break; - } - else if (_match_with_wildcard (uri, list->data)) - { - match = TRUE; - break; - } - #endif list = g_slist_next (list); } if (!match) @@ -747,7 +682,6 @@ _may_load_script (const gchar* uri, list = *excludes; while (list) { - #if HAVE_GREGEX re = _convert_to_simple_regexp (list->data); if (g_regex_match_simple (re, uri, 0, 0)) { @@ -755,19 +689,6 @@ _may_load_script (const gchar* uri, break; } g_free (re); - #else - pattern_len = strlen (list->data); - if (!g_ascii_strncasecmp (uri, list->data, MAX (uri_len, pattern_len))) - { - match = FALSE; - break; - } - else if (_match_with_wildcard (uri, list->data)) - { - match = FALSE; - break; - } - #endif list = g_slist_next (list); } return match; @@ -925,13 +846,11 @@ midori_addons_new (MidoriAddonKind kind, GtkWidget* web_widget) { MidoriAddons* addons; - #if GLIB_CHECK_VERSION (2, 16, 0) GSList* directories; GSList* list; GFile* directory; GError* error; GFileMonitor* monitor; - #endif g_return_val_if_fail (GTK_IS_WIDGET (web_widget), NULL); @@ -946,7 +865,6 @@ midori_addons_new (MidoriAddonKind kind, midori_addons_update_elements (addons); - #if GLIB_CHECK_VERSION (2, 16, 0) directories = _addons_get_directories (addons); list = directories; while (directories) @@ -967,7 +885,6 @@ midori_addons_new (MidoriAddonKind kind, G_CALLBACK (midori_addons_directory_monitor_changed), addons); } g_slist_free (list); -#endif return GTK_WIDGET (addons); } From 530542f07d1a81626d850611b3e91399bccef87b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 23:54:45 +0100 Subject: [PATCH 0874/2970] Use libSoup unconditionally in KatzeNet --- katze/katze-net.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index a40c1e3f..b6485344 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,9 +15,7 @@ #include "katze-net.h" -#if HAVE_LIBSOUP - #include -#endif +#include struct _KatzeNet { @@ -27,9 +25,7 @@ struct _KatzeNet gchar* cache_path; guint cache_size; - #if HAVE_LIBSOUP SoupSession* session; - #endif }; struct _KatzeNetClass @@ -61,20 +57,16 @@ katze_net_object_maybe_unref (gpointer object) static void katze_net_init (KatzeNet* net) { - #if HAVE_LIBSOUP static SoupSession* session = NULL; - #endif net->memory = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, katze_net_object_maybe_unref); net->cache_path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, NULL); - #if HAVE_LIBSOUP if (!session) session = soup_session_async_new (); net->session = session; - #endif } static void @@ -126,11 +118,7 @@ katze_net_get_session (KatzeNet* net) { g_return_val_if_fail (KATZE_IS_NET (net), NULL); - #if HAVE_LIBSOUP return net->session; - #else - return NULL; - #endif } typedef struct @@ -173,11 +161,7 @@ katze_net_get_cached_path (KatzeNet* net, else cache_path = net->cache_path; g_mkdir_with_parents (cache_path, 0700); - #if GLIB_CHECK_VERSION (2, 16, 0) checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); - #else - checksum = g_strdup_printf ("%u", g_str_hash (uri)); - #endif extension = g_strrstr (uri, "."); cached_filename = g_strdup_printf ("%s%s", checksum, @@ -190,7 +174,6 @@ katze_net_get_cached_path (KatzeNet* net, return cached_path; } -#if HAVE_LIBSOUP static void katze_net_got_body_cb (SoupMessage* msg, KatzeNetPriv* priv); @@ -262,7 +245,6 @@ katze_net_finished_cb (SoupMessage* msg, { katze_net_priv_free (priv); } -#endif static gboolean katze_net_local_cb (KatzeNetPriv* priv) @@ -355,9 +337,7 @@ katze_net_load_uri (KatzeNet* net, { KatzeNetRequest* request; KatzeNetPriv* priv; - #if HAVE_LIBSOUP SoupMessage* msg; - #endif g_return_if_fail (KATZE_IS_NET (net)); g_return_if_fail (uri != NULL); @@ -377,7 +357,6 @@ katze_net_load_uri (KatzeNet* net, priv->user_data = user_data; priv->request = request; - #if HAVE_LIBSOUP if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) { msg = soup_message_new ("GET", uri); @@ -392,7 +371,6 @@ katze_net_load_uri (KatzeNet* net, soup_session_queue_message (net->session, msg, NULL, NULL); return; } - #endif if (g_str_has_prefix (uri, "file://")) { From dba291d3ba6bc1457e54a8ae2029b40d2c61ffbd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Mar 2009 23:55:25 +0100 Subject: [PATCH 0875/2970] Drop WebKit/ libSoup related conditonals from preferences --- midori/midori-preferences.c | 39 ++----------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c8894832..25ae3a36 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,10 +20,7 @@ #include #include - -#if HAVE_LIBSOUP - #include -#endif +#include struct _MidoriPreferences { @@ -244,7 +241,6 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); } -#if HAVE_LIBSOUP static void midori_preferences_notify_auto_detect_proxy_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -265,7 +261,6 @@ midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, identify_as == MIDORI_IDENT_CUSTOM); } -#endif #if HAVE_OSX static void @@ -332,11 +327,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; - #if HAVE_LIBSOUP - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - GObjectClass* webkit_class; - #endif - #endif g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -583,15 +573,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ - #if HAVE_LIBSOUP - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - webkit_class = g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); - if (g_object_class_find_property (webkit_class, "session") || - /* If a cookie jar was created, WebKit is using Soup */ - g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar"))) - { - #endif PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); TABLE_NEW (5, 2); @@ -623,21 +604,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("MB")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 4, 5); - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - } - #endif - #endif /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); - #if HAVE_LIBSOUP_2_25_2 - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - if (g_object_class_find_property (webkit_class, "session") || - /* If a cookie jar was created, WebKit is using Soup */ - g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar"))) - { - #endif FRAME_NEW (_("Web Cookies")); TABLE_NEW (3, 2); label = katze_property_label (settings, "accept-cookies"); @@ -654,10 +623,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("days")), FALSE, FALSE, 0); FILLED_ADD (hbox, 1, 2, 2, 3); - #if !WEBKIT_CHECK_VERSION (1, 1, 1) - } - #endif - #endif FRAME_NEW (_("History")); TABLE_NEW (3, 2); button = katze_property_proxy (settings, "remember-last-visited-pages", NULL); From 7f207ce2c95feb02c2925418f4372e114c2d13d3 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Tue, 17 Mar 2009 21:15:53 +0100 Subject: [PATCH 0876/2970] Update Japanese translation --- po/ja.po | 613 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 340 insertions(+), 273 deletions(-) diff --git a/po/ja.po b/po/ja.po index 69bac1aa..84f84e22 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,14 +1,14 @@ # Japanese translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Masato Hashimoto 2008 +# Masato Hashimoto 2008-2009 # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.2\n" +"Project-Id-Version: Midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 11:35+0900\n" -"PO-Revision-Date: 2009-03-02 11:33+0900\n" +"POT-Creation-Date: 2009-03-16 13:26+0900\n" +"PO-Revision-Date: 2009-03-16 17:48+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,8 +20,11 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 -#: ../midori/main.c:1711 ../midori/main.c:1722 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1580 +#: ../midori/main.c:1672 +#: ../midori/main.c:1681 +#: ../midori/main.c:1692 #: ../midori/midori-websettings.c:267 msgid "Midori" msgstr "Midori" @@ -30,192 +33,200 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:106 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:157 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:168 ../midori/main.c:238 +#: ../midori/main.c:164 +#: ../midori/main.c:234 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:480 +#: ../midori/main.c:476 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:488 ../midori/main.c:497 +#: ../midori/main.c:484 +#: ../midori/main.c:493 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/main.c:519 +#: ../midori/main.c:515 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:547 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:601 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:625 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#: ../midori/main.c:648 +#: ../midori/main.c:682 +#: ../midori/main.c:698 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:878 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:906 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:939 +#: ../midori/main.c:935 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1069 ../midori/sokoke.c:617 +#: ../midori/main.c:1065 +#: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#: ../midori/main.c:1086 +#: ../midori/main.c:1113 +#: ../midori/main.c:1141 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 ../midori/main.c:1193 +#: ../midori/main.c:1165 +#: ../midori/main.c:1189 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 +#: ../midori/main.c:1220 +#: ../midori/midori-preferences.c:433 msgid "Transfers" msgstr "転送" -#: ../midori/main.c:1265 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1398 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" -"ようであれば、問題解決のために以下のオプションを試してみてください。" +#: ../midori/main.c:1377 +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1413 +#: ../midori/main.c:1392 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1417 +#: ../midori/main.c:1396 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1422 +#: ../midori/main.c:1401 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1596 +#: ../midori/main.c:1580 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1628 ../midori/gjs.c:514 +#: ../midori/main.c:1603 +#: ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1651 +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1653 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1655 +#: ../midori/main.c:1630 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1699 +#: ../midori/main.c:1669 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1723 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1772 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1832 +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1860 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1873 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1885 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1901 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:277 +#: ../midori/midori-browser.c:3060 +#: ../midori/midori-browser.c:3066 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:288 +#: ../midori/midori-browser.c:3063 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" @@ -249,11 +260,13 @@ msgstr "ブックマークの編集" msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:597 +#: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:616 +#: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "アドレス(_A):" @@ -261,7 +274,8 @@ msgstr "アドレス(_A):" msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:640 +#: ../midori/midori-browser.c:681 msgid "Toplevel folder" msgstr "トップレベルフォルダ" @@ -273,449 +287,469 @@ msgstr "名前を付けて保存" msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2635 +#: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2642 +#: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2645 +#: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:2799 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:2807 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:2994 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:2997 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3000 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3003 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3006 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3008 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3009 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3011 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3012 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3015 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3018 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3020 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3023 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3026 +#: ../midori/midori-browser.c:3029 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3032 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3035 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3038 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3041 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3043 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3044 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3046 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3047 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3050 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3051 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3054 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3056 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3057 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3069 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3072 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3075 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3076 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3078 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3081 +#: ../midori/midori-websettings.c:194 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3084 +#: ../midori/midori-websettings.c:195 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3087 +#: ../midori/midori-websettings.c:196 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3090 +#: ../midori/midori-websettings.c:197 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3093 +#: ../midori/midori-websettings.c:198 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3096 +#: ../midori/midori-websettings.c:199 #: ../midori/midori-websettings.c:271 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3099 +#: ../midori/midori-view.c:1073 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3100 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3102 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3103 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3107 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3109 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3112 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3115 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3118 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3120 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3121 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3123 +#: ../midori/midori-view.c:1045 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3124 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3128 +#: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3129 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3131 +#: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3132 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3136 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3137 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3139 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3140 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3142 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3144 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3145 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3147 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3148 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3150 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3151 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3154 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3161 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3162 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3167 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3168 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3171 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3172 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3175 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3176 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3179 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3180 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3183 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3184 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3187 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3188 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3621 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3628 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3630 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3654 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3656 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3675 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3688 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3690 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3703 +#: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3705 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3718 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3720 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:3883 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:3908 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:3913 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:3918 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:3926 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:3936 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4230 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:481 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:231 +#: ../midori/midori-websettings.c:482 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:241 +#: ../midori/midori-panel.c:242 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:177 +#: ../midori/midori-view.c:1789 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:178 +#: ../midori/midori-websettings.c:501 msgid "Homepage" msgstr "ホームページ" @@ -763,7 +797,8 @@ msgstr "すべての Cookie" msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:252 +#: ../panels/midori-addons.c:96 msgid "None" msgstr "なし" @@ -984,371 +1019,382 @@ msgstr "新しくページを開くとき" msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:602 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:603 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:616 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:617 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:625 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:626 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:634 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:635 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:643 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:644 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:660 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:661 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:676 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:677 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:685 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:686 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:695 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:696 msgid "Accept cookies from the original website only" -msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" +msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れる" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:704 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:705 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:715 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:716 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:724 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:725 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:733 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:734 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:742 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:743 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:753 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:754 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:769 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:770 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:786 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:787 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:803 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:804 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:812 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:813 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#: ../midori/midori-view.c:626 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:956 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:958 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:975 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:989 +#: ../midori/midori-view.c:985 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:993 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1015 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1024 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1491 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1664 +#: ../midori/midori-view.c:1632 msgid "Source" msgstr "ソース" -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1656 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:1672 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:94 #, c-format msgid "Preferences for %s" msgstr "%s の設定" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:408 msgid "General" msgstr "一般" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:409 msgid "Startup" msgstr "起動" +#: ../midori/midori-preferences.c:425 +msgid "Use current page as homepage" +msgstr "現在のページをホームページにします" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:469 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:470 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:472 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:478 msgid "The default font size used to display text" msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:481 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:484 msgid "The minimum font size used to display text" msgstr "文字表示で使用される最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:491 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:494 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:501 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:502 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:505 +#: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:506 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:509 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:510 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:513 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:514 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:517 msgid "Resizable text areas" msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:518 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:521 +#: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:522 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:525 +#: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:526 msgid "Enable embedded plugin objects" msgstr "組み込みプラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:529 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:530 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:533 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:534 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:546 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:547 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:556 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:595 +#: ../midori/midori-preferences.c:596 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:623 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:632 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:641 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:668 msgid "days" msgstr "日" -#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:661 +#: ../panels/midori-history.c:104 msgid "History" msgstr "履歴" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "空" @@ -1376,7 +1422,8 @@ msgstr "トークン(_T):" msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/sokoke.c:109 +#: ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" @@ -1433,37 +1480,52 @@ msgstr "閉じたタブとウィンドウ(_C)" msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:743 +#: ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s にはプロパティ '%s' はありません" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s は %s.%s に割り当てることはできません" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s にアクセスできません" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:97 +#: ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1006 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "有効" + +#: ../panels/midori-addons.c:1015 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" +#: ../panels/midori-addons.c:1016 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "無効" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "ブックマーク" @@ -1526,15 +1588,16 @@ msgstr "今日" msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "プラグイン" -#: ../katze/katze-http-auth.c:101 +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "認証が要求されました" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" @@ -1542,11 +1605,11 @@ msgstr "" "この場所を開くためにはユーザ名とパスワードが\n" "必要です:" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "ユーザ名" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "パスワード" @@ -1564,12 +1627,14 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "ファイルの選択" @@ -1586,7 +1651,8 @@ msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "ページホルダ" @@ -1601,3 +1667,4 @@ msgstr "画像" #: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "スクリプト" + From bbaa0fb9e6a5309148811d0d02896a440fa29871 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 17 Mar 2009 21:35:05 +0100 Subject: [PATCH 0877/2970] Implement source view with GIO and drop internal source view We use GIO to choose a text editor unless a text editor was specified in the Preferences. We drop our internal source view now which used to serve as a fallback. --- midori/midori-browser.c | 75 ++++++++++++++-------- midori/midori-source.c | 136 ---------------------------------------- midori/midori-source.h | 47 -------------- midori/midori-view.c | 32 +--------- midori/midori.h | 3 +- tests/properties.c | 2 - 6 files changed, 54 insertions(+), 241 deletions(-) delete mode 100644 midori/midori-source.c delete mode 100644 midori/midori-source.h diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 05d367bb..647542ea 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -17,7 +17,6 @@ #include "midori-browser.h" #include "midori-view.h" -#include "midori-source.h" #include "midori-preferences.h" #include "midori-panel.h" #include "midori-locationaction.h" @@ -2185,6 +2184,8 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, { if ((fp = fdopen (fd, "w"))) { + gboolean success; + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); if ((ret - request->length) != 0) @@ -2195,7 +2196,15 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, } g_object_get (browser->settings, "text-editor", &text_editor, NULL); - sokoke_spawn_program (text_editor, unique_filename); + if (text_editor && *text_editor) + success = sokoke_spawn_program (text_editor, unique_filename); + else + { + gchar* command = g_strconcat ("exo-open ", unique_filename, NULL); + success = g_spawn_command_line_async (command, NULL); + g_free (command); + } + g_free (unique_filename); g_free (text_editor); } @@ -2209,11 +2218,9 @@ static void _action_source_view_activate (GtkAction* action, MidoriBrowser* browser) { - gchar* text_editor; GtkWidget* view; - GtkWidget* source_view; - gchar* uri; - gint n; + gchar* text_editor; + const gchar* uri; if (!(view = midori_browser_get_current_tab (browser))) return; @@ -2222,28 +2229,46 @@ _action_source_view_activate (GtkAction* action, g_object_get (browser->settings, "text-editor", &text_editor, NULL); else text_editor = NULL; + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); - if (text_editor && *text_editor) + if (!g_strcmp0 (text_editor, "")) { - katze_net_load_uri (browser->net, - midori_view_get_display_uri (MIDORI_VIEW (view)), NULL, - (KatzeNetTransferCb)midori_browser_source_transfer_cb, browser); - g_free (text_editor); - return; - } - else - { - uri = g_strdup_printf ("view-source:%s", - midori_view_get_display_uri (MIDORI_VIEW (view))); - source_view = midori_view_new (browser->net); - midori_view_set_settings (MIDORI_VIEW (source_view), browser->settings); - midori_view_set_uri (MIDORI_VIEW (source_view), uri); - midori_view_notify_icon_cb (MIDORI_VIEW (source_view), NULL, browser); - g_free (uri); - gtk_widget_show (source_view); - n = midori_browser_add_tab (browser, source_view); - midori_browser_set_current_page (browser, n); + GFile* file = g_file_new_for_uri (uri); + + gchar* content_type; + GAppInfo* app_info; + GList* files; + gpointer context; + + #if GLIB_CHECK_VERSION (2, 18, 0) + content_type = g_content_type_from_mime_type ("text/plain"); + #else + content_type = g_strdup ("text/plain"); + #endif + + app_info = g_app_info_get_default_for_type (content_type, + !g_str_has_prefix (uri, "file://")); + g_free (content_type); + files = g_list_prepend (NULL, file); + #if GTK_CHECK_VERSION (2, 14, 0) + context = gdk_app_launch_context_new (); + gdk_app_launch_context_set_screen (context, gtk_widget_get_screen (view)); + gdk_app_launch_context_set_timestamp (context, gtk_get_current_event_time ()); + #else + context = g_app_launch_context_new (); + #endif + if (g_app_info_launch (app_info, files, context, NULL)) + { + g_object_unref (app_info); + g_list_free (files); + g_object_unref (file); + g_free (text_editor); + return; + } } + + katze_net_load_uri (browser->net, uri, NULL, + (KatzeNetTransferCb)midori_browser_source_transfer_cb, browser); g_free (text_editor); } diff --git a/midori/midori-source.c b/midori/midori-source.c deleted file mode 100644 index c3fcef22..00000000 --- a/midori/midori-source.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - Copyright (C) 2007-2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#if HAVE_CONFIG_H - #include -#endif - -#include "midori-source.h" - -#include - -#include -#include - -struct _MidoriSource -{ - GtkTextView parent_instance; - - KatzeNet* net; -}; - -struct _MidoriSourceClass -{ - GtkTextViewClass parent_class; -}; - -G_DEFINE_TYPE (MidoriSource, midori_source, GTK_TYPE_TEXT_VIEW); - -static void -midori_source_finalize (GObject* object); - -static void -midori_source_class_init (MidoriSourceClass* class) -{ - GObjectClass* gobject_class; - - gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_source_finalize; -} - -static void -midori_source_init (MidoriSource* source) -{ - gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (source), TRUE); - - source->net = katze_net_new (); -} - -static void -midori_source_finalize (GObject* object) -{ - katze_object_assign (MIDORI_SOURCE (object)->net, NULL); - - G_OBJECT_CLASS (midori_source_parent_class)->finalize (object); -} - -/** - * midori_source_new: - * @uri: a view-source: URI - * - * Creates a new source widget. - * - * Return value: a new #MidoriSource - **/ -GtkWidget* -midori_source_new (const gchar* uri) -{ - MidoriSource* source = g_object_new (MIDORI_TYPE_SOURCE, - /*"uri", uri,*/ - NULL); - midori_source_set_uri (source, uri); - - return GTK_WIDGET (source); -} - -static void -midori_source_transfer_cb (KatzeNetRequest* request, - MidoriSource* source) -{ - gchar** mimev; - gchar* charset; - const gchar* default_charset; - gchar* contents_utf8; - GtkTextBuffer* buffer; - - if (request->data) - { - if (!g_utf8_validate (request->data, request->length, NULL)) - { - charset = NULL; - if (request->mime_type) - { - mimev = g_strsplit (request->mime_type, " ", 2); - if (mimev[0] && mimev[1] && - g_str_has_prefix (mimev[1], "charset=")) - charset = g_strdup (&mimev[1][8]); - g_strfreev (mimev); - } - g_get_charset (&default_charset); - contents_utf8 = g_convert (request->data, -1, "UTF-8", - charset ? charset : default_charset, NULL, NULL, NULL); - /* If conversion from the user's locale also failed, - try ISO-8859-1 as a last resort */ - if (!contents_utf8) - contents_utf8 = g_convert (request->data, -1, "UTF-8", - "ISO-8859-1", NULL, NULL, NULL); - } - else - contents_utf8 = (gchar*)request->data; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source)); - if (contents_utf8) - gtk_text_buffer_set_text (buffer, contents_utf8, -1); - if (contents_utf8 != request->data) - g_free (contents_utf8); - } -} - -void -midori_source_set_uri (MidoriSource* source, - const gchar* uri) -{ - g_return_if_fail (MIDORI_IS_SOURCE (source)); - g_return_if_fail (uri != NULL); - - katze_net_load_uri (source->net, uri, - NULL, (KatzeNetTransferCb)midori_source_transfer_cb, source); -} diff --git a/midori/midori-source.h b/midori/midori-source.h deleted file mode 100644 index e7b18783..00000000 --- a/midori/midori-source.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_SOURCE_H__ -#define __MIDORI_SOURCE_H__ - -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_SOURCE \ - (midori_source_get_type ()) -#define MIDORI_SOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_SOURCE, MidoriSource)) -#define MIDORI_SOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_SOURCE, MidoriSourceClass)) -#define MIDORI_IS_SOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_SOURCE)) -#define MIDORI_IS_SOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_SOURCE)) -#define MIDORI_SOURCE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_SOURCE, MidoriSourceClass)) - -typedef struct _MidoriSource MidoriSource; -typedef struct _MidoriSourceClass MidoriSourceClass; - -GType -midori_source_get_type (void); - -GtkWidget* -midori_source_new (const gchar* uri); - -void -midori_source_set_uri (MidoriSource* source, - const gchar* uri); - -G_END_DECLS - -#endif /* __MIDORI_SOURCE_H__ */ diff --git a/midori/midori-view.c b/midori/midori-view.c index 57ac1c9b..f30285d1 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -14,7 +14,6 @@ #endif #include "midori-view.h" -#include "midori-source.h" #include "midori-stock.h" #include "compat.h" @@ -1603,43 +1602,18 @@ midori_view_construct_web_view (MidoriView* view) * @view: a #MidoriView * * Opens the specified URI in the view. - * - * Pass an URI prefixed with "view-source:" in - * order to create a source view. **/ void midori_view_set_uri (MidoriView* view, const gchar* uri) { - GtkWidget* widget; gchar* data; g_return_if_fail (MIDORI_IS_VIEW (view)); if (!uri) uri = ""; - if (!view->web_view && view->uri - && g_str_has_prefix (view->uri, "view-source:")) - { - g_signal_emit (view, signals[NEW_TAB], 0, uri); - } - else if (!view->web_view && g_str_has_prefix (uri, "view-source:")) - { - katze_assign (view->uri, g_strdup (uri)); - g_object_notify (G_OBJECT (view), "uri"); - if (view->item) - katze_item_set_uri (view->item, uri); - data = g_strdup_printf ("%s - %s", _("Source"), &uri[12]); - g_object_set (view, "title", data, NULL); - g_free (data); - katze_object_assign (view->icon, - gtk_widget_render_icon (GTK_WIDGET (view), - GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU, NULL)); - widget = midori_source_new (&uri[12]); - gtk_container_add (GTK_CONTAINER (view), widget); - gtk_widget_show (widget); - } - else + if (1) { if (!view->web_view) midori_view_construct_web_view (view); @@ -2260,10 +2234,10 @@ midori_view_can_zoom_out (MidoriView* view) gboolean midori_view_can_view_source (MidoriView* view) { - g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - const gchar* uri = view->uri; + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + /* FIXME: Consider other types that are also text */ if (!g_str_has_prefix (view->mime_type, "text/") && !g_strrstr (view->mime_type, "xml")) diff --git a/midori/midori.h b/midori/midori.h index a0f50f0e..fe050e6e 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,6 @@ #include "midori-panel.h" #include "midori-preferences.h" #include "midori-searchaction.h" -#include "midori-source.h" #include "midori-stock.h" #include "midori-view.h" #include "midori-viewable.h" diff --git a/tests/properties.c b/tests/properties.c index cdcacd60..deb6266e 100644 --- a/tests/properties.c +++ b/tests/properties.c @@ -172,8 +172,6 @@ main (int argc, (gconstpointer)MIDORI_TYPE_PREFERENCES, properties_type_test); g_test_add_data_func ("/properties/search-action", (gconstpointer)MIDORI_TYPE_SEARCH_ACTION, properties_type_test); - g_test_add_data_func ("/properties/source", - (gconstpointer)MIDORI_TYPE_SOURCE, properties_type_test); g_test_add_data_func ("/properties/view", (gconstpointer)MIDORI_TYPE_VIEW, properties_type_test); g_test_add_data_func ("/properties/viewable", From b602178630e7e31fef3d0c44b54593aa8fa94798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 19 Mar 2009 18:14:04 +0100 Subject: [PATCH 0878/2970] Remove midori-view.c from POTFILES.in --- po/POTFILES.in | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5fbbe2d1..de85f098 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,6 @@ midori/midori-browser.c midori/midori-panel.c midori/midori-websettings.c midori/midori-view.c -midori/midori-source.c midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c From 7af8baee8bdd5cbfcfb24ff5e2c304c25094d385 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Mar 2009 18:28:50 +0100 Subject: [PATCH 0879/2970] Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well. --- midori/marshal.list | 1 + midori/midori-browser.c | 139 +++++++++++++++++++++++++++++++++--- midori/midori-preferences.c | 3 + midori/midori-view.c | 69 +++++++++++++++++- midori/midori-websettings.c | 22 +++++- 5 files changed, 219 insertions(+), 15 deletions(-) diff --git a/midori/marshal.list b/midori/marshal.list index c82c5639..825f9730 100644 --- a/midori/marshal.list +++ b/midori/marshal.list @@ -1,3 +1,4 @@ +BOOLEAN:OBJECT BOOLEAN:VOID VOID:BOOLEAN,STRING VOID:OBJECT,ENUM diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 647542ea..e667e7e3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -65,6 +65,7 @@ struct _MidoriBrowser gboolean find_typing; GtkWidget* statusbar; + GtkWidget* transferbar; GtkWidget* progressbar; gchar* statusbar_text; @@ -893,6 +894,117 @@ midori_view_new_view_cb (GtkWidget* view, } } +#if WEBKIT_CHECK_VERSION (1, 1, 3) +static void +midori_browser_download_notify_progress_cb (WebKitDownload* download, + GParamSpec* pspec, + GtkWidget* progress) +{ + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + webkit_download_get_progress (download)); +} + +static void +midori_browser_download_notify_status_cb (WebKitDownload* download, + GParamSpec* pspec, + GtkWidget* button) +{ + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + GtkWidget* icon; + icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), icon); + /* FIXME: Implement opening of files */ + gtk_widget_set_sensitive (button, FALSE); + break; + } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + case WEBKIT_DOWNLOAD_STATUS_ERROR: + gtk_widget_set_sensitive (button, FALSE); + break; + default: + break; + } +} + +static void +midori_browser_download_button_clicked_cb (GtkWidget* button, + WebKitDownload* download) +{ + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + webkit_download_cancel (download); + break; + default: + break; + } +} + +static void +midori_browser_add_download_item (MidoriBrowser* browser, + WebKitDownload* download) +{ + GtkWidget* box; + GtkWidget* icon; + GtkWidget* button; + GtkWidget* progress; + + box = gtk_hbox_new (FALSE, 0); + /* icon = gtk_image_new_from_stock (STOCK_TRANSFER, GTK_ICON_SIZE_MENU); + gtk_box_pack_start (GTK_BOX (box), icon, FALSE, FALSE, 0); */ + progress = gtk_progress_bar_new (); + gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), + PANGO_ELLIPSIZE_MIDDLE); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), + webkit_download_get_suggested_filename (download)); + /* Avoid a bug in WebKit */ + if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + webkit_download_get_progress (download)); + gtk_box_pack_start (GTK_BOX (box), progress, FALSE, FALSE, 0); + icon = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU); + button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + gtk_container_add (GTK_CONTAINER (button), icon); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); + gtk_widget_show_all (box); + gtk_box_pack_start (GTK_BOX (browser->transferbar), box, + FALSE, FALSE, 3); + + g_signal_connect (download, "notify::progress", + G_CALLBACK (midori_browser_download_notify_progress_cb), progress); + g_signal_connect (download, "notify::status", + G_CALLBACK (midori_browser_download_notify_status_cb), button); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_browser_download_button_clicked_cb), download); +} + +static gboolean +midori_view_download_requested_cb (GtkWidget* view, + WebKitDownload* download, + MidoriBrowser* browser) +{ + if (!webkit_download_get_destination_uri (download)) + { + gchar* folder = katze_object_get_string (browser->settings, + "download-folder"); + gchar* filename = g_build_filename (folder, + webkit_download_get_suggested_filename (download), NULL); + g_free (folder); + gchar* uri = g_filename_to_uri (filename, NULL, NULL); + g_free (filename); + webkit_download_set_destination_uri (download, uri); + g_free (uri); + } + midori_browser_add_download_item (browser, download); + return TRUE; +} +#endif + static void midori_view_search_text_cb (GtkWidget* view, gboolean found, @@ -1017,6 +1129,10 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_new_window_cb, browser, "signal::new-view", midori_view_new_view_cb, browser, + #if WEBKIT_CHECK_VERSION (1, 1, 3) + "signal::download-requested", + midori_view_download_requested_cb, browser, + #endif "signal::search-text", midori_view_search_text_cb, browser, "signal::add-bookmark", @@ -1782,9 +1898,9 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Bookmarkbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - menuitem = sokoke_action_create_popup_menu_item ( + /*menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Transferbar")); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); */ menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Statusbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -3204,10 +3320,10 @@ static const GtkToggleActionEntry toggle_entries[] = { N_("_Bookmarkbar"), "", N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate), FALSE }, - { "Transferbar", NULL, + /* { "Transferbar", NULL, N_("_Transferbar"), "", - N_("Show transferbar"), NULL/*G_CALLBACK (_action_transferbar_activate)*/, - FALSE }, + N_("Show transferbar"), G_CALLBACK (_action_transferbar_activate), + FALSE }, */ { "Statusbar", NULL, N_("_Statusbar"), "", N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate), @@ -3335,7 +3451,7 @@ static const gchar* ui_markup = "" "" "" - "" + /* "" */ "" "

" "" @@ -3636,8 +3752,6 @@ midori_browser_init (MidoriBrowser* browser) g_error_free (error); } - /* _action_set_active(browser, "Transferbar", config->toolbarTransfers); */ - /* Hide the 'Dummy' which only holds otherwise unused actions */ g_object_set (_action_by_name (browser, "Dummy"), "visible", FALSE, NULL); @@ -3797,7 +3911,8 @@ midori_browser_init (MidoriBrowser* browser) g_object_set (_action_by_name (browser, "Menubar"), "visible", FALSE, NULL); g_object_set (_action_by_name (browser, "Statusbar"), "visible", FALSE, NULL); #endif - _action_set_sensitive (browser, "Transferbar", FALSE); + /* if (!g_signal_lookup ("download-requested", WEBKIT_TYPE_WEB_VIEW)) + _action_set_sensitive (browser, "Transferbar", FALSE); */ _action_set_sensitive (browser, "EncodingCustom", FALSE); _action_set_sensitive (browser, "SelectionSourceView", FALSE); @@ -3982,12 +4097,18 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_modify_style (browser->statusbar, rcstyle); g_object_unref (rcstyle); gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); + browser->progressbar = gtk_progress_bar_new (); /* Set the progressbar's height to 1 to fit it in the statusbar */ gtk_widget_set_size_request (browser->progressbar, -1, 1); gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->progressbar, FALSE, FALSE, 3); + browser->transferbar = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->transferbar, + FALSE, FALSE, 3); + gtk_widget_show (browser->transferbar); + g_object_unref (ui_manager); } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 25ae3a36..753e3136 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -422,10 +422,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (3, 2); + #if WEBKIT_CHECK_VERSION (1, 1, 3) label = katze_property_label (settings, "download-folder"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "download-folder", "folder"); FILLED_ADD (button, 1, 2, 0, 1); + #else label = katze_property_label (settings, "download-manager"); INDENTED_ADD (label, 0, 1, 1, 2); hbox = gtk_hbox_new (FALSE, 4); @@ -440,6 +442,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_signal_connect (entry, "focus-out-event", G_CALLBACK (proxy_download_manager_icon_cb), button); FILLED_ADD (hbox, 1, 2, 1, 2); + #endif label = katze_property_label (settings, "text-editor"); INDENTED_ADD (label, 0, 1, 2, 3); hbox = gtk_hbox_new (FALSE, 4); diff --git a/midori/midori-view.c b/midori/midori-view.c index f30285d1..a7c5ff9b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -143,6 +143,7 @@ enum { NEW_TAB, NEW_WINDOW, NEW_VIEW, + DOWNLOAD_REQUESTED, SEARCH_TEXT, ADD_BOOKMARK, SAVE_AS, @@ -271,6 +272,36 @@ midori_view_class_init (MidoriViewClass* class) MIDORI_TYPE_VIEW, MIDORI_TYPE_NEW_VIEW); + /** + * MidoriView::download-requested: + * @view: the object on which the signal is emitted + * @download: a new download + * + * Emitted when a new download is requested, if a + * file cannot be displayed or a download was started + * from the context menu. + * + * If the download should be accepted, a callback + * has to return %TRUE, and the download will also + * be started automatically. + * + * Note: This requires WebKitGTK 1.1.3. + * + * Return value: %TRUE if the download was handled + * + * Since: 0.1.5 + */ + signals[DOWNLOAD_REQUESTED] = g_signal_new ( + "download-requested", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + g_signal_accumulator_true_handled, + NULL, + midori_cclosure_marshal_BOOLEAN__OBJECT, + G_TYPE_BOOLEAN, 1, + G_TYPE_OBJECT); + /** * MidoriView::search-text: * @view: the object on which the signal is emitted @@ -619,7 +650,12 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, gchar* title; gchar* data; + #if WEBKIT_CHECK_VERSION (1, 1, 3) + if (!success && webkit_web_view_can_show_mime_type ( + WEBKIT_WEB_VIEW (view->web_view), view->mime_type)) + #else if (!success) + #endif { /* i18n: The title of the 404 - Not found error page */ title = g_strdup_printf (_("Not found - %s"), view->uri); @@ -886,6 +922,7 @@ midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, g_free (uri); } +#if !WEBKIT_CHECK_VERSION (1, 1, 3) static void midori_web_view_menu_save_as_activate_cb (GtkWidget* widget, MidoriView* view) @@ -899,6 +936,7 @@ midori_web_view_menu_download_activate_cb (GtkWidget* widget, { sokoke_spawn_program (view->download_manager, view->link_uri); } +#endif static void midori_web_view_menu_add_bookmark_activate_cb (GtkWidget* widget, @@ -977,6 +1015,11 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_new_window_activate_cb), view); menuitem = (GtkWidget*)g_list_nth_data (items, 3); g_list_free (items); + #if WEBKIT_CHECK_VERSION (1, 1, 3) + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), _("_Download Link destination")); + #else /* hack to disable non-functional Download File FIXME: Make sure this really is the right menu item */ gtk_widget_hide (menuitem); @@ -998,6 +1041,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_download_activate_cb), view); gtk_widget_show (menuitem); } + #endif menuitem = gtk_image_menu_item_new_from_stock (STOCK_BOOKMARK_ADD, NULL); gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 5); g_signal_connect (menuitem, "activate", @@ -1144,12 +1188,14 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, midori_view_update_icon (view, NULL); g_object_notify (G_OBJECT (view), "mime-type"); - /* TODO: Display contents with a Viewable if WebKit can't do it */ - /* TODO: Offer downloading file if it cannot be displayed at all */ - if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) return FALSE; + #if WEBKIT_CHECK_VERSION (1, 1, 3) + webkit_web_policy_decision_download (decision); + return TRUE; + #endif + uri = g_strdup_printf ("error:nodisplay %s", webkit_network_request_get_uri (request)); midori_view_set_uri (view, uri); @@ -1158,6 +1204,18 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, return TRUE; } +#if WEBKIT_CHECK_VERSION (1, 1, 3) +static gboolean +webkit_web_view_download_requested_cb (GtkWidget* web_view, + WebKitDownload* download, + MidoriView* view) +{ + gboolean handled; + g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); + return handled; +} +#endif + static void webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* message, @@ -1576,7 +1634,12 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_create_web_view_cb, view, "signal::mime-type-policy-decision-requested", webkit_web_view_mime_type_decision_cb, view, + #if WEBKIT_CHECK_VERSION (1, 1, 3) + "signal::download-requested", + webkit_web_view_download_requested_cb, view, + #endif NULL); + g_object_connect (web_frame, "signal::load-done", webkit_web_frame_load_done_cb, view, diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index ddc8cee2..237edb9d 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -291,6 +291,18 @@ midori_web_settings_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static const gchar* +midori_get_download_dir (void) +{ + const gchar* dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD); + if (dir) + { + g_mkdir_with_parents (dir, 0700); + return dir; + } + return g_get_home_dir (); +} + static void midori_web_settings_class_init (MidoriWebSettingsClass* class) { @@ -525,8 +537,12 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) "download-folder", _("Download Folder"), _("The folder downloaded files are saved to"), - g_get_home_dir (), - G_PARAM_READABLE)); + midori_get_download_dir (), + #if WEBKIT_CHECK_VERSION (1, 1, 3) + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + #else + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + #endif g_object_class_install_property (gobject_class, PROP_DOWNLOAD_MANAGER, @@ -584,7 +600,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) TRUE, flags)); - g_type_class_ref (WEBKIT_TYPE_WEB_VIEW); g_object_class_install_property (gobject_class, PROP_OPEN_NEW_PAGES_IN, g_param_spec_enum ( @@ -845,6 +860,7 @@ notify_default_encoding_cb (GObject* object, static void midori_web_settings_init (MidoriWebSettings* web_settings) { + web_settings->download_folder = g_strdup (midori_get_download_dir ()); web_settings->http_proxy = NULL; web_settings->open_popups_in_tabs = TRUE; web_settings->remember_last_form_inputs = TRUE; From 2421a3163fe98f163497b9216d6a1a5fdb36223f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 19 Mar 2009 23:37:32 +0100 Subject: [PATCH 0880/2970] Strip selection from spaces when middle click opening It happens every so often that you quickly select an address and there's leading or trailing space you accidentally hit. So we strip the selection, otherwise such addresses don't work. --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index a7c5ff9b..36b0b64d 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -807,7 +807,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, gtk_widget_get_display (GTK_WIDGET (view)), GDK_SELECTION_PRIMARY); uri = gtk_clipboard_wait_for_text (clipboard); - if (uri && strchr (uri, '.') && !strchr (uri, ' ')) + if (uri && strchr (uri, '.') && !strchr (g_strstrip (uri), ' ')) { new_uri = sokoke_magic_uri (uri, NULL); if (event->state & GDK_CONTROL_MASK) From ffccd0c18ceed816eed47c5e4757d298b34c3d20 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Mar 2009 02:34:27 +0100 Subject: [PATCH 0881/2970] Add 'Colorful tabs' extension --- extensions/colorful-tabs.c | 144 +++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 extensions/colorful-tabs.c diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c new file mode 100644 index 00000000..bddb403b --- /dev/null +++ b/extensions/colorful-tabs.c @@ -0,0 +1,144 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +static void +colorful_tabs_button_toggled_cb (GtkWidget* button, + MidoriExtension* extension) +{ + midori_extension_set_boolean (extension, "tint", + !midori_extension_get_boolean (extension, "tint")); + /* FIXME: Update all tab colors */ +} + +static void +colorful_tabs_view_notify_uri_cb (MidoriView* view, + GParamSpec* pspec, + MidoriExtension* extension) +{ + GtkWidget* label; + SoupURI* uri; + gchar* hash; + gchar* colorstr; + GdkColor color; + + label = midori_view_get_proxy_tab_label (view); + if (!midori_extension_get_boolean (extension, "tint")) + { + gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); + return; + } + + /* Find a color that is unique to an address. We merely compute + a hash value, pick the first 6 + 1 characters and turn the + first into a hash sign, ie. #8b424b. In case a color is too + dark, we lighten it up a litte. Finally we make the event box + visible and modify its background. */ + + uri = soup_uri_new (midori_view_get_display_uri (view)); + hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, -1); + soup_uri_free (uri); + colorstr = g_strndup (hash, 6 + 1); + g_free (hash); + colorstr[0] = '#'; + gdk_color_parse (colorstr, &color); + if (color.red < 35000) + color.red += 25000 + (color.blue + 1) / 2; + if (color.green < 35000) + color.green += 25000 + (color.red + 1) / 2; + if (color.blue < 35000) + color.blue += 25000 + (color.green + 1) / 2; + gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE); + gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color); + gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, &color); +} + +static void +colorful_tabs_browser_add_tab_cb (MidoriBrowser* browser, + MidoriView* view, + MidoriExtension* extension) +{ + g_signal_connect (view, "notify::uri", + G_CALLBACK (colorful_tabs_view_notify_uri_cb), extension); +} + +static void +colorful_tabs_deactivate_cb (MidoriExtension* extension, + GtkWidget* bbox) +{ + gtk_widget_destroy (bbox); + g_signal_handlers_disconnect_by_func ( + extension, colorful_tabs_deactivate_cb, bbox); + /* FIXME: Disconnect signals */ + /* FIXME: Reset all tab colors */ +} + +static void +colorful_tabs_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + GtkWidget* statusbar; + GtkWidget* bbox; + GtkWidget* button; + + statusbar = katze_object_get_object (browser, "statusbar"); + bbox = gtk_hbox_new (FALSE, 0); + button = gtk_check_button_new_with_label (_("Tint tabs distinctly")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), + midori_extension_get_boolean (extension, "tint")); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); + gtk_widget_show (button); + gtk_widget_show (bbox); + gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); + + g_signal_connect (button, "toggled", + G_CALLBACK (colorful_tabs_button_toggled_cb), extension); + g_signal_connect (browser, "add-tab", + G_CALLBACK (colorful_tabs_browser_add_tab_cb), extension); + g_signal_connect (extension, "deactivate", + G_CALLBACK (colorful_tabs_deactivate_cb), bbox); +} + +static void +colorful_tabs_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + colorful_tabs_app_add_browser_cb (app, browser, extension); + g_signal_connect (app, "add-browser", + G_CALLBACK (colorful_tabs_app_add_browser_cb), extension); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Colorful Tabs"), + "description", _("Tint each tab distinctly"), + "version", "0.1", + "authors", "Christian Dywan ", + NULL); + midori_extension_install_boolean (extension, "tint", FALSE); + + g_signal_connect (extension, "activate", + G_CALLBACK (colorful_tabs_activate_cb), NULL); + + return extension; +} From 99fc5f2e4a65082315cf8fcffed156d433138a36 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 20 Mar 2009 23:55:38 +0100 Subject: [PATCH 0882/2970] Allow showing/ hiding the transferbar --- midori/midori-browser.c | 36 ++++++++++++++++++++++++++---------- midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e667e7e3..ffe4b3fb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -972,8 +972,7 @@ midori_browser_add_download_item (MidoriBrowser* browser, gtk_container_add (GTK_CONTAINER (button), icon); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_widget_show_all (box); - gtk_box_pack_start (GTK_BOX (browser->transferbar), box, - FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (browser->transferbar), box, FALSE, FALSE, 3); g_signal_connect (download, "notify::progress", G_CALLBACK (midori_browser_download_notify_progress_cb), progress); @@ -1898,9 +1897,9 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Bookmarkbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - /*menuitem = sokoke_action_create_popup_menu_item ( + menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Transferbar")); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); */ + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Statusbar")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -2137,6 +2136,16 @@ _action_bookmarkbar_activate (GtkToggleAction* action, sokoke_widget_set_visible (browser->bookmarkbar, active); } +static void +_action_transferbar_activate (GtkToggleAction* action, + MidoriBrowser* browser) +{ + gboolean active = gtk_toggle_action_get_active (action); + if (browser->settings) + g_object_set (browser->settings, "show-transferbar", active, NULL); + sokoke_widget_set_visible (browser->transferbar, active); +} + static void _action_statusbar_activate (GtkToggleAction* action, MidoriBrowser* browser) @@ -3320,10 +3329,10 @@ static const GtkToggleActionEntry toggle_entries[] = { N_("_Bookmarkbar"), "", N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate), FALSE }, - /* { "Transferbar", NULL, + { "Transferbar", NULL, N_("_Transferbar"), "", N_("Show transferbar"), G_CALLBACK (_action_transferbar_activate), - FALSE }, */ + FALSE }, { "Statusbar", NULL, N_("_Statusbar"), "", N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate), @@ -3451,7 +3460,7 @@ static const gchar* ui_markup = "" "" "" - /* "" */ + "" "" "" "" @@ -3911,8 +3920,9 @@ midori_browser_init (MidoriBrowser* browser) g_object_set (_action_by_name (browser, "Menubar"), "visible", FALSE, NULL); g_object_set (_action_by_name (browser, "Statusbar"), "visible", FALSE, NULL); #endif - /* if (!g_signal_lookup ("download-requested", WEBKIT_TYPE_WEB_VIEW)) - _action_set_sensitive (browser, "Transferbar", FALSE); */ + #if !WEBKIT_CHECK_VERSION (1, 1, 3) + _action_set_sensitive (browser, "Transferbar", FALSE); + #endif _action_set_sensitive (browser, "EncodingCustom", FALSE); _action_set_sensitive (browser, "SelectionSourceView", FALSE); @@ -4108,6 +4118,8 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->transferbar, FALSE, FALSE, 3); gtk_widget_show (browser->transferbar); + g_signal_connect (browser->statusbar, "button-press-event", + G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); g_object_unref (ui_manager); } @@ -4254,7 +4266,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) gboolean compact_sidepanel, right_align_sidepanel; gint last_panel_position, last_panel_page; gboolean show_menubar, show_bookmarkbar; - gboolean show_panel; + gboolean show_panel, show_transferbar; MidoriToolbarStyle toolbar_style; gchar* toolbar_items; gint last_web_search; @@ -4276,6 +4288,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-navigationbar", &browser->show_navigationbar, "show-bookmarkbar", &show_bookmarkbar, "show-panel", &show_panel, + "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, @@ -4337,6 +4350,9 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Navigationbar", browser->show_navigationbar); _action_set_active (browser, "Bookmarkbar", show_bookmarkbar); _action_set_active (browser, "Panel", show_panel); + #if WEBKIT_CHECK_VERSION (1, 1, 3) + _action_set_active (browser, "Transferbar", show_transferbar); + #endif _action_set_active (browser, "Statusbar", browser->show_statusbar); g_free (toolbar_items); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 237edb9d..0edffc45 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -36,6 +36,7 @@ struct _MidoriWebSettings gboolean show_navigationbar; gboolean show_bookmarkbar; gboolean show_panel; + gboolean show_transferbar; gboolean show_statusbar; MidoriToolbarStyle toolbar_style; @@ -103,6 +104,7 @@ enum PROP_SHOW_NAVIGATIONBAR, PROP_SHOW_BOOKMARKBAR, PROP_SHOW_PANEL, + PROP_SHOW_TRANSFERBAR, PROP_SHOW_STATUSBAR, PROP_TOOLBAR_STYLE, @@ -425,6 +427,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) FALSE, flags)); + /** + * MidoriWebSettings:show-transferbar: + * + * Whether to show the transferbar. + * + * Since: 0.1.5 + */ + g_object_class_install_property (gobject_class, + PROP_SHOW_TRANSFERBAR, + g_param_spec_boolean ( + "show-transferbar", + _("Show Transferbar"), + _("Whether to show the transferbar"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_SHOW_STATUSBAR, g_param_spec_boolean ( @@ -987,6 +1005,9 @@ midori_web_settings_set_property (GObject* object, case PROP_SHOW_PANEL: web_settings->show_panel = g_value_get_boolean (value); break; + case PROP_SHOW_TRANSFERBAR: + web_settings->show_transferbar = g_value_get_boolean (value); + break; case PROP_SHOW_STATUSBAR: web_settings->show_statusbar = g_value_get_boolean (value); break; @@ -1177,6 +1198,9 @@ midori_web_settings_get_property (GObject* object, case PROP_SHOW_PANEL: g_value_set_boolean (value, web_settings->show_panel); break; + case PROP_SHOW_TRANSFERBAR: + g_value_set_boolean (value, web_settings->show_transferbar); + break; case PROP_SHOW_STATUSBAR: g_value_set_boolean (value, web_settings->show_statusbar); break; From feed868ec22aa184f3659b14ec2ef8c82d473cf3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 00:08:22 +0100 Subject: [PATCH 0883/2970] Implement opening of downloaded files --- midori/midori-browser.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ffe4b3fb..a92278dd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -916,8 +916,6 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, GtkWidget* icon; icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); - /* FIXME: Implement opening of files */ - gtk_widget_set_sensitive (button, FALSE); break; } case WEBKIT_DOWNLOAD_STATUS_CANCELLED: @@ -938,6 +936,18 @@ midori_browser_download_button_clicked_cb (GtkWidget* button, case WEBKIT_DOWNLOAD_STATUS_STARTED: webkit_download_cancel (download); break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + const gchar* uri = webkit_download_get_destination_uri (download); + if (!gtk_show_uri (gtk_widget_get_screen (button), + uri, gtk_get_current_event_time (), NULL)) + { + gchar* command = g_strconcat ("exo-open ", uri, NULL); + g_spawn_command_line_async (command, NULL); + g_free (command); + } + break; + } default: break; } From 81717cc965c979db0ca9abed93c2dfb2fb96a0cd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 00:11:29 +0100 Subject: [PATCH 0884/2970] Remove items from the transferbar when they are opened --- midori/midori-browser.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a92278dd..acdad246 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -939,13 +939,16 @@ midori_browser_download_button_clicked_cb (GtkWidget* button, case WEBKIT_DOWNLOAD_STATUS_FINISHED: { const gchar* uri = webkit_download_get_destination_uri (download); - if (!gtk_show_uri (gtk_widget_get_screen (button), - uri, gtk_get_current_event_time (), NULL)) + gboolean success = gtk_show_uri (gtk_widget_get_screen (button), + uri, gtk_get_current_event_time (), NULL); + if (!success) { gchar* command = g_strconcat ("exo-open ", uri, NULL); - g_spawn_command_line_async (command, NULL); + success = g_spawn_command_line_async (command, NULL); g_free (command); } + if (success) + gtk_widget_destroy (gtk_widget_get_parent (button)); break; } default: From 42027c256b9f7a02ea4cc42559f1d6cd68035f44 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 00:40:03 +0100 Subject: [PATCH 0885/2970] Show a dialog before downloading asking what to do --- midori/midori-browser.c | 76 ++++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index acdad246..2af041de 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1000,20 +1000,72 @@ midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, MidoriBrowser* browser) { - if (!webkit_download_get_destination_uri (download)) + GtkWidget* dialog; + gchar* mime_type; + gchar* description; + gchar* title; + GdkScreen* screen; + GtkIconTheme* icon_theme; + + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, + _("Open or download file")); + mime_type = katze_object_get_string (view, "mime-type"); + description = g_content_type_get_description (mime_type); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("File Type: %s ('%s')"), description, mime_type); + g_free (mime_type); + g_free (description); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */ + title = g_strdup_printf (_("Open %s"), + webkit_download_get_suggested_filename (download)); + gtk_window_set_title (GTK_WINDOW (dialog), title); + g_free (title); + screen = gtk_widget_get_screen (dialog); + if (screen) { - gchar* folder = katze_object_get_string (browser->settings, - "download-folder"); - gchar* filename = g_build_filename (folder, - webkit_download_get_suggested_filename (download), NULL); - g_free (folder); - gchar* uri = g_filename_to_uri (filename, NULL, NULL); - g_free (filename); - webkit_download_set_destination_uri (download, uri); - g_free (uri); + icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, STOCK_TRANSFER)) + gtk_window_set_icon_name (GTK_WINDOW (dialog), STOCK_TRANSFER); + else + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); } - midori_browser_add_download_item (browser, download); - return TRUE; + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + GTK_STOCK_SAVE, 1, + GTK_STOCK_CANCEL, 2, + GTK_STOCK_OPEN, 3, + NULL); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), 3, FALSE); + switch (gtk_dialog_run (GTK_DIALOG (dialog))) + { + case 1: + gtk_widget_destroy (dialog); + if (!webkit_download_get_destination_uri (download)) + { + gchar* folder = katze_object_get_string (browser->settings, + "download-folder"); + gchar* filename = g_build_filename (folder, + webkit_download_get_suggested_filename (download), NULL); + g_free (folder); + gchar* uri = g_filename_to_uri (filename, NULL, NULL); + g_free (filename); + webkit_download_set_destination_uri (download, uri); + g_free (uri); + } + midori_browser_add_download_item (browser, download); + return TRUE; + case 2: + break; + case 3: + { + /* FIXME: Implement open */ + break; + } + } + + gtk_widget_destroy (dialog); + return FALSE; } #endif From 9be395fe9ea26297fa1064400eff59638d3ce66e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 10:46:25 +0100 Subject: [PATCH 0886/2970] Implement the 'open' button in the download dialog --- midori/midori-browser.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2af041de..b06a1dcb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -916,6 +916,8 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, GtkWidget* icon; icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); + if (g_object_get_data (G_OBJECT (download), "open")) + gtk_button_clicked (GTK_BUTTON (button)); break; } case WEBKIT_DOWNLOAD_STATUS_CANCELLED: @@ -1036,9 +1038,10 @@ midori_view_download_requested_cb (GtkWidget* view, GTK_STOCK_CANCEL, 2, GTK_STOCK_OPEN, 3, NULL); - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), 3, FALSE); switch (gtk_dialog_run (GTK_DIALOG (dialog))) { + case 3: + g_object_set_data (G_OBJECT (download), "open", (gpointer)1); case 1: gtk_widget_destroy (dialog); if (!webkit_download_get_destination_uri (download)) @@ -1057,11 +1060,6 @@ midori_view_download_requested_cb (GtkWidget* view, return TRUE; case 2: break; - case 3: - { - /* FIXME: Implement open */ - break; - } } gtk_widget_destroy (dialog); From 9e76f7e072f94b8eab913ff225607c1f0901610f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 15:06:57 +0100 Subject: [PATCH 0887/2970] Move download dialog to the view and don't show an error page We have to handle the dialog when the MIME type is requested, otherwise we don't know the type. Plus we stop the loading now to avoid seeing an error page. --- midori/midori-browser.c | 78 +++++++++---------------------------- midori/midori-view.c | 85 +++++++++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 73 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b06a1dcb..8b4089e6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -914,9 +914,10 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, case WEBKIT_DOWNLOAD_STATUS_FINISHED: { GtkWidget* icon; + icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); - if (g_object_get_data (G_OBJECT (download), "open")) + if (g_object_get_data (G_OBJECT (download), "open-download")) gtk_button_clicked (GTK_BUTTON (button)); break; } @@ -1002,68 +1003,23 @@ midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, MidoriBrowser* browser) { - GtkWidget* dialog; - gchar* mime_type; - gchar* description; - gchar* title; - GdkScreen* screen; - GtkIconTheme* icon_theme; - - dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("Open or download file")); - mime_type = katze_object_get_string (view, "mime-type"); - description = g_content_type_get_description (mime_type); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("File Type: %s ('%s')"), description, mime_type); - g_free (mime_type); - g_free (description); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); - /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */ - title = g_strdup_printf (_("Open %s"), - webkit_download_get_suggested_filename (download)); - gtk_window_set_title (GTK_WINDOW (dialog), title); - g_free (title); - screen = gtk_widget_get_screen (dialog); - if (screen) + if (!webkit_download_get_destination_uri (download)) { - icon_theme = gtk_icon_theme_get_for_screen (screen); - if (gtk_icon_theme_has_icon (icon_theme, STOCK_TRANSFER)) - gtk_window_set_icon_name (GTK_WINDOW (dialog), STOCK_TRANSFER); - else - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); - } - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_SAVE, 1, - GTK_STOCK_CANCEL, 2, - GTK_STOCK_OPEN, 3, - NULL); - switch (gtk_dialog_run (GTK_DIALOG (dialog))) - { - case 3: - g_object_set_data (G_OBJECT (download), "open", (gpointer)1); - case 1: - gtk_widget_destroy (dialog); - if (!webkit_download_get_destination_uri (download)) - { - gchar* folder = katze_object_get_string (browser->settings, - "download-folder"); - gchar* filename = g_build_filename (folder, - webkit_download_get_suggested_filename (download), NULL); - g_free (folder); - gchar* uri = g_filename_to_uri (filename, NULL, NULL); - g_free (filename); - webkit_download_set_destination_uri (download, uri); - g_free (uri); - } - midori_browser_add_download_item (browser, download); - return TRUE; - case 2: - break; - } + gchar* folder; + gchar* filename; + gchar* uri; - gtk_widget_destroy (dialog); - return FALSE; + folder = katze_object_get_string (browser->settings, "download-folder"); + filename = g_build_filename (folder, + webkit_download_get_suggested_filename (download), NULL); + g_free (folder); + uri = g_filename_to_uri (filename, NULL, NULL); + g_free (filename); + webkit_download_set_destination_uri (download, uri); + g_free (uri); + } + midori_browser_add_download_item (browser, download); + return TRUE; } #endif diff --git a/midori/midori-view.c b/midori/midori-view.c index 36b0b64d..93203db3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -650,12 +650,7 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, gchar* title; gchar* data; - #if WEBKIT_CHECK_VERSION (1, 1, 3) - if (!success && webkit_web_view_can_show_mime_type ( - WEBKIT_WEB_VIEW (view->web_view), view->mime_type)) - #else if (!success) - #endif { /* i18n: The title of the 404 - Not found error page */ title = g_strdup_printf (_("Not found - %s"), view->uri); @@ -1179,22 +1174,85 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, WebKitWebPolicyDecision* decision, MidoriView* view) { - gchar* uri; + #if WEBKIT_CHECK_VERSION (1, 1, 3) + GtkWidget* dialog; + gchar* content_type; + gchar* description; + gchar* title; + GdkScreen* screen; + GtkIconTheme* icon_theme; + gint response; + #endif if (web_frame != webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) return FALSE; - katze_assign (view->mime_type, g_strdup (mime_type)); - midori_view_update_icon (view, NULL); - g_object_notify (G_OBJECT (view), "mime-type"); - if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) + { + katze_assign (view->mime_type, g_strdup (mime_type)); + midori_view_update_icon (view, NULL); + g_object_notify (G_OBJECT (view), "mime-type"); return FALSE; + } #if WEBKIT_CHECK_VERSION (1, 1, 3) - webkit_web_policy_decision_download (decision); - return TRUE; + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, + _("Open or download file")); + #if GLIB_CHECK_VERSION (2, 18, 0) + content_type = g_content_type_from_mime_type (mime_type); + #else + content_type = g_strdup (mime_type); #endif + description = g_content_type_get_description (content_type); + g_free (content_type); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("File Type: %s ('%s')"), description, mime_type); + g_free (description); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */ + title = g_strdup_printf (_("Open %s"), + webkit_network_request_get_uri (request)); + gtk_window_set_title (GTK_WINDOW (dialog), title); + g_free (title); + screen = gtk_widget_get_screen (dialog); + if (screen) + { + icon_theme = gtk_icon_theme_get_for_screen (screen); + if (gtk_icon_theme_has_icon (icon_theme, STOCK_TRANSFER)) + gtk_window_set_icon_name (GTK_WINDOW (dialog), STOCK_TRANSFER); + else + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_OPEN); + } + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + GTK_STOCK_SAVE, 1, + GTK_STOCK_CANCEL, 2, + GTK_STOCK_OPEN, 3, + NULL); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + g_object_set_data (G_OBJECT (view), "open-download", (gpointer)0); + switch (response) + { + case 3: + g_object_set_data (G_OBJECT (view), "open-download", (gpointer)1); + case 1: + webkit_web_policy_decision_download (decision); + /* Apparently WebKit will continue loading which ends in an error. + It's unclear whether it's a bug or we are doing something wrong. */ + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); + return TRUE; + case 2: + default: + /* Apparently WebKit will continue loading which ends in an error. + It's unclear whether it's a bug or we are doing something wrong. */ + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (view->web_view)); + return FALSE; + } + #else + katze_assign (view->mime_type, NULL); + midori_view_update_icon (view, NULL); + g_object_notify (G_OBJECT (view), "mime-type"); uri = g_strdup_printf ("error:nodisplay %s", webkit_network_request_get_uri (request)); @@ -1202,6 +1260,7 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, g_free (uri); return TRUE; + #endif } #if WEBKIT_CHECK_VERSION (1, 1, 3) @@ -1211,6 +1270,8 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, MidoriView* view) { gboolean handled; + g_object_set_data (G_OBJECT (download), "open-download", + g_object_get_data (G_OBJECT (view), "open-download")); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); return handled; } From 863f2db6112d3a6213ae528e1ee292fcca60dbbc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 20:07:38 +0100 Subject: [PATCH 0888/2970] Always reset the flag to open the downloaded file --- midori/midori-view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 93203db3..61545321 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1272,6 +1272,7 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, gboolean handled; g_object_set_data (G_OBJECT (download), "open-download", g_object_get_data (G_OBJECT (view), "open-download")); + g_object_set_data (G_OBJECT (view), "open-download", (gpointer)0); g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled); return handled; } From e5d1f36561e6e03232c8db0b239b3a8c00e749dc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 20:08:37 +0100 Subject: [PATCH 0889/2970] Provide a Clear button for cancelled downloads --- midori/midori-browser.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8b4089e6..c8c3e15a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -909,21 +909,20 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, GParamSpec* pspec, GtkWidget* button) { + GtkWidget* icon; + switch (webkit_download_get_status (download)) { case WEBKIT_DOWNLOAD_STATUS_FINISHED: - { - GtkWidget* icon; - icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); if (g_object_get_data (G_OBJECT (download), "open-download")) gtk_button_clicked (GTK_BUTTON (button)); break; - } case WEBKIT_DOWNLOAD_STATUS_CANCELLED: case WEBKIT_DOWNLOAD_STATUS_ERROR: - gtk_widget_set_sensitive (button, FALSE); + icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), icon); break; default: break; @@ -954,6 +953,8 @@ midori_browser_download_button_clicked_cb (GtkWidget* button, gtk_widget_destroy (gtk_widget_get_parent (button)); break; } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + gtk_widget_destroy (gtk_widget_get_parent (button)); default: break; } From d9f2cf492bbd179ab2a768a5038daef12af9e46f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 21 Mar 2009 20:17:23 +0100 Subject: [PATCH 0890/2970] Reduce the width of individual download items --- midori/midori-browser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c8c3e15a..aa1b1483 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -968,6 +968,7 @@ midori_browser_add_download_item (MidoriBrowser* browser, GtkWidget* icon; GtkWidget* button; GtkWidget* progress; + gint width; box = gtk_hbox_new (FALSE, 0); /* icon = gtk_image_new_from_stock (STOCK_TRANSFER, GTK_ICON_SIZE_MENU); @@ -977,6 +978,8 @@ midori_browser_add_download_item (MidoriBrowser* browser, PANGO_ELLIPSIZE_MIDDLE); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), webkit_download_get_suggested_filename (download)); + sokoke_widget_get_text_size (progress, "M", &width, NULL); + gtk_widget_set_size_request (progress, width * 10, -1); /* Avoid a bug in WebKit */ if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), @@ -989,7 +992,7 @@ midori_browser_add_download_item (MidoriBrowser* browser, gtk_container_add (GTK_CONTAINER (button), icon); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_widget_show_all (box); - gtk_box_pack_start (GTK_BOX (browser->transferbar), box, FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (browser->transferbar), box, FALSE, FALSE, 0); g_signal_connect (download, "notify::progress", G_CALLBACK (midori_browser_download_notify_progress_cb), progress); From 50690c89e6bfca4492dc1848e53e2f8f49229d5a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 15:24:40 +0100 Subject: [PATCH 0891/2970] Add add-download signal to MidoriBrowser --- midori/midori-browser.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index aa1b1483..2b103dc1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -120,6 +120,7 @@ enum REMOVE_TAB, ACTIVATE_ACTION, CONTEXT_READY, + ADD_DOWNLOAD, QUIT, LAST_SIGNAL @@ -1007,6 +1008,7 @@ midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, MidoriBrowser* browser) { + g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download); if (!webkit_download_get_destination_uri (download)) { gchar* folder; @@ -1262,6 +1264,33 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 1, G_TYPE_POINTER); + /** + * MidoriView::add-download: + * @view: the object on which the signal is emitted + * @download: a new download + * + * Emitted when a new download was accepted and is + * about to start, before the browser adds items + * to the transferbar. + * + * Emitting this signal manually is equal to a + * user initiating and confirming a download + * + * Note: This requires WebKitGTK 1.1.3. + * + * Since: 0.1.5 + */ + signals[ADD_DOWNLOAD] = g_signal_new ( + "add-download", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); + signals[QUIT] = g_signal_new ( "quit", G_TYPE_FROM_CLASS (class), From 1650d09070a1eb7777c6919d01a15acfbb1870a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 15:25:57 +0100 Subject: [PATCH 0892/2970] Implement Transfers sidepanel --- midori/main.c | 8 +- panels/midori-transfers.c | 417 ++++++++++++++++++++++++++++++++++++++ panels/midori-transfers.h | 47 +++++ po/POTFILES.in | 1 + 4 files changed, 469 insertions(+), 4 deletions(-) create mode 100644 panels/midori-transfers.c create mode 100644 panels/midori-transfers.h diff --git a/midori/main.c b/midori/main.c index b063b747..eccf89e2 100644 --- a/midori/main.c +++ b/midori/main.c @@ -25,6 +25,7 @@ #include "midori-panel.h" #include "midori-preferences.h" #include "midori-plugins.h" +#include "midori-transfers.h" #include "midori-view.h" #include "midori-websettings.h" @@ -1213,11 +1214,10 @@ midori_app_add_browser_cb (MidoriApp* app, midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); /* Transfers */ - #if 0 - addon = midori_view_new (net); + #if WEBKIT_CHECK_VERSION (1, 1, 3) + addon = g_object_new (MIDORI_TYPE_TRANSFERS, "app", app, NULL); gtk_widget_show (addon); - midori_panel_append_widget (MIDORI_PANEL (panel), addon, - STOCK_TRANSFERS, _("Transfers"), NULL); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); #endif /* Console */ diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c new file mode 100644 index 00000000..43434a05 --- /dev/null +++ b/panels/midori-transfers.c @@ -0,0 +1,417 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-transfers.h" + +#include "midori-app.h" +#include "midori-browser.h" +#include "midori-stock.h" +#include "midori-view.h" + +#include "sokoke.h" +#include "compat.h" +#include + +struct _MidoriTransfers +{ + GtkVBox parent_instance; + + GtkWidget* toolbar; + GtkWidget* treeview; + MidoriApp* app; +}; + +struct _MidoriTransfersClass +{ + GtkVBoxClass parent_class; +}; + +static void +midori_transfers_viewable_iface_init (MidoriViewableIface* iface); + +G_DEFINE_TYPE_WITH_CODE (MidoriTransfers, midori_transfers, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + midori_transfers_viewable_iface_init)); + +enum +{ + PROP_0, + + PROP_APP +}; + +static void +midori_transfers_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec); + +static void +midori_transfers_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec); + +static void +midori_transfers_class_init (MidoriTransfersClass* class) +{ + GObjectClass* gobject_class; + GParamFlags flags; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->set_property = midori_transfers_set_property; + gobject_class->get_property = midori_transfers_get_property; + + flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; + + g_object_class_install_property (gobject_class, + PROP_APP, + g_param_spec_object ( + "app", + "App", + "The app", + MIDORI_TYPE_APP, + flags)); +} + +static const gchar* +midori_transfers_get_label (MidoriViewable* viewable) +{ + return _("Transfers"); +} + +static const gchar* +midori_transfers_get_stock_id (MidoriViewable* viewable) +{ + return STOCK_TRANSFERS; +} + +static void +midori_transfers_button_clear_clicked_cb (GtkToolItem* toolitem, + MidoriTransfers* transfers) +{ + GtkTreeModel* model = gtk_tree_view_get_model ( + GTK_TREE_VIEW (transfers->treeview)); + /* FIXME: Clear only finished and cancelled downloads */ + gtk_tree_store_clear (GTK_TREE_STORE (model)); +} + +static GtkWidget* +midori_transfers_get_toolbar (MidoriViewable* transfers) +{ + if (!MIDORI_TRANSFERS (transfers)->toolbar) + { + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + toolitem = gtk_tool_item_new (); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), + FALSE); + gtk_tool_item_set_expand (toolitem, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_transfers_button_clear_clicked_cb), transfers); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + MIDORI_TRANSFERS (transfers)->toolbar = toolbar; + } + + return MIDORI_TRANSFERS (transfers)->toolbar; +} + +static void +midori_transfers_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = midori_transfers_get_stock_id; + iface->get_label = midori_transfers_get_label; + iface->get_toolbar = midori_transfers_get_toolbar; +} + +#if WEBKIT_CHECK_VERSION (1, 1, 3) +static void +midori_transfers_download_notify_progress_cb (WebKitDownload* download, + GParamSpec* pspec, + MidoriTransfers* transfers) +{ + /* FIXME: Update only the appropriate row */ + gtk_widget_queue_draw (transfers->treeview); +} + +static void +midori_transfers_download_notify_status_cb (WebKitDownload* download, + GParamSpec* pspec, + MidoriTransfers* transfers) +{ + /* FIXME: Update only the appropriate row */ + gtk_widget_queue_draw (transfers->treeview); +} + +static void +midori_transfers_browser_add_download_cb (MidoriBrowser* browser, + WebKitDownload* download, + MidoriTransfers* transfers) +{ + GtkTreeView* treeview; + GtkTreeModel* model; + + treeview = GTK_TREE_VIEW (transfers->treeview); + model = gtk_tree_view_get_model (treeview); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + NULL, NULL, G_MAXINT, + 0, NULL, 1, download, -1); + g_signal_connect (download, "notify::progress", + G_CALLBACK (midori_transfers_download_notify_progress_cb), transfers); + g_signal_connect (download, "notify::status", + G_CALLBACK (midori_transfers_download_notify_status_cb), transfers); +} +#endif + +static void +midori_transfers_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MidoriTransfers* transfers = MIDORI_TRANSFERS (object); + + switch (prop_id) + { + case PROP_APP: + transfers->app = g_value_get_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_transfers_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MidoriTransfers* transfers = MIDORI_TRANSFERS (object); + + switch (prop_id) + { + case PROP_APP: + g_value_set_object (value, transfers->app); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +midori_transfers_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + g_object_set (renderer, "stock-id", STOCK_TRANSFER, + "stock-size", GTK_ICON_SIZE_DND, + "xpad", 1, "ypad", 12, NULL); +} + +static void +midori_transfers_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + #if WEBKIT_CHECK_VERSION (1, 1, 3) + WebKitDownload* download; + gchar* current; + gchar* total; + gchar* size_text; + gchar* text; + gdouble progress; + + gtk_tree_model_get (model, iter, 1, &download, -1); + + /* FIXME: Ellipsize filename */ + current = g_format_size_for_display (webkit_download_get_current_size (download)); + total = g_format_size_for_display (webkit_download_get_total_size (download)); + size_text = g_strdup_printf (_("%s of %s"), current, total); + g_free (current); + g_free (total); + text = g_strdup_printf ("%s\n%s", + webkit_download_get_suggested_filename (download), size_text); + g_free (size_text); + /* Avoid a bug in WebKit */ + if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) + progress = webkit_download_get_progress (download); + else + progress = 0.0; + g_object_set (renderer, "text", text, + "value", (gint)(progress * 100), + "xpad", 1, "ypad", 6, NULL); + g_free (text); + g_object_unref (download); + #endif +} + +static void +midori_transfers_treeview_render_button_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + #if WEBKIT_CHECK_VERSION (1, 1, 3) + WebKitDownload* download; + const gchar* stock_id; + + gtk_tree_model_get (model, iter, 1, &download, -1); + + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + stock_id = GTK_STOCK_CANCEL; + break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + stock_id = GTK_STOCK_OPEN; + break; + default: + stock_id = GTK_STOCK_CLEAR; + } + g_object_set (renderer, "stock-id", stock_id, + "stock-size", GTK_ICON_SIZE_MENU, NULL); + + g_object_unref (download); + #endif +} + +static void +midori_transfers_treeview_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriTransfers* transfers) +{ + GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + if (gtk_tree_model_get_iter (model, &iter, path)) + { + #if WEBKIT_CHECK_VERSION (1, 1, 3) + WebKitDownload* download; + + gtk_tree_model_get (model, &iter, 1, &download, -1); + + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + webkit_download_cancel (download); + break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + const gchar* uri; + gboolean success; + + uri = webkit_download_get_destination_uri (download); + success = gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET ( + treeview)), uri, gtk_get_current_event_time (), NULL); + if (!success) + { + gchar* command = g_strconcat ("exo-open ", uri, NULL); + success = g_spawn_command_line_async (command, NULL); + g_free (command); + } + break; + } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + /* FIXME: Remove this item from the model */ + default: + break; + } + g_object_unref (download); + #endif + } +} + +static void +midori_transfers_hierarchy_changed_cb (MidoriTransfers* transfers, + GtkWidget* old_parent) +{ + #if WEBKIT_CHECK_VERSION (1, 1, 3) + GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (transfers)); + if (GTK_WIDGET_TOPLEVEL (browser)) + g_signal_connect (browser, "add-download", + G_CALLBACK (midori_transfers_browser_add_download_cb), transfers); + #endif +} + +static void +midori_transfers_init (MidoriTransfers* transfers) +{ + /* Create the treeview */ + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_text; + GtkTreeStore* treestore = gtk_tree_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_OBJECT); + transfers->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treestore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (transfers->treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_transfers_treeview_render_icon_cb, + transfers->treeview, NULL); + renderer_text = gtk_cell_renderer_progress_new (); + gtk_tree_view_column_pack_start (column, renderer_text, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_transfers_treeview_render_text_cb, + transfers->treeview, NULL); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_transfers_treeview_render_button_cb, + transfers->treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (transfers->treeview), column); + g_object_unref (treestore); + g_signal_connect (transfers->treeview, "row-activated", + G_CALLBACK (midori_transfers_treeview_row_activated_cb), + transfers); + gtk_widget_show (transfers->treeview); + gtk_box_pack_start (GTK_BOX (transfers), transfers->treeview, TRUE, TRUE, 0); + + g_signal_connect (transfers, "hierarchy-changed", + G_CALLBACK (midori_transfers_hierarchy_changed_cb), NULL); +} + +/** + * midori_transfers_new: + * + * Creates a new empty transfers. + * + * Return value: a new #MidoriTransfers + * + * Since 0.1.5 + **/ +GtkWidget* +midori_transfers_new (void) +{ + MidoriTransfers* transfers = g_object_new (MIDORI_TYPE_TRANSFERS, NULL); + + return GTK_WIDGET (transfers); +} diff --git a/panels/midori-transfers.h b/panels/midori-transfers.h new file mode 100644 index 00000000..97787115 --- /dev/null +++ b/panels/midori-transfers.h @@ -0,0 +1,47 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_TRANSFERS_H__ +#define __MIDORI_TRANSFERS_H__ + +#include + +#include + +#include "midori-viewable.h" + +G_BEGIN_DECLS + +#define MIDORI_TYPE_TRANSFERS \ + (midori_transfers_get_type ()) +#define MIDORI_TRANSFERS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_TRANSFERS, MidoriTransfers)) +#define MIDORI_TRANSFERS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_TRANSFERS, MidoriTransfersClass)) +#define MIDORI_IS_TRANSFERS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_TRANSFERS)) +#define MIDORI_IS_TRANSFERS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_TRANSFERS)) +#define MIDORI_TRANSFERS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_TRANSFERS, MidoriTransfersClass)) + +typedef struct _MidoriTransfers MidoriTransfers; +typedef struct _MidoriTransfersClass MidoriTransfersClass; + +GType +midori_transfers_get_type (void); + +GtkWidget* +midori_transfers_new (void); + +G_END_DECLS + +#endif /* __MIDORI_TRANSFERS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index de85f098..2840e97a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,6 +17,7 @@ panels/midori-console.c panels/midori-extensions.c panels/midori-history.c panels/midori-plugins.c +panels/midori-transfers.c katze/katze-http-auth.c katze/katze-throbber.c katze/katze-utils.c From 664a40646af39331c187b604f83c7d3d032f913c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 19:09:40 +0100 Subject: [PATCH 0893/2970] Add a Copy button the the console --- panels/midori-console.c | 56 +++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/panels/midori-console.c b/panels/midori-console.c index 59dddc2d..0f662ca5 100644 --- a/panels/midori-console.c +++ b/panels/midori-console.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -158,6 +158,34 @@ midori_console_get_property (GObject* object, } } +static void +midori_console_button_copy_clicked_cb (GtkToolItem* toolitem, + MidoriConsole* console) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (console->treeview), + &model, &iter)) + { + GdkDisplay* display; + GtkClipboard* clipboard; + gchar* text; + gchar* message; + gint line; + gchar* source_id; + + display = gtk_widget_get_display (GTK_WIDGET (console)); + clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD); + gtk_tree_model_get (model, &iter, 0, &message, 1, &line, 2, &source_id, -1); + text = g_strdup_printf ("%d @ %s: %s", line, source_id, message); + g_free (source_id); + g_free (message); + gtk_clipboard_set_text (clipboard, text, -1); + g_free (text); + } +} + static void midori_console_button_clear_clicked_cb (GtkToolItem* toolitem, MidoriConsole* console) @@ -199,22 +227,6 @@ midori_console_treeview_render_text_cb (GtkTreeViewColumn* column, g_free (source_id); } -static void -midori_console_treeview_row_activated_cb (GtkTreeView* treeview, - GtkTreePath* path, - GtkTreeViewColumn* column, - MidoriConsole* console) -{ - /*GtkTreeModel* model = gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - if (gtk_tree_model_get_iter (model, &iter, path)) - { - gchar* source_id; - gtk_tree_model_get (model, &iter, 2, &source_id, -1); - g_free (source_id); - }*/ -} - static void midori_console_hierarchy_changed_cb (MidoriConsole* console, GtkWidget* old_parent) @@ -250,9 +262,6 @@ midori_console_init (MidoriConsole* console) console->treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (console->treeview), column); g_object_unref (treestore); - g_signal_connect (console->treeview, "row-activated", - G_CALLBACK (midori_console_treeview_row_activated_cb), - console); gtk_widget_show (console->treeview); gtk_box_pack_start (GTK_BOX (console), console->treeview, TRUE, TRUE, 0); @@ -300,10 +309,13 @@ midori_console_get_toolbar (MidoriViewable* console) toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); - toolitem = gtk_tool_item_new (); - /* TODO: What about a find entry here that filters e.g. by url? */ + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_COPY); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_console_button_copy_clicked_cb), console); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); + /* TODO: What about a find entry here that filters e.g. by url? */ toolitem = gtk_separator_tool_item_new (); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); From 5783bf93a6a435f8f1bc6d8c14e70e08bc1ac908 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 22:26:41 +0100 Subject: [PATCH 0894/2970] Update translation template --- po/POTFILES.in | 1 + po/midori.pot | 735 ++++++++++++++++++++++++++----------------------- 2 files changed, 393 insertions(+), 343 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 2840e97a..a721958a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,6 +25,7 @@ katze/katze-item.c katze/katze-list.c katze/katze-array.c katze/katze-arrayaction.c +extensions/colorful-tabs.c extensions/mouse-gestures/main.c extensions/page-holder.c extensions/statusbar-features.c diff --git a/po/midori.pot b/po/midori.pot index 27f85b84..dcecf31d 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 00:58+0100\n" +"POT-Creation-Date: 2009-03-22 22:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 -#: ../midori/main.c:1711 ../midori/main.c:1722 -#: ../midori/midori-websettings.c:267 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 +#: ../midori/main.c:1681 ../midori/main.c:1692 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "" @@ -30,676 +30,672 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:106 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:161 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:168 ../midori/main.c:238 +#: ../midori/main.c:165 ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:480 +#: ../midori/main.c:477 msgid "File not found." msgstr "" -#: ../midori/main.c:488 ../midori/main.c:497 +#: ../midori/main.c:485 ../midori/main.c:494 msgid "Malformed document." msgstr "" -#: ../midori/main.c:519 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:551 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:605 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:629 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:910 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:939 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1069 ../midori/sokoke.c:617 +#: ../midori/main.c:1066 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 ../midori/main.c:1193 +#: ../midori/main.c:1166 ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 -msgid "Transfers" -msgstr "" - -#: ../midori/main.c:1265 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1398 +#: ../midori/main.c:1377 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1413 +#: ../midori/main.c:1392 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1417 +#: ../midori/main.c:1396 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1422 +#: ../midori/main.c:1401 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1596 +#: ../midori/main.c:1580 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1628 ../midori/gjs.c:514 +#: ../midori/main.c:1603 ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1651 +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1653 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "" -#: ../midori/main.c:1655 +#: ../midori/main.c:1630 msgid "Addresses" msgstr "" -#: ../midori/main.c:1699 +#: ../midori/main.c:1669 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1723 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1725 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1752 +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1820 +#: ../midori/main.c:1772 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1832 +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1847 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1860 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1873 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1885 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1901 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "" -#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3228 ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3278 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3280 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3283 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3286 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3289 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3292 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "" -#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3301 ../midori/midori-view.c:1111 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3330 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3331 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3333 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3352 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3821 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3918 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:4085 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4110 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4115 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "" @@ -707,644 +703,672 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1888 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:989 -msgid "_Save Link destination" -msgstr "" - -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1664 -msgid "Source" -msgstr "" - -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1755 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" msgstr "" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 +#. Page "Network" +#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 msgid "days" msgstr "" -#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 msgid "History" msgstr "" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "" @@ -1429,37 +1453,45 @@ msgstr "" msgid "New _Window" msgstr "" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:743 ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "" + +#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "" +#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "" @@ -1526,21 +1558,26 @@ msgstr "" msgid "Plugins" msgstr "" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "" @@ -1571,6 +1608,18 @@ msgstr "" msgid "Choose folder" msgstr "" +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "" + #: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "" From 7c6358f5c29ee87e7458f003366ad99c13fc2331 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 22:26:57 +0100 Subject: [PATCH 0895/2970] Update French translation --- po/fr.po | 731 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 386 insertions(+), 345 deletions(-) diff --git a/po/fr.po b/po/fr.po index b355d209..5bffc071 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-11 15:04-0400\n" +"POT-Creation-Date: 2009-03-22 22:19+0100\n" "PO-Revision-Date: 2009-03-11 15:12-0400\n" "Last-Translator: Pascal Gervais 2009\n" "Language-Team: French \n" @@ -23,9 +23,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur toile léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1612 ../midori/main.c:1715 -#: ../midori/main.c:1724 ../midori/main.c:1735 -#: ../midori/midori-websettings.c:267 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 +#: ../midori/main.c:1681 ../midori/main.c:1692 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -33,97 +33,93 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur toile" -#: ../midori/main.c:107 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:162 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:169 ../midori/main.c:239 +#: ../midori/main.c:165 ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:481 +#: ../midori/main.c:477 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/main.c:489 ../midori/main.c:498 +#: ../midori/main.c:485 ../midori/main.c:494 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/main.c:520 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:552 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:606 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer de l'historique l'élément : %s\n" -#: ../midori/main.c:630 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:653 ../midori/main.c:687 ../midori/main.c:703 +#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:883 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer de l'hitorique les anciens éléments : %s\n" -#: ../midori/main.c:911 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:940 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1070 ../midori/sokoke.c:617 +#: ../midori/main.c:1066 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/main.c:1091 ../midori/main.c:1118 ../midori/main.c:1146 +#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1170 ../midori/main.c:1194 +#: ../midori/main.c:1166 ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1225 ../midori/midori-preferences.c:433 -msgid "Transfers" -msgstr "Transferts" - -#: ../midori/main.c:1266 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1409 +#: ../midori/main.c:1377 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." @@ -132,173 +128,173 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1424 +#: ../midori/main.c:1392 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1428 +#: ../midori/main.c:1396 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1433 +#: ../midori/main.c:1401 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1612 +#: ../midori/main.c:1580 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1639 ../midori/gjs.c:515 +#: ../midori/main.c:1603 ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1662 +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" msgstr "Exécutez le fichier spécifié en tant que javascript" -#: ../midori/main.c:1664 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1666 +#: ../midori/main.c:1630 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1712 +#: ../midori/main.c:1669 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1736 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1738 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1765 +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:1772 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés : %s\n" -#: ../midori/main.c:1862 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1875 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1888 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargé: %s\n" -#: ../midori/main.c:1900 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1916 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3056 -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "Enregistrer le fichier dans" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2635 ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2642 ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2645 ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." msgstr "Un navigateur toile léger" -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -306,414 +302,414 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:2996 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:2999 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3002 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3008 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3016 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3019 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3022 ../midori/midori-browser.c:3025 +#: ../midori/midori-browser.c:3228 ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3028 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3034 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3037 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "Rechercher le _précédant" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3278 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3074 +#: ../midori/midori-browser.c:3280 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3077 ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3283 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3080 ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3286 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3083 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3289 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3086 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3292 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3089 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3092 ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3095 ../midori/midori-view.c:1073 +#: ../midori/midori-browser.c:3301 ../midori/midori-view.c:1111 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "Affiche le code source de la sélection" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" msgstr "Va à la page précédente" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" msgstr "Va à la page suivante" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "Va à la page d'accueil" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3119 ../midori/midori-view.c:1045 +#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3124 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3330 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3331 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3127 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3333 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "Affiche la documentation" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3352 msgid "_Report a Bug" msgstr "_Rapporter une anomalie" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "Ouvrir le gestionnaire d'anomalies de Midori" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "Affiche des informations concernant le programme" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "Barre de _signets" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" msgstr "Barre de _transferts" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3617 +#: ../midori/midori-browser.c:3821 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3626 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "Ouvre un emplacement particulier" -#: ../midori/midori-browser.c:3650 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "Recherche _toile..." -#: ../midori/midori-browser.c:3652 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "Lance une recherche sur la toile" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "Rouvre un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:3684 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "Rouvre des pages précédemment visitées" -#: ../midori/midori-browser.c:3699 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:3714 +#: ../midori/midori-browser.c:3918 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "Afficher une vue générale de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4085 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:3904 +#: ../midori/midori-browser.c:4110 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:3909 +#: ../midori/midori-browser.c:4115 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:3922 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "Résultats analogues en surbrillance" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" @@ -721,648 +717,673 @@ msgstr "Indique s'il faut aligner le panneau latéral sur la droite" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1819 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1888 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "Tous les témoins" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "Dernière recherche sur la toile" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "La dernière recherche sur la toile enregistrée" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "Afficher la barre des transferts" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "Indique s'il faut afficher la barre de transferts" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "Progression dans le champ d'adresse" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans le champ d'adresse" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "Afficher le dialogue de fermeture inattendue" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "Afficher un dialogue en cas de fermeture inattendue de Midori" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "Un éditeur texte externe" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "Encodage des caractères favori" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "Clic du milieu ouvre la sélection" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "" "Charger l'addresse sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "Chercher en ligne en tapant" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "Indique s'il faut chercher automatiquement en ligne en tapant" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "Accepter les témoins" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "Type de témoins (cookies) à accepter" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "Uniquement les témoins d'origine" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "Accepter les témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "Âge maximal des témoins" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "Détecter le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" +msgstr "" +"Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "S'dentifier comme" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "S'identifier comme quoi, sur les pages de la toile" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "Taille de l'antémémoire" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire (cache) permise" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:626 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:956 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:958 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:975 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:985 -msgid "_Save Link destination" -msgstr "_Enregistrer la cible du lien" - -#: ../midori/midori-view.c:993 +#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1015 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "_Enregistrer la cible du lien" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "_Chercher sur la toile" -#: ../midori/midori-view.c:1024 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "Ouvrir ou télécharger le fichier" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Type de fichier: %s (« %s »)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "Ouvrir %s" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1662 -msgid "Source" -msgstr "Source" - -#: ../midori/midori-view.c:1686 +#: ../midori/midori-view.c:1755 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1702 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-preferences.c:94 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Préférences de %s" #. Page "General" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Transferts" + #. Page "Appearance" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "La taille par défaut de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "Taille minimum de la police" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "La taille minimum de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "Encodage des caractères par défaut" #. Page "Behavior" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:505 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Charger les images" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "Charger et afficher les images" -#: ../midori/midori-preferences.c:509 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "Diminuer les images" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "Réduire automatiquement les images pour les adapter" -#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimentionnés" -#: ../midori/midori-preferences.c:521 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:525 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Activer les greffons" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" msgstr "Active la prise en charge interne des greffons" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:534 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" #. Page "Interface" -#: ../midori/midori-preferences.c:546 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:547 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:556 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:595 ../midori/midori-preferences.c:596 +#. Page "Network" +#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:632 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:641 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../midori/midori-preferences.c:654 ../midori/midori-preferences.c:668 +#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 msgid "days" msgstr "jours" -#: ../midori/midori-preferences.c:661 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 msgid "History" msgstr "Historique" @@ -1466,27 +1487,27 @@ msgstr "%s ne peut être assigné à %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s ne peut être accédé" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activer" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "Activer" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Désactiver" -#: ../panels/midori-addons.c:1016 ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "Désactiver" @@ -1556,11 +1577,16 @@ msgstr "Hier" msgid "Plugins" msgstr "Greffons" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Authentification requise" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" @@ -1568,11 +1594,11 @@ msgstr "" "Un nom d'utilisateur et un mot de passe sont requis\n" "pour l'ouverture de ce lieu :" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "Nom d'utilisateur" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "Mot de passe" @@ -1603,11 +1629,23 @@ msgstr "Choisissez un fichier" msgid "Choose folder" msgstr "Choisissez un répertoire" -#: ../extensions/mouse-gestures/main.c:216 +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "Colorer les onglets" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "Onglets coloré" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "Donner un couleur propre a chaque onglet" + +#: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "Mouvements de souris" -#: ../extensions/mouse-gestures/main.c:217 +#: ../extensions/mouse-gestures/main.c:177 msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" @@ -1627,3 +1665,6 @@ msgstr "Images" #: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Scripts" + +#~ msgid "Source" +#~ msgstr "Source" From 679d0c150c33de4541bba99659e3a0a15a80c07a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 22:27:39 +0100 Subject: [PATCH 0896/2970] Update German translation --- po/de.po | 751 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 401 insertions(+), 350 deletions(-) diff --git a/po/de.po b/po/de.po index 0a3f75b6..0e4fa1d3 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 00:58+0100\n" +"POT-Creation-Date: 2009-03-22 22:19+0100\n" "PO-Revision-Date: 2009-02-01 19:56+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -19,108 +19,104 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Schlanker Netznavigator" +msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 -#: ../midori/main.c:1711 ../midori/main.c:1722 -#: ../midori/midori-websettings.c:267 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 +#: ../midori/main.c:1681 ../midori/main.c:1692 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Netznavigator" +msgstr "Internetbetrachter" -#: ../midori/main.c:106 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:168 ../midori/main.c:238 +#: ../midori/main.c:165 ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:480 +#: ../midori/main.c:477 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/main.c:488 ../midori/main.c:497 +#: ../midori/main.c:485 ../midori/main.c:494 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/main.c:519 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:939 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1069 ../midori/sokoke.c:617 +#: ../midori/main.c:1066 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 ../midori/main.c:1193 +#: ../midori/main.c:1166 ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 -msgid "Transfers" -msgstr "Übertragungen" - -#: ../midori/main.c:1265 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1398 +#: ../midori/main.c:1377 msgid "" "Midori seems to have crashed the last time it was opened. If this happend " "repeatedly, try one of the following options to solve the problem." @@ -128,584 +124,583 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1413 +#: ../midori/main.c:1392 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1417 +#: ../midori/main.c:1396 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1422 +#: ../midori/main.c:1401 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1596 +#: ../midori/main.c:1580 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1628 ../midori/gjs.c:514 +#: ../midori/main.c:1603 ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1651 +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1653 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1655 +#: ../midori/main.c:1630 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1699 +#: ../midori/main.c:1669 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1723 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1772 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1832 +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1860 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1873 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1885 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1901 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 -#, fuzzy msgid "Open all in _Tabs" -msgstr "In neuem _Reiter öffnen" +msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." -msgstr "Ein kleiner Netznavigator." +msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3228 ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3278 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3280 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3283 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3286 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3289 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3292 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3301 ../midori/midori-view.c:1111 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3330 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3331 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3333 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3352 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3821 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3918 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:4085 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4110 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4115 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" @@ -713,644 +708,672 @@ msgstr "Die Seitenleiste auf der rechten Seite anordnen" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1888 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "Übertragungsleiste anzeigen" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "Die Übertragungsleiste anzeigen oder verbergen" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "Profildateien annehmen" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "Maximales Alter von Profildateien" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "Zwischenrechner" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "Zwischenrechner automatisch erkennen" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" -msgstr "Wie gegenüber Seiten im Netz identifiziert werden soll" +msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:989 -msgid "_Save Link destination" -msgstr "Verweisziel _speichern" - -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "Verweisziel _speichern" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "Datei öffnen oder herunterladen" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Dateityp: %s («%s»)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "%s öffnen" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1664 -msgid "Source" -msgstr "Quelltext" - -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1755 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Programmstart" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Aktuelle Seite als Startseite benutzen" + +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Übertragungen" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "Einzelne Bilder automatisch angemessen verkleinern" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" msgstr "Eingebettete Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "Erzwinge 96 Punkte pro Zoll" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" msgstr "Erzwinge eine Punktdichte von 96 DPI" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "Navigation" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 +#. Page "Network" +#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" -msgstr "Netzprofile" +msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 msgid "days" msgstr "Tage" -#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 msgid "History" msgstr "Verlauf" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Leer" @@ -1435,37 +1458,45 @@ msgstr "_Geschlossene Reiter und Fenster" msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:743 ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s hat keine Eigenschaft »%s«" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s kann %s.%s nicht zugewiesen werden" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "Auf %s.%s kann nicht zugegriffen werden" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Benutzerstile" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Einschalten" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "_Einschalten" + +#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Auschalten" +#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "_Auschalten" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Lesezeichen" @@ -1532,11 +1563,16 @@ msgstr "Gestern" msgid "Plugins" msgstr "Zusatzmodule" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s von %s" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Authentifizierung erforderlich" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" @@ -1544,11 +1580,11 @@ msgstr "" "Ein Benutzername und ein Kennwort\n" "werden zum Öffnen dieses Ortes benötigt:" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "Benutzername" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "Kennwort" @@ -1579,6 +1615,18 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "Reiter unterschiedlich einfärben" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "Farbige Reiter" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "Alle Reiter unterschiedlich einfärben" + #: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "Mausgesten" @@ -1603,3 +1651,6 @@ msgstr "Bilder" #: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Skripte" + +#~ msgid "Source" +#~ msgstr "Quelltext" From 600168b614c6b4a6967eccf43877c0f81e79e985 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Mar 2009 22:38:24 +0100 Subject: [PATCH 0897/2970] Bump version to 0.1.5 --- ChangeLog | 7 +++++++ wscript | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d626ad20..0de3fcfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.5: + + Add a Colorful Tabs extension + + Support downloading with WebKitGTK+ 1.1.3 + + Load and save settings of extensions + + Drop internal source view + + Require WebKitGTK+ 1.1.1, Glib 2.16 and libsoup 2.25.2 + v0.1.4: + Automatic inline find can be disabled + Implement an Encoding menu diff --git a/wscript b/wscript index 9c835a71..c5555412 100644 --- a/wscript +++ b/wscript @@ -22,7 +22,7 @@ import UnitTest major = 0 minor = 1 -micro = 4 +micro = 5 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From 5c9e56fdb6c08aed2af5b805f0a94fc994c5c55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 22 Mar 2009 23:47:07 +0100 Subject: [PATCH 0898/2970] Remove left-over assignement of configuration file --- midori/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index eccf89e2..aa401a3d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1877,7 +1877,6 @@ main (int argc, s_session = katze_net_get_session (net); g_type_set_qdata (SOUP_TYPE_SESSION, g_quark_from_static_string ("midori-app"), app); - katze_assign (config_file, build_config_filename ("cookies.txt")); jar = soup_cookie_jar_new (); soup_session_add_feature (s_session, SOUP_SESSION_FEATURE (jar)); soup_session_add_feature (webkit_session, SOUP_SESSION_FEATURE (jar)); From ded346905c16a8fbd5343701fda027ac87a0927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 23 Mar 2009 00:58:33 +0100 Subject: [PATCH 0899/2970] Properly initialize tooltips instance to NULL --- midori/compat.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/midori/compat.c b/midori/compat.c index 6e858f55..273935e4 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -41,10 +41,13 @@ void gtk_widget_set_tooltip_text (GtkWidget* widget, const gchar* text) { - static GtkTooltips* tooltips; - if (!tooltips) - tooltips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tooltips, widget, text, NULL); + if (text && *text) + { + static GtkTooltips* tooltips = NULL; + if (G_UNLIKELY (!tooltips)) + tooltips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tooltips, widget, text, NULL); + } } void From 350dbe5e073cdb8a52f743be3ed0cf4c0d30b7da Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 23 Mar 2009 12:08:27 +0100 Subject: [PATCH 0900/2970] Fix API documentation build --- docs/api/wscript_build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/wscript_build b/docs/api/wscript_build index 8e72edb4..ddbcfc59 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -27,8 +27,8 @@ for module in ('midori', 'katze'): Utils.check_dir ('html') os.chdir ('html') subprocess.call (['gtkdoc-mkhtml', module, '../%s.sgml' % module]) - Params.pprint ('YELLOW', "Created documentation for %s." % module) + Utils.pprint ('YELLOW', "Created documentation for %s." % module) os.chdir ('../../../../..') except Exception, msg: print msg - Params.pprint ('RED', "Failed to create documentation for %s." % module) + Utils.pprint ('RED', "Failed to create documentation for %s." % module) From 637388a8deff82135b20e00e2b24a56bcbca039c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 23 Mar 2009 19:27:35 +0100 Subject: [PATCH 0901/2970] Do not try to compute a tab colour unless it's a proper URI --- extensions/colorful-tabs.c | 39 ++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index bddb403b..2eea40e5 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -45,22 +45,29 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view, dark, we lighten it up a litte. Finally we make the event box visible and modify its background. */ - uri = soup_uri_new (midori_view_get_display_uri (view)); - hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, -1); - soup_uri_free (uri); - colorstr = g_strndup (hash, 6 + 1); - g_free (hash); - colorstr[0] = '#'; - gdk_color_parse (colorstr, &color); - if (color.red < 35000) - color.red += 25000 + (color.blue + 1) / 2; - if (color.green < 35000) - color.green += 25000 + (color.red + 1) / 2; - if (color.blue < 35000) - color.blue += 25000 + (color.green + 1) / 2; - gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE); - gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color); - gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, &color); + if ((uri = soup_uri_new (midori_view_get_display_uri (view)))) + { + hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, -1); + soup_uri_free (uri); + colorstr = g_strndup (hash, 6 + 1); + g_free (hash); + colorstr[0] = '#'; + gdk_color_parse (colorstr, &color); + if (color.red < 35000) + color.red += 25000 + (color.blue + 1) / 2; + if (color.green < 35000) + color.green += 25000 + (color.red + 1) / 2; + if (color.blue < 35000) + color.blue += 25000 + (color.green + 1) / 2; + gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE); + gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color); + gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, &color); + } + else + { + gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); + } } static void From 1aa158d78f48999745c9c20abb52891c14e80049 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 23 Mar 2009 21:09:29 +0100 Subject: [PATCH 0902/2970] Add a missing variable declaration --- midori/midori-view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 61545321..97b7081d 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1182,6 +1182,8 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, GdkScreen* screen; GtkIconTheme* icon_theme; gint response; + #else + gchar* uri; #endif if (web_frame != webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))) From 15790565e86bd368236e03b5e26b11997477564e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Mar 2009 01:10:15 +0100 Subject: [PATCH 0903/2970] Create cookie jar on startup instead of waiting for an HTTP request --- katze/katze-http-cookies.c | 37 ++++++++----------------------------- midori/main.c | 28 ++++++++++++---------------- 2 files changed, 20 insertions(+), 45 deletions(-) diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c index e6d29d30..c66ee66c 100644 --- a/katze/katze-http-cookies.c +++ b/katze/katze-http-cookies.c @@ -218,7 +218,6 @@ cookie_jar_changed_cb (SoupCookieJar* jar, SoupCookie* new_cookie, gchar* filename) { - GObject* app; GObject* settings; guint accept_cookies; @@ -229,10 +228,7 @@ cookie_jar_changed_cb (SoupCookieJar* jar, { FILE *out; - /* FIXME: This is really a hack */ - app = g_type_get_qdata (SOUP_TYPE_SESSION, - g_quark_from_static_string ("midori-app")); - settings = katze_object_get_object (G_OBJECT (app), "settings"); + settings = g_object_get_data (G_OBJECT (jar), "midori-settings"); accept_cookies = katze_object_get_enum (settings, "accept-cookies"); if (accept_cookies == 2 /* MIDORI_ACCEPT_COOKIES_NONE */) { @@ -259,45 +255,28 @@ cookie_jar_changed_cb (SoupCookieJar* jar, } static void -katze_http_cookies_session_request_queued_cb (SoupSession* session, - SoupMessage* msg, - SoupSessionFeature* feature) +katze_http_cookies_attach (SoupSessionFeature* feature, + SoupSession* session) { - const gchar* filename; SoupSessionFeature* cookie_jar; - - filename = g_object_get_data (G_OBJECT (feature), "filename"); - if (!filename) - return; + gchar* filename; cookie_jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); - if (!cookie_jar) - return; - - g_type_set_qdata (SOUP_TYPE_COOKIE_JAR, - g_quark_from_static_string ("midori-has-jar"), (void*)1); + g_return_if_fail (cookie_jar != NULL); + filename = g_object_get_data (G_OBJECT (feature), "filename"); + g_return_if_fail (filename != NULL); cookie_jar_load (SOUP_COOKIE_JAR (cookie_jar), filename); g_signal_connect_data (cookie_jar, "changed", G_CALLBACK (cookie_jar_changed_cb), g_strdup (filename), (GClosureNotify)g_free, 0); - g_signal_handlers_disconnect_by_func (session, - katze_http_cookies_session_request_queued_cb, feature); -} -static void -katze_http_cookies_attach (SoupSessionFeature* feature, - SoupSession* session) -{ - g_signal_connect (session, "request-queued", - G_CALLBACK (katze_http_cookies_session_request_queued_cb), feature); } static void katze_http_cookies_detach (SoupSessionFeature* feature, SoupSession* session) { - g_signal_handlers_disconnect_by_func (session, - katze_http_cookies_session_request_queued_cb, feature); + /* Nothing to do. */ } static void diff --git a/midori/main.c b/midori/main.c index aa401a3d..9fe227c9 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1320,6 +1320,7 @@ midori_soup_session_debug (SoupSession* session) static void midori_soup_session_prepare (SoupSession* session, + SoupCookieJar* cookie_jar, MidoriWebSettings* settings) { SoupSessionFeature* feature; @@ -1341,6 +1342,7 @@ midori_soup_session_prepare (SoupSession* session, config_file = build_config_filename ("cookies.txt"); g_object_set_data_full (G_OBJECT (feature), "filename", config_file, (GDestroyNotify)g_free); + soup_session_add_feature (session, SOUP_SESSION_FEATURE (cookie_jar)); soup_session_add_feature (session, feature); } @@ -1644,6 +1646,7 @@ main (int argc, KatzeItem* item; gchar* uri_ready; KatzeNet* net; + SoupSession* webkit_session; SoupSession* s_session; SoupCookieJar* jar; #if HAVE_SQLITE @@ -1869,22 +1872,15 @@ main (int argc, } g_string_free (error_messages, TRUE); - if (1) - { - SoupSession* webkit_session = webkit_get_default_session (); - - net = katze_net_new (); - s_session = katze_net_get_session (net); - g_type_set_qdata (SOUP_TYPE_SESSION, - g_quark_from_static_string ("midori-app"), app); - jar = soup_cookie_jar_new (); - soup_session_add_feature (s_session, SOUP_SESSION_FEATURE (jar)); - soup_session_add_feature (webkit_session, SOUP_SESSION_FEATURE (jar)); - g_object_unref (jar); - midori_soup_session_prepare (s_session, settings); - midori_soup_session_prepare (webkit_session, settings); - g_object_unref (net); - } + webkit_session = webkit_get_default_session (); + net = katze_net_new (); + s_session = katze_net_get_session (net); + jar = soup_cookie_jar_new (); + g_object_set_data (G_OBJECT (jar), "midori-settings", settings); + midori_soup_session_prepare (s_session, jar, settings); + midori_soup_session_prepare (webkit_session, jar, settings); + g_object_unref (jar); + g_object_unref (net); /* Open as many tabs as we have uris, seperated by pipes */ i = 0; From a75a94c3885af293e4c4532615d5482d1022d391 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Mar 2009 01:55:46 +0100 Subject: [PATCH 0904/2970] Merge KatzeArray and KatzeList, we only ever use the array --- katze/katze-array.c | 161 +++++++++++++++++++-------- katze/katze-array.h | 4 +- katze/katze-list.c | 263 -------------------------------------------- katze/katze-list.h | 91 --------------- katze/katze.h | 3 +- po/POTFILES.in | 1 - 6 files changed, 119 insertions(+), 404 deletions(-) delete mode 100644 katze/katze-list.c delete mode 100644 katze/katze-list.h diff --git a/katze/katze-array.c b/katze/katze-array.c index 32e7b892..baebfeac 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,43 +26,66 @@ struct _KatzeArray { - KatzeList parent_instance; + KatzeItem parent_instance; GType type; + GList* items; }; struct _KatzeArrayClass { - KatzeListClass parent_class; + KatzeItemClass parent_class; + + /* Signals */ + void + (*add_item) (KatzeArray* array, + gpointer item); + void + (*remove_item) (KatzeArray* array, + gpointer item); + void + (*clear) (KatzeArray* array); }; -G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_LIST) +G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_ITEM); + +enum { + ADD_ITEM, + REMOVE_ITEM, + CLEAR, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; static void katze_array_finalize (GObject* object); static void -_katze_array_add_item (KatzeList* list, - gpointer item) +_katze_array_add_item (KatzeArray* array, + gpointer item) { - if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) + if (katze_array_is_a (array, G_TYPE_OBJECT)) { GType type = G_OBJECT_TYPE (item); - g_return_if_fail (katze_array_is_a ((KatzeArray*)list, type)); + g_return_if_fail (katze_array_is_a (array, type)); g_object_ref (item); if (g_type_is_a (type, KATZE_TYPE_ITEM)) - katze_item_set_parent (item, list); + katze_item_set_parent (item, array); } - KATZE_LIST_CLASS (katze_array_parent_class)->add_item (list, item); + + array->items = g_list_append (array->items, item); } static void -_katze_array_remove_item (KatzeList* list, +_katze_array_remove_item (KatzeArray* array, gpointer item) { - KATZE_LIST_CLASS (katze_array_parent_class)->remove_item (list, item); - if (katze_array_is_a ((KatzeArray*)list, G_TYPE_OBJECT)) + array->items = g_list_remove (array->items, item); + + if (katze_array_is_a (array, G_TYPE_OBJECT)) { if (KATZE_IS_ITEM (item)) katze_item_set_parent (item, NULL); @@ -70,24 +93,76 @@ _katze_array_remove_item (KatzeList* list, } } +static void +_katze_array_clear (KatzeArray* array) +{ + guint n; + guint i; + GObject* item; + + n = g_list_length (array->items); + for (i = 0; i < n; i++) + { + if ((item = g_list_nth_data (array->items, i))) + katze_array_remove_item (array, item); + } + g_list_free (array->items); + array->items = NULL; +} + static void katze_array_class_init (KatzeArrayClass* class) { GObjectClass* gobject_class; - KatzeListClass* katzelist_class; gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = katze_array_finalize; - katzelist_class = KATZE_LIST_CLASS (class); - katzelist_class->add_item = _katze_array_add_item; - katzelist_class->remove_item = _katze_array_remove_item; + signals[ADD_ITEM] = g_signal_new ( + "add-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeArrayClass, add_item), + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + + signals[REMOVE_ITEM] = g_signal_new ( + "remove-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeArrayClass, remove_item), + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + + signals[CLEAR] = g_signal_new ( + "clear", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeArrayClass, clear), + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = katze_array_finalize; + + class->add_item = _katze_array_add_item; + class->remove_item = _katze_array_remove_item; + class->clear = _katze_array_clear; } static void katze_array_init (KatzeArray* array) { array->type = G_TYPE_NONE; + array->items = NULL; } static void @@ -99,11 +174,13 @@ katze_array_finalize (GObject* object) array = KATZE_ARRAY (object); if (katze_array_is_a (array, G_TYPE_OBJECT)) { - n = katze_list_get_length ((KatzeList*)array); + n = g_list_length (array->items); for (i = 0; i < n; i++) - g_object_unref (katze_list_get_nth_item ((KatzeList*)array, i)); + g_object_unref (g_list_nth_data (array->items, i)); } + g_list_free (array->items); + G_OBJECT_CLASS (katze_array_parent_class)->finalize (object); } @@ -118,12 +195,6 @@ katze_array_finalize (GObject* object) * The array will keep a reference on each object until * it is removed from the array. * - * If @type is *not* a #GObject type, #KatzeArray behaves - * pretty much like #KatzeList. - * - * Note: Since 0.1.2 you may use #KatzeList accessors to - * work with #KatzeArray if you want to. - * * Return value: a new #KatzeArray **/ KatzeArray* @@ -158,7 +229,7 @@ katze_array_is_a (KatzeArray* array, /** * katze_array_add_item: * @array: a #KatzeArray - * @item: a #GObject + * @item: an item * * Adds an item to the array. * @@ -168,15 +239,15 @@ void katze_array_add_item (KatzeArray* array, gpointer item) { - /* g_return_if_fail (KATZE_IS_ARRAY (array)); */ + g_return_if_fail (KATZE_IS_ARRAY (array)); - katze_list_add_item (KATZE_LIST (array), item); + g_signal_emit (array, signals[ADD_ITEM], 0, item); } /** * katze_array_remove_item: * @array: a #KatzeArray - * @item: a #GObject + * @item: an item * * Removes an item from the array. * @@ -186,9 +257,9 @@ void katze_array_remove_item (KatzeArray* array, gpointer item) { - /* g_return_if_fail (KATZE_IS_ARRAY (array)); */ + g_return_if_fail (KATZE_IS_ARRAY (array)); - katze_list_remove_item (KATZE_LIST (array), item); + g_signal_emit (array, signals[REMOVE_ITEM], 0, item); } /** @@ -204,25 +275,25 @@ gpointer katze_array_get_nth_item (KatzeArray* array, guint n) { - /* g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); */ + g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); - return katze_list_get_nth_item (KATZE_LIST (array), n); + return g_list_nth_data (array->items, n); } /** * katze_array_is_empty: * @array: a #KatzeArray * - * Determines if @array is empty. + * Determines whether @array is empty. * * Return value: an item, or %NULL **/ gboolean katze_array_is_empty (KatzeArray* array) { - /* g_return_val_if_fail (KATZE_IS_ARRAY (array), TRUE); */ + g_return_val_if_fail (KATZE_IS_ARRAY (array), TRUE); - return katze_list_is_empty (KATZE_LIST (array)); + return !g_list_nth_data (array->items, 0); } /** @@ -238,9 +309,9 @@ gint katze_array_get_item_index (KatzeArray* array, gpointer item) { - /* g_return_val_if_fail (KATZE_IS_ARRAY (array), -1); */ + g_return_val_if_fail (KATZE_IS_ARRAY (array), -1); - return katze_list_get_item_index (KATZE_LIST (array), item); + return g_list_index (array->items, item); } /** @@ -271,14 +342,14 @@ katze_array_find_token (KatzeArray* array, if (!katze_array_is_a (array, G_TYPE_OBJECT)) return NULL; - n = katze_list_get_length ((KatzeList*)array); + n = g_list_length (array->items); for (i = 0; i < n; i++) { - item = katze_list_get_nth_item ((KatzeList*)array, i); + item = g_list_nth_data (array->items, i); if (!g_type_is_a (G_OBJECT_TYPE (item), KATZE_TYPE_ITEM)) continue; found_token = katze_item_get_token ((KatzeItem*)item); - if (found_token && !strcmp (found_token, token)) + if (!g_strcmp0 (found_token, token)) return item; } return NULL; @@ -295,9 +366,9 @@ katze_array_find_token (KatzeArray* array, guint katze_array_get_length (KatzeArray* array) { - /* g_return_val_if_fail (KATZE_IS_ARRAY (array), 0); */ + g_return_val_if_fail (KATZE_IS_ARRAY (array), 0); - return katze_list_get_length (KATZE_LIST (array)); + return g_list_length (array->items); } /** @@ -309,7 +380,7 @@ katze_array_get_length (KatzeArray* array) void katze_array_clear (KatzeArray* array) { - /* g_return_if_fail (KATZE_IS_ARRAY (array)); */ + g_return_if_fail (KATZE_IS_ARRAY (array)); - katze_list_clear (KATZE_LIST (array)); + g_signal_emit (array, signals[CLEAR], 0); } diff --git a/katze/katze-array.h b/katze/katze-array.h index 1caf43e6..c99867d1 100644 --- a/katze/katze-array.h +++ b/katze/katze-array.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ #ifndef __KATZE_ARRAY_H__ #define __KATZE_ARRAY_H__ -#include "katze-list.h" +#include G_BEGIN_DECLS diff --git a/katze/katze-list.c b/katze/katze-list.c deleted file mode 100644 index cb0fe80d..00000000 --- a/katze/katze-list.c +++ /dev/null @@ -1,263 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "katze-list.h" - -#include "katze-utils.h" - -#include -#include - -/** - * SECTION:katze-list - * @short_description: A verbose and versatile item container - * @see_also: #KatzeItem - * - * #KatzeList is a verbose and versatile container for items. - */ - -G_DEFINE_TYPE (KatzeList, katze_list, KATZE_TYPE_ITEM) - -enum { - ADD_ITEM, - REMOVE_ITEM, - CLEAR, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -static void -katze_list_finalize (GObject* object); - -static void -_katze_list_add_item (KatzeList* list, - gpointer item) -{ - list->items = g_list_append (list->items, item); -} - -static void -_katze_list_remove_item (KatzeList* list, - gpointer item) -{ - list->items = g_list_remove (list->items, item); -} - -static void -_katze_list_clear (KatzeList* list) -{ - guint n; - guint i; - GObject* item; - - n = g_list_length (list->items); - for (i = 0; i < n; i++) - { - if ((item = g_list_nth_data (list->items, i))) - katze_list_remove_item (list, item); - } - g_list_free (list->items); - list->items = NULL; -} - -static void -katze_list_class_init (KatzeListClass* class) -{ - GObjectClass* gobject_class; - - signals[ADD_ITEM] = g_signal_new ( - "add-item", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (KatzeListClass, add_item), - 0, - NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, - G_TYPE_POINTER); - - signals[REMOVE_ITEM] = g_signal_new ( - "remove-item", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (KatzeListClass, remove_item), - 0, - NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, - G_TYPE_POINTER); - - signals[CLEAR] = g_signal_new ( - "clear", - G_TYPE_FROM_CLASS (class), - (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (KatzeListClass, clear), - 0, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - - gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = katze_list_finalize; - - class->add_item = _katze_list_add_item; - class->remove_item = _katze_list_remove_item; - class->clear = _katze_list_clear; -} - -static void -katze_list_init (KatzeList* list) -{ - list->items = NULL; -} - -static void -katze_list_finalize (GObject* object) -{ - KatzeList* list; - - list = KATZE_LIST (object); - g_list_free (list->items); - - G_OBJECT_CLASS (katze_list_parent_class)->finalize (object); -} - -/** - * katze_list_new: - * - * Creates a new #KatzeList. - * - * Return value: a new #KatzeList - **/ -KatzeList* -katze_list_new (void) -{ - KatzeList* list = g_object_new (KATZE_TYPE_LIST, NULL); - - return list; -} - -/** - * katze_list_add_item: - * @list: a #KatzeList - * @item: a #GObject - * - * Adds an item to the list. - **/ -void -katze_list_add_item (KatzeList* list, - gpointer item) -{ - g_return_if_fail (KATZE_IS_LIST (list)); - - g_signal_emit (list, signals[ADD_ITEM], 0, item); -} - -/** - * katze_list_add_item: - * @list: a #KatzeList - * @item: a #GObject - * - * Removes an item from the list. - **/ -void -katze_list_remove_item (KatzeList* list, - gpointer item) -{ - g_return_if_fail (KATZE_IS_LIST (list)); - - g_signal_emit (list, signals[REMOVE_ITEM], 0, item); -} - -/** - * katze_list_get_nth_item: - * @list: a #KatzeList - * @n: an index in the list - * - * Retrieves the item in @list at the position @n. - * - * Return value: an item, or %NULL - **/ -gpointer -katze_list_get_nth_item (KatzeList* list, - guint n) -{ - g_return_val_if_fail (KATZE_IS_LIST (list), NULL); - - return g_list_nth_data (list->items, n); -} - -/** - * katze_list_is_empty: - * @list: a #KatzeList - * - * Determines if @list is empty. - * - * Return value: an item, or %NULL - **/ -gboolean -katze_list_is_empty (KatzeList* list) -{ - g_return_val_if_fail (KATZE_IS_LIST (list), TRUE); - - return !g_list_nth_data (list->items, 0); -} - -/** - * katze_list_get_item_position: - * @list: a #KatzeList - * @item: an item in the list - * - * Retrieves the index of the item in @list. - * - * Return value: an item, or -1 - **/ -gint -katze_list_get_item_index (KatzeList* list, - gpointer item) -{ - g_return_val_if_fail (KATZE_IS_LIST (list), -1); - - return g_list_index (list->items, item); -} - -/** - * katze_list_get_length: - * @list: a #KatzeList - * - * Retrieves the number of items in @list. - * - * Return value: the length of the list - **/ -guint -katze_list_get_length (KatzeList* list) -{ - g_return_val_if_fail (KATZE_IS_LIST (list), 0); - - return g_list_length (list->items); -} - -/** - * katze_list_clear: - * @list: a #KatzeList - * - * Deletes all items currently contained in @list. - **/ -void -katze_list_clear (KatzeList* list) -{ - g_return_if_fail (KATZE_IS_LIST (list)); - - g_signal_emit (list, signals[CLEAR], 0); -} diff --git a/katze/katze-list.h b/katze/katze-list.h deleted file mode 100644 index 4d5d9d93..00000000 --- a/katze/katze-list.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __KATZE_LIST_H__ -#define __KATZE_LIST_H__ - -#include "katze-item.h" - -G_BEGIN_DECLS - -#define KATZE_TYPE_LIST \ - (katze_list_get_type ()) -#define KATZE_LIST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_LIST, KatzeList)) -#define KATZE_LIST_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_LIST, KatzeListClass)) -#define KATZE_IS_LIST(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_LIST)) -#define KATZE_IS_LIST_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_LIST)) -#define KATZE_LIST_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_LIST, KatzeListClass)) - -typedef struct _KatzeList KatzeList; -typedef struct _KatzeListClass KatzeListClass; - -struct _KatzeList -{ - KatzeItem parent_instance; - - GList* items; -}; - -struct _KatzeListClass -{ - KatzeItemClass parent_class; - - /* Signals */ - void - (*add_item) (KatzeList* list, - gpointer item); - void - (*remove_item) (KatzeList* list, - gpointer item); - void - (*clear) (KatzeList* list); - -}; - -GType -katze_list_get_type (void); - -KatzeList* -katze_list_new (void); - -void -katze_list_add_item (KatzeList* list, - gpointer item); - -void -katze_list_remove_item (KatzeList* list, - gpointer item); - -gpointer -katze_list_get_nth_item (KatzeList* list, - guint n); - -gboolean -katze_list_is_empty (KatzeList* list); - -gint -katze_list_get_item_index (KatzeList* list, - gpointer item); - -guint -katze_list_get_length (KatzeList* list); - -void -katze_list_clear (KatzeList* list); - -G_END_DECLS - -#endif /* __KATZE_LIST_H__ */ diff --git a/katze/katze.h b/katze/katze.h index d2616768..8dd286bf 100644 --- a/katze/katze.h +++ b/katze/katze.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,6 @@ #include "katze-throbber.h" #include "katze-utils.h" #include "katze-item.h" -#include "katze-list.h" #include "katze-array.h" #include "katze-arrayaction.h" #include "katze-separatoraction.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index a721958a..4dac5136 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -22,7 +22,6 @@ katze/katze-http-auth.c katze/katze-throbber.c katze/katze-utils.c katze/katze-item.c -katze/katze-list.c katze/katze-array.c katze/katze-arrayaction.c extensions/colorful-tabs.c From fa1085246faca6bcf6de748fc75296e44eaf8216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 24 Mar 2009 23:05:47 +0100 Subject: [PATCH 0905/2970] Add 'Cookie manager' extension --- extensions/cookie-manager.c | 622 ++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + 2 files changed, 623 insertions(+) create mode 100644 extensions/cookie-manager.c diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c new file mode 100644 index 00000000..d4515b74 --- /dev/null +++ b/extensions/cookie-manager.c @@ -0,0 +1,622 @@ +/* + Copyright (C) 2009 Enrico Tröger + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "config.h" +#include +#include + +#define CM_DEBUG 0 + +#define STOCK_COOKIE_MANAGER "cookie-manager" +#define CM_EMPTY_LABEL_TEXT "\n\n\n\n\n" + +enum +{ + COL_NAME, + COL_TOOLTIP, + COL_ITEM, /* indicates whether a row is a child (cookie name) or a parent (domain name) */ + COL_COOKIE, + N_COLUMNS +}; + +typedef struct _CMData +{ + MidoriApp *app; + + GtkWidget *panel_page; + GtkWidget *desc_label; + GtkWidget *delete_button; + + GtkWidget *treeview; + GtkTreeStore *store; + + GtkWidget *popup_menu; + + SoupCookieJar *jar; + GSList *cookies; + + guint timer_id; + gint ignore_changed_count; +} CMData; + +static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); + + +#if CM_DEBUG +static gchar *cookie_to_string(SoupCookie *c) +{ + if (c != NULL) + { + static gchar s[256]; /* this might be too small but for debugging it should be ok */ + g_snprintf(s, sizeof(s), "%s\t%s = %s", c->domain, c->name, c->value); + return s; + } + return NULL; +} +#endif + + +static void cm_free_cookie_list(CMData *cmdata) +{ + if (cmdata->cookies != NULL) + { + GSList *l; + + for (l = cmdata->cookies; l != NULL; l = g_slist_next(l)) + soup_cookie_free(l->data); + g_slist_free(cmdata->cookies); + cmdata->cookies = NULL; + } +} + + +static void cm_deactivate_cb(MidoriExtension *extension, CMData *cmdata) +{ + g_signal_handlers_disconnect_by_func(cmdata->app, cm_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func(extension, cm_deactivate_cb, cmdata); + + cm_free_cookie_list(cmdata); + + gtk_widget_destroy(cmdata->panel_page); + gtk_widget_destroy(cmdata->popup_menu); + g_free(cmdata); +} + + +static void cm_refresh_store(CMData *cmdata) +{ + GSList *l; + GHashTable *parents; + GtkTreeIter iter; + GtkTreeIter *parent_iter; + gchar *tooltip = NULL; + SoupCookie *cookie; + + g_object_ref(cmdata->store); + gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), NULL); + + gtk_tree_store_clear(cmdata->store); + + /* free the old list */ + cm_free_cookie_list(cmdata); + + cmdata->cookies = soup_cookie_jar_all_cookies(cmdata->jar); + + /* Hashtable holds domain names as keys, the corresponding tree iters as values */ + parents = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + + for (l = cmdata->cookies; l != NULL; l = g_slist_next(l)) + { + cookie = l->data; + + /* look for the parent item for the current domain name and create it if it doesn't exist */ + if ((parent_iter = (GtkTreeIter*) g_hash_table_lookup(parents, cookie->domain)) == NULL) + { + parent_iter = g_new0(GtkTreeIter, 1); + + gtk_tree_store_append(cmdata->store, parent_iter, NULL); + gtk_tree_store_set(cmdata->store, parent_iter, + COL_NAME, cookie->domain, + COL_ITEM, FALSE, + -1); + + g_hash_table_insert(parents, g_strdup(cookie->domain), parent_iter); + } + + if (gtk_check_version(2, 12, 0) == NULL) + tooltip = g_markup_printf_escaped( + _("Host: %s\nPath: %s\nSecure: %s\nName: %s\nValue: %s"), + cookie->domain, + cookie->path, + cookie->secure ? _("Yes") : _("No"), + cookie->name, + cookie->value); + + gtk_tree_store_append(cmdata->store, &iter, parent_iter); + gtk_tree_store_set(cmdata->store, &iter, + COL_NAME, cookie->name, + COL_TOOLTIP, tooltip, + COL_ITEM, TRUE, + COL_COOKIE, cookie, + -1); + + g_free(tooltip); + } + g_hash_table_destroy(parents); + + gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), GTK_TREE_MODEL(cmdata->store)); + g_object_unref(cmdata->store); +} + + +static void cm_tree_selection_changed_cb(GtkTreeSelection *selection, CMData *cmdata) +{ + GtkTreeIter iter; + GtkTreeModel *model; + gchar *text; + gboolean is_item; + + gtk_tree_selection_get_selected(selection, &model, &iter); + + if (model == NULL || ! gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) + { + /* This is a bit hack'ish but we add some empty lines to get a minimum height of the + * label at the bottom without any font size calculation. */ + gtk_label_set_text(GTK_LABEL(cmdata->desc_label), CM_EMPTY_LABEL_TEXT); + gtk_widget_set_sensitive(cmdata->delete_button, FALSE); + return; + } + + gtk_tree_model_get(model, &iter, COL_TOOLTIP, &text, COL_ITEM, &is_item, -1); + + gtk_label_set_markup(GTK_LABEL(cmdata->desc_label), text); + + gtk_widget_set_sensitive(cmdata->delete_button, TRUE); + + g_free(text); +} + + +static gboolean cm_tree_button_press_event_cb(GtkWidget *widget, GdkEventButton *ev, CMData *cmdata) +{ + if (ev->type == GDK_2BUTTON_PRESS) + { + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + model = GTK_TREE_MODEL(cmdata->store); + + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) + { + /* double click on parent node expands/collapses it */ + if (gtk_tree_model_iter_has_child(model, &iter)) + { + GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); + else + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); + + gtk_tree_path_free(path); + + return TRUE; + } + } + } + return FALSE; +} + + +static gboolean cm_tree_button_release_event_cb(GtkWidget *widget, GdkEventButton *ev, CMData *cmdata) +{ + if (ev->button == 3) + { + gtk_menu_popup(GTK_MENU(cmdata->popup_menu), NULL, NULL, NULL, NULL, ev->button, ev->time); + return TRUE; + } + return FALSE; +} + + +static void cm_tree_popup_collapse_activate_cb(GtkCheckMenuItem *item, CMData *cmdata) +{ + gtk_tree_view_collapse_all(GTK_TREE_VIEW(cmdata->treeview)); +} + + +static void cm_tree_popup_expand_activate_cb(GtkCheckMenuItem *item, CMData *cmdata) +{ + gtk_tree_view_expand_all(GTK_TREE_VIEW(cmdata->treeview)); +} + + +static void cm_delete_cookie(GtkTreeModel *model, GtkTreeIter *child, CMData *cmdata) +{ + SoupCookie *cookie; + + gtk_tree_model_get(model, child, COL_COOKIE, &cookie, -1); + + if (cookie != NULL) + { + cmdata->ignore_changed_count++; + + soup_cookie_jar_delete_cookie(cmdata->jar, cookie); + /* the SoupCookie object is freed when the whole list gets updated */ + } +} + + +static void cm_button_delete_clicked_cb(GtkWidget *button, CMData *cmdata) +{ + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cmdata->treeview)); + gtk_tree_selection_get_selected(selection, &model, &iter); + + if (gtk_tree_model_iter_has_child(model, &iter)) + { + gint i, n = gtk_tree_model_iter_n_children(model, &iter); + GtkTreeIter child; + + for (i = 0; i < n; i++) + { + gtk_tree_model_iter_nth_child(model, &child, &iter, i); + cm_delete_cookie(model, &child, cmdata); + } + /* remove the parent */ + /* TODO does this really remove all children automatically? */ + gtk_tree_store_remove(cmdata->store, &iter); + } + else + { + GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + + cm_delete_cookie(model, &iter, cmdata); + gtk_tree_store_remove(cmdata->store, &iter); + + /* check whether the parent still has children, otherwise delete it */ + if (gtk_tree_path_up(path)) + { + gtk_tree_model_get_iter(model, &iter, path); + if (! gtk_tree_model_iter_has_child(model, &iter)) + /* remove the empty parent */ + gtk_tree_store_remove(cmdata->store, &iter); + } + gtk_tree_path_free(path); + } +} + + +static void cm_delete_all_cookies_real(CMData *cmdata) +{ + GSList *l; + + for (l = cmdata->cookies; l != NULL; l = g_slist_next(l)) + { + SoupCookie *cookie = l->data; + + cmdata->ignore_changed_count++; + soup_cookie_jar_delete_cookie(cmdata->jar, cookie); + /* the SoupCookie object is freed below when calling cm_free_cookie_list() */ + } + + gtk_tree_store_clear(cmdata->store); + cm_free_cookie_list(cmdata); +} + + +static void cm_button_delete_all_clicked_cb(GtkWidget *button, CMData *cmdata) +{ + GtkWidget *dialog; + GtkWidget *toplevel = gtk_widget_get_toplevel(button); + + dialog = gtk_message_dialog_new(GTK_WINDOW(toplevel), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + _("Do you really want to delete all cookies?")); + + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); + /* steal Midori's icon :) */ + gtk_window_set_icon_name(GTK_WINDOW(dialog), gtk_window_get_icon_name(GTK_WINDOW(toplevel))); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) + cm_delete_all_cookies_real(cmdata); + + gtk_widget_destroy(dialog); +} + + +static void cm_tree_drag_data_get_cb(GtkWidget *widget, GdkDragContext *drag_context, + GtkSelectionData *data, guint info, guint ltime, CMData *cmdata) +{ + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreeSelection *selection; + gchar *name, *text; + gboolean is_item; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cmdata->treeview)); + gtk_tree_selection_get_selected(selection, &model, &iter); + + if (model != NULL && gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) + { + gtk_tree_model_get(model, &iter, COL_NAME, &name, COL_ITEM, &is_item, -1); + + if (! is_item && name != NULL) + { + /* skip a leading dot */ + text = (*name == '.') ? name + 1 : name; + + gtk_selection_data_set_text(data, text, -1); + } + g_free(name); + } +} + + +static void cm_tree_prepare(CMData *cmdata) +{ + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkTreeSelection *sel; + GtkWidget *tree; + GtkWidget *item; + GtkWidget *menu; + + cmdata->treeview = tree = gtk_tree_view_new(); + cmdata->store = gtk_tree_store_new(N_COLUMNS, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, SOUP_TYPE_COOKIE); + + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes( + _("Name"), renderer, "text", COL_NAME, NULL); + gtk_tree_view_column_set_sort_indicator(column, TRUE); + gtk_tree_view_column_set_sort_column_id(column, COL_NAME); + gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); + + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree), TRUE); + gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tree), TRUE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(tree), COL_NAME); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(cmdata->store), COL_NAME, GTK_SORT_ASCENDING); + + if (gtk_check_version(2, 12, 0) == NULL) + g_object_set(tree, "tooltip-column", COL_TOOLTIP, NULL); + + /* selection handling */ + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); + gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); + + gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(cmdata->store)); + g_object_unref(cmdata->store); + + /* signals */ + g_signal_connect(sel, "changed", G_CALLBACK(cm_tree_selection_changed_cb), cmdata); + g_signal_connect(tree, "button-press-event", G_CALLBACK(cm_tree_button_press_event_cb), cmdata); + g_signal_connect(tree, "button-release-event", G_CALLBACK(cm_tree_button_release_event_cb), cmdata); + + /* drag'n'drop */ + gtk_tree_view_enable_model_drag_source( + GTK_TREE_VIEW(tree), + GDK_BUTTON1_MASK, + NULL, + 0, + GDK_ACTION_COPY + ); + gtk_drag_source_add_text_targets(tree); + /*gtk_drag_source_add_uri_targets(tree);*/ + g_signal_connect(tree, "drag-data-get", G_CALLBACK(cm_tree_drag_data_get_cb), cmdata); + + /* popup menu */ + menu = gtk_menu_new(); + + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_DELETE, NULL); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(cm_button_delete_clicked_cb), cmdata); + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + item = gtk_image_menu_item_new_with_mnemonic(_("_Expand All")); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), + gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU)); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(cm_tree_popup_expand_activate_cb), cmdata); + + item = gtk_image_menu_item_new_with_mnemonic(_("_Collapse All")); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), + gtk_image_new_from_icon_name(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU)); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(cm_tree_popup_collapse_activate_cb), cmdata); + + cmdata->popup_menu = menu; +} + + +static gboolean cm_delayed_refresh(CMData *cmdata) +{ + cm_refresh_store(cmdata); + cmdata->timer_id = 0; + + return FALSE; +} + + +static void cm_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, CMData *cmdata) +{ + if (cmdata->ignore_changed_count > 0) + { + cmdata->ignore_changed_count--; + return; + } + + /* We delay these events a little bit to avoid too many rebuilds of the tree. + * Some websites (like Flyspray bugtrackers sent a whole bunch of cookies at once. */ + if (cmdata->timer_id == 0) + { + cmdata->timer_id = g_timeout_add_seconds(1, (GSourceFunc) cm_delayed_refresh, cmdata); + } +} + + +static void cm_page_realize_cb(GtkWidget *widget, CMData *cmdata) +{ + /* Initially fill the tree view. This gets also called when the alignment of the panel is + * changed but then we don't need to rebuild the tree. */ + if (cmdata->cookies == NULL) + cm_refresh_store(cmdata); +} + + +static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext) +{ + GtkWidget *panel; + GtkWidget *tree_swin; + GtkWidget *desc_swin; + GtkWidget *toolbar; + GtkToolItem *toolitem; + SoupSession *session; + CMData *cmdata; + + cmdata = g_new0(CMData, 1); + cmdata->app = app; + + panel = katze_object_get_object(browser, "panel"); + toolbar = gtk_toolbar_new(); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON); + gtk_widget_show(toolbar); + + toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE); + gtk_tool_item_set_is_important(toolitem, TRUE); + g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmdata); + gtk_widget_show(GTK_WIDGET(toolitem)); + gtk_widget_set_sensitive(GTK_WIDGET(toolitem), FALSE); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + cmdata->delete_button = GTK_WIDGET(toolitem); + + toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE); + gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolitem), _("Delete All")); + gtk_tool_item_set_is_important(toolitem, TRUE); + g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_all_clicked_cb), cmdata); + gtk_widget_show(GTK_WIDGET(toolitem)); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + + toolitem = gtk_separator_tool_item_new(); + gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolitem), FALSE); + gtk_tool_item_set_expand(toolitem, TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + gtk_widget_show(GTK_WIDGET(toolitem)); + + toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_ADD); + gtk_tool_item_set_tooltip_text(toolitem, _("Expand All")); + g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_tree_popup_expand_activate_cb), cmdata); + gtk_widget_show(GTK_WIDGET(toolitem)); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + + toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_REMOVE); + gtk_tool_item_set_tooltip_text(toolitem, _("Collapse All")); + g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_tree_popup_collapse_activate_cb), cmdata); + gtk_widget_show(GTK_WIDGET(toolitem)); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + + cmdata->desc_label = gtk_label_new(CM_EMPTY_LABEL_TEXT); + gtk_label_set_selectable(GTK_LABEL(cmdata->desc_label), TRUE); + gtk_label_set_line_wrap(GTK_LABEL(cmdata->desc_label), TRUE); + gtk_label_set_line_wrap_mode(GTK_LABEL(cmdata->desc_label), PANGO_WRAP_CHAR); + gtk_misc_set_alignment(GTK_MISC(cmdata->desc_label), 0, 0); + gtk_widget_show(cmdata->desc_label); + + desc_swin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(desc_swin), + GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(desc_swin), GTK_SHADOW_IN); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(desc_swin), cmdata->desc_label); + gtk_widget_show(desc_swin); + + cm_tree_prepare(cmdata); + gtk_widget_show(cmdata->treeview); + + tree_swin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tree_swin), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_swin), GTK_SHADOW_IN); + gtk_container_add(GTK_CONTAINER(tree_swin), cmdata->treeview); + gtk_widget_show(tree_swin); + + cmdata->panel_page = gtk_vpaned_new(); + gtk_paned_pack1(GTK_PANED(cmdata->panel_page), tree_swin, TRUE, FALSE); + gtk_paned_pack2(GTK_PANED(cmdata->panel_page), desc_swin, FALSE, FALSE); + gtk_widget_show(cmdata->panel_page); + + /* setup soup */ + session = webkit_get_default_session(); + cmdata->jar = SOUP_COOKIE_JAR(soup_session_get_feature(session, soup_cookie_jar_get_type())); + g_signal_connect(cmdata->jar, "changed", G_CALLBACK(cm_jar_changed_cb), cmdata); + + midori_panel_append_widget(MIDORI_PANEL(panel), cmdata->panel_page, + STOCK_COOKIE_MANAGER, _("Cookie Manager"), toolbar); + + g_signal_connect(cmdata->panel_page, "realize", G_CALLBACK(cm_page_realize_cb), cmdata); + g_signal_connect(ext, "deactivate", G_CALLBACK(cm_deactivate_cb), cmdata); +} + + +static void cm_activate_cb(MidoriExtension *extension, MidoriApp *app, gpointer data) +{ + g_signal_connect(app, "add-browser", G_CALLBACK(cm_app_add_browser_cb), extension); +} + + +MidoriExtension *extension_init(void) +{ + MidoriExtension *extension; + GtkIconFactory *factory; + GtkIconSource *icon_source; + GtkIconSet *icon_set; + static GtkStockItem items[] = + { + { STOCK_COOKIE_MANAGER, N_("_Cookie Manager"), 0, 0, NULL } + }; + + factory = gtk_icon_factory_new(); + gtk_stock_add(items, G_N_ELEMENTS(items)); + icon_set = gtk_icon_set_new(); + icon_source = gtk_icon_source_new(); + gtk_icon_source_set_icon_name(icon_source, GTK_STOCK_DIALOG_AUTHENTICATION); + gtk_icon_set_add_source(icon_set, icon_source); + gtk_icon_source_free(icon_source); + gtk_icon_factory_add(factory, STOCK_COOKIE_MANAGER, icon_set); + gtk_icon_set_unref(icon_set); + gtk_icon_factory_add_default(factory); + g_object_unref(factory); + + extension = g_object_new(MIDORI_TYPE_EXTENSION, + "name", _("Cookie Manager"), + "description", _("List, view and delete cookies"), + "version", "0.1", + "authors", "Enrico Tröger ", + NULL); + + g_signal_connect(extension, "activate", G_CALLBACK(cm_activate_cb), NULL); + + return extension; +} diff --git a/po/POTFILES.in b/po/POTFILES.in index 4dac5136..23855c92 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,6 +25,7 @@ katze/katze-item.c katze/katze-array.c katze/katze-arrayaction.c extensions/colorful-tabs.c +extensions/cookie-manager.c extensions/mouse-gestures/main.c extensions/page-holder.c extensions/statusbar-features.c From 32d17cf2c25a16d194fda57504b72a70421c84c8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Mar 2009 23:53:50 +0100 Subject: [PATCH 0906/2970] Add "move-item" and katze_array_move_item --- katze/katze-array.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ katze/katze-array.h | 5 ++++ katze/marshal.list | 1 + katze/wscript_build | 1 + 4 files changed, 65 insertions(+) create mode 100644 katze/marshal.list diff --git a/katze/katze-array.c b/katze/katze-array.c index baebfeac..ae451ab7 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -12,6 +12,7 @@ #include "katze-array.h" #include "katze-utils.h" +#include "marshal.h" #include #include @@ -44,6 +45,10 @@ struct _KatzeArrayClass (*remove_item) (KatzeArray* array, gpointer item); void + (*move_item) (KatzeArray* array, + gpointer item, + gint index); + void (*clear) (KatzeArray* array); }; @@ -52,6 +57,7 @@ G_DEFINE_TYPE (KatzeArray, katze_array, KATZE_TYPE_ITEM); enum { ADD_ITEM, REMOVE_ITEM, + MOVE_ITEM, CLEAR, LAST_SIGNAL @@ -93,6 +99,15 @@ _katze_array_remove_item (KatzeArray* array, } } +static void +_katze_array_move_item (KatzeArray* array, + gpointer item, + gint position) +{ + array->items = g_list_remove (array->items, item); + array->items = g_list_insert (array->items, item, position); +} + static void _katze_array_clear (KatzeArray* array) { @@ -140,6 +155,28 @@ katze_array_class_init (KatzeArrayClass* class) G_TYPE_NONE, 1, G_TYPE_POINTER); + /** + * KatzeArray::move-item: + * @array: the object on which the signal is emitted + * @item: the item being moved + * @position: the new position of the item + * + * An item is moved to a new position. + * + * Since: 0.1.6 + **/ + signals[MOVE_ITEM] = g_signal_new ( + "move-item", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + G_STRUCT_OFFSET (KatzeArrayClass, move_item), + 0, + NULL, + katze_cclosure_marshal_VOID__POINTER_INT, + G_TYPE_NONE, 2, + G_TYPE_POINTER, + G_TYPE_INT); + signals[CLEAR] = g_signal_new ( "clear", G_TYPE_FROM_CLASS (class), @@ -155,6 +192,7 @@ katze_array_class_init (KatzeArrayClass* class) class->add_item = _katze_array_add_item; class->remove_item = _katze_array_remove_item; + class->move_item = _katze_array_move_item; class->clear = _katze_array_clear; } @@ -371,6 +409,26 @@ katze_array_get_length (KatzeArray* array) return g_list_length (array->items); } +/** + * katze_array_move_item: + * @array: a #KatzeArray + * @item: the item being moved + * @position: the new position of the item + * + * Moves @item to the position @position. + * + * Since: 0.1.6 + **/ +void +katze_array_move_item (KatzeArray* array, + gpointer item, + gint position) +{ + g_return_if_fail (KATZE_IS_ARRAY (array)); + + g_signal_emit (array, signals[MOVE_ITEM], 0, item, position); +} + /** * katze_array_clear: * @array: a #KatzeArray diff --git a/katze/katze-array.h b/katze/katze-array.h index c99867d1..89bfea9c 100644 --- a/katze/katze-array.h +++ b/katze/katze-array.h @@ -68,6 +68,11 @@ katze_array_find_token (KatzeArray* array, guint katze_array_get_length (KatzeArray* array); +void +katze_array_move_item (KatzeArray* array, + gpointer item, + gint position); + void katze_array_clear (KatzeArray* array); diff --git a/katze/marshal.list b/katze/marshal.list new file mode 100644 index 00000000..ce752891 --- /dev/null +++ b/katze/marshal.list @@ -0,0 +1 @@ +VOID:POINTER,INT diff --git a/katze/wscript_build b/katze/wscript_build index b52eb015..27a24fc2 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -9,6 +9,7 @@ obj.name = 'katze' obj.target = 'katze' obj.includes = '. ../.' obj.find_sources_in_dirs ('.') +obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal') obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML' obj.install_path = None From fce6761870b0e37318f853618876c6378c028a44 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 24 Mar 2009 23:54:37 +0100 Subject: [PATCH 0907/2970] Save tab reordering to the session --- midori/midori-browser.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2b103dc1..b03063aa 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3143,6 +3143,18 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_update_progress (browser, MIDORI_VIEW (view)); } +static void +midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook, + MidoriView* view, + guint page_num, + MidoriBrowser* browser) +{ + KatzeItem* item = midori_view_get_proxy_item (view); + katze_array_move_item (browser->proxy_array, item, page_num); + + g_object_notify (G_OBJECT (browser), "uri"); +} + static gboolean gtk_notebook_button_press_event_cb (GtkNotebook* notebook, GdkEventButton* event, @@ -4050,6 +4062,9 @@ midori_browser_init (MidoriBrowser* browser) g_signal_connect_after (browser->notebook, "switch-page", G_CALLBACK (gtk_notebook_switch_page_cb), browser); + g_signal_connect (browser->notebook, "page-reordered", + G_CALLBACK (midori_browser_notebook_page_reordered_cb), + browser); g_signal_connect (browser->notebook, "button-press-event", G_CALLBACK (gtk_notebook_button_press_event_cb), browser); From ba7ada884632497be984445687590d4f43fee466 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Wed, 25 Mar 2009 00:13:44 +0100 Subject: [PATCH 0908/2970] Update Japanese translation --- po/ja.po | 729 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 385 insertions(+), 344 deletions(-) diff --git a/po/ja.po b/po/ja.po index 84f84e22..938fdf18 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.4\n" +"Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-16 13:26+0900\n" -"PO-Revision-Date: 2009-03-16 17:48+0900\n" +"POT-Creation-Date: 2009-03-23 17:16+0900\n" +"PO-Revision-Date: 2009-03-23 22:00+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "軽量級ウェブブラウザ" #: ../midori/main.c:1672 #: ../midori/main.c:1681 #: ../midori/main.c:1692 -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -33,99 +33,94 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:102 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:157 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:164 -#: ../midori/main.c:234 +#: ../midori/main.c:165 +#: ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:476 +#: ../midori/main.c:477 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:484 -#: ../midori/main.c:493 +#: ../midori/main.c:485 +#: ../midori/main.c:494 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/main.c:515 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:547 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:601 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:625 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:648 -#: ../midori/main.c:682 -#: ../midori/main.c:698 +#: ../midori/main.c:649 +#: ../midori/main.c:683 +#: ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:878 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:906 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:935 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1065 +#: ../midori/main.c:1066 #: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1086 -#: ../midori/main.c:1113 -#: ../midori/main.c:1141 +#: ../midori/main.c:1087 +#: ../midori/main.c:1114 +#: ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1165 -#: ../midori/main.c:1189 +#: ../midori/main.c:1166 +#: ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1220 -#: ../midori/midori-preferences.c:433 -msgid "Transfers" -msgstr "転送" - #: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" @@ -219,522 +214,522 @@ msgstr "次のエラーが発生しました:" msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:277 -#: ../midori/midori-browser.c:3060 -#: ../midori/midori-browser.c:3066 +#: ../midori/midori-browser.c:278 +#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:288 -#: ../midori/midori-browser.c:3063 +#: ../midori/midori-browser.c:289 +#: ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:597 +#: ../midori/midori-browser.c:598 #: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:617 #: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:640 -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 +#: ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2635 +#: ../midori/midori-browser.c:2837 #: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2642 +#: ../midori/midori-browser.c:2844 #: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2645 +#: ../midori/midori-browser.c:2847 #: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:2799 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:2807 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:2994 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:2997 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3000 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3008 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3012 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3020 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3023 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3026 -#: ../midori/midori-browser.c:3029 +#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3032 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3035 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3044 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3056 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3057 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3069 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:3278 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3280 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3081 -#: ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3283 +#: ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3084 -#: ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3286 +#: ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3087 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3289 +#: ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3090 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3292 +#: ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3093 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3295 +#: ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3096 -#: ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3298 +#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3099 -#: ../midori/midori-view.c:1073 +#: ../midori/midori-browser.c:3301 +#: ../midori/midori-view.c:1111 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3123 -#: ../midori/midori-view.c:1045 +#: ../midori/midori-browser.c:3325 +#: ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3330 #: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3129 +#: ../midori/midori-browser.c:3331 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3333 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3352 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3187 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3188 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3621 +#: ../midori/midori-browser.c:3821 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3628 +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3630 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3654 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3675 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3688 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3690 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3703 +#: ../midori/midori-browser.c:3903 #: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:3705 +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3718 +#: ../midori/midori-browser.c:3918 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3720 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3883 +#: ../midori/midori-browser.c:4085 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:3908 +#: ../midori/midori-browser.c:4110 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4115 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:3926 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:3936 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" #: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" #: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" @@ -743,652 +738,678 @@ msgstr "サイドパネルを右側に表示します" msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:177 -#: ../midori/midori-view.c:1789 +#: ../midori/midori-websettings.c:179 +#: ../midori/midori-view.c:1888 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:178 -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 +#: ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:252 -#: ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "メニューバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "パネルを表示するかどうか指定します" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "転送バーを表示する" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "転送バーを表示します" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示するかどうか指定します" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示する" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在または最後のタブの隣に開きます" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:660 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れる" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:716 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:725 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:734 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:742 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "User-Agent" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "ウェブページに報告する User-Agent 識別名を指定します" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "User-Agent アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:626 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:956 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:958 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:975 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:985 -msgid "_Save Link destination" -msgstr "リンク先を保存(_S)" - -#: ../midori/midori-view.c:993 +#: ../midori/midori-view.c:1016 +#: ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1015 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "リンク先を保存(_S)" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1024 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1491 +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "ファイルを開きますか、保存しますか?" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "ファイルタイプ: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "%s を開く" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1632 -msgid "Source" -msgstr "ソース" - -#: ../midori/midori-view.c:1656 +#: ../midori/midori-view.c:1755 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1672 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-preferences.c:94 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "%s の設定" #. Page "General" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "一般" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "起動" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "現在のページをホームページにします" +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "転送" + #. Page "Appearance" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "文字表示で使用される最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:498 #: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:509 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:514 #: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:518 #: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" msgstr "組み込みプラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:534 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:546 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:547 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:556 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "ブラウジング" -#: ../midori/midori-preferences.c:595 -#: ../midori/midori-preferences.c:596 +#. Page "Network" +#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:580 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:632 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:641 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:654 -#: ../midori/midori-preferences.c:668 +#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:636 msgid "days" msgstr "日" -#: ../midori/midori-preferences.c:661 +#: ../midori/midori-preferences.c:629 #: ../panels/midori-history.c:104 msgid "History" msgstr "履歴" @@ -1496,32 +1517,32 @@ msgstr "%s は %s.%s に割り当てることはできません" msgid "%s.%s cannot be accessed" msgstr "%s.%s にアクセスできません" -#: ../panels/midori-addons.c:97 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:1005 +#: ../panels/midori-addons.c:922 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:1006 +#: ../panels/midori-addons.c:923 #: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "有効" -#: ../panels/midori-addons.c:1015 +#: ../panels/midori-addons.c:932 #: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-addons.c:1016 +#: ../panels/midori-addons.c:933 #: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "無効" @@ -1593,6 +1614,11 @@ msgstr "昨日" msgid "Plugins" msgstr "プラグイン" +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "認証が要求されました" @@ -1642,6 +1668,18 @@ msgstr "ファイルの選択" msgid "Choose folder" msgstr "フォルダの選択" +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "タブを区別する色をつける" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "カラフルタブ" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "各タブにそれぞれを区別する色をつけます" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "マウスジェスチャ" @@ -1668,3 +1706,6 @@ msgstr "画像" msgid "Scripts" msgstr "スクリプト" +#~ msgid "Source" +#~ msgstr "ソース" + From 3df21e947f2fa395647eb506eaf47626a9148fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Wed, 25 Mar 2009 00:43:03 +0100 Subject: [PATCH 0909/2970] Add pageholder to existing browsers and not only new ones --- extensions/page-holder.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/extensions/page-holder.c b/extensions/page-holder.c index 2902b78a..7d3032bd 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -122,6 +122,14 @@ static void page_holder_activate_cb (MidoriExtension* extension, MidoriApp* app) { + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + page_holder_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (page_holder_app_add_browser_cb), extension); } From d0a947528c31dca472e5d862f60cd8eaa4c974ef Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 25 Mar 2009 02:04:41 +0100 Subject: [PATCH 0910/2970] Always lookup an item to find a radio group Storing a group isn't good enough because as soon as an item is removed that group is invalid and can't be reused anymore. --- midori/midori-panel.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 41574536..4f1dcc0b 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -29,7 +29,6 @@ struct _MidoriPanel GtkWidget* frame; GtkWidget* toolbook; GtkWidget* notebook; - GSList* group; GtkMenu* menu; gboolean right_aligned; @@ -93,7 +92,6 @@ midori_panel_class_init (MidoriPanelClass* class) GObjectClass* gobject_class; GParamFlags flags; - signals[CLOSE] = g_signal_new ( "close", G_TYPE_FROM_CLASS (class), @@ -511,9 +509,9 @@ midori_panel_append_page (MidoriPanel* panel, label = midori_viewable_get_label (viewable); stock_id = midori_viewable_get_stock_id (viewable); - toolitem = gtk_radio_tool_button_new_from_stock (panel->group, stock_id); - panel->group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON ( - toolitem)); + toolitem = gtk_radio_tool_button_new_from_stock (NULL, stock_id); + g_object_set (toolitem, "group", + gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), 0), NULL); image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); if (label) From 164bd5b265d29262a5ba3c552cbe9da916d876a2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 25 Mar 2009 02:07:27 +0100 Subject: [PATCH 0911/2970] Add midori_extension_get_app and enforce a valid app We change the deactivation so that an extension is regarded as active until the 'deactivate' signal was processed. And we define that 'activate' must be called with a valid app. --- midori/midori-extension.c | 39 ++++++++++++++++++++++++++++++++------- midori/midori-extension.h | 5 ++++- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index ce02313b..99030c34 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -15,8 +15,6 @@ #include #endif -#include "midori-app.h" - #include #include "sokoke.h" #include @@ -30,6 +28,7 @@ struct _MidoriExtensionPrivate gchar* version; gchar* authors; + MidoriApp* app; gboolean active; gchar* config_dir; GList* lsettings; @@ -217,7 +216,11 @@ static void midori_extension_activate_cb (MidoriExtension* extension, MidoriApp* app) { - GList* lsettings = g_list_first (extension->priv->lsettings); + GList* lsettings; + + g_return_if_fail (MIDORI_IS_APP (app)); + + lsettings = g_list_first (extension->priv->lsettings); /* If a configuration directory was requested before activation we assume we should load and save settings. This is a detail that @@ -279,6 +282,7 @@ midori_extension_activate_cb (MidoriExtension* extension, lsettings = g_list_next (lsettings); } + extension->priv->app = g_object_ref (app); extension->priv->active = TRUE; /* FIXME: Disconnect all signal handlers */ } @@ -289,6 +293,7 @@ midori_extension_init (MidoriExtension* extension) extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (extension, MIDORI_TYPE_EXTENSION, MidoriExtensionPrivate); + extension->priv->app = NULL; extension->priv->active = FALSE; extension->priv->config_dir = NULL; extension->priv->lsettings = NULL; @@ -305,6 +310,7 @@ midori_extension_finalize (GObject* object) { MidoriExtension* extension = MIDORI_EXTENSION (object); + katze_object_assign (extension->priv->app, NULL); katze_assign (extension->priv->name, NULL); katze_assign (extension->priv->description, NULL); katze_assign (extension->priv->version, NULL); @@ -417,16 +423,35 @@ midori_extension_is_active (MidoriExtension* extension) * midori_extension_deactivate: * @extension: a #MidoriExtension * - * Attempts to deactivate @extension in a way that the instance - * is actually finished irreversibly. + * Attempts to deactivate @extension. **/ void midori_extension_deactivate (MidoriExtension* extension) { - g_return_if_fail (MIDORI_IS_EXTENSION (extension)); + g_return_if_fail (midori_extension_is_active (extension)); - extension->priv->active = FALSE; g_signal_emit (extension, signals[DEACTIVATE], 0); + extension->priv->active = FALSE; + katze_object_assign (extension->priv->app, NULL); +} + +/** + * midori_extension_get_app: + * @extension: a #MidoriExtension + * + * Retrieves the #MidoriApp the extension belongs to. The + * extension has to be active. + * + * Return value: the #MidoriApp instance + * + * Since 0.1.6 + **/ +MidoriApp* +midori_extension_get_app (MidoriExtension* extension) +{ + g_return_val_if_fail (midori_extension_is_active (extension), NULL); + + return extension->priv->app; } /** diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 3cab6ba6..1125d4cb 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -12,7 +12,7 @@ #ifndef __MIDORI_EXTENSION_H__ #define __MIDORI_EXTENSION_H__ -#include +#include "midori-app.h" G_BEGIN_DECLS @@ -57,6 +57,9 @@ midori_extension_is_active (MidoriExtension* extension); void midori_extension_deactivate (MidoriExtension* extension); +MidoriApp* +midori_extension_get_app (MidoriExtension* extension); + const gchar* midori_extension_get_config_dir (MidoriExtension* extension); From 331537201a05c1e3c91a0317dfcad7530fc7fd9b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 25 Mar 2009 02:11:16 +0100 Subject: [PATCH 0912/2970] Use a valid app when testing extension activation --- tests/extensions.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/extensions.c b/tests/extensions.c index edc87492..aba3a41c 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -33,8 +33,10 @@ extension_deactivate_cb (MidoriExtension* extension) static void extension_create (void) { + MidoriApp* app; MidoriExtension* extension; + app = midori_app_new (); extension = g_object_new (MIDORI_TYPE_EXTENSION, NULL); g_assert (!midori_extension_is_prepared (extension)); g_object_set (extension, "name", "TestExtension", @@ -48,8 +50,9 @@ extension_create (void) G_CALLBACK (extension_activate_cb), NULL); g_assert (midori_extension_is_prepared (extension)); g_assert (!midori_extension_is_active (extension)); - g_signal_emit_by_name (extension, "activate", NULL); + g_signal_emit_by_name (extension, "activate", app); g_assert (midori_extension_is_active (extension)); + g_assert (midori_extension_get_app (extension) == app); g_assert (g_object_get_data (G_OBJECT (extension), "activated") == magic); g_signal_connect (extension, "deactivate", G_CALLBACK (extension_deactivate_cb), NULL); @@ -75,18 +78,20 @@ extension_mock_object (void) static void extension_settings (void) { + MidoriApp* app; MidoriExtension* extension; gboolean nihilist; gint age; const gchar* lastname; + app = midori_app_new (); extension = extension_mock_object (); midori_extension_install_boolean (extension, "nihilist", TRUE); nihilist = midori_extension_get_boolean (extension, "nihilist"); g_assert (!nihilist); g_signal_connect (extension, "activate", G_CALLBACK (extension_activate_cb), NULL); - g_signal_emit_by_name (extension, "activate", NULL); + g_signal_emit_by_name (extension, "activate", app); nihilist = midori_extension_get_boolean (extension, "nihilist"); g_assert (nihilist); midori_extension_set_boolean (extension, "nihilist", FALSE); @@ -100,7 +105,7 @@ extension_settings (void) g_assert_cmpint (age, ==, 0); g_signal_connect (extension, "activate", G_CALLBACK (extension_activate_cb), NULL); - g_signal_emit_by_name (extension, "activate", NULL); + g_signal_emit_by_name (extension, "activate", app); age = midori_extension_get_integer (extension, "age"); g_assert_cmpint (age, ==, 88); midori_extension_set_integer (extension, "age", 66); @@ -114,7 +119,7 @@ extension_settings (void) g_assert_cmpstr (lastname, ==, NULL); g_signal_connect (extension, "activate", G_CALLBACK (extension_activate_cb), NULL); - g_signal_emit_by_name (extension, "activate", NULL); + g_signal_emit_by_name (extension, "activate", app); lastname = midori_extension_get_string (extension, "lastname"); g_assert_cmpstr (lastname, ==, "Thomas Mann"); midori_extension_set_string (extension, "lastname", "Theodor Fontane"); From 8ff4ff5909515e27f8cce235ad26fea69426d8ca Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 25 Mar 2009 02:12:12 +0100 Subject: [PATCH 0913/2970] Use the new midori_extension_get_app in extensions --- extensions/page-holder.c | 11 +++++++++++ extensions/statusbar-features.c | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/extensions/page-holder.c b/extensions/page-holder.c index 7d3032bd..9ceb1963 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -13,6 +13,11 @@ #define STOCK_PAGE_HOLDER "page-holder" +static void +page_holder_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + static gint page_holder_notebook_append_view (GtkWidget* notebook) { @@ -68,7 +73,13 @@ static void page_holder_deactivate_cb (MidoriExtension* extension, GtkWidget* notebook) { + MidoriApp* app = midori_extension_get_app (extension); + gtk_widget_destroy (notebook); + g_signal_handlers_disconnect_by_func ( + extension, page_holder_deactivate_cb, notebook); + g_signal_handlers_disconnect_by_func ( + app, page_holder_app_add_browser_cb, extension); } static void diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 8362a4e9..d4792299 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -11,13 +11,22 @@ #include +static void +statusbar_features_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + static void statusbar_features_deactivate_cb (MidoriExtension* extension, GtkWidget* bbox) { + MidoriApp* app = midori_extension_get_app (extension); + gtk_widget_destroy (bbox); g_signal_handlers_disconnect_by_func ( extension, statusbar_features_deactivate_cb, bbox); + g_signal_handlers_disconnect_by_func ( + app, statusbar_features_app_add_browser_cb, extension); } static void From ff6a4b419741110cfcbd10596a5efce5e7a3f178 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 26 Mar 2009 16:19:52 +0100 Subject: [PATCH 0914/2970] Check the host as well before computing a tab color --- extensions/colorful-tabs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index 2eea40e5..6d8a46e5 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -45,7 +45,7 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view, dark, we lighten it up a litte. Finally we make the event box visible and modify its background. */ - if ((uri = soup_uri_new (midori_view_get_display_uri (view)))) + if ((uri = soup_uri_new (midori_view_get_display_uri (view))) && uri->host) { hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri->host, -1); soup_uri_free (uri); From 00e1dd1e663d56d6ead821b8ca2df3f6b5147609 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Thu, 26 Mar 2009 21:58:33 +0100 Subject: [PATCH 0915/2970] Update Japanese translation --- po/ja.po | 498 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 258 insertions(+), 240 deletions(-) diff --git a/po/ja.po b/po/ja.po index 938fdf18..01d8be93 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-23 17:16+0900\n" -"PO-Revision-Date: 2009-03-23 22:00+0900\n" +"POT-Creation-Date: 2009-03-26 00:06+0900\n" +"PO-Revision-Date: 2009-03-26 00:15+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,11 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1580 -#: ../midori/main.c:1672 -#: ../midori/main.c:1681 -#: ../midori/main.c:1692 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1582 ../midori/main.c:1675 +#: ../midori/main.c:1684 ../midori/main.c:1695 #: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -43,8 +40,7 @@ msgstr "設定を読み込めませんでした: %s\n" msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:165 -#: ../midori/main.c:235 +#: ../midori/main.c:165 ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" @@ -53,8 +49,7 @@ msgstr "無効な設定値 '%s'" msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/main.c:485 -#: ../midori/main.c:494 +#: ../midori/main.c:485 ../midori/main.c:494 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" @@ -78,9 +73,7 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:649 -#: ../midori/main.c:683 -#: ../midori/main.c:699 +#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" @@ -101,22 +94,18 @@ msgstr "設定を保存できませんでした。%s" msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1066 -#: ../midori/sokoke.c:617 +#: ../midori/main.c:1066 ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/main.c:1087 -#: ../midori/main.c:1114 -#: ../midori/main.c:1142 +#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 -#: ../midori/main.c:1190 +#: ../midori/main.c:1166 ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" @@ -126,102 +115,103 @@ msgstr "ゴミ箱を保存できませんでした。%s" msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1377 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." -msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションを試してみてください。" +#: ../midori/main.c:1379 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happend " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" +"ようであれば、問題解決のために以下のオプションを試してみてください。" -#: ../midori/main.c:1392 +#: ../midori/main.c:1394 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1396 +#: ../midori/main.c:1398 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1401 +#: ../midori/main.c:1403 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1580 +#: ../midori/main.c:1582 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1603 -#: ../midori/gjs.c:515 +#: ../midori/main.c:1605 ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" # CLI --help -#: ../midori/main.c:1626 +#: ../midori/main.c:1628 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1628 +#: ../midori/main.c:1630 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1630 +#: ../midori/main.c:1632 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1669 +#: ../midori/main.c:1672 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1693 +#: ../midori/main.c:1696 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1695 +#: ../midori/main.c:1698 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1722 +#: ../midori/main.c:1725 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1772 +#: ../midori/main.c:1775 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1784 +#: ../midori/main.c:1787 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1799 +#: ../midori/main.c:1802 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1812 +#: ../midori/main.c:1815 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1825 +#: ../midori/main.c:1828 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1840 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1853 +#: ../midori/main.c:1856 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:278 -#: ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3280 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:289 -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3277 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" @@ -255,13 +245,11 @@ msgstr "ブックマークの編集" msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:598 -#: ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:617 -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "アドレス(_A):" @@ -269,8 +257,7 @@ msgstr "アドレス(_A):" msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:641 -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "トップレベルフォルダ" @@ -282,20 +269,17 @@ msgstr "名前を付けて保存" msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2837 -#: ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2844 -#: ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2847 -#: ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" @@ -308,443 +292,426 @@ msgstr "軽快なウェブブラウザ" msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3208 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3211 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3214 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3217 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3220 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3222 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3223 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3225 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3226 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3229 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3232 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3234 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3237 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3228 -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3240 ../midori/midori-browser.c:3243 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3246 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3249 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3252 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3255 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3257 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3258 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3260 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3261 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3264 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3265 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3268 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3270 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3271 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3283 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3286 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3289 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3290 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3292 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3283 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3286 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3289 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3301 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3292 -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3304 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3295 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3307 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3298 -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3310 ../midori/midori-websettings.c:201 #: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3301 -#: ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3313 ../midori/midori-view.c:1111 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3314 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3316 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3317 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3321 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3323 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3326 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3329 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3332 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3334 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3335 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3325 -#: ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3337 ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3338 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3330 -#: ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3342 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3343 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3333 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3345 ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3346 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3350 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3351 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3353 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3354 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3356 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3358 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3359 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3361 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3362 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3364 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3365 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3368 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3375 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3376 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3381 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3382 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3385 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3386 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3389 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3390 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3393 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3394 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3397 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3398 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3401 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3402 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3833 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3840 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3842 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3866 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3868 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3887 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:3900 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:3902 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3903 -#: ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3915 ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:3917 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:3930 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:3932 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4100 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4125 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4130 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4135 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4143 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4153 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4459 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:227 ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-panel.c:241 -#: ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:239 ../midori/midori-panel.c:240 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:179 -#: ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1890 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:180 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "ホームページ" @@ -792,8 +759,7 @@ msgstr "すべての Cookie" msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:254 -#: ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 msgid "None" msgstr "なし" @@ -1193,8 +1159,7 @@ msgstr "リンクを新しいタブで開く(_T)" msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1016 -#: ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" @@ -1210,32 +1175,32 @@ msgstr "ウェブで検索(_S)" msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1203 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1212 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1216 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1612 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1757 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1773 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1258,8 +1223,7 @@ msgstr "起動" msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:423 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "転送" @@ -1305,8 +1269,7 @@ msgstr "振る舞い" msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:51 msgid "Load images automatically" msgstr "画像を自動的に読み込む" @@ -1338,8 +1301,7 @@ msgstr "可変サイズのテキストエリアにする" msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:514 -#: ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:58 msgid "Enable scripts" msgstr "スクリプトを有効にする" @@ -1347,8 +1309,7 @@ msgstr "スクリプトを有効にする" msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:518 -#: ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:65 msgid "Enable plugins" msgstr "プラグインを有効にする" @@ -1386,8 +1347,7 @@ msgid "Browsing" msgstr "ブラウジング" #. Page "Network" -#: ../midori/midori-preferences.c:579 -#: ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 msgid "Network" msgstr "ネットワーク" @@ -1404,18 +1364,15 @@ msgstr "プライバシー" msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:626 -#: ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 msgid "days" msgstr "日" -#: ../midori/midori-preferences.c:629 -#: ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 msgid "History" msgstr "履歴" -#: ../midori/midori-searchaction.c:455 -#: ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "空" @@ -1443,8 +1400,7 @@ msgstr "トークン(_T):" msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:109 -#: ../midori/sokoke.c:121 +#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" @@ -1501,8 +1457,7 @@ msgstr "閉じたタブとウィンドウ(_C)" msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../midori/gjs.c:743 -#: ../midori/gjs.c:833 +#: ../midori/gjs.c:743 ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s にはプロパティ '%s' はありません" @@ -1517,33 +1472,27 @@ msgstr "%s は %s.%s に割り当てることはできません" msgid "%s.%s cannot be accessed" msgstr "%s.%s にアクセスできません" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:922 -#: ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:923 -#: ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "有効" -#: ../panels/midori-addons.c:932 -#: ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-addons.c:933 -#: ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "無効" @@ -1609,8 +1558,7 @@ msgstr "今日" msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:54 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 msgid "Plugins" msgstr "プラグイン" @@ -1653,14 +1601,12 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 msgid "Choose file" msgstr "ファイルの選択" @@ -1668,18 +1614,91 @@ msgstr "ファイルの選択" msgid "Choose folder" msgstr "フォルダの選択" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" -msgstr "タブを区別する色をつける" +msgstr "タブの色分け" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" msgstr "カラフルタブ" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" +#: ../extensions/cookie-manager.c:136 +#, c-format +msgid "" +"Host: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Name: %s\n" +"Value: %s" +msgstr "" +"ホスト: %s\n" +"パス: %s\n" +"Secureフラグ: %s\n" +"名前: %s\n" +"値: %s" + +# Secure flag is set. +#: ../extensions/cookie-manager.c:139 +msgid "Yes" +msgstr "あり" + +# Secure flag isn't set. +#: ../extensions/cookie-manager.c:139 +msgid "No" +msgstr "なし" + +#: ../extensions/cookie-manager.c:330 +msgid "Do you really want to delete all cookies?" +msgstr "本当にすべての cookie を削除してよろしいですか?" + +# Dialog title +#: ../extensions/cookie-manager.c:332 +msgid "Question" +msgstr "確認" + +# Column name of cookie browser +#: ../extensions/cookie-manager.c:386 +msgid "Name" +msgstr "名前" + +#: ../extensions/cookie-manager.c:436 +msgid "_Expand All" +msgstr "すべて展開する(_E)" + +#: ../extensions/cookie-manager.c:443 +msgid "_Collapse All" +msgstr "すべて折り畳む(_C)" + +#: ../extensions/cookie-manager.c:517 +msgid "Delete All" +msgstr "すべて削除" + +# tooltip +#: ../extensions/cookie-manager.c:530 +msgid "Expand All" +msgstr "すべて展開します" + +# tooltip +#: ../extensions/cookie-manager.c:536 +msgid "Collapse All" +msgstr "すべて折り畳みます" + +#: ../extensions/cookie-manager.c:576 ../extensions/cookie-manager.c:613 +msgid "Cookie Manager" +msgstr "Cookie マネージャ" + +#: ../extensions/cookie-manager.c:597 +msgid "_Cookie Manager" +msgstr "Cookie マネージャ(_C)" + +#: ../extensions/cookie-manager.c:614 +msgid "List, view and delete cookies" +msgstr "Cookie の一覧や内容の表示および削除を行います" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "マウスジェスチャ" @@ -1689,20 +1708,19 @@ msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:127 ../extensions/page-holder.c:172 msgid "Pageholder" msgstr "ページホルダ" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:156 msgid "_Pageholder" msgstr "ページホルダ(_P)" -#: ../extensions/statusbar-features.c:40 +#: ../extensions/statusbar-features.c:49 msgid "Images" msgstr "画像" -#: ../extensions/statusbar-features.c:47 +#: ../extensions/statusbar-features.c:56 msgid "Scripts" msgstr "スクリプト" From f7c5ab216b5e97b9aacb3e6b023c24bbde37987e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 26 Mar 2009 22:27:06 +0100 Subject: [PATCH 0916/2970] Add cookie manager to existing browsers and fill the tree at once --- extensions/cookie-manager.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index d4515b74..3fcb1e19 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -477,15 +477,6 @@ static void cm_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *n } -static void cm_page_realize_cb(GtkWidget *widget, CMData *cmdata) -{ - /* Initially fill the tree view. This gets also called when the alignment of the panel is - * changed but then we don't need to rebuild the tree. */ - if (cmdata->cookies == NULL) - cm_refresh_store(cmdata); -} - - static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext) { GtkWidget *panel; @@ -572,16 +563,25 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori cmdata->jar = SOUP_COOKIE_JAR(soup_session_get_feature(session, soup_cookie_jar_get_type())); g_signal_connect(cmdata->jar, "changed", G_CALLBACK(cm_jar_changed_cb), cmdata); + cm_refresh_store(cmdata); + midori_panel_append_widget(MIDORI_PANEL(panel), cmdata->panel_page, STOCK_COOKIE_MANAGER, _("Cookie Manager"), toolbar); - g_signal_connect(cmdata->panel_page, "realize", G_CALLBACK(cm_page_realize_cb), cmdata); g_signal_connect(ext, "deactivate", G_CALLBACK(cm_deactivate_cb), cmdata); } static void cm_activate_cb(MidoriExtension *extension, MidoriApp *app, gpointer data) { + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object(app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item(browsers, i++))) + cm_app_add_browser_cb(app, browser, extension); g_signal_connect(app, "add-browser", G_CALLBACK(cm_app_add_browser_cb), extension); } From e6ea06afd3996db46a1d70a38d92a7919f563852 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 26 Mar 2009 22:37:33 +0100 Subject: [PATCH 0917/2970] Display only the MIME type if there is no description --- midori/midori-view.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 97b7081d..e6e9f023 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1208,8 +1208,12 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, #endif description = g_content_type_get_description (content_type); g_free (content_type); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("File Type: %s ('%s')"), description, mime_type); + if (g_strrstr (description, mime_type)) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("File Type: '%s'"), mime_type); + else + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("File Type: %s ('%s')"), description, mime_type); g_free (description); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */ From 73b26c53f9f0faa6aa808cdca77ed3cc0b8bfcc7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 26 Mar 2009 23:46:36 +0100 Subject: [PATCH 0918/2970] Support mailto: by passing it to gtk_show_uri or Exo --- midori/midori-view.c | 10 ++++++++++ midori/sokoke.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index e6e9f023..633b8312 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1803,6 +1803,16 @@ midori_view_set_uri (MidoriView* view, { midori_view_execute_script (view, &uri[11], NULL); } + else if (g_str_has_prefix (uri, "mailto:")) + { + if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL)) + { + /* Fallback to Exo for example if GConf isn't setup */ + gchar* command = g_strconcat ("exo-open ", uri, NULL); + g_spawn_command_line_async (command, NULL); + g_free (command); + } + } else { katze_assign (view->uri, g_strdup (uri)); diff --git a/midori/sokoke.c b/midori/sokoke.c index c073e1fa..fc1e716d 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -220,8 +220,8 @@ sokoke_magic_uri (const gchar* uri, g_return_val_if_fail (!search_engines || katze_array_is_a (search_engines, KATZE_TYPE_ITEM), NULL); - /* Just return if it's a javascript: uri */ - if (g_str_has_prefix (uri, "javascript:")) + /* Just return if it's a javascript: or mailto: uri */ + if (g_str_has_prefix (uri, "javascript:") || g_str_has_prefix (uri, "mailto:")) return g_strdup (uri); /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) From 2134db5ac2851ec4122948aa5c44464108a6f55b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 26 Mar 2009 23:47:54 +0100 Subject: [PATCH 0919/2970] Use GTest for magic-uri and group cases in proper paths --- tests/magic-uri.c | 155 ++++++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 61 deletions(-) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 3b8554cc..1a67dce7 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,42 +16,46 @@ #include "compat.h" #include "sokoke.h" -int -main (int argc, - char** argv) -{ - KatzeArray* search_engines; - KatzeItem* item; - gchar* uri; - gchar* a, *b; - - gtk_init_check (&argc, &argv); - - search_engines = katze_array_new (KATZE_TYPE_ITEM); - item = g_object_new (KATZE_TYPE_ITEM, - "uri", "http://www.searchmash.com/search/%s", - "token", "sm", NULL); - katze_array_add_item (search_engines, item); - g_object_unref (item); - item = g_object_new (KATZE_TYPE_ITEM, - "uri", "http://www.searchmash.com/search/", - "token", "se", NULL); - katze_array_add_item (search_engines, item); - g_object_unref (item); - -#define test_input(input, expected) \ - uri = sokoke_magic_uri (input, search_engines); \ - if (g_strcmp0 (uri, expected)) \ - { \ - g_print ("Input: %s\nExpected: %s\nResult: %s\n\n", \ - input ? input : "NULL", \ - expected ? expected : "NULL", \ - uri ? uri : "NULL"); \ - return 1; \ - } \ - g_free (uri) #define SM "http://www.searchmash.com/search/" +static void +test_input (const gchar* input, + const gchar* expected) +{ + static KatzeArray* search_engines = NULL; + if (G_UNLIKELY (!search_engines)) + { + KatzeItem* item; + + search_engines = katze_array_new (KATZE_TYPE_ITEM); + item = g_object_new (KATZE_TYPE_ITEM, + "uri", SM "%s", + "token", "sm", NULL); + katze_array_add_item (search_engines, item); + g_object_unref (item); + item = g_object_new (KATZE_TYPE_ITEM, + "uri", SM, + "token", "se", NULL); + katze_array_add_item (search_engines, item); + g_object_unref (item); + } + + gchar* uri = sokoke_magic_uri (input, search_engines); + if (g_strcmp0 (uri, expected)) + { + g_error ("Input: %s\nExpected: %s\nResult: %s", + input ? input : "NULL", + expected ? expected : "NULL", + uri ? uri : "NULL"); + } + g_free (uri); +} + +static void +magic_uri_uri (void) +{ + gchar* a, *b; + test_input ("ftp://ftp.mozilla.org", "ftp://ftp.mozilla.org"); test_input ("ftp://ftp.mozilla.org/pub", "ftp://ftp.mozilla.org/pub"); test_input ("http://www.example.com", "http://www.example.com"); @@ -69,6 +73,39 @@ main (int argc, test_input ("localhost/rss", "http://localhost/rss"); test_input ("192.168.1.1", "http://192.168.1.1"); test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); + test_input ("file:///home/mark/foo/bar.html", + "file:///home/mark/foo/bar.html"); +} + +static void +magic_uri_idn (void) +{ + #if HAVE_LIBIDN + test_input ("http://www.münchhausen.at", "http://www.xn--mnchhausen-9db.at"); + test_input ("http://www.خداوند.com/", "http://www.xn--mgbndb8il.com/"); + test_input ("айкидо.com", "http://xn--80aildf0a.com"); + test_input ("http://東京理科大学.jp", "http://xn--1lq68wkwbj6ugkpigi.jp"); + test_input ("https://青のネコ", "https://xn--u9jthzcs263c"); + #else + test_input ("http://www.münchhausen.at", "http://www.münchhausen.at"); + test_input ("http://www.خداوند.com/", "http://www.خداوند.com/"); + test_input ("айкидо.com", "http://айкидо.com"); + test_input ("http://東京理科大学.jp", "http://東京理科大学.jp"); + test_input ("https://青のネコ.co.jp", "https://青のネコ.co.jp"); + #endif + test_input ("http://en.wikipedia.org/wiki/Kölsch_language", + "http://en.wikipedia.org/wiki/Kölsch_language"); + test_input ("en.wikipedia.org/wiki/Kölsch_language", + "http://en.wikipedia.org/wiki/Kölsch_language"); + test_input ("sm Küchenzubehör", SM "Küchenzubehör"); + test_input ("sm 東京理科大学", SM "東京理科大学"); + test_input ("file:///home/mark/frühstück", + "file:///home/mark/frühstück"); +} + +static void +magic_uri_search (void) +{ test_input ("sm midori", SM "midori"); test_input ("sm cats dogs", SM "cats dogs"); test_input ("se cats dogs", SM "cats dogs"); @@ -91,32 +128,28 @@ main (int argc, test_input ("verbose de.po", NULL); test_input ("g de.po verbose", NULL); test_input ("sm de.po verbose", SM "de.po verbose"); - test_input ("javascript:alert(1)", "javascript:alert(1)"); test_input ("sm warning: configure /dev/net: virtual", SM "warning: configure /dev/net: virtual"); - #if HAVE_LIBIDN - test_input ("http://www.münchhausen.at", "http://www.xn--mnchhausen-9db.at"); - test_input ("http://www.خداوند.com/", "http://www.xn--mgbndb8il.com/"); - test_input ("айкидо.com", "http://xn--80aildf0a.com"); - test_input ("http://東京理科大学.jp", "http://xn--1lq68wkwbj6ugkpigi.jp"); - test_input ("https://青のネコ", "https://xn--u9jthzcs263c"); - #else - test_input ("http://www.münchhausen.at", "http://www.münchhausen.at"); - test_input ("http://www.خداوند.com/", "http://www.خداوند.com/"); - test_input ("айкидо.com", "http://айкидо.com"); - test_input ("http://東京理科大学.jp", "http://東京理科大学.jp"); - test_input ("https://青のネコ.co.jp", "https://青のネコ.co.jp"); - #endif - test_input ("http://en.wikipedia.org/wiki/Kölsch_language", - "http://en.wikipedia.org/wiki/Kölsch_language"); - test_input ("en.wikipedia.org/wiki/Kölsch_language", - "http://en.wikipedia.org/wiki/Kölsch_language"); - test_input ("sm Küchenzubehör", SM "Küchenzubehör"); - test_input ("sm 東京理科大学", SM "東京理科大学"); - test_input ("file:///home/mark/foo/bar.html", - "file:///home/mark/foo/bar.html"); - test_input ("file:///home/mark/frühstück", - "file:///home/mark/frühstück"); - - return 0; +} + +static void +magic_uri_pseudo (void) +{ + test_input ("javascript:alert(1)", "javascript:alert(1)"); + test_input ("mailto:christian@twotoasts.de", "mailto:christian@twotoasts.de"); +} + +int +main (int argc, + char** argv) +{ + g_test_init (&argc, &argv, NULL); + gtk_init_check (&argc, &argv); + + g_test_add_func ("/magic-uri/uri", magic_uri_uri); + g_test_add_func ("/magic-uri/idn", magic_uri_idn); + g_test_add_func ("/magic-uri/search", magic_uri_search); + g_test_add_func ("/magic-uri/pseudo", magic_uri_pseudo); + + return g_test_run (); } From 1e68d8fa4079c8b5bca4571f2c4ad65797b72278 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 27 Mar 2009 00:40:28 +0100 Subject: [PATCH 0920/2970] Use the file icon in the download dialog if possible --- midori/midori-view.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 633b8312..7d710178 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1178,6 +1178,10 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, GtkWidget* dialog; gchar* content_type; gchar* description; + #if GTK_CHECK_VERSION (2, 14, 0) + GIcon* icon; + GtkWidget* image; + #endif gchar* title; GdkScreen* screen; GtkIconTheme* icon_theme; @@ -1207,6 +1211,13 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, content_type = g_strdup (mime_type); #endif description = g_content_type_get_description (content_type); + #if GTK_CHECK_VERSION (2, 14, 0) + icon = g_content_type_get_icon (content_type); + image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG); + g_object_unref (icon); + gtk_widget_show (image); + gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); + #endif g_free (content_type); if (g_strrstr (description, mime_type)) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), From fb1d931e2c327da8c2ae87c04c40e71aa982ad5f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Mar 2009 03:04:27 +0100 Subject: [PATCH 0921/2970] Load cookie jar in an idle callback This improves perceived startup time a lot. --- midori/main.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/midori/main.c b/midori/main.c index 9fe227c9..6512ca43 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1433,6 +1433,28 @@ midori_create_diagnostic_dialog (MidoriWebSettings* settings, return dialog; } +static gboolean +midori_load_cookie_jar (gpointer data) +{ + MidoriWebSettings* settings = MIDORI_WEB_SETTINGS (data); + SoupSession* webkit_session; + KatzeNet* net; + SoupSession* s_session; + SoupCookieJar* jar; + + webkit_session = webkit_get_default_session (); + net = katze_net_new (); + s_session = katze_net_get_session (net); + jar = soup_cookie_jar_new (); + g_object_set_data (G_OBJECT (jar), "midori-settings", settings); + midori_soup_session_prepare (s_session, jar, settings); + midori_soup_session_prepare (webkit_session, jar, settings); + g_object_unref (jar); + g_object_unref (net); + + return FALSE; +} + static gboolean midori_load_extensions (gpointer data) { @@ -1645,10 +1667,6 @@ main (int argc, gchar* uri; KatzeItem* item; gchar* uri_ready; - KatzeNet* net; - SoupSession* webkit_session; - SoupSession* s_session; - SoupCookieJar* jar; #if HAVE_SQLITE sqlite3* db; gint max_history_age; @@ -1872,16 +1890,6 @@ main (int argc, } g_string_free (error_messages, TRUE); - webkit_session = webkit_get_default_session (); - net = katze_net_new (); - s_session = katze_net_get_session (net); - jar = soup_cookie_jar_new (); - g_object_set_data (G_OBJECT (jar), "midori-settings", settings); - midori_soup_session_prepare (s_session, jar, settings); - midori_soup_session_prepare (webkit_session, jar, settings); - g_object_unref (jar); - g_object_unref (net); - /* Open as many tabs as we have uris, seperated by pipes */ i = 0; while (uris && uris[i]) @@ -1995,6 +2003,7 @@ main (int argc, g_signal_connect (app, "add-browser", G_CALLBACK (midori_app_add_browser_cb), NULL); + g_idle_add (midori_load_cookie_jar, settings); g_idle_add (midori_load_extensions, app); katze_item_set_parent (KATZE_ITEM (_session), app); g_idle_add (midori_load_session, _session); From e0cd10aea62860723dbfbb7e09fa1ea798fde47f Mon Sep 17 00:00:00 2001 From: Pascal Gervais Date: Sat, 28 Mar 2009 15:14:04 +0100 Subject: [PATCH 0922/2970] Update French translation --- po/fr.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5bffc071..fe507c11 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.4\n" +"Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-03-22 22:19+0100\n" -"PO-Revision-Date: 2009-03-11 15:12-0400\n" +"PO-Revision-Date: 2009-03-24 08:46-0400\n" "Last-Translator: Pascal Gervais 2009\n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -481,15 +481,15 @@ msgstr "A_ller" #: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" -msgstr "Va à la page précédente" +msgstr "Aller à la page précédente" #: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" -msgstr "Va à la page suivante" +msgstr "Aller à la page suivante" #: ../midori/midori-browser.c:3320 msgid "Go to your homepage" -msgstr "Va à la page d'accueil" +msgstr "Aller à la page d'accueil" #: ../midori/midori-browser.c:3322 msgid "Empty Trash" @@ -637,7 +637,7 @@ msgstr "_Emplacement..." #: ../midori/midori-browser.c:3830 msgid "Open a particular location" -msgstr "Ouvre un emplacement particulier" +msgstr "Ouvrir un emplacement particulier" #: ../midori/midori-browser.c:3854 msgid "_Web Search..." @@ -645,11 +645,11 @@ msgstr "Recherche _toile..." #: ../midori/midori-browser.c:3856 msgid "Run a web search" -msgstr "Lance une recherche sur la toile" +msgstr "Lancer une recherche sur la toile" #: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" -msgstr "Rouvre un onglet ou une fenêtre précédemment fermé" +msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" #: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" @@ -657,7 +657,7 @@ msgstr "Pages _récemment visitées" #: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" -msgstr "Rouvre des pages précédemment visitées" +msgstr "Rouvrir des pages précédemment visitées" #: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 msgid "_Bookmarks" @@ -673,7 +673,7 @@ msgstr "_Fenêtre" #: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" -msgstr "Afficher une vue générale de tous les onglets ouverts" +msgstr "Afficher la liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages #: ../midori/midori-browser.c:4085 @@ -1197,7 +1197,7 @@ msgstr "Ouvrir ou télécharger le fichier" #: ../midori/midori-view.c:1210 #, c-format msgid "File Type: %s ('%s')" -msgstr "Type de fichier: %s (« %s »)" +msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" #: ../midori/midori-view.c:1214 @@ -1290,15 +1290,15 @@ msgstr "Charger les images" #: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" -msgstr "Charger et afficher les images" +msgstr "Charger et afficher les images automatiquement" #: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" -msgstr "Diminuer les images" +msgstr "Réduire les images" #: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" -msgstr "Réduire automatiquement les images pour les adapter" +msgstr "Réduire automatiquement les images pour les adapter à la fenêtre" #: ../midori/midori-preferences.c:506 msgid "Print background images" From 825a035f4c13958f4f5fe4c5c7dabcb88260b5db Mon Sep 17 00:00:00 2001 From: Benjamin Maisonnas Date: Sat, 28 Mar 2009 16:04:20 +0100 Subject: [PATCH 0923/2970] Update French translation --- po/fr.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/fr.po b/po/fr.po index fe507c11..db458916 100644 --- a/po/fr.po +++ b/po/fr.po @@ -85,7 +85,7 @@ msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Impossible de supprimer de l'hitorique les anciens éléments : %s\n" +msgstr "Impossible de supprimer de l'historique les anciens éléments : %s\n" #: ../midori/main.c:907 #, c-format @@ -150,7 +150,7 @@ msgstr "Une erreur inconnue est survenue." #: ../midori/main.c:1626 msgid "Run the specified filename as javascript" -msgstr "Exécutez le fichier spécifié en tant que javascript" +msgstr "Exécuter le fichier spécifié en tant que javascript" #: ../midori/main.c:1628 msgid "Display program version" @@ -201,7 +201,7 @@ msgstr "La corbeille n'a pu être chargée : %s\n" #: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "L'historique n'a pu être chargé: %s\n" +msgstr "L'historique n'a pu être chargé : %s\n" #: ../midori/main.c:1837 msgid "The following errors occured:" @@ -269,7 +269,7 @@ msgstr "Répertoire supérieur" #: ../midori/midori-browser.c:762 msgid "Save file as" -msgstr "Enregistrer le fichier dans" +msgstr "Enregistrer le fichier sous" #: ../midori/midori-browser.c:1538 msgid "Open file" @@ -292,7 +292,7 @@ msgstr "Ouvrir dans une nouvelle _fenêtre" #: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." -msgstr "Un navigateur toile léger" +msgstr "Un navigateur toile léger." #: ../midori/midori-browser.c:3009 msgid "translator-credits" @@ -384,7 +384,7 @@ msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" #: ../midori/midori-browser.c:3248 msgid "Find _Previous" -msgstr "Rechercher le _précédant" +msgstr "Rechercher le _précédent" #: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" @@ -469,7 +469,7 @@ msgstr "Afficher la source de la sélection" #: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" -msgstr "Affiche le code source de la sélection" +msgstr "Afficher le code source de la sélection" #: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" @@ -549,7 +549,7 @@ msgstr "_Sommaire" #: ../midori/midori-browser.c:3347 msgid "Show the documentation" -msgstr "Affiche la documentation" +msgstr "Afficher la documentation" #: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" @@ -569,7 +569,7 @@ msgstr "Ouvrir le gestionnaire d'anomalies de Midori" #: ../midori/midori-browser.c:3356 msgid "Show information about the program" -msgstr "Affiche des informations concernant le programme" +msgstr "Afficher des informations concernant le programme" #: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" @@ -673,7 +673,7 @@ msgstr "_Fenêtre" #: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" -msgstr "Afficher la liste de tous les onglets ouverts" +msgstr "Afficher une liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages #: ../midori/midori-browser.c:4085 @@ -956,7 +956,7 @@ msgstr "Éditeur de texte" #: ../midori/midori-websettings.c:579 msgid "An external text editor" -msgstr "Un éditeur texte externe" +msgstr "Un éditeur de texte externe" #: ../midori/midori-websettings.c:587 msgid "Location entry Search" @@ -1039,7 +1039,7 @@ msgstr "Ouvrir les fenêtres surgissantes dans des onglets" #: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" -msgstr "Indique s'il faut ouvrir les fenêtres surgissantes dans des onglets" +msgstr "Indique s'il faut ouvrir les fenêtres surgissantes (popup) dans des onglets" #: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" @@ -1134,11 +1134,11 @@ msgstr "" #. i18n: This refers to an application, not the 'user agent' string #: ../midori/midori-websettings.c:819 msgid "Identify as" -msgstr "S'dentifier comme" +msgstr "S'identifier comme" #: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" -msgstr "S'identifier comme quoi, sur les pages de la toile" +msgstr "Comment s'identifier sur les pages de la toile" #: ../midori/midori-websettings.c:836 msgid "Identification string" @@ -1314,7 +1314,7 @@ msgstr "Zones de texte redimensionnables" #: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" -msgstr "Indique si les zones de texte peuvent être redimentionnés" +msgstr "Indique si les zones de texte peuvent être redimentionnées" #: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 msgid "Enable scripts" @@ -1635,11 +1635,11 @@ msgstr "Colorer les onglets" #: ../extensions/colorful-tabs.c:133 msgid "Colorful Tabs" -msgstr "Onglets coloré" +msgstr "Onglets colorés" #: ../extensions/colorful-tabs.c:134 msgid "Tint each tab distinctly" -msgstr "Donner un couleur propre a chaque onglet" +msgstr "Donner une couleur distincte à chaque onglet" #: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" From 85fe95cd93b03f867886e998c7e75069d048c5d2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Mar 2009 17:40:00 +0100 Subject: [PATCH 0924/2970] Update French translation --- po/fr.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/fr.po b/po/fr.po index db458916..f05bdada 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,7 +21,7 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Navigateur toile léger" +msgstr "Navigateur internet léger" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 #: ../midori/main.c:1681 ../midori/main.c:1692 @@ -31,7 +31,7 @@ msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Navigateur toile" +msgstr "Navigateur internet" #: ../midori/main.c:103 #, c-format @@ -292,7 +292,7 @@ msgstr "Ouvrir dans une nouvelle _fenêtre" #: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." -msgstr "Un navigateur toile léger." +msgstr "Un navigateur internet léger." #: ../midori/midori-browser.c:3009 msgid "translator-credits" @@ -641,11 +641,11 @@ msgstr "Ouvrir un emplacement particulier" #: ../midori/midori-browser.c:3854 msgid "_Web Search..." -msgstr "Recherche _toile..." +msgstr "Recherche _internet..." #: ../midori/midori-browser.c:3856 msgid "Run a web search" -msgstr "Lancer une recherche sur la toile" +msgstr "Lancer une recherche sur l'internet" #: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" @@ -1059,15 +1059,15 @@ msgstr "Indique s'il faut chercher automatiquement en ligne en tapant" #: ../midori/midori-websettings.c:718 msgid "Accept cookies" -msgstr "Accepter les témoins" +msgstr "Accepter les cookies" #: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" -msgstr "Type de témoins (cookies) à accepter" +msgstr "Type de témoins à accepter" #: ../midori/midori-websettings.c:728 msgid "Original cookies only" -msgstr "Uniquement les témoins d'origine" +msgstr "Uniquement les cookies d'origine" #: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" @@ -1075,7 +1075,7 @@ msgstr "Accepter les témoins du site d'origine uniquement" #: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" -msgstr "Âge maximal des témoins" +msgstr "Âge maximal des cookies" #: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" @@ -1150,11 +1150,11 @@ msgstr "La chaîne d'identification de l'application" #: ../midori/midori-websettings.c:845 msgid "Cache size" -msgstr "Taille de l'antémémoire" +msgstr "Taille du cache" #: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" -msgstr "La taille de l'antémémoire (cache) permise" +msgstr "La taille de l'antémémoire permise" #. i18n: The title of the 404 - Not found error page #: ../midori/midori-view.c:656 @@ -1184,7 +1184,7 @@ msgstr "_Enregistrer la cible du lien" #: ../midori/midori-view.c:1053 msgid "_Search the Web" -msgstr "_Chercher sur la toile" +msgstr "_Chercher sur l'internet" #: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" From 6eb17e1b15b5414ad1d582b361f544161e45c35c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Mar 2009 18:49:46 +0100 Subject: [PATCH 0925/2970] Update German translation --- po/de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 0e4fa1d3..c8367f4d 100644 --- a/po/de.po +++ b/po/de.po @@ -1047,7 +1047,7 @@ msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" #: ../midori/midori-websettings.c:718 msgid "Accept cookies" -msgstr "Profildateien annehmen" +msgstr "Cookies annehmen" #: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" @@ -1063,7 +1063,7 @@ msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" #: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" -msgstr "Maximales Alter von Profildateien" +msgstr "Maximales Alter von Cookiedaten" #: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" @@ -1103,7 +1103,7 @@ msgstr "Die zuletzt heruntegeladenen Dateien speichern" #: ../midori/midori-websettings.c:786 msgid "Proxy Server" -msgstr "Zwischenrechner" +msgstr "Zwischenrechner (Proxy)" #: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" @@ -1111,7 +1111,7 @@ msgstr "Der Zwischenrechner für HTTP-Verbindungen" #: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" -msgstr "Zwischenrechner automatisch erkennen" +msgstr "Proxyrechner automatisch erkennen" #: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" From f34223e55dc2574e59d5c250c27fb271d46a01b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 28 Mar 2009 20:57:42 +0100 Subject: [PATCH 0926/2970] Only append separator to bookmarks if the array isn't empty --- midori/midori-browser.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b03063aa..7e95a7e8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2071,9 +2071,14 @@ _action_bookmarks_populate_popup (GtkAction* action, GtkMenu* menu, MidoriBrowser* browser) { - GtkWidget* menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); + GtkWidget* menuitem; + + if (katze_array_get_nth_item (browser->bookmarks, 0)) + { + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + } menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "BookmarkAdd")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); From 3a36d27d6faa3c7b68ad2a02d29523dbeabe8139 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Mar 2009 21:00:11 +0100 Subject: [PATCH 0927/2970] Add BookmarkAdd to dummy menu items This fixes a warning about an accelerator and in some cases even a crash when opening the bookmarks menu. --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7e95a7e8..95d5e39a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3579,6 +3579,7 @@ static const gchar* ui_markup = *somewhere* in the UI definition */ "" "" "" diff --git a/midori/midori-view.c b/midori/midori-view.c index 49f17c0f..d2467368 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -152,6 +152,7 @@ enum { SEARCH_TEXT, ADD_BOOKMARK, SAVE_AS, + ADD_SPEED_DIAL, LAST_SIGNAL }; @@ -179,15 +180,12 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, MidoriView* view); static void -midori_view_speeddial_get_thumb (GtkWidget* web_view, +midori_view_speed_dial_get_thumb (GtkWidget* web_view, const gchar* message, MidoriView* view); static void -midori_view_speeddial_save (GtkWidget* web_view); - -static gchar* -midori_view_speeddial_get_next_free_slot (void); +midori_view_speed_dial_save (GtkWidget* web_view); static void midori_view_class_init (MidoriViewClass* class) @@ -364,6 +362,26 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + /** + * MidoriView::add-speed-dial: + * @view: the object on which the signal is emitted + * @uri: the URI to add to the speed dial + * + * Emitted when an URI is added to the spee dial page. + * + * Since: 0.1.7 + */ + signals[ADD_SPEED_DIAL] = g_signal_new ( + "add-speed-dial", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_view_finalize; gobject_class->set_property = midori_view_set_property; @@ -971,96 +989,10 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, } static void -midori_web_view_menu_action_add_speeddial_cb (GtkWidget* widget, +midori_web_view_menu_action_add_speed_dial_cb (GtkWidget* widget, MidoriView* view) { - gchar* folder; - gchar* thumb; - gchar* filename; - gchar* replace_from; - gchar* replace_by; - /*gchar* uri = g_strdup (webkit_web_frame_get_uri ( - webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)))); - gchar* title = g_strdup (webkit_web_frame_get_title ( - webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view))));*/ - gchar* uri = g_strdup (view->uri); - gchar* title = g_strdup (view->title); - gchar* slot_id = midori_view_speeddial_get_next_free_slot (); - - if (slot_id == NULL) - { - g_free (uri); - g_free (title); - return; - } - - if (strlen (title) > 15) - { - gchar* stripped = g_strndup (title, 15 * sizeof (gchar)); - g_free (title); - title = g_strdup_printf ("%s...", stripped); - g_free (stripped); - } - - folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); - thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); - filename = g_build_filename (folder, thumb, NULL); - - if (g_file_test (filename, G_FILE_TEST_EXISTS)) - { - GdkPixbuf* img; - GRegex* regex; - gchar* replace; - gchar* file_content; - gchar* encoded; - gchar* speeddial_body; - gchar* body_fname; - gsize sz; - - body_fname = g_strconcat (g_get_user_config_dir (), - "/midori/speeddial-body.html", NULL); - - g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); - - img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); - gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); - encoded = g_base64_encode ((guchar *)file_content, sz); - - replace_from = g_strdup_printf ( - "
[ \r\n\t]*"\ - "[ \r\n\t]*

"\ - "%s

.+

[ \r\n\t]*[ \r\n\t]*

[ ]*

[ \r\t\n]*
", - slot_id, slot_id, (slot_id+1)); - - replace_by = g_strdup_printf ( - "
"\ - "
x

%s

", - slot_id, slot_id, uri, slot_id, encoded, slot_id, title); - - regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); - replace = g_regex_replace (regex, speeddial_body, -1, - 1, replace_by, 0, NULL); - - g_file_set_contents (body_fname, replace, -1, NULL); - - g_object_unref (img); - g_regex_unref (regex); - g_free (encoded); - g_free (file_content); - g_free (body_fname); - g_free (speeddial_body); - g_free (replace_by); - g_free (replace_from); - g_free (replace); - } - - g_free (thumb); - g_free (filename); + g_signal_emit (view, signals[ADD_SPEED_DIAL], 0, view->link_uri); } static void @@ -1318,13 +1250,14 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - /* FIXME: This should be a proper action in the browser */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeeddial"); + g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_add_speeddial_cb), view); + G_CALLBACK (midori_web_view_menu_action_add_speed_dial_cb), view); gtk_widget_show (menuitem); + if (!view->customized_homepage_in_new_tabs) + gtk_widget_set_sensitive (menuitem, FALSE); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -1532,10 +1465,10 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* source_id, MidoriView* view) { - if (!strncmp (message, "speeddial-get-thumbnail", 22)) - midori_view_speeddial_get_thumb (web_view, message, view); - else if (!strncmp (message, "speeddial-save", 13)) - midori_view_speeddial_save (web_view); + if (!strncmp (message, "speed_dial-get-thumbnail", 22)) + midori_view_speed_dial_get_thumb (web_view, message, view); + else if (!strncmp (message, "speed_dial-save", 13)) + midori_view_speed_dial_save (web_view); else g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); return TRUE; @@ -2025,16 +1958,16 @@ midori_view_set_uri (MidoriView* view, SoupServer* res_server; guint port; gchar* res_root; - gchar* speeddial_head; - gchar* speeddial_body; - gchar* speeddial_html; + gchar* speed_dial_head; + gchar* speed_dial_body; + gchar* speed_dial_html; gchar* body_fname; gchar* location_entry_search; katze_assign (view->uri, g_strdup ("")); g_file_get_contents (DATADIR "/midori/res/speeddial-head.html", - &speeddial_head, NULL, NULL); + &speed_dial_head, NULL, NULL); res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); @@ -2045,18 +1978,18 @@ midori_view_set_uri (MidoriView* view, if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", - &speeddial_body, NULL, NULL ); - g_file_set_contents (body_fname, speeddial_body, -1, NULL ); + &speed_dial_body, NULL, NULL ); + g_file_set_contents (body_fname, speed_dial_body, -1, NULL ); } else - g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); + g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); - speeddial_html = g_strconcat (speeddial_head, speeddial_body, NULL); + speed_dial_html = g_strconcat (speed_dial_head, speed_dial_body, NULL); g_object_get (view->settings, "location-entry-search", &location_entry_search, NULL); - data = sokoke_replace_variables (speeddial_html, + data = sokoke_replace_variables (speed_dial_html, "{res}", res_root, "{title}", _("Blank page"), "{search_uri}", location_entry_search, @@ -2079,9 +2012,9 @@ midori_view_set_uri (MidoriView* view, g_free (res_root); g_free (data); - g_free (speeddial_html); - g_free (speeddial_head); - g_free (speeddial_body); + g_free (speed_dial_html); + g_free (speed_dial_head); + g_free (speed_dial_body); g_free (body_fname); g_free (location_entry_search); } @@ -2976,14 +2909,14 @@ midori_view_execute_script (MidoriView* view, /** - * midori_view_speeddial_inject_thumb + * midori_view_speed_dial_inject_thumb * @view: a #MidoriView * @filename: filename of the thumbnail - * @dom_id: Id of the shortcut on speeddial page in wich to inject content + * @dom_id: Id of the shortcut on speed_dial page in wich to inject content * @url: url of the shortcut */ static void -midori_view_speeddial_inject_thumb (MidoriView* view, +midori_view_speed_dial_inject_thumb (MidoriView* view, gchar* filename, gchar* dom_id, gchar* url) @@ -3007,7 +2940,7 @@ midori_view_speeddial_inject_thumb (MidoriView* view, free (js); g_object_unref (img); - midori_view_speeddial_save (view->web_view); + midori_view_speed_dial_save (view->web_view); g_free (url); g_free (dom_id); @@ -3017,7 +2950,7 @@ midori_view_speeddial_inject_thumb (MidoriView* view, /** - * midori_view_speeddial_save + * midori_view_speed_dial_save * @web_view: a #WebkitView * @message: Console log data * @@ -3029,7 +2962,7 @@ midori_view_speeddial_inject_thumb (MidoriView* view, * **/ static void -midori_view_speeddial_get_thumb (GtkWidget* web_view, +midori_view_speed_dial_get_thumb (GtkWidget* web_view, const gchar* message, MidoriView* view) { @@ -3047,60 +2980,20 @@ midori_view_speeddial_get_thumb (GtkWidget* web_view, filename = g_build_filename (folder, thumb, NULL); g_free (thumb); - midori_view_speeddial_inject_thumb (view, filename, + midori_view_speed_dial_inject_thumb (view, filename, g_strdup (t_data[1]), g_strdup (t_data[2])); g_strfreev (t_data); } - /** - * midori_view_speeddial_get_next_free_slot - * - * Returns: Id of the next shortcut slot on the speeddial page - */ -static gchar* -midori_view_speeddial_get_next_free_slot (void) -{ - gchar* speeddial_body; - gchar* body_fname; - gchar* slot_id = NULL; - gchar* p = NULL; - - body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), - "/midori/speeddial-body.html"); - if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) - { - g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", - &speeddial_body, NULL, NULL); - g_file_set_contents (body_fname, speeddial_body, -1, NULL); - } - else - g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); - - p = g_strstr_len (speeddial_body, -1, "

"); - - if (p != NULL) - { - p = g_strndup ((p+4), 1); - slot_id = g_strdup_printf ("s%s", p); - g_free (p); - } - - g_free (body_fname); - g_free (speeddial_body); - - return slot_id; -} - -/** - * midori_view_speeddial_save + * midori_view_speed_dial_save * @web_view: a #WebkitView * - * Save speeddial DOM structure to body template + * Save speed_dial DOM structure to body template * **/ static void -midori_view_speeddial_save (GtkWidget* web_view) +midori_view_speed_dial_save (GtkWidget* web_view) { JSContextRef js_context = webkit_web_frame_get_global_context ( webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))); From 64b60d7f94729d49f2cdfaacb8274e71f46e0b97 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 14:48:12 +0200 Subject: [PATCH 1141/2970] Use the correct config folder to store speed dial This is important when using the -c or --config switch --- midori/midori-browser.c | 8 ++++---- midori/midori-view.c | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d058c616..b6af5cdb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -879,8 +879,8 @@ midori_browser_speed_dial_get_next_free_slot (void) gchar* slot_id = NULL; gchar* p = NULL; - body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), - "/midori/speeddial-body.html"); + body_fname = g_build_filename (sokoke_set_config_dir (NULL), + "speeddial-body.html", NULL); if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", @@ -953,8 +953,8 @@ midori_browser_add_speed_dial (MidoriBrowser* browser) gchar* body_fname; gsize sz; - body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), - "/midori/speeddial-body.html"); + body_fname = g_build_filename (sokoke_set_config_dir (NULL), + "speeddial-body.html", NULL); g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); diff --git a/midori/midori-view.c b/midori/midori-view.c index d2467368..14283525 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1972,8 +1972,8 @@ midori_view_set_uri (MidoriView* view, res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); - body_fname = g_strconcat (g_get_user_config_dir (), - "/midori/speeddial-body.html", NULL); + body_fname = g_build_filename (sokoke_set_config_dir (NULL), + "speeddial-body.html", NULL); if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { @@ -2998,7 +2998,8 @@ midori_view_speed_dial_save (GtkWidget* web_view) JSContextRef js_context = webkit_web_frame_get_global_context ( webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))); gchar* newdom = sokoke_js_script_eval (js_context,"getSpeeddialContent()", NULL); - gchar* fname = g_strconcat (g_get_user_config_dir (), "/midori/speeddial-body.html", NULL); + gchar* fname = g_build_filename (sokoke_set_config_dir (NULL), + "speeddial-body.html", NULL); g_file_set_contents (fname, newdom, -1, NULL); g_free (fname); g_free (newdom); From db826d348a60aa2206eac9ef7acb396417b55179 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 14:57:26 +0200 Subject: [PATCH 1142/2970] Make AddSpeedDial visible/ hidden instead of sensitive/ grayed --- midori/midori-browser.c | 2 +- midori/midori-view.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b6af5cdb..8a9156b4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -249,7 +249,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (MIDORI_VIEW (view))); - _action_set_sensitive (browser, "AddSpeedDial", + gtk_action_set_visible (_action_by_name (browser, "AddSpeedDial"), browser->customized_homepage_in_new_tabs); /* Currently views that don't support source, don't support saving either. If that changes, we need to think of something. */ diff --git a/midori/midori-view.c b/midori/midori-view.c index 14283525..95491e71 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1250,14 +1250,15 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_add_speed_dial_cb), view); - gtk_widget_show (menuitem); - if (!view->customized_homepage_in_new_tabs) - gtk_widget_set_sensitive (menuitem, FALSE); + if (view->customized_homepage_in_new_tabs) + { + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_add_speed_dial_cb), view); + gtk_widget_show (menuitem); + } menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); From e5276907e9da818e551ff686c4c73291ece7206e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Sun, 10 May 2009 15:05:17 +0200 Subject: [PATCH 1143/2970] Add an 'edit' icon to emphasize that shortcut can be renamed --- data/speeddial-head.html | 2 ++ midori/midori-view.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 9254a347..a2811f3a 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -139,6 +139,8 @@ .activated p { cursor: text; + background: url({stock}/gtk-edit) 98% 65% no-repeat; + -webkit-background-size: 12px 15px; } diff --git a/midori/midori-view.c b/midori/midori-view.c index 95491e71..a5f71f59 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -698,6 +698,7 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, webkit_web_frame_load_alternate_string (web_frame, result, res_root, uri); g_free (res_root); + g_free (stock_root); g_free (result); return TRUE; @@ -1964,6 +1965,7 @@ midori_view_set_uri (MidoriView* view, gchar* speed_dial_html; gchar* body_fname; gchar* location_entry_search; + gchar* stock_root; katze_assign (view->uri, g_strdup ("")); @@ -1973,6 +1975,7 @@ midori_view_set_uri (MidoriView* view, res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); + stock_root = g_strdup_printf ("http://localhost:%d/stock", port); body_fname = g_build_filename (sokoke_set_config_dir (NULL), "speeddial-body.html", NULL); @@ -1992,6 +1995,7 @@ midori_view_set_uri (MidoriView* view, data = sokoke_replace_variables (speed_dial_html, "{res}", res_root, + "{stock}", stock_root, "{title}", _("Blank page"), "{search_uri}", location_entry_search, "{search_title}", _("Search"), @@ -2012,6 +2016,7 @@ midori_view_set_uri (MidoriView* view, #endif g_free (res_root); + g_free (stock_root); g_free (data); g_free (speed_dial_html); g_free (speed_dial_head); From 2715ec243840be8ef5afaa45f9f7bcd5041a752a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 15:39:12 +0200 Subject: [PATCH 1144/2970] Use ngettext to render %d days ago --- panels/midori-history.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index df19f9ec..1b2ee3ae 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -596,13 +596,13 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, } else if (age > 6) { - sdate = g_strdup_printf (_("A week ago")); + sdate = _("A week ago"); g_object_set (renderer, "text", sdate, NULL); - g_free (sdate); } else if (age > 1) { - sdate = g_strdup_printf (_("%d days ago"), (gint)age); + sdate = g_strdup_printf (ngettext (_("%d day ago"), + _("%d days ago"), (gint)age), (gint)age); g_object_set (renderer, "text", sdate, NULL); g_free (sdate); } From 906ccf632de8f5b6a51036183120d504c574b460 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 16:07:28 +0200 Subject: [PATCH 1145/2970] Go back to referring to Speed Dial in the user interface The term customized homepage is somewhat unclear and speed dial is known from phones and other browsers. --- midori/midori-browser.c | 18 +++++++++--------- midori/midori-preferences.c | 2 +- midori/midori-view.c | 16 ++++++++-------- midori/midori-websettings.c | 25 +++++++++++++------------ 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8a9156b4..892250f7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -86,7 +86,7 @@ struct _MidoriBrowser gboolean show_navigationbar; gboolean show_statusbar; - gboolean customized_homepage_in_new_tabs; + gboolean speed_dial_in_new_tabs; gboolean progress_in_location; gboolean remember_last_visited_pages; gchar* location_entry_search; @@ -250,7 +250,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_view_can_go_forward (MIDORI_VIEW (view))); gtk_action_set_visible (_action_by_name (browser, "AddSpeedDial"), - browser->customized_homepage_in_new_tabs); + browser->speed_dial_in_new_tabs); /* Currently views that don't support source, don't support saving either. If that changes, we need to think of something. */ _action_set_sensitive (browser, "SaveAs", @@ -482,7 +482,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, MIDORI_LOCATION_ACTION (action), NULL); g_object_notify (G_OBJECT (browser), "uri"); } - if (browser->customized_homepage_in_new_tabs) + if (browser->speed_dial_in_new_tabs) midori_browser_update_thumbnail (view, uri); _midori_browser_update_interface (browser); @@ -3681,7 +3681,7 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_update_interface (browser); _midori_browser_update_progress (browser, MIDORI_VIEW (view)); - if (browser->customized_homepage_in_new_tabs) + if (browser->speed_dial_in_new_tabs) midori_browser_update_thumbnail (view, uri); } @@ -3761,8 +3761,8 @@ static const GtkActionEntry entries[] = { NULL, "s", N_("Save to a file"), G_CALLBACK (_action_save_as_activate) }, { "AddSpeedDial", NULL, - N_("Add to customize _homepage"), "h", - N_("Add shortcut to customized _homepage"), G_CALLBACK (_action_add_speed_dial_activate) }, + N_("Add to Speed _dial"), "h", + N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) }, { "TabClose", NULL, N_("_Close Tab"), "w", N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, @@ -4949,7 +4949,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-panel", &show_panel, "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, - "customized-homepage-in-new-tabs", &browser->customized_homepage_in_new_tabs, + "speed-dial-in-new-tabs", &browser->speed_dial_in_new_tabs, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, @@ -5056,8 +5056,8 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->show_navigationbar = g_value_get_boolean (&value); else if (name == g_intern_string ("show-statusbar")) browser->show_statusbar = g_value_get_boolean (&value); - else if (name == g_intern_string ("customized-homepage-in-new-tabs")) - browser->customized_homepage_in_new_tabs = g_value_get_boolean (&value); + else if (name == g_intern_string ("speed-dial-in-new-tabs")) + browser->speed_dial_in_new_tabs = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); else if (name == g_intern_string ("search-engines-in-completion")) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 3ce064fe..f3897345 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -420,7 +420,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 1, 2); button = katze_property_proxy (settings, "show-crash-dialog", NULL); INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "customized-homepage-in-new-tabs", NULL); + button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL); FILLED_ADD (button, 1, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (2, 2); diff --git a/midori/midori-view.c b/midori/midori-view.c index a5f71f59..3fb02fb6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -60,7 +60,7 @@ struct _MidoriView GtkWidget* web_view; KatzeArray* news_feeds; - gboolean customized_homepage_in_new_tabs; + gboolean speed_dial_in_new_tabs; gchar* download_manager; gchar* news_aggregator; gboolean middle_click_opens_selection; @@ -1251,9 +1251,9 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - if (view->customized_homepage_in_new_tabs) + if (view->speed_dial_in_new_tabs) { - menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to Speed _dial")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); g_signal_connect (menuitem, "activate", @@ -1659,7 +1659,7 @@ _midori_view_update_settings (MidoriView* view) gboolean zoom_text_and_images; g_object_get (view->settings, - "customized-homepage-in-new-tabs", &view->customized_homepage_in_new_tabs, + "speed-dial-in-new-tabs", &view->speed_dial_in_new_tabs, "download-manager", &view->download_manager, "news-aggregator", &view->news_aggregator, "zoom-text-and-images", &zoom_text_and_images, @@ -1687,9 +1687,9 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (view->settings), name, &value); - if (name == g_intern_string ("customized-homepage-in-new-tabs")) + if (name == g_intern_string ("speed-dial-in-new-tabs")) { - view->customized_homepage_in_new_tabs = g_value_get_boolean (&value); + view->speed_dial_in_new_tabs = g_value_get_boolean (&value); } else if (name == g_intern_string ("download-manager")) { @@ -1955,7 +1955,7 @@ midori_view_set_uri (MidoriView* view, if (!view->web_view) midori_view_construct_web_view (view); - if (view->customized_homepage_in_new_tabs && !g_strcmp0 (uri, "")) + if (view->speed_dial_in_new_tabs && !g_strcmp0 (uri, "")) { SoupServer* res_server; guint port; @@ -2002,7 +2002,7 @@ midori_view_set_uri (MidoriView* view, "{search}", _("Search"), "{click_to_add}", _("Click to add a shortcut"), "{enter_shortcut_address}", _("Enter shortcut address"), - "{enter_shortcut_name}", _("Enter shortcut name"), + "{enter_shortcut_name}", _("Enter shortcut title"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index e7bcb6ed..49c4304d 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -49,7 +49,7 @@ struct _MidoriWebSettings MidoriStartup load_on_startup; gchar* homepage; gboolean show_crash_dialog; - gboolean customized_homepage_in_new_tabs; + gboolean speed_dial_in_new_tabs; gchar* download_folder; gboolean ask_for_destination_folder; gboolean notify_transfer_completed; @@ -122,7 +122,7 @@ enum PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, - PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS, + PROP_SPEED_DIAL_IN_NEW_TABS, PROP_DOWNLOAD_FOLDER, PROP_ASK_FOR_DESTINATION_FOLDER, PROP_NOTIFY_TRANSFER_COMPLETED, @@ -574,18 +574,19 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); /** - * MidoriWebSettings:customized-homepage-in-new-tabs: + * MidoriWebSettings:speed-dial-in-new-tabs: * - * Show a customized homepage in newly opened tabs. + * Show spee dial in newly opened tabs. * * Since: 0.1.7 */ g_object_class_install_property (gobject_class, - PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS, + PROP_SPEED_DIAL_IN_NEW_TABS, g_param_spec_boolean ( - "customized-homepage-in-new-tabs", - _("Show customized homepage in new tabs"), - _("Show a customized homepage in newly opened tabs"), + "speed-dial-in-new-tabs", + /* i18n: Speed dial, webpage shortcuts, named for the phone function */ + _("Show speed dial in new tabs"), + _("Show speed dial in newly opened tabs"), TRUE, flags)); @@ -1137,8 +1138,8 @@ midori_web_settings_set_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: web_settings->show_crash_dialog = g_value_get_boolean (value); break; - case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS: - web_settings->customized_homepage_in_new_tabs = g_value_get_boolean (value); + case PROP_SPEED_DIAL_IN_NEW_TABS: + web_settings->speed_dial_in_new_tabs = g_value_get_boolean (value); break; case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); @@ -1345,8 +1346,8 @@ midori_web_settings_get_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: g_value_set_boolean (value, web_settings->show_crash_dialog); break; - case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS: - g_value_set_boolean (value, web_settings->customized_homepage_in_new_tabs); + case PROP_SPEED_DIAL_IN_NEW_TABS: + g_value_set_boolean (value, web_settings->speed_dial_in_new_tabs); break; case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); From 5f34e7d72f77dbc1e64dfd32491f75fe4c23c2c3 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 10 May 2009 16:11:24 +0200 Subject: [PATCH 1146/2970] Update Russian translation --- po/ru.po | 823 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 438 insertions(+), 385 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9464bf76..91318549 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-30 22:14+0900\n" -"PO-Revision-Date: 2009-04-30 22:57+0800\n" +"POT-Creation-Date: 2009-05-10 10:43+0900\n" +"PO-Revision-Date: 2009-05-10 11:03+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1314 -#: ../midori/main.c:1415 -#: ../midori/main.c:1423 -#: ../midori/main.c:1434 -#: ../midori/midori-websettings.c:275 +#: ../midori/main.c:1315 +#: ../midori/main.c:1449 +#: ../midori/main.c:1457 +#: ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -33,186 +33,195 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:95 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:157 -#: ../midori/main.c:237 +#: ../midori/main.c:158 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:349 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:381 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:459 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:482 -#: ../midori/main.c:516 -#: ../midori/main.c:532 +#: ../midori/main.c:483 +#: ../midori/main.c:517 +#: ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:711 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:740 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:769 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:788 -#: ../midori/main.c:816 -#: ../midori/main.c:845 +#: ../midori/main.c:789 +#: ../midori/main.c:817 +#: ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:868 -#: ../midori/main.c:891 +#: ../midori/main.c:869 +#: ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:964 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1091 +#: ../midori/main.c:1092 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1106 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1110 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1115 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1314 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1337 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1362 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Снимок сохранён в: %s\n" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1362 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1366 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1368 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Создать снимок указанной страницы" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1370 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1412 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1435 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1437 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1481 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1516 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1578 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1593 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1606 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1619 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1631 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1647 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Игнорировать" @@ -231,577 +240,577 @@ msgstr "Плохо сформированный документ." msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:281 -#: ../midori/midori-browser.c:3436 -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:285 +#: ../midori/midori-browser.c:3664 +#: ../midori/midori-browser.c:3670 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:292 -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:296 +#: ../midori/midori-browser.c:3667 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:354 +#: ../midori/midori-browser.c:358 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:379 +#: ../midori/midori-browser.c:383 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:601 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:601 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:544 +#: ../midori/midori-browser.c:603 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:544 +#: ../midori/midori-browser.c:603 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:574 +#: ../midori/midori-browser.c:633 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:587 +#: ../midori/midori-browser.c:646 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:606 +#: ../midori/midori-browser.c:665 #: ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:684 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:630 -#: ../midori/midori-browser.c:671 +#: ../midori/midori-browser.c:689 +#: ../midori/midori-browser.c:730 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:747 +#: ../midori/midori-browser.c:806 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:921 +#: ../midori/midori-browser.c:976 #, c-format msgid "The file %s has been downloaded." -msgstr "Файл %s был загружен." +msgstr "Файл %s загружен." -#: ../midori/midori-browser.c:924 +#: ../midori/midori-browser.c:980 msgid "Transfer completed" msgstr "Передача завершена" -#: ../midori/midori-browser.c:1602 +#: ../midori/midori-browser.c:1675 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2877 -#: ../panels/midori-bookmarks.c:780 +#: ../midori/midori-browser.c:3000 +#: ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:2884 -#: ../panels/midori-bookmarks.c:786 +#: ../midori/midori-browser.c:3007 +#: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:814 -#: ../extensions/feed-panel/feed-panel.c:534 +#: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2887 -#: ../panels/midori-bookmarks.c:788 +#: ../midori/midori-browser.c:3010 +#: ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:816 -#: ../extensions/feed-panel/feed-panel.c:536 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:3048 +#: ../midori/midori-browser.c:3273 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3276 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3289 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3297 #: ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:3075 +#: ../midori/midori-browser.c:3300 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:3078 +#: ../midori/midori-browser.c:3303 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:3306 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3386 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3394 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3598 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3601 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3376 +#: ../midori/midori-browser.c:3604 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3379 +#: ../midori/midori-browser.c:3607 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3610 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3612 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3613 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3387 +#: ../midori/midori-browser.c:3615 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3388 +#: ../midori/midori-browser.c:3616 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3391 +#: ../midori/midori-browser.c:3619 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3394 +#: ../midori/midori-browser.c:3622 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3396 +#: ../midori/midori-browser.c:3624 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:3627 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3402 -#: ../midori/midori-browser.c:3405 +#: ../midori/midori-browser.c:3630 +#: ../midori/midori-browser.c:3633 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3636 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3639 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3414 +#: ../midori/midori-browser.c:3642 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3645 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3419 +#: ../midori/midori-browser.c:3647 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3648 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3422 +#: ../midori/midori-browser.c:3650 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3651 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3654 msgid "_Quick Find" msgstr "_Быстрый поиск" -#: ../midori/midori-browser.c:3427 +#: ../midori/midori-browser.c:3655 msgid "Quickly jump to a word or phrase" msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:3430 +#: ../midori/midori-browser.c:3658 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3660 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3433 +#: ../midori/midori-browser.c:3661 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3673 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3676 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3679 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3680 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3682 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:3457 -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3685 +#: ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-browser.c:3460 -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3688 +#: ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-browser.c:3463 -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3691 +#: ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:3466 -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3694 +#: ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:3469 -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3697 +#: ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:3472 -#: ../midori/midori-websettings.c:207 -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-browser.c:3700 +#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-browser.c:3475 -#: ../midori/midori-view.c:1142 +#: ../midori/midori-browser.c:3703 +#: ../midori/midori-view.c:1340 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3704 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3706 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3479 +#: ../midori/midori-browser.c:3707 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3711 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3485 +#: ../midori/midori-browser.c:3713 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3716 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3719 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3722 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3496 +#: ../midori/midori-browser.c:3724 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3725 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3499 -#: ../midori/midori-view.c:1114 +#: ../midori/midori-browser.c:3727 +#: ../midori/midori-view.c:1300 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3500 +#: ../midori/midori-browser.c:3728 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3504 +#: ../midori/midori-browser.c:3732 #: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3506 +#: ../midori/midori-browser.c:3734 #: ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Создать папку" -#: ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3735 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:3508 +#: ../midori/midori-browser.c:3736 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3510 +#: ../midori/midori-browser.c:3738 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3511 +#: ../midori/midori-browser.c:3739 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3514 +#: ../midori/midori-browser.c:3742 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:3515 +#: ../midori/midori-browser.c:3743 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:3519 +#: ../midori/midori-browser.c:3747 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3748 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3522 +#: ../midori/midori-browser.c:3750 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3751 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3525 +#: ../midori/midori-browser.c:3753 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3527 +#: ../midori/midori-browser.c:3755 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3528 +#: ../midori/midori-browser.c:3756 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3530 +#: ../midori/midori-browser.c:3758 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3531 +#: ../midori/midori-browser.c:3759 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3761 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3762 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3537 +#: ../midori/midori-browser.c:3765 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3544 +#: ../midori/midori-browser.c:3772 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3545 +#: ../midori/midori-browser.c:3773 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3550 +#: ../midori/midori-browser.c:3778 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3551 +#: ../midori/midori-browser.c:3779 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3554 +#: ../midori/midori-browser.c:3782 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3783 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3558 +#: ../midori/midori-browser.c:3786 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3559 +#: ../midori/midori-browser.c:3787 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3562 +#: ../midori/midori-browser.c:3790 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3563 +#: ../midori/midori-browser.c:3791 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3566 +#: ../midori/midori-browser.c:3794 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3567 +#: ../midori/midori-browser.c:3795 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3570 +#: ../midori/midori-browser.c:3798 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3571 +#: ../midori/midori-browser.c:3799 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:4002 +#: ../midori/midori-browser.c:4233 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:4009 +#: ../midori/midori-browser.c:4240 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:4011 +#: ../midori/midori-browser.c:4242 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:4033 +#: ../midori/midori-browser.c:4264 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:4035 +#: ../midori/midori-browser.c:4266 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:4287 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:4069 +#: ../midori/midori-browser.c:4302 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:4304 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:4084 +#: ../midori/midori-browser.c:4319 #: ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:4086 +#: ../midori/midori-browser.c:4321 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:4099 +#: ../midori/midori-browser.c:4336 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:4101 +#: ../midori/midori-browser.c:4338 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:4518 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4543 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:4548 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4553 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4561 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:4571 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4356 -#: ../extensions/cookie-manager.c:819 +#: ../midori/midori-browser.c:4606 +#: ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "Удалить всё" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4928 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -815,12 +824,12 @@ msgid "Whether to detach the chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" #: ../midori/midori-panel.c:345 -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" #: ../midori/midori-panel.c:347 -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" @@ -829,551 +838,603 @@ msgstr "Расположить боковую панель справа" msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:185 -#: ../midori/midori-view.c:1947 +#: ../midori/midori-websettings.c:187 +#: ../midori/midori-view.c:2061 +#: ../midori/midori-view.c:2237 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:186 -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:587 +msgid "Show customized homepage in new tabs" +msgstr "Показывать визуальные закладки в новых вкладках" + +#: ../midori/midori-websettings.c:588 +msgid "Show a customized homepage in newly opened tabs" +msgstr "Показывать визуальные закладки в только что открытых вкладках" + +#: ../midori/midori-websettings.c:596 msgid "Download Folder" msgstr "Папка загрузок" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:597 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:616 msgid "Ask for the destination folder" msgstr "Запрашивать папку для загрузок" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:617 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Запрашивать конечную папку для каждого файла" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:636 msgid "Notify when a transfer has been completed" msgstr "Уведомлять по завершении передачи" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:637 msgid "Whether to show a notification when a transfer has been completed" msgstr "Показывать уведомление по окончании передачи файлов" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:649 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:650 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:658 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:659 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:674 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:675 msgid "An external news aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:683 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:684 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:692 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:693 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:703 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:704 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:712 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:713 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:721 msgid "Open new pages in" msgstr "Открывать новую страницу в" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:722 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:731 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:732 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:745 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:746 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:754 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:755 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:763 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:764 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:772 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:773 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:771 +#: ../midori/midori-websettings.c:789 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:790 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:805 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:788 +#: ../midori/midori-websettings.c:806 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:814 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:815 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:824 msgid "Original cookies only" msgstr "Только оригинальные фрагменты данных" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:825 msgid "Accept cookies from the original website only" msgstr "Принимать фрагменты данных только с оригинального сайта" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:833 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:834 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения фрагментов данных" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:844 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:845 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:853 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:854 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:844 +#: ../midori/midori-websettings.c:862 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:863 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:871 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:872 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:882 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:883 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:898 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:899 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:915 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:916 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:914 +#: ../midori/midori-websettings.c:932 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:933 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:941 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:942 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" +#: ../midori/midori-view.c:668 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Не удалось открыть страницу «%s»." + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:670 +#: ../midori/midori-view.c:2762 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Ошибка" + +#: ../midori/midori-view.c:673 +msgid "Try again" +msgstr "Попытаться снова" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:629 -#: ../midori/midori-view.c:2471 +#: ../midori/midori-view.c:702 +#: ../midori/midori-view.c:2766 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1162 msgid "Open _Link" msgstr "_Открыть ссылку" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1164 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1181 msgid "Open Link in New _Window" msgstr "Открыть ссылку в новом _окне" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1190 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1196 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1205 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1234 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1262 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1272 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1238 +#. FIXME: This should be a proper action in the browser +#: ../midori/midori-view.c:1322 +msgid "Add to customized _homepage" +msgstr "До_бавить в визуальные закладки" + +#: ../midori/midori-view.c:1437 msgid "Open or download file" msgstr "Открыть или загрузить файл" -#: ../midori/midori-view.c:1255 +#: ../midori/midori-view.c:1454 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1457 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1461 #, c-format msgid "Open %s" msgstr "Открыть %s" -#: ../midori/midori-view.c:1665 +#: ../midori/midori-view.c:1881 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1810 +#: ../midori/midori-view.c:2063 +#: ../midori/midori-view.c:2064 +msgid "Search" +msgstr "Найти" + +#: ../midori/midori-view.c:2065 +msgid "Click to add a shortcut" +msgstr "Нажмите, чтобы добавить закладку" + +#: ../midori/midori-view.c:2066 +msgid "Enter shortcut address" +msgstr "Введите адрес страницы" + +#: ../midori/midori-view.c:2067 +msgid "Enter shortcut name" +msgstr "Введите название закладки" + +#: ../midori/midori-view.c:2068 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Удалить визуальную закладку?" + +#: ../midori/midori-view.c:2099 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1826 +#: ../midori/midori-view.c:2116 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" @@ -1384,19 +1445,19 @@ msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:425 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Передачи" @@ -1585,7 +1646,7 @@ msgid "days" msgstr "дней" #: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:277 +#: ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Очистить" @@ -1866,105 +1927,105 @@ msgstr "Да" msgid "No" msgstr "Нет" -#: ../extensions/cookie-manager.c:491 +#: ../extensions/cookie-manager.c:493 msgid "Do you really want to delete all cookies?" msgstr "Удалить все сохранённые фрагменты данных?" -#: ../extensions/cookie-manager.c:493 +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager.c:502 -msgid "Only the visible cookies are deleted which match the entered filter string." -msgstr "Будут удалены только видимые фрагменты, удовлетворяющие условиям фильтра." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Будут удалены только фрагменты, удовлетворяющие условиям фильтра." -#: ../extensions/cookie-manager.c:680 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager.c:740 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager.c:748 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager.c:821 +#: ../extensions/cookie-manager.c:823 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены только те фрагменты, которые удовлетворяют его условиям." -#: ../extensions/cookie-manager.c:836 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "Развернуть всё" -#: ../extensions/cookie-manager.c:843 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager.c:874 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "Фильтр:" -#: ../extensions/cookie-manager.c:879 +#: ../extensions/cookie-manager.c:881 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" -#: ../extensions/cookie-manager.c:914 -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:916 +#: ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" -#: ../extensions/cookie-manager.c:946 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "Менеджер _фрагментов данных" -#: ../extensions/cookie-manager.c:963 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "Просмотр и удаление фрагментов данных" -#: ../extensions/feed-panel/feed-atom.c:217 +#: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." -#: ../extensions/feed-panel/feed-atom.c:323 +#: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:394 +#: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Последнее обновление: %s." -#: ../extensions/feed-panel/feed-panel.c:656 +#: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" msgstr "Ленты" -#: ../extensions/feed-panel/feed-panel.c:709 +#: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" msgstr "Добавить ленту" -#: ../extensions/feed-panel/feed-panel.c:716 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" msgstr "Удалить ленту" -#: ../extensions/feed-panel/feed-panel.c:799 +#: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" msgstr "Л_енты" -#: ../extensions/feed-panel/feed-parse.c:139 +#: ../extensions/feed-panel/feed-parse.c:175 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не удалось найти корневой элемент в данных XML." -#: ../extensions/feed-panel/feed-parse.c:179 +#: ../extensions/feed-panel/feed-parse.c:215 #, c-format msgid "Unsupported feed format." msgstr "Формат ленты не поддерживается." -#: ../extensions/feed-panel/feed-parse.c:209 +#: ../extensions/feed-panel/feed-parse.c:245 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не удалось обработать XML-ленту: %s" @@ -1985,10 +2046,6 @@ msgstr "Не удалось найти обязательные элементы msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML." -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Ошибка" - #: ../extensions/feed-panel/main.c:114 #, c-format msgid "Feed '%s' already exists" @@ -2151,8 +2208,6 @@ msgstr "Быстрая настройка режимов отображения #~ msgstr "Показать кнопку Новая Вкладка в панели инструментов" #~ msgid "Show Homepage" #~ msgstr "Показать домашнюю страницу" -#~ msgid "Show the Homepage button in the toolbar" -#~ msgstr "Показать кнопку Домашняя Страница в панели инструментов" #~ msgid "Show Web search" #~ msgstr "Показать поиск" #~ msgid "Show the Web search entry in the toolbar" @@ -2181,8 +2236,6 @@ msgstr "Быстрая настройка режимов отображения #~ msgstr "Имя иконки содержащей анимационные рамки" #~ msgid "The name of an icon to be used as the static image" #~ msgstr "Имя иконки для статичного изобрадения" -#~ msgid "Icon '%s' couldn't be loaded" -#~ msgstr "Значок '%s' не может быть загружен" #~ msgid "The descriptive text of the item" #~ msgstr "Описание пункта" #~ msgid "Token" From d6189f0040cff78cfba7fb28c0dfd11461a85adc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 16:13:16 +0200 Subject: [PATCH 1147/2970] Update localization template --- po/midori.pot | 755 +++++++++++++++++++++++++++----------------------- 1 file changed, 404 insertions(+), 351 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index 940df1ed..685cee8b 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-03 00:47+0200\n" +"POT-Creation-Date: 2009-05-10 16:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 -#: ../midori/main.c:1423 ../midori/main.c:1434 -#: ../midori/midori-websettings.c:275 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 +#: ../midori/main.c:1457 ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "" @@ -30,182 +30,191 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:95 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:150 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:157 ../midori/main.c:237 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:349 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:381 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:435 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:459 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:711 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:740 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:769 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:868 ../midori/main.c:891 +#: ../midori/main.c:869 ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:964 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1091 +#: ../midori/main.c:1092 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1106 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1110 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1115 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1314 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1337 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1362 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "" -#: ../midori/main.c:1362 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "" -#: ../midori/main.c:1366 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1368 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "" -#: ../midori/main.c:1370 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "" -#: ../midori/main.c:1412 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1435 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1437 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1481 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1516 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1566 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1578 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1593 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1606 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1619 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1631 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1647 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "" @@ -222,550 +231,558 @@ msgstr "" msgid "Writing failed." msgstr "" -#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3497 -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3500 +#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:354 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:379 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:630 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:803 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:1119 #, c-format msgid "The file %s has been downloaded." msgstr "" -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:1123 msgid "Transfer completed" msgstr "" -#: ../midori/midori-browser.c:1658 +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2936 ../panels/midori-bookmarks.c:780 +#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "" -#: ../midori/midori-browser.c:2943 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 +#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2946 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 +#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "" -#: ../midori/midori-browser.c:3131 ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3452 msgid "Cookies" msgstr "" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" msgstr "" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:3431 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3434 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3437 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3449 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3463 ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3472 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3480 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3481 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3493 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3506 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:3515 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:3518 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-browser.c:3521 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-browser.c:3524 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-browser.c:3527 ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-browser.c:3530 ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-browser.c:3533 ../midori/midori-websettings.c:207 -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "" -#: ../midori/midori-browser.c:3536 ../midori/midori-view.c:1187 +#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3537 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3540 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3544 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3552 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3557 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3558 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3560 ../midori/midori-view.c:1159 +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3561 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3565 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3567 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "" -#: ../midori/midori-browser.c:3568 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3571 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3572 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3575 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3576 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "" -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3581 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3583 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3584 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3588 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3589 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3591 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3592 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3594 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3595 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3598 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3605 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3606 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3612 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3615 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3616 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3619 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3620 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3623 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3627 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3628 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3631 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3632 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:4072 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:4094 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:4096 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:4130 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:4132 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:4145 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:4147 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:4160 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4354 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4359 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4382 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4417 ../extensions/cookie-manager.c:819 +#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "" -#: ../midori/midori-browser.c:4729 +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -778,11 +795,11 @@ msgstr "" msgid "Whether to detach the chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "" @@ -790,560 +807,593 @@ msgstr "" msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2000 +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:578 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:617 msgid "Ask for the destination folder" msgstr "" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:618 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:637 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:638 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:771 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:788 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:844 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:914 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "" -#: ../midori/midori-view.c:641 +#: ../midori/midori-view.c:686 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "" -#: ../midori/midori-view.c:643 ../extensions/feed-panel/main.c:112 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "" -#: ../midori/midori-view.c:646 +#: ../midori/midori-view.c:691 msgid "Try again" msgstr "" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:673 ../midori/midori-view.c:2524 +#: ../midori/midori-view.c:721 ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1021 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:1023 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:1040 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:1049 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1055 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1064 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:1093 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "" -#: ../midori/midori-view.c:1121 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1131 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "" -#: ../midori/midori-view.c:1300 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:1303 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1307 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "" -#: ../midori/midori-view.c:1710 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1862 +#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 +msgid "Search" +msgstr "" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1879 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "" @@ -1354,19 +1404,19 @@ msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "" -#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "" @@ -1550,7 +1600,7 @@ msgstr "" msgid "days" msgstr "" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "" @@ -1708,10 +1758,14 @@ msgid "Clear the entire history" msgstr "" #: ../panels/midori-history.c:599 -#, c-format msgid "A week ago" msgstr "" +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "" + #: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" @@ -1814,109 +1868,108 @@ msgstr "" msgid "No" msgstr "" -#: ../extensions/cookie-manager.c:491 +#: ../extensions/cookie-manager.c:493 msgid "Do you really want to delete all cookies?" msgstr "" -#: ../extensions/cookie-manager.c:493 +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "" -#: ../extensions/cookie-manager.c:502 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." msgstr "" -#: ../extensions/cookie-manager.c:680 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "" -#: ../extensions/cookie-manager.c:740 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "" -#: ../extensions/cookie-manager.c:748 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "" -#: ../extensions/cookie-manager.c:821 +#: ../extensions/cookie-manager.c:823 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" -#: ../extensions/cookie-manager.c:836 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "" -#: ../extensions/cookie-manager.c:843 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "" -#: ../extensions/cookie-manager.c:874 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "" -#: ../extensions/cookie-manager.c:879 +#: ../extensions/cookie-manager.c:881 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" msgstr "" -#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "" -#: ../extensions/cookie-manager.c:946 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "" -#: ../extensions/cookie-manager.c:963 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "" -#: ../extensions/feed-panel/feed-atom.c:217 +#: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/feed-atom.c:323 +#: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "" -#: ../extensions/feed-panel/feed-panel.c:660 +#: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:803 +#: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" msgstr "" -#: ../extensions/feed-panel/feed-parse.c:139 +#: ../extensions/feed-panel/feed-parse.c:175 #, c-format msgid "Failed to find root element in feed XML data." msgstr "" -#: ../extensions/feed-panel/feed-parse.c:179 +#: ../extensions/feed-panel/feed-parse.c:215 #, c-format msgid "Unsupported feed format." msgstr "" -#: ../extensions/feed-panel/feed-parse.c:209 +#: ../extensions/feed-panel/feed-parse.c:245 #, c-format msgid "Failed to parse XML feed: %s" msgstr "" From 2991939575c010d2a964383ab17ed9f48cc77ef5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 16:13:38 +0200 Subject: [PATCH 1148/2970] Update German translation --- po/de.po | 760 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 406 insertions(+), 354 deletions(-) diff --git a/po/de.po b/po/de.po index 842e632f..a518c133 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-03 00:47+0200\n" +"POT-Creation-Date: 2009-05-10 16:06+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 -#: ../midori/main.c:1423 ../midori/main.c:1434 -#: ../midori/midori-websettings.c:275 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 +#: ../midori/main.c:1457 ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -31,79 +31,79 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:95 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:157 ../midori/main.c:237 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:349 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:381 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:459 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:711 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:740 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:769 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:868 ../midori/main.c:891 +#: ../midori/main.c:869 ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:964 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1091 +#: ../midori/main.c:1092 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -111,104 +111,113 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1106 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1110 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1115 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1314 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1337 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1362 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Schnappschuss gespeichert: %s\n" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1362 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1366 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1368 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Schnappschuss der angegebenen URI aufnehmen" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1370 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1412 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1435 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1437 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1481 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1516 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1578 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1593 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1606 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1619 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1631 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1647 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Ignorieren" @@ -225,552 +234,560 @@ msgstr "Fehlerhaftes Dokument" msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3497 -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3500 +#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:354 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:379 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:630 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:803 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:1119 #, c-format msgid "The file %s has been downloaded." msgstr "Die Datei %s wurde heruntergeladen." -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:1123 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../midori/midori-browser.c:1658 +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2936 ../panels/midori-bookmarks.c:780 +#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:2943 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 +#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2946 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 +#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:3131 ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3452 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" msgstr "«Flash» Cookies" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3431 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3434 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3437 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Zu Schnell_wahl hinzufügen" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3449 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3463 ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3472 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3480 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3481 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3493 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3506 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3515 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:3518 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-browser.c:3521 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-browser.c:3524 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:3527 ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3530 ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:3533 ../midori/midori-websettings.c:207 -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:3536 ../midori/midori-view.c:1187 +#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3537 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3540 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3544 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3552 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3557 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3558 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3560 ../midori/midori-view.c:1159 +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3561 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3565 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3567 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../midori/midori-browser.c:3568 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3571 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3572 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3575 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3576 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3581 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3583 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3584 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3588 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3589 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3591 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3592 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3594 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3595 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3598 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3605 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3606 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3612 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3615 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3616 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3619 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3620 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3623 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3627 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3628 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3631 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3632 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:4072 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:4094 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:4096 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:4130 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:4132 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:4145 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:4147 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:4160 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4354 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4359 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4382 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4417 ../extensions/cookie-manager.c:819 +#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "Alle löschen" -#: ../midori/midori-browser.c:4729 +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -783,11 +800,11 @@ msgstr "Gewählte Leiste vom Fenster ablösen" msgid "Whether to detach the chosen panel from the window" msgstr "Die gewählte Seitenleiste vom Fenster ablösen" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" @@ -795,561 +812,594 @@ msgstr "Die Seitenleiste auf der rechten Seite anordnen" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2000 +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:578 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Schnellwahl in neuen Reitern anzeigen" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:617 msgid "Ask for the destination folder" msgstr "Nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:618 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:637 msgid "Notify when a transfer has been completed" msgstr "Benachrichtigen bei Abschluss einer Übertragung" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:638 msgid "Whether to show a notification when a transfer has been completed" msgstr "" "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:771 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:788 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:844 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:914 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" -#: ../midori/midori-view.c:641 +#: ../midori/midori-view.c:686 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite «%s» konnte nicht geladen werden." -#: ../midori/midori-view.c:643 ../extensions/feed-panel/main.c:112 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Fehler" -#: ../midori/midori-view.c:646 +#: ../midori/midori-view.c:691 msgid "Try again" msgstr "Erneut versuchen" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:673 ../midori/midori-view.c:2524 +#: ../midori/midori-view.c:721 ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1021 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:1023 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1040 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:1049 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1055 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1064 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:1093 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:1121 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1131 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1300 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: «%s»" -#: ../midori/midori-view.c:1303 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1307 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1710 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1862 +#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Suchen" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Klicken um eine Verknüpfung hinzuzufügen" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Ziel der Verknüpfung eingeben" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Titel der Verknüpfung eingeben" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1879 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1360,19 +1410,19 @@ msgid "Preferences for %s" msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" -#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Übertragungen" @@ -1558,7 +1608,7 @@ msgstr "Benutzerprofile" msgid "days" msgstr "Tage" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Leer" @@ -1716,14 +1766,18 @@ msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" #: ../panels/midori-history.c:599 -#, c-format msgid "A week ago" msgstr "Vor einer Woche" +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "Vor %d Tagen" + #: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" -msgstr "vor %d Tagen" +msgstr "Vor %d Tagen" #: ../panels/midori-history.c:612 msgid "Today" @@ -1830,34 +1884,32 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../extensions/cookie-manager.c:491 +#: ../extensions/cookie-manager.c:493 msgid "Do you really want to delete all cookies?" msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" -#: ../extensions/cookie-manager.c:493 +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager.c:502 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." msgstr "" -"Nur die sichtbaren Profildateien, die auf den eigegebenen Filter passen, " -"werden gelöscht." +"Nur Profildateien, die auf den eigegebenen Filter passen, werden gelöscht." -#: ../extensions/cookie-manager.c:680 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager.c:740 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager.c:748 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../extensions/cookie-manager.c:821 +#: ../extensions/cookie-manager.c:823 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -1865,19 +1917,19 @@ msgstr "" "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " "Einträge gelöscht, die auf den Filter passen" -#: ../extensions/cookie-manager.c:836 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "Alle ausklappen" -#: ../extensions/cookie-manager.c:843 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "Alle einklappen" -#: ../extensions/cookie-manager.c:874 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager.c:879 +#: ../extensions/cookie-manager.c:881 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -1885,62 +1937,62 @@ msgstr "" "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " "Domöne auf den eingegebenen Filter passt." -#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "Cookieverwaltung" -#: ../extensions/cookie-manager.c:946 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "_Cookieverwaltung" -#: ../extensions/cookie-manager.c:963 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "Profildateien auflisten, anzeigen und löschen" -#: ../extensions/feed-panel/feed-atom.c:217 +#: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" "Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." -#: ../extensions/feed-panel/feed-atom.c:323 +#: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Zuletzt aktualisiert: %s." -#: ../extensions/feed-panel/feed-panel.c:660 +#: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" msgstr "Nachrichtenquellen" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" msgstr "Eine neue Nachrichtenquelle hinzufügen" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" msgstr "Nachrichtenquelle löschen" -#: ../extensions/feed-panel/feed-panel.c:803 +#: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" -#: ../extensions/feed-panel/feed-parse.c:139 +#: ../extensions/feed-panel/feed-parse.c:175 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Das Basiselement wurde im XML der Nachrichtenquelle nicht gefunden." -#: ../extensions/feed-panel/feed-parse.c:179 +#: ../extensions/feed-panel/feed-parse.c:215 #, c-format msgid "Unsupported feed format." msgstr "Nicht unterstütztes Quellenformat." -#: ../extensions/feed-panel/feed-parse.c:209 +#: ../extensions/feed-panel/feed-parse.c:245 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML-Quelle konnte nicht ausgelesen werden: %s" From b5a534b3631d6e09e0a4de486aa1323c7cf045f6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 16:20:50 +0200 Subject: [PATCH 1149/2970] Replace variables in templates literally --- midori/sokoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 8e9c84b2..59d88e05 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1057,7 +1057,7 @@ sokoke_replace_variables (const gchar* template, const gchar* value = va_arg (args, const gchar*); GRegex* regex = g_regex_new (variable, 0, 0, NULL); gchar* replaced = result; - result = g_regex_replace (regex, replaced, -1, 0, value, 0, NULL); + result = g_regex_replace_literal (regex, replaced, -1, 0, value, 0, NULL); g_free (replaced); g_regex_unref (regex); } From a582d8dcc064612909657480f308c4592e6bc20d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 16:40:43 +0200 Subject: [PATCH 1150/2970] Fix font family/ homepage tooltip mixup --- midori/midori-preferences.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index f3897345..c15522e4 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -444,7 +444,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); hbox = gtk_hbox_new (FALSE, 4); button = katze_property_proxy (settings, "default-font-family", "font"); - gtk_widget_set_tooltip_text (entry, _("The default font family used to display text")); + gtk_widget_set_tooltip_text (button, _("The default font family used to display text")); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); entry = katze_property_proxy (settings, "default-font-size", NULL); gtk_widget_set_tooltip_text (entry, _("The default font size used to display text")); From 8588c3b43feb01afa3b95d4fce5560bcd861c373 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 12 May 2009 01:27:51 +0200 Subject: [PATCH 1151/2970] Ellipsize tab labels differently to emphasize subtitles --- midori/midori-view.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 3fb02fb6..744a4578 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1558,6 +1558,24 @@ midori_view_set_property (GObject* object, #define title midori_view_get_display_title (view) if (view->tab_label) { + /* If the title starts with the presumed name of the website, we + ellipsize differently, to emphasize the subtitle */ + if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0) + { + SoupURI* uri = soup_uri_new (view->uri); + const gchar* host = uri ? (uri->host ? uri->host : "") : ""; + const gchar* name = g_str_has_prefix (host, "www.") ? &host[4] : host; + guint i = 0; + while (name[i++]) + if (name[i] == '.') + break; + if (!g_ascii_strncasecmp (title, name, i)) + gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_START); + else + gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_END); + if (uri) + soup_uri_free (uri); + } gtk_label_set_text (GTK_LABEL (view->tab_title), title); gtk_widget_set_tooltip_text (view->tab_title, title); } @@ -2381,7 +2399,8 @@ midori_view_update_tab_title (GtkWidget* label, if (angle == 0.0 || angle == 360.0) { gtk_widget_set_size_request (label, width * size, -1); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + if (gtk_label_get_ellipsize (GTK_LABEL (label)) != PANGO_ELLIPSIZE_START) + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); } else { From 541d65f01308c62fd34ddeb0285bad8e2b1a87c8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 12 May 2009 01:33:44 +0200 Subject: [PATCH 1152/2970] Fix Gtk version check for speed dial, this is >= Gtk 2.14 --- midori/midori-browser.c | 2 +- midori/midori-websettings.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 892250f7..29d018b9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -406,7 +406,7 @@ midori_browser_update_thumbnail (GtkWidget* view, { GtkWidget* child; - #if GTK_CHECK_VERSION (2, 12, 0) + #if GTK_CHECK_VERSION (2, 14, 0) if (midori_view_get_load_status (MIDORI_VIEW (view)) != MIDORI_LOAD_FINISHED) return; diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 49c4304d..b2dffb0d 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -588,7 +588,11 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Show speed dial in new tabs"), _("Show speed dial in newly opened tabs"), TRUE, + #if GTK_CHECK_VERSION (2, 14, 0) flags)); + #else + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + #endif g_object_class_install_property (gobject_class, PROP_DOWNLOAD_FOLDER, From 465ff4d0ffc78ad8b2b270a4deaddca870386c65 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 12 May 2009 01:41:15 +0200 Subject: [PATCH 1153/2970] Include compat.h in sokoke --- midori/sokoke.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/sokoke.c b/midori/sokoke.c index 59d88e05..552e025c 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -13,6 +13,8 @@ #include "sokoke.h" #include "midori-stock.h" +#include "compat.h" + #if HAVE_CONFIG_H #include #endif From ff2abf1fd4483f553d8e8fd606d9b61f7d5ca55d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 12 May 2009 01:50:07 +0200 Subject: [PATCH 1154/2970] Use katze_assign, not katze_object_assign for program_notify_send --- midori/midori-app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index f70a0469..12452790 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -537,7 +537,7 @@ midori_app_finalize (GObject* object) app->libnotify_funcs.uninit (); g_module_close (app->libnotify_module); } - katze_object_assign (app->program_notify_send, NULL); + katze_assign (app->program_notify_send, NULL); G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); } From 20d03e43aa67b933abf69da40d095b7ceb245bc3 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 12 May 2009 01:52:30 +0200 Subject: [PATCH 1155/2970] Improve handling of feeds with missing data Previously the description was used in the treeview if the title was not present, however this is not possible in some cases, as it may contain markup. The the RSS code is changed so now if there is no title, the description is used as the title, but with the html stripped from it. We also have to consider that some description elements may simply contain an html tag (and therefore no text). In that case the URI is used as the title. --- extensions/feed-panel/feed-parse.c | 36 +++++++++++++++++++----------- extensions/feed-panel/feed-parse.h | 3 +++ extensions/feed-panel/feed-rss.c | 27 ++++++++++++++++++---- 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/extensions/feed-panel/feed-parse.c b/extensions/feed-panel/feed-parse.c index 4c09dc64..1c2cd3f3 100644 --- a/extensions/feed-panel/feed-parse.c +++ b/extensions/feed-panel/feed-parse.c @@ -33,35 +33,36 @@ feed_get_element_string (FeedParser* fparser) return (gchar*)xmlNodeListGetString (fparser->doc, node->children, 1); } -void +static void handle_markup_chars (void* user_data, const xmlChar* ch, int len) { - gchar** markup; - gchar* temp; + if (len > 0) + { + gchar** markup; + gchar* temp; - markup = (gchar**)user_data; - temp = g_strndup ((gchar*)ch, len); - *markup = (*markup) ? g_strconcat (*markup, temp, NULL) : g_strdup (temp); - g_free (temp); + markup = (gchar**)user_data; + temp = g_strndup ((gchar*)ch, len); + *markup = (*markup) ? g_strconcat (*markup, temp, NULL) : g_strdup (temp); + g_free (temp); + } } gchar* -feed_get_element_markup (FeedParser* fparser) +feed_remove_markup (gchar* markup) { - gchar* markup; const xmlChar* stag; - - markup = feed_get_element_string (fparser); - if ((stag = xmlStrchr (BAD_CAST markup, '<')) && xmlStrchr (stag, '>')) + if (((stag = xmlStrchr (BAD_CAST markup, '<')) && xmlStrchr (stag, '>')) || + xmlStrchr (BAD_CAST markup, '&')) { gchar* text = NULL; htmlSAXHandlerPtr psax; psax = g_new0 (htmlSAXHandler, 1); psax->characters = handle_markup_chars; - htmlSAXParseDoc (BAD_CAST markup, NULL, psax, &text); + htmlSAXParseDoc (BAD_CAST markup, "UTF-8", psax, &text); g_free (psax); g_free (markup); return text; @@ -69,6 +70,15 @@ feed_get_element_markup (FeedParser* fparser) return markup; } +gchar* +feed_get_element_markup (FeedParser* fparser) +{ + gchar* markup; + + markup = feed_get_element_string (fparser); + return feed_remove_markup (markup); +} + gint64 feed_get_element_date (FeedParser* fparser) { diff --git a/extensions/feed-panel/feed-parse.h b/extensions/feed-panel/feed-parse.h index 84ae9f19..31685feb 100644 --- a/extensions/feed-panel/feed-parse.h +++ b/extensions/feed-panel/feed-parse.h @@ -57,6 +57,9 @@ typedef struct _FeedParser gchar* feed_get_element_string (FeedParser* fparser); +gchar* +feed_remove_markup (gchar* markup); + gchar* feed_get_element_markup (FeedParser* fparser); diff --git a/extensions/feed-panel/feed-rss.c b/extensions/feed-panel/feed-rss.c index 03843df6..e8022634 100644 --- a/extensions/feed-panel/feed-rss.c +++ b/extensions/feed-panel/feed-rss.c @@ -137,11 +137,30 @@ rss_postparse_item (FeedParser* fparser) * Verify that the required RSS elements are added * (as per the spec) */ - if (!katze_item_get_name (fparser->item) && - !katze_item_get_text (fparser->item)) + if (!katze_item_get_name (fparser->item)) { - feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, - _("Failed to find required RSS \"item\" elements in XML data.")); + gchar* desc; + + desc = (gchar*)katze_item_get_text (fparser->item); + if (!desc) + { + feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find required RSS \"item\" elements in XML data.")); + } + else + { + desc = feed_remove_markup (g_strdup (desc)); + if (desc) + { + katze_item_set_name (fparser->item, desc); + g_free (desc); + } + else + { + if ((desc = (gchar*)katze_item_get_uri (fparser->item))) + katze_item_set_name (fparser->item, desc); + } + } } } From a7b9a40f1ac50bf3f91373416a80431348d15615 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Tue, 12 May 2009 02:22:24 +0200 Subject: [PATCH 1156/2970] Update Japanese translation --- po/ja.po | 1084 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 626 insertions(+), 458 deletions(-) diff --git a/po/ja.po b/po/ja.po index dc98bcbd..6271c10f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-27 21:28+0900\n" -"PO-Revision-Date: 2009-04-27 21:27+0900\n" +"POT-Creation-Date: 2009-05-11 00:57+0900\n" +"PO-Revision-Date: 2009-05-11 00:59+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,9 +20,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 -#: ../midori/main.c:1423 ../midori/main.c:1434 -#: ../midori/midori-websettings.c:273 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1315 +#: ../midori/main.c:1449 +#: ../midori/main.c:1457 +#: ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -30,187 +33,197 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:95 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:157 ../midori/main.c:237 +#: ../midori/main.c:158 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:349 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:381 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:459 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 +#: ../midori/main.c:483 +#: ../midori/main.c:517 +#: ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:711 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:740 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:769 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 +#: ../midori/main.c:789 +#: ../midori/main.c:817 +#: ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:868 ../midori/main.c:891 +#: ../midori/main.c:869 +#: ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:964 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1091 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" -"ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" -"い。" +#: ../midori/main.c:1092 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションのいずれかを試してみてください。" -#: ../midori/main.c:1106 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1110 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1115 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1314 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1337 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1362 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "スナップショットを取得しました: %s\n" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1362 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "FOLDER" # CLI --help -#: ../midori/main.c:1366 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "指定された URI のスナップショットを取得する" + # CLI --help -#: ../midori/main.c:1368 +#: ../midori/main.c:1401 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1370 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1412 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1435 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1437 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1481 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1516 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1578 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1593 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1606 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1619 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1631 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1647 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "無視(_I)" @@ -218,561 +231,597 @@ msgstr "無視(_I)" msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:338 ../midori/sokoke.c:714 +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3426 -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:287 +#: ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:298 +#: ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:354 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:379 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:544 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:544 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:574 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:587 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:648 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:606 ../midori/midori-searchaction.c:962 -#: ../extensions/feed-panel/main.c:322 +#: ../midori/midori-browser.c:667 +#: ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:630 ../midori/midori-browser.c:671 +#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:747 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:921 +#: ../midori/midori-browser.c:1119 #, c-format msgid "The file %s has been downloaded." msgstr "ファイル %s をダウンロードしました。" -#: ../midori/midori-browser.c:924 +#: ../midori/midori-browser.c:1123 msgid "Transfer completed" msgstr "転送完了" -#: ../midori/midori-browser.c:1602 +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2867 ../panels/midori-bookmarks.c:780 +#: ../midori/midori-browser.c:3152 +#: ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2874 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:492 +#: ../midori/midori-browser.c:3159 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 +#: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2877 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:494 +#: ../midori/midori-browser.c:3162 +#: ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" # Dialog title -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button title -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:3062 ../midori/midori-preferences.c:646 +#: ../midori/midori-browser.c:3449 +#: ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3452 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3360 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3366 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3372 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3764 +#: ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "スピードダイアルに追加(_D)" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "ショートカットをスピードダイアルに追加します" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3375 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" -#: ../midori/midori-browser.c:3392 ../midori/midori-browser.c:3395 +#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "選択した文字をコピーします" -#: ../midori/midori-browser.c:3398 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "選択した文字を削除します" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3413 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3416 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3422 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3435 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3438 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3444 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3447 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3840 +#: ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3450 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3843 +#: ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3453 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3846 +#: ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3456 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3849 +#: ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3459 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3852 +#: ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3462 ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3855 +#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3465 ../midori/midori-view.c:1146 +#: ../midori/midori-browser.c:3858 +#: ../midori/midori-view.c:1275 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3468 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3473 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3481 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3489 ../midori/midori-view.c:1118 +#: ../midori/midori-browser.c:3882 +#: ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3494 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3887 +#: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3496 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3889 +#: ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3500 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3893 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3501 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:3504 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3510 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3515 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3517 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3518 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3521 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3524 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3527 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3540 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3541 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3544 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3545 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3548 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3552 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3556 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3557 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3560 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3561 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:4003 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:4005 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:4027 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:4065 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:4078 ../midori/sokoke.c:870 +#: ../midori/midori-browser.c:4475 +#: ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:4080 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" -msgstr "保存されたブックマークを表示します" +msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4292 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4297 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4315 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4350 ../extensions/cookie-manager.c:819 +#: ../midori/midori-browser.c:4762 +#: ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "すべて削除" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -785,551 +834,614 @@ msgstr "選択したパネルをウィンドウから切り離す" msgid "Whether to detach the chosen panel from the window" msgstr "選択したパネルをウィンドウから切り離します" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 +#: ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 +#: ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +#: ../midori/midori-panel.c:357 +#: ../midori/midori-panel.c:358 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1951 +#: ../midori/midori-websettings.c:187 +#: ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:262 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "転送バーを表示する" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" -#: ../midori/midori-websettings.c:576 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "新しいタブにスピードダイアルを表示する" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "新しく開かれたタブにスピードダイアルを表示します" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:617 +msgid "Ask for the destination folder" +msgstr "保存先フォルダを問い合わせる" + +#: ../midori/midori-websettings.c:618 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" + +#: ../midori/midori-websettings.c:637 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:638 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:634 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "フィードリーダ" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:673 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:750 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" -msgstr "Cookie を受け入れる方式を選択してください" +msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れる" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" -#: ../midori/midori-websettings.c:859 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:875 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "識別名" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" +#: ../midori/midori-view.c:686 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "ページ '%s' を読み込めませんでした" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 +#: ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "エラー" + +#: ../midori/midori-view.c:691 +msgid "Try again" +msgstr "再試行" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 ../midori/midori-view.c:2475 +#: ../midori/midori-view.c:721 +#: ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:984 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:986 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1003 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1012 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1018 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:1027 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:1056 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:1084 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1094 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1242 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:1259 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1266 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:1669 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1814 +#: ../midori/midori-view.c:2001 +#: ../midori/midori-view.c:2002 +msgid "Search" +msgstr "検索" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "クリックするとショートカットを追加できます" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "ショートカットのアドレスを入力してください" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "ショートカットの名前を入力してください" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "このショートカットを削除してもよろしいですか?" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1830 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1352,164 +1464,196 @@ msgstr "起動" msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 +#: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "転送" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:447 msgid "The default font family used to display text" msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:453 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:456 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:517 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:482 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:533 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:498 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:534 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:537 ../extensions/statusbar-features.c:72 +#: ../midori/midori-preferences.c:502 +#: ../extensions/statusbar-features.c:72 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:503 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:541 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:545 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:546 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "スペルチェック" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "スペルチェックを有効にする" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "キー入力中のスペルチェックを有効にします" + +#: ../midori/midori-preferences.c:525 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "スペルチェックを行う言語をカンマで区切って指定します。例 \"en_GB,de_DE\"" + #. Page "Interface" -#: ../midori/midori-preferences.c:554 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:555 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:566 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "ブラウジング" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "アプリケーション" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "外部アプリケーション" + #. Page "Network" -#: ../midori/midori-preferences.c:596 ../midori/midori-preferences.c:597 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:620 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:629 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:630 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:643 ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:666 +#: ../midori/midori-preferences.c:676 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 +#: ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "空です" @@ -1541,90 +1685,99 @@ msgstr "検索エンジンの管理" msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:518 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/sokoke.c:869 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:871 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "ブックマークに追加(_A)" -#: ../midori/sokoke.c:872 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:873 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:874 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:875 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:876 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:877 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/sokoke.c:878 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:879 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:880 +#: ../midori/sokoke.c:882 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../midori/sokoke.c:881 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "閉じたタブとウィンドウ(_C)" -#: ../midori/sokoke.c:882 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:927 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 +# tooltip +#: ../panels/midori-addons.c:928 +#: ../panels/midori-extensions.c:145 msgid "Enable" -msgstr "有効" +msgstr "有効にします" -#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:937 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 +# tooltip +#: ../panels/midori-addons.c:938 +#: ../panels/midori-extensions.c:155 msgid "Disable" -msgstr "無効" +msgstr "無効にします" #: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" @@ -1667,10 +1820,14 @@ msgid "Clear the entire history" msgstr "すべての履歴をクリアします" #: ../panels/midori-history.c:599 -#, c-format msgid "A week ago" msgstr "一週間前" +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "%d 日前" + #: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" @@ -1727,16 +1884,18 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:244 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "フォルダの選択" @@ -1783,150 +1942,148 @@ msgstr "あり" msgid "No" msgstr "なし" -#: ../extensions/cookie-manager.c:491 +#: ../extensions/cookie-manager.c:493 msgid "Do you really want to delete all cookies?" msgstr "本当にすべての cookie を削除してよろしいですか?" # Dialog title -#: ../extensions/cookie-manager.c:493 +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "確認" -#: ../extensions/cookie-manager.c:502 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." -msgstr "" -"フィルタに入力された文字列にマッチした、表示されている cookie のみ削除されま" -"す。" +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "フィルタに入力された文字列にマッチした cookie のみ削除されます。" # Column name of cookie browser -#: ../extensions/cookie-manager.c:680 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "名前" -#: ../extensions/cookie-manager.c:740 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "すべて展開する(_E)" -#: ../extensions/cookie-manager.c:748 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "すべて折り畳む(_C)" -#: ../extensions/cookie-manager.c:821 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" -"ルタにマッチした cookie のみ削除されます。" +#: ../extensions/cookie-manager.c:823 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "表示されているすべての cookie を削除します。フィルタが設定されていれば、フィルタにマッチした cookie のみ削除されます。" # tooltip -#: ../extensions/cookie-manager.c:836 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "すべて展開します" # tooltip -#: ../extensions/cookie-manager.c:843 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "すべて折り畳みます" -#: ../extensions/cookie-manager.c:874 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "フィルタ:" -#: ../extensions/cookie-manager.c:879 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"フィルタに入力された文字列と、名前またはドメインフィールドがマッチした " -"cookie のみ表示します。" +#: ../extensions/cookie-manager.c:881 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "フィルタに入力された文字列と、名前またはドメインフィールドがマッチした cookie のみ表示します。" -#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:916 +#: ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "Cookie マネージャ" -#: ../extensions/cookie-manager.c:946 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "Cookie マネージャ(_C)" -#: ../extensions/cookie-manager.c:963 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" -#: ../extensions/feed-panel/feed-atom.c:217 -msgid "Failed to find required Atom entry elements in XML data." -msgstr "XML データ内に要求された Atom エントリ要素が見つかりませんでした。" +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "XML データ内に要求された Atom \"entry\" 要素が見つかりませんでした。" -#: ../extensions/feed-panel/feed-atom.c:323 -msgid "Failed to find required Atom feed elements in XML data." -msgstr "XML データ内に要求された Atom フィード要素が見つかりませんでした。" +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "XML データ内に要求された Atom \"feed\" 要素が見つかりませんでした。" -#: ../extensions/feed-panel/feed-panel.c:614 +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "最終更新: %s" + +#: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" msgstr "フィード" -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" msgstr "新しいフィードの追加" -#: ../extensions/feed-panel/feed-panel.c:674 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" msgstr "フィードの削除" -#: ../extensions/feed-panel/feed-panel.c:757 +#: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" msgstr "フィード(_F)" -#: ../extensions/feed-panel/feed-parse.c:139 +#: ../extensions/feed-panel/feed-parse.c:175 #, c-format msgid "Failed to find root element in feed XML data." msgstr "フィード XML データ内にルート要素が見つかりませんでした。" -#: ../extensions/feed-panel/feed-parse.c:179 +#: ../extensions/feed-panel/feed-parse.c:215 #, c-format msgid "Unsupported feed format." msgstr "サポートされていないフィード形式です。" -#: ../extensions/feed-panel/feed-parse.c:209 +#: ../extensions/feed-panel/feed-parse.c:245 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML フィードの解析に失敗しました: %s" #: ../extensions/feed-panel/feed-rss.c:46 -msgid "Failed to find channel element in RSS XML data." -msgstr "RSS XML データ内にチャンネル要素が見つかりませんでした。" +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "RSS XML データ内に \"channel\" 要素が見つかりませんでした。" #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." msgstr "サポートされていない RSS バージョンが見つかりました。" #: ../extensions/feed-panel/feed-rss.c:144 -msgid "Failed to find required RSS item elements in XML data." -msgstr "XML データ内に要求された RSS アイテム要素が見つかりませんでした。" +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "XML データ内に要求された RSS \"item\" 要素が見つかりませんでした。" #: ../extensions/feed-panel/feed-rss.c:229 -msgid "Failed to find required RSS channel elements in XML data." -msgstr "XML データ内に要求された RSS チャンネル要素が見つかりませんでした。" +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "XML データ内に要求された RSS \"channel\" 要素が見つかりませんでした。" -#: ../extensions/feed-panel/main.c:148 -msgid "Error" -msgstr "エラー" - -#: ../extensions/feed-panel/main.c:178 +#: ../extensions/feed-panel/main.c:114 #, c-format -msgid "Error loading feed %s" -msgstr "フィード %s の読み込みでエラーです" +msgid "Feed '%s' already exists" +msgstr "フィード '%s' はすでに存在します" -#: ../extensions/feed-panel/main.c:310 +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "フィード '%s' の読み込みでエラーです" + +#: ../extensions/feed-panel/main.c:331 msgid "New feed" msgstr "新しいフィード" -#: ../extensions/feed-panel/main.c:459 +#: ../extensions/feed-panel/main.c:489 msgid "Feed Panel" msgstr "フィードパネル" -#: ../extensions/feed-panel/main.c:460 +#: ../extensions/feed-panel/main.c:490 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" @@ -1939,7 +2096,8 @@ msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "ページホルダ" @@ -1947,14 +2105,24 @@ msgstr "ページホルダ" msgid "_Pageholder" msgstr "ページホルダ(_P)" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "ステータスバー機能" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "ウェブページへの機能のオン/オフを簡単に切り換えます" + +#~ msgid "Add to customize _homepage" +#~ msgstr "カスタムホームページに追加(_H)" +#~ msgid "Add to customized _homepage" +#~ msgstr "カスタムホームページに追加(_H)" #~ msgid "P_lugins" #~ msgstr "プラグイン(_L)" - #~ msgid "Plugins" #~ msgstr "プラグイン" - #~ msgid "Images" #~ msgstr "画像" - #~ msgid "Scripts" #~ msgstr "スクリプト" + From 0e9803a31c2028d6f1445416a1801e613b5026d2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 12 May 2009 02:30:00 +0200 Subject: [PATCH 1157/2970] Point out that translators should adjust the spell check example --- midori/midori-preferences.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c15522e4..b3f22e43 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -522,6 +522,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing")); INDENTED_ADD (button, 0, 1, 0, 1); entry = katze_property_proxy (settings, "spell-checking-languages", NULL); + /* i18n: The example should be adjusted to contain a good local default */ gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"")); FILLED_ADD (entry, 1, 2, 0, 1); #endif From 760553f374bd21a7d858332de9c6b757c739ed12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Wed, 13 May 2009 23:56:55 +0200 Subject: [PATCH 1158/2970] Store speed dial as JSON instead of actual HTML source This will make it possible to change the layout of the page without losing shortcuts. --- data/mootools.js | 112 ++++++++++++++++++++++++++------- data/speeddial-body.html | 65 ------------------- data/speeddial-head.html | 131 +++++++++++++++++++++++++++++++++------ data/speeddial.json | 1 + midori/midori-browser.c | 92 ++++++++++++++------------- midori/midori-view.c | 39 ++++++------ wscript | 2 +- 7 files changed, 270 insertions(+), 172 deletions(-) delete mode 100644 data/speeddial-body.html create mode 100644 data/speeddial.json diff --git a/data/mootools.js b/data/mootools.js index 19f9ba1b..f60d1562 100644 --- a/data/mootools.js +++ b/data/mootools.js @@ -1,3 +1,5 @@ +//MooTools, , My Object Oriented (JavaScript) Tools. Copyright (c) 2006-2009 Valerio Proietti, , MIT Style License. + var MooTools={version:"1.2.2",build:"f0491d62fbb7e906789aa3733d6a67d43e5af7c9"};var Native=function(k){k=k||{};var a=k.name;var i=k.legacy;var b=k.protect; var c=k.implement;var h=k.generics;var f=k.initialize;var g=k.afterImplement||function(){};var d=f||i;h=h!==false;d.constructor=Native;d.$family={name:"native"}; if(i&&f){d.prototype=i.prototype;}d.prototype.constructor=d;if(a){var e=a.toLowerCase();d.prototype.$family={name:e};Native.typize(d,e);}var j=function(n,l,o,m){if(!b||m||!n.prototype[l]){n.prototype[l]=o; @@ -86,7 +88,27 @@ break;case"mouseout":l=a.relatedTarget||a.toElement;}if(!(function(){while(l&&l. }}}}return $extend(this,{event:a,type:j,page:i,client:c,rightClick:e,wheel:h,relatedTarget:l,target:g,code:b,key:m,shift:a.shiftKey,control:a.ctrlKey,alt:a.altKey,meta:a.metaKey}); }});Event.Keys=new Hash({enter:13,up:38,down:40,left:37,right:39,esc:27,space:32,backspace:8,tab:9,"delete":46});Event.implement({stop:function(){return this.stopPropagation().preventDefault(); },stopPropagation:function(){if(this.event.stopPropagation){this.event.stopPropagation();}else{this.event.cancelBubble=true;}return this;},preventDefault:function(){if(this.event.preventDefault){this.event.preventDefault(); -}else{this.event.returnValue=false;}return this;}});var Element=new Native({name:"Element",legacy:window.Element,initialize:function(a,b){var c=Element.Constructors.get(a); +}else{this.event.returnValue=false;}return this;}});function Class(b){if(b instanceof Function){b={initialize:b};}var a=function(){Object.reset(this);if(a._prototyping){return this; +}this._current=$empty;var c=(this.initialize)?this.initialize.apply(this,arguments):this;delete this._current;delete this.caller;return c;}.extend(this); +a.implement(b);a.constructor=Class;a.prototype.constructor=a;return a;}Function.prototype.protect=function(){this._protected=true;return this;};Object.reset=function(a,c){if(c==null){for(var e in a){Object.reset(a,e); +}return a;}delete a[c];switch($type(a[c])){case"object":var d=function(){};d.prototype=a[c];var b=new d;a[c]=Object.reset(b);break;case"array":a[c]=$unlink(a[c]); +break;}return a;};new Native({name:"Class",initialize:Class}).extend({instantiate:function(b){b._prototyping=true;var a=new b;delete b._prototyping;return a; +},wrap:function(a,b,c){if(c._origin){c=c._origin;}return function(){if(c._protected&&this._current==null){throw new Error('The method "'+b+'" cannot be called.'); +}var e=this.caller,f=this._current;this.caller=f;this._current=arguments.callee;var d=c.apply(this,arguments);this._current=f;this.caller=e;return d;}.extend({_owner:a,_origin:c,_name:b}); +}});Class.implement({implement:function(a,d){if($type(a)=="object"){for(var e in a){this.implement(e,a[e]);}return this;}var f=Class.Mutators[a];if(f){d=f.call(this,d); +if(d==null){return this;}}var c=this.prototype;switch($type(d)){case"function":if(d._hidden){return this;}c[a]=Class.wrap(this,a,d);break;case"object":var b=c[a]; +if($type(b)=="object"){$mixin(b,d);}else{c[a]=$unlink(d);}break;case"array":c[a]=$unlink(d);break;default:c[a]=d;}return this;}});Class.Mutators={Extends:function(a){this.parent=a; +this.prototype=Class.instantiate(a);this.implement("parent",function(){var b=this.caller._name,c=this.caller._owner.parent.prototype[b];if(!c){throw new Error('The method "'+b+'" has no parent.'); +}return c.apply(this,arguments);}.protect());},Implements:function(a){$splat(a).each(function(b){if(b instanceof Function){b=Class.instantiate(b);}this.implement(b); +},this);}};var Chain=new Class({$chain:[],chain:function(){this.$chain.extend(Array.flatten(arguments));return this;},callChain:function(){return(this.$chain.length)?this.$chain.shift().apply(this,arguments):false; +},clearChain:function(){this.$chain.empty();return this;}});var Events=new Class({$events:{},addEvent:function(c,b,a){c=Events.removeOn(c);if(b!=$empty){this.$events[c]=this.$events[c]||[]; +this.$events[c].include(b);if(a){b.internal=true;}}return this;},addEvents:function(a){for(var b in a){this.addEvent(b,a[b]);}return this;},fireEvent:function(c,b,a){c=Events.removeOn(c); +if(!this.$events||!this.$events[c]){return this;}this.$events[c].each(function(d){d.create({bind:this,delay:a,"arguments":b})();},this);return this;},removeEvent:function(b,a){b=Events.removeOn(b); +if(!this.$events[b]){return this;}if(!a.internal){this.$events[b].erase(a);}return this;},removeEvents:function(c){var d;if($type(c)=="object"){for(d in c){this.removeEvent(d,c[d]); +}return this;}if(c){c=Events.removeOn(c);}for(d in this.$events){if(c&&c!=d){continue;}var b=this.$events[d];for(var a=b.length;a--;a){this.removeEvent(d,b[a]); +}}return this;}});Events.removeOn=function(a){return a.replace(/^on([A-Z])/,function(b,c){return c.toLowerCase();});};var Options=new Class({setOptions:function(){this.options=$merge.run([this.options].extend(arguments)); +if(!this.addEvent){return this;}for(var a in this.options){if($type(this.options[a])!="function"||!(/^on[A-Z]/).test(a)){continue;}this.addEvent(a,this.options[a]); +delete this.options[a];}return this;}});var Element=new Native({name:"Element",legacy:window.Element,initialize:function(a,b){var c=Element.Constructors.get(a); if(c){return c(b);}if(typeof a=="string"){return document.newElement(a,b);}return $(a).set(b);},afterImplement:function(a,b){Element.Prototype[a]=b;if(Array[a]){return; }Elements.implement(a,function(){var c=[],g=true;for(var e=0,d=this.length;e1),cash:!g});}});Element.implement({match:function(b){if(!b||(b==this)){return true;}var d=Selectors.Utils.parseTagAndID(b); var a=d[0],e=d[1];if(!Selectors.Filters.byID(this,e)||!Selectors.Filters.byTag(this,a)){return false;}var c=Selectors.Utils.parseSelector(b);return(c)?Selectors.Utils.filter(this,c,{}):true; @@ -242,4 +245,69 @@ while((b=b.previousSibling)){if(b.nodeType!=1){continue;}f++;var a=e.positions[$ },encode:function(b){switch($type(b)){case"string":return'"'+b.replace(/[\x00-\x1f\\"]/g,JSON.$replaceChars)+'"';case"array":return"["+String(b.map(JSON.encode).filter($defined))+"]"; case"object":case"hash":var a=[];Hash.each(b,function(e,d){var c=JSON.encode(e);if(c){a.push(JSON.encode(d)+":"+c);}});return"{"+a+"}";case"number":case"boolean":return String(b); case false:return"null";}return null;},decode:function(string,secure){if($type(string)!="string"||!string.length){return null;}if(secure&&!(/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(string.replace(/\\./g,"@").replace(/"[^"\\\n\r]*"/g,""))){return null; -}return eval("("+string+")");}});Native.implement([Hash,Array,String,Number],{toJSON:function(){return JSON.encode(this);}}); +}return eval("("+string+")");}});Native.implement([Hash,Array,String,Number],{toJSON:function(){return JSON.encode(this);}});var Cookie=new Class({Implements:Options,options:{path:false,domain:false,duration:false,secure:false,document:document},initialize:function(b,a){this.key=b; +this.setOptions(a);},write:function(b){b=encodeURIComponent(b);if(this.options.domain){b+="; domain="+this.options.domain;}if(this.options.path){b+="; path="+this.options.path; +}if(this.options.duration){var a=new Date();a.setTime(a.getTime()+this.options.duration*24*60*60*1000);b+="; expires="+a.toGMTString();}if(this.options.secure){b+="; secure"; +}this.options.document.cookie=this.key+"="+b;return this;},read:function(){var a=this.options.document.cookie.match("(?:^|;)\\s*"+this.key.escapeRegExp()+"=([^;]*)"); +return(a)?decodeURIComponent(a[1]):null;},dispose:function(){new Cookie(this.key,$merge(this.options,{duration:-1})).write("");return this;}});Cookie.write=function(b,c,a){return new Cookie(b,a).write(c); +};Cookie.read=function(a){return new Cookie(a).read();};Cookie.dispose=function(b,a){return new Cookie(b,a).dispose();};var Fx=new Class({Implements:[Chain,Events,Options],options:{fps:50,unit:false,duration:500,link:"ignore"},initialize:function(a){this.subject=this.subject||this; +this.setOptions(a);this.options.duration=Fx.Durations[this.options.duration]||this.options.duration.toInt();var b=this.options.wait;if(b===false){this.options.link="cancel"; +}},getTransition:function(){return function(a){return -(Math.cos(Math.PI*a)-1)/2;};},step:function(){var a=$time();if(a=(7-4*d)/11){e=c*c-Math.pow((11-6*d-11*f)/4,2); +break;}}return e;},Elastic:function(b,a){return Math.pow(2,10*--b)*Math.cos(20*b*Math.PI*(a[0]||1)/3);}});["Quad","Cubic","Quart","Quint"].each(function(b,a){Fx.Transitions[b]=new Fx.Transition(function(c){return Math.pow(c,[a+2]); +});});var Request=new Class({Implements:[Chain,Events,Options],options:{url:"",data:"",headers:{"X-Requested-With":"XMLHttpRequest",Accept:"text/javascript, text/html, application/xml, text/xml, */*"},async:true,format:false,method:"post",link:"ignore",isSuccess:null,emulation:true,urlEncoded:true,encoding:"utf-8",evalScripts:false,evalResponse:false,noCache:false},initialize:function(a){this.xhr=new Browser.Request(); +this.setOptions(a);this.options.isSuccess=this.options.isSuccess||this.isSuccess;this.headers=new Hash(this.options.headers);},onStateChange:function(){if(this.xhr.readyState!=4||!this.running){return; +}this.running=false;this.status=0;$try(function(){this.status=this.xhr.status;}.bind(this));if(this.options.isSuccess.call(this,this.status)){this.response={text:this.xhr.responseText,xml:this.xhr.responseXML}; +this.success(this.response.text,this.response.xml);}else{this.response={text:null,xml:null};this.failure();}this.xhr.onreadystatechange=$empty;},isSuccess:function(){return((this.status>=200)&&(this.status<300)); +},processScripts:function(a){if(this.options.evalResponse||(/(ecma|java)script/).test(this.getHeader("Content-type"))){return $exec(a);}return a.stripScripts(this.options.evalScripts); +},success:function(b,a){this.onSuccess(this.processScripts(b),a);},onSuccess:function(){this.fireEvent("complete",arguments).fireEvent("success",arguments).callChain(); +},failure:function(){this.onFailure();},onFailure:function(){this.fireEvent("complete").fireEvent("failure",this.xhr);},setHeader:function(a,b){this.headers.set(a,b); +return this;},getHeader:function(a){return $try(function(){return this.xhr.getResponseHeader(a);}.bind(this));},check:function(){if(!this.running){return true; +}switch(this.options.link){case"cancel":this.cancel();return true;case"chain":this.chain(this.caller.bind(this,arguments));return false;}return false;},send:function(j){if(!this.check(j)){return this; +}this.running=true;var h=$type(j);if(h=="string"||h=="element"){j={data:j};}var d=this.options;j=$extend({data:d.data,url:d.url,method:d.method},j);var f=j.data,b=j.url,a=j.method; +switch($type(f)){case"element":f=$(f).toQueryString();break;case"object":case"hash":f=Hash.toQueryString(f);}if(this.options.format){var i="format="+this.options.format; +f=(f)?i+"&"+f:i;}if(this.options.emulation&&["put","delete"].contains(a)){var g="_method="+a;f=(f)?g+"&"+f:g;a="post";}if(this.options.urlEncoded&&a=="post"){var c=(this.options.encoding)?"; charset="+this.options.encoding:""; +this.headers.set("Content-type","application/x-www-form-urlencoded"+c);}if(this.options.noCache){var e="noCache="+new Date().getTime();f=(f)?e+"&"+f:e; +}if(f&&a=="get"){b=b+(b.contains("?")?"&":"?")+f;f=null;}this.xhr.open(a.toUpperCase(),b,this.options.async);this.xhr.onreadystatechange=this.onStateChange.bind(this); +this.headers.each(function(l,k){try{this.xhr.setRequestHeader(k,l);}catch(m){this.fireEvent("exception",[k,l]);}},this);this.fireEvent("request");this.xhr.send(f); +if(!this.options.async){this.onStateChange();}return this;},cancel:function(){if(!this.running){return this;}this.running=false;this.xhr.abort();this.xhr.onreadystatechange=$empty; +this.xhr=new Browser.Request();this.fireEvent("cancel");return this;}});(function(){var a={};["get","post","put","delete","GET","POST","PUT","DELETE"].each(function(b){a[b]=function(){var c=Array.link(arguments,{url:String.type,data:$defined}); +return this.send($extend(c,{method:b.toLowerCase()}));};});Request.implement(a);})(); \ No newline at end of file diff --git a/data/speeddial-body.html b/data/speeddial-body.html deleted file mode 100644 index d0b3852b..00000000 --- a/data/speeddial-body.html +++ /dev/null @@ -1,65 +0,0 @@ - -
-
- -

1

- -

-
-
- -

2

- -

-
-
- -

3

- -

-
-
- -

4

- -

-
-
- -

5

- -

-
-
- -

6

- -

-
-
- -

7

- -

-
-
- -

8

- -

-
-
- -

9

- -

-
-
-
- - - diff --git a/data/speeddial-head.html b/data/speeddial-head.html index a2811f3a..48ee2aff 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -11,6 +11,12 @@ @@ -255,4 +341,9 @@ onblur="javascript:if(this.value=='') this.value='{search_title}';" /> +
+
+ + + diff --git a/data/speeddial.json b/data/speeddial.json new file mode 100644 index 00000000..0bb63f32 --- /dev/null +++ b/data/speeddial.json @@ -0,0 +1 @@ +'{"shortcuts": [ { "id": "s1", "href": "#", "title": "", "img": "" }, { "id": "s2", "href": "#", "title": "", "img": "" }, { "id": "s3", "href": "#", "title": "", "img": "" }, { "id": "s4", "href": "#", "title": "", "img": "" }, { "id": "s5", "href": "#", "title": "", "img": "" }, { "id": "s6", "href": "#", "title": "", "img": "" }, { "id": "s7", "href": "#", "title": "", "img": "" }, { "id": "s8", "href": "#", "title": "", "img": "" }, { "id": "s9", "href": "#", "title": "", "img": "" } ] }' diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 29d018b9..34c5aef9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -874,33 +874,45 @@ midori_view_save_as_cb (GtkWidget* menuitem, static gchar* midori_browser_speed_dial_get_next_free_slot (void) { + GRegex* regex; + GMatchInfo* match_info; gchar* speed_dial_body; gchar* body_fname; gchar* slot_id = NULL; - gchar* p = NULL; body_fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial-body.html", NULL); + "speeddial.json", NULL); + if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { - g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", - &speed_dial_body, NULL, NULL); - g_file_set_contents (body_fname, speed_dial_body, -1, NULL); + if (g_file_get_contents (DATADIR "/midori/res/speeddial.json", + &speed_dial_body, NULL, NULL)) + { + g_file_set_contents (body_fname, speed_dial_body, -1, NULL); + + g_free (speed_dial_body); + } + g_free (body_fname); + return g_strdup ("s1"); } else g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); - p = g_strstr_len (speed_dial_body, -1, "

"); + regex = g_regex_new ("\"id\":[ \t]*\"(s[0-9])\"[ \t]*,[ \t]*\"href\":\"#\"", + G_REGEX_MULTILINE, 0, NULL); - if (p != NULL) + if (g_regex_match (regex, speed_dial_body, 0, &match_info)) { - p = g_strndup ((p+4), 1); - slot_id = g_strdup_printf ("s%s", p); - g_free (p); + slot_id = g_match_info_fetch (match_info, 1); + g_match_info_free (match_info); } + if (!g_strcmp0 (slot_id, "")) + g_free (slot_id); + g_free (body_fname); g_free (speed_dial_body); + g_free (regex); return slot_id; } @@ -954,45 +966,37 @@ midori_browser_add_speed_dial (MidoriBrowser* browser) gsize sz; body_fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial-body.html", NULL); + "speeddial.json", NULL); - g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); + if (g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL)) + { + img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); + encoded = g_base64_encode ((guchar *)file_content, sz); - img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); - gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); - encoded = g_base64_encode ((guchar *)file_content, sz); + replace_from = g_strdup_printf ( + "\\{[ \t]*\"id\"[ \t]*:[ \t]*\"%s\"[ \t]*,[ \t]*\"href\"[ \t]*"\ + "[ \t]*:[ \t]*\"#\"[ \t]*,[ \t]*\"title\"[ \t]*:[ \t]*\"\"[ \t]*,"\ + "\"img\"[ \t]*:[ \t]*\"\"[ \t]*\\}", slot_id); + replace_by = g_strdup_printf ( + "{\"id\":\"%s\",\"href\":\"%s\",\"title\":\"%s\",\"img\":\"%s\"}", + slot_id, uri, title, encoded); - replace_from = g_strdup_printf ( - "
[ \r\n\t]*"\ - "[ \r\n\t]*

"\ - "%s

.+

[ \r\n\t]*[ \r\n\t]*

[ ]*

[ \r\t\n]*
", - slot_id, slot_id, (slot_id+1)); + regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); + replace = g_regex_replace (regex, speed_dial_body, -1, + 1, replace_by, 0, NULL); + g_file_set_contents (body_fname, replace, -1, NULL); - replace_by = g_strdup_printf ( - "
"\ - "
x

%s

", - slot_id, slot_id, uri, slot_id, encoded, slot_id, title); - - regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); - replace = g_regex_replace (regex, speed_dial_body, -1, - 1, replace_by, 0, NULL); - - g_file_set_contents (body_fname, replace, -1, NULL); - - g_object_unref (img); - g_regex_unref (regex); - g_free (encoded); - g_free (file_content); + g_object_unref (img); + g_regex_unref (regex); + g_free (encoded); + g_free (file_content); + g_free (speed_dial_body); + g_free (replace_from); + g_free (replace_by); + g_free (replace); + } g_free (body_fname); - g_free (speed_dial_body); - g_free (replace_by); - g_free (replace_from); - g_free (replace); } g_free (thumb); diff --git a/midori/midori-view.c b/midori/midori-view.c index 744a4578..f60880f6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -185,7 +185,9 @@ midori_view_speed_dial_get_thumb (GtkWidget* web_view, MidoriView* view); static void -midori_view_speed_dial_save (GtkWidget* web_view); +midori_view_speed_dial_save (GtkWidget* web_view, + const gchar* message); + static void midori_view_class_init (MidoriViewClass* class) @@ -1470,7 +1472,7 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, if (!strncmp (message, "speed_dial-get-thumbnail", 22)) midori_view_speed_dial_get_thumb (web_view, message, view); else if (!strncmp (message, "speed_dial-save", 13)) - midori_view_speed_dial_save (web_view); + midori_view_speed_dial_save (web_view, message); else g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); return TRUE; @@ -1980,7 +1982,6 @@ midori_view_set_uri (MidoriView* view, gchar* res_root; gchar* speed_dial_head; gchar* speed_dial_body; - gchar* speed_dial_html; gchar* body_fname; gchar* location_entry_search; gchar* stock_root; @@ -1995,25 +1996,27 @@ midori_view_set_uri (MidoriView* view, res_root = g_strdup_printf ("http://localhost:%d/res", port); stock_root = g_strdup_printf ("http://localhost:%d/stock", port); body_fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial-body.html", NULL); + "speeddial.json", NULL); if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { - g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", - &speed_dial_body, NULL, NULL ); - g_file_set_contents (body_fname, speed_dial_body, -1, NULL ); + if (g_file_get_contents (DATADIR "/midori/res/speeddial.json", + &speed_dial_body, NULL, NULL)) + g_file_set_contents (body_fname, speed_dial_body, -1, NULL); + else + speed_dial_body = g_strdup (""); } else g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); - speed_dial_html = g_strconcat (speed_dial_head, speed_dial_body, NULL); g_object_get (view->settings, "location-entry-search", &location_entry_search, NULL); - data = sokoke_replace_variables (speed_dial_html, + data = sokoke_replace_variables (speed_dial_head, "{res}", res_root, "{stock}", stock_root, + "{json_data}", speed_dial_body, "{title}", _("Blank page"), "{search_uri}", location_entry_search, "{search_title}", _("Search"), @@ -2036,7 +2039,6 @@ midori_view_set_uri (MidoriView* view, g_free (res_root); g_free (stock_root); g_free (data); - g_free (speed_dial_html); g_free (speed_dial_head); g_free (speed_dial_body); g_free (body_fname); @@ -2956,7 +2958,7 @@ midori_view_speed_dial_inject_thumb (MidoriView* view, return; img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); - gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, "compression", "7", NULL); encoded = g_base64_encode ( (guchar *)file_content, sz ); /* Call Javascript function to replace shortcut's content */ @@ -2965,8 +2967,6 @@ midori_view_speed_dial_inject_thumb (MidoriView* view, free (js); g_object_unref (img); - midori_view_speed_dial_save (view->web_view); - g_free (url); g_free (dom_id); g_free (encoded); @@ -3018,14 +3018,13 @@ midori_view_speed_dial_get_thumb (GtkWidget* web_view, * **/ static void -midori_view_speed_dial_save (GtkWidget* web_view) +midori_view_speed_dial_save (GtkWidget* web_view, + const gchar* message) { - JSContextRef js_context = webkit_web_frame_get_global_context ( - webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))); - gchar* newdom = sokoke_js_script_eval (js_context,"getSpeeddialContent()", NULL); + gchar* json = g_strdup (message + 15); gchar* fname = g_build_filename (sokoke_set_config_dir (NULL), - "speeddial-body.html", NULL); - g_file_set_contents (fname, newdom, -1, NULL); + "speeddial.json", NULL); + g_file_set_contents (fname, json, -1, NULL); g_free (fname); - g_free (newdom); + g_free (json); } diff --git a/wscript b/wscript index 4fcb61c9..bdca1030 100644 --- a/wscript +++ b/wscript @@ -340,7 +340,7 @@ def build (bld): Utils.pprint ('BLUE', "logo-shade could not be rasterized.") bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/error.html') bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html') - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial-body.html') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial.json') bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/mootools.js') if Options.commands['check']: From d29ebbb45c8e583e62b3289075429d0e57e48839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Thu, 14 May 2009 00:15:12 +0200 Subject: [PATCH 1159/2970] Update Czech translation --- po/cs.po | 679 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 362 insertions(+), 317 deletions(-) diff --git a/po/cs.po b/po/cs.po index 9b781a42..98cb7152 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-04 09:03+0200\n" -"PO-Revision-Date: 2009-05-04 09:23+0200\n" +"POT-Creation-Date: 2009-05-10 21:30+0200\n" +"PO-Revision-Date: 2009-05-10 21:53+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1445 -#: ../midori/main.c:1453 ../midori/main.c:1464 -#: ../midori/midori-websettings.c:275 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 +#: ../midori/main.c:1457 ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -130,93 +130,93 @@ msgstr "Nebyl zadán název souboru" msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1369 +#: ../midori/main.c:1370 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímek uložen do %s\n" -#: ../midori/main.c:1389 +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "Spustit ADDRESS jako webovou aplikaci" -#: ../midori/main.c:1389 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1391 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "Použít FOLDER jako místo pro uložení konfigurace" -#: ../midori/main.c:1391 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1393 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1395 +#: ../midori/main.c:1398 msgid "Take a snapshot of the specified URI" msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1397 +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1399 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1442 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1465 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1467 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Zjistit nové verze v:" -#: ../midori/main.c:1543 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1578 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1628 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1640 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1655 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1668 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1681 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1693 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1709 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Ignorovat" @@ -233,550 +233,558 @@ msgstr "Nesprávný formát dokumentu." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3522 -#: ../midori/midori-browser.c:3528 +#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3525 +#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:354 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:379 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:630 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:803 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:1119 #, c-format msgid "The file %s has been downloaded." msgstr "Soubor %s byl stažen." -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:1123 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../midori/midori-browser.c:1658 +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2961 ../panels/midori-bookmarks.c:778 +#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:2968 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 +#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 +#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:3156 ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3452 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:3165 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:3456 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:3468 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:3470 +#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Přidat do rychlého _přístupu" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Kliknutím přidáte záložku" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:3471 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:3473 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:3474 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:3480 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:3485 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:3488 ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:3500 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:3506 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:3508 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "Okamžitě přeskočit na slovo nebo frázi" -#: ../midori/midori-browser.c:3516 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:3518 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "_Pohled" -#: ../midori/midori-browser.c:3519 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:3531 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:3537 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:3540 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:3543 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" -#: ../midori/midori-browser.c:3546 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:3549 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:3552 ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3555 ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:3558 ../midori/midori-websettings.c:207 -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:3561 ../midori/midori-view.c:1213 +#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 msgid "View _Source" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:3562 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:3564 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "Zobrazit zdrojový kód výběru" -#: ../midori/midori-browser.c:3565 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "Zobrazit zdrojový kód vybraného textu" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:3571 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "_Jít" -#: ../midori/midori-browser.c:3574 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "Jít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:3577 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "Jít vpřed (na následující stránku)" -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "Jít na domovskou stránku" -#: ../midori/midori-browser.c:3582 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:3583 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:3585 ../midori/midori-view.c:1185 +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "Vrátit zavření karty" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:3590 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3592 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Přidat složku" -#: ../midori/midori-browser.c:3593 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:3594 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:3596 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:3597 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:3600 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:3601 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:3605 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:3606 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:3608 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:3613 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:3614 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:3616 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:3617 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:3619 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:3620 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:3623 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:3630 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:3631 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:3636 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "_Menu" -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "Zobrazit menu" -#: ../midori/midori-browser.c:3640 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:3641 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:3645 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:3648 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:3649 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:3652 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:3653 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:3657 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:4088 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:4097 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:4121 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:4142 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:4155 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:4157 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:4170 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:4172 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:4187 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4356 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:4381 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:4386 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:4391 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:4399 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:4409 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:4444 ../extensions/cookie-manager.c:821 +#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "Smazat vše" -#: ../midori/midori-browser.c:4837 +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -789,11 +797,11 @@ msgstr "Oddělit vybraný panel od okna" msgid "Whether to detach the chosen panel from the window" msgstr "Z panelu vytvořit samostatné okno" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "Přesunout boční panel na opačnou stranu" @@ -801,561 +809,594 @@ msgstr "Přesunout boční panel na opačnou stranu" msgid "Close panel" msgstr "Zavřít panel" -#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2032 +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Naposledy otevřené stránky" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Nová karta" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Nové okno" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Aktuální karta" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "Výchozí" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Obojí" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Obojí vedle sebe" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Všechna cookies" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "Cookies sezení" -#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 msgid "None" msgstr "Žádné" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Ukládat rozměry okna?" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Šířka okna" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Výška okna" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "Uložená poslední pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Poslední otevřená stránka" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "Uložená stránka" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "Rychlé hledání na webu" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "Uložené poslední vyhledávání na webu" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Zobrazit menu" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Zobrazit menu?" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Zobrazit vyhledávání" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Zobrazit lištu vyhledávání?" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Zobrazit lištu se záložkami?" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Zobrazit panel?" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "Zobrazit stav přenosu" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "Zobrazit stav přenosu?" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Zobrazit stavový řádek?" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Styl lišty" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Nastaví styl lišty (zobrazení textu a ikon)." -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "Zobrazit průběh v řádku adresy" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "Zobrazovat průběh načítání v řádku s adresou?" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "Zobrazovat výsledky hledání při zadávání adresy" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Položky nástrojové lišty" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Položky, které se budou zobrazovat na nástrojové liště" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Kompaktní boční panel" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Má se zobrazit boční panel kompaktně?" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Načíst při startu" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Co načíst při startu" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu Midori" -#: ../midori/midori-websettings.c:578 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Zobrazit obsah rychlého přístupu v kartách" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "Složka pro ukládání" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "Kam se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:617 msgid "Ask for the destination folder" msgstr "Zeptat se na cílovou složku" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:618 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Zda se ptát, kam se bude ukládat" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:637 msgid "Notify when a transfer has been completed" msgstr "Upozornit na dokončení přenosu" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:638 msgid "Whether to show a notification when a transfer has been completed" msgstr "Zda zobrazit upozornění při dokončení přenosu" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "Správce stahování" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "Externí program pro stahování" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "Preferované kódování" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "Preferované kódování stránek" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "Vždy zobrazovat karty" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "Zobrazit karty, i když je jen jedna?" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "Otevírat nové stránky v" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "Otevírat externí stránky v" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "Kde se budou otevírat externí stránky" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "Karty se otevírají na pozadí" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta se otevře vedle aktivní" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovací okno se otevře v nové kartě" -#: ../midori/midori-websettings.c:771 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "Při přibližování zvětšovat text i obrázky?" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:788 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "Při psaní hledat text?" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "Přijímat cookies" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "Který typ cookies přijímat" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "Původní" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "Z původní stránky" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "Maximální stáří cookies" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "Pamatovat si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "Pamatovat si naposledy navštívené stránky?" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "Maximální délka historie" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "" "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:844 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "Pamatovat si vložený text" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "Pamatovat si text vložený do vstupních polí?" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "Pamatovat si naposledy stahované soubory" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "Pamatovat si seznam souborů, které byly stahovány?" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "Nastavení proxy serveru pro HTTP spojení" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "Zjistit proxy server automaticky" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zjistit nastavení proxy serveru automaticky?" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "Jak se hlásit webovým stránkám" -#: ../midori/midori-websettings.c:914 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "Velikost keše" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "Povolená velikost keše" -#: ../midori/midori-view.c:648 +#: ../midori/midori-view.c:686 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Ikona '%s' nemůže být načtena." -#: ../midori/midori-view.c:650 ../extensions/feed-panel/main.c:112 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Chyba" -#: ../midori/midori-view.c:653 +#: ../midori/midori-view.c:691 msgid "Try again" msgstr "Zkusit znovu" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:680 ../midori/midori-view.c:2556 +#: ../midori/midori-view.c:721 ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "Nenalezeno - %s" -#: ../midori/midori-view.c:1047 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "Otevřít _odkaz" -#: ../midori/midori-view.c:1049 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:1066 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:1075 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "_Stáhnout umístění" -#: ../midori/midori-view.c:1081 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "_Uložit umístění" -#: ../midori/midori-view.c:1090 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "Stáhnout za použití Download _manageru" -#: ../midori/midori-view.c:1119 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "Hledat _s" -#: ../midori/midori-view.c:1147 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:1157 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:1309 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:1326 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:1329 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1333 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:1742 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:1894 +#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Najít" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Záložku přidáte kliknutím" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Vložte adresu záložky" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Vložte název záložky" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Opravdu chcete smazat tuto záložku?" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:1911 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" @@ -1366,19 +1407,19 @@ msgid "Preferences for %s" msgstr "Nastavení pro %s" #. Page "General" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Obecné" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Při spuštění" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" -#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Přenosy" @@ -1722,10 +1763,14 @@ msgid "Clear the entire history" msgstr "Smazat celou historii" #: ../panels/midori-history.c:599 -#, c-format msgid "A week ago" msgstr "Před týdnem" +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "Před %d dny" + #: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" @@ -1898,48 +1943,48 @@ msgstr "Správce _cookies" msgid "List, view and delete cookies" msgstr "Seznam, detaily a mazání cookies" -#: ../extensions/feed-panel/feed-atom.c:217 +#: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech." -#: ../extensions/feed-panel/feed-atom.c:323 +#: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"feed\" v XML datech." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Poslední aktualizace: %s." -#: ../extensions/feed-panel/feed-panel.c:660 +#: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" msgstr "Přidat nový kanál" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" msgstr "Smazat kanál" -#: ../extensions/feed-panel/feed-panel.c:803 +#: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" msgstr "_Kanály" -#: ../extensions/feed-panel/feed-parse.c:139 +#: ../extensions/feed-panel/feed-parse.c:175 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Chyba při hledání kořenového elementu v XML datech." -#: ../extensions/feed-panel/feed-parse.c:179 +#: ../extensions/feed-panel/feed-parse.c:215 #, c-format msgid "Unsupported feed format." msgstr "Nepodporovaný formát kanálu." -#: ../extensions/feed-panel/feed-parse.c:209 +#: ../extensions/feed-panel/feed-parse.c:245 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Nepodařilo se načíst XML kanál: %s" From 3e94be31c431d7088eed2b6889713d3c7174d7a0 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Thu, 14 May 2009 00:21:01 +0200 Subject: [PATCH 1160/2970] Update Danish translation --- po/da.po | 1112 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 645 insertions(+), 467 deletions(-) diff --git a/po/da.po b/po/da.po index 07421041..add74e6b 100644 --- a/po/da.po +++ b/po/da.po @@ -5,26 +5,26 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.5\n" +"Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-22 22:19+0100\n" -"PO-Revision-Date: 2009-03-28 21:59+0100\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-05-02 14:35+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Letvægts-webbrowser" +msgstr "Letvægtig webbrowser" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1580 -#: ../midori/main.c:1672 -#: ../midori/main.c:1681 -#: ../midori/main.c:1692 -#: ../midori/midori-websettings.c:269 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -32,276 +32,325 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:165 -#: ../midori/main.c:235 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "Fil blev ikke fundet." - -#: ../midori/main.c:485 -#: ../midori/main.c:494 -msgid "Malformed document." -msgstr "Misdannet dokument." - -#: ../midori/main.c:516 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kunne ikke rydde historikken: %s\n" -#: ../midori/main.c:649 -#: ../midori/main.c:683 -#: ../midori/main.c:699 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:936 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" -#: ../midori/main.c:1066 -#: ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "Skrivning fejlede." - -#: ../midori/main.c:1087 -#: ../midori/main.c:1114 -#: ../midori/main.c:1142 +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 -#: ../midori/main.c:1190 +#: ../midori/main.c:850 +#: ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:1261 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:1377 +#: ../midori/main.c:1073 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:1392 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:1396 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:1401 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1580 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1603 -#: ../midori/gjs.c:515 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1626 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Kør ADRESSE som et webprogram" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "ADRESSE" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Brug MAPPE som en indstillingsmappe" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "MAPPE" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1628 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1630 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1669 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1693 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1695 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1722 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "Den angivne indstillingsmappe er ikke gyldig." + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1772 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1784 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1799 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1812 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1825 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1853 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "_Ignorér" -#: ../midori/midori-browser.c:278 -#: ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Fil blev ikke fundet." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Misdannet dokument." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Skrivning fejlede." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:289 -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:598 -#: ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:617 -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:641 -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2837 -#: ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:2844 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:2847 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Ryd private data" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Ryd private data" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Ryd de følgende data:" + +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historik" + #: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "'Flash' cookies" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Webstedikoner" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -309,934 +358,990 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:3228 -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "_Find hurtigt" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "Hop hurtigt til et ord eller sætning" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:3283 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3389 +#: ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" -#: ../midori/midori-browser.c:3286 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3392 +#: ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-browser.c:3289 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:3292 -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3295 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:3298 -#: ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:3301 -#: ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 msgid "View _Source" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "Vis kilde for markerede" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "Vis kildekode for markering" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "Gå til næste side" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:3325 -#: ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "Fortryd luk faneblad" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:3330 -#: ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Tilføj en ny mappe" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Tilføj en ny bogmærkemappe" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:3333 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Ryd private data" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Ryd private data..." + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:3903 -#: ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Frigør valgte panel fra vinduet" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Om det valgte panel skal frigøres fra vinduet" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-panel.c:241 -#: ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-websettings.c:179 -#: ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-websettings.c:180 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Hjemmeside" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Sidste åbne sider" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Begge" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Begge vandrette" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:258 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "Om overførselsstatus skal vises" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Værktøjsbjælkestil" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "Vis fremgang i placeringindgang" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "Om visning af indlæsningsfremgang i placeringsindgang" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Vis søgemaskiner i adresseudfyldelse" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "Indlæs ved opstart" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Hvad der skal indlæses under opstart" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Nedhentning-mappen" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Nyhedssamler" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "En ekstern nyhedssamler" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Åbn nye vinduer i" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Åbn eksterne sider i" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "Kun for originale cookies" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" -msgstr "Tillad kun cookies fra original web-side" +msgstr "Tillad kun cookies fra original websted" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Husk sidste besøgte sider" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "Om sidste besøgte sider skal gemmes" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Husk sidste formularindtastninger" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "Om sidste formularindtastninger skal gemmes" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "Genkend automatisk proxyserver" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Om proxyserveren genkendes automatisk fra miljøet" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Størrelse af mellemlager" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "Den tilladte størrelse af mellemlager" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "Åbn _henvisning" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:1016 -#: ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "_Hent henvisningsadressen" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Hent med nedhentnings_håndtering" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Søg _med" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "Filtype: '%s'" + +#: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" @@ -1265,259 +1370,246 @@ msgid "Transfers" msgstr "Overførsler" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Udseende" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Indstillinger for skrifttype" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Standard for skrifttypefamilie" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "Størrelse af standardskriftstype er brugt til at vise tekst" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "Minimum størrelse af skrifttype til at vise tekst" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "Tegnsæt" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "Tegnsæt som bruges standard" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Funktionalitet" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Formindsk billeder automatisk" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "Minimér enkeltstående billeder til at passe" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Justerbare tekstområder" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "Om tekstområder kan ændre størrelse" -#: ../midori/midori-preferences.c:514 -#: ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-preferences.c:518 -#: ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Slå udvidelsesmoduler til" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "Slå indlejrede udvidelsesobjekter til" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "Gennemtving 96 dots per tomme" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "Gennemtving tæthed af videopunkt på 96 DPI" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "Brug udvikler-værktøjer" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "Slå specielle udvidelser til udviklere til" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "Grænseflade" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "Navigeringsbjælke" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "Browsing" #. Page "Network" -#: ../midori/midori-preferences.c:579 -#: ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:591 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "Beskyttelse af privatliv" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "Web-cookies" -#: ../midori/midori-preferences.c:626 -#: ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:637 +#: ../midori/midori-preferences.c:647 msgid "days" msgstr "dage" -#: ../midori/midori-preferences.c:629 -#: ../panels/midori-history.c:104 -msgid "History" -msgstr "Historik" - -#: ../midori/midori-searchaction.c:455 +#: ../midori/midori-searchaction.c:484 #: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Tom" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Tilføj søgemaskine" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Redigér søgemaskine" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Navn:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Håndtér søgemaskiner" -#: ../midori/sokoke.c:109 -#: ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Brug som _standard" + +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Advarsel: Du bruger en superbruger-konto!" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "_Bogmærke" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "_Tilføj bogmærke" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "_Konsol" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "_Udvidelser" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "Hi_storik" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "_Hjemmeside" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "Brugerskri_pter" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "Bruger_grænseflader" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "Nyt _faneblad" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "_Overførsler" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "Udvidelses_moduler" + +#: ../midori/sokoke.c:792 msgid "_Closed Tabs and Windows" msgstr "_Lukkede faneblade og vinduer" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/gjs.c:743 -#: ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s har ingen egenskab '%s'" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s kan ikke blive tildelt til %s.%s" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s kan ikke tilgås" - #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 msgid "Userscripts" @@ -1528,43 +1620,39 @@ msgstr "Brugerskripter" msgid "Userstyles" msgstr "Brugerstile" -#: ../panels/midori-addons.c:922 +#: ../panels/midori-addons.c:927 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Slå til" -#: ../panels/midori-addons.c:923 +#: ../panels/midori-addons.c:928 #: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "Slå til" -#: ../panels/midori-addons.c:932 +#: ../panels/midori-addons.c:937 #: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Slå fra" -#: ../panels/midori-addons.c:933 +#: ../panels/midori-addons.c:938 #: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "Slå fra" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "Tilføj en ny mappe" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "Separator" @@ -1576,42 +1664,41 @@ msgstr "Konsol" msgid "Extensions" msgstr "Udvidelser" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "For en uge siden" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "For %d dage siden" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "I dag" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "I går" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "Udvidelsesmoduler" @@ -1654,59 +1741,150 @@ msgstr "Lagerikon '%s' kunne ikke indlæses" msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Vælg mappe" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" msgstr "Ton faneblade tydeligt" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" msgstr "Farvefulde faneblade" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "Ton hvert faneblad tydeligt" -#: ../extensions/mouse-gestures/main.c:176 +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Ved afslutningen af sessionen" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Vært: %s\n" +"Navn: %s\n" +"Værdi: %s\n" +"Sti: %s\n" +"Sikker: %s\n" +"Udløber: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Ja" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Nej" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "Er du sikker på, at du ønsker at fjerne alle cookies?" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "Spørgsmål" + +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "Kun de synlige cookies, som passer med den indtastede filterstreng, er slettet." + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "Navn" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "_Udfold alle" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "_Fold alle" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "Slet alle" + +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Slet alle viste cookies. Hvis filter er indstillet, vil kun de cookies, som passer til filteret, blive slettet." + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Udfold alle" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "Fold alle" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt passer til det indtastede filter" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Cookiehåndtering" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "_Cookiehåndtering" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "Vis, gennemse og slet cookies" + +#: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Musebevægelser" -#: ../extensions/mouse-gestures/main.c:177 +#: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "Styr Midori ved at flytte musen" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Sideholder" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "_Sideholder" -#: ../extensions/statusbar-features.c:40 -msgid "Images" -msgstr "Billeder" - -#: ../extensions/statusbar-features.c:47 -msgid "Scripts" -msgstr "Skripter" - +#~ msgid "%s has no property '%s'" +#~ msgstr "%s har ingen egenskab '%s'" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s kan ikke blive tildelt til %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s kan ikke tilgås" +#~ msgid "Images" +#~ msgstr "Billeder" +#~ msgid "Scripts" +#~ msgstr "Skripter" #~ msgid "Source" #~ msgstr "Kilde" - From 37ad813e4479650da665c82d402f49cf33a43c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Thu, 14 May 2009 00:26:33 +0200 Subject: [PATCH 1161/2970] Update French translation --- po/fr.po | 506 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 261 insertions(+), 245 deletions(-) diff --git a/po/fr.po b/po/fr.po index e0951992..5c50f153 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-08 17:46+0200\n" +"POT-Creation-Date: 2009-05-10 18:59+0200\n" "PO-Revision-Date: 2009-05-03 09:58+0100\n" "Last-Translator: Jérôme Guelfucci \n" "Language-Team: French \n" @@ -186,46 +186,46 @@ msgstr "" msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1549 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1584 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1634 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1646 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/main.c:1661 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1674 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1687 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1699 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:1715 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Ignorer" @@ -242,129 +242,129 @@ msgstr "Document mal formé." msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:3638 -#: ../midori/midori-browser.c:3644 +#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:293 ../midori/midori-browser.c:3641 +#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:355 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:380 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:599 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:599 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:601 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:601 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:631 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:644 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:663 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:804 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:1119 #, c-format msgid "The file %s has been downloaded." msgstr "Le fichier %s a été téléchargé." -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:1123 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../midori/midori-browser.c:1658 +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2983 ../panels/midori-bookmarks.c:778 +#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2990 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 +#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2993 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 +#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:3272 ../midori/midori-preferences.c:671 +#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3452 msgid "Cookies" msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:3361 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -372,425 +372,433 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:3572 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3575 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3578 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3581 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3584 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Ajouter à l'accueil personnalisé" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Ajouter un raccourci à la page d'accueil personnalisée" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3587 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3589 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3590 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3593 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3596 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3598 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3601 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3604 ../midori/midori-browser.c:3607 +#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3610 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3613 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3616 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3619 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3621 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3622 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:3625 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3628 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3629 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3632 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3634 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3647 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3650 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3653 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3654 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3659 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3662 ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3665 ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3668 ../midori/midori-websettings.c:207 +#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3671 ../midori/midori-websettings.c:208 +#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3674 ../midori/midori-websettings.c:209 +#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209 #: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3677 ../midori/midori-view.c:1234 +#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3678 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3680 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3681 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:3685 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3687 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3690 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:3693 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:3696 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:3698 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3701 ../midori/midori-view.c:1206 +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3702 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3706 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3708 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Ajouter un nouveau répertoire" -#: ../midori/midori-browser.c:3709 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:3710 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3712 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3713 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3717 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:3721 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3722 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3724 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3725 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3727 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3729 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3730 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:3732 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3733 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3735 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "_Signaler une anomalie" -#: ../midori/midori-browser.c:3736 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:3739 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:3746 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:3747 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3752 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3753 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3756 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3760 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3761 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3764 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:3765 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3768 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:3769 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3772 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3773 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:4207 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:4238 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:4261 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "Réouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "Réouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:4293 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:4295 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4522 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4527 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4535 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../midori/midori-browser.c:4545 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4580 ../extensions/cookie-manager.c:821 +#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "Supprimer tous" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" @@ -815,8 +823,8 @@ msgstr "Indique s'il faut aligner le panneau latéral sur la droite" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1952 -#: ../midori/midori-view.c:2127 +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "Page vierge" @@ -999,7 +1007,7 @@ msgstr "Indique s'il faut afficher la progression dans la barre d'adresse" #: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" -msgstr "Ajouter les moteurs de recherche à la complétion" +msgstr "Moteurs de recherche dans la complétion" #: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" @@ -1037,7 +1045,7 @@ msgstr "La page d'accueil" #: ../midori/midori-websettings.c:571 msgid "Show crash dialog" -msgstr "Afficher la fenêtre de fermeture inattendue" +msgstr "Fenêtre de fermeture inattendue" #: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" @@ -1046,11 +1054,11 @@ msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function #: ../midori/midori-websettings.c:588 msgid "Show speed dial in new tabs" -msgstr "Afficher le speed dial dans les nouveaux onglets" +msgstr "Accueil personnalisé dans les onglets" #: ../midori/midori-websettings.c:589 -msgid "Show a speed dial page in newly opened tabs" -msgstr "Afficher une page de démarrage personnalisée dans les nouveaux onglets" +msgid "Show speed dial in newly opened tabs" +msgstr "Afficher une page d'accueil personnalisée dans les nouveaux onglets" #: ../midori/midori-websettings.c:597 msgid "Download Folder" @@ -1144,11 +1152,11 @@ msgstr "Lieu où les nouvelles pages doivent être ouvertes" #: ../midori/midori-websettings.c:732 msgid "Open external pages in" -msgstr "Lieu où les pages externes doivent être ouvertes" +msgstr "Ouvrir les pages externes dans" #: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" -msgstr "Où ouvrir les pages externes" +msgstr "Lieu où les pages externes doivent être ouvertes" #: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" @@ -1198,7 +1206,7 @@ msgstr "Indique s'il faut agrandir le texte et les images" #: ../midori/midori-websettings.c:806 msgid "Find inline while typing" -msgstr "Chercher dans la page pendant la saisie" +msgstr "Chercher pendant la saisie" #: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" @@ -1307,114 +1315,117 @@ msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" # pas très content -#: ../midori/midori-view.c:667 +#: ../midori/midori-view.c:686 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:669 ../extensions/feed-panel/main.c:112 +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Erreur" -#: ../midori/midori-view.c:672 +#: ../midori/midori-view.c:691 msgid "Try again" msgstr "Essayer une autre fois" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:701 ../midori/midori-view.c:2651 +#: ../midori/midori-view.c:721 ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:1068 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:1070 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:1087 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:1096 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1102 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:1111 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:1140 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "Chercher _avec" -#: ../midori/midori-view.c:1168 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "_Chercher sur Internet" -#: ../midori/midori-view.c:1178 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1330 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1347 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:1350 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1354 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1774 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1954 ../midori/midori-view.c:1955 +#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002 msgid "Search" msgstr "Rechercher" -#: ../midori/midori-view.c:1956 +#: ../midori/midori-view.c:2003 msgid "Click to add a shortcut" msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-view.c:2004 msgid "Enter shortcut address" msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:1958 -msgid "Enter shortcut name" -msgstr "Entrez le nom du raccourci" +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:1959 +#: ../midori/midori-view.c:2006 msgid "Are you sure you want to delete this shortcut?" msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:1989 +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" @@ -1425,157 +1436,157 @@ msgid "Preferences for %s" msgstr "Préférences pour %s" #. Page "General" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:400 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:416 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" -#: ../midori/midori-preferences.c:426 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferts" #. Page "Appearance" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:445 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:447 msgid "The default font family used to display text" msgstr "La police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "La taille de la police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:453 msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:458 +#: ../midori/midori-preferences.c:456 msgid "The font family used to display fixed-width text" msgstr "" "La taille de la police utilisée par défaut pour afficher les textes à " "largeur fixe" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "La taille minimale de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Encodage par défaut des caractères" #. Page "Behavior" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:484 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" -msgstr "Réduire la taille des images automatiquement" +msgstr "Réduire la taille des images" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "" "Réduire automatiquement la taille des images pour les adapter à celle de la " "fenêtre" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimensionnées" -#: ../midori/midori-preferences.c:500 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:504 ../extensions/statusbar-features.c:72 +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:503 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:509 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:518 msgid "Spell Checking" msgstr "Vérificateur d'orthographe" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:521 msgid "Enable Spell Checking" msgstr "Activer la varification d'orthographe" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:522 msgid "Enable spell checking while typing" msgstr "Activer la vérification d'orthographe lors de la saisie" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:525 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" @@ -1584,46 +1595,46 @@ msgstr "" "d'ortographe, par example « fr_FR,de_DE »" #. Page "Interface" -#: ../midori/midori-preferences.c:532 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:544 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:572 msgid "Applications" msgstr "Applications" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:573 msgid "External applications" msgstr "Applications externes" #. Page "Network" -#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:649 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Fichiers témoins" -#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 msgid "days" msgstr "jours" @@ -1785,10 +1796,13 @@ msgid "Clear the entire history" msgstr "Vider l'historique tout entier" #: ../panels/midori-history.c:599 -#, c-format msgid "A week ago" msgstr "Il y a une semaine" +#: ../panels/midori-history.c:604 +msgid "%d day ago" +msgstr "Il y a %d jours" + #: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" @@ -1964,48 +1978,50 @@ msgstr "Gestionnaire de _cookies" msgid "List, view and delete cookies" msgstr "Lister, afficher et supprimer les fichiers témoins" -#: ../extensions/feed-panel/feed-atom.c:217 +#: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Impossible de trouver l'élément \"entry\" ATOM requise dans les données XML." +msgstr "" +"Impossible de trouver l'élément \"entry\" ATOM requise dans les données XML." -#: ../extensions/feed-panel/feed-atom.c:323 +#: ../extensions/feed-panel/feed-atom.c:348 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Impossible de trouver l'élément \"feed\" ATOM requis dans les données XML." +msgstr "" +"Impossible de trouver l'élément \"feed\" ATOM requis dans les données XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Dernière mise à jour : %s." -#: ../extensions/feed-panel/feed-panel.c:660 +#: ../extensions/feed-panel/feed-panel.c:664 msgid "Feeds" msgstr "Flux" -#: ../extensions/feed-panel/feed-panel.c:713 +#: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" msgstr "Ajouter un nouveau flux" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" msgstr "Supprimer un flux" -#: ../extensions/feed-panel/feed-panel.c:803 +#: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" msgstr "_Flux" -#: ../extensions/feed-panel/feed-parse.c:139 +#: ../extensions/feed-panel/feed-parse.c:175 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Impossible de trouver l'élément racine dans les données XML du flux." -#: ../extensions/feed-panel/feed-parse.c:179 +#: ../extensions/feed-panel/feed-parse.c:215 #, c-format msgid "Unsupported feed format." msgstr "Format de flux non pris en charge." -#: ../extensions/feed-panel/feed-parse.c:209 +#: ../extensions/feed-panel/feed-parse.c:245 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Impossible d'analyser le flux XML: %s" From 67fea42b125c5b8fe5a94f165882b78734a5582a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 14 May 2009 20:36:26 +0200 Subject: [PATCH 1162/2970] Bind View Source to Ctrl+U by default --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 34c5aef9..2e4e6cbf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3859,7 +3859,7 @@ static const GtkActionEntry entries[] = { N_("Custom..."), "", NULL, G_CALLBACK (_action_view_encoding_activate) }, { "SourceView", NULL, - N_("View _Source"), "", + N_("View _Source"), "U", N_("View the source code of the page"), G_CALLBACK (_action_source_view_activate) }, { "SelectionSourceView", NULL, N_("View Selection Source"), "", From f200fc8f9db00b66b1bd6ac858d1fbb7f7a06978 Mon Sep 17 00:00:00 2001 From: Elega Date: Thu, 14 May 2009 20:43:37 +0200 Subject: [PATCH 1163/2970] Update Spanish translation --- po/es.po | 1178 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 705 insertions(+), 473 deletions(-) diff --git a/po/es.po b/po/es.po index f1502ab1..6625f41d 100644 --- a/po/es.po +++ b/po/es.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" -"PO-Revision-Date: 2009-04-26 01:47-0300\n" -"Last-Translator: Elega \n" +"POT-Creation-Date: 2009-05-10 16:06+0200\n" +"PO-Revision-Date: 2009-05-11 21:03-0300\n" +"Last-Translator: elega \n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +24,11 @@ msgid "Lightweight web browser" msgstr "Navegador ligero" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1288 -#: ../midori/main.c:1388 -#: ../midori/main.c:1396 -#: ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../midori/main.c:1315 +#: ../midori/main.c:1449 +#: ../midori/main.c:1457 +#: ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" @@ -36,186 +36,195 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:94 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:156 -#: ../midori/main.c:228 +#: ../midori/main.c:158 +#: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración inválido «%s»" -#: ../midori/main.c:332 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "No se ha podido abrir la base de datos: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No se ha podido quitar los elementos del historial: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "No se ha podido vaciar el historial: %s\n" -#: ../midori/main.c:465 -#: ../midori/main.c:499 -#: ../midori/main.c:515 +#: ../midori/main.c:483 +#: ../midori/main.c:517 +#: ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "No se ha podido añadir un elemento al historial: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "No se ha podido quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar los motores de búsqueda. %s" -#: ../midori/main.c:770 -#: ../midori/main.c:798 -#: ../midori/main.c:827 +#: ../midori/main.c:789 +#: ../midori/main.c:817 +#: ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 -#: ../midori/main.c:873 +#: ../midori/main.c:869 +#: ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1092 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." -#: ../midori/main.c:1088 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:1092 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Restaurar la última _sesión" -#: ../midori/main.c:1097 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Deshabilitar todas las _extensiones" -#: ../midori/main.c:1288 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "No se especificó el nombre del archivo" -#: ../midori/main.c:1311 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." -#: ../midori/main.c:1336 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Captura guardada en: %s\n" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" msgstr "Ejecutar DIRECCIÓN como una aplicación de internet" -#: ../midori/main.c:1336 +#: ../midori/main.c:1391 msgid "ADDRESS" msgstr "DIRECCIÓN" -#: ../midori/main.c:1338 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "Utilizar CARPETA como carpeta de configuración" -#: ../midori/main.c:1338 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1340 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" msgstr "Ejecute el nombre de archivo especificado como javascript" -#: ../midori/main.c:1342 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Tomar una captura de la URL especificada" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1344 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:1385 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1548 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuración especificada no es válida." -#: ../midori/main.c:1489 +#: ../midori/main.c:1583 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1633 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No se pudieron cargar los motores de búsqueda. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1645 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Los marcadores no pudieron ser cargados: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1660 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1673 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1686 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1698 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1714 msgid "_Ignore" msgstr "_Ignorar" @@ -229,132 +238,144 @@ msgid "Malformed document." msgstr "Documento defectuoso." #: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:625 +#: ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/midori-browser.c:280 -#: ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:287 +#: ../midori/midori-browser.c:3819 +#: ../midori/midori-browser.c:3825 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:291 -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:298 +#: ../midori/midori-browser.c:3822 msgid "Stop loading the current page" msgstr "Detener la carga de la página" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:360 #, c-format msgid "%d%% loaded" msgstr "%d%% cargado" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:385 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:603 msgid "New folder" msgstr "Nueva carpeta" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:603 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:605 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:605 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:635 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:648 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:667 #: ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Dirección:" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:686 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:629 -#: ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:732 msgid "Toplevel folder" msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:808 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:1119 +#, c-format +msgid "The file %s has been downloaded." +msgstr "El archivo %s ha sido descargado." + +#: ../midori/midori-browser.c:1123 +msgid "Transfer completed" +msgstr "Transferencia completa" + +#: ../midori/midori-browser.c:1820 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2803 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:3152 +#: ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Abrir todo en _pestañas" -#: ../midori/midori-browser.c:2810 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:3159 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 +#: ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2813 -#: ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:3162 +#: ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3425 msgid "Clear Private Data" msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3428 msgid "_Clear private data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3441 msgid "Clear the following data:" msgstr "Borrar los siguientes datos:" -#: ../midori/midori-browser.c:2998 -#: ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3449 +#: ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3452 msgid "Cookies" -msgstr "Huellas/ Cookies" +msgstr "Huellas / Cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3455 msgid "'Flash' Cookies" -msgstr "'Flash' Cookies" +msgstr "'Flash' Huellas" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3458 msgid "Website icons" msgstr "Íconos de sitios de internet" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3538 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3546 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -363,990 +384,1068 @@ msgstr "" "Elega \n" "Guillermo Iguarán " -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3750 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3753 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3756 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3759 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3762 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3764 +#: ../midori/midori-view.c:1256 +msgid "Add to Speed _dial" +msgstr "Añadir a marcación rápida" + +#: ../midori/midori-browser.c:3765 +msgid "Add shortcut to speed dial" +msgstr "Añadir acceso directo a marcación rápida" + +#: ../midori/midori-browser.c:3767 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3768 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3770 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3771 msgid "Close this window" msgstr "Cerrar ésta ventana" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3774 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3777 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3779 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3782 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:3334 -#: ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:3788 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3791 msgid "Paste text from the clipboard" msgstr "Pegar texto del portapapeles" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3794 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3797 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3800 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3802 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3803 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar la siguiente aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3805 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3806 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar la anterior aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3809 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3810 msgid "Quickly jump to a word or phrase" msgstr "Saltar rápidamente a una palabra o una frase" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3813 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3815 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3816 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3828 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3831 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3834 msgid "Reset the zoom level" msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3835 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3837 msgid "_Automatic" -msgstr "_Automatico" +msgstr "_Automático" -#: ../midori/midori-browser.c:3389 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3840 +#: ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" -#: ../midori/midori-browser.c:3392 -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3843 +#: ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-browser.c:3395 -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3846 +#: ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:3398 -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3849 +#: ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3401 -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3852 +#: ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3404 -#: ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3855 +#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:3407 -#: ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3858 +#: ../midori/midori-view.c:1275 msgid "View _Source" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3859 msgid "View the source code of the page" msgstr "Ver el código fuente de la página" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3861 msgid "View Selection Source" msgstr "Ver código fuente de la selección" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3862 msgid "View the source code of the selection" msgstr "Ver el código fuente de la selección" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3866 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3868 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3871 msgid "Go back to the previous page" msgstr "Retroceder una página" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3874 msgid "Go forward to the next page" msgstr "Avanzar una página" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3877 msgid "Go to your homepage" msgstr "Abrir página de inicio" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3879 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3880 msgid "Delete the contents of the trash" msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:3431 -#: ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3882 +#: ../midori/midori-view.c:1233 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3883 msgid "Open the last closed tab" msgstr "Abrir la última pestaña cerrada" -#: ../midori/midori-browser.c:3436 -#: ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3887 +#: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3438 -#: ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3889 +#: ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Añadir una nueva carpeta" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3890 msgid "Add a new bookmark folder" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3891 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:3893 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" -msgstr "_Administrar los motores de búsqueda" +msgstr "_Administrar motores de búsqueda" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3894 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar y quitar motores de búsqueda..." -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3897 msgid "_Clear Private Data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3898 msgid "Clear private data..." msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3902 msgid "_Previous Tab" msgstr "_Pestaña anterior" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3903 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3905 msgid "_Next Tab" msgstr "_Pestaña siguiente" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3906 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3908 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3910 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3911 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3913 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3914 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3916 msgid "_Report a Bug" msgstr "_Reportar un error" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3917 msgid "Open Midori's bug tracker" msgstr "Abrir el rastreador de errores de Midori" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3920 msgid "Show information about the program" msgstr "Mostrar información sobre el programa" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3927 msgid "P_rivate Browsing" msgstr "_Navegación privada" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3928 msgid "Don't save any private data while browsing" msgstr "No guardar datos durante la navegación privada" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3933 msgid "_Menubar" msgstr "_Barra de menú" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3934 msgid "Show menubar" msgstr "Mostrar la barra de menú" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3937 msgid "_Navigationbar" msgstr "_Barra de navegación" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3938 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3941 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3942 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3945 msgid "_Bookmarkbar" msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3946 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3949 msgid "_Transferbar" msgstr "_Barra de transferencias" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3950 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3953 msgid "_Statusbar" msgstr "_Barra de estado" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3954 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4389 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4396 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4398 msgid "Open a particular location" msgstr "Abrir un lugar" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4420 msgid "_Web Search..." -msgstr "_Buscar en la internet..." +msgstr "_Buscar en internet..." -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4422 msgid "Run a web search" -msgstr "Realizar una búsqueda de internet" +msgstr "Realizar una búsqueda en internet" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4443 msgid "Reopen a previously closed tab or window" msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4458 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4460 msgid "Reopen pages that you visited earlier" msgstr "Abre las páginas que usted visitó anteriormente" -#: ../midori/midori-browser.c:4021 -#: ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4475 +#: ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4477 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardados." -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4492 msgid "_Window" msgstr "_Ventanas" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4494 msgid "Show a list of all open tabs" -msgstr "Mostrar una lista de todas las pesañas abiertas" +msgstr "Mostrar una lista de todas las pestañas abiertas" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4674 msgid "_Inline Find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4699 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4704 msgid "Next" msgstr "Siguiente" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4709 msgid "Match Case" msgstr "Sensible mayúsculas " -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4717 msgid "Highlight Matches" msgstr "Destacar coincidencias" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4727 msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4762 +#: ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Eliminar todo" + +#: ../midori/midori-browser.c:5084 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Separar el panel elegido de la ventana" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" -msgstr "Si se desea separar el panel de la ventana" +msgstr "Separar el panel de la ventana" -#: ../midori/midori-panel.c:321 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 +#: ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" +msgstr "Alinear el panel a la derecha" + +#: ../midori/midori-panel.c:347 +#: ../midori/midori-websettings.c:536 +msgid "Whether to align the sidepanel on the right" msgstr "Alinear el panel lateral a la derecha" -#: ../midori/midori-panel.c:323 -#: ../midori/midori-websettings.c:532 -msgid "Whether to align the sidepanel on the right" -msgstr "Si se desea alinear el panel lateral a la derecha" - -#: ../midori/midori-panel.c:333 -#: ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 +#: ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-websettings.c:183 -#: ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:187 +#: ../midori/midori-view.c:1999 +#: ../midori/midori-view.c:2176 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-websettings.c:184 -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Últimas páginas visitadas" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:242 msgid "Icons" -msgstr "Iconos" +msgstr "Íconos" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Todas las huellas" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "Huellas de la sesión" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:262 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Ninguna" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" msgstr "Última búsqueda en la internet" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" msgstr "Última búsqueda de internet guardada" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Si se desea mostrar la barra de menú" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Si se desea mostrar la barra de navegación" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Si se desea mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Si se desea mostrar el panel" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "Si se desea mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Si se desea mostrar la barra de estado" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" msgstr "Mostrar progreso en lugar de entrada" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" msgstr "Motores de búsqueda en completamiento" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Al iniciar Midori cargar:" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Página que se carga al inicio" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" msgstr "Mostrar diálogo de cuelgue" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un dialogo despues de que Midori se cuelgue" -#: ../midori/midori-websettings.c:576 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Mostrar marcación rápida en una nueva pestaña" + +#: ../midori/midori-websettings.c:589 +msgid "Show speed dial in newly opened tabs" +msgstr "Mostrar marcación rápida en las pestañas abiertas recientemente" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:617 +msgid "Ask for the destination folder" +msgstr "Preguntar por la carpeta de destino" + +#: ../midori/midori-websettings.c:618 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Si se desea seleccionar la carpeta de destino cuando se descarga un archivo" + +#: ../midori/midori-websettings.c:637 +msgid "Notify when a transfer has been completed" +msgstr "Notificar cuando una transferencia se ha completado" + +#: ../midori/midori-websettings.c:638 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Si se desea mostrar una notificación cuando se ha completado la transferencia" + +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "Gestor de descargas externo" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "Editor de textos externo" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "Agregador de noticias" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "Un agregador de noticias externo" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "Abrir páginas nuevas en" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" msgstr "Donde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" msgstr "Abrir las páginas externas en" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "Donde abrir las páginas externas" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" msgstr "Clic del medio abre la selección" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "Ampliar textos e imágenes" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "Si se desea ampliar texto e imágenes" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" msgstr "Buscar en el texto al escribir" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" msgstr "Si se desea buscar en el texto automáticamente al comenzar a tipear" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" -msgstr "Aceptar cookies" +msgstr "Aceptar huellas" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "Qué tipos de huellas van a ser aceptadas" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" -msgstr "Sólo cookies originales" +msgstr "Sólo huellas originales" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "Sólo se aceptan las huellas del sitio de internet original" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" -msgstr "Duración máxima de las cookies" +msgstr "Duración máxima de las huellas" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de días para conservar las huellas" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "Si se desea que las últimas páginas visitadas sean recordadas" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "Duración máxima del historial" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" msgstr "Recordar lo que se haya ingresado en formularios" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" msgstr "Si se desea que las últimas entradas de formulario sean recordadas" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "Recordar los últimos archivos descargados" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "Si se desea que los archivos descargados sean recordados" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy utilizado para conexiones HTTP" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "Detectar automáticamente el servidor proxy" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Si se desea detectar automáticamente el servidor proxy desde el entorno" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "Identificar como:" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" msgstr "Identificar como páginas de internet" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "Cadena de identificación" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "Aplicación de identificación de cadenas" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "Tamaño del caché" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" +#: ../midori/midori-view.c:686 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "No se pudo cargar la página «%s»." + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#: ../midori/midori-view.c:688 +#: ../midori/midori-view.c:2701 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Error" + +#: ../midori/midori-view.c:691 +msgid "Try again" +msgstr "Inténtelo nuevamente" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:721 +#: ../midori/midori-view.c:2705 #, c-format msgid "Not found - %s" msgstr "No se ha encontrado - %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1095 msgid "Open _Link" msgstr "Abrir _enlace" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1097 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1114 msgid "Open Link in New _Window" msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1123 msgid "_Download Link destination" msgstr "_Descargar enlace" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1129 msgid "_Save Link destination" msgstr "_Guardar enlace" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1138 msgid "Download with Download _Manager" msgstr "Descargar con el gestor de descargas" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1167 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1195 msgid "_Search the Web" msgstr "_Buscar en la internet" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1205 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1372 msgid "Open or download file" msgstr "Abrir o descargar archivo" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1389 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: '%s'" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1392 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1396 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1816 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:2001 +#: ../midori/midori-view.c:2002 +msgid "Search" +msgstr "Buscar" + +#: ../midori/midori-view.c:2003 +msgid "Click to add a shortcut" +msgstr "Haga clic aquí para añadir un acceso directo" + +#: ../midori/midori-view.c:2004 +msgid "Enter shortcut address" +msgstr "Introduzca la dirección del acceso directo" + +#: ../midori/midori-view.c:2005 +msgid "Enter shortcut title" +msgstr "Introduzca el título del acceso directo" + +#: ../midori/midori-view.c:2006 +msgid "Are you sure you want to delete this shortcut?" +msgstr "¿Está seguro que desea eliminar éste acceso directo?" + +#: ../midori/midori-view.c:2038 #, c-format msgid "Document cannot be displayed" msgstr "El documento no puede ser mostrado" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:2055 #, c-format msgid "No documentation installed" msgstr "No se dispone de documentación instalada" @@ -1369,159 +1468,196 @@ msgstr "Inicio" msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:425 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferencias" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Apariencia" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Configuración de las fuentes" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Fuente por defecto" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Fuente de ancho fijo" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Fuente utilizada para mostrar el texto de ancho fijo" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Tamaño mínimo de fuente" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "Mínimo tamaño de fuente utilizado para mostrar texto" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Codificación" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Codificación de caracteres a utilizar por defecto" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Características" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:482 #: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Cargar y mostrar imágenes automáticamente" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Reducir imágenes automáticamente" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Reducir imágenes automáticamente independientemente si caben" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Si se desea imprimir las imágenes de fondo" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Áreas de texto dimensionables" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Si se desea que las áreas de texto sean dimensionables" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:498 #: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Habilitar script de lenguajes embebidos" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:502 #: ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Habilitar complementos" +msgid "Enable Netscape plugins" +msgstr "Habilitar complementos Netscape" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "Habilitar el complemento de objetos embebidos" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Habilitar el complemento de objetos embebidos Netscape" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Aplicar 96 puntos por pulgada" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Aplicar una densidad de puntos de video de 96 DPI" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Habilitar herramientas de desarrollo" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Habilitar extensiones especiales para desarrolladores" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Corrector ortográfico" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Habilitar el corrector ortográfico" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Habilitar el corrector ortográfico al escribir" + +#: ../midori/midori-preferences.c:525 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Lista de idiomas separados con comas que se utilizarán para la corrección ortográfica, por ejemplo \"en_GB,de_DE\"" + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Navegación" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Aplicaciones" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Aplicaciones externas" + #. Page "Network" -#: ../midori/midori-preferences.c:590 -#: ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:620 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Privacidad" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Huellas" -#: ../midori/midori-preferences.c:637 -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 +#: ../midori/midori-preferences.c:676 msgid "days" msgstr "días" #: ../midori/midori-searchaction.c:484 -#: ../katze/katze-arrayaction.c:277 +#: ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Vacío" @@ -1553,65 +1689,65 @@ msgstr "Administrar los motores de búsqueda" msgid "Use as _default" msgstr "Utilizar como _predeterminado" -#: ../midori/sokoke.c:117 -#: ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" -msgstr "_Añadir marcador" +msgstr "_Añadir a marcadores" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "_Página de inicio" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "_Estilos de usuario" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "Nueva _pestaña" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "C_omplementos" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "C_omplementos Netscape" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "_Pestañas y ventanas cerradas" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "Nueva _ventana" @@ -1649,15 +1785,15 @@ msgstr "Desactivar" msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Separador" @@ -1669,43 +1805,47 @@ msgstr "Consola" msgid "Extensions" msgstr "Extensiones" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "¿Estás seguro de que quieres quitar todos los elementos del historial?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Añadir a marcadores el elemento seleccionado del historial" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Borrar del historial el elemento seleccionado" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Vaciar el historial completo" -#: ../panels/midori-history.c:600 -#, c-format +#: ../panels/midori-history.c:599 msgid "A week ago" msgstr "Hace una semana" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:604 +#, c-format +msgid "%d day ago" +msgstr "Hace %d días" + +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "Hace %d días" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Hoy" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Ayer" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Complementos" +msgid "Netscape plugins" +msgstr "Complementos Netscape" #: ../panels/midori-transfers.c:256 #, c-format @@ -1744,32 +1884,32 @@ msgstr "No se pudo cargar el ícono stock «%s»" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" -msgstr "Los cuadros de animación estan rotos" +msgstr "Los cuadros de animación están rotos" #: ../katze/katze-utils.c:183 -#: ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" #: ../katze/katze-utils.c:215 -#: ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Elegir archivo" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Elegir carpeta" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Pestañas de distintos colores" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "Pestañas de colores" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "Colorear pestañas de distintos colores" @@ -1802,67 +1942,147 @@ msgstr "Si" msgid "No" msgstr "No" -#: ../extensions/cookie-manager.c:491 -msgid "Do you really want to delete all cookies?" -msgstr "¿Esta seguro que desea eliminar todas las cookies?" - #: ../extensions/cookie-manager.c:493 +msgid "Do you really want to delete all cookies?" +msgstr "¿Está seguro que desea eliminar todas las huellas?" + +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "Pregunta" -#: ../extensions/cookie-manager.c:501 -msgid "Only the visible cookies are deleted which match the entered filter string." -msgstr "Sólo se eliminarán las cookies visibles que coinciden con el filtro." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Sólo se eliminarán las huellas visibles que coinciden con el filtro." -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "Nombre" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "_Expandir todo" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "_Contraer todo" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Eliminar todo" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:823 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Elimina todas las cookies. Si se establece un filtro, sólo se eliminarán las \"cookies\" que coincidan con el filtro." +msgstr "Elimina todas las huellas. Si se establece un filtro, sólo se eliminarán las \"huellas\" que coincidan con el filtro." -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "Expandir todo" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "Contraer todo" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:881 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre o dominio coincide con el filtro ingresado" +msgstr "Introduzca una cadena de filtro para mostrar sólo las huellas cuyo nombre o dominio coincide con el filtro ingresado" -#: ../extensions/cookie-manager.c:913 -#: ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:916 +#: ../extensions/cookie-manager.c:964 msgid "Cookie Manager" -msgstr "Gestor de cookies" +msgstr "Gestor de huellas" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" -msgstr "_Gestor de cookies" +msgstr "_Gestor de huellas" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "Listar, ver y eliminar huellas" +#: ../extensions/feed-panel/feed-atom.c:242 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "No se ha podido encontrar los elementos necesarios Atom \"entry\" en los datos XML." + +#: ../extensions/feed-panel/feed-atom.c:348 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "No se ha podido encontrar los elementos necesarios Atom \"feed\" en los datos XML." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Última actualización: %s." + +#: ../extensions/feed-panel/feed-panel.c:664 +msgid "Feeds" +msgstr "Canales" + +#: ../extensions/feed-panel/feed-panel.c:717 +msgid "Add new feed" +msgstr "Añadir nuevo canal" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Delete feed" +msgstr "Eliminar canal" + +#: ../extensions/feed-panel/feed-panel.c:807 +msgid "_Feeds" +msgstr "_Canales" + +#: ../extensions/feed-panel/feed-parse.c:175 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "No se ha podido encontrar el elemento raíz en el canal de información XML." + +#: ../extensions/feed-panel/feed-parse.c:215 +#, c-format +msgid "Unsupported feed format." +msgstr "Formato de canal no soportado." + +#: ../extensions/feed-panel/feed-parse.c:245 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "No se ha podido analizar el canal XML: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "No se ha podido encontrar el elemento \"channel\" en lo datos XML del RSS" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Versión de RSS no soportada." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "No se ha podido encontrar los elementos necesarios RSS \"item\" en los datos XML." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "No se ha podido encontrar los elementos necesarios RSS \"channel\" en los datos XML." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "El canal '%s' ya existe" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Error al cargar el canal '%s'" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Nuevo canal" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Panel de canales" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Lector de canales Atom/RSS" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Gestos de ratón" @@ -1881,6 +2101,18 @@ msgstr "Anclar página" msgid "_Pageholder" msgstr "_Anclar página" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Barra de funcionalidades" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Alternar fácilmente las características de páginas web dentro y fuera" + +#~ msgid "P_lugins" +#~ msgstr "C_omplementos" +#~ msgid "Plugins" +#~ msgstr "Complementos" #~ msgid "Source" #~ msgstr "Código fuente" #~ msgid "_Icon (name or file):" From 05f403bd5493e8df2d75c69194e07c5d1197e014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Thu, 14 May 2009 20:52:55 +0200 Subject: [PATCH 1164/2970] Fix missing keyboard events for bookmark menu items --- katze/katze-arrayaction.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 0969c5d7..c7909d20 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -232,6 +232,14 @@ katze_array_action_activate (GtkAction* action) GTK_ACTION_CLASS (katze_array_action_parent_class)->activate (action); } +static void +katze_array_action_menu_activate_cb (GtkWidget* proxy, + KatzeArrayAction* array_action) +{ + KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); + g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); +} + static gboolean katze_array_action_menu_button_press_cb (GtkWidget* proxy, GdkEventButton* event, @@ -240,11 +248,17 @@ katze_array_action_menu_button_press_cb (GtkWidget* proxy, KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); gboolean handled; - g_signal_emit (array_action, signals[ACTIVATE_ITEM_ALT], 0, item, event->button, &handled); + g_signal_emit (array_action, signals[ACTIVATE_ITEM_ALT], 0, item, + event->button, &handled); if (!handled) g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); + /* we need to block the 'activate' handler which would be called + * otherwise as well */ + g_signal_handlers_block_by_func (proxy, + katze_array_action_menu_activate_cb, array_action); + return TRUE; } @@ -306,6 +320,9 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, { g_signal_connect (menuitem, "button-press-event", G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); + /* we need the 'activate' signal as well for keyboard events */ + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_activate_cb), array_action); } gtk_widget_show (menuitem); } From 03a6f54d25e5ced0e2c682b3b29ccf8ccfedadac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 14 May 2009 22:26:02 +0200 Subject: [PATCH 1165/2970] Plug a few memory leaks in MidoriView and MidoriWebSettings --- midori/midori-view.c | 9 ++++++--- midori/midori-websettings.c | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index f60880f6..5e803d83 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -539,7 +539,10 @@ midori_view_update_icon (MidoriView* view, { icon_theme = gtk_icon_theme_get_for_screen (screen); if ((parts = g_strsplit (view->mime_type, "/", 2))) - parts = (parts[0] && parts[1]) ? parts : NULL; + { + if (!(parts[0] && parts[1])) + katze_assign (parts, NULL); + } } else parts = NULL; @@ -780,8 +783,8 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, g_strfreev (parts); } g_strfreev (items); - g_object_set_data (G_OBJECT (view), "news-feeds", - value && *value ? (void*)1 : (void*)0); + g_object_set_data_full (G_OBJECT (view), "news-feeds", + value && *value ? (void*)1 : (void*)0, g_free); /* Ensure load-status is notified again, whether it changed or not */ g_object_notify (G_OBJECT (view), "load-status"); } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index b2dffb0d..d2a4e72d 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -954,7 +954,7 @@ notify_default_encoding_cb (GObject* object, GParamSpec* pspec) { MidoriWebSettings* web_settings; - const gchar* string; + gchar* string; const gchar* encoding; web_settings = MIDORI_WEB_SETTINGS (object); @@ -973,6 +973,7 @@ notify_default_encoding_cb (GObject* object, web_settings->preferred_encoding = MIDORI_ENCODING_WESTERN; else web_settings->preferred_encoding = MIDORI_ENCODING_CUSTOM; + g_free (string); g_object_notify (object, "preferred-encoding"); } @@ -994,6 +995,20 @@ midori_web_settings_init (MidoriWebSettings* web_settings) static void midori_web_settings_finalize (GObject* object) { + MidoriWebSettings* web_settings; + + web_settings = MIDORI_WEB_SETTINGS (object); + + katze_assign (web_settings->toolbar_items, NULL); + katze_assign (web_settings->homepage, NULL); + katze_assign (web_settings->download_folder, NULL); + katze_assign (web_settings->download_manager, NULL); + katze_assign (web_settings->text_editor, NULL); + katze_assign (web_settings->news_aggregator, NULL); + katze_assign (web_settings->location_entry_search, NULL); + katze_assign (web_settings->http_proxy, NULL); + katze_assign (web_settings->ident_string, NULL); + G_OBJECT_CLASS (midori_web_settings_parent_class)->finalize (object); } From 06d9e2d026df342c50c4102bbba088ba17818559 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 14 May 2009 22:29:59 +0200 Subject: [PATCH 1166/2970] Move 'Add to Speed dial' from View to File menu --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2e4e6cbf..2ed6fbe1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4053,6 +4053,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -4103,7 +4104,6 @@ static const gchar* ui_markup = "

" "" "" - "" "" "" "" From ade0f16053c606629dd79368b42a4dfd3ddb14c5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 00:58:58 +0200 Subject: [PATCH 1167/2970] Fix a crash caused by a mistaken attempt at plugging a leak --- midori/midori-view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5e803d83..867cb227 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -783,8 +783,9 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, g_strfreev (parts); } g_strfreev (items); - g_object_set_data_full (G_OBJECT (view), "news-feeds", - value && *value ? (void*)1 : (void*)0, g_free); + g_object_set_data (G_OBJECT (view), "news-feeds", + value && *value ? (void*)1 : (void*)0); + g_free (value); /* Ensure load-status is notified again, whether it changed or not */ g_object_notify (G_OBJECT (view), "load-status"); } From 8b3a74b6f052a82edb1c13c406be626c26fdf85b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 01:18:14 +0200 Subject: [PATCH 1168/2970] Update address and actions properly when navigating in-page --- midori/midori-browser.c | 13 +++++++++++++ midori/midori-view.c | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2ed6fbe1..8cd62669 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -509,6 +509,17 @@ midori_view_context_ready_cb (GtkWidget* view, g_signal_emit (browser, signals[CONTEXT_READY], 0, js_context); } +static void +midori_view_notify_uri_cb (GtkWidget* view, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + GtkAction* action = _action_by_name (browser, "Location"); + midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); + _midori_browser_update_interface (browser); +} + static void midori_view_notify_title_cb (GtkWidget* view, GParamSpec* pspec, @@ -1376,6 +1387,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_notify_progress_cb, browser, "signal::context-ready", midori_view_context_ready_cb, browser, + "signal::notify::uri", + midori_view_notify_uri_cb, browser, "signal::notify::title", midori_view_notify_title_cb, browser, "signal::notify::zoom-level", diff --git a/midori/midori-view.c b/midori/midori-view.c index 867cb227..f8aa4c54 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -793,6 +793,25 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, g_object_thaw_notify (G_OBJECT (view)); } +#if WEBKIT_CHECK_VERSION (1, 1, 4) +static void +webkit_web_view_notify_uri_cb (WebKitWebView* web_view, + GParamSpec* pspec, + MidoriView* view) +{ + g_object_get (web_view, "uri", &view->uri, NULL); + g_object_notify (G_OBJECT (view), "uri"); +} + +static void +webkit_web_view_notify_title_cb (WebKitWebView* web_view, + GParamSpec* pspec, + MidoriView* view) +{ + g_object_get (web_view, "title", &view->title, NULL); + g_object_notify (G_OBJECT (view), "title"); +} +#else static void webkit_web_view_title_changed_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, @@ -801,6 +820,7 @@ webkit_web_view_title_changed_cb (WebKitWebView* web_view, { g_object_set (view, "title", title, NULL); } +#endif static void webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view, @@ -1904,8 +1924,15 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_progress_changed_cb, view, "signal::load-finished", webkit_web_view_load_finished_cb, view, + #if WEBKIT_CHECK_VERSION (1, 1, 4) + "signal::notify::uri", + webkit_web_view_notify_uri_cb, view, + "signal::notify::title", + webkit_web_view_notify_title_cb, view, + #else "signal::title-changed", webkit_web_view_title_changed_cb, view, + #endif "signal::status-bar-text-changed", webkit_web_view_statusbar_text_changed_cb, view, "signal::hovering-over-link", From 9569a3c0604bc6815b911ce7ce9493b4aa48e863 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 01:55:11 +0200 Subject: [PATCH 1169/2970] Provide custom overflow menu items to support middle click --- katze/katze-arrayaction.c | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index c7909d20..cc887bc5 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -472,6 +472,44 @@ katze_array_action_item_notify_cb (KatzeItem* item, } } +static gboolean +katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, + KatzeItem* item) +{ + KatzeArrayAction* array_action; + GtkWidget* menuitem; + const gchar* icon_name; + GtkWidget* image; + GdkPixbuf* icon; + + array_action = g_object_get_data (G_OBJECT (proxy), "KatzeArrayAction"); + menuitem = katze_image_menu_item_new_ellipsized ( + katze_item_get_name (item)); + if ((icon_name = katze_item_get_icon (item)) && *icon_name) + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + else + { + if (KATZE_IS_ARRAY (item)) + icon = gtk_widget_render_icon (menuitem, + GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); + else + icon = katze_net_load_icon (array_action->net, + katze_item_get_uri (item), NULL, proxy, NULL); + image = gtk_image_new_from_pixbuf (icon); + g_object_unref (icon); + } + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + g_signal_connect (menuitem, "button-press-event", + G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); + /* we need the 'activate' signal as well for keyboard events */ + g_signal_connect (menuitem, "activate", + G_CALLBACK (katze_array_action_menu_activate_cb), array_action); + gtk_tool_item_set_proxy_menu_item (GTK_TOOL_ITEM (proxy), + "katze-tool-item-menu", menuitem); + return TRUE; +} + /** * katze_array_action_create_tool_item_for: * @array_action: a #KatzeArrayAction @@ -507,6 +545,8 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, return gtk_separator_tool_item_new (); toolitem = gtk_tool_button_new (NULL, NULL); + g_signal_connect (toolitem, "create-menu-proxy", + G_CALLBACK (katze_array_action_proxy_create_menu_proxy_cb), item); if (KATZE_IS_ARRAY (item)) icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); From b0babb3c17c09e63f3f3d4f967cdaa68bdc4913d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 17:26:09 +0200 Subject: [PATCH 1170/2970] Moving tab title update to a function and fix tab titles --- midori/midori-view.c | 67 ++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index f8aa4c54..4bb25035 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -508,6 +508,41 @@ midori_view_class_init (MidoriViewClass* class) flags)); } +static void +midori_view_update_title (MidoriView* view) +{ + #define title midori_view_get_display_title (view) + if (view->tab_label) + { + /* If the title starts with the presumed name of the website, we + ellipsize differently, to emphasize the subtitle */ + if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0) + { + SoupURI* uri = soup_uri_new (view->uri); + const gchar* host = uri ? (uri->host ? uri->host : "") : ""; + const gchar* name = g_str_has_prefix (host, "www.") ? &host[4] : host; + guint i = 0; + while (name[i++]) + if (name[i] == '.') + break; + if (!g_ascii_strncasecmp (title, name, i)) + gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_START); + else + gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_END); + if (uri) + soup_uri_free (uri); + } + gtk_label_set_text (GTK_LABEL (view->tab_title), title); + gtk_widget_set_tooltip_text (view->tab_title, title); + } + if (view->menu_item) + gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( + view->menu_item))), title); + if (view->item) + katze_item_set_name (view->item, title); + #undef title +} + static GdkPixbuf* midori_view_mime_icon (GtkIconTheme* icon_theme, const gchar* format, @@ -809,6 +844,7 @@ webkit_web_view_notify_title_cb (WebKitWebView* web_view, MidoriView* view) { g_object_get (web_view, "title", &view->title, NULL); + midori_view_update_title (view); g_object_notify (G_OBJECT (view), "title"); } #else @@ -1581,36 +1617,7 @@ midori_view_set_property (GObject* object, { case PROP_TITLE: katze_assign (view->title, g_value_dup_string (value)); - #define title midori_view_get_display_title (view) - if (view->tab_label) - { - /* If the title starts with the presumed name of the website, we - ellipsize differently, to emphasize the subtitle */ - if (gtk_label_get_angle (GTK_LABEL (view->tab_title)) == 0.0) - { - SoupURI* uri = soup_uri_new (view->uri); - const gchar* host = uri ? (uri->host ? uri->host : "") : ""; - const gchar* name = g_str_has_prefix (host, "www.") ? &host[4] : host; - guint i = 0; - while (name[i++]) - if (name[i] == '.') - break; - if (!g_ascii_strncasecmp (title, name, i)) - gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_START); - else - gtk_label_set_ellipsize (GTK_LABEL (view->tab_title), PANGO_ELLIPSIZE_END); - if (uri) - soup_uri_free (uri); - } - gtk_label_set_text (GTK_LABEL (view->tab_title), title); - gtk_widget_set_tooltip_text (view->tab_title, title); - } - if (view->menu_item) - gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( - view->menu_item))), title); - if (view->item) - katze_item_set_name (view->item, title); - #undef title + midori_view_update_title (view); break; case PROP_ZOOM_LEVEL: midori_view_set_zoom_level (view, g_value_get_float (value)); From a6f2ca54e91e1c100b785dac746fad181eace601 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 17:30:54 +0200 Subject: [PATCH 1171/2970] Make sure to only update the address entry with the current view --- midori/midori-browser.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8cd62669..d9467a9d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -514,10 +514,13 @@ midori_view_notify_uri_cb (GtkWidget* view, GParamSpec* pspec, MidoriBrowser* browser) { - const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); - GtkAction* action = _action_by_name (browser, "Location"); - midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); - _midori_browser_update_interface (browser); + if (view == midori_browser_get_current_tab (browser)) + { + const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + GtkAction* action = _action_by_name (browser, "Location"); + midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); + _midori_browser_update_interface (browser); + } } static void From c217609403e8822ce3b22a1a9c2410c5fc824420 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 18:51:54 +0200 Subject: [PATCH 1172/2970] Title the speed dial as Speed dial instead of Blank page --- midori/midori-view.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 4bb25035..4a44632e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2055,7 +2055,7 @@ midori_view_set_uri (MidoriView* view, "{res}", res_root, "{stock}", stock_root, "{json_data}", speed_dial_body, - "{title}", _("Blank page"), + "{title}", _("Speed dial"), "{search_uri}", location_entry_search, "{search_title}", _("Search"), "{search}", _("Search"), @@ -2230,11 +2230,10 @@ midori_view_get_display_title (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), "about:blank"); - if (midori_view_is_blank (view)) - return _("Blank page"); - if (view->title && *view->title) return view->title; + if (midori_view_is_blank (view)) + return _("Blank page"); return midori_view_get_display_uri (view); } From 90e9ee4af7915a61ec5ed35e9ef0553d988c7d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 15 May 2009 18:58:57 +0200 Subject: [PATCH 1173/2970] Fix crash for URIs with an invalid hostname and without a path --- midori/sokoke.c | 2 ++ tests/magic-uri.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/midori/sokoke.c b/midori/sokoke.c index 552e025c..2909821c 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -222,6 +222,8 @@ sokoke_idn_to_punycode (gchar* uri) g_utf8_strncpy (buffer, hostname, offset); hostname = buffer; } + else + hostname = g_strdup (hostname); } else hostname = g_strdup (uri); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index b8fbe445..10f45e8f 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -62,6 +62,7 @@ magic_uri_uri (void) test_input ("http://example.com", "http://example.com"); test_input ("example.com", "http://example.com"); test_input ("example.com", "http://example.com"); + test_input ("www.google..com", "http://www.google..com"); test_input ("/home/user/midori.html", "file:///home/user/midori.html"); a = g_get_current_dir (); b = g_strconcat ("file://", a, G_DIR_SEPARATOR_S, "magic-uri.c", NULL); @@ -139,6 +140,7 @@ magic_uri_search (void) test_input ("g conference \"April 2, 7:00 am\"", NULL); test_input ("max@mustermann.de", NULL); test_input ("g max@mustermann.de", NULL); + test_input ("g inurl:http://twotoasts.de bug", NULL); } static void From 396c477f2d22a180ce4b8c2ed9d69b84539b07e1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 20:08:06 +0200 Subject: [PATCH 1174/2970] Disconnect history panel when finalizing There's a small hack now which prevents the disconnect function from releasing the references. Our reference handling is flawed and needs to be investigated before we can fix that for good. --- panels/midori-history.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 1b2ee3ae..a440703f 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -274,7 +274,8 @@ midori_history_clear_cb (KatzeArray* array, static void midori_history_disconnect_folder (MidoriHistory* history, - KatzeArray* array) + KatzeArray* array, + gboolean unref) { KatzeItem* item; guint i; @@ -292,8 +293,9 @@ midori_history_disconnect_folder (MidoriHistory* history, while ((item = katze_array_get_nth_item (array, i++))) { if (KATZE_IS_ARRAY (item)) - midori_history_disconnect_folder (history, KATZE_ARRAY (item)); - g_object_unref (item); + midori_history_disconnect_folder (history, KATZE_ARRAY (item), TRUE); + if (unref) + g_object_unref (item); } } @@ -308,6 +310,7 @@ midori_history_add_item_cb (KatzeArray* array, g_return_if_fail (KATZE_IS_ARRAY (array)); g_return_if_fail (KATZE_IS_ITEM (added_item)); + g_return_if_fail (MIDORI_IS_HISTORY (history)); if (KATZE_IS_ARRAY (added_item)) { @@ -391,7 +394,7 @@ midori_history_remove_item_cb (KatzeArray* array, g_assert (KATZE_IS_ITEM (removed_item)); if (KATZE_IS_ARRAY (removed_item)) - midori_history_disconnect_folder (history, KATZE_ARRAY (removed_item)); + midori_history_disconnect_folder (history, KATZE_ARRAY (removed_item), TRUE); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); midori_history_remove_iter (model, NULL, removed_item); @@ -423,7 +426,7 @@ midori_history_clear_cb (KatzeArray* array, midori_history_remove_item_cb (array, item, history); } - midori_history_disconnect_folder (history, array); + midori_history_disconnect_folder (history, array, TRUE); } static void @@ -480,7 +483,7 @@ midori_history_set_app (MidoriHistory* history, if (history->array) { - midori_history_disconnect_folder (history, history->array); + midori_history_disconnect_folder (history, history->array, TRUE); g_object_unref (history->array); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); @@ -966,6 +969,11 @@ midori_history_finalize (GObject* object) if (history->app) g_object_unref (history->app); + + /* FIXME: We don't unref items (last argument is FALSE) because + our reference counting is incorrect. */ + midori_history_disconnect_folder (history, history->array, FALSE); + g_object_unref (history->array); } From 3395d0a0f20be1153a02af61804c69bb15a1a2a3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 20:30:24 +0200 Subject: [PATCH 1175/2970] Shorten the paths used for --run to make them more easily reusable --- wscript | 1 + 1 file changed, 1 insertion(+) diff --git a/wscript b/wscript index bdca1030..fd31663e 100644 --- a/wscript +++ b/wscript @@ -395,6 +395,7 @@ def shutdown (): os.chdir ('..') elif Options.options.run: folder = os.path.dirname (Build.bld.env['waf_config_files'][0]) + folder = os.path.relpath (folder) try: ext = 'MIDORI_EXTENSION_PATH=' + folder + os.sep + 'extensions' nls = 'NLSPATH=' + folder + os.sep + 'po' From 4c2a3f5bb70804158ac2a18a744278f68e70fd8c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 23:08:52 +0200 Subject: [PATCH 1176/2970] Support custom sizes of icons in res_server --- data/speeddial-head.html | 3 +-- midori/sokoke.c | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 48ee2aff..842f6472 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -153,8 +153,7 @@ .activated p { cursor: text; - background: url({stock}/gtk-edit) 98% 70% no-repeat; - -webkit-background-size: 16px 15px; + background: url({stock}/16/gtk-edit) 98% 70% no-repeat; opacity: 0.6; color: rgba(0,0,0,1); } diff --git a/midori/sokoke.c b/midori/sokoke.c index 2909821c..301f3529 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1008,12 +1008,33 @@ res_server_handler_cb (SoupServer* res_server, else if (g_str_has_prefix (path, "/stock/")) { GtkIconTheme* icon_theme = gtk_icon_theme_get_default (); - const gchar* icon_name = &path[7]; - GdkPixbuf* icon = gtk_icon_theme_load_icon (icon_theme, icon_name, - strstr (icon_name, "dialog") ? 48 : 22, 0, NULL); + const gchar* icon_name = &path[7] ? &path[7] : ""; + gint icon_size = 22; + GdkPixbuf* icon; gchar* contents; gsize length; + if (g_ascii_isalpha (icon_name[0])) + icon_size = strstr (icon_name, "dialog") ? 48 : 22; + else if (g_ascii_isdigit (icon_name[0])) + { + guint i = 0; + while (icon_name[i]) + if (icon_name[i++] == '/') + { + gchar* size = g_strndup (icon_name, i - 1); + icon_size = atoi (size); + g_free (size); + icon_name = &icon_name[i]; + } + } + + icon = gtk_icon_theme_load_icon (icon_theme, icon_name, + icon_size, 0, NULL); + if (!icon) + icon = gtk_icon_theme_load_icon (icon_theme, "gtk-missing-image", + icon_size, 0, NULL); + gdk_pixbuf_save_to_buffer (icon, &contents, &length, "png", NULL, NULL); g_object_unref (icon); soup_message_set_response (msg, "image/png", SOUP_MEMORY_TAKE, From 3388c17f745db4a6061a6c4bbb0d19ae8b2be558 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 15 May 2009 23:10:48 +0200 Subject: [PATCH 1177/2970] Use stock close button instead of cross in speed dial I'm not entirely decided if it's better or worse, we'll see how it is and can revert if needed. --- data/speeddial-head.html | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 842f6472..621a0475 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -131,24 +131,19 @@ } .cross { - -webkit-border-radius: 7px; - background-color: #ddd; - height: 15px; - width: 15px; - font-size: 11px; - font-weight: bolder; - font-family: sans-serif; + height: 16px; + width: 16px; margin-bottom: -17px; - margin-left: 183px; + margin-left: 180px; margin-top: 2px; - text-align: center; - color: #fff; + background: url({stock}/16/gtk-close) 98% 70% no-repeat; cursor: pointer; z-index: -4; + opacity: 0.6; } .cross:hover { - background-color: #ff7575; + opacity: 1; } .activated p { @@ -210,7 +205,7 @@ a.empty ().removeClass ('waiter').grab (im); a.setProperty ('href', href); - var cross = new Element ('div', { 'html': 'x' }); + var cross = new Element ('div', { 'html': '' }); cross.setProperty ('onclick', 'clearShortcut("' + id + '");'); cross.addClass ('cross'); cross.inject ($(id), 'top'); @@ -313,7 +308,7 @@ { div.addClass ('activated'); var im = new Element ('img', { src: 'data:image/png;base64,' + item.img }); - var cross = new Element ('div', { 'html': 'x' }); + var cross = new Element ('div', { 'html': '' }); cross.setProperty ('onclick', 'clearShortcut("' + item.id + '");'); cross.addClass ('cross'); cross.inject (div, 'top'); From b6ea2941895849701baf47e4fa1584663f391c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Fri, 15 May 2009 23:47:32 +0200 Subject: [PATCH 1178/2970] Remove the search field from the speed dial --- data/speeddial-head.html | 54 +++++++++++----------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 621a0475..06943df5 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -11,7 +11,6 @@ +
+ {set_dial_width} + {set_shortcut_count} +
diff --git a/midori/midori-view.c b/midori/midori-view.c index 83f20352..1b8720d0 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3483,7 +3483,11 @@ midori_view_set_uri (MidoriView* view, "{click_to_add}", _("Click to add a shortcut"), "{enter_shortcut_address}", _("Enter shortcut address"), "{enter_shortcut_name}", _("Enter shortcut title"), - "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL); + "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), + "{set_dial_width}", _("Set number of columns"), + "{enter_dial_width}", _("Enter number of columns:"), + "{set_shortcut_count}", _("Set number of shortcuts"), + "{enter_shortcut_count}", _("Enter number of shortcuts:"), NULL); midori_view_load_alternate_string (view, From 046dbda868824138ca9e07d3a7d55f5ec962c434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Wed, 19 May 2010 08:29:31 +0200 Subject: [PATCH 2600/2970] l10n: Updated Czech (cs) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 432 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 230 insertions(+), 202 deletions(-) diff --git a/po/cs.po b/po/cs.po index 9093a71a..ec977fb8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-16 16:07+0000\n" +"POT-Creation-Date: 2010-05-19 04:07+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -245,777 +245,781 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Přidat do rychlého _přístupu" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s z %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5123 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5564 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "Nabídka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Smazat vše" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -1661,8 +1665,8 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4505 -#: ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:4513 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1813,45 +1817,61 @@ msgstr "Vložte název záložky" msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3512 +#: ../midori/midori-view.c:3487 +msgid "Set number of columns" +msgstr "Nastavit počet sloupců" + +#: ../midori/midori-view.c:3488 +msgid "Enter number of columns:" +msgstr "Vložte počet sloupců" + +#: ../midori/midori-view.c:3489 +msgid "Set number of shortcuts" +msgstr "Nastavit počet zkratek" + +#: ../midori/midori-view.c:3490 +msgid "Enter number of shortcuts:" +msgstr "Vložte počet zkratek" + +#: ../midori/midori-view.c:3516 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3539 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3785 +#: ../midori/midori-view.c:3789 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4045 +#: ../midori/midori-view.c:4049 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4050 +#: ../midori/midori-view.c:4054 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:4050 +#: ../midori/midori-view.c:4054 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-view.c:4056 +#: ../midori/midori-view.c:4060 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:4681 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4678 +#: ../midori/midori-view.c:4682 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4730 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Rozšíření" @@ -2095,6 +2115,14 @@ msgstr "Oddělovač" msgid "Console" msgstr "Konzola" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Kopírovat _vše" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Kopírovat vše" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Rozšíření" From 0e4658b6bd5b29f5a732e333c8347420b8de0101 Mon Sep 17 00:00:00 2001 From: Harald Servat Date: Wed, 19 May 2010 11:22:54 +0200 Subject: [PATCH 2601/2970] l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 996 +++++++++++++++++++++++++++---------------------------- 1 file changed, 488 insertions(+), 508 deletions(-) diff --git a/po/ca.po b/po/ca.po index 9bc54516..ede343d8 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,12 +4,12 @@ # This file is distributed under the same license as the midori package. # Carles Muñoz Gorriz , 2009-2010. # Harald Servat , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-04 16:07+0000\n" +"POT-Creation-Date: 2010-05-19 04:07+0000\n" "PO-Revision-Date: 2010-05-04 19:53+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -26,7 +26,7 @@ msgstr "Navegador web lleuger" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -87,20 +87,12 @@ msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" #: ../midori/main.c:868 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"No es disposa del certificat arrel. Els certificats SSL no es poden " -"verificar." +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "No es disposa del certificat arrel. Els certificats SSL no es poden verificar." #: ../midori/main.c:958 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha " -"ocorregut repetidament, proveu una de les següents opcions per a resoldre el " -"problema." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." #: ../midori/main.c:973 msgid "Modify _preferences" @@ -250,796 +242,790 @@ msgstr "Document format erròniament." msgid "Unrecognized bookmark format." msgstr "No es reconeix el format de l'adreça d'interès." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Afegeix al _marcador ràpid" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "S'ha descarregat el fitxer «%s»." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Transferència finalitzada" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" -#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Buit" -#: ../midori/midori-browser.c:3690 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948 +#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4570 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4572 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4574 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4710 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4746 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:5074 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la " -"segons els termes de la GNU Lesser General Public License tal com està " -"publicat per la Free Software Foundation; ja sigui a la versió 2.1, o " -"(segons la vostra tria) versió posterior." +#: ../midori/midori-browser.c:5123 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5564 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." -msgstr "" -"Inspecciona els detalls de la pàgina i accedeix a les eines per " -"desenvolupadors…" +msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6208 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6215 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:6279 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "Pàgines visitades _recentment" -#: ../midori/midori-browser.c:6281 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "Reobre pàgines que heu visitat anteriorment" -#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/midori-browser.c:6298 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:6342 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6344 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "Menú" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6548 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "Cerca en _línia:" -#: ../midori/midori-browser.c:6579 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6584 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "Següent" -#: ../midori/midori-browser.c:6589 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "Coincidència de majúscules i minúscules" -#: ../midori/midori-browser.c:6598 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "Ressalta les coincidències" -#: ../midori/midori-browser.c:6610 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "Tanca la barra de cerques" -#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Netejar-ho tot" -#: ../midori/midori-browser.c:7014 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" @@ -1069,624 +1055,615 @@ msgstr "No s'ha pogut executar la declaració de base de dades\n" msgid "Paste and p_roceed" msgstr "Enganxa i _procedeix" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Desenganxar el panell triat de la finestra" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Alinear el panell lateral a la dreta" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Tanca el quadre" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Alinear el panell lateral a l'esquerra" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Oculta els controls d'operació" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Mostra pàgina en blanc" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Mostra la pàgina d'inici" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Icones petites" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "Automàtic (GNOME o entorn)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "Sense servidor intermediari" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Totes les galetes" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Galetes de sessió" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Cap" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Recorda la mida de la darrera finestra" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "La posició emmagatzemada del darrer panell" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Mostra barra de fransferències" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "Si es mostrarà la barra de transferències" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "Mostrar el progrés a la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" -msgstr "" -"Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la " -"localització" +msgstr "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "Motors de cerca per a completar la cerca" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "Mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "Si s'ha de mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "Si s'ha d'alinear el panell lateral a la dreta" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Obre els quadres en finestres separades" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "Si s'ha d'obrir els quadres en finestres separades" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "Mostra un diàleg quan Midori falli" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Mostrar el marcador ràpid a les noves pestanyes" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Demanar per la carpeta destí" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "Informa quan una transferència hagi finalitzat" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si es mostra una notificació quan acabi una transferència" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "Gestor de descàrregues" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "Un gestor de descàrregues extern" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Obre les noves pàgines a:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "On s'han d'obrir les pàgines noves" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Obre pàgines externes a:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "On s'obren de forma externa les pàgines obertes" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" -msgstr "" -"Carregar una adreça des de la selecció mitjançant el botó central del ratolí" +msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Obre pestanyes al fons" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "Si s'ha d'obrir pestanyes al fons" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "Obre les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" +msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Obre els missatges emergents en pestanyes" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carrega les imatges automàticament" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "Carrega i mostra les imatges automàticament" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilita els scripts" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "Habilita els llenguatges d'script incrustats" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilita els connectors de netscape" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "Activar els objectes de connexió integrats de Netscape" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "Habilita la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "Habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "Si s'habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "Si es buscarà automàticament a mesura que s'escriu" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "Desplaçament cinètic" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" +msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Accepta galetes" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Quins tipus de galetes s'accepten" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Només galetes originals" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "Accepta només galetes del seu lloc web original" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "Edat màxima de la galeta" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "El nombre màxim de dies que es guardaran les galetes" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Recordar les darreres pàgines visitades" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "Si les darreres pàgines visitades es desaran" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "Edat màxima de l'historial" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Recordar els darrers fitxers descarregats" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "Tipus de servidor intermediari a fer servir" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "El servidor proxy usat per a les connexions HTTP" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "Detecta automàticament el servidor intermediari" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "Identifica'l com a" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "Idiomes preferits" -#: ../midori/midori-websettings.c:1129 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Un llistat separat per comes d'idiomes preferits per mostrar pàgines web " -"multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" +#: ../midori/midori-websettings.c:1124 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Un llistat separat per comes d'idiomes preferits per mostrar pàgines web multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "La selecció de dades privades per a esborrar" @@ -1694,197 +1671,213 @@ msgstr "La selecció de dades privades per a esborrar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482 -#: ../midori/midori-view.c:4486 +#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:4513 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1183 +#: ../midori/midori-view.c:1243 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1245 msgid "Try again" msgstr "Torneu-ho a provar" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1264 #, c-format msgid "Not found - %s" msgstr "No s'ha trobat «%s»" -#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303 +#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2176 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2142 +#: ../midori/midori-view.c:2177 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2183 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2186 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226 +#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261 msgid "_Save Link destination" msgstr "De_sa el destí de l'enllaç" -#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255 msgid "_Download Link destination" msgstr "_Descarrega el destí de l'enllaç" -#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2231 +#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2266 msgid "Download with Download _Manager" msgstr "Descarrega amb el _gestor de descàrregues" -#: ../midori/midori-view.c:2168 +#: ../midori/midori-view.c:2203 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2171 +#: ../midori/midori-view.c:2206 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2174 +#: ../midori/midori-view.c:2209 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2210 msgid "Download I_mage" msgstr "Descarrega la i_matge" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2217 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2220 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2220 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2248 +#: ../midori/midori-view.c:2283 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290 +#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:2346 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2643 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2662 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2665 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2645 +#: ../midori/midori-view.c:2669 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3179 +#: ../midori/midori-view.c:3217 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3482 msgid "Speed dial" msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3483 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3484 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3485 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3486 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3487 +msgid "Set number of columns" +msgstr "Estableix el nombre de columnes" + +#: ../midori/midori-view.c:3488 +msgid "Enter number of columns:" +msgstr "Introduïu el nombre de columnes:" + +#: ../midori/midori-view.c:3489 +msgid "Set number of shortcuts" +msgstr "Estableix el nombre de dreceres" + +#: ../midori/midori-view.c:3490 +msgid "Enter number of shortcuts:" +msgstr "Introduïeu el nombre de dreceres:" + +#: ../midori/midori-view.c:3516 #, c-format msgid "Document cannot be displayed" msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3539 #, c-format msgid "No documentation installed" msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3758 +#: ../midori/midori-view.c:3789 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4049 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4054 msgid "_Restore Tab" msgstr "_Restaura la pestanya" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4054 msgid "_Minimize Tab" msgstr "_Minimitza la pestanya" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4060 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:4681 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4682 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Característiques" @@ -1985,12 +1978,8 @@ msgstr "Diccionaris:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Una llista d'idiomes separats per coma que seran usats per a la correcció " -"ortogràfica, per exemple \"ca_ES,en_GB,de_DE\"" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Una llista d'idiomes separats per coma que seran usats per a la correcció ortogràfica, per exemple \"ca_ES,en_GB,de_DE\"" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2064,63 +2053,67 @@ msgstr "Gestiona els ginys de cerca" msgid "Use as _default" msgstr "Empra'l per _defecte" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Adreça d'interès" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "Afegeix adreça d'_interès" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "_Pàgina d'inici" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "Scripts d'_usuari" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Nova _pestanya" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "_Transferències" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "_Connectors de Netscape" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "Nova _carpeta" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separador" @@ -2128,6 +2121,14 @@ msgstr "Separador" msgid "Console" msgstr "Consola" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copia _tot" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copia tot" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensions" @@ -2137,8 +2138,7 @@ msgid "Erroneous clock time" msgstr "Rellotge erroni" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." +msgid "The clock time lies in the past. Please check the current date and time." msgstr "El rellotge menteix. Si us plau, comproveu la data i hora actual." #: ../panels/midori-history.c:286 @@ -2164,28 +2164,28 @@ msgstr "Ahir" msgid "Are you sure you want to remove all history items?" msgstr "Voleu esborrar tots els elements de l’historial?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Afegeix l'element seleccionat de l'historial a les adreces d'interès" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Esborra l'element de l'historial seleccionat" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Buida l'historial" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtre:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "_Obre la carpeta destí" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Copia la _localització de l'enllaç" @@ -2245,44 +2245,40 @@ msgstr "Seleccioneu carpeta" msgid "Preferences for %s" msgstr "Preferències per a %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configura els filtres de publicitat" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i " -"premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Configura els filtres de _publicitat…" -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Edita la regla" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_oca imatge" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_oca enllaç" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Bloqueig de publicitat" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Bloca els anuncis publicitaris segons una llista de filtres" @@ -2335,12 +2331,8 @@ msgid "Delete All" msgstr "Suprimeix-ho tot" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Esborra totes les galetes mostrades. Si hi ha un filtre establert, només " -"aquelles galetes que coincideixin amb el filtre s'esborraran." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Esborra totes les galetes mostrades. Si hi ha un filtre establert, només aquelles galetes que coincideixin amb el filtre s'esborraran." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2413,12 +2405,8 @@ msgid "_Collapse All" msgstr "_Plega-ho tot" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que " -"coincideixi amb el filtre" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que coincideixi amb el filtre" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2609,20 +2597,15 @@ msgstr "Pestanya amb la llista de l'historial" #: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" +msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "_Personalitza la barra d'eines" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Selecciona els elements mostrats a la barra d'eines. Els elements poden ser " -"ordenats arrossegant-los." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Selecciona els elements mostrats a la barra d'eines. Els elements poden ser ordenats arrossegant-los." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2648,11 +2631,8 @@ msgstr "Edita fàcilment la distribució de la barra d'eines" msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a " -#~ "la carpeta %s." +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a la carpeta %s." #~ msgid "Open _Link" #~ msgstr "Obre l'_enllaç" From 4ec0309662f9da27d7c4ecce96aaab6aecb3b7a5 Mon Sep 17 00:00:00 2001 From: Xu Meihong Date: Wed, 19 May 2010 15:21:43 +0200 Subject: [PATCH 2602/2970] l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/zh_CN.po | 891 +++++++++++++++++++++++++++------------------------- 1 file changed, 461 insertions(+), 430 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index eb487920..f6c2dbe4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,13 +3,12 @@ # This file is distributed under the same license as the midori package. # Stanley Zhang , 2009. # Hunt Xu , 2009, 2010. - msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-04 04:07+0000\n" -"PO-Revision-Date: 2010-05-04 12:18+0800\n" +"POT-Creation-Date: 2010-05-19 10:07+0000\n" +"PO-Revision-Date: 2010-05-19 21:27+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -23,7 +22,7 @@ msgstr "轻量的网页浏览器" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -244,262 +243,266 @@ msgstr "异常的文件。" msgid "Unrecognized bookmark format." msgstr "不能识别的书签格式。" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "写入失败。" -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "更新标题失败: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'。" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "标题(_T):" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "添加到快速拨号(_S)" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "在工具栏中显示(_B)" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "作为 web 应用程序运行(_W)" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "可用空间不足以下载 \"%s\"。" -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "该文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "已下载 %s，共 %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "文件 '%s' 已下载。" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "下载完成" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "新建订阅" -#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3690 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "无法运行外部程序。" -#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948 +#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "添加新历史项目失败: %s\n" -#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4570 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4572 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4574 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "导入书签..." -#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "应用程序(_A):" -#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "定制..." -#: ../midori/midori-browser.c:4710 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "导入书签失败" -#: ../midori/midori-browser.c:4746 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "导出书签失败" -#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "关闭的标签页(_C)" -#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "网页缓存" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "退出 Midori 前清除隐私数据(_Q)" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "轻量级的网页浏览器." -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:5123 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -510,525 +513,525 @@ msgstr "" "条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选" "择）更新的版本。" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" "Hunt Xu , 2009, 2010." -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "打开一个新标签" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "隐私浏览(_R)" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "添加到快速拨号(_D)" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" msgstr "添加快捷方式到桌面(_D)" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" msgstr "添加快捷方式到桌面" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "添加到新闻订阅(_F)" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "添加到此新闻订阅" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "撤销上个改动" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "重复上个修改" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "剪切" -#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "复制" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "从剪贴板粘贴" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "删除" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "全选" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "在页面中查找" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "查找该词或短语出现的下一处地方" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "查找该词或短语出现的上一处地方" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "放大" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "缩小" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "恢复默认大小" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "查看页面的源代码" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "切换全屏" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5564 msgid "Scroll to the left" msgstr "向左滚动" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "向下滚动" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "向上滚动" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "向右滚动" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "前进(_G)" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "转到下一页" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "返回上个子页" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "转到下个子页" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "删除回收站中的内容" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "打开最后关闭的标签" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "添加新目录(_F)" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "添加、编辑和移除搜索引擎..." -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "清除隐私数据..." -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." msgstr "检查页面详细信息并使用开发者工具..." -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "上一个标签(_P)" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "转到上一个标签" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "下一个标签(_N)" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "转到下一个标签" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "聚焦到当前标签页(_C)" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "聚焦到当前标签页" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "打开上次运行时的标签页" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "显示 FAQ" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "报告 Bug(_R)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "侧栏(_P)" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "显示侧栏" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "朝鲜语 (EUC-KR)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:6208 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:6215 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "位置(_L)..." -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "搜索网页(_W)..." -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "运行网页搜索" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签或窗口" -#: ../midori/midori-browser.c:6279 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:6281 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:6298 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:6342 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:6344 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "菜单" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6548 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "在文中查找(_I):" -#: ../midori/midori-browser.c:6579 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:6584 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:6589 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:6598 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:6610 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "清除所有项目" -#: ../midori/midori-browser.c:7014 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" @@ -1058,607 +1061,607 @@ msgstr "执行数据库操作失败\n" msgid "Paste and p_roceed" msgstr "粘贴并转到(_R)" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "从窗口中分离选择的面板" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "侧栏在右" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "关闭侧栏" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "侧栏在左" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "隐藏操作控件" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "显示空白页面" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "显示主页" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "显示最后打开的标签" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "日语 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "新建标签" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "当前标签" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "默认" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "小图标" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "图标和文字" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "文字在图标旁" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "自动 (GNOME 或其他桌面环境)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "不使用代理服务器" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "所有 Cookies" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "无" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "记住上次窗口的大小" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "上次窗口的宽度" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "上次窗口的高度" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "上次的侧栏位置" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "上次保存的侧栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "上次的侧栏页" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "上次保存的侧栏页" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "上次使用的 Web 搜索" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "上次保存的 Web 搜索" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "显示侧栏" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "是否显示侧栏" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "显示传输栏" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "是否显示传输栏" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "工具栏样式:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "在地址栏中显示进度" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "是否在地址栏中显示加载进度" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "是否在地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "工具栏中的项目" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "在工具栏中显示的项目" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "紧凑侧栏" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "是否让侧栏紧凑显示" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "显示面板的操作控件" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "是否显示面板的操作控件" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "侧栏在右" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "是否让侧栏摆放到右侧" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "在单独窗口中打开面板" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "是否总是在单独窗口中打开面板" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "当 Midori 启动时:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Midori 启动时做什么" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "主页:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "显示崩溃提示对话框" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "当 Midori 崩溃后显示提示对话框" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "在新标签中显示快速拨号" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "在新标签中显示快速拨号" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "保存下载的文件到:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "下载的文件将保存到此目录" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "询问保存目录" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "是否在下载文件时询问保存目录" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "下载完成后显示提示" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "是否在下载完成时显示提示信息" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "下载管理器" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "外部的下载管理器" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "外部的文本编辑器" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "新闻聚合器" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "外部的新闻聚合查看器" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "地址栏查找" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "在地址栏中执行的查找" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "首选的编码" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "首选的字符编码集" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "在标签上显示关闭按钮" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "是否在标签上显示关闭按钮" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "在...打开新的页面:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "在哪里打开新的页面" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "在...打开外部页面:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "在哪里打开外部页面" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "鼠标中键打开所选地址" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "用鼠标中键单击打开选中地址" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "在后台打开新标签" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开新标签" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "在当前标签后打开新标签" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "选择在当前标签后或者在最后的标签后打开新标签" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "弹出窗口在新标签中打开" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "弹出窗口是否在新标签中打开" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "自动加载图像" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "启用网页中的脚本" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "启用 Netscape 插件" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "启用嵌入的 Netscape 插件对象" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "是否启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "是否启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "启用离线 web 应用程序缓存" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "是否启用离线 web 应用程序缓存" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "缩放文字和图像" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "是否缩放文字和图像" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "输入时回忆" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "是否输入时自动查找" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "惯性滚动" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "是否根据拖拽速度惯性滚动页面" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "接收 Cookies" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "接收什么类型的 Cookies" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "只接收原始 Cookies" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "只接收原始网站的 Cookies" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "最长 Cookie 有效期" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "最长 Cookie 保存天数" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "记录上次访问的页面" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "是否记录上次访问的页面" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "最长历史有效期" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "最长历史保存天数" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "记录上次下载的文件" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "是否保存上次下载的文件" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "使用的代理服务器类型" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "自动检测代理服务器" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "是否自动检测系统环境中的代理服务器设置" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "让页面识别为什么" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "首选语言" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1124 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1666,11 +1669,11 @@ msgstr "" "一个由逗号分隔的语言列表，以选择显示多语言网页时的首选语言，例如 \"de\"，" "\"ru,nl\" 或者 \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "清除隐私数据" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "选中要删除的隐私数据" @@ -1678,197 +1681,213 @@ msgstr "选中要删除的隐私数据" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482 -#: ../midori/midori-view.c:4486 +#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:4513 #, c-format msgid "Error - %s" msgstr "错误 - %s" -#: ../midori/midori-view.c:1183 +#: ../midori/midori-view.c:1243 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "网页 '%s' 无法打开。" -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1245 msgid "Try again" msgstr "重试" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1264 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303 +#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338 #, c-format msgid "Send a message to %s" msgstr "发送消息到 %s" -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500 msgid "Inspect _Element" msgstr "检查网页元素(_E)" -#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242 msgid "Open Link in New _Tab" msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2176 msgid "Open Link in _Foreground Tab" msgstr "在前台标签页中打开链接(_F)" -#: ../midori/midori-view.c:2142 +#: ../midori/midori-view.c:2177 msgid "Open Link in _Background Tab" msgstr "在后台标签中打开链接(_B)" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2183 msgid "Open Link as Web A_pplication" msgstr "将链接作为 Web 应用程序运行(_P)" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2186 msgid "Copy Link de_stination" msgstr "复制链接目标(_S)" -#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226 +#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2231 +#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2266 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:2168 +#: ../midori/midori-view.c:2203 msgid "Open _Image in New Tab" msgstr "在新标签页中打开图像(_I)" -#: ../midori/midori-view.c:2171 +#: ../midori/midori-view.c:2206 msgid "Copy Image _Address" msgstr "复制图像地址(_A)" -#: ../midori/midori-view.c:2174 +#: ../midori/midori-view.c:2209 msgid "Save I_mage" msgstr "保存图像文件(_M)" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2210 msgid "Download I_mage" msgstr "下载图像(_M)" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2217 msgid "Copy Video _Address" msgstr "复制视频地址(_A)" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2220 msgid "Save _Video" msgstr "保存视频文件(_V)" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2220 msgid "Download _Video" msgstr "下载视频文件(_V)" -#: ../midori/midori-view.c:2248 +#: ../midori/midori-view.c:2283 msgid "Search _with" msgstr "使用...搜索(_W)" -#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290 +#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325 msgid "_Search the Web" msgstr "搜索网页(_S)" -#: ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:2346 msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2643 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2662 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2665 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2645 +#: ../midori/midori-view.c:2669 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3179 +#: ../midori/midori-view.c:3217 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3482 msgid "Speed dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3483 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3484 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3485 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3486 msgid "Are you sure you want to delete this shortcut?" msgstr "确认删除此快捷方式？" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3487 +msgid "Set number of columns" +msgstr "设置列数" + +#: ../midori/midori-view.c:3488 +msgid "Enter number of columns:" +msgstr "输入列数:" + +#: ../midori/midori-view.c:3489 +msgid "Set number of shortcuts" +msgstr "设置快捷方式数目" + +#: ../midori/midori-view.c:3490 +msgid "Enter number of shortcuts:" +msgstr "输入快捷方式数:" + +#: ../midori/midori-view.c:3516 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3539 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-view.c:3758 +#: ../midori/midori-view.c:3789 msgid "Blank page" msgstr "空白页" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4049 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4054 msgid "_Restore Tab" msgstr "恢复标签(_R)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4054 msgid "_Minimize Tab" msgstr "最小化标签(_M)" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4060 msgid "Close ot_her Tabs" msgstr "关闭其他标签(_H)" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:4681 msgid "Print background images" msgstr "打印背景图片" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4682 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图片" -#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381 msgid "Features" msgstr "特性" @@ -2046,63 +2065,67 @@ msgstr "管理搜索引擎" msgid "Use as _default" msgstr "作为默认(_D)" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "添加书签(_K)" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "扩展(_E)" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "历史(_H)" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "新建标签(_T)" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "Netscape 插件(_L)" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "新建目录(_F)" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "添加新书签目录" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "分隔符" @@ -2110,6 +2133,14 @@ msgstr "分隔符" msgid "Console" msgstr "控制台" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "复制全部内容(_A)" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "复制全部内容" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "扩展" @@ -2145,28 +2176,28 @@ msgstr "昨天" msgid "Are you sure you want to remove all history items?" msgstr "确认删除所有的历史项？" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "将选中的历史项加入书签" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "删除选中的历史项" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "清空全部历史" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "过滤器(_F):" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "打开保存文件目录(_F)" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "复制链接地址(_A)" @@ -2226,11 +2257,11 @@ msgstr "选择目录" msgid "Preferences for %s" msgstr "%s 的首选项" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "设置广告过滤器" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2239,31 +2270,31 @@ msgstr "" "在文本输入框中输入预设过滤器列表的地址，然后点击“添加”加入此列表。您可以在 %" "s 找到更多列表。" -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "设置广告过滤器(_A)..." -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "编辑规则" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "规则(_R):" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "屏蔽图像(_O)" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "屏蔽链接(_O)" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "广告拦截器" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "使用过滤列表拦截广告" From f04c7ef76dc597420a6174ba61db952b135fdcc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Sok=C3=B3=C5=82?= Date: Wed, 19 May 2010 22:47:56 +0200 Subject: [PATCH 2603/2970] l10n: Updated Polish (pl) translation to 90% New status: 558 messages complete with 18 fuzzies and 42 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pl.po | 1194 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 622 insertions(+), 572 deletions(-) diff --git a/po/pl.po b/po/pl.po index ba1a3d6d..351735c9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-25 10:06+0000\n" -"PO-Revision-Date: 2010-04-25 15:16+0100\n" -"Last-Translator: Piotr Sokół \n" +"POT-Creation-Date: 2010-05-19 16:07+0000\n" +"PO-Revision-Date: 2010-05-19 22:37+0100\n" +"Last-Translator: Piotr Sokół \n" "Language-Team: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +23,11 @@ msgid "Lightweight web browser" msgstr "Lekka przeglądarka internetowa" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1342 -#: ../midori/main.c:1670 -#: ../midori/main.c:1678 -#: ../midori/main.c:1694 -#: ../midori/midori-websettings.c:318 +#: ../midori/main.c:1336 +#: ../midori/main.c:1664 +#: ../midori/main.c:1672 +#: ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -35,206 +35,206 @@ msgstr "Midori" msgid "Web Browser" msgstr "Przeglądarka internetowa" -#: ../midori/main.c:103 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Nie można wczytać ustawień: %s\n" -#: ../midori/main.c:152 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wartość „%s” nie jest poprawna dla %s" -#: ../midori/main.c:159 -#: ../midori/main.c:245 +#: ../midori/main.c:158 +#: ../midori/main.c:244 #, fuzzy, c-format msgid "Invalid configuration value '%s'" msgstr "Błędna wartość konfiguracyjna „%s”" -#: ../midori/main.c:371 +#: ../midori/main.c:370 #: ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Nie udało się uzyskać dostępu do bazy danych: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:426 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nie udało się usunąć przestarzałych elementów historii: %s\n" -#: ../midori/main.c:446 +#: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Ustawienia nie mogą zostać zapisane. %s" +msgstr "Nie można zapisać ustawień. %s" -#: ../midori/main.c:484 +#: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Wyszukiwarki internetowe nie mogą być zapisane. %s" +msgstr "Nie można zapisać wyszukiwarek internetowych. %s" -#: ../midori/main.c:503 -#: ../midori/main.c:553 -#: ../midori/main.c:573 +#: ../midori/main.c:502 +#: ../midori/main.c:552 +#: ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Zakładki nie mogą zostać zapisane. %s" +msgstr "Nie można zapisać zakładek. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:603 -#: ../midori/main.c:626 +#: ../midori/main.c:602 +#: ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Lista ostatnio zamkniętych kart i okien nie może zostać zapisana. %s" +msgstr "Nie można zapisać listy ostatnio zamkniętych kart i okien. %s" -#: ../midori/main.c:690 -#: ../midori/main.c:930 +#: ../midori/main.c:684 +#: ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Sesja nie może zostać zapisana. %s" +msgstr "Nie można zapisać sesji. %s" -#: ../midori/main.c:874 +#: ../midori/main.c:868 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/main.c:964 +#: ../midori/main.c:958 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Program uległ awarii odkąd został uruchomiony ostatni raz. Jeżeli problem się powtarza, należy spróbować poniższych opcji w celu rozwiązania problemu." -#: ../midori/main.c:979 +#: ../midori/main.c:973 msgid "Modify _preferences" msgstr "Zmodyfikuj p_referencje" -#: ../midori/main.c:983 +#: ../midori/main.c:977 msgid "Reset the last _session" msgstr "Przywróć ostatnią _sesję" -#: ../midori/main.c:988 +#: ../midori/main.c:982 msgid "Disable all _extensions" msgstr "Wyłącz wszystkie _wtyczki" -#: ../midori/main.c:1223 -#: ../midori/main.c:1943 +#: ../midori/main.c:1217 +#: ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Nie można wczytać sesji: %s\n" -#: ../midori/main.c:1342 +#: ../midori/main.c:1336 msgid "No filename specified" msgstr "Nie podano pliku" -#: ../midori/main.c:1361 +#: ../midori/main.c:1355 msgid "An unknown error occured." msgstr "Wystąpił nieznany błąd." -#: ../midori/main.c:1392 +#: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Kopia strony zapisana jako: %s\n" -#: ../midori/main.c:1563 +#: ../midori/main.c:1557 msgid "Run ADDRESS as a web application" msgstr "Uruchamia ADRES jako aplikację internetową" -#: ../midori/main.c:1563 +#: ../midori/main.c:1557 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1566 +#: ../midori/main.c:1560 msgid "Use FOLDER as configuration folder" msgstr "Używa KATALOGU do przechowywania konfiguracji programu" -#: ../midori/main.c:1566 +#: ../midori/main.c:1560 msgid "FOLDER" msgstr "KATALOG" -#: ../midori/main.c:1569 +#: ../midori/main.c:1563 msgid "Show a diagnostic dialog" msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii" -#: ../midori/main.c:1571 +#: ../midori/main.c:1565 msgid "Run the specified filename as javascript" msgstr "Uruchamia określony plik jako skrypt javascript" -#: ../midori/main.c:1574 +#: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" msgstr "Wykonuje migawkę podanego adresu URI" -#: ../midori/main.c:1577 +#: ../midori/main.c:1571 msgid "Execute the specified command" msgstr "Wykonuje wprowadzone polecenie" -#: ../midori/main.c:1579 +#: ../midori/main.c:1573 msgid "Display program version" msgstr "Wypisuje wersję programu" -#: ../midori/main.c:1581 +#: ../midori/main.c:1575 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1583 +#: ../midori/main.c:1577 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokuje adresy URI określone przez WZORZEC" -#: ../midori/main.c:1583 +#: ../midori/main.c:1577 msgid "PATTERN" msgstr "WZORZEC" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1587 +#: ../midori/main.c:1581 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1587 +#: ../midori/main.c:1581 #, fuzzy msgid "SECONDS" msgstr "SEKUND" -#: ../midori/main.c:1667 +#: ../midori/main.c:1661 msgid "[Addresses]" msgstr "[ADRES...]" -#: ../midori/main.c:1695 +#: ../midori/main.c:1689 msgid "Please report comments, suggestions and bugs to:" msgstr "Prosimy o zgłaszanie uwag, sugestii i błędów na adres:" -#: ../midori/main.c:1697 +#: ../midori/main.c:1691 msgid "Check for new versions at:" msgstr "Sprawdź nową wersję na:" -#: ../midori/main.c:1794 +#: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." msgstr "Podany katalog konfiguracyjny jest niepoprawny" -#: ../midori/main.c:1842 +#: ../midori/main.c:1836 msgid "An instance of Midori is already running but not responding.\n" msgstr "Pogram Midori jest już uruchomiony lecz nie odpowiada.\n" -#: ../midori/main.c:1897 +#: ../midori/main.c:1891 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Nie można wczytać wyszukiwarek internetowych. %s\n" -#: ../midori/main.c:1926 +#: ../midori/main.c:1920 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Nie można wczytać zakładek: %s\n" -#: ../midori/main.c:1958 +#: ../midori/main.c:1952 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Nie można wczytać listy ostatnio zamkniętych kart i okien: %s\n" -#: ../midori/main.c:1972 +#: ../midori/main.c:1966 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Nie można wczytać historii: %s\n" -#: ../midori/main.c:1986 +#: ../midori/main.c:1980 msgid "The following errors occured:" msgstr "Napotkano błędy:" -#: ../midori/main.c:2002 +#: ../midori/main.c:1996 msgid "_Ignore" msgstr "_Ignoruj" @@ -253,129 +253,143 @@ msgid "Unrecognized bookmark format." msgstr "Nierozpoznany format zakładek." #: ../midori/midori-array.c:718 -#: ../midori/sokoke.c:1120 +#: ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Zapisywanie nie udało się." -#: ../midori/midori-browser.c:333 -#: ../midori/midori-browser.c:5435 -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:336 +#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "Wczytuje ponownie bieżącą stronę" -#: ../midori/midori-browser.c:343 -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:346 +#: ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "Zatrzymuje wczytywanie bieżącej strony" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "wczytano %d%%" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Nie udało się zaktualizować tytułu: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Niespodziewana czynność „%s”." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nowy katalog" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Edytuj katalog" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nowa zakładka" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Edytuj zakładkę" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Tytuł:" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:774 #: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-browser.c:781 +#: ../midori/midori-browser.c:793 #: ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adres:" -#: ../midori/midori-browser.c:811 -#: ../midori/midori-browser.c:4590 +#: ../midori/midori-browser.c:823 +#: ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "_Katalog:" -#: ../midori/midori-browser.c:821 -#: ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4595 -#: ../midori/midori-browser.c:4627 +#: ../midori/midori-browser.c:833 +#: ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "Katalog główny" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Dodaj do strony _szybkiego wybierania" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Wyświetlanie na pasku _narzędziowym" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Uruchamianie jako _aplikacja internetowa" -#: ../midori/midori-browser.c:981 -#: ../midori/midori-browser.c:4645 -#: ../midori/midori-browser.c:4677 +#: ../midori/midori-browser.c:986 +#, fuzzy, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Nie ma wystarczająco dużo przestrzeni aby pobrać „%s”." + +#: ../midori/midori-browser.c:990 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1047 +#: ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:1355 -#: ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 +#: ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "" -#: ../midori/midori-browser.c:1391 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Plik „%s” został pobrany." -#: ../midori/midori-browser.c:1395 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Pobieranie zakończone" -#: ../midori/midori-browser.c:1535 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2260 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2336 +#: ../midori/midori-browser.c:2425 #: ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nowy kanał wiadomości" -#: ../midori/midori-browser.c:2377 -#: ../midori/midori-browser.c:5500 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2466 +#: ../midori/midori-browser.c:5603 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaje nową zakładkę" -#: ../midori/midori-browser.c:2935 +#: ../midori/midori-browser.c:3039 #: ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 @@ -383,97 +397,96 @@ msgstr "Dodaje nową zakładkę" msgid "Failed to execute database statement: %s\n" msgstr "Nie udało się wykonać zapytania: %s\n" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3119 #: ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Puste" -#: ../midori/midori-browser.c:3636 -#: ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 -#: ../midori/sokoke.c:441 -#: ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3740 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nie można uruchomić zewnętrznego programu" -#: ../midori/midori-browser.c:3950 -#: ../midori/midori-browser.c:5894 +#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nie udało się dodać nowego elementu historii: %s\n" -#: ../midori/midori-browser.c:4283 -#: ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4387 +#: ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otwórz wszystkie w nowych _kartach" -#: ../midori/midori-browser.c:4290 -#: ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 +#: ../midori/midori-browser.c:4394 +#: ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 #: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-browser.c:4293 -#: ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 +#: ../midori/midori-browser.c:4397 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 #: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-browser.c:4516 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4518 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4519 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4520 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4541 -#: ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "Importowanie zakładek" -#: ../midori/midori-browser.c:4544 -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:4648 +#: ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "_Zaimportuj zakładki" -#: ../midori/midori-browser.c:4555 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4582 -#: ../midori/midori-browser.c:5609 -#: ../midori/midori-websettings.c:232 -#: ../midori/midori-websettings.c:323 -#: ../katze/katze-utils.c:688 +#: ../midori/midori-browser.c:4686 +#: ../midori/midori-browser.c:5712 +#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Dostosuj..." -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "Nie udało się zaimportować zakładek" -#: ../midori/midori-browser.c:4692 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "Nie udało się wyeksportować zakładek" -#: ../midori/midori-browser.c:4746 +#: ../midori/midori-browser.c:4850 #: ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format @@ -481,588 +494,588 @@ msgid "Failed to remove history item: %s\n" msgstr "Nie udało się usunąć elementu historii: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4853 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "Usuwanie danych" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "_Usuń prywatne dane" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "Prywatne dane:" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4986 #: ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historia" -#: ../midori/midori-browser.c:4888 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "Ciasteczka" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "Ciasteczka „Flash”" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "Ikony stron internetowych" -#: ../midori/midori-browser.c:4903 -#: ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5007 +#: ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zamknięte karty" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:5012 #: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Pamięć podręczna" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "Usunięcie danych podczas _kończenia programu" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "Lekka przeglądarka internetowa" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5123 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ta biblioteka jest wolnym oprogramowaniem; można ją rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub którejś z późniejszych wersji." -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "" "Przemysław Sitek \n" "Piotr Sokół " -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "_Plik" -#: ../midori/midori-browser.c:5350 -#: ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5453 +#: ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Nowe okno" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "Otwiera nowe okno programu" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "Otwiera nową kartę" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "Tryb p_rywatny" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "Nie zapisuje żadnych prywatnych danych podczas przeglądania stron" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "Otwiera plik strony" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "Zapisuje stronę do pliku" -#: ../midori/midori-browser.c:5366 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "Dodaj do strony _szybkiego wybierania" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "Dodaje odnośnik do strony szybiego wybierania" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" -msgstr "" +msgstr "Dodaj do strony _szybiego wybierania" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" -msgstr "" +msgstr "Dodaj do strony szybkiego wybierania" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "Zamyka bieżącą kartę" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "Za_mknij okno" -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "Zamyka bieżące okno" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "Drukuje bieżącą stronę" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "Kończy działanie programu" -#: ../midori/midori-browser.c:5390 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "_Edycja" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "Cofa ostatnie działanie" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "Powtarza ostatnie działanie" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "Wycina zaznaczony tekst" -#: ../midori/midori-browser.c:5404 -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "Kopiuje zaznaczony tekst" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "Wkleja tekst ze schowka" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "Usuwa zaznaczony tekst" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "Zaznacz w_szystko" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "Wyszukuje słowa lub wyrażenia na stronie" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "Znajdź _następne" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "Wyszukuje następne wystąpienie słowa lub wyrażenia" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "Znajdź _poprzednie" -#: ../midori/midori-browser.c:5425 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "Wyszukuje poprzednie wystąpienie słowa lub wyrażenia" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "Konfiguruje preferencje programu" -#: ../midori/midori-browser.c:5431 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "_Widok" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "Powiększa rozmiar strony" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "Zmniejsza rozmiar strony" -#: ../midori/midori-browser.c:5450 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "Przywraca pierwotny rozmiar strony" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "_Kodowanie znaków" -#: ../midori/midori-browser.c:5453 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "Wyświetl ź_ródło" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "Wyświetla kod źródłowy strony" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "Przełącza widok trybu pełnoekranowego" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5564 #, fuzzy msgid "Scroll to the left" msgstr "Przełącz na następną kartę" -#: ../midori/midori-browser.c:5463 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "P_rzejdź" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "Przechodzi do poprzedniej odwiedzonej strony" -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "Przechodzi do następnej odwiedzonej strony" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "Przechodzi do poprzedniej strony podrzędnej" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "Przechodzi do następnej strony podrzędnej" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "Przechodzi do strony głównej przeglądarki" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "Wyczyść listę" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "Czyści listę ostatnio zamkniętych kart i okien" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "Cofnij _zamknięcie karty" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "Otwórz ostatnio zamkniętą kartę" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "Utwórz _katalog" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "Dodaj nowy katalog zakładek" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "_Eksportuj..." -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5614 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami..." -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "Zarządza wyszukiwarkami internetowymi" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "_Usuń dane prywatne..." -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "Usuwa prywatne dane zapisane przez program..." -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "_Analizuj stronę..." -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." msgstr "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia programistyczne" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "Przełącz na poprzednią kartę" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "_Następna karta" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "Przełącz na następną kartę" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "Zaznacz _bieżącą kartę" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "Uaktywnia bieżącą kartę przeglądarki" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "Przywróć ostatnią _sesję" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "Otwiera karty zapisane podczas ostatniej sesji" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "Pomo_c" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "_Spis treści" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "Wyświetla pomoc dotyczącą programu" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "_Często zadawane pytania" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "Wyświetla najczęściej zadawane pytania" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "_Zgłoś problem" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "Otwiera stronę systemu zgłaszania i monitorowania błędów" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "Wyświetla informacje na temat programu" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "Pasek _menu" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "Przełącza widoczność paska menu" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "Przełącza widoczność paska narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "Panel _boczny" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "Przełącza widoczność panelu bocznego" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "Przełącza widoczność paska zakładek" -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "_Pasek pobierania plików" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "Przełącza widoczność paska pobierania plików" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "Przełącza widoczność paska stanu" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "Wybór _automatyczny" -#: ../midori/midori-browser.c:5590 -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5693 +#: ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chiński tradycyjny (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-browser.c:5597 -#: ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5700 +#: ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreański (EUC-KR)" -#: ../midori/midori-browser.c:5600 -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5703 +#: ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Rosyjski (KOI8-R)" -#: ../midori/midori-browser.c:5603 -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5706 +#: ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5606 -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5709 +#: ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Zachodni (ISO-8859-1)" -#: ../midori/midori-browser.c:6154 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6161 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "_Położenie" -#: ../midori/midori-browser.c:6163 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "Otwiera wprowadzone położenie" -#: ../midori/midori-browser.c:6187 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "_Wyszukiwarka" -#: ../midori/midori-browser.c:6189 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej" -#: ../midori/midori-browser.c:6210 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "Wyświetla listę ostatnio zamkniętych kart i okien" -#: ../midori/midori-browser.c:6225 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "_Ostatnio odwiedzone strony" -#: ../midori/midori-browser.c:6227 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "Wyświetla listę ostatnio odwiedzonych stron" -#: ../midori/midori-browser.c:6242 -#: ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6345 +#: ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zakładki" -#: ../midori/midori-browser.c:6244 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "Wyświetla zapisane zakładki" -#: ../midori/midori-browser.c:6259 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "_Narzędzia" -#: ../midori/midori-browser.c:6272 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6274 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "Wyświetla listę otwartych kart" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "Wyświetla listę poleceń paska menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6494 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "_Wyszukiwanie:" -#: ../midori/midori-browser.c:6525 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "Poprzednie" -#: ../midori/midori-browser.c:6530 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "Następne" -#: ../midori/midori-browser.c:6535 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "Uwzględnianie wielkości liter" -#: ../midori/midori-browser.c:6544 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "Wyróżnianie" -#: ../midori/midori-browser.c:6556 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "Zamyka pasek wyszukiwania" -#: ../midori/midori-browser.c:6602 -#: ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6705 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Wyczyść wszystko" -#: ../midori/midori-browser.c:6960 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "Niespodziewane ustawienie „%s”" @@ -1092,631 +1105,630 @@ msgstr "Nie udało się wykonać zapytania: %s\n" msgid "Paste and p_roceed" msgstr "Wklej i p_rzejdź" -#: ../midori/midori-panel.c:433 -#: ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 +#: ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Odłącza panel od okna" -#: ../midori/midori-panel.c:445 -#: ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 -#: ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 +#: ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 +#: ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Umieszcza panel boczy po prawej stronie okna" +#: ../midori/midori-panel.c:456 #: ../midori/midori-panel.c:457 -#: ../midori/midori-panel.c:458 msgid "Close panel" msgstr "Zamyka panel" -#: ../midori/midori-panel.c:641 -#: ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 +#: ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Umieszcza panel boczy po lewej stronie okna" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Przełącza widoczność przycisków konfiguracyjnych panelu" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Wyświetlanie pustej strony" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Wyświetlanie strony głównej" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Wyświetlanie ostatnio otwartych kart" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "W nowej karcie" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "W nowym oknie" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "W bieżącej karcie" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Domyślny" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Tylko ikony" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Małe ikony" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Tylko tekst" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Etykiety poniżej ikon" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Etykiety obok ikon" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "Ustawienia środowiska" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "Serwer pośredniczący HTTP" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "Brak" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Wszystkie" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Bieżącej sesji" -#: ../midori/midori-websettings.c:303 -#: ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:664 +#: ../midori/midori-websettings.c:298 +#: ../katze/katze-utils.c:667 msgid "None" msgstr "Żadne" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Pamiętaj ostatni rozmiar okna" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "Zapamiętuje ostatni rozmiar okna programu" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Ostatnia szerokość okna" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Ostatnia zapisana szerokość okna" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "Ostatnia wysokość okna" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Ostatnia zapisana wysokość okna" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Ostatnia pozycja panelu" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Ostatnio zapisana pozycja panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 #, fuzzy msgid "Show Menubar" msgstr "Wyświetlanie paska menu" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 #, fuzzy msgid "Whether to show the menubar" msgstr "Otwieranie nowych kart w tle" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 #, fuzzy msgid "Show Navigationbar" msgstr "Wyświetlanie paska nawigacji" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Pokaż panel" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Pasek pobierania plików" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 #, fuzzy msgid "Whether to show the transferbar" msgstr "Otwieraj nowe karty w tle" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Pasek _stanu" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "Wygląd:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "Określa styl paska narzędzi" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "Pasek postępu wczytywania strony" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "Wyświetla pasek postępu wczytywania strony w pasku adresu" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "Wyszukiwarki na liście paska adresu" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "Wyświetla wyszukiwarki na liście automatycznego uzupełniania paska adresu" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 #, fuzzy msgid "Toolbar Items" msgstr "Paski _narzędziowe" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Określa wygląd paska narzędziowego" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 #, fuzzy msgid "Compact Sidepanel" msgstr "Panel _boczny" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "Wyświetlanie przycisków konfiguracyjnych panelu" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "Wyświetla przyciski konfiguracyjne panelu" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Otwieranie paneli w oddzielnych oknach" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "Otwiera wszystkie panale w oddzielnych oknach" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Domyślna czynność:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Określa domyślną czynność wykonywaną po uruchomieniu programu" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Strona główna:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "Wprowadza adres strony głównej przeglądarki" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "Wyświetlanie okna diagnostycznego po wystąpieniu awarii" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "Wyświetla okno diagnostyczne po wystąpieniu awarii programu" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Strona szybkiego wybierania" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Wyświetla stronę szybkiego wybierania w pustych kartach" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Położenie:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "Katalog w którym są zapisywane pobierane pliki" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Wybór katalogu pobierania" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Pyta o wskazanie katalogu docelowego każdorazowo przed rozpoczęciem pobierania pliku" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "Powiadamianie o zakończeniu" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "Wyświetla powiadomienie gdy pobieranie zostanie zakończone" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "Menedżer pobierania:" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "Zewnętrzny menedżer pobierania" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Edytor tekstu:" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Zewnętrzny edytor tekstu" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "Czytnik wiadomości:" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "Zewnętrzny czytnik wiadomości" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "Adres domyślnej wyszukiwarki internetowej" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "Kodowanie znaków:" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "Określa preferowane kodowanie znaków" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Zawsze widoczny pasek kart" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Wyświetla pasek kart nawet gdy otwarto tylko jedną kartę" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "Przyciski zamykania kart" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "Wyświetla przyciski zamykania na kartach" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Otwieranie nowych stron:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Określa sposób otwierania nowych stron" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Otwieranie stron przez inne programy:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "Określa sposób otwierania stron przez inne programy" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Środkowy przycisk myszy otwiera zaznaczoną stronę" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Otwieranie kart w tle" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "Otwiera karty w tle" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "Otwieranie kart za bieżącą kartą" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Określa czy nowe karty będą umieszczane zaraz za bieżącą kartą czy za ostatnią" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Otwieranie wyskakującyh okienek jako karty" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "Czy otwierać wyskakujące okienka jako karty" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:851 #: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Wczytywanie obrazów" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "Wczytuje i wyświetla obrazy automatycznie" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:859 #: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Wykonywanie skryptów" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "Wykonuje osadzone skrypty" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:867 #: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Wtyczki Netscape" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "Używa wtyczek Netscape" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "Obsługa baz danych HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "Obsługuje bazy danych HTML5" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "Pamięć podręczna programów internetowych w trybie offline" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "Włącza pamięć podręczną programów internetowych w trybie offline" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Skalowanie tekstu i obrazów" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "Umożliwia skalowanie tekstu i obrazów" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "Wyszukiwanie inkrementalne podczas wpisywania tekstu" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "Wyszukuje tekst automatycznie podczas jego wpisywania w polu wyszukiwania" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Akceptowane typy:" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Określa typy akceptowanych ciasteczek" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "Zezwalaj wyłącznie na ciasteczka z bieżącej strony" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "Maksymalny okres przechowywania:" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "Określa maksymalny czas przechowywania ciasteczek dla witryn internetowych" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Przechowywanie adresów ostatnio odwiedzonych stron" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" -msgstr "" +msgstr "Określa czy będzie przechowywana lista ostatnio odwiedzonych stron" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "Maksymalny okres przechowywania:" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "Określa maksymalny czas przechowywania historii odwiedzonych stron" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Przechowywanie informacji o ostatnio pobranych plikach" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" -msgstr "" +msgstr "Określa czy będzie przechowywana lista ostatnio pobranych plików" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "Serwer pośredniczący:" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "Określa typ używanego serwera pośredniczącego" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "Serwer pośredniczący HTTP:" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "Określa serwer pośredniczący w połączeniach HTTP" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "Automatyczne wykrywanie serwera pośredniczącego" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Przełącza automatyczne wykrywanie serwera pośredniczącego" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" -msgstr "Identyfikowanie przeglądarki jako:" +msgstr "Identyfikator:" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "Określa jak przeglądarka ma się identyfikować przed stronami internetowymi" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "Identyfikacja" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "Ciąg indentyfikujący przeglądarkę" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "Preferowane języki:" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1124 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Wprowadza listę języków preferowanych podczas renderowania witryn wielojęzycznych, rozdzielonych znakiem przecinka. Np.: „pl”, „ru,nl” or „en-us;q=1.0, fr-fr;q=0.667”." -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "" @@ -1724,207 +1736,222 @@ msgstr "" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1187 -#: ../midori/midori-view.c:4452 -#: ../midori/midori-view.c:4456 +#: ../midori/midori-view.c:1242 +#: ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:4513 #, c-format msgid "Error - %s" msgstr "Błąd - %s" -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1243 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nie można wczytać strony „%s”." -#: ../midori/midori-view.c:1193 +#: ../midori/midori-view.c:1245 msgid "Try again" msgstr "Wczytaj ponownie" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1264 #, c-format msgid "Not found - %s" msgstr "Nie znaleziono - %s" -#: ../midori/midori-view.c:1456 -#: ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:1501 +#: ../midori/midori-view.c:2338 #, c-format msgid "Send a message to %s" msgstr "Wyślij wiadomość na adres %s" -#: ../midori/midori-view.c:2058 -#: ../midori/midori-view.c:2438 +#: ../midori/midori-view.c:2120 +#: ../midori/midori-view.c:2500 msgid "Inspect _Element" msgstr "Analizuj _element..." -#: ../midori/midori-view.c:2110 -#: ../midori/midori-view.c:2180 +#: ../midori/midori-view.c:2172 +#: ../midori/midori-view.c:2242 msgid "Open Link in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-view.c:2114 -#, fuzzy +#: ../midori/midori-view.c:2176 msgid "Open Link in _Foreground Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../midori/midori-view.c:2115 +#: ../midori/midori-view.c:2177 msgid "Open Link in _Background Tab" msgstr "Otwórz w nowej karcie w _tle" -#: ../midori/midori-view.c:2118 -#: ../midori/midori-view.c:2187 +#: ../midori/midori-view.c:2180 +#: ../midori/midori-view.c:2249 msgid "Open Link in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2183 msgid "Open Link as Web A_pplication" msgstr "Uruchom jako a_plikację internetową" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2186 msgid "Copy Link de_stination" msgstr "_Skopiuj adres odnośnika" -#: ../midori/midori-view.c:2127 -#: ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2261 msgid "_Save Link destination" msgstr "_Zapisz obiekt odnośnika" -#: ../midori/midori-view.c:2128 -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2255 msgid "_Download Link destination" msgstr "_Pobierz obiekt odnośnika" -#: ../midori/midori-view.c:2132 -#: ../midori/midori-view.c:2162 -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2194 +#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2266 msgid "Download with Download _Manager" msgstr "Pobierz za pomocą _menedżera pobierania" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2203 msgid "Open _Image in New Tab" msgstr "Otwórz obraz w nowej _karcie" -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2206 msgid "Copy Image _Address" msgstr "Skopiuj _adres obrazu" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2209 msgid "Save I_mage" msgstr "Zapisz _obraz" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2210 msgid "Download I_mage" msgstr "_Pobierz obraz" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2217 msgid "Copy Video _Address" msgstr "_Skopiuj adres wideo" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2220 msgid "Save _Video" msgstr "Zapisz _wideo" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2220 msgid "Download _Video" msgstr "Pobierz _wideo" -#: ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2283 msgid "Search _with" msgstr "Wyszukaj _za pomocą" -#: ../midori/midori-view.c:2256 -#: ../midori/midori-view.c:2263 +#: ../midori/midori-view.c:2318 +#: ../midori/midori-view.c:2325 msgid "_Search the Web" msgstr "_Wyszukaj w internecie" -#: ../midori/midori-view.c:2284 +#: ../midori/midori-view.c:2346 msgid "Open Address in New _Tab" msgstr "Otwórz adres w nowej _karcie" -#: ../midori/midori-view.c:2588 +#: ../midori/midori-view.c:2643 msgid "Open or download file" msgstr "Pobieranie pliku" -#: ../midori/midori-view.c:2611 +#: ../midori/midori-view.c:2662 #, c-format msgid "File Type: '%s'" msgstr "Typ pliku: „%s”" -#: ../midori/midori-view.c:2614 +#: ../midori/midori-view.c:2665 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ pliku: %s („%s”)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2618 +#: ../midori/midori-view.c:2669 #, c-format msgid "Open %s" msgstr "Otwieranie %s" -#: ../midori/midori-view.c:3152 +#: ../midori/midori-view.c:3217 #, c-format msgid "Inspect page - %s" msgstr "Analizowanie - %s" -#: ../midori/midori-view.c:3413 +#: ../midori/midori-view.c:3482 msgid "Speed dial" msgstr "Szybkie wybieranie" -#: ../midori/midori-view.c:3414 +#: ../midori/midori-view.c:3483 msgid "Click to add a shortcut" msgstr "Proszę kliknąć aby dodać odnośnik" -#: ../midori/midori-view.c:3415 +#: ../midori/midori-view.c:3484 msgid "Enter shortcut address" msgstr "Proszę wprowadzić adres URL odnośnika:" -#: ../midori/midori-view.c:3416 +#: ../midori/midori-view.c:3485 msgid "Enter shortcut title" msgstr "Proszę wprowadzić nazwę odnośnika:" -#: ../midori/midori-view.c:3417 +#: ../midori/midori-view.c:3486 msgid "Are you sure you want to delete this shortcut?" msgstr "Usunąć odnośnik?" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3487 +msgid "Set number of columns" +msgstr "" + +#: ../midori/midori-view.c:3488 +msgid "Enter number of columns:" +msgstr "" + +#: ../midori/midori-view.c:3489 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3490 +msgid "Enter number of shortcuts:" +msgstr "Proszę wprowadzić ilość odnośników:" + +#: ../midori/midori-view.c:3516 #, c-format msgid "Document cannot be displayed" msgstr "Nie można wyświetlić dokumentu" -#: ../midori/midori-view.c:3477 +#: ../midori/midori-view.c:3539 #, c-format msgid "No documentation installed" msgstr "Brak zainstalowanej dokumentacji" -#: ../midori/midori-view.c:3727 +#: ../midori/midori-view.c:3789 msgid "Blank page" msgstr "Pusta strona" -#: ../midori/midori-view.c:3987 +#: ../midori/midori-view.c:4049 msgid "_Duplicate Tab" msgstr "_Powiel kartę" -#: ../midori/midori-view.c:3992 +#: ../midori/midori-view.c:4054 msgid "_Restore Tab" msgstr "_Przywróć kartę" -#: ../midori/midori-view.c:3992 +#: ../midori/midori-view.c:4054 msgid "_Minimize Tab" msgstr "_Zminimalizuj kartę" -#: ../midori/midori-view.c:3998 +#: ../midori/midori-view.c:4060 msgid "Close ot_her Tabs" msgstr "Zamknij pozo_stałe karty" -#: ../midori/midori-view.c:4624 +#: ../midori/midori-view.c:4681 msgid "Print background images" msgstr "Drukowanie obrazów tła" -#: ../midori/midori-view.c:4625 +#: ../midori/midori-view.c:4682 msgid "Whether background images should be printed" msgstr "Drukuje obrazy tła stron" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:4734 #: ../midori/midori-preferences.c:381 msgid "Features" msgstr "Treść" @@ -1959,7 +1986,7 @@ msgstr "Czcionki" #: ../midori/midori-preferences.c:352 msgid "Default Font Family" -msgstr "Krój domyślny:" +msgstr "Domyślna:" #: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" @@ -1971,7 +1998,7 @@ msgstr "Określa domyślny rozmiar czcionki używany do wyświetlania tekstu" #: ../midori/midori-preferences.c:360 msgid "Fixed-width Font Family" -msgstr "Krój stały:" +msgstr "Stałej szerokości:" #: ../midori/midori-preferences.c:363 msgid "The font family used to display fixed-width text" @@ -2105,82 +2132,67 @@ msgstr "Wyszukiwarki" msgid "Use as _default" msgstr "Ustaw _domyślną" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Zakładka" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "_Dodaj zakładkę" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Konsola" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Wtyczki" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Historia" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "_Strona główna" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "Skrypty _użytkownika" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Nowa kar_ta" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "_Pobieranie plików" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "Wtyczki _Netscape" -#: ../panels/midori-addons.c:99 -#: ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Skrypty użytkownika" - -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Skrypty użytkownika" - -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "" - -#: ../panels/midori-addons.c:911 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "Nowy _katalog" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Zakładki" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Edytuj wybraną zakładkę" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Usuń wybraną zakładkę" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Dodaje nowy katalog" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separator" @@ -2188,6 +2200,14 @@ msgstr "Separator" msgid "Console" msgstr "Konsola" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Skopiuj _wszystko" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Skopiuj wszystko" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Wtyczki" @@ -2224,28 +2244,28 @@ msgstr "Wczoraj" msgid "Are you sure you want to remove all history items?" msgstr "Czy na pewno usunąć wszystkie elementy historii?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Dodaje zakładkę do zaznaczonego elementu historii" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Usuwa zaznaczony element historii" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Czyści całą historię" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtr:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Otwórz _katalog pobierania" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Skopiuj położ_enie odnośnika" @@ -2271,32 +2291,32 @@ msgstr "Hasło" msgid "_Remember password" msgstr "_Zapamiętaj hasło" -#: ../katze/katze-throbber.c:842 +#: ../katze/katze-throbber.c:882 #, fuzzy, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Sesja nie może być załadowana. %s\n" -#: ../katze/katze-throbber.c:855 +#: ../katze/katze-throbber.c:895 #, fuzzy, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Sesja nie może być załadowana. %s\n" -#: ../katze/katze-throbber.c:923 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:495 -#: ../katze/katze-utils.c:890 +#: ../katze/katze-utils.c:498 +#: ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:541 -#: ../katze/katze-utils.c:570 +#: ../katze/katze-utils.c:544 +#: ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Wybierz plik" -#: ../katze/katze-utils.c:556 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Wybór katalogu" @@ -2305,45 +2325,75 @@ msgstr "Wybór katalogu" msgid "Preferences for %s" msgstr "Preferencje %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Filtr reklam" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Proszę wpisać w polu adres skonfigurowanej listy filtrów i kliknąć przycisk „Dodaj”, aby umieścić ją na poniższej liście. Więcej list można znaleźć pod adresem %s." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Skonfiguruj filtr _reklam..." -#: ../extensions/adblock.c:839 -#, fuzzy +#: ../extensions/adblock.c:841 msgid "Edit rule" -msgstr "Edytuj folder" +msgstr "Edycja reguły" -#: ../extensions/adblock.c:852 -#, fuzzy +#: ../extensions/adblock.c:854 msgid "_Rule:" -msgstr "_Tytuł:" +msgstr "_Reguła:" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Za_blokuj obraz" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Za_blokuj odnośnik" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Filtr reklam" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Blokuje wyświetlanie treści według określonych filtrów" +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "Proszę skopiować %s do katalogu „%s”." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Skrypty użytkownika" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Skrypty użytkownika" + +#: ../extensions/addons.c:1085 +#, fuzzy, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Ustawienia nie mogą zostać zapisane. %s" + +#: ../extensions/addons.c:1086 +#: ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Dodatki użytkownika" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Obsługuje własne skrypty i style" + #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Kolorowe karty" @@ -2554,11 +2604,11 @@ msgstr "Nie zainstalowano pliku zasobów" msgid "Form history filler" msgstr "Historia pól formularzy" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gesty myszy" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Umożliwia kontrolowanie przeglądarki za pomocą gestów myszy" From 7753db46e0624378a4239cf624090bfbc272311b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20St=C3=B6sel?= Date: Thu, 20 May 2010 23:19:02 +0200 Subject: [PATCH 2604/2970] Pass the frame to midori_view_load_alternate_string The frame where an error occurs may not be the main frame, and coincidentally there is a race condition where the main frame isn't valid, so this actually reolves a crash. --- midori/midori-view.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 1b8720d0..89f068c0 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1153,21 +1153,22 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view, #endif static void -midori_view_load_alternate_string (MidoriView* view, - const gchar* data, - const gchar* res_root, - const gchar* uri) +midori_view_load_alternate_string (MidoriView* view, + const gchar* data, + const gchar* res_root, + const gchar* uri, + WebKitWebFrame* web_frame) { WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view); + if (!web_frame) + web_frame = webkit_web_view_get_main_frame (web_view); view->special = TRUE; #if WEBKIT_CHECK_VERSION (1, 1, 14) webkit_web_frame_load_alternate_string ( - webkit_web_view_get_main_frame (web_view), - data, uri, uri); + web_frame, data, uri, uri); #elif WEBKIT_CHECK_VERSION (1, 1, 6) webkit_web_frame_load_alternate_string ( - webkit_web_view_get_main_frame (web_view), - data, res_root, uri); + web_frame, data, res_root, uri); #else webkit_web_view_load_html_string ( web_view, data, res_root); @@ -1175,12 +1176,13 @@ midori_view_load_alternate_string (MidoriView* view, } static gboolean -midori_view_display_error (MidoriView* view, - const gchar* uri, - const gchar* title, - const gchar* message, - const gchar* description, - const gchar* try_again) +midori_view_display_error (MidoriView* view, + const gchar* uri, + const gchar* title, + const gchar* message, + const gchar* description, + const gchar* try_again, + WebKitWebFrame* web_frame) { gchar* template_file = g_build_filename ("midori", "res", "error.html", NULL); gchar* path = sokoke_find_data_filename (template_file); @@ -1218,7 +1220,7 @@ midori_view_display_error (MidoriView* view, g_free (template); midori_view_load_alternate_string (view, - result, res_root, uri); + result, res_root, uri, web_frame); g_free (res_root); g_free (stock_root); @@ -1242,7 +1244,7 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, gchar* title = g_strdup_printf (_("Error - %s"), uri); gchar* message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); gboolean result = midori_view_display_error (view, uri, title, - message, error->message, _("Try again")); + message, error->message, _("Try again"), web_frame); g_free (message); g_free (title); return result; @@ -3491,7 +3493,7 @@ midori_view_set_uri (MidoriView* view, midori_view_load_alternate_string (view, - data, res_root, "about:blank"); + data, res_root, "about:blank", NULL); g_free (res_root); g_free (stock_root); From 2a43689175094cc983b0551ace5e0bffb34bf942 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 20 May 2010 23:56:57 +0200 Subject: [PATCH 2605/2970] Import 'Utils' to fix API documentation build --- docs/api/wscript_build | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api/wscript_build b/docs/api/wscript_build index 70165263..fdcecb50 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -4,6 +4,7 @@ import pproc as subprocess import os +import Utils for module in ('midori', 'katze'): try: From 62cafb87b20001eca63d7099ffd7abd9750d452b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 21 May 2010 00:53:21 +0200 Subject: [PATCH 2606/2970] Deprecate midori_viewable_new_from_uri and _register_protocol These facilities haven't been used and likely won't be. --- midori/midori-viewable.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c index 5a8966cb..566f847e 100644 --- a/midori/midori-viewable.c +++ b/midori/midori-viewable.c @@ -122,6 +122,8 @@ midori_viewable_base_finalize (MidoriViewableIface* iface) * the #MidoriViewable via midori_viewable_register_protocol(). * * Return value: a new #MidoriViewable, or %NULL + * + * Deprecated: 0.2.6 **/ GtkWidget* midori_viewable_new_from_uri (const gchar* uri) @@ -210,6 +212,8 @@ viewable_type_implements (GType type, * "midori://dummy": support URIs like "midori://dummy/foo" * * Return value: a new #MidoriViewable, or %NULL + * + * Deprecated: 0.2.6 **/ void midori_viewable_register_protocol (GType type, From 6c4d94942f5f835de134259f5bf4ffcde9086bc6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 21 May 2010 01:17:43 +0200 Subject: [PATCH 2607/2970] Render stock:// as pixbufs and pass as data URIs Stock icons do not match filenames in many icon themes and the appropriate sizes may not be available. Thus we now always render the icon through the theme engine and encode it as a data URI with BASE64/ PNG. As a side effect, we use stock sizes now instead of pixel sizes, where 1 means menu size, 4 means button size and 6 dialog size; the value 16 is translated to 4 to keep existing files working. --- data/speeddial-head.html | 4 ++-- midori/midori-view.c | 43 ++++++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 2e015076..6d5814fd 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -119,7 +119,7 @@ margin-bottom: -17px; margin-left: 180px; margin-top: 2px; - background: url({stock}/16/gtk-close) 98% 70% no-repeat; + background: url({stock}/1/gtk-close) 98% 70% no-repeat; cursor: pointer; z-index: -4; opacity: 0.6; @@ -131,7 +131,7 @@ .activated p { cursor: text; - background: url({stock}/16/gtk-edit) 98% 70% no-repeat; + background: url({stock}/1/gtk-edit) 98% 70% no-repeat; opacity: 0.6; color: rgba(0,0,0,1); } diff --git a/midori/midori-view.c b/midori/midori-view.c index 89f068c0..cc183b2c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1117,13 +1117,13 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view, } else if (g_str_has_prefix (uri, "stock://")) { - GtkIconTheme* icon_theme = gtk_icon_theme_get_default (); + GdkPixbuf* pixbuf; const gchar* icon_name = &uri[8] ? &uri[8] : ""; - gint icon_size = 22; - GtkIconInfo* info; + gint icon_size = GTK_ICON_SIZE_MENU; if (g_ascii_isalpha (icon_name[0])) - icon_size = strstr (icon_name, "dialog") ? 48 : 22; + icon_size = strstr (icon_name, "dialog") ? + GTK_ICON_SIZE_DIALOG : GTK_ICON_SIZE_BUTTON; else if (g_ascii_isdigit (icon_name[0])) { guint i = 0; @@ -1132,21 +1132,38 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view, { gchar* size = g_strndup (icon_name, i - 1); icon_size = atoi (size); + /* Compatibility: map pixel to symbolic size */ + if (icon_size == 16) + icon_size = GTK_ICON_SIZE_MENU; g_free (size); icon_name = &icon_name[i]; } } - if ((info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, icon_size, 0))) + pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), icon_name, icon_size, NULL); + if (!pixbuf) + pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), + GTK_STOCK_MISSING_IMAGE, icon_size, NULL); + if (pixbuf) { - const gchar* filename = gtk_icon_info_get_filename (info); - if (filename) - { - gchar* file_uri = g_filename_to_uri (filename, NULL, NULL); - webkit_network_request_set_uri (request, file_uri); - g_free (file_uri); - } - gtk_icon_info_free (info); + gboolean success; + gchar* buffer; + gsize buffer_size; + gchar* encoded; + gchar* data_uri; + + success = gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", NULL, NULL); + g_object_unref (pixbuf); + if (!success) + return; + + encoded = g_base64_encode ((guchar*)buffer, buffer_size); + g_free (buffer); + data_uri = g_strconcat ("data:image/png;base64,", encoded, NULL); + g_free (encoded); + webkit_network_request_set_uri (request, data_uri); + g_free (data_uri); + return; } } } From 27620f2affa4e48d540d8d12d288598f2621c204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Fri, 21 May 2010 07:58:24 +0200 Subject: [PATCH 2608/2970] l10n: Updated Czech (cs) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 108 +++++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/po/cs.po b/po/cs.po index ec977fb8..ce5c1529 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-19 04:07+0000\n" +"POT-Creation-Date: 2010-05-21 04:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -1665,213 +1665,213 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509 -#: ../midori/midori-view.c:4513 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1243 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránka '%s' nemůže být načtena." -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Zkusit znovu" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Nenalezeno - %s" -#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Poslat %s zprávu" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Prozkoumat _prvek" -#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Otevřít odkaz v nové kartě na _pozadí" -#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Otevřít odkaz jako _webovou aplikaci" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Zkopírovat _cíl odkazu" -#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Uložit odkaz" -#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Stáhnout odkaz" -#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Stáhnout za použití Download _manageru" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Otevřít _obrázek v nové kartě" -#: ../midori/midori-view.c:2206 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Zkopírovat _adresu obrázku" -#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Uložit o_brázek" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Stáhnout o_brázek" -#: ../midori/midori-view.c:2217 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Zkopírovat _adresu videa" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Uložit _video" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Stáhnout _video" -#: ../midori/midori-view.c:2283 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Hledat _s" -#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:2346 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2643 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2665 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2669 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3217 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3482 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3483 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:3484 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3486 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3487 +#: ../midori/midori-view.c:3506 msgid "Set number of columns" msgstr "Nastavit počet sloupců" -#: ../midori/midori-view.c:3488 +#: ../midori/midori-view.c:3507 msgid "Enter number of columns:" msgstr "Vložte počet sloupců" -#: ../midori/midori-view.c:3489 +#: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" -msgstr "Nastavit počet zkratek" +msgstr "Změnit počet záložek" -#: ../midori/midori-view.c:3490 +#: ../midori/midori-view.c:3509 msgid "Enter number of shortcuts:" -msgstr "Vložte počet zkratek" +msgstr "Vložte počet záložek" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3789 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4049 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-view.c:4060 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4682 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Rozšíření" From db2a120cc349ef29e68f65a1c8c569b2b30569f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Fri, 21 May 2010 07:59:02 +0200 Subject: [PATCH 2609/2970] l10n: Updated Czech (cs) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/cs.po b/po/cs.po index ce5c1529..4fd14b9a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1819,7 +1819,7 @@ msgstr "Opravdu chcete smazat tuto záložku?" #: ../midori/midori-view.c:3506 msgid "Set number of columns" -msgstr "Nastavit počet sloupců" +msgstr "Změnit počet sloupců" #: ../midori/midori-view.c:3507 msgid "Enter number of columns:" From 6eed68e5ee8a88678d362fe55da10f0845ea624e Mon Sep 17 00:00:00 2001 From: Gheyret Kenji Date: Fri, 21 May 2010 09:48:40 +0200 Subject: [PATCH 2610/2970] l10n: Uyghur Translation New status: 32 messages complete with 0 fuzzies and 578 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ug.po | 2808 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2808 insertions(+) create mode 100644 po/ug.po diff --git a/po/ug.po b/po/ug.po new file mode 100644 index 00000000..9c1d8bc7 --- /dev/null +++ b/po/ug.po @@ -0,0 +1,2808 @@ +# Uyghur translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Gheyret T.Kenji , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.1.9\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-04 16:35+0900\n" +"PO-Revision-Date: 2010-05-04 16:34+0900\n" +"Last-Translator: Gheyret T.Kenji \n" +"Language-Team: Uyghur Computer Science Association \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:318 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "توركۆرگۈ" + +#: ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../midori/main.c:158 ../midori/main.c:244 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "" + +#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:425 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:445 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:483 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:602 ../midori/main.c:625 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:684 ../midori/main.c:924 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:868 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" + +#: ../midori/main.c:958 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:973 +msgid "Modify _preferences" +msgstr "" + +#: ../midori/main.c:977 +msgid "Reset the last _session" +msgstr "" + +#: ../midori/main.c:982 +msgid "Disable all _extensions" +msgstr "" + +#: ../midori/main.c:1217 ../midori/main.c:1937 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1336 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1355 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/main.c:1386 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "" + +# CLI --help +#: ../midori/main.c:1557 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1557 +msgid "ADDRESS" +msgstr "" + +# CLI --help +#: ../midori/main.c:1560 +msgid "Use FOLDER as configuration folder" +msgstr "" + +#: ../midori/main.c:1560 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1563 +msgid "Show a diagnostic dialog" +msgstr "" + +# CLI --help +#: ../midori/main.c:1565 +msgid "Run the specified filename as javascript" +msgstr "" + +# CLI --help +#: ../midori/main.c:1568 +msgid "Take a snapshot of the specified URI" +msgstr "" + +# CLI --help +#: ../midori/main.c:1571 +msgid "Execute the specified command" +msgstr "" + +# CLI --help +#: ../midori/main.c:1573 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1575 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1577 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1577 +msgid "PATTERN" +msgstr "" + +# CLI --help +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1581 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1581 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:1661 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:1689 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:1691 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1788 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:1836 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1891 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:1920 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1952 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1966 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1980 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:1996 +msgid "_Ignore" +msgstr "" + +#: ../midori/midori-array.c:428 +msgid "File not found." +msgstr "" + +#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:495 +msgid "Malformed document." +msgstr "" + +#: ../midori/midori-array.c:504 +msgid "Unrecognized bookmark format." +msgstr "" + +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 +#, c-format +msgid "Writing failed." +msgstr "" + +#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5495 +msgid "Reload the current page" +msgstr "" + +#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 +msgid "Stop loading the current page" +msgstr "" + +#: ../midori/midori-browser.c:457 +#, c-format +msgid "%d%% loaded" +msgstr "" + +#: ../midori/midori-browser.c:495 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:509 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../midori/midori-browser.c:716 +msgid "New folder" +msgstr "" + +#: ../midori/midori-browser.c:716 +msgid "Edit folder" +msgstr "" + +#: ../midori/midori-browser.c:718 +msgid "New bookmark" +msgstr "" + +#: ../midori/midori-browser.c:718 +msgid "Edit bookmark" +msgstr "" + +#: ../midori/midori-browser.c:749 +msgid "_Title:" +msgstr "" + +#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +msgid "_Description:" +msgstr "چۈشەندۈرۈش(_D):" + +#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:376 +msgid "_Address:" +msgstr "" + +#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 +msgid "_Folder:" +msgstr "" + +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 +msgid "Toplevel folder" +msgstr "" + +#: ../midori/midori-browser.c:850 +msgid "Show in the tool_bar" +msgstr "" + +#: ../midori/midori-browser.c:865 +msgid "Run as _web application" +msgstr "" + +#: ../midori/midori-browser.c:959 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:963 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4731 +msgid "Save file as" +msgstr "" + +#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#, c-format +msgid "%s of %s" +msgstr "" + +#: ../midori/midori-browser.c:1429 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "" + +#: ../midori/midori-browser.c:1433 +msgid "Transfer completed" +msgstr "" + +#: ../midori/midori-browser.c:1573 +msgid "Save file" +msgstr "" + +#: ../midori/midori-browser.c:2297 +msgid "Open file" +msgstr "" + +#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 +msgid "New feed" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554 +#: ../panels/midori-bookmarks.c:242 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "قۇرۇق" + +#: ../midori/midori-browser.c:3690 ../midori/sokoke.c:403 +#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 +#: ../midori/sokoke.c:481 +msgid "Could not run external program." +msgstr "" + +#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795 +#: ../panels/midori-history.c:751 +msgid "Open all in _Tabs" +msgstr "" + +#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +msgid "Open in New _Tab" +msgstr "" + +#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +msgid "Open in New _Window" +msgstr "" + +#: ../midori/midori-browser.c:4570 +msgid "Arora" +msgstr "" + +#: ../midori/midori-browser.c:4571 +msgid "Kazehakase" +msgstr "" + +#: ../midori/midori-browser.c:4572 +msgid "Opera" +msgstr "" + +#: ../midori/midori-browser.c:4573 +msgid "Konqueror" +msgstr "" + +#: ../midori/midori-browser.c:4574 +msgid "Epiphany" +msgstr "" + +#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 +msgid "Import bookmarks..." +msgstr "" + +#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559 +msgid "_Import bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4609 +msgid "_Application:" +msgstr "" + +#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663 +#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../katze/katze-utils.c:691 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:4710 +msgid "Failed to import bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4746 +msgid "Failed to export bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141 +#: ../panels/midori-history.c:171 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +# Dialog title +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4907 +msgid "Clear Private Data" +msgstr "" + +# Button label +#: ../midori/midori-browser.c:4911 +msgid "_Clear private data" +msgstr "" + +#: ../midori/midori-browser.c:4925 +msgid "Clear the following data:" +msgstr "" + +#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 +msgid "History" +msgstr "" + +#: ../midori/midori-browser.c:4942 +msgid "Cookies" +msgstr "" + +#: ../midori/midori-browser.c:4947 +msgid "'Flash' Cookies" +msgstr "" + +#: ../midori/midori-browser.c:4952 +msgid "Website icons" +msgstr "" + +#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310 +msgid "_Closed Tabs" +msgstr "" + +#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464 +msgid "Web Cache" +msgstr "" + +#: ../midori/midori-browser.c:4970 +msgid "Clear private data when _quitting Midori" +msgstr "" + +#: ../midori/midori-browser.c:5072 +msgid "A lightweight web browser." +msgstr "" + +#: ../midori/midori-browser.c:5074 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" + +#: ../midori/midori-browser.c:5093 +msgid "translator-credits" +msgstr "Gheyret T.Kenji 2010" + +#: ../midori/midori-browser.c:5402 +msgid "_File" +msgstr "ھۆججەت(_F)" + +#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311 +msgid "New _Window" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5405 +msgid "Open a new window" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5408 +msgid "Open a new tab" +msgstr "" + +#: ../midori/midori-browser.c:5410 +msgid "P_rivate Browsing" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5411 +msgid "Don't save any private data while browsing" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5415 +msgid "Open a file" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5418 +msgid "Save to a file" +msgstr "" + +#: ../midori/midori-browser.c:5420 +msgid "Add to Speed _dial" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5421 +msgid "Add shortcut to speed dial" +msgstr "" + +#: ../midori/midori-browser.c:5423 +msgid "Add Shortcut to the _desktop" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5424 +msgid "Add shortcut to the desktop" +msgstr "" + +#: ../midori/midori-browser.c:5426 +msgid "Subscribe to News _feed" +msgstr "" + +#: ../midori/midori-browser.c:5427 +msgid "Subscribe to this news feed" +msgstr "" + +#: ../midori/midori-browser.c:5432 +msgid "_Close Tab" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5433 +msgid "Close the current tab" +msgstr "" + +#: ../midori/midori-browser.c:5435 +msgid "C_lose Window" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5436 +msgid "Close this window" +msgstr "مەزكۇر كۆزنەكنى تاقايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5439 +msgid "Print the current page" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5442 +msgid "Quit the application" +msgstr "" + +#: ../midori/midori-browser.c:5444 +msgid "_Edit" +msgstr "تەھرىر(_E)" + +#: ../midori/midori-browser.c:5448 +msgid "Undo the last modification" +msgstr "" + +#: ../midori/midori-browser.c:5451 +msgid "Redo the last modification" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5455 +msgid "Cut the selected text" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461 +msgid "Copy the selected text" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5464 +msgid "Paste text from the clipboard" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5467 +msgid "Delete the selected text" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5470 +msgid "Select all text" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5473 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:5475 +msgid "Find _Next" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5476 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:5478 +msgid "Find _Previous" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5479 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5483 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:5485 +msgid "_View" +msgstr "كۆرۈنۈش(_V)" + +#: ../midori/midori-browser.c:5486 +msgid "_Toolbars" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5498 +msgid "Increase the zoom level" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5501 +msgid "Decrease the zoom level" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5504 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:5505 +msgid "_Encoding" +msgstr "" + +#: ../midori/midori-browser.c:5507 +msgid "View So_urce" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5508 +msgid "View the source code of the page" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5511 +msgid "Toggle fullscreen view" +msgstr "" + +#: ../midori/midori-browser.c:5514 +msgid "Scroll _Left" +msgstr "" + +#: ../midori/midori-browser.c:5515 +msgid "Scroll to the left" +msgstr "" + +#: ../midori/midori-browser.c:5517 +msgid "Scroll _Down" +msgstr "" + +#: ../midori/midori-browser.c:5518 +msgid "Scroll down" +msgstr "" + +#: ../midori/midori-browser.c:5520 +msgid "Scroll _Up" +msgstr "" + +#: ../midori/midori-browser.c:5521 +msgid "Scroll up" +msgstr "" + +#: ../midori/midori-browser.c:5523 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:5524 +msgid "Scroll to the right" +msgstr "" + +#: ../midori/midori-browser.c:5527 +msgid "_Go" +msgstr "يۆتكەل(_G)" + +# tooltip +#: ../midori/midori-browser.c:5530 +msgid "Go back to the previous page" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5533 +msgid "Go forward to the next page" +msgstr "" + +# tooltip +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5537 +msgid "Go to the previous sub-page" +msgstr "" + +# tooltip +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5541 +msgid "Go to the next sub-page" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5544 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:5546 +msgid "Empty Trash" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5547 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:5549 +msgid "Undo _Close Tab" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5550 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:5556 +msgid "Add a new _folder" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5557 +msgid "Add a new bookmark folder" +msgstr "" + +#: ../midori/midori-browser.c:5562 +msgid "_Export bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5566 +msgid "Add, edit and remove search engines..." +msgstr "" + +#: ../midori/midori-browser.c:5569 +msgid "_Clear Private Data" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5570 +msgid "Clear private data..." +msgstr "" + +#: ../midori/midori-browser.c:5574 +msgid "_Inspect Page" +msgstr "" + +#: ../midori/midori-browser.c:5575 +msgid "Inspect page details and access developer tools..." +msgstr "" + +#: ../midori/midori-browser.c:5580 +msgid "_Previous Tab" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5581 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:5583 +msgid "_Next Tab" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5584 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:5586 +msgid "Focus _Current Tab" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5587 +msgid "Focus the current tab" +msgstr "" + +#: ../midori/midori-browser.c:5589 +msgid "Open last _session" +msgstr "" + +#: ../midori/midori-browser.c:5590 +msgid "Open the tabs saved in the last session" +msgstr "" + +#: ../midori/midori-browser.c:5592 +msgid "_Help" +msgstr "ياردەم(_H)" + +#: ../midori/midori-browser.c:5594 +msgid "_Contents" +msgstr "مۇندەرىجە(_C)" + +# tooltip +#: ../midori/midori-browser.c:5595 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:5597 +msgid "_Frequent Questions" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5598 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:5600 +msgid "_Report a Bug" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5601 +msgid "Open Midori's bug tracker" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5604 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:5612 +msgid "_Menubar" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5613 +msgid "Show menubar" +msgstr "" + +#: ../midori/midori-browser.c:5616 +msgid "_Navigationbar" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5617 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:5620 +msgid "Side_panel" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5621 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:5624 +msgid "_Bookmarkbar" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5625 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:5628 +msgid "_Transferbar" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5629 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:5632 +msgid "_Statusbar" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:5633 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:5641 +msgid "_Automatic" +msgstr "" + +#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226 +msgid "Chinese (BIG5)" +msgstr "" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5648 +msgid "Japanese (SHIFT__JIS)" +msgstr "" + +#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 +msgid "Korean (EUC-KR)" +msgstr "" + +#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:6208 +msgid "_Separator" +msgstr "" + +#: ../midori/midori-browser.c:6215 +msgid "_Location..." +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:6217 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:6241 +msgid "_Web Search..." +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:6243 +msgid "Run a web search" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:6264 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:6279 +msgid "_Recently visited pages" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:6281 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 +msgid "_Bookmarks" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:6298 +msgid "Show the saved bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:6313 +msgid "_Tools" +msgstr "" + +#: ../midori/midori-browser.c:6326 +msgid "_Window" +msgstr "" + +# tooltip +#: ../midori/midori-browser.c:6328 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:6342 +msgid "_Menu" +msgstr "" + +#: ../midori/midori-browser.c:6344 +msgid "Menu" +msgstr "Menu" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:6548 +msgid "_Inline Find:" +msgstr "" + +#: ../midori/midori-browser.c:6579 +msgid "Previous" +msgstr "" + +#: ../midori/midori-browser.c:6584 +msgid "Next" +msgstr "كېيىنكىسى" + +#: ../midori/midori-browser.c:6589 +msgid "Match Case" +msgstr "" + +#: ../midori/midori-browser.c:6598 +msgid "Highlight Matches" +msgstr "" + +#: ../midori/midori-browser.c:6610 +msgid "Close Findbar" +msgstr "" + +#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 +msgid "Clear All" +msgstr "" + +#: ../midori/midori-browser.c:7014 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-locationaction.c:377 +#, c-format +msgid "Failed to select from history\n" +msgstr "" + +#: ../midori/midori-locationaction.c:459 +#, c-format +msgid "Search for %s" +msgstr "" + +#: ../midori/midori-locationaction.c:482 +#, c-format +msgid "Search with %s" +msgstr "" + +#: ../midori/midori-locationaction.c:1197 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "" + +#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +msgid "Align sidepanel to the right" +msgstr "" + +#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +msgid "Close panel" +msgstr "" + +#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +msgid "Align sidepanel to the left" +msgstr "" + +#: ../midori/midori-panel.c:798 +msgid "Hide operating controls" +msgstr "" + +#: ../midori/midori-websettings.c:209 +msgid "Show Blank page" +msgstr "" + +#: ../midori/midori-websettings.c:210 +msgid "Show Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:211 +msgid "Show last open tabs" +msgstr "" + +#: ../midori/midori-websettings.c:227 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-websettings.c:247 +msgid "New tab" +msgstr "" + +#: ../midori/midori-websettings.c:248 +msgid "New window" +msgstr "" + +#: ../midori/midori-websettings.c:249 +msgid "Current tab" +msgstr "" + +#: ../midori/midori-websettings.c:264 +msgid "Default" +msgstr "كۆڭۈلدىكى" + +#: ../midori/midori-websettings.c:265 +msgid "Icons" +msgstr "سىنبەلگىلەر" + +#: ../midori/midori-websettings.c:266 +msgid "Small icons" +msgstr "" + +#: ../midori/midori-websettings.c:267 +msgid "Text" +msgstr "تېكىست" + +#: ../midori/midori-websettings.c:268 +msgid "Icons and text" +msgstr "" + +#: ../midori/midori-websettings.c:269 +msgid "Text beside icons" +msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن" + +#: ../midori/midori-websettings.c:284 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:285 +msgid "HTTP proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:286 +msgid "No proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:301 +msgid "All cookies" +msgstr "" + +#: ../midori/midori-websettings.c:302 +msgid "Session cookies" +msgstr "" + +#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +msgid "None" +msgstr "يوق" + +#: ../midori/midori-websettings.c:319 +msgid "Safari" +msgstr "" + +#: ../midori/midori-websettings.c:320 +msgid "iPhone" +msgstr "" + +#: ../midori/midori-websettings.c:321 +msgid "Firefox" +msgstr "" + +#: ../midori/midori-websettings.c:322 +msgid "Internet Explorer" +msgstr "" + +#: ../midori/midori-websettings.c:375 +msgid "Remember last window size" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:376 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:384 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:385 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:393 +msgid "Last window height" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:394 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:419 +msgid "Last panel position" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:420 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:429 +msgid "Last panel page" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:430 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:438 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:439 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:448 +msgid "Show Menubar" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:449 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:457 +msgid "Show Navigationbar" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:458 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:466 +msgid "Show Bookmarkbar" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:467 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:475 +msgid "Show Panel" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:476 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:491 +msgid "Show Transferbar" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:492 +msgid "Whether to show the transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:500 +msgid "Show Statusbar" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:501 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:510 +msgid "Toolbar Style:" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:511 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:527 +msgid "Show progress in location entry" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:528 +msgid "Whether to show loading progress in the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:543 +msgid "Search engines in location completion" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:544 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:552 +msgid "Toolbar Items" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:553 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:561 +msgid "Compact Sidepanel" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:562 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:577 +msgid "Show operating controls of the panel" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:578 +msgid "Whether to show the operating controls of the panel" +msgstr "" + +#: ../midori/midori-websettings.c:593 +msgid "Align sidepanel on the right" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:594 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:609 +msgid "Open panels in separate windows" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:610 +msgid "Whether to always open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:619 +msgid "When Midori starts:" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:620 +msgid "What to do when Midori starts" +msgstr "" + +#: ../midori/midori-websettings.c:629 +msgid "Homepage:" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:630 +msgid "The homepage" +msgstr "" + +#: ../midori/midori-websettings.c:645 +msgid "Show crash dialog" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:646 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:662 +msgid "Show speed dial in new tabs" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:663 +msgid "Show speed dial in newly opened tabs" +msgstr "" + +#: ../midori/midori-websettings.c:671 +msgid "Save downloaded files to:" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:672 +msgid "The folder downloaded files are saved to" +msgstr "" + +#: ../midori/midori-websettings.c:693 +msgid "Ask for the destination folder" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:694 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "" + +#: ../midori/midori-websettings.c:713 +msgid "Notify when a transfer has been completed" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:714 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:726 +msgid "Download Manager" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:727 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:735 +msgid "Text Editor" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:736 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:751 +msgid "News Aggregator" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:752 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:760 +msgid "Location entry Search" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:761 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:769 +msgid "Preferred Encoding" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:770 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:780 +msgid "Always Show Tabbar" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:781 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:789 +msgid "Close Buttons on Tabs" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:790 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:798 +msgid "Open new pages in:" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:799 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:808 +msgid "Open external pages in:" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:809 +msgid "Where to open externally opened pages" +msgstr "" + +#: ../midori/midori-websettings.c:818 +msgid "Middle click opens Selection" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:819 +msgid "Load an address from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:827 +msgid "Open tabs in the background" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:828 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:836 +msgid "Open Tabs next to Current" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:837 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:845 +msgid "Open popups in tabs" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:846 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:857 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:865 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:873 +msgid "Enable embedded Netscape plugin objects" +msgstr "" + +#: ../midori/midori-websettings.c:889 +msgid "Enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:890 +msgid "Whether to enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:896 +msgid "Enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:897 +msgid "Whether to enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:905 +msgid "Enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:906 +msgid "Whether to enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:931 +msgid "Zoom Text and Images" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:932 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:947 +msgid "Find inline while typing" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:948 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:963 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:964 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:972 +msgid "Accept cookies" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:973 +msgid "What type of cookies to accept" +msgstr "" + +#: ../midori/midori-websettings.c:989 +msgid "Original cookies only" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:990 +msgid "Accept cookies from the original website only" +msgstr "" + +#: ../midori/midori-websettings.c:998 +msgid "Maximum cookie age" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:999 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:1016 +msgid "Remember last visited pages" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1017 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../midori/midori-websettings.c:1025 +msgid "Maximum history age" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1026 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:1034 +msgid "Remember last downloaded files" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1035 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../midori/midori-websettings.c:1052 +msgid "Proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:1053 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:1062 +msgid "HTTP Proxy Server" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1063 +msgid "The proxy server used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:1078 +msgid "Detect proxy server automatically" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1079 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:1095 +msgid "Identify as" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1096 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:1112 +msgid "Identification string" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:1113 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1128 +msgid "Preferred languages" +msgstr "" + +#: ../midori/midori-websettings.c:1129 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +# Button title +#: ../midori/midori-websettings.c:1144 +msgid "Clear private data" +msgstr "" + +# FIXME: +#: ../midori/midori-websettings.c:1145 +msgid "The private data selected for deletion" +msgstr "" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482 +#: ../midori/midori-view.c:4486 +#, c-format +msgid "Error - %s" +msgstr "" + +#: ../midori/midori-view.c:1183 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "" + +#: ../midori/midori-view.c:1188 +msgid "Try again" +msgstr "قايتا سىناپ كور" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1229 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303 +#, c-format +msgid "Send a message to %s" +msgstr "" + +#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465 +msgid "Inspect _Element" +msgstr "" + +#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207 +msgid "Open Link in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2141 +msgid "Open Link in _Foreground Tab" +msgstr "" + +#: ../midori/midori-view.c:2142 +msgid "Open Link in _Background Tab" +msgstr "" + +#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214 +msgid "Open Link in New _Window" +msgstr "" + +#: ../midori/midori-view.c:2148 +msgid "Open Link as Web A_pplication" +msgstr "" + +#: ../midori/midori-view.c:2151 +msgid "Copy Link de_stination" +msgstr "" + +#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2231 +msgid "Download with Download _Manager" +msgstr "" + +#: ../midori/midori-view.c:2168 +msgid "Open _Image in New Tab" +msgstr "" + +#: ../midori/midori-view.c:2171 +msgid "Copy Image _Address" +msgstr "" + +#: ../midori/midori-view.c:2174 +msgid "Save I_mage" +msgstr "" + +#: ../midori/midori-view.c:2175 +msgid "Download I_mage" +msgstr "" + +#: ../midori/midori-view.c:2182 +msgid "Copy Video _Address" +msgstr "" + +#: ../midori/midori-view.c:2185 +msgid "Save _Video" +msgstr "" + +#: ../midori/midori-view.c:2185 +msgid "Download _Video" +msgstr "" + +#: ../midori/midori-view.c:2248 +msgid "Search _with" +msgstr "" + +#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:2311 +msgid "Open Address in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2615 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:2638 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:2641 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2645 +#, c-format +msgid "Open %s" +msgstr "" + +#: ../midori/midori-view.c:3179 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:3444 +msgid "Speed dial" +msgstr "" + +#: ../midori/midori-view.c:3445 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:3446 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:3447 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:3448 +msgid "Are you sure you want to delete this shortcut?" +msgstr "" + +#: ../midori/midori-view.c:3485 +#, c-format +msgid "Document cannot be displayed" +msgstr "" + +#: ../midori/midori-view.c:3508 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-view.c:3758 +msgid "Blank page" +msgstr "" + +#: ../midori/midori-view.c:4018 +msgid "_Duplicate Tab" +msgstr "" + +#: ../midori/midori-view.c:4023 +msgid "_Restore Tab" +msgstr "" + +#: ../midori/midori-view.c:4023 +msgid "_Minimize Tab" +msgstr "" + +#: ../midori/midori-view.c:4029 +msgid "Close ot_her Tabs" +msgstr "" + +#: ../midori/midori-view.c:4654 +msgid "Print background images" +msgstr "" + +# tooltip +#: ../midori/midori-view.c:4655 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 +msgid "Features" +msgstr "" + +#. Page "General" +#: ../midori/midori-preferences.c:298 +msgid "General" +msgstr "ئادەتتىكى" + +#: ../midori/midori-preferences.c:299 +msgid "Startup" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +msgid "Use current page as homepage" +msgstr "" + +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:349 +msgid "Appearance" +msgstr "كۆرۈنۈشى" + +#: ../midori/midori-preferences.c:350 +msgid "Font settings" +msgstr "" + +#: ../midori/midori-preferences.c:352 +msgid "Default Font Family" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:355 +msgid "The default font family used to display text" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:358 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:360 +msgid "Fixed-width Font Family" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:363 +msgid "The font family used to display fixed-width text" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:366 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:368 +msgid "Minimum Font Size" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:371 +msgid "The minimum font size used to display text" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:380 +msgid "Behavior" +msgstr "ھەرىكىتى" + +#: ../midori/midori-preferences.c:393 +msgid "Enforce 96 dots per inch" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:394 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:415 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" + +#: ../midori/midori-preferences.c:419 +msgid "Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:422 +msgid "Enable Spell Checking" +msgstr "" + +# tooltip +#: ../midori/midori-preferences.c:423 +msgid "Enable spell checking while typing" +msgstr "" + +#: ../midori/midori-preferences.c:425 +msgid "Spelling dictionaries:" +msgstr "" + +# tooltip +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:429 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:435 +msgid "Interface" +msgstr "" + +#: ../midori/midori-preferences.c:436 +msgid "Navigationbar" +msgstr "" + +#: ../midori/midori-preferences.c:446 +msgid "Browsing" +msgstr "" + +#. Page "Applications" +#: ../midori/midori-preferences.c:468 +msgid "Applications" +msgstr "" + +#: ../midori/midori-preferences.c:469 +msgid "External applications" +msgstr "" + +#. Page "Network" +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +msgid "Network" +msgstr "تور" + +#: ../midori/midori-preferences.c:492 +msgid "Hostname" +msgstr "" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:511 +msgid "Privacy" +msgstr "" + +#: ../midori/midori-preferences.c:512 +msgid "Web Cookies" +msgstr "" + +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:917 +msgid "Add search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:917 +msgid "Edit search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:945 +msgid "_Name:" +msgstr "ئاتى(_N):" + +#: ../midori/midori-searchaction.c:989 +msgid "_Icon:" +msgstr "سىنبەلگە(_I):" + +#: ../midori/midori-searchaction.c:1003 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1234 +msgid "Manage Search Engines" +msgstr "" + +#: ../midori/midori-searchaction.c:1335 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:1299 +msgid "_Bookmark" +msgstr "" + +#: ../midori/sokoke.c:1301 +msgid "Add Boo_kmark" +msgstr "" + +#: ../midori/sokoke.c:1302 +msgid "_Console" +msgstr "" + +#: ../midori/sokoke.c:1303 +msgid "_Extensions" +msgstr "" + +#: ../midori/sokoke.c:1304 +msgid "_History" +msgstr "" + +#: ../midori/sokoke.c:1305 +msgid "_Homepage" +msgstr "" + +#: ../midori/sokoke.c:1306 +msgid "_Userscripts" +msgstr "" + +#: ../midori/sokoke.c:1307 +msgid "New _Tab" +msgstr "" + +#: ../midori/sokoke.c:1308 +msgid "_Transfers" +msgstr "" + +#: ../midori/sokoke.c:1309 +msgid "Netscape p_lugins" +msgstr "" + +#: ../panels/midori-bookmarks.c:111 +msgid "Bookmarks" +msgstr "" + +# tooltip +#: ../panels/midori-bookmarks.c:250 +msgid "Edit the selected bookmark" +msgstr "" + +# tooltip +#: ../panels/midori-bookmarks.c:258 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:278 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:608 +msgid "Separator" +msgstr "" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "" + +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "" + +#: ../panels/midori-history.c:273 +msgid "Erroneous clock time" +msgstr "" + +#: ../panels/midori-history.c:274 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "" + +#: ../panels/midori-history.c:286 +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:288 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "" + +#: ../panels/midori-history.c:291 +msgid "Today" +msgstr "بۈگۈن" + +#: ../panels/midori-history.c:293 +msgid "Yesterday" +msgstr "تۈنۈگۈن" + +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +# tooltip +#: ../panels/midori-history.c:438 +msgid "Bookmark the selected history item" +msgstr "" + +# tooltip +#: ../panels/midori-history.c:447 +msgid "Delete the selected history item" +msgstr "" + +# tooltip +#: ../panels/midori-history.c:455 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-history.c:953 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "" + +#: ../panels/midori-transfers.c:479 +msgid "Open Destination _Folder" +msgstr "" + +#: ../panels/midori-transfers.c:482 +msgid "Copy Link Loc_ation" +msgstr "" + +#: ../katze/katze-http-auth.c:214 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:230 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:244 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:257 +msgid "Password" +msgstr "" + +#: ../katze/katze-http-auth.c:272 +msgid "_Remember password" +msgstr "" + +#: ../katze/katze-throbber.c:882 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:895 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:963 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:559 +msgid "Choose folder" +msgstr "" + +#: ../katze/katze-preferences.c:95 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#: ../extensions/adblock.c:413 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:445 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" + +#: ../extensions/adblock.c:585 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:839 +msgid "Edit rule" +msgstr "" + +#: ../extensions/adblock.c:852 +msgid "_Rule:" +msgstr "" + +#: ../extensions/adblock.c:906 +msgid "Bl_ock image" +msgstr "" + +#: ../extensions/adblock.c:911 +msgid "Bl_ock link" +msgstr "" + +#: ../extensions/adblock.c:1485 +msgid "Advertisement blocker" +msgstr "" + +# description +#: ../extensions/adblock.c:1486 +msgid "Block advertisements according to a filter list" +msgstr "" + +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "" + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:204 +msgid "Colorful Tabs" +msgstr "" + +# description +#: ../extensions/colorful-tabs.c:205 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:82 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Delete All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:129 +msgid "Expand All" +msgstr "" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:136 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:578 +msgid "Do you really want to delete all cookies?" +msgstr "" + +# Dialog title +#: ../extensions/cookie-manager/cookie-manager-page.c:580 +msgid "Question" +msgstr "سوئال" + +#: ../extensions/cookie-manager/cookie-manager-page.c:589 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:677 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +# cookie: Secure flag is set. +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "Yes" +msgstr "" + +# cookie: Secure flag isn't set. +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "No" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" + +# Column name of cookie browser +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +msgid "Name" +msgstr "ئاتى" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +msgid "_Collapse All" +msgstr "" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "" + +# description +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:399 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:671 +msgid "Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:724 +msgid "Add new feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:731 +msgid "Delete feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:814 +msgid "_Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:192 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:232 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:262 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:132 +msgid "Error" +msgstr "خاتالىق" + +#: ../extensions/feed-panel/main.c:134 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:211 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:522 +msgid "Feed Panel" +msgstr "" + +# description +#: ../extensions/feed-panel/main.c:523 +msgid "Read Atom/ RSS feeds" +msgstr "" + +#: ../extensions/formhistory.c:144 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "" + +#: ../extensions/formhistory.c:510 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory.c:514 +#, c-format +msgid "Not available: %s" +msgstr "" + +#: ../extensions/formhistory.c:515 +msgid "Resource files not installed" +msgstr "" + +#: ../extensions/formhistory.c:521 +msgid "Form history filler" +msgstr "" + +#: ../extensions/mouse-gestures.c:303 +msgid "Mouse Gestures" +msgstr "" + +# description +#: ../extensions/mouse-gestures.c:304 +msgid "Control Midori by moving the mouse" +msgstr "" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "" + +#: ../extensions/shortcuts.c:170 +msgid "Customize Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:315 +msgid "Shortcuts" +msgstr "" + +# description +#: ../extensions/shortcuts.c:316 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "سۈرەتلەر" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "" + +# description +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +msgid "Tab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:609 +msgid "T_ab Panel" +msgstr "" + +# description +#: ../extensions/tab-panel.c:626 +msgid "Show tabs in a vertical panel" +msgstr "" + +#: ../extensions/tab-switcher.c:395 +msgid "Tab History List" +msgstr "" + +#: ../extensions/tab-switcher.c:396 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" + +#: ../extensions/toolbar-editor.c:389 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:405 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:421 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:442 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:577 +msgid "Customize _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:608 +msgid "Toolbar Editor" +msgstr "" + +# description +#: ../extensions/toolbar-editor.c:609 +msgid "Easily edit the toolbar layout" +msgstr "" + +#: ../extensions/web-cache.c:465 +msgid "Cache HTTP communication on disk" +msgstr "" + +#~ msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" +#~ msgstr "設定を読み込めませんでした: %s\n" + +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "ユーザスクリプトをフォルダ %s へ、ユーザスタイルをフォルダ %s へコピーしま" +#~ "す。" + +#~ msgid "Open _Link" +#~ msgstr "リンクを開く(_L)" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "画像を新しいウィンドウで開く(_N)" + +#~ msgid "REGEX" +#~ msgstr "REGEX" + +#~ msgid "Not available on this platform" +#~ msgstr "このプラットフォームでは利用できません" + +#~ msgid "Failed to get current time: %s\n" +#~ msgstr "現在時刻の取得に失敗しました: %s\n" + +#~ msgid "Failed to add history item: %s\n" +#~ msgstr "履歴アイテムの追加に失敗しました: %s\n" + +#~ msgid "Show panel _titles" +#~ msgstr "パネルタイトルの表示(_T)" + +#~ msgid "Options" +#~ msgstr "オプション" + +#~ msgid "Spell checking languages:" +#~ msgstr "スペルチェックする言語:" + +#~ msgid "View Selection Source" +#~ msgstr "選択領域のソースを表示" + +# tooltip +#~ msgid "View the source code of the selection" +#~ msgstr "ページのソースコードを表示します" + +#~ msgid "Shrink images automatically" +#~ msgstr "画像を自動的に読み込む" + +# description +#~ msgid "Tint tabs distinctly" +#~ msgstr "各タブにそれぞれを区別する色をつけます" + +#~ msgid "DNS prefetching" +#~ msgstr "DNS プリフェッチ" + +#~ msgid "Prefetch IP addresses of hovered links" +#~ msgstr "マウスポインタを置いたリンクの IP アドレスを先読みします" From 361ca8762352dee951263aaf90d9c55601bf1cbb Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Fri, 21 May 2010 10:57:47 +0200 Subject: [PATCH 2611/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 520 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 274 insertions(+), 246 deletions(-) diff --git a/po/pt.po b/po/pt.po index a5ebc9fc..a28769e7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-14 10:07+0000\n" +"POT-Creation-Date: 2010-05-21 04:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -245,777 +245,781 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao actualizar título: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Adicionar a _Ligação Rápida" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "O ficheiro '%s' foi transferido." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5123 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5564 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "Local_izar:" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "Sensível à Capitalização" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar Tudo" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" @@ -1661,197 +1665,213 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1189 ../midori/midori-view.c:4488 -#: ../midori/midori-view.c:4492 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1190 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página '%s' não foi carregada." -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:1473 ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Enviar mensagem a %s" -#: ../midori/midori-view.c:2092 ../midori/midori-view.c:2472 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Inspeccionar _Elementos" -#: ../midori/midori-view.c:2144 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Abrir Ligação no Separador _Principal" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Abrir Ligação no Separador _Secundário" -#: ../midori/midori-view.c:2152 ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Abrir Ligação como A_plicação Web" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Copiar de_stino da Ligação" -#: ../midori/midori-view.c:2161 ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Guardar destino da Ligação" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Transferir destino da Ligação" -#: ../midori/midori-view.c:2166 ../midori/midori-view.c:2196 -#: ../midori/midori-view.c:2238 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Transferir com _Gestor de Transferências" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Abrir _Imagem em Novo Separador" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Copiar _Endereço da Imagem" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Guardar I_magem" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Transferir I_magem" -#: ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Copiar _Endereço do Vídeo" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Guardar _Vídeo" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Transferir _Vídeo" -#: ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2290 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:2318 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:2634 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:2637 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3189 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "Definir número de colunas" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "Indique o número de colunas:" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "Definir número de atalhos" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "Indique o número de atalhos" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3768 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4028 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Restaurar Separadores" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Minizar Separadores" -#: ../midori/midori-view.c:4039 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4660 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4713 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2095,6 +2115,14 @@ msgstr "Separador" msgid "Console" msgstr "Consola" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copiar _Tudo" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copiar Tudo" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensões" @@ -2211,40 +2239,40 @@ msgstr "Escolha a pasta" msgid "Preferences for %s" msgstr "Preferências para %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configurar filtros de Publicidade" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Digite o endereço de uma lista de filtros pré-configurados e clique em \"Adicionar\" para a adicionar à lista. Pode encontrar mais listas em %s." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Configurar filtros de _Publicidade..." -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_oquear imagem" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_oquear ligação" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com a lista " From 91395c256548200c7c2605456cf3be0831a689a3 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Fri, 21 May 2010 18:14:00 +0200 Subject: [PATCH 2612/2970] l10n: Updated Danish (da) translation to 99% New status: 617 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 520 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 274 insertions(+), 246 deletions(-) diff --git a/po/da.po b/po/da.po index 016d8fd3..d7bc28f7 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-14 04:07+0000\n" +"POT-Creation-Date: 2010-05-21 16:07+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -244,261 +244,265 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Tilføj til hurtig_opkald" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s af %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Filen '%s' er blevet hentet." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Overførsel gennemført" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Tom" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5123 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -506,519 +510,519 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5564 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Ryd alle" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" @@ -1664,197 +1668,213 @@ msgstr "De private data valgt til sletning" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1189 ../midori/midori-view.c:4488 -#: ../midori/midori-view.c:4492 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Fejl - %s" -#: ../midori/midori-view.c:1190 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Siden '%s' kunne ikke indlæses." -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Prøv igen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:1473 ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Send en besked til %s" -#: ../midori/midori-view.c:2092 ../midori/midori-view.c:2472 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Undersøg _element" -#: ../midori/midori-view.c:2144 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Åbn henvisning i _fanebladet i forgrunden" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Åbn henvisning i _faneblad i baggrunden" -#: ../midori/midori-view.c:2152 ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Åbn henvisning som et _webprogram" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Kopiér _henvisningsdestination" -#: ../midori/midori-view.c:2161 ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Hent henvisningsadressen" -#: ../midori/midori-view.c:2166 ../midori/midori-view.c:2196 -#: ../midori/midori-view.c:2238 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Hent med nedhentnings_håndtering" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Åbn _billede i nyt faneblad" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Kopiér billed_adresse" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Gem _billede" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Hent bi_llede" -#: ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Kopiér vide_oadresse" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Gem _video" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Hent _video" -#: ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:2290 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:2318 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:2634 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:2637 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:3189 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "Indstil antal af kolonner" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "Angiv antal kolonner:" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "Indstil antal af genveje" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "Angiv antal af genveje:" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3768 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4028 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Gendan faneblad" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Minimér faneblad" -#: ../midori/midori-view.c:4039 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4660 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4713 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funktionalitet" @@ -2098,6 +2118,14 @@ msgstr "Separator" msgid "Console" msgstr "Konsol" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Kopiér _alt" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Kopiér alt" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Udvidelser" @@ -2214,40 +2242,40 @@ msgstr "Vælg mappe" msgid "Preferences for %s" msgstr "Indstillinger for %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Indstil reklamefiltre" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Indtast adressen til en forudindstillet filterliste i tekstfeltet og tryk \"Tilføj\" for at føje det til listen. Du kan finde flere lister på %s." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Indstil _reklamefiltre..." -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Redigér regel" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_okér billede" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_okér henvisning" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Blokering af reklamer" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" From 203e65ed87cecba8fe5cdbaba6e612342532c476 Mon Sep 17 00:00:00 2001 From: Andres Kovtunos Date: Sat, 22 May 2010 12:15:41 +0200 Subject: [PATCH 2613/2970] l10n: Updated Russian (ru) translation to 99% New status: 615 messages complete with 1 fuzzy and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 506 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 266 insertions(+), 240 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2658eab4..8374c026 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-15 10:07+0000\n" +"POT-Creation-Date: 2010-05-22 10:07+0000\n" "PO-Revision-Date: 2010-04-09 12:45+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -244,780 +244,785 @@ msgstr "Неизвестный формат закладок." msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5544 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Добавить в _быстрый набор" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 +#: ../midori/midori-browser.c:4781 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s из %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл «%s» загружен." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:2349 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4620 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4621 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4622 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4623 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4624 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4645 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4659 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4760 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4796 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4957 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4961 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4975 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4992 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4997 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5002 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5020 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5121 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5123 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5142 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5451 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5454 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5457 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5459 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5460 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5464 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5467 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5469 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5470 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5472 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5473 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5475 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5476 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5481 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5482 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5484 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5485 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5488 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5491 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5493 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5497 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5500 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5504 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5513 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5516 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5519 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5522 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5524 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5525 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5527 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5528 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5532 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5534 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5535 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5547 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5550 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5553 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5554 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5556 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5557 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5560 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5563 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5564 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5566 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5567 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5569 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5570 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5572 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5573 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5576 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5579 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5582 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5586 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5590 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5593 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5595 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5596 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5598 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5599 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5605 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5606 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5611 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5615 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5618 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5619 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5623 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5624 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5629 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5630 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5632 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5633 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5635 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5636 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5638 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5639 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5641 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5643 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5644 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5646 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5647 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5649 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5650 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5653 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5661 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5662 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5665 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5666 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5669 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5670 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5673 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5674 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5677 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5678 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5681 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5682 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5690 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5697 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6257 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6264 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6266 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6290 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6292 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6313 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6328 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6330 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6347 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6362 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6375 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6377 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6391 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6393 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6597 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6628 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6633 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6638 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6647 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6659 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистить все" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7063 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -1663,197 +1668,213 @@ msgstr "Выбранные для удаления личные данные" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1189 ../midori/midori-view.c:4488 -#: ../midori/midori-view.c:4492 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1190 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Попытаться снова" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1473 ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2092 ../midori/midori-view.c:2472 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2144 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2152 ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2161 ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2166 ../midori/midori-view.c:2196 -#: ../midori/midori-view.c:2238 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2290 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2318 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2634 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2637 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3189 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "Установить число колонок" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "Введите число колонок:" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3768 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4028 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-view.c:4039 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4660 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4713 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Возможности" @@ -2097,6 +2118,14 @@ msgstr "Разделитель" msgid "Console" msgstr "Консоль" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Копировать все" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Копировать все" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Дополнения" @@ -2823,9 +2852,6 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "The current browser" #~ msgstr "Данный браузер" -#~ msgid "The current number of browsers" -#~ msgstr "Текущее число обозревателей" - #~ msgid "Kind" #~ msgstr "Тип" From 533db989d3e52fd7fb9143476be0e023663287f2 Mon Sep 17 00:00:00 2001 From: Andres Kovtunos Date: Sat, 22 May 2010 12:19:55 +0200 Subject: [PATCH 2614/2970] l10n: Updated Russian (ru) translation to 100% New status: 618 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 8374c026..0797fb73 100644 --- a/po/ru.po +++ b/po/ru.po @@ -307,7 +307,6 @@ msgid "Toplevel folder" msgstr "Корневая папка" #: ../midori/midori-browser.c:864 -#, fuzzy msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" @@ -1830,11 +1829,11 @@ msgstr "Введите число колонок:" #: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" -msgstr "" +msgstr "Установить число закладок" #: ../midori/midori-view.c:3509 msgid "Enter number of shortcuts:" -msgstr "" +msgstr "Введите число закладок:" #: ../midori/midori-view.c:3535 #, c-format From 8cb761239f85264d488eb0d04c37679e299e17ee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 22 May 2010 23:48:03 +0200 Subject: [PATCH 2615/2970] Show dialog if quitting while files are being downloaded --- midori/midori-browser.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ad5e391c..2bf7c971 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1899,6 +1899,42 @@ midori_browser_key_press_event (GtkWidget* widget, return widget_class->key_press_event (widget, event); } +static gboolean +midori_browser_delete_event (GtkWidget* widget, + GdkEventAny* event) +{ + MidoriBrowser* browser = MIDORI_BROWSER (widget); + GList* children; + GtkWidget* dialog = NULL; + gboolean cancel = FALSE; + + children = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); + if (g_list_length (children) > 1) + { + dialog = gtk_message_dialog_new (GTK_WINDOW (widget), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, + _("Some files are being downloaded")); + gtk_window_set_title (GTK_WINDOW (dialog), + _("Some files are being downloaded")); + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (dialog), + _("_Quit Midori"), GTK_RESPONSE_ACCEPT); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("The transfers will be cancelled if Midori quits.")); + } + g_list_free (children); + if (dialog != NULL) + { + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL) + cancel = TRUE; + gtk_widget_destroy (dialog); + } + + return cancel; +} + static void midori_browser_class_init (MidoriBrowserClass* class) { @@ -2062,6 +2098,7 @@ midori_browser_class_init (MidoriBrowserClass* class) gtkwidget_class = GTK_WIDGET_CLASS (class); gtkwidget_class->key_press_event = midori_browser_key_press_event; + gtkwidget_class->delete_event = midori_browser_delete_event; gobject_class = G_OBJECT_CLASS (class); gobject_class->dispose = midori_browser_dispose; From bbdaf4723df6db1aa5607369bb4a8d9e064fc774 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sun, 23 May 2010 07:38:03 +0200 Subject: [PATCH 2616/2970] l10n: Updated Japanese (ja) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ja.po | 904 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 475 insertions(+), 429 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1b4f2feb..81feedd6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-04 16:35+0900\n" -"PO-Revision-Date: 2010-05-04 16:34+0900\n" +"POT-Creation-Date: 2010-05-23 14:36+0900\n" +"PO-Revision-Date: 2010-05-23 14:33+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +23,7 @@ msgstr "軽量級ウェブブラウザ" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -251,211 +252,227 @@ msgstr "不正な形式のドキュメントです。" msgid "Unrecognized bookmark format." msgstr "認識できないブックマーク形式です。" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "スピードダイアルに追加(_S)" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "ファイル '%s' をダウンロードしました。" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "転送完了" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "ファイルのダウンロード中です" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "Midori を終了(_Q)" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Midori を終了すると転送がキャンセルされます。" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "空です" -#: ../midori/midori-browser.c:3690 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4570 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4572 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4574 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:4710 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4746 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" @@ -463,53 +480,53 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:5160 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -520,577 +537,577 @@ msgstr "" "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" # tooltip -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" # tooltip -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "デスクトップにショートカットを追加します" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "このニュースフィードを購読します" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" # tooltip -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "左へスクロールします" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "下へスクロール" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "上へスクロール" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "右へスクロールします" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:6208 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:6215 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:6279 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" # tooltip -#: ../midori/midori-browser.c:6281 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "ブックマーク(_B)" # tooltip -#: ../midori/midori-browser.c:6298 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:6342 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:6344 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "メニュー" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6548 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:6579 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:6584 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:6589 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:6598 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:6610 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "すべてクリア" -#: ../midori/midori-browser.c:7014 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -1120,660 +1137,660 @@ msgstr "データベース文の実行に失敗しました\n" msgid "Paste and p_roceed" msgstr "貼り付けて続行(_R)" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "選択したパネルをウィンドウから切り離す" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置する" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "操作コントロールを隠す" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "空白ページを表示" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "ホームページを表示" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "HTTP プロキシサーバ" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "プロキシサーバなし" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "最後のウィンドウの高さ" # tooltip -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "最後のパネルページ" # tooltip -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "メニューバーを表示する" # tooltip -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" # tooltip -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" # tooltip -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "パネルを表示する" # tooltip -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "転送バーを表示する" # tooltip -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "ステータスバーを表示する" # tooltip -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "ツールバー方式:" # tooltip -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" # tooltip -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" # tooltip -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "ツールバーアイテム" # tooltip -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" # tooltip -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "パネルの操作コントロールを表示する" # tooltip -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "パネルに操作コントロールを表示します" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" # tooltip -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "パネルを別のウィンドウで開く" # tooltip -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "パネルを常に別のウィンドウで開きます" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Midori を起動した時:" # tooltip -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Midori の起動時に表示するページを指定します" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "ホームページ:" # tooltip -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" # tooltip -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "新しいタブにスピードダイアルを表示する" # tooltip -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "新しく開かれたタブにスピードダイアルを表示します" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "ダウンロードファイルの保存先:" # tooltip -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "保存先フォルダを問い合わせる" # tooltip -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" # tooltip -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "ダウンロードマネージャ" # tooltip -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "テキストエディタ" # tooltip -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "フィードリーダ" # tooltip -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "ロケーションエントリの検索" # tooltip -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "文字のエンコーディング" # tooltip -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" # tooltip -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" # tooltip -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "新しくページを開く時:" # tooltip -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "外部ページを開く時:" # tooltip -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" # tooltip -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" # tooltip -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "画像を自動的に読み込む" # tooltip -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "スクリプトを有効にする" # tooltip -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" # tooltip -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にする" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にします" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にする" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にします" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にする" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にします" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" # tooltip -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" # tooltip -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "慣性スクロール" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "速度にしたがって慣性がかかったようにスクロールします" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Cookie の受け入れ" # tooltip -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" # tooltip -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" # tooltip -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "履歴の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" # tooltip -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "使用するプロキシサーバの種類を指定します" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "HTTP プロキシサーバ" # tooltip -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" # tooltip -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "識別名" # tooltip -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "識別文字列" # tooltip -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "言語の優先度" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1124 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1782,12 +1799,12 @@ msgstr "" "指定します。例 \"ja\"、\"en-us\" または \"ja;q=1.0, en-us;q=0.667\"" # Button title -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "プライベートデータのクリア" # FIXME: -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "選択されているプライベートデータを削除します" @@ -1795,198 +1812,214 @@ msgstr "選択されているプライベートデータを削除します" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482 -#: ../midori/midori-view.c:4486 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "エラー - %s" -#: ../midori/midori-view.c:1183 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "ページ '%s' を読み込めませんでした" -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "再試行" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "要素の検証(_E)" -#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "リンクをフォアグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2142 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "リンクをバックグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "ウェブアプリケーションとして実行する(_P)" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "リンク先をコピー(_S)" -#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2231 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:2168 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:2171 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "画像のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2174 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "画像をダウンロード(_M)" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:2248 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2645 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3179 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "スピードダイアル" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "カラム数の設定" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "カラム数を入力してください:" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "ショートカットの設定" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "ショートカット数を入力してください:" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:3758 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "タブの復元(_R)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "タブの最小化(_M)" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "機能" @@ -2174,65 +2207,69 @@ msgstr "検索エンジンの管理" msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "新しいフォルダ(_F)" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "ブックマーク" # tooltip -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "セパレータ" @@ -2240,6 +2277,15 @@ msgstr "セパレータ" msgid "Console" msgstr "コンソール" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "全てコピー(_A)" + +# tooltip +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "全てコピー" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "エクステンション" @@ -2277,30 +2323,30 @@ msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "フィルタ:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "保存先フォルダを開く(_F)" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "リンクの場所をコピー(_A)" @@ -2360,11 +2406,11 @@ msgstr "フォルダの選択" msgid "Preferences for %s" msgstr "%s の設定" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "広告フィルタの設定" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " @@ -2373,32 +2419,32 @@ msgstr "" "リストに追加するには、フィルタリストのアドレスを入力し \"追加\" ボタンをク" "リックしてください。フィルタリストは %s で見つけることができます。" -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "広告フィルタの設定(_A)..." -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "ルールの編集" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "ルール(_R):" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "画像をブロック(_O)" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "リンクをブロック(_O)" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "広告ブロッカ" # description -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "フィルタリストに登録された広告をブロックします" From e022e48451086e7f821db046949eb6dc051a7d42 Mon Sep 17 00:00:00 2001 From: Johannes Lips Date: Sun, 23 May 2010 18:47:13 +0200 Subject: [PATCH 2617/2970] l10n: Updated German (de) translation to 96% New status: 599 messages complete with 12 fuzzies and 10 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/de.po | 1195 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 612 insertions(+), 583 deletions(-) diff --git a/po/de.po b/po/de.po index c94755f4..f10ccc0f 100644 --- a/po/de.po +++ b/po/de.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the midori package. # Enrico Tröger 2008 # Christian Dywan 2008-2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-09 22:52+0200\n" +"POT-Creation-Date: 2010-05-23 16:07+0000\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1319 ../midori/main.c:1647 -#: ../midori/main.c:1655 ../midori/main.c:1671 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -31,198 +31,198 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:103 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:152 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:159 ../midori/main.c:245 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:371 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:426 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:446 -#, c-format +#: ../midori/main.c:445 +#, c-format, fuzzy msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:484 -#, c-format +#: ../midori/main.c:483 +#, c-format, fuzzy msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573 -#, c-format +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#, c-format, fuzzy msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:603 ../midori/main.c:626 +#: ../midori/main.c:602 ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:690 ../midori/main.c:907 -#, c-format +#: ../midori/main.c:684 ../midori/main.c:924 +#, c-format, fuzzy msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:941 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." +#: ../midori/main.c:868 +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " -"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:956 +#: ../midori/main.c:958 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." + +#: ../midori/main.c:973 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:960 +#: ../midori/main.c:977 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:965 +#: ../midori/main.c:982 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1200 ../midori/main.c:1920 +#: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1319 +#: ../midori/main.c:1336 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1338 +#: ../midori/main.c:1355 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1369 +#: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1540 +#: ../midori/main.c:1557 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1540 +#: ../midori/main.c:1557 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1543 +#: ../midori/main.c:1560 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1543 +#: ../midori/main.c:1560 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1546 +#: ../midori/main.c:1563 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:1548 +#: ../midori/main.c:1565 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1551 +#: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1554 +#: ../midori/main.c:1571 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1556 +#: ../midori/main.c:1573 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1558 +#: ../midori/main.c:1575 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1560 +#: ../midori/main.c:1577 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:1560 +#: ../midori/main.c:1577 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1564 +#: ../midori/main.c:1581 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:1564 +#: ../midori/main.c:1581 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:1644 +#: ../midori/main.c:1661 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1672 +#: ../midori/main.c:1689 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1674 +#: ../midori/main.c:1691 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1771 +#: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1819 +#: ../midori/main.c:1836 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1874 +#: ../midori/main.c:1891 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1903 +#: ../midori/main.c:1920 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1935 +#: ../midori/main.c:1952 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1949 +#: ../midori/main.c:1966 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1963 +#: ../midori/main.c:1980 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1979 +#: ../midori/main.c:1996 msgid "_Ignore" msgstr "_Ignorieren" @@ -239,782 +239,803 @@ msgstr "Fehlerhaftes Dokument" msgid "Unrecognized bookmark format." msgstr "Unbekanntes Lesezeichenformat." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5427 -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:452 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:490 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:744 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4582 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896 -#: ../midori/midori-browser.c:4587 ../midori/midori-browser.c:4619 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:845 +#: ../midori/midori-browser.c:864 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Zu Schnell_wahl hinzufügen" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:860 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4637 -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:990 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s von %s" -#: ../midori/midori-browser.c:1386 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Die Datei »%s« wurde heruntergeladen." -#: ../midori/midori-browser.c:1390 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../midori/midori-browser.c:1530 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2253 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#, fuzzy +msgid "Some files are being downloaded" +msgstr "Die Datei »%s« wurde heruntergeladen." + +#: ../midori/midori-browser.c:1923 +#, fuzzy +msgid "_Quit Midori" +msgstr "Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2329 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2370 ../midori/midori-browser.c:5492 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2927 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/midori-browser.c:3007 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Leer" -#: ../midori/midori-browser.c:3628 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/midori-browser.c:3942 ../midori/midori-browser.c:5886 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:4275 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:4282 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:4285 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4510 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4511 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4512 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4533 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Lesezeichen importieren..." -#: ../midori/midori-browser.c:4536 ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:4547 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4574 ../midori/midori-browser.c:5601 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 -#: ../katze/katze-utils.c:688 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:4648 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" -#: ../midori/midori-browser.c:4738 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:4874 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "»Flash« Cookies" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:4895 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-browser.c:4900 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Zwischenspeicher" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:5012 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der " -"GNU Lesser General Public License, wie von der Free Software Foundation " -"veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " -"2.1 der Lizenz oder (wahlweise) jeder späteren Version." +#: ../midori/midori-browser.c:5160 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version 2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:5342 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:5365 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Diese Nachrichtenquelle abonnieren" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Letzte Änderung rückgängig machen" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Die letzte Ä_nderung rückgängig machen" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:5396 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:5414 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:5453 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Nach links rollen" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:5456 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Herunter rollen" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Hoch rollen" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Nach rechts rollen" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Gehe zur voherigen Unterseite zurück" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:5503 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokusieren" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Den aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "In der letzten Sitzung geöffnete Reiter öffnen" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5582 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5589 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5592 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:6153 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:6155 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:6179 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:6181 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:6202 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:6219 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:6234 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:6251 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:6280 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6282 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Menü" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6486 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:6517 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:6522 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:6527 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:6536 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:6548 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:6594 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Alle entfernen" -#: ../midori/midori-browser.c:6952 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -1044,622 +1065,615 @@ msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n" msgid "Paste and p_roceed" msgstr "Einfügen und _fortfahren" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Gewählte Leiste vom Fenster ablösen" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Bedienelemente anzeigen" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Leere Seite anzeigen" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Startseite anzeigen" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Zuletzt geöffnete Reiter anzeigen" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Kleine Symbole" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME oder Umgebung)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "Kein Zwischenrechner" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:664 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "Bedienelemente der Leiste anzeigen" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Leisten in eigenen Fenstern öffnen" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Was beim Starten von Midori passieren soll" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Startseite:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Schnellwahl in neuen Reitern anzeigen" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Heruntergeladene Dateien speichern:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "Benachrichtigen bei Abschluss der Übertragung" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" -"Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" +msgstr "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Öffne neue Seiten in:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Öffne Seiten von außerhalb in:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape-Module einschalten" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "Eingebettete Netscape-Module einschalten" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "HTML5-Datenbanken einschalten" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "Unterstützung für HTML5-Datenbank einschalten" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "Unterstützung für HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "HTML5-Anwendungsspeicher einschalten" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "Sanfter Bildlauf" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "Ob der Bildlauf sanft schneller und langsamer wird" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "Die Art des zu verwendenden Zwischenrechners" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "Bevorzugte Sprachen" -#: ../midori/midori-websettings.c:1129 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur " -"Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru," -"nl« oder »en-us;q=1.0, fr-fr;q=0.667«" +#: ../midori/midori-websettings.c:1124 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Private Daten löschen" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" @@ -1667,205 +1681,214 @@ msgstr "Zum Löschen ausgewählte private Daten" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1128 ../midori/midori-view.c:4407 -#: ../midori/midori-view.c:4411 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:1134 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Erneut versuchen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1175 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1397 ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:2022 ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Element _untersuchen" -#: ../midori/midori-view.c:2074 ../midori/midori-view.c:2152 -msgid "Open _Link" -msgstr "Ver_weis öffnen" - -#: ../midori/midori-view.c:2077 ../midori/midori-view.c:2154 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2081 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Verweis in _Vordergrund-Reiter öffnen" -#: ../midori/midori-view.c:2082 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Verweis in _Hintergrund-Reiter öffnen" -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:2088 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Verweis als _Internetanwendung öffnen" -#: ../midori/midori-view.c:2091 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Verweisziel k_opieren" -#: ../midori/midori-view.c:2094 ../midori/midori-view.c:2173 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:2095 ../midori/midori-view.c:2167 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:2099 ../midori/midori-view.c:2135 -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:2111 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:2114 -msgid "Open Image in New Wi_ndow" -msgstr "Bild in neuem Fe_nster öffnen" - -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Bild_adresse kopieren" -#: ../midori/midori-view.c:2120 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Bild herunterla_den" -#: ../midori/midori-view.c:2128 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:2198 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:2233 ../midori/midori-view.c:2240 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2573 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2577 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3107 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:3368 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:3369 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:3370 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3371 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3372 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" -#: ../midori/midori-view.c:3409 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3509 +#, fuzzy +msgid "Enter number of shortcuts:" +msgstr "Ziel der Verknüpfung eingeben" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:3432 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:3682 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:3942 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:3947 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "Reiter _wiederherstellen" -#: ../midori/midori-view.c:3947 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "Reiter _minimieren" -#: ../midori/midori-view.c:3953 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:4580 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:4632 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Inhalte" @@ -1966,12 +1989,8 @@ msgstr "Rechtschreibwörterbücher" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Eine durch Kommas getrennte Liste von Sprachen, die für die " -"Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Eine durch Kommas getrennte Liste von Sprachen, die für die Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2045,83 +2064,68 @@ msgstr "Suchmaschinen verwalten" msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "Netscape-Module" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Benutzerskripte" - -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Benutzerstile" - -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "" -"Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den " -"Ordner »%s«." - -#: ../panels/midori-addons.c:911 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" +#: ../midori/sokoke.c:1307 +#, fuzzy +msgid "New _Folder" +msgstr "Neuer Ordner" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Trennlinie" @@ -2129,6 +2133,16 @@ msgstr "Trennlinie" msgid "Console" msgstr "Konsole" +#: ../panels/midori-console.c:361 +#, fuzzy +msgid "Copy _All" +msgstr "Alle einklappen" + +#: ../panels/midori-console.c:362 +#, fuzzy +msgid "Copy All" +msgstr "Alle einklappen" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Erweiterungen" @@ -2138,11 +2152,8 @@ msgid "Erroneous clock time" msgstr "Fehlerhafte Uhrzeit" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "" -"Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das " -"eingestellte Datum und die Uhrzeit." +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das eingestellte Datum und die Uhrzeit." #: ../panels/midori-history.c:286 msgid "A week ago" @@ -2167,28 +2178,28 @@ msgstr "Gestern" msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Zielordner ö_ffnen" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Verweisziel ko_pieren" @@ -2216,30 +2227,30 @@ msgstr "Kennwort" msgid "_Remember password" msgstr "Kennwort _merken" -#: ../katze/katze-throbber.c:842 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Das benannte Symbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:855 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" -#: ../katze/katze-throbber.c:923 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:556 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -2248,48 +2259,74 @@ msgstr "Dateispeicherordner auswählen" msgid "Preferences for %s" msgstr "Einstellungen für %s" -#: ../extensions/adblock.c:409 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Werbefilter einstellen" -#: ../extensions/adblock.c:441 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld " -"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " -"Listen finden Sie auf %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere Listen finden Sie auf %s." -#: ../extensions/adblock.c:581 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Werbefilter einstellen..." -#: ../extensions/adblock.c:835 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Regel bearbeiten" -#: ../extensions/adblock.c:848 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regel:" -#: ../extensions/adblock.c:902 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bild bloc_kieren" -#: ../extensions/adblock.c:907 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Verweis blo_ckieren" -#: ../extensions/adblock.c:1481 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:1482 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "" + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Benutzerskripte" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Benutzerstile" + +#: ../extensions/addons.c:1085 +#, fuzzy, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Die Konfiguration konnte nicht geladen werden. %s" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "" + #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Farbige Reiter" @@ -2308,12 +2345,8 @@ msgid "Delete All" msgstr "Alle löschen" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " -"Einträge gelöscht, die auf den Filter passen" +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene Einträge gelöscht, die auf den Filter passen" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2333,8 +2366,7 @@ msgstr "Frage" #: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." -msgstr "" -"Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." +msgstr "Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." #: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" @@ -2387,12 +2419,8 @@ msgid "_Collapse All" msgstr "Alle _einklappen" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " -"Domöne auf den eingegebenen Filter passt." +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder Domöne auf den eingegebenen Filter passt." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2404,13 +2432,11 @@ msgstr "Profildateien auflisten, anzeigen und löschen" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" -"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" -"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2452,8 +2478,7 @@ msgstr "XML-Quelle konnte nicht ausgelesen werden: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" -"Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2465,8 +2490,7 @@ msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden. #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" -"Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/main.c:132 msgid "Error" @@ -2512,11 +2536,11 @@ msgstr "Konfigurationsdateien nicht installiert" msgid "Form history filler" msgstr "Formularvervollständigung" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Mausgesten" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" @@ -2594,12 +2618,8 @@ msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen " -"sich durch Ziehen und Ablegen ordnen." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen sich durch Ziehen und Ablegen ordnen." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2625,6 +2645,15 @@ msgstr "Werkzeugleisten leicht anpassen" msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" +#~ msgid "Open _Link" +#~ msgstr "Ver_weis öffnen" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "Bild in neuem Fe_nster öffnen" + +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den Ordner »%s«." + #~ msgid "Failed to get current time: %s\n" #~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n" From a41111ceb11af82895fd2de8b761cb18813f2409 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Sun, 23 May 2010 20:46:07 +0200 Subject: [PATCH 2618/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 514 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 277 insertions(+), 237 deletions(-) diff --git a/po/uk.po b/po/uk.po index e0806ad6..bf8ef818 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-17 10:07+0000\n" +"POT-Creation-Date: 2010-05-23 16:07+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -244,777 +244,793 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Додати до шви_дкого виклику" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s з %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл '%s' завантажено." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Передачу завершено" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Деякі файли завантажено." + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "_Вийти з Мідорі" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не вдалось виконати запит бази даних: %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Останньо відвідані сторінки" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "Знайти _входження:" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Попереднє" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Наступне" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Врахувати регістр" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Підсвітити збіги" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистити все" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -1660,197 +1676,213 @@ msgstr "Приватні дані, що вибрані для очищення" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4505 -#: ../midori/midori-view.c:4509 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Помилка - %s" -#: ../midori/midori-view.c:1243 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Сторінку '%s' неможливо завантажити." -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Спробуйте знову" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Не знайдено - %s" -#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Послати повідомлення до %s" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Перевірити _елемент" -#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Відкрити посилання у новій в_кладці" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Відкривати посилання у в_кладці переднього плану" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Відкрити посилання у фоновій в_кладці" -#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Відкрити посилання у новому _вікні" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Відкрити посилання як веб-_додаток" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Копіювати поси_лання" -#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "Збер_ігати віддаленні посилання" -#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "За_вантажувати віддалені посилання" -#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Завантажувати в менеджері завантажень" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Відкрити зображення у новій _вкладці" -#: ../midori/midori-view.c:2206 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Копіювати адрес _зображення" -#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Зберегти з_ображення" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Завантажити _зображення" -#: ../midori/midori-view.c:2217 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Скопіювати адресу _відео" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Зберегти _відео" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Завантажити _відео" -#: ../midori/midori-view.c:2283 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Шукати _з" -#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Шукати Веб" -#: ../midori/midori-view.c:2346 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2643 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2665 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2669 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3217 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:3482 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Швидкий виклик" -#: ../midori/midori-view.c:3483 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:3484 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:3486 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:3512 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "Встановити кількість колонок" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "Введіть число колонок:" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "Встановити кількість скорочень" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "Введіть кількість скорочень:" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Не можу відобразити документ" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Документація не заінстальована" -#: ../midori/midori-view.c:3785 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4045 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4050 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Відновити вкладку" -#: ../midori/midori-view.c:4050 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Мінімізувати вкладку" -#: ../midori/midori-view.c:4056 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4678 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4730 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Опції" @@ -2094,6 +2126,14 @@ msgstr "Роздільник" msgid "Console" msgstr "Консоль" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Копіювати _все" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Копіювати все" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Розширення" From fd445571c732791737881b220c148a1507b12106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Sun, 23 May 2010 22:04:07 +0200 Subject: [PATCH 2619/2970] l10n: Updates to Croatian (hr) translation New status: 364 messages complete with 0 fuzzies and 246 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 84 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/po/hr.po b/po/hr.po index 66f9dc94..8080c90a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,14 +1,14 @@ # Croatian translations for PACKAGE package. # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# , 2010. +# Ivica Kolić , 2010. # msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-10 16:06+0000\n" -"PO-Revision-Date: 2010-05-16 04:49+0200\n" +"PO-Revision-Date: 2010-05-23 21:59+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -142,7 +142,7 @@ msgstr "MAPA" #: ../midori/main.c:1563 msgid "Show a diagnostic dialog" -msgstr "" +msgstr "Pokaži dijagnostički dijalog" #: ../midori/main.c:1565 msgid "Run the specified filename as javascript" @@ -223,7 +223,7 @@ msgstr "Povijest ne može biti učitana: %s\n" #: ../midori/main.c:1980 msgid "The following errors occured:" -msgstr "" +msgstr "Došlo je do slijedećih grešaka" #: ../midori/main.c:1996 msgid "_Ignore" @@ -240,12 +240,12 @@ msgstr "" #: ../midori/midori-array.c:504 msgid "Unrecognized bookmark format." -msgstr "" +msgstr "Neprepoznatljiv format zabilješke" #: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." -msgstr "" +msgstr "Neuspješno pisanje" #: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 #: ../midori/midori-browser.c:5517 @@ -377,7 +377,7 @@ msgstr "" #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." -msgstr "" +msgstr "ne mogu pokrenuti vanjski program" #: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 #, c-format @@ -449,7 +449,7 @@ msgstr "Neuspjeli izvoz zabilješki" #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Neuspjelo micanje stavke povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu #: ../midori/midori-browser.c:4930 @@ -479,7 +479,7 @@ msgstr "'Flash' kolačići" #: ../midori/midori-browser.c:4975 msgid "Website icons" -msgstr "" +msgstr "Website ikone" #: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 msgid "_Closed Tabs" @@ -1029,7 +1029,7 @@ msgstr "" #: ../midori/midori-locationaction.c:377 #, c-format msgid "Failed to select from history\n" -msgstr "" +msgstr "Neuspio odabir iz povijesti\n" #: ../midori/midori-locationaction.c:459 #, c-format @@ -1102,7 +1102,7 @@ msgstr "Trenutna kartica" #: ../midori/midori-websettings.c:264 msgid "Default" -msgstr "Početno" +msgstr "Zadano" #: ../midori/midori-websettings.c:265 msgid "Icons" @@ -1291,7 +1291,7 @@ msgstr "Stavke alatne trake" #: ../midori/midori-websettings.c:553 msgid "The items to show on the toolbar" -msgstr "" +msgstr "Stavke za prikazivanje u alatnoj traci" #: ../midori/midori-websettings.c:561 msgid "Compact Sidepanel" @@ -1368,7 +1368,7 @@ msgstr "" #: ../midori/midori-websettings.c:693 msgid "Ask for the destination folder" -msgstr "" +msgstr "Pitaj za odredišnu mapu" #: ../midori/midori-websettings.c:694 msgid "Whether to ask for the destination folder when downloading a file" @@ -1448,7 +1448,7 @@ msgstr "Gdje otvoriti nove stranice" #: ../midori/midori-websettings.c:808 msgid "Open external pages in:" -msgstr "" +msgstr "Otvori vanjske stranice u" #: ../midori/midori-websettings.c:809 msgid "Where to open externally opened pages" @@ -1456,7 +1456,7 @@ msgstr "" #: ../midori/midori-websettings.c:818 msgid "Middle click opens Selection" -msgstr "" +msgstr "Srednji klik otvara odabir" #: ../midori/midori-websettings.c:819 msgid "Load an address from the selection via middle click" @@ -1584,7 +1584,7 @@ msgstr "" #: ../midori/midori-websettings.c:1016 msgid "Remember last visited pages" -msgstr "" +msgstr "Zapamti zadnje posjećene stranice" #: ../midori/midori-websettings.c:1017 msgid "Whether the last visited pages are saved" @@ -1596,11 +1596,11 @@ msgstr "" #: ../midori/midori-websettings.c:1026 msgid "The maximum number of days to save the history for" -msgstr "" +msgstr "Maksimalni broj dana čuvanja povijesti" #: ../midori/midori-websettings.c:1034 msgid "Remember last downloaded files" -msgstr "" +msgstr "Zapamti zadnje preuzete datoteke" #: ../midori/midori-websettings.c:1035 msgid "Whether the last downloaded files are saved" @@ -1663,7 +1663,7 @@ msgstr "Očisti privatne podatke" #: ../midori/midori-websettings.c:1145 msgid "The private data selected for deletion" -msgstr "" +msgstr "Privatni podaci odabrani za brisanje" #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. @@ -1721,15 +1721,15 @@ msgstr "Otvori poveznicu kao Web A_plikaciju" #: ../midori/midori-view.c:2159 msgid "Copy Link de_stination" -msgstr "" +msgstr "Kopiraj oderedište po_veznice" #: ../midori/midori-view.c:2162 ../midori/midori-view.c:2234 msgid "_Save Link destination" -msgstr "" +msgstr "_Spremi odredište poveznice" #: ../midori/midori-view.c:2163 ../midori/midori-view.c:2228 msgid "_Download Link destination" -msgstr "" +msgstr "_Odredište poveznice preuzimanja" #: ../midori/midori-view.c:2167 ../midori/midori-view.c:2197 #: ../midori/midori-view.c:2239 @@ -1754,15 +1754,15 @@ msgstr "Preuzmi S_liku" #: ../midori/midori-view.c:2190 msgid "Copy Video _Address" -msgstr "" +msgstr "Kopiraj video _adresu" #: ../midori/midori-view.c:2193 msgid "Save _Video" -msgstr "" +msgstr "Spremi _video" #: ../midori/midori-view.c:2193 msgid "Download _Video" -msgstr "" +msgstr "Preuzmi _video" #: ../midori/midori-view.c:2256 msgid "Search _with" @@ -1824,12 +1824,12 @@ msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" #: ../midori/midori-view.c:3496 #, c-format msgid "Document cannot be displayed" -msgstr "" +msgstr "Dokument ne može biti prikazan" #: ../midori/midori-view.c:3519 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "Dokumentacija nije instalirana" #: ../midori/midori-view.c:3769 msgid "Blank page" @@ -1837,15 +1837,15 @@ msgstr "Prazna stranica" #: ../midori/midori-view.c:4029 msgid "_Duplicate Tab" -msgstr "" +msgstr "_Udvostuči karticu" #: ../midori/midori-view.c:4034 msgid "_Restore Tab" -msgstr "" +msgstr "_Obnovi karticu" #: ../midori/midori-view.c:4034 msgid "_Minimize Tab" -msgstr "" +msgstr "_Minimiziraj karticu" #: ../midori/midori-view.c:4040 msgid "Close ot_her Tabs" @@ -1866,7 +1866,7 @@ msgstr "" #. Page "General" #: ../midori/midori-preferences.c:298 msgid "General" -msgstr "Općenito" +msgstr "Osnovno" #: ../midori/midori-preferences.c:299 msgid "Startup" @@ -1899,7 +1899,7 @@ msgstr "" #: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" -msgstr "" +msgstr "Zadania veličina fonata za prikaz teksta" #: ../midori/midori-preferences.c:360 msgid "Fixed-width Font Family" @@ -1919,7 +1919,7 @@ msgstr "Najmanja veličina fonta" #: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" -msgstr "" +msgstr "Najmnja veličina fonta za prikaz teksta" #. Page "Behavior" #: ../midori/midori-preferences.c:380 @@ -1985,7 +1985,7 @@ msgstr "Aplikacije" #: ../midori/midori-preferences.c:469 msgid "External applications" -msgstr "" +msgstr "Vanjske aplikacije" #. Page "Network" #: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 @@ -1994,7 +1994,7 @@ msgstr "Mreža" #: ../midori/midori-preferences.c:492 msgid "Hostname" -msgstr "" +msgstr "Ime računala" #. Page "Privacy" #: ../midori/midori-preferences.c:511 @@ -2035,7 +2035,7 @@ msgstr "" #: ../midori/midori-searchaction.c:1335 msgid "Use as _default" -msgstr "" +msgstr "koristi kao _zadano" #: ../midori/sokoke.c:1294 msgid "_Bookmark" @@ -2136,7 +2136,7 @@ msgstr "Jučer" #: ../panels/midori-history.c:378 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "Jeste li sigurni da želite ukloniti sve stavke povijesti?" #: ../panels/midori-history.c:438 msgid "Bookmark the selected history item" @@ -2144,7 +2144,7 @@ msgstr "Zabilježi odabranu stavku povijesti" #: ../panels/midori-history.c:447 msgid "Delete the selected history item" -msgstr "" +msgstr "Izbriši odabranu stavku povijesti" #: ../panels/midori-history.c:455 msgid "Clear the entire history" @@ -2153,11 +2153,11 @@ msgstr "Obriši cijelu povijest" #: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" -msgstr "" +msgstr "Filter:" #: ../panels/midori-transfers.c:479 msgid "Open Destination _Folder" -msgstr "" +msgstr "Otvori odredišnu _mapu" #: ../panels/midori-transfers.c:482 msgid "Copy Link Loc_ation" @@ -2302,7 +2302,7 @@ msgstr "Upravitelj kolačićima" #: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" -msgstr "" +msgstr "Izbriši sve" #: ../extensions/cookie-manager/cookie-manager-page.c:114 msgid "" @@ -2359,6 +2359,8 @@ msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" +"Domena: %s\n" +"Kolačići: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" From cc0e6d0f3d379e6bc89c8dba5f1e8e317c16c5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Mon, 24 May 2010 03:01:17 +0200 Subject: [PATCH 2620/2970] l10n: Updates to Croatian (hr) translation New status: 373 messages complete with 0 fuzzies and 248 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 890 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 467 insertions(+), 423 deletions(-) diff --git a/po/hr.po b/po/hr.po index 8080c90a..aad36895 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 16:06+0000\n" -"PO-Revision-Date: 2010-05-23 21:59+0200\n" +"POT-Creation-Date: 2010-05-23 22:07+0000\n" +"PO-Revision-Date: 2010-05-24 02:57+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "Lagani web preglednik" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -247,257 +247,273 @@ msgstr "Neprepoznatljiv format zabilješke" msgid "Writing failed." msgstr "Neuspješno pisanje" -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Naslov" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Opis" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresa" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Mapa" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Dodaj u Brzo_biranje" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "_Isključi Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Prijenosi će biti odgođeni ako se Midori isključi" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" -msgstr "Otvori sve u _Karticama" +msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otvori u novoj_kartici" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otvori u novom_prozoru" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Uvezi zabilješke" -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Aplikacija" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Prilagođeno" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Neuspjelo micanje stavke povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Website ikone" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" -msgstr "" +msgstr "Očisti privatne podatke kad _isključuješ Midori" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5160 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -505,523 +521,523 @@ msgid "" "option) any later version." msgstr "" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" -msgstr "preveo-zahvale" +msgstr "Ivica Kolić ikoli@yahoo.com" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Novi_prozor" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo_biranje" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" -msgstr "" +msgstr "Isključi aplikaciju" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" -msgstr "Izreži označenii tekst" +msgstr "Izreži označeni tekst" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Nađ i_Slijedeće" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" -msgstr "Dodaj novu_mapu" +msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Lokacija" -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Web pretraživanje" -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Nedavno posjećene stranice" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Izbornik" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Prethodno" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Slijedeće" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -1051,617 +1067,617 @@ msgstr "" msgid "Paste and p_roceed" msgstr "" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Zatvori panel" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Pokaži praznu stranicu" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Zadano" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Tekst ispod ikona" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Svi kolačići" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Zadnja širina prozora" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Zadnja sačuvana širina prozora" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Zadnja pozicija panela" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Zadnja spremljena pozicija panela" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Pokaži panel" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Stavke za prikazivanje u alatnoj traci" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Otvori panele u zasebnim prozorima" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Kad se Midori pokrene" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Početna stranica" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Pokaži brzo biranje u novim karticama" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Pokaži brzo biranje u novootvorenim karticama" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Pitaj za odredišnu mapu" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Otvori nove stranice u" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Otvori vanjske stranice u" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Omoogući Netscape priključke" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Prihvati kolačiće" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Koju vrstu kolačića prihvatiti" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Samo izvorne kolačiće" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "Prihvati kolačiće samo sa izvorne web stranice" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Zapamti zadnje posjećene stranice" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "Maksimalni broj dana čuvanja povijesti" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Zapamti zadnje preuzete datoteke" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1124 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" @@ -1669,197 +1685,213 @@ msgstr "Privatni podaci odabrani za brisanje" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1190 ../midori/midori-view.c:4489 -#: ../midori/midori-view.c:4493 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Greška %s" -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "" -#: ../midori/midori-view.c:1196 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Pokušaj ponovo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1474 ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Pošalji poruku %s" -#: ../midori/midori-view.c:2093 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2215 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj_kartici" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u pozadinskoj_kartici" -#: ../midori/midori-view.c:2153 ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom_prozoru" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Otvori poveznicu kao Web A_plikaciju" -#: ../midori/midori-view.c:2159 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Kopiraj oderedište po_veznice" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2234 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Spremi odredište poveznice" -#: ../midori/midori-view.c:2163 ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Odredište poveznice preuzimanja" -#: ../midori/midori-view.c:2167 ../midori/midori-view.c:2197 -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2179 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Kopiraj adresu _slike" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Sačuvaj S_liku" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Preuzmi S_liku" -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2291 ../midori/midori-view.c:2298 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj_kartici" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2642 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečace" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:3459 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:3496 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "Unesi broj prečaca" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Dokument ne može biti prikazan" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:3769 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "_Udvostuči karticu" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Obnovi karticu" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Minimiziraj karticu" -#: ../midori/midori-view.c:4040 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "" -#: ../midori/midori-view.c:4662 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4714 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "" @@ -2043,7 +2075,7 @@ msgstr "_Zabilješka" #: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" -msgstr "Dodaj_zabilješku" +msgstr "Dodaj za_bilješku" #: ../midori/sokoke.c:1297 msgid "_Console" @@ -2077,23 +2109,27 @@ msgstr "_Prijenosi" msgid "Netscape p_lugins" msgstr "Netscape p_riključci" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "Nova _mapa" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Zabilješke" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Uredi odabrane zabilješke" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Izbriši odabrane zabilješke" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Dodaj novu mapu" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Razdjelnik" @@ -2101,6 +2137,14 @@ msgstr "Razdjelnik" msgid "Console" msgstr "" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Kopiraj _sve" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Kopiraj sve" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Proširenja" @@ -2138,28 +2182,28 @@ msgstr "Jučer" msgid "Are you sure you want to remove all history items?" msgstr "Jeste li sigurni da želite ukloniti sve stavke povijesti?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Zabilježi odabranu stavku povijesti" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Izbriši odabranu stavku povijesti" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Obriši cijelu povijest" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Otvori odredišnu _mapu" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "" @@ -2217,42 +2261,42 @@ msgstr "Izaberi mapu" msgid "Preferences for %s" msgstr "Osobitosti za %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "" "Type the address of a preconfigured filter list in the text entry and click " "\"Add\" to add it to the list. You can find more lists at %s." msgstr "" -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Uredi pravilo" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Pravilo" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_okiraj sliku" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "" From a9ce85cc3542feaf5966e5af01808d52060b7fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Mon, 24 May 2010 07:18:35 +0200 Subject: [PATCH 2621/2970] l10n: Updated Czech (cs) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 354 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 183 insertions(+), 171 deletions(-) diff --git a/po/cs.po b/po/cs.po index 4fd14b9a..e7afbf95 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-21 04:08+0000\n" +"POT-Creation-Date: 2010-05-24 04:07+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -245,12 +245,12 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" @@ -298,12 +298,12 @@ msgstr "_Popis:" msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Adresář:" #: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Hlavní adresář" @@ -329,8 +329,8 @@ msgstr "Není dost místa pro stažení \"%s\"." msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Uložit soubor jako" @@ -352,674 +352,686 @@ msgstr "Přenos dokončen" msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Ještě se stahují nějaké soubory." + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "U_končit Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Nabídka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Smazat vše" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" From cc554248dbd8a23000019cd753179a799a6e1a62 Mon Sep 17 00:00:00 2001 From: Xu Meihong Date: Mon, 24 May 2010 08:43:11 +0200 Subject: [PATCH 2622/2970] l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/zh_CN.po | 458 +++++++++++++++++++++++++++------------------------- 1 file changed, 235 insertions(+), 223 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f6c2dbe4..4124c418 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-19 10:07+0000\n" -"PO-Revision-Date: 2010-05-19 21:27+0800\n" +"POT-Creation-Date: 2010-05-24 04:07+0000\n" +"PO-Revision-Date: 2010-05-24 14:48+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -248,12 +248,12 @@ msgstr "不能识别的书签格式。" msgid "Writing failed." msgstr "写入失败。" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "停止载入当前页" @@ -301,12 +301,12 @@ msgstr "描述(_D):" msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "目录(_F):" #: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "最上层目录" @@ -332,8 +332,8 @@ msgstr "可用空间不足以下载 \"%s\"。" msgid "The file needs %s but only %s are left." msgstr "该文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "文件另存为" @@ -355,154 +355,166 @@ msgstr "下载完成" msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "有文件下载正在进行中" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "退出 Midori(_Q)" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "如果退出 Midori，正在执行的下载将会被取消。" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "新建订阅" -#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "无法运行外部程序。" -#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "添加新历史项目失败: %s\n" -#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "导入书签..." -#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "应用程序(_A):" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "定制..." -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "导入书签失败" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "导出书签失败" -#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "关闭的标签页(_C)" -#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "网页缓存" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "退出 Midori 前清除隐私数据(_Q)" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "轻量级的网页浏览器." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -513,525 +525,525 @@ msgstr "" "条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选" "择）更新的版本。" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" "Hunt Xu , 2009, 2010." -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "打开一个新标签" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "隐私浏览(_R)" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "添加到快速拨号(_D)" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "添加快捷方式到桌面(_D)" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "添加快捷方式到桌面" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "添加到新闻订阅(_F)" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "添加到此新闻订阅" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "撤销上个改动" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "重复上个修改" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "剪切" -#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "复制" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "从剪贴板粘贴" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "删除" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "全选" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "在页面中查找" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "查找该词或短语出现的下一处地方" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "查找该词或短语出现的上一处地方" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "放大" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "缩小" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "恢复默认大小" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "查看页面的源代码" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "切换全屏" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "向左滚动" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "向下滚动" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "向上滚动" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "向右滚动" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "前进(_G)" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "转到下一页" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "返回上个子页" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "转到下个子页" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "删除回收站中的内容" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "打开最后关闭的标签" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "添加新目录(_F)" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "添加、编辑和移除搜索引擎..." -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "清除隐私数据..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "检查页面详细信息并使用开发者工具..." -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "上一个标签(_P)" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "转到上一个标签" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "下一个标签(_N)" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "转到下一个标签" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "聚焦到当前标签页(_C)" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "聚焦到当前标签页" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "打开上次运行时的标签页" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "显示 FAQ" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "报告 Bug(_R)" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "侧栏(_P)" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "显示侧栏" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "朝鲜语 (EUC-KR)" -#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "位置(_L)..." -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "搜索网页(_W)..." -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "运行网页搜索" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签或窗口" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "菜单" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "在文中查找(_I):" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "清除所有项目" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" @@ -1681,213 +1693,213 @@ msgstr "选中要删除的隐私数据" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509 -#: ../midori/midori-view.c:4513 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "错误 - %s" -#: ../midori/midori-view.c:1243 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "网页 '%s' 无法打开。" -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "重试" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "发送消息到 %s" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "检查网页元素(_E)" -#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "在前台标签页中打开链接(_F)" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "在后台标签中打开链接(_B)" -#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "将链接作为 Web 应用程序运行(_P)" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "复制链接目标(_S)" -#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "在新标签页中打开图像(_I)" -#: ../midori/midori-view.c:2206 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "复制图像地址(_A)" -#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "保存图像文件(_M)" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "下载图像(_M)" -#: ../midori/midori-view.c:2217 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "复制视频地址(_A)" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "保存视频文件(_V)" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "下载视频文件(_V)" -#: ../midori/midori-view.c:2283 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "使用...搜索(_W)" -#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "搜索网页(_S)" -#: ../midori/midori-view.c:2346 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2643 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:2665 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2669 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3217 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:3482 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3483 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:3484 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3486 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "确认删除此快捷方式？" -#: ../midori/midori-view.c:3487 +#: ../midori/midori-view.c:3506 msgid "Set number of columns" msgstr "设置列数" -#: ../midori/midori-view.c:3488 +#: ../midori/midori-view.c:3507 msgid "Enter number of columns:" msgstr "输入列数:" -#: ../midori/midori-view.c:3489 +#: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" msgstr "设置快捷方式数目" -#: ../midori/midori-view.c:3490 +#: ../midori/midori-view.c:3509 msgid "Enter number of shortcuts:" msgstr "输入快捷方式数:" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-view.c:3789 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "空白页" -#: ../midori/midori-view.c:4049 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "恢复标签(_R)" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "最小化标签(_M)" -#: ../midori/midori-view.c:4060 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "关闭其他标签(_H)" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "打印背景图片" -#: ../midori/midori-view.c:4682 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图片" -#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "特性" From d03da50412a9d7b820ed3acb72e80c90cfcd9004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Mon, 24 May 2010 11:24:45 +0200 Subject: [PATCH 2623/2970] l10n: Updated Croatian (hr) translation to 60% New status: 376 messages complete with 0 fuzzies and 245 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 53 ++++++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/po/hr.po b/po/hr.po index aad36895..726f8147 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,20 +2,19 @@ # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Ivica Kolić , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 22:07+0000\n" +"POT-Creation-Date: 2010-05-24 04:07+0000\n" "PO-Revision-Date: 2010-05-24 02:57+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" @@ -81,17 +80,14 @@ msgstr "Smeće ne može biti spremljeno %s" #: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" -msgstr "" +msgstr "Prazan" #: ../midori/main.c:868 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" #: ../midori/main.c:958 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "" #: ../midori/main.c:973 @@ -387,7 +383,7 @@ msgstr "" #: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" -msgstr "" +msgstr "Prazan" #: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 @@ -514,11 +510,7 @@ msgid "A lightweight web browser." msgstr "Lagani web preglednik" #: ../midori/midori-browser.c:5160 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "" #: ../midori/midori-browser.c:5179 @@ -970,7 +962,7 @@ msgstr "Pokreni web pretraživanje" #: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" -msgstr "" +msgstr "Ponovo otvori prethodno zatvorenu karticu ili prozor" #: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" @@ -1668,9 +1660,7 @@ msgid "Preferred languages" msgstr "" #: ../midori/midori-websettings.c:1124 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" #: ../midori/midori-websettings.c:1139 @@ -1992,9 +1982,7 @@ msgstr "" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "" #. Page "Interface" @@ -2154,8 +2142,7 @@ msgid "Erroneous clock time" msgstr "" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." +msgid "The clock time lies in the past. Please check the current date and time." msgstr "" #: ../panels/midori-history.c:286 @@ -2267,9 +2254,7 @@ msgstr "" #: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "" #: ../extensions/adblock.c:587 @@ -2349,9 +2334,7 @@ msgid "Delete All" msgstr "Izbriši sve" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:129 @@ -2419,9 +2402,7 @@ msgid "_Collapse All" msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "" #: ../extensions/cookie-manager/main.c:40 @@ -2620,9 +2601,7 @@ msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" #: ../extensions/toolbar-editor.c:421 From 94bbfa5cae7dcd20c89a4551b29d59a7046d9fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Mon, 24 May 2010 11:45:43 +0200 Subject: [PATCH 2624/2970] l10n: Updated Croatian (hr) translation to 63% New status: 393 messages complete with 0 fuzzies and 228 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/hr.po b/po/hr.po index 726f8147..17c1a13a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -663,11 +663,11 @@ msgstr "_Alatne trake" #: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" -msgstr "" +msgstr "Povećaj razinu zumiranja" #: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" -msgstr "" +msgstr "Smani razinu zumiranja" #: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" @@ -679,7 +679,7 @@ msgstr "" #: ../midori/midori-browser.c:5593 msgid "View So_urce" -msgstr "" +msgstr "Kodnaa stranica" #: ../midori/midori-browser.c:5594 msgid "View the source code of the page" @@ -950,7 +950,7 @@ msgstr "_Lokacija" #: ../midori/midori-browser.c:6303 msgid "Open a particular location" -msgstr "" +msgstr "Otvorite određenu lokaciju" #: ../midori/midori-browser.c:6327 msgid "_Web Search..." @@ -1684,7 +1684,7 @@ msgstr "Greška %s" #: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "" +msgstr "Stranica '% s' nije mogla bitt iučitana" #: ../midori/midori-view.c:1264 msgid "Try again" @@ -1694,7 +1694,7 @@ msgstr "Pokušaj ponovo" #: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Nije pronađeno -% s" #: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format @@ -1789,12 +1789,12 @@ msgstr "Otvori ili preuzmi datoteku" #: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" -msgstr "" +msgstr "Vrsta datoteke: '% s'" #: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" -msgstr "" +msgstr "Vrsta datoteke:% s ('% s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" #: ../midori/midori-view.c:2688 @@ -1829,15 +1829,15 @@ msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" #: ../midori/midori-view.c:3506 msgid "Set number of columns" -msgstr "" +msgstr "Postavite broj stupaca" #: ../midori/midori-view.c:3507 msgid "Enter number of columns:" -msgstr "" +msgstr "Unesite broj stupaca:" #: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" -msgstr "" +msgstr "Postavite broj prečaca" #: ../midori/midori-view.c:3509 msgid "Enter number of shortcuts:" @@ -1875,7 +1875,7 @@ msgstr "Zatvori dr_uge kartice" #: ../midori/midori-view.c:4700 msgid "Print background images" -msgstr "" +msgstr "Ispis pozadinske slike" #: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" @@ -1978,7 +1978,7 @@ msgstr "" #: ../midori/midori-preferences.c:425 msgid "Spelling dictionaries:" -msgstr "" +msgstr "Pravopisni rječnici:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 @@ -2051,7 +2051,7 @@ msgstr "" #: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" -msgstr "" +msgstr "Upravljanje Tražilicama" #: ../midori/midori-searchaction.c:1335 msgid "Use as _default" @@ -2143,7 +2143,7 @@ msgstr "" #: ../panels/midori-history.c:274 msgid "The clock time lies in the past. Please check the current date and time." -msgstr "" +msgstr "Sat vremena leži u prošlosti. Molimo provjerite trenutni datum i vrijeme." #: ../panels/midori-history.c:286 msgid "A week ago" @@ -2542,11 +2542,11 @@ msgstr "" #: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" -msgstr "" +msgstr "Prilagodi prečace tipkovnice" #: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." -msgstr "" +msgstr "Prilagodi pr_ečace" #: ../extensions/shortcuts.c:315 msgid "Shortcuts" From bf70878903dee38fa9a795e4d942d9e6715b8d74 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 24 May 2010 13:00:10 +0200 Subject: [PATCH 2625/2970] Update German translation --- po/de.po | 161 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 103 insertions(+), 58 deletions(-) diff --git a/po/de.po b/po/de.po index f10ccc0f..990a3201 100644 --- a/po/de.po +++ b/po/de.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the midori package. # Enrico Tröger 2008 # Christian Dywan 2008-2010 -# +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.4\n" +"Project-Id-Version: midori 0.2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 16:07+0000\n" +"POT-Creation-Date: 2010-05-24 12:49+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,17 +59,17 @@ msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #: ../midori/main.c:445 -#, c-format, fuzzy +#, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" #: ../midori/main.c:483 -#, c-format, fuzzy +#, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" #: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 -#, c-format, fuzzy +#, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" @@ -79,17 +80,22 @@ msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" #: ../midori/main.c:684 ../midori/main.c:924 -#, c-format, fuzzy +#, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" #: ../midori/main.c:868 -msgid "No root certificate file is available. SSL certificates cannot be verified." +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "" #: ../midori/main.c:958 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " +"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." #: ../midori/main.c:973 msgid "Modify _preferences" @@ -307,7 +313,6 @@ msgid "Toplevel folder" msgstr "Oberster Ordner" #: ../midori/midori-browser.c:864 -#, fuzzy msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" @@ -322,12 +327,12 @@ msgstr "Als _Internetanwendung starten" #: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "" +msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen." #: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." -msgstr "" +msgstr "Die Datei benötigt %s, aber nur %s sind übrig." #: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 #: ../midori/midori-browser.c:4818 @@ -353,18 +358,16 @@ msgid "Save file" msgstr "Datei speichern" #: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -#, fuzzy msgid "Some files are being downloaded" -msgstr "Die Datei »%s« wurde heruntergeladen." +msgstr "Einige Dateien werden gerade heruntergeladen." #: ../midori/midori-browser.c:1923 -#, fuzzy msgid "_Quit Midori" -msgstr "Midori" +msgstr "Midori _beenden" #: ../midori/midori-browser.c:1925 msgid "The transfers will be cancelled if Midori quits." -msgstr "" +msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." #: ../midori/midori-browser.c:2386 msgid "Open file" @@ -514,8 +517,16 @@ msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." #: ../midori/midori-browser.c:5160 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version 2.1 der Lizenz oder (wahlweise) jeder späteren Version." +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der " +"GNU Lesser General Public License, wie von der Free Software Foundation " +"veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " +"2.1 der Lizenz oder (wahlweise) jeder späteren Version." #: ../midori/midori-browser.c:5179 msgid "translator-credits" @@ -1394,7 +1405,8 @@ msgstr "Benachrichtigen bei Abschluss der Übertragung" #: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" -msgstr "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" +msgstr "" +"Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" #: ../midori/midori-websettings.c:721 msgid "Download Manager" @@ -1666,8 +1678,13 @@ msgid "Preferred languages" msgstr "Bevorzugte Sprachen" #: ../midori/midori-websettings.c:1124 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur " +"Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru," +"nl« oder »en-us;q=1.0, fr-fr;q=0.667«" #: ../midori/midori-websettings.c:1139 msgid "Clear private data" @@ -1835,20 +1852,19 @@ msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" #: ../midori/midori-view.c:3506 msgid "Set number of columns" -msgstr "" +msgstr "Anzahl Spalten ändern" #: ../midori/midori-view.c:3507 msgid "Enter number of columns:" -msgstr "" +msgstr "Anzahl an Spalten eingeben:" #: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" -msgstr "" +msgstr "Anzahl Verknüpfungen ändern" #: ../midori/midori-view.c:3509 -#, fuzzy msgid "Enter number of shortcuts:" -msgstr "Ziel der Verknüpfung eingeben" +msgstr "Anzahl an Verknüpfungen eingeben:" #: ../midori/midori-view.c:3535 #, c-format @@ -1989,8 +2005,12 @@ msgstr "Rechtschreibwörterbücher" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Eine durch Kommas getrennte Liste von Sprachen, die für die Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Eine durch Kommas getrennte Liste von Sprachen, die für die " +"Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2105,9 +2125,8 @@ msgid "Netscape p_lugins" msgstr "Netscape-Module" #: ../midori/sokoke.c:1307 -#, fuzzy msgid "New _Folder" -msgstr "Neuer Ordner" +msgstr "Neuer _Ordner" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" @@ -2134,14 +2153,12 @@ msgid "Console" msgstr "Konsole" #: ../panels/midori-console.c:361 -#, fuzzy msgid "Copy _All" -msgstr "Alle einklappen" +msgstr "_Alle kopieren" #: ../panels/midori-console.c:362 -#, fuzzy msgid "Copy All" -msgstr "Alle einklappen" +msgstr "Alle kopieren" #: ../panels/midori-extensions.c:91 msgid "Extensions" @@ -2152,8 +2169,11 @@ msgid "Erroneous clock time" msgstr "Fehlerhafte Uhrzeit" #: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das eingestellte Datum und die Uhrzeit." +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "" +"Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das " +"eingestellte Datum und die Uhrzeit." #: ../panels/midori-history.c:286 msgid "A week ago" @@ -2265,8 +2285,13 @@ msgstr "Werbefilter einstellen" #: ../extensions/adblock.c:447 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere Listen finden Sie auf %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld " +"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " +"Listen finden Sie auf %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2299,7 +2324,7 @@ msgstr "Werbung an Hand einer Filterliste blockieren" #: ../extensions/addons.c:122 #, c-format msgid "Copy %s to the folder %s." -msgstr "" +msgstr "%2s in den Ordner %1s kopieren." #: ../extensions/addons.c:177 msgid "Userscripts" @@ -2310,13 +2335,13 @@ msgid "Userstyles" msgstr "Benutzerstile" #: ../extensions/addons.c:1085 -#, fuzzy, c-format +#, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Die Konfiguration konnte nicht geladen werden. %s" +msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht geladen werden: %s\n" #: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" -msgstr "" +msgstr "Benutzererweiterungen" #: ../extensions/addons.c:1210 #, c-format @@ -2325,7 +2350,7 @@ msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" #: ../extensions/addons.c:1254 msgid "Support for userscripts and userstyles" -msgstr "" +msgstr "Unterstützung für Benutzerskripte und -stile" #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" @@ -2345,8 +2370,12 @@ msgid "Delete All" msgstr "Alle löschen" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene Einträge gelöscht, die auf den Filter passen" +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " +"Einträge gelöscht, die auf den Filter passen" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2366,7 +2395,8 @@ msgstr "Frage" #: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." -msgstr "Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." +msgstr "" +"Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." #: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" @@ -2419,8 +2449,12 @@ msgid "_Collapse All" msgstr "Alle _einklappen" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder Domöne auf den eingegebenen Filter passt." +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " +"Domöne auf den eingegebenen Filter passt." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2432,11 +2466,13 @@ msgstr "Profildateien auflisten, anzeigen und löschen" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2478,7 +2514,8 @@ msgstr "XML-Quelle konnte nicht ausgelesen werden: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2490,7 +2527,8 @@ msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden. #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/main.c:132 msgid "Error" @@ -2618,8 +2656,12 @@ msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen sich durch Ziehen und Ablegen ordnen." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen " +"sich durch Ziehen und Ablegen ordnen." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2651,8 +2693,11 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Bild in neuem Fe_nster öffnen" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den Ordner »%s«." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den " +#~ "Ordner »%s«." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n" From 07e3f686f9c3526fca1f369a8fc78761c788109c Mon Sep 17 00:00:00 2001 From: Kim Boram Date: Mon, 24 May 2010 18:32:18 +0200 Subject: [PATCH 2626/2970] Update Korean translation --- po/ko.po | 1100 +++++++++++++++++++++++++++--------------------------- 1 file changed, 550 insertions(+), 550 deletions(-) diff --git a/po/ko.po b/po/ko.po index fada1d76..cc391770 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.2.4\n" +"Project-Id-Version: midori 0.2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-05 02:57+0900\n" +"POT-Creation-Date: 2010-05-23 13:27+0900\n" "PO-Revision-Date: 2010-05-05 03:05+0900\n" "Last-Translator: Kim Boram \n" "Language-Team: Kim Boram \n" @@ -20,12 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "가벼운 웹 브라우저" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1336 -#: ../midori/main.c:1664 -#: ../midori/main.c:1672 -#: ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "미도리" @@ -43,14 +40,12 @@ msgstr "설정을 읽을 수 없습니다: %s\n" msgid "Value '%s' is invalid for %s" msgstr "값 '%s'은(는) %s에 대한 잘못된 값입니다" -#: ../midori/main.c:158 -#: ../midori/main.c:244 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr " '%s'은(는) 잘못된 설정 값입니다." -#: ../midori/main.c:370 -#: ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "데이터베이스에 접속할 수 없음: %s\n" @@ -71,33 +66,35 @@ msgstr "설정을 저장할 수 없습니다. %s" msgid "The search engines couldn't be saved. %s" msgstr "검색 엔진을 저장할 수 없습니다. %s" -#: ../midori/main.c:502 -#: ../midori/main.c:552 -#: ../midori/main.c:572 +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "책갈피를 저장할 수 없습니다.%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 -#: ../midori/main.c:625 +#: ../midori/main.c:602 ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "휴지통을 저장할 수 없습니다.%s" -#: ../midori/main.c:684 -#: ../midori/main.c:924 +#: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" msgstr "세션을 저장할 수 없습니다.%s" #: ../midori/main.c:868 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다." +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다." #: ../midori/main.c:958 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "미도리가 마지막으로 실행되었을 때 비 정상적으로 종료된 것 같습니다. 이런 일이 계속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오." +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"미도리가 마지막으로 실행되었을 때 비 정상적으로 종료된 것 같습니다. 이런 일" +"이 계속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오." #: ../midori/main.c:973 msgid "Modify _preferences" @@ -111,8 +108,7 @@ msgstr "마지막 세션 초기화(_S)" msgid "Disable all _extensions" msgstr "모든 확장 기능 비 활성화(_E)" -#: ../midori/main.c:1217 -#: ../midori/main.c:1937 +#: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "세션을 열 수 없습니다: %s\n" @@ -239,8 +235,7 @@ msgstr "무시(_I)" msgid "File not found." msgstr "파일이 없습니다." -#: ../midori/midori-array.c:462 -#: ../midori/midori-array.c:485 +#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." msgstr "잘못된 문서." @@ -249,826 +244,807 @@ msgstr "잘못된 문서." msgid "Unrecognized bookmark format." msgstr "책갈피 형식을 알 수 없습니다." -#: ../midori/midori-array.c:718 -#: ../midori/sokoke.c:1120 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "쓸 수 없습니다." -#: ../midori/midori-browser.c:333 -#: ../midori/midori-browser.c:5489 -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "현재 페이지 다시 불러오기" -#: ../midori/midori-browser.c:343 -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "현재 페이지 불러오기 중지" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% 불러옴" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "제목 업데이트 실패: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "기대하지 않은 동작 '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "새 폴더" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "폴더 편집" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "새 책갈피" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "책갈피 편집" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "제목(_T):" -#: ../midori/midori-browser.c:762 -#: ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "설명(_D):" -#: ../midori/midori-browser.c:781 -#: ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "주소(_A):" -#: ../midori/midori-browser.c:811 -#: ../midori/midori-browser.c:4644 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "폴더(_F):" -#: ../midori/midori-browser.c:821 -#: ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4649 -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "최상위 폴더" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "단축 번호에 더하기(_S)" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "도구 모음에 보이기(_B)" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "웹 응용 프로그램으로 실행(_W)" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\"(을)를 다운로드 할 빈 공간이 부족합니다." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다." -#: ../midori/midori-browser.c:1020 -#: ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "다른 이름으로 저장" -#: ../midori/midori-browser.c:1393 -#: ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "파일 '%s'(을)를 다운로드 했습니다." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "전송이 끝났습니다" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "파일 저장" -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "파일을 다운로드 하고 있습니다" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "미도리 종료(_Q)" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "미도리를 종료하시면 파일 다운로드가 취소될 것입니다." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "파일 열기" -#: ../midori/midori-browser.c:2373 -#: ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "새 피드" -#: ../midori/midori-browser.c:2414 -#: ../midori/midori-browser.c:5554 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "새 책갈피 더하기" -#: ../midori/midori-browser.c:2989 -#: ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n" -#: ../midori/midori-browser.c:3069 -#: ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "비어있음" -#: ../midori/midori-browser.c:3690 -#: ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 -#: ../midori/sokoke.c:441 -#: ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "외부 프로그램을 실행할 수 없습니다." -#: ../midori/midori-browser.c:4004 -#: ../midori/midori-browser.c:5948 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "새 기록 항목 삽입 실패: %s\n" -#: ../midori/midori-browser.c:4337 -#: ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "전부 탭으로 열기(_T)" -#: ../midori/midori-browser.c:4344 -#: ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 -#: ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "새 탭에서 열기(_T)" -#: ../midori/midori-browser.c:4347 -#: ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 -#: ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "새 창에서 열기(_W)" -#: ../midori/midori-browser.c:4570 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "아로라" -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "카제하카세" -#: ../midori/midori-browser.c:4572 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "오페라" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "컨쿼러" -#: ../midori/midori-browser.c:4574 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "에피파니" -#: ../midori/midori-browser.c:4595 -#: ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "책갈피 가져오기..." -#: ../midori/midori-browser.c:4598 -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "책갈피 가져오기(_I)" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "응용 프로그램(_A):" -#: ../midori/midori-browser.c:4636 -#: ../midori/midori-browser.c:5663 -#: ../midori/midori-websettings.c:232 -#: ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "사용자 지정..." -#: ../midori/midori-browser.c:4710 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "책갈피 가져오기 실패" -#: ../midori/midori-browser.c:4746 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "책갈피 내보내기 실패" -#: ../midori/midori-browser.c:4800 -#: ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "기록 항목을 제거할 수 없습니다: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "개인 데이터 모두 지우기" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "다음의 데이터 지우기:" -#: ../midori/midori-browser.c:4936 -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "기록" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "쿠키" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "'플래시' 쿠키" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "웹 사이트 아이콘" -#: ../midori/midori-browser.c:4957 -#: ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "닫은 탭 (_C)" -#: ../midori/midori-browser.c:4962 -#: ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "웹 캐시" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "가벼운 웹 브라우저." -#: ../midori/midori-browser.c:5074 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "이 라이브러리는 자유 소프트웨어입니다; 이 프로그램은 자유 소프트웨어 재단에서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전 (선택적)에 따라 재배포하거나 수정할 수 있습니다." +#: ../midori/midori-browser.c:5160 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"이 라이브러리는 자유 소프트웨어입니다; 이 프로그램은 자유 소프트웨어 재단에" +"서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전 (선택적)에 " +"따라 재배포하거나 수정할 수 있습니다." -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Seo Sanghyeon \n" "김보람 " -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "파일(_F)" -#: ../midori/midori-browser.c:5404 -#: ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "새 창(_W)" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "새 창을 엽니다" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "새 탭을 엽니다" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "개인 정보 보호 모드(_R)" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "브라우저 사용 중 어떤 개인 데이터도 저장하지 않습니다" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "파일을 엽니다" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "파일로 저장" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "단축 번호 더하기(_D)" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "단축 번호에 바로 가기를 더합니다" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "바로 가기를 바탕 화면에 추가(_D)" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "바로 가기를 바탕 화면에 추가" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "뉴스 피드 구독(_F)" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "뉴스 피드 구독" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "현재 탭을 닫습니다." -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "창 닫기(_L)" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "이 창을 닫습니다" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "현재 페이지를 인쇄합니다" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "프로그램 끝내기" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "편집(_E)" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "마지막 수정 되돌리기" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "마지막 수정 다시 실행" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "선택한 텍스트를 클립보드로 잘라냅니다" -#: ../midori/midori-browser.c:5458 -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "선택한 텍스트를 클립보드로 복사합니다" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "클립보드에서 텍스트를 붙여 넣습니다" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "선택한 텍스트를 지웁니다" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "모든 텍스트 선택" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "이 페이지에서 단어나 단락을 찾습니다" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "다음에 나타나는 단어나 문장을 찾습니다" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "이전 찾기(_P)" -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "이전에 나타난 단어나 문장을 찾습니다" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "프로그램 기본 설정을 편집합니다" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "보기(_V)" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "도구 모음(_T)" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "확대/축소 단계 키우기" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "확대/축소 단계 줄이기" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "확대/축소 단계 초기화" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "인코딩(_E)" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "소스 보기(_U)" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "페이지의 소스 코드를 보여줍니다" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "전체 화면 보기 전환" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "왼쪽으로 스크롤(_L)" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "왼쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "아래쪽으로 스크롤(_D)" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "아래쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "위쪽으로 스크롤(_U)" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "위쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "오른쪽으로 스크롤(_R)" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "오른쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "이동(_G)" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "전에 들렀던 페이지로 갑니다" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "다음 들렀던 페이지로 갑니다" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "전에 들렀던 하위 페이지로 갑니다" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "다음 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "홈 페이지로 갑니다." -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "휴지통 비우기" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "휴지통에 있는 모든 항목을 지웁니다" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "닫은 탭 되돌리기(_C)" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "마지막에 닫은 탭을 엽니다." -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "새 폴더 더하기(_F)" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "새 책갈피 폴더를 더합니다" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "책갈피 내보내기(_E)" -#: ../midori/midori-browser.c:5565 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "검색 엔진 관리(_M)" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "검색 엔진을 더하고 편집, 제거합니다..." -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "개인 데이터를 지웁니다..." -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "페이지 검사(_I)" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "페이지의 세부 사항을 검사하고 개발자 도구에 접근..." -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "이전 탭(_P)" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "이전 탭으로 이동합니다" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "다음 탭(_N)" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "다음 탭으로 전환합니다" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "현재 탭에 포커스 맞추기(_C)" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "현재 탭에 포커스를 맞춥니다" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "마지막 세션 열기(_S)" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "마지막 세션에서 저장된 탭 엽니다" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "도움말(_H)" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "차례(_C)" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "문서 보기" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "일반적인 질문들(_F)" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "자주 하는 질문의 답변 보기" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "버그 보고(_R)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "미도리의 버그 트래커를 엽니다" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "프로그램 정보를 보여줍니다" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "메뉴 모음(_M)" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "메뉴 모음 보기" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "내비게이션 줄(_N)" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "내비게이션 줄 보기" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "가장자리 패널(_P)" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "가장자리 패널 보기" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "책갈피 모음(_B)" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "책갈피 모음 보기" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "전송 줄(_T)" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "전송 줄 보기" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "상태 표시줄(_S)" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "상태 표시줄을 봅니다" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "자동(_A)" -#: ../midori/midori-browser.c:5644 -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "중국어 번체 (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-browser.c:5651 -#: ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "한국어 (EUC-KR)" -#: ../midori/midori-browser.c:5654 -#: ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "키릴어 (KOI8-R)" -#: ../midori/midori-browser.c:5657 -#: ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "유니코드 (UTF-8)" -#: ../midori/midori-browser.c:5660 -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "서양어 (ISO-8859-1)" -#: ../midori/midori-browser.c:6208 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "구분선(_S)" -#: ../midori/midori-browser.c:6215 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "위치(_L)..." -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "특정 위치 열기" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "웹 검색(_W)..." -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "웹 검색 실행" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "이전에 닫은 탭이나 창을 다시 엽니다" -#: ../midori/midori-browser.c:6279 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "최근 방문한 페이지(_R)" -#: ../midori/midori-browser.c:6281 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "이전에 방문한 페이지를 다시 엽니다" -#: ../midori/midori-browser.c:6296 -#: ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "책갈피(_B)" -#: ../midori/midori-browser.c:6298 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "저장된 책갈피 보기" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "도구(_T)" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "창(_W)" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "모든 열려있는 탭의 목록을 표시합니다" -#: ../midori/midori-browser.c:6342 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "메뉴(_M)" -#: ../midori/midori-browser.c:6344 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "메뉴" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6548 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "바로 찾기(_I):" -#: ../midori/midori-browser.c:6579 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "이전" -#: ../midori/midori-browser.c:6584 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "다음" -#: ../midori/midori-browser.c:6589 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "대소문자 일치" -#: ../midori/midori-browser.c:6598 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "일치하는 단어 강조 표시" -#: ../midori/midori-browser.c:6610 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "찾기 줄 닫기" -#: ../midori/midori-browser.c:6656 -#: ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "모두 지우기" -#: ../midori/midori-browser.c:7014 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "기대하지 않은 설정 '%s'" @@ -1098,624 +1074,619 @@ msgstr "데이터 베이스 문(statement)을 실행 실패\n" msgid "Paste and p_roceed" msgstr "붙여넣기 후 진행(_R)" -#: ../midori/midori-panel.c:433 -#: ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "선택한 패널 창에서 분리" -#: ../midori/midori-panel.c:445 -#: ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 -#: ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "창을 오른쪽으로 이동" -#: ../midori/midori-panel.c:457 -#: ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "패널 닫기" -#: ../midori/midori-panel.c:641 -#: ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "창을 왼쪽으로 이동" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "조작 컨트롤 감추기(_C)" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "빈 페이지 보기" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "홈 페이지 보기" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "마지막에 연 탭 보기" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "새 탭" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "새 창" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "현재 탭" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "기본 값" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "아이콘" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "작은 아이콘" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "텍스트" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "아이콘 및 텍스트" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "아이콘 옆에 글자" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "자동 (그놈 또는 환경 변수)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" msgstr "프록시 서버 없음" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "모든 쿠키" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "세션 쿠키" -#: ../midori/midori-websettings.c:303 -#: ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "없음" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "사파리" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "아이폰" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "파이어폭스" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "인터넷 익스플로러" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "마지막에 연 창 크기 기억" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "마지막에 연 창의 크기를 저장할지 결정합니다." -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "마지막에 연 창 너비" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "저장된 마지막에 연 창의 너비" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "마지막에 연 창 높이" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "저장된 마지막에 연 창의 높이" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "마지막에 연 패널 위치" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "저장된 마지막에 연 패널의 위치" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "마지막 패널 페이지" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "저장된 마지막에 연 패널 페이지" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "마지막 웹 검색" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "저장된 마지막에 한 검색" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "메뉴 모음 보기" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "메뉴 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "내비게이션 바 보기" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "내비게이션 바를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "책갈피 모음 보기" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "책갈피 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "패널 표시" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "패널을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "전송 줄 보기" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "전송 줄을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "상태 표시줄을 보기" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "상태를 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "위치 항목에 진행 상태 표시" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "불러오기 진행 상태를 위치 입력 줄에 표시할지 선택합니다." -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "위치를 완성하는데 검색 엔진 사용" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "위치 입력을 완성하는데 검색 엔진을 사용할지 선택합니다." -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "도구 모음 항목" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "도구 모음에 보일 항목" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "간략한 사이드 패널(_C)" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "사이드 패널을 간단하게 표시할지 결정합니다." -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "기능 조정 콘드롤 패널에 보기" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "기능 조절 콘트롤을 패널에 보일지 결정합니다." -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "사이드 표시 줄을 오른쪽에" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다." -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "패널 분리된 창에 열기" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "패널을 항상 분리된 창에 보일지 선택합니다." -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "미도리 시작 시:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "미도리 시작 시 어떤 것을 할지 결정합니다" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "홈페이지:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "홈페이지" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "충돌 대화 상자 보기" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "단축 번호를 새 탭에 보기" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "단축 번호를 새로 열린 탭에 표시합니다." -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "다운로드한 파일을 저장할 경로:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "다운로드한 파일이 저장되는 폴더" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "저장 할 폴더 물어보기" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "파일을 다운로드한 때 저장할 폴더를 물어볼지 선택합니다" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "전송이 완료되면 알려줍니다" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "전송이 끝나면 알림을 보여줄지 선택합니다." -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "다운로드 관리자" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "외부 다운로드 관리자" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "텍스트 편집기" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "외부 텍스트 편집기" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "뉴스 수집기" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "외부 뉴스 수집기" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "위치 항목에서 검색" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "위치 항목 안에서 검색을 실행합니다." -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "우선할 문자 인코딩" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "탭 모음 항상 보기" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "탭 모음을 항상 볼 수 있게 합니다." -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "탭에 닫기 단추 표시" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "탭에 닫기 단추를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "새 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "새 페이지를 어디에서 열지 결정합니다." -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "외부 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "외부적으로 열린 페이지를 어디에 열지 결정합니다." -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "가운데 버튼 클릭으로 선택한 주소 열기" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다." -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "탭을 연 후 바로 전환하지 않음" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "탭이 열렸을 때 바로 전환할지 결정합니다" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "탭을 현재 탭 옆에 열기" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다." -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "팝업 창을 탭에 열기" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "팝업 창을 탭에 열지 결정합니다." -#: ../midori/midori-websettings.c:856 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "자동으로 그림 읽기" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "그림을 자동으로 읽고 표시합니다." -#: ../midori/midori-websettings.c:864 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "스크립트 활성화" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "스크립트 언어를 활성화 합니다." -#: ../midori/midori-websettings.c:872 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "넷스케이프 플러그인 활성화" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "넷스케이프 플러그인 개체를 활성화 합니다." -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "HTML5 데이터 베이스 지원 활성화" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "HTML5 데이터 베이스 지원을 활성화할지 결정합니다." -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "HTML5 로컬 기억 장치 지원 활성화" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 로컬 기억 장치 지원을 활성화할지 결정합니다." -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "오프라인 웹 응용 프로그램 캐시 활성화" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "오프라인 웹 응용 프로그램 캐시를 활성화할지 결정합니다." -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "문자와 그림 확대" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "글자와 그림을 확대할지 결정합니다." -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "주소 창에 입력할 때 바로 찾기" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "입력 중 자동으로 찾을지 결정합니다." -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "동역학 스크롤" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다." -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "쿠키 받아들임" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "받아들일 쿠키의 종류를 결정합니다." -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "원본 쿠키만" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "원본 웹 사이트 쿠키만 받아들입니다." -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "쿠키의 최대 기한" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "쿠키를 저장할 최대 일 수" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "마지막으로 방문한 페이지 기억" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "마지막으로 방문한 페이지를 저장할지 결정합니다." -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "기록의 최대 기한" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "방문 기록을 저장할 최대 일 수" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "마지막에 다운로드한 파일 기억" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "마지막으로 다운로드한 파일을 저장할지 결정합니다." -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "프록시 서버" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "사용할 프록시 서버의 종류" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "HTTP 연결에 사용되는 프록시 서버" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "프록시 서버 자동으로 검색" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "현재 환경에서 자동으로 프록시 서버를 검색할지 결정합니다." #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "식별 명" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "웹 페이지에 보낼 유저 에이전트 식별 명을 지정합니다." -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "식별 문자열" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "응용 프로그램 식별 문자열" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:1129 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "복수의 언어로 작성된 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1124 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"복수의 언어로 작성된 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분" +"해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "개인 데이터 지우기" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "삭제하기 위해 선택한 개인 데이터" @@ -1723,207 +1694,213 @@ msgstr "삭제하기 위해 선택한 개인 데이터" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1182 -#: ../midori/midori-view.c:4482 -#: ../midori/midori-view.c:4486 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "오류 - %s" -#: ../midori/midori-view.c:1183 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "페이지 '%s'을(를) 불러올 수 없습니다." -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "다시 시도하십시오" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "%s이(가) 발견되지 않았습니다" -#: ../midori/midori-view.c:1466 -#: ../midori/midori-view.c:2303 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "%s에 메시지 보내기" -#: ../midori/midori-view.c:2085 -#: ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "요소 검사(_E)" -#: ../midori/midori-view.c:2137 -#: ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "새 탭에 링크 열기(_T)" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "새 탭에 링크 열고 전환(_F)" -#: ../midori/midori-view.c:2142 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "새 탭에 링크 열고 전환 안 함(_B)" -#: ../midori/midori-view.c:2145 -#: ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "새 창에 링크 열기(_W)" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "웹 응용 프로그램으로 링크 열기(_P)" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "링크 위치 복사(_S)" -#: ../midori/midori-view.c:2154 -#: ../midori/midori-view.c:2226 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "링크 다른 이름으로 저장(_S)" -#: ../midori/midori-view.c:2155 -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "링크 다운로드(_D)" -#: ../midori/midori-view.c:2159 -#: ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2231 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "다운로드 관리자로 다운로드(_M)" -#: ../midori/midori-view.c:2168 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "그림 새 탭에서 열기(_I)" -#: ../midori/midori-view.c:2171 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "그림 주소 복사(_A)" -#: ../midori/midori-view.c:2174 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "그림 저장(_M)" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "그림 다운로드(_M)" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "비디오 주소 복사(_A)" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "비디오 저장(_V)" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "비디오 다운로드(_V)" -#: ../midori/midori-view.c:2248 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "다음으로 검색(_W)" -#: ../midori/midori-view.c:2283 -#: ../midori/midori-view.c:2290 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "웹 검색(_S)" -#: ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "주소 새 탭에서 열기(_T)" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "파일을 열거나 다운로드 합니다" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "파일 종류: '%s'" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "파일 종류: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2645 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "%s 열기" -#: ../midori/midori-view.c:3179 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "페이지 살피기 - %s" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "단축 번호" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "바로 가기를 더하려면 누르십시오" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "바로 가기 주소 입력" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "바로 가기 제목 입력" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "이 바로 가기를 정말로 삭제하시겠습니까?" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "열 번호 설정," + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "열 번호를 입력하세요" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "바로 가기 번호 설정" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "바로 가기 번호를 입력하세요:" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "문서를 표시할 수 없습니다." -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "설치된 문서화 도구가 없습니다" -#: ../midori/midori-view.c:3758 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "빈 페이지" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "탭 복제(_D)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "탭 되돌리기(_R)" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "탭 최소화(_M)" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "배경 그림 인쇄" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "배경 그림을 인쇄할 지 결정합니다" -#: ../midori/midori-view.c:4707 -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "기능" @@ -1936,13 +1913,11 @@ msgstr "일반" msgid "Startup" msgstr "시작" -#: ../midori/midori-preferences.c:314 -#: ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 msgid "Use current page as homepage" msgstr "현재 페이지를 홈 페이지로 사용" -#: ../midori/midori-preferences.c:331 -#: ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "전송" @@ -2026,7 +2001,9 @@ msgstr "맞춤법 검사에 사용할 사전:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" msgstr "맞춤법 검사를 할 언어는 쉼표로 구분합니다, 예: \"en_GB,de_DE\"" #. Page "Interface" @@ -2052,8 +2029,7 @@ msgid "External applications" msgstr "외부 프로그램" #. Page "Network" -#: ../midori/midori-preferences.c:485 -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 msgid "Network" msgstr "네트워크" @@ -2070,8 +2046,7 @@ msgstr "개인 정보" msgid "Web Cookies" msgstr "웹 쿠키" -#: ../midori/midori-preferences.c:521 -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" msgstr "일" @@ -2103,63 +2078,67 @@ msgstr "검색 엔진 관리" msgid "Use as _default" msgstr "기본값으로 사용(_D)" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "책갈피(_B)" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "책갈피 더하기(_K)" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "콘솔(_C)" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "확장 기능(_E)" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "기록(_H)" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "홈페이지(_H)" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "사용자 스크립트(_U)" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "새 탭(_T)" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "전송(_T)" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "넷스케이프 플러그인(_L)" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "새 폴더(_F)" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "책갈피" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "선택한 책갈피를 편집합니다" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "선택한 책갈피를 지웁니다" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "새 폴더를 더합니다" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "구분선" @@ -2167,6 +2146,14 @@ msgstr "구분선" msgid "Console" msgstr "콘솔" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "모두 복사(_A)" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "모두 복사" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "확장 기능" @@ -2176,7 +2163,8 @@ msgid "Erroneous clock time" msgstr "잘못된 시간" #: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." +msgid "" +"The clock time lies in the past. Please check the current date and time." msgstr "시간이 잘못되어 있습니다. 현재 날짜와 시간을 확인하십시오." #: ../panels/midori-history.c:286 @@ -2202,28 +2190,28 @@ msgstr "어제" msgid "Are you sure you want to remove all history items?" msgstr "정말 모든 기록 항목을 지우시겠습니까?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "선택한 기록 항목을 책갈피에 더합니다" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "선택한 기록 항목을 지웁니다" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "모든 기록 제거" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "필터:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "다운로드 폴더 열기(_F)" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "링크 위치 복사(_A)" @@ -2265,14 +2253,12 @@ msgstr "보관된 '%s'아이콘을 열 수 없습니다." msgid "Animation frames are broken" msgstr "애니메이션 프레임이 망가졌습니다" -#: ../katze/katze-utils.c:498 -#: ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "속성 '%s'은(는) %s에 적당하지 않음" -#: ../katze/katze-utils.c:544 -#: ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" msgstr "파일 선택" @@ -2285,40 +2271,44 @@ msgstr "폴더 선택" msgid "Preferences for %s" msgstr "%s을(를) 위한 기본 설정" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "광고 필터 설정" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "텍스트 항목에 미리 설정된 필터 목록의 주소를 입력하시고, 목록에 추가하기 위해 \"추가\" 버튼을 눌러주십시오. 더 많은 목록을 %s에서 찾으실 수 있습니다." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"텍스트 항목에 미리 설정된 필터 목록의 주소를 입력하시고, 목록에 추가하기 위" +"해 \"추가\" 버튼을 눌러주십시오. 더 많은 목록을 %s에서 찾으실 수 있습니다." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "광고 필터 설정(_A)..." -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "규칙 편집" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "규칙(_R):" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "그림 막기(_O)" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "링크 막기(_O)" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "광고 막기" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "필터 목록에 따라 광고를 막습니다" @@ -2340,8 +2330,7 @@ msgstr "사용자 스타일" msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "확장 기능 '%s'의 설정을 저장할 수 없습니다: %s\n" -#: ../extensions/addons.c:1086 -#: ../extensions/addons.c:1253 +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" msgstr "사용자 추가 기능" @@ -2372,8 +2361,12 @@ msgid "Delete All" msgstr "모두 삭제" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "보이는 모든 쿠키를 지웁니다. 필터가 설정되어 있으면 필터와 맞는 쿠키만 지워집니다." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"보이는 모든 쿠키를 지웁니다. 필터가 설정되어 있으면 필터와 맞는 쿠키만 지워집" +"니다." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2446,8 +2439,12 @@ msgid "_Collapse All" msgstr "모두 접기(_C)" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "이름 또는 도메인 필드가 입력된 필터와 맞는 쿠키만 보려면 필터 문자열을 입력하세요" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"이름 또는 도메인 필드가 입력된 필터와 맞는 쿠키만 보려면 필터 문자열을 입력하" +"세요" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2572,8 +2569,7 @@ msgid "Control Midori by moving the mouse" msgstr "마우스의 움직임으로 미도리를 조정합니다" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "페이지 보관함" @@ -2583,7 +2579,8 @@ msgstr "페이지 보관함(_P)" #: ../extensions/page-holder.c:178 msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "탭과는 별도로 열려있는 하나 이상의 페이지를 페이지 보관함에 보관합니다." +msgstr "" +"탭과는 별도로 열려있는 하나 이상의 페이지를 페이지 보관함에 보관합니다." #: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" @@ -2621,8 +2618,7 @@ msgstr "상태 표시줄 기능" msgid "Easily toggle features on web pages on and off" msgstr "웹 페이지의 기능을 쉽게 켜고 끕니다" -#: ../extensions/tab-panel.c:568 -#: ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "탭 패널" @@ -2640,15 +2636,20 @@ msgstr "탭 기록 목록" #: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "최근 사용한 순으로 보관된 목록에서 선택하여 탭을 전환할 수 있도록 합니다." +msgstr "" +"최근 사용한 순으로 보관된 목록에서 선택하여 탭을 전환할 수 있도록 합니다." #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "도구 모음 사용자 설정" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 재배치 할 수 있습니다." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"도구 모음에 표시할 항목을 설정합니다. 끌어다 놓기로 항목을 재배치 할 수 있습" +"니다." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2679,4 +2680,3 @@ msgstr "디스크에 HTTP 통신을 저장합니다." #~ msgstr "" #~ "사용자 스크립트를 폴더%s(으)로 복사하고 사용자 스타일을 폴더 %s(으)로 복사" #~ "합니다." - From 8d3d61035ba0406cfec2371a943f9d3e3e433d04 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Mon, 24 May 2010 19:17:46 +0200 Subject: [PATCH 2627/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 354 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 183 insertions(+), 171 deletions(-) diff --git a/po/pt.po b/po/pt.po index a28769e7..adb508b3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-21 04:08+0000\n" +"POT-Creation-Date: 2010-05-24 16:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -245,12 +245,12 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" @@ -298,12 +298,12 @@ msgstr "_Descrição:" msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Pasta:" #: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Pasta Superior" @@ -329,8 +329,8 @@ msgstr "Não possui espaço suficiente para transferir \"%s\"." msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Guardar como" @@ -352,674 +352,686 @@ msgstr "Transferência concluída" msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Existem ficheiros a ser transferidos" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "_Sair do Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "As transferências serão canceladas se sair do Midori." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "Local_izar:" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Sensível à Capitalização" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar Tudo" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" From 83a737e386c42428d45211c815aa66c11ffaa78d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 24 May 2010 19:34:44 +0200 Subject: [PATCH 2628/2970] Bump version to 0.2.6 --- ChangeLog | 8 ++++++++ wscript | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cdc6687a..42b0fba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.2.6 + + Show a dialogue when quitting while downloading + + Render icons in errors/ speed dial properly + + Fix a build error with API documentation + + Fix error pages in frames, and a related crash + + Allow more shortcuts or columns in speed dial + + Add 'Copy All' button to Console panel + v0.2.5 + Keyboard access in speed dial + Panels adapt to system icon style diff --git a/wscript b/wscript index f0a6d195..fbbb6e8b 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ from Configure import find_program_impl major = 0 minor = 2 -micro = 5 +micro = 6 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From 5fab25b2e6d04f89977e9d4bdeab66b56e12a68d Mon Sep 17 00:00:00 2001 From: Andres Kovtunos Date: Tue, 25 May 2010 11:12:30 +0200 Subject: [PATCH 2629/2970] l10n: Updated Russian (ru) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 354 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 183 insertions(+), 171 deletions(-) diff --git a/po/ru.po b/po/ru.po index 0797fb73..26cbc0e5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-22 10:07+0000\n" +"POT-Creation-Date: 2010-05-25 04:08+0000\n" "PO-Revision-Date: 2010-04-09 12:45+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -244,12 +244,12 @@ msgstr "Неизвестный формат закладок." msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" @@ -297,12 +297,12 @@ msgstr "_Описание:" msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Папка:" #: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Корневая папка" @@ -328,8 +328,8 @@ msgstr "Не хватает свободного места для загруз msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Сохранить файл как" @@ -351,677 +351,689 @@ msgstr "Загрузка завершена" msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Некоторые файлы загружаются" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "Выход из Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Загрузки будут отменены при закрытии Midori" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистить все" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" From 462d8d5f4b558458ec29992eb34856bf01e5cf17 Mon Sep 17 00:00:00 2001 From: Robert Hartl Date: Tue, 25 May 2010 13:29:56 +0200 Subject: [PATCH 2630/2970] l10n: Updated Slovak (sk) translation to 89% New status: 558 messages complete with 19 fuzzies and 44 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/sk.po | 1273 +++++++++++++++++++++++++++++------------------------- 1 file changed, 694 insertions(+), 579 deletions(-) diff --git a/po/sk.po b/po/sk.po index 28699f95..e8a968ae 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9-3345559\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-08 12:07+0100\n" +"POT-Creation-Date: 2010-05-25 10:08+0000\n" "PO-Revision-Date: 2010-03-08 12:24+0100\n" "Last-Translator: Robert Hartl \n" "Language-Team: Slovak \n" @@ -19,9 +19,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Ľahký internetový prehliadač" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1310 ../midori/main.c:1541 -#: ../midori/main.c:1549 ../midori/main.c:1565 -#: ../midori/midori-websettings.c:299 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -29,181 +29,198 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetový prehliadač" -#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurácia sa nemôže načítať: %s\n" -#: ../midori/main.c:145 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Hodnota '%s' nie je platná pre %s" -#: ../midori/main.c:152 ../midori/main.c:238 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neplatná hodnota '%s' v konfigurácii" -#: ../midori/main.c:364 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Zlyhalo otvorenie databázy: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:419 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nepodarilo sa odstrániť staré položky histórie: %s\n" -#: ../midori/main.c:439 +#: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nastavenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:477 +#: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhľadávače sa nepodarilo uložiť. %s" -#: ../midori/main.c:496 ../midori/main.c:546 ../midori/main.c:566 +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky sa nepodarilo uložiť. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:596 ../midori/main.c:619 +#: ../midori/main.c:602 ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Zoznam zavretých kariet sa nepodarilo uložiť %s" -#: ../midori/main.c:683 ../midori/main.c:898 +#: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sedenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:932 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." +#: ../midori/main.c:868 +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -"Zdá sa, če Midori nebolo naposledy riadne ukončené. Ak sa to stáva " -"opakovane, pre odstránenie problému skúste nasledujúce možnosti." -#: ../midori/main.c:947 +#: ../midori/main.c:958 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Zdá sa, če Midori nebolo naposledy riadne ukončené. Ak sa to stáva opakovane, pre odstránenie problému skúste nasledujúce možnosti." + +#: ../midori/main.c:973 msgid "Modify _preferences" msgstr "Zmeniť _predvoľby" -#: ../midori/main.c:951 +#: ../midori/main.c:977 msgid "Reset the last _session" msgstr "Vymazať posledne _sedenie" -#: ../midori/main.c:956 +#: ../midori/main.c:982 msgid "Disable all _extensions" msgstr "Zakázať všetky _rozšírenia" -#: ../midori/main.c:1191 ../midori/main.c:1805 +#: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sedenie nie je možné načítať: %s\n" -#: ../midori/main.c:1310 +#: ../midori/main.c:1336 msgid "No filename specified" msgstr "Nebol zadaný názov súboru" -#: ../midori/main.c:1329 +#: ../midori/main.c:1355 msgid "An unknown error occured." msgstr "Nastala neznáma chyba." -#: ../midori/main.c:1360 +#: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímok uložený do: %s\n" -#: ../midori/main.c:1443 +#: ../midori/main.c:1557 msgid "Run ADDRESS as a web application" msgstr "Spustiť ADDRESS ako webovú aplikáciu" -#: ../midori/main.c:1443 +#: ../midori/main.c:1557 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1446 +#: ../midori/main.c:1560 msgid "Use FOLDER as configuration folder" msgstr "Použiť PRIEČINOK ako konfiguračný priečinok" -#: ../midori/main.c:1446 +#: ../midori/main.c:1560 msgid "FOLDER" msgstr "PRIEČINOK" -#: ../midori/main.c:1449 +#: ../midori/main.c:1563 msgid "Show a diagnostic dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/main.c:1451 +#: ../midori/main.c:1565 msgid "Run the specified filename as javascript" msgstr "Spustiť zadaný názov súboru ako javaskript" -#: ../midori/main.c:1454 +#: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" msgstr "Urobiť snímok požadovanej URI" -#: ../midori/main.c:1457 +#: ../midori/main.c:1571 msgid "Execute the specified command" msgstr "Spustiť zadaný príkaz" -#: ../midori/main.c:1459 +#: ../midori/main.c:1573 msgid "Display program version" msgstr "Zobraziť verziu programu" -#: ../midori/main.c:1461 +#: ../midori/main.c:1575 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1538 +#: ../midori/main.c:1577 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1577 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1581 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1581 +msgid "SECONDS" +msgstr "SEKUNDY" + +#: ../midori/main.c:1661 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1566 +#: ../midori/main.c:1689 msgid "Please report comments, suggestions and bugs to:" msgstr "Vaše komentáre, požiadavky a chyby prosím posielajte na:" -#: ../midori/main.c:1568 +#: ../midori/main.c:1691 msgid "Check for new versions at:" msgstr "Skontrolovať nové verzie na:" -#: ../midori/main.c:1656 +#: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfiguračný priečinok nie je platný." -#: ../midori/main.c:1704 +#: ../midori/main.c:1836 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori síce beži, ale neodpovedá.\n" -#: ../midori/main.c:1759 +#: ../midori/main.c:1891 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhľadávacie nástroje nemôžu byť načítané.%s\n" -#: ../midori/main.c:1788 +#: ../midori/main.c:1920 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Záložky nie je možné načítať: %s\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1952 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zatvorené karty nemôžu byť načítane: %s\n" -#: ../midori/main.c:1834 +#: ../midori/main.c:1966 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Históriu nie je možné načítať: %s\n" -#: ../midori/main.c:1848 +#: ../midori/main.c:1980 msgid "The following errors occured:" msgstr "Došlo k nasledujúcim chybám:" -#: ../midori/main.c:1864 +#: ../midori/main.c:1996 msgid "_Ignore" msgstr "_Ignorovať" @@ -220,1392 +237,1447 @@ msgstr "Nesprávny formát dokumentu." msgid "Unrecognized bookmark format." msgstr "Neznámy formát záložiek" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1076 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Zapisovanie zlyhalo." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5410 -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Obnoviť aktuálnu stránku" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Zastaviť načítanie aktuálnej stránky" -#: ../midori/midori-browser.c:452 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% načítaný" -#: ../midori/midori-browser.c:490 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodarilo sa aktualizovať titulok: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Neočakávaná akcia '%s'." -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nový priečinok" -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Upraviť priečinok" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Upraviť záložku" -#: ../midori/midori-browser.c:744 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Názov:" -#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Poznámka:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4567 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Priečinok:" -#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896 -#: ../midori/midori-browser.c:4572 ../midori/midori-browser.c:4604 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Priečinok najvyššej úrovne" -#: ../midori/midori-browser.c:845 +#: ../midori/midori-browser.c:864 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Pridať do _Rýchleho prístupu" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Zobraziť v paneli _nástrojov" -#: ../midori/midori-browser.c:860 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Spustiť ako _webovú aplikáciu" -#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4622 -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:990 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Uložiť súbor ako" -#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s z %s" -#: ../midori/midori-browser.c:1386 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "Súbor '%s' bol stiahnutý." -#: ../midori/midori-browser.c:1390 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Prenos dokončený" -#: ../midori/midori-browser.c:1530 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Uložiť súbor" -#: ../midori/midori-browser.c:2244 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#, fuzzy +msgid "Some files are being downloaded" +msgstr "Súbor '%s' bol stiahnutý." + +#: ../midori/midori-browser.c:1923 +#, fuzzy +msgid "_Quit Midori" +msgstr "Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:2320 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2361 ../midori/midori-browser.c:5475 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Pridať novú záložku" -#: ../midori/midori-browser.c:2918 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodarilo sa spustiť databázový príkaz: %s\n" -#: ../midori/midori-browser.c:2998 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdne" -#: ../midori/midori-browser.c:3618 ../midori/sokoke.c:400 -#: ../midori/sokoke.c:410 ../midori/sokoke.c:438 ../midori/sokoke.c:464 -#: ../midori/sokoke.c:478 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nie je možné spustiť externý program" -#: ../midori/midori-browser.c:3932 ../midori/midori-browser.c:5867 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodarilo sa vložiť novú položku histórie: %s\n" -#: ../midori/midori-browser.c:4264 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otvoriť všetky na _kartách" -#: ../midori/midori-browser.c:4271 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otvoriť na novej _karte" -#: ../midori/midori-browser.c:4274 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otvoriť v novom _okne" -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4495 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4496 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4497 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4518 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importovať záložky..." -#: ../midori/midori-browser.c:4521 ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Importovať záložky" -#: ../midori/midori-browser.c:4532 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Aplikácia:" -#: ../midori/midori-browser.c:4559 ../midori/midori-browser.c:5582 -#: ../midori/midori-websettings.c:230 ../midori/midori-websettings.c:304 -#: ../katze/katze-utils.c:687 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastné..." -#: ../midori/midori-browser.c:4633 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Nepodarilo sa importovať záložky" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Nepodarilo sa exportovať záložky" -#: ../midori/midori-browser.c:4723 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodarilo sa odstrániť položku histórie: %s\n" -#: ../midori/midori-browser.c:4829 +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4847 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Odstrániť nasledujúce údaje:" -#: ../midori/midori-browser.c:4858 ../midori/midori-preferences.c:524 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "História" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4869 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "Cookies z Flash" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Ikony webových stránok" -#: ../midori/midori-browser.c:4879 ../midori/sokoke.c:1266 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zatvorené karty" -#: ../midori/midori-browser.c:4884 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Vyrovnávacia pamäť stránok" -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Odstrániť súkromné údaje pri _ukončení Midori" -#: ../midori/midori-browser.c:5000 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Ľahký internetový prehliadač." -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:5160 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "" + +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "Robert Hartl 2009" -#: ../midori/midori-browser.c:5323 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Súbor" -#: ../midori/midori-browser.c:5325 ../midori/sokoke.c:1267 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Otvoriť nové okno" -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Otvoriť novú kartu" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "_Súkromné prehliadanie" -#: ../midori/midori-browser.c:5332 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Neukladať pri prehliadaní žiadne súkromné dáta" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Uložiť do súboru" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Pridať do _Rýchleho prístupu" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Pridať odkaz do rýchleho prístupu" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Pridať záložku na _plochu" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Pridá záložku na plochu" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Pridať _kanál" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Pridá tento kanál do odoberaných kanálov" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Zatvoriť kartu" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Zatvoriť aktívnu kartu" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "_Zatvoriť okno" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Zatvoriť toto okno" -#: ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Vytlačiť aktuálnu stránku" -#: ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Ukončiť aplikáciu" -#: ../midori/midori-browser.c:5365 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Upraviť" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Vrátiť poslednú zmenu" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Znova použiť poslednú zmenu" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Vystrihnúť vybraný text" -#: ../midori/midori-browser.c:5379 ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Kopírovať vybraný text" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Prilepiť vybraný text" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Odstrániť označený text" -#: ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Vybrať všetok text" -#: ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Hľadať slovo alebo frázu na stránke" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Hľadať _ďalšie" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Hľadať ďalší výskyt slova alebo frázy" -#: ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Hľadať _predchádzajúce" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Hľadať predchádzajúce slovo alebo frázu" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Nastaviť možnosti aplikácie" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Zobraziť" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Panely s nástrojmi" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Priblížiť" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Oddialiť" -#: ../midori/midori-browser.c:5425 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Nastaviť pôvodné priblíženie" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Kódovanie" -#: ../midori/midori-browser.c:5428 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Zobraziť _zdrojový kód" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Zobraziť zdrojový kód stránky" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Prepnúť zobrazenie na celú obrazovku" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Rolovať _vľavo" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5601 #, fuzzy msgid "Scroll to the left" msgstr "Umiestnenie bočného panelu vľavo" -#: ../midori/midori-browser.c:5438 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Rolovať _dole" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "" -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Rolovať na_hore" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Rolovať v_pravo" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "P_rejsť" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Späť na predchádzajúcu stránku" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Dopredu na nasledujúcu stránku" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5623 #, fuzzy msgid "Go to the previous sub-page" msgstr "Späť na predchádzajúcu stránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5627 #, fuzzy msgid "Go to the next sub-page" msgstr "Dopredu na nasledujúcu stránku" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Ísť na domovskú stránku" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Vysypať kôš" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Zmaže zoznam zatvorených kariet" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Obnoviť _zatvorenú kartu" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Otvoriť naposledy zatvorenú kartu" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Pridať nový priečinok" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Pridať nový priečinok do záložiek" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Exportovať záložky" -#: ../midori/midori-browser.c:5486 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Správca vyhľadávacích modulov" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Pridáva, upravuje a maže vyhľadávacie moduly..." -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Odstráni súkromné údaje..." -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "_Preskúmať stránku" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Predchádzajúca karta" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Prepnúť na predchádzajúcu kartu" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Ďalšia karta" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Prepnúť na nasledujúcu kartu" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Zamerať _aktuálnu kartu" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Zameria aktuálnu kartu" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Otvoriť posledné _sedenie" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Otvorí karty uložené pri poslednom sedení" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Pomocník" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Obsah pomocníka" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Zobraziť dokumentáciu" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Časté otázky" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Zobraziť Často kladené otázky" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "_Ohlásiť chybu" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Otvorí stránku pre hlásenie chýb" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Zobrazí informácie o programe" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Panel _ponuky" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Zobraziť panel ponuky" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "_Navigačný panel" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Zobraziť navigačný panel" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "_Bočný panel" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Zobraziť bočný panel" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Panel _záložiek" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Zobraziť panel záložiek" -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "Stav _prenosu" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Zobraziť stav prenosu dát" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "_Stavový riadok" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5563 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Čínske (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:5567 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:5570 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Kórejské (EUC-KR)" -#: ../midori/midori-browser.c:5573 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5576 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5579 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Západné (ISO-8859-1)" -#: ../midori/midori-browser.c:6127 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Oddeľovač" -#: ../midori/midori-browser.c:6134 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Umiestnenie..." -#: ../midori/midori-browser.c:6136 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Otvoriť umiestnenie" -#: ../midori/midori-browser.c:6160 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Hľadať na webe..." -#: ../midori/midori-browser.c:6162 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Spustí vyhľadávanie na webe" -#: ../midori/midori-browser.c:6183 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Znovu otvoriť zatvorenú kartu alebo okno" -#: ../midori/midori-browser.c:6198 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Nedávno navštívené stránky" -#: ../midori/midori-browser.c:6200 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Znovu otvorí stránky, ktoré ste už navštívili" -#: ../midori/midori-browser.c:6215 ../midori/sokoke.c:1256 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Zobrazí uložené záložky" -#: ../midori/midori-browser.c:6232 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Nástroje" -#: ../midori/midori-browser.c:6245 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6247 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Zobraziť zoznam všetkých otvorených kariet" -#: ../midori/midori-browser.c:6261 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Ponuka" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "_Ponuka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6467 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "_Rýchle hľadanie" -#: ../midori/midori-browser.c:6498 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Predchádzajúce" -#: ../midori/midori-browser.c:6503 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Ďalšie" -#: ../midori/midori-browser.c:6508 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Rozlišovať veľkosť písma" -#: ../midori/midori-browser.c:6517 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Zvýrazniť" -#: ../midori/midori-browser.c:6529 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Zatvoriť vyhľadávaciu lištu" -#: ../midori/midori-browser.c:6575 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Zmazať všetko" -#: ../midori/midori-browser.c:6932 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočakávané nastavenie '%s'" -#: ../midori/midori-locationaction.c:376 +#: ../midori/midori-locationaction.c:377 #, c-format msgid "Failed to select from history\n" msgstr "Nepodarilo sa vybrať z histórie\n" -#: ../midori/midori-locationaction.c:454 +#: ../midori/midori-locationaction.c:459 #, c-format msgid "Search for %s" msgstr "Hľadať %s" -#: ../midori/midori-locationaction.c:477 +#: ../midori/midori-locationaction.c:482 #, c-format msgid "Search with %s" msgstr "Hľadať s %s" -#: ../midori/midori-locationaction.c:1192 +#: ../midori/midori-locationaction.c:1197 #, c-format msgid "Failed to execute database statement\n" msgstr "Nepodarilo sa spustiť databázový príkaz\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1249 +#: ../midori/midori-locationaction.c:1254 msgid "Paste and p_roceed" msgstr "Vložiť a s_pustiť" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Oddeliť vybraný panel od okna" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Umiestnenie bočného panelu vpravo" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Zatvoriť panel" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Umiestnenie bočného panelu vľavo" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Schovať ovládacie prvky" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Zobraziť prázdnu stránku" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Zobraziť domovskú stránku" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Zobraziť naposledy otvorené karty" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "na novú kartu" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "v novom okne" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "na otvorenej karte" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Predvolený" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Malé ikony" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Ikony a text" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Text pod ikonami" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:279 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:280 +#, fuzzy +msgid "HTTP proxy server" +msgstr "Proxy Server" + +#: ../midori/midori-websettings.c:281 +#, fuzzy +msgid "No proxy server" +msgstr "Proxy Server" + +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Všetky cookies" -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Cookies sedenia" -#: ../midori/midori-websettings.c:284 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:663 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Žiadne" -#: ../midori/midori-websettings.c:300 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Zapamätať si poslednú veľkosť okna" -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "Prajete si ukladať poslednú veľkosť okna?" -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Posledná šírka okna" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Naposledy uložená šírka okna" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "Posledná výška okna" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Posledná pozícia panela" -#: ../midori/midori-websettings.c:401 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Uložená posledná pozícia panela" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "Posledná stránka panelu" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "Posledná uložená stránka panala" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Rýchle hľadanie na webe" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Zobraziť panel pouky" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "Zobrazovať ponuku?" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Zobraziť vyhľadávaciu lištu" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "Zobrazovať vyhľadávaciu lištu?" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Zobraziť záložky" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "Zobrazovať panel záložiek?" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Zobraziť panel" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "Má sa zobrazovať panel?" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Zobraziť stav prenosu" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "Štýl panelu s nástrojmi:" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "Zobraziť priebeh v riadku adresy" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "Zobrazovať výsledky hľadania pri zadávaní adresy" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovanie výsledkov vyhľadávania pri zadávaní adresy" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Položky panelu nástrojov" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Položky, ktoré sa budú zobrazovať na paneli nástrojov" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Kompaktný bočný panel" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "Má sa zobrazovať bočný panel kompaktne?" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "Zobraziť zoznam nástrojov" -#: ../midori/midori-websettings.c:559 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "Má zobrazovať zoznam nástrojov?" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "Umiestniť bočný panel vpravo" -#: ../midori/midori-websettings.c:575 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "Presunúť bočný panel na opačnú stranu" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Otvoriť panely v samostatných oknách" -#: ../midori/midori-websettings.c:591 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "" -#: ../midori/midori-websettings.c:600 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Pri spustení Midori:" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Čo robiť pri spustení Midori?" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "Zobrazí dialóg po spadnutí Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Zobraziť rýchly prístup na nových kartách" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Zobrazí rýchly prístup v novo otvorených kartách" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Uložiť stiahnuté súbory do:" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Spýtať sa na cieľový priečinok" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "Upozorniť po dokončení prenosu" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:707 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "Správca sťahovania" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "Externý správca sťahovania" -#: ../midori/midori-websettings.c:716 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:717 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Externý textový editor" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "Čítačka RSS" -#: ../midori/midori-websettings.c:733 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "Externá čítačka správ RSS" -#: ../midori/midori-websettings.c:741 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "Vyhľadávanie v adresnom riadku" -#: ../midori/midori-websettings.c:742 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "Vyhľadávanie použité v riadku s adresou" -#: ../midori/midori-websettings.c:750 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "Preferované kódovanie" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "Preferované kódovanie znakov" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Vždy zobrazovať karty" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Vždy zobrazí panel kariet" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "Zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:771 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "Zobrazí zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:779 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Otvárať nové stránky v:" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Kde sa budú otvárať nové stránky" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Otvárať externé stránky v:" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "Kde sa budú otvárať externé stránky" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "Prostredné tlačítko myši otvorí adresu, ktorá je vo vybranom texte" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Otvárať karty na pozadí" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "Otvorené karty sa otvárajú na pozadí" -#: ../midori/midori-websettings.c:817 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "Otvoriť karty vedľa aktívnej" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta sa otvorí vedľa aktívnej" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Otvárať vyskakujúce okná na kartách" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovacie okno sa otvorí v novej karte" -#: ../midori/midori-websettings.c:837 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Automaticky načítať obrázky" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "Načíta a zobrazí obrázky automaticky" -#: ../midori/midori-websettings.c:845 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Povoliť skripty" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "Povolí vložené skriptové jazyky" -#: ../midori/midori-websettings.c:853 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Povoliť pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:878 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:900 #, fuzzy msgid "Enable offline web application cache" msgstr "Spustiť ako _webovú aplikáciu" -#: ../midori/midori-websettings.c:887 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:912 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Zväčšovať text aj obrázky" -#: ../midori/midori-websettings.c:913 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "Upravovať text aj obrázky pri menení veľkosti?" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "Hľadať pri písaní" -#: ../midori/midori-websettings.c:929 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "Hľadať text pri písaní?" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "Kinetické rolovanie" -#: ../midori/midori-websettings.c:945 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "Má sa naklonením zariadenia rolovať?" -#: ../midori/midori-websettings.c:953 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Povoliť cookies" -#: ../midori/midori-websettings.c:954 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Ktorý typ cookies prijímať" -#: ../midori/midori-websettings.c:970 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Len originálne cookies" -#: ../midori/midori-websettings.c:971 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:979 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "Uchovávať cookies maximálne" -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "Maximálny počet dní, pre ktoré sú cookies platné" -#: ../midori/midori-websettings.c:997 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Zapamätať si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:1006 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "Maximálna dĺžka histórie" -#: ../midori/midori-websettings.c:1007 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Pamätať si naposledy stiahnuté súbory" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté" -#: ../midori/midori-websettings.c:1026 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:1047 +#, fuzzy +msgid "Proxy server" msgstr "Proxy Server" -#: ../midori/midori-websettings.c:1027 +#: ../midori/midori-websettings.c:1048 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:1057 +#, fuzzy +msgid "HTTP Proxy Server" +msgstr "Proxy Server" + +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "Nastavenie proxy serveru pre HTTP spojenie" -#: ../midori/midori-websettings.c:1042 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "Zistiť proxy server automaticky" -#: ../midori/midori-websettings.c:1043 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Povolí automatické zisťovanie proxy servera" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "Identifikovať sa ako" -#: ../midori/midori-websettings.c:1060 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "Ako sa hlási webovým stránkam" -#: ../midori/midori-websettings.c:1076 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "Identifikačný reťazec" -#: ../midori/midori-websettings.c:1077 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "Identifikačný reťazec aplikácie" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "Uprednostňované jazyky" -#: ../midori/midori-websettings.c:1093 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1124 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "Osobné dáta boli označené k vymazaniu" @@ -1613,342 +1685,361 @@ msgstr "Osobné dáta boli označené k vymazaniu" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:956 ../midori/midori-view.c:4190 -#: ../midori/midori-view.c:4194 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:957 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránka '%s' sa nedá načítať." -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Skúsiť znovu" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1002 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Nenašlo sa - %s" -#: ../midori/midori-view.c:1225 ../midori/midori-view.c:2081 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Poslať %s správu" -#: ../midori/midori-view.c:1850 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Preskúmať _prvok" -#: ../midori/midori-view.c:1902 ../midori/midori-view.c:1980 -msgid "Open _Link" -msgstr "Otvoriť _odkaz" - -#: ../midori/midori-view.c:1905 ../midori/midori-view.c:1982 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:1909 +#: ../midori/midori-view.c:2195 #, fuzzy msgid "Open Link in _Foreground Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:1910 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Otvoriť odkaz v novej karte na pozadí" -#: ../midori/midori-view.c:1913 ../midori/midori-view.c:1989 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Otvoriť odkaz v novom _okne" -#: ../midori/midori-view.c:1916 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Otvoriť odkaz ako _webovú aplikáciu" -#: ../midori/midori-view.c:1919 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Kopírovať _cieľ odkazu" -#: ../midori/midori-view.c:1922 ../midori/midori-view.c:2001 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Uložiť cieľ odkazu" -#: ../midori/midori-view.c:1923 ../midori/midori-view.c:1995 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Stiahnuť cieľ odkazu" -#: ../midori/midori-view.c:1927 ../midori/midori-view.c:1963 -#: ../midori/midori-view.c:2006 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Stiahnuť pomocou _správcu sťahovania" -#: ../midori/midori-view.c:1939 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Otvoriť _obrázok na novej karte" -#: ../midori/midori-view.c:1942 -msgid "Open Image in New Wi_ndow" -msgstr "Otvoriť obrázok v novom o_kne" - -#: ../midori/midori-view.c:1945 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Kopírovať _adresu obrázka" -#: ../midori/midori-view.c:1948 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Uložiť _obrázok" -#: ../midori/midori-view.c:1949 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Stiahnuť o_brázok" -#: ../midori/midori-view.c:1956 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Kopírovať _adresu videa" -#: ../midori/midori-view.c:1959 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Uložiť _video" -#: ../midori/midori-view.c:1959 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Stiahnuť v_ideo" -#: ../midori/midori-view.c:2026 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Hľadať _pomocou" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2068 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Hľadať na webe" -#: ../midori/midori-view.c:2089 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Otvoriť adresu v novej karte" -#: ../midori/midori-view.c:2375 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Otvoriť alebo stiahnuť súbor" -#: ../midori/midori-view.c:2398 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Typ súboru: '%s'" -#: ../midori/midori-view.c:2401 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ súboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2405 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Otvoriť %s" -#: ../midori/midori-view.c:2920 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Inšpekcia stránky - %s" -#: ../midori/midori-view.c:3181 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Rýchly prístup" -#: ../midori/midori-view.c:3182 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Kliknite pre pridanie odkazu" -#: ../midori/midori-view.c:3183 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Zadajte adresu skratky" -#: ../midori/midori-view.c:3184 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Zadajte titulok skratky" -#: ../midori/midori-view.c:3185 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Naozaj chcete zmazať túto záložku?" -#: ../midori/midori-view.c:3221 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3509 +#, fuzzy +msgid "Enter number of shortcuts:" +msgstr "Zadajte adresu skratky" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemôže byť zobrazený" -#: ../midori/midori-view.c:3244 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Dokumentácia nie je nainštalovaná" -#: ../midori/midori-view.c:3467 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Prázdnu stránku" -#: ../midori/midori-view.c:3727 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "Z_dvojiť kartu" -#: ../midori/midori-view.c:3732 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Obnoviť kartu" -#: ../midori/midori-view.c:3732 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Minimalizovať kartu" -#: ../midori/midori-view.c:3738 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "_Zatvorí ostatné karty" -#: ../midori/midori-view.c:4362 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Tlačiť obrázky na pozadí" -#: ../midori/midori-view.c:4363 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Povolí tlačenie obrázkov na pozadí" -#: ../midori/midori-view.c:4415 ../midori/midori-preferences.c:382 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funkcie" #. Page "General" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:298 msgid "General" msgstr "Hlavné" -#: ../midori/midori-preferences.c:300 +#: ../midori/midori-preferences.c:299 msgid "Startup" msgstr "Spustenie" -#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 msgid "Use current page as homepage" msgstr "Použiť aktuálnu ako domovskú stránku" -#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Prenosy" #. Page "Appearance" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:349 msgid "Appearance" msgstr "Vzhľad" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:350 msgid "Font settings" msgstr "Nastavenia písma" -#: ../midori/midori-preferences.c:353 +#: ../midori/midori-preferences.c:352 msgid "Default Font Family" msgstr "Štandardná rodina písma" -#: ../midori/midori-preferences.c:356 +#: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" msgstr "Predvolená rodina písma použitá pre zobrazenie textu" -#: ../midori/midori-preferences.c:359 +#: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" msgstr "Predvolená veľkosť písma použitá pre zobrazenie textu" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:360 msgid "Fixed-width Font Family" msgstr "Rodina neproporciálneho písma" -#: ../midori/midori-preferences.c:364 +#: ../midori/midori-preferences.c:363 msgid "The font family used to display fixed-width text" msgstr "Písmo použité pri zobrazovaní písma z rovnakou šírkou písmen" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" msgstr "Veľkosť písma použitá pre zobrazovanie písma s rovnakou šírkou písmen" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" msgstr "Minimálna veľkosť písma" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" msgstr "Minimálna veľkosť písma použitá na zobrazenie textu" #. Page "Behavior" -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-preferences.c:380 msgid "Behavior" msgstr "Správanie" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:393 msgid "Enforce 96 dots per inch" msgstr "Vynútiť 96 bodov na palec" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:394 msgid "Enforce a video dot density of 96 DPI" msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec" #: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "" + +#: ../midori/midori-preferences.c:415 +#, fuzzy +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Vyskakovacie okno sa otvorí v novej karte" + +#: ../midori/midori-preferences.c:419 msgid "Spell Checking" msgstr "Kontrola pravopisu" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:422 msgid "Enable Spell Checking" msgstr "Povoliť kontrolu pravopisu" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:423 msgid "Enable spell checking while typing" msgstr "Povoliť kontrolu pravopisu pri písaní" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Spelling dictionaries:" msgstr "Slovníky pre kontrolu pravopisu:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:424 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Čiarkou oddelený zoznam jazykov použitých pre kontrolu pravopisu, napr. " -"\"sk_SK, en_GB\"" +#: ../midori/midori-preferences.c:429 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Čiarkou oddelený zoznam jazykov použitých pre kontrolu pravopisu, napr. \"sk_SK, en_GB\"" #. Page "Interface" -#: ../midori/midori-preferences.c:430 +#: ../midori/midori-preferences.c:435 msgid "Interface" msgstr "Rozhranie" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:436 msgid "Navigationbar" msgstr "Navigačný panel" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:446 msgid "Browsing" msgstr "Prehliadanie" #. Page "Applications" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:468 msgid "Applications" msgstr "Aplikácie" -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:469 msgid "External applications" msgstr "Externé aplikácie" #. Page "Network" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 msgid "Network" msgstr "Sieť" +#: ../midori/midori-preferences.c:492 +#, fuzzy +msgid "Hostname" +msgstr "Meno" + #. Page "Privacy" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:511 msgid "Privacy" msgstr "Súkromie" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:512 msgid "Web Cookies" msgstr "Webové Cookies" -#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" msgstr "dní" @@ -1980,83 +2071,68 @@ msgstr "Správca vyhľadávacích modulov" msgid "Use as _default" msgstr "Použiť ako _predvolený" -#: ../midori/sokoke.c:1255 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Záložka" -#: ../midori/sokoke.c:1257 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "Pridať záložku" -#: ../midori/sokoke.c:1258 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:1259 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Rozšírenia" -#: ../midori/sokoke.c:1260 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_História" -#: ../midori/sokoke.c:1261 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:1262 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "_Užívateľské skripty" -#: ../midori/sokoke.c:1263 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/sokoke.c:1264 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "_Prenosy" -#: ../midori/sokoke.c:1265 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "Pluginy _Netscape" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Užívateľské skripty" - -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Užívateľské štýly" - -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "" -"Skopíruje užívateľské skripty do priečinka %s a užívateľské štýly do " -"priečinka %s" - -#: ../panels/midori-addons.c:911 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Nemôžem sledovať priečinok: '%s': %s" +#: ../midori/sokoke.c:1307 +#, fuzzy +msgid "New _Folder" +msgstr "Nový priečinok" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Upraviť vybranú záložku" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Vymazať označenú záložku" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Pridať nový priečinok" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Oddeľovač" @@ -2064,6 +2140,16 @@ msgstr "Oddeľovač" msgid "Console" msgstr "Konzola" +#: ../panels/midori-console.c:361 +#, fuzzy +msgid "Copy _All" +msgstr "Zbaliť všetko" + +#: ../panels/midori-console.c:362 +#, fuzzy +msgid "Copy All" +msgstr "Zbaliť všetko" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Rozšírenia" @@ -2073,8 +2159,7 @@ msgid "Erroneous clock time" msgstr "Chyba v nastavení času" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." +msgid "The clock time lies in the past. Please check the current date and time." msgstr "Hodiny meškajú. Skon" #: ../panels/midori-history.c:286 @@ -2101,28 +2186,28 @@ msgstr "Včera" msgid "Are you sure you want to remove all history items?" msgstr "Naozaj si želáte vymazať celú históriu?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Pridať do záložiek vybranú položku histórie" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Odstrániť označenú položku v histórii" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Zmazať celú históriu" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Otvoriť cieľový _priečinok" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Kopírovať _umiestnenie" @@ -2148,30 +2233,30 @@ msgstr "Heslo" msgid "_Remember password" msgstr "Zapamätať _heslo" -#: ../katze/katze-throbber.c:842 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Ikona „%s“ nemôže byť načítaná" -#: ../katze/katze-throbber.c:855 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Uložená ikona „%s“ nemôže byť načítaná" -#: ../katze/katze-throbber.c:923 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "Snímky animácie sú porušené" -#: ../katze/katze-utils.c:494 ../katze/katze-utils.c:889 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnosť '%s' nie je platná pre %s" -#: ../katze/katze-utils.c:540 ../katze/katze-utils.c:569 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Vyberte súbor" -#: ../katze/katze-utils.c:555 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Vyberte priečinok" @@ -2180,50 +2265,79 @@ msgstr "Vyberte priečinok" msgid "Preferences for %s" msgstr "Predvoľby pre %s" -#: ../extensions/adblock.c:398 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Nastaviť filtre na reklamu" -#: ../extensions/adblock.c:430 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "" -#: ../extensions/adblock.c:570 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "_Blokovanie reklamy" -#: ../extensions/adblock.c:818 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Upraviť pravidlo" -#: ../extensions/adblock.c:831 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Pravidlo:" -#: ../extensions/adblock.c:885 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "_Blokovať obrázok" -#: ../extensions/adblock.c:890 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "_Blokovať odkaz" -#: ../extensions/adblock.c:1447 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Blokovač reklamy" -#: ../extensions/adblock.c:1448 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Blokovať reklamy podľa zoznamu filtorv" -#: ../extensions/colorful-tabs.c:138 +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "" + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Užívateľské skripty" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Užívateľské štýly" + +#: ../extensions/addons.c:1085 +#, fuzzy, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Nastavenie sa nepodarilo uložiť. %s" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Nemôžem sledovať priečinok: '%s': %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Ofarebné karty" -#: ../extensions/colorful-tabs.c:139 +#: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" msgstr "Ofarbiť každú kartu samostatne" @@ -2237,9 +2351,7 @@ msgid "Delete All" msgstr "Odstrániť všetky" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:129 @@ -2313,12 +2425,8 @@ msgid "_Collapse All" msgstr "_Zbaliť všetko" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Vložte reťazec, podľa ktorého sa budú cookies filtrovať. Filtruje sa podľa " -"názvu alebo domény" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Vložte reťazec, podľa ktorého sa budú cookies filtrovať. Filtruje sa podľa názvu alebo domény" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2328,11 +2436,11 @@ msgstr "Správca _cookies" msgid "List, view and delete cookies" msgstr "Zoznam, detaily a mazanie cookies" -#: ../extensions/feed-panel/feed-atom.c:237 +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Nepodarilo sa nájsť požadované prvky Atom \"entry\" v dátach XML." -#: ../extensions/feed-panel/feed-atom.c:343 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Nepodarilo sa nájsť požadované prvky Atom \"feed\" v dátach XML." @@ -2343,19 +2451,19 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Posledná aktualizácia: %s" -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:671 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Add new feed" msgstr "Pridať nový kanál" -#: ../extensions/feed-panel/feed-panel.c:727 +#: ../extensions/feed-panel/feed-panel.c:731 msgid "Delete feed" msgstr "Odstrániť kanál" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:814 msgid "_Feeds" msgstr "_Kanály" @@ -2434,11 +2542,11 @@ msgstr "Nie sú nainštalované súbory so zdrojom" msgid "Form history filler" msgstr "" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gesta myšou" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Ovládanie Midori pomocou myši" @@ -2491,23 +2599,23 @@ msgstr "Rožšírenie stavového riadka" msgid "Easily toggle features on web pages on and off" msgstr "Jednoducho zapína a vypína rozšírenia webových stránok" -#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Panel záložiek" -#: ../extensions/tab-panel.c:606 +#: ../extensions/tab-panel.c:609 msgid "T_ab Panel" msgstr "Panel _záložiek" -#: ../extensions/tab-panel.c:623 +#: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" msgstr "Zobraziť karty vo vertikálnom panely" -#: ../extensions/tab-switcher.c:394 +#: ../extensions/tab-switcher.c:395 msgid "Tab History List" msgstr "Karta histórie" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "" @@ -2516,9 +2624,7 @@ msgid "Customize Toolbar" msgstr "Upraviť panel" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" #: ../extensions/toolbar-editor.c:421 @@ -2545,6 +2651,15 @@ msgstr "Umožňuje jednoducho zmeniť panel" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" +#~ msgid "Open _Link" +#~ msgstr "Otvoriť _odkaz" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "Otvoriť obrázok v novom o_kne" + +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Skopíruje užívateľské skripty do priečinka %s a užívateľské štýly do priečinka %s" + #~ msgid "Failed to get current time: %s\n" #~ msgstr "Nepodarilo sa zistiť aktuálny čas: %s\n" From 63598e8e5163721231024e48cc11def880fff491 Mon Sep 17 00:00:00 2001 From: Robert Hartl Date: Tue, 25 May 2010 13:35:13 +0200 Subject: [PATCH 2631/2970] l10n: Updated Slovak (sk) translation to 90% New status: 564 messages complete with 15 fuzzies and 42 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/sk.po | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/sk.po b/po/sk.po index e8a968ae..3fdde326 100644 --- a/po/sk.po +++ b/po/sk.po @@ -83,7 +83,7 @@ msgstr "Sedenie sa nepodarilo uložiť. %s" #: ../midori/main.c:868 msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "" +msgstr "Nie sú k dispozícií žiadne koreňové certifikáty. SSL certifikáty nemôžu byť overené." #: ../midori/main.c:958 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." @@ -305,9 +305,8 @@ msgid "Toplevel folder" msgstr "Priečinok najvyššej úrovne" #: ../midori/midori-browser.c:864 -#, fuzzy msgid "Add to _Speed Dial" -msgstr "Pridať do _Rýchleho prístupu" +msgstr "Pridať do _rýchleho prístupu" #: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" @@ -356,9 +355,8 @@ msgid "Some files are being downloaded" msgstr "Súbor '%s' bol stiahnutý." #: ../midori/midori-browser.c:1923 -#, fuzzy msgid "_Quit Midori" -msgstr "Midori" +msgstr "_Ukončiť Midori" #: ../midori/midori-browser.c:1925 msgid "The transfers will be cancelled if Midori quits." @@ -1139,17 +1137,15 @@ msgstr "Text pod ikonami" #: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" -msgstr "" +msgstr "Automaticky (GNOME alebo iné prostredie)" #: ../midori/midori-websettings.c:280 -#, fuzzy msgid "HTTP proxy server" -msgstr "Proxy Server" +msgstr "HTTTP proxy server" #: ../midori/midori-websettings.c:281 -#, fuzzy msgid "No proxy server" -msgstr "Proxy Server" +msgstr "Žiadny" #: ../midori/midori-websettings.c:296 msgid "All cookies" From 8701722f308ff9dfcfada136e0abce4282dd56bf Mon Sep 17 00:00:00 2001 From: Robert Hartl Date: Tue, 25 May 2010 13:41:28 +0200 Subject: [PATCH 2632/2970] l10n: Updated Slovak (sk) translation to 91% New status: 570 messages complete with 13 fuzzies and 38 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/sk.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/sk.po b/po/sk.po index 3fdde326..929919d0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -319,12 +319,12 @@ msgstr "Spustiť ako _webovú aplikáciu" #: ../midori/midori-browser.c:986 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "" +msgstr "Nie je dosť miesta pre stiahnutie \"%s\"." #: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." -msgstr "" +msgstr "Potrebuje %s, ale k dispozícií je iba %s." #: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 #: ../midori/midori-browser.c:4818 @@ -350,9 +350,8 @@ msgid "Save file" msgstr "Uložiť súbor" #: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -#, fuzzy msgid "Some files are being downloaded" -msgstr "Súbor '%s' bol stiahnutý." +msgstr "Ešte sa sťahujú nejaké súbory" #: ../midori/midori-browser.c:1923 msgid "_Quit Midori" @@ -360,7 +359,7 @@ msgstr "_Ukončiť Midori" #: ../midori/midori-browser.c:1925 msgid "The transfers will be cancelled if Midori quits." -msgstr "" +msgstr "Ukončením Midori budú prenosy zrušené." #: ../midori/midori-browser.c:2386 msgid "Open file" @@ -694,9 +693,8 @@ msgid "Scroll _Left" msgstr "Rolovať _vľavo" #: ../midori/midori-browser.c:5601 -#, fuzzy msgid "Scroll to the left" -msgstr "Umiestnenie bočného panelu vľavo" +msgstr "" #: ../midori/midori-browser.c:5603 msgid "Scroll _Down" @@ -1523,11 +1521,11 @@ msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)" #: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" -msgstr "" +msgstr "Povoliť podporu databázy HTML5" #: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "Či povoliť databázu HTML5" #: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" From a8ee99b26505b0cd7a87c937cf3c51527a009762 Mon Sep 17 00:00:00 2001 From: Robert Hartl Date: Tue, 25 May 2010 13:48:30 +0200 Subject: [PATCH 2633/2970] l10n: Updated Slovak (sk) translation to 93% New status: 583 messages complete with 5 fuzzies and 33 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/sk.po | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/po/sk.po b/po/sk.po index 929919d0..ecd770fb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1617,18 +1617,16 @@ msgid "Whether the last downloaded files are saved" msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté" #: ../midori/midori-websettings.c:1047 -#, fuzzy msgid "Proxy server" -msgstr "Proxy Server" +msgstr "Proxy server" #: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" -msgstr "" +msgstr "Typ proxy servera" #: ../midori/midori-websettings.c:1057 -#, fuzzy msgid "HTTP Proxy Server" -msgstr "Proxy Server" +msgstr "HTTP proxy server" #: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" @@ -1834,20 +1832,19 @@ msgstr "Naozaj chcete zmazať túto záložku?" #: ../midori/midori-view.c:3506 msgid "Set number of columns" -msgstr "" +msgstr "Zmeniť počet stĺpcov" #: ../midori/midori-view.c:3507 msgid "Enter number of columns:" -msgstr "" +msgstr "Vložte počet stĺpcov" #: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" -msgstr "" +msgstr "Zmeniť počet záložiek" #: ../midori/midori-view.c:3509 -#, fuzzy msgid "Enter number of shortcuts:" -msgstr "Zadajte adresu skratky" +msgstr "Vložte počet záložiek" #: ../midori/midori-view.c:3535 #, c-format @@ -1964,12 +1961,11 @@ msgstr "Vnúti rozlíšenie obrazu 96 bodov na palec" #: ../midori/midori-preferences.c:414 msgid "Allow scripts to open popups" -msgstr "" +msgstr "Povoliť skriptom otvárať vyskakovacie okná" #: ../midori/midori-preferences.c:415 -#, fuzzy msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Vyskakovacie okno sa otvorí v novej karte" +msgstr "Či skripty môžu otvárať vyskakovacie okná automaticky" #: ../midori/midori-preferences.c:419 msgid "Spell Checking" @@ -2020,9 +2016,8 @@ msgid "Network" msgstr "Sieť" #: ../midori/midori-preferences.c:492 -#, fuzzy msgid "Hostname" -msgstr "Meno" +msgstr "Počítač" #. Page "Privacy" #: ../midori/midori-preferences.c:511 @@ -2106,9 +2101,8 @@ msgid "Netscape p_lugins" msgstr "Pluginy _Netscape" #: ../midori/sokoke.c:1307 -#, fuzzy msgid "New _Folder" -msgstr "Nový priečinok" +msgstr "Nový _priečinok" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" @@ -2135,14 +2129,12 @@ msgid "Console" msgstr "Konzola" #: ../panels/midori-console.c:361 -#, fuzzy msgid "Copy _All" -msgstr "Zbaliť všetko" +msgstr "Kopírovať _všetko" #: ../panels/midori-console.c:362 -#, fuzzy msgid "Copy All" -msgstr "Zbaliť všetko" +msgstr "Kopírovať všetko" #: ../panels/midori-extensions.c:91 msgid "Extensions" From efc5344777cea8dac37c0c90551f900746b19ac0 Mon Sep 17 00:00:00 2001 From: Harald Servat Date: Tue, 25 May 2010 14:34:39 +0200 Subject: [PATCH 2634/2970] l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 456 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 234 insertions(+), 222 deletions(-) diff --git a/po/ca.po b/po/ca.po index ede343d8..6c336c86 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-19 04:07+0000\n" +"POT-Creation-Date: 2010-05-25 10:08+0000\n" "PO-Revision-Date: 2010-05-04 19:53+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -247,12 +247,12 @@ msgstr "No es reconeix el format de l'adreça d'interès." msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" @@ -300,12 +300,12 @@ msgstr "_Descripció:" msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Carpeta:" #: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" @@ -331,8 +331,8 @@ msgstr "No hi ha prou espai lliure per descarregat «%s»." msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Anomena i desa" @@ -354,678 +354,690 @@ msgstr "Transferència finalitzada" msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "S'estan descarregant fitxers" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "_Sortir de Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Les transferències es cancel·laran si se surt de Midori." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" -#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Buit" -#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "Pàgines visitades _recentment" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Reobre pàgines que heu visitat anteriorment" -#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Menú" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "Cerca en _línia:" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Següent" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Coincidència de majúscules i minúscules" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Ressalta les coincidències" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Tanca la barra de cerques" -#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Netejar-ho tot" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" @@ -1671,213 +1683,213 @@ msgstr "La selecció de dades privades per a esborrar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1242 ../midori/midori-view.c:4509 -#: ../midori/midori-view.c:4513 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1243 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Torneu-ho a provar" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "No s'ha trobat «%s»" -#: ../midori/midori-view.c:1501 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2500 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2172 ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2180 ../midori/midori-view.c:2249 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2189 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "De_sa el destí de l'enllaç" -#: ../midori/midori-view.c:2190 ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Descarrega el destí de l'enllaç" -#: ../midori/midori-view.c:2194 ../midori/midori-view.c:2224 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Descarrega amb el _gestor de descàrregues" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2206 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Descarrega la i_matge" -#: ../midori/midori-view.c:2217 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2283 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2318 ../midori/midori-view.c:2325 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2346 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2643 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2665 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2669 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3217 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3482 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3483 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3484 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3486 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3487 +#: ../midori/midori-view.c:3506 msgid "Set number of columns" msgstr "Estableix el nombre de columnes" -#: ../midori/midori-view.c:3488 +#: ../midori/midori-view.c:3507 msgid "Enter number of columns:" msgstr "Introduïu el nombre de columnes:" -#: ../midori/midori-view.c:3489 +#: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" msgstr "Estableix el nombre de dreceres" -#: ../midori/midori-view.c:3490 +#: ../midori/midori-view.c:3509 msgid "Enter number of shortcuts:" msgstr "Introduïeu el nombre de dreceres:" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3789 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4049 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Restaura la pestanya" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Minimitza la pestanya" -#: ../midori/midori-view.c:4060 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4682 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4734 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Característiques" From 59926ad49266ca34eb7ccf63d7eace3df05e4970 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 May 2010 18:26:47 +0200 Subject: [PATCH 2635/2970] Verbosely explain how to use news feed URI --- midori/midori-browser.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2bf7c971..586a2add 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2459,7 +2459,17 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* browser, if (browser->news_aggregator && *browser->news_aggregator) sokoke_spawn_program (browser->news_aggregator, uri, FALSE); else - sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), uri); + { + gchar* description = g_strdup_printf ("%s\n\n%s", uri, + _("To use the above URI open a news aggregator. " + "There is usually a menu or button \"New Subscription\", " + "\"New News Feed\" or similar.\n" + "Alternatively go to Preferences, Applications in Midori, " + "and select a News Aggregator. Next time you click the " + "news feed icon, it will be added automatically.")); + sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), description); + g_free (description); + } } static void From 76c7319ddb11b5a38144284fafb29a1fcef0f2e2 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Tue, 25 May 2010 18:34:01 +0200 Subject: [PATCH 2636/2970] l10n: Updated Danish (da) translation to 99% New status: 620 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 354 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 183 insertions(+), 171 deletions(-) diff --git a/po/da.po b/po/da.po index d7bc28f7..f56f0cc4 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-21 16:07+0000\n" +"POT-Creation-Date: 2010-05-25 16:07+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -244,12 +244,12 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" @@ -297,12 +297,12 @@ msgstr "_Beskrivelse:" msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Mappe:" #: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Øverste mappe" @@ -328,8 +328,8 @@ msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Gem fil som" @@ -351,158 +351,170 @@ msgstr "Overførsel gennemført" msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Nogle filer bliver overført" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "_Afslut Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2425 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2466 ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3039 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/midori-browser.c:3119 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Tom" -#: ../midori/midori-browser.c:3740 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:4054 ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4387 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4394 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4397 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4648 ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4850 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4986 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:5007 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:5012 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -510,519 +522,519 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:5453 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:5507 ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5614 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5693 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5700 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5703 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5706 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5709 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:6345 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:6705 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Ryd alle" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" From c571a6394f6feb622dd758d04a3b0ed7cbabfa23 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 May 2010 18:50:16 +0200 Subject: [PATCH 2637/2970] Don't pass around KatzeNet instances anymore The KatzeNet is always a singleton, no need to pass it around. --- extensions/feed-panel/feed-panel.c | 4 ---- extensions/feed-panel/main.c | 8 +------- katze/katze-net.c | 15 +++++++++++---- midori/midori-browser.c | 19 ++++++------------- midori/midori-view.c | 15 +++++---------- 5 files changed, 23 insertions(+), 38 deletions(-) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 8ef29d69..26fbb261 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -30,7 +30,6 @@ struct _FeedPanel GtkWidget* webview; GtkWidget* delete; GdkPixbuf* pixbuf; - KatzeNet* net; }; struct _FeedPanelClass @@ -750,7 +749,6 @@ feed_panel_finalize (GObject* object) FeedPanel* panel = FEED_PANEL (object); g_object_unref (panel->pixbuf); - g_object_unref (panel->net); } static void @@ -826,8 +824,6 @@ feed_panel_init (FeedPanel* panel) gtk_icon_factory_add_default (factory); g_object_unref (factory); - panel->net = katze_net_new (); - model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); panel->treeview = treeview; diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 499a4e09..4695225e 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -40,7 +40,6 @@ typedef struct MidoriExtension* extension; GtkWidget* panel; KatzeArray* feeds; - KatzeNet* net; GSList* parsers; guint source_id; @@ -96,8 +95,6 @@ feed_deactivate_cb (MidoriExtension* extension, g_source_remove (priv->source_id); g_slist_foreach (priv->parsers, (GFunc)g_free, NULL); g_slist_free (priv->parsers); - if (priv->feeds) - g_object_unref (priv->net); if (priv->feeds) g_object_unref (priv->feeds); gtk_widget_destroy (priv->panel); @@ -286,7 +283,7 @@ update_feed (FeedPrivate* priv, netpriv->extension = priv->extension; netpriv->feed = KATZE_ARRAY (feed); - katze_net_load_uri (priv->net, + katze_net_load_uri (NULL, katze_item_get_uri (feed), (KatzeNetStatusCb) feed_status_cb, (KatzeNetTransferCb) feed_transfer_cb, @@ -437,7 +434,6 @@ feed_app_add_browser_cb (MidoriApp* app, GtkWidget* addon; GtkActionGroup* action_group; GtkAction* action; - KatzeNet* net; KatzeArray* feeds; KatzeArray* feed; FeedPrivate* priv; @@ -453,14 +449,12 @@ feed_app_add_browser_cb (MidoriApp* app, midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); g_object_unref (panel); - net = katze_net_new (); feeds = katze_array_new (KATZE_TYPE_ARRAY); feed_panel_add_feeds (FEED_PANEL (addon), KATZE_ITEM (feeds)); priv->extension = extension; priv->browser = browser; priv->panel = addon; - priv->net = net; priv->feeds = feeds; priv->parsers = g_slist_prepend (priv->parsers, atom_init_parser ()); priv->parsers = g_slist_prepend (priv->parsers, rss_init_parser ()); diff --git a/katze/katze-net.c b/katze/katze-net.c index d781b9b8..6467832f 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -77,6 +77,8 @@ katze_net_finalize (GObject* object) * Instantiates a new #KatzeNet instance. * * Return value: a new #KatzeNet + * + * Deprecated: 0.2.7 **/ KatzeNet* katze_net_new (void) @@ -102,14 +104,14 @@ katze_net_new (void) * * Return value: a session, or %NULL * - * Since: 0.1.3 + * Deprecated: 0.2.7: Use webkit_get_default_session (). **/ gpointer katze_net_get_session (KatzeNet* net) { g_return_val_if_fail (KATZE_IS_NET (net), NULL); - return net->session; + return webkit_get_default_session (); } typedef struct @@ -147,6 +149,9 @@ katze_net_get_cached_path (KatzeNet* net, gchar* cached_filename; gchar* cached_path; + if (!net) + net = katze_net_new (); + if (subfolder) cache_path = g_build_filename (net->cache_path, subfolder, NULL); else @@ -301,7 +306,7 @@ katze_net_default_cb (KatzeNetPriv* priv) /** * katze_net_load_uri: - * @net: a #KatzeNet + * @net: a #KatzeNet, or %NULL * @uri: an URI string * @status_cb: function to call for status information * @transfer_cb: function to call upon transfer @@ -330,12 +335,14 @@ katze_net_load_uri (KatzeNet* net, KatzeNetPriv* priv; SoupMessage* msg; - g_return_if_fail (KATZE_IS_NET (net)); g_return_if_fail (uri != NULL); if (!status_cb && !transfer_cb) return; + if (net == NULL) + net = katze_net_new (); + request = g_new0 (KatzeNetRequest, 1); request->uri = g_strdup (uri); request->mime_type = NULL; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 586a2add..534a2a05 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -104,8 +104,6 @@ struct _MidoriBrowser KatzeArray* history; gboolean show_tabs; - KatzeNet* net; - gboolean show_navigationbar; gboolean show_statusbar; gboolean speed_dial_in_new_tabs; @@ -1100,7 +1098,7 @@ midori_browser_save_uri (MidoriBrowser* browser, webkit_download_start (download); g_free (destination); #else - katze_net_load_uri (browser->net, uri, NULL, + katze_net_load_uri (NULL, uri, NULL, (KatzeNetTransferCb)midori_browser_save_transfer_cb, filename); #endif @@ -3765,7 +3763,7 @@ _action_source_view_activate (GtkAction* action, GtkWidget* source; GtkWidget* web_view; - source = midori_view_new (browser->net); + source = midori_view_new (NULL); midori_view_set_settings (MIDORI_VIEW (source), browser->settings); midori_view_set_uri (MIDORI_VIEW (source), ""); web_view = midori_view_get_web_view (MIDORI_VIEW (source)); @@ -3800,7 +3798,7 @@ _action_source_view_activate (GtkAction* action, g_free (filename); return; } - katze_net_load_uri (browser->net, uri, NULL, + katze_net_load_uri (NULL, uri, NULL, (KatzeNetTransferCb)midori_browser_source_transfer_cb, browser); g_free (text_editor); } @@ -4903,7 +4901,7 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog, button = g_object_get_data (G_OBJECT (dialog), "cookies"); if (gtk_toggle_button_get_active (button)) { - SoupSession* session = katze_net_get_session (browser->net); + SoupSession* session = webkit_get_default_session (); SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR); GSList* cookies = soup_cookie_jar_all_cookies (SOUP_COOKIE_JAR (jar)); @@ -5449,7 +5447,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook, view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, - "net", browser->net, NULL); + NULL); midori_view_set_uri (MIDORI_VIEW (view), ""); gtk_widget_show (view); g_object_set_data (G_OBJECT (view), "midori-view-append", (void*)1); @@ -6233,8 +6231,6 @@ midori_browser_init (MidoriBrowser* browser) GtkWidget* scrolled; GtkWidget* icon; - browser->net = katze_net_new (); - browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); browser->bookmarks = NULL; @@ -6790,8 +6786,6 @@ midori_browser_finalize (GObject* object) katze_object_assign (browser->search_engines, NULL); katze_object_assign (browser->history, NULL); - katze_object_assign (browser->net, NULL); - katze_assign (browser->news_aggregator, NULL); G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); @@ -7509,7 +7503,6 @@ midori_browser_add_item (MidoriBrowser* browser, view = g_object_new (MIDORI_TYPE_VIEW, "title", title, "settings", browser->settings, - "net", browser->net, NULL); midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); @@ -7551,7 +7544,7 @@ midori_browser_add_uri (MidoriBrowser* browser, g_return_val_if_fail (uri != NULL, -1); view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, - "net", browser->net, NULL); + NULL); midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); diff --git a/midori/midori-view.c b/midori/midori-view.c index cc183b2c..dd66fd1d 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -887,7 +887,7 @@ _midori_web_view_load_icon (MidoriView* view) icon_uri = g_strdup_printf ("%s/favicon.ico", view->uri); } - icon_file = katze_net_get_cached_path (view->net, icon_uri, "icons"); + icon_file = katze_net_get_cached_path (NULL, icon_uri, "icons"); if (g_hash_table_lookup_extended (view->memory, icon_file, NULL, (gpointer)&pixbuf)) { @@ -910,7 +910,7 @@ _midori_web_view_load_icon (MidoriView* view) priv->icon_uri = icon_uri; priv->view = view; - katze_net_load_uri (view->net, icon_uri, + katze_net_load_uri (NULL, icon_uri, (KatzeNetStatusCb)katze_net_icon_status_cb, (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv); } @@ -2600,7 +2600,6 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, else { new_view = g_object_new (MIDORI_TYPE_VIEW, - "net", view->net, "settings", view->settings, NULL); midori_view_construct_web_view (new_view); @@ -2967,8 +2966,6 @@ midori_view_set_property (GObject* object, break; case PROP_NET: katze_object_assign (view->net, g_value_dup_object (value)); - if (!view->net) - view->net = katze_net_new (); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -3047,7 +3044,7 @@ midori_view_focus_in_event (GtkWidget* widget, /** * midori_view_new: - * @net: a #KatzeNet + * @net: a #KatzeNet, or %NULL * * Creates a new view. * @@ -3056,9 +3053,7 @@ midori_view_focus_in_event (GtkWidget* widget, GtkWidget* midori_view_new (KatzeNet* net) { - g_return_val_if_fail (!net || KATZE_IS_NET (net), NULL); - - return g_object_new (MIDORI_TYPE_VIEW, "net", net, NULL); + return g_object_new (MIDORI_TYPE_VIEW, NULL); } static void @@ -3986,7 +3981,7 @@ midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget* menuitem, { MidoriNewView where = MIDORI_NEW_VIEW_TAB; GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, - "net", view->net, "settings", view->settings, NULL); + "settings", view->settings, NULL); midori_view_set_uri (MIDORI_VIEW (new_view), midori_view_get_display_uri (view)); gtk_widget_show (new_view); From 07b3eaab7d8126c1cb8c911fb1eaa1d1c2fe18d0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 May 2010 21:46:14 +0200 Subject: [PATCH 2638/2970] Update German translation --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 990a3201..f379d759 100644 --- a/po/de.po +++ b/po/de.po @@ -61,17 +61,17 @@ msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Die Konfiguration konnte nicht geladen werden. %s" +msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" #: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" +msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s" #: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Die Lesezeichen konnten nicht geladen werden. %s" +msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" #. i18n: Trash, or wastebin, containing closed tabs #: ../midori/main.c:602 ../midori/main.c:625 @@ -82,7 +82,7 @@ msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" #: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Die Sitzung konnte nicht geladen werden. %s" +msgstr "Die Sitzung konnte nicht gespeichert werden. %s" #: ../midori/main.c:868 msgid "" @@ -2337,7 +2337,7 @@ msgstr "Benutzerstile" #: ../extensions/addons.c:1085 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht geladen werden: %s\n" +msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" #: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" From dc047272d703d14b8d1fd1f393994e2e654625fc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 May 2010 22:24:41 +0200 Subject: [PATCH 2639/2970] Always bring the inspector window in the foreground --- midori/midori-view.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index dd66fd1d..aefaa23b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3282,6 +3282,21 @@ midori_view_web_inspector_inspect_web_view_cb (gpointer inspector, return WEBKIT_WEB_VIEW (inspector_view); } +static gboolean +midori_view_web_inspector_show_window_cb (gpointer inspector, + MidoriView* view) +{ + GtkWidget* inspector_view; + GtkWidget* window; + + g_object_get (inspector, "web-view", &inspector_view, NULL); + window = gtk_widget_get_toplevel (inspector_view); + if (!window) + return FALSE; + gtk_window_present (GTK_WINDOW (window)); + return TRUE; +} + static gboolean midori_view_web_inspector_attach_window_cb (gpointer inspector, MidoriView* view) @@ -3413,6 +3428,8 @@ midori_view_construct_web_view (MidoriView* view) g_object_connect (inspector, "signal::inspect-web-view", midori_view_web_inspector_inspect_web_view_cb, view, + "signal::show-window", + midori_view_web_inspector_show_window_cb, view, "signal::attach-window", midori_view_web_inspector_attach_window_cb, view, "signal::detach-window", From 5f8e9da610ad396aff86cd3699fbe66da1d63877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Sok=C3=B3=C5=82?= Date: Tue, 25 May 2010 23:20:55 +0200 Subject: [PATCH 2640/2970] l10n: Updated Polish (pl) translation to 91% New status: 569 messages complete with 16 fuzzies and 36 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pl.po | 530 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 271 insertions(+), 259 deletions(-) diff --git a/po/pl.po b/po/pl.po index 351735c9..3c8cf120 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # Przemysław Sitek , 2008. # Lukasz Romanowicz , 2008. -# Piotr Sokół , 2010. +# Piotr Sokół , 2010. # msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-19 16:07+0000\n" -"PO-Revision-Date: 2010-05-19 22:37+0100\n" +"POT-Creation-Date: 2010-05-25 16:07+0000\n" +"PO-Revision-Date: 2010-05-25 23:13+0100\n" "Last-Translator: Piotr Sokół \n" -"Language-Team: pl\n" +"Language-Team: pl <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -183,12 +183,11 @@ msgstr "WZORZEC" #. i18n: CLI: Close tabs, clear private data, open starting page #: ../midori/main.c:1581 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" +msgstr "Resetuje działanie programu po czasie wyrażonym ilością SEKUND" #: ../midori/main.c:1581 -#, fuzzy msgid "SECONDS" -msgstr "SEKUND" +msgstr "SEKUNDY" #: ../midori/main.c:1661 msgid "[Addresses]" @@ -259,13 +258,13 @@ msgid "Writing failed." msgstr "Zapisywanie nie udało się." #: ../midori/midori-browser.c:336 -#: ../midori/midori-browser.c:5538 -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Wczytuje ponownie bieżącą stronę" #: ../midori/midori-browser.c:346 -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Zatrzymuje wczytywanie bieżącej strony" @@ -316,14 +315,14 @@ msgid "_Address:" msgstr "_Adres:" #: ../midori/midori-browser.c:823 -#: ../midori/midori-browser.c:4694 +#: ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Katalog:" #: ../midori/midori-browser.c:833 #: ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:4736 +#: ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Katalog główny" @@ -340,18 +339,18 @@ msgid "Run as _web application" msgstr "Uruchamianie jako _aplikacja internetowa" #: ../midori/midori-browser.c:986 -#, fuzzy, c-format +#, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Nie ma wystarczająco dużo przestrzeni aby pobrać „%s”." +msgstr "Nie ma wystarczająco dużo wolnej przestrzeni aby pobrać „%s”." #: ../midori/midori-browser.c:990 #, c-format msgid "The file needs %s but only %s are left." -msgstr "" +msgstr "Pobranie pliku wymaga %s wolnej przestrzeni ale dostępne jest tylko %s." #: ../midori/midori-browser.c:1047 -#: ../midori/midori-browser.c:4749 -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Wybór pliku" @@ -359,7 +358,7 @@ msgstr "Wybór pliku" #: ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" -msgstr "" +msgstr "%s z %s" #: ../midori/midori-browser.c:1456 #, c-format @@ -374,22 +373,35 @@ msgstr "Pobieranie zakończone" msgid "Save file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2349 +#: ../midori/midori-browser.c:1917 +#: ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Pliki są pobierane." + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "Za_kończ program" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Pobieranie plików zostanie anulowane po zakończeniu programu." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Wybór pliku" -#: ../midori/midori-browser.c:2425 +#: ../midori/midori-browser.c:2462 #: ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Nowy kanał wiadomości" -#: ../midori/midori-browser.c:2466 -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:2503 +#: ../midori/midori-browser.c:5640 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaje nową zakładkę" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3076 #: ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 @@ -397,96 +409,96 @@ msgstr "Dodaje nową zakładkę" msgid "Failed to execute database statement: %s\n" msgstr "Nie udało się wykonać zapytania: %s\n" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3156 #: ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Puste" -#: ../midori/midori-browser.c:3740 +#: ../midori/midori-browser.c:3777 #: ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 #: ../midori/sokoke.c:436 #: ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." -msgstr "Nie można uruchomić zewnętrznego programu" +msgstr "Nie można uruchomić zewnętrznego programu." -#: ../midori/midori-browser.c:4054 -#: ../midori/midori-browser.c:5997 +#: ../midori/midori-browser.c:4091 +#: ../midori/midori-browser.c:6034 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nie udało się dodać nowego elementu historii: %s\n" -#: ../midori/midori-browser.c:4387 +#: ../midori/midori-browser.c:4424 #: ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otwórz wszystkie w nowych _kartach" -#: ../midori/midori-browser.c:4394 +#: ../midori/midori-browser.c:4431 #: ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 #: ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-browser.c:4397 +#: ../midori/midori-browser.c:4434 #: ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 #: ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-browser.c:4620 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4621 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4622 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4624 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4645 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importowanie zakładek" -#: ../midori/midori-browser.c:4648 -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4685 +#: ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Zaimportuj zakładki" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4686 -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:4723 +#: ../midori/midori-browser.c:5749 #: ../midori/midori-websettings.c:227 #: ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Dostosuj..." -#: ../midori/midori-browser.c:4760 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Nie udało się zaimportować zakładek" -#: ../midori/midori-browser.c:4796 +#: ../midori/midori-browser.c:4833 msgid "Failed to export bookmarks" msgstr "Nie udało się wyeksportować zakładek" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4887 #: ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format @@ -494,588 +506,588 @@ msgid "Failed to remove history item: %s\n" msgstr "Nie udało się usunąć elementu historii: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Usuwanie danych" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "_Usuń prywatne dane" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Prywatne dane:" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5023 #: ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historia" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Ciasteczka" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "Ciasteczka „Flash”" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5039 msgid "Website icons" msgstr "Ikony stron internetowych" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5044 #: ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zamknięte karty" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5049 #: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Pamięć podręczna" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Usunięcie danych podczas _kończenia programu" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Lekka przeglądarka internetowa" -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5160 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ta biblioteka jest wolnym oprogramowaniem; można ją rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub którejś z późniejszych wersji." -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Przemysław Sitek \n" -"Piotr Sokół " +"Piotr Sokół , 2010" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Plik" -#: ../midori/midori-browser.c:5453 +#: ../midori/midori-browser.c:5490 #: ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Nowe okno" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Otwiera nowe okno programu" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Otwiera nową kartę" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "Tryb p_rywatny" -#: ../midori/midori-browser.c:5460 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Nie zapisuje żadnych prywatnych danych podczas przeglądania stron" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Otwiera plik strony" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Zapisuje stronę do pliku" -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Dodaj do strony _szybkiego wybierania" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Dodaje odnośnik do strony szybiego wybierania" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "Dodaj do strony _szybiego wybierania" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Dodaj do strony szybkiego wybierania" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "_Zamknij kartę" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Zamyka bieżącą kartę" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "Za_mknij okno" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5522 msgid "Close this window" msgstr "Zamyka bieżące okno" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Drukuje bieżącą stronę" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Kończy działanie programu" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Edycja" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Cofa ostatnie działanie" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Powtarza ostatnie działanie" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Wycina zaznaczony tekst" -#: ../midori/midori-browser.c:5507 -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Kopiuje zaznaczony tekst" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Wkleja tekst ze schowka" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Usuwa zaznaczony tekst" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Zaznacz w_szystko" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Wyszukuje słowa lub wyrażenia na stronie" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Znajdź _następne" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" msgstr "Wyszukuje następne wystąpienie słowa lub wyrażenia" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Znajdź _poprzednie" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Wyszukuje poprzednie wystąpienie słowa lub wyrażenia" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" msgstr "Konfiguruje preferencje programu" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Widok" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "Paski _narzędziowe" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Powiększa rozmiar strony" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Zmniejsza rozmiar strony" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Przywraca pierwotny rozmiar strony" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "_Kodowanie znaków" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Wyświetl ź_ródło" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Wyświetla kod źródłowy strony" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Przełącza widok trybu pełnoekranowego" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5600 msgid "Scroll _Left" msgstr "" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5601 #, fuzzy msgid "Scroll to the left" msgstr "Przełącz na następną kartę" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5603 msgid "Scroll _Down" msgstr "" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5604 msgid "Scroll down" msgstr "" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5606 msgid "Scroll _Up" msgstr "" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5607 msgid "Scroll up" msgstr "" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5609 msgid "Scroll _Right" msgstr "" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5610 msgid "Scroll to the right" msgstr "" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "P_rzejdź" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Przechodzi do poprzedniej odwiedzonej strony" -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Przechodzi do następnej odwiedzonej strony" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Przechodzi do poprzedniej strony podrzędnej" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Przechodzi do następnej strony podrzędnej" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Przechodzi do strony głównej przeglądarki" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Wyczyść listę" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Czyści listę ostatnio zamkniętych kart i okien" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Cofnij _zamknięcie karty" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Otwórz ostatnio zamkniętą kartę" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Utwórz _katalog" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Dodaj nowy katalog zakładek" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5648 msgid "_Export bookmarks" msgstr "_Eksportuj..." -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5651 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Zarządzaj wyszukiwarkami..." -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Zarządza wyszukiwarkami internetowymi" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Usuń dane prywatne..." -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Usuwa prywatne dane zapisane przez program..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "_Inspect Page" msgstr "_Analizuj stronę..." -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5661 msgid "Inspect page details and access developer tools..." msgstr "Umożliwia analizowanie szczegółów strony i udostępnia narzędzia programistyczne" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "_Poprzednia karta" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Przełącz na poprzednią kartę" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "_Następna karta" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Przełącz na następną kartę" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Zaznacz _bieżącą kartę" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Uaktywnia bieżącą kartę przeglądarki" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Przywróć ostatnią _sesję" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Otwiera karty zapisane podczas ostatniej sesji" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "Pomo_c" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Spis treści" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Wyświetla pomoc dotyczącą programu" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "_Często zadawane pytania" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Wyświetla najczęściej zadawane pytania" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "_Zgłoś problem" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Otwiera stronę systemu zgłaszania i monitorowania błędów" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Wyświetla informacje na temat programu" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Pasek _menu" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Przełącza widoczność paska menu" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "Pasek _narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Przełącza widoczność paska narzędzi nawigacyjnych" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "Panel _boczny" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Przełącza widoczność panelu bocznego" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Pasek _zakładek" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Przełącza widoczność paska zakładek" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "_Pasek pobierania plików" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Przełącza widoczność paska pobierania plików" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "Pasek stanu" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Przełącza widoczność paska stanu" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "Wybór _automatyczny" -#: ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:5730 #: ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chiński tradycyjny (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japoński (SHIFT_JIS)" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5737 #: ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Koreański (EUC-KR)" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5740 #: ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Rosyjski (KOI8-R)" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5743 #: ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5746 #: ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Zachodni (ISO-8859-1)" -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Położenie" -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Otwiera wprowadzone położenie" -#: ../midori/midori-browser.c:6290 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "_Wyszukiwarka" -#: ../midori/midori-browser.c:6292 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Wyszukuje wyrażenia przy pomocy wyszukiwarki internetowej" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Wyświetla listę ostatnio zamkniętych kart i okien" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "_Ostatnio odwiedzone strony" -#: ../midori/midori-browser.c:6330 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Wyświetla listę ostatnio odwiedzonych stron" -#: ../midori/midori-browser.c:6345 +#: ../midori/midori-browser.c:6382 #: ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zakładki" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Wyświetla zapisane zakładki" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Narzędzia" -#: ../midori/midori-browser.c:6375 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6377 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Wyświetla listę otwartych kart" -#: ../midori/midori-browser.c:6391 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Wyświetla listę poleceń paska menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6597 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "_Wyszukiwanie:" -#: ../midori/midori-browser.c:6628 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Poprzednie" -#: ../midori/midori-browser.c:6633 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Następne" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Uwzględnianie wielkości liter" -#: ../midori/midori-browser.c:6647 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Wyróżnianie" -#: ../midori/midori-browser.c:6659 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Zamyka pasek wyszukiwania" -#: ../midori/midori-browser.c:6705 +#: ../midori/midori-browser.c:6742 #: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Wyczyść wszystko" -#: ../midori/midori-browser.c:7063 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Niespodziewane ustawienie „%s”" @@ -1657,7 +1669,7 @@ msgstr "Przechowywanie adresów ostatnio odwiedzonych stron" #: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" -msgstr "Określa czy będzie przechowywana lista ostatnio odwiedzonych stron" +msgstr "Przechowuje listę ostatnio odwiedzonych stron" #: ../midori/midori-websettings.c:1020 msgid "Maximum history age" @@ -1736,222 +1748,222 @@ msgstr "" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1242 -#: ../midori/midori-view.c:4509 -#: ../midori/midori-view.c:4513 +#: ../midori/midori-view.c:1261 +#: ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Błąd - %s" -#: ../midori/midori-view.c:1243 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nie można wczytać strony „%s”." -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Wczytaj ponownie" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Nie znaleziono - %s" -#: ../midori/midori-view.c:1501 -#: ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:1520 +#: ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Wyślij wiadomość na adres %s" -#: ../midori/midori-view.c:2120 -#: ../midori/midori-view.c:2500 +#: ../midori/midori-view.c:2139 +#: ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Analizuj _element..." -#: ../midori/midori-view.c:2172 -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2191 +#: ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Otwórz w nowej _karcie" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Otwórz odnośnik w nowej karcie" -#: ../midori/midori-view.c:2177 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Otwórz w nowej karcie w _tle" -#: ../midori/midori-view.c:2180 -#: ../midori/midori-view.c:2249 +#: ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Otwórz w nowym _oknie" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Uruchom jako a_plikację internetową" -#: ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "_Skopiuj adres odnośnika" -#: ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 +#: ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Zapisz obiekt odnośnika" -#: ../midori/midori-view.c:2190 -#: ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Pobierz obiekt odnośnika" -#: ../midori/midori-view.c:2194 -#: ../midori/midori-view.c:2224 -#: ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Pobierz za pomocą _menedżera pobierania" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Otwórz obraz w nowej _karcie" -#: ../midori/midori-view.c:2206 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Skopiuj _adres obrazu" -#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Zapisz _obraz" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "_Pobierz obraz" -#: ../midori/midori-view.c:2217 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "_Skopiuj adres wideo" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Zapisz _wideo" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Pobierz _wideo" -#: ../midori/midori-view.c:2283 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Wyszukaj _za pomocą" -#: ../midori/midori-view.c:2318 -#: ../midori/midori-view.c:2325 +#: ../midori/midori-view.c:2337 +#: ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Wyszukaj w internecie" -#: ../midori/midori-view.c:2346 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Otwórz adres w nowej _karcie" -#: ../midori/midori-view.c:2643 +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Pobieranie pliku" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Typ pliku: „%s”" -#: ../midori/midori-view.c:2665 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ pliku: %s („%s”)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2669 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Otwieranie %s" -#: ../midori/midori-view.c:3217 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Analizowanie - %s" -#: ../midori/midori-view.c:3482 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Szybkie wybieranie" -#: ../midori/midori-view.c:3483 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Proszę kliknąć aby dodać odnośnik" -#: ../midori/midori-view.c:3484 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Proszę wprowadzić adres URL odnośnika:" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Proszę wprowadzić nazwę odnośnika:" -#: ../midori/midori-view.c:3486 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Usunąć odnośnik?" -#: ../midori/midori-view.c:3487 +#: ../midori/midori-view.c:3506 msgid "Set number of columns" -msgstr "" +msgstr "Ustaw ilość kolumn" -#: ../midori/midori-view.c:3488 +#: ../midori/midori-view.c:3507 msgid "Enter number of columns:" -msgstr "" +msgstr "Proszę wprowadzić ilość kolumn:" -#: ../midori/midori-view.c:3489 +#: ../midori/midori-view.c:3508 msgid "Set number of shortcuts" -msgstr "" +msgstr "Ustaw ilość odnośników" -#: ../midori/midori-view.c:3490 +#: ../midori/midori-view.c:3509 msgid "Enter number of shortcuts:" msgstr "Proszę wprowadzić ilość odnośników:" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Nie można wyświetlić dokumentu" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Brak zainstalowanej dokumentacji" -#: ../midori/midori-view.c:3789 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Pusta strona" -#: ../midori/midori-view.c:4049 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "_Powiel kartę" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Przywróć kartę" -#: ../midori/midori-view.c:4054 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Zminimalizuj kartę" -#: ../midori/midori-view.c:4060 +#: ../midori/midori-view.c:4079 msgid "Close ot_her Tabs" msgstr "Zamknij pozo_stałe karty" -#: ../midori/midori-view.c:4681 +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Drukowanie obrazów tła" -#: ../midori/midori-view.c:4682 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Drukuje obrazy tła stron" -#: ../midori/midori-view.c:4734 +#: ../midori/midori-view.c:4753 #: ../midori/midori-preferences.c:381 msgid "Features" msgstr "Treść" @@ -2373,7 +2385,7 @@ msgstr "Skrypty użytkownika" #: ../extensions/addons.c:179 msgid "Userstyles" -msgstr "Skrypty użytkownika" +msgstr "Style użytkownika" #: ../extensions/addons.c:1085 #, fuzzy, c-format @@ -2519,15 +2531,15 @@ msgstr "Kanały informacyjne" #: ../extensions/feed-panel/feed-panel.c:724 msgid "Add new feed" -msgstr "Dodaje kanał informacyjny" +msgstr "Dodaje kanał wiadomości" #: ../extensions/feed-panel/feed-panel.c:731 msgid "Delete feed" -msgstr "Usuwa kanał informacyjny" +msgstr "Usuwa kanał wiadomości" #: ../extensions/feed-panel/feed-panel.c:814 msgid "_Feeds" -msgstr "Kanały _informacyjne" +msgstr "Kanały _wiadomości" #: ../extensions/feed-panel/feed-parse.c:192 #, c-format @@ -2567,12 +2579,12 @@ msgstr "Błąd" #: ../extensions/feed-panel/main.c:134 #, c-format msgid "Feed '%s' already exists" -msgstr "Kanał wiadomości „%s” już istnieje" +msgstr "Kanał wiadomości „%s” już istnieje." #: ../extensions/feed-panel/main.c:211 #, c-format msgid "Error loading feed '%s'" -msgstr "Wystąpił błąd podczas wczytywania kanału wiadomości „%s”" +msgstr "Wystąpił błąd podczas wczytywania kanału wiadomości „%s”." #: ../extensions/feed-panel/main.c:522 msgid "Feed Panel" From c2be3d67cfb6b13af5a4383f1cd8072cd8215396 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 26 May 2010 22:41:13 +0200 Subject: [PATCH 2641/2970] Recognize more characters as next page and be more tolerant --- midori/midori-view.c | 77 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index aefaa23b..655b1df5 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4657,12 +4657,38 @@ midori_view_get_previous_page (MidoriView* view) web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); katze_assign (uri, sokoke_js_script_eval (js_context, - "(function (l) { for (i in l) " - "if ((l[i].rel && l[i].rel == 'prev') " - " || (l[i].innerHTML" - " && l[i].innerHTML.toLowerCase ().indexOf ('prev') != -1)) " - "{ return l[i].href; } return 0; })(" - "document.getElementsByTagName ('a'));", NULL)); + "(function (l) {" + "var ind = ['prev','←','«','<'];" + "var nind = ['next','→','»','>'];" + "for (i in l)" + "if (l[i].rel && (l[i].rel == ind[0]))" + "return l[i].href;" + "for (j in ind)" + "for (i in l)" + "if (l[i].innerHTML" + "&& (l[i].innerHTML.toLowerCase ().indexOf (ind[j]) != -1)" + "&& (l[i].innerHTML.toLowerCase ().indexOf (nind[j]) == -1))" + "return l[i].href;" + "var wa = window.location.href.split (/\\d+/);" + "var wn = window.location.href.split (/[^\\d]+/);" + "wn = wn.slice (1,wn.length - 1);" + "var cand = [];" + "for (i in wn)" + "{" + "cand[i] = '';" + "for (j = 0; j <= i; j++)" + "{" + "cand[i] += wa[j];" + "if (wn[j])" + "cand[i] += parseInt (wn[j]) - ((i == j) ? 1 : 0);" + "}" + "}" + "for (j in cand)" + "for (i in l)" + "if (l[i].href && (l[i].href.indexOf (cand[j]) == 0))" + "return l[i].href;" + "return 0;" + "}) (document.getElementsByTagName ('a'));", NULL)); return uri && uri[0] != '0' ? uri : NULL; } @@ -4688,15 +4714,40 @@ midori_view_get_next_page (MidoriView* view) web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); katze_assign (uri, sokoke_js_script_eval (js_context, - "(function (l) { for (i in l) " - "if ((l[i].rel && l[i].rel == 'next') " - " || (l[i].innerHTML" - " && l[i].innerHTML.toLowerCase ().indexOf ('next') != -1)) " - "{ return l[i].href; } return 0; })(" - "document.getElementsByTagName ('a'));", NULL)); + "(function (l) {" + "var ind = ['next','→','»','>'];" + "var nind = ['prev','←','«','<'];" + "for (i in l)" + "if (l[i].rel && (l[i].rel == ind[0]))" + "return l[i].href;" + "for (j in ind)" + "for (i in l)" + "if (l[i].innerHTML" + "&& (l[i].innerHTML.toLowerCase ().indexOf (ind[j]) != -1)" + "&& (l[i].innerHTML.toLowerCase ().indexOf (nind[j]) == -1))" + "return l[i].href;" + "var wa = window.location.href.split (/\\d+/);" + "var wn = window.location.href.split (/[^\\d]+/);" + "wn = wn.slice (1,wn.length - 1);" + "var cand = [];" + "for (i in wn)" + "{" + "cand[i] = '';" + "for (j = 0; j <= i; j++)" + "{" + "cand[i] += wa[j];" + "if (wn[j])" + "cand[i] += parseInt (wn[j]) + ((i == j) ? 1 : 0);" + "}" + "}" + "for (j in cand)" + "for (i in l)" + "if (l[i].href && (l[i].href.indexOf (cand[j]) == 0))" + "return l[i].href;" + "return 0;" + "}) (document.getElementsByTagName ('a'));", NULL)); return uri && uri[0] != '0' ? uri : NULL; } - #if WEBKIT_CHECK_VERSION (1, 1, 5) static GtkWidget* midori_view_print_create_custom_widget_cb (GtkPrintOperation* operation, From 7c8636017fdbf3bd26135f3610d00433dc687a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Thu, 27 May 2010 11:16:48 +0200 Subject: [PATCH 2642/2970] l10n: Updated Croatian (hr) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 562 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 285 insertions(+), 277 deletions(-) diff --git a/po/hr.po b/po/hr.po index 17c1a13a..0ad66c50 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:07+0000\n" +"POT-Creation-Date: 2010-05-27 04:08+0000\n" "PO-Revision-Date: 2010-05-24 02:57+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" @@ -54,7 +54,7 @@ msgstr "Neuspjelo otvaranje baze podataka: %s\n" #: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Nisam uspio maknuti stare stavke povijesti:% s \\ n" #: ../midori/main.c:445 #, c-format @@ -105,7 +105,7 @@ msgstr "Onemogući sva_proširenja" #: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "" +msgstr "Sesija nije mogla biti učitana:% s \\ n" #: ../midori/main.c:1336 msgid "No filename specified" @@ -165,8 +165,9 @@ msgid "Block URIs according to regular expression PATTERN" msgstr "" #: ../midori/main.c:1577 +#, fuzzy msgid "PATTERN" -msgstr "" +msgstr "UZORAK" #. i18n: CLI: Close tabs, clear private data, open starting page #: ../midori/main.c:1581 @@ -187,7 +188,7 @@ msgstr "Prijavite komentare,sugestije i probleme" #: ../midori/main.c:1691 msgid "Check for new versions at:" -msgstr "" +msgstr "Provjerite nove verzije na:" #: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." @@ -232,7 +233,7 @@ msgstr "Datoteka nije pronađena" #: ../midori/midori-array.c:462 ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." -msgstr "" +msgstr "Deformiran dokument." #: ../midori/midori-array.c:504 msgid "Unrecognized bookmark format." @@ -243,793 +244,799 @@ msgstr "Neprepoznatljiv format zabilješke" msgid "Writing failed." msgstr "Neuspješno pisanje" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" -msgstr "" +msgstr "% D%% učitan" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." -msgstr "" +msgstr "Neočekivana akcija '% s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Naslov" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Opis" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Mapa" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "Dodaj u Brzo_biranje" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" -msgstr "" +msgstr "Neke datoteke su preuzete" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "_Isključi Midori" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "Prijenosi će biti odgođeni ako se Midori isključi" -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prazan" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otvori u novoj_kartici" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otvori u novom_prozoru" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Uvezi zabilješke" -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Aplikacija" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Prilagođeno" -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Neuspjelo micanje stavke povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Website ikone" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Očisti privatne podatke kad _isključuješ Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "Ivica Kolić ikoli@yahoo.com" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Novi_prozor" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "Ne spremaj privatne podatake tijekom pregledavanja" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo_biranje" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Isključi aplikaciju" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" -msgstr "" +msgstr "Poništi zadnje izmjene" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Izreži označeni tekst" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Nađ i_Slijedeće" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Povećaj razinu zumiranja" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Smani razinu zumiranja" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Kodnaa stranica" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" -msgstr "" +msgstr "Otvori zadnju _sesiju" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" -msgstr "" +msgstr "Otvori kartice spremljene u zadnjoj sesijji" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Lokacija" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Otvorite određenu lokaciju" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Web pretraživanje" -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Ponovo otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Nedavno posjećene stranice" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Izbornik" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Prethodno" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Slijedeće" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -1057,7 +1064,7 @@ msgstr "" #. i18n: Right-click on Location, Open an URL from the clipboard #: ../midori/midori-locationaction.c:1254 msgid "Paste and p_roceed" -msgstr "" +msgstr "Zalijepi i n_astavi" #: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" @@ -1134,11 +1141,12 @@ msgstr "Tekst ispod ikona" #: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" -msgstr "" +msgstr "Automatski (GNOME ili okruženje)" #: ../midori/midori-websettings.c:280 +#, fuzzy msgid "HTTP proxy server" -msgstr "" +msgstr "HTTP proxy poslužitelj" #: ../midori/midori-websettings.c:281 msgid "No proxy server" @@ -1150,11 +1158,11 @@ msgstr "Svi kolačići" #: ../midori/midori-websettings.c:297 msgid "Session cookies" -msgstr "" +msgstr "Kolačići sesije" #: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" -msgstr "" +msgstr "Nijedan" #: ../midori/midori-websettings.c:314 msgid "Safari" @@ -1271,11 +1279,11 @@ msgstr "" #: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" -msgstr "" +msgstr "Stil alatne trake:" #: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" -msgstr "" +msgstr "Stil alatne trake:" #: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" @@ -1496,11 +1504,11 @@ msgstr "" #: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" -msgstr "" +msgstr "Učitaj slike automatski" #: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" -msgstr "" +msgstr "Učitaj i prikaži slike automatski" #: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" @@ -1520,7 +1528,7 @@ msgstr "" #: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" -msgstr "" +msgstr "Omogući podršku HTML5 database" #: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" @@ -1584,11 +1592,11 @@ msgstr "Prihvati kolačiće samo sa izvorne web stranice" #: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" -msgstr "" +msgstr "Maksimalna starost kolačića" #: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "Najveći broj dana za spremanje kolačića za" #: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" @@ -1600,7 +1608,7 @@ msgstr "" #: ../midori/midori-websettings.c:1020 msgid "Maximum history age" -msgstr "" +msgstr "Maksimalna starost povijesti" #: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" @@ -1616,23 +1624,23 @@ msgstr "" #: ../midori/midori-websettings.c:1047 msgid "Proxy server" -msgstr "" +msgstr "Proxy poslužitelj" #: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" -msgstr "" +msgstr "Tip proxy poslužitelja" #: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" -msgstr "" +msgstr "HTTP Proxy poslužitelj" #: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "Proxy poslužitelj korišteni za HTTP veze" #: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" -msgstr "" +msgstr "Nađi proxy poslužitelj automatski" #: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" @@ -1675,8 +1683,8 @@ msgstr "Privatni podaci odabrani za brisanje" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 +#: ../midori/midori-view.c:4544 #, c-format msgid "Error - %s" msgstr "Greška %s" @@ -1782,106 +1790,106 @@ msgstr "" msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj_kartici" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Vrsta datoteke: '% s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Vrsta datoteke:% s ('% s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečace" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:3506 +#: ../midori/midori-view.c:3518 msgid "Set number of columns" msgstr "Postavite broj stupaca" -#: ../midori/midori-view.c:3507 +#: ../midori/midori-view.c:3519 msgid "Enter number of columns:" msgstr "Unesite broj stupaca:" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3520 msgid "Set number of shortcuts" msgstr "Postavite broj prečaca" -#: ../midori/midori-view.c:3509 +#: ../midori/midori-view.c:3521 msgid "Enter number of shortcuts:" msgstr "Unesi broj prečaca" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "Dokument ne može biti prikazan" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3820 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4080 msgid "_Duplicate Tab" msgstr "_Udvostuči karticu" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4085 msgid "_Restore Tab" msgstr "_Obnovi karticu" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4085 msgid "_Minimize Tab" msgstr "_Minimiziraj karticu" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4091 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4763 msgid "Print background images" msgstr "Ispis pozadinske slike" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4764 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 msgid "Features" msgstr "" @@ -1892,7 +1900,7 @@ msgstr "Osnovno" #: ../midori/midori-preferences.c:299 msgid "Startup" -msgstr "" +msgstr "Početak" #: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 msgid "Use current page as homepage" @@ -1913,7 +1921,7 @@ msgstr "Postavke fonta" #: ../midori/midori-preferences.c:352 msgid "Default Font Family" -msgstr "" +msgstr "Zadana font obitelj" #: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" @@ -1974,7 +1982,7 @@ msgstr "Omogući provjeru pravopisa" #: ../midori/midori-preferences.c:423 msgid "Enable spell checking while typing" -msgstr "" +msgstr "Omogući provjeru pravopisa dok pišem" #: ../midori/midori-preferences.c:425 msgid "Spelling dictionaries:" @@ -2202,7 +2210,7 @@ msgstr "" msgid "" "A username and a password are required\n" "to open this location:" -msgstr "" +msgstr "Korisničko ime i lozinka su potrebni za otvaranje ove lokacije:" #: ../katze/katze-http-auth.c:244 msgid "Username" @@ -2219,7 +2227,7 @@ msgstr "_Zapamti lozinku" #: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "" +msgstr "Imenovana ikona '% s' ne može biti učitana" #: ../katze/katze-throbber.c:895 #, c-format @@ -2288,7 +2296,7 @@ msgstr "" #: ../extensions/addons.c:122 #, c-format msgid "Copy %s to the folder %s." -msgstr "" +msgstr "Kopiraj% s u mapu% s." #: ../extensions/addons.c:177 msgid "Userscripts" @@ -2339,11 +2347,11 @@ msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" -msgstr "" +msgstr "Proširi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" -msgstr "" +msgstr "Sažmi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" @@ -2359,7 +2367,7 @@ msgstr "Biti će izbrisani samo kolačići koji odgovaraju filteru" #: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" -msgstr "" +msgstr "Na kraju sesije" #: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format @@ -2395,11 +2403,11 @@ msgstr "Ime" #: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" -msgstr "" +msgstr "_Proširi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" -msgstr "" +msgstr "_Sažmi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" @@ -2411,7 +2419,7 @@ msgstr "_Upravitelj kolačićima" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "" +msgstr "Lista, pregled i brisanje kolačića" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2422,25 +2430,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "" -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "" @@ -2475,25 +2483,25 @@ msgstr "" msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Greška" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "" @@ -2586,7 +2594,7 @@ msgstr "" #: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" -msgstr "" +msgstr "Pokaži kartice na okomitoj ploći" #: ../extensions/tab-switcher.c:395 msgid "Tab History List" @@ -2594,7 +2602,7 @@ msgstr "" #: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" +msgstr "Omogući prebacivanje kartice odabirom iz liste poredanih po zadnjem korištenju" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" From 901a54ed97cb0220e665f1ebe3f554fed08e6569 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Thu, 27 May 2010 13:55:06 +0200 Subject: [PATCH 2643/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 622 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 474 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 241 insertions(+), 233 deletions(-) diff --git a/po/pt.po b/po/pt.po index adb508b3..d7703d2d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 16:08+0000\n" +"POT-Creation-Date: 2010-05-27 10:07+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -245,793 +245,801 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao actualizar título: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "Adicionar a _Ligação Rápida" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "O ficheiro '%s' foi transferido." -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "Existem ficheiros a ser transferidos" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" +"Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "Local_izar:" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Sensível à Capitalização" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar Tudo" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" @@ -1677,8 +1685,8 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 +#: ../midori/midori-view.c:4544 #, c-format msgid "Error - %s" msgstr "Erro - %s" @@ -1784,106 +1792,106 @@ msgstr "_Pesquisar na Web" msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:3506 +#: ../midori/midori-view.c:3518 msgid "Set number of columns" msgstr "Definir número de colunas" -#: ../midori/midori-view.c:3507 +#: ../midori/midori-view.c:3519 msgid "Enter number of columns:" msgstr "Indique o número de colunas:" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3520 msgid "Set number of shortcuts" msgstr "Definir número de atalhos" -#: ../midori/midori-view.c:3509 +#: ../midori/midori-view.c:3521 msgid "Enter number of shortcuts:" msgstr "Indique o número de atalhos" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3820 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4080 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4085 msgid "_Restore Tab" msgstr "_Restaurar Separadores" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4085 msgid "_Minimize Tab" msgstr "_Minizar Separadores" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4091 msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4763 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4764 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2431,25 +2439,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Falha ao encontrar os elementos Atom de \"feed\" nos dados XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualização: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Fontes" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Adicionar nova fonte" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Apagar fonte" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Fontes" @@ -2484,25 +2492,25 @@ msgstr "Falha ao encontrar os elementos RSS do \"item\" nos dados XML." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Falha ao encontrar os elementos RSS do \"channel\" nos dados XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Já existe a fonte '%s'" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Erro ao carregar a fonte '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Painel de Fontes" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Ler fontes Atom/RSS" From d57bb45a3f516b73626f693a27328bdf4986c4e7 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Thu, 27 May 2010 15:02:24 +0200 Subject: [PATCH 2644/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 622 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 474 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 241 insertions(+), 233 deletions(-) diff --git a/po/uk.po b/po/uk.po index bf8ef818..8893007f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 16:07+0000\n" +"POT-Creation-Date: 2010-05-27 10:07+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -244,793 +244,801 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s з %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл '%s' завантажено." -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Передачу завершено" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "Деякі файли завантажено." -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "_Вийти з Мідорі" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" +"Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не вдалось виконати запит бази даних: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Останньо відвідані сторінки" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "Знайти _входження:" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Попереднє" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Наступне" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Врахувати регістр" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Підсвітити збіги" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистити все" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -1676,8 +1684,8 @@ msgstr "Приватні дані, що вибрані для очищення" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 +#: ../midori/midori-view.c:4544 #, c-format msgid "Error - %s" msgstr "Помилка - %s" @@ -1783,106 +1791,106 @@ msgstr "_Шукати Веб" msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Швидкий виклик" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:3506 +#: ../midori/midori-view.c:3518 msgid "Set number of columns" msgstr "Встановити кількість колонок" -#: ../midori/midori-view.c:3507 +#: ../midori/midori-view.c:3519 msgid "Enter number of columns:" msgstr "Введіть число колонок:" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3520 msgid "Set number of shortcuts" msgstr "Встановити кількість скорочень" -#: ../midori/midori-view.c:3509 +#: ../midori/midori-view.c:3521 msgid "Enter number of shortcuts:" msgstr "Введіть кількість скорочень:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "Не можу відобразити документ" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "Документація не заінстальована" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3820 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4080 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4085 msgid "_Restore Tab" msgstr "_Відновити вкладку" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4085 msgid "_Minimize Tab" msgstr "_Мінімізувати вкладку" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4091 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4763 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4764 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Опції" @@ -2433,25 +2441,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Не можу знайти вимаганий елемент Atom \"feed\" в даних XML" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Останньо оновлювалося: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Стрічки новин" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Додати нову стрічку новин" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Видалити стрічку новин" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "Стрічки _новин" @@ -2486,25 +2494,25 @@ msgstr "Не можу знайти вимаганий елемент RSS \"item\ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не можу знайти вимаганий елемент RSS \"channel\" в даних XML" -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Помилка" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Стрічка новин '%s' вже існує" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Помилка завантаження стрічки новин '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Панель стрічок новин" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Читати Atom-/ RSS стрічки новин" From fbc1c51fdc4fb7f1800ea31e75fbd477b12c2161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Thu, 27 May 2010 18:02:10 +0200 Subject: [PATCH 2645/2970] l10n: Initial Croatian (hr) translation New status: 391 messages complete with 0 fuzzies and 219 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 1123 ++++++++++++++++++++++++++---------------------------- 1 file changed, 547 insertions(+), 576 deletions(-) diff --git a/po/hr.po b/po/hr.po index 0ad66c50..9fad79ab 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,20 +1,21 @@ # Croatian translations for PACKAGE package. # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Ivica Kolić , 2010. -# +# , 2010. +# msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 04:08+0000\n" -"PO-Revision-Date: 2010-05-24 02:57+0200\n" +"POT-Creation-Date: 2010-05-10 16:06+0000\n" +"PO-Revision-Date: 2010-05-27 17:57+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" @@ -22,7 +23,7 @@ msgstr "Lagani web preglednik" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:318 msgid "Midori" msgstr "Midori" @@ -54,7 +55,7 @@ msgstr "Neuspjelo otvaranje baze podataka: %s\n" #: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Nisam uspio maknuti stare stavke povijesti:% s \\ n" +msgstr "" #: ../midori/main.c:445 #, c-format @@ -80,14 +81,17 @@ msgstr "Smeće ne može biti spremljeno %s" #: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Prazan" +msgstr "Sesija ne može biti spremljena %s" #: ../midori/main.c:868 -msgid "No root certificate file is available. SSL certificates cannot be verified." +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "" #: ../midori/main.c:958 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." msgstr "" #: ../midori/main.c:973 @@ -96,7 +100,7 @@ msgstr "Izmjeni_osobitosti" #: ../midori/main.c:977 msgid "Reset the last _session" -msgstr "" +msgstr "Obnovi posljednju _sesiju" #: ../midori/main.c:982 msgid "Disable all _extensions" @@ -105,11 +109,11 @@ msgstr "Onemogući sva_proširenja" #: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "Sesija nije mogla biti učitana:% s \\ n" +msgstr "Sesija ne može biti učitana: %s\n" #: ../midori/main.c:1336 msgid "No filename specified" -msgstr "" +msgstr "NIje određeno ime datoteke" #: ../midori/main.c:1355 msgid "An unknown error occured." @@ -165,7 +169,6 @@ msgid "Block URIs according to regular expression PATTERN" msgstr "" #: ../midori/main.c:1577 -#, fuzzy msgid "PATTERN" msgstr "UZORAK" @@ -188,7 +191,7 @@ msgstr "Prijavite komentare,sugestije i probleme" #: ../midori/main.c:1691 msgid "Check for new versions at:" -msgstr "Provjerite nove verzije na:" +msgstr "Provjeri za nove verzije na:" #: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." @@ -220,7 +223,7 @@ msgstr "Povijest ne može biti učitana: %s\n" #: ../midori/main.c:1980 msgid "The following errors occured:" -msgstr "Došlo je do slijedećih grešaka" +msgstr "Došlo je do slijedeće greške:" #: ../midori/main.c:1996 msgid "_Ignore" @@ -233,810 +236,792 @@ msgstr "Datoteka nije pronađena" #: ../midori/midori-array.c:462 ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." -msgstr "Deformiran dokument." +msgstr "" #: ../midori/midori-array.c:504 msgid "Unrecognized bookmark format." -msgstr "Neprepoznatljiv format zabilješke" +msgstr "" #: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." -msgstr "Neuspješno pisanje" +msgstr "" -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5517 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:457 #, c-format msgid "%d%% loaded" -msgstr "% D%% učitan" +msgstr "" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:495 #, c-format msgid "Failed to update title: %s\n" msgstr "" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:509 #, c-format msgid "Unexpected action '%s'." -msgstr "Neočekivana akcija '% s'." +msgstr "" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:716 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:716 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:718 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:718 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:749 msgid "_Title:" msgstr "_Naslov" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Opis" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresa" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 msgid "_Folder:" msgstr "_Mapa" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:862 -msgid "Add to _Speed Dial" -msgstr "Dodaj u Brzo_biranje" - -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:850 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:865 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:959 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:963 #, c-format msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 +#: ../midori/midori-browser.c:4754 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 #, c-format msgid "%s of %s" msgstr "" -#: ../midori/midori-browser.c:1454 +#: ../midori/midori-browser.c:1429 #, c-format msgid "The file '%s' has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1458 +#: ../midori/midori-browser.c:1433 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1573 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "Neke datoteke su preuzete" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "_Isključi Midori" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Prijenosi će biti odgođeni ako se Midori isključi" - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2322 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2462 -msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." -msgstr "" - -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../panels/midori-bookmarks.c:242 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 msgid "Empty" -msgstr "Prazan" +msgstr "Prazno" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:795 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" -msgstr "Otvori sve u _karticama" +msgstr "Otvori sve u _Karticama" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:801 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Otvori u novoj_kartici" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:803 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Otvori u novom_prozoru" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4593 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4594 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4595 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4596 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4597 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4618 ../panels/midori-bookmarks.c:271 msgid "Import bookmarks..." msgstr "Uvezi zabilješke" -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4632 msgid "_Application:" msgstr "_Aplikacija" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Prilagođeno" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4733 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4769 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "Neuspjelo micanje stavke povijesti: %s\n" +msgstr "" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4930 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4934 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4948 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4965 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4970 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4975 msgid "Website icons" -msgstr "Website ikone" +msgstr "" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4993 msgid "Clear private data when _quitting Midori" -msgstr "Očisti privatne podatke kad _isključuješ Midori" +msgstr "" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5094 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5168 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +#: ../midori/midori-browser.c:5096 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." msgstr "" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:5115 msgid "translator-credits" msgstr "Ivica Kolić ikoli@yahoo.com" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5424 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Novi_prozor" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5427 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5430 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5432 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5433 msgid "Don't save any private data while browsing" -msgstr "Ne spremaj privatne podatake tijekom pregledavanja" +msgstr "Ne spremaj privatne podatke dok pregledavaš" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5437 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5440 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5442 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo_biranje" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5443 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5445 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5446 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5448 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5449 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5454 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5455 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5457 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5458 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5461 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5464 msgid "Quit the application" -msgstr "Isključi aplikaciju" +msgstr "Isključi program" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5466 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5470 msgid "Undo the last modification" -msgstr "Poništi zadnje izmjene" +msgstr "" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5473 msgid "Redo the last modification" msgstr "" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5477 msgid "Cut the selected text" -msgstr "Izreži označeni tekst" +msgstr "Izreži označenii tekst" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5486 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5489 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5492 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5495 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5497 msgid "Find _Next" msgstr "Nađ i_Slijedeće" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5498 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5500 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5501 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5505 msgid "Configure the application preferences" -msgstr "" +msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5507 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5508 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5520 msgid "Increase the zoom level" -msgstr "Povećaj razinu zumiranja" +msgstr "" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5523 msgid "Decrease the zoom level" -msgstr "Smani razinu zumiranja" +msgstr "" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5526 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5527 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5529 msgid "View So_urce" -msgstr "Kodnaa stranica" +msgstr "" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5530 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5533 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5536 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5537 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5539 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5540 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5542 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5543 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5545 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5546 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5549 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5552 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5555 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5559 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5563 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5566 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5568 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5569 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5571 msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5572 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5578 msgid "Add a new _folder" -msgstr "Dodaj novu _mapu" +msgstr "Dodaj novu_mapu" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5579 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5584 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5588 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5591 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5592 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5596 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5597 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5602 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5603 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5605 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5606 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5608 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5609 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5611 msgid "Open last _session" -msgstr "Otvori zadnju _sesiju" +msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5612 msgid "Open the tabs saved in the last session" -msgstr "Otvori kartice spremljene u zadnjoj sesijji" +msgstr "Otvori kartice spremljene u posljednjoj sesiji" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5614 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5616 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5617 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5619 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5620 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5622 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5623 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5626 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5634 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5635 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5638 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5639 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5642 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5643 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5646 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5647 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5650 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5651 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5654 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5655 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5663 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:226 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5670 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:228 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:229 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:230 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:231 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6230 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6237 msgid "_Location..." msgstr "_Lokacija" -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6239 msgid "Open a particular location" -msgstr "Otvorite određenu lokaciju" +msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6263 msgid "_Web Search..." msgstr "_Web pretraživanje" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6265 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6286 msgid "Reopen a previously closed tab or window" -msgstr "Ponovo otvori prethodno zatvorenu karticu ili prozor" +msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6301 msgid "_Recently visited pages" msgstr "_Nedavno posjećene stranice" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6303 msgid "Reopen pages that you visited earlier" msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6320 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6335 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6348 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6350 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6364 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6366 msgid "Menu" msgstr "Izbornik" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 +#: ../midori/midori-browser.c:6570 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:6671 +#: ../midori/midori-browser.c:6601 msgid "Previous" msgstr "Prethodno" -#: ../midori/midori-browser.c:6676 +#: ../midori/midori-browser.c:6606 msgid "Next" msgstr "Slijedeće" -#: ../midori/midori-browser.c:6681 +#: ../midori/midori-browser.c:6611 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:6690 +#: ../midori/midori-browser.c:6620 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:6702 +#: ../midori/midori-browser.c:6632 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:142 msgid "Clear All" msgstr "Očisti sve" -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:7036 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -1044,7 +1029,7 @@ msgstr "" #: ../midori/midori-locationaction.c:377 #, c-format msgid "Failed to select from history\n" -msgstr "Neuspio odabir iz povijesti\n" +msgstr "" #: ../midori/midori-locationaction.c:459 #, c-format @@ -1066,616 +1051,617 @@ msgstr "" msgid "Paste and p_roceed" msgstr "Zalijepi i n_astavi" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 msgid "Close panel" msgstr "Zatvori panel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:798 msgid "Hide operating controls" msgstr "" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:209 msgid "Show Blank page" msgstr "Pokaži praznu stranicu" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:210 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:211 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:227 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:247 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:248 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:249 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:264 msgid "Default" -msgstr "Zadano" +msgstr "Početno" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:265 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:266 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:267 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:268 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:269 msgid "Text beside icons" msgstr "Tekst ispod ikona" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:284 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:280 -#, fuzzy +#: ../midori/midori-websettings.c:285 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:286 msgid "No proxy server" msgstr "" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:301 msgid "All cookies" msgstr "Svi kolačići" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:302 msgid "Session cookies" msgstr "Kolačići sesije" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 msgid "None" msgstr "Nijedan" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:319 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:320 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:321 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:322 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:375 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:376 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:384 msgid "Last window width" msgstr "Zadnja širina prozora" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:385 msgid "The last saved window width" msgstr "Zadnja sačuvana širina prozora" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:393 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:394 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:419 msgid "Last panel position" msgstr "Zadnja pozicija panela" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:420 msgid "The last saved panel position" msgstr "Zadnja spremljena pozicija panela" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:429 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:430 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:438 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:439 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:448 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:449 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:457 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:458 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:466 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:467 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:475 msgid "Show Panel" msgstr "Pokaži panel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:476 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:491 msgid "Show Transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:492 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:500 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:501 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Style:" -msgstr "Stil alatne trake:" +msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:511 msgid "The style of the toolbar" -msgstr "Stil alatne trake:" +msgstr "" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:527 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:528 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:543 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:544 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:552 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:553 msgid "The items to show on the toolbar" -msgstr "Stavke za prikazivanje u alatnoj traci" +msgstr "" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:561 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:562 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:577 msgid "Show operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:578 msgid "Whether to show the operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:593 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:594 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:609 msgid "Open panels in separate windows" msgstr "Otvori panele u zasebnim prozorima" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:610 msgid "Whether to always open panels in separate windows" msgstr "" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:619 msgid "When Midori starts:" msgstr "Kad se Midori pokrene" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:620 msgid "What to do when Midori starts" -msgstr "" +msgstr "Što uraditi kad se Midori pokrene" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:629 msgid "Homepage:" msgstr "Početna stranica" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:630 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:645 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:646 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:662 msgid "Show speed dial in new tabs" msgstr "Pokaži brzo biranje u novim karticama" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:663 msgid "Show speed dial in newly opened tabs" msgstr "Pokaži brzo biranje u novootvorenim karticama" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:671 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:672 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:693 msgid "Ask for the destination folder" -msgstr "Pitaj za odredišnu mapu" +msgstr "Pitaj za odredišni direktorij" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:694 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:713 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:714 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:726 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:727 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:735 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:736 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:751 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:752 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:760 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:761 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:769 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:770 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:780 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:781 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:789 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:790 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:798 msgid "Open new pages in:" msgstr "Otvori nove stranice u" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:799 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:808 msgid "Open external pages in:" -msgstr "Otvori vanjske stranice u" +msgstr "Otvori vanjske stranice u:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:809 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:818 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:819 msgid "Load an address from the selection via middle click" -msgstr "" +msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:827 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:828 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:836 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:837 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:845 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:846 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:857 msgid "Load and display images automatically" msgstr "Učitaj i prikaži slike automatski" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Omoogući Netscape priključke" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:873 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:889 msgid "Enable HTML5 database support" -msgstr "Omogući podršku HTML5 database" +msgstr "" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:890 msgid "Whether to enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:896 msgid "Enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:897 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:905 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:906 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:931 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:932 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:947 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:948 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:963 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:964 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:972 msgid "Accept cookies" msgstr "Prihvati kolačiće" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:973 msgid "What type of cookies to accept" msgstr "Koju vrstu kolačića prihvatiti" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:989 msgid "Original cookies only" msgstr "Samo izvorne kolačiće" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:990 msgid "Accept cookies from the original website only" msgstr "Prihvati kolačiće samo sa izvorne web stranice" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:998 msgid "Maximum cookie age" -msgstr "Maksimalna starost kolačića" +msgstr "" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:999 msgid "The maximum number of days to save cookies for" -msgstr "Najveći broj dana za spremanje kolačića za" +msgstr "" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1016 msgid "Remember last visited pages" -msgstr "Zapamti zadnje posjećene stranice" +msgstr "Zapamti zadnju posjećenu stranicu" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1017 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1025 msgid "Maximum history age" -msgstr "Maksimalna starost povijesti" +msgstr "" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1026 msgid "The maximum number of days to save the history for" -msgstr "Maksimalni broj dana čuvanja povijesti" +msgstr "" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1034 msgid "Remember last downloaded files" msgstr "Zapamti zadnje preuzete datoteke" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1035 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1052 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1053 msgid "The type of proxy server to use" -msgstr "Tip proxy poslužitelja" +msgstr "" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1062 msgid "HTTP Proxy Server" msgstr "HTTP Proxy poslužitelj" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1063 msgid "The proxy server used for HTTP connections" -msgstr "Proxy poslužitelj korišteni za HTTP veze" +msgstr "" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1078 msgid "Detect proxy server automatically" -msgstr "Nađi proxy poslužitelj automatski" +msgstr "" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1079 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1095 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1096 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1112 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1113 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1128 msgid "Preferred languages" msgstr "" -#: ../midori/midori-websettings.c:1124 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1129 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1144 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1145 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" @@ -1683,224 +1669,208 @@ msgstr "Privatni podaci odabrani za brisanje" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 -#: ../midori/midori-view.c:4544 +#: ../midori/midori-view.c:1190 ../midori/midori-view.c:4489 +#: ../midori/midori-view.c:4493 #, c-format msgid "Error - %s" msgstr "Greška %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1191 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Stranica '% s' nije mogla bitt iučitana" +msgstr "Stranica '%s ne može biti učitana" -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1196 msgid "Try again" msgstr "Pokušaj ponovo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1237 #, c-format msgid "Not found - %s" -msgstr "Nije pronađeno -% s" +msgstr "" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1474 ../midori/midori-view.c:2311 #, c-format msgid "Send a message to %s" msgstr "Pošalji poruku %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2093 ../midori/midori-view.c:2473 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2215 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj_kartici" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2149 msgid "Open Link in _Foreground Tab" msgstr "" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2150 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u pozadinskoj_kartici" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2153 ../midori/midori-view.c:2222 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom_prozoru" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2156 msgid "Open Link as Web A_pplication" msgstr "Otvori poveznicu kao Web A_plikaciju" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2159 msgid "Copy Link de_stination" -msgstr "Kopiraj oderedište po_veznice" +msgstr "Kopiraj odredište po_veznice" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2234 msgid "_Save Link destination" msgstr "_Spremi odredište poveznice" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2163 ../midori/midori-view.c:2228 msgid "_Download Link destination" -msgstr "_Odredište poveznice preuzimanja" +msgstr "" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2167 ../midori/midori-view.c:2197 +#: ../midori/midori-view.c:2239 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2176 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2179 msgid "Copy Image _Address" msgstr "Kopiraj adresu _slike" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2182 msgid "Save I_mage" msgstr "Sačuvaj S_liku" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2183 msgid "Download I_mage" msgstr "Preuzmi S_liku" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2190 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2193 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2193 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2256 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2291 ../midori/midori-view.c:2298 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2319 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj_kartici" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2616 msgid "Open or download file" msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2635 #, c-format msgid "File Type: '%s'" -msgstr "Vrsta datoteke: '% s'" +msgstr "Tip datoteke: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2638 #, c-format msgid "File Type: %s ('%s')" -msgstr "Vrsta datoteke:% s ('% s')" +msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2642 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3190 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3455 msgid "Speed dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3456 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečace" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3457 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3458 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3459 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "Postavite broj stupaca" - -#: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "Unesite broj stupaca:" - -#: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "Postavite broj prečaca" - -#: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "Unesi broj prečaca" - -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3496 #, c-format msgid "Document cannot be displayed" msgstr "Dokument ne može biti prikazan" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3519 #, c-format msgid "No documentation installed" -msgstr "Dokumentacija nije instalirana" +msgstr "" -#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3769 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4080 +#: ../midori/midori-view.c:4029 msgid "_Duplicate Tab" -msgstr "_Udvostuči karticu" +msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4034 msgid "_Restore Tab" msgstr "_Obnovi karticu" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4034 msgid "_Minimize Tab" msgstr "_Minimiziraj karticu" -#: ../midori/midori-view.c:4091 +#: ../midori/midori-view.c:4040 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4763 +#: ../midori/midori-view.c:4661 msgid "Print background images" -msgstr "Ispis pozadinske slike" +msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:4764 +#: ../midori/midori-view.c:4662 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4714 ../midori/midori-preferences.c:381 msgid "Features" msgstr "" #. Page "General" #: ../midori/midori-preferences.c:298 msgid "General" -msgstr "Osnovno" +msgstr "Općenito" #: ../midori/midori-preferences.c:299 msgid "Startup" -msgstr "Početak" +msgstr "Pokretanje" #: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 msgid "Use current page as homepage" @@ -1921,7 +1891,7 @@ msgstr "Postavke fonta" #: ../midori/midori-preferences.c:352 msgid "Default Font Family" -msgstr "Zadana font obitelj" +msgstr "" #: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" @@ -1929,7 +1899,7 @@ msgstr "" #: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" -msgstr "Zadania veličina fonata za prikaz teksta" +msgstr "" #: ../midori/midori-preferences.c:360 msgid "Fixed-width Font Family" @@ -1949,7 +1919,7 @@ msgstr "Najmanja veličina fonta" #: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" -msgstr "Najmnja veličina fonta za prikaz teksta" +msgstr "" #. Page "Behavior" #: ../midori/midori-preferences.c:380 @@ -1986,11 +1956,13 @@ msgstr "Omogući provjeru pravopisa dok pišem" #: ../midori/midori-preferences.c:425 msgid "Spelling dictionaries:" -msgstr "Pravopisni rječnici:" +msgstr "Pravopisni rječnici" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" msgstr "" #. Page "Interface" @@ -2009,11 +1981,11 @@ msgstr "Pretraživanje" #. Page "Applications" #: ../midori/midori-preferences.c:468 msgid "Applications" -msgstr "Aplikacije" +msgstr "Programi" #: ../midori/midori-preferences.c:469 msgid "External applications" -msgstr "Vanjske aplikacije" +msgstr "Vanjski programi" #. Page "Network" #: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 @@ -2059,11 +2031,11 @@ msgstr "" #: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" -msgstr "Upravljanje Tražilicama" +msgstr "" #: ../midori/midori-searchaction.c:1335 msgid "Use as _default" -msgstr "koristi kao _zadano" +msgstr "Koristi kao _zadano" #: ../midori/sokoke.c:1294 msgid "_Bookmark" @@ -2071,7 +2043,7 @@ msgstr "_Zabilješka" #: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" -msgstr "Dodaj za_bilješku" +msgstr "Dodaj_zabilješku" #: ../midori/sokoke.c:1297 msgid "_Console" @@ -2105,27 +2077,23 @@ msgstr "_Prijenosi" msgid "Netscape p_lugins" msgstr "Netscape p_riključci" -#: ../midori/sokoke.c:1307 -msgid "New _Folder" -msgstr "Nova _mapa" - #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Zabilješke" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:250 msgid "Edit the selected bookmark" msgstr "Uredi odabrane zabilješke" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:258 msgid "Delete the selected bookmark" msgstr "Izbriši odabrane zabilješke" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:278 msgid "Add a new folder" msgstr "Dodaj novu mapu" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:608 msgid "Separator" msgstr "Razdjelnik" @@ -2133,14 +2101,6 @@ msgstr "Razdjelnik" msgid "Console" msgstr "" -#: ../panels/midori-console.c:361 -msgid "Copy _All" -msgstr "Kopiraj _sve" - -#: ../panels/midori-console.c:362 -msgid "Copy All" -msgstr "Kopiraj sve" - #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Proširenja" @@ -2150,8 +2110,9 @@ msgid "Erroneous clock time" msgstr "" #: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Sat vremena leži u prošlosti. Molimo provjerite trenutni datum i vrijeme." +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "" #: ../panels/midori-history.c:286 msgid "A week ago" @@ -2177,28 +2138,28 @@ msgstr "Jučer" msgid "Are you sure you want to remove all history items?" msgstr "Jeste li sigurni da želite ukloniti sve stavke povijesti?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:438 msgid "Bookmark the selected history item" msgstr "Zabilježi odabranu stavku povijesti" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:447 msgid "Delete the selected history item" msgstr "Izbriši odabranu stavku povijesti" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:455 msgid "Clear the entire history" msgstr "Obriši cijelu povijest" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:479 msgid "Open Destination _Folder" -msgstr "Otvori odredišnu _mapu" +msgstr "Otvori odredišni _direktorij" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:482 msgid "Copy Link Loc_ation" msgstr "" @@ -2210,7 +2171,9 @@ msgstr "" msgid "" "A username and a password are required\n" "to open this location:" -msgstr "Korisničko ime i lozinka su potrebni za otvaranje ove lokacije:" +msgstr "" +"Korisničko ime i lozinka su potrebni\n" +"za otvaranje ove lokacije" #: ../katze/katze-http-auth.c:244 msgid "Username" @@ -2227,7 +2190,7 @@ msgstr "_Zapamti lozinku" #: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Imenovana ikona '% s' ne može biti učitana" +msgstr "Imenovana ikona '%s ne može biti učitana" #: ../katze/katze-throbber.c:895 #, c-format @@ -2256,47 +2219,49 @@ msgstr "Izaberi mapu" msgid "Preferences for %s" msgstr "Osobitosti za %s" -#: ../extensions/adblock.c:415 +#: ../extensions/adblock.c:413 msgid "Configure Advertisement filters" msgstr "" -#: ../extensions/adblock.c:447 +#: ../extensions/adblock.c:445 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." msgstr "" -#: ../extensions/adblock.c:587 +#: ../extensions/adblock.c:585 msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/adblock.c:841 +#: ../extensions/adblock.c:839 msgid "Edit rule" msgstr "Uredi pravilo" -#: ../extensions/adblock.c:854 +#: ../extensions/adblock.c:852 msgid "_Rule:" msgstr "_Pravilo" -#: ../extensions/adblock.c:908 +#: ../extensions/adblock.c:906 msgid "Bl_ock image" msgstr "Bl_okiraj sliku" -#: ../extensions/adblock.c:913 +#: ../extensions/adblock.c:911 msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1485 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1486 msgid "Block advertisements according to a filter list" msgstr "" #: ../extensions/addons.c:122 #, c-format msgid "Copy %s to the folder %s." -msgstr "Kopiraj% s u mapu% s." +msgstr "Kopiraj %s u mapu %s." #: ../extensions/addons.c:177 msgid "Userscripts" @@ -2342,16 +2307,18 @@ msgid "Delete All" msgstr "Izbriši sve" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" -msgstr "Proširi sve" +msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" -msgstr "Sažmi sve" +msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" @@ -2403,14 +2370,16 @@ msgstr "Ime" #: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" -msgstr "_Proširi sve" +msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" -msgstr "_Sažmi sve" +msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" msgstr "" #: ../extensions/cookie-manager/main.c:40 @@ -2419,7 +2388,7 @@ msgstr "_Upravitelj kolačićima" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "Lista, pregled i brisanje kolačića" +msgstr "" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2430,25 +2399,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:399 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "" -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:671 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:731 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:814 msgid "_Feeds" msgstr "" @@ -2483,25 +2452,25 @@ msgstr "" msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/main.c:129 +#: ../extensions/feed-panel/main.c:132 msgid "Error" msgstr "Greška" -#: ../extensions/feed-panel/main.c:131 +#: ../extensions/feed-panel/main.c:134 #, c-format msgid "Feed '%s' already exists" msgstr "" -#: ../extensions/feed-panel/main.c:208 +#: ../extensions/feed-panel/main.c:211 #, c-format msgid "Error loading feed '%s'" msgstr "" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:522 msgid "Feed Panel" msgstr "" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:523 msgid "Read Atom/ RSS feeds" msgstr "" @@ -2550,19 +2519,19 @@ msgstr "" #: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" -msgstr "Prilagodi prečace tipkovnice" +msgstr "Prilagodi kratice tipkovnice" #: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." -msgstr "Prilagodi pr_ečace" +msgstr "Prilagodi kr_atice" #: ../extensions/shortcuts.c:315 msgid "Shortcuts" -msgstr "Prečaci" +msgstr "Kratice" #: ../extensions/shortcuts.c:316 msgid "View and edit keyboard shortcuts" -msgstr "Pogledaj i uredi prečace tipkovnice" +msgstr "Pogledaj i uredi kratice tipkovnice" #: ../extensions/statusbar-features.c:84 msgid "Images" @@ -2594,7 +2563,7 @@ msgstr "" #: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" -msgstr "Pokaži kartice na okomitoj ploći" +msgstr "" #: ../extensions/tab-switcher.c:395 msgid "Tab History List" @@ -2602,14 +2571,16 @@ msgstr "" #: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Omogući prebacivanje kartice odabirom iz liste poredanih po zadnjem korištenju" +msgstr "" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." msgstr "" #: ../extensions/toolbar-editor.c:421 From f4a85633991d3f2edf1f05671c4e214056eff68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C8=99u=20Moldovan?= Date: Sat, 29 May 2010 13:30:20 +0200 Subject: [PATCH 2646/2970] l10n: Updated Romanian (ro) translation to 100% New status: 621 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ro.po | 1766 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 994 insertions(+), 772 deletions(-) diff --git a/po/ro.po b/po/ro.po index 667adcdb..72fd8b92 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,31 +1,31 @@ # Romanian translations for midori package # Traducerea în limba română pentru pachetul midori. -# Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER +# Copyright (C) 2009-2010 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Igor Știrbu 2009 -# Mișu Moldovan 2009 -# +# Mișu Moldovan 2009-2010 +# Andrei Popescu 2010 +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.2\n" +"Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-27 19:33+0200\n" -"PO-Revision-Date: 2009-12-27 21:06+0200\n" -"Last-Translator: Igor Știrbu \n" +"POT-Creation-Date: 2010-05-23 10:07+0000\n" +"PO-Revision-Date: 2010-05-29 14:32+0300\n" +"Last-Translator: Mișu Moldovan \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Mic navigator pentru Internet" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1508 ../midori/main.c:1710 -#: ../midori/main.c:1718 ../midori/main.c:1729 -#: ../midori/midori-websettings.c:293 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -33,212 +33,198 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigator Internet" -#: ../midori/main.c:107 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Nu s-au putut încărca preferințele: %s\n" -#: ../midori/main.c:162 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Valoarea „%s” nu este validă pentru %s" -#: ../midori/main.c:169 ../midori/main.c:255 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valoare nevalidă pentru preferințe „%s”" -#: ../midori/main.c:379 ../extensions/formhistory.c:436 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Eșec la deschiderea bazei de date: %s\n" -#: ../midori/main.c:411 ../extensions/formhistory.c:451 -#: ../extensions/formhistory.c:455 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Eșec la executarea comenzii pentru baza de date: %s\n" - -#: ../midori/main.c:465 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Eșec la ștergerea elementului din istoric: %s\n" - -#: ../midori/main.c:489 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Eșec la curățarea istoricului: %s\n" - -#: ../midori/main.c:512 -#, c-format -msgid "Failed to update history item: %s\n" -msgstr "Eșec la actualizarea elementului din istoric: %s\n" - -#: ../midori/main.c:546 -#, c-format -msgid "Failed to get current time: %s\n" -msgstr "Eșec la încercarea de obținere a datei curente: %s\n" - -#: ../midori/main.c:562 -#, c-format -msgid "Failed to add history item: %s\n" -msgstr "Eșec la adăugarea elementului în istoric: %s\n" - #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:741 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Eșec la ștergerea elementelor vechi din istoric: %s\n" -#: ../midori/main.c:770 +#: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Nu s-au putut salva preferințele. %s" -#: ../midori/main.c:808 +#: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Nu s-au putut salva motoarele de căutare. %s" -#: ../midori/main.c:827 ../midori/main.c:877 ../midori/main.c:897 +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Nu s-au putut salva favoritele. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:927 ../midori/main.c:950 +#: ../midori/main.c:602 ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Nu s-a putut salva gunoiul. %s" -#: ../midori/main.c:1019 ../midori/main.c:1191 +#: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" msgstr "Nu s-a putut salva sesiunea. %s" -#: ../midori/main.c:1225 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Se pare că Midori s-a terminat prematur la ultima pornire. Dacă se repetă " -"problema, încercați una dintre opțiunile de mai jos pentru remediere." +#: ../midori/main.c:868 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Niciun fișier cu certificate root nu este disponibil. Certificatele SSL nu vor putea fi verificate." -#: ../midori/main.c:1240 +#: ../midori/main.c:958 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Se pare că Midori s-a terminat prematur la ultima pornire. Dacă se repetă problema, încercați una dintre opțiunile de mai jos pentru remediere." + +#: ../midori/main.c:973 msgid "Modify _preferences" msgstr "_Editare preferințe" -#: ../midori/main.c:1244 +#: ../midori/main.c:977 msgid "Reset the last _session" msgstr "_Sesiune nouă" -#: ../midori/main.c:1249 +#: ../midori/main.c:982 msgid "Disable all _extensions" msgstr "_Fără extensii" -#: ../midori/main.c:1412 ../midori/main.c:1943 +#: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca sesiunea: %s\n" -#: ../midori/main.c:1508 +#: ../midori/main.c:1336 msgid "No filename specified" msgstr "Nu s-a precizat un fișier" -#: ../midori/main.c:1531 +#: ../midori/main.c:1355 msgid "An unknown error occured." msgstr "A intervenit o eroare necunoscută." -#: ../midori/main.c:1563 +#: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captură salvată în: %s\n" -#: ../midori/main.c:1623 +#: ../midori/main.c:1557 msgid "Run ADDRESS as a web application" msgstr "Tratează ADRESA ca o aplicație Internet" -#: ../midori/main.c:1623 +#: ../midori/main.c:1557 msgid "ADDRESS" msgstr "ADRESĂ" -#: ../midori/main.c:1626 +#: ../midori/main.c:1560 msgid "Use FOLDER as configuration folder" msgstr "Folosește DOSAR ca dosar cu preferințe" -#: ../midori/main.c:1626 +#: ../midori/main.c:1560 msgid "FOLDER" msgstr "DOSAR" -#: ../midori/main.c:1629 +#: ../midori/main.c:1563 msgid "Show a diagnostic dialog" msgstr "Arată o fereastră de depanare" -#: ../midori/main.c:1631 +#: ../midori/main.c:1565 msgid "Run the specified filename as javascript" msgstr "Execută fișierul precizat ca JavaScript" -#: ../midori/main.c:1634 +#: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" msgstr "Salvează o captură a URI-ului specificat" -#: ../midori/main.c:1637 +#: ../midori/main.c:1571 msgid "Execute the specified command" msgstr "Execută comanda specificată" -#: ../midori/main.c:1639 +#: ../midori/main.c:1573 msgid "Display program version" msgstr "Arată versiunea aplicației" -#: ../midori/main.c:1641 +#: ../midori/main.c:1575 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1707 +#: ../midori/main.c:1577 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Blochează URI-uri după un model regexp" + +#: ../midori/main.c:1577 +msgid "PATTERN" +msgstr "MODEL" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1581 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Repornește Midori după un număr de SECUNDE de inactivitate" + +#: ../midori/main.c:1581 +msgid "SECONDS" +msgstr "SECUNDE" + +#: ../midori/main.c:1661 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/main.c:1730 +#: ../midori/main.c:1689 msgid "Please report comments, suggestions and bugs to:" msgstr "Trimiteți comentarii, sugestii și raportați defectele la:" -#: ../midori/main.c:1732 +#: ../midori/main.c:1691 msgid "Check for new versions at:" msgstr "Versiunile noi sunt disponibile la:" -#: ../midori/main.c:1814 +#: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." msgstr "Dosarul cu preferințe precizat nu este valid." -#: ../midori/main.c:1862 +#: ../midori/main.c:1836 msgid "An instance of Midori is already running but not responding.\n" msgstr "O instanță de Midori este deja pornită, dar nu răspunde.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1891 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Nu s-au putut încărca motoarele de căutare. %s\n" -#: ../midori/main.c:1928 +#: ../midori/main.c:1920 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Nu s-au putut încărca favoritele: %s\n" -#: ../midori/main.c:1956 +#: ../midori/main.c:1952 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca gunoiul: %s\n" -#: ../midori/main.c:1969 +#: ../midori/main.c:1966 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Nu s-a putut încărca istoricul: %s\n" -#: ../midori/main.c:1981 +#: ../midori/main.c:1980 msgid "The following errors occured:" msgstr "Au intervenit următoarele erori:" -#: ../midori/main.c:1997 +#: ../midori/main.c:1996 msgid "_Ignore" msgstr "_Ignoră" @@ -255,1277 +241,1439 @@ msgstr "Document deteriorat." msgid "Unrecognized bookmark format." msgstr "Format necunoscut de favorite" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:967 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Eșec la scriere." -#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5088 -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" msgstr "Reîncarcă pagina curentă" -#: ../midori/midori-browser.c:345 ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Oprește încărcarea paginii curente" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% încărcat" -#: ../midori/midori-browser.c:481 +#: ../midori/midori-browser.c:498 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Eșec la actualizarea titlului: %s\n" + +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Acțiune neașteptată „%s”." -#: ../midori/midori-browser.c:687 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Dosar nou" -#: ../midori/midori-browser.c:687 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Editare dosar" -#: ../midori/midori-browser.c:689 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Favorit nou" -#: ../midori/midori-browser.c:689 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Editare favorite" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Titlu:" -#: ../midori/midori-browser.c:732 ../midori/midori-searchaction.c:967 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descriere:" -#: ../midori/midori-browser.c:751 ../midori/midori-searchaction.c:981 -#: ../extensions/feed-panel/main.c:368 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Adresă:" -#: ../midori/midori-browser.c:781 ../midori/midori-browser.c:4335 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "D_osar:" -#: ../midori/midori-browser.c:791 ../midori/midori-browser.c:867 -#: ../midori/midori-browser.c:4340 ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" msgstr "Dosarul rădăcină" -#: ../midori/midori-browser.c:820 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Adaugă ca apel _rapid" + +#: ../midori/midori-browser.c:877 msgid "Show in the tool_bar" msgstr "Arată în _bara cu unelte" -#: ../midori/midori-browser.c:835 +#: ../midori/midori-browser.c:892 msgid "Run as _web application" msgstr "Tratează ca o aplicație _Internet" -#: ../midori/midori-browser.c:947 ../midori/midori-browser.c:4390 +#: ../midori/midori-browser.c:986 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Nu există îndeajuns spațiu liber pentru a descărca „%s”." + +#: ../midori/midori-browser.c:990 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Fișierul necesită %s, dar liberi sunt doar %s." + +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" msgstr "Salvare fișier ca" -#: ../midori/midori-browser.c:1321 ../panels/midori-transfers.c:272 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s din %s" -#: ../midori/midori-browser.c:1357 +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." msgstr "S-a descărcat fișierul %s." -#: ../midori/midori-browser.c:1361 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Descărcare finalizată" -#: ../midori/midori-browser.c:1501 +#: ../midori/midori-browser.c:1600 msgid "Save file" msgstr "Salvare fișier" -#: ../midori/midori-browser.c:2210 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Unele fișiere sunt în curs de descărcare" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "În_chidere Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Dacă închideți Midori, se vor pierde transferurile curente" + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Deschidere fișier" -#: ../midori/midori-browser.c:2286 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 msgid "New feed" msgstr "Flux nou" -#: ../midori/midori-browser.c:2319 ../midori/midori-browser.c:5137 -#: ../panels/midori-bookmarks.c:243 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Adăugare favorit nou" -#: ../midori/midori-browser.c:2880 ../midori/midori-searchaction.c:491 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Eșec la executarea comenzii pentru baza de date: %s\n" + +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Gol" -#: ../midori/midori-browser.c:3486 ../midori/sokoke.c:282 -#: ../midori/sokoke.c:292 ../midori/sokoke.c:320 ../midori/sokoke.c:342 -#: ../midori/sokoke.c:356 +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nu s-a putut porni aplicația externă" -#: ../midori/midori-browser.c:4037 ../panels/midori-bookmarks.c:796 -#: ../panels/midori-history.c:822 +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Eșec la inserarea în istoric a elementului: %s\n" + +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Deschide tot în _taburi" -#: ../midori/midori-browser.c:4044 ../panels/midori-bookmarks.c:802 -#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 msgid "Open in New _Tab" msgstr "Deschide într-un _tab nou" -#: ../midori/midori-browser.c:4047 ../panels/midori-bookmarks.c:804 -#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 msgid "Open in New _Window" msgstr "Deschide într-o _fereastră nouă" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4657 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4265 +#: ../midori/midori-browser.c:4658 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:4659 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4267 +#: ../midori/midori-browser.c:4660 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4268 +#: ../midori/midori-browser.c:4661 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4288 ../panels/midori-bookmarks.c:272 +#: ../midori/midori-browser.c:4682 msgid "Import bookmarks..." msgstr "Importare favorite..." -#: ../midori/midori-browser.c:4291 ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 msgid "_Import bookmarks" msgstr "_Importă favoritele" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4696 msgid "_Application:" msgstr "_Aplicație:" -#: ../midori/midori-browser.c:4327 ../midori/midori-browser.c:5235 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:298 -#: ../katze/katze-utils.c:676 +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizare..." -#: ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:4797 msgid "Failed to import bookmarks" msgstr "Nu s-au putut importa favoritele" -#: ../midori/midori-browser.c:4547 +#: ../midori/midori-browser.c:4833 +msgid "Failed to export bookmarks" +msgstr "Nu s-au putut exporta favoritele" + +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../panels/midori-history.c:171 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Eșec la ștergerea elementului din istoric: %s\n" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4994 msgid "Clear Private Data" msgstr "Șterge datele private" -#: ../midori/midori-browser.c:4551 +#: ../midori/midori-browser.c:4998 msgid "_Clear private data" msgstr "Șterge datele pri_vate" -#: ../midori/midori-browser.c:4564 +#: ../midori/midori-browser.c:5012 msgid "Clear the following data:" msgstr "Șterge următoarele date:" -#: ../midori/midori-browser.c:4574 ../midori/midori-preferences.c:511 -#: ../panels/midori-history.c:108 +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 msgid "History" msgstr "Istoric" -#: ../midori/midori-browser.c:4579 +#: ../midori/midori-browser.c:5029 msgid "Cookies" msgstr "Cookie-uri" -#: ../midori/midori-browser.c:4584 +#: ../midori/midori-browser.c:5034 msgid "'Flash' Cookies" msgstr "Cookie-uri Flash" -#: ../midori/midori-browser.c:4589 +#: ../midori/midori-browser.c:5039 msgid "Website icons" -msgstr "Iconițe de site-uri" +msgstr "Iconițe site web" -#: ../midori/midori-browser.c:4594 ../midori/sokoke.c:1126 +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Taburi în_chise" -#: ../midori/midori-browser.c:4599 ../extensions/web-cache.c:409 +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Internet" -#: ../midori/midori-browser.c:4607 +#: ../midori/midori-browser.c:5057 msgid "Clear private data when _quitting Midori" msgstr "Șterge datele pri_vate la ieșirea din Midori" -#: ../midori/midori-browser.c:4703 +#: ../midori/midori-browser.c:5158 msgid "A lightweight web browser." msgstr "Un mic navigator pentru Internet." -#: ../midori/midori-browser.c:4719 +#: ../midori/midori-browser.c:5160 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Această bibliotecă este software liber ce poate fi redistribuit și/sau modificat în termenii licenței GNU LGPL (Lesser General Public License), publicată de Free Software Foundation, fie versiunea 2.1 ori o versiune ulterioară, la alegere." + +#: ../midori/midori-browser.c:5179 msgid "translator-credits" msgstr "" "Igor Știrbu \n" -"Mișu Moldovan " +"Mișu Moldovan \n" +"Andrei Popescu " -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5488 msgid "_File" msgstr "_Fișier" -#: ../midori/midori-browser.c:5003 ../midori/sokoke.c:1127 +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Fereastră nouă" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:5491 msgid "Open a new window" msgstr "Deschide o fereastră nouă" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5494 msgid "Open a new tab" msgstr "Deschide un tab nou" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:5496 msgid "P_rivate Browsing" msgstr "Navigare p_rivată" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5497 msgid "Don't save any private data while browsing" msgstr "Nu salva date private în timpul navigării" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:5501 msgid "Open a file" msgstr "Deschide un fișier" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:5504 msgid "Save to a file" msgstr "Salvează într-un fișier" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5506 msgid "Add to Speed _dial" msgstr "Adaugă ca apel _rapid" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5507 msgid "Add shortcut to speed dial" msgstr "Adaugă scurtătură de apel rapid" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5509 msgid "Add Shortcut to the _desktop" msgstr "A_daugă scurtătura la spațiul de lucru" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5510 msgid "Add shortcut to the desktop" msgstr "Adaugă scurtătura la spațiul de _lucru" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5512 msgid "Subscribe to News _feed" msgstr "Abonare la _fluxul de știri" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to this news feed" msgstr "Abonare la acest flux de știri" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:5518 msgid "_Close Tab" msgstr "În_chide tabul" -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:5519 msgid "Close the current tab" msgstr "Închide tabul curent" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5521 msgid "C_lose Window" msgstr "Înc_hide fereastra" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5522 msgid "Close this window" -msgstr "Închide această fereastră" +msgstr "Închide fereastra curentă" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5525 msgid "Print the current page" msgstr "Tipărește pagina curentă" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5528 msgid "Quit the application" msgstr "Ieșire din aplicație" -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:5530 msgid "_Edit" msgstr "_Editare" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:5534 msgid "Undo the last modification" msgstr "Anulează ultima modificare" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5537 msgid "Redo the last modification" msgstr "Refă ultima modificare" -#: ../midori/midori-browser.c:5054 +#: ../midori/midori-browser.c:5541 msgid "Cut the selected text" msgstr "Taie textul selectat" -#: ../midori/midori-browser.c:5057 ../midori/midori-browser.c:5060 +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 msgid "Copy the selected text" msgstr "Copiază textul selectat" -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:5550 msgid "Paste text from the clipboard" msgstr "Lipește textul din clipboard" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5553 msgid "Delete the selected text" msgstr "Șterge textul selectat" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5556 msgid "Select all text" msgstr "Selectează tot textul" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5559 msgid "Find a word or phrase in the page" msgstr "Caută un cuvânt sau o frază în pagină" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:5561 msgid "Find _Next" msgstr "Caută înai_nte" -#: ../midori/midori-browser.c:5075 +#: ../midori/midori-browser.c:5562 msgid "Find the next occurrence of a word or phrase" -msgstr "Caută următoarea potrivire a cuvântului sau a expresiei" +msgstr "Caută următoarea apariție a cuvântului sau a expresiei" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:5564 msgid "Find _Previous" msgstr "Caută înap_oi" -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:5565 msgid "Find the previous occurrence of a word or phrase" msgstr "Caută apariția anterioară a cuvântului sau a expresiei" -#: ../midori/midori-browser.c:5082 +#: ../midori/midori-browser.c:5569 msgid "Configure the application preferences" -msgstr "Schimbați preferințele aplicației" +msgstr "Schimbați preferințele programului" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5571 msgid "_View" msgstr "_Vizualizare" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5572 msgid "_Toolbars" msgstr "_Bare cu unelte" -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5584 msgid "Increase the zoom level" msgstr "Zoom mărit" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5587 msgid "Decrease the zoom level" msgstr "Zoom micșorat" -#: ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:5590 msgid "Reset the zoom level" msgstr "Zoom normal" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5591 msgid "_Encoding" msgstr "C_odare" -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:5593 msgid "View So_urce" msgstr "Vizualizare s_ursă" -#: ../midori/midori-browser.c:5107 +#: ../midori/midori-browser.c:5594 msgid "View the source code of the page" msgstr "Vizualizare a codului sursă a paginii" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:5597 msgid "Toggle fullscreen view" msgstr "Comută modul pe tot ecranul" -#: ../midori/midori-browser.c:5112 +#: ../midori/midori-browser.c:5600 +msgid "Scroll _Left" +msgstr "Derulare _stânga" + +#: ../midori/midori-browser.c:5601 +msgid "Scroll to the left" +msgstr "Derulare spre stânga" + +#: ../midori/midori-browser.c:5603 +msgid "Scroll _Down" +msgstr "Derulare j_os" + +#: ../midori/midori-browser.c:5604 +msgid "Scroll down" +msgstr "Derulare în jos" + +#: ../midori/midori-browser.c:5606 +msgid "Scroll _Up" +msgstr "Derulare _sus" + +#: ../midori/midori-browser.c:5607 +msgid "Scroll up" +msgstr "Derulare în sus" + +#: ../midori/midori-browser.c:5609 +msgid "Scroll _Right" +msgstr "Derulare _dreapta" + +#: ../midori/midori-browser.c:5610 +msgid "Scroll to the right" +msgstr "Derulare spre dreapta" + +#: ../midori/midori-browser.c:5613 msgid "_Go" msgstr "_Navigare" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5616 msgid "Go back to the previous page" msgstr "Salt la pagina anterioară" -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5619 msgid "Go forward to the next page" msgstr "Salt la pagina următoare" -#: ../midori/midori-browser.c:5121 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5623 msgid "Go to the previous sub-page" msgstr "Salt la sub-pagina anterioară" -#: ../midori/midori-browser.c:5124 +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5627 msgid "Go to the next sub-page" msgstr "Salt la sub-pagina următoare" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:5630 msgid "Go to your homepage" msgstr "Salt la pagina de pornire" -#: ../midori/midori-browser.c:5129 +#: ../midori/midori-browser.c:5632 msgid "Empty Trash" msgstr "Golește gunoiul" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5633 msgid "Delete the contents of the trash" msgstr "Șterge conținutul coșului de gunoi" -#: ../midori/midori-browser.c:5132 +#: ../midori/midori-browser.c:5635 msgid "Undo _Close Tab" msgstr "Revocă în_chiderea tabului" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5636 msgid "Open the last closed tab" msgstr "Deschide ultimul tab închis" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Adaugă un _dosar nou" -#: ../midori/midori-browser.c:5140 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Adaugă un dosar cu favorite" -#: ../midori/midori-browser.c:5145 ../midori/midori-searchaction.c:500 +#: ../midori/midori-browser.c:5648 +msgid "_Export bookmarks" +msgstr "_Exportă favoritele" + +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gestionare _motoare de căutare" -#: ../midori/midori-browser.c:5146 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." msgstr "Adăugați, editați și ștergeți motoare de căutare..." -#: ../midori/midori-browser.c:5149 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "Șt_erge datele private" -#: ../midori/midori-browser.c:5150 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Ștergere date private..." -#: ../midori/midori-browser.c:5154 +#: ../midori/midori-browser.c:5660 +msgid "_Inspect Page" +msgstr "_Inspectare pagină" + +#: ../midori/midori-browser.c:5661 +msgid "Inspect page details and access developer tools..." +msgstr "Inspectați detaliile paginii și accesați uneltele de dezvoltare..." + +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" msgstr "Tabul a_nterior" -#: ../midori/midori-browser.c:5155 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" msgstr "Comută la tabul anterior" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" msgstr "Tabul u_rmător" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" msgstr "Comută la tabul următor" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5672 msgid "Focus _Current Tab" msgstr "Activează tabul _curent" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5673 msgid "Focus the current tab" msgstr "Activează tabul curent" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:5675 msgid "Open last _session" msgstr "Deschide ultima _sesiune" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:5676 msgid "Open the tabs saved in the last session" msgstr "Deschide taburile salvate în ultima sesune" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5678 msgid "_Help" msgstr "_Ajutor" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Conținut" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" msgstr "Arată documentația" -#: ../midori/midori-browser.c:5171 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" msgstr "Întrebări _frecvente" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" msgstr "Arată întrebările frecvente" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" msgstr "_Raportare defect" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" msgstr "Deschide gestionarul de defecte al Midori" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" msgstr "Arată detalii despre aplicație" -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" msgstr "Bară de _meniu" -#: ../midori/midori-browser.c:5186 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" msgstr "Arată bara de meniu" -#: ../midori/midori-browser.c:5189 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" msgstr "Bară de _navigare" -#: ../midori/midori-browser.c:5190 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" msgstr "Arată bara de navigare" -#: ../midori/midori-browser.c:5193 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" msgstr "_Panou lateral" -#: ../midori/midori-browser.c:5194 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" msgstr "Arată panoul lateral" -#: ../midori/midori-browser.c:5197 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" msgstr "Bară cu _favorite" -#: ../midori/midori-browser.c:5198 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" msgstr "Arată bara cu favorite" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" msgstr "Bară de _descărcare" -#: ../midori/midori-browser.c:5202 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" msgstr "Arată bara descărcărilor" -#: ../midori/midori-browser.c:5205 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" msgstr "Bară de _stare" -#: ../midori/midori-browser.c:5206 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" msgstr "Arată bara de stare" -#: ../midori/midori-browser.c:5213 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automată" -#: ../midori/midori-browser.c:5216 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chineză (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:5220 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japoneză (SHIFT__JIS)" -#: ../midori/midori-browser.c:5223 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Coreeană (EUC-KR)" -#: ../midori/midori-browser.c:5226 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Rusă (KOI8-R)" -#: ../midori/midori-browser.c:5229 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5232 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Vestică (ISO-8859-1)" -#: ../midori/midori-browser.c:5786 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5793 +#: ../midori/midori-browser.c:6301 msgid "_Location..." msgstr "_Locație..." -#: ../midori/midori-browser.c:5795 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" msgstr "Deschide o anumită locație" -#: ../midori/midori-browser.c:5819 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." msgstr "Caută pe _Internet..." -#: ../midori/midori-browser.c:5821 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" msgstr "Pornește o căutare pe Internet" -#: ../midori/midori-browser.c:5842 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Redeschideți taburi ori ferestre închise recent" -#: ../midori/midori-browser.c:5857 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" msgstr "Pagini vizitate _recent" -#: ../midori/midori-browser.c:5859 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Redeschideți pagini vizitate recent" -#: ../midori/midori-browser.c:5874 ../midori/sokoke.c:1116 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "Favo_rite" -#: ../midori/midori-browser.c:5876 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" msgstr "Arată favoritele salvate" -#: ../midori/midori-browser.c:5891 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "_Unelte" -#: ../midori/midori-browser.c:5904 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "Fereas_tră" -#: ../midori/midori-browser.c:5906 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" msgstr "Arată lista tuturor taburilor deschise" -#: ../midori/midori-browser.c:5920 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Meniu" -#: ../midori/midori-browser.c:5922 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Meniu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6126 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" msgstr "Căutare _inclusă:" -#: ../midori/midori-browser.c:6157 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Anterioară" -#: ../midori/midori-browser.c:6162 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Următoare" -#: ../midori/midori-browser.c:6167 +#: ../midori/midori-browser.c:6675 msgid "Match Case" msgstr "Majuscule semnificative" -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" msgstr "Evidențiază potrivirile" -#: ../midori/midori-browser.c:6188 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" msgstr "Închide bara de căutare" -#: ../midori/midori-browser.c:6234 ../panels/midori-transfers.c:143 +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Șterge tot" -#: ../midori/midori-browser.c:6592 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Opțiune neașteptată „%s”" -#: ../midori/midori-locationaction.c:993 +#: ../midori/midori-locationaction.c:377 +#, c-format +msgid "Failed to select from history\n" +msgstr "Eșec la selectarea din istoric\n" + +#: ../midori/midori-locationaction.c:459 +#, c-format +msgid "Search for %s" +msgstr "Caută %s" + +#: ../midori/midori-locationaction.c:482 #, c-format msgid "Search with %s" msgstr "Caută cu %s" -#: ../midori/midori-panel.c:434 ../midori/midori-panel.c:436 +#: ../midori/midori-locationaction.c:1197 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "Eșec la executarea comenzii pentru baza de date\n" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "Lipește și c_ontinuă" + +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Detașează de fereastră panoul ales" -#: ../midori/midori-panel.c:446 ../midori/midori-panel.c:448 -#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Aliniază la dreapta panoul lateral" -#: ../midori/midori-panel.c:458 ../midori/midori-panel.c:459 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Închide panoul" -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Aliniază la stânga panoul lateral" -#: ../midori/midori-panel.c:722 -msgid "Show panel _titles" -msgstr "Arată _titlurile panourilor" +#: ../midori/midori-panel.c:797 +msgid "Hide operating controls" +msgstr "Ascunde controalele active" -#: ../midori/midori-panel.c:729 -msgid "Show operating _controls" -msgstr "Arată _controalele active" - -#: ../midori/midori-panel.c:834 -msgid "Options" -msgstr "Opțiuni" - -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Arată o pagină goală" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Arată pagina de pornire" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Arată ultimele taburi deschise" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japoneză (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Tab nou" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Fereastră nouă" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Tab curent" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Implicit" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Iconițe" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Iconițe mici" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Iconițe și text" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Text lângă iconițe" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:279 +msgid "Automatic (GNOME or environment)" +msgstr "Automat (din mediu ori GNOME)" + +#: ../midori/midori-websettings.c:280 +msgid "HTTP proxy server" +msgstr "Server proxy HTTP" + +#: ../midori/midori-websettings.c:281 +msgid "No proxy server" +msgstr "Fără server proxy" + +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Toate cookie-urile" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Cookie-uri de sesiune" -#: ../midori/midori-websettings.c:278 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:652 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Fără" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Reține dimensiunea ultimei ferestre" -#: ../midori/midori-websettings.c:351 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "Specifică dacă se salvează dimensiunea ultimei ferestre" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Lățimea ultimei ferestre" -#: ../midori/midori-websettings.c:360 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Ultima lățime salvată a ferestrei" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "Înălțimea ultimei ferestre" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Ultima înălțime salvată a ferestrei" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Ultima poziție a panoului" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Ultima poziție salvată a panoului" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "Ultima pagină a panoului" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" -msgstr "Ulima pagină salvată a panoului" +msgstr "Ultima pagină salvată a panoului" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Ultima căutare pe Internet" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "Ultima căutare pe Internet salvată" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Arată bara de meniu" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "Specifică dacă să fie vizibilă bara de meniu" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Arată bara de navigare" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "Specifică dacă să fie vizibilă bara de navigare" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Arată bara cu favorite" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "Specifică dacă să fie vizibilă bara cu favorite" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Arată panoul" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "Specifică dacă să fie vizibil panoul" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Arată bara descărcărilor" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "Specifică dacă să fie vizibilă bara descărcărilor" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Arată bara de stare" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "Specifică dacă să fie vizibilă bara de stare" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "Stil bară cu unelte:" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "Stilul barei cu unelte" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "Arată progresul în bara de adrese" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "Specifică dacă să fie vizibil progresul încărcării în bara de adrese" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "Arată căutările la completarea adreselor" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" -msgstr "Specifică dacă să fie vizibile motoarele de căutare la completarea " -"în bara de adrese" +msgstr "Specifică dacă să fie vizibile motoarele de căutare la completarea în bara de adrese" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Elementele barei cu unelte" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Elementele de arătat în bara cu unelte" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Panou lateral compact" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "Specifică dacă panoul lateral e compact" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "Arată controalele active ale panoului" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "Specifică dacă să fie vizibile controalele active ale panoului" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "Aliniază la dreapta panoul lateral" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "Specifică dacă panoul lateral se aliniază la dreapta" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Deschide panourile în ferestre separate" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "Specifică dacă panourile noi se deschid în ferestre separate" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "La pornirea Midori:" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "Specificați cum să pornească Midori" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Pagină de pornire:" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "Pagina de pornire" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "Depanare după terminări premature" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "Arată o fereastră de depanare la pornirea după o terminare prematură" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Arată apelurile rapide în taburi noi" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Arată apelurile rapide în taburile nou deschise" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Salvează fișierele descărcate în:" -#: ../midori/midori-websettings.c:647 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "Calea către dosarul pentru salvarea fișierelor descărcate" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Cere un dosar de destinație" -#: ../midori/midori-websettings.c:669 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" -"Specifică dacă se va cere precizarea dosarului în care se face descărcarea" +msgstr "Specifică dacă se va cere precizarea dosarului în care se face descărcarea" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "Notifică la finalizarea descărcărilor" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "Specifică dacă se afișează o notificare la finalizarea unei descărcări" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "Gestionar de descărcări" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "Gestionar extern de descărcări" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Editor extern de text" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "Agregator de știri" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "Agregator extern de știri" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "Căutarea în bara de adrese" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "Căutarea de efectuat în bara de adrese" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "Codare preferată" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "Codarea de caractere preferată" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Arată întotdeauna bara cu taburi" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Arată întotdeauna bara cu taburi" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "Butoane de închidere pe taburi" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "Specifică dacă se adaugă butoane de închidere pe taburi" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Paginile noi se vor deschide în:" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Alegeți unde să se deschidă paginile noi" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Paginile externe se vor deschide în:" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "Alegeți unde să se deschidă paginile externe" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Butonul din mijloc deschide selecția" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" -msgstr "" -"Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului" +msgstr "Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Deschide taburile în fundal" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "Specifică dacă taburile noi se deschid în fundal" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "Deschide taburile lângă cel curent" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Specifică dacă taburile noi se deschid lângă cel curent sau după ultimul tab" +msgstr "Specifică dacă taburile noi se deschid lângă cel curent sau după ultimul tab" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Deschide popup-urile în taburi" -#: ../midori/midori-websettings.c:821 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "Specifică dacă ferestrele popup se deschid în taburi" -#: ../midori/midori-websettings.c:831 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Încarcă automat imaginile" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "Încarcă și afișează automat imaginile" -#: ../midori/midori-websettings.c:839 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Execută scripturi" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "Activează limbajele de scripting incluse" -#: ../midori/midori-websettings.c:847 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Utilizează module Netscape" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "Activează modulele Netscape incluse" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:884 +msgid "Enable HTML5 database support" +msgstr "Suport pentru baze de date HTML5" + +#: ../midori/midori-websettings.c:885 +msgid "Whether to enable HTML5 database support" +msgstr "Specifică dacă să se activeze suportul pentru baze de date HTML5" + +#: ../midori/midori-websettings.c:891 +msgid "Enable HTML5 local storage support" +msgstr "Suport pentru stocare locală HTML5" + +#: ../midori/midori-websettings.c:892 +msgid "Whether to enable HTML5 local storage support" +msgstr "Specifică dacă să se activeze suportul pentru stocare locală HTML5" + +#: ../midori/midori-websettings.c:900 +msgid "Enable offline web application cache" +msgstr "Cache offline pentru aplicații web" + +#: ../midori/midori-websettings.c:901 +msgid "Whether to enable offline web application cache" +msgstr "Specifică dacă să se activeze suportul pentru cache offline de aplicații web" + +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Scalează imaginile odată cu textul" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "Specifică dacă se scalează concomitent textul și imaginile" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "Caută în pagină pe măsură ce se tastează" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "Specifică dacă se caută automat pe măsură ce se tastează" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "Derulare cinetică" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Specifică dacă derularea ar trebui să se facă cinetic în acord cu viteza" +msgstr "Specifică dacă derularea ar trebui să se facă cinetic, în acord cu viteza" -#: ../midori/midori-websettings.c:913 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Acceptă cookie-uri" -#: ../midori/midori-websettings.c:914 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Tipuri de cookie-uri acceptate" -#: ../midori/midori-websettings.c:930 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Doar cookie-uri originale" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" -msgstr "Acceptă cookie-uri doar de la site-ul original" +msgstr "Refuză cookie-uri de la alte servere" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" -msgstr "Durata maximă pentru cookie-uri" +msgstr "Durată maximă pentru cookie-uri" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "Numărul maxim de zile pentru păstrarea cookie-urilor" -#: ../midori/midori-websettings.c:957 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Reține ultimele pagini vizitate" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "Specifică dacă se rețin ultimele pagini vizitate" -#: ../midori/midori-websettings.c:966 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "Număr maxim de zile pentru istoric" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "Numărul maxim de zile pentru păstrarea istoricului" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Reține ultimele fișiere descărcate" -#: ../midori/midori-websettings.c:976 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "Specifică dacă se rețin ultimele fișiere descărcate" -#: ../midori/midori-websettings.c:986 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:1047 +msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:1048 +msgid "The type of proxy server to use" +msgstr "Tipul serverului proxy de utilizat" + +#: ../midori/midori-websettings.c:1057 +msgid "HTTP Proxy Server" +msgstr "Server proxy HTTP" + +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "Serverul proxy pentru conexiuni HTTP" -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "Detectează automat serverul proxy" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" -"Specifică dacă se detectează automat serverul proxy din variabilele de mediu" +msgstr "Specifică dacă se detectează automat serverul proxy din variabilele de mediu" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1019 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "Identificare" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "Alegeți identitatea de prezentat serverelor din Internet" -#: ../midori/midori-websettings.c:1036 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "Șir de identificare" -#: ../midori/midori-websettings.c:1037 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "Șirul de identificare al aplicației" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1123 +msgid "Preferred languages" +msgstr "Limbă preferată" + +#: ../midori/midori-websettings.c:1124 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "O listă de limbi preferate pentru afișarea paginilor multilingve, de exemplu: „ro”, „ro,en” ori „en-us;q=1.0, fr-fr;q=0.667”" + +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Ștergere date private" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "Datele private selectate pentru ștergere" @@ -1533,437 +1681,449 @@ msgstr "Datele private selectate pentru ștergere" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:947 ../midori/midori-view.c:3950 -#: ../midori/midori-view.c:3954 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 #, c-format msgid "Error - %s" msgstr "Eroare - %s" -#: ../midori/midori-view.c:948 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Nu s-a putut încărca pagina „%s”." -#: ../midori/midori-view.c:953 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Reîncearcă" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:986 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "%s nu a fost găsit" -#: ../midori/midori-view.c:1200 ../midori/midori-view.c:1987 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Trimite un mesaj la %s" -#: ../midori/midori-view.c:1811 ../midori/midori-view.c:1886 -msgid "Open _Link" -msgstr "Deschide _linkul" - -#: ../midori/midori-view.c:1814 ../midori/midori-view.c:1888 -msgid "Open Link in New _Tab" -msgstr "Deschide linkul într-un _tab nou" - -#: ../midori/midori-view.c:1818 -msgid "Open Link in _Foreground Tab" -msgstr "Deschide lin_kul în tabul din prim-plan" - -#: ../midori/midori-view.c:1819 -msgid "Open Link in _Background Tab" -msgstr "Deschide linkul într-un tab din _fundal" - -#: ../midori/midori-view.c:1822 ../midori/midori-view.c:1895 -msgid "Open Link in New _Window" -msgstr "Deschide linkul într-o _fereastră nouă" - -#: ../midori/midori-view.c:1825 -msgid "_Copy Link destination" -msgstr "_Copiază destinația linkului" - -#: ../midori/midori-view.c:1828 ../midori/midori-view.c:1907 -msgid "_Save Link destination" -msgstr "_Salvează destinația linkului" - -#: ../midori/midori-view.c:1829 ../midori/midori-view.c:1901 -msgid "_Download Link destination" -msgstr "_Descarcă destinația linkului" - -#: ../midori/midori-view.c:1833 ../midori/midori-view.c:1869 -#: ../midori/midori-view.c:1912 -msgid "Download with Download _Manager" -msgstr "D_escarcă cu gestionarul de descărcări" - -#: ../midori/midori-view.c:1845 -msgid "Open _Image in New Tab" -msgstr "Deschide _imaginea într-un tab nou" - -#: ../midori/midori-view.c:1848 -msgid "Open Image in New Wi_ndow" -msgstr "Deschide imaginea într-o _fereastră nouă" - -#: ../midori/midori-view.c:1851 -msgid "Copy Image _Address" -msgstr "Copiază _adresa imaginii" - -#: ../midori/midori-view.c:1854 -msgid "Save I_mage" -msgstr "Salvează i_maginea" - -#: ../midori/midori-view.c:1855 -msgid "Download I_mage" -msgstr "Descarcă i_maginea" - -#: ../midori/midori-view.c:1862 -msgid "Copy Video _Address" -msgstr "Copiază _adresa materialului video" - -#: ../midori/midori-view.c:1865 -msgid "Save _Video" -msgstr "Salvează materialul _video" - -#: ../midori/midori-view.c:1865 -msgid "Download _Video" -msgstr "Descarcă materialul _video" - -#: ../midori/midori-view.c:1932 -msgid "Search _with" -msgstr "Caută c_u" - -#: ../midori/midori-view.c:1967 ../midori/midori-view.c:1974 -msgid "_Search the Web" -msgstr "C_aută pe Internet" - -#: ../midori/midori-view.c:1995 -msgid "Open Address in New _Tab" -msgstr "Deschide adresa într-un _tab nou" - -#: ../midori/midori-view.c:2146 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Inspectare _element" -#: ../midori/midori-view.c:2270 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +msgid "Open Link in New _Tab" +msgstr "Deschide linkul într-un _tab nou" + +#: ../midori/midori-view.c:2195 +msgid "Open Link in _Foreground Tab" +msgstr "Deschide lin_kul în tabul din prim-plan" + +#: ../midori/midori-view.c:2196 +msgid "Open Link in _Background Tab" +msgstr "Deschide linkul într-un tab din _fundal" + +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +msgid "Open Link in New _Window" +msgstr "Deschide linkul într-o _fereastră nouă" + +#: ../midori/midori-view.c:2202 +msgid "Open Link as Web A_pplication" +msgstr "Deschide linkul ca o aplicație _web" + +#: ../midori/midori-view.c:2205 +msgid "Copy Link de_stination" +msgstr "Copiază de_stinația linkului" + +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +msgid "_Save Link destination" +msgstr "_Salvează destinația linkului" + +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +msgid "_Download Link destination" +msgstr "_Descarcă destinația linkului" + +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 +msgid "Download with Download _Manager" +msgstr "D_escarcă cu gestionarul de descărcări" + +#: ../midori/midori-view.c:2222 +msgid "Open _Image in New Tab" +msgstr "Deschide _imaginea într-un tab nou" + +#: ../midori/midori-view.c:2225 +msgid "Copy Image _Address" +msgstr "Copiază _adresa imaginii" + +#: ../midori/midori-view.c:2228 +msgid "Save I_mage" +msgstr "Salvează i_maginea" + +#: ../midori/midori-view.c:2229 +msgid "Download I_mage" +msgstr "Descarcă i_maginea" + +#: ../midori/midori-view.c:2236 +msgid "Copy Video _Address" +msgstr "Copiază _adresa materialului video" + +#: ../midori/midori-view.c:2239 +msgid "Save _Video" +msgstr "Salvează materialul _video" + +#: ../midori/midori-view.c:2239 +msgid "Download _Video" +msgstr "Descarcă materialul _video" + +#: ../midori/midori-view.c:2302 +msgid "Search _with" +msgstr "Caută c_u" + +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +msgid "_Search the Web" +msgstr "C_aută pe Internet" + +#: ../midori/midori-view.c:2365 +msgid "Open Address in New _Tab" +msgstr "Deschide adresa într-un _tab nou" + +#: ../midori/midori-view.c:2662 msgid "Open or download file" msgstr "Deschide sau descarcă fișierul" -#: ../midori/midori-view.c:2293 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" msgstr "Tip fișier: „%s”" -#: ../midori/midori-view.c:2296 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" msgstr "Tip fișier: %s („%s”)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2300 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Deschide %s" -#: ../midori/midori-view.c:2815 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Inspectare pagină - %s" -#: ../midori/midori-view.c:3073 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Culegere rapidă" -#: ../midori/midori-view.c:3074 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" msgstr "Clic pentru a adăuga o scurtătură" -#: ../midori/midori-view.c:3075 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" msgstr "Introduceți adresa scurtăturii" -#: ../midori/midori-view.c:3076 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" msgstr "Introduceți titlul scurtăturii" -#: ../midori/midori-view.c:3077 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" msgstr "Sigur doriți să ștergeți această scurtătură?" -#: ../midori/midori-view.c:3107 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "Precizați numărul de coloane" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "Introduceți numărul de coloane" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "Precizați numărul de combinații de taste" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "Introduceți numărul de combinații de taste" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" msgstr "Documentul nu poate fi afișat" -#: ../midori/midori-view.c:3124 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Documentația nu este instalată" -#: ../midori/midori-view.c:3251 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "O pagină goală" -#: ../midori/midori-view.c:3494 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" msgstr "D_uplică tabul" -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" msgstr "_Restaurează tabul" -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" msgstr "_Minimizează tabul" -#: ../midori/midori-view.c:4118 +#: ../midori/midori-view.c:4079 +msgid "Close ot_her Tabs" +msgstr "Înc_hide celelalte taburi" + +#: ../midori/midori-view.c:4700 msgid "Print background images" msgstr "Tipărește imaginile de fundal" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4701 msgid "Whether background images should be printed" msgstr "Specifică dacă se tipăresc și imaginile de fundal" -#: ../midori/midori-view.c:4163 ../midori/midori-preferences.c:383 +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Facilități" #. Page "General" -#: ../midori/midori-preferences.c:300 +#: ../midori/midori-preferences.c:298 msgid "General" msgstr "Generale" -#: ../midori/midori-preferences.c:301 +#: ../midori/midori-preferences.c:299 msgid "Startup" msgstr "Pornire" -#: ../midori/midori-preferences.c:316 ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 msgid "Use current page as homepage" msgstr "Utilizează pagina curentă ca pagină de pornire" -#: ../midori/midori-preferences.c:333 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferuri" #. Page "Appearance" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:349 msgid "Appearance" msgstr "Aspect" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:350 msgid "Font settings" msgstr "Preferințe fonturi" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:352 msgid "Default Font Family" msgstr "Familie implicită de fonturi" -#: ../midori/midori-preferences.c:357 +#: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" msgstr "Familie implicită de fonturi pentru afișarea textului" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" msgstr "Mărime implicită a fontului pentru afișarea textului" -#: ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:360 msgid "Fixed-width Font Family" msgstr "Familie de fonturi cu lățime fixă" -#: ../midori/midori-preferences.c:365 +#: ../midori/midori-preferences.c:363 msgid "The font family used to display fixed-width text" msgstr "Familie de fonturi utilizată pentru afișarea textului de lățime fixă" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" msgstr "Mărimea fontului utilizată pentru afișarea textului de lățime fixă" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" msgstr "Mărime minimă a fontului" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" msgstr "Mărime minimă a fontului pentru afișarea textului" #. Page "Behavior" -#: ../midori/midori-preferences.c:382 +#: ../midori/midori-preferences.c:380 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:410 +#: ../midori/midori-preferences.c:393 msgid "Enforce 96 dots per inch" msgstr "Forțează afișarea în 96 DPI" -#: ../midori/midori-preferences.c:411 +#: ../midori/midori-preferences.c:394 msgid "Enforce a video dot density of 96 DPI" msgstr "Forțează la 96 DPI densitatea punctelor ecranului" +#: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "Permite popup-uri deschise de scripturi" + #: ../midori/midori-preferences.c:415 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Specifică dacă se permite scripturilor deschiderea de ferestre popup" + +#: ../midori/midori-preferences.c:419 msgid "Spell Checking" msgstr "Verificare ortografică" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:422 msgid "Enable Spell Checking" msgstr "Activează verificarea ortografică" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:423 msgid "Enable spell checking while typing" msgstr "Verifică ortografia pe măsură ce se tastează" +#: ../midori/midori-preferences.c:425 +msgid "Spelling dictionaries:" +msgstr "Dicționare ortografice:" + #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:423 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"O listă separată prin virgule de limbi pentru care se activează verificarea " -"ortografică, de exemplu: „ro_RO,en_GB”" +#: ../midori/midori-preferences.c:429 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "O listă separată prin virgule de limbi pentru care se activează verificarea ortografică, de exemplu: „ro_RO,en_GB”" #. Page "Interface" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:435 msgid "Interface" msgstr "Interfață" -#: ../midori/midori-preferences.c:430 +#: ../midori/midori-preferences.c:436 msgid "Navigationbar" msgstr "Bară de navigare" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:446 msgid "Browsing" msgstr "Navigare" #. Page "Applications" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:468 msgid "Applications" msgstr "Aplicații" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:469 msgid "External applications" msgstr "Aplicații externe" #. Page "Network" -#: ../midori/midori-preferences.c:479 ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 msgid "Network" msgstr "Rețea" +#: ../midori/midori-preferences.c:492 +msgid "Hostname" +msgstr "Nume server" + #. Page "Privacy" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:511 msgid "Privacy" msgstr "Intimitate" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:512 msgid "Web Cookies" msgstr "Cookie-uri Internet" -#: ../midori/midori-preferences.c:509 ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" msgstr "zile" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Adăugare motor de căutare" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:917 msgid "Edit search engine" msgstr "Editare motor de căutare" -#: ../midori/midori-searchaction.c:951 +#: ../midori/midori-searchaction.c:945 msgid "_Name:" msgstr "_Nume:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:989 msgid "_Icon:" msgstr "_Iconiță:" -#: ../midori/midori-searchaction.c:1009 +#: ../midori/midori-searchaction.c:1003 msgid "_Token:" msgstr "_Etichetă:" -#: ../midori/midori-searchaction.c:1232 +#: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" msgstr "Gestionare motoare de căutare" -#: ../midori/midori-searchaction.c:1333 +#: ../midori/midori-searchaction.c:1335 msgid "Use as _default" msgstr "I_mplicit" -#: ../midori/sokoke.c:1115 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Favorit" -#: ../midori/sokoke.c:1117 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "Adaugă un fa_vorit" -#: ../midori/sokoke.c:1118 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Consolă" -#: ../midori/sokoke.c:1119 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "E_xtensii" -#: ../midori/sokoke.c:1120 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Istoric" -#: ../midori/sokoke.c:1121 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "P_agină de pornire" -#: ../midori/sokoke.c:1122 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "Scripturi pr_oprii" -#: ../midori/sokoke.c:1123 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Ta_b nou" -#: ../midori/sokoke.c:1124 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "_Transferuri" -#: ../midori/sokoke.c:1125 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "Module _Netscape" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Scripturi proprii" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "_Dosar nou" -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Stiluri proprii" - -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "" -"Copiază scripturile proprii în dosarul %s și copiază stilurile proprii în " -"dosarul %s." - -#: ../panels/midori-addons.c:907 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Nu se poate monitoriza dosarul „%s”: %s" - -#: ../panels/midori-bookmarks.c:112 +#: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Favorite" -#: ../panels/midori-bookmarks.c:251 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Editare favorit selectat" -#: ../panels/midori-bookmarks.c:259 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Șterge favoritul selectat" -#: ../panels/midori-bookmarks.c:279 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Adaugă un dosar nou" -#: ../panels/midori-bookmarks.c:609 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separator" @@ -1971,40 +2131,31 @@ msgstr "Separator" msgid "Console" msgstr "Consolă" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copiază t_ot" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copiază tot" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensii" -#: ../panels/midori-history.c:162 -msgid "Are you sure you want to remove all history items?" -msgstr "Sigur doriți să ștergeți toate elementele din istoric?" - -#: ../panels/midori-history.c:217 -msgid "Bookmark the selected history item" -msgstr "Adaugă ca favorit elementul selectat din istoric" - -#: ../panels/midori-history.c:226 -msgid "Delete the selected history item" -msgstr "Șterge elementul selectat din istoric" - -#: ../panels/midori-history.c:234 -msgid "Clear the entire history" -msgstr "Șterge întregul istoric" - -#: ../panels/midori-history.c:598 +#: ../panels/midori-history.c:273 msgid "Erroneous clock time" msgstr "Data de sistem este greșită" -#: ../panels/midori-history.c:599 -msgid "" -"The clock time lies in the past. Please check the current date and time." +#: ../panels/midori-history.c:274 +msgid "The clock time lies in the past. Please check the current date and time." msgstr "Data sistemului este în trecut. Verificați data și ora curentă." -#: ../panels/midori-history.c:611 +#: ../panels/midori-history.c:286 msgid "A week ago" msgstr "Săptămâna trecută" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:288 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2012,31 +2163,48 @@ msgstr[0] "o zi în urmă" msgstr[1] "%d zile în urmă" msgstr[2] "%d de zile în urmă" -#: ../panels/midori-history.c:624 +#: ../panels/midori-history.c:291 msgid "Today" msgstr "Azi" -#: ../panels/midori-history.c:626 +#: ../panels/midori-history.c:293 msgid "Yesterday" msgstr "Ieri" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "Module Netscape" +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "Sigur doriți să ștergeți toate elementele din istoric?" -#: ../panels/midori-transfers.c:480 +#: ../panels/midori-history.c:437 +msgid "Bookmark the selected history item" +msgstr "Adaugă ca favorit elementul selectat din istoric" + +#: ../panels/midori-history.c:446 +msgid "Delete the selected history item" +msgstr "Șterge elementul selectat din istoric" + +#: ../panels/midori-history.c:454 +msgid "Clear the entire history" +msgstr "Șterge întregul istoric" + +#: ../panels/midori-history.c:952 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtru:" + +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Deschide _dosarul de destinație" -#: ../panels/midori-transfers.c:483 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Copiază _adresa legăturii" -#: ../katze/katze-http-auth.c:209 +#: ../katze/katze-http-auth.c:214 msgid "Authentication Required" msgstr "Autentificare obligatorie" -#: ../katze/katze-http-auth.c:225 +#: ../katze/katze-http-auth.c:230 msgid "" "A username and a password are required\n" "to open this location:" @@ -2044,126 +2212,164 @@ msgstr "" "Pentru a deschide această adresă sunt\n" "necesare numele de utilizator și parola:" -#: ../katze/katze-http-auth.c:239 +#: ../katze/katze-http-auth.c:244 msgid "Username" msgstr "Utilizator" -#: ../katze/katze-http-auth.c:252 +#: ../katze/katze-http-auth.c:257 msgid "Password" msgstr "Parolă" -#: ../katze/katze-http-auth.c:266 +#: ../katze/katze-http-auth.c:272 msgid "_Remember password" msgstr "_Reține parola" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Nu s-a putut încărca iconița cu numele „%s”" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Nu s-a putut încărca iconița-sistem „%s”" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "Cadrele animației sunt nevalide" -#: ../katze/katze-utils.c:487 ../katze/katze-utils.c:878 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Proprietatea „%s” nu este validă pentru %s" -#: ../katze/katze-utils.c:533 ../katze/katze-utils.c:562 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Selectare fișier" -#: ../katze/katze-utils.c:548 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Selectare dosar" -#: ../katze/katze-preferences.c:91 +#: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" msgstr "Preferințe %s" -#: ../extensions/adblock.c:345 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Opțiuni pentru filtrarea reclamelor" -#: ../extensions/adblock.c:377 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Tastați adresa listei cu filtre preconfigurate în căsuța de text și faceți " -"clic pe „Adaugă” pentru a o adauga la listă. Mai multe liste pot fi găsite " -"la %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Tastați adresa listei cu filtre preconfigurate în căsuța de text și faceți clic pe „Adaugă” pentru a o adăuga la listă. Mai multe liste pot fi găsite la %s." -#: ../extensions/adblock.c:517 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Opțiuni pentru _filtrarea reclamelor..." -#: ../extensions/adblock.c:1199 -msgid "Advertisement blocker" -msgstr "Blocare reclame" +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "Editare regulă" -#: ../extensions/adblock.c:1200 +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "_Regulă:" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "Bl_ochează imaginea" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "Bl_ochează linkul" + +#: ../extensions/adblock.c:1489 +msgid "Advertisement blocker" +msgstr "Blocare de reclame" + +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Blochează reclamele conform unei liste de filtre" -#: ../extensions/colorful-tabs.c:127 +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "Copiază %s în dosarul %s." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Scripturi proprii" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Stiluri proprii" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Opțiunile extensiei „%s” nu au putut fi salvate: %s\n" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Module utilizator" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Nu se poate monitoriza dosarul „%s”: %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Suport pentru scripturi și stiluri proprii" + +#: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Taburi colorate" -#: ../extensions/colorful-tabs.c:128 +#: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" msgstr "Nuanțează diferit fiecare tab" -#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Gestionare cookie-uri" -#: ../extensions/cookie-manager/cookie-manager-page.c:109 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Șterge tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:111 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Șterge toate cookie-urile afișate. Dacă se aplică un filtru, doar cookie-" -"urile ce se potrivesc cu respectivul filtru vor fi șterse." +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Șterge toate cookie-urile afișate. Dacă se aplică un filtru, doar cookie-urile ce se potrivesc cu respectivul filtru vor fi șterse." -#: ../extensions/cookie-manager/cookie-manager-page.c:126 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Extinde tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:133 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Pliază tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:460 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" msgstr "Sigur doriți să ștergeți toate cookie-urile?" -#: ../extensions/cookie-manager/cookie-manager-page.c:462 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Întrebare" -#: ../extensions/cookie-manager/cookie-manager-page.c:471 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." msgstr "Doar cookie-urile ce se potrivesc cu filtrul vor fi șterse." -#: ../extensions/cookie-manager/cookie-manager-page.c:539 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "Până la sfârșitul sesiunii" -#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2180,37 +2386,38 @@ msgstr "" "Securizare: %s\n" "Valabilitate: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Da" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Nu" -#: ../extensions/cookie-manager/cookie-manager-page.c:811 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Domeniu: %s\n" +"Cookie-uri: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Nume" -#: ../extensions/cookie-manager/cookie-manager-page.c:862 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Extinde tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:870 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "Plia_ză tot" -#: ../extensions/cookie-manager/cookie-manager-page.c:923 -msgid "Filter:" -msgstr "Filtru:" - -#: ../extensions/cookie-manager/cookie-manager-page.c:928 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori " -"domenii se potrivesc" +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori domenii se potrivesc" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2220,19 +2427,11 @@ msgstr "Gestionare _cookie-uri" msgid "List, view and delete cookies" msgstr "Vizualizați și ștergeți cookie-uri" -#: ../extensions/dnsprefetch.c:194 -msgid "DNS prefetching" -msgstr "Preîncărcare de date DNS" - -#: ../extensions/dnsprefetch.c:195 -msgid "Prefetch IP addresses of hovered links" -msgstr "Preîncarcă adresele IP ale linkurilor de sub cursorul de maus" - -#: ../extensions/feed-panel/feed-atom.c:237 +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Nu s-au găsit elementele necesare Atom „entry” în datele XML." -#: ../extensions/feed-panel/feed-atom.c:343 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Nu s-au găsit elementele necesare Atom „feed” în datele XML." @@ -2243,19 +2442,19 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Ultima actualizare: %s." -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:671 msgid "Feeds" msgstr "Fluxuri" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Add new feed" msgstr "Adăugare flux nou" -#: ../extensions/feed-panel/feed-panel.c:727 +#: ../extensions/feed-panel/feed-panel.c:731 msgid "Delete feed" msgstr "Șterge fluxul" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:814 msgid "_Feeds" msgstr "_Fluxuri" @@ -2284,63 +2483,61 @@ msgstr "A fost depistată o versiune nesuportată de RSS." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" -"Nu s-au găsit elementele necesare „item” în datele XML ale RSS-ului." +msgstr "Nu s-au găsit elementele necesare „item” în datele XML ale RSS-ului." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" -"Nu s-au găsit elementele necesare „channel” în datele XML ale RSS-ului." +msgstr "Nu s-au găsit elementele necesare „channel” în datele XML ale RSS-ului." -#: ../extensions/feed-panel/main.c:124 +#: ../extensions/feed-panel/main.c:132 msgid "Error" msgstr "Eroare" -#: ../extensions/feed-panel/main.c:126 +#: ../extensions/feed-panel/main.c:134 #, c-format msgid "Feed '%s' already exists" msgstr "Fluxul „%s” există deja" -#: ../extensions/feed-panel/main.c:203 +#: ../extensions/feed-panel/main.c:211 #, c-format msgid "Error loading feed '%s'" msgstr "Eroare la încărcarea fluxului „%s”" -#: ../extensions/feed-panel/main.c:514 +#: ../extensions/feed-panel/main.c:522 msgid "Feed Panel" msgstr "Panou cu fluxuri" -#: ../extensions/feed-panel/main.c:515 +#: ../extensions/feed-panel/main.c:523 msgid "Read Atom/ RSS feeds" msgstr "Citește fluxuri Atom/RSS" -#: ../extensions/formhistory.c:140 +#: ../extensions/formhistory.c:144 #, c-format msgid "Failed to add form value: %s\n" msgstr "Eșec la adăugarea elementului formularului: %s\n" -#: ../extensions/formhistory.c:500 +#: ../extensions/formhistory.c:510 msgid "Stores history of entered form data" -msgstr "Salvează istoricul datelor întroduse în formulare" +msgstr "Salvează istoricul datelor introduse în formulare" -#: ../extensions/formhistory.c:504 +#: ../extensions/formhistory.c:514 #, c-format msgid "Not available: %s" msgstr "Indisponibil: %s" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory.c:515 msgid "Resource files not installed" msgstr "Fișierele resursă nu sunt instalate" -#: ../extensions/formhistory.c:511 +#: ../extensions/formhistory.c:521 msgid "Form history filler" msgstr "Completare istoric formulare" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gesturi de maus" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Controlați Midori prin mișcările mausului" @@ -2357,19 +2554,19 @@ msgstr "_Loc pentru pagini" msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Ține una sau mai multe pagini deschise pe lângă taburi" -#: ../extensions/shortcuts.c:162 +#: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" msgstr "Schimbați combinațiile de taste" -#: ../extensions/shortcuts.c:268 +#: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." msgstr "Schimbați c_ombinațiile de taste..." -#: ../extensions/shortcuts.c:307 +#: ../extensions/shortcuts.c:315 msgid "Shortcuts" msgstr "Combinații de taste" -#: ../extensions/shortcuts.c:308 +#: ../extensions/shortcuts.c:316 msgid "View and edit keyboard shortcuts" msgstr "Vizualizați și editați combinațiile de taste" @@ -2381,6 +2578,10 @@ msgstr "Imagini" msgid "Scripts" msgstr "Scripturi" +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Module Netscape" + #: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Facilități bară de stare" @@ -2389,63 +2590,84 @@ msgstr "Facilități bară de stare" msgid "Easily toggle features on web pages on and off" msgstr "Activați ori dezactivați cu ușurință facilități pentru paginile din Internet" -#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Panou cu taburi" -#: ../extensions/tab-panel.c:606 +#: ../extensions/tab-panel.c:609 msgid "T_ab Panel" msgstr "Panou cu t_aburi" -#: ../extensions/tab-panel.c:623 +#: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" msgstr "Arată taburile într-un panou vertical" -#: ../extensions/tab-switcher.c:394 +#: ../extensions/tab-switcher.c:395 msgid "Tab History List" msgstr "Listă istoric taburi" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Schimbați taburile alegând din lista sortată după ultima utilizare" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personalizare bară cu unelte" -#: ../extensions/toolbar-editor.c:407 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Selectați elementele de afișat în bara cu unelte. Ele pot fi reordonate prin " -"tragere și plasare." +#: ../extensions/toolbar-editor.c:405 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Selectați elementele de afișat în bara cu unelte. Ele pot fi reordonate prin tragere și plasare." -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:421 msgid "Available Items" msgstr "Elemente disponibile" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:442 msgid "Displayed Items" msgstr "Elemente afișate" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:577 msgid "Customize _Toolbar..." msgstr "Personalizare bară cu unel_te..." -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:608 msgid "Toolbar Editor" msgstr "Editor bară cu unelte" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:609 msgid "Easily edit the toolbar layout" msgstr "Ajustare ușoară a aspectului barei cu unelte" -#: ../extensions/toolbar-editor.c:617 -msgid "Not available on this platform" -msgstr "Indisponibil pe această platformă" - -#: ../extensions/web-cache.c:410 +#: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "Stochează în cache-ul de pe disc comunicarea HTTP" +#~ msgid "Failed to get current time: %s\n" +#~ msgstr "Eșec la încercarea de obținere a datei curente: %s\n" + +#~ msgid "Failed to add history item: %s\n" +#~ msgstr "Eșec la adăugarea elementului în istoric: %s\n" + +#~ msgid "Show panel _titles" +#~ msgstr "Arată _titlurile panourilor" + +#~ msgid "Options" +#~ msgstr "Opțiuni" + +#~ msgid "Open _Link" +#~ msgstr "Deschide _linkul" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "Deschide imaginea într-o _fereastră nouă" + +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Copiază scripturile proprii în dosarul %s și copiază stilurile proprii în dosarul %s." + +#~ msgid "DNS prefetching" +#~ msgstr "Preîncărcare de date DNS" + +#~ msgid "Prefetch IP addresses of hovered links" +#~ msgstr "Preîncarcă adresele IP ale linkurilor de sub cursorul de maus" + +#~ msgid "Not available on this platform" +#~ msgstr "Indisponibil pe această platformă" From 27b478b42f536c2bcde4b5e7aa06185e2ebeaec4 Mon Sep 17 00:00:00 2001 From: padv Date: Sun, 30 May 2010 20:44:25 +0200 Subject: [PATCH 2647/2970] l10n: Updated Dutch (Flemish) (nl) translation to 49% New status: 308 messages complete with 140 fuzzies and 174 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 1499 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 868 insertions(+), 631 deletions(-) diff --git a/po/nl.po b/po/nl.po index a822f965..ea305a09 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 08:48-0500\n" +"POT-Creation-Date: 2010-05-30 16:08+0000\n" "PO-Revision-Date: 2008-11-10 02:02+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lichtgewicht webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1577 ../midori/main.c:1779 -#: ../midori/main.c:1787 ../midori/main.c:1798 -#: ../midori/midori-websettings.c:296 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -30,211 +30,201 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:105 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Configuratie kan niet geladen worden: %s\n" -#: ../midori/main.c:160 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Waarde '%s' is ongeldig voor %s" -#: ../midori/main.c:167 ../midori/main.c:253 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ongeldige waarde '%s'" -#: ../midori/main.c:377 ../extensions/formhistory.c:437 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Kan database niet openen: %s\n" -#: ../midori/main.c:409 ../extensions/formhistory.c:452 -#: ../extensions/formhistory.c:456 -#, fuzzy, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Kan database niet uitvoeren:% s \\ n" - -#: ../midori/main.c:463 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Kan item in geschiedenis niet verwijderen: %s\n" - -#: ../midori/main.c:487 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Kan geschiedenis niet wissen: %s\n" - -#: ../midori/main.c:510 -#, fuzzy, c-format -msgid "Failed to update history item: %s\n" -msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" - -#: ../midori/main.c:544 -#, c-format -msgid "Failed to get current time: %s\n" -msgstr "Kan de tijd niet verkrijgen: %s\n" - -#: ../midori/main.c:560 -#, c-format -msgid "Failed to add history item: %s\n" -msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" - #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:739 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kan verjaarde items in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:768 +#: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "De instellingen kunnen niet worden opgeslagen. %s" -#: ../midori/main.c:806 +#: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" -#: ../midori/main.c:825 ../midori/main.c:875 ../midori/main.c:895 +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:925 ../midori/main.c:948 +#: ../midori/main.c:602 ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" msgstr "De prullenbak kan niet worden opgeslagen. %s" -#: ../midori/main.c:1012 ../midori/main.c:1215 +#: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" msgstr "De sessie kan niet worden opgeslagen. %s" -#: ../midori/main.c:1249 +#: ../midori/main.c:868 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "" + +#: ../midori/main.c:958 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori schijnt te zijn gecrasht de laatste keer dat het werd geopend. Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het probleem op te lossen." -#: ../midori/main.c:1264 +#: ../midori/main.c:973 #, fuzzy msgid "Modify _preferences" msgstr "Wijzigen _Preferences" -#: ../midori/main.c:1268 +#: ../midori/main.c:977 msgid "Reset the last _session" msgstr "Reset de laatste _SESSION" -#: ../midori/main.c:1273 +#: ../midori/main.c:982 msgid "Disable all _extensions" msgstr "Schakel alle _extensions uit" -#: ../midori/main.c:1481 ../midori/main.c:2013 +#: ../midori/main.c:1217 ../midori/main.c:1937 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "De sessie kan niet geladen worden: %s\n" -#: ../midori/main.c:1577 +#: ../midori/main.c:1336 msgid "No filename specified" msgstr "Geen bestandsnaam ingegeven" -#: ../midori/main.c:1600 +#: ../midori/main.c:1355 msgid "An unknown error occured." msgstr "Onbekende fout." -#: ../midori/main.c:1632 +#: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snapshot opgeslagen in:%s\n" -#: ../midori/main.c:1692 +#: ../midori/main.c:1557 #, fuzzy msgid "Run ADDRESS as a web application" msgstr "Run ADRES als een webapplicatie" -#: ../midori/main.c:1692 +#: ../midori/main.c:1557 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1695 +#: ../midori/main.c:1560 msgid "Use FOLDER as configuration folder" msgstr "Gebruik FOLDER als configuratie map" -#: ../midori/main.c:1695 +#: ../midori/main.c:1560 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1698 +#: ../midori/main.c:1563 msgid "Show a diagnostic dialog" msgstr "Toon een diagnostisch venster" -#: ../midori/main.c:1700 +#: ../midori/main.c:1565 msgid "Run the specified filename as javascript" msgstr "Voer de gegeven bestandsnaam uit als Javascript" -#: ../midori/main.c:1703 +#: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" msgstr "Neem een snapshot van de opgegeven URI" -#: ../midori/main.c:1706 +#: ../midori/main.c:1571 msgid "Execute the specified command" msgstr "Voer de opgegeven opdracht uit" -#: ../midori/main.c:1708 +#: ../midori/main.c:1573 msgid "Display program version" msgstr "Versie-informatie weergeven" -#: ../midori/main.c:1710 +#: ../midori/main.c:1575 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1776 +#: ../midori/main.c:1577 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1577 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1581 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1581 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:1661 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1799 +#: ../midori/main.c:1689 msgid "Please report comments, suggestions and bugs to:" msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" -#: ../midori/main.c:1801 +#: ../midori/main.c:1691 msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" -#: ../midori/main.c:1884 +#: ../midori/main.c:1788 #, fuzzy msgid "The specified configuration folder is invalid." msgstr "De instellingen kunnen niet worden opgeslagen. %s" -#: ../midori/main.c:1932 +#: ../midori/main.c:1836 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori is al actief maar reageert niet.\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1891 #, fuzzy, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" -#: ../midori/main.c:1998 +#: ../midori/main.c:1920 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "De bladwijzers kunnen niet geladen worden: %s\n" -#: ../midori/main.c:2026 +#: ../midori/main.c:1952 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "De prullenbak kan niet geladen worden: %s\n" -#: ../midori/main.c:2039 +#: ../midori/main.c:1966 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "De geschiedenis kan niet geladen worden: %s\n" -#: ../midori/main.c:2051 +#: ../midori/main.c:1980 msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" -#: ../midori/main.c:2067 +#: ../midori/main.c:1996 #, fuzzy msgid "_Ignore" msgstr "_IGNORE" @@ -253,764 +243,890 @@ msgstr "Ongeldig document." msgid "Unrecognized bookmark format." msgstr "Onbekende bookmark formaat." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1029 +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Fout bij schrijven." -#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5132 -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "De huidige pagina herladen" -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5135 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:485 +#: ../midori/midori-browser.c:496 +#, fuzzy, c-format +msgid "Failed to update title: %s\n" +msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" + +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Onverwachte actie '%s'." -#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nieuwe map" -#: ../midori/midori-browser.c:691 +#: ../midori/midori-browser.c:726 #, fuzzy msgid "Edit folder" msgstr "Edit map" -#: ../midori/midori-browser.c:693 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nieuwe bladwijzer" -#: ../midori/midori-browser.c:693 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:723 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:736 ../midori/midori-searchaction.c:967 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beschrijving:" -#: ../midori/midori-browser.c:755 ../midori/midori-searchaction.c:981 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Address:" -#: ../midori/midori-browser.c:785 ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Map:" -#: ../midori/midori-browser.c:795 ../midori/midori-browser.c:875 -#: ../midori/midori-browser.c:4384 ../midori/midori-browser.c:4416 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Hoofdmap" -#: ../midori/midori-browser.c:824 +#: ../midori/midori-browser.c:862 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Toevoegen aan Speed _dial" + +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Laat in de werk_balk zien" -#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:890 #, fuzzy msgid "Run as _web application" msgstr "Uitvoeren als _web toepassing" -#: ../midori/midori-browser.c:955 ../midori/midori-browser.c:4434 +#: ../midori/midori-browser.c:984 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:1329 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s van %s" -#: ../midori/midori-browser.c:1365 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Het bestand '%s' is gedownload." -#: ../midori/midori-browser.c:1369 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Overdracht compleet" -#: ../midori/midori-browser.c:1509 +#: ../midori/midori-browser.c:1598 #, fuzzy msgid "Save file" msgstr "Bestand opslaan als" -#: ../midori/midori-browser.c:2218 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#, fuzzy +msgid "Some files are being downloaded" +msgstr "Het bestand '%s' is gedownload." + +#: ../midori/midori-browser.c:1921 +#, fuzzy +msgid "_Quit Midori" +msgstr "Midori" + +#: ../midori/midori-browser.c:1923 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:2294 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 #, fuzzy msgid "New feed" msgstr "Nieuwe feed" -#: ../midori/midori-browser.c:2335 ../midori/midori-browser.c:5183 -#: ../panels/midori-bookmarks.c:243 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:2899 ../midori/midori-searchaction.c:491 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#, fuzzy, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Kan database niet uitvoeren:% s \\ n" + +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Leeg" -#: ../midori/midori-browser.c:3505 ../midori/sokoke.c:333 -#: ../midori/sokoke.c:343 ../midori/sokoke.c:371 ../midori/sokoke.c:397 -#: ../midori/sokoke.c:411 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kan externe applicatie niet uitvoeren." -#: ../midori/midori-browser.c:3745 ../midori/midori-locationaction.c:1017 -#, c-format -msgid "Search with %s" -msgstr "Zoek met %s" +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#, fuzzy, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Kan item in geschiedenis niet verwijderen: %s\n" -#: ../midori/midori-browser.c:4081 ../panels/midori-bookmarks.c:796 -#: ../panels/midori-history.c:822 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 #, fuzzy msgid "Open all in _Tabs" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:4088 ../panels/midori-bookmarks.c:802 -#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-browser.c:4091 ../panels/midori-bookmarks.c:804 -#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4310 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4311 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4312 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4332 ../panels/midori-bookmarks.c:272 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Bladwijzer importeren..." -#: ../midori/midori-browser.c:4335 ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 #, fuzzy msgid "_Import bookmarks" msgstr "_Importeren bladwijzers" -#: ../midori/midori-browser.c:4345 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_programma" -#: ../midori/midori-browser.c:4371 ../midori/midori-browser.c:5281 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:301 -#: ../katze/katze-utils.c:676 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Aangepast..." -#: ../midori/midori-browser.c:4445 +#: ../midori/midori-browser.c:4805 #, fuzzy msgid "Failed to import bookmarks" msgstr "Bladwijzer bewerken" -#: ../midori/midori-browser.c:4591 +#: ../midori/midori-browser.c:4841 +#, fuzzy +msgid "Failed to export bookmarks" +msgstr "Bladwijzer bewerken" + +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 +#: ../panels/midori-history.c:171 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kan item in geschiedenis niet verwijderen: %s\n" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Wis privé data" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" -msgstr "privé data _wissen" +msgstr "Privé data _wissen" -#: ../midori/midori-browser.c:4608 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "wis de volgende data:" -#: ../midori/midori-browser.c:4618 ../midori/midori-preferences.c:517 -#: ../panels/midori-history.c:108 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 msgid "History" msgstr "Geschiedenis" -#: ../midori/midori-browser.c:4623 +#: ../midori/midori-browser.c:5037 #, fuzzy msgid "Cookies" msgstr "Koekies" -#: ../midori/midori-browser.c:4628 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' koekies" -#: ../midori/midori-browser.c:4633 +#: ../midori/midori-browser.c:5047 #, fuzzy msgid "Website icons" msgstr "Website iconen" -#: ../midori/midori-browser.c:4638 ../midori/sokoke.c:1188 -#, fuzzy +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" -msgstr "Tabblad _sluiten" +msgstr "Ge_sloten tabbladen" -#: ../midori/midori-browser.c:4643 ../extensions/web-cache.c:415 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Web tijdelijke opslag" -#: ../midori/midori-browser.c:4651 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Privégegevens wissen bij het _afsluiten van Midori" -#: ../midori/midori-browser.c:4747 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Een lichtgewicht webbrowser." -#: ../midori/midori-browser.c:4763 +#: ../midori/midori-browser.c:5168 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "" + +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "Timo Verbeek " -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Bestand" -#: ../midori/midori-browser.c:5047 ../midori/sokoke.c:1189 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nieuw _venster" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Nieuw venster openen" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Nieuw tabblad openen" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "P _rivé Browsen" -#: ../midori/midori-browser.c:5054 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Geen privé-data opslaan tijdens het browsen" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Bestand openen" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Opslaan naar bestand" -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:5514 #, fuzzy msgid "Add to Speed _dial" msgstr "Toevoegen aan Speed _dial" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5515 #, fuzzy msgid "Add shortcut to speed dial" msgstr "Voeg snelkoppeling toe aan Speed Dial" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Voeg Snelkoppeling aan _desktop" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5518 #, fuzzy msgid "Add shortcut to the desktop" msgstr "Voeg snelkoppeling naar het bureaublad" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Aanmelden aan deze Nieuws _feed" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Aanmelden aan deze nieuws feed" -#: ../midori/midori-browser.c:5075 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "Tabblad _sluiten" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Huidig tabblad sluiten" -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Venster _sluiten" -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Dit venster sluiten" -#: ../midori/midori-browser.c:5082 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Huidige pagina uitprinten" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Programma afsluiten" -#: ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Bewerken" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Maak de laatste wijziging ongedaan" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5545 #, fuzzy msgid "Redo the last modification" msgstr "Opnieuw de laatste wijziging maken" -#: ../midori/midori-browser.c:5098 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Geselecteerde tekst knippen" -#: ../midori/midori-browser.c:5101 ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Geselecteerde tekst kopiëren" -#: ../midori/midori-browser.c:5107 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Tekst van het klembord plakken" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Geselecteerde tekst verwijderen" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Alle tekst selecteren" -#: ../midori/midori-browser.c:5116 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Zoek naar een woord of zin in deze pagina" -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Vo_lgende zoeken" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Volgende voorkomen van een woord of zin opzoeken" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Vorige voorkomen van een woord of zin opzoeken" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Voorkeuren instellen" -#: ../midori/midori-browser.c:5128 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Beeld" -#: ../midori/midori-browser.c:5129 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Werkbalken" -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Zoomniveau verhogen" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Zoomniveau verlagen" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Zoomniveau op beginwaarde" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:5599 #, fuzzy msgid "_Encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-browser.c:5150 +#: ../midori/midori-browser.c:5601 #, fuzzy msgid "View So_urce" msgstr "_Bron bekijken" -#: ../midori/midori-browser.c:5151 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Broncode van deze pagina bekijken" -#: ../midori/midori-browser.c:5154 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Volledig scherm" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:5608 +msgid "Scroll _Left" +msgstr "" + +#: ../midori/midori-browser.c:5609 +#, fuzzy +msgid "Scroll to the left" +msgstr "Overschakelen naar het volgende tabblad" + +#: ../midori/midori-browser.c:5611 +msgid "Scroll _Down" +msgstr "" + +#: ../midori/midori-browser.c:5612 +msgid "Scroll down" +msgstr "" + +#: ../midori/midori-browser.c:5614 +msgid "Scroll _Up" +msgstr "" + +#: ../midori/midori-browser.c:5615 +msgid "Scroll up" +msgstr "" + +#: ../midori/midori-browser.c:5617 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:5618 +msgid "Scroll to the right" +msgstr "" + +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Ga naar" -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Terug naar de vorige pagina" -#: ../midori/midori-browser.c:5162 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Naar de volgende pagina" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5631 #, fuzzy msgid "Go to the previous sub-page" msgstr "Terug naar de vorige pagina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:5635 #, fuzzy msgid "Go to the next sub-page" msgstr "Naar de volgende pagina" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Naar de homepage" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Prullenbak leegmaken" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Verwijder de inhoud van de prullenbak" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:5643 #, fuzzy msgid "Undo _Close Tab" msgstr "Tabblad sluiten ongedaan maken" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Open het laatst gesloten tabblad" -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5650 #, fuzzy msgid "Add a new _folder" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:5186 +#: ../midori/midori-browser.c:5651 #, fuzzy msgid "Add a new bookmark folder" msgstr "Nieuwe bladwijzer toevoegen" -#: ../midori/midori-browser.c:5191 ../midori/midori-searchaction.c:500 +#: ../midori/midori-browser.c:5656 +#, fuzzy +msgid "_Export bookmarks" +msgstr "_Importeren bladwijzers" + +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." -#: ../midori/midori-browser.c:5195 +#: ../midori/midori-browser.c:5663 #, fuzzy msgid "_Clear Private Data" msgstr "_clear Privegegevens" -#: ../midori/midori-browser.c:5196 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." +msgstr "Privé data wissen..." + +#: ../midori/midori-browser.c:5668 +#, fuzzy +msgid "_Inspect Page" +msgstr "Pagina analyseren - %s" + +#: ../midori/midori-browser.c:5669 +msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5200 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "Vo_rig tabblad" -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Overschakelen naar het vorige tabblad" -#: ../midori/midori-browser.c:5203 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-browser.c:5204 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Overschakelen naar het volgende tabblad" -#: ../midori/midori-browser.c:5206 -#, fuzzy +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" -msgstr "Huidig tabblad" +msgstr "Focus _huidig tabblad" -#: ../midori/midori-browser.c:5207 -#, fuzzy +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" -msgstr "Huidig tabblad sluiten" +msgstr "Focus op huidig tabblad" -#: ../midori/midori-browser.c:5209 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:5684 #, fuzzy msgid "Open the tabs saved in the last session" msgstr "Open de huidige pagina in het paginavak" -#: ../midori/midori-browser.c:5212 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Hulp" -#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Inhoud" -#: ../midori/midori-browser.c:5215 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Documentatie weergeven" -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5691 #, fuzzy msgid "_Frequent Questions" msgstr "_Veelgestelde vragen" -#: ../midori/midori-browser.c:5218 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Veelgestelde vragen weergeven" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5694 #, fuzzy msgid "_Report a Bug" msgstr "Fouten _melden" -#: ../midori/midori-browser.c:5221 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Open Midori's foutmelder" -#: ../midori/midori-browser.c:5224 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Informatie over dit programma weergeven" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Menubalk" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "_Navigatiebalk" -#: ../midori/midori-browser.c:5236 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "_Paneel" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "_Paneel weergeven" -#: ../midori/midori-browser.c:5243 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "_Bladwijzerbalk" -#: ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "Bestands_overdrachten-balk" -#: ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Bestandsoverdrachten-balk weergeven" -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Statusbalk" -#: ../midori/midori-browser.c:5252 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:5262 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinees (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:5266 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5742 #, fuzzy msgid "Japanese (SHIFT__JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-browser.c:5269 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "" -#: ../midori/midori-browser.c:5272 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5275 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5278 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" -#: ../midori/midori-browser.c:5832 +#: ../midori/midori-browser.c:6300 #, fuzzy msgid "_Separator" msgstr "Scheidingsteken" -#: ../midori/midori-browser.c:5839 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Locatie..." -#: ../midori/midori-browser.c:5841 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Open een locatie" -#: ../midori/midori-browser.c:5865 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "Zoeken op het _web..." -#: ../midori/midori-browser.c:5867 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Doorzoek het web" -#: ../midori/midori-browser.c:5888 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Heropen een eerder gesloten tabblad of venster" -#: ../midori/midori-browser.c:5903 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Recent bezochte pagina's" -#: ../midori/midori-browser.c:5905 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Eerder bezochte pagina's heropenen" -#: ../midori/midori-browser.c:5920 ../midori/sokoke.c:1178 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Bladwijzers" -#: ../midori/midori-browser.c:5922 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Opgeslagen bladwijzers weergeven" -#: ../midori/midori-browser.c:5937 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Hulpmiddelen" -#: ../midori/midori-browser.c:5950 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Venster" -#: ../midori/midori-browser.c:5952 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Geef een lijst met open tabbladen weer" -#: ../midori/midori-browser.c:5966 +#: ../midori/midori-browser.c:6434 #, fuzzy msgid "_Menu" msgstr "_Menubalk" -#: ../midori/midori-browser.c:5968 +#: ../midori/midori-browser.c:6436 #, fuzzy msgid "Menu" msgstr "_Menubalk" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6172 +#: ../midori/midori-browser.c:6640 #, fuzzy msgid "_Inline Find:" msgstr "_Ingebed zoeken:" -#: ../midori/midori-browser.c:6203 -#, fuzzy +#: ../midori/midori-browser.c:6671 msgid "Previous" -msgstr "Vo_rig tabblad" +msgstr "Vorig" -#: ../midori/midori-browser.c:6208 -#, fuzzy +#: ../midori/midori-browser.c:6676 msgid "Next" -msgstr "Tekst" +msgstr "Volgend" -#: ../midori/midori-browser.c:6213 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Hoofdlettergevoelig" -#: ../midori/midori-browser.c:6222 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Gevonden items markeren" -#: ../midori/midori-browser.c:6234 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Zoekbalk sluiten" -#: ../midori/midori-browser.c:6280 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "" -#: ../midori/midori-browser.c:6638 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" +#: ../midori/midori-locationaction.c:377 +#, fuzzy, c-format +msgid "Failed to select from history\n" +msgstr "Kan geschiedenis niet wissen: %s\n" + +#: ../midori/midori-locationaction.c:459 +#, fuzzy, c-format +msgid "Search for %s" +msgstr "Zoek met %s" + +#: ../midori/midori-locationaction.c:482 +#, c-format +msgid "Search with %s" +msgstr "Zoek met %s" + +#: ../midori/midori-locationaction.c:1197 +#, fuzzy, c-format +msgid "Failed to execute database statement\n" +msgstr "Kan database niet uitvoeren:% s \\ n" + #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1142 +#: ../midori/midori-locationaction.c:1254 msgid "Paste and p_roceed" msgstr "" -#: ../midori/midori-panel.c:431 ../midori/midori-panel.c:433 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:443 ../midori/midori-panel.c:445 -#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "" -#: ../midori/midori-panel.c:455 ../midori/midori-panel.c:456 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Paneel sluiten" -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "" -#: ../midori/midori-panel.c:796 -msgid "Show operating _controls" -msgstr "" +#: ../midori/midori-panel.c:797 +#, fuzzy +msgid "Hide operating controls" +msgstr "Informatie over dit programma weergeven" #: ../midori/midori-websettings.c:204 #, fuzzy @@ -1068,526 +1184,572 @@ msgid "Text beside icons" msgstr "" #: ../midori/midori-websettings.c:279 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:280 +#, fuzzy +msgid "HTTP proxy server" +msgstr "HTTP proxy" + +#: ../midori/midori-websettings.c:281 +msgid "No proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Alle koekies" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Sessie-koekies" -#: ../midori/midori-websettings.c:281 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:652 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Geen" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:315 #, fuzzy msgid "iPhone" msgstr "Geen" -#: ../midori/midori-websettings.c:299 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:300 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../midori/midori-websettings.c:354 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "Laatst gebruiken venstergrootte onthouden" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:363 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Laatst gebruikte positie van paneel" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Laatst gebruikte positie van paneel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:427 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:436 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:486 #, fuzzy msgid "Show Transferbar" msgstr "Bestandsoverdrachten-balk weergeven" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:487 #, fuzzy msgid "Whether to show the transferbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:505 #, fuzzy msgid "Toolbar Style:" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:489 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:522 #, fuzzy msgid "Show progress in location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:523 #, fuzzy msgid "Whether to show loading progress in the location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Items in de werkbalk" -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "Items om weer te geven in de werkbalk" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Compact paneel" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "Het paneel compact weergeven" -#: ../midori/midori-websettings.c:555 +#: ../midori/midori-websettings.c:572 #, fuzzy msgid "Show operating controls of the panel" msgstr "Informatie over dit programma weergeven" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:573 #, fuzzy msgid "Whether to show the operating controls of the panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:589 #, fuzzy msgid "Whether to align the sidepanel on the right" msgstr "Het paneel compact weergeven" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:604 #, fuzzy msgid "Open panels in separate windows" msgstr "Nieuw venster openen" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:605 #, fuzzy msgid "Whether to always open panels in separate windows" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:615 #, fuzzy msgid "What to do when Midori starts" msgstr "Wat geladen moet worden tijdens het opstarten" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:624 #, fuzzy msgid "Homepage:" msgstr "Homepage" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:658 #, fuzzy msgid "Show speed dial in newly opened tabs" msgstr "Geef een lijst met open tabbladen weer" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:666 #, fuzzy msgid "Save downloaded files to:" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:667 #, fuzzy msgid "The folder downloaded files are saved to" msgstr "De map waar gedownloadede de bestanden worden opgeslagen" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:692 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "Downloadbeheer" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "Extern downloadbeheer" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Tekstbewerker" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Een externe tekstbewerker" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:747 #, fuzzy msgid "An external news aggregator" msgstr "Een externe tekstbewerker" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "Zoeken vanuit locatieveld" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Balk met tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:793 #, fuzzy msgid "Open new pages in:" msgstr "Nieuwe pagina's openen in" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Waar nieuwe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:803 #, fuzzy msgid "Open external pages in:" msgstr "Externe pagina's openen in" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "Waar externe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Middel-klikken opent selectie" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:814 #, fuzzy msgid "Load an address from the selection via middle click" msgstr "Laad een URL vanuit de selectie met een klik op de middelste muisknop" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:834 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:852 #, fuzzy msgid "Load and display images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-websettings.c:842 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Scripts aanzetten" -#: ../midori/midori-websettings.c:843 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 #, fuzzy msgid "Enable Netscape plugins" msgstr "Plugins aanzetten" -#: ../midori/midori-websettings.c:851 +#: ../midori/midori-websettings.c:868 #, fuzzy msgid "Enable embedded Netscape plugin objects" msgstr "Plugins aanzetten" #: ../midori/midori-websettings.c:884 -msgid "Zoom Text and Images" +msgid "Enable HTML5 database support" msgstr "" #: ../midori/midori-websettings.c:885 +msgid "Whether to enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:891 +msgid "Enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:892 +msgid "Whether to enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:900 +#, fuzzy +msgid "Enable offline web application cache" +msgstr "Uitvoeren als _web toepassing" + +#: ../midori/midori-websettings.c:901 +msgid "Whether to enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:926 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:927 #, fuzzy msgid "Whether to zoom text and images" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:916 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:917 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:925 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Koekies accepteren" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Welke soorten koekies geaccepteerd moeten worden" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Alleen originele koekies" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "Alleen koekies accepteren van de originele website" -#: ../midori/midori-websettings.c:951 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "Maximale leeftijd van koekies" -#: ../midori/midori-websettings.c:952 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "Hoeveel dagen een koekie maximaal bewaard mag worden" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:970 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:978 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "Dagen in geschiedenis" -#: ../midori/midori-websettings.c:979 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" -#: ../midori/midori-websettings.c:987 +#: ../midori/midori-websettings.c:1029 #, fuzzy msgid "Remember last downloaded files" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:988 +#: ../midori/midori-websettings.c:1030 #, fuzzy msgid "Whether the last downloaded files are saved" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:998 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:1047 +msgid "Proxy server" msgstr "" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:1048 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:1057 +#, fuzzy +msgid "HTTP Proxy Server" +msgstr "HTTP proxy" + +#: ../midori/midori-websettings.c:1058 #, fuzzy msgid "The proxy server used for HTTP connections" msgstr "De gebruikte proxy voor HTTP-verbindingen" -#: ../midori/midori-websettings.c:1014 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:1015 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:1032 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1064 +#: ../midori/midori-websettings.c:1123 #, fuzzy msgid "Preferred languages" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:1065 +#: ../midori/midori-websettings.c:1124 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1080 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "" -#: ../midori/midori-websettings.c:1081 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "" @@ -1595,465 +1757,476 @@ msgstr "" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:953 ../midori/midori-view.c:4127 -#: ../midori/midori-view.c:4131 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 +#: ../midori/midori-view.c:4544 #, c-format msgid "Error - %s" msgstr "" -#: ../midori/midori-view.c:954 +#: ../midori/midori-view.c:1262 #, fuzzy, c-format msgid "The page '%s' couldn't be loaded." msgstr "Pictogram '%s' kan niet geladen worden" -#: ../midori/midori-view.c:959 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:992 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1210 ../midori/midori-view.c:2066 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "" -#: ../midori/midori-view.c:1835 ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:1887 ../midori/midori-view.c:1965 -#, fuzzy -msgid "Open _Link" -msgstr "Bestand openen" - -#: ../midori/midori-view.c:1890 ../midori/midori-view.c:1967 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Link in nieuw _tabblad openen" -#: ../midori/midori-view.c:1894 +#: ../midori/midori-view.c:2195 #, fuzzy msgid "Open Link in _Foreground Tab" msgstr "Link in nieuw _tabblad openen" -#: ../midori/midori-view.c:1895 +#: ../midori/midori-view.c:2196 #, fuzzy msgid "Open Link in _Background Tab" msgstr "Link in nieuw _tabblad openen" -#: ../midori/midori-view.c:1898 ../midori/midori-view.c:1974 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 #, fuzzy msgid "Open Link in New _Window" msgstr "In nieuw _venster openen" -#: ../midori/midori-view.c:1901 +#: ../midori/midori-view.c:2202 #, fuzzy msgid "Open Link as Web A_pplication" msgstr "Link in nieuw _tabblad openen" -#: ../midori/midori-view.c:1904 +#: ../midori/midori-view.c:2205 #, fuzzy msgid "Copy Link de_stination" msgstr "Locatie _opslaan" -#: ../midori/midori-view.c:1907 ../midori/midori-view.c:1986 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "Locatie _opslaan" -#: ../midori/midori-view.c:1908 ../midori/midori-view.c:1980 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "Locatie _downloaden" -#: ../midori/midori-view.c:1912 ../midori/midori-view.c:1948 -#: ../midori/midori-view.c:1991 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 #, fuzzy msgid "Download with Download _Manager" msgstr "Downloadbeheer" -#: ../midori/midori-view.c:1924 +#: ../midori/midori-view.c:2222 #, fuzzy msgid "Open _Image in New Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-view.c:1927 -#, fuzzy -msgid "Open Image in New Wi_ndow" -msgstr "In nieuw _venster openen" - -#: ../midori/midori-view.c:1930 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "" -#: ../midori/midori-view.c:1933 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "" -#: ../midori/midori-view.c:1934 +#: ../midori/midori-view.c:2229 #, fuzzy msgid "Download I_mage" msgstr "Downloadbeheer" -#: ../midori/midori-view.c:1941 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "" -#: ../midori/midori-view.c:1944 +#: ../midori/midori-view.c:2239 #, fuzzy msgid "Save _Video" msgstr "Bestand opslaan als" -#: ../midori/midori-view.c:1944 +#: ../midori/midori-view.c:2239 #, fuzzy msgid "Download _Video" msgstr "Downloadmap" -#: ../midori/midori-view.c:2011 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "" -#: ../midori/midori-view.c:2046 ../midori/midori-view.c:2053 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:2074 +#: ../midori/midori-view.c:2365 #, fuzzy msgid "Open Address in New _Tab" msgstr "In nieuw _tabblad openen" -#: ../midori/midori-view.c:2360 +#: ../midori/midori-view.c:2661 #, fuzzy msgid "Open or download file" msgstr "Bestand openen" -#: ../midori/midori-view.c:2383 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:2386 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2390 +#: ../midori/midori-view.c:2687 #, fuzzy, c-format msgid "Open %s" msgstr "Bestand openen" -#: ../midori/midori-view.c:2905 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Pagina analyseren - %s" -#: ../midori/midori-view.c:3162 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "" -#: ../midori/midori-view.c:3163 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "" -#: ../midori/midori-view.c:3164 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "" -#: ../midori/midori-view.c:3165 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "" -#: ../midori/midori-view.c:3166 +#: ../midori/midori-view.c:3517 #, fuzzy msgid "Are you sure you want to delete this shortcut?" msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" -#: ../midori/midori-view.c:3196 +#: ../midori/midori-view.c:3518 +msgid "Set number of columns" +msgstr "" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns:" +msgstr "" + +#: ../midori/midori-view.c:3520 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3521 +msgid "Enter number of shortcuts:" +msgstr "" + +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:3213 +#: ../midori/midori-view.c:3570 #, fuzzy, c-format msgid "No documentation installed" msgstr "Documentatie weergeven" -#: ../midori/midori-view.c:3425 +#: ../midori/midori-view.c:3820 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-view.c:3668 +#: ../midori/midori-view.c:4080 msgid "_Duplicate Tab" msgstr "" -#: ../midori/midori-view.c:3673 +#: ../midori/midori-view.c:4085 #, fuzzy msgid "_Restore Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-view.c:3673 +#: ../midori/midori-view.c:4085 msgid "_Minimize Tab" msgstr "" -#: ../midori/midori-view.c:4299 +#: ../midori/midori-view.c:4091 +#, fuzzy +msgid "Close ot_her Tabs" +msgstr "Tabblad _sluiten" + +#: ../midori/midori-view.c:4763 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-view.c:4300 +#: ../midori/midori-view.c:4764 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4352 ../midori/midori-preferences.c:382 +#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Opties" #. Page "General" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:298 msgid "General" msgstr "Algemeen" -#: ../midori/midori-preferences.c:300 +#: ../midori/midori-preferences.c:299 msgid "Startup" msgstr "Opstarten" -#: ../midori/midori-preferences.c:315 ../midori/midori-preferences.c:322 +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 #, fuzzy msgid "Use current page as homepage" msgstr "Open de huidige pagina in het paginavak" -#: ../midori/midori-preferences.c:332 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Bestandsoverdrachten" #. Page "Appearance" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:349 msgid "Appearance" msgstr "Weergave" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:350 msgid "Font settings" msgstr "Lettertype" -#: ../midori/midori-preferences.c:353 +#: ../midori/midori-preferences.c:352 msgid "Default Font Family" msgstr "Standaard lettertype" -#: ../midori/midori-preferences.c:356 +#: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" msgstr "" -#: ../midori/midori-preferences.c:359 +#: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:361 +#: ../midori/midori-preferences.c:360 #, fuzzy msgid "Fixed-width Font Family" msgstr "Standaard lettertype" -#: ../midori/midori-preferences.c:364 +#: ../midori/midori-preferences.c:363 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:367 +#: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" msgstr "Minimale lettergrootte" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-preferences.c:380 msgid "Behavior" msgstr "Gedrag" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:393 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:395 +#: ../midori/midori-preferences.c:394 msgid "Enforce a video dot density of 96 DPI" msgstr "" #: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "" + +#: ../midori/midori-preferences.c:415 +#, fuzzy +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Pop-ups in tabbladen openen" + +#: ../midori/midori-preferences.c:419 msgid "Spell Checking" msgstr "" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:422 #, fuzzy msgid "Enable Spell Checking" msgstr "Plugins aanzetten" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:423 msgid "Enable spell checking while typing" msgstr "" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Spelling dictionaries:" msgstr "" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:424 +#: ../midori/midori-preferences.c:429 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:430 +#: ../midori/midori-preferences.c:435 msgid "Interface" msgstr "Gebruik" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:436 msgid "Navigationbar" msgstr "Navigatiebalk" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:446 msgid "Browsing" msgstr "Browsen" #. Page "Applications" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:468 #, fuzzy msgid "Applications" msgstr "Programma afsluiten" -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:469 #, fuzzy msgid "External applications" msgstr "Programma afsluiten" #. Page "Network" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 msgid "Network" msgstr "Netwerk" +#: ../midori/midori-preferences.c:492 +msgid "Hostname" +msgstr "" + #. Page "Privacy" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:511 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:512 msgid "Web Cookies" msgstr "Koekies" -#: ../midori/midori-preferences.c:515 ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" msgstr "dagen" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Zoekmachine toevoegen" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:917 msgid "Edit search engine" msgstr "Zoekmachine bewerken" -#: ../midori/midori-searchaction.c:951 +#: ../midori/midori-searchaction.c:945 msgid "_Name:" msgstr "_Naam:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:989 #, fuzzy msgid "_Icon:" msgstr "Pictogrammen" -#: ../midori/midori-searchaction.c:1009 +#: ../midori/midori-searchaction.c:1003 msgid "_Token:" msgstr "_Trefwoord:" -#: ../midori/midori-searchaction.c:1240 +#: ../midori/midori-searchaction.c:1234 #, fuzzy msgid "Manage Search Engines" msgstr "_Zoekmachines beheren" -#: ../midori/midori-searchaction.c:1341 +#: ../midori/midori-searchaction.c:1335 msgid "Use as _default" msgstr "" -#: ../midori/sokoke.c:1177 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Bladwijzer" -#: ../midori/sokoke.c:1179 +#: ../midori/sokoke.c:1296 #, fuzzy msgid "Add Boo_kmark" msgstr "Bladwijzer _toevoegen" -#: ../midori/sokoke.c:1180 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:1181 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Extensies" -#: ../midori/sokoke.c:1182 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Geschiedenis" -#: ../midori/sokoke.c:1183 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "_Homepage" -#: ../midori/sokoke.c:1184 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "Gebruikers_scripts" -#: ../midori/sokoke.c:1185 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Nieuw _tabblad" -#: ../midori/sokoke.c:1186 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "Bestands_overdrachten" -#: ../midori/sokoke.c:1187 +#: ../midori/sokoke.c:1304 #, fuzzy msgid "Netscape p_lugins" msgstr "Plugins aanzetten" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Gebruikersscripts" +#: ../midori/sokoke.c:1307 +#, fuzzy +msgid "New _Folder" +msgstr "Nieuwe map" -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Gebruikersopmaakprofielen" - -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "" - -#: ../panels/midori-addons.c:911 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "" - -#: ../panels/midori-bookmarks.c:112 +#: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../panels/midori-bookmarks.c:251 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Geselecteerde bladwijzer bewerken" -#: ../panels/midori-bookmarks.c:259 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" -#: ../panels/midori-bookmarks.c:279 +#: ../panels/midori-bookmarks.c:262 #, fuzzy msgid "Add a new folder" msgstr "Nieuwe bladwijzer toevoegen" -#: ../panels/midori-bookmarks.c:609 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Scheidingsteken" @@ -2061,188 +2234,252 @@ msgstr "Scheidingsteken" msgid "Console" msgstr "Console" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensies" -#: ../panels/midori-history.c:162 -msgid "Are you sure you want to remove all history items?" -msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" - -#: ../panels/midori-history.c:217 -msgid "Bookmark the selected history item" -msgstr "Geselecteerde item uit geschiedenis toevoegen als bladwijzer" - -#: ../panels/midori-history.c:226 -msgid "Delete the selected history item" -msgstr "Geselecteerde item uit geschiedenis verwijderen" - -#: ../panels/midori-history.c:234 -msgid "Clear the entire history" -msgstr "Volledige geschiedenis wissen" - -#: ../panels/midori-history.c:598 +#: ../panels/midori-history.c:273 msgid "Erroneous clock time" msgstr "" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:274 msgid "The clock time lies in the past. Please check the current date and time." msgstr "" -#: ../panels/midori-history.c:611 +#: ../panels/midori-history.c:286 msgid "A week ago" msgstr "Eén week geleden" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:288 #, fuzzy, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dagen geleden" msgstr[1] "%d dagen geleden" -#: ../panels/midori-history.c:624 +#: ../panels/midori-history.c:291 msgid "Today" msgstr "Vandaag" -#: ../panels/midori-history.c:626 +#: ../panels/midori-history.c:293 msgid "Yesterday" msgstr "Gisteren" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" + +#: ../panels/midori-history.c:437 +msgid "Bookmark the selected history item" +msgstr "Geselecteerde item uit geschiedenis toevoegen als bladwijzer" + +#: ../panels/midori-history.c:446 +msgid "Delete the selected history item" +msgstr "Geselecteerde item uit geschiedenis verwijderen" + +#: ../panels/midori-history.c:454 +msgid "Clear the entire history" +msgstr "Volledige geschiedenis wissen" + +#: ../panels/midori-history.c:952 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +#, fuzzy +msgid "Filter:" +msgstr "_Map:" + +#: ../panels/midori-transfers.c:478 #, fuzzy msgid "Open Destination _Folder" msgstr "Openen in _paginavak" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "" -#: ../katze/katze-http-auth.c:209 +#: ../katze/katze-http-auth.c:214 msgid "Authentication Required" msgstr "" -#: ../katze/katze-http-auth.c:225 +#: ../katze/katze-http-auth.c:230 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -#: ../katze/katze-http-auth.c:239 +#: ../katze/katze-http-auth.c:244 msgid "Username" msgstr "" -#: ../katze/katze-http-auth.c:252 +#: ../katze/katze-http-auth.c:257 msgid "Password" msgstr "" -#: ../katze/katze-http-auth.c:266 +#: ../katze/katze-http-auth.c:272 #, fuzzy msgid "_Remember password" msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Pictogram '%s' kan niet geladen worden" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Standaardpictogram '%s' kan niet geladen worden" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "Film-frames werken niet " -#: ../katze/katze-utils.c:487 ../katze/katze-utils.c:878 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschap '%s' is ongeldig voor %s" -#: ../katze/katze-utils.c:533 ../katze/katze-utils.c:562 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Bestand kiezen" -#: ../katze/katze-utils.c:548 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Map kiezen" -#: ../katze/katze-preferences.c:91 +#: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" msgstr "Voorkeuren voor %s" -#: ../extensions/adblock.c:362 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "" -#: ../extensions/adblock.c:394 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "" -#: ../extensions/adblock.c:534 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/adblock.c:1285 +#: ../extensions/adblock.c:841 +#, fuzzy +msgid "Edit rule" +msgstr "Edit map" + +#: ../extensions/adblock.c:854 +#, fuzzy +msgid "_Rule:" +msgstr "_Titel:" + +#: ../extensions/adblock.c:908 +#, fuzzy +msgid "Bl_ock image" +msgstr "Blanco pagina" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "" + +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1286 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "" -#: ../extensions/colorful-tabs.c:136 +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "" + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Gebruikersscripts" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Gebruikersopmaakprofielen" + +#: ../extensions/addons.c:1085 +#, fuzzy, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "De instellingen kunnen niet worden opgeslagen. %s" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:204 #, fuzzy msgid "Colorful Tabs" msgstr "Tabblad _sluiten" -#: ../extensions/colorful-tabs.c:137 +#: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:80 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:56 #, fuzzy msgid "Cookie Manager" msgstr "Downloadbeheer" -#: ../extensions/cookie-manager/cookie-manager-page.c:110 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:112 +#: ../extensions/cookie-manager/cookie-manager-page.c:114 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:127 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:134 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:510 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 #, fuzzy msgid "Do you really want to delete all cookies?" msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" -#: ../extensions/cookie-manager/cookie-manager-page.c:512 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:521 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:609 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 #, fuzzy msgid "At the end of the session" msgstr "Bekijk de broncode van de geselecteerde tekst" -#: ../extensions/cookie-manager/cookie-manager-page.c:612 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2253,41 +2490,36 @@ msgid "" "Expires: %s" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:618 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:618 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 #, fuzzy msgid "No" msgstr "Geen" -#: ../extensions/cookie-manager/cookie-manager-page.c:632 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:962 +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 #, fuzzy msgid "Name" msgstr "_Naam:" -#: ../extensions/cookie-manager/cookie-manager-page.c:1015 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:1023 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "" -#: ../extensions/cookie-manager/cookie-manager-page.c:1076 -#, fuzzy -msgid "Filter:" -msgstr "_Map:" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1081 +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "" @@ -2300,35 +2532,35 @@ msgstr "Downloadbeheer" msgid "List, view and delete cookies" msgstr "" -#: ../extensions/feed-panel/feed-atom.c:237 +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/feed-atom.c:343 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "" -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:670 #, fuzzy msgid "Feeds" msgstr "Opties" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:727 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "" @@ -2363,56 +2595,56 @@ msgstr "" msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 #, fuzzy msgid "Feed Panel" msgstr "Paneel weergeven" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "" -#: ../extensions/formhistory.c:140 +#: ../extensions/formhistory.c:144 #, fuzzy, c-format msgid "Failed to add form value: %s\n" msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" -#: ../extensions/formhistory.c:501 +#: ../extensions/formhistory.c:510 msgid "Stores history of entered form data" msgstr "" -#: ../extensions/formhistory.c:505 +#: ../extensions/formhistory.c:514 #, c-format msgid "Not available: %s" msgstr "" -#: ../extensions/formhistory.c:506 +#: ../extensions/formhistory.c:515 msgid "Resource files not installed" msgstr "" -#: ../extensions/formhistory.c:512 +#: ../extensions/formhistory.c:521 msgid "Form history filler" msgstr "" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "" @@ -2467,68 +2699,76 @@ msgstr "_Statusbalk" msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 #, fuzzy msgid "Tab Panel" msgstr "Paneel weergeven" -#: ../extensions/tab-panel.c:606 +#: ../extensions/tab-panel.c:609 #, fuzzy msgid "T_ab Panel" msgstr "Paneel weergeven" -#: ../extensions/tab-panel.c:623 +#: ../extensions/tab-panel.c:626 #, fuzzy msgid "Show tabs in a vertical panel" msgstr "_Paneel weergeven" -#: ../extensions/tab-switcher.c:394 +#: ../extensions/tab-switcher.c:395 #, fuzzy msgid "Tab History List" msgstr "Geschiedenis" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "" -#: ../extensions/toolbar-editor.c:407 +#: ../extensions/toolbar-editor.c:405 msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:421 msgid "Available Items" msgstr "" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:442 msgid "Displayed Items" msgstr "" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:577 #, fuzzy msgid "Customize _Toolbar..." msgstr "Aangepast..." -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:608 #, fuzzy msgid "Toolbar Editor" msgstr "Stijl van de werkbalk" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:609 msgid "Easily edit the toolbar layout" msgstr "" -#: ../extensions/toolbar-editor.c:617 -msgid "Not available on this platform" -msgstr "" - -#: ../extensions/web-cache.c:416 +#: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "" +#~ msgid "Failed to get current time: %s\n" +#~ msgstr "Kan de tijd niet verkrijgen: %s\n" + +#~ msgid "Failed to add history item: %s\n" +#~ msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" + +#~ msgid "Open _Link" +#~ msgstr "Bestand openen" + +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "In nieuw _venster openen" + #~ msgid "User_styles" #~ msgstr "Gebruikers_opmaakprofielen" @@ -2622,9 +2862,6 @@ msgstr "" #~ msgid "[URIs]" #~ msgstr "[URI's]" -#~ msgid "HTTP Proxy" -#~ msgstr "HTTP proxy" - #~ msgid "URIs" #~ msgstr "URI's" From 10304fd6e2ac448e118898f06c48302c9971a976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Mon, 31 May 2010 13:03:34 +0200 Subject: [PATCH 2648/2970] l10n: Updated Croatian (hr) translation to 63% New status: 398 messages complete with 4 fuzzies and 220 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 973 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 503 insertions(+), 470 deletions(-) diff --git a/po/hr.po b/po/hr.po index 9fad79ab..8c8295e3 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,20 +2,19 @@ # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 16:06+0000\n" +"POT-Creation-Date: 2010-05-31 10:08+0000\n" "PO-Revision-Date: 2010-05-27 17:57+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" @@ -23,7 +22,7 @@ msgstr "Lagani web preglednik" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" @@ -84,14 +83,11 @@ msgid "The session couldn't be saved. %s" msgstr "Sesija ne može biti spremljena %s" #: ../midori/main.c:868 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" #: ../midori/main.c:958 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "" #: ../midori/main.c:973 @@ -113,7 +109,7 @@ msgstr "Sesija ne može biti učitana: %s\n" #: ../midori/main.c:1336 msgid "No filename specified" -msgstr "NIje određeno ime datoteke" +msgstr "Nije navedeno ime datoteke" #: ../midori/main.c:1355 msgid "An unknown error occured." @@ -247,781 +243,801 @@ msgstr "" msgid "Writing failed." msgstr "" -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Naslov" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Opis" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Mapa" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:862 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Dodaj u Brzo_biranje" + +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +msgid "Some files are being downloaded" +msgstr "" + +#: ../midori/midori-browser.c:1921 +#, fuzzy +msgid "_Quit Midori" +msgstr "Midori" + +#: ../midori/midori-browser.c:1923 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prazno" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otvori sve u _Karticama" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otvori u novoj_kartici" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otvori u novom_prozoru" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Uvezi zabilješke" -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Aplikacija" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Prilagođeno" -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5096 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." +#: ../midori/midori-browser.c:5168 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "Ivica Kolić ikoli@yahoo.com" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Novi_prozor" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Ne spremaj privatne podatke dok pregledavaš" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo_biranje" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Isključi program" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Izreži označenii tekst" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Nađ i_Slijedeće" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Dodaj novu_mapu" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Otvori kartice spremljene u posljednjoj sesiji" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Lokacija" -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Web pretraživanje" -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Nedavno posjećene stranice" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Izbornik" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Prethodno" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Slijedeće" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "" @@ -1051,617 +1067,615 @@ msgstr "" msgid "Paste and p_roceed" msgstr "Zalijepi i n_astavi" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Zatvori panel" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Pokaži praznu stranicu" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Početno" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:261 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Tekst ispod ikona" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:280 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:281 msgid "No proxy server" -msgstr "" +msgstr "Nema proxy poslužitelja" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Svi kolačići" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Kolačići sesije" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Nijedan" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:315 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:379 msgid "Last window width" msgstr "Zadnja širina prozora" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" msgstr "Zadnja sačuvana širina prozora" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:388 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Zadnja pozicija panela" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" msgstr "Zadnja spremljena pozicija panela" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:425 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:433 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:434 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:443 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:444 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:452 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:453 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:461 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:462 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:470 msgid "Show Panel" msgstr "Pokaži panel" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:604 msgid "Open panels in separate windows" msgstr "Otvori panele u zasebnim prozorima" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:605 msgid "Whether to always open panels in separate windows" msgstr "" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Kad se Midori pokrene" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" -msgstr "Što uraditi kad se Midori pokrene" +msgstr "Što učiniti kad se Midori pokrene" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" msgstr "Početna stranica" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" msgstr "Pokaži brzo biranje u novim karticama" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" msgstr "Pokaži brzo biranje u novootvorenim karticama" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" msgstr "Pitaj za odredišni direktorij" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" -msgstr "" +msgstr "Obavijesti kad je prijenos kompletiran" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Otvori nove stranice u" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Otvori vanjske stranice u:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:852 msgid "Load and display images automatically" msgstr "Učitaj i prikaži slike automatski" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Omoogući Netscape priključke" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:868 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:900 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:901 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:958 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:959 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Prihvati kolačiće" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Koju vrstu kolačića prihvatiti" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Samo izvorne kolačiće" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" msgstr "Prihvati kolačiće samo sa izvorne web stranice" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Zapamti zadnju posjećenu stranicu" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "Zapamti zadnje preuzete datoteke" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1047 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1048 msgid "The type of proxy server to use" msgstr "" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1057 msgid "HTTP Proxy Server" msgstr "HTTP Proxy poslužitelj" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1123 msgid "Preferred languages" msgstr "" -#: ../midori/midori-websettings.c:1129 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1124 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" @@ -1669,197 +1683,214 @@ msgstr "Privatni podaci odabrani za brisanje" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1190 ../midori/midori-view.c:4489 -#: ../midori/midori-view.c:4493 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 +#: ../midori/midori-view.c:4544 #, c-format msgid "Error - %s" msgstr "Greška %s" -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stranica '%s ne može biti učitana" -#: ../midori/midori-view.c:1196 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Pokušaj ponovo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:1474 ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Pošalji poruku %s" -#: ../midori/midori-view.c:2093 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2215 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj_kartici" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u pozadinskoj_kartici" -#: ../midori/midori-view.c:2153 ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom_prozoru" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Otvori poveznicu kao Web A_plikaciju" -#: ../midori/midori-view.c:2159 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Kopiraj odredište po_veznice" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2234 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Spremi odredište poveznice" -#: ../midori/midori-view.c:2163 ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:2167 ../midori/midori-view.c:2197 -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2179 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Kopiraj adresu _slike" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Sačuvaj S_liku" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Preuzmi S_liku" -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2291 ../midori/midori-view.c:2298 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj_kartici" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Tip datoteke: '%s'" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2642 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečace" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:3459 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:3496 +#: ../midori/midori-view.c:3518 +msgid "Set number of columns" +msgstr "" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns:" +msgstr "" + +#: ../midori/midori-view.c:3520 +msgid "Set number of shortcuts" +msgstr "" + +#: ../midori/midori-view.c:3521 +#, fuzzy +msgid "Enter number of shortcuts:" +msgstr "Unesi adresu prečaca" + +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "Dokument ne može biti prikazan" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "" -#: ../midori/midori-view.c:3769 +#: ../midori/midori-view.c:3820 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4080 msgid "_Duplicate Tab" msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4085 msgid "_Restore Tab" msgstr "_Obnovi karticu" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4085 msgid "_Minimize Tab" msgstr "_Minimiziraj karticu" -#: ../midori/midori-view.c:4040 +#: ../midori/midori-view.c:4091 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4763 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:4662 +#: ../midori/midori-view.c:4764 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4714 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 msgid "Features" msgstr "" @@ -1960,9 +1991,7 @@ msgstr "Pravopisni rječnici" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "" #. Page "Interface" @@ -2077,23 +2106,28 @@ msgstr "_Prijenosi" msgid "Netscape p_lugins" msgstr "Netscape p_riključci" +#: ../midori/sokoke.c:1307 +#, fuzzy +msgid "New _Folder" +msgstr "Nova mapa" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Zabilješke" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Uredi odabrane zabilješke" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Izbriši odabrane zabilješke" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Dodaj novu mapu" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Razdjelnik" @@ -2101,6 +2135,14 @@ msgstr "Razdjelnik" msgid "Console" msgstr "" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Proširenja" @@ -2110,8 +2152,7 @@ msgid "Erroneous clock time" msgstr "" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." +msgid "The clock time lies in the past. Please check the current date and time." msgstr "" #: ../panels/midori-history.c:286 @@ -2122,9 +2163,9 @@ msgstr "Prije tjedan dana" #, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "% d dan prije" +msgstr[1] "% d dana prije" +msgstr[2] "% d dana prije" #: ../panels/midori-history.c:291 msgid "Today" @@ -2138,28 +2179,28 @@ msgstr "Jučer" msgid "Are you sure you want to remove all history items?" msgstr "Jeste li sigurni da želite ukloniti sve stavke povijesti?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Zabilježi odabranu stavku povijesti" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Izbriši odabranu stavku povijesti" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Obriši cijelu povijest" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Otvori odredišni _direktorij" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "" @@ -2219,42 +2260,40 @@ msgstr "Izaberi mapu" msgid "Preferences for %s" msgstr "Osobitosti za %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "" -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "" -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Uredi pravilo" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Pravilo" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_okiraj sliku" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "" @@ -2307,9 +2346,7 @@ msgid "Delete All" msgstr "Izbriši sve" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:129 @@ -2377,9 +2414,7 @@ msgid "_Collapse All" msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "" #: ../extensions/cookie-manager/main.c:40 @@ -2399,25 +2434,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "" -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "" @@ -2452,25 +2487,25 @@ msgstr "" msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Greška" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "" @@ -2555,11 +2590,11 @@ msgstr "" #: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" -msgstr "" +msgstr "Kartica ploče" #: ../extensions/tab-panel.c:609 msgid "T_ab Panel" -msgstr "" +msgstr "K_artica ploče" #: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" @@ -2567,7 +2602,7 @@ msgstr "" #: ../extensions/tab-switcher.c:395 msgid "Tab History List" -msgstr "" +msgstr "Kartica lista povijesti" #: ../extensions/tab-switcher.c:396 msgid "Allows to switch tabs by choosing from a list sorted by last usage" @@ -2578,9 +2613,7 @@ msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" #: ../extensions/toolbar-editor.c:421 @@ -2601,7 +2634,7 @@ msgstr "Uređivač alatne trake" #: ../extensions/toolbar-editor.c:609 msgid "Easily edit the toolbar layout" -msgstr "" +msgstr "Jednostavno uređivanje izgleda alatnih traka" #: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" From 28a0361cffcd3e2b34cd9000ff028d996a29857a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayhan=20YAL=C3=87INSOY?= Date: Mon, 31 May 2010 20:15:04 +0200 Subject: [PATCH 2649/2970] l10n: Updated Turkish (tr) translation to 99% New status: 619 messages complete with 1 fuzzy and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/tr.po | 547 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 297 insertions(+), 250 deletions(-) diff --git a/po/tr.po b/po/tr.po index 71654aa9..be8122d7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-15 10:07+0000\n" +"POT-Creation-Date: 2010-05-31 16:08+0000\n" "PO-Revision-Date: 2010-05-10 09:45+0300\n" "Last-Translator: Ayhan YALÇINSOY \n" "Language-Team: Turkish \n" @@ -245,780 +245,803 @@ msgstr "Tanımlanmayan yer imi biçimi." msgid "Writing failed." msgstr "Yazma işlemi gerçekleştirilemedi." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Bu sayfayı yeniden yükle" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Bu sayfayı yüklemeyi durdur" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% yüklendi" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "İsim güncelleme hatası: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Beklenmedik eylem '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Yeni Dizin" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Klasörü düzenle" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Yeni yer imi" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Yer imini düzenle" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Başlık:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Açıklama:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "Adres:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Dizin:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Üst Seviye Dizin" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:862 +msgid "Add to _Speed Dial" +msgstr "_Hızlı aramaya Ekle" + +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Araç_çubuğunda göster" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "_Web uygulaması olarak çalıştır" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" indirmek için yeterli boş disk alanı yok." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Dosya %s ihtiyaç duyuyor ancak %s kaldı." -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s nin %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Dosya '%s' indirildi." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Aktarım tamamlandı" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Dosyayı kaydet" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#, fuzzy +msgid "Some files are being downloaded" +msgstr "Dosya '%s' indirildi." + +#: ../midori/midori-browser.c:1921 +msgid "_Quit Midori" +msgstr "Midori'den _çık" + +#: ../midori/midori-browser.c:1923 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Dosya aç" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Yeni kaynak" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Yeni bir yer imi ekle" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Veri tabanı ifadesi çalışma hatası: %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Boş" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Harici uygulama çalıştırılamadı." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Yeni geçmiş ögesi ekleme hatası: %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Hepsini _Sekmelerde aç" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Yeni _Sekmede Aç" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Yeni _Pencerede aç" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Yerimleri içe aktarılıyor..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "Yerimlerini içe aktar" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Uygulamadan:" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Özel..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Yerimlerini içe aktarma hatası" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Yer imlerini dışarı aktarma hatası" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Şu geçmiş öğesi silinemedi: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Kişisel Verileri Temizle" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Kişisel verileri temizle" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Aşağıdaki verileri temizle:" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Geçmiş" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Çerezler" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' çerezleri" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Websitesi simgeleri" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Sekmeleri _kapat" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Web Önbelleği" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Midori'den çıkıldığında kişisel verileri temizle" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Hafif bir web tarayıcı." -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Bu kütüphane özgür yazılımdır; GNU'nun -Özgür Yazılım Vakfı tarafından yayımlanan Genel Kamu Lisansı sürüm 2.1 veya (seçiminize bağlı) daha eski bir sürüm- şartları altında yeniden dağıtılabilir ve/veya değiştirilebilir. " -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "" "Mirat Can Bayrak \n" "Gökmen Görgen \n" "Ayhan YALÇINSOY " -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Dosya" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Yeni _Pencere" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Yeni bir pencerede aç" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Yeni bir sekmede aç" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "G_izli Gezinme" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Gezinirken hiç bir özel veriyi kaydetme" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Bir dosya aç" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Bir dosyaya kaydet" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Hızlı aramaya _ekle" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Hızlı aramaya kısayol ekle" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "_Masaüstüne Kısayol ekle" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Masaüstüne kısayol ekle" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Haber _kaynaksine üye ol" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Bu haber kaynaksine üye ol" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "Sekmeyi _kapat" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Geçerli sekmeyi kapat" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Pen_cereyi Kapat" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Bu pencereyi kapat" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Geçerli sayfayı yazdır" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Uygulamadan çık" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Düzenle" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Son değişikliği geri al" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Son değişikliği yeniden yap" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Seçili metni kes" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Seçili metni kopyala" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Metni panodan yapıştır" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Seçili metni sil" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Bütün metni seç" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Bir kelime yada ibareyi geçerli sayfada ara" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "So_nrakini Bul" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Kelime ya da ibarenin sonraki örneğini bul" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Öncekini Bu_l" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Kelime ya da ibarenin sonraki örneğini bul" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Uygulama tercihlerini yapılandır" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Görünüm" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Araç Çubukları" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Yakınlaştırma seviyesini arttır" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Yakınlaştırma seviyesini azalt" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Yakınlaştırma oranını sıfırla" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Kodlama" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Kaynağını görüntüle" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Geçerli sayfanın kaynak kodunu görüntüle" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Tam ekran modunu aç / kapat" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "So_l Kaydırma" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Sola kaydır" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Aşağı Kay_dırma" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Aşağı kaydır" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Y_ukarı kaydırma" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Yukarı kaydır" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Sağa Kaydı_rma" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Sağa kaydır" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Git" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Önceki sayfaya geri dön" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Sonraki sayfaya git" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Önceki sayfaya geri dön" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Sonraki sayfaya git" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Anasayfaya git" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Çöp Kutusunu Boşalt" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Çöp Kutusu içerisindeki bütün içeriği sil" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "Sekme kapatmayı geri al" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Son kapatılan sekmeyi aç" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Yeni bir _dizin ekle" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Yeni bir yerimi dizini ekle" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "Yerimlerini _dışa aktar" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Arama _Motorlarını Yönet" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Arama motorlarını ekle, sil ve düzenle..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "Kişisel Verileri Temizle" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Kişisel verileri temizle..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "Sayfayı _incele" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Sayfa detaylarını kontrol et ve geliştirici araçlarına bağlan..." -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "Ön_ceki Sekme" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Önceki sekmeye geç" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "So_nraki Sekme" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Sonraki sekmeye geç" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "Geçerli Sekmeye Odaklan" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Geçerli sekmeye odaklan" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "_Son oturumu aç" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Son oturumda kaydedilmiş sekmeleri aç" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Yardım" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_İçerik" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Belgelendirmeyi göster" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Sık Sorulan Sorular" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Sık Sorulan Soruları Göster" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "Bir Hata _Raporla" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Midori'nin hata takip sistemini aç" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Uygulama hakkında bilgi göster" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Menü Çubuğu" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Menü çubuğunu göster" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "Gezi_nti araç Çubuğu" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Gezinti araç çubuğunu göster" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Yan _panel" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Yan paneli göster" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "Yer imi araç çu_buğu" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Yer imi araç çubuğunu göster" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "Ak_tarım çubuğu" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Aktarım çubuğunu göster" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Durum Çubuğu" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Durum çubuğunu göster" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "Otom_atik" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Çince (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japonca (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" msgstr "Korece (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Rusça (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Batı Avrupa (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "Ayraç" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "Kon_um..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Belirli bir konumu aç" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Web Arama..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Bir web arama gerçekleştir" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Daha önce kapatılmış pencereyi ya da sekmeyi yeniden aç" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Yeni ziyaret edilmiş sayfalar" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Daha önce ziyaret edilmiş sayfaları yeniden aç" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Yer İmleri" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Kaydedilmiş yer imlerini göster" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Araçlar" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Pencere" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Açık sekmelerin bir listesini göster" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Menü" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "Sat_ıriçi Bul:" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Önceki Sekme" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Sonraki" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Büyük - Küçük Harf Duyarlı" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Eşleşenleri Vurgula" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Arama Çubuğunu Kapat" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Hepsini Temizle" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Beklenmedik ayar '%s'" @@ -1664,197 +1687,213 @@ msgstr "Silmek için kişisel veri seçildi" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1189 ../midori/midori-view.c:4488 -#: ../midori/midori-view.c:4492 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 +#: ../midori/midori-view.c:4544 #, c-format msgid "Error - %s" msgstr "Hata - %s" -#: ../midori/midori-view.c:1190 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Sayfa '%s' yüklenemedi." -#: ../midori/midori-view.c:1195 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Tekrar deneyin" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Bulunamadı - %s" -#: ../midori/midori-view.c:1473 ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "%s bir mesaj gönder" -#: ../midori/midori-view.c:2092 ../midori/midori-view.c:2472 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Unsurları Kontrol _et" -#: ../midori/midori-view.c:2144 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Bağlantıyı Yeni _Sekmede Aç" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Bağlantıyı _Önalan Sekmede Aç" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Bağlantıyı _Arka Alan Sekmede Aç" -#: ../midori/midori-view.c:2152 ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Bağlantıyı Yeni _Pencerede aç" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Bağlantıyı Web Uygulaması Olarak Aç" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Bağlantı konumunu _kopyala" -#: ../midori/midori-view.c:2161 ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "Bağlantı konumunu kay_det" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "Bağlantı konumunu İnd_ir" -#: ../midori/midori-view.c:2166 ../midori/midori-view.c:2196 -#: ../midori/midori-view.c:2238 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "İndirme _Yöneticisi ile indir" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Resm_i Yeni Sekmede Aç" -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Resim _Adresini Kopyala" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Res_mi Kaydet" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Resm_i İndir" -#: ../midori/midori-view.c:2189 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Video _Adresini Kopyala" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "_Video kaydet" -#: ../midori/midori-view.c:2192 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "_Video İndir" -#: ../midori/midori-view.c:2255 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "_ile ara" -#: ../midori/midori-view.c:2290 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "Web ara" -#: ../midori/midori-view.c:2318 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Adresi Yeni _Sekmede Aç" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Dosyayı aç veya indir" -#: ../midori/midori-view.c:2634 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Dosya Türü: '%s'" -#: ../midori/midori-view.c:2637 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Dosya Türü: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "%s aç" -#: ../midori/midori-view.c:3189 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Sayfayı incele - %s" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Hızlı arama" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Bir kısayol eklemek için tıklayın" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Kısayol adresi girin" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Kısayol başlığını girin" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Bu kısayolu silmek istediğinizden emin misiniz?" -#: ../midori/midori-view.c:3495 +#: ../midori/midori-view.c:3518 +msgid "Set number of columns" +msgstr "Sütun sayısını ayarla" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns:" +msgstr "Sütun sayısını gir" + +#: ../midori/midori-view.c:3520 +msgid "Set number of shortcuts" +msgstr "Kısayol sayısını ayarla" + +#: ../midori/midori-view.c:3521 +msgid "Enter number of shortcuts:" +msgstr "Kısayol sayısını gir" + +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "Belge görüntülenemedi" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "Kurulmuş belgelendirme yok" -#: ../midori/midori-view.c:3768 +#: ../midori/midori-view.c:3820 msgid "Blank page" msgstr "Boş sayfa" -#: ../midori/midori-view.c:4028 +#: ../midori/midori-view.c:4080 msgid "_Duplicate Tab" msgstr "Sekmeyi Çoğalt" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4085 msgid "_Restore Tab" msgstr "Sekmeyi Ye_rleştir" -#: ../midori/midori-view.c:4033 +#: ../midori/midori-view.c:4085 msgid "_Minimize Tab" msgstr "Sekmeyi küçült" -#: ../midori/midori-view.c:4039 +#: ../midori/midori-view.c:4091 msgid "Close ot_her Tabs" msgstr "_Diğer Sekmeleri Kapat" -#: ../midori/midori-view.c:4660 +#: ../midori/midori-view.c:4763 msgid "Print background images" msgstr "Arkaplan resimlerini yazdır" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4764 msgid "Whether background images should be printed" msgstr "Arka fon resimlerini yaz açık/kapalı" -#: ../midori/midori-view.c:4713 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Özellikler" @@ -2098,6 +2137,14 @@ msgstr "Ayraç" msgid "Console" msgstr "Uçbirim" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "_Hepsini Kopyala" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Hepsini Kopyala" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Ek Özellikler" @@ -2394,25 +2441,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "XML verisindeki gerekli Atom \"kaynak\" elementi bulma hatası." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Son güncelleme: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Kaynaklar" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Yeni kaynak ekle" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "kaynak sil" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Kaynak" @@ -2447,25 +2494,25 @@ msgstr "XML verisindeki gerekli RSS \"öge\" elementi bulma hatası." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "XML verisindeki gerekli RSS \"kanal\" elementi bulma hatası." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Hata" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Kaynak '%s' halihazırda var" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Kaynak '%s' yükleme hatası" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Kaynak Paneli" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS kaynaklarını oku" From 6bdd00a074d25a328d21b9b338310b88db585029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayhan=20YAL=C3=87INSOY?= Date: Mon, 31 May 2010 21:07:10 +0200 Subject: [PATCH 2650/2970] l10n: Updated Turkish (tr) translation to 99% New status: 621 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index be8122d7..23dbac4f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -353,9 +353,8 @@ msgid "Save file" msgstr "Dosyayı kaydet" #: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -#, fuzzy msgid "Some files are being downloaded" -msgstr "Dosya '%s' indirildi." +msgstr "Bazı dosyalar indiriliyor" #: ../midori/midori-browser.c:1921 msgid "_Quit Midori" @@ -363,7 +362,7 @@ msgstr "Midori'den _çık" #: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." -msgstr "" +msgstr "Midori kapatılırsa aktarmalar iptal edilecek." #: ../midori/midori-browser.c:2384 msgid "Open file" From 6f6684855bcf9453f4834b15c25f2db53dfc99ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Mon, 31 May 2010 23:49:43 +0200 Subject: [PATCH 2651/2970] l10n: Updates to Croatian (hr) translation New status: 440 messages complete with 0 fuzzies and 182 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 176 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 98 insertions(+), 78 deletions(-) diff --git a/po/hr.po b/po/hr.po index 8c8295e3..794fd252 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,20 +1,21 @@ -# Croatian translations for PACKAGE package. +# Croatian translations for Midori package. # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# , 2010. -# +# This file is distributed under the same license as the Midori package. +# Ivica Kolić, 2010. +# msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-31 10:08+0000\n" -"PO-Revision-Date: 2010-05-27 17:57+0200\n" +"PO-Revision-Date: 2010-05-31 23:45+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" @@ -48,13 +49,13 @@ msgstr "" #: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" -msgstr "Neuspjelo otvaranje baze podataka: %s\n" +msgstr "Neuspjelo otvaranje baze podataka: %s\n" #. i18n: Couldn't remove items that are older than n days #: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "" +msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n" #: ../midori/main.c:445 #, c-format @@ -83,11 +84,14 @@ msgid "The session couldn't be saved. %s" msgstr "Sesija ne može biti spremljena %s" #: ../midori/main.c:868 -msgid "No root certificate file is available. SSL certificates cannot be verified." +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." msgstr "" #: ../midori/main.c:958 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." msgstr "" #: ../midori/main.c:973 @@ -232,16 +236,16 @@ msgstr "Datoteka nije pronađena" #: ../midori/midori-array.c:462 ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." -msgstr "" +msgstr "Deformirani dokument" #: ../midori/midori-array.c:504 msgid "Unrecognized bookmark format." -msgstr "" +msgstr "Neprepoznati format zabilješke" #: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." -msgstr "" +msgstr "Neuspjelo pisanje" #: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 #: ../midori/midori-browser.c:5589 @@ -255,7 +259,7 @@ msgstr "Prestani učitavati trenutnu stranicu" #: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" -msgstr "" +msgstr "%d%% učitano" #: ../midori/midori-browser.c:496 #, c-format @@ -306,9 +310,8 @@ msgid "Toplevel folder" msgstr "" #: ../midori/midori-browser.c:862 -#, fuzzy msgid "Add to _Speed Dial" -msgstr "Dodaj u Brzo_biranje" +msgstr "Dodaj u _brzo biranje" #: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" @@ -341,7 +344,7 @@ msgstr "" #: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." -msgstr "" +msgstr "Datoteka '%s' je preuzeta." #: ../midori/midori-browser.c:1458 msgid "Transfer completed" @@ -353,16 +356,15 @@ msgstr "Spremi datoteku" #: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" -msgstr "" +msgstr "Neke datoteke su preuzete" #: ../midori/midori-browser.c:1921 -#, fuzzy msgid "_Quit Midori" -msgstr "Midori" +msgstr "_Isključi Midori" #: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." -msgstr "" +msgstr "Prijenosi će biti odgođeni ako se Midori isključi" #: ../midori/midori-browser.c:2384 msgid "Open file" @@ -370,8 +372,11 @@ msgstr "Otvori datoteku" #: ../midori/midori-browser.c:2462 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" #: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 @@ -397,7 +402,7 @@ msgstr "Prazno" #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." -msgstr "ne mogu pokrenuti vanjski program" +msgstr "Ne mogu pokrenuti vanjski program" #: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format @@ -412,12 +417,12 @@ msgstr "Otvori sve u _Karticama" #: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" -msgstr "Otvori u novoj_kartici" +msgstr "Otvori u novoj _kartici" #: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" -msgstr "Otvori u novom_prozoru" +msgstr "Otvori u novom _prozoru" #: ../midori/midori-browser.c:4665 msgid "Arora" @@ -449,7 +454,7 @@ msgstr "_Uvezi zabilješke" #: ../midori/midori-browser.c:4704 msgid "_Application:" -msgstr "_Aplikacija" +msgstr "_Program" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 #: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 @@ -469,7 +474,7 @@ msgstr "Neuspjeli izvoz zabilješki" #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "" +msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu #: ../midori/midori-browser.c:5002 @@ -499,7 +504,7 @@ msgstr "'Flash' kolačići" #: ../midori/midori-browser.c:5047 msgid "Website icons" -msgstr "" +msgstr "Website ikone" #: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" @@ -511,14 +516,18 @@ msgstr "" #: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" -msgstr "" +msgstr "Očisti privatne podatke kad _isključuješ Midori" #: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Lagani web preglednik" #: ../midori/midori-browser.c:5168 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." msgstr "" #: ../midori/midori-browser.c:5187 @@ -531,7 +540,7 @@ msgstr "_Datoteka" #: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" -msgstr "Novi_prozor" +msgstr "Novi _prozor" #: ../midori/midori-browser.c:5499 msgid "Open a new window" @@ -559,7 +568,7 @@ msgstr "Spremi u datoteku" #: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" -msgstr "Dodaj u Brzo_biranje" +msgstr "Dodaj u Brzo _biranje" #: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" @@ -773,7 +782,7 @@ msgstr "Otvori zadnju zatvorenu karticu" #: ../midori/midori-browser.c:5650 msgid "Add a new _folder" -msgstr "Dodaj novu_mapu" +msgstr "Dodaj novu _mapu" #: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" @@ -785,7 +794,7 @@ msgstr "_Izvezi zabilješke" #: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" -msgstr "" +msgstr "_Upravljaj tražilicama" #: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." @@ -1040,12 +1049,12 @@ msgstr "Očisti sve" #: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" -msgstr "" +msgstr "Neočekivana postavka '%s'" #: ../midori/midori-locationaction.c:377 #, c-format msgid "Failed to select from history\n" -msgstr "" +msgstr "Neuspjeli odabir iz povijesti\n" #: ../midori/midori-locationaction.c:459 #, c-format @@ -1206,20 +1215,20 @@ msgstr "Zadnja sačuvana visina prozora" #: ../midori/midori-websettings.c:414 msgid "Last panel position" -msgstr "Zadnja pozicija panela" +msgstr "Zadnja pozicija ploče" #: ../midori/midori-websettings.c:415 msgid "The last saved panel position" -msgstr "Zadnja spremljena pozicija panela" +msgstr "Zadnja spremljena pozicija ploče" #. i18n: The internal index of the last opened panel #: ../midori/midori-websettings.c:424 msgid "Last panel page" -msgstr "" +msgstr "zadnja stranica ploče" #: ../midori/midori-websettings.c:425 msgid "The last saved panel page" -msgstr "" +msgstr "Zadnja spremljena stranica ploče" #: ../midori/midori-websettings.c:433 msgid "Last Web search" @@ -1255,7 +1264,7 @@ msgstr "" #: ../midori/midori-websettings.c:470 msgid "Show Panel" -msgstr "Pokaži panel" +msgstr "Pokaži ploču" #: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" @@ -1528,7 +1537,7 @@ msgstr "" #: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" -msgstr "" +msgstr "Omogući podršku za HTML5 bazu podataka" #: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" @@ -1536,7 +1545,7 @@ msgstr "" #: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" -msgstr "" +msgstr "Omogući podršku za HTML5 lokalnu pohranu" #: ../midori/midori-websettings.c:892 msgid "Whether to enable HTML5 local storage support" @@ -1636,7 +1645,7 @@ msgstr "HTTP Proxy poslužitelj" #: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" -msgstr "" +msgstr "Proxy poslužitelj korišten za HTTP spajanja" #: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" @@ -1668,7 +1677,9 @@ msgid "Preferred languages" msgstr "" #: ../midori/midori-websettings.c:1124 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" #: ../midori/midori-websettings.c:1139 @@ -1702,7 +1713,7 @@ msgstr "Pokušaj ponovo" #: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "NIje pronađeno - %s" #: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format @@ -1743,7 +1754,7 @@ msgstr "_Spremi odredište poveznice" #: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" -msgstr "" +msgstr "_Preuzmi odredište poveznice" #: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 #: ../midori/midori-view.c:2285 @@ -1802,7 +1813,7 @@ msgstr "Tip datoteke: '%s'" #: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" -msgstr "" +msgstr "Tip datoteke: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" #: ../midori/midori-view.c:2687 @@ -1837,20 +1848,19 @@ msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" #: ../midori/midori-view.c:3518 msgid "Set number of columns" -msgstr "" +msgstr "Postavi broj stupaca" #: ../midori/midori-view.c:3519 msgid "Enter number of columns:" -msgstr "" +msgstr "Unesi broj stupaca" #: ../midori/midori-view.c:3520 msgid "Set number of shortcuts" -msgstr "" +msgstr "Postavi broj prečaca" #: ../midori/midori-view.c:3521 -#, fuzzy msgid "Enter number of shortcuts:" -msgstr "Unesi adresu prečaca" +msgstr "Unesi broj prečaca" #: ../midori/midori-view.c:3547 #, c-format @@ -1860,7 +1870,7 @@ msgstr "Dokument ne može biti prikazan" #: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "Dokumentacija nije instalirana" #: ../midori/midori-view.c:3820 msgid "Blank page" @@ -1897,7 +1907,7 @@ msgstr "" #. Page "General" #: ../midori/midori-preferences.c:298 msgid "General" -msgstr "Općenito" +msgstr "Osnovno" #: ../midori/midori-preferences.c:299 msgid "Startup" @@ -1950,7 +1960,7 @@ msgstr "Najmanja veličina fonta" #: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" -msgstr "" +msgstr "Najmanja veličina fonta korištena za prikaz teksta" #. Page "Behavior" #: ../midori/midori-preferences.c:380 @@ -1991,7 +2001,9 @@ msgstr "Pravopisni rječnici" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" msgstr "" #. Page "Interface" @@ -2048,11 +2060,11 @@ msgstr "Uredi tražilicu" #: ../midori/midori-searchaction.c:945 msgid "_Name:" -msgstr "_Ime" +msgstr "_Ime:" #: ../midori/midori-searchaction.c:989 msgid "_Icon:" -msgstr "_Ikona" +msgstr "_Ikona:" #: ../midori/midori-searchaction.c:1003 msgid "_Token:" @@ -2060,7 +2072,7 @@ msgstr "" #: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" -msgstr "" +msgstr "Upravljaj tražilicama" #: ../midori/midori-searchaction.c:1335 msgid "Use as _default" @@ -2107,9 +2119,8 @@ msgid "Netscape p_lugins" msgstr "Netscape p_riključci" #: ../midori/sokoke.c:1307 -#, fuzzy msgid "New _Folder" -msgstr "Nova mapa" +msgstr "Nova _mapa" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" @@ -2137,11 +2148,11 @@ msgstr "" #: ../panels/midori-console.c:361 msgid "Copy _All" -msgstr "" +msgstr "Kopiraj _sve" #: ../panels/midori-console.c:362 msgid "Copy All" -msgstr "" +msgstr "Kopiraj sve" #: ../panels/midori-extensions.c:91 msgid "Extensions" @@ -2152,7 +2163,8 @@ msgid "Erroneous clock time" msgstr "" #: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." +msgid "" +"The clock time lies in the past. Please check the current date and time." msgstr "" #: ../panels/midori-history.c:286 @@ -2202,7 +2214,7 @@ msgstr "Otvori odredišni _direktorij" #: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" -msgstr "" +msgstr "Kopiraj lokaciju po_veznice" #: ../katze/katze-http-auth.c:214 msgid "Authentication Required" @@ -2266,7 +2278,9 @@ msgstr "" #: ../extensions/adblock.c:447 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." msgstr "" #: ../extensions/adblock.c:587 @@ -2330,7 +2344,7 @@ msgstr "" #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" -msgstr "" +msgstr "Obojane kartice" #: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" @@ -2346,16 +2360,18 @@ msgid "Delete All" msgstr "Izbriši sve" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" -msgstr "" +msgstr "Proširi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" -msgstr "" +msgstr "Skupi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" @@ -2407,14 +2423,16 @@ msgstr "Ime" #: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" -msgstr "" +msgstr "_Proširi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" -msgstr "" +msgstr "_Skupi sve" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" msgstr "" #: ../extensions/cookie-manager/main.c:40 @@ -2550,7 +2568,7 @@ msgstr "" #: ../extensions/page-holder.c:178 msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "" +msgstr "Držite jednu ili više stranica otvorenima paralelno sa vašim karticama" #: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" @@ -2598,7 +2616,7 @@ msgstr "K_artica ploče" #: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" -msgstr "" +msgstr "Pokaži kartice u okomitoj ploči" #: ../extensions/tab-switcher.c:395 msgid "Tab History List" @@ -2613,7 +2631,9 @@ msgid "Customize Toolbar" msgstr "Prilagodi alatnu traku" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." msgstr "" #: ../extensions/toolbar-editor.c:421 From ea7e627e3bb48eb0ebd1074196aaf0fbd6e95d92 Mon Sep 17 00:00:00 2001 From: Tsahee Zidenberg Date: Mon, 31 May 2010 23:39:02 +0200 Subject: [PATCH 2652/2970] Implement loading delayed pages at startup Each view has a meta value 'delay' which indicates whether it be loaded or needs to be loaded manually before it shows content. One way to trigger this is that Midori crashes and if it is configured to 'Show last open tabs', all tabs will now be delayed. To allow Midori to safely open without crashing again. The other way is to change the 'Load on Startup' preference to 'Show last tabs without loading'. This causes all tabs restored from the session to be delayed. One interesting aspect is that it is possible to have delayed tabs, use 'Show last open tabs' and tabs will remain as they are, so delayed tabs will be delayed over following sessions. --- midori/main.c | 47 ++++++++++++++++++++++++++++++------- midori/midori-browser.c | 13 +++++++--- midori/midori-view.c | 17 ++++++++++++++ midori/midori-websettings.c | 1 + midori/midori-websettings.h | 8 ++++--- 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/midori/main.c b/midori/main.c index 628665c3..759dc81f 100644 --- a/midori/main.c +++ b/midori/main.c @@ -430,6 +430,18 @@ midori_history_terminate (sqlite3* db, } #endif +static void +midori_session_add_delay (KatzeArray* session) +{ + KatzeItem* item; + gint i = 0; + while ((item = katze_array_get_nth_item (session, i++))) + { + if (katze_item_get_meta_integer (item, "delay") < 0) + katze_item_set_meta_integer (item, "delay", 1); + } +} + static void settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -1230,11 +1242,13 @@ midori_load_session (gpointer data) KatzeArray* _session = KATZE_ARRAY (data); MidoriBrowser* browser; MidoriApp* app = katze_item_get_parent (KATZE_ITEM (_session)); + MidoriWebSettings* settings = katze_object_get_object (app, "settings"); gchar* config_file; KatzeArray* session; KatzeItem* item; guint i; gint64 current; + MidoriStartup load_on_startup; gchar** command = g_object_get_data (G_OBJECT (app), "execute-command"); #ifdef G_ENABLE_DEBUG gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; @@ -1263,14 +1277,13 @@ midori_load_session (gpointer data) g_signal_connect_after (gtk_accel_map_get (), "changed", G_CALLBACK (accel_map_changed_cb), NULL); + g_object_get (settings, "load-on-startup", &load_on_startup, NULL); + if (katze_array_is_empty (_session)) { - MidoriWebSettings* settings = katze_object_get_object (app, "settings"); - MidoriStartup load_on_startup; gchar* homepage; item = katze_item_new (); - g_object_get (settings, "load-on-startup", &load_on_startup, NULL); if (load_on_startup == MIDORI_STARTUP_BLANK_PAGE) katze_item_set_uri (item, ""); else @@ -1279,11 +1292,13 @@ midori_load_session (gpointer data) katze_item_set_uri (item, homepage); g_free (homepage); } - g_object_unref (settings); katze_array_add_item (_session, item); g_object_unref (item); } + if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES) + midori_session_add_delay (_session); + session = midori_browser_get_proxy_array (browser); i = 0; while ((item = katze_array_get_nth_item (_session, i++))) @@ -1299,6 +1314,8 @@ midori_load_session (gpointer data) item = katze_array_get_nth_item (_session, 0); if (!strcmp (katze_item_get_uri (item), "")) midori_browser_activate_action (browser, "Location"); + + g_object_unref (settings); g_object_unref (_session); katze_assign (config_file, build_config_filename ("session.xbel")); @@ -1541,6 +1558,7 @@ main (int argc, gchar* webapp; gchar* config; gboolean diagnostic_dialog; + gboolean back_from_crash; gboolean run; gchar* snapshot; gboolean execute; @@ -1649,6 +1667,7 @@ main (int argc, /* Parse cli options */ webapp = NULL; config = NULL; + back_from_crash = FALSE; diagnostic_dialog = FALSE; run = FALSE; snapshot = NULL; @@ -1926,7 +1945,7 @@ main (int argc, _session = katze_array_new (KATZE_TYPE_ITEM); #if HAVE_LIBXML g_object_get (settings, "load-on-startup", &load_on_startup, NULL); - if (load_on_startup == MIDORI_STARTUP_LAST_OPEN_PAGES) + if (load_on_startup >= MIDORI_STARTUP_LAST_OPEN_PAGES) { katze_assign (config_file, build_config_filename ("session.xbel")); error = NULL; @@ -2026,6 +2045,7 @@ main (int argc, uri_ready = midori_prepare_uri (uri); katze_item_set_uri (item, uri_ready); g_free (uri_ready); + katze_item_set_meta_integer (item, "delay", 0); katze_array_add_item (_session, item); uri = strtok (NULL, "|"); } @@ -2075,12 +2095,21 @@ main (int argc, katze_assign (config_file, build_config_filename ("running")); if (g_access (config_file, F_OK) == 0) { - if (katze_object_get_boolean (settings, "show-crash-dialog")) - diagnostic_dialog = TRUE; + back_from_crash = TRUE; } else g_file_set_contents (config_file, "RUNNING", -1, NULL); + if (back_from_crash) + { + if (katze_object_get_int (settings, "load-on-startup") + >= MIDORI_STARTUP_LAST_OPEN_PAGES) + midori_session_add_delay (_session); + + if (katze_object_get_boolean (settings, "show-crash-dialog")) + diagnostic_dialog = TRUE; + } + if (diagnostic_dialog) { GtkWidget* dialog = midori_create_diagnostic_dialog (settings, _session); @@ -2156,8 +2185,8 @@ main (int argc, } } - if (katze_object_get_boolean (settings, "load-on-startup") - != MIDORI_STARTUP_LAST_OPEN_PAGES) + if (katze_object_get_int (settings, "load-on-startup") + < MIDORI_STARTUP_LAST_OPEN_PAGES) { katze_assign (config_file, build_config_filename ("session.xbel")); g_unlink (config_file); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 534a2a05..066fd13f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -7488,7 +7488,6 @@ gint midori_browser_add_item (MidoriBrowser* browser, KatzeItem* item) { - const gchar* uri; const gchar* title; GtkWidget* view; gint page; @@ -7498,13 +7497,21 @@ midori_browser_add_item (MidoriBrowser* browser, g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (KATZE_IS_ITEM (item), -1); - uri = katze_item_get_uri (item); title = katze_item_get_name (item); view = g_object_new (MIDORI_TYPE_VIEW, "title", title, "settings", browser->settings, NULL); - midori_view_set_uri (MIDORI_VIEW (view), uri); + if (katze_item_get_meta_integer (item, "delay") > 0) + { + gchar* new_uri; + new_uri = g_strdup_printf ("pause:%s", katze_item_get_uri (item)); + midori_view_set_uri (MIDORI_VIEW (view), new_uri); + g_free (new_uri); + } + else + midori_view_set_uri (MIDORI_VIEW (view), katze_item_get_uri (item)); + gtk_widget_show (view); /* FIXME: We should have public API for that */ diff --git a/midori/midori-view.c b/midori/midori-view.c index 655b1df5..f99934db 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3680,6 +3680,23 @@ midori_view_set_uri (MidoriView* view, katze_item_set_uri (view->item, uri); return; } + else if (g_str_has_prefix (uri, "pause:")) + { + gchar* title; + + title = g_strdup_printf ("%s", view->title); + katze_assign (view->uri, g_strdup (&uri[6])); + midori_view_display_error ( + view, view->uri, title, + _("Page loading delayed"), + _("Loading delayed either due to a recent crash or startup preferences."), + _("Load Page"), + NULL); + g_free (title); + g_object_notify (G_OBJECT (view), "uri"); + if (view->item) + katze_item_set_uri (view->item, uri); + } else if (g_str_has_prefix (uri, "javascript:")) { gboolean result; diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index b7e573af..4102bf2b 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -204,6 +204,7 @@ midori_startup_get_type (void) { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Blank page") }, { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") }, { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") }, + { MIDORI_STARTUP_DELAYED_PAGES, "MIDORI_STARTUP_DELAYED_PAGES", N_("Show last tabs without loading") }, { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriStartup", values); diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 05ad0f7c..2cedff15 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -60,11 +60,13 @@ midori_window_state_get_type (void) G_GNUC_CONST; #define MIDORI_TYPE_WINDOW_STATE \ (midori_window_state_get_type ()) +/* values >= MIDORI_STARTUP_LAST_OPEN_PAGES mean session is saved */ typedef enum { - MIDORI_STARTUP_BLANK_PAGE, - MIDORI_STARTUP_HOMEPAGE, - MIDORI_STARTUP_LAST_OPEN_PAGES + MIDORI_STARTUP_BLANK_PAGE, /* One blank tab or speed dial is opened */ + MIDORI_STARTUP_HOMEPAGE, /* One homepage tab is opened */ + MIDORI_STARTUP_LAST_OPEN_PAGES, /* The session is loaded and saved */ + MIDORI_STARTUP_DELAYED_PAGES /* The session is saved, loading pages is delayed */ } MidoriStartup; GType From f3de3466425e8d9a35f64a6cbf50149bfc0a1dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Tue, 1 Jun 2010 09:13:18 +0200 Subject: [PATCH 2653/2970] l10n: Updated Czech (cs) translation to 100% New status: 626 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 862 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 442 insertions(+), 420 deletions(-) diff --git a/po/cs.po b/po/cs.po index e7afbf95..d9a6e498 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:07+0000\n" +"POT-Creation-Date: 2010-06-01 04:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -58,172 +58,172 @@ msgstr "Nepodařilo se otevřít databázi: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Nepodařilo se odstranit staré položky historie: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurace nemůže být uložena. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhledávací nástroj nemůže být uložen. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky nemohou být uloženy. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Seznam zavřených karet nemůže být uložen. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sezení nemůže být uloženo. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nemohou být ověřovány." -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává opakovaně, pro odstranění problému zkuste následující možnosti." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Vymazat poslední _sezení" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Nebyl zadán název souboru" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímek uložen do %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Spustit ADRESA jako webovou aplikaci" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Použít SLOŽKA jako místo pro uložení konfigurace" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "SLOŽKA" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Spustit vybraný příkaz" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokovat adresy (URI) pomocí regulárního výrazu REGVÝRAZ" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "VTEŘINY" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Zkontrolujte, zda není nová verze na " -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ignorovat" @@ -245,793 +245,799 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s z %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "Ještě se stahují nějaké soubory." -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "U_končit Midori" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Nabídka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Smazat vše" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -1094,582 +1100,586 @@ msgstr "zobrazit domovskou stránku" msgid "Show last open tabs" msgstr "zobrazit naposledy otevřené karty" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Zobrazit naposledy otevřené záložky bez načtení" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "nové kartě" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "novém okně" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "výchozí" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "ikony" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "malé ikony" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "ikony a text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "automaticky (GNOME, nebo jiné prostředí)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "žádný" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "všechna cookies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "cookies sezení" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "žádná" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Ukládat rozměry okna?" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Šířka okna" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Výška okna" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Uložená poslední pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Poslední otevřená stránka" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Uložená stránka" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Rychlé hledání na webu" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Uložené poslední vyhledávání na webu" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Zobrazit nabídku?" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Zobrazit vyhledávání" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Zobrazit lištu vyhledávání?" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Zobrazit lištu se záložkami?" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Zobrazit panel?" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Zobrazit stav přenosu" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Zobrazit stav přenosu?" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Zobrazit stavový řádek?" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Styl lišty:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Nastaví styl lišty (zobrazení textu a ikon)." -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Zobrazit průběh v řádku adresy" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Zobrazovat průběh načítání v řádku s adresou?" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Zobrazovat výsledky hledání při zadávání adresy" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Položky nástrojové lišty" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Položky, které se budou zobrazovat na nástrojové liště" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Kompaktní boční panel" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Má se zobrazit boční panel kompaktně?" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Zobrazí seznam nástrojů" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Zda zobrazovat seznam nástrojů" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Přesunout boční panel na opačnou stranu" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Otvírat panely v samostatných oknech" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Zda vždy otevřít panel v samostatné okno" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Když Midori nastartuje:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Co udělat, když je Midori spuštěno" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Zobrazit obsah rychlého přístupu v kartách" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Ukládat stažené soubory do:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Kam se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Zeptat se na cílovou složku" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Zda se ptát, kam se bude ukládat" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Upozornit na dokončení přenosu" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Zda zobrazit upozornění při dokončení přenosu" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Správce stahování" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Externí program pro stahování" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Preferované kódování" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Preferované kódování stránek" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Vždy zobrazovat karty" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Zobrazit karty, i když je jen jedna?" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Nové stránky otevírat v:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Externí stránky otevírat v:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Kde se budou otevírat externí stránky" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Karty se otevírají na pozadí" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta se otevře vedle aktivní" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovací okno se otevře v nové kartě" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Automaticky načítat obrázky" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Automaticky načítat a zobrazovat obrázky" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Povolit skripty" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Povolit vložené skriptové jazyky" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Povolit pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Povolit HTML5 databázi" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Zda povolit HTML5 databázi" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Povolit místní úložiště pro HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Zda povolit místní úložiště dat pro HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Povolit cache pro offline aplikace" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Zda povolit používání cache pro offline aplikace" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Při přibližování zvětšovat text i obrázky?" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Při psaní hledat text?" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Kinetické rolování" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Zda naklápěním zařízení rolovat" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Přijímat cookies:" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Který typ cookies přijímat" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Původní" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Z původní stránky" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Maximální stáří cookies" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Pamatovat si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Pamatovat si naposledy navštívené stránky?" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Maximální délka historie" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Pamatovat si naposledy stahované soubory" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Pamatovat si seznam souborů, které byly stahovány?" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Jaký typ proxy serveru chcete použít" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Proxy server, který bude použit pro HTTP spojení" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Zjistit proxy server automaticky" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zjistit nastavení proxy serveru automaticky (podle prostředí)?" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Jak se hlásit webovým stránkám" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Preferované jazyky" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", nebo \"cs-cs;q=1.0, en-en;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Osobní data byla označena ke smazání" @@ -1677,8 +1687,8 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4557 +#: ../midori/midori-view.c:4561 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1784,106 +1794,118 @@ msgstr "_Hledat na webu" msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3506 +#: ../midori/midori-view.c:3518 msgid "Set number of columns" msgstr "Změnit počet sloupců" -#: ../midori/midori-view.c:3507 +#: ../midori/midori-view.c:3519 msgid "Enter number of columns:" msgstr "Vložte počet sloupců" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3520 msgid "Set number of shortcuts" msgstr "Změnit počet záložek" -#: ../midori/midori-view.c:3509 +#: ../midori/midori-view.c:3521 msgid "Enter number of shortcuts:" msgstr "Vložte počet záložek" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3691 +msgid "Page loading delayed" +msgstr "Načítání stránky pozdrženo" + +#: ../midori/midori-view.c:3692 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." + +#: ../midori/midori-view.c:3693 +msgid "Load Page" +msgstr "Načíst stránku" + +#: ../midori/midori-view.c:3837 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4097 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4102 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4102 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4108 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4780 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4781 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4833 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Rozšíření" @@ -2430,25 +2452,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"feed\" v XML datech." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Poslední aktualizace: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Přidat nový kanál" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Smazat kanál" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Kanály" @@ -2483,25 +2505,25 @@ msgstr "Nepodařilo se najít požadovaný element \"item\" v XML datech." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nepodařilo se najít požadovaný element \"channel\" v XML datech." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Chyba" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Kanál '%s' byl již přidán" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Chyba při načítání kanálu '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Panel kanálů" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Čte Atom/RSS kanály" From da30135ed0c777c9f42f39d75423844129a4cbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Tue, 1 Jun 2010 09:15:21 +0200 Subject: [PATCH 2654/2970] l10n: Updated Czech (cs) translation to 100% New status: 626 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/cs.po b/po/cs.po index d9a6e498..5325671d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1102,7 +1102,7 @@ msgstr "zobrazit naposledy otevřené karty" #: ../midori/midori-websettings.c:207 msgid "Show last tabs without loading" -msgstr "Zobrazit naposledy otevřené záložky bez načtení" +msgstr "zobrazit naposledy otevřené karty bez načtení" #: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" From 481e33f0d7a71c2f791079a091c4bea98f2db95a Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Tue, 1 Jun 2010 17:32:24 +0200 Subject: [PATCH 2655/2970] l10n: Updated Japanese (ja) translation to 100% New status: 626 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ja.po | 871 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 450 insertions(+), 421 deletions(-) diff --git a/po/ja.po b/po/ja.po index 81feedd6..14b5e349 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 14:36+0900\n" -"PO-Revision-Date: 2010-05-23 14:33+0900\n" +"POT-Creation-Date: 2010-06-02 00:29+0900\n" +"PO-Revision-Date: 2010-06-02 00:28+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -57,38 +57,38 @@ msgstr "データベースのオープンに失敗しました: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。" -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -97,145 +97,145 @@ msgstr "" "ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" "い。" -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "診断ダイアログを表示する" # CLI --help -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" # CLI --help -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "正規表現 PATTERN に従って URI をブロックする" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "PATTERN" # CLI --help #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "無視(_I)" @@ -257,222 +257,235 @@ msgstr "認識できないブックマーク形式です。" msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "ファイル '%s' をダウンロードしました。" -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "転送完了" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "ファイルのダウンロード中です" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "Midori を終了(_Q)" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "Midori を終了すると転送がキャンセルされます。" -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"上記 URI を使用するにはフィードリーダを開いてください。通常「新規に購読」、" +"「新規ニュースフィード」などのメニューやボタンがあります。\n" +"もしくは Midori の設定のアプリケーションタブでフィードリーダを指定してくださ" +"い。次にニュースフィードアイコンをクリックしたときに自動的に追加されます。" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "空です" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" @@ -480,53 +493,53 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -537,577 +550,577 @@ msgstr "" "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" # tooltip -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" # tooltip -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "デスクトップにショートカットを追加します" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "このニュースフィードを購読します" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" # tooltip -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "左へスクロールします" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "下へスクロール" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "上へスクロール" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "右へスクロールします" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" # tooltip -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "ブックマーク(_B)" # tooltip -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "メニュー" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "すべてクリア" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -1170,627 +1183,631 @@ msgstr "ホームページを表示" msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "最後のタブを読み込まずに表示" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP プロキシサーバ" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "プロキシサーバなし" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "最後のウィンドウの高さ" # tooltip -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "最後のパネルページ" # tooltip -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "メニューバーを表示する" # tooltip -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" # tooltip -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" # tooltip -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "パネルを表示する" # tooltip -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "転送バーを表示する" # tooltip -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "ステータスバーを表示する" # tooltip -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "ツールバー方式:" # tooltip -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" # tooltip -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" # tooltip -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "ツールバーアイテム" # tooltip -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" # tooltip -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "パネルの操作コントロールを表示する" # tooltip -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "パネルに操作コントロールを表示します" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" # tooltip -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "パネルを別のウィンドウで開く" # tooltip -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "パネルを常に別のウィンドウで開きます" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Midori を起動した時:" # tooltip -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Midori の起動時に表示するページを指定します" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "ホームページ:" # tooltip -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" # tooltip -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "新しいタブにスピードダイアルを表示する" # tooltip -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "新しく開かれたタブにスピードダイアルを表示します" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "ダウンロードファイルの保存先:" # tooltip -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "保存先フォルダを問い合わせる" # tooltip -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" # tooltip -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "ダウンロードマネージャ" # tooltip -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "テキストエディタ" # tooltip -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "フィードリーダ" # tooltip -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "ロケーションエントリの検索" # tooltip -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "文字のエンコーディング" # tooltip -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" # tooltip -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" # tooltip -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "新しくページを開く時:" # tooltip -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "外部ページを開く時:" # tooltip -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" # tooltip -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" # tooltip -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "画像を自動的に読み込む" # tooltip -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "スクリプトを有効にする" # tooltip -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" # tooltip -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にする" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にします" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にする" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にします" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にする" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にします" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" # tooltip -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" # tooltip -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "慣性スクロール" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "速度にしたがって慣性がかかったようにスクロールします" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Cookie の受け入れ" # tooltip -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" # tooltip -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" # tooltip -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "履歴の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" # tooltip -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "使用するプロキシサーバの種類を指定します" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP プロキシサーバ" # tooltip -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" # tooltip -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "識別名" # tooltip -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "識別文字列" # tooltip -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "言語の優先度" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1799,12 +1816,12 @@ msgstr "" "指定します。例 \"ja\"、\"en-us\" または \"ja;q=1.0, en-us;q=0.667\"" # Button title -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "プライベートデータのクリア" # FIXME: -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "選択されているプライベートデータを削除します" @@ -1812,8 +1829,8 @@ msgstr "選択されているプライベートデータを削除します" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4557 +#: ../midori/midori-view.c:4561 #, c-format msgid "Error - %s" msgstr "エラー - %s" @@ -1919,107 +1936,119 @@ msgstr "ウェブで検索(_S)" msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "スピードダイアル" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:3506 +#: ../midori/midori-view.c:3518 msgid "Set number of columns" msgstr "カラム数の設定" -#: ../midori/midori-view.c:3507 +#: ../midori/midori-view.c:3519 msgid "Enter number of columns:" msgstr "カラム数を入力してください:" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3520 msgid "Set number of shortcuts" msgstr "ショートカットの設定" -#: ../midori/midori-view.c:3509 +#: ../midori/midori-view.c:3521 msgid "Enter number of shortcuts:" msgstr "ショートカット数を入力してください:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3547 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3570 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3691 +msgid "Page loading delayed" +msgstr "ページ読み込みの保留" + +#: ../midori/midori-view.c:3692 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "最近のクラッシュか起動設定により読み込みが保留されています。" + +#: ../midori/midori-view.c:3693 +msgid "Load Page" +msgstr "ページを読み込む" + +#: ../midori/midori-view.c:3837 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4097 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4102 msgid "_Restore Tab" msgstr "タブの復元(_R)" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4102 msgid "_Minimize Tab" msgstr "タブの最小化(_M)" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4108 msgid "Close ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4780 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4781 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4833 ../midori/midori-preferences.c:381 msgid "Features" msgstr "機能" @@ -2608,25 +2637,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "XML データ内に要求された Atom \"feed\" 要素が見つかりませんでした。" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "最終更新: %s" -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "フィード" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "新しいフィードの追加" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "フィードの削除" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "フィード(_F)" @@ -2661,26 +2690,26 @@ msgstr "XML データ内に要求された RSS \"item\" 要素が見つかりま msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "XML データ内に要求された RSS \"channel\" 要素が見つかりませんでした。" -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "エラー" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "フィード '%s' はすでに存在します" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "フィード '%s' の読み込みでエラーです" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "フィードパネル" # description -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" From a2e22b4341378e35f149d8dfa1971364b6965385 Mon Sep 17 00:00:00 2001 From: padv Date: Tue, 1 Jun 2010 21:41:23 +0200 Subject: [PATCH 2656/2970] l10n: Updated Dutch (Flemish) (nl) translation to 66% New status: 411 messages complete with 78 fuzzies and 133 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 263 +++++++++++++++++++++---------------------------------- 1 file changed, 102 insertions(+), 161 deletions(-) diff --git a/po/nl.po b/po/nl.po index ea305a09..9a7c8b4a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -239,9 +239,8 @@ msgid "Malformed document." msgstr "Ongeldig document." #: ../midori/midori-array.c:504 -#, fuzzy msgid "Unrecognized bookmark format." -msgstr "Onbekende bookmark formaat." +msgstr "Onbekend bladwijzerformaat." #: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format @@ -312,23 +311,21 @@ msgid "Toplevel folder" msgstr "Hoofdmap" #: ../midori/midori-browser.c:862 -#, fuzzy msgid "Add to _Speed Dial" -msgstr "Toevoegen aan Speed _dial" +msgstr "Toevoegen aan _snelkiezen" #: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Laat in de werk_balk zien" #: ../midori/midori-browser.c:890 -#, fuzzy msgid "Run as _web application" -msgstr "Uitvoeren als _web toepassing" +msgstr "Uitvoeren als _webtoepassing" #: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "" +msgstr "Er is niet voldoende schijfruimte om \"%s\" te downloaden." #: ../midori/midori-browser.c:988 #, c-format @@ -416,9 +413,8 @@ msgstr "Kan item in geschiedenis niet verwijderen: %s\n" #: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 -#, fuzzy msgid "Open all in _Tabs" -msgstr "In nieuw _tabblad openen" +msgstr "Alles openen in _tabbladen" #: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 @@ -455,9 +451,8 @@ msgid "Import bookmarks..." msgstr "Bladwijzer importeren..." #: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 -#, fuzzy msgid "_Import bookmarks" -msgstr "_Importeren bladwijzers" +msgstr "Bladwijzers _importeren" #: ../midori/midori-browser.c:4704 msgid "_Application:" @@ -470,14 +465,12 @@ msgid "Custom..." msgstr "Aangepast..." #: ../midori/midori-browser.c:4805 -#, fuzzy msgid "Failed to import bookmarks" -msgstr "Bladwijzer bewerken" +msgstr "Bladwijzers importeren mislukt" #: ../midori/midori-browser.c:4841 -#, fuzzy msgid "Failed to export bookmarks" -msgstr "Bladwijzer bewerken" +msgstr "Bladwijzers exporteren mislukt" #: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 @@ -504,16 +497,14 @@ msgid "History" msgstr "Geschiedenis" #: ../midori/midori-browser.c:5037 -#, fuzzy msgid "Cookies" -msgstr "Koekies" +msgstr "Cookies" #: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' koekies" #: ../midori/midori-browser.c:5047 -#, fuzzy msgid "Website icons" msgstr "Website iconen" @@ -535,7 +526,7 @@ msgstr "Een lichtgewicht webbrowser." #: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "" +msgstr "Deze bibliotheek is vrije software; u kan deze opnieuw verdelen en/of wijzigen onder de voorwaarden van de GNU Lesser General Public License zoals gepubliceerd door de Free Software Foundation; ofwel versie 2.1 van de licentie of een latere versie (naar keuze)." #: ../midori/midori-browser.c:5187 msgid "translator-credits" @@ -574,23 +565,20 @@ msgid "Save to a file" msgstr "Opslaan naar bestand" #: ../midori/midori-browser.c:5514 -#, fuzzy msgid "Add to Speed _dial" -msgstr "Toevoegen aan Speed _dial" +msgstr "Toevoegen aan _snelkiezen" #: ../midori/midori-browser.c:5515 -#, fuzzy msgid "Add shortcut to speed dial" -msgstr "Voeg snelkoppeling toe aan Speed Dial" +msgstr "Voeg snelkoppeling toe aan snelkiezen" #: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Voeg Snelkoppeling aan _desktop" #: ../midori/midori-browser.c:5518 -#, fuzzy msgid "Add shortcut to the desktop" -msgstr "Voeg snelkoppeling naar het bureaublad" +msgstr "Voeg snelkoppeling toe op bureaublad" #: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" @@ -633,9 +621,8 @@ msgid "Undo the last modification" msgstr "Maak de laatste wijziging ongedaan" #: ../midori/midori-browser.c:5545 -#, fuzzy msgid "Redo the last modification" -msgstr "Opnieuw de laatste wijziging maken" +msgstr "De laatste wijziging opnieuw maken" #: ../midori/midori-browser.c:5549 msgid "Cut the selected text" @@ -702,12 +689,10 @@ msgid "Reset the zoom level" msgstr "Zoomniveau op beginwaarde" #: ../midori/midori-browser.c:5599 -#, fuzzy msgid "_Encoding" -msgstr "Voorkeurs-codering" +msgstr "_Codering" #: ../midori/midori-browser.c:5601 -#, fuzzy msgid "View So_urce" msgstr "_Bron bekijken" @@ -721,36 +706,35 @@ msgstr "Volledig scherm" #: ../midori/midori-browser.c:5608 msgid "Scroll _Left" -msgstr "" +msgstr "Naar _links schuiven" #: ../midori/midori-browser.c:5609 -#, fuzzy msgid "Scroll to the left" -msgstr "Overschakelen naar het volgende tabblad" +msgstr "Naar links schuiven" #: ../midori/midori-browser.c:5611 msgid "Scroll _Down" -msgstr "" +msgstr "Naar _beneden schuiven" #: ../midori/midori-browser.c:5612 msgid "Scroll down" -msgstr "" +msgstr "Naar beneden schuiven" #: ../midori/midori-browser.c:5614 msgid "Scroll _Up" -msgstr "" +msgstr "Naar _omhoog schuiven" #: ../midori/midori-browser.c:5615 msgid "Scroll up" -msgstr "" +msgstr "Naar omhoog schuiven" #: ../midori/midori-browser.c:5617 msgid "Scroll _Right" -msgstr "" +msgstr "Naar _rechts schuiven" #: ../midori/midori-browser.c:5618 msgid "Scroll to the right" -msgstr "" +msgstr "Naar rechts schuiven" #: ../midori/midori-browser.c:5621 msgid "_Go" @@ -766,15 +750,13 @@ msgstr "Naar de volgende pagina" #. i18n: Visit the previous logical page, ie. in a forum or blog #: ../midori/midori-browser.c:5631 -#, fuzzy msgid "Go to the previous sub-page" -msgstr "Terug naar de vorige pagina" +msgstr "Naar de vorige subpagina" #. i18n: Visit the following logical page, ie. in a forum or blog #: ../midori/midori-browser.c:5635 -#, fuzzy msgid "Go to the next sub-page" -msgstr "Naar de volgende pagina" +msgstr "Naar de volgende subpagina" #: ../midori/midori-browser.c:5638 msgid "Go to your homepage" @@ -789,28 +771,24 @@ msgid "Delete the contents of the trash" msgstr "Verwijder de inhoud van de prullenbak" #: ../midori/midori-browser.c:5643 -#, fuzzy msgid "Undo _Close Tab" -msgstr "Tabblad sluiten ongedaan maken" +msgstr "Tabblad _sluiten ongedaan maken" #: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Open het laatst gesloten tabblad" #: ../midori/midori-browser.c:5650 -#, fuzzy msgid "Add a new _folder" -msgstr "Nieuwe bladwijzer toevoegen" +msgstr "Nieuwe _map toevoegen" #: ../midori/midori-browser.c:5651 -#, fuzzy msgid "Add a new bookmark folder" -msgstr "Nieuwe bladwijzer toevoegen" +msgstr "Nieuwe bladwijzermap toevoegen" #: ../midori/midori-browser.c:5656 -#, fuzzy msgid "_Export bookmarks" -msgstr "_Importeren bladwijzers" +msgstr "Bladwijzers _exporteren" #: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" @@ -821,22 +799,20 @@ msgid "Add, edit and remove search engines..." msgstr "Zoekmachines toevoegen, bewerken en verwijderen..." #: ../midori/midori-browser.c:5663 -#, fuzzy msgid "_Clear Private Data" -msgstr "_clear Privegegevens" +msgstr "Privégegevens _wissen" #: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Privé data wissen..." #: ../midori/midori-browser.c:5668 -#, fuzzy msgid "_Inspect Page" -msgstr "Pagina analyseren - %s" +msgstr "Pagina _inspecteren - %s" #: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." -msgstr "" +msgstr "Inspecteer paginadetails en toegang tot ontwikkelaarsgereedschappen..." #: ../midori/midori-browser.c:5674 msgid "_Previous Tab" @@ -864,12 +840,11 @@ msgstr "Focus op huidig tabblad" #: ../midori/midori-browser.c:5683 msgid "Open last _session" -msgstr "" +msgstr "Open laatste _sessie" #: ../midori/midori-browser.c:5684 -#, fuzzy msgid "Open the tabs saved in the last session" -msgstr "Open de huidige pagina in het paginavak" +msgstr "Open tabbladen die werden bewaard in de laatste sessie" #: ../midori/midori-browser.c:5686 msgid "_Help" @@ -893,9 +868,8 @@ msgid "Show the Frequently Asked Questions" msgstr "Veelgestelde vragen weergeven" #: ../midori/midori-browser.c:5694 -#, fuzzy msgid "_Report a Bug" -msgstr "Fouten _melden" +msgstr "Probleem _melden" #: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" @@ -955,7 +929,7 @@ msgstr "Statusbalk weergeven" #: ../midori/midori-browser.c:5735 msgid "_Automatic" -msgstr "" +msgstr "_Automatisch" #: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" @@ -963,13 +937,12 @@ msgstr "Chinees (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic #: ../midori/midori-browser.c:5742 -#, fuzzy msgid "Japanese (SHIFT__JIS)" -msgstr "Japans (SHIFT_JIS)" +msgstr "Japans (SHIFT__JIS)" #: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 msgid "Korean (EUC-KR)" -msgstr "" +msgstr "Koreaans (EUC-KR)" #: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" @@ -984,9 +957,8 @@ msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" #: ../midori/midori-browser.c:6300 -#, fuzzy msgid "_Separator" -msgstr "Scheidingsteken" +msgstr "_Scheidingsteken" #: ../midori/midori-browser.c:6307 msgid "_Location..." @@ -1037,20 +1009,17 @@ msgid "Show a list of all open tabs" msgstr "Geef een lijst met open tabbladen weer" #: ../midori/midori-browser.c:6434 -#, fuzzy msgid "_Menu" msgstr "_Menubalk" #: ../midori/midori-browser.c:6436 -#, fuzzy msgid "Menu" -msgstr "_Menubalk" +msgstr "Menubalk" #. i18n: A panel at the bottom, to search text in pages #: ../midori/midori-browser.c:6640 -#, fuzzy msgid "_Inline Find:" -msgstr "_Ingebed zoeken:" +msgstr "_Zoeken:" #: ../midori/midori-browser.c:6671 msgid "Previous" @@ -1074,7 +1043,7 @@ msgstr "Zoekbalk sluiten" #: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" -msgstr "" +msgstr "Alles wissen" #: ../midori/midori-browser.c:7104 #, c-format @@ -1082,14 +1051,14 @@ msgid "Unexpected setting '%s'" msgstr "Onverwachte configuratie-optie '%s'" #: ../midori/midori-locationaction.c:377 -#, fuzzy, c-format +#, c-format msgid "Failed to select from history\n" -msgstr "Kan geschiedenis niet wissen: %s\n" +msgstr "Kon niet kiezen uit geschiedenis\n" #: ../midori/midori-locationaction.c:459 -#, fuzzy, c-format +#, c-format msgid "Search for %s" -msgstr "Zoek met %s" +msgstr "Zoek naar %s" #: ../midori/midori-locationaction.c:482 #, c-format @@ -1097,23 +1066,23 @@ msgid "Search with %s" msgstr "Zoek met %s" #: ../midori/midori-locationaction.c:1197 -#, fuzzy, c-format +#, c-format msgid "Failed to execute database statement\n" -msgstr "Kan database niet uitvoeren:% s \\ n" +msgstr "Kon database statement niet uitvoeren:\n" #. i18n: Right-click on Location, Open an URL from the clipboard #: ../midori/midori-locationaction.c:1254 msgid "Paste and p_roceed" -msgstr "" +msgstr "Plakken en _doorgaan" #: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" -msgstr "" +msgstr "Gekozen paneel losmaken van venster" #: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 #: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" -msgstr "" +msgstr "Zijpaneel rechts plaatsen" #: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" @@ -1121,27 +1090,23 @@ msgstr "Paneel sluiten" #: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" -msgstr "" +msgstr "Zijpaneel links plaatsen" #: ../midori/midori-panel.c:797 -#, fuzzy msgid "Hide operating controls" -msgstr "Informatie over dit programma weergeven" +msgstr "Bedieningselementen verbergen" #: ../midori/midori-websettings.c:204 -#, fuzzy msgid "Show Blank page" -msgstr "Blanco pagina" +msgstr "Toon blanco pagina" #: ../midori/midori-websettings.c:205 -#, fuzzy msgid "Show Homepage" -msgstr "Homepage" +msgstr "Toon startpagina" #: ../midori/midori-websettings.c:206 -#, fuzzy msgid "Show last open tabs" -msgstr "Geef een lijst met open tabbladen weer" +msgstr "Toon laatst geopende tabbladen" #: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" @@ -1169,7 +1134,7 @@ msgstr "Pictogrammen" #: ../midori/midori-websettings.c:261 msgid "Small icons" -msgstr "" +msgstr "Kleine pictogrammen" #: ../midori/midori-websettings.c:262 msgid "Text" @@ -1177,24 +1142,23 @@ msgstr "Tekst" #: ../midori/midori-websettings.c:263 msgid "Icons and text" -msgstr "" +msgstr "Pictogrammen en tekst" #: ../midori/midori-websettings.c:264 msgid "Text beside icons" -msgstr "" +msgstr "Tekst naast pictogrammen" #: ../midori/midori-websettings.c:279 msgid "Automatic (GNOME or environment)" -msgstr "" +msgstr "Automatisch (GNOME of omgeving)" #: ../midori/midori-websettings.c:280 -#, fuzzy msgid "HTTP proxy server" -msgstr "HTTP proxy" +msgstr "HTTP proxy server" #: ../midori/midori-websettings.c:281 msgid "No proxy server" -msgstr "" +msgstr "Geen proxy server" #: ../midori/midori-websettings.c:296 msgid "All cookies" @@ -1210,20 +1174,19 @@ msgstr "Geen" #: ../midori/midori-websettings.c:314 msgid "Safari" -msgstr "" +msgstr "Safari" #: ../midori/midori-websettings.c:315 -#, fuzzy msgid "iPhone" -msgstr "Geen" +msgstr "iPhone" #: ../midori/midori-websettings.c:316 msgid "Firefox" -msgstr "" +msgstr "Firefox" #: ../midori/midori-websettings.c:317 msgid "Internet Explorer" -msgstr "" +msgstr "Internet Explorer" #: ../midori/midori-websettings.c:370 msgid "Remember last window size" @@ -1307,14 +1270,12 @@ msgid "Whether to show the panel" msgstr "Paneel weergeven" #: ../midori/midori-websettings.c:486 -#, fuzzy msgid "Show Transferbar" msgstr "Bestandsoverdrachten-balk weergeven" #: ../midori/midori-websettings.c:487 -#, fuzzy msgid "Whether to show the transferbar" -msgstr "Statusbalk weergeven" +msgstr "Of de statusbalk dient te worden weergeven" #: ../midori/midori-websettings.c:495 msgid "Show Statusbar" @@ -1325,31 +1286,28 @@ msgid "Whether to show the statusbar" msgstr "Statusbalk weergeven" #: ../midori/midori-websettings.c:505 -#, fuzzy msgid "Toolbar Style:" -msgstr "Stijl van de werkbalk" +msgstr "Stijl van de werkbalk:" #: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "Stijl van de werkbalk" #: ../midori/midori-websettings.c:522 -#, fuzzy msgid "Show progress in location entry" -msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" +msgstr "Toon voortgang in locatieveld" #: ../midori/midori-websettings.c:523 -#, fuzzy msgid "Whether to show loading progress in the location entry" -msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" +msgstr "Of voortgang van laden pagina getoond dient te worden in locatieveld" #: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" -msgstr "" +msgstr "Zoekmachines tonen bij ingave in locatieveld" #: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" -msgstr "" +msgstr "Of zoekmachines bij ingaves in het locatieveld dienen te worden getoond" #: ../midori/midori-websettings.c:547 msgid "Toolbar Items" @@ -1368,47 +1326,40 @@ msgid "Whether to make the sidepanel compact" msgstr "Het paneel compact weergeven" #: ../midori/midori-websettings.c:572 -#, fuzzy msgid "Show operating controls of the panel" -msgstr "Informatie over dit programma weergeven" +msgstr "Toon bedieningselementen van het paneel" #: ../midori/midori-websettings.c:573 -#, fuzzy msgid "Whether to show the operating controls of the panel" -msgstr "Paneel weergeven" +msgstr "Of bedieningselementen van het paneel moeten worden weergegeven" #: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" -msgstr "" +msgstr "Plaats zijpaneel rechts" #: ../midori/midori-websettings.c:589 -#, fuzzy msgid "Whether to align the sidepanel on the right" -msgstr "Het paneel compact weergeven" +msgstr "Of het zijpaneel aan de rechterkant dient te worden geplaatst" #: ../midori/midori-websettings.c:604 -#, fuzzy msgid "Open panels in separate windows" -msgstr "Nieuw venster openen" +msgstr "Open panelen in aparte vensters" #: ../midori/midori-websettings.c:605 -#, fuzzy msgid "Whether to always open panels in separate windows" -msgstr "Tabbladen op de achtergrond openen" +msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters" #: ../midori/midori-websettings.c:614 msgid "When Midori starts:" -msgstr "" +msgstr "Bij starten van Midori:" #: ../midori/midori-websettings.c:615 -#, fuzzy msgid "What to do when Midori starts" -msgstr "Wat geladen moet worden tijdens het opstarten" +msgstr "Wat er dient te gebeuren bij starten van Midori" #: ../midori/midori-websettings.c:624 -#, fuzzy msgid "Homepage:" -msgstr "Homepage" +msgstr "Startpagina" #: ../midori/midori-websettings.c:625 msgid "The homepage" @@ -1416,47 +1367,44 @@ msgstr "Homepage" #: ../midori/midori-websettings.c:640 msgid "Show crash dialog" -msgstr "" +msgstr "Toon crashdialoog" #: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" -msgstr "" +msgstr "Toon een dialoog nadat Midori crasht" #. i18n: Speed dial, webpage shortcuts, named for the phone function #: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" -msgstr "" +msgstr "Toon snelkiezen in nieuwe tabbladen" #: ../midori/midori-websettings.c:658 -#, fuzzy msgid "Show speed dial in newly opened tabs" -msgstr "Geef een lijst met open tabbladen weer" +msgstr "Toon snelkiezen in nieuw geopende tabbladen" #: ../midori/midori-websettings.c:666 -#, fuzzy msgid "Save downloaded files to:" -msgstr "Laatst gedownloadede bestanden onthouden" +msgstr "Bewaar gedownloade bestanden in:" #: ../midori/midori-websettings.c:667 -#, fuzzy msgid "The folder downloaded files are saved to" -msgstr "De map waar gedownloadede de bestanden worden opgeslagen" +msgstr "De map waar gedownloade bestanden worden opgeslagen" #: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" -msgstr "" +msgstr "Vraag naar de doelmap" #: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" +msgstr "Of naar de doelmap moet worden gevraagd bij het downloaden van een bestand" #: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" -msgstr "" +msgstr "Melding wanneer de overdracht is voltooid" #: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" +msgstr "Of een melding dient te worden getoond als een overdracht is voltooid" #: ../midori/midori-websettings.c:721 msgid "Download Manager" @@ -1476,12 +1424,11 @@ msgstr "Een externe tekstbewerker" #: ../midori/midori-websettings.c:746 msgid "News Aggregator" -msgstr "" +msgstr "Nieuwsaggregator" #: ../midori/midori-websettings.c:747 -#, fuzzy msgid "An external news aggregator" -msgstr "Een externe tekstbewerker" +msgstr "Een externe nieuwaggregator" #: ../midori/midori-websettings.c:755 msgid "Location entry Search" @@ -1516,18 +1463,16 @@ msgid "Whether tabs have close buttons" msgstr "Sluitknoppen op tabbladen" #: ../midori/midori-websettings.c:793 -#, fuzzy msgid "Open new pages in:" -msgstr "Nieuwe pagina's openen in" +msgstr "Nieuwe pagina's openen in:" #: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Waar nieuwe pagina's geopend moeten worden" #: ../midori/midori-websettings.c:803 -#, fuzzy msgid "Open external pages in:" -msgstr "Externe pagina's openen in" +msgstr "Externe pagina's openen in:" #: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" @@ -1538,9 +1483,8 @@ msgid "Middle click opens Selection" msgstr "Middel-klikken opent selectie" #: ../midori/midori-websettings.c:814 -#, fuzzy msgid "Load an address from the selection via middle click" -msgstr "Laad een URL vanuit de selectie met een klik op de middelste muisknop" +msgstr "Een adres vanuit de selectie laden met middelste muisknop" #: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" @@ -1571,9 +1515,8 @@ msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" #: ../midori/midori-websettings.c:852 -#, fuzzy msgid "Load and display images automatically" -msgstr "Afbeeldingen automatisch laden" +msgstr "Afbeeldingen automatisch laden en weergeven" #: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 msgid "Enable scripts" @@ -1581,25 +1524,23 @@ msgstr "Scripts aanzetten" #: ../midori/midori-websettings.c:860 msgid "Enable embedded scripting languages" -msgstr "" +msgstr "Ingebedde scripttalen uitvoeren" #: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 -#, fuzzy msgid "Enable Netscape plugins" -msgstr "Plugins aanzetten" +msgstr "Netscape plugins uitvoeren" #: ../midori/midori-websettings.c:868 -#, fuzzy msgid "Enable embedded Netscape plugin objects" -msgstr "Plugins aanzetten" +msgstr "Ingebedde Netscape pluginobjecten uitvoeren" #: ../midori/midori-websettings.c:884 msgid "Enable HTML5 database support" -msgstr "" +msgstr "HTML5 database ondersteuning activeren" #: ../midori/midori-websettings.c:885 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "OF HTML5 database ondersteuning dient te worden geactiveerd" #: ../midori/midori-websettings.c:891 msgid "Enable HTML5 local storage support" From 0aa24037bd9a0142989d6b9c7cbb8cdfbf4c559c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20St=C3=B6sel?= Date: Tue, 1 Jun 2010 22:11:08 +0200 Subject: [PATCH 2657/2970] Connect tab switcher to child web view key events The parent view will do its best to forward the focus to the child web view, so the tab switcher should listen to it. --- extensions/tab-switcher.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/extensions/tab-switcher.c b/extensions/tab-switcher.c index add09df1..ad778725 100644 --- a/extensions/tab-switcher.c +++ b/extensions/tab-switcher.c @@ -248,12 +248,19 @@ tab_selector_browser_add_tab_cb (MidoriBrowser *browser, GtkWidget *view, MidoriExtension *extension) { - g_signal_connect (view, "key_press_event", + GtkWidget* web_view; + GList* list; + + g_return_if_fail (MIDORI_IS_VIEW (view)); + + web_view = midori_view_get_web_view (MIDORI_VIEW(view)); + + g_signal_connect (web_view, "key_press_event", G_CALLBACK (tab_selector_handle_events), browser); - g_signal_connect (view, "key_release_event", + g_signal_connect (web_view, "key_release_event", G_CALLBACK (tab_selector_handle_events), browser); - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); + list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); list = g_list_append(list, view); g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); } From fa4de7b7232330ef8596ea10f37d238f5df7b192 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 1 Jun 2010 22:19:11 +0200 Subject: [PATCH 2658/2970] Connect view *after* mime-policy-decision-requested In order to allow extensions to override the MIME handling, we need to be late in the order. --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index f99934db..4968b908 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3391,7 +3391,7 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_view_window_object_cleared_cb, view, "signal::create-web-view", webkit_web_view_create_web_view_cb, view, - "signal::mime-type-policy-decision-requested", + "signal-after::mime-type-policy-decision-requested", webkit_web_view_mime_type_decision_cb, view, #if WEBKIT_CHECK_VERSION (1, 1, 3) "signal::download-requested", From 4422f640cb3a0bbc6cac1ea0e4332374009e1f6c Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Tue, 1 Jun 2010 23:56:04 +0200 Subject: [PATCH 2659/2970] Combined speed dial resize and thumbnail sizes --- data/speeddial-head.html | 182 +++++++++++++++++++++++++++++++++------ midori/midori-browser.c | 2 +- midori/midori-view.c | 13 +-- 3 files changed, 164 insertions(+), 33 deletions(-) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 6d5814fd..0f5b51c5 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -30,7 +30,7 @@ } #content { - margin-top: 10px; + margin-top: 40px; } div.shortcut { @@ -90,6 +90,11 @@ text-decoration: none; } + div.shortcut a img { + width: 100%; + height: 100%; + } + .waiter img { margin-top: 38px; } @@ -142,23 +147,54 @@ } div.config { + position: absolute; + top: 0px; padding: 12px; text-align: left; } div.config span { color: #ccc; + margin-right: 10px; + margin-right: 10px; } - div.config span:hover { + div.config span.config_option:hover { color: #999; cursor: pointer; } + + div.config span.config_label { + color: #ccc; + cursor: default; + margin-right: 0px; + } + + div.config span.config_option { + margin-left: 0px; + margin-right: 0px; + } + + div.osd { + top: 9px; + position: fixed; + width: 100%; + text-align: right; + } + + div.osd span { + border: 1px solid #999; + background-color: #f5f5f5; + padding: 8px; + color: #999; + -webkit-border-bottom-left-radius: 10px; + visibility: hidden; + } +
+ +
- {set_dial_width} - {set_shortcut_count} + {set_dial_size} + {set_thumb_size} + {set_thumb_small} + {set_thumb_normal} + {set_thumb_big}
diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 066fd13f..6acba91e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1226,7 +1226,7 @@ midori_browser_add_speed_dial (MidoriBrowser* browser) g_regex_unref (reg_unsafe); } - if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 160, 107))) + if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160))) { GRegex* regex; gchar* replace; diff --git a/midori/midori-view.c b/midori/midori-view.c index 4968b908..e7c36df2 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3515,10 +3515,13 @@ midori_view_set_uri (MidoriView* view, "{enter_shortcut_address}", _("Enter shortcut address"), "{enter_shortcut_name}", _("Enter shortcut title"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), - "{set_dial_width}", _("Set number of columns"), - "{enter_dial_width}", _("Enter number of columns:"), - "{set_shortcut_count}", _("Set number of shortcuts"), - "{enter_shortcut_count}", _("Enter number of shortcuts:"), NULL); + "{set_dial_size}", _("Set number of columns and rows"), + "{enter_dial_width}", _("Enter number of columns and rows:"), + "{invalid_dial_size}", _("Invalid input for the size of the speed dial"), + "{set_thumb_size}", _("Thumb size:"), + "{set_thumb_small}", _("Small"), + "{set_thumb_normal}", _("Medium"), + "{set_thumb_big}", _("Big"), NULL); midori_view_load_alternate_string (view, @@ -5112,7 +5115,7 @@ thumb_view_load_status_cb (MidoriView* thumb_view, if (katze_object_get_enum (thumb_view, "load-status") != MIDORI_LOAD_FINISHED) return; - img = midori_view_get_snapshot (MIDORI_VIEW (thumb_view), 160, 107); + img = midori_view_get_snapshot (MIDORI_VIEW (thumb_view), 240, 160); gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, "compression", "7", NULL); encoded = g_base64_encode ((guchar *)file_content, sz ); From 1acb888a29eb43772bdb3df8b4043ebf8d4fbfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Wed, 2 Jun 2010 07:59:19 +0200 Subject: [PATCH 2660/2970] l10n: Updated Czech (cs) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 70 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/po/cs.po b/po/cs.po index 5325671d..08ab2154 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-01 04:08+0000\n" +"POT-Creation-Date: 2010-06-02 04:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -1687,8 +1687,8 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4557 -#: ../midori/midori-view.c:4561 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1840,72 +1840,84 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" #: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "Změnit počet sloupců" +msgid "Set number of columns and rows" +msgstr "Změnit počet sloupců a řádků" #: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "Vložte počet sloupců" +msgid "Enter number of columns and rows:" +msgstr "Vložte počet sloupců a řádků:" #: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "Změnit počet záložek" +msgid "Invalid input for the size of the speed dial" +msgstr "Nesprávná hodnota velikosti rychlého přístupu" #: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "Vložte počet záložek" +msgid "Thumb size:" +msgstr "Velikost náhledů:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "malá" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "střední" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "velká" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3691 +#: ../midori/midori-view.c:3694 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3692 +#: ../midori/midori-view.c:3695 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." -#: ../midori/midori-view.c:3693 +#: ../midori/midori-view.c:3696 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:3837 +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4097 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4102 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:4102 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-view.c:4108 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4780 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4781 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4833 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Rozšíření" @@ -2618,11 +2630,11 @@ msgstr "Panel _karet" msgid "Show tabs in a vertical panel" msgstr "Zobrazí karty ve vertikálním panelu" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Karta historie" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití" @@ -2658,6 +2670,12 @@ msgstr "Umožňuje jednoduše změnit lištu" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +#~ msgid "Set number of shortcuts" +#~ msgstr "Změnit počet záložek" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Vložte počet záložek" + #~ msgid "Open _Link" #~ msgstr "Otevřít _odkaz" From 75913f8fd9f1f6f0330874ad17820db462be2f27 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Wed, 2 Jun 2010 12:13:24 +0200 Subject: [PATCH 2661/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 464 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 249 insertions(+), 215 deletions(-) diff --git a/po/uk.po b/po/uk.po index 8893007f..0e7079b4 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 10:07+0000\n" +"POT-Creation-Date: 2010-06-02 10:12+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легкий переглядач Веб" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Мідорі" @@ -57,172 +57,172 @@ msgstr "Не вдалось відкрити базу даних: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Невдача видалення старих об'єктів історії: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Неможливо зберегти конфігурацію. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Неможливо зберегти пошукові машини. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Неможливо зберегти закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити. " -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Змінити _налаштування" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Скинути останню _сесію" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Не вказано назви файлу" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Отримано невідому помилку." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Знімок екрану збережено до: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Запустити АДРЕСУ як веб-додаток" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Використайте ТЕКУ як теку конфігурації" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "ТЕКА" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Показати діалог діагностики" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Виконати визначений файл як джава-скрипт" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Зробити знімок вибраної сторінки/адреси" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Виконати вибрану комнаду" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокувати URI згідно з регулярним виразом PATTERN" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Зресетувати Midori після СЕКУНД неактивності" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "Це невластива тека конфігурації." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Один із екземплярів програми Midori вже працює, але не відповідає на запити.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Неможливо завантажити пошукову машину. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ігнорувати" @@ -453,7 +453,7 @@ msgid "_Application:" msgstr "_Програма:" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Інша..." @@ -924,7 +924,7 @@ msgstr "Показати панель стану" msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" @@ -933,19 +933,19 @@ msgstr "Китайська (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" @@ -1101,582 +1101,586 @@ msgstr "Показати домашню сторінку" msgid "Show last open tabs" msgstr "Показати останньо відкриті вкладки" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Показати останні вкладки без завантаження" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Маленькі значки" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Значки і текст" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Текст за значками" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME або змінні оточення)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Сервер HTTP проксі" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Немає сервера проксі" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Всі тістечка" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Тістечка сесії" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Нічого" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Запам'ятати останній розмір вікна" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Чи зберігати останній розмір вікна" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Ширина останнього вікна" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Остання збережена ширина вікна" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Висота останнього вікна" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Остання збережена висота вікна" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Остання позиція панелі" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Остання збережена позиція панелі" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Остання сторінка панелі" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Остання збережена сторінка панелі" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Останній пошук у Веб" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Останній збережений пошук у Веб" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Показати панель меню" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Чи показувати панель меню" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Чи показувати панель навігації" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Чи показувати панель закладок" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Показати панель" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Чи показувати панель" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Чи показувати панель завантажень" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Показати панель стану" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Чи показувати панель стану" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Стиль панелі:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Показати поступ у рядку адреси" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Чи показувати прогрес завантаження в рядку адреси" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Доповнення рядка в вікні пошуку" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Чи автоматично доповнювати стрічку в рядку пошуку" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Об'єкти панелі інструментів" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Об'єкти, що відображаються у панелі інструментів" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Компактна бічна панель" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Налаштування відображення компактної бічної панелі" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Показати об’єкти налаштування панелі" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Чи показувати пульт оправління панелі" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Чи вирівнювати бічну панель по правому краю" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Відкривати панелі в нових вікнах" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Чи відкривати панелі в окремих вікнах" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Коли Мідорі стартує:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Що завантажувати при старті" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Домашня сторінка" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Показати діалог краху" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Показати діалог, коли Мідорі зазнає краху" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Показати швидкий виклик в новій вкладці" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Показувати швидкий виклик в щойно відкритих вкладках" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Зберігати завантажені файли до:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Завантажені файли зберігати в теку" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Запитати про теку призначення" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Чи запитувати про теку призначення при завантаженні файлу" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Повідомити про закінчення завантаження" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Чи показувати повідомлення про завершення завантаження" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Менеджер завантажень" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Зовнішній менеджер завантажень" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Текстовий редактор" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Зовнішній текстовий редактор" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Читалка новин" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Зовнішня читалка стрічок новин" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Місце початку пошуку" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Здійснювати пошук всередині місця входження" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Типове кодування" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Типове кодування символів" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Кнопки закриття на вкладках" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Чи матимуть вкладки кнопки закриття" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Відкривати нові сторінки в:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Де відкривати нові сторінки" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Відкривати зовнішні сторінки в:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Де відкривати сторінки зовнішнього виклику" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Середня кнопка відкриває виділене" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Завантажувати посилання URL з виділеного через клацання середньої кнопки" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Відкривати вкладки в фоні" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Чи відкривати нові вкладки в фоновому режимі" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Відкривати вкладки у наступних після поточної" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Чи відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Автоматично завантажити зображення" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Автоматично завантажити і показати зображення" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Ввімкнути скрипти" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Ввімкнути вбудовані мови скриптів" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Ввімкнути розширення Netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Ввімкнути вбудовані об’єкти розширень Netscape" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Ввімкнути підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Чи дозволити підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Ввімкнути підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Чи дозволити підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Чи збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Шукати під час вписування" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Чи автоматично шукати при вписуванні" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Кінетичне прокручування" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Приймати тістечка" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Тістечка якого типу приймати" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Тільки оригінальні тістечка" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Приймати тістечка тільки з оригінального сайту" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Тривалість життя тістечка" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Максимальне число днів зберігання тістечок для" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Запам'ятати останні відвідані сторінки" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Чи зберігати останні відвідані сторінки" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Тривалість життя історії" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Максимальне число днів зберігання історії для" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Запам'ятовувати останні завантажені файли" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Чи зберігати останні завантажені файли" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Сервер проксі" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Тип проксі-сервера для використання" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP сервер проксі" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Проксі, що використовується для HTTP з'єднань" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Визначити сервер проксі автоматично" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Чи визначати сервер проксі зі змінних оточення" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Ідентифікувати як" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Що ідентифікувати для веб-сторінок" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Стрічка ідентифікації" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Стрічка ідентифікації програми" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Типові мови" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Розділений комами список бажаних мов для відображання веб-сторінок, наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Очистити приватні дані" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Приватні дані, що вибрані для очищення" @@ -1684,8 +1688,8 @@ msgstr "Приватні дані, що вибрані для очищення" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 -#: ../midori/midori-view.c:4544 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Помилка - %s" @@ -1837,60 +1841,84 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" #: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "Встановити кількість колонок" +msgid "Set number of columns and rows" +msgstr "Встановити кількість колонок і рядків" #: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "Введіть число колонок:" +msgid "Enter number of columns and rows:" +msgstr "Введіть кількість колонок і рядків:" #: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "Встановити кількість скорочень" +msgid "Invalid input for the size of the speed dial" +msgstr "Неправильні дані для розміру швидкого виклику" #: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "Введіть кількість скорочень:" +msgid "Thumb size:" +msgstr "Розмір значка:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Маленький" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Середній" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Великий" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Не можу відобразити документ" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Документація не заінстальована" -#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Завантаження сторінки затримане" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Завантаження затримане або в зв’язку з останнім крахом або з налаштуваннями завантаження." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Завантажити сторінку" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4080 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Відновити вкладку" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Мінімізувати вкладку" -#: ../midori/midori-view.c:4091 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4763 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4764 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Опції" @@ -2607,11 +2635,11 @@ msgstr "Панель в_кладок" msgid "Show tabs in a vertical panel" msgstr "Показати вкладки у вертикальній панелі" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Список історії вкладок" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Дозволяє перемикатися між вкладками при виборі із списку, впорядкованим по часу останнього використання" @@ -2647,6 +2675,12 @@ msgstr "Легко редагувати формат панелі інструм msgid "Cache HTTP communication on disk" msgstr "Кешувати комунікацію HTTP на диск" +#~ msgid "Set number of shortcuts" +#~ msgstr "Встановити кількість скорочень" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Введіть кількість скорочень:" + #~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "Копіювати скрипти користувачів до теки %s і копіювати стилі до теки %s." From d7b7f740535eead8611b9a8df6cd4c8c4ade1c9b Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Wed, 2 Jun 2010 13:40:13 +0200 Subject: [PATCH 2662/2970] l10n: Updated Danish (da) translation to 99% New status: 623 messages complete with 4 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 900 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 472 insertions(+), 428 deletions(-) diff --git a/po/da.po b/po/da.po index f56f0cc4..3d06b737 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 16:07+0000\n" +"POT-Creation-Date: 2010-06-02 11:32+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -57,172 +57,172 @@ msgstr "Kunne ikke åbne databasen: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres." -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Vis en nedbrudsdialog" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "MØNSTRE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ignorér" @@ -244,277 +244,283 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s af %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Filen '%s' er blevet hentet." -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Overførsel gennemført" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "Nogle filer bliver overført" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "_Afslut Midori" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Tom" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -522,519 +528,519 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Ryd alle" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" @@ -1097,582 +1103,586 @@ msgstr "Vis hjemmeside" msgid "Show last open tabs" msgstr "Vis sidste åbne faneblade" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Vis sidste faneblad uden at indlæse" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Små ikoner" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Ikoner og tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automatisk (GNOME eller miljø)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Ingen proxyserver" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Om overførselsstatus skal vises" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Værktøjsbjælkestil:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Vis fremgang i placeringindgang" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Om visning af indlæsningsfremgang i placeringsindgang" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Vis søgemaskiner i adresseudfyldelse" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Vis handlingskontroller til panelet" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Om handlingskontroller til panelet skal vises" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Åbn paneler i separate vinduer" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Om paneler altid skal åbnes i separate vinduer" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Når Midori starter:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Hvad der skal ske når Midori startes" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Vis hurtigopkald i nye faneblade" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Vis hurtigopkald i nyligt åbnede faneblade" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Gem hentede filer til:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Spørg om målmappen" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Om der skal spørges om målmappen ved hentning af fil" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Påmindelse når en overførsel er gennemført" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Åbn nye sider i:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Åbn eksterne sider i:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Slå Netscape-udvidelsesmoduler til" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Slå HTML5 databaseunderstøttelse til" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Om understøttelse af database til HTML5 skal slås til" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Slå understøttelse af lokal lagring af HTML5 til" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Slå ikke forbundet webprograms mellemlager til" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Om ikke forbundet webprograms mellemlager skal slås til" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Bevægelsesrulning" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Om rulning skal ske med bevægelseshastighed eller ej" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Kun for originale cookies" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Tillad kun cookies fra original websted" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Husk sidste besøgte sider" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Om sidste besøgte sider skal gemmes" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Proxyservertypen som skal bruges" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Genkend automatisk proxyserver" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Om proxyserveren genkendes automatisk fra miljøet" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Foretrukne sprog" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "En kommaadskilt liste af foretrukne sprog for rendering af flersprogssider, eksempelvis \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Ryd private data" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "De private data valgt til sletning" @@ -1680,8 +1690,8 @@ msgstr "De private data valgt til sletning" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Fejl - %s" @@ -1787,106 +1797,134 @@ msgstr "_Søg internettet" msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" +#: ../midori/midori-view.c:3518 +#, fuzzy +msgid "Set number of columns and rows" msgstr "Indstil antal af kolonner" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" +#: ../midori/midori-view.c:3519 +#, fuzzy +msgid "Enter number of columns and rows:" msgstr "Angiv antal kolonner:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Indstil antal af genveje" +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "Ugyldig inddata af størrelsen til hurtigopringing." -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Angiv antal af genveje:" +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Miniaturestørrelse:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3522 +#, fuzzy +msgid "Small" +msgstr "Små ikoner" + +#: ../midori/midori-view.c:3523 +#, fuzzy +msgid "Medium" +msgstr "Menu" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Stor" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Forsinket sideindlæsning" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Indlæs side" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Gendan faneblad" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Minimér faneblad" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funktionalitet" @@ -2434,25 +2472,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Kunne ikke finde anmodede Atom \"feed\"-elementerne i XML-data." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Sidst opdateret: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Tilføj nyt feed" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Slet feed" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Feeds" @@ -2487,25 +2525,25 @@ msgstr "Kunne ikke finde anmodede RSS \"punkt\"elementer i XML-data." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Kunne ikke finde anmodede RSS \"kanal\"-elemterne i XML-data." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fejl" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Feed '%s' findes allerede" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Fejl ved indlæsning af feed '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Feed-panel" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" @@ -2600,11 +2638,11 @@ msgstr "Faneblad_panel" msgid "Show tabs in a vertical panel" msgstr "Vis faneblade i et lodret panel" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Fanebladshistorik" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug" @@ -2640,6 +2678,12 @@ msgstr "Redigér nemt layout af værktøjsbjælken" msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation på disk" +#~ msgid "Set number of shortcuts" +#~ msgstr "Indstil antal af genveje" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Angiv antal af genveje:" + #~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "Kopiér brugerskripter til mappen %s og kopiér brugerstile til mappen %s." From c5603adca96d4e9be0e8927d0415796584485bc7 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Wed, 2 Jun 2010 13:47:00 +0200 Subject: [PATCH 2663/2970] l10n: Updated Danish (da) translation to 99% New status: 627 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/da.po b/po/da.po index 3d06b737..f2c5650b 100644 --- a/po/da.po +++ b/po/da.po @@ -1843,14 +1843,12 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" #: ../midori/midori-view.c:3518 -#, fuzzy msgid "Set number of columns and rows" -msgstr "Indstil antal af kolonner" +msgstr "Indstil antal af kolonner og rækker" #: ../midori/midori-view.c:3519 -#, fuzzy msgid "Enter number of columns and rows:" -msgstr "Angiv antal kolonner:" +msgstr "Angiv antal kolonner og rækker:" #: ../midori/midori-view.c:3520 msgid "Invalid input for the size of the speed dial" @@ -1861,14 +1859,12 @@ msgid "Thumb size:" msgstr "Miniaturestørrelse:" #: ../midori/midori-view.c:3522 -#, fuzzy msgid "Small" -msgstr "Små ikoner" +msgstr "Små" #: ../midori/midori-view.c:3523 -#, fuzzy msgid "Medium" -msgstr "Menu" +msgstr "Mellem" #: ../midori/midori-view.c:3524 msgid "Big" From fc7d3473e497f0c2b619616ad79cdc14bb37efa1 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Wed, 2 Jun 2010 15:07:21 +0200 Subject: [PATCH 2664/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 464 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 249 insertions(+), 215 deletions(-) diff --git a/po/pt.po b/po/pt.po index d7703d2d..71dc0ea7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 10:07+0000\n" +"POT-Creation-Date: 2010-06-02 11:32+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador Web rápido" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -58,172 +58,172 @@ msgstr "Falha ao abrir a base de dados: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico antigo: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi guardada. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram guardados. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram guardados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nenhum certificado root disponível. Os certificados SSL não podem ser verificados." -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão PATTERN" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repor Midori após SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ignorar " @@ -454,7 +454,7 @@ msgid "_Application:" msgstr "_Aplicação:" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." @@ -925,7 +925,7 @@ msgstr "Mostrar barra de estado" msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" @@ -934,19 +934,19 @@ msgstr "Chinês (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" @@ -1102,582 +1102,586 @@ msgstr "Mostrar Página Inicial" msgid "Show last open tabs" msgstr "Mostrar últimos separadores abertos" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Mostrar últimos separadores sem os carregar" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Marque se quiser guardar o último tamanho da janela" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Última página de painel guardada" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Última pesquisa Web" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Mostrar Barra de Transferências" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Marque se quiser mostrar a barra de transferências" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Estilo da Barra de Ferramentas:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Mostrar evolução no endereço" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Marque se quiser mostrar a evolução de carregamento do endereço" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Marque se quiser mostrar motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Marque se quiser mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Marque se quiser alinhar o painel lateral à direita" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Abrir painéis em janelas separadas" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Marque se quiser abrir, sempre, os painéis em janelas separadas" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Ao iniciar Midori:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar Midori" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Página Inicial:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Mostrar ligação rápida em novos separadores" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar ligação rápida em separadores recentemente abertos" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Guardar ficheiros transferidos em:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Perguntar pasta de destino" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Marcar se quiser perguntar por uma pasta de destino ao transferir um ficheiro" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Marque se quiser mostrar uma notificação ao concluir a transferência" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Agregador de Notícias" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Pesquisa de Endereço" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "A pesquisa a executar no endereço" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Marque se quiser que os separadores tenham ícones para fechar" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Abrir páginas externas em:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Marque se quiser abrir os novos separadores em segundo plano" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Marque se quiser abrir os novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Marque se quiser abrir janelas popup em separadores" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Carregar e apresentar automaticamente as imagens " -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activar argumentos" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Activar argumentos de linguagem incorporados" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activar plugins Netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Activar plugins Netscape incorporados" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Activar suporte a dados HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Marque se quiser activar suporte a dados HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Activar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Marque se quiser activar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Activar cache de aplicação web offline" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Marque se quiser activar cache de aplicação web offline" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Marque se quiser ajustar zoom de texto e imagens" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Marque se quiser encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Deslocamento cinético" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Marque se quiser que o deslocamento se mova cineticamente conforme a velocidade" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Apenas aceitar cookies do sítio web original" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "O número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Marque se quiser guardar as últimas páginas visitadas" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Marque se quiser guardar as últimas transferências" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "O tipo de servidor a utilizar" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Servidor Proxy HTTP" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Detectar servidor proxy automaticamente" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Marque se quiser detectar automaticamente o servidor proxy" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Uma lista de idiomas, separada por vírgulas, para o processamento de páginas web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Os dados privados seleccionados para apagar" @@ -1685,8 +1689,8 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 -#: ../midori/midori-view.c:4544 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Erro - %s" @@ -1838,60 +1842,84 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" #: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "Definir número de colunas" +msgid "Set number of columns and rows" +msgstr "Definir número de linhas e colunas" #: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "Indique o número de colunas:" +msgid "Enter number of columns and rows:" +msgstr "Indique o número de linhas e colunas:" #: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "Definir número de atalhos" +msgid "Invalid input for the size of the speed dial" +msgstr "Entrada inválida para o tamanho da ligação rápida" #: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "Indique o número de atalhos" +msgid "Thumb size:" +msgstr "Tamanho das miniaturas:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Pequenas" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Médias" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Grandes" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Actualização de página atrasada" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "O atraso na actualização foi devido a um encerramento brusco ou ás preferências de arranque." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Carregar Página" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4080 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Restaurar Separadores" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Minizar Separadores" -#: ../midori/midori-view.c:4091 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4763 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4764 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2605,11 +2633,11 @@ msgstr "P_ainel de Separadores" msgid "Show tabs in a vertical panel" msgstr "Mostrar separadores em painel vertical" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Lista de Histórico do Separador" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Permite mudar de separadores ao escolher de uma lista ordenada por uso" @@ -2645,6 +2673,12 @@ msgstr "Editar facilmente a barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "Set number of shortcuts" +#~ msgstr "Definir número de atalhos" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Indique o número de atalhos" + #~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "Copiar argumentos de utilizador para a pasta %s e copiar estilos de utilizador para a pasta %s." From 1c330e33bf7aa713c0ac49b8552b44cc61319bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayhan=20YAL=C3=87INSOY?= Date: Wed, 2 Jun 2010 19:36:19 +0200 Subject: [PATCH 2665/2970] l10n: Updated Turkish (tr) translation to 99% New status: 626 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/tr.po | 464 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 249 insertions(+), 215 deletions(-) diff --git a/po/tr.po b/po/tr.po index 23dbac4f..adeb7b61 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-31 16:08+0000\n" +"POT-Creation-Date: 2010-06-02 16:08+0000\n" "PO-Revision-Date: 2010-05-10 09:45+0300\n" "Last-Translator: Ayhan YALÇINSOY \n" "Language-Team: Turkish \n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Hafif web tarayıcı " -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -58,172 +58,172 @@ msgstr "Şu veri tabanı açılamadı: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Eski geçmiş ögeleri silinemedi: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Ayarlar kaydedilemedi. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Arama motorları kaydedilemedi. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Yer imleri kaydedilemedi. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Çöp kutusu kaydedilemedi. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "Oturum kaydedilemedi. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Root yetki dosyası kullanılabilir değil. SSL yetkileri doğrulanamadı." -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori son açıldığında çökmüş görünüyor. Bu devam ederse sorunu çözmek için aşağıdaki seçeneklerden biri deneyin." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "_Tercihleri Değiştir" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Son _oturumu yeniden başlat" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Tüm _eklentiler kapalı" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Oturum yüklenemedi: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Dosya ismi belirtilmedi" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Bilinmeyen bir sorun oluştu." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Ekran görüntüsünü kaydet: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "ADRES'i web uygulaması gibi çalıştır" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "KLASÖR'ü yapılandırma klasörü olarak kullan" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "KLASÖR" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Bir tanılama diyaloğu göster" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Belirtilen dosya ismini javascript olarak çalıştır" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Belirtilen URI'nin bir ekran görüntüsünü al" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Belirtilen komutu çalıştır" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Uygulama sürümünü göster" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Adresler" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "ÖRNEK düzenli ifadeye göre URI engele" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "ÖRNEK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Kullanılmayan süre SANİYELER 'den sonra Midori'yi yeniden başlat" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SANİYELER" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Adresler]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Lütfen yorumlarınızı, isteklerinizi ve yakaladığınız hataları şuraya raporlayın:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Yeni sürümler için şuraya bakın:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "Belirtilen yapılandırma dizini geçersiz." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Şu anda Midori'nin başka bir örneği çalışıyor; ama cevap vermiyor.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Arama motorları yüklenemedi. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Yer imleri yüklenemedi: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Çöp kutusu yüklenemedi: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Geçmiş yüklenemedi: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Şu hatalar ortaya çıktı:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Yoksay" @@ -452,7 +452,7 @@ msgid "_Application:" msgstr "_Uygulamadan:" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Özel..." @@ -926,7 +926,7 @@ msgstr "Durum çubuğunu göster" msgid "_Automatic" msgstr "Otom_atik" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Çince (BIG5)" @@ -935,19 +935,19 @@ msgstr "Çince (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Japonca (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korece (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Rusça (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Batı Avrupa (ISO-8859-1)" @@ -1103,582 +1103,586 @@ msgstr "Anasayfa göster" msgid "Show last open tabs" msgstr "Son açılan sekmeleri göster" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Yüklemeden son sekmeyi göster" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonca (Shift_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Yeni sekme" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Yeni pencere" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Geçerli sekme" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Öntanımlı" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Simgeler" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Küçük simgeler" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Metin" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Simgeler ve metin" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Simgelerin yanında metin" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Otomatik (GNOME veya çevre)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP vekil sunucu" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Vekil sunucu yok" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Bütün çerezler" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Oturum çerezleri" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Yok" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Son pencerenin ölçülerini hatırla" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Son pencere boyu kaydedilsin" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Son pencerenin eni" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Son kaydedilmiş pencere eni" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Son pencere yüksekliği" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Son kaydedilmiş pencere yüksekliği" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Son panel pozisyonu" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Son kaydedilen panel pozisyonu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Son panel sayfası" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Son kaydedilmiş panel sayfası" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Son Web Arama" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Kaydedilmiş son web arama" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Menü Çubuğunu Göster" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Menü çubuğu gösterilsin" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Gezinti Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Navigasyon çubuğu gösterilsin" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Yer İmi Araç Çubuğunu Göster" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Yer imi araç çubuğu gösterilsin" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Paneli Göster" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Panel çubuğu gösterilsin" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Aktarım çubuğunu göster" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Aktarım çubuğu göster açık/kapalı" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Durum Çubuğunu Göster" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Durum çubuğu gösterilsin" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Araç Çubuğu Biçimi:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Araç çubuğunun biçimi" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Yerel girdideki ilerlemeyi göster" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Yerel girdideki yükleme ilerleyişini göster açık/kapalı" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Konum tamamlamada arama motorları" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Konum tamamlamada arama motorlarını göster açık/kapalı" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Araç Çubuğu Öğeleri" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Araç çubuğunun üzerinde gösterilecek ögeler" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Küçük Yan Panel" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Yan panel küçük gösterilsin" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Panelin işletme kontrollerini göster" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Panelin işletme kontrollerini göster açık/kapalı" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Kenar panelini sağda hizala" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Kenar panelini sağa hizala açık/kapalı" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Panelleri ayrı pencerelerde aç" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Her zaman panelleri ayrı pencerelerde aç açık/kapalı" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Midori başlarken:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Midori başlatılırken ne yapılacak" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Anasayfa:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Anasayfa" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Çökme diyaloğunu göster" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Midori çöktükten sonra bir diyalog göster" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Yeni sekmede hızlı aramayı göster" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Yeni açılan sekmelerde hızlı aramayı göster" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "İndirilen dosyaları kaydet:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "İndirilen dosyaların kaydedileceği dizin" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Hedef klasörü sor" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Bir dosyayı indirirken hedef dizini sor açık/kapalı" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Bir aktarım bittiğinde uyar" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Bir aktarım bittiğinde bir uyarı göster açık/kapalı" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "İndirme Yöneticisi" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Harici indirme yöneticisi" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Metin Düzenleyici" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Harici metin düzenleyici" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Haber Toplayıcı" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Harici bir haber toplayıcıda" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Konum Girişi Arama" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Konum girişi içinde yapılacak arama" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Tercih Edilen Kodlama" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Tercih edilen karakter kodlaması" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Sekme Çubuğunu Her Zaman Göster" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Sekme çubuğunu her zaman göster" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Sekmelerde kapatma düğmesi" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Sekmelerde kapatma düğmesi olsun" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Yeni sayfaları aç:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Yeni sayfaların açılacağı yer" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Harici sayfaları aç:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Harici açılmış sayfaların açılacağı yer" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Orta tuşla seçimi aç" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Orta tuşla tıklamasıyla bir adres yükle" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Sekmeleri arkaplanda aç" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Sekmeler arka planda açılsın" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Sekmeleri geçerli sekmeden sonrakine aç" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Yeni sekmelerin hangi sekmeden sonra açılacağını belirle" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Açılır pencereleri sekmelerde aç" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Açılır pencereler sekmelerde açılsın" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Resimleri otomatik yükle" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Resimleri otomatik yükle ve görüntüle" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Betiklere izin ver" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Kodlama dilleri yerleştirmesi açık" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape eklentileri açık" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Gömülü Netscape eklenti nesneleri açık" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "HTML5 veritabanı desteği açık" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "HTML5 veritabanı desteği açık/kapalı" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "HTML5 yerel depolama desteği açık" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 yerel depolama desteği açık/kapalı" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Çevrim dışı web uygulama önbelleği açık" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Çevrim dışı web uygulama önbelleği açık/kapalı" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Metni ve Resimleri yakınlaştır" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Metni ve Resimleri yakınlaştır açık/kapalı" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Yazarken satır içinde ara" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Yazarken otomatik satır içinde ara açık/kapalı" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Hareketli kaydırma" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Kaydırma hıza göre hareketli olarak taşınacak açık/kapalı" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Çerezleri kabul et" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Kabul edilecek çerez türleri" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Sadece gerçek çerezler" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Sadece asıl internet sitelerinden gelen çerezleri kabul et" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "En çok çerez süresi" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Çerezlerin saklanacağı en çok gün sayısı" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Son ziyaret edilen sayfaları hatırla" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Eğer son ziyaret edilen sayfalar kaydedilmişse" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "En çok geçmiş süresi" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Geçmişin saklanacağı en çok gün sayısı" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Son indirilmiş dosyaları hatırla" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Eğer son indirilmiş dosyalar kaydedilmişse" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Vekil sunucu" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Kullanılacak vekil sunucunun türü" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP Vekil Sunucu" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "HTTP bağlantıları için kullanılan vekil sunucu" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Vekil sunucuyu otomatik olarak belirle" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Vekil sunucuyu ortamdan otomatik olarak belirle açık/kapalı" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Belirle" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Web sayfasını belirle" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Tanımlama dizesi" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Uygulama tanımlama dizesi" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Tercih diller" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Çok dilli web sayfalarını taramak için önerilen dillerin listesi bir virgül ile ayrılır, örneğin \"de\",\"ru,nl\" veya \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Kişisel veri temizle" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Silmek için kişisel veri seçildi" @@ -1686,8 +1690,8 @@ msgstr "Silmek için kişisel veri seçildi" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 -#: ../midori/midori-view.c:4544 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Hata - %s" @@ -1839,60 +1843,84 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "Bu kısayolu silmek istediğinizden emin misiniz?" #: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "Sütun sayısını ayarla" +msgid "Set number of columns and rows" +msgstr "Satır ve sütun sayısını ayarla" #: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "Sütun sayısını gir" +msgid "Enter number of columns and rows:" +msgstr "Satır ve sütun sayısını gir" #: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "Kısayol sayısını ayarla" +msgid "Invalid input for the size of the speed dial" +msgstr "" #: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "Kısayol sayısını gir" +msgid "Thumb size:" +msgstr "Küçük resim boyutu:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Küçük" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Orta" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Büyük" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Belge görüntülenemedi" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Kurulmuş belgelendirme yok" -#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Sayfa yükleme gecikmesi" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Sayfa Yükle" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Boş sayfa" -#: ../midori/midori-view.c:4080 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "Sekmeyi Çoğalt" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "Sekmeyi Ye_rleştir" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "Sekmeyi küçült" -#: ../midori/midori-view.c:4091 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "_Diğer Sekmeleri Kapat" -#: ../midori/midori-view.c:4763 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Arkaplan resimlerini yazdır" -#: ../midori/midori-view.c:4764 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Arka fon resimlerini yaz açık/kapalı" -#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Özellikler" @@ -2606,11 +2634,11 @@ msgstr "Sekme P_aneli" msgid "Show tabs in a vertical panel" msgstr "Sekmeleri bir dikey panelde göster" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Sekme Geçmiş Listesi" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Son kullanım tarafından seçilmiş bir listeden seçilerek sekmelerin değişmesine izin verir" @@ -2646,6 +2674,12 @@ msgstr "Araç çubuğunu kolayca düzenler" msgid "Cache HTTP communication on disk" msgstr "Diskteki HTTP iletişimi önbelleği" +#~ msgid "Set number of shortcuts" +#~ msgstr "Kısayol sayısını ayarla" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Kısayol sayısını gir" + #~ msgid "User_styles" #~ msgstr "Kullanıcı _biçimleri" From 7a1c84d96e9dfcf99aa2925f0d69d7c28ae2f0f1 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Thu, 3 Jun 2010 21:54:47 +0200 Subject: [PATCH 2666/2970] Update Russian translation --- po/ru.po | 1051 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 589 insertions(+), 462 deletions(-) diff --git a/po/ru.po b/po/ru.po index 26cbc0e5..5090351a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the midori package. # Troitskiy Nikita 2008 # Anton Shestakov 2008-2009 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 04:08+0000\n" -"PO-Revision-Date: 2010-04-09 12:45+0800\n" +"POT-Creation-Date: 2010-06-02 19:47+0900\n" +"PO-Revision-Date: 2010-06-02 20:35+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,9 +22,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1353 +#: ../midori/main.c:1683 +#: ../midori/main.c:1691 +#: ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -41,12 +45,14 @@ msgstr "Не удалось загрузить настройки: %s\n" msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:158 +#: ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 +#: ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" @@ -57,172 +63,177 @@ msgstr "Не удалось открыть базу данных: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 +#: ../midori/main.c:564 +#: ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 +#: ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 +#: ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 +#: ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Игнорировать" @@ -230,7 +241,8 @@ msgstr "_Игнорировать" msgid "File not found." msgstr "Файл не найден." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:462 +#: ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." msgstr "Плохо сформированный документ." @@ -239,801 +251,851 @@ msgstr "Плохо сформированный документ." msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 +#: ../midori/midori-array.c:718 +#: ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 +#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 +#: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 +#: ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 +#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 +#: ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 +#: ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 +#: ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s из %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл «%s» загружен." -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 +#: ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "Некоторые файлы загружаются" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "Выход из Midori" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori" -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" +"В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." + +#: ../midori/midori-browser.c:2468 +#: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 +#: ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:3084 +#: ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 +#: ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/midori-browser.c:3785 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 +#: ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 +#: ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 +#: ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 +#: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 +#: ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 +#: ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 +#: ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 +#: ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 +#: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 +#: ../midori/sokoke.c:1306 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 +#: ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 +#: ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 +#: ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 +#: ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 +#: ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 +#: ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистить все" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -1063,20 +1125,25 @@ msgstr "Не удалось выполнить запрос к базе данн msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:432 +#: ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:444 +#: ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 +#: ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:456 +#: ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:640 +#: ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" @@ -1096,582 +1163,590 @@ msgstr "Открыть домашнюю страницу" msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Открыть последние страницы без загрузки" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 +#: ../katze/katze-utils.c:667 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Показать элементы управления панелью" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Показывать элементы управления панелью" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Открывать панели в отдельных окнах" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Панели при открытии будут отделены от главного окна" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Показывать панель быстрого набора в новых вкладках" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Показывать панель быстрого набора в только что открытых вкладках" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Запрашивать папку для загрузок" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Запрашивать конечную папку для каждого файла" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Уведомлять по завершении передачи" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Показывать уведомление по окончании передачи файлов" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Открывать внешние страницы в:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 +#: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Включить поддержку баз данных HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Включить поддержку баз данных стандарта HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища (localStorage) стандарта HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Кэшировать данные веб-приложений для автономной работы" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Изменять масштаб изображений при масштабировании страницы" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Инерционная прокрутка" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Только оригинальные фрагменты данных" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Принимать фрагменты данных только с оригинального сайта" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Хранить историю за последние" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Тип прокси-сервера" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Предпочитаемые языки" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Список предпочитаемых языков для отображения многоязычных страниц, например, «de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" @@ -1679,8 +1754,9 @@ msgstr "Выбранные для удаления личные данные" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 +#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" @@ -1700,16 +1776,19 @@ msgstr "Попытаться снова" msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1520 +#: ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2139 +#: ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2191 +#: ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" @@ -1721,7 +1800,8 @@ msgstr "Открыть ссылку в новой _активной вкладк msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" @@ -1733,15 +1813,18 @@ msgstr "Открыть ссылку как веб-_приложение" msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2208 +#: ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2243 #: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" @@ -1778,7 +1861,8 @@ msgstr "Загрузить _видео" msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2337 +#: ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Найти в сети" @@ -1786,106 +1870,131 @@ msgstr "_Найти в сети" msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Установить число колонок" +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "Установить количество закладок" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Введите число колонок:" +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "Введите число столбцов и строк:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Установить число закладок" +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "Проверьте правильность ввода" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Введите число закладок:" +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Размер миниатюр:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Маленький" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Средний" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Большой" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Загрузка страницы отложена" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Загрузить страницу" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 +#: ../midori/midori-preferences.c:381 msgid "Features" msgstr "Возможности" @@ -1898,11 +2007,13 @@ msgstr "Общие" msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:321 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:331 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Передачи" @@ -2012,7 +2123,8 @@ msgid "External applications" msgstr "Внешние приложения" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:486 msgid "Network" msgstr "Сеть" @@ -2029,7 +2141,8 @@ msgstr "Конфиденциальность" msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:535 msgid "days" msgstr "дней" @@ -2236,12 +2349,14 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:498 +#: ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:544 +#: ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Выберите файл" @@ -2309,7 +2424,8 @@ msgstr "Стили пользователя" msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1086 +#: ../extensions/addons.c:1253 msgid "User addons" msgstr "Пользовательские дополнения" @@ -2434,25 +2550,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Последнее обновление: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Ленты" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Добавить ленту" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Удалить ленту" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "Л_енты" @@ -2487,25 +2603,25 @@ msgstr "Не удалось найти обязательные элементы msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Ошибка" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Лента «%s» уже была добавлена" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Не удалось загрузить ленту «%s»" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Панель лент новостей" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" @@ -2540,7 +2656,8 @@ msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Контейнер" @@ -2588,7 +2705,8 @@ msgstr "Настройка возможностей" msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:568 +#: ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Панель вкладок" @@ -2600,11 +2718,11 @@ msgstr "П_анель вкладок" msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "История вкладок" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Отображает список вкладок в порядке времени последнего использования" @@ -2640,8 +2758,17 @@ msgstr "Простой редактор панели инструментов" msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Установленными считаются пользовательские сценарии, расположенные в «%s» и стили, расположенные в «%s»." +#~ msgid "Set number of shortcuts" +#~ msgstr "Установить число закладок" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Введите число закладок:" + +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Установленными считаются пользовательские сценарии, расположенные в «%s» " +#~ "и стили, расположенные в «%s»." #~ msgid "Open _Link" #~ msgstr "_Открыть ссылку" From 57b05a458e9de909bbe19b093d0ceb5490b34b7a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 3 Jun 2010 22:20:15 +0200 Subject: [PATCH 2667/2970] Replace {enter_dial_size}, not {enter_dial_width} --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index e7c36df2..b1e0ba67 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3516,7 +3516,7 @@ midori_view_set_uri (MidoriView* view, "{enter_shortcut_name}", _("Enter shortcut title"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), "{set_dial_size}", _("Set number of columns and rows"), - "{enter_dial_width}", _("Enter number of columns and rows:"), + "{enter_dial_size}", _("Enter number of columns and rows:"), "{invalid_dial_size}", _("Invalid input for the size of the speed dial"), "{set_thumb_size}", _("Thumb size:"), "{set_thumb_small}", _("Small"), From a2330c57f65723e76328430160304d7aaab0d8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Fri, 4 Jun 2010 00:26:01 +0200 Subject: [PATCH 2668/2970] l10n: Updates to Croatian (hr) translation New status: 465 messages complete with 0 fuzzies and 164 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 623 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 333 insertions(+), 290 deletions(-) diff --git a/po/hr.po b/po/hr.po index 794fd252..be7e9d33 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-31 10:08+0000\n" -"PO-Revision-Date: 2010-05-31 23:45+0200\n" +"POT-Creation-Date: 2010-06-03 16:08+0000\n" +"PO-Revision-Date: 2010-06-04 00:23+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lagani web preglednik" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -39,12 +39,12 @@ msgstr "Konfiguracija ne može biti učitana: %s\n" #: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "" +msgstr "Vrijednost '%s' nije valjana za %s" #: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" -msgstr "" +msgstr "Neispravna konfiguracijska vrijednost '%s'" #: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format @@ -55,197 +55,197 @@ msgstr "Neuspjelo otvaranje baze podataka: %s\n" #: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n" +msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Konfiguracija ne može biti spremljena %s" +msgstr "Konfiguracija ne može biti spremljena. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Tražilice ne mogu biti spremljene %s" +msgstr "Tražilice ne mogu biti spremljene. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Zabilješke na mogu biti spremljene %s" +msgstr "Zabilješke na mogu biti spremljene. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Smeće ne može biti spremljeno %s" +msgstr "Smeće ne može biti spremljeno. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" -msgstr "Sesija ne može biti spremljena %s" +msgstr "Sesija ne može biti spremljena. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" -msgstr "Izmjeni_osobitosti" +msgstr "Izmjeni _osobitosti" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Obnovi posljednju _sesiju" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" -msgstr "Onemogući sva_proširenja" +msgstr "Onemogući sva _proširenja" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesija ne može biti učitana: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Nije navedeno ime datoteke" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." -msgstr "Nepoznata greška" +msgstr "Nepoznata greška." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Pokreni Adresu kao web aplikaciju" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" -msgstr "Adresa" +msgstr "ADRESA" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Koristi MAPU kao konfiguracijsku mapu" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "MAPA" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Pokaži dijagnostički dijalog" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Pokreni naznačeno ime datoteke kao javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Izvrši naznačenu naredbu" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Prikaži verziju programa" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "UZORAK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SEKUNDE" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" -msgstr "Prijavite komentare,sugestije i probleme" +msgstr "Prijavite komentare,sugestije i probleme u:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Provjeri za nove verzije na:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" -msgstr "" +msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Tražilice ne nogu biti učitane: %s\n" +msgstr "Tražilice ne nogu biti učitane: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Zabilješke ne mogu biti učitane: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "Smeće ne može biti učitano: %s\n" +msgstr "Smeće ne može biti učitano: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Povijest ne može biti učitana: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Došlo je do slijedeće greške:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ignoriraj" #: ../midori/midori-array.c:428 msgid "File not found." -msgstr "Datoteka nije pronađena" +msgstr "Datoteka nije pronađena." #: ../midori/midori-array.c:462 ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." -msgstr "Deformirani dokument" +msgstr "Deformirani dokument." #: ../midori/midori-array.c:504 msgid "Unrecognized bookmark format." -msgstr "Neprepoznati format zabilješke" +msgstr "Neprepoznati format zabilješke." #: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." -msgstr "Neuspjelo pisanje" +msgstr "Neuspjelo pisanje." #: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 #: ../midori/midori-browser.c:5589 @@ -264,12 +264,12 @@ msgstr "%d%% učitano" #: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" -msgstr "" +msgstr "Neuspjeh u ažuriranju naslova: %s\n" #: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." -msgstr "" +msgstr "Neočekivana radnja '%s'." #: ../midori/midori-browser.c:726 msgid "New folder" @@ -289,20 +289,20 @@ msgstr "Uredi zabilješku" #: ../midori/midori-browser.c:759 msgid "_Title:" -msgstr "_Naslov" +msgstr "_Naslov:" #: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" -msgstr "_Opis" +msgstr "_Opis:" #: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" -msgstr "_Adresa" +msgstr "_Adresa:" #: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" -msgstr "_Mapa" +msgstr "_Mapa:" #: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 #: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 @@ -407,12 +407,12 @@ msgstr "Ne mogu pokrenuti vanjski program" #: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" -msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" +msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" #: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" -msgstr "Otvori sve u _Karticama" +msgstr "Otvori sve u _karticama" #: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 @@ -446,7 +446,7 @@ msgstr "Epiphany" #: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." -msgstr "Uvezi zabilješke" +msgstr "Uvezi zabilješke..." #: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" @@ -454,13 +454,13 @@ msgstr "_Uvezi zabilješke" #: ../midori/midori-browser.c:4704 msgid "_Application:" -msgstr "_Program" +msgstr "_Program:" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." -msgstr "Prilagođeno" +msgstr "Prilagođeno..." #: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" @@ -487,7 +487,7 @@ msgstr "_Očisti privatne podatke" #: ../midori/midori-browser.c:5020 msgid "Clear the following data:" -msgstr "Očisti slijedeće podatke" +msgstr "Očisti slijedeće podatke:" #: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 @@ -532,7 +532,7 @@ msgstr "" #: ../midori/midori-browser.c:5187 msgid "translator-credits" -msgstr "Ivica Kolić ikoli@yahoo.com" +msgstr "Ivica Kolić " #: ../midori/midori-browser.c:5496 msgid "_File" @@ -628,7 +628,7 @@ msgstr "" #: ../midori/midori-browser.c:5549 msgid "Cut the selected text" -msgstr "Izreži označenii tekst" +msgstr "Izreži označeni tekst" #: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" @@ -652,7 +652,7 @@ msgstr "Nađi riječ ili frazu na stranici" #: ../midori/midori-browser.c:5569 msgid "Find _Next" -msgstr "Nađ i_Slijedeće" +msgstr "Nađi _Slijedeće" #: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" @@ -680,11 +680,11 @@ msgstr "_Alatne trake" #: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" -msgstr "" +msgstr "Povećaj zoom razinu" #: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" -msgstr "" +msgstr "Smanji zoom razinu" #: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" @@ -692,7 +692,7 @@ msgstr "" #: ../midori/midori-browser.c:5599 msgid "_Encoding" -msgstr "" +msgstr "_Kodiranje" #: ../midori/midori-browser.c:5601 msgid "View So_urce" @@ -932,7 +932,7 @@ msgstr "Pokaži statusnu traku" msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" @@ -941,19 +941,19 @@ msgstr "Kineski (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" @@ -963,7 +963,7 @@ msgstr "_Razdjelnik" #: ../midori/midori-browser.c:6307 msgid "_Location..." -msgstr "_Lokacija" +msgstr "_Lokacija..." #: ../midori/midori-browser.c:6309 msgid "Open a particular location" @@ -971,7 +971,7 @@ msgstr "Otvori određenu lokaciju" #: ../midori/midori-browser.c:6333 msgid "_Web Search..." -msgstr "_Web pretraživanje" +msgstr "_Web pretraživanje..." #: ../midori/midori-browser.c:6335 msgid "Run a web search" @@ -1109,584 +1109,588 @@ msgstr "Pokaži početnu stranicu" msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Pokaži zadnje kartice bez učitavanja" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:259 -msgid "Default" -msgstr "Početno" - #: ../midori/midori-websettings.c:260 +msgid "Default" +msgstr "Zadano" + +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" -msgstr "Tekst ispod ikona" +msgstr "Tekst pored ikona" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Nema proxy poslužitelja" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Svi kolačići" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Kolačići sesije" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Nijedan" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Zadnja širina prozora" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Zadnja sačuvana širina prozora" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Zadnja pozicija ploče" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Zadnja spremljena pozicija ploče" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 -msgid "Last panel page" -msgstr "zadnja stranica ploče" - #: ../midori/midori-websettings.c:425 +msgid "Last panel page" +msgstr "Zadnja stranica ploče" + +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Zadnja spremljena stranica ploče" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Pokaži ploču" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" -msgstr "" +msgstr "Stavke za prikazivanje u alatnoj traci" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-websettings.c:604 -msgid "Open panels in separate windows" -msgstr "Otvori panele u zasebnim prozorima" - #: ../midori/midori-websettings.c:605 +msgid "Open panels in separate windows" +msgstr "Otvori ploče u zasebnim prozorima" + +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Kad se Midori pokrene" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Što učiniti kad se Midori pokrene" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Početna stranica" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Pokaži brzo biranje u novim karticama" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Pokaži brzo biranje u novootvorenim karticama" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Pitaj za odredišni direktorij" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Obavijesti kad je prijenos kompletiran" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:793 -msgid "Open new pages in:" -msgstr "Otvori nove stranice u" - #: ../midori/midori-websettings.c:794 +msgid "Open new pages in:" +msgstr "Otvori nove stranice u:" + +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Otvori vanjske stranice u:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:831 -msgid "Open Tabs next to Current" -msgstr "" - #: ../midori/midori-websettings.c:832 +msgid "Open Tabs next to Current" +msgstr "Otvori kartice do trenutne" + +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Učitaj i prikaži slike automatski" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" -msgstr "Omoogući Netscape priključke" +msgstr "Omogući Netscape priključke" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Omogući podršku za HTML5 bazu podataka" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Omogući podršku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Prihvati kolačiće" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Koju vrstu kolačića prihvatiti" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Samo izvorne kolačiće" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Prihvati kolačiće samo sa izvorne web stranice" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "Maksimalni broj dana za spremanje kolačića" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Zapamti zadnju posjećenu stranicu" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" -msgstr "" +msgstr "Maksimalni broj dana za spremanje povijesti" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Zapamti zadnje preuzete datoteke" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP Proxy poslužitelj" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Proxy poslužitelj korišten za HTTP spajanja" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1123 -msgid "Preferred languages" -msgstr "" - #: ../midori/midori-websettings.c:1124 +msgid "Preferred languages" +msgstr "Željeni jezici" + +#: ../midori/midori-websettings.c:1125 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" @@ -1694,11 +1698,11 @@ msgstr "Privatni podaci odabrani za brisanje" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 -#: ../midori/midori-view.c:4544 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" -msgstr "Greška %s" +msgstr "Greška - %s" #: ../midori/midori-view.c:1262 #, c-format @@ -1726,7 +1730,7 @@ msgstr "" #: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" -msgstr "Otvori poveznicu u novoj_kartici" +msgstr "Otvori poveznicu u novoj _kartici" #: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" @@ -1734,11 +1738,11 @@ msgstr "" #: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" -msgstr "Otvori poveznicu u pozadinskoj_kartici" +msgstr "Otvori poveznicu u _pozadinskoj kartici" #: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" -msgstr "Otvori poveznicu u novom_prozoru" +msgstr "Otvori poveznicu u novom _prozoru" #: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" @@ -1799,7 +1803,7 @@ msgstr "" #: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" -msgstr "Otvori adresu u novoj_kartici" +msgstr "Otvori adresu u novoj _kartici" #: ../midori/midori-view.c:2661 msgid "Open or download file" @@ -1819,7 +1823,7 @@ msgstr "Tip datoteke: %s ('%s')" #: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" -msgstr "Otvori %s" +msgstr "Otvori %s" #: ../midori/midori-view.c:3231 #, c-format @@ -1832,7 +1836,7 @@ msgstr "Brzo biranje" #: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" -msgstr "Klik za dodavanje prečace" +msgstr "Klik za dodavanje prečaca" #: ../midori/midori-view.c:3515 msgid "Enter shortcut address" @@ -1847,60 +1851,84 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" #: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "Postavi broj stupaca" +msgid "Set number of columns and rows" +msgstr "Postavi broj stupaca i redova" #: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "Unesi broj stupaca" +msgid "Enter number of columns and rows:" +msgstr "Unesi broj stupaca i redova" #: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "Postavi broj prečaca" +msgid "Invalid input for the size of the speed dial" +msgstr "Neispravni unos za veličinu brzog biranja" #: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "Unesi broj prečaca" +msgid "Thumb size:" +msgstr "" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Male" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Srednje" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Velike" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Dokument ne može biti prikazan" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Odgođeno učitavanje stranice" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Učitaj stranicu" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4080 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Obnovi karticu" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Minimiziraj karticu" -#: ../midori/midori-view.c:4091 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4763 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:4764 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "" @@ -2005,6 +2033,8 @@ msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" msgstr "" +"Zarezom odijeljena lista jezika koja će se koristiti za provjeru pravopisa," +"npr. \"en_GB,de_DE\"" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2084,7 +2114,7 @@ msgstr "_Zabilješka" #: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" -msgstr "Dodaj_zabilješku" +msgstr "Dodaj za_bilješku" #: ../midori/sokoke.c:1297 msgid "_Console" @@ -2165,7 +2195,7 @@ msgstr "" #: ../panels/midori-history.c:274 msgid "" "The clock time lies in the past. Please check the current date and time." -msgstr "" +msgstr "Vrijeme sata je u prošlosti.Provjerite trenutni dan i vrijeme." #: ../panels/midori-history.c:286 msgid "A week ago" @@ -2218,7 +2248,7 @@ msgstr "Kopiraj lokaciju po_veznice" #: ../katze/katze-http-auth.c:214 msgid "Authentication Required" -msgstr "" +msgstr "Potrebna ovjera" #: ../katze/katze-http-auth.c:230 msgid "" @@ -2257,7 +2287,7 @@ msgstr "" #: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "" +msgstr "Svojstvo '%s' nije valjano za %s" #: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" @@ -2270,7 +2300,7 @@ msgstr "Izaberi mapu" #: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" -msgstr "Osobitosti za %s" +msgstr "Osobitosti za %s" #: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" @@ -2293,7 +2323,7 @@ msgstr "Uredi pravilo" #: ../extensions/adblock.c:854 msgid "_Rule:" -msgstr "_Pravilo" +msgstr "_Pravilo:" #: ../extensions/adblock.c:908 msgid "Bl_ock image" @@ -2399,10 +2429,16 @@ msgid "" "Secure: %s\n" "Expires: %s" msgstr "" +"Glavno računalo: %s\n" +"Ime: %s\n" +"Vrijednost: %s\n" +"Staza: %s\n" +"Sigurno: %s\n" +"Ističe: %s" #: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" -msgstr "DA" +msgstr "Da" #: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" @@ -2441,7 +2477,7 @@ msgstr "_Upravitelj kolačićima" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "" +msgstr "Listaj,pogledaj i izbriši kolačiće" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2576,7 +2612,7 @@ msgstr "Prilagodi kratice tipkovnice" #: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." -msgstr "Prilagodi kr_atice" +msgstr "Prilagodi kr_atice..." #: ../extensions/shortcuts.c:315 msgid "Shortcuts" @@ -2618,13 +2654,14 @@ msgstr "K_artica ploče" msgid "Show tabs in a vertical panel" msgstr "Pokaži kartice u okomitoj ploči" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Kartica lista povijesti" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "" +"Dozvoli prebacivanje kartica izborom sa liste poredanih po zadnjoj upotrebi" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2646,7 +2683,7 @@ msgstr "Prikazane stavke" #: ../extensions/toolbar-editor.c:577 msgid "Customize _Toolbar..." -msgstr "Prilagodi_Alatnu traku" +msgstr "Prilagodi_Alatnu traku..." #: ../extensions/toolbar-editor.c:608 msgid "Toolbar Editor" @@ -2659,3 +2696,9 @@ msgstr "Jednostavno uređivanje izgleda alatnih traka" #: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "" + +#~ msgid "Set number of shortcuts" +#~ msgstr "Postavi broj prečaca" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Unesi broj prečaca" From fc88d4bed36451de530c5854a02751cb17ff71f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Mart=C3=ADn?= Date: Fri, 4 Jun 2010 10:24:23 +0200 Subject: [PATCH 2669/2970] l10n: Updated Spanish (Castilian) (es) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/es.po | 1282 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 711 insertions(+), 571 deletions(-) diff --git a/po/es.po b/po/es.po index cc5f562b..113a219e 100644 --- a/po/es.po +++ b/po/es.po @@ -7,13 +7,13 @@ # Elega 2009 # Guillermo Iguarán 2009 # Abel Martín 2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-21 16:06+0000\n" -"PO-Revision-Date: 2010-03-29 13:40+0100\n" +"POT-Creation-Date: 2010-06-04 04:08+0000\n" +"PO-Revision-Date: 2010-06-04 10:22+0100\n" "Last-Translator: Abel Martín \n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" @@ -25,9 +25,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web ligero" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1342 ../midori/main.c:1670 -#: ../midori/main.c:1678 ../midori/main.c:1694 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1353 +#: ../midori/main.c:1683 +#: ../midori/main.c:1691 +#: ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -35,198 +38,205 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:103 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:152 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor '%s' no es válido para %s" -#: ../midori/main.c:159 ../midori/main.c:245 +#: ../midori/main.c:158 +#: ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración inválido '%s'" -#: ../midori/main.c:371 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 +#: ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Fallo al abrir la base de datos: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:426 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Fallo al quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:446 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/main.c:484 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudieron guardar los motores de búsqueda. %s" -#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573 +#: ../midori/main.c:514 +#: ../midori/main.c:564 +#: ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:603 ../midori/main.c:626 +#: ../midori/main.c:614 +#: ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:690 ../midori/main.c:930 +#: ../midori/main.c:696 +#: ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:874 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "No hay ningún archivo de cerficado raíz disponible. Los certificados SSL no se pueden verificar." -#: ../midori/main.c:964 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." -#: ../midori/main.c:979 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:983 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Restaurar la última _sesión" -#: ../midori/main.c:988 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Deshabilitar todas las _extensiones" -#: ../midori/main.c:1223 ../midori/main.c:1943 +#: ../midori/main.c:1229 +#: ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1342 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "No se especificó el nombre del archivo" -#: ../midori/main.c:1361 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." -#: ../midori/main.c:1392 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada en: %s\n" -#: ../midori/main.c:1563 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Ejecutar DIRECCIÓN como una aplicación web" -#: ../midori/main.c:1563 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "DIRECCIÓN" -#: ../midori/main.c:1566 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Utilizar CARPETA como carpeta de configuración" -#: ../midori/main.c:1566 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1569 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1571 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Ejecute el nombre de archivo especificado como javascript" -#: ../midori/main.c:1574 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Tomar una captura de la URL especificada" -#: ../midori/main.c:1577 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Ejecutar el comando especificado" -#: ../midori/main.c:1579 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1581 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:1583 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs según PATRÓN de expresión regular" -#: ../midori/main.c:1583 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1587 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad" -#: ../midori/main.c:1587 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1667 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/main.c:1695 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:1697 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:1794 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuración especificada no es válida." -#: ../midori/main.c:1842 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/main.c:1897 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No se pudieron cargar los motores de búsqueda. %s\n" -#: ../midori/main.c:1926 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "No se pudieron cargar los marcadores: %s\n" -#: ../midori/main.c:1958 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1972 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:1986 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:2002 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ignorar" @@ -234,7 +244,8 @@ msgstr "_Ignorar" msgid "File not found." msgstr "Archivo no encontrado." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:462 +#: ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." msgstr "Documento defectuoso." @@ -243,256 +254,322 @@ msgstr "Documento defectuoso." msgid "Unrecognized bookmark format." msgstr "Formato de marcador no reconocido." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 +#: ../midori/midori-array.c:718 +#: ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5433 -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:334 +#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:344 +#: ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Detener la carga de la página actual" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% cargado" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Fallo al actualizar el título: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada '%s'." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nueva carpeta" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 +#: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 +#: ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Dirección:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4588 +#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4593 ../midori/midori-browser.c:4625 +#: ../midori/midori-browser.c:831 +#: ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 +#: ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:862 +msgid "Add to _Speed Dial" +msgstr "Añadir a marcación _rápida" + +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Mostrar en la _barra de herramientas" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Ejecutar como aplicación _web" -#: ../midori/midori-browser.c:981 ../midori/midori-browser.c:4643 -#: ../midori/midori-browser.c:4675 +#: ../midori/midori-browser.c:984 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "No hay suficiente espacio para descargar \"%s\"." + +#: ../midori/midori-browser.c:988 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "El archivo necesita %s pero solo quedan %s libres." + +#: ../midori/midori-browser.c:1045 +#: ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1355 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1418 +#: ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1391 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "El archivo '%s' ha sido descargado." -#: ../midori/midori-browser.c:1395 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Transferencia completa" -#: ../midori/midori-browser.c:1535 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Guardar archivo" -#: ../midori/midori-browser.c:2258 +#: ../midori/midori-browser.c:1915 +#: ../midori/midori-browser.c:1917 +msgid "Some files are being downloaded" +msgstr "Se está descargando algunos archivos" + +#: ../midori/midori-browser.c:1921 +msgid "_Quit Midori" +msgstr "_Cerrar Midori" + +#: ../midori/midori-browser.c:1923 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Se cancelarán las descargas si Midori se cierra." + +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2334 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"La URI de arriba abre un nuevo canal de noticias. Normalmente hay un botón \"Nueva subscripción\", \"Nuevo canal de noticias\" o similar.\n" +"Alternativamente vaya a Preferencias, Aplicaciones en Midori y elija Canal de noticias. La próxima vez que haga clic en un icono de canal de noticias se añadirá automáticamente." + +#: ../midori/midori-browser.c:2468 +#: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nuevo canal" -#: ../midori/midori-browser.c:2375 ../midori/midori-browser.c:5498 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2511 +#: ../midori/midori-browser.c:5648 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:2933 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:3084 +#: ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" -#: ../midori/midori-browser.c:3013 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 +#: ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-browser.c:3634 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3785 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." -#: ../midori/midori-browser.c:3948 ../midori/midori-browser.c:5892 +#: ../midori/midori-browser.c:4099 +#: ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n" -#: ../midori/midori-browser.c:4281 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4432 +#: ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todo en _pestañas" -#: ../midori/midori-browser.c:4288 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 +#: ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:4291 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 +#: ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 +#: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:4514 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4516 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4517 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4518 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4539 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4542 ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:4693 +#: ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4553 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Aplicación:" -#: ../midori/midori-browser.c:4580 ../midori/midori-browser.c:5607 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 -#: ../katze/katze-utils.c:688 +#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:319 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Fallo al importar marcadores" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Fallo al exportar marcadores" -#: ../midori/midori-browser.c:4744 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 +#: ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No se han podido quitar los elementos del historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:4869 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Borrar los siguientes datos:" -#: ../midori/midori-browser.c:4880 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 +#: ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4891 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Íconos de sitios web" -#: ../midori/midori-browser.c:4901 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:5052 +#: ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Pestañas cerradas" -#: ../midori/midori-browser.c:4906 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 +#: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Caché web" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Borrar datos privados al _salir de Midori" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Un navegador web ligero" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5168 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta librería es software libre; puede redistribuirla y/o modificarla bajo los términos de la Licencia Pública General Reducida GNU tal y como es publicada por la Free Software Foundation; bien versión 2.1 de la licencia o (según su criterio) cualquier versión posterior." -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -502,519 +579,529 @@ msgstr "" "Guillermo Iguarán \n" "Abel Martín " -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:5348 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5498 +#: ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "_Navegación privada" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "No guardar datos durante la navegación privada" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Añadir a marcación rápida" -#: ../midori/midori-browser.c:5365 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Añadir acceso directo a marcación rápida" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Añadir acceso directo en el _escritorio" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Añadir acceso directo en el escritorio" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Suscribirse a _canal de noticias" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Suscribirse a este canal de noticias" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Cerrar ésta ventana" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Deshacer la última modificación" -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Rehacer la última modificación" -#: ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:5402 ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Pegar texto del portapapeles" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:5414 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar la siguiente aparición de una palabra o una frase" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar la anterior aparición de una palabra o una frase" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Ver el código fuente de la página" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Desplazar hacia la _izquierda" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Desplazar hacia la izquierda" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Desplazar hacia a_bajo" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Desplazar hacia abajo" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Desplazar hacia a_rriba" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Desplazar hacia arriba" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Desplazar hacia la _derecha" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Desplazar hacia la derecha" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5474 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Retroceder una página" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Avanzar una página" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Ir a la sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Ir a la sub-página siguiente" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Abrir página de inicio" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "Des_hacer el cierre de pestaña" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Abrir la última pestaña cerrada" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Añadir una nueva _carpeta" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5509 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Administrar motores de búsqueda" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar y quitar motores de búsqueda..." -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "_Inspeccionar página" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar detalles de página y acceder a herramientas de desarrollo..." -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "_Pestaña anterior" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "_Pestaña siguiente" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "Foco en la pestaña a_ctual" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Foco en la pestaña actual" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Abrir la última _sesión" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Abrir las pestañas guardadas en la última sesión" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "_Reportar un error" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Abrir el rastreador de errores de Midori" -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Mostrar información sobre el programa" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "_Barra de menú" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Mostrar la barra de menú" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "_Barra de navegación" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "_Barra de transferencias" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "_Barra de estado" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5588 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5738 +#: ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japonés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5745 +#: ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreano (EUC-KR)" -#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5748 +#: ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5601 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5751 +#: ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5604 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5754 +#: ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6152 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6159 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:6161 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Abrir una dirección en particular" -#: ../midori/midori-browser.c:6185 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "_Buscar en la web..." -#: ../midori/midori-browser.c:6187 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Realizar una búsqueda en la web" -#: ../midori/midori-browser.c:6208 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:6223 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:6225 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Abre las páginas que usted visitó anteriormente" -#: ../midori/midori-browser.c:6240 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6388 +#: ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6242 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardados." -#: ../midori/midori-browser.c:6257 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:6270 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "_Ventanas" -#: ../midori/midori-browser.c:6272 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pestañas abiertas" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "_Menú" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6492 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "_Buscar:" -#: ../midori/midori-browser.c:6523 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6528 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Siguiente" -#: ../midori/midori-browser.c:6533 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Coincidir mayúsculas " -#: ../midori/midori-browser.c:6542 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Destacar coincidencias" -#: ../midori/midori-browser.c:6554 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../midori/midori-browser.c:6600 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6748 +#: ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpiar todo" -#: ../midori/midori-browser.c:6958 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" @@ -1044,616 +1131,628 @@ msgstr "Fallo al ejecutar sentencia de base de datos\n" msgid "Paste and p_roceed" msgstr "Pegar y c_ontinuar" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 +#: ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Separar el panel elegido de la ventana" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 +#: ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 +#: ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 +#: ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 +#: ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Alinear el panel a la izquierda" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Ocultar _controles de operación" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Mostrar página en blanco" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Mostar página de inicio" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Mostrar las últimas pestañas abiertas" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Mostrar las últimas etiquetas sin cargar" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Íconos" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Iconos pequeños" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Iconos y texto" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Texto al lado de los íconos" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME o entorno)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Sin servidor proxy" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Todas las cookies" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Cookies de la sesión" -#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:664 +#: ../midori/midori-websettings.c:299 +#: ../katze/katze-utils.c:667 msgid "None" msgstr "Ninguna" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Última búsqueda web" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Última búsqueda web guardada" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Si se desea mostrar la barra de menú" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Si se desea mostrar la barra de navegación" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Si se desea mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Si se desea mostrar el panel" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Si se desea mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Si se desea mostrar la barra de estado" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Estilo de la barra de tareas:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Mostrar progreso en la barra de direcciones" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Motores de búsqueda en completamiento" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Mostrar los controles de operación en el panel" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Si se desea mostrar los controles de operación en el panel" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Alinear el panel lateral a la derecha" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Abrir paneles en ventanas separadas" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Configura si los paneles se abren en ventanas separadas" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Cuando Midori inicia:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Qué hacer al inicio de Midori" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Página de inicio:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Mostrar diálogo de cuelgue" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un dialogo despues de que Midori se cuelgue" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Mostrar marcación rápida en nuevas pestañas" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar marcación rápida en la pestaña abierta recientemente" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Guardar los archivos descargados en:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Preguntar por la carpeta de destino" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Si se desea seleccionar la carpeta de destino cuando se descarga un archivo" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Notificarme sobre las transferencias completas" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si se desea mostrar una notificación cuando se ha completado la transferencia" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Gestor de descargas externo" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Editor de textos externo" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Agregador de noticias" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Un agregador de noticias externo" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Abrir las páginas nuevas en:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Donde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Abrir las páginas externas en:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Donde abrir las páginas externas" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Clic del medio abre la selección" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Cargar y mostrar imágenes automáticamente" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Habilitar script de lenguajes embebidos" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 +#: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilitar complementos Netscape" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Habilitar el complemento de objetos embebidos Netscape" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Activar soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Configura si se activa el soporte de base de datos de HTML5" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Activar soporte de almacenamiento local HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Configura si se activa el soporte de almacenamiento local de HTML5" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Activar caché local de aplicación web" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Configura si se activa el caché local de aplicación web" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Ampliar textos e imágenes" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Si se desea ampliar texto e imágenes" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Buscar en el texto al escribir" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Si se desea buscar automáticamente en el texto al comenzar a escribir" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Desplazamiento dinámico" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Configura si el desplazamiento debe realizarse de forma acorde a la velocidad" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Aceptar cookies" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Qué tipos de cookies son aceptadas" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Sólo cookies originales" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Sólo se aceptan las cookies del sitio web original" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Duración máxima de las cookies" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de días para conservar las cookies" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Si se desea que las últimas páginas visitadas sean recordadas" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Duración máxima del historial" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Recordar los últimos archivos descargados" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Si se desea que los archivos descargados sean recordados" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "El tipo de servidor a usar" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy utilizado para conexiones HTTP" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Detectar automáticamente el servidor proxy" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Si se desea detectar automáticamente el servidor proxy del entorno" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Identificar como:" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Identificar como páginas web" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Cadena de identificación" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Aplicación de identificación de cadenas" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Una lista separada por comas de idioma preferidos para procesar páginas multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Borrar datos privados" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Los datos privados seleccionados para su eliminación" @@ -1661,197 +1760,247 @@ msgstr "Los datos privados seleccionados para su eliminación" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1187 ../midori/midori-view.c:4452 -#: ../midori/midori-view.c:4456 +#: ../midori/midori-view.c:1261 +#: ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No se pudo cargar la página '%s'." -#: ../midori/midori-view.c:1193 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Inténtelo de nuevo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "No se ha encontrado - %s" -#: ../midori/midori-view.c:1456 ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:1520 +#: ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Enviar un mensaje a %s" -#: ../midori/midori-view.c:2058 ../midori/midori-view.c:2438 +#: ../midori/midori-view.c:2139 +#: ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2110 ../midori/midori-view.c:2180 +#: ../midori/midori-view.c:2191 +#: ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:2114 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Abrir enlace en pestaña en _primer plano" -#: ../midori/midori-view.c:2115 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Abrir enlace en pestaña en _segundo plano" -#: ../midori/midori-view.c:2118 ../midori/midori-view.c:2187 +#: ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Abrir enlace como a_plicación web" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Copiar de_stino del enlace" -#: ../midori/midori-view.c:2127 ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2208 +#: ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Guardar enlace" -#: ../midori/midori-view.c:2128 ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2209 +#: ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Descargar enlace" -#: ../midori/midori-view.c:2132 ../midori/midori-view.c:2162 -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Descargar con el _gestor de descargas" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Abrir _imagen en nueva pestaña" -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Copiar _dirección de imagen" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Guardar i_magen" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Descargar i_magen" -#: ../midori/midori-view.c:2155 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Copiar _dirección de vídeo" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Guardar _vídeo" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Descargar _vídeo" -#: ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:2256 ../midori/midori-view.c:2263 +#: ../midori/midori-view.c:2337 +#: ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Buscar en la web" -#: ../midori/midori-view.c:2284 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:2588 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Abrir o descargar archivo" -#: ../midori/midori-view.c:2611 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: '%s'" -#: ../midori/midori-view.c:2614 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2618 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3152 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:3413 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:3414 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Haga clic aquí para añadir un acceso directo" -#: ../midori/midori-view.c:3415 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Introduzca la dirección del acceso directo" -#: ../midori/midori-view.c:3416 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Introduzca el título del acceso directo" -#: ../midori/midori-view.c:3417 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "¿Está seguro que desea eliminar este acceso directo?" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "Establecer el número de columnas y filas" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "Introduzca el número de columnas y filas:" + +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "Valores no válidos para el tamaño de la marcación rápida" + +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Tamaño de miniatura:" + +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Pequeño" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Medio" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Grande" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "El documento no puede ser mostrado" -#: ../midori/midori-view.c:3477 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "No hay documentación instalada" -#: ../midori/midori-view.c:3727 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Carga de página retrasada" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "La carga se ha retrasado debido a un cuelgue reciente o a las preferencias de inicio" + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Cargar página" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-view.c:3987 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Duplicar pestaña" -#: ../midori/midori-view.c:3992 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Restaurar pestaña" -#: ../midori/midori-view.c:3992 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Minimizar pestaña" -#: ../midori/midori-view.c:3998 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Cerrar las o_tras pestañas" -#: ../midori/midori-view.c:4624 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-view.c:4625 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Si se deberían imprimir las imágenes de fondo" -#: ../midori/midori-view.c:4677 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 +#: ../midori/midori-preferences.c:381 msgid "Features" msgstr "Características" @@ -1864,11 +2013,13 @@ msgstr "General" msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:321 msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:331 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferencias" @@ -1978,7 +2129,8 @@ msgid "External applications" msgstr "Aplicaciones externas" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:486 msgid "Network" msgstr "Red" @@ -1995,7 +2147,8 @@ msgstr "Privacidad" msgid "Web Cookies" msgstr "Cookies web" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:535 msgid "days" msgstr "días" @@ -2027,81 +2180,67 @@ msgstr "Administrar los motores de búsqueda" msgid "Use as _default" msgstr "_Predeterminado" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" msgstr "Añadir _marcadores" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1300 msgid "_Homepage" msgstr "_Página de inicio" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1302 msgid "New _Tab" msgstr "Nueva _pestaña" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" msgstr "C_omplementos de Netscape" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Scripts de usuario" - -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Estilos de usuario" - -#: ../panels/midori-addons.c:305 -#, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en la carpeta %s." - -#: ../panels/midori-addons.c:911 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "No se puede monitorizar el directorio '%s': %s" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "Nueva _carpeta" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Añadir una nueva carpeta" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Separador" @@ -2109,6 +2248,14 @@ msgstr "Separador" msgid "Console" msgstr "Consola" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copiar _todo" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copiar todo" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensiones" @@ -2144,28 +2291,28 @@ msgstr "Ayer" msgid "Are you sure you want to remove all history items?" msgstr "¿Está seguro de que desea borrar todos los elementos del historial?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Añadir a marcadores el elemento seleccionado del historial" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Borrar el elemento seleccionado del historial" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Vaciar todo el historial" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtro:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Abrir la _carpeta de destino" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Copiar destino del _enlace" @@ -2193,30 +2340,32 @@ msgstr "Contraseña" msgid "_Remember password" msgstr "_Recordar contraseña" -#: ../katze/katze-throbber.c:842 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "No se pudo cargar el ícono llamado «%s»" -#: ../katze/katze-throbber.c:855 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "No se pudo cargar el ícono stock «%s»" -#: ../katze/katze-throbber.c:923 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "Los cuadros de animación están rotos" -#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890 +#: ../katze/katze-utils.c:498 +#: ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570 +#: ../katze/katze-utils.c:544 +#: ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Elegir archivo" -#: ../katze/katze-utils.c:556 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Elegir carpeta" @@ -2225,43 +2374,75 @@ msgstr "Elegir carpeta" msgid "Preferences for %s" msgstr "Preferencias de %s" -#: ../extensions/adblock.c:409 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configurar los filtros de publicidad" -#: ../extensions/adblock.c:441 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Escriba la dirección de una lista de filtros preconfigurados en el cuadro de texto y haga clic en \"Añadir\" para añadirlo a la lista. Puede encontrar más listas en %s." -#: ../extensions/adblock.c:581 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Configurar filtros de p_ublicidad..." -#: ../extensions/adblock.c:835 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Editar regla" -#: ../extensions/adblock.c:848 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regla:" -#: ../extensions/adblock.c:902 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_oquear imagen" -#: ../extensions/adblock.c:907 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_oquear enlace" -#: ../extensions/adblock.c:1481 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Bloqueador de publicidad" -#: ../extensions/adblock.c:1482 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidad de acuerdo a una lista de filtros" +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "Copiar %s a la carpeta %s." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Scripts de usuario" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Estilos de usuario" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "No se pudo guardar la configuración de la extensión '%s': %s\n" + +#: ../extensions/addons.c:1086 +#: ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Complementos de usuario" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "No se puede monitorizar el directorio '%s': %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Soporte para scripts y estilos de usuario" + #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Pestañas de colores" @@ -2374,25 +2555,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "No se ha podido encontrar los elementos necesarios de tipo \"feed\" Atom en los datos XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualización: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Canales" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Añadir nuevo canal" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Eliminar canal" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Canales" @@ -2427,25 +2608,25 @@ msgstr "No se ha podido encontrar los elementos necesarios RSS \"item\" en los d msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "No se ha podido encontrar los elementos necesarios RSS \"channel\" en los datos XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "El canal '%s' ya existe" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Error al cargar el canal '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Panel de canales" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Lector de canales Atom/RSS" @@ -2471,16 +2652,17 @@ msgstr "Archivos de recursos no instalados" msgid "Form history filler" msgstr "Completador de historial de formularios" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gestos de ratón" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori moviendo el ratón" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Álbum de páginas" @@ -2528,7 +2710,8 @@ msgstr "Barra de funcionalidades" msgid "Easily toggle features on web pages on and off" msgstr "Activar y desactivar fácilmente las características de páginas web" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:568 +#: ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Panel de pestañas" @@ -2540,11 +2723,11 @@ msgstr "Panel de p_estañas" msgid "Show tabs in a vertical panel" msgstr "Mostrar las pestañas en un panel vertical" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Lista de historial de pestañas" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Permite cambiar de pestaña eligiéndola de una lista ordenada por último uso" @@ -2580,152 +2763,109 @@ msgstr "Editar fácilmente el diseño de la barra de herramienta" msgid "Cache HTTP communication on disk" msgstr "Cachear tráfico HTTP en disco" +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en " +#~ "la carpeta %s." #~ msgid "Open _Link" #~ msgstr "Abrir en_lace" - #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Abrir imagen en nueve ve_ntana" - #~ msgid "View Selection Source" #~ msgstr "Ver código fuente de la selección" - #~ msgid "View the source code of the selection" #~ msgstr "Ver el código fuente de la selección" - #~ msgid "Show panel _titles" #~ msgstr "Mostrar el panel de _títulos" - #~ msgid "Options" #~ msgstr "Opciones" - #~ msgid "Remember last form inputs" #~ msgstr "Recordar lo que se haya ingresado en formularios" - #~ msgid "Whether the last form inputs are saved" #~ msgstr "Si se desea que las últimas entradas de formulario sean recordadas" - #~ msgid "Cache size" #~ msgstr "Tamaño del caché" - #~ msgid "The allowed size of the cache" #~ msgstr "Tamaño asignado a la memoria caché" - #~ msgid "Encoding" #~ msgstr "Codificación" - #~ msgid "The character encoding to use by default" #~ msgstr "Codificación de caracteres a utilizar por defecto" - #~ msgid "Shrink images automatically" #~ msgstr "Reducir imágenes automáticamente" - #~ msgid "Automatically shrink standalone images to fit" #~ msgstr "Reducir imágenes automáticamente independientemente si caben" - #~ msgid "Resizable text areas" #~ msgstr "Áreas de texto dimensionables" - #~ msgid "Whether text areas are resizable" #~ msgstr "Si se desea que las áreas de texto sean dimensionables" - #~ msgid "Enable developer tools" #~ msgstr "Habilitar herramientas de desarrollo" - #~ msgid "Enable special extensions for developers" #~ msgstr "Habilitar extensiones especiales para desarrolladores" - #~ msgid "MB" #~ msgstr "MB" - #~ msgid "User_styles" #~ msgstr "_Estilos de usuario" - #~ msgid "Tint tabs distinctly" #~ msgstr "Pestañas de distintos colores" - #~ msgid "_Closed Tabs and Windows" #~ msgstr "_Pestañas y ventanas cerradas" - #~ msgid "Last open pages" #~ msgstr "Últimas páginas visitadas" - #~ msgid "Both" #~ msgstr "Ambos" - #~ msgid "Both horizontal" #~ msgstr "Ambos en horizontal" - #~ msgid "Load on Startup" #~ msgstr "Al iniciar Midori cargar:" - #~ msgid "Configure _Toolbar..." #~ msgstr "Configurar la _Barra de tareas" - #~ msgid "_Quick Find" #~ msgstr "Búsqueda _rápida" - #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Saltar rápidamente a una palabra o una frase" - #~ msgid "Search" #~ msgstr "Buscar" - #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" - #~ msgid "_Enable" #~ msgstr "_Activar" - #~ msgid "Enable" #~ msgstr "Activar" - #~ msgid "_Disable" #~ msgstr "_Desactivar" - #~ msgid "Disable" #~ msgstr "Desactivar" - #~ msgid "%d days ago" #~ msgstr "Hace %d días" - #~ msgid "P_lugins" #~ msgstr "C_omplementos" - #~ msgid "Plugins" #~ msgstr "Complementos" - #~ msgid "Source" #~ msgstr "Código fuente" - #~ msgid "_Icon (name or file):" #~ msgstr "_Icono (nombre o archivo):" - #~ msgid "%s has no property '%s'" #~ msgstr "%s no tiene la propiedad «%s»" - #~ msgid "%s cannot be assigned to %s.%s" #~ msgstr "%s no puede ser asignado a %s.%s" - #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s no se puede acceder" - #~ msgid "Manage search engines" #~ msgstr "Administrar los motores de búsqueda" - #~ msgid "URIs" #~ msgstr "URIs" - #~ msgid "[URIs]" #~ msgstr "[URIs]" - #~ msgid "_URL:" #~ msgstr "_URL " - #~ msgid "Root" #~ msgstr "Raíz" - #~ msgid "HTTP Proxy" #~ msgstr "HTTP Proxy" - #~ msgid "Open URL in New _Tab" #~ msgstr "Abrir URL en una pestaña _nueva" + From 997d8df49c12eb29e672c83e8e638384bfb154ad Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 4 Jun 2010 23:46:27 +0200 Subject: [PATCH 2670/2970] Ensure the web view of the thumb view is realized --- midori/midori-view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index b1e0ba67..684b3bc4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -5115,6 +5115,7 @@ thumb_view_load_status_cb (MidoriView* thumb_view, if (katze_object_get_enum (thumb_view, "load-status") != MIDORI_LOAD_FINISHED) return; + gtk_widget_realize (midori_view_get_web_view (MIDORI_VIEW (thumb_view))); img = midori_view_get_snapshot (MIDORI_VIEW (thumb_view), 240, 160); gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, "compression", "7", NULL); encoded = g_base64_encode ((guchar *)file_content, sz ); From fb25c74ece5e32e4aaa12050735cf6295204e4b8 Mon Sep 17 00:00:00 2001 From: Gheyret Kenji Date: Sat, 5 Jun 2010 04:33:40 +0200 Subject: [PATCH 2671/2970] l10n: Updated Uyghur (ug) translation to 13% New status: 82 messages complete with 0 fuzzies and 528 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ug.po | 100 +++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/po/ug.po b/po/ug.po index 9c1d8bc7..55d0550a 100644 --- a/po/ug.po +++ b/po/ug.po @@ -18,7 +18,7 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "" +msgstr "يېنىك توركۆرگۈ" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 #: ../midori/main.c:1672 ../midori/main.c:1688 @@ -116,7 +116,7 @@ msgstr "" #: ../midori/main.c:1355 msgid "An unknown error occured." -msgstr "" +msgstr "نامەلۇم خاتالىق كۆرۈلدى." #: ../midori/main.c:1386 #, c-format @@ -130,7 +130,7 @@ msgstr "" #: ../midori/main.c:1557 msgid "ADDRESS" -msgstr "" +msgstr "ADDRESS" # CLI --help #: ../midori/main.c:1560 @@ -167,7 +167,7 @@ msgstr "" #: ../midori/main.c:1575 msgid "Addresses" -msgstr "" +msgstr "ئادرېس" #: ../midori/main.c:1577 msgid "Block URIs according to regular expression PATTERN" @@ -233,11 +233,11 @@ msgstr "" #: ../midori/main.c:1996 msgid "_Ignore" -msgstr "" +msgstr "پەرۋا قىلما(_I)" #: ../midori/midori-array.c:428 msgid "File not found." -msgstr "" +msgstr "ھۆججەت تېپىلمىدى." #: ../midori/midori-array.c:462 ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 @@ -251,16 +251,16 @@ msgstr "" #: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 #, c-format msgid "Writing failed." -msgstr "" +msgstr "يېزىش مەغلۇپ بولدى." #: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 #: ../midori/midori-browser.c:5495 msgid "Reload the current page" -msgstr "" +msgstr "ھازىرقى بەتنى قايتا ئوقۇ" #: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 msgid "Stop loading the current page" -msgstr "" +msgstr "ھازىرقى بەتنى قايتا ئوقۇشنى توختات" #: ../midori/midori-browser.c:457 #, c-format @@ -295,7 +295,7 @@ msgstr "" #: ../midori/midori-browser.c:749 msgid "_Title:" -msgstr "" +msgstr "ماۋزۇ (_T):" #: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 msgid "_Description:" @@ -304,11 +304,11 @@ msgstr "چۈشەندۈرۈش(_D):" #: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" -msgstr "" +msgstr "ئادرېس(_A):" #: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 msgid "_Folder:" -msgstr "" +msgstr "مۇندەرىجە(_F)" #: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 #: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 @@ -350,15 +350,15 @@ msgstr "" #: ../midori/midori-browser.c:1433 msgid "Transfer completed" -msgstr "" +msgstr "يوللاش تاممالاندى" #: ../midori/midori-browser.c:1573 msgid "Save file" -msgstr "" +msgstr "ھۆججەت ساقلا" #: ../midori/midori-browser.c:2297 msgid "Open file" -msgstr "" +msgstr "ھۆججەتنى ئاچ" #: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 msgid "New feed" @@ -408,23 +408,23 @@ msgstr "" #: ../midori/midori-browser.c:4570 msgid "Arora" -msgstr "" +msgstr "Arora " #: ../midori/midori-browser.c:4571 msgid "Kazehakase" -msgstr "" +msgstr "Kazehakase " #: ../midori/midori-browser.c:4572 msgid "Opera" -msgstr "" +msgstr "Opera " #: ../midori/midori-browser.c:4573 msgid "Konqueror" -msgstr "" +msgstr "Konqueror " #: ../midori/midori-browser.c:4574 msgid "Epiphany" -msgstr "" +msgstr "Epiphany " #: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 msgid "Import bookmarks..." @@ -442,7 +442,7 @@ msgstr "" #: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 #: ../katze/katze-utils.c:691 msgid "Custom..." -msgstr "" +msgstr "ئادەت..." #: ../midori/midori-browser.c:4710 msgid "Failed to import bookmarks" @@ -476,7 +476,7 @@ msgstr "" #: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" -msgstr "" +msgstr "تارىخ" #: ../midori/midori-browser.c:4942 msgid "Cookies" @@ -504,7 +504,7 @@ msgstr "" #: ../midori/midori-browser.c:5072 msgid "A lightweight web browser." -msgstr "" +msgstr "يېنىك توركۆرگۈ." #: ../midori/midori-browser.c:5074 msgid "" @@ -653,7 +653,7 @@ msgstr "" #: ../midori/midori-browser.c:5475 msgid "Find _Next" -msgstr "" +msgstr "كېيىنكىسىنى ئىزدە(_N)" # tooltip #: ../midori/midori-browser.c:5476 @@ -662,7 +662,7 @@ msgstr "" #: ../midori/midori-browser.c:5478 msgid "Find _Previous" -msgstr "" +msgstr "ئالدىنقىنى ئىزدە(_P)" # tooltip #: ../midori/midori-browser.c:5479 @@ -780,7 +780,7 @@ msgstr "" #: ../midori/midori-browser.c:5546 msgid "Empty Trash" -msgstr "" +msgstr "ئەخلەت ساندۇقىنى تازىلاش" # tooltip #: ../midori/midori-browser.c:5547 @@ -975,7 +975,7 @@ msgstr "" #: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 msgid "Korean (EUC-KR)" -msgstr "" +msgstr "كورىيىچە (EUC-KR)" #: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 msgid "Russian (KOI8-R)" @@ -983,7 +983,7 @@ msgstr "" #: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "يۇنىكود (UTF-8)" #: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 msgid "Western (ISO-8859-1)" @@ -1027,7 +1027,7 @@ msgstr "" #: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 msgid "_Bookmarks" -msgstr "" +msgstr "خەتكۈش(_B)" # tooltip #: ../midori/midori-browser.c:6298 @@ -1062,7 +1062,7 @@ msgstr "" #: ../midori/midori-browser.c:6579 msgid "Previous" -msgstr "" +msgstr "ئالدى" #: ../midori/midori-browser.c:6584 msgid "Next" @@ -1082,7 +1082,7 @@ msgstr "" #: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 msgid "Clear All" -msgstr "" +msgstr "ھەممىنى تازىلا" #: ../midori/midori-browser.c:7014 #, c-format @@ -1125,7 +1125,7 @@ msgstr "" #: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 msgid "Close panel" -msgstr "" +msgstr "panel نى تاقا" #: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 msgid "Align sidepanel to the left" @@ -1417,7 +1417,7 @@ msgstr "" #: ../midori/midori-websettings.c:629 msgid "Homepage:" -msgstr "" +msgstr "Homepage:" # tooltip #: ../midori/midori-websettings.c:630 @@ -1481,7 +1481,7 @@ msgstr "" #: ../midori/midori-websettings.c:735 msgid "Text Editor" -msgstr "" +msgstr "تېكىست تەھرىرلىگۈ" # tooltip #: ../midori/midori-websettings.c:736 @@ -1980,7 +1980,7 @@ msgstr "" #: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 msgid "Features" -msgstr "" +msgstr "ئىقتىدار" #. Page "General" #: ../midori/midori-preferences.c:298 @@ -2110,7 +2110,7 @@ msgstr "" #. Page "Applications" #: ../midori/midori-preferences.c:468 msgid "Applications" -msgstr "" +msgstr "پروگراممىلار" #: ../midori/midori-preferences.c:469 msgid "External applications" @@ -2123,12 +2123,12 @@ msgstr "تور" #: ../midori/midori-preferences.c:492 msgid "Hostname" -msgstr "" +msgstr "مۇلازىمېتىر نامى" #. Page "Privacy" #: ../midori/midori-preferences.c:511 msgid "Privacy" -msgstr "" +msgstr "شەخسىيەت" #: ../midori/midori-preferences.c:512 msgid "Web Cookies" @@ -2196,7 +2196,7 @@ msgstr "" #: ../midori/sokoke.c:1307 msgid "New _Tab" -msgstr "" +msgstr "يېڭى بەتكۈچ(_T)" #: ../midori/sokoke.c:1308 msgid "_Transfers" @@ -2208,7 +2208,7 @@ msgstr "" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" -msgstr "" +msgstr "خەتكۈش" # tooltip #: ../panels/midori-bookmarks.c:250 @@ -2230,7 +2230,7 @@ msgstr "" #: ../panels/midori-console.c:87 msgid "Console" -msgstr "" +msgstr "كونترول تاختا" #: ../panels/midori-extensions.c:91 msgid "Extensions" @@ -2297,7 +2297,7 @@ msgstr "" #: ../katze/katze-http-auth.c:214 msgid "Authentication Required" -msgstr "" +msgstr "ۋاكالەتچى مۇلازىمىتىرنى دەلىللەش زۆرۈر" #: ../katze/katze-http-auth.c:230 msgid "" @@ -2307,11 +2307,11 @@ msgstr "" #: ../katze/katze-http-auth.c:244 msgid "Username" -msgstr "" +msgstr "ئىشلەتكۈچى ئاتى" #: ../katze/katze-http-auth.c:257 msgid "Password" -msgstr "" +msgstr "ئىم" #: ../katze/katze-http-auth.c:272 msgid "_Remember password" @@ -2436,7 +2436,7 @@ msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" -msgstr "" +msgstr "ھەممىنى ئۆچۈر…" #: ../extensions/cookie-manager/cookie-manager-page.c:114 msgid "" @@ -2447,12 +2447,12 @@ msgstr "" # tooltip #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" -msgstr "" +msgstr "ھەممەنى ياي" # tooltip #: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" -msgstr "" +msgstr "ھەممەنى قاتلا" #: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" @@ -2485,12 +2485,12 @@ msgstr "" # cookie: Secure flag is set. #: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" -msgstr "" +msgstr "ھەئە" # cookie: Secure flag isn't set. #: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" -msgstr "" +msgstr "ياق" #: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format @@ -2667,7 +2667,7 @@ msgstr "" #: ../extensions/shortcuts.c:315 msgid "Shortcuts" -msgstr "" +msgstr "تېزلەتمىلەر" # description #: ../extensions/shortcuts.c:316 From b8283b8fbf0d60d5499d5f4d4ee9621ac865d59b Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Sun, 6 Jun 2010 11:14:18 +0200 Subject: [PATCH 2672/2970] l10n: Updated Dutch (Flemish) (nl) translation to 65% New status: 412 messages complete with 80 fuzzies and 137 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 454 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 242 insertions(+), 212 deletions(-) diff --git a/po/nl.po b/po/nl.po index 9a7c8b4a..ba3ff3be 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-30 16:08+0000\n" +"POT-Creation-Date: 2010-06-06 04:08+0000\n" "PO-Revision-Date: 2008-11-10 02:02+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lichtgewicht webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -56,175 +56,175 @@ msgstr "Kan database niet openen: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Kan verjaarde items in geschiedenis niet verwijderen: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "De instellingen kunnen niet worden opgeslagen. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "De bladwijzers kunnen niet opgeslagen worden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "De prullenbak kan niet worden opgeslagen. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "De sessie kan niet worden opgeslagen. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori schijnt te zijn gecrasht de laatste keer dat het werd geopend. Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het probleem op te lossen." -#: ../midori/main.c:973 +#: ../midori/main.c:985 #, fuzzy msgid "Modify _preferences" msgstr "Wijzigen _Preferences" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Reset de laatste _SESSION" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Schakel alle _extensions uit" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "De sessie kan niet geladen worden: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Geen bestandsnaam ingegeven" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Onbekende fout." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snapshot opgeslagen in:%s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 #, fuzzy msgid "Run ADDRESS as a web application" msgstr "Run ADRES als een webapplicatie" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADRES" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Gebruik FOLDER als configuratie map" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Toon een diagnostisch venster" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Voer de gegeven bestandsnaam uit als Javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Neem een snapshot van de opgegeven URI" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Voer de opgegeven opdracht uit" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Versie-informatie weergeven" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" -msgstr "" +msgstr "PATROON" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "Gelieve commentaar, suggesties en fouten in het Engels te melden bij:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 #, fuzzy msgid "The specified configuration folder is invalid." msgstr "De instellingen kunnen niet worden opgeslagen. %s" -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori is al actief maar reageert niet.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, fuzzy, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "De bladwijzers kunnen niet geladen worden: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "De prullenbak kan niet geladen worden: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "De geschiedenis kan niet geladen worden: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 #, fuzzy msgid "_Ignore" msgstr "_IGNORE" @@ -459,7 +459,7 @@ msgid "_Application:" msgstr "_programma" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Aangepast..." @@ -931,7 +931,7 @@ msgstr "Statusbalk weergeven" msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinees (BIG5)" @@ -940,19 +940,19 @@ msgstr "Chinees (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Japans (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreaans (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Westers (ISO-8859-1)" @@ -1108,589 +1108,593 @@ msgstr "Toon startpagina" msgid "Show last open tabs" msgstr "Toon laatst geopende tabbladen" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japans (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nieuw tabblad" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nieuw venster" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Huidig tabblad" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Standaard" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Pictogrammen" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Kleine pictogrammen" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Pictogrammen en tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Tekst naast pictogrammen" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME of omgeving)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Geen proxy server" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Alle koekies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Sessie-koekies" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Geen" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Laatst gebruikte venstergrootte onthouden" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Laatst gebruiken venstergrootte onthouden" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Laatst gebruikte vensterbreedte" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Laatst gebruikte vensterhoogte" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Laatst gebruikte positie van paneel" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Laatst gebruikte positie van paneel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Laatst geopende paneel" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Laatst uitgevoerde zoekopdracht" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Menubalk weergeven" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Navigatiebalk weergeven" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Bladwijzerbalk weergeven" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Bestandsoverdrachten-balk weergeven" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Of de statusbalk dient te worden weergeven" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Statusbalk weergeven" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Stijl van de werkbalk:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Stijl van de werkbalk" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Toon voortgang in locatieveld" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Of voortgang van laden pagina getoond dient te worden in locatieveld" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Zoekmachines tonen bij ingave in locatieveld" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Of zoekmachines bij ingaves in het locatieveld dienen te worden getoond" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Items in de werkbalk" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Items om weer te geven in de werkbalk" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Compact paneel" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Het paneel compact weergeven" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Toon bedieningselementen van het paneel" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Of bedieningselementen van het paneel moeten worden weergegeven" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Plaats zijpaneel rechts" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Of het zijpaneel aan de rechterkant dient te worden geplaatst" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Open panelen in aparte vensters" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Of tabbladen altijd dienen te worden geopend in aparte vensters" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Bij starten van Midori:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Wat er dient te gebeuren bij starten van Midori" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Startpagina" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Homepage" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Toon crashdialoog" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Toon een dialoog nadat Midori crasht" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Toon snelkiezen in nieuwe tabbladen" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Toon snelkiezen in nieuw geopende tabbladen" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Bewaar gedownloade bestanden in:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "De map waar gedownloade bestanden worden opgeslagen" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Vraag naar de doelmap" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Of naar de doelmap moet worden gevraagd bij het downloaden van een bestand" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Melding wanneer de overdracht is voltooid" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Of een melding dient te worden getoond als een overdracht is voltooid" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Downloadbeheer" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Extern downloadbeheer" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Tekstbewerker" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Een externe tekstbewerker" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Nieuwsaggregator" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Een externe nieuwaggregator" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Zoeken vanuit locatieveld" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Met welke website gezocht wordt vanuit het locatie-invoerveld" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Balk met tabbladen altijd weergeven" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Sluitknoppen op tabbladen" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Nieuwe pagina's openen in:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Waar nieuwe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Externe pagina's openen in:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Waar externe pagina's geopend moeten worden" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Middel-klikken opent selectie" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Een adres vanuit de selectie laden met middelste muisknop" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Tabbladen op de achtergrond openen" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Tabbladen naast het huidige tabblad openen" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Pop-ups in tabbladen openen" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Afbeeldingen automatisch laden" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Afbeeldingen automatisch laden en weergeven" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Scripts aanzetten" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Ingebedde scripttalen uitvoeren" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape plugins uitvoeren" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Ingebedde Netscape pluginobjecten uitvoeren" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "HTML5 database ondersteuning activeren" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "OF HTML5 database ondersteuning dient te worden geactiveerd" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 #, fuzzy msgid "Enable offline web application cache" msgstr "Uitvoeren als _web toepassing" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 #, fuzzy msgid "Whether to zoom text and images" msgstr "Paneel weergeven" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Koekies accepteren" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Welke soorten koekies geaccepteerd moeten worden" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Alleen originele koekies" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Alleen koekies accepteren van de originele website" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Maximale leeftijd van koekies" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Hoeveel dagen een koekie maximaal bewaard mag worden" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Laatst bezochte pagina's onthouden" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Dagen in geschiedenis" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 #, fuzzy msgid "Remember last downloaded files" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 #, fuzzy msgid "Whether the last downloaded files are saved" msgstr "Laatst gedownloadede bestanden onthouden" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 #, fuzzy msgid "HTTP Proxy Server" msgstr "HTTP proxy" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 #, fuzzy msgid "The proxy server used for HTTP connections" msgstr "De gebruikte proxy voor HTTP-verbindingen" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 #, fuzzy msgid "Preferred languages" msgstr "Voorkeurs-codering" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "" @@ -1698,8 +1702,8 @@ msgstr "" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4540 -#: ../midori/midori-view.c:4544 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "" @@ -1864,62 +1868,88 @@ msgid "Are you sure you want to delete this shortcut?" msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" #: ../midori/midori-view.c:3518 -msgid "Set number of columns" +msgid "Set number of columns and rows" msgstr "" #: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" +msgid "Enter number of columns and rows:" msgstr "" #: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" +msgid "Invalid input for the size of the speed dial" msgstr "" #: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" +msgid "Thumb size:" msgstr "" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3522 +#, fuzzy +msgid "Small" +msgstr "Kleine pictogrammen" + +#: ../midori/midori-view.c:3523 +#, fuzzy +msgid "Medium" +msgstr "Menubalk" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3573 #, fuzzy, c-format msgid "No documentation installed" msgstr "Documentatie weergeven" -#: ../midori/midori-view.c:3820 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Blanco pagina" -#: ../midori/midori-view.c:4080 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 #, fuzzy msgid "_Restore Tab" msgstr "Vo_lgend tabblad" -#: ../midori/midori-view.c:4085 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "" -#: ../midori/midori-view.c:4091 +#: ../midori/midori-view.c:4111 #, fuzzy msgid "Close ot_her Tabs" msgstr "Tabblad _sluiten" -#: ../midori/midori-view.c:4763 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Achtergrondafbeeldingen meenemen in afdrukken" -#: ../midori/midori-view.c:4764 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4816 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Opties" @@ -2655,12 +2685,12 @@ msgstr "Paneel weergeven" msgid "Show tabs in a vertical panel" msgstr "_Paneel weergeven" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 #, fuzzy msgid "Tab History List" msgstr "Geschiedenis" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "" From f2fe44b49f4437213fde4edeae9db38f4b612ab1 Mon Sep 17 00:00:00 2001 From: padv Date: Sun, 6 Jun 2010 11:32:54 +0200 Subject: [PATCH 2673/2970] l10n: Updated Dutch (Flemish) (nl) translation to 77% New status: 488 messages complete with 45 fuzzies and 96 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 191 ++++++++++++++++++++++++------------------------------- 1 file changed, 82 insertions(+), 109 deletions(-) diff --git a/po/nl.po b/po/nl.po index ba3ff3be..595d86fe 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-06 04:08+0000\n" +"POT-Creation-Date: 2010-06-05 10:08+0000\n" "PO-Revision-Date: 2008-11-10 02:02+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch\n" @@ -84,16 +84,15 @@ msgstr "De sessie kan niet worden opgeslagen. %s" #: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "" +msgstr "Geen root certificaatbestand aanwezig. SSL certificaten kunnen niet worden geverifieerd" #: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori schijnt te zijn gecrasht de laatste keer dat het werd geopend. Als dit herhaaldelijk gebeurt, probeer dan een van de volgende opties om het probleem op te lossen." #: ../midori/main.c:985 -#, fuzzy msgid "Modify _preferences" -msgstr "Wijzigen _Preferences" +msgstr "_Voorkeuren wijzigen" #: ../midori/main.c:989 msgid "Reset the last _session" @@ -122,9 +121,8 @@ msgid "Snapshot saved to: %s\n" msgstr "Snapshot opgeslagen in:%s\n" #: ../midori/main.c:1575 -#, fuzzy msgid "Run ADDRESS as a web application" -msgstr "Run ADRES als een webapplicatie" +msgstr "ADRES uitvoeren als een webapplicatie" #: ../midori/main.c:1575 msgid "ADDRESS" @@ -164,7 +162,7 @@ msgstr "Adressen" #: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" -msgstr "" +msgstr "Blokkeer URIs die overeenstemmen met reguliere expressie PATROON" #: ../midori/main.c:1595 msgid "PATTERN" @@ -173,11 +171,11 @@ msgstr "PATROON" #. i18n: CLI: Close tabs, clear private data, open starting page #: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" +msgstr "Reset Midori na SECONDEN seconden van inactiviteit" #: ../midori/main.c:1599 msgid "SECONDS" -msgstr "" +msgstr "SECONDEN" #: ../midori/main.c:1680 msgid "[Addresses]" @@ -192,18 +190,17 @@ msgid "Check for new versions at:" msgstr "Controleer op nieuwe versies op:" #: ../midori/main.c:1807 -#, fuzzy msgid "The specified configuration folder is invalid." -msgstr "De instellingen kunnen niet worden opgeslagen. %s" +msgstr "De gespecifieerde configuratiemap is ongeldig." #: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori is al actief maar reageert niet.\n" #: ../midori/main.c:1910 -#, fuzzy, c-format +#, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "De zoekmachines kunnen niet opgeslagen worden. %s" +msgstr "De zoekmachines kunnen niet worden geladen. %s\n" #: ../midori/main.c:1939 #, c-format @@ -225,9 +222,8 @@ msgid "The following errors occured:" msgstr "De volgende fouten hebben plaatsgevonden:" #: ../midori/main.c:2015 -#, fuzzy msgid "_Ignore" -msgstr "_IGNORE" +msgstr "_Negeren" #: ../midori/midori-array.c:428 msgid "File not found." @@ -262,9 +258,9 @@ msgid "%d%% loaded" msgstr "%d%% geladen" #: ../midori/midori-browser.c:496 -#, fuzzy, c-format +#, c-format msgid "Failed to update title: %s\n" -msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" +msgstr "Kan titel niet aanpassen: %s\n" #: ../midori/midori-browser.c:510 #, c-format @@ -276,9 +272,8 @@ msgid "New folder" msgstr "Nieuwe map" #: ../midori/midori-browser.c:726 -#, fuzzy msgid "Edit folder" -msgstr "Edit map" +msgstr "Map wijzigen" #: ../midori/midori-browser.c:728 msgid "New bookmark" @@ -330,7 +325,7 @@ msgstr "Er is niet voldoende schijfruimte om \"%s\" te downloaden." #: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." -msgstr "" +msgstr "Het bestand heeft %s nodig maar slechts %s is beschikbaar." #: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 #: ../midori/midori-browser.c:4826 @@ -352,23 +347,20 @@ msgid "Transfer completed" msgstr "Overdracht compleet" #: ../midori/midori-browser.c:1598 -#, fuzzy msgid "Save file" -msgstr "Bestand opslaan als" +msgstr "Bestand opslaan" #: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -#, fuzzy msgid "Some files are being downloaded" -msgstr "Het bestand '%s' is gedownload." +msgstr "Sommige bestanden worden gedownload" #: ../midori/midori-browser.c:1921 -#, fuzzy msgid "_Quit Midori" -msgstr "Midori" +msgstr "Midori _afsluiten" #: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." -msgstr "" +msgstr "De bestandsoverdrachten zullen worden geannuleerd als Midori wordt afgesloten." #: ../midori/midori-browser.c:2384 msgid "Open file" @@ -379,9 +371,10 @@ msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" +"Om de bovenstaande URI te openen heeft u een nieuwsaggregator nodig. Daar is meestal een menu of knop \"Nieuw abonnement\", \"Nieuwe nieuwsfeed\" of vergelijkbaar.\n" +"Alternatief kan u gaan naar Voorkeuren, Toepassingen in Midori en een Nieuwsaggregator kiezen. De volgende keer dat u de nieuwsfeed aanklikt zal deze automatisch worden toegevoegd." #: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 -#, fuzzy msgid "New feed" msgstr "Nieuwe feed" @@ -392,9 +385,9 @@ msgstr "Nieuwe bladwijzer toevoegen" #: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, fuzzy, c-format +#, c-format msgid "Failed to execute database statement: %s\n" -msgstr "Kan database niet uitvoeren:% s \\ n" +msgstr "Kan database statement niet uitvoeren: %s\n" #: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" @@ -407,9 +400,9 @@ msgid "Could not run external program." msgstr "Kan externe applicatie niet uitvoeren." #: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 -#, fuzzy, c-format +#, c-format msgid "Failed to insert new history item: %s\n" -msgstr "Kan item in geschiedenis niet verwijderen: %s\n" +msgstr "Kan nieuw item in geschiedenis niet toevoegen: %s\n" #: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 @@ -859,7 +852,6 @@ msgid "Show the documentation" msgstr "Documentatie weergeven" #: ../midori/midori-browser.c:5691 -#, fuzzy msgid "_Frequent Questions" msgstr "_Veelgestelde vragen" @@ -1548,45 +1540,43 @@ msgstr "OF HTML5 database ondersteuning dient te worden geactiveerd" #: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" -msgstr "" +msgstr "HTML5 lokale opslagondersteuning activeren" #: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" -msgstr "" +msgstr "Of HTML5 locale opslagondersteuning dient te worden geactiveerd" #: ../midori/midori-websettings.c:901 -#, fuzzy msgid "Enable offline web application cache" -msgstr "Uitvoeren als _web toepassing" +msgstr "Offline webtoepassingscache gebruiken" #: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" -msgstr "" +msgstr "Of offline webtoepassingscache dient te worden gebruikt" #: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" -msgstr "" +msgstr "Tekst en afbeeldingen zoomen" #: ../midori/midori-websettings.c:928 -#, fuzzy msgid "Whether to zoom text and images" -msgstr "Paneel weergeven" +msgstr "Of tekst en afbeeldingen gezoomd dienen te worden" #: ../midori/midori-websettings.c:943 msgid "Find inline while typing" -msgstr "" +msgstr "Zoeken tijdens typen" #: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" -msgstr "" +msgstr "Of automatisch dient gezocht te worden tijdens het typen" #: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" -msgstr "" +msgstr "Kinetisch schuiven" #: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" -msgstr "" +msgstr "Of schuiven kinetisch dient te gebeuren volgens de snelheid" #: ../midori/midori-websettings.c:968 msgid "Accept cookies" @@ -1629,74 +1619,69 @@ msgid "The maximum number of days to save the history for" msgstr "Hoeveel dagen items in de geschiedenis bewaard moeten blijven" #: ../midori/midori-websettings.c:1030 -#, fuzzy msgid "Remember last downloaded files" -msgstr "Laatst gedownloadede bestanden onthouden" +msgstr "Laatst gedownloade bestanden onthouden" #: ../midori/midori-websettings.c:1031 -#, fuzzy msgid "Whether the last downloaded files are saved" -msgstr "Laatst gedownloadede bestanden onthouden" +msgstr "Of de laatst gedownloade bestanden onthouden dienen te worden" #: ../midori/midori-websettings.c:1048 msgid "Proxy server" -msgstr "" +msgstr "Proxyserver" #: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" -msgstr "" +msgstr "De te gebruiken proxyserver" #: ../midori/midori-websettings.c:1058 -#, fuzzy msgid "HTTP Proxy Server" -msgstr "HTTP proxy" +msgstr "HTTP proxyserver" #: ../midori/midori-websettings.c:1059 -#, fuzzy msgid "The proxy server used for HTTP connections" -msgstr "De gebruikte proxy voor HTTP-verbindingen" +msgstr "De proxyserver voor HTTP-verbindingen gebruiken" #: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" -msgstr "" +msgstr "De proxyserver automatisch detecteren" #: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" +msgstr "Of de proxyserver automatisch dient gedetecteerd te worden uit de omgeving" #. i18n: This refers to an application, not the 'user agent' string #: ../midori/midori-websettings.c:1091 msgid "Identify as" -msgstr "" +msgstr "Identificeren als" #: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" -msgstr "" +msgstr "Hoe zich te identificeren naar webpagina's" #: ../midori/midori-websettings.c:1108 msgid "Identification string" -msgstr "" +msgstr "Identificatiestring" #: ../midori/midori-websettings.c:1109 msgid "The application identification string" -msgstr "" +msgstr "De indentificatiestring van de toepassing" #: ../midori/midori-websettings.c:1124 -#, fuzzy msgid "Preferred languages" -msgstr "Voorkeurs-codering" +msgstr "Voorkeurstalen" #: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" +msgstr "Een door komma's gescheiden lijst van voorkeurstalen om meertalige webpagina's in weer te geven, bijvoorbeeld \"de\", \"ru,nl\" of \"en-us;q=1.0, fr-fr;q=0.667\"" #: ../midori/midori-websettings.c:1140 msgid "Clear private data" -msgstr "" +msgstr "Privégegevens wissen" #: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" -msgstr "" +msgstr "De te verwijderen privégegevens" #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. @@ -1706,60 +1691,55 @@ msgstr "" #: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" -msgstr "" +msgstr "Fout - %s" #: ../midori/midori-view.c:1262 -#, fuzzy, c-format +#, c-format msgid "The page '%s' couldn't be loaded." -msgstr "Pictogram '%s' kan niet geladen worden" +msgstr "De pagina '%s' kan niet worden geladen" #: ../midori/midori-view.c:1264 msgid "Try again" -msgstr "" +msgstr "Probeer opnieuw" #. i18n: The title of the 404 - Not found error page #: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Niet gevonden - %s" #: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" -msgstr "" +msgstr "Stuur een bericht naar %s" #: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" -msgstr "" +msgstr "_Element inspecteren" #: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Link in nieuw _tabblad openen" #: ../midori/midori-view.c:2195 -#, fuzzy msgid "Open Link in _Foreground Tab" -msgstr "Link in nieuw _tabblad openen" +msgstr "Link in nieuw tabblad op _voorgrond openen" #: ../midori/midori-view.c:2196 -#, fuzzy msgid "Open Link in _Background Tab" -msgstr "Link in nieuw _tabblad openen" +msgstr "Link in nieuw tabblad op _achtergrond openen" #: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 -#, fuzzy msgid "Open Link in New _Window" -msgstr "In nieuw _venster openen" +msgstr "Link in nieuw _venster openen" #: ../midori/midori-view.c:2202 -#, fuzzy msgid "Open Link as Web A_pplication" -msgstr "Link in nieuw _tabblad openen" +msgstr "Link als webt_oepassing openen" #: ../midori/midori-view.c:2205 -#, fuzzy msgid "Copy Link de_stination" -msgstr "Locatie _opslaan" +msgstr "Linkve_rwijzing kopiëren" #: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" @@ -1771,75 +1751,68 @@ msgstr "Locatie _downloaden" #: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 #: ../midori/midori-view.c:2285 -#, fuzzy msgid "Download with Download _Manager" -msgstr "Downloadbeheer" +msgstr "Downloaden met Download_beheer" #: ../midori/midori-view.c:2222 -#, fuzzy msgid "Open _Image in New Tab" -msgstr "In nieuw _tabblad openen" +msgstr "Open _afbeelding in nieuw tabblad" #: ../midori/midori-view.c:2225 msgid "Copy Image _Address" -msgstr "" +msgstr "_Adres van afbeelding kopiëren" #: ../midori/midori-view.c:2228 msgid "Save I_mage" -msgstr "" +msgstr "A_fbeelding opslaan" #: ../midori/midori-view.c:2229 -#, fuzzy msgid "Download I_mage" -msgstr "Downloadbeheer" +msgstr "A_fbeelding downloaden" #: ../midori/midori-view.c:2236 msgid "Copy Video _Address" -msgstr "" +msgstr "_Adres van video kopiëren" #: ../midori/midori-view.c:2239 -#, fuzzy msgid "Save _Video" -msgstr "Bestand opslaan als" +msgstr "_Video opslaan als" #: ../midori/midori-view.c:2239 -#, fuzzy msgid "Download _Video" -msgstr "Downloadmap" +msgstr "_Video downloaden" #: ../midori/midori-view.c:2302 msgid "Search _with" -msgstr "" +msgstr "Zoeken _met" #: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" -msgstr "" +msgstr "_Zoek op internet" #: ../midori/midori-view.c:2365 -#, fuzzy msgid "Open Address in New _Tab" -msgstr "In nieuw _tabblad openen" +msgstr "Adres in nieuw _tabblad openen" #: ../midori/midori-view.c:2661 -#, fuzzy msgid "Open or download file" -msgstr "Bestand openen" +msgstr "Bestand openen of downloaden" #: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" -msgstr "" +msgstr "Bestandstype: '%s'" #: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" -msgstr "" +msgstr "Bestandstype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" #: ../midori/midori-view.c:2687 -#, fuzzy, c-format +#, c-format msgid "Open %s" -msgstr "Bestand openen" +msgstr "Openen %s" #: ../midori/midori-view.c:3231 #, c-format @@ -1848,15 +1821,15 @@ msgstr "Pagina analyseren - %s" #: ../midori/midori-view.c:3513 msgid "Speed dial" -msgstr "" +msgstr "Snelkeuze" #: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" -msgstr "" +msgstr "Klik om een snelkeuze toe te voegen" #: ../midori/midori-view.c:3515 msgid "Enter shortcut address" -msgstr "" +msgstr "Geef adres voor snelkeuze" #: ../midori/midori-view.c:3516 msgid "Enter shortcut title" From 67d5758283bfa2b0e284902fbb3a86f6d4752f3f Mon Sep 17 00:00:00 2001 From: padv Date: Sun, 6 Jun 2010 11:42:49 +0200 Subject: [PATCH 2674/2970] l10n: Updated Dutch (Flemish) (nl) translation to 81% New status: 513 messages complete with 37 fuzzies and 79 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 59 +++++++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/po/nl.po b/po/nl.po index 595d86fe..11da2d47 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1102,7 +1102,7 @@ msgstr "Toon laatst geopende tabbladen" #: ../midori/midori-websettings.c:207 msgid "Show last tabs without loading" -msgstr "" +msgstr "Toon laatste tabbladen zonder te laden" #: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" @@ -1833,64 +1833,61 @@ msgstr "Geef adres voor snelkeuze" #: ../midori/midori-view.c:3516 msgid "Enter shortcut title" -msgstr "" +msgstr "Geef titel voor snelkeuze" #: ../midori/midori-view.c:3517 -#, fuzzy msgid "Are you sure you want to delete this shortcut?" -msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" +msgstr "Weet u zeker dat u deze snelkeuze wil wissen?" #: ../midori/midori-view.c:3518 msgid "Set number of columns and rows" -msgstr "" +msgstr "Stel aantal kolommen en rijen in" #: ../midori/midori-view.c:3519 msgid "Enter number of columns and rows:" -msgstr "" +msgstr "Geef aantal kolommen en rijen:" #: ../midori/midori-view.c:3520 msgid "Invalid input for the size of the speed dial" -msgstr "" +msgstr "Ongeldige invoer voor grootte van snelkeuze" #: ../midori/midori-view.c:3521 msgid "Thumb size:" -msgstr "" +msgstr "Grootte miniatuurafbeelding:" #: ../midori/midori-view.c:3522 -#, fuzzy msgid "Small" -msgstr "Kleine pictogrammen" +msgstr "Klein" #: ../midori/midori-view.c:3523 -#, fuzzy msgid "Medium" -msgstr "Menubalk" +msgstr "Middelmatig" #: ../midori/midori-view.c:3524 msgid "Big" -msgstr "" +msgstr "Groot" #: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" -msgstr "" +msgstr "Het document kan niet worden weergegeven" #: ../midori/midori-view.c:3573 -#, fuzzy, c-format +#, c-format msgid "No documentation installed" -msgstr "Documentatie weergeven" +msgstr "Geen documentatie geïnstalleerd" #: ../midori/midori-view.c:3694 msgid "Page loading delayed" -msgstr "" +msgstr "Het laden van de pagina is vertraagd" #: ../midori/midori-view.c:3695 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" +msgstr "Het laden is vertraagd door een recente crash of opstartvoorkeuren." #: ../midori/midori-view.c:3696 msgid "Load Page" -msgstr "" +msgstr "Pagina laden" #: ../midori/midori-view.c:3840 msgid "Blank page" @@ -1898,21 +1895,19 @@ msgstr "Blanco pagina" #: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" -msgstr "" +msgstr "Tabblad _dupliceren" #: ../midori/midori-view.c:4105 -#, fuzzy msgid "_Restore Tab" -msgstr "Vo_lgend tabblad" +msgstr "Tabblad _herstellen" #: ../midori/midori-view.c:4105 msgid "_Minimize Tab" -msgstr "" +msgstr "Tabblad _minimaliseren" #: ../midori/midori-view.c:4111 -#, fuzzy msgid "Close ot_her Tabs" -msgstr "Tabblad _sluiten" +msgstr "An_dere tabbladen sluiten" #: ../midori/midori-view.c:4783 msgid "Print background images" @@ -1920,7 +1915,7 @@ msgstr "Achtergrondafbeeldingen meenemen in afdrukken" #: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" -msgstr "" +msgstr "Of achtergrondafbeeldingen dienen te worden geprint" #: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" @@ -1936,9 +1931,8 @@ msgid "Startup" msgstr "Opstarten" #: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 -#, fuzzy msgid "Use current page as homepage" -msgstr "Open de huidige pagina in het paginavak" +msgstr "Gebruik de huidige pagina als startpagina" #: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 msgid "Transfers" @@ -1959,20 +1953,19 @@ msgstr "Standaard lettertype" #: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" -msgstr "" +msgstr "Het standaardlettertype om tekst weer te geven" #: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" -msgstr "" +msgstr "De standaard lettergrootte om tekst weer te geven" #: ../midori/midori-preferences.c:360 -#, fuzzy msgid "Fixed-width Font Family" -msgstr "Standaard lettertype" +msgstr "Lettertype met vaste breedte" #: ../midori/midori-preferences.c:363 msgid "The font family used to display fixed-width text" -msgstr "" +msgstr "Het lettertype om tekst met vaste breedte weer te geven" #: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" From 5897b112db880acf43cf721f4147f655888ad393 Mon Sep 17 00:00:00 2001 From: padv Date: Sun, 6 Jun 2010 11:56:58 +0200 Subject: [PATCH 2675/2970] l10n: Updated Dutch (Flemish) (nl) translation to 85% New status: 538 messages complete with 27 fuzzies and 64 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 58 +++++++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/po/nl.po b/po/nl.po index 11da2d47..9feb3e7d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1969,7 +1969,7 @@ msgstr "Het lettertype om tekst met vaste breedte weer te geven" #: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" -msgstr "" +msgstr "De lettergrootte om tekst met vaste breedte weer te geven" #: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" @@ -1977,7 +1977,7 @@ msgstr "Minimale lettergrootte" #: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" -msgstr "" +msgstr "De minimale lettergrootte om tekst weer te geven" #. Page "Behavior" #: ../midori/midori-preferences.c:380 @@ -1986,42 +1986,40 @@ msgstr "Gedrag" #: ../midori/midori-preferences.c:393 msgid "Enforce 96 dots per inch" -msgstr "" +msgstr "Handhaven van 96 dpi" #: ../midori/midori-preferences.c:394 msgid "Enforce a video dot density of 96 DPI" -msgstr "" +msgstr "Een videoresolutie van 96 dpi handhaven" #: ../midori/midori-preferences.c:414 msgid "Allow scripts to open popups" -msgstr "" +msgstr "Scripts toelaten om popups te openen" #: ../midori/midori-preferences.c:415 -#, fuzzy msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Pop-ups in tabbladen openen" +msgstr "Of het toegelaten is voor scripts om popups automatisch te openen" #: ../midori/midori-preferences.c:419 msgid "Spell Checking" -msgstr "" +msgstr "Spellingscontrole" #: ../midori/midori-preferences.c:422 -#, fuzzy msgid "Enable Spell Checking" -msgstr "Plugins aanzetten" +msgstr "Spellingscontrole activeren" #: ../midori/midori-preferences.c:423 msgid "Enable spell checking while typing" -msgstr "" +msgstr "Spellingscontrole tijden typen activeren" #: ../midori/midori-preferences.c:425 msgid "Spelling dictionaries:" -msgstr "" +msgstr "Spellingswoordenboeken:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "" +msgstr "Een door komma's gescheiden lijst van talen voor spellingscontrole, bijvoorbeeld \"en_GB,de_DE\"" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2038,14 +2036,12 @@ msgstr "Browsen" #. Page "Applications" #: ../midori/midori-preferences.c:468 -#, fuzzy msgid "Applications" -msgstr "Programma afsluiten" +msgstr "Toepassingen" #: ../midori/midori-preferences.c:469 -#, fuzzy msgid "External applications" -msgstr "Programma afsluiten" +msgstr "Externe toepassingen" #. Page "Network" #: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 @@ -2054,7 +2050,7 @@ msgstr "Netwerk" #: ../midori/midori-preferences.c:492 msgid "Hostname" -msgstr "" +msgstr "Hostnaam" #. Page "Privacy" #: ../midori/midori-preferences.c:511 @@ -2082,29 +2078,26 @@ msgid "_Name:" msgstr "_Naam:" #: ../midori/midori-searchaction.c:989 -#, fuzzy msgid "_Icon:" -msgstr "Pictogrammen" +msgstr "_Pictogram:" #: ../midori/midori-searchaction.c:1003 msgid "_Token:" msgstr "_Trefwoord:" #: ../midori/midori-searchaction.c:1234 -#, fuzzy msgid "Manage Search Engines" -msgstr "_Zoekmachines beheren" +msgstr "Zoekmachines beheren" #: ../midori/midori-searchaction.c:1335 msgid "Use as _default" -msgstr "" +msgstr "Als _standaard gebruiken" #: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Bladwijzer" #: ../midori/sokoke.c:1296 -#, fuzzy msgid "Add Boo_kmark" msgstr "Bladwijzer _toevoegen" @@ -2137,14 +2130,12 @@ msgid "_Transfers" msgstr "Bestands_overdrachten" #: ../midori/sokoke.c:1304 -#, fuzzy msgid "Netscape p_lugins" -msgstr "Plugins aanzetten" +msgstr "Netscape p_lugins" #: ../midori/sokoke.c:1307 -#, fuzzy msgid "New _Folder" -msgstr "Nieuwe map" +msgstr "Nieuwe _map" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" @@ -2159,9 +2150,8 @@ msgid "Delete the selected bookmark" msgstr "Geselecteerde bladwijzer verwijderen" #: ../panels/midori-bookmarks.c:262 -#, fuzzy msgid "Add a new folder" -msgstr "Nieuwe bladwijzer toevoegen" +msgstr "Een nieuwe map toevoegen" #: ../panels/midori-bookmarks.c:592 msgid "Separator" @@ -2173,11 +2163,11 @@ msgstr "Console" #: ../panels/midori-console.c:361 msgid "Copy _All" -msgstr "" +msgstr "Kopieer _alle" #: ../panels/midori-console.c:362 msgid "Copy All" -msgstr "" +msgstr "Kopieer alle" #: ../panels/midori-extensions.c:91 msgid "Extensions" @@ -2185,11 +2175,11 @@ msgstr "Extensies" #: ../panels/midori-history.c:273 msgid "Erroneous clock time" -msgstr "" +msgstr "Foutieve kloktijd" #: ../panels/midori-history.c:274 msgid "The clock time lies in the past. Please check the current date and time." -msgstr "" +msgstr "De kloktijd ligt in het verleden. Controleer a.u.b. de huidige datum en tijd." #: ../panels/midori-history.c:286 msgid "A week ago" From d3f60cd83543cc86180255bd4722701b6ee03c1c Mon Sep 17 00:00:00 2001 From: padv Date: Sun, 6 Jun 2010 14:49:18 +0200 Subject: [PATCH 2676/2970] l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/nl.po | 263 ++++++++++++++++++++++++++----------------------------- 1 file changed, 126 insertions(+), 137 deletions(-) diff --git a/po/nl.po b/po/nl.po index 9feb3e7d..65553c71 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-05 10:08+0000\n" +"POT-Creation-Date: 2010-06-06 10:08+0000\n" "PO-Revision-Date: 2008-11-10 02:02+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch\n" @@ -54,7 +54,7 @@ msgstr "Kan database niet openen: %s\n" #: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Kan verjaarde items in geschiedenis niet verwijderen: %s\n" +msgstr "Kan oude items in geschiedenis niet verwijderen: %s\n" #: ../midori/main.c:457 #, c-format @@ -84,7 +84,7 @@ msgstr "De sessie kan niet worden opgeslagen. %s" #: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Geen root certificaatbestand aanwezig. SSL certificaten kunnen niet worden geverifieerd" +msgstr "Geen root certificaatbestand aanwezig. SSL certificaten kunnen niet worden geverifieerd." #: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." @@ -100,7 +100,7 @@ msgstr "Reset de laatste _SESSION" #: ../midori/main.c:994 msgid "Disable all _extensions" -msgstr "Schakel alle _extensions uit" +msgstr "Schakel alle _extensies uit" #: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format @@ -122,7 +122,7 @@ msgstr "Snapshot opgeslagen in:%s\n" #: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" -msgstr "ADRES uitvoeren als een webapplicatie" +msgstr "ADRES uitvoeren als een webtoepassing" #: ../midori/main.c:1575 msgid "ADDRESS" @@ -130,11 +130,11 @@ msgstr "ADRES" #: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" -msgstr "Gebruik FOLDER als configuratie map" +msgstr "Gebruik MAP als configuratiemap" #: ../midori/main.c:1578 msgid "FOLDER" -msgstr "FOLDER" +msgstr "MAP" #: ../midori/main.c:1581 msgid "Show a diagnostic dialog" @@ -246,7 +246,7 @@ msgstr "Fout bij schrijven." #: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 #: ../midori/midori-browser.c:5589 msgid "Reload the current page" -msgstr "De huidige pagina herladen" +msgstr "De huidige pagina opnieuw laden" #: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" @@ -397,7 +397,7 @@ msgstr "Leeg" #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." -msgstr "Kan externe applicatie niet uitvoeren." +msgstr "Kan extern programma niet uitvoeren." #: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format @@ -441,7 +441,7 @@ msgstr "Epiphany" #: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." -msgstr "Bladwijzer importeren..." +msgstr "Bladwijzers importeren..." #: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" @@ -449,7 +449,7 @@ msgstr "Bladwijzers _importeren" #: ../midori/midori-browser.c:4704 msgid "_Application:" -msgstr "_programma" +msgstr "_Toepassing:" #: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 @@ -474,15 +474,15 @@ msgstr "Kan item in geschiedenis niet verwijderen: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu #: ../midori/midori-browser.c:5002 msgid "Clear Private Data" -msgstr "Wis privé data" +msgstr "Wis privégegevens" #: ../midori/midori-browser.c:5006 msgid "_Clear private data" -msgstr "Privé data _wissen" +msgstr "Privégegevens _wissen" #: ../midori/midori-browser.c:5020 msgid "Clear the following data:" -msgstr "wis de volgende data:" +msgstr "Wis de volgende data:" #: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 @@ -495,11 +495,11 @@ msgstr "Cookies" #: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" -msgstr "'Flash' koekies" +msgstr "'Flash' cookies" #: ../midori/midori-browser.c:5047 msgid "Website icons" -msgstr "Website iconen" +msgstr "Website pictogrammen" #: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" @@ -523,7 +523,9 @@ msgstr "Deze bibliotheek is vrije software; u kan deze opnieuw verdelen en/of wi #: ../midori/midori-browser.c:5187 msgid "translator-credits" -msgstr "Timo Verbeek " +msgstr "" +"Timo Verbeek \n" +"Pascal De Vuyst " #: ../midori/midori-browser.c:5496 msgid "_File" @@ -543,11 +545,11 @@ msgstr "Nieuw tabblad openen" #: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" -msgstr "P _rivé Browsen" +msgstr "P_rivé surfen" #: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" -msgstr "Geen privé-data opslaan tijdens het browsen" +msgstr "Geen privégegevens opslaan tijdens het surfen" #: ../midori/midori-browser.c:5509 msgid "Open a file" @@ -567,7 +569,7 @@ msgstr "Voeg snelkoppeling toe aan snelkiezen" #: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" -msgstr "Voeg Snelkoppeling aan _desktop" +msgstr "Voeg snelkoppeling toe op _bureaublad" #: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" @@ -575,11 +577,11 @@ msgstr "Voeg snelkoppeling toe op bureaublad" #: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" -msgstr "Aanmelden aan deze Nieuws _feed" +msgstr "Abonneren op nieuws_feed" #: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" -msgstr "Aanmelden aan deze nieuws feed" +msgstr "Abonneren op deze nieuwsfeed" #: ../midori/midori-browser.c:5526 msgid "_Close Tab" @@ -2186,10 +2188,10 @@ msgid "A week ago" msgstr "Eén week geleden" #: ../panels/midori-history.c:288 -#, fuzzy, c-format +#, c-format msgid "%d day ago" msgid_plural "%d days ago" -msgstr[0] "%d dagen geleden" +msgstr[0] "%d dag geleden" msgstr[1] "%d dagen geleden" #: ../panels/midori-history.c:291 @@ -2218,41 +2220,40 @@ msgstr "Volledige geschiedenis wissen" #: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 -#, fuzzy msgid "Filter:" -msgstr "_Map:" +msgstr "Filter:" #: ../panels/midori-transfers.c:478 -#, fuzzy msgid "Open Destination _Folder" -msgstr "Openen in _paginavak" +msgstr "Open bestemmings_map" #: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" -msgstr "" +msgstr "Kopieer Linkverwijzing" #: ../katze/katze-http-auth.c:214 msgid "Authentication Required" -msgstr "" +msgstr "Authenticatie vereist" #: ../katze/katze-http-auth.c:230 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" +"Een gebruikersnaam en wachtwoord zijn\n" +"vereist om deze locatie te openen:" #: ../katze/katze-http-auth.c:244 msgid "Username" -msgstr "" +msgstr "Gebruikersnaam" #: ../katze/katze-http-auth.c:257 msgid "Password" -msgstr "" +msgstr "Wachtwoord" #: ../katze/katze-http-auth.c:272 -#, fuzzy msgid "_Remember password" -msgstr "Laatst gebruikte venstergrootte onthouden" +msgstr "Wachtwoord _onthouden" #: ../katze/katze-throbber.c:882 #, c-format @@ -2288,48 +2289,45 @@ msgstr "Voorkeuren voor %s" #: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" -msgstr "" +msgstr "Configureer advertentiefilters" #: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "" +msgstr "Geef het adres van een voorgeconfigureerde filterlijst in het tekstvak en klik \"\\Toevoegen\" om het aan de lijst toe te voegen. Meer lijsten zijn beschikbaar op %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." -msgstr "" +msgstr "Configureer _advertentiefilters" #: ../extensions/adblock.c:841 -#, fuzzy msgid "Edit rule" -msgstr "Edit map" +msgstr "Regel bewerken" #: ../extensions/adblock.c:854 -#, fuzzy msgid "_Rule:" -msgstr "_Titel:" +msgstr "_Regel:" #: ../extensions/adblock.c:908 -#, fuzzy msgid "Bl_ock image" -msgstr "Blanco pagina" +msgstr "Afbeelding bl_okkeren" #: ../extensions/adblock.c:913 msgid "Bl_ock link" -msgstr "" +msgstr "Link bl_okkeren" #: ../extensions/adblock.c:1489 msgid "Advertisement blocker" -msgstr "" +msgstr "Advertentieblokkeerder" #: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" -msgstr "" +msgstr "Blokkeer advertenties volgens filterlijst" #: ../extensions/addons.c:122 #, c-format msgid "Copy %s to the folder %s." -msgstr "" +msgstr "Kopieer %s naar de map %s." #: ../extensions/addons.c:177 msgid "Userscripts" @@ -2340,71 +2338,67 @@ msgid "Userstyles" msgstr "Gebruikersopmaakprofielen" #: ../extensions/addons.c:1085 -#, fuzzy, c-format +#, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "De instellingen kunnen niet worden opgeslagen. %s" +msgstr "De configuratie van de extensie '%s' kan niet worden opgeslagen: %s\n" #: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" -msgstr "" +msgstr "Gebruiker addons" #: ../extensions/addons.c:1210 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "" +msgstr "Kan folder '%s': %s niet controleren" #: ../extensions/addons.c:1254 msgid "Support for userscripts and userstyles" -msgstr "" +msgstr "Ondersteuning voor gebruikersscripts en -stijlen" #: ../extensions/colorful-tabs.c:204 -#, fuzzy msgid "Colorful Tabs" -msgstr "Tabblad _sluiten" +msgstr "Gekleurde tabbladen" #: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" -msgstr "" +msgstr "Ieder tabblad verschillend tinten" #: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:56 -#, fuzzy msgid "Cookie Manager" -msgstr "Downloadbeheer" +msgstr "Cookiebeheerder" #: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" -msgstr "" +msgstr "Alles wissen" #: ../extensions/cookie-manager/cookie-manager-page.c:114 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "" +msgstr "Alle weergegeven cookies wissen. Als een filter is ingesteld zullen enkel de cookies die overeenkomen met de filter worden gewist." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" -msgstr "" +msgstr "Alles uitvouwen" #: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" -msgstr "" +msgstr "Alles invouwen" #: ../extensions/cookie-manager/cookie-manager-page.c:578 -#, fuzzy msgid "Do you really want to delete all cookies?" -msgstr "Weet u zeker dat u de hele geschiedenis wilt wissen?" +msgstr "Weet u zeker dat u alle cookies wil wissen?" #: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" -msgstr "" +msgstr "Vraag" #: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." -msgstr "" +msgstr "Enkel cookies die overeenkomen met de filter zullen worden gewist." #: ../extensions/cookie-manager/cookie-manager-page.c:677 -#, fuzzy msgid "At the end of the session" -msgstr "Bekijk de broncode van de geselecteerde tekst" +msgstr "Bij het beëindigen van de sessie" #: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format @@ -2416,15 +2410,20 @@ msgid "" "Secure: %s\n" "Expires: %s" msgstr "" +"Host: %s\n" +"Naam: %s\n" +"Waarde: %s\n" +"Pad: %s\n" +"Veilig: %s\n" +"Vervalt: %s" #: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" -msgstr "" +msgstr "Ja" #: ../extensions/cookie-manager/cookie-manager-page.c:686 -#, fuzzy msgid "No" -msgstr "Geen" +msgstr "Nee" #: ../extensions/cookie-manager/cookie-manager-page.c:700 #, c-format @@ -2432,148 +2431,146 @@ msgid "" "Domain: %s\n" "Cookies: %d" msgstr "" +"Domein: %s\n" +"Cookies: %d" #: ../extensions/cookie-manager/cookie-manager-page.c:1030 -#, fuzzy msgid "Name" -msgstr "_Naam:" +msgstr "Naam" #: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" -msgstr "" +msgstr "Alles _uitvouwen" #: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" -msgstr "" +msgstr "Alles _invouwen" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "" +msgstr "Geef een filterwaarde om enkel de cookies te tonen wiens naam of domein overeenkomen met het ingegeven filter." #: ../extensions/cookie-manager/main.c:40 -#, fuzzy msgid "_Cookie Manager" -msgstr "Downloadbeheer" +msgstr "_Cookiebeheerder" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "" +msgstr "Cookies tonen en verwijderen" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +msgstr "Kan vereiste Atom \"entry\" elementen niet vinden in XML data." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +msgstr "Kan vereiste Atom \"feed\" elementen niet vinden in XML data." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "" +msgstr "Laatst aangepast: %s." #: ../extensions/feed-panel/feed-panel.c:670 -#, fuzzy msgid "Feeds" -msgstr "Opties" +msgstr "Feeds" #: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" -msgstr "" +msgstr "Nieuwe feed toevoegen" #: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" -msgstr "" +msgstr "Feed verwijderen" #: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" -msgstr "" +msgstr "_Feeds" #: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "" +msgstr "Kan hoofdelement in XML data van feed niet vinden." #: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." -msgstr "" +msgstr "Niet ondersteund feedformaat." #: ../extensions/feed-panel/feed-parse.c:262 -#, fuzzy, c-format +#, c-format msgid "Failed to parse XML feed: %s" -msgstr "Kan database niet openen: %s\n" +msgstr "Kan XML feed niet openen: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" +msgstr "Kan \"channel\" element in RSS XML data niet vinden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "" +msgstr "Niet ondersteunde RSS versie gevonden." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +msgstr "Kan vereiste RSS \"\\item\" elementen niet vinden in XML data." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" +msgstr "Kan vereiste RSS \"\\channel\" elementen niet vinden in XML data." #: ../extensions/feed-panel/main.c:129 msgid "Error" -msgstr "" +msgstr "Fout" #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" -msgstr "" +msgstr "Feed '%s' bestaat reeds" #: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" -msgstr "" +msgstr "Fout bij het laden van feed '%s'" #: ../extensions/feed-panel/main.c:516 -#, fuzzy msgid "Feed Panel" -msgstr "Paneel weergeven" +msgstr "Feedpaneel" #: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" -msgstr "" +msgstr "Lees Atom/RSS feeds" #: ../extensions/formhistory.c:144 -#, fuzzy, c-format +#, c-format msgid "Failed to add form value: %s\n" -msgstr "Kan item niet toevoegen aan geschiedenis: %s\n" +msgstr "Fout bij toevoegen van formulierwaarde: %s\n" #: ../extensions/formhistory.c:510 msgid "Stores history of entered form data" -msgstr "" +msgstr "Bewaart geschiedenis van ingegeven formuliergegevens" #: ../extensions/formhistory.c:514 #, c-format msgid "Not available: %s" -msgstr "" +msgstr "Niet beschikbaar: %s" #: ../extensions/formhistory.c:515 msgid "Resource files not installed" -msgstr "" +msgstr "Bronbestanden niet geïnstalleerd" #: ../extensions/formhistory.c:521 msgid "Form history filler" -msgstr "" +msgstr "Formuliergeschiedenis" #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" -msgstr "" +msgstr "Muisgebaren" #: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" -msgstr "" +msgstr "Midori besturen door de muis te bewegen" #. i18n: A panel showing a user specified web page #: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 @@ -2586,23 +2583,23 @@ msgstr "_Paginavak" #: ../extensions/page-holder.c:178 msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "" +msgstr "Een of meerdere pagina's open houden parallel met uw tabbladen" #: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" -msgstr "" +msgstr "Toetsenbord sneltoetsen aanpassen" #: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." -msgstr "" +msgstr "Snelt_oetsen aanpassen..." #: ../extensions/shortcuts.c:315 msgid "Shortcuts" -msgstr "" +msgstr "Sneltoetsen" #: ../extensions/shortcuts.c:316 msgid "View and edit keyboard shortcuts" -msgstr "" +msgstr "Toetsenbord sneltoetsen tonen en bewerken" #: ../extensions/statusbar-features.c:84 msgid "Images" @@ -2613,76 +2610,68 @@ msgid "Scripts" msgstr "Scripts" #: ../extensions/statusbar-features.c:108 -#, fuzzy msgid "Netscape plugins" -msgstr "Plugins aanzetten" +msgstr "Netscape plugins" #: ../extensions/statusbar-features.c:149 -#, fuzzy msgid "Statusbar Features" -msgstr "_Statusbalk" +msgstr "Statusbalk gedrag" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "" +msgstr "Eenvoudig omschakelen van gedrag van webpagina's" #: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 -#, fuzzy msgid "Tab Panel" -msgstr "Paneel weergeven" +msgstr "Tabbladpaneel" #: ../extensions/tab-panel.c:609 -#, fuzzy msgid "T_ab Panel" -msgstr "Paneel weergeven" +msgstr "T_abbladpaneel" #: ../extensions/tab-panel.c:626 -#, fuzzy msgid "Show tabs in a vertical panel" -msgstr "_Paneel weergeven" +msgstr "Tabbladen in een verticaal paneel tonen" #: ../extensions/tab-switcher.c:402 -#, fuzzy msgid "Tab History List" -msgstr "Geschiedenis" +msgstr "Lijst van tabbladengeschiedenis " #: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" +msgstr "Laat toe om tussen tabbladen te wisselen door te kiezen uit een lijst gesorteerd volgens laatst gebruik" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" -msgstr "" +msgstr "Werkbalk aanpassen" #: ../extensions/toolbar-editor.c:405 msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "" +msgstr "Selecteer items die op de werkbalk dienen te worden weergegeven. Items kunnen via slepen en neerzetten van plaats worden verandert." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" -msgstr "" +msgstr "Beschikbare items" #: ../extensions/toolbar-editor.c:442 msgid "Displayed Items" -msgstr "" +msgstr "Weergegeven items" #: ../extensions/toolbar-editor.c:577 -#, fuzzy msgid "Customize _Toolbar..." -msgstr "Aangepast..." +msgstr "_Werkbalk aanpassen..." #: ../extensions/toolbar-editor.c:608 -#, fuzzy msgid "Toolbar Editor" -msgstr "Stijl van de werkbalk" +msgstr "Werkbalkeditor" #: ../extensions/toolbar-editor.c:609 msgid "Easily edit the toolbar layout" -msgstr "" +msgstr "De werkbalk eenvoudig aanpassen" #: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" -msgstr "" +msgstr "HTTP-communicatie op schijf cachen" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Kan de tijd niet verkrijgen: %s\n" From 44296a6d36b85175c7cb25ddd34cfc6bc184b42e Mon Sep 17 00:00:00 2001 From: douart patrick Date: Sun, 6 Jun 2010 20:56:25 +0200 Subject: [PATCH 2677/2970] l10n: Updated French (fr) translation to 97% New status: 611 messages complete with 17 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/fr.po | 1206 +++++++++++++++++++++++++++--------------------------- 1 file changed, 611 insertions(+), 595 deletions(-) diff --git a/po/fr.po b/po/fr.po index fd13213d..e13847f1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,12 +8,12 @@ # Jérôme Geulfucci 2009 # Stéphane Marguet 2009-2010 # Patrick Douart 2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 12:45-0400\n" +"POT-Creation-Date: 2010-06-06 16:09+0000\n" "PO-Revision-Date: 2010-05-10 13:07-0400\n" "Last-Translator: Pascal Gervais \n" "Language-Team: French \n" @@ -26,9 +26,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur Internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -62,184 +62,175 @@ msgstr "Impossible d'ouvrir la base de données : %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pas pu être enregistrés. %s" -# pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +# pas très content +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:868 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Aucun fichier de certificat racine disponible. Les certificats SSL ne " -"peuvent être vérifiés." +#: ../midori/main.c:880 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Aucun fichier de certificat racine disponible. Les certificats SSL ne peuvent être vérifiés." -#: ../midori/main.c:958 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori semble s'être interrompu de façon inattendue lors de la dernière " -"utilisation. Si cela se produit de façon répétée, essayez l'une des options " -"suivantes pour résoudre le problème." +#: ../midori/main.c:970 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori semble s'être interrompu de façon inattendue lors de la dernière utilisation. Si cela se produit de façon répétée, essayez l'une des options suivantes pour résoudre le problème." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pas pu être chargée : %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Capture enregistrée sous: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "Lancer l'ADRESSE comme une application internet" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "Afficher une fenêtre de diagnostic" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "Exécuter la commande spécifiée" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquer les URIs conformément au MODÈLE d'expression régulière" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "MODÈLE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SECONDES" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" -msgstr "" -"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" +msgstr "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" # pas très content -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "_Ignorer" @@ -261,270 +252,288 @@ msgstr "Format de signets inconnus." msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5511 -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "Impossible de mettre à jour le titre: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "Nouveau dossier" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "Modifier le dossier" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4672 ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "Dossier supérieur" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:862 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Ajouter à la page d'appel rapi_de" + +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "Afficher dans la _barre d'outils" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "Lancer comme une application _internet" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Il n'y a pas assez d'espace libre pour télécharger \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Le fichier à besoin de %s, mais seulement %s est disponible." -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4722 -#: ../midori/midori-browser.c:4754 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1429 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "Le fichier « %s » a été téléchargé." -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "Transfert terminé" -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:2322 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#, fuzzy +msgid "Some files are being downloaded" +msgstr "Le fichier « %s » a été téléchargé." + +#: ../midori/midori-browser.c:1921 +#, fuzzy +msgid "_Quit Midori" +msgstr "Quitter Midori" + +#: ../midori/midori-browser.c:1923 +#, fuzzy +msgid "The transfers will be cancelled if Midori quits." +msgstr "Les transferts seront annulées si Midori se ferme" + +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2398 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nouveau flux" -#: ../midori/midori-browser.c:2439 ../midori/midori-browser.c:5576 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3012 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/midori-browser.c:3092 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vide" -#: ../midori/midori-browser.c:3713 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:5970 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Impossible d'ajouter l'élément de l'historique : %s\n" -#: ../midori/midori-browser.c:4360 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:4367 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:4370 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:4593 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4594 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4595 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4596 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4597 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4618 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "Importer des signets..." -#: ../midori/midori-browser.c:4621 ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "_Importer des signets" -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "_Application :" -#: ../midori/midori-browser.c:4659 ../midori/midori-browser.c:5685 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:4733 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "Impossible d'importer les signets" -#: ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "Impossible d'exporter les signets" -#: ../midori/midori-browser.c:4823 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer l'élément de l'historique : %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:4959 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:4980 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Onglets _fermés" -#: ../midori/midori-browser.c:4985 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache internet" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "Effacer les informations privées en _quittant Midori" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:5096 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou " -"le modifier selon les termes de la GNU Lesser General Public License telle " -"que publiée par la Free Software Foundation; soit la version 2.1 de la " -"licence ou, à votre choix, toutes versions ultérieures." +#: ../midori/midori-browser.c:5168 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU Lesser General Public License telle que publiée par la Free Software Foundation; soit la version 2.1 de la licence ou, à votre choix, toutes versions ultérieures." -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -533,519 +542,519 @@ msgstr "" "Pascal Gervais \n" "Jérôme Geulfucci " -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:5426 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:5440 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "Ajouter un raccourci à la page d'appel rapide" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "Ajouter un raccourci sur le _bureau" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "Ajouter un raccourci sur le bureau" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "Souscrire au flux de _nouvelles" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "Souscrire à ce flux de _nouvelles" -#: ../midori/midori-browser.c:5454 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "Refaire la dernière modification" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:5480 ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "Défilement à _gauche" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "Défilement vers la gauche" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "Défilement en _bas" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "Défilement vers le bas" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "Défilement en _haut" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "Défilement vers le haut" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "Défilement à _droite" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "Défilement vers la droite" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "Aller à la page suivante" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "Aller à la sous-page précédente" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "Aller à la sous-page suivante" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "_Exporter des signets" -#: ../midori/midori-browser.c:5587 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "_Inspecter la page" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "Inspecter les détails de la page et accéder aux outils développeur..." -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "_Focaliser l'onglet actuel" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "Focaliser l'onglet actuel" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "Ouvrir la _dernière session" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "Ouvrir les onglets enregistrés dans la dernière session" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "Signaler une _anomalie" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:5666 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:5673 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Coréen (EUC-KR)" -#: ../midori/midori-browser.c:5676 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:5679 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5682 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6230 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:6237 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:6263 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:6265 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:6286 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "Rouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:6318 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:6320 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:6348 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "Fe_nêtre" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6570 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:6601 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:6606 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:6611 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:6620 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../midori/midori-browser.c:6632 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:6678 ../panels/midori-transfers.c:142 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Effacer tout" -#: ../midori/midori-browser.c:7036 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" @@ -1075,636 +1084,620 @@ msgstr "Impossible d'exécuter l'instruction de base de données\n" msgid "Paste and p_roceed" msgstr "Coller et continue_r" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Détacher le panneau choisi de la fenêtre" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Aligner le panneau latéral sur la gauche" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Cacher les contrôles" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Afficher une Page vierge" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Afficher les derniers onglets ouverts" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:207 +#, fuzzy +msgid "Show last tabs without loading" +msgstr "Afficher les derniers onglets sans charger" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Petites icônes" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Icônes et texte" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automatique (GNOME ou de l'environnement)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Pas de serveur mandataire" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Dernière recherche sur Internet" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "La dernière recherche sur Internet enregistrée" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Indique s'il faut afficher la barre des transferts" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Moteurs de recherche dans la complétion" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" -msgstr "" -"Indique s'il faut afficher les moteurs de recherche dans les résultats de " -"complétion de la barre d'adresse" +msgstr "Indique s'il faut afficher les moteurs de recherche dans les résultats de complétion de la barre d'adresse" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Afficher les élements de contrôle du panneau" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Indique s'il faut afficher les élements de contrôle du panneau" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Ouvrir les panneaux dans une fenêtre séparée" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" -msgstr "" -"Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" +msgstr "Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Au lancement de Midori :" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Que faire au lancement de Midori" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Fenêtre de fermeture inattendue" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Afficher la page d'appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Enregistrer les téléchargements sous :" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les fichiers téléchargés" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Demander le dossier de destination" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" -"Indique s'il faut demander le dossier de destination quand un fichier est " -"téléchargé." +msgstr "Indique s'il faut demander le dossier de destination quand un fichier est téléchargé." -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Signaler la fin des transferts" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Indique s'il faut signaler la fin d'un transfert par une notification" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Agrégateur de flux" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Un agrégateur de flux externe" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Encodage favori des caractères" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Ouvrir les nouvelles pages dans :" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Lieu où les nouvelles pages doivent être ouvertes" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Ouvrir les pages externes dans :" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Lieu où les pages externes doivent être ouvertes" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Un clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" -msgstr "" -"Charger l'addresse de la sélection avec un clic du bouton central de la " -"souris" +msgstr "Charger l'addresse de la sélection avec un clic du bouton central de la souris" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou " -"après le dernier" +msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou après le dernier" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtre intempestives dans des onglets" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" -msgstr "" -"Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" +msgstr "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Activer le support de base de données HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Indique s'il faut activer le support de base de données de HTML5" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Activer le support de stockage local de HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Indique s'il faut activer le support de stockage local de HTML5" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Activer le cache d'applications web hors ligne" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Indique s'il faut activer le cache des applications web hors ligne" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Chercher pendant la saisie" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" -msgstr "" -"Indique s'il faut chercher automatiquement dans la page pendant la saisie" +msgstr "Indique s'il faut chercher automatiquement dans la page pendant la saisie" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Défilement cinétique" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Indique si le défilement doit se déplacer cinétiquement en fonction de la " -"vitesse" +msgstr "Indique si le défilement doit se déplacer cinétiquement en fonction de la vitesse" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Accepter les cookies" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Type de fichiers témoins (cookies) à accepter" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Uniquement les cookies d'origine" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Accepter les fichiers témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Âge maximal des cookies" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" -msgstr "" -"Le nombre maximal de jours durant lesquels conserver les fichiers témoins" +msgstr "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Se souvenir des dernières pages visitées" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" -msgstr "" -"Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" +msgstr "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Le type de serveur mandataire à utiliser" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Détecter le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" -"Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" +msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages Internet" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Langages préférés" -#: ../midori/midori-websettings.c:1129 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Une liste des langues préférées séparées par une virgule pour le rendu des " -"pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;" -"q=0.667\"" +#: ../midori/midori-websettings.c:1125 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Une liste des langues préférées séparées par une virgule pour le rendu des pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Effacer les informations privées" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Les informations privées sélectionnées pour la suppression" @@ -1712,197 +1705,246 @@ msgstr "Les informations privées sélectionnées pour la suppression" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1190 ../midori/midori-view.c:4489 -#: ../midori/midori-view.c:4493 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Erreur - %s" -#: ../midori/midori-view.c:1191 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:1196 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Essayer une autre fois" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1237 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:1474 ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 #, c-format msgid "Send a message to %s" msgstr "Envoyer un message à %s" -#: ../midori/midori-view.c:2093 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 msgid "Inspect _Element" msgstr "Inspecter l'élé_ment" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2215 +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:2195 msgid "Open Link in _Foreground Tab" msgstr "Ouvrir le lien en a_vant plan" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2196 msgid "Open Link in _Background Tab" msgstr "Ouvrir le lien en a_rrière plan" -#: ../midori/midori-view.c:2153 ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2202 msgid "Open Link as Web A_pplication" msgstr "Ouvrir le lien comme une appli_cation internet" -#: ../midori/midori-view.c:2159 +#: ../midori/midori-view.c:2205 msgid "Copy Link de_stination" msgstr "Copier l'adre_sse du lien" -#: ../midori/midori-view.c:2162 ../midori/midori-view.c:2234 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:2163 ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:2167 ../midori/midori-view.c:2197 -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:2176 +#: ../midori/midori-view.c:2222 msgid "Open _Image in New Tab" msgstr "Ouvrir l'image dans un _nouvel onglet" -#: ../midori/midori-view.c:2179 +#: ../midori/midori-view.c:2225 msgid "Copy Image _Address" msgstr "Copier l'_adresse de l'image" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2228 msgid "Save I_mage" msgstr "Enregistrer l'i_mage" -#: ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2229 msgid "Download I_mage" msgstr "Téléc_harger l'image" -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2236 msgid "Copy Video _Address" msgstr "Copier l'_adresse de la vidéo" -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2239 msgid "Save _Video" msgstr "Enregistrer la _vidéo" -#: ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2239 msgid "Download _Video" msgstr "Télécharger la _vidéo" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Rechercher _avec" -#: ../midori/midori-view.c:2291 ../midori/midori-view.c:2298 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:2635 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2642 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:3190 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Appel rapide" -#: ../midori/midori-view.c:3456 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:3457 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:3458 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:3459 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:3496 +#: ../midori/midori-view.c:3518 +#, fuzzy +msgid "Set number of columns and rows" +msgstr "Choisir le nombre de colonnes et de lignes" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "Entrer le nombre de colonnes et de lignes" + +#: ../midori/midori-view.c:3520 +#, fuzzy +msgid "Invalid input for the size of the speed dial" +msgstr "Entrée invalide pour la taille de la boite de dialogue vitesse" + +#: ../midori/midori-view.c:3521 +#, fuzzy +msgid "Thumb size:" +msgstr "Taille des vignettes:" + +#: ../midori/midori-view.c:3522 +#, fuzzy +msgid "Small" +msgstr "Petites" + +#: ../midori/midori-view.c:3523 +#, fuzzy +msgid "Medium" +msgstr "Moyennes" + +#: ../midori/midori-view.c:3524 +#, fuzzy +msgid "Big" +msgstr "Grandes" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-view.c:3769 +#: ../midori/midori-view.c:3694 +#, fuzzy +msgid "Page loading delayed" +msgstr "Chargement de la page retardé" + +#: ../midori/midori-view.c:3695 +#, fuzzy +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Chargement différé, soit en raison d'un récent accident ou les préférences de démarrage." + +#: ../midori/midori-view.c:3696 +#, fuzzy +msgid "Load Page" +msgstr "Charger la page" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Dupliquer l'onglet" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Restorer l'onglet" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Minimiser l'onglet" -#: ../midori/midori-view.c:4040 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-view.c:4661 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:4662 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:4714 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Fonctionnalités" @@ -1954,8 +1996,7 @@ msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe" #: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" -msgstr "" -"La taille de la police utilisée pour afficher les textes à largeur fixe" +msgstr "La taille de la police utilisée pour afficher les textes à largeur fixe" #: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" @@ -1984,9 +2025,7 @@ msgstr "Autorisés les scripts à ouvrir des popups" #: ../midori/midori-preferences.c:415 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives " -"(popups) automatiquement" +msgstr "Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives (popups) automatiquement" #: ../midori/midori-preferences.c:419 msgid "Spell Checking" @@ -2006,12 +2045,8 @@ msgstr "Dictionnaires d'orthographe :" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Une liste de langues séparées par des virgules, utilisées par le " -"vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Une liste de langues séparées par des virgules, utilisées par le vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2125,23 +2160,28 @@ msgstr "_Transferts" msgid "Netscape p_lugins" msgstr "Greffons _Netscape" +#: ../midori/sokoke.c:1307 +#, fuzzy +msgid "New _Folder" +msgstr "Nouveau dossier" + #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:592 msgid "Separator" msgstr "Séparateur" @@ -2149,6 +2189,16 @@ msgstr "Séparateur" msgid "Console" msgstr "Console" +#: ../panels/midori-console.c:361 +#, fuzzy +msgid "Copy _All" +msgstr "Masquer tous" + +#: ../panels/midori-console.c:362 +#, fuzzy +msgid "Copy All" +msgstr "Masquer tous" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensions" @@ -2158,11 +2208,8 @@ msgid "Erroneous clock time" msgstr "Temps d'horloge incorrect" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "" -"L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la " -"date et l'heure." +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la date et l'heure." #: ../panels/midori-history.c:286 msgid "A week ago" @@ -2187,29 +2234,29 @@ msgstr "Hier" msgid "Are you sure you want to remove all history items?" msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Supprimer l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Effacer tout l'historique" # manque un raccourcis Alt+X -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtre :" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Ouvrir le _dossier de destination" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Copier l'_adresse du lien" @@ -2269,45 +2316,40 @@ msgstr "Choisissez un dossier" msgid "Preferences for %s" msgstr "Préférences pour %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configurer les filtres de publicité" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte " -"et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de " -"listes à %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de listes à %s." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Configurer les filtres de _publicité" -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Modifier les règles" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regles :" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "_Bloquer l'image" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "B_loquer le lien" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" @@ -2327,8 +2369,7 @@ msgstr "Styles utilisateur" #: ../extensions/addons.c:1085 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" -"La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" +msgstr "La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" #: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" @@ -2361,12 +2402,8 @@ msgid "Delete All" msgstr "Supprimer tous" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Supprimer tous les témoins visibles. Si un filtre est appliqué, seuls les " -"fichiers témoins correspondant au filtre seront effacés." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Supprimer tous les témoins visibles. Si un filtre est appliqué, seuls les fichiers témoins correspondant au filtre seront effacés." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2439,12 +2476,8 @@ msgid "_Collapse All" msgstr "_Masquer tous" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine " -"correspondent au filtre entré." +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine correspondent au filtre entré." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2456,35 +2489,32 @@ msgstr "Lister, afficher et supprimer les fichiers témoins" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments ATOM \"entry\" requis dans les données " -"XML." +msgstr "Impossible de trouver les éléments ATOM \"entry\" requis dans les données XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML." +msgstr "Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Dernière mise à jour : %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Flux" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Ajouter un nouveau flux" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Supprimer un flux" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Flux" @@ -2505,8 +2535,7 @@ msgstr "Impossible d'analyser le flux XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" -"Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." +msgstr "Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2514,34 +2543,31 @@ msgstr "La version trouvée du flux RSS n'est pas prise en charge." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments \"item\" requis dans les données XML." +msgstr "Impossible de trouver les éléments \"item\" requis dans les données XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments RSS \"channel\" requis dans les données " -"XML." +msgstr "Impossible de trouver les éléments RSS \"channel\" requis dans les données XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erreur" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Le flux « %s » existe déjà" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Erreur lors du chargement du flux « %s »" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Panneau de flux" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" @@ -2622,8 +2648,7 @@ msgstr "Fonctionnalités dans la barre d'état" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "" -"Activer et désactiver facilement des fonctionnalités sur les pages Internet" +msgstr "Activer et désactiver facilement des fonctionnalités sur les pages Internet" #: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" @@ -2637,24 +2662,20 @@ msgstr "P_anneau d'onglets" msgid "Show tabs in a vertical panel" msgstr "Afficher les onglets dans un panneau vertical" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Liste de l'historique des onglets" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"Permettre de changer d'onglet en choisissant dans une liste triée par " -"dernière utilisation" +msgstr "Permettre de changer d'onglet en choisissant dans une liste triée par dernière utilisation" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" "Sélectionnez les éléments à afficher sur la barre d'outils.\n" "Ils peuvent être réorganisés par glisser-déposer." @@ -2689,11 +2710,8 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Ouvrir l'image dans une nouvelle fe_nêtre" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "Copier le scripts utilisateur dans le dossier %s et les styles " -#~ "utilisateurs dans le dossier %s." +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Copier le scripts utilisateur dans le dossier %s et les styles utilisateurs dans le dossier %s." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Impossible d'obtenir l'heure actuelle : %s\n" @@ -2720,8 +2738,7 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgstr "Réduire la taille des images" #~ msgid "Automatically shrink standalone images to fit" -#~ msgstr "" -#~ "Réduire automatiquement la taille des images pour les adapter à la fenêtre" +#~ msgstr "Réduire automatiquement la taille des images pour les adapter à la fenêtre" #~ msgid "Enable developer tools" #~ msgstr "Activer les outils de développement" @@ -2757,8 +2774,7 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgstr "Se souvenir du contenu des derniers formulaires remplis" #~ msgid "Whether the last form inputs are saved" -#~ msgstr "" -#~ "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" +#~ msgstr "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" #~ msgid "Cache size" #~ msgstr "Taille du cache" From 5f790a7217210ceacc78a86256b170ae87f6fc36 Mon Sep 17 00:00:00 2001 From: douart patrick Date: Sun, 6 Jun 2010 21:02:15 +0200 Subject: [PATCH 2678/2970] l10n: Updated French (fr) translation to 97% New status: 611 messages complete with 18 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index e13847f1..5b0373b3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -381,10 +381,11 @@ msgid "Open file" msgstr "Ouvrir le fichier" #: ../midori/midori-browser.c:2462 +#, fuzzy msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." -msgstr "" +msgstr "Pour utiliser l'URI ci-dessus ouvrez un nouvel agrégateur. Il ya habituellement un menu ou un bouton \" nouvel abonnement\", \"Nouvelles RSS \" ou similaires. \\ nAlternativement aller dans Préférences, Applications de Midori, et sélectionnez un nouvel agrégateur. La prochaine fois que vous cliquez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." #: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" From 31885fe2be99fbe7acd78f658e01db8d98b17b16 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jun 2010 23:29:08 +0200 Subject: [PATCH 2679/2970] Assume 'http://' if adding address without scheme to speed dial --- data/speeddial-head.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 0f5b51c5..edf89118 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -210,6 +210,8 @@ var url = prompt ("{enter_shortcut_address}", "http://"); if (!url) return false; + if (url.indexOf ("://") == -1) + url = "http://" + url; var name = prompt ("{enter_shortcut_name}", ""); if (!name) name = ""; From dcf1bb5356d90784ae872ad7b45ca5f622d068d8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jun 2010 23:46:10 +0200 Subject: [PATCH 2680/2970] Always add blank pages without delay --- midori/midori-browser.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6acba91e..a3fe1d90 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -7488,6 +7488,7 @@ gint midori_browser_add_item (MidoriBrowser* browser, KatzeItem* item) { + const gchar* uri; const gchar* title; GtkWidget* view; gint page; @@ -7497,20 +7498,23 @@ midori_browser_add_item (MidoriBrowser* browser, g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (KATZE_IS_ITEM (item), -1); + uri = katze_item_get_uri (item); title = katze_item_get_name (item); view = g_object_new (MIDORI_TYPE_VIEW, "title", title, "settings", browser->settings, NULL); - if (katze_item_get_meta_integer (item, "delay") > 0) + /* Blank pages should not be delayed */ + if (katze_item_get_meta_integer (item, "delay") > 0 + && uri != NULL && strcmp (uri, "about:blank") != 0) { gchar* new_uri; - new_uri = g_strdup_printf ("pause:%s", katze_item_get_uri (item)); + new_uri = g_strdup_printf ("pause:%s", uri); midori_view_set_uri (MIDORI_VIEW (view), new_uri); g_free (new_uri); } else - midori_view_set_uri (MIDORI_VIEW (view), katze_item_get_uri (item)); + midori_view_set_uri (MIDORI_VIEW (view), uri); gtk_widget_show (view); From 52a346c06f6293ba31f3118df12c09d46b10b5ad Mon Sep 17 00:00:00 2001 From: Xu Meihong Date: Mon, 7 Jun 2010 02:40:27 +0200 Subject: [PATCH 2681/2970] l10n: Updated Chinese (China) (zh_CN) translation to 99% New status: 628 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/zh_CN.po | 905 +++++++++++++++++++++++++++------------------------- 1 file changed, 474 insertions(+), 431 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 4124c418..71e48c8f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:07+0000\n" -"PO-Revision-Date: 2010-05-24 14:48+0800\n" +"POT-Creation-Date: 2010-06-06 22:08+0000\n" +"PO-Revision-Date: 2010-06-07 08:46+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "轻量的网页浏览器" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 +#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -56,38 +56,38 @@ msgstr "打开数据库失败: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "删除旧的历史项目失败: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "配置无法保存。%s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "搜索引擎无法保存。%s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "书签无法保存。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "回收站无法保存。%s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "会话无法保存。%s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "无可用的根证书文件。SSL 证书无法认证。" -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -95,138 +95,138 @@ msgstr "" "Midori 好像在上次运行时崩溃了。如果这种情况反复出现，请尝试下面的选项来解决此" "问题。" -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "修改首选项(_P)" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "重置最后的会话(_S)" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "禁用所有扩展(_E)" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1229 ../midori/main.c:1956 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1353 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1355 +#: ../midori/main.c:1372 msgid "An unknown error occured." msgstr "发生了一个未知的错误。" -#: ../midori/main.c:1386 +#: ../midori/main.c:1403 #, c-format msgid "Snapshot saved to: %s\n" msgstr "截图保存到: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "Run ADDRESS as a web application" msgstr "将 ADDRESS 作为 web 应用程序运行" -#: ../midori/main.c:1557 +#: ../midori/main.c:1575 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "Use FOLDER as configuration folder" msgstr "使用 FOLDER 作为设置目录" -#: ../midori/main.c:1560 +#: ../midori/main.c:1578 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1563 +#: ../midori/main.c:1581 msgid "Show a diagnostic dialog" msgstr "显示诊断对话框" -#: ../midori/main.c:1565 +#: ../midori/main.c:1583 msgid "Run the specified filename as javascript" msgstr "将指定的文件当作 javascript 执行" -#: ../midori/main.c:1568 +#: ../midori/main.c:1586 msgid "Take a snapshot of the specified URI" msgstr "对指定 URI 截图" -#: ../midori/main.c:1571 +#: ../midori/main.c:1589 msgid "Execute the specified command" msgstr "执行特定命令" -#: ../midori/main.c:1573 +#: ../midori/main.c:1591 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1575 +#: ../midori/main.c:1593 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "Block URIs according to regular expression PATTERN" msgstr "根据正则表达式 PATTERN 屏蔽 URI" -#: ../midori/main.c:1577 +#: ../midori/main.c:1595 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "在不活动 SECONDS 秒之后重置 Midori" -#: ../midori/main.c:1581 +#: ../midori/main.c:1599 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1661 +#: ../midori/main.c:1680 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1708 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1710 msgid "Check for new versions at:" msgstr "在此检查新的版本:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1807 msgid "The specified configuration folder is invalid." msgstr "无效的配置文件目录。" -#: ../midori/main.c:1836 +#: ../midori/main.c:1855 msgid "An instance of Midori is already running but not responding.\n" msgstr "已经有一个 Midori 在运行，但是无法响应。\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1910 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "搜索引擎无法加载。%s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1939 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1971 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "回收站无法加载: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1985 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1999 msgid "The following errors occured:" msgstr "发生了以下错误:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2015 msgid "_Ignore" msgstr "忽略(_I)" @@ -248,273 +248,282 @@ msgstr "不能识别的书签格式。" msgid "Writing failed." msgstr "写入失败。" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5589 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:458 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:496 #, c-format msgid "Failed to update title: %s\n" msgstr "更新标题失败: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:510 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'。" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:726 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:759 msgid "_Title:" msgstr "标题(_T):" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 +#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:862 msgid "Add to _Speed Dial" msgstr "添加到快速拨号(_S)" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:875 msgid "Show in the tool_bar" msgstr "在工具栏中显示(_B)" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:890 msgid "Run as _web application" msgstr "作为 web 应用程序运行(_W)" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "可用空间不足以下载 \"%s\"。" -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "该文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4826 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "已下载 %s，共 %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1454 #, c-format msgid "The file '%s' has been downloaded." msgstr "文件 '%s' 已下载。" -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1458 msgid "Transfer completed" msgstr "下载完成" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1598 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 msgid "Some files are being downloaded" msgstr "有文件下载正在进行中" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1921 msgid "_Quit Midori" msgstr "退出 Midori(_Q)" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1923 msgid "The transfers will be cancelled if Midori quits." msgstr "如果退出 Midori，正在执行的下载将会被取消。" -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2384 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2462 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" + +#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新建订阅" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "无法运行外部程序。" -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "添加新历史项目失败: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4665 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4666 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4667 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4668 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4669 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4690 msgid "Import bookmarks..." msgstr "导入书签..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4704 msgid "_Application:" msgstr "应用程序(_A):" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "定制..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4805 msgid "Failed to import bookmarks" msgstr "导入书签失败" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4841 msgid "Failed to export bookmarks" msgstr "导出书签失败" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5002 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5006 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5020 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5037 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5042 msgid "'Flash' Cookies" msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5047 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "关闭的标签页(_C)" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "网页缓存" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5065 msgid "Clear private data when _quitting Midori" msgstr "退出 Midori 前清除隐私数据(_Q)" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5166 msgid "A lightweight web browser." msgstr "轻量级的网页浏览器." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5168 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -525,525 +534,525 @@ msgstr "" "条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选" "择）更新的版本。" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5187 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" "Hunt Xu , 2009, 2010." -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5496 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5499 msgid "Open a new window" msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5502 msgid "Open a new tab" msgstr "打开一个新标签" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5504 msgid "P_rivate Browsing" msgstr "隐私浏览(_R)" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5505 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5509 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5512 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5514 msgid "Add to Speed _dial" msgstr "添加到快速拨号(_D)" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5515 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5517 msgid "Add Shortcut to the _desktop" msgstr "添加快捷方式到桌面(_D)" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5518 msgid "Add shortcut to the desktop" msgstr "添加快捷方式到桌面" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5520 msgid "Subscribe to News _feed" msgstr "添加到新闻订阅(_F)" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5521 msgid "Subscribe to this news feed" msgstr "添加到此新闻订阅" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5526 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5527 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5529 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5530 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5533 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5536 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5538 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5542 msgid "Undo the last modification" msgstr "撤销上个改动" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5545 msgid "Redo the last modification" msgstr "重复上个修改" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5549 msgid "Cut the selected text" msgstr "剪切" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 msgid "Copy the selected text" msgstr "复制" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5558 msgid "Paste text from the clipboard" msgstr "从剪贴板粘贴" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5561 msgid "Delete the selected text" msgstr "删除" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5564 msgid "Select all text" msgstr "全选" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5567 msgid "Find a word or phrase in the page" msgstr "在页面中查找" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5569 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5570 msgid "Find the next occurrence of a word or phrase" msgstr "查找该词或短语出现的下一处地方" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5572 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5573 msgid "Find the previous occurrence of a word or phrase" msgstr "查找该词或短语出现的上一处地方" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5577 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5579 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5580 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5592 msgid "Increase the zoom level" msgstr "放大" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5595 msgid "Decrease the zoom level" msgstr "缩小" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5598 msgid "Reset the zoom level" msgstr "恢复默认大小" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5599 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5601 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5602 msgid "View the source code of the page" msgstr "查看页面的源代码" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5605 msgid "Toggle fullscreen view" msgstr "切换全屏" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5608 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5609 msgid "Scroll to the left" msgstr "向左滚动" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5611 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5612 msgid "Scroll down" msgstr "向下滚动" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5614 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5615 msgid "Scroll up" msgstr "向上滚动" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5617 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5618 msgid "Scroll to the right" msgstr "向右滚动" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5621 msgid "_Go" msgstr "前进(_G)" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5624 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5627 msgid "Go forward to the next page" msgstr "转到下一页" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5631 msgid "Go to the previous sub-page" msgstr "返回上个子页" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5635 msgid "Go to the next sub-page" msgstr "转到下个子页" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5638 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5640 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5641 msgid "Delete the contents of the trash" msgstr "删除回收站中的内容" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5643 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5644 msgid "Open the last closed tab" msgstr "打开最后关闭的标签" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5650 msgid "Add a new _folder" msgstr "添加新目录(_F)" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5651 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5656 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5660 msgid "Add, edit and remove search engines..." msgstr "添加、编辑和移除搜索引擎..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5663 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5664 msgid "Clear private data..." msgstr "清除隐私数据..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5668 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5669 msgid "Inspect page details and access developer tools..." msgstr "检查页面详细信息并使用开发者工具..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5674 msgid "_Previous Tab" msgstr "上一个标签(_P)" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5675 msgid "Switch to the previous tab" msgstr "转到上一个标签" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5677 msgid "_Next Tab" msgstr "下一个标签(_N)" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5678 msgid "Switch to the next tab" msgstr "转到下一个标签" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5680 msgid "Focus _Current Tab" msgstr "聚焦到当前标签页(_C)" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5681 msgid "Focus the current tab" msgstr "聚焦到当前标签页" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5683 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5684 msgid "Open the tabs saved in the last session" msgstr "打开上次运行时的标签页" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5686 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5688 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5689 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5691 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5692 msgid "Show the Frequently Asked Questions" msgstr "显示 FAQ" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5694 msgid "_Report a Bug" msgstr "报告 Bug(_R)" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5695 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5698 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5706 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5707 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5710 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5711 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5714 msgid "Side_panel" msgstr "侧栏(_P)" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5715 msgid "Show sidepanel" msgstr "显示侧栏" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5718 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5719 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5722 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5723 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5726 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5727 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5735 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5742 msgid "Japanese (SHIFT__JIS)" msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "朝鲜语 (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6300 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6307 msgid "_Location..." msgstr "位置(_L)..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6309 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6333 msgid "_Web Search..." msgstr "搜索网页(_W)..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6335 msgid "Run a web search" msgstr "运行网页搜索" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6356 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签或窗口" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6371 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6373 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6390 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6405 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6418 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6420 msgid "Show a list of all open tabs" msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6434 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6436 msgid "Menu" msgstr "菜单" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6640 msgid "_Inline Find:" msgstr "在文中查找(_I):" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6671 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6676 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6681 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6690 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6702 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "清除所有项目" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7104 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" @@ -1106,574 +1115,578 @@ msgstr "显示主页" msgid "Show last open tabs" msgstr "显示最后打开的标签" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "显示最后打开的标签但不载入" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "日语 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "新建标签" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "当前标签" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "默认" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "小图标" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "图标和文字" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "文字在图标旁" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "自动 (GNOME 或其他桌面环境)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "不使用代理服务器" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "所有 Cookies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "无" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "记住上次窗口的大小" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "上次窗口的宽度" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "上次窗口的高度" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "上次的侧栏位置" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "上次保存的侧栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "上次的侧栏页" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "上次保存的侧栏页" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "上次使用的 Web 搜索" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "上次保存的 Web 搜索" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "显示侧栏" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "是否显示侧栏" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "显示传输栏" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "是否显示传输栏" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "工具栏样式:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "在地址栏中显示进度" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "是否在地址栏中显示加载进度" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "是否在地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "工具栏中的项目" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "在工具栏中显示的项目" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "紧凑侧栏" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "是否让侧栏紧凑显示" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "显示面板的操作控件" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "是否显示面板的操作控件" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "侧栏在右" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "是否让侧栏摆放到右侧" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "在单独窗口中打开面板" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "是否总是在单独窗口中打开面板" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "当 Midori 启动时:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Midori 启动时做什么" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "主页:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "显示崩溃提示对话框" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "当 Midori 崩溃后显示提示对话框" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "在新标签中显示快速拨号" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "在新标签中显示快速拨号" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "保存下载的文件到:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "下载的文件将保存到此目录" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "询问保存目录" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "是否在下载文件时询问保存目录" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "下载完成后显示提示" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "是否在下载完成时显示提示信息" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "下载管理器" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "外部的下载管理器" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "外部的文本编辑器" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "新闻聚合器" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "外部的新闻聚合查看器" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "地址栏查找" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "在地址栏中执行的查找" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "首选的编码" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "首选的字符编码集" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "在标签上显示关闭按钮" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "是否在标签上显示关闭按钮" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "在...打开新的页面:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "在哪里打开新的页面" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "在...打开外部页面:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "在哪里打开外部页面" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "鼠标中键打开所选地址" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "用鼠标中键单击打开选中地址" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "在后台打开新标签" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开新标签" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "在当前标签后打开新标签" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "选择在当前标签后或者在最后的标签后打开新标签" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "弹出窗口在新标签中打开" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "弹出窗口是否在新标签中打开" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "自动加载图像" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "启用网页中的脚本" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "启用 Netscape 插件" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "启用嵌入的 Netscape 插件对象" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "是否启用 HTML5 数据库支持" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "是否启用 HTML5 本地存储支持" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "启用离线 web 应用程序缓存" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "是否启用离线 web 应用程序缓存" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "缩放文字和图像" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "是否缩放文字和图像" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "输入时回忆" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "是否输入时自动查找" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "惯性滚动" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "是否根据拖拽速度惯性滚动页面" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "接收 Cookies" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "接收什么类型的 Cookies" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "只接收原始 Cookies" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "只接收原始网站的 Cookies" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "最长 Cookie 有效期" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "最长 Cookie 保存天数" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "记录上次访问的页面" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "是否记录上次访问的页面" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "最长历史有效期" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "最长历史保存天数" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "记录上次下载的文件" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "是否保存上次下载的文件" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "使用的代理服务器类型" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP 代理服务器" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "自动检测代理服务器" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "是否自动检测系统环境中的代理服务器设置" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "让页面识别为什么" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "首选语言" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1681,11 +1694,11 @@ msgstr "" "一个由逗号分隔的语言列表，以选择显示多语言网页时的首选语言，例如 \"de\"，" "\"ru,nl\" 或者 \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "清除隐私数据" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "选中要删除的隐私数据" @@ -1693,8 +1706,8 @@ msgstr "选中要删除的隐私数据" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "错误 - %s" @@ -1800,106 +1813,130 @@ msgstr "搜索网页(_S)" msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "确认删除此快捷方式？" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "设置列数" +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "设置列数和行数" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "输入列数:" +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "输入列数和行数:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "设置快捷方式数目" +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "快速拨号数量输入无效" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "输入快捷方式数:" +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "缩略图大小:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "小" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "中" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "大" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "页面载入发生延迟" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "页面载入由于程序之前的崩溃或者首选项设定而发生延迟" + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "载入页面" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "空白页" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "恢复标签(_R)" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "最小化标签(_M)" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "关闭其他标签(_H)" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4783 msgid "Print background images" msgstr "打印背景图片" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4784 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图片" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 msgid "Features" msgstr "特性" @@ -2458,25 +2495,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "查找必需的 XML 数据中的 Atom \"feed\" 元素失败。" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "最后更新: %s。" -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "订阅" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "添加新订阅" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "删除所有订阅" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "订阅(_F)" @@ -2511,25 +2548,25 @@ msgstr "查找必需的 XML 数据中的 RSS \"item\" 元素失败。" msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "查找必需的 XML 数据中的 RSS \"channel\" 元素失败。" -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "错误" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "订阅 '%s' 已经存在" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "加载订阅 '%s' 出错" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "订阅面板" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "阅读 Atom 及 RSS 订阅" @@ -2624,11 +2661,11 @@ msgstr "标签面板(_A)" msgid "Show tabs in a vertical panel" msgstr "在垂直面板里显示标签" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "标签页历史列表" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "允许从上次打开顺序排序的列表中切换标签页" @@ -2666,6 +2703,12 @@ msgstr "轻松编辑工具栏布局" msgid "Cache HTTP communication on disk" msgstr "在磁盘上缓存 HTTP 通讯" +#~ msgid "Set number of shortcuts" +#~ msgstr "设置快捷方式数目" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "输入快捷方式数:" + #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "复制用户脚本到 %s 目录，用户样式到 %s 目录。" From 4aebdad6716524481027c679c26e5e9ff09d3c9e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 7 Jun 2010 21:27:03 +0200 Subject: [PATCH 2682/2970] Enable encoding action at compilation time --- midori/midori-browser.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a3fe1d90..920a7b84 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -269,17 +269,6 @@ _midori_browser_update_actions (MidoriBrowser* browser) } } -static gboolean -midori_browser_view_can_set_encoding (MidoriView* view) -{ - static GParamSpec* pspec = NULL; - if (G_UNLIKELY (!pspec)) - pspec = g_object_class_find_property ( - g_type_class_peek (WEBKIT_TYPE_WEB_VIEW), "custom-encoding"); - /* Web views and zoom, source views can't, so zoom means encoding */ - return pspec && midori_view_can_zoom_in (view); -} - static void _midori_browser_update_interface (MidoriBrowser* browser) { @@ -313,8 +302,10 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (view)); _action_set_sensitive (browser, "ZoomNormal", midori_view_get_zoom_level (view) != 1.0f); + #if WEBKIT_CHECK_VERSION (1, 1, 2) _action_set_sensitive (browser, "Encoding", - midori_browser_view_can_set_encoding (view)); + midori_view_can_view_source (view)); + #endif _action_set_sensitive (browser, "SourceView", midori_view_can_view_source (view)); _action_set_sensitive (browser, "Find", @@ -3625,8 +3616,9 @@ _action_view_encoding_activate (GtkAction* action, GtkAction* current, MidoriBrowser* browser) { + #if WEBKIT_CHECK_VERSION (1, 1, 2) GtkWidget* view = midori_browser_get_current_tab (browser); - if (view && midori_browser_view_can_set_encoding (MIDORI_VIEW (view))) + if (view) { const gchar* name; GtkWidget* web_view; @@ -3655,6 +3647,7 @@ _action_view_encoding_activate (GtkAction* action, g_object_set (web_view, "custom-encoding", encoding, NULL); } } + #endif } static gchar* @@ -6501,6 +6494,9 @@ midori_browser_init (MidoriBrowser* browser) #if !WEBKIT_CHECK_VERSION (1, 1, 3) _action_set_visible (browser, "Transferbar", FALSE); #endif + #if !WEBKIT_CHECK_VERSION (1, 1, 2) + _action_set_sensitive (browser, "Encoding", FALSE); + #endif _action_set_sensitive (browser, "EncodingCustom", FALSE); _action_set_visible (browser, "LastSession", FALSE); /* FIXME: Show once implemented */ From fd2e0b7aedf8d5e0c8ae8db7e9b3bf01d7b875bb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 7 Jun 2010 21:48:23 +0200 Subject: [PATCH 2683/2970] Implement MIDORI_UNARMED variable for 'dry run' --- INSTALL | 4 ++++ midori/main.c | 3 ++- midori/midori-view.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 5df8a1a4..af519fb0 100644 --- a/INSTALL +++ b/INSTALL @@ -61,6 +61,10 @@ If you are interested in (non-) touchscreen behaviour, try this: 'MIDORI_TOUCHSCREEN=0 _build_/default/midori/midori' +If you want to "dry run" without WebKitGTK+ rendering, try this: + +'MIDORI_UNARMED=1 _build_/default/midori/midori' + For further information a tutorial for gdb and reading up on how you can install debugging symbols for libraries used by Midori are recommended. diff --git a/midori/main.c b/midori/main.c index 759dc81f..91e5c5be 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1200,7 +1200,8 @@ midori_load_extensions (gpointer data) } g_strfreev (active_extensions); - g_idle_add (midori_load_netscape_plugins, app); + if (g_getenv ("MIDORI_UNARMED") == NULL) + g_idle_add (midori_load_netscape_plugins, app); #ifdef G_ENABLE_DEBUG if (startup_timer) diff --git a/midori/midori-view.c b/midori/midori-view.c index 684b3bc4..20d1ad68 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3455,7 +3455,7 @@ midori_view_set_uri (MidoriView* view, /* Treat "about:blank" and "" equally, see midori_view_is_blank(). */ if (!uri || !strcmp (uri, "about:blank")) uri = ""; - if (1) + if (g_getenv ("MIDORI_UNARMED") == NULL) { if (!view->web_view) midori_view_construct_web_view (view); @@ -4674,6 +4674,9 @@ midori_view_get_previous_page (MidoriView* view) g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + if (!view->web_view) + return NULL; + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); katze_assign (uri, sokoke_js_script_eval (js_context, @@ -4731,6 +4734,9 @@ midori_view_get_next_page (MidoriView* view) g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); + if (!view->web_view) + return NULL; + web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); katze_assign (uri, sokoke_js_script_eval (js_context, From bce8268b2749b5417a1ee19c8f9c08917658dd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Wed, 9 Jun 2010 01:29:45 +0200 Subject: [PATCH 2684/2970] l10n: Updates to Croatian (hr) translation New status: 496 messages complete with 0 fuzzies and 133 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 528 +++++++++++++++++++++++++++---------------------------- 1 file changed, 264 insertions(+), 264 deletions(-) diff --git a/po/hr.po b/po/hr.po index be7e9d33..8baebaf2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-03 16:08+0000\n" -"PO-Revision-Date: 2010-06-04 00:23+0200\n" +"POT-Creation-Date: 2010-06-08 22:08+0000\n" +"PO-Revision-Date: 2010-06-09 01:27+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lagani web preglednik" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 +#: ../midori/main.c:1692 ../midori/main.c:1708 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -106,126 +106,126 @@ msgstr "Obnovi posljednju _sesiju" msgid "Disable all _extensions" msgstr "Onemogući sva _proširenja" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1230 ../midori/main.c:1957 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesija ne može biti učitana: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1354 msgid "No filename specified" msgstr "Nije navedeno ime datoteke" -#: ../midori/main.c:1372 +#: ../midori/main.c:1373 msgid "An unknown error occured." msgstr "Nepoznata greška." -#: ../midori/main.c:1403 +#: ../midori/main.c:1404 #, c-format msgid "Snapshot saved to: %s\n" msgstr "" -#: ../midori/main.c:1575 +#: ../midori/main.c:1576 msgid "Run ADDRESS as a web application" msgstr "Pokreni Adresu kao web aplikaciju" -#: ../midori/main.c:1575 +#: ../midori/main.c:1576 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1578 +#: ../midori/main.c:1579 msgid "Use FOLDER as configuration folder" msgstr "Koristi MAPU kao konfiguracijsku mapu" -#: ../midori/main.c:1578 +#: ../midori/main.c:1579 msgid "FOLDER" msgstr "MAPA" -#: ../midori/main.c:1581 +#: ../midori/main.c:1582 msgid "Show a diagnostic dialog" msgstr "Pokaži dijagnostički dijalog" -#: ../midori/main.c:1583 +#: ../midori/main.c:1584 msgid "Run the specified filename as javascript" msgstr "Pokreni naznačeno ime datoteke kao javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1587 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1589 +#: ../midori/main.c:1590 msgid "Execute the specified command" msgstr "Izvrši naznačenu naredbu" -#: ../midori/main.c:1591 +#: ../midori/main.c:1592 msgid "Display program version" msgstr "Prikaži verziju programa" -#: ../midori/main.c:1593 +#: ../midori/main.c:1594 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1595 +#: ../midori/main.c:1596 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1595 +#: ../midori/main.c:1596 msgid "PATTERN" msgstr "UZORAK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1600 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1599 +#: ../midori/main.c:1600 msgid "SECONDS" msgstr "SEKUNDE" -#: ../midori/main.c:1680 +#: ../midori/main.c:1681 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1709 msgid "Please report comments, suggestions and bugs to:" msgstr "Prijavite komentare,sugestije i probleme u:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1711 msgid "Check for new versions at:" msgstr "Provjeri za nove verzije na:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1808 msgid "The specified configuration folder is invalid." -msgstr "" +msgstr "Određena konfiguracijaka mapa nije valjana" -#: ../midori/main.c:1855 +#: ../midori/main.c:1856 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1911 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Tražilice ne nogu biti učitane: %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1940 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Zabilješke ne mogu biti učitane: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1972 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Smeće ne može biti učitano: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1986 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Povijest ne može biti učitana: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:2000 msgid "The following errors occured:" msgstr "Došlo je do slijedeće greške:" -#: ../midori/main.c:2015 +#: ../midori/main.c:2016 msgid "_Ignore" msgstr "_Ignoriraj" @@ -247,130 +247,130 @@ msgstr "Neprepoznati format zabilješke." msgid "Writing failed." msgstr "Neuspjelo pisanje." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5582 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5579 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:449 #, c-format msgid "%d%% loaded" msgstr "%d%% učitano" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:487 #, c-format msgid "Failed to update title: %s\n" msgstr "Neuspjeh u ažuriranju naslova: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:501 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekivana radnja '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:717 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:717 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:719 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:719 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:750 msgid "_Title:" msgstr "_Naslov:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4732 msgid "_Folder:" msgstr "_Mapa:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 +#: ../midori/midori-browser.c:4737 ../midori/midori-browser.c:4769 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:853 msgid "Add to _Speed Dial" msgstr "Dodaj u _brzo biranje" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:866 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:881 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:975 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:979 #, c-format msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4787 +#: ../midori/midori-browser.c:4819 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1409 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" -msgstr "" +msgstr "%s od %s" -#: ../midori/midori-browser.c:1454 +#: ../midori/midori-browser.c:1445 #, c-format msgid "The file '%s' has been downloaded." msgstr "Datoteka '%s' je preuzeta." -#: ../midori/midori-browser.c:1458 +#: ../midori/midori-browser.c:1449 msgid "Transfer completed" msgstr "Prijenos završen" -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1589 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#: ../midori/midori-browser.c:1906 ../midori/midori-browser.c:1908 msgid "Some files are being downloaded" msgstr "Neke datoteke su preuzete" -#: ../midori/midori-browser.c:1921 +#: ../midori/midori-browser.c:1912 msgid "_Quit Midori" msgstr "_Isključi Midori" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1914 msgid "The transfers will be cancelled if Midori quits." msgstr "Prijenosi će biti odgođeni ako se Midori isključi" -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2375 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2453 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -379,150 +379,150 @@ msgid "" "automatically." msgstr "" -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2459 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5641 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3075 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3155 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prazno" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3778 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:4092 ../midori/midori-browser.c:6035 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4425 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4658 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4659 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4660 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4661 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4662 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4683 msgid "Import bookmarks..." msgstr "Uvezi zabilješke..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5646 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4697 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4724 ../midori/midori-browser.c:5750 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Prilagođeno..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4798 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4834 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4888 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4995 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4999 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5013 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5024 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5030 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5035 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:5040 msgid "Website icons" msgstr "Website ikone" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5045 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5050 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5058 msgid "Clear private data when _quitting Midori" msgstr "Očisti privatne podatke kad _isključuješ Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5159 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5161 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -530,523 +530,523 @@ msgid "" "option) any later version." msgstr "" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:5180 msgid "translator-credits" -msgstr "Ivica Kolić " +msgstr "zvacet " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5489 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5491 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Novi _prozor" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5492 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5495 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5497 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5498 msgid "Don't save any private data while browsing" msgstr "Ne spremaj privatne podatke dok pregledavaš" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5502 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5505 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5507 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo _biranje" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5508 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5510 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5511 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5514 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5519 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5520 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5522 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5523 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5526 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5529 msgid "Quit the application" msgstr "Isključi program" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5531 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5535 msgid "Undo the last modification" -msgstr "" +msgstr "Poništi zadnju izmjenu" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5538 msgid "Redo the last modification" -msgstr "" +msgstr "Vrati zadnju izmjenu" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5542 msgid "Cut the selected text" msgstr "Izreži označeni tekst" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5545 ../midori/midori-browser.c:5548 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5551 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5554 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5557 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5560 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5562 msgid "Find _Next" msgstr "Nađi _Slijedeće" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5563 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "Nađi slijedeće pojavljivanje riječi ili fraze" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5565 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5566 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Nađi prethodno pojavljivanje riječi ili fraze" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5570 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5572 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5573 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5585 msgid "Increase the zoom level" msgstr "Povećaj zoom razinu" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5588 msgid "Decrease the zoom level" msgstr "Smanji zoom razinu" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5591 msgid "Reset the zoom level" -msgstr "" +msgstr "Vrati zoom razinu" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5592 msgid "_Encoding" msgstr "_Kodiranje" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5594 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5595 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5598 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5601 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5602 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5604 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5605 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5607 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5608 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5610 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5611 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5614 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5617 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5620 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5624 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5628 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5631 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5633 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5634 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5636 msgid "Undo _Close Tab" -msgstr "" +msgstr "Poništi _zatvori karticu" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5637 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5643 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5644 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5649 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5652 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Upravljaj tražilicama" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5653 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5656 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5657 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5661 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5662 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5667 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5668 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5670 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5671 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5673 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5674 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5676 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5677 msgid "Open the tabs saved in the last session" msgstr "Otvori kartice spremljene u posljednjoj sesiji" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5679 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5681 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5682 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5684 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5685 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5687 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5688 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5691 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5699 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5700 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5703 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5704 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5707 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5708 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5711 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5712 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5715 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5716 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5719 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5720 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5728 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5731 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5735 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5741 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5744 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5747 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6293 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6300 msgid "_Location..." msgstr "_Lokacija..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6302 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6326 msgid "_Web Search..." msgstr "_Web pretraživanje..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6328 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6349 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6364 msgid "_Recently visited pages" msgstr "_Nedavno posjećene stranice" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6366 msgid "Reopen pages that you visited earlier" msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6381 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6383 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6398 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6411 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6413 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6427 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6429 msgid "Menu" msgstr "Izbornik" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 +#: ../midori/midori-browser.c:6636 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:6671 +#: ../midori/midori-browser.c:6667 msgid "Previous" msgstr "Prethodno" -#: ../midori/midori-browser.c:6676 +#: ../midori/midori-browser.c:6672 msgid "Next" msgstr "Slijedeće" -#: ../midori/midori-browser.c:6681 +#: ../midori/midori-browser.c:6677 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:6690 +#: ../midori/midori-browser.c:6686 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:6702 +#: ../midori/midori-browser.c:6698 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6744 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekivana postavka '%s'" @@ -1199,7 +1199,7 @@ msgstr "Zapamti zadnu veličinu prozora" #: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" -msgstr "" +msgstr "Da li spremiti zadnju veličinu prozora" #: ../midori/midori-websettings.c:380 msgid "Last window width" @@ -1248,7 +1248,7 @@ msgstr "Pokaži traku izbornika" #: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" -msgstr "" +msgstr "Da li pokazati izbornik" #: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" @@ -1256,7 +1256,7 @@ msgstr "Pokaži navigacijsku traku" #: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "Da li pokazati navigacijsku traku" #: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" @@ -1264,7 +1264,7 @@ msgstr "Pokaži traku zabilješki" #: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "Da li pokazati traku zabilješki" #: ../midori/midori-websettings.c:471 msgid "Show Panel" @@ -1272,7 +1272,7 @@ msgstr "Pokaži ploču" #: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" -msgstr "" +msgstr "Da li pokazati ploču" #: ../midori/midori-websettings.c:487 msgid "Show Transferbar" @@ -1280,7 +1280,7 @@ msgstr "Pokaži traku prijenosa" #: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" -msgstr "" +msgstr "Da li pokazati traku prijenosa" #: ../midori/midori-websettings.c:496 msgid "Show Statusbar" @@ -1288,7 +1288,7 @@ msgstr "Pokaži statusnu traku" #: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" -msgstr "" +msgstr "Da li pokazati statusnu traku" #: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" @@ -1328,7 +1328,7 @@ msgstr "Zbijeni bočni stupac" #: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" -msgstr "" +msgstr "Da li bočni stupac učiniti zbijenim" #: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" @@ -1344,7 +1344,7 @@ msgstr "Poravnaj bočni stupac desno" #: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" -msgstr "" +msgstr "Da li poravnati bočni stupac lijevo" #: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" @@ -1352,11 +1352,11 @@ msgstr "Otvori ploče u zasebnim prozorima" #: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" -msgstr "" +msgstr "Da li uvijek otvarati ploče u odvojenim prozorima" #: ../midori/midori-websettings.c:615 msgid "When Midori starts:" -msgstr "Kad se Midori pokrene" +msgstr "Kad se Midori pokrene:" #: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" @@ -1364,7 +1364,7 @@ msgstr "Što učiniti kad se Midori pokrene" #: ../midori/midori-websettings.c:625 msgid "Homepage:" -msgstr "Početna stranica" +msgstr "Početna stranica:" #: ../midori/midori-websettings.c:626 msgid "The homepage" @@ -1372,11 +1372,11 @@ msgstr "početna stranica" #: ../midori/midori-websettings.c:641 msgid "Show crash dialog" -msgstr "" +msgstr "Pokaži dijalog rušenja" #: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" -msgstr "" +msgstr "Pokaži dijalog nakon što se Midori sruši" #. i18n: Speed dial, webpage shortcuts, named for the phone function #: ../midori/midori-websettings.c:658 @@ -1401,7 +1401,7 @@ msgstr "Pitaj za odredišni direktorij" #: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" +msgstr "Da li pitati za odredišni direktorij kada preuzimam datoteku" #: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" @@ -1409,15 +1409,15 @@ msgstr "Obavijesti kad je prijenos kompletiran" #: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" +msgstr "Da li pokazati obavijest kada je prijenos dovršen" #: ../midori/midori-websettings.c:722 msgid "Download Manager" -msgstr "" +msgstr "Upravitelj preuzimanja" #: ../midori/midori-websettings.c:723 msgid "An external download manager" -msgstr "" +msgstr "Vanjski upravitelj preuzimanja" #: ../midori/midori-websettings.c:731 msgid "Text Editor" @@ -1445,11 +1445,11 @@ msgstr "" #: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" -msgstr "" +msgstr "Željeno kodiranje" #: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" -msgstr "" +msgstr "Željeno kodiranje znakova" #: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" @@ -1481,7 +1481,7 @@ msgstr "Otvori vanjske stranice u:" #: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" -msgstr "" +msgstr "Gdje otvoriti izvanjski otvorene stranice" #: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" @@ -1497,7 +1497,7 @@ msgstr "Otvori kartice u pozadini" #: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" -msgstr "" +msgstr "Da li otvoriti nove kartice u pozadini" #: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" @@ -1545,7 +1545,7 @@ msgstr "Omogući podršku za HTML5 bazu podataka" #: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "Da li omogućiti podršku za HTML bazu podataka" #: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" @@ -1553,7 +1553,7 @@ msgstr "Omogući podršku za HTML5 lokalnu pohranu" #: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" -msgstr "" +msgstr "Da li omogućiti podršku za HTML5 lokalnu pohranu" #: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" @@ -1569,7 +1569,7 @@ msgstr "Zumiraj tekst i slike" #: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" -msgstr "" +msgstr "Da li zumirati tekst i slike" #: ../midori/midori-websettings.c:943 msgid "Find inline while typing" @@ -1920,15 +1920,15 @@ msgstr "_Minimiziraj karticu" msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4789 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4790 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4842 ../midori/midori-preferences.c:381 msgid "Features" msgstr "" From e327b6fa8f8ca08a90b38677ff6b12a9a0d279e9 Mon Sep 17 00:00:00 2001 From: Harald Servat Date: Wed, 9 Jun 2010 15:42:59 +0200 Subject: [PATCH 2685/2970] l10n: Updated Catalan (Valencian) (ca) translation to 99% New status: 626 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 898 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 469 insertions(+), 429 deletions(-) diff --git a/po/ca.po b/po/ca.po index 6c336c86..2f27474a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 10:08+0000\n" +"POT-Creation-Date: 2010-06-09 10:08+0000\n" "PO-Revision-Date: 2010-05-04 19:53+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -24,9 +24,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lleuger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 +#: ../midori/main.c:1692 ../midori/main.c:1708 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -60,172 +60,172 @@ msgstr "No s'ha pogut obrir la base de dades: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "No s'han pogut eliminar els elements antics de l'historial: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:457 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No s'ha pogut desar la configuració: %s" -#: ../midori/main.c:483 +#: ../midori/main.c:495 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No es pot desar les enginys de cerca. %s" -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No s'han pogut desar les adreces d'interès. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:614 ../midori/main.c:637 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:696 ../midori/main.c:936 #, c-format msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:880 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "No es disposa del certificat arrel. Els certificats SSL no es poden verificar." -#: ../midori/main.c:958 +#: ../midori/main.c:970 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." -#: ../midori/main.c:973 +#: ../midori/main.c:985 msgid "Modify _preferences" msgstr "Modificació de les _preferències" -#: ../midori/main.c:977 +#: ../midori/main.c:989 msgid "Reset the last _session" msgstr "Reiniciar la darrera _sessió" -#: ../midori/main.c:982 +#: ../midori/main.c:994 msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1230 ../midori/main.c:1957 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1354 msgid "No filename specified" msgstr "No s'ha especificat un nom de fitxer" -#: ../midori/main.c:1355 +#: ../midori/main.c:1373 msgid "An unknown error occured." msgstr "Ha ocorregut un error desconegut." -#: ../midori/main.c:1386 +#: ../midori/main.c:1404 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1576 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1557 +#: ../midori/main.c:1576 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1560 +#: ../midori/main.c:1579 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1560 +#: ../midori/main.c:1579 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1563 +#: ../midori/main.c:1582 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1565 +#: ../midori/main.c:1584 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1587 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1571 +#: ../midori/main.c:1590 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1573 +#: ../midori/main.c:1592 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1575 +#: ../midori/main.c:1594 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1577 +#: ../midori/main.c:1596 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1577 +#: ../midori/main.c:1596 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1600 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1581 +#: ../midori/main.c:1600 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1661 +#: ../midori/main.c:1681 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1709 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1711 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1808 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuració especificada és invalida." -#: ../midori/main.c:1836 +#: ../midori/main.c:1856 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1911 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No s'han pogut carregar els motors de cerca. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1940 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1972 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1986 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:2000 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2016 msgid "_Ignore" msgstr "_Ignora" @@ -247,793 +247,799 @@ msgstr "No es reconeix el format de l'adreça d'interès." msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5582 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5579 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:449 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:487 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:501 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:717 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:717 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:719 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:719 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:750 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4732 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 +#: ../midori/midori-browser.c:4737 ../midori/midori-browser.c:4769 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:853 msgid "Add to _Speed Dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:866 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:881 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:975 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:979 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4787 +#: ../midori/midori-browser.c:4819 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1409 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1456 +#: ../midori/midori-browser.c:1445 #, c-format msgid "The file '%s' has been downloaded." msgstr "S'ha descarregat el fitxer «%s»." -#: ../midori/midori-browser.c:1460 +#: ../midori/midori-browser.c:1449 msgid "Transfer completed" msgstr "Transferència finalitzada" -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1589 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +#: ../midori/midori-browser.c:1906 ../midori/midori-browser.c:1908 msgid "Some files are being downloaded" msgstr "S'estan descarregant fitxers" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1912 msgid "_Quit Midori" msgstr "_Sortir de Midori" -#: ../midori/midori-browser.c:1925 +#: ../midori/midori-browser.c:1914 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferències es cancel·laran si se surt de Midori." -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2375 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2453 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2459 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5641 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3075 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3155 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Buit" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3778 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:4092 ../midori/midori-browser.c:6035 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4425 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4658 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4659 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4660 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4661 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4662 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4683 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5646 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4697 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4724 ../midori/midori-browser.c:5750 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4798 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4834 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4888 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4995 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4999 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:5013 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5024 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5030 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5035 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5040 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5045 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5050 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5058 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5159 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5161 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:5180 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5489 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5491 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5492 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5495 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5497 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5498 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5502 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5505 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5507 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5508 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5510 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5511 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5514 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5519 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5520 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5522 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5523 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5526 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5529 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5531 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5535 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5538 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5542 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5545 ../midori/midori-browser.c:5548 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5551 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5554 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5557 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5560 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5562 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5563 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5565 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5566 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5570 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5572 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5573 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5585 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5588 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5591 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5592 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5594 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5595 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5598 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5601 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5602 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5604 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5605 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5607 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5608 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5610 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5611 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5614 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5617 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5620 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5624 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5628 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5631 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5633 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5634 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5636 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5637 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5643 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5644 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5649 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5652 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5653 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5656 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5657 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5661 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5662 msgid "Inspect page details and access developer tools..." msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5667 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5668 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5670 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5671 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5673 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5674 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5676 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5677 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5679 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5681 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5682 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5684 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5685 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5687 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5688 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5691 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5699 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5700 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5703 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5704 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5707 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5708 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5711 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5712 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5715 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5716 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5719 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5720 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5728 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5731 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5735 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5741 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5744 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5747 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6293 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6300 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6302 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6326 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6328 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6349 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6364 msgid "_Recently visited pages" msgstr "Pàgines visitades _recentment" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6366 msgid "Reopen pages that you visited earlier" msgstr "Reobre pàgines que heu visitat anteriorment" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6381 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6383 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6398 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6411 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6413 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6427 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6429 msgid "Menu" msgstr "Menú" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6636 msgid "_Inline Find:" msgstr "Cerca en _línia:" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6667 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6672 msgid "Next" msgstr "Següent" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6677 msgid "Match Case" msgstr "Coincidència de majúscules i minúscules" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6686 msgid "Highlight Matches" msgstr "Ressalta les coincidències" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6698 msgid "Close Findbar" msgstr "Tanca la barra de cerques" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6744 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Netejar-ho tot" @@ -1100,582 +1106,586 @@ msgstr "Mostra la pàgina d'inici" msgid "Show last open tabs" msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Icones petites" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automàtic (GNOME o entorn)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Sense servidor intermediari" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Totes les galetes" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Galetes de sessió" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Cap" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Recorda la mida de la darrera finestra" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "La posició emmagatzemada del darrer panell" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Mostra barra de fransferències" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Si es mostrarà la barra de transferències" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Mostrar el progrés a la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Motors de cerca per a completar la cerca" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Si s'ha de mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Si s'ha d'alinear el panell lateral a la dreta" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Obre els quadres en finestres separades" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Si s'ha d'obrir els quadres en finestres separades" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Mostra un diàleg quan Midori falli" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Mostrar el marcador ràpid a les noves pestanyes" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Demanar per la carpeta destí" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Informa quan una transferència hagi finalitzat" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si es mostra una notificació quan acabi una transferència" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Gestor de descàrregues" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Un gestor de descàrregues extern" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Obre les noves pàgines a:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "On s'han d'obrir les pàgines noves" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Obre pàgines externes a:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "On s'obren de forma externa les pàgines obertes" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Obre pestanyes al fons" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Si s'ha d'obrir pestanyes al fons" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Obre les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Obre els missatges emergents en pestanyes" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carrega les imatges automàticament" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Carrega i mostra les imatges automàticament" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilita els scripts" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Habilita els llenguatges d'script incrustats" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilita els connectors de netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Activar els objectes de connexió integrats de Netscape" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Habilita la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Si s'habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Si es buscarà automàticament a mesura que s'escriu" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Desplaçament cinètic" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Accepta galetes" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Quins tipus de galetes s'accepten" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Només galetes originals" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Accepta només galetes del seu lloc web original" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Edat màxima de la galeta" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "El nombre màxim de dies que es guardaran les galetes" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Recordar les darreres pàgines visitades" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Si les darreres pàgines visitades es desaran" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Edat màxima de l'historial" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Recordar els darrers fitxers descarregats" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Tipus de servidor intermediari a fer servir" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "El servidor proxy usat per a les connexions HTTP" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Detecta automàticament el servidor intermediari" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Identifica'l com a" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Idiomes preferits" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Un llistat separat per comes d'idiomes preferits per mostrar pàgines web multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "La selecció de dades privades per a esborrar" @@ -1683,8 +1693,8 @@ msgstr "La selecció de dades privades per a esborrar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Error - %s" @@ -1790,106 +1800,130 @@ msgstr "_Cerca la Web" msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Estableix el nombre de columnes" +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "Estableix el nombre de columnes i files" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Introduïu el nombre de columnes:" +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "Introduïu el nombre de columnes i files:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Estableix el nombre de dreceres" +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Introduïeu el nombre de dreceres:" +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Tamany de la miniatura:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Petit" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Mitjà" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Gran" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "S'ha retardat la càrrega de la pàgina" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "S'ha retardat la càrrega degut a una fallada recent o a les preferències d'inici." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Carregar pàgina" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "_Restaura la pestanya" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "_Minimitza la pestanya" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4789 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4790 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4842 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Característiques" @@ -2437,25 +2471,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "No s'han pogut trobar elements Atom \"feed\" en les dades XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Darrera actualització: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Canals" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Afegeix un nou canal" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Suprimeix el canal" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Canals" @@ -2490,25 +2524,25 @@ msgstr "No s'ha pogut trobar els elements RSS \"item\" en les dades XML." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "No s'ha pogut trobar els elements RSS \"channel\" en les dades XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Error" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "El canal «%s» ja existeix." -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Error en carregar el canal «%s»" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Quadre de canals" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" @@ -2603,11 +2637,11 @@ msgstr "Quadre de _pestanyes" msgid "Show tabs in a vertical panel" msgstr "Mostra les pestanyes en un quadre vertical" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Pestanya amb la llista de l'historial" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" @@ -2643,6 +2677,12 @@ msgstr "Edita fàcilment la distribució de la barra d'eines" msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" +#~ msgid "Set number of shortcuts" +#~ msgstr "Estableix el nombre de dreceres" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Introduïeu el nombre de dreceres:" + #~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a la carpeta %s." From 5333845ba45e2c709e50418ee28310b9693b648f Mon Sep 17 00:00:00 2001 From: Nuno Miguel Date: Wed, 9 Jun 2010 23:14:39 +0200 Subject: [PATCH 2686/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 466 +++++++++++++++++++++++++++---------------------------- 1 file changed, 233 insertions(+), 233 deletions(-) diff --git a/po/pt.po b/po/pt.po index 71dc0ea7..d541d1ee 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,23 +7,23 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 11:32+0000\n" +"POT-Creation-Date: 2010-06-09 16:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: PORTUGAL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: PORTUGAL\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navegador Web rápido" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 +#: ../midori/main.c:1692 ../midori/main.c:1708 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -104,126 +104,126 @@ msgstr "Restaurar última _sessão" msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1230 ../midori/main.c:1957 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1354 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1372 +#: ../midori/main.c:1373 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1403 +#: ../midori/main.c:1404 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1576 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1575 +#: ../midori/main.c:1576 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1578 +#: ../midori/main.c:1579 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1578 +#: ../midori/main.c:1579 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1581 +#: ../midori/main.c:1582 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1583 +#: ../midori/main.c:1584 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1586 +#: ../midori/main.c:1587 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1589 +#: ../midori/main.c:1590 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1591 +#: ../midori/main.c:1592 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1593 +#: ../midori/main.c:1594 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1595 +#: ../midori/main.c:1596 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão PATTERN" -#: ../midori/main.c:1595 +#: ../midori/main.c:1596 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1600 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repor Midori após SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1599 +#: ../midori/main.c:1600 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1680 +#: ../midori/main.c:1681 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1709 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1711 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1808 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1855 +#: ../midori/main.c:1856 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1911 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1940 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1972 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1986 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:2000 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:2015 +#: ../midori/main.c:2016 msgid "_Ignore" msgstr "_Ignorar " @@ -245,130 +245,130 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5576 +#: ../midori/midori-browser.c:5582 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5579 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:449 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:487 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao actualizar título: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:501 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:717 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:717 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:719 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:719 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:750 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4732 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 +#: ../midori/midori-browser.c:4737 ../midori/midori-browser.c:4769 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:853 msgid "Add to _Speed Dial" msgstr "Adicionar a _Ligação Rápida" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:866 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:881 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:975 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:979 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4787 +#: ../midori/midori-browser.c:4819 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1409 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../midori/midori-browser.c:1454 +#: ../midori/midori-browser.c:1445 #, c-format msgid "The file '%s' has been downloaded." msgstr "O ficheiro '%s' foi transferido." -#: ../midori/midori-browser.c:1458 +#: ../midori/midori-browser.c:1449 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1589 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#: ../midori/midori-browser.c:1906 ../midori/midori-browser.c:1908 msgid "Some files are being downloaded" msgstr "Existem ficheiros a ser transferidos" -#: ../midori/midori-browser.c:1921 +#: ../midori/midori-browser.c:1912 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1914 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2375 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2453 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -376,670 +376,670 @@ msgstr "" "Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" "Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2459 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5641 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 +#: ../midori/midori-browser.c:3075 ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3155 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3778 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:4092 ../midori/midori-browser.c:6035 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4425 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4658 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4659 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4660 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4661 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4662 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4683 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5646 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4697 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4724 ../midori/midori-browser.c:5750 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4798 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4834 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4888 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4995 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4999 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5013 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5024 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5030 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5035 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:5040 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5045 ../midori/sokoke.c:1305 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5050 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5058 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5159 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5161 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:5180 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5489 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5491 ../midori/sokoke.c:1306 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5492 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5495 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5497 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5498 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5502 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5505 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5507 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5508 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5510 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5511 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5513 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5514 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5519 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5520 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5522 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5523 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5526 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5529 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5531 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5535 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5538 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5542 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5545 ../midori/midori-browser.c:5548 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5551 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5554 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5557 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5560 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5562 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5563 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5565 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5566 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5570 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5572 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5573 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5585 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5588 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5591 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5592 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5594 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5595 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5598 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5601 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5602 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5604 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5605 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5607 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5608 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5610 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5611 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5614 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5617 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5620 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5624 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5628 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5631 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5633 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5634 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5636 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5637 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5643 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5644 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5649 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5652 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5653 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5656 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5657 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5661 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5662 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5667 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5668 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5670 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5671 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5673 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5674 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5676 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5677 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5679 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5681 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5682 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5684 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5685 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5687 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5688 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5691 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5699 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5700 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5703 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5704 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5707 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5708 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5711 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5712 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5715 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5716 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5719 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5720 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5728 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5731 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5735 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5741 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5744 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5747 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6293 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6300 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6302 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6326 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6328 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6349 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6364 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6366 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6381 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6383 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6398 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6411 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6413 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6427 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6429 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 +#: ../midori/midori-browser.c:6636 msgid "_Inline Find:" msgstr "Local_izar:" -#: ../midori/midori-browser.c:6671 +#: ../midori/midori-browser.c:6667 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:6676 +#: ../midori/midori-browser.c:6672 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:6681 +#: ../midori/midori-browser.c:6677 msgid "Match Case" msgstr "Sensível à Capitalização" -#: ../midori/midori-browser.c:6690 +#: ../midori/midori-browser.c:6686 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:6702 +#: ../midori/midori-browser.c:6698 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6744 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Limpar Tudo" -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" @@ -1843,11 +1843,11 @@ msgstr "Tem a certeza que quer apagar este atalho?" #: ../midori/midori-view.c:3518 msgid "Set number of columns and rows" -msgstr "Definir número de linhas e colunas" +msgstr "Definir número de colunas e linhas" #: ../midori/midori-view.c:3519 msgid "Enter number of columns and rows:" -msgstr "Indique o número de linhas e colunas:" +msgstr "Indique o número de colunas e linhas:" #: ../midori/midori-view.c:3520 msgid "Invalid input for the size of the speed dial" @@ -1911,15 +1911,15 @@ msgstr "_Minizar Separadores" msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4789 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4790 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4842 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2081,7 +2081,7 @@ msgstr "_Nome:" #: ../midori/midori-searchaction.c:989 msgid "_Icon:" -msgstr "_Icone:" +msgstr "Í_cone:" #: ../midori/midori-searchaction.c:1003 msgid "_Token:" From ff6fec636700b71b296ebe5c2976b8cb7080d292 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 10 Jun 2010 17:49:22 +0200 Subject: [PATCH 2687/2970] Use g_file_set_contents to save 'config' with a temporary file If the filesystem runs out of space and Midori tries to save the 'config' file under that condition, the file is lost. To avoid that, we use g_file_set_contents which writes a temporary file first, at the cost of destroying symbolic links. --- midori/sokoke.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 04c37af5..e8ade3af 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1103,22 +1103,15 @@ sokoke_key_file_save_to_file (GKeyFile* key_file, GError** error) { gchar* data; - FILE* fp; + gboolean success = FALSE; data = g_key_file_to_data (key_file, NULL, error); if (!data) return FALSE; - if (!(fp = fopen (filename, "w"))) - { - *error = g_error_new (G_FILE_ERROR, G_FILE_ERROR_ACCES, - _("Writing failed.")); - return FALSE; - } - fputs (data, fp); - fclose (fp); + success = g_file_set_contents (filename, data, -1, error); g_free (data); - return TRUE; + return success; } void From 61c5514c1c9d0637e4273c54eb8d1c6a96ee46da Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 10 Jun 2010 17:53:08 +0200 Subject: [PATCH 2688/2970] Remove toolbar menu items from the compact menu --- midori/midori-browser.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 920a7b84..bf001fed 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3367,12 +3367,6 @@ _action_compact_menu_populate_popup (GtkAction* action, { "Find" }, #else { "Print" }, - { "About" }, - { NULL }, - { "Menubar" }, - { "Bookmarkbar" }, - { "Panel" }, - { "Statusbar" }, { NULL }, { "-" }, { "ClearPrivateData" }, @@ -3381,6 +3375,7 @@ _action_compact_menu_populate_popup (GtkAction* action, #endif { "Fullscreen" }, #endif + { "About" }, { "Preferences" }, #if HAVE_HILDON { "auto-load-images" }, From b747f00e26c5358b7a9f4fdfbecc569828abe439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Fri, 11 Jun 2010 19:51:48 +0200 Subject: [PATCH 2689/2970] l10n: Updated Croatian (hr) translation to 78% New status: 496 messages complete with 0 fuzzies and 133 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 363 +++++++++++++++++++++++++++---------------------------- 1 file changed, 181 insertions(+), 182 deletions(-) diff --git a/po/hr.po b/po/hr.po index 8baebaf2..d7c35b34 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-08 22:08+0000\n" -"PO-Revision-Date: 2010-06-09 01:27+0200\n" +"POT-Creation-Date: 2010-06-11 16:08+0000\n" +"PO-Revision-Date: 2010-06-11 19:50+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -242,17 +242,16 @@ msgstr "Deformirani dokument." msgid "Unrecognized bookmark format." msgstr "Neprepoznati format zabilješke." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Neuspjelo pisanje." -#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5576 -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5577 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5574 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" @@ -300,12 +299,12 @@ msgstr "_Opis:" msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4727 msgid "_Folder:" msgstr "_Mapa:" #: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 -#: ../midori/midori-browser.c:4737 ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:4732 ../midori/midori-browser.c:4764 msgid "Toplevel folder" msgstr "" @@ -331,8 +330,8 @@ msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4787 -#: ../midori/midori-browser.c:4819 +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4782 +#: ../midori/midori-browser.c:4814 msgid "Save file as" msgstr "Spremi datoteku kao" @@ -383,7 +382,7 @@ msgstr "" msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5636 #: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" @@ -398,131 +397,131 @@ msgstr "" msgid "Empty" msgstr "Prazno" -#: ../midori/midori-browser.c:3778 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3773 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4092 ../midori/midori-browser.c:6035 +#: ../midori/midori-browser.c:4087 ../midori/midori-browser.c:6030 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4425 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4420 ../panels/midori-bookmarks.c:779 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4427 ../panels/midori-bookmarks.c:785 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4430 ../panels/midori-bookmarks.c:787 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4653 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4654 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4655 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4656 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:4657 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4678 msgid "Import bookmarks..." msgstr "Uvezi zabilješke..." -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:4681 ../midori/midori-browser.c:5641 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4697 +#: ../midori/midori-browser.c:4692 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4724 ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:4719 ../midori/midori-browser.c:5745 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Prilagođeno..." -#: ../midori/midori-browser.c:4798 +#: ../midori/midori-browser.c:4793 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4834 +#: ../midori/midori-browser.c:4829 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4888 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4883 ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4990 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4994 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:5008 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke:" -#: ../midori/midori-browser.c:5024 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5019 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5025 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5030 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5035 msgid "Website icons" msgstr "Website ikone" -#: ../midori/midori-browser.c:5045 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5040 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:5050 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5045 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5053 msgid "Clear private data when _quitting Midori" msgstr "Očisti privatne podatke kad _isključuješ Midori" -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:5154 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5156 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -530,523 +529,523 @@ msgid "" "option) any later version." msgstr "" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:5175 msgid "translator-credits" -msgstr "zvacet " +msgstr "Ivica Kolić (zvacet) " -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5484 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5491 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5486 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Novi _prozor" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5487 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5490 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5492 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5493 msgid "Don't save any private data while browsing" msgstr "Ne spremaj privatne podatke dok pregledavaš" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5497 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5500 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5502 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo _biranje" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5503 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5505 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5506 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5508 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5509 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5514 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5515 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5517 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5518 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5521 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5524 msgid "Quit the application" msgstr "Isključi program" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5526 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5530 msgid "Undo the last modification" msgstr "Poništi zadnju izmjenu" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5533 msgid "Redo the last modification" msgstr "Vrati zadnju izmjenu" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5537 msgid "Cut the selected text" msgstr "Izreži označeni tekst" -#: ../midori/midori-browser.c:5545 ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5540 ../midori/midori-browser.c:5543 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5546 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5549 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5552 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5555 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5557 msgid "Find _Next" msgstr "Nađi _Slijedeće" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5558 msgid "Find the next occurrence of a word or phrase" msgstr "Nađi slijedeće pojavljivanje riječi ili fraze" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5560 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5561 msgid "Find the previous occurrence of a word or phrase" msgstr "Nađi prethodno pojavljivanje riječi ili fraze" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5565 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5567 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5568 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5580 msgid "Increase the zoom level" msgstr "Povećaj zoom razinu" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5583 msgid "Decrease the zoom level" msgstr "Smanji zoom razinu" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5586 msgid "Reset the zoom level" msgstr "Vrati zoom razinu" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5587 msgid "_Encoding" msgstr "_Kodiranje" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5589 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5590 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5593 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5596 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5597 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5599 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5600 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5602 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5603 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5605 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5606 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5609 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5612 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5615 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5619 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5623 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5626 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5628 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5629 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5631 msgid "Undo _Close Tab" msgstr "Poništi _zatvori karticu" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5632 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5638 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5639 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5644 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5652 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5647 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Upravljaj tražilicama" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5648 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5651 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5652 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5656 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5657 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5662 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5663 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5665 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5666 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5668 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5669 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5671 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5672 msgid "Open the tabs saved in the last session" msgstr "Otvori kartice spremljene u posljednjoj sesiji" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5674 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5676 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5677 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5679 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5680 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5682 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5683 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5686 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5694 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5695 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5698 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5699 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5702 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5703 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5706 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5707 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5710 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5711 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5714 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5715 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:5723 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5731 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5726 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5730 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5733 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5741 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5736 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5744 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5739 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5747 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5742 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6293 +#: ../midori/midori-browser.c:6288 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6295 msgid "_Location..." msgstr "_Lokacija..." -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:6297 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6321 msgid "_Web Search..." msgstr "_Web pretraživanje..." -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6323 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6349 +#: ../midori/midori-browser.c:6344 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6359 msgid "_Recently visited pages" msgstr "_Nedavno posjećene stranice" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6361 msgid "Reopen pages that you visited earlier" msgstr "Ponovo otvori stranice koje ste posjetili ranije" -#: ../midori/midori-browser.c:6381 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6376 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Zabilješke" -#: ../midori/midori-browser.c:6383 +#: ../midori/midori-browser.c:6378 msgid "Show the saved bookmarks" msgstr "Pokaži spremljene zabilješke" -#: ../midori/midori-browser.c:6398 +#: ../midori/midori-browser.c:6393 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6411 +#: ../midori/midori-browser.c:6406 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6413 +#: ../midori/midori-browser.c:6408 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6427 +#: ../midori/midori-browser.c:6422 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6429 +#: ../midori/midori-browser.c:6424 msgid "Menu" msgstr "Izbornik" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6636 +#: ../midori/midori-browser.c:6631 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:6667 +#: ../midori/midori-browser.c:6662 msgid "Previous" msgstr "Prethodno" -#: ../midori/midori-browser.c:6672 +#: ../midori/midori-browser.c:6667 msgid "Next" msgstr "Slijedeće" -#: ../midori/midori-browser.c:6677 +#: ../midori/midori-browser.c:6672 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:6686 +#: ../midori/midori-browser.c:6681 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:6698 +#: ../midori/midori-browser.c:6693 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:6744 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6739 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Očisti sve" -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:7095 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekivana postavka '%s'" @@ -2108,47 +2107,47 @@ msgstr "Upravljaj tražilicama" msgid "Use as _default" msgstr "Koristi kao _zadano" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Zabilješka" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Dodaj za_bilješku" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Proširenja" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Povijest" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Početna stranica" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Korisničke skripte" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Nova _kartica" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Prijenosi" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Netscape p_riključci" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Nova _mapa" From 61add83eeb8d2a8eda011768fb5823be8b59c533 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 8 Jun 2010 22:27:57 +0200 Subject: [PATCH 2690/2970] Iterate links and anchors for next/ previous labels --- midori/midori-view.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 20d1ad68..40352d92 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4680,9 +4680,11 @@ midori_view_get_previous_page (MidoriView* view) web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); katze_assign (uri, sokoke_js_script_eval (js_context, - "(function (l) {" + "(function (g) {" "var ind = ['prev','←','«','<'];" "var nind = ['next','→','»','>'];" + "for (h in g) {" + "l = g[h];" "for (i in l)" "if (l[i].rel && (l[i].rel == ind[0]))" "return l[i].href;" @@ -4708,10 +4710,12 @@ midori_view_get_previous_page (MidoriView* view) "}" "for (j in cand)" "for (i in l)" - "if (l[i].href && (l[i].href.indexOf (cand[j]) == 0))" + "if (cand[j].length && l[i].href && (l[i].href.indexOf (cand[j]) == 0))" "return l[i].href;" + "}" "return 0;" - "}) (document.getElementsByTagName ('a'));", NULL)); + "}) ([document.getElementsByTagName ('link')," + "document.getElementsByTagName ('a')]);", NULL)); return uri && uri[0] != '0' ? uri : NULL; } @@ -4740,9 +4744,11 @@ midori_view_get_next_page (MidoriView* view) web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); js_context = webkit_web_frame_get_global_context (web_frame); katze_assign (uri, sokoke_js_script_eval (js_context, - "(function (l) {" + "(function (g) {" "var ind = ['next','→','»','>'];" "var nind = ['prev','←','«','<'];" + "for (h in g) {" + "l = g[h];" "for (i in l)" "if (l[i].rel && (l[i].rel == ind[0]))" "return l[i].href;" @@ -4768,10 +4774,12 @@ midori_view_get_next_page (MidoriView* view) "}" "for (j in cand)" "for (i in l)" - "if (l[i].href && (l[i].href.indexOf (cand[j]) == 0))" + "if (cand[j].length && l[i].href && (l[i].href.indexOf (cand[j]) == 0))" "return l[i].href;" + "}" "return 0;" - "}) (document.getElementsByTagName ('a'));", NULL)); + "}) ([document.getElementsByTagName ('link')," + "document.getElementsByTagName ('a')]);", NULL)); return uri && uri[0] != '0' ? uri : NULL; } #if WEBKIT_CHECK_VERSION (1, 1, 5) From 1676fcc217af73cfea90a18dd42d51e611d0725f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 11 Jun 2010 22:52:51 +0200 Subject: [PATCH 2691/2970] Confirm before overwriting in Save As dialogue --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index bf001fed..49ed5348 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1035,6 +1035,7 @@ midori_browser_save_uri (MidoriBrowser* browser, dialog = sokoke_file_chooser_dialog_new (_("Save file as"), GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); if (uri) { From 87ac3ae563dd99778537661d6abc708b2db6f737 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 12 Jun 2010 22:54:11 -0400 Subject: [PATCH 2692/2970] Initial sqlite read support We go back to GtkTreeStore rather than a custom class. --- midori/main.c | 49 +++++++---- panels/midori-bookmark-store.c | 110 ----------------------- panels/midori-bookmark-store.h | 44 ---------- panels/midori-bookmarks.c | 155 ++++++++++++++++++++++++--------- 4 files changed, 150 insertions(+), 208 deletions(-) delete mode 100644 panels/midori-bookmark-store.c delete mode 100644 panels/midori-bookmark-store.h diff --git a/midori/main.c b/midori/main.c index 91e5c5be..dce2085d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -428,6 +428,30 @@ midori_history_terminate (sqlite3* db, g_free (sqlcmd); sqlite3_close (db); } + +static sqlite3* +midori_bookmarks_initialize (KatzeArray* array, + const gchar* filename, + char** errmsg) +{ + sqlite3* db; + + if (sqlite3_open (filename, &db) != SQLITE_OK) + { + if (errmsg) + *errmsg = g_strdup_printf (_("Failed to open database: %s\n"), + sqlite3_errmsg (db)); + sqlite3_close (db); + return NULL; + } + + if (sqlite3_exec (db, + "CREATE TABLE IF NOT EXISTS " + "bookmarks (uri text, title text, folder text, type integer);", + NULL, NULL, errmsg) != SQLITE_OK) + return NULL; + return db; +} #endif static void @@ -1924,24 +1948,19 @@ main (int argc, midori_startup_timer ("Search read: \t%f"); bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - #if HAVE_LIBXML - katze_assign (config_file, build_config_filename (BOOKMARK_FILE)); - error = NULL; - if (!midori_array_from_file (bookmarks, config_file, "xbel", &error)) + #if HAVE_SQLITE + katze_assign (config_file, build_config_filename ("bookmarks.db")); + errmsg = NULL; + if ((db = midori_bookmarks_initialize (bookmarks, config_file, &errmsg)) == NULL) { - if (error->code == G_FILE_ERROR_NOENT) - { - katze_assign (config_file, - sokoke_find_config_filename (NULL, "bookmarks.xbel")); - midori_array_from_file (bookmarks, config_file, "xbel", NULL); - } - else - g_string_append_printf (error_messages, - _("The bookmarks couldn't be loaded: %s\n"), error->message); - g_error_free (error); + g_string_append_printf (error_messages, + _("Bookmarks couldn't be loaded: %s\n"), errmsg); + g_free (errmsg); } + else + g_object_set_data (G_OBJECT (bookmarks), "db", db); #endif - midori_startup_timer ("Bkmarks read: \t%f"); + midori_startup_timer ("Bookmarks read: \t%f"); _session = katze_array_new (KATZE_TYPE_ITEM); #if HAVE_LIBXML diff --git a/panels/midori-bookmark-store.c b/panels/midori-bookmark-store.c deleted file mode 100644 index b8e03f23..00000000 --- a/panels/midori-bookmark-store.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - Copyright (C) 2009 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "midori-bookmark-store.h" - -struct _MidoriBookmarkStore -{ - GtkTreeStore parent_instance; -}; - -struct _MidoriBookmarkStoreClass -{ - GtkTreeStoreClass parent_class; -}; - -static void -midori_bookmark_store_drag_source_iface_init (GtkTreeDragSourceIface* iface); - -static void -midori_bookmark_store_drag_dest_iface_init (GtkTreeDragDestIface* iface); - -G_DEFINE_TYPE_WITH_CODE (MidoriBookmarkStore, midori_bookmark_store, GTK_TYPE_TREE_STORE, - G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE, - midori_bookmark_store_drag_source_iface_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_DEST, - midori_bookmark_store_drag_dest_iface_init)); - -static void -midori_bookmark_store_finalize (GObject* object); - -static void -midori_bookmark_store_class_init (MidoriBookmarkStoreClass* class) -{ - GObjectClass* gobject_class; - - gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = midori_bookmark_store_finalize; -} - -static void -midori_bookmark_store_init (MidoriBookmarkStore* bookmark_store) -{ - /* Nothing to do */ -} - -static void -midori_bookmark_store_finalize (GObject* object) -{ - /* Nothing to do */ -} - -static void -midori_bookmark_store_drag_source_iface_init (GtkTreeDragSourceIface* iface) -{ - /*iface->row_draggable = real_gtk_tree_store_row_draggable; - iface->drag_data_delete = gtk_tree_store_drag_data_delete; - iface->drag_data_get = gtk_tree_store_drag_data_get;*/ -} - -static void -midori_bookmark_store_drag_dest_iface_init (GtkTreeDragDestIface* iface) -{ - /*iface->drag_data_received = gtk_tree_store_drag_data_received; - iface->row_drop_possible = gtk_tree_store_row_drop_possible;*/ -} - -/** - * midori_bookmark_store_new: - * - * Creates a new empty bookmark_store. - * - * Return value: a new #MidoriBookmarkStore - * - * Since: 0.1.8 - **/ -GtkTreeStore* -midori_bookmark_store_new (gint n_columns, - ...) -{ - GtkTreeStore* treestore; - va_list args; - gint i; - GType* types; - - g_return_val_if_fail (n_columns > 0, NULL); - - treestore = g_object_new (MIDORI_TYPE_BOOKMARK_STORE, NULL); - - va_start (args, n_columns); - - types = g_new (GType, n_columns); - for (i = 0; i < n_columns; i++) - { - GType type = va_arg (args, GType); - types[i] = type; - } - va_end (args); - - gtk_tree_store_set_column_types (treestore, i, types); - - return treestore; -} diff --git a/panels/midori-bookmark-store.h b/panels/midori-bookmark-store.h deleted file mode 100644 index ee6a3d54..00000000 --- a/panels/midori-bookmark-store.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - Copyright (C) 2009 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __MIDORI_BOOKMARK_STORE_H__ -#define __MIDORI_BOOKMARK_STORE_H__ - -#include - -G_BEGIN_DECLS - -#define MIDORI_TYPE_BOOKMARK_STORE \ - (midori_bookmark_store_get_type ()) -#define MIDORI_BOOKMARK_STORE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStore)) -#define MIDORI_BOOKMARK_STORE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStoreClass)) -#define MIDORI_IS_BOOKMARK_STORE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_BOOKMARK_STORE)) -#define MIDORI_IS_BOOKMARK_STORE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_BOOKMARK_STORE)) -#define MIDORI_BOOKMARK_STORE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_BOOKMARK_STORE, MidoriBookmarkStoreClass)) - -typedef struct _MidoriBookmarkStore MidoriBookmarkStore; -typedef struct _MidoriBookmarkStoreClass MidoriBookmarkStoreClass; - -GType -midori_bookmark_store_get_type (void); - -GtkTreeStore* -midori_bookmark_store_new (gint n_columns, - ...); - -G_END_DECLS - -#endif /* __MIDORI_BOOKMARK_STORE_H__ */ diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 2a901f01..fdc7080d 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -16,7 +16,6 @@ #include "midori-stock.h" #include "midori-view.h" #include "midori-viewable.h" -#include "midori-bookmark-store.h" #include "sokoke.h" @@ -26,6 +25,11 @@ #include #include +#include "config.h" +#if HAVE_SQLITE + #include +#endif + void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, @@ -117,6 +121,74 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) return STOCK_BOOKMARKS; } +#if HAVE_SQLITE +static gboolean +midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, + GtkTreeStore* model, + GtkTreeIter* parent, + const gchar* folder) +{ + sqlite3* db; + sqlite3_stmt* statement; + gint result; + const gchar* sqlcmd; + + GtkTreeIter iter; + GtkTreeIter root_iter; + + db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + + sqlcmd = "SELECT uri, title, type from bookmarks where folder = ?" + " ORDER BY type, title ASC"; + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); + sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); + + if (result != SQLITE_OK) + return FALSE; + + while ((result = sqlite3_step (statement)) == SQLITE_ROW) + { + gint type; + KatzeItem* item; + const unsigned char* uri; + const unsigned char* title; + + uri = sqlite3_column_text (statement, 0); + title = sqlite3_column_text (statement, 1); + type = sqlite3_column_int64 (statement, 2); + + item = katze_item_new (); + katze_item_set_uri (item, (gchar*)uri); + katze_item_set_name (item, (gchar*)title); + + /* type 0 -- folder, 1 -- entry */ + if (type == 0) + { + gtk_tree_store_insert_with_values (model, &root_iter, parent, + 0, 0, item, -1); + /* That's an invisible dummy, so we always have an expander */ + gtk_tree_store_insert_with_values (model, &iter, &root_iter, + 0, 0, NULL, -1); + } + else + { + if (!uri) + continue; + + gtk_tree_store_insert_with_values (model, NULL, parent, + 0, 0, item, -1); + } + } + + if (result != SQLITE_DONE) + g_print (_("Failed to execute database statement: %s\n"), + sqlite3_errmsg (db)); + + sqlite3_finalize (statement); + return FALSE; +} +#endif + static void midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) { @@ -298,31 +370,6 @@ static void midori_bookmarks_clear_cb (KatzeArray* array, MidoriBookmarks* bookmarks); -static void -midori_bookmarks_disconnect_folder (MidoriBookmarks* bookmarks, - KatzeArray* array) -{ - KatzeItem* item; - guint i; - - g_return_if_fail (KATZE_IS_ARRAY (array)); - - g_signal_handlers_disconnect_by_func (array, - midori_bookmarks_add_item_cb, bookmarks); - g_signal_handlers_disconnect_by_func (array, - midori_bookmarks_remove_item_cb, bookmarks); - g_signal_handlers_disconnect_by_func (array, - midori_bookmarks_clear_cb, bookmarks); - - i = 0; - while ((item = katze_array_get_nth_item (array, i++))) - { - if (KATZE_IS_ARRAY (item)) - midori_bookmarks_disconnect_folder (bookmarks, KATZE_ARRAY (item)); - g_object_unref (item); - } -} - static void midori_bookmarks_add_item_cb (KatzeArray* array, KatzeItem* added_item, @@ -416,9 +463,6 @@ midori_bookmarks_remove_item_cb (KatzeArray* array, g_return_if_fail (KATZE_IS_ARRAY (array)); g_return_if_fail (KATZE_IS_ITEM (removed_item)); - if (KATZE_IS_ARRAY (removed_item)) - midori_bookmarks_disconnect_folder (bookmarks, KATZE_ARRAY (removed_item)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); midori_bookmarks_remove_iter (model, NULL, removed_item); g_object_unref (removed_item); @@ -489,10 +533,12 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, if (bookmarks->array) { - midori_bookmarks_disconnect_folder (bookmarks, bookmarks->array); g_object_unref (bookmarks->array); model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); + #if HAVE_SQLITE + midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); + #endif } katze_assign (bookmarks->app, app); if (!app) @@ -500,13 +546,6 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); - if (bookmarks->array) - { - /* FIXME: Dereference the app on finalization */ - model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); - midori_bookmarks_insert_folder (bookmarks, GTK_TREE_STORE (model), - NULL, g_object_ref (bookmarks->array)); - } } static void @@ -880,6 +919,41 @@ midori_bookmarks_popup_menu_cb (GtkWidget* widget, } } +static void +midori_bookmarks_row_expanded_cb (GtkTreeView* treeview, + GtkTreeIter* iter, + GtkTreePath* path, + MidoriBookmarks* bookmarks) +{ + GtkTreeModel* model; + KatzeItem* item; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + gtk_tree_model_get (model, iter, 0, &item, -1); + midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), + iter, katze_item_get_name (item)); + g_object_unref (item); +} + +static void +midori_bookmarks_row_collapsed_cb (GtkTreeView *treeview, + GtkTreeIter *parent, + GtkTreePath *path, + gpointer user_data) +{ + GtkTreeModel* model; + GtkTreeStore* treestore; + GtkTreeIter child; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + treestore = GTK_TREE_STORE (model); + while (gtk_tree_model_iter_nth_child (model, &child, parent, 0)) + gtk_tree_store_remove (treestore, &child); + /* That's an invisible dummy, so we always have an expander */ + gtk_tree_store_insert_with_values (treestore, &child, parent, + 0, 0, NULL, -1); +} + static void midori_bookmarks_init (MidoriBookmarks* bookmarks) { @@ -890,7 +964,7 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) GtkCellRenderer* renderer_text; /* Create the treeview */ - model = midori_bookmark_store_new (1, KATZE_TYPE_ITEM); + model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); @@ -919,6 +993,10 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) midori_bookmarks_key_release_event_cb, bookmarks, "signal::popup-menu", midori_bookmarks_popup_menu_cb, bookmarks, + "signal::row-expanded", + midori_bookmarks_row_expanded_cb, bookmarks, + "signal::row-collapsed", + midori_bookmarks_row_collapsed_cb, bookmarks, NULL); gtk_widget_show (treeview); gtk_box_pack_start (GTK_BOX (bookmarks), treeview, TRUE, TRUE, 0); @@ -930,7 +1008,6 @@ midori_bookmarks_finalize (GObject* object) { MidoriBookmarks* bookmarks = MIDORI_BOOKMARKS (object); - midori_bookmarks_disconnect_folder (bookmarks, bookmarks->array); if (bookmarks->app) g_object_unref (bookmarks->app); } From 3b46d80161b69811504e5c2812f8fe61d9681c0a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 12 Jun 2010 23:06:27 -0400 Subject: [PATCH 2693/2970] Fixup the bookmark panel initialization --- panels/midori-bookmarks.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index fdc7080d..e5deb9cb 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -531,14 +531,11 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, { GtkTreeModel* model; + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); if (bookmarks->array) { g_object_unref (bookmarks->array); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); - #if HAVE_SQLITE - midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); - #endif } katze_assign (bookmarks->app, app); if (!app) @@ -546,6 +543,10 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); + + #if HAVE_SQLITE + midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); + #endif } static void From 9bff58199abb7b0a7cc6ce027fe11c5b677b1ca0 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 12 Jun 2010 23:19:55 -0400 Subject: [PATCH 2694/2970] Order bookmarks descending. Folders should always be on top --- panels/midori-bookmarks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index e5deb9cb..607d3987 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -139,7 +139,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); sqlcmd = "SELECT uri, title, type from bookmarks where folder = ?" - " ORDER BY type, title ASC"; + " ORDER BY type DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); From 6f415c4e6e9154285c760fd06b419ab6ff42c0b9 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sun, 13 Jun 2010 15:40:28 -0400 Subject: [PATCH 2695/2970] Import bookmarks from bookmarks.xbel on the first start. The bookmark handling in main is not needed any more. --- midori/main.c | 136 ++++------------- panels/midori-bookmarks.c | 303 ++++++++++++++------------------------ panels/midori-bookmarks.h | 16 ++ 3 files changed, 150 insertions(+), 305 deletions(-) diff --git a/midori/main.c b/midori/main.c index dce2085d..388c9d5f 100644 --- a/midori/main.c +++ b/midori/main.c @@ -452,6 +452,24 @@ midori_bookmarks_initialize (KatzeArray* array, return NULL; return db; } + +static void +midori_bookmarks_import (const gchar* filename, + sqlite3* db) +{ + KatzeArray* bookmarks; + GError* error = NULL; + + bookmarks = katze_array_new (KATZE_TYPE_ARRAY); + + if (!midori_array_from_file (bookmarks, filename, "xbel", &error)) + { + g_warning (_("The bookmarks couldn't be saved. %s"), error->message); + g_error_free (error); + return; + } + midori_bookmarks_import_array_db (bookmarks, db); +} #endif static void @@ -523,105 +541,6 @@ midori_search_engines_modify_cb (KatzeArray* array, g_free (config_file); } -static void -midori_bookmarks_notify_item_cb (KatzeArray* folder, - GParamSpec* pspec, - KatzeArray* bookmarks) -{ - gchar* config_file; - GError* error; - - config_file = build_config_filename (BOOKMARK_FILE); - error = NULL; - if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) - { - g_warning (_("The bookmarks couldn't be saved. %s"), error->message); - g_error_free (error); - } - g_free (config_file); -} - -static void -midori_bookmarks_add_item_cb (KatzeArray* folder, - KatzeItem* item, - KatzeArray* bookmarks); - -static void -midori_bookmarks_remove_item_cb (KatzeArray* folder, - GObject* item, - KatzeArray* bookmarks); - -static void -midori_bookmarks_connect_item (KatzeArray* folder, - KatzeItem* item, - KatzeArray* bookmarks) -{ - if (KATZE_IS_ARRAY (item)) - { - KatzeItem* child; - guint i = 0; - while ((child = katze_array_get_nth_item ((KatzeArray*)item, i++))) - midori_bookmarks_connect_item ((KatzeArray*)item, child, bookmarks); - - g_signal_connect_after (item, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - } - - g_signal_connect_after (item, "notify", - G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); -} - -static void -midori_bookmarks_add_item_cb (KatzeArray* folder, - KatzeItem* item, - KatzeArray* bookmarks) -{ - gchar* config_file; - GError* error; - - config_file = build_config_filename (BOOKMARK_FILE); - error = NULL; - if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) - { - g_warning (_("The bookmarks couldn't be saved. %s"), error->message); - g_error_free (error); - } - g_free (config_file); - - midori_bookmarks_connect_item (folder, item, bookmarks); -} - -static void -midori_bookmarks_remove_item_cb (KatzeArray* folder, - GObject* item, - KatzeArray* bookmarks) -{ - gchar* config_file; - GError* error; - - config_file = build_config_filename (BOOKMARK_FILE); - error = NULL; - if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) - { - g_warning (_("The bookmarks couldn't be saved. %s"), error->message); - g_error_free (error); - } - g_free (config_file); - - if (KATZE_IS_ARRAY (item)) - { - g_signal_handlers_disconnect_by_func (item, - midori_bookmarks_add_item_cb, bookmarks); - g_signal_handlers_disconnect_by_func (item, - midori_bookmarks_remove_item_cb, bookmarks); - } - - g_signal_handlers_disconnect_by_func (item, - midori_bookmarks_notify_item_cb, bookmarks); -} - static void midori_trash_add_item_cb (KatzeArray* trash, GObject* item) @@ -1958,7 +1877,16 @@ main (int argc, g_free (errmsg); } else + { + gchar* old_bookmarks = build_config_filename (BOOKMARK_FILE); + if (g_access (old_bookmarks, F_OK) == 0) + { + midori_bookmarks_import (old_bookmarks, db); + g_unlink(old_bookmarks); + } + g_free (old_bookmarks); g_object_set_data (G_OBJECT (bookmarks), "db", db); + } #endif midori_startup_timer ("Bookmarks read: \t%f"); @@ -2089,16 +2017,6 @@ main (int argc, G_CALLBACK (midori_search_engines_modify_cb), search_engines); } } - katze_assign (config_file, build_config_filename (BOOKMARK_FILE)); - /* Don't save bookmarks if they are not our own */ - if (!g_path_is_absolute (BOOKMARK_FILE)) - { - midori_bookmarks_connect_item (NULL, (KatzeItem*)bookmarks, bookmarks); - g_signal_connect_after (bookmarks, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect_after (bookmarks, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - } katze_assign (config_file, build_config_filename ("tabtrash.xbel")); g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_trash_add_item_cb), NULL); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 607d3987..2a53ad75 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -22,14 +22,8 @@ #include #include -#include #include -#include "config.h" -#if HAVE_SQLITE - #include -#endif - void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, @@ -122,6 +116,25 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) } #if HAVE_SQLITE +void +midori_bookmarks_import_array_db (KatzeArray* array, + sqlite3* db) +{ + GList* list = NULL; + GList* bookmarks; + + bookmarks = katze_array_get_items ((KatzeArray*)array); + for (list = bookmarks; list != NULL; list = g_list_next (list)) + { + KatzeItem* item; + + if (KATZE_IS_ARRAY (list->data)) + midori_bookmarks_import_array_db (list->data, db); + item = (KatzeItem*) list->data; + midori_bookmarks_insert_item_db (db, item); + } +} + static gboolean midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, GtkTreeStore* model, @@ -158,7 +171,6 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, type = sqlite3_column_int64 (statement, 2); item = katze_item_new (); - katze_item_set_uri (item, (gchar*)uri); katze_item_set_name (item, (gchar*)title); /* type 0 -- folder, 1 -- entry */ @@ -175,6 +187,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, if (!uri) continue; + katze_item_set_uri (item, (gchar*)uri); gtk_tree_store_insert_with_values (model, NULL, parent, 0, 0, item, -1); } @@ -187,6 +200,73 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, sqlite3_finalize (statement); return FALSE; } + +void +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item) +{ + gchar* sqlcmd; + char* errmsg = NULL; + gint64 type; + gchar* parent; + + if (katze_item_get_uri (item)) + type = 1; + else + type = 0; + + if (katze_item_get_name (katze_item_get_parent (item))) + parent = g_strdup (katze_item_get_name (katze_item_get_parent (item))); + else + parent = g_strdup (""); + + sqlcmd = sqlite3_mprintf ( + "INSERT into bookmarks (uri, title, folder, type) values" + " ('%q', '%q', '%q', %u)", + katze_item_get_uri (item), + katze_item_get_name (item), + parent, + type); + + if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) + { + g_printerr (_("Failed to remove history item: %s\n"), errmsg); + sqlite3_free (errmsg); + } + + g_free (parent); + sqlite3_free (sqlcmd); +} + +static void +midori_bookmarks_remove_item_from_db (MidoriBookmarks* bookmarks, + KatzeItem* item) +{ + gchar* sqlcmd; + sqlite3* db; + char* errmsg = NULL; + + db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + + if (katze_item_get_uri (item)) + sqlcmd = sqlite3_mprintf ( + "DELETE FROM bookmarks WHERE uri = '%q' AND" + " title = '%q'", + katze_item_get_uri (item), + katze_item_get_name (item)); + else + sqlcmd = sqlite3_mprintf ( + "DELETE FROM bookmarks WHERE folder = '%q'", katze_item_get_name (item)); + + if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) + { + g_printerr (_("Failed to remove history item: %s\n"), errmsg); + sqlite3_free (errmsg); + } + + g_debug ("%s", sqlcmd); + sqlite3_free (sqlcmd); +} #endif static void @@ -234,15 +314,13 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, &model, &iter)) { KatzeItem* item; - KatzeArray* parent; gtk_tree_model_get (model, &iter, 0, &item, -1); - /* FIXME: Even toplevel items should technically have a parent */ - g_return_if_fail (katze_item_get_parent (item)); - - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); + #if HAVE_SQLITE + midori_bookmarks_remove_item_from_db (bookmarks, item); + #endif + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); g_object_unref (item); } @@ -273,8 +351,9 @@ midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, gboolean is_separator; gtk_tree_model_get (model, &iter, 0, &item, -1); - - is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); + if (!item) + return; + is_separator = !katze_item_get_uri (item); gtk_widget_set_sensitive (bookmarks->edit, !is_separator); gtk_widget_set_sensitive (bookmarks->delete, TRUE); @@ -356,175 +435,6 @@ midori_bookmarks_viewable_iface_init (MidoriViewableIface* iface) iface->get_toolbar = midori_bookmarks_get_toolbar; } -static void -midori_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* added_item, - MidoriBookmarks* bookmarks); - -static void -midori_bookmarks_remove_item_cb (KatzeArray* array, - KatzeItem* removed_item, - MidoriBookmarks* bookmarks); - -static void -midori_bookmarks_clear_cb (KatzeArray* array, - MidoriBookmarks* bookmarks); - -static void -midori_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* added_item, - MidoriBookmarks* bookmarks) -{ - GtkTreeModel* model; - GtkTreeIter iter; - guint i; - - g_return_if_fail (KATZE_IS_ARRAY (array)); - g_return_if_fail (KATZE_IS_ITEM (added_item)); - - if (KATZE_IS_ARRAY (added_item)) - { - g_signal_connect (added_item, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect (added_item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - g_signal_connect (added_item, "clear", - G_CALLBACK (midori_bookmarks_clear_cb), bookmarks); - } - - g_object_ref (added_item); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); - - if (array == bookmarks->array) - { - gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - &iter, NULL, G_MAXINT, 0, added_item, -1); - return; - } - - i = 0; - /* FIXME: Recurse over children of folders, too */ - while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) - { - KatzeItem* item; - - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (item == (KatzeItem*)array) - { - GtkTreeIter child_iter; - - gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - &child_iter, &iter, G_MAXINT, 0, added_item, -1); - break; - } - g_object_unref (item); - - i++; - } -} - -static void -midori_bookmarks_remove_iter (GtkTreeModel* model, - GtkTreeIter* parent, - KatzeItem* removed_item) -{ - guint i; - GtkTreeIter iter; - - i = 0; - while (gtk_tree_model_iter_nth_child (model, &iter, parent, i)) - { - KatzeItem* item; - - gtk_tree_model_get (model, &iter, 0, &item, -1); - - if (item == removed_item) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - g_object_unref (item); - break; - } - - if (KATZE_IS_ARRAY (item)) - midori_bookmarks_remove_iter (model, &iter, removed_item); - - g_object_unref (item); - i++; - } -} - -static void -midori_bookmarks_remove_item_cb (KatzeArray* array, - KatzeItem* removed_item, - MidoriBookmarks* bookmarks) -{ - GtkTreeModel* model; - - g_return_if_fail (KATZE_IS_ARRAY (array)); - g_return_if_fail (KATZE_IS_ITEM (removed_item)); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); - midori_bookmarks_remove_iter (model, NULL, removed_item); - g_object_unref (removed_item); -} - -static void -midori_bookmarks_clear_cb (KatzeArray* array, - MidoriBookmarks* bookmarks) -{ - GtkTreeView* treeview; - GtkTreeStore* store; - - g_return_if_fail (KATZE_IS_ARRAY (array)); - - if (array == bookmarks->array) - { - treeview = GTK_TREE_VIEW (bookmarks->treeview); - store = GTK_TREE_STORE (gtk_tree_view_get_model (treeview)); - gtk_tree_store_clear (store); - } - else - { - KatzeItem* item; - guint i; - - i = 0; - while ((item = katze_array_get_nth_item (array, i++))) - midori_bookmarks_remove_item_cb (array, item, bookmarks); - } -} - -static void -midori_bookmarks_insert_folder (MidoriBookmarks* bookmarks, - GtkTreeStore* treestore, - GtkTreeIter* parent, - KatzeArray* array) -{ - KatzeItem* item; - guint i; - GtkTreeIter iter; - - g_return_if_fail (KATZE_IS_ARRAY (array)); - - g_signal_connect (array, "add-item", - G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); - g_signal_connect (array, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); - g_signal_connect (array, "clear", - G_CALLBACK (midori_bookmarks_clear_cb), bookmarks); - - i = 0; - while ((item = katze_array_get_nth_item (array, i++))) - { - g_object_ref (item); - gtk_tree_store_insert_with_values (treestore, &iter, parent, i, - 0, item, -1); - if (KATZE_IS_ARRAY (item)) - midori_bookmarks_insert_folder (bookmarks, treestore, - &iter, KATZE_ARRAY (item)); - } -} - static void midori_bookmarks_set_app (MidoriBookmarks* bookmarks, MidoriApp* app) @@ -601,17 +511,18 @@ midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, /* TODO: Would it be better to not do this on every redraw? */ pixbuf = NULL; - if (KATZE_IS_ARRAY (item)) + if (item && !katze_item_get_uri (item) && katze_item_get_name (item)) pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); - else if (katze_item_get_uri (item)) + else if (item && katze_item_get_uri (item)) pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); if (pixbuf) g_object_unref (pixbuf); - g_object_unref (item); + if (item) + g_object_unref (item); } static void @@ -625,13 +536,14 @@ midori_bookmarks_treeview_render_text_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); - if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) + if (item && katze_item_get_name (item)) g_object_set (renderer, "markup", NULL, "text", katze_item_get_name (item), NULL); else g_object_set (renderer, "markup", _("Separator"), NULL); - g_object_unref (item); + if (item) + g_object_unref (item); } static void @@ -793,15 +705,12 @@ midori_bookmarks_delete_activate_cb (GtkWidget* menuitem, MidoriBookmarks* bookmarks) { KatzeItem* item; - KatzeArray* parent; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - - /* FIXME: Even toplevel items should technically have a parent */ - g_return_if_fail (katze_item_get_parent (item)); - - parent = katze_item_get_parent (item); - katze_array_remove_item (parent, item); + #if HAVE_SQLITE + midori_bookmarks_remove_item_from_db (bookmarks, item); + #endif + /* FIXME: Refresh menu */ } static void @@ -931,8 +840,10 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview, model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); gtk_tree_model_get (model, iter, 0, &item, -1); + #if HAVE_SQLITE midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), iter, katze_item_get_name (item)); + #endif g_object_unref (item); } diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h index 96797183..8beff86c 100644 --- a/panels/midori-bookmarks.h +++ b/panels/midori-bookmarks.h @@ -12,7 +12,14 @@ #ifndef __MIDORI_BOOKMARKS_H__ #define __MIDORI_BOOKMARKS_H__ +#include "config.h" + +#if HAVE_SQLITE + #include +#endif + #include +#include G_BEGIN_DECLS @@ -38,6 +45,15 @@ midori_bookmarks_get_type (void); GtkWidget* midori_bookmarks_new (void); +#if HAVE_SQLITE +void +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item); +void +midori_bookmarks_import_array_db (KatzeArray* array, + sqlite3* db); +#endif + G_END_DECLS #endif /* __MIDORI_BOOKMARKS_H__ */ From 5af37f6c92d5f07ac3968618289c86b918d4bb2e Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sun, 13 Jun 2010 16:33:23 -0400 Subject: [PATCH 2696/2970] Fix edit/ delete/ new operations on bookmarks --- midori/midori-browser.c | 43 ++++++++++++++++++++++----------------- panels/midori-bookmarks.c | 41 +++++++++++++++++++++---------------- panels/midori-bookmarks.h | 8 +++++++- 3 files changed, 54 insertions(+), 38 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 49ed5348..67f6ee53 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -175,6 +175,17 @@ midori_browser_get_property (GObject* object, GValue* value, GParamSpec* pspec); +#if HAVE_SQLITE +void +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item, + gchar* folder); + +void +midori_bookmarks_remove_item_from_db (sqlite3* db, + KatzeItem* item); +#endif + static void midori_browser_new_history_item (MidoriBrowser* browser, KatzeItem** item); @@ -891,6 +902,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { gchar* selected; KatzeArray* folder; + #if HAVE_SQLITE + sqlite3* db; + + db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); + #endif katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); @@ -914,26 +930,15 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, folder = browser->bookmarks; selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - if (strcmp (selected, _("Toplevel folder"))) - { - guint i = 0; - KatzeItem* item; - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) - if (KATZE_IS_ARRAY (item)) - if (!g_strcmp0 (katze_item_get_name (item), selected)) - { - folder = KATZE_ARRAY (item); - break; - } - } + + #if HAVE_SQLITE + midori_bookmarks_remove_item_from_db (db, bookmark); + if (!strcmp (selected, _("Toplevel folder"))) + midori_bookmarks_insert_item_db (db, bookmark, ""); + else + midori_bookmarks_insert_item_db (db, bookmark, selected); + #endif g_free (selected); - if (folder != katze_item_get_parent (bookmark) && folder != browser->bookmarks) - { - katze_array_remove_item (katze_item_get_parent (bookmark), bookmark); - new_bookmark = TRUE; - } - if (new_bookmark) - katze_array_add_item (folder, bookmark); } gtk_widget_destroy (dialog); } diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 2a53ad75..b98b4ed9 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -131,7 +131,7 @@ midori_bookmarks_import_array_db (KatzeArray* array, if (KATZE_IS_ARRAY (list->data)) midori_bookmarks_import_array_db (list->data, db); item = (KatzeItem*) list->data; - midori_bookmarks_insert_item_db (db, item); + midori_bookmarks_insert_item_db (db, item, NULL); } } @@ -203,7 +203,8 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, void midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item) + KatzeItem* item, + gchar* folder) { gchar* sqlcmd; char* errmsg = NULL; @@ -215,7 +216,9 @@ midori_bookmarks_insert_item_db (sqlite3* db, else type = 0; - if (katze_item_get_name (katze_item_get_parent (item))) + if (folder) + parent = g_strdup (folder); + else if (katze_item_get_name (katze_item_get_parent (item))) parent = g_strdup (katze_item_get_name (katze_item_get_parent (item))); else parent = g_strdup (""); @@ -238,22 +241,17 @@ midori_bookmarks_insert_item_db (sqlite3* db, sqlite3_free (sqlcmd); } -static void -midori_bookmarks_remove_item_from_db (MidoriBookmarks* bookmarks, - KatzeItem* item) +void +midori_bookmarks_remove_item_from_db (sqlite3* db, + KatzeItem* item) { gchar* sqlcmd; - sqlite3* db; char* errmsg = NULL; - db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - if (katze_item_get_uri (item)) sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE uri = '%q' AND" - " title = '%q'", - katze_item_get_uri (item), - katze_item_get_name (item)); + "DELETE FROM bookmarks WHERE uri = '%q'", + katze_item_get_uri (item)); else sqlcmd = sqlite3_mprintf ( "DELETE FROM bookmarks WHERE folder = '%q'", katze_item_get_name (item)); @@ -264,7 +262,6 @@ midori_bookmarks_remove_item_from_db (MidoriBookmarks* bookmarks, sqlite3_free (errmsg); } - g_debug ("%s", sqlcmd); sqlite3_free (sqlcmd); } #endif @@ -292,13 +289,12 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, &iter, 0, &item, -1); - is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); + is_separator = item && !katze_item_get_uri (item); if (!is_separator) { MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } - g_object_unref (item); } } @@ -309,6 +305,11 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, { GtkTreeModel* model; GtkTreeIter iter; + #if HAVE_SQLITE + sqlite3* db; + + db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + #endif if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), &model, &iter)) @@ -318,7 +319,7 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, &iter, 0, &item, -1); #if HAVE_SQLITE - midori_bookmarks_remove_item_from_db (bookmarks, item); + midori_bookmarks_remove_item_from_db (db, item); #endif gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); @@ -705,10 +706,14 @@ midori_bookmarks_delete_activate_cb (GtkWidget* menuitem, MidoriBookmarks* bookmarks) { KatzeItem* item; + #if HAVE_SQLITE + sqlite3* db; + #endif item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); #if HAVE_SQLITE - midori_bookmarks_remove_item_from_db (bookmarks, item); + db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + midori_bookmarks_remove_item_from_db (db, item); #endif /* FIXME: Refresh menu */ } diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h index 8beff86c..f5e33a7d 100644 --- a/panels/midori-bookmarks.h +++ b/panels/midori-bookmarks.h @@ -48,7 +48,13 @@ midori_bookmarks_new (void); #if HAVE_SQLITE void midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item); + KatzeItem* item, + gchar* folder); + +void +midori_bookmarks_remove_item_from_db (sqlite3* db, + KatzeItem* item); + void midori_bookmarks_import_array_db (KatzeArray* array, sqlite3* db); From 954939fdd153c87360117cb772d706d9e5f1e762 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sun, 13 Jun 2010 17:28:22 -0400 Subject: [PATCH 2697/2970] Use extra attributes of a bookmark --- midori/main.c | 3 ++- midori/midori-browser.c | 1 + panels/midori-bookmarks.c | 30 +++++++++++++++++++++++++----- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index 388c9d5f..ab7de931 100644 --- a/midori/main.c +++ b/midori/main.c @@ -447,7 +447,8 @@ midori_bookmarks_initialize (KatzeArray* array, if (sqlite3_exec (db, "CREATE TABLE IF NOT EXISTS " - "bookmarks (uri text, title text, folder text, type integer);", + "bookmarks (uri text, title text, folder text, type integer, " + "desc text, app integer, toolbar integer);", NULL, NULL, errmsg) != SQLITE_OK) return NULL; return db; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 67f6ee53..2628cf5a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -912,6 +912,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_title))); katze_item_set_text (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_desc))); + /* FIXME: Toolbar is not working?? */ katze_item_set_meta_integer (bookmark, "toolbar", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)) ? 1 : -1); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index b98b4ed9..68731d65 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -151,7 +151,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - sqlcmd = "SELECT uri, title, type from bookmarks where folder = ?" + sqlcmd = "SELECT uri, title, type, app, toolbar from bookmarks where folder = ?" " ORDER BY type DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); @@ -162,6 +162,8 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, while ((result = sqlite3_step (statement)) == SQLITE_ROW) { gint type; + gint app; + gint toolbar; KatzeItem* item; const unsigned char* uri; const unsigned char* title; @@ -169,9 +171,18 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, uri = sqlite3_column_text (statement, 0); title = sqlite3_column_text (statement, 1); type = sqlite3_column_int64 (statement, 2); + app = sqlite3_column_int64 (statement, 3); + toolbar = sqlite3_column_int64 (statement, 4); + + + if (app == 0) + app = -1; + if (toolbar == 0) + toolbar = -1; item = katze_item_new (); katze_item_set_name (item, (gchar*)title); + katze_item_set_meta_integer (item, "toolbar", toolbar); /* type 0 -- folder, 1 -- entry */ if (type == 0) @@ -188,6 +199,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, continue; katze_item_set_uri (item, (gchar*)uri); + katze_item_set_meta_integer (item, "app", app); gtk_tree_store_insert_with_values (model, NULL, parent, 0, 0, item, -1); } @@ -223,17 +235,25 @@ midori_bookmarks_insert_item_db (sqlite3* db, else parent = g_strdup (""); + if (katze_item_get_meta_integer (item, "toolbar") == -1) + katze_item_set_meta_integer (item, "toolbar", 0); + + if (katze_item_get_meta_integer (item, "app") == -1) + katze_item_set_meta_integer (item, "app", 0); + sqlcmd = sqlite3_mprintf ( - "INSERT into bookmarks (uri, title, folder, type) values" - " ('%q', '%q', '%q', %u)", + "INSERT into bookmarks (uri, title, folder, type, toolbar, app) values" + " ('%q', '%q', '%q', %u, %u, %u)", katze_item_get_uri (item), katze_item_get_name (item), parent, - type); + type, + katze_item_get_meta_integer (item, "toolbar"), + katze_item_get_meta_integer (item, "app")); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { - g_printerr (_("Failed to remove history item: %s\n"), errmsg); + g_printerr (_("Failed to add bookmark item: %s\n"), errmsg); sqlite3_free (errmsg); } From 0b99bbdd4e6b297265264d09d50be792f36f3696 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sun, 13 Jun 2010 17:31:12 -0400 Subject: [PATCH 2698/2970] Add outstanding bookmark issues to TODO file --- TODO | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/TODO b/TODO index 2311184c..67a6603f 100644 --- a/TODO +++ b/TODO @@ -91,3 +91,11 @@ TODO: . Draw rectangle with the mouse, x/y/x2/y2 in the statusbar (extension) . Shared bookmarks and config . Prevent dead tabs: download, aborted page + +BOOKMARK ISSUES: + . Show on toolbar is not working + . Refresh of sidebar is not done + . Bookmark menu is not populated + . Bookmark toolbar is broken + . Import is broken + . Integration with locationbar search From 09d9615964ee2536d994f949279b87a371a57564 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Mon, 14 Jun 2010 02:39:42 -0400 Subject: [PATCH 2699/2970] Refresh bookmark sidebar on new items --- TODO | 3 ++- midori/midori-browser.c | 10 ++++++++++ panels/midori-bookmarks.c | 19 +++++++++++++------ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 67a6603f..212bae12 100644 --- a/TODO +++ b/TODO @@ -94,8 +94,9 @@ TODO: BOOKMARK ISSUES: . Show on toolbar is not working - . Refresh of sidebar is not done . Bookmark menu is not populated . Bookmark toolbar is broken . Import is broken . Integration with locationbar search + . Can't remove folder + . Can't select folder while adding new bookmark diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2628cf5a..7d73626b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -935,7 +935,17 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, #if HAVE_SQLITE midori_bookmarks_remove_item_from_db (db, bookmark); if (!strcmp (selected, _("Toplevel folder"))) + { + GtkTreeView* treeview; + GtkTreeModel* model; + midori_bookmarks_insert_item_db (db, bookmark, ""); + treeview = g_object_get_data (G_OBJECT (browser->bookmarks), "treeview"); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + /* FIXME: We need to add item in the end of the list */ + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), + NULL, NULL, 999, 0, bookmark, -1); + } else midori_bookmarks_insert_item_db (db, bookmark, selected); #endif diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 68731d65..8c9c71ff 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -474,6 +474,7 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); + g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); #if HAVE_SQLITE midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); @@ -729,13 +730,19 @@ midori_bookmarks_delete_activate_cb (GtkWidget* menuitem, #if HAVE_SQLITE sqlite3* db; #endif + GtkTreeModel* model; + GtkTreeIter iter; - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - #if HAVE_SQLITE - db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - midori_bookmarks_remove_item_from_db (db, item); - #endif - /* FIXME: Refresh menu */ + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), + &model, &iter)) + { + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + #if HAVE_SQLITE + db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + midori_bookmarks_remove_item_from_db (db, item); + #endif + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + } } static void From f55377e7f3f0068144c1e9707c37184122facacb Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Mon, 14 Jun 2010 03:00:05 -0400 Subject: [PATCH 2700/2970] Fix selecting a directory while adding a new bookmark Allow folders to be removed --- TODO | 3 +-- midori/midori-browser.c | 35 ++++++++++++++++++++++------------- panels/midori-bookmarks.c | 4 +++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/TODO b/TODO index 212bae12..6d51e175 100644 --- a/TODO +++ b/TODO @@ -98,5 +98,4 @@ BOOKMARK ISSUES: . Bookmark toolbar is broken . Import is broken . Integration with locationbar search - . Can't remove folder - . Can't select folder while adding new bookmark + . Remove separator from submenu before showing it diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7d73626b..b3d8bce7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -720,10 +720,17 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* combo_folder; GtkWidget* check_toolbar; GtkWidget* check_app; + #if HAVE_SQLITE + sqlite3* db; + #endif if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) return; + #if HAVE_SQLITE + db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); + #endif + if (is_folder) title = new_bookmark ? _("New folder") : _("Edit folder"); else @@ -815,8 +822,12 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { GtkListStore* model; GtkCellRenderer* renderer; - KatzeItem* item; + #if HAVE_SQLITE guint i, n; + sqlite3_stmt* statement; + gint result; + const gchar* sqlcmd; + #endif hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); @@ -833,22 +844,25 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, 0, _("Toplevel folder"), 1, PANGO_ELLIPSIZE_END, -1); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); + #if HAVE_SQLITE i = 0; n = 1; - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) + sqlcmd = "SELECT title from bookmarks where type=0"; + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); + while ((result = sqlite3_step (statement)) == SQLITE_ROW) { - if (KATZE_IS_ARRAY (item) && item != bookmark) - { - const gchar* name = katze_item_get_name (item); + const unsigned char* name = sqlite3_column_text (statement, 0); gtk_list_store_insert_with_values (model, NULL, G_MAXINT, 0, name, 1, PANGO_ELLIPSIZE_END, -1); - if (katze_item_get_parent (bookmark) == item) - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n); + /* FIXME: Not working */ + /*if (katze_item_get_parent (bookmark) == item) + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n);*/ n++; - } } if (n < 2) gtk_widget_set_sensitive (combo_folder, FALSE); + #endif + gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); @@ -902,11 +916,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { gchar* selected; KatzeArray* folder; - #if HAVE_SQLITE - sqlite3* db; - - db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); - #endif katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 8c9c71ff..598e94b2 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -274,7 +274,9 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, katze_item_get_uri (item)); else sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE folder = '%q'", katze_item_get_name (item)); + "DELETE FROM bookmarks WHERE folder = '%q' OR title = '%q'", + katze_item_get_name (item), + katze_item_get_name (item)); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { From 6d3672a433fd7c19a4075dec656f447a7db3019f Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 16 Jun 2010 17:16:25 -0400 Subject: [PATCH 2701/2970] Initial support of DND in bookmarks --- panels/midori-bookmarks.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 598e94b2..dcd84c38 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -288,6 +288,33 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, } #endif +static void +midori_bookmarks_row_changed_cb (GtkTreeModel* model, + GtkTreePath* path, + GtkTreeIter* iter, + MidoriBookmarks* bookmarks) +{ + KatzeItem* parent_item; + KatzeItem* item; + GtkTreeIter parent; + sqlite3* db; + gchar* parent_name; + + db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (gtk_tree_model_iter_parent (model, &parent, iter)) + { + gtk_tree_model_get (model, &parent , 0, &parent_item, -1); + parent_name = g_strdup (katze_item_get_name (parent_item)); + } + else + parent_name = g_strdup (""); + + midori_bookmarks_remove_item_from_db (db, item); + midori_bookmarks_insert_item_db (db, item, parent_name); +} + static void midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) { @@ -480,6 +507,9 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, #if HAVE_SQLITE midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); + g_signal_connect_after (model, "row-changed", + G_CALLBACK (midori_bookmarks_row_changed_cb), + bookmarks); #endif } @@ -925,6 +955,7 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) (GtkTreeCellDataFunc)midori_bookmarks_treeview_render_text_cb, treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), TRUE); g_object_unref (model); g_object_connect (treeview, "signal::row-activated", From 9f904b93d708e95dcfbb3c79386a80d0ef4d9d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Thu, 17 Jun 2010 09:52:49 +0200 Subject: [PATCH 2702/2970] l10n: Updated Czech (cs) translation to 100% New status: 630 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 548 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 275 insertions(+), 273 deletions(-) diff --git a/po/cs.po b/po/cs.po index 08ab2154..5529aefb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 04:08+0000\n" +"POT-Creation-Date: 2010-06-17 04:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -47,7 +47,7 @@ msgstr "Hodnota '%s' je pro %s špatná" msgid "Invalid configuration value '%s'" msgstr "Nesprávná hodnota '%s' v konfiguraci" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Nepodařilo se otevřít databázi: %s\n" @@ -58,172 +58,172 @@ msgstr "Nepodařilo se otevřít databázi: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Nepodařilo se odstranit staré položky historie: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Konfigurace nemůže být uložena. %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Vyhledávací nástroj nemůže být uložen. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky nemohou být uloženy. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Konfigurace nemůže být uložena. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Vyhledávací nástroj nemůže být uložen. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Seznam zavřených karet nemůže být uložen. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sezení nemůže být uloženo. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nemohou být ověřovány." -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává opakovaně, pro odstranění problému zkuste následující možnosti." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Vymazat poslední _sezení" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Nebyl zadán název souboru" -#: ../midori/main.c:1372 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1403 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímek uložen do %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Spustit ADRESA jako webovou aplikaci" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Použít SLOŽKA jako místo pro uložení konfigurace" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "SLOŽKA" -#: ../midori/main.c:1581 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/main.c:1583 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1589 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Spustit vybraný příkaz" -#: ../midori/main.c:1591 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1593 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokovat adresy (URI) pomocí regulárního výrazu REGVÝRAZ" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity" -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "VTEŘINY" -#: ../midori/main.c:1680 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Zkontrolujte, zda není nová verze na " -#: ../midori/main.c:1807 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1855 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:2015 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignorovat" @@ -240,804 +240,804 @@ msgstr "Nesprávný formát dokumentu." msgid "Unrecognized bookmark format." msgstr "Neznámý formát záložek." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5603 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5600 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:735 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:735 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:737 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:737 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:768 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:800 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4753 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:946 +#: ../midori/midori-browser.c:4758 ../midori/midori-browser.c:4790 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:878 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:891 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:906 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:1000 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:1004 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1061 ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4840 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1435 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s z %s" -#: ../midori/midori-browser.c:1454 +#: ../midori/midori-browser.c:1471 #, c-format msgid "The file '%s' has been downloaded." msgstr "Soubor %s byl stažen." -#: ../midori/midori-browser.c:1458 +#: ../midori/midori-browser.c:1475 msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1615 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#: ../midori/midori-browser.c:1932 ../midori/midori-browser.c:1934 msgid "Some files are being downloaded" msgstr "Ještě se stahují nějaké soubory." -#: ../midori/midori-browser.c:1921 +#: ../midori/midori-browser.c:1938 msgid "_Quit Midori" msgstr "U_končit Midori" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1940 msgid "The transfers will be cancelled if Midori quits." msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2401 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2479 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2485 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2528 ../midori/midori-browser.c:5662 +#: ../panels/midori-bookmarks.c:434 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:3101 ../panels/midori-bookmarks.c:209 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3181 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3799 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:4113 ../midori/midori-browser.c:6056 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4446 ../panels/midori-bookmarks.c:792 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4453 ../panels/midori-bookmarks.c:798 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4456 ../panels/midori-bookmarks.c:800 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4679 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4680 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4681 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4682 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4683 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4704 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4707 ../midori/midori-browser.c:5667 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4718 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4745 ../midori/midori-browser.c:5771 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4819 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4855 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4909 ../panels/midori-bookmarks.c:283 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5016 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5020 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5034 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5045 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5051 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5056 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:5061 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5066 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5071 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5079 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5180 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5182 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:5201 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5510 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5512 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5513 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5516 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5518 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5519 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5523 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5526 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5528 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5529 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5531 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5532 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5534 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5535 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5540 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5541 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5543 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5544 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5547 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5550 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5552 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5556 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5559 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5563 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5566 ../midori/midori-browser.c:5569 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5572 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5575 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5578 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5581 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5583 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5584 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5586 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5587 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5591 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5593 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5594 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5606 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5609 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5612 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5613 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5615 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5616 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5619 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5622 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5623 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5625 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5626 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5628 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5629 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5631 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5632 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5635 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5638 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5641 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5645 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5649 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5652 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5654 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5655 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5657 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5658 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5664 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5665 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5670 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5673 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5674 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5677 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5678 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5682 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5683 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5688 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5689 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5691 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5692 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5694 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5695 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5697 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5698 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5700 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5702 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5703 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5705 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5706 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5708 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5709 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5712 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5720 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5721 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5724 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5725 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5728 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5729 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5732 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5733 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5736 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5737 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5740 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5741 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5749 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5752 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5756 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5759 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5762 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5765 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5768 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6314 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6321 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6323 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6347 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6349 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6370 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6385 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6387 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6402 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6404 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6419 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6432 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6434 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6448 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6450 msgid "Menu" msgstr "Nabídka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 +#: ../midori/midori-browser.c:6657 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:6671 +#: ../midori/midori-browser.c:6688 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:6676 +#: ../midori/midori-browser.c:6693 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:6681 +#: ../midori/midori-browser.c:6698 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:6690 +#: ../midori/midori-browser.c:6707 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:6702 +#: ../midori/midori-browser.c:6719 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6765 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Smazat vše" -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:7121 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -1909,15 +1909,15 @@ msgstr "_Schovat titulek" msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4797 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4798 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Rozšíření" @@ -2093,67 +2093,72 @@ msgstr "Upravit vyhledávací nástroje" msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Záložky" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Přidat záložku" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Rozšíření" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Historie" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Uživatelské skripty" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Přenosy" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Netscape p_luginy" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Nová _složka" -#: ../panels/midori-bookmarks.c:111 +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Záložku se nepodařilo přidat: %s\n" + +#: ../panels/midori-bookmarks.c:442 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:450 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:597 msgid "Separator" msgstr "Oddělovač" @@ -2691,9 +2696,6 @@ msgstr "Kešuje (ukládá) HTTP komunikaci na disk" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Nepodařilo se zjistit aktuální čas: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Nepodařilo se přidat položku do historie: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Zobrazit _titulky nástrojů" From 0fdef5d825f6426ab3527c4abfa25585c4c0a0d8 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Thu, 17 Jun 2010 15:09:55 +0200 Subject: [PATCH 2703/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 630 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 548 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 275 insertions(+), 273 deletions(-) diff --git a/po/uk.po b/po/uk.po index 0e7079b4..0453df13 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 10:12+0000\n" +"POT-Creation-Date: 2010-06-17 10:08+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легкий переглядач Веб" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Мідорі" @@ -46,7 +46,7 @@ msgstr "Значення '%s' є неправильним для %s" msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Не вдалось відкрити базу даних: %s\n" @@ -57,172 +57,172 @@ msgstr "Не вдалось відкрити базу даних: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Невдача видалення старих об'єктів історії: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Неможливо зберегти конфігурацію. %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Неможливо зберегти пошукові машини. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Неможливо зберегти закладки. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Неможливо зберегти конфігурацію. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Неможливо зберегти пошукові машини. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити. " -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Змінити _налаштування" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Скинути останню _сесію" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Не вказано назви файлу" -#: ../midori/main.c:1372 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Отримано невідому помилку." -#: ../midori/main.c:1403 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Знімок екрану збережено до: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Запустити АДРЕСУ як веб-додаток" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Використайте ТЕКУ як теку конфігурації" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "ТЕКА" -#: ../midori/main.c:1581 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Показати діалог діагностики" -#: ../midori/main.c:1583 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Виконати визначений файл як джава-скрипт" -#: ../midori/main.c:1586 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Зробити знімок вибраної сторінки/адреси" -#: ../midori/main.c:1589 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Виконати вибрану комнаду" -#: ../midori/main.c:1591 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1593 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокувати URI згідно з регулярним виразом PATTERN" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Зресетувати Midori після СЕКУНД неактивності" -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1680 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Це невластива тека конфігурації." -#: ../midori/main.c:1855 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Один із екземплярів програми Midori вже працює, але не відповідає на запити.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Неможливо завантажити пошукову машину. %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:2015 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ігнорувати" @@ -239,135 +239,134 @@ msgstr "Неправильний документ." msgid "Unrecognized bookmark format." msgstr "Нерозпізнаний формат закладки." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5603 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5600 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:735 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:735 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:737 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:737 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:768 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:800 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4753 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:946 +#: ../midori/midori-browser.c:4758 ../midori/midori-browser.c:4790 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:878 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:891 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:906 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:1000 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:1004 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1061 ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4840 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 +#: ../midori/midori-browser.c:1435 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s з %s" -#: ../midori/midori-browser.c:1454 +#: ../midori/midori-browser.c:1471 #, c-format msgid "The file '%s' has been downloaded." msgstr "Файл '%s' завантажено." -#: ../midori/midori-browser.c:1458 +#: ../midori/midori-browser.c:1475 msgid "Transfer completed" msgstr "Передачу завершено" -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1615 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 +#: ../midori/midori-browser.c:1932 ../midori/midori-browser.c:1934 msgid "Some files are being downloaded" msgstr "Деякі файли завантажено." -#: ../midori/midori-browser.c:1921 +#: ../midori/midori-browser.c:1938 msgid "_Quit Midori" msgstr "_Вийти з Мідорі" -#: ../midori/midori-browser.c:1923 +#: ../midori/midori-browser.c:1940 msgid "The transfers will be cancelled if Midori quits." msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2401 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2479 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -375,670 +374,671 @@ msgstr "" "Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" "Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2485 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2528 ../midori/midori-browser.c:5662 +#: ../panels/midori-bookmarks.c:434 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:3101 ../panels/midori-bookmarks.c:209 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не вдалось виконати запит бази даних: %s\n" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:3181 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3799 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:4113 ../midori/midori-browser.c:6056 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4446 ../panels/midori-bookmarks.c:792 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4453 ../panels/midori-bookmarks.c:798 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4456 ../panels/midori-bookmarks.c:800 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4679 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4680 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4681 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4682 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4683 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4704 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4707 ../midori/midori-browser.c:5667 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4718 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4745 ../midori/midori-browser.c:5771 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4819 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4855 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4909 ../panels/midori-bookmarks.c:283 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5016 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5020 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5034 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:5045 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5051 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5056 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:5061 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:5066 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:5071 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5079 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5180 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5182 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:5201 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5510 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5512 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5513 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5516 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5518 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5519 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5523 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5526 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5528 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5529 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5531 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5532 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5534 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5535 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5540 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5541 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5543 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5544 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5547 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5550 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5552 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5556 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5559 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5563 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5566 ../midori/midori-browser.c:5569 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5572 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5575 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5578 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5581 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5583 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5584 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5586 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5587 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5591 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5593 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5594 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5606 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5609 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5612 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5613 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5615 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5616 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5619 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5622 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5623 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5625 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5626 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5628 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5629 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5631 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5632 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5635 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5638 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5641 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5645 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5649 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5652 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5654 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5655 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5657 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5658 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5664 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5665 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5670 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5673 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5674 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5677 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5678 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5682 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5683 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5688 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5689 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5691 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5692 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5694 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5695 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5697 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5698 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5700 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5702 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5703 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5705 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5706 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5708 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5709 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5712 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5720 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5721 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5724 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5725 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5728 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5729 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5732 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5733 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5736 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5737 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5740 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5741 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5749 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5752 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5756 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5759 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5762 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5765 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5768 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6314 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6321 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6323 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6347 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6349 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6370 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6385 msgid "_Recently visited pages" msgstr "_Останньо відвідані сторінки" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6387 msgid "Reopen pages that you visited earlier" msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6402 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6404 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6419 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6432 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6434 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6448 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6450 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 +#: ../midori/midori-browser.c:6657 msgid "_Inline Find:" msgstr "Знайти _входження:" -#: ../midori/midori-browser.c:6671 +#: ../midori/midori-browser.c:6688 msgid "Previous" msgstr "Попереднє" -#: ../midori/midori-browser.c:6676 +#: ../midori/midori-browser.c:6693 msgid "Next" msgstr "Наступне" -#: ../midori/midori-browser.c:6681 +#: ../midori/midori-browser.c:6698 msgid "Match Case" msgstr "Врахувати регістр" -#: ../midori/midori-browser.c:6690 +#: ../midori/midori-browser.c:6707 msgid "Highlight Matches" msgstr "Підсвітити збіги" -#: ../midori/midori-browser.c:6702 +#: ../midori/midori-browser.c:6719 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 +#: ../midori/midori-browser.c:6765 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Очистити все" -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:7121 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -1910,15 +1910,15 @@ msgstr "_Мінімізувати вкладку" msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4797 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4798 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Опції" @@ -2094,67 +2094,72 @@ msgstr "Налаштувати пошукові машини" msgid "Use as _default" msgstr "Використовувати по _замовчуванню" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Додати закладку" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Розширення" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Історія" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "Д_омашня сторінка" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Скрипти користувача" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Нова _вкладка" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Завантаження" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Роз_ширення Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Нова _тека" -#: ../panels/midori-bookmarks.c:111 +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Не вдалося дадати закладку: %s\n" + +#: ../panels/midori-bookmarks.c:442 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:450 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:597 msgid "Separator" msgstr "Роздільник" @@ -2696,9 +2701,6 @@ msgstr "Кешувати комунікацію HTTP на диск" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Не вдалось отримати поточний час: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Невдача при додаванні об'єкту історії: %s\n" - #~ msgid "Not available on this platform" #~ msgstr "Недоступно для цієї платформи" From fa08c4d1f9056eb2eae6321f228e62aa0dea758d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 17 Jun 2010 20:03:11 +0200 Subject: [PATCH 2704/2970] Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler. --- midori/midori-browser.c | 245 ++-------------------------- midori/wscript_build | 4 +- po/POTFILES.in | 1 + toolbars/midori-transferbar.c | 297 ++++++++++++++++++++++++++++++++++ toolbars/midori-transferbar.h | 40 +++++ 5 files changed, 356 insertions(+), 231 deletions(-) create mode 100644 toolbars/midori-transferbar.c create mode 100644 toolbars/midori-transferbar.h diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b3d8bce7..21708791 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -24,6 +24,7 @@ #include "midori-locationaction.h" #include "midori-searchaction.h" #include "midori-stock.h" +#include "midori-transferbar.h" #include "gtkiconentry.h" #include "marshal.h" @@ -86,7 +87,6 @@ struct _MidoriBrowser GtkWidget* statusbar; GtkWidget* statusbar_contents; GtkWidget* transferbar; - GtkWidget* transferbar_clear; GtkWidget* progressbar; gchar* statusbar_text; @@ -207,12 +207,6 @@ static void midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks); -#if WEBKIT_CHECK_VERSION (1, 1, 3) -static void -midori_browser_add_download_item (MidoriBrowser* browser, - WebKitDownload* download); -#endif - GdkPixbuf* midori_search_action_get_icon (KatzeItem* item, GtkWidget* widget, @@ -230,6 +224,15 @@ _action_menus_activate_item_alt (GtkAction* action, static void midori_browser_add_speed_dial (MidoriBrowser* browser); +gboolean +midori_transferbar_confirm_delete (MidoriTransferbar* transferbar); + +#if WEBKIT_CHECK_VERSION (1, 1, 3) +void +midori_transferbar_add_download_item (MidoriTransferbar* transferbar, + WebKitDownload* download); +#endif + #define _action_by_name(brwsr, nme) \ gtk_action_group_get_action (brwsr->action_group, nme) #define _action_set_sensitive(brwsr, nme, snstv) \ @@ -1013,7 +1016,7 @@ midori_browser_prepare_download (MidoriBrowser* browser, } webkit_download_set_destination_uri (download, uri); - midori_browser_add_download_item (browser, download); + midori_transferbar_add_download_item (MIDORI_TRANSFERBAR (browser->transferbar), download); return TRUE; } #else @@ -1417,167 +1420,6 @@ midori_view_new_view_cb (GtkWidget* view, } #if WEBKIT_CHECK_VERSION (1, 1, 3) -static void -midori_browser_download_notify_progress_cb (WebKitDownload* download, - GParamSpec* pspec, - GtkWidget* progress) -{ - gchar* current; - gchar* total; - gchar* size_text; - gchar* text; - - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), - webkit_download_get_progress (download)); - - current = g_format_size_for_display (webkit_download_get_current_size (download)); - total = g_format_size_for_display (webkit_download_get_total_size (download)); - size_text = g_strdup_printf (_("%s of %s"), current, total); - g_free (current); - g_free (total); - text = g_strdup_printf ("%s (%s)", - gtk_progress_bar_get_text (GTK_PROGRESS_BAR (progress)), - size_text); - gtk_widget_set_tooltip_text (progress, text); -} - -static void -midori_browser_download_notify_status_cb (WebKitDownload* download, - GParamSpec* pspec, - GtkWidget* button) -{ - GtkWidget* icon; - - switch (webkit_download_get_status (download)) - { - case WEBKIT_DOWNLOAD_STATUS_FINISHED: - { - MidoriBrowser* browser = midori_browser_get_for_widget (button); - - icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (button), icon); - if (g_object_get_data (G_OBJECT (download), "open-download")) - gtk_button_clicked (GTK_BUTTON (button)); - else - g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), - "done", (void*)1); - - if (katze_object_get_boolean (browser->settings, "notify-transfer-completed")) - { - const gchar* uri = webkit_download_get_destination_uri (download); - gchar* path = soup_uri_decode (uri); - gchar* filename = g_strrstr (path, "/") + 1; - gchar* msg = g_strdup_printf ( - _("The file '%s' has been downloaded."), filename); - g_free (path); - - g_signal_emit (browser, signals[SEND_NOTIFICATION], 0, - _("Transfer completed"), msg); - - g_free (msg); - } - break; - } - case WEBKIT_DOWNLOAD_STATUS_CANCELLED: - case WEBKIT_DOWNLOAD_STATUS_ERROR: - icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (button), icon); - g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), - "done", (void*)1); - break; - default: - break; - } -} - -static void -midori_browser_download_button_clicked_cb (GtkWidget* button, - WebKitDownload* download) -{ - MidoriBrowser* browser; - GList* buttons; - - browser = midori_browser_get_for_widget (button); - - switch (webkit_download_get_status (download)) - { - case WEBKIT_DOWNLOAD_STATUS_STARTED: - webkit_download_cancel (download); - g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), - "done", (void*)1); - break; - case WEBKIT_DOWNLOAD_STATUS_FINISHED: - { - const gchar* uri = webkit_download_get_destination_uri (download); - if (sokoke_show_uri (gtk_widget_get_screen (button), - uri, gtk_get_current_event_time (), NULL)) - gtk_widget_destroy (gtk_widget_get_parent (button)); - break; - } - case WEBKIT_DOWNLOAD_STATUS_CANCELLED: - gtk_widget_destroy (gtk_widget_get_parent (button)); - default: - break; - } - - buttons = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); - if (g_list_length (buttons) == 1) - gtk_widget_hide (browser->transferbar_clear); - g_list_free (buttons); -} - -static void -midori_browser_add_download_item (MidoriBrowser* browser, - WebKitDownload* download) -{ - GtkWidget* box; - GtkWidget* icon; - GtkWidget* button; - GtkWidget* progress; - const gchar* uri; - gint width; - - box = gtk_hbox_new (FALSE, 0); - /* icon = gtk_image_new_from_stock (STOCK_TRANSFER, GTK_ICON_SIZE_MENU); - gtk_box_pack_start (GTK_BOX (box), icon, FALSE, FALSE, 0); */ - progress = gtk_progress_bar_new (); - gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), - PANGO_ELLIPSIZE_MIDDLE); - if ((uri = webkit_download_get_destination_uri (download))) - { - gchar* path = soup_uri_decode (uri); - gchar* filename = g_strrstr (path, "/") + 1; - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename); - g_free (path); - } - else - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), - webkit_download_get_suggested_filename (download)); - sokoke_widget_get_text_size (progress, "M", &width, NULL); - gtk_widget_set_size_request (progress, width * 10, -1); - /* Avoid a bug in WebKit */ - if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), - webkit_download_get_progress (download)); - gtk_box_pack_start (GTK_BOX (box), progress, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU); - button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); - gtk_container_add (GTK_CONTAINER (button), icon); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); - gtk_widget_show_all (box); - gtk_box_pack_start (GTK_BOX (browser->transferbar), box, FALSE, FALSE, 0); - gtk_widget_show (browser->transferbar_clear); - - g_signal_connect (download, "notify::progress", - G_CALLBACK (midori_browser_download_notify_progress_cb), progress); - g_signal_connect (download, "notify::status", - G_CALLBACK (midori_browser_download_notify_status_cb), button); - g_signal_connect (button, "clicked", - G_CALLBACK (midori_browser_download_button_clicked_cb), download); -} - static void midori_view_download_save_as_response_cb (GtkWidget* dialog, @@ -1675,26 +1517,6 @@ midori_view_download_requested_cb (GtkWidget* view, } #endif -static void -midori_browser_transferbar_clear_clicked_cb (GtkWidget* button, - MidoriBrowser* browser) -{ - GList* buttons; - guint i; - GtkWidget* item; - - buttons = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); - i = 0; - while ((item = g_list_nth_data (buttons, i++))) - if (g_object_get_data (G_OBJECT (item), "done")) - gtk_widget_destroy (item); - g_list_free (buttons); - buttons = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); - if (g_list_length (buttons) == 1) - gtk_widget_hide (browser->transferbar_clear); - g_list_free (buttons); -} - static void midori_view_search_text_cb (GtkWidget* view, gboolean found, @@ -1919,35 +1741,7 @@ midori_browser_delete_event (GtkWidget* widget, GdkEventAny* event) { MidoriBrowser* browser = MIDORI_BROWSER (widget); - GList* children; - GtkWidget* dialog = NULL; - gboolean cancel = FALSE; - - children = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); - if (g_list_length (children) > 1) - { - dialog = gtk_message_dialog_new (GTK_WINDOW (widget), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("Some files are being downloaded")); - gtk_window_set_title (GTK_WINDOW (dialog), - _("Some files are being downloaded")); - gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("_Quit Midori"), GTK_RESPONSE_ACCEPT); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("The transfers will be cancelled if Midori quits.")); - } - g_list_free (children); - if (dialog != NULL) - { - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL) - cancel = TRUE; - gtk_widget_destroy (dialog); - } - - return cancel; + return midori_transferbar_confirm_delete (MIDORI_TRANSFERBAR (browser->transferbar)); } static void @@ -6243,7 +6037,6 @@ midori_browser_init (MidoriBrowser* browser) GtkRcStyle* rcstyle; GtkWidget* label; GtkWidget* scrolled; - GtkWidget* icon; browser->settings = midori_web_settings_new (); browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY); @@ -6758,17 +6551,11 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), browser->progressbar, FALSE, FALSE, 3); - browser->transferbar = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), - browser->transferbar, FALSE, FALSE, 3); + browser->transferbar = g_object_new (MIDORI_TYPE_TRANSFERBAR, NULL); + gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), browser->transferbar, FALSE, FALSE, 3); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->transferbar), FALSE); gtk_widget_show (browser->transferbar); - browser->transferbar_clear = gtk_button_new_with_label (_("Clear All")); - icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (browser->transferbar_clear), icon); - g_signal_connect (browser->transferbar_clear, "clicked", - G_CALLBACK (midori_browser_transferbar_clear_clicked_cb), browser); - gtk_box_pack_end (GTK_BOX (browser->transferbar), browser->transferbar_clear, - FALSE, FALSE, 0); + g_signal_connect (browser->statusbar, "button-press-event", G_CALLBACK (midori_browser_menu_button_press_event_cb), browser); diff --git a/midori/wscript_build b/midori/wscript_build index bb76c6f0..27de582b 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -11,8 +11,8 @@ libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \ if progressive or Options.commands['check']: obj = bld.new_task_gen ('cc', 'staticlib') obj.target = 'midori-core' - obj.includes = '.. ../katze .' - obj.find_sources_in_dirs ('../katze . ../panels', excludes=['main.c']) + obj.includes = '.. ../katze . ../toolbars' + obj.find_sources_in_dirs ('../katze . ../panels ../toolbars', excludes=['main.c']) obj.uselib = libs obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal') obj.install_path = None diff --git a/po/POTFILES.in b/po/POTFILES.in index faa2a58d..3c47d866 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,6 +12,7 @@ midori/midori-view.c midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c +toolbars/midori-transferbar.c panels/midori-bookmarks.c panels/midori-console.c panels/midori-extensions.c diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c new file mode 100644 index 00000000..3309e892 --- /dev/null +++ b/toolbars/midori-transferbar.c @@ -0,0 +1,297 @@ +/* + Copyright (C) 2010 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-transferbar.h" + +#include "midori-browser.h" +#include "sokoke.h" + +#include + +struct _MidoriTransferbar +{ + GtkToolbar parent_instance; + + GList* infos; + GtkToolItem* clear; +}; + +struct _MidoriTransferbarClass +{ + GtkToolbarClass parent_class; +}; + +G_DEFINE_TYPE (MidoriTransferbar, midori_transferbar, GTK_TYPE_TOOLBAR); + +static void +midori_transferbar_class_init (MidoriTransferbarClass* class) +{ + /* Nothing to do */ +} + +#if WEBKIT_CHECK_VERSION (1, 1, 3) +typedef struct +{ + WebKitDownload* download; + GtkWidget* button; + GtkWidget* toolitem; + MidoriTransferbar* transferbar; +} TransferInfo; + +static gboolean +midori_transferbar_info_free (gpointer data) +{ + TransferInfo* info = data; + MidoriTransferbar* transferbar = info->transferbar; + + transferbar->infos = g_list_remove (transferbar->infos, info); + g_object_unref (info->download); + gtk_widget_destroy (info->toolitem); + g_free (info); + + if (!transferbar->infos || !g_list_nth_data (transferbar->infos, 0)) + gtk_widget_hide (GTK_WIDGET (transferbar->clear)); + + return FALSE; +} + +static void +midori_transferbar_button_destroy_cb (GtkWidget* button, + TransferInfo* info) +{ + g_idle_add (midori_transferbar_info_free, info); +} + +static void +midori_transferbar_download_notify_progress_cb (WebKitDownload* download, + GParamSpec* pspec, + GtkWidget* progress) +{ + gchar* current; + gchar* total; + gchar* size_text; + gchar* text; + + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + webkit_download_get_progress (download)); + + current = g_format_size_for_display (webkit_download_get_current_size (download)); + total = g_format_size_for_display (webkit_download_get_total_size (download)); + size_text = g_strdup_printf (_("%s of %s"), current, total); + g_free (current); + g_free (total); + text = g_strdup_printf ("%s (%s)", + gtk_progress_bar_get_text (GTK_PROGRESS_BAR (progress)), + size_text); + gtk_widget_set_tooltip_text (progress, text); +} + +static void +midori_transferbar_download_notify_status_cb (WebKitDownload* download, + GParamSpec* pspec, + TransferInfo* info) +{ + GtkWidget* button = info->button; + GtkWidget* icon; + + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + MidoriBrowser* browser = midori_browser_get_for_widget (button); + MidoriWebSettings* settings = midori_browser_get_settings (browser); + + icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), icon); + if (g_object_get_data (G_OBJECT (download), "open-download")) + gtk_button_clicked (GTK_BUTTON (button)); + + if (katze_object_get_boolean (settings, "notify-transfer-completed")) + { + const gchar* uri = webkit_download_get_destination_uri (download); + gchar* path = soup_uri_decode (uri); + gchar* filename = g_strrstr (path, "/") + 1; + gchar* msg = g_strdup_printf ( + _("The file '%s' has been downloaded."), filename); + g_free (path); + g_signal_emit_by_name (browser, "send-notification", + _("Transfer completed"), msg); + g_free (msg); + } + break; + } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + case WEBKIT_DOWNLOAD_STATUS_ERROR: + icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), icon); + break; + default: + break; + } +} + +static void +midori_transferbar_download_button_clicked_cb (GtkWidget* button, + TransferInfo* info) +{ + WebKitDownload* download = info->download; + + switch (webkit_download_get_status (download)) + { + case WEBKIT_DOWNLOAD_STATUS_STARTED: + webkit_download_cancel (download); + break; + case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + const gchar* uri = webkit_download_get_destination_uri (download); + if (sokoke_show_uri (gtk_widget_get_screen (button), + uri, gtk_get_current_event_time (), NULL)) + gtk_widget_destroy (button); + break; + } + case WEBKIT_DOWNLOAD_STATUS_CANCELLED: + gtk_widget_destroy (button); + default: + break; + } +} + +void +midori_transferbar_add_download_item (MidoriTransferbar* transferbar, + WebKitDownload* download) +{ + GtkWidget* box; + GtkWidget* icon; + GtkToolItem* toolitem; + GtkWidget* button; + GtkWidget* progress; + const gchar* uri; + gint width; + TransferInfo* info; + + box = gtk_hbox_new (FALSE, 0); + progress = gtk_progress_bar_new (); + gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (progress), + PANGO_ELLIPSIZE_MIDDLE); + if ((uri = webkit_download_get_destination_uri (download))) + { + gchar* path = soup_uri_decode (uri); + gchar* filename = g_strrstr (path, "/") + 1; + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), filename); + g_free (path); + } + else + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), + webkit_download_get_suggested_filename (download)); + sokoke_widget_get_text_size (progress, "M", &width, NULL); + gtk_widget_set_size_request (progress, width * 10, 1); + /* Avoid a bug in WebKit */ + if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_CREATED) + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + webkit_download_get_progress (download)); + gtk_box_pack_start (GTK_BOX (box), progress, FALSE, FALSE, 0); + icon = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU); + button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); + gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + gtk_container_add (GTK_CONTAINER (button), icon); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); + toolitem = gtk_tool_item_new (); + gtk_container_add (GTK_CONTAINER (toolitem), box); + gtk_widget_show_all (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (transferbar), toolitem, 0); + gtk_widget_show (GTK_WIDGET (transferbar->clear)); + + info = g_new (TransferInfo, 1); + info->download = g_object_ref (download); + info->button = button; + info->toolitem = GTK_WIDGET (toolitem); + info->transferbar = transferbar; + g_signal_connect (button, "destroy", + G_CALLBACK (midori_transferbar_button_destroy_cb), info); + transferbar->infos = g_list_prepend (transferbar->infos, info); + + g_signal_connect (download, "notify::progress", + G_CALLBACK (midori_transferbar_download_notify_progress_cb), progress); + g_signal_connect (download, "notify::status", + G_CALLBACK (midori_transferbar_download_notify_status_cb), info); + g_signal_connect (button, "clicked", + G_CALLBACK (midori_transferbar_download_button_clicked_cb), info); +} + +static void +midori_transferbar_clear_clicked_cb (GtkWidget* button, + MidoriTransferbar* transferbar) +{ + GList* list; + + for (list = transferbar->infos; list != NULL; list = g_list_next (list)) + { + TransferInfo* info = list->data; + WebKitDownloadStatus status = webkit_download_get_status (info->download); + if (status == WEBKIT_DOWNLOAD_STATUS_ERROR + || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED + || status == WEBKIT_DOWNLOAD_STATUS_FINISHED) + { + gtk_widget_destroy (info->button); + } + } +} +#endif + +static void +midori_transferbar_init (MidoriTransferbar* transferbar) +{ + gtk_toolbar_set_style (GTK_TOOLBAR (transferbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (transferbar), GTK_ICON_SIZE_MENU); + + transferbar->clear = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (transferbar->clear), _("Clear All")); + gtk_tool_item_set_is_important (transferbar->clear, TRUE); + g_signal_connect (transferbar->clear, "clicked", + G_CALLBACK (midori_transferbar_clear_clicked_cb), transferbar); + gtk_toolbar_insert (GTK_TOOLBAR (transferbar), transferbar->clear, -1); + + transferbar->infos = NULL; +} + +gboolean +midori_transferbar_confirm_delete (MidoriTransferbar* transferbar) +{ + GtkWidget* dialog = NULL; + gboolean cancel = FALSE; + + if (transferbar->infos || g_list_nth_data (transferbar->infos, 0)) + { + GtkWidget* widget = gtk_widget_get_toplevel (GTK_WIDGET (transferbar)); + dialog = gtk_message_dialog_new (GTK_WINDOW (widget), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, + _("Some files are being downloaded")); + gtk_window_set_title (GTK_WINDOW (dialog), + _("Some files are being downloaded")); + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (dialog), + _("_Quit Midori"), GTK_RESPONSE_ACCEPT); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("The transfers will be cancelled if Midori quits.")); + } + if (dialog != NULL) + { + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_CANCEL) + cancel = TRUE; + gtk_widget_destroy (dialog); + } + + return cancel; +} + diff --git a/toolbars/midori-transferbar.h b/toolbars/midori-transferbar.h new file mode 100644 index 00000000..76e252b2 --- /dev/null +++ b/toolbars/midori-transferbar.h @@ -0,0 +1,40 @@ +/* + Copyright (C) 2010 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_TRANSFERBAR_H__ +#define __MIDORI_TRANSFERBAR_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_TRANSFERBAR \ + (midori_transferbar_get_type ()) +#define MIDORI_TRANSFERBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_TRANSFERBAR, MidoriTransferbar)) +#define MIDORI_TRANSFERBAR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_TRANSFERBAR, MidoriTransferbarClass)) +#define MIDORI_IS_TRANSFERBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_TRANSFERBAR)) +#define MIDORI_IS_TRANSFERBAR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_TRANSFERBAR)) +#define MIDORI_TRANSFERBAR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_TRANSFERBAR, MidoriTransferbarClass)) + +typedef struct _MidoriTransferbar MidoriTransferbar; +typedef struct _MidoriTransferbarClass MidoriTransferbarClass; + +GType +midori_transferbar_get_type (void); + +G_END_DECLS + +#endif /* __MIDORI_TRANSFERBAR_H__ */ From 5d4ba964d49d85687a0a897817e71a635dfd6a50 Mon Sep 17 00:00:00 2001 From: Gheyret Kenji Date: Fri, 18 Jun 2010 15:52:52 +0200 Subject: [PATCH 2705/2970] l10n: Updated Uyghur (ug) translation to 15% New status: 97 messages complete with 0 fuzzies and 513 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ug.po | 84 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/po/ug.po b/po/ug.po index 55d0550a..17ae0d39 100644 --- a/po/ug.po +++ b/po/ug.po @@ -233,7 +233,7 @@ msgstr "" #: ../midori/main.c:1996 msgid "_Ignore" -msgstr "پەرۋا قىلما(_I)" +msgstr "" #: ../midori/midori-array.c:428 msgid "File not found." @@ -251,16 +251,16 @@ msgstr "" #: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 #, c-format msgid "Writing failed." -msgstr "يېزىش مەغلۇپ بولدى." +msgstr "" #: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 #: ../midori/midori-browser.c:5495 msgid "Reload the current page" -msgstr "ھازىرقى بەتنى قايتا ئوقۇ" +msgstr "" #: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 msgid "Stop loading the current page" -msgstr "ھازىرقى بەتنى قايتا ئوقۇشنى توختات" +msgstr "" #: ../midori/midori-browser.c:457 #, c-format @@ -279,7 +279,7 @@ msgstr "" #: ../midori/midori-browser.c:716 msgid "New folder" -msgstr "" +msgstr "يېڭى قىسقۇچ" #: ../midori/midori-browser.c:716 msgid "Edit folder" @@ -304,7 +304,7 @@ msgstr "چۈشەندۈرۈش(_D):" #: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:376 msgid "_Address:" -msgstr "ئادرېس(_A):" +msgstr "" #: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 msgid "_Folder:" @@ -350,7 +350,7 @@ msgstr "" #: ../midori/midori-browser.c:1433 msgid "Transfer completed" -msgstr "يوللاش تاممالاندى" +msgstr "" #: ../midori/midori-browser.c:1573 msgid "Save file" @@ -408,23 +408,23 @@ msgstr "" #: ../midori/midori-browser.c:4570 msgid "Arora" -msgstr "Arora " +msgstr "" #: ../midori/midori-browser.c:4571 msgid "Kazehakase" -msgstr "Kazehakase " +msgstr "" #: ../midori/midori-browser.c:4572 msgid "Opera" -msgstr "Opera " +msgstr "Opera" #: ../midori/midori-browser.c:4573 msgid "Konqueror" -msgstr "Konqueror " +msgstr "Konqueror" #: ../midori/midori-browser.c:4574 msgid "Epiphany" -msgstr "Epiphany " +msgstr "Epiphany" #: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 msgid "Import bookmarks..." @@ -442,7 +442,7 @@ msgstr "" #: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 #: ../katze/katze-utils.c:691 msgid "Custom..." -msgstr "ئادەت..." +msgstr "ئۆزى بەلگىلەش…" #: ../midori/midori-browser.c:4710 msgid "Failed to import bookmarks" @@ -480,7 +480,7 @@ msgstr "تارىخ" #: ../midori/midori-browser.c:4942 msgid "Cookies" -msgstr "" +msgstr "Cookies" #: ../midori/midori-browser.c:4947 msgid "'Flash' Cookies" @@ -504,7 +504,7 @@ msgstr "" #: ../midori/midori-browser.c:5072 msgid "A lightweight web browser." -msgstr "يېنىك توركۆرگۈ." +msgstr "" #: ../midori/midori-browser.c:5074 msgid "" @@ -529,12 +529,12 @@ msgstr "" # tooltip #: ../midori/midori-browser.c:5405 msgid "Open a new window" -msgstr "" +msgstr "يېڭى كۆزنەكتىن بىرنى ئاچ" # tooltip #: ../midori/midori-browser.c:5408 msgid "Open a new tab" -msgstr "" +msgstr "يېڭى بەتكۈچتىن بىرنى ئاچ" #: ../midori/midori-browser.c:5410 msgid "P_rivate Browsing" @@ -987,7 +987,7 @@ msgstr "يۇنىكود (UTF-8)" #: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 msgid "Western (ISO-8859-1)" -msgstr "" +msgstr "غەربچە (ISO-8859-1)" #: ../midori/midori-browser.c:6208 msgid "_Separator" @@ -1070,7 +1070,7 @@ msgstr "كېيىنكىسى" #: ../midori/midori-browser.c:6589 msgid "Match Case" -msgstr "" +msgstr "چوڭ كىچىك ھەرپنى پەرقلەندۈر" #: ../midori/midori-browser.c:6598 msgid "Highlight Matches" @@ -1102,7 +1102,7 @@ msgstr "" #: ../midori/midori-locationaction.c:482 #, c-format msgid "Search with %s" -msgstr "" +msgstr "%s دا ئىزدە" #: ../midori/midori-locationaction.c:1197 #, c-format @@ -1153,11 +1153,11 @@ msgstr "" #: ../midori/midori-websettings.c:247 msgid "New tab" -msgstr "" +msgstr "يېڭى بەتكۈچ" #: ../midori/midori-websettings.c:248 msgid "New window" -msgstr "" +msgstr "يېڭى كۆزنەك" #: ../midori/midori-websettings.c:249 msgid "Current tab" @@ -1173,7 +1173,7 @@ msgstr "سىنبەلگىلەر" #: ../midori/midori-websettings.c:266 msgid "Small icons" -msgstr "" +msgstr "كىچىك سىنبەلگە" #: ../midori/midori-websettings.c:267 msgid "Text" @@ -1213,7 +1213,7 @@ msgstr "يوق" #: ../midori/midori-websettings.c:319 msgid "Safari" -msgstr "" +msgstr "Safari" #: ../midori/midori-websettings.c:320 msgid "iPhone" @@ -1221,11 +1221,11 @@ msgstr "" #: ../midori/midori-websettings.c:321 msgid "Firefox" -msgstr "" +msgstr "Firefox" #: ../midori/midori-websettings.c:322 msgid "Internet Explorer" -msgstr "" +msgstr "Internet Explorer" #: ../midori/midori-websettings.c:375 msgid "Remember last window size" @@ -1589,7 +1589,7 @@ msgstr "" #: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 msgid "Load images automatically" -msgstr "" +msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە" # tooltip #: ../midori/midori-websettings.c:857 @@ -1720,7 +1720,7 @@ msgstr "" #: ../midori/midori-websettings.c:1052 msgid "Proxy server" -msgstr "" +msgstr "ۋاكالەتچى مۇلازىمىتىر" #: ../midori/midori-websettings.c:1053 msgid "The type of proxy server to use" @@ -1791,7 +1791,7 @@ msgstr "" #: ../midori/midori-view.c:4486 #, c-format msgid "Error - %s" -msgstr "" +msgstr "خاتالىق - %s" #: ../midori/midori-view.c:1183 #, c-format @@ -1951,7 +1951,7 @@ msgstr "" #: ../midori/midori-view.c:3758 msgid "Blank page" -msgstr "" +msgstr "بوش بەت" #: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" @@ -1989,7 +1989,7 @@ msgstr "ئادەتتىكى" #: ../midori/midori-preferences.c:299 msgid "Startup" -msgstr "" +msgstr "قوزغات" # tooltip #: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 @@ -2007,7 +2007,7 @@ msgstr "كۆرۈنۈشى" #: ../midori/midori-preferences.c:350 msgid "Font settings" -msgstr "" +msgstr "خەت نۇسخا تەڭشەك" #: ../midori/midori-preferences.c:352 msgid "Default Font Family" @@ -2105,12 +2105,12 @@ msgstr "" #: ../midori/midori-preferences.c:446 msgid "Browsing" -msgstr "" +msgstr "كۆز يۈگۈرت" #. Page "Applications" #: ../midori/midori-preferences.c:468 msgid "Applications" -msgstr "پروگراممىلار" +msgstr "قوللىنىشچان پروگرامما" #: ../midori/midori-preferences.c:469 msgid "External applications" @@ -2136,7 +2136,7 @@ msgstr "" #: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" -msgstr "" +msgstr "كۈن" #: ../midori/midori-searchaction.c:917 msgid "Add search engine" @@ -2208,7 +2208,7 @@ msgstr "" #: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" -msgstr "خەتكۈش" +msgstr "خەتكۈچ" # tooltip #: ../panels/midori-bookmarks.c:250 @@ -2234,7 +2234,7 @@ msgstr "كونترول تاختا" #: ../panels/midori-extensions.c:91 msgid "Extensions" -msgstr "" +msgstr "كېڭەيتىلمە" #: ../panels/midori-history.c:273 msgid "Erroneous clock time" @@ -2285,7 +2285,7 @@ msgstr "" #: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" -msgstr "" +msgstr "سۈزگۈچ:" #: ../panels/midori-transfers.c:479 msgid "Open Destination _Folder" @@ -2297,7 +2297,7 @@ msgstr "" #: ../katze/katze-http-auth.c:214 msgid "Authentication Required" -msgstr "ۋاكالەتچى مۇلازىمىتىرنى دەلىللەش زۆرۈر" +msgstr "ۋاكالەتچى مۇلازىمېتىرنى دەلىللەش زۆرۈر" #: ../katze/katze-http-auth.c:230 msgid "" @@ -2545,7 +2545,7 @@ msgstr "" #: ../extensions/feed-panel/feed-panel.c:671 msgid "Feeds" -msgstr "" +msgstr "قانال" #: ../extensions/feed-panel/feed-panel.c:724 msgid "Add new feed" @@ -2667,7 +2667,7 @@ msgstr "" #: ../extensions/shortcuts.c:315 msgid "Shortcuts" -msgstr "تېزلەتمىلەر" +msgstr "" # description #: ../extensions/shortcuts.c:316 @@ -2718,7 +2718,7 @@ msgstr "" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" -msgstr "" +msgstr "قورال ئىستونىنى ئۆزى بەلگىلەش" #: ../extensions/toolbar-editor.c:405 msgid "" From ff9ef6aeaee0453bf04062e672632d4c53a46b85 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Fri, 18 Jun 2010 19:19:55 +0200 Subject: [PATCH 2706/2970] l10n: Updated Danish (da) translation to 99% New status: 628 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 594 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 298 insertions(+), 296 deletions(-) diff --git a/po/da.po b/po/da.po index f2c5650b..7182c129 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 11:32+0000\n" +"POT-Creation-Date: 2010-06-18 16:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -46,7 +46,7 @@ msgstr "Værdien '%s' er ikke gyldig til %s" msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" @@ -57,172 +57,172 @@ msgstr "Kunne ikke åbne databasen: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Indstillingen kunne ikke gemmes. %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Søgemaskinerne kunne ikke gemmes. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Indstillingen kunne ikke gemmes. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Søgemaskinerne kunne ikke gemmes. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres." -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1372 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1403 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1581 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Vis en nedbrudsdialog" -#: ../midori/main.c:1583 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1589 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1591 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1593 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "MØNSTRE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1680 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1855 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:2015 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignorér" @@ -239,288 +239,262 @@ msgstr "Misdannet dokument." msgid "Unrecognized bookmark format." msgstr "Ukendt bogmærkeformat." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5397 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5394 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:463 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:501 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:515 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:738 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:738 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:740 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:740 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:771 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4547 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:949 +#: ../midori/midori-browser.c:4552 ../midori/midori-browser.c:4584 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:881 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:894 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:909 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:1003 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:1007 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1064 ../midori/midori-browser.c:4602 +#: ../midori/midori-browser.c:4634 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s af %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Filen '%s' er blevet hentet." - -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "Overførsel gennemført" - -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1457 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "Nogle filer bliver overført" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "_Afslut Midori" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2195 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2273 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2279 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2322 ../midori/midori-browser.c:5456 +#: ../panels/midori-bookmarks.c:434 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2895 ../panels/midori-bookmarks.c:209 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2975 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Tom" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3593 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3907 ../midori/midori-browser.c:5850 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4240 ../panels/midori-bookmarks.c:792 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4247 ../panels/midori-bookmarks.c:798 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4250 ../panels/midori-bookmarks.c:800 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4473 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4474 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4475 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4476 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4477 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4498 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4501 ../midori/midori-browser.c:5461 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4512 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4539 ../midori/midori-browser.c:5565 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4613 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4649 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4703 ../panels/midori-bookmarks.c:283 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4810 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4814 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4828 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4839 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4845 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4850 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4855 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4860 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4865 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4873 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4974 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4976 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4995 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -528,519 +502,515 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5304 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5306 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5307 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5310 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5312 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5313 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5317 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5320 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5322 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5323 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5325 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5326 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5328 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5329 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5334 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5335 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5337 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5338 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5341 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5344 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5346 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5350 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5353 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5357 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5360 ../midori/midori-browser.c:5363 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5366 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5369 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5372 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5375 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5377 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5378 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5380 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5381 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5385 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5387 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5388 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5400 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5403 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5406 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5407 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5409 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5410 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5413 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5416 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5417 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5419 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5420 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5422 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5423 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5425 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5426 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5429 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5432 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5435 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5439 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5443 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5446 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5448 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5449 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5451 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5452 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5458 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5459 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5464 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5467 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5468 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5471 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5472 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5476 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5477 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5482 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5483 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5485 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5486 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5488 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5489 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5491 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5492 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5494 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5496 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5497 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5499 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5500 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5502 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5503 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5506 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5514 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5515 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5518 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5519 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5522 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5523 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5526 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5527 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5530 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5531 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5534 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5535 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5543 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5546 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5550 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5553 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5556 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5559 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5562 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:6107 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:6114 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:6116 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:6140 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:6142 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6163 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6178 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6180 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6195 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6197 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6212 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6225 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6227 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6241 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6243 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 +#: ../midori/midori-browser.c:6450 msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:6671 +#: ../midori/midori-browser.c:6481 msgid "Previous" msgstr "Forrige" -#: ../midori/midori-browser.c:6676 +#: ../midori/midori-browser.c:6486 msgid "Next" msgstr "Næste" -#: ../midori/midori-browser.c:6681 +#: ../midori/midori-browser.c:6491 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:6690 +#: ../midori/midori-browser.c:6500 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:6702 +#: ../midori/midori-browser.c:6512 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Ryd alle" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6908 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" @@ -1912,15 +1882,15 @@ msgstr "_Minimér faneblad" msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4797 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4798 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funktionalitet" @@ -2096,67 +2066,102 @@ msgstr "Håndtér søgemaskiner" msgid "Use as _default" msgstr "Brug som _standard" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Bogmærke" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Tilføj bogmærke" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Konsol" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Udvidelser" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "Hi_storik" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Hjemmeside" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "Brugerskri_pter" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Nyt _faneblad" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Overførsler" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Netscape-u_dvidelsesmoduler" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Ny __mappe" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s af %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Filen '%s' er blevet hentet." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Overførsel gennemført" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Ryd alle" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Nogle filer bliver overført" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Afslut Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Kunne ikke tilføje historikelementet: %s\n" + +#: ../panels/midori-bookmarks.c:442 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:450 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:597 msgid "Separator" msgstr "Separator" @@ -2695,9 +2700,6 @@ msgstr "Cache HTTP-kommunikation på disk" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Kunne ikke hente aktuel tid: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Kunne ikke tilføje historikelementet: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Vis panel_titler" From 8cbdd61c97906a8f97d1d2dbbebb1586c0088435 Mon Sep 17 00:00:00 2001 From: MonkeyOfDoom Date: Fri, 18 Jun 2010 23:07:27 +0200 Subject: [PATCH 2707/2970] Add extension 'Copy Addresses of Tabs' The extension adds a menu item to copy the addresses of all tabs to the clipboard. --- extensions/copy-tabs.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 extensions/copy-tabs.c diff --git a/extensions/copy-tabs.c b/extensions/copy-tabs.c new file mode 100644 index 00000000..2734ec54 --- /dev/null +++ b/extensions/copy-tabs.c @@ -0,0 +1,109 @@ +/* + Copyright (C) 2008-2010 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include +#include + +static void +copy_tabs_apply_cb (GtkWidget* menuitem, + MidoriBrowser* browser) +{ + guint i = 0; + GtkWidget* view; + gchar* text = g_strdup (""); + GtkClipboard* clipboard = gtk_widget_get_clipboard (menuitem, + GDK_SELECTION_CLIPBOARD); + + while ((view = midori_browser_get_nth_tab (browser, i++))) + { + gchar* new_text = g_strconcat (text, + midori_view_get_display_uri (MIDORI_VIEW (view)), "\n", NULL); + katze_assign (text, new_text); + } + gtk_clipboard_set_text (clipboard, text, -1); +} + +static void +copy_tabs_browser_populate_tool_menu_cb (MidoriBrowser* browser, + GtkWidget* menu, + MidoriExtension* extension) +{ + GtkWidget* menuitem = gtk_menu_item_new_with_mnemonic (_("Copy Tab _Addresses")); + + g_signal_connect (menuitem, "activate", + G_CALLBACK (copy_tabs_apply_cb), browser); + gtk_widget_show (menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); +} + +static void +copy_tabs_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + +static void +copy_tabs_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser) +{ + MidoriApp* app = midori_extension_get_app (extension); + + g_signal_handlers_disconnect_by_func ( + browser, copy_tabs_browser_populate_tool_menu_cb, extension); + g_signal_handlers_disconnect_by_func ( + extension, copy_tabs_deactivate_cb, browser); + g_signal_handlers_disconnect_by_func ( + app, copy_tabs_app_add_browser_cb, extension); +} + +static void +copy_tabs_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + g_signal_connect (browser, "populate-tool-menu", + G_CALLBACK (copy_tabs_browser_populate_tool_menu_cb), extension); + g_signal_connect (extension, "deactivate", + G_CALLBACK (copy_tabs_deactivate_cb), browser); +} + +static void +copy_tabs_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + copy_tabs_app_add_browser_cb (app, browser, extension); + g_object_unref (browsers); + g_signal_connect (app, "add-browser", + G_CALLBACK (copy_tabs_app_add_browser_cb), extension); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Copy Addresses of Tabs"), + "description", _("Copy the addresses of all tabs to the clipboard"), + "version", "0.1", + "authors", "MonkeyOfDoom ", + NULL); + + g_signal_connect (extension, "activate", + G_CALLBACK (copy_tabs_activate_cb), NULL); + + return extension; +} + From 89e72b73d34f176c3002e79f52219a9647593d3b Mon Sep 17 00:00:00 2001 From: MonkeyOfDoom Date: Fri, 18 Jun 2010 23:12:07 +0200 Subject: [PATCH 2708/2970] Add extension 'Minimize new Tabs' Once it is activated the extension will minimize all newly opened tabs by default. --- extensions/tabs-minimized.c | 83 +++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 extensions/tabs-minimized.c diff --git a/extensions/tabs-minimized.c b/extensions/tabs-minimized.c new file mode 100644 index 00000000..42d43518 --- /dev/null +++ b/extensions/tabs-minimized.c @@ -0,0 +1,83 @@ +/* + Copyright (C) 2008-2010 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include +#include + +static void +tabs_minimized_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + +static void +tabs_minimized_deactivate_cb (MidoriExtension* extension, + MidoriBrowser* browser) +{ + MidoriApp* app = midori_extension_get_app (extension); + + g_signal_handlers_disconnect_by_func ( + extension, tabs_minimized_deactivate_cb, browser); + g_signal_handlers_disconnect_by_func ( + app, tabs_minimized_app_add_browser_cb, extension); +} + +static void +tabs_minimized_add_tab_cb (MidoriApp* app, + MidoriView* tab, + MidoriExtension* extension) +{ + g_object_set (tab, "minimized", TRUE, NULL); +} + +static void +tabs_minimized_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + g_signal_connect (browser, "add-tab", + G_CALLBACK (tabs_minimized_add_tab_cb), extension); + g_signal_connect (extension, "deactivate", + G_CALLBACK (tabs_minimized_deactivate_cb), browser); +} + +static void +tabs_minimized_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + tabs_minimized_app_add_browser_cb (app, browser, extension); + g_object_unref (browsers); + g_signal_connect (app, "add-browser", + G_CALLBACK (tabs_minimized_app_add_browser_cb), extension); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Minimize new Tabs"), + "description", _("New tabs open minimized"), + "version", "0.1", + "authors", "MonkeyOfDoom ", + NULL); + + g_signal_connect (extension, "activate", + G_CALLBACK (tabs_minimized_activate_cb), NULL); + + return extension; +} + From 6556d71273cf8a5dc179fda80985b5ed3a2c5fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20St=C3=B6sel?= Date: Fri, 18 Jun 2010 23:27:29 +0200 Subject: [PATCH 2709/2970] Add sokoke_gtk_action_count_modifiers helper function --- midori/midori.vapi | 5 +++++ midori/sokoke.c | 33 +++++++++++++++++++++++++++++++++ midori/sokoke.h | 2 ++ 3 files changed, 40 insertions(+) diff --git a/midori/midori.vapi b/midori/midori.vapi index eb0f1f29..8e04493a 100644 --- a/midori/midori.vapi +++ b/midori/midori.vapi @@ -149,5 +149,10 @@ namespace Midori { public class WebSettings : WebKit.WebSettings { public WebSettings (); } + + [CCode (cheader_filename = "midori/sokoke.h", lower_case_cprefix = "sokoke_")] + namespace Sokoke { + public static uint gtk_action_count_modifiers (Gtk.Action action); + } } diff --git a/midori/sokoke.c b/midori/sokoke.c index e8ade3af..c6e8614a 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1682,6 +1682,39 @@ sokoke_window_activate_key (GtkWindow* window, return FALSE; } +/** + * sokoke_gtk_action_count_modifiers: + * @action: a #GtkAction + * + * Counts the number of modifiers in the accelerator + * belonging to the action. + * + * Return value: the number of modifiers + **/ +guint +sokoke_gtk_action_count_modifier (GtkAction* action) +{ + GtkAccelKey key; + gint mods, cmods = 0; + const gchar* accel_path; + + g_return_val_if_fail (GTK_IS_ACTION (action), 0); + + accel_path = gtk_action_get_accel_path (action); + if (accel_path) + if (gtk_accel_map_lookup_entry (accel_path, &key)) + { + mods = key.accel_mods; + while (mods) + { + if (1 & mods >> 0) + cmods++; + mods = mods >> 1; + } + } + return cmods; +} + /** * sokoke_file_chooser_dialog_new: * @title: a window title, or %NULL diff --git a/midori/sokoke.h b/midori/sokoke.h index 46da82e8..187cea76 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -227,6 +227,8 @@ sokoke_replace_variables (const gchar* template, gboolean sokoke_window_activate_key (GtkWindow* window, GdkEventKey* event); +guint +sokoke_gtk_action_count_modifiers (GtkAction* action); GtkWidget* sokoke_file_chooser_dialog_new (const gchar* title, From 05c7622aebaf04955813c1476a735cc38e847240 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 18 Jun 2010 23:34:26 +0200 Subject: [PATCH 2710/2970] Add Minimize Tabs and Copy Addresses to POTFILES.in --- po/POTFILES.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3c47d866..ca352d16 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -31,6 +31,7 @@ extensions/colorful-tabs.c extensions/cookie-manager/cookie-manager.c extensions/cookie-manager/cookie-manager-page.c extensions/cookie-manager/main.c +extensions/copy-tabs.c extensions/feed-panel/feed-atom.c extensions/feed-panel/feed-panel.c extensions/feed-panel/feed-parse.c @@ -43,5 +44,6 @@ extensions/shortcuts.c extensions/statusbar-features.c extensions/tab-panel.c extensions/tab-switcher.c +extensions/tabs-minimized.c extensions/toolbar-editor.c extensions/web-cache.c From bc024f86f21b8f4a3f56f186f443aeb38f3c354a Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Sat, 19 Jun 2010 13:09:36 +0200 Subject: [PATCH 2711/2970] l10n: Updated Danish (da) translation to 99% New status: 633 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7182c129..7d480e4f 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-18 16:08+0000\n" +"POT-Creation-Date: 2010-06-19 10:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -2464,6 +2464,18 @@ msgstr "_Cookiehåndtering" msgid "List, view and delete cookies" msgstr "Vis, gennemse og slet cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Kopiér faneblad_adresser" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Kopiér adresser af faneblade" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Kopiér adresser af alle fanblade til udklipsholder" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data." @@ -2647,6 +2659,14 @@ msgstr "Fanebladshistorik" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug" +#: ../extensions/tabs-minimized.c:72 +msgid "Minimize new Tabs" +msgstr "_Minimér nye faneblade" + +#: ../extensions/tabs-minimized.c:73 +msgid "New tabs open minimized" +msgstr "Åbn nye faneblade minimeret" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Tilpas værktøjsbjælke" From 22cd35be6fe4c31acb1493e05879e348e9e73f30 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jun 2010 15:15:28 +0200 Subject: [PATCH 2712/2970] Fix typo of sokoke_gtk_action_count_modifier/s Oddly enough the compiler failed to complain that the function had no definition/ prototype. --- midori/sokoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index c6e8614a..b71bb86e 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1692,7 +1692,7 @@ sokoke_window_activate_key (GtkWindow* window, * Return value: the number of modifiers **/ guint -sokoke_gtk_action_count_modifier (GtkAction* action) +sokoke_gtk_action_count_modifiers (GtkAction* action) { GtkAccelKey key; gint mods, cmods = 0; From 0d665e2d005ca91c01bc6914b298d916be4b7dba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 19 Jun 2010 15:36:17 +0200 Subject: [PATCH 2713/2970] Update German translation --- po/de.po | 1046 +++++++++++++++++++++++++++++------------------------- 1 file changed, 557 insertions(+), 489 deletions(-) diff --git a/po/de.po b/po/de.po index f379d759..bfa042f3 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.2.5\n" +"Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 12:49+0200\n" +"POT-Creation-Date: 2010-06-19 15:34+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -47,7 +47,7 @@ msgstr "Wert »%s« ist ungültig für %s" msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" @@ -58,38 +58,40 @@ msgstr "Datenbank konnte nicht geöffnet werden: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:445 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" - -#: ../midori/main.c:483 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s" - -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht gespeichert werden. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:824 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" +"Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht " +"überprüft werden." -#: ../midori/main.c:958 +#: ../midori/main.c:914 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -97,138 +99,138 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:973 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:977 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:982 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1355 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1386 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1557 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1560 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1560 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1563 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:1565 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1568 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1571 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1573 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1575 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1577 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:1577 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:1581 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:1661 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1836 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1996 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignorieren" @@ -245,278 +247,261 @@ msgstr "Fehlerhaftes Dokument" msgid "Unrecognized bookmark format." msgstr "Unbekanntes Lesezeichenformat." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5391 +#: ../midori/midori-browser.c:5397 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5394 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:463 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:501 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:515 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:738 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:738 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:740 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:740 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:771 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4547 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:949 +#: ../midori/midori-browser.c:4552 ../midori/midori-browser.c:4584 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:881 msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:894 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:909 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:1003 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:1007 #, c-format msgid "The file needs %s but only %s are left." msgstr "Die Datei benötigt %s, aber nur %s sind übrig." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1064 ../midori/midori-browser.c:4602 +#: ../midori/midori-browser.c:4634 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s von %s" - -#: ../midori/midori-browser.c:1456 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Die Datei »%s« wurde heruntergeladen." - -#: ../midori/midori-browser.c:1460 -msgid "Transfer completed" -msgstr "Übertragung abgeschlossen" - -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1457 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -msgid "Some files are being downloaded" -msgstr "Einige Dateien werden gerade heruntergeladen." - -#: ../midori/midori-browser.c:1923 -msgid "_Quit Midori" -msgstr "Midori _beenden" - -#: ../midori/midori-browser.c:1925 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." - -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2195 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2273 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" + +#: ../midori/midori-browser.c:2279 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2322 ../midori/midori-browser.c:5456 +#: ../panels/midori-bookmarks.c:434 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2895 ../panels/midori-bookmarks.c:209 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2975 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Leer" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3593 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:3907 ../midori/midori-browser.c:5850 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4240 ../panels/midori-bookmarks.c:792 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4247 ../panels/midori-bookmarks.c:798 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4250 ../panels/midori-bookmarks.c:800 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4473 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4474 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4475 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4476 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4477 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4498 msgid "Import bookmarks..." msgstr "Lesezeichen importieren..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4501 ../midori/midori-browser.c:5461 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4512 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4539 ../midori/midori-browser.c:5565 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4613 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4649 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4703 ../panels/midori-bookmarks.c:283 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4810 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4814 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4828 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4839 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4845 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4850 msgid "'Flash' Cookies" msgstr "»Flash« Cookies" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4855 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4860 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4865 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Zwischenspeicher" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4873 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4974 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4976 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -528,525 +513,521 @@ msgstr "" "veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " "2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4995 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5304 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5306 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5307 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5310 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5312 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5313 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5317 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5320 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5322 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5323 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5325 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5326 msgid "Add shortcut to the desktop" msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5328 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5329 msgid "Subscribe to this news feed" msgstr "Diese Nachrichtenquelle abonnieren" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5334 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5335 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5337 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5338 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5341 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5344 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5346 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5350 msgid "Undo the last modification" msgstr "Letzte Änderung rückgängig machen" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5353 msgid "Redo the last modification" msgstr "Die letzte Ä_nderung rückgängig machen" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5357 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5360 ../midori/midori-browser.c:5363 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5366 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5369 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5372 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5375 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5377 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5378 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5380 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5381 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5385 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5387 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5388 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5400 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5403 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5406 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5407 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5409 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5410 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5413 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5416 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5417 msgid "Scroll to the left" msgstr "Nach links rollen" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5419 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5420 msgid "Scroll down" msgstr "Herunter rollen" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5422 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5423 msgid "Scroll up" msgstr "Hoch rollen" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5425 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5426 msgid "Scroll to the right" msgstr "Nach rechts rollen" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5429 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5432 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5435 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5439 msgid "Go to the previous sub-page" msgstr "Gehe zur voherigen Unterseite zurück" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5443 msgid "Go to the next sub-page" msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5446 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5448 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5449 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5451 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5452 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5458 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5459 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5464 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5467 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5468 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5471 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5472 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5476 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5477 msgid "Inspect page details and access developer tools..." msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5482 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5483 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5485 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5486 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5488 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokusieren" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5489 msgid "Focus the current tab" msgstr "Den aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5491 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5492 msgid "Open the tabs saved in the last session" msgstr "In der letzten Sitzung geöffnete Reiter öffnen" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5494 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5496 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5497 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5499 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5500 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5502 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5503 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5506 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5514 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5515 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5518 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5519 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5522 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5523 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5526 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5527 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5530 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5531 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5534 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5535 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5543 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5546 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5550 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5553 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5556 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5559 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5562 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:6107 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:6114 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:6116 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:6140 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:6142 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6163 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6178 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6180 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6195 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6197 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6212 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6225 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6227 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6241 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6243 msgid "Menu" msgstr "Menü" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 +#: ../midori/midori-browser.c:6450 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:6665 +#: ../midori/midori-browser.c:6481 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6486 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:6675 +#: ../midori/midori-browser.c:6491 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:6684 +#: ../midori/midori-browser.c:6500 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:6696 +#: ../midori/midori-browser.c:6512 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Alle entfernen" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6908 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -1109,575 +1090,579 @@ msgstr "Startseite anzeigen" msgid "Show last open tabs" msgstr "Zuletzt geöffnete Reiter anzeigen" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Letzte Reiter zeigen ohne sie zu laden" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Kleine Symbole" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME oder Umgebung)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Kein Zwischenrechner" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Bedienelemente der Leiste anzeigen" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Leisten in eigenen Fenstern öffnen" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Was beim Starten von Midori passieren soll" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Startseite:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Schnellwahl in neuen Reitern anzeigen" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Heruntergeladene Dateien speichern:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Benachrichtigen bei Abschluss der Übertragung" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "" "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Öffne neue Seiten in:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Öffne Seiten von außerhalb in:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape-Module einschalten" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Eingebettete Netscape-Module einschalten" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "HTML5-Datenbanken einschalten" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Unterstützung für HTML5-Datenbank einschalten" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Unterstützung für HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "HTML5-Anwendungsspeicher einschalten" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Sanfter Bildlauf" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Ob der Bildlauf sanft schneller und langsamer wird" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Die Art des zu verwendenden Zwischenrechners" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Bevorzugte Sprachen" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1686,11 +1671,11 @@ msgstr "" "Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru," "nl« oder »en-us;q=1.0, fr-fr;q=0.667«" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Private Daten löschen" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" @@ -1698,8 +1683,8 @@ msgstr "Zum Löschen ausgewählte private Daten" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 #, c-format msgid "Error - %s" msgstr "Fehler - %s" @@ -1805,106 +1790,130 @@ msgstr "Im Netz _suchen" msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2661 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2680 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2683 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2687 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3513 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3514 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3515 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3516 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3517 msgid "Are you sure you want to delete this shortcut?" msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Anzahl Spalten ändern" +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "Anzahl Spalten und Zeilen ändern" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Anzahl an Spalten eingeben:" +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "Anzahl an Spalten und Zeilen eingeben:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Anzahl Verknüpfungen ändern" +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "Ungültige Eingabe für die Größe der Schnellwahl" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Anzahl an Verknüpfungen eingeben:" +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Vorschaubildgröße:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Klein" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Mittel" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Groß" + +#: ../midori/midori-view.c:3550 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Laden der Seite verzögert" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Laden der Seite wegen eines Absturzes oder Einstellung verzögert" + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Seite laden" + +#: ../midori/midori-view.c:3840 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4100 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Restore Tab" msgstr "Reiter _wiederherstellen" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4105 msgid "_Minimize Tab" msgstr "Reiter _minimieren" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4111 msgid "Close ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4797 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4798 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Inhalte" @@ -2084,67 +2093,102 @@ msgstr "Suchmaschinen verwalten" msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Netscape-Module" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Neuer _Ordner" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s von %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Die Datei »%s« wurde heruntergeladen." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Übertragung abgeschlossen" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Alle entfernen" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Einige Dateien werden gerade heruntergeladen." + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "Midori _beenden" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:256 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n" + +#: ../panels/midori-bookmarks.c:442 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:450 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:463 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:597 msgid "Separator" msgstr "Trennlinie" @@ -2337,7 +2381,8 @@ msgstr "Benutzerstile" #: ../extensions/addons.c:1085 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" +msgstr "" +"Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" #: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" @@ -2464,6 +2509,18 @@ msgstr "_Cookieverwaltung" msgid "List, view and delete cookies" msgstr "Profildateien auflisten, anzeigen und löschen" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "_Adressen aller Reiter kopieren" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Adressen aller Reiter kopieren" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Die Adressen aller Reiter in die Zwischenablage kopieren" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2475,25 +2532,25 @@ msgstr "" "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Zuletzt aktualisiert: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Nachrichtenquellen" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Eine neue Nachrichtenquelle hinzufügen" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Nachrichtenquelle löschen" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" @@ -2530,25 +2587,25 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fehler" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Nachrichtenquelle »%s« ist bereits vorhanden" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Fehler beim Laden der Nachrichtenquelle »%s«" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Nachrichtenquellenleiste" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" @@ -2643,14 +2700,22 @@ msgstr "_Reiterleiste" msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Verlaufsgestützte Reiterliste" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Reiter anhand einer nach Nutzung sortierten Liste wechseln" +#: ../extensions/tabs-minimized.c:72 +msgid "Minimize new Tabs" +msgstr "Neue Reiter minimieren" + +#: ../extensions/tabs-minimized.c:73 +msgid "New tabs open minimized" +msgstr "Neue Reiter werden minimiert geöffnet" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" @@ -2687,6 +2752,12 @@ msgstr "Werkzeugleisten leicht anpassen" msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" +#~ msgid "Set number of shortcuts" +#~ msgstr "Anzahl Verknüpfungen ändern" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Anzahl an Verknüpfungen eingeben:" + #~ msgid "Open _Link" #~ msgstr "Ver_weis öffnen" @@ -2702,9 +2773,6 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" - #~ msgid "Not available on this platform" #~ msgstr "Auf dieser Plattform nicht verfügbar" From 633b7ed294561395f05fbedd2e3cb8b71a64f7c8 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 19 Jun 2010 09:52:16 -0400 Subject: [PATCH 2714/2970] Inline functions in adblock for 0.5 percent speedup --- extensions/adblock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index 8b021afd..4623d595 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -591,7 +591,7 @@ adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); } -static gboolean +static inline gboolean adblock_check_filter_options (GRegex* regex, const gchar* opts, const gchar* req_uri, @@ -607,7 +607,7 @@ adblock_check_filter_options (GRegex* regex, return FALSE; } -static gboolean +static inline gboolean adblock_is_matched_by_pattern (const gchar* req_uri, const gchar* page_uri) { @@ -634,7 +634,7 @@ adblock_is_matched_by_pattern (const gchar* req_uri, return FALSE; } -static gboolean +static inline gboolean adblock_is_matched_by_key (const gchar* opts, const gchar* req_uri, const gchar* page_uri) From 053048d05eeb5ba5b1c847276209a4910f893405 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 19 Jun 2010 09:56:50 -0400 Subject: [PATCH 2715/2970] Fixed handling of bookmark meta data sqlite doesn't store negative value but rather 0 and 1, so we work with these values now. As a side effect it makes the code easier to read. --- TODO | 1 - midori/midori-browser.c | 10 ++++------ panels/midori-bookmarks.c | 12 ------------ 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/TODO b/TODO index 6d51e175..75e1dd9e 100644 --- a/TODO +++ b/TODO @@ -93,7 +93,6 @@ TODO: . Prevent dead tabs: download, aborted page BOOKMARK ISSUES: - . Show on toolbar is not working . Bookmark menu is not populated . Bookmark toolbar is broken . Import is broken diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 21708791..0db0f51f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -893,7 +893,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar), - katze_item_get_meta_string (bookmark, "toolbar") != NULL); + katze_item_get_meta_integer (bookmark, "toolbar")); gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); @@ -908,7 +908,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app), - katze_item_get_meta_string (bookmark, "app") != NULL); + katze_item_get_meta_integer (bookmark, "app")); gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); @@ -926,15 +926,13 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_desc))); /* FIXME: Toolbar is not working?? */ katze_item_set_meta_integer (bookmark, "toolbar", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)) - ? 1 : -1); + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))); if (!KATZE_IS_ARRAY (bookmark)) { katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); katze_item_set_meta_integer (bookmark, "app", - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app)) - ? 1 : -1); + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app))); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index dcd84c38..cbac36c7 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -174,12 +174,6 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, app = sqlite3_column_int64 (statement, 3); toolbar = sqlite3_column_int64 (statement, 4); - - if (app == 0) - app = -1; - if (toolbar == 0) - toolbar = -1; - item = katze_item_new (); katze_item_set_name (item, (gchar*)title); katze_item_set_meta_integer (item, "toolbar", toolbar); @@ -235,12 +229,6 @@ midori_bookmarks_insert_item_db (sqlite3* db, else parent = g_strdup (""); - if (katze_item_get_meta_integer (item, "toolbar") == -1) - katze_item_set_meta_integer (item, "toolbar", 0); - - if (katze_item_get_meta_integer (item, "app") == -1) - katze_item_set_meta_integer (item, "app", 0); - sqlcmd = sqlite3_mprintf ( "INSERT into bookmarks (uri, title, folder, type, toolbar, app) values" " ('%q', '%q', '%q', %u, %u, %u)", From 91ed4b7bc8dd7369db6eba612aa1d2a221a3912a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Sat, 19 Jun 2010 22:09:41 +0200 Subject: [PATCH 2716/2970] l10n: Updated Czech (cs) translation to 100% New status: 635 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 468 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 244 insertions(+), 224 deletions(-) diff --git a/po/cs.po b/po/cs.po index 5529aefb..116de8d8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-17 04:08+0000\n" +"POT-Creation-Date: 2010-06-19 16:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -244,800 +244,770 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5597 -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5395 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5392 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:463 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:501 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:515 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:735 +#: ../midori/midori-browser.c:738 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:735 +#: ../midori/midori-browser.c:738 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:737 +#: ../midori/midori-browser.c:740 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:737 +#: ../midori/midori-browser.c:740 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:768 +#: ../midori/midori-browser.c:771 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:800 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4753 +#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4545 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:946 -#: ../midori/midori-browser.c:4758 ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:947 +#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:4582 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:878 +#: ../midori/midori-browser.c:881 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:891 +#: ../midori/midori-browser.c:894 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:906 +#: ../midori/midori-browser.c:909 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:1000 +#: ../midori/midori-browser.c:1001 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:1004 +#: ../midori/midori-browser.c:1005 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1061 ../midori/midori-browser.c:4808 -#: ../midori/midori-browser.c:4840 +#: ../midori/midori-browser.c:1062 ../midori/midori-browser.c:4600 +#: ../midori/midori-browser.c:4632 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1435 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../midori/midori-browser.c:1471 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Soubor %s byl stažen." - -#: ../midori/midori-browser.c:1475 -msgid "Transfer completed" -msgstr "Přenos dokončen" - -#: ../midori/midori-browser.c:1615 +#: ../midori/midori-browser.c:1455 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:1932 ../midori/midori-browser.c:1934 -msgid "Some files are being downloaded" -msgstr "Ještě se stahují nějaké soubory." - -#: ../midori/midori-browser.c:1938 -msgid "_Quit Midori" -msgstr "U_končit Midori" - -#: ../midori/midori-browser.c:1940 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." - -#: ../midori/midori-browser.c:2401 +#: ../midori/midori-browser.c:2193 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2479 +#: ../midori/midori-browser.c:2271 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." -#: ../midori/midori-browser.c:2485 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2277 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2528 ../midori/midori-browser.c:5662 -#: ../panels/midori-bookmarks.c:434 +#: ../midori/midori-browser.c:2320 ../midori/midori-browser.c:5454 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3101 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:2893 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/midori-browser.c:3181 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3799 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3591 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:4113 ../midori/midori-browser.c:6056 +#: ../midori/midori-browser.c:3905 ../midori/midori-browser.c:5848 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4446 ../panels/midori-bookmarks.c:792 +#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4453 ../panels/midori-bookmarks.c:798 +#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4456 ../panels/midori-bookmarks.c:800 +#: ../midori/midori-browser.c:4248 ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4679 +#: ../midori/midori-browser.c:4471 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4680 +#: ../midori/midori-browser.c:4472 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:4473 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4474 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4475 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4496 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4707 ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:4499 ../midori/midori-browser.c:5459 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4718 +#: ../midori/midori-browser.c:4510 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4745 ../midori/midori-browser.c:5771 +#: ../midori/midori-browser.c:4537 ../midori/midori-browser.c:5563 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4819 +#: ../midori/midori-browser.c:4611 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4647 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4909 ../panels/midori-bookmarks.c:283 +#: ../midori/midori-browser.c:4701 ../panels/midori-bookmarks.c:271 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4808 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4812 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4826 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:5045 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4837 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4843 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4848 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4853 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:5066 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4858 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:5071 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4863 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:4871 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:4972 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4974 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:4993 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5302 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5512 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:5304 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5305 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5308 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5310 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5311 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5315 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5318 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5320 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5321 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5323 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5324 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5326 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5327 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5332 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5333 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5335 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5336 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5339 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5342 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5344 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5348 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5351 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5355 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5566 ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5358 ../midori/midori-browser.c:5361 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5364 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5367 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5370 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5373 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5375 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5376 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5378 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5379 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5383 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5385 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5386 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5398 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5401 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5404 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5405 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5407 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5408 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5411 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5414 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5415 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5417 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5418 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5420 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5421 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5423 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5424 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5427 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5430 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5433 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5437 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5441 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5444 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5446 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5447 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5449 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5450 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5456 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5457 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5462 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5673 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5465 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5466 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5469 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5470 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5474 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5475 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5480 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5481 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5483 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5484 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5486 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5487 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5489 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5490 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5492 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5494 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5495 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5705 +#: ../midori/midori-browser.c:5497 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5498 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5500 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5501 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5504 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5512 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5513 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5516 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5725 +#: ../midori/midori-browser.c:5517 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:5520 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5729 +#: ../midori/midori-browser.c:5521 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5524 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:5525 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5736 +#: ../midori/midori-browser.c:5528 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5737 +#: ../midori/midori-browser.c:5529 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5740 +#: ../midori/midori-browser.c:5532 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5741 +#: ../midori/midori-browser.c:5533 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:5541 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5752 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5544 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5548 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5759 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5551 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5762 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5554 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5765 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5557 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5768 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:6314 +#: ../midori/midori-browser.c:6105 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6321 +#: ../midori/midori-browser.c:6112 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:6323 +#: ../midori/midori-browser.c:6114 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6138 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6349 +#: ../midori/midori-browser.c:6140 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6370 +#: ../midori/midori-browser.c:6161 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6385 +#: ../midori/midori-browser.c:6176 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:6387 +#: ../midori/midori-browser.c:6178 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:6402 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:6193 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6404 +#: ../midori/midori-browser.c:6195 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6419 +#: ../midori/midori-browser.c:6210 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:6432 +#: ../midori/midori-browser.c:6223 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6225 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6448 +#: ../midori/midori-browser.c:6239 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6450 +#: ../midori/midori-browser.c:6241 msgid "Menu" msgstr "Nabídka" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6657 +#: ../midori/midori-browser.c:6448 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:6688 +#: ../midori/midori-browser.c:6479 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:6693 +#: ../midori/midori-browser.c:6484 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:6698 +#: ../midori/midori-browser.c:6489 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:6707 +#: ../midori/midori-browser.c:6498 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:6719 +#: ../midori/midori-browser.c:6510 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:6765 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Smazat vše" - -#: ../midori/midori-browser.c:7121 +#: ../midori/midori-browser.c:6906 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -2137,28 +2107,58 @@ msgstr "Netscape p_luginy" msgid "New _Folder" msgstr "Nová _složka" +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Soubor %s byl stažen." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Přenos dokončen" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Smazat vše" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Ještě se stahují nějaké soubory." + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "U_končit Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." + #: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:256 +#: ../panels/midori-bookmarks.c:244 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Záložku se nepodařilo přidat: %s\n" -#: ../panels/midori-bookmarks.c:442 +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:450 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:463 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:597 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Oddělovač" @@ -2460,6 +2460,18 @@ msgstr "Správce _cookies" msgid "List, view and delete cookies" msgstr "Seznam, detaily a mazání cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Zkopírovat _adresu karty" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Zkopírovat adresy z karet" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Zkopíruje adresy všech karet do schránky" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech." @@ -2643,6 +2655,14 @@ msgstr "Karta historie" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití" +#: ../extensions/tabs-minimized.c:72 +msgid "Minimize new Tabs" +msgstr "Minimalizovat otevřené karty" + +#: ../extensions/tabs-minimized.c:73 +msgid "New tabs open minimized" +msgstr "Nové karty otevírat minimalizovaně" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Upravit lištu" From 09af931756c5b48d7f2782421638313c393ce89b Mon Sep 17 00:00:00 2001 From: MonkeyOfDoom Date: Sat, 19 Jun 2010 22:36:23 +0200 Subject: [PATCH 2717/2970] Disconnect tabs_minimized_add_tab_cb when deactivating --- extensions/tabs-minimized.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/extensions/tabs-minimized.c b/extensions/tabs-minimized.c index 42d43518..0d14dc68 100644 --- a/extensions/tabs-minimized.c +++ b/extensions/tabs-minimized.c @@ -17,6 +17,11 @@ tabs_minimized_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser, MidoriExtension* extension); +static void +tabs_minimized_add_tab_cb (MidoriBrowser* browser, + MidoriView* tab, + MidoriExtension* extension); + static void tabs_minimized_deactivate_cb (MidoriExtension* extension, MidoriBrowser* browser) @@ -27,10 +32,12 @@ tabs_minimized_deactivate_cb (MidoriExtension* extension, extension, tabs_minimized_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, tabs_minimized_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, tabs_minimized_add_tab_cb, extension); } static void -tabs_minimized_add_tab_cb (MidoriApp* app, +tabs_minimized_add_tab_cb (MidoriBrowser* browser, MidoriView* tab, MidoriExtension* extension) { From 2e7307b01420b945c475f215b30b6601d6b98357 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Sun, 20 Jun 2010 10:26:50 +0200 Subject: [PATCH 2718/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 635 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 468 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 244 insertions(+), 224 deletions(-) diff --git a/po/uk.po b/po/uk.po index 0453df13..1f4ec1ad 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-17 10:08+0000\n" +"POT-Creation-Date: 2010-06-20 04:08+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -243,130 +243,104 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5597 -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5395 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5392 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:463 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:501 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:515 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:735 +#: ../midori/midori-browser.c:738 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:735 +#: ../midori/midori-browser.c:738 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:737 +#: ../midori/midori-browser.c:740 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:737 +#: ../midori/midori-browser.c:740 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:768 +#: ../midori/midori-browser.c:771 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:800 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:834 ../midori/midori-browser.c:4753 +#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4545 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:946 -#: ../midori/midori-browser.c:4758 ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:947 +#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:4582 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:878 +#: ../midori/midori-browser.c:881 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:891 +#: ../midori/midori-browser.c:894 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:906 +#: ../midori/midori-browser.c:909 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:1000 +#: ../midori/midori-browser.c:1001 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:1004 +#: ../midori/midori-browser.c:1005 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1061 ../midori/midori-browser.c:4808 -#: ../midori/midori-browser.c:4840 +#: ../midori/midori-browser.c:1062 ../midori/midori-browser.c:4600 +#: ../midori/midori-browser.c:4632 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1435 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s з %s" - -#: ../midori/midori-browser.c:1471 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Файл '%s' завантажено." - -#: ../midori/midori-browser.c:1475 -msgid "Transfer completed" -msgstr "Передачу завершено" - -#: ../midori/midori-browser.c:1615 +#: ../midori/midori-browser.c:1455 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:1932 ../midori/midori-browser.c:1934 -msgid "Some files are being downloaded" -msgstr "Деякі файли завантажено." - -#: ../midori/midori-browser.c:1938 -msgid "_Quit Midori" -msgstr "_Вийти з Мідорі" - -#: ../midori/midori-browser.c:1940 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" - -#: ../midori/midori-browser.c:2401 +#: ../midori/midori-browser.c:2193 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2479 +#: ../midori/midori-browser.c:2271 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -374,671 +348,667 @@ msgstr "" "Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" "Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." -#: ../midori/midori-browser.c:2485 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2277 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2528 ../midori/midori-browser.c:5662 -#: ../panels/midori-bookmarks.c:434 +#: ../midori/midori-browser.c:2320 ../midori/midori-browser.c:5454 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3101 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:2893 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не вдалось виконати запит бази даних: %s\n" -#: ../midori/midori-browser.c:3181 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3799 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3591 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:4113 ../midori/midori-browser.c:6056 +#: ../midori/midori-browser.c:3905 ../midori/midori-browser.c:5848 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4446 ../panels/midori-bookmarks.c:792 +#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4453 ../panels/midori-bookmarks.c:798 +#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4456 ../panels/midori-bookmarks.c:800 +#: ../midori/midori-browser.c:4248 ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4679 +#: ../midori/midori-browser.c:4471 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4680 +#: ../midori/midori-browser.c:4472 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:4473 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4474 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4475 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4496 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4707 ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:4499 ../midori/midori-browser.c:5459 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4718 +#: ../midori/midori-browser.c:4510 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4745 ../midori/midori-browser.c:5771 +#: ../midori/midori-browser.c:4537 ../midori/midori-browser.c:5563 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4819 +#: ../midori/midori-browser.c:4611 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4647 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4909 ../panels/midori-bookmarks.c:283 +#: ../midori/midori-browser.c:4701 ../panels/midori-bookmarks.c:271 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4808 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4812 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4826 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:5045 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4837 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4843 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4848 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4853 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:5066 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4858 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:5071 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4863 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:4871 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:4972 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4974 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:5201 +#: ../midori/midori-browser.c:4993 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5302 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5512 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:5304 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5305 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5308 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5310 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5311 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5315 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5318 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5320 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5321 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5323 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5324 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5326 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5327 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5332 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5333 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5335 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5336 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5339 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5342 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:5344 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5348 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5351 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5355 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:5566 ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5358 ../midori/midori-browser.c:5361 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5364 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5367 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:5370 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5373 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5375 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5376 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5378 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5379 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5383 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5385 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5386 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5398 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5401 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5404 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5405 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5407 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5408 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5411 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5622 +#: ../midori/midori-browser.c:5414 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5415 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5417 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5418 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5420 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5421 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5423 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5424 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5427 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5430 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5433 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5437 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5441 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5444 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5654 +#: ../midori/midori-browser.c:5446 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5447 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5449 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5450 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5456 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:5457 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5462 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5673 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5465 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5466 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5469 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5470 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5474 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5475 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5480 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5481 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5483 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5484 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5486 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5487 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5489 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5490 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5492 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5494 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5495 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5705 +#: ../midori/midori-browser.c:5497 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5498 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5500 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5709 +#: ../midori/midori-browser.c:5501 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5504 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5512 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5721 +#: ../midori/midori-browser.c:5513 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5516 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5725 +#: ../midori/midori-browser.c:5517 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:5520 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5729 +#: ../midori/midori-browser.c:5521 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5524 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5733 +#: ../midori/midori-browser.c:5525 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5736 +#: ../midori/midori-browser.c:5528 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5737 +#: ../midori/midori-browser.c:5529 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5740 +#: ../midori/midori-browser.c:5532 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5741 +#: ../midori/midori-browser.c:5533 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5749 +#: ../midori/midori-browser.c:5541 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5752 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5544 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5548 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5759 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5551 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5762 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5554 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5765 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5557 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5768 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:6314 +#: ../midori/midori-browser.c:6105 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6321 +#: ../midori/midori-browser.c:6112 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:6323 +#: ../midori/midori-browser.c:6114 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6347 +#: ../midori/midori-browser.c:6138 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:6349 +#: ../midori/midori-browser.c:6140 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6370 +#: ../midori/midori-browser.c:6161 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6385 +#: ../midori/midori-browser.c:6176 msgid "_Recently visited pages" msgstr "_Останньо відвідані сторінки" -#: ../midori/midori-browser.c:6387 +#: ../midori/midori-browser.c:6178 msgid "Reopen pages that you visited earlier" msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#: ../midori/midori-browser.c:6402 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:6193 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6404 +#: ../midori/midori-browser.c:6195 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6419 +#: ../midori/midori-browser.c:6210 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:6432 +#: ../midori/midori-browser.c:6223 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6225 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6448 +#: ../midori/midori-browser.c:6239 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6450 +#: ../midori/midori-browser.c:6241 msgid "Menu" msgstr "Меню" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6657 +#: ../midori/midori-browser.c:6448 msgid "_Inline Find:" msgstr "Знайти _входження:" -#: ../midori/midori-browser.c:6688 +#: ../midori/midori-browser.c:6479 msgid "Previous" msgstr "Попереднє" -#: ../midori/midori-browser.c:6693 +#: ../midori/midori-browser.c:6484 msgid "Next" msgstr "Наступне" -#: ../midori/midori-browser.c:6698 +#: ../midori/midori-browser.c:6489 msgid "Match Case" msgstr "Врахувати регістр" -#: ../midori/midori-browser.c:6707 +#: ../midori/midori-browser.c:6498 msgid "Highlight Matches" msgstr "Підсвітити збіги" -#: ../midori/midori-browser.c:6719 +#: ../midori/midori-browser.c:6510 msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../midori/midori-browser.c:6765 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Очистити все" - -#: ../midori/midori-browser.c:7121 +#: ../midori/midori-browser.c:6906 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -2138,28 +2108,58 @@ msgstr "Роз_ширення Netscape" msgid "New _Folder" msgstr "Нова _тека" +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s з %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Файл '%s' завантажено." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Передачу завершено" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Очистити все" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Деякі файли завантажено." + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Вийти з Мідорі" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" + #: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:256 +#: ../panels/midori-bookmarks.c:244 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не вдалося дадати закладку: %s\n" -#: ../panels/midori-bookmarks.c:442 +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:450 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:463 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:597 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Роздільник" @@ -2465,6 +2465,18 @@ msgstr "Менеджер _тістечок" msgid "List, view and delete cookies" msgstr "Показати, переглянути і видалити тістечка" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Копіювати адреси _вкладок" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Копіювати адреси вкладок" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Копіювати адреси усіх вкладок до буфера обміну" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не можу знайти вимаганий елемент Atom \"entry\" в даних XML" @@ -2648,6 +2660,14 @@ msgstr "Список історії вкладок" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Дозволяє перемикатися між вкладками при виборі із списку, впорядкованим по часу останнього використання" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Мінімізувати нові вкладки" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Нові вкладки відкриваються мінімізованими" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Змінити панель інструментів" From f5604f290c860a1d3445e7f696f37533562f8748 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 20 Jun 2010 20:13:39 +0200 Subject: [PATCH 2719/2970] Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change. --- midori/midori-browser.c | 258 ++---------------------------- toolbars/midori-findbar.c | 327 ++++++++++++++++++++++++++++++++++++++ toolbars/midori-findbar.h | 57 +++++++ 3 files changed, 395 insertions(+), 247 deletions(-) create mode 100644 toolbars/midori-findbar.c create mode 100644 toolbars/midori-findbar.h diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0db0f51f..5b26f46c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -11,10 +11,6 @@ See the file COPYING for the full license text. */ -#if HAVE_CONFIG_H - #include -#endif - #include "midori-browser.h" #include "midori-array.h" @@ -24,6 +20,7 @@ #include "midori-locationaction.h" #include "midori-searchaction.h" #include "midori-stock.h" +#include "midori-findbar.h" #include "midori-transferbar.h" #include "gtkiconentry.h" @@ -55,6 +52,10 @@ #include #endif +#if HAVE_CONFIG_H + #include +#endif + struct _MidoriBrowser { #if HAVE_HILDON @@ -78,11 +79,6 @@ struct _MidoriBrowser GtkWidget* inspector_view; GtkWidget* find; - GtkWidget* find_text; - GtkToolItem* find_case; - GtkToolItem* find_highlight; - GtkToolItem* find_close; - gboolean find_typing; GtkWidget* statusbar; GtkWidget* statusbar_contents; @@ -212,9 +208,6 @@ midori_search_action_get_icon (KatzeItem* item, GtkWidget* widget, const gchar** icon_name); -static void -_midori_browser_find_done (MidoriBrowser* browser); - static gboolean _action_menus_activate_item_alt (GtkAction* action, KatzeItem* item, @@ -328,7 +321,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_view_can_find (view)); _action_set_sensitive (browser, "FindPrevious", midori_view_can_find (view)); - gtk_widget_set_sensitive (GTK_WIDGET (browser->find_highlight), + midori_findbar_set_can_find (MIDORI_FINDBAR (browser->find), midori_view_can_find (view)); action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); @@ -1521,41 +1514,7 @@ midori_view_search_text_cb (GtkWidget* view, gchar* typing, MidoriBrowser* browser) { - const gchar* text; - gboolean case_sensitive; - gboolean highlight; - - if (typing) - { - gint position = -1; - - browser->find_typing = TRUE; - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( - browser->find_highlight), TRUE); - gtk_widget_hide (GTK_WIDGET (browser->find_case)); - gtk_widget_hide (GTK_WIDGET (browser->find_highlight)); - gtk_widget_hide (GTK_WIDGET (browser->find_close)); - if (!gtk_widget_get_visible (browser->find)) - gtk_entry_set_text (GTK_ENTRY (browser->find_text), ""); - gtk_widget_show (browser->find); - gtk_window_set_focus (GTK_WINDOW (browser), browser->find_text); - gtk_editable_insert_text (GTK_EDITABLE (browser->find_text), typing, -1, &position); - gtk_editable_set_position (GTK_EDITABLE (browser->find_text), -1); - } - if (gtk_widget_get_visible (browser->find) && !typing) - { - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), - GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); - #endif - text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); - case_sensitive = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); - midori_view_mark_text_matches (MIDORI_VIEW (view), text, case_sensitive); - highlight = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (browser->find_highlight)); - midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); - } + midori_findbar_search_text (MIDORI_FINDBAR (browser->find), view, found, typing); } static gboolean @@ -2526,125 +2485,21 @@ static void _action_find_activate (GtkAction* action, MidoriBrowser* browser) { - if (gtk_widget_get_visible (browser->find)) - _midori_browser_find_done (browser); - else - { - GtkWidget* view; - const gchar* text; - - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), - GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); - gtk_widget_show (GTK_WIDGET (browser->find_case)); - #endif - gtk_widget_show (GTK_WIDGET (browser->find_highlight)); - gtk_widget_show (GTK_WIDGET (browser->find_close)); - view = midori_browser_get_current_tab (browser); - if ((text = midori_view_get_selected_text (MIDORI_VIEW (view)))) - gtk_entry_set_text (GTK_ENTRY (browser->find_text), text); - gtk_widget_show (browser->find); - } - - gtk_widget_grab_focus (GTK_WIDGET (browser->find_text)); -} - -static void -_midori_browser_find (MidoriBrowser* browser, - gboolean forward) -{ - const gchar* text; - gboolean case_sensitive; - GtkWidget* view; - - if (!(view = midori_browser_get_current_tab (browser))) - return; - - text = gtk_entry_get_text (GTK_ENTRY (browser->find_text)); - case_sensitive = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); - midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); -} - -static void -_midori_browser_find_done (MidoriBrowser* browser) -{ - GtkWidget* view = midori_browser_get_current_tab (browser); - midori_view_unmark_text_matches (MIDORI_VIEW (view)); - gtk_widget_hide (browser->find); - browser->find_typing = FALSE; - gtk_window_set_focus (GTK_WINDOW (browser), view); + midori_findbar_invoke (MIDORI_FINDBAR (browser->find)); } static void _action_find_next_activate (GtkAction* action, MidoriBrowser* browser) { - _midori_browser_find (browser, TRUE); -} - -static void -midori_browser_find_text_changed_cb (GtkWidget* entry, - MidoriBrowser* browser) -{ - if (browser->find_typing) - { - GtkWidget* view = midori_browser_get_current_tab (browser); - const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); - midori_view_unmark_text_matches (MIDORI_VIEW (view)); - if (g_utf8_strlen (text, -1) > 2) - _midori_browser_find (browser, TRUE); - } -} - -static gboolean -midori_browser_find_text_focus_out_event_cb (GtkWidget* entry, - GdkEventFocus* event, - MidoriBrowser* browser) -{ - if (browser->find_typing) - _midori_browser_find_done (browser); - return FALSE; + midori_findbar_find (MIDORI_FINDBAR (browser->find), TRUE); } static void _action_find_previous_activate (GtkAction* action, MidoriBrowser* browser) { - _midori_browser_find (browser, FALSE); -} - -static void -_find_highlight_toggled (GtkToggleToolButton* toolitem, - MidoriBrowser* browser) -{ - GtkWidget* view; - gboolean highlight; - - view = midori_browser_get_current_tab (browser); - highlight = gtk_toggle_tool_button_get_active (toolitem); - midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); -} - -static gboolean -midori_browser_find_key_press_event_cb (GtkWidget* toolbar, - GdkEventKey* event, - MidoriBrowser* browser) -{ - if (event->keyval == GDK_Escape) - { - _midori_browser_find_done (browser); - return TRUE; - } - - return FALSE; -} - -static void -midori_browser_find_button_close_clicked_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - _midori_browser_find_done (browser); + midori_findbar_find (MIDORI_FINDBAR (browser->find), FALSE); } static void @@ -5805,16 +5660,6 @@ midori_browser_realize_cb (GtkStyle* style, } } -static void -midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry, - gint icon_pos, - gint button, - gpointer user_data) -{ - if (icon_pos == GTK_ICON_ENTRY_SECONDARY) - gtk_entry_set_text (GTK_ENTRY (entry), ""); -} - static void midori_browser_new_history_item (MidoriBrowser* browser, KatzeItem** item) @@ -6031,7 +5876,6 @@ midori_browser_init (MidoriBrowser* browser) GtkSettings* gtk_settings; GtkWidget* hpaned; GtkWidget* vpaned; - GtkToolItem* toolitem; GtkRcStyle* rcstyle; GtkWidget* label; GtkWidget* scrolled; @@ -6435,87 +6279,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view); /* Incremental findbar */ - browser->find = gtk_toolbar_new (); - gtk_widget_set_name (browser->find, "MidoriFindbar"); - gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ); - g_signal_connect (browser->find, "key-press-event", - G_CALLBACK (midori_browser_find_key_press_event_cb), browser); - toolitem = gtk_tool_item_new (); - gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); - gtk_container_add (GTK_CONTAINER (toolitem), - /* i18n: A panel at the bottom, to search text in pages */ - gtk_label_new_with_mnemonic (_("_Inline Find:"))); - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - browser->find_text = gtk_icon_entry_new (); - #if !HAVE_HILDON - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), - GTK_ICON_ENTRY_PRIMARY, - GTK_STOCK_FIND); - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (browser->find_text), - GTK_ICON_ENTRY_SECONDARY, - GTK_STOCK_CLEAR); - gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (browser->find_text), - GTK_ICON_ENTRY_SECONDARY, TRUE); - #endif - g_signal_connect (browser->find_text, "icon-release", - G_CALLBACK (midori_browser_entry_clear_icon_released_cb), NULL); - g_signal_connect (browser->find_text, "activate", - G_CALLBACK (_action_find_next_activate), browser); - g_signal_connect (browser->find_text, "changed", - G_CALLBACK (midori_browser_find_text_changed_cb), browser); - g_signal_connect (browser->find_text, "focus-out-event", - G_CALLBACK (midori_browser_find_text_focus_out_event_cb), browser); - toolitem = gtk_tool_item_new (); - gtk_container_add (GTK_CONTAINER (toolitem), browser->find_text); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - #if HAVE_HILDON - browser->find_case = gtk_toggle_tool_button_new (); - browser->find_highlight = gtk_toggle_tool_button_new (); - #else - toolitem = (GtkToolItem*)gtk_action_create_tool_item - (_action_by_name (browser, "FindPrevious")); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Previous")); - gtk_tool_item_set_is_important (toolitem, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - toolitem = (GtkToolItem*)gtk_action_create_tool_item - (_action_by_name (browser, "FindNext")); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Next")); - gtk_tool_item_set_is_important (toolitem, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - browser->find_case = gtk_toggle_tool_button_new_from_stock ( - GTK_STOCK_SPELL_CHECK); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_case), _("Match Case")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (browser->find_case), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_case, -1); - browser->find_highlight = gtk_toggle_tool_button_new_from_stock ( - GTK_STOCK_SELECT_ALL); - #endif - g_signal_connect (browser->find_highlight, "toggled", - G_CALLBACK (_find_highlight_toggled), browser); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_highlight), - _("Highlight Matches")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (browser->find_highlight), TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_highlight, -1); - toolitem = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw ( - GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); - #if !HAVE_HILDON - gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - #endif - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), toolitem, -1); - browser->find_close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (browser->find_close), - _("Close Findbar")); - g_signal_connect (browser->find_close, "clicked", - G_CALLBACK (midori_browser_find_button_close_clicked_cb), browser); - #if HAVE_OSX - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_close, 0); - #else - gtk_toolbar_insert (GTK_TOOLBAR (browser->find), browser->find_close, -1); - #endif - sokoke_container_show_children (GTK_CONTAINER (browser->find)); + browser->find = g_object_new (MIDORI_TYPE_FINDBAR, NULL); #if HAVE_HILDON hildon_window_add_toolbar (HILDON_WINDOW (browser), GTK_TOOLBAR (browser->find)); diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c new file mode 100644 index 00000000..fa72a3aa --- /dev/null +++ b/toolbars/midori-findbar.c @@ -0,0 +1,327 @@ +/* + Copyright (C) 2008-2010 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "midori-findbar.h" + +#include "midori-browser.h" +#include "gtkiconentry.h" +#include "sokoke.h" + +#include +#include +#include + +#if HAVE_CONFIG_H + #include "config.h" +#endif + +struct _MidoriFindbar +{ + GtkToolbar parent_instance; + GtkWidget* find_text; + GtkToolItem* previous; + GtkToolItem* next; + GtkToolItem* find_case; + GtkToolItem* find_highlight; + GtkToolItem* find_close; + gboolean find_typing; +}; + +struct _MidoriFindbarClass +{ + GtkToolbarClass parent_class; +}; + +G_DEFINE_TYPE (MidoriFindbar, midori_findbar, GTK_TYPE_TOOLBAR); + +static void +midori_findbar_class_init (MidoriFindbarClass* class) +{ + /* Nothing to do */ +} + +static void +midori_findbar_done (MidoriFindbar* findbar) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (findbar)); + GtkWidget* view = midori_browser_get_current_tab (browser); + + midori_view_unmark_text_matches (MIDORI_VIEW (view)); + gtk_widget_hide (GTK_WIDGET (findbar)); + findbar->find_typing = FALSE; + gtk_window_set_focus (GTK_WINDOW (browser), view); +} + +static gboolean +midori_findbar_find_key_press_event_cb (MidoriFindbar* findbar, + GdkEventKey* event) +{ + if (event->keyval == GDK_Escape) + { + midori_findbar_done (findbar); + return TRUE; + } + + return FALSE; +} + +static void +midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry, + gint icon_pos, + gint button, + gpointer user_data) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text (GTK_ENTRY (entry), ""); +} + +void +midori_findbar_find (MidoriFindbar* findbar, + gboolean forward) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (findbar)); + const gchar* text; + gboolean case_sensitive; + GtkWidget* view; + + if (!(view = midori_browser_get_current_tab (browser))) + return; + + text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); + case_sensitive = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (findbar->find_case)); + midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); +} + +void +midori_findbar_invoke (MidoriFindbar* findbar) +{ + if (gtk_widget_get_visible (GTK_WIDGET (findbar))) + midori_findbar_done (findbar); + else + { + MidoriBrowser* browser = midori_browser_get_for_widget (findbar->find_text); + GtkWidget* view = midori_browser_get_current_tab (browser); + const gchar* text; + + #if !HAVE_HILDON + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), + GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND); + gtk_widget_show (GTK_WIDGET (findbar->find_case)); + #endif + gtk_widget_show (GTK_WIDGET (findbar->find_highlight)); + gtk_widget_show (GTK_WIDGET (findbar->find_close)); + if ((text = midori_view_get_selected_text (MIDORI_VIEW (view)))) + gtk_entry_set_text (GTK_ENTRY (findbar->find_text), text); + gtk_widget_show (GTK_WIDGET (findbar)); + } + + gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text)); +} + +static void +midori_findbar_next_activate_cb (GtkWidget* entry, + MidoriFindbar* findbar) +{ + midori_findbar_find (findbar, TRUE); +} + +static void +midori_findbar_previous_clicked_cb (GtkWidget* entry, + MidoriFindbar* findbar) +{ + midori_findbar_find (findbar, FALSE); +} + +static void +midori_findbar_button_close_clicked_cb (GtkWidget* widget, + MidoriFindbar* findbar) +{ + midori_findbar_done (findbar); +} + +static void +midori_findbar_text_changed_cb (GtkWidget* entry, + MidoriFindbar* findbar) +{ + if (findbar->find_typing) + { + MidoriBrowser* browser = midori_browser_get_for_widget (entry); + GtkWidget* view = midori_browser_get_current_tab (browser); + const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); + midori_view_unmark_text_matches (MIDORI_VIEW (view)); + if (g_utf8_strlen (text, -1) > 2) + midori_findbar_find (findbar, TRUE); + } +} + +static gboolean +midori_findbar_text_focus_out_event_cb (GtkWidget* entry, + GdkEventFocus* event, + MidoriFindbar* findbar) +{ + if (findbar->find_typing) + midori_findbar_done (findbar); + return FALSE; +} + +static void +midori_findbar_highlight_toggled_cb (GtkToggleToolButton* toolitem, + MidoriFindbar* findbar) +{ + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (findbar)); + GtkWidget* view = midori_browser_get_current_tab (browser); + gboolean highlight = gtk_toggle_tool_button_get_active (toolitem); + midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); +} + +static void +midori_findbar_init (MidoriFindbar* findbar) +{ + GtkToolItem* toolitem; + + gtk_widget_set_name (GTK_WIDGET (findbar), "MidoriFindbar"); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (findbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style (GTK_TOOLBAR (findbar), GTK_TOOLBAR_BOTH_HORIZ); + g_signal_connect (findbar, "key-press-event", + G_CALLBACK (midori_findbar_find_key_press_event_cb), NULL); + + toolitem = gtk_tool_item_new (); + gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); + gtk_container_add (GTK_CONTAINER (toolitem), + /* i18n: A panel at the bottom, to search text in pages */ + gtk_label_new_with_mnemonic (_("_Inline Find:"))); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1); + findbar->find_text = gtk_icon_entry_new (); + #if !HAVE_HILDON + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), + GTK_ICON_ENTRY_PRIMARY, + GTK_STOCK_FIND); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), + GTK_ICON_ENTRY_SECONDARY, + GTK_STOCK_CLEAR); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (findbar->find_text), + GTK_ICON_ENTRY_SECONDARY, TRUE); + #endif + g_signal_connect (findbar->find_text, "icon-release", + G_CALLBACK (midori_findbar_entry_clear_icon_released_cb), NULL); + g_signal_connect (findbar->find_text, "activate", + G_CALLBACK (midori_findbar_next_activate_cb), findbar); + g_signal_connect (findbar->find_text, "changed", + G_CALLBACK (midori_findbar_text_changed_cb), findbar); + g_signal_connect (findbar->find_text, "focus-out-event", + G_CALLBACK (midori_findbar_text_focus_out_event_cb), findbar); + toolitem = gtk_tool_item_new (); + gtk_container_add (GTK_CONTAINER (toolitem), findbar->find_text); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1); + #if HAVE_HILDON + findbar->find_case = gtk_toggle_tool_button_new (); + findbar->find_highlight = gtk_toggle_tool_button_new (); + #else + findbar->previous = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK); + g_signal_connect (findbar->previous, "clicked", + G_CALLBACK (midori_findbar_previous_clicked_cb), findbar); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->previous), _("Previous")); + gtk_tool_item_set_is_important (findbar->previous, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->previous, -1); + findbar->next = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); + g_signal_connect (findbar->next, "clicked", + G_CALLBACK (midori_findbar_next_activate_cb), findbar); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->next), _("Next")); + gtk_tool_item_set_is_important (findbar->next, TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->next, -1); + findbar->find_case = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_SPELL_CHECK); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->find_case), _("Match Case")); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (findbar->find_case), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_case, -1); + findbar->find_highlight = gtk_toggle_tool_button_new_from_stock ( + GTK_STOCK_SELECT_ALL); + #endif + g_signal_connect (findbar->find_highlight, "toggled", + G_CALLBACK (midori_findbar_highlight_toggled_cb), findbar); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->find_highlight), + _("Highlight Matches")); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (findbar->find_highlight), TRUE); + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_highlight, -1); + toolitem = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE); + #if !HAVE_HILDON + gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); + #endif + gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1); + findbar->find_close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->find_close), + _("Close Findbar")); + g_signal_connect (findbar->find_close, "clicked", + G_CALLBACK (midori_findbar_button_close_clicked_cb), findbar); + #if HAVE_OSX + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, 0); + #else + gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, -1); + #endif + sokoke_container_show_children (GTK_CONTAINER (findbar)); +} + +void +midori_findbar_set_can_find (MidoriFindbar* findbar, + gboolean can_find) +{ + gtk_widget_set_sensitive (GTK_WIDGET (findbar->next), can_find); + gtk_widget_set_sensitive (GTK_WIDGET (findbar->previous), can_find); +} + +void +midori_findbar_search_text (MidoriFindbar* findbar, + GtkWidget* view, + gboolean found, + gchar* typing) +{ + const gchar* text; + gboolean case_sensitive; + gboolean highlight; + + if (typing) + { + MidoriBrowser* browser = midori_browser_get_for_widget (view); + gint position = -1; + + findbar->find_typing = TRUE; + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + findbar->find_highlight), TRUE); + gtk_widget_hide (GTK_WIDGET (findbar->find_case)); + gtk_widget_hide (GTK_WIDGET (findbar->find_highlight)); + gtk_widget_hide (GTK_WIDGET (findbar->find_close)); + if (!gtk_widget_get_visible (GTK_WIDGET (findbar))) + gtk_entry_set_text (GTK_ENTRY (findbar->find_text), ""); + gtk_widget_show (GTK_WIDGET (findbar)); + gtk_window_set_focus (GTK_WINDOW (browser), findbar->find_text); + gtk_editable_insert_text (GTK_EDITABLE (findbar->find_text), + typing, -1, &position); + gtk_editable_set_position (GTK_EDITABLE (findbar->find_text), -1); + } + if (gtk_widget_get_visible (GTK_WIDGET (findbar)) && !typing) + { + #if !HAVE_HILDON + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text), + GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); + #endif + text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); + case_sensitive = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (findbar->find_case)); + midori_view_mark_text_matches (MIDORI_VIEW (view), text, case_sensitive); + highlight = gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (findbar->find_highlight)); + midori_view_set_highlight_text_matches (MIDORI_VIEW (view), highlight); + } +} + + diff --git a/toolbars/midori-findbar.h b/toolbars/midori-findbar.h new file mode 100644 index 00000000..fffa497f --- /dev/null +++ b/toolbars/midori-findbar.h @@ -0,0 +1,57 @@ +/* + Copyright (C) 2010 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_FINDBAR_H__ +#define __MIDORI_FINDBAR_H__ + +#include + +G_BEGIN_DECLS + +#define MIDORI_TYPE_FINDBAR \ + (midori_findbar_get_type ()) +#define MIDORI_FINDBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_FINDBAR, MidoriFindbar)) +#define MIDORI_FINDBAR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_TYPE_FINDBAR, MidoriFindbarClass)) +#define MIDORI_IS_FINDBAR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_FINDBAR)) +#define MIDORI_IS_FINDBAR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), MIDORI_TYPE_FINDBAR)) +#define MIDORI_FINDBAR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), MIDORI_TYPE_FINDBAR, MidoriFindbarClass)) + +typedef struct _MidoriFindbar MidoriFindbar; +typedef struct _MidoriFindbarClass MidoriFindbarClass; + +GType +midori_findbar_get_type (void); + +void +midori_findbar_invoke (MidoriFindbar* findbar); + +void +midori_findbar_find (MidoriFindbar* findbar, + gboolean forward); + +void +midori_findbar_set_can_find (MidoriFindbar* findbar, + gboolean can_find); + +void +midori_findbar_search_text (MidoriFindbar* findbar, + GtkWidget* view, + gboolean found, + gchar* typing); + +G_END_DECLS + +#endif /* __MIDORI_FINDBAR_H__ */ From 111fb25a93e193cbd1c6594917968978db8b6628 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Mon, 21 Jun 2010 11:19:24 +0200 Subject: [PATCH 2720/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 647 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 331 insertions(+), 316 deletions(-) diff --git a/po/pt.po b/po/pt.po index d541d1ee..0b2aff24 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,23 +7,23 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-09 16:08+0000\n" +"POT-Creation-Date: 2010-06-21 04:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: PORTUGAL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: PORTUGAL\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navegador Web rápido" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 -#: ../midori/main.c:1692 ../midori/main.c:1708 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -47,7 +47,7 @@ msgstr "O valor '%s' é inválido para %s" msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" @@ -58,172 +58,172 @@ msgstr "Falha ao abrir a base de dados: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico antigo: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "A configuração não foi guardada. %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Os motores de pesquisa não foram guardados. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram guardados. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A configuração não foi guardada. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Os motores de pesquisa não foram guardados. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nenhum certificado root disponível. Os certificados SSL não podem ser verificados." -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1230 ../midori/main.c:1957 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1354 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1373 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1404 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1576 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1576 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1579 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1579 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1582 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1584 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1587 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1590 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1592 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1594 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1596 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão PATTERN" -#: ../midori/main.c:1596 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1600 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repor Midori após SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1600 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1681 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1709 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1711 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1808 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1856 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1911 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1940 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1972 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1986 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:2000 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:2016 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignorar " @@ -240,135 +240,108 @@ msgstr "Documento inválido." msgid "Unrecognized bookmark format." msgstr "Formato de marcadores não reconhecido." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5576 -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5250 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:449 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:487 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao actualizar título: %s\n" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:750 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 -#: ../midori/midori-browser.c:4737 ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:853 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Adicionar a _Ligação Rápida" -#: ../midori/midori-browser.c:866 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:975 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4787 -#: ../midori/midori-browser.c:4819 +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4487 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1409 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-browser.c:1445 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "O ficheiro '%s' foi transferido." - -#: ../midori/midori-browser.c:1449 -msgid "Transfer completed" -msgstr "Transferência concluída" - -#: ../midori/midori-browser.c:1589 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:1906 ../midori/midori-browser.c:1908 -msgid "Some files are being downloaded" -msgstr "Existem ficheiros a ser transferidos" - -#: ../midori/midori-browser.c:1912 -msgid "_Quit Midori" -msgstr "_Sair do Midori" - -#: ../midori/midori-browser.c:1914 -msgid "The transfers will be cancelled if Midori quits." -msgstr "As transferências serão canceladas se sair do Midori." - -#: ../midori/midori-browser.c:2375 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2453 +#: ../midori/midori-browser.c:2230 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -376,670 +349,642 @@ msgstr "" "Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" "Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." -#: ../midori/midori-browser.c:2459 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5641 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3075 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../midori/midori-browser.c:3155 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3778 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:4092 ../midori/midori-browser.c:6035 +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4425 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4326 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4327 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4328 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4329 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:4330 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4351 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4697 +#: ../midori/midori-browser.c:4365 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4724 ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4798 +#: ../midori/midori-browser.c:4466 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4834 +#: ../midori/midori-browser.c:4502 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4888 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4663 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4667 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4681 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:5024 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4698 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:4703 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:4708 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:5045 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:5050 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4726 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:4827 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4829 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:4848 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5157 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5491 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5160 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5163 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5165 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5166 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5170 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5173 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5175 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5176 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5178 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5179 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5181 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5187 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5188 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5190 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5191 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5194 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5197 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5199 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5203 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5206 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5210 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5545 ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5219 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5222 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5225 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5231 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5234 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5238 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5240 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5241 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5253 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5256 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5259 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5260 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5262 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5263 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5266 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5269 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5270 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5272 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5273 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5276 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5279 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5282 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5285 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5288 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5292 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5296 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5299 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5301 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5302 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5304 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5305 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5311 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5312 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5317 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5652 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5321 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5324 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5325 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5330 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5336 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5339 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5341 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5342 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5344 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5345 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5347 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5349 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5350 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5352 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5353 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5355 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5356 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5359 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5367 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5368 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5371 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5372 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5375 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5376 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5379 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5380 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5383 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5384 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5387 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5388 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:5396 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5731 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5403 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5741 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5744 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5747 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6293 +#: ../midori/midori-browser.c:5949 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5956 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:5958 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:5982 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:5984 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6349 +#: ../midori/midori-browser.c:6005 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6020 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6022 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:6381 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6383 +#: ../midori/midori-browser.c:6039 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:6398 +#: ../midori/midori-browser.c:6054 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6411 +#: ../midori/midori-browser.c:6067 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6413 +#: ../midori/midori-browser.c:6069 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6427 +#: ../midori/midori-browser.c:6083 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6429 +#: ../midori/midori-browser.c:6085 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6636 -msgid "_Inline Find:" -msgstr "Local_izar:" - -#: ../midori/midori-browser.c:6667 -msgid "Previous" -msgstr "Anterior" - -#: ../midori/midori-browser.c:6672 -msgid "Next" -msgstr "Seguinte" - -#: ../midori/midori-browser.c:6677 -msgid "Match Case" -msgstr "Sensível à Capitalização" - -#: ../midori/midori-browser.c:6686 -msgid "Highlight Matches" -msgstr "Realçar Correspondências" - -#: ../midori/midori-browser.c:6698 -msgid "Close Findbar" -msgstr "Fechar" - -#: ../midori/midori-browser.c:6744 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Limpar Tudo" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6670 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" @@ -1911,15 +1856,15 @@ msgstr "_Minizar Separadores" msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4789 +#: ../midori/midori-view.c:4797 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4790 +#: ../midori/midori-view.c:4798 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4842 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2095,67 +2040,102 @@ msgstr "Gerir Motores de Pesquisa" msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Adicionar _Marcador" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Página Inicial" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "Argumentos de _Utilizador" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "_Novo Separador" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "P_lugins Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Nova _Pasta" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "O ficheiro '%s' foi transferido." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Transferência concluída" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Limpar Tudo" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Existem ficheiros a ser transferidos" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Sair do Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "As transferências serão canceladas se sair do Midori." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Falha ao adicionar marcador: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Editar marcador seleccionado" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Apagar marcador seleccionado" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Separador" @@ -2458,6 +2438,18 @@ msgstr "Gestor de _Cookies" msgid "List, view and delete cookies" msgstr "Listar, ver e apagar cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Copiar _Endereço do Separador" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Copiar Endereço dos Separadores" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copiar endereço de todos os separadores para a área de transferência" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Falha ao encontrar os elementos Atom de \"entry\" nos dados XML." @@ -2641,6 +2633,14 @@ msgstr "Lista de Histórico do Separador" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Permite mudar de separadores ao escolher de uma lista ordenada por uso" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Minimizar novos Separadores" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Minimizar novos separadores ao abrir" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personalizar Barra de Ferramentas" @@ -2673,6 +2673,24 @@ msgstr "Editar facilmente a barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "_Inline Find:" +#~ msgstr "Local_izar:" + +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgid "Next" +#~ msgstr "Seguinte" + +#~ msgid "Match Case" +#~ msgstr "Sensível à Capitalização" + +#~ msgid "Highlight Matches" +#~ msgstr "Realçar Correspondências" + +#~ msgid "Close Findbar" +#~ msgstr "Fechar" + #~ msgid "Set number of shortcuts" #~ msgstr "Definir número de atalhos" @@ -2697,9 +2715,6 @@ msgstr "Pôr comunicações HTTP em cache" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Falha na obtenção da hora actual: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Falha ao adicionar histórico: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Mostrar _títulos do painel" From 63f754948031a8101d43d08909cc74a4b5ca3a0a Mon Sep 17 00:00:00 2001 From: Harald Servat Date: Mon, 21 Jun 2010 18:10:45 +0200 Subject: [PATCH 2721/2970] l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 651 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 334 insertions(+), 317 deletions(-) diff --git a/po/ca.po b/po/ca.po index 2f27474a..805e5caa 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-09 10:08+0000\n" +"POT-Creation-Date: 2010-06-21 16:08+0000\n" "PO-Revision-Date: 2010-05-04 19:53+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -24,8 +24,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lleuger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 -#: ../midori/main.c:1692 ../midori/main.c:1708 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -49,7 +49,7 @@ msgstr "El valor «%s» no és vàlid per %s" msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "No s'ha pogut obrir la base de dades: %s\n" @@ -60,172 +60,172 @@ msgstr "No s'ha pogut obrir la base de dades: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "No s'han pogut eliminar els elements antics de l'historial: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "No s'ha pogut desar la configuració: %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "No es pot desar les enginys de cerca. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No s'han pogut desar les adreces d'interès. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "No s'ha pogut desar la configuració: %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "No es pot desar les enginys de cerca. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "No es disposa del certificat arrel. Els certificats SSL no es poden verificar." -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Modificació de les _preferències" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Reiniciar la darrera _sessió" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1230 ../midori/main.c:1957 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1354 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "No s'ha especificat un nom de fitxer" -#: ../midori/main.c:1373 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Ha ocorregut un error desconegut." -#: ../midori/main.c:1404 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1576 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1576 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1579 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1579 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1582 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1584 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1587 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1590 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1592 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1594 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1596 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1596 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1600 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1600 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1681 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1709 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1711 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1808 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuració especificada és invalida." -#: ../midori/main.c:1856 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n" -#: ../midori/main.c:1911 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No s'han pogut carregar els motors de cerca. %s\n" -#: ../midori/main.c:1940 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1972 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1986 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:2000 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:2016 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignora" @@ -242,808 +242,755 @@ msgstr "Document format erròniament." msgid "Unrecognized bookmark format." msgstr "No es reconeix el format de l'adreça d'interès." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5576 -#: ../midori/midori-browser.c:5582 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5250 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:449 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" -#: ../midori/midori-browser.c:487 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:750 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4732 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 -#: ../midori/midori-browser.c:4737 ../midori/midori-browser.c:4769 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:853 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:866 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:975 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4787 -#: ../midori/midori-browser.c:4819 +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4487 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1409 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-browser.c:1445 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "S'ha descarregat el fitxer «%s»." - -#: ../midori/midori-browser.c:1449 -msgid "Transfer completed" -msgstr "Transferència finalitzada" - -#: ../midori/midori-browser.c:1589 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:1906 ../midori/midori-browser.c:1908 -msgid "Some files are being downloaded" -msgstr "S'estan descarregant fitxers" - -#: ../midori/midori-browser.c:1912 -msgid "_Quit Midori" -msgstr "_Sortir de Midori" - -#: ../midori/midori-browser.c:1914 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Les transferències es cancel·laran si se surt de Midori." - -#: ../midori/midori-browser.c:2375 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2453 +#: ../midori/midori-browser.c:2230 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" +"Per a usar l'URI que hi ha a dalt, obriu un agregador de notícies. Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o similar.\n" +"Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu agregador de notícies. El proper cop que cliqueu a la icona de les notícies, s'agregarà automàticament." -#: ../midori/midori-browser.c:2459 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5641 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:3075 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" -#: ../midori/midori-browser.c:3155 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Buit" -#: ../midori/midori-browser.c:3778 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:4092 ../midori/midori-browser.c:6035 +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:4425 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:4435 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4326 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4327 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4328 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4329 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:4330 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4683 +#: ../midori/midori-browser.c:4351 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4686 ../midori/midori-browser.c:5646 +#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4697 +#: ../midori/midori-browser.c:4365 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4724 ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4798 +#: ../midori/midori-browser.c:4466 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4834 +#: ../midori/midori-browser.c:4502 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4888 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4663 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4667 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4681 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:5024 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4698 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:4703 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:4708 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:5045 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:5050 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4726 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:4827 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4829 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:4848 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5157 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:5491 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5160 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5163 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5165 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5166 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5170 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5173 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5175 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5176 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5178 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5179 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5181 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5187 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5188 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5190 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5191 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5194 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5197 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5199 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5203 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5206 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5210 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:5545 ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5219 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5222 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5225 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5231 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5234 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5238 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5240 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5241 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5585 +#: ../midori/midori-browser.c:5253 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5256 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5259 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5260 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5262 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5263 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5266 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5269 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5270 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5272 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5273 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5276 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5279 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5282 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5285 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5288 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5292 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5296 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5299 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5301 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5302 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5304 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5637 +#: ../midori/midori-browser.c:5305 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5311 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5312 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5317 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5652 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5321 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5324 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5325 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5330 msgid "Inspect page details and access developer tools..." msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5336 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5339 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5341 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5342 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5344 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5345 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5347 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5349 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5350 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5352 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5353 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5355 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5356 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5359 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5367 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5368 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5371 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5372 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5375 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5376 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5379 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5380 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5383 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5384 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5387 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5720 +#: ../midori/midori-browser.c:5388 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5728 +#: ../midori/midori-browser.c:5396 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5731 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5403 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5741 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5744 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5747 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6293 +#: ../midori/midori-browser.c:5949 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5956 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:6302 +#: ../midori/midori-browser.c:5958 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:5982 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:5984 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:6349 +#: ../midori/midori-browser.c:6005 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:6364 +#: ../midori/midori-browser.c:6020 msgid "_Recently visited pages" msgstr "Pàgines visitades _recentment" -#: ../midori/midori-browser.c:6366 +#: ../midori/midori-browser.c:6022 msgid "Reopen pages that you visited earlier" msgstr "Reobre pàgines que heu visitat anteriorment" -#: ../midori/midori-browser.c:6381 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/midori-browser.c:6383 +#: ../midori/midori-browser.c:6039 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:6398 +#: ../midori/midori-browser.c:6054 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:6411 +#: ../midori/midori-browser.c:6067 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:6413 +#: ../midori/midori-browser.c:6069 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:6427 +#: ../midori/midori-browser.c:6083 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6429 +#: ../midori/midori-browser.c:6085 msgid "Menu" msgstr "Menú" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6636 -msgid "_Inline Find:" -msgstr "Cerca en _línia:" - -#: ../midori/midori-browser.c:6667 -msgid "Previous" -msgstr "Anterior" - -#: ../midori/midori-browser.c:6672 -msgid "Next" -msgstr "Següent" - -#: ../midori/midori-browser.c:6677 -msgid "Match Case" -msgstr "Coincidència de majúscules i minúscules" - -#: ../midori/midori-browser.c:6686 -msgid "Highlight Matches" -msgstr "Ressalta les coincidències" - -#: ../midori/midori-browser.c:6698 -msgid "Close Findbar" -msgstr "Tanca la barra de cerques" - -#: ../midori/midori-browser.c:6744 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Netejar-ho tot" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6670 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" @@ -1108,7 +1055,7 @@ msgstr "Mostra les pestanyes obertes recentment" #: ../midori/midori-websettings.c:207 msgid "Show last tabs without loading" -msgstr "" +msgstr "Mostra les darreres pestanyes sense carregar-les" #: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" @@ -1855,7 +1802,7 @@ msgstr "Introduïu el nombre de columnes i files:" #: ../midori/midori-view.c:3520 msgid "Invalid input for the size of the speed dial" -msgstr "" +msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida" #: ../midori/midori-view.c:3521 msgid "Thumb size:" @@ -1915,15 +1862,15 @@ msgstr "_Minimitza la pestanya" msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4789 +#: ../midori/midori-view.c:4797 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4790 +#: ../midori/midori-view.c:4798 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4842 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Característiques" @@ -2099,67 +2046,102 @@ msgstr "Gestiona els ginys de cerca" msgid "Use as _default" msgstr "Empra'l per _defecte" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Adreça d'interès" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Afegeix adreça d'_interès" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Pàgina d'inici" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "Scripts d'_usuari" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Nova _pestanya" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Transferències" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "_Connectors de Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Nova _carpeta" -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "S'ha descarregat el fitxer «%s»." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Transferència finalitzada" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Netejar-ho tot" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "S'estan descarregant fitxers" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Sortir de Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Les transferències es cancel·laran si se surt de Midori." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "No s'ha pogut afegir un ítem a les adreces d'interès: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Separador" @@ -2462,6 +2444,18 @@ msgstr "_Gestor de galetes" msgid "List, view and delete cookies" msgstr "Llista, mostra i borra galetes" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Copia les adreces de les pestanyes" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Copia les adreces de les pestanyes" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copia les adreces de totes les pestanyes al porta-retalls" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "No s'han pogut trobar elements Atom \"entry\" en les dades XML." @@ -2645,6 +2639,14 @@ msgstr "Pestanya amb la llista de l'historial" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "_Minimitza les noves pestanyes" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Les noves pestanyes s'obren minimitzades" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "_Personalitza la barra d'eines" @@ -2677,6 +2679,24 @@ msgstr "Edita fàcilment la distribució de la barra d'eines" msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" +#~ msgid "_Inline Find:" +#~ msgstr "Cerca en _línia:" + +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgid "Next" +#~ msgstr "Següent" + +#~ msgid "Match Case" +#~ msgstr "Coincidència de majúscules i minúscules" + +#~ msgid "Highlight Matches" +#~ msgstr "Ressalta les coincidències" + +#~ msgid "Close Findbar" +#~ msgstr "Tanca la barra de cerques" + #~ msgid "Set number of shortcuts" #~ msgstr "Estableix el nombre de dreceres" @@ -2698,9 +2718,6 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP" #~ msgid "Failed to get current time: %s\n" #~ msgstr "No s'ha pogut obtenir l'hora actual: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "No s'ha pogut afegir un ítem a l'historial: %s\n" - #~ msgid "View Selection Source" #~ msgstr "Veure el codi font de la selecció" From bc6849494d4c95c8a00d55afc8951c5feb375001 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jun 2010 21:24:01 +0200 Subject: [PATCH 2722/2970] Add 'Open in New Window' to page context menu While we're at it, the label of the according tab menu item should be the same. --- midori/midori-view.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 40352d92..a889492f 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1939,6 +1939,14 @@ midori_web_view_menu_download_activate_cb (GtkWidget* widget, sokoke_spawn_program (view->download_manager, view->link_uri, FALSE); } +static void +midori_view_tab_label_menu_window_new_cb (GtkWidget* menuitem, + GtkWidget* view) +{ + g_signal_emit (view, signals[NEW_WINDOW], 0, + midori_view_get_display_uri (MIDORI_VIEW (view))); +} + #if WEBKIT_CHECK_VERSION (1, 1, 17) static void midori_web_view_menu_inspect_element_activate_cb (GtkWidget* widget, @@ -2410,8 +2418,13 @@ midori_view_populate_popup (MidoriView* view, gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ()); menuitem = sokoke_action_create_popup_menu_item ( - gtk_action_group_get_action (actions, "UndoTabClose")); + gtk_action_group_get_action (actions, "UndoTabClose")); gtk_menu_shell_append (menu_shell, menuitem); + menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL); + gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), _("Open in New _Window")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view); #if WEBKIT_CHECK_VERSION (1, 1, 15) /* if (webkit_web_view_get_main_frame (web_view) != frame_under_mouse) @@ -4004,13 +4017,6 @@ midori_view_tab_label_menu_open_cb (GtkWidget* menuitem, midori_browser_set_current_tab (browser, view); } -static void -midori_view_tab_label_menu_window_new_cb (GtkWidget* menuitem, - GtkWidget* view) -{ - g_signal_emit (view, signals[NEW_WINDOW], 0, - midori_view_get_display_uri (MIDORI_VIEW (view))); -} static void midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget* menuitem, @@ -4094,6 +4100,7 @@ midori_view_get_tab_menu (MidoriView* view) g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_open_cb), view); menuitem = gtk_image_menu_item_new_from_stock (STOCK_WINDOW_NEW, NULL); + gtk_menu_item_set_label (GTK_MENU_ITEM (menuitem), _("Open in New _Window")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_window_new_cb), view); From 00f417b7104662d487e6dbdc0b8b47210dc44a11 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jun 2010 22:22:24 +0200 Subject: [PATCH 2723/2970] Add MidoriFindbar to POTFILES.in --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index ca352d16..39b59100 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,6 +12,7 @@ midori/midori-view.c midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c +toolbars/midori-findbar.c toolbars/midori-transferbar.c panels/midori-bookmarks.c panels/midori-console.c From e200f2cb3ead57f370615ddfec71d16e1184906d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 21 Jun 2010 22:47:52 +0200 Subject: [PATCH 2724/2970] Hide panel if a panel was activated that's already shown Also default hotkeys for History And Transfers. --- midori/midori-panel.c | 5 +++++ midori/sokoke.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 33618ae3..97b43517 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -712,6 +712,11 @@ midori_panel_action_activate_cb (GtkRadioAction* action, && gtk_radio_action_get_current_value (action) == katze_object_get_int (action, "value")) midori_panel_detach_page (panel, n); + else if (gtk_radio_action_get_current_value (action) + == katze_object_get_int (action, "value") + && gtk_widget_get_visible (GTK_WIDGET (panel)) + && midori_panel_get_current_page (panel) == n) + gtk_widget_hide (GTK_WIDGET (panel)); else { midori_panel_set_current_page (panel, n); diff --git a/midori/sokoke.c b/midori/sokoke.c index b71bb86e..c3f3d826 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1289,11 +1289,11 @@ sokoke_register_stock_items (void) { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark"), 0, 0, GTK_STOCK_ADD }, { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, - { STOCK_HISTORY, N_("_History"), 0, 0, GTK_STOCK_SORT_ASCENDING }, + { STOCK_HISTORY, N_("_History"), 0, GDK_H, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, - { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, + { STOCK_TRANSFERS, N_("_Transfers"), 0, GDK_J, GTK_STOCK_SAVE }, { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, From 6ac4bba4d055eafc94aca6121397e582df99b4fc Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 22 Jun 2010 03:13:40 +0200 Subject: [PATCH 2725/2970] l10n: Updated Hungarian (hu) translation to 100% New status: 629 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hu.po | 3266 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 2244 insertions(+), 1022 deletions(-) diff --git a/po/hu.po b/po/hu.po index fd67e1f0..f5c66e8f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,1494 +1,2716 @@ -# Hungarian translations for midori package. -# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# Hungarian translation of midori +# Copyright 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the midori package. -# SZERVÁC Attila 2008 # +# Gabor Kelemen , 2010. msgid "" msgstr "" -"Project-Id-Version: midori 0.0.18\n" +"Project-Id-Version: midori master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:25+0100\n" -"PO-Revision-Date: 2008-05-10 19:33+0100\n" -"Last-Translator: SZERVÁC Attila \n" -"Language-Team: Hungarian \n" +"POT-Creation-Date: 2010-06-12 16:08+0000\n" +"PO-Revision-Date: 2010-06-22 03:12+0200\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Pehelysúlyú webböngésző" +msgstr "Könnyűsúlyú webböngésző" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 +#: ../midori/main.c:1692 ../midori/main.c:1708 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Webböngésző" -#: ../midori/main.c:86 -msgid "_Bookmark" -msgstr "" - -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 -msgid "_Bookmarks" -msgstr "Könyv_jelzők" - -#: ../midori/main.c:88 -msgid "_Add Bookmark" -msgstr "" - -#: ../midori/main.c:89 -msgid "_Console" -msgstr "_Konzol" - -#: ../midori/main.c:90 -msgid "_Extensions" -msgstr "K_iterjesztések" - -#: ../midori/main.c:91 -msgid "_History" -msgstr "_Történet" - -#: ../midori/main.c:92 -msgid "_Homepage" -msgstr "H_onlap" - -#: ../midori/main.c:93 -msgid "_Userscripts" -msgstr "" - -#: ../midori/main.c:94 -msgid "User_styles" -msgstr "" - -#: ../midori/main.c:95 -msgid "New _Tab" -msgstr "Új _lap" - -#: ../midori/main.c:96 -msgid "_Transfers" -msgstr "_Letöltések" - -#: ../midori/main.c:97 -msgid "_Closed Tabs and Windows" -msgstr "_Bezárt lapok és ablakok" - -#: ../midori/main.c:98 -msgid "New _Window" -msgstr "Új _ablak" - -#: ../midori/main.c:143 -#, fuzzy, c-format +#: ../midori/main.c:102 +#, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "A beállítást nem sikerült betölteni. %s\n" +msgstr "A beállítások nem tölthetők be: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" -msgstr "'%s' érték érvénytelen ehhez: %s" +msgstr "A(z) „%s” érték érvénytelen ehhez: %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" -msgstr "" +msgstr "Érvénytelen beállításérték: „%s”" -#: ../midori/main.c:532 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Az adatbázis nem nyitható meg: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:425 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "A régi előzményelemek eltávolítása meghiúsult: %s\n" + +#: ../midori/main.c:457 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A beállítások nem menthetők. %s" + +#: ../midori/main.c:495 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "A keresőmotorok nem menthetők. %s" + +#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "A könyvjelzők nem menthetők. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:614 ../midori/main.c:637 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "A Kuka nem menthető. %s" + +#: ../midori/main.c:696 ../midori/main.c:936 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "A munkamenet nem menthető. %s" + +#: ../midori/main.c:880 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Nem érhető el gyökértanúsítvány-fájl. Az SSL-tanúsítványok nem ellenőrizhetők." + +#: ../midori/main.c:970 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Úgy tűnik, hogy a Midori összeomlott az utolsó futásakor. Ha ez ismételten " +"előfordul, a probléma megoldása érdekében próbálja ki a következő " +"lehetőségeket." + +#: ../midori/main.c:985 +msgid "Modify _preferences" +msgstr "Beállítások _módosítása" + +#: ../midori/main.c:989 +msgid "Reset the last _session" +msgstr "_Utolsó munkamenet visszaállítása" + +#: ../midori/main.c:994 +msgid "Disable all _extensions" +msgstr "Minden _kiterjesztés letiltása" + +#: ../midori/main.c:1230 ../midori/main.c:1957 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "A munkamenet nem tölthető be: %s\n" + +#: ../midori/main.c:1354 +msgid "No filename specified" +msgstr "Nincs megadva fájlnév" + +#: ../midori/main.c:1373 +msgid "An unknown error occured." +msgstr "Ismeretlen hiba történt." + +#: ../midori/main.c:1404 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Pillanatkép mentve ide: %s\n" + +#: ../midori/main.c:1576 +msgid "Run ADDRESS as a web application" +msgstr "A CÍM futtatása webalkalmazásként" + +#: ../midori/main.c:1576 +msgid "ADDRESS" +msgstr "CÍM" + +#: ../midori/main.c:1579 +msgid "Use FOLDER as configuration folder" +msgstr "A MAPPA használata konfigurációs mappaként" + +#: ../midori/main.c:1579 +msgid "FOLDER" +msgstr "MAPPA" + +#: ../midori/main.c:1582 +msgid "Show a diagnostic dialog" +msgstr "Diagnosztikai ablak megjelenítése" + +#: ../midori/main.c:1584 +msgid "Run the specified filename as javascript" +msgstr "A megadott fájl futtatása javascriptként" + +#: ../midori/main.c:1587 +msgid "Take a snapshot of the specified URI" +msgstr "Pillanatkép készítése a megadott URI-ről" + +#: ../midori/main.c:1590 +msgid "Execute the specified command" +msgstr "A megadott parancs futtatása" + +#: ../midori/main.c:1592 +msgid "Display program version" +msgstr "A program verziójának megjelenítése" + +#: ../midori/main.c:1594 +msgid "Addresses" +msgstr "Címek" + +#: ../midori/main.c:1596 +msgid "Block URIs according to regular expression PATTERN" +msgstr "URI-címek blokkolása a MINTA reguláris kifejezés alapján" + +#: ../midori/main.c:1596 +msgid "PATTERN" +msgstr "MINTA" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1600 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "A Midori visszaállítása ennyi MÁSODPERC inaktivitás után" + +#: ../midori/main.c:1600 +msgid "SECONDS" +msgstr "MÁSODPERC" + +#: ../midori/main.c:1681 +msgid "[Addresses]" +msgstr "[Címek]" + +#: ../midori/main.c:1709 +msgid "Please report comments, suggestions and bugs to:" +msgstr "A megjegyzéseit, javaslatait és a hibákat ide küldje:" + +#: ../midori/main.c:1711 +msgid "Check for new versions at:" +msgstr "Új verziókért lásd:" + +#: ../midori/main.c:1808 +msgid "The specified configuration folder is invalid." +msgstr "A megadott konfigurációs mappa érvénytelen." + +#: ../midori/main.c:1856 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "A Midori egy példánya már fut, de nem válaszol.\n" + +#: ../midori/main.c:1911 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "A keresőmotorok nem tölthetők be. %s\n" + +#: ../midori/main.c:1940 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "A könyvjelzők nem tölthetők be: %s\n" + +#: ../midori/main.c:1972 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "A Kuka nem tölthető be: %s\n" + +#: ../midori/main.c:1986 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Az előzmények nem tölthetők be: %s\n" + +#: ../midori/main.c:2000 +msgid "The following errors occured:" +msgstr "A következő hibák történtek:" + +#: ../midori/main.c:2016 +msgid "_Ignore" +msgstr "_Kihagyás" + +#: ../midori/midori-array.c:428 msgid "File not found." msgstr "A fájl nem található." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:495 msgid "Malformed document." -msgstr "Hibás dokumentum." +msgstr "Rosszul formált dokumentum." -#: ../midori/main.c:571 ../midori/main.c:603 -#, c-format -msgid "Failed to open database: %s\n" -msgstr "" +#: ../midori/midori-array.c:504 +msgid "Unrecognized bookmark format." +msgstr "Ismeretlen könyvjelzőformátum." -#: ../midori/main.c:657 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "" - -#: ../midori/main.c:681 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "" - -#: ../midori/main.c:714 ../midori/main.c:728 -#, c-format -msgid "Failed to add history item: %s\n" -msgstr "" - -#. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 -#, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "" - -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Az írás meghiúsult." -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Letöltések" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "A folyamatot nem tudtam elmenteni. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Program verzió kiírása" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "" - -#: ../midori/main.c:1335 -#, fuzzy -msgid "[URIs]" -msgstr "[URL]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Véleményeket, javaslatokat és hibákat ide:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Új verziók keresése itt:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:1447 -#, fuzzy, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "A könyvjelzőket nem tudtam betölteni. %s\n" - -#: ../midori/main.c:1463 -#, fuzzy, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "A folyamatot nem tudtam betölteni. %s\n" - -#: ../midori/main.c:1477 -#, fuzzy, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "A kukát nem tudtam betölteni. %s\n" - -#: ../midori/main.c:1491 -#, fuzzy, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "A kukát nem tudtam betölteni. %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "Az alábbi hibák történtek:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "A keresőmotorokat nem tudtam elmenteni. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "A könyvjelzőket nem tudtam elmenteni. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "A kukát nem tudtam elmenteni. %s" - -#: ../midori/main.c:1715 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "A beállítást nem tudtam elmenteni. %s" - -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5578 msgid "Reload the current page" -msgstr "Oldal újratöltése" +msgstr "Az aktuális oldal újratöltése" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5575 msgid "Stop loading the current page" -msgstr "Betöltés leállítása" +msgstr "Az aktuális oldal betöltésének leállítása" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:449 #, c-format msgid "%d%% loaded" msgstr "%d%% betöltve" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:487 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "A cím frissítése meghiúsult: %s\n" + +#: ../midori/midori-browser.c:501 #, c-format msgid "Unexpected action '%s'." -msgstr "Ismeretlen '%s' művelet" +msgstr "Váratlan művelet: „%s”." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:717 +msgid "New folder" +msgstr "Új mappa" + +#: ../midori/midori-browser.c:717 +msgid "Edit folder" +msgstr "Mappa szerkesztése" + +#: ../midori/midori-browser.c:719 msgid "New bookmark" msgstr "Új könyvjelző" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:719 msgid "Edit bookmark" msgstr "Könyvjelző szerkesztése" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:750 msgid "_Title:" msgstr "_Cím:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Leírás:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 +msgid "_Address:" +msgstr "_Webcím:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4728 msgid "_Folder:" msgstr "_Mappa:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Gyökér" +#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 +#: ../midori/midori-browser.c:4733 ../midori/midori-browser.c:4765 +msgid "Toplevel folder" +msgstr "Felső szintű mappa" -#: ../midori/midori-browser.c:668 -#, fuzzy +#: ../midori/midori-browser.c:853 +msgid "Add to _Speed Dial" +msgstr "Felvétel a _gyorstárcsázásba" + +#: ../midori/midori-browser.c:866 +msgid "Show in the tool_bar" +msgstr "M_egjelenítés az eszköztáron" + +#: ../midori/midori-browser.c:881 +msgid "Run as _web application" +msgstr "_Futtatás webalkalmazásként" + +#: ../midori/midori-browser.c:975 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Nincs elég szabad lemezhely a(z) „%s” letöltéséhez." + +#: ../midori/midori-browser.c:979 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "A fájl %s helyet igényel, de csak %s maradt." + +#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4783 +#: ../midori/midori-browser.c:4815 msgid "Save file as" -msgstr "Mentés fájlba" +msgstr "Fájl mentése másként" -#: ../midori/midori-browser.c:1248 -#, fuzzy +#: ../midori/midori-browser.c:1410 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../midori/midori-browser.c:1446 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "A(z) „%s” fájl letöltve." + +#: ../midori/midori-browser.c:1450 +msgid "Transfer completed" +msgstr "Átvitel kész" + +#: ../midori/midori-browser.c:1590 +msgid "Save file" +msgstr "Fájl mentése" + +#: ../midori/midori-browser.c:1907 ../midori/midori-browser.c:1909 +msgid "Some files are being downloaded" +msgstr "Néhány fájl letöltése folyamatban" + +#: ../midori/midori-browser.c:1913 +msgid "_Quit Midori" +msgstr "_Kilépés a Midoriból" + +#: ../midori/midori-browser.c:1915 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból." + +#: ../midori/midori-browser.c:2376 msgid "Open file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:2328 -msgid "Open in New _Tab" -msgstr "Megnyitás új _lapon" +#: ../midori/midori-browser.c:2454 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"A fenti URI használatához nyisson meg egy hírforrásolvasót. Általában találhat egy " +"„Új feliratkozás”, „Új hírforrás” vagy hasonló menüt vagy gombot.\n" +"Ennek alternatívájaként nyissa meg a Beállítások -> Alkalmazások fület, és válasszon " +"egy hírforrásolvasót. A hírforrások ikonjára kattintva ezután az automatikusan " +"felvételre kerül." -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2460 ../extensions/feed-panel/main.c:361 +msgid "New feed" +msgstr "Új hírforrás" + +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5637 +#: ../panels/midori-bookmarks.c:233 +msgid "Add a new bookmark" +msgstr "Új könyvjelző hozzáadása" + +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s\n" + +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Üres" + +#: ../midori/midori-browser.c:3774 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 +msgid "Could not run external program." +msgstr "A külső program nem futtatható." + +#: ../midori/midori-browser.c:4088 ../midori/midori-browser.c:6031 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Az új előzményelem beszúrása meghiúsult: %s\n" + +#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 +msgid "Open all in _Tabs" +msgstr "Összes _megnyitása lapokon" + +#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Tab" +msgstr "Megnyi_tás új lapon" + +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Megnyitás új _ablakban" -#: ../midori/midori-browser.c:2601 -msgid "Separator" -msgstr "Elválasztó" +#: ../midori/midori-browser.c:4654 +msgid "Arora" +msgstr "Arora" -#: ../midori/midori-browser.c:2712 +#: ../midori/midori-browser.c:4655 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4656 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4657 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4658 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4679 +msgid "Import bookmarks..." +msgstr "Könyvjelzők importálása…" + +#: ../midori/midori-browser.c:4682 ../midori/midori-browser.c:5642 +msgid "_Import bookmarks" +msgstr "_Könyvjelzők importálása" + +#: ../midori/midori-browser.c:4693 +msgid "_Application:" +msgstr "_Alkalmazás:" + +#: ../midori/midori-browser.c:4720 ../midori/midori-browser.c:5746 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../katze/katze-utils.c:691 +msgid "Custom..." +msgstr "Egyéni…" + +#: ../midori/midori-browser.c:4794 +msgid "Failed to import bookmarks" +msgstr "A könyvjelzők importálása sikertelen" + +#: ../midori/midori-browser.c:4830 +msgid "Failed to export bookmarks" +msgstr "A könyvjelzők exportálása sikertelen" + +#: ../midori/midori-browser.c:4884 ../panels/midori-history.c:141 +#: ../panels/midori-history.c:171 #, c-format -msgid "A week ago" -msgstr "" +msgid "Failed to remove history item: %s\n" +msgstr "Az előzményelem eltávolítása meghiúsult: %s\n" -#: ../midori/midori-browser.c:2718 -#, c-format -msgid "%d days ago" -msgstr "" +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4991 +msgid "Clear Private Data" +msgstr "Privát adatok törlése" -#: ../midori/midori-browser.c:2725 -msgid "Today" -msgstr "" +#: ../midori/midori-browser.c:4995 +msgid "_Clear private data" +msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:2727 -msgid "Yesterday" -msgstr "" +#: ../midori/midori-browser.c:5009 +msgid "Clear the following data:" +msgstr "A következő adatok törlése:" -#: ../midori/midori-browser.c:2816 +#: ../midori/midori-browser.c:5020 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 +msgid "History" +msgstr "Előzmények" + +#: ../midori/midori-browser.c:5026 +msgid "Cookies" +msgstr "Sütik" + +#: ../midori/midori-browser.c:5031 +msgid "'Flash' Cookies" +msgstr "„Flash” sütik" + +#: ../midori/midori-browser.c:5036 +msgid "Website icons" +msgstr "Weboldalikonok" + +#: ../midori/midori-browser.c:5041 ../midori/sokoke.c:1298 +msgid "_Closed Tabs" +msgstr "_Bezárt lapok" + +#: ../midori/midori-browser.c:5046 ../extensions/web-cache.c:464 +msgid "Web Cache" +msgstr "Webes gyorsítótár" + +#: ../midori/midori-browser.c:5054 +msgid "Clear private data when _quitting Midori" +msgstr "Privát adatok törlése a Mi_doriból kilépéskor" + +#: ../midori/midori-browser.c:5155 msgid "A lightweight web browser." -msgstr "Egy pehelysúlyú webböngésző" +msgstr "Könnyűsúlyú webböngésző." -#: ../midori/midori-browser.c:2824 -msgid "translator-credits" -msgstr "SZERVÁC Attila " - -#: ../midori/midori-browser.c:2958 -msgid "Are you sure you want to remove all history items?" +#: ../midori/midori-browser.c:5157 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." msgstr "" +"A Midori szabad szoftver, terjesztheti és/vagy módosíthatja a Free Software " +"Foundation által kiadott GNU Lesser General Public License 2.1 (vagy bármely " +"későbbi) változatában foglaltak alapján." -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:5176 +msgid "translator-credits" +msgstr "Kelemen Gábor " + +#: ../midori/midori-browser.c:5485 msgid "_File" msgstr "_Fájl" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:5487 ../midori/sokoke.c:1299 +msgid "New _Window" +msgstr "Új _ablak" + +#: ../midori/midori-browser.c:5488 msgid "Open a new window" msgstr "Új ablak megnyitása" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:5491 msgid "Open a new tab" msgstr "Új lap megnyitása" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:5493 +msgid "P_rivate Browsing" +msgstr "_Privát böngészés" + +#: ../midori/midori-browser.c:5494 +msgid "Don't save any private data while browsing" +msgstr "Ne mentsen privát adatokat böngészéskor" + +#: ../midori/midori-browser.c:5498 msgid "Open a file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:3076 +#: ../midori/midori-browser.c:5501 msgid "Save to a file" msgstr "Mentés fájlba" -#: ../midori/midori-browser.c:3078 -msgid "_Close Tab" -msgstr "_Lap bezárása" +#: ../midori/midori-browser.c:5503 +msgid "Add to Speed _dial" +msgstr "Hozzáadás _gyorstárcsázáshoz" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:5504 +msgid "Add shortcut to speed dial" +msgstr "Indítóikon hozzáadása a gyorstárcsázáshoz" + +#: ../midori/midori-browser.c:5506 +msgid "Add Shortcut to the _desktop" +msgstr "Indítóikon hozzáadása az _asztalhoz" + +#: ../midori/midori-browser.c:5507 +msgid "Add shortcut to the desktop" +msgstr "Indítóikon hozzáadása az asztalhoz" + +#: ../midori/midori-browser.c:5509 +msgid "Subscribe to News _feed" +msgstr "_Feliratkozás hírforrásra" + +#: ../midori/midori-browser.c:5510 +msgid "Subscribe to this news feed" +msgstr "Feliratkozás erre a hírforrásra" + +#: ../midori/midori-browser.c:5515 +msgid "_Close Tab" +msgstr "Lap _bezárása" + +#: ../midori/midori-browser.c:5516 msgid "Close the current tab" msgstr "A jelenlegi lap bezárása" -#: ../midori/midori-browser.c:3081 +#: ../midori/midori-browser.c:5518 msgid "C_lose Window" msgstr "_Ablak bezárása" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:5519 msgid "Close this window" msgstr "A jelenlegi ablak bezárása" -#: ../midori/midori-browser.c:3085 +#: ../midori/midori-browser.c:5522 msgid "Print the current page" -msgstr "" +msgstr "A jelenlegi oldal nyomtatása" -#: ../midori/midori-browser.c:3088 +#: ../midori/midori-browser.c:5525 msgid "Quit the application" -msgstr "Kilépés a programból" +msgstr "Kilépés az alkalmazásból" -#: ../midori/midori-browser.c:3090 +#: ../midori/midori-browser.c:5527 msgid "_Edit" -msgstr "Sz_erkesztés" +msgstr "S_zerkesztés" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:5531 +msgid "Undo the last modification" +msgstr "Az utolsó módosítás visszavonása" + +#: ../midori/midori-browser.c:5534 +msgid "Redo the last modification" +msgstr "Az utolsó módosítás újra végrehajtása" + +#: ../midori/midori-browser.c:5538 msgid "Cut the selected text" -msgstr "" +msgstr "A kijelölt szöveg kivágása" -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:5541 ../midori/midori-browser.c:5544 msgid "Copy the selected text" msgstr "A kijelölt szöveg másolása" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:5547 msgid "Paste text from the clipboard" -msgstr "Szöveg beillesztése a vágólapról" +msgstr "Beillesztés a vágólapról" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:5550 msgid "Delete the selected text" msgstr "A kijelölt szöveg törlése" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:5553 msgid "Select all text" -msgstr "Minden szöveg kijelölése" +msgstr "A teljes szöveg kijelölése" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:5556 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Szó vagy kifejezés keresése az oldalon" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:5558 msgid "Find _Next" -msgstr "_Következő" +msgstr "_Következő találat" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:5559 msgid "Find the next occurrence of a word or phrase" -msgstr "" +msgstr "Szó vagy kifejezés következő előfordulásának keresése" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:5561 msgid "Find _Previous" -msgstr "_Előző" +msgstr "_Előző találat" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:5562 msgid "Find the previous occurrence of a word or phrase" -msgstr "" +msgstr "Szó vagy kifejezés előző előfordulásának keresése" -#: ../midori/midori-browser.c:3120 -msgid "_Quick Find" -msgstr "_Gyors keresés" - -#: ../midori/midori-browser.c:3121 -msgid "Quickly jump to a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:5566 msgid "Configure the application preferences" -msgstr "" +msgstr "Az alkalmazás beállításainak megadása" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:5568 msgid "_View" msgstr "_Nézet" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:5569 msgid "_Toolbars" -msgstr "Eszköz_sávok" +msgstr "_Eszköztárak" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:5581 msgid "Increase the zoom level" -msgstr "" +msgstr "Nagyítási szint növelése" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:5584 msgid "Decrease the zoom level" -msgstr "" +msgstr "Nagyítási szint csökkentése" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:5587 msgid "Reset the zoom level" -msgstr "" +msgstr "Nagyítási szint visszaállítása" -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 -msgid "View _Source" -msgstr "" +#: ../midori/midori-browser.c:5588 +msgid "_Encoding" +msgstr "_Kódolás" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:5590 +msgid "View So_urce" +msgstr "_Forrás megjelenítése" + +#: ../midori/midori-browser.c:5591 msgid "View the source code of the page" -msgstr "" +msgstr "Az oldal forráskódjának megtekintése" -#: ../midori/midori-browser.c:3150 -msgid "View Selection Source" -msgstr "Kijelölés forrásnak megtekintése" - -#: ../midori/midori-browser.c:3151 -msgid "View the source code of the selection" -msgstr "" - -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:5594 msgid "Toggle fullscreen view" -msgstr "Teljes képernyős váltás" +msgstr "Teljes képernyős nézet be- illetve kikapcsolása" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:5597 +msgid "Scroll _Left" +msgstr "Görgetés _balra" + +#: ../midori/midori-browser.c:5598 +msgid "Scroll to the left" +msgstr "Görgetés balra" + +#: ../midori/midori-browser.c:5600 +msgid "Scroll _Down" +msgstr "Görgetés l_e" + +#: ../midori/midori-browser.c:5601 +msgid "Scroll down" +msgstr "Görgetés le" + +#: ../midori/midori-browser.c:5603 +msgid "Scroll _Up" +msgstr "Görgetés _fel" + +#: ../midori/midori-browser.c:5604 +msgid "Scroll up" +msgstr "Görgetés fel" + +#: ../midori/midori-browser.c:5606 +msgid "Scroll _Right" +msgstr "Görgetés j_obbra" + +#: ../midori/midori-browser.c:5607 +msgid "Scroll to the right" +msgstr "Görgetés jobbra" + +#: ../midori/midori-browser.c:5610 msgid "_Go" msgstr "_Ugrás" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:5613 msgid "Go back to the previous page" -msgstr "" +msgstr "Ugrás az előző oldalra" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:5616 msgid "Go forward to the next page" -msgstr "" +msgstr "Ugrás a következő oldalra" -#: ../midori/midori-browser.c:3166 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5620 +msgid "Go to the previous sub-page" +msgstr "Ugrás az előző aloldalra" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5624 +msgid "Go to the next sub-page" +msgstr "Ugrás a következő aloldalra" + +#: ../midori/midori-browser.c:5627 msgid "Go to your homepage" -msgstr "" +msgstr "Ugrás a kezdőlapra" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:5629 msgid "Empty Trash" -msgstr "Üres kuka" +msgstr "Kuka ürítése" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:5630 msgid "Delete the contents of the trash" -msgstr "" +msgstr "A Kuka tartalmának törlése" -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 -msgid "Undo Close Tab" -msgstr "Lap bezárásának visszavonása" +#: ../midori/midori-browser.c:5632 +msgid "Undo _Close Tab" +msgstr "Lapbezárás _visszavonása" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:5633 msgid "Open the last closed tab" -msgstr "" +msgstr "Az utoljára bezárt lap megnyitása" -#: ../midori/midori-browser.c:3176 -msgid "Add a new bookmark" -msgstr "" +#: ../midori/midori-browser.c:5639 +msgid "Add a new _folder" +msgstr "Új mappa _hozzáadása" -#: ../midori/midori-browser.c:3179 -msgid "Edit the selected bookmark" -msgstr "" +#: ../midori/midori-browser.c:5640 +msgid "Add a new bookmark folder" +msgstr "Új könyvjelzőmappa hozzáadása" -#: ../midori/midori-browser.c:3182 -msgid "Delete the selected bookmark" -msgstr "" +#: ../midori/midori-browser.c:5645 +msgid "_Export bookmarks" +msgstr "Könyvjelzők e_xportálása" -#: ../midori/midori-browser.c:3185 -#, fuzzy -msgid "Delete the selected history item" -msgstr "A kijelölt szöveg törlése" - -#: ../midori/midori-browser.c:3188 -msgid "Clear the entire history" -msgstr "" - -#: ../midori/midori-browser.c:3191 -#, fuzzy -msgid "Bookmark the selected history item" -msgstr "A kijelölt szöveg másolása" - -#: ../midori/midori-browser.c:3193 -msgid "_Tools" -msgstr "Esz_közök" - -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:5648 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" -msgstr "Kereső-motorok kezelése" +msgstr "_Keresőszolgáltatások kezelése" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:5649 msgid "Add, edit and remove search engines..." -msgstr "Kereső-motorok hozzáadása, szerkesztése és eltávolítása..." +msgstr "Keresőszolgáltatások hozzáadása, szerkesztése és eltávolítása…" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:5652 +msgid "_Clear Private Data" +msgstr "_Privát adatok törlése" + +#: ../midori/midori-browser.c:5653 +msgid "Clear private data..." +msgstr "Privát adatok törlése…" + +#: ../midori/midori-browser.c:5657 +msgid "_Inspect Page" +msgstr "_Oldal vizsgálata" + +#: ../midori/midori-browser.c:5658 +msgid "Inspect page details and access developer tools..." +msgstr "Oldal részleteinek vizsgálata és fejlesztői eszközök elérése…" + +#: ../midori/midori-browser.c:5663 msgid "_Previous Tab" msgstr "_Előző lap" -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:5664 msgid "Switch to the previous tab" -msgstr "" +msgstr "Váltás az előző lapra" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:5666 msgid "_Next Tab" msgstr "_Következő lap" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:5667 msgid "Switch to the next tab" -msgstr "" +msgstr "Váltás a következő lapra" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:5669 +msgid "Focus _Current Tab" +msgstr "_Aktuális lap előtérbe" + +#: ../midori/midori-browser.c:5670 +msgid "Focus the current tab" +msgstr "Aktuális lap előtérbe hozása" + +#: ../midori/midori-browser.c:5672 +msgid "Open last _session" +msgstr "_Utolsó munkamenet megnyitása" + +#: ../midori/midori-browser.c:5673 +msgid "Open the tabs saved in the last session" +msgstr "Az utolsó munkamenetben mentett lapok megnyitása" + +#: ../midori/midori-browser.c:5675 msgid "_Help" msgstr "_Súgó" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:5677 msgid "_Contents" msgstr "_Tartalom" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:5678 msgid "Show the documentation" -msgstr "" +msgstr "A dokumentáció megjelenítése" -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" -msgstr "" +#: ../midori/midori-browser.c:5680 +msgid "_Frequent Questions" +msgstr "_Gyakori kérdések" -#: ../midori/midori-browser.c:3212 +#: ../midori/midori-browser.c:5681 msgid "Show the Frequently Asked Questions" -msgstr "" +msgstr "A gyakran ismételt kérdések megjelenítése" -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" -msgstr "" +#: ../midori/midori-browser.c:5683 +msgid "_Report a Bug" +msgstr "_Hiba jelentése" -#: ../midori/midori-browser.c:3215 +#: ../midori/midori-browser.c:5684 msgid "Open Midori's bug tracker" -msgstr "" +msgstr "A Midori hibakövetőjének megnyitása" -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:5687 msgid "Show information about the program" -msgstr "" +msgstr "Információk megjelenítése a programról" -#: ../midori/midori-browser.c:3225 -msgid "P_rivate Browsing" -msgstr "_Személyes böngészés" - -#: ../midori/midori-browser.c:3226 -msgid "Don't save any private data while browsing" -msgstr "" - -#: ../midori/midori-browser.c:3231 -#, fuzzy +#: ../midori/midori-browser.c:5695 msgid "_Menubar" -msgstr "Menüsáv" +msgstr "_Menüsáv" -#: ../midori/midori-browser.c:3232 -#, fuzzy +#: ../midori/midori-browser.c:5696 msgid "Show menubar" -msgstr "A menüsáv" +msgstr "A menüsáv megjelenítése" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:5699 msgid "_Navigationbar" -msgstr "_Címsáv" +msgstr "_Navigációs sáv" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:5700 msgid "Show navigationbar" -msgstr "" +msgstr "A navigációs sáv megjelenítése" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:5703 msgid "Side_panel" -msgstr "Oldal_panel" +msgstr "_Oldalsáv" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:5704 msgid "Show sidepanel" -msgstr "" +msgstr "Az oldalsáv megjelenítése" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:5707 msgid "_Bookmarkbar" msgstr "_Könyvjelzősáv" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:5708 msgid "Show bookmarkbar" -msgstr "" +msgstr "A könyvjelzősáv megjelenítése" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:5711 msgid "_Transferbar" -msgstr "_Letöltési sáv" +msgstr "Át_vitelsáv" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:5712 msgid "Show transferbar" -msgstr "" +msgstr "Az átvitelsáv megjelenítése" -#: ../midori/midori-browser.c:3251 +#: ../midori/midori-browser.c:5715 msgid "_Statusbar" -msgstr "_Állapotsáv" +msgstr "Á_llapotsor" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:5716 msgid "Show statusbar" -msgstr "" +msgstr "Az állapotsor megjelenítése" -#: ../midori/midori-browser.c:3669 -msgid "_Location..." -msgstr "_Hely..." +#: ../midori/midori-browser.c:5724 +msgid "_Automatic" +msgstr "_Automatikus" -#: ../midori/midori-browser.c:3671 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:3695 -msgid "_Web Search..." -msgstr "_Web-keresés..." - -#: ../midori/midori-browser.c:3697 -msgid "Run a web search" -msgstr "" - -#: ../midori/midori-browser.c:3716 -msgid "Reopen a previously closed tab or window" -msgstr "Egy korábban bezárt lap vagy ablak megnyitása" - -#: ../midori/midori-browser.c:3729 -#, fuzzy -msgid "_Recently visited pages" -msgstr "Legutóbbi lapok megjegyzése" - -#: ../midori/midori-browser.c:3731 -msgid "Reopen pages that you visited earlier" -msgstr "" - -#: ../midori/midori-browser.c:3746 -#, fuzzy -msgid "Show the saved bookmarks" -msgstr "Könyvjelzősáv mutatása" - -#: ../midori/midori-browser.c:3759 -msgid "_Window" -msgstr "_Ablak" - -#: ../midori/midori-browser.c:3761 -msgid "Show a list of all open tabs" -msgstr "" - -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Könyvjelzők" - -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 -msgid "History" -msgstr "Történet" - -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" -msgstr "" - -#: ../midori/midori-browser.c:4004 -msgid "Match Case" -msgstr "Nagybetű-érzékeny" - -#: ../midori/midori-browser.c:4012 -msgid "Highlight Matches" -msgstr "" - -#: ../midori/midori-browser.c:4021 -msgid "Close Findbar" -msgstr "Keresősáv bezárása" - -#: ../midori/midori-browser.c:4262 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "Ismeretlen '%s' beállítás" - -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 -msgid "Close panel" -msgstr "Panel bezárása" - -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 -msgid "Blank page" -msgstr "Üres lap" - -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 -msgid "Homepage" -msgstr "Honlap" - -#: ../midori/midori-websettings.c:133 -msgid "Last open pages" -msgstr "Legutóbb megnyitott lapok" - -#: ../midori/midori-websettings.c:148 +#: ../midori/midori-browser.c:5727 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kínai (BIG5)" -#: ../midori/midori-websettings.c:149 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japán (SHIFT_JIS)" +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5731 +msgid "Japanese (SHIFT__JIS)" +msgstr "Japán (SHIFT__JIS)" -#: ../midori/midori-websettings.c:150 +#: ../midori/midori-browser.c:5734 ../midori/midori-websettings.c:224 +msgid "Korean (EUC-KR)" +msgstr "Koreai (EUC-KR)" + +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" -msgstr "Orosz (KOI8-r)" +msgstr "Orosz (KOI8-R)" -#: ../midori/midori-websettings.c:151 +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-websettings.c:152 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Nyugati (ISO-8859-1)" -#: ../midori/midori-websettings.c:153 -msgid "Custom..." -msgstr "Egyéni..." +#: ../midori/midori-browser.c:6289 +msgid "_Separator" +msgstr "_Elválasztó" -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-browser.c:6296 +msgid "_Location..." +msgstr "He_ly…" + +#: ../midori/midori-browser.c:6298 +msgid "Open a particular location" +msgstr "Adott hely megnyitása" + +#: ../midori/midori-browser.c:6322 +msgid "_Web Search..." +msgstr "_Webkeresés…" + +#: ../midori/midori-browser.c:6324 +msgid "Run a web search" +msgstr "Webkeresés futtatása " + +#: ../midori/midori-browser.c:6345 +msgid "Reopen a previously closed tab or window" +msgstr "Korábban bezárt lap vagy ablak ismételt megnyitása" + +#: ../midori/midori-browser.c:6360 +msgid "_Recently visited pages" +msgstr "_Nemrég látogatott oldalak" + +#: ../midori/midori-browser.c:6362 +msgid "Reopen pages that you visited earlier" +msgstr "Korábban meglátogatott oldalak ismételt megnyitása" + +#: ../midori/midori-browser.c:6377 ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Könyvjelzők" + +#: ../midori/midori-browser.c:6379 +msgid "Show the saved bookmarks" +msgstr "A mentett könyvjelzők megjelenítése" + +#: ../midori/midori-browser.c:6394 +msgid "_Tools" +msgstr "_Eszközök" + +#: ../midori/midori-browser.c:6407 +msgid "_Window" +msgstr "_Ablak" + +#: ../midori/midori-browser.c:6409 +msgid "Show a list of all open tabs" +msgstr "Az összes megnyitott lap listájának megjelenítése" + +#: ../midori/midori-browser.c:6423 +msgid "_Menu" +msgstr "_Menü" + +#: ../midori/midori-browser.c:6425 +msgid "Menu" +msgstr "Menü" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:6632 +msgid "_Inline Find:" +msgstr "Beágyazott _keresés:" + +#: ../midori/midori-browser.c:6663 +msgid "Previous" +msgstr "Előző" + +#: ../midori/midori-browser.c:6668 +msgid "Next" +msgstr "Tovább" + +#: ../midori/midori-browser.c:6673 +msgid "Match Case" +msgstr "Kis- és nagybetű" + +#: ../midori/midori-browser.c:6682 +msgid "Highlight Matches" +msgstr "Találatok kiemelése" + +#: ../midori/midori-browser.c:6694 +msgid "Close Findbar" +msgstr "Keresősáv bezárása" + +#: ../midori/midori-browser.c:6740 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Minden mező törlése" + +#: ../midori/midori-browser.c:7096 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Váratlan beállítás: „%s”" + +#: ../midori/midori-locationaction.c:377 +#, c-format +msgid "Failed to select from history\n" +msgstr "Az előzményekből választás meghiúsult\n" + +#: ../midori/midori-locationaction.c:459 +#, c-format +msgid "Search for %s" +msgstr "%s keresése" + +#: ../midori/midori-locationaction.c:482 +#, c-format +msgid "Search with %s" +msgstr "Keresés ezzel: %s" + +#: ../midori/midori-locationaction.c:1197 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "Az adatbázis-utasítás végrehajtása meghiúsult\n" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "Beillesztés és _folytatás" + +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +msgid "Detach chosen panel from the window" +msgstr "Kiválasztott panel leválasztása az ablakról" + +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +msgid "Align sidepanel to the right" +msgstr "Az oldalsáv jobbra igazítása" + +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +msgid "Close panel" +msgstr "Panel bezárása" + +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +msgid "Align sidepanel to the left" +msgstr "Az oldalsáv balra igazítása" + +#: ../midori/midori-panel.c:797 +msgid "Hide operating controls" +msgstr "Vezérlők elrejtése" + +#: ../midori/midori-websettings.c:204 +msgid "Show Blank page" +msgstr "Üres oldal megjelenítése" + +#: ../midori/midori-websettings.c:205 +msgid "Show Homepage" +msgstr "Kezdőlap megjelenítése" + +#: ../midori/midori-websettings.c:206 +msgid "Show last open tabs" +msgstr "A legutóbbi lapok megjelenítése" + +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "A legutóbbi lapok megjelenítése betöltés nélkül" + +#: ../midori/midori-websettings.c:223 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japán (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Új lap" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Új ablak" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:245 msgid "Current tab" -msgstr "Jelenlegi lap" +msgstr "Aktuális lap" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:260 msgid "Default" -msgstr "Alap" +msgstr "Alapértelmezett" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Ikonok" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:262 +msgid "Small icons" +msgstr "Kis ikonok" + +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Szöveg" -#: ../midori/midori-websettings.c:188 -msgid "Both" -msgstr "Mindkettő" +#: ../midori/midori-websettings.c:264 +msgid "Icons and text" +msgstr "Ikonok és szöveg" -#: ../midori/midori-websettings.c:189 -msgid "Both horizontal" -msgstr "Mindkettő vízszintesen" +#: ../midori/midori-websettings.c:265 +msgid "Text beside icons" +msgstr "Szöveg az ikonok mellett" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:280 +msgid "Automatic (GNOME or environment)" +msgstr "Automatikus (GNOME vagy környezet)" + +#: ../midori/midori-websettings.c:281 +msgid "HTTP proxy server" +msgstr "HTTP proxykiszolgáló" + +#: ../midori/midori-websettings.c:282 +msgid "No proxy server" +msgstr "Nincs proxykiszolgáló" + +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Minden süti" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" -msgstr "Munkafolyamat sütik" +msgstr "Munkamenetsütik" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" -msgstr "Semmi" +msgstr "Nincs" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:315 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:316 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:317 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:318 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" -msgstr "Legutóbbi ablak méretének megjegyzése" +msgstr "Utolsó ablakméret megjegyzése" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" -msgstr "Mentésre kerüljön-e a legutóbbi ablak mérete" +msgstr "Az utolsó ablakméret megjegyzendő-e" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:380 msgid "Last window width" -msgstr "Legutóbbi ablak szélessége" +msgstr "Utolsó ablakszélesség" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" -msgstr "A legutóbb elmentett ablak-szélesség" +msgstr "Az utoljára mentett ablakszélesség" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:389 msgid "Last window height" -msgstr "Legutóbbi ablak magassága" +msgstr "Utolsó ablakmagasság" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" -msgstr "A legutóbb mentett ablak-magasság" - -#: ../midori/midori-websettings.c:273 -msgid "Last panel position" -msgstr "A panel helyzete" - -#: ../midori/midori-websettings.c:274 -msgid "The last saved panel position" -msgstr "A legutóbb mentett panel-helyzet" - -#. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 -msgid "Last panel page" -msgstr "Legutóbbi panel-lap" - -#: ../midori/midori-websettings.c:284 -msgid "The last saved panel page" -msgstr "A legutóbb mentett panel-lap" - -#: ../midori/midori-websettings.c:292 -msgid "Last Web search" -msgstr "Legutóbbi web-keresés" - -#: ../midori/midori-websettings.c:293 -msgid "The last saved Web search" -msgstr "A legutóbb mentett web-keresés" - -#: ../midori/midori-websettings.c:302 -#, fuzzy -msgid "Show Menubar" -msgstr "Menüsáv" - -#: ../midori/midori-websettings.c:303 -#, fuzzy -msgid "Whether to show the menubar" -msgstr "Megjelenjen-e az állapotsáv" - -#: ../midori/midori-websettings.c:311 -msgid "Show Navigationbar" -msgstr "Címsáv mutatása" - -#: ../midori/midori-websettings.c:312 -msgid "Whether to show the navigationbar" -msgstr "Megjelenjen-e a címsáv" - -#: ../midori/midori-websettings.c:320 -msgid "Show Bookmarkbar" -msgstr "Könyvjelzősáv mutatása" - -#: ../midori/midori-websettings.c:321 -msgid "Whether to show the bookmarkbar" -msgstr "Megjelenjen-e a könyvjelzősáv" - -#: ../midori/midori-websettings.c:329 -msgid "Show Panel" -msgstr "Panel mutatása" - -#: ../midori/midori-websettings.c:330 -msgid "Whether to show the panel" -msgstr "Megjelenjen-e a panel" - -#: ../midori/midori-websettings.c:338 -msgid "Show Statusbar" -msgstr "Állapotsáv mutatása" - -#: ../midori/midori-websettings.c:339 -msgid "Whether to show the statusbar" -msgstr "Megjelenjen-e az állapotsáv" - -#: ../midori/midori-websettings.c:348 -msgid "Toolbar Style" -msgstr "Eszközsáv stílus" - -#: ../midori/midori-websettings.c:349 -msgid "The style of the toolbar" -msgstr "Az eszközsáv stílusa" - -#: ../midori/midori-websettings.c:358 -#, fuzzy -msgid "Toolbar Items" -msgstr "Eszközsáv stílus" - -#: ../midori/midori-websettings.c:359 -#, fuzzy -msgid "The items to show on the toolbar" -msgstr "Az eszközsáv stílusa" - -#: ../midori/midori-websettings.c:367 -#, fuzzy -msgid "Compact Sidepanel" -msgstr "Oldal_panel" - -#: ../midori/midori-websettings.c:368 -#, fuzzy -msgid "Whether to make the sidepanel compact" -msgstr "Megjelenjen-e a panel" - -#: ../midori/midori-websettings.c:377 -msgid "Load on Startup" -msgstr "Betöltés induláskor" - -#: ../midori/midori-websettings.c:378 -msgid "What to load on startup" -msgstr "Az induláskor betöltendő" - -#: ../midori/midori-websettings.c:388 -msgid "The homepage" -msgstr "A honlap" - -#: ../midori/midori-websettings.c:396 -msgid "Download Folder" -msgstr "Letöltő mappa" - -#: ../midori/midori-websettings.c:397 -msgid "The folder downloaded files are saved to" -msgstr "A fájlok alapértelmezett letöltési mappája" - -#: ../midori/midori-websettings.c:405 -msgid "Download Manager" -msgstr "" - -#: ../midori/midori-websettings.c:406 -msgid "An external download manager" -msgstr "" - -#: ../midori/midori-websettings.c:414 -msgid "Text Editor" -msgstr "" +msgstr "Az utoljára mentett ablakmagasság" #: ../midori/midori-websettings.c:415 -msgid "An external text editor" -msgstr "" +msgid "Last panel position" +msgstr "Utolsó panelpozíció" -#: ../midori/midori-websettings.c:423 -msgid "Location entry Search" -msgstr "A hely-beviteli Kereső" +#: ../midori/midori-websettings.c:416 +msgid "The last saved panel position" +msgstr "Az utoljára mentett panelpozíció" -#: ../midori/midori-websettings.c:424 -msgid "The search to perform inside the location entry" -msgstr "A keresés a hely-beviteli mezőben" +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:425 +msgid "Last panel page" +msgstr "Utolsó paneloldal" -#: ../midori/midori-websettings.c:432 -msgid "Preferred Encoding" -msgstr "Alapértelmezett kódolás" +#: ../midori/midori-websettings.c:426 +msgid "The last saved panel page" +msgstr "Az utoljára mentett paneloldal" -#: ../midori/midori-websettings.c:433 -msgid "The preferred character encoding" -msgstr "Az alapértelmezett karakter-kódolás" +#: ../midori/midori-websettings.c:434 +msgid "Last Web search" +msgstr "Utolsó webkeresés" -#: ../midori/midori-websettings.c:443 -msgid "Always Show Tabbar" -msgstr "" +#: ../midori/midori-websettings.c:435 +msgid "The last saved Web search" +msgstr "Az utoljára mentett webkeresés" #: ../midori/midori-websettings.c:444 -msgid "Always show the tabbar" -msgstr "" +msgid "Show Menubar" +msgstr "Menüsáv megjelenítése" -#: ../midori/midori-websettings.c:452 -msgid "Close Buttons on Tabs" -msgstr "Bezáró gombok a lapokon" +#: ../midori/midori-websettings.c:445 +msgid "Whether to show the menubar" +msgstr "A menüsáv megjelenítendő-e" #: ../midori/midori-websettings.c:453 -msgid "Whether tabs have close buttons" -msgstr "Legyenek-e bezáró gombok a lapokon" +msgid "Show Navigationbar" +msgstr "Navigációs sáv megjelenítése" + +#: ../midori/midori-websettings.c:454 +msgid "Whether to show the navigationbar" +msgstr "A navigációs sáv megjelenítendő-e" #: ../midori/midori-websettings.c:462 -msgid "Open new pages in" -msgstr "Új lapok megnyitása itt:" +msgid "Show Bookmarkbar" +msgstr "Könyvjelzősáv megjelenítése" #: ../midori/midori-websettings.c:463 +msgid "Whether to show the bookmarkbar" +msgstr "A könyvjelzősáv megjelenítendő-e" + +#: ../midori/midori-websettings.c:471 +msgid "Show Panel" +msgstr "Panel megjelenítése" + +#: ../midori/midori-websettings.c:472 +msgid "Whether to show the panel" +msgstr "A panel megjelenítendő-e" + +#: ../midori/midori-websettings.c:487 +msgid "Show Transferbar" +msgstr "Átvitelsáv megjelenítése" + +#: ../midori/midori-websettings.c:488 +msgid "Whether to show the transferbar" +msgstr "Az átvitelsáv megjelenítendő-e" + +#: ../midori/midori-websettings.c:496 +msgid "Show Statusbar" +msgstr "Állapotsor megjelenítése" + +#: ../midori/midori-websettings.c:497 +msgid "Whether to show the statusbar" +msgstr "Az állapotsor megjelenítendő-e" + +#: ../midori/midori-websettings.c:506 +msgid "Toolbar Style:" +msgstr "Eszköztár stílusa:" + +#: ../midori/midori-websettings.c:507 +msgid "The style of the toolbar" +msgstr "Az eszköztár stílusa" + +#: ../midori/midori-websettings.c:523 +msgid "Show progress in location entry" +msgstr "Előrehaladás megjelenítése a címsávban" + +#: ../midori/midori-websettings.c:524 +msgid "Whether to show loading progress in the location entry" +msgstr "A betöltés előrehaladása megjelenjen-e a címsávban" + +#: ../midori/midori-websettings.c:539 +msgid "Search engines in location completion" +msgstr "Keresőszolgáltatások megjelenítése a helykiegészítésben" + +#: ../midori/midori-websettings.c:540 +msgid "Whether to show search engines in the location completion" +msgstr "Megjelenjenek-e a keresőszolgáltatások a helykiegészítésben" + +#: ../midori/midori-websettings.c:548 +msgid "Toolbar Items" +msgstr "Eszköztárelemek" + +#: ../midori/midori-websettings.c:549 +msgid "The items to show on the toolbar" +msgstr "Az eszköztáron megjelenítendő elemek" + +#: ../midori/midori-websettings.c:557 +msgid "Compact Sidepanel" +msgstr "Tömör oldalsáv" + +#: ../midori/midori-websettings.c:558 +msgid "Whether to make the sidepanel compact" +msgstr "Az oldalsáv tömören jelenjen-e meg" + +#: ../midori/midori-websettings.c:573 +msgid "Show operating controls of the panel" +msgstr "A panel vezérlőinek megjelenítése" + +#: ../midori/midori-websettings.c:574 +msgid "Whether to show the operating controls of the panel" +msgstr "Megjelenjenek-e a panel vezérlői" + +#: ../midori/midori-websettings.c:589 +msgid "Align sidepanel on the right" +msgstr "Az oldalsáv jobbra igazítása" + +#: ../midori/midori-websettings.c:590 +msgid "Whether to align the sidepanel on the right" +msgstr "Az oldalsáv jobbra legyen-e igazítva" + +#: ../midori/midori-websettings.c:605 +msgid "Open panels in separate windows" +msgstr "Panelek megnyitása külön ablakokban" + +#: ../midori/midori-websettings.c:606 +msgid "Whether to always open panels in separate windows" +msgstr "A panelek mindig külön ablakokban nyíljanak-e meg" + +#: ../midori/midori-websettings.c:615 +msgid "When Midori starts:" +msgstr "A Midori indulásakor:" + +#: ../midori/midori-websettings.c:616 +msgid "What to do when Midori starts" +msgstr "Mi történjen a Midori indulásakor" + +#: ../midori/midori-websettings.c:625 +msgid "Homepage:" +msgstr "Kezdőlap:" + +#: ../midori/midori-websettings.c:626 +msgid "The homepage" +msgstr "A kezdőlap" + +#: ../midori/midori-websettings.c:641 +msgid "Show crash dialog" +msgstr "Összeomlási ablak megjelenítése" + +#: ../midori/midori-websettings.c:642 +msgid "Show a dialog after Midori crashed" +msgstr "Párbeszédablak megjelenítése a Midori összeomlása után" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:658 +msgid "Show speed dial in new tabs" +msgstr "Gyorstárcsázás megjelenítése új lapokon" + +#: ../midori/midori-websettings.c:659 +msgid "Show speed dial in newly opened tabs" +msgstr "Gyorstárcsázás megjelenítése az újonnan megnyitott lapokon" + +#: ../midori/midori-websettings.c:667 +msgid "Save downloaded files to:" +msgstr "Letöltött fájlok mentése ide:" + +#: ../midori/midori-websettings.c:668 +msgid "The folder downloaded files are saved to" +msgstr "A letöltött fájlok ebbe a mappába kerülnek mentésre" + +#: ../midori/midori-websettings.c:689 +msgid "Ask for the destination folder" +msgstr "Rákérdezés a célmappára" + +#: ../midori/midori-websettings.c:690 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Fájl letöltésekor rákérdezzen-e a célmappára" + +#: ../midori/midori-websettings.c:709 +msgid "Notify when a transfer has been completed" +msgstr "Értesítés átvitel befejeződésekor" + +#: ../midori/midori-websettings.c:710 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Megjelenjen-e értesítés átvitel befejeződésekor" + +#: ../midori/midori-websettings.c:722 +msgid "Download Manager" +msgstr "Letöltéskezelő" + +#: ../midori/midori-websettings.c:723 +msgid "An external download manager" +msgstr "Külső letöltéskezelő" + +#: ../midori/midori-websettings.c:731 +msgid "Text Editor" +msgstr "Szövegszerkesztő" + +#: ../midori/midori-websettings.c:732 +msgid "An external text editor" +msgstr "Külső szövegszerkesztő" + +#: ../midori/midori-websettings.c:747 +msgid "News Aggregator" +msgstr "Hírforrásolvasó" + +#: ../midori/midori-websettings.c:748 +msgid "An external news aggregator" +msgstr "Külső hírforrásolvasó" + +#: ../midori/midori-websettings.c:756 +msgid "Location entry Search" +msgstr "Keresés a címsávban" + +#: ../midori/midori-websettings.c:757 +msgid "The search to perform inside the location entry" +msgstr "A címsávban végrehajtandó keresés" + +#: ../midori/midori-websettings.c:765 +msgid "Preferred Encoding" +msgstr "Előnyben részesített kódolás" + +#: ../midori/midori-websettings.c:766 +msgid "The preferred character encoding" +msgstr "Az előnyben részesített karakterkódolás" + +#: ../midori/midori-websettings.c:776 +msgid "Always Show Tabbar" +msgstr "Mindig jelenjen meg a lapsáv" + +#: ../midori/midori-websettings.c:777 +msgid "Always show the tabbar" +msgstr "Mindig jelenjen meg a lapsáv" + +#: ../midori/midori-websettings.c:785 +msgid "Close Buttons on Tabs" +msgstr "Bezárás gombok a lapokon" + +#: ../midori/midori-websettings.c:786 +msgid "Whether tabs have close buttons" +msgstr "A lapokon legyenek-e bezárás gombok" + +#: ../midori/midori-websettings.c:794 +msgid "Open new pages in:" +msgstr "Új oldalak megnyitása:" + +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" -msgstr "Hol nyíljanak az új lapok" +msgstr "Hol nyíljanak meg az új oldalak" -#: ../midori/midori-websettings.c:473 -#, fuzzy -msgid "Open external pages in" -msgstr "Új lapok megnyitása itt:" +#: ../midori/midori-websettings.c:804 +msgid "Open external pages in:" +msgstr "Külső oldalak megnyitása:" -#: ../midori/midori-websettings.c:474 -#, fuzzy +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" -msgstr "Hol nyíljanak az új lapok" +msgstr "Hol nyíljanak meg a külső programokból megnyitott oldalak" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" -msgstr "Középső gombra megnyitás" +msgstr "A középső kattintás megnyitja a kijelölést" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "URL betöltése a kijelölésből középső gombbal" +#: ../midori/midori-websettings.c:815 +msgid "Load an address from the selection via middle click" +msgstr "Cím betöltése a kijelölésből középső kattintásra" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Lapok megnyitása a háttérben" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" -msgstr "Az új lapok a háttérben nyíljanak-e" +msgstr "Az új lapok a háttérben nyíljanak-e meg" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" -msgstr "" +msgstr "Lapok megnyitása az aktuális mellett" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" +msgstr "Az új lapok az aktuális mellett vagy az utolsó után nyíljanak-e meg" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" -msgstr "Felugrók megnyitása lapokon" +msgstr "Felugró ablakok megnyitása lapokon" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" -msgstr "Megnyíljanak-e a felugró ablakok lapokon" +msgstr "A felugró ablakok lapokon nyíljanak-e meg" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Képek automatikus betöltése" + +#: ../midori/midori-websettings.c:853 +msgid "Load and display images automatically" +msgstr "A képek automatikus letöltése és megnyitása" + +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Parancsfájlok engedélyezése" + +#: ../midori/midori-websettings.c:861 +msgid "Enable embedded scripting languages" +msgstr "Beágyazott programnyelvek engedélyezése" + +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Netscape bővítmények engedélyezése" + +#: ../midori/midori-websettings.c:869 +msgid "Enable embedded Netscape plugin objects" +msgstr "Beágyazott Netscape bővítményobjektumok engedélyezése" + +#: ../midori/midori-websettings.c:885 +msgid "Enable HTML5 database support" +msgstr "HTML5 adatbázis-támogatás engedélyezése" + +#: ../midori/midori-websettings.c:886 +msgid "Whether to enable HTML5 database support" +msgstr "A HTML5 adatbázis-támogatás engedélyezve legyen-e" + +#: ../midori/midori-websettings.c:892 +msgid "Enable HTML5 local storage support" +msgstr "HTML5 helyi tárolás támogatásának engedélyezése" + +#: ../midori/midori-websettings.c:893 +msgid "Whether to enable HTML5 local storage support" +msgstr "A HTML5 helyi tárolás támogatása engedélyezve legyen-e" + +#: ../midori/midori-websettings.c:901 +msgid "Enable offline web application cache" +msgstr "Webalkalmazások kapcsolat nélküli gyorsítótárának engedélyezése" + +#: ../midori/midori-websettings.c:902 +msgid "Whether to enable offline web application cache" +msgstr "A webalkalmazások kapcsolat nélküli gyorsítótára engedélyezve legyen-e" + +#: ../midori/midori-websettings.c:927 +msgid "Zoom Text and Images" +msgstr "Szöveg és képek nagyítása" + +#: ../midori/midori-websettings.c:928 +msgid "Whether to zoom text and images" +msgstr "A szöveg és képek nagyítandók-e" + +#: ../midori/midori-websettings.c:943 +msgid "Find inline while typing" +msgstr "Beágyazott keresés gépeléskor" + +#: ../midori/midori-websettings.c:944 +msgid "Whether to automatically find inline while typing" +msgstr "Gépeléskor az automatikus beágyazott keresés használandó-e" + +# Fixme: ez mi? +#: ../midori/midori-websettings.c:959 +msgid "Kinetic scrolling" +msgstr "Kinetikus görgetés" + +# Fixme: ez mi? +#: ../midori/midori-websettings.c:960 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "A görgetés kinetikusan mozogjon-e a sebességnek megfelelően" + +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" -msgstr "Sütik fogadása" +msgstr "Sütik elfogadása" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" -msgstr "Milyen sütiket fogadjunk el" +msgstr "Milyen típusú sütiket fogadjon el" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" -msgstr "Csak eredeti sütiket" +msgstr "Csak eredeti sütik" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" -msgstr "Csak az eredeti lapról való sütiket fogadjuk el" +msgstr "Csak az eredeti webhelyről származó sütik elfogadása" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Sütik maximális kora" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" -msgstr "A napok száma, melyre a sütiket legfeljebb elmentsük" +msgstr "Sütik tárolása legfeljebb ennyi napig" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" -msgstr "Legutóbbi lapok megjegyzése" +msgstr "Utoljára látogatott oldalak megjegyzése" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" -msgstr "Mentsük-e a legutóbb meglátogatott lapokat" +msgstr "Az utoljára meglátogatott oldalak mentendők-e" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" -msgstr "Történet maximális kora" +msgstr "Előzmények maximális kora" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" -msgstr "A legtöbb nap, melyre a történetet elmentsük" +msgstr "Előzmények tárolása legfeljebb ennyi napig" -#: ../midori/midori-websettings.c:585 -msgid "Remember last form inputs" -msgstr "Űrlapok megjegyzése" - -#: ../midori/midori-websettings.c:586 -msgid "Whether the last form inputs are saved" -msgstr "Mentsük-e az űrlapokba bevitt adatokat" - -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" -msgstr "Legutóbbi letöltések megjegyzése" +msgstr "Utoljára letöltött fájlok megjegyzése" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" -msgstr "Jegyezzük-e a legutóbbi letöltéseket" +msgstr "Az utoljára letöltött fájlok megjegyzendők-e" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "HTTP Proxy" +#: ../midori/midori-websettings.c:1048 +msgid "Proxy server" +msgstr "Proxykiszolgáló" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "A HTTP-kapcsolatok proxy kiszolgálója" +#: ../midori/midori-websettings.c:1049 +msgid "The type of proxy server to use" +msgstr "A használandó proxykiszolgáló típusa" -#: ../midori/midori-websettings.c:614 -msgid "Cache size" -msgstr "Gyorstár mérete" +#: ../midori/midori-websettings.c:1058 +msgid "HTTP Proxy Server" +msgstr "HTTP proxykiszolgáló" -#: ../midori/midori-websettings.c:615 -msgid "The allowed size of the cache" -msgstr "Az engedélyezett gyorstár-méret" +#: ../midori/midori-websettings.c:1059 +msgid "The proxy server used for HTTP connections" +msgstr "A HTTP kapcsolatokhoz használt proxykiszolgáló" + +#: ../midori/midori-websettings.c:1074 +msgid "Detect proxy server automatically" +msgstr "Proxykiszolgáló automatikus felismerése" + +#: ../midori/midori-websettings.c:1075 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Megpróbálja-e automatikusan felismerni a proxykiszolgálót a környezetből" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:1091 +msgid "Identify as" +msgstr "Azonosítás mint" + +#: ../midori/midori-websettings.c:1092 +msgid "What to identify as to web pages" +msgstr "Miként mutatkozzon be a weboldalaknak" + +#: ../midori/midori-websettings.c:1108 +msgid "Identification string" +msgstr "Azonosító karakterlánc" + +#: ../midori/midori-websettings.c:1109 +msgid "The application identification string" +msgstr "Az alkalmazást azonosító karakterlánc" + +#: ../midori/midori-websettings.c:1124 +msgid "Preferred languages" +msgstr "Előnyben részesített nyelvek" + +#: ../midori/midori-websettings.c:1125 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Többnyelvű weboldalak megjelenítésekor előnyben részesített nyelvek vesszővel " +"elválasztott listája. Például: " +"„hu”, „hu,en” vagy „en-us;q=1.0, fr-fr;q=0.667”" + +#: ../midori/midori-websettings.c:1140 +msgid "Clear private data" +msgstr "Privát adatok törlése" + +#: ../midori/midori-websettings.c:1141 +msgid "The private data selected for deletion" +msgstr "A törlésre kiválasztott privát adatok" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 +#, c-format +msgid "Error - %s" +msgstr "Hiba - %s" + +#: ../midori/midori-view.c:1262 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "A(z) „%s” oldal nem tölthető be." + +#: ../midori/midori-view.c:1264 +msgid "Try again" +msgstr "Próbálja újra" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" -msgstr "" +msgstr "Nem található - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#, c-format +msgid "Send a message to %s" +msgstr "Üzenet küldése a következőnek: %s" + +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +msgid "Inspect _Element" +msgstr "Elem _vizsgálata" + +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" msgstr "Hivatkozás megnyitása új _lapon" -#: ../midori/midori-view.c:925 +#: ../midori/midori-view.c:2195 +msgid "Open Link in _Foreground Tab" +msgstr "Hi_vatkozás megnyitása az előtérben lévő lapon" + +#: ../midori/midori-view.c:2196 +msgid "Open Link in _Background Tab" +msgstr "_Hivatkozás megnyitása a háttérben lévő lapon" + +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +msgid "Open Link in New _Window" +msgstr "Hivatkozás megnyitása új _ablakban" + +#: ../midori/midori-view.c:2202 +msgid "Open Link as Web A_pplication" +msgstr "Hivatkozás megnyitása _webes alkalmazásként" + +#: ../midori/midori-view.c:2205 +msgid "Copy Link de_stination" +msgstr "Hivatkozás _címének másolása" + +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" -msgstr "" +msgstr "Hivatkozás címének me_ntése" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 msgid "_Download Link destination" -msgstr "" +msgstr "Hivatkozás címének l_etöltése" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "URL megnyitása új _lapon" +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 +msgid "Download with Download _Manager" +msgstr "_Letöltés a letöltéskezelővel" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:2222 +msgid "Open _Image in New Tab" +msgstr "Ké_p megnyitása új lapon" + +#: ../midori/midori-view.c:2225 +msgid "Copy Image _Address" +msgstr "Kép _címének másolása" + +#: ../midori/midori-view.c:2228 +msgid "Save I_mage" +msgstr "Kép me_ntése" + +#: ../midori/midori-view.c:2229 +msgid "Download I_mage" +msgstr "_Kép letöltése" + +#: ../midori/midori-view.c:2236 +msgid "Copy Video _Address" +msgstr "Videó _címének másolása" + +#: ../midori/midori-view.c:2239 +msgid "Save _Video" +msgstr "Videó me_ntése" + +#: ../midori/midori-view.c:2239 +msgid "Download _Video" +msgstr "_Videó letöltése" + +#: ../midori/midori-view.c:2302 +msgid "Search _with" +msgstr "_Keresés ezzel" + +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +msgid "_Search the Web" +msgstr "Keresés a _weben" + +#: ../midori/midori-view.c:2365 +msgid "Open Address in New _Tab" +msgstr "Cím meg_nyitása új lapon" + +#: ../midori/midori-view.c:2661 +msgid "Open or download file" +msgstr "Fájl megnyitása vagy letöltése" + +#: ../midori/midori-view.c:2680 +#, c-format +msgid "File Type: '%s'" +msgstr "Fájltípus: „%s”" + +#: ../midori/midori-view.c:2683 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Fájltípus: %s („%s”)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2687 +#, c-format +msgid "Open %s" +msgstr "%s megnyitása" + +#: ../midori/midori-view.c:3231 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Oldal vizsgálata - %s" -#: ../midori/midori-view.c:1503 -msgid "Source" -msgstr "" +#: ../midori/midori-view.c:3513 +msgid "Speed dial" +msgstr "Gyorstárcsázó" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:3514 +msgid "Click to add a shortcut" +msgstr "Kattintson gyorsindító hozzáadásához" + +#: ../midori/midori-view.c:3515 +msgid "Enter shortcut address" +msgstr "Adja meg a gyorsindító címét" + +#: ../midori/midori-view.c:3516 +msgid "Enter shortcut title" +msgstr "Adja meg a gyorsindító címét" + +#: ../midori/midori-view.c:3517 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Biztosan törölni akarja ezt a gyorsindítót?" + +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "Oszlopok és sorok számának beállítása" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "Adja meg az oszlopok és sorok számát:" + +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "A gyorstárcsázó megadott mérete érvénytelen" + +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Bélyegkép mérete:" + +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "Kicsi" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "Közepes" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "Nagy" + +#: ../midori/midori-view.c:3550 +#, c-format +msgid "Document cannot be displayed" +msgstr "A dokumentum nem jeleníthető meg" + +#: ../midori/midori-view.c:3573 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "Nincs telepítve dokumentáció" -#: ../midori/midori-preferences.c:87 -#, fuzzy, c-format -msgid "Preferences for %s" -msgstr "%s beállításai" +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "Oldalbetöltés késleltetve" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "A betöltés késleltetve egy nemrégi összeomlás vagy az indítási beállítások miatt." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "Oldal betöltése" + +#: ../midori/midori-view.c:3840 +msgid "Blank page" +msgstr "Üres oldal" + +#: ../midori/midori-view.c:4100 +msgid "_Duplicate Tab" +msgstr "_Lap kettőzése" + +#: ../midori/midori-view.c:4105 +msgid "_Restore Tab" +msgstr "Lap _visszaállítása" + +#: ../midori/midori-view.c:4105 +msgid "_Minimize Tab" +msgstr "Lap _minimalizálása" + +#: ../midori/midori-view.c:4111 +msgid "Close ot_her Tabs" +msgstr "_Többi lap bezárása" + +#: ../midori/midori-view.c:4797 +msgid "Print background images" +msgstr "Háttérképek nyomtatása" + +#: ../midori/midori-view.c:4798 +msgid "Whether background images should be printed" +msgstr "A háttérképeket ki kell-e nyomtatni" + +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +msgid "Features" +msgstr "Szolgáltatások" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:298 msgid "General" msgstr "Általános" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:299 msgid "Startup" -msgstr "Indulás" +msgstr "Indítás" + +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +msgid "Use current page as homepage" +msgstr "Jelenlegi oldal használata kezdőlapként" + +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "Átvitelek" #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:349 msgid "Appearance" msgstr "Megjelenés" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:350 msgid "Font settings" -msgstr "Betű beállítások" +msgstr "Betűkészlet-beállítások" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:352 msgid "Default Font Family" -msgstr "" +msgstr "Alapértelmezett betűkészletcsalád" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:355 +msgid "The default font family used to display text" +msgstr "A szöveg megjelenítésére alapértelmezésben használandó betűkészletcsalád" + +#: ../midori/midori-preferences.c:358 +msgid "The default font size used to display text" +msgstr "A szöveg megjelenítésére alapértelmezésben használandó betűméret" + +#: ../midori/midori-preferences.c:360 +msgid "Fixed-width Font Family" +msgstr "Rögzített szélességű betűkészletcsalád" + +#: ../midori/midori-preferences.c:363 +msgid "The font family used to display fixed-width text" +msgstr "A rögzített szélességű szöveg megjelenítésére használt betűkészletcsalád" + +#: ../midori/midori-preferences.c:366 +msgid "The font size used to display fixed-width text" +msgstr "A rögzített szélességű szöveg megjelenítésére használt betűméret" + +#: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" -msgstr "" +msgstr "Minimális betűméret" + +#: ../midori/midori-preferences.c:371 +msgid "The minimum font size used to display text" +msgstr "A szöveg megjelenítésére használt minimális betűméret" #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:380 msgid "Behavior" msgstr "Viselkedés" -#: ../midori/midori-preferences.c:408 -msgid "Features" -msgstr "Képességek" +#: ../midori/midori-preferences.c:393 +msgid "Enforce 96 dots per inch" +msgstr "96 DPI kényszerítése" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 -msgid "Load images automatically" -msgstr "" +#: ../midori/midori-preferences.c:394 +msgid "Enforce a video dot density of 96 DPI" +msgstr "96 DPI képpontsűrűség kényszerítése" #: ../midori/midori-preferences.c:414 -msgid "Shrink images automatically" -msgstr "" +msgid "Allow scripts to open popups" +msgstr "A parancsfájlok megnyithatnak felugró ablakokat" -#: ../midori/midori-preferences.c:417 -msgid "Print background images" -msgstr "" +#: ../midori/midori-preferences.c:415 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "A parancsfájlok megnyithatnak-e automatikusan felugró ablakokat" -#: ../midori/midori-preferences.c:420 -msgid "Resizable text areas" -msgstr "" +#: ../midori/midori-preferences.c:419 +msgid "Spell Checking" +msgstr "Helyesírás-ellenőrzés" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 -msgid "Enable scripts" -msgstr "" +#: ../midori/midori-preferences.c:422 +msgid "Enable Spell Checking" +msgstr "Helyesírás-ellenőrzés engedélyezése" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 -msgid "Enable plugins" -msgstr "" +#: ../midori/midori-preferences.c:423 +msgid "Enable spell checking while typing" +msgstr "Helyesírás-ellenőrzés engedélyezése gépeléskor" +#: ../midori/midori-preferences.c:425 +msgid "Spelling dictionaries:" +msgstr "Helyesírási szótárak:" + +#. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "Enable developer tools" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" msgstr "" +"A helyesírás-ellenőrzéshez használandó nyelvek vesszővel elválasztott listája, " +"például: „hu_HU,en_US”" #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:435 msgid "Interface" msgstr "Felület" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:436 msgid "Navigationbar" -msgstr "Címsáv" +msgstr "Navigációs sáv" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:446 msgid "Browsing" msgstr "Böngészés" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#. Page "Applications" +#: ../midori/midori-preferences.c:468 +msgid "Applications" +msgstr "Alkalmazások" + +#: ../midori/midori-preferences.c:469 +msgid "External applications" +msgstr "Külső alkalmazások" + +#. Page "Network" +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 msgid "Network" msgstr "Hálózat" #: ../midori/midori-preferences.c:492 -msgid "MB" -msgstr "MB" +msgid "Hostname" +msgstr "Gépnév" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:511 msgid "Privacy" -msgstr "" +msgstr "Adatvédelem" -#: ../midori/midori-preferences.c:500 -#, fuzzy +#: ../midori/midori-preferences.c:512 msgid "Web Cookies" -msgstr "Sütik fogadása" +msgstr "Webes sütik" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" -msgstr "" +msgstr "nap" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 -msgid "Empty" -msgstr "Üres" - -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:917 msgid "Add search engine" -msgstr "Kereső-motor hozzáadása" +msgstr "Keresőszolgáltatás hozzáadása" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:917 msgid "Edit search engine" -msgstr "Kereső-motor szerkesztése" +msgstr "Keresőszolgáltatás szerkesztése" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:945 msgid "_Name:" msgstr "_Név:" -#: ../midori/midori-searchaction.c:869 -msgid "_Icon (name or file):" -msgstr "_Ikon (Név vagy fájl):" +#: ../midori/midori-searchaction.c:989 +msgid "_Icon:" +msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:1003 msgid "_Token:" -msgstr "" +msgstr "_Jelsor:" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" -msgstr "Kereső-motorok kezelése" +#: ../midori/midori-searchaction.c:1234 +msgid "Manage Search Engines" +msgstr "Keresőszolgáltatások kezelése" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 -msgid "Could not run external program." -msgstr "" +#: ../midori/midori-searchaction.c:1335 +msgid "Use as _default" +msgstr "_Alapértelmezett" -#: ../midori/sokoke.c:282 -msgid "Warning: You are using a superuser account!" -msgstr "VESZÉLY! Rendszergazda hozzáférést használsz!" +#: ../midori/sokoke.c:1287 +msgid "_Bookmark" +msgstr "_Könyvjelző" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "" +#: ../midori/sokoke.c:1289 +msgid "Add Boo_kmark" +msgstr "Köny_vjelző hozzáadása" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "" +#: ../midori/sokoke.c:1290 +msgid "_Console" +msgstr "_Konzol" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "" +#: ../midori/sokoke.c:1291 +msgid "_Extensions" +msgstr "Kit_erjesztések" -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "" +#: ../midori/sokoke.c:1292 +msgid "_History" +msgstr "_Előzmények" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "" +#: ../midori/sokoke.c:1293 +msgid "_Homepage" +msgstr "Kez_dőlap" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 -msgid "Userstyles" -msgstr "" +#: ../midori/sokoke.c:1294 +msgid "_Userscripts" +msgstr "_Felhasználói parancsfájlok" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 -msgid "_Enable" -msgstr "" +#: ../midori/sokoke.c:1295 +msgid "New _Tab" +msgstr "Új _lap" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 -#, fuzzy -msgid "_Disable" -msgstr "_Fájl" +#: ../midori/sokoke.c:1296 +msgid "_Transfers" +msgstr "Á_tvitelek" + +#: ../midori/sokoke.c:1297 +msgid "Netscape p_lugins" +msgstr "_Netscape bővítmények" + +#: ../midori/sokoke.c:1300 +msgid "New _Folder" +msgstr "Új _mappa" + +#: ../panels/midori-bookmarks.c:111 +msgid "Bookmarks" +msgstr "Könyvjelzők" + +#: ../panels/midori-bookmarks.c:241 +msgid "Edit the selected bookmark" +msgstr "A kijelölt könyvjelző szerkesztése" + +#: ../panels/midori-bookmarks.c:249 +msgid "Delete the selected bookmark" +msgstr "A kijelölt könyvjelző törlése" + +#: ../panels/midori-bookmarks.c:262 +msgid "Add a new folder" +msgstr "Új mappa hozzáadása" + +#: ../panels/midori-bookmarks.c:592 +msgid "Separator" +msgstr "Elválasztó" #: ../panels/midori-console.c:87 msgid "Console" msgstr "Konzol" -#: ../panels/midori-extensions.c:87 +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Ö_sszes másolása" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Összes másolása" + +#: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Kiterjesztések" -#: ../katze/katze-throbber.c:828 +#: ../panels/midori-history.c:273 +msgid "Erroneous clock time" +msgstr "Hibás óraidő" + +#: ../panels/midori-history.c:274 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "Az óra ideje a múltban van. Ellenőrizze a jelenlegi dátumot és időt." + +#: ../panels/midori-history.c:286 +msgid "A week ago" +msgstr "Egy hete" + +#: ../panels/midori-history.c:288 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d napja" +msgstr[1] "%d napja" + +#: ../panels/midori-history.c:291 +msgid "Today" +msgstr "Ma" + +#: ../panels/midori-history.c:293 +msgid "Yesterday" +msgstr "Tegnap" + +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "Biztos benne, hogy minden előzményelemet el akar távolítani?" + +#: ../panels/midori-history.c:437 +msgid "Bookmark the selected history item" +msgstr "A kijelölt előzményelem könyvjelzőzése" + +#: ../panels/midori-history.c:446 +msgid "Delete the selected history item" +msgstr "A kijelölt előzményelem törlése" + +#: ../panels/midori-history.c:454 +msgid "Clear the entire history" +msgstr "Minden előzmény törlése" + +#: ../panels/midori-history.c:952 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Szűrő:" + +#: ../panels/midori-transfers.c:478 +msgid "Open Destination _Folder" +msgstr "_Célmappa megnyitása" + +#: ../panels/midori-transfers.c:481 +msgid "Copy Link Loc_ation" +msgstr "Link _helyének másolása" + +#: ../katze/katze-http-auth.c:214 +msgid "Authentication Required" +msgstr "Hitelesítés szükséges" + +#: ../katze/katze-http-auth.c:230 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"A hely megnyitásához felhasználónév\n" +"és jelszó szükséges:" + +#: ../katze/katze-http-auth.c:244 +msgid "Username" +msgstr "Felhasználói név" + +#: ../katze/katze-http-auth.c:257 +msgid "Password" +msgstr "Jelszó" + +#: ../katze/katze-http-auth.c:272 +msgid "_Remember password" +msgstr "Jelszó _megjegyzése" + +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "" +msgstr "A(z) „%s” nevű ikon nem tölthető be" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "" +msgstr "A(z) „%s” alapértelmezett ikon nem tölthető be" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" -msgstr "" +msgstr "Az animációs képkockák sérültek" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" -msgstr "Érvénytelen '%s' tulajdonság ehhez: %s" +msgstr "A(z) „%s” tulajdonság érvénytelen a következőhöz: %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" -msgstr "Válassz fájlt" +msgstr "Válasszon fájlt" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:559 msgid "Choose folder" -msgstr "Válassz mappát" +msgstr "Válasszon mappát" + +#: ../katze/katze-preferences.c:95 +#, c-format +msgid "Preferences for %s" +msgstr "%s tulajdonságai" + +#: ../extensions/adblock.c:415 +msgid "Configure Advertisement filters" +msgstr "Reklámszűrők beállítása" + +#: ../extensions/adblock.c:447 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához adáshoz " +"nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s." + +#: ../extensions/adblock.c:587 +msgid "Configure _Advertisement filters..." +msgstr "_Reklámszűrők beállítása…" + +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "Szabály szerkesztése" + +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "S_zabály:" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "Kép _blokkolása" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "_Hivatkozás blokkolása" + +#: ../extensions/adblock.c:1489 +msgid "Advertisement blocker" +msgstr "Reklámblokkoló" + +#: ../extensions/adblock.c:1490 +msgid "Block advertisements according to a filter list" +msgstr "Reklámok blokkolása szűrőlista alapján" + +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "%s másolása ezen mappába: %s." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Felhasználói parancsfájlok" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Felhasználói stílusok" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "A(z) „%s” kiterjesztés beállításai nem menthetők: %s\n" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Felhasználói bővítmények" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "„%s” mappa nem figyelhető meg: %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Felhasználói parancsfájlok és stílusok támogatása" + +#: ../extensions/colorful-tabs.c:204 +msgid "Colorful Tabs" +msgstr "Színes lapok" + +#: ../extensions/colorful-tabs.c:205 +msgid "Tint each tab distinctly" +msgstr "Eltérő szín adása minden lapnak" + +#: ../extensions/cookie-manager/cookie-manager-page.c:82 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Sütikezelő" + +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Delete All" +msgstr "Összes törlése" + +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Minden megjelenített süti törlése. Ha be van állítva szűrő, akkor csak " +"az annak megfelelő sütiket törli." + +#: ../extensions/cookie-manager/cookie-manager-page.c:129 +msgid "Expand All" +msgstr "Összes kibontása" + +#: ../extensions/cookie-manager/cookie-manager-page.c:136 +msgid "Collapse All" +msgstr "Összes összecsukása" + +#: ../extensions/cookie-manager/cookie-manager-page.c:578 +msgid "Do you really want to delete all cookies?" +msgstr "Biztos, hogy az összes sütit törölni akarja?" + +#: ../extensions/cookie-manager/cookie-manager-page.c:580 +msgid "Question" +msgstr "Kérdés" + +#: ../extensions/cookie-manager/cookie-manager-page.c:589 +msgid "Only cookies which match the filter will be deleted." +msgstr "Csak a szűrőnek megfelelő sütik kerülnek törlésre." + +#: ../extensions/cookie-manager/cookie-manager-page.c:677 +msgid "At the end of the session" +msgstr "A munkamenet végén" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Gép: %s\n" +"Név: %s\n" +"Érték: %s\n" +"Útvonal: %s\n" +"Biztonságos: %s\n" +"Lejár: %s" + +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "Yes" +msgstr "Igen" + +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "No" +msgstr "Nem" + +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Tartomány: %s\n" +"Sütik: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +msgid "Name" +msgstr "Név" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +msgid "_Expand All" +msgstr "Összes _kibontása" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +msgid "_Collapse All" +msgstr "Összes össze_csukása" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "Adjon meg egy szűrő karakterláncot a név vagy tartomány mező szűréséhez" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "_Sütikezelő" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Sütik felsorolása, megjelenítése és törlése" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Nem találhatók a szükséges Atom „entry” bejegyzések az XML adatokban." + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Nem találhatók a szükséges Atom „feed” bejegyzések az XML adatokban." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Utolsó frissítés: %s." + +#: ../extensions/feed-panel/feed-panel.c:670 +msgid "Feeds" +msgstr "Hírforrások" + +#: ../extensions/feed-panel/feed-panel.c:723 +msgid "Add new feed" +msgstr "Új hírforrás hozzáadása" + +#: ../extensions/feed-panel/feed-panel.c:730 +msgid "Delete feed" +msgstr "Hírforrás törlése" + +#: ../extensions/feed-panel/feed-panel.c:812 +msgid "_Feeds" +msgstr "_Hírforrások" + +#: ../extensions/feed-panel/feed-parse.c:192 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Nem található gyökérelem a hírforrás XML adataiban." + +#: ../extensions/feed-panel/feed-parse.c:232 +#, c-format +msgid "Unsupported feed format." +msgstr "Nem támogatott hírforrásformátum." + +#: ../extensions/feed-panel/feed-parse.c:262 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Az XML hírforrás feldolgozása meghiúsult: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Nem található a „channel” elem az RSS XML adatokban." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Nem támogatott RSS verzió." + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Nem találhatók a szükséges RSS „item” elemek az XML adatokban." + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Nem találhatók a szükséges RSS „channel” elemek az XML adatokban." + +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Hiba" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "A(z) „%s” hírforrás már létezik" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Hiba a(z) „%s” hírforrás betöltésekor" + +#: ../extensions/feed-panel/main.c:516 +msgid "Feed Panel" +msgstr "Hírforráspanel" + +#: ../extensions/feed-panel/main.c:517 +msgid "Read Atom/ RSS feeds" +msgstr "Atom/ RSS hírforrások olvasása" + +#: ../extensions/formhistory.c:144 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Az űrlapérték hozzáadása meghiúsult: %s\n" + +#: ../extensions/formhistory.c:510 +msgid "Stores history of entered form data" +msgstr "A bevitt űrlapadatok előzményeit tárolja" + +#: ../extensions/formhistory.c:514 +#, c-format +msgid "Not available: %s" +msgstr "Nem érhető el: %s" + +#: ../extensions/formhistory.c:515 +msgid "Resource files not installed" +msgstr "Az erőforrásfájlok nincsenek telepítve" + +#: ../extensions/formhistory.c:521 +msgid "Form history filler" +msgstr "Űrlap-előzmények kitöltése" + +#: ../extensions/mouse-gestures.c:303 +msgid "Mouse Gestures" +msgstr "Egérgesztusok" + +#: ../extensions/mouse-gestures.c:304 +msgid "Control Midori by moving the mouse" +msgstr "A Midori irányítása az egér mozgatásával" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "" +msgstr "Oldaltároló" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "_Mappa:" +msgstr "_Oldaltároló" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Oldalak nyitva tartása a lapokkal párhuzamosan" + +#: ../extensions/shortcuts.c:170 +msgid "Customize Keyboard shortcuts" +msgstr "Gyorsbillentyűk személyre szabása" + +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." +msgstr "_Gyorsbillentyűk személyre szabása…" + +#: ../extensions/shortcuts.c:315 +msgid "Shortcuts" +msgstr "Gyorsbillentyűk" + +#: ../extensions/shortcuts.c:316 +msgid "View and edit keyboard shortcuts" +msgstr "Gyorsbillentyűk megjelenítése és szerkesztése" + +#: ../extensions/statusbar-features.c:84 msgid "Images" -msgstr "" +msgstr "Képek" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:96 msgid "Scripts" +msgstr "Parancsfájlok" + +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Netscape bővítmények" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "Állapotsor-összetevők" + +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "Weboldalak összetevőinek egyszerű be- és kikapcsolása" + +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +msgid "Tab Panel" +msgstr "Lappanel" + +#: ../extensions/tab-panel.c:609 +msgid "T_ab Panel" +msgstr "_Lappanel" + +#: ../extensions/tab-panel.c:626 +msgid "Show tabs in a vertical panel" +msgstr "Lapok megjelenítése függőleges panelen" + +#: ../extensions/tab-switcher.c:402 +msgid "Tab History List" +msgstr "Lapelőzmények listája" + +#: ../extensions/tab-switcher.c:403 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Lehetővé teszi a lapok közti váltást az utolsó használat alapján rendezett listából" + +#: ../extensions/toolbar-editor.c:389 +msgid "Customize Toolbar" +msgstr "Eszköztár testreszabása" + +#: ../extensions/toolbar-editor.c:405 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." msgstr "" +"Válassza ki az eszköztáron megjelenítendő elemeket. Az elemek fogd és vidd " +"módszerrel átrendezhetők." -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "" +#: ../extensions/toolbar-editor.c:421 +msgid "Available Items" +msgstr "Elérhető elemek" -#~ msgid "Select _All" -#~ msgstr "Mindent ki_jelöl" +#: ../extensions/toolbar-editor.c:442 +msgid "Displayed Items" +msgstr "Megjelenített elemek" -#~ msgid "_Fullscreen" -#~ msgstr "_Teljes képernyő" +#: ../extensions/toolbar-editor.c:577 +msgid "Customize _Toolbar..." +msgstr "_Eszköztár személyre szabása…" -#~ msgid "_Leave Fullscreen" -#~ msgstr "Teljes képernyő elhagyása" +#: ../extensions/toolbar-editor.c:608 +msgid "Toolbar Editor" +msgstr "Eszköztárszerkesztő" -#~ msgid "Settings" -#~ msgstr "Beállítások" +#: ../extensions/toolbar-editor.c:609 +msgid "Easily edit the toolbar layout" +msgstr "Az eszköztár elrendezésének egyszerű szerkesztése" -#~ msgid "The associated settings" -#~ msgstr "Társított beállítások" +#: ../extensions/web-cache.c:465 +msgid "Cache HTTP communication on disk" +msgstr "HTTP kommunikáció gyorsítótárazása a lemezen" -#~ msgid "Trash" -#~ msgstr "Kuka" - -#~ msgid "The trash, collecting recently closed tabs and windows" -#~ msgstr "A legutóbb bezárt lapokat és ablakokat gyűjtő kuka." - -#~ msgid "Browser" -#~ msgstr "Böngésző" - -#~ msgid "The navigationbar" -#~ msgstr "A címsáv" - -#~ msgid "Tab" -#~ msgstr "Lap" - -#~ msgid "The current tab" -#~ msgstr "Jelenlegi lap" - -#~ msgid "Statusbar" -#~ msgstr "Állapotsáv" - -#~ msgid "The statusbar" -#~ msgstr "Az állapotsáv" - -#~ msgid "Statusbar Text" -#~ msgstr "Állapotsáv szöveg" - -#~ msgid "The text that is displayed in the statusbar" -#~ msgstr "Az állapotsávra írt szöveg" - -#~ msgid "Pa_ge Setup" -#~ msgstr "_Oldal beállítása" - -#~ msgid "Undo the last modification" -#~ msgstr "Utolsó módosítás visszavonása" - -#~ msgid "Redo the last modification" -#~ msgstr "Utolsó módosítás ismétlése" - -#~ msgid "_Manage Bookmarks" -#~ msgstr "Könyvjelzők _kezelése" - -#~ msgid "Tab _Overview" -#~ msgstr "Lapok át_tekintése" - -#~ msgid "_Work Offline" -#~ msgstr "_Kapcsolat nélküli munka" - -#~ msgid "Appearance of the shadow around each panel" -#~ msgstr "Panelek körüli árnyékok megjelenése" - -#~ msgid "Menu" -#~ msgstr "Menü" - -#~ msgid "Menu to hold panel items" -#~ msgstr "Panel-elemek menüje" - -#~ msgid "Show New Tab" -#~ msgstr "Új lap mutatása" - -#~ msgid "Show the New Tab button in the toolbar" -#~ msgstr "Új lap gomb mutatása az eszközsávon" - -#~ msgid "Show Web search" -#~ msgstr "Web-keresés mutatása" - -#~ msgid "Show the Web search entry in the toolbar" -#~ msgstr "A Web-kereső mező mutatása az eszközsávon" - -#~ msgid "Show Trash" -#~ msgstr "Kuka mutatása" - -#~ msgid "Show the Trash button in the toolbar" -#~ msgstr "A kuka gomb mutatása az eszközsávon" - -#~ msgid "Tab Label Size" -#~ msgstr "A címke mérete" - -#~ msgid "The desired tab label size" -#~ msgstr "A lapok címkéinek kívánt mérete" - -#~ msgid "The URI of the currently loaded page" -#~ msgstr "A jelenlegi lap URI-ja" - -#~ msgid "The title of the currently loaded page" -#~ msgstr "A jelenlegi lap címe" - -#~ msgid "Symbolic size to use for the animation" -#~ msgstr "Az animációra használt jelképes méret" - -#~ msgid "The name of an icon containing animation frames" -#~ msgstr "Egy animációs kereteket tartalmazó ikon neve" - -#~ msgid "A GdkPixbuf containing animation frames" -#~ msgstr "Egy animációs kereteket tartalmazó GdkPixbuf" - -#~ msgid "Whether the throbber should be animated" -#~ msgstr "A betöltés-jelző animált legyen-e" - -#~ msgid "The name of an icon to be used as the static image" -#~ msgstr "Egy állóképként használandó ikon neve" - -#~ msgid "A GdkPixbuf to be used as the static image" -#~ msgstr "Egy állóképként használandó GdkPixbuf" From 8551c16f84082b63eea4038c8ec2f0ededf2cf22 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 22 Jun 2010 11:04:52 +0200 Subject: [PATCH 2726/2970] l10n: Updated Hungarian (hu) translation to 100% New status: 635 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hu.po | 813 +++++++++++++++++++++++++++---------------------------- 1 file changed, 399 insertions(+), 414 deletions(-) diff --git a/po/hu.po b/po/hu.po index f5c66e8f..762f64d0 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,28 +1,28 @@ # Hungarian translation of midori # Copyright 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the midori package. -# +# # Gabor Kelemen , 2010. msgid "" msgstr "" "Project-Id-Version: midori master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-12 16:08+0000\n" +"POT-Creation-Date: 2010-06-22 04:08+0000\n" "PO-Revision-Date: 2010-06-22 03:12+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Könnyűsúlyú webböngésző" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 -#: ../midori/main.c:1692 ../midori/main.c:1708 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -46,7 +46,7 @@ msgstr "A(z) „%s” érték érvénytelen ehhez: %s" msgid "Invalid configuration value '%s'" msgstr "Érvénytelen beállításérték: „%s”" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Az adatbázis nem nyitható meg: %s\n" @@ -57,177 +57,172 @@ msgstr "Az adatbázis nem nyitható meg: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "A régi előzményelemek eltávolítása meghiúsult: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "A beállítások nem menthetők. %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "A keresőmotorok nem menthetők. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "A könyvjelzők nem menthetők. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A beállítások nem menthetők. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "A keresőmotorok nem menthetők. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "A Kuka nem menthető. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "A munkamenet nem menthető. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nem érhető el gyökértanúsítvány-fájl. Az SSL-tanúsítványok nem ellenőrizhetők." -#: ../midori/main.c:970 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Úgy tűnik, hogy a Midori összeomlott az utolsó futásakor. Ha ez ismételten " -"előfordul, a probléma megoldása érdekében próbálja ki a következő " -"lehetőségeket." +#: ../midori/main.c:914 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Úgy tűnik, hogy a Midori összeomlott az utolsó futásakor. Ha ez ismételten előfordul, a probléma megoldása érdekében próbálja ki a következő lehetőségeket." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Beállítások _módosítása" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "_Utolsó munkamenet visszaállítása" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Minden _kiterjesztés letiltása" -#: ../midori/main.c:1230 ../midori/main.c:1957 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A munkamenet nem tölthető be: %s\n" -#: ../midori/main.c:1354 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Nincs megadva fájlnév" -#: ../midori/main.c:1373 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Ismeretlen hiba történt." -#: ../midori/main.c:1404 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Pillanatkép mentve ide: %s\n" -#: ../midori/main.c:1576 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "A CÍM futtatása webalkalmazásként" -#: ../midori/main.c:1576 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "CÍM" -#: ../midori/main.c:1579 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "A MAPPA használata konfigurációs mappaként" -#: ../midori/main.c:1579 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "MAPPA" -#: ../midori/main.c:1582 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Diagnosztikai ablak megjelenítése" -#: ../midori/main.c:1584 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "A megadott fájl futtatása javascriptként" -#: ../midori/main.c:1587 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Pillanatkép készítése a megadott URI-ről" -#: ../midori/main.c:1590 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "A megadott parancs futtatása" -#: ../midori/main.c:1592 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "A program verziójának megjelenítése" -#: ../midori/main.c:1594 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Címek" -#: ../midori/main.c:1596 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "URI-címek blokkolása a MINTA reguláris kifejezés alapján" -#: ../midori/main.c:1596 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "MINTA" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1600 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "A Midori visszaállítása ennyi MÁSODPERC inaktivitás után" -#: ../midori/main.c:1600 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "MÁSODPERC" -#: ../midori/main.c:1681 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Címek]" -#: ../midori/main.c:1709 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "A megjegyzéseit, javaslatait és a hibákat ide küldje:" -#: ../midori/main.c:1711 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Új verziókért lásd:" -#: ../midori/main.c:1808 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "A megadott konfigurációs mappa érvénytelen." -#: ../midori/main.c:1856 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "A Midori egy példánya már fut, de nem válaszol.\n" -#: ../midori/main.c:1911 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "A keresőmotorok nem tölthetők be. %s\n" -#: ../midori/main.c:1940 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "A könyvjelzők nem tölthetők be: %s\n" -#: ../midori/main.c:1972 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "A Kuka nem tölthető be: %s\n" -#: ../midori/main.c:1986 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Az előzmények nem tölthetők be: %s\n" -#: ../midori/main.c:2000 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "A következő hibák történtek:" -#: ../midori/main.c:2016 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Kihagyás" @@ -248,814 +243,748 @@ msgstr "Ismeretlen könyvjelzőformátum." msgid "Writing failed." msgstr "Az írás meghiúsult." -#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5572 -#: ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5250 msgid "Reload the current page" msgstr "Az aktuális oldal újratöltése" -#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 msgid "Stop loading the current page" msgstr "Az aktuális oldal betöltésének leállítása" -#: ../midori/midori-browser.c:449 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% betöltve" -#: ../midori/midori-browser.c:487 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "A cím frissítése meghiúsult: %s\n" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Váratlan művelet: „%s”." -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Új mappa" -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Mappa szerkesztése" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Új könyvjelző" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Könyvjelző szerkesztése" -#: ../midori/midori-browser.c:750 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Cím:" -#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Leírás:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Webcím:" -#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4728 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 msgid "_Folder:" msgstr "_Mappa:" -#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 -#: ../midori/midori-browser.c:4733 ../midori/midori-browser.c:4765 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 msgid "Toplevel folder" msgstr "Felső szintű mappa" -#: ../midori/midori-browser.c:853 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Felvétel a _gyorstárcsázásba" -#: ../midori/midori-browser.c:866 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "M_egjelenítés az eszköztáron" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "_Futtatás webalkalmazásként" -#: ../midori/midori-browser.c:975 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nincs elég szabad lemezhely a(z) „%s” letöltéséhez." -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "A fájl %s helyet igényel, de csak %s maradt." -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4783 -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4487 msgid "Save file as" msgstr "Fájl mentése másként" -#: ../midori/midori-browser.c:1410 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../midori/midori-browser.c:1446 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "A(z) „%s” fájl letöltve." - -#: ../midori/midori-browser.c:1450 -msgid "Transfer completed" -msgstr "Átvitel kész" - -#: ../midori/midori-browser.c:1590 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Fájl mentése" -#: ../midori/midori-browser.c:1907 ../midori/midori-browser.c:1909 -msgid "Some files are being downloaded" -msgstr "Néhány fájl letöltése folyamatban" - -#: ../midori/midori-browser.c:1913 -msgid "_Quit Midori" -msgstr "_Kilépés a Midoriból" - -#: ../midori/midori-browser.c:1915 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból." - -#: ../midori/midori-browser.c:2376 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:2454 +#: ../midori/midori-browser.c:2230 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or " -"button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News " -"Aggregator. Next time you click the news feed icon, it will be added " -"automatically." +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -"A fenti URI használatához nyisson meg egy hírforrásolvasót. Általában találhat egy " -"„Új feliratkozás”, „Új hírforrás” vagy hasonló menüt vagy gombot.\n" -"Ennek alternatívájaként nyissa meg a Beállítások -> Alkalmazások fület, és válasszon " -"egy hírforrásolvasót. A hírforrások ikonjára kattintva ezután az automatikusan " -"felvételre kerül." +"A fenti URI használatához nyisson meg egy hírforrásolvasót. Általában találhat egy „Új feliratkozás”, „Új hírforrás” vagy hasonló menüt vagy gombot.\n" +"Ennek alternatívájaként nyissa meg a Beállítások -> Alkalmazások fület, és válasszon egy hírforrásolvasót. A hírforrások ikonjára kattintva ezután az automatikusan felvételre kerül." -#: ../midori/midori-browser.c:2460 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Új hírforrás" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5637 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Új könyvjelző hozzáadása" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Az adatbázis-utasítás végrehajtása meghiúsult: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Üres" -#: ../midori/midori-browser.c:3774 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "A külső program nem futtatható." -#: ../midori/midori-browser.c:4088 ../midori/midori-browser.c:6031 +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Az új előzményelem beszúrása meghiúsult: %s\n" -#: ../midori/midori-browser.c:4421 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Összes _megnyitása lapokon" -#: ../midori/midori-browser.c:4428 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Megnyi_tás új lapon" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4103 ../midori/midori-view.c:2424 +#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Megnyitás új _ablakban" -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:4326 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4655 +#: ../midori/midori-browser.c:4327 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:4328 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4329 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4330 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4679 +#: ../midori/midori-browser.c:4351 msgid "Import bookmarks..." msgstr "Könyvjelzők importálása…" -#: ../midori/midori-browser.c:4682 ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 msgid "_Import bookmarks" msgstr "_Könyvjelzők importálása" -#: ../midori/midori-browser.c:4693 +#: ../midori/midori-browser.c:4365 msgid "_Application:" msgstr "_Alkalmazás:" -#: ../midori/midori-browser.c:4720 ../midori/midori-browser.c:5746 +#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Egyéni…" -#: ../midori/midori-browser.c:4794 +#: ../midori/midori-browser.c:4466 msgid "Failed to import bookmarks" msgstr "A könyvjelzők importálása sikertelen" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4502 msgid "Failed to export bookmarks" msgstr "A könyvjelzők exportálása sikertelen" -#: ../midori/midori-browser.c:4884 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Az előzményelem eltávolítása meghiúsult: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4991 +#: ../midori/midori-browser.c:4663 msgid "Clear Private Data" msgstr "Privát adatok törlése" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4667 msgid "_Clear private data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4681 msgid "Clear the following data:" msgstr "A következő adatok törlése:" -#: ../midori/midori-browser.c:5020 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Előzmények" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:4698 msgid "Cookies" msgstr "Sütik" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:4703 msgid "'Flash' Cookies" msgstr "„Flash” sütik" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:4708 msgid "Website icons" msgstr "Weboldalikonok" -#: ../midori/midori-browser.c:5041 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Bezárt lapok" -#: ../midori/midori-browser.c:5046 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webes gyorsítótár" -#: ../midori/midori-browser.c:5054 +#: ../midori/midori-browser.c:4726 msgid "Clear private data when _quitting Midori" msgstr "Privát adatok törlése a Mi_doriból kilépéskor" -#: ../midori/midori-browser.c:5155 +#: ../midori/midori-browser.c:4827 msgid "A lightweight web browser." msgstr "Könnyűsúlyú webböngésző." -#: ../midori/midori-browser.c:5157 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"A Midori szabad szoftver, terjesztheti és/vagy módosíthatja a Free Software " -"Foundation által kiadott GNU Lesser General Public License 2.1 (vagy bármely " -"későbbi) változatában foglaltak alapján." +#: ../midori/midori-browser.c:4829 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "A Midori szabad szoftver, terjesztheti és/vagy módosíthatja a Free Software Foundation által kiadott GNU Lesser General Public License 2.1 (vagy bármely későbbi) változatában foglaltak alapján." -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4848 msgid "translator-credits" msgstr "Kelemen Gábor " -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5157 msgid "_File" msgstr "_Fájl" -#: ../midori/midori-browser.c:5487 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Új _ablak" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5160 msgid "Open a new window" msgstr "Új ablak megnyitása" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5163 msgid "Open a new tab" msgstr "Új lap megnyitása" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:5165 msgid "P_rivate Browsing" msgstr "_Privát böngészés" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5166 msgid "Don't save any private data while browsing" msgstr "Ne mentsen privát adatokat böngészéskor" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5170 msgid "Open a file" msgstr "Fájl megnyitása" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5173 msgid "Save to a file" msgstr "Mentés fájlba" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5175 msgid "Add to Speed _dial" msgstr "Hozzáadás _gyorstárcsázáshoz" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5176 msgid "Add shortcut to speed dial" msgstr "Indítóikon hozzáadása a gyorstárcsázáshoz" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5178 msgid "Add Shortcut to the _desktop" msgstr "Indítóikon hozzáadása az _asztalhoz" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5179 msgid "Add shortcut to the desktop" msgstr "Indítóikon hozzáadása az asztalhoz" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5181 msgid "Subscribe to News _feed" msgstr "_Feliratkozás hírforrásra" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to this news feed" msgstr "Feliratkozás erre a hírforrásra" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5187 msgid "_Close Tab" msgstr "Lap _bezárása" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5188 msgid "Close the current tab" msgstr "A jelenlegi lap bezárása" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5190 msgid "C_lose Window" msgstr "_Ablak bezárása" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5191 msgid "Close this window" msgstr "A jelenlegi ablak bezárása" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5194 msgid "Print the current page" msgstr "A jelenlegi oldal nyomtatása" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5197 msgid "Quit the application" msgstr "Kilépés az alkalmazásból" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5199 msgid "_Edit" msgstr "S_zerkesztés" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5203 msgid "Undo the last modification" msgstr "Az utolsó módosítás visszavonása" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5206 msgid "Redo the last modification" msgstr "Az utolsó módosítás újra végrehajtása" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5210 msgid "Cut the selected text" msgstr "A kijelölt szöveg kivágása" -#: ../midori/midori-browser.c:5541 ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 msgid "Copy the selected text" msgstr "A kijelölt szöveg másolása" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5219 msgid "Paste text from the clipboard" msgstr "Beillesztés a vágólapról" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5222 msgid "Delete the selected text" msgstr "A kijelölt szöveg törlése" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5225 msgid "Select all text" msgstr "A teljes szöveg kijelölése" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Szó vagy kifejezés keresése az oldalon" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "_Következő találat" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5231 msgid "Find the next occurrence of a word or phrase" msgstr "Szó vagy kifejezés következő előfordulásának keresése" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "_Előző találat" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5234 msgid "Find the previous occurrence of a word or phrase" msgstr "Szó vagy kifejezés előző előfordulásának keresése" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5238 msgid "Configure the application preferences" msgstr "Az alkalmazás beállításainak megadása" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:5240 msgid "_View" msgstr "_Nézet" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5241 msgid "_Toolbars" msgstr "_Eszköztárak" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5253 msgid "Increase the zoom level" msgstr "Nagyítási szint növelése" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5256 msgid "Decrease the zoom level" msgstr "Nagyítási szint csökkentése" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5259 msgid "Reset the zoom level" msgstr "Nagyítási szint visszaállítása" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5260 msgid "_Encoding" msgstr "_Kódolás" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5262 msgid "View So_urce" msgstr "_Forrás megjelenítése" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5263 msgid "View the source code of the page" msgstr "Az oldal forráskódjának megtekintése" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5266 msgid "Toggle fullscreen view" msgstr "Teljes képernyős nézet be- illetve kikapcsolása" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5269 msgid "Scroll _Left" msgstr "Görgetés _balra" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5270 msgid "Scroll to the left" msgstr "Görgetés balra" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5272 msgid "Scroll _Down" msgstr "Görgetés l_e" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5273 msgid "Scroll down" msgstr "Görgetés le" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Up" msgstr "Görgetés _fel" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5276 msgid "Scroll up" msgstr "Görgetés fel" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Right" msgstr "Görgetés j_obbra" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5279 msgid "Scroll to the right" msgstr "Görgetés jobbra" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5282 msgid "_Go" msgstr "_Ugrás" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5285 msgid "Go back to the previous page" msgstr "Ugrás az előző oldalra" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5288 msgid "Go forward to the next page" msgstr "Ugrás a következő oldalra" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5292 msgid "Go to the previous sub-page" msgstr "Ugrás az előző aloldalra" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5296 msgid "Go to the next sub-page" msgstr "Ugrás a következő aloldalra" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5299 msgid "Go to your homepage" msgstr "Ugrás a kezdőlapra" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5301 msgid "Empty Trash" msgstr "Kuka ürítése" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5302 msgid "Delete the contents of the trash" msgstr "A Kuka tartalmának törlése" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5304 msgid "Undo _Close Tab" msgstr "Lapbezárás _visszavonása" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5305 msgid "Open the last closed tab" msgstr "Az utoljára bezárt lap megnyitása" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:5311 msgid "Add a new _folder" msgstr "Új mappa _hozzáadása" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5312 msgid "Add a new bookmark folder" msgstr "Új könyvjelzőmappa hozzáadása" -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5317 msgid "_Export bookmarks" msgstr "Könyvjelzők e_xportálása" -#: ../midori/midori-browser.c:5648 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Keresőszolgáltatások kezelése" -#: ../midori/midori-browser.c:5649 +#: ../midori/midori-browser.c:5321 msgid "Add, edit and remove search engines..." msgstr "Keresőszolgáltatások hozzáadása, szerkesztése és eltávolítása…" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5324 msgid "_Clear Private Data" msgstr "_Privát adatok törlése" -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:5325 msgid "Clear private data..." msgstr "Privát adatok törlése…" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "_Oldal vizsgálata" -#: ../midori/midori-browser.c:5658 +#: ../midori/midori-browser.c:5330 msgid "Inspect page details and access developer tools..." msgstr "Oldal részleteinek vizsgálata és fejlesztői eszközök elérése…" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "_Előző lap" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5336 msgid "Switch to the previous tab" msgstr "Váltás az előző lapra" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "_Következő lap" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5339 msgid "Switch to the next tab" msgstr "Váltás a következő lapra" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5341 msgid "Focus _Current Tab" msgstr "_Aktuális lap előtérbe" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5342 msgid "Focus the current tab" msgstr "Aktuális lap előtérbe hozása" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5344 msgid "Open last _session" msgstr "_Utolsó munkamenet megnyitása" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5345 msgid "Open the tabs saved in the last session" msgstr "Az utolsó munkamenetben mentett lapok megnyitása" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5347 msgid "_Help" msgstr "_Súgó" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5349 msgid "_Contents" msgstr "_Tartalom" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5350 msgid "Show the documentation" msgstr "A dokumentáció megjelenítése" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5352 msgid "_Frequent Questions" msgstr "_Gyakori kérdések" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5353 msgid "Show the Frequently Asked Questions" msgstr "A gyakran ismételt kérdések megjelenítése" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5355 msgid "_Report a Bug" msgstr "_Hiba jelentése" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5356 msgid "Open Midori's bug tracker" msgstr "A Midori hibakövetőjének megnyitása" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5359 msgid "Show information about the program" msgstr "Információk megjelenítése a programról" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5367 msgid "_Menubar" msgstr "_Menüsáv" -#: ../midori/midori-browser.c:5696 +#: ../midori/midori-browser.c:5368 msgid "Show menubar" msgstr "A menüsáv megjelenítése" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5371 msgid "_Navigationbar" msgstr "_Navigációs sáv" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5372 msgid "Show navigationbar" msgstr "A navigációs sáv megjelenítése" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5375 msgid "Side_panel" msgstr "_Oldalsáv" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5376 msgid "Show sidepanel" msgstr "Az oldalsáv megjelenítése" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5379 msgid "_Bookmarkbar" msgstr "_Könyvjelzősáv" -#: ../midori/midori-browser.c:5708 +#: ../midori/midori-browser.c:5380 msgid "Show bookmarkbar" msgstr "A könyvjelzősáv megjelenítése" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5383 msgid "_Transferbar" msgstr "Át_vitelsáv" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5384 msgid "Show transferbar" msgstr "Az átvitelsáv megjelenítése" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5387 msgid "_Statusbar" msgstr "Á_llapotsor" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5388 msgid "Show statusbar" msgstr "Az állapotsor megjelenítése" -#: ../midori/midori-browser.c:5724 +#: ../midori/midori-browser.c:5396 msgid "_Automatic" msgstr "_Automatikus" -#: ../midori/midori-browser.c:5727 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kínai (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5731 +#: ../midori/midori-browser.c:5403 msgid "Japanese (SHIFT__JIS)" msgstr "Japán (SHIFT__JIS)" -#: ../midori/midori-browser.c:5734 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreai (EUC-KR)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Orosz (KOI8-R)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Nyugati (ISO-8859-1)" -#: ../midori/midori-browser.c:6289 +#: ../midori/midori-browser.c:5949 msgid "_Separator" msgstr "_Elválasztó" -#: ../midori/midori-browser.c:6296 +#: ../midori/midori-browser.c:5956 msgid "_Location..." msgstr "He_ly…" -#: ../midori/midori-browser.c:6298 +#: ../midori/midori-browser.c:5958 msgid "Open a particular location" msgstr "Adott hely megnyitása" -#: ../midori/midori-browser.c:6322 +#: ../midori/midori-browser.c:5982 msgid "_Web Search..." msgstr "_Webkeresés…" -#: ../midori/midori-browser.c:6324 +#: ../midori/midori-browser.c:5984 msgid "Run a web search" msgstr "Webkeresés futtatása " -#: ../midori/midori-browser.c:6345 +#: ../midori/midori-browser.c:6005 msgid "Reopen a previously closed tab or window" msgstr "Korábban bezárt lap vagy ablak ismételt megnyitása" -#: ../midori/midori-browser.c:6360 +#: ../midori/midori-browser.c:6020 msgid "_Recently visited pages" msgstr "_Nemrég látogatott oldalak" -#: ../midori/midori-browser.c:6362 +#: ../midori/midori-browser.c:6022 msgid "Reopen pages that you visited earlier" msgstr "Korábban meglátogatott oldalak ismételt megnyitása" -#: ../midori/midori-browser.c:6377 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Könyvjelzők" -#: ../midori/midori-browser.c:6379 +#: ../midori/midori-browser.c:6039 msgid "Show the saved bookmarks" msgstr "A mentett könyvjelzők megjelenítése" -#: ../midori/midori-browser.c:6394 +#: ../midori/midori-browser.c:6054 msgid "_Tools" msgstr "_Eszközök" -#: ../midori/midori-browser.c:6407 +#: ../midori/midori-browser.c:6067 msgid "_Window" msgstr "_Ablak" -#: ../midori/midori-browser.c:6409 +#: ../midori/midori-browser.c:6069 msgid "Show a list of all open tabs" msgstr "Az összes megnyitott lap listájának megjelenítése" -#: ../midori/midori-browser.c:6423 +#: ../midori/midori-browser.c:6083 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6425 +#: ../midori/midori-browser.c:6085 msgid "Menu" msgstr "Menü" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6632 -msgid "_Inline Find:" -msgstr "Beágyazott _keresés:" - -#: ../midori/midori-browser.c:6663 -msgid "Previous" -msgstr "Előző" - -#: ../midori/midori-browser.c:6668 -msgid "Next" -msgstr "Tovább" - -#: ../midori/midori-browser.c:6673 -msgid "Match Case" -msgstr "Kis- és nagybetű" - -#: ../midori/midori-browser.c:6682 -msgid "Highlight Matches" -msgstr "Találatok kiemelése" - -#: ../midori/midori-browser.c:6694 -msgid "Close Findbar" -msgstr "Keresősáv bezárása" - -#: ../midori/midori-browser.c:6740 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Minden mező törlése" - -#: ../midori/midori-browser.c:7096 +#: ../midori/midori-browser.c:6670 #, c-format msgid "Unexpected setting '%s'" msgstr "Váratlan beállítás: „%s”" @@ -1102,7 +1031,7 @@ msgstr "Panel bezárása" msgid "Align sidepanel to the left" msgstr "Az oldalsáv balra igazítása" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Vezérlők elrejtése" @@ -1692,13 +1621,8 @@ msgid "Preferred languages" msgstr "Előnyben részesített nyelvek" #: ../midori/midori-websettings.c:1125 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Többnyelvű weboldalak megjelenítésekor előnyben részesített nyelvek vesszővel " -"elválasztott listája. Például: " -"„hu”, „hu,en” vagy „en-us;q=1.0, fr-fr;q=0.667”" +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Többnyelvű weboldalak megjelenítésekor előnyben részesített nyelvek vesszővel elválasztott listája. Például: „hu”, „hu,en” vagy „en-us;q=1.0, fr-fr;q=0.667”" #: ../midori/midori-websettings.c:1140 msgid "Clear private data" @@ -1712,8 +1636,8 @@ msgstr "A törlésre kiválasztott privát adatok" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4567 +#: ../midori/midori-view.c:4571 #, c-format msgid "Error - %s" msgstr "Hiba - %s" @@ -1733,216 +1657,216 @@ msgstr "Próbálja újra" msgid "Not found - %s" msgstr "Nem található - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 #, c-format msgid "Send a message to %s" msgstr "Üzenet küldése a következőnek: %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 msgid "Inspect _Element" msgstr "Elem _vizsgálata" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 msgid "Open Link in New _Tab" msgstr "Hivatkozás megnyitása új _lapon" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2203 msgid "Open Link in _Foreground Tab" msgstr "Hi_vatkozás megnyitása az előtérben lévő lapon" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2204 msgid "Open Link in _Background Tab" msgstr "_Hivatkozás megnyitása a háttérben lévő lapon" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 msgid "Open Link in New _Window" msgstr "Hivatkozás megnyitása új _ablakban" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2210 msgid "Open Link as Web A_pplication" msgstr "Hivatkozás megnyitása _webes alkalmazásként" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2213 msgid "Copy Link de_stination" msgstr "Hivatkozás _címének másolása" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 msgid "_Save Link destination" msgstr "Hivatkozás címének me_ntése" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 msgid "_Download Link destination" msgstr "Hivatkozás címének l_etöltése" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 +#: ../midori/midori-view.c:2293 msgid "Download with Download _Manager" msgstr "_Letöltés a letöltéskezelővel" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2230 msgid "Open _Image in New Tab" msgstr "Ké_p megnyitása új lapon" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2233 msgid "Copy Image _Address" msgstr "Kép _címének másolása" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2236 msgid "Save I_mage" msgstr "Kép me_ntése" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2237 msgid "Download I_mage" msgstr "_Kép letöltése" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2244 msgid "Copy Video _Address" msgstr "Videó _címének másolása" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Save _Video" msgstr "Videó me_ntése" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Download _Video" msgstr "_Videó letöltése" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2310 msgid "Search _with" msgstr "_Keresés ezzel" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 msgid "_Search the Web" msgstr "Keresés a _weben" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2373 msgid "Open Address in New _Tab" msgstr "Cím meg_nyitása új lapon" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2674 msgid "Open or download file" msgstr "Fájl megnyitása vagy letöltése" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2693 #, c-format msgid "File Type: '%s'" msgstr "Fájltípus: „%s”" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2696 #, c-format msgid "File Type: %s ('%s')" msgstr "Fájltípus: %s („%s”)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2700 #, c-format msgid "Open %s" msgstr "%s megnyitása" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3244 #, c-format msgid "Inspect page - %s" msgstr "Oldal vizsgálata - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3526 msgid "Speed dial" msgstr "Gyorstárcsázó" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3527 msgid "Click to add a shortcut" msgstr "Kattintson gyorsindító hozzáadásához" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3528 msgid "Enter shortcut address" msgstr "Adja meg a gyorsindító címét" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3529 msgid "Enter shortcut title" msgstr "Adja meg a gyorsindító címét" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3530 msgid "Are you sure you want to delete this shortcut?" msgstr "Biztosan törölni akarja ezt a gyorsindítót?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3531 msgid "Set number of columns and rows" msgstr "Oszlopok és sorok számának beállítása" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3532 msgid "Enter number of columns and rows:" msgstr "Adja meg az oszlopok és sorok számát:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3533 msgid "Invalid input for the size of the speed dial" msgstr "A gyorstárcsázó megadott mérete érvénytelen" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3534 msgid "Thumb size:" msgstr "Bélyegkép mérete:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3535 msgid "Small" msgstr "Kicsi" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3536 msgid "Medium" msgstr "Közepes" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3537 msgid "Big" msgstr "Nagy" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3563 #, c-format msgid "Document cannot be displayed" msgstr "A dokumentum nem jeleníthető meg" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3586 #, c-format msgid "No documentation installed" msgstr "Nincs telepítve dokumentáció" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3707 msgid "Page loading delayed" msgstr "Oldalbetöltés késleltetve" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3708 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "A betöltés késleltetve egy nemrégi összeomlás vagy az indítási beállítások miatt." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3709 msgid "Load Page" msgstr "Oldal betöltése" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3853 msgid "Blank page" msgstr "Üres oldal" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4107 msgid "_Duplicate Tab" msgstr "_Lap kettőzése" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4112 msgid "_Restore Tab" msgstr "Lap _visszaállítása" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4112 msgid "_Minimize Tab" msgstr "Lap _minimalizálása" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4118 msgid "Close ot_her Tabs" msgstr "_Többi lap bezárása" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4804 msgid "Print background images" msgstr "Háttérképek nyomtatása" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4805 msgid "Whether background images should be printed" msgstr "A háttérképeket ki kell-e nyomtatni" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Szolgáltatások" @@ -2043,12 +1967,8 @@ msgstr "Helyesírási szótárak:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"A helyesírás-ellenőrzéshez használandó nyelvek vesszővel elválasztott listája, " -"például: „hu_HU,en_US”" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "A helyesírás-ellenőrzéshez használandó nyelvek vesszővel elválasztott listája, például: „hu_HU,en_US”" #. Page "Interface" #: ../midori/midori-preferences.c:435 @@ -2166,23 +2086,83 @@ msgstr "_Netscape bővítmények" msgid "New _Folder" msgstr "Új _mappa" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "Beágyazott _keresés:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Előző" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Tovább" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Kis- és nagybetű" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Találatok kiemelése" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Keresősáv bezárása" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "A(z) „%s” fájl letöltve." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Átvitel kész" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Minden mező törlése" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Néhány fájl letöltése folyamatban" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Kilépés a Midoriból" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Az átvitel meg fog szakadni, ha kilép a Midoriból." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Könyvjelzők" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "A könyvjelzőelem hozzáadása meghiúsult: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "A kijelölt könyvjelző szerkesztése" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "A kijelölt könyvjelző törlése" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Új mappa hozzáadása" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Elválasztó" @@ -2320,12 +2300,8 @@ msgstr "Reklámszűrők beállítása" #: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához adáshoz " -"nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Írja be az előre beállított szűrőlista címét a szövegmezőben, és a listához adáshoz nyomja meg a „Hozzáadás” gombot. További listákat itt találhat: %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2404,12 +2380,8 @@ msgid "Delete All" msgstr "Összes törlése" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Minden megjelenített süti törlése. Ha be van állítva szűrő, akkor csak " -"az annak megfelelő sütiket törli." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Minden megjelenített süti törlése. Ha be van állítva szűrő, akkor csak az annak megfelelő sütiket törli." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2482,9 +2454,7 @@ msgid "_Collapse All" msgstr "Összes össze_csukása" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Adjon meg egy szűrő karakterláncot a név vagy tartomány mező szűréséhez" #: ../extensions/cookie-manager/main.c:40 @@ -2495,6 +2465,18 @@ msgstr "_Sütikezelő" msgid "List, view and delete cookies" msgstr "Sütik felsorolása, megjelenítése és törlése" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Lap_címek másolása" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Lapok címeinek másolása" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Az összes lap címeinek vágólapra másolása" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Nem találhatók a szükséges Atom „entry” bejegyzések az XML adatokban." @@ -2678,17 +2660,21 @@ msgstr "Lapelőzmények listája" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Lehetővé teszi a lapok közti váltást az utolsó használat alapján rendezett listából" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Új lapok minimalizálása" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Az új lapok minimalizálva nyílnak meg" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Eszköztár testreszabása" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Válassza ki az eszköztáron megjelenítendő elemeket. Az elemek fogd és vidd " -"módszerrel átrendezhetők." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Válassza ki az eszköztáron megjelenítendő elemeket. Az elemek fogd és vidd módszerrel átrendezhetők." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2713,4 +2699,3 @@ msgstr "Az eszköztár elrendezésének egyszerű szerkesztése" #: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "HTTP kommunikáció gyorsítótárazása a lemezen" - From bcb867042c0b79abab9ae86f28f4048e1386fef8 Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Tue, 22 Jun 2010 16:02:05 +0200 Subject: [PATCH 2727/2970] l10n: Updated Galician (gl) translation to 99% New status: 629 messages complete with 1 fuzzy and 5 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 1168 +++++++++++++++++++++++++++++------------------------- 1 file changed, 635 insertions(+), 533 deletions(-) diff --git a/po/gl.po b/po/gl.po index 0fb7cb62..385673a6 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: midori-0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-04 10:07+0000\n" +"POT-Creation-Date: 2010-06-22 10:08+0000\n" "PO-Revision-Date: 2010-02-08 21:51+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -26,9 +26,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lixeiro" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -51,7 +51,7 @@ msgstr "O valor «%s» non é válido para %s" msgid "Invalid configuration value '%s'" msgstr "O valor de configuración «%s» non é válido" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Fallou ao abrir a base de datos: %s\n" @@ -62,172 +62,172 @@ msgstr "Fallou ao abrir a base de datos: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Fallou ao eliminar elementos antigos do historial: %s\n" -#: ../midori/main.c:445 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Non se puido gardar a configuración. %s" - -#: ../midori/main.c:483 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Non se puideron gardar os motores de busca. %s" - -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Non se puideron gardar os marcadores. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Non se puido gardar a configuración. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Non se puideron gardar os motores de busca. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Non se puido gardar o lixo. %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Non se puido gardar a sesión. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Non hai ningún ficheiro de certificado raíz dispoñible. Non se pode verificar os certificados SSL." -#: ../midori/main.c:958 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Parece que Midori pechou inesperadamente a última vez. Se isto xa ocorreu varias veces, probe unha das seguintes opcións para resolver o problema." -#: ../midori/main.c:973 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Modificar as _preferencias" -#: ../midori/main.c:977 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Restablecer a última _sesión" -#: ../midori/main.c:982 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Desactivar tódalas _extensións" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Non se puido cargar a sesión: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Nome de ficheiro sen especificar" -#: ../midori/main.c:1355 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Produciuse un erro descoñecido:" -#: ../midori/main.c:1386 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura gardada en: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREZO como un aplicativo web" -#: ../midori/main.c:1557 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ENDEREZO" -#: ../midori/main.c:1560 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Usar CARTAFOL como cartafol de configuración" -#: ../midori/main.c:1560 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "CARTAFOL" -#: ../midori/main.c:1563 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Mostrar un diálogo de diagnóstico" -#: ../midori/main.c:1565 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Execute o nome de ficheiro especificado como JavaScript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Facer unha captura do URI específicado" -#: ../midori/main.c:1571 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1573 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Mostrar a versión do programa" -#: ../midori/main.c:1575 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Enderezos" -#: ../midori/main.c:1577 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear os URIs de acordo ca expresión regular PATRÓN" -#: ../midori/main.c:1577 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATRÓN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1581 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1661 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Enderezos]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envíe comentarios, suxestións e erros a:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Comprobar se existen novas versións en:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "O cartafol de configuración especificado non é correcto." -#: ../midori/main.c:1836 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Xa se está a executar outra instancia de Midori pero non responde.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Non se puideron cargar os motores de busca. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Non se puideron cargar os marcadores: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "Non foi posible cargar os marcadores: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Non se puido cargar o lixo: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Non se puido cargar o historial: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Producíronse os seguintes erros:" -#: ../midori/main.c:1996 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignorar" @@ -244,266 +244,264 @@ msgstr "Documento malformado." msgid "Unrecognized bookmark format." msgstr "Formato de marcador non recoñecido." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Fallou a escritura." -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5250 msgid "Reload the current page" msgstr "Recargar a páxina actual" -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:457 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:495 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Produciuse un erro ao actualizar o título: %s\n" -#: ../midori/midori-browser.c:509 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Cartafol novo" -#: ../midori/midori-browser.c:716 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Editar cartafol" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:718 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Editar o marcador" -#: ../midori/midori-browser.c:749 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrición" -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Enderezo:" -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 msgid "_Folder:" msgstr "_Cartafol:" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 msgid "Toplevel folder" msgstr "Cartafol principal" -#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:874 +#, fuzzy +msgid "Add to _Speed Dial" +msgstr "Enga_dir a marcación rápida" + +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:865 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Executar como aplicativo _web" -#: ../midori/midori-browser.c:959 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Non hai espazo libre dabondo para descargar \"%s\"." -#: ../midori/midori-browser.c:963 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa %s pero só quedan %s." -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4487 msgid "Save file as" msgstr "Gardar o ficheiro como" -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-browser.c:1429 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Descargouse o ficheiro '%s'." - -#: ../midori/midori-browser.c:1433 -msgid "Transfer completed" -msgstr "Transferencia completada" - -#: ../midori/midori-browser.c:1573 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Gardar ficheiro" -#: ../midori/midori-browser.c:2297 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2230 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Engadir novo marcador" -#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Fallou ao executar a declaración na base de datos: %s\n" -#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Baleiro" -#: ../midori/midori-browser.c:3690 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Non se puido executar o programa externo." -#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948 +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Produciuse un erro ao inserir un novo elemento no historial: %s\n" -#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Abrir todo en _lapelas" -#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir nunha nova _lapela" -#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4103 ../midori/midori-view.c:2424 +#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir nunha nova _fiestra" -#: ../midori/midori-browser.c:4570 +#: ../midori/midori-browser.c:4326 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4571 +#: ../midori/midori-browser.c:4327 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4572 +#: ../midori/midori-browser.c:4328 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4573 +#: ../midori/midori-browser.c:4329 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4574 +#: ../midori/midori-browser.c:4330 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4351 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4365 msgid "_Application:" msgstr "_Aplicativo:" -#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 +#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4710 +#: ../midori/midori-browser.c:4466 msgid "Failed to import bookmarks" msgstr "Produciuse un erro ao importar os marcadores" -#: ../midori/midori-browser.c:4746 +#: ../midori/midori-browser.c:4502 msgid "Failed to export bookmarks" msgstr "Produciuse un erro ao exportar os marcadores" -#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Fallou ao eliminar o elemento do historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4663 msgid "Clear Private Data" msgstr "Limpar os datos privados" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4667 msgid "_Clear private data" msgstr "_Limpar os datos privados" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4681 msgid "Clear the following data:" msgstr "Limpar os seguintes datos:" -#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4698 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4703 msgid "'Flash' Cookies" msgstr "Cookies de «Flash»" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4708 msgid "Website icons" msgstr "Iconas de sitios web" -#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Lapelas pechadas" -#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Caché web" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4726 msgid "Clear private data when _quitting Midori" msgstr "_Limpar os datos privados ao saír de Midori" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:4827 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:4829 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:4848 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada, 2008, 2009\n" @@ -511,519 +509,490 @@ msgstr "" "\n" "Proxecto Trasno http://trasno.net" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5157 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _fiestra" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5160 msgid "Open a new window" msgstr "Abrir unha nova fiestra" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5163 msgid "Open a new tab" msgstr "Abrir unha nova lapela" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5165 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5166 msgid "Don't save any private data while browsing" msgstr "Non gardar datos privados durante a navegación" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5170 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5173 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5175 msgid "Add to Speed _dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5176 msgid "Add shortcut to speed dial" msgstr "Engadir atallo á marcación rápida" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5178 msgid "Add Shortcut to the _desktop" msgstr "Engadir atallo no _escritorio" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5179 msgid "Add shortcut to the desktop" msgstr "Engadir un atallo no escritorio" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5181 msgid "Subscribe to News _feed" msgstr "Subscribirse á _fonte de novas" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to this news feed" msgstr "Subscribirse a esta fonte de novas" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5187 msgid "_Close Tab" msgstr "Pechar _lapela" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5188 msgid "Close the current tab" msgstr "Pechar a lapela actual" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5190 msgid "C_lose Window" msgstr "_Pechar a fiestra" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5191 msgid "Close this window" msgstr "Pechar esta fiestra" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5194 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5197 msgid "Quit the application" msgstr "Saír do aplicativo" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5199 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5203 msgid "Undo the last modification" msgstr "Desfacer a última modificación" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5206 msgid "Redo the last modification" msgstr "Refacer a última modificación" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5210 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5219 msgid "Paste text from the clipboard" msgstr "Pegar o texto seleccionado no portarretallos" -#: ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:5222 msgid "Delete the selected text" msgstr "Borrar o texto seleccionado" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5225 msgid "Select all text" msgstr "Seleccionar todo o texto" -#: ../midori/midori-browser.c:5473 +#: ../midori/midori-browser.c:5228 msgid "Find a word or phrase in the page" msgstr "Buscar unha palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5230 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5231 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar a seguinte coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:5478 +#: ../midori/midori-browser.c:5233 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5234 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar a anterior coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5238 msgid "Configure the application preferences" msgstr "Configurar as preferencias do aplicativo" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5240 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5241 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5253 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5256 msgid "Decrease the zoom level" msgstr "Diminuír o nivel de zoom" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5259 msgid "Reset the zoom level" msgstr "Restablecer o nivel de zoom" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5260 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5262 msgid "View So_urce" msgstr "Ver o códi_go da páxina" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5263 msgid "View the source code of the page" msgstr "Ver o código fonte da páxina" -#: ../midori/midori-browser.c:5511 +#: ../midori/midori-browser.c:5266 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5269 msgid "Scroll _Left" msgstr "Desprazar cara á _esquerda" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5270 msgid "Scroll to the left" msgstr "Desprazar cara á esquerda" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5272 msgid "Scroll _Down" msgstr "Desprazar cara a_baixo" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5273 msgid "Scroll down" msgstr "Desprazar cara abaixo" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5275 msgid "Scroll _Up" msgstr "Desprazar cara _arriba" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5276 msgid "Scroll up" msgstr "Desprazar cara arriba" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5278 msgid "Scroll _Right" msgstr "Desprazar cara á _dereita" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5279 msgid "Scroll to the right" msgstr "Desprazar cara á dereita" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5282 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5285 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5288 msgid "Go forward to the next page" msgstr "Ir á seguinte páxina" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5292 msgid "Go to the previous sub-page" msgstr "Ir á anterior subpáxina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5296 msgid "Go to the next sub-page" msgstr "Ir á seguinte subpáxina" -#: ../midori/midori-browser.c:5544 +#: ../midori/midori-browser.c:5299 msgid "Go to your homepage" msgstr "Ir á súa páxina de inicio" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:5301 msgid "Empty Trash" msgstr "Baleirar o lixo" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5302 msgid "Delete the contents of the trash" msgstr "Borrar o contido do lixo" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5304 msgid "Undo _Close Tab" msgstr "Desfa_cer pechar lapela" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5305 msgid "Open the last closed tab" msgstr "Abrir a última lapela pechada" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5311 msgid "Add a new _folder" msgstr "Engadir un carta_fol novo" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:5312 msgid "Add a new bookmark folder" msgstr "Engadir un novo cartafol de marcadores" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5317 msgid "_Export bookmarks" msgstr "_Exportar os marcadores" -#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5321 msgid "Add, edit and remove search engines..." msgstr "Engadir, editar ou eliminar motores de busca..." -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5324 msgid "_Clear Private Data" msgstr "_Limpar datos privados" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5325 msgid "Clear private data..." msgstr "Limpar os datos privados..." -#: ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:5329 msgid "_Inspect Page" msgstr "_Inspeccionar a páxina" -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5330 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar os detalles de páxina e acceder ás ferramentas de desenvolvemento..." -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5335 msgid "_Previous Tab" msgstr "Lapela _anterior" -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:5336 msgid "Switch to the previous tab" msgstr "Cambiar á lapela anterior" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:5338 msgid "_Next Tab" msgstr "Lapela _seguinte" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5339 msgid "Switch to the next tab" msgstr "Cambiar á lapela seguinte" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5341 msgid "Focus _Current Tab" msgstr "Enfocar a lapela a_ctual" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5342 msgid "Focus the current tab" msgstr "Enfocar a lapela actual" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:5344 msgid "Open last _session" msgstr "Abrir a última _sesión" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5345 msgid "Open the tabs saved in the last session" msgstr "Abre as lapelas gardadas na última sesión" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5347 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5349 msgid "_Contents" msgstr "_Contido" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5350 msgid "Show the documentation" msgstr "Mostrar a documentación" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5352 msgid "_Frequent Questions" msgstr "Preguntas _frecuentes" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5353 msgid "Show the Frequently Asked Questions" msgstr "Mostrar as preguntas frecuentes" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5355 msgid "_Report a Bug" msgstr "_Comunicar un erro" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5356 msgid "Open Midori's bug tracker" msgstr "Abrir o xestor de reporte de fallos de Midori" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5359 msgid "Show information about the program" msgstr "Mostrar información sobre o programa" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5367 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5368 msgid "Show menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5371 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5372 msgid "Show navigationbar" msgstr "Mostrar a barra de navegación" -#: ../midori/midori-browser.c:5620 +#: ../midori/midori-browser.c:5375 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5376 msgid "Show sidepanel" msgstr "Mostrar panel lateral" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5379 msgid "_Bookmarkbar" msgstr "Barra de marcadores" -#: ../midori/midori-browser.c:5625 +#: ../midori/midori-browser.c:5380 msgid "Show bookmarkbar" msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:5383 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:5384 msgid "Show transferbar" msgstr "Mostrar a barra de transferencias" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5387 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5388 msgid "Show statusbar" msgstr "Mostrar a barra de estado" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5396 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinés (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5403 msgid "Japanese (SHIFT__JIS)" msgstr "Xaponés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6208 +#: ../midori/midori-browser.c:5949 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6215 +#: ../midori/midori-browser.c:5956 msgid "_Location..." msgstr "Localización..." -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:5958 msgid "Open a particular location" msgstr "Abrir un enderezo determinado" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:5982 msgid "_Web Search..." msgstr "Buscar na _web..." -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:5984 msgid "Run a web search" msgstr "Executar unha busca na web" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:6005 msgid "Reopen a previously closed tab or window" msgstr "Volver abrir fiestras ou lapelas pechadas" -#: ../midori/midori-browser.c:6279 +#: ../midori/midori-browser.c:6020 msgid "_Recently visited pages" msgstr "Páxinas visitadas _recentemente" -#: ../midori/midori-browser.c:6281 +#: ../midori/midori-browser.c:6022 msgid "Reopen pages that you visited earlier" msgstr "Volver abrir as páxinas que visitou antes" -#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6298 +#: ../midori/midori-browser.c:6039 msgid "Show the saved bookmarks" msgstr "Mostrar os marcadores gardados" -#: ../midori/midori-browser.c:6313 +#: ../midori/midori-browser.c:6054 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:6326 +#: ../midori/midori-browser.c:6067 msgid "_Window" msgstr "_Fiestra" -#: ../midori/midori-browser.c:6328 +#: ../midori/midori-browser.c:6069 msgid "Show a list of all open tabs" msgstr "Mostrar unha lista de tódalas lapelas abertas" -#: ../midori/midori-browser.c:6342 +#: ../midori/midori-browser.c:6083 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6344 +#: ../midori/midori-browser.c:6085 msgid "Menu" msgstr "Menú" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6548 -msgid "_Inline Find:" -msgstr "_Busca en liña:" - -#: ../midori/midori-browser.c:6579 -msgid "Previous" -msgstr "Anterior" - -#: ../midori/midori-browser.c:6584 -msgid "Next" -msgstr "Seguinte" - -#: ../midori/midori-browser.c:6589 -msgid "Match Case" -msgstr "Diferenciar maiúsculas de minúsculas" - -#: ../midori/midori-browser.c:6598 -msgid "Highlight Matches" -msgstr "Resaltar coincidencias" - -#: ../midori/midori-browser.c:6610 -msgid "Close Findbar" -msgstr "Pechar a barra de buscas" - -#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "Limpar todo" - -#: ../midori/midori-browser.c:7014 +#: ../midori/midori-browser.c:6670 #, c-format msgid "Unexpected setting '%s'" msgstr "Opción inesperada «%s»" @@ -1053,615 +1022,619 @@ msgstr "Produciuse un erro ao executar a instrución de base de datos\n" msgid "Paste and p_roceed" msgstr "Pegar e _continuar" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Separar o panel seleccionado da fiestra " -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Aliñar o panel lateral á dereita" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Pechar o panel" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Aliñar o panel lateral á esquerda" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Ocultar os controis de operación" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Mostrar unha páxina en branco" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Mostrar a páxina inicial" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Mostrar as últimas lapelas abertas" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Mostrar as últimas lapelas sen cargalas" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Xaponés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Nova lapela" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Nova fiestra" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Lapela actual" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Iconas pequenas" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Iconas e texto" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Texto a carón das iconas" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou contorno)" -#: ../midori/midori-websettings.c:285 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:286 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Sen servidor proxy" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Todas as cookies" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "As cookies desta sesión" -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Ningunha" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Lembrar o último tamaño de fiestra" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Gardar (ou non) o último tamaño de fiestra" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Última largura da fiestra" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Última largura da fiestra gardada" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Última altura da fiestra" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Última altura da fiestra gardada" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Última posición do panel" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Última posición gardada do panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Última páxina do panel" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Última páxina gardada do panel" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Última busca na web" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Última busca na web gardada" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Mostrar a barra de menú" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Mostrar (ou non) a barra de menú" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Mostrar a barra de navegación" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Mostrar (ou non) a barra de navegación" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (ou non) a barra de marcadores" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Mostrar o panel" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Mostrar (ou non) o panel" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Mostrar a barra de transferencias" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Mostrar (ou non) a barra de transferencias" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Mostrar a barra de estado" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Mostrar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Mostrar o progreso da carga na barra de navegación" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Mostrar o progreso da carga (ou non) na barra de navegación" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Motor de busca na barra de navegación" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Mostrar (ou non) o motor de busca na barra de navegación" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Elementos da barra de ferramentas" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Elementos que se van mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Facer (ou non) o panel lateral compacto" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Mostrar os controis de operación do panel" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Mostrar (ou non) os controis de operación do panel" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Aliñar á dereita o panel lateral" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Aliñar (ou non) á dereita o panel lateral" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Abrir os paneis en fiestras separadas" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Indica se os paneis se abren sempre en fiestras separadas" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Cando se inicia Midori:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Que facer ao iniciar Midori" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Páxina de inicio:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "A páxina de inicio" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Mostrar o diálogo de fallo" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un cadro de dialogo despois de que Midori falle" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Mostrar a marcación rápida nas novas lapelas" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar a marcación rápida nas novas lapelas que se abran" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Gardar os ficheiros descargados en:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Preguntar polo cartafol de destino" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Notificar cando se complete unha transferencia" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Xestor de descargas" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Xestor de descargas externo" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Un editor de texto externo" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Agregador de novas" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Un agregador de novas externo" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Facer unha busca a partir do contido da barra de enderezos" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Codificación de carácteres preferida" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lapelas" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Cada unha das lapelas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Abrir as páxinas novas en:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Onde se van abrir as páxinas novas" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Abrir as páxinas externas en:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Onde se van abrir as páxinas abertas dende o exterior" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Prema no botón central para abrir a selección" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Cargue un enderezo da selección premendo no botón central do rato" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Abrir as lapelas en segundo plano" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lapelas en segundo plano" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Abrir lapelas xunto á actual" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abrir as novas lapelas xunto á lapela actual ou despois da última" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Abrir «emerxentes» en lapelas" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Abrir (ou non) as fiestras emerxentes en lapelas" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Cargar as imaxes automaticamente" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Cargar e mostrar as imaxes automaticamente" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activar scripts" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Activar linguaxes de script incrustadas" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activar os engadidos de Netscape" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Activar o engadido de obxectos incrustados de Netscape" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Activar o soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Activar ou desactivar o soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Activar o soporte de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Activar ou desactivar o soporte de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Activar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Activar ou desactivar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Zoom sobre o texto e imaxes" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Aplicar zoom (ou non) ao texto e ás imaxes" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Buscar en liña ao escribir" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Buscar en liña automaticamente (ou non) mentres se escribe" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Desprazamento cinético" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "O desprazamento móvese de acordo ca velocidade" -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Aceptar as «cookies»" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Que tipos de «cookies» se van aceptar" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Só as «cookies» do sitio orixinal" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Só se aceptan as «cookies» do sitio web orixe" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Persistencia máxima das «cookies»" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Tempo máximo, en días, durante os que se gardaran as «cookies»" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Lembrar as últimas páxinas visitadas" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Lembrar (ou non) as últimas páxinas que se visitaron" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Persistencia máxima do historial" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Tempo máximo, en días, durante os que se gardará un dato do historial" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Lembrar os últimos ficheiros descargados" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Lembrar (ou non) a lista de descargas realizadas ultimamente" -#: ../midori/midori-websettings.c:1052 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "O tipo de servidor proxy a usar" -#: ../midori/midori-websettings.c:1062 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy que se usa para as conexións HTTP" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Detectar o servidor proxy automaticamente" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Identificarse como" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Como se identifica nas páxinas web" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Cadea de identificación" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Cadea de identificación do aplicativo" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Un lista separada por comas de idiomas preferidos para mostrar páxinas web multiidioma, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Limpar a información persoal" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Os datos privados seleccionados para eliminar" @@ -1669,197 +1642,237 @@ msgstr "Os datos privados seleccionados para eliminar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482 -#: ../midori/midori-view.c:4486 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4567 +#: ../midori/midori-view.c:4571 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1183 +#: ../midori/midori-view.c:1262 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Non se puido cargar a páxina «%s»." -#: ../midori/midori-view.c:1188 +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Inténteo de novo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" msgstr "Non se atopou - %s" -#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 #, c-format msgid "Send a message to %s" msgstr "Enviarlle unha mensaxe a %s" -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465 +#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 msgid "Open Link in New _Tab" msgstr "Abrir a ligazón nunha nova _lapela" -#: ../midori/midori-view.c:2141 +#: ../midori/midori-view.c:2203 msgid "Open Link in _Foreground Tab" msgstr "Abrir a ligazón na lapela de _primeiro plano" -#: ../midori/midori-view.c:2142 +#: ../midori/midori-view.c:2204 msgid "Open Link in _Background Tab" msgstr "Abrir a ligazón na lapela de _fondo" -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214 +#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 msgid "Open Link in New _Window" msgstr "Abrir a ligazón nunha _fiestra nova" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:2210 msgid "Open Link as Web A_pplication" msgstr "Abrir a ligazón como a_plicativo web" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2213 msgid "Copy Link de_stination" msgstr "Copiar o de_stino da ligazón" -#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 msgid "_Save Link destination" msgstr "_Gardar ligazón de destino" -#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 msgid "_Download Link destination" msgstr "_Descargar ligazón de destino" -#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2231 +#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 +#: ../midori/midori-view.c:2293 msgid "Download with Download _Manager" msgstr "Descargar co _Xestor de descargas" -#: ../midori/midori-view.c:2168 +#: ../midori/midori-view.c:2230 msgid "Open _Image in New Tab" msgstr "Abrir a _imaxe nunha nova lapela" -#: ../midori/midori-view.c:2171 +#: ../midori/midori-view.c:2233 msgid "Copy Image _Address" msgstr "Copiar o _enderezo da imaxe" -#: ../midori/midori-view.c:2174 +#: ../midori/midori-view.c:2236 msgid "Save I_mage" msgstr "Gardar a _imaxe" -#: ../midori/midori-view.c:2175 +#: ../midori/midori-view.c:2237 msgid "Download I_mage" msgstr "Descargar a i_maxe" -#: ../midori/midori-view.c:2182 +#: ../midori/midori-view.c:2244 msgid "Copy Video _Address" msgstr "Copiar o _enderezo do vídeo" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2247 msgid "Save _Video" msgstr "Gardar o _vídeo" -#: ../midori/midori-view.c:2185 +#: ../midori/midori-view.c:2247 msgid "Download _Video" msgstr "Descargar o _vídeo" -#: ../midori/midori-view.c:2248 +#: ../midori/midori-view.c:2310 msgid "Search _with" msgstr "Buscar _con: " -#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 msgid "_Search the Web" msgstr "_Buscar na rede" -#: ../midori/midori-view.c:2311 +#: ../midori/midori-view.c:2373 msgid "Open Address in New _Tab" msgstr "Abrir o enderezo nunha nova _lapela" -#: ../midori/midori-view.c:2615 +#: ../midori/midori-view.c:2674 msgid "Open or download file" msgstr "Abrir ou descargar o ficheiro" -#: ../midori/midori-view.c:2638 +#: ../midori/midori-view.c:2693 #, c-format msgid "File Type: '%s'" msgstr "Tipo de ficheiro: «%s»" -#: ../midori/midori-view.c:2641 +#: ../midori/midori-view.c:2696 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de ficheiro: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2645 +#: ../midori/midori-view.c:2700 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3179 +#: ../midori/midori-view.c:3244 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar a páxina - %s" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3526 msgid "Speed dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3527 msgid "Click to add a shortcut" msgstr "Prema para engadir un atallo" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3528 msgid "Enter shortcut address" msgstr "Introduza o enderezo do atallo" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3529 msgid "Enter shortcut title" msgstr "Introduza o título do atallo" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3530 msgid "Are you sure you want to delete this shortcut?" msgstr "Está seguro de que desexa eliminar este atallo?" -#: ../midori/midori-view.c:3485 +#: ../midori/midori-view.c:3531 +msgid "Set number of columns and rows" +msgstr "Definir o número de columnas e filas" + +#: ../midori/midori-view.c:3532 +msgid "Enter number of columns and rows:" +msgstr "Introduza o número de columnas e filas:" + +#: ../midori/midori-view.c:3533 +msgid "Invalid input for the size of the speed dial" +msgstr "" + +#: ../midori/midori-view.c:3534 +msgid "Thumb size:" +msgstr "Tamaño da miniatura:" + +#: ../midori/midori-view.c:3535 +msgid "Small" +msgstr "Pequeno" + +#: ../midori/midori-view.c:3536 +msgid "Medium" +msgstr "Mediano" + +#: ../midori/midori-view.c:3537 +msgid "Big" +msgstr "Grande" + +#: ../midori/midori-view.c:3563 #, c-format msgid "Document cannot be displayed" msgstr "Non se pode mostrar o documento" -#: ../midori/midori-view.c:3508 +#: ../midori/midori-view.c:3586 #, c-format msgid "No documentation installed" msgstr "A documentación non está instalada" -#: ../midori/midori-view.c:3758 +#: ../midori/midori-view.c:3707 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:3708 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:3709 +msgid "Load Page" +msgstr "Cargar a páxina" + +#: ../midori/midori-view.c:3853 msgid "Blank page" msgstr "Páxina en branco" -#: ../midori/midori-view.c:4018 +#: ../midori/midori-view.c:4107 msgid "_Duplicate Tab" msgstr "_Duplicar a lapela" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4112 msgid "_Restore Tab" msgstr "_Restaurar a lapela" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4112 msgid "_Minimize Tab" msgstr "_Minimizar a lapela" -#: ../midori/midori-view.c:4029 +#: ../midori/midori-view.c:4118 msgid "Close ot_her Tabs" msgstr "Pechar ou_tras lapelas" -#: ../midori/midori-view.c:4654 +#: ../midori/midori-view.c:4804 msgid "Print background images" msgstr "Imprimir imaxes de fondo" -#: ../midori/midori-view.c:4655 +#: ../midori/midori-view.c:4805 msgid "Whether background images should be printed" msgstr "Se se imprimen (ou non) as imaxes de fondo" -#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2035,63 +2048,127 @@ msgstr "Xestionar os motores de busca" msgid "Use as _default" msgstr "Usar como pre_determinado" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Engadir mar_cador…" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Extensións" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "P_áxina de inicio" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Nova _lapela" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "En_gadidos de Netscape" -#: ../panels/midori-bookmarks.c:111 +#: ../midori/sokoke.c:1300 +msgid "New _Folder" +msgstr "Cartafol _novo" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Busca en liña:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Anterior" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Seguinte" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Diferenciar maiúsculas de minúsculas" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Resaltar coincidencias" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Pechar a barra de buscas" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Descargouse o ficheiro '%s'." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Transferencia completada" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Limpar todo" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Estanse a descargar algúns ficheiros" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "Saír de Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Se sae de Midori hanse cancelar as transferencias." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Produciuse un erro engadir o elemento ao marcadores: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Editar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Borrar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Engadir un cartafol novo" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Separador" @@ -2099,6 +2176,14 @@ msgstr "Separador" msgid "Console" msgstr "Consola" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copiar _todo" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copiar todo" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensións" @@ -2134,28 +2219,28 @@ msgstr "Onte" msgid "Are you sure you want to remove all history items?" msgstr "Esta seguro de que desexa eliminar tódolos elementos do historial?" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:437 msgid "Bookmark the selected history item" msgstr "Por en marcadores o elemento seleccionado no historial" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:446 msgid "Delete the selected history item" msgstr "Borrar o elemento seleccionado no historial" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:454 msgid "Clear the entire history" msgstr "Limpar completamente o historial" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:952 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr " Filtro:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Abrir o carta_fol de destino" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Copiar o enderezo da lig_azón" @@ -2215,40 +2300,40 @@ msgstr "Escoller un cartafol" msgid "Preferences for %s" msgstr "Preferencias de %s" -#: ../extensions/adblock.c:413 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configurar os filtros de publicidade" -#: ../extensions/adblock.c:445 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Introduza o enderezo dunha lista preconfigurada de filtros na entrada de texto e prema en \"Engadir\" para engadila á lista. Pode atopar máis listas en %s." -#: ../extensions/adblock.c:585 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Configurar os filtros de _publicidade..." -#: ../extensions/adblock.c:839 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Editar regra" -#: ../extensions/adblock.c:852 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Regra:" -#: ../extensions/adblock.c:906 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Bl_oquear a imaxe" -#: ../extensions/adblock.c:911 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Bl_oquear a ligazón" -#: ../extensions/adblock.c:1485 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Bloqueo de publicidade" -#: ../extensions/adblock.c:1486 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Bloquear a publicidade de acordo cunha lista de filtros" @@ -2386,6 +2471,18 @@ msgstr "Xestor de _cookies" msgid "List, view and delete cookies" msgstr "Listar, ver e borrar cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Copiar os _enderezos das lapelas" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Copiar os enderezos das lapelas" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copiar os enderezos de todas as lapelas ao portarretallos" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Non se puideron atopar os elementos necesarios Atom «entry» nos datos XML." @@ -2395,25 +2492,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Non se puideron atopar os elementos necesarios Atom «feed» nos datos XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última actualización: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Fontes" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Engadir unha nova fonte" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Borrar fonte" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Fontes" @@ -2448,25 +2545,25 @@ msgstr "Non se puidieron atopar os elementos necesarios RSS «item» nos datos X msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Non se puideron atopar os elementos necesarios RSS «channel» nos datos XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "A fonte «%s» xa existe" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Atopouse un erro ao cargar a fonte «%s»" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Panel de fontes" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Lector de fontes Atom/RSS" @@ -2561,14 +2658,22 @@ msgstr "Panel de _lapelas" msgid "Show tabs in a vertical panel" msgstr "Mostrar as lapelas nun panel vertical" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Lista do historial de lapelas" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Permite cambiar de lapela seleccionando nunha lista ordenada por último uso" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Minimizar as novas lapelas" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "As novas lapelas ábrense minimizadas" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personalizar a barra de ferramentas" @@ -2616,9 +2721,6 @@ msgstr "Gardar unha caché da comunicación HTTP no disco" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Produciuse un erro ao obter a hora actual: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Fallou ao engadir o elemento ao historial: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Mostrar os _títulos dos paneis" From 6c496fab542c21d3435ff77db23dd85622de998a Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Tue, 22 Jun 2010 16:06:20 +0200 Subject: [PATCH 2728/2970] l10n: Updated Galician (gl) translation to 99% New status: 632 messages complete with 1 fuzzy and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/gl.po b/po/gl.po index 385673a6..84eb9c79 100644 --- a/po/gl.po +++ b/po/gl.po @@ -351,6 +351,8 @@ msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" +"Ao usar o URI de enriba ábrese un agregador de novas. Normalmente hai un menú ou un butón chamado \"Nova subscrición\", \"Nova fonte de novas\" ou algo semellante.\n" +"En Midori tamén pode ir a Preferencias, Aplicativos e seleccionar un Agregador de novas. A seguinte vez que prema na icona da fonte de novas engadirase automaticamente." #: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" @@ -1834,11 +1836,11 @@ msgstr "A documentación non está instalada" #: ../midori/midori-view.c:3707 msgid "Page loading delayed" -msgstr "" +msgstr "Pospúxose a carga da páxina" #: ../midori/midori-view.c:3708 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" +msgstr "Pospúxose a carga debido a un fallo recente ou ao inicio das preferencias." #: ../midori/midori-view.c:3709 msgid "Load Page" From 72756ed3f126dcd7fa26e6fdf1f86e9c79a40259 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jun 2010 22:52:36 +0200 Subject: [PATCH 2729/2970] Add Yahoo Web Search to default search engines This doesn't affect current users, only new or reset configurations. --- data/search | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/search b/data/search index ada2a7f7..c7938290 100644 --- a/data/search +++ b/data/search @@ -1,4 +1,11 @@ +[Yahoo] +name=Yahoo +text=Yahoo Web Search +uri=http://search.yahoo.com/search?p= +icon= +token=y + [Google] name=Google text=Web Search From eec5359cf52c2df47b2564790ce22358363de6ff Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 22 Jun 2010 23:15:25 +0200 Subject: [PATCH 2730/2970] Don't clear bindings of an erroneous sqlite statement This is not safe and can cause a crash. --- midori/midori-browser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5b26f46c..75c5f314 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3760,7 +3760,8 @@ _action_location_submit_uri (GtkAction* action, g_printerr (_("Failed to insert new history item: %s\n"), sqlite3_errmsg (db)); sqlite3_reset (statement); - sqlite3_clear_bindings (statement); + if (sqlite3_step (statement) == SQLITE_DONE) + sqlite3_clear_bindings (statement); #endif g_free (keywords); From f14152fe1764883db2b321c30a6b1325f9308148 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 24 Jun 2010 22:37:12 +0200 Subject: [PATCH 2731/2970] Don't hardcode toolbar icon style on Windows --- midori/midori-browser.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 75c5f314..e42bd7c2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6367,11 +6367,7 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); g_object_get (gtk_settings, "gtk-toolbar-icon-size", &icon_size, NULL); if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) - #ifdef G_OS_WIN32 - gtk_toolbar_style = GTK_TOOLBAR_ICONS; - #else g_object_get (gtk_settings, "gtk-toolbar-style", >k_toolbar_style, NULL); - #endif else { switch (toolbar_style) From 005b243f016f39c58e46800263087a55fedb3ad8 Mon Sep 17 00:00:00 2001 From: Sergio Cipolla Date: Thu, 24 Jun 2010 23:20:50 +0200 Subject: [PATCH 2732/2970] Update Brazilian Portuguese translation --- po/pt_BR.po | 2835 +++++++++++++++++++++++++++++---------------------- 1 file changed, 1626 insertions(+), 1209 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 8966fb27..3aa5c593 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,15 +2,17 @@ # Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. # Rogério Brito 2009 +# Sergio Cipolla 2010 # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.10\n" +"Project-Id-Version: Midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-24 10:45-0300\n" -"PO-Revision-Date: 2009-09-16 11:15-0300\n" -"Last-Translator: Rogério Brito \n" -"Language-Team: Rogério Brito \n" +"POT-Creation-Date: 2010-06-22 14:27-0300\n" +"PO-Revision-Date: 2010-06-22 13:29-0300\n" +"Last-Translator: Sérgio Brandão Cipolla \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,91 +20,78 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Navegador Leve de Web" +msgstr "Navegador web leve" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1343 ../midori/main.c:1517 -#: ../midori/main.c:1525 ../midori/main.c:1536 -#: ../midori/midori-websettings.c:287 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 +#: ../midori/main.c:1672 ../midori/main.c:1688 +#: ../midori/midori-websettings.c:313 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Navegador Web" +msgstr "Navegador web" -#: ../midori/main.c:96 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" -msgstr "A configuração não foi carregada: %s\n" +msgstr "A configuração não pôde ser carregada: %s\n" #: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:158 ../midori/main.c:238 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:350 +#: ../midori/main.c:370 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" -msgstr "Falha ao abrir banco de dados: %s\n" - -#: ../midori/main.c:382 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Falha ao executar comando da banco de dados: %s\n" - -#: ../midori/main.c:436 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Falha ao remover item do histórico: %s\n" - -#: ../midori/main.c:460 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Falha ao limpar histórico: %s\n" - -#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 -#, c-format -msgid "Failed to add history item: %s\n" -msgstr "Falha ao adicionar item ao histórico: %s\n" +msgstr "Falha ao abrir a base de dados: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:712 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Falha ao remover itens antigos do histórico: %s\n" +msgstr "Falha ao excluir histórico antigo: %s\n" -#: ../midori/main.c:741 +#: ../midori/main.c:445 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "A configuração não foi guardada. %s" +msgstr "A configuração não pôde ser salva. %s" -#: ../midori/main.c:779 +#: ../midori/main.c:483 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Os sites de pesquisa não foram guardados. %s" +msgstr "Os motores de pesquisa não puderam ser salvos. %s" -#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855 +#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Os favoritos não foram guardados. %s" +msgstr "Os favoritos não puderam ser salvos. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:878 ../midori/main.c:901 +#: ../midori/main.c:602 ../midori/main.c:625 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "O lixo não foi guardado. %s" +msgstr "O lixo não pôde ser salvo. %s" -#: ../midori/main.c:974 +#: ../midori/main.c:684 ../midori/main.c:924 #, c-format msgid "The session couldn't be saved. %s" -msgstr "A sessão não foi guardada. %s" +msgstr "A sessão não pôde ser salva. %s" -#: ../midori/main.c:1101 +#: ../midori/main.c:868 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Nenhum certificado raiz disponível. Os certificados SSL não podem ser " +"verificados." + +#: ../midori/main.c:958 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -111,1873 +100,2312 @@ msgstr "" "ocorrer repetidamente, tente uma das seguintes opções para resolver o " "problema." -#: ../midori/main.c:1116 +#: ../midori/main.c:973 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1120 +#: ../midori/main.c:977 msgid "Reset the last _session" -msgstr "Restaurar última _sessão" +msgstr "Restaurar a última _sessão" -#: ../midori/main.c:1125 +#: ../midori/main.c:982 msgid "Disable all _extensions" -msgstr "Desativar todas _extensões" +msgstr "Desabilitar todas as _extensões" -#: ../midori/main.c:1343 +#: ../midori/main.c:1217 ../midori/main.c:1937 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "A sessão não pôde ser carregada: %s\n" + +#: ../midori/main.c:1336 msgid "No filename specified" -msgstr "Nenhum nome especificado" +msgstr "Nenhum nome de arquivo especificado" -#: ../midori/main.c:1366 +#: ../midori/main.c:1355 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1398 +#: ../midori/main.c:1386 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Captura guardada em: %s\n" +msgstr "Captura salva em: %s\n" -#: ../midori/main.c:1447 +#: ../midori/main.c:1557 msgid "Run ADDRESS as a web application" -msgstr "Executar ENDEREÇO como aplicação web" +msgstr "Executar ENDEREÇO como aplicativo web" -#: ../midori/main.c:1447 +#: ../midori/main.c:1557 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1449 +#: ../midori/main.c:1560 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1449 +#: ../midori/main.c:1560 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1451 +#: ../midori/main.c:1563 +msgid "Show a diagnostic dialog" +msgstr "Exibir diálogo de diagnóstico" + +#: ../midori/main.c:1565 msgid "Run the specified filename as javascript" msgstr "Executar o arquivo especificado como javascript" -#: ../midori/main.c:1454 +#: ../midori/main.c:1568 msgid "Take a snapshot of the specified URI" -msgstr "Tirar uma captura da URI especificada" +msgstr "Tirar uma captura do URI especificado" -#: ../midori/main.c:1457 +#: ../midori/main.c:1571 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1459 +#: ../midori/main.c:1573 msgid "Display program version" -msgstr "Mostrar a versão do programa" +msgstr "Exibir a versão do programa" -#: ../midori/main.c:1461 +#: ../midori/main.c:1575 msgid "Addresses" msgstr "Endereços" -#: ../midori/main.c:1514 +#: ../midori/main.c:1577 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Bloquear URIs conforme a expressão regular PADRÃO" + +#: ../midori/main.c:1577 +msgid "PATTERN" +msgstr "PADRÃO" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1581 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Restaurar o Midori após SEGUNDOS segundos de inatividade" + +#: ../midori/main.c:1581 +msgid "SECONDS" +msgstr "SEGUNDOS" + +#: ../midori/main.c:1661 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1537 +#: ../midori/main.c:1689 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envie comentários, sugestões e relatos de erros para:" -#: ../midori/main.c:1539 +#: ../midori/main.c:1691 msgid "Check for new versions at:" -msgstr "Verificar por novas versões em:" +msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1619 +#: ../midori/main.c:1788 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1655 +#: ../midori/main.c:1836 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -"Já existe uma instância do Midori em execução que não está respondendo.\n" +"Uma instância do Midori já está em execução mas não está respondendo.\n" -#: ../midori/main.c:1715 +#: ../midori/main.c:1891 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Os sites de pesquisa não foram carregados. %s\n" +msgstr "Os motores de pesquisa não puderam ser carregados. %s\n" -#: ../midori/main.c:1727 +#: ../midori/main.c:1920 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Os favoritos não foram carregados: %s\n" +msgstr "Os favoritos não puderam ser carregados: %s\n" -#: ../midori/main.c:1742 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "A sessão não foi carregada: %s\n" - -#: ../midori/main.c:1755 +#: ../midori/main.c:1952 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "O lixo não foi carregado: %s\n" +msgstr "O lixo não pôde ser carregado: %s\n" -#: ../midori/main.c:1768 +#: ../midori/main.c:1966 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "O histórico não foi carregado: %s\n" +msgstr "O histórico não pôde ser carregado: %s\n" -#: ../midori/main.c:1780 +#: ../midori/main.c:1980 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1796 +#: ../midori/main.c:1996 msgid "_Ignore" -msgstr "_Ignorar" +msgstr "_Ignorar " -#: ../midori/midori-array.c:250 +#: ../midori/midori-array.c:428 msgid "File not found." msgstr "Arquivo não encontrado." -#: ../midori/midori-array.c:258 ../midori/midori-array.c:267 +#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:495 msgid "Malformed document." -msgstr "Documento mal-formado." +msgstr "Documento mal conformado." -#: ../midori/midori-array.c:429 ../midori/sokoke.c:694 +#: ../midori/midori-array.c:504 +msgid "Unrecognized bookmark format." +msgstr "Formato de favoritos não reconhecido." + +#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 #, c-format msgid "Writing failed." msgstr "Falha na escrita." -#: ../midori/midori-browser.c:307 ../midori/midori-browser.c:4229 -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5581 msgid "Reload the current page" -msgstr "Recarregar página atual" +msgstr "Recarregar a página atual" -#: ../midori/midori-browser.c:318 ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 msgid "Stop loading the current page" msgstr "Parar o carregamento da página atual" -#: ../midori/midori-browser.c:409 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" -msgstr "%d%% carregado(s)" +msgstr "%d%% carregado" -#: ../midori/midori-browser.c:434 +#: ../midori/midori-browser.c:498 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Falha ao atualizar título: %s\n" + +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." -msgstr "Ação '%s' inesperada." +msgstr "Ação inesperada '%s'." -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Novo favorito" -#: ../midori/midori-browser.c:618 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Editar favorito" -#: ../midori/midori-browser.c:648 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:661 ../midori/midori-searchaction.c:952 +#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:680 ../midori/midori-searchaction.c:966 -#: ../extensions/feed-panel/main.c:343 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:376 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:699 +#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:704 ../midori/midori-browser.c:745 +#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 +#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 msgid "Toplevel folder" -msgstr "Pasta Acima" +msgstr "Pasta superior" -#: ../midori/midori-browser.c:821 +#: ../midori/midori-browser.c:864 +msgid "Add to _Speed Dial" +msgstr "Adicionar à _ligação rápida" + +#: ../midori/midori-browser.c:877 +msgid "Show in the tool_bar" +msgstr "Exibir na _barra de ferramentas" + +#: ../midori/midori-browser.c:892 +msgid "Run as _web application" +msgstr "Executar como aplicativo _web" + +#: ../midori/midori-browser.c:986 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Não há espaço livre suficiente para baixar \"%s\"." + +#: ../midori/midori-browser.c:990 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "O arquivo precisa de %s e só há %s livre." + +#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4818 msgid "Save file as" -msgstr "Guardar como" +msgstr "Salvar como" -#: ../midori/midori-browser.c:1172 +#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../midori/midori-browser.c:1456 #, c-format msgid "The file '%s' has been downloaded." -msgstr "O arquivo '%s' foi transferido." +msgstr "O arquivo '%s' foi baixado." -#: ../midori/midori-browser.c:1176 +#: ../midori/midori-browser.c:1460 msgid "Transfer completed" msgstr "Transferência concluída" -#: ../midori/midori-browser.c:1317 +#: ../midori/midori-browser.c:1600 msgid "Save file" -msgstr "Gravar arquivo" +msgstr "Salvar arquivo" -#: ../midori/midori-browser.c:1984 +#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 +msgid "Some files are being downloaded" +msgstr "Alguns arquivos estão sendo baixados" + +#: ../midori/midori-browser.c:1923 +msgid "_Quit Midori" +msgstr "_Sair do Midori" + +#: ../midori/midori-browser.c:1925 +msgid "The transfers will be cancelled if Midori quits." +msgstr "As transferências serão canceladas se sair do Midori." + +#: ../midori/midori-browser.c:2386 msgid "Open file" msgstr "Abrir arquivo" -#: ../midori/midori-browser.c:3430 ../panels/midori-bookmarks.c:781 -#: ../panels/midori-history.c:812 -msgid "Open all in _Tabs" -msgstr "Abrir tudo em _Abas" +#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +msgid "New feed" +msgstr "Novo feed" -#: ../midori/midori-browser.c:3437 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542 -msgid "Open in New _Tab" -msgstr "Abrir em Nova _Aba" - -#: ../midori/midori-browser.c:3440 ../panels/midori-bookmarks.c:789 -#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544 -msgid "Open in New _Window" -msgstr "Abrir em Nova _Janela" - -#: ../midori/midori-browser.c:3750 -msgid "Clear Private Data" -msgstr "Limpar Dados Privados" - -#: ../midori/midori-browser.c:3754 -msgid "_Clear private data" -msgstr "_Limpar dados privados" - -#: ../midori/midori-browser.c:3767 -msgid "Clear the following data:" -msgstr "Limpar os seguintes dados:" - -#: ../midori/midori-browser.c:3777 ../midori/midori-preferences.c:671 -#: ../panels/midori-history.c:108 -msgid "History" -msgstr "Histórico" - -#: ../midori/midori-browser.c:3782 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:3787 -msgid "'Flash' Cookies" -msgstr "Cookies do 'Flash'" - -#: ../midori/midori-browser.c:3792 -msgid "Website icons" -msgstr "Ícones de sites" - -#: ../midori/midori-browser.c:3797 ../midori/sokoke.c:868 -msgid "_Closed Tabs" -msgstr "Abas _Fechadas" - -#: ../midori/midori-browser.c:3805 -msgid "Clear private data when _quitting Midori" -msgstr "Limpar dados privados ao _sair do Midori" - -#: ../midori/midori-browser.c:3889 -msgid "A lightweight web browser." -msgstr "Um navegador leve de web." - -#: ../midori/midori-browser.c:3897 -msgid "translator-credits" -msgstr "Rogério Brito " - -#: ../midori/midori-browser.c:4163 -msgid "_File" -msgstr "_Arquivo" - -#: ../midori/midori-browser.c:4165 ../midori/sokoke.c:869 -msgid "New _Window" -msgstr "Nova _Janela" - -#: ../midori/midori-browser.c:4166 -msgid "Open a new window" -msgstr "Abrir nova janela" - -#: ../midori/midori-browser.c:4169 -msgid "Open a new tab" -msgstr "Abrir nova aba" - -#: ../midori/midori-browser.c:4172 -msgid "Open a file" -msgstr "Abrir arquivo" - -#: ../midori/midori-browser.c:4175 -msgid "Save to a file" -msgstr "Gravar para arquivo" - -#: ../midori/midori-browser.c:4177 -msgid "Add to Speed _dial" -msgstr "Adicionar à ligação rápi_da" - -#: ../midori/midori-browser.c:4178 -msgid "Add shortcut to speed dial" -msgstr "Adicionar atalho a ligação rápida" - -#: ../midori/midori-browser.c:4180 -msgid "_Close Tab" -msgstr "_Fechar Aba" - -#: ../midori/midori-browser.c:4181 -msgid "Close the current tab" -msgstr "Fechar Aba atual" - -#: ../midori/midori-browser.c:4183 -msgid "C_lose Window" -msgstr "Fechar Jane_la" - -#: ../midori/midori-browser.c:4184 -msgid "Close this window" -msgstr "Fechar esta janela" - -#: ../midori/midori-browser.c:4187 -msgid "Print the current page" -msgstr "Imprimir página atual" - -#: ../midori/midori-browser.c:4190 -msgid "Quit the application" -msgstr "Sair da aplicação" - -#: ../midori/midori-browser.c:4192 -msgid "_Edit" -msgstr "_Editar" - -#: ../midori/midori-browser.c:4195 -msgid "Cut the selected text" -msgstr "Cortar o texto selecionado" - -#: ../midori/midori-browser.c:4198 ../midori/midori-browser.c:4201 -msgid "Copy the selected text" -msgstr "Copiar o texto selecionado" - -#: ../midori/midori-browser.c:4204 -msgid "Paste text from the clipboard" -msgstr "Colar texto da área de transferência" - -#: ../midori/midori-browser.c:4207 -msgid "Delete the selected text" -msgstr "Apagar o texto selecionado" - -#: ../midori/midori-browser.c:4210 -msgid "Select all text" -msgstr "Selecionar tudo" - -#: ../midori/midori-browser.c:4213 -msgid "Find a word or phrase in the page" -msgstr "Localizar palavra ou frase na página" - -#: ../midori/midori-browser.c:4215 -msgid "Find _Next" -msgstr "_Localizar Próxima" - -#: ../midori/midori-browser.c:4216 -msgid "Find the next occurrence of a word or phrase" -msgstr "Localizar próxima ocorrência da palavra ou frase" - -#: ../midori/midori-browser.c:4218 -msgid "Find _Previous" -msgstr "Localizar _Anterior" - -#: ../midori/midori-browser.c:4219 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Localizar a ocorrência anterior da palavra ou frase" - -#: ../midori/midori-browser.c:4223 -msgid "Configure the application preferences" -msgstr "Configurar preferências da aplicação" - -#: ../midori/midori-browser.c:4225 -msgid "_View" -msgstr "_Ver" - -#: ../midori/midori-browser.c:4226 -msgid "_Toolbars" -msgstr "_Barra de Ferramentas" - -#: ../midori/midori-browser.c:4238 -msgid "Increase the zoom level" -msgstr "Aumentar Zoom" - -#: ../midori/midori-browser.c:4241 -msgid "Decrease the zoom level" -msgstr "Diminuir Zoom" - -#: ../midori/midori-browser.c:4244 -msgid "Reset the zoom level" -msgstr "Usar zoom inicial" - -#: ../midori/midori-browser.c:4245 -msgid "_Encoding" -msgstr "_Codificação" - -#: ../midori/midori-browser.c:4247 -msgid "View So_urce" -msgstr "Ver Fo_nte" - -#: ../midori/midori-browser.c:4248 -msgid "View the source code of the page" -msgstr "Ver código-fonte da página" - -#: ../midori/midori-browser.c:4250 -msgid "View Selection Source" -msgstr "Ver Origem da Seleção" - -#: ../midori/midori-browser.c:4251 -msgid "View the source code of the selection" -msgstr "Ver código-fonte da seleção" - -#: ../midori/midori-browser.c:4255 -msgid "Toggle fullscreen view" -msgstr "Alternar para tela cheia" - -#: ../midori/midori-browser.c:4257 -msgid "_Go" -msgstr "_Ir" - -#: ../midori/midori-browser.c:4260 -msgid "Go back to the previous page" -msgstr "Ir para página anterior" - -#: ../midori/midori-browser.c:4263 -msgid "Go forward to the next page" -msgstr "Ir para página seguinte" - -#: ../midori/midori-browser.c:4266 -msgid "Go to your homepage" -msgstr "Ir para página inicial" - -#: ../midori/midori-browser.c:4268 -msgid "Empty Trash" -msgstr "Esvaziar Lixeira" - -#: ../midori/midori-browser.c:4269 -msgid "Delete the contents of the trash" -msgstr "Apagar conteúdo da lixeira" - -#: ../midori/midori-browser.c:4271 -msgid "Undo _Close Tab" -msgstr "Desfazer _Fechar Aba" - -#: ../midori/midori-browser.c:4272 -msgid "Open the last closed tab" -msgstr "Abrir última aba fechada" - -#: ../midori/midori-browser.c:4276 ../panels/midori-bookmarks.c:231 +#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 +#: ../panels/midori-bookmarks.c:233 msgid "Add a new bookmark" msgstr "Adicionar novo favorito" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Falha ao executar afirmação da base de dados: %s\n" + +#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Vazio" + +#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 +msgid "Could not run external program." +msgstr "Não foi possível executar o programa externo." + +#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Falha ao inserir novo item no histórico: %s\n" + +#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../panels/midori-history.c:750 +msgid "Open all in _Tabs" +msgstr "Abrir tudo em _abas" + +#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +msgid "Open in New _Tab" +msgstr "Abrir em nova _aba" + +#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +msgid "Open in New _Window" +msgstr "Abrir em nova _janela" + +#: ../midori/midori-browser.c:4657 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4658 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4659 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4660 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4661 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4682 +msgid "Import bookmarks..." +msgstr "Importar favoritos..." + +#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +msgid "_Import bookmarks" +msgstr "_Importar favoritos" + +#: ../midori/midori-browser.c:4696 +msgid "_Application:" +msgstr "_Aplicativo:" + +#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 +#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../katze/katze-utils.c:691 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:4797 +msgid "Failed to import bookmarks" +msgstr "Falha ao importar favoritos" + +#: ../midori/midori-browser.c:4833 +msgid "Failed to export bookmarks" +msgstr "Falha ao exportar favoritos" + +#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 +#: ../panels/midori-history.c:171 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falha ao excluir item do histórico: %s\n" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4994 +msgid "Clear Private Data" +msgstr "Limpar dados privados" + +#: ../midori/midori-browser.c:4998 +msgid "_Clear private data" +msgstr "_Limpar dados privados" + +#: ../midori/midori-browser.c:5012 +msgid "Clear the following data:" +msgstr "Limpar os seguintes dados:" + +#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 +msgid "History" +msgstr "Histórico" + +#: ../midori/midori-browser.c:5029 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:5034 +msgid "'Flash' Cookies" +msgstr "Cookies 'Flash'" + +#: ../midori/midori-browser.c:5039 +msgid "Website icons" +msgstr "Ícones de sites" + +#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +msgid "_Closed Tabs" +msgstr "Abas _fechadas" + +#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +msgid "Web Cache" +msgstr "Cache da web" + +#: ../midori/midori-browser.c:5057 +msgid "Clear private data when _quitting Midori" +msgstr "Limpar dados privados ao _sair do Midori" + +#: ../midori/midori-browser.c:5158 +msgid "A lightweight web browser." +msgstr "Um navegador web leve." + +#: ../midori/midori-browser.c:5160 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"Esta biblioteca é software livre; você pode redistribuí-la e/ou modificá-la " +"nos termos da GNU Lesser General Public License conforme publicada pela Free " +"Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão " +"mais recente." + +#: ../midori/midori-browser.c:5179 +msgid "translator-credits" +msgstr "Sérgio Cipolla \n" +"Rogério Brito " + +#: ../midori/midori-browser.c:5488 +msgid "_File" +msgstr "_Arquivo" + +#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +msgid "New _Window" +msgstr "Nova _janela" + +#: ../midori/midori-browser.c:5491 +msgid "Open a new window" +msgstr "Abrir nova janela" + +#: ../midori/midori-browser.c:5494 +msgid "Open a new tab" +msgstr "Abrir nova aba" + +#: ../midori/midori-browser.c:5496 +msgid "P_rivate Browsing" +msgstr "Navegação pri_vada" + +#: ../midori/midori-browser.c:5497 +msgid "Don't save any private data while browsing" +msgstr "Não salvar quaisquer dados privados ao navegar" + +#: ../midori/midori-browser.c:5501 +msgid "Open a file" +msgstr "Abrir arquivo" + +#: ../midori/midori-browser.c:5504 +msgid "Save to a file" +msgstr "Salvar para arquivo" + +#: ../midori/midori-browser.c:5506 +msgid "Add to Speed _dial" +msgstr "Adicionar à ligação rápi_da" + +#: ../midori/midori-browser.c:5507 +msgid "Add shortcut to speed dial" +msgstr "Adicionar atalho à ligação rápida" + +#: ../midori/midori-browser.c:5509 +msgid "Add Shortcut to the _desktop" +msgstr "A_dicionar atalho à área de trabalho" + +#: ../midori/midori-browser.c:5510 +msgid "Add shortcut to the desktop" +msgstr "Adicionar atalho à área de trabalho" + +#: ../midori/midori-browser.c:5512 +msgid "Subscribe to News _feed" +msgstr "Inscrever _feed de notícias" + +#: ../midori/midori-browser.c:5513 +msgid "Subscribe to this news feed" +msgstr "Inscrever este feed de notícias" + +#: ../midori/midori-browser.c:5518 +msgid "_Close Tab" +msgstr "_Fechar aba" + +#: ../midori/midori-browser.c:5519 +msgid "Close the current tab" +msgstr "Fechar a aba atual" + +#: ../midori/midori-browser.c:5521 +msgid "C_lose Window" +msgstr "Fechar jane_la" + +#: ../midori/midori-browser.c:5522 +msgid "Close this window" +msgstr "Fechar esta janela" + +#: ../midori/midori-browser.c:5525 +msgid "Print the current page" +msgstr "Imprimir a página atual" + +#: ../midori/midori-browser.c:5528 +msgid "Quit the application" +msgstr "Sair do aplicativo" + +#: ../midori/midori-browser.c:5530 +msgid "_Edit" +msgstr "_Editar" + +#: ../midori/midori-browser.c:5534 +msgid "Undo the last modification" +msgstr "Desfazer a última modificação" + +#: ../midori/midori-browser.c:5537 +msgid "Redo the last modification" +msgstr "Refazer a última modificação" + +#: ../midori/midori-browser.c:5541 +msgid "Cut the selected text" +msgstr "Recortar o texto selecionado" + +#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +msgid "Copy the selected text" +msgstr "Copiar o texto selecionado" + +#: ../midori/midori-browser.c:5550 +msgid "Paste text from the clipboard" +msgstr "Colar texto da área de transferência" + +#: ../midori/midori-browser.c:5553 +msgid "Delete the selected text" +msgstr "Excluir o texto selecionado" + +#: ../midori/midori-browser.c:5556 +msgid "Select all text" +msgstr "Selecionar todo o texto" + +#: ../midori/midori-browser.c:5559 +msgid "Find a word or phrase in the page" +msgstr "Localizar palavra ou frase na página" + +#: ../midori/midori-browser.c:5561 +msgid "Find _Next" +msgstr "Localizar _seguinte" + +#: ../midori/midori-browser.c:5562 +msgid "Find the next occurrence of a word or phrase" +msgstr "Localizar a ocorrência seguinte da palavra ou frase" + +#: ../midori/midori-browser.c:5564 +msgid "Find _Previous" +msgstr "Localizar _anterior" + +#: ../midori/midori-browser.c:5565 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Localizar a ocorrência anterior da palavra ou frase" + +#: ../midori/midori-browser.c:5569 +msgid "Configure the application preferences" +msgstr "Configurar preferências do aplicativo" + +#: ../midori/midori-browser.c:5571 +msgid "_View" +msgstr "_Ver" + +#: ../midori/midori-browser.c:5572 +msgid "_Toolbars" +msgstr "_Barras de ferramentas" + +#: ../midori/midori-browser.c:5584 +msgid "Increase the zoom level" +msgstr "Ampliar" + +#: ../midori/midori-browser.c:5587 +msgid "Decrease the zoom level" +msgstr "Reduzir" + +#: ../midori/midori-browser.c:5590 +msgid "Reset the zoom level" +msgstr "Tamanho normal" + +#: ../midori/midori-browser.c:5591 +msgid "_Encoding" +msgstr "_Codificação" + +#: ../midori/midori-browser.c:5593 +msgid "View So_urce" +msgstr "Ver _fonte" + +#: ../midori/midori-browser.c:5594 +msgid "View the source code of the page" +msgstr "Ver código fonte da página" + +#: ../midori/midori-browser.c:5597 +msgid "Toggle fullscreen view" +msgstr "Alternar tela cheia" + +#: ../midori/midori-browser.c:5600 +msgid "Scroll _Left" +msgstr "Rolar à _esquerda" + +#: ../midori/midori-browser.c:5601 +msgid "Scroll to the left" +msgstr "Rolar à esquerda" + +#: ../midori/midori-browser.c:5603 +msgid "Scroll _Down" +msgstr "Rolar para _baixo" + +#: ../midori/midori-browser.c:5604 +msgid "Scroll down" +msgstr "Rolar para baixo" + +#: ../midori/midori-browser.c:5606 +msgid "Scroll _Up" +msgstr "Rolar para _cima" + +#: ../midori/midori-browser.c:5607 +msgid "Scroll up" +msgstr "Rolar para cima" + +#: ../midori/midori-browser.c:5609 +msgid "Scroll _Right" +msgstr "Rolar à _direita" + +#: ../midori/midori-browser.c:5610 +msgid "Scroll to the right" +msgstr "Rolar à direita" + +#: ../midori/midori-browser.c:5613 +msgid "_Go" +msgstr "_Ir" + +#: ../midori/midori-browser.c:5616 +msgid "Go back to the previous page" +msgstr "Ir para a página anterior" + +#: ../midori/midori-browser.c:5619 +msgid "Go forward to the next page" +msgstr "Ir para a página seguinte" + +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5623 +msgid "Go to the previous sub-page" +msgstr "Ir para a subpágina anterior" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5627 +msgid "Go to the next sub-page" +msgstr "Ir para a subpágina seguinte" + +#: ../midori/midori-browser.c:5630 +msgid "Go to your homepage" +msgstr "Ir para a página inicial" + +#: ../midori/midori-browser.c:5632 +msgid "Empty Trash" +msgstr "Esvaziar lixo" + +#: ../midori/midori-browser.c:5633 +msgid "Delete the contents of the trash" +msgstr "Excluir o conteúdo do lixo" + +#: ../midori/midori-browser.c:5635 +msgid "Undo _Close Tab" +msgstr "Desfazer _fechar aba" + +#: ../midori/midori-browser.c:5636 +msgid "Open the last closed tab" +msgstr "Abrir a última aba fechada" + +#: ../midori/midori-browser.c:5642 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:5643 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de favoritos" -#: ../midori/midori-browser.c:4281 ../midori/midori-searchaction.c:497 +#: ../midori/midori-browser.c:5648 +msgid "_Export bookmarks" +msgstr "_Exportar favoritos" + +#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" -msgstr "Administrar Sites de _Pesquisa" +msgstr "Gerenciar motores de _pesquisa" -#: ../midori/midori-browser.c:4282 +#: ../midori/midori-browser.c:5652 msgid "Add, edit and remove search engines..." -msgstr "Adicionar, editar e remover sites de pesquisa..." +msgstr "Adicionar, editar e excluir motores de pesquisa..." -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:5655 msgid "_Clear Private Data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4286 +#: ../midori/midori-browser.c:5656 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:4290 +#: ../midori/midori-browser.c:5660 +msgid "_Inspect Page" +msgstr "Inspecionar página" + +#: ../midori/midori-browser.c:5661 +msgid "Inspect page details and access developer tools..." +msgstr "" +"Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..." + +#: ../midori/midori-browser.c:5666 msgid "_Previous Tab" -msgstr "Aba _Anterior" +msgstr "Aba _anterior" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:5667 msgid "Switch to the previous tab" -msgstr "Mudar para aba anterior" +msgstr "Mudar para a aba anterior" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:5669 msgid "_Next Tab" -msgstr "_Próxima Aba" +msgstr "Aba _seguinte" -#: ../midori/midori-browser.c:4294 +#: ../midori/midori-browser.c:5670 msgid "Switch to the next tab" -msgstr "Mudar para próxima aba" +msgstr "Mudar para a aba seguinte" -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:5672 +msgid "Focus _Current Tab" +msgstr "_Focar aba atual" + +#: ../midori/midori-browser.c:5673 +msgid "Focus the current tab" +msgstr "Focar a aba atual" + +#: ../midori/midori-browser.c:5675 +msgid "Open last _session" +msgstr "Abrir _última sessão" + +#: ../midori/midori-browser.c:5676 +msgid "Open the tabs saved in the last session" +msgstr "Abrir as abas salvas na última sessão" + +#: ../midori/midori-browser.c:5678 msgid "_Help" -msgstr "_Ajuda" +msgstr "Aj_uda" -#: ../midori/midori-browser.c:4298 +#: ../midori/midori-browser.c:5680 msgid "_Contents" msgstr "_Conteúdo" -#: ../midori/midori-browser.c:4299 +#: ../midori/midori-browser.c:5681 msgid "Show the documentation" -msgstr "Mostrar documentação" +msgstr "Exibir a documentação" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:5683 msgid "_Frequent Questions" -msgstr "Perguntas _Frequentes" +msgstr "Perguntas _frequentes" -#: ../midori/midori-browser.c:4302 +#: ../midori/midori-browser.c:5684 msgid "Show the Frequently Asked Questions" -msgstr "Mostrar Perguntas Frequentes" +msgstr "Exibir as perguntas frequentes" -#: ../midori/midori-browser.c:4304 +#: ../midori/midori-browser.c:5686 msgid "_Report a Bug" -msgstr "_Relatar Erro" +msgstr "_Relatar erro" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:5687 msgid "Open Midori's bug tracker" -msgstr "Abrir site de bugs do Midori" +msgstr "Abrir o rastreador de bugs do Midori" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:5690 msgid "Show information about the program" -msgstr "Mostrar informação sobre o programa" +msgstr "Exibir informação sobre o programa" -#: ../midori/midori-browser.c:4315 -msgid "P_rivate Browsing" -msgstr "Navegação P_rivada" - -#: ../midori/midori-browser.c:4316 -msgid "Don't save any private data while browsing" -msgstr "Não guardar nenhum dado privado durante navegação" - -#: ../midori/midori-browser.c:4321 +#: ../midori/midori-browser.c:5698 msgid "_Menubar" -msgstr "Barra de _Menu" +msgstr "Barra de _menu" -#: ../midori/midori-browser.c:4322 +#: ../midori/midori-browser.c:5699 msgid "Show menubar" -msgstr "Mostrar barra de menu" +msgstr "Exibir barra de menu" -#: ../midori/midori-browser.c:4325 +#: ../midori/midori-browser.c:5702 msgid "_Navigationbar" -msgstr "Barra de _Navegação" +msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:5703 msgid "Show navigationbar" -msgstr "Mostrar barra de navegação" +msgstr "Exibir barra de navegação" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:5706 msgid "Side_panel" -msgstr "Pai_nel lateral" +msgstr "Painel _lateral" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:5707 msgid "Show sidepanel" -msgstr "Mostrar painel lateral" +msgstr "Exibir painel lateral" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:5710 msgid "_Bookmarkbar" -msgstr "_Barra de Favoritos" +msgstr "Barra de _favoritos" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:5711 msgid "Show bookmarkbar" -msgstr "Mostrar barra de favoritos" +msgstr "Exibir barra de favoritos" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:5714 msgid "_Transferbar" -msgstr "Barra de _Transferências" +msgstr "Barra de _transferências" -#: ../midori/midori-browser.c:4338 +#: ../midori/midori-browser.c:5715 msgid "Show transferbar" -msgstr "Mostrar barra de transferências" +msgstr "Exibir barra de transferências" -#: ../midori/midori-browser.c:4341 +#: ../midori/midori-browser.c:5718 msgid "_Statusbar" -msgstr "Barra de _Status" +msgstr "Barra de _status" -#: ../midori/midori-browser.c:4342 +#: ../midori/midori-browser.c:5719 msgid "Show statusbar" -msgstr "Mostrar barra de status" +msgstr "Exibir barra de status" -#: ../midori/midori-browser.c:4349 +#: ../midori/midori-browser.c:5727 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:4352 ../midori/midori-websettings.c:214 +#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:4356 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5734 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:4359 ../midori/midori-websettings.c:216 +#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +msgid "Korean (EUC-KR)" +msgstr "Coreano (EUC-KR)" + +#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:4362 ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:4365 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:4368 ../midori/midori-websettings.c:219 -#: ../midori/midori-websettings.c:291 -msgid "Custom..." -msgstr "Personalizar..." - -#: ../midori/midori-browser.c:4806 +#: ../midori/midori-browser.c:6294 msgid "_Separator" msgstr "_Aba" -#: ../midori/midori-browser.c:4813 +#: ../midori/midori-browser.c:6301 msgid "_Location..." -msgstr "_Local..." +msgstr "_Localização..." -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:6303 msgid "Open a particular location" -msgstr "Abrir o local específicado" +msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:6327 msgid "_Web Search..." -msgstr "Pesquisa na _Web..." +msgstr "Pesquisa _web..." -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:6329 msgid "Run a web search" -msgstr "Executar uma pesquisa na web" +msgstr "Pesquisar na web" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:6350 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou aba anteriormente fechada" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:6365 msgid "_Recently visited pages" -msgstr "Páginas _Recentes" +msgstr "Páginas _recentes" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:6367 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:4894 ../midori/sokoke.c:857 +#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 msgid "_Bookmarks" msgstr "_Favoritos" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:6384 msgid "Show the saved bookmarks" -msgstr "Mostrar favoritos guardados" +msgstr "Exibir favoritos salvos" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:6399 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:6412 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:6414 msgid "Show a list of all open tabs" -msgstr "Mostrar lista de abas abertas" +msgstr "Exibir lista das abas abertas" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:6428 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:6430 msgid "Menu" msgstr "Menu" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:6634 msgid "_Inline Find:" -msgstr "Local_izar:" +msgstr "Local_izar na página:" -#: ../midori/midori-browser.c:5152 +#: ../midori/midori-browser.c:6665 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:6670 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:5162 +#: ../midori/midori-browser.c:6675 msgid "Match Case" -msgstr "Maiúsculas e Minúsculas" +msgstr "Sensível ao caso" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:6684 msgid "Highlight Matches" -msgstr "Realçar Correspondências" +msgstr "Realçar correspondências" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:6696 msgid "Close Findbar" -msgstr "Fechar" +msgstr "Fechar barra de localização" -#: ../midori/midori-browser.c:5215 -#: ../extensions/cookie-manager/cookie-manager-page.c:109 -msgid "Delete All" -msgstr "Apagar Tudo" +#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Limpar tudo" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:7100 #, c-format msgid "Unexpected setting '%s'" -msgstr "Definição '%s' inesperada" +msgstr "Configuração inesperada '%s'" -#: ../midori/midori-locationaction.c:901 +#: ../midori/midori-locationaction.c:377 +#, c-format +msgid "Failed to select from history\n" +msgstr "Falha ao selecionar do histórico\n" + +#: ../midori/midori-locationaction.c:459 +#, c-format +msgid "Search for %s" +msgstr "Pesquisar por %s" + +#: ../midori/midori-locationaction.c:482 #, c-format msgid "Search with %s" msgstr "Pesquisar com %s" -#: ../midori/midori-panel.c:382 ../midori/midori-panel.c:384 +#: ../midori/midori-locationaction.c:1197 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "Falha ao executar afirmação da base de dados:\n" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "Cola_r e prosseguir" + +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" -msgstr "Separar o painel escolhido da janela" +msgstr "Separar da janela o painel escolhido" -#: ../midori/midori-panel.c:394 ../midori/midori-panel.c:396 -#: ../midori/midori-panel.c:577 ../midori/midori-panel.c:580 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" -msgstr "Alinhar painel à direita" +msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-panel.c:406 ../midori/midori-panel.c:407 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:578 ../midori/midori-panel.c:581 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" -msgstr "Alinhar painel à esquerda" +msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-panel.c:704 -msgid "Show panel _titles" -msgstr "Mostrar _títulos de painel" +#: ../midori/midori-panel.c:797 +msgid "Hide operating controls" +msgstr "Ocultar controles operacionais" -#: ../midori/midori-panel.c:712 -msgid "Show operating _controls" -msgstr "Mostrar _controles operacionais" - -#: ../midori/midori-panel.c:783 -msgid "Options" -msgstr "Opções" - -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" -msgstr "Mostrar página em branco" +msgstr "Exibir página em branco" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" -msgstr "Mostrar Página Inicial" +msgstr "Exibir a página inicial" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" -msgstr "Mostrar últimas abas abertas" +msgstr "Exibir as últimas abas abertas" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:222 msgid "Japanese (SHIFT_JIS)" -msgstr "Japonês (SHIFT__JIS)" +msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:242 msgid "New tab" msgstr "Nova aba" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:243 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:244 msgid "Current tab" msgstr "Aba atual" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:259 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:260 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:261 +msgid "Small icons" +msgstr "Ícones pequenos" + +#: ../midori/midori-websettings.c:262 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:263 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:264 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:279 +msgid "Automatic (GNOME or environment)" +msgstr "Automático (GNOME ou ambiente)" + +#: ../midori/midori-websettings.c:280 +msgid "HTTP proxy server" +msgstr "Servidor proxy HTTP" + +#: ../midori/midori-websettings.c:281 +msgid "No proxy server" +msgstr "Sem servidor proxy" + +#: ../midori/midori-websettings.c:296 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:297 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:272 ../panels/midori-addons.c:94 -#: ../extensions/shortcuts.c:93 +#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:314 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:289 +#: ../midori/midori-websettings.c:315 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:316 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:290 +#: ../midori/midori-websettings.c:317 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:370 msgid "Remember last window size" -msgstr "Lembrar último tamanho de janela" +msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:371 msgid "Whether to save the last window size" -msgstr "Marque se quiser guardar o último tamanho de janela" +msgstr "Se o último tamanho da janela deve ser salvo" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:379 msgid "Last window width" -msgstr "Largura da última janela" +msgstr "Última largura da janela" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:380 msgid "The last saved window width" -msgstr "Última largura de janela guardada" +msgstr "Última largura da janela salva" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:388 msgid "Last window height" -msgstr "Altura da última janela" +msgstr "Última altura da janela" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:389 msgid "The last saved window height" -msgstr "Última altura de janela guardada" +msgstr "Última altura da janela salva" -#: ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:414 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:415 msgid "The last saved panel position" -msgstr "Última posição de painel guardada" +msgstr "Última posição do painel salva" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:424 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:398 -msgid "The last saved panel page" -msgstr "Última posição de painel de página guardada" - -#: ../midori/midori-websettings.c:406 -msgid "Last Web search" -msgstr "Última pesquisa da Web" - -#: ../midori/midori-websettings.c:407 -msgid "The last saved Web search" -msgstr "Última pesquisa da Web guardada" - -#: ../midori/midori-websettings.c:416 -msgid "Show Menubar" -msgstr "Mostrar Barra de Menu" - -#: ../midori/midori-websettings.c:417 -msgid "Whether to show the menubar" -msgstr "Marque se quiser mostrar a barra de menu" - #: ../midori/midori-websettings.c:425 -msgid "Show Navigationbar" -msgstr "Mostrar Barra de Navegação" +msgid "The last saved panel page" +msgstr "Última página do painel salva" -#: ../midori/midori-websettings.c:426 -msgid "Whether to show the navigationbar" -msgstr "Marque se quiser mostrar a barra de navegação" +#: ../midori/midori-websettings.c:433 +msgid "Last Web search" +msgstr "Última pesquisa na web" #: ../midori/midori-websettings.c:434 -msgid "Show Bookmarkbar" -msgstr "Mostrar Barra de Favoritos" - -#: ../midori/midori-websettings.c:435 -msgid "Whether to show the bookmarkbar" -msgstr "Marque se quiser mostrar a barra de favoritos" +msgid "The last saved Web search" +msgstr "Última pesquisa na web salva" #: ../midori/midori-websettings.c:443 -msgid "Show Panel" -msgstr "Mostrar Painel" +msgid "Show Menubar" +msgstr "Exibir barra de menu" #: ../midori/midori-websettings.c:444 +msgid "Whether to show the menubar" +msgstr "Se a barra de menu deve ser exibida" + +#: ../midori/midori-websettings.c:452 +msgid "Show Navigationbar" +msgstr "Exibir barra de navegação" + +#: ../midori/midori-websettings.c:453 +msgid "Whether to show the navigationbar" +msgstr "Se a barra de navegação deve ser exibida" + +#: ../midori/midori-websettings.c:461 +msgid "Show Bookmarkbar" +msgstr "Exibir barra de favoritos" + +#: ../midori/midori-websettings.c:462 +msgid "Whether to show the bookmarkbar" +msgstr "Se a barra de favoritos deve ser exibida" + +#: ../midori/midori-websettings.c:470 +msgid "Show Panel" +msgstr "Exibir painel" + +#: ../midori/midori-websettings.c:471 msgid "Whether to show the panel" -msgstr "Marque se quiser mostrar o painel" +msgstr "Se o painel deve ser exibido" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:486 msgid "Show Transferbar" -msgstr "Mostrar barra de transferências" +msgstr "Exibir barra de transferências" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:487 msgid "Whether to show the transferbar" -msgstr "Marque se quiser mostrar a barra de transferências" +msgstr "Se a barra de transferências deve ser exibida" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:495 msgid "Show Statusbar" -msgstr "Mostrar Barra de Status" +msgstr "Exibir barra de status" -#: ../midori/midori-websettings.c:469 +#: ../midori/midori-websettings.c:496 msgid "Whether to show the statusbar" -msgstr "Marque se quiser mostrar a barra de status" +msgstr "Se a barra de status deve ser exibida" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:505 msgid "Toolbar Style:" -msgstr "Estilo da Barra de Ferramentas:" +msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:479 +#: ../midori/midori-websettings.c:506 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:522 msgid "Show progress in location entry" -msgstr "Mostrar evolução na entrada de localização" +msgstr "Exibir progresso no campo de endereço" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:523 msgid "Whether to show loading progress in the location entry" -msgstr "" -"Marque para mostrar a evolução do carregamento na entrada de localização" +msgstr "Se o progresso do carregamento deve ser exibido no campo de endereço" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:538 msgid "Search engines in location completion" -msgstr "Sites de pesquisa ao completar localizações" +msgstr "Motores de pesquisa na complementação do endereço" -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-websettings.c:539 msgid "Whether to show search engines in the location completion" -msgstr "Marque para mostrar sites de pesquisa ao completar localizações" +msgstr "" +"Se motores de pesquisa devem ser exibidos na complementação do endereço" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:547 msgid "Toolbar Items" -msgstr "Itens da Barra de Ferramentas" +msgstr "Itens da barra de ferramentas" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:548 msgid "The items to show on the toolbar" -msgstr "Itens a mostrar na barra de ferramentas" +msgstr "Itens a serem exibidos na barra de ferramentas" -#: ../midori/midori-websettings.c:529 +#: ../midori/midori-websettings.c:556 msgid "Compact Sidepanel" -msgstr "Compactar Painel Lateral" +msgstr "Painel lateral compacto" -#: ../midori/midori-websettings.c:530 +#: ../midori/midori-websettings.c:557 msgid "Whether to make the sidepanel compact" -msgstr "Marque para compactar o painel lateral" +msgstr "Se o painel lateral deve ser compacto" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:572 msgid "Show operating controls of the panel" -msgstr "Mostrar os controles do painel" +msgstr "Exibir os controles operacionais do painel" -#: ../midori/midori-websettings.c:546 +#: ../midori/midori-websettings.c:573 msgid "Whether to show the operating controls of the panel" -msgstr "Marque para mostrar os controles do painel" +msgstr "Se os controles operacionais do painel devem ser exibidos" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:588 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:589 msgid "Whether to align the sidepanel on the right" -msgstr "Marque para alinhar o painel lateral à direita" +msgstr "Se o painel lateral deve ser alinhado à direita" -#: ../midori/midori-websettings.c:571 +#: ../midori/midori-websettings.c:604 +msgid "Open panels in separate windows" +msgstr "Abrir painéis em janelas separadas" + +#: ../midori/midori-websettings.c:605 +msgid "Whether to always open panels in separate windows" +msgstr "Se os painéis devem ser sempre abertos em janelas separadas" + +#: ../midori/midori-websettings.c:614 msgid "When Midori starts:" msgstr "Ao iniciar o Midori:" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:615 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar o Midori" -#: ../midori/midori-websettings.c:581 +#: ../midori/midori-websettings.c:624 msgid "Homepage:" -msgstr "Página Inicial:" +msgstr "Página inicial:" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:625 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:640 msgid "Show crash dialog" -msgstr "Mostrar diálogo sobre encerramento" +msgstr "Exibir diálogo de encerramento abrupto" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:641 msgid "Show a dialog after Midori crashed" -msgstr "Mostrar diálogo após o encerramento do Midori" +msgstr "Exibir um diálogo após o encerramento abrupto do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in new tabs" -msgstr "Mostrar ligação rápida em novas aba" +msgstr "Exibir ligação rápida nas novas abas" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in newly opened tabs" -msgstr "Mostrar ligação rápida em abas recentemente abertas" +msgstr "Exibir ligação rápida nas abas recentemente abertas" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:666 msgid "Save downloaded files to:" -msgstr "Guardar arquivos transferidos em:" +msgstr "Salvar arquivos baixados em:" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:667 msgid "The folder downloaded files are saved to" -msgstr "A pasta para guardar transferências" +msgstr "A pasta na qual salvar os arquivos baixados" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:688 msgid "Ask for the destination folder" -msgstr "Perguntar pasta de destino" +msgstr "Perguntar pela pasta de destino" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:689 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" -"Marcar para perguntar por uma pasta de destino ao transferir um arquivo" +msgstr "Se é para perguntar em que pasta salvar o arquivo a ser baixado" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:708 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:709 msgid "Whether to show a notification when a transfer has been completed" -msgstr "Marque para mostrar uma notificação ao concluir a transferência" +msgstr "Se uma notificação deve ser exibida ao concluir-se a transferência" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:721 msgid "Download Manager" -msgstr "Gerenciador de Transferências" +msgstr "Gerenciador de downloads" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:722 msgid "An external download manager" -msgstr "Um gerenciador de transferências externo" +msgstr "Um gerenciador de downloads externo" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:730 msgid "Text Editor" -msgstr "Editor de Texto" +msgstr "Editor de texto" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:731 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:746 msgid "News Aggregator" -msgstr "Agregador de Notícias" +msgstr "Agregador de notícias" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:747 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:755 msgid "Location entry Search" -msgstr "Pesquisa na entrada de locais" +msgstr "Pesquisa no campo de endereço" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:756 msgid "The search to perform inside the location entry" -msgstr "A pesquisa a fazer dentro da entrada de locais" +msgstr "A pesquisa a ser executada pelo campo de endereço" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:764 msgid "Preferred Encoding" -msgstr "Codificação Preferida" +msgstr "Codificação preferida" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:765 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:775 msgid "Always Show Tabbar" -msgstr "Sempre Mostrar Barra de Abas" +msgstr "Sempre exibir barra de abas" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:776 msgid "Always show the tabbar" -msgstr "Mostrar sempre barra de abas" +msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:784 msgid "Close Buttons on Tabs" -msgstr "Ícone \"Fechar\" nas Abas" +msgstr "Botão fechar nas abas" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:785 msgid "Whether tabs have close buttons" -msgstr "Marque para cada aba ter um botão para fechar" +msgstr "Se as abas devem ter um botão para fechar" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:793 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:794 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:803 msgid "Open external pages in:" msgstr "Abrir páginas externas em:" -#: ../midori/midori-websettings.c:759 +#: ../midori/midori-websettings.c:804 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:768 +#: ../midori/midori-websettings.c:813 msgid "Middle click opens Selection" -msgstr "Clicar na roda do mouse abre Seleção" +msgstr "Clique na roda do mouse abre seleção" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:814 msgid "Load an address from the selection via middle click" -msgstr "Carregar endereço selecionado através de clique na roda do mouse" +msgstr "Carregar endereço selecionado clicando na roda do mouse" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:822 msgid "Open tabs in the background" msgstr "Abrir abas em segundo plano" -#: ../midori/midori-websettings.c:778 +#: ../midori/midori-websettings.c:823 msgid "Whether to open new tabs in the background" -msgstr "Marque se quiser abrir novas abas em segundo plano" +msgstr "Se as novas abas devem ser abertas em segundo plano" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:831 msgid "Open Tabs next to Current" -msgstr "Abrir Abas perto da Atual" +msgstr "Abrir abas ao lado da atual" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:832 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Marque para abrir as novas abas perto da atual ou após a última" +msgstr "" +"Se as novas abas devem ser abertas ao lado da atual em vez de após a última" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:840 msgid "Open popups in tabs" msgstr "Abrir popups em abas" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:841 msgid "Whether to open popup windows in tabs" -msgstr "Marque para abrir janelas popup em abas" +msgstr "Se janelas popup devem ser abertas em abas" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "Carregar imagens automaticamente" + +#: ../midori/midori-websettings.c:852 +msgid "Load and display images automatically" +msgstr "Carregar e exibir as imagens automaticamente" + +#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "Habilitar scripts" + +#: ../midori/midori-websettings.c:860 +msgid "Enable embedded scripting languages" +msgstr "Habilitar linguagem de scripts incorporadas" + +#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Habilitar plugins Netscape" + +#: ../midori/midori-websettings.c:868 +msgid "Enable embedded Netscape plugin objects" +msgstr "Habilitar plugins Netscape incorporados" + +#: ../midori/midori-websettings.c:884 +msgid "Enable HTML5 database support" +msgstr "Habilitar suporte a dados HTML5" + +#: ../midori/midori-websettings.c:885 +msgid "Whether to enable HTML5 database support" +msgstr "Se o suporte a dados HTML5 deve ser habilitado" + +#: ../midori/midori-websettings.c:891 +msgid "Enable HTML5 local storage support" +msgstr "Habilitar suporte a armazenagem local HTML5" + +#: ../midori/midori-websettings.c:892 +msgid "Whether to enable HTML5 local storage support" +msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado" + +#: ../midori/midori-websettings.c:900 +msgid "Enable offline web application cache" +msgstr "Habilitar cache de aplicativo web offline" + +#: ../midori/midori-websettings.c:901 +msgid "Whether to enable offline web application cache" +msgstr "Se o cache de aplicativo web offline deve ser habilitado" + +#: ../midori/midori-websettings.c:926 msgid "Zoom Text and Images" -msgstr "Zoom de Texto e Imagens" +msgstr "Zoom de texto e imagens" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:927 msgid "Whether to zoom text and images" -msgstr "Marque para ajustar zoom de texto e imagens" +msgstr "Se o zoom de texto e imagens pode ser ajustado" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:942 msgid "Find inline while typing" -msgstr "Encontrar ao digitar" +msgstr "Localizar na página ao digitar" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:943 msgid "Whether to automatically find inline while typing" -msgstr "Marque para encontrar automaticamente ao digitar" +msgstr "Se a localização na página deve ser automaticamente ao digitar" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:958 +msgid "Kinetic scrolling" +msgstr "Rolagem cinética" + +#: ../midori/midori-websettings.c:959 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade" + +#: ../midori/midori-websettings.c:967 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:968 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:984 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:848 +#: ../midori/midori-websettings.c:985 msgid "Accept cookies from the original website only" -msgstr "Só aceitar cookies do site original" +msgstr "Apenas aceitar cookies do site web original" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:993 msgid "Maximum cookie age" -msgstr "Idade máxima dos cookies" +msgstr "Antiguidade máxima dos cookies" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:994 msgid "The maximum number of days to save cookies for" -msgstr "Número máximo de dias para guardar cookies" +msgstr "O número máximo de dias para manter cookies salvos" -#: ../midori/midori-websettings.c:867 +#: ../midori/midori-websettings.c:1011 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:1012 msgid "Whether the last visited pages are saved" -msgstr "Marque para guardar as últimas páginas visitadas" +msgstr "Se as últimas páginas visitadas devem ser salvas" -#: ../midori/midori-websettings.c:876 +#: ../midori/midori-websettings.c:1020 msgid "Maximum history age" -msgstr "Idade máxima do histórico" +msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:877 +#: ../midori/midori-websettings.c:1021 msgid "The maximum number of days to save the history for" -msgstr "O número máximo de dias para guardar histórico" +msgstr "O número máximo de dias para os quais manter um histórico" -#: ../midori/midori-websettings.c:885 -msgid "Remember last form inputs" -msgstr "Lembrar dados de formulários" - -#: ../midori/midori-websettings.c:886 -msgid "Whether the last form inputs are saved" -msgstr "Marque para guardar os dados de formulário" - -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" -msgstr "Lembrar últimas transferências " +msgstr "Lembrar últimos arquivos baixados" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:1030 msgid "Whether the last downloaded files are saved" -msgstr "Marque para guardar as últimas transferências" +msgstr "Se os últimos arquivos baixados devem ser lembrados" -#: ../midori/midori-websettings.c:905 -msgid "Proxy Server" -msgstr "Servidor Proxy" +#: ../midori/midori-websettings.c:1047 +msgid "Proxy server" +msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:1048 +msgid "The type of proxy server to use" +msgstr "O tipo de servidor a utilizar" + +#: ../midori/midori-websettings.c:1057 +msgid "HTTP Proxy Server" +msgstr "Servidor proxy HTTP" + +#: ../midori/midori-websettings.c:1058 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para conexões HTTP" -#: ../midori/midori-websettings.c:921 +#: ../midori/midori-websettings.c:1073 msgid "Detect proxy server automatically" msgstr "Detectar servidor proxy automaticamente" -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:1074 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Marque para detectar automaticamente o servidor proxy do ambiente" +msgstr "Se o servidor proxy deve ser detectado automaticamente" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:938 +#: ../midori/midori-websettings.c:1090 msgid "Identify as" -msgstr "Identificar como" +msgstr "Identificar-se como" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:1091 msgid "What to identify as to web pages" -msgstr "Identificar navegador para as páginas web como" +msgstr "Identificar-se para as páginas web como" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:1107 msgid "Identification string" -msgstr "Linha de Identificação" +msgstr "Cadeia de identificação" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:1108 msgid "The application identification string" -msgstr "A linha de identificação da aplicação" +msgstr "A cadeia de identificação do aplicativo" -#: ../midori/midori-websettings.c:964 -msgid "Cache size" -msgstr "Tamanho do cache" +#: ../midori/midori-websettings.c:1123 +msgid "Preferred languages" +msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:965 -msgid "The allowed size of the cache" -msgstr "Tamanho permitido do cache" +#: ../midori/midori-websettings.c:1124 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Uma lista de idiomas, separados por vírgulas, para o processamento de " +"páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-" +"fr;q=0.667\"" -#: ../midori/midori-websettings.c:980 +#: ../midori/midori-websettings.c:1139 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:981 +#: ../midori/midori-websettings.c:1140 msgid "The private data selected for deletion" -msgstr "Os dados privados selecionados para apagar" - -#: ../midori/midori-view.c:781 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "A página '%s' não foi carregada." +msgstr "Os dados privados selecionados para exclusão" #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, #. so reloading via Javascript works but not via API calls. -#: ../midori/midori-view.c:783 ../midori/midori-view.c:3013 -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Erro" +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 +#: ../midori/midori-view.c:4532 +#, c-format +msgid "Error - %s" +msgstr "Erro - %s" -#: ../midori/midori-view.c:786 +#: ../midori/midori-view.c:1262 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "A página '%s' não pôde ser carregada." + +#: ../midori/midori-view.c:1264 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:818 ../midori/midori-view.c:3017 +#: ../midori/midori-view.c:1283 #, c-format msgid "Not found - %s" -msgstr "Não encontrado(a) - %s" +msgstr "Não encontrado - %s" -#: ../midori/midori-view.c:1205 -msgid "Open _Link" -msgstr "Abrir _Link" +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#, c-format +msgid "Send a message to %s" +msgstr "Enviar uma mensagem para %s" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +msgid "Inspect _Element" +msgstr "Inspecionar _elemento" + +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 msgid "Open Link in New _Tab" -msgstr "Abrir Link em Nova _Aba" +msgstr "Abrir link em nova _aba" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:2195 +msgid "Open Link in _Foreground Tab" +msgstr "Abrir link na aba em _primeiro plano" + +#: ../midori/midori-view.c:2196 +msgid "Open Link in _Background Tab" +msgstr "Abrir link na aba em _segundo plano" + +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 msgid "Open Link in New _Window" -msgstr "Abrir Link em Nova _Janela" +msgstr "Abrir link em nova _janela" -#: ../midori/midori-view.c:1230 -msgid "_Download Link destination" -msgstr "_Destino de Download do Link" +#: ../midori/midori-view.c:2202 +msgid "Open Link as Web A_pplication" +msgstr "Abrir link como a_plicação web" -#: ../midori/midori-view.c:1236 +#: ../midori/midori-view.c:2205 +msgid "Copy Link de_stination" +msgstr "Copiar _destino do link" + +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 msgid "_Save Link destination" -msgstr "De_stino para Guardar Link" +msgstr "_Salvar destino do link" -#: ../midori/midori-view.c:1245 +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +msgid "_Download Link destination" +msgstr "_Baixar destino do link" + +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 msgid "Download with Download _Manager" -msgstr "Transferir com _Gerenciador de Transferências" +msgstr "Baixar com _gerenciador de downloads" -#: ../midori/midori-view.c:1274 +#: ../midori/midori-view.c:2222 +msgid "Open _Image in New Tab" +msgstr "Abrir _imagem em nova aba" + +#: ../midori/midori-view.c:2225 +msgid "Copy Image _Address" +msgstr "Copiar _endereço da imagem" + +#: ../midori/midori-view.c:2228 +msgid "Save I_mage" +msgstr "Salvar i_magem" + +#: ../midori/midori-view.c:2229 +msgid "Download I_mage" +msgstr "Baixar i_magem" + +#: ../midori/midori-view.c:2236 +msgid "Copy Video _Address" +msgstr "Copiar _endereço do vídeo" + +#: ../midori/midori-view.c:2239 +msgid "Save _Video" +msgstr "Salvar _vídeo" + +#: ../midori/midori-view.c:2239 +msgid "Download _Video" +msgstr "Baixar _vídeo" + +#: ../midori/midori-view.c:2302 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:1306 +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 msgid "_Search the Web" -msgstr "_Pesquisar na Web" +msgstr "_Pesquisar na web" -#: ../midori/midori-view.c:1316 +#: ../midori/midori-view.c:2365 msgid "Open Address in New _Tab" -msgstr "Abrir Endereço em Nova _Aba" +msgstr "Abrir endereço em nova _aba" -#: ../midori/midori-view.c:1494 +#: ../midori/midori-view.c:2662 msgid "Open or download file" -msgstr "Abrir ou transferir arquivo" +msgstr "Abrir ou baixar arquivo" -#: ../midori/midori-view.c:1511 +#: ../midori/midori-view.c:2681 #, c-format msgid "File Type: '%s'" -msgstr "Tipo de Arquivo: '%s'" +msgstr "Tipo de arquivo: '%s'" -#: ../midori/midori-view.c:1514 +#: ../midori/midori-view.c:2684 #, c-format msgid "File Type: %s ('%s')" -msgstr "Tipo de Arquivo: %s ('%s')" +msgstr "Tipo de arquivo: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1518 +#: ../midori/midori-view.c:2688 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:1957 +#: ../midori/midori-view.c:3236 #, c-format msgid "Inspect page - %s" msgstr "Inspecionar página - %s" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:3501 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:2148 +#: ../midori/midori-view.c:3502 msgid "Click to add a shortcut" -msgstr "Clique para adicionar atalho" +msgstr "Clique para adicionar um atalho" -#: ../midori/midori-view.c:2149 +#: ../midori/midori-view.c:3503 msgid "Enter shortcut address" -msgstr "Introduza endereço do atalho" +msgstr "Informe o endereço do atalho" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:3504 msgid "Enter shortcut title" -msgstr "Introduza título do atalho" +msgstr "Informe o título do atalho" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:3505 msgid "Are you sure you want to delete this shortcut?" -msgstr "Tem certeza de que quer apagar este atalho?" +msgstr "Tem certeza de que quer excluir este atalho?" -#: ../midori/midori-view.c:2181 +#: ../midori/midori-view.c:3506 +msgid "Set number of columns" +msgstr "Definir número de colunas" + +#: ../midori/midori-view.c:3507 +msgid "Enter number of columns:" +msgstr "Informe o número de colunas:" + +#: ../midori/midori-view.c:3508 +msgid "Set number of shortcuts" +msgstr "Definir número de atalhos" + +#: ../midori/midori-view.c:3509 +msgid "Enter number of shortcuts:" +msgstr "Informe o número de atalhos" + +#: ../midori/midori-view.c:3535 #, c-format msgid "Document cannot be displayed" -msgstr "O documento não pôde ser apresentado" +msgstr "O documento não pode ser exibido" -#: ../midori/midori-view.c:2198 +#: ../midori/midori-view.c:3558 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:2323 +#: ../midori/midori-view.c:3808 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:2551 ../midori/sokoke.c:865 -msgid "New _Tab" -msgstr "_Nova Aba" - -#: ../midori/midori-view.c:2565 +#: ../midori/midori-view.c:4068 msgid "_Duplicate Tab" -msgstr "_Duplicar Aba" +msgstr "_Duplicar aba" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:4073 msgid "_Restore Tab" -msgstr "_Restaurar Aba" +msgstr "_Restaurar aba" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:4073 msgid "_Minimize Tab" -msgstr "_Minizar Aba" +msgstr "_Minimizar aba" -#: ../midori/midori-preferences.c:91 -#, c-format -msgid "Preferences for %s" -msgstr "Preferências para %s" +#: ../midori/midori-view.c:4079 +msgid "Close ot_her Tabs" +msgstr "Fec_har outras abas" + +#: ../midori/midori-view.c:4700 +msgid "Print background images" +msgstr "Imprimir imagens de fundo" + +#: ../midori/midori-view.c:4701 +msgid "Whether background images should be printed" +msgstr "Se as imagens de fundo devem ser impressas" + +#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +msgid "Features" +msgstr "Funcionalidades" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:298 msgid "General" msgstr "Geral" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:299 msgid "Startup" msgstr "Início" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 msgid "Use current page as homepage" -msgstr "Usar página atual como página inicial" +msgstr "Usar a página atual como página inicial" -#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferências" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:349 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:350 msgid "Font settings" -msgstr "Definição de fontes" +msgstr "Configurações de fontes" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:352 msgid "Default Font Family" -msgstr "Família Padrão de Fontes" +msgstr "Família de fontes padrão" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:355 msgid "The default font family used to display text" -msgstr "A família padrão de fontes usada para apresentar texto" +msgstr "A família de fontes padrão usada para exibir texto" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:358 msgid "The default font size used to display text" -msgstr "O tamanho padrão da fonte para apresentar texto" +msgstr "O tamanho de fonte padrão usado para exibir texto" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:360 msgid "Fixed-width Font Family" -msgstr "Família de Fontes de Largura Fixa" +msgstr "Família de fontes de largura fixa" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:363 msgid "The font family used to display fixed-width text" -msgstr "A família de fontes usada para apresentar texto com largura fixa" +msgstr "A família de fontes usada para exibir texto com largura fixa" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:366 msgid "The font size used to display fixed-width text" -msgstr "Tamanho da fonte para apresentar texto com largura fixa" +msgstr "O tamanho de fonte usado para exibir texto com largura fixa" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:368 msgid "Minimum Font Size" -msgstr "Tamanho Mínimo de Fonte" +msgstr "Tamanho mínimo de fonte" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:371 msgid "The minimum font size used to display text" -msgstr "Tamanho mínimo de fonte para apresentar texto" - -#: ../midori/midori-preferences.c:473 -msgid "Encoding" -msgstr "Codificação" - -#: ../midori/midori-preferences.c:476 -msgid "The character encoding to use by default" -msgstr "A codificação padrão de caracteres" +msgstr "O tamanho mínimo de fonte usado para exibir texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:380 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:484 -msgid "Features" -msgstr "Funções" - -#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "Carregar imagens automaticamente" - -#: ../midori/midori-preferences.c:488 -msgid "Load and display images automatically" -msgstr "Carregar e apresentar imagens automaticamente" - -#: ../midori/midori-preferences.c:491 -msgid "Shrink images automatically" -msgstr "Encolher imagens automaticamente" - -#: ../midori/midori-preferences.c:492 -msgid "Automatically shrink standalone images to fit" -msgstr "Encolher imagens automaticamente para caber na página" - -#: ../midori/midori-preferences.c:495 -msgid "Print background images" -msgstr "Imprimir imagens em segundo plano" - -#: ../midori/midori-preferences.c:496 -msgid "Whether background images should be printed" -msgstr "Marque para imprimir as imagens em segundo plano" - -#: ../midori/midori-preferences.c:499 -msgid "Resizable text areas" -msgstr "Áreas de texto dimensionáveis" - -#: ../midori/midori-preferences.c:500 -msgid "Whether text areas are resizable" -msgstr "Marque para redimensionar as áreas de texto" - -#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "Ativar scripts" - -#: ../midori/midori-preferences.c:504 -msgid "Enable embedded scripting languages" -msgstr "Ativar linguagens de scripts já incorporadas" - -#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "Ativar plugins do Netscape" - -#: ../midori/midori-preferences.c:508 -msgid "Enable embedded Netscape plugin objects" -msgstr "Ativar plugins nativos do Netscape" - -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:393 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegada" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:394 msgid "Enforce a video dot density of 96 DPI" -msgstr "Forçar densidade de vídeo como 96 Pontos por Polegada" +msgstr "Forçar resolução de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:515 -msgid "Enable developer tools" -msgstr "Ativar ferramentas de desenvolvimento" +#: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "Permitir que os scripts abram popups" -#: ../midori/midori-preferences.c:516 -msgid "Enable special extensions for developers" -msgstr "Ativar extensões especiais de desenvolvimento" +#: ../midori/midori-preferences.c:415 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" +"Se os scripts devem ter permissão para abrir janelas popup automaticamente" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:419 msgid "Spell Checking" -msgstr "Verificação Ortográfica" +msgstr "Verificação ortográfica" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:422 msgid "Enable Spell Checking" -msgstr "Ativar Verificação Ortográfica" +msgstr "Habilitar verificação ortográfica" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:423 msgid "Enable spell checking while typing" -msgstr "Ativar verificação ortográfica ao digitar" +msgstr "Habilitar verificação ortográfica ao digitar" + +#: ../midori/midori-preferences.c:425 +msgid "Spelling dictionaries:" +msgstr "Dicionários de ortografia:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:429 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" msgstr "" "Uma lista de idiomas, separados por vírgulas, para a verificação " -"ortográfica. Por exemplo \"pt,pt__BR\"" +"ortográfica, por exemplo \"en_GB,pt_BR\"" #. Page "Interface" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:435 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:537 +#: ../midori/midori-preferences.c:436 msgid "Navigationbar" -msgstr "Barra de Navegação" +msgstr "Barra de navegação" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:446 msgid "Browsing" -msgstr "Navegar" +msgstr "Navegação" #. Page "Applications" -#: ../midori/midori-preferences.c:574 +#: ../midori/midori-preferences.c:468 msgid "Applications" -msgstr "Aplicações" +msgstr "Aplicativos" -#: ../midori/midori-preferences.c:575 +#: ../midori/midori-preferences.c:469 msgid "External applications" -msgstr "Aplicações externas" +msgstr "Aplicativos externos" #. Page "Network" -#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:649 -msgid "MB" -msgstr "MB" +#: ../midori/midori-preferences.c:492 +msgid "Hostname" +msgstr "Nome da máquina" #. Page "Privacy" -#: ../midori/midori-preferences.c:654 +#: ../midori/midori-preferences.c:511 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:655 +#: ../midori/midori-preferences.c:512 msgid "Web Cookies" msgstr "Cookies" -#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 msgid "days" msgstr "dias" -#: ../midori/midori-searchaction.c:488 ../katze/katze-arrayaction.c:335 -msgid "Empty" -msgstr "Vazio" - -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:917 msgid "Add search engine" -msgstr "Adicionar site de pesquisa" +msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:908 +#: ../midori/midori-searchaction.c:917 msgid "Edit search engine" -msgstr "Editar site de pesquisa" +msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:936 +#: ../midori/midori-searchaction.c:945 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:980 +#: ../midori/midori-searchaction.c:989 msgid "_Icon:" -msgstr "_Icone:" +msgstr "_Ícone:" -#: ../midori/midori-searchaction.c:994 +#: ../midori/midori-searchaction.c:1003 msgid "_Token:" -msgstr "_Token:" +msgstr "_Palavra-chave:" -#: ../midori/midori-searchaction.c:1213 +#: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" -msgstr "Gerenciar Sites de Pesquisa" +msgstr "Gerenciar motores de pesquisa" -#: ../midori/midori-searchaction.c:1312 +#: ../midori/midori-searchaction.c:1335 msgid "Use as _default" -msgstr "Usar por _default" +msgstr "Usar como _padrão" -#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 -msgid "Could not run external program." -msgstr "Não foi possível executar o programa externo." - -#: ../midori/sokoke.c:856 +#: ../midori/sokoke.c:1294 msgid "_Bookmark" msgstr "_Favorito" -#: ../midori/sokoke.c:858 +#: ../midori/sokoke.c:1296 msgid "Add Boo_kmark" -msgstr "Adicionar _Favorito" +msgstr "Adicionar _favorito" -#: ../midori/sokoke.c:859 +#: ../midori/sokoke.c:1297 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:860 +#: ../midori/sokoke.c:1298 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:861 +#: ../midori/sokoke.c:1299 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:862 +#: ../midori/sokoke.c:1300 msgid "_Homepage" -msgstr "_Página Inicial" +msgstr "_Página inicial" -#: ../midori/sokoke.c:863 +#: ../midori/sokoke.c:1301 msgid "_Userscripts" -msgstr "Scripts do _Usuário" +msgstr "Scripts de _usuário" -#: ../midori/sokoke.c:864 -msgid "User_styles" -msgstr "E_stilos de Usuário" +#: ../midori/sokoke.c:1302 +msgid "New _Tab" +msgstr "_Nova aba" -#: ../midori/sokoke.c:866 +#: ../midori/sokoke.c:1303 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:867 +#: ../midori/sokoke.c:1304 msgid "Netscape p_lugins" -msgstr "P_lugins do Netscape" +msgstr "P_lugins Netscape" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 -msgid "Userscripts" -msgstr "Scripts do Usuário" +#: ../midori/sokoke.c:1307 +msgid "New _Folder" +msgstr "Nova _pasta" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 -msgid "Userstyles" -msgstr "Estilos de usuário" - -#: ../panels/midori-bookmarks.c:108 +#: ../panels/midori-bookmarks.c:111 msgid "Bookmarks" msgstr "Favoritos" -#: ../panels/midori-bookmarks.c:239 +#: ../panels/midori-bookmarks.c:241 msgid "Edit the selected bookmark" -msgstr "Editar favorito selecionado" +msgstr "Editar o favorito selecionado" -#: ../panels/midori-bookmarks.c:247 +#: ../panels/midori-bookmarks.c:249 msgid "Delete the selected bookmark" -msgstr "Apagar favorito selecionado" +msgstr "Excluir o favorito selecionado" -#: ../panels/midori-bookmarks.c:260 +#: ../panels/midori-bookmarks.c:262 msgid "Add a new folder" msgstr "Adicionar nova pasta" #: ../panels/midori-bookmarks.c:592 msgid "Separator" -msgstr "Separador" +msgstr "Aba" #: ../panels/midori-console.c:87 msgid "Console" msgstr "Console" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copiar _tudo" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copiar tudo" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensões" -#: ../panels/midori-history.c:162 -msgid "Are you sure you want to remove all history items?" -msgstr "Tem certeza de que quer remover todo o histórico?" +#: ../panels/midori-history.c:273 +msgid "Erroneous clock time" +msgstr "Hora do relógio incorreta" -#: ../panels/midori-history.c:217 -msgid "Bookmark the selected history item" -msgstr "Marcar o item de histórico selecionado como favorito" +#: ../panels/midori-history.c:274 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr "O relógio está atrasado. Por favor, verifique a data e a hora atual." -#: ../panels/midori-history.c:226 -msgid "Delete the selected history item" -msgstr "Apagar item de histórico selecionado" - -#: ../panels/midori-history.c:234 -msgid "Clear the entire history" -msgstr "Limpar todo o histórico" - -#: ../panels/midori-history.c:601 +#: ../panels/midori-history.c:286 msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:288 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dia atrás" msgstr[1] "%d dias atrás" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:291 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:293 msgid "Yesterday" msgstr "Ontem" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "Plugins do Netscape" +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "Tem certeza de que quer excluir todo o histórico?" -#: ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" +#: ../panels/midori-history.c:437 +msgid "Bookmark the selected history item" +msgstr "Adicionar como favorito o item do histórico selecionado" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-history.c:446 +msgid "Delete the selected history item" +msgstr "Excluir o item do histórico selecionado" + +#: ../panels/midori-history.c:454 +msgid "Clear the entire history" +msgstr "Limpar todo o histórico" + +#: ../panels/midori-history.c:952 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtro:" + +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" -msgstr "Abrir Pas_ta de Destino" +msgstr "Abrir pas_ta de destino" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" -msgstr "Copi_ar Endereço do Link" +msgstr "Copiar loc_alização do link" -#: ../katze/katze-http-auth.c:97 +#: ../katze/katze-http-auth.c:214 msgid "Authentication Required" -msgstr "Autenticação Necessária" +msgstr "Autenticação requerida" -#: ../katze/katze-http-auth.c:113 +#: ../katze/katze-http-auth.c:230 msgid "" "A username and a password are required\n" "to open this location:" msgstr "" -"Precisa de um nome de usuário e uma senha\n" +"É necessário um nome de usuário e uma senha\n" "para abrir esta localização:" -#: ../katze/katze-http-auth.c:127 +#: ../katze/katze-http-auth.c:244 msgid "Username" -msgstr "Nome de Usuário" +msgstr "Nome de usuário" -#: ../katze/katze-http-auth.c:138 +#: ../katze/katze-http-auth.c:257 msgid "Password" msgstr "Senha" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-http-auth.c:272 +msgid "_Remember password" +msgstr "_Lembrar senha" + +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "O ícone '%s' não foi carregado" +msgstr "O ícone nomeado '%s' não pôde ser carregado" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "O ícone padrão '%s' não foi carregado" +msgstr "O ícone do estoque '%s' não pôde ser carregado" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" -msgstr "Frames de animação corrompidos" +msgstr "Os quadros de animação estão corrompidos" -#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407 +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264 +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 msgid "Choose file" -msgstr "Escolha o arquivo" +msgstr "Escolher arquivo" -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:559 msgid "Choose folder" -msgstr "Escolha a pasta" +msgstr "Escolher pasta" -#: ../extensions/adblock.c:167 +#: ../katze/katze-preferences.c:95 +#, c-format +msgid "Preferences for %s" +msgstr "Preferências para o %s" + +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" -msgstr "Configurar filtros de Propagandas" +msgstr "Configurar filtros de publicidade" -#: ../extensions/adblock.c:304 +#: ../extensions/adblock.c:447 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Digite o endereço de uma lista de filtros pré-configurada e clique em " +"\"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em " +"%s." + +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." -msgstr "Configurar filtros de _Propagandas..." +msgstr "Configurar filtros de _publicidade..." -#: ../extensions/adblock.c:562 +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "Editar regra" + +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "_Regra:" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "Bl_oquear imagem" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "Bl_oquear link" + +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" -msgstr "Bloqueador de propagandas" +msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:563 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" -msgstr "Bloquear propagandas de acordo com uma lista de sites banidos" +msgstr "Bloquear publicidade de acordo com uma lista de filtros" -#: ../extensions/colorful-tabs.c:115 -msgid "Tint tabs distinctly" -msgstr "Cores distintas para abas" +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "Copiar %s para a pasta %s." -#: ../extensions/colorful-tabs.c:151 +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Scripts de usuário" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Estilos de usuário" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "A configuração da extensão '%s' não pôde ser salva: %s\n" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Extras de usuário" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Não é possível monitorar a pasta '%s': %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Suporte a scripts e estilos de usuário" + +#: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" -msgstr "Abas Coloridas" +msgstr "Abas coloridas" -#: ../extensions/colorful-tabs.c:152 +#: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" -msgstr "Cor distinta para cada aba" +msgstr "Colorir distintamente cada aba" -#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" -msgstr "Gerenciador de Cookies" +msgstr "Gerenciador de cookies" -#: ../extensions/cookie-manager/cookie-manager-page.c:111 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Delete All" +msgstr "Excluir tudo" + +#: ../extensions/cookie-manager/cookie-manager-page.c:114 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" -"Apagar todos os cookies mostrados. Se definir um filtro, só serão eliminados " -"os cookies que coincidirem com o filtro." +"Excluir todos os cookies exibidos. Se um filtro for definido, só serão " +"excluídos os cookies que correspondam ao filtro." -#: ../extensions/cookie-manager/cookie-manager-page.c:126 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" -msgstr "Expandir Todos" +msgstr "Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:133 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" -msgstr "_Unir Todos" +msgstr "Ocultar tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:460 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" -msgstr "Deseja realmente apagar todos os cookies?" +msgstr "Deseja realmente excluir todos os cookies?" -#: ../extensions/cookie-manager/cookie-manager-page.c:462 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Pergunta" -#: ../extensions/cookie-manager/cookie-manager-page.c:471 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." -msgstr "Apenas serão apagados os cookies que coincidirem com o filtro." +msgstr "Apenas cookies que correspondam ao filtro serão excluídos." -#: ../extensions/cookie-manager/cookie-manager-page.c:539 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "No fim da sessão" -#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -1987,60 +2415,67 @@ msgid "" "Secure: %s\n" "Expires: %s" msgstr "" -"Site: %s\n" +"Servidor: %s\n" "Nome: %s\n" "Valor: %s\n" "Caminho: %s\n" "Seguro: %s\n" -"Expira: %s" +"Expiração: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Sim" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "Não" -#: ../extensions/cookie-manager/cookie-manager-page.c:811 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Domínio: %s\n" +"Cookies: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Nome" -#: ../extensions/cookie-manager/cookie-manager-page.c:862 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" -msgstr "_Expandir Todos" +msgstr "_Expandir tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:870 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" -msgstr "_Unir Todos" +msgstr "_Ocultar tudo" -#: ../extensions/cookie-manager/cookie-manager-page.c:923 -msgid "Filter:" -msgstr "Filtro:" - -#: ../extensions/cookie-manager/cookie-manager-page.c:928 +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" msgstr "" -"Introduza um filtro para mostrar apenas os cookies cujo nome ou domínio " -"coincidam com o filtro" +"Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio " +"correspondam ao filtro" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" -msgstr "Gerenciador de _Cookies" +msgstr "Gerenciador de _cookies" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "Listar, ver e apagar cookies" +msgstr "Listar, ver e excluir cookies" -#: ../extensions/feed-panel/feed-atom.c:242 +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Falha ao encontrar elementos \"entry\" do Atom nos dados XML." +msgstr "" +"Não foram encontrados os elementos Atom requeridos \"entry\" nos dados XML." -#: ../extensions/feed-panel/feed-atom.c:348 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Falha ao encontrar elementos \"feed\" do Atom nos dados XML." +msgstr "" +"Não foram encontrados os elementos Atom requeridos \"feed\" nos dados XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:399 @@ -2049,40 +2484,40 @@ msgctxt "Feed" msgid "Last updated: %s." msgstr "Última atualização: %s." -#: ../extensions/feed-panel/feed-panel.c:664 +#: ../extensions/feed-panel/feed-panel.c:671 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:717 +#: ../extensions/feed-panel/feed-panel.c:724 msgid "Add new feed" msgstr "Adicionar novo feed" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:731 msgid "Delete feed" -msgstr "Apagar feed" +msgstr "Excluir feed" -#: ../extensions/feed-panel/feed-panel.c:807 +#: ../extensions/feed-panel/feed-panel.c:814 msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:185 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "Falha ao encontrar o elemento raiz nos dados XML do feed." +msgstr "Não foi encontrado o elemento raiz nos dados XML do feed." -#: ../extensions/feed-panel/feed-parse.c:225 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." -msgstr "Formato de feed não suportado" +msgstr "Formato de feed não suportado." -#: ../extensions/feed-panel/feed-parse.c:255 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "Falha ao analisar o XML do feed: %s" +msgstr "Falha ao analisar o feed XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Falha ao encontrar elemento \"channel\" nos dados RSS XML." +msgstr "Não foi encontrado o elemento \"channel\" nos dados RSS XML." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2090,64 +2525,92 @@ msgstr "Encontrada uma versão RSS não suportada." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Falha ao encontrar elementos \"item\" de RSS nos dados XML." +msgstr "" +"Não foram encontrados os elementos RSS requeridos \"item\" nos dados XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Falha ao encontrar elementos \"channel\" de RSS nos dados XML." +msgstr "" +"Não foram encontrados os elementos RSS requeridos \"channel\" nos dados XML." -#: ../extensions/feed-panel/main.c:114 +#: ../extensions/feed-panel/main.c:132 +msgid "Error" +msgstr "Erro" + +#: ../extensions/feed-panel/main.c:134 #, c-format msgid "Feed '%s' already exists" msgstr "O feed '%s' já existe" -#: ../extensions/feed-panel/main.c:191 +#: ../extensions/feed-panel/main.c:211 #, c-format msgid "Error loading feed '%s'" msgstr "Erro ao carregar o feed '%s'" -#: ../extensions/feed-panel/main.c:331 -msgid "New feed" -msgstr "Novo feed" - -#: ../extensions/feed-panel/main.c:489 +#: ../extensions/feed-panel/main.c:522 msgid "Feed Panel" -msgstr "Painel de Feeds" +msgstr "Painel de feeds" -#: ../extensions/feed-panel/main.c:490 +#: ../extensions/feed-panel/main.c:523 msgid "Read Atom/ RSS feeds" msgstr "Ler feeds Atom/RSS" -#: ../extensions/mouse-gestures/main.c:236 -msgid "Mouse Gestures" -msgstr "Gestos de Mouse" +#: ../extensions/formhistory.c:144 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/mouse-gestures/main.c:237 +#: ../extensions/formhistory.c:510 +msgid "Stores history of entered form data" +msgstr "Armazena o histórico de dados de formulário" + +#: ../extensions/formhistory.c:514 +#, c-format +msgid "Not available: %s" +msgstr "Não disponível: %s" + +#: ../extensions/formhistory.c:515 +msgid "Resource files not installed" +msgstr "arquivos de configuração não instalados" + +#: ../extensions/formhistory.c:521 +msgid "Form history filler" +msgstr "Preenchimento de formulários" + +#: ../extensions/mouse-gestures.c:303 +msgid "Mouse Gestures" +msgstr "Gestos de mouse" + +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Controlar o Midori movendo o mouse" #. i18n: A panel showing a user specified web page #: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" -msgstr "Página padrão" +msgstr "Fixador de página" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "_Página padrão" +msgstr "Fixador de _página" -#: ../extensions/shortcuts.c:172 +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "Manter uma ou várias páginas abertas em paralelo às abas" + +#: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" msgstr "Personalizar atalhos de teclado" -#: ../extensions/shortcuts.c:264 +#: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." -msgstr "Personalizar Atalh_os..." +msgstr "Personalizar atalh_os..." -#: ../extensions/shortcuts.c:303 +#: ../extensions/shortcuts.c:315 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:304 +#: ../extensions/shortcuts.c:316 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" @@ -2159,147 +2622,101 @@ msgstr "Imagens" msgid "Scripts" msgstr "Scripts" +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Plugins Netscape" + #: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" -msgstr "Funções da barra de status" +msgstr "Funcionalidades na barra de status" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "Alternar facilmente as funções ligado/desligado nas páginas web" +msgstr "Ligar/desligar facilmente funcionalidades das páginas web" -#: ../extensions/tab-panel.c:383 ../extensions/tab-panel.c:443 +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" -msgstr "Painel de Abas" +msgstr "Painel de abas" -#: ../extensions/tab-panel.c:427 +#: ../extensions/tab-panel.c:609 msgid "T_ab Panel" -msgstr "P_ainel de Abas" +msgstr "P_ainel de abas" -#: ../extensions/tab-panel.c:444 +#: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" -msgstr "Mostrar abas em painel vertical" +msgstr "Exibir as abas num painel vertical" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/tab-switcher.c:395 +msgid "Tab History List" +msgstr "Lista do histórico de abas" + +#: ../extensions/tab-switcher.c:396 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" +"Permite mudar de abas ao escolher de uma lista ordenada pelo último uso" + +#: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" -msgstr "Personalizar Barra de Ferramentas" +msgstr "Personalizar barra de ferramentas" -#: ../extensions/toolbar-editor.c:407 +#: ../extensions/toolbar-editor.c:405 msgid "" "Select items to be displayed on the toolbar. Items can be reodered by drag " "and drop." msgstr "" -"Selecione os itens a mostar na barra de ferramentas. Os itens podem ser " -"ordenados por arrastamento." +"Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem " +"ser reordenados ao arrastar e soltar." -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:421 msgid "Available Items" -msgstr "Itens Disponíveis" +msgstr "Itens disponíveis" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:442 msgid "Displayed Items" -msgstr "Itens Apresentados" +msgstr "Itens exibidos" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:577 msgid "Customize _Toolbar..." -msgstr "Personalizar Barra de _Ferramentas..." +msgstr "Personalizar barra de _ferramentas..." -#: ../extensions/toolbar-editor.c:611 +#: ../extensions/toolbar-editor.c:608 msgid "Toolbar Editor" -msgstr "Editor da Barra de Ferramentas" +msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:609 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" -#~ msgid "_Closed Tabs and Windows" -#~ msgstr "Abas e Janelas Fe_chadas" +#: ../extensions/web-cache.c:465 +msgid "Cache HTTP communication on disk" +msgstr "Pôr comunicações HTTP em cache" -#~ msgid "Last open pages" -#~ msgstr "Últimas páginas abertas" +#~ msgid "Open _Link" +#~ msgstr "Abrir _link" -#~ msgid "Both" -#~ msgstr "Texto e Ícones" +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copiar scripts de usuário para a pasta %s e copiar estilos de usuário " +#~ "para a pasta %s." -#~ msgid "Both horizontal" -#~ msgstr "Ambos na horizontal" +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "Abrir imagem em nova ja_nela" -#~ msgid "Load on Startup" -#~ msgstr "Carregar ao Iniciar" +#~ msgid "REGEX" +#~ msgstr "REGEX" -#~ msgid "Download Folder" -#~ msgstr "Pasta de Transferências" +#~ msgid "Not available on this platform" +#~ msgstr "Não disponível para esta plataforma" -#~ msgid "Configure _Toolbar..." -#~ msgstr "Configurar Barra de Ferramentas" +#~ msgid "Failed to get current time: %s\n" +#~ msgstr "Falha na obtenção da hora atual: %s\n" -#~ msgid "_Quick Find" -#~ msgstr "Localização _Rápida" +#~ msgid "Failed to add history item: %s\n" +#~ msgstr "Falha ao adicionar item do histórico: %s\n" -#~ msgid "Quickly jump to a word or phrase" -#~ msgstr "Avanço rápido para palavra ou frase" +#~ msgid "Show panel _titles" +#~ msgstr "Exibir _títulos do painel" -#~ msgid "Whether to detach the chosen panel from the window" -#~ msgstr "Marque se quiser separar da janela o painel escolhido" - -#~ msgid "Search" -#~ msgstr "Procurar" - -#~ msgid "Warning: You are using a superuser account!" -#~ msgstr "Aviso: Você está usando uma conta de super-usuário!" - -#~ msgid "_Enable" -#~ msgstr "_Activar" - -#~ msgid "Enable" -#~ msgstr "Ativar" - -#~ msgid "_Disable" -#~ msgstr "_Desativar" - -#~ msgid "Disable" -#~ msgstr "Desativar" - -#~ msgid "%d days ago" -#~ msgstr "%d dias atrás" - -#~ msgid "P_lugins" -#~ msgstr "P_lugins" - -#~ msgid "Plugins" -#~ msgstr "Plugins" - -#~ msgid "%s has no property '%s'" -#~ msgstr "%s não tem a propriedade '%s'" - -#~ msgid "%s cannot be assigned to %s.%s" -#~ msgstr "%s não pode ser atribuído a %s.%s" - -#~ msgid "%s.%s cannot be accessed" -#~ msgstr "%s. Não pode acessar %s" - -#~ msgid "Source" -#~ msgstr "Origem" - -#~ msgid "URIs" -#~ msgstr "URIs" - -#~ msgid "[URIs]" -#~ msgstr "[URIs]" - -#~ msgid "_URL:" -#~ msgstr "_URL:" - -#~ msgid "Root" -#~ msgstr "Administrador" - -#~ msgid "HTTP Proxy" -#~ msgstr "HTTP Proxy" - -#~ msgid "Open URL in New _Tab" -#~ msgstr "Abrir URL em Nova _Aba" - -#~ msgid "_Icon (name or file):" -#~ msgstr "_Ícone (nome ou arquivo):" - -#~ msgid "Manage search engines" -#~ msgstr "Gerir sites de procura" +#~ msgid "Options" +#~ msgstr "Opções" From 516ce0425eba543db1bf674ca42f4252d6fdd9e8 Mon Sep 17 00:00:00 2001 From: Robert Hartl Date: Sat, 26 Jun 2010 00:03:39 +0200 Subject: [PATCH 2733/2970] l10n: Updated Slovak (sk) translation to 93% New status: 591 messages complete with 8 fuzzies and 36 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/sk.po | 1138 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 601 insertions(+), 537 deletions(-) diff --git a/po/sk.po b/po/sk.po index ecd770fb..90a5b30d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9-3345559\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-25 10:08+0000\n" +"POT-Creation-Date: 2010-06-25 16:26+0000\n" "PO-Revision-Date: 2010-03-08 12:24+0100\n" "Last-Translator: Robert Hartl \n" "Language-Team: Slovak \n" @@ -19,9 +19,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Ľahký internetový prehliadač" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -44,7 +44,7 @@ msgstr "Hodnota '%s' nie je platná pre %s" msgid "Invalid configuration value '%s'" msgstr "Neplatná hodnota '%s' v konfigurácii" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Zlyhalo otvorenie databázy: %s\n" @@ -55,172 +55,172 @@ msgstr "Zlyhalo otvorenie databázy: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Nepodarilo sa odstrániť staré položky histórie: %s\n" -#: ../midori/main.c:445 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Nastavenie sa nepodarilo uložiť. %s" - -#: ../midori/main.c:483 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Vyhľadávače sa nepodarilo uložiť. %s" - -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky sa nepodarilo uložiť. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Nastavenie sa nepodarilo uložiť. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Vyhľadávače sa nepodarilo uložiť. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Zoznam zavretých kariet sa nepodarilo uložiť %s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sedenie sa nepodarilo uložiť. %s" -#: ../midori/main.c:868 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nie sú k dispozícií žiadne koreňové certifikáty. SSL certifikáty nemôžu byť overené." -#: ../midori/main.c:958 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Zdá sa, če Midori nebolo naposledy riadne ukončené. Ak sa to stáva opakovane, pre odstránenie problému skúste nasledujúce možnosti." -#: ../midori/main.c:973 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Zmeniť _predvoľby" -#: ../midori/main.c:977 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Vymazať posledne _sedenie" -#: ../midori/main.c:982 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Zakázať všetky _rozšírenia" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sedenie nie je možné načítať: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Nebol zadaný názov súboru" -#: ../midori/main.c:1355 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Nastala neznáma chyba." -#: ../midori/main.c:1386 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímok uložený do: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Spustiť ADDRESS ako webovú aplikáciu" -#: ../midori/main.c:1557 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1560 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Použiť PRIEČINOK ako konfiguračný priečinok" -#: ../midori/main.c:1560 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "PRIEČINOK" -#: ../midori/main.c:1563 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/main.c:1565 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Spustiť zadaný názov súboru ako javaskript" -#: ../midori/main.c:1568 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Urobiť snímok požadovanej URI" -#: ../midori/main.c:1571 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Spustiť zadaný príkaz" -#: ../midori/main.c:1573 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Zobraziť verziu programu" -#: ../midori/main.c:1575 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1577 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1577 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1581 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEKUNDY" -#: ../midori/main.c:1661 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Vaše komentáre, požiadavky a chyby prosím posielajte na:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Skontrolovať nové verzie na:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfiguračný priečinok nie je platný." -#: ../midori/main.c:1836 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori síce beži, ale neodpovedá.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhľadávacie nástroje nemôžu byť načítané.%s\n" -#: ../midori/main.c:1920 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +#: ../midori/main.c:1877 +#, fuzzy, c-format +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nie je možné načítať: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zatvorené karty nemôžu byť načítane: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Históriu nie je možné načítať: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Došlo k nasledujúcim chybám:" -#: ../midori/main.c:1996 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Ignorovať" @@ -237,800 +237,752 @@ msgstr "Nesprávny formát dokumentu." msgid "Unrecognized bookmark format." msgstr "Neznámy formát záložiek" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Zapisovanie zlyhalo." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5251 msgid "Reload the current page" msgstr "Obnoviť aktuálnu stránku" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5248 msgid "Stop loading the current page" msgstr "Zastaviť načítanie aktuálnej stránky" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% načítaný" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodarilo sa aktualizovať titulok: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Neočakávaná akcia '%s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Nový priečinok" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Upraviť priečinok" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Upraviť záložku" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Názov:" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Poznámka:" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4401 msgid "_Folder:" msgstr "_Priečinok:" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4406 ../midori/midori-browser.c:4438 msgid "Toplevel folder" msgstr "Priečinok najvyššej úrovne" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Pridať do _rýchleho prístupu" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Zobraziť v paneli _nástrojov" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Spustiť ako _webovú aplikáciu" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nie je dosť miesta pre stiahnutie \"%s\"." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "Potrebuje %s, ale k dispozícií je iba %s." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4488 msgid "Save file as" msgstr "Uložiť súbor ako" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s z %s" - -#: ../midori/midori-browser.c:1456 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Súbor '%s' bol stiahnutý." - -#: ../midori/midori-browser.c:1460 -msgid "Transfer completed" -msgstr "Prenos dokončený" - -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Uložiť súbor" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -msgid "Some files are being downloaded" -msgstr "Ešte sa sťahujú nejaké súbory" - -#: ../midori/midori-browser.c:1923 -msgid "_Quit Midori" -msgstr "_Ukončiť Midori" - -#: ../midori/midori-browser.c:1925 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Ukončením Midori budú prenosy zrušené." - -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2230 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5310 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Pridať novú záložku" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodarilo sa spustiť databázový príkaz: %s\n" -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdne" -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nie je možné spustiť externý program" -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5694 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodarilo sa vložiť novú položku histórie: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Otvoriť všetky na _kartách" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4101 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otvoriť na novej _karte" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4104 ../midori/midori-view.c:2424 +#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otvoriť v novom _okne" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:4327 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:4328 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:4329 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:4330 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:4331 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4352 msgid "Import bookmarks..." msgstr "Importovať záložky..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5315 msgid "_Import bookmarks" msgstr "_Importovať záložky" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4366 msgid "_Application:" msgstr "_Aplikácia:" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 +#: ../midori/midori-browser.c:4393 ../midori/midori-browser.c:5419 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastné..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4467 msgid "Failed to import bookmarks" msgstr "Nepodarilo sa importovať záložky" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4503 msgid "Failed to export bookmarks" msgstr "Nepodarilo sa exportovať záložky" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4557 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodarilo sa odstrániť položku histórie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4664 msgid "Clear Private Data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4668 msgid "_Clear private data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4682 msgid "Clear the following data:" msgstr "Odstrániť nasledujúce údaje:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4693 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "História" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4699 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4704 msgid "'Flash' Cookies" msgstr "Cookies z Flash" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4709 msgid "Website icons" msgstr "Ikony webových stránok" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4714 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zatvorené karty" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4719 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Vyrovnávacia pamäť stránok" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4727 msgid "Clear private data when _quitting Midori" msgstr "Odstrániť súkromné údaje pri _ukončení Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4828 msgid "A lightweight web browser." msgstr "Ľahký internetový prehliadač." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4830 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4849 msgid "translator-credits" msgstr "Robert Hartl 2009" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5158 msgid "_File" msgstr "_Súbor" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5160 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5161 msgid "Open a new window" msgstr "Otvoriť nové okno" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5164 msgid "Open a new tab" msgstr "Otvoriť novú kartu" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5166 msgid "P_rivate Browsing" msgstr "_Súkromné prehliadanie" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5167 msgid "Don't save any private data while browsing" msgstr "Neukladať pri prehliadaní žiadne súkromné dáta" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5171 msgid "Open a file" msgstr "Otvoriť súbor" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5174 msgid "Save to a file" msgstr "Uložiť do súboru" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5176 msgid "Add to Speed _dial" msgstr "Pridať do _Rýchleho prístupu" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5177 msgid "Add shortcut to speed dial" msgstr "Pridať odkaz do rýchleho prístupu" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5179 msgid "Add Shortcut to the _desktop" msgstr "Pridať záložku na _plochu" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:5180 msgid "Add shortcut to the desktop" msgstr "Pridá záložku na plochu" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to News _feed" msgstr "Pridať _kanál" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5183 msgid "Subscribe to this news feed" msgstr "Pridá tento kanál do odoberaných kanálov" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5188 msgid "_Close Tab" msgstr "_Zatvoriť kartu" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5189 msgid "Close the current tab" msgstr "Zatvoriť aktívnu kartu" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5191 msgid "C_lose Window" msgstr "_Zatvoriť okno" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5192 msgid "Close this window" msgstr "Zatvoriť toto okno" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5195 msgid "Print the current page" msgstr "Vytlačiť aktuálnu stránku" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5198 msgid "Quit the application" msgstr "Ukončiť aplikáciu" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5200 msgid "_Edit" msgstr "_Upraviť" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5204 msgid "Undo the last modification" msgstr "Vrátiť poslednú zmenu" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:5207 msgid "Redo the last modification" msgstr "Znova použiť poslednú zmenu" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5211 msgid "Cut the selected text" msgstr "Vystrihnúť vybraný text" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5214 ../midori/midori-browser.c:5217 msgid "Copy the selected text" msgstr "Kopírovať vybraný text" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5220 msgid "Paste text from the clipboard" msgstr "Prilepiť vybraný text" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:5223 msgid "Delete the selected text" msgstr "Odstrániť označený text" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:5226 msgid "Select all text" msgstr "Vybrať všetok text" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5229 msgid "Find a word or phrase in the page" msgstr "Hľadať slovo alebo frázu na stránke" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5231 msgid "Find _Next" msgstr "Hľadať _ďalšie" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5232 msgid "Find the next occurrence of a word or phrase" msgstr "Hľadať ďalší výskyt slova alebo frázy" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5234 msgid "Find _Previous" msgstr "Hľadať _predchádzajúce" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:5235 msgid "Find the previous occurrence of a word or phrase" msgstr "Hľadať predchádzajúce slovo alebo frázu" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "Nastaviť možnosti aplikácie" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "_Zobraziť" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "_Panely s nástrojmi" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:5254 msgid "Increase the zoom level" msgstr "Priblížiť" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:5257 msgid "Decrease the zoom level" msgstr "Oddialiť" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:5260 msgid "Reset the zoom level" msgstr "Nastaviť pôvodné priblíženie" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:5261 msgid "_Encoding" msgstr "_Kódovanie" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:5263 msgid "View So_urce" msgstr "Zobraziť _zdrojový kód" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:5264 msgid "View the source code of the page" msgstr "Zobraziť zdrojový kód stránky" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5267 msgid "Toggle fullscreen view" msgstr "Prepnúť zobrazenie na celú obrazovku" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:5270 msgid "Scroll _Left" msgstr "Rolovať _vľavo" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5271 msgid "Scroll to the left" msgstr "" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:5273 msgid "Scroll _Down" msgstr "Rolovať _dole" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:5274 msgid "Scroll down" msgstr "" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:5276 msgid "Scroll _Up" msgstr "Rolovať na_hore" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:5277 msgid "Scroll up" msgstr "" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5279 msgid "Scroll _Right" msgstr "Rolovať v_pravo" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5280 msgid "Scroll to the right" msgstr "" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:5283 msgid "_Go" msgstr "P_rejsť" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:5286 msgid "Go back to the previous page" msgstr "Späť na predchádzajúcu stránku" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5289 msgid "Go forward to the next page" msgstr "Dopredu na nasledujúcu stránku" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5293 #, fuzzy msgid "Go to the previous sub-page" msgstr "Späť na predchádzajúcu stránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5297 #, fuzzy msgid "Go to the next sub-page" msgstr "Dopredu na nasledujúcu stránku" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:5300 msgid "Go to your homepage" msgstr "Ísť na domovskú stránku" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:5302 msgid "Empty Trash" msgstr "Vysypať kôš" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:5303 msgid "Delete the contents of the trash" msgstr "Zmaže zoznam zatvorených kariet" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5305 msgid "Undo _Close Tab" msgstr "Obnoviť _zatvorenú kartu" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5306 msgid "Open the last closed tab" msgstr "Otvoriť naposledy zatvorenú kartu" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5312 msgid "Add a new _folder" msgstr "Pridať nový priečinok" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5313 msgid "Add a new bookmark folder" msgstr "Pridať nový priečinok do záložiek" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:5318 msgid "_Export bookmarks" msgstr "_Exportovať záložky" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5321 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Správca vyhľadávacích modulov" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5322 msgid "Add, edit and remove search engines..." msgstr "Pridáva, upravuje a maže vyhľadávacie moduly..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5325 msgid "_Clear Private Data" msgstr "_Odstrániť súkromné údaje" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5326 msgid "Clear private data..." msgstr "Odstráni súkromné údaje..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5330 msgid "_Inspect Page" msgstr "_Preskúmať stránku" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5331 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5336 msgid "_Previous Tab" msgstr "_Predchádzajúca karta" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5337 msgid "Switch to the previous tab" msgstr "Prepnúť na predchádzajúcu kartu" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5339 msgid "_Next Tab" msgstr "_Ďalšia karta" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5340 msgid "Switch to the next tab" msgstr "Prepnúť na nasledujúcu kartu" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5342 msgid "Focus _Current Tab" msgstr "Zamerať _aktuálnu kartu" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5343 msgid "Focus the current tab" msgstr "Zameria aktuálnu kartu" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5345 msgid "Open last _session" msgstr "Otvoriť posledné _sedenie" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5346 msgid "Open the tabs saved in the last session" msgstr "Otvorí karty uložené pri poslednom sedení" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5348 msgid "_Help" msgstr "_Pomocník" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5350 msgid "_Contents" msgstr "_Obsah pomocníka" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5351 msgid "Show the documentation" msgstr "Zobraziť dokumentáciu" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5353 msgid "_Frequent Questions" msgstr "_Časté otázky" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5354 msgid "Show the Frequently Asked Questions" msgstr "Zobraziť Často kladené otázky" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5356 msgid "_Report a Bug" msgstr "_Ohlásiť chybu" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5357 msgid "Open Midori's bug tracker" msgstr "Otvorí stránku pre hlásenie chýb" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5360 msgid "Show information about the program" msgstr "Zobrazí informácie o programe" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5368 msgid "_Menubar" msgstr "Panel _ponuky" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5369 msgid "Show menubar" msgstr "Zobraziť panel ponuky" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5372 msgid "_Navigationbar" msgstr "_Navigačný panel" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5373 msgid "Show navigationbar" msgstr "Zobraziť navigačný panel" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5376 msgid "Side_panel" msgstr "_Bočný panel" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5377 msgid "Show sidepanel" msgstr "Zobraziť bočný panel" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5380 msgid "_Bookmarkbar" msgstr "Panel _záložiek" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5381 msgid "Show bookmarkbar" msgstr "Zobraziť panel záložiek" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5384 msgid "_Transferbar" msgstr "Stav _prenosu" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5385 msgid "Show transferbar" msgstr "Zobraziť stav prenosu dát" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5388 msgid "_Statusbar" msgstr "_Stavový riadok" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5389 msgid "Show statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5397 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5400 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Čínske (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5404 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Kórejské (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5416 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Západné (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:5950 msgid "_Separator" msgstr "_Oddeľovač" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:5957 msgid "_Location..." msgstr "_Umiestnenie..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:5959 msgid "Open a particular location" msgstr "Otvoriť umiestnenie" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:5983 msgid "_Web Search..." msgstr "_Hľadať na webe..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:5985 msgid "Run a web search" msgstr "Spustí vyhľadávanie na webe" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:6006 msgid "Reopen a previously closed tab or window" msgstr "Znovu otvoriť zatvorenú kartu alebo okno" -#: ../midori/midori-browser.c:6365 +#: ../midori/midori-browser.c:6021 msgid "_Recently visited pages" msgstr "_Nedávno navštívené stránky" -#: ../midori/midori-browser.c:6367 +#: ../midori/midori-browser.c:6023 msgid "Reopen pages that you visited earlier" msgstr "Znovu otvorí stránky, ktoré ste už navštívili" -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6038 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:6040 msgid "Show the saved bookmarks" msgstr "Zobrazí uložené záložky" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:6055 msgid "_Tools" msgstr "_Nástroje" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:6068 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:6070 msgid "Show a list of all open tabs" msgstr "Zobraziť zoznam všetkých otvorených kariet" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:6084 msgid "_Menu" msgstr "_Ponuka" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:6086 msgid "Menu" msgstr "_Ponuka" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 -msgid "_Inline Find:" -msgstr "_Rýchle hľadanie" - -#: ../midori/midori-browser.c:6665 -msgid "Previous" -msgstr "Predchádzajúce" - -#: ../midori/midori-browser.c:6670 -msgid "Next" -msgstr "Ďalšie" - -#: ../midori/midori-browser.c:6675 -msgid "Match Case" -msgstr "Rozlišovať veľkosť písma" - -#: ../midori/midori-browser.c:6684 -msgid "Highlight Matches" -msgstr "Zvýrazniť" - -#: ../midori/midori-browser.c:6696 -msgid "Close Findbar" -msgstr "Zatvoriť vyhľadávaciu lištu" - -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Zmazať všetko" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6667 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočakávané nastavenie '%s'" @@ -1077,7 +1029,7 @@ msgstr "Zatvoriť panel" msgid "Align sidepanel to the left" msgstr "Umiestnenie bočného panelu vľavo" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Schovať ovládacie prvky" @@ -1093,583 +1045,586 @@ msgstr "Zobraziť domovskú stránku" msgid "Show last open tabs" msgstr "Zobraziť naposledy otvorené karty" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Zobraziť naposledy otvorené karty bez načítania" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "na novú kartu" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "v novom okne" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "na otvorenej karte" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Predvolený" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Malé ikony" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Ikony a text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Text pod ikonami" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Automaticky (GNOME alebo iné prostredie)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "HTTTP proxy server" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Žiadny" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Všetky cookies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Cookies sedenia" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 msgid "None" msgstr "Žiadne" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Zapamätať si poslednú veľkosť okna" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Prajete si ukladať poslednú veľkosť okna?" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Posledná šírka okna" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Naposledy uložená šírka okna" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Posledná výška okna" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Posledná pozícia panela" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Uložená posledná pozícia panela" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Posledná stránka panelu" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Posledná uložená stránka panala" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Rýchle hľadanie na webe" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Zobraziť panel pouky" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Zobrazovať ponuku?" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Zobraziť vyhľadávaciu lištu" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Zobrazovať vyhľadávaciu lištu?" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Zobraziť záložky" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Zobrazovať panel záložiek?" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Zobraziť panel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Má sa zobrazovať panel?" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Zobraziť stav prenosu" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Zobraziť stavový riadok" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Štýl panelu s nástrojmi:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Zobraziť priebeh v riadku adresy" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Zobrazovať výsledky hľadania pri zadávaní adresy" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovanie výsledkov vyhľadávania pri zadávaní adresy" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Položky panelu nástrojov" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Položky, ktoré sa budú zobrazovať na paneli nástrojov" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Kompaktný bočný panel" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Má sa zobrazovať bočný panel kompaktne?" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Zobraziť zoznam nástrojov" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Má zobrazovať zoznam nástrojov?" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Umiestniť bočný panel vpravo" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Presunúť bočný panel na opačnú stranu" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Otvoriť panely v samostatných oknách" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Pri spustení Midori:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Čo robiť pri spustení Midori?" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Zobraziť dialóg po spadnutí" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Zobrazí dialóg po spadnutí Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Zobraziť rýchly prístup na nových kartách" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Zobrazí rýchly prístup v novo otvorených kartách" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Uložiť stiahnuté súbory do:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Spýtať sa na cieľový priečinok" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Upozorniť po dokončení prenosu" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Správca sťahovania" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Externý správca sťahovania" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Externý textový editor" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Čítačka RSS" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Externá čítačka správ RSS" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Vyhľadávanie v adresnom riadku" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Vyhľadávanie použité v riadku s adresou" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Preferované kódovanie" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Preferované kódovanie znakov" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Vždy zobrazovať karty" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Vždy zobrazí panel kariet" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Zobrazí zatváracie tlačidlá na kartách" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Otvárať nové stránky v:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Kde sa budú otvárať nové stránky" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Otvárať externé stránky v:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Kde sa budú otvárať externé stránky" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Kliknutím prostredného. tlačítka otvoriť vybraný text" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Prostredné tlačítko myši otvorí adresu, ktorá je vo vybranom texte" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Otvárať karty na pozadí" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Otvorené karty sa otvárajú na pozadí" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Otvoriť karty vedľa aktívnej" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta sa otvorí vedľa aktívnej" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Otvárať vyskakujúce okná na kartách" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovacie okno sa otvorí v novej karte" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Automaticky načítať obrázky" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Načíta a zobrazí obrázky automaticky" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Povoliť skripty" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Povolí vložené skriptové jazyky" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Povoliť pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Povolí pluginové objekty prehliadača Netscape (Mozilla)" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Povoliť podporu databázy HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Či povoliť databázu HTML5" -#: ../midori/midori-websettings.c:891 -msgid "Enable HTML5 local storage support" -msgstr "" - #: ../midori/midori-websettings.c:892 -msgid "Whether to enable HTML5 local storage support" -msgstr "" +msgid "Enable HTML5 local storage support" +msgstr "Povoliť miestne úložisko pre HTML5" -#: ../midori/midori-websettings.c:900 -#, fuzzy -msgid "Enable offline web application cache" -msgstr "Spustiť ako _webovú aplikáciu" +#: ../midori/midori-websettings.c:893 +msgid "Whether to enable HTML5 local storage support" +msgstr "Či povoliť miestne úložisko dát pre HTML5" #: ../midori/midori-websettings.c:901 +msgid "Enable offline web application cache" +msgstr "Povoliť cache pre offline aplikácie" + +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Zväčšovať text aj obrázky" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Upravovať text aj obrázky pri menení veľkosti?" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Hľadať pri písaní" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Hľadať text pri písaní?" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Kinetické rolovanie" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Má sa naklonením zariadenia rolovať?" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Povoliť cookies" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Ktorý typ cookies prijímať" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Len originálne cookies" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Uchovávať cookies maximálne" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Maximálny počet dní, pre ktoré sú cookies platné" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Zapamätať si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Maximálna dĺžka histórie" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Pamätať si naposledy stiahnuté súbory" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Poli pamätanie si zoznam súborov, ktoré boli naposledy stiahnuté" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Typ proxy servera" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Nastavenie proxy serveru pre HTTP spojenie" -#: ../midori/midori-websettings.c:1073 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Zistiť proxy server automaticky" -#: ../midori/midori-websettings.c:1074 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Povolí automatické zisťovanie proxy servera" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Identifikovať sa ako" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Ako sa hlási webovým stránkam" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Identifikačný reťazec" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Identifikačný reťazec aplikácie" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Uprednostňované jazyky" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Odstrániť súkromné údaje" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Osobné dáta boli označené k vymazaniu" @@ -1677,8 +1632,8 @@ msgstr "Osobné dáta boli označené k vymazaniu" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4567 +#: ../midori/midori-view.c:4571 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1698,193 +1653,217 @@ msgstr "Skúsiť znovu" msgid "Not found - %s" msgstr "Nenašlo sa - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 #, c-format msgid "Send a message to %s" msgstr "Poslať %s správu" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 msgid "Inspect _Element" msgstr "Preskúmať _prvok" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 msgid "Open Link in New _Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2203 #, fuzzy msgid "Open Link in _Foreground Tab" msgstr "Otvoriť odkaz na novej _karte" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2204 msgid "Open Link in _Background Tab" msgstr "Otvoriť odkaz v novej karte na pozadí" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 msgid "Open Link in New _Window" msgstr "Otvoriť odkaz v novom _okne" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2210 msgid "Open Link as Web A_pplication" msgstr "Otvoriť odkaz ako _webovú aplikáciu" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2213 msgid "Copy Link de_stination" msgstr "Kopírovať _cieľ odkazu" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 msgid "_Save Link destination" msgstr "_Uložiť cieľ odkazu" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 msgid "_Download Link destination" msgstr "_Stiahnuť cieľ odkazu" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 +#: ../midori/midori-view.c:2293 msgid "Download with Download _Manager" msgstr "Stiahnuť pomocou _správcu sťahovania" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2230 msgid "Open _Image in New Tab" msgstr "Otvoriť _obrázok na novej karte" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2233 msgid "Copy Image _Address" msgstr "Kopírovať _adresu obrázka" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2236 msgid "Save I_mage" msgstr "Uložiť _obrázok" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2237 msgid "Download I_mage" msgstr "Stiahnuť o_brázok" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2244 msgid "Copy Video _Address" msgstr "Kopírovať _adresu videa" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Save _Video" msgstr "Uložiť _video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Download _Video" msgstr "Stiahnuť v_ideo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2310 msgid "Search _with" msgstr "Hľadať _pomocou" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 msgid "_Search the Web" msgstr "_Hľadať na webe" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2373 msgid "Open Address in New _Tab" msgstr "Otvoriť adresu v novej karte" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2674 msgid "Open or download file" msgstr "Otvoriť alebo stiahnuť súbor" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2693 #, c-format msgid "File Type: '%s'" msgstr "Typ súboru: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2696 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ súboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2700 #, c-format msgid "Open %s" msgstr "Otvoriť %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3244 #, c-format msgid "Inspect page - %s" msgstr "Inšpekcia stránky - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3526 msgid "Speed dial" msgstr "Rýchly prístup" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3527 msgid "Click to add a shortcut" msgstr "Kliknite pre pridanie odkazu" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3528 msgid "Enter shortcut address" msgstr "Zadajte adresu skratky" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3529 msgid "Enter shortcut title" msgstr "Zadajte titulok skratky" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3530 msgid "Are you sure you want to delete this shortcut?" msgstr "Naozaj chcete zmazať túto záložku?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Zmeniť počet stĺpcov" +#: ../midori/midori-view.c:3531 +msgid "Set number of columns and rows" +msgstr "Zmeniť počet stĺpcov a riadkov" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Vložte počet stĺpcov" +#: ../midori/midori-view.c:3532 +msgid "Enter number of columns and rows:" +msgstr "Vložte počet stĺpcov a riadkov" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Zmeniť počet záložiek" +#: ../midori/midori-view.c:3533 +msgid "Invalid input for the size of the speed dial" +msgstr "" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Vložte počet záložiek" +#: ../midori/midori-view.c:3534 +msgid "Thumb size:" +msgstr "Veľkosť náhľadov:" #: ../midori/midori-view.c:3535 +msgid "Small" +msgstr "Malá" + +#: ../midori/midori-view.c:3536 +msgid "Medium" +msgstr "Stredná" + +#: ../midori/midori-view.c:3537 +msgid "Big" +msgstr "Veľká" + +#: ../midori/midori-view.c:3563 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemôže byť zobrazený" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3586 #, c-format msgid "No documentation installed" msgstr "Dokumentácia nie je nainštalovaná" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3707 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:3708 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:3709 +msgid "Load Page" +msgstr "" + +#: ../midori/midori-view.c:3853 msgid "Blank page" msgstr "Prázdnu stránku" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4107 msgid "_Duplicate Tab" msgstr "Z_dvojiť kartu" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4112 msgid "_Restore Tab" msgstr "_Obnoviť kartu" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4112 msgid "_Minimize Tab" msgstr "_Minimalizovať kartu" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4118 msgid "Close ot_her Tabs" msgstr "_Zatvorí ostatné karty" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4804 msgid "Print background images" msgstr "Tlačiť obrázky na pozadí" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4805 msgid "Whether background images should be printed" msgstr "Povolí tlačenie obrázkov na pozadí" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funkcie" @@ -2060,67 +2039,127 @@ msgstr "Správca vyhľadávacích modulov" msgid "Use as _default" msgstr "Použiť ako _predvolený" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Záložka" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Pridať záložku" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Rozšírenia" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_História" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Užívateľské skripty" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Prenosy" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Pluginy _Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Nový _priečinok" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Rýchle hľadanie" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Predchádzajúce" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Ďalšie" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Rozlišovať veľkosť písma" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Zvýrazniť" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Zatvoriť vyhľadávaciu lištu" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Súbor '%s' bol stiahnutý." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Prenos dokončený" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Zmazať všetko" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Ešte sa sťahujú nejaké súbory" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Ukončiť Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Ukončením Midori budú prenosy zrušené." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:244 +#, fuzzy, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Nepodarilo sa pridať položku do histórie: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Upraviť vybranú záložku" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Vymazať označenú záložku" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Pridať nový priečinok" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Oddeľovač" @@ -2308,7 +2347,7 @@ msgstr "Nastavenie sa nepodarilo uložiť. %s" #: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" -msgstr "" +msgstr "Užívateľove rozšírenia" #: ../extensions/addons.c:1210 #, c-format @@ -2422,6 +2461,20 @@ msgstr "Správca _cookies" msgid "List, view and delete cookies" msgstr "Zoznam, detaily a mazanie cookies" +#: ../extensions/copy-tabs.c:39 +#, fuzzy +msgid "Copy Tab _Addresses" +msgstr "Kopírovať _adresu obrázka" + +#: ../extensions/copy-tabs.c:98 +#, fuzzy +msgid "Copy Addresses of Tabs" +msgstr "Otvoriť adresu v novej karte" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Nepodarilo sa nájsť požadované prvky Atom \"entry\" v dátach XML." @@ -2431,25 +2484,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Nepodarilo sa nájsť požadované prvky Atom \"feed\" v dátach XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Posledná aktualizácia: %s" -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Kanály" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Pridať nový kanál" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Odstrániť kanál" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Kanály" @@ -2484,25 +2537,25 @@ msgstr "Nepodarilo sa nájsť požadované prvky RSS \"item\" v dátach XML." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nepodarilo sa nájsť požadované prvky RSS \"channel\" v dátach XML." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Chyba" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Kanál \"%s\" je už pridaný" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Chyba pri načítavaní kanálu \"%s\"" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Panel kanálov" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Čítač Atom/RSS kanálov" @@ -2526,7 +2579,7 @@ msgstr "Nie sú nainštalované súbory so zdrojom" #: ../extensions/formhistory.c:521 msgid "Form history filler" -msgstr "" +msgstr "Ukladanie hodnôt vo formulári" #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" @@ -2597,14 +2650,22 @@ msgstr "Panel _záložiek" msgid "Show tabs in a vertical panel" msgstr "Zobraziť karty vo vertikálnom panely" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Karta histórie" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Minimalizovať otvorené karty" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Upraviť panel" @@ -2637,6 +2698,12 @@ msgstr "Umožňuje jednoducho zmeniť panel" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" +#~ msgid "Set number of shortcuts" +#~ msgstr "Zmeniť počet záložiek" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Vložte počet záložiek" + #~ msgid "Open _Link" #~ msgstr "Otvoriť _odkaz" @@ -2649,9 +2716,6 @@ msgstr "Kešuje (ukladá) HTTP komunikáciu na disk" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Nepodarilo sa zistiť aktuálny čas: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Nepodarilo sa pridať položku do histórie: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Zobraziť _titulky panelov" From facd02f1f22e5cfed9a5f24c10be5092c7cb4418 Mon Sep 17 00:00:00 2001 From: Xu Meihong Date: Sat, 26 Jun 2010 06:17:58 +0200 Subject: [PATCH 2734/2970] l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 635 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/zh_CN.po | 763 +++++++++++++++++++++++++++------------------------- 1 file changed, 395 insertions(+), 368 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 71e48c8f..5d6a5ee7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-06 22:08+0000\n" -"PO-Revision-Date: 2010-06-07 08:46+0800\n" +"POT-Creation-Date: 2010-06-25 22:08+0000\n" +"PO-Revision-Date: 2010-06-26 12:19+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "轻量的网页浏览器" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -45,7 +45,7 @@ msgstr "值 '%s' 在 %s 中无效" msgid "Invalid configuration value '%s'" msgstr "无效的设置值 '%s'" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "打开数据库失败: %s\n" @@ -56,38 +56,38 @@ msgstr "打开数据库失败: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "删除旧的历史项目失败: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "配置无法保存。%s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "搜索引擎无法保存。%s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "书签无法保存。%s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "配置无法保存。%s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "搜索引擎无法保存。%s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "回收站无法保存。%s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "会话无法保存。%s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "无可用的根证书文件。SSL 证书无法认证。" -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -95,138 +95,138 @@ msgstr "" "Midori 好像在上次运行时崩溃了。如果这种情况反复出现，请尝试下面的选项来解决此" "问题。" -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "修改首选项(_P)" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "重置最后的会话(_S)" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "禁用所有扩展(_E)" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1372 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "发生了一个未知的错误。" -#: ../midori/main.c:1403 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "截图保存到: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "将 ADDRESS 作为 web 应用程序运行" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "使用 FOLDER 作为设置目录" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1581 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "显示诊断对话框" -#: ../midori/main.c:1583 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "将指定的文件当作 javascript 执行" -#: ../midori/main.c:1586 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "对指定 URI 截图" -#: ../midori/main.c:1589 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "执行特定命令" -#: ../midori/main.c:1591 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1593 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "根据正则表达式 PATTERN 屏蔽 URI" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "在不活动 SECONDS 秒之后重置 Midori" -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1680 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "在此检查新的版本:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "无效的配置文件目录。" -#: ../midori/main.c:1855 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "已经有一个 Midori 在运行，但是无法响应。\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "搜索引擎无法加载。%s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "回收站无法加载: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "发生了以下错误:" -#: ../midori/main.c:2015 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "忽略(_I)" @@ -243,135 +243,108 @@ msgstr "异常的文件。" msgid "Unrecognized bookmark format." msgstr "不能识别的书签格式。" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "写入失败。" -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5251 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5248 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "更新标题失败: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'。" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "标题(_T):" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4401 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4406 ../midori/midori-browser.c:4438 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "添加到快速拨号(_S)" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "在工具栏中显示(_B)" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "作为 web 应用程序运行(_W)" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "可用空间不足以下载 \"%s\"。" -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "该文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4488 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "已下载 %s，共 %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "文件 '%s' 已下载。" - -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "下载完成" - -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "有文件下载正在进行中" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "退出 Midori(_Q)" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "如果退出 Midori，正在执行的下载将会被取消。" - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2230 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -379,151 +352,157 @@ msgid "" "Aggregator. Next time you click the news feed icon, it will be added " "automatically." msgstr "" +"要使用上面的 URI 打开一个新闻聚合。通常都有名为“新订阅”、“新新闻供稿”或者类似" +"的菜单项或者按钮。\n" +"您可以选择进入 Midori 的首选项中的应用程序设置，并且选择一个新闻聚合。当您再次" +"点击新闻供稿的图标时，该订阅将自动被添加。" -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新建订阅" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5310 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "无法运行外部程序。" -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5694 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "添加新历史项目失败: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4101 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4104 ../midori/midori-view.c:2424 +#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4327 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4328 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4329 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4330 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4331 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4352 msgid "Import bookmarks..." msgstr "导入书签..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5315 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4366 msgid "_Application:" msgstr "应用程序(_A):" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4393 ../midori/midori-browser.c:5419 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "定制..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4467 msgid "Failed to import bookmarks" msgstr "导入书签失败" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4503 msgid "Failed to export bookmarks" msgstr "导出书签失败" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4557 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4664 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4668 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4682 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4693 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4699 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4704 msgid "'Flash' Cookies" msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4709 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4714 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "关闭的标签页(_C)" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4719 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "网页缓存" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4727 msgid "Clear private data when _quitting Midori" msgstr "退出 Midori 前清除隐私数据(_Q)" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4828 msgid "A lightweight web browser." msgstr "轻量级的网页浏览器." -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4830 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -534,525 +513,496 @@ msgstr "" "条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选" "择）更新的版本。" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4849 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" "Hunt Xu , 2009, 2010." -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5158 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5160 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5161 msgid "Open a new window" msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5164 msgid "Open a new tab" msgstr "打开一个新标签" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5166 msgid "P_rivate Browsing" msgstr "隐私浏览(_R)" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5167 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5171 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5174 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5176 msgid "Add to Speed _dial" msgstr "添加到快速拨号(_D)" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5177 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5179 msgid "Add Shortcut to the _desktop" msgstr "添加快捷方式到桌面(_D)" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5180 msgid "Add shortcut to the desktop" msgstr "添加快捷方式到桌面" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to News _feed" msgstr "添加到新闻订阅(_F)" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5183 msgid "Subscribe to this news feed" msgstr "添加到此新闻订阅" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5188 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5189 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5191 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5192 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5195 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5198 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5200 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5204 msgid "Undo the last modification" msgstr "撤销上个改动" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5207 msgid "Redo the last modification" msgstr "重复上个修改" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5211 msgid "Cut the selected text" msgstr "剪切" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5214 ../midori/midori-browser.c:5217 msgid "Copy the selected text" msgstr "复制" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5220 msgid "Paste text from the clipboard" msgstr "从剪贴板粘贴" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5223 msgid "Delete the selected text" msgstr "删除" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5226 msgid "Select all text" msgstr "全选" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5229 msgid "Find a word or phrase in the page" msgstr "在页面中查找" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5231 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5232 msgid "Find the next occurrence of a word or phrase" msgstr "查找该词或短语出现的下一处地方" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5234 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5235 msgid "Find the previous occurrence of a word or phrase" msgstr "查找该词或短语出现的上一处地方" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5254 msgid "Increase the zoom level" msgstr "放大" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5257 msgid "Decrease the zoom level" msgstr "缩小" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5260 msgid "Reset the zoom level" msgstr "恢复默认大小" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5261 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5263 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5264 msgid "View the source code of the page" msgstr "查看页面的源代码" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5267 msgid "Toggle fullscreen view" msgstr "切换全屏" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5270 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5271 msgid "Scroll to the left" msgstr "向左滚动" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5273 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5274 msgid "Scroll down" msgstr "向下滚动" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5276 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5277 msgid "Scroll up" msgstr "向上滚动" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5279 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5280 msgid "Scroll to the right" msgstr "向右滚动" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5283 msgid "_Go" msgstr "前进(_G)" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5286 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5289 msgid "Go forward to the next page" msgstr "转到下一页" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5293 msgid "Go to the previous sub-page" msgstr "返回上个子页" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5297 msgid "Go to the next sub-page" msgstr "转到下个子页" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5300 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5302 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5303 msgid "Delete the contents of the trash" msgstr "删除回收站中的内容" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5305 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5306 msgid "Open the last closed tab" msgstr "打开最后关闭的标签" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5312 msgid "Add a new _folder" msgstr "添加新目录(_F)" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5313 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5318 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5321 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5322 msgid "Add, edit and remove search engines..." msgstr "添加、编辑和移除搜索引擎..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5325 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5326 msgid "Clear private data..." msgstr "清除隐私数据..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5330 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5331 msgid "Inspect page details and access developer tools..." msgstr "检查页面详细信息并使用开发者工具..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5336 msgid "_Previous Tab" msgstr "上一个标签(_P)" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5337 msgid "Switch to the previous tab" msgstr "转到上一个标签" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5339 msgid "_Next Tab" msgstr "下一个标签(_N)" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5340 msgid "Switch to the next tab" msgstr "转到下一个标签" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5342 msgid "Focus _Current Tab" msgstr "聚焦到当前标签页(_C)" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5343 msgid "Focus the current tab" msgstr "聚焦到当前标签页" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5345 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5346 msgid "Open the tabs saved in the last session" msgstr "打开上次运行时的标签页" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5348 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5350 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5351 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5353 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5354 msgid "Show the Frequently Asked Questions" msgstr "显示 FAQ" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5356 msgid "_Report a Bug" msgstr "报告 Bug(_R)" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5357 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5360 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5368 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5369 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5372 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5373 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5376 msgid "Side_panel" msgstr "侧栏(_P)" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5377 msgid "Show sidepanel" msgstr "显示侧栏" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5380 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5381 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5384 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5385 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5388 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5389 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5397 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5400 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5404 msgid "Japanese (SHIFT__JIS)" msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "朝鲜语 (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5416 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5950 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5957 msgid "_Location..." msgstr "位置(_L)..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:5959 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:5983 msgid "_Web Search..." msgstr "搜索网页(_W)..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:5985 msgid "Run a web search" msgstr "运行网页搜索" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6006 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签或窗口" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6021 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6023 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6038 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6040 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6055 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6068 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6070 msgid "Show a list of all open tabs" msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6084 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6086 msgid "Menu" msgstr "菜单" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "在文中查找(_I):" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "上一个" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "下一个" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "区分大小写" - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "高亮显示匹配" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "关闭查找栏" - -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "清除所有项目" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6667 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" @@ -1099,7 +1049,7 @@ msgstr "关闭侧栏" msgid "Align sidepanel to the left" msgstr "侧栏在左" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "隐藏操作控件" @@ -1706,8 +1656,8 @@ msgstr "选中要删除的隐私数据" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4567 +#: ../midori/midori-view.c:4571 #, c-format msgid "Error - %s" msgstr "错误 - %s" @@ -1727,216 +1677,216 @@ msgstr "重试" msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 #, c-format msgid "Send a message to %s" msgstr "发送消息到 %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 msgid "Inspect _Element" msgstr "检查网页元素(_E)" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 msgid "Open Link in New _Tab" msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2203 msgid "Open Link in _Foreground Tab" msgstr "在前台标签页中打开链接(_F)" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2204 msgid "Open Link in _Background Tab" msgstr "在后台标签中打开链接(_B)" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2210 msgid "Open Link as Web A_pplication" msgstr "将链接作为 Web 应用程序运行(_P)" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2213 msgid "Copy Link de_stination" msgstr "复制链接目标(_S)" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 +#: ../midori/midori-view.c:2293 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2230 msgid "Open _Image in New Tab" msgstr "在新标签页中打开图像(_I)" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2233 msgid "Copy Image _Address" msgstr "复制图像地址(_A)" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2236 msgid "Save I_mage" msgstr "保存图像文件(_M)" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2237 msgid "Download I_mage" msgstr "下载图像(_M)" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2244 msgid "Copy Video _Address" msgstr "复制视频地址(_A)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Save _Video" msgstr "保存视频文件(_V)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Download _Video" msgstr "下载视频文件(_V)" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2310 msgid "Search _with" msgstr "使用...搜索(_W)" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 msgid "_Search the Web" msgstr "搜索网页(_S)" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2373 msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2674 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2693 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2696 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2700 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3244 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3526 msgid "Speed dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3527 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3528 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3529 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3530 msgid "Are you sure you want to delete this shortcut?" msgstr "确认删除此快捷方式？" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3531 msgid "Set number of columns and rows" msgstr "设置列数和行数" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3532 msgid "Enter number of columns and rows:" msgstr "输入列数和行数:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3533 msgid "Invalid input for the size of the speed dial" msgstr "快速拨号数量输入无效" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3534 msgid "Thumb size:" msgstr "缩略图大小:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3535 msgid "Small" msgstr "小" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3536 msgid "Medium" msgstr "中" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3537 msgid "Big" msgstr "大" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3563 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3586 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3707 msgid "Page loading delayed" msgstr "页面载入发生延迟" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3708 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "页面载入由于程序之前的崩溃或者首选项设定而发生延迟" -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3709 msgid "Load Page" msgstr "载入页面" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3853 msgid "Blank page" msgstr "空白页" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4107 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4112 msgid "_Restore Tab" msgstr "恢复标签(_R)" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4112 msgid "_Minimize Tab" msgstr "最小化标签(_M)" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4118 msgid "Close ot_her Tabs" msgstr "关闭其他标签(_H)" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4804 msgid "Print background images" msgstr "打印背景图片" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4805 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图片" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 msgid "Features" msgstr "特性" @@ -2114,67 +2064,127 @@ msgstr "管理搜索引擎" msgid "Use as _default" msgstr "作为默认(_D)" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "添加书签(_K)" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "扩展(_E)" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "历史(_H)" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "新建标签(_T)" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Netscape 插件(_L)" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "新建目录(_F)" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "在文中查找(_I):" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "上一个" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "下一个" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "区分大小写" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "高亮显示匹配" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "关闭查找栏" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "已下载 %s，共 %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "文件 '%s' 已下载。" + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "下载完成" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "清除所有项目" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "有文件下载正在进行中" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "退出 Midori(_Q)" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "如果退出 Midori，正在执行的下载将会被取消。" + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "添加书签项失败: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "添加新书签目录" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "分隔符" @@ -2486,6 +2496,18 @@ msgstr "Cookie 管理器(_C)" msgid "List, view and delete cookies" msgstr "列出、查看和删除 Cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "复制标签地址(_A)" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "复制标签地址" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "复制所有标签中的地址至剪贴板" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "查找必须的 XML 数据中的 Atom \"entry\" 元素失败。" @@ -2669,6 +2691,14 @@ msgstr "标签页历史列表" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "允许从上次打开顺序排序的列表中切换标签页" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "最小化新是打开标签" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "新标签以最小化方式打开" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "定制工具栏" @@ -2725,9 +2755,6 @@ msgstr "在磁盘上缓存 HTTP 通讯" #~ msgid "Failed to get current time: %s\n" #~ msgstr "获取当前时间失败: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "添加历史项失败: %s\n" - #~ msgid "Not available on this platform" #~ msgstr "在此平台上不可用" From 63fce626645ea707726ffc9f2102098829ec201d Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Sat, 26 Jun 2010 15:31:44 +0200 Subject: [PATCH 2735/2970] Use icon with multiple sizes on Windows The icon is prepared already so 'convert' isn't needed anymore. --- data/midori.ico | Bin 0 -> 36660 bytes data/midori.rc | 2 +- wscript | 30 ------------------------------ 3 files changed, 1 insertion(+), 31 deletions(-) create mode 100644 data/midori.ico diff --git a/data/midori.ico b/data/midori.ico new file mode 100644 index 0000000000000000000000000000000000000000..d0d482bd104f602b73cdd8a9dad3eab3ca997a56 GIT binary patch literal 36660 zcmXtf2UJr{wDk=jpmY#H_#g;M6QwCg4G7XZ2qHp2q^h9w9*Rouy#}OrrAiG*?@d8! z=v4?kgplNq@4Y{3Wu@IYGxyAyJ!kJZ0RRv{2K;+~04_kn2mn-w??puZ_jAcT0PrJz z$Hn!3pXmYMt`7jv6JP&bZ%=GG9035~dOE5!H`s0vo6@MODI5Iz_1}|{ocQv}rNkBh z3~}npibh^@`~KI{{_9EJ+$-B{`MtPny!TXfFGb-g*Y&$(j1N{i1EXnvvXHZ{SPlQI z7_k})XyLS_k@>TiZZ7g?@Alden<#lKg)l2S^&jip=n)&*kE~Rm6c(FN?WlvYXh>|C zEH`)TU`4(ROy9`e*4X%sF%E@0T8a!~jG({sv@;iz|0|g9{KWt#!rnLPW!F_}f*f2CHDPaH_>dgu8D;8s4Q4Do}i-~KuidipU{jOS48#SG)^KuU(Y zw@Sh*VYKG_^U-WZyz*joH<%_ny{oVRtx9&B2e(Kl_E}4^qLDFg~K-p^}d1hyT4}SdAZ*jhH6Wjj3cR(go!#QU9 zY)8>e%{%+l2?(bv9lMLj>{?lA)CVaa*Z#A%PLq-9Y!zG1uW5=3J(QMZL_|kuZ4S{B zT`%=HC6@4{)S`VB<$_HbGeEkkOorCmt>iwSx% zMW4kX=LN5nV`+Y`yLbt~;46Q{m3+#yc&E5-6gM3A2{ zYGu}47<_BTJvVSGFO<_TDvy51}@WI+P zqNvJrVedXja&S22+qh@GLTs&sg7f)uyav?|@?WA3zHQA28!MAr26t6AQp`%edom=s zqnZ%nmK2X)?x2+(M}%YuZcgm>J}_b{|KL|m(F9{DwLolZdUQQ~1MqTD`(vvUDV*s{ zVV&2u1USJt(1@GZSh)oCv&VSJ6t+AjC9FMRIrG;Nq0EJq5>eqK{-8o`=;&l+N70YP zq0RXGhtJo-(i`$h%`68-P#N6PQ7o^UkzS( zhApXj9kF^=&N!;A2qxtC9=Il8-xrWy+^`+2d`k2oFYqY6y7=%_XLPr&z$amScw%$@ zjBK0AWy}h$AT8KP1D1M>DroMh%f(aoc?2GEwMTLx-~at+au?l3oTfF_s0*_Jr5kjd z0c*WyH;$ey$tMfxt5H34Xm3{-Ut_zZgSxHog`K5wINoF z)QDd|NB09!;uqnY#+Uv+ zu~+O8)aV{8*#Ee5wzA`#LFph@xu;^q+C;R&WZ#X5H(HhPC_6h{OnJa^(k2&{8Kv*| zsHh)%szUCC9$g`Id-pB6SvAJK#h`#-7(47m@Ty35m zEhXLRN%6>QD4|5d&kOHXm(%v2&iT{|9=*-V1NnMsTT}dQ38{uBOT40DpB_&tlZx3_ zdJOL>X_Ls{vH*Wj3|Myefanm7aFgoYy;zBaI$&Z6_P9$;;kLQeO)q-r0)pa*NqOMM zJvr51GJZx!=i6&1mnVY1>vMrVtVzo6@fv|GJ)5t_bMjukUjCu#(!5bK6t5DXpccNM z50YZQHQLRiO!U6Y2b7ufzWqnG)d+dqXOb}+Fh8W@mN7&^wtxL#7G4&CG1RDaQoVcJS>dZ1nmJ)aHiw-$`&-ALApt zV}VEcbKV{nNypp>Va5BU@dwve&Oo;@XAYB3&_Z!f6y5+gsG}~6=I5Ne3KKMQZ-{zS#*P>wVk;?$A*OC0}i$gdJq(kLE;NV%OTD6d;7%@Vl5G_Zh9W zqwzc*EpMneSgqZDROu76cGk3w(tR>O_YQ+9UK&bTGG3DR8-rsP zir9-e3NW~}$218`?BS7#FwNlzo*e%OA! zSraOny5kAxhBpyQ3w_hC-llMb_M>c4&4(W>3#j+79<3ZrphwkCawe?Z!p@F-)A|~H zoaG{PmH$HtC*aewVD1hak0rA->TL`QXDC9>_nir~?;3K9Gc5H3fOW)v1I*8MYZTqY zBW|-!@r0Z!?qy&L}I7SU@0*Jp~a!Uwo?D5=tVJrV;|{X?`#X0LlPw1 zX~0^Ei+|f{6YdVQZA=U?d<_p zZb*R+7I3*9sb4|z--MS{z9j^6Y0g72qH~^jb@pm4`yq1ch78aSFDMc@830^ zo$rxxXh)B)1ZBIq9g>FF>1OmhpX0fAgvT(tr8#RER|#r_Pk&LQTm)U%<)OH0%ztZa z0gdYvapZNqM#PbKj86}TY_RzF({n;d0w9pl)_`QT<@~4@kOBr6^)*?Cv796PW`tZV z8l7+ghaxhHbTan5vS~xS6)wy9xH0;RCg$d6QEF%2cOb-Ui91LloHR`M?2_{E{p_*+ zXbz*wl|}^L&{VST#f)g3?j3?2BjfzT-}_6D9hogeu2nrZE*q#8PS0a0Kt7rX_7AM6 zV_B40zi4}yMa+A-10^uLwjUUL{Jnf%z}gpti@Ve22r~n*Nt{IsyQ1sIBRO(~-X1xp zd}8dB-pj(q33^3;9ZNEHyeete;c=bv3Po2}31H&N04beZre&?EOo(0_>o0dE`uA^z zTzDCGUSb9qq{j(%(xR<1^uI_=6JPB(SN%E3IZ=&)nNE=xw$5B& z-?|-0@|hRCe3tpFkE=ga7|FRPoTpr45PoRayIuGKjL^P*EWq@!KqyCA`=CJK(svBg zSDF-0$l~gU+~L6iSdImaGNx~xFX#3sh%lr@E*5VoQ(SAv9v%7dQ5B!91rpRh6J_ZiA&TCTr#uSOH#94c1M*zfR%y_4PH5IIw>}B1@x}XRY0s{J(x>?AKKb;AYDq>8VFDA0j!- z$J9(zVu*h2P(P03zABrkwyA-hT`u1(yEs2@`JQ#_I{s|avkqlomf)OsAS2%l26N7A3@1gclKS!up*NYCeBS^6AIT?NNXcUrx?+)5h#>T3U zZnFNRqB#2eSuW0p@|0Eosi>g#v>x~Kblwf%b=834133IYf|^TQ&H{S>5hf_M;zuy!_fLm%@t}T&EJw^U13GV9jS+`$Z)yo6 z`i~wvhm{31-Nh^@Xnh*U2{|3(-GbD=28~og74L=L9RR|^t%^yGDa5GWiz@EnuZJFA zs-Fa1jd9``&i>Oa7yt_kbwDRx#c*TgYeKaMSm-KxDrQdu32 zJ$Xytco|6Bn6Z@?&`=2I)gtMI)>Wq-@y!-Lc#F?i(4La;39tNUFprCaO@=?(dW5qCgKV4tG(XjHIO)RGFZK z>fWt)Ma@LGr_ixRdwZKt&lg9$398BY#kwIQ2Eav=5kIWQ zb;XKcKWTQ7uVJrZHrL`Ixae=F%I3PD=~3r!Y6baazIwxqvb3*YIPC!2O!(DOj-uq;eiPMVJUX`e0A>&KgC)wp5^H6ifkN@KeAq={ub+b?j;X?`omD{N z85leLHc3+Y2ei8s76Z_tQ}o`H@_(%RR_m~5k;m+>4+KK&X3$U8uL^@8U@5}0`mOPT z8iAX_;KYF1;QGx#2?H!{O?rFl7m_8}vn43}O6hR}&iL4RC@I3*ZSXJiBO3!IbXGiw zl2YvWgd4|PN-n7Vyb$q7sHzEmh8}st@@&U7^8~J6pJZ$Fu<(WH|n|~CWk-6zQcAtMFhB}bN>kcH?|9NSt zhC6%--Zvk zUV!RH2|W|!r1^VmdPeam3meesdFwXNc=#0mBv~K_yl!%dEoGRSN0XmLXMKx9s@X%N zU>}#q-j2cqcpwo0StPIo1Ej*B1{Jf@U<>XX9b_HSlDu>yjr@=VxQ|cT-QtLJ8Qde8^`BmUHTC*L{*ge7gn`74d18{W&h28ZHKg@}q#Qu?v!zqBpQ&|Jw_ zT#81sT}}1fO*OwYdE5(XvZowGCP4DVsDy3?I-_vu72hn#@VTMX|N)Jd6H@L<_1Hq>10?ByH0HzB|s+Jhc ze(oynaR2L7>ly1J;Ly$zi~khk!C^Rn(mybZ)$9P0bPW3;unay@5#cbg{f~CQn|j=I zAh=b&6%r`C-M!3dgOf9ZFEU=-Ps@Vs+%$=Y1);&7`Bz!I9|t^Q0+cVIQh3+h-8YLr z72R`G`Bux#F4p_bCtqCC*3f$1kFcEMKG^#57|bP7MI9)4teYpM5|C|4afz=`gPFnQ zma`B-hg%X`P{X+r>XU0($9P5*IE+Go?1}aQ=;Fc7?>yB@RiE-?60qw>xMVfl<3EAt zAT7b{vN$43_Ht*B2Ypk(GQ8W`PmBi#uA|tb(`d)j)l4m=U^Zt<>U&8Y4DE8y@S0qQ z_%+*Lx(DN-3jzEIV7*{}zMQ+eIeE&LxIx^oGw;c?a>cMEaPgk{t+a^cD^_6E{^5O0 zIV(o9l$WEmizI7@1pF4>2DswW4})q{%=L3q!CMiJp59eZwLIiEF*1vL67xx`ErToC8i$PLa<`c`L{03SPho zW4DgYF8^LjJL!X*VkZcFZ`BAdo(d7Jb@@k19HSmNf%}V6pcHorRaL3{zs0rL$JbIW zzF7a)+Ai9g&l=c$^JODFxn)G9oYm+x;ASO={@GP!qBqy?J|9!wW1ej5gE8NDe1I!{ zwF5rigk#ZqITY2QwSoF!fEI3t1T(;%Nme5=+vUHYp6=T)ZEJ3!ebMFXy1g{MA@Nw1 z)x9tt^5sQ<%(%@oiCp34QRA)4Z%fJCxXK#jpT>r>St^mOYJyDL%4?e%UB9>CH@;u> zS;7&Q<(XbByev~MV8xV>WzXh^Jd+6sM3jMl+)C&9$!~O8?C)5;*T67PVeUrz*o8V! zVL=RC)1Yd$Ds#MbzhJ;CR~R)uYXG}`me{1?zN1Q8JI{vPPlZjO(X_TF&wRh{iC3%PZoiNM)6f6xJ znDapj&DA~4i!bJ*_5BkKYSp5Dlrz7I!{4qcj^N#@MrD?2UF1FF-1$Xdsn|6;Jh^h{ z<=`Z!%zm6LLI=7%hY~)j1Z?uF{4Sh#CwqV%Y2c}?=9Ui^eEryMdNtaDTEX((!ZRB{ znMsa`xOZ|v&oDOslm*r^WH^aO zNDDE7=?G9!42fXm zbHRB=W`P~aP&~qYGB#JR@9Cw5qF-rBXtRRr=3q@S&#jBLmz=;J1x(1NK#wjElSF3ZSlz|*3Z7;MM3|Q zBGf5b5h`UOtmMo_uPb5$WO4@2ktt-+sU9 zWC!%yk$+HqaTZ>%Y(EO}xC0scm<|@xQRFr*nOb2{#fIt&fp>5NT|rM1sNxrgCr>y% zIYUXz|Kf~0zwA6Fc(w7}vH8u2-H(|L%tM)3PbsN#c54Mi zc0ik#8|i%6$%@5^YUn)};no`XlVe@L>LjW1Ujg;QdAn+J#tVZ5J zb;PjH^=q~9l+^lbR#EmQl4{w&QVxISk(I;F3ine@X>#!%A?#6;GMlG%YUMwV)xCK|d`8W{>BJPoswL%H9|*Yi z_Fr_f@p&j95W#XEpnV2irvYPBgO8SsQShNGgzO<-0^a9Urx5OJCOKSMx=E+};|D8% z%%($1oz$_6#{a5Pr|)T}xz~z!1soyuwkh_yjD?j2cnP|BhNGPmCH5TROUrOH0?uz2 zv?gCJX!frAxD)zr=H~emAeW0KQ0-EQ?du#Jzs+fN-ff4~{R4l~>zC=WzVVw^`@JFd z+G{q0;{9Mx5g>TsV@X$F{hj8+^9N2bp?BzlFSuk~F8Q~5ma~n7zZ~$o81(SPGKaOb zfAqb*M>1TNIrbO`ju=(2`}oj^)H3pNEtF)3t|`n9QUFsIRQ!?G_r>ErPLAm);>i}= z$?no5`71LGi=fLyG$>AsjB)#JZbn|aBDN}Hv6Vs$>;gtwOLQz}n`<5I?*`bW2N|tjacZr^5cSRZj2>d?E3yp#5TCr7MCf@jik%Mr-hxq*WddqW|^By9cb?X zjz3jx2T#K8N?E2HJ!sKw`APujM6k`(NH!hizk?~kz&I&~gd&aDKE zE8Al9Hf2pLT`oM93(mNx8dnXg5yWzYIWMHvFKqSRX!XXqVgFFE1~S*qj0^Bp)|os1 zvFT9AyA2%FjZT+9c5xpK<56Q#`&(yQZE7&Vuq;?}d7cEnKXpWqPPQLI&niEe3%dS# z5t%qi1VB;uUA3iwWPr>k;Ld!wU%SZbl^kt9T6H`4G4A9K zw5Ax3%1_mUD1Ee4@7xZw>tFpi4*i6lp}71t@!!T!=&9=9Se@Is%(Wh!Z@ zbLL=VeDC%Rdr(w|9C~4^fXt6n$db=@rSsKK}3tYE_5cljZIlXCz9*5tgD zqYrF7#EFb#$j*3xe`e9XQdMLH^p{aZnN^y)7kb);qT?n_v7r>6g3K@p?%0qlgw!p| zX{s00Hxq-6jZ!p2NlyUM4+I?DF-b@ckRO#cTw|koGZw6jv^GxNy^3c*LB7msZ|_RR;r%9 zN+qc$d?D(6tU$~%KejwtD>O`dc~>!i;0~KMO=)^if>nd35KiiQ!jqoYFH?i=;~u={ zDMw3gT~$sZD;UF!wQ>B}Oo<6VQbZYZ2{waL&GmB`24JJOy%MUb-9Sm8MCja3$-V)7`_`TUKPo`=_a}?ocGQ-IBArVwknilf9Ln!02)Q;+4N`tg?{e zK*Dee)Toq>KX{>GEtTwdVAL51zwDxV12JJ;v;`_vRFMps;H$zE&f<^RpTbexA}=C#UOv?V`A42#^$n=%l{4M>XSv%Y zF|D_Oc(h~@F3KOKzdRvu#$>%2?^NkWgJc&d}VbO5nu#oiV=N zedQPOSi=Y|qMqE!pQ z0m@FU_zOD2kkYA;1XZ53;{~FhL7*>QIlp1Z~BE>() zDQD%qiR=Bt(-Rf)I3TWoVK3i_s^?(S?523F1V;?t{Hzhg%zhMu$YtIzcx`41&#K#C>n+{#a7_pY>`c>Vm6T3-i z(?WVMY6`6sz-hM&BJU7C8lkuzbEI)K3_Z6{(J-V)9_BLQkG&Z!W;3ok@F(|pyc$uw z4(utP3T_m`Oeo>4l)t7mh1A8``bzf zCv(Atoh({X=@JiG#yxah^~uQAhkyl*Td3GD2sc6c*JrtmM<_z8_NAFCo=g5$u=H$x zGYzCWgj8mu+XPRka^M=9;N@=-ISkQt3t2VljZ!eZ-YmBJuFuiLD)7r%U+Mh@8UHWo z&xh*KQ?+kW(K|bV}IVEfTvqL+OQCanzvMGbOvfbBZ_?Mq^Z@WSYiwW#;Bd z*V>D`NwX!ksOQf%zEV>5H-SE^;Xp!vgLc~7QNn|m`%7Y`)kO!?A+9kr`&O|YYjV0g z*nsvGVXzByoQ)k*Ns&MHLM1sul{ZtvxPR~DX^En*G)oH+WGw}>*A zHW)DQPz{}Xw2B(_@-EC4b&uGe(Abbl-Zz*l!lq^~NFpGtO(+3lE_=EdrN({g9w5u1 z1=*A_D+MNBHg-A056Z$yXTP*Vh{_@Wys+v_Ga`%3UQYS#*Dl67n){q;j2>?l=jx_E~8P@>yQ$eRu4=?goto`j|Vl9I_`TB=y z;TKKNe&Sj~56vaY8~av;nM|k}2h7<5F3*Xf^b0sF!&k%;_sQM68oYhfOOV79)kIB0 z_nW%U3mUCA;Qpk};?6c`quC*UyI>*$wE8b}kff@K0BU^avF?r^8HRif%0$(Yf3mto zMuT|V2VOJ@?i@v(9mkci*Xt??#mun;FKjU^TrOVRYhVBGVR$t-5CaH9eQACh{mK~S zJdfy5S)T*`v?4@NbS1~ITYJuqQ-0~KkQRpl@(tF<>_}C=Q)x-UmkgfMh z0@|(M*4PC`h^wA@*{8C##N;Q}n@Q6RsYat$^Z%51=sun_TUz@i-`KsyA!AW?vA~GD zlCG^5)7OMGO|;8LgwJN%Ch;?pIr*hNxBPAQp$W{v;jc)lL4b<`@Q%r!%>+H6pPixM z-({{rfR16hx{@8%XRHB^uFxdwsDGVgp)tJjjs6E4?U;e9FJ$6y<_Z~+;iwM1vRGfI z>h9ErF219U{r;GXD^zdw!j}8Js{#K#tft26Ukl%oQXcXzd+gtt(C3*OX1F~ z6rchBs-u3L13SZ>EiJ!Usb7~d8{#v1Lz7hf5wEHavhI_9xNm9z>pj9tb6MZ-W!q^x z*iz?%IV9k64Il5!;c=ue<4L3RdCk|WnRJZ*ttDTiBZ9T|Owmnem#qQq3EXcSbA@LG z{9~c3?C5LB(`)s`apf03wmuwQ_U=WdCQUYDGVR?@d}@LXNymGs75Hs(n#6!Z{7CQn z>0e+yjpx6ns#Eq?J$ei_hOsmA{lckJKUq=`S=V#w7gGCo-faX7_B7!b;q$a`7g($D zQTpf#QJC@Qwk|x)vjG?1n@Y{B;!b@GC~T7lN-nYl2TcT|NvKLU&d3JleAfY|9L9;!qs$4{tmZK;w*#n(oOXICjfAW}NZW4cL1n zpbkf!SUpP0dEnhW%?&Vba<>su_P<@n;_vJBFE8n$Jf^CaAhx=GT|@so*zmc(a>kRp zeWz{5&`to|rM1`O7;3W0KF<)fu!WNj*4S%m>b<#@@tymyc=RfGzh&UJEFk?;0!U-{ zS+@!jzM!y7GS!7vi`CHCv~v*-mQ1calW$--xAq&viA?!yHr}jSpsS704T$+0=Db9N zb&DX{A;*Po8t!pze5M3q0YesZq5jS4hG(8sm5V{Kk!RnWsb(yn-wdC%-}Z@}%71E9D5?#7vQJe|;aXBUc&5SG#nsfya8z+mh0N&~`$ z=eII1vO+?3x61o&eOvIH&_2@iJE(v20DZ5wt9ZfFu$GIby`AGR0JdoVoH8OJOc}8X zz6mm=e|dwRatip7Lg)~l#|KTDKvgNoJtmLxy=BQvOZ*$1!~`7vy_pFp4dk z$k13~lc)HMo$DV^@T!62e^Pf8-ei0#3RrAFcyqko!|p$*SWw&dcP4v?_C`J2uFHu; z6S4Lq^p45V$9WU3f7qW1QC*__1-xq9K^S=dloimdnkEt979w3%$6LFng{a1eIv7=v z<8CM(gr-d!#?lxcu$VD}2`vLU2V2B|j$GK{fEpTCvjX>Bq^Mu0z98=~zT!zFjBzx> zzxb572%+~O-G4XQed!)bH_HCtbw+wsub#LO%QMj~#Ef{%m(DoS(dorg_>0=)ivA4| zOO7C-rgIdlh9^ZhVdax)b+wUVJT>>)kIUjVUX1{+n>alZ#f=rImTO1Es z+leKF1zpOy4>T9Fuj$+=0)C&9Q7?6aYgWNpPcSX#aK|3V7p$Xy&&KPOA)NgB2wKj5vwJ9`qROODeTfE7Dd=nybf^6=Pj0;K3JENaxPxp2>AZ|Xdvc6zo2{T6sjL3qkDP40%eBd z%6MNg!z<*hh+Y{ZqSz&0ik{MMqs!GMn3D0j&&}Kz1sZ?{as$@D-Z*ec=s2MO7X;Q*SUEIxn`z-H~kNfF(EEVmE!zFtUG$h!Z!tMVeVy4e2 z?BA8h0;}xj@f&gv!x8qoH>67~B}y>`gH09ji?vSb8&R7e`-$a)aFAz z;y)VI19o)fdp!MPW8K1c-~Capbz9vJPwd{zj!7P5mOS@ca9#f%p?ep-@l1X9zB^;w zGq(+CtXGD5s|EX=zRIh6o>dGp%7h(YHl%9FNDM}{`z zDVN{Ro1Yg_y_DfDkYPdj0GXOZ?75)4T{ZmX0uwc;N~rQH0(02-4rwkg4rt5=OEZWA ztR%0T7kCE&OJKY<6sDY9K>&lxCH{W*t$w%BzG70Oh9?$l7&HT7hj-Hr6%&60WGU0) z=1=up;Hn>nwy?a!bXz_gwaM01wYmlkH9a^nqHZVyb$oXFeJPyCj7cLO4kL=RJCa=Y zLA^jON4BmRwStEWl-#mM3u!8Y2?5+MgU(p>hyrzNY2aN^dM>SGq_`h=dC zQEN7hN!bxqyt%^V0e`3KBH~2Vt10ef$}45#b#YRF>^0C@1VCjknf}#{J6@W+aZ1{0 zh)=sH3K_;Kch9)uGgDu!63^1I-lb)Z?AI4m?}QX@E11Ygeqc#jpmQD9A)@6`3{4qa zxa}52(^v~UcXqngId`-7*_&%9w2BlfX`F*8u&hnOoj9y}fKW=OEGU9WsU{h4xgbyF zzw}J$obBU8Q}1j(N?MtaL=~@0SPlKY;AyYl-}Swrf6#J=`e7hZ=(V zIS7vx4kP`S>c*D$EZ<}arS(xOux|j0w*xER+$OuL36fvHdk(s~6I{C9=L>~7KM7O9 zziWjAr%~Dte#ouOwzyapP*Ni9*iU$gd0{N`8$NVoWkl>ujAhwHfBiz^zOX>vPJQk6 z<*gQL(6K0090Sp`*?<92G9xRX0M-T^1;M{mmTc0e#UZoTAHfF2q-{3Yb{-QYh$&0n znO!J;^d{U4>PCrW;}Fvj!MI;p)RMFr!I6D81#xI{)v z4x)amPXk=y!$4dYCh~vY&4WKJ=z{Y&{FWv)OUo+0ygA&%d2)DXF8x7s#~1p4j++)o z_FAt0+o%em6oP1sIXM5jh((`GdBfz6>t7w^Z?qle!@!^8V5>X)q=(c^S>#${zzdo{ zyH$3J!C;%Iw{}yvM;_b_fufL7AF^`hj$93~E~Y(p@~R>(h(Bc)Z&26EB4RxsOuOEd z>Yh3JeS%Owdw%Yd=9dEOQH}s%5rKLnQJ)o<^3RMU+zggoke7JzOi2M11#-v|_yo90 ziAOm1{|Iytae;0!;0FDj=HlDZEF?2;Y0G@xln^SYQEn1<^Va2|62WWi!U!)FB!nvQRsfc*#V_M@~@WCF1I z_scc6%fGdS@6l^G8EowRC1m_XktUIDWg_9(3(h4@Un7nE<~EPA4>hph?c@fe+30?Z zNX=WJ0!5jcw;y@Xl|SrzitTa1C-3H|?f{fzHo!YiVyT7*C8bhOGA_G~wbCzw@F#$aJ_6M7%~a@GZ-~V|Sjb&(Ka-0iuslG#nsZuu9i_7b?hXYV zYWl6U6BEKuA_Dj(VJX~+sc!J`@_k5wbz3M^MTG7&?TOuw%2jcTQ1&M0&lLpW5@6T? zpr`Bs`Zes_N#pdWJ8sT&n=~{XUP^C15^_r-Oy5BOWi0wV{6Ae=@FC}(4e?goP6^iHNmkN0*pr~+y-s949u>~3?6CvE zSAiu2_?WsvWj`FmI>;JGg!?0}D@0XIkc2QMt!|{%^hMT}EBW(j-CwPUNGFZF=SSHs z7uBiiFXo0qTgLn-BECk%!eY3>>H04Tt$&y{K2UyR@RkIK@-(N_tw-5f z#W`=_zS`8JJ3|3fZJ=i?KpD(O9Pt99sd{C_kZO2fe69K#D{ zuy-8x%id_{LL*5jqyX^laHc~jQn^Tw{RwNm9r%M-+J4+0PAscPLBAMiaKd{}o`Q)T zs4wmN=12~~%-Acsd5(9_{-I>y{pxDxz9*+Ay0hG^5;XYwKVcn_qcvR6zAv=E&Qo5rs{G=LBnNyWkfQUZ<$N0GhxFl>9}4{B3M%|Lpbv@D zuE&>`zD2)=bE6}>o1BO?Z{k8vVeiLWy{lJU_s*g}nTox?_WtEhc-pf^v_A*1q_OQs z&ZqbZ4he&Zxs@N;Jm{{9)!H10TG${g=&1lO8GmA6xd?Qpfx^T|<0=;#88_E&7mHH~ z<>;rg1b)mo-b1702JWJqPPRB=`H%EA=+e1EL?2O z6>F)^3%YGeiwo!LM7DSpFd#*}A9O|dIVnB-Af>DzUEStX-xcHY^hPFSdR$ zle|RYnA@iDtvp9l)ueIQrmEGG$cRb7<_#X?tpk>I!pSs&!bM)7q@ACVT0wnm_|ya9 zg8aeJ_gFha@j+zIo6TfP>1Z5*V{h+Z|Dxj$mtjjyGS;c=qLmRmc2Xo{WpJ9f@OD*Q z|6j?H=TABq0a5ZcH-yk+oUd2#&p+%qzLLiNw*>IN{a3bJUVy*w_07F3qQKGXfBAhI z+bG1q4&;!zYIx&zE8zyJgzpvM&dn)AR8l{iAE3)>{QLT)wEsPHhSxE2_N}

F3(6BrZM$-!pw`=ZLHd#4PuE{5cjdavo*Y=8I$~W7 zx*lg~^?FY%x)jrgArb#7w9mAGX{#N?$LA8Y<@nN^4T z(o+1iT#ZfK&1{dK;xPKhbJ}QWB?`h+R~oxMChP(!hrbksmWlV3lLk zTBL~rzpK%P{*1`O>0Fu)cC5u$$@6x5NAvUU)GVU7JhH`gdAwQeS{=&w%!cU)+Y!zV z(X&nnR|pesNqHTIHSS+W@NYi#X2ZXI7Dv8pasH;6>TAv9{}g(*&4+(+C$U_ovb_6?%^?*A} z&`>QrRS_W|JD%WHe6mSGB$Dj2i37=DVxSjn)S90JaD;=Mbz;d7ej4KZo8{99a9K*y zy$iWbO5eJW`uwOV8Jlia(Ed^e@p*dm?TQ7RF!M$cA+|>$pk*!fpsFy8h}8-bXDnPV z@O!+rz`>yBd=M9n0+p#4h&%YUIH+{ZRgMW+r%lLg+c_5R$r+9XU7XDmVrkt`Lz>KR zCMzvF$-mg`($uNoqQZr}6&&j#HLj-{EOTZv-s`{&hxR)Xo=w08UC-bQK}C12$Vd`7 z`1Boxs#-U%k!H8HAN8HiidVBVjKqSxj`!gcc~$;TiGnKA8)mRnPS*nMnpD+W3|lgv z;E$QE`_GbX6y5yx!mDFi6lD|@jj_V~c!98OL`*JC;QMF={ZFP~rntXOUw?flv}+nW z3A17i3^DhuAJc?=+i~qG`Nt7*8)_`1uV(ht)GWus(K|sb1oaOO)`}y>=-w#7K%IXG z!D0A4q9(#c{vn?jA+e<+{jfI)ekYQT}Uv2$Df6uE)Se$e7?ai2WYZ$!VQoJ$~k?#AT64b0u z&2XQr0$<~8edIdq`Bs6Aob~pR#Bas-XToWK<$C(W8e<$+>zJ>|JWXTBeZs< z+{jFdIAB@QsG|W0J*@DKV&B) zmH~lpU^M@)wyyxMJtde%YEe$)eB z<5LHhEM%=Z+;hQ%H#42OC4JHh%})RLA2%uJ5@9tT!AV56S?}uSM_j*Ec)aA z8d+j;U^>?yN=qcyaW`M>;+OSxdJ=!)^;`Mry$fxK@g8<#1Vi9hvi_h+PL6V=jbFe# zBpFn9T{$qoujNXOM}MI!)ZvMh2L)W;^F!%*>y&R*j;7iB{RkEu4W?DL=p@da_A%j;Q9u$;XQEZX>}zUssX1JK$jR^2JO0e#=pEo!XR`&# z7W?DJ#!K$}a9eh!?j+h-NtJQ+3(YoG1UAoFIHta)A=&I}GK&mx5Fx&gRmwiX6@DU# zp#x*)49q*YsaQA!Lch6bKEP+W{5w^81pLB6m2)Y7RT3pDZwVH09~koq8MM%H9&Jy>1OXtO9wP z>w9ARB3hs4wMDqs`79!6^G3nF#nQyYq&`B=f1@JeFRj_Qa1`3!UJ4nn=rKGR&g(gp zE}|`qT{N?~w!i&yV^jW_2i09=`%JuNa1(Ef8$WJs4)(aza4WE1{4yo~^MYR1>`CTV zwy>6zqr4Pi&ips-Tg|-}`t<6jSlufQ8bA25{8mAG!RX~{13f-HX=*k|IVShwb)oYE z7Xkk&sMYLu6_O^TJKN7S7>5gH>VPk#-0g3Gc>ERSIl6#cm|U(@_*6GPf1US}0;SA5 z#Io#Zw3T)#*KU0sJ7++wuQ@r|l#e#0)r!q(qF#|pUz2U!(}C5-Rj=brr)Kx%9jEl_ z@tmWdfph9t-U@ei+9>6wyuAO8XhiftWx`-|=Uo1fy4UAN!OslmTCMY^1XUCVaRbng zD`pkkQYG&1SzpF_MA37>>!v!L&719|lWaO3U+PmeUgmf?Z-)5+j$lgPXNONG(D?ia zolBJ}-S3oGMTDL&na|apA6QPL_jP`5O8qi-P;o-);F$ckl@X@Xi93^N3t8^g`lXmI zizMPoy8Uk2Zk6k9b__SDG}AftEK$-iES_D}ot3BkXcBmow)2&;*u|s?^Qr1lT(ona z797w}wkm&FZ<$3VPLo218zRIA~_*vao3VtoJURj zV!{NDwTX_hwUW}_eEdsF%G}YGZ)QmV7`jEfoMn6L?SVg zpz(!xY*);V6#j!xPh!-X+c)E$pN#Oz+f+X_H92aPoN%jpxn5wyk>cI?9P(xpn=Vy4 zPEK}ceHVRy(8)O zm!qgncH{Br!M4Tso7)H2cPg_hybR;=GD$YIVIyQG8W;y2-DHf=Wdc&~ z5qNy8V7w(RkZtPo_cM7Hw<6EI&{rz1&dnl=^L_o1skXvbGoEd19T@8YyZsj493(12 zaPJIUp0a-bM$hnF#eG+$-Zk4w6#nC ze&e!YUEk&v=3sQK*qZk*DCk}GUO(0_`_pzeN&#D$xm9~WAYb6oQ;<^1-~Tn`*3!Yj zwzuhpb>S)shx$=daV-D-H*AkR11t)>0t9|?zA!ss*_pn65h3M zTS*u9?#u}$O@4`9rO#RU^R6k^CN$PHIV_$cck@Gqy!*M3x~SMa(|GMdY)`AtX!3dX z@lNNewm)*+2WfAf4Fm>B5%Ox{s$=E(r_XV|^6aoggW+jYrTFz7v@i$vl5_1T3n|Jz z9btK&%DQz=^+h^#SWADnu+O(c|MV@rqa|(5imTw&Et8^l$W0!IT-n1tDUL$qSqh~G z+Dr{QE`rADiJZxPSo6N7ft1KXHt?M-ayGgpi}CjKvBGpS-h!{k2QC*&J)w^YqxKZ7M;7gOnBH zO{C#x%)M&_`lAQWbk$|HkI#sx^ehlFu-O0gY(_Auj!gX7=J6j5PtznpOFx! z8L^%Hh6oh`D12-(2!8ex2wtH)S156{n7W9vY!^%5SNZxE5M2|3N}GbT4>d_}MB`0t zCCt|ZQMLyY5==bRldw4BqNGIbpBBjo68O4x3}DcUzxUzId=|6wxec+8Q_IT3*M3SN11F!ouPpr}r-EYtX1! z^HWcA7PwNht*=tg8jPydud9kT9yG7-nfhevxcEhHmG|~^aZZn=G)F4C=ur+vaY{^k zZP%05-5pEK>?@^Z<=jq~e%H>Qm~q{JZ(2-zm3smjtCe$PfugqXz)k(;N_e+c`b)KR zVqIYDKG`z)P=W1*>H@x1Yl2x1?wuFlwvjE3GQZ#rk5ew?`eGfT9KDe-v3(f%?!--v z)PS{G?_N)y_!NHiwRTr-B(c6^9Y^s>ML)kgobRh%q|cVwKuC0|b_-7vV{xYKPS{EW z1){IA0SPl_>6bq$=-gVr?D@Osn;I#DZF*n2c5xBm`n2jqFZdOuZYzaVlk%!DLw=X< zEk9nXtJJkiO2j$GOu8o3vVZK<>e-^`eA{BzAa*61tHgl2+9)ckGz%wpL*t2kv(ya< z>B-4*3)Noxc-KU+Q+;P>U!|HaDY4tjbF@mIX7ctL=TrZ$Nd-a4u9A3a31O~Im=QI% zZZB(H$AQB0L%A1;NR|8RDzdBiionuOn*~KX_W3(gPO{y9zHzbhT(g2c`AmrfAw`1+ zJsdZ*F6VH?QlzMPZn5i%HyGXQ?Twiv;*!W0==aszc59YPByDR7&wWi*$Rl{g z*xZO*3&ET@C5}=&Yc33Y)G0Qob-FWkI{(}kuTJp4d@nBGy29W5;>v3wFFx_}@)6?? z^3quPF1st-xV!n~B2hiT6`V4($-BqT>^vUK@%62rMp00p`IIdxjwLxyy`|DrR8|do zZ9DuT(QE4c()x3zg)1k#;dpt!C*aA$@EfCrSp^AcmT4kq9_BxZT3j30ar@{fsbZy| zV8y~~UWIdVu2N+wx*{$~VmzgdlugHrPA6)cTnehK?3<-OyHRVxY$0W-`8IuTBFYI) zL6b9OyLpNC>{>C~XPyvQ`6c6=gIHRfp23tfKIu$5$9Hq&-4_K6P}R!T^4aceI32^Q z%c@iS&Q@$2hi0buarSdMDId-$YfGOxaM?c@-kxLGUM$gjV+sX8q)4*}Do4`pUhgxy z!ZXnEvFP>tr{RW^M5-Px{UdX3Rd|fjqVn8)*WGzB^TtH_^<7J7P(q(|WPRY*SK}zV zitPvO<*mOM>y&ZKlKx6GO#7U3FF$Yvz${0No6goa=}s>#Pbi;*gTq72H7L4!=Je?^ zkGHfetajaeT>LuKbKES|nX-!w#40x|^nxsLG`Gj=bu6J@(p6K%KJ>BGzPL7Fi}vyz z*3|fC_Y}|}*`ys`jOWOI23Ph{Nc#F|G+t_aiQ}0&qooL`QGUmhYLrjfr1oBXC`G`p z^ABywO3n0C)EDhE^YR`qFW}#IHesgsi?yc7>(sK(Wn{eRzS8~W+3GQyY@P`c4}$v> z-5ZLWrwQ8p~c7=QY2iJmCDAxBT}nxOa6p2E3Und8F2wYocKPJ{={= ziZ@*crS$!sc=(8zJ(3n<*j-+qH(YAKHHAms2=zJD>J$a`&GIna>-Xh-hGU)SyUR9d z8D*uT3Y5Nl4a)bQF>%pD(dAZzFLla9s3EZ64CwwqLP5FEYUdZRGdTPp~39RiaO$F;hT!KYb zM!WkzS5Q9sq`QQj?+9YT=LvLKr~z5B9pw>)%~?w8>H95D|LvL6FFQj zZdg3dojrz{f$MRGyce=h6_neR12FD8=sG%ZdWv^@M6{;<2nDs=gmD zN!%&FWc}HrG3*(w{%OU`VnO#CPsMVRXTwV=SZyPSPz#BU9Q)Hz>sy^~bGYXDxE%ht zA>&Dy%>@2Y?>EVxf9|1|)*11(k0P>&SQmc})hz4tzkQjWHf@T2?zfJT%`_mNUAv6Uopd~{qX0#mWU7+#&a$QY9 zD%_*DUk>rh8D#h&i*sQ}D|s85;h>BF#vW)i5*j+Z7%zMs&2iTt z`=K$v!}Y&H1@?Q4!CVsFLvOAl+`?a9L7p$ql0E)zR~U=%7=W<}!@M-Y9Qi&tNseXC z!DAS>;xU+I{`)^o!59n|hGoaIY$S7I2O6KV4zXpfM#M1{vhiIsC*j0&!So4jJcB}? zpGQlJx1lj7Veetwj5Eear!t%zhjC-j;=jd#&Icsynsw2LHErb(%uLvEKj*w93D|O%shiiSby8*p6d7RFORJIEERI$MT8!emI|27T4mSWsJn@*v*`L;;>k_}S3 z?n}afal-Zq(-`j)e~uA}#}vS0(y4VMPjLfJc{HV=ZRH@Z4ERMaY##CcV>~cjG2QTd zXo7zW2jDxr#~RfUXg*0{s26t=WIaJP8*;p z44$&7JMNosBHb75-Yz*J$Kl_aL2=gkyA2VY3F|L5Ke?9E|H5at7z!6DZaX?nJ z@g)5C9)^D-(05keCM0}rBNEItLo?5s03Jqw2c4%3DB@)ped+}_t@q6DI{IuiWV2SphbmFNbe5aMl#{IeUyO2E?SW`YF3^F zi3g^|48Q~Pl*%=)A$+lo4tsF{abekD=&2v|?T@fCzhj$*^&PBhF(Mj(j>j^(p*0c7 zm25{#irtV*kt@<-=o9=by#M}fr;)_vEu?ISUa&&5!PbfZ9!#FXv|;K`?9<`T_}=&o zEr!0udJ5~?Kj$ed$JqY>_(x{Xz$e4JZ}8+Gk}vf@ORsK6vL)M)&Ydt42B!Q*cIGo= z!xqiGv;}Bkjpl%il020MJax_t1$CSy{ZTvz!>NM!5gQ7=D%7aJ1~2CsMe!1Ib@?M{7A$9n^>*YoAJ|43U{4%d{Q?iV zY<#b$mSTMiw(lEH(QPsxE|D;qxCFO)BG`#U;_ z^x<|joJBz`X8?zEqNW50Z1^{x`cdEhf~OcZoaqF8}_LLy| z_LFGM!zeVrjP4f>@f6tb`M({P!#x#u&=m{^elkopvSA|5Zc+Ehqi(L5Qkrtv7+RG)-QA0I}BkK&PDT^!PW z7>iavj7EoEU1Rd<&$Oo77YimHn5Quw-Y?D|x!ZoE4Ij=^*cV~y+u-)I%sA=D;ivOa zj(`IdrM@ml?!ZUR5L>W&l7g%nlF`QcL}dK<5Yn$ZfY#RTLz=)xdtMZf@ehFU_q3+t zLBnIPUdR3{#>2Qi9xX2UCL46yN4Mc29l1qEXz(;04gAKq(>wpG2z(?Cb)-f#Dh5&rD;g9<1Gxq5rUVv%Lq{a4*Q)uaR&mq5% zX~RQ1&N1Qt^Jo6F2wb4A(}QtH=qyFsK^7c9maT!0EP#(pfCdJS4j?_CfgZ^7{#RE? z9*21&JA2b(lcbHpxbJ>-1*zQ)9%jRxQP{IQ=2`OZ!;f)d;Ght(k>n*z2PPk3SvCe5 z=rd#)^Vp%@>&*Qc>DiTv@x?j|^Apy$7zgG#eAlz{OdI^q;2(y=BH-CXkZHe`98#7o z8+7oj9X&;i*ZSXV#@Pd}Ycb+ALDyouhvN_k@c;(=Bl98t zYB9P#M@H%XD52{bX`_F%3A%OrPz3NY*7pGa-^GE{Pk1h-gU^fqG5i=mx?SqQv|>Hah61N=1JWI+yIM;?5H@JDA*K`DxnE7r~hfs(0vTtX@5HQ-`*UKN4Pl(s60v1!|ZVaS^@r@Vf{fA(Q%P^ zp2GHFq`C>)x+Z9U&;I^XeCT*2!+NAGHcazHJDYRSww4T}UB8cv5i{dqFb30t`cIeo zPv_C~tqTK2a^JB$V%vaiEw)vR7%k>0EJuR>DLnt?;dDO6dJ*q8Nf!(|rUTaX_>6$B zL&J2V{+p%#^SSgh9@dX|&wHSe_%PxOOgu22cnr^f4$r?`;2SHFEION{9QTq!k_j6jQfApb2G+4Pd@(_JqZU~XZ9FQf`bk(?gt4< zGw$JV*vIGx$(}|8(D3yVBA^8K&4h9@?t2M=KHT>c-2J$R(Sx{0uq|X?LZC4Gy_X2M ziTi$n+(#Hd?jJ(Uc)t+70s8 zmY@;%Go@mltM4xkHM%G0q*}tJD;!Fw33C%#0z&L-MdBxIk|~{Pqi}hwfrJO4F^l7W z1sj`=NW`i`julZ|g~+=37}5p5V@pd4@~cUE0lbd{oK&v)*Jbu@fpe=1#A*Dh(?8C1 zR4F6Yh|K%9FtBO~ZPq;ETDjsu*mpHSY^iFbjgk&BAng@<+Nz-(Hczer>03c~5Io1kIIcrGPf#6&>&U54Eo86B^vSB7DwB!75 z^Y?R$wj!OB9WAUnLh%2gkKj*Z)*pOZ6!OjP?fqc+Bneqwh(NXldmwhdfvjB^pRPl~ zfop1Tu2^oDDdg<;{e=6_UZkiXFNj-kn=Y(?)&Fu2CT?7O%(njMS22i}nm>TJ%@H@` zQ*(mMpHG9j5}a3?0QEiNAm1GN`~tcDy1U`OUmx~q_GK%y;()_rkP+2C-2sgmBC2t= zcVsHO$=Hk`QNq9L4N&EcPM z-BIAv(}UxT=jZoe0EQ1#`{Gz2G~& z0rIT-(IVje-7oXW8UjocCT|R1AAeqZcNY?NR;wm-fA24hGm<>&-f{}bT&3r$3@W40 z>I4@Q^e7ARJuZ;|ip!sjf=+6-JfgX!aSF9k_Mei73I*D>Har621_CSpXYUt}YB$c-+3R28_it;Q`*j^%SE)PH@fF@O|)U$oRynEu8qf^?5f+=k0(uvM54s80WVYA>R`5 z;u4zYtBd^Fvg!Fp$lKw#C0Sbl`A?1VK;+Vxf+S#XFmI4~cz^@f3gNn~;qt0~KMIXA zUGUo&!-S2}i9V1QQmpWU{IoApy5WtiA00+|sb0vvA{nXQq@l&d^qdurpW^x-TpRE! z-oQCeTx&F3Ud4;-(TuIiHwmrjV}7*sU_`O>X;>|cW zNza8ruKNb;2jscwH3yhC+{xMxoNpm>!avYt7R2;%O$wG*oOi_aPnb7&GuI-svmuS3 z2aJEYK3oLdSM39NmGzJ>A#X3`YaHv&$%b8=|!1W8VHzAJ(`KKkIucWTIA!*3VE-ZvR zKh$qZ0B`(?CYH4a(RdT7GrwD(pbBzMw^Mu^`Ro$f_B0J`f_gEXswkvh83y^Iok->0 zPNZ5DinQut(caz?6xntO?S%7UIHt_4P4Va(~n(a8AjqH5-{^2R0Cz0wzB_VzrPG_<>b! z<%u75bzMesw|s`=Rkvz4n&+eY@~1h!xG-9O4!_ur)opR@1!N3!GtdF&g>Wn!_xoR! zf?by?|D`_B|6?@o#zm>C6P-Kv_mm=a;2A8hy7wcn&+?9d`@dN7r%Qsia)RQXnyrzI z=b+9hi_9tDcs!mvxV+|!v{4|kq0bp>L@2~fI&&vX&32`!=stB}vzwMxi zz50yb&H3@VAWfG?e1~R@{gpkCYq&_}_%JWx_@`}4Dl*LQ?-*yi;LwlrnBV!fC@G1! zsdw*c%0=6sog!m}GP^d&Gw+YEr^xIyPLK;T?F(x>OXgWH3^+e(-Fh4uWd-(3v{;<| zJD*>0tGbx5%Zg4~Z6;cqx&z7XG+i;mb-x>?6m23Y>9@9aRs7b0uqPm&O;8gJF;wHm z1hlpEz*jyS`C1<1g#zDAVtf&DUOrX8NwrOE#~LIXYBKj%V@7&SKEhHR_@YKW!lKXp z))C~?bOM<)97fw8okSAe+Fdgpmq!pZg5{^@f$f`ar?C5{>;LeAkb|m#sK@F=0Y~an zl^E;SuJ@AB!8c`S^QGN`g3ilZ`5l$a;n9ET_x{7>zn`WhC#LJLGYY*cm^wg^xdD@ai`65cIvztwOJB5T-%S78Y5B2^Ye&fohS;2TF7-R zP!sX$GMcq*C2o6$Pd2;|%s0V9alqtKC>rg&7-}cZA--yN28!w`K*4Zk4`~A!>%++L!Vi7O=P>8bsP;s0uSyV`-mHGu19}{1$08P< zKJ+lxL>KA;)M_H&_ePoMU~d_@FTq_Gk!oWM`OK*9LNwh$=`*1vxP%GAjA$)C z(Kv&_Fc^pPsOosHFIey3ck}7b z7(Fva`vjMt!dK&hFhpz2Mx1VoKd?H?cLO*mgr&GRyOrcKZhM*jc{|tb|7kws!f1c_ zxf4T{KLWaZRXOPlaL9h8JsD#)gzLGg+M7_%b3gIXzO>vO)8SA>_Jd5?bbIf_Y+*vBk99b$fXawsI ZjRN1H(HN~n1;)bXK4^n576oUi{2yv-$r%6u literal 0 HcmV?d00001 diff --git a/data/midori.rc b/data/midori.rc index b1f1556b..63a5dc09 100644 --- a/data/midori.rc +++ b/data/midori.rc @@ -1,2 +1,2 @@ -IDR_MAINFRAME ICON DISCARDABLE "../_build_/default/data/midori.ico" +IDR_MAINFRAME ICON DISCARDABLE "midori.ico" diff --git a/wscript b/wscript index fbbb6e8b..59595b48 100644 --- a/wscript +++ b/wscript @@ -124,8 +124,6 @@ def configure (conf): icons = 'no ' if is_mingw (conf.env) or Options.platform == 'win32': - if not conf.find_program ('convert', var='CONVERT'): - Utils.pprint ('YELLOW', 'midori.ico won\'t be created') conf.find_program ('windres', var='WINRC') conf.env['platform'] = 'win32' @@ -147,9 +145,6 @@ def configure (conf): Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.') - if conf.env['CONVERT'] and not conf.env['WINRC']: - Utils.pprint ('YELLOW', 'midori.ico won\'t be created') - dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) if conf.env['PREFIX'] == '/usr': dirname_default ('SYSCONFDIR', '/etc') @@ -415,31 +410,6 @@ def write_linguas_file (self): write_linguas_file = feature ('intltool_po')(write_linguas_file) def build (bld): - def image_to_win32ico (task): - 'Converts an image to a Win32 ico' - - if not os.path.exists (bld.env['CONVERT']): - return 1 - - infile = task.inputs[0].abspath (task.env) - outfile = task.outputs[0].abspath (task.env) - command = bld.env['CONVERT'] + ' -background transparent \ - -geometry 16x16 -extent 16x16 ' + \ - infile + ' ' + outfile - if Utils.exec_command (command): - return 1 - - if task.chmod: - os.chmod (outfile, task.chmod) - return 0 - - if bld.env['WINRC']: - obj = bld.new_task_gen ('copy', - fun = image_to_win32ico, - source = 'icons/16x16/midori.png', - target = 'data/midori.ico', - before = 'cc') - bld.add_group () bld.add_subdirs ('midori icons') From a84a077ac84bb43250b09cc657856b128b20d050 Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Sat, 26 Jun 2010 15:38:37 +0200 Subject: [PATCH 2736/2970] Implement default configuration files on Windows --- midori/sokoke.c | 12 +++++++++++- wscript | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index c3f3d826..4f7e92d7 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1455,17 +1455,27 @@ sokoke_find_config_filename (const gchar* folder, const gchar* const* config_dirs = g_get_system_config_dirs (); guint i = 0; const gchar* config_dir; + gchar* path; if (!folder) folder = ""; while ((config_dir = config_dirs[i++])) { - gchar* path = g_build_filename (config_dir, PACKAGE_NAME, folder, filename, NULL); + path = g_build_filename (config_dir, PACKAGE_NAME, folder, filename, NULL); if (g_access (path, F_OK) == 0) return path; g_free (path); } + + #ifdef G_OS_WIN32 + config_dir = g_win32_get_package_installation_directory_of_module (NULL); + path = g_build_filename (config_dir, "etc", "xdg", PACKAGE_NAME, folder, filename, NULL); + if (g_access (path, F_OK) == 0) + return path; + g_free (path); + #endif + return g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder, filename, NULL); } diff --git a/wscript b/wscript index 59595b48..76de481a 100644 --- a/wscript +++ b/wscript @@ -503,7 +503,15 @@ def build (bld): bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css') # FIXME: Determine the library naming for other platforms - if Options.platform == 'linux': + if bld.env['platform'] == 'win32': + extensions = os.listdir ('data/extensions') + for extension in extensions: + folder = 'lib' + extension + '.dll' + source = 'data/extensions/' + extension + '/config' + if os.path.exists (source): + bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \ + '/extensions/' + folder, source) + elif Options.platform == 'linux': extensions = os.listdir ('data/extensions') for extension in extensions: folder = 'lib' + extension + '.so' From 7c4263ebca3ccdea14dd0a645ee3c13aed205bc4 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 22 Jun 2010 13:08:55 -0400 Subject: [PATCH 2737/2970] Work around sqlite3_mprintf for bookmark metadata --- panels/midori-bookmarks.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index cbac36c7..225a73d1 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -214,13 +214,11 @@ midori_bookmarks_insert_item_db (sqlite3* db, { gchar* sqlcmd; char* errmsg = NULL; - gint64 type; + int type = 0; gchar* parent; if (katze_item_get_uri (item)) type = 1; - else - type = 0; if (folder) parent = g_strdup (folder); @@ -229,15 +227,18 @@ midori_bookmarks_insert_item_db (sqlite3* db, else parent = g_strdup (""); - sqlcmd = sqlite3_mprintf ( + /* Workaround a sqlite3_mprintf error with + handling of katze_item_get_meta_integer(). */ + /* FIXME: Need proper single quote escaping. */ + sqlcmd = g_strdup_printf ( "INSERT into bookmarks (uri, title, folder, type, toolbar, app) values" - " ('%q', '%q', '%q', %u, %u, %u)", + " ('%s', '%s', '%s', %d, %d, %d)", katze_item_get_uri (item), katze_item_get_name (item), parent, type, - katze_item_get_meta_integer (item, "toolbar"), - katze_item_get_meta_integer (item, "app")); + (int)katze_item_get_meta_integer (item, "toolbar"), + (int)katze_item_get_meta_integer (item, "app")); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { @@ -246,7 +247,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, } g_free (parent); - sqlite3_free (sqlcmd); + g_free (sqlcmd); } void From 2ec272eb9603f523fe307b424595e37ef7ab8e0a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 24 Jun 2010 21:47:02 -0400 Subject: [PATCH 2738/2970] Rip the old bookmarkbar out of the browser --- midori/midori-browser.c | 173 +--------------------------------------- 1 file changed, 3 insertions(+), 170 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e42bd7c2..fafb0894 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -917,7 +917,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_title))); katze_item_set_text (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_desc))); - /* FIXME: Toolbar is not working?? */ katze_item_set_meta_integer (bookmark, "toolbar", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))); if (!KATZE_IS_ARRAY (bookmark)) @@ -3652,11 +3651,6 @@ midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button, return FALSE; } -static void -midori_browser_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* item, - GtkWidget* toolbar); - static void _action_location_focus_in (GtkAction* action, MidoriBrowser* browser) @@ -4271,34 +4265,6 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, return FALSE; } -static gboolean -midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, - GdkEventButton* event, - MidoriBrowser* browser) -{ - KatzeItem* item; - gint n; - - if (event->button == 2) - { - item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - if (katze_item_get_uri (item)) - { - n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - } - else if (event->button == 3) - { - item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - midori_browser_bookmark_popup (toolitem, NULL, item, browser); - return TRUE; - } - return FALSE; -} - static void _action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) @@ -5500,9 +5466,6 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser, static void midori_browser_destroy_cb (MidoriBrowser* browser) { - if (browser->bookmarks) - midori_browser_set_bookmarks (browser, NULL); - if (G_UNLIKELY (browser->panel_timeout)) g_source_remove (browser->panel_timeout); if (G_UNLIKELY (browser->alloc_timeout)) @@ -6205,7 +6168,6 @@ midori_browser_init (MidoriBrowser* browser) G_CALLBACK (midori_browser_bookmark_homepage_clicked_cb), browser); g_signal_connect (gtk_bin_get_child (GTK_BIN (browser->homepage)), "button-press-event", G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser); - gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), browser->homepage, -1); #if HAVE_HILDON hildon_window_add_toolbar (HILDON_WINDOW (browser), GTK_TOOLBAR (browser->bookmarkbar)); @@ -6668,147 +6630,18 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_unset (&value); } -static GtkWidget* -midori_browser_toolitem_for_item (KatzeItem* item, - GtkWidget* toolbar) - -{ - GList* children = gtk_container_get_children (GTK_CONTAINER (toolbar)); - while (children != NULL) - { - void* toolitem = children->data; - void* found_item = g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); - - if (found_item == item) - return toolitem; - children = g_list_next (children); - } - return NULL; -} - -static void -midori_browser_bookmarks_remove_item_cb (KatzeArray* array, - KatzeItem* removed_item, - GtkWidget* toolbar) -{ - GtkWidget* toolitem = midori_browser_toolitem_for_item (removed_item, toolbar); - if (toolitem) - gtk_widget_destroy (toolitem); -} - -static void -midori_browser_bookmarks_meta_data_changed_toolbar_cb (KatzeItem* item, - const gchar* key, - GtkWidget* toolbar) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); - - if (katze_item_get_meta_string (item, "toolbar")) - { - GtkToolItem* toolitem; - - if ((toolitem = (GtkToolItem*)midori_browser_toolitem_for_item (item, toolbar))) - return; - - toolitem = katze_array_action_create_tool_item_for ( - KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item); - g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); - - if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item)) - { - GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem)); - g_signal_connect (child, "button-press-event", - G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), - browser); - g_object_set_data (G_OBJECT (child), "KatzeItem", item); - } - else /* Separator */ - { - gtk_tool_item_set_use_drag_window (toolitem, TRUE); - g_signal_connect (toolitem, "button-press-event", - G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb), - browser); - } - gtk_widget_show (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - } - else - { - KatzeArray* array = katze_item_get_parent (item); - midori_browser_bookmarks_remove_item_cb (array, item, toolbar); - } -} - -static void -midori_browser_bookmarks_connect_item (KatzeArray* array, - KatzeItem* item, - GtkWidget* toolbar) -{ - if (KATZE_IS_ARRAY (item)) - { - KatzeItem* child; - guint i = 0; - while ((child = katze_array_get_nth_item ((KatzeArray*)item, i++))) - midori_browser_bookmarks_connect_item ((KatzeArray*)item, child, toolbar); - - g_signal_connect_after (item, "add-item", - G_CALLBACK (midori_browser_bookmarks_add_item_cb), toolbar); - g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_browser_bookmarks_remove_item_cb), toolbar); - } - - if (katze_item_get_meta_string (item, "toolbar")) - midori_browser_bookmarks_meta_data_changed_toolbar_cb (item, "toolbar", toolbar); - g_signal_connect (item, "meta-data-changed::toolbar", - G_CALLBACK (midori_browser_bookmarks_meta_data_changed_toolbar_cb), toolbar); -} - -static void -midori_browser_bookmarks_add_item_cb (KatzeArray* array, - KatzeItem* item, - GtkWidget* toolbar) -{ - midori_browser_bookmarks_connect_item (array, item, toolbar); -} - static void midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks) { - if (browser->bookmarks == bookmarks) - return; - - if (browser->bookmarks) + if (!browser->bookmarks) { - g_signal_handlers_disconnect_by_func ( - browser->bookmarks, midori_browser_bookmarks_add_item_cb, browser->bookmarkbar); - g_signal_handlers_disconnect_by_func ( - browser->bookmarks, midori_browser_bookmarks_remove_item_cb, browser->bookmarkbar); - /* FIXME: Disconnect recursively */ - } - - if (bookmarks) g_object_ref (bookmarks); - katze_object_assign (browser->bookmarks, bookmarks); + katze_object_assign (browser->bookmarks, bookmarks); + } g_object_set (_action_by_name (browser, "Bookmarks"), "array", browser->bookmarks, NULL); - - _action_set_sensitive (browser, "BookmarkAdd", FALSE); - _action_set_sensitive (browser, "BookmarkFolderAdd", FALSE); - - if (!browser->bookmarks) - return; - - midori_browser_bookmarks_connect_item (NULL, (KatzeItem*)browser->bookmarks, - browser->bookmarkbar); - g_signal_connect (browser->bookmarks, "add-item", - G_CALLBACK (midori_browser_bookmarks_add_item_cb), browser->bookmarkbar); - g_signal_connect (browser->bookmarks, "remove-item", - G_CALLBACK (midori_browser_bookmarks_remove_item_cb), browser->bookmarkbar); - - _action_set_sensitive (browser, "BookmarkAdd", TRUE); - _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE); } static void From 3eea7c933d5e129881e08876819f0e5a5914adbc Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 24 Jun 2010 22:05:26 -0400 Subject: [PATCH 2739/2970] Reimplement bookmarkbar with sqlite --- midori/midori-browser.c | 144 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index fafb0894..3becd48b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6630,10 +6630,149 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, g_value_unset (&value); } +static gboolean +midori_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser) +{ + KatzeItem* item; + gint n; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); + if (event->button == 2) + { + if (katze_item_get_uri (item)) + { + n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + _midori_browser_set_current_page_smartly (browser, n); + + return TRUE; + } + else + { + /* FIXME: This is a folder and we need to popup a menu */ + } + } + else if (event->button == 3) + { + midori_browser_bookmark_popup (toolitem, NULL, item, browser); + return TRUE; + } + return FALSE; +} + +static void +midori_bookmarkbar_insert_item (GtkWidget* toolbar, + KatzeItem* item) +{ + GtkToolItem* toolitem; + + MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); + + toolitem = katze_array_action_create_tool_item_for ( + KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item); + g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); + + if (KATZE_IS_ITEM (item)) + { + GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem)); + g_object_set_data (G_OBJECT (child), "KatzeItem", item); + } + else /* Separator */ + gtk_tool_item_set_use_drag_window (toolitem, TRUE); + + g_signal_connect (toolitem, "button-press-event", + G_CALLBACK (midori_bookmarkbar_item_button_press_event_cb), + browser); + gtk_widget_show (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); +} + +static void +midori_bookmarkbar_populate (MidoriBrowser* browser) +{ + sqlite3* db; + gint result; + const gchar* sqlcmd; + sqlite3_stmt* statement; + + /* FIXME: We need to insert copy of a homepage. */ + gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), browser->homepage, -1); + + db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); + if (!db) + return; + + sqlcmd = "SELECT uri, title, app FROM bookmarks WHERE " + " toolbar = 1 ORDER BY type ASC"; + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); + if (result != SQLITE_OK) + { + _action_set_sensitive (browser, "BookmarkAdd", FALSE); + _action_set_sensitive (browser, "BookmarkFolderAdd", FALSE); + return; + } + + while ((result = sqlite3_step (statement)) == SQLITE_ROW) + { + gint app; + KatzeItem* item; + const unsigned char* uri; + const unsigned char* title; + + uri = sqlite3_column_text (statement, 0); + title = sqlite3_column_text (statement, 1); + app = sqlite3_column_int64 (statement, 2); + + item = katze_item_new (); + katze_item_set_name (item, (gchar*)title); + if (uri) + { + katze_item_set_uri (item, (gchar*)uri); + katze_item_set_meta_integer (item, "app", app); + } + midori_bookmarkbar_insert_item (browser->bookmarkbar, item); + } + _action_set_sensitive (browser, "BookmarkAdd", TRUE); + _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE); +} + +static void +midori_bookmarkbar_clear (GtkWidget* toolbar) +{ + GList* children = gtk_container_get_children (GTK_CONTAINER (toolbar)); + while (children != NULL) + { + gtk_widget_destroy (children->data); + children = g_list_next (children); + } +} + +static void +midori_browser_show_bookmarkbar_notify_value_cb (MidoriWebSettings* settings, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + gboolean show_bookmarkbar; + + g_object_get (browser->settings, "show-bookmarkbar", + &show_bookmarkbar, NULL); + + if (!show_bookmarkbar) + midori_bookmarkbar_clear (browser->bookmarkbar); + else + midori_bookmarkbar_populate (browser); +} + static void midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks) { + MidoriWebSettings* settings; + + if (!bookmarks) + return; + if (!browser->bookmarks) { g_object_ref (bookmarks); @@ -6642,6 +6781,11 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, g_object_set (_action_by_name (browser, "Bookmarks"), "array", browser->bookmarks, NULL); + + settings = midori_browser_get_settings (browser); + g_signal_connect (settings, "notify::show-bookmarkbar", + G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser); + g_object_notify (G_OBJECT (settings), "show-bookmarkbar"); } static void From 08dab16bc22b755ea56d81fd06d2122398c3052b Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 00:11:36 -0400 Subject: [PATCH 2740/2970] Refactoring of bookmarks add functions --- midori/midori-browser.c | 30 +++++---------------------- midori/midori-view.c | 9 ++++++++ panels/midori-bookmarks.c | 18 +++++++--------- panels/midori-history.c | 43 ++++++++++++++++----------------------- 4 files changed, 38 insertions(+), 62 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3becd48b..5b3fd372 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -956,20 +956,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_widget_destroy (dialog); } -static void -midori_view_add_bookmark_cb (GtkWidget* menuitem, - const gchar* uri, - GtkWidget* view) -{ - KatzeItem* item; - MidoriBrowser* browser; - - item = katze_item_new (); - katze_item_set_uri (item, uri); - browser = midori_browser_get_for_widget (menuitem); - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); -} - #if WEBKIT_CHECK_VERSION (1, 1, 3) static gboolean midori_browser_prepare_download (MidoriBrowser* browser, @@ -1601,8 +1587,6 @@ _midori_browser_add_tab (MidoriBrowser* browser, #endif "signal::search-text", midori_view_search_text_cb, browser, - "signal::add-bookmark", - midori_view_add_bookmark_cb, browser, "signal::save-as", midori_view_save_as_cb, browser, "signal::add-speed-dial", @@ -4269,14 +4253,10 @@ static void _action_bookmark_add_activate (GtkAction* action, MidoriBrowser* browser) { - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); -} - -static void -_action_bookmark_folder_add_activate (GtkAction* action, - MidoriBrowser* browser) -{ - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); + if (g_str_equal (gtk_action_get_name (action), "BookmarkFolderAdd")) + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); + else + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void @@ -5276,7 +5256,7 @@ static const GtkActionEntry entries[] = N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, { "BookmarkFolderAdd", NULL, N_("Add a new _folder"), "", - N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) }, + N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_add_activate) }, { "BookmarksImport", NULL, N_("_Import bookmarks"), "", NULL, G_CALLBACK (_action_bookmarks_import_activate) }, diff --git a/midori/midori-view.c b/midori/midori-view.c index a889492f..a22daf14 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -397,6 +397,15 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_BOOLEAN, G_TYPE_STRING); + /** + * MidoriView::add-bookmark: + * @view: the object on which the signal is emitted + * @uri: the bookmark URI + * + * Emitted when a bookmark is added. + * + * Deprecated: 0.2.7 + */ signals[ADD_BOOKMARK] = g_signal_new ( "add-bookmark", G_TYPE_FROM_CLASS (class), diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 225a73d1..b98724f4 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -309,7 +309,10 @@ midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) { MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); /* FIXME: Take selected folder into account */ - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); + if (g_str_equal (gtk_widget_get_name (toolitem), "BookmarkFolderAdd")) + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); + else + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void @@ -365,15 +368,6 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, } } -static void -midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (toolitem)); - /* FIXME: Take selected folder into account */ - midori_browser_edit_bookmark_dialog_new (browser, - NULL, TRUE, TRUE); -} - static void midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, MidoriBookmarks* bookmarks) @@ -419,6 +413,7 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); bookmarks->toolbar = toolbar; toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); + gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd"); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add a new bookmark")); gtk_tool_item_set_is_important (toolitem, TRUE); @@ -448,10 +443,11 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); + gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd"); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add a new folder")); g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_bookmarks_folder_clicked_cb), bookmarks); + G_CALLBACK (midori_bookmarks_add_clicked_cb), bookmarks); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); diff --git a/panels/midori-history.c b/panels/midori-history.c index 2eed597d..ba3fe3f7 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -336,14 +336,6 @@ midori_history_read_from_db (MidoriHistory* history, return FALSE; } -static void -midori_history_add_clicked_cb (GtkWidget* toolitem) -{ - MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); - /* FIXME: Take selected folder into account */ - midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); -} - static void midori_history_delete_clicked_cb (GtkWidget* toolitem, MidoriHistory* history) @@ -416,6 +408,21 @@ midori_history_cursor_or_row_changed_cb (GtkTreeView* treeview, } #endif +static void +midori_history_bookmark_add_cb (GtkWidget* menuitem, + MidoriHistory* history) +{ + KatzeItem* item; + + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + + if (KATZE_IS_ITEM (item) && katze_item_get_uri (item)) + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); + else + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); +} + static GtkWidget* midori_history_get_toolbar (MidoriViewable* viewable) { @@ -437,7 +444,7 @@ midori_history_get_toolbar (MidoriViewable* viewable) _("Bookmark the selected history item")); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_history_add_clicked_cb), history); + G_CALLBACK (midori_history_bookmark_add_cb), history); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); history->bookmark = GTK_WIDGET (toolitem); @@ -718,22 +725,6 @@ midori_history_open_in_window_activate_cb (GtkWidget* menuitem, } } -static void -midori_history_bookmark_activate_cb (GtkWidget* menuitem, - MidoriHistory* history) -{ - KatzeItem* item; - const gchar* uri; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - - if (uri && *uri) - { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); - midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); - } -} static void midori_history_popup (GtkWidget* widget, @@ -758,7 +749,7 @@ midori_history_popup (GtkWidget* widget, midori_history_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), item, midori_history_open_in_window_activate_cb, history); midori_history_popup_item (menu, STOCK_BOOKMARK_ADD, NULL, - item, midori_history_bookmark_activate_cb, history); + item, midori_history_bookmark_add_cb, history); } menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); From b2d0d0af8ec2be672631d6acaed680a9958d9bea Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 00:24:53 -0400 Subject: [PATCH 2741/2970] Show bookmarksbar after item was added to db and not before --- midori/midori-browser.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5b3fd372..958da3cb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -911,7 +911,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { gchar* selected; - KatzeArray* folder; katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); @@ -927,11 +926,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app))); } - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) - if (!gtk_widget_get_visible (browser->bookmarkbar)) - _action_set_active (browser, "Bookmarkbar", TRUE); - - folder = browser->bookmarks; selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); #if HAVE_SQLITE @@ -950,6 +944,10 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } else midori_bookmarks_insert_item_db (db, bookmark, selected); + + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) + if (!gtk_widget_get_visible (browser->bookmarkbar)) + _action_set_active (browser, "Bookmarkbar", TRUE); #endif g_free (selected); } From 3b55b7ab7bbe37112e45a7bbb81abf2abb3fd07b Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 09:50:19 -0400 Subject: [PATCH 2742/2970] Merge _action_zoom_*_activate into _action_zoom_activate () --- midori/midori-browser.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 958da3cb..9788bd54 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3232,31 +3232,20 @@ _action_reload_stop_activate (GtkAction* action, } static void -_action_zoom_in_activate (GtkAction* action, - MidoriBrowser* browser) +_action_zoom_activate (GtkAction* action, + MidoriBrowser* browser) { GtkWidget* view = midori_browser_get_current_tab (browser); - if (view) + if (!view) + return; + + if (g_str_equal (gtk_action_get_name (action), "ZoomIn")) midori_view_set_zoom_level (MIDORI_VIEW (view), midori_view_get_zoom_level (MIDORI_VIEW (view)) + 0.25f); -} - -static void -_action_zoom_out_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view = midori_browser_get_current_tab (browser); - if (view) + else if (g_str_equal (gtk_action_get_name (action), "ZoomOut")) midori_view_set_zoom_level (MIDORI_VIEW (view), midori_view_get_zoom_level (MIDORI_VIEW (view)) - 0.25f); -} - -static void -_action_zoom_normal_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view = midori_browser_get_current_tab (browser); - if (view) + else midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f); } @@ -5195,13 +5184,13 @@ static const GtkActionEntry entries[] = N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", - N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) }, + N_("Increase the zoom level"), G_CALLBACK (_action_zoom_activate) }, { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", - N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) }, + N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_activate) }, { "ZoomNormal", GTK_STOCK_ZOOM_100, NULL, "0", - N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) }, + N_("Reset the zoom level"), G_CALLBACK (_action_zoom_activate) }, { "Encoding", NULL, N_("_Encoding") }, { "SourceView", NULL, N_("View So_urce"), "U", From 6d7e1838ea217fcea9590359554a6499de1af5dd Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 10:11:40 -0400 Subject: [PATCH 2743/2970] Merge _action_(back|forward|Previous|Next)into _action_navigation_activate () --- midori/midori-browser.c | 87 +++++++++++++---------------------------- 1 file changed, 27 insertions(+), 60 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9788bd54..2a1b1853 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3467,7 +3467,7 @@ _action_scroll_somewhere_activate (GtkAction* action, if (g_str_equal (name, "ScrollLeft")) webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, -1); - if (g_str_equal (name, "ScrollDown")) + else if (g_str_equal (name, "ScrollDown")) webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_DISPLAY_LINES, 1); else if (g_str_equal (name, "ScrollUp")) webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_DISPLAY_LINES, -1); @@ -3477,10 +3477,13 @@ _action_scroll_somewhere_activate (GtkAction* action, #endif static void -_action_back_activate (GtkAction* action, - MidoriBrowser* browser) +_action_navigation_activate (GtkAction* action, + MidoriBrowser* browser) { - GtkWidget* view; + MidoriView* view; + GtkWidget* tab; + gchar* uri; + const gchar* name; if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) { @@ -3488,66 +3491,30 @@ _action_back_activate (GtkAction* action, return; } - view = midori_browser_get_current_tab (browser); - if (view) - midori_view_go_back (MIDORI_VIEW (view)); -} - -static void -_action_forward_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view; - - if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) - { - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); + tab = midori_browser_get_current_tab (browser); + if (!tab) return; - } - view = midori_browser_get_current_tab (browser); - if (view) - midori_view_go_forward (MIDORI_VIEW (view)); -} + view = MIDORI_VIEW (tab); -static void -_action_previous_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view; + name = gtk_action_get_name (action); - if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) + if (g_str_equal (name, "Back")) + midori_view_go_back (view); + else if (g_str_equal (name, "Forward")) + midori_view_go_forward (view); + else if (g_str_equal (name, "Previous")) { - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); - return; - } - - view = midori_browser_get_current_tab (browser); - if (view) - { - gchar* uri = g_strdup (midori_view_get_previous_page (MIDORI_VIEW (view))); - midori_view_set_uri (MIDORI_VIEW (view), uri); + /* Duplicate here because the URI pointer might change */ + uri = g_strdup (midori_view_get_previous_page (view)); + midori_view_set_uri (view, uri); g_free (uri); } -} - -static void -_action_next_activate (GtkAction* action, - MidoriBrowser* browser) -{ - GtkWidget* view; - - if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) + else if (g_str_equal (name, "Next")) { - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); - return; - } - - view = midori_browser_get_current_tab (browser); - if (view) - { - gchar* uri = g_strdup (midori_view_get_next_page (MIDORI_VIEW (view))); - midori_view_set_uri (MIDORI_VIEW (view), uri); + /* Duplicate here because the URI pointer might change */ + uri = g_strdup (midori_view_get_next_page (view)); + midori_view_set_uri (view, uri); g_free (uri); } } @@ -5216,18 +5183,18 @@ static const GtkActionEntry entries[] = { "Go", NULL, N_("_Go") }, { "Back", GTK_STOCK_GO_BACK, NULL, "Left", - N_("Go back to the previous page"), G_CALLBACK (_action_back_activate) }, + N_("Go back to the previous page"), G_CALLBACK (_action_navigation_activate) }, { "Forward", GTK_STOCK_GO_FORWARD, NULL, "Right", - N_("Go forward to the next page"), G_CALLBACK (_action_forward_activate) }, + N_("Go forward to the next page"), G_CALLBACK (_action_navigation_activate) }, { "Previous", GTK_STOCK_MEDIA_PREVIOUS, NULL, "Left", /* i18n: Visit the previous logical page, ie. in a forum or blog */ - N_("Go to the previous sub-page"), G_CALLBACK (_action_previous_activate) }, + N_("Go to the previous sub-page"), G_CALLBACK (_action_navigation_activate) }, { "Next", GTK_STOCK_MEDIA_NEXT, NULL, "Right", /* i18n: Visit the following logical page, ie. in a forum or blog */ - N_("Go to the next sub-page"), G_CALLBACK (_action_next_activate) }, + N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, { "Homepage", STOCK_HOMEPAGE, NULL, "Home", N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, From 0bc4933c17c8a7438d4b0667dbe7bc6738a74ed3 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 11:18:22 -0400 Subject: [PATCH 2744/2970] Add homepage handling in _action_navigation_activate () --- midori/midori-browser.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2a1b1853..5302d7e5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3517,23 +3517,12 @@ _action_navigation_activate (GtkAction* action, midori_view_set_uri (view, uri); g_free (uri); } -} - -static void -_action_homepage_activate (GtkAction* action, - MidoriBrowser* browser) -{ - gchar* homepage; - - if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) + else if (g_str_equal (name, "Homepage")) { - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); - return; + g_object_get (browser->settings, "homepage", &uri, NULL); + midori_view_set_uri (view, uri); + g_free (uri); } - - g_object_get (browser->settings, "homepage", &homepage, NULL); - midori_browser_set_current_uri (browser, homepage); - g_free (homepage); } static void @@ -5197,7 +5186,7 @@ static const GtkActionEntry entries[] = N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, { "Homepage", STOCK_HOMEPAGE, NULL, "Home", - N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, + N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) }, { "TrashEmpty", GTK_STOCK_CLEAR, N_("Empty Trash"), "", N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, From 6e878c2881cd136ebf9b212f6380cfc69c231a49 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 11:30:59 -0400 Subject: [PATCH 2745/2970] Merge _menu_middle_click_on_navigation_action with _action_navigation_activate --- midori/midori-browser.c | 135 +++++----------------------------------- 1 file changed, 17 insertions(+), 118 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5302d7e5..4fbbfb3e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3476,7 +3476,7 @@ _action_scroll_somewhere_activate (GtkAction* action, } #endif -static void +static gboolean _action_navigation_activate (GtkAction* action, MidoriBrowser* browser) { @@ -3485,30 +3485,39 @@ _action_navigation_activate (GtkAction* action, gchar* uri; const gchar* name; + g_assert (GTK_IS_ACTION (action)); + if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) { g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0); - return; + return FALSE; } tab = midori_browser_get_current_tab (browser); if (!tab) - return; + return FALSE; view = MIDORI_VIEW (tab); name = gtk_action_get_name (action); if (g_str_equal (name, "Back")) + { midori_view_go_back (view); + return TRUE; + } else if (g_str_equal (name, "Forward")) + { midori_view_go_forward (view); + return TRUE; + } else if (g_str_equal (name, "Previous")) { /* Duplicate here because the URI pointer might change */ uri = g_strdup (midori_view_get_previous_page (view)); midori_view_set_uri (view, uri); g_free (uri); + return TRUE; } else if (g_str_equal (name, "Next")) { @@ -3516,13 +3525,16 @@ _action_navigation_activate (GtkAction* action, uri = g_strdup (midori_view_get_next_page (view)); midori_view_set_uri (view, uri); g_free (uri); + return TRUE; } else if (g_str_equal (name, "Homepage")) { g_object_get (browser->settings, "homepage", &uri, NULL); midori_view_set_uri (view, uri); g_free (uri); + return TRUE; } + return FALSE; } static void @@ -4063,119 +4075,6 @@ midori_browser_menu_button_press_event_cb (GtkWidget* toolitem, return FALSE; } -static gboolean -midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser, - GtkAction* action) -{ - const gchar* name; - gchar* homepage; - - g_return_val_if_fail (action != NULL, FALSE); - - g_object_get (browser->settings, "homepage", &homepage, NULL); - - name = gtk_action_get_name (action); - - /* We use a trick here to implement middle click and prevent the default - "activate" callback from being invoked. We set "midori-middle-click" - as GObject data and check the value in the "activate" callback. */ - - if (g_str_equal (name, "Homepage")) - { - gint n; - - n = midori_browser_add_uri (browser, homepage); - _midori_browser_set_current_page_smartly (browser, n); - - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1); - - return TRUE; - } - else if (g_str_equal (name, "Back")) - { - GtkWidget* view; - GtkWidget* page; - WebKitWebBackForwardList* back_forward_list; - WebKitWebHistoryItem* back_item; - const gchar* back_uri; - gint n; - - page = midori_browser_get_current_tab (browser); - view = midori_view_get_web_view (MIDORI_VIEW (page)); - - back_forward_list = - webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); - - back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); - back_uri = webkit_web_history_item_get_uri (back_item); - - n = midori_browser_add_uri (browser, back_uri); - _midori_browser_set_current_page_smartly (browser, n); - - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1); - - return TRUE; - } - else if (g_str_equal (name, "Forward")) - { - GtkWidget *view; - GtkWidget *page; - WebKitWebBackForwardList *back_forward_list; - WebKitWebHistoryItem *forward_item; - const gchar *forward_uri; - gint n; - - page = midori_browser_get_current_tab (browser); - view = midori_view_get_web_view (MIDORI_VIEW (page)); - - back_forward_list = - webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); - - forward_item = - webkit_web_back_forward_list_get_forward_item (back_forward_list); - forward_uri = webkit_web_history_item_get_uri (forward_item); - - n = midori_browser_add_uri (browser, forward_uri); - _midori_browser_set_current_page_smartly (browser, n); - - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1); - - return TRUE; - } - else if (g_str_equal (name, "Previous")) - { - GtkWidget *view; - gint n; - - view = midori_browser_get_current_tab (browser); - n = midori_browser_add_uri (browser, - midori_view_get_previous_page (MIDORI_VIEW (view))); - _midori_browser_set_current_page_smartly (browser, n); - - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1); - - return TRUE; - } - else if (g_str_equal (name, "Next")) - { - GtkWidget *view; - gint n; - - view = midori_browser_get_current_tab (browser); - n = midori_browser_add_uri (browser, - midori_view_get_next_page (MIDORI_VIEW (view))); - _midori_browser_set_current_page_smartly (browser, n); - - g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)1); - - return TRUE; - } - - g_free (homepage); - - return FALSE; -} - static gboolean midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, GdkEventButton* event, @@ -4187,7 +4086,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (toolitem)); - return midori_browser_menu_middle_click_on_navigation_action (browser, action); + return _action_navigation_activate (action, browser); } return FALSE; } @@ -6289,7 +6188,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GtkAction* action = gtk_activatable_get_related_action ( GTK_ACTIVATABLE (parent)); - return midori_browser_menu_middle_click_on_navigation_action (browser, action); + return _action_navigation_activate (action, browser); } else if (event->button == 3) { From dc9cb532d9d87a0ee17cb5e31b8eefd526b657a2 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 25 Jun 2010 11:55:04 -0400 Subject: [PATCH 2746/2970] Connect right-click correctly on bookmarkbar items --- midori/midori-browser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4fbbfb3e..304ec25e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6499,13 +6499,13 @@ midori_bookmarkbar_insert_item (GtkWidget* toolbar, { GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem)); g_object_set_data (G_OBJECT (child), "KatzeItem", item); + g_signal_connect (child, "button-press-event", + G_CALLBACK (midori_bookmarkbar_item_button_press_event_cb), + browser); } else /* Separator */ gtk_tool_item_set_use_drag_window (toolitem, TRUE); - g_signal_connect (toolitem, "button-press-event", - G_CALLBACK (midori_bookmarkbar_item_button_press_event_cb), - browser); gtk_widget_show (GTK_WIDGET (toolitem)); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); } From 07659cc57f597fe48e591009c508de12ef03b225 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sat, 26 Jun 2010 22:07:14 +0200 Subject: [PATCH 2747/2970] Update Russian translation --- po/ru.po | 825 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 424 insertions(+), 401 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5090351a..bcc09f42 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.2.4\n" +"Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 19:47+0900\n" -"PO-Revision-Date: 2010-06-02 20:35+0800\n" +"POT-Creation-Date: 2010-06-26 00:33+0900\n" +"PO-Revision-Date: 2010-06-26 00:55+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -23,10 +23,10 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1353 -#: ../midori/main.c:1683 -#: ../midori/main.c:1691 -#: ../midori/main.c:1707 +#: ../midori/main.c:1298 +#: ../midori/main.c:1628 +#: ../midori/main.c:1636 +#: ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -52,6 +52,7 @@ msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" #: ../midori/main.c:370 +#: ../midori/main.c:442 #: ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" @@ -63,177 +64,175 @@ msgstr "Не удалось открыть базу данных: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Не удалось сохранить настройки. %s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Не удалось сохранить средства поиска. %s" - -#: ../midori/main.c:514 -#: ../midori/main.c:564 -#: ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Не удалось сохранить настройки. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Не удалось сохранить средства поиска. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 -#: ../midori/main.c:637 +#: ../midori/main.c:558 +#: ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:696 -#: ../midori/main.c:936 +#: ../midori/main.c:640 +#: ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1229 -#: ../midori/main.c:1956 +#: ../midori/main.c:1174 +#: ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1372 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1403 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1581 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1583 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1589 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1591 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1593 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1680 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1855 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2015 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "_Игнорировать" @@ -252,145 +251,115 @@ msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." #: ../midori/midori-array.c:718 -#: ../midori/sokoke.c:1115 -#, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:334 -#: ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:332 +#: ../midori/midori-browser.c:5245 +#: ../midori/midori-browser.c:5251 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:344 -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:5248 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:772 +#: ../midori/midori-browser.c:777 #: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:791 +#: ../midori/midori-browser.c:796 #: ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:821 -#: ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:4401 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:831 -#: ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 -#: ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:840 +#: ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4406 +#: ../midori/midori-browser.c:4438 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:994 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:998 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1045 -#: ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1055 +#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4488 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1418 -#: ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s из %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Файл «%s» загружен." - -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "Загрузка завершена" - -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1448 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:1915 -#: ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "Некоторые файлы загружаются" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "Выход из Midori" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Загрузки будут отменены при закрытии Midori" - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2152 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2230 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -398,18 +367,19 @@ msgstr "" "Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" "В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." -#: ../midori/midori-browser.c:2468 +#: ../midori/midori-browser.c:2236 #: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2511 -#: ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2279 +#: ../midori/midori-browser.c:5310 +#: ../panels/midori-bookmarks.c:422 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3084 +#: ../midori/midori-browser.c:2748 +#: ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 #: ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 @@ -417,12 +387,12 @@ msgstr "Новая закладка" msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:2828 #: ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-browser.c:3785 +#: ../midori/midori-browser.c:3446 #: ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 #: ../midori/sokoke.c:436 @@ -431,82 +401,85 @@ msgstr "Очистить" msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:4099 -#: ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3760 +#: ../midori/midori-browser.c:5694 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4432 -#: ../panels/midori-bookmarks.c:779 +#: ../midori/midori-browser.c:4094 +#: ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:750 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4439 -#: ../panels/midori-bookmarks.c:785 +#: ../midori/midori-browser.c:4101 +#: ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:756 #: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4442 -#: ../panels/midori-bookmarks.c:787 +#: ../midori/midori-browser.c:4104 +#: ../midori/midori-view.c:2424 +#: ../midori/midori-view.c:4103 +#: ../panels/midori-bookmarks.c:788 #: ../panels/midori-history.c:758 #: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4327 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4328 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4329 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4330 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4331 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4352 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4693 -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4355 +#: ../midori/midori-browser.c:5315 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4366 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4731 -#: ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4393 +#: ../midori/midori-browser.c:5419 #: ../midori/midori-websettings.c:228 #: ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4467 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4503 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4557 +#: ../panels/midori-bookmarks.c:271 #: ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format @@ -514,588 +487,558 @@ msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4664 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4668 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4682 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:4693 #: ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4699 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4704 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4709 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:5052 -#: ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4714 +#: ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4719 #: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4727 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4828 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4830 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4849 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5158 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5498 -#: ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:5160 +#: ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5161 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5164 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5166 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:5167 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:5171 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5174 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5176 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5177 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5179 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5180 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5182 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5183 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5188 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5189 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5191 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5192 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5195 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5198 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5200 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5204 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:5207 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5211 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:5552 -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5214 +#: ../midori/midori-browser.c:5217 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5220 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:5223 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5226 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5229 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5231 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5232 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5234 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5235 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5239 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5241 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5242 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5254 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5257 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5260 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5261 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5263 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5264 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5267 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5270 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5271 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5273 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5274 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5276 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5277 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5279 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5280 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5283 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5286 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5289 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5293 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5297 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5300 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5302 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5303 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5305 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5306 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5312 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5313 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5318 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5321 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5322 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5325 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5326 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5330 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5331 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5336 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5337 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5339 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5340 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5342 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5343 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5345 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5346 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5348 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5350 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5351 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5353 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5354 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5356 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5357 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5360 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5368 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5369 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5372 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5373 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5376 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5377 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5380 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5381 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5384 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5385 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5388 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5389 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5397 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5738 +#: ../midori/midori-browser.c:5400 #: ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5404 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 +#: ../midori/midori-browser.c:5407 #: ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5748 +#: ../midori/midori-browser.c:5410 #: ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5751 +#: ../midori/midori-browser.c:5413 #: ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5754 +#: ../midori/midori-browser.c:5416 #: ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5950 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5957 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:5959 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:5983 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:5985 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:6006 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:6021 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:6023 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:6388 -#: ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:6038 +#: ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:6040 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:6055 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:6068 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:6070 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:6084 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6086 msgid "Menu" msgstr "Меню" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "_Найти:" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "Назад" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "Далее" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "Учитывать регистр" - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "Подсветить совпадения" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "Закрыть вкладку поиска" - -#: ../midori/midori-browser.c:6748 -#: ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Очистить все" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6667 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -1147,7 +1090,7 @@ msgstr "Закрыть панель" msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Скрыть элементы управления" @@ -1755,8 +1698,8 @@ msgstr "Выбранные для удаления личные данные" #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page #: ../midori/midori-view.c:1261 -#: ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:4567 +#: ../midori/midori-view.c:4571 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" @@ -1777,223 +1720,223 @@ msgid "Not found - %s" msgstr "Страница не найдена — %s" #: ../midori/midori-view.c:1520 -#: ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:2365 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2139 -#: ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2532 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2191 -#: ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2269 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2203 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2204 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2199 -#: ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2276 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2210 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2213 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2208 -#: ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2216 +#: ../midori/midori-view.c:2288 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2209 -#: ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2217 +#: ../midori/midori-view.c:2282 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2213 -#: ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2221 +#: ../midori/midori-view.c:2251 +#: ../midori/midori-view.c:2293 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2230 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2233 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2236 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2237 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2244 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2247 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2310 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2337 -#: ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2345 +#: ../midori/midori-view.c:2352 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2373 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2674 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2693 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2696 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2700 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3244 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3526 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3527 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3528 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3529 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3530 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3531 msgid "Set number of columns and rows" msgstr "Установить количество закладок" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3532 msgid "Enter number of columns and rows:" msgstr "Введите число столбцов и строк:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3533 msgid "Invalid input for the size of the speed dial" msgstr "Проверьте правильность ввода" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3534 msgid "Thumb size:" msgstr "Размер миниатюр:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3535 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3536 msgid "Medium" msgstr "Средний" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3537 msgid "Big" msgstr "Большой" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3563 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3586 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3707 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3708 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3709 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3853 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4107 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4112 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4112 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4118 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4804 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4805 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4836 +#: ../midori/midori-view.c:4857 #: ../midori/midori-preferences.c:381 msgid "Features" msgstr "Возможности" @@ -2174,67 +2117,130 @@ msgstr "Управление средствами поиска" msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Новая папка" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Найти:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Назад" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Далее" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Учитывать регистр" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Подсветить совпадения" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Закрыть вкладку поиска" + +#: ../toolbars/midori-transferbar.c:88 +#: ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s из %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Файл «%s» загружен." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Загрузка завершена" + +#: ../toolbars/midori-transferbar.c:257 +#: ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Убрать завершённые" + +#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Некоторые файлы загружаются" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "В_ыйти из Midori" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Загрузки будут отменены при закрытии Midori." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Не удалось добавить закладку: %s\n" + +#: ../panels/midori-bookmarks.c:430 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:438 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:451 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:585 msgid "Separator" msgstr "Разделитель" @@ -2436,7 +2442,7 @@ msgstr "Отслеживание изменений в «%s» отключено #: ../extensions/addons.c:1254 msgid "Support for userscripts and userstyles" -msgstr "Поддержка пользовательских скриптов и стилей" +msgstr "Поддержка пользовательских сценариев и стилей" #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" @@ -2541,6 +2547,18 @@ msgstr "Менеджер _фрагментов данных" msgid "List, view and delete cookies" msgstr "Просмотр и удаление фрагментов данных" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Копировать _адреса вкладок" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Скопировать адреса вкладок" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Копирует адреса всех вкладок в буфер обмена" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." @@ -2726,6 +2744,14 @@ msgstr "История вкладок" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Отображает список вкладок в порядке времени последнего использования" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Сворачивать новые вкладки" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Новые закладки открываются свёрнутыми" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Настройка панели инструментов" @@ -2782,9 +2808,6 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "Failed to get current time: %s\n" #~ msgstr "Не удалось получить текущее время: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Не удалось добавить запись в журнал: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "_Заголовки панелей" From a25553edba3467adf17166afc3c34902e1a35165 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Jun 2010 22:09:01 +0200 Subject: [PATCH 2748/2970] Add Statusbar Clock extension to POTFILES.in --- extensions/status-clock.c | 2 +- po/POTFILES.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/status-clock.c b/extensions/status-clock.c index 96bcf74d..c30f1cf0 100644 --- a/extensions/status-clock.c +++ b/extensions/status-clock.c @@ -173,7 +173,7 @@ MidoriExtension* extension_init (void) { MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Status clock"), + "name", _("Statusbar Clock"), "description", _("Display date and time in the statusbar"), "version", "0.1", "authors", "Arno Renevier ", diff --git a/po/POTFILES.in b/po/POTFILES.in index 39b59100..ffd1b003 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -42,6 +42,7 @@ extensions/formhistory.c extensions/mouse-gestures.c extensions/page-holder.c extensions/shortcuts.c +extensions/status-clock.c extensions/statusbar-features.c extensions/tab-panel.c extensions/tab-switcher.c From 2ffc24977d81164a7584c16d9096e4c7189d9097 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 26 Jun 2010 23:39:49 +0200 Subject: [PATCH 2749/2970] Determine default window size relative to monitor --- midori/midori-browser.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 304ec25e..0c0ada11 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6258,8 +6258,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) gchar* toolbar_items; gint last_web_search; gboolean close_buttons_on_tabs; - GdkScreen* screen; - gint default_width, default_height; KatzeItem* item; g_free (browser->news_aggregator); @@ -6293,18 +6291,24 @@ _midori_browser_update_settings (MidoriBrowser* browser) "news-aggregator", &browser->news_aggregator, NULL); - screen = gtk_window_get_screen (GTK_WINDOW (browser)); - default_width = gdk_screen_get_width (screen) / 1.7; - default_height = gdk_screen_get_height (screen) / 1.7; - if (remember_last_window_size) { if (browser->last_window_width && browser->last_window_height) gtk_window_set_default_size (GTK_WINDOW (browser), browser->last_window_width, browser->last_window_height); else + { + GdkScreen* screen; + GdkRectangle monitor; + gint default_width, default_height; + + screen = gtk_window_get_screen (GTK_WINDOW (browser)); + gdk_screen_get_monitor_geometry (screen, 0, &monitor); + default_width = monitor.width / 1.7; + default_height = monitor.height / 1.7; gtk_window_set_default_size (GTK_WINDOW (browser), default_width, default_height); + } switch (last_window_state) { case MIDORI_WINDOW_MINIMIZED: From 316b324be27fa25a454178ef698299354f7821b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Sun, 27 Jun 2010 16:41:26 +0200 Subject: [PATCH 2750/2970] l10n: Updated Czech (cs) translation to 100% New status: 637 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 571 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 290 insertions(+), 281 deletions(-) diff --git a/po/cs.po b/po/cs.po index 116de8d8..833cc34b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-19 16:08+0000\n" +"POT-Creation-Date: 2010-06-27 10:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -244,770 +244,746 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5389 -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5039 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:463 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:515 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:771 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4545 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:947 -#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:4582 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 +#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:894 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:909 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:1001 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:1005 +#: ../midori/midori-browser.c:981 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1062 ../midori/midori-browser.c:4600 -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4276 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1455 +#: ../midori/midori-browser.c:1431 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2193 +#: ../midori/midori-browser.c:2133 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2271 +#: ../midori/midori-browser.c:2211 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." -#: ../midori/midori-browser.c:2277 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2320 ../midori/midori-browser.c:5454 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:2893 ../panels/midori-bookmarks.c:203 +#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Prázdné" -#: ../midori/midori-browser.c:3591 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:3905 ../midori/midori-browser.c:5848 +#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4248 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4471 +#: ../midori/midori-browser.c:4115 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4116 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4473 +#: ../midori/midori-browser.c:4117 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4118 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4119 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4496 +#: ../midori/midori-browser.c:4140 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4499 ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4510 +#: ../midori/midori-browser.c:4154 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4537 ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:4255 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4647 +#: ../midori/midori-browser.c:4291 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4701 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4452 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4812 +#: ../midori/midori-browser.c:4456 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4470 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4837 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:4843 +#: ../midori/midori-browser.c:4487 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4492 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:4853 +#: ../midori/midori-browser.c:4497 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:4858 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:4863 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4515 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4616 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4618 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4637 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:4946 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:5304 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:4949 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:5308 +#: ../midori/midori-browser.c:4952 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:4954 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:4955 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:4959 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:4962 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:4964 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:4965 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:5323 +#: ../midori/midori-browser.c:4967 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:4968 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:4970 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:5327 +#: ../midori/midori-browser.c:4971 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:5332 +#: ../midori/midori-browser.c:4976 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:4977 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:4979 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:4980 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:4983 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:4986 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:4988 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:4992 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:4995 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:4999 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5358 ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5008 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5011 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5014 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5017 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5019 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5020 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:5022 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5023 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5027 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5029 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5030 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5042 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:5045 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5048 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5049 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5051 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5052 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5055 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5414 +#: ../midori/midori-browser.c:5058 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5059 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5061 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5062 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5064 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5065 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5067 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5068 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5071 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5074 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5077 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5081 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5085 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5088 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5090 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5091 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5093 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5450 +#: ../midori/midori-browser.c:5094 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5456 +#: ../midori/midori-browser.c:5100 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5101 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5106 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5465 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5110 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5113 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5114 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5474 +#: ../midori/midori-browser.c:5118 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5119 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5124 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5125 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5127 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5128 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5130 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5131 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5133 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5134 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5136 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5138 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5139 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5141 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5142 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5144 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5145 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5148 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5156 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5157 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5160 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5161 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5164 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5165 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5168 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5169 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5172 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5173 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5176 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5177 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5185 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5544 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5192 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5551 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5554 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5557 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:6105 +#: ../midori/midori-browser.c:5735 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:6112 +#: ../midori/midori-browser.c:5742 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5744 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:6138 +#: ../midori/midori-browser.c:5768 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:6140 +#: ../midori/midori-browser.c:5770 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:6161 +#: ../midori/midori-browser.c:5791 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5806 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:6178 +#: ../midori/midori-browser.c:5808 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:6193 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:6195 +#: ../midori/midori-browser.c:5825 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:6210 +#: ../midori/midori-browser.c:5840 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:6223 +#: ../midori/midori-browser.c:5853 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:6225 +#: ../midori/midori-browser.c:5855 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:5869 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:5871 msgid "Menu" msgstr "Nabídka" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6448 -msgid "_Inline Find:" -msgstr "_Rychlé hledání" - -#: ../midori/midori-browser.c:6479 -msgid "Previous" -msgstr "Předchozí" - -#: ../midori/midori-browser.c:6484 -msgid "Next" -msgstr "Následující" - -#: ../midori/midori-browser.c:6489 -msgid "Match Case" -msgstr "Rozlišovat velikost" - -#: ../midori/midori-browser.c:6498 -msgid "Highlight Matches" -msgstr "Zvýraznit nalezené" - -#: ../midori/midori-browser.c:6510 -msgid "Close Findbar" -msgstr "Zavřít vyhledávací lištu" - -#: ../midori/midori-browser.c:6906 +#: ../midori/midori-browser.c:6455 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -1054,7 +1030,7 @@ msgstr "Zavřít panel" msgid "Align sidepanel to the left" msgstr "Umístit boční panel vlevo" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Schovat ovládací prvky" @@ -1657,237 +1633,237 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 +#: ../midori/midori-view.c:4580 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránka '%s' nemůže být načtena." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Zkusit znovu" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Nenalezeno - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Poslat %s zprávu" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Prozkoumat _prvek" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Otevřít odkaz v nové kartě na _pozadí" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Otevřít odkaz jako _webovou aplikaci" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "Zkopírovat _cíl odkazu" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "_Uložit odkaz" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "_Stáhnout odkaz" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Stáhnout za použití Download _manageru" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Otevřít _obrázek v nové kartě" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Zkopírovat _adresu obrázku" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Uložit o_brázek" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Stáhnout o_brázek" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Zkopírovat _adresu videa" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Uložit _video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Stáhnout _video" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Hledat _s" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2683 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2702 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2709 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3253 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3535 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3536 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3537 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3538 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3539 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3540 msgid "Set number of columns and rows" msgstr "Změnit počet sloupců a řádků" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3541 msgid "Enter number of columns and rows:" msgstr "Vložte počet sloupců a řádků:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3542 msgid "Invalid input for the size of the speed dial" msgstr "Nesprávná hodnota velikosti rychlého přístupu" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3543 msgid "Thumb size:" msgstr "Velikost náhledů:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3544 msgid "Small" msgstr "malá" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3545 msgid "Medium" msgstr "střední" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3546 msgid "Big" msgstr "velká" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3572 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3595 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3716 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3717 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3718 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3862 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4116 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4121 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4121 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4127 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4813 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4814 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Rozšíření" @@ -2107,6 +2083,31 @@ msgstr "Netscape p_luginy" msgid "New _Folder" msgstr "Nová _složka" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Rychlé hledání" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Předchozí" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Následující" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Rozlišovat velikost" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Zvýraznit nalezené" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Zavřít vyhledávací lištu" + #: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" @@ -2141,24 +2142,24 @@ msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Záložku se nepodařilo přidat: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "Oddělovač" @@ -2206,23 +2207,23 @@ msgstr "Dnes" msgid "Yesterday" msgstr "Včera" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat všechny položky historie?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "Zazáložkovat vybranou položku historie" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtr:" @@ -2615,6 +2616,14 @@ msgstr "Zkratky" msgid "View and edit keyboard shortcuts" msgstr "Zobrazí a umožní změnu klávesových zkratek" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Hodiny ve stavovém řádku" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Zobrazuje datum a čas ve stavovém řádku" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Obrázky" @@ -2655,11 +2664,11 @@ msgstr "Karta historie" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití" -#: ../extensions/tabs-minimized.c:72 +#: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Minimalizovat otevřené karty" -#: ../extensions/tabs-minimized.c:73 +#: ../extensions/tabs-minimized.c:80 msgid "New tabs open minimized" msgstr "Nové karty otevírat minimalizovaně" From d241fc081b9cb0742f90471660d32a050cfaffff Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Mon, 28 Jun 2010 14:40:25 +0200 Subject: [PATCH 2751/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 637 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 534 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 275 insertions(+), 259 deletions(-) diff --git a/po/pt.po b/po/pt.po index 0b2aff24..12e9829e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-21 04:08+0000\n" +"POT-Creation-Date: 2010-06-28 10:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -244,12 +244,12 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5039 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" @@ -297,12 +297,12 @@ msgstr "_Descrição:" msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 +#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 msgid "Toplevel folder" msgstr "Pasta Superior" @@ -318,30 +318,30 @@ msgstr "Mostrar na _barra de ferramentas" msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:981 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4276 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1431 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2133 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2211 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -349,642 +349,643 @@ msgstr "" "Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" "Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." -#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar o relatório da base de dados: %s\n" -#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:4115 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4116 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4117 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4118 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4119 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4351 +#: ../midori/midori-browser.c:4140 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 +#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4154 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4255 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4291 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4663 +#: ../midori/midori-browser.c:4452 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4456 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:4470 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:4698 +#: ../midori/midori-browser.c:4487 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4703 +#: ../midori/midori-browser.c:4492 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:4708 +#: ../midori/midori-browser.c:4497 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:4726 +#: ../midori/midori-browser.c:4515 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4616 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:4829 +#: ../midori/midori-browser.c:4618 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4637 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:4946 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4949 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:4952 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:4954 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4955 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:4959 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:4962 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:4964 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4965 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:4967 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4968 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:5181 +#: ../midori/midori-browser.c:4970 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4971 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4976 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:4977 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:5190 +#: ../midori/midori-browser.c:4979 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:4980 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5194 +#: ../midori/midori-browser.c:4983 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:5197 +#: ../midori/midori-browser.c:4986 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:5199 +#: ../midori/midori-browser.c:4988 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5203 +#: ../midori/midori-browser.c:4992 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5206 +#: ../midori/midori-browser.c:4995 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:4999 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:5008 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5011 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5225 +#: ../midori/midori-browser.c:5014 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5017 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:5019 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5020 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5022 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5234 +#: ../midori/midori-browser.c:5023 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5027 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5029 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5030 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5042 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5045 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5048 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:5049 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5051 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5052 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5266 +#: ../midori/midori-browser.c:5055 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5058 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5059 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:5061 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:5062 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5275 +#: ../midori/midori-browser.c:5064 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:5065 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5067 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5068 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5282 +#: ../midori/midori-browser.c:5071 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5074 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5077 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5081 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5085 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:5088 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:5090 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5091 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5093 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5094 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:5100 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5101 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:5106 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5110 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5113 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5114 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:5118 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5119 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:5124 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5125 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5127 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5128 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:5130 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5131 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:5133 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5134 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5136 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5138 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5139 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5141 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5142 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5144 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5145 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5148 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5156 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5157 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5160 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5161 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5164 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5165 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5168 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5169 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5172 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5173 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5387 +#: ../midori/midori-browser.c:5176 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5177 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5185 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5192 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5949 +#: ../midori/midori-browser.c:5735 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5956 +#: ../midori/midori-browser.c:5742 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:5958 +#: ../midori/midori-browser.c:5744 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:5982 +#: ../midori/midori-browser.c:5768 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:5984 +#: ../midori/midori-browser.c:5770 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:6005 +#: ../midori/midori-browser.c:5791 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:5806 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:6022 +#: ../midori/midori-browser.c:5808 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:6039 +#: ../midori/midori-browser.c:5825 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:6054 +#: ../midori/midori-browser.c:5840 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6067 +#: ../midori/midori-browser.c:5853 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6069 +#: ../midori/midori-browser.c:5855 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:6083 +#: ../midori/midori-browser.c:5869 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:5871 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6455 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" @@ -1031,7 +1032,7 @@ msgstr "Fechar painel" msgid "Align sidepanel to the left" msgstr "Alinhar painel à esquerda" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Ocultar controlos operacionais" @@ -1634,237 +1635,237 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 +#: ../midori/midori-view.c:4580 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página '%s' não foi carregada." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Enviar mensagem a %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Inspeccionar _Elementos" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Abrir Ligação no Separador _Principal" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Abrir Ligação no Separador _Secundário" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Abrir Ligação como A_plicação Web" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "Copiar de_stino da Ligação" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "_Guardar destino da Ligação" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "_Transferir destino da Ligação" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Transferir com _Gestor de Transferências" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Abrir _Imagem em Novo Separador" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Copiar _Endereço da Imagem" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Guardar I_magem" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Transferir I_magem" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Copiar _Endereço do Vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Guardar _Vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Transferir _Vídeo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2683 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2702 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2709 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3253 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3535 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3536 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3537 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3538 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3539 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3540 msgid "Set number of columns and rows" msgstr "Definir número de colunas e linhas" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3541 msgid "Enter number of columns and rows:" msgstr "Indique o número de colunas e linhas:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3542 msgid "Invalid input for the size of the speed dial" msgstr "Entrada inválida para o tamanho da ligação rápida" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3543 msgid "Thumb size:" msgstr "Tamanho das miniaturas:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3544 msgid "Small" msgstr "Pequenas" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3545 msgid "Medium" msgstr "Médias" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3546 msgid "Big" msgstr "Grandes" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3572 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3595 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3716 msgid "Page loading delayed" msgstr "Actualização de página atrasada" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3717 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "O atraso na actualização foi devido a um encerramento brusco ou ás preferências de arranque." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3718 msgid "Load Page" msgstr "Carregar Página" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3862 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4116 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4121 msgid "_Restore Tab" msgstr "_Restaurar Separadores" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4121 msgid "_Minimize Tab" msgstr "_Minizar Separadores" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4127 msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4813 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4814 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funcionalidades" @@ -2084,6 +2085,31 @@ msgstr "P_lugins Netscape" msgid "New _Folder" msgstr "Nova _Pasta" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "Local_izar:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Anterior" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Seguinte" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Sensível à Capitalização" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Realçar Correspondências" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Fechar" + #: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" @@ -2118,24 +2144,24 @@ msgstr "As transferências serão canceladas se sair do Midori." msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Falha ao adicionar marcador: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "Editar marcador seleccionado" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "Apagar marcador seleccionado" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "Separador" @@ -2182,23 +2208,23 @@ msgstr "Hoje" msgid "Yesterday" msgstr "Ontem" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "Tem a certeza que quer remover todo o histórico?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "Marcar o item de histórico seleccionado" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "Apagar item de histórico seleccionado" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtro:" @@ -2593,6 +2619,14 @@ msgstr "Atalhos" msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Relógio de barra de estado" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Mostrar data e hora na barra de estado" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Imagens" @@ -2673,24 +2707,6 @@ msgstr "Editar facilmente a barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" -#~ msgid "_Inline Find:" -#~ msgstr "Local_izar:" - -#~ msgid "Previous" -#~ msgstr "Anterior" - -#~ msgid "Next" -#~ msgstr "Seguinte" - -#~ msgid "Match Case" -#~ msgstr "Sensível à Capitalização" - -#~ msgid "Highlight Matches" -#~ msgstr "Realçar Correspondências" - -#~ msgid "Close Findbar" -#~ msgstr "Fechar" - #~ msgid "Set number of shortcuts" #~ msgstr "Definir número de atalhos" From b428de12a6167416df0e4a0efd670b78e7f400f3 Mon Sep 17 00:00:00 2001 From: Evaggelos Balaskas Date: Mon, 28 Jun 2010 18:13:54 +0200 Subject: [PATCH 2752/2970] l10n: Updated Greek (el) translation to 100% New status: 637 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/el.po | 1385 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 799 insertions(+), 586 deletions(-) diff --git a/po/el.po b/po/el.po index 69b68350..9c6d5b47 100644 --- a/po/el.po +++ b/po/el.po @@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: midori git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-09 04:06+0000\n" -"PO-Revision-Date: 2010-03-09 19:56+0200\n" +"POT-Creation-Date: 2010-06-27 11:52+0300\n" +"PO-Revision-Date: 2010-06-28 19:11+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,9 +24,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "Ελαφρύς περιηγητής ιστού" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1319 ../midori/main.c:1647 -#: ../midori/main.c:1655 ../midori/main.c:1671 -#: ../midori/midori-websettings.c:318 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1298 +#: ../midori/main.c:1628 +#: ../midori/main.c:1636 +#: ../midori/main.c:1652 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Μιντόρι" @@ -33,194 +37,204 @@ msgstr "Μιντόρι" msgid "Web Browser" msgstr "Περιηγητής Ιστού" -#: ../midori/main.c:103 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:152 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" -#: ../midori/main.c:159 ../midori/main.c:245 +#: ../midori/main.c:158 +#: ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" -#: ../midori/main.c:371 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 +#: ../midori/main.c:442 +#: ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:426 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n" -#: ../midori/main.c:446 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" - -#: ../midori/main.c:484 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s" - -#: ../midori/main.c:503 ../midori/main.c:553 ../midori/main.c:573 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:603 ../midori/main.c:626 +#: ../midori/main.c:558 +#: ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/main.c:690 ../midori/main.c:907 +#: ../midori/main.c:640 +#: ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s" -#: ../midori/main.c:941 +#: ../midori/main.c:824 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν μπορούν να επιβεβαιωθούν." + +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Το Μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να επιλύσετε το πρόβλημα." -#: ../midori/main.c:956 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Τροποποίηση _προτιμήσεων" -#: ../midori/main.c:960 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" -#: ../midori/main.c:965 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1200 ../midori/main.c:1920 +#: ../midori/main.c:1174 +#: ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1319 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Δεν ορίστηκε όνομα αρχείου" -#: ../midori/main.c:1338 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Συνέβη ένα άγνωστο σφάλμα." -#: ../midori/main.c:1369 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1540 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1540 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1543 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1543 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1546 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Εμφάνιση του διαλόγου διάγνωσης" -#: ../midori/main.c:1548 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1551 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1554 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Εκτέλεση της συγκεκριμένης εντολής" -#: ../midori/main.c:1556 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1558 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1560 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" -msgstr "" +msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ" -#: ../midori/main.c:1560 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "ΜΟΤΙΒΟ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1564 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" +msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας" -#: ../midori/main.c:1564 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ" -#: ../midori/main.c:1644 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[Διευθύνσεις" -#: ../midori/main.c:1672 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:1674 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:1771 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." -#: ../midori/main.c:1819 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n" -#: ../midori/main.c:1874 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" -#: ../midori/main.c:1903 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1935 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n" -#: ../midori/main.c:1949 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n" -#: ../midori/main.c:1963 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:1979 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "Α_γνόησε" @@ -228,7 +242,8 @@ msgstr "Α_γνόησε" msgid "File not found." msgstr "Το αρχείο δεν βρέθηκε." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:462 +#: ../midori/midori-array.c:485 #: ../midori/midori-array.c:495 msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." @@ -237,768 +252,792 @@ msgstr "Κακοσχηματισμένο έγγραφο." msgid "Unrecognized bookmark format." msgstr "Άγνωστος τύπος συνδέσμου." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5427 -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:332 +#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5039 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:5036 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:452 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% φορτώθηκε" -#: ../midori/midori-browser.c:490 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:711 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:744 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:757 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 +#: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:796 +#: ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:806 ../midori/midori-browser.c:4582 +#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:4189 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:816 ../midori/midori-browser.c:896 -#: ../midori/midori-browser.c:4587 ../midori/midori-browser.c:4619 +#: ../midori/midori-browser.c:840 +#: ../midori/midori-browser.c:933 +#: ../midori/midori-browser.c:4194 +#: ../midori/midori-browser.c:4226 msgid "Toplevel folder" msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:845 +#: ../midori/midori-browser.c:874 +msgid "Add to _Speed Dial" +msgstr "Προσθήκη στην _γρήγορη σύνδεση" + +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Εμφάνιση στην εργαλειο_θήκη" -#: ../midori/midori-browser.c:860 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή" -#: ../midori/midori-browser.c:976 ../midori/midori-browser.c:4637 -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:977 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"." + +#: ../midori/midori-browser.c:981 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s." + +#: ../midori/midori-browser.c:1038 +#: ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4276 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1350 ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "%s από %s" - -#: ../midori/midori-browser.c:1386 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Το αρχείο '%s' έχει κατέβει." - -#: ../midori/midori-browser.c:1390 -msgid "Transfer completed" -msgstr "Η μεταφορά ολοκληρώθηκε" - -#: ../midori/midori-browser.c:1530 +#: ../midori/midori-browser.c:1431 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:2253 +#: ../midori/midori-browser.c:2133 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2329 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2211 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" +"Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, θα προστεθεί αυτόματα." + +#: ../midori/midori-browser.c:2217 +#: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Νέα ροή" -#: ../midori/midori-browser.c:2370 ../midori/midori-browser.c:5492 -#: ../panels/midori-bookmarks.c:242 +#: ../midori/midori-browser.c:2260 +#: ../midori/midori-browser.c:5098 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:2927 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2729 +#: ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 +#: ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" -#: ../midori/midori-browser.c:3007 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2809 +#: ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Άδειο" -#: ../midori/midori-browser.c:3628 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 +#: ../midori/midori-browser.c:3416 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/midori-browser.c:3942 ../midori/midori-browser.c:5886 +#: ../midori/midori-browser.c:3693 +#: ../midori/midori-browser.c:5479 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n" -#: ../midori/midori-browser.c:4275 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:4027 +#: ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:4282 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:4034 +#: ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:4285 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:4037 +#: ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4112 +#: ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 +#: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4115 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4509 +#: ../midori/midori-browser.c:4116 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4510 +#: ../midori/midori-browser.c:4117 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4511 +#: ../midori/midori-browser.c:4118 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4512 +#: ../midori/midori-browser.c:4119 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4533 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4140 msgid "Import bookmarks..." msgstr "Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4536 ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:4143 +#: ../midori/midori-browser.c:5103 msgid "_Import bookmarks" msgstr "_Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4547 +#: ../midori/midori-browser.c:4154 msgid "_Application:" msgstr "_Εφαρμογή:" -#: ../midori/midori-browser.c:4574 ../midori/midori-browser.c:5601 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 -#: ../katze/katze-utils.c:688 +#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:5207 +#: ../midori/midori-websettings.c:228 +#: ../midori/midori-websettings.c:319 +#: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Προσαρμογή..." -#: ../midori/midori-browser.c:4648 +#: ../midori/midori-browser.c:4255 msgid "Failed to import bookmarks" msgstr "Αποτυχία εισαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4684 +#: ../midori/midori-browser.c:4291 msgid "Failed to export bookmarks" msgstr "Αποτυχία εξαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4738 ../panels/midori-history.c:141 +#: ../midori/midori-browser.c:4345 +#: ../panels/midori-bookmarks.c:272 +#: ../panels/midori-history.c:141 #: ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4452 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4456 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:4470 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:4874 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4481 +#: ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Ιστορικό" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4487 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4492 msgid "'Flash' Cookies" msgstr "Άδειασμα των cookies" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4497 msgid "Website icons" msgstr "Εικονίδια ιστότοπων" -#: ../midori/midori-browser.c:4895 ../midori/sokoke.c:1310 +#: ../midori/midori-browser.c:4502 +#: ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Κλειστές καρτέλες" -#: ../midori/midori-browser.c:4900 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4507 +#: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Προσωρινής μνήμης ιστού" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4515 msgid "Clear private data when _quitting Midori" msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4616 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:4618 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." + +#: ../midori/midori-browser.c:4637 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008,2009" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:4946 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:5342 ../midori/sokoke.c:1311 +#: ../midori/midori-browser.c:4948 +#: ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Νέο _παράθυρο" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:4949 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:4952 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:4954 msgid "P_rivate Browsing" msgstr "Π_ροσωπική περιήγηση" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:4955 msgid "Don't save any private data while browsing" msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:4959 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:4962 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:5358 +#: ../midori/midori-browser.c:4964 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:4965 msgid "Add shortcut to speed dial" msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση" -#: ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:4967 msgid "Add Shortcut to the _desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας" -#: ../midori/midori-browser.c:5362 +#: ../midori/midori-browser.c:4968 msgid "Add shortcut to the desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:4970 msgid "Subscribe to News _feed" msgstr "Εγγραφή σε _ροή νέων" -#: ../midori/midori-browser.c:5365 +#: ../midori/midori-browser.c:4971 msgid "Subscribe to this news feed" msgstr "Εγγραφή στην ροή νέων" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:4976 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:4977 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:4979 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:5374 +#: ../midori/midori-browser.c:4980 msgid "Close this window" msgstr "Κλείσιμο αυτού του παραθύρου" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:4983 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:4986 msgid "Quit the application" msgstr "Έξοδος από την εφαρμογή" -#: ../midori/midori-browser.c:5382 +#: ../midori/midori-browser.c:4988 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:4992 msgid "Undo the last modification" msgstr "Αναίρεση της τελευταίας τροποποίησης" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:4995 msgid "Redo the last modification" msgstr "Επανάληψη της τελευταίας τροποποίησης" -#: ../midori/midori-browser.c:5393 +#: ../midori/midori-browser.c:4999 msgid "Cut the selected text" msgstr "Αποκοπή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:5396 ../midori/midori-browser.c:5399 +#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:5005 msgid "Copy the selected text" msgstr "Αντιγραφή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:5402 +#: ../midori/midori-browser.c:5008 msgid "Paste text from the clipboard" msgstr "Επικόλληση κειμένου από το πρόχειρο" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5011 msgid "Delete the selected text" msgstr "Διαγραφή του επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5014 msgid "Select all text" msgstr "Επιλογή όλου του κειμένου" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5017 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:5019 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:5414 +#: ../midori/midori-browser.c:5020 msgid "Find the next occurrence of a word or phrase" msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5022 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5023 msgid "Find the previous occurrence of a word or phrase" msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5027 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5029 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5030 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:5436 +#: ../midori/midori-browser.c:5042 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5045 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:5442 +#: ../midori/midori-browser.c:5048 msgid "Reset the zoom level" msgstr "Επαναφορά του επιπέδου εστίασης" -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5049 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:5445 +#: ../midori/midori-browser.c:5051 msgid "View So_urce" msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5052 msgid "View the source code of the page" msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5055 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5058 msgid "Scroll _Left" msgstr "Μετακίνηση _αριστερά" -#: ../midori/midori-browser.c:5453 +#: ../midori/midori-browser.c:5059 msgid "Scroll to the left" msgstr "Μετακίνηση προς αριστερά" -#: ../midori/midori-browser.c:5455 +#: ../midori/midori-browser.c:5061 msgid "Scroll _Down" msgstr "Μετακίνηση _κάτω" -#: ../midori/midori-browser.c:5456 +#: ../midori/midori-browser.c:5062 msgid "Scroll down" msgstr "Μετακίνηση κάτω" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5064 msgid "Scroll _Up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5065 msgid "Scroll up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:5067 msgid "Scroll _Right" msgstr "Μετακίνηση _δεξιά" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5068 msgid "Scroll to the right" msgstr "Μετακίνηση προς τα δεξιά" -#: ../midori/midori-browser.c:5465 +#: ../midori/midori-browser.c:5071 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5074 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5077 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5081 msgid "Go to the previous sub-page" msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:5085 msgid "Go to the next sub-page" msgstr "Μετάβαση στην επόμενη υπό-σελίδα" -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5088 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5090 msgid "Empty Trash" msgstr "Άδειασμα απορριμμάτων" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5091 msgid "Delete the contents of the trash" msgstr "Διαγραφή των περιεχομένων των απορριμμάτων" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5093 msgid "Undo _Close Tab" msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5094 msgid "Open the last closed tab" msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5100 msgid "Add a new _folder" msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5101 msgid "Add a new bookmark folder" msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5106 msgid "_Export bookmarks" msgstr "_Εξαγωγή συνδέσμων" -#: ../midori/midori-browser.c:5503 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5109 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5110 msgid "Add, edit and remove search engines..." msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:5113 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:5114 msgid "Clear private data..." msgstr "Καθαρισμός προσωπικών δεδομένων..." -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5118 msgid "_Inspect Page" msgstr "_Εξέταση σελίδας" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5119 msgid "Inspect page details and access developer tools..." msgstr "Εξέταση λεπτομερειών σελίδας και πρόσβαση σε διαχειριστικά εργαλεία ..." -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5124 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5125 msgid "Switch to the previous tab" msgstr "Μετάβαση στην προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5127 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5128 msgid "Switch to the next tab" msgstr "Μετάβαση στην επόμενη καρτέλα" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5130 msgid "Focus _Current Tab" msgstr "Εστίαση στην _ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5131 msgid "Focus the current tab" msgstr "Εστίαση στην ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5133 msgid "Open last _session" msgstr "Επαναφορά της τελευταίας _συνεδρίας" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5134 msgid "Open the tabs saved in the last session" msgstr "Άνοιγμα των καρτελών που αποθηκεύτηκαν κατά την τελευταία συνεδρία" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5136 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5138 msgid "_Contents" msgstr "_Περιεχόμενα" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5139 msgid "Show the documentation" msgstr "Εμφάνιση της τεκμηρίωσης" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5141 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:5142 msgid "Show the Frequently Asked Questions" msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:5144 msgid "_Report a Bug" msgstr "Α_ναφορά σφάλματος" -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5145 msgid "Open Midori's bug tracker" msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:5148 msgid "Show information about the program" msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5156 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:5551 +#: ../midori/midori-browser.c:5157 msgid "Show menubar" msgstr "Προβολή μπάρας μενού" -#: ../midori/midori-browser.c:5554 +#: ../midori/midori-browser.c:5160 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:5161 msgid "Show navigationbar" msgstr "Εμφάνιση περιήγησης" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:5164 msgid "Side_panel" msgstr "Πλαϊνό _πλαίσιο" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:5165 msgid "Show sidepanel" msgstr "Εμφάνιση πλαϊνού πλαισίου" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:5168 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:5169 msgid "Show bookmarkbar" msgstr "Εμφάνιση μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5566 +#: ../midori/midori-browser.c:5172 msgid "_Transferbar" msgstr "_Μπάρα μεταφορών" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5173 msgid "Show transferbar" msgstr "Εμφάνιση μπάρα μεταφορών" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5176 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:5177 msgid "Show statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5185 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:5582 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5188 +#: ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Κινέζικα (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:5192 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:5589 ../midori/midori-websettings.c:228 +#: ../midori/midori-browser.c:5195 +#: ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Κορεάτικα (EUC-KR)" -#: ../midori/midori-browser.c:5592 ../midori/midori-websettings.c:229 +#: ../midori/midori-browser.c:5198 +#: ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:5595 ../midori/midori-websettings.c:230 +#: ../midori/midori-browser.c:5201 +#: ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5598 ../midori/midori-websettings.c:231 +#: ../midori/midori-browser.c:5204 +#: ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:6146 +#: ../midori/midori-browser.c:5735 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:6153 +#: ../midori/midori-browser.c:5742 msgid "_Location..." msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:6155 +#: ../midori/midori-browser.c:5744 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:6179 +#: ../midori/midori-browser.c:5768 msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:6181 +#: ../midori/midori-browser.c:5770 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:6202 +#: ../midori/midori-browser.c:5791 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:6217 +#: ../midori/midori-browser.c:5806 msgid "_Recently visited pages" msgstr "_Πρόσφατες επισκεφθείσες σελίδες" -#: ../midori/midori-browser.c:6219 +#: ../midori/midori-browser.c:5808 msgid "Reopen pages that you visited earlier" msgstr "Ξανα-άνοιγμα σελίδων που επισκεφτήκατε νωρίτερα" -#: ../midori/midori-browser.c:6234 ../midori/sokoke.c:1300 +#: ../midori/midori-browser.c:5823 +#: ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../midori/midori-browser.c:6236 +#: ../midori/midori-browser.c:5825 msgid "Show the saved bookmarks" msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" -#: ../midori/midori-browser.c:6251 +#: ../midori/midori-browser.c:5840 msgid "_Tools" msgstr "_Εργαλεία" -#: ../midori/midori-browser.c:6264 +#: ../midori/midori-browser.c:5853 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:6266 +#: ../midori/midori-browser.c:5855 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες" -#: ../midori/midori-browser.c:6280 +#: ../midori/midori-browser.c:5869 msgid "_Menu" msgstr "_Μενού" -#: ../midori/midori-browser.c:6282 +#: ../midori/midori-browser.c:5871 msgid "Menu" msgstr "Μενού" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6486 -msgid "_Inline Find:" -msgstr "Ε_νσωματωμένη αναζήτηση:" - -#: ../midori/midori-browser.c:6517 -msgid "Previous" -msgstr "Προηγούμενο" - -#: ../midori/midori-browser.c:6522 -msgid "Next" -msgstr "Επόμενο" - -#: ../midori/midori-browser.c:6527 -msgid "Match Case" -msgstr "Ταίριασμα πεζών" - -#: ../midori/midori-browser.c:6536 -msgid "Highlight Matches" -msgstr "Τονισμός των ταιριασμάτων" - -#: ../midori/midori-browser.c:6548 -msgid "Close Findbar" -msgstr "Κλείσιμο μπάρας εύρεσης" - -#: ../midori/midori-browser.c:6594 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "Καθαρισμός όλων" - -#: ../midori/midori-browser.c:6952 +#: ../midori/midori-browser.c:6455 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" @@ -1028,620 +1067,628 @@ msgstr "Αποτυχία εκτέλεσης δήλωσης βάσης δεδομ msgid "Paste and p_roceed" msgstr "Επικόλληση και σ_υνέχεια" -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 +#: ../midori/midori-panel.c:432 +#: ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Αποσύνδεση επιλεγμένου πλαισίου από το παράθυρο" -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:444 +#: ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 +#: ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 +#: ../midori/midori-panel.c:456 +#: ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Κλείσιμο πλαισίου" -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 +#: ../midori/midori-panel.c:640 +#: ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά" -#: ../midori/midori-panel.c:798 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Απόκρυψη στοιχείων λειτουργίας" -#: ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Εμφάνιση κενής σελίδας" -#: ../midori/midori-websettings.c:210 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Εμφάνιση αρχικής σελίδας" -#: ../midori/midori-websettings.c:211 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση" + +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Ιαπωνικά (SHIFT_JIS)" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../midori/midori-websettings.c:248 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Νέο παράθυρο" -#: ../midori/midori-websettings.c:249 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Τρέχον καρτέλα" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "Προκαθορισμένο" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Εικονίδια" -#: ../midori/midori-websettings.c:266 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Μικρά εικονίδια" -#: ../midori/midori-websettings.c:267 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Κείμενο" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Εικονίδια με κείμενο" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Κείμενο δίπλα στα εικονίδια" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" -msgstr "" +msgstr "Αυτόματα (Gnome ή περιβάλλον)" -#: ../midori/midori-websettings.c:285 -#, fuzzy +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" -msgstr "Διακομιστής μεσολάβησης" +msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:286 -#, fuzzy +#: ../midori/midori-websettings.c:282 msgid "No proxy server" -msgstr "Διακομιστής μεσολάβησης" +msgstr "Κανένας διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:301 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Όλα τα cookies" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "Cookies συνεδρίας" -#: ../midori/midori-websettings.c:303 ../panels/midori-addons.c:98 -#: ../katze/katze-utils.c:664 +#: ../midori/midori-websettings.c:299 +#: ../katze/katze-utils.c:667 msgid "None" msgstr "Κανένα" -#: ../midori/midori-websettings.c:319 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Πλάτος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Ύψος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Η τελευταία θέση πλαισίου" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Η τελευταία σελίδα πλαισίου" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Τελευταία αναζήτηση ιστού" -#: ../midori/midori-websettings.c:439 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Εμφάνιση γραμμής μενού" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Εάν θα φαίνεται η μπάρα του μενού" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Εμφάνιση της γραμμής πλοήγησης" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Εμφάνιση μπάρας σελιδοδεικτών" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Εάν θα φαίνεται η μπάρα των σελιδοδεικτών" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Εμφάνιση πλαισίου" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Εάν θα φαίνεται το πλαίσιο" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Εμφάνιση μπάρας μεταφορών" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Εάν θα φαίνεται η μπάρα μεταφορών" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Στυλ εργαλειοθήκης:" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Να εμφανίζεται η πρόοδος στην τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:528 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Εάν θα εμφανίζεται η πρόοδος φόρτωσης στην τοποθεσία εισαγωγής" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Εάν θα φαίνονται οι μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Αντικείμενα εργαλειοθήκης" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη" -#: ../midori/midori-websettings.c:561 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Σύμπτυξη πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Εμφάνιση των στοιχείων λειτουργίας στο ταμπλό" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Εάν θα φαίνονται τα στοιχεία λειτουργίας στο ταμπλό" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά" -#: ../midori/midori-websettings.c:609 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Άνοιγμα ταμπλών σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:610 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Εάν θα ανοίγουν πάντα τα ταμπλό σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "Κατά την εκκίνηση του midori:" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Κατά την εκκίνηση του midori να φορτώνει:" -#: ../midori/midori-websettings.c:629 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Αρχική σελίδα:" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Η αρχική σελίδα" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Εμφάνιση παραθύρου αποτυχίας" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Εμφάνιση γρήγορης σύνδεσης σε νέες καρτέλες" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Εμφάνιση γρήγορης σύνδεσης στις νέες ανοιχτές καρτέλες" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Ερώτηση για τον κατάλογο αποθήκευσης" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Εάν θα ρωτάει για τον κατάλογο αποθήκευσης όταν κατεβαίνει ένα αρχείο" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Ειδοποίηση όταν μία μεταφορά έχει ολοκληρωθεί" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Εάν θα εμφανίζεται μία ειδοποίηση όταν ολοκληρωθεί μία μεταφορά" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Εξωτερικός διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Εξωτερικός κειμενογράφος" -#: ../midori/midori-websettings.c:751 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Διαχειριστής νέων" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Εξωτερικός διαχειριστής νέων" -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Διεύθυνση για αναζήτηση" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:769 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" -#: ../midori/midori-websettings.c:770 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" -#: ../midori/midori-websettings.c:780 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτελών" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες" -#: ../midori/midori-websettings.c:789 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" -#: ../midori/midori-websettings.c:798 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Άνοιγμα νέων σελίδων σε:" -#: ../midori/midori-websettings.c:799 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" -#: ../midori/midori-websettings.c:808 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Άνοιγμα εξωτερικών σελίδων σε:" -#: ../midori/midori-websettings.c:809 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" -#: ../midori/midori-websettings.c:818 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" -msgstr "Ενεργοποίηση σεναρίων" +msgstr "Ενεργοποίηση δεσμών εντολών" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου" -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 +#: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Ενεργοποίηση αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5" -#: ../midori/midori-websettings.c:890 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:896 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:905 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:906 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:931 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-websettings.c:932 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" -#: ../midori/midori-websettings.c:947 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:948 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:963 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Κινητική κύλιση" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα " -#: ../midori/midori-websettings.c:972 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Αποδοχή cookies" -#: ../midori/midori-websettings.c:973 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Τι τύπο cookies να γίνονται αποδεκτά" -#: ../midori/midori-websettings.c:989 +#: ../midori/midori-websettings.c:985 msgid "Original cookies only" msgstr "Μόνο πρωτότυπα cookies" -#: ../midori/midori-websettings.c:990 +#: ../midori/midori-websettings.c:986 msgid "Accept cookies from the original website only" msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους" -#: ../midori/midori-websettings.c:998 +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Μέγιστος χρόνος cookie" -#: ../midori/midori-websettings.c:999 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:1016 +#: ../midori/midori-websettings.c:1012 msgid "Remember last visited pages" msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων" -#: ../midori/midori-websettings.c:1017 +#: ../midori/midori-websettings.c:1013 msgid "Whether the last visited pages are saved" msgstr "Εάν θα αποθηκεύονται οι τελευταίες επισκεπτόμενες σελίδες" -#: ../midori/midori-websettings.c:1025 +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Μέγιστο χρόνος ιστορικού" -#: ../midori/midori-websettings.c:1026 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:1034 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν" -#: ../midori/midori-websettings.c:1052 -#, fuzzy +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:1053 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" -msgstr "" +msgstr "Ο τύπος του διακομιστής προς χρήση" -#: ../midori/midori-websettings.c:1062 -#, fuzzy +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" -msgstr "Διακομιστής μεσολάβησης" +msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:1063 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" -#: ../midori/midori-websettings.c:1078 +#: ../midori/midori-websettings.c:1074 msgid "Detect proxy server automatically" msgstr "Αυτόματη εύρεση διακομιστή μεσολάβησης" -#: ../midori/midori-websettings.c:1079 +#: ../midori/midori-websettings.c:1075 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Εάν θα εντοπίζεται αυτόματα από το περιβάλλον ο διακομιστής μεσολάβησης" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Αναγνώριση ως" -#: ../midori/midori-websettings.c:1096 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" -#: ../midori/midori-websettings.c:1112 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Αλφαριθμητικό αναγνώρισης" -#: ../midori/midori-websettings.c:1113 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" -#: ../midori/midori-websettings.c:1128 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Προτιμώμενες γλώσσες" -#: ../midori/midori-websettings.c:1129 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1144 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-websettings.c:1145 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή" @@ -1649,205 +1696,247 @@ msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1128 ../midori/midori-view.c:4407 -#: ../midori/midori-view.c:4411 +#: ../midori/midori-view.c:1270 +#: ../midori/midori-view.c:4576 +#: ../midori/midori-view.c:4580 #, c-format msgid "Error - %s" msgstr "Σφάλμα- %s" -#: ../midori/midori-view.c:1129 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί." -#: ../midori/midori-view.c:1134 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Δοκιμάστε ξανά" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1175 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Δεν βρέθηκε - %s" -#: ../midori/midori-view.c:1397 ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:1529 +#: ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Αποστολή μηνύματος στο: %s" -#: ../midori/midori-view.c:2022 ../midori/midori-view.c:2415 +#: ../midori/midori-view.c:2156 +#: ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Εξέταση _στοιχείου" -#: ../midori/midori-view.c:2074 ../midori/midori-view.c:2152 -msgid "Open _Link" -msgstr "Άνοιγμα _συνδέσμου" - -#: ../midori/midori-view.c:2077 ../midori/midori-view.c:2154 +#: ../midori/midori-view.c:2208 +#: ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:2081 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο" -#: ../midori/midori-view.c:2082 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο" -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2216 +#: ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο" -#: ../midori/midori-view.c:2088 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή" -#: ../midori/midori-view.c:2091 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "Αντιγραφή συνδέσμου πρ_οορισμού" -#: ../midori/midori-view.c:2094 ../midori/midori-view.c:2173 +#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "Απ_οθήκευση συνδέσμου προορισμού" -#: ../midori/midori-view.c:2095 ../midori/midori-view.c:2167 +#: ../midori/midori-view.c:2226 +#: ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "Κ_ατέβασμα συνδέσμου προορισμού" -#: ../midori/midori-view.c:2099 ../midori/midori-view.c:2135 -#: ../midori/midori-view.c:2178 +#: ../midori/midori-view.c:2230 +#: ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Κατέβασμα με τον διαχειριστή μεταφορών" -#: ../midori/midori-view.c:2111 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα" -#: ../midori/midori-view.c:2114 -msgid "Open Image in New Wi_ndow" -msgstr "Άνοιγμα εικόνας σε νέο πα_ράθυρο" - -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Αντιγραφή _διεύθυνσης εικόνας" -#: ../midori/midori-view.c:2120 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2128 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Αντιγραφή _διεύθυνσης βίντεο" -#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2198 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:2233 ../midori/midori-view.c:2240 +#: ../midori/midori-view.c:2354 +#: ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:2547 +#: ../midori/midori-view.c:2683 msgid "Open or download file" msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:2570 +#: ../midori/midori-view.c:2702 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:2573 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: %s ('%s')" msgstr "Τύπος αρχείου: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2577 +#: ../midori/midori-view.c:2709 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:3107 +#: ../midori/midori-view.c:3253 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:3368 +#: ../midori/midori-view.c:3535 msgid "Speed dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:3369 +#: ../midori/midori-view.c:3536 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:3370 +#: ../midori/midori-view.c:3537 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:3371 +#: ../midori/midori-view.c:3538 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:3372 +#: ../midori/midori-view.c:3539 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:3409 +#: ../midori/midori-view.c:3540 +msgid "Set number of columns and rows" +msgstr "Ορισμός αριθμού στηλών και γραμμών" + +#: ../midori/midori-view.c:3541 +msgid "Enter number of columns and rows:" +msgstr "Εισάγεται τον αριθμό των στηλών και γραμμών:" + +#: ../midori/midori-view.c:3542 +msgid "Invalid input for the size of the speed dial" +msgstr "Άκυρη εισαγωγή για το μέγεθος της γρήγορης σύνδεσης" + +#: ../midori/midori-view.c:3543 +msgid "Thumb size:" +msgstr "Μέγεθος μικρογραφίας:" + +#: ../midori/midori-view.c:3544 +msgid "Small" +msgstr "Μικρό" + +#: ../midori/midori-view.c:3545 +msgid "Medium" +msgstr "Μεσαίο" + +#: ../midori/midori-view.c:3546 +msgid "Big" +msgstr "Μεγάλο" + +#: ../midori/midori-view.c:3572 #, c-format msgid "Document cannot be displayed" msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" -#: ../midori/midori-view.c:3432 +#: ../midori/midori-view.c:3595 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-view.c:3682 +#: ../midori/midori-view.c:3716 +msgid "Page loading delayed" +msgstr "Καθυστέρηση φόρτωση σελίδας" + +#: ../midori/midori-view.c:3717 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Καθυστέρηση φόρτωσης είτε λόγω κάποιου σφάλματος είτε για ρυθμίσεις εκκίνησης." + +#: ../midori/midori-view.c:3718 +msgid "Load Page" +msgstr "Φόρτωση σελίδας" + +#: ../midori/midori-view.c:3862 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-view.c:3942 +#: ../midori/midori-view.c:4116 msgid "_Duplicate Tab" msgstr "_Διπλότυπη καρτέλα" -#: ../midori/midori-view.c:3947 +#: ../midori/midori-view.c:4121 msgid "_Restore Tab" msgstr "_Επαναφορά καρτέλας" -#: ../midori/midori-view.c:3947 +#: ../midori/midori-view.c:4121 msgid "_Minimize Tab" msgstr "_Ελαχιστοποίηση καρτέλας" -#: ../midori/midori-view.c:3953 +#: ../midori/midori-view.c:4127 msgid "Close ot_her Tabs" msgstr "Κλείσιμο άλλ_ων καρτελών" -#: ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4813 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-view.c:4580 +#: ../midori/midori-view.c:4814 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-view.c:4632 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4866 +#: ../midori/midori-preferences.c:381 msgid "Features" msgstr "Χαρακτηριστικά" @@ -1860,11 +1949,13 @@ msgstr "Γενικά" msgid "Startup" msgstr "Εκκίνηση" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:314 +#: ../midori/midori-preferences.c:321 msgid "Use current page as homepage" msgstr "Τρέχουσα σελίδα ως αρχική" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:331 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Μεταφορές" @@ -1924,12 +2015,11 @@ msgstr "Επιβολή της πυκνότητας βίντεο dot στα 96DPI #: ../midori/midori-preferences.c:414 msgid "Allow scripts to open popups" -msgstr "" +msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα." #: ../midori/midori-preferences.c:415 -#, fuzzy msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" +msgstr "Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα παράθυρα" #: ../midori/midori-preferences.c:419 msgid "Spell Checking" @@ -1975,14 +2065,14 @@ msgid "External applications" msgstr "Εξωτερικές εφαρμογές" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:486 msgid "Network" msgstr "Δίκτυο" #: ../midori/midori-preferences.c:492 -#, fuzzy msgid "Hostname" -msgstr "Όνομα χρήσης" +msgstr "Όνομα διακομιστή" #. Page "Privacy" #: ../midori/midori-preferences.c:511 @@ -1993,7 +2083,8 @@ msgstr "Προσωπικό απόρρητο" msgid "Web Cookies" msgstr "Cookies ιστού" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:535 msgid "days" msgstr "ημέρες" @@ -2025,81 +2116,130 @@ msgstr "Διαχείριση των μηχανών αναζήτησης" msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Σελιδοδείκτης" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Προσθήκη σ_ελιδοδείκτη" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Τερματικό" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Επεκτάσεις" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Ιστορικό" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Αρχική σελίδα" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" -msgstr "_Σενάρια χρήστη" +msgstr "_Δέσμες εντολών χρήστη" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Νέα _καρτέλα" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Μεταφορές" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Α_ρθρωμάτων netscape" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:144 -msgid "Userscripts" -msgstr "Σενάρια χρηστών" +#: ../midori/sokoke.c:1300 +msgid "New _Folder" +msgstr "Νέος _φάκελος" -#: ../panels/midori-addons.c:100 -msgid "Userstyles" -msgstr "Θέματα χρήστη" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "Ε_νσωματωμένη αναζήτηση:" -#: ../panels/midori-addons.c:305 +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Προηγούμενο" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Επόμενο" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Ταίριασμα πεζών" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Τονισμός των ταιριασμάτων" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Κλείσιμο μπάρας εύρεσης" + +#: ../toolbars/midori-transferbar.c:88 +#: ../panels/midori-transfers.c:270 #, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "Αντιγραφή σεναρίων χρήστη στον κατάλογο %s και αντιγραφή των θεμάτων χρήση στον κατάλογο %s." +msgid "%s of %s" +msgstr "%s από %s" -#: ../panels/midori-addons.c:911 +#: ../toolbars/midori-transferbar.c:123 #, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Αδυναμία παρακολούθησης του καταλόγου '%s': %s" +msgid "The file '%s' has been downloaded." +msgstr "Το αρχείο '%s' έχει κατέβει." -#: ../panels/midori-bookmarks.c:111 +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Η μεταφορά ολοκληρώθηκε" + +#: ../toolbars/midori-transferbar.c:257 +#: ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "Καθαρισμός όλων" + +#: ../toolbars/midori-transferbar.c:278 +#: ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "Μερικά αρχεία κατεβαίνουν" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "_Τερματισμός του Μιντόρι" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori." + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../panels/midori-bookmarks.c:250 +#: ../panels/midori-bookmarks.c:245 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n" + +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:258 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "Προσθήκη ενός νέου φακέλου" -#: ../panels/midori-bookmarks.c:608 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "Διαχωριστικό" @@ -2107,6 +2247,14 @@ msgstr "Διαχωριστικό" msgid "Console" msgstr "Τερματικό" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Αντιγραφή _όλων" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Αντιγραφή όλων" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Επεκτάσεις" @@ -2138,32 +2286,32 @@ msgstr "Σήμερα" msgid "Yesterday" msgstr "Χθες" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" -#: ../panels/midori-history.c:438 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού" -#: ../panels/midori-history.c:447 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" -#: ../panels/midori-history.c:455 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "Καθαρισμός ολόκληρου του ιστορικού" -#: ../panels/midori-history.c:953 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Φίλτρο:" -#: ../panels/midori-transfers.c:479 +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Άνοιγμα φακέλου προορισμού" -#: ../panels/midori-transfers.c:482 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Αντιγραφή τοποθεσίας σ_υνδέσμου" @@ -2191,30 +2339,32 @@ msgstr "Συνθηματικό" msgid "_Remember password" msgstr "Α_πομνημόνευση συνθηματικού" -#: ../katze/katze-throbber.c:842 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "Το εικονίδιο Named '%s' δεν μπορεί να φορτωθεί" -#: ../katze/katze-throbber.c:855 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθεί" -#: ../katze/katze-throbber.c:923 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" -#: ../katze/katze-utils.c:495 ../katze/katze-utils.c:890 +#: ../katze/katze-utils.c:498 +#: ../katze/katze-utils.c:893 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s" -#: ../katze/katze-utils.c:541 ../katze/katze-utils.c:570 +#: ../katze/katze-utils.c:544 +#: ../katze/katze-utils.c:573 msgid "Choose file" msgstr "Επιλογή αρχείου" -#: ../katze/katze-utils.c:556 +#: ../katze/katze-utils.c:559 msgid "Choose folder" msgstr "Επιλογή φακέλου" @@ -2223,43 +2373,75 @@ msgstr "Επιλογή φακέλου" msgid "Preferences for %s" msgstr "Προτιμήσεις για %s" -#: ../extensions/adblock.c:409 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Ρύθμιση φίλτρων διαφημίσεων" -#: ../extensions/adblock.c:441 +#: ../extensions/adblock.c:447 #, c-format msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." msgstr "Πληκτρολογήστε την διεύθυνση σε μία προ ρυθμισμένη λίστα φίλτρων στην εισαγωγή κειμένου και πατήστε \"Προσθήκη\" για να την προσθέσετε στην λίστα. Μπορείτε να βρείτε περισσότερες λίστες στο %s." -#: ../extensions/adblock.c:581 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Ρύθμιση φίλτρων δ_ιαφημίσεων..." -#: ../extensions/adblock.c:832 +#: ../extensions/adblock.c:841 msgid "Edit rule" msgstr "Επεξεργασία κανόνα" -#: ../extensions/adblock.c:845 +#: ../extensions/adblock.c:854 msgid "_Rule:" msgstr "_Κανόνας:" -#: ../extensions/adblock.c:899 +#: ../extensions/adblock.c:908 msgid "Bl_ock image" msgstr "Φρ_αγή εικόνας" -#: ../extensions/adblock.c:904 +#: ../extensions/adblock.c:913 msgid "Bl_ock link" msgstr "Φρ_αγή συνδέσμου" -#: ../extensions/adblock.c:1466 +#: ../extensions/adblock.c:1489 msgid "Advertisement blocker" msgstr "Εμποδιστής διαφημίσεων" -#: ../extensions/adblock.c:1467 +#: ../extensions/adblock.c:1490 msgid "Block advertisements according to a filter list" msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα" +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "Αντιγραφή %s στον κατάλογο %s." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Δέσμες εντολών χρηστών" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Θέματα χρήστη" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "Οι ρυθμίσεις της επέκτασης '%s' δεν μπορεί να αποθηκευτεί: %s\n" + +#: ../extensions/addons.c:1086 +#: ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Προσθήκες χρήστη" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Αδυναμία παρακολούθησης του καταλόγου '%s': %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Υποστήριξη για δέσμες εντολών χρήστη και στυλ χρήστη" + #: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Χρωματιστές καρτέλες" @@ -2363,6 +2545,18 @@ msgstr "_Διαχειριστής cookie" msgid "List, view and delete cookies" msgstr "Λίστα, εμφάνιση και διαγραφή cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Αντιγραφή _διεύθυνσης καρτέλας" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Αντιγραφή διευθύνσεων από καρτέλες" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Αντιγραφή των διευθύνσεων όλων των καρτέλων στο πρόχειρο" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML." @@ -2372,25 +2566,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"feed\" στα δεδομένα XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Τελευταία ενημέρωση: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Ροές νέων" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Προσθήκη ενός νέας ροής" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Διαγραφή ροής" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Ροές" @@ -2425,25 +2619,25 @@ msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχεί msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου RSS \"channel\" στα XML δεδομένα." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Σφάλμα" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Η ροή '%s' ήδη υπάρχει" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Σφάλμα κατά την φόρτωση ροής '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Πλαίσιο ροής" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" @@ -2469,16 +2663,17 @@ msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί" msgid "Form history filler" msgstr "Ιστορικό δεδομένων φόρμας" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Κινήσεις ποντικιού" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Χειρισμός του midori μετακινώντας το ποντίκι" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Αποθήκευση Σελίδων" @@ -2506,13 +2701,21 @@ msgstr "Συντομεύσεις" msgid "View and edit keyboard shortcuts" msgstr "Εμφάνιση και επεξεργασία συντομεύσεων πληκτρολογίου" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Ρολόι στην γραμμή κατάστασης" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Εμφάνιση ημερομηνίας και ώρας στην γραμμή κατάστασης" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Εικόνες" #: ../extensions/statusbar-features.c:96 msgid "Scripts" -msgstr "Σενάρια" +msgstr "Δέσμες εντολών" #: ../extensions/statusbar-features.c:108 msgid "Netscape plugins" @@ -2526,7 +2729,8 @@ msgstr "Γραμμή κατάστασης χαρακτηριστικών" msgid "Easily toggle features on web pages on and off" msgstr "Εύκολη εναλλαγή χαρακτηριστικών στις ιστοσελίδες ενεργοποίηση και απενεργοποίηση" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:568 +#: ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Πλαίσιο καρτέλας" @@ -2538,14 +2742,22 @@ msgstr "Πλαίσιο κ_αρτέλας" msgid "Show tabs in a vertical panel" msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "Καρτέλα λίστας ιστορικού" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Να επιτρέπεται η εναλλαγή καρτελών επιλέγοντας από την ταξινομημένη λίστα της τελευταίας χρήσης." +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Ελαχιστοποίηση των νέων καρτέλων" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Οι νέες καρτέλες ανοίγουν ελαχιστοποιημένες" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Προσαρμογή εργαλειοθήκης" @@ -2577,3 +2789,4 @@ msgstr "Εύκολη επεξεργασία της εμφάνισης της ε #: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "Προσωρινή μνήμη επικοινωνίας HTTP στο δίσκο" + From bf589d7001db1230fcb8cec40ed4a904fc755a46 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Tue, 29 Jun 2010 01:09:38 +0200 Subject: [PATCH 2753/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 637 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 567 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 288 insertions(+), 279 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1f4ec1ad..ae5c8451 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-20 04:08+0000\n" +"POT-Creation-Date: 2010-06-28 22:08+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -243,104 +243,104 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5389 -#: ../midori/midori-browser.c:5395 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5039 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5392 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:463 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:494 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:515 +#: ../midori/midori-browser.c:508 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:733 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:733 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:771 +#: ../midori/midori-browser.c:764 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4545 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:947 -#: ../midori/midori-browser.c:4550 ../midori/midori-browser.c:4582 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 +#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:874 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:894 +#: ../midori/midori-browser.c:887 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:909 +#: ../midori/midori-browser.c:902 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:1001 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:1005 +#: ../midori/midori-browser.c:981 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1062 ../midori/midori-browser.c:4600 -#: ../midori/midori-browser.c:4632 +#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4276 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1455 +#: ../midori/midori-browser.c:1431 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2193 +#: ../midori/midori-browser.c:2133 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2271 +#: ../midori/midori-browser.c:2211 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -348,667 +348,643 @@ msgstr "" "Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" "Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." -#: ../midori/midori-browser.c:2277 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2320 ../midori/midori-browser.c:5454 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:2893 ../panels/midori-bookmarks.c:203 +#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не вдалось виконати запит бази даних: %s\n" -#: ../midori/midori-browser.c:2973 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Пусто" -#: ../midori/midori-browser.c:3591 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:3905 ../midori/midori-browser.c:5848 +#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4238 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4245 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4248 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4471 +#: ../midori/midori-browser.c:4115 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4116 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4473 +#: ../midori/midori-browser.c:4117 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4118 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4119 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4496 +#: ../midori/midori-browser.c:4140 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4499 ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4510 +#: ../midori/midori-browser.c:4154 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4537 ../midori/midori-browser.c:5563 +#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4611 +#: ../midori/midori-browser.c:4255 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4647 +#: ../midori/midori-browser.c:4291 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4701 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4452 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4812 +#: ../midori/midori-browser.c:4456 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4470 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4837 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:4843 +#: ../midori/midori-browser.c:4487 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4492 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:4853 +#: ../midori/midori-browser.c:4497 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:4858 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:4863 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4515 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4616 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4618 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4637 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:4946 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5304 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:4949 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:5308 +#: ../midori/midori-browser.c:4952 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:4954 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:4955 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:4959 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:4962 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:4964 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:4965 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:5323 +#: ../midori/midori-browser.c:4967 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:4968 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:4970 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:5327 +#: ../midori/midori-browser.c:4971 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:5332 +#: ../midori/midori-browser.c:4976 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:5333 +#: ../midori/midori-browser.c:4977 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:4979 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:4980 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:4983 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:4986 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:4988 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:4992 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:4995 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:4999 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:5358 ../midori/midori-browser.c:5361 +#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:5364 +#: ../midori/midori-browser.c:5008 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5011 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:5370 +#: ../midori/midori-browser.c:5014 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5017 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5019 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5020 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:5022 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5023 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5027 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5029 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5386 +#: ../midori/midori-browser.c:5030 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5398 +#: ../midori/midori-browser.c:5042 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5401 +#: ../midori/midori-browser.c:5045 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5048 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:5405 +#: ../midori/midori-browser.c:5049 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5051 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5408 +#: ../midori/midori-browser.c:5052 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:5411 +#: ../midori/midori-browser.c:5055 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5414 +#: ../midori/midori-browser.c:5058 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5415 +#: ../midori/midori-browser.c:5059 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5061 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:5062 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5064 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5421 +#: ../midori/midori-browser.c:5065 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5067 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5424 +#: ../midori/midori-browser.c:5068 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:5427 +#: ../midori/midori-browser.c:5071 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5430 +#: ../midori/midori-browser.c:5074 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:5433 +#: ../midori/midori-browser.c:5077 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5437 +#: ../midori/midori-browser.c:5081 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5441 +#: ../midori/midori-browser.c:5085 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5444 +#: ../midori/midori-browser.c:5088 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5090 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5447 +#: ../midori/midori-browser.c:5091 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5093 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5450 +#: ../midori/midori-browser.c:5094 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:5456 +#: ../midori/midori-browser.c:5100 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5457 +#: ../midori/midori-browser.c:5101 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:5462 +#: ../midori/midori-browser.c:5106 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5465 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5466 +#: ../midori/midori-browser.c:5110 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:5113 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5470 +#: ../midori/midori-browser.c:5114 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:5474 +#: ../midori/midori-browser.c:5118 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5475 +#: ../midori/midori-browser.c:5119 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:5480 +#: ../midori/midori-browser.c:5124 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5481 +#: ../midori/midori-browser.c:5125 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5127 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:5128 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5130 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:5131 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5133 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:5134 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5136 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5138 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5495 +#: ../midori/midori-browser.c:5139 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5141 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5498 +#: ../midori/midori-browser.c:5142 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5144 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:5145 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:5148 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:5156 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:5157 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5516 +#: ../midori/midori-browser.c:5160 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:5161 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:5164 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5165 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5168 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:5169 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:5172 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:5173 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5176 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5177 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:5185 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5544 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5548 +#: ../midori/midori-browser.c:5192 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5551 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5554 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5557 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5560 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:6105 +#: ../midori/midori-browser.c:5735 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:6112 +#: ../midori/midori-browser.c:5742 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5744 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:6138 +#: ../midori/midori-browser.c:5768 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:6140 +#: ../midori/midori-browser.c:5770 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:6161 +#: ../midori/midori-browser.c:5791 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:6176 +#: ../midori/midori-browser.c:5806 msgid "_Recently visited pages" msgstr "_Останньо відвідані сторінки" -#: ../midori/midori-browser.c:6178 +#: ../midori/midori-browser.c:5808 msgid "Reopen pages that you visited earlier" msgstr "Знову відкрити сторінки, що були переглянуті раніше" -#: ../midori/midori-browser.c:6193 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:6195 +#: ../midori/midori-browser.c:5825 msgid "Show the saved bookmarks" msgstr "Показати збережені закладки" -#: ../midori/midori-browser.c:6210 +#: ../midori/midori-browser.c:5840 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:6223 +#: ../midori/midori-browser.c:5853 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:6225 +#: ../midori/midori-browser.c:5855 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:6239 +#: ../midori/midori-browser.c:5869 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:5871 msgid "Menu" msgstr "Меню" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6448 -msgid "_Inline Find:" -msgstr "Знайти _входження:" - -#: ../midori/midori-browser.c:6479 -msgid "Previous" -msgstr "Попереднє" - -#: ../midori/midori-browser.c:6484 -msgid "Next" -msgstr "Наступне" - -#: ../midori/midori-browser.c:6489 -msgid "Match Case" -msgstr "Врахувати регістр" - -#: ../midori/midori-browser.c:6498 -msgid "Highlight Matches" -msgstr "Підсвітити збіги" - -#: ../midori/midori-browser.c:6510 -msgid "Close Findbar" -msgstr "Закрити панель пошуку" - -#: ../midori/midori-browser.c:6906 +#: ../midori/midori-browser.c:6455 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -1055,7 +1031,7 @@ msgstr "Закрити панель" msgid "Align sidepanel to the left" msgstr "Рівняти бічну панель по лівому краю" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Приховати панель _управління" @@ -1658,237 +1634,237 @@ msgstr "Приватні дані, що вибрані для очищення" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 +#: ../midori/midori-view.c:4580 #, c-format msgid "Error - %s" msgstr "Помилка - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Сторінку '%s' неможливо завантажити." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Спробуйте знову" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Не знайдено - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Послати повідомлення до %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Перевірити _елемент" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Відкрити посилання у новій в_кладці" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Відкривати посилання у в_кладці переднього плану" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Відкрити посилання у фоновій в_кладці" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Відкрити посилання у новому _вікні" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Відкрити посилання як веб-_додаток" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "Копіювати поси_лання" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "Збер_ігати віддаленні посилання" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "За_вантажувати віддалені посилання" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Завантажувати в менеджері завантажень" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Відкрити зображення у новій _вкладці" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Копіювати адрес _зображення" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Зберегти з_ображення" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Завантажити _зображення" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Скопіювати адресу _відео" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Зберегти _відео" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Завантажити _відео" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Шукати _з" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Шукати Веб" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2683 msgid "Open or download file" msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2702 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2709 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3253 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3535 msgid "Speed dial" msgstr "Швидкий виклик" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3536 msgid "Click to add a shortcut" msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3537 msgid "Enter shortcut address" msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3538 msgid "Enter shortcut title" msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3539 msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3540 msgid "Set number of columns and rows" msgstr "Встановити кількість колонок і рядків" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3541 msgid "Enter number of columns and rows:" msgstr "Введіть кількість колонок і рядків:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3542 msgid "Invalid input for the size of the speed dial" msgstr "Неправильні дані для розміру швидкого виклику" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3543 msgid "Thumb size:" msgstr "Розмір значка:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3544 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3545 msgid "Medium" msgstr "Середній" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3546 msgid "Big" msgstr "Великий" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3572 #, c-format msgid "Document cannot be displayed" msgstr "Не можу відобразити документ" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3595 #, c-format msgid "No documentation installed" msgstr "Документація не заінстальована" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3716 msgid "Page loading delayed" msgstr "Завантаження сторінки затримане" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3717 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Завантаження затримане або в зв’язку з останнім крахом або з налаштуваннями завантаження." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3718 msgid "Load Page" msgstr "Завантажити сторінку" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3862 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4116 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4121 msgid "_Restore Tab" msgstr "_Відновити вкладку" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4121 msgid "_Minimize Tab" msgstr "_Мінімізувати вкладку" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4127 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4813 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4814 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Опції" @@ -2108,6 +2084,31 @@ msgstr "Роз_ширення Netscape" msgid "New _Folder" msgstr "Нова _тека" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "Знайти _входження:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Попереднє" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Наступне" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Врахувати регістр" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Підсвітити збіги" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Закрити панель пошуку" + #: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" @@ -2142,24 +2143,24 @@ msgstr "Всі завантаження буде скасовано, якщо в msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не вдалося дадати закладку: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "Роздільник" @@ -2207,23 +2208,23 @@ msgstr "Сьогодні" msgid "Yesterday" msgstr "Вчора" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "Додати в закладки вибраний об'єкт історії" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "Видалити вибраний об'єкт історії" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "Очистити історію" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Фільтр:" @@ -2620,6 +2621,14 @@ msgstr "Скорочення" msgid "View and edit keyboard shortcuts" msgstr "Переглянути і редагувати скорочення клавіатури" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Годинник панелі статусу" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Показувати дату і час на панелі статусу" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Зображення" From 2f09df75b0f16a59aad89bee9c7a9cedcea0c191 Mon Sep 17 00:00:00 2001 From: Xu Meihong Date: Tue, 29 Jun 2010 06:06:34 +0200 Subject: [PATCH 2754/2970] l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 637 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/zh_CN.po | 566 +++++++++++++++++++++++++--------------------------- 1 file changed, 269 insertions(+), 297 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 5d6a5ee7..2fe4310e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-25 22:08+0000\n" +"POT-Creation-Date: 2010-06-28 22:08+0000\n" "PO-Revision-Date: 2010-06-26 12:19+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" @@ -83,17 +83,12 @@ msgid "The session couldn't be saved. %s" msgstr "会话无法保存。%s" #: ../midori/main.c:824 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." +msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "无可用的根证书文件。SSL 证书无法认证。" #: ../midori/main.c:914 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori 好像在上次运行时崩溃了。如果这种情况反复出现，请尝试下面的选项来解决此" -"问题。" +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori 好像在上次运行时崩溃了。如果这种情况反复出现，请尝试下面的选项来解决此问题。" #: ../midori/main.c:929 msgid "Modify _preferences" @@ -247,12 +242,12 @@ msgstr "不能识别的书签格式。" msgid "Writing failed." msgstr "写入失败。" -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5245 -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5039 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 msgid "Stop loading the current page" msgstr "停止载入当前页" @@ -300,12 +295,12 @@ msgstr "描述(_D):" msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4406 ../midori/midori-browser.c:4438 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 +#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 msgid "Toplevel folder" msgstr "最上层目录" @@ -321,688 +316,676 @@ msgstr "在工具栏中显示(_B)" msgid "Run as _web application" msgstr "作为 web 应用程序运行(_W)" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:977 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "可用空间不足以下载 \"%s\"。" -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:981 #, c-format msgid "The file needs %s but only %s are left." msgstr "该文件需要 %s 但只剩余 %s。" -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4456 -#: ../midori/midori-browser.c:4488 +#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 +#: ../midori/midori-browser.c:4276 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1431 msgid "Save file" msgstr "保存文件" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2133 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2211 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or " -"button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News " -"Aggregator. Next time you click the news feed icon, it will be added " -"automatically." +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -"要使用上面的 URI 打开一个新闻聚合。通常都有名为“新订阅”、“新新闻供稿”或者类似" -"的菜单项或者按钮。\n" -"您可以选择进入 Midori 的首选项中的应用程序设置，并且选择一个新闻聚合。当您再次" -"点击新闻供稿的图标时，该订阅将自动被添加。" +"要使用上面的 URI 打开一个新闻聚合。通常都有名为“新订阅”、“新新闻供稿”或者类似的菜单项或者按钮。\n" +"您可以选择进入 Midori 的首选项中的应用程序设置，并且选择一个新闻聚合。当您再次点击新闻供稿的图标时，该订阅将自动被添加。" -#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新建订阅" -#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5310 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "添加新书签" -#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "清空" -#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "无法运行外部程序。" -#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "添加新历史项目失败: %s\n" -#: ../midori/midori-browser.c:4094 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:4101 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:4104 ../midori/midori-view.c:2424 -#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4115 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4116 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4117 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4118 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4119 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:4140 msgid "Import bookmarks..." msgstr "导入书签..." -#: ../midori/midori-browser.c:4355 ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 msgid "_Import bookmarks" msgstr "导入书签(_I)" -#: ../midori/midori-browser.c:4366 +#: ../midori/midori-browser.c:4154 msgid "_Application:" msgstr "应用程序(_A):" -#: ../midori/midori-browser.c:4393 ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "定制..." -#: ../midori/midori-browser.c:4467 +#: ../midori/midori-browser.c:4255 msgid "Failed to import bookmarks" msgstr "导入书签失败" -#: ../midori/midori-browser.c:4503 +#: ../midori/midori-browser.c:4291 msgid "Failed to export bookmarks" msgstr "导出书签失败" -#: ../midori/midori-browser.c:4557 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4664 +#: ../midori/midori-browser.c:4452 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4456 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4470 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:4693 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4487 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4492 msgid "'Flash' Cookies" msgstr "'Flash' Cookies" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:4497 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:4714 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "关闭的标签页(_C)" -#: ../midori/midori-browser.c:4719 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "网页缓存" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:4515 msgid "Clear private data when _quitting Midori" msgstr "退出 Midori 前清除隐私数据(_Q)" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4616 msgid "A lightweight web browser." msgstr "轻量级的网页浏览器." -#: ../midori/midori-browser.c:4830 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"本软件库是自由软件；您可以在自由软件基金会发布的 GNU 较宽松公共许可协议(LGPL)" -"条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选" -"择）更新的版本。" +#: ../midori/midori-browser.c:4618 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "本软件库是自由软件；您可以在自由软件基金会发布的 GNU 较宽松公共许可协议(LGPL)条款的约束下再分发和/或对其进行修改；依据协议的 2.1 版本，或者（由您自行选择）更新的版本。" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4637 msgid "translator-credits" msgstr "" "张翼 , 2009.\n" "Hunt Xu , 2009, 2010." -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4946 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:5160 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4949 msgid "Open a new window" msgstr "打开一个新窗口" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:4952 msgid "Open a new tab" msgstr "打开一个新标签" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4954 msgid "P_rivate Browsing" msgstr "隐私浏览(_R)" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:4955 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:5171 +#: ../midori/midori-browser.c:4959 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:4962 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4964 msgid "Add to Speed _dial" msgstr "添加到快速拨号(_D)" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:4965 msgid "Add shortcut to speed dial" msgstr "添加快捷方式到快速拨号" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4967 msgid "Add Shortcut to the _desktop" msgstr "添加快捷方式到桌面(_D)" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:4968 msgid "Add shortcut to the desktop" msgstr "添加快捷方式到桌面" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4970 msgid "Subscribe to News _feed" msgstr "添加到新闻订阅(_F)" -#: ../midori/midori-browser.c:5183 +#: ../midori/midori-browser.c:4971 msgid "Subscribe to this news feed" msgstr "添加到此新闻订阅" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:4976 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: ../midori/midori-browser.c:5189 +#: ../midori/midori-browser.c:4977 msgid "Close the current tab" msgstr "关闭当前标签" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:4979 msgid "C_lose Window" msgstr "关闭窗口(_L)" -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:4980 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:5195 +#: ../midori/midori-browser.c:4983 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:5198 +#: ../midori/midori-browser.c:4986 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:5200 +#: ../midori/midori-browser.c:4988 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:5204 +#: ../midori/midori-browser.c:4992 msgid "Undo the last modification" msgstr "撤销上个改动" -#: ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:4995 msgid "Redo the last modification" msgstr "重复上个修改" -#: ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:4999 msgid "Cut the selected text" msgstr "剪切" -#: ../midori/midori-browser.c:5214 ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 msgid "Copy the selected text" msgstr "复制" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:5008 msgid "Paste text from the clipboard" msgstr "从剪贴板粘贴" -#: ../midori/midori-browser.c:5223 +#: ../midori/midori-browser.c:5011 msgid "Delete the selected text" msgstr "删除" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:5014 msgid "Select all text" msgstr "全选" -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:5017 msgid "Find a word or phrase in the page" msgstr "在页面中查找" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5019 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:5020 msgid "Find the next occurrence of a word or phrase" msgstr "查找该词或短语出现的下一处地方" -#: ../midori/midori-browser.c:5234 +#: ../midori/midori-browser.c:5022 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:5023 msgid "Find the previous occurrence of a word or phrase" msgstr "查找该词或短语出现的上一处地方" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:5027 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5029 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:5030 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:5042 msgid "Increase the zoom level" msgstr "放大" -#: ../midori/midori-browser.c:5257 +#: ../midori/midori-browser.c:5045 msgid "Decrease the zoom level" msgstr "缩小" -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:5048 msgid "Reset the zoom level" msgstr "恢复默认大小" -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:5049 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5051 msgid "View So_urce" msgstr "查看源码(_U)" -#: ../midori/midori-browser.c:5264 +#: ../midori/midori-browser.c:5052 msgid "View the source code of the page" msgstr "查看页面的源代码" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:5055 msgid "Toggle fullscreen view" msgstr "切换全屏" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5058 msgid "Scroll _Left" msgstr "向左滚动(_L)" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:5059 msgid "Scroll to the left" msgstr "向左滚动" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:5061 msgid "Scroll _Down" msgstr "向下滚动(_D)" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:5062 msgid "Scroll down" msgstr "向下滚动" -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:5064 msgid "Scroll _Up" msgstr "向上滚动(_U)" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:5065 msgid "Scroll up" msgstr "向上滚动" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5067 msgid "Scroll _Right" msgstr "向右滚动(_R)" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:5068 msgid "Scroll to the right" msgstr "向右滚动" -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:5071 msgid "_Go" msgstr "前进(_G)" -#: ../midori/midori-browser.c:5286 +#: ../midori/midori-browser.c:5074 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:5289 +#: ../midori/midori-browser.c:5077 msgid "Go forward to the next page" msgstr "转到下一页" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5293 +#: ../midori/midori-browser.c:5081 msgid "Go to the previous sub-page" msgstr "返回上个子页" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:5085 msgid "Go to the next sub-page" msgstr "转到下个子页" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5088 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5090 msgid "Empty Trash" msgstr "清空回收站" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5091 msgid "Delete the contents of the trash" msgstr "删除回收站中的内容" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5093 msgid "Undo _Close Tab" msgstr "撤销关闭标签(_C)" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5094 msgid "Open the last closed tab" msgstr "打开最后关闭的标签" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5100 msgid "Add a new _folder" msgstr "添加新目录(_F)" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5101 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:5106 msgid "_Export bookmarks" msgstr "导出书签(_E)" -#: ../midori/midori-browser.c:5321 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5110 msgid "Add, edit and remove search engines..." msgstr "添加、编辑和移除搜索引擎..." -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5113 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5114 msgid "Clear private data..." msgstr "清除隐私数据..." -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5118 msgid "_Inspect Page" msgstr "检查页面(_I)" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5119 msgid "Inspect page details and access developer tools..." msgstr "检查页面详细信息并使用开发者工具..." -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5124 msgid "_Previous Tab" msgstr "上一个标签(_P)" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:5125 msgid "Switch to the previous tab" msgstr "转到上一个标签" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5127 msgid "_Next Tab" msgstr "下一个标签(_N)" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5128 msgid "Switch to the next tab" msgstr "转到下一个标签" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5130 msgid "Focus _Current Tab" msgstr "聚焦到当前标签页(_C)" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5131 msgid "Focus the current tab" msgstr "聚焦到当前标签页" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5133 msgid "Open last _session" msgstr "打开上次会话(_S)" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5134 msgid "Open the tabs saved in the last session" msgstr "打开上次运行时的标签页" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5136 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5138 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:5139 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5141 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5142 msgid "Show the Frequently Asked Questions" msgstr "显示 FAQ" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5144 msgid "_Report a Bug" msgstr "报告 Bug(_R)" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5145 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:5148 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5156 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5157 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5160 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5161 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5164 msgid "Side_panel" msgstr "侧栏(_P)" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5165 msgid "Show sidepanel" msgstr "显示侧栏" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5168 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5169 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5172 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5173 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5176 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5177 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5185 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:5400 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5192 msgid "Japanese (SHIFT__JIS)" msgstr "日语 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5407 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "朝鲜语 (EUC-KR)" -#: ../midori/midori-browser.c:5410 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:5413 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5416 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:5950 +#: ../midori/midori-browser.c:5735 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:5957 +#: ../midori/midori-browser.c:5742 msgid "_Location..." msgstr "位置(_L)..." -#: ../midori/midori-browser.c:5959 +#: ../midori/midori-browser.c:5744 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:5983 +#: ../midori/midori-browser.c:5768 msgid "_Web Search..." msgstr "搜索网页(_W)..." -#: ../midori/midori-browser.c:5985 +#: ../midori/midori-browser.c:5770 msgid "Run a web search" msgstr "运行网页搜索" -#: ../midori/midori-browser.c:6006 +#: ../midori/midori-browser.c:5791 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签或窗口" -#: ../midori/midori-browser.c:6021 +#: ../midori/midori-browser.c:5806 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:6023 +#: ../midori/midori-browser.c:5808 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:6038 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:6040 +#: ../midori/midori-browser.c:5825 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:6055 +#: ../midori/midori-browser.c:5840 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:6068 +#: ../midori/midori-browser.c:5853 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:6070 +#: ../midori/midori-browser.c:5855 msgid "Show a list of all open tabs" msgstr "显示所有打开标签的列表" -#: ../midori/midori-browser.c:6084 +#: ../midori/midori-browser.c:5869 msgid "_Menu" msgstr "菜单(_M)" -#: ../midori/midori-browser.c:6086 +#: ../midori/midori-browser.c:5871 msgid "Menu" msgstr "菜单" -#: ../midori/midori-browser.c:6667 +#: ../midori/midori-browser.c:6455 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" @@ -1637,12 +1620,8 @@ msgid "Preferred languages" msgstr "首选语言" #: ../midori/midori-websettings.c:1125 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"一个由逗号分隔的语言列表，以选择显示多语言网页时的首选语言，例如 \"de\"，" -"\"ru,nl\" 或者 \"en-us;q=1.0, fr-fr;q=0.667\"" +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "一个由逗号分隔的语言列表，以选择显示多语言网页时的首选语言，例如 \"de\"，\"ru,nl\" 或者 \"en-us;q=1.0, fr-fr;q=0.667\"" #: ../midori/midori-websettings.c:1140 msgid "Clear private data" @@ -1656,237 +1635,237 @@ msgstr "选中要删除的隐私数据" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4567 -#: ../midori/midori-view.c:4571 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 +#: ../midori/midori-view.c:4580 #, c-format msgid "Error - %s" msgstr "错误 - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "网页 '%s' 无法打开。" -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "重试" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "发送消息到 %s" -#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "检查网页元素(_E)" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "在新标签中打开链接(_T)" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "在前台标签页中打开链接(_F)" -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "在后台标签中打开链接(_B)" -#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "将链接作为 Web 应用程序运行(_P)" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "复制链接目标(_S)" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 -#: ../midori/midori-view.c:2293 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:2230 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "在新标签页中打开图像(_I)" -#: ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "复制图像地址(_A)" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "保存图像文件(_M)" -#: ../midori/midori-view.c:2237 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "下载图像(_M)" -#: ../midori/midori-view.c:2244 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "复制视频地址(_A)" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "保存视频文件(_V)" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "下载视频文件(_V)" -#: ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "使用...搜索(_W)" -#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "搜索网页(_S)" -#: ../midori/midori-view.c:2373 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" -#: ../midori/midori-view.c:2674 +#: ../midori/midori-view.c:2683 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:2693 +#: ../midori/midori-view.c:2702 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:2696 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: %s ('%s')" msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2700 +#: ../midori/midori-view.c:2709 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:3244 +#: ../midori/midori-view.c:3253 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:3526 +#: ../midori/midori-view.c:3535 msgid "Speed dial" msgstr "快速拨号" -#: ../midori/midori-view.c:3527 +#: ../midori/midori-view.c:3536 msgid "Click to add a shortcut" msgstr "单击添加快捷方式" -#: ../midori/midori-view.c:3528 +#: ../midori/midori-view.c:3537 msgid "Enter shortcut address" msgstr "输入快捷方式地址" -#: ../midori/midori-view.c:3529 +#: ../midori/midori-view.c:3538 msgid "Enter shortcut title" msgstr "输入快捷方式标题" -#: ../midori/midori-view.c:3530 +#: ../midori/midori-view.c:3539 msgid "Are you sure you want to delete this shortcut?" msgstr "确认删除此快捷方式？" -#: ../midori/midori-view.c:3531 +#: ../midori/midori-view.c:3540 msgid "Set number of columns and rows" msgstr "设置列数和行数" -#: ../midori/midori-view.c:3532 +#: ../midori/midori-view.c:3541 msgid "Enter number of columns and rows:" msgstr "输入列数和行数:" -#: ../midori/midori-view.c:3533 +#: ../midori/midori-view.c:3542 msgid "Invalid input for the size of the speed dial" msgstr "快速拨号数量输入无效" -#: ../midori/midori-view.c:3534 +#: ../midori/midori-view.c:3543 msgid "Thumb size:" msgstr "缩略图大小:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3544 msgid "Small" msgstr "小" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3545 msgid "Medium" msgstr "中" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3546 msgid "Big" msgstr "大" -#: ../midori/midori-view.c:3563 +#: ../midori/midori-view.c:3572 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:3586 +#: ../midori/midori-view.c:3595 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-view.c:3707 +#: ../midori/midori-view.c:3716 msgid "Page loading delayed" msgstr "页面载入发生延迟" -#: ../midori/midori-view.c:3708 +#: ../midori/midori-view.c:3717 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "页面载入由于程序之前的崩溃或者首选项设定而发生延迟" -#: ../midori/midori-view.c:3709 +#: ../midori/midori-view.c:3718 msgid "Load Page" msgstr "载入页面" -#: ../midori/midori-view.c:3853 +#: ../midori/midori-view.c:3862 msgid "Blank page" msgstr "空白页" -#: ../midori/midori-view.c:4107 +#: ../midori/midori-view.c:4116 msgid "_Duplicate Tab" msgstr "复制标签(_D)" -#: ../midori/midori-view.c:4112 +#: ../midori/midori-view.c:4121 msgid "_Restore Tab" msgstr "恢复标签(_R)" -#: ../midori/midori-view.c:4112 +#: ../midori/midori-view.c:4121 msgid "_Minimize Tab" msgstr "最小化标签(_M)" -#: ../midori/midori-view.c:4118 +#: ../midori/midori-view.c:4127 msgid "Close ot_her Tabs" msgstr "关闭其他标签(_H)" -#: ../midori/midori-view.c:4804 +#: ../midori/midori-view.c:4813 msgid "Print background images" msgstr "打印背景图片" -#: ../midori/midori-view.c:4805 +#: ../midori/midori-view.c:4814 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图片" -#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 msgid "Features" msgstr "特性" @@ -1987,9 +1966,7 @@ msgstr "用以进行拼写检查的词典:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "用以拼写检查的语言列表，用逗号分隔，比如 \"zh_CN,en_GB\"" #. Page "Interface" @@ -2167,24 +2144,24 @@ msgstr "如果退出 Midori，正在执行的下载将会被取消。" msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "添加书签项失败: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "添加新书签目录" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "分隔符" @@ -2209,8 +2186,7 @@ msgid "Erroneous clock time" msgstr "错误的时钟时间" #: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." +msgid "The clock time lies in the past. Please check the current date and time." msgstr "时钟时间滞后，请检查当前的日期和时间。" #: ../panels/midori-history.c:286 @@ -2231,23 +2207,23 @@ msgstr "今天" msgid "Yesterday" msgstr "昨天" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "确认删除所有的历史项？" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "将选中的历史项加入书签" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "删除选中的历史项" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "清空全部历史" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "过滤器(_F):" @@ -2322,12 +2298,8 @@ msgstr "设置广告过滤器" #: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"在文本输入框中输入预设过滤器列表的地址，然后点击“添加”加入此列表。您可以在 %" -"s 找到更多列表。" +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "在文本输入框中输入预设过滤器列表的地址，然后点击“添加”加入此列表。您可以在 %s 找到更多列表。" #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2406,11 +2378,8 @@ msgid "Delete All" msgstr "删除所有" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"删除所有 Cookies。如果已设置了一个过滤器，则只删除匹配过滤字符串的 Cookies。" +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "删除所有 Cookies。如果已设置了一个过滤器，则只删除匹配过滤字符串的 Cookies。" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2483,9 +2452,7 @@ msgid "_Collapse All" msgstr "折叠所有项目(_C)" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "输入过滤字符串以只显示名称或主机名相符的 Cookies" #: ../extensions/cookie-manager/main.c:40 @@ -2651,6 +2618,14 @@ msgstr "快捷键" msgid "View and edit keyboard shortcuts" msgstr "查看和编辑快捷键" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "状态栏时钟" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "在状态栏显示日期和时间" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "图像" @@ -2704,9 +2679,7 @@ msgid "Customize Toolbar" msgstr "定制工具栏" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "选择在工具栏上显示的项目，可以拖动各项调整显示顺序。" #: ../extensions/toolbar-editor.c:421 @@ -2739,8 +2712,7 @@ msgstr "在磁盘上缓存 HTTP 通讯" #~ msgid "Enter number of shortcuts:" #~ msgstr "输入快捷方式数:" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "复制用户脚本到 %s 目录，用户样式到 %s 目录。" #~ msgid "REGEX" From 7e015f88a9ce997b0038e9fa1beda7fac2554cd5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 29 Jun 2010 07:09:01 +0200 Subject: [PATCH 2755/2970] Always install the scalable icons --- icons/wscript_build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/icons/wscript_build b/icons/wscript_build index caaa19b9..6421b80c 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -36,6 +36,8 @@ def add_image (bld, category, name): else: Utils.pprint ('BLUE', "Optimized icons could not be created.") break + bld.install_files ('${MDATADIR}/icons/hicolor/scalable/' + category, + srcdir + '/icons/scalable/' + name + '.svg') add_image (bld, 'categories', 'extension') add_image (bld, 'apps', 'midori') From 7821d61b5c8a0bde2834457ef38161b1e0cb89ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?= Date: Mon, 28 Jun 2010 19:41:13 +0200 Subject: [PATCH 2756/2970] Don't always show the "Pending downloads" dialog. If all donwloads are finished, cancelled or errored, the dialog should not be shown. --- toolbars/midori-transferbar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c index 3309e892..f0fb0304 100644 --- a/toolbars/midori-transferbar.c +++ b/toolbars/midori-transferbar.c @@ -267,9 +267,29 @@ gboolean midori_transferbar_confirm_delete (MidoriTransferbar* transferbar) { GtkWidget* dialog = NULL; + GList* list; gboolean cancel = FALSE; + gboolean all_done = TRUE; + #if WEBKIT_CHECK_VERSION (1, 1, 3) + for (list = transferbar->infos; list != NULL; list = g_list_next (list)) + { + TransferInfo* info = list->data; + WebKitDownloadStatus status = webkit_download_get_status (info->download); + + if (status != WEBKIT_DOWNLOAD_STATUS_FINISHED + && status != WEBKIT_DOWNLOAD_STATUS_CANCELLED + && status != WEBKIT_DOWNLOAD_STATUS_ERROR) + { + all_done = FALSE; + break; + } + } + + if (!all_done) + #else if (transferbar->infos || g_list_nth_data (transferbar->infos, 0)) + #endif { GtkWidget* widget = gtk_widget_get_toplevel (GTK_WIDGET (transferbar)); dialog = gtk_message_dialog_new (GTK_WINDOW (widget), From 3336938418dee10e3cd83e53e6dc72875253ebce Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 29 Jun 2010 07:36:45 +0200 Subject: [PATCH 2757/2970] Always toggle source mode except for source code views --- midori/midori-view.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index a22daf14..58c65520 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2661,7 +2661,10 @@ webkit_web_view_mime_type_decision_cb (GtkWidget* web_view, if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type)) { #if WEBKIT_CHECK_VERSION (1, 1, 14) - gboolean view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view)); + gboolean view_source = FALSE; + /* Dedicated source code views are always pseudo-blank pages */ + if (midori_view_is_blank (view)) + view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view)); /* Render raw XML, including news feeds, as source */ if (!view_source && (!strcmp (mime_type, "application/xml") From f2e4a93c72cffb04c87f5e04eae9658a629e7b58 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 29 Jun 2010 08:15:52 +0200 Subject: [PATCH 2758/2970] Dynamically create homepage button from action --- midori/midori-browser.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0c0ada11..65eaca89 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -70,7 +70,6 @@ struct _MidoriBrowser GtkWidget* throbber; GtkWidget* navigationbar; GtkWidget* bookmarkbar; - GtkToolItem* homepage; GtkWidget* panel; GtkWidget* notebook; @@ -3559,17 +3558,6 @@ _action_location_active_changed (GtkAction* action, } } -static void -midori_browser_bookmark_homepage_clicked_cb (GtkToolItem* button, - MidoriBrowser* browser) -{ - gchar* homepage; - g_object_get (browser->settings, "homepage", &homepage, NULL); - midori_browser_set_current_uri (browser, homepage); - g_free (homepage); - gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); -} - static gboolean midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button, GdkEventButton* event, @@ -5983,13 +5971,6 @@ midori_browser_init (MidoriBrowser* browser) GTK_ICON_SIZE_MENU); gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), GTK_TOOLBAR_BOTH_HORIZ); - browser->homepage = gtk_tool_button_new_from_stock (STOCK_HOMEPAGE); - gtk_tool_item_set_is_important (browser->homepage, TRUE); - gtk_widget_show (GTK_WIDGET (browser->homepage)); - g_signal_connect (browser->homepage, "clicked", - G_CALLBACK (midori_browser_bookmark_homepage_clicked_cb), browser); - g_signal_connect (gtk_bin_get_child (GTK_BIN (browser->homepage)), "button-press-event", - G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser); #if HAVE_HILDON hildon_window_add_toolbar (HILDON_WINDOW (browser), GTK_TOOLBAR (browser->bookmarkbar)); @@ -6371,9 +6352,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Transferbar", show_transferbar); #endif _action_set_active (browser, "Statusbar", browser->show_statusbar); - - sokoke_widget_set_visible (GTK_WIDGET (browser->homepage), - homepage && *homepage); + _action_set_visible (browser, "Homepage", homepage && *homepage); g_free (homepage); g_free (toolbar_items); @@ -6429,8 +6408,10 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); else if (name == g_intern_string ("homepage")) - sokoke_widget_set_visible (GTK_WIDGET (browser->homepage), + { + _action_set_visible (browser, "Homepage", g_value_get_string (&value) && *g_value_get_string (&value)); + } else if (name == g_intern_string ("search-engines-in-completion")) { if (g_value_get_boolean (&value)) @@ -6517,13 +6498,18 @@ midori_bookmarkbar_insert_item (GtkWidget* toolbar, static void midori_bookmarkbar_populate (MidoriBrowser* browser) { + GtkWidget* homepage; sqlite3* db; gint result; const gchar* sqlcmd; sqlite3_stmt* statement; - /* FIXME: We need to insert copy of a homepage. */ - gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), browser->homepage, -1); + homepage = gtk_action_create_tool_item (_action_by_name (browser, "Homepage")); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (homepage), TRUE); + g_signal_connect (gtk_bin_get_child (GTK_BIN (homepage)), "button-press-event", + G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser); + gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), + (GtkToolItem*)homepage, -1); db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); if (!db) From d6addb595ba8218e5b0f83cb9b4f32fa50bd5f2b Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Wed, 30 Jun 2010 15:25:47 +0200 Subject: [PATCH 2759/2970] l10n: Updated Japanese (ja) translation to 100% New status: 637 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ja.po | 819 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 434 insertions(+), 385 deletions(-) diff --git a/po/ja.po b/po/ja.po index 14b5e349..0443331e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-02 00:29+0900\n" -"PO-Revision-Date: 2010-06-02 00:28+0900\n" +"POT-Creation-Date: 2010-06-30 22:22+0900\n" +"PO-Revision-Date: 2010-06-30 22:21+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -46,7 +46,7 @@ msgstr "'%s' は %s の値として無効です" msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" @@ -57,38 +57,38 @@ msgstr "データベースのオープンに失敗しました: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:457 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "設定を保存できませんでした。%s" - -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "検索エンジンを保存できませんでした。%s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "設定を保存できませんでした。%s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "検索エンジンを保存できませんでした。%s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:880 +#: ../midori/main.c:824 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。" -#: ../midori/main.c:970 +#: ../midori/main.c:914 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -97,145 +97,145 @@ msgstr "" "ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" "い。" -#: ../midori/main.c:985 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:989 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:994 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1174 ../midori/main.c:1905 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1372 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1403 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1575 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1578 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1581 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "診断ダイアログを表示する" # CLI --help -#: ../midori/main.c:1583 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1586 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1589 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" # CLI --help -#: ../midori/main.c:1591 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1593 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "正規表現 PATTERN に従って URI をブロックする" -#: ../midori/main.c:1595 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATTERN" # CLI --help #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする" -#: ../midori/main.c:1599 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1680 +#: ../midori/main.c:1625 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1653 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1655 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1752 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1855 +#: ../midori/main.c:1800 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1855 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1877 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1920 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1934 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1948 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:2015 +#: ../midori/main.c:1964 msgid "_Ignore" msgstr "無視(_I)" @@ -252,135 +252,108 @@ msgstr "不正な形式のドキュメントです。" msgid "Unrecognized bookmark format." msgstr "認識できないブックマーク形式です。" -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:718 msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5027 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5024 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:455 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:493 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:507 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4177 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4182 ../midori/midori-browser.c:4214 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:976 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1037 ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:4264 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "ファイル '%s' をダウンロードしました。" - -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "転送完了" - -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1430 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "ファイルのダウンロード中です" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "Midori を終了(_Q)" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Midori を終了すると転送がキャンセルされます。" - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2132 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2210 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -393,153 +366,155 @@ msgstr "" "もしくは Midori の設定のアプリケーションタブでフィードリーダを指定してくださ" "い。次にニュースフィードアイコンをクリックしたときに自動的に追加されます。" -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2216 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2259 ../midori/midori-browser.c:5086 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 +#: ../midori/midori-browser.c:2728 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2808 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "空です" -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3415 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3681 ../midori/midori-browser.c:5467 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4015 ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4022 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4025 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:4103 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:4104 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4105 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4106 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:4107 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:4128 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:4131 ../midori/midori-browser.c:5091 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4142 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 +#: ../midori/midori-browser.c:4169 ../midori/midori-browser.c:5195 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4243 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4279 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4333 ../panels/midori-bookmarks.c:272 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4440 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4444 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4458 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4469 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4475 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4480 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4485 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4490 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4495 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4503 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4604 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4606 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -550,577 +525,548 @@ msgstr "" "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4625 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:4934 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:4936 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:4937 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:4940 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:4942 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:4943 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" # tooltip -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:4947 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:4950 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:4952 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:4953 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:4955 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" # tooltip -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:4956 msgid "Add shortcut to the desktop" msgstr "デスクトップにショートカットを追加します" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:4958 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4959 msgid "Subscribe to this news feed" msgstr "このニュースフィードを購読します" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:4964 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:4965 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:4967 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4968 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:4971 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:4974 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:4976 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:4980 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:4983 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:4987 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4990 ../midori/midori-browser.c:4993 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:4996 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:4999 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:5002 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:5005 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:5007 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:5008 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:5010 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5011 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:5015 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:5017 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:5018 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:5030 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5033 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:5036 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:5037 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5039 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:5040 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" # tooltip -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:5043 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5046 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:5047 msgid "Scroll to the left" msgstr "左へスクロールします" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5049 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5050 msgid "Scroll down" msgstr "下へスクロール" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:5052 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5053 msgid "Scroll up" msgstr "上へスクロール" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5055 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:5056 msgid "Scroll to the right" msgstr "右へスクロールします" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5059 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5062 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:5065 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:5069 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:5073 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:5076 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5078 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5079 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5081 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5082 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:5088 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:5089 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5094 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5097 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5098 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:5101 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5102 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5106 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5107 msgid "Inspect page details and access developer tools..." msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:5112 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5113 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5115 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5116 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5118 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5119 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5121 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5122 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5124 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5126 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5127 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5129 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5130 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5132 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5133 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5136 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5144 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5145 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5148 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5149 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5152 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5153 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5156 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5157 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5160 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5161 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5164 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5165 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5173 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5176 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5180 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5183 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5186 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5189 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5192 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5723 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5730 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:5732 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:5756 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:5758 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:5779 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:6371 +#: ../midori/midori-browser.c:5794 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" # tooltip -#: ../midori/midori-browser.c:6373 +#: ../midori/midori-browser.c:5796 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:5811 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "ブックマーク(_B)" # tooltip -#: ../midori/midori-browser.c:6390 +#: ../midori/midori-browser.c:5813 msgid "Show the saved bookmarks" msgstr "ブックマークを表示します" -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:5828 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:5841 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:5843 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:5857 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:5859 msgid "Menu" msgstr "メニュー" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "インライン検索(_I)" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "前を検索" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "次を検索" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "大文字・小文字を区別" - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "強調表示" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "検索バーを閉じる" - -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "すべてクリア" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6436 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -1167,7 +1113,7 @@ msgstr "パネルを閉じます" msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置する" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "操作コントロールを隠す" @@ -1829,226 +1775,238 @@ msgstr "選択されているプライベートデータを削除します" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4557 -#: ../midori/midori-view.c:4561 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "エラー - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "ページ '%s' を読み込めませんでした" -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "再試行" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "要素の検証(_E)" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "リンクをフォアグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "リンクをバックグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "ウェブアプリケーションとして実行する(_P)" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "リンク先をコピー(_S)" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "画像のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "画像をダウンロード(_M)" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "スピードダイアル" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:3518 -msgid "Set number of columns" -msgstr "カラム数の設定" +#: ../midori/midori-view.c:3543 +msgid "Set number of columns and rows" +msgstr "行数と列数を設定" -#: ../midori/midori-view.c:3519 -msgid "Enter number of columns:" -msgstr "カラム数を入力してください:" +#: ../midori/midori-view.c:3544 +msgid "Enter number of columns and rows:" +msgstr "行数および列数を入力してください:" -#: ../midori/midori-view.c:3520 -msgid "Set number of shortcuts" -msgstr "ショートカットの設定" +#: ../midori/midori-view.c:3545 +msgid "Invalid input for the size of the speed dial" +msgstr "入力されたスピードダイアルのサイズは正しくありません" -#: ../midori/midori-view.c:3521 -msgid "Enter number of shortcuts:" -msgstr "ショートカット数を入力してください:" +#: ../midori/midori-view.c:3546 +msgid "Thumb size:" +msgstr "サムネイルサイズ:" #: ../midori/midori-view.c:3547 +msgid "Small" +msgstr "小さい" + +#: ../midori/midori-view.c:3548 +msgid "Medium" +msgstr "普通" + +#: ../midori/midori-view.c:3549 +msgid "Big" +msgstr "大きい" + +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:3570 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:3691 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "ページ読み込みの保留" -#: ../midori/midori-view.c:3692 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "最近のクラッシュか起動設定により読み込みが保留されています。" -#: ../midori/midori-view.c:3693 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "ページを読み込む" -#: ../midori/midori-view.c:3837 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4097 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4102 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "タブの復元(_R)" -#: ../midori/midori-view.c:4102 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "タブの最小化(_M)" -#: ../midori/midori-view.c:4108 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-view.c:4780 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:4781 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-view.c:4833 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:381 msgid "Features" msgstr "機能" @@ -2236,69 +2194,129 @@ msgstr "検索エンジンの管理" msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "新しいフォルダ(_F)" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "インライン検索(_I)" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "前を検索" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "次を検索" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "大文字・小文字を区別" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "強調表示" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "検索バーを閉じる" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "ファイル '%s' をダウンロードしました。" + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "転送完了" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "すべてクリア" + +#: ../toolbars/midori-transferbar.c:298 ../toolbars/midori-transferbar.c:300 +msgid "Some files are being downloaded" +msgstr "ファイルのダウンロード中です" + +#: ../toolbars/midori-transferbar.c:304 +msgid "_Quit Midori" +msgstr "Midori を終了(_Q)" + +#: ../toolbars/midori-transferbar.c:306 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Midori を終了すると転送がキャンセルされます。" + +#: ../panels/midori-bookmarks.c:109 msgid "Bookmarks" msgstr "ブックマーク" +#: ../panels/midori-bookmarks.c:245 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "ブックマークアイテムの追加に失敗しました: %s\n" + # tooltip -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "セパレータ" @@ -2347,26 +2365,26 @@ msgstr "今日" msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "フィルタ:" @@ -2628,6 +2646,18 @@ msgstr "Cookie マネージャ(_C)" msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "タブのアドレスをコピー(_A)" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "タブのアドレスをコピーします" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "すべてのタブのアドレスをクリップボードにコピーします" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "XML データ内に要求された Atom \"entry\" 要素が見つかりませんでした。" @@ -2774,6 +2804,14 @@ msgstr "ショートカット" msgid "View and edit keyboard shortcuts" msgstr "キーボードショートカットの表示および編集を行います" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "ステータスバー時計" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "ステータスバーに日付と時刻を表示します" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "画像" @@ -2808,14 +2846,22 @@ msgstr "タブパネル(_A)" msgid "Show tabs in a vertical panel" msgstr "タブを縦のパネルに表示します" -#: ../extensions/tab-switcher.c:395 +#: ../extensions/tab-switcher.c:402 msgid "Tab History List" msgstr "タブ履歴リスト" -#: ../extensions/tab-switcher.c:396 +#: ../extensions/tab-switcher.c:403 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "最後に使用された順の履歴から選択したタブに切り替えます" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "新規タブの最小化" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "新しいタブを最小化して開きます" + #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "ツールバーのカスタマイズ" @@ -2853,6 +2899,12 @@ msgstr "ツールバーのレイアウトを簡単に編集できます" msgid "Cache HTTP communication on disk" msgstr "HTTP 通信をディスクにキャッシュします" +#~ msgid "Set number of shortcuts" +#~ msgstr "ショートカットの設定" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "ショートカット数を入力してください:" + #, fuzzy #~ msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" #~ msgstr "設定を読み込めませんでした: %s\n" @@ -2878,9 +2930,6 @@ msgstr "HTTP 通信をディスクにキャッシュします" #~ msgid "Failed to get current time: %s\n" #~ msgstr "現在時刻の取得に失敗しました: %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "履歴アイテムの追加に失敗しました: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "パネルタイトルの表示(_T)" From 896cc75f5771693f9f39fdffdcf37b518abd01a6 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 09:51:54 -0400 Subject: [PATCH 2760/2970] Don't inject autosuggest bits where we dont need it --- data/autosuggestcontrol.js | 5 ++++- extensions/formhistory.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/autosuggestcontrol.js b/data/autosuggestcontrol.js index f045f0f5..85a506ab 100644 --- a/data/autosuggestcontrol.js +++ b/data/autosuggestcontrol.js @@ -295,7 +295,9 @@ FormSuggestions.prototype.requestSuggestions = function (oAutoSuggestControl /*: }; function initSuggestions () { - var inputs = document.getElementsByTagName("input"); + var inputs = document.getElementsByTagName ("input"); + if (inputs.length == 0) + return false; for (i=0;i Date: Wed, 30 Jun 2010 11:41:19 -0400 Subject: [PATCH 2761/2970] Skip values from the inputboxes with disabled autocompletion --- extensions/formhistory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/formhistory.c b/extensions/formhistory.c index b772ef04..1dd535eb 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -202,6 +202,8 @@ formhistory_navigation_decision_cb (WebKitWebView* web_view, const gchar* script = "function dumpForm (inputs) {" " var out = '';" " for (i=0;i Date: Wed, 30 Jun 2010 11:48:37 -0400 Subject: [PATCH 2762/2970] Skip '+' sign in adblock rules --- extensions/adblock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/adblock.c b/extensions/adblock.c index 4623d595..372d13ad 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -1059,6 +1059,8 @@ adblock_fixup_regexp (gchar* src) case '^': g_string_append (str, ""); break; + case '+': + break; default: g_string_append_printf (str,"%c", *src); break; @@ -1407,6 +1409,7 @@ test_adblock_parse (void) g_assert (!adblock_parse_line ("##")); g_assert (!adblock_parse_line ("[")); + g_assert_cmpstr (adblock_parse_line ("+advert/"), ==, "advert/"); g_assert_cmpstr (adblock_parse_line ("*foo"), ==, "foo"); g_assert_cmpstr (adblock_parse_line ("f*oo"), ==, "f.*oo"); g_assert_cmpstr (adblock_parse_line ("?foo"), ==, "\\?foo"); From f759fe921aa2ba826e943d637b8282294708dc65 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 12:16:05 -0400 Subject: [PATCH 2763/2970] Improve duplicate skipping logic in form history extension --- extensions/formhistory.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/formhistory.c b/extensions/formhistory.c index 1dd535eb..a21b2577 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -166,16 +166,19 @@ formhistory_update_main_hash (gchar* key, if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key))) { gchar* rvalue = g_strdup_printf ("\"%s\"",value); - if (!g_regex_match_simple (rvalue, tmp, + gchar* patt = g_regex_escape_string (rvalue, -1); + if (!g_regex_match_simple (patt, tmp, G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) { gchar* new_value = g_strdup_printf ("%s%s,", tmp, rvalue); g_hash_table_insert (global_keys, g_strdup (key), new_value); g_free (rvalue); + g_free (patt); } else { g_free (rvalue); + g_free (patt); return FALSE; } } From e7e2181858186561d9a3ebd4e4cacd964e421b14 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 10:43:18 -0400 Subject: [PATCH 2764/2970] Escape special chars in formhistory array keys --- extensions/formhistory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/formhistory.c b/extensions/formhistory.c index a21b2577..c0eb8576 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -162,6 +162,7 @@ formhistory_update_main_hash (gchar* key, if (length > MAXCHARS || length < MINCHARS) return FALSE; + formhistory_fixup_value (key); formhistory_fixup_value (value); if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key))) { From d1694c6d5fa70ba044e5996abcf420fe830e6453 Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Wed, 30 Jun 2010 21:15:11 +0200 Subject: [PATCH 2765/2970] Put number in front of download filename extension --- midori/midori-browser.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 65eaca89..3d75ab50 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1464,17 +1464,32 @@ midori_view_download_requested_cb (GtkWidget* view, /* If the filename exists, choose a different name */ if (g_access (filename, F_OK) == 0) { - /* FIXME: Put the number in front of the extension */ - gsize length = strlen (filename); + /* Put the number in front of the extension */ + gchar* extension = strrchr (filename, '.'); + gsize length = extension ? (gsize)(extension - filename) : strlen (filename); do { if (g_ascii_isdigit (filename[length - 1])) - filename[length - 1] += 1; + filename[length - 1] += 1; /* FIXME: This will increment '9' to ':' */ else { - gchar* new_filename = g_strconcat (filename, "0", NULL); + gchar* new_filename; + if (extension) + { + /* Change the '.' to a '\0' to put the 0 in between */ + *extension++ = '\0'; + new_filename= g_strconcat (filename, "0.", extension, NULL); + } + else + new_filename = g_strconcat (filename, "0", NULL); katze_assign (filename, new_filename); - length = strlen (filename); + if (extension) + { + extension = strrchr (filename, '.'); + length = extension - filename; + } + else + length = strlen (filename); } } while (g_access (filename, F_OK) == 0); From 01f568b8ab7a7d4e8734ca004d113fd1b3fea627 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 30 Jun 2010 21:21:06 +0200 Subject: [PATCH 2766/2970] 'Use current' should set 'about:blank' for a blank page --- midori/midori-preferences.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 80b207e7..1a731979 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -176,7 +176,10 @@ midori_preferences_homepage_current_clicked_cb (GtkWidget* button, if (GTK_IS_WINDOW (browser)) { gchar* uri = katze_object_get_string (browser, "uri"); - g_object_set (settings, "homepage", uri, NULL); + if (uri && *uri) + g_object_set (settings, "homepage", uri, NULL); + else + g_object_set (settings, "homepage", "about:blank", NULL); g_free (uri); } } From 28aa06366cc1aace498a5d769b3125541855487d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 30 Jun 2010 22:25:51 +0200 Subject: [PATCH 2767/2970] Declare URI accessors in Midori.View as unowned Wrongly declared, Vala will think it needs to free the strings. --- midori/midori.vapi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/midori/midori.vapi b/midori/midori.vapi index 8e04493a..fee05686 100644 --- a/midori/midori.vapi +++ b/midori/midori.vapi @@ -109,10 +109,10 @@ namespace Midori { public View (GLib.Object net); public void set_uri (string uri); public bool is_blank (); - public string get_display_uri (); - public string get_display_title (); - public string get_icon_uri (); - public string get_link_uri (); + public unowned string get_display_uri (); + public unowned string get_display_title (); + public unowned string get_icon_uri (); + public unowned string get_link_uri (); public bool has_selection (); public string get_selected_text (); public Gtk.MenuItem get_proxy_menu_item (); From 07053d49a019b1d6446fe384140bbef29776e536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20St=C3=B6sel?= Date: Wed, 30 Jun 2010 22:27:52 +0200 Subject: [PATCH 2768/2970] Re-implement History List extension in Vala --- extensions/history-list.vala | 255 +++++++++++++++++++++ extensions/tab-switcher.c | 423 ----------------------------------- 2 files changed, 255 insertions(+), 423 deletions(-) create mode 100644 extensions/history-list.vala delete mode 100644 extensions/tab-switcher.c diff --git a/extensions/history-list.vala b/extensions/history-list.vala new file mode 100644 index 00000000..b111a9f4 --- /dev/null +++ b/extensions/history-list.vala @@ -0,0 +1,255 @@ +/* + Copyright (C) 2010 André Stösel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +using Gtk; +using Gdk; +using WebKit; +using Midori; + +enum TabTreeCells { + TREE_CELL_PIXBUF, + TREE_CELL_STRING, + TREE_CELL_POINTER, + TREE_CELL_COUNT +} + +private abstract class HistoryWindow : Gtk.Window { + public Midori.Browser browser { get; construct set; } + protected Gtk.TreeView? treeview = null; + public HistoryWindow (Midori.Browser browser) { + GLib.Object (type: Gtk.WindowType.POPUP, + window_position: Gtk.WindowPosition.CENTER, + browser: browser); + } + public void walk (int step) { + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; + + this.treeview.get_cursor (out path, out column); + + unowned int[] indices = path.get_indices (); + int new_index = indices[0] + step; + + var model = this.treeview.get_model () as Gtk.ListStore; + + while (new_index < 0 || new_index >= model.length) + new_index = new_index < 0 ? model.length + new_index : new_index - model.length; + + path = new Gtk.TreePath.from_indices (new_index); + this.treeview.set_cursor (path, column, false); + } + public abstract void make_update (); +} + +private class TabWindow : HistoryWindow { + public TabWindow (Midori.Browser browser) { + base (browser); + + var hbox = new Gtk.HBox (false, 1); + this.add (hbox); + + var sw = new Gtk.ScrolledWindow (null, null); + sw.set_size_request (320, 20); + sw.set_policy (PolicyType.NEVER , PolicyType.AUTOMATIC); + sw.set_shadow_type (ShadowType.ETCHED_IN); + hbox.pack_start (sw, true, true, 0); + + var store = new Gtk.ListStore (TabTreeCells.TREE_CELL_COUNT, + typeof (Gdk.Pixbuf), typeof (string), typeof (void*)); + + Gtk.TreeIter iter; + unowned GLib.PtrArray list = this.browser.get_data ("history-list-tab-history"); + for (var i = list.len; i > 0; i--) { + Midori.View view = list.index (i - 1) as Midori.View; + + Gdk.Pixbuf? icon = null; + view.get ("icon", ref icon); + + unowned string title = view.get_display_title (); + + store.append (out iter); + store.set (iter, TabTreeCells.TREE_CELL_PIXBUF, icon, + TabTreeCells.TREE_CELL_STRING, title, + TabTreeCells.TREE_CELL_POINTER, view); + } + + this.set_default_size (320, list.len > 10 ? 232 : (int) list.len * 23 + 2); + this.treeview = new Gtk.TreeView.with_model (store); + this.treeview.set_fixed_height_mode (true); + sw.add (treeview); + + this.treeview.set_model (store); + this.treeview.set ("headers-visible", false); + + this.treeview.insert_column_with_attributes ( + TabTreeCells.TREE_CELL_PIXBUF, "Icon", + new CellRendererPixbuf (), "pixbuf", 0); + this.treeview.insert_column_with_attributes ( + TabTreeCells.TREE_CELL_STRING, "Title", + new CellRendererText (), "text", 1); + + this.show_all (); + } + public override void make_update () { + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; + + this.treeview.get_cursor (out path, out column); + + var model = this.treeview.get_model () as Gtk.ListStore; + + Gtk.TreeIter iter; + unowned Midori.View? view = null; + + model.get_iter (out iter, path); + model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view); + this.browser.set ("tab", view); + } +} + +private class HistoryList : Midori.Extension { + protected uint modifier_count; + protected HistoryWindow? history_window; + protected ulong[] tmp_sig_ids = new ulong[2]; + public bool key_press (Gdk.EventKey event_key) { + if (event_key.is_modifier > 0) { + this.modifier_count++; + } + return false; + } + public bool key_release (Gdk.EventKey event_key, Browser browser) { + if (event_key.is_modifier > 0) { + this.modifier_count--; + if (this.modifier_count == 0) { + browser.disconnect (this.tmp_sig_ids[0]); + browser.disconnect (this.tmp_sig_ids[1]); + this.history_window.make_update (); + this.history_window.destroy (); + this.history_window = null; + } + } + return false; + } + public void walk (Gtk.Action action, Browser browser, Type type, int step) { + if (this.history_window == null || this.history_window.get_type () != type) { + if (this.history_window == null) { + this.modifier_count = Midori.Sokoke.gtk_action_count_modifiers (action); + this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => { + return this.key_press (ek); + }); + this.tmp_sig_ids[1] = browser.key_release_event.connect ((ek) => { + return this.key_release (ek, browser); + }); + } else { + this.history_window.destroy (); + this.history_window = null; + } + /* + Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618750 + Code: this.history_window = (Gtk.Window) GLib.Object.new (type); + */ + if (type == typeof (TabWindow)) { + this.history_window = new TabWindow (browser); + } + } + var hw = this.history_window as HistoryWindow; + hw.walk (step); + } + void browser_added (Midori.Browser browser) { + var acg = new Gtk.AccelGroup (); + browser.add_accel_group (acg); + var action_group = browser.get_action_group (); + + Gtk.Action action; + + action = new Gtk.Action ("HistoryListNextTab", + "Next Tab (HistoryList)", "Next tab from history", null); + action.activate.connect ((a) => { + this.walk (a, browser, typeof (TabWindow), 1); + }); + action_group.add_action_with_accel (action, "Tab"); + action.set_accel_group (acg); + action.connect_accelerator (); + + action = new Gtk.Action ("HistoryListPreviousTab", + "Previous Tab (HistoryList)", "Previous tab from history", null); + action.activate.connect ((a) => { + this.walk (a, browser, typeof (TabWindow), -1); + }); + action_group.add_action_with_accel (action, "Tab"); + action.set_accel_group (acg); + action.connect_accelerator (); + + browser.set_data ("history-list-tab-history", + new GLib.PtrArray ()); + foreach (var tab in browser.get_tabs ()) + tab_added (browser, tab); + browser.add_tab.connect (tab_added); + browser.remove_tab.connect (tab_removed); + browser.notify["tab"].connect (this.tab_changed); + } + void browser_removed (Midori.Browser browser) { + string[] callbacks = { "HistoryListNextTab", "HistoryListPreviousTab" }; + + Gtk.ActionGroup action_group; + action_group = browser.get_action_group (); + for (int i = 0; i < callbacks.length; i++) { + Gtk.Action action = action_group.get_action (callbacks[i]); + if (action != null) + action_group.remove_action (action); + } + + browser.add_tab.disconnect (tab_added); + browser.remove_tab.disconnect (tab_removed); + browser.notify["tab"].disconnect (this.tab_changed); + } + void tab_added (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + list.add (view); + } + void tab_removed (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + list.remove (view); + } + void tab_changed (GLib.Object window, GLib.ParamSpec pspec) { + Midori.Browser browser = window as Midori.Browser; + Midori.View view = null; + browser.get ("tab", ref view); + + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + list.remove (view); + list.add (view); + } + void activated (Midori.App app) { + foreach (var browser in app.get_browsers ()) + browser_added (browser); + app.add_browser.connect (browser_added); + } + void deactivated () { + var app = get_app (); + foreach (var browser in app.get_browsers ()) + browser_removed (browser); + app.add_browser.disconnect (browser_added); + } + internal HistoryList () { + GLib.Object (name: "History List", + description: "Allows to switch tabs by choosing from a list sorted by last usage", + version: "0.2", + authors: "André Stösel "); + activate.connect (activated); + deactivate.connect (deactivated); + } +} + +public Midori.Extension extension_init () { + return new HistoryList (); +} + diff --git a/extensions/tab-switcher.c b/extensions/tab-switcher.c deleted file mode 100644 index ad778725..00000000 --- a/extensions/tab-switcher.c +++ /dev/null @@ -1,423 +0,0 @@ -/* - Copyright (C) 2009 André Stösel - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include - -enum { TAB_ICON, TAB_NAME, TAB_POINTER, TAB_CELL_COUNT }; - -static MidoriExtension *thisExtension; -static gboolean switchEvent; - -static GdkPixbuf* tab_selector_get_snapshot(MidoriView* view, - gint maxwidth, - gint maxheight) -{ - GtkWidget* web_view; - guint width, height; - gfloat factor; - - g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - - web_view = midori_view_get_web_view (view); - - if(maxwidth < 0) { - maxwidth *= -1; - } - if(maxheight < 0) { - maxheight *= -1; - } - - factor = MIN((gfloat) maxwidth / web_view->allocation.width, (gfloat) maxheight / web_view->allocation.height); - width = (int)(factor * web_view->allocation.width); - height = (int)(factor * web_view->allocation.height); - - return midori_view_get_snapshot(view, width, height); -} - -static void tab_selector_list_foreach (GtkWidget *view, - GtkListStore *store) -{ - GtkTreeIter it; - GdkPixbuf* icon = midori_view_get_icon (MIDORI_VIEW (view)); - const gchar *title = midori_view_get_display_title (MIDORI_VIEW (view)); - gtk_list_store_append (store, &it); - gtk_list_store_set (store, &it, TAB_ICON, icon, -1); - gtk_list_store_set (store, &it, TAB_NAME, title, -1); - gtk_list_store_set (store, &it, TAB_POINTER, view, -1); -} - -static GtkWidget* tab_selector_init_window (MidoriBrowser *browser) -{ - GList *list; - gint col_offset; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkWidget *window, *treeview, *sw, *hbox; - GtkListStore *store; - GtkWidget *page; - GtkWidget *image; - GdkPixbuf *snapshot; - - window = gtk_window_new(GTK_WINDOW_POPUP); - gtk_window_set_default_size(GTK_WINDOW(window), 320, 20); - gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); - - - hbox = gtk_hbox_new(FALSE, 1); - gtk_container_add(GTK_CONTAINER(window), hbox); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 1); - - sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), - GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - - gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0); - - store = gtk_list_store_new(TAB_CELL_COUNT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); - treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - g_object_set_data(G_OBJECT(window), "tab_selector_treeview", treeview); - - list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - g_list_foreach(list, (GFunc) tab_selector_list_foreach, store); - - g_object_unref(store); - g_object_set(treeview, "headers-visible", FALSE, NULL); - - renderer = gtk_cell_renderer_pixbuf_new(); - - gtk_tree_view_insert_column_with_attributes( - GTK_TREE_VIEW(treeview), -1, "Icon", renderer, "pixbuf", TAB_ICON, NULL); - - renderer = gtk_cell_renderer_text_new(); - - col_offset = gtk_tree_view_insert_column_with_attributes( - GTK_TREE_VIEW(treeview), -1, "Title", renderer, "text", TAB_NAME, NULL); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1); - gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), - midori_extension_get_integer(thisExtension, "TitleColumnWidth")); - - gtk_container_add (GTK_CONTAINER (sw), treeview); - - page = katze_object_get_object(browser, "tab"); - snapshot = tab_selector_get_snapshot(MIDORI_VIEW(page), - midori_extension_get_integer(thisExtension, "TabPreviewWidth"), - midori_extension_get_integer(thisExtension, "TabPreviewHeight")); - image = gtk_image_new_from_pixbuf (snapshot); - gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0); - g_object_set_data(G_OBJECT(window), "tab_selector_image", image); - - gtk_widget_show_all(window); - - return window; -} - -static void tab_selector_window_walk ( GtkWidget *window, - GdkEventKey *event, - MidoriBrowser *browser) -{ - gint *pindex, iindex, items; - GtkWidget *view; - GtkTreeIter iter; - GtkTreePath *path; - GtkTreeView *treeview; - GtkTreeModel *model; - GtkTreeViewColumn *column; - - treeview = g_object_get_data (G_OBJECT (window), "tab_selector_treeview"); - model = gtk_tree_view_get_model (treeview); - items = gtk_tree_model_iter_n_children (model, NULL) -1; - gtk_tree_view_get_cursor (treeview, &path, &column); - pindex = gtk_tree_path_get_indices (path); - if(!pindex) - return; - iindex = *pindex; - gtk_tree_path_free(path); - - if (event->state & GDK_SHIFT_MASK) - iindex = iindex == 0 ? items : iindex-1; - else - iindex = iindex == items ? 0 : iindex+1; - - path = gtk_tree_path_new_from_indices(iindex, -1); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 1); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, column, FALSE); - - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, TAB_POINTER, &view, -1); - - if (midori_extension_get_boolean (thisExtension, "ShowTabInBackground")) { - midori_browser_set_current_tab (browser, view); - } else { - GtkImage *image; - GdkPixbuf *snapshot = tab_selector_get_snapshot(MIDORI_VIEW(view), - midori_extension_get_integer(thisExtension, "TabPreviewWidth"), - midori_extension_get_integer(thisExtension, "TabPreviewHeight")); - image = g_object_get_data(G_OBJECT(window), "tab_selector_image"); - gtk_image_set_from_pixbuf(image, snapshot); - } - gtk_tree_path_free(path); -} - -static gboolean tab_selector_handle_events (GtkWidget *widget, - GdkEventKey *event, - MidoriBrowser *browser) -{ - /* tab -> 23 - ctrl -> 37 */ - gint treeitems; - static GtkWidget *window; - if(event->type == GDK_KEY_PRESS && event->hardware_keycode == 23 && event->state & GDK_CONTROL_MASK) { - treeitems = gtk_notebook_get_n_pages (GTK_NOTEBOOK ( - katze_object_get_object(browser, "notebook"))); - if(treeitems > 1) { - if(!GTK_IS_WINDOW(window)) { - switchEvent = FALSE; - window = tab_selector_init_window(browser); - } - tab_selector_window_walk(window, event, browser); - } - return TRUE; - } else if(event->type == GDK_KEY_RELEASE && event->hardware_keycode == 37 && GTK_IS_WINDOW(window)) { - switchEvent = TRUE; - if(midori_extension_get_boolean(thisExtension, "ShowTabInBackground")) { - GtkWidget *page; - page = katze_object_get_object(browser, "tab"); - - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_remove(list, page); - list = g_list_prepend(list, page); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); - } else { - GtkTreePath *path; - GtkTreeViewColumn *column; - GtkTreeIter iter; - GtkWidget *view, *treeview; - GtkTreeModel *model; - - treeview = g_object_get_data(G_OBJECT(window), "tab_selector_treeview"); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - - gtk_tree_view_get_cursor ( - GTK_TREE_VIEW(treeview), &path, &column); - gtk_tree_model_get_iter ( - model, &iter, path); - gtk_tree_model_get ( - model, &iter, TAB_POINTER, &view, -1); - midori_browser_set_current_tab (browser, view); - gtk_tree_path_free (path); - } - gtk_widget_destroy(window); - window = NULL; - return TRUE; - } - return FALSE; -} - -static void tab_selector_switch_page (GtkNotebook *notebook, - GtkNotebookPage *page_, - guint page_num, - MidoriBrowser *browser) -{ - if(switchEvent) { - /* Don't know why *page_ points to the wrong address */ - GtkWidget *page; - page = katze_object_get_object(browser, "tab"); - - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_remove(list, page); - list = g_list_prepend(list, page); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); - } -} - -static void -tab_selector_browser_add_tab_cb (MidoriBrowser *browser, - GtkWidget *view, - MidoriExtension *extension) -{ - GtkWidget* web_view; - GList* list; - - g_return_if_fail (MIDORI_IS_VIEW (view)); - - web_view = midori_view_get_web_view (MIDORI_VIEW(view)); - - g_signal_connect (web_view, "key_press_event", - G_CALLBACK (tab_selector_handle_events), browser); - g_signal_connect (web_view, "key_release_event", - G_CALLBACK (tab_selector_handle_events), browser); - - list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_append(list, view); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); -} - -static void -tab_selector_browser_remove_tab_cb (MidoriBrowser *browser, - GtkWidget *view, - MidoriExtension *extension) -{ - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_remove(list, view); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); -} - -static void -tab_selector_disconnect_tab_cb (GtkWidget *view, - MidoriBrowser *browser) -{ - g_signal_handlers_disconnect_by_func ( - view, tab_selector_handle_events, browser); -} - -static void -tab_selector_app_add_browser_cb (MidoriApp *app, - MidoriBrowser *browser, - MidoriExtension *extension) -{ - GtkWidget *navigationbar, *notebook; - - g_object_set_data(G_OBJECT(browser), "tab_selector_list", NULL); - - g_signal_connect (browser, "add-tab", - G_CALLBACK (tab_selector_browser_add_tab_cb), extension); - g_signal_connect (browser, "remove-tab", - G_CALLBACK (tab_selector_browser_remove_tab_cb), extension); - - navigationbar = katze_object_get_object(browser, "navigationbar"); - g_signal_connect (navigationbar, "key_press_event", - G_CALLBACK (tab_selector_handle_events), browser); - g_signal_connect (navigationbar, "key_release_event", - G_CALLBACK (tab_selector_handle_events), browser); - g_object_unref(navigationbar); - - notebook = katze_object_get_object(browser, "notebook"); - g_signal_connect_after (notebook, "switch-page", - G_CALLBACK (tab_selector_switch_page), browser); - g_object_unref(notebook); -} - -static void -tab_selector_app_remove_browser_cb (MidoriApp *app, - MidoriBrowser *browser, - MidoriExtension *extension) -{ - GList *list = g_object_get_data (G_OBJECT (browser), "tab_selector_list"); - g_list_free (list); -} - -static void -tab_selector_disconnect_browser_cb (MidoriApp *app, - MidoriBrowser *browser, - MidoriExtension *extension) -{ - GtkWidget *navigationbar, *notebook; - - midori_browser_foreach (browser, - (GtkCallback)tab_selector_disconnect_tab_cb, browser); - - g_signal_handlers_disconnect_by_func ( - browser, tab_selector_browser_add_tab_cb, extension); - g_signal_handlers_disconnect_by_func ( - browser, tab_selector_browser_remove_tab_cb, extension); - g_signal_handlers_disconnect_by_func ( - katze_object_get_object (browser, "navigationbar"), - tab_selector_handle_events, browser); - - navigationbar = katze_object_get_object (browser, "navigationbar"); - g_signal_handlers_disconnect_by_func (navigationbar, - tab_selector_handle_events, browser); - g_signal_handlers_disconnect_by_func (navigationbar, - tab_selector_handle_events, browser); - g_object_unref (navigationbar); - - notebook = katze_object_get_object (browser, "notebook"); - g_signal_handlers_disconnect_by_func (notebook, - tab_selector_switch_page, browser); - g_object_unref (notebook); -} - -static void -tab_selector_activate_cb (MidoriExtension *extension, - MidoriApp *app) -{ - GtkWidget *view; - KatzeArray *browsers; - MidoriBrowser *browser; - guint i, j; - - browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) { - j = 0; - tab_selector_app_add_browser_cb (app, browser, extension); - while((view = midori_browser_get_nth_tab(browser, j++))) - tab_selector_browser_add_tab_cb(browser, view, extension); - } - g_object_unref (browsers); - g_signal_connect (app, "add-browser", - G_CALLBACK (tab_selector_app_add_browser_cb), extension); - g_signal_connect (app, "remove-browser", - G_CALLBACK (tab_selector_app_remove_browser_cb), extension); -} - -static void -tab_selector_deactivate_cb (MidoriExtension *extension, - GtkWidget *foo) -{ - MidoriApp* app = midori_extension_get_app (extension); - KatzeArray *browsers; - MidoriBrowser *browser; - guint i; - - g_signal_handlers_disconnect_by_func ( - app, tab_selector_app_add_browser_cb, extension); - g_signal_handlers_disconnect_by_func ( - app, tab_selector_app_remove_browser_cb, extension); - - browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) - tab_selector_disconnect_browser_cb (app, browser, extension); - g_object_unref (browsers); -} - -MidoriExtension* -extension_init (void) -{ - MidoriExtension *extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Tab History List"), - "description", _("Allows to switch tabs by choosing from a " - "list sorted by last usage"), - "version", "0.1", - "authors", "André Stösel ", - NULL); - - g_signal_connect (extension, "activate", - G_CALLBACK (tab_selector_activate_cb), NULL); - g_signal_connect (extension, "deactivate", - G_CALLBACK (tab_selector_deactivate_cb), NULL); - - midori_extension_install_boolean (extension, "ShowTabInBackground", FALSE); - midori_extension_install_integer (extension, "TitleColumnWidth", 300); - midori_extension_install_integer (extension, "TabPreviewWidth", 200); - midori_extension_install_integer (extension, "TabPreviewHeight", 200); - thisExtension = extension; - switchEvent = TRUE; - - return extension; -} - From a04bf24b5ef4efc2df0a89b856d4d0e66b19785d Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 16:31:10 -0400 Subject: [PATCH 2769/2970] Properly disconnect add-tab on destruction in adblock --- extensions/adblock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/adblock.c b/extensions/adblock.c index 372d13ad..46a244a0 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -1349,6 +1349,8 @@ adblock_deactivate_cb (MidoriExtension* extension, extension, adblock_deactivate_cb, browser); g_signal_handlers_disconnect_by_func ( app, adblock_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func ( + browser, adblock_add_tab_cb, extension); midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, browser); katze_assign (blockcss, NULL); From b0191b69b08a7c7436bb46cb6a2f6c14f9b084e5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 30 Jun 2010 23:09:21 +0200 Subject: [PATCH 2770/2970] Check if extension_init returns NULL and handle it In the case where an extension ends up existing multiple times, it will fail to create an instance. We would rather see it in the list than crash. --- midori/main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index ab7de931..0b40b412 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1109,13 +1109,17 @@ midori_load_extensions (gpointer data) (gpointer) &extension_init)) { extension = extension_init (); - /* Signal that we want the extension to load and save */ - g_object_set_data_full (G_OBJECT (extension), "filename", - g_strdup (filename), g_free); - if (midori_extension_is_prepared (extension)) - midori_extension_get_config_dir (extension); + if (extension != NULL) + { + /* Signal that we want the extension to load and save */ + g_object_set_data_full (G_OBJECT (extension), "filename", + g_strdup (filename), g_free); + if (midori_extension_is_prepared (extension)) + midori_extension_get_config_dir (extension); + } } - else + + if (!extension) { extension = g_object_new (MIDORI_TYPE_EXTENSION, "name", filename, From 62f5a1c974c4b7ea24fa0035b85c557eead8928c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jul 2010 00:13:18 +0200 Subject: [PATCH 2771/2970] Introduce ITEM_IS_BOOKMARK|FOLDER|SEPARATOR in bookmark panel The implicit logic for differentiating items is not easy to read, so we introduce macros for that. --- panels/midori-bookmarks.c | 69 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index b98724f4..7db49898 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -24,6 +24,10 @@ #include +#define ITEM_IS_BOOKMARK(item) (item && katze_item_get_uri (item)) +#define ITEM_IS_FOLDER(item) (item && !katze_item_get_uri (item)) +#define ITEM_IS_SEPARATOR(item) (item == NULL) + void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, @@ -217,7 +221,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, int type = 0; gchar* parent; - if (katze_item_get_uri (item)) + if (ITEM_IS_BOOKMARK (item)) type = 1; if (folder) @@ -257,7 +261,7 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, gchar* sqlcmd; char* errmsg = NULL; - if (katze_item_get_uri (item)) + if (ITEM_IS_BOOKMARK (item)) sqlcmd = sqlite3_mprintf ( "DELETE FROM bookmarks WHERE uri = '%q'", katze_item_get_uri (item)); @@ -326,16 +330,15 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, &model, &iter)) { KatzeItem* item; - gboolean is_separator; + MidoriBrowser* browser; gtk_tree_model_get (model, &iter, 0, &item, -1); - is_separator = item && !katze_item_get_uri (item); - if (!is_separator) - { - MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); - } + g_assert (!ITEM_IS_SEPARATOR (item)); + + browser = midori_browser_get_for_widget (toolitem); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + g_object_unref (item); } } @@ -381,16 +384,13 @@ midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) { - gboolean is_separator; - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (!item) - return; - is_separator = !katze_item_get_uri (item); - gtk_widget_set_sensitive (bookmarks->edit, !is_separator); + + gtk_widget_set_sensitive (bookmarks->edit, !ITEM_IS_SEPARATOR (item)); gtk_widget_set_sensitive (bookmarks->delete, TRUE); - g_object_unref (item); + if (item != NULL) + g_object_unref (item); } else { @@ -550,10 +550,10 @@ midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, /* TODO: Would it be better to not do this on every redraw? */ pixbuf = NULL; - if (item && !katze_item_get_uri (item) && katze_item_get_name (item)) + if (ITEM_IS_FOLDER (item)) pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); - else if (item && katze_item_get_uri (item)) + else if (ITEM_IS_BOOKMARK (item)) pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -621,7 +621,7 @@ midori_bookmarks_popup_item (GtkWidget* menu, const gchar* uri; GtkWidget* menuitem; - uri = katze_item_get_uri (item); + uri = ITEM_IS_BOOKMARK (item) ? katze_item_get_uri (item) : NULL; menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); if (label) @@ -629,8 +629,8 @@ midori_bookmarks_popup_item (GtkWidget* menu, GTK_BIN (menuitem))), label); if (!strcmp (stock_id, GTK_STOCK_EDIT)) gtk_widget_set_sensitive (menuitem, - KATZE_IS_ARRAY (item) || uri != NULL); - else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE)) + !ITEM_IS_SEPARATOR (item)); + else if (!ITEM_IS_FOLDER (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks); @@ -646,9 +646,8 @@ midori_bookmarks_open_activate_cb (GtkWidget* menuitem, const gchar* uri; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - if (uri && *uri) + if ((uri = katze_item_get_uri (item)) && *uri) { MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); midori_browser_set_current_uri (browser, uri); @@ -664,11 +663,12 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, guint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - if (KATZE_IS_ARRAY (item)) + if (ITEM_IS_FOLDER (item)) { KatzeItem* child; guint i = 0; + g_return_if_fail (KATZE_IS_ARRAY (item)); while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) { if ((uri = katze_item_get_uri (child)) && *uri) @@ -727,16 +727,13 @@ midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, MidoriBookmarks* bookmarks) { KatzeItem* item; - gboolean is_separator; + MidoriBrowser* browser; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); + g_assert (!ITEM_IS_SEPARATOR (item)); - if (!is_separator) - { - MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); - } + browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } static void @@ -772,7 +769,7 @@ midori_bookmarks_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - if (KATZE_IS_ARRAY (item)) + if (ITEM_IS_FOLDER (item)) midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open all in _Tabs"), item, midori_bookmarks_open_in_tab_activate_cb, bookmarks); @@ -815,9 +812,8 @@ midori_bookmarks_button_release_event_cb (GtkWidget* widget, if (event->button == 2) { - const gchar* uri = katze_item_get_uri (item); - - if (uri && *uri) + const gchar* uri; + if (ITEM_IS_BOOKMARK (item) && (uri = katze_item_get_uri (item)) && *uri) { MidoriBrowser* browser; gint n; @@ -830,7 +826,8 @@ midori_bookmarks_button_release_event_cb (GtkWidget* widget, else midori_bookmarks_popup (widget, event, item, bookmarks); - g_object_unref (item); + if (item != NULL) + g_object_unref (item); return TRUE; } return FALSE; From 791c38ae3e98606d419cb87bb9de4c7a49bc098e Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 20:45:14 -0400 Subject: [PATCH 2772/2970] Fix open directory in tabs in bookmarks sidebar --- panels/midori-bookmarks.c | 95 +++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 7db49898..1b3a26fb 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -139,19 +139,15 @@ midori_bookmarks_import_array_db (KatzeArray* array, } } -static gboolean +static KatzeArray* midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, - GtkTreeStore* model, - GtkTreeIter* parent, const gchar* folder) { sqlite3* db; sqlite3_stmt* statement; gint result; const gchar* sqlcmd; - - GtkTreeIter iter; - GtkTreeIter root_iter; + KatzeArray* array; db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); @@ -161,7 +157,9 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); if (result != SQLITE_OK) - return FALSE; + return NULL; + + array = katze_array_new (KATZE_TYPE_ITEM); while ((result = sqlite3_step (statement)) == SQLITE_ROW) { @@ -183,24 +181,12 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, katze_item_set_meta_integer (item, "toolbar", toolbar); /* type 0 -- folder, 1 -- entry */ - if (type == 0) + if (type == 1) { - gtk_tree_store_insert_with_values (model, &root_iter, parent, - 0, 0, item, -1); - /* That's an invisible dummy, so we always have an expander */ - gtk_tree_store_insert_with_values (model, &iter, &root_iter, - 0, 0, NULL, -1); - } - else - { - if (!uri) - continue; - katze_item_set_uri (item, (gchar*)uri); katze_item_set_meta_integer (item, "app", app); - gtk_tree_store_insert_with_values (model, NULL, parent, - 0, 0, item, -1); } + katze_array_add_item (array, item); } if (result != SQLITE_DONE) @@ -208,7 +194,39 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, sqlite3_errmsg (db)); sqlite3_finalize (statement); - return FALSE; + return array; +} + +static void +midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, + GtkTreeStore* model, + GtkTreeIter* parent, + const gchar* folder) +{ + KatzeArray* array; + KatzeItem* child; + GtkTreeIter iter; + GtkTreeIter root_iter; + guint i = 0; + + array = midori_bookmarks_read_from_db (bookmarks, folder); + while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) + { + if (ITEM_IS_BOOKMARK (child)) + { + gtk_tree_store_insert_with_values (model, NULL, parent, + 0, 0, child, -1); + } + else + { + gtk_tree_store_insert_with_values (model, &root_iter, parent, + 0, 0, child, -1); + /* That's an invisible dummy, so we always have an expander */ + gtk_tree_store_insert_with_values (model, &iter, &root_iter, + 0, 0, NULL, -1); + } + i++; + } } void @@ -491,7 +509,7 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); #if HAVE_SQLITE - midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, ""); + midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, ""); g_signal_connect_after (model, "row-changed", G_CALLBACK (midori_bookmarks_row_changed_cb), bookmarks); @@ -666,10 +684,12 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, if (ITEM_IS_FOLDER (item)) { KatzeItem* child; + KatzeArray* array; guint i = 0; - g_return_if_fail (KATZE_IS_ARRAY (item)); - while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) + array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item)); + g_return_if_fail (KATZE_IS_ARRAY (array)); + while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) { if ((uri = katze_item_get_uri (child)) && *uri) { @@ -686,20 +706,17 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, i++; } } - else + else if ((uri = katze_item_get_uri (item)) && *uri) { - if ((uri = katze_item_get_uri (item)) && *uri) - { - MidoriBrowser* browser; - MidoriWebSettings* settings; + MidoriBrowser* browser; + MidoriWebSettings* settings; - browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - n = midori_browser_add_item (browser, item); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (browser, n); - g_object_unref (settings); - } + browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + n = midori_browser_add_item (browser, item); + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (browser, n); + g_object_unref (settings); } } @@ -887,8 +904,8 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview, model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); gtk_tree_model_get (model, iter, 0, &item, -1); #if HAVE_SQLITE - midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), - iter, katze_item_get_name (item)); + midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), + iter, katze_item_get_name (item)); #endif g_object_unref (item); } From 090a16f664deff19e59301e5a1b39f175df9dd5a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 21:19:15 -0400 Subject: [PATCH 2773/2970] Fix bookmark folder properties dialog --- midori/midori-browser.c | 6 +++--- panels/midori-bookmarks.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3d75ab50..706fe913 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -788,7 +788,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_widget_show_all (hbox); entry_uri = NULL; - if (!KATZE_IS_ARRAY (bookmark)) + if (!is_folder) { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); @@ -891,7 +891,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_widget_show_all (hbox); check_app = NULL; - if (!KATZE_IS_ARRAY (bookmark)) + if (!is_folder) { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 1); @@ -917,7 +917,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_desc))); katze_item_set_meta_integer (bookmark, "toolbar", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))); - if (!KATZE_IS_ARRAY (bookmark)) + if (!is_folder) { katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 1b3a26fb..f633d775 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -355,7 +355,7 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, g_assert (!ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (toolitem); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, ITEM_IS_FOLDER (item)); g_object_unref (item); } @@ -750,7 +750,7 @@ midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, g_assert (!ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, ITEM_IS_FOLDER (item)); } static void From fb634e19b9cb30721e4d918198ba2097c206881a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 21:24:43 -0400 Subject: [PATCH 2774/2970] Fix popup menu on folders in history --- panels/midori-history.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index ba3fe3f7..c5691d0a 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -631,9 +631,8 @@ midori_history_popup_item (GtkWidget* menu, gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( GTK_BIN (menuitem))), label); if (!strcmp (stock_id, GTK_STOCK_EDIT)) - gtk_widget_set_sensitive (menuitem, - KATZE_IS_ARRAY (item) || uri != NULL); - else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE)) + gtk_widget_set_sensitive (menuitem, uri != NULL); + else if (katze_item_get_uri (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (callback), history); @@ -736,7 +735,7 @@ midori_history_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - if (KATZE_IS_ARRAY (item)) + if (!katze_item_get_uri (item)) midori_history_popup_item (menu, STOCK_TAB_NEW, _("Open all in _Tabs"), item, midori_history_open_in_tab_activate_cb, history); From 6822969aacd1a65941913764a75366729cb82d95 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jul 2010 20:42:42 +0200 Subject: [PATCH 2775/2970] Introduce katze_item_get_meta_boolean convenience --- katze/katze-item.c | 26 ++++++++++++++++++++++++++ katze/katze-item.h | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/katze/katze-item.c b/katze/katze-item.c index 9ea98bd3..e56bc47b 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -595,6 +595,32 @@ katze_item_get_meta_integer (KatzeItem* item, return -1; } +/** + * katze_item_get_meta_boolean: + * @item: a #KatzeItem + * @key: the name of a boolean value + * + * The Value should be set with katze_item_set_meta_integer(). + * If the value is set and not 0, %TRUE will be returned. + * + * Since: 0.2.7 + **/ +gboolean +katze_item_get_meta_boolean (KatzeItem* item, + const gchar* key) +{ + const gchar* value; + + g_return_val_if_fail (KATZE_IS_ITEM (item), FALSE); + g_return_val_if_fail (key != NULL, FALSE); + + value = katze_item_get_meta_string (item, key); + if (value == NULL || value[0] == '0') + return FALSE; + else + return TRUE; +} + /** * katze_item_set_meta_integer: * @item: a #KatzeItem diff --git a/katze/katze-item.h b/katze/katze-item.h index 387a7a23..23b61fd2 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -118,6 +118,10 @@ gint64 katze_item_get_meta_integer (KatzeItem* item, const gchar* key); +gboolean +katze_item_get_meta_boolean (KatzeItem* item, + const gchar* key); + void katze_item_set_meta_integer (KatzeItem* item, const gchar* key, From 94b6cf4e174571085e6e477eedd5bd49b644cd9e Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 01:24:17 -0400 Subject: [PATCH 2776/2970] Fix display of the bookmark properties in the add dialog --- midori/midori-browser.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 706fe913..a50e413a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -885,7 +885,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar), - katze_item_get_meta_integer (bookmark, "toolbar")); + katze_item_get_meta_boolean (bookmark, "toolbar")); gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); @@ -900,7 +900,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app), - katze_item_get_meta_integer (bookmark, "app")); + katze_item_get_meta_boolean (bookmark, "app")); gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); @@ -3991,9 +3991,9 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); uri = katze_item_get_uri (item); - if (KATZE_IS_ARRAY (item)) + if (!uri) midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE); - else if (uri && *uri) + else midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } @@ -4025,7 +4025,7 @@ midori_browser_bookmark_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - if (KATZE_IS_ARRAY (item)) + if (!katze_item_get_uri (item)) midori_browser_bookmark_popup_item (menu, STOCK_TAB_NEW, _("Open all in _Tabs"), item, midori_browser_bookmark_open_in_tab_activate_cb, browser); @@ -6553,6 +6553,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) item = katze_item_new (); katze_item_set_name (item, (gchar*)title); + katze_item_set_meta_integer (item, "toolbar", 1); if (uri) { katze_item_set_uri (item, (gchar*)uri); From 4f9615167eab26729de4134b3bb1f5eced3b9e88 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jul 2010 20:58:20 +0200 Subject: [PATCH 2777/2970] Make sqlite3 a mandatory dependency --- README | 4 ++-- wscript | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/README b/README index 305c921b..e58c5b08 100644 --- a/README +++ b/README @@ -11,9 +11,9 @@ Midori is a lightweight web browser. * Customizable and extensible interface. * Extensions written in C. -Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2 +Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2, sqlite 3.0 -Optional: Unique 0.9, libidn, sqlite 3.0, docutils, libnotify +Optional: Unique 0.9, libidn, docutils, libnotify For installation instructions read INSTALL. diff --git a/wscript b/wscript index 76de481a..952f5820 100644 --- a/wscript +++ b/wscript @@ -186,15 +186,6 @@ def configure (conf): unique = 'no ' conf.define ('HAVE_UNIQUE', [0,1][unique == 'yes']) - if option_enabled ('sqlite'): - check_pkg ('sqlite3', '3.0', False, var='SQLITE') - sqlite = ['N/A','yes'][conf.env['HAVE_SQLITE'] == 1] - if sqlite != 'yes': - option_checkfatal ('sqlite', 'history database') - else: - sqlite = 'no ' - conf.define ('HAVE_SQLITE', [0,1][sqlite == 'yes']) - if option_enabled ('libnotify'): check_pkg ('libnotify', mandatory=False) libnotify = ['N/A','yes'][conf.env['HAVE_LIBNOTIFY'] == 1] @@ -225,6 +216,8 @@ def configure (conf): check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3') check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91') check_pkg ('libxml-2.0', '2.6') + check_pkg ('sqlite3', '3.0', True, var='SQLITE') + conf.define ('HAVE_SQLITE', 1) if conf.env['HAVE_LIBSOUP_2_27_90']: idn = 'yes' @@ -327,7 +320,6 @@ def configure (conf): print ''' Localization: %(nls)s (intltool) Icon optimizations: %(icons)s (rsvg-convert) - History: %(sqlite)s (sqlite3) Notifications: %(libnotify)s (libnotify) IDN support: %(idn)s (libidn or libsoup 2.27.90) @@ -376,7 +368,6 @@ def set_options (opt): group = opt.add_option_group ('Optional features', '') add_enable_option ('unique', 'single instance support', group) add_enable_option ('libidn', 'international domain name support', group) - add_enable_option ('sqlite', 'history database support', group) add_enable_option ('libnotify', 'notification support', group) add_enable_option ('addons', 'building of extensions', group) add_enable_option ('tests', 'building of tests', group, disable=True) From 32299da6c143946a8245a1dbad04f66c038aac52 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Thu, 1 Jul 2010 21:56:16 +0200 Subject: [PATCH 2778/2970] l10n: Updated Danish (da) translation to 99% New status: 635 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 577 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 293 insertions(+), 284 deletions(-) diff --git a/po/da.po b/po/da.po index 7d480e4f..27e39756 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-19 10:08+0000\n" +"POT-Creation-Date: 2010-06-30 16:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -243,258 +243,259 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5391 -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5027 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5024 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:463 +#: ../midori/midori-browser.c:455 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:493 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:515 +#: ../midori/midori-browser.c:507 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:771 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4547 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4177 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:949 -#: ../midori/midori-browser.c:4552 ../midori/midori-browser.c:4584 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4182 ../midori/midori-browser.c:4214 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:894 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:909 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:1003 +#: ../midori/midori-browser.c:976 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:1007 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1064 ../midori/midori-browser.c:4602 -#: ../midori/midori-browser.c:4634 +#: ../midori/midori-browser.c:1037 ../midori/midori-browser.c:4232 +#: ../midori/midori-browser.c:4264 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1457 +#: ../midori/midori-browser.c:1430 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2195 +#: ../midori/midori-browser.c:2132 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2273 +#: ../midori/midori-browser.c:2210 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -#: ../midori/midori-browser.c:2279 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2216 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2322 ../midori/midori-browser.c:5456 -#: ../panels/midori-bookmarks.c:434 +#: ../midori/midori-browser.c:2259 ../midori/midori-browser.c:5086 +#: ../panels/midori-bookmarks.c:418 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:2895 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:2728 ../panels/midori-bookmarks.c:203 #: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 #: ../extensions/formhistory.c:465 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../midori/midori-browser.c:2975 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2808 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Tom" -#: ../midori/midori-browser.c:3593 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3415 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:3907 ../midori/midori-browser.c:5850 +#: ../midori/midori-browser.c:3681 ../midori/midori-browser.c:5467 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4240 ../panels/midori-bookmarks.c:792 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4015 ../panels/midori-bookmarks.c:777 +#: ../panels/midori-history.c:741 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4247 ../panels/midori-bookmarks.c:798 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4022 ../panels/midori-bookmarks.c:783 +#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4250 ../panels/midori-bookmarks.c:800 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4025 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:785 +#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4473 +#: ../midori/midori-browser.c:4103 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4104 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4105 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4476 +#: ../midori/midori-browser.c:4106 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4107 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4498 +#: ../midori/midori-browser.c:4128 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4501 ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:4131 ../midori/midori-browser.c:5091 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4512 +#: ../midori/midori-browser.c:4142 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4539 ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:4169 ../midori/midori-browser.c:5195 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:691 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4613 +#: ../midori/midori-browser.c:4243 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4649 +#: ../midori/midori-browser.c:4279 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4703 ../panels/midori-bookmarks.c:283 +#: ../midori/midori-browser.c:4333 ../panels/midori-bookmarks.c:272 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4440 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:4444 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4458 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4839 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4469 ../midori/midori-preferences.c:530 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4475 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4480 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4485 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:4860 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4490 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:4865 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4495 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4503 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4604 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4606 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4625 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -502,515 +503,490 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:4934 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:5306 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4936 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:4937 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:4940 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:4942 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:4943 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:4947 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:4950 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:4952 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:5323 +#: ../midori/midori-browser.c:4953 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:4955 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:4956 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:4958 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:4959 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:4964 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:4965 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:4967 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:4968 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:4971 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:4974 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:4976 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:4980 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:4983 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:4987 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:5360 ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:4990 ../midori/midori-browser.c:4993 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:5366 +#: ../midori/midori-browser.c:4996 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:4999 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5002 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5005 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5007 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:5008 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5010 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5011 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5015 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5387 +#: ../midori/midori-browser.c:5017 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5018 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:5030 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5033 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:5036 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:5037 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:5039 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:5040 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:5043 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:5046 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:5047 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:5049 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:5050 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:5052 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:5053 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:5425 +#: ../midori/midori-browser.c:5055 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:5056 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:5059 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5062 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5065 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5069 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5073 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5076 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5078 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5079 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5081 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5082 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5088 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5089 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5094 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5467 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5097 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5098 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5101 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5102 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5106 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5107 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5112 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5113 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5115 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5116 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5118 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5119 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5121 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5122 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5124 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5126 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5127 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5129 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5130 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5132 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5133 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5136 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5144 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5145 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5148 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5149 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5152 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5153 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5156 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5157 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5160 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5161 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5164 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5165 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5173 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5546 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5176 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5180 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5553 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5183 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5556 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5186 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5559 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5189 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5562 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5192 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:6107 +#: ../midori/midori-browser.c:5723 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5730 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:6116 +#: ../midori/midori-browser.c:5732 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:6140 +#: ../midori/midori-browser.c:5756 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:6142 +#: ../midori/midori-browser.c:5758 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:6163 +#: ../midori/midori-browser.c:5779 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:6178 +#: ../midori/midori-browser.c:5794 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:6180 +#: ../midori/midori-browser.c:5796 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:6195 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:5811 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/midori-browser.c:6197 +#: ../midori/midori-browser.c:5813 msgid "Show the saved bookmarks" msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:6212 +#: ../midori/midori-browser.c:5828 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:6225 +#: ../midori/midori-browser.c:5841 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:6227 +#: ../midori/midori-browser.c:5843 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:5857 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:5859 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6450 -msgid "_Inline Find:" -msgstr "_Indlejret søgning:" - -#: ../midori/midori-browser.c:6481 -msgid "Previous" -msgstr "Forrige" - -#: ../midori/midori-browser.c:6486 -msgid "Next" -msgstr "Næste" - -#: ../midori/midori-browser.c:6491 -msgid "Match Case" -msgstr "Versalfølsom" - -#: ../midori/midori-browser.c:6500 -msgid "Highlight Matches" -msgstr "Fremhæv fundne" - -#: ../midori/midori-browser.c:6512 -msgid "Close Findbar" -msgstr "Luk søgebjælke" - -#: ../midori/midori-browser.c:6908 +#: ../midori/midori-browser.c:6436 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" @@ -1057,7 +1033,7 @@ msgstr "Luk panel" msgid "Align sidepanel to the left" msgstr "Opstil sidepanel til venstre" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Skjul handlingskontroller" @@ -1660,237 +1636,237 @@ msgstr "De private data valgt til sletning" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Fejl - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Siden '%s' kunne ikke indlæses." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Prøv igen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Send en besked til %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Undersøg _element" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Åbn henvisning i _fanebladet i forgrunden" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Åbn henvisning i _faneblad i baggrunden" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Åbn henvisning som et _webprogram" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "Kopiér _henvisningsdestination" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "_Hent henvisningsadressen" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Hent med nedhentnings_håndtering" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Åbn _billede i nyt faneblad" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Kopiér billed_adresse" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Gem _billede" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Hent bi_llede" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Kopiér vide_oadresse" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Gem _video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Hent _video" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Indstil antal af kolonner og rækker" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Angiv antal kolonner og rækker:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Ugyldig inddata af størrelsen til hurtigopringing." -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Miniaturestørrelse:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Små" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Mellem" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Stor" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Forsinket sideindlæsning" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Indlæs side" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "_Gendan faneblad" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Minimér faneblad" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:381 msgid "Features" msgstr "Funktionalitet" @@ -2110,6 +2086,31 @@ msgstr "Netscape-u_dvidelsesmoduler" msgid "New _Folder" msgstr "Ny __mappe" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Indlejret søgning:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Forrige" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Næste" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Versalfølsom" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Fremhæv fundne" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Luk søgebjælke" + #: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" @@ -2128,15 +2129,15 @@ msgstr "Overførsel gennemført" msgid "Clear All" msgstr "Ryd alle" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:298 ../toolbars/midori-transferbar.c:300 msgid "Some files are being downloaded" msgstr "Nogle filer bliver overført" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:304 msgid "_Quit Midori" msgstr "_Afslut Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:306 msgid "The transfers will be cancelled if Midori quits." msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." @@ -2144,24 +2145,24 @@ msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:256 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" -#: ../panels/midori-bookmarks.c:442 +#: ../panels/midori-bookmarks.c:426 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:450 +#: ../panels/midori-bookmarks.c:434 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:463 +#: ../panels/midori-bookmarks.c:448 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:597 +#: ../panels/midori-bookmarks.c:582 msgid "Separator" msgstr "Separator" @@ -2208,23 +2209,23 @@ msgstr "I dag" msgid "Yesterday" msgstr "I går" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:943 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" @@ -2619,6 +2620,14 @@ msgstr "Genveje" msgid "View and edit keyboard shortcuts" msgstr "Vis og redigér tastaturgenveje" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Statusbjælkens ur" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Vis dato og tid på statusbjælken" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Billeder" @@ -2659,11 +2668,11 @@ msgstr "Fanebladshistorik" msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug" -#: ../extensions/tabs-minimized.c:72 +#: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "_Minimér nye faneblade" -#: ../extensions/tabs-minimized.c:73 +#: ../extensions/tabs-minimized.c:80 msgid "New tabs open minimized" msgstr "Åbn nye faneblade minimeret" From a49f1f7814006db82f13622b97ad627026360b7d Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 11:43:57 -0400 Subject: [PATCH 2779/2970] Introduce katze_bookmark_populate_tree_view() and rename ITEM_IS* macros --- katze/katze-item.h | 3 +++ katze/katze-utils.c | 30 +++++++++++++++++++++ katze/katze-utils.h | 12 ++++++--- panels/midori-bookmarks.c | 56 +++++++++++---------------------------- 4 files changed, 58 insertions(+), 43 deletions(-) diff --git a/katze/katze-item.h b/katze/katze-item.h index 23b61fd2..40c250f8 100644 --- a/katze/katze-item.h +++ b/katze/katze-item.h @@ -28,6 +28,9 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_ITEM)) #define KATZE_ITEM_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_ITEM, KatzeItemClass)) +#define KATZE_ITEM_IS_BOOKMARK(item) (item && katze_item_get_uri (item)) +#define KATZE_ITEM_IS_FOLDER(item) (item && !katze_item_get_uri (item)) +#define KATZE_ITEM_IS_SEPARATOR(item) (item == NULL) typedef struct _KatzeItem KatzeItem; typedef struct _KatzeItemClass KatzeItemClass; diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 5416eb7b..39c70583 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -10,6 +10,7 @@ */ #include "katze-utils.h" +#include "katze-array.h" #include #include @@ -1123,6 +1124,35 @@ katze_tree_view_get_selected_iter (GtkTreeView* treeview, return FALSE; } +void +katze_bookmark_populate_tree_view (KatzeArray* array, + GtkTreeStore* model, + GtkTreeIter* parent) +{ + KatzeItem* child; + GtkTreeIter iter; + GtkTreeIter root_iter; + guint i = 0; + + while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) + { + if (KATZE_ITEM_IS_BOOKMARK (child)) + { + gtk_tree_store_insert_with_values (model, NULL, parent, + 0, 0, child, -1); + } + else + { + gtk_tree_store_insert_with_values (model, &root_iter, parent, + 0, 0, child, -1); + /* That's an invisible dummy, so we always have an expander */ + gtk_tree_store_insert_with_values (model, &iter, &root_iter, + 0, 0, NULL, -1); + } + i++; + } +} + /** * katze_strip_mnemonics: * @original: a string with mnemonics diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 6a5843f6..6b811f54 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -14,6 +14,7 @@ #define __KATZE_UTILS_H__ #include +#include "katze-array.h" G_BEGIN_DECLS @@ -105,9 +106,14 @@ katze_pixbuf_new_from_buffer (const guchar* buffer, GError** error); gboolean -katze_tree_view_get_selected_iter (GtkTreeView* treeview, - GtkTreeModel** model, - GtkTreeIter* iter); +katze_tree_view_get_selected_iter (GtkTreeView* treeview, + GtkTreeModel** model, + GtkTreeIter* iter); + +void +katze_bookmark_populate_tree_view (KatzeArray* array, + GtkTreeStore* model, + GtkTreeIter* parent); gchar* katze_strip_mnemonics (const gchar* original); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index f633d775..e1cc618d 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -24,10 +24,6 @@ #include -#define ITEM_IS_BOOKMARK(item) (item && katze_item_get_uri (item)) -#define ITEM_IS_FOLDER(item) (item && !katze_item_get_uri (item)) -#define ITEM_IS_SEPARATOR(item) (item == NULL) - void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, @@ -204,29 +200,9 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, const gchar* folder) { KatzeArray* array; - KatzeItem* child; - GtkTreeIter iter; - GtkTreeIter root_iter; - guint i = 0; array = midori_bookmarks_read_from_db (bookmarks, folder); - while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) - { - if (ITEM_IS_BOOKMARK (child)) - { - gtk_tree_store_insert_with_values (model, NULL, parent, - 0, 0, child, -1); - } - else - { - gtk_tree_store_insert_with_values (model, &root_iter, parent, - 0, 0, child, -1); - /* That's an invisible dummy, so we always have an expander */ - gtk_tree_store_insert_with_values (model, &iter, &root_iter, - 0, 0, NULL, -1); - } - i++; - } + katze_bookmark_populate_tree_view (array, model, parent); } void @@ -239,7 +215,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, int type = 0; gchar* parent; - if (ITEM_IS_BOOKMARK (item)) + if (KATZE_ITEM_IS_BOOKMARK (item)) type = 1; if (folder) @@ -279,7 +255,7 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, gchar* sqlcmd; char* errmsg = NULL; - if (ITEM_IS_BOOKMARK (item)) + if (KATZE_ITEM_IS_BOOKMARK (item)) sqlcmd = sqlite3_mprintf ( "DELETE FROM bookmarks WHERE uri = '%q'", katze_item_get_uri (item)); @@ -352,10 +328,10 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, &iter, 0, &item, -1); - g_assert (!ITEM_IS_SEPARATOR (item)); + g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (toolitem); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, ITEM_IS_FOLDER (item)); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); g_object_unref (item); } @@ -404,7 +380,7 @@ midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, { gtk_tree_model_get (model, &iter, 0, &item, -1); - gtk_widget_set_sensitive (bookmarks->edit, !ITEM_IS_SEPARATOR (item)); + gtk_widget_set_sensitive (bookmarks->edit, !KATZE_ITEM_IS_SEPARATOR (item)); gtk_widget_set_sensitive (bookmarks->delete, TRUE); if (item != NULL) @@ -568,10 +544,10 @@ midori_bookmarks_treeview_render_icon_cb (GtkTreeViewColumn* column, /* TODO: Would it be better to not do this on every redraw? */ pixbuf = NULL; - if (ITEM_IS_FOLDER (item)) + if (KATZE_ITEM_IS_FOLDER (item)) pixbuf = gtk_widget_render_icon (treeview, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); - else if (ITEM_IS_BOOKMARK (item)) + else if (KATZE_ITEM_IS_BOOKMARK (item)) pixbuf = katze_load_cached_icon (katze_item_get_uri (item), treeview); g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -639,7 +615,7 @@ midori_bookmarks_popup_item (GtkWidget* menu, const gchar* uri; GtkWidget* menuitem; - uri = ITEM_IS_BOOKMARK (item) ? katze_item_get_uri (item) : NULL; + uri = KATZE_ITEM_IS_BOOKMARK (item) ? katze_item_get_uri (item) : NULL; menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); if (label) @@ -647,8 +623,8 @@ midori_bookmarks_popup_item (GtkWidget* menu, GTK_BIN (menuitem))), label); if (!strcmp (stock_id, GTK_STOCK_EDIT)) gtk_widget_set_sensitive (menuitem, - !ITEM_IS_SEPARATOR (item)); - else if (!ITEM_IS_FOLDER (item) && strcmp (stock_id, GTK_STOCK_DELETE)) + !KATZE_ITEM_IS_SEPARATOR (item)); + else if (!KATZE_ITEM_IS_FOLDER (item) && strcmp (stock_id, GTK_STOCK_DELETE)) gtk_widget_set_sensitive (menuitem, uri != NULL); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks); @@ -681,7 +657,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, guint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - if (ITEM_IS_FOLDER (item)) + if (KATZE_ITEM_IS_FOLDER (item)) { KatzeItem* child; KatzeArray* array; @@ -747,10 +723,10 @@ midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - g_assert (!ITEM_IS_SEPARATOR (item)); + g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, ITEM_IS_FOLDER (item)); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); } static void @@ -786,7 +762,7 @@ midori_bookmarks_popup (GtkWidget* widget, GtkWidget* menuitem; menu = gtk_menu_new (); - if (ITEM_IS_FOLDER (item)) + if (KATZE_ITEM_IS_FOLDER (item)) midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open all in _Tabs"), item, midori_bookmarks_open_in_tab_activate_cb, bookmarks); @@ -830,7 +806,7 @@ midori_bookmarks_button_release_event_cb (GtkWidget* widget, if (event->button == 2) { const gchar* uri; - if (ITEM_IS_BOOKMARK (item) && (uri = katze_item_get_uri (item)) && *uri) + if (KATZE_ITEM_IS_BOOKMARK (item) && (uri = katze_item_get_uri (item)) && *uri) { MidoriBrowser* browser; gint n; From bd97f069d4f60c10cc8edf4b2fd157611cb76d6a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 15:18:31 -0400 Subject: [PATCH 2780/2970] Introduce katze_array_from_sqlite () and katze_array_from_statement () --- midori/midori-array.c | 103 ++++++++++++++++++++++++++++++++++++++++++ midori/midori-array.h | 8 ++++ 2 files changed, 111 insertions(+) diff --git a/midori/midori-array.c b/midori/midori-array.c index 3e725462..ca8390de 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -17,6 +17,7 @@ #include #include +#include #if HAVE_LIBXML #include @@ -752,3 +753,105 @@ midori_array_to_file (KatzeArray* array, g_critical ("Cannot write KatzeArray to unknown format '%s'.", format); return FALSE; } + +static void +katze_item_set_value_from_column (sqlite3_stmt* stmt, + gint column, + KatzeItem* item) +{ + const gchar* name; + + name = sqlite3_column_name (stmt, column); + g_return_if_fail (name != NULL); + + if (g_str_equal (name, "uri")) + { + const unsigned char* uri; + uri = sqlite3_column_text (stmt, column); + if (uri && uri[0]) + katze_item_set_uri (item, (gchar*)uri); + } + else if (g_str_equal (name, "title") || g_str_equal (name, "name")) + { + const unsigned char* title; + title = sqlite3_column_text (stmt, column); + katze_item_set_name (item, (gchar*)title); + } + else if (g_str_equal (name, "date")) + { + gint date; + date = sqlite3_column_int64 (stmt, column); + katze_item_set_added (item, date); + } + else if (g_str_equal (name, "day") || g_str_equal (name, "app") + || g_str_equal (name, "toolbar") || g_str_equal (name, "type")) + { + gint value; + value = sqlite3_column_int64 (stmt, column); + katze_item_set_meta_integer (item, name, value); + } + else + g_warn_if_reached (); +} + +/** + * midori_array_from_statement: + * @stmt: prepared statement + * + * Stores the result in a #KatzeArray. + * + * Return value: a #KatzeArray on success, %NULL otherwise + * + * Since: 0.2.7 + **/ +KatzeArray* +katze_array_from_statement (sqlite3_stmt* stmt) +{ + KatzeArray *array; + gint result; + gint cols; + + array = katze_array_new (KATZE_TYPE_ITEM); + cols = sqlite3_column_count (stmt); + + while ((result = sqlite3_step (stmt)) == SQLITE_ROW) + { + gint i; + KatzeItem* item; + + item = katze_item_new (); + for (i = 0; i < cols; i++) + katze_item_set_value_from_column (stmt, i, item); + katze_array_add_item (array, item); + } + + sqlite3_clear_bindings (stmt); + sqlite3_reset (stmt); + return array; +} + +/** + * midori_array_from_sqlite: + * @db: opened database handler + * @sqlcmd: SQL query + * + * Stores the result in a #KatzeArray. + * + * Return value: a #KatzeArray on success, %NULL otherwise + * + * Since: 0.2.7 + **/ + +KatzeArray* +katze_array_from_sqlite (sqlite3* db, + const gchar* sqlcmd) +{ + sqlite3_stmt* stmt; + gint result; + + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL); + if (result != SQLITE_OK) + return NULL; + + return katze_array_from_statement (stmt); +} diff --git a/midori/midori-array.h b/midori/midori-array.h index a41936a3..a0cac614 100644 --- a/midori/midori-array.h +++ b/midori/midori-array.h @@ -12,6 +12,7 @@ #ifndef __MIDORI_ARRAY_H__ #define __MIDORI_ARRAY_H__ 1 +#include #include gboolean @@ -26,4 +27,11 @@ midori_array_to_file (KatzeArray* array, const gchar* format, GError** error); +KatzeArray* +katze_array_from_statement (sqlite3_stmt* stmt); + +KatzeArray* +katze_array_from_sqlite (sqlite3* db, + const gchar* sqlcmd); + #endif /* !__MIDORI_ARRAY_H__ */ From 3c4896f94fb507afc00ac83bb54656293a0a8904 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 15:21:01 -0400 Subject: [PATCH 2781/2970] Start using new sqlite helper functions --- midori/midori-browser.c | 63 +++++++++++---------------------------- panels/midori-bookmarks.c | 39 ++---------------------- 2 files changed, 20 insertions(+), 82 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a50e413a..5bbba4e9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2728,39 +2728,27 @@ _action_history_populate_popup (GtkAction* action, GtkMenu* menu, MidoriBrowser* browser) { - #if HAVE_SQLITE sqlite3* db; - sqlite3_stmt* statement; - gint result; const gchar* sqlcmd; + KatzeArray* array; + KatzeItem* item; + gint i = 0; db = g_object_get_data (G_OBJECT (browser->history), "db"); sqlcmd = "SELECT uri, title, date FROM history " "GROUP BY uri ORDER BY date ASC LIMIT 10"; - result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - if (result != SQLITE_OK) - { - g_print (_("Failed to execute database statement: %s\n"), - sqlite3_errmsg (db)); - return; - } + array = katze_array_from_sqlite (db, sqlcmd); - while ((result = sqlite3_step (statement)) == SQLITE_ROW) + while ((item = katze_array_get_nth_item (KATZE_ARRAY (array), i))) { - const unsigned char* uri; - const unsigned char* title; - KatzeItem* item; GtkWidget* menuitem; GdkPixbuf* icon; GtkWidget* image; + const gchar* uri; + const gchar* title; - uri = sqlite3_column_text (statement, 0); - title = sqlite3_column_text (statement, 1); - - item = katze_item_new (); - katze_item_set_uri (item, (gchar*)uri); - katze_item_set_name (item, (gchar*)title); - + uri = katze_item_get_uri (item); + title = katze_item_get_name (item); menuitem = katze_image_menu_item_new_ellipsized ((gchar*)title); icon = katze_load_cached_icon ((gchar*)uri, GTK_WIDGET (browser)); image = gtk_image_new_from_pixbuf (icon); @@ -2783,9 +2771,8 @@ _action_history_populate_popup (GtkAction* action, G_CALLBACK (midori_browser_menu_item_select_cb), browser); g_signal_connect (menuitem, "deselect", G_CALLBACK (midori_browser_menu_item_deselect_cb), browser); + i++; } - sqlite3_finalize (statement); - #endif } static void @@ -6515,9 +6502,10 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) { GtkWidget* homepage; sqlite3* db; - gint result; const gchar* sqlcmd; - sqlite3_stmt* statement; + KatzeArray* array; + KatzeItem* item; + gint i; homepage = gtk_action_create_tool_item (_action_by_name (browser, "Homepage")); gtk_tool_item_set_is_important (GTK_TOOL_ITEM (homepage), TRUE); @@ -6532,34 +6520,19 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) sqlcmd = "SELECT uri, title, app FROM bookmarks WHERE " " toolbar = 1 ORDER BY type ASC"; - result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - if (result != SQLITE_OK) + + array = katze_array_from_sqlite (db, sqlcmd); + if (!array) { _action_set_sensitive (browser, "BookmarkAdd", FALSE); _action_set_sensitive (browser, "BookmarkFolderAdd", FALSE); return; } - while ((result = sqlite3_step (statement)) == SQLITE_ROW) + while ((item = katze_array_get_nth_item (KATZE_ARRAY (array), i))) { - gint app; - KatzeItem* item; - const unsigned char* uri; - const unsigned char* title; - - uri = sqlite3_column_text (statement, 0); - title = sqlite3_column_text (statement, 1); - app = sqlite3_column_int64 (statement, 2); - - item = katze_item_new (); - katze_item_set_name (item, (gchar*)title); - katze_item_set_meta_integer (item, "toolbar", 1); - if (uri) - { - katze_item_set_uri (item, (gchar*)uri); - katze_item_set_meta_integer (item, "app", app); - } midori_bookmarkbar_insert_item (browser->bookmarkbar, item); + i++; } _action_set_sensitive (browser, "BookmarkAdd", TRUE); _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index e1cc618d..791f786e 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -11,6 +11,7 @@ #include "midori-bookmarks.h" +#include "midori-array.h" #include "midori-app.h" #include "midori-browser.h" #include "midori-stock.h" @@ -143,7 +144,6 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, sqlite3_stmt* statement; gint result; const gchar* sqlcmd; - KatzeArray* array; db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); @@ -155,42 +155,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, if (result != SQLITE_OK) return NULL; - array = katze_array_new (KATZE_TYPE_ITEM); - - while ((result = sqlite3_step (statement)) == SQLITE_ROW) - { - gint type; - gint app; - gint toolbar; - KatzeItem* item; - const unsigned char* uri; - const unsigned char* title; - - uri = sqlite3_column_text (statement, 0); - title = sqlite3_column_text (statement, 1); - type = sqlite3_column_int64 (statement, 2); - app = sqlite3_column_int64 (statement, 3); - toolbar = sqlite3_column_int64 (statement, 4); - - item = katze_item_new (); - katze_item_set_name (item, (gchar*)title); - katze_item_set_meta_integer (item, "toolbar", toolbar); - - /* type 0 -- folder, 1 -- entry */ - if (type == 1) - { - katze_item_set_uri (item, (gchar*)uri); - katze_item_set_meta_integer (item, "app", app); - } - katze_array_add_item (array, item); - } - - if (result != SQLITE_DONE) - g_print (_("Failed to execute database statement: %s\n"), - sqlite3_errmsg (db)); - - sqlite3_finalize (statement); - return array; + return katze_array_from_statement (statement); } static void From 6fb35107a0d948b4e8f20d13641133ec9643013b Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 15:42:54 -0400 Subject: [PATCH 2782/2970] Fix for folders in bookmarksbar --- midori/midori-browser.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5bbba4e9..99488a95 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6531,7 +6531,20 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) while ((item = katze_array_get_nth_item (KATZE_ARRAY (array), i))) { - midori_bookmarkbar_insert_item (browser->bookmarkbar, item); + if (KATZE_ITEM_IS_BOOKMARK (item)) + midori_bookmarkbar_insert_item (browser->bookmarkbar, item); + else + { + KatzeArray* subfolder; + gchar* subsqlcmd; + + subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM bookmarks WHERE " + " folder = '%s'", katze_item_get_name (item)); + subfolder = katze_array_from_sqlite (db, sqlcmd); + katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); + midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); + g_free (subsqlcmd); + } i++; } _action_set_sensitive (browser, "BookmarkAdd", TRUE); From 60593b27d17f657193b48b07364585f67539fdb5 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 22:09:58 +0200 Subject: [PATCH 2783/2970] Skip bookmark URIS starting with '(' Due to a bug in the sqlite handling we were happily adding folders with '(null') and it happened to work until now. --- midori/midori-array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index ca8390de..5230d586 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -768,7 +768,7 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt, { const unsigned char* uri; uri = sqlite3_column_text (stmt, column); - if (uri && uri[0]) + if (uri && uri[0] && uri[0] != '(') katze_item_set_uri (item, (gchar*)uri); } else if (g_str_equal (name, "title") || g_str_equal (name, "name")) From 73376c0ea1e8e078c4e4ef958033def84dec8b78 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 1 Jul 2010 22:33:10 +0200 Subject: [PATCH 2784/2970] Remove the old tab switcher extension from POTFILES.in --- po/POTFILES.in | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index ffd1b003..686fb1da 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -45,7 +45,6 @@ extensions/shortcuts.c extensions/status-clock.c extensions/statusbar-features.c extensions/tab-panel.c -extensions/tab-switcher.c extensions/tabs-minimized.c extensions/toolbar-editor.c extensions/web-cache.c From f9071289048eea2309c981c902e23e73be8342eb Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 17:03:24 -0400 Subject: [PATCH 2785/2970] Drop bookmark type field and save meta boolean properly --- midori/main.c | 2 +- midori/midori-browser.c | 4 ++-- panels/midori-bookmarks.c | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/midori/main.c b/midori/main.c index 0b40b412..9c38e3b4 100644 --- a/midori/main.c +++ b/midori/main.c @@ -447,7 +447,7 @@ midori_bookmarks_initialize (KatzeArray* array, if (sqlite3_exec (db, "CREATE TABLE IF NOT EXISTS " - "bookmarks (uri text, title text, folder text, type integer, " + "bookmarks (uri text, title text, folder text, " "desc text, app integer, toolbar integer);", NULL, NULL, errmsg) != SQLITE_OK) return NULL; diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 99488a95..8113567b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -842,7 +842,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, #if HAVE_SQLITE i = 0; n = 1; - sqlcmd = "SELECT title from bookmarks where type=0"; + sqlcmd = "SELECT title from bookmarks where uri=''"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); while ((result = sqlite3_step (statement)) == SQLITE_ROW) { @@ -6540,7 +6540,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM bookmarks WHERE " " folder = '%s'", katze_item_get_name (item)); - subfolder = katze_array_from_sqlite (db, sqlcmd); + subfolder = katze_array_from_sqlite (db, subsqlcmd); katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); g_free (subsqlcmd); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 791f786e..3bd2ef4d 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -177,11 +177,13 @@ midori_bookmarks_insert_item_db (sqlite3* db, { gchar* sqlcmd; char* errmsg = NULL; - int type = 0; gchar* parent; + gchar* uri; if (KATZE_ITEM_IS_BOOKMARK (item)) - type = 1; + uri = g_strdup (katze_item_get_uri (item)); + else + uri = g_strdup (""); if (folder) parent = g_strdup (folder); @@ -194,14 +196,13 @@ midori_bookmarks_insert_item_db (sqlite3* db, handling of katze_item_get_meta_integer(). */ /* FIXME: Need proper single quote escaping. */ sqlcmd = g_strdup_printf ( - "INSERT into bookmarks (uri, title, folder, type, toolbar, app) values" - " ('%s', '%s', '%s', %d, %d, %d)", - katze_item_get_uri (item), + "INSERT into bookmarks (uri, title, folder, toolbar, app) values" + " ('%s', '%s', '%s', %d, %d)", + uri, katze_item_get_name (item), parent, - type, - (int)katze_item_get_meta_integer (item, "toolbar"), - (int)katze_item_get_meta_integer (item, "app")); + katze_item_get_meta_boolean (item, "toolbar"), + katze_item_get_meta_boolean (item, "app")); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { @@ -209,6 +210,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, sqlite3_free (errmsg); } + g_free (uri); g_free (parent); g_free (sqlcmd); } @@ -226,8 +228,7 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, katze_item_get_uri (item)); else sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE folder = '%q' OR title = '%q'", - katze_item_get_name (item), + "DELETE FROM bookmarks WHERE title = '%q'", katze_item_get_name (item)); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) From e1fbfb6bdead7cc44de5845767eab612839a6733 Mon Sep 17 00:00:00 2001 From: Harald Servat Date: Fri, 2 Jul 2010 18:30:25 +0200 Subject: [PATCH 2786/2970] l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 635 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 755 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 384 insertions(+), 371 deletions(-) diff --git a/po/ca.po b/po/ca.po index 805e5caa..2d5f4275 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-21 16:08+0000\n" +"POT-Creation-Date: 2010-07-02 16:08+0000\n" "PO-Revision-Date: 2010-05-04 19:53+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -24,8 +24,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lleuger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -49,7 +49,7 @@ msgstr "El valor «%s» no és vàlid per %s" msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "No s'ha pogut obrir la base de dades: %s\n" @@ -106,244 +106,244 @@ msgstr "Reiniciar la darrera _sessió" msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "No s'ha especificat un nom de fitxer" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Ha ocorregut un error desconegut." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuració especificada és invalida." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No s'han pogut carregar els motors de cerca. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "No s'ha trobat el fitxer." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Document format erròniament." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "No es reconeix el format de l'adreça d'interès." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5029 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5026 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:455 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:493 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:507 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4179 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4184 ../midori/midori-browser.c:4216 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:976 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:980 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:1037 ../midori/midori-browser.c:4234 +#: ../midori/midori-browser.c:4266 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1430 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2147 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2225 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -351,646 +351,640 @@ msgstr "" "Per a usar l'URI que hi ha a dalt, obriu un agregador de notícies. Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o similar.\n" "Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu agregador de notícies. El proper cop que cliqueu a la icona de les notícies, s'agregarà automàticament." -#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2231 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2274 ../midori/midori-browser.c:5088 +#: ../panels/midori-bookmarks.c:378 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" - -#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +#: ../midori/midori-browser.c:2810 ../midori/midori-searchaction.c:484 msgid "Empty" msgstr "Buit" -#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3417 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:3683 ../midori/midori-browser.c:5469 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:4017 ../panels/midori-bookmarks.c:733 +#: ../panels/midori-history.c:740 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:4024 ../panels/midori-bookmarks.c:739 +#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:4027 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:741 +#: ../panels/midori-history.c:748 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:4105 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4106 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4107 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4108 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4109 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4351 +#: ../midori/midori-browser.c:4130 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 +#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:5093 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:4144 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 +#: ../midori/midori-browser.c:4171 ../midori/midori-browser.c:5197 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4245 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4281 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../midori/midori-browser.c:4335 ../panels/midori-bookmarks.c:236 #: ../panels/midori-history.c:141 ../panels/midori-history.c:171 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4663 +#: ../midori/midori-browser.c:4442 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4446 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:4460 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 +#: ../midori/midori-browser.c:4471 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:119 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4698 +#: ../midori/midori-browser.c:4477 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:4703 +#: ../midori/midori-browser.c:4482 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:4708 +#: ../midori/midori-browser.c:4487 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4492 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4497 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:4726 +#: ../midori/midori-browser.c:4505 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4606 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:4829 +#: ../midori/midori-browser.c:4608 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4627 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:4936 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4938 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4939 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:4942 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:4944 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4945 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:4949 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:4952 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:4954 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4955 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:4957 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4958 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:5181 +#: ../midori/midori-browser.c:4960 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4961 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4966 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:4967 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:5190 +#: ../midori/midori-browser.c:4969 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:4970 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:5194 +#: ../midori/midori-browser.c:4973 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:5197 +#: ../midori/midori-browser.c:4976 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:5199 +#: ../midori/midori-browser.c:4978 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:5203 +#: ../midori/midori-browser.c:4982 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:5206 +#: ../midori/midori-browser.c:4985 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:4989 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:4992 ../midori/midori-browser.c:4995 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:4998 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:5001 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:5225 +#: ../midori/midori-browser.c:5004 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:5007 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:5009 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:5010 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:5012 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5234 +#: ../midori/midori-browser.c:5013 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:5017 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:5019 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:5020 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:5032 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:5035 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:5038 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:5039 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:5041 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:5042 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:5266 +#: ../midori/midori-browser.c:5045 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:5048 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:5049 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:5051 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:5052 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:5275 +#: ../midori/midori-browser.c:5054 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:5055 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:5057 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:5058 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:5282 +#: ../midori/midori-browser.c:5061 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:5064 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:5067 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:5071 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:5075 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:5078 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:5080 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5081 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:5083 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5084 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:5090 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5091 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:5096 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5099 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:5100 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:5103 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5104 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:5108 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5109 msgid "Inspect page details and access developer tools..." msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:5114 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5115 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:5117 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5118 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:5120 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5121 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:5123 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5124 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5126 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5128 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5129 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5131 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5132 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5134 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5135 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5138 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5146 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5147 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5150 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5151 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5154 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5155 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5158 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5159 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5162 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5163 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5387 +#: ../midori/midori-browser.c:5166 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5167 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5175 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5178 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5182 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5185 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5191 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5194 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5949 +#: ../midori/midori-browser.c:5725 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5956 +#: ../midori/midori-browser.c:5732 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:5958 +#: ../midori/midori-browser.c:5734 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:5982 +#: ../midori/midori-browser.c:5758 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:5984 +#: ../midori/midori-browser.c:5760 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:6005 +#: ../midori/midori-browser.c:5781 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:6020 +#: ../midori/midori-browser.c:5796 msgid "_Recently visited pages" msgstr "Pàgines visitades _recentment" -#: ../midori/midori-browser.c:6022 +#: ../midori/midori-browser.c:5798 msgid "Reopen pages that you visited earlier" msgstr "Reobre pàgines que heu visitat anteriorment" -#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 +#: ../midori/midori-browser.c:5813 ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/midori-browser.c:6039 +#: ../midori/midori-browser.c:5815 msgid "Show the saved bookmarks" msgstr "Mostra les adreces d'interès desades" -#: ../midori/midori-browser.c:6054 +#: ../midori/midori-browser.c:5830 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:6067 +#: ../midori/midori-browser.c:5843 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:6069 +#: ../midori/midori-browser.c:5845 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:6083 +#: ../midori/midori-browser.c:5859 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:5861 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6438 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" @@ -1037,7 +1031,7 @@ msgstr "Tanca el quadre" msgid "Align sidepanel to the left" msgstr "Alinear el panell lateral a l'esquerra" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Oculta els controls d'operació" @@ -1117,7 +1111,7 @@ msgstr "Totes les galetes" msgid "Session cookies" msgstr "Galetes de sessió" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 msgid "None" msgstr "Cap" @@ -1640,381 +1634,381 @@ msgstr "La selecció de dades privades per a esborrar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Torneu-ho a provar" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "No s'ha trobat «%s»" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "De_sa el destí de l'enllaç" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "_Descarrega el destí de l'enllaç" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Descarrega amb el _gestor de descàrregues" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Descarrega la i_matge" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Estableix el nombre de columnes i files" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Introduïu el nombre de columnes i files:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Tamany de la miniatura:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Petit" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Mitjà" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Gran" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "S'ha retardat la càrrega de la pàgina" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "S'ha retardat la càrrega degut a una fallada recent o a les preferències d'inici." -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Carregar pàgina" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "_Restaura la pestanya" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Minimitza la pestanya" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Característiques" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Inicialització" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Empra la pàgina actual com a pàgina d'inici" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferències" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Aparença" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Paràmetres del tipus de lletra" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Família de tipus de lletra per defecte" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "La família de tipus de lletra per defecte emprada per mostrar el text" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "La mida del tipus de lletra per defecte emprada per mostrar el text" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Família de tipus de lletra d'amplada fixa" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "La família de fonts per a mostrar text de mida fixa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "La mida de la font usada per a mostrar text de mida fixa" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Mida mínima del tipus de lletra" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "La mida mínima del tipus de lletra emprada per mostrar text" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportament" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Força 96 PPP" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Força una densitat de punt de 96 PPP" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Permetre als scripts obrir finestres emergents" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Si els scripts poden obrir finestres emergents de forma automàtica" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Corrector ortogràfic" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Habilita el corrector ortogràfic" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Activa la comprovació ortogràfica mentre s'escriu" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Diccionaris:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Una llista d'idiomes separats per coma que seran usats per a la correcció ortogràfica, per exemple \"ca_ES,en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Interfície" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Barra de navegació" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navegant" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Aplicacions" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Aplicacions externes" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Xarxa" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Nom del host" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Privacitat" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Galetes de web" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "dies" @@ -2090,6 +2084,31 @@ msgstr "_Connectors de Netscape" msgid "New _Folder" msgstr "Nova _carpeta" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "Cerca en _línia:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Anterior" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Següent" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Coincidència de majúscules i minúscules" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Ressalta les coincidències" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Tanca la barra de cerques" + #: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" @@ -2108,40 +2127,40 @@ msgstr "Transferència finalitzada" msgid "Clear All" msgstr "Netejar-ho tot" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:298 ../toolbars/midori-transferbar.c:300 msgid "Some files are being downloaded" msgstr "S'estan descarregant fitxers" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:304 msgid "_Quit Midori" msgstr "_Sortir de Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:306 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferències es cancel·laran si se surt de Midori." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:110 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:209 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "No s'ha pogut afegir un ítem a les adreces d'interès: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:386 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:394 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:408 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:542 msgid "Separator" msgstr "Separador" @@ -2188,23 +2207,29 @@ msgstr "Avuí" msgid "Yesterday" msgstr "Ahir" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" + +#: ../panels/midori-history.c:370 msgid "Are you sure you want to remove all history items?" msgstr "Voleu esborrar tots els elements de l’historial?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:444 msgid "Bookmark the selected history item" msgstr "Afegeix l'element seleccionat de l'historial a les adreces d'interès" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:453 msgid "Delete the selected history item" msgstr "Esborra l'element de l'historial seleccionat" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:461 msgid "Clear the entire history" msgstr "Buida l'historial" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:942 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtre:" @@ -2255,16 +2280,16 @@ msgstr "La icona «%s» no s'ha pogut carregar" msgid "Animation frames are broken" msgstr "Els marcs d'animació no funcionen correctament" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propietat «%s» no és vàlida per a %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Seleccioneu fitxer" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Seleccioneu carpeta" @@ -2302,11 +2327,11 @@ msgstr "Bl_oca imatge" msgid "Bl_ock link" msgstr "Bl_oca enllaç" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Bloqueig de publicitat" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Bloca els anuncis publicitaris segons una llista de filtres" @@ -2540,25 +2565,25 @@ msgstr "Quadre de canals" msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "No s'ha pogut afegir un valor al formulari: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Emmagatzema l'historial de les dades introduïdes als formularis" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "No disponible: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Els fitxers de recursos no estan instaŀlats" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Omple el formulari de l'historial" @@ -2599,6 +2624,14 @@ msgstr "Dreceres" msgid "View and edit keyboard shortcuts" msgstr "Mostra i edita les dreceres del teclat" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Rellotge a la barra d'estat" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Mostrar la data i l'hora a la barra d'estat" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Imatges" @@ -2631,14 +2664,6 @@ msgstr "Quadre de _pestanyes" msgid "Show tabs in a vertical panel" msgstr "Mostra les pestanyes en un quadre vertical" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Pestanya amb la llista de l'historial" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "_Minimitza les noves pestanyes" @@ -2679,23 +2704,11 @@ msgstr "Edita fàcilment la distribució de la barra d'eines" msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" -#~ msgid "_Inline Find:" -#~ msgstr "Cerca en _línia:" +#~ msgid "Tab History List" +#~ msgstr "Pestanya amb la llista de l'historial" -#~ msgid "Previous" -#~ msgstr "Anterior" - -#~ msgid "Next" -#~ msgstr "Següent" - -#~ msgid "Match Case" -#~ msgstr "Coincidència de majúscules i minúscules" - -#~ msgid "Highlight Matches" -#~ msgstr "Ressalta les coincidències" - -#~ msgid "Close Findbar" -#~ msgstr "Tanca la barra de cerques" +#~ msgid "Allows to switch tabs by choosing from a list sorted by last usage" +#~ msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" #~ msgid "Set number of shortcuts" #~ msgstr "Estableix el nombre de dreceres" From 8c6a8abe5fd85bfb9217b2bc2f66f48a3841239e Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 1 Jul 2010 23:55:41 -0400 Subject: [PATCH 2787/2970] Revamp bookmark import with sqlite --- midori/main.c | 2 +- midori/midori-browser.c | 45 ++++++++++++++++++--------------------- panels/midori-bookmarks.c | 15 +++++++------ panels/midori-bookmarks.h | 11 +++++----- 4 files changed, 36 insertions(+), 37 deletions(-) diff --git a/midori/main.c b/midori/main.c index 9c38e3b4..f0e4d781 100644 --- a/midori/main.c +++ b/midori/main.c @@ -469,7 +469,7 @@ midori_bookmarks_import (const gchar* filename, g_error_free (error); return; } - midori_bookmarks_import_array_db (bookmarks, db); + midori_bookmarks_import_array_db (db, bookmarks, ""); } #endif diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8113567b..d043310c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -171,6 +171,11 @@ midori_browser_get_property (GObject* object, GParamSpec* pspec); #if HAVE_SQLITE +void +midori_bookmarks_import_array_db (sqlite3* db, + KatzeArray* array, + gchar* folder); + void midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, @@ -4122,6 +4127,9 @@ _action_bookmarks_import_activate (GtkAction* action, gint icon_width = 16; guint i; KatzeItem* item; + sqlite3* db; + const gchar* sqlcmd; + KatzeArray* bookmarkdirs; if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) return; @@ -4183,21 +4191,20 @@ _action_bookmarks_import_activate (GtkAction* action, combobox_folder = GTK_COMBO_BOX (combo); gtk_combo_box_append_text (combobox_folder, _("Toplevel folder")); gtk_combo_box_set_active (combobox_folder, 0); + + db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); + sqlcmd = "SELECT title from bookmarks where uri=''"; + bookmarkdirs = katze_array_from_sqlite (db, sqlcmd); i = 0; - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) + while ((item = katze_array_get_nth_item (bookmarkdirs, i++))) { - if (KATZE_IS_ARRAY (item)) - { - const gchar* name = katze_item_get_name (item); - if (name) - gtk_combo_box_append_text (combobox_folder, name); - } + const gchar* name = katze_item_get_name (item); + gtk_combo_box_append_text (combobox_folder, name); } gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); - /* FIXME: Importing into a subfolder doesn't work */ - gtk_widget_set_sensitive (combo, FALSE); + gtk_widget_set_sensitive (combo, TRUE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) @@ -4205,26 +4212,14 @@ _action_bookmarks_import_activate (GtkAction* action, GtkTreeIter iter; gchar* path; gchar* selected; - KatzeArray* folder; GError* error; gtk_combo_box_get_active_iter (combobox, &iter); gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &path, -1); selected = gtk_combo_box_get_active_text (combobox_folder); - folder = browser->bookmarks; - if (g_strcmp0 (selected, _("Toplevel folder"))) - { - i = 0; - while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) - if (KATZE_IS_ARRAY (item)) - if (!g_strcmp0 (katze_item_get_name (item), selected)) - { - folder = KATZE_ARRAY (item); - break; - } - } - g_free (selected); + if (g_str_equal (selected, _("Toplevel folder"))) + selected = g_strdup (""); gtk_widget_destroy (dialog); if (!path) @@ -4239,13 +4234,15 @@ _action_bookmarks_import_activate (GtkAction* action, } error = NULL; - if (path && !midori_array_from_file (folder, path, NULL, &error)) + if (path && !midori_array_from_file (browser->bookmarks, path, NULL, &error)) { sokoke_message_dialog (GTK_MESSAGE_ERROR, _("Failed to import bookmarks"), error ? error->message : ""); if (error) g_error_free (error); } + midori_bookmarks_import_array_db (db, browser->bookmarks, selected); + g_free (selected); g_free (path); } else diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 3bd2ef4d..4d8985d4 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -118,8 +118,9 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) #if HAVE_SQLITE void -midori_bookmarks_import_array_db (KatzeArray* array, - sqlite3* db) +midori_bookmarks_import_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder) { GList* list = NULL; GList* bookmarks; @@ -130,9 +131,9 @@ midori_bookmarks_import_array_db (KatzeArray* array, KatzeItem* item; if (KATZE_IS_ARRAY (list->data)) - midori_bookmarks_import_array_db (list->data, db); + midori_bookmarks_import_array_db (db, list->data, folder); item = (KatzeItem*) list->data; - midori_bookmarks_insert_item_db (db, item, NULL); + midori_bookmarks_insert_item_db (db, item, folder); } } @@ -171,9 +172,9 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, } void -midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item, - gchar* folder) +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item, + const gchar* folder) { gchar* sqlcmd; char* errmsg = NULL; diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h index f5e33a7d..0a20a880 100644 --- a/panels/midori-bookmarks.h +++ b/panels/midori-bookmarks.h @@ -47,17 +47,18 @@ midori_bookmarks_new (void); #if HAVE_SQLITE void -midori_bookmarks_insert_item_db (sqlite3* db, - KatzeItem* item, - gchar* folder); +midori_bookmarks_insert_item_db (sqlite3* db, + KatzeItem* item, + const gchar* folder); void midori_bookmarks_remove_item_from_db (sqlite3* db, KatzeItem* item); void -midori_bookmarks_import_array_db (KatzeArray* array, - sqlite3* db); +midori_bookmarks_import_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder); #endif G_END_DECLS From 93b0b9029ba241614d60cf0fead7be0d68a31618 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 2 Jul 2010 23:06:10 +0200 Subject: [PATCH 2788/2970] Check absent 'version' in toplevel 'xbel' element Albeit required, in pracise the 'version' value may be missing. --- midori/midori-array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index 5230d586..e3fec8b8 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -205,7 +205,7 @@ katze_array_from_xmlDocPtr (KatzeArray* array, gchar* value; value = (gchar*)xmlGetProp (cur, (xmlChar*)"version"); - if (!katze_str_equal (value, "1.0")) + if (!value || !katze_str_equal (value, "1.0")) g_warning ("XBEL version is not 1.0."); g_free (value); From 8306424277ad031f5c5bda3794caeb95036482b2 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 00:01:39 -0400 Subject: [PATCH 2789/2970] Remove separator when expanding bookmark folders --- panels/midori-bookmarks.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 4d8985d4..286524ca 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -166,9 +166,15 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, const gchar* folder) { KatzeArray* array; + gint last; + GtkTreeIter child; array = midori_bookmarks_read_from_db (bookmarks, folder); katze_bookmark_populate_tree_view (array, model, parent); + /* Remove invisible dummy row */ + last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent); + gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (model), &child, parent, last - 1); + gtk_tree_store_remove (model, &child); } void From 4e0c1396a094ba47cdcf3f80040b5a7777c5177d Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 00:23:25 -0400 Subject: [PATCH 2790/2970] Allow to expand/ collapse folder by double click --- panels/midori-bookmarks.c | 17 ++++++++++++----- panels/midori-history.c | 23 ++++++++++++----------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 286524ca..0604fcd4 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -566,13 +566,20 @@ midori_bookmarks_row_activated_cb (GtkTreeView* treeview, if (gtk_tree_model_get_iter (model, &iter, path)) { - MidoriBrowser* browser; - gtk_tree_model_get (model, &iter, 0, &item, -1); + if (KATZE_ITEM_IS_BOOKMARK (item)) + { + MidoriBrowser* browser; - browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_open_bookmark (browser, item); - + browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + midori_browser_open_bookmark (browser, item); + g_object_unref (item); + return; + } + if (gtk_tree_view_row_expanded (treeview, path)) + gtk_tree_view_collapse_row (treeview, path); + else + gtk_tree_view_expand_row (treeview, path, FALSE); g_object_unref (item); } } diff --git a/panels/midori-history.c b/panels/midori-history.c index c5691d0a..809fb25e 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -582,33 +582,34 @@ midori_history_treeview_render_icon_cb (GtkTreeViewColumn* column, #if HAVE_SQLITE static void midori_history_row_activated_cb (GtkTreeView* treeview, - GtkTreePath* path, - GtkTreeViewColumn* column, - MidoriHistory* history) + GtkTreePath* path, + GtkTreeViewColumn* column, + MidoriHistory* history) { GtkTreeModel* model; GtkTreeIter iter; KatzeItem* item; - const gchar* uri; model = gtk_tree_view_get_model (treeview); if (gtk_tree_model_get_iter (model, &iter, path)) { gtk_tree_model_get (model, &iter, 0, &item, -1); - - if (!item) - return; - - uri = katze_item_get_uri (item); - if (uri && *uri) + if (KATZE_ITEM_IS_BOOKMARK (item)) { MidoriBrowser* browser; + const gchar* uri; + uri = katze_item_get_uri (item); browser = midori_browser_get_for_widget (GTK_WIDGET (history)); midori_browser_set_current_uri (browser, uri); + g_object_unref (item); + return; } - + if (gtk_tree_view_row_expanded (treeview, path)) + gtk_tree_view_collapse_row (treeview, path); + else + gtk_tree_view_expand_row (treeview, path, FALSE); g_object_unref (item); } } From ad5066a43fa8baeb25f64afcce3c2b1582455f6e Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 00:50:14 -0400 Subject: [PATCH 2791/2970] Remove ghosts after bookmark edit. Merge edit/ delete callbacks --- midori/midori-browser.c | 7 ++++-- panels/midori-bookmarks.c | 52 +++++++-------------------------------- 2 files changed, 14 insertions(+), 45 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d043310c..eb73654e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -700,7 +700,7 @@ midori_browser_edit_bookmark_add_speed_dial_cb (GtkWidget* button, } /* Private function, used by MidoriBookmarks and MidoriHistory */ -/* static */ void +/* static */ gboolean midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, @@ -720,12 +720,13 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* combo_folder; GtkWidget* check_toolbar; GtkWidget* check_app; + gboolean return_status = FALSE; #if HAVE_SQLITE sqlite3* db; #endif if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) - return; + return FALSE; #if HAVE_SQLITE db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); @@ -954,8 +955,10 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, _action_set_active (browser, "Bookmarkbar", TRUE); #endif g_free (selected); + return_status = TRUE; } gtk_widget_destroy (dialog); + return return_status; } #if WEBKIT_CHECK_VERSION (1, 1, 3) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 0604fcd4..33687c27 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -25,7 +25,7 @@ #include -void +gboolean midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, @@ -303,9 +303,12 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); - browser = midori_browser_get_for_widget (toolitem); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); - + browser = midori_browser_get_for_widget (bookmarks->treeview); + if (midori_browser_edit_bookmark_dialog_new ( + browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item))) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + } g_object_unref (item); } } @@ -695,43 +698,6 @@ midori_bookmarks_open_in_window_activate_cb (GtkWidget* menuitem, } } -static void -midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, - MidoriBookmarks* bookmarks) -{ - KatzeItem* item; - MidoriBrowser* browser; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); - - browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); -} - -static void -midori_bookmarks_delete_activate_cb (GtkWidget* menuitem, - MidoriBookmarks* bookmarks) -{ - KatzeItem* item; - #if HAVE_SQLITE - sqlite3* db; - #endif - GtkTreeModel* model; - GtkTreeIter iter; - - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), - &model, &iter)) - { - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - #if HAVE_SQLITE - db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - midori_bookmarks_remove_item_from_db (db, item); - #endif - gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - } -} - static void midori_bookmarks_popup (GtkWidget* widget, GdkEventButton* event, @@ -759,9 +725,9 @@ midori_bookmarks_popup (GtkWidget* widget, gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); midori_bookmarks_popup_item (menu, GTK_STOCK_EDIT, NULL, - item, midori_bookmarks_edit_activate_cb, bookmarks); + item, midori_bookmarks_edit_clicked_cb, bookmarks); midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL, - item, midori_bookmarks_delete_activate_cb, bookmarks); + item, midori_bookmarks_delete_clicked_cb, bookmarks); katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } From 1e8e6f4652c1bef1a96f40a98f8bf95f3f4cd0f8 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 01:05:11 -0400 Subject: [PATCH 2792/2970] Fix handling of 'app' property on bookmark open --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index eb73654e..41a4eec8 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2855,7 +2855,7 @@ midori_browser_open_bookmark (MidoriBrowser* browser, uri_fixed = g_strdup (uri); /* FIXME: Use the same binary that is running right now */ - if (katze_item_get_meta_integer (item, "app") != -1) + if (katze_item_get_meta_boolean (item, "app")) midori_browser_spawn_app (uri_fixed); else { From dbcc8e20540e4d3013427a553e50af43d6ea01d9 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 10:39:53 -0400 Subject: [PATCH 2793/2970] Do removal from bookmarkbar via the database --- midori/midori-browser.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 41a4eec8..4566d744 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3981,33 +3981,27 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { KatzeItem* item; - const gchar* uri; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - if (!uri) - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE); - else + if (KATZE_ITEM_IS_BOOKMARK (item)) midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + else + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE); } static void midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { + sqlite3* db; KatzeItem* item; - const gchar* uri; - KatzeItem* parent; + db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - /* FIXME: Even toplevel items should technically have a parent */ - g_return_if_fail (katze_item_get_parent (item)); - - parent = katze_item_get_parent (item); - katze_array_remove_item (KATZE_ARRAY (parent), item); + midori_bookmarks_remove_item_from_db (db, item); + g_object_unref (item); } static void From 659b7c351ebcff1eb2fa5bfdb8a2d85b84f8e978 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 11:04:36 -0400 Subject: [PATCH 2794/2970] Add 'folder' property to bookmarks --- midori/midori-array.c | 6 ++++++ midori/midori-browser.c | 2 +- panels/midori-bookmarks.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index e3fec8b8..aa1d2291 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -790,6 +790,12 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt, value = sqlite3_column_int64 (stmt, column); katze_item_set_meta_integer (item, name, value); } + else if (g_str_equal (name, "folder")) + { + const unsigned char* folder; + folder = sqlite3_column_text (stmt, column); + katze_item_set_meta_string (item, name, (gchar*)folder); + } else g_warn_if_reached (); } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 4566d744..388bcdcd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6512,7 +6512,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) if (!db) return; - sqlcmd = "SELECT uri, title, app FROM bookmarks WHERE " + sqlcmd = "SELECT uri, title, app, folder FROM bookmarks WHERE " " toolbar = 1 ORDER BY type ASC"; array = katze_array_from_sqlite (db, sqlcmd); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 33687c27..2624f22a 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -148,7 +148,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - sqlcmd = "SELECT uri, title, type, app, toolbar from bookmarks where folder = ?" + sqlcmd = "SELECT uri, title, type, app, toolbar, folder from bookmarks where folder = ?" " ORDER BY type DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); From 067eb6c3ece102b8d03532a983caba371de56a2f Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 11:08:08 -0400 Subject: [PATCH 2795/2970] Display correct folder name in bookmark edit dialog --- midori/midori-browser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 388bcdcd..5dbb2bfd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -855,9 +855,9 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, const unsigned char* name = sqlite3_column_text (statement, 0); gtk_list_store_insert_with_values (model, NULL, G_MAXINT, 0, name, 1, PANGO_ELLIPSIZE_END, -1); - /* FIXME: Not working */ - /*if (katze_item_get_parent (bookmark) == item) - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n);*/ + if (!new_bookmark + && g_str_equal (katze_item_get_meta_string (bookmark, "folder"), name)) + gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n); n++; } if (n < 2) From b170dd688a3d45fea4b74954328379e91a645ebe Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 11:13:55 -0400 Subject: [PATCH 2796/2970] Delete bookmarks from the folder they reside in --- panels/midori-bookmarks.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 2624f22a..b8c9b69c 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -231,12 +231,17 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, if (KATZE_ITEM_IS_BOOKMARK (item)) sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE uri = '%q'", - katze_item_get_uri (item)); + "DELETE FROM bookmarks WHERE uri = '%q' " + " AND folder = '%q'", + katze_item_get_uri (item), + katze_item_get_meta_string (item, "folder")); + else sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE title = '%q'", - katze_item_get_name (item)); + "DELETE FROM bookmarks WHERE title = '%q'" + " AND folder = '%q'", + katze_item_get_name (item), + katze_item_get_meta_string (item, "folder")); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { From 9230c299e9aa7a658496b035ecd2b1c788f0d004 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 11:47:55 -0400 Subject: [PATCH 2797/2970] Fix for Open all in tabs for directories in history bar --- panels/midori-history.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 809fb25e..f8b0fe2d 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -12,6 +12,7 @@ #include "midori-history.h" #include "midori-app.h" +#include "midori-array.h" #include "midori-browser.h" #include "midori-stock.h" #include "midori-view.h" @@ -667,12 +668,22 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, guint n; item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - if (KATZE_IS_ARRAY (item)) + if (KATZE_ITEM_IS_FOLDER (item)) { + sqlite3* db; + gchar* sqlcmd; KatzeItem* child; + KatzeArray* array; guint i = 0; - while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) + db = g_object_get_data (G_OBJECT (history->array), "db"); + sqlcmd = g_strdup_printf ("SELECT uri, title, date, day " + "FROM history WHERE day = %d " + "GROUP BY uri ORDER BY date ASC", + (int)katze_item_get_added (item)); + array = katze_array_from_sqlite (db, sqlcmd); + g_free (sqlcmd); + while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i++))) { if ((uri = katze_item_get_uri (child)) && *uri) { @@ -686,7 +697,6 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, midori_browser_set_current_page (browser, n); g_object_unref (settings); } - i++; } } else From 2caaed659c1ecd6ef47db813db90eb5daade88cb Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 2 Jul 2010 12:59:09 -0400 Subject: [PATCH 2798/2970] Remove last bits of 'type' field usage --- midori/midori-array.c | 2 +- midori/midori-browser.c | 4 ++-- panels/midori-bookmarks.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index aa1d2291..35c938a9 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -784,7 +784,7 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt, katze_item_set_added (item, date); } else if (g_str_equal (name, "day") || g_str_equal (name, "app") - || g_str_equal (name, "toolbar") || g_str_equal (name, "type")) + || g_str_equal (name, "toolbar")) { gint value; value = sqlite3_column_int64 (stmt, column); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5dbb2bfd..7397a987 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6513,7 +6513,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) return; sqlcmd = "SELECT uri, title, app, folder FROM bookmarks WHERE " - " toolbar = 1 ORDER BY type ASC"; + " toolbar = 1 ORDER BY uri ASC"; array = katze_array_from_sqlite (db, sqlcmd); if (!array) @@ -6533,7 +6533,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) gchar* subsqlcmd; subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM bookmarks WHERE " - " folder = '%s'", katze_item_get_name (item)); + " folder = '%s' and uri != ''", katze_item_get_name (item)); subfolder = katze_array_from_sqlite (db, subsqlcmd); katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index b8c9b69c..393cb66d 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -148,8 +148,8 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - sqlcmd = "SELECT uri, title, type, app, toolbar, folder from bookmarks where folder = ?" - " ORDER BY type DESC"; + sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where folder = ?" + " ORDER BY uri DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); From 78cfcb64d9505a16a9ac1ce985b9dfe3e4d74bbb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 3 Jul 2010 23:05:09 +0200 Subject: [PATCH 2799/2970] Force items dragged onto non-folders to the toplevel --- panels/midori-bookmarks.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 393cb66d..1c2bd74c 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -259,7 +259,6 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model, GtkTreeIter* iter, MidoriBookmarks* bookmarks) { - KatzeItem* parent_item; KatzeItem* item; GtkTreeIter parent; sqlite3* db; @@ -270,8 +269,17 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model, if (gtk_tree_model_iter_parent (model, &parent, iter)) { - gtk_tree_model_get (model, &parent , 0, &parent_item, -1); - parent_name = g_strdup (katze_item_get_name (parent_item)); + KatzeItem* new_parent; + + gtk_tree_model_get (model, &parent, 0, &new_parent, -1); + + /* Bookmarks must not be moved into non-folder items */ + if (!KATZE_ITEM_IS_FOLDER (new_parent)) + parent_name = g_strdup (""); + else + parent_name = g_strdup (katze_item_get_name (new_parent)); + + g_object_unref (new_parent); } else parent_name = g_strdup (""); From 67f4f7d9772914cc7868c20df1ca95d49c3273e9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 3 Jul 2010 23:30:21 +0200 Subject: [PATCH 2800/2970] Require Vala unless --disable-vala is passed --- README | 2 +- wscript | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README b/README index e58c5b08..7f46fc86 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ Midori is a lightweight web browser. Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2, sqlite 3.0 -Optional: Unique 0.9, libidn, docutils, libnotify +Optional: Unique 0.9, libidn, docutils, libnotify, Vala For installation instructions read INSTALL. diff --git a/wscript b/wscript index 952f5820..e8cbf743 100644 --- a/wscript +++ b/wscript @@ -87,11 +87,14 @@ def configure (conf): return dirvalue conf.check_tool ('compiler_cc') - # Circumvent mandatory check for valac - if find_program_impl (conf.env, 'valac'): - conf.check_tool ('vala') - else: - conf.check_message ('program', 'valac', False, False) + if option_enabled ('vala'): + if find_program_impl (conf.env, 'valac'): + conf.check_tool ('vala') + else: + conf.check_message ('program', 'valac', False, False) + Utils.pprint ('RED', 'Vala is required for some extensions.') + Utils.pprint ('RED', 'Pass --disable-vala to not build with Vala.') + sys.exit (1) conf.check_tool ('glib2') if option_enabled ('userdocs'): @@ -367,6 +370,7 @@ def set_options (opt): group = opt.add_option_group ('Optional features', '') add_enable_option ('unique', 'single instance support', group) + add_enable_option ('vala', 'Vala support', group) add_enable_option ('libidn', 'international domain name support', group) add_enable_option ('libnotify', 'notification support', group) add_enable_option ('addons', 'building of extensions', group) From 9aebc6d37462f55c3a6380cb2e4cffa2f01e2834 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 10:28:54 +0200 Subject: [PATCH 2801/2970] Adjust guards in transferbar for WebKitGTK+ < 1.1.3 --- toolbars/midori-transferbar.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c index f0fb0304..f59d3337 100644 --- a/toolbars/midori-transferbar.c +++ b/toolbars/midori-transferbar.c @@ -256,8 +256,10 @@ midori_transferbar_init (MidoriTransferbar* transferbar) transferbar->clear = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); gtk_tool_button_set_label (GTK_TOOL_BUTTON (transferbar->clear), _("Clear All")); gtk_tool_item_set_is_important (transferbar->clear, TRUE); + #if WEBKIT_CHECK_VERSION (1, 1, 3) g_signal_connect (transferbar->clear, "clicked", G_CALLBACK (midori_transferbar_clear_clicked_cb), transferbar); + #endif gtk_toolbar_insert (GTK_TOOLBAR (transferbar), transferbar->clear, -1); transferbar->infos = NULL; @@ -267,11 +269,11 @@ gboolean midori_transferbar_confirm_delete (MidoriTransferbar* transferbar) { GtkWidget* dialog = NULL; - GList* list; gboolean cancel = FALSE; + #if WEBKIT_CHECK_VERSION (1, 1, 3) + GList* list; gboolean all_done = TRUE; - #if WEBKIT_CHECK_VERSION (1, 1, 3) for (list = transferbar->infos; list != NULL; list = g_list_next (list)) { TransferInfo* info = list->data; From c3e145f540c4b602bbb6f9f3852df42ca4f7a952 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 10:45:35 +0200 Subject: [PATCH 2802/2970] Localize Vala extensions and mark strings for translation The -include switch is passed to the compiler to work around Vala failing to include gi18n.h first. This works for clang and gcc at least. --- extensions/external-applications.vala | 4 ++-- extensions/history-list.vala | 10 ++++++---- midori/midori.h | 2 +- po/POTFILES.in | 2 ++ wscript | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/extensions/external-applications.vala b/extensions/external-applications.vala index f56b3c4b..f606a73f 100644 --- a/extensions/external-applications.vala +++ b/extensions/external-applications.vala @@ -90,8 +90,8 @@ public class ExternalApplications : Midori.Extension { } } internal ExternalApplications () { - GLib.Object (name: "External Applications", - description: "Associate URL schemes with external commands", + GLib.Object (name: _("External Applications"), + description: _("Associate URL schemes with external commands"), version: "0.1", authors: "Christian Dywan "); activate.connect (activated); diff --git a/extensions/history-list.vala b/extensions/history-list.vala index b111a9f4..721ed258 100644 --- a/extensions/history-list.vala +++ b/extensions/history-list.vala @@ -171,7 +171,8 @@ private class HistoryList : Midori.Extension { Gtk.Action action; action = new Gtk.Action ("HistoryListNextTab", - "Next Tab (HistoryList)", "Next tab from history", null); + _("Next Tab (History List)"), + _("Next tab from history"), null); action.activate.connect ((a) => { this.walk (a, browser, typeof (TabWindow), 1); }); @@ -180,7 +181,8 @@ private class HistoryList : Midori.Extension { action.connect_accelerator (); action = new Gtk.Action ("HistoryListPreviousTab", - "Previous Tab (HistoryList)", "Previous tab from history", null); + _("Previous Tab (History List)"), + _("Previous tab from history"), null); action.activate.connect ((a) => { this.walk (a, browser, typeof (TabWindow), -1); }); @@ -240,8 +242,8 @@ private class HistoryList : Midori.Extension { app.add_browser.disconnect (browser_added); } internal HistoryList () { - GLib.Object (name: "History List", - description: "Allows to switch tabs by choosing from a list sorted by last usage", + GLib.Object (name: _("History List"), + description: _("Allows to switch tabs by choosing from a list sorted by last usage"), version: "0.2", authors: "André Stösel "); activate.connect (activated); diff --git a/midori/midori.h b/midori/midori.h index 44c47821..84a13d5c 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -26,7 +26,7 @@ #include "midori-websettings.h" /* For convenience, include localization header */ -#include +#include #define MIDORI_CHECK_VERSION(major, minor, micro) \ (MIDORI_MAJOR_VERSION > (major) || \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 686fb1da..4577c184 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -33,12 +33,14 @@ extensions/cookie-manager/cookie-manager.c extensions/cookie-manager/cookie-manager-page.c extensions/cookie-manager/main.c extensions/copy-tabs.c +extensions/external-applications.vala extensions/feed-panel/feed-atom.c extensions/feed-panel/feed-panel.c extensions/feed-panel/feed-parse.c extensions/feed-panel/feed-rss.c extensions/feed-panel/main.c extensions/formhistory.c +extensions/history-list.vala extensions/mouse-gestures.c extensions/page-holder.c extensions/shortcuts.c diff --git a/wscript b/wscript index e8cbf743..c21dc807 100644 --- a/wscript +++ b/wscript @@ -282,7 +282,7 @@ def configure (conf): conf.define ('MIDORI_MICRO_VERSION', micro) conf.write_config_header ('config.h') - conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H') + conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H -include config.h'.split ()) debug_level = Options.options.debug_level compiler = conf.env['CC_NAME'] if debug_level != '' and compiler != 'gcc': From bba875c634ffc912f08e29aa94e3bb3762f505d8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 11:14:30 +0200 Subject: [PATCH 2803/2970] Remove "Bookmarks" action from the menubar --- midori/midori-browser.c | 85 ++--------------------------------------- 1 file changed, 4 insertions(+), 81 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 7397a987..a9d2e709 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2562,7 +2562,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser) { static const gchar* actions[] = { "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", - "Fullscreen", "Preferences", "Window", "Bookmarks", + "Fullscreen", "Preferences", "Window", "RecentlyVisited", "ReloadStop", "ZoomIn", "TabClose", "ZoomOut", "Separator", "Back", "Forward", "Homepage", "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL }; @@ -2791,54 +2791,6 @@ _action_history_activate_item (GtkAction* action, midori_browser_set_current_uri (browser, katze_item_get_uri (item)); } -static void -_action_bookmarks_populate_popup (GtkAction* action, - GtkMenu* menu, - MidoriBrowser* browser) -{ - GList* children = gtk_container_get_children (GTK_CONTAINER (menu)); - guint i = 0; - GtkWidget* menuitem; - - while ((menuitem = g_list_nth_data (children, i++))) - { - g_signal_connect (menuitem, "select", - G_CALLBACK (midori_browser_menu_item_select_cb), browser); - g_signal_connect (menuitem, "deselect", - G_CALLBACK (midori_browser_menu_item_deselect_cb), browser); - } - g_list_free (children); - - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - - if (katze_array_is_empty (browser->bookmarks)) - { - menuitem = gtk_image_menu_item_new_with_label (_("Empty")); - gtk_widget_set_sensitive (menuitem, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - } - menuitem = gtk_action_create_menu_item ( - _action_by_name (browser, "BookmarksExport")); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - menuitem = gtk_action_create_menu_item ( - _action_by_name (browser, "BookmarksImport")); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - - menuitem = gtk_action_create_menu_item ( - _action_by_name (browser, "BookmarkFolderAdd")); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - menuitem = gtk_action_create_menu_item ( - _action_by_name (browser, "BookmarkAdd")); - gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); -} - /* static */ void midori_browser_open_bookmark (MidoriBrowser* browser, KatzeItem* item) @@ -2865,14 +2817,6 @@ midori_browser_open_bookmark (MidoriBrowser* browser, g_free (uri_fixed); } -static void -_action_bookmarks_activate_item (GtkAction* action, - KatzeItem* item, - MidoriBrowser* browser) -{ - midori_browser_open_bookmark (browser, item); -} - static void _action_tools_populate_popup (GtkAction* action, GtkMenu* menu, @@ -5302,6 +5246,8 @@ static const gchar* ui_markup = "" "" "" + "" + "" "" "" "

" @@ -5366,7 +5312,6 @@ static const gchar* ui_markup = "" "" "" - "" "" "" "" @@ -5386,8 +5331,6 @@ static const gchar* ui_markup = "" "" "" - "" - "" "" "" "" @@ -5802,23 +5745,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); - action = g_object_new (KATZE_TYPE_ARRAY_ACTION, - "name", "Bookmarks", - "label", _("_Bookmarks"), - "stock-id", STOCK_BOOKMARKS, - "tooltip", _("Show the saved bookmarks"), - NULL); - g_object_connect (action, - "signal::populate-popup", - _action_bookmarks_populate_popup, browser, - "signal::activate-item", - _action_bookmarks_activate_item, browser, - "signal::activate-item-alt", - _action_menus_activate_item_alt, browser, - NULL); - gtk_action_group_add_action_with_accel (browser->action_group, action, ""); - g_object_unref (action); - action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Tools", "label", _("_Tools"), @@ -6473,7 +6399,7 @@ midori_bookmarkbar_insert_item (GtkWidget* toolbar, MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); toolitem = katze_array_action_create_tool_item_for ( - KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item); + KATZE_ARRAY_ACTION (_action_by_name (browser, "Tools")), item); g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); if (KATZE_IS_ITEM (item)) @@ -6587,9 +6513,6 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, katze_object_assign (browser->bookmarks, bookmarks); } - g_object_set (_action_by_name (browser, "Bookmarks"), "array", - browser->bookmarks, NULL); - settings = midori_browser_get_settings (browser); g_signal_connect (settings, "notify::show-bookmarkbar", G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser); From 9d587ff3a2a57176c149130d90b864dd49e5ebc0 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sun, 4 Jul 2010 15:46:56 +0200 Subject: [PATCH 2804/2970] l10n: Updated Japanese (ja) translation to 100% New status: 642 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ja.po | 658 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 340 insertions(+), 318 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0443331e..3c71bb07 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-30 22:22+0900\n" -"PO-Revision-Date: 2010-06-30 22:21+0900\n" +"POT-Creation-Date: 2010-07-04 22:45+0900\n" +"PO-Revision-Date: 2010-07-04 22:42+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -46,7 +46,7 @@ msgstr "'%s' は %s の値として無効です" msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" @@ -109,251 +109,251 @@ msgstr "最後のセッションをリセットする(_S)" msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "診断ダイアログを表示する" # CLI --help -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" # CLI --help -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "正規表現 PATTERN に従って URI をブロックする" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "PATTERN" # CLI --help #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "認識できないブックマーク形式です。" -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5021 -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4967 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:455 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:493 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:507 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:736 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:736 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:738 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:738 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:769 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4182 ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 +#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:879 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:892 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:907 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1037 ../midori/midori-browser.c:4232 -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 +#: ../midori/midori-browser.c:4204 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2132 +#: ../midori/midori-browser.c:2155 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2210 +#: ../midori/midori-browser.c:2233 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -366,155 +366,144 @@ msgstr "" "もしくは Midori の設定のアプリケーションタブでフィードリーダを指定してくださ" "い。次にニュースフィードアイコンをクリックしたときに自動的に追加されます。" -#: ../midori/midori-browser.c:2216 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2259 ../midori/midori-browser.c:5086 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 +#: ../panels/midori-bookmarks.c:401 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:2728 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "データベース文の実行に失敗しました: %s\n" - -#: ../midori/midori-browser.c:2808 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "空です" - -#: ../midori/midori-browser.c:3415 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/midori-browser.c:3681 ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:4015 ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:4022 ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:4025 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4103 +#: ../midori/midori-browser.c:4051 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4104 +#: ../midori/midori-browser.c:4052 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4105 +#: ../midori/midori-browser.c:4053 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4106 +#: ../midori/midori-browser.c:4054 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4107 +#: ../midori/midori-browser.c:4055 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4079 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:4131 ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4142 +#: ../midori/midori-browser.c:4093 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4169 ../midori/midori-browser.c:5195 +#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:4243 +#: ../midori/midori-browser.c:4181 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4219 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4333 ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4380 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4384 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4398 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4469 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4415 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4420 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4425 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:4490 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:4495 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/midori-browser.c:4503 +#: ../midori/midori-browser.c:4443 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:4604 +#: ../midori/midori-browser.c:4544 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:4606 +#: ../midori/midori-browser.c:4546 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -525,548 +514,539 @@ msgstr "" "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:4625 +#: ../midori/midori-browser.c:4565 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4874 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:4936 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4877 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:4880 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4882 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:4943 +#: ../midori/midori-browser.c:4883 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" # tooltip -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4887 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4890 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4892 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:4893 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4895 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" # tooltip -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4896 msgid "Add shortcut to the desktop" msgstr "デスクトップにショートカットを追加します" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4898 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4899 msgid "Subscribe to this news feed" msgstr "このニュースフィードを購読します" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4904 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4905 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4907 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4908 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4911 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4914 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4916 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4920 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4923 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4927 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:4990 ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4936 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4939 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4942 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4945 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4947 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4948 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4950 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4951 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:5015 +#: ../midori/midori-browser.c:4955 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4957 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4958 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4970 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:4973 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:4976 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4977 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4979 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:4980 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" # tooltip -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:4983 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4986 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4987 msgid "Scroll to the left" msgstr "左へスクロールします" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4989 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:4990 msgid "Scroll down" msgstr "下へスクロール" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4992 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4993 msgid "Scroll up" msgstr "上へスクロール" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4995 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4996 msgid "Scroll to the right" msgstr "右へスクロールします" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4999 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:5002 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5005 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5009 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5013 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5016 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:5018 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:5019 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:5021 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:5082 +#: ../midori/midori-browser.c:5022 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5028 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5029 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5034 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5097 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:5098 +#: ../midori/midori-browser.c:5038 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5041 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:5042 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:5046 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5107 +#: ../midori/midori-browser.c:5047 msgid "Inspect page details and access developer tools..." msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." -#: ../midori/midori-browser.c:5112 +#: ../midori/midori-browser.c:5052 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5053 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5055 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:5116 +#: ../midori/midori-browser.c:5056 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5058 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:5059 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5061 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:5062 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:5064 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:5066 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:5067 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:5129 +#: ../midori/midori-browser.c:5069 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5070 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:5132 +#: ../midori/midori-browser.c:5072 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5073 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5076 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5084 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:5085 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:5088 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:5149 +#: ../midori/midori-browser.c:5089 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:5152 +#: ../midori/midori-browser.c:5092 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:5153 +#: ../midori/midori-browser.c:5093 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:5096 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5097 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5100 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5101 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:5104 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:5105 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5113 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5176 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:5120 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5183 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5186 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5189 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5192 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5662 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5669 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5671 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5695 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5697 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5718 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:5794 +#: ../midori/midori-browser.c:5733 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" # tooltip -#: ../midori/midori-browser.c:5796 +#: ../midori/midori-browser.c:5735 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:5811 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "ブックマーク(_B)" - -# tooltip -#: ../midori/midori-browser.c:5813 -msgid "Show the saved bookmarks" -msgstr "ブックマークを表示します" - -#: ../midori/midori-browser.c:5828 +#: ../midori/midori-browser.c:5750 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:5841 +#: ../midori/midori-browser.c:5763 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5843 +#: ../midori/midori-browser.c:5765 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:5857 +#: ../midori/midori-browser.c:5779 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:5859 +#: ../midori/midori-browser.c:5781 msgid "Menu" msgstr "メニュー" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6358 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -1193,7 +1173,7 @@ msgstr "すべての Cookie" msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 msgid "None" msgstr "なし" @@ -2006,166 +1986,170 @@ msgstr "背景画像を印刷する" msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "機能" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "一般" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "起動" # tooltip -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "転送" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" # tooltip -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "等幅フォントファミリ" # tooltip -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "等幅文字表示で使用するフォントファミリを指定します" # tooltip -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "等幅文字表示で使用するフォントのサイズを指定します" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "最小フォントサイズ" # tooltip -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "文字表示で使用する最小のフォントサイズを指定します" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" # tooltip -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "ポップアップを表示するスクリプトを許可する" # tooltip -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "ポップアップウィンドウを自動的に開くスクリプトの実行を許可します" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "スペルチェック" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "スペルチェックを有効にする" # tooltip -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "キー入力中のスペルチェックを有効にします" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "スペルチェック辞書:" # tooltip #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" msgstr "スペルチェックを行う言語をカンマで区切って指定します。例 \"en,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "ブラウジング" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "アプリケーション" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "外部アプリケーション" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "ホスト名" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "日" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "空です" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "検索エンジンの追加" @@ -2198,6 +2182,10 @@ msgstr "デフォルトで使う(_D)" msgid "_Bookmark" msgstr "ブックマーク(_B)" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "ブックマーク(_B)" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" @@ -2281,42 +2269,42 @@ msgstr "転送完了" msgid "Clear All" msgstr "すべてクリア" -#: ../toolbars/midori-transferbar.c:298 ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "ファイルのダウンロード中です" -#: ../toolbars/midori-transferbar.c:304 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "Midori を終了(_Q)" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Midori を終了すると転送がキャンセルされます。" -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:110 msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:216 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "ブックマークアイテムの追加に失敗しました: %s\n" # tooltip -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:409 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:417 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:431 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "セパレータ" @@ -2337,54 +2325,60 @@ msgstr "全てコピー" msgid "Extensions" msgstr "エクステンション" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "時刻の誤り" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "" "The clock time lies in the past. Please check the current date and time." msgstr "時計時刻が過去になっています。現在の日付と時刻をチェックしてください。" -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 日前" msgstr[1] "%d 日前" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "データベース文の実行に失敗しました: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:445 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:454 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:462 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:943 +#: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "フィルタ:" @@ -2435,16 +2429,16 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "フォルダの選択" @@ -2486,12 +2480,12 @@ msgstr "画像をブロック(_O)" msgid "Bl_ock link" msgstr "リンクをブロック(_O)" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "広告ブロッカ" # description -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "フィルタリストに登録された広告をブロックします" @@ -2658,6 +2652,14 @@ msgstr "タブのアドレスをコピーします" msgid "Copy the addresses of all tabs to the clipboard" msgstr "すべてのタブのアドレスをクリップボードにコピーします" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "外部アプリケーション" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "URL スキームに外部コマンドを割り当てます" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "XML データ内に要求された Atom \"entry\" 要素が見つかりませんでした。" @@ -2743,28 +2745,52 @@ msgstr "フィードパネル" msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "フォーム値の追加に失敗しました: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "入力されたフォームデータの履歴を記憶します" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "利用できません: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "リソースファイルがインストールされていません" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "入力フォーム履歴フィルタ" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "次のタブ (履歴リスト)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "履歴から次のタブへ切り替えます" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "前のタブ (履歴リスト)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "履歴から前のタブへ切り替えます" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "履歴リスト" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "最後に使用された順の履歴から選択したタブに切り替えます" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "マウスジェスチャ" @@ -2846,14 +2872,6 @@ msgstr "タブパネル(_A)" msgid "Show tabs in a vertical panel" msgstr "タブを縦のパネルに表示します" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "タブ履歴リスト" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "最後に使用された順の履歴から選択したタブに切り替えます" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "新規タブの最小化" @@ -2899,6 +2917,10 @@ msgstr "ツールバーのレイアウトを簡単に編集できます" msgid "Cache HTTP communication on disk" msgstr "HTTP 通信をディスクにキャッシュします" +# tooltip +#~ msgid "Show the saved bookmarks" +#~ msgstr "ブックマークを表示します" + #~ msgid "Set number of shortcuts" #~ msgstr "ショートカットの設定" From 3728accefce6b79905e11521dd9f50d4fd1f1329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Sun, 4 Jul 2010 19:29:24 +0200 Subject: [PATCH 2805/2970] l10n: Updated Czech (cs) translation to 100% New status: 642 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 716 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 369 insertions(+), 347 deletions(-) diff --git a/po/cs.po b/po/cs.po index 833cc34b..67bd8616 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-27 10:08+0000\n" +"POT-Creation-Date: 2010-07-04 16:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -47,7 +47,7 @@ msgstr "Hodnota '%s' je pro %s špatná" msgid "Invalid configuration value '%s'" msgstr "Nesprávná hodnota '%s' v konfiguraci" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Nepodařilo se otevřít databázi: %s\n" @@ -104,886 +104,867 @@ msgstr "Vymazat poslední _sezení" msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Nebyl zadán název souboru" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímek uložen do %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Spustit ADRESA jako webovou aplikaci" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Použít SLOŽKA jako místo pro uložení konfigurace" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "SLOŽKA" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Spustit vybraný příkaz" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokovat adresy (URI) pomocí regulárního výrazu REGVÝRAZ" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "VTEŘINY" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Zkontrolujte, zda není nová verze na " -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Ignorovat" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Soubor nebyl nalezen." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Nesprávný formát dokumentu." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Neznámý formát záložek." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4967 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:736 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:736 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:738 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:738 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:769 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 -#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 +#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:879 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:892 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:907 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:981 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 +#: ../midori/midori-browser.c:4204 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1431 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2133 +#: ../midori/midori-browser.c:2155 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2211 +#: ../midori/midori-browser.c:2233 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." -#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 +#: ../panels/midori-bookmarks.c:401 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Nepodařilo se spustit databázový příkaz: %s\n" - -#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Prázdné" - -#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4051 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4116 +#: ../midori/midori-browser.c:4052 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4053 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4118 +#: ../midori/midori-browser.c:4054 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:4055 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:4079 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4154 +#: ../midori/midori-browser.c:4093 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4181 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4219 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4380 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4384 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4398 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4415 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4420 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:4497 +#: ../midori/midori-browser.c:4425 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:4443 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:4616 +#: ../midori/midori-browser.c:4544 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4546 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4565 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4874 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4877 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4880 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:4882 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4883 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4887 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4890 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4892 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4893 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4895 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4896 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4898 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4899 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4904 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4905 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4907 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4908 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4911 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4914 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:4916 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4920 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4923 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4927 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4936 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4939 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4942 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4945 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4947 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4948 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4950 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:4951 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:4955 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4957 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4958 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4970 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:4973 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:4976 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4977 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4979 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4980 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4983 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4986 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4987 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4989 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4990 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:4992 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4993 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4995 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:4996 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:4999 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:5002 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:5005 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:5009 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5013 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5016 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:5018 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:5019 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5021 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:5022 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5028 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5029 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:5034 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:5038 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5041 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5114 +#: ../midori/midori-browser.c:5042 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5046 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:5047 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:5052 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5125 +#: ../midori/midori-browser.c:5053 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:5055 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5128 +#: ../midori/midori-browser.c:5056 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5058 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5131 +#: ../midori/midori-browser.c:5059 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5061 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5134 +#: ../midori/midori-browser.c:5062 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5064 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:5066 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:5067 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:5069 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5070 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5072 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:5073 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:5076 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:5084 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5085 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5088 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5089 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:5092 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:5093 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5096 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:5097 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:5100 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5101 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:5104 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:5105 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5113 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5120 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5662 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5669 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5671 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5695 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:5697 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:5718 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:5806 +#: ../midori/midori-browser.c:5733 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:5808 +#: ../midori/midori-browser.c:5735 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Záložky" - -#: ../midori/midori-browser.c:5825 -msgid "Show the saved bookmarks" -msgstr "Zobrazit uložené záložky" - -#: ../midori/midori-browser.c:5840 +#: ../midori/midori-browser.c:5750 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:5853 +#: ../midori/midori-browser.c:5763 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:5855 +#: ../midori/midori-browser.c:5765 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:5869 +#: ../midori/midori-browser.c:5779 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5871 +#: ../midori/midori-browser.c:5781 msgid "Menu" msgstr "Nabídka" -#: ../midori/midori-browser.c:6455 +#: ../midori/midori-browser.c:6358 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -1110,7 +1091,7 @@ msgstr "všechna cookies" msgid "Session cookies" msgstr "cookies sezení" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 msgid "None" msgstr "žádná" @@ -1633,8 +1614,8 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 -#: ../midori/midori-view.c:4580 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1740,277 +1721,281 @@ msgstr "_Hledat na webu" msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:2702 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2709 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3253 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Změnit počet sloupců a řádků" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Vložte počet sloupců a řádků:" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Nesprávná hodnota velikosti rychlého přístupu" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Velikost náhledů:" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "malá" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "střední" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "velká" -#: ../midori/midori-view.c:3572 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3595 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3716 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3717 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." -#: ../midori/midori-view.c:3718 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:3862 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4116 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "_Ukázat titulek" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Schovat titulek" -#: ../midori/midori-view.c:4127 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4813 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4814 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Rozšíření" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Obecné" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Při spuštění" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Přenosy" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Vzhled" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Nastavení písma" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Výchozí font" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Výchozí font pro zobrazení textu" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Velikost textu" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Výchozí font písma se stejnou šířkou" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Minimální velikost textu" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Minimální velikost textu, která se použije pro zobrazení" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Chování" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Vnutit rozlišení 96 bodů/palec" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Vnutit rozlišení obrazu 96 bodů na palec" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Povolit skriptům otevírat vyskakovací okna" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Jestli skripty (JavaScript) mohou otevírat vyskakovací okna (popup okna)" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Kontrola pravopisu" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Povolit kontrolu pravopisu" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Povolit kontrolu pravopisu při psaní" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Slovníky pro kontrolu pravopisu:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. \"cs_CZ,en_GB\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Rozhraní" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Navigační lišta" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Prohlížení" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Aplikace" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Externí aplikace" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Síť" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Počítač" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Soukromí" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Web cookies" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "dny" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Prázdné" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Přidat vyhledávací nástroj" @@ -2043,6 +2028,10 @@ msgstr "Použít jako _výchozí" msgid "_Bookmark" msgstr "_Záložky" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Záložky" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Přidat záložku" @@ -2126,40 +2115,40 @@ msgstr "Přenos dokončen" msgid "Clear All" msgstr "Smazat vše" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Ještě se stahují nějaké soubory." -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "U_končit Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:110 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:216 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Záložku se nepodařilo přidat: %s\n" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:409 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:417 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:431 msgid "Add a new folder" msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Oddělovač" @@ -2179,19 +2168,19 @@ msgstr "Kopírovat vše" msgid "Extensions" msgstr "Rozšíření" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Chyba v nastavení času" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "The clock time lies in the past. Please check the current date and time." msgstr "Hodiny jdou pozpátku. Zkontrolujte nastavení data a času." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Před týdnem" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2199,31 +2188,37 @@ msgstr[0] "Před %d dny" msgstr[1] "Před %d dny" msgstr[2] "Před %d dny" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Dnes" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Včera" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Nepodařilo se spustit databázový příkaz: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat všechny položky historie?" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:445 msgid "Bookmark the selected history item" msgstr "Zazáložkovat vybranou položku historie" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:454 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:462 msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-history.c:943 +#: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtr:" @@ -2272,16 +2267,16 @@ msgstr "Uložená ikona '%s' nemůže být načtena" msgid "Animation frames are broken" msgstr "Snímky animace jsou porušené" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Vybrat soubor" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Vybrat adresář" @@ -2319,11 +2314,11 @@ msgstr "Bl_okovat obrázek" msgid "Bl_ock link" msgstr "Bl_okovat odkaz" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Blokování reklamy" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Blokuje reklamu podle filtrů" @@ -2473,6 +2468,14 @@ msgstr "Zkopírovat adresy z karet" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Zkopíruje adresy všech karet do schránky" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Externí aplikace" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Spojuje URL schémata s externími příkazy" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech." @@ -2557,28 +2560,52 @@ msgstr "Panel kanálů" msgid "Read Atom/ RSS feeds" msgstr "Čte Atom/RSS kanály" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nepodařilo se přidat položku formuláře: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Ukládat historii hodnot vložených do formuláře" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Není k dispozici: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Nejsou nainstalovány soubory se zdrojem" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Ukládání hodnot ve formuláři" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Další karta (v historii)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Zvolí další kartu z historie" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Předchozí karta (v historii)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Zvolí předchozí kartu z historie" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Historie" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gesta myší" @@ -2656,14 +2683,6 @@ msgstr "Panel _karet" msgid "Show tabs in a vertical panel" msgstr "Zobrazí karty ve vertikálním panelu" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Karta historie" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Umožňuje přepínat karty výběrem ze seznamu řazeného podle posledního použití" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Minimalizovat otevřené karty" @@ -2704,6 +2723,9 @@ msgstr "Umožňuje jednoduše změnit lištu" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +#~ msgid "Show the saved bookmarks" +#~ msgstr "Zobrazit uložené záložky" + #~ msgid "Set number of shortcuts" #~ msgstr "Změnit počet záložek" From 809a94c34bee0e8aca6d734c3406bd98623cce37 Mon Sep 17 00:00:00 2001 From: Dmitrij Smirnov Date: Sun, 4 Jul 2010 21:00:36 +0200 Subject: [PATCH 2806/2970] l10n: Updated Russian (ru) translation to 98% New status: 633 messages complete with 9 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 917 ++++++++++++++++++++++++++----------------------------- 1 file changed, 433 insertions(+), 484 deletions(-) diff --git a/po/ru.po b/po/ru.po index bcc09f42..417adf18 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,30 +3,27 @@ # This file is distributed under the same license as the midori package. # Troitskiy Nikita 2008 # Anton Shestakov 2008-2009 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-26 00:33+0900\n" +"POT-Creation-Date: 2010-07-04 16:08+0000\n" "PO-Revision-Date: 2010-06-26 00:55+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1298 -#: ../midori/main.c:1628 -#: ../midori/main.c:1636 -#: ../midori/main.c:1652 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -45,15 +42,12 @@ msgstr "Не удалось загрузить настройки: %s\n" msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:158 -#: ../midori/main.c:244 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:370 -#: ../midori/main.c:442 -#: ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" @@ -80,14 +74,12 @@ msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 -#: ../midori/main.c:581 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:640 -#: ../midori/main.c:880 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" @@ -112,254 +104,244 @@ msgstr "Удалить _данные последнего сеанса" msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1174 -#: ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Файл не найден." -#: ../midori/midori-array.c:462 -#: ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:332 -#: ../midori/midori-browser.c:5245 -#: ../midori/midori-browser.c:5251 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4967 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:342 -#: ../midori/midori-browser.c:5248 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:736 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:736 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:738 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:738 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:769 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:777 -#: ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:796 -#: ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:830 -#: ../midori/midori-browser.c:4401 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:840 -#: ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4406 -#: ../midori/midori-browser.c:4438 +#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 +#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:879 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:892 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:907 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1055 -#: ../midori/midori-browser.c:4456 -#: ../midori/midori-browser.c:4488 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 +#: ../midori/midori-browser.c:4204 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2155 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2233 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -367,678 +349,627 @@ msgstr "" "Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" "В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." -#: ../midori/midori-browser.c:2236 -#: ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2279 -#: ../midori/midori-browser.c:5310 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 +#: ../panels/midori-bookmarks.c:401 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:2748 -#: ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не удалось выполнить запрос к базе данных: %s\n" - -#: ../midori/midori-browser.c:2828 -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Очистить" - -#: ../midori/midori-browser.c:3446 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 +#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:3760 -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:4094 -#: ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:4101 -#: ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:4104 -#: ../midori/midori-view.c:2424 -#: ../midori/midori-view.c:4103 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 -#: ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:4051 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4052 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4053 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:4054 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4055 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4352 +#: ../midori/midori-browser.c:4079 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4355 -#: ../midori/midori-browser.c:5315 +#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4366 +#: ../midori/midori-browser.c:4093 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4393 -#: ../midori/midori-browser.c:5419 -#: ../midori/midori-websettings.c:228 -#: ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4467 +#: ../midori/midori-browser.c:4181 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4503 +#: ../midori/midori-browser.c:4219 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4557 -#: ../panels/midori-bookmarks.c:271 -#: ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4664 +#: ../midori/midori-browser.c:4380 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:4384 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:4398 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4693 -#: ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4699 +#: ../midori/midori-browser.c:4415 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:4420 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:4709 +#: ../midori/midori-browser.c:4425 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:4714 -#: ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:4719 -#: ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:4443 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4544 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4546 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4565 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4874 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:5160 -#: ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4877 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:4880 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4882 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:4883 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:5171 +#: ../midori/midori-browser.c:4887 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:5174 +#: ../midori/midori-browser.c:4890 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4892 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:4893 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4895 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:4896 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4898 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:5183 +#: ../midori/midori-browser.c:4899 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:4904 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:5189 +#: ../midori/midori-browser.c:4905 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:4907 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:4908 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:5195 +#: ../midori/midori-browser.c:4911 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:5198 +#: ../midori/midori-browser.c:4914 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:5200 +#: ../midori/midori-browser.c:4916 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:5204 +#: ../midori/midori-browser.c:4920 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:5207 +#: ../midori/midori-browser.c:4923 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:5211 +#: ../midori/midori-browser.c:4927 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:5214 -#: ../midori/midori-browser.c:5217 +#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:5220 +#: ../midori/midori-browser.c:4936 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:5223 +#: ../midori/midori-browser.c:4939 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:5226 +#: ../midori/midori-browser.c:4942 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:5229 +#: ../midori/midori-browser.c:4945 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:4947 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:5232 +#: ../midori/midori-browser.c:4948 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5234 +#: ../midori/midori-browser.c:4950 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:5235 +#: ../midori/midori-browser.c:4951 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:5239 +#: ../midori/midori-browser.c:4955 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:4957 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:5242 +#: ../midori/midori-browser.c:4958 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:5254 +#: ../midori/midori-browser.c:4970 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:5257 +#: ../midori/midori-browser.c:4973 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:4976 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:5261 +#: ../midori/midori-browser.c:4977 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:4979 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:5264 +#: ../midori/midori-browser.c:4980 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:5267 +#: ../midori/midori-browser.c:4983 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:4986 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:5271 +#: ../midori/midori-browser.c:4987 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:4989 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:5274 +#: ../midori/midori-browser.c:4990 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:4992 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:5277 +#: ../midori/midori-browser.c:4993 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:4995 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:5280 +#: ../midori/midori-browser.c:4996 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:5283 +#: ../midori/midori-browser.c:4999 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5286 +#: ../midori/midori-browser.c:5002 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5289 +#: ../midori/midori-browser.c:5005 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5293 +#: ../midori/midori-browser.c:5009 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5297 +#: ../midori/midori-browser.c:5013 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5300 +#: ../midori/midori-browser.c:5016 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:5018 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5303 +#: ../midori/midori-browser.c:5019 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:5021 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5306 +#: ../midori/midori-browser.c:5022 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:5028 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:5029 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5318 +#: ../midori/midori-browser.c:5034 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5321 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:5038 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:5041 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:5042 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:5046 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5331 +#: ../midori/midori-browser.c:5047 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:5052 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:5053 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:5055 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5340 +#: ../midori/midori-browser.c:5056 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:5058 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5343 +#: ../midori/midori-browser.c:5059 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:5061 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:5062 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5348 +#: ../midori/midori-browser.c:5064 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5066 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5351 +#: ../midori/midori-browser.c:5067 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5069 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5354 +#: ../midori/midori-browser.c:5070 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5072 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:5073 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:5076 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5084 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:5085 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5088 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5373 +#: ../midori/midori-browser.c:5089 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5092 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:5093 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5096 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:5097 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5100 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:5101 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5104 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5389 +#: ../midori/midori-browser.c:5105 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:5113 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5400 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5404 +#: ../midori/midori-browser.c:5120 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5407 -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5410 -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5413 -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5416 -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5950 +#: ../midori/midori-browser.c:5662 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5957 +#: ../midori/midori-browser.c:5669 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:5959 +#: ../midori/midori-browser.c:5671 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5983 +#: ../midori/midori-browser.c:5695 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:5985 +#: ../midori/midori-browser.c:5697 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:6006 +#: ../midori/midori-browser.c:5718 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:6021 +#: ../midori/midori-browser.c:5733 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:6023 +#: ../midori/midori-browser.c:5735 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:6038 -#: ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Закладки" - -#: ../midori/midori-browser.c:6040 -msgid "Show the saved bookmarks" -msgstr "Показать все сохранённые закладки" - -#: ../midori/midori-browser.c:6055 +#: ../midori/midori-browser.c:5750 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:6068 +#: ../midori/midori-browser.c:5763 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:6070 +#: ../midori/midori-browser.c:5765 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:6084 +#: ../midori/midori-browser.c:5779 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:6086 +#: ../midori/midori-browser.c:5781 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6667 +#: ../midori/midori-browser.c:6358 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -1068,25 +999,20 @@ msgstr "Не удалось выполнить запрос к базе данн msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-panel.c:432 -#: ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:444 -#: ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 -#: ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:456 -#: ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:640 -#: ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" @@ -1170,8 +1096,7 @@ msgstr "Все" msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:299 -#: ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 msgid "None" msgstr "Нет" @@ -1513,8 +1438,7 @@ msgstr "Открывать всплывающие окна во вкладках msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:852 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Загружать изображения автоматически" @@ -1522,8 +1446,7 @@ msgstr "Загружать изображения автоматически" msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:860 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Выполнять сценарии" @@ -1531,8 +1454,7 @@ msgstr "Выполнять сценарии" msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:868 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" @@ -1697,398 +1619,388 @@ msgstr "Выбранные для удаления личные данные" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 -#: ../midori/midori-view.c:4567 -#: ../midori/midori-view.c:4571 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Попытаться снова" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1520 -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2147 -#: ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2199 -#: ../midori/midori-view.c:2269 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2207 -#: ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2216 -#: ../midori/midori-view.c:2288 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2217 -#: ../midori/midori-view.c:2282 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2221 -#: ../midori/midori-view.c:2251 -#: ../midori/midori-view.c:2293 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2230 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2237 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2244 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2345 -#: ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2373 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2674 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2693 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2696 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2700 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3244 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3526 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3527 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3528 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3529 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3530 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3531 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Установить количество закладок" -#: ../midori/midori-view.c:3532 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Введите число столбцов и строк:" -#: ../midori/midori-view.c:3533 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Проверьте правильность ввода" -#: ../midori/midori-view.c:3534 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Размер миниатюр:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Средний" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Большой" -#: ../midori/midori-view.c:3563 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3586 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3707 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:3708 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." -#: ../midori/midori-view.c:3709 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:3853 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4107 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4112 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:4112 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-view.c:4118 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4804 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4805 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4857 -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Возможности" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:314 -#: ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" -#: ../midori/midori-preferences.c:331 -#: ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Передачи" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Семейство шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Семейство моноширинного шрифта" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Семейство моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Размер моноширинного шрифта для отображения текста" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Разрешить сценариям открывать всплывающие окна" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Разрешено ли сценариям открывать всплывающие окна без вмешательства пользователя" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Проверка орфографии" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Проверять орфографию" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Проверять правописание вводимого текста" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Словари:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Список языков для проверки орфографии через запятую, например, «en_US,ru»" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Навигация" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Приложения" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Внешние приложения" #. Page "Network" -#: ../midori/midori-preferences.c:485 -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Адрес" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:521 -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "дней" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Очистить" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Добавление средства поиска" @@ -2121,6 +2033,10 @@ msgstr "Использовать _по умолчанию" msgid "_Bookmark" msgstr "_Закладка" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Закладки" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Добавить закладку" @@ -2186,8 +2102,7 @@ msgstr "Подсветить совпадения" msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../toolbars/midori-transferbar.c:88 -#: ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s из %s" @@ -2201,46 +2116,44 @@ msgstr "Файл «%s» загружен." msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:257 -#: ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Убрать завершённые" -#: ../toolbars/midori-transferbar.c:278 -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Некоторые файлы загружаются" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "В_ыйти из Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:110 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:216 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:409 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:417 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:431 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Разделитель" @@ -2260,19 +2173,19 @@ msgstr "Копировать все" msgid "Extensions" msgstr "Дополнения" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Некорректное время" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "The clock time lies in the past. Please check the current date and time." msgstr "Дата находится в прошлом. Проверьте системное время." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2280,31 +2193,37 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Вчера" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не удалось выполнить запрос к базе данных: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:445 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:454 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:462 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Фильтр:" @@ -2355,18 +2274,16 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:498 -#: ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:544 -#: ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Выберите папку" @@ -2404,11 +2321,11 @@ msgstr "Бл_окировать изображение" msgid "Bl_ock link" msgstr "Бл_окировать ссылку" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" @@ -2430,8 +2347,7 @@ msgstr "Стили пользователя" msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" -#: ../extensions/addons.c:1086 -#: ../extensions/addons.c:1253 +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" msgstr "Пользовательские дополнения" @@ -2559,6 +2475,16 @@ msgstr "Скопировать адреса вкладок" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копирует адреса всех вкладок в буфер обмена" +#: ../extensions/external-applications.vala:93 +#, fuzzy +msgid "External Applications" +msgstr "Внешние приложения" + +#: ../extensions/external-applications.vala:94 +#, fuzzy +msgid "Associate URL schemes with external commands" +msgstr "Ассоциировать схемы ссылок с внешними командами" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." @@ -2643,28 +2569,57 @@ msgstr "Панель лент новостей" msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Не удалось добавить значение: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Файлы ресурсов не установлены" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "История форм ввода" +#: ../extensions/history-list.vala:174 +#, fuzzy +msgid "Next Tab (History List)" +msgstr "Следующая вкладка (Список истории)" + +#: ../extensions/history-list.vala:175 +#, fuzzy +msgid "Next tab from history" +msgstr "Следующая вкладка из истории\n" + +#: ../extensions/history-list.vala:184 +#, fuzzy +msgid "Previous Tab (History List)" +msgstr "Предыдущая вкладка (Список истории)" + +#: ../extensions/history-list.vala:185 +#, fuzzy +msgid "Previous tab from history" +msgstr "Предыдущая вкладка из истории" + +#: ../extensions/history-list.vala:245 +#, fuzzy +msgid "History List" +msgstr "История вкладок" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Отображает список вкладок в порядке времени последнего использования" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Жесты мышью" @@ -2674,8 +2629,7 @@ msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Контейнер" @@ -2703,6 +2657,16 @@ msgstr "Комбинации клавиш" msgid "View and edit keyboard shortcuts" msgstr "Просмотр и изменение «горячих клавиш»" +#: ../extensions/status-clock.c:176 +#, fuzzy +msgid "Statusbar Clock" +msgstr "Панель состояния" + +#: ../extensions/status-clock.c:177 +#, fuzzy +msgid "Display date and time in the statusbar" +msgstr "Показывать дату и время в строке статуса" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Изображения" @@ -2723,8 +2687,7 @@ msgstr "Настройка возможностей" msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:568 -#: ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Панель вкладок" @@ -2736,14 +2699,6 @@ msgstr "П_анель вкладок" msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "История вкладок" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Отображает список вкладок в порядке времени последнего использования" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Сворачивать новые вкладки" @@ -2784,17 +2739,17 @@ msgstr "Простой редактор панели инструментов" msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" +#~ msgid "Show the saved bookmarks" +#~ msgstr "Показать все сохранённые закладки" + #~ msgid "Set number of shortcuts" #~ msgstr "Установить число закладок" #~ msgid "Enter number of shortcuts:" #~ msgstr "Введите число закладок:" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "Установленными считаются пользовательские сценарии, расположенные в «%s» " -#~ "и стили, расположенные в «%s»." +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Установленными считаются пользовательские сценарии, расположенные в «%s» и стили, расположенные в «%s»." #~ msgid "Open _Link" #~ msgstr "_Открыть ссылку" @@ -3034,15 +2989,9 @@ msgstr "Кэширует принятые данные (HTTP) на диске" #~ msgid "The current tab" #~ msgstr "Данная вкладка" -#~ msgid "Statusbar" -#~ msgstr "Панель состояния" - #~ msgid "The statusbar" #~ msgstr "Панель состояния" -#~ msgid "The text that is displayed in the statusbar" -#~ msgstr "Текст отображаемый во вкладке статуса" - #~ msgid "The list of search engines to be used for web search" #~ msgstr "Список средств поиска используемые для поиска в сети" From aaa831d0c31da41c757611cddc7fde21b8438e5e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 22:35:20 +0200 Subject: [PATCH 2807/2970] Update German translation --- po/de.po | 829 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 430 insertions(+), 399 deletions(-) diff --git a/po/de.po b/po/de.po index bfa042f3..3bfdd606 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-19 15:34+0200\n" +"POT-Creation-Date: 2010-07-04 13:21+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 #: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -47,7 +47,7 @@ msgstr "Wert »%s« ist ungültig für %s" msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" @@ -111,244 +111,244 @@ msgstr "Die letzte _Sitzung zurücksetzen" msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Datei nicht gefunden." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Unbekanntes Lesezeichenformat." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:339 ../midori/midori-browser.c:5391 -#: ../midori/midori-browser.c:5397 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4967 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:349 ../midori/midori-browser.c:5394 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:463 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:515 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:736 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:736 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:738 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:740 +#: ../midori/midori-browser.c:738 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:771 +#: ../midori/midori-browser.c:769 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:837 ../midori/midori-browser.c:4547 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:847 ../midori/midori-browser.c:949 -#: ../midori/midori-browser.c:4552 ../midori/midori-browser.c:4584 +#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 +#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:879 msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:894 +#: ../midori/midori-browser.c:892 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:909 +#: ../midori/midori-browser.c:907 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:1003 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen." -#: ../midori/midori-browser.c:1007 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Die Datei benötigt %s, aber nur %s sind übrig." -#: ../midori/midori-browser.c:1064 ../midori/midori-browser.c:4602 -#: ../midori/midori-browser.c:4634 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 +#: ../midori/midori-browser.c:4204 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1457 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2195 +#: ../midori/midori-browser.c:2155 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2273 +#: ../midori/midori-browser.c:2233 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -357,151 +357,141 @@ msgid "" "automatically." msgstr "" -#: ../midori/midori-browser.c:2279 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2322 ../midori/midori-browser.c:5456 -#: ../panels/midori-bookmarks.c:434 +#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 +#: ../panels/midori-bookmarks.c:401 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:2895 ../panels/midori-bookmarks.c:209 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" - -#: ../midori/midori-browser.c:2975 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Leer" - -#: ../midori/midori-browser.c:3593 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/midori-browser.c:3907 ../midori/midori-browser.c:5850 +#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:4240 ../panels/midori-bookmarks.c:792 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:4247 ../panels/midori-bookmarks.c:798 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:4250 ../panels/midori-bookmarks.c:800 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4473 +#: ../midori/midori-browser.c:4051 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4052 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4053 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4476 +#: ../midori/midori-browser.c:4054 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4055 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4498 +#: ../midori/midori-browser.c:4079 msgid "Import bookmarks..." msgstr "Lesezeichen importieren..." -#: ../midori/midori-browser.c:4501 ../midori/midori-browser.c:5461 +#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:4512 +#: ../midori/midori-browser.c:4093 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4539 ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 #: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:4613 +#: ../midori/midori-browser.c:4181 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4649 +#: ../midori/midori-browser.c:4219 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" -#: ../midori/midori-browser.c:4703 ../panels/midori-bookmarks.c:283 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4380 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:4384 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4398 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:4839 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4415 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4420 msgid "'Flash' Cookies" msgstr "»Flash« Cookies" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4425 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:4860 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-browser.c:4865 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Zwischenspeicher" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4443 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4544 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4546 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -513,521 +503,488 @@ msgstr "" "veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " "2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4565 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:4874 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:5306 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-browser.c:5307 +#: ../midori/midori-browser.c:4877 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:5310 +#: ../midori/midori-browser.c:4880 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:4882 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:5313 +#: ../midori/midori-browser.c:4883 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:4887 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:5320 +#: ../midori/midori-browser.c:4890 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:5322 +#: ../midori/midori-browser.c:4892 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:5323 +#: ../midori/midori-browser.c:4893 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:4895 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:5326 +#: ../midori/midori-browser.c:4896 msgid "Add shortcut to the desktop" msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" -#: ../midori/midori-browser.c:5328 +#: ../midori/midori-browser.c:4898 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:4899 msgid "Subscribe to this news feed" msgstr "Diese Nachrichtenquelle abonnieren" -#: ../midori/midori-browser.c:5334 +#: ../midori/midori-browser.c:4904 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:4905 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:5337 +#: ../midori/midori-browser.c:4907 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:4908 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:4911 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:4914 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:5346 +#: ../midori/midori-browser.c:4916 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:4920 msgid "Undo the last modification" msgstr "Letzte Änderung rückgängig machen" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:4923 msgid "Redo the last modification" msgstr "Die letzte Ä_nderung rückgängig machen" -#: ../midori/midori-browser.c:5357 +#: ../midori/midori-browser.c:4927 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:5360 ../midori/midori-browser.c:5363 +#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:5366 +#: ../midori/midori-browser.c:4936 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:5369 +#: ../midori/midori-browser.c:4939 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:4942 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:4945 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:5377 +#: ../midori/midori-browser.c:4947 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:5378 +#: ../midori/midori-browser.c:4948 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:4950 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:5381 +#: ../midori/midori-browser.c:4951 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:5385 +#: ../midori/midori-browser.c:4955 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:5387 +#: ../midori/midori-browser.c:4957 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:4958 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:5400 +#: ../midori/midori-browser.c:4970 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:4973 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:4976 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:5407 +#: ../midori/midori-browser.c:4977 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:5409 +#: ../midori/midori-browser.c:4979 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:5410 +#: ../midori/midori-browser.c:4980 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:5413 +#: ../midori/midori-browser.c:4983 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:5416 +#: ../midori/midori-browser.c:4986 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:5417 +#: ../midori/midori-browser.c:4987 msgid "Scroll to the left" msgstr "Nach links rollen" -#: ../midori/midori-browser.c:5419 +#: ../midori/midori-browser.c:4989 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:5420 +#: ../midori/midori-browser.c:4990 msgid "Scroll down" msgstr "Herunter rollen" -#: ../midori/midori-browser.c:5422 +#: ../midori/midori-browser.c:4992 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:5423 +#: ../midori/midori-browser.c:4993 msgid "Scroll up" msgstr "Hoch rollen" -#: ../midori/midori-browser.c:5425 +#: ../midori/midori-browser.c:4995 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:5426 +#: ../midori/midori-browser.c:4996 msgid "Scroll to the right" msgstr "Nach rechts rollen" -#: ../midori/midori-browser.c:5429 +#: ../midori/midori-browser.c:4999 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:5432 +#: ../midori/midori-browser.c:5002 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:5435 +#: ../midori/midori-browser.c:5005 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5439 +#: ../midori/midori-browser.c:5009 msgid "Go to the previous sub-page" msgstr "Gehe zur voherigen Unterseite zurück" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5443 +#: ../midori/midori-browser.c:5013 msgid "Go to the next sub-page" msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:5446 +#: ../midori/midori-browser.c:5016 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:5448 +#: ../midori/midori-browser.c:5018 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:5449 +#: ../midori/midori-browser.c:5019 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:5451 +#: ../midori/midori-browser.c:5021 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:5452 +#: ../midori/midori-browser.c:5022 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:5458 +#: ../midori/midori-browser.c:5028 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:5459 +#: ../midori/midori-browser.c:5029 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:5464 +#: ../midori/midori-browser.c:5034 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:5467 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:5468 +#: ../midori/midori-browser.c:5038 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:5471 +#: ../midori/midori-browser.c:5041 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5472 +#: ../midori/midori-browser.c:5042 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:5476 +#: ../midori/midori-browser.c:5046 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:5477 +#: ../midori/midori-browser.c:5047 msgid "Inspect page details and access developer tools..." msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." -#: ../midori/midori-browser.c:5482 +#: ../midori/midori-browser.c:5052 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:5483 +#: ../midori/midori-browser.c:5053 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:5485 +#: ../midori/midori-browser.c:5055 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:5486 +#: ../midori/midori-browser.c:5056 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:5058 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokusieren" -#: ../midori/midori-browser.c:5489 +#: ../midori/midori-browser.c:5059 msgid "Focus the current tab" msgstr "Den aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:5061 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:5062 msgid "Open the tabs saved in the last session" msgstr "In der letzten Sitzung geöffnete Reiter öffnen" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:5064 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:5066 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:5067 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:5069 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:5070 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:5072 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:5073 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:5076 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:5084 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:5085 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5088 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:5089 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:5092 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5523 +#: ../midori/midori-browser.c:5093 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5096 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:5097 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5100 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:5531 +#: ../midori/midori-browser.c:5101 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:5104 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5105 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:5113 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5546 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:5120 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5553 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5556 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5559 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5562 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:6107 +#: ../midori/midori-browser.c:5662 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:6114 +#: ../midori/midori-browser.c:5669 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:6116 +#: ../midori/midori-browser.c:5671 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:6140 +#: ../midori/midori-browser.c:5695 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:6142 +#: ../midori/midori-browser.c:5697 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:6163 +#: ../midori/midori-browser.c:5718 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:6178 +#: ../midori/midori-browser.c:5733 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:6180 +#: ../midori/midori-browser.c:5735 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:6195 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Lesezeichen" - -#: ../midori/midori-browser.c:6197 -msgid "Show the saved bookmarks" -msgstr "Die gespeicherten Lesezeichen anzeigen" - -#: ../midori/midori-browser.c:6212 +#: ../midori/midori-browser.c:5750 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:6225 +#: ../midori/midori-browser.c:5763 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:6227 +#: ../midori/midori-browser.c:5765 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:6241 +#: ../midori/midori-browser.c:5779 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:6243 +#: ../midori/midori-browser.c:5781 msgid "Menu" msgstr "Menü" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6450 -msgid "_Inline Find:" -msgstr "_Inkrementelle Suche:" - -#: ../midori/midori-browser.c:6481 -msgid "Previous" -msgstr "Zurück" - -#: ../midori/midori-browser.c:6486 -msgid "Next" -msgstr "Weiter" - -#: ../midori/midori-browser.c:6491 -msgid "Match Case" -msgstr "Groß-/ Kleinschreibung" - -#: ../midori/midori-browser.c:6500 -msgid "Highlight Matches" -msgstr "Treffer hervorheben" - -#: ../midori/midori-browser.c:6512 -msgid "Close Findbar" -msgstr "Suchleiste schließen" - -#: ../midori/midori-browser.c:6908 +#: ../midori/midori-browser.c:6358 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -1074,7 +1031,7 @@ msgstr "Leiste schließen" msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Bedienelemente anzeigen" @@ -1154,7 +1111,7 @@ msgstr "Alle Profildateien" msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 msgid "None" msgstr "Keine" @@ -1683,337 +1640,337 @@ msgstr "Zum Löschen ausgewählte private Daten" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Erneut versuchen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Element _untersuchen" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Verweis in _Vordergrund-Reiter öffnen" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Verweis in _Hintergrund-Reiter öffnen" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Verweis als _Internetanwendung öffnen" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "Verweisziel k_opieren" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Bild_adresse kopieren" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Bild herunterla_den" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Anzahl Spalten und Zeilen ändern" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Anzahl an Spalten und Zeilen eingeben:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Ungültige Eingabe für die Größe der Schnellwahl" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Vorschaubildgröße:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Klein" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Mittel" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Groß" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Laden der Seite verzögert" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Laden der Seite wegen eines Absturzes oder Einstellung verzögert" -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Seite laden" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "Reiter _wiederherstellen" -#: ../midori/midori-view.c:4105 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "Reiter _minimieren" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-view.c:4797 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:4798 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Inhalte" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Übertragungen" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Dicktengleiche Schriftart" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Die Schriftgröße, in der dicktengleicher Text angezeigt wird" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "96 Punkte pro Zoll erzwingen" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Eine Punktdichte von 96 DPI erzwingen" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Skripte können Aufklappfenster öffnen" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Skripte können selbstständig neue Fenster öffnen" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Rechtschreibprüfung" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Rechtschreibprüfung einschalten" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Rechtschreibprüfung beim Eintippen einschalten" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Rechtschreibwörterbücher" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" @@ -2022,49 +1979,53 @@ msgstr "" "Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Anwendungen" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Externe Anwendungen" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Rechnername" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "Tage" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Leer" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" @@ -2097,6 +2058,10 @@ msgstr "Als _Standard" msgid "_Bookmark" msgstr "_Lesezeichen" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Lesezeichen" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" @@ -2137,6 +2102,31 @@ msgstr "Netscape-Module" msgid "New _Folder" msgstr "Neuer _Ordner" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Inkrementelle Suche:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Zurück" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Weiter" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Groß-/ Kleinschreibung" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Treffer hervorheben" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Suchleiste schließen" + #: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" @@ -2155,40 +2145,40 @@ msgstr "Übertragung abgeschlossen" msgid "Clear All" msgstr "Alle entfernen" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Einige Dateien werden gerade heruntergeladen." -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "Midori _beenden" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:110 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:256 +#: ../panels/midori-bookmarks.c:216 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n" -#: ../panels/midori-bookmarks.c:442 +#: ../panels/midori-bookmarks.c:409 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:450 +#: ../panels/midori-bookmarks.c:417 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:463 +#: ../panels/midori-bookmarks.c:431 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:597 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Trennlinie" @@ -2208,53 +2198,59 @@ msgstr "Alle kopieren" msgid "Extensions" msgstr "Erweiterungen" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Fehlerhafte Uhrzeit" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "" "The clock time lies in the past. Please check the current date and time." msgstr "" "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das " "eingestellte Datum und die Uhrzeit." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Vor %d Tag" msgstr[1] "Vor %d Tagen" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Gestern" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:445 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:454 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:462 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:952 +#: ../panels/midori-history.c:953 #: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filter:" @@ -2305,16 +2301,16 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -2357,11 +2353,11 @@ msgstr "Bild bloc_kieren" msgid "Bl_ock link" msgstr "Verweis blo_ckieren" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Werbeblocker" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" @@ -2521,6 +2517,14 @@ msgstr "Adressen aller Reiter kopieren" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Die Adressen aller Reiter in die Zwischenablage kopieren" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Externe Anwendungen" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "URL-Schemata mit Anwendungen verknüpfen" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2609,28 +2613,52 @@ msgstr "Nachrichtenquellenleiste" msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Formularfeld konnte nicht hinzugefügt werden: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Speichert zuvor eingegebene Formulareingaben" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Nicht verfügbar: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Konfigurationsdateien nicht installiert" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Formularvervollständigung" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Nächster Reiter (Verlaufsgestützte Liste)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Nächster Reiter aus dem Verlauf" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Voheriger Reiter (Verlaufsgestützte Liste)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Voheriger Reiter aus dem Verlauf" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Verlaufsgestützte Liste" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Reiter anhand einer nach Nutzung sortierten Liste wechseln" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Mausgesten" @@ -2668,6 +2696,14 @@ msgstr "Tastaturkürzel" msgid "View and edit keyboard shortcuts" msgstr "Tastaturkürzel ansehen und bearbeiten" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Uhr in der Statusbar" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Datum und Zeit in der Statusbar anzeigen" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Bilder" @@ -2700,19 +2736,11 @@ msgstr "_Reiterleiste" msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Verlaufsgestützte Reiterliste" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Reiter anhand einer nach Nutzung sortierten Liste wechseln" - -#: ../extensions/tabs-minimized.c:72 +#: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Neue Reiter minimieren" -#: ../extensions/tabs-minimized.c:73 +#: ../extensions/tabs-minimized.c:80 msgid "New tabs open minimized" msgstr "Neue Reiter werden minimiert geöffnet" @@ -2752,6 +2780,9 @@ msgstr "Werkzeugleisten leicht anpassen" msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" +#~ msgid "Show the saved bookmarks" +#~ msgstr "Die gespeicherten Lesezeichen anzeigen" + #~ msgid "Set number of shortcuts" #~ msgstr "Anzahl Verknüpfungen ändern" From 9ed9cebe92f8e6a0fc234a841f9e84baa714bda7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 22:41:01 +0200 Subject: [PATCH 2808/2970] Add 'Panel' menu item to compact menu button --- midori/midori-browser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a9d2e709..b7118874 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2975,6 +2975,7 @@ _action_compact_menu_populate_popup (GtkAction* action, #else { "Print" }, { NULL }, + { "Panel" }, { "-" }, { "ClearPrivateData" }, #if WEBKIT_CHECK_VERSION (1, 1, 17) From fefd9fd8504619f21861dc48b2c47b2e6a202041 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 22:54:27 +0200 Subject: [PATCH 2809/2970] Remove "RecentlyVisited" action from the menubar --- midori/midori-browser.c | 142 +--------------------------------------- 1 file changed, 1 insertion(+), 141 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b7118874..ceb3e704 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -212,12 +212,6 @@ midori_search_action_get_icon (KatzeItem* item, GtkWidget* widget, const gchar** icon_name); -static gboolean -_action_menus_activate_item_alt (GtkAction* action, - KatzeItem* item, - guint button, - MidoriBrowser* browser); - static void midori_browser_add_speed_dial (MidoriBrowser* browser); @@ -2563,7 +2557,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser) static const gchar* actions[] = { "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", "Fullscreen", "Preferences", "Window", - "RecentlyVisited", "ReloadStop", "ZoomIn", "TabClose", + "ReloadStop", "ZoomIn", "TabClose", "ZoomOut", "Separator", "Back", "Forward", "Homepage", "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL }; @@ -2714,83 +2708,6 @@ _action_trash_activate_item_alt (GtkAction* action, return FALSE; } -static void -midori_browser_menu_item_activate_cb (GtkWidget* menuitem, - MidoriBrowser* browser) -{ - KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - midori_browser_set_current_uri (browser, katze_item_get_uri (item)); -} - -static gboolean -midori_browser_menu_item_button_press_cb (GtkWidget* menuitem, - GdkEventButton* event, - MidoriBrowser* browser) -{ - KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - return _action_menus_activate_item_alt (NULL, item, event->button, browser); -} - -static void -_action_history_populate_popup (GtkAction* action, - GtkMenu* menu, - MidoriBrowser* browser) -{ - sqlite3* db; - const gchar* sqlcmd; - KatzeArray* array; - KatzeItem* item; - gint i = 0; - - db = g_object_get_data (G_OBJECT (browser->history), "db"); - sqlcmd = "SELECT uri, title, date FROM history " - "GROUP BY uri ORDER BY date ASC LIMIT 10"; - array = katze_array_from_sqlite (db, sqlcmd); - - while ((item = katze_array_get_nth_item (KATZE_ARRAY (array), i))) - { - GtkWidget* menuitem; - GdkPixbuf* icon; - GtkWidget* image; - const gchar* uri; - const gchar* title; - - uri = katze_item_get_uri (item); - title = katze_item_get_name (item); - menuitem = katze_image_menu_item_new_ellipsized ((gchar*)title); - icon = katze_load_cached_icon ((gchar*)uri, GTK_WIDGET (browser)); - image = gtk_image_new_from_pixbuf (icon); - g_object_unref (icon); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - #if GTK_CHECK_VERSION (2, 16, 0) - gtk_image_menu_item_set_always_show_image ( - GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - #endif - g_object_set_data_full (G_OBJECT (menuitem), "KatzeItem", - item, (GDestroyNotify)g_object_unref); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - gtk_widget_show (menuitem); - - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_menu_item_activate_cb), browser); - g_signal_connect (menuitem, "button-press-event", - G_CALLBACK (midori_browser_menu_item_button_press_cb), browser); - g_signal_connect (menuitem, "select", - G_CALLBACK (midori_browser_menu_item_select_cb), browser); - g_signal_connect (menuitem, "deselect", - G_CALLBACK (midori_browser_menu_item_deselect_cb), browser); - i++; - } -} - -static void -_action_history_activate_item (GtkAction* action, - KatzeItem* item, - MidoriBrowser* browser) -{ - midori_browser_set_current_uri (browser, katze_item_get_uri (item)); -} - /* static */ void midori_browser_open_bookmark (MidoriBrowser* browser, KatzeItem* item) @@ -2880,30 +2797,6 @@ midori_browser_bookmark_popup (GtkWidget* widget, KatzeItem* item, MidoriBrowser* browser); -static gboolean -_action_menus_activate_item_alt (GtkAction* action, - KatzeItem* item, - guint button, - MidoriBrowser* browser) -{ - if (button == 2) - { - gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - else if (button == 3) - { - GdkEvent* event = gtk_get_current_event (); - midori_browser_bookmark_popup (gtk_get_event_widget (event), - (GdkEventButton*)event, item, browser); - return TRUE; - } - - return FALSE; -} - static void _action_window_populate_popup (GtkAction* action, GtkMenu* menu, @@ -5311,7 +5204,6 @@ static const gchar* ui_markup = "" "" "" - "" "" "" "" @@ -5411,16 +5303,6 @@ midori_browser_new_history_item (MidoriBrowser* browser, #endif } -static void -midori_browser_history_remove_item_cb (KatzeArray* folder, - KatzeItem* item, - MidoriBrowser* browser) -{ - GtkAction* action = _action_by_name (browser, "RecentlyVisited"); - if ((KatzeArray*)item == katze_array_action_get_array (KATZE_ARRAY_ACTION (action))) - g_object_set (action, "array", NULL, NULL); -} - static void midori_browser_history_clear_cb (KatzeArray* history, MidoriBrowser* browser) @@ -5446,16 +5328,11 @@ midori_browser_set_history (MidoriBrowser* browser, if (history) g_object_ref (history); katze_object_assign (browser->history, history); - g_object_set (_action_by_name (browser, "RecentlyVisited"), - "array", history, NULL); - midori_browser_history_clear_cb (history, browser); if (!history) return; - g_signal_connect (browser->history, "remove-item", - G_CALLBACK (midori_browser_history_remove_item_cb), browser); g_signal_connect (browser->history, "clear", G_CALLBACK (midori_browser_history_clear_cb), browser); @@ -5729,23 +5606,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); - action = g_object_new (KATZE_TYPE_ARRAY_ACTION, - "name", "RecentlyVisited", - "label", _("_Recently visited pages"), - "stock-id", STOCK_HISTORY, - "tooltip", _("Reopen pages that you visited earlier"), - NULL); - g_object_connect (action, - "signal::populate-popup", - _action_history_populate_popup, browser, - "signal::activate-item", - _action_history_activate_item, browser, - "signal::activate-item-alt", - _action_menus_activate_item_alt, browser, - NULL); - gtk_action_group_add_action_with_accel (browser->action_group, action, ""); - g_object_unref (action); - action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Tools", "label", _("_Tools"), From d6d1cd21a9a7b957ca1acde17971a09ed7042ce7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 23:10:44 +0200 Subject: [PATCH 2810/2970] Remove settings Original Cookies, Last visited pages, Autodetect proxy --- midori/main.c | 2 +- midori/midori-websettings.c | 76 ------------------------------------- 2 files changed, 1 insertion(+), 77 deletions(-) diff --git a/midori/main.c b/midori/main.c index f0e4d781..9da5df2d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -828,7 +828,7 @@ midori_soup_session_prepare (SoupSession* session, soup_session_settings_notify_http_proxy_cb (settings, NULL, session); g_signal_connect (settings, "notify::http-proxy", G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session); - g_signal_connect (settings, "notify::auto-detect-proxy", + g_signal_connect (settings, "notify::proxy-type", G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session); #if !WEBKIT_CHECK_VERSION (1, 1, 11) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 4102bf2b..122f0a0c 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -65,7 +65,6 @@ struct _MidoriWebSettings gboolean remember_last_visited_pages : 1; gboolean remember_last_downloaded_files : 1; MidoriProxy proxy_type : 2; - gboolean auto_detect_proxy : 1; MidoriIdentity identify_as : 3; gint last_window_width; @@ -159,16 +158,13 @@ enum PROP_FIND_WHILE_TYPING, PROP_KINETIC_SCROLLING, PROP_ACCEPT_COOKIES, - PROP_ORIGINAL_COOKIES_ONLY, PROP_MAXIMUM_COOKIE_AGE, - PROP_REMEMBER_LAST_VISITED_PAGES, PROP_MAXIMUM_HISTORY_AGE, PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_PROXY_TYPE, PROP_HTTP_PROXY, - PROP_AUTO_DETECT_PROXY, PROP_IDENTIFY_AS, PROP_USER_AGENT, PROP_PREFERRED_LANGUAGES, @@ -971,22 +967,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) MIDORI_ACCEPT_COOKIES_ALL, flags)); - /** - * MidoriWebSettings:original-cookies-only: - * - * Accept cookies from the original website only. - * - * Deprecated: 0.2.3: This value is not used. - */ - g_object_class_install_property (gobject_class, - PROP_ORIGINAL_COOKIES_ONLY, - g_param_spec_boolean ( - "original-cookies-only", - _("Original cookies only"), - _("Accept cookies from the original website only"), - FALSE, - flags)); - g_object_class_install_property (gobject_class, PROP_MAXIMUM_COOKIE_AGE, g_param_spec_int ( @@ -997,23 +977,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); - - /** - * MidoriWebSettings:remember-last-visited-pages: - * - * Whether the last visited pages are saved. - * - * Deprecated: 0.2.2 - */ - g_object_class_install_property (gobject_class, - PROP_REMEMBER_LAST_VISITED_PAGES, - g_param_spec_boolean ( - "remember-last-visited-pages", - _("Remember last visited pages"), - _("Whether the last visited pages are saved"), - TRUE, - flags)); - g_object_class_install_property (gobject_class, PROP_MAXIMUM_HISTORY_AGE, g_param_spec_int ( @@ -1060,22 +1023,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) NULL, flags)); - /** - * MidoriWebSettings:auto-detect-proxy: - * - * Whether to detect the proxy server automatically from the environment - * - * Deprecated: 0.2.5 - */ - g_object_class_install_property (gobject_class, - PROP_AUTO_DETECT_PROXY, - g_param_spec_boolean ( - "auto-detect-proxy", - _("Detect proxy server automatically"), - _("Whether to detect the proxy server automatically from the environment"), - TRUE, - flags)); - /** * MidoriWebSettings:identify-as: * @@ -1184,7 +1131,6 @@ midori_web_settings_init (MidoriWebSettings* web_settings) web_settings->open_popups_in_tabs = TRUE; web_settings->remember_last_downloaded_files = TRUE; web_settings->kinetic_scrolling = TRUE; - web_settings->auto_detect_proxy = TRUE; g_signal_connect (web_settings, "notify::default-encoding", G_CALLBACK (notify_default_encoding_cb), NULL); @@ -1506,16 +1452,10 @@ midori_web_settings_set_property (GObject* object, case PROP_ACCEPT_COOKIES: web_settings->accept_cookies = g_value_get_enum (value); break; - case PROP_ORIGINAL_COOKIES_ONLY: - web_settings->original_cookies_only = g_value_get_boolean (value); - break; case PROP_MAXIMUM_COOKIE_AGE: web_settings->maximum_cookie_age = g_value_get_int (value); break; - case PROP_REMEMBER_LAST_VISITED_PAGES: - web_settings->remember_last_visited_pages = g_value_get_boolean (value); - break; case PROP_MAXIMUM_HISTORY_AGE: web_settings->maximum_history_age = g_value_get_int (value); break; @@ -1525,17 +1465,10 @@ midori_web_settings_set_property (GObject* object, case PROP_PROXY_TYPE: web_settings->proxy_type = g_value_get_enum (value); - web_settings->auto_detect_proxy = - web_settings->proxy_type == MIDORI_PROXY_AUTOMATIC - ? TRUE : FALSE; - g_object_notify (object, "auto-detect-proxy"); break; case PROP_HTTP_PROXY: katze_assign (web_settings->http_proxy, g_value_dup_string (value)); break; - case PROP_AUTO_DETECT_PROXY: - web_settings->auto_detect_proxy = g_value_get_boolean (value); - break; case PROP_IDENTIFY_AS: web_settings->identify_as = g_value_get_enum (value); if (web_settings->identify_as != MIDORI_IDENT_CUSTOM) @@ -1757,16 +1690,10 @@ midori_web_settings_get_property (GObject* object, case PROP_ACCEPT_COOKIES: g_value_set_enum (value, web_settings->accept_cookies); break; - case PROP_ORIGINAL_COOKIES_ONLY: - g_value_set_boolean (value, web_settings->original_cookies_only); - break; case PROP_MAXIMUM_COOKIE_AGE: g_value_set_int (value, web_settings->maximum_cookie_age); break; - case PROP_REMEMBER_LAST_VISITED_PAGES: - g_value_set_boolean (value, web_settings->remember_last_visited_pages); - break; case PROP_MAXIMUM_HISTORY_AGE: g_value_set_int (value, web_settings->maximum_history_age); break; @@ -1780,9 +1707,6 @@ midori_web_settings_get_property (GObject* object, case PROP_HTTP_PROXY: g_value_set_string (value, web_settings->http_proxy); break; - case PROP_AUTO_DETECT_PROXY: - g_value_set_boolean (value, web_settings->auto_detect_proxy); - break; case PROP_IDENTIFY_AS: g_value_set_enum (value, web_settings->identify_as); break; From 8c784e7486523e5b3008d1abf2c8f3b25b6a3f7f Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 3 Jul 2010 01:47:41 -0400 Subject: [PATCH 2811/2970] Implement search in the bookmark panel --- panels/midori-bookmarks.c | 112 ++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 11 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 1c2bd74c..e29d3f6a 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -19,12 +19,15 @@ #include "midori-viewable.h" #include "sokoke.h" +#include "gtkiconentry.h" #include #include #include +#define COMPLETION_DELAY 200 + gboolean midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, @@ -45,6 +48,9 @@ struct _MidoriBookmarks GtkWidget* treeview; MidoriApp* app; KatzeArray* array; + + gint filter_timeout; + gchar* filter; }; struct _MidoriBookmarksClass @@ -139,7 +145,8 @@ midori_bookmarks_import_array_db (sqlite3* db, static KatzeArray* midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, - const gchar* folder) + const gchar* folder, + const gchar* keyword) { sqlite3* db; sqlite3_stmt* statement; @@ -148,10 +155,25 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where folder = ?" - " ORDER BY uri DESC"; - result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); - sqlite3_bind_text (statement, 1, g_strdup(folder), -1, g_free); + if (keyword && *keyword) + { + gchar* filterstr; + sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where " + " title like ? ORDER BY uri DESC"; + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); + filterstr = g_strdup_printf ("%%%s%%", keyword); + sqlite3_bind_text (statement, 1, g_strdup (filterstr), -1, g_free); + g_free (filterstr); + } + else + { + if (!folder) + folder = ""; + sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where " + " folder = ? ORDER BY uri DESC"; + result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); + sqlite3_bind_text (statement, 1, g_strdup (folder), -1, g_free); + } if (result != SQLITE_OK) return NULL; @@ -163,18 +185,25 @@ static void midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, GtkTreeStore* model, GtkTreeIter* parent, - const gchar* folder) + const gchar* folder, + const gchar* keyword) { KatzeArray* array; gint last; + KatzeItem* item; GtkTreeIter child; - array = midori_bookmarks_read_from_db (bookmarks, folder); + array = midori_bookmarks_read_from_db (bookmarks, folder, keyword); katze_bookmark_populate_tree_view (array, model, parent); /* Remove invisible dummy row */ last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent); + if (!last) + return; gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (model), &child, parent, last - 1); - gtk_tree_store_remove (model, &child); + gtk_tree_model_get (GTK_TREE_MODEL (model), &child, 0, &item, -1); + if (KATZE_ITEM_IS_SEPARATOR (item)) + gtk_tree_store_remove (model, &child); + g_object_unref (item); } void @@ -474,7 +503,7 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); #if HAVE_SQLITE - midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, ""); + midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "", NULL); g_signal_connect_after (model, "row-changed", G_CALLBACK (midori_bookmarks_row_changed_cb), bookmarks); @@ -659,7 +688,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, KatzeArray* array; guint i = 0; - array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item)); + array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item), NULL); g_return_if_fail (KATZE_IS_ARRAY (array)); while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) { @@ -840,7 +869,7 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview, gtk_tree_model_get (model, iter, 0, &item, -1); #if HAVE_SQLITE midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), - iter, katze_item_get_name (item)); + iter, katze_item_get_name (item), NULL); #endif g_object_unref (item); } @@ -864,15 +893,76 @@ midori_bookmarks_row_collapsed_cb (GtkTreeView *treeview, 0, 0, NULL, -1); } +static gboolean +midori_bookmarks_filter_timeout_cb (gpointer data) +{ + MidoriBookmarks* bookmarks = data; + GtkTreeModel* model; + GtkTreeStore* treestore; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + treestore = GTK_TREE_STORE (model); + + gtk_tree_store_clear (treestore); + midori_bookmarks_read_from_db_to_model (bookmarks, + treestore, NULL, NULL, bookmarks->filter); + + return FALSE; +} + +static void +midori_bookmarks_filter_entry_changed_cb (GtkEntry* entry, + MidoriBookmarks* bookmarks) +{ + if (bookmarks->filter_timeout) + g_source_remove (bookmarks->filter_timeout); + katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry))); + bookmarks->filter_timeout = g_timeout_add (COMPLETION_DELAY, + midori_bookmarks_filter_timeout_cb, bookmarks); +} + +static void +midori_bookmarks_filter_entry_clear_cb (GtkEntry* entry, + gint icon_pos, + gint button, + MidoriBookmarks* bookmarks) +{ + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text (entry, ""); +} + static void midori_bookmarks_init (MidoriBookmarks* bookmarks) { + GtkWidget* entry; + GtkWidget* box; GtkTreeStore* model; GtkWidget* treeview; GtkTreeViewColumn* column; GtkCellRenderer* renderer_pixbuf; GtkCellRenderer* renderer_text; + /* Create the filter entry */ + entry = gtk_icon_entry_new (); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_PRIMARY, + GTK_STOCK_FIND); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, + GTK_STOCK_CLEAR); + gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, TRUE); + g_signal_connect (entry, "icon-release", + G_CALLBACK (midori_bookmarks_filter_entry_clear_cb), bookmarks); + #if HAVE_SQLITE + g_signal_connect (entry, "changed", + G_CALLBACK (midori_bookmarks_filter_entry_changed_cb), bookmarks); + #endif + box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3); + gtk_widget_show_all (box); + gtk_box_pack_start (GTK_BOX (bookmarks), box, FALSE, FALSE, 5); + /* Create the treeview */ model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); From 7f4c4ad2877d382feeb7d3e4339588d4589ffb62 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 3 Jul 2010 01:49:29 -0400 Subject: [PATCH 2812/2970] Match appearence of history and bookmark search --- panels/midori-history.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index f8b0fe2d..2a924696 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -39,7 +39,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, #include #endif -#define COMPLETION_DELAY 150 +#define COMPLETION_DELAY 200 struct _MidoriHistory { @@ -940,9 +940,14 @@ midori_history_init (MidoriHistory* history) /* Create the filter entry */ entry = gtk_icon_entry_new (); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); + GTK_ICON_ENTRY_PRIMARY, + GTK_STOCK_FIND); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), + GTK_ICON_ENTRY_SECONDARY, + GTK_STOCK_CLEAR); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry), - GTK_ICON_ENTRY_SECONDARY, TRUE); + GTK_ICON_ENTRY_SECONDARY, + TRUE); g_signal_connect (entry, "icon-release", G_CALLBACK (midori_history_filter_entry_clear_cb), history); #if HAVE_SQLITE @@ -950,7 +955,6 @@ midori_history_init (MidoriHistory* history) G_CALLBACK (midori_history_filter_entry_changed_cb), history); #endif box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (box), gtk_label_new (_("Filter:")), FALSE, FALSE, 3); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3); gtk_widget_show_all (box); gtk_box_pack_start (GTK_BOX (history), box, FALSE, FALSE, 5); From 76ea968e20c76a0ab22ec921f0642af8d77384e7 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 3 Jul 2010 02:35:55 -0400 Subject: [PATCH 2813/2970] Drop callbacks for cursor-changed and columns-changed We don't have special separators any more, so there is no items that can't be deleted. --- panels/midori-bookmarks.c | 34 ---------------------------------- panels/midori-history.c | 37 ------------------------------------- 2 files changed, 71 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index e29d3f6a..5e907950 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -383,34 +383,6 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, } } -static void -midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView* treeview, - MidoriBookmarks* bookmarks) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - if (!bookmarks->edit) - return; - - if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) - { - gtk_tree_model_get (model, &iter, 0, &item, -1); - - gtk_widget_set_sensitive (bookmarks->edit, !KATZE_ITEM_IS_SEPARATOR (item)); - gtk_widget_set_sensitive (bookmarks->delete, TRUE); - - if (item != NULL) - g_object_unref (item); - } - else - { - gtk_widget_set_sensitive (bookmarks->edit, FALSE); - gtk_widget_set_sensitive (bookmarks->delete, FALSE); - } -} - static GtkWidget* midori_bookmarks_get_toolbar (MidoriViewable* viewable) { @@ -463,8 +435,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - midori_bookmarks_cursor_or_row_changed_cb ( - GTK_TREE_VIEW (bookmarks->treeview), bookmarks); g_signal_connect (bookmarks->edit, "destroy", G_CALLBACK (gtk_widget_destroyed), &bookmarks->edit); g_signal_connect (bookmarks->delete, "destroy", @@ -984,10 +954,6 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) g_object_connect (treeview, "signal::row-activated", midori_bookmarks_row_activated_cb, bookmarks, - "signal::cursor-changed", - midori_bookmarks_cursor_or_row_changed_cb, bookmarks, - "signal::columns-changed", - midori_bookmarks_cursor_or_row_changed_cb, bookmarks, "signal::button-release-event", midori_bookmarks_button_release_event_cb, bookmarks, "signal::key-release-event", diff --git a/panels/midori-history.c b/panels/midori-history.c index 2a924696..83b52b71 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -376,37 +376,6 @@ midori_history_clear_clicked_cb (GtkWidget* toolitem, midori_history_clear_db (history); } - -static void -midori_history_cursor_or_row_changed_cb (GtkTreeView* treeview, - MidoriHistory* history) -{ - GtkTreeModel* model; - GtkTreeIter iter; - KatzeItem* item; - - if (!history->bookmark) - return; - - if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) - { - gboolean is_page; - - gtk_tree_model_get (model, &iter, 0, &item, -1); - - is_page = item && katze_item_get_uri (item); - gtk_widget_set_sensitive (history->bookmark, is_page); - gtk_widget_set_sensitive (history->delete, TRUE); - - if (item) - g_object_unref (item); - } - else - { - gtk_widget_set_sensitive (history->bookmark, FALSE); - gtk_widget_set_sensitive (history->delete, FALSE); - } -} #endif static void @@ -465,8 +434,6 @@ midori_history_get_toolbar (MidoriViewable* viewable) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); history->clear = GTK_WIDGET (toolitem); - midori_history_cursor_or_row_changed_cb ( - GTK_TREE_VIEW (history->treeview), history); g_signal_connect (history->bookmark, "destroy", G_CALLBACK (gtk_widget_destroyed), &history->bookmark); g_signal_connect (history->delete, "destroy", @@ -979,10 +946,6 @@ midori_history_init (MidoriHistory* history) g_object_connect (treeview, "signal::row-activated", midori_history_row_activated_cb, history, - "signal::cursor-changed", - midori_history_cursor_or_row_changed_cb, history, - "signal::columns-changed", - midori_history_cursor_or_row_changed_cb, history, "signal::button-release-event", midori_history_button_release_event_cb, history, "signal::key-release-event", From e70bc2cb752db09a1613d826e896fbc57269361c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 4 Jul 2010 23:59:01 +0200 Subject: [PATCH 2814/2970] Don't try to release references to dummy separator rows --- panels/midori-bookmarks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 5e907950..0a1e7b36 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -203,7 +203,8 @@ midori_bookmarks_read_from_db_to_model (MidoriBookmarks* bookmarks, gtk_tree_model_get (GTK_TREE_MODEL (model), &child, 0, &item, -1); if (KATZE_ITEM_IS_SEPARATOR (item)) gtk_tree_store_remove (model, &child); - g_object_unref (item); + else + g_object_unref (item); } void From 62930be0820a17d114fd5cf1de1212ab967228f1 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 3 Jul 2010 03:28:03 -0400 Subject: [PATCH 2815/2970] Introduce midori_browser_set_current_page_smartly() as public API --- midori/midori-browser.c | 16 ++++++++-------- midori/midori-browser.h | 3 +++ panels/midori-bookmarks.c | 12 ++---------- panels/midori-history.c | 12 ++---------- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ceb3e704..3f3808b0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -425,9 +425,9 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, } } -static void -_midori_browser_set_current_page_smartly (MidoriBrowser* browser, - gint n) +void +midori_browser_set_current_page_smartly (MidoriBrowser* browser, + gint n) { if (!katze_object_get_boolean (browser->settings, "open-tabs-in-the-background")) @@ -2697,7 +2697,7 @@ _action_trash_activate_item_alt (GtkAction* action, n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - _midori_browser_set_current_page_smartly (browser, n); + midori_browser_set_current_page_smartly (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); @@ -3419,7 +3419,7 @@ midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button, g_object_get (browser->settings, "homepage", &homepage, NULL); n = midori_browser_add_uri (browser, homepage); g_free (homepage); - _midori_browser_set_current_page_smartly (browser, n); + midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -3781,7 +3781,7 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget* menuitem, if ((uri = katze_item_get_uri (child)) && *uri) { n = midori_browser_add_item (browser, child); - _midori_browser_set_current_page_smartly (browser, n); + midori_browser_set_current_page_smartly (browser, n); } i++; } @@ -3791,7 +3791,7 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget* menuitem, if ((uri = katze_item_get_uri (item)) && *uri) { n = midori_browser_add_item (browser, item); - _midori_browser_set_current_page_smartly (browser, n); + midori_browser_set_current_page_smartly (browser, n); } } } @@ -6234,7 +6234,7 @@ midori_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, if (katze_item_get_uri (item)) { n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - _midori_browser_set_current_page_smartly (browser, n); + midori_browser_set_current_page_smartly (browser, n); return TRUE; } diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 7129bcc8..7b0d98c0 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -116,6 +116,9 @@ midori_browser_set_current_uri (MidoriBrowser* browser, const gchar* midori_browser_get_current_uri (MidoriBrowser* browser); +void +midori_browser_set_current_page_smartly (MidoriBrowser* browser, + gint n); void midori_browser_set_current_page (MidoriBrowser* browser, gint n); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 0a1e7b36..e27df97e 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -666,14 +666,10 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, if ((uri = katze_item_get_uri (child)) && *uri) { MidoriBrowser* browser; - MidoriWebSettings* settings; browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); n = midori_browser_add_item (browser, child); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (browser, n); - g_object_unref (settings); + midori_browser_set_current_page_smartly (browser, n); } i++; } @@ -681,14 +677,10 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, else if ((uri = katze_item_get_uri (item)) && *uri) { MidoriBrowser* browser; - MidoriWebSettings* settings; browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); n = midori_browser_add_item (browser, item); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (browser, n); - g_object_unref (settings); + midori_browser_set_current_page_smartly (browser, n); } } diff --git a/panels/midori-history.c b/panels/midori-history.c index 83b52b71..bfe469d7 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -655,14 +655,10 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, if ((uri = katze_item_get_uri (child)) && *uri) { MidoriBrowser* browser; - MidoriWebSettings* settings; browser = midori_browser_get_for_widget (GTK_WIDGET (history)); n = midori_browser_add_item (browser, child); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (browser, n); - g_object_unref (settings); + midori_browser_set_current_page_smartly (browser, n); } } } @@ -671,14 +667,10 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, if ((uri = katze_item_get_uri (item)) && *uri) { MidoriBrowser* browser; - MidoriWebSettings* settings; browser = midori_browser_get_for_widget (GTK_WIDGET (history)); n = midori_browser_add_item (browser, item); - settings = katze_object_get_object (browser, "settings"); - if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (browser, n); - g_object_unref (settings); + midori_browser_set_current_page_smartly (browser, n); } } } From 30819851dda65f41309fd785021a4ab10b33b4bd Mon Sep 17 00:00:00 2001 From: Evaggelos Balaskas Date: Mon, 5 Jul 2010 09:34:54 +0200 Subject: [PATCH 2816/2970] l10n: Updated Greek (el) translation to 100% New status: 634 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/el.po | 1111 +++++++++++++++++++++++++++--------------------------- 1 file changed, 547 insertions(+), 564 deletions(-) diff --git a/po/el.po b/po/el.po index 9c6d5b47..85ae82b7 100644 --- a/po/el.po +++ b/po/el.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: midori git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-27 11:52+0300\n" -"PO-Revision-Date: 2010-06-28 19:11+0200\n" +"POT-Creation-Date: 2010-07-05 10:26+0300\n" +"PO-Revision-Date: 2010-07-05 10:29+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "Language: el\n" @@ -25,11 +25,11 @@ msgid "Lightweight web browser" msgstr "Ελαφρύς περιηγητής ιστού" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1298 -#: ../midori/main.c:1628 -#: ../midori/main.c:1636 -#: ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../midori/main.c:1302 +#: ../midori/main.c:1632 +#: ../midori/main.c:1640 +#: ../midori/main.c:1656 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Μιντόρι" @@ -55,7 +55,7 @@ msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" #: ../midori/main.c:370 #: ../midori/main.c:442 -#: ../extensions/formhistory.c:446 +#: ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n" @@ -114,254 +114,254 @@ msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1174 -#: ../midori/main.c:1905 +#: ../midori/main.c:1178 +#: ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Δεν ορίστηκε όνομα αρχείου" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Συνέβη ένα άγνωστο σφάλμα." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Εμφάνιση του διαλόγου διάγνωσης" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Εκτέλεση της συγκεκριμένης εντολής" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "ΜΟΤΙΒΟ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Διευθύνσεις" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "Α_γνόησε" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Το αρχείο δεν βρέθηκε." -#: ../midori/midori-array.c:462 -#: ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 +#: ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Κακοσχηματισμένο έγγραφο." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Άγνωστος τύπος συνδέσμου." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:332 -#: ../midori/midori-browser.c:5033 -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:330 +#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4861 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:342 -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:340 +#: ../midori/midori-browser.c:4858 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:454 #, c-format msgid "%d%% loaded" msgstr "%d%% φορτώθηκε" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:492 #, c-format msgid "Failed to update title: %s\n" msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:777 +#: ../midori/midori-browser.c:776 #: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-browser.c:796 +#: ../midori/midori-browser.c:795 #: ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:830 -#: ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:829 +#: ../midori/midori-browser.c:4022 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:840 -#: ../midori/midori-browser.c:933 -#: ../midori/midori-browser.c:4194 -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:839 +#: ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4027 +#: ../midori/midori-browser.c:4056 msgid "Toplevel folder" msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Προσθήκη στην _γρήγορη σύνδεση" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "Εμφάνιση στην εργαλειο_θήκη" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"." -#: ../midori/midori-browser.c:981 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s." -#: ../midori/midori-browser.c:1038 -#: ../midori/midori-browser.c:4244 -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:1039 +#: ../midori/midori-browser.c:4064 +#: ../midori/midori-browser.c:4098 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1431 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:2133 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2211 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -369,32 +369,18 @@ msgstr "" "Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" "Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, θα προστεθεί αυτόματα." -#: ../midori/midori-browser.c:2217 +#: ../midori/midori-browser.c:2233 #: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Νέα ροή" -#: ../midori/midori-browser.c:2260 -#: ../midori/midori-browser.c:5098 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2276 +#: ../midori/midori-browser.c:4920 +#: ../panels/midori-bookmarks.c:403 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:2729 -#: ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" - -#: ../midori/midori-browser.c:2809 -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Άδειο" - -#: ../midori/midori-browser.c:3416 +#: ../midori/midori-browser.c:3263 #: ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 #: ../midori/sokoke.c:436 @@ -403,641 +389,624 @@ msgstr "Άδειο" msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/midori-browser.c:3693 -#: ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:3529 +#: ../midori/midori-browser.c:5299 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n" -#: ../midori/midori-browser.c:4027 -#: ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:3857 +#: ../panels/midori-bookmarks.c:718 +#: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:4034 -#: ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 +#: ../midori/midori-browser.c:3864 +#: ../panels/midori-bookmarks.c:724 +#: ../panels/midori-history.c:716 #: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:4037 +#: ../midori/midori-browser.c:3867 #: ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4112 -#: ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 +#: ../midori/midori-view.c:4115 +#: ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:718 #: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:3945 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4116 +#: ../midori/midori-browser.c:3946 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:3947 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4118 +#: ../midori/midori-browser.c:3948 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:3949 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:3973 msgid "Import bookmarks..." msgstr "Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4143 -#: ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:3976 +#: ../midori/midori-browser.c:4925 msgid "_Import bookmarks" msgstr "_Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:4154 +#: ../midori/midori-browser.c:3987 msgid "_Application:" msgstr "_Εφαρμογή:" -#: ../midori/midori-browser.c:4181 -#: ../midori/midori-browser.c:5207 -#: ../midori/midori-websettings.c:228 -#: ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4014 +#: ../midori/midori-browser.c:5029 +#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:315 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Προσαρμογή..." -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4075 msgid "Failed to import bookmarks" msgstr "Αποτυχία εισαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4113 msgid "Failed to export bookmarks" msgstr "Αποτυχία εξαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4345 -#: ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4167 +#: ../panels/midori-bookmarks.c:278 +#: ../panels/midori-history.c:142 +#: ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4274 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4278 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4292 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:4481 -#: ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4303 +#: ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Ιστορικό" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4309 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4314 msgid "'Flash' Cookies" msgstr "Άδειασμα των cookies" -#: ../midori/midori-browser.c:4497 +#: ../midori/midori-browser.c:4319 msgid "Website icons" msgstr "Εικονίδια ιστότοπων" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4324 #: ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Κλειστές καρτέλες" -#: ../midori/midori-browser.c:4507 +#: ../midori/midori-browser.c:4329 #: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Προσωρινής μνήμης ιστού" -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:4337 msgid "Clear private data when _quitting Midori" msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori" -#: ../midori/midori-browser.c:4616 +#: ../midori/midori-browser.c:4438 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4440 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4459 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008,2009" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4768 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4770 #: ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Νέο _παράθυρο" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4771 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4774 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:4776 msgid "P_rivate Browsing" msgstr "Π_ροσωπική περιήγηση" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4777 msgid "Don't save any private data while browsing" msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4781 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4784 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4786 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4787 msgid "Add shortcut to speed dial" msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4789 msgid "Add Shortcut to the _desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας" -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4790 msgid "Add shortcut to the desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4792 msgid "Subscribe to News _feed" msgstr "Εγγραφή σε _ροή νέων" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4793 msgid "Subscribe to this news feed" msgstr "Εγγραφή στην ροή νέων" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4798 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4799 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4801 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4802 msgid "Close this window" msgstr "Κλείσιμο αυτού του παραθύρου" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4805 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4808 msgid "Quit the application" msgstr "Έξοδος από την εφαρμογή" -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:4810 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4814 msgid "Undo the last modification" msgstr "Αναίρεση της τελευταίας τροποποίησης" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4817 msgid "Redo the last modification" msgstr "Επανάληψη της τελευταίας τροποποίησης" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4821 msgid "Cut the selected text" msgstr "Αποκοπή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:5002 -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4824 +#: ../midori/midori-browser.c:4827 msgid "Copy the selected text" msgstr "Αντιγραφή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4830 msgid "Paste text from the clipboard" msgstr "Επικόλληση κειμένου από το πρόχειρο" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4833 msgid "Delete the selected text" msgstr "Διαγραφή του επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4836 msgid "Select all text" msgstr "Επιλογή όλου του κειμένου" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4839 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4841 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4842 msgid "Find the next occurrence of a word or phrase" msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4844 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:4845 msgid "Find the previous occurrence of a word or phrase" msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:4849 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4851 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4852 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4864 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:4867 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:4870 msgid "Reset the zoom level" msgstr "Επαναφορά του επιπέδου εστίασης" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4871 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4873 msgid "View So_urce" msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4874 msgid "View the source code of the page" msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4877 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4880 msgid "Scroll _Left" msgstr "Μετακίνηση _αριστερά" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4881 msgid "Scroll to the left" msgstr "Μετακίνηση προς αριστερά" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4883 msgid "Scroll _Down" msgstr "Μετακίνηση _κάτω" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4884 msgid "Scroll down" msgstr "Μετακίνηση κάτω" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:4886 msgid "Scroll _Up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4887 msgid "Scroll up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4889 msgid "Scroll _Right" msgstr "Μετακίνηση _δεξιά" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:4890 msgid "Scroll to the right" msgstr "Μετακίνηση προς τα δεξιά" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:4893 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:4896 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:4899 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:4903 msgid "Go to the previous sub-page" msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:4907 msgid "Go to the next sub-page" msgstr "Μετάβαση στην επόμενη υπό-σελίδα" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:4910 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:4912 msgid "Empty Trash" msgstr "Άδειασμα απορριμμάτων" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:4913 msgid "Delete the contents of the trash" msgstr "Διαγραφή των περιεχομένων των απορριμμάτων" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:4915 msgid "Undo _Close Tab" msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:4916 msgid "Open the last closed tab" msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:4922 msgid "Add a new _folder" msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:4923 msgid "Add a new bookmark folder" msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:4928 msgid "_Export bookmarks" msgstr "_Εξαγωγή συνδέσμων" -#: ../midori/midori-browser.c:5109 +#: ../midori/midori-browser.c:4931 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:4932 msgid "Add, edit and remove search engines..." msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:4935 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:5114 +#: ../midori/midori-browser.c:4936 msgid "Clear private data..." msgstr "Καθαρισμός προσωπικών δεδομένων..." -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:4940 msgid "_Inspect Page" msgstr "_Εξέταση σελίδας" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:4941 msgid "Inspect page details and access developer tools..." msgstr "Εξέταση λεπτομερειών σελίδας και πρόσβαση σε διαχειριστικά εργαλεία ..." -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:4946 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5125 +#: ../midori/midori-browser.c:4947 msgid "Switch to the previous tab" msgstr "Μετάβαση στην προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:4949 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:5128 +#: ../midori/midori-browser.c:4950 msgid "Switch to the next tab" msgstr "Μετάβαση στην επόμενη καρτέλα" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:4952 msgid "Focus _Current Tab" msgstr "Εστίαση στην _ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5131 +#: ../midori/midori-browser.c:4953 msgid "Focus the current tab" msgstr "Εστίαση στην ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:4955 msgid "Open last _session" msgstr "Επαναφορά της τελευταίας _συνεδρίας" -#: ../midori/midori-browser.c:5134 +#: ../midori/midori-browser.c:4956 msgid "Open the tabs saved in the last session" msgstr "Άνοιγμα των καρτελών που αποθηκεύτηκαν κατά την τελευταία συνεδρία" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:4958 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:4960 msgid "_Contents" msgstr "_Περιεχόμενα" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:4961 msgid "Show the documentation" msgstr "Εμφάνιση της τεκμηρίωσης" -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:4963 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:4964 msgid "Show the Frequently Asked Questions" msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:4966 msgid "_Report a Bug" msgstr "Α_ναφορά σφάλματος" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:4967 msgid "Open Midori's bug tracker" msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:4970 msgid "Show information about the program" msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:4978 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:4979 msgid "Show menubar" msgstr "Προβολή μπάρας μενού" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4982 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4983 msgid "Show navigationbar" msgstr "Εμφάνιση περιήγησης" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:4986 msgid "Side_panel" msgstr "Πλαϊνό _πλαίσιο" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:4987 msgid "Show sidepanel" msgstr "Εμφάνιση πλαϊνού πλαισίου" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4990 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:4991 msgid "Show bookmarkbar" msgstr "Εμφάνιση μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:4994 msgid "_Transferbar" msgstr "_Μπάρα μεταφορών" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:4995 msgid "Show transferbar" msgstr "Εμφάνιση μπάρα μεταφορών" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4998 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:4999 msgid "Show statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5007 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:5188 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5010 +#: ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Κινέζικα (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5014 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:5195 -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5017 +#: ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Κορεάτικα (EUC-KR)" -#: ../midori/midori-browser.c:5198 -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5020 +#: ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:5201 -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5023 +#: ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5204 -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5026 +#: ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5540 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5547 msgid "_Location..." msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5549 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5573 msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:5575 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:5596 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:5806 -msgid "_Recently visited pages" -msgstr "_Πρόσφατες επισκεφθείσες σελίδες" - -#: ../midori/midori-browser.c:5808 -msgid "Reopen pages that you visited earlier" -msgstr "Ξανα-άνοιγμα σελίδων που επισκεφτήκατε νωρίτερα" - -#: ../midori/midori-browser.c:5823 -#: ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Σελιδοδείκτες" - -#: ../midori/midori-browser.c:5825 -msgid "Show the saved bookmarks" -msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" - -#: ../midori/midori-browser.c:5840 +#: ../midori/midori-browser.c:5611 msgid "_Tools" msgstr "_Εργαλεία" -#: ../midori/midori-browser.c:5853 +#: ../midori/midori-browser.c:5624 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:5855 +#: ../midori/midori-browser.c:5626 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες" -#: ../midori/midori-browser.c:5869 +#: ../midori/midori-browser.c:5640 msgid "_Menu" msgstr "_Μενού" -#: ../midori/midori-browser.c:5871 +#: ../midori/midori-browser.c:5642 msgid "Menu" msgstr "Μενού" -#: ../midori/midori-browser.c:6455 +#: ../midori/midori-browser.c:6219 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" @@ -1093,602 +1062,578 @@ msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αρι msgid "Hide operating controls" msgstr "Απόκρυψη στοιχείων λειτουργίας" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Εμφάνιση κενής σελίδας" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Εμφάνιση αρχικής σελίδας" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Εμφάνιση των τελευταίων ανοιχτών καρτελών" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Εμφάνιση των τελευταίων καρτέλων χωρίς φόρτωση" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Ιαπωνικά (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Νέο παράθυρο" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Τρέχον καρτέλα" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Προκαθορισμένο" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Εικονίδια" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Μικρά εικονίδια" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Κείμενο" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Εικονίδια με κείμενο" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Κείμενο δίπλα στα εικονίδια" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Αυτόματα (Gnome ή περιβάλλον)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Κανένας διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Όλα τα cookies" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "Cookies συνεδρίας" -#: ../midori/midori-websettings.c:299 -#: ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:295 +#: ../katze/katze-utils.c:668 msgid "None" msgstr "Κανένα" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Πλάτος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Ύψος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Η τελευταία θέση πλαισίου" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "Η τελευταία αποθηκευμένη θέση πλαισίου" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Η τελευταία σελίδα πλαισίου" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "Η τελευταία αποθηκευμένη σελίδα πλαισίου" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Τελευταία αναζήτηση ιστού" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Εμφάνιση γραμμής μενού" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Εάν θα φαίνεται η μπάρα του μενού" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Εμφάνιση της γραμμής πλοήγησης" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Εμφάνιση μπάρας σελιδοδεικτών" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Εάν θα φαίνεται η μπάρα των σελιδοδεικτών" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Εμφάνιση πλαισίου" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Εάν θα φαίνεται το πλαίσιο" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Εμφάνιση μπάρας μεταφορών" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Εάν θα φαίνεται η μπάρα μεταφορών" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Στυλ εργαλειοθήκης:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Να εμφανίζεται η πρόοδος στην τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Εάν θα εμφανίζεται η πρόοδος φόρτωσης στην τοποθεσία εισαγωγής" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Εάν θα φαίνονται οι μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Αντικείμενα εργαλειοθήκης" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Σύμπτυξη πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού πλαισίου" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Εμφάνιση των στοιχείων λειτουργίας στο ταμπλό" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Εάν θα φαίνονται τα στοιχεία λειτουργίας στο ταμπλό" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα δεξιά" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό πλαίσιο στα δεξιά" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Άνοιγμα ταμπλών σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Εάν θα ανοίγουν πάντα τα ταμπλό σε ξεχωριστά παράθυρα" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Κατά την εκκίνηση του midori:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Κατά την εκκίνηση του midori να φορτώνει:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Αρχική σελίδα:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "Η αρχική σελίδα" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Εμφάνιση παραθύρου αποτυχίας" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Εμφάνιση γρήγορης σύνδεσης σε νέες καρτέλες" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Εμφάνιση γρήγορης σύνδεσης στις νέες ανοιχτές καρτέλες" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Αποθήκευση των αρχείων που κατέβηκαν στο:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Ερώτηση για τον κατάλογο αποθήκευσης" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Εάν θα ρωτάει για τον κατάλογο αποθήκευσης όταν κατεβαίνει ένα αρχείο" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Ειδοποίηση όταν μία μεταφορά έχει ολοκληρωθεί" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Εάν θα εμφανίζεται μία ειδοποίηση όταν ολοκληρωθεί μία μεταφορά" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "Εξωτερικός διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Εξωτερικός κειμενογράφος" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Διαχειριστής νέων" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Εξωτερικός διαχειριστής νέων" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Διεύθυνση για αναζήτηση" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτελών" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Άνοιγμα νέων σελίδων σε:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Άνοιγμα εξωτερικών σελίδων σε:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:848 #: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:856 #: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Ενεργοποίηση δεσμών εντολών" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:864 #: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Ενεργοποίηση αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων netscape" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Ενεργοποίηση υποστήριξης βάσης δεδομένων HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Ενεργοποίηση τοπικής υποστήριξης αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Εάν θα ενεργοποιηθεί η τοπική υποστήριξη αποθήκευσης HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Ενεργοποίηση προσωρινής μνήμης δικτυακή εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Εάν θα ενεργοποιηθεί η προσωρινή μνήμη της εφαρμογής εκτός σύνδεσης" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Εστίαση κειμένου και εικόνων" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Κινητική κύλιση" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Εάν η κύλιση θα κινείται ανάλογα με την ταχύτητα " -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Αποδοχή cookies" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Τι τύπο cookies να γίνονται αποδεκτά" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Μόνο πρωτότυπα cookies" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Μέγιστος χρόνος cookie" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Εάν θα αποθηκεύονται οι τελευταίες επισκεπτόμενες σελίδες" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Μέγιστο χρόνος ιστορικού" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "Ο τύπος του διακομιστής προς χρήση" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "HTTP διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Αυτόματη εύρεση διακομιστή μεσολάβησης" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Εάν θα εντοπίζεται αυτόματα από το περιβάλλον ο διακομιστής μεσολάβησης" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Αναγνώριση ως" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Αλφαριθμητικό αναγνώρισης" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Προτιμώμενες γλώσσες" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Μία διαχωρισμένη λίστα των προτιμώμενων γλωσσών με κόμμα για επεξεργασία των πολυγλωσσικών ιστοσελίδων, για παράδειγμα \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν για διαγραφή" @@ -1697,8 +1642,8 @@ msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page #: ../midori/midori-view.c:1270 -#: ../midori/midori-view.c:4576 -#: ../midori/midori-view.c:4580 +#: ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Σφάλμα- %s" @@ -1812,282 +1757,286 @@ msgstr "_Αναζήτηση στον ιστό" msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:2702 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Τύπος αρχείου: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2709 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:3253 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Ορισμός αριθμού στηλών και γραμμών" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Εισάγεται τον αριθμό των στηλών και γραμμών:" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Άκυρη εισαγωγή για το μέγεθος της γρήγορης σύνδεσης" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Μέγεθος μικρογραφίας:" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Μικρό" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Μεσαίο" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Μεγάλο" -#: ../midori/midori-view.c:3572 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" -#: ../midori/midori-view.c:3595 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-view.c:3716 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Καθυστέρηση φόρτωση σελίδας" -#: ../midori/midori-view.c:3717 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Καθυστέρηση φόρτωσης είτε λόγω κάποιου σφάλματος είτε για ρυθμίσεις εκκίνησης." -#: ../midori/midori-view.c:3718 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Φόρτωση σελίδας" -#: ../midori/midori-view.c:3862 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-view.c:4116 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "_Διπλότυπη καρτέλα" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "_Επαναφορά καρτέλας" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Ελαχιστοποίηση καρτέλας" -#: ../midori/midori-view.c:4127 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "Κλείσιμο άλλ_ων καρτελών" -#: ../midori/midori-view.c:4813 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-view.c:4814 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-view.c:4866 -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 +#: ../midori/midori-preferences.c:384 msgid "Features" msgstr "Χαρακτηριστικά" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Γενικά" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Εκκίνηση" -#: ../midori/midori-preferences.c:314 -#: ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Τρέχουσα σελίδα ως αρχική" -#: ../midori/midori-preferences.c:331 +#: ../midori/midori-preferences.c:334 #: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Μεταφορές" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Εμφάνιση" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Ρυθμίσεις γραμματοσειράς" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Προεπιλεγμένη οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Η προκαθορισμένη οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Σταθερού-μεγέθους οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Η οικογένεια γραμματοσειράς χρησιμοποιείται για την εμφάνιση σταθερού μεγέθους κειμένου" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Το μέγεθος της γραμματοσειράς που χρησιμοποιείται για την εμφάνιση κειμένου σταθερού μεγέθους" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Ελάχιστο μέγεθος γραμματοσειράς" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Συμπεριφορά" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Επιβολή 96 dots ανά ίντσα" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Επιβολή της πυκνότητας βίντεο dot στα 96DPI" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Να επιτρέπονται στις δέσμες εντολών να ανοίγουν αναδυόμενα παράθυρα." -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Εάν θα επιτρέπονται στις δέσμες εντολών να ανοίγουν αυτόματα αναδυόμενα παράθυρα" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Ορθογραφία πληκτρολόγησης" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Ενεργοποίηση ορθογραφίας" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Ενεργοποίηση ορθογραφίας κατά την πληκτρολόγηση" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Λεξικά συλλαβισμού:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Μία διαχωρισμένη λίστα με τις γλώσσες που μπορείτε να χρησιμοποιήσετε κατά την ορθογραφία πληκτρολόγησης, για παράδειγμα \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Διεπαφή" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Γραμμή πλοήγησης" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Περιήγηση" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Εφαρμογές" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Εξωτερικές εφαρμογές" #. Page "Network" -#: ../midori/midori-preferences.c:485 -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:489 msgid "Network" msgstr "Δίκτυο" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Όνομα διακομιστή" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Προσωπικό απόρρητο" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Cookies ιστού" -#: ../midori/midori-preferences.c:521 -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:538 msgid "days" msgstr "ημέρες" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Άδειο" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Προσθήκη μηχανής αναζήτησης" @@ -2120,6 +2069,10 @@ msgstr "Χρήση ως _προκαθορισμένο" msgid "_Bookmark" msgstr "_Σελιδοδείκτης" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Σελιδοδείκτες" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Προσθήκη σ_ελιδοδείκτη" @@ -2205,41 +2158,41 @@ msgstr "Η μεταφορά ολοκληρώθηκε" msgid "Clear All" msgstr "Καθαρισμός όλων" -#: ../toolbars/midori-transferbar.c:278 -#: ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Μερικά αρχεία κατεβαίνουν" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Τερματισμός του Μιντόρι" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματιστεί ο midori." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:246 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:411 msgid "Edit the selected bookmark" msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:419 msgid "Delete the selected bookmark" msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:433 msgid "Add a new folder" msgstr "Προσθήκη ενός νέου φακέλου" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Διαχωριστικό" @@ -2259,54 +2212,56 @@ msgstr "Αντιγραφή όλων" msgid "Extensions" msgstr "Επεκτάσεις" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Εσφαλμένη τιμή ώρας" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "The clock time lies in the past. Please check the current date and time." msgstr "Η τιμή της ώρας είναι παρελθοντική. Παρακαλώ ελέγξτε την τρέχουσα ημερομηνία και ώρα." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Μια βδομάδα πριν" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d μέρα πριν" msgstr[1] "%d μέρες πριν" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Σήμερα" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Χθες" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:333 +#: ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:414 msgid "Bookmark the selected history item" msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:423 msgid "Delete the selected history item" msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:431 msgid "Clear the entire history" msgstr "Καθαρισμός ολόκληρου του ιστορικού" -#: ../panels/midori-history.c:943 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Φίλτρο:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Άνοιγμα φακέλου προορισμού" @@ -2353,18 +2308,18 @@ msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθ msgid "Animation frames are broken" msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" -#: ../katze/katze-utils.c:498 -#: ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 +#: ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s" -#: ../katze/katze-utils.c:544 -#: ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 +#: ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Επιλογή αρχείου" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Επιλογή φακέλου" @@ -2402,11 +2357,11 @@ msgstr "Φρ_αγή εικόνας" msgid "Bl_ock link" msgstr "Φρ_αγή συνδέσμου" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Εμποδιστής διαφημίσεων" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Μπλόκαρε διαφημίσεις σύμφωνα με μία λίστα με φίλτρα" @@ -2533,6 +2488,10 @@ msgstr "_Ανάπτυξη όλων" msgid "_Collapse All" msgstr "_Μάζεμα όλων" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Φίλτρο:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που το όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται" @@ -2557,6 +2516,14 @@ msgstr "Αντιγραφή διευθύνσεων από καρτέλες" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Αντιγραφή των διευθύνσεων όλων των καρτέλων στο πρόχειρο" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Εξωτερικές εφαρμογές" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Συσχέτιση URL σχημάτων με εξωτερικές εντολές" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Αποτυχία εύρεσης απαιτούμενου στοιχείου Atom \"entry\" στα δεδομένα XML." @@ -2641,28 +2608,52 @@ msgstr "Πλαίσιο ροής" msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Απέτυχε η προσθήκη τιμής φόρμας: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Αποθηκεύει το ιστορικό των δεδομένων που έχουν εισαχθεί σε φόρμες" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Μη διαθέσιμα: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Ιστορικό δεδομένων φόρμας" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Επόμενη καρτέλα (λίστα ιστορικού)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Επόμενη καρτέλα από το ιστορικό" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Προηγούμενη καρτέλα (λίστα ιστορικού)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Προηγούμενη καρτέλα από ιστορικό" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Λίστα ιστορικού" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Να επιτρέπεται η εναλλαγή καρτελών επιλέγοντας από την ταξινομημένη λίστα της τελευταίας χρήσης." + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Κινήσεις ποντικιού" @@ -2742,14 +2733,6 @@ msgstr "Πλαίσιο κ_αρτέλας" msgid "Show tabs in a vertical panel" msgstr "Εμφάνιση καρτελών στο κάθετο πλαίσιο" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Καρτέλα λίστας ιστορικού" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Να επιτρέπεται η εναλλαγή καρτελών επιλέγοντας από την ταξινομημένη λίστα της τελευταίας χρήσης." - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Ελαχιστοποίηση των νέων καρτέλων" From f92ce0b790de2a70b3c19ebdfc7d383428a7b9fd Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Mon, 5 Jul 2010 12:03:34 +0200 Subject: [PATCH 2817/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 634 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 1061 +++++++++++++++++++++++++++--------------------------- 1 file changed, 537 insertions(+), 524 deletions(-) diff --git a/po/uk.po b/po/uk.po index ae5c8451..80d70d7f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 22:08+0000\n" +"POT-Creation-Date: 2010-07-05 04:08+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легкий переглядач Веб" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Мідорі" @@ -46,7 +46,7 @@ msgstr "Значення '%s' є неправильним для %s" msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Не вдалось відкрити базу даних: %s\n" @@ -103,244 +103,244 @@ msgstr "Скинути останню _сесію" msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Не вказано назви файлу" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Отримано невідому помилку." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Знімок екрану збережено до: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Запустити АДРЕСУ як веб-додаток" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Використайте ТЕКУ як теку конфігурації" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "ТЕКА" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Показати діалог діагностики" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Виконати визначений файл як джава-скрипт" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Зробити знімок вибраної сторінки/адреси" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Виконати вибрану комнаду" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокувати URI згідно з регулярним виразом PATTERN" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Зресетувати Midori після СЕКУНД неактивності" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Це невластива тека конфігурації." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Один із екземплярів програми Midori вже працює, але не відповідає на запити.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Неможливо завантажити пошукову машину. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Ігнорувати" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Файл не знайдений." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Неправильний документ." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Нерозпізнаний формат закладки." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4861 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4858 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:454 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:492 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 -#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:981 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 +#: ../midori/midori-browser.c:4098 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1431 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2133 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2211 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -348,643 +348,616 @@ msgstr "" "Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" "Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." -#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4920 +#: ../panels/midori-bookmarks.c:403 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не вдалось виконати запит бази даних: %s\n" - -#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Пусто" - -#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5299 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:718 +#: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:724 +#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:3945 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4116 +#: ../midori/midori-browser.c:3946 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:3947 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4118 +#: ../midori/midori-browser.c:3948 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:3949 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:3973 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4925 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:4154 +#: ../midori/midori-browser.c:3987 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5029 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4075 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4113 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4167 ../panels/midori-bookmarks.c:278 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Невдача при видаленні об'єкту історії: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4274 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4278 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4292 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4303 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4309 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4314 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:4497 +#: ../midori/midori-browser.c:4319 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4324 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4329 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:4337 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:4616 +#: ../midori/midori-browser.c:4438 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4440 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4459 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4768 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4770 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4771 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4774 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:4776 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4777 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4781 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4784 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4786 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4787 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4789 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4790 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4792 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4793 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4798 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4799 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4801 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4802 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4805 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4808 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:4810 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4814 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4817 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4821 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4824 ../midori/midori-browser.c:4827 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4830 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4833 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4836 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4839 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4841 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4842 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4844 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:4845 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:4849 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4851 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4852 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4864 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:4867 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:4870 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4871 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4873 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4874 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4877 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4880 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4881 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4883 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4884 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:4886 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4887 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4889 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:4890 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:4893 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:4896 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:4899 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:4903 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:4907 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:4910 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:4912 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:4913 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:4915 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:4916 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:4922 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:4923 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:4928 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4931 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:4932 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:4935 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:5114 +#: ../midori/midori-browser.c:4936 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:4940 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:4941 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:4946 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:5125 +#: ../midori/midori-browser.c:4947 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:4949 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:5128 +#: ../midori/midori-browser.c:4950 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:4952 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5131 +#: ../midori/midori-browser.c:4953 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:4955 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5134 +#: ../midori/midori-browser.c:4956 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:4958 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:4960 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:4961 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:4963 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:4964 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:4966 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:4967 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:4970 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:4978 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:4979 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4982 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4983 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:4986 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:4987 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4990 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:4991 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:4994 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:4995 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4998 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:4999 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5007 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5010 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5014 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5017 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5020 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5023 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5026 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5540 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5547 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5549 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5573 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:5575 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:5596 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:5806 -msgid "_Recently visited pages" -msgstr "_Останньо відвідані сторінки" - -#: ../midori/midori-browser.c:5808 -msgid "Reopen pages that you visited earlier" -msgstr "Знову відкрити сторінки, що були переглянуті раніше" - -#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Закладки" - -#: ../midori/midori-browser.c:5825 -msgid "Show the saved bookmarks" -msgstr "Показати збережені закладки" - -#: ../midori/midori-browser.c:5840 +#: ../midori/midori-browser.c:5611 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:5853 +#: ../midori/midori-browser.c:5624 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:5855 +#: ../midori/midori-browser.c:5626 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:5869 +#: ../midori/midori-browser.c:5640 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5871 +#: ../midori/midori-browser.c:5642 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6455 +#: ../midori/midori-browser.c:6219 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -1035,598 +1008,574 @@ msgstr "Рівняти бічну панель по лівому краю" msgid "Hide operating controls" msgstr "Приховати панель _управління" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Показати пусту сторінку" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Показати домашню сторінку" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Показати останньо відкриті вкладки" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Показати останні вкладки без завантаження" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Маленькі значки" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Значки і текст" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Текст за значками" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME або змінні оточення)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "Сервер HTTP проксі" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Немає сервера проксі" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Всі тістечка" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "Тістечка сесії" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "Нічого" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Запам'ятати останній розмір вікна" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Чи зберігати останній розмір вікна" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Ширина останнього вікна" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "Остання збережена ширина вікна" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Висота останнього вікна" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "Остання збережена висота вікна" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Остання позиція панелі" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "Остання збережена позиція панелі" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Остання сторінка панелі" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "Остання збережена сторінка панелі" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Останній пошук у Веб" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "Останній збережений пошук у Веб" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Показати панель меню" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Чи показувати панель меню" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Чи показувати панель навігації" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Чи показувати панель закладок" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Показати панель" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Чи показувати панель" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Чи показувати панель завантажень" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Показати панель стану" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Чи показувати панель стану" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Стиль панелі:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Показати поступ у рядку адреси" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Чи показувати прогрес завантаження в рядку адреси" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Доповнення рядка в вікні пошуку" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Чи автоматично доповнювати стрічку в рядку пошуку" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Об'єкти панелі інструментів" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Об'єкти, що відображаються у панелі інструментів" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Компактна бічна панель" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Налаштування відображення компактної бічної панелі" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Показати об’єкти налаштування панелі" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Чи показувати пульт оправління панелі" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Чи вирівнювати бічну панель по правому краю" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Відкривати панелі в нових вікнах" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Чи відкривати панелі в окремих вікнах" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Коли Мідорі стартує:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Що завантажувати при старті" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "Домашня сторінка" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Показати діалог краху" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Показати діалог, коли Мідорі зазнає краху" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Показати швидкий виклик в новій вкладці" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Показувати швидкий виклик в щойно відкритих вкладках" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Зберігати завантажені файли до:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "Завантажені файли зберігати в теку" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Запитати про теку призначення" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Чи запитувати про теку призначення при завантаженні файлу" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Повідомити про закінчення завантаження" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Чи показувати повідомлення про завершення завантаження" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Менеджер завантажень" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "Зовнішній менеджер завантажень" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Текстовий редактор" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Зовнішній текстовий редактор" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Читалка новин" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Зовнішня читалка стрічок новин" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Місце початку пошуку" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "Здійснювати пошук всередині місця входження" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Типове кодування" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Типове кодування символів" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Кнопки закриття на вкладках" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Чи матимуть вкладки кнопки закриття" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Відкривати нові сторінки в:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Де відкривати нові сторінки" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Відкривати зовнішні сторінки в:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Де відкривати сторінки зовнішнього виклику" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Середня кнопка відкриває виділене" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Завантажувати посилання URL з виділеного через клацання середньої кнопки" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Відкривати вкладки в фоні" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Чи відкривати нові вкладки в фоновому режимі" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Відкривати вкладки у наступних після поточної" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Чи відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Автоматично завантажити зображення" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Автоматично завантажити і показати зображення" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Ввімкнути скрипти" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Ввімкнути вбудовані мови скриптів" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Ввімкнути розширення Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Ввімкнути вбудовані об’єкти розширень Netscape" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Ввімкнути підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Чи дозволити підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Ввімкнути підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Чи дозволити підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Чи збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Шукати під час вписування" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "Чи автоматично шукати при вписуванні" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Кінетичне прокручування" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Приймати тістечка" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Тістечка якого типу приймати" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Тільки оригінальні тістечка" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Приймати тістечка тільки з оригінального сайту" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Тривалість життя тістечка" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Максимальне число днів зберігання тістечок для" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Запам'ятати останні відвідані сторінки" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Чи зберігати останні відвідані сторінки" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Тривалість життя історії" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Максимальне число днів зберігання історії для" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Запам'ятовувати останні завантажені файли" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Чи зберігати останні завантажені файли" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Сервер проксі" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "Тип проксі-сервера для використання" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "HTTP сервер проксі" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Проксі, що використовується для HTTP з'єднань" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Визначити сервер проксі автоматично" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Чи визначати сервер проксі зі змінних оточення" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Ідентифікувати як" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Що ідентифікувати для веб-сторінок" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Стрічка ідентифікації" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "Стрічка ідентифікації програми" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Типові мови" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Розділений комами список бажаних мов для відображання веб-сторінок, наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Очистити приватні дані" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "Приватні дані, що вибрані для очищення" @@ -1634,8 +1583,8 @@ msgstr "Приватні дані, що вибрані для очищення" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 -#: ../midori/midori-view.c:4580 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Помилка - %s" @@ -1741,277 +1690,281 @@ msgstr "_Шукати Веб" msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:2702 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2709 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3253 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Швидкий виклик" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Встановити кількість колонок і рядків" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Введіть кількість колонок і рядків:" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Неправильні дані для розміру швидкого виклику" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Розмір значка:" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Середній" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Великий" -#: ../midori/midori-view.c:3572 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Не можу відобразити документ" -#: ../midori/midori-view.c:3595 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Документація не заінстальована" -#: ../midori/midori-view.c:3716 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Завантаження сторінки затримане" -#: ../midori/midori-view.c:3717 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Завантаження затримане або в зв’язку з останнім крахом або з налаштуваннями завантаження." -#: ../midori/midori-view.c:3718 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Завантажити сторінку" -#: ../midori/midori-view.c:3862 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4116 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "_Відновити вкладку" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Мінімізувати вкладку" -#: ../midori/midori-view.c:4127 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4813 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4814 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Опції" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Основні" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Початкові" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Використати поточну сторінку як домашню" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Завантаження" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Зовнішній вигляд" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Налаштування шрифтів" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Типове сімейство шрифтів" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Шрифт по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Розмір шрифта по замовчуванню для відображення тексту" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Шрифти фіксованої ширини" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Шрифт для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Розмір шрифта для відображення тексту фіксованої ширини" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Мінімальний розмір шрифту" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Мінімальний розмір шрифта для відображення тексту" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Поведінка" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Примусити 96 пікселів на дюйм" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Примусити 96 DPI для відео" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Дозволити скриптам відкривати спливаючі вікна" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Чи дозволяти криптам автоматично відкривати спливаючі вікна" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Перевірка орфографії" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Ввімкнути перевірку правопису" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Ввімкнути перевірку правопису під час введення тексту" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Словники перевірки правопису:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Розділений комами список мов, що використовуються для перевірки правопису, наприклад: \"uk_UA,en_US\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Інтерфейс" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Панель навігації" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Перегляд сторінок" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Програми" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Зовнішні рограми" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Мережа" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Назва сервера" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Приватність" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Веб-тістечка" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "днів" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Пусто" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Додати пошукову машину" @@ -2044,6 +1997,10 @@ msgstr "Використовувати по _замовчуванню" msgid "_Bookmark" msgstr "_Закладка" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Закладки" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Додати закладку" @@ -2127,40 +2084,40 @@ msgstr "Передачу завершено" msgid "Clear All" msgstr "Очистити все" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Деякі файли завантажено." -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Вийти з Мідорі" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Всі завантаження буде скасовано, якщо вийти з Мідорі" -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:246 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не вдалося дадати закладку: %s\n" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:411 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:419 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:433 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Роздільник" @@ -2180,19 +2137,19 @@ msgstr "Копіювати все" msgid "Extensions" msgstr "Розширення" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Неправильний час годинника" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "The clock time lies in the past. Please check the current date and time." msgstr "Час годинника є в минулому. Перевірте поточні дату і час." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Тижневої давності" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2200,35 +2157,36 @@ msgstr[0] "%d день тому" msgstr[1] "%d днів тому" msgstr[2] "%d днів тому" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Сьогодні" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Вчора" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не вдалось виконати запит бази даних: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:414 msgid "Bookmark the selected history item" msgstr "Додати в закладки вибраний об'єкт історії" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:423 msgid "Delete the selected history item" msgstr "Видалити вибраний об'єкт історії" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:431 msgid "Clear the entire history" msgstr "Очистити історію" -#: ../panels/midori-history.c:943 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Фільтр:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Відкрити теку при_значення" @@ -2275,16 +2233,16 @@ msgstr "Значок '%s' не вдається завантажити" msgid "Animation frames are broken" msgstr "Кадри анімації пошкоджені" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Властивості '%s' неправильні для %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Вибрати файл" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Вибрати теку" @@ -2322,11 +2280,11 @@ msgstr "Блокувати зображення" msgid "Bl_ock link" msgstr "Блокувати посилання" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Блокіратор реклами" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Блокувати рекламу використовуючи список фільтрів" @@ -2454,6 +2412,10 @@ msgstr "Роз_крити все" msgid "_Collapse All" msgstr "З_горнути все" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Фільтр:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Введіть рядок фільтра, щоб показувати тільки тістечко, чиє поле імені або домена відповідає введеному фільтру" @@ -2478,6 +2440,14 @@ msgstr "Копіювати адреси вкладок" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копіювати адреси усіх вкладок до буфера обміну" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Зовнішні програми" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Асоціювати схеми URL із зовнішніми командами" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Не можу знайти вимаганий елемент Atom \"entry\" в даних XML" @@ -2562,28 +2532,52 @@ msgstr "Панель стрічок новин" msgid "Read Atom/ RSS feeds" msgstr "Читати Atom-/ RSS стрічки новин" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Невдача при додаванні з значенням: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Зберігає історію введених даних форм" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Файли русурсів не встановлені" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Заповнювач історії форм" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Наступна вкладка (список історії)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Наступна вкладка з історії" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Попередня вкладка (список історії)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Попередня вкладка з історії" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Історія вкладок" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Дозволяє перемикатися між вкладками при виборі із списку, впорядкованим по часу останнього використання" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Жести миші" @@ -2661,14 +2655,6 @@ msgstr "Панель в_кладок" msgid "Show tabs in a vertical panel" msgstr "Показати вкладки у вертикальній панелі" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Список історії вкладок" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Дозволяє перемикатися між вкладками при виборі із списку, впорядкованим по часу останнього використання" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Мінімізувати нові вкладки" @@ -2709,6 +2695,33 @@ msgstr "Легко редагувати формат панелі інструм msgid "Cache HTTP communication on disk" msgstr "Кешувати комунікацію HTTP на диск" +#~ msgid "_Recently visited pages" +#~ msgstr "_Останньо відвідані сторінки" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Знову відкрити сторінки, що були переглянуті раніше" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Показати збережені закладки" + +#~ msgid "Original cookies only" +#~ msgstr "Тільки оригінальні тістечка" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Приймати тістечка тільки з оригінального сайту" + +#~ msgid "Remember last visited pages" +#~ msgstr "Запам'ятати останні відвідані сторінки" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Чи зберігати останні відвідані сторінки" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Визначити сервер проксі автоматично" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Чи визначати сервер проксі зі змінних оточення" + #~ msgid "Set number of shortcuts" #~ msgstr "Встановити кількість скорочень" From c94e12e41c1aca08b5c3c4a1cb16bbf43e6811aa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Jul 2010 23:02:27 +0200 Subject: [PATCH 2818/2970] Use a 200ms delay for location completion like elsewhere --- midori/midori-locationaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 9434e1cd..c35c30b8 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -25,7 +25,7 @@ #include #endif -#define COMPLETION_DELAY 150 +#define COMPLETION_DELAY 200 #define MAX_ITEMS 25 struct _MidoriLocationAction From ec2d1e21c97c09251eb4b49ebd5664a3362ede39 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Jul 2010 23:14:49 +0200 Subject: [PATCH 2819/2970] Fallback to the old parent when inserting bookmarks --- panels/midori-bookmarks.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index e27df97e..5450f0ba 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -214,6 +214,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, { gchar* sqlcmd; char* errmsg = NULL; + KatzeItem* old_parent; gchar* parent; gchar* uri; @@ -222,10 +223,12 @@ midori_bookmarks_insert_item_db (sqlite3* db, else uri = g_strdup (""); - if (folder) + /* Use folder, otherwise fallback to parent folder */ + old_parent = katze_item_get_parent (item); + if (folder && *folder) parent = g_strdup (folder); - else if (katze_item_get_name (katze_item_get_parent (item))) - parent = g_strdup (katze_item_get_name (katze_item_get_parent (item))); + else if (old_parent && katze_item_get_name (old_parent)) + parent = g_strdup (katze_item_get_name (old_parent)); else parent = g_strdup (""); From b4a21723fc7e9c892174b3bdbc7bf980757edfa1 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Tue, 6 Jul 2010 19:40:51 +0200 Subject: [PATCH 2820/2970] l10n: Updated Danish (da) translation to 99% New status: 632 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 977 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 495 insertions(+), 482 deletions(-) diff --git a/po/da.po b/po/da.po index 27e39756..015c5b3a 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-30 16:08+0000\n" +"POT-Creation-Date: 2010-07-06 16:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -46,7 +46,7 @@ msgstr "Værdien '%s' er ikke gyldig til %s" msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" @@ -103,166 +103,166 @@ msgstr "Nulstil den sidste _session" msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Vis en nedbrudsdialog" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "MØNSTRE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1800 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Ignorér" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Fil blev ikke fundet." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Misdannet dokument." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Ukendt bogmærkeformat." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5021 -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4861 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4858 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:455 +#: ../midori/midori-browser.c:454 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:493 +#: ../midori/midori-browser.c:492 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:507 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." @@ -296,12 +296,12 @@ msgstr "_Beskrivelse:" msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4177 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 msgid "_Folder:" msgstr "_Mappe:" #: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4182 ../midori/midori-browser.c:4214 +#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 msgid "Toplevel folder" msgstr "Øverste mappe" @@ -317,185 +317,174 @@ msgstr "Vis på vær_ktøjsbjælken" msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1037 ../midori/midori-browser.c:4232 -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 +#: ../midori/midori-browser.c:4098 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2132 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2210 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -#: ../midori/midori-browser.c:2216 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2259 ../midori/midori-browser.c:5086 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4920 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:2728 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Kunne ikke køre databaseudtryk: %s\n" - -#: ../midori/midori-browser.c:2808 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Tom" - -#: ../midori/midori-browser.c:3415 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:3681 ../midori/midori-browser.c:5467 +#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5299 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:4015 ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:4022 ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:4025 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:4103 +#: ../midori/midori-browser.c:3945 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4104 +#: ../midori/midori-browser.c:3946 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4105 +#: ../midori/midori-browser.c:3947 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4106 +#: ../midori/midori-browser.c:3948 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4107 +#: ../midori/midori-browser.c:3949 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:3973 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:4131 ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4925 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4142 +#: ../midori/midori-browser.c:3987 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4169 ../midori/midori-browser.c:5195 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5029 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4243 +#: ../midori/midori-browser.c:4075 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4279 +#: ../midori/midori-browser.c:4113 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4333 ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4167 ../panels/midori-bookmarks.c:281 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4274 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4278 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4458 +#: ../midori/midori-browser.c:4292 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4469 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4303 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:4475 +#: ../midori/midori-browser.c:4309 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4480 +#: ../midori/midori-browser.c:4314 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:4485 +#: ../midori/midori-browser.c:4319 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:4490 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4324 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:4495 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4329 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:4503 +#: ../midori/midori-browser.c:4337 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:4604 +#: ../midori/midori-browser.c:4438 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:4606 +#: ../midori/midori-browser.c:4440 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:4625 +#: ../midori/midori-browser.c:4459 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -503,490 +492,474 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4768 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:4936 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4770 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4771 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:4774 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4776 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:4943 +#: ../midori/midori-browser.c:4777 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4781 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4784 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4786 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:4787 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4789 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4790 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4792 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4793 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4798 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4799 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4801 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4802 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4805 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4808 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4810 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4814 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4817 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4821 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:4990 ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4824 ../midori/midori-browser.c:4827 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4830 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4833 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4836 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4839 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4841 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4842 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4844 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4845 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:5015 +#: ../midori/midori-browser.c:4849 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4851 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4852 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4864 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:4867 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:4870 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4871 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4873 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:4874 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:4877 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4880 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4881 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4883 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:4884 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4886 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4887 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4889 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4890 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4893 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4896 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4899 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:4903 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:4907 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:4910 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:4912 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:4913 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:4915 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:5082 +#: ../midori/midori-browser.c:4916 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:4922 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:4923 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:4928 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:5097 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4931 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:5098 +#: ../midori/midori-browser.c:4932 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:4935 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:4936 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:4940 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5107 +#: ../midori/midori-browser.c:4941 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5112 +#: ../midori/midori-browser.c:4946 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:4947 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:4949 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5116 +#: ../midori/midori-browser.c:4950 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:4952 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:4953 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:4955 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5122 +#: ../midori/midori-browser.c:4956 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:4958 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:4960 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:4961 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5129 +#: ../midori/midori-browser.c:4963 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:4964 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5132 +#: ../midori/midori-browser.c:4966 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:4967 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:4970 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:4978 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:4979 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:4982 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5149 +#: ../midori/midori-browser.c:4983 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5152 +#: ../midori/midori-browser.c:4986 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5153 +#: ../midori/midori-browser.c:4987 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:4990 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:4991 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4994 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:4995 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:4998 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:4999 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5007 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5176 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5010 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5180 +#: ../midori/midori-browser.c:5014 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5183 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5017 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5186 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5020 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5189 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5023 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5192 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5026 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5540 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5547 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5549 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:5756 +#: ../midori/midori-browser.c:5573 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5575 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5596 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:5794 -msgid "_Recently visited pages" -msgstr "_Nyligt besøgte sider" - -#: ../midori/midori-browser.c:5796 -msgid "Reopen pages that you visited earlier" -msgstr "Genåbn sider som du tidligere har besøgt" - -#: ../midori/midori-browser.c:5811 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Bogmærker" - -#: ../midori/midori-browser.c:5813 -msgid "Show the saved bookmarks" -msgstr "Vis de gemte bogmærker" - -#: ../midori/midori-browser.c:5828 +#: ../midori/midori-browser.c:5611 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:5841 +#: ../midori/midori-browser.c:5624 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:5843 +#: ../midori/midori-browser.c:5626 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:5857 +#: ../midori/midori-browser.c:5640 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5859 +#: ../midori/midori-browser.c:5642 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:6219 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" @@ -1037,598 +1010,574 @@ msgstr "Opstil sidepanel til venstre" msgid "Hide operating controls" msgstr "Skjul handlingskontroller" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Vis blank side" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Vis hjemmeside" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Vis sidste åbne faneblade" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Vis sidste faneblad uden at indlæse" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Små ikoner" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Ikoner og tekst" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Automatisk (GNOME eller miljø)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Ingen proxyserver" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Om overførselsstatus skal vises" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Værktøjsbjælkestil:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Vis fremgang i placeringindgang" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Om visning af indlæsningsfremgang i placeringsindgang" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Vis søgemaskiner i adresseudfyldelse" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Vis handlingskontroller til panelet" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Om handlingskontroller til panelet skal vises" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Åbn paneler i separate vinduer" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Om paneler altid skal åbnes i separate vinduer" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Når Midori starter:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Hvad der skal ske når Midori startes" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Vis hurtigopkald i nye faneblade" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Vis hurtigopkald i nyligt åbnede faneblade" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Gem hentede filer til:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Spørg om målmappen" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Om der skal spørges om målmappen ved hentning af fil" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Påmindelse når en overførsel er gennemført" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Åbn nye sider i:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Åbn eksterne sider i:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Slå Netscape-udvidelsesmoduler til" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Slå HTML5 databaseunderstøttelse til" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Om understøttelse af database til HTML5 skal slås til" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Slå understøttelse af lokal lagring af HTML5 til" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Slå ikke forbundet webprograms mellemlager til" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Om ikke forbundet webprograms mellemlager skal slås til" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Bevægelsesrulning" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Om rulning skal ske med bevægelseshastighed eller ej" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Kun for originale cookies" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Tillad kun cookies fra original websted" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Husk sidste besøgte sider" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Om sidste besøgte sider skal gemmes" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "Proxyservertypen som skal bruges" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Genkend automatisk proxyserver" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Om proxyserveren genkendes automatisk fra miljøet" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Foretrukne sprog" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "En kommaadskilt liste af foretrukne sprog for rendering af flersprogssider, eksempelvis \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Ryd private data" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "De private data valgt til sletning" @@ -1866,154 +1815,158 @@ msgstr "Udskriv baggrundsbilleder" msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funktionalitet" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Generel" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Opstart" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Brug nuværende side som hjemmeside" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Overførsler" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Udseende" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Indstillinger for skrifttype" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Standard for skrifttypefamilie" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Standard skrifttype til visning af tekst" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Størrelse af standardskriftstype er brugt til at vise tekst" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Fastbredde skrifttype" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Skrifttypen til visning af fastbredde tekst" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Skrifttypen til visning af tekst med fastbredde" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Minimum størrelse af skrifttype til at vise tekst" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Gennemtving 96 dots per tomme" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Gennemtving tæthed af videopunkt på 96 DPI" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Tillad skripter at åbne pop op." -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Om skripter er tilladt at åbne pop opvinduer automatisk" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Stavekontrol" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Slå stavekontrol til" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Slå stavekontrol til mens du taster" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Stavekontroller:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "En kommaadskilt liste over sprog til at blive brugt til stavekontrol eksempelvis \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Grænseflade" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Navigeringsbjælke" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Browsing" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Programmer" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Eksterne programmer" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Værtsnavn" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Beskyttelse af privatliv" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Web-cookies" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "dage" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Tom" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Tilføj søgemaskine" @@ -2046,6 +1999,10 @@ msgstr "Brug som _standard" msgid "_Bookmark" msgstr "_Bogmærke" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Bogmærker" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Tilføj bogmærke" @@ -2129,40 +2086,40 @@ msgstr "Overførsel gennemført" msgid "Clear All" msgstr "Ryd alle" -#: ../toolbars/midori-transferbar.c:298 ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Nogle filer bliver overført" -#: ../toolbars/midori-transferbar.c:304 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Afslut Midori" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:249 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:568 msgid "Separator" msgstr "Separator" @@ -2182,54 +2139,55 @@ msgstr "Kopiér alt" msgid "Extensions" msgstr "Udvidelser" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Fejlagtig tid" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "The clock time lies in the past. Please check the current date and time." msgstr "Tiden ligger i fortiden. Kontrollér den aktuelle dato og tid." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "For en uge siden" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dage siden" msgstr[1] "%d dage siden" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "I dag" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "I går" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Kunne ikke køre databaseudtryk: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:414 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:423 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:431 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#: ../panels/midori-history.c:943 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filter:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Åbn mål_mappen" @@ -2276,16 +2234,16 @@ msgstr "Lagerikon '%s' kunne ikke indlæses" msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Vælg mappe" @@ -2323,11 +2281,11 @@ msgstr "Bl_okér billede" msgid "Bl_ock link" msgstr "Bl_okér henvisning" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Blokering af reklamer" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" @@ -2453,6 +2411,10 @@ msgstr "_Udfold alle" msgid "_Collapse All" msgstr "_Fold alle" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filter:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Indtast en filterstreng for at vise kun cookies hvis navn eller domænefelt passer til det indtastede filter" @@ -2477,6 +2439,14 @@ msgstr "Kopiér adresser af faneblade" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Kopiér adresser af alle fanblade til udklipsholder" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Eksterne programmer" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Knyt URL-skemaer til eksterne kommandoer" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Kunne ikke finde anmodede Atom \"post\"-elementerne i XML-data." @@ -2561,28 +2531,52 @@ msgstr "Feed-panel" msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Kunne ikke tilføje formularværdien: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Gem historikken af indtastede formulardata" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Ikke tilgængelig: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Resourcefiler er ikke installeret" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Historikfylder til formular" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Næste faneblad (historikliste)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Næste faneblad fra historik" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Sidste faneblad (historikliste)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Sidste faneblad fra historik" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Historikliste" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Musebevægelser" @@ -2660,14 +2654,6 @@ msgstr "Faneblad_panel" msgid "Show tabs in a vertical panel" msgstr "Vis faneblade i et lodret panel" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Fanebladshistorik" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Tillad at skifte faneblade ved at vælge fra en liste sorteret efter seneste brug" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "_Minimér nye faneblade" @@ -2708,6 +2694,33 @@ msgstr "Redigér nemt layout af værktøjsbjælken" msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation på disk" +#~ msgid "_Recently visited pages" +#~ msgstr "_Nyligt besøgte sider" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Genåbn sider som du tidligere har besøgt" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Vis de gemte bogmærker" + +#~ msgid "Original cookies only" +#~ msgstr "Kun for originale cookies" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Tillad kun cookies fra original websted" + +#~ msgid "Remember last visited pages" +#~ msgstr "Husk sidste besøgte sider" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Om sidste besøgte sider skal gemmes" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Genkend automatisk proxyserver" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Om proxyserveren genkendes automatisk fra miljøet" + #~ msgid "Set number of shortcuts" #~ msgstr "Indstil antal af genveje" From 922a94fc98c9ac7dd2ba3ed39323a8a3e68879a2 Mon Sep 17 00:00:00 2001 From: Samuel Creshal Date: Tue, 6 Jul 2010 10:42:30 +0200 Subject: [PATCH 2821/2970] Delete search history when clearing history --- midori/midori-browser.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3f3808b0..cdbe57d4 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4164,9 +4164,18 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog, if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { - g_printerr (_("Failed to remove history item: %s\n"), errmsg); + g_printerr (_("Failed to clear history: %s\n"), errmsg); sqlite3_free (errmsg); } + else + { + sqlcmd = "DELETE FROM search"; + if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) + { + g_printerr (_("Failed to clear search history: %s\n"), errmsg); + sqlite3_free (errmsg); + } + } clear_prefs |= MIDORI_CLEAR_HISTORY; } #endif From cfd00f7fe4bbb9804e7c33c23b453642b37369f1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jul 2010 22:28:02 +0200 Subject: [PATCH 2822/2970] Don't hide panel if individual panel was already active What might look like a little convenience for keyboard usage is very awkward when using buttons or menu items. --- midori/midori-panel.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 97b43517..33618ae3 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -712,11 +712,6 @@ midori_panel_action_activate_cb (GtkRadioAction* action, && gtk_radio_action_get_current_value (action) == katze_object_get_int (action, "value")) midori_panel_detach_page (panel, n); - else if (gtk_radio_action_get_current_value (action) - == katze_object_get_int (action, "value") - && gtk_widget_get_visible (GTK_WIDGET (panel)) - && midori_panel_get_current_page (panel) == n) - gtk_widget_hide (GTK_WIDGET (panel)); else { midori_panel_set_current_page (panel, n); From 880587a05519b5c419d15f0e30d903e7627a245c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jul 2010 22:41:42 +0200 Subject: [PATCH 2823/2970] Provide a fallback definition of gtk_menu_item_set_label --- midori/sokoke.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/sokoke.h b/midori/sokoke.h index 187cea76..99d91e01 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -40,6 +40,9 @@ #if !GTK_CHECK_VERSION (2, 16, 0) #define GTK_ACTIVATABLE GTK_WIDGET #define gtk_activatable_get_related_action gtk_widget_get_action + #define gtk_menu_item_set_label(menuitem, label) \ + gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child), \ + label ? label : ""); #endif #if !GTK_CHECK_VERSION (2, 18, 0) From e794fe798af5cc3eaf32bcc61446cb0257210946 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jul 2010 23:08:18 +0200 Subject: [PATCH 2824/2970] Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations. --- midori/midori-browser.c | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cdbe57d4..e421c540 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4403,6 +4403,46 @@ _action_tab_current_activate (GtkAction* action, gtk_widget_grab_focus (view); } +static void +_action_tab_minimize_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* view = midori_browser_get_current_tab (browser); + g_object_set (view, "minimized", + !katze_object_get_boolean (view, "minimized"), NULL); +} + +static void +_action_tab_duplicate_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* view = midori_browser_get_current_tab (browser); + MidoriNewView where = MIDORI_NEW_VIEW_TAB; + GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, + "settings", browser->settings, NULL); + midori_view_set_uri (MIDORI_VIEW (new_view), + midori_view_get_display_uri (MIDORI_VIEW (view))); + gtk_widget_show (new_view); + g_signal_emit_by_name (view, "new-view", new_view, where); +} + +static void +midori_browser_close_other_tabs_cb (GtkWidget* view, + gpointer data) +{ + GtkWidget* remaining_view = data; + if (view != remaining_view) + gtk_widget_destroy (view); +} + +static void +_action_tab_close_other_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GtkWidget* view = midori_browser_get_current_tab (browser); + midori_browser_foreach (browser, midori_browser_close_other_tabs_cb, view); +} + static const gchar* credits_authors[] = { "Christian Dywan ", NULL }; static const gchar* credits_documenters[] = @@ -4960,6 +5000,15 @@ static const GtkActionEntry entries[] = { "TabCurrent", NULL, N_("Focus _Current Tab"), "Home", N_("Focus the current tab"), G_CALLBACK (_action_tab_current_activate) }, + { "TabMinimize", NULL, + N_("Minimize _Current Tab"), "", + N_("Minimize the current tab"), G_CALLBACK (_action_tab_minimize_activate) }, + { "TabDuplicate", NULL, + N_("_Duplicate Current Tab"), "", + N_("Duplicate the current tab"), G_CALLBACK (_action_tab_duplicate_activate) }, + { "TabCloseOther", NULL, + N_("Close Ot_her Tabs"), "", + N_("Close all tabs except the current tab"), G_CALLBACK (_action_tab_close_other_activate) }, { "LastSession", NULL, N_("Open last _session"), NULL, N_("Open the tabs saved in the last session"), NULL }, @@ -5238,6 +5287,9 @@ static const gchar* ui_markup = "" "" "" + "" + "" + "" "" "" "" From 74df2a583c182bd94791b3300d0980cd004bcb5a Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sat, 10 Jul 2010 11:30:22 +0200 Subject: [PATCH 2825/2970] l10n: Updated Japanese (ja) translation to 100% New status: 642 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ja.po | 802 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 418 insertions(+), 384 deletions(-) diff --git a/po/ja.po b/po/ja.po index 3c71bb07..cf64ea9e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 22:45+0900\n" -"PO-Revision-Date: 2010-07-04 22:42+0900\n" +"POT-Creation-Date: 2010-07-10 18:29+0900\n" +"PO-Revision-Date: 2010-07-10 18:26+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -23,7 +23,7 @@ msgstr "軽量級ウェブブラウザ" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 #: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -256,104 +256,104 @@ msgstr "認識できないブックマーク形式です。" msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4910 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:454 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:492 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:769 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 -#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:879 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:907 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 +#: ../midori/midori-browser.c:4098 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2155 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -366,144 +366,148 @@ msgstr "" "もしくは Midori の設定のアプリケーションタブでフィードリーダを指定してくださ" "い。次にニュースフィードアイコンをクリックしたときに自動的に追加されます。" -#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 -#: ../panels/midori-bookmarks.c:401 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:3945 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:3946 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:3947 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:3948 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4055 +#: ../midori/midori-browser.c:3949 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:3973 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:3987 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4075 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4113 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 +#: ../midori/midori-browser.c:4167 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "履歴アイテムの削除に失敗しました: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "履歴のクリアに失敗しました: %s\n" + +#: ../midori/midori-browser.c:4175 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "検索履歴のクリアに失敗しました: %s\n" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4283 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4287 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4301 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:120 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:4415 +#: ../midori/midori-browser.c:4318 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4323 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:4425 +#: ../midori/midori-browser.c:4328 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4346 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:4544 +#: ../midori/midori-browser.c:4487 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:4546 +#: ../midori/midori-browser.c:4489 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -514,539 +518,557 @@ msgstr "" "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4508 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4817 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4820 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4823 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4825 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4826 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" # tooltip -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4830 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4833 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:4835 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4836 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4838 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" # tooltip -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4839 msgid "Add shortcut to the desktop" msgstr "デスクトップにショートカットを追加します" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4841 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4842 msgid "Subscribe to this news feed" msgstr "このニュースフィードを購読します" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4847 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4848 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4850 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4851 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4854 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4857 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4859 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4863 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4866 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4870 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4879 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4882 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4885 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4888 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4890 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4891 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4893 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:4894 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4898 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4900 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4901 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4913 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4916 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4919 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4920 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4922 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4923 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" # tooltip -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4926 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4929 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4930 msgid "Scroll to the left" msgstr "左へスクロールします" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4932 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4933 msgid "Scroll down" msgstr "下へスクロール" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4935 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4936 msgid "Scroll up" msgstr "上へスクロール" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4938 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4939 msgid "Scroll to the right" msgstr "右へスクロールします" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4942 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4945 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4948 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4952 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4956 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4959 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4961 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4962 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4964 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4965 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:4971 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4972 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4977 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:4981 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:4984 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4985 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4989 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4990 msgid "Inspect page details and access developer tools..." msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4995 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4996 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4998 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4999 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5001 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5002 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:5004 +msgid "Minimize _Current Tab" +msgstr "現在のタブの最小化(_C)" + +# tooltip +#: ../midori/midori-browser.c:5005 +msgid "Minimize the current tab" +msgstr "現在のタブを最小化します" + +#: ../midori/midori-browser.c:5007 +msgid "_Duplicate Current Tab" +msgstr "現在のタブの複製(_D)" + +# tooltip +#: ../midori/midori-browser.c:5008 +msgid "Duplicate the current tab" +msgstr "現在のタブを複製します" + +#: ../midori/midori-browser.c:5010 +msgid "Close Ot_her Tabs" +msgstr "他のタブを閉じる(_H)" + +# tooltip +#: ../midori/midori-browser.c:5011 +msgid "Close all tabs except the current tab" +msgstr "現在のタブ以外を全て閉じます" + +#: ../midori/midori-browser.c:5013 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:5014 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5016 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5018 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5019 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5021 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5022 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5024 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5025 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5028 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5036 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5037 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5040 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5041 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:5092 +#: ../midori/midori-browser.c:5044 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5045 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5048 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5049 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5052 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5053 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5056 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:5105 +#: ../midori/midori-browser.c:5057 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5065 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5120 +#: ../midori/midori-browser.c:5072 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5601 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5608 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5610 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5634 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5636 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5657 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:5733 -msgid "_Recently visited pages" -msgstr "最近訪れたページ(_R)" - -# tooltip -#: ../midori/midori-browser.c:5735 -msgid "Reopen pages that you visited earlier" -msgstr "以前に訪れたページを再び開きます" - -#: ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:5672 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:5763 +#: ../midori/midori-browser.c:5685 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5687 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5701 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5703 msgid "Menu" msgstr "メニュー" -#: ../midori/midori-browser.c:6358 +#: ../midori/midori-browser.c:6280 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -1076,664 +1098,642 @@ msgstr "データベース文の実行に失敗しました\n" msgid "Paste and p_roceed" msgstr "貼り付けて続行(_R)" +# tooltip #: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" -msgstr "選択したパネルをウィンドウから切り離す" +msgstr "選択したパネルをウィンドウから切り離します" +# tooltip #: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 #: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" -msgstr "サイドパネルを右側に配置する" +msgstr "サイドパネルを右側に配置します" +# tooltip #: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "パネルを閉じます" +# tooltip #: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" -msgstr "サイドパネルを左側に配置する" +msgstr "サイドパネルを左側に配置します" -#: ../midori/midori-panel.c:802 +# tooltip +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" -msgstr "操作コントロールを隠す" +msgstr "操作コントロールを隠します" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "空白ページを表示" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "ホームページを表示" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "最後のタブを読み込まずに表示" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "HTTP プロキシサーバ" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "プロキシサーバなし" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "最後のウィンドウの高さ" # tooltip -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "最後のパネルページ" # tooltip -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "メニューバーを表示する" # tooltip -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" # tooltip -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" # tooltip -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "パネルを表示する" # tooltip -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "転送バーを表示する" # tooltip -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "ステータスバーを表示する" # tooltip -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "ツールバー方式:" # tooltip -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" # tooltip -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" # tooltip -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "ツールバーアイテム" # tooltip -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" # tooltip -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "パネルの操作コントロールを表示する" # tooltip -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "パネルに操作コントロールを表示します" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" # tooltip -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "パネルを別のウィンドウで開く" # tooltip -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "パネルを常に別のウィンドウで開きます" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Midori を起動した時:" # tooltip -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Midori の起動時に表示するページを指定します" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "ホームページ:" # tooltip -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" # tooltip -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "新しいタブにスピードダイアルを表示する" # tooltip -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "新しく開かれたタブにスピードダイアルを表示します" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "ダウンロードファイルの保存先:" # tooltip -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "保存先フォルダを問い合わせる" # tooltip -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" # tooltip -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "ダウンロードマネージャ" # tooltip -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "テキストエディタ" # tooltip -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "フィードリーダ" # tooltip -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "ロケーションエントリの検索" # tooltip -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "文字のエンコーディング" # tooltip -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" # tooltip -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" # tooltip -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "新しくページを開く時:" # tooltip -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "外部ページを開く時:" # tooltip -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" # tooltip -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" # tooltip -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "画像を自動的に読み込む" # tooltip -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "スクリプトを有効にする" # tooltip -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" # tooltip -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にする" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にします" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にする" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にします" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にする" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にします" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" # tooltip -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" # tooltip -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "慣性スクロール" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "速度にしたがって慣性がかかったようにスクロールします" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Cookie の受け入れ" # tooltip -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "オリジナルの Cookie のみ" - -# tooltip -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "最後に訪れたページを記憶する" - -# tooltip -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "最後に訪れたページを記憶します" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "履歴の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" # tooltip -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "使用するプロキシサーバの種類を指定します" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "HTTP プロキシサーバ" # tooltip -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "プロキシサーバを自動検出する" - -# tooltip -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "プロキシサーバをシステム環境から自動的に検出します" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "識別名" # tooltip -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "識別文字列" # tooltip -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "言語の優先度" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1742,12 +1742,12 @@ msgstr "" "指定します。例 \"ja\"、\"en-us\" または \"ja;q=1.0, en-us;q=0.667\"" # Button title -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "プライベートデータのクリア" # FIXME: -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "選択されているプライベートデータを削除します" @@ -2281,30 +2281,36 @@ msgstr "Midori を終了(_Q)" msgid "The transfers will be cancelled if Midori quits." msgstr "Midori を終了すると転送がキャンセルされます。" -#: ../panels/midori-bookmarks.c:110 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:216 +#: ../panels/midori-bookmarks.c:249 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "ブックマークアイテムの追加に失敗しました: %s\n" +#: ../panels/midori-bookmarks.c:281 ../panels/midori-history.c:142 +#: ../panels/midori-history.c:172 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "履歴アイテムの削除に失敗しました: %s\n" + # tooltip -#: ../panels/midori-bookmarks.c:409 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" # tooltip -#: ../panels/midori-bookmarks.c:417 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:431 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 msgid "Separator" msgstr "セパレータ" @@ -2364,25 +2370,20 @@ msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:445 +#: ../panels/midori-history.c:414 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:423 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:462 +#: ../panels/midori-history.c:431 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "フィルタ:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "保存先フォルダを開く(_F)" @@ -2622,6 +2623,10 @@ msgstr "すべて展開する(_E)" msgid "_Collapse All" msgstr "すべて折り畳む(_C)" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "フィルタ:" + # tooltip #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "" @@ -2917,6 +2922,35 @@ msgstr "ツールバーのレイアウトを簡単に編集できます" msgid "Cache HTTP communication on disk" msgstr "HTTP 通信をディスクにキャッシュします" +#~ msgid "_Recently visited pages" +#~ msgstr "最近訪れたページ(_R)" + +# tooltip +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "以前に訪れたページを再び開きます" + +#~ msgid "Original cookies only" +#~ msgstr "オリジナルの Cookie のみ" + +# tooltip +#~ msgid "Accept cookies from the original website only" +#~ msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れます" + +#~ msgid "Remember last visited pages" +#~ msgstr "最後に訪れたページを記憶する" + +# tooltip +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "最後に訪れたページを記憶します" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "プロキシサーバを自動検出する" + +# tooltip +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "プロキシサーバをシステム環境から自動的に検出します" + # tooltip #~ msgid "Show the saved bookmarks" #~ msgstr "ブックマークを表示します" From 68c866325b1fefa7754c3aba9358a31d71222ab9 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Sun, 11 Jul 2010 21:10:44 +0200 Subject: [PATCH 2826/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 642 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 338 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 186 insertions(+), 152 deletions(-) diff --git a/po/uk.po b/po/uk.po index 80d70d7f..7c200099 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-05 04:08+0000\n" +"POT-Creation-Date: 2010-07-11 16:08+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -243,12 +243,12 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4855 -#: ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4910 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" @@ -352,8 +352,8 @@ msgstr "" msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4920 -#: ../panels/midori-bookmarks.c:403 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Додати нову закладку" @@ -363,23 +363,23 @@ msgstr "Додати нову закладку" msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:718 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:721 #: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:724 +#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:727 #: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" #: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:726 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:729 #: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" @@ -408,7 +408,7 @@ msgstr "Epiphany" msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 msgid "_Import bookmarks" msgstr "_Імпорт закладок" @@ -416,7 +416,7 @@ msgstr "_Імпорт закладок" msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 #: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." @@ -430,534 +430,562 @@ msgstr "Не вдалося імпортувати закладки" msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4167 ../panels/midori-bookmarks.c:278 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 +#: ../midori/midori-browser.c:4167 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Невдача при видаленні об'єкту історії: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Невдача при очищенні історії: %s\n" + +#: ../midori/midori-browser.c:4175 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Неможливо очистити історію пошуку: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4283 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4287 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4292 +#: ../midori/midori-browser.c:4301 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4303 ../midori/midori-preferences.c:533 +#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:120 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4318 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4323 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:4319 +#: ../midori/midori-browser.c:4328 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:4324 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:4329 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:4346 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:4438 +#: ../midori/midori-browser.c:4487 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4489 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:4459 +#: ../midori/midori-browser.c:4508 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:4817 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4770 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:4771 +#: ../midori/midori-browser.c:4820 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:4774 +#: ../midori/midori-browser.c:4823 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:4825 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:4777 +#: ../midori/midori-browser.c:4826 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4830 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:4784 +#: ../midori/midori-browser.c:4833 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4835 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:4787 +#: ../midori/midori-browser.c:4836 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:4789 +#: ../midori/midori-browser.c:4838 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:4839 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:4792 +#: ../midori/midori-browser.c:4841 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:4793 +#: ../midori/midori-browser.c:4842 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:4798 +#: ../midori/midori-browser.c:4847 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:4799 +#: ../midori/midori-browser.c:4848 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:4801 +#: ../midori/midori-browser.c:4850 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:4851 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4854 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4857 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4859 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:4863 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4866 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:4870 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:4824 ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4879 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4882 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4885 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4888 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4890 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4891 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4893 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4894 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4898 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4900 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4901 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:4913 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4916 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4919 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4920 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4922 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4923 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4926 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4929 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4930 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4932 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:4933 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:4935 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4936 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4938 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4939 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4942 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4945 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4948 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:4952 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4956 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:4959 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:4961 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4962 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4964 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4965 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4971 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4972 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:4928 +#: ../midori/midori-browser.c:4977 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:4931 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4981 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4984 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4985 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:4989 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:4990 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4995 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4996 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4998 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4999 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5001 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:5002 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:5004 +msgid "Minimize _Current Tab" +msgstr "Мінімізувати _поточну вкладку" + +#: ../midori/midori-browser.c:5005 +msgid "Minimize the current tab" +msgstr "Мінімізувати поточну вкладку" + +#: ../midori/midori-browser.c:5007 +msgid "_Duplicate Current Tab" +msgstr "_Дублювати поточну вкладку" + +#: ../midori/midori-browser.c:5008 +msgid "Duplicate the current tab" +msgstr "Дублювати поточну вкладку" + +#: ../midori/midori-browser.c:5010 +msgid "Close Ot_her Tabs" +msgstr "_Закрити інші вкладки" + +#: ../midori/midori-browser.c:5011 +msgid "Close all tabs except the current tab" +msgstr "Закрити всі вкладки окрім поточної вкладки" + +#: ../midori/midori-browser.c:5013 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5014 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:5016 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5018 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:5019 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5021 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5022 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:5024 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5025 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5028 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5036 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:5037 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:4982 +#: ../midori/midori-browser.c:5040 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5041 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5044 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:5045 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:5048 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:4991 +#: ../midori/midori-browser.c:5049 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5052 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5053 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5056 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5057 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5065 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5010 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:5072 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5017 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5020 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5023 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5026 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5601 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5608 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5610 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5634 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5636 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5657 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5672 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5685 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5687 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5701 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5703 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6219 +#: ../midori/midori-browser.c:6280 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" @@ -1004,7 +1032,7 @@ msgstr "Закрити панель" msgid "Align sidepanel to the left" msgstr "Рівняти бічну панель по лівому краю" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Приховати панель _управління" @@ -2100,24 +2128,30 @@ msgstr "Всі завантаження буде скасовано, якщо в msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:249 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не вдалося дадати закладку: %s\n" -#: ../panels/midori-bookmarks.c:411 +#: ../panels/midori-bookmarks.c:281 ../panels/midori-history.c:142 +#: ../panels/midori-history.c:172 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Невдача при видаленні об'єкту історії: %s\n" + +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" -#: ../panels/midori-bookmarks.c:419 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Видалити вибрану закладку" -#: ../panels/midori-bookmarks.c:433 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 msgid "Separator" msgstr "Роздільник" From df1f754a562c2fa4e6126ca6d01b826622be9e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Tue, 6 Jul 2010 02:09:15 +0200 Subject: [PATCH 2827/2970] Fix speed dial regex causing dials other than 1-9 to be ignored when adding --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e421c540..60bf8b09 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1144,7 +1144,7 @@ midori_browser_speed_dial_get_next_free_slot (void) else g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); - regex = g_regex_new ("\"id\":\"(s[1-9])\",\"href\":\"#\"", + regex = g_regex_new ("\"id\":\"(s[0-9]{1,2})\",\"href\":\"#\"", G_REGEX_MULTILINE, 0, NULL); if (g_regex_match (regex, speed_dial_body, 0, &match_info)) From 5a082100c80af824bd5b8880b86e7d82e74b50be Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 11 Jul 2010 23:49:13 +0200 Subject: [PATCH 2828/2970] Use sqlite3_mprintf to quote when inserting bookmark items --- panels/midori-bookmarks.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 5450f0ba..d767bec6 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -232,12 +232,9 @@ midori_bookmarks_insert_item_db (sqlite3* db, else parent = g_strdup (""); - /* Workaround a sqlite3_mprintf error with - handling of katze_item_get_meta_integer(). */ - /* FIXME: Need proper single quote escaping. */ - sqlcmd = g_strdup_printf ( + sqlcmd = sqlite3_mprintf ( "INSERT into bookmarks (uri, title, folder, toolbar, app) values" - " ('%s', '%s', '%s', %d, %d)", + " ('%q', '%q', '%q', %d, %d)", uri, katze_item_get_name (item), parent, @@ -252,7 +249,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, g_free (uri); g_free (parent); - g_free (sqlcmd); + sqlite3_free (sqlcmd); } void From f6be9c4972e22bc5886f23f208fac84c007891e0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 11 Jul 2010 23:54:52 +0200 Subject: [PATCH 2829/2970] Read 'config' in app mode, if -c switch was specfified --- midori/main.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index 9da5df2d..a29cc3ae 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1701,10 +1701,28 @@ main (int argc, gchar* tmp_uri = midori_prepare_uri (webapp); katze_assign (webapp, tmp_uri); midori_startup_timer ("Browser: \t%f"); - settings = katze_object_get_object (browser, "settings"); + if (config) + { + gchar* random_name; + gchar* app_name; + + random_name = g_strdup_printf ("app%u", g_random_int ()); + app_name = g_strconcat ("midori", "_", random_name, NULL); + app = g_object_new (MIDORI_TYPE_APP, "name", app_name, NULL); + g_free (random_name); + g_free (app_name); + + config_file = build_config_filename ("config"); + settings = settings_new_from_file (config_file, &extensions); + g_free (config_file); + g_strfreev (extensions); + } + else + settings = katze_object_get_object (browser, "settings"); g_object_set (settings, "show-menubar", FALSE, "show-navigationbar", TRUE, + "show-panel", FALSE, "toolbar-items", "Back,Forward,ReloadStop,Location", "homepage", NULL, "show-statusbar", TRUE, From 7fbc8b2f88f43d7ecd421d34ed07c35a1e789778 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Tue, 13 Jul 2010 15:11:43 +0200 Subject: [PATCH 2830/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 642 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 1101 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 574 insertions(+), 527 deletions(-) diff --git a/po/pt.po b/po/pt.po index 12e9829e..b89e3a97 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 10:08+0000\n" +"POT-Creation-Date: 2010-07-13 10:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador Web rápido" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -47,7 +47,7 @@ msgstr "O valor '%s' é inválido para %s" msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" @@ -104,244 +104,244 @@ msgstr "Restaurar última _sessão" msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1178 ../midori/main.c:1927 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1317 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1348 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1520 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1523 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1526 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1528 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1531 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1534 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1536 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1538 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão PATTERN" -#: ../midori/main.c:1540 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repor Midori após SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1544 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1625 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1774 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1800 +#: ../midori/main.c:1822 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1877 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1899 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1942 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1956 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1970 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1964 +#: ../midori/main.c:1986 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Ficheiro não encontrado." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Documento inválido." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Formato de marcadores não reconhecido." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5033 -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4910 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:454 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:492 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao actualizar título: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:933 -#: ../midori/midori-browser.c:4194 ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Adicionar a _Ligação Rápida" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:977 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:981 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1038 ../midori/midori-browser.c:4244 -#: ../midori/midori-browser.c:4276 +#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 +#: ../midori/midori-browser.c:4098 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1431 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:2133 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2211 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -349,643 +349,644 @@ msgstr "" "Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" "Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." -#: ../midori/midori-browser.c:2217 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2260 ../midori/midori-browser.c:5098 -#: ../panels/midori-bookmarks.c:418 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 +#: ../panels/midori-bookmarks.c:403 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:2729 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Falha ao executar o relatório da base de dados: %s\n" - -#: ../midori/midori-browser.c:2809 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vazio" - -#: ../midori/midori-browser.c:3416 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:3693 ../midori/midori-browser.c:5479 +#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:4027 ../panels/midori-bookmarks.c:777 -#: ../panels/midori-history.c:741 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:718 +#: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:4034 ../panels/midori-bookmarks.c:783 -#: ../panels/midori-history.c:747 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:724 +#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:4037 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4112 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:749 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:3945 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4116 +#: ../midori/midori-browser.c:3946 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:3947 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4118 +#: ../midori/midori-browser.c:3948 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4119 +#: ../midori/midori-browser.c:3949 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:3973 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4143 ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4154 +#: ../midori/midori-browser.c:3987 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4181 ../midori/midori-browser.c:5207 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4255 +#: ../midori/midori-browser.c:4075 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4291 +#: ../midori/midori-browser.c:4113 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4345 ../panels/midori-bookmarks.c:272 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4167 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Falha ao remover histórico: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Falha ao apagar o histórico: %s\n" + +#: ../midori/midori-browser.c:4175 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Falha ao apagar o histórico de pesquisas: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4452 +#: ../midori/midori-browser.c:4283 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4456 +#: ../midori/midori-browser.c:4287 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4470 +#: ../midori/midori-browser.c:4301 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4481 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4318 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4492 +#: ../midori/midori-browser.c:4323 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:4497 +#: ../midori/midori-browser.c:4328 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:4502 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:4507 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:4515 +#: ../midori/midori-browser.c:4346 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:4616 +#: ../midori/midori-browser.c:4487 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4489 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:4637 +#: ../midori/midori-browser.c:4508 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4817 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:4948 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4820 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4823 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:4825 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4826 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4830 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4833 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4835 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4836 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4838 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:4968 +#: ../midori/midori-browser.c:4839 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4841 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4842 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4847 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4848 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4850 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4851 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4854 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4857 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:4859 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4863 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4866 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4870 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5002 ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4879 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4882 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4885 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4888 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4890 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4891 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4893 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:4894 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:4898 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4900 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4901 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4913 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:4916 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:4919 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4920 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4922 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4923 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4926 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4929 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4930 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4932 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4933 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:4935 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4936 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4938 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:4939 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:4942 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:4945 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:4948 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:4952 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:4956 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:4959 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:4961 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:4962 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:4964 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:5094 +#: ../midori/midori-browser.c:4965 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:4971 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:4972 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:4977 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5109 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:4981 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:4984 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:5114 +#: ../midori/midori-browser.c:4985 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:4989 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:4990 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:4995 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:5125 +#: ../midori/midori-browser.c:4996 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:5127 +#: ../midori/midori-browser.c:4998 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:5128 +#: ../midori/midori-browser.c:4999 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5130 +#: ../midori/midori-browser.c:5001 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5131 +#: ../midori/midori-browser.c:5002 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5133 +#: ../midori/midori-browser.c:5004 +msgid "Minimize _Current Tab" +msgstr "Minimizar o Separador A_ctual" + +#: ../midori/midori-browser.c:5005 +msgid "Minimize the current tab" +msgstr "Minimizar o separador actual" + +#: ../midori/midori-browser.c:5007 +msgid "_Duplicate Current Tab" +msgstr "_Duplicar o Separador Actual" + +#: ../midori/midori-browser.c:5008 +msgid "Duplicate the current tab" +msgstr "Duplicar o separador actual" + +#: ../midori/midori-browser.c:5010 +msgid "Close Ot_her Tabs" +msgstr "Fec_har os Outros Separadores" + +#: ../midori/midori-browser.c:5011 +msgid "Close all tabs except the current tab" +msgstr "Fechar todos os separadores excepto o actual" + +#: ../midori/midori-browser.c:5013 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5134 +#: ../midori/midori-browser.c:5014 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5136 +#: ../midori/midori-browser.c:5016 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:5018 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5139 +#: ../midori/midori-browser.c:5019 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5141 +#: ../midori/midori-browser.c:5021 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5142 +#: ../midori/midori-browser.c:5022 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5144 +#: ../midori/midori-browser.c:5024 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5145 +#: ../midori/midori-browser.c:5025 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5148 +#: ../midori/midori-browser.c:5028 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:5036 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:5037 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:5040 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5161 +#: ../midori/midori-browser.c:5041 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5164 +#: ../midori/midori-browser.c:5044 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:5045 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:5048 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5169 +#: ../midori/midori-browser.c:5049 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5172 +#: ../midori/midori-browser.c:5052 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:5053 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:5056 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5177 +#: ../midori/midori-browser.c:5057 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5185 +#: ../midori/midori-browser.c:5065 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5192 +#: ../midori/midori-browser.c:5072 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5195 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5198 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5201 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5204 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5601 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5608 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:5744 +#: ../midori/midori-browser.c:5610 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:5768 +#: ../midori/midori-browser.c:5634 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:5770 +#: ../midori/midori-browser.c:5636 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:5791 +#: ../midori/midori-browser.c:5657 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:5806 -msgid "_Recently visited pages" -msgstr "Páginas _Recentes" - -#: ../midori/midori-browser.c:5808 -msgid "Reopen pages that you visited earlier" -msgstr "Reabrir páginas visitadas anteriormente" - -#: ../midori/midori-browser.c:5823 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/midori-browser.c:5825 -msgid "Show the saved bookmarks" -msgstr "Mostrar marcadores guardados" - -#: ../midori/midori-browser.c:5840 +#: ../midori/midori-browser.c:5672 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:5853 +#: ../midori/midori-browser.c:5685 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:5855 +#: ../midori/midori-browser.c:5687 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:5869 +#: ../midori/midori-browser.c:5701 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5871 +#: ../midori/midori-browser.c:5703 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6455 +#: ../midori/midori-browser.c:6280 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" @@ -1032,602 +1033,578 @@ msgstr "Fechar painel" msgid "Align sidepanel to the left" msgstr "Alinhar painel à esquerda" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Ocultar controlos operacionais" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Mostrar Página em Branco" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Mostrar Página Inicial" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Mostrar últimos separadores abertos" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Mostrar últimos separadores sem os carregar" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Marque se quiser guardar o último tamanho da janela" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "Última página de painel guardada" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Última pesquisa Web" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Mostrar Barra de Transferências" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Marque se quiser mostrar a barra de transferências" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Estilo da Barra de Ferramentas:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Mostrar evolução no endereço" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Marque se quiser mostrar a evolução de carregamento do endereço" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Marque se quiser mostrar motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Marque se quiser mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Marque se quiser alinhar o painel lateral à direita" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Abrir painéis em janelas separadas" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Marque se quiser abrir, sempre, os painéis em janelas separadas" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Ao iniciar Midori:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Página Inicial:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Mostrar ligação rápida em novos separadores" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar ligação rápida em separadores recentemente abertos" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Guardar ficheiros transferidos em:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Perguntar pasta de destino" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Marcar se quiser perguntar por uma pasta de destino ao transferir um ficheiro" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Marque se quiser mostrar uma notificação ao concluir a transferência" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Agregador de Notícias" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Pesquisa de Endereço" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "A pesquisa a executar no endereço" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Marque se quiser que os separadores tenham ícones para fechar" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Abrir páginas externas em:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Marque se quiser abrir os novos separadores em segundo plano" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Marque se quiser abrir os novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Marque se quiser abrir janelas popup em separadores" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Carregar e apresentar automaticamente as imagens " -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activar argumentos" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Activar argumentos de linguagem incorporados" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activar plugins Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Activar plugins Netscape incorporados" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Activar suporte a dados HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Marque se quiser activar suporte a dados HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Activar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Marque se quiser activar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Activar cache de aplicação web offline" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Marque se quiser activar cache de aplicação web offline" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Marque se quiser ajustar zoom de texto e imagens" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "Marque se quiser encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Deslocamento cinético" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Marque se quiser que o deslocamento se mova cineticamente conforme a velocidade" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Apenas cookies originais" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Apenas aceitar cookies do sítio web original" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "O número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Lembrar últimas páginas visitadas" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Marque se quiser guardar as últimas páginas visitadas" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Marque se quiser guardar as últimas transferências" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "O tipo de servidor a utilizar" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "Servidor Proxy HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Detectar servidor proxy automaticamente" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Marque se quiser detectar automaticamente o servidor proxy" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Uma lista de idiomas, separada por vírgulas, para o processamento de páginas web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "Os dados privados seleccionados para apagar" @@ -1635,8 +1612,8 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4576 -#: ../midori/midori-view.c:4580 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Erro - %s" @@ -1742,277 +1719,281 @@ msgstr "_Pesquisar na Web" msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:2702 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2709 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3253 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Definir número de colunas e linhas" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Indique o número de colunas e linhas:" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Entrada inválida para o tamanho da ligação rápida" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Tamanho das miniaturas:" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Pequenas" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Médias" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Grandes" -#: ../midori/midori-view.c:3572 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:3595 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3716 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Actualização de página atrasada" -#: ../midori/midori-view.c:3717 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "O atraso na actualização foi devido a um encerramento brusco ou ás preferências de arranque." -#: ../midori/midori-view.c:3718 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Carregar Página" -#: ../midori/midori-view.c:3862 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4116 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "_Restaurar Separadores" -#: ../midori/midori-view.c:4121 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Minizar Separadores" -#: ../midori/midori-view.c:4127 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4813 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4814 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4866 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funcionalidades" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Geral" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Início" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Usar página actual como página inicial" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferências" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Definições de fonte" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Família de Fontes por Omissão" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "A família de fontes, usada por omissão, para apresentar texto" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "O tamanho da fonte, por omissão, para apresentar texto" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Família de Fontes de Largura Fixa" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "A família de fontes usada para apresentar texto com largura fixa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Tamanho da fonte para apresentar texto com largura fixa" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Tamanho Mínimo de Fonte" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo de fonte para apresentar texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegada" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Forçar densidade de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Permitir que os scripts abram popups" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Marque se quiser que os scripts abram janelas popup automaticamente" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Verificação Ortográfica" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Activar Verificação Ortográfica" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Activar verificação ortográfica ao escrever" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Dicionários:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Uma lista de idiomas, separados por vírgulas, para a verificação ortográfica, por exemplo \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Barra de Navegação" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navegar" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Aplicações" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Aplicações externas" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Nome de anfitrião" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "dias" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Vazio" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" @@ -2045,6 +2026,10 @@ msgstr "Usar por _omissão" msgid "_Bookmark" msgstr "_Marcador" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Marcadores" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Adicionar _Marcador" @@ -2128,40 +2113,46 @@ msgstr "Transferência concluída" msgid "Clear All" msgstr "Limpar Tudo" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Existem ficheiros a ser transferidos" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Sair do Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "As transferências serão canceladas se sair do Midori." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:246 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Falha ao adicionar marcador: %s\n" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:278 ../panels/midori-history.c:142 +#: ../panels/midori-history.c:172 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falha ao remover histórico: %s\n" + +#: ../panels/midori-bookmarks.c:411 msgid "Edit the selected bookmark" msgstr "Editar marcador seleccionado" -#: ../panels/midori-bookmarks.c:434 +#: ../panels/midori-bookmarks.c:419 msgid "Delete the selected bookmark" msgstr "Apagar marcador seleccionado" -#: ../panels/midori-bookmarks.c:448 +#: ../panels/midori-bookmarks.c:433 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:582 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Separador" @@ -2181,54 +2172,55 @@ msgstr "Copiar Tudo" msgid "Extensions" msgstr "Extensões" -#: ../panels/midori-history.c:273 +#: ../panels/midori-history.c:274 msgid "Erroneous clock time" msgstr "Hora do relógio incorrecta" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:275 msgid "The clock time lies in the past. Please check the current date and time." msgstr "O relógio está incorrecto. Por favor, verifique a data e hora actual." -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dia atrás" msgstr[1] "%d dias atrás" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Ontem" -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Falha ao executar o relatório da base de dados: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Tem a certeza que quer remover todo o histórico?" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:414 msgid "Bookmark the selected history item" msgstr "Marcar o item de histórico seleccionado" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:423 msgid "Delete the selected history item" msgstr "Apagar item de histórico seleccionado" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:431 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-history.c:943 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtro:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Abrir Pas_ta de Destino" @@ -2275,16 +2267,16 @@ msgstr "O ícone '%s' não foi carregado" msgid "Animation frames are broken" msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Escolha o ficheiro" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Escolha a pasta" @@ -2322,11 +2314,11 @@ msgstr "Bl_oquear imagem" msgid "Bl_ock link" msgstr "Bl_oquear ligação" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com a lista " @@ -2452,6 +2444,10 @@ msgstr "_Expandir Todos" msgid "_Collapse All" msgstr "_Contrair Todos" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtro:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Introduza um filtro para apenas mostrar os cookies cujo nome ou domínio coincidam com o filtro" @@ -2476,6 +2472,14 @@ msgstr "Copiar Endereço dos Separadores" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copiar endereço de todos os separadores para a área de transferência" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Aplicações Externas" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Associar o esquema das URL a comandos externos" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Falha ao encontrar os elementos Atom de \"entry\" nos dados XML." @@ -2560,28 +2564,52 @@ msgstr "Painel de Fontes" msgid "Read Atom/ RSS feeds" msgstr "Ler fontes Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Armazena o histórico do formulário" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Não disponível: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "O ficheiro de recursos não está instalado" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "Preenchimento do formulário" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Próximo Separador (Lista de Histórico)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Próximo separador do histórico" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Separador Anterior (Lista de Histórico)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Separador anterior do histórico" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Lista de Histórico" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permite mudar de separadores ao escolher de uma lista ordenada por uso" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gestos de Rato" @@ -2659,14 +2687,6 @@ msgstr "P_ainel de Separadores" msgid "Show tabs in a vertical panel" msgstr "Mostrar separadores em painel vertical" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Lista de Histórico do Separador" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permite mudar de separadores ao escolher de uma lista ordenada por uso" - #: ../extensions/tabs-minimized.c:79 msgid "Minimize new Tabs" msgstr "Minimizar novos Separadores" @@ -2707,6 +2727,33 @@ msgstr "Editar facilmente a barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "_Recently visited pages" +#~ msgstr "Páginas _Recentes" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Reabrir páginas visitadas anteriormente" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Mostrar marcadores guardados" + +#~ msgid "Original cookies only" +#~ msgstr "Apenas cookies originais" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Apenas aceitar cookies do sítio web original" + +#~ msgid "Remember last visited pages" +#~ msgstr "Lembrar últimas páginas visitadas" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Marque se quiser guardar as últimas páginas visitadas" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Detectar servidor proxy automaticamente" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Marque se quiser detectar automaticamente o servidor proxy" + #~ msgid "Set number of shortcuts" #~ msgstr "Definir número de atalhos" From 1b933a5da6049407afdf655f9810f56cf0649478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Tue, 13 Jul 2010 16:39:22 +0200 Subject: [PATCH 2831/2970] l10n: Updated Czech (cs) translation to 100% New status: 642 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 791 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 408 insertions(+), 383 deletions(-) diff --git a/po/cs.po b/po/cs.po index 67bd8616..6ba12724 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 16:08+0000\n" +"POT-Creation-Date: 2010-07-13 10:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -24,7 +24,7 @@ msgstr "Odlehčený prohlížeč" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 #: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -104,7 +104,7 @@ msgstr "Vymazat poslední _sezení" msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1178 ../midori/main.c:1927 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" @@ -191,39 +191,39 @@ msgstr "Komentáře, požadavky a chyby posílejte na:" msgid "Check for new versions at:" msgstr "Zkontrolujte, zda není nová verze na " -#: ../midori/main.c:1756 +#: ../midori/main.c:1774 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1804 +#: ../midori/main.c:1822 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1877 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1899 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1942 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1956 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1970 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1968 +#: ../midori/main.c:1986 msgid "_Ignore" msgstr "_Ignorovat" @@ -244,727 +244,747 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4910 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:454 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:492 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:730 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:730 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:732 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:732 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:769 +#: ../midori/midori-browser.c:763 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 -#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 +#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:879 +#: ../midori/midori-browser.c:873 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:886 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:907 +#: ../midori/midori-browser.c:901 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 +#: ../midori/midori-browser.c:4098 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2155 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." -#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 -#: ../panels/midori-bookmarks.c:401 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 +#: ../panels/midori-bookmarks.c:403 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:718 +#: ../panels/midori-history.c:710 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:724 +#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:3945 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:3946 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:3947 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:3948 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4055 +#: ../midori/midori-browser.c:3949 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:3973 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:3987 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4075 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4113 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 +#: ../midori/midori-browser.c:4167 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Nepodařilo se odstranit položku historie: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Nepodařilo se smazat historii: %s\n" + +#: ../midori/midori-browser.c:4175 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Nepodařilo se smazat historii hledání: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4283 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4287 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4301 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:120 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:4415 +#: ../midori/midori-browser.c:4318 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4323 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:4425 +#: ../midori/midori-browser.c:4328 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4346 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:4544 +#: ../midori/midori-browser.c:4487 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4546 +#: ../midori/midori-browser.c:4489 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4508 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4817 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4820 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4823 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4825 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4826 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4830 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4833 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:4835 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4836 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4838 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4839 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4841 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4842 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4847 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4848 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4850 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4851 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4854 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4857 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4859 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4863 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4866 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4870 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4879 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4882 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4885 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4888 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4890 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4891 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4893 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:4894 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4898 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4900 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4901 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4913 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4916 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4919 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4920 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4922 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4923 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4926 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4929 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4930 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4932 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4933 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4935 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4936 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4938 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4939 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4942 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4945 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4948 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4952 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4956 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4959 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4961 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4962 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4964 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4965 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:4971 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4972 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4977 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:4981 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:4984 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4985 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4989 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4990 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4995 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4996 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4998 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4999 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:5001 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5002 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:5004 +msgid "Minimize _Current Tab" +msgstr "Minimalizovat _aktuální kartu" + +#: ../midori/midori-browser.c:5005 +msgid "Minimize the current tab" +msgstr "Minimalizuje aktuální kartu" + +#: ../midori/midori-browser.c:5007 +msgid "_Duplicate Current Tab" +msgstr "Z_dvojit aktuální kartu" + +#: ../midori/midori-browser.c:5008 +msgid "Duplicate the current tab" +msgstr "Obsah aktuální karty otevře v nové kartě" + +#: ../midori/midori-browser.c:5010 +msgid "Close Ot_her Tabs" +msgstr "_Zavřít ostatní karty" + +#: ../midori/midori-browser.c:5011 +msgid "Close all tabs except the current tab" +msgstr "Zavře všechny karty kromě aktuální" + +#: ../midori/midori-browser.c:5013 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:5014 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5016 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5018 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5019 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5021 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5022 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5024 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5025 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5028 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5036 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5037 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5040 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5041 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5092 +#: ../midori/midori-browser.c:5044 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5045 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5048 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5049 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5052 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5053 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5056 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5105 +#: ../midori/midori-browser.c:5057 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5065 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5120 +#: ../midori/midori-browser.c:5072 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5601 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5608 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5610 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5634 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5636 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5657 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:5733 -msgid "_Recently visited pages" -msgstr "_Naposledy navštívené stránky" - -#: ../midori/midori-browser.c:5735 -msgid "Reopen pages that you visited earlier" -msgstr "Znovu otevře stránky, které jste již navštívili" - -#: ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:5672 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:5763 +#: ../midori/midori-browser.c:5685 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5687 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5701 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5703 msgid "Menu" msgstr "Nabídka" -#: ../midori/midori-browser.c:6358 +#: ../midori/midori-browser.c:6280 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" @@ -1011,602 +1031,578 @@ msgstr "Zavřít panel" msgid "Align sidepanel to the left" msgstr "Umístit boční panel vlevo" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Schovat ovládací prvky" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "zobrazit prázdnou stránku" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "zobrazit domovskou stránku" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "zobrazit naposledy otevřené karty" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "zobrazit naposledy otevřené karty bez načtení" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "nové kartě" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "novém okně" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "výchozí" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "ikony" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "malé ikony" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "ikony a text" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "automaticky (GNOME, nebo jiné prostředí)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "žádný" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "všechna cookies" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "cookies sezení" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "žádná" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Ukládat rozměry okna?" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Šířka okna" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Výška okna" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "Uložená poslední pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Poslední otevřená stránka" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "Uložená stránka" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Rychlé hledání na webu" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "Uložené poslední vyhledávání na webu" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Zobrazit nabídku?" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Zobrazit vyhledávání" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Zobrazit lištu vyhledávání?" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Zobrazit lištu se záložkami?" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Zobrazit panel?" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Zobrazit stav přenosu" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Zobrazit stav přenosu?" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Zobrazit stavový řádek?" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Styl lišty:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "Nastaví styl lišty (zobrazení textu a ikon)." -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Zobrazit průběh v řádku adresy" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Zobrazovat průběh načítání v řádku s adresou?" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Zobrazovat výsledky hledání při zadávání adresy" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Položky nástrojové lišty" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Položky, které se budou zobrazovat na nástrojové liště" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Kompaktní boční panel" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Má se zobrazit boční panel kompaktně?" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Zobrazí seznam nástrojů" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Zda zobrazovat seznam nástrojů" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Přesunout boční panel na opačnou stranu" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Otvírat panely v samostatných oknech" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Zda vždy otevřít panel v samostatné okno" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Když Midori nastartuje:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Co udělat, když je Midori spuštěno" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Zobrazit obsah rychlého přístupu v kartách" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Ukládat stažené soubory do:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "Kam se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Zeptat se na cílovou složku" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Zda se ptát, kam se bude ukládat" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Upozornit na dokončení přenosu" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Zda zobrazit upozornění při dokončení přenosu" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Správce stahování" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "Externí program pro stahování" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Preferované kódování" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Preferované kódování stránek" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Vždy zobrazovat karty" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Zobrazit karty, i když je jen jedna?" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Nové stránky otevírat v:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Externí stránky otevírat v:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Kde se budou otevírat externí stránky" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Karty se otevírají na pozadí" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta se otevře vedle aktivní" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovací okno se otevře v nové kartě" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Automaticky načítat obrázky" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Automaticky načítat a zobrazovat obrázky" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Povolit skripty" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Povolit vložené skriptové jazyky" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Povolit pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Povolit HTML5 databázi" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Zda povolit HTML5 databázi" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Povolit místní úložiště pro HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Zda povolit místní úložiště dat pro HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Povolit cache pro offline aplikace" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Zda povolit používání cache pro offline aplikace" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Při přibližování zvětšovat text i obrázky?" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "Při psaní hledat text?" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Kinetické rolování" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Zda naklápěním zařízení rolovat" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Přijímat cookies:" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Který typ cookies přijímat" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Původní" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Z původní stránky" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Maximální stáří cookies" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Pamatovat si naposledy navštívené stránky" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Pamatovat si naposledy navštívené stránky?" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Maximální délka historie" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Pamatovat si naposledy stahované soubory" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Pamatovat si seznam souborů, které byly stahovány?" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "Jaký typ proxy serveru chcete použít" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Proxy server, který bude použit pro HTTP spojení" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Zjistit proxy server automaticky" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Zjistit nastavení proxy serveru automaticky (podle prostředí)?" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Jak se hlásit webovým stránkám" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Preferované jazyky" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", nebo \"cs-cs;q=1.0, en-en;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "Osobní data byla označena ke smazání" @@ -2127,24 +2123,30 @@ msgstr "U_končit Midori" msgid "The transfers will be cancelled if Midori quits." msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." -#: ../panels/midori-bookmarks.c:110 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:216 +#: ../panels/midori-bookmarks.c:246 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Záložku se nepodařilo přidat: %s\n" -#: ../panels/midori-bookmarks.c:409 +#: ../panels/midori-bookmarks.c:278 ../panels/midori-history.c:142 +#: ../panels/midori-history.c:172 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodařilo se odstranit položku historie: %s\n" + +#: ../panels/midori-bookmarks.c:411 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:417 +#: ../panels/midori-bookmarks.c:419 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:431 +#: ../panels/midori-bookmarks.c:433 msgid "Add a new folder" msgstr "Přidat složku" @@ -2206,23 +2208,18 @@ msgstr "Nepodařilo se spustit databázový příkaz: %s\n" msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat všechny položky historie?" -#: ../panels/midori-history.c:445 +#: ../panels/midori-history.c:414 msgid "Bookmark the selected history item" msgstr "Zazáložkovat vybranou položku historie" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:423 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:462 +#: ../panels/midori-history.c:431 msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtr:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Otevřít cílovou _složku" @@ -2444,6 +2441,10 @@ msgstr "Rozbalit _vše" msgid "_Collapse All" msgstr "_Sbalit vše" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtr:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle názvu nebo domény" @@ -2723,6 +2724,30 @@ msgstr "Umožňuje jednoduše změnit lištu" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +#~ msgid "_Recently visited pages" +#~ msgstr "_Naposledy navštívené stránky" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Znovu otevře stránky, které jste již navštívili" + +#~ msgid "Original cookies only" +#~ msgstr "Původní" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Z původní stránky" + +#~ msgid "Remember last visited pages" +#~ msgstr "Pamatovat si naposledy navštívené stránky" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Pamatovat si naposledy navštívené stránky?" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Zjistit proxy server automaticky" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Zjistit nastavení proxy serveru automaticky (podle prostředí)?" + #~ msgid "Show the saved bookmarks" #~ msgstr "Zobrazit uložené záložky" From b5a4023a7d40184cd270d43fe5b59191b87e87b5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 14 Jul 2010 23:48:45 +0200 Subject: [PATCH 2832/2970] Use 'git describe' to generate the git version string --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index c21dc807..ae358ab8 100644 --- a/wscript +++ b/wscript @@ -35,9 +35,9 @@ APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: - git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True) + git = Utils.cmd_output (['git', 'describe'], silent=True) if git: - VERSION = (VERSION + '-' + git).strip () + VERSION = git except: pass From 0fcc460312c5376eb7b2c1deadc633c86eef40ad Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Wed, 14 Jul 2010 23:51:39 +0200 Subject: [PATCH 2833/2970] Handle news feeds with empty date and update them correctly --- extensions/feed-panel/feed-parse.c | 7 +++++-- extensions/feed-panel/feed-rss.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions/feed-panel/feed-parse.c b/extensions/feed-panel/feed-parse.c index 1f7c41b0..9963d0ec 100644 --- a/extensions/feed-panel/feed-parse.c +++ b/extensions/feed-panel/feed-parse.c @@ -100,8 +100,11 @@ feed_get_element_date (FeedParser* fparser) SoupDate* sdate; sdate = soup_date_new_from_string (content); - date = soup_date_to_time_t (sdate); - soup_date_free (sdate); + if (sdate) + { + date = soup_date_to_time_t (sdate); + soup_date_free (sdate); + } g_free (content); } return ((gint64)date); diff --git a/extensions/feed-panel/feed-rss.c b/extensions/feed-panel/feed-rss.c index 8351fd53..356a582f 100644 --- a/extensions/feed-panel/feed-rss.c +++ b/extensions/feed-panel/feed-rss.c @@ -76,7 +76,7 @@ rss_update (FeedParser* fparser) fparser->node = child; newdate = feed_get_element_date (fparser); fparser->node = node; - return (date != newdate); + return (date != newdate || date == 0); } } child = child->next; From 3bfb452e697f52c872667667619508d3dd7fdbb1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Jul 2010 21:13:11 +0200 Subject: [PATCH 2834/2970] Don't save configuration on every location change --- midori/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index a29cc3ae..243d8d00 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1268,8 +1268,6 @@ midori_load_session (gpointer data) g_object_unref (_session); katze_assign (config_file, build_config_filename ("session.xbel")); - g_signal_connect_after (browser, "notify::uri", - G_CALLBACK (midori_browser_session_cb), session); g_signal_connect_after (browser, "add-tab", G_CALLBACK (midori_browser_session_cb), session); g_signal_connect_after (browser, "remove-tab", From 57683d45b16fbf8455c29743778a82a3b57bb003 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Jul 2010 21:23:11 +0200 Subject: [PATCH 2835/2970] Use no border (shadow) on views by default --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 58c65520..29e2f5be 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2903,7 +2903,7 @@ midori_view_init (MidoriView* view) /* Adjustments are not created initially, but overwritten later */ view->scrolled_window = katze_scrolled_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view->scrolled_window), - GTK_SHADOW_ETCHED_OUT); + GTK_SHADOW_NONE); gtk_container_add (GTK_CONTAINER (view), view->scrolled_window); g_signal_connect (view->scrolled_window, "notify::hadjustment", From 94fbf158f6e12a970147eb247ee1b508989c52ba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 17 Jul 2010 21:31:29 +0200 Subject: [PATCH 2836/2970] Remove conditional guards for sqlite --- extensions/formhistory.c | 16 +--------------- midori/main.c | 19 +------------------ midori/midori-browser.c | 30 +----------------------------- midori/midori-locationaction.c | 14 +------------- midori/midori-view.c | 2 -- panels/midori-bookmarks.c | 13 ------------- panels/midori-bookmarks.h | 7 +------ panels/midori-history.c | 20 ++------------------ wscript | 1 - 9 files changed, 7 insertions(+), 115 deletions(-) diff --git a/extensions/formhistory.c b/extensions/formhistory.c index c0eb8576..446e534b 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -21,9 +21,7 @@ #include #endif -#if HAVE_SQLITE - #include -#endif +#include static GHashTable* global_keys; static gchar* jsforms; @@ -130,7 +128,6 @@ formhistory_update_database (gpointer db, const gchar* key, const gchar* value) { - #if HAVE_SQLITE gchar* sqlcmd; gchar* errmsg; gint success; @@ -146,7 +143,6 @@ formhistory_update_database (gpointer db, g_free (errmsg); return; } - #endif } static gboolean @@ -372,9 +368,7 @@ formhistory_deactivate_cb (MidoriExtension* extension, MidoriBrowser* browser) { MidoriApp* app = midori_extension_get_app (extension); - #if HAVE_SQLITE sqlite3* db; - #endif g_signal_handlers_disconnect_by_func ( browser, formhistory_add_tab_cb, extension); @@ -389,13 +383,10 @@ formhistory_deactivate_cb (MidoriExtension* extension, if (global_keys) g_hash_table_destroy (global_keys); - #if HAVE_SQLITE if ((db = g_object_get_data (G_OBJECT (extension), "formhistory-db"))) sqlite3_close (db); - #endif } -#if HAVE_SQLITE static int formhistory_add_field (gpointer data, int argc, @@ -423,18 +414,15 @@ formhistory_add_field (gpointer data, } return 0; } -#endif static void formhistory_activate_cb (MidoriExtension* extension, MidoriApp* app) { - #if HAVE_SQLITE const gchar* config_dir; gchar* filename; sqlite3* db; char* errmsg = NULL, *errmsg2 = NULL; - #endif KatzeArray* browsers; MidoriBrowser* browser; guint i; @@ -444,7 +432,6 @@ formhistory_activate_cb (MidoriExtension* extension, (GDestroyNotify)g_free); if(!jsforms) formhistory_prepare_js (); - #if HAVE_SQLITE config_dir = midori_extension_get_config_dir (extension); katze_mkdir_with_parents (config_dir, 0700); filename = g_build_filename (config_dir, "forms.db", NULL); @@ -475,7 +462,6 @@ formhistory_activate_cb (MidoriExtension* extension, } sqlite3_close (db); } - #endif browsers = katze_object_get_object (app, "browsers"); i = 0; diff --git a/midori/main.c b/midori/main.c index 243d8d00..b8c823cc 100644 --- a/midori/main.c +++ b/midori/main.c @@ -33,10 +33,7 @@ #include #include #include - -#if HAVE_SQLITE - #include -#endif +#include #if ENABLE_NLS #include @@ -351,7 +348,6 @@ search_engines_save_to_file (KatzeArray* search_engines, return saved; } -#if HAVE_SQLITE static sqlite3* midori_history_initialize (KatzeArray* array, const gchar* filename, @@ -471,7 +467,6 @@ midori_bookmarks_import (const gchar* filename, } midori_bookmarks_import_array_db (db, bookmarks, ""); } -#endif static void midori_session_add_delay (KatzeArray* session) @@ -1561,11 +1556,9 @@ main (int argc, gchar* uri; KatzeItem* item; gchar* uri_ready; - #if HAVE_SQLITE gchar* errmsg; sqlite3* db; gint max_history_age; - #endif gint clear_prefs = MIDORI_CLEAR_NONE; #ifdef G_ENABLE_DEBUG gboolean startup_timer = g_getenv ("MIDORI_STARTTIME") != NULL; @@ -1888,7 +1881,6 @@ main (int argc, midori_startup_timer ("Search read: \t%f"); bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - #if HAVE_SQLITE katze_assign (config_file, build_config_filename ("bookmarks.db")); errmsg = NULL; if ((db = midori_bookmarks_initialize (bookmarks, config_file, &errmsg)) == NULL) @@ -1908,7 +1900,6 @@ main (int argc, g_free (old_bookmarks); g_object_set_data (G_OBJECT (bookmarks), "db", db); } - #endif midori_startup_timer ("Bookmarks read: \t%f"); _session = katze_array_new (KATZE_TYPE_ITEM); @@ -1944,7 +1935,6 @@ main (int argc, midori_startup_timer ("Trash read: \t%f"); history = katze_array_new (KATZE_TYPE_ARRAY); - #if HAVE_SQLITE katze_assign (config_file, build_config_filename ("history.db")); errmsg = NULL; @@ -1955,7 +1945,6 @@ main (int argc, g_free (errmsg); } g_object_set_data (G_OBJECT (history), "db", db); - #endif midori_startup_timer ("History read: \t%f"); /* In case of errors */ @@ -2043,9 +2032,7 @@ main (int argc, G_CALLBACK (midori_trash_add_item_cb), NULL); g_signal_connect_after (trash, "remove-item", G_CALLBACK (midori_trash_remove_item_cb), NULL); - #if HAVE_SQLITE katze_assign (config_file, build_config_filename ("history.db")); - #endif katze_item_set_parent (KATZE_ITEM (_session), app); g_object_set_data (G_OBJECT (app), "extensions", extensions); @@ -2107,18 +2094,14 @@ main (int argc, gtk_main (); settings = katze_object_get_object (app, "settings"); - #if HAVE_SQLITE g_object_get (settings, "maximum-history-age", &max_history_age, NULL); midori_history_terminate (db, max_history_age); - #endif /* Clear data on quit, according to the Clear private data dialog */ g_object_get (settings, "clear-private-data", &clear_prefs, NULL); if (clear_prefs & MIDORI_CLEAR_ON_QUIT) { - #if HAVE_SQLITE midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "history.db"); - #endif midori_remove_config_file (clear_prefs, MIDORI_CLEAR_COOKIES, "cookies.txt"); if ((clear_prefs & MIDORI_CLEAR_FLASH_COOKIES) == MIDORI_CLEAR_FLASH_COOKIES) { diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 60bf8b09..96b969da 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -48,9 +48,7 @@ #include #endif -#if HAVE_SQLITE - #include -#endif +#include #if HAVE_CONFIG_H #include @@ -170,7 +168,6 @@ midori_browser_get_property (GObject* object, GValue* value, GParamSpec* pspec); -#if HAVE_SQLITE void midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, @@ -184,7 +181,6 @@ midori_bookmarks_insert_item_db (sqlite3* db, void midori_bookmarks_remove_item_from_db (sqlite3* db, KatzeItem* item); -#endif static void midori_browser_new_history_item (MidoriBrowser* browser, @@ -472,7 +468,6 @@ static void midori_browser_update_history_title (MidoriBrowser* browser, KatzeItem* item) { - #if HAVE_SQLITE sqlite3* db; static sqlite3_stmt* stmt = NULL; @@ -492,7 +487,6 @@ midori_browser_update_history_title (MidoriBrowser* browser, g_printerr (_("Failed to update title: %s\n"), sqlite3_errmsg (db)); sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); - #endif } static void @@ -715,16 +709,12 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkWidget* check_toolbar; GtkWidget* check_app; gboolean return_status = FALSE; - #if HAVE_SQLITE sqlite3* db; - #endif if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) return FALSE; - #if HAVE_SQLITE db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); - #endif if (is_folder) title = new_bookmark ? _("New folder") : _("Edit folder"); @@ -817,12 +807,10 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, { GtkListStore* model; GtkCellRenderer* renderer; - #if HAVE_SQLITE guint i, n; sqlite3_stmt* statement; gint result; const gchar* sqlcmd; - #endif hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); @@ -839,7 +827,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, 0, _("Toplevel folder"), 1, PANGO_ELLIPSIZE_END, -1); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); - #if HAVE_SQLITE i = 0; n = 1; sqlcmd = "SELECT title from bookmarks where uri=''"; @@ -856,7 +843,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, } if (n < 2) gtk_widget_set_sensitive (combo_folder, FALSE); - #endif gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); @@ -927,7 +913,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - #if HAVE_SQLITE midori_bookmarks_remove_item_from_db (db, bookmark); if (!strcmp (selected, _("Toplevel folder"))) { @@ -947,7 +932,6 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) if (!gtk_widget_get_visible (browser->bookmarkbar)) _action_set_active (browser, "Bookmarkbar", TRUE); - #endif g_free (selected); return_status = TRUE; } @@ -3481,12 +3465,10 @@ _action_location_submit_uri (GtkAction* action, gchar** parts; gchar* keywords = NULL; const gchar* search_uri = NULL; - #if HAVE_SQLITE time_t now; gint64 day; sqlite3* db; static sqlite3_stmt* statement = NULL; - #endif /* Do we have a keyword and a string? */ parts = g_strsplit (stripped_uri, " ", 2); @@ -3510,7 +3492,6 @@ _action_location_submit_uri (GtkAction* action, } new_uri = sokoke_search_uri (search_uri, keywords); - #if HAVE_SQLITE now = time (NULL); day = sokoke_time_t_to_julian (&now); @@ -3531,7 +3512,6 @@ _action_location_submit_uri (GtkAction* action, sqlite3_reset (statement); if (sqlite3_step (statement) == SQLITE_DONE) sqlite3_clear_bindings (statement); - #endif g_free (keywords); } @@ -4151,7 +4131,6 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog, g_object_get (browser->settings, "clear-private-data", &saved_prefs, NULL); - #if HAVE_SQLITE button = g_object_get_data (G_OBJECT (dialog), "history"); if (gtk_toggle_button_get_active (button)) { @@ -4178,7 +4157,6 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog, } clear_prefs |= MIDORI_CLEAR_HISTORY; } - #endif button = g_object_get_data (G_OBJECT (dialog), "cookies"); if (gtk_toggle_button_get_active (button)) { @@ -4308,13 +4286,11 @@ _action_clear_private_data_activate (GtkAction* action, vbox = gtk_vbox_new (TRUE, 4); alignment = gtk_alignment_new (0, 0, 1, 1); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 6, 12, 0); - #if HAVE_SQLITE button = gtk_check_button_new_with_mnemonic (_("History")); if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); g_object_set_data (G_OBJECT (dialog), "history", button); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); - #endif button = gtk_check_button_new_with_mnemonic (_("Cookies")); if ((clear_prefs & MIDORI_CLEAR_COOKIES) == MIDORI_CLEAR_COOKIES) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); @@ -5333,16 +5309,13 @@ midori_browser_new_history_item (MidoriBrowser* browser, { time_t now; gint64 day; - #if HAVE_SQLITE sqlite3* db; static sqlite3_stmt* stmt = NULL; - #endif now = time (NULL); katze_item_set_added (*item, now); day = sokoke_time_t_to_julian (&now); - #if HAVE_SQLITE db = g_object_get_data (G_OBJECT (browser->history), "db"); if (!stmt) { @@ -5361,7 +5334,6 @@ midori_browser_new_history_item (MidoriBrowser* browser, sqlite3_errmsg (db)); sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); - #endif } static void diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c35c30b8..3d4baec7 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -21,9 +21,7 @@ #include #include -#if HAVE_SQLITE - #include -#endif +#include #define COMPLETION_DELAY 200 #define MAX_ITEMS 25 @@ -274,7 +272,6 @@ midori_location_action_create_model (void) return model; } -#if HAVE_SQLITE static void midori_location_action_popup_position (GtkWidget* popup, GtkWidget* widget) @@ -516,7 +513,6 @@ midori_location_action_popup_timeout_cb (gpointer data) return FALSE; } -#endif static void midori_location_action_popup_completion (MidoriLocationAction* action, @@ -529,11 +525,9 @@ midori_location_action_popup_completion (MidoriLocationAction* action, action->entry = entry; g_signal_connect (entry, "destroy", G_CALLBACK (gtk_widget_destroyed), &action->entry); - #if HAVE_SQLITE action->completion_timeout = g_timeout_add (COMPLETION_DELAY, midori_location_action_popup_timeout_cb, action); /* TODO: Inline completion */ - #endif } static void @@ -633,17 +627,14 @@ midori_location_action_toggle_arrow_cb (GtkWidget* widget, MidoriLocationAction* location_action) { gboolean show = FALSE; - #if HAVE_SQLITE sqlite3* db; const gchar* sqlcmd; sqlite3_stmt* statement; gint result; - #endif if (!GTK_IS_BUTTON (widget)) return; - #if HAVE_SQLITE db = g_object_get_data (G_OBJECT (location_action->history), "db"); sqlcmd = "SELECT uri FROM history LIMIT 1"; sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); @@ -651,7 +642,6 @@ midori_location_action_toggle_arrow_cb (GtkWidget* widget, if (result == SQLITE_ROW) show = TRUE; sqlite3_finalize (statement); - #endif sokoke_widget_set_visible (widget, show); gtk_widget_set_size_request (widget, show ? -1 : 1, show ? -1 : 1); } @@ -1171,7 +1161,6 @@ static void midori_location_action_entry_popup_cb (GtkComboBox* combo_box, MidoriLocationAction* location_action) { - #if HAVE_SQLITE GtkListStore* store; gint result; const gchar* sqlcmd; @@ -1217,7 +1206,6 @@ midori_location_action_entry_popup_cb (GtkComboBox* combo_box, while (result == SQLITE_ROW); sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); - #endif } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index 29e2f5be..5e7e16cb 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3658,7 +3658,6 @@ midori_view_set_uri (MidoriView* view, "GTK+%d.%d.%d (%d.%d.%d)" "Glib%d.%d.%d (%d.%d.%d)" "libsoup%s" - "sqlite3%s" "libnotify%s" "libidn%s" "libunique%s" @@ -3680,7 +3679,6 @@ midori_view_set_uri (MidoriView* view, GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION, glib_major_version, glib_minor_version, glib_micro_version, LIBSOUP_VERSION, - HAVE_SQLITE ? "Yes" : "No", HAVE_LIBNOTIFY ? "Yes" : "No", HAVE_LIBIDN ? "Yes" : "No", HAVE_UNIQUE ? "Yes" : "No", diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index d767bec6..3b9e26e0 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -122,7 +122,6 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) return STOCK_BOOKMARKS; } -#if HAVE_SQLITE void midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, @@ -281,7 +280,6 @@ midori_bookmarks_remove_item_from_db (sqlite3* db, sqlite3_free (sqlcmd); } -#endif static void midori_bookmarks_row_changed_cb (GtkTreeModel* model, @@ -362,12 +360,9 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, { GtkTreeModel* model; GtkTreeIter iter; - #if HAVE_SQLITE sqlite3* db; db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); - #endif - if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), &model, &iter)) { @@ -375,9 +370,7 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, &iter, 0, &item, -1); - #if HAVE_SQLITE midori_bookmarks_remove_item_from_db (db, item); - #endif gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); g_object_unref (item); @@ -473,12 +466,10 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, bookmarks->array = katze_object_get_object (app, "bookmarks"); g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); - #if HAVE_SQLITE midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "", NULL); g_signal_connect_after (model, "row-changed", G_CALLBACK (midori_bookmarks_row_changed_cb), bookmarks); - #endif } static void @@ -830,10 +821,8 @@ midori_bookmarks_row_expanded_cb (GtkTreeView* treeview, model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); gtk_tree_model_get (model, iter, 0, &item, -1); - #if HAVE_SQLITE midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), iter, katze_item_get_name (item), NULL); - #endif g_object_unref (item); } @@ -917,10 +906,8 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) GTK_ICON_ENTRY_SECONDARY, TRUE); g_signal_connect (entry, "icon-release", G_CALLBACK (midori_bookmarks_filter_entry_clear_cb), bookmarks); - #if HAVE_SQLITE g_signal_connect (entry, "changed", G_CALLBACK (midori_bookmarks_filter_entry_changed_cb), bookmarks); - #endif box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3); gtk_widget_show_all (box); diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h index 0a20a880..2c53712f 100644 --- a/panels/midori-bookmarks.h +++ b/panels/midori-bookmarks.h @@ -14,10 +14,7 @@ #include "config.h" -#if HAVE_SQLITE - #include -#endif - +#include #include #include @@ -45,7 +42,6 @@ midori_bookmarks_get_type (void); GtkWidget* midori_bookmarks_new (void); -#if HAVE_SQLITE void midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, @@ -59,7 +55,6 @@ void midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, const gchar* folder); -#endif G_END_DECLS diff --git a/panels/midori-history.c b/panels/midori-history.c index bfe469d7..8e7d7cdd 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -34,10 +34,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gboolean is_folder); #include "config.h" - -#if HAVE_SQLITE - #include -#endif +#include #define COMPLETION_DELAY 200 @@ -126,7 +123,6 @@ midori_history_get_stock_id (MidoriViewable* viewable) return STOCK_HISTORY; } -#if HAVE_SQLITE static void midori_history_clear_db (MidoriHistory* history) { @@ -376,7 +372,6 @@ midori_history_clear_clicked_cb (GtkWidget* toolitem, midori_history_clear_db (history); } -#endif static void midori_history_bookmark_add_cb (GtkWidget* menuitem, @@ -401,14 +396,11 @@ midori_history_get_toolbar (MidoriViewable* viewable) if (!history->toolbar) { GtkWidget* toolbar; - #if HAVE_SQLITE GtkToolItem* toolitem; - #endif toolbar = gtk_toolbar_new (); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); history->toolbar = toolbar; - #if HAVE_SQLITE toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Bookmark the selected history item")); @@ -440,7 +432,6 @@ midori_history_get_toolbar (MidoriViewable* viewable) G_CALLBACK (gtk_widget_destroyed), &history->delete); g_signal_connect (history->clear, "destroy", G_CALLBACK (gtk_widget_destroyed), &history->clear); - #endif } return history->toolbar; @@ -474,10 +465,8 @@ midori_history_set_app (MidoriHistory* history, history->array = katze_object_get_object (app, "history"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); - #if HAVE_SQLITE if (history->array) midori_history_read_from_db (history, GTK_TREE_STORE (model), NULL, 0, NULL); - #endif } static void @@ -547,7 +536,6 @@ midori_history_treeview_render_icon_cb (GtkTreeViewColumn* column, } } -#if HAVE_SQLITE static void midori_history_row_activated_cb (GtkTreeView* treeview, GtkTreePath* path, @@ -873,7 +861,7 @@ midori_history_filter_entry_changed_cb (GtkEntry* entry, midori_history_filter_timeout_cb, history); katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry))); } -#endif + static void midori_history_filter_entry_clear_cb (GtkEntry* entry, gint icon_pos, @@ -909,10 +897,8 @@ midori_history_init (MidoriHistory* history) TRUE); g_signal_connect (entry, "icon-release", G_CALLBACK (midori_history_filter_entry_clear_cb), history); - #if HAVE_SQLITE g_signal_connect (entry, "changed", G_CALLBACK (midori_history_filter_entry_changed_cb), history); - #endif box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 3); gtk_widget_show_all (box); @@ -934,7 +920,6 @@ midori_history_init (MidoriHistory* history) "text", 1, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); g_object_unref (model); - #if HAVE_SQLITE g_object_connect (treeview, "signal::row-activated", midori_history_row_activated_cb, history, @@ -949,7 +934,6 @@ midori_history_init (MidoriHistory* history) "signal::popup-menu", midori_history_popup_menu_cb, history, NULL); - #endif gtk_widget_show (treeview); gtk_box_pack_start (GTK_BOX (history), treeview, TRUE, TRUE, 0); history->treeview = treeview; diff --git a/wscript b/wscript index ae358ab8..fe331612 100644 --- a/wscript +++ b/wscript @@ -220,7 +220,6 @@ def configure (conf): check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91') check_pkg ('libxml-2.0', '2.6') check_pkg ('sqlite3', '3.0', True, var='SQLITE') - conf.define ('HAVE_SQLITE', 1) if conf.env['HAVE_LIBSOUP_2_27_90']: idn = 'yes' From 7dffde361c86b6f026c25ce1ed506fc8c468119c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jul 2010 20:42:56 +0200 Subject: [PATCH 2837/2970] Append new bookmarks to the end of the store, with G_MAXINT --- midori/midori-browser.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 96b969da..b304d7c3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -922,9 +922,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, midori_bookmarks_insert_item_db (db, bookmark, ""); treeview = g_object_get_data (G_OBJECT (browser->bookmarks), "treeview"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); - /* FIXME: We need to add item in the end of the list */ gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), - NULL, NULL, 999, 0, bookmark, -1); + NULL, NULL, G_MAXINT, 0, bookmark, -1); } else midori_bookmarks_insert_item_db (db, bookmark, selected); From b944ce0c838c25ba4b4d290b4d055f18ce84bf8b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jul 2010 20:47:33 +0200 Subject: [PATCH 2838/2970] Require bookmarks and folders to have a title --- midori/midori-browser.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b304d7c3..e2063b2b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -678,6 +678,15 @@ midori_browser_edit_bookmark_uri_changed_cb (GtkEntry* entry, || g_str_has_prefix (uri, "javascript:"))); } +static void +midori_browser_edit_bookmark_title_changed_cb (GtkEntry* entry, + GtkDialog* dialog) +{ + const gchar* title = gtk_entry_get_text (entry); + gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT, + title != NULL && title[0] != '\0'); +} + static void midori_browser_edit_bookmark_add_speed_dial_cb (GtkWidget* button, KatzeItem* bookmark) @@ -757,6 +766,10 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE); value = katze_item_get_name (bookmark); gtk_entry_set_text (GTK_ENTRY (entry_title), value ? value : ""); + midori_browser_edit_bookmark_title_changed_cb (GTK_ENTRY (entry_title), + GTK_DIALOG (dialog)); + g_signal_connect (entry_title, "changed", + G_CALLBACK (midori_browser_edit_bookmark_title_changed_cb), dialog); gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show_all (hbox); From 687de063f9bf8f2ec26bfcdf2921f3a768cb06e7 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Mon, 19 Jul 2010 20:55:59 +0200 Subject: [PATCH 2839/2970] Clear the bookmarkbar before populating and populate after editing --- midori/midori-browser.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e2063b2b..16f25e24 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -182,6 +182,12 @@ void midori_bookmarks_remove_item_from_db (sqlite3* db, KatzeItem* item); +static void +midori_bookmarkbar_populate (MidoriBrowser* browser); + +static void +midori_bookmarkbar_clear (GtkWidget* toolbar); + static void midori_browser_new_history_item (MidoriBrowser* browser, KatzeItem** item); @@ -947,6 +953,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, g_free (selected); return_status = TRUE; } + if (gtk_widget_get_visible (browser->bookmarkbar)) + midori_bookmarkbar_populate (browser); gtk_widget_destroy (dialog); return return_status; } @@ -6331,7 +6339,9 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) const gchar* sqlcmd; KatzeArray* array; KatzeItem* item; - gint i; + gint i = 0; + + midori_bookmarkbar_clear (browser->bookmarkbar); homepage = gtk_action_create_tool_item (_action_by_name (browser, "Homepage")); gtk_tool_item_set_is_important (GTK_TOOL_ITEM (homepage), TRUE); @@ -6344,7 +6354,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) if (!db) return; - sqlcmd = "SELECT uri, title, app, folder FROM bookmarks WHERE " + sqlcmd = "SELECT uri, title, app, folder, toolbar FROM bookmarks WHERE " " toolbar = 1 ORDER BY uri ASC"; array = katze_array_from_sqlite (db, sqlcmd); From 9a098e2656d681c38180e9f3779433e1100e5905 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Mon, 19 Jul 2010 21:07:26 +0200 Subject: [PATCH 2840/2970] Attach bookmark table and union bookmarks in location completion --- midori/main.c | 15 ++++++++++++--- midori/midori-locationaction.c | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index b8c823cc..35f9b99c 100644 --- a/midori/main.c +++ b/midori/main.c @@ -351,12 +351,14 @@ search_engines_save_to_file (KatzeArray* search_engines, static sqlite3* midori_history_initialize (KatzeArray* array, const gchar* filename, + const gchar* bookmarks_filename, char** errmsg) { sqlite3* db; gboolean has_day; sqlite3_stmt* stmt; gint result; + gchar* sql; has_day = FALSE; @@ -401,6 +403,11 @@ midori_history_initialize (KatzeArray* array, "DROP TABLE backup;" "COMMIT;", NULL, NULL, errmsg); + + sql = g_strdup_printf ("ATTACH DATABASE '%s' AS bookmarks", bookmarks_filename); + sqlite3_exec (db, sql, NULL, NULL, errmsg); + g_free (sql); + return db; } @@ -1546,6 +1553,7 @@ main (int argc, gchar** extensions; MidoriWebSettings* settings; gchar* config_file; + gchar* bookmarks_file; MidoriStartup load_on_startup; KatzeArray* search_engines; KatzeArray* bookmarks; @@ -1881,9 +1889,9 @@ main (int argc, midori_startup_timer ("Search read: \t%f"); bookmarks = katze_array_new (KATZE_TYPE_ARRAY); - katze_assign (config_file, build_config_filename ("bookmarks.db")); + bookmarks_file = build_config_filename ("bookmarks.db"); errmsg = NULL; - if ((db = midori_bookmarks_initialize (bookmarks, config_file, &errmsg)) == NULL) + if ((db = midori_bookmarks_initialize (bookmarks, bookmarks_file, &errmsg)) == NULL) { g_string_append_printf (error_messages, _("Bookmarks couldn't be loaded: %s\n"), errmsg); @@ -1938,12 +1946,13 @@ main (int argc, katze_assign (config_file, build_config_filename ("history.db")); errmsg = NULL; - if ((db = midori_history_initialize (history, config_file, &errmsg)) == NULL) + if ((db = midori_history_initialize (history, config_file, bookmarks_file ,&errmsg)) == NULL) { g_string_append_printf (error_messages, _("The history couldn't be loaded: %s\n"), errmsg); g_free (errmsg); } + g_free (bookmarks_file); g_object_set_data (G_OBJECT (history), "db", db); midori_startup_timer ("History read: \t%f"); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 3d4baec7..927e80e9 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -361,6 +361,9 @@ midori_location_action_popup_timeout_cb (gpointer data) "UNION ALL " "SELECT type, replace(uri, '%s', title) AS uri, title, count() AS ct FROM search_view " "WHERE title LIKE ?1 GROUP BY uri " + "UNION ALL " + "SELECT '1' AS type, uri, title, '100' AS ct FROM bookmarks " + "WHERE title LIKE ?1 AND uri !='' " "ORDER BY ct DESC LIMIT ?2"; sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); } From f764f25747607ced59403a8da7ef9029d5bbf9a4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 19 Jul 2010 21:39:57 +0200 Subject: [PATCH 2841/2970] Implement activate-item(-alt) for bookmarkbar mouse buttons --- midori/midori-browser.c | 50 +++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 16f25e24..a9359d00 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2651,6 +2651,30 @@ midori_browser_menu_item_deselect_cb (GtkWidget* menuitem, _midori_browser_set_statusbar_text (browser, NULL); } +static void +midori_bookmarkbar_activate_item (GtkAction* action, + KatzeItem* item, + MidoriBrowser* browser) +{ + midori_browser_set_current_uri (browser, katze_item_get_uri (item)); +} + +static gboolean +midori_bookmarkbar_activate_item_alt (GtkAction* action, + KatzeItem* item, + guint button, + MidoriBrowser* browser) +{ + if (button == 2) + { + gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + midori_browser_set_current_page_smartly (browser, n); + return TRUE; + } + + return FALSE; +} + static void _action_trash_populate_popup (GtkAction* action, GtkMenu* menu, @@ -2697,15 +2721,10 @@ _action_trash_activate_item_alt (GtkAction* action, { if (button == 2) { - gint n; - - n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - + gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); midori_browser_set_current_page_smartly (browser, n); - katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); - return TRUE; } @@ -5668,6 +5687,10 @@ midori_browser_init (MidoriBrowser* browser) g_object_connect (action, "signal::populate-popup", _action_tools_populate_popup, browser, + "signal::activate-item", + midori_bookmarkbar_activate_item, browser, + "signal::activate-item-alt", + midori_bookmarkbar_activate_item_alt, browser, NULL); gtk_action_group_add_action (browser->action_group, action); g_object_unref (action); @@ -6284,17 +6307,12 @@ midori_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); if (event->button == 2) { - if (katze_item_get_uri (item)) + if (KATZE_ITEM_IS_BOOKMARK (item)) { n = midori_browser_add_uri (browser, katze_item_get_uri (item)); midori_browser_set_current_page_smartly (browser, n); - return TRUE; } - else - { - /* FIXME: This is a folder and we need to popup a menu */ - } } else if (event->button == 3) { @@ -6308,12 +6326,10 @@ static void midori_bookmarkbar_insert_item (GtkWidget* toolbar, KatzeItem* item) { - GtkToolItem* toolitem; - MidoriBrowser* browser = midori_browser_get_for_widget (toolbar); - - toolitem = katze_array_action_create_tool_item_for ( - KATZE_ARRAY_ACTION (_action_by_name (browser, "Tools")), item); + GtkAction* action = _action_by_name (browser, "Tools"); + GtkToolItem* toolitem = katze_array_action_create_tool_item_for ( + KATZE_ARRAY_ACTION (action), item); g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item); if (KATZE_IS_ITEM (item)) From 9763a1225f7e3aa7b3ec65dc5d2376b0b95ef9f3 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Mon, 19 Jul 2010 21:42:15 +0200 Subject: [PATCH 2842/2970] Verify that we have "folder" meta value in bookmark edit dialog --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a9359d00..a6bb4221 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -855,7 +855,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, const unsigned char* name = sqlite3_column_text (statement, 0); gtk_list_store_insert_with_values (model, NULL, G_MAXINT, 0, name, 1, PANGO_ELLIPSIZE_END, -1); - if (!new_bookmark + if (!new_bookmark && katze_item_get_meta_string (bookmark, "folder") && g_str_equal (katze_item_get_meta_string (bookmark, "folder"), name)) gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n); n++; From f77eaf6d9bbc6ba675b0d6090842f24c7b27de32 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Tue, 20 Jul 2010 20:51:14 +0200 Subject: [PATCH 2843/2970] l10n: Updated Danish (da) translation to 99% New status: 640 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 542 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 288 insertions(+), 254 deletions(-) diff --git a/po/da.po b/po/da.po index 015c5b3a..c630d977 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-06 16:08+0000\n" +"POT-Creation-Date: 2010-07-20 16:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1631 +#: ../midori/main.c:1639 ../midori/main.c:1655 #: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -31,79 +31,79 @@ msgstr "Midori" msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:445 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:428 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:471 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:502 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:540 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:560 ../midori/main.c:583 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:642 ../midori/main.c:882 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:826 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres." -#: ../midori/main.c:914 +#: ../midori/main.c:916 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:929 +#: ../midori/main.c:931 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:933 +#: ../midori/main.c:935 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:938 +#: ../midori/main.c:940 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1180 ../midori/main.c:1924 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" @@ -178,51 +178,51 @@ msgstr "" msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1629 +#: ../midori/main.c:1628 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1656 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1658 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1773 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1804 +#: ../midori/main.c:1821 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1876 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1897 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1939 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1952 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1966 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1968 +#: ../midori/main.c:1982 msgid "_Ignore" msgstr "_Ignorér" @@ -243,21 +243,21 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4855 -#: ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:4925 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:4922 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:493 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" @@ -267,224 +267,228 @@ msgstr "Kunne ikke opdatere titel: %s\n" msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:735 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:735 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:737 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:737 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:768 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:785 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:804 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:836 ../midori/midori-browser.c:4041 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:846 ../midori/midori-browser.c:936 +#: ../midori/midori-browser.c:4046 ../midori/midori-browser.c:4075 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:878 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:891 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:906 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:982 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:986 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:1043 ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:4117 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1436 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2153 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2231 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2237 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4920 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2280 ../midori/midori-browser.c:4984 +#: ../panels/midori-bookmarks.c:396 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3286 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:3549 ../midori/midori-browser.c:5372 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:710 +#: ../midori/midori-browser.c:3876 ../panels/midori-bookmarks.c:709 +#: ../panels/midori-history.c:698 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3883 ../panels/midori-bookmarks.c:715 +#: ../panels/midori-history.c:704 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3886 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4113 ../panels/midori-bookmarks.c:717 +#: ../panels/midori-history.c:706 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:3964 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:3965 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3947 +#: ../midori/midori-browser.c:3966 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3948 +#: ../midori/midori-browser.c:3967 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:3968 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3992 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:3995 ../midori/midori-browser.c:4989 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4006 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4033 ../midori/midori-browser.c:5102 #: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:4094 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:4132 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4167 ../panels/midori-bookmarks.c:281 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 +#: ../midori/midori-browser.c:4185 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Kunne ikke fjerne historikelementet: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Kunne ikke fjerne historik: %s\n" + +#: ../midori/midori-browser.c:4193 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Kunne ikke fjerne søgehistorik: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4300 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4304 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4292 +#: ../midori/midori-browser.c:4318 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4303 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4328 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:117 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4333 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4338 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:4319 +#: ../midori/midori-browser.c:4343 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:4324 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4348 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:4329 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4353 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:4361 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:4438 +#: ../midori/midori-browser.c:4502 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4504 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:4459 +#: ../midori/midori-browser.c:4523 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -492,474 +496,498 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:4832 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:4770 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4834 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:4771 +#: ../midori/midori-browser.c:4835 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:4774 +#: ../midori/midori-browser.c:4838 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:4840 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:4777 +#: ../midori/midori-browser.c:4841 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4845 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:4784 +#: ../midori/midori-browser.c:4848 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4850 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:4787 +#: ../midori/midori-browser.c:4851 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:4789 +#: ../midori/midori-browser.c:4853 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:4854 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:4792 +#: ../midori/midori-browser.c:4856 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:4793 +#: ../midori/midori-browser.c:4857 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:4798 +#: ../midori/midori-browser.c:4862 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:4799 +#: ../midori/midori-browser.c:4863 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:4801 +#: ../midori/midori-browser.c:4865 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:4866 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4869 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4872 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4874 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:4878 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4881 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:4885 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:4824 ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4888 ../midori/midori-browser.c:4891 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4894 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4897 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4900 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4903 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4905 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4906 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4908 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4909 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4913 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4915 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4916 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:4928 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4931 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4934 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4935 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4937 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4938 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4941 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4944 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4945 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4947 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:4948 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:4950 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4951 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4953 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4954 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4957 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4960 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4963 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:4967 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4971 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:4974 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:4976 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4977 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4979 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4980 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4986 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4987 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:4928 +#: ../midori/midori-browser.c:4992 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:4931 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4995 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4996 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4999 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:5000 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:5004 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5005 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5010 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5011 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5013 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:5014 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5016 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:5017 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:5019 +msgid "Minimize _Current Tab" +msgstr "_Minimér nuværede faneblade" + +#: ../midori/midori-browser.c:5020 +msgid "Minimize the current tab" +msgstr "Minimér nuværende faneblad" + +#: ../midori/midori-browser.c:5022 +msgid "_Duplicate Current Tab" +msgstr "_Dublér nuværende faneblad" + +#: ../midori/midori-browser.c:5023 +msgid "Duplicate the current tab" +msgstr "Dublér nuværende faneblad" + +#: ../midori/midori-browser.c:5025 +msgid "Close Ot_her Tabs" +msgstr "Luk a_ndre faneblade" + +#: ../midori/midori-browser.c:5026 +msgid "Close all tabs except the current tab" +msgstr "Luk alle faneblade undtaget nuværende faneblad" + +#: ../midori/midori-browser.c:5028 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5029 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:5031 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5033 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:5034 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5036 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5037 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:5039 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5040 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5043 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5051 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:5052 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:4982 +#: ../midori/midori-browser.c:5055 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5056 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5059 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:5060 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:5063 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:4991 +#: ../midori/midori-browser.c:5064 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5067 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5068 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5071 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5072 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5080 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5010 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5083 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:5087 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5017 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5090 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5020 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5093 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5023 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5096 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5026 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5099 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5612 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5619 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5621 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5645 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5647 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5668 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5683 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5700 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5702 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5716 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5718 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6219 +#: ../midori/midori-browser.c:6295 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" @@ -979,13 +1007,13 @@ msgstr "Søg efter %s" msgid "Search with %s" msgstr "Søg med %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1189 #, c-format msgid "Failed to execute database statement\n" msgstr "Kunne ikke køre databaseudtryk\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1245 msgid "Paste and p_roceed" msgstr "Indsæt og f_ortsæt" @@ -1006,7 +1034,7 @@ msgstr "Luk panel" msgid "Align sidepanel to the left" msgstr "Opstil sidepanel til venstre" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Skjul handlingskontroller" @@ -1585,8 +1613,8 @@ msgstr "De private data valgt til sletning" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4577 +#: ../midori/midori-view.c:4581 #, c-format msgid "Error - %s" msgstr "Fejl - %s" @@ -1775,47 +1803,47 @@ msgstr "Dokument kan ikke vises" msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3717 msgid "Page loading delayed" msgstr "Forsinket sideindlæsning" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3718 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3719 msgid "Load Page" msgstr "Indlæs side" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3863 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4117 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4122 msgid "_Restore Tab" msgstr "_Gendan faneblad" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4122 msgid "_Minimize Tab" msgstr "_Minimér faneblad" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4128 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4814 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4815 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4867 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funktionalitet" @@ -2102,24 +2130,30 @@ msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:277 ../panels/midori-history.c:138 +#: ../panels/midori-history.c:168 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kunne ikke fjerne historikelementet: %s\n" + +#: ../panels/midori-bookmarks.c:404 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:412 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:426 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:568 +#: ../panels/midori-bookmarks.c:556 msgid "Separator" msgstr "Separator" @@ -2139,52 +2173,52 @@ msgstr "Kopiér alt" msgid "Extensions" msgstr "Udvidelser" -#: ../panels/midori-history.c:274 +#: ../panels/midori-history.c:270 msgid "Erroneous clock time" msgstr "Fejlagtig tid" -#: ../panels/midori-history.c:275 +#: ../panels/midori-history.c:271 msgid "The clock time lies in the past. Please check the current date and time." msgstr "Tiden ligger i fortiden. Kontrollér den aktuelle dato og tid." -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:283 msgid "A week ago" msgstr "For en uge siden" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:285 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dage siden" msgstr[1] "%d dage siden" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:288 msgid "Today" msgstr "I dag" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:290 msgid "Yesterday" msgstr "I går" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 +#: ../panels/midori-history.c:329 ../extensions/formhistory.c:455 +#: ../extensions/formhistory.c:459 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Kunne ikke køre databaseudtryk: %s\n" -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:367 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:414 +#: ../panels/midori-history.c:406 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:415 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:431 +#: ../panels/midori-history.c:423 msgid "Clear the entire history" msgstr "Ryd hele historikken" @@ -2478,17 +2512,17 @@ msgstr "Slet feed" msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Kunne ikke finde rodelement i feed XML-data." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Ikke understøttet feed-format." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Kunne ikke fortolke XML-feed: %s" @@ -2531,25 +2565,25 @@ msgstr "Feed-panel" msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Kunne ikke tilføje formularværdien: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Gem historikken af indtastede formulardata" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Ikke tilgængelig: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Resourcefiler er ikke installeret" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Historikfylder til formular" From 5859bbe2abd8244d71a33fd4b9ae2f6d7d6baf51 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Mon, 19 Jul 2010 16:58:18 -0400 Subject: [PATCH 2844/2970] Fix edit bookmark behavior --- midori/midori-browser.c | 17 ++++++++++------- panels/midori-bookmarks.c | 7 ++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a6bb4221..c5043f2e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -915,6 +915,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { gchar* selected; + GtkTreeView* treeview; + GtkTreeModel* model; + + if (!new_bookmark) + midori_bookmarks_remove_item_from_db (db, bookmark); katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); @@ -932,20 +937,18 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); - midori_bookmarks_remove_item_from_db (db, bookmark); if (!strcmp (selected, _("Toplevel folder"))) - { - GtkTreeView* treeview; - GtkTreeModel* model; + selected = g_strdup (""); - midori_bookmarks_insert_item_db (db, bookmark, ""); + midori_bookmarks_insert_item_db (db, bookmark, selected); + + if (new_bookmark) + { treeview = g_object_get_data (G_OBJECT (browser->bookmarks), "treeview"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), NULL, NULL, G_MAXINT, 0, bookmark, -1); } - else - midori_bookmarks_insert_item_db (db, bookmark, selected); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) if (!gtk_widget_get_visible (browser->bookmarkbar)) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 3b9e26e0..0edac295 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -345,11 +345,8 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (bookmarks->treeview); - if (midori_browser_edit_bookmark_dialog_new ( - browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item))) - { - gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - } + midori_browser_edit_bookmark_dialog_new ( + browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item)); g_object_unref (item); } } From 64fb6e8ee82de7dd06a939a249371d44c69d4ecb Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 20 Jul 2010 09:40:28 -0400 Subject: [PATCH 2845/2970] Fix typos and simplify SQL query for locationbar --- midori/main.c | 6 +----- midori/midori-locationaction.c | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/midori/main.c b/midori/main.c index 35f9b99c..fd5ec988 100644 --- a/midori/main.c +++ b/midori/main.c @@ -375,11 +375,7 @@ midori_history_initialize (KatzeArray* array, "CREATE TABLE IF NOT EXISTS " "history (uri text, title text, date integer, day integer);" "CREATE TABLE IF NOT EXISTS " - "search (keywords text, uri text, day integer);" - "CREATE TEMP VIEW history_view AS SELECT " - "1 AS type, uri, title, day FROM history;" - "CREATE TEMP VIEW search_view AS SELECT " - "2 AS type, uri, keywords AS title, day FROM search;", + "search (keywords text, uri text, day integer);", NULL, NULL, errmsg) != SQLITE_OK) return NULL; diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 927e80e9..1f6ff2e9 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -356,15 +356,17 @@ midori_location_action_popup_timeout_cb (gpointer data) { sqlite3* db; db = g_object_get_data (G_OBJECT (action->history), "db"); - sqlcmd = "SELECT type, uri, title, count() AS ct FROM history_view " - "WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri " - "UNION ALL " - "SELECT type, replace(uri, '%s', title) AS uri, title, count() AS ct FROM search_view " - "WHERE title LIKE ?1 GROUP BY uri " - "UNION ALL " - "SELECT '1' AS type, uri, title, '100' AS ct FROM bookmarks " - "WHERE title LIKE ?1 AND uri !='' " - "ORDER BY ct DESC LIMIT ?2"; + sqlcmd = "SELECT type, uri, title FROM (" + " SELECT 1 AS type, uri, title, count() AS ct FROM history " + " WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri " + " UNION ALL " + " SELECT 2 AS type, replace(uri, '%s', keywords) AS uri, " + " keywords AS title, count() AS ct FROM search " + " WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri " + " UNION ALL " + " SELECT 1 AS type, uri, title, 50 AS ct FROM bookmarks " + " WHERE title LIKE ?1 OR uri LIKE ?1 AND uri !='' " + ") GROUP BY uri ORDER BY ct DESC LIMIT ?2"; sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); } sqlite3_bind_text (stmt, 1, g_strdup_printf ("%%%s%%", action->key), -1, g_free); From cac6571371d68d0c5888879ec409ab91f594df2e Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 20 Jul 2010 14:18:58 -0400 Subject: [PATCH 2846/2970] Escape space in search pattern to match the history URL format --- midori/sokoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 4f7e92d7..22093f12 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -626,7 +626,7 @@ gchar* sokoke_search_uri (const gchar* uri, if (!uri) return g_strdup (keywords); - escaped = g_uri_escape_string (keywords, " :/", TRUE); + escaped = g_uri_escape_string (keywords, ":/", TRUE); if (strstr (uri, "%s")) search = g_strdup_printf (uri, escaped); else From ca9010acd5d3be603c8f288c1f853e71d02d4203 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 20 Jul 2010 14:38:04 -0400 Subject: [PATCH 2847/2970] Show decoded urls in the locationbar --- midori/midori-locationaction.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 1f6ff2e9..de70b2c0 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -446,6 +446,7 @@ midori_location_action_popup_timeout_cb (gpointer data) style = gtk_widget_get_style (action->treeview); while (result == SQLITE_ROW) { + gchar* unescaped_uri; sqlite3_int64 type = sqlite3_column_int64 (stmt, 0); const unsigned char* uri = sqlite3_column_text (stmt, 1); const unsigned char* title = sqlite3_column_text (stmt, 2); @@ -453,9 +454,13 @@ midori_location_action_popup_timeout_cb (gpointer data) if (!icon) icon = action->default_icon; if (type == 1 /* history_view */) + { + unescaped_uri = g_uri_unescape_string ((const char*)uri, ""); gtk_list_store_insert_with_values (store, NULL, matches, - URI_COL, uri, TITLE_COL, title, YALIGN_COL, 0.25, + URI_COL, unescaped_uri, TITLE_COL, title, YALIGN_COL, 0.25, FAVICON_COL, icon, -1); + g_free (unescaped_uri); + } else if (type == 2 /* search_view */) { gchar* search_title = g_strdup_printf (_("Search for %s"), title); @@ -1443,7 +1448,7 @@ midori_location_action_set_uri (MidoriLocationAction* location_action, g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - katze_assign (location_action->uri, g_strdup (uri)); + katze_assign (location_action->uri, g_uri_unescape_string (uri, "")); midori_location_action_set_text (location_action, uri); } From 58f3444ba1d7a67463f19f84659a67d07f6ce0a4 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 20 Jul 2010 15:25:34 -0400 Subject: [PATCH 2848/2970] Rework history panel search query --- panels/midori-history.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 8e7d7cdd..84baaf60 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -207,16 +207,17 @@ midori_history_read_from_db (MidoriHistory* history, { gchar* filterstr; - sqlcmd = "SELECT uri, title, day FROM history_view " - "WHERE uri LIKE ? or title LIKE ? GROUP BY uri " + sqlcmd = "SELECT * FROM (" + " SELECT uri, title, day FROM history" + " WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri " "UNION ALL " - "SELECT replace(uri, '%s', title) AS uri, title, day " - "FROM search_view WHERE title LIKE ?1 GROUP BY uri " - "ORDER BY day ASC"; + " SELECT replace (uri, '%s', keywords) AS uri, " + " keywords AS title, day FROM search " + " WHERE uri LIKE ?1 OR keywords LIKE ?1 GROUP BY uri " + ") ORDER BY day ASC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); filterstr = g_strdup_printf ("%%%s%%", filter); sqlite3_bind_text (statement, 1, filterstr, -1, g_free); - sqlite3_bind_text (statement, 2, g_strdup (filterstr), -1, g_free); req_day = -1; } else if (req_day == 0) From 46b63639f6aea44508c3c203456a60bf7c8f0e38 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 10:34:52 -0400 Subject: [PATCH 2849/2970] Refactor history panel to match bookmark code. The toolbar buttons are also taken care of. The broken clock time warning was removed since it would be awkward to have with the date formatting where there is not even a widget available. Should be re-considered. --- panels/midori-history.c | 223 +++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 118 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 84baaf60..314280dd 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -24,19 +24,16 @@ #include #include -#include #include +#define COMPLETION_DELAY 200 + void midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, KatzeItem* bookmark, gboolean new_bookmark, gboolean is_folder); -#include "config.h" -#include - -#define COMPLETION_DELAY 200 struct _MidoriHistory { @@ -123,6 +120,40 @@ midori_history_get_stock_id (MidoriViewable* viewable) return STOCK_HISTORY; } +static gchar* +midori_history_format_date (KatzeItem *item) +{ + gint age; + gint64 day; + gchar token[50]; + gchar* sdate; + time_t current_time; + + current_time = time (NULL); + day = katze_item_get_added (item); + + age = sokoke_days_between ((time_t*)&day, ¤t_time); + + /* A negative age is a date in the future, the clock is probably off */ + if (age < -1) + ; + else if (age > 7 || age < 0) + { + strftime (token, sizeof (token), "%x", localtime ((time_t*)&day)); + sdate = token; + } + else if (age > 6) + sdate = _("A week ago"); + else if (age > 1) + sdate = g_strdup_printf (ngettext ("%d day ago", + "%d days ago", (gint)age), (gint)age); + else if (age == 0) + sdate = _("Today"); + else + sdate = _("Yesterday"); + return sdate; +} + static void midori_history_clear_db (MidoriHistory* history) { @@ -152,7 +183,7 @@ midori_history_remove_item_from_db (MidoriHistory* history, db = g_object_get_data (G_OBJECT (history->array), "db"); - if (katze_item_get_uri (item)) + if (KATZE_ITEM_IS_BOOKMARK (item)) sqlcmd = sqlite3_mprintf ( "DELETE FROM history WHERE uri = '%q' AND" " title = '%q' AND date = %llu", @@ -160,8 +191,8 @@ midori_history_remove_item_from_db (MidoriHistory* history, katze_item_get_name (item), katze_item_get_added (item)); else - sqlcmd = sqlite3_mprintf ( - "DELETE FROM history WHERE day = %d", katze_item_get_added (item)); + sqlcmd = sqlite3_mprintf ("DELETE FROM history WHERE day = %d", + katze_item_get_meta_integer (item, "day")); if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) { @@ -175,8 +206,6 @@ midori_history_remove_item_from_db (MidoriHistory* history, /** * midori_history_read_from_db: * @history: a #MidoriHistory - * @model: a #GtkTreeStore - * @parent: a #GtkTreeIter, or %NULL * @req_day: the timestamp of one day, or 0 * @filter: a filter string to search for * @@ -185,10 +214,8 @@ midori_history_remove_item_from_db (MidoriHistory* history, * 2. If @req_day is given, all pages for that day are added. * 3. If @filter is given, all pages matching the filter are added. **/ -static gboolean +static KatzeArray* midori_history_read_from_db (MidoriHistory* history, - GtkTreeStore* model, - GtkTreeIter* parent, int req_day, const gchar* filter) { @@ -196,10 +223,6 @@ midori_history_read_from_db (MidoriHistory* history, sqlite3_stmt* statement; gint result; const gchar* sqlcmd; - time_t current_time; - - GtkTreeIter iter; - GtkTreeIter root_iter; db = g_object_get_data (G_OBJECT (history->array), "db"); @@ -235,103 +258,36 @@ midori_history_read_from_db (MidoriHistory* history, } if (result != SQLITE_OK) - return FALSE; + return NULL; - if (req_day == 0) - current_time = time (NULL); + return katze_array_from_statement (statement); +} - while ((result = sqlite3_step (statement)) == SQLITE_ROW) - { - KatzeItem* item; - const unsigned char* uri; - const unsigned char* title; - sqlite3_int64 date; - sqlite3_int64 day; +static void +midori_history_read_from_db_to_model (MidoriHistory* history, + GtkTreeStore* model, + GtkTreeIter* parent, + int req_day, + const gchar* filter) +{ + KatzeArray* array; + gint last; + KatzeItem* item; + GtkTreeIter child; - if (req_day == 0) - { - gint age; - gchar token[50]; - gchar* sdate; + array = midori_history_read_from_db (history, req_day, filter); + katze_bookmark_populate_tree_view (array, model, parent); - day = sqlite3_column_int64 (statement, 0); - date = sqlite3_column_int64 (statement, 1); - - item = katze_item_new (); - katze_item_set_added (item, day); - age = sokoke_days_between ((time_t*)&date, ¤t_time); - - /* A negative age is a date in the future, the clock is probably off */ - if (age < -1) - { - static gboolean clock_warning = FALSE; - if (!clock_warning) - { - midori_app_send_notification (history->app, - _("Erroneous clock time"), - _("The clock time lies in the past. " - "Please check the current date and time.")); - clock_warning = TRUE; - } - } - - if (age > 7 || age < 0) - { - strftime (token, sizeof (token), "%x", localtime ((time_t*)&date)); - sdate = token; - } - else if (age > 6) - sdate = _("A week ago"); - else if (age > 1) - sdate = g_strdup_printf (ngettext ("%d day ago", - "%d days ago", (gint)age), (gint)age); - else if (age == 0) - sdate = _("Today"); - else - sdate = _("Yesterday"); - - gtk_tree_store_insert_with_values (model, &root_iter, NULL, - 0, 0, item, 1, sdate, -1); - /* That's an invisible dummy, so we always have an expander */ - gtk_tree_store_insert_with_values (model, &iter, &root_iter, - 0, 0, NULL, 1, NULL, -1); - - if (age > 1 && age < 7) - g_free (sdate); - } - else - { - uri = sqlite3_column_text (statement, 0); - title = sqlite3_column_text (statement, 1); - date = sqlite3_column_int64 (statement, 2); - day = sqlite3_column_int64 (statement, 3); - if (!uri) - continue; - - item = katze_item_new (); - katze_item_set_added (item, date); - katze_item_set_uri (item, (gchar*)uri); - katze_item_set_name (item, (gchar*)title); - gtk_tree_store_insert_with_values (model, NULL, parent, - 0, 0, item, 1, katze_item_get_name (item), -1); - } - } - - if (req_day != 0 && !(filter && *filter)) - { - /* Remove invisible dummy row */ - GtkTreeIter child; - gint last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent); - gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (model), &child, parent, last - 1); + /* Remove invisible dummy row */ + last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent); + if (!last) + return; + gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (model), &child, parent, last - 1); + gtk_tree_model_get (GTK_TREE_MODEL (model), &child, 0, &item, -1); + if (KATZE_ITEM_IS_SEPARATOR (item)) gtk_tree_store_remove (model, &child); - } - - if (result != SQLITE_DONE) - g_print (_("Failed to execute database statement: %s\n"), - sqlite3_errmsg (db)); - - sqlite3_finalize (statement); - return FALSE; + else + g_object_unref (item); } static void @@ -378,15 +334,21 @@ static void midori_history_bookmark_add_cb (GtkWidget* menuitem, MidoriHistory* history) { + GtkTreeModel* model; + GtkTreeIter iter; KatzeItem* item; MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (history->treeview), + &model, &iter)) + gtk_tree_model_get (model, &iter, 0, &item, -1); if (KATZE_IS_ITEM (item) && katze_item_get_uri (item)) midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); else midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); + + g_object_unref (item); } static GtkWidget* @@ -467,7 +429,7 @@ midori_history_set_app (MidoriHistory* history, history->array = katze_object_get_object (app, "history"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); if (history->array) - midori_history_read_from_db (history, GTK_TREE_STORE (model), NULL, 0, NULL); + midori_history_read_from_db_to_model (history, GTK_TREE_STORE (model), NULL, 0, NULL); } static void @@ -537,6 +499,30 @@ midori_history_treeview_render_icon_cb (GtkTreeViewColumn* column, } } +static void +midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + if (KATZE_ITEM_IS_BOOKMARK (item)) + g_object_set (renderer, "markup", NULL, + "text", katze_item_get_name (item), NULL); + else if (KATZE_ITEM_IS_FOLDER (item)) + g_object_set (renderer, "markup", NULL, + "text", midori_history_format_date (item), NULL); + else + g_object_set (renderer, "markup", _("Separator"), NULL); + + if (item) + g_object_unref (item); +} + static void midori_history_row_activated_cb (GtkTreeView* treeview, GtkTreePath* path, @@ -812,8 +798,8 @@ midori_history_row_expanded_cb (GtkTreeView* treeview, model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); gtk_tree_model_get (model, iter, 0, &item, -1); - midori_history_read_from_db (history, GTK_TREE_STORE (model), - iter, katze_item_get_added (item), NULL); + midori_history_read_from_db_to_model (history, GTK_TREE_STORE (model), + iter, katze_item_get_meta_integer (item, "day"), NULL); g_object_unref (item); } @@ -833,7 +819,7 @@ midori_history_row_collapsed_cb (GtkTreeView *treeview, gtk_tree_store_remove (treestore, &child); /* That's an invisible dummy, so we always have an expander */ gtk_tree_store_insert_with_values (treestore, &child, parent, - 0, 0, NULL, 1, NULL, -1); + 0, 0, NULL, -1); } static gboolean @@ -847,7 +833,7 @@ midori_history_filter_timeout_cb (gpointer data) treestore = GTK_TREE_STORE (model); gtk_tree_store_clear (treestore); - midori_history_read_from_db (history, treestore, NULL, 0, history->filter); + midori_history_read_from_db_to_model (history, treestore, NULL, 0, history->filter); return FALSE; } @@ -906,7 +892,7 @@ midori_history_init (MidoriHistory* history) gtk_box_pack_start (GTK_BOX (history), box, FALSE, FALSE, 5); /* Create the treeview */ - model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING); + model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); column = gtk_tree_view_column_new (); @@ -917,8 +903,9 @@ midori_history_init (MidoriHistory* history) treeview, NULL); renderer_text = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer_text, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_text, - "text", 1, NULL); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)midori_history_treeview_render_text_cb, + treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); g_object_unref (model); g_object_connect (treeview, From 44a2351b72f7fd702c4b68c59943c50937632cc4 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 10:35:47 -0400 Subject: [PATCH 2850/2970] Decode URIs before updating the locationbar --- midori/midori-browser.c | 4 +--- midori/midori-locationaction.c | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c5043f2e..42d61e09 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -609,9 +609,7 @@ midori_view_notify_title_cb (GtkWidget* widget, uri = midori_view_get_display_uri (view); title = midori_view_get_display_title (view); action = _action_by_name (browser, "Location"); - if (browser->maximum_history_age) - midori_location_action_set_title_for_uri ( - MIDORI_LOCATION_ACTION (action), title, uri); + if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) { KatzeItem* item; diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index de70b2c0..2ec6034b 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1445,12 +1445,14 @@ void midori_location_action_set_uri (MidoriLocationAction* location_action, const gchar* uri) { + gchar* escaped_uri; + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - katze_assign (location_action->uri, g_uri_unescape_string (uri, "")); - - midori_location_action_set_text (location_action, uri); + escaped_uri = g_uri_unescape_string (uri, ""); + midori_location_action_set_text (location_action, escaped_uri); + g_free (escaped_uri); } /** From 3aa48c34b5cbd078913398a3e9fc0888d276aa1f Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 13:47:08 -0400 Subject: [PATCH 2851/2970] Stop listening to notify::uri signal. load-status is enough --- midori/midori-browser.c | 1 - midori/midori-view.c | 57 +---------------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 42d61e09..19906888 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -591,7 +591,6 @@ midori_view_notify_uri_cb (GtkWidget* view, const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); GtkAction* action = _action_by_name (browser, "Location"); midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); - _midori_browser_update_interface (browser); } } diff --git a/midori/midori-view.c b/midori/midori-view.c index 5e7e16cb..7ee134ff 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1423,59 +1423,6 @@ midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view, #endif #if WEBKIT_CHECK_VERSION (1, 1, 4) -static void -webkit_web_view_notify_uri_cb (WebKitWebView* web_view, - GParamSpec* pspec, - MidoriView* view) -{ - #if 0 - if (view->item) - { - /* Save back forward history as meta data. This is disabled - because we can't reliably restore these atm. */ - WebKitWebView* web_view; - WebKitWebBackForwardList* list; - GList* back; - GList* forward; - - web_view = WEBKIT_WEB_VIEW (view->web_view); - list = webkit_web_view_get_back_forward_list (web_view); - back = webkit_web_back_forward_list_get_back_list_with_limit (list, 5); - forward = webkit_web_back_forward_list_get_forward_list_with_limit (list, 5); - guint i; - WebKitWebHistoryItem* item; - gchar* key = g_strdup ("back0"); - - i = 0; - while ((item = g_list_nth_data (back, i++))) - { - katze_item_set_meta_string (view->item, key, - webkit_web_history_item_get_uri (item)); - key[4] = 48 + i; - } - - #if 0 - key[0] = 'f'; - key[1] = 'o'; - key[2] = 'r'; - key[3] = 'e'; - key[4] = 48; - i = 0; - while ((item = g_list_nth_data (forward, i++))) - { - katze_item_set_meta_string (view->item, key, - webkit_web_history_item_get_uri (item)); - key[4] = 48 + i; - } - #endif - g_free (key); - } - #endif - - g_object_get (web_view, "uri", &view->uri, NULL); - g_object_notify (G_OBJECT (view), "uri"); -} - static void webkit_web_view_notify_title_cb (WebKitWebView* web_view, GParamSpec* pspec, @@ -1549,7 +1496,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, gboolean background; event->state = event->state & MIDORI_KEYS_MODIFIER_MASK; - link_uri = midori_view_get_link_uri (MIDORI_VIEW (view)); + link_uri = midori_view_get_link_uri (view); switch (event->button) { @@ -3388,8 +3335,6 @@ midori_view_construct_web_view (MidoriView* view) midori_web_view_notify_icon_uri_cb, view, #endif #if WEBKIT_CHECK_VERSION (1, 1, 4) - "signal::notify::uri", - webkit_web_view_notify_uri_cb, view, "signal::notify::title", webkit_web_view_notify_title_cb, view, #else From 74278e64496b0f9be23136f1a57f0b813729a9c8 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 15:28:45 -0400 Subject: [PATCH 2852/2970] Properly create proxy item and cleanup history agregation --- midori/midori-browser.c | 32 ++++++++++------------- midori/midori-view.c | 58 +++++------------------------------------ 2 files changed, 20 insertions(+), 70 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 19906888..d3fff69f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -190,7 +190,7 @@ midori_bookmarkbar_clear (GtkWidget* toolbar); static void midori_browser_new_history_item (MidoriBrowser* browser, - KatzeItem** item); + KatzeItem* item); static void _midori_browser_set_toolbar_style (MidoriBrowser* browser, @@ -611,25 +611,21 @@ midori_view_notify_title_cb (GtkWidget* widget, if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) { - KatzeItem* item; KatzeItem* proxy; - if (browser->history && browser->maximum_history_age) { - item = g_object_get_data (G_OBJECT (view), "history-item-added"); proxy = midori_view_get_proxy_item (view); - if (item && katze_item_get_added (item) == katze_item_get_added (proxy)) + if (katze_item_get_uri (proxy) && + (katze_item_get_meta_integer (proxy, "process") == -1)) { - katze_item_set_name (item, katze_item_get_name (proxy)); - midori_browser_update_history_title (browser, item); + midori_browser_new_history_item (browser, proxy); + katze_item_set_meta_integer (proxy, "process", 1); } - else + else if (katze_item_get_name (proxy) && + (katze_item_get_meta_integer (proxy, "process") == 1)) { - katze_object_assign (item, katze_item_copy (proxy)); - midori_browser_new_history_item (browser, &item); - g_object_ref (item); - g_object_set_data_full (G_OBJECT (view), "history-item-added", - item, (GDestroyNotify)g_object_unref); + midori_browser_update_history_title (browser, proxy); + katze_item_set_meta_integer (proxy, "process", 2); } } } @@ -5344,7 +5340,7 @@ midori_browser_realize_cb (GtkStyle* style, static void midori_browser_new_history_item (MidoriBrowser* browser, - KatzeItem** item) + KatzeItem* item) { time_t now; gint64 day; @@ -5352,7 +5348,7 @@ midori_browser_new_history_item (MidoriBrowser* browser, static sqlite3_stmt* stmt = NULL; now = time (NULL); - katze_item_set_added (*item, now); + katze_item_set_added (item, now); day = sokoke_time_t_to_julian (&now); db = g_object_get_data (G_OBJECT (browser->history), "db"); @@ -5363,9 +5359,9 @@ midori_browser_new_history_item (MidoriBrowser* browser, sqlcmd = "INSERT INTO history (uri, title, date, day) VALUES (?,?,?,?)"; sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL); } - sqlite3_bind_text (stmt, 1, katze_item_get_uri (*item), -1, 0); - sqlite3_bind_text (stmt, 2, katze_item_get_name (*item), -1, 0); - sqlite3_bind_int64 (stmt, 3, katze_item_get_added (*item)); + sqlite3_bind_text (stmt, 1, katze_item_get_uri (item), -1, 0); + sqlite3_bind_text (stmt, 2, katze_item_get_name (item), -1, 0); + sqlite3_bind_int64 (stmt, 3, katze_item_get_added (item)); sqlite3_bind_int64 (stmt, 4, day); if (sqlite3_step (stmt) != SQLITE_DONE) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7ee134ff..c5354b78 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1006,54 +1006,15 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, g_return_if_fail (uri != NULL); katze_assign (view->uri, sokoke_format_uri_for_display (uri)); katze_assign (view->icon_uri, NULL); - if (view->item) - { - #if 0 - /* Load back forward history from meta data. WebKit does not seem to - respect the order of items, so the feature is unusable. */ - if (!view->back_forward_set) - { - WebKitWebBackForwardList* list; - gchar* key; - guint i; - const gchar* data; - WebKitWebHistoryItem* item; - list = webkit_web_view_get_back_forward_list (web_view); + /* FIXME: Create a proxy item if we don't have one. + * We should either always create it, or not rely on it */ + if (!view->item) + midori_view_get_proxy_item (view); - key = g_strdup ("back4"); - for (i = 4; i > 0; i--) - { - key[4] = 48 + i; - if ((data = katze_item_get_meta_string (view->item, key))) - { - item = webkit_web_history_item_new_with_data (data, NULL); - webkit_web_back_forward_list_add_item (list, item); - g_object_unref (item); - } - } + katze_item_set_uri (view->item, uri); + katze_item_set_added (view->item, time (NULL)); - #if 0 - key[0] = 'f'; - key[1] = 'o'; - key[2] = 'r'; - key[3] = 'e'; - for (i = 4; i > 0; i--) - { - key[4] = 48 + i; - item = webkit_web_history_item_new_with_data (data, NULL); - webkit_web_back_forward_list_add_item (list, item); - g_object_unref (item); - } - #endif - g_free (key); - view->back_forward_set = TRUE; - } - #endif - - katze_item_set_uri (view->item, uri); - katze_item_set_added (view->item, time (NULL)); - } g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); @@ -4396,18 +4357,11 @@ midori_view_item_meta_data_changed (KatzeItem* item, KatzeItem* midori_view_get_proxy_item (MidoriView* view) { - const gchar* uri; - const gchar* title; - g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); if (!view->item) { view->item = katze_item_new (); - uri = midori_view_get_display_uri (view); - katze_item_set_uri (view->item, uri); - title = midori_view_get_display_title (view); - katze_item_set_name (view->item, title); g_signal_connect (view->item, "meta-data-changed", G_CALLBACK (midori_view_item_meta_data_changed), view); } From 87ac72112747b8fd8d2c84e64ddb6be0d104d95c Mon Sep 17 00:00:00 2001 From: Harald Servat Date: Thu, 22 Jul 2010 12:43:40 +0200 Subject: [PATCH 2853/2970] l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 1105 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 576 insertions(+), 529 deletions(-) diff --git a/po/ca.po b/po/ca.po index 2d5f4275..db14e584 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-02 16:08+0000\n" +"POT-Creation-Date: 2010-07-22 10:08+0000\n" "PO-Revision-Date: 2010-05-04 19:53+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" @@ -24,9 +24,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lleuger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1627 +#: ../midori/main.c:1635 ../midori/main.c:1651 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -34,198 +34,198 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la configuració: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no és vàlid per %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:441 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "No s'ha pogut obrir la base de dades: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "No s'han pogut eliminar els elements antics de l'historial: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:467 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No s'han pogut desar les adreces d'interès. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:498 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No s'ha pogut desar la configuració: %s" -#: ../midori/main.c:538 +#: ../midori/main.c:536 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No es pot desar les enginys de cerca. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:556 ../midori/main.c:579 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:638 ../midori/main.c:878 #, c-format msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:822 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "No es disposa del certificat arrel. Els certificats SSL no es poden verificar." -#: ../midori/main.c:914 +#: ../midori/main.c:912 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." -#: ../midori/main.c:929 +#: ../midori/main.c:927 msgid "Modify _preferences" msgstr "Modificació de les _preferències" -#: ../midori/main.c:933 +#: ../midori/main.c:931 msgid "Reset the last _session" msgstr "Reiniciar la darrera _sessió" -#: ../midori/main.c:938 +#: ../midori/main.c:936 msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1176 ../midori/main.c:1920 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "No s'ha especificat un nom de fitxer" -#: ../midori/main.c:1321 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Ha ocorregut un error desconegut." -#: ../midori/main.c:1352 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1524 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1527 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1527 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1530 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1532 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1535 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1538 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1540 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1542 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1544 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1544 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1548 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1629 +#: ../midori/main.c:1624 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1652 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1654 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1769 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuració especificada és invalida." -#: ../midori/main.c:1804 +#: ../midori/main.c:1817 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1872 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No s'han pogut carregar els motors de cerca. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1893 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1935 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1948 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1962 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:1968 +#: ../midori/main.c:1978 msgid "_Ignore" msgstr "_Ignora" @@ -246,16 +246,16 @@ msgstr "No es reconeix el format de l'adreça d'interès." msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:331 ../midori/midori-browser.c:5023 -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4921 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:4918 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:455 +#: ../midori/midori-browser.c:456 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" @@ -265,85 +265,85 @@ msgstr "%d%% carregat" msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:507 +#: ../midori/midori-browser.c:506 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:728 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:730 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:730 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:761 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:778 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:797 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4179 +#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4037 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4184 ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:933 +#: ../midori/midori-browser.c:4042 ../midori/midori-browser.c:4071 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:871 msgid "Add to _Speed Dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:884 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:899 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:976 +#: ../midori/midori-browser.c:978 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:980 +#: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1037 ../midori/midori-browser.c:4234 -#: ../midori/midori-browser.c:4266 +#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:4113 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1430 +#: ../midori/midori-browser.c:1432 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2147 +#: ../midori/midori-browser.c:2149 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2225 +#: ../midori/midori-browser.c:2227 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -351,666 +351,674 @@ msgstr "" "Per a usar l'URI que hi ha a dalt, obriu un agregador de notícies. Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o similar.\n" "Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu agregador de notícies. El proper cop que cliqueu a la icona de les notícies, s'agregarà automàticament." -#: ../midori/midori-browser.c:2231 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2274 ../midori/midori-browser.c:5088 -#: ../panels/midori-bookmarks.c:378 +#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4980 +#: ../panels/midori-bookmarks.c:393 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:2810 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Buit" - -#: ../midori/midori-browser.c:3417 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3282 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:3683 ../midori/midori-browser.c:5469 +#: ../midori/midori-browser.c:3545 ../midori/midori-browser.c:5368 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:4017 ../panels/midori-bookmarks.c:733 -#: ../panels/midori-history.c:740 +#: ../midori/midori-browser.c:3872 ../panels/midori-bookmarks.c:706 +#: ../panels/midori-history.c:685 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:4024 ../panels/midori-bookmarks.c:739 -#: ../panels/midori-history.c:746 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3879 ../panels/midori-bookmarks.c:712 +#: ../panels/midori-history.c:691 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:4027 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:741 -#: ../panels/midori-history.c:748 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:2341 +#: ../midori/midori-view.c:4019 ../panels/midori-bookmarks.c:714 +#: ../panels/midori-history.c:693 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:4105 +#: ../midori/midori-browser.c:3960 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:4106 +#: ../midori/midori-browser.c:3961 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4107 +#: ../midori/midori-browser.c:3962 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4108 +#: ../midori/midori-browser.c:3963 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4109 +#: ../midori/midori-browser.c:3964 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4130 +#: ../midori/midori-browser.c:3988 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:3991 ../midori/midori-browser.c:4985 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4144 +#: ../midori/midori-browser.c:4002 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4171 ../midori/midori-browser.c:5197 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../midori/midori-browser.c:4029 ../midori/midori-browser.c:5098 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4245 +#: ../midori/midori-browser.c:4090 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4281 +#: ../midori/midori-browser.c:4128 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4335 ../panels/midori-bookmarks.c:236 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4181 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "No s'ha pogut buidar l'historial: %s\n" + +#: ../midori/midori-browser.c:4189 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "No s'ha pogut buidar l'historial de cerques: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4442 +#: ../midori/midori-browser.c:4296 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4446 +#: ../midori/midori-browser.c:4300 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4460 +#: ../midori/midori-browser.c:4314 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4471 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4324 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4477 +#: ../midori/midori-browser.c:4329 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:4482 +#: ../midori/midori-browser.c:4334 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4339 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:4492 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4344 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:4497 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4349 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:4505 +#: ../midori/midori-browser.c:4357 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:4606 +#: ../midori/midori-browser.c:4498 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:4608 +#: ../midori/midori-browser.c:4500 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:4627 +#: ../midori/midori-browser.c:4519 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4828 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:4938 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4830 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4831 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4834 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:4836 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4837 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4841 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4844 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:4846 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4847 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4849 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4850 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:4852 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4853 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:4858 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4859 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:4861 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4862 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4865 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4868 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:4870 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:4982 +#: ../midori/midori-browser.c:4874 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:4985 +#: ../midori/midori-browser.c:4877 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4881 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:4992 ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4884 ../midori/midori-browser.c:4887 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4890 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4893 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:4896 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4899 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4901 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4902 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4904 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4905 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4909 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4911 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4912 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:4924 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:4927 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:4930 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4931 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:4933 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4934 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:4937 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:4940 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:4941 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:4943 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4944 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:5054 +#: ../midori/midori-browser.c:4946 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4947 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4949 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4950 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4953 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:4956 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4959 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:4963 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5075 +#: ../midori/midori-browser.c:4967 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:5078 +#: ../midori/midori-browser.c:4970 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:5080 +#: ../midori/midori-browser.c:4972 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:4973 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:5083 +#: ../midori/midori-browser.c:4975 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:4976 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:5090 +#: ../midori/midori-browser.c:4982 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:4983 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:4988 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:5099 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4991 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:4992 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:4995 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:4996 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5108 +#: ../midori/midori-browser.c:5000 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5109 +#: ../midori/midori-browser.c:5001 msgid "Inspect page details and access developer tools..." msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" -#: ../midori/midori-browser.c:5114 +#: ../midori/midori-browser.c:5006 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5007 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5117 +#: ../midori/midori-browser.c:5009 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5010 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5120 +#: ../midori/midori-browser.c:5012 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5121 +#: ../midori/midori-browser.c:5013 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5123 +#: ../midori/midori-browser.c:5015 +msgid "Minimize _Current Tab" +msgstr "Minimitza la pestanya _actual" + +#: ../midori/midori-browser.c:5016 +msgid "Minimize the current tab" +msgstr "Minimitza la pestanya actual" + +#: ../midori/midori-browser.c:5018 +msgid "_Duplicate Current Tab" +msgstr "_Duplica la pestanya actual" + +#: ../midori/midori-browser.c:5019 +msgid "Duplicate the current tab" +msgstr "Duplica la pestanya actual" + +#: ../midori/midori-browser.c:5021 +msgid "Close Ot_her Tabs" +msgstr "Tanca la _resta de pestanyes" + +#: ../midori/midori-browser.c:5022 +msgid "Close all tabs except the current tab" +msgstr "Tanca totes les pestanyes menys l'actual" + +#: ../midori/midori-browser.c:5024 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5124 +#: ../midori/midori-browser.c:5025 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:5027 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5128 +#: ../midori/midori-browser.c:5029 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5129 +#: ../midori/midori-browser.c:5030 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5131 +#: ../midori/midori-browser.c:5032 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5132 +#: ../midori/midori-browser.c:5033 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5134 +#: ../midori/midori-browser.c:5035 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5135 +#: ../midori/midori-browser.c:5036 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5138 +#: ../midori/midori-browser.c:5039 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5146 +#: ../midori/midori-browser.c:5047 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5147 +#: ../midori/midori-browser.c:5048 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5150 +#: ../midori/midori-browser.c:5051 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5151 +#: ../midori/midori-browser.c:5052 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5154 +#: ../midori/midori-browser.c:5055 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5155 +#: ../midori/midori-browser.c:5056 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:5059 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5159 +#: ../midori/midori-browser.c:5060 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5162 +#: ../midori/midori-browser.c:5063 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:5064 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:5067 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5167 +#: ../midori/midori-browser.c:5068 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:5076 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5178 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5079 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:5083 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5185 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5086 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5188 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5089 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5191 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5092 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5194 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5095 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5725 +#: ../midori/midori-browser.c:5608 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5615 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5617 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:5758 +#: ../midori/midori-browser.c:5641 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:5760 +#: ../midori/midori-browser.c:5643 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5664 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:5796 -msgid "_Recently visited pages" -msgstr "Pàgines visitades _recentment" - -#: ../midori/midori-browser.c:5798 -msgid "Reopen pages that you visited earlier" -msgstr "Reobre pàgines que heu visitat anteriorment" - -#: ../midori/midori-browser.c:5813 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Adreces d'interès" - -#: ../midori/midori-browser.c:5815 -msgid "Show the saved bookmarks" -msgstr "Mostra les adreces d'interès desades" - -#: ../midori/midori-browser.c:5830 +#: ../midori/midori-browser.c:5679 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:5843 +#: ../midori/midori-browser.c:5696 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:5845 +#: ../midori/midori-browser.c:5698 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:5859 +#: ../midori/midori-browser.c:5712 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:5861 +#: ../midori/midori-browser.c:5714 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6438 +#: ../midori/midori-browser.c:6291 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:379 #, c-format msgid "Failed to select from history\n" msgstr "No s'ha pogut seleccionar de l'historial\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:466 #, c-format msgid "Search for %s" msgstr "Cercar %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:489 #, c-format msgid "Search with %s" msgstr "Cerca amb %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1196 #, c-format msgid "Failed to execute database statement\n" msgstr "No s'ha pogut executar la declaració de base de dades\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1252 msgid "Paste and p_roceed" msgstr "Enganxa i _procedeix" @@ -1031,602 +1039,578 @@ msgstr "Tanca el quadre" msgid "Align sidepanel to the left" msgstr "Alinear el panell lateral a l'esquerra" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Oculta els controls d'operació" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Mostra pàgina en blanc" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Mostra la pàgina d'inici" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Mostra les darreres pestanyes sense carregar-les" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Icones petites" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Automàtic (GNOME o entorn)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Sense servidor intermediari" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Totes les galetes" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "Galetes de sessió" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "Cap" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Recorda la mida de la darrera finestra" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "La posició emmagatzemada del darrer panell" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Mostra barra de fransferències" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Si es mostrarà la barra de transferències" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Mostrar el progrés a la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Motors de cerca per a completar la cerca" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Si s'ha de mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Si s'ha d'alinear el panell lateral a la dreta" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Obre els quadres en finestres separades" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Si s'ha d'obrir els quadres en finestres separades" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Mostra un diàleg quan Midori falli" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Mostrar el marcador ràpid a les noves pestanyes" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Demanar per la carpeta destí" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Informa quan una transferència hagi finalitzat" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si es mostra una notificació quan acabi una transferència" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Gestor de descàrregues" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "Un gestor de descàrregues extern" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Obre les noves pàgines a:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "On s'han d'obrir les pàgines noves" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Obre pàgines externes a:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "On s'obren de forma externa les pàgines obertes" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Obre pestanyes al fons" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Si s'ha d'obrir pestanyes al fons" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Obre les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Obre els missatges emergents en pestanyes" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carrega les imatges automàticament" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Carrega i mostra les imatges automàticament" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilita els scripts" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Habilita els llenguatges d'script incrustats" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilita els connectors de netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Activar els objectes de connexió integrats de Netscape" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Habilita la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Si s'habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "Si es buscarà automàticament a mesura que s'escriu" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Desplaçament cinètic" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Accepta galetes" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Quins tipus de galetes s'accepten" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Només galetes originals" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Accepta només galetes del seu lloc web original" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Edat màxima de la galeta" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "El nombre màxim de dies que es guardaran les galetes" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Recordar les darreres pàgines visitades" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Si les darreres pàgines visitades es desaran" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Edat màxima de l'historial" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Recordar els darrers fitxers descarregats" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "Tipus de servidor intermediari a fer servir" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "El servidor proxy usat per a les connexions HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Detecta automàticament el servidor intermediari" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Identifica'l com a" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Idiomes preferits" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Un llistat separat per comes d'idiomes preferits per mostrar pàgines web multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "La selecció de dades privades per a esborrar" @@ -1634,237 +1618,237 @@ msgstr "La selecció de dades privades per a esborrar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1231 ../midori/midori-view.c:4476 +#: ../midori/midori-view.c:4480 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1232 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1234 msgid "Try again" msgstr "Torneu-ho a provar" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1253 #, c-format msgid "Not found - %s" msgstr "No s'ha trobat «%s»" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1437 ../midori/midori-view.c:2282 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2064 ../midori/midori-view.c:2449 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2116 ../midori/midori-view.c:2186 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2120 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2121 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2124 ../midori/midori-view.c:2193 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2127 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2130 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2133 ../midori/midori-view.c:2205 msgid "_Save Link destination" msgstr "De_sa el destí de l'enllaç" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2199 msgid "_Download Link destination" msgstr "_Descarrega el destí de l'enllaç" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2138 ../midori/midori-view.c:2168 +#: ../midori/midori-view.c:2210 msgid "Download with Download _Manager" msgstr "Descarrega amb el _gestor de descàrregues" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2147 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2150 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2153 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2154 msgid "Download I_mage" msgstr "Descarrega la i_matge" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2161 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2164 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2164 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2227 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2262 ../midori/midori-view.c:2269 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2290 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2594 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2616 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2620 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3164 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3444 msgid "Speed dial" msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3445 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3446 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3447 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3448 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3449 msgid "Set number of columns and rows" msgstr "Estableix el nombre de columnes i files" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3450 msgid "Enter number of columns and rows:" msgstr "Introduïu el nombre de columnes i files:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3451 msgid "Invalid input for the size of the speed dial" msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3452 msgid "Thumb size:" msgstr "Tamany de la miniatura:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3453 msgid "Small" msgstr "Petit" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3454 msgid "Medium" msgstr "Mitjà" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3455 msgid "Big" msgstr "Gran" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3481 #, c-format msgid "Document cannot be displayed" msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3504 #, c-format msgid "No documentation installed" msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3623 msgid "Page loading delayed" msgstr "S'ha retardat la càrrega de la pàgina" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3624 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "S'ha retardat la càrrega degut a una fallada recent o a les preferències d'inici." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3625 msgid "Load Page" msgstr "Carregar pàgina" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3769 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4023 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4028 msgid "_Restore Tab" msgstr "_Restaura la pestanya" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4028 msgid "_Minimize Tab" msgstr "_Minimitza la pestanya" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4034 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4713 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4714 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4766 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Característiques" @@ -2012,6 +1996,10 @@ msgstr "Galetes de web" msgid "days" msgstr "dies" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Buit" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Afegeix giny de cerca" @@ -2044,6 +2032,10 @@ msgstr "Empra'l per _defecte" msgid "_Bookmark" msgstr "_Adreça d'interès" +#: ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "_Adreces d'interès" + #: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "Afegeix adreça d'_interès" @@ -2127,40 +2119,46 @@ msgstr "Transferència finalitzada" msgid "Clear All" msgstr "Netejar-ho tot" -#: ../toolbars/midori-transferbar.c:298 ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "S'estan descarregant fitxers" -#: ../toolbars/midori-transferbar.c:304 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "_Sortir de Midori" -#: ../toolbars/midori-transferbar.c:306 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Les transferències es cancel·laran si se surt de Midori." -#: ../panels/midori-bookmarks.c:110 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:209 +#: ../panels/midori-bookmarks.c:245 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "No s'ha pogut afegir un ítem a les adreces d'interès: %s\n" -#: ../panels/midori-bookmarks.c:386 +#: ../panels/midori-bookmarks.c:277 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" + +#: ../panels/midori-bookmarks.c:401 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:394 +#: ../panels/midori-bookmarks.c:409 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:408 +#: ../panels/midori-bookmarks.c:423 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:542 +#: ../panels/midori-bookmarks.c:553 ../panels/midori-history.c:520 msgid "Separator" msgstr "Separador" @@ -2180,60 +2178,41 @@ msgstr "Copia tot" msgid "Extensions" msgstr "Extensions" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Rellotge erroni" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "El rellotge menteix. Si us plau, comproveu la data i hora actual." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Setmana passada" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Fa %d dia" msgstr[1] "Fa %d dies" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Avuí" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Ahir" -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" - -#: ../panels/midori-history.c:370 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Voleu esborrar tots els elements de l’historial?" -#: ../panels/midori-history.c:444 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Afegeix l'element seleccionat de l'historial a les adreces d'interès" -#: ../panels/midori-history.c:453 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Esborra l'element de l'historial seleccionat" -#: ../panels/midori-history.c:461 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Buida l'historial" -#: ../panels/midori-history.c:942 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtre:" - #: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "_Obre la carpeta destí" @@ -2457,6 +2436,10 @@ msgstr "_Expandeix-ho tot" msgid "_Collapse All" msgstr "_Plega-ho tot" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtre:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que coincideixi amb el filtre" @@ -2481,6 +2464,14 @@ msgstr "Copia les adreces de les pestanyes" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copia les adreces de totes les pestanyes al porta-retalls" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Aplicacions externes" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Associar esquemes URL amb comandes externes" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "No s'han pogut trobar elements Atom \"entry\" en les dades XML." @@ -2512,17 +2503,17 @@ msgstr "Suprimeix el canal" msgid "_Feeds" msgstr "_Canals" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "No s'ha pogut trobar l'element arrel en les dades XML." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Format de canal no compatible." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "No s'ha pogut analitzar el canal XML: %s" @@ -2565,28 +2556,57 @@ msgstr "Quadre de canals" msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "No s'ha pogut afegir un valor al formulari: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "No s'ha pogut executar la comanda a la base de dades: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Emmagatzema l'historial de les dades introduïdes als formularis" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "No disponible: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Els fitxers de recursos no estan instaŀlats" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Omple el formulari de l'historial" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Pestanya següent (Llista de l'historial)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Pestanya següent de l'historial" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Pestanya anterior (Llista de l'historial)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Pestanya anterior de l'historial" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Llista de l'historial" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gesticulacions de ratolí" @@ -2704,11 +2724,38 @@ msgstr "Edita fàcilment la distribució de la barra d'eines" msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" -#~ msgid "Tab History List" -#~ msgstr "Pestanya amb la llista de l'historial" +#~ msgid "_Recently visited pages" +#~ msgstr "Pàgines visitades _recentment" -#~ msgid "Allows to switch tabs by choosing from a list sorted by last usage" -#~ msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Reobre pàgines que heu visitat anteriorment" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Mostra les adreces d'interès desades" + +#~ msgid "Original cookies only" +#~ msgstr "Només galetes originals" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Accepta només galetes del seu lloc web original" + +#~ msgid "Remember last visited pages" +#~ msgstr "Recordar les darreres pàgines visitades" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Si les darreres pàgines visitades es desaran" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Detecta automàticament el servidor intermediari" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" + +#~ msgid "Erroneous clock time" +#~ msgstr "Rellotge erroni" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "El rellotge menteix. Si us plau, comproveu la data i hora actual." #~ msgid "Set number of shortcuts" #~ msgstr "Estableix el nombre de dreceres" From 46c80ad2d1d431595d5f8c177cb5570fa0d0d1b1 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 22:12:20 -0400 Subject: [PATCH 2854/2970] Create MidoriView proxy item during initialization --- midori/midori-view.c | 67 +++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index c5354b78..43bb457a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -657,8 +657,7 @@ midori_view_update_title (MidoriView* view) if (view->menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( view->menu_item))), title); - if (view->item) - katze_item_set_name (view->item, title); + katze_item_set_name (view->item, title); #undef title } @@ -667,8 +666,7 @@ midori_view_apply_icon (MidoriView* view, GdkPixbuf* icon, const gchar* icon_name) { - if (view->item) - katze_item_set_icon (view->item, icon_name); + katze_item_set_icon (view->item, icon_name); katze_object_assign (view->icon, icon); g_object_notify (G_OBJECT (view), "icon"); @@ -1004,15 +1002,14 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, uri = webkit_web_frame_get_uri (web_frame); g_return_if_fail (uri != NULL); - katze_assign (view->uri, sokoke_format_uri_for_display (uri)); katze_assign (view->icon_uri, NULL); - /* FIXME: Create a proxy item if we don't have one. - * We should either always create it, or not rely on it */ - if (!view->item) - midori_view_get_proxy_item (view); + if (g_strcmp0 (uri, katze_item_get_uri (view->item))) + { + katze_assign (view->uri, sokoke_format_uri_for_display (uri)); + katze_item_set_uri (view->item, uri); + } - katze_item_set_uri (view->item, uri); katze_item_set_added (view->item, time (NULL)); g_object_notify (G_OBJECT (view), "uri"); @@ -2736,8 +2733,7 @@ midori_view_hadjustment_notify_value_cb (GtkAdjustment* hadjustment, MidoriView* view) { gint value = (gint)gtk_adjustment_get_value (hadjustment); - if (view->item) - katze_item_set_meta_integer (view->item, "scrollh", value); + katze_item_set_meta_integer (view->item, "scrollh", value); } static void @@ -2757,8 +2753,7 @@ midori_view_vadjustment_notify_value_cb (GtkAdjustment* vadjustment, MidoriView* view) { gint value = (gint)gtk_adjustment_get_value (vadjustment); - if (view->item) - katze_item_set_meta_integer (view->item, "scrollv", value); + katze_item_set_meta_integer (view->item, "scrollv", value); } static void @@ -2801,7 +2796,8 @@ midori_view_init (MidoriView* view) view->selected_text = NULL; view->news_feeds = katze_array_new (KATZE_TYPE_ITEM); - view->item = NULL; + view->item = katze_item_new (); + view->scrollh = view->scrollv = -2; view->back_forward_set = FALSE; @@ -2814,6 +2810,8 @@ midori_view_init (MidoriView* view) GTK_SHADOW_NONE); gtk_container_add (GTK_CONTAINER (view), view->scrolled_window); + g_signal_connect (view->item, "meta-data-changed", + G_CALLBACK (midori_view_item_meta_data_changed), view); g_signal_connect (view->scrolled_window, "notify::hadjustment", G_CALLBACK (midori_view_notify_hadjustment_cb), view); g_signal_connect (view->scrolled_window, "notify::vadjustment", @@ -2830,9 +2828,8 @@ midori_view_finalize (GObject* object) if (view->settings) g_signal_handlers_disconnect_by_func (view->settings, midori_view_settings_notify_cb, view); - if (view->item) - g_signal_handlers_disconnect_by_func (view->item, - midori_view_item_meta_data_changed, view); + g_signal_handlers_disconnect_by_func (view->item, + midori_view_item_meta_data_changed, view); if (view->thumb_view) gtk_widget_destroy (view->thumb_view); @@ -2876,15 +2873,12 @@ midori_view_set_property (GObject* object, break; case PROP_MINIMIZED: view->minimized = g_value_get_boolean (value); - if (view->item) - { - g_signal_handlers_block_by_func (view->item, - midori_view_item_meta_data_changed, view); - katze_item_set_meta_integer (view->item, "minimized", - view->minimized ? 1 : -1); - g_signal_handlers_unblock_by_func (view->item, - midori_view_item_meta_data_changed, view); - } + g_signal_handlers_block_by_func (view->item, + midori_view_item_meta_data_changed, view); + katze_item_set_meta_integer (view->item, "minimized", + view->minimized ? 1 : -1); + g_signal_handlers_unblock_by_func (view->item, + midori_view_item_meta_data_changed, view); if (view->tab_label) sokoke_widget_set_visible (view->tab_title, !view->minimized); break; @@ -3405,6 +3399,7 @@ midori_view_set_uri (MidoriView* view, gchar* filepath; katze_assign (view->uri, g_strdup ("")); + katze_item_set_uri (view->item, ""); filepath = sokoke_find_data_filename ("midori/res/speeddial-head.html"); g_file_get_contents (filepath, &speed_dial_head, NULL, NULL); @@ -3608,8 +3603,7 @@ midori_view_set_uri (MidoriView* view, WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); g_object_notify (G_OBJECT (view), "uri"); - if (view->item) - katze_item_set_uri (view->item, uri); + katze_item_set_uri (view->item, uri); return; } else if (g_str_has_prefix (uri, "pause:")) @@ -3626,8 +3620,7 @@ midori_view_set_uri (MidoriView* view, NULL); g_free (title); g_object_notify (G_OBJECT (view), "uri"); - if (view->item) - katze_item_set_uri (view->item, uri); + katze_item_set_uri (view->item, uri); } else if (g_str_has_prefix (uri, "javascript:")) { @@ -3651,8 +3644,7 @@ midori_view_set_uri (MidoriView* view, { katze_assign (view->uri, sokoke_format_uri_for_display (uri)); g_object_notify (G_OBJECT (view), "uri"); - if (view->item) - katze_item_set_uri (view->item, uri); + katze_item_set_uri (view->item, uri); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } } @@ -4349,8 +4341,7 @@ midori_view_item_meta_data_changed (KatzeItem* item, * Retrieves a proxy item that can be used for bookmark storage as * well as session management. * - * The item is created on the first call and will be updated to reflect - * changes to the title and uri automatically. + * The item reflects changes to the title and uri automatically. * * Return value: the proxy #KatzeItem **/ @@ -4359,12 +4350,6 @@ midori_view_get_proxy_item (MidoriView* view) { g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - if (!view->item) - { - view->item = katze_item_new (); - g_signal_connect (view->item, "meta-data-changed", - G_CALLBACK (midori_view_item_meta_data_changed), view); - } return view->item; } From f7cd519b7f3edb79f26d3fcd360513c40d4aed69 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 23:45:42 -0400 Subject: [PATCH 2855/2970] Unescape spaces as well --- midori/sokoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 22093f12..99bc96ec 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -751,7 +751,7 @@ sokoke_format_uri_for_display (const gchar* uri) { if (uri && g_str_has_prefix (uri, "http://")) { - gchar* unescaped = g_uri_unescape_string (uri, " +"); + gchar* unescaped = g_uri_unescape_string (uri, "+"); #ifdef HAVE_LIBSOUP_2_27_90 gchar* path = NULL; gchar* hostname; From 70861110247c4e33482aee5352084eed38949805 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 23:46:31 -0400 Subject: [PATCH 2856/2970] Avoid double unescaping on locationbar updates --- midori/midori-browser.c | 2 +- midori/midori-locationaction.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d3fff69f..460494a0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -397,7 +397,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); if (text && *text) { - midori_location_action_set_uri (location_action, text); + midori_location_action_set_uri (location_action, browser->statusbar_text); midori_location_action_set_icon (location_action, NULL); midori_location_action_set_secondary_icon (location_action, NULL); } diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 2ec6034b..34772b24 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1445,14 +1445,10 @@ void midori_location_action_set_uri (MidoriLocationAction* location_action, const gchar* uri) { - gchar* escaped_uri; - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (uri != NULL); - escaped_uri = g_uri_unescape_string (uri, ""); - midori_location_action_set_text (location_action, escaped_uri); - g_free (escaped_uri); + midori_location_action_set_text (location_action, uri); } /** From a770a1b488bc06abd658c2def6e328b3fea15e2c Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 22 Jul 2010 09:28:18 -0400 Subject: [PATCH 2857/2970] Uri property is mandatory for history operations --- midori/midori-browser.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 460494a0..b82abafc 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -477,6 +477,8 @@ midori_browser_update_history_title (MidoriBrowser* browser, sqlite3* db; static sqlite3_stmt* stmt = NULL; + g_return_if_fail (katze_item_get_uri (item) != NULL); + db = g_object_get_data (G_OBJECT (browser->history), "db"); if (!stmt) { @@ -5347,6 +5349,8 @@ midori_browser_new_history_item (MidoriBrowser* browser, sqlite3* db; static sqlite3_stmt* stmt = NULL; + g_return_if_fail (katze_item_get_uri (item) != NULL); + now = time (NULL); katze_item_set_added (item, now); day = sokoke_time_t_to_julian (&now); From f8bf87ecf97cb56f676b71d4b704453cfd5f568f Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 09:48:45 -0400 Subject: [PATCH 2858/2970] Dont unescape URIs which are not escaped sokoke_uri_unescape_string handles that and handles '+' the way we want. --- midori/midori-locationaction.c | 3 ++- midori/sokoke.c | 19 ++++++++++++++++++- midori/sokoke.h | 3 +++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 34772b24..29484d9e 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -455,7 +455,8 @@ midori_location_action_popup_timeout_cb (gpointer data) icon = action->default_icon; if (type == 1 /* history_view */) { - unescaped_uri = g_uri_unescape_string ((const char*)uri, ""); + unescaped_uri = sokoke_uri_unescape_string ((const char*)uri); + gtk_list_store_insert_with_values (store, NULL, matches, URI_COL, unescaped_uri, TITLE_COL, title, YALIGN_COL, 0.25, FAVICON_COL, icon, -1); diff --git a/midori/sokoke.c b/midori/sokoke.c index 99bc96ec..909f7113 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -737,6 +737,22 @@ sokoke_magic_uri (const gchar* uri) return NULL; } +/** + * sokoke_uri_unescape_string: + * @uri: an URI string + * + * Unescape @uri if needed, and pass through '+'. + * + * Return value: a newly allocated URI + **/ +gchar* +sokoke_uri_unescape_string (const gchar* uri) +{ + if (strchr (uri,'%')) + return g_uri_unescape_string (uri, "+"); + return g_strdup (uri); +} + /** * sokoke_format_uri_for_display: * @uri: an URI string @@ -749,9 +765,10 @@ sokoke_magic_uri (const gchar* uri) gchar* sokoke_format_uri_for_display (const gchar* uri) { + gchar* unescaped; if (uri && g_str_has_prefix (uri, "http://")) { - gchar* unescaped = g_uri_unescape_string (uri, "+"); + gchar* unescaped = sokoke_uri_unescape_string (uri); #ifdef HAVE_LIBSOUP_2_27_90 gchar* path = NULL; gchar* hostname; diff --git a/midori/sokoke.h b/midori/sokoke.h index 99d91e01..105aed0c 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -113,6 +113,9 @@ sokoke_uri_to_ascii (const gchar* uri); gchar* sokoke_magic_uri (const gchar* uri); +gchar* +sokoke_uri_unescape_string (const gchar* uri); + gchar* sokoke_format_uri_for_display (const gchar* uri); From d78efc08631bec76727f2458e1162229b40ea12d Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 09:50:10 -0400 Subject: [PATCH 2859/2970] Duplicate day name for history panel folder names --- panels/midori-history.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 314280dd..1af95429 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -140,7 +140,7 @@ midori_history_format_date (KatzeItem *item) else if (age > 7 || age < 0) { strftime (token, sizeof (token), "%x", localtime ((time_t*)&day)); - sdate = token; + sdate = g_strdup (token); } else if (age > 6) sdate = _("A week ago"); From 1339dc671b9e656e84b53d21cd0d2863e80fe533 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 11:19:38 -0400 Subject: [PATCH 2860/2970] Dont add items with empty uris into history --- midori/midori-browser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b82abafc..f4e7a75f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -616,8 +616,10 @@ midori_view_notify_title_cb (GtkWidget* widget, KatzeItem* proxy; if (browser->history && browser->maximum_history_age) { + const gchar* proxy_uri; proxy = midori_view_get_proxy_item (view); - if (katze_item_get_uri (proxy) && + proxy_uri = katze_item_get_uri (proxy); + if (proxy_uri && *proxy_uri && proxy_uri[1] && (katze_item_get_meta_integer (proxy, "process") == -1)) { midori_browser_new_history_item (browser, proxy); From 5e250cc70d97d02b4eb397eaffd0c4a02140f0b3 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 13:57:59 -0400 Subject: [PATCH 2861/2970] Store 'description' property of a bookmark --- midori/midori-array.c | 6 ++++++ midori/midori-browser.c | 4 ++-- panels/midori-bookmarks.c | 9 +++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/midori/midori-array.c b/midori/midori-array.c index 35c938a9..e8ca484b 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -796,6 +796,12 @@ katze_item_set_value_from_column (sqlite3_stmt* stmt, folder = sqlite3_column_text (stmt, column); katze_item_set_meta_string (item, name, (gchar*)folder); } + else if (g_str_equal (name, "desc")) + { + const unsigned char* text; + text = sqlite3_column_text (stmt, column); + katze_item_set_text (item, (gchar*)text); + } else g_warn_if_reached (); } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f4e7a75f..097a470f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -6372,7 +6372,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) if (!db) return; - sqlcmd = "SELECT uri, title, app, folder, toolbar FROM bookmarks WHERE " + sqlcmd = "SELECT uri, title, desc, app, folder, toolbar FROM bookmarks WHERE " " toolbar = 1 ORDER BY uri ASC"; array = katze_array_from_sqlite (db, sqlcmd); @@ -6392,7 +6392,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) KatzeArray* subfolder; gchar* subsqlcmd; - subsqlcmd = g_strdup_printf ("SELECT uri, title, app FROM bookmarks WHERE " + subsqlcmd = g_strdup_printf ("SELECT uri, title, desc, app FROM bookmarks WHERE " " folder = '%s' and uri != ''", katze_item_get_name (item)); subfolder = katze_array_from_sqlite (db, subsqlcmd); katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item)); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 0edac295..128848d8 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -157,7 +157,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, if (keyword && *keyword) { gchar* filterstr; - sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where " + sqlcmd = "SELECT uri, title, desc, app, toolbar, folder from bookmarks where " " title like ? ORDER BY uri DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); filterstr = g_strdup_printf ("%%%s%%", keyword); @@ -168,7 +168,7 @@ midori_bookmarks_read_from_db (MidoriBookmarks* bookmarks, { if (!folder) folder = ""; - sqlcmd = "SELECT uri, title, app, toolbar, folder from bookmarks where " + sqlcmd = "SELECT uri, title, desc, app, toolbar, folder from bookmarks where " " folder = ? ORDER BY uri DESC"; result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL); sqlite3_bind_text (statement, 1, g_strdup (folder), -1, g_free); @@ -232,10 +232,11 @@ midori_bookmarks_insert_item_db (sqlite3* db, parent = g_strdup (""); sqlcmd = sqlite3_mprintf ( - "INSERT into bookmarks (uri, title, folder, toolbar, app) values" - " ('%q', '%q', '%q', %d, %d)", + "INSERT into bookmarks (uri, title, desc, folder, toolbar, app) values" + " ('%q', '%q', '%q', '%q', %d, %d)", uri, katze_item_get_name (item), + katze_item_get_text (item), parent, katze_item_get_meta_boolean (item, "toolbar"), katze_item_get_meta_boolean (item, "app")); From 9e3e3fc4916362a1e3a58cc7de27c53ad9c3280a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 13:51:28 -0400 Subject: [PATCH 2862/2970] Update bookmark for export from sqlite database --- midori/midori-browser.c | 8 ++++++++ panels/midori-bookmarks.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 097a470f..5caa48a2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -173,6 +173,11 @@ midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, gchar* folder); +void +midori_bookmarks_export_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder); + void midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, @@ -4110,6 +4115,7 @@ _action_bookmarks_export_activate (GtkAction* action, GtkWidget* file_dialog; gchar* path = NULL; GError* error; + sqlite3* db; if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser))) return; @@ -4126,6 +4132,8 @@ _action_bookmarks_export_activate (GtkAction* action, return; error = NULL; + db = g_object_get_data (G_OBJECT (browser->history), "db"); + midori_bookmarks_export_array_db (db, browser->bookmarks, ""); if (!midori_array_to_file (browser->bookmarks, path, "xbel", &error)) { sokoke_message_dialog (GTK_MESSAGE_ERROR, diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 128848d8..1f94c897 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -122,6 +122,35 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) return STOCK_BOOKMARKS; } +void +midori_bookmarks_export_array_db (sqlite3* db, + KatzeArray* array, + const gchar* folder) +{ + gchar* sqlcmd; + KatzeArray* root_array; + KatzeArray* subarray; + KatzeItem* item; + int i = 0; + + sqlcmd = g_strdup_printf ("SELECT * FROM bookmarks where folder='%s'", folder); + root_array = katze_array_from_sqlite (db, sqlcmd); + g_free (sqlcmd); + + while ((item = katze_array_get_nth_item (KATZE_ARRAY (root_array), i++))) + { + if (KATZE_ITEM_IS_FOLDER (item)) + { + subarray = katze_array_new (KATZE_TYPE_ARRAY); + katze_item_set_name (KATZE_ITEM (subarray), katze_item_get_name (item)); + midori_bookmarks_export_array_db (db, subarray, katze_item_get_name (item)); + katze_array_add_item (array, subarray); + } + else + katze_array_add_item (array, item); + } +} + void midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, From fd48f850a3d973e590cd9fbecab27146643faa28 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 16:24:11 -0400 Subject: [PATCH 2863/2970] Emmit uri signals after after item uri is set --- midori/midori-view.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 43bb457a..1b3114dd 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3602,8 +3602,8 @@ midori_view_set_uri (MidoriView* view, webkit_web_view_load_html_string ( WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); - g_object_notify (G_OBJECT (view), "uri"); katze_item_set_uri (view->item, uri); + g_object_notify (G_OBJECT (view), "uri"); return; } else if (g_str_has_prefix (uri, "pause:")) @@ -3619,8 +3619,8 @@ midori_view_set_uri (MidoriView* view, _("Load Page"), NULL); g_free (title); - g_object_notify (G_OBJECT (view), "uri"); katze_item_set_uri (view->item, uri); + g_object_notify (G_OBJECT (view), "uri"); } else if (g_str_has_prefix (uri, "javascript:")) { @@ -3643,8 +3643,8 @@ midori_view_set_uri (MidoriView* view, else { katze_assign (view->uri, sokoke_format_uri_for_display (uri)); - g_object_notify (G_OBJECT (view), "uri"); katze_item_set_uri (view->item, uri); + g_object_notify (G_OBJECT (view), "uri"); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } } From e2ac49a76ddb519d46c4545c6ec38c5563a2612f Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Fri, 23 Jul 2010 17:11:38 -0400 Subject: [PATCH 2864/2970] Dont store about:* pages in history, Reset history step counter --- midori/midori-browser.c | 10 ++++++---- midori/midori-view.c | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 5caa48a2..0ee09e06 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -625,16 +625,18 @@ midori_view_notify_title_cb (GtkWidget* widget, proxy = midori_view_get_proxy_item (view); proxy_uri = katze_item_get_uri (proxy); if (proxy_uri && *proxy_uri && proxy_uri[1] && - (katze_item_get_meta_integer (proxy, "process") == -1)) + !g_str_has_prefix (proxy_uri, "about:") && + (katze_item_get_meta_integer (proxy, "history-step") == -1)) { midori_browser_new_history_item (browser, proxy); - katze_item_set_meta_integer (proxy, "process", 1); + katze_item_set_meta_integer (proxy, "history-step", 1); } else if (katze_item_get_name (proxy) && - (katze_item_get_meta_integer (proxy, "process") == 1)) + !g_str_has_prefix (proxy_uri, "about:") && + (katze_item_get_meta_integer (proxy, "history-step") == 1)) { midori_browser_update_history_title (browser, proxy); - katze_item_set_meta_integer (proxy, "process", 2); + katze_item_set_meta_integer (proxy, "history-step", 2); } } } diff --git a/midori/midori-view.c b/midori/midori-view.c index 1b3114dd..40083a8f 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1011,6 +1011,7 @@ webkit_web_view_load_committed_cb (WebKitWebView* web_view, } katze_item_set_added (view->item, time (NULL)); + katze_item_set_meta_integer (view->item, "history-step", -1); g_object_notify (G_OBJECT (view), "uri"); g_object_set (view, "title", NULL, NULL); From 51196b05f15b80f4ce964efe6f08e797315a3919 Mon Sep 17 00:00:00 2001 From: Evaggelos Balaskas Date: Tue, 27 Jul 2010 19:58:35 +0200 Subject: [PATCH 2865/2970] l10n: Updated Greek (el) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/el.po | 781 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 403 insertions(+), 378 deletions(-) diff --git a/po/el.po b/po/el.po index 85ae82b7..3a7068a8 100644 --- a/po/el.po +++ b/po/el.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: midori git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-05 10:26+0300\n" -"PO-Revision-Date: 2010-07-05 10:29+0200\n" +"POT-Creation-Date: 2010-07-27 20:54+0300\n" +"PO-Revision-Date: 2010-07-27 20:57+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "Language: el\n" @@ -25,10 +25,10 @@ msgid "Lightweight web browser" msgstr "Ελαφρύς περιηγητής ιστού" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1302 -#: ../midori/main.c:1632 -#: ../midori/main.c:1640 -#: ../midori/main.c:1656 +#: ../midori/main.c:1298 +#: ../midori/main.c:1627 +#: ../midori/main.c:1635 +#: ../midori/main.c:1651 #: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Μιντόρι" @@ -37,204 +37,204 @@ msgstr "Μιντόρι" msgid "Web Browser" msgstr "Περιηγητής Ιστού" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" -#: ../midori/main.c:158 -#: ../midori/main.c:244 +#: ../midori/main.c:155 +#: ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" -#: ../midori/main.c:370 -#: ../midori/main.c:442 -#: ../extensions/formhistory.c:453 +#: ../midori/main.c:368 +#: ../midori/main.c:441 +#: ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:467 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Οι σελιδοδείκτες δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:498 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:536 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να αποθηκευτούν. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 -#: ../midori/main.c:581 +#: ../midori/main.c:556 +#: ../midori/main.c:579 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Τα απορρίμματα δεν μπόρεσαν να αποθηκευτούν. %s" -#: ../midori/main.c:640 -#: ../midori/main.c:880 +#: ../midori/main.c:638 +#: ../midori/main.c:878 #, c-format msgid "The session couldn't be saved. %s" msgstr "Η συνεδρία δεν μπόρεσε να αποθηκευτεί. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:822 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Δεν είναι διαθέσιμο κανένα πιστοποιητικό ρίζας. Πιστοποιητικά SSL δεν μπορούν να επιβεβαιωθούν." -#: ../midori/main.c:914 +#: ../midori/main.c:912 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Το Μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να επιλύσετε το πρόβλημα." -#: ../midori/main.c:929 +#: ../midori/main.c:927 msgid "Modify _preferences" msgstr "Τροποποίηση _προτιμήσεων" -#: ../midori/main.c:933 +#: ../midori/main.c:931 msgid "Reset the last _session" msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" -#: ../midori/main.c:938 +#: ../midori/main.c:936 msgid "Disable all _extensions" msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" -#: ../midori/main.c:1178 -#: ../midori/main.c:1909 +#: ../midori/main.c:1176 +#: ../midori/main.c:1920 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1298 msgid "No filename specified" msgstr "Δεν ορίστηκε όνομα αρχείου" -#: ../midori/main.c:1321 +#: ../midori/main.c:1317 msgid "An unknown error occured." msgstr "Συνέβη ένα άγνωστο σφάλμα." -#: ../midori/main.c:1352 +#: ../midori/main.c:1348 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Το στιγμιότυπο αποθηκεύτηκε στο: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1520 msgid "Run ADDRESS as a web application" msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" -#: ../midori/main.c:1524 +#: ../midori/main.c:1520 msgid "ADDRESS" msgstr "Διεύθυνση" -#: ../midori/main.c:1527 +#: ../midori/main.c:1523 msgid "Use FOLDER as configuration folder" msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" -#: ../midori/main.c:1527 +#: ../midori/main.c:1523 msgid "FOLDER" msgstr "ΦΑΚΕΛΟΣ" -#: ../midori/main.c:1530 +#: ../midori/main.c:1526 msgid "Show a diagnostic dialog" msgstr "Εμφάνιση του διαλόγου διάγνωσης" -#: ../midori/main.c:1532 +#: ../midori/main.c:1528 msgid "Run the specified filename as javascript" msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" -#: ../midori/main.c:1535 +#: ../midori/main.c:1531 msgid "Take a snapshot of the specified URI" msgstr "Αποθήκευση του συγκεκριμένου URI" -#: ../midori/main.c:1538 +#: ../midori/main.c:1534 msgid "Execute the specified command" msgstr "Εκτέλεση της συγκεκριμένης εντολής" -#: ../midori/main.c:1540 +#: ../midori/main.c:1536 msgid "Display program version" msgstr "Προβολή έκδοσης προγράμματος" -#: ../midori/main.c:1542 +#: ../midori/main.c:1538 msgid "Addresses" msgstr "Διευθύνσεις" -#: ../midori/main.c:1544 +#: ../midori/main.c:1540 msgid "Block URIs according to regular expression PATTERN" msgstr "Εμπόδισε URIs σύμφωνα με την κανονική έκφραση ΜΟΤΙΒΟ" -#: ../midori/main.c:1544 +#: ../midori/main.c:1540 msgid "PATTERN" msgstr "ΜΟΤΙΒΟ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1544 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Επαναφορά midori μετά από SECONDS δευτερόλεπτα απραγίας" -#: ../midori/main.c:1548 +#: ../midori/main.c:1544 msgid "SECONDS" msgstr "ΔΕΥΤΕΡΟΛΕΠΤΑ" -#: ../midori/main.c:1629 +#: ../midori/main.c:1624 msgid "[Addresses]" msgstr "[Διευθύνσεις" -#: ../midori/main.c:1657 +#: ../midori/main.c:1652 msgid "Please report comments, suggestions and bugs to:" msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1654 msgid "Check for new versions at:" msgstr "Έλεγχος για νέα έκδοση στο:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1769 msgid "The specified configuration folder is invalid." msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." -#: ../midori/main.c:1804 +#: ../midori/main.c:1817 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ένα στιγμιότυπο του Μιντόρι τρέχει ήδη αλλά δεν ανταποκρίνεται.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1872 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Οι μηχανές αναζήτησης δεν μπόρεσαν να φορτωθούν. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1893 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1935 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Τα απορρίμματα δεν μπόρεσαν να φορτωθούν: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1948 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Το ιστορικό δεν μπόρεσε να φορτωθεί: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1962 msgid "The following errors occured:" msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" -#: ../midori/main.c:1968 +#: ../midori/main.c:1978 msgid "_Ignore" msgstr "Α_γνόησε" @@ -256,112 +256,112 @@ msgstr "Άγνωστος τύπος συνδέσμου." msgid "Writing failed." msgstr "Αποτυχία εγγραφής." -#: ../midori/midori-browser.c:330 -#: ../midori/midori-browser.c:4855 -#: ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:337 +#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4935 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:340 -#: ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:347 +#: ../midori/midori-browser.c:4932 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:461 #, c-format msgid "%d%% loaded" msgstr "%d%% φορτώθηκε" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:500 #, c-format msgid "Failed to update title: %s\n" msgstr "Αποτυχία κατά την ανανέωση του τίτλου: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:513 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:739 msgid "New folder" msgstr "Νέος φάκελος" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:739 msgid "Edit folder" msgstr "Επεξεργασία φακέλου" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:741 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:741 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:772 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:776 +#: ../midori/midori-browser.c:789 #: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-browser.c:795 +#: ../midori/midori-browser.c:808 #: ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:829 -#: ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:840 +#: ../midori/midori-browser.c:4048 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:839 -#: ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4027 -#: ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:850 +#: ../midori/midori-browser.c:944 +#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:4082 msgid "Toplevel folder" msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:882 msgid "Add to _Speed Dial" msgstr "Προσθήκη στην _γρήγορη σύνδεση" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:895 msgid "Show in the tool_bar" msgstr "Εμφάνιση στην εργαλειο_θήκη" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:910 msgid "Run as _web application" msgstr "Εκτέλεση ως _διαδικτυακή εφαρμογή" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:989 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Δεν υπάρχει αρκετός ελεύθερος χώρος για να κατεβάσετε \"%s\"." -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:993 #, c-format msgid "The file needs %s but only %s are left." msgstr "Το αρχείο χρειάζεται %s αλλά έχουν απομείνει μόνο %s." -#: ../midori/midori-browser.c:1039 -#: ../midori/midori-browser.c:4064 -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:1050 +#: ../midori/midori-browser.c:4090 +#: ../midori/midori-browser.c:4125 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1443 msgid "Save file" msgstr "Αποθήκευση αρχείου" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2160 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2238 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -369,18 +369,18 @@ msgstr "" "Για την χρήση του παραπάνω URI ανοίξτε έναν συλλέκτη νέων. Υπάρχει συνήθως ένα μενού ή ένα πλήκτρο \"Νέα Συνδρομή\", \"Νέα Νέα Ροή\" ή παρόμοια.\n" "Εναλλακτικά πήγαινε στις προτιμήσεις, εφαρμογές στο midori, κι επιλέξτε έναν συλλέκτη νέων. Την επόμενη φορά που θα κάνετε click σε εικονίδιο ροής νέων, θα προστεθεί αυτόματα." -#: ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2244 #: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Νέα ροή" -#: ../midori/midori-browser.c:2276 -#: ../midori/midori-browser.c:4920 -#: ../panels/midori-bookmarks.c:403 +#: ../midori/midori-browser.c:2287 +#: ../midori/midori-browser.c:4994 +#: ../panels/midori-bookmarks.c:423 msgid "Add a new bookmark" msgstr "Προσθήκη ενός νέου σελιδοδείκτη" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3293 #: ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 #: ../midori/sokoke.c:436 @@ -389,639 +389,665 @@ msgstr "Προσθήκη ενός νέου σελιδοδείκτη" msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/midori-browser.c:3529 -#: ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:3556 +#: ../midori/midori-browser.c:5384 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Αποτυχία εισαγωγής νέου αντικειμένου στο ιστορικό: %s\n" -#: ../midori/midori-browser.c:3857 -#: ../panels/midori-bookmarks.c:718 -#: ../panels/midori-history.c:710 +#: ../midori/midori-browser.c:3883 +#: ../panels/midori-bookmarks.c:736 +#: ../panels/midori-history.c:685 msgid "Open all in _Tabs" msgstr "Άνοιγμα όλων σε _καρτέλες" -#: ../midori/midori-browser.c:3864 -#: ../panels/midori-bookmarks.c:724 -#: ../panels/midori-history.c:716 +#: ../midori/midori-browser.c:3890 +#: ../panels/midori-bookmarks.c:742 +#: ../panels/midori-history.c:691 #: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:3867 -#: ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 -#: ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:718 +#: ../midori/midori-browser.c:3893 +#: ../midori/midori-view.c:2339 +#: ../midori/midori-view.c:4012 +#: ../panels/midori-bookmarks.c:744 +#: ../panels/midori-history.c:693 #: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:3971 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:3972 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3947 +#: ../midori/midori-browser.c:3973 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3948 +#: ../midori/midori-browser.c:3974 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:3975 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3999 msgid "Import bookmarks..." msgstr "Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:3976 -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4002 +#: ../midori/midori-browser.c:4999 msgid "_Import bookmarks" msgstr "_Εισαγωγή συνδέσμων..." -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:4013 msgid "_Application:" msgstr "_Εφαρμογή:" -#: ../midori/midori-browser.c:4014 -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4040 +#: ../midori/midori-browser.c:5112 #: ../midori/midori-websettings.c:224 #: ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Προσαρμογή..." -#: ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:4101 msgid "Failed to import bookmarks" msgstr "Αποτυχία εισαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:4142 msgid "Failed to export bookmarks" msgstr "Αποτυχία εξαγωγής συνδέσμων" -#: ../midori/midori-browser.c:4167 -#: ../panels/midori-bookmarks.c:278 -#: ../panels/midori-history.c:142 -#: ../panels/midori-history.c:172 +#: ../midori/midori-browser.c:4195 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού: %s\n" + +#: ../midori/midori-browser.c:4203 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Αποτυχία κατά τον καθαρισμό του ιστορικού αναζήτησης: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4310 msgid "Clear Private Data" msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4278 +#: ../midori/midori-browser.c:4314 msgid "_Clear private data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4292 +#: ../midori/midori-browser.c:4328 msgid "Clear the following data:" msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4338 #: ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Ιστορικό" -#: ../midori/midori-browser.c:4309 +#: ../midori/midori-browser.c:4343 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4348 msgid "'Flash' Cookies" msgstr "Άδειασμα των cookies" -#: ../midori/midori-browser.c:4319 +#: ../midori/midori-browser.c:4353 msgid "Website icons" msgstr "Εικονίδια ιστότοπων" -#: ../midori/midori-browser.c:4324 -#: ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4358 +#: ../midori/sokoke.c:1315 msgid "_Closed Tabs" msgstr "_Κλειστές καρτέλες" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4363 #: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Προσωρινής μνήμης ιστού" -#: ../midori/midori-browser.c:4337 +#: ../midori/midori-browser.c:4371 msgid "Clear private data when _quitting Midori" msgstr "Καθαρισμός προσωπικών δεδομένων κατά τον _τερματισμό του Midori" -#: ../midori/midori-browser.c:4438 +#: ../midori/midori-browser.c:4512 msgid "A lightweight web browser." msgstr "Ένας ελαφρύς περιηγητής ιστού" -#: ../midori/midori-browser.c:4440 +#: ../midori/midori-browser.c:4514 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Η βιβλιοθήκη είναι ελεύθερο λογισμικό - μπορείτε να το αναδιανέμεται και/ή να το τροποποιήσετε κάτω από την άδεια χρήστης GNU Lesser General Public License όπως δημοσιεύεται από το Free Software Foundation - είτε έκδοση 2.1 της άδειας, ή (κατά την γνώμη σας) οποιαδήποτε νεώτερη." -#: ../midori/midori-browser.c:4459 +#: ../midori/midori-browser.c:4533 msgid "translator-credits" msgstr "Ευάγγελος Μπαλάσκας 2008,2009" -#: ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:4842 msgid "_File" msgstr "_Αρχείο" -#: ../midori/midori-browser.c:4770 -#: ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4844 +#: ../midori/sokoke.c:1316 msgid "New _Window" msgstr "Νέο _παράθυρο" -#: ../midori/midori-browser.c:4771 +#: ../midori/midori-browser.c:4845 msgid "Open a new window" msgstr "Άνοιγμα ενός νέου παραθύρου" -#: ../midori/midori-browser.c:4774 +#: ../midori/midori-browser.c:4848 msgid "Open a new tab" msgstr "Άνοιγμα μίας νέας καρτέλας" -#: ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:4850 msgid "P_rivate Browsing" msgstr "Π_ροσωπική περιήγηση" -#: ../midori/midori-browser.c:4777 +#: ../midori/midori-browser.c:4851 msgid "Don't save any private data while browsing" msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" -#: ../midori/midori-browser.c:4781 +#: ../midori/midori-browser.c:4855 msgid "Open a file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:4784 +#: ../midori/midori-browser.c:4858 msgid "Save to a file" msgstr "Αποθήκευση σε αρχείου" -#: ../midori/midori-browser.c:4786 +#: ../midori/midori-browser.c:4860 msgid "Add to Speed _dial" msgstr "Προσθήκη σε γρήγορη σ_ύνδεση" -#: ../midori/midori-browser.c:4787 +#: ../midori/midori-browser.c:4861 msgid "Add shortcut to speed dial" msgstr "Προσθήκη συντόμευσης σε γρήγορη σύνδεση" -#: ../midori/midori-browser.c:4789 +#: ../midori/midori-browser.c:4863 msgid "Add Shortcut to the _desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια εργασίας" -#: ../midori/midori-browser.c:4790 +#: ../midori/midori-browser.c:4864 msgid "Add shortcut to the desktop" msgstr "Προσθήκη συντόμευσης στην _επιφάνεια" -#: ../midori/midori-browser.c:4792 +#: ../midori/midori-browser.c:4866 msgid "Subscribe to News _feed" msgstr "Εγγραφή σε _ροή νέων" -#: ../midori/midori-browser.c:4793 +#: ../midori/midori-browser.c:4867 msgid "Subscribe to this news feed" msgstr "Εγγραφή στην ροή νέων" -#: ../midori/midori-browser.c:4798 +#: ../midori/midori-browser.c:4872 msgid "_Close Tab" msgstr "_Κλείσιμο καρτέλας" -#: ../midori/midori-browser.c:4799 +#: ../midori/midori-browser.c:4873 msgid "Close the current tab" msgstr "Κλείσιμο της τρέχουσας καρτέλας" -#: ../midori/midori-browser.c:4801 +#: ../midori/midori-browser.c:4875 msgid "C_lose Window" msgstr "Κ_λείσιμο παραθύρου" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:4876 msgid "Close this window" msgstr "Κλείσιμο αυτού του παραθύρου" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4879 msgid "Print the current page" msgstr "Εκτύπωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4882 msgid "Quit the application" msgstr "Έξοδος από την εφαρμογή" -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4884 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:4888 msgid "Undo the last modification" msgstr "Αναίρεση της τελευταίας τροποποίησης" -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4891 msgid "Redo the last modification" msgstr "Επανάληψη της τελευταίας τροποποίησης" -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:4895 msgid "Cut the selected text" msgstr "Αποκοπή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:4824 -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4901 msgid "Copy the selected text" msgstr "Αντιγραφή επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4904 msgid "Paste text from the clipboard" msgstr "Επικόλληση κειμένου από το πρόχειρο" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4907 msgid "Delete the selected text" msgstr "Διαγραφή του επιλεγμένου κειμένου" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4910 msgid "Select all text" msgstr "Επιλογή όλου του κειμένου" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4913 msgid "Find a word or phrase in the page" msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4915 msgid "Find _Next" msgstr "Εύρεση επ_όμενο" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4916 msgid "Find the next occurrence of a word or phrase" msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4918 msgid "Find _Previous" msgstr "Εύρεση _προηγούμενο" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4919 msgid "Find the previous occurrence of a word or phrase" msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4923 msgid "Configure the application preferences" msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4925 msgid "_View" msgstr "_Εμφάνιση" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4926 msgid "_Toolbars" msgstr "_Εργαλειοθήκες" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:4938 msgid "Increase the zoom level" msgstr "Αύξηση του επίπεδου εστίασης" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4941 msgid "Decrease the zoom level" msgstr "Μείωση του επιπέδου εστίασης" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4944 msgid "Reset the zoom level" msgstr "Επαναφορά του επιπέδου εστίασης" -#: ../midori/midori-browser.c:4871 +#: ../midori/midori-browser.c:4945 msgid "_Encoding" msgstr "_Κωδικοποίηση" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4947 msgid "View So_urce" msgstr "Προβολή κ_ώδικα" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4948 msgid "View the source code of the page" msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4951 msgid "Toggle fullscreen view" msgstr "Εναλλαγή σε πλήρη οθόνη" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4954 msgid "Scroll _Left" msgstr "Μετακίνηση _αριστερά" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4955 msgid "Scroll to the left" msgstr "Μετακίνηση προς αριστερά" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4957 msgid "Scroll _Down" msgstr "Μετακίνηση _κάτω" -#: ../midori/midori-browser.c:4884 +#: ../midori/midori-browser.c:4958 msgid "Scroll down" msgstr "Μετακίνηση κάτω" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:4960 msgid "Scroll _Up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4961 msgid "Scroll up" msgstr "Μετακίνηση _επάνω" -#: ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4963 msgid "Scroll _Right" msgstr "Μετακίνηση _δεξιά" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4964 msgid "Scroll to the right" msgstr "Μετακίνηση προς τα δεξιά" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4967 msgid "_Go" msgstr "_Μετάβαση" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4970 msgid "Go back to the previous page" msgstr "Μετάβαση στην προηγούμενη σελίδα" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4973 msgid "Go forward to the next page" msgstr "Μετάβαση στην επόμενη σελίδα" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:4977 msgid "Go to the previous sub-page" msgstr "Μετάβαση στην προηγούμενη υπό-σελίδα" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4981 msgid "Go to the next sub-page" msgstr "Μετάβαση στην επόμενη υπό-σελίδα" -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:4984 msgid "Go to your homepage" msgstr "Μετάβαση στην αρχική σελίδα" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:4986 msgid "Empty Trash" msgstr "Άδειασμα απορριμμάτων" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4987 msgid "Delete the contents of the trash" msgstr "Διαγραφή των περιεχομένων των απορριμμάτων" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4989 msgid "Undo _Close Tab" msgstr "Αναίρεση κλ_είσιμο καρτέλας" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4990 msgid "Open the last closed tab" msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4996 msgid "Add a new _folder" msgstr "Προσθήκη ενός νέου φ_ακέλου" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4997 msgid "Add a new bookmark folder" msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" -#: ../midori/midori-browser.c:4928 +#: ../midori/midori-browser.c:5002 msgid "_Export bookmarks" msgstr "_Εξαγωγή συνδέσμων" -#: ../midori/midori-browser.c:4931 +#: ../midori/midori-browser.c:5005 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Διαχείριση των μηχανών αναζήτησης" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:5006 msgid "Add, edit and remove search engines..." msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:5009 msgid "_Clear Private Data" msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:5010 msgid "Clear private data..." msgstr "Καθαρισμός προσωπικών δεδομένων..." -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:5014 msgid "_Inspect Page" msgstr "_Εξέταση σελίδας" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5015 msgid "Inspect page details and access developer tools..." msgstr "Εξέταση λεπτομερειών σελίδας και πρόσβαση σε διαχειριστικά εργαλεία ..." -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5020 msgid "_Previous Tab" msgstr "_Προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5021 msgid "Switch to the previous tab" msgstr "Μετάβαση στην προηγούμενη καρτέλα" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5023 msgid "_Next Tab" msgstr "Επόμε_νη καρτέλα" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:5024 msgid "Switch to the next tab" msgstr "Μετάβαση στην επόμενη καρτέλα" -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:5026 msgid "Focus _Current Tab" msgstr "Εστίαση στην _ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:5027 msgid "Focus the current tab" msgstr "Εστίαση στην ισχύουσα καρτέλα" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:5029 +msgid "Minimize _Current Tab" +msgstr "Ελαχιστοποίηση της _τρέχουσας καρτέλας" + +#: ../midori/midori-browser.c:5030 +msgid "Minimize the current tab" +msgstr "Ελαχιστοποίηση της συγκεκριμένης καρτέλας" + +#: ../midori/midori-browser.c:5032 +msgid "_Duplicate Current Tab" +msgstr "_Διπλασίασε την τρέχουσα καρτέλα" + +#: ../midori/midori-browser.c:5033 +msgid "Duplicate the current tab" +msgstr "Διπλασιασμός της συγκεκριμένης καρτέλας" + +#: ../midori/midori-browser.c:5035 +msgid "Close Ot_her Tabs" +msgstr "Κλείσιμο των άλλ_ων καρτελών" + +#: ../midori/midori-browser.c:5036 +msgid "Close all tabs except the current tab" +msgstr "Κλείσιμο των άλλων καρτελών εκτός της τρέχουσας" + +#: ../midori/midori-browser.c:5038 msgid "Open last _session" msgstr "Επαναφορά της τελευταίας _συνεδρίας" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5039 msgid "Open the tabs saved in the last session" msgstr "Άνοιγμα των καρτελών που αποθηκεύτηκαν κατά την τελευταία συνεδρία" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:5041 msgid "_Help" msgstr "_Βοήθεια" -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:5043 msgid "_Contents" msgstr "_Περιεχόμενα" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:5044 msgid "Show the documentation" msgstr "Εμφάνιση της τεκμηρίωσης" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:5046 msgid "_Frequent Questions" msgstr "Σ_υχνές ερωτήσεις" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:5047 msgid "Show the Frequently Asked Questions" msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:5049 msgid "_Report a Bug" msgstr "Α_ναφορά σφάλματος" -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:5050 msgid "Open Midori's bug tracker" msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5053 msgid "Show information about the program" msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:5061 msgid "_Menubar" msgstr "_Μπάρα μενού" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:5062 msgid "Show menubar" msgstr "Προβολή μπάρας μενού" -#: ../midori/midori-browser.c:4982 +#: ../midori/midori-browser.c:5065 msgid "_Navigationbar" msgstr "_Μπάρα περιήγησης" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5066 msgid "Show navigationbar" msgstr "Εμφάνιση περιήγησης" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5069 msgid "Side_panel" msgstr "Πλαϊνό _πλαίσιο" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:5070 msgid "Show sidepanel" msgstr "Εμφάνιση πλαϊνού πλαισίου" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:5073 msgid "_Bookmarkbar" msgstr "_Μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:4991 +#: ../midori/midori-browser.c:5074 msgid "Show bookmarkbar" msgstr "Εμφάνιση μπάρα σελιδοδείκτη" -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:5077 msgid "_Transferbar" msgstr "_Μπάρα μεταφορών" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5078 msgid "Show transferbar" msgstr "Εμφάνιση μπάρα μεταφορών" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5081 msgid "_Statusbar" msgstr "_Γραμμή κατάστασης" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5082 msgid "Show statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5090 msgid "_Automatic" msgstr "_Αυτόματα" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5093 #: ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Κινέζικα (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:5097 msgid "Japanese (SHIFT__JIS)" msgstr "Ιαπωνικά (SHIFT__JIS)" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:5100 #: ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Κορεάτικα (EUC-KR)" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:5103 #: ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Ρωσικά (KOI8-R)" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:5106 #: ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5109 #: ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Δυτικά (ISO-8859-1)" -#: ../midori/midori-browser.c:5540 +#: ../midori/midori-browser.c:5624 msgid "_Separator" msgstr "_Διαχωριστής" -#: ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:5631 msgid "_Location..." msgstr "_Τοποθεσία:" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:5633 msgid "Open a particular location" msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:5657 msgid "_Web Search..." msgstr "_Αναζήτηση ιστού..." -#: ../midori/midori-browser.c:5575 +#: ../midori/midori-browser.c:5659 msgid "Run a web search" msgstr "Εκκίνηση μίας αναζήτησης ιστού" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:5680 msgid "Reopen a previously closed tab or window" msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:5695 msgid "_Tools" msgstr "_Εργαλεία" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:5712 msgid "_Window" msgstr "_Παράθυρο" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:5714 msgid "Show a list of all open tabs" msgstr "Εμφάνιση μίας λίστας με όλες τις ανοιχτές καρτέλες" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:5728 msgid "_Menu" msgstr "_Μενού" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:5730 msgid "Menu" msgstr "Μενού" -#: ../midori/midori-browser.c:6219 +#: ../midori/midori-browser.c:6307 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:379 #, c-format msgid "Failed to select from history\n" msgstr "Αποτυχία επιλογής ιστορικό: \n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:467 #, c-format msgid "Search for %s" msgstr "Αναζήτηση για %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:490 #, c-format msgid "Search with %s" msgstr "Αναζήτηση με %s" @@ -1032,7 +1058,7 @@ msgid "Failed to execute database statement\n" msgstr "Αποτυχία εκτέλεσης δήλωσης βάσης δεδομένων\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1253 msgid "Paste and p_roceed" msgstr "Επικόλληση και σ_υνέχεια" @@ -1058,7 +1084,7 @@ msgstr "Κλείσιμο πλαισίου" msgid "Align sidepanel to the left" msgstr "Ευθυγράμμιση πλαϊνού πλαισίου στα αριστερά" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:797 msgid "Hide operating controls" msgstr "Απόκρυψη στοιχείων λειτουργίας" @@ -1641,246 +1667,246 @@ msgstr "Τα προσωπικά δεδομένα που επιλέχθηκαν #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 -#: ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:4462 +#: ../midori/midori-view.c:4466 #, c-format msgid "Error - %s" msgstr "Σφάλμα- %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1230 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Η σελίδα '%s' δεν μπορεί να φορτωθεί." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1232 msgid "Try again" msgstr "Δοκιμάστε ξανά" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1251 #, c-format msgid "Not found - %s" msgstr "Δεν βρέθηκε - %s" -#: ../midori/midori-view.c:1529 -#: ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1435 +#: ../midori/midori-view.c:2280 #, c-format msgid "Send a message to %s" msgstr "Αποστολή μηνύματος στο: %s" -#: ../midori/midori-view.c:2156 -#: ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2062 +#: ../midori/midori-view.c:2447 msgid "Inspect _Element" msgstr "Εξέταση _στοιχείου" -#: ../midori/midori-view.c:2208 -#: ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2114 +#: ../midori/midori-view.c:2184 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Foreground Tab" msgstr "Άνοιγμα συνδέσμου σε νέα καρτέλα στο π_ροσκήνιο" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2119 msgid "Open Link in _Background Tab" msgstr "Άνοιγμα συνδέσμου σε καρτέλα στο _παρασκήνιο" -#: ../midori/midori-view.c:2216 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2122 +#: ../midori/midori-view.c:2191 msgid "Open Link in New _Window" msgstr "Άνοιγμα συνδέσμου σε νέο _παράθυρο" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2125 msgid "Open Link as Web A_pplication" msgstr "Άνοιγμα ως δικτυακή εφ_αρμογή" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2128 msgid "Copy Link de_stination" msgstr "Αντιγραφή συνδέσμου πρ_οορισμού" -#: ../midori/midori-view.c:2225 -#: ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2203 msgid "_Save Link destination" msgstr "Απ_οθήκευση συνδέσμου προορισμού" -#: ../midori/midori-view.c:2226 -#: ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2132 +#: ../midori/midori-view.c:2197 msgid "_Download Link destination" msgstr "Κ_ατέβασμα συνδέσμου προορισμού" -#: ../midori/midori-view.c:2230 -#: ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2136 +#: ../midori/midori-view.c:2166 +#: ../midori/midori-view.c:2208 msgid "Download with Download _Manager" msgstr "Κατέβασμα με τον διαχειριστή μεταφορών" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2145 msgid "Open _Image in New Tab" msgstr "Άνοιγμα ει_κόνας σε νέα καρτέλα" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2148 msgid "Copy Image _Address" msgstr "Αντιγραφή _διεύθυνσης εικόνας" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2151 msgid "Save I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2152 msgid "Download I_mage" msgstr "Αποθήκευση ει_κόνας" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2159 msgid "Copy Video _Address" msgstr "Αντιγραφή _διεύθυνσης βίντεο" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2162 msgid "Save _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2162 msgid "Download _Video" msgstr "Αποθήκευση _βίντεο" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2225 msgid "Search _with" msgstr "Αναζήτηση _με" -#: ../midori/midori-view.c:2354 -#: ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2267 msgid "_Search the Web" msgstr "_Αναζήτηση στον ιστό" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2288 msgid "Open Address in New _Tab" msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2592 msgid "Open or download file" msgstr "Άνοιγμα ή κατέβασμα αρχείου" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2611 #, c-format msgid "File Type: '%s'" msgstr "Τύπος αρχείου: '%s'" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2614 #, c-format msgid "File Type: %s ('%s')" msgstr "Τύπος αρχείου: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2618 #, c-format msgid "Open %s" msgstr "Άνοιγμα %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3159 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3440 msgid "Speed dial" msgstr "Γρήγορη σύνδεση" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3441 msgid "Click to add a shortcut" msgstr "Κάντε click για προσθήκη συντόμευσης" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut address" msgstr "Εισάγεται διεύθυνση συντόμευσης" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3443 msgid "Enter shortcut title" msgstr "Εισάγετε τίτλο συντόμευσης" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3444 msgid "Are you sure you want to delete this shortcut?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συντόμευση;" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3445 msgid "Set number of columns and rows" msgstr "Ορισμός αριθμού στηλών και γραμμών" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3446 msgid "Enter number of columns and rows:" msgstr "Εισάγεται τον αριθμό των στηλών και γραμμών:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3447 msgid "Invalid input for the size of the speed dial" msgstr "Άκυρη εισαγωγή για το μέγεθος της γρήγορης σύνδεσης" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3448 msgid "Thumb size:" msgstr "Μέγεθος μικρογραφίας:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3449 msgid "Small" msgstr "Μικρό" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3450 msgid "Medium" msgstr "Μεσαίο" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3451 msgid "Big" msgstr "Μεγάλο" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3477 #, c-format msgid "Document cannot be displayed" msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3500 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Καθυστέρηση φόρτωση σελίδας" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Καθυστέρηση φόρτωσης είτε λόγω κάποιου σφάλματος είτε για ρυθμίσεις εκκίνησης." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Φόρτωση σελίδας" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3762 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4016 msgid "_Duplicate Tab" msgstr "_Διπλότυπη καρτέλα" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4021 msgid "_Restore Tab" msgstr "_Επαναφορά καρτέλας" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4021 msgid "_Minimize Tab" msgstr "_Ελαχιστοποίηση καρτέλας" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4027 msgid "Close ot_her Tabs" msgstr "Κλείσιμο άλλ_ων καρτελών" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4699 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4700 msgid "Whether background images should be printed" msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" -#: ../midori/midori-view.c:4869 +#: ../midori/midori-view.c:4752 #: ../midori/midori-preferences.c:384 msgid "Features" msgstr "Χαρακτηριστικά" @@ -2065,51 +2091,51 @@ msgstr "Διαχείριση των μηχανών αναζήτησης" msgid "Use as _default" msgstr "Χρήση ως _προκαθορισμένο" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1304 msgid "_Bookmark" msgstr "_Σελιδοδείκτης" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1305 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1306 msgid "Add Boo_kmark" msgstr "Προσθήκη σ_ελιδοδείκτη" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1307 msgid "_Console" msgstr "_Τερματικό" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1308 msgid "_Extensions" msgstr "_Επεκτάσεις" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1309 msgid "_History" msgstr "_Ιστορικό" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1310 msgid "_Homepage" msgstr "_Αρχική σελίδα" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1311 msgid "_Userscripts" msgstr "_Δέσμες εντολών χρήστη" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1312 msgid "New _Tab" msgstr "Νέα _καρτέλα" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1313 msgid "_Transfers" msgstr "_Μεταφορές" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1314 msgid "Netscape p_lugins" msgstr "Α_ρθρωμάτων netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1317 msgid "New _Folder" msgstr "Νέος _φάκελος" @@ -2175,24 +2201,32 @@ msgstr "Οι μεταφορές θα ακυρωθούν εάν τερματισ msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Απέτυχε η προσθήκη σελιδοδείκτη: %s\n" -#: ../panels/midori-bookmarks.c:411 +#: ../panels/midori-bookmarks.c:307 +#: ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" + +#: ../panels/midori-bookmarks.c:431 msgid "Edit the selected bookmark" msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:419 +#: ../panels/midori-bookmarks.c:439 msgid "Delete the selected bookmark" msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" -#: ../panels/midori-bookmarks.c:433 +#: ../panels/midori-bookmarks.c:453 msgid "Add a new folder" msgstr "Προσθήκη ενός νέου φακέλου" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:583 +#: ../panels/midori-history.c:520 msgid "Separator" msgstr "Διαχωριστικό" @@ -2212,53 +2246,38 @@ msgstr "Αντιγραφή όλων" msgid "Extensions" msgstr "Επεκτάσεις" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Εσφαλμένη τιμή ώρας" - -#: ../panels/midori-history.c:275 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Η τιμή της ώρας είναι παρελθοντική. Παρακαλώ ελέγξτε την τρέχουσα ημερομηνία και ώρα." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Μια βδομάδα πριν" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d μέρα πριν" msgstr[1] "%d μέρες πριν" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Σήμερα" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Χθες" -#: ../panels/midori-history.c:333 -#: ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" -#: ../panels/midori-history.c:414 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Σελιδοποίηση του επιλεγμένου αντικειμένου του ιστορικού" -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" -#: ../panels/midori-history.c:431 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Καθαρισμός ολόκληρου του ιστορικού" @@ -2555,17 +2574,17 @@ msgstr "Διαγραφή ροής" msgid "_Feeds" msgstr "_Ροές" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Αποτυχία εύρεσης root στοιχείου στα δεδομένα XML ροής." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Μορφή ροής που δεν υποστηρίζεται" -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Αποτυχία επεξεργασίας της XML ροής: %s" @@ -2608,25 +2627,31 @@ msgstr "Πλαίσιο ροής" msgid "Read Atom/ RSS feeds" msgstr "Ανάγνωση Atom / RSS ροών" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Απέτυχε η προσθήκη τιμής φόρμας: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 +#: ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Αποθηκεύει το ιστορικό των δεδομένων που έχουν εισαχθεί σε φόρμες" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Μη διαθέσιμα: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Τα αρχεία πόρων δεν έχουν εγκατασταθεί" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Ιστορικό δεδομένων φόρμας" From 1dac2e6d9f2768853cb7773a2e0c6894866a9e39 Mon Sep 17 00:00:00 2001 From: Gheyret Kenji Date: Thu, 29 Jul 2010 06:59:50 +0200 Subject: [PATCH 2866/2970] l10n: Updated Uyghur (ug) translation to 97% New status: 615 messages complete with 0 fuzzies and 14 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ug.po | 5652 +++++++++++++++++++++++++++--------------------------- 1 file changed, 2844 insertions(+), 2808 deletions(-) diff --git a/po/ug.po b/po/ug.po index 17ae0d39..8d915f66 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1,2808 +1,2844 @@ -# Uyghur translations for midori package. -# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER -# This file is distributed under the same license as the midori package. -# Gheyret T.Kenji , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: Midori 0.1.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-04 16:35+0900\n" -"PO-Revision-Date: 2010-05-04 16:34+0900\n" -"Last-Translator: Gheyret T.Kenji \n" -"Language-Team: Uyghur Computer Science Association \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: ../data/midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "يېنىك توركۆرگۈ" - -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:318 -msgid "Midori" -msgstr "Midori" - -#: ../data/midori.desktop.in.h:3 -msgid "Web Browser" -msgstr "توركۆرگۈ" - -#: ../midori/main.c:102 -#, c-format -msgid "The configuration couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:151 -#, c-format -msgid "Value '%s' is invalid for %s" -msgstr "" - -#: ../midori/main.c:158 ../midori/main.c:244 -#, c-format -msgid "Invalid configuration value '%s'" -msgstr "" - -#: ../midori/main.c:370 ../extensions/formhistory.c:446 -#, c-format -msgid "Failed to open database: %s\n" -msgstr "" - -#. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 -#, c-format -msgid "Failed to remove old history items: %s\n" -msgstr "" - -#: ../midori/main.c:445 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:483 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "" - -#. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:684 ../midori/main.c:924 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "" - -#: ../midori/main.c:868 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" - -#: ../midori/main.c:958 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" - -#: ../midori/main.c:973 -msgid "Modify _preferences" -msgstr "" - -#: ../midori/main.c:977 -msgid "Reset the last _session" -msgstr "" - -#: ../midori/main.c:982 -msgid "Disable all _extensions" -msgstr "" - -#: ../midori/main.c:1217 ../midori/main.c:1937 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1336 -msgid "No filename specified" -msgstr "" - -#: ../midori/main.c:1355 -msgid "An unknown error occured." -msgstr "نامەلۇم خاتالىق كۆرۈلدى." - -#: ../midori/main.c:1386 -#, c-format -msgid "Snapshot saved to: %s\n" -msgstr "" - -# CLI --help -#: ../midori/main.c:1557 -msgid "Run ADDRESS as a web application" -msgstr "" - -#: ../midori/main.c:1557 -msgid "ADDRESS" -msgstr "ADDRESS" - -# CLI --help -#: ../midori/main.c:1560 -msgid "Use FOLDER as configuration folder" -msgstr "" - -#: ../midori/main.c:1560 -msgid "FOLDER" -msgstr "" - -#: ../midori/main.c:1563 -msgid "Show a diagnostic dialog" -msgstr "" - -# CLI --help -#: ../midori/main.c:1565 -msgid "Run the specified filename as javascript" -msgstr "" - -# CLI --help -#: ../midori/main.c:1568 -msgid "Take a snapshot of the specified URI" -msgstr "" - -# CLI --help -#: ../midori/main.c:1571 -msgid "Execute the specified command" -msgstr "" - -# CLI --help -#: ../midori/main.c:1573 -msgid "Display program version" -msgstr "" - -#: ../midori/main.c:1575 -msgid "Addresses" -msgstr "ئادرېس" - -#: ../midori/main.c:1577 -msgid "Block URIs according to regular expression PATTERN" -msgstr "" - -#: ../midori/main.c:1577 -msgid "PATTERN" -msgstr "" - -# CLI --help -#. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 -msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "" - -#: ../midori/main.c:1581 -msgid "SECONDS" -msgstr "" - -#: ../midori/main.c:1661 -msgid "[Addresses]" -msgstr "" - -#: ../midori/main.c:1689 -msgid "Please report comments, suggestions and bugs to:" -msgstr "" - -#: ../midori/main.c:1691 -msgid "Check for new versions at:" -msgstr "" - -#: ../midori/main.c:1788 -msgid "The specified configuration folder is invalid." -msgstr "" - -#: ../midori/main.c:1836 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" - -#: ../midori/main.c:1891 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "" - -#: ../midori/main.c:1920 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1952 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1966 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "" - -#: ../midori/main.c:1980 -msgid "The following errors occured:" -msgstr "" - -#: ../midori/main.c:1996 -msgid "_Ignore" -msgstr "" - -#: ../midori/midori-array.c:428 -msgid "File not found." -msgstr "ھۆججەت تېپىلمىدى." - -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 -msgid "Malformed document." -msgstr "" - -#: ../midori/midori-array.c:504 -msgid "Unrecognized bookmark format." -msgstr "" - -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1120 -#, c-format -msgid "Writing failed." -msgstr "" - -#: ../midori/midori-browser.c:333 ../midori/midori-browser.c:5489 -#: ../midori/midori-browser.c:5495 -msgid "Reload the current page" -msgstr "" - -#: ../midori/midori-browser.c:343 ../midori/midori-browser.c:5492 -msgid "Stop loading the current page" -msgstr "" - -#: ../midori/midori-browser.c:457 -#, c-format -msgid "%d%% loaded" -msgstr "" - -#: ../midori/midori-browser.c:495 -#, c-format -msgid "Failed to update title: %s\n" -msgstr "" - -#: ../midori/midori-browser.c:509 -#, c-format -msgid "Unexpected action '%s'." -msgstr "" - -#: ../midori/midori-browser.c:716 -msgid "New folder" -msgstr "يېڭى قىسقۇچ" - -#: ../midori/midori-browser.c:716 -msgid "Edit folder" -msgstr "" - -#: ../midori/midori-browser.c:718 -msgid "New bookmark" -msgstr "" - -#: ../midori/midori-browser.c:718 -msgid "Edit bookmark" -msgstr "" - -#: ../midori/midori-browser.c:749 -msgid "_Title:" -msgstr "ماۋزۇ (_T):" - -#: ../midori/midori-browser.c:762 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "چۈشەندۈرۈش(_D):" - -#: ../midori/midori-browser.c:781 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 -msgid "_Address:" -msgstr "" - -#: ../midori/midori-browser.c:811 ../midori/midori-browser.c:4644 -msgid "_Folder:" -msgstr "مۇندەرىجە(_F)" - -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:901 -#: ../midori/midori-browser.c:4649 ../midori/midori-browser.c:4681 -msgid "Toplevel folder" -msgstr "" - -#: ../midori/midori-browser.c:850 -msgid "Show in the tool_bar" -msgstr "" - -#: ../midori/midori-browser.c:865 -msgid "Run as _web application" -msgstr "" - -#: ../midori/midori-browser.c:959 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "" - -#: ../midori/midori-browser.c:963 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "" - -#: ../midori/midori-browser.c:1020 ../midori/midori-browser.c:4699 -#: ../midori/midori-browser.c:4731 -msgid "Save file as" -msgstr "" - -#: ../midori/midori-browser.c:1393 ../panels/midori-transfers.c:271 -#, c-format -msgid "%s of %s" -msgstr "" - -#: ../midori/midori-browser.c:1429 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "" - -#: ../midori/midori-browser.c:1433 -msgid "Transfer completed" -msgstr "" - -#: ../midori/midori-browser.c:1573 -msgid "Save file" -msgstr "ھۆججەت ساقلا" - -#: ../midori/midori-browser.c:2297 -msgid "Open file" -msgstr "ھۆججەتنى ئاچ" - -#: ../midori/midori-browser.c:2373 ../extensions/feed-panel/main.c:364 -msgid "New feed" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:2414 ../midori/midori-browser.c:5554 -#: ../panels/midori-bookmarks.c:242 -msgid "Add a new bookmark" -msgstr "" - -#: ../midori/midori-browser.c:2989 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "" - -#: ../midori/midori-browser.c:3069 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "قۇرۇق" - -#: ../midori/midori-browser.c:3690 ../midori/sokoke.c:403 -#: ../midori/sokoke.c:413 ../midori/sokoke.c:441 ../midori/sokoke.c:467 -#: ../midori/sokoke.c:481 -msgid "Could not run external program." -msgstr "" - -#: ../midori/midori-browser.c:4004 ../midori/midori-browser.c:5948 -#, c-format -msgid "Failed to insert new history item: %s\n" -msgstr "" - -#: ../midori/midori-browser.c:4337 ../panels/midori-bookmarks.c:795 -#: ../panels/midori-history.c:751 -msgid "Open all in _Tabs" -msgstr "" - -#: ../midori/midori-browser.c:4344 ../panels/midori-bookmarks.c:801 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:545 -msgid "Open in New _Tab" -msgstr "" - -#: ../midori/midori-browser.c:4347 ../panels/midori-bookmarks.c:803 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:547 -msgid "Open in New _Window" -msgstr "" - -#: ../midori/midori-browser.c:4570 -msgid "Arora" -msgstr "" - -#: ../midori/midori-browser.c:4571 -msgid "Kazehakase" -msgstr "" - -#: ../midori/midori-browser.c:4572 -msgid "Opera" -msgstr "Opera" - -#: ../midori/midori-browser.c:4573 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../midori/midori-browser.c:4574 -msgid "Epiphany" -msgstr "Epiphany" - -#: ../midori/midori-browser.c:4595 ../panels/midori-bookmarks.c:271 -msgid "Import bookmarks..." -msgstr "" - -#: ../midori/midori-browser.c:4598 ../midori/midori-browser.c:5559 -msgid "_Import bookmarks" -msgstr "" - -#: ../midori/midori-browser.c:4609 -msgid "_Application:" -msgstr "" - -#: ../midori/midori-browser.c:4636 ../midori/midori-browser.c:5663 -#: ../midori/midori-websettings.c:232 ../midori/midori-websettings.c:323 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "ئۆزى بەلگىلەش…" - -#: ../midori/midori-browser.c:4710 -msgid "Failed to import bookmarks" -msgstr "" - -#: ../midori/midori-browser.c:4746 -msgid "Failed to export bookmarks" -msgstr "" - -#: ../midori/midori-browser.c:4800 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "" - -# Dialog title -#. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4907 -msgid "Clear Private Data" -msgstr "" - -# Button label -#: ../midori/midori-browser.c:4911 -msgid "_Clear private data" -msgstr "" - -#: ../midori/midori-browser.c:4925 -msgid "Clear the following data:" -msgstr "" - -#: ../midori/midori-browser.c:4936 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 -msgid "History" -msgstr "تارىخ" - -#: ../midori/midori-browser.c:4942 -msgid "Cookies" -msgstr "Cookies" - -#: ../midori/midori-browser.c:4947 -msgid "'Flash' Cookies" -msgstr "" - -#: ../midori/midori-browser.c:4952 -msgid "Website icons" -msgstr "" - -#: ../midori/midori-browser.c:4957 ../midori/sokoke.c:1310 -msgid "_Closed Tabs" -msgstr "" - -#: ../midori/midori-browser.c:4962 ../extensions/web-cache.c:464 -msgid "Web Cache" -msgstr "" - -#: ../midori/midori-browser.c:4970 -msgid "Clear private data when _quitting Midori" -msgstr "" - -#: ../midori/midori-browser.c:5072 -msgid "A lightweight web browser." -msgstr "" - -#: ../midori/midori-browser.c:5074 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" - -#: ../midori/midori-browser.c:5093 -msgid "translator-credits" -msgstr "Gheyret T.Kenji 2010" - -#: ../midori/midori-browser.c:5402 -msgid "_File" -msgstr "ھۆججەت(_F)" - -#: ../midori/midori-browser.c:5404 ../midori/sokoke.c:1311 -msgid "New _Window" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5405 -msgid "Open a new window" -msgstr "يېڭى كۆزنەكتىن بىرنى ئاچ" - -# tooltip -#: ../midori/midori-browser.c:5408 -msgid "Open a new tab" -msgstr "يېڭى بەتكۈچتىن بىرنى ئاچ" - -#: ../midori/midori-browser.c:5410 -msgid "P_rivate Browsing" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5411 -msgid "Don't save any private data while browsing" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5415 -msgid "Open a file" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5418 -msgid "Save to a file" -msgstr "" - -#: ../midori/midori-browser.c:5420 -msgid "Add to Speed _dial" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5421 -msgid "Add shortcut to speed dial" -msgstr "" - -#: ../midori/midori-browser.c:5423 -msgid "Add Shortcut to the _desktop" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5424 -msgid "Add shortcut to the desktop" -msgstr "" - -#: ../midori/midori-browser.c:5426 -msgid "Subscribe to News _feed" -msgstr "" - -#: ../midori/midori-browser.c:5427 -msgid "Subscribe to this news feed" -msgstr "" - -#: ../midori/midori-browser.c:5432 -msgid "_Close Tab" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5433 -msgid "Close the current tab" -msgstr "" - -#: ../midori/midori-browser.c:5435 -msgid "C_lose Window" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5436 -msgid "Close this window" -msgstr "مەزكۇر كۆزنەكنى تاقايدۇ" - -# tooltip -#: ../midori/midori-browser.c:5439 -msgid "Print the current page" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5442 -msgid "Quit the application" -msgstr "" - -#: ../midori/midori-browser.c:5444 -msgid "_Edit" -msgstr "تەھرىر(_E)" - -#: ../midori/midori-browser.c:5448 -msgid "Undo the last modification" -msgstr "" - -#: ../midori/midori-browser.c:5451 -msgid "Redo the last modification" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5455 -msgid "Cut the selected text" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5458 ../midori/midori-browser.c:5461 -msgid "Copy the selected text" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5464 -msgid "Paste text from the clipboard" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5467 -msgid "Delete the selected text" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5470 -msgid "Select all text" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5473 -msgid "Find a word or phrase in the page" -msgstr "" - -#: ../midori/midori-browser.c:5475 -msgid "Find _Next" -msgstr "كېيىنكىسىنى ئىزدە(_N)" - -# tooltip -#: ../midori/midori-browser.c:5476 -msgid "Find the next occurrence of a word or phrase" -msgstr "" - -#: ../midori/midori-browser.c:5478 -msgid "Find _Previous" -msgstr "ئالدىنقىنى ئىزدە(_P)" - -# tooltip -#: ../midori/midori-browser.c:5479 -msgid "Find the previous occurrence of a word or phrase" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5483 -msgid "Configure the application preferences" -msgstr "" - -#: ../midori/midori-browser.c:5485 -msgid "_View" -msgstr "كۆرۈنۈش(_V)" - -#: ../midori/midori-browser.c:5486 -msgid "_Toolbars" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5498 -msgid "Increase the zoom level" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5501 -msgid "Decrease the zoom level" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5504 -msgid "Reset the zoom level" -msgstr "" - -#: ../midori/midori-browser.c:5505 -msgid "_Encoding" -msgstr "" - -#: ../midori/midori-browser.c:5507 -msgid "View So_urce" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5508 -msgid "View the source code of the page" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5511 -msgid "Toggle fullscreen view" -msgstr "" - -#: ../midori/midori-browser.c:5514 -msgid "Scroll _Left" -msgstr "" - -#: ../midori/midori-browser.c:5515 -msgid "Scroll to the left" -msgstr "" - -#: ../midori/midori-browser.c:5517 -msgid "Scroll _Down" -msgstr "" - -#: ../midori/midori-browser.c:5518 -msgid "Scroll down" -msgstr "" - -#: ../midori/midori-browser.c:5520 -msgid "Scroll _Up" -msgstr "" - -#: ../midori/midori-browser.c:5521 -msgid "Scroll up" -msgstr "" - -#: ../midori/midori-browser.c:5523 -msgid "Scroll _Right" -msgstr "" - -#: ../midori/midori-browser.c:5524 -msgid "Scroll to the right" -msgstr "" - -#: ../midori/midori-browser.c:5527 -msgid "_Go" -msgstr "يۆتكەل(_G)" - -# tooltip -#: ../midori/midori-browser.c:5530 -msgid "Go back to the previous page" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5533 -msgid "Go forward to the next page" -msgstr "" - -# tooltip -#. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5537 -msgid "Go to the previous sub-page" -msgstr "" - -# tooltip -#. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5541 -msgid "Go to the next sub-page" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5544 -msgid "Go to your homepage" -msgstr "" - -#: ../midori/midori-browser.c:5546 -msgid "Empty Trash" -msgstr "ئەخلەت ساندۇقىنى تازىلاش" - -# tooltip -#: ../midori/midori-browser.c:5547 -msgid "Delete the contents of the trash" -msgstr "" - -#: ../midori/midori-browser.c:5549 -msgid "Undo _Close Tab" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5550 -msgid "Open the last closed tab" -msgstr "" - -#: ../midori/midori-browser.c:5556 -msgid "Add a new _folder" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5557 -msgid "Add a new bookmark folder" -msgstr "" - -#: ../midori/midori-browser.c:5562 -msgid "_Export bookmarks" -msgstr "" - -#: ../midori/midori-browser.c:5565 ../midori/midori-searchaction.c:493 -msgid "_Manage Search Engines" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5566 -msgid "Add, edit and remove search engines..." -msgstr "" - -#: ../midori/midori-browser.c:5569 -msgid "_Clear Private Data" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5570 -msgid "Clear private data..." -msgstr "" - -#: ../midori/midori-browser.c:5574 -msgid "_Inspect Page" -msgstr "" - -#: ../midori/midori-browser.c:5575 -msgid "Inspect page details and access developer tools..." -msgstr "" - -#: ../midori/midori-browser.c:5580 -msgid "_Previous Tab" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5581 -msgid "Switch to the previous tab" -msgstr "" - -#: ../midori/midori-browser.c:5583 -msgid "_Next Tab" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5584 -msgid "Switch to the next tab" -msgstr "" - -#: ../midori/midori-browser.c:5586 -msgid "Focus _Current Tab" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5587 -msgid "Focus the current tab" -msgstr "" - -#: ../midori/midori-browser.c:5589 -msgid "Open last _session" -msgstr "" - -#: ../midori/midori-browser.c:5590 -msgid "Open the tabs saved in the last session" -msgstr "" - -#: ../midori/midori-browser.c:5592 -msgid "_Help" -msgstr "ياردەم(_H)" - -#: ../midori/midori-browser.c:5594 -msgid "_Contents" -msgstr "مۇندەرىجە(_C)" - -# tooltip -#: ../midori/midori-browser.c:5595 -msgid "Show the documentation" -msgstr "" - -#: ../midori/midori-browser.c:5597 -msgid "_Frequent Questions" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5598 -msgid "Show the Frequently Asked Questions" -msgstr "" - -#: ../midori/midori-browser.c:5600 -msgid "_Report a Bug" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5601 -msgid "Open Midori's bug tracker" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5604 -msgid "Show information about the program" -msgstr "" - -#: ../midori/midori-browser.c:5612 -msgid "_Menubar" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5613 -msgid "Show menubar" -msgstr "" - -#: ../midori/midori-browser.c:5616 -msgid "_Navigationbar" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5617 -msgid "Show navigationbar" -msgstr "" - -#: ../midori/midori-browser.c:5620 -msgid "Side_panel" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5621 -msgid "Show sidepanel" -msgstr "" - -#: ../midori/midori-browser.c:5624 -msgid "_Bookmarkbar" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5625 -msgid "Show bookmarkbar" -msgstr "" - -#: ../midori/midori-browser.c:5628 -msgid "_Transferbar" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5629 -msgid "Show transferbar" -msgstr "" - -#: ../midori/midori-browser.c:5632 -msgid "_Statusbar" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:5633 -msgid "Show statusbar" -msgstr "" - -#: ../midori/midori-browser.c:5641 -msgid "_Automatic" -msgstr "" - -#: ../midori/midori-browser.c:5644 ../midori/midori-websettings.c:226 -msgid "Chinese (BIG5)" -msgstr "" - -#. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5648 -msgid "Japanese (SHIFT__JIS)" -msgstr "" - -#: ../midori/midori-browser.c:5651 ../midori/midori-websettings.c:228 -msgid "Korean (EUC-KR)" -msgstr "كورىيىچە (EUC-KR)" - -#: ../midori/midori-browser.c:5654 ../midori/midori-websettings.c:229 -msgid "Russian (KOI8-R)" -msgstr "" - -#: ../midori/midori-browser.c:5657 ../midori/midori-websettings.c:230 -msgid "Unicode (UTF-8)" -msgstr "يۇنىكود (UTF-8)" - -#: ../midori/midori-browser.c:5660 ../midori/midori-websettings.c:231 -msgid "Western (ISO-8859-1)" -msgstr "غەربچە (ISO-8859-1)" - -#: ../midori/midori-browser.c:6208 -msgid "_Separator" -msgstr "" - -#: ../midori/midori-browser.c:6215 -msgid "_Location..." -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:6217 -msgid "Open a particular location" -msgstr "" - -#: ../midori/midori-browser.c:6241 -msgid "_Web Search..." -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:6243 -msgid "Run a web search" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:6264 -msgid "Reopen a previously closed tab or window" -msgstr "" - -#: ../midori/midori-browser.c:6279 -msgid "_Recently visited pages" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:6281 -msgid "Reopen pages that you visited earlier" -msgstr "" - -#: ../midori/midori-browser.c:6296 ../midori/sokoke.c:1300 -msgid "_Bookmarks" -msgstr "خەتكۈش(_B)" - -# tooltip -#: ../midori/midori-browser.c:6298 -msgid "Show the saved bookmarks" -msgstr "" - -#: ../midori/midori-browser.c:6313 -msgid "_Tools" -msgstr "" - -#: ../midori/midori-browser.c:6326 -msgid "_Window" -msgstr "" - -# tooltip -#: ../midori/midori-browser.c:6328 -msgid "Show a list of all open tabs" -msgstr "" - -#: ../midori/midori-browser.c:6342 -msgid "_Menu" -msgstr "" - -#: ../midori/midori-browser.c:6344 -msgid "Menu" -msgstr "Menu" - -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6548 -msgid "_Inline Find:" -msgstr "" - -#: ../midori/midori-browser.c:6579 -msgid "Previous" -msgstr "ئالدى" - -#: ../midori/midori-browser.c:6584 -msgid "Next" -msgstr "كېيىنكىسى" - -#: ../midori/midori-browser.c:6589 -msgid "Match Case" -msgstr "چوڭ كىچىك ھەرپنى پەرقلەندۈر" - -#: ../midori/midori-browser.c:6598 -msgid "Highlight Matches" -msgstr "" - -#: ../midori/midori-browser.c:6610 -msgid "Close Findbar" -msgstr "" - -#: ../midori/midori-browser.c:6656 ../panels/midori-transfers.c:142 -msgid "Clear All" -msgstr "ھەممىنى تازىلا" - -#: ../midori/midori-browser.c:7014 -#, c-format -msgid "Unexpected setting '%s'" -msgstr "" - -#: ../midori/midori-locationaction.c:377 -#, c-format -msgid "Failed to select from history\n" -msgstr "" - -#: ../midori/midori-locationaction.c:459 -#, c-format -msgid "Search for %s" -msgstr "" - -#: ../midori/midori-locationaction.c:482 -#, c-format -msgid "Search with %s" -msgstr "%s دا ئىزدە" - -#: ../midori/midori-locationaction.c:1197 -#, c-format -msgid "Failed to execute database statement\n" -msgstr "" - -#. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 -msgid "Paste and p_roceed" -msgstr "" - -#: ../midori/midori-panel.c:433 ../midori/midori-panel.c:435 -msgid "Detach chosen panel from the window" -msgstr "" - -#: ../midori/midori-panel.c:445 ../midori/midori-panel.c:447 -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 -msgid "Align sidepanel to the right" -msgstr "" - -#: ../midori/midori-panel.c:457 ../midori/midori-panel.c:458 -msgid "Close panel" -msgstr "panel نى تاقا" - -#: ../midori/midori-panel.c:641 ../midori/midori-panel.c:644 -msgid "Align sidepanel to the left" -msgstr "" - -#: ../midori/midori-panel.c:798 -msgid "Hide operating controls" -msgstr "" - -#: ../midori/midori-websettings.c:209 -msgid "Show Blank page" -msgstr "" - -#: ../midori/midori-websettings.c:210 -msgid "Show Homepage" -msgstr "" - -#: ../midori/midori-websettings.c:211 -msgid "Show last open tabs" -msgstr "" - -#: ../midori/midori-websettings.c:227 -msgid "Japanese (SHIFT_JIS)" -msgstr "" - -#: ../midori/midori-websettings.c:247 -msgid "New tab" -msgstr "يېڭى بەتكۈچ" - -#: ../midori/midori-websettings.c:248 -msgid "New window" -msgstr "يېڭى كۆزنەك" - -#: ../midori/midori-websettings.c:249 -msgid "Current tab" -msgstr "" - -#: ../midori/midori-websettings.c:264 -msgid "Default" -msgstr "كۆڭۈلدىكى" - -#: ../midori/midori-websettings.c:265 -msgid "Icons" -msgstr "سىنبەلگىلەر" - -#: ../midori/midori-websettings.c:266 -msgid "Small icons" -msgstr "كىچىك سىنبەلگە" - -#: ../midori/midori-websettings.c:267 -msgid "Text" -msgstr "تېكىست" - -#: ../midori/midori-websettings.c:268 -msgid "Icons and text" -msgstr "" - -#: ../midori/midori-websettings.c:269 -msgid "Text beside icons" -msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن" - -#: ../midori/midori-websettings.c:284 -msgid "Automatic (GNOME or environment)" -msgstr "" - -#: ../midori/midori-websettings.c:285 -msgid "HTTP proxy server" -msgstr "" - -#: ../midori/midori-websettings.c:286 -msgid "No proxy server" -msgstr "" - -#: ../midori/midori-websettings.c:301 -msgid "All cookies" -msgstr "" - -#: ../midori/midori-websettings.c:302 -msgid "Session cookies" -msgstr "" - -#: ../midori/midori-websettings.c:303 ../katze/katze-utils.c:667 -msgid "None" -msgstr "يوق" - -#: ../midori/midori-websettings.c:319 -msgid "Safari" -msgstr "Safari" - -#: ../midori/midori-websettings.c:320 -msgid "iPhone" -msgstr "" - -#: ../midori/midori-websettings.c:321 -msgid "Firefox" -msgstr "Firefox" - -#: ../midori/midori-websettings.c:322 -msgid "Internet Explorer" -msgstr "Internet Explorer" - -#: ../midori/midori-websettings.c:375 -msgid "Remember last window size" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:376 -msgid "Whether to save the last window size" -msgstr "" - -#: ../midori/midori-websettings.c:384 -msgid "Last window width" -msgstr "" - -#: ../midori/midori-websettings.c:385 -msgid "The last saved window width" -msgstr "" - -#: ../midori/midori-websettings.c:393 -msgid "Last window height" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:394 -msgid "The last saved window height" -msgstr "" - -#: ../midori/midori-websettings.c:419 -msgid "Last panel position" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:420 -msgid "The last saved panel position" -msgstr "" - -#. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:429 -msgid "Last panel page" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:430 -msgid "The last saved panel page" -msgstr "" - -#: ../midori/midori-websettings.c:438 -msgid "Last Web search" -msgstr "" - -#: ../midori/midori-websettings.c:439 -msgid "The last saved Web search" -msgstr "" - -#: ../midori/midori-websettings.c:448 -msgid "Show Menubar" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:449 -msgid "Whether to show the menubar" -msgstr "" - -#: ../midori/midori-websettings.c:457 -msgid "Show Navigationbar" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:458 -msgid "Whether to show the navigationbar" -msgstr "" - -#: ../midori/midori-websettings.c:466 -msgid "Show Bookmarkbar" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:467 -msgid "Whether to show the bookmarkbar" -msgstr "" - -#: ../midori/midori-websettings.c:475 -msgid "Show Panel" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:476 -msgid "Whether to show the panel" -msgstr "" - -#: ../midori/midori-websettings.c:491 -msgid "Show Transferbar" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:492 -msgid "Whether to show the transferbar" -msgstr "" - -#: ../midori/midori-websettings.c:500 -msgid "Show Statusbar" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:501 -msgid "Whether to show the statusbar" -msgstr "" - -#: ../midori/midori-websettings.c:510 -msgid "Toolbar Style:" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:511 -msgid "The style of the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:527 -msgid "Show progress in location entry" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:528 -msgid "Whether to show loading progress in the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:543 -msgid "Search engines in location completion" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:544 -msgid "Whether to show search engines in the location completion" -msgstr "" - -#: ../midori/midori-websettings.c:552 -msgid "Toolbar Items" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:553 -msgid "The items to show on the toolbar" -msgstr "" - -#: ../midori/midori-websettings.c:561 -msgid "Compact Sidepanel" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:562 -msgid "Whether to make the sidepanel compact" -msgstr "" - -#: ../midori/midori-websettings.c:577 -msgid "Show operating controls of the panel" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:578 -msgid "Whether to show the operating controls of the panel" -msgstr "" - -#: ../midori/midori-websettings.c:593 -msgid "Align sidepanel on the right" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:594 -msgid "Whether to align the sidepanel on the right" -msgstr "" - -#: ../midori/midori-websettings.c:609 -msgid "Open panels in separate windows" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:610 -msgid "Whether to always open panels in separate windows" -msgstr "" - -#: ../midori/midori-websettings.c:619 -msgid "When Midori starts:" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:620 -msgid "What to do when Midori starts" -msgstr "" - -#: ../midori/midori-websettings.c:629 -msgid "Homepage:" -msgstr "Homepage:" - -# tooltip -#: ../midori/midori-websettings.c:630 -msgid "The homepage" -msgstr "" - -#: ../midori/midori-websettings.c:645 -msgid "Show crash dialog" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:646 -msgid "Show a dialog after Midori crashed" -msgstr "" - -#. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:662 -msgid "Show speed dial in new tabs" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:663 -msgid "Show speed dial in newly opened tabs" -msgstr "" - -#: ../midori/midori-websettings.c:671 -msgid "Save downloaded files to:" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:672 -msgid "The folder downloaded files are saved to" -msgstr "" - -#: ../midori/midori-websettings.c:693 -msgid "Ask for the destination folder" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:694 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" - -#: ../midori/midori-websettings.c:713 -msgid "Notify when a transfer has been completed" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:714 -msgid "Whether to show a notification when a transfer has been completed" -msgstr "" - -#: ../midori/midori-websettings.c:726 -msgid "Download Manager" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:727 -msgid "An external download manager" -msgstr "" - -#: ../midori/midori-websettings.c:735 -msgid "Text Editor" -msgstr "تېكىست تەھرىرلىگۈ" - -# tooltip -#: ../midori/midori-websettings.c:736 -msgid "An external text editor" -msgstr "" - -#: ../midori/midori-websettings.c:751 -msgid "News Aggregator" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:752 -msgid "An external news aggregator" -msgstr "" - -#: ../midori/midori-websettings.c:760 -msgid "Location entry Search" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:761 -msgid "The search to perform inside the location entry" -msgstr "" - -#: ../midori/midori-websettings.c:769 -msgid "Preferred Encoding" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:770 -msgid "The preferred character encoding" -msgstr "" - -#: ../midori/midori-websettings.c:780 -msgid "Always Show Tabbar" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:781 -msgid "Always show the tabbar" -msgstr "" - -#: ../midori/midori-websettings.c:789 -msgid "Close Buttons on Tabs" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:790 -msgid "Whether tabs have close buttons" -msgstr "" - -#: ../midori/midori-websettings.c:798 -msgid "Open new pages in:" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:799 -msgid "Where to open new pages" -msgstr "" - -#: ../midori/midori-websettings.c:808 -msgid "Open external pages in:" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:809 -msgid "Where to open externally opened pages" -msgstr "" - -#: ../midori/midori-websettings.c:818 -msgid "Middle click opens Selection" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:819 -msgid "Load an address from the selection via middle click" -msgstr "" - -#: ../midori/midori-websettings.c:827 -msgid "Open tabs in the background" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:828 -msgid "Whether to open new tabs in the background" -msgstr "" - -#: ../midori/midori-websettings.c:836 -msgid "Open Tabs next to Current" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:837 -msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" - -#: ../midori/midori-websettings.c:845 -msgid "Open popups in tabs" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:846 -msgid "Whether to open popup windows in tabs" -msgstr "" - -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:88 -msgid "Load images automatically" -msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە" - -# tooltip -#: ../midori/midori-websettings.c:857 -msgid "Load and display images automatically" -msgstr "" - -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:100 -msgid "Enable scripts" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:865 -msgid "Enable embedded scripting languages" -msgstr "" - -#: ../midori/midori-websettings.c:872 ../extensions/statusbar-features.c:112 -msgid "Enable Netscape plugins" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:873 -msgid "Enable embedded Netscape plugin objects" -msgstr "" - -#: ../midori/midori-websettings.c:889 -msgid "Enable HTML5 database support" -msgstr "" - -#: ../midori/midori-websettings.c:890 -msgid "Whether to enable HTML5 database support" -msgstr "" - -#: ../midori/midori-websettings.c:896 -msgid "Enable HTML5 local storage support" -msgstr "" - -#: ../midori/midori-websettings.c:897 -msgid "Whether to enable HTML5 local storage support" -msgstr "" - -#: ../midori/midori-websettings.c:905 -msgid "Enable offline web application cache" -msgstr "" - -#: ../midori/midori-websettings.c:906 -msgid "Whether to enable offline web application cache" -msgstr "" - -#: ../midori/midori-websettings.c:931 -msgid "Zoom Text and Images" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:932 -msgid "Whether to zoom text and images" -msgstr "" - -#: ../midori/midori-websettings.c:947 -msgid "Find inline while typing" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:948 -msgid "Whether to automatically find inline while typing" -msgstr "" - -#: ../midori/midori-websettings.c:963 -msgid "Kinetic scrolling" -msgstr "" - -#: ../midori/midori-websettings.c:964 -msgid "Whether scrolling should kinetically move according to speed" -msgstr "" - -#: ../midori/midori-websettings.c:972 -msgid "Accept cookies" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:973 -msgid "What type of cookies to accept" -msgstr "" - -#: ../midori/midori-websettings.c:989 -msgid "Original cookies only" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:990 -msgid "Accept cookies from the original website only" -msgstr "" - -#: ../midori/midori-websettings.c:998 -msgid "Maximum cookie age" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:999 -msgid "The maximum number of days to save cookies for" -msgstr "" - -#: ../midori/midori-websettings.c:1016 -msgid "Remember last visited pages" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1017 -msgid "Whether the last visited pages are saved" -msgstr "" - -#: ../midori/midori-websettings.c:1025 -msgid "Maximum history age" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1026 -msgid "The maximum number of days to save the history for" -msgstr "" - -#: ../midori/midori-websettings.c:1034 -msgid "Remember last downloaded files" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1035 -msgid "Whether the last downloaded files are saved" -msgstr "" - -#: ../midori/midori-websettings.c:1052 -msgid "Proxy server" -msgstr "ۋاكالەتچى مۇلازىمىتىر" - -#: ../midori/midori-websettings.c:1053 -msgid "The type of proxy server to use" -msgstr "" - -#: ../midori/midori-websettings.c:1062 -msgid "HTTP Proxy Server" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1063 -msgid "The proxy server used for HTTP connections" -msgstr "" - -#: ../midori/midori-websettings.c:1078 -msgid "Detect proxy server automatically" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1079 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" - -#. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1095 -msgid "Identify as" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1096 -msgid "What to identify as to web pages" -msgstr "" - -#: ../midori/midori-websettings.c:1112 -msgid "Identification string" -msgstr "" - -# tooltip -#: ../midori/midori-websettings.c:1113 -msgid "The application identification string" -msgstr "" - -#: ../midori/midori-websettings.c:1128 -msgid "Preferred languages" -msgstr "" - -#: ../midori/midori-websettings.c:1129 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" - -# Button title -#: ../midori/midori-websettings.c:1144 -msgid "Clear private data" -msgstr "" - -# FIXME: -#: ../midori/midori-websettings.c:1145 -msgid "The private data selected for deletion" -msgstr "" - -#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, -#. so reloading via Javascript works but not via API calls. -#. Error pages are special, we want to try loading the destination -#. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1182 ../midori/midori-view.c:4482 -#: ../midori/midori-view.c:4486 -#, c-format -msgid "Error - %s" -msgstr "خاتالىق - %s" - -#: ../midori/midori-view.c:1183 -#, c-format -msgid "The page '%s' couldn't be loaded." -msgstr "" - -#: ../midori/midori-view.c:1188 -msgid "Try again" -msgstr "قايتا سىناپ كور" - -#. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1229 -#, c-format -msgid "Not found - %s" -msgstr "" - -#: ../midori/midori-view.c:1466 ../midori/midori-view.c:2303 -#, c-format -msgid "Send a message to %s" -msgstr "" - -#: ../midori/midori-view.c:2085 ../midori/midori-view.c:2465 -msgid "Inspect _Element" -msgstr "" - -#: ../midori/midori-view.c:2137 ../midori/midori-view.c:2207 -msgid "Open Link in New _Tab" -msgstr "" - -#: ../midori/midori-view.c:2141 -msgid "Open Link in _Foreground Tab" -msgstr "" - -#: ../midori/midori-view.c:2142 -msgid "Open Link in _Background Tab" -msgstr "" - -#: ../midori/midori-view.c:2145 ../midori/midori-view.c:2214 -msgid "Open Link in New _Window" -msgstr "" - -#: ../midori/midori-view.c:2148 -msgid "Open Link as Web A_pplication" -msgstr "" - -#: ../midori/midori-view.c:2151 -msgid "Copy Link de_stination" -msgstr "" - -#: ../midori/midori-view.c:2154 ../midori/midori-view.c:2226 -msgid "_Save Link destination" -msgstr "" - -#: ../midori/midori-view.c:2155 ../midori/midori-view.c:2220 -msgid "_Download Link destination" -msgstr "" - -#: ../midori/midori-view.c:2159 ../midori/midori-view.c:2189 -#: ../midori/midori-view.c:2231 -msgid "Download with Download _Manager" -msgstr "" - -#: ../midori/midori-view.c:2168 -msgid "Open _Image in New Tab" -msgstr "" - -#: ../midori/midori-view.c:2171 -msgid "Copy Image _Address" -msgstr "" - -#: ../midori/midori-view.c:2174 -msgid "Save I_mage" -msgstr "" - -#: ../midori/midori-view.c:2175 -msgid "Download I_mage" -msgstr "" - -#: ../midori/midori-view.c:2182 -msgid "Copy Video _Address" -msgstr "" - -#: ../midori/midori-view.c:2185 -msgid "Save _Video" -msgstr "" - -#: ../midori/midori-view.c:2185 -msgid "Download _Video" -msgstr "" - -#: ../midori/midori-view.c:2248 -msgid "Search _with" -msgstr "" - -#: ../midori/midori-view.c:2283 ../midori/midori-view.c:2290 -msgid "_Search the Web" -msgstr "" - -#: ../midori/midori-view.c:2311 -msgid "Open Address in New _Tab" -msgstr "" - -#: ../midori/midori-view.c:2615 -msgid "Open or download file" -msgstr "" - -#: ../midori/midori-view.c:2638 -#, c-format -msgid "File Type: '%s'" -msgstr "" - -#: ../midori/midori-view.c:2641 -#, c-format -msgid "File Type: %s ('%s')" -msgstr "" - -#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2645 -#, c-format -msgid "Open %s" -msgstr "" - -#: ../midori/midori-view.c:3179 -#, c-format -msgid "Inspect page - %s" -msgstr "" - -#: ../midori/midori-view.c:3444 -msgid "Speed dial" -msgstr "" - -#: ../midori/midori-view.c:3445 -msgid "Click to add a shortcut" -msgstr "" - -#: ../midori/midori-view.c:3446 -msgid "Enter shortcut address" -msgstr "" - -#: ../midori/midori-view.c:3447 -msgid "Enter shortcut title" -msgstr "" - -#: ../midori/midori-view.c:3448 -msgid "Are you sure you want to delete this shortcut?" -msgstr "" - -#: ../midori/midori-view.c:3485 -#, c-format -msgid "Document cannot be displayed" -msgstr "" - -#: ../midori/midori-view.c:3508 -#, c-format -msgid "No documentation installed" -msgstr "" - -#: ../midori/midori-view.c:3758 -msgid "Blank page" -msgstr "بوش بەت" - -#: ../midori/midori-view.c:4018 -msgid "_Duplicate Tab" -msgstr "" - -#: ../midori/midori-view.c:4023 -msgid "_Restore Tab" -msgstr "" - -#: ../midori/midori-view.c:4023 -msgid "_Minimize Tab" -msgstr "" - -#: ../midori/midori-view.c:4029 -msgid "Close ot_her Tabs" -msgstr "" - -#: ../midori/midori-view.c:4654 -msgid "Print background images" -msgstr "" - -# tooltip -#: ../midori/midori-view.c:4655 -msgid "Whether background images should be printed" -msgstr "" - -#: ../midori/midori-view.c:4707 ../midori/midori-preferences.c:381 -msgid "Features" -msgstr "ئىقتىدار" - -#. Page "General" -#: ../midori/midori-preferences.c:298 -msgid "General" -msgstr "ئادەتتىكى" - -#: ../midori/midori-preferences.c:299 -msgid "Startup" -msgstr "قوزغات" - -# tooltip -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 -msgid "Use current page as homepage" -msgstr "" - -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 -msgid "Transfers" -msgstr "" - -#. Page "Appearance" -#: ../midori/midori-preferences.c:349 -msgid "Appearance" -msgstr "كۆرۈنۈشى" - -#: ../midori/midori-preferences.c:350 -msgid "Font settings" -msgstr "خەت نۇسخا تەڭشەك" - -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:355 -msgid "The default font family used to display text" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:358 -msgid "The default font size used to display text" -msgstr "" - -#: ../midori/midori-preferences.c:360 -msgid "Fixed-width Font Family" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:363 -msgid "The font family used to display fixed-width text" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:366 -msgid "The font size used to display fixed-width text" -msgstr "" - -#: ../midori/midori-preferences.c:368 -msgid "Minimum Font Size" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:371 -msgid "The minimum font size used to display text" -msgstr "" - -#. Page "Behavior" -#: ../midori/midori-preferences.c:380 -msgid "Behavior" -msgstr "ھەرىكىتى" - -#: ../midori/midori-preferences.c:393 -msgid "Enforce 96 dots per inch" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:394 -msgid "Enforce a video dot density of 96 DPI" -msgstr "" - -#: ../midori/midori-preferences.c:414 -msgid "Allow scripts to open popups" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:415 -msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" - -#: ../midori/midori-preferences.c:419 -msgid "Spell Checking" -msgstr "" - -#: ../midori/midori-preferences.c:422 -msgid "Enable Spell Checking" -msgstr "" - -# tooltip -#: ../midori/midori-preferences.c:423 -msgid "Enable spell checking while typing" -msgstr "" - -#: ../midori/midori-preferences.c:425 -msgid "Spelling dictionaries:" -msgstr "" - -# tooltip -#. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" - -#. Page "Interface" -#: ../midori/midori-preferences.c:435 -msgid "Interface" -msgstr "" - -#: ../midori/midori-preferences.c:436 -msgid "Navigationbar" -msgstr "" - -#: ../midori/midori-preferences.c:446 -msgid "Browsing" -msgstr "كۆز يۈگۈرت" - -#. Page "Applications" -#: ../midori/midori-preferences.c:468 -msgid "Applications" -msgstr "قوللىنىشچان پروگرامما" - -#: ../midori/midori-preferences.c:469 -msgid "External applications" -msgstr "" - -#. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 -msgid "Network" -msgstr "تور" - -#: ../midori/midori-preferences.c:492 -msgid "Hostname" -msgstr "مۇلازىمېتىر نامى" - -#. Page "Privacy" -#: ../midori/midori-preferences.c:511 -msgid "Privacy" -msgstr "شەخسىيەت" - -#: ../midori/midori-preferences.c:512 -msgid "Web Cookies" -msgstr "" - -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 -msgid "days" -msgstr "كۈن" - -#: ../midori/midori-searchaction.c:917 -msgid "Add search engine" -msgstr "" - -#: ../midori/midori-searchaction.c:917 -msgid "Edit search engine" -msgstr "" - -#: ../midori/midori-searchaction.c:945 -msgid "_Name:" -msgstr "ئاتى(_N):" - -#: ../midori/midori-searchaction.c:989 -msgid "_Icon:" -msgstr "سىنبەلگە(_I):" - -#: ../midori/midori-searchaction.c:1003 -msgid "_Token:" -msgstr "" - -#: ../midori/midori-searchaction.c:1234 -msgid "Manage Search Engines" -msgstr "" - -#: ../midori/midori-searchaction.c:1335 -msgid "Use as _default" -msgstr "" - -#: ../midori/sokoke.c:1299 -msgid "_Bookmark" -msgstr "" - -#: ../midori/sokoke.c:1301 -msgid "Add Boo_kmark" -msgstr "" - -#: ../midori/sokoke.c:1302 -msgid "_Console" -msgstr "" - -#: ../midori/sokoke.c:1303 -msgid "_Extensions" -msgstr "" - -#: ../midori/sokoke.c:1304 -msgid "_History" -msgstr "" - -#: ../midori/sokoke.c:1305 -msgid "_Homepage" -msgstr "" - -#: ../midori/sokoke.c:1306 -msgid "_Userscripts" -msgstr "" - -#: ../midori/sokoke.c:1307 -msgid "New _Tab" -msgstr "يېڭى بەتكۈچ(_T)" - -#: ../midori/sokoke.c:1308 -msgid "_Transfers" -msgstr "" - -#: ../midori/sokoke.c:1309 -msgid "Netscape p_lugins" -msgstr "" - -#: ../panels/midori-bookmarks.c:111 -msgid "Bookmarks" -msgstr "خەتكۈچ" - -# tooltip -#: ../panels/midori-bookmarks.c:250 -msgid "Edit the selected bookmark" -msgstr "" - -# tooltip -#: ../panels/midori-bookmarks.c:258 -msgid "Delete the selected bookmark" -msgstr "" - -#: ../panels/midori-bookmarks.c:278 -msgid "Add a new folder" -msgstr "" - -#: ../panels/midori-bookmarks.c:608 -msgid "Separator" -msgstr "" - -#: ../panels/midori-console.c:87 -msgid "Console" -msgstr "كونترول تاختا" - -#: ../panels/midori-extensions.c:91 -msgid "Extensions" -msgstr "كېڭەيتىلمە" - -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "" - -#: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "" - -#: ../panels/midori-history.c:286 -msgid "A week ago" -msgstr "" - -#: ../panels/midori-history.c:288 -#, c-format -msgid "%d day ago" -msgid_plural "%d days ago" -msgstr[0] "" - -#: ../panels/midori-history.c:291 -msgid "Today" -msgstr "بۈگۈن" - -#: ../panels/midori-history.c:293 -msgid "Yesterday" -msgstr "تۈنۈگۈن" - -#: ../panels/midori-history.c:378 -msgid "Are you sure you want to remove all history items?" -msgstr "" - -# tooltip -#: ../panels/midori-history.c:438 -msgid "Bookmark the selected history item" -msgstr "" - -# tooltip -#: ../panels/midori-history.c:447 -msgid "Delete the selected history item" -msgstr "" - -# tooltip -#: ../panels/midori-history.c:455 -msgid "Clear the entire history" -msgstr "" - -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "سۈزگۈچ:" - -#: ../panels/midori-transfers.c:479 -msgid "Open Destination _Folder" -msgstr "" - -#: ../panels/midori-transfers.c:482 -msgid "Copy Link Loc_ation" -msgstr "" - -#: ../katze/katze-http-auth.c:214 -msgid "Authentication Required" -msgstr "ۋاكالەتچى مۇلازىمېتىرنى دەلىللەش زۆرۈر" - -#: ../katze/katze-http-auth.c:230 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" - -#: ../katze/katze-http-auth.c:244 -msgid "Username" -msgstr "ئىشلەتكۈچى ئاتى" - -#: ../katze/katze-http-auth.c:257 -msgid "Password" -msgstr "ئىم" - -#: ../katze/katze-http-auth.c:272 -msgid "_Remember password" -msgstr "" - -#: ../katze/katze-throbber.c:882 -#, c-format -msgid "Named icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:895 -#, c-format -msgid "Stock icon '%s' couldn't be loaded" -msgstr "" - -#: ../katze/katze-throbber.c:963 -msgid "Animation frames are broken" -msgstr "" - -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 -#, c-format -msgid "Property '%s' is invalid for %s" -msgstr "" - -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 -msgid "Choose file" -msgstr "" - -#: ../katze/katze-utils.c:559 -msgid "Choose folder" -msgstr "" - -#: ../katze/katze-preferences.c:95 -#, c-format -msgid "Preferences for %s" -msgstr "" - -#: ../extensions/adblock.c:413 -msgid "Configure Advertisement filters" -msgstr "" - -#: ../extensions/adblock.c:445 -#, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" - -#: ../extensions/adblock.c:585 -msgid "Configure _Advertisement filters..." -msgstr "" - -#: ../extensions/adblock.c:839 -msgid "Edit rule" -msgstr "" - -#: ../extensions/adblock.c:852 -msgid "_Rule:" -msgstr "" - -#: ../extensions/adblock.c:906 -msgid "Bl_ock image" -msgstr "" - -#: ../extensions/adblock.c:911 -msgid "Bl_ock link" -msgstr "" - -#: ../extensions/adblock.c:1485 -msgid "Advertisement blocker" -msgstr "" - -# description -#: ../extensions/adblock.c:1486 -msgid "Block advertisements according to a filter list" -msgstr "" - -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "" - -#: ../extensions/addons.c:177 -msgid "Userscripts" -msgstr "" - -#: ../extensions/addons.c:179 -msgid "Userstyles" -msgstr "" - -#: ../extensions/addons.c:1085 -#, c-format -msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" - -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 -msgid "User addons" -msgstr "" - -#: ../extensions/addons.c:1210 -#, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "" - -#: ../extensions/addons.c:1254 -msgid "Support for userscripts and userstyles" -msgstr "" - -#: ../extensions/colorful-tabs.c:204 -msgid "Colorful Tabs" -msgstr "" - -# description -#: ../extensions/colorful-tabs.c:205 -msgid "Tint each tab distinctly" -msgstr "" - -#: ../extensions/cookie-manager/cookie-manager-page.c:82 -#: ../extensions/cookie-manager/main.c:56 -msgid "Cookie Manager" -msgstr "" - -#: ../extensions/cookie-manager/cookie-manager-page.c:112 -msgid "Delete All" -msgstr "ھەممىنى ئۆچۈر…" - -#: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" - -# tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:129 -msgid "Expand All" -msgstr "ھەممەنى ياي" - -# tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:136 -msgid "Collapse All" -msgstr "ھەممەنى قاتلا" - -#: ../extensions/cookie-manager/cookie-manager-page.c:578 -msgid "Do you really want to delete all cookies?" -msgstr "" - -# Dialog title -#: ../extensions/cookie-manager/cookie-manager-page.c:580 -msgid "Question" -msgstr "سوئال" - -#: ../extensions/cookie-manager/cookie-manager-page.c:589 -msgid "Only cookies which match the filter will be deleted." -msgstr "" - -#: ../extensions/cookie-manager/cookie-manager-page.c:677 -msgid "At the end of the session" -msgstr "" - -#: ../extensions/cookie-manager/cookie-manager-page.c:680 -#, c-format -msgid "" -"Host: %s\n" -"Name: %s\n" -"Value: %s\n" -"Path: %s\n" -"Secure: %s\n" -"Expires: %s" -msgstr "" - -# cookie: Secure flag is set. -#: ../extensions/cookie-manager/cookie-manager-page.c:686 -msgid "Yes" -msgstr "ھەئە" - -# cookie: Secure flag isn't set. -#: ../extensions/cookie-manager/cookie-manager-page.c:686 -msgid "No" -msgstr "ياق" - -#: ../extensions/cookie-manager/cookie-manager-page.c:700 -#, c-format -msgid "" -"Domain: %s\n" -"Cookies: %d" -msgstr "" - -# Column name of cookie browser -#: ../extensions/cookie-manager/cookie-manager-page.c:1030 -msgid "Name" -msgstr "ئاتى" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1083 -msgid "_Expand All" -msgstr "" - -#: ../extensions/cookie-manager/cookie-manager-page.c:1091 -msgid "_Collapse All" -msgstr "" - -# tooltip -#: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" - -#: ../extensions/cookie-manager/main.c:40 -msgid "_Cookie Manager" -msgstr "" - -# description -#: ../extensions/cookie-manager/main.c:57 -msgid "List, view and delete cookies" -msgstr "" - -#: ../extensions/feed-panel/feed-atom.c:209 -msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" - -#: ../extensions/feed-panel/feed-atom.c:315 -msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" - -#. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 -#, c-format -msgctxt "Feed" -msgid "Last updated: %s." -msgstr "" - -#: ../extensions/feed-panel/feed-panel.c:671 -msgid "Feeds" -msgstr "قانال" - -#: ../extensions/feed-panel/feed-panel.c:724 -msgid "Add new feed" -msgstr "" - -#: ../extensions/feed-panel/feed-panel.c:731 -msgid "Delete feed" -msgstr "" - -#: ../extensions/feed-panel/feed-panel.c:814 -msgid "_Feeds" -msgstr "" - -#: ../extensions/feed-panel/feed-parse.c:192 -#, c-format -msgid "Failed to find root element in feed XML data." -msgstr "" - -#: ../extensions/feed-panel/feed-parse.c:232 -#, c-format -msgid "Unsupported feed format." -msgstr "" - -#: ../extensions/feed-panel/feed-parse.c:262 -#, c-format -msgid "Failed to parse XML feed: %s" -msgstr "" - -#: ../extensions/feed-panel/feed-rss.c:46 -msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" - -#: ../extensions/feed-panel/feed-rss.c:51 -msgid "Unsupported RSS version found." -msgstr "" - -#: ../extensions/feed-panel/feed-rss.c:148 -msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" - -#: ../extensions/feed-panel/feed-rss.c:248 -msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" - -#: ../extensions/feed-panel/main.c:132 -msgid "Error" -msgstr "خاتالىق" - -#: ../extensions/feed-panel/main.c:134 -#, c-format -msgid "Feed '%s' already exists" -msgstr "" - -#: ../extensions/feed-panel/main.c:211 -#, c-format -msgid "Error loading feed '%s'" -msgstr "" - -#: ../extensions/feed-panel/main.c:522 -msgid "Feed Panel" -msgstr "" - -# description -#: ../extensions/feed-panel/main.c:523 -msgid "Read Atom/ RSS feeds" -msgstr "" - -#: ../extensions/formhistory.c:144 -#, c-format -msgid "Failed to add form value: %s\n" -msgstr "" - -#: ../extensions/formhistory.c:510 -msgid "Stores history of entered form data" -msgstr "" - -#: ../extensions/formhistory.c:514 -#, c-format -msgid "Not available: %s" -msgstr "" - -#: ../extensions/formhistory.c:515 -msgid "Resource files not installed" -msgstr "" - -#: ../extensions/formhistory.c:521 -msgid "Form history filler" -msgstr "" - -#: ../extensions/mouse-gestures.c:303 -msgid "Mouse Gestures" -msgstr "" - -# description -#: ../extensions/mouse-gestures.c:304 -msgid "Control Midori by moving the mouse" -msgstr "" - -#. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 -msgid "Pageholder" -msgstr "" - -#: ../extensions/page-holder.c:161 -msgid "_Pageholder" -msgstr "" - -#: ../extensions/page-holder.c:178 -msgid "Keep one or multiple pages open in parallel to your tabs" -msgstr "" - -#: ../extensions/shortcuts.c:170 -msgid "Customize Keyboard shortcuts" -msgstr "" - -#: ../extensions/shortcuts.c:276 -msgid "Customize Sh_ortcuts..." -msgstr "" - -#: ../extensions/shortcuts.c:315 -msgid "Shortcuts" -msgstr "" - -# description -#: ../extensions/shortcuts.c:316 -msgid "View and edit keyboard shortcuts" -msgstr "" - -#: ../extensions/statusbar-features.c:84 -msgid "Images" -msgstr "سۈرەتلەر" - -#: ../extensions/statusbar-features.c:96 -msgid "Scripts" -msgstr "" - -#: ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "" - -#: ../extensions/statusbar-features.c:149 -msgid "Statusbar Features" -msgstr "" - -# description -#: ../extensions/statusbar-features.c:150 -msgid "Easily toggle features on web pages on and off" -msgstr "" - -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 -msgid "Tab Panel" -msgstr "" - -#: ../extensions/tab-panel.c:609 -msgid "T_ab Panel" -msgstr "" - -# description -#: ../extensions/tab-panel.c:626 -msgid "Show tabs in a vertical panel" -msgstr "" - -#: ../extensions/tab-switcher.c:395 -msgid "Tab History List" -msgstr "" - -#: ../extensions/tab-switcher.c:396 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" - -#: ../extensions/toolbar-editor.c:389 -msgid "Customize Toolbar" -msgstr "قورال ئىستونىنى ئۆزى بەلگىلەش" - -#: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" - -#: ../extensions/toolbar-editor.c:421 -msgid "Available Items" -msgstr "" - -#: ../extensions/toolbar-editor.c:442 -msgid "Displayed Items" -msgstr "" - -#: ../extensions/toolbar-editor.c:577 -msgid "Customize _Toolbar..." -msgstr "" - -#: ../extensions/toolbar-editor.c:608 -msgid "Toolbar Editor" -msgstr "" - -# description -#: ../extensions/toolbar-editor.c:609 -msgid "Easily edit the toolbar layout" -msgstr "" - -#: ../extensions/web-cache.c:465 -msgid "Cache HTTP communication on disk" -msgstr "" - -#~ msgid "The configuration of the extension '%s' couldn't be loaded: %s\n" -#~ msgstr "設定を読み込めませんでした: %s\n" - -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "ユーザスクリプトをフォルダ %s へ、ユーザスタイルをフォルダ %s へコピーしま" -#~ "す。" - -#~ msgid "Open _Link" -#~ msgstr "リンクを開く(_L)" - -#~ msgid "Open Image in New Wi_ndow" -#~ msgstr "画像を新しいウィンドウで開く(_N)" - -#~ msgid "REGEX" -#~ msgstr "REGEX" - -#~ msgid "Not available on this platform" -#~ msgstr "このプラットフォームでは利用できません" - -#~ msgid "Failed to get current time: %s\n" -#~ msgstr "現在時刻の取得に失敗しました: %s\n" - -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "履歴アイテムの追加に失敗しました: %s\n" - -#~ msgid "Show panel _titles" -#~ msgstr "パネルタイトルの表示(_T)" - -#~ msgid "Options" -#~ msgstr "オプション" - -#~ msgid "Spell checking languages:" -#~ msgstr "スペルチェックする言語:" - -#~ msgid "View Selection Source" -#~ msgstr "選択領域のソースを表示" - -# tooltip -#~ msgid "View the source code of the selection" -#~ msgstr "ページのソースコードを表示します" - -#~ msgid "Shrink images automatically" -#~ msgstr "画像を自動的に読み込む" - -# description -#~ msgid "Tint tabs distinctly" -#~ msgstr "各タブにそれぞれを区別する色をつけます" - -#~ msgid "DNS prefetching" -#~ msgstr "DNS プリフェッチ" - -#~ msgid "Prefetch IP addresses of hovered links" -#~ msgstr "マウスポインタを置いたリンクの IP アドレスを先読みします" +# Uyghur translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Gheyret T.Kenji , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.1.9\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-21 04:08+0000\n" +"PO-Revision-Date: 2010-05-04 16:34+0900\n" +"Last-Translator: Gheyret T.Kenji \n" +"Language-Team: Uyghur Computer Science Association \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "يېنىك توركۆرگۈ" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 +#: ../midori/main.c:1636 ../midori/main.c:1652 +#: ../midori/midori-websettings.c:314 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "توركۆرگۈ" + +#: ../midori/main.c:102 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "تەڭشەكنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "'%s' نى %s نىڭ قىممىتى قىلىپ ئىشلەتكىلى بولمايدۇ" + +#: ../midori/main.c:158 ../midori/main.c:244 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "تەڭشەك قىممىتى '%s' خاتا" + +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "سانداننى ئېچىش مەغلۇپ بولدى: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:425 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "كونا ئىزلارنى ئېچىش مەغلۇپ بولدى: %s\n" + +#: ../midori/main.c:468 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "خەتكۈچنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:500 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "تەڭشەكنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:538 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "ئىزدەش ماتورىنى ساقلىغىنى بولمىدى. %s " + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:558 ../midori/main.c:581 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "ئەخلەتنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:640 ../midori/main.c:880 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى. %s" + +#: ../midori/main.c:824 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr " " + +#: ../midori/main.c:914 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "Midori ئالدىنقى قېتىم قوزغىتىلغاندا غۇلاپ كەتكەندەك قىلىدۇ. بۇ يەنە تەكرارلانسا " +"تۆۋەندىكى تاللانمىلارنى تاللاپ كۆرۈپ بېقىڭ." + +#: ../midori/main.c:929 +msgid "Modify _preferences" +msgstr "تەڭشەكنى ئۆزگەرت(_P)" + +#: ../midori/main.c:933 +msgid "Reset the last _session" +msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئەسلىگە قايتۇر(_S)" + +#: ../midori/main.c:938 +msgid "Disable all _extensions" +msgstr "بارلىق كېڭەيتمىنى چەكلە(_E)" + +#: ../midori/main.c:1174 ../midori/main.c:1905 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "ئەڭگىمەنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1298 +msgid "No filename specified" +msgstr "ھۆججەت ئاتى بەلگىلەنمىگەن" + +#: ../midori/main.c:1317 +msgid "An unknown error occured." +msgstr "نامەلۇم خاتالىق كۆرۈلدى." + +#: ../midori/main.c:1348 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Snapshot بۇ يەرگە ساقلاندى :%s\n" + +# CLI --help +#: ../midori/main.c:1520 +msgid "Run ADDRESS as a web application" +msgstr "ADDRESS نى تور پروگراممىسى قاتارىدا ئىجرا قىل" + +#: ../midori/main.c:1520 +msgid "ADDRESS" +msgstr "ADDRESS" + +# CLI --help +#: ../midori/main.c:1523 +msgid "Use FOLDER as configuration folder" +msgstr "FOLDER نى تەڭشەك مۇندەرىجىسى قىلىپ ئىشلەت" + +#: ../midori/main.c:1523 +msgid "FOLDER" +msgstr "FOLDER" + +#: ../midori/main.c:1526 +msgid "Show a diagnostic dialog" +msgstr "دىئاگنوز كۆزنىكىنى كۆرسىتىدۇ" + +# CLI --help +#: ../midori/main.c:1528 +msgid "Run the specified filename as javascript" +msgstr "كۆرسىتىلگەن ھۆججەت نامىنى javascript دەپ قاراپ ئىجرا قىل" + +# CLI --help +#: ../midori/main.c:1531 +msgid "Take a snapshot of the specified URI" +msgstr "كۆرسىتىلگەن URI نىڭ snapshot نى ئال" + +# CLI --help +#: ../midori/main.c:1534 +msgid "Execute the specified command" +msgstr "كۆرسىتىلگەن بۇيرۇقنى ئىجرا قىل" + +# CLI --help +#: ../midori/main.c:1536 +msgid "Display program version" +msgstr "پروگرامما نەشرى كۆرسەت" + +#: ../midori/main.c:1538 +msgid "Addresses" +msgstr "ئادرېس" + +#: ../midori/main.c:1540 +msgid "Block URIs according to regular expression PATTERN" +msgstr "ئۆلچەملىك ئىپادە PATTERN غا بويسۇنۇپ URI چەكلە" + +#: ../midori/main.c:1540 +msgid "PATTERN" +msgstr "PATTERN" + +# CLI --help +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1544 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Midori ئاكتىپ ئەمەس ھالەتتە SECONDS سېكۇنت تۇرسا، Midori نى ئەسلىگە قايتۇر" + +#: ../midori/main.c:1544 +msgid "SECONDS" +msgstr "SECONDS" + +#: ../midori/main.c:1625 +msgid "[Addresses]" +msgstr "[ئادرېس]" + +#: ../midori/main.c:1653 +msgid "Please report comments, suggestions and bugs to:" +msgstr "پىكىر، تەكلىپ، شۇنداقلا كەمتۈكلەرنى بۇ يەرگە مەلۇم قىلىڭ:" + +#: ../midori/main.c:1655 +msgid "Check for new versions at:" +msgstr "يېڭى نەشرىنى بۇ يەردىن تەكشۈر:" + +#: ../midori/main.c:1752 +msgid "The specified configuration folder is invalid." +msgstr "كۆرسىتىلگەن تەڭشەك مۇندەرىجىسى توغرا ئەمەس." + +#: ../midori/main.c:1800 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori نىڭ instance ئىجرا قىلىنىۋېتىپتۇ بىراق ئىنكاس يوق.\n" + +#: ../midori/main.c:1855 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "ئىزدەش ماتورىنى ئوقۇغىلى بولمىدى. %s\n" + +#: ../midori/main.c:1877 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "خەتكۈچنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1920 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "ئەخلەت ساندۇقىنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1934 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "ئىزلارنى ئوقۇغىلى بولمىدى: %s\n" + +#: ../midori/main.c:1948 +msgid "The following errors occured:" +msgstr "تۆۋەندىكىدەك خاتالىق كۆرۈلدى:" + +#: ../midori/main.c:1964 +msgid "_Ignore" +msgstr "پەرۋا قىلما(_I)" + +#: ../midori/midori-array.c:428 +msgid "File not found." +msgstr "ھۆججەت تېپىلمىدى." + +#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 +#: ../midori/midori-array.c:495 +msgid "Malformed document." +msgstr "فورماتى خاتا بولغان پۈتۈك." + +#: ../midori/midori-array.c:504 +msgid "Unrecognized bookmark format." +msgstr "فورماتى خاتا بولغان خەتكۈش." + +#: ../midori/midori-array.c:718 +msgid "Writing failed." +msgstr "يېزىش مەغلۇپ بولدى." + +#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 +#: ../midori/midori-browser.c:5250 +msgid "Reload the current page" +msgstr "ھازىرقى بەتنى قايتا ئوقۇيدۇ" + +#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 +msgid "Stop loading the current page" +msgstr "ھازىرقى بېتىنى ئوقۇشنى توختىتىدۇ" + +#: ../midori/midori-browser.c:456 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% ئوقۇلدى" + +#: ../midori/midori-browser.c:494 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "ماۋزۇنى يېڭىلاش مەغلۇپ بولدى: %s\n" + +#: ../midori/midori-browser.c:508 +#, c-format +msgid "Unexpected action '%s'." +msgstr "'%s' بولسا كۈتۈلمىگەن مەشغۇلات." + +#: ../midori/midori-browser.c:731 +msgid "New folder" +msgstr "يېڭى مۇندەرىجە" + +#: ../midori/midori-browser.c:731 +msgid "Edit folder" +msgstr "مۇندەرىجە تەھرىرلەيدۇ" + +#: ../midori/midori-browser.c:733 +msgid "New bookmark" +msgstr "يېڭى خەتكۈش" + +#: ../midori/midori-browser.c:733 +msgid "Edit bookmark" +msgstr "خەتكۈش تەھرىرلەش" + +#: ../midori/midori-browser.c:764 +msgid "_Title:" +msgstr "ماۋزۇ (_T):" + +#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 +msgid "_Description:" +msgstr "چۈشەندۈرۈش(_D):" + +#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 +msgid "_Address:" +msgstr "ئادرېس(_A):" + +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 +msgid "_Folder:" +msgstr "مۇندەرىجە(_F)" + +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 +#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 +msgid "Toplevel folder" +msgstr "ئۈستىقەۋەت مۇندەرىجە" + +#: ../midori/midori-browser.c:874 +msgid "Add to _Speed Dial" +msgstr "" + +#: ../midori/midori-browser.c:887 +msgid "Show in the tool_bar" +msgstr "قورال بالدىقىدا كۆرسەت(_B)" + +#: ../midori/midori-browser.c:902 +msgid "Run as _web application" +msgstr "تور پروگراممىسى شەكلىدە ئىجرا قىل(_W)" + +#: ../midori/midori-browser.c:994 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "\"%s\" نى چۈشۈرۈشكە يېتەرلىك بوشلۇق يوق." + +#: ../midori/midori-browser.c:998 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "ھۆججەتكە %s كېرەك ئىدى، بىراق %s چىلىكلا بار ئىكەن." + +#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 +#: ../midori/midori-browser.c:4487 +msgid "Save file as" +msgstr "باشقا نامدا ساقلا" + +#: ../midori/midori-browser.c:1448 +msgid "Save file" +msgstr "ھۆججەت ساقلا" + +#: ../midori/midori-browser.c:2152 +msgid "Open file" +msgstr "ھۆججەتنى ئاچ" + +#: ../midori/midori-browser.c:2230 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr " \n" +" " + +#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +msgid "New feed" +msgstr "يېڭى feed" + +# tooltip +#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 +#: ../panels/midori-bookmarks.c:422 +msgid "Add a new bookmark" +msgstr "يېڭى خەتكۈش قوش" + +#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 +#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 +#: ../extensions/formhistory.c:465 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى: %s\n" + +#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "قۇرۇق" + +#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 +msgid "Could not run external program." +msgstr "سىرتقى پروگراممىنى ئىجرا قىلغىلى بولمىدى" + +#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "يېڭى ئىز قىستۇرۇش مەغلۇپ بولدى: %s\n" + +#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:750 +msgid "Open all in _Tabs" +msgstr "ھەممىنى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Tab" +msgstr "يېڭى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-browser.c:4103 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +msgid "Open in New _Window" +msgstr "يېڭى كۆزنەكتە ئاچ(_W)" + +#: ../midori/midori-browser.c:4326 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:4327 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:4328 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:4329 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:4330 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:4351 +msgid "Import bookmarks..." +msgstr "خەتكۈش ئىمپورت قىل..." + +#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 +msgid "_Import bookmarks" +msgstr "خەتكۈش ئىمپورت قىل(_I)" + +#: ../midori/midori-browser.c:4365 +msgid "_Application:" +msgstr "پروگرامما(_A):" + +#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../katze/katze-utils.c:691 +msgid "Custom..." +msgstr "ئۆزى بەلگىلەش…" + +#: ../midori/midori-browser.c:4466 +msgid "Failed to import bookmarks" +msgstr "خەتكۈش ئىمپورت قىلىش مەغلۇپ بولدى" + +#: ../midori/midori-browser.c:4502 +msgid "Failed to export bookmarks" +msgstr "خەتكۈش ئېكسپورت قىلىش مەغلۇپ بولدى" + +#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 +#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "ئىز ئۆچۈرۈش مەغلۇپ بولدى: %s\n" + +# Dialog title +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4663 +msgid "Clear Private Data" +msgstr "شەخسىي سانلىق ئاساسلارنى تازىلايدۇ" + +# Button label +#: ../midori/midori-browser.c:4667 +msgid "_Clear private data" +msgstr "شەخسىي سانلىق مەلۇماتلار تازىلا(_C)" + +#: ../midori/midori-browser.c:4681 +msgid "Clear the following data:" +msgstr "تۆۋەندىكى سانلىق ئاساسلارنى تازىلا:" + +#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 +#: ../panels/midori-history.c:119 +msgid "History" +msgstr "ئىز" + +#: ../midori/midori-browser.c:4698 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:4703 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookie" + +#: ../midori/midori-browser.c:4708 +msgid "Website icons" +msgstr "تورتۇرا سىنبەلگىسى" + +#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 +msgid "_Closed Tabs" +msgstr "تاقالغان بەتكۈچلەر(_C)" + +#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 +msgid "Web Cache" +msgstr "تور غەملىكى" + +#: ../midori/midori-browser.c:4726 +msgid "Clear private data when _quitting Midori" +msgstr "Midori نى ئاخىرلاشتۇرغاندا شەخسىي سانلىق ئاساسلارنى تازىلا(_Q)" + +#: ../midori/midori-browser.c:4827 +msgid "A lightweight web browser." +msgstr "ئەپچىل توركۆرگۈ" + +#: ../midori/midori-browser.c:4829 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" + +#: ../midori/midori-browser.c:4848 +msgid "translator-credits" +msgstr "Gheyret T.Kenji 2010" + +#: ../midori/midori-browser.c:5157 +msgid "_File" +msgstr "ھۆججەت(_F)" + +#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 +msgid "New _Window" +msgstr "يېڭى كۆزنەك(_W)" + +# tooltip +#: ../midori/midori-browser.c:5160 +msgid "Open a new window" +msgstr "يېڭى كۆزنەكتىن بىرنى ئاچ" + +# tooltip +#: ../midori/midori-browser.c:5163 +msgid "Open a new tab" +msgstr "يېڭى بەتكۈچتىن بىرنى ئاچ" + +#: ../midori/midori-browser.c:5165 +msgid "P_rivate Browsing" +msgstr "شەخسىي كۆرۈش(_R)" + +# tooltip +#: ../midori/midori-browser.c:5166 +msgid "Don't save any private data while browsing" +msgstr "كۆرۈۋاتقاندا شەخسىي سانلىق مەلۇماتلارنى ساقلىمىسۇن" + +# tooltip +#: ../midori/midori-browser.c:5170 +msgid "Open a file" +msgstr "ھۆججەت ئاچ" + +# tooltip +#: ../midori/midori-browser.c:5173 +msgid "Save to a file" +msgstr "ھۆججەتكە ساقلا" + +#: ../midori/midori-browser.c:5175 +msgid "Add to Speed _dial" +msgstr "Speed dial قوش(_D)" + +# tooltip +#: ../midori/midori-browser.c:5176 +msgid "Add shortcut to speed dial" +msgstr "Speed dial نىڭ تېزلەتمىسىنى قوش" + +#: ../midori/midori-browser.c:5178 +msgid "Add Shortcut to the _desktop" +msgstr "ئۈستەليۈزىگە تېزلەتمە قوش(_D)" + +# tooltip +#: ../midori/midori-browser.c:5179 +msgid "Add shortcut to the desktop" +msgstr "ئۈستەليۈزىگە تېزلەتمە قوش" + +#: ../midori/midori-browser.c:5181 +msgid "Subscribe to News _feed" +msgstr "خەۋەر feed غا مۇشتەرى بول(_F)" + +#: ../midori/midori-browser.c:5182 +msgid "Subscribe to this news feed" +msgstr "خەۋەر feed غا مۇشتەرى بولىدۇ" + +#: ../midori/midori-browser.c:5187 +msgid "_Close Tab" +msgstr "بەتكۈچنى تاقا(_C)" + +# tooltip +#: ../midori/midori-browser.c:5188 +msgid "Close the current tab" +msgstr "ھازىرقى بەتكۈچنى تاقايدۇ" + +#: ../midori/midori-browser.c:5190 +msgid "C_lose Window" +msgstr "كۆزنەك تاقا(_L)" + +# tooltip +#: ../midori/midori-browser.c:5191 +msgid "Close this window" +msgstr "مەزكۇر كۆزنەكنى تاقايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5194 +msgid "Print the current page" +msgstr "ھازىرقى بەتنى باسىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5197 +msgid "Quit the application" +msgstr "مەزكۇر پروگراممىنى ئاخىرلاشتۇرىدۇ" + +#: ../midori/midori-browser.c:5199 +msgid "_Edit" +msgstr "تەھرىر(_E)" + +#: ../midori/midori-browser.c:5203 +msgid "Undo the last modification" +msgstr "ئەڭ ئاخىرقى قېتىم تۈزەتكەندىن يېنىۋالىدۇ" + +#: ../midori/midori-browser.c:5206 +msgid "Redo the last modification" +msgstr "ئەڭ ئاخىرقى قېتىم يانغانغا پۇشايمان قىلىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5210 +msgid "Cut the selected text" +msgstr "تاللانغان تېكىستنى كېسىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 +msgid "Copy the selected text" +msgstr "تاللانغان تېكىستنى كۆچۈرىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5219 +msgid "Paste text from the clipboard" +msgstr "clipboard دىكىنى چاپلايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5222 +msgid "Delete the selected text" +msgstr "تاللانغان تېكىستنى ئۆچۈرىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5225 +msgid "Select all text" +msgstr "ھەممە تېكىستنى تاللايدۇ" + +# tooltip +#: ../midori/midori-browser.c:5228 +msgid "Find a word or phrase in the page" +msgstr "بەت ئىچىدىن سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" + +#: ../midori/midori-browser.c:5230 +msgid "Find _Next" +msgstr "كېيىنكىسىنى ئىزدە(_N)" + +# tooltip +#: ../midori/midori-browser.c:5231 +msgid "Find the next occurrence of a word or phrase" +msgstr "كېيىنكى سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" + +#: ../midori/midori-browser.c:5233 +msgid "Find _Previous" +msgstr "ئالدىنقىنى ئىزدە(_P)" + +# tooltip +#: ../midori/midori-browser.c:5234 +msgid "Find the previous occurrence of a word or phrase" +msgstr "ئالدىنقى سوز ياكى سوز بىرىكمىسىنى ئىزدەيدۇ" + +# tooltip +#: ../midori/midori-browser.c:5238 +msgid "Configure the application preferences" +msgstr "مەزكۇر پروگراممىنىڭ تەڭشىكىنى تەڭشەيدۇ" + +#: ../midori/midori-browser.c:5240 +msgid "_View" +msgstr "كۆرۈنۈش(_V)" + +#: ../midori/midori-browser.c:5241 +msgid "_Toolbars" +msgstr "قورال بالدىقى(_T)" + +# tooltip +#: ../midori/midori-browser.c:5253 +msgid "Increase the zoom level" +msgstr "zoom دەرىجىسىنى چوڭايتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5256 +msgid "Decrease the zoom level" +msgstr "zoom دەرىجىسىنى كىچىكلىتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5259 +msgid "Reset the zoom level" +msgstr "zoom دەرىجىسىنى ئەسلىگە قايتۇرىدۇ" + +#: ../midori/midori-browser.c:5260 +msgid "_Encoding" +msgstr "كودلىشى(_E)" + +#: ../midori/midori-browser.c:5262 +msgid "View So_urce" +msgstr "مەنبەنى كۆرسەت(_U)" + +# tooltip +#: ../midori/midori-browser.c:5263 +msgid "View the source code of the page" +msgstr "مەزكۇر بەتنىڭ مەنبە كودىنى كۆرسىتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5266 +msgid "Toggle fullscreen view" +msgstr "تولۇق ئېكران كۆرسەت/كۆرسەتمە نى ئالماشتۇرۇش" + +#: ../midori/midori-browser.c:5269 +msgid "Scroll _Left" +msgstr "سولغا سىيرىل(_L)" + +#: ../midori/midori-browser.c:5270 +msgid "Scroll to the left" +msgstr "سولغا سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5272 +msgid "Scroll _Down" +msgstr "پەسكە سىيرىل(_D)" + +#: ../midori/midori-browser.c:5273 +msgid "Scroll down" +msgstr "پەسكە سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5275 +msgid "Scroll _Up" +msgstr "ئۈستىگە سىيرىلىدۇ(_U)" + +#: ../midori/midori-browser.c:5276 +msgid "Scroll up" +msgstr "ئۈستىگە سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5278 +msgid "Scroll _Right" +msgstr "ئوڭغا سىيرىل(_R)" + +#: ../midori/midori-browser.c:5279 +msgid "Scroll to the right" +msgstr "ئونغا سىيرىلىدۇ" + +#: ../midori/midori-browser.c:5282 +msgid "_Go" +msgstr "يۆتكەل(_G)" + +# tooltip +#: ../midori/midori-browser.c:5285 +msgid "Go back to the previous page" +msgstr "ئالدىنقى بەتكە قايتىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5288 +msgid "Go forward to the next page" +msgstr "كېيىنكى بەتكە ماڭىدۇ" + +# tooltip +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5292 +msgid "Go to the previous sub-page" +msgstr "ئالدىنقى بالا بەتكە قايتىدۇ" + +# tooltip +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:5296 +msgid "Go to the next sub-page" +msgstr "كېيىنكى بالا بەتكە ماڭىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5299 +msgid "Go to your homepage" +msgstr "ئانا بەتكە ماڭىدۇ" + +#: ../midori/midori-browser.c:5301 +msgid "Empty Trash" +msgstr "ئەخلەت ساندۇقىنى تازىلاش" + +# tooltip +#: ../midori/midori-browser.c:5302 +msgid "Delete the contents of the trash" +msgstr "ئەخلەت ساندۇقىنىڭ ئىچىدىكى مەزمۇنلارنى ئۆچۈرىدۇ" + +#: ../midori/midori-browser.c:5304 +msgid "Undo _Close Tab" +msgstr "تاقالغان بەتكۈچنى ئەسلى كەلتۈر(_C)" + +# tooltip +#: ../midori/midori-browser.c:5305 +msgid "Open the last closed tab" +msgstr "ئەڭ ئاخىرقى قېتىم تاقالغان بەتنى ئاچىدۇ" + +#: ../midori/midori-browser.c:5311 +msgid "Add a new _folder" +msgstr "يېڭى مۇندەرىجە قوش(_F)" + +# tooltip +#: ../midori/midori-browser.c:5312 +msgid "Add a new bookmark folder" +msgstr "يېڭى خەتكۈش مۇندەرىجىسى قوشىدۇ" + +#: ../midori/midori-browser.c:5317 +msgid "_Export bookmarks" +msgstr "خەتكۈچنى ئېكسپورت قىل(_E)" + +#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "ئىزدەش ماتورىنى باشقۇر(_M)" + +# tooltip +#: ../midori/midori-browser.c:5321 +msgid "Add, edit and remove search engines..." +msgstr "ئىزدەش ماتورىنى قوشىدۇ، تەھرىرلەيدۇ، ئۆچۈرىدۇ..." + +#: ../midori/midori-browser.c:5324 +msgid "_Clear Private Data" +msgstr "شەخسىي سانلىق ئاساسلارنى تازىلا(_C)" + +# tooltip +#: ../midori/midori-browser.c:5325 +msgid "Clear private data..." +msgstr "شەخسىي سانلىق ئاساسلارنى تازىلايدۇ..." + +#: ../midori/midori-browser.c:5329 +msgid "_Inspect Page" +msgstr "بەتنى تەكشۈر(_I)" + +#: ../midori/midori-browser.c:5330 +msgid "Inspect page details and access developer tools..." +msgstr "بەت تەپسىلاتىنى تەكشۈرىدۇ ۋە ئىجادىيەت قوراللىرىنى زىيارەت قىلىدۇ..." + +#: ../midori/midori-browser.c:5335 +msgid "_Previous Tab" +msgstr "ئالدىنقى بەتكۈچ(_P)" + +# tooltip +#: ../midori/midori-browser.c:5336 +msgid "Switch to the previous tab" +msgstr "ئالدىنقى بەتكۈچكە ئالمىشىدۇ" + +#: ../midori/midori-browser.c:5338 +msgid "_Next Tab" +msgstr "كېيىنكى بەتكۈچ(_N)" + +# tooltip +#: ../midori/midori-browser.c:5339 +msgid "Switch to the next tab" +msgstr "كېيىنكى بەتكۈچكە ئالمىشىدۇ" + +#: ../midori/midori-browser.c:5341 +msgid "Focus _Current Tab" +msgstr "ھازىرقى بەتكۈچكە فوكۇسلان(_C)" + +# tooltip +#: ../midori/midori-browser.c:5342 +msgid "Focus the current tab" +msgstr "فوكۇسنى ھازىرقى بەتكە يۆتكەيدۇ" + +#: ../midori/midori-browser.c:5344 +msgid "Open last _session" +msgstr "ئەڭ ئاخىرقى ئەڭگىمەنى ئاچ(_S)" + +#: ../midori/midori-browser.c:5345 +msgid "Open the tabs saved in the last session" +msgstr "ئەڭ ئاخىرقى ئەڭگىمەدە ساقلانغان بەتنى ئاچىدۇ" + +#: ../midori/midori-browser.c:5347 +msgid "_Help" +msgstr "ياردەم(_H)" + +#: ../midori/midori-browser.c:5349 +msgid "_Contents" +msgstr "مەزمۇن(_C)" + +# tooltip +#: ../midori/midori-browser.c:5350 +msgid "Show the documentation" +msgstr "پۈتۈكلەرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5352 +msgid "_Frequent Questions" +msgstr "كوپ سورىلىدىغان سوئاللار(_F)" + +# tooltip +#: ../midori/midori-browser.c:5353 +msgid "Show the Frequently Asked Questions" +msgstr "كوپ سورىلىدىغان سوئاللارنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5355 +msgid "_Report a Bug" +msgstr "كەمتۈك مەلۇم قىل(_R)" + +# tooltip +#: ../midori/midori-browser.c:5356 +msgid "Open Midori's bug tracker" +msgstr "Midori نىڭ كەمتۈك tracker سىنى ئاچىدۇ" + +# tooltip +#: ../midori/midori-browser.c:5359 +msgid "Show information about the program" +msgstr "مەزكۇر پروگرامما ھەققىدىكى ئۇچۇرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5367 +msgid "_Menubar" +msgstr "Menu بالدىقى(_M)" + +# tooltip +#: ../midori/midori-browser.c:5368 +msgid "Show menubar" +msgstr "Menu بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5371 +msgid "_Navigationbar" +msgstr "يولچى بالدىقى(_N)" + +# tooltip +#: ../midori/midori-browser.c:5372 +msgid "Show navigationbar" +msgstr "يولچى بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5375 +msgid "Side_panel" +msgstr "يان panel(_P)" + +# tooltip +#: ../midori/midori-browser.c:5376 +msgid "Show sidepanel" +msgstr "يان panel نى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5379 +msgid "_Bookmarkbar" +msgstr "خەتكۈش بالدىقى(_B)" + +# tooltip +#: ../midori/midori-browser.c:5380 +msgid "Show bookmarkbar" +msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5383 +msgid "_Transferbar" +msgstr "ئۇزىتىش بالدىقى(_T)" + +# tooltip +#: ../midori/midori-browser.c:5384 +msgid "Show transferbar" +msgstr "ئۇزىتىش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5387 +msgid "_Statusbar" +msgstr "ھالەت بالدىقى(_S)" + +# tooltip +#: ../midori/midori-browser.c:5388 +msgid "Show statusbar" +msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:5396 +msgid "_Automatic" +msgstr "ئۆزلۈكىدىن(_A)" + +#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 +msgid "Chinese (BIG5)" +msgstr "خەنزۇچە (BIG5)" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5403 +msgid "Japanese (SHIFT__JIS)" +msgstr "ياپونچە (SHIFT__JIS)" + +#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +msgid "Korean (EUC-KR)" +msgstr "كورىيەچە(EUC-KR)" + +#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 +msgid "Russian (KOI8-R)" +msgstr "رۇسچە(KOI8-R)" + +#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 +msgid "Unicode (UTF-8)" +msgstr "يۇنىكود (UTF-8)" + +#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 +msgid "Western (ISO-8859-1)" +msgstr "غەربچە (ISO-8859-1)" + +#: ../midori/midori-browser.c:5949 +msgid "_Separator" +msgstr "ئايرىغۇ(_S)" + +#: ../midori/midori-browser.c:5956 +msgid "_Location..." +msgstr "ئورۇن(_L)..." + +# tooltip +#: ../midori/midori-browser.c:5958 +msgid "Open a particular location" +msgstr "بەلگىلەنگەن ئورۇننى ئاچىدۇ" + +#: ../midori/midori-browser.c:5982 +msgid "_Web Search..." +msgstr "توردىن ئىزدە(_W)..." + +# tooltip +#: ../midori/midori-browser.c:5984 +msgid "Run a web search" +msgstr "توردىن ئىزدەيدۇ" + +# tooltip +#: ../midori/midori-browser.c:6005 +msgid "Reopen a previously closed tab or window" +msgstr "بۇرۇن يېپىلغان بەتكۈچ ياكى كۆزنەكنى قايتا ئاچىدۇ" + +#: ../midori/midori-browser.c:6020 +msgid "_Recently visited pages" +msgstr "يېقىندا كۆرگەن بەتلەر" + +# tooltip +#: ../midori/midori-browser.c:6022 +msgid "Reopen pages that you visited earlier" +msgstr "يېقىندا كۆرگەن بەتلەرنى ئاچىدۇ" + +#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 +msgid "_Bookmarks" +msgstr "خەتكۈش(_B)" + +# tooltip +#: ../midori/midori-browser.c:6039 +msgid "Show the saved bookmarks" +msgstr "ساقلانغان خەتكۈچلەرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:6054 +msgid "_Tools" +msgstr "قورال(_T)" + +#: ../midori/midori-browser.c:6067 +msgid "_Window" +msgstr "كۆزنەك(_W)" + +# tooltip +#: ../midori/midori-browser.c:6069 +msgid "Show a list of all open tabs" +msgstr "ئوچۇق بارلىق بەتكۈچلەرنى كۆرسىتىدۇ" + +#: ../midori/midori-browser.c:6083 +msgid "_Menu" +msgstr "Menu(_M)" + +#: ../midori/midori-browser.c:6085 +msgid "Menu" +msgstr "Menu" + +#: ../midori/midori-browser.c:6670 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "'%s' ئويلاپ باقمىغان تەڭشەكتۇر" + +#: ../midori/midori-locationaction.c:377 +#, c-format +msgid "Failed to select from history\n" +msgstr "ئىزدىن تاللاش مەغلۇپ بولدى\n" + +#: ../midori/midori-locationaction.c:459 +#, c-format +msgid "Search for %s" +msgstr "%s نى ئىزدە" + +#: ../midori/midori-locationaction.c:482 +#, c-format +msgid "Search with %s" +msgstr "%s دا ئىزدە" + +#: ../midori/midori-locationaction.c:1197 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "ساندان جۈملىسىنى ئىجرا قىلىش مەغلۇپ بولدى\n" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1254 +msgid "Paste and p_roceed" +msgstr "چاپلا ۋە داۋاملاشتۇر(_R)" + +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +msgid "Detach chosen panel from the window" +msgstr "تاللانغان panel نى كۆزنەكتىن ئايرىۋېتىدۇ" + +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +msgid "Align sidepanel to the right" +msgstr "يان panel نى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ" + +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +msgid "Close panel" +msgstr "panel نى تاقا" + +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +msgid "Align sidepanel to the left" +msgstr "يان panel نى سول تەرەپكە ئورۇنلاشتۇرىدۇ" + +#: ../midori/midori-panel.c:797 +msgid "Hide operating controls" +msgstr "مەشغۇلات تىزگىنەكلىرىنى يوشۇر" + +#: ../midori/midori-websettings.c:204 +msgid "Show Blank page" +msgstr "قۇرۇق بەتنى كۆرسەت" + +#: ../midori/midori-websettings.c:205 +msgid "Show Homepage" +msgstr "ماكان بەتنى كۆرسەت" + +#: ../midori/midori-websettings.c:206 +msgid "Show last open tabs" +msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتكۈچنى كۆرسەت" + +#: ../midori/midori-websettings.c:207 +msgid "Show last tabs without loading" +msgstr "ئەڭ ئاخىرىدا ئېچىلغان بەتنى قايتا ئوقۇماي كۆرسەت" + +#: ../midori/midori-websettings.c:223 +msgid "Japanese (SHIFT_JIS)" +msgstr "ياپونچە (SHIFT_JIS)" + +#: ../midori/midori-websettings.c:243 +msgid "New tab" +msgstr "يېڭى بەتكۈچ" + +#: ../midori/midori-websettings.c:244 +msgid "New window" +msgstr "يېڭى كۆزنەك" + +#: ../midori/midori-websettings.c:245 +msgid "Current tab" +msgstr "ھازىرقى بەتكۈچ" + +#: ../midori/midori-websettings.c:260 +msgid "Default" +msgstr "كۆڭۈلدىكى" + +#: ../midori/midori-websettings.c:261 +msgid "Icons" +msgstr "سىنبەلگىلەر" + +#: ../midori/midori-websettings.c:262 +msgid "Small icons" +msgstr "كىچىك سىنبەلگە" + +#: ../midori/midori-websettings.c:263 +msgid "Text" +msgstr "تېكىست" + +#: ../midori/midori-websettings.c:264 +msgid "Icons and text" +msgstr "سىنبەلگە ۋە تېكىست" + +#: ../midori/midori-websettings.c:265 +msgid "Text beside icons" +msgstr "تېكىست سىنبەلگىنىڭ يېنىدا كۆرسىتىلسۇن" + +#: ../midori/midori-websettings.c:280 +msgid "Automatic (GNOME or environment)" +msgstr "ئۆزلۈكىدىن (GNOME ياكى مۇھىت)" + +#: ../midori/midori-websettings.c:281 +msgid "HTTP proxy server" +msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر" + +#: ../midori/midori-websettings.c:282 +msgid "No proxy server" +msgstr "ۋاكالەتچى مۇلازىمېتىر يوق" + +#: ../midori/midori-websettings.c:297 +msgid "All cookies" +msgstr "بارلىق Cookie" + +#: ../midori/midori-websettings.c:298 +msgid "Session cookies" +msgstr "ئەڭگىمە Cookie سى" + +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +msgid "None" +msgstr "يوق" + +#: ../midori/midori-websettings.c:315 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:316 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:317 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:318 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:371 +msgid "Remember last window size" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋال" + +# tooltip +#: ../midori/midori-websettings.c:372 +msgid "Whether to save the last window size" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى چوڭلۇقىنى ئەستە تۇتۇۋالىدۇ" + +#: ../midori/midori-websettings.c:380 +msgid "Last window width" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى" + +#: ../midori/midori-websettings.c:381 +msgid "The last saved window width" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى كەڭلىكى" + +#: ../midori/midori-websettings.c:389 +msgid "Last window height" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى" + +# tooltip +#: ../midori/midori-websettings.c:390 +msgid "The last saved window height" +msgstr "كۆزنەكنىڭ ئەڭ ئاخىرقى ئېگىزلىكى" + +#: ../midori/midori-websettings.c:415 +msgid "Last panel position" +msgstr "panel نىڭ ئەڭ ئاخىرقى ئورنى" + +# tooltip +#: ../midori/midori-websettings.c:416 +msgid "The last saved panel position" +msgstr "panel نىڭ ئەڭ ئاخىرقى ئورنى" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:425 +msgid "Last panel page" +msgstr "panel دىكى ئەڭ ئاخىرقى بەت" + +# tooltip +#: ../midori/midori-websettings.c:426 +msgid "The last saved panel page" +msgstr "panel نىڭ ئەڭ ئاخىرى ساقلانغان بەت" + +#: ../midori/midori-websettings.c:434 +msgid "Last Web search" +msgstr "ئەڭ ئاخىرقى ئىزدەلگەنلەر" + +#: ../midori/midori-websettings.c:435 +msgid "The last saved Web search" +msgstr "ساقلانغان ئەڭ ئاخىرقى ئىزدەلگەن" + +#: ../midori/midori-websettings.c:444 +msgid "Show Menubar" +msgstr "Menu بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:445 +msgid "Whether to show the menubar" +msgstr "Menu بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:453 +msgid "Show Navigationbar" +msgstr "يولچى بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:454 +msgid "Whether to show the navigationbar" +msgstr "يولچى بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:462 +msgid "Show Bookmarkbar" +msgstr "خەتكۈش بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:463 +msgid "Whether to show the bookmarkbar" +msgstr "خەتكۈش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:471 +msgid "Show Panel" +msgstr "Panel نى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:472 +msgid "Whether to show the panel" +msgstr "Panel نى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:487 +msgid "Show Transferbar" +msgstr "ئۇزىتىش بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:488 +msgid "Whether to show the transferbar" +msgstr "ئۇزىتىش بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:496 +msgid "Show Statusbar" +msgstr "ھالەت بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:497 +msgid "Whether to show the statusbar" +msgstr "ھالەت بالدىقىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:506 +msgid "Toolbar Style:" +msgstr "قورال بالدىقى ئۇسلۇبى:" + +# tooltip +#: ../midori/midori-websettings.c:507 +msgid "The style of the toolbar" +msgstr "قورال بالدىقىنىڭ ئۇسلۇبىنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:523 +msgid "Show progress in location entry" +msgstr "ئورۇن كىرگۈزىدىغان يەردە progress نى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:524 +msgid "Whether to show loading progress in the location entry" +msgstr "ئورۇن كىرگۈزىدىغان يەردە progress نى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:539 +msgid "Search engines in location completion" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:540 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:548 +msgid "Toolbar Items" +msgstr "قورال بالدىقىدىكى تۈرلەر" + +# tooltip +#: ../midori/midori-websettings.c:549 +msgid "The items to show on the toolbar" +msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:557 +msgid "Compact Sidepanel" +msgstr "يان panel نى ئىخچام كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:558 +msgid "Whether to make the sidepanel compact" +msgstr "يان panel نى ئىخچام كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:573 +msgid "Show operating controls of the panel" +msgstr "panel نىڭ مەشغۇلات تىزگىنەكلىرىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:574 +msgid "Whether to show the operating controls of the panel" +msgstr "panel نىڭ مەشغۇلات تىزگىنەكلىرىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:589 +msgid "Align sidepanel on the right" +msgstr "يان panelنى ئوڭ تەرەپكە ئورۇنلاشتۇر" + +# tooltip +#: ../midori/midori-websettings.c:590 +msgid "Whether to align the sidepanel on the right" +msgstr "يان panelنى ئوڭ تەرەپكە ئورۇنلاشتۇرىدۇ" + +#: ../midori/midori-websettings.c:605 +msgid "Open panels in separate windows" +msgstr "panel نى ئايرىم كۆزنەكتە ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:606 +msgid "Whether to always open panels in separate windows" +msgstr "panel نى ئايرىم كۆزنەكتە ئاچىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:615 +msgid "When Midori starts:" +msgstr "Midori قوزغالغاندا:" + +# tooltip +#: ../midori/midori-websettings.c:616 +msgid "What to do when Midori starts" +msgstr "Midori قوزغالغاندا نېمە قىلىش كېرەك" + +#: ../midori/midori-websettings.c:625 +msgid "Homepage:" +msgstr "ماكان بەت:" + +# tooltip +#: ../midori/midori-websettings.c:626 +msgid "The homepage" +msgstr "ماكان بەتنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:641 +msgid "Show crash dialog" +msgstr "غۇلاش كۆزنىكىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:642 +msgid "Show a dialog after Midori crashed" +msgstr "Midori غۇلاپ كېتىپ، قايتا قوزغالغاندا كۆزنەك كۆرسىتىدۇ" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:658 +msgid "Show speed dial in new tabs" +msgstr "يېڭى بەتكۈچتە speed dial نى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:659 +msgid "Show speed dial in newly opened tabs" +msgstr "يېڭى ئېچىلغان بەتكۈچتە speed dial نى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:667 +msgid "Save downloaded files to:" +msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇن:" + +# tooltip +#: ../midori/midori-websettings.c:668 +msgid "The folder downloaded files are saved to" +msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ئورۇننى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:689 +msgid "Ask for the destination folder" +msgstr "ساقلايدىغان چاغدا سورا" + +# tooltip +#: ../midori/midori-websettings.c:690 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "چۈشۈرگەن ھۆججەتنى ساقلايدىغان ۋاقىتتا ، ساقلايدىغان مۇندەرىجىنى سورايدۇ" + +#: ../midori/midori-websettings.c:709 +msgid "Notify when a transfer has been completed" +msgstr "ئۇزىتىش تاماملانغاندا ئۇقتۇرۇش قىل" + +# tooltip +#: ../midori/midori-websettings.c:710 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "ئۇزىتىش تاماملانغاندا، ئۇنى ئىشلەتكۈچىگە خەۋەر قىلىدۇ" + +#: ../midori/midori-websettings.c:722 +msgid "Download Manager" +msgstr "چۈشۈرۈش باشقۇرغۇسى" + +# tooltip +#: ../midori/midori-websettings.c:723 +msgid "An external download manager" +msgstr "سىرتتىكى چۈشۈرۈش باشقۇرغۇسىنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:731 +msgid "Text Editor" +msgstr "تېكىست تەھرىرلىگۈ" + +# tooltip +#: ../midori/midori-websettings.c:732 +msgid "An external text editor" +msgstr "سىرتقى تېكىست تەھرىرلىگۈنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:747 +msgid "News Aggregator" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:748 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:756 +msgid "Location entry Search" +msgstr "" + +# tooltip +#: ../midori/midori-websettings.c:757 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:765 +msgid "Preferred Encoding" +msgstr "ئامراق كودلاش" + +# tooltip +#: ../midori/midori-websettings.c:766 +msgid "The preferred character encoding" +msgstr "ھەرپلەرنىڭ ئامراق كودلاش شەكلى" + +#: ../midori/midori-websettings.c:776 +msgid "Always Show Tabbar" +msgstr "بەتكۈچ بالدىقىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:777 +msgid "Always show the tabbar" +msgstr "بەتكۈچ بالدىقىنى كۆرسىتىپلا تۇرىدۇ" + +#: ../midori/midori-websettings.c:785 +msgid "Close Buttons on Tabs" +msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسەت" + +# tooltip +#: ../midori/midori-websettings.c:786 +msgid "Whether tabs have close buttons" +msgstr "بەتكۈچتە تاقاش توپچىسىنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:794 +msgid "Open new pages in:" +msgstr "يېڭى بەت ئاچقاندا:" + +# tooltip +#: ../midori/midori-websettings.c:795 +msgid "Where to open new pages" +msgstr "يېڭى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:804 +msgid "Open external pages in:" +msgstr "سىرتقى بەتنى ئاچقاندا:" + +# tooltip +#: ../midori/midori-websettings.c:805 +msgid "Where to open externally opened pages" +msgstr "سىرتقى بەتنى قەيەردە ئاچىدىغانلىقىنى بەلگىلەيدۇ" + +#: ../midori/midori-websettings.c:814 +msgid "Middle click opens Selection" +msgstr "چاشقىنەكنىڭ ئوتتۇرىسىنى چېكىپ تاللىغاننى ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:815 +msgid "Load an address from the selection via middle click" +msgstr "ئادرېسنى تاللاپ بولۇپ، چاشقىنەكنىڭ ئوتتۇرىسىنى چەكسە شۇ ئادرېس ئېچىلىدۇ" + +#: ../midori/midori-websettings.c:823 +msgid "Open tabs in the background" +msgstr "بەتكۈچنى background دا ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:824 +msgid "Whether to open new tabs in the background" +msgstr "يېڭى بەتكۈچنى background ئاچىدۇ" + +#: ../midori/midori-websettings.c:832 +msgid "Open Tabs next to Current" +msgstr "يېڭى بەتكۈچنى ھازىرقى بەتكۈچنىڭ يېنىدا ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:833 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "يېڭى بەتكۈچنى ھازىرقىنىڭ يېنىدا ياكى ئەڭ ئاخىرقىنىڭ يېنىدا ئاچىدۇ" + +#: ../midori/midori-websettings.c:841 +msgid "Open popups in tabs" +msgstr "بەتكۈچتە قاڭقىشى ئاچ" + +# tooltip +#: ../midori/midori-websettings.c:842 +msgid "Whether to open popup windows in tabs" +msgstr "بەتكۈچتە قاڭقىش menusini ئاچىدۇ" + +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "سۈرەتنى ئۆزلۈكىدىن يۈكلە" + +# tooltip +#: ../midori/midori-websettings.c:853 +msgid "Load and display images automatically" +msgstr "سۈرەتنى ئۆزلۈكىدىن ئوقۇپ كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "script ئېچىۋەت" + +# tooltip +#: ../midori/midori-websettings.c:861 +msgid "Enable embedded scripting languages" +msgstr "سىڭدۈرمە script تىلىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "Netscape قىستۇرمىلىرى ئېچىۋەت" + +# tooltip +#: ../midori/midori-websettings.c:869 +msgid "Enable embedded Netscape plugin objects" +msgstr "سىڭدۈرمە Netscape قىستۇرمىلىرىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:885 +msgid "Enable HTML5 database support" +msgstr "HTML5 ساندانىنى قوللا" + +#: ../midori/midori-websettings.c:886 +msgid "Whether to enable HTML5 database support" +msgstr "HTML5 ساندانىنى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:892 +msgid "Enable HTML5 local storage support" +msgstr "HTML5 يەرلىك storage نى قوللا" + +#: ../midori/midori-websettings.c:893 +msgid "Whether to enable HTML5 local storage support" +msgstr "HTML5 يەرلىك storage نى ئىشلەتكىلى بولىدىغان قىلىدۇ" + +#: ../midori/midori-websettings.c:901 +msgid "Enable offline web application cache" +msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋەت" + +#: ../midori/midori-websettings.c:902 +msgid "Whether to enable offline web application cache" +msgstr "تورسىز ھالەتتە تور پروگراممىلىرىنىڭ غەملىكىنى ئېچىۋېتىدۇ" + +#: ../midori/midori-websettings.c:927 +msgid "Zoom Text and Images" +msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايت تارايت" + +# tooltip +#: ../midori/midori-websettings.c:928 +msgid "Whether to zoom text and images" +msgstr "تېكىست ۋە سۈرەتلەرنى چوڭايتىدۇ ياكى تارايتىدۇ" + +#: ../midori/midori-websettings.c:943 +msgid "Find inline while typing" +msgstr "كىرگۈزگەن ھامان ئىزدە" + +# tooltip +#: ../midori/midori-websettings.c:944 +msgid "Whether to automatically find inline while typing" +msgstr "كۇنۇپكا بېسىلغان ھامان ئىزدەش ئېلىپ بارىدۇ" + +#: ../midori/midori-websettings.c:959 +msgid "Kinetic scrolling" +msgstr "Kinetic سىيرىل" + +#: ../midori/midori-websettings.c:960 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "تېزلىكىگە ئاساسەن Kinetic سىيرىلىپ يۆتكىلىدۇ" + +#: ../midori/midori-websettings.c:968 +msgid "Accept cookies" +msgstr "cookie لارنى قوبۇل قىل" + +# tooltip +#: ../midori/midori-websettings.c:969 +msgid "What type of cookies to accept" +msgstr "قوبۇل قىلىدىغان cookie نىڭ تىپى" + +#: ../midori/midori-websettings.c:985 +msgid "Original cookies only" +msgstr "پەقەتلا ئەسلى cookie" + +# tooltip +#: ../midori/midori-websettings.c:986 +msgid "Accept cookies from the original website only" +msgstr "ئەسلى تورتۇرادىن كەلگەن cookie لارنىلا قوبۇل قىلىدۇ" + +#: ../midori/midori-websettings.c:994 +msgid "Maximum cookie age" +msgstr "Cookie نىڭ ئۆمرى" + +# tooltip +#: ../midori/midori-websettings.c:995 +msgid "The maximum number of days to save cookies for" +msgstr "Cookie نىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى" + +#: ../midori/midori-websettings.c:1012 +msgid "Remember last visited pages" +msgstr "ئەڭ ئاخىرقى قېتىم كۆرگەن بەتنى ئەستە تۇت" + +# tooltip +#: ../midori/midori-websettings.c:1013 +msgid "Whether the last visited pages are saved" +msgstr "ئەڭ ئاخىرقى قېتىم كۆرگەن بەتنى ساقلىۋالىدۇ" + +#: ../midori/midori-websettings.c:1021 +msgid "Maximum history age" +msgstr "ئىزنىڭ ئەڭ ئۇزۇن ۋاقتى" + +# tooltip +#: ../midori/midori-websettings.c:1022 +msgid "The maximum number of days to save the history for" +msgstr "ئىزنىڭ ئەڭ ئۇزۇن ساقلىنىش ۋاقتى" + +#: ../midori/midori-websettings.c:1030 +msgid "Remember last downloaded files" +msgstr "ئەڭ ئاخىرقى قېتىم چۈشۈرگەن ھۆججەتنى ئەستە تۇت" + +# tooltip +#: ../midori/midori-websettings.c:1031 +msgid "Whether the last downloaded files are saved" +msgstr "ئەڭ ئاخىرقى قېتىم چۈشۈرگەن ھۆججەتنى ئەستە تۇتۇۋالىدۇ" + +#: ../midori/midori-websettings.c:1048 +msgid "Proxy server" +msgstr "ۋاكالەتچى مۇلازىمېتىر" + +#: ../midori/midori-websettings.c:1049 +msgid "The type of proxy server to use" +msgstr "ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنىڭ تىپى" + +#: ../midori/midori-websettings.c:1058 +msgid "HTTP Proxy Server" +msgstr "HTTP ۋاكالەتچى مۇلازىمېتىر" + +# tooltip +#: ../midori/midori-websettings.c:1059 +msgid "The proxy server used for HTTP connections" +msgstr "HTTP باغلىنىشىدا ئىشلىتىدىغان ۋاكالەتچى مۇلازىمېتىرنى كۆرسىتىدۇ" + +#: ../midori/midori-websettings.c:1074 +msgid "Detect proxy server automatically" +msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئۆزلۈكىدىن ئۆچۈر" + +# tooltip +#: ../midori/midori-websettings.c:1075 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئۆزلۈكىدىن ئۆچۈرىدۇ" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:1091 +msgid "Identify as" +msgstr "تونۇتۇلىدۇ" + +# tooltip +#: ../midori/midori-websettings.c:1092 +msgid "What to identify as to web pages" +msgstr "قانداقلىرىنى تور بېتى دەپ تونۇتىدىغانلىقىنى بېكىتىدۇ" + +#: ../midori/midori-websettings.c:1108 +msgid "Identification string" +msgstr "تونۇش ھەرپ تىزمىسى" + +# tooltip +#: ../midori/midori-websettings.c:1109 +msgid "The application identification string" +msgstr "پروگراممىنىڭ تونۇش ھەرپ تىزمىسى" + +#: ../midori/midori-websettings.c:1124 +msgid "Preferred languages" +msgstr "ئامراق تىللار" + +#: ../midori/midori-websettings.c:1125 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "كوپ تىللىق بەتلەرنى كۆرسەتكەندە ئالدىن ئويلىشىدىغان تىللارنىڭ تىزىملىكى. مەسىلەن \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" + +# Button title +#: ../midori/midori-websettings.c:1140 +msgid "Clear private data" +msgstr "شەخسىي سانلىق-ئاساسلارنى تازىلا" + +# FIXME: +#: ../midori/midori-websettings.c:1141 +msgid "The private data selected for deletion" +msgstr "تالانغان شەخسىي سانلىق-ئاساسلارنى ئۆچۈرىدۇ" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 +#: ../midori/midori-view.c:4564 +#, c-format +msgid "Error - %s" +msgstr "خاتالىق - %s" + +#: ../midori/midori-view.c:1262 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "بەت '%s' نى ئوقۇغىلى بولمىدى." + +#: ../midori/midori-view.c:1264 +msgid "Try again" +msgstr "قايتا سىناپ كور" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1283 +#, c-format +msgid "Not found - %s" +msgstr "بەت تېپىلمىدى - %s" + +#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#, c-format +msgid "Send a message to %s" +msgstr "%s غا ئۇچۇر ئەۋەتىدۇ" + +#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +msgid "Inspect _Element" +msgstr "ئېلېمېنتلارنى تەكشۈر(_E)" + +#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +msgid "Open Link in New _Tab" +msgstr "ئۇلانمىنى يېڭى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2195 +msgid "Open Link in _Foreground Tab" +msgstr "ئۇلانمىنى ئەڭ ئالدىدىكى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2196 +msgid "Open Link in _Background Tab" +msgstr "ئۇلانمىنى ئەڭ ئاخىرقى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +msgid "Open Link in New _Window" +msgstr "ئۇلانمىنى يېڭى كۆزنەكتە ئاچ(_W)" + +#: ../midori/midori-view.c:2202 +msgid "Open Link as Web A_pplication" +msgstr "ئۇلانمىنى تور پروگراممىسى دەپ قاراپ ئاچ(_P)" + +#: ../midori/midori-view.c:2205 +msgid "Copy Link de_stination" +msgstr "ئۇلانما نىشانىنى كۆچۈر(_S)" + +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +msgid "_Save Link destination" +msgstr "ئۇلانما نىشانىنى ساقلا(_S)" + +#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +msgid "_Download Link destination" +msgstr "ئۇلانما نىشانىنى چۈشۈر(_D)" + +#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 +#: ../midori/midori-view.c:2285 +msgid "Download with Download _Manager" +msgstr "چۈشۈرۈش باشقۇرغۇسىدا چۈشۈر(_M)" + +#: ../midori/midori-view.c:2222 +msgid "Open _Image in New Tab" +msgstr "سۈرەتنى يېڭى بەتكۈچتە ئاچ(_I)" + +#: ../midori/midori-view.c:2225 +msgid "Copy Image _Address" +msgstr "سۈرەت ئادرېسىنى كۆچۈر(_A)" + +#: ../midori/midori-view.c:2228 +msgid "Save I_mage" +msgstr "سۈرەتنى ساقلا(_M)" + +#: ../midori/midori-view.c:2229 +msgid "Download I_mage" +msgstr "سۈرەتنى چۈشۈر(_M)" + +#: ../midori/midori-view.c:2236 +msgid "Copy Video _Address" +msgstr "سىن ئادرېسىنى كۆچۈر(_A)" + +#: ../midori/midori-view.c:2239 +msgid "Save _Video" +msgstr "سىننى ساقلا(_V)" + +#: ../midori/midori-view.c:2239 +msgid "Download _Video" +msgstr "سىننى چۈشۈر(_V)" + +#: ../midori/midori-view.c:2302 +msgid "Search _with" +msgstr "ئىزدە(_W)" + +#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +msgid "_Search the Web" +msgstr "توردا ئىزدە(_S)" + +#: ../midori/midori-view.c:2365 +msgid "Open Address in New _Tab" +msgstr "ئادرېسنى يېڭى بەتكۈچتە ئاچ(_T)" + +#: ../midori/midori-view.c:2661 +msgid "Open or download file" +msgstr "ھۆججەتنى ئاچامسىز، چۈشۈرەمسىز؟" + +#: ../midori/midori-view.c:2680 +#, c-format +msgid "File Type: '%s'" +msgstr "ھۆججەت تىپى: '%s'" + +#: ../midori/midori-view.c:2683 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "ھۆججەت تىپى: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2687 +#, c-format +msgid "Open %s" +msgstr "%s نى ئاچ" + +#: ../midori/midori-view.c:3231 +#, c-format +msgid "Inspect page - %s" +msgstr "بەتنى تەكشۈر - %s" + +#: ../midori/midori-view.c:3513 +msgid "Speed dial" +msgstr "" + +#: ../midori/midori-view.c:3514 +msgid "Click to add a shortcut" +msgstr "چەكسە تېزلەتمىگە قوشۇلىدۇ" + +#: ../midori/midori-view.c:3515 +msgid "Enter shortcut address" +msgstr "تېزلەتمە ئادرېسىنى كىرگۈز" + +#: ../midori/midori-view.c:3516 +msgid "Enter shortcut title" +msgstr "تېزلەتمە ماۋزۇسىنى كىرگۈز" + +#: ../midori/midori-view.c:3517 +msgid "Are you sure you want to delete this shortcut?" +msgstr "بۇ تېزلەتمىنى راستلا ئۆچۈرەمسىز؟" + +#: ../midori/midori-view.c:3518 +msgid "Set number of columns and rows" +msgstr "قۇر ۋە ئىستون نومۇرى" + +#: ../midori/midori-view.c:3519 +msgid "Enter number of columns and rows:" +msgstr "قۇر ۋە ئىستون نومۇرىنى كىرگۈزۈڭ:" + +#: ../midori/midori-view.c:3520 +msgid "Invalid input for the size of the speed dial" +msgstr "كىرگۈزۈلگەن speed dial نىڭ چوڭلۇقى ئىناۋەتسىز" + +#: ../midori/midori-view.c:3521 +msgid "Thumb size:" +msgstr "Thumb چوڭلۇقى:" + +#: ../midori/midori-view.c:3522 +msgid "Small" +msgstr "كىچىك" + +#: ../midori/midori-view.c:3523 +msgid "Medium" +msgstr "ئوتتۇرا" + +#: ../midori/midori-view.c:3524 +msgid "Big" +msgstr "چوڭ" + +#: ../midori/midori-view.c:3550 +#, c-format +msgid "Document cannot be displayed" +msgstr "پۈتۈكنى كۆرسەتكىلى بولمىدى" + +#: ../midori/midori-view.c:3573 +#, c-format +msgid "No documentation installed" +msgstr "پۈتۈك ئورنىتىلمىغان" + +#: ../midori/midori-view.c:3694 +msgid "Page loading delayed" +msgstr "بەتنى ئوقۇش كېچىكتۈرۈلدى" + +#: ../midori/midori-view.c:3695 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "غۇلاش ياكى قوزغىلىش مايىللىقى سەۋەبىدىن ئوقۇش كېچىكتۈرۈلدى." + +#: ../midori/midori-view.c:3696 +msgid "Load Page" +msgstr "بەتنى ئوقۇش" + +#: ../midori/midori-view.c:3840 +msgid "Blank page" +msgstr "بوش بەت" + +#: ../midori/midori-view.c:4100 +msgid "_Duplicate Tab" +msgstr "بەتكۈچنى تۇغدۇر(_D)" + +#: ../midori/midori-view.c:4105 +msgid "_Restore Tab" +msgstr "بەتكۈچنى ئەسلىگە كەلتۈر(_R)" + +#: ../midori/midori-view.c:4105 +msgid "_Minimize Tab" +msgstr "بەتكۈچنى كىچىكلەت(_M)" + +#: ../midori/midori-view.c:4111 +msgid "Close ot_her Tabs" +msgstr "باشقا بەتكۈچلەرنى تاقا(_H)" + +#: ../midori/midori-view.c:4797 +msgid "Print background images" +msgstr "تەگ سۈرىتىنى بېسىپ چىقار" + +# tooltip +#: ../midori/midori-view.c:4798 +msgid "Whether background images should be printed" +msgstr "تەگ سۈرىتىنى بېسىپ چىقىرىدۇ" + +#: ../midori/midori-view.c:4850 ../midori/midori-preferences.c:381 +msgid "Features" +msgstr "ئىقتىدار" + +#. Page "General" +#: ../midori/midori-preferences.c:298 +msgid "General" +msgstr "ئادەتتىكى" + +#: ../midori/midori-preferences.c:299 +msgid "Startup" +msgstr "قوزغات" + +# tooltip +#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +msgid "Use current page as homepage" +msgstr "ھازىرقى بەتنى ماكان بەت قىل" + +#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "ئۇزاتقانلىرى" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:349 +msgid "Appearance" +msgstr "كۆرۈنۈشى" + +#: ../midori/midori-preferences.c:350 +msgid "Font settings" +msgstr "خەت نۇسخا تەڭشەك" + +#: ../midori/midori-preferences.c:352 +msgid "Default Font Family" +msgstr "كۆڭۈلدىكى فونت" + +# tooltip +#: ../midori/midori-preferences.c:355 +msgid "The default font family used to display text" +msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونت" + +# tooltip +#: ../midori/midori-preferences.c:358 +msgid "The default font size used to display text" +msgstr "تېكىستلەرنى كۆرسىتىدىغان كۆڭۈلدىكى فونتنىڭ چوڭلۇقى" + +#: ../midori/midori-preferences.c:360 +msgid "Fixed-width Font Family" +msgstr "تەڭ كەڭلىكتىكى فونت" + +# tooltip +#: ../midori/midori-preferences.c:363 +msgid "The font family used to display fixed-width text" +msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونت" + +# tooltip +#: ../midori/midori-preferences.c:366 +msgid "The font size used to display fixed-width text" +msgstr "تېكىستلەرنى تەڭ كەڭلىكتە كۆرسىتىدىغان فونتنىڭ چوڭلۇقى" + +#: ../midori/midori-preferences.c:368 +msgid "Minimum Font Size" +msgstr "فونتنىڭ ئەڭ كىچىك چوڭلۇقى" + +# tooltip +#: ../midori/midori-preferences.c:371 +msgid "The minimum font size used to display text" +msgstr "تېكىستلەرنى كۆرسىتىدىغان فونتنىڭ ئەڭ كىچىك چوڭلۇقى" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:380 +msgid "Behavior" +msgstr "ھەرىكىتى" + +#: ../midori/midori-preferences.c:393 +msgid "Enforce 96 dots per inch" +msgstr "مەجبۇرىي 96DPI دا كۆرسەت" + +# tooltip +#: ../midori/midori-preferences.c:394 +msgid "Enforce a video dot density of 96 DPI" +msgstr "سىن زىچلىقىنى 96DPI غا توغرىلايدۇ" + +#: ../midori/midori-preferences.c:414 +msgid "Allow scripts to open popups" +msgstr "script ئىشلىتىپ popup چىقىرىشقا رۇخسەت قىل" + +# tooltip +#: ../midori/midori-preferences.c:415 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "script ئىشلىتىپ popup چىقىرىشقا رۇخسەت قىلىدۇ" + +#: ../midori/midori-preferences.c:419 +msgid "Spell Checking" +msgstr "ئىملا تەكشۈرۈش" + +#: ../midori/midori-preferences.c:422 +msgid "Enable Spell Checking" +msgstr "ئىملا تەكشۈرۈش ئىناۋەتلىك" + +# tooltip +#: ../midori/midori-preferences.c:423 +msgid "Enable spell checking while typing" +msgstr "كىرگۈزۈۋاتقاندا ئىملا تەكشۈرىدۇ" + +#: ../midori/midori-preferences.c:425 +msgid "Spelling dictionaries:" +msgstr "ئىملا ئامبىرى:" + +# tooltip +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:429 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "ئىملاسى تەكشۈرۈلىدىغان تىللار(پەش بىلەن ئايرىلىدۇ مەسىلەن: \"en,de_DE\")" + +#. Page "Interface" +#: ../midori/midori-preferences.c:435 +msgid "Interface" +msgstr "كۆرۈنمە يۈز" + +#: ../midori/midori-preferences.c:436 +msgid "Navigationbar" +msgstr "يولچى بالداق" + +#: ../midori/midori-preferences.c:446 +msgid "Browsing" +msgstr "كۆز يۈگۈرت" + +#. Page "Applications" +#: ../midori/midori-preferences.c:468 +msgid "Applications" +msgstr "پروگرامما" + +#: ../midori/midori-preferences.c:469 +msgid "External applications" +msgstr "سىرتقى پروگرامما" + +#. Page "Network" +#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +msgid "Network" +msgstr "تور" + +#: ../midori/midori-preferences.c:492 +msgid "Hostname" +msgstr "مۇلازىمېتىر نامى" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:511 +msgid "Privacy" +msgstr "شەخسىيەت" + +#: ../midori/midori-preferences.c:512 +msgid "Web Cookies" +msgstr "تور Cookie" + +#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +msgid "days" +msgstr "كۈن" + +#: ../midori/midori-searchaction.c:917 +msgid "Add search engine" +msgstr "ئىزدەش ماتورى قوش" + +#: ../midori/midori-searchaction.c:917 +msgid "Edit search engine" +msgstr "ئىزدەش ماتورى تەھرىرلە" + +#: ../midori/midori-searchaction.c:945 +msgid "_Name:" +msgstr "ئاتى(_N):" + +#: ../midori/midori-searchaction.c:989 +msgid "_Icon:" +msgstr "سىنبەلگە(_I):" + +#: ../midori/midori-searchaction.c:1003 +msgid "_Token:" +msgstr "ماياق(_T):" + +#: ../midori/midori-searchaction.c:1234 +msgid "Manage Search Engines" +msgstr "ئىزدەش ماتورىنى باشقۇرۇش" + +#: ../midori/midori-searchaction.c:1335 +msgid "Use as _default" +msgstr "كۆڭۈلدىكى قىلىپ ئىشلەت(_D)" + +#: ../midori/sokoke.c:1287 +msgid "_Bookmark" +msgstr "خەتكۈش(_B)" + +#: ../midori/sokoke.c:1289 +msgid "Add Boo_kmark" +msgstr "خەتكۈش قوش(_K)" + +#: ../midori/sokoke.c:1290 +msgid "_Console" +msgstr "كۆزنەك(_C)" + +#: ../midori/sokoke.c:1291 +msgid "_Extensions" +msgstr "كېڭەيتمىلەر(_E)" + +#: ../midori/sokoke.c:1292 +msgid "_History" +msgstr "ئىز(_H)" + +#: ../midori/sokoke.c:1293 +msgid "_Homepage" +msgstr "ماكان بەت(_H)" + +#: ../midori/sokoke.c:1294 +msgid "_Userscripts" +msgstr "_Userscripts" + +#: ../midori/sokoke.c:1295 +msgid "New _Tab" +msgstr "يېڭى بەتكۈچ(_T)" + +#: ../midori/sokoke.c:1296 +msgid "_Transfers" +msgstr "ئۇزىتىش(_T)" + +#: ../midori/sokoke.c:1297 +msgid "Netscape p_lugins" +msgstr "Netscape قىستۇرمىلىرى(_L)" + +#: ../midori/sokoke.c:1300 +msgid "New _Folder" +msgstr "يېڭى مۇندەرىجە(_F)" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "ھۆججەت '%s' چۈشۈرۈلدى." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "ئۇزىتىش تاماملاندى" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +msgid "Clear All" +msgstr "ھەممىنى تازىلا" + +#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +msgid "Some files are being downloaded" +msgstr "بەزى ھۆججەتلەر چۈشۈرۈلىدۇ" + +#: ../toolbars/midori-transferbar.c:284 +msgid "_Quit Midori" +msgstr "Midori نى ئاخىرلاشتۇر(_Q)" + +#: ../toolbars/midori-transferbar.c:286 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Midori ئاخىرلاشتۇرۇلسا ئۇزىتىشلار ئۈزۈلىدۇ." + +#: ../panels/midori-bookmarks.c:109 +msgid "Bookmarks" +msgstr "خەتكۈش" + +#: ../panels/midori-bookmarks.c:244 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "خەتكۈش تۇرىنى ئېچىش مەغلۇپ بولدى: %s\n" + +# tooltip +#: ../panels/midori-bookmarks.c:430 +msgid "Edit the selected bookmark" +msgstr "تاللانغان خەتكۈچنى تەھرىرلەيدۇ" + +# tooltip +#: ../panels/midori-bookmarks.c:438 +msgid "Delete the selected bookmark" +msgstr "تاللانغان خەتكۈچنى ئۆچۈرىدۇ" + +#: ../panels/midori-bookmarks.c:451 +msgid "Add a new folder" +msgstr "يېڭى مۇندەرىجە قوش" + +#: ../panels/midori-bookmarks.c:585 +msgid "Separator" +msgstr "ئايرىغۇچ" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "كۆزنەك" + +# tooltip +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "ھەممىنى كۆچۈر(_A)" + +# tooltip +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "ھەممىنى كۆچۈر" + +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "كېڭەيتىلمە" + +#: ../panels/midori-history.c:273 +msgid "Erroneous clock time" +msgstr "ۋاقىت خاتالىقى" + +#: ../panels/midori-history.c:274 +msgid "" +"The clock time lies in the past. Please check the current date and time." +msgstr " " + +#: ../panels/midori-history.c:286 +msgid "A week ago" +msgstr "بىر ھەپتە بۇرۇن" + +#: ../panels/midori-history.c:288 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d كۈن بۇرۇن" + +#: ../panels/midori-history.c:291 +msgid "Today" +msgstr "بۈگۈن" + +#: ../panels/midori-history.c:293 +msgid "Yesterday" +msgstr "تۈنۈگۈن" + +#: ../panels/midori-history.c:378 +msgid "Are you sure you want to remove all history items?" +msgstr "بارلىق ئىزلارنى ئۆچۈرەمسىز؟" + +# tooltip +#: ../panels/midori-history.c:437 +msgid "Bookmark the selected history item" +msgstr "تاللانغان ئىزنى خەتكۈچكە قوشىدۇ" + +# tooltip +#: ../panels/midori-history.c:446 +msgid "Delete the selected history item" +msgstr "تاللانغان ئىزنى ئۆچۈرىدۇ" + +# tooltip +#: ../panels/midori-history.c:454 +msgid "Clear the entire history" +msgstr "بارلىق ئىزنى تازىلايدۇ" + +#: ../panels/midori-history.c:952 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "سۈزگۈچ:" + +#: ../panels/midori-transfers.c:478 +msgid "Open Destination _Folder" +msgstr "نىشان مۇندەرىجىنى ئاچ(_F)" + +#: ../panels/midori-transfers.c:481 +msgid "Copy Link Loc_ation" +msgstr "ئۇلانما ئورنىنى كۆچۈر(_A)" + +#: ../katze/katze-http-auth.c:214 +msgid "Authentication Required" +msgstr "دەلىللەش زۆرۈر" + +#: ../katze/katze-http-auth.c:230 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "بۇ ئورۇننى ئېچىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم\n" +"زۆرۈردۇر:" + +#: ../katze/katze-http-auth.c:244 +msgid "Username" +msgstr "ئىشلەتكۈچى ئاتى" + +#: ../katze/katze-http-auth.c:257 +msgid "Password" +msgstr "ئىم" + +#: ../katze/katze-http-auth.c:272 +msgid "_Remember password" +msgstr "ئىمنى ئەستە تۇتۇۋال(_R)" + +#: ../katze/katze-throbber.c:882 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "'%s' ئاتلىق سىنبەلگىنى ئوقۇيالمىدى" + +#: ../katze/katze-throbber.c:895 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Stock سىنبەلگە '%s' نى ئوقۇيالمىدى" + +#: ../katze/katze-throbber.c:963 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "'%s' بولسا %s نىڭ خاسلىقى ئەمەس" + +#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +msgid "Choose file" +msgstr "ھۆججەت تاللا" + +#: ../katze/katze-utils.c:559 +msgid "Choose folder" +msgstr "مۇندەرىجە تاللا" + +#: ../katze/katze-preferences.c:95 +#, c-format +msgid "Preferences for %s" +msgstr "%s نى تەڭشە" + +#: ../extensions/adblock.c:415 +msgid "Configure Advertisement filters" +msgstr "ئېلان سۈزگۈچىنى تەڭشە" + +#: ../extensions/adblock.c:447 +#, c-format +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" + +#: ../extensions/adblock.c:587 +msgid "Configure _Advertisement filters..." +msgstr "ئېلان سۈزگۈچىنى تەڭشە(_A)..." + +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "تۇزۇم تەھرىرلە" + +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "تۇزۇم(_R):" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "سۈرەتنى چەكلە(_O)" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "ئۇلانمىنى چەكلە(_O)" + +#: ../extensions/adblock.c:1489 +msgid "Advertisement blocker" +msgstr "ئېلان چەكلىگۈ" + +# description +#: ../extensions/adblock.c:1490 +msgid "Block advertisements according to a filter list" +msgstr "سۈزگۈچ تىزىملىكىگە ئاساسەن ئېلاننى چەكلەيدۇ" + +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "%s نى مۇندەرىجە %s غا كۆچۈرىدۇ." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Userscripts" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "ئىشلەتكۈچى ئۇسلۇبى" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "كېڭەيتىلمە '%s' نىڭ تەڭشىكىنى ساقلىغىلى بولمىدى: %s\n" + +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +msgid "User addons" +msgstr "ئىشلەتكۈچى قوشۇلمىسى" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "مۇندەرىجە '%s' نى كۆزەتكىلى بولمىدى: %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "userscripts ۋە ئىشلەتكۈچى ئۇسلۇبىنى ئىشلەتكىلى بولىدۇ" + +#: ../extensions/colorful-tabs.c:204 +msgid "Colorful Tabs" +msgstr "رەڭلىك بەتكۈچلەر" + +# description +#: ../extensions/colorful-tabs.c:205 +msgid "Tint each tab distinctly" +msgstr "ھەر بىر بەتكۈچنى ئوخشىمىغان رەڭدە كۆرسەت" + +#: ../extensions/cookie-manager/cookie-manager-page.c:82 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "Cookie باشقۇرغۇ" + +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Delete All" +msgstr "ھەممىنى ئۆچۈر…" + +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "كۆرۈنگەن ھەممە cookie نى ئۆچۈرىدۇ. ئەگەر سۈزگۈچ بار بولسا، سۈزۈلگەننىلا ئۆچۈرىدۇ." + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:129 +msgid "Expand All" +msgstr "ھەممىنى ياي" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:136 +msgid "Collapse All" +msgstr "ھەممىنى قاتلا" + +#: ../extensions/cookie-manager/cookie-manager-page.c:578 +msgid "Do you really want to delete all cookies?" +msgstr "ھەممە cookie راستلا ئۆچۈرەمسىز؟" + +# Dialog title +#: ../extensions/cookie-manager/cookie-manager-page.c:580 +msgid "Question" +msgstr "سوئال" + +#: ../extensions/cookie-manager/cookie-manager-page.c:589 +msgid "Only cookies which match the filter will be deleted." +msgstr "سۈزۈلگەن cookie نىلا ئۆچۈرىدۇ." + +#: ../extensions/cookie-manager/cookie-manager-page.c:677 +msgid "At the end of the session" +msgstr "ئەڭگىمەنىڭ ئاخىرىغىچە" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "Host: %s\n" +"ئاتى: %s\n" +"قىممىتى: %s\n" +"يولى: %s\n" +"بىخەتەر: %s\n" +"مۇددىتى: %s" + +# cookie: Secure flag is set. +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "Yes" +msgstr "ھەئە" + +# cookie: Secure flag isn't set. +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "No" +msgstr "ياق" + +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "Domain: %s\n" +"Cookie سانى: %d" + +# Column name of cookie browser +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +msgid "Name" +msgstr "ئاتى" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +msgid "_Expand All" +msgstr "ھەممىنى ياي(_E)" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +msgid "_Collapse All" +msgstr "ھەممىنى قاتلا(_C)" + +# tooltip +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "Cookie باشقۇرغۇ(_C)" + +# description +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "Cookie نى تىزىپ كۆرسىتىدۇ، كۆرىدۇ، ئۆچۈرىدۇ" + +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ(_A)" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "بەتكۈچ ئادرېسىنى كۆچۈرىدۇ" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "بارلىق بەتكۈچنىڭ ئادرېسىنى clipboard قا كۆچۈرىدۇ" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "XML غا زۆرۈر بولغان Atom \"entry\" ئېلېمېنتى تېپىلمىدى." + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "XML غا زۆرۈر بولغان Atom \"feed\" ئېلېمېنتى تېپىلمىدى." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "يېڭىلانغان ۋاقتى: %s" + +#: ../extensions/feed-panel/feed-panel.c:670 +msgid "Feeds" +msgstr "Feeds" + +#: ../extensions/feed-panel/feed-panel.c:723 +msgid "Add new feed" +msgstr "يېڭى feed قوش" + +#: ../extensions/feed-panel/feed-panel.c:730 +msgid "Delete feed" +msgstr "feed ئۆچۈر" + +#: ../extensions/feed-panel/feed-panel.c:812 +msgid "_Feeds" +msgstr "feed(_F)" + +#: ../extensions/feed-panel/feed-parse.c:192 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "feed XML ئىچىدىن root ئېلېمېنتىنى تېپىش مەغلۇپ بولدى" + +#: ../extensions/feed-panel/feed-parse.c:232 +#, c-format +msgid "Unsupported feed format." +msgstr "بۇ خىل feed فورماتىنى تېخى ئىشلەتكىلى بولمايدۇ" + +#: ../extensions/feed-panel/feed-parse.c:262 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "XML feed نى تەھلىل قىلىش مەغلۇپ بولدى: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "RSS XML ئىچىدىن \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "RSS نىڭ بۇ نەشرىنى تېخى ئىشلىتەلمەيمەن" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "XML ئىچىدىن زۆرۈر بولغان RSS \"item\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى." + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "XML ئىچىدىن زۆرۈر بولغان RSS \"channel\" ئېلېمېنتىنى تېپىش مەغلۇپ بولدى." + +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "خاتالىق" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Feed '%s' ئاللىقاچان بار" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Feed '%s' ئوقۇشتا خاتالىق كۆرۈلدى" + +#: ../extensions/feed-panel/main.c:516 +msgid "Feed Panel" +msgstr "Feed Panel" + +# description +#: ../extensions/feed-panel/main.c:517 +msgid "Read Atom/ RSS feeds" +msgstr "Atom/RSS Feedنى ئوقۇۋاتىدۇ" + +#: ../extensions/formhistory.c:144 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "form قىممىتىنى قوشۇش مەغلۇپ بولدى: %s\n" + +#: ../extensions/formhistory.c:510 +msgid "Stores history of entered form data" +msgstr "form كىرگۈزۈلگەن ئۇچۇرلارنى ئەستە ساقلىۋالىدۇ" + +#: ../extensions/formhistory.c:514 +#, c-format +msgid "Not available: %s" +msgstr "ئىشلەتكىلى بولمايدۇ: %s" + +#: ../extensions/formhistory.c:515 +msgid "Resource files not installed" +msgstr "Resource ھۆججىتى ئورنىتىلمىغان" + +#: ../extensions/formhistory.c:521 +msgid "Form history filler" +msgstr "ئىز تولدۇرغۇدىن" + +#: ../extensions/mouse-gestures.c:303 +msgid "Mouse Gestures" +msgstr "چاشقىنەك ئىشارىتى" + +# description +#: ../extensions/mouse-gestures.c:304 +msgid "Control Midori by moving the mouse" +msgstr "چاشقىنەك ھەرىكىتىدە Midori نى باشقۇرىدۇ" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Pageholder" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "Pageholder(P)" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "بەتكۈچلەردە بىر ياكى كوپ بەتلەرنى پاراللېل ئاچسۇن" + +#: ../extensions/shortcuts.c:170 +msgid "Customize Keyboard shortcuts" +msgstr "كۇنۇپكا تېزلەتمىسىنى ئۆزلەشتۈر" + +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." +msgstr "تېزلەتمىنى ئۆزلەشتۈر(_O)..." + +#: ../extensions/shortcuts.c:315 +msgid "Shortcuts" +msgstr "تېزلەتمە" + +# description +#: ../extensions/shortcuts.c:316 +msgid "View and edit keyboard shortcuts" +msgstr "كۇنۇپكا تېزلەتمىسىنى كۆرىدۇ ۋە تەھرىرلەيدۇ" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "سۈرەتلەر" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "Scripts" + +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Netscape قىستۇرمىلىرى" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "ھالەت بالدىقى ئالاھىدىلىكلىرى" + +# description +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +msgid "Tab Panel" +msgstr "بەتكۈچ Panel" + +#: ../extensions/tab-panel.c:609 +msgid "T_ab Panel" +msgstr "بەتكۈچ Panel(_A)" + +# description +#: ../extensions/tab-panel.c:626 +msgid "Show tabs in a vertical panel" +msgstr "بەتكۈچلەرنى تىك panel دا كۆرسىتىدۇ" + +#: ../extensions/tab-switcher.c:402 +msgid "Tab History List" +msgstr "بەتكۈچ ئىزى تىزىملىكى" + +#: ../extensions/tab-switcher.c:403 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" + +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "يېڭى بەتكۈچنى ئەڭ كىچىك قىل" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "يېڭى بەتكۈچنى ئەڭ كىچىك ھالەتتە ئاچىدۇ" + +#: ../extensions/toolbar-editor.c:389 +msgid "Customize Toolbar" +msgstr "قورال ئىستونىنى ئۆزى بەلگىلەش" + +#: ../extensions/toolbar-editor.c:405 +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "قورال بالدىقىدا كۆرسىتىلىدىغان تۈرلەرنى تاللا. ئۇلارنى ئۇنىڭ تەرتىپىنى تۇتۇپ تاشلاپ ئۆزگەرتىشكە بولىدۇ" + +#: ../extensions/toolbar-editor.c:421 +msgid "Available Items" +msgstr "بار تۈرلەر" + +#: ../extensions/toolbar-editor.c:442 +msgid "Displayed Items" +msgstr "كۆرسىتىدىغان تۈرلەر" + +#: ../extensions/toolbar-editor.c:577 +msgid "Customize _Toolbar..." +msgstr "قورال بالدىقىنى ئۆزلەشتۈر(_T)..." + +#: ../extensions/toolbar-editor.c:608 +msgid "Toolbar Editor" +msgstr "قورال بالدىقى تەھرىرلىگۈ" + +# description +#: ../extensions/toolbar-editor.c:609 +msgid "Easily edit the toolbar layout" +msgstr "قورال بالدىقىنىڭ ئورۇنلاشتۇرۇلۇشىنى ئاسانلا تەھرىرلىگىلى بولىدۇ" + +#: ../extensions/web-cache.c:465 +msgid "Cache HTTP communication on disk" +msgstr "HTTP ئالاقىسىنى دىسكىغا غەملەيدۇ" From 2350fc0834ca4c174bf16ff8e21bad82184eec7e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 29 Jul 2010 15:03:18 +0200 Subject: [PATCH 2867/2970] Disconnect settings and bookmarkbar when disposing --- midori/midori-browser.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0ee09e06..1ac1d40e 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -5968,6 +5968,10 @@ midori_browser_dispose (GObject* object) /* We are done, the session mustn't change anymore */ katze_object_assign (browser->proxy_array, NULL); + g_signal_handlers_disconnect_by_func (browser->settings, + midori_browser_settings_notify, + browser); + midori_browser_set_bookmarks (browser, NULL); G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object); } @@ -5977,14 +5981,9 @@ midori_browser_finalize (GObject* object) { MidoriBrowser* browser = MIDORI_BROWSER (object); - g_signal_handlers_disconnect_by_func (browser->settings, - midori_browser_settings_notify, - browser); - katze_assign (browser->statusbar_text, NULL); katze_object_assign (browser->settings, NULL); - katze_object_assign (browser->bookmarks, NULL); katze_object_assign (browser->trash, NULL); katze_object_assign (browser->search_engines, NULL); katze_object_assign (browser->history, NULL); @@ -6448,16 +6447,15 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, { MidoriWebSettings* settings; + settings = midori_browser_get_settings (browser); + g_signal_handlers_disconnect_by_func (settings, + midori_browser_show_bookmarkbar_notify_value_cb, browser); + katze_object_assign (browser->bookmarks, bookmarks); + if (!bookmarks) return; - if (!browser->bookmarks) - { - g_object_ref (bookmarks); - katze_object_assign (browser->bookmarks, bookmarks); - } - - settings = midori_browser_get_settings (browser); + g_object_ref (bookmarks); g_signal_connect (settings, "notify::show-bookmarkbar", G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser); g_object_notify (G_OBJECT (settings), "show-bookmarkbar"); From a724d883b1e1cb3a1f910eec64152502494a3cee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 29 Jul 2010 15:18:27 +0200 Subject: [PATCH 2868/2970] Synchronize browser and panel toolbar style --- midori/midori-browser.c | 6 ++++++ midori/midori-panel.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1ac1d40e..b38dcb11 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -210,6 +210,10 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, GParamSpec* pspec, MidoriBrowser* browser); +void +midori_panel_set_toolbar_style (MidoriPanel* panel, + GtkToolbarStyle style); + static void midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks); @@ -6026,6 +6030,8 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser, gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar), gtk_toolbar_style); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), icon_size); + midori_panel_set_toolbar_style (MIDORI_PANEL (browser->panel), + gtk_toolbar_style); } static gboolean diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 33618ae3..694fc87c 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -1150,3 +1150,14 @@ midori_panel_append_widget (MidoriPanel* panel, G_CALLBACK (midori_panel_widget_destroy_cb), viewable); return midori_panel_append_page (panel, MIDORI_VIEWABLE (viewable)); } + +/* Private function, used by MidoriBrowser */ +void +midori_panel_set_toolbar_style (MidoriPanel* panel, + GtkToolbarStyle style) +{ + g_return_if_fail (MIDORI_IS_PANEL (panel)); + + gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), style); +} + From 6b54f9e8b5191c6f72517bab8f8e7d6dfad83fdf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 29 Jul 2010 15:39:16 +0200 Subject: [PATCH 2869/2970] Remove the obsolete MidoriPanel::menu property --- midori/midori-browser.c | 1 - midori/midori-panel.c | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b38dcb11..91b6d9e1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -5864,7 +5864,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (hpaned); browser->panel = g_object_new (MIDORI_TYPE_PANEL, "action-group", browser->action_group, - "menu", browser->menu_tools, NULL); g_object_connect (browser->panel, "signal::notify::page", diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 694fc87c..9747b342 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -38,7 +38,6 @@ struct _MidoriPanel GtkWidget* toolbook; GtkWidget* notebook; GtkActionGroup* action_group; - GtkMenu* menu; gboolean show_titles; gboolean show_controls; @@ -63,7 +62,6 @@ enum PROP_SHADOW_TYPE, PROP_ACTION_GROUP, - PROP_MENU, PROP_PAGE, PROP_SHOW_TITLES, PROP_SHOW_CONTROLS, @@ -165,24 +163,6 @@ midori_panel_class_init (MidoriPanelClass* class) GTK_TYPE_ACTION_GROUP, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /** - * MidoriWebSettings:menu: - * - * This is the menu that holds the panel menu items. - * - * You shouldn't use this menu or add items. - * - * Deprecated: 0.1.9 - */ - g_object_class_install_property (gobject_class, - PROP_MENU, - g_param_spec_object ( - "menu", - "Menu", - "Menu to hold panel items", - GTK_TYPE_MENU, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_PAGE, g_param_spec_int ( @@ -508,9 +488,6 @@ midori_panel_set_property (GObject* object, case PROP_ACTION_GROUP: katze_object_assign (panel->action_group, g_value_dup_object (value)); break; - case PROP_MENU: - katze_object_assign (panel->menu, g_value_dup_object (value)); - break; case PROP_PAGE: midori_panel_set_current_page (panel, g_value_get_int (value)); break; @@ -556,9 +533,6 @@ midori_panel_get_property (GObject* object, case PROP_ACTION_GROUP: g_value_set_object (value, panel->action_group); break; - case PROP_MENU: - g_value_set_object (value, panel->menu); - break; case PROP_PAGE: g_value_set_int (value, midori_panel_get_current_page (panel)); break; From 1550c9d9f237587482c71a979dfe6d7b50421c0c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 29 Jul 2010 15:54:11 +0200 Subject: [PATCH 2870/2970] Don't' declare 'unescaped' twice in sokoke_format_uri_for_display --- midori/sokoke.c | 1 - 1 file changed, 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 909f7113..aafe379c 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -765,7 +765,6 @@ sokoke_uri_unescape_string (const gchar* uri) gchar* sokoke_format_uri_for_display (const gchar* uri) { - gchar* unescaped; if (uri && g_str_has_prefix (uri, "http://")) { gchar* unescaped = sokoke_uri_unescape_string (uri); From 5b640c7f46ce454c71011e3f123478933cb42c98 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jul 2010 01:21:50 +0200 Subject: [PATCH 2871/2970] Store address of bookmarks for tooltip as a string in the model --- katze/katze-utils.c | 4 +++- panels/midori-bookmarks.c | 3 ++- panels/midori-history.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 39c70583..dc7f7946 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1138,8 +1138,10 @@ katze_bookmark_populate_tree_view (KatzeArray* array, { if (KATZE_ITEM_IS_BOOKMARK (child)) { + gchar* tooltip = g_markup_escape_text (katze_item_get_uri (child), -1); gtk_tree_store_insert_with_values (model, NULL, parent, - 0, 0, child, -1); + 0, 0, child, 1, tooltip, -1); + g_free (tooltip); } else { diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 1f94c897..b572a98c 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -941,9 +941,10 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) gtk_box_pack_start (GTK_BOX (bookmarks), box, FALSE, FALSE, 5); /* Create the treeview */ - model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); diff --git a/panels/midori-history.c b/panels/midori-history.c index 1af95429..d8aed73f 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -892,9 +892,10 @@ midori_history_init (MidoriHistory* history) gtk_box_pack_start (GTK_BOX (history), box, FALSE, FALSE, 5); /* Create the treeview */ - model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); From 60eca91b74449e511041432ddfcd0268bab6bc6f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jul 2010 01:29:57 +0200 Subject: [PATCH 2872/2970] Do NULL-safe address comparison when loading the session --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index fd5ec988..35ac8c78 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1259,7 +1259,7 @@ midori_load_session (gpointer data) midori_browser_set_current_page (browser, current); if (!(item = katze_array_get_nth_item (_session, current))) item = katze_array_get_nth_item (_session, 0); - if (!strcmp (katze_item_get_uri (item), "")) + if (!g_strcmp0 (katze_item_get_uri (item), "")) midori_browser_activate_action (browser, "Location"); g_object_unref (settings); From 34d7a8033bf718a815130e8a7e682cdeae1485e2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jul 2010 01:42:14 +0200 Subject: [PATCH 2873/2970] Use KatzeArray* to signal new items to MidoriHistory --- midori/midori-browser.c | 4 ++++ panels/midori-history.c | 51 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 91b6d9e1..f3d1d71a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -5389,6 +5389,10 @@ midori_browser_new_history_item (MidoriBrowser* browser, sqlite3_errmsg (db)); sqlite3_reset (stmt); sqlite3_clear_bindings (stmt); + + /* FIXME: Workaround for the lack of a database interface */ + katze_array_add_item (browser->history, item); + katze_array_remove_item (browser->history, item); } static void diff --git a/panels/midori-history.c b/panels/midori-history.c index d8aed73f..f681ddc3 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -408,6 +408,51 @@ midori_history_viewable_iface_init (MidoriViewableIface* iface) iface->get_toolbar = midori_history_get_toolbar; } +static void +midori_history_add_item_cb (KatzeArray* array, + KatzeItem* item, + MidoriHistory* history) +{ + GtkTreeView* treeview = GTK_TREE_VIEW (history->treeview); + GtkTreeModel* model = gtk_tree_view_get_model (treeview); + GtkTreeIter iter; + KatzeItem* today; + time_t current_time; + + current_time = time (NULL); + if (gtk_tree_model_iter_children (model, &iter, NULL)) + { + gint64 day; + gboolean has_today; + + gtk_tree_model_get (model, &iter, 0, &today, -1); + + day = katze_item_get_added (today); + has_today = sokoke_days_between ((time_t*)&day, ¤t_time) == 0; + g_object_unref (today); + if (has_today) + { + gchar* tooltip = g_markup_escape_text (katze_item_get_uri (item), -1); + KatzeItem* copy = katze_item_copy (item); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), NULL, &iter, + 0, 0, copy, 1, tooltip, -1); + g_object_unref (copy); + g_free (tooltip); + return; + } + } + + today = (KatzeItem*)katze_array_new (KATZE_TYPE_ITEM); + katze_item_set_added (today, current_time); + katze_item_set_meta_integer (today, "day", + sokoke_time_t_to_julian (¤t_time)); + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter, NULL, + 0, 0, today, -1); + /* That's an invisible dummy, so we always have an expander */ + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), NULL, &iter, + 0, 0, NULL, -1); +} + static void midori_history_set_app (MidoriHistory* history, MidoriApp* app) @@ -416,7 +461,9 @@ midori_history_set_app (MidoriHistory* history, if (history->array) { - g_object_unref (history->array); + g_signal_handlers_disconnect_by_func (history->array, + midori_history_add_item_cb, history); + katze_object_assign (history->array, NULL); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); gtk_tree_store_clear (GTK_TREE_STORE (model)); } @@ -427,6 +474,8 @@ midori_history_set_app (MidoriHistory* history, g_object_ref (app); history->array = katze_object_get_object (app, "history"); + g_signal_connect (history->array, "add-item", + G_CALLBACK (midori_history_add_item_cb), history); model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); if (history->array) midori_history_read_from_db_to_model (history, GTK_TREE_STORE (model), NULL, 0, NULL); From 2d1d19de23be79c7274b55fd1507fde126adb022 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 31 Jul 2010 13:59:48 +0200 Subject: [PATCH 2874/2970] Remove freeze, thaw and set_uri from MidoriLocationAction --- midori/midori-browser.c | 10 ++++---- midori/midori-locationaction.c | 47 ---------------------------------- midori/midori-locationaction.h | 10 -------- 3 files changed, 5 insertions(+), 62 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f3d1d71a..0e3e7633 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -406,7 +406,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); if (text && *text) { - midori_location_action_set_uri (location_action, browser->statusbar_text); + midori_location_action_set_text (location_action, browser->statusbar_text); midori_location_action_set_icon (location_action, NULL); midori_location_action_set_secondary_icon (location_action, NULL); } @@ -421,7 +421,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, else midori_location_action_set_secondary_icon ( location_action, GTK_STOCK_JUMP_TO); - midori_location_action_set_uri (location_action, + midori_location_action_set_text (location_action, midori_view_get_display_uri (MIDORI_VIEW (view))); midori_location_action_set_icon (location_action, midori_view_get_icon (MIDORI_VIEW (view))); @@ -556,7 +556,7 @@ midori_view_notify_load_status_cb (GtkWidget* widget, { if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) { - midori_location_action_set_uri ( + midori_location_action_set_text ( MIDORI_LOCATION_ACTION (action), uri); midori_location_action_set_secondary_icon ( MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); @@ -601,7 +601,7 @@ midori_view_notify_uri_cb (GtkWidget* view, { const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); GtkAction* action = _action_by_name (browser, "Location"); - midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); + midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); } } @@ -3492,7 +3492,7 @@ _action_location_reset_uri (GtkAction* action, const gchar* uri; uri = midori_browser_get_current_uri (browser); - midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); + midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri); } diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 29484d9e..5b77ac58 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -568,34 +568,6 @@ midori_location_action_entry_for_proxy (GtkWidget* proxy) return entry; } -/** - * midori_location_action_freeze: - * @location_action: a #MidoriLocationAction - * - * Freezing of the action doesn't do anything. - * - * Deprecated: 0.2.3 - **/ -void -midori_location_action_freeze (MidoriLocationAction* location_action) -{ - /* Nothing to do */ -} - -/** - * midori_location_action_thaw: - * @location_action: a #MidoriLocationAction - * - * Thawing of the action doesn't do anything. - * - * Deprecated: 0.2.3 - **/ -void -midori_location_action_thaw (MidoriLocationAction* location_action) -{ - /* Nothing to do */ -} - static void midori_location_action_init (MidoriLocationAction* location_action) { @@ -1433,25 +1405,6 @@ midori_location_action_set_text (MidoriLocationAction* location_action, g_object_unref (icon); } -/** - * midori_location_action_set_uri: - * @location_action: a #MidoriLocationAction - * @uri: an URI string - * - * Sets the entry URI to @uri and, if applicable, updates the icon. - * - * Deprecated: 0.2.0 - **/ -void -midori_location_action_set_uri (MidoriLocationAction* location_action, - const gchar* uri) -{ - g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); - g_return_if_fail (uri != NULL); - - midori_location_action_set_text (location_action, uri); -} - /** * midori_location_action_set_icon: * @location_action: a #MidoriLocationAction diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index 3decc542..fd70e9cf 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -36,12 +36,6 @@ typedef struct _MidoriLocationActionClass MidoriLocationActionClass; GType midori_location_action_get_type (void) G_GNUC_CONST; -void -midori_location_action_freeze (MidoriLocationAction* location_action); - -void -midori_location_action_thaw (MidoriLocationAction* location_action); - const gchar* midori_location_action_get_text (MidoriLocationAction* location_action); @@ -52,10 +46,6 @@ midori_location_action_set_text (MidoriLocationAction* location_acti const gchar* midori_location_action_get_uri (MidoriLocationAction* location_action); -void -midori_location_action_set_uri (MidoriLocationAction* location_action, - const gchar* uri); - void midori_location_action_set_icon (MidoriLocationAction* location_action, GdkPixbuf* icon); From 13ffa17f2bd4a00d0f0fd5e2f9709195f1b97555 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 7 Aug 2010 15:14:58 +0200 Subject: [PATCH 2875/2970] Correctly load settings and cookies with --config in app mode --- midori/main.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/midori/main.c b/midori/main.c index 35ac8c78..1eabbcea 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1698,19 +1698,21 @@ main (int argc, midori_startup_timer ("Browser: \t%f"); if (config) { - gchar* random_name; - gchar* app_name; + SoupSession* session; + SoupCookieJar* jar; - random_name = g_strdup_printf ("app%u", g_random_int ()); - app_name = g_strconcat ("midori", "_", random_name, NULL); - app = g_object_new (MIDORI_TYPE_APP, "name", app_name, NULL); - g_free (random_name); - g_free (app_name); - - config_file = build_config_filename ("config"); + config_file = g_build_filename (config, "config", NULL); settings = settings_new_from_file (config_file, &extensions); g_free (config_file); g_strfreev (extensions); + + session = webkit_get_default_session (); + config_file = g_build_filename (config, "cookies.txt", NULL); + jar = soup_cookie_jar_text_new (config_file, TRUE); + g_free (config_file); + soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar)); + g_object_unref (jar); + } else settings = katze_object_get_object (browser, "settings"); From 05065e521d4db5bcef4da221d9027497a14d1ca4 Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Sat, 7 Aug 2010 15:20:09 +0200 Subject: [PATCH 2876/2970] Decrement n after clearing individual transfer items --- panels/midori-transfers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index 8292010e..d8ccaf1c 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -112,7 +112,10 @@ midori_transfers_button_clear_clicked_cb (GtkToolItem* toolitem, status = webkit_download_get_status (download); if (status == WEBKIT_DOWNLOAD_STATUS_FINISHED || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED) + { gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + n--; /* Decrement n since we just removed it */ + } g_object_unref (download); #endif } From 0870196942343ce4c33034e47174b8bd65ee0e2b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 7 Aug 2010 15:30:56 +0200 Subject: [PATCH 2877/2970] Show tooltip text on tab icon, not only the label --- midori/midori-view.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 40083a8f..58276433 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -97,7 +97,6 @@ struct _MidoriView GtkWidget* menu_item; GtkWidget* tab_label; - /* GtkWidget* tooltip_image; */ GtkWidget* tab_icon; GtkWidget* tab_title; GtkWidget* tab_close; @@ -650,9 +649,8 @@ midori_view_update_title (MidoriView* view) soup_uri_free (uri); } gtk_label_set_text (GTK_LABEL (view->tab_title), title); - #if 1 + gtk_widget_set_tooltip_text (view->tab_icon, title); gtk_widget_set_tooltip_text (view->tab_title, title); - #endif } if (view->menu_item) gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN ( @@ -4179,23 +4177,6 @@ midori_view_tab_label_parent_set (GtkWidget* tab_label, } } -#if 0 -static gboolean -midori_view_tab_label_query_tooltip_cb (GtkWidget* tab_label, - gint x, - gint y, - gboolean keyboard, - GtkTooltip* tooltip, - MidoriView* view) -{ - if (view->speed_dial_in_new_tabs) - gtk_tooltip_set_icon (tooltip, midori_view_get_snapshot (view, -160, -107)); - else - gtk_tooltip_set_text (tooltip, midori_view_get_display_title (view)); - return TRUE; -} -#endif - /** * midori_view_get_label_ellipsize: * @view: a #MidoriView @@ -4296,11 +4277,6 @@ midori_view_get_proxy_tab_label (MidoriView* view) G_CALLBACK (midori_view_tab_close_clicked), view); view->tab_label = event_box; - #if 0 - gtk_widget_set_has_tooltip (view->tab_label, TRUE); - g_signal_connect (view->tab_label, "query-tooltip", - G_CALLBACK (midori_view_tab_label_query_tooltip_cb), view); - #endif g_signal_connect (view->tab_icon, "destroy", G_CALLBACK (gtk_widget_destroyed), &view->tab_icon); From aac70d52b5c4e83148adecb1f91ad01202eae101 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 7 Aug 2010 15:46:33 +0200 Subject: [PATCH 2878/2970] Strip whitespace and line breaks off git version string --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index fe331612..e3c36ee1 100644 --- a/wscript +++ b/wscript @@ -37,7 +37,7 @@ VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: git = Utils.cmd_output (['git', 'describe'], silent=True) if git: - VERSION = git + VERSION = git.strip () except: pass From 8015f39fe61cb6b34da5c48b72734613622a6dff Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Aug 2010 22:41:19 +0200 Subject: [PATCH 2879/2970] Don't bother with unused config filenames in main --- midori/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index 1eabbcea..5b480b2a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -2019,7 +2019,6 @@ main (int argc, } } - katze_assign (config_file, build_config_filename ("search")); if (1) { g_signal_connect_after (search_engines, "add-item", @@ -2034,12 +2033,10 @@ main (int argc, G_CALLBACK (midori_search_engines_modify_cb), search_engines); } } - katze_assign (config_file, build_config_filename ("tabtrash.xbel")); g_signal_connect_after (trash, "add-item", G_CALLBACK (midori_trash_add_item_cb), NULL); g_signal_connect_after (trash, "remove-item", G_CALLBACK (midori_trash_remove_item_cb), NULL); - katze_assign (config_file, build_config_filename ("history.db")); katze_item_set_parent (KATZE_ITEM (_session), app); g_object_set_data (G_OBJECT (app), "extensions", extensions); From 71549af0890ffb5f7eae01c40d7f334d31a8b3f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Aug 2010 22:58:11 +0200 Subject: [PATCH 2880/2970] Disconnect insertion when MidoriHistory finalizes --- panels/midori-history.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index f681ddc3..17f79e3d 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -988,8 +988,8 @@ midori_history_finalize (GObject* object) if (history->app) g_object_unref (history->app); - /* FIXME: We don't unref items (last argument is FALSE) because - our reference counting is incorrect. */ + g_signal_handlers_disconnect_by_func (history->array, + midori_history_add_item_cb, history); g_object_unref (history->array); katze_assign (history->filter, NULL); } From a7452bd0b567d284c6dfc03c83a653d77438e829 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 10 Aug 2010 23:46:49 +0200 Subject: [PATCH 2881/2970] Use KatzeArray* to remove and monitor deleted bookmarks The panel and the bookmarkbar need to monitor the removal of bookmarks, and there can be multiple windows, so the database should only be used to remove in one central place. --- midori/main.c | 33 ++++++++++++++++++++++++++ midori/midori-browser.c | 26 +++++++++++++-------- panels/midori-bookmarks.c | 49 ++++++++++++++------------------------- panels/midori-bookmarks.h | 4 ---- 4 files changed, 66 insertions(+), 46 deletions(-) diff --git a/midori/main.c b/midori/main.c index 5b480b2a..14b97272 100644 --- a/midori/main.c +++ b/midori/main.c @@ -428,6 +428,37 @@ midori_history_terminate (sqlite3* db, sqlite3_close (db); } +static void +midori_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* item, + sqlite3* db) +{ + gchar* sqlcmd; + char* errmsg = NULL; + + if (KATZE_ITEM_IS_BOOKMARK (item)) + sqlcmd = sqlite3_mprintf ( + "DELETE FROM bookmarks WHERE uri = '%q' " + " AND folder = '%q'", + katze_item_get_uri (item), + katze_item_get_meta_string (item, "folder")); + + else + sqlcmd = sqlite3_mprintf ( + "DELETE FROM bookmarks WHERE title = '%q'" + " AND folder = '%q'", + katze_item_get_name (item), + katze_item_get_meta_string (item, "folder")); + + if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) + { + g_printerr (_("Failed to remove history item: %s\n"), errmsg); + sqlite3_free (errmsg); + } + + sqlite3_free (sqlcmd); +} + static sqlite3* midori_bookmarks_initialize (KatzeArray* array, const gchar* filename, @@ -450,6 +481,8 @@ midori_bookmarks_initialize (KatzeArray* array, "desc text, app integer, toolbar integer);", NULL, NULL, errmsg) != SQLITE_OK) return NULL; + g_signal_connect (array, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), db); return db; } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0e3e7633..df831223 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -183,10 +183,6 @@ midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, gchar* folder); -void -midori_bookmarks_remove_item_from_db (sqlite3* db, - KatzeItem* item); - static void midori_bookmarkbar_populate (MidoriBrowser* browser); @@ -927,7 +923,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, GtkTreeModel* model; if (!new_bookmark) - midori_bookmarks_remove_item_from_db (db, bookmark); + katze_array_remove_item (browser->bookmarks, bookmark); katze_item_set_name (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_title))); @@ -3862,14 +3858,10 @@ static void midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - sqlite3* db; KatzeItem* item; - db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - - midori_bookmarks_remove_item_from_db (db, item); - g_object_unref (item); + katze_array_remove_item (browser->bookmarks, item); } static void @@ -6367,6 +6359,15 @@ midori_bookmarkbar_insert_item (GtkWidget* toolbar, gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); } +static void +midori_bookmarkbar_remove_item_cb (KatzeArray* bookmarks, + KatzeItem* item, + MidoriBrowser* browser) +{ + if (gtk_widget_get_visible (browser->bookmarkbar)) + midori_bookmarkbar_populate (browser); +} + static void midori_bookmarkbar_populate (MidoriBrowser* browser) { @@ -6456,6 +6457,9 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, { MidoriWebSettings* settings; + if (browser->bookmarks != NULL) + g_signal_handlers_disconnect_by_func (browser->bookmarks, + midori_bookmarkbar_remove_item_cb, browser); settings = midori_browser_get_settings (browser); g_signal_handlers_disconnect_by_func (settings, midori_browser_show_bookmarkbar_notify_value_cb, browser); @@ -6468,6 +6472,8 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, g_signal_connect (settings, "notify::show-bookmarkbar", G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser); g_object_notify (G_OBJECT (settings), "show-bookmarkbar"); + g_signal_connect_after (bookmarks, "remove-item", + G_CALLBACK (midori_bookmarkbar_remove_item_cb), browser); } static void diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index b572a98c..339c9d4e 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -281,34 +281,15 @@ midori_bookmarks_insert_item_db (sqlite3* db, sqlite3_free (sqlcmd); } -void -midori_bookmarks_remove_item_from_db (sqlite3* db, - KatzeItem* item) +static void +midori_bookmarks_remove_item_cb (KatzeArray* array, + KatzeItem* item, + MidoriBookmarks* bookmarks) { - gchar* sqlcmd; - char* errmsg = NULL; - - if (KATZE_ITEM_IS_BOOKMARK (item)) - sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE uri = '%q' " - " AND folder = '%q'", - katze_item_get_uri (item), - katze_item_get_meta_string (item, "folder")); - - else - sqlcmd = sqlite3_mprintf ( - "DELETE FROM bookmarks WHERE title = '%q'" - " AND folder = '%q'", - katze_item_get_name (item), - katze_item_get_meta_string (item, "folder")); - - if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK) - { - g_printerr (_("Failed to remove history item: %s\n"), errmsg); - sqlite3_free (errmsg); - } - - sqlite3_free (sqlcmd); + GtkTreeModel* model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview)); + gtk_tree_store_clear (GTK_TREE_STORE (model)); + midori_bookmarks_read_from_db_to_model (bookmarks, + GTK_TREE_STORE (model), NULL, NULL, bookmarks->filter); } static void @@ -342,7 +323,7 @@ midori_bookmarks_row_changed_cb (GtkTreeModel* model, else parent_name = g_strdup (""); - midori_bookmarks_remove_item_from_db (db, item); + katze_array_remove_item (bookmarks->array, item); midori_bookmarks_insert_item_db (db, item, parent_name); } @@ -387,9 +368,7 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, { GtkTreeModel* model; GtkTreeIter iter; - sqlite3* db; - db = g_object_get_data (G_OBJECT (bookmarks->array), "db"); if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (bookmarks->treeview), &model, &iter)) { @@ -397,9 +376,13 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, &iter, 0, &item, -1); - midori_bookmarks_remove_item_from_db (db, item); + /* Manually remove the iter and block clearing the treeview */ gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); - + g_signal_handlers_block_by_func (bookmarks->array, + midori_bookmarks_remove_item_cb, bookmarks); + katze_array_remove_item (bookmarks->array, item); + g_signal_handlers_unblock_by_func (bookmarks->array, + midori_bookmarks_remove_item_cb, bookmarks); g_object_unref (item); } } @@ -492,6 +475,8 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks, g_object_ref (app); bookmarks->array = katze_object_get_object (app, "bookmarks"); g_object_set_data (G_OBJECT (bookmarks->array), "treeview", bookmarks->treeview); + g_signal_connect (bookmarks->array, "remove-item", + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, "", NULL); g_signal_connect_after (model, "row-changed", diff --git a/panels/midori-bookmarks.h b/panels/midori-bookmarks.h index 2c53712f..3dc260be 100644 --- a/panels/midori-bookmarks.h +++ b/panels/midori-bookmarks.h @@ -47,10 +47,6 @@ midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, const gchar* folder); -void -midori_bookmarks_remove_item_from_db (sqlite3* db, - KatzeItem* item); - void midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, From 9c84a2c407aad6147666a86343cc5c0b6db098b1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Aug 2010 20:58:38 +0200 Subject: [PATCH 2882/2970] Use midori_browser_open_bookmark for the bookmarkbar --- midori/midori-browser.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index df831223..495f55c2 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -183,6 +183,10 @@ midori_bookmarks_insert_item_db (sqlite3* db, KatzeItem* item, gchar* folder); +void +midori_browser_open_bookmark (MidoriBrowser* browser, + KatzeItem* item); + static void midori_bookmarkbar_populate (MidoriBrowser* browser); @@ -2663,7 +2667,7 @@ midori_bookmarkbar_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - midori_browser_set_current_uri (browser, katze_item_get_uri (item)); + midori_browser_open_bookmark (browser, item); } static gboolean @@ -3778,14 +3782,8 @@ static void midori_browser_bookmark_open_activate_cb (GtkWidget* menuitem, MidoriBrowser* browser) { - KatzeItem* item; - const gchar* uri; - - item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); - uri = katze_item_get_uri (item); - - if (uri && *uri) - midori_browser_set_current_uri (browser, uri); + KatzeItem* item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + midori_browser_open_bookmark (browser, item); } static void From bae41b45a82c0422ea5c6fb5423b740595cf9cee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 14 Aug 2010 21:12:02 +0200 Subject: [PATCH 2883/2970] Make 'Inspect Element' always show the inspector Without scripts enabled, this doesn't happen implicitly. --- midori/midori-view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 58276433..a6c6a855 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1872,6 +1872,7 @@ midori_web_view_menu_inspect_element_activate_cb (GtkWidget* widget, x = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "x")); y = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "y")); webkit_web_inspector_inspect_coordinates (inspector, x, y); + webkit_web_inspector_show (inspector); } #endif From 9a78cc6f6e2e55b76cf9cd41af58e84e0694cb86 Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Sun, 15 Aug 2010 23:44:13 +0200 Subject: [PATCH 2884/2970] Support space and percent as wild cards in location completion Internally the typed key is treated as if spaces are wildcards, so 'hello world' would be 'hello%world'. The text renderer splits the typed text by ' ' and '%', so multiple words are highlighted. --- midori/midori-locationaction.c | 145 +++++++++++++++++++++++++++------ 1 file changed, 122 insertions(+), 23 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 5b77ac58..2e583f1a 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -336,6 +336,8 @@ midori_location_action_popup_timeout_cb (gpointer data) MidoriLocationAction* action = data; GtkTreeViewColumn* column; GtkListStore* store; + gchar* effective_key; + gint i; gint result; static sqlite3_stmt* stmt; const gchar* sqlcmd; @@ -369,7 +371,16 @@ midori_location_action_popup_timeout_cb (gpointer data) ") GROUP BY uri ORDER BY ct DESC LIMIT ?2"; sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL); } - sqlite3_bind_text (stmt, 1, g_strdup_printf ("%%%s%%", action->key), -1, g_free); + effective_key = g_strdup_printf ("%%%s%%", action->key); + i = 0; + do + { + if (effective_key[i] == ' ') + effective_key[i] = '%'; + i++; + } + while (effective_key[i] != '\0'); + sqlite3_bind_text (stmt, 1, effective_key, -1, g_free); sqlite3_bind_int64 (stmt, 2, MAX_ITEMS); result = sqlite3_step (stmt); @@ -1019,14 +1030,21 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gboolean style; gchar* desc; gchar* desc_uri; + gchar* desc_iter; + gchar* temp_iter; gchar* desc_title; const gchar* str; gchar* key; + gchar** keys; + gint key_idx; gchar* start; gchar* skey; gchar* temp; + gchar* temp_concat; + gchar* temp_markup; gchar** parts; size_t len; + size_t offset; gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, BACKGROUND_COL, &background, STYLE_COL, &style, -1); @@ -1047,40 +1065,121 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, str = ""; key = g_utf8_strdown (str, -1); - len = strlen (key); + keys = g_strsplit_set (key, " %", -1); + g_free (key); if (G_LIKELY (uri)) { - temp = g_utf8_strdown (uri, -1); - if ((start = strstr (temp, key)) && (start - temp)) + temp_iter = temp = g_utf8_strdown (uri, -1); + desc_iter = uri; + key_idx = 0; + key = keys[key_idx]; + len = strlen (key); + offset = 0; + while ((start = strstr (temp_iter, key)) && start) { - skey = g_strndup (uri + (start - temp), len); - parts = g_strsplit (uri, skey, 2); - if (parts[0] && parts[1]) - desc_uri = g_markup_printf_escaped ("%s%s%s", - parts[0], skey, parts[1]); - g_strfreev (parts); - g_free (skey); + if (len) + { + offset = (start - temp_iter); + skey = g_strndup (desc_iter + offset, len); + parts = g_strsplit (desc_iter, skey, 2); + if (parts[0] && parts[1]) + { + if (desc_uri) + { + temp_markup = g_markup_printf_escaped ("%s%s", + parts[0], skey); + temp_concat = g_strconcat (desc_uri, temp_markup, NULL); + g_free (temp_markup); + katze_assign (desc_uri, temp_concat); + } + else + { + desc_uri = g_markup_printf_escaped ("%s%s", + parts[0], skey); + } + } + g_strfreev (parts); + g_free (skey); + + offset += len; + temp_iter += offset; + desc_iter += offset; + } + key_idx++; + key = keys[key_idx]; + if (key == NULL) + break; + len = strlen (key); } - if (!desc_uri) + if (key) + katze_assign (desc_uri, NULL); + if (desc_uri) + { + temp_markup = g_markup_escape_text (desc_iter, -1); + temp_concat = g_strconcat (desc_uri, temp_markup, NULL); + g_free (temp_markup); + katze_assign (desc_uri, temp_concat); + } + else desc_uri = g_markup_escape_text (uri, -1); g_free (temp); } if (G_LIKELY (title)) { - temp = g_utf8_strdown (title, -1); - if ((start = strstr (temp, key)) && (start - temp)) + temp_iter = temp = g_utf8_strdown (title, -1); + desc_iter = title; + key_idx = 0; + key = keys[key_idx]; + len = strlen (key); + offset = 0; + while ((start = strstr (temp_iter, key)) && start) { - skey = g_strndup (title + (start - temp), len); - parts = g_strsplit (title, skey, 2); - if (parts[0] && parts[1]) - desc_title = g_markup_printf_escaped ("%s%s%s", - parts[0], skey, parts[1]); - g_strfreev (parts); - g_free (skey); + if (len) + { + offset = (start - temp_iter); + skey = g_strndup (desc_iter + offset, len); + parts = g_strsplit (desc_iter, skey, 2); + if (parts[0] && parts[1]) + { + if (desc_title) + { + temp_markup = g_markup_printf_escaped ("%s%s", + parts[0], skey); + temp_concat = g_strconcat (desc_title, temp_markup, NULL); + g_free (temp_markup); + katze_assign (desc_title, temp_concat); + } + else + { + desc_title = g_markup_printf_escaped ("%s%s", + parts[0], skey); + } + } + g_strfreev (parts); + g_free (skey); + + offset += len; + temp_iter += offset; + desc_iter += offset; + } + key_idx++; + key = keys[key_idx]; + if (key == NULL) + break; + len = strlen (key); } - if (!desc_title) + if (key) + katze_assign (desc_title, NULL); + if (desc_title) + { + temp_markup = g_markup_escape_text (desc_iter, -1); + temp_concat = g_strconcat (desc_title, temp_markup, NULL); + g_free (temp_markup); + katze_assign (desc_title, temp_concat); + } + else desc_title = g_markup_escape_text (title, -1); g_free (temp); } @@ -1100,7 +1199,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, g_free (uri); g_free (title); - g_free (key); + g_strfreev (keys); g_free (desc); } From b563479014547d3d3eeaa220eaedecbbe71d104f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Aug 2010 21:01:02 +0200 Subject: [PATCH 2885/2970] Simplify update_interface and avoid extra updates --- midori/midori-browser.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 495f55c2..aed94ed0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -288,17 +288,12 @@ _midori_browser_update_actions (MidoriBrowser* browser) static void _midori_browser_update_interface (MidoriBrowser* browser) { - GtkWidget* widget; - MidoriView* view; - gboolean loading; - gboolean can_reload; + GtkWidget* widget = midori_browser_get_current_tab (browser); + MidoriView* view = MIDORI_VIEW (widget); + gboolean loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED; + gboolean can_reload = midori_view_can_reload (view); GtkAction* action; - widget = midori_browser_get_current_tab (browser); - view = MIDORI_VIEW (widget); - loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED; - can_reload = midori_view_can_reload (view); - _action_set_sensitive (browser, "Reload", can_reload); _action_set_sensitive (browser, "Stop", can_reload && loading); _action_set_sensitive (browser, "Back", midori_view_can_go_back (view)); @@ -333,7 +328,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_findbar_set_can_find (MIDORI_FINDBAR (browser->find), midori_view_can_find (view)); - action = gtk_action_group_get_action (browser->action_group, "ReloadStop"); + action = _action_by_name (browser, "ReloadStop"); if (!loading) { g_object_set (action, @@ -355,12 +350,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) !gtk_widget_get_visible (browser->navigationbar) && browser->progress_in_location) gtk_widget_show (browser->navigationbar); - if (browser->progress_in_location) - { - action = _action_by_name (browser, "Location"); - midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action), - midori_view_get_progress (view)); - } } #if HAVE_HILDON @@ -387,7 +376,6 @@ _midori_browser_update_interface (MidoriBrowser* browser) } midori_location_action_set_security_hint ( MIDORI_LOCATION_ACTION (action), midori_view_get_security (view)); - } static void @@ -468,15 +456,14 @@ _midori_browser_update_progress (MidoriBrowser* browser, g_free (message); if (!browser->progress_in_location) progress = 0.0; - midori_location_action_set_progress (action, progress); } else { gtk_progress_bar_pulse (GTK_PROGRESS_BAR (browser->progressbar)); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), NULL); - midori_location_action_set_progress (action, 0.0); } + midori_location_action_set_progress (action, progress); } static void @@ -543,18 +530,19 @@ midori_view_notify_load_status_cb (GtkWidget* widget, MidoriBrowser* browser) { MidoriView* view = MIDORI_VIEW (widget); + MidoriLoadStatus load_status = midori_view_get_load_status (view); const gchar* uri; GtkAction* action; uri = midori_view_get_display_uri (view); action = _action_by_name (browser, "Location"); - if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) + if (load_status == MIDORI_LOAD_COMMITTED) midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri); if (widget == midori_browser_get_current_tab (browser)) { - if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) + if (load_status == MIDORI_LOAD_COMMITTED) { midori_location_action_set_text ( MIDORI_LOCATION_ACTION (action), uri); @@ -613,12 +601,10 @@ midori_view_notify_title_cb (GtkWidget* widget, MidoriView* view = MIDORI_VIEW (widget); const gchar* uri; const gchar* title; - GtkAction* action; gchar* window_title; uri = midori_view_get_display_uri (view); title = midori_view_get_display_title (view); - action = _action_by_name (browser, "Location"); if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) { From 025334fb8f3cf0d98d6e268b0e461b514d7fac0e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 16 Aug 2010 21:31:14 +0200 Subject: [PATCH 2886/2970] Bump version to 0.2.7 --- ChangeLog | 12 ++++++++++++ wscript | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 42b0fba5..ea3e8912 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.2.7 + + Multiple word completion in location + + Database backed bookmarks + + Search bookmark panel and drag bookmarks + + Bookmarks in address completion + + Removed bookmarks and history from menubar + + Add 'Minimize New Tabs' and 'Copy Addresses of Tabs' + + Refactorings and optimisations in the core + + Adblock compatibility improvements and speedup + + Changeable speed dial size + + Delayed pages at startup, or after a crash + v0.2.6 + Show a dialogue when quitting while downloading + Render icons in errors/ speed dial properly diff --git a/wscript b/wscript index e3c36ee1..05ee4efd 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ from Configure import find_program_impl major = 0 minor = 2 -micro = 6 +micro = 7 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From c65ca763fb20a429be679acc6a365fb523f53cab Mon Sep 17 00:00:00 2001 From: gianluca foddis Date: Fri, 20 Aug 2010 17:02:21 +0200 Subject: [PATCH 2887/2970] l10n: Updated Italian (it) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/it.po | 2104 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 1221 insertions(+), 883 deletions(-) diff --git a/po/it.po b/po/it.po index 9658ec69..8fc054be 100644 --- a/po/it.po +++ b/po/it.po @@ -4,30 +4,34 @@ # Sergio Durzu 2009 # Luca Perri 2009 # Gianluca Foddis , 2009. +# Fabio Pozzi , 2010. msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-17 17:11+0100\n" -"PO-Revision-Date: 2009-12-24 12:26+0100\n" +"POT-Creation-Date: 2010-08-19 10:08+0000\n" +"PO-Revision-Date: 2010-08-20 15:50+0100\n" "Last-Translator: Gianluca Foddis \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" # GLOSSARIO # transfer=trasferimento # download=scaricamento (come in gnome e in kde) - #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Browser web leggero" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1514 ../midori/main.c:1712 -#: ../midori/main.c:1720 ../midori/main.c:1731 -#: ../midori/midori-websettings.c:292 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1331 +#: ../midori/main.c:1660 +#: ../midori/main.c:1668 +#: ../midori/main.c:1684 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -35,943 +39,1071 @@ msgstr "Midori" msgid "Web Browser" msgstr "Browser web" -#: ../midori/main.c:107 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Le impostazioni non possono essere caricate: %s\n" -#: ../midori/main.c:162 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Il valore «%s» non è valido per %s" -#: ../midori/main.c:169 ../midori/main.c:255 +#: ../midori/main.c:155 +#: ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valore di configurazione «%s» non valido" -#: ../midori/main.c:379 ../extensions/formhistory.c:438 +#: ../midori/main.c:368 +#: ../midori/main.c:472 +#: ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Errore nella connessione al database: %s\n" -#: ../midori/main.c:411 ../extensions/formhistory.c:453 -#: ../extensions/formhistory.c:457 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Errore nell'esecuzione della richiesta al database: %s\n" - -#: ../midori/main.c:465 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" - -#: ../midori/main.c:489 -#, c-format -msgid "Failed to clear history: %s\n" -msgstr "Errore nella cancellazione della cronologia: %s\n" - -#: ../midori/main.c:512 ../midori/main.c:546 ../midori/main.c:562 -#, c-format -msgid "Failed to add history item: %s\n" -msgstr "Errore nell'inserimento dell'elemento nella cronologia: %s\n" - #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:741 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Errore nella cancellazione dei vecchi elementi della cronologia: %s\n" -#: ../midori/main.c:770 +#: ../midori/main.c:455 +#: ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 #, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "Le impostazioni non possono essere salvate. %s" +msgid "Failed to remove history item: %s\n" +msgstr "Errore nell'eliminazione dell'elemento della cronologia: %s\n" -#: ../midori/main.c:808 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "I motori di ricerca non possono essere salvati. %s" - -#: ../midori/main.c:827 ../midori/main.c:877 ../midori/main.c:897 +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "I segnalibri non possono essere salvati. %s" +#: ../midori/main.c:531 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Le impostazioni non possono essere salvate. %s" + +#: ../midori/main.c:569 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "I motori di ricerca non possono essere salvati. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:927 ../midori/main.c:950 +#: ../midori/main.c:589 +#: ../midori/main.c:612 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Il cestino non può essere salvato. %s" -#: ../midori/main.c:1019 ../midori/main.c:1191 +#: ../midori/main.c:671 +#: ../midori/main.c:911 #, c-format msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" -#: ../midori/main.c:1229 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori sembra essersi chiuso inaspettatamente l'ultima volta che è stato " -"usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per " -"risolvere il problema." +#: ../midori/main.c:855 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Non è disponibile nessun certificato di root. I certificati SSL non possono essere verificati." -#: ../midori/main.c:1244 +#: ../midori/main.c:945 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori sembra essersi chiuso inaspettatamente l'ultima volta che è stato usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per risolvere il problema." + +#: ../midori/main.c:960 msgid "Modify _preferences" msgstr "Modifica _preferenze" -#: ../midori/main.c:1248 +#: ../midori/main.c:964 msgid "Reset the last _session" msgstr "Reimposta l'ultima _sessione" -#: ../midori/main.c:1253 +#: ../midori/main.c:969 msgid "Disable all _extensions" msgstr "Disabilita tutte le _estensioni" -#: ../midori/main.c:1418 ../midori/main.c:1945 +#: ../midori/main.c:1209 +#: ../midori/main.c:1955 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La sessione non può essere caricata: %s\n" -#: ../midori/main.c:1514 +#: ../midori/main.c:1331 msgid "No filename specified" msgstr "Nessun file specificato" -#: ../midori/main.c:1537 +#: ../midori/main.c:1350 msgid "An unknown error occured." msgstr "Si è presentato un errore sconosciuto" -#: ../midori/main.c:1569 +#: ../midori/main.c:1381 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Istantanea salvata in: %s\n" -#: ../midori/main.c:1628 +#: ../midori/main.c:1553 msgid "Run ADDRESS as a web application" msgstr "Esegui INDIRIZZO come applicazione web" -#: ../midori/main.c:1628 +#: ../midori/main.c:1553 msgid "ADDRESS" msgstr "INDIRIZZO" -#: ../midori/main.c:1631 +#: ../midori/main.c:1556 msgid "Use FOLDER as configuration folder" msgstr "Usa CARTELLA come cartella di configurazione" -#: ../midori/main.c:1631 +#: ../midori/main.c:1556 msgid "FOLDER" msgstr "CARTELLA" -#: ../midori/main.c:1634 +#: ../midori/main.c:1559 +msgid "Show a diagnostic dialog" +msgstr "Mostra finestra di diagnostica" + +#: ../midori/main.c:1561 msgid "Run the specified filename as javascript" msgstr "Esegue il file specificato come javascript" -#: ../midori/main.c:1637 +#: ../midori/main.c:1564 msgid "Take a snapshot of the specified URI" msgstr "Scatta istantanea dell'URL specificato" -#: ../midori/main.c:1640 +#: ../midori/main.c:1567 msgid "Execute the specified command" msgstr "Esegue il comando specificato" -#: ../midori/main.c:1642 +#: ../midori/main.c:1569 msgid "Display program version" msgstr "Visualizza la versione dell'applicazione" -#: ../midori/main.c:1644 +#: ../midori/main.c:1571 msgid "Addresses" msgstr "Indirizzi" -#: ../midori/main.c:1709 +#: ../midori/main.c:1573 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Blocca le URI secondo l'espressione regolare SCHEMA" + +#: ../midori/main.c:1573 +msgid "PATTERN" +msgstr "SCHEMA" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1577 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Riavvia Midori dopo SECONDI secondi di inattività" + +#: ../midori/main.c:1577 +msgid "SECONDS" +msgstr "SECONDI" + +#: ../midori/main.c:1657 msgid "[Addresses]" msgstr "[Indirizzi]" -#: ../midori/main.c:1732 +# fp suggerisce "a:", mantengo "su:" per uniformita´ con le trad xfce +#: ../midori/main.c:1685 msgid "Please report comments, suggestions and bugs to:" msgstr "Segnalare commenti, suggerimenti e bug su:" -#: ../midori/main.c:1734 +#: ../midori/main.c:1687 msgid "Check for new versions at:" msgstr "Controlla nuove versioni su:" -#: ../midori/main.c:1816 +#: ../midori/main.c:1804 msgid "The specified configuration folder is invalid." msgstr "La cartella di configurazione specificata non è accettabile. %s" -#: ../midori/main.c:1864 +#: ../midori/main.c:1852 msgid "An instance of Midori is already running but not responding.\n" msgstr "Un'istanza di Midori è già in esecuzione, ma non risponde.\n" -#: ../midori/main.c:1912 +#: ../midori/main.c:1907 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "I motori di ricerca non possono essere caricati. %s\n" -#: ../midori/main.c:1930 +#: ../midori/main.c:1928 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "I segnalibri non possono essere caricati: %s\n" -#: ../midori/main.c:1958 +#: ../midori/main.c:1970 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Il cestino non può essere caricato: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1983 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "La cronologia non può essere caricata: %s\n" -#: ../midori/main.c:1983 +#: ../midori/main.c:1997 msgid "The following errors occured:" msgstr "Si sono presentati i seguenti errori:" -#: ../midori/main.c:1999 +#: ../midori/main.c:2013 msgid "_Ignore" msgstr "_Ignora" -#: ../midori/midori-array.c:424 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "File non trovato." -#: ../midori/midori-array.c:458 ../midori/midori-array.c:481 -#: ../midori/midori-array.c:491 +#: ../midori/midori-array.c:463 +#: ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Documento corrotto." -#: ../midori/midori-array.c:500 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Formato del segnalibro non riconosciuto." -#: ../midori/midori-array.c:714 ../midori/sokoke.c:965 -#, c-format +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Errore di scrittura." -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:5003 -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:336 +#: ../midori/midori-browser.c:4909 +#: ../midori/midori-browser.c:4915 msgid "Reload the current page" msgstr "Ricarica la pagina corrente" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:346 +#: ../midori/midori-browser.c:4912 msgid "Stop loading the current page" msgstr "Interrompe il caricamento della pagina corrente" -#: ../midori/midori-browser.c:449 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% caricato" -#: ../midori/midori-browser.c:474 +#: ../midori/midori-browser.c:491 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Errore nell'aggiornamento del titolo: %s\n" + +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Azione inaspettata: '%s'" -#: ../midori/midori-browser.c:675 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nuova cartella" -#: ../midori/midori-browser.c:675 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Modifica cartella" -#: ../midori/midori-browser.c:677 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nuovo segnalibro" -#: ../midori/midori-browser.c:677 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Modifica segnalibro" -#: ../midori/midori-browser.c:707 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Titolo:" -#: ../midori/midori-browser.c:720 ../midori/midori-searchaction.c:967 +#: ../midori/midori-browser.c:779 +#: ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrizione:" -#: ../midori/midori-browser.c:739 ../midori/midori-searchaction.c:981 -#: ../extensions/feed-panel/main.c:368 +#: ../midori/midori-browser.c:798 +#: ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Indirizzo:" -#: ../midori/midori-browser.c:769 ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:4028 msgid "_Folder:" msgstr "_Cartella:" -#: ../midori/midori-browser.c:779 ../midori/midori-browser.c:855 -#: ../midori/midori-browser.c:4255 ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:840 +#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4033 +#: ../midori/midori-browser.c:4062 msgid "Toplevel folder" msgstr "Livello principale" -#: ../midori/midori-browser.c:808 +#: ../midori/midori-browser.c:872 +msgid "Add to _Speed Dial" +msgstr "Aggiungi a _selezione veloce" + +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Mostra nella _barra degli strumenti" -#: ../midori/midori-browser.c:823 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Esegui come applicazione _web" -#: ../midori/midori-browser.c:935 ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:979 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Spazio insufficiente per scaricare \"%s\"." + +#: ../midori/midori-browser.c:983 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "Il file ha bisogno di %s ma sono rimasti solo %s." + +#: ../midori/midori-browser.c:1040 +#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4105 msgid "Save file as" msgstr "Salva come" -#: ../midori/midori-browser.c:1302 ../panels/midori-transfers.c:272 -#, c-format -msgid "%s of %s" -msgstr "%s su %s" - -#: ../midori/midori-browser.c:1338 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Il file '%s' è stato traferito." - -#: ../midori/midori-browser.c:1342 -msgid "Transfer completed" -msgstr "Trasferimento completato" - -#: ../midori/midori-browser.c:1482 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Salva file" -#: ../midori/midori-browser.c:2191 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Apri file" -#: ../midori/midori-browser.c:2267 ../extensions/feed-panel/main.c:356 +#: ../midori/midori-browser.c:2228 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"Per usare questa URI usare un aggregatore di notizie; di solito vi è un pulsante \"Nuova sottoscrizione\", \"Nuovo Feed Notizie\" o simile;\n" +"in alternativa andare in Preferenze, Applicazioni in Midori, e selezionare un Aggregatore di notizie; al prossim clic sull'icona del fedd delle notizie, questo verrà aggiunto automaticamente" + +#: ../midori/midori-browser.c:2234 +#: ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Nuovo feed" -#: ../midori/midori-browser.c:2300 ../midori/midori-browser.c:5050 -#: ../panels/midori-bookmarks.c:243 +#: ../midori/midori-browser.c:2277 +#: ../midori/midori-browser.c:4974 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Aggiunge un nuovo segnalibro" -#: ../midori/midori-browser.c:2861 ../midori/midori-searchaction.c:491 -msgid "Empty" -msgstr "Vuoto" - -#: ../midori/midori-browser.c:3467 ../midori/sokoke.c:275 -#: ../midori/sokoke.c:285 ../midori/sokoke.c:313 ../midori/sokoke.c:335 -#: ../midori/sokoke.c:349 +#: ../midori/midori-browser.c:3283 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Non è possibile eseguire l'applicazione esterna." -#: ../midori/midori-browser.c:3980 ../panels/midori-bookmarks.c:796 -#: ../panels/midori-history.c:822 +#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:5364 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Errore nell'inserimento dell'elemento della cronologia: %s\n" + +#: ../midori/midori-browser.c:3863 +#: ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Apri _tutti in nuove schede" -#: ../midori/midori-browser.c:3987 ../panels/midori-bookmarks.c:802 -#: ../panels/midori-history.c:828 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:3870 +#: ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 +#: ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Apri in una nuova sc_heda" -#: ../midori/midori-browser.c:3990 ../panels/midori-bookmarks.c:804 -#: ../panels/midori-history.c:830 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:3873 +#: ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4011 +#: ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 +#: ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Apri in una nuova _finestra" -#: ../midori/midori-browser.c:4179 +#: ../midori/midori-browser.c:3951 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4180 +#: ../midori/midori-browser.c:3952 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:3953 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4182 +#: ../midori/midori-browser.c:3954 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4183 +#: ../midori/midori-browser.c:3955 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4203 ../panels/midori-bookmarks.c:272 +#: ../midori/midori-browser.c:3979 msgid "Import bookmarks..." msgstr "Importa segnalibri..." -#: ../midori/midori-browser.c:4206 ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:3982 +#: ../midori/midori-browser.c:4979 msgid "_Import bookmarks" msgstr "_Importa segnalibri" -#: ../midori/midori-browser.c:4216 +#: ../midori/midori-browser.c:3993 msgid "_Application:" msgstr "_Applicazione:" -#: ../midori/midori-browser.c:4242 ../midori/midori-browser.c:5148 -#: ../midori/midori-websettings.c:223 ../midori/midori-websettings.c:297 -#: ../katze/katze-utils.c:672 +#: ../midori/midori-browser.c:4020 +#: ../midori/midori-browser.c:5092 +#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:315 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Personalizzato..." -#: ../midori/midori-browser.c:4316 +#: ../midori/midori-browser.c:4081 msgid "Failed to import bookmarks" msgstr "Impossibile importare i segnalibri" -#: ../midori/midori-browser.c:4462 +#: ../midori/midori-browser.c:4122 +msgid "Failed to export bookmarks" +msgstr "Impossibile esportare i segnalibri" + +#: ../midori/midori-browser.c:4175 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Errore nella cancellazione della cronologia: %s\n" + +# c-format +#: ../midori/midori-browser.c:4183 +msgid "Failed to clear search history: %s\n" +msgstr "Errore nella cancellazione della cronologia delle ricerche: %s\n" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4290 msgid "Clear Private Data" msgstr "Pulizia dati personali" -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4294 msgid "_Clear private data" msgstr "_Pulizia dati personali" -#: ../midori/midori-browser.c:4479 +#: ../midori/midori-browser.c:4308 msgid "Clear the following data:" msgstr "Rimuovi i seguenti dati:" -#: ../midori/midori-browser.c:4489 ../midori/midori-preferences.c:515 -#: ../panels/midori-history.c:108 +#: ../midori/midori-browser.c:4318 +#: ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Cronologia" -#: ../midori/midori-browser.c:4494 +#: ../midori/midori-browser.c:4323 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:4499 +#: ../midori/midori-browser.c:4328 msgid "'Flash' Cookies" msgstr "Cookie 'Flash'" -#: ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:4333 msgid "Website icons" msgstr "Icone dei siti" -#: ../midori/midori-browser.c:4509 ../midori/sokoke.c:1124 +#: ../midori/midori-browser.c:4338 +#: ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Schede _chiuse" -#: ../midori/midori-browser.c:4514 ../extensions/web-cache.c:591 +#: ../midori/midori-browser.c:4343 +#: ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Web Cache" -#: ../midori/midori-browser.c:4522 +# cri.penta version +#: ../midori/midori-browser.c:4351 msgid "Clear private data when _quitting Midori" -msgstr "Cancella i dati personali _quando si chiude Midori" +msgstr "Cancella i dati personali _quando Midori viene chiuso" -#: ../midori/midori-browser.c:4618 +#: ../midori/midori-browser.c:4492 msgid "A lightweight web browser." msgstr "Un browser web leggero" -#: ../midori/midori-browser.c:4634 +#: ../midori/midori-browser.c:4494 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Questa libreria è software libero; può essere redistribuito e/o modificato in accordo ai temrini della GNU Lesser General Public License così come pubblicata dalla Free Software Foundation; sia nella versione 2.1 della licenza che (a scelta) in una versiona successiva." + +#: ../midori/midori-browser.c:4513 msgid "translator-credits" msgstr "" "Sergio Durzu \n" "Luca Perri \n" +"Fabio Pozzi \n" "Gianluca Foddis " -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4822 msgid "_File" msgstr "_File" -#: ../midori/midori-browser.c:4918 ../midori/sokoke.c:1125 +#: ../midori/midori-browser.c:4824 +#: ../midori/sokoke.c:1315 msgid "New _Window" msgstr "N_uova finestra" -#: ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:4825 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4828 msgid "Open a new tab" msgstr "Apre una nuova scheda" -#: ../midori/midori-browser.c:4924 +#: ../midori/midori-browser.c:4830 msgid "P_rivate Browsing" msgstr "Navi_gazione privata" -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:4831 msgid "Don't save any private data while browsing" msgstr "Non memorizza i dati personali durante la navigazione" -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4835 msgid "Open a file" msgstr "Apre un file" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4838 msgid "Save to a file" -msgstr "Salva un file" +msgstr "Salva in un file" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4840 msgid "Add to Speed _dial" msgstr "Aggiungi a selezione _veloce" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4841 msgid "Add shortcut to speed dial" msgstr "Aggiungi collegamento a selezione veloce" -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4843 msgid "Add Shortcut to the _desktop" msgstr "Aggiungi collegamento sulla _scrivania" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4844 msgid "Add shortcut to the desktop" msgstr "Aggiunge collegamento sulla scrivania" -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:4846 msgid "Subscribe to News _feed" -msgstr "Sottoscrivi il _feed di notizie" +msgstr "Abbonati al _feed di notizie" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:4847 msgid "Subscribe to this news feed" msgstr "Sottoscrivi questo feed di notizie" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4852 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4853 msgid "Close the current tab" msgstr "Chiude la scheda corrente" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4855 msgid "C_lose Window" msgstr "C_hiudi finestra" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4856 msgid "Close this window" msgstr "Chiude la finestra" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:4859 msgid "Print the current page" msgstr "Stampa la pagina corrente" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4862 msgid "Quit the application" msgstr "Esce dall'applicazione" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4864 msgid "_Edit" msgstr "Mo_difica" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4868 msgid "Undo the last modification" msgstr "Annulla l'ultima modifica" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4871 msgid "Redo the last modification" msgstr "Riesegui l'ultima modifica" -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:4875 msgid "Cut the selected text" msgstr "Taglia il testo selezionato" -#: ../midori/midori-browser.c:4972 ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4881 msgid "Copy the selected text" msgstr "Copia il testo selezionato" -#: ../midori/midori-browser.c:4978 +#: ../midori/midori-browser.c:4884 msgid "Paste text from the clipboard" msgstr "Incolla il testo dagli appunti" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4887 msgid "Delete the selected text" msgstr "Elimina il testo selezionato" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:4890 msgid "Select all text" msgstr "Seleziona tutto" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4893 msgid "Find a word or phrase in the page" msgstr "Cerca una parola o una frase nella pagina" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4895 msgid "Find _Next" msgstr "Trova s_uccessivo" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4896 msgid "Find the next occurrence of a word or phrase" msgstr "Trova la parola o frase successiva" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4898 msgid "Find _Previous" msgstr "Trova _precedente" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4899 msgid "Find the previous occurrence of a word or phrase" msgstr "Trova la parola o frase precedente" -#: ../midori/midori-browser.c:4997 +#: ../midori/midori-browser.c:4903 msgid "Configure the application preferences" msgstr "Imposta le preferenze dell'applicazione" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4905 msgid "_View" msgstr "_Visualizza" -#: ../midori/midori-browser.c:5000 +#: ../midori/midori-browser.c:4906 msgid "_Toolbars" msgstr "Barre degli _strumenti" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4918 msgid "Increase the zoom level" msgstr "Aumenta il livello di ingrandimento" -#: ../midori/midori-browser.c:5015 +#: ../midori/midori-browser.c:4921 msgid "Decrease the zoom level" msgstr "Diminuisce il livello di ingrandimento" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4924 msgid "Reset the zoom level" msgstr "Azzera il livello di ingrandimento" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4925 msgid "_Encoding" msgstr "_Codifica" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4927 msgid "View So_urce" msgstr "Visualizza s_orgente" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4928 msgid "View the source code of the page" msgstr "Visualizza il codice sorgente della pagina" -#: ../midori/midori-browser.c:5024 -msgid "View Selection Source" -msgstr "Visualizza sorgente selezione" - -#: ../midori/midori-browser.c:5025 -msgid "View the source code of the selection" -msgstr "Visualizza il codice sorgente della selezione" - -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4931 msgid "Toggle fullscreen view" msgstr "Schermo intero" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:4934 +msgid "Scroll _Left" +msgstr "Scorri a _sinistra" + +#: ../midori/midori-browser.c:4935 +msgid "Scroll to the left" +msgstr "Scorre verso sinistra" + +#: ../midori/midori-browser.c:4937 +msgid "Scroll _Down" +msgstr "Scorri in _basso" + +#: ../midori/midori-browser.c:4938 +msgid "Scroll down" +msgstr "Scorre in basso" + +#: ../midori/midori-browser.c:4940 +msgid "Scroll _Up" +msgstr "Scorri in _alto" + +#: ../midori/midori-browser.c:4941 +msgid "Scroll up" +msgstr "Scorre in alto" + +#: ../midori/midori-browser.c:4943 +msgid "Scroll _Right" +msgstr "Scorri a _destra" + +#: ../midori/midori-browser.c:4944 +msgid "Scroll to the right" +msgstr "Scorre verso destra" + +#: ../midori/midori-browser.c:4947 msgid "_Go" msgstr "V_ai" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4950 msgid "Go back to the previous page" msgstr "Va alla pagina precedente" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4953 msgid "Go forward to the next page" msgstr "Va alla pagina successiva" -#: ../midori/midori-browser.c:5040 +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:4957 +msgid "Go to the previous sub-page" +msgstr "Va alla pagina precedente" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:4961 +msgid "Go to the next sub-page" +msgstr "Va alla sottopagina successiva" + +#: ../midori/midori-browser.c:4964 msgid "Go to your homepage" msgstr "Va alla pagina iniziale" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4966 msgid "Empty Trash" msgstr "Svuota cestino" -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:4967 msgid "Delete the contents of the trash" msgstr "Elimina il contenuto del cestino" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:4969 msgid "Undo _Close Tab" msgstr "Annulla chiu_sura scheda" -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4970 msgid "Open the last closed tab" msgstr "Apre l'ultima scheda chiusa" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4976 msgid "Add a new _folder" msgstr "Aggiungi una nuova _cartella" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4977 msgid "Add a new bookmark folder" msgstr "Aggiunge un nuova cartella di preferiti" -#: ../midori/midori-browser.c:5058 ../midori/midori-searchaction.c:500 +#: ../midori/midori-browser.c:4982 +msgid "_Export bookmarks" +msgstr "Esp_orta segnalibri" + +#: ../midori/midori-browser.c:4985 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gestisci _motori di ricerca" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4986 msgid "Add, edit and remove search engines..." msgstr "Aggiunge, modifica e elimina motori di ricerca..." -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4989 msgid "_Clear Private Data" msgstr "_Rimuovi dati privati" -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:4990 msgid "Clear private data..." msgstr "Rimozione dati privati..." -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:4994 +msgid "_Inspect Page" +msgstr "_Ispeziona la pagina" + +#: ../midori/midori-browser.c:4995 +msgid "Inspect page details and access developer tools..." +msgstr "Vedi i dettagli della pagina ed accedi agli strumenti per sviluppatori..." + +#: ../midori/midori-browser.c:5000 msgid "_Previous Tab" msgstr "Scheda _precedente" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:5001 msgid "Switch to the previous tab" msgstr "Passa alla scheda precedente" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5003 msgid "_Next Tab" msgstr "Scheda _successiva" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:5004 msgid "Switch to the next tab" msgstr "Passa alla scheda successiva" -#: ../midori/midori-browser.c:5073 +# comando per selezionare la scheda corrente +#: ../midori/midori-browser.c:5006 msgid "Focus _Current Tab" -msgstr "Fuoco su scheda _corrente" +msgstr "Scheda _corrente" -#: ../midori/midori-browser.c:5074 +#: ../midori/midori-browser.c:5007 msgid "Focus the current tab" msgstr "Posiziona il fuoco sulla scheda corrente" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5009 +msgid "Minimize _Current Tab" +msgstr "Minimizza la scheda _corrente" + +#: ../midori/midori-browser.c:5010 +msgid "Minimize the current tab" +msgstr "Minimizza la scheda corrente" + +#: ../midori/midori-browser.c:5012 +msgid "_Duplicate Current Tab" +msgstr "_Duplica la scheda corrente" + +#: ../midori/midori-browser.c:5013 +msgid "Duplicate the current tab" +msgstr "Duplica la scheda corrente" + +# acceleratore sulla h per evitare conflitti +#: ../midori/midori-browser.c:5015 +msgid "Close Ot_her Tabs" +msgstr "Chiudi le altre sc_hede" + +#: ../midori/midori-browser.c:5016 +msgid "Close all tabs except the current tab" +msgstr "Chiude tutte le schede eccetto la corrente" + +#: ../midori/midori-browser.c:5018 msgid "Open last _session" msgstr "Apri ultima s_essione" -#: ../midori/midori-browser.c:5077 +#: ../midori/midori-browser.c:5019 msgid "Open the tabs saved in the last session" msgstr "Apre le schede salvate nell'ultima sessione" -#: ../midori/midori-browser.c:5079 +#: ../midori/midori-browser.c:5021 msgid "_Help" msgstr "A_iuto" -#: ../midori/midori-browser.c:5081 +#: ../midori/midori-browser.c:5023 msgid "_Contents" msgstr "_Contenuti" -#: ../midori/midori-browser.c:5082 +#: ../midori/midori-browser.c:5024 msgid "Show the documentation" msgstr "Mostra la documentazione" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5026 msgid "_Frequent Questions" msgstr "Domande fre_quenti" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5027 msgid "Show the Frequently Asked Questions" msgstr "Mostra le domande e risposte frequenti (F.A.Q.)" -#: ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:5029 msgid "_Report a Bug" msgstr "Segnala un _problema" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5030 msgid "Open Midori's bug tracker" msgstr "Apre lo strumento di segnalazione bug di Midori" -#: ../midori/midori-browser.c:5091 +#: ../midori/midori-browser.c:5033 msgid "Show information about the program" msgstr "Mostra le informazioni sull'applicazione" -#: ../midori/midori-browser.c:5098 +#: ../midori/midori-browser.c:5041 msgid "_Menubar" msgstr "Barra dei _menu" -#: ../midori/midori-browser.c:5099 +#: ../midori/midori-browser.c:5042 msgid "Show menubar" msgstr "Mostra la barra dei menu" -#: ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:5045 msgid "_Navigationbar" msgstr "Barra di _navigazione" -#: ../midori/midori-browser.c:5103 +#: ../midori/midori-browser.c:5046 msgid "Show navigationbar" msgstr "Mostra la barra di navigazione" -#: ../midori/midori-browser.c:5106 +#: ../midori/midori-browser.c:5049 msgid "Side_panel" msgstr "Pannello _laterale" -#: ../midori/midori-browser.c:5107 +#: ../midori/midori-browser.c:5050 msgid "Show sidepanel" msgstr "Mostra il pannello laterale" -#: ../midori/midori-browser.c:5110 +#: ../midori/midori-browser.c:5053 msgid "_Bookmarkbar" msgstr "Barra dei s_egnalibri" -#: ../midori/midori-browser.c:5111 +#: ../midori/midori-browser.c:5054 msgid "Show bookmarkbar" msgstr "Mostra la barra dei segnalibri" -#: ../midori/midori-browser.c:5114 +#: ../midori/midori-browser.c:5057 msgid "_Transferbar" msgstr "Barra dei _trasferimenti" -#: ../midori/midori-browser.c:5115 +#: ../midori/midori-browser.c:5058 msgid "Show transferbar" msgstr "Mostra la barra dei trasferimenti" -#: ../midori/midori-browser.c:5118 +#: ../midori/midori-browser.c:5061 msgid "_Statusbar" msgstr "Barra di stat_o" -#: ../midori/midori-browser.c:5119 +#: ../midori/midori-browser.c:5062 msgid "Show statusbar" msgstr "Mostra la barra di stato" -#: ../midori/midori-browser.c:5126 +#: ../midori/midori-browser.c:5070 msgid "_Automatic" msgstr "_Automatico" -#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:217 +#: ../midori/midori-browser.c:5073 +#: ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Cinese (BIGS)" -#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic -#: ../midori/midori-browser.c:5133 +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5077 msgid "Japanese (SHIFT__JIS)" msgstr "Giapponese (SHIFT__JIS)" -#: ../midori/midori-browser.c:5136 ../midori/midori-websettings.c:219 +#: ../midori/midori-browser.c:5080 +#: ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5139 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5083 +#: ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5142 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5086 +#: ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5145 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5089 +#: ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Occidentale (ISO-8859-1)" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5608 msgid "_Separator" msgstr "_Separatore" -#: ../midori/midori-browser.c:5704 +#: ../midori/midori-browser.c:5615 msgid "_Location..." msgstr "I_ndirizzo..." -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5617 msgid "Open a particular location" msgstr "Apre un indirizzo specifico" -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5641 msgid "_Web Search..." msgstr "Ricerca sul _web..." -#: ../midori/midori-browser.c:5732 +#: ../midori/midori-browser.c:5643 msgid "Run a web search" msgstr "Esegue una ricerca sul web" -#: ../midori/midori-browser.c:5753 +#: ../midori/midori-browser.c:5664 msgid "Reopen a previously closed tab or window" msgstr "Riapre una scheda o una finestra chiusa precedentemente" -#: ../midori/midori-browser.c:5768 -msgid "_Recently visited pages" -msgstr "Pagine visitate _recentemente" - -#: ../midori/midori-browser.c:5770 -msgid "Reopen pages that you visited earlier" -msgstr "Riapre le pagine visitate recentemente" - -#: ../midori/midori-browser.c:5785 ../midori/sokoke.c:1114 -msgid "_Bookmarks" -msgstr "Segnali_bri" - -#: ../midori/midori-browser.c:5787 -msgid "Show the saved bookmarks" -msgstr "Mostra i segnalibri salvati" - -#: ../midori/midori-browser.c:5802 +#: ../midori/midori-browser.c:5679 msgid "_Tools" msgstr "_Strumenti" -#: ../midori/midori-browser.c:5815 +#: ../midori/midori-browser.c:5696 msgid "_Window" msgstr "Fi_nestra" -#: ../midori/midori-browser.c:5817 +#: ../midori/midori-browser.c:5698 msgid "Show a list of all open tabs" msgstr "Mostra un elenco delle schede aperte" -#: ../midori/midori-browser.c:5831 +#: ../midori/midori-browser.c:5712 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5833 +#: ../midori/midori-browser.c:5714 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6035 -msgid "_Inline Find:" -msgstr "Cerca nel _testo:" - -#: ../midori/midori-browser.c:6066 -msgid "Previous" -msgstr "Successivo" - -#: ../midori/midori-browser.c:6071 -msgid "Next" -msgstr "Precedente" - -#: ../midori/midori-browser.c:6076 -msgid "Match Case" -msgstr "Maiuscole/minuscole" - -#: ../midori/midori-browser.c:6085 -msgid "Highlight Matches" -msgstr "Evidenzia risultati" - -#: ../midori/midori-browser.c:6097 -msgid "Close Findbar" -msgstr "Chiudi barra ricerca" - -#: ../midori/midori-browser.c:6143 ../panels/midori-transfers.c:143 -msgid "Clear All" -msgstr "Cancella tutto" - -#: ../midori/midori-browser.c:6501 +#: ../midori/midori-browser.c:6291 #, c-format msgid "Unexpected setting '%s'" msgstr "Impostazione «%s» non prevista" -#: ../midori/midori-locationaction.c:982 +#: ../midori/midori-locationaction.c:390 +#, c-format +msgid "Failed to select from history\n" +msgstr "Impossibile selezionare dalla cronologia: %s\n" + +#: ../midori/midori-locationaction.c:478 +#, c-format +msgid "Search for %s" +msgstr "Cerca %s" + +#: ../midori/midori-locationaction.c:501 #, c-format msgid "Search with %s" msgstr "Cerca con %s" -#: ../midori/midori-panel.c:434 ../midori/midori-panel.c:436 +#: ../midori/midori-locationaction.c:1268 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "Impossibile eseguire la richiesta al database\n" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1324 +msgid "Paste and p_roceed" +msgstr "Incolla e p_rocedi" + +#: ../midori/midori-panel.c:412 +#: ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Stacca il pannello selezionato dalla finestra" -#: ../midori/midori-panel.c:446 ../midori/midori-panel.c:448 -#: ../midori/midori-panel.c:638 ../midori/midori-panel.c:641 +#: ../midori/midori-panel.c:424 +#: ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 +#: ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Allinea il pannello laterale a destra" -#: ../midori/midori-panel.c:458 ../midori/midori-panel.c:459 +#: ../midori/midori-panel.c:436 +#: ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Chiudi pannello" -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:614 +#: ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Allinea il pannello laterale a sinistra" -#: ../midori/midori-panel.c:722 -msgid "Show panel _titles" -msgstr "Mostra i _titoli del pannello" - -#: ../midori/midori-panel.c:729 -msgid "Show operating _controls" -msgstr "Mostra i _controlli operativi" - -#: ../midori/midori-panel.c:834 -msgid "Options" -msgstr "Opzioni" +#: ../midori/midori-panel.c:771 +msgid "Hide operating controls" +msgstr "Nascondi i controlli operativi" #: ../midori/midori-websettings.c:200 msgid "Show Blank page" @@ -985,566 +1117,566 @@ msgstr "Mostra la pagina iniziale" msgid "Show last open tabs" msgstr "Mostra le ultime schede aperte" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:203 +msgid "Show last tabs without loading" +msgstr "Mostra le ultime schede senza caricarle" + +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Giapponese (SHIFT_JIS)" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Nuova scheda" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Nuova finestra" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Scheda corrente" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "Predefinito" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Icone" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Icone piccole" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Testo" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Icone e testo" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Testo accanto alle icone" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:276 +msgid "Automatic (GNOME or environment)" +msgstr "Automatico (GNOME o ambiente)" + +#: ../midori/midori-websettings.c:277 +msgid "HTTP proxy server" +msgstr "Server proxy HTTP" + +#: ../midori/midori-websettings.c:278 +msgid "No proxy server" +msgstr "Nessun proxy" + +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Tutti i cookie" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "Cookie di sessione" -#: ../midori/midori-websettings.c:277 ../panels/midori-addons.c:93 -#: ../katze/katze-utils.c:648 +#: ../midori/midori-websettings.c:295 +#: ../katze/katze-utils.c:668 msgid "None" msgstr "Nessuno" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:295 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Ricorda la dimensione dell'ultima finestra" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" -msgstr "" -"Abilitare questa opzione per salvare le dimensioni dell'ultima finestra" +msgstr "Abilitare questa opzione per salvare le dimensioni dell'ultima finestra" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Larghezza dell'ultima finestra" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "L'ultima larghezza salvata per la finestra" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Altezza dell'ultima finestra" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "L'ultima altezza salvata per la finestra" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Posizione del pannello" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "L'ultima posizione salvata per il pannello" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Pagina dell'ultimo pannello" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "L'ultima pagina salvata per il pannello" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Ultima ricerca web" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "L'ultima ricerca web salvata" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Mostra barra dei menu" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Abilitare questa opzione per mostrare la barra dei menu" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Mostra barra di navigazione" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Abilitare questa opzione per mostrare la barra di navigazione" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Mostra barra dei segnalibri" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Abilitare questa opzione per mostrare la barra dei segnalibri" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Mostra pannello" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Abilitare questa opzione per mostrare il pannello" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Mostra la barra dei trasferimenti" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Abilitare questa opzione per mostrare la barra degli scaricamenti" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Mostra barra di stato" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Abilitare questa opzione per mostrare la barra di stato" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Stile della barra degli strumenti:" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "Scegliere lo stile della barra degli strumenti" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Mostra caricamento nella barra degli indirizzi" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" -msgstr "" -"Abilitare questa opzione per mostrare la percentuale di caricamento della " -"pagina nella barra degli indirizzi" +msgstr "Abilitare questa opzione per mostrare la percentuale di caricamento della pagina nella barra degli indirizzi" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Motori di ricerca nell'autocompletamento" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" -msgstr "" -"Abilitare questa opzione per mostrare i motori di ricerca durante il " -"completamento dell'indirizzo" +msgstr "Abilitare questa opzione per mostrare i motori di ricerca durante il completamento dell'indirizzo" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Elementi barra degli strumenti" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Indicare gli elementi da mostrare nella barra degli strumenti" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Pannello compatto" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Abilitare questa opzione per la visualizzazione compatta del pannello" -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Mostra i controlli operativi del pannello" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" -msgstr "" -"Abilitare questa opzione per mostrare i controlli operativi del pannello" +msgstr "Abilitare questa opzione per mostrare i controlli operativi del pannello" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Allinea a destra il pannello laterale" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Abilitare questa opzione per allineare il pannello laterale a destra" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Apri i pannelli in finestre separate" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" -msgstr "" -"Abilitare questa opzione per aprire sempre i pannelli in finestre separate" +msgstr "Abilitare questa opzione per aprire sempre i pannelli in finestre separate" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "All'avvio di Midori:" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Cosa fare all'avvio di Midori" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Pagina iniziale:" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:622 msgid "The homepage" -msgstr "Pagina iniziale" +msgstr "La pagina iniziale" -#: ../midori/midori-websettings.c:619 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Mostra finestra di errore" -#: ../midori/midori-websettings.c:620 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" -msgstr "" -"Abilitare questa opzione per mostrare una finestra nel caso Midori si sia " -"chiuso inaspettatamente" +msgstr "Abilitare questa opzione per mostrare una finestra nel caso Midori si sia chiuso inaspettatamente" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Mostra le selezioni veloci nelle nuove schede" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" -msgstr "" -"Abilitare questa opzione per mostrare la selezione veloce nelle nuove tab" +msgstr "Abilitare questa opzione per mostrare la selezione veloce nelle nuove tab" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Salva i file scaricati in:" -#: ../midori/midori-websettings.c:646 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "Scegliere la cartella dove devono essere salvati i file scaricati" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Richiedi cartella di destinazione" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" -"Abilitare questa opzione per chiedere la cartella di destinazione quando si " -"scarica un file" +msgstr "Abilitare questa opzione per chiedere la cartella di destinazione quando si scarica un file" -#: ../midori/midori-websettings.c:687 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Notifica quando un trasferimento è stato completato" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" -"Abilitare questa opzione per mostrare una notifica quando viene completato " -"un trasferimento" +msgstr "Abilitare questa opzione per mostrare una notifica quando viene completato un trasferimento" -#: ../midori/midori-websettings.c:700 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Gestione scaricamenti" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" -msgstr "Un gestore dei scaricamenti esterno" +msgstr "Un gestore di scaricamenti esterno" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Editor di testo" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Inserire un editor di testo esterno" -#: ../midori/midori-websettings.c:725 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Aggregatore notizie" -#: ../midori/midori-websettings.c:726 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Aggregatore di notizie esterno" -#: ../midori/midori-websettings.c:734 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Motore di ricerca predefinito" -#: ../midori/midori-websettings.c:735 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" -msgstr "" -"Inserire il motore di ricerca predefinito da utilizzare dalla barra degli " -"indirizzi" +msgstr "Inserire il motore di ricerca predefinito da utilizzare dalla barra degli indirizzi" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Codifica preferita" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Scegliere la codifica dei caratteri preferita" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Mostra sempre le schede" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Abilitare questa opzione per mostrare sempre le etichette delle schede" -#: ../midori/midori-websettings.c:763 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Pulsante di chiusura schede" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" -msgstr "" -"Abilitare questa opzione per visualizzare il pulsante di chiusura nelle " -"schede" +msgstr "Abilitare questa opzione per visualizzare il pulsante di chiusura nelle schede" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Apri le nuove pagine in:" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Scegliere dove aprire le nuove pagine" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Apri le pagine esterne in:" -#: ../midori/midori-websettings.c:783 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Scegliere dove aprire le pagine aperte da applicazioni esterne" -#: ../midori/midori-websettings.c:792 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Tasto centrale apre la selezione" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" -msgstr "" -"Abilitare questa opzione per poter caricare un indirizzo da una selezione " -"tramite il clic col tasto centrale" +msgstr "Abilitare questa opzione per poter caricare un indirizzo da una selezione tramite il clic col tasto centrale" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Apri schede sullo sfondo" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Abilitare questa opzione per aprire le nuove schede sullo sfondo" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Apri schede dopo quella corrente" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale " -"oppure disabilitarla per aprirle dopo l'ultima" +msgstr "Abilitare questa opzione per aprire le nuove schede dopo la scheda attuale oppure disabilitarla per aprirle dopo l'ultima" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Apri popup in schede" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Abilitare questa opzione per aprire le finestre popup in schede" -#: ../midori/midori-websettings.c:830 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" -msgstr "Carica immagini" +msgstr "Carica immagini automaticamente" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" -msgstr "" -"Abilitare questa opzione per caricare e visualizzare automaticamente le " -"immagini" +msgstr "Abilitare questa opzione per caricare e visualizzare automaticamente le immagini" -#: ../midori/midori-websettings.c:838 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Abilita script" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" -msgstr "" -"Abilitare questa opzione per attivare i linguaggi di scripting integrati" +msgstr "Abilitare questa opzione per attivare i linguaggi di scripting integrati" -#: ../midori/midori-websettings.c:846 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 +#: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Abilita plugin di Netscape" -#: ../midori/midori-websettings.c:847 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" -msgstr "" -"Abilitare questa opzione per attivare gli oggetti integrati con i plugin di " -"Netscape" +msgstr "Abilitare questa opzione per attivare gli oggetti integrati con i plugin di Netscape" -#: ../midori/midori-websettings.c:862 +#: ../midori/midori-websettings.c:881 +msgid "Enable HTML5 database support" +msgstr "Abilita il supporto al database HTML5" + +#: ../midori/midori-websettings.c:882 +msgid "Whether to enable HTML5 database support" +msgstr "Abilitare questa opzione per attivare il supporto al database HTML5" + +#: ../midori/midori-websettings.c:888 +msgid "Enable HTML5 local storage support" +msgstr "Abilita il supporto allo storage locale HTML5" + +#: ../midori/midori-websettings.c:889 +msgid "Whether to enable HTML5 local storage support" +msgstr "Abilitare questa opzione per attivare il supporto allo storage locale HTML5" + +#: ../midori/midori-websettings.c:897 +msgid "Enable offline web application cache" +msgstr "Abilita la cache delle applicazioni web offline" + +#: ../midori/midori-websettings.c:898 +msgid "Whether to enable offline web application cache" +msgstr "Abilitare questa opzione per attivare la cache delle applicazioni web quando offline" + +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Ingrandimento testo e immagini" -#: ../midori/midori-websettings.c:863 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Abilitare questa opzione per ingrandire il testo e le immagini" -#: ../midori/midori-websettings.c:878 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Cerca nella pagina durante la digitazione" -#: ../midori/midori-websettings.c:879 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" -msgstr "" -"Abilitare questa opzione per cercare automaticamente nella pagina durante la " -"digitazione" +msgstr "Abilitare questa opzione per cercare automaticamente nella pagina durante la digitazione" -#: ../midori/midori-websettings.c:894 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Scorrimento per movimento" -#: ../midori/midori-websettings.c:895 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Se durante lo scorrimento si deve tener conto della velocità del movimento" +msgstr "Se durante lo scorrimento si deve tener conto della velocità del movimento" -#: ../midori/midori-websettings.c:903 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Accetta cookie" -#: ../midori/midori-websettings.c:904 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Indicare che tipo di cookie devono essere accettati" -#: ../midori/midori-websettings.c:913 -msgid "Original cookies only" -msgstr "Cookie originali" - -#: ../midori/midori-websettings.c:914 -msgid "Accept cookies from the original website only" -msgstr "" -"Abilitare questa opzione per accettare i cookie solo dai siti originali" - -#: ../midori/midori-websettings.c:922 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Durata massima dei cookie" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Numero massimo di giorni per cui possono essere validi i cookie" -#: ../midori/midori-websettings.c:940 -msgid "Remember last visited pages" -msgstr "Ricorda ultime pagine visitate" - -#: ../midori/midori-websettings.c:941 -msgid "Whether the last visited pages are saved" -msgstr "" -"Abilitare questa opzione per salvare l'elenco delle ultime pagine visitate" - -#: ../midori/midori-websettings.c:949 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Durata cronologia" -#: ../midori/midori-websettings.c:950 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Numero massimo di giorni per cui deve essere salvata la cronologia" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Ricorda gli ultimi file scaricati" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" -msgstr "" -"Abilitare questa opzione per salvare l'elenco degli ultimi file scaricati" +msgstr "Abilitare questa opzione per salvare l'elenco degli ultimi file scaricati" -#: ../midori/midori-websettings.c:969 -msgid "Proxy Server" +#: ../midori/midori-websettings.c:1011 +msgid "Proxy server" msgstr "Server proxy" -#: ../midori/midori-websettings.c:970 +#: ../midori/midori-websettings.c:1012 +msgid "The type of proxy server to use" +msgstr "Il tipo di server proxy da usare" + +#: ../midori/midori-websettings.c:1021 +msgid "HTTP Proxy Server" +msgstr "Server proxy HTTP" + +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Inserire il server proxy usato per le connessioni HTTP" -#: ../midori/midori-websettings.c:985 -msgid "Detect proxy server automatically" -msgstr "Riconosci automaticamente il server proxy" - -#: ../midori/midori-websettings.c:986 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" -"Abilitare questa opzione per riconoscere automaticamente il server proxy di " -"sistema" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1002 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Identifica come" -#: ../midori/midori-websettings.c:1003 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Come essere identificati sul web" -#: ../midori/midori-websettings.c:1019 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Stringa di identificazione" -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "Inserire la stringa di identificazione dell'applicazione" -#: ../midori/midori-websettings.c:1035 +#: ../midori/midori-websettings.c:1071 +msgid "Preferred languages" +msgstr "Lingue preferite" + +#: ../midori/midori-websettings.c:1072 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Una lista separata da virgole dei linguaggi preferiti per la visualizzazione di pagine web multilingua, per esempio \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" + +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Cancella i dati personali" -#: ../midori/midori-websettings.c:1036 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "Dati privati selezionati per la cancellazione" @@ -1552,450 +1684,559 @@ msgstr "Dati privati selezionati per la cancellazione" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:915 ../midori/midori-view.c:3831 -#: ../midori/midori-view.c:3835 +#: ../midori/midori-view.c:1227 +#: ../midori/midori-view.c:4439 +#: ../midori/midori-view.c:4443 #, c-format msgid "Error - %s" msgstr "Errore - %s" -#: ../midori/midori-view.c:916 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La pagina '%s' non può essere caricata." -#: ../midori/midori-view.c:921 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Riprova" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:954 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Non trovato - %s" -#: ../midori/midori-view.c:1168 ../midori/midori-view.c:1912 +#: ../midori/midori-view.c:1433 +#: ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Invia un messaggio a %s" -#: ../midori/midori-view.c:1739 ../midori/midori-view.c:1807 -msgid "Open _Link" -msgstr "Apri co_llegamento" +#: ../midori/midori-view.c:2061 +#: ../midori/midori-view.c:2446 +msgid "Inspect _Element" +msgstr "Ispeziona _Elemento" -#: ../midori/midori-view.c:1742 ../midori/midori-view.c:1809 +#: ../midori/midori-view.c:2113 +#: ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Apri collegamento in una nuova sc_heda" -#: ../midori/midori-view.c:1746 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Apri collegamento in una scheda in primo _piano" -#: ../midori/midori-view.c:1747 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Apri collegamento in una scheda in secondo p_iano" -#: ../midori/midori-view.c:1750 ../midori/midori-view.c:1816 +#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Apri collegamento in una nuova _finestra" -#: ../midori/midori-view.c:1753 -msgid "_Copy Link destination" -msgstr "_Copia indirizzo collegamento" +#: ../midori/midori-view.c:2124 +msgid "Open Link as Web A_pplication" +msgstr "Apri il collegamento come applicazione _web" -#: ../midori/midori-view.c:1756 ../midori/midori-view.c:1828 +#: ../midori/midori-view.c:2127 +msgid "Copy Link de_stination" +msgstr "Copia l'indirizzo di de_stinazione" + +#: ../midori/midori-view.c:2130 +#: ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Salva indirizzo collegamento" -#: ../midori/midori-view.c:1757 ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "Scarica in_dirizzo collegamento" -#: ../midori/midori-view.c:1761 ../midori/midori-view.c:1797 -#: ../midori/midori-view.c:1833 +#: ../midori/midori-view.c:2135 +#: ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Scarica con Gestore scarica_menti" -#: ../midori/midori-view.c:1773 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Apri _immagine in nuova scheda" -#: ../midori/midori-view.c:1776 -msgid "Open Image in New Wi_ndow" -msgstr "Apri immagine in nuova fi_nestra" - -#: ../midori/midori-view.c:1779 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Copi_a indirizzo immagine" -#: ../midori/midori-view.c:1782 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Salva i_mmagine" -#: ../midori/midori-view.c:1783 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Scarica i_mmagine" -#: ../midori/midori-view.c:1790 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Copi_a indirizzo video" -#: ../midori/midori-view.c:1793 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Salva _video" -#: ../midori/midori-view.c:1793 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Scarica _video" -#: ../midori/midori-view.c:1853 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Cerca _con" -#: ../midori/midori-view.c:1888 ../midori/midori-view.c:1899 +#: ../midori/midori-view.c:2259 +#: ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Cerca nel web" -#: ../midori/midori-view.c:1920 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Apri indirizzi in una nuova _scheda" -#: ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Apri o scarica file" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tipo di file: '%s'" -#: ../midori/midori-view.c:2216 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo di file: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2220 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Apri %s" -#: ../midori/midori-view.c:2736 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Controlla pagina - %s" -#: ../midori/midori-view.c:2954 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Selezione veloce" -#: ../midori/midori-view.c:2955 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Clicca per aggiungere un collegamento" -#: ../midori/midori-view.c:2956 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Inserisci indirizzo del collegamento" -#: ../midori/midori-view.c:2957 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Inserisci titolo del collegamento" -#: ../midori/midori-view.c:2958 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Sicuro di voler eliminare questo collegamento?" -#: ../midori/midori-view.c:2988 +#: ../midori/midori-view.c:3444 +msgid "Set number of columns and rows" +msgstr "Imposta il numero di righe e colonne" + +#: ../midori/midori-view.c:3445 +msgid "Enter number of columns and rows:" +msgstr "Inserisci il numero di righe e colonne" + +#: ../midori/midori-view.c:3446 +msgid "Invalid input for the size of the speed dial" +msgstr "Valore non valido per la dimensione della selezione veloce" + +#: ../midori/midori-view.c:3447 +msgid "Thumb size:" +msgstr "Dimensione della miniatura:" + +#: ../midori/midori-view.c:3448 +msgid "Small" +msgstr "Piccolo" + +#: ../midori/midori-view.c:3449 +msgid "Medium" +msgstr "Medio" + +#: ../midori/midori-view.c:3450 +msgid "Big" +msgstr "Grande" + +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Il documento non può essere visualizzato" -#: ../midori/midori-view.c:3005 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "La documentazione non è installata" -#: ../midori/midori-view.c:3132 +#: ../midori/midori-view.c:3617 +msgid "Page loading delayed" +msgstr "Caricamento pagina ritardato" + +#: ../midori/midori-view.c:3618 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Caricamento ritardato a causa di un errore recente o delle preferenze di avvio" + +#: ../midori/midori-view.c:3619 +msgid "Load Page" +msgstr "Carica pagina" + +#: ../midori/midori-view.c:3761 msgid "Blank page" msgstr "Pagina vuota" -#: ../midori/midori-view.c:3375 +#: ../midori/midori-view.c:4015 msgid "_Duplicate Tab" msgstr "_Duplica scheda" -#: ../midori/midori-view.c:3380 +#: ../midori/midori-view.c:4020 msgid "_Restore Tab" msgstr "_Ripristina scheda" -#: ../midori/midori-view.c:3380 +#: ../midori/midori-view.c:4020 msgid "_Minimize Tab" msgstr "_Minimizza scheda" -#: ../midori/midori-view.c:3937 +#: ../midori/midori-view.c:4026 +msgid "Close ot_her Tabs" +msgstr "Chiudi le altre sc_hede" + +#: ../midori/midori-view.c:4676 msgid "Print background images" msgstr "Stampa immagini di sfondo" -#: ../midori/midori-view.c:3938 +#: ../midori/midori-view.c:4677 msgid "Whether background images should be printed" msgstr "Abilitare questa opzione per stampare le immagini di sfondo" -#: ../midori/midori-view.c:3982 ../midori/midori-preferences.c:383 +#: ../midori/midori-view.c:4729 +#: ../midori/midori-preferences.c:384 msgid "Features" msgstr "Opzioni" #. Page "General" -#: ../midori/midori-preferences.c:300 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Generale" -#: ../midori/midori-preferences.c:301 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Avvio" -#: ../midori/midori-preferences.c:316 ../midori/midori-preferences.c:323 +#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Usa la pagina corrente come homepage" -#: ../midori/midori-preferences.c:333 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:334 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Trasferimenti" #. Page "Appearance" -#: ../midori/midori-preferences.c:351 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Visualizzazione" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Impostazioni caratteri" -#: ../midori/midori-preferences.c:354 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Famiglia di caratteri predefinita" -#: ../midori/midori-preferences.c:357 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" -msgstr "" -"Scegliere la famiglia predefinita dei caratteri per visualizzare il testo" +msgstr "Scegliere la famiglia predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" -msgstr "" -"Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" +msgstr "Scegliere la dimensione predefinita dei caratteri per visualizzare il testo" -#: ../midori/midori-preferences.c:362 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Caratteri a larghezza fissa" -#: ../midori/midori-preferences.c:365 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" -msgstr "" -"Dimensione dei caratteri del testo per visualizzare testi di larghezza " -"predefinita" +msgstr "Dimensione dei caratteri del testo per visualizzare testi di larghezza predefinita" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" -msgstr "" -"Dimensione dei caratteri utilizzati per visualizzare il testo di altezza " -"fissa" +msgstr "Dimensione dei caratteri utilizzati per visualizzare il testo di altezza fissa" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Dimensione minima caratteri" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Scegliere la dimensione minima dei caratteri per visualizzare il testo" #. Page "Behavior" -#: ../midori/midori-preferences.c:382 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:404 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Forza 96 punti per pollice" -#: ../midori/midori-preferences.c:405 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Abilitare questa opzione per forzare la densità dei punti a 96 DPI" -#: ../midori/midori-preferences.c:408 -msgid "Enable developer tools" -msgstr "Abilita strumenti di sviluppo" - -#: ../midori/midori-preferences.c:409 -msgid "Enable special extensions for developers" -msgstr "" -"Abilitare questa opzione per utilizzare le estensioni per gli sviluppatori" - #: ../midori/midori-preferences.c:417 +msgid "Allow scripts to open popups" +msgstr "Permetti agli script di aprire popup" + +#: ../midori/midori-preferences.c:418 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "Abilitare questa opzione per consentire l' apertura automatica delle finestre di popup" + +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Controllo dell'ortografia" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Abilita controllo ortografico" -#: ../midori/midori-preferences.c:421 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" -msgstr "" -"Abilita questa opzione per attivare il controllo ortografico durante la " -"digitazione" +msgstr "Abilita questa opzione per attivare il controllo ortografico durante la digitazione" + +#: ../midori/midori-preferences.c:428 +msgid "Spelling dictionaries:" +msgstr "Dizionari di controllo ortografico:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:425 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Una virgola deve separare le lingue in lista da usare nel controllo " -"ortografico, per esempio \"en_GB,de_DE\"" +#: ../midori/midori-preferences.c:432 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Una lista separata da virgole da usare per il controllo ortografico, per esempio \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Interfaccia" -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Barra di navigazione" -#: ../midori/midori-preferences.c:442 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navigazione" #. Page "Applications" -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Applicazioni" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Applicazioni esterne" #. Page "Network" -#: ../midori/midori-preferences.c:481 ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:489 msgid "Network" msgstr "Rete" +#: ../midori/midori-preferences.c:495 +msgid "Hostname" +msgstr "Nome host" + #. Page "Privacy" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Privacy" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Cookie" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:538 msgid "days" msgstr "giorni" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Vuoto" + +#: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Aggiungi motore di ricerca" -#: ../midori/midori-searchaction.c:923 +#: ../midori/midori-searchaction.c:917 msgid "Edit search engine" msgstr "Modifica motore di ricerca" -#: ../midori/midori-searchaction.c:951 +#: ../midori/midori-searchaction.c:945 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:995 +#: ../midori/midori-searchaction.c:989 msgid "_Icon:" msgstr "I_cona:" -#: ../midori/midori-searchaction.c:1009 +#: ../midori/midori-searchaction.c:1003 msgid "_Token:" msgstr "Parame_tro:" -#: ../midori/midori-searchaction.c:1232 +#: ../midori/midori-searchaction.c:1234 msgid "Manage Search Engines" msgstr "Gestisci motori di ricerca" -#: ../midori/midori-searchaction.c:1333 +#: ../midori/midori-searchaction.c:1335 msgid "Use as _default" msgstr "Usa come _predefinito" -#: ../midori/sokoke.c:1113 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "S_egnalibro" -#: ../midori/sokoke.c:1115 +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "Segnali_bri" + +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Aggiungi se_gnalibro" -#: ../midori/sokoke.c:1116 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:1117 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Estensioni" -#: ../midori/sokoke.c:1118 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "C_ronologia" -#: ../midori/sokoke.c:1119 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Pagina iniziale" -#: ../midori/sokoke.c:1120 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "Script dell'_utente" -#: ../midori/sokoke.c:1121 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nuova _scheda" -#: ../midori/sokoke.c:1122 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Trasferimenti" -#: ../midori/sokoke.c:1123 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Plugins n_avigatore" -#: ../panels/midori-addons.c:94 ../panels/midori-addons.c:139 -msgid "Userscripts" -msgstr "Script dell'utente" +#: ../midori/sokoke.c:1316 +msgid "New _Folder" +msgstr "Nuova _cartella" -#: ../panels/midori-addons.c:95 -msgid "Userstyles" -msgstr "Stili dell'utente" +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "Cerca nel _testo:" -#: ../panels/midori-addons.c:294 +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Successivo" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Precedente" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Maiuscole/minuscole" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Evidenzia risultati" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Chiudi barra ricerca" + +#: ../toolbars/midori-transferbar.c:88 +#: ../panels/midori-transfers.c:273 #, c-format -msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -msgstr "" -"Copia gli script utente nella cartella %s e copia gli stili utente nella " -"cartella %s." +msgid "%s of %s" +msgstr "%s di %s" -#: ../panels/midori-addons.c:896 +#: ../toolbars/midori-transferbar.c:123 #, c-format -msgid "Can't monitor folder '%s': %s" -msgstr "Impossibile monitorare la cartella '%s': %s" +msgid "The file '%s' has been downloaded." +msgstr "Il file '%s' è stato traferito." -#: ../panels/midori-bookmarks.c:112 +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Trasferimento completato" + +#: ../toolbars/midori-transferbar.c:257 +#: ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "Cancella tutto" + +#: ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "Alcuni file sono stati scaricati" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "_Chiudi Midori" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "I trasferimenti verranno cancellati se Midori viene chiuso" + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Segnalibri" -#: ../panels/midori-bookmarks.c:251 +#: ../panels/midori-bookmarks.c:275 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Impossibile aggiungere il segnalibro: %s\n" + +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Modifica il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:259 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Elimina il segnalibro selezionato" -#: ../panels/midori-bookmarks.c:279 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Aggiungi una nuova cartella" -#: ../panels/midori-bookmarks.c:609 +#: ../panels/midori-bookmarks.c:568 +#: ../panels/midori-history.c:569 msgid "Separator" msgstr "Separatore" @@ -2003,71 +2244,66 @@ msgstr "Separatore" msgid "Console" msgstr "Console" +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "Copi_a Tutto" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "Copia tutto" + #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Estensioni" -#: ../panels/midori-history.c:162 -msgid "Are you sure you want to remove all history items?" -msgstr "Cancellare completamente la cronologia?" - -#: ../panels/midori-history.c:217 -msgid "Bookmark the selected history item" -msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" - -#: ../panels/midori-history.c:226 -msgid "Delete the selected history item" -msgstr "Elimina l'elemento selezionato dalla cronologia" - -#: ../panels/midori-history.c:234 -msgid "Clear the entire history" -msgstr "Cancella l'intera cronologia" - -#: ../panels/midori-history.c:598 -msgid "Erroneous clock time" -msgstr "Ora dell'orologio errata" - -#: ../panels/midori-history.c:599 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "L'ora dell'orologio è passata. Controllare la data e l'ora corrente." - -#: ../panels/midori-history.c:611 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Una settimana fa" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d giorno fa" msgstr[1] "%d giorni fa" -#: ../panels/midori-history.c:624 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Oggi" -#: ../panels/midori-history.c:626 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Ieri" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108 -msgid "Netscape plugins" -msgstr "Plugin di netscape" +#: ../panels/midori-history.c:324 +msgid "Are you sure you want to remove all history items?" +msgstr "Cancellare completamente la cronologia?" -#: ../panels/midori-transfers.c:480 +#: ../panels/midori-history.c:369 +msgid "Bookmark the selected history item" +msgstr "Crea un segnalibro dall'elemento della cronologia selezionato" + +#: ../panels/midori-history.c:378 +msgid "Delete the selected history item" +msgstr "Elimina l'elemento selezionato dalla cronologia" + +#: ../panels/midori-history.c:386 +msgid "Clear the entire history" +msgstr "Cancella l'intera cronologia" + +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Apri _cartella di destinazione" -#: ../panels/midori-transfers.c:483 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copia l'indirizzo del colle_gamento" -#: ../katze/katze-http-auth.c:209 +#: ../katze/katze-http-auth.c:214 msgid "Authentication Required" msgstr "Autenticazione richiesta" -#: ../katze/katze-http-auth.c:225 +#: ../katze/katze-http-auth.c:230 msgid "" "A username and a password are required\n" "to open this location:" @@ -2075,126 +2311,167 @@ msgstr "" "Sono necessari un nome utente e una password\n" "per aprire questo indirizzo:" -#: ../katze/katze-http-auth.c:239 +#: ../katze/katze-http-auth.c:244 msgid "Username" msgstr "Nome utente" -#: ../katze/katze-http-auth.c:252 +#: ../katze/katze-http-auth.c:257 msgid "Password" msgstr "Password" -#: ../katze/katze-http-auth.c:266 +#: ../katze/katze-http-auth.c:272 msgid "_Remember password" msgstr "Memo_rizza password" -#: ../katze/katze-throbber.c:828 +#: ../katze/katze-throbber.c:882 #, c-format msgid "Named icon '%s' couldn't be loaded" msgstr "L'icona denominata '%s' non può essere caricata" -#: ../katze/katze-throbber.c:841 +#: ../katze/katze-throbber.c:895 #, c-format msgid "Stock icon '%s' couldn't be loaded" msgstr "L'icona «%s» dello stock non può essere caricata" -#: ../katze/katze-throbber.c:907 +#: ../katze/katze-throbber.c:963 msgid "Animation frames are broken" msgstr "I fotogrammi dell'animazione sono danneggiati" -#: ../katze/katze-utils.c:483 ../katze/katze-utils.c:874 +#: ../katze/katze-utils.c:499 +#: ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La proprietà «%s» non è valida per %s" -#: ../katze/katze-utils.c:529 ../katze/katze-utils.c:558 +#: ../katze/katze-utils.c:545 +#: ../katze/katze-utils.c:574 msgid "Choose file" msgstr "Scegli un file" -#: ../katze/katze-utils.c:544 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "Scegli una cartella" -#: ../katze/katze-preferences.c:91 +#: ../katze/katze-preferences.c:95 #, c-format msgid "Preferences for %s" msgstr "Preferenze per %s" -#: ../extensions/adblock.c:377 +#: ../extensions/adblock.c:415 msgid "Configure Advertisement filters" msgstr "Configurazione dei filtri per gli avvisi pubblicitari" -#: ../extensions/adblock.c:409 +#: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Digitare l'indirizzo della lista dei filtri preconfigurati nel campo di " -"testo e fare clic su \"Aggiungi\" per aggiungerlo alla lista. E' possibile " -"trovare altre liste su %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Digitare l'indirizzo della lista dei filtri preconfigurati nel campo di testo e fare clic su \"Aggiungi\" per aggiungerlo alla lista. E' possibile trovare altre liste su %s." -#: ../extensions/adblock.c:549 +#: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." msgstr "Configura i filtri per gli av_visi pubblicitari..." -#: ../extensions/adblock.c:1103 +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "Modifica regola" + +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "_Regola:" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "Bl_occa immagine" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "Bl_occa link" + +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Blocca avvisi pubblicitari" -#: ../extensions/adblock.c:1104 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Blocca gli avvisi pubblicitari in accordo alla lista dei filtri" -#: ../extensions/colorful-tabs.c:127 +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "Copia %s nella cartella %s." + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "Script dell'utente" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "Stili dell'utente" + +#: ../extensions/addons.c:1085 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "La configurazione dell'estensione '%s' non possono essere salvate: %s\n" + +#: ../extensions/addons.c:1086 +#: ../extensions/addons.c:1253 +msgid "User addons" +msgstr "Estensioni utente" + +#: ../extensions/addons.c:1210 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "Impossibile monitorare la cartella '%s': %s" + +#: ../extensions/addons.c:1254 +msgid "Support for userscripts and userstyles" +msgstr "Supporto per userscripts ed userstyles" + +#: ../extensions/colorful-tabs.c:204 msgid "Colorful Tabs" msgstr "Tab colorate" -#: ../extensions/colorful-tabs.c:128 +#: ../extensions/colorful-tabs.c:205 msgid "Tint each tab distinctly" msgstr "Colora ogni etichetta in modo differente" -#: ../extensions/cookie-manager/cookie-manager-page.c:79 +#: ../extensions/cookie-manager/cookie-manager-page.c:82 #: ../extensions/cookie-manager/main.c:56 msgid "Cookie Manager" msgstr "Gestore Cookie" -#: ../extensions/cookie-manager/cookie-manager-page.c:109 +#: ../extensions/cookie-manager/cookie-manager-page.c:112 msgid "Delete All" msgstr "Rimuovi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:111 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Elimina tutti i cookie mostrati. Se è stato impostato un filtro, verranno " -"eliminati solo quelli risultanti dalla filtrazione." +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Elimina tutti i cookie mostrati. Se è stato impostato un filtro, verranno eliminati solo quelli risultanti dalla filtrazione." -#: ../extensions/cookie-manager/cookie-manager-page.c:126 +#: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" msgstr "Espandi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:133 +#: ../extensions/cookie-manager/cookie-manager-page.c:136 msgid "Collapse All" msgstr "Riduci tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:460 +#: ../extensions/cookie-manager/cookie-manager-page.c:578 msgid "Do you really want to delete all cookies?" msgstr "Vuoi davvero cancellare tutti i cookie?" -#: ../extensions/cookie-manager/cookie-manager-page.c:462 +#: ../extensions/cookie-manager/cookie-manager-page.c:580 msgid "Question" msgstr "Domanda" -#: ../extensions/cookie-manager/cookie-manager-page.c:471 +#: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." msgstr "Solo i cookie che combaciano col filtro verranno eliminati." -#: ../extensions/cookie-manager/cookie-manager-page.c:539 +#: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" msgstr "Alla fine della sessione" -#: ../extensions/cookie-manager/cookie-manager-page.c:542 +#: ../extensions/cookie-manager/cookie-manager-page.c:680 #, c-format msgid "" "Host: %s\n" @@ -2211,37 +2488,42 @@ msgstr "" "Protezione: %s\n" "Scadenza: %s" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "Yes" msgstr "Si" -#: ../extensions/cookie-manager/cookie-manager-page.c:548 +#: ../extensions/cookie-manager/cookie-manager-page.c:686 msgid "No" msgstr "No" -#: ../extensions/cookie-manager/cookie-manager-page.c:811 +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" +"Dominio: %s\n" +"Cookies: %d" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 msgid "Name" msgstr "Nome:" -#: ../extensions/cookie-manager/cookie-manager-page.c:862 +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 msgid "_Expand All" msgstr "_Espandi tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:870 +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 msgid "_Collapse All" msgstr "_Riduci tutto" -#: ../extensions/cookie-manager/cookie-manager-page.c:923 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 msgid "Filter:" msgstr "Filtro:" -#: ../extensions/cookie-manager/cookie-manager-page.c:928 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Inserisci una stringa filtro per mostrare i soli cookie il cui nome o " -"dominio corrisponda a quello del filtro inserito" +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Inserisci una stringa filtro per mostrare i soli cookie il cui nome o dominio corrisponda a quello del filtro inserito" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2251,56 +2533,68 @@ msgstr "Gestore _Cookie" msgid "List, view and delete cookies" msgstr "Elenca, mostra o elimina i cookie" -#: ../extensions/dnsprefetch.c:194 -msgid "DNS prefetching" -msgstr "Precaricamento DNS" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Copia gli indirizzi delle schede" -#: ../extensions/dnsprefetch.c:195 -msgid "Prefetch IP addresses of hovered links" -msgstr "Precarica gli indirizzi IP dei collegamenti attraversati" +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Copia gli indirizzi delle schede" -#: ../extensions/feed-panel/feed-atom.c:237 +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copia gli indirizzi di tutte le schede negli appunti" + +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Applicazioni esterne" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Associa gli schemi URL con comandi esterni" + +#: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Fallita la ricerca degli " +msgstr "Impossibile trovare gli elementi Atom \"entry\" nei dati XML." -#: ../extensions/feed-panel/feed-atom.c:343 +#: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Impossibile trovare l'elemento Atom \"feed\" nell'XML indicato." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Ultimo aggiornato: %s." +msgstr "Ultimo aggiornamento: %s." -#: ../extensions/feed-panel/feed-panel.c:667 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "Feed" -#: ../extensions/feed-panel/feed-panel.c:720 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "Aggiungi nuovo feed" -#: ../extensions/feed-panel/feed-panel.c:727 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "Elimina feed" -#: ../extensions/feed-panel/feed-panel.c:810 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Impossibile trovare elemento root nel file XML del feed." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Format del feed non supportato." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Errore nell'analisi del file XML del feed : %s" @@ -2321,60 +2615,91 @@ msgstr "Impossibile trovare l'elemento RSS \"item\" nell'XML indicato." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Impossibile trovare l'elemento RSS \"channel\" nell'XML indicato." -#: ../extensions/feed-panel/main.c:124 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Errore" -#: ../extensions/feed-panel/main.c:126 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "Il Feed '%s' già esiste." -#: ../extensions/feed-panel/main.c:203 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Errore nel caricare feed '%s'" -#: ../extensions/feed-panel/main.c:514 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "Pannello Feed" -#: ../extensions/feed-panel/main.c:515 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Leggi feed Atom/RSS" -#: ../extensions/formhistory.c:140 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Errore nell'aggiunta del valore della form: %s\n" -#: ../extensions/formhistory.c:502 +#: ../extensions/formhistory.c:455 +#: ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Errore nell'esecuzione della richiesta al database: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Memorizza una cronologia dei dati inseriti nei form" -#: ../extensions/formhistory.c:506 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Non disponibile: %s" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "I file della risorsa non sono installati" -#: ../extensions/formhistory.c:513 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Gestore cronologia form" -#: ../extensions/mouse-gestures.c:288 +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Scheda successiva (lista cronologia)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Scheda successiva dalla cronologia" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Scheda precedente (lista cronologia)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Scheda precedente dalla cornologia" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Lista cronologia" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Consente di cambiare scheda scegliendo da una lista ordinata per ultimo utilizzo" + +#: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gesti del mouse" -#: ../extensions/mouse-gestures.c:289 +#: ../extensions/mouse-gestures.c:304 msgid "Control Midori by moving the mouse" msgstr "Permette di controllare Midori con i movimenti del mouse" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Cornice della pagina" @@ -2386,22 +2711,30 @@ msgstr "_Cornice della pagina" msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Mantiene una o più pagine aperte in parallelo alla schede" -#: ../extensions/shortcuts.c:162 +#: ../extensions/shortcuts.c:170 msgid "Customize Keyboard shortcuts" msgstr "Personalizza le scorciatoie da tastiera" -#: ../extensions/shortcuts.c:268 +#: ../extensions/shortcuts.c:276 msgid "Customize Sh_ortcuts..." msgstr "Personalizza sc_orciatoie..." -#: ../extensions/shortcuts.c:307 +#: ../extensions/shortcuts.c:315 msgid "Shortcuts" msgstr "Scorciatoie" -#: ../extensions/shortcuts.c:308 +#: ../extensions/shortcuts.c:316 msgid "View and edit keyboard shortcuts" msgstr "Visualizza e modifica le scorciatoie da tastiera" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Orologio della barra di stato" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Mostra la data e l'ora nella barra di stato" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Immagini" @@ -2410,172 +2743,177 @@ msgstr "Immagini" msgid "Scripts" msgstr "Script" +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Plugin di netscape" + #: ../extensions/statusbar-features.c:149 msgid "Statusbar Features" msgstr "Proprietà della barra di stato" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "" -"Permette di attivare o disattivare facilmente determinate funzionalità sulle " -"pagine internet" +msgstr "Permette di attivare o disattivare facilmente determinate funzionalità sulle pagine internet" -#: ../extensions/tab-panel.c:565 ../extensions/tab-panel.c:622 +#: ../extensions/tab-panel.c:568 +#: ../extensions/tab-panel.c:625 msgid "Tab Panel" msgstr "Pannello a scheda" -#: ../extensions/tab-panel.c:606 +#: ../extensions/tab-panel.c:609 msgid "T_ab Panel" msgstr "Pannello _a scheda" -#: ../extensions/tab-panel.c:623 +#: ../extensions/tab-panel.c:626 msgid "Show tabs in a vertical panel" msgstr "Mostra le schede in un pannello verticale" -#: ../extensions/tab-switcher.c:394 -msgid "Tab History List" -msgstr "Lista cronologia schede" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "Minimizza le nuove schede" -#: ../extensions/tab-switcher.c:395 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"Consente di cambiare scheda scegliendo in una lista ordinata per ultimo " -"utilizzo" +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "Le nuove schede sono aperte minimizzate" -#: ../extensions/toolbar-editor.c:391 +#: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personalizza la barra degli strumenti" -#: ../extensions/toolbar-editor.c:407 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Seleziona gli oggetti da visualizzare nella barra degli strumenti. Gli " -"oggetti possono essere riordinati tramite trascinamento." +#: ../extensions/toolbar-editor.c:405 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Seleziona gli oggetti da visualizzare nella barra degli strumenti. Gli oggetti possono essere riordinati tramite trascinamento." -#: ../extensions/toolbar-editor.c:423 +#: ../extensions/toolbar-editor.c:421 msgid "Available Items" msgstr "Oggetti disponibili" -#: ../extensions/toolbar-editor.c:444 +#: ../extensions/toolbar-editor.c:442 msgid "Displayed Items" msgstr "Oggetti visualizzati" -#: ../extensions/toolbar-editor.c:579 +#: ../extensions/toolbar-editor.c:577 msgid "Customize _Toolbar..." msgstr "Personalizza barra degli s_trumenti..." -#: ../extensions/toolbar-editor.c:612 +#: ../extensions/toolbar-editor.c:608 msgid "Toolbar Editor" msgstr "Editor della barra degli strumenti" -#: ../extensions/toolbar-editor.c:614 +#: ../extensions/toolbar-editor.c:609 msgid "Easily edit the toolbar layout" -msgstr "" -"Permette di modificare facilmente la disposizione della barra degli strumenti" +msgstr "Permette di modificare facilmente la disposizione della barra degli strumenti" -#: ../extensions/toolbar-editor.c:617 -msgid "Not available on this platform" -msgstr "Non disponibile in questa piattaforma" - -#: ../extensions/web-cache.c:592 +#: ../extensions/web-cache.c:465 msgid "Cache HTTP communication on disk" msgstr "Memorizza la comunicazione HTTP sul disco" +#~ msgid "_Recently visited pages" +#~ msgstr "Pagine visitate _recentemente" +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Riapre le pagine visitate recentemente" +#~ msgid "Show the saved bookmarks" +#~ msgstr "Mostra i segnalibri salvati" +#~ msgid "Original cookies only" +#~ msgstr "Cookie originali" +#~ msgid "Accept cookies from the original website only" +#~ msgstr "" +#~ "Abilitare questa opzione per accettare i cookie solo dai siti originali" +#~ msgid "Remember last visited pages" +#~ msgstr "Ricorda ultime pagine visitate" +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "" +#~ "Abilitare questa opzione per salvare l'elenco delle ultime pagine visitate" +#~ msgid "Detect proxy server automatically" +#~ msgstr "Riconosci automaticamente il server proxy" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "" +#~ "Abilitare questa opzione per riconoscere automaticamente il server proxy " +#~ "di sistema" +#~ msgid "Open _Link" +#~ msgstr "Apri co_llegamento" +#~ msgid "Open Image in New Wi_ndow" +#~ msgstr "Apri immagine in nuova fi_nestra" +#~ msgid "Enable developer tools" +#~ msgstr "Abilita strumenti di sviluppo" +#~ msgid "Enable special extensions for developers" +#~ msgstr "" +#~ "Abilitare questa opzione per utilizzare le estensioni per gli sviluppatori" +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copia gli script utente nella cartella %s e copia gli stili utente nella " +#~ "cartella %s." +#~ msgid "DNS prefetching" +#~ msgstr "Precaricamento DNS" +#~ msgid "Prefetch IP addresses of hovered links" +#~ msgstr "Precarica gli indirizzi IP dei collegamenti attraversati" +#~ msgid "Not available on this platform" +#~ msgstr "Non disponibile in questa piattaforma" #~ msgid "Shrink images automatically" #~ msgstr "Ridimensiona immagini" - #~ msgid "Automatically shrink standalone images to fit" #~ msgstr "" #~ "Abilitare per ridimensionare automaticamente le immagini caricate da sole" - #~ msgid "Tint tabs distinctly" #~ msgstr "Colora le etichette in modo distinto" - #~ msgid "_Quick Find" #~ msgstr "Ricerca _veloce" - #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Salta velocemente a una parola o frase" - #~ msgid "Last open pages" #~ msgstr "Ultime pagine visitate" - #~ msgid "Both" #~ msgstr "Entrambi" - #~ msgid "Both horizontal" #~ msgstr "Entrambi orizzontalmente" - #~ msgid "Load on Startup" #~ msgstr "Carica all'avvio" - #~ msgid "Remember last form inputs" #~ msgstr "Ricorda i moduli compilati" - #~ msgid "Whether the last form inputs are saved" #~ msgstr "Abilitare per salvare le informazioni inserite nei moduli." - #~ msgid "Cache size" #~ msgstr "File temporanei" - #~ msgid "The allowed size of the cache" #~ msgstr "Dimensione massima consentita per i file temporanei" - #~ msgid "Search" #~ msgstr "Cerca" - #~ msgid "Encoding" #~ msgstr "Codifica" - #~ msgid "The character encoding to use by default" #~ msgstr "Scegliere la codifica predefinita dei caratteri" - #~ msgid "Resizable text areas" #~ msgstr "Aree di testo ridimensionabili" - #~ msgid "Whether text areas are resizable" #~ msgstr "Abilitare per rendere le aree di testo ridimensionabili" - #~ msgid "MB" #~ msgstr "MB" - #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Attenzione: si sta eseguendo l'applicazione come amministratore." - #~ msgid "User_styles" #~ msgstr "_Stili dell'utente" - #~ msgid "_Closed Tabs and Windows" #~ msgstr "_Finestre e schede chiuse" - #~ msgid "_Enable" #~ msgstr "_Abilita" - #~ msgid "Enable" #~ msgstr "Abilita" - #~ msgid "_Disable" #~ msgstr "_Disabilita" - #~ msgid "Disable" #~ msgstr "Disabilita" - #~ msgid "Source" #~ msgstr "Sorgente" - #~ msgid "%s has no property '%s'" #~ msgstr "%s non ha la proprietà «%s»" - #~ msgid "%s cannot be assigned to %s.%s" #~ msgstr "%s non può essere assegnato a %s.%s" - #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s non è accessibile" - #~ msgid "Plugins" #~ msgstr "Plugin" - #~ msgid "_Icon (name or file):" #~ msgstr "_Icona (nome o file):" + From cf880abf0c835de68ce2ddec5247ec0be385f434 Mon Sep 17 00:00:00 2001 From: Kim Boram Date: Sun, 22 Aug 2010 03:04:48 +0200 Subject: [PATCH 2888/2970] Update Korean translation --- po/ko.po | 1520 +++++++++++++++++++++++++++++------------------------- 1 file changed, 824 insertions(+), 696 deletions(-) diff --git a/po/ko.po b/po/ko.po index cc391770..1fa9eb91 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,23 +6,24 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.2.5\n" +"Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 13:27+0900\n" -"PO-Revision-Date: 2010-05-05 03:05+0900\n" +"POT-Creation-Date: 2010-08-15 14:18+0900\n" +"PO-Revision-Date: 2010-07-13 00:30+0900\n" "Last-Translator: Kim Boram \n" "Language-Team: Kim Boram \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "가벼운 웹 브라우저" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1331 ../midori/main.c:1660 +#: ../midori/main.c:1668 ../midori/main.c:1684 +#: ../midori/midori-websettings.c:311 msgid "Midori" msgstr "미도리" @@ -30,65 +31,71 @@ msgstr "미도리" msgid "Web Browser" msgstr "웹 브라우저" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "설정을 읽을 수 없습니다: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "값 '%s'은(는) %s에 대한 잘못된 값입니다" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr " '%s'은(는) 잘못된 설정 값입니다." -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "데이터베이스에 접속할 수 없음: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "오래된 기록 항목을 지울 수 없습니다: %s\n" -#: ../midori/main.c:445 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 #, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "설정을 저장할 수 없습니다. %s" +msgid "Failed to remove history item: %s\n" +msgstr "기록 항목을 제거할 수 없습니다: %s\n" -#: ../midori/main.c:483 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "검색 엔진을 저장할 수 없습니다. %s" - -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "책갈피를 저장할 수 없습니다.%s" +#: ../midori/main.c:531 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "설정을 저장할 수 없습니다. %s" + +#: ../midori/main.c:569 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "검색 엔진을 저장할 수 없습니다. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 +#: ../midori/main.c:589 ../midori/main.c:612 #, c-format msgid "The trash couldn't be saved. %s" msgstr "휴지통을 저장할 수 없습니다.%s" -#: ../midori/main.c:684 ../midori/main.c:924 +#: ../midori/main.c:671 ../midori/main.c:911 #, c-format msgid "The session couldn't be saved. %s" msgstr "세션을 저장할 수 없습니다.%s" -#: ../midori/main.c:868 +#: ../midori/main.c:855 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" "사용 가능한 루트 인증서 파일이 없습니다. SSL 인증서를 검증할 수 없습니다." -#: ../midori/main.c:958 +#: ../midori/main.c:945 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -96,426 +103,407 @@ msgstr "" "미도리가 마지막으로 실행되었을 때 비 정상적으로 종료된 것 같습니다. 이런 일" "이 계속된다면, 문제 해결을 위해 다음 중 하나를 선택하십시오." -#: ../midori/main.c:973 +#: ../midori/main.c:960 msgid "Modify _preferences" msgstr "기본 설정 수정(_P)" -#: ../midori/main.c:977 +#: ../midori/main.c:964 msgid "Reset the last _session" msgstr "마지막 세션 초기화(_S)" -#: ../midori/main.c:982 +#: ../midori/main.c:969 msgid "Disable all _extensions" msgstr "모든 확장 기능 비 활성화(_E)" -#: ../midori/main.c:1217 ../midori/main.c:1937 +#: ../midori/main.c:1209 ../midori/main.c:1955 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "세션을 열 수 없습니다: %s\n" -#: ../midori/main.c:1336 +#: ../midori/main.c:1331 msgid "No filename specified" msgstr "파일 이름이 지정되지 않았습니다." -#: ../midori/main.c:1355 +#: ../midori/main.c:1350 msgid "An unknown error occured." msgstr "알 수 없는 오류가 발생했습니다." -#: ../midori/main.c:1386 +#: ../midori/main.c:1381 #, c-format msgid "Snapshot saved to: %s\n" msgstr "스냅샷이 다음에 저장되었습니다: %s\n" -#: ../midori/main.c:1557 +#: ../midori/main.c:1553 msgid "Run ADDRESS as a web application" msgstr "[주소]를 웹 응용 프로그램으로 실행" -#: ../midori/main.c:1557 +#: ../midori/main.c:1553 msgid "ADDRESS" msgstr "[주소]" -#: ../midori/main.c:1560 +#: ../midori/main.c:1556 msgid "Use FOLDER as configuration folder" msgstr "[폴더]를 설정 폴더로 사용" -#: ../midori/main.c:1560 +#: ../midori/main.c:1556 msgid "FOLDER" msgstr "[폴더]" -#: ../midori/main.c:1563 +#: ../midori/main.c:1559 msgid "Show a diagnostic dialog" msgstr "진단 대화 상자 보기" -#: ../midori/main.c:1565 +#: ../midori/main.c:1561 msgid "Run the specified filename as javascript" msgstr "특정한 파일 이름을 자바 스크립트로 실행" -#: ../midori/main.c:1568 +#: ../midori/main.c:1564 msgid "Take a snapshot of the specified URI" msgstr "지정한 주소의 스냅샷 저장" -#: ../midori/main.c:1571 +#: ../midori/main.c:1567 msgid "Execute the specified command" msgstr "실행할 특정 명령어" -#: ../midori/main.c:1573 +#: ../midori/main.c:1569 msgid "Display program version" msgstr "프로그램의 버전 표시" -#: ../midori/main.c:1575 +#: ../midori/main.c:1571 msgid "Addresses" msgstr "주소" -#: ../midori/main.c:1577 +#: ../midori/main.c:1573 msgid "Block URIs according to regular expression PATTERN" msgstr "정규 표현 패턴에 따라 주소를 막기" -#: ../midori/main.c:1577 +#: ../midori/main.c:1573 msgid "PATTERN" msgstr "[패턴]" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 +#: ../midori/main.c:1577 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "수 초 이상 활동이 없을 경우 미도리 초기화" -#: ../midori/main.c:1581 +#: ../midori/main.c:1577 msgid "SECONDS" msgstr "[초]" -#: ../midori/main.c:1661 +#: ../midori/main.c:1657 msgid "[Addresses]" msgstr "[주소]" -#: ../midori/main.c:1689 +#: ../midori/main.c:1685 msgid "Please report comments, suggestions and bugs to:" msgstr "코멘트, 제안, 버그 등을 이곳에 보고해 주십시오:" -#: ../midori/main.c:1691 +#: ../midori/main.c:1687 msgid "Check for new versions at:" msgstr "다음에서 새 버전 검색:" -#: ../midori/main.c:1788 +#: ../midori/main.c:1804 msgid "The specified configuration folder is invalid." msgstr "지정된 설정 폴더가 유효하지 않습니다." -#: ../midori/main.c:1836 +#: ../midori/main.c:1852 msgid "An instance of Midori is already running but not responding.\n" msgstr "미도리가 이미 실행되어 있지만 응답을 하지 않고 있습니다.\n" -#: ../midori/main.c:1891 +#: ../midori/main.c:1907 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "검색 엔진을 불러올 수 없습니다. %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1928 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "책갈피를 읽을 수 없습니다: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "책갈피를 읽어올 수 없습니다: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1970 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "휴지통을 열 수 없습니다: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1983 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "기록을 열 수 없습니다: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1997 msgid "The following errors occured:" msgstr "다음의 오류가 발생했습니다:" -#: ../midori/main.c:1996 +#: ../midori/main.c:2013 msgid "_Ignore" msgstr "무시(_I)" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "파일이 없습니다." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "잘못된 문서." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "책갈피 형식을 알 수 없습니다." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "쓸 수 없습니다." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 +#: ../midori/midori-browser.c:341 ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4929 msgid "Reload the current page" msgstr "현재 페이지 다시 불러오기" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 +#: ../midori/midori-browser.c:351 ../midori/midori-browser.c:4926 msgid "Stop loading the current page" msgstr "현재 페이지 불러오기 중지" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:465 #, c-format msgid "%d%% loaded" msgstr "%d%% 불러옴" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:504 #, c-format msgid "Failed to update title: %s\n" msgstr "제목 업데이트 실패: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:517 #, c-format msgid "Unexpected action '%s'." msgstr "기대하지 않은 동작 '%s'." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:743 msgid "New folder" msgstr "새 폴더" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:743 msgid "Edit folder" msgstr "폴더 편집" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:745 msgid "New bookmark" msgstr "새 책갈피" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:745 msgid "Edit bookmark" msgstr "책갈피 편집" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:776 msgid "_Title:" msgstr "제목(_T):" -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "설명(_D):" -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 +#: ../midori/midori-browser.c:812 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "주소(_A):" -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 +#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:4042 msgid "_Folder:" msgstr "폴더(_F):" -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 +#: ../midori/midori-browser.c:854 ../midori/midori-browser.c:948 +#: ../midori/midori-browser.c:4047 ../midori/midori-browser.c:4076 msgid "Toplevel folder" msgstr "최상위 폴더" -#: ../midori/midori-browser.c:864 +#: ../midori/midori-browser.c:886 msgid "Add to _Speed Dial" msgstr "단축 번호에 더하기(_S)" -#: ../midori/midori-browser.c:877 +#: ../midori/midori-browser.c:899 msgid "Show in the tool_bar" msgstr "도구 모음에 보이기(_B)" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:914 msgid "Run as _web application" msgstr "웹 응용 프로그램으로 실행(_W)" -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:993 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "\"%s\"(을)를 다운로드 할 빈 공간이 부족합니다." +msgstr "\"%s\"을(를) 다운로드 할 빈 공간이 부족합니다." -#: ../midori/midori-browser.c:990 +#: ../midori/midori-browser.c:997 #, c-format msgid "The file needs %s but only %s are left." msgstr "파일 다운로드에는 %s이(가) 필요합니다 만 %s 만이 남아있습니다." -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:1054 ../midori/midori-browser.c:4084 +#: ../midori/midori-browser.c:4119 msgid "Save file as" msgstr "다른 이름으로 저장" -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s / %s" - -#: ../midori/midori-browser.c:1456 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "파일 '%s'(을)를 다운로드 했습니다." - -#: ../midori/midori-browser.c:1460 -msgid "Transfer completed" -msgstr "전송이 끝났습니다" - -#: ../midori/midori-browser.c:1600 +#: ../midori/midori-browser.c:1447 msgid "Save file" msgstr "파일 저장" -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -msgid "Some files are being downloaded" -msgstr "파일을 다운로드 하고 있습니다" - -#: ../midori/midori-browser.c:1923 -msgid "_Quit Midori" -msgstr "미도리 종료(_Q)" - -#: ../midori/midori-browser.c:1925 -msgid "The transfers will be cancelled if Midori quits." -msgstr "미도리를 종료하시면 파일 다운로드가 취소될 것입니다." - -#: ../midori/midori-browser.c:2386 +#: ../midori/midori-browser.c:2164 msgid "Open file" msgstr "파일 열기" -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 +#: ../midori/midori-browser.c:2242 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"위 주소를 뉴스 수집기로 열기 위해서는 보통 메뉴나 \"새 구독\", \"새 뉴스 피드" +"\"또는 이와 비슷한 단추를 찾을 수 있습니다.\n" +"이 외에 미도리 기본 설정 안 프로그램 탭으로 이동하여 뉴스 수집기를 선택하면 " +"다음 뉴스 피드 아이콘을 누를 때 자동으로 추가될 것입니다." + +#: ../midori/midori-browser.c:2248 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "새 피드" -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2291 ../midori/midori-browser.c:4988 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "새 책갈피 더하기" -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n" - -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "비어있음" - -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3297 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "외부 프로그램을 실행할 수 없습니다." -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 +#: ../midori/midori-browser.c:3560 ../midori/midori-browser.c:5378 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "새 기록 항목 삽입 실패: %s\n" -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3877 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "전부 탭으로 열기(_T)" -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 +#: ../midori/midori-browser.c:3884 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "새 탭에서 열기(_T)" -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 +#: ../midori/midori-browser.c:3887 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4011 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "새 창에서 열기(_W)" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:3965 msgid "Arora" msgstr "아로라" -#: ../midori/midori-browser.c:4658 +#: ../midori/midori-browser.c:3966 msgid "Kazehakase" msgstr "카제하카세" -#: ../midori/midori-browser.c:4659 +#: ../midori/midori-browser.c:3967 msgid "Opera" msgstr "오페라" -#: ../midori/midori-browser.c:4660 +#: ../midori/midori-browser.c:3968 msgid "Konqueror" msgstr "컨쿼러" -#: ../midori/midori-browser.c:4661 +#: ../midori/midori-browser.c:3969 msgid "Epiphany" msgstr "에피파니" -#: ../midori/midori-browser.c:4682 +#: ../midori/midori-browser.c:3993 msgid "Import bookmarks..." msgstr "책갈피 가져오기..." -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:3996 ../midori/midori-browser.c:4993 msgid "_Import bookmarks" msgstr "책갈피 가져오기(_I)" -#: ../midori/midori-browser.c:4696 +#: ../midori/midori-browser.c:4007 msgid "_Application:" msgstr "응용 프로그램(_A):" -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4034 ../midori/midori-browser.c:5106 +#: ../midori/midori-websettings.c:225 ../midori/midori-websettings.c:316 +#: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "사용자 지정..." -#: ../midori/midori-browser.c:4797 +#: ../midori/midori-browser.c:4095 msgid "Failed to import bookmarks" msgstr "책갈피 가져오기 실패" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4136 msgid "Failed to export bookmarks" msgstr "책갈피 내보내기 실패" -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4189 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "기록 항목을 제거할 수 없습니다: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "기록을 제거할 수 없습니다: %s\n" + +#: ../midori/midori-browser.c:4197 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "검색 기록을 제거할 수 없습니다: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4304 msgid "Clear Private Data" msgstr "개인 데이터 모두 지우기" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4308 msgid "_Clear private data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4322 msgid "Clear the following data:" msgstr "다음의 데이터 지우기:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4332 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "기록" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4337 msgid "Cookies" msgstr "쿠키" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4342 msgid "'Flash' Cookies" msgstr "'플래시' 쿠키" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4347 msgid "Website icons" msgstr "웹 사이트 아이콘" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4352 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "닫은 탭 (_C)" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4357 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "웹 캐시" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4365 msgid "Clear private data when _quitting Midori" msgstr "미도리를 종료할 때 개인 데이터를 제거합니다(_Q)" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4506 msgid "A lightweight web browser." msgstr "가벼운 웹 브라우저." -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4508 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -526,1155 +514,1114 @@ msgstr "" "서 발표한 GNU 약소 일반 공중 사용 허가서 버전 2.1 또는 이후 버전 (선택적)에 " "따라 재배포하거나 수정할 수 있습니다." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4527 msgid "translator-credits" msgstr "" "Seo Sanghyeon \n" "김보람 " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:4836 msgid "_File" msgstr "파일(_F)" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:4838 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "새 창(_W)" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:4839 msgid "Open a new window" msgstr "새 창을 엽니다" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:4842 msgid "Open a new tab" msgstr "새 탭을 엽니다" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:4844 msgid "P_rivate Browsing" msgstr "개인 정보 보호 모드(_R)" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:4845 msgid "Don't save any private data while browsing" msgstr "브라우저 사용 중 어떤 개인 데이터도 저장하지 않습니다" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:4849 msgid "Open a file" msgstr "파일을 엽니다" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:4852 msgid "Save to a file" msgstr "파일로 저장" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:4854 msgid "Add to Speed _dial" msgstr "단축 번호 더하기(_D)" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:4855 msgid "Add shortcut to speed dial" msgstr "단축 번호에 바로 가기를 더합니다" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:4857 msgid "Add Shortcut to the _desktop" msgstr "바로 가기를 바탕 화면에 추가(_D)" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:4858 msgid "Add shortcut to the desktop" msgstr "바로 가기를 바탕 화면에 추가" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:4860 msgid "Subscribe to News _feed" msgstr "뉴스 피드 구독(_F)" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:4861 msgid "Subscribe to this news feed" msgstr "뉴스 피드 구독" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:4866 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:4867 msgid "Close the current tab" msgstr "현재 탭을 닫습니다." -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4869 msgid "C_lose Window" msgstr "창 닫기(_L)" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:4870 msgid "Close this window" msgstr "이 창을 닫습니다" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:4873 msgid "Print the current page" msgstr "현재 페이지를 인쇄합니다" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:4876 msgid "Quit the application" msgstr "프로그램 끝내기" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4878 msgid "_Edit" msgstr "편집(_E)" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:4882 msgid "Undo the last modification" msgstr "마지막 수정 되돌리기" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:4885 msgid "Redo the last modification" msgstr "마지막 수정 다시 실행" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:4889 msgid "Cut the selected text" msgstr "선택한 텍스트를 클립보드로 잘라냅니다" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:4892 ../midori/midori-browser.c:4895 msgid "Copy the selected text" msgstr "선택한 텍스트를 클립보드로 복사합니다" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:4898 msgid "Paste text from the clipboard" msgstr "클립보드에서 텍스트를 붙여 넣습니다" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:4901 msgid "Delete the selected text" msgstr "선택한 텍스트를 지웁니다" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:4904 msgid "Select all text" msgstr "모든 텍스트 선택" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4907 msgid "Find a word or phrase in the page" msgstr "이 페이지에서 단어나 단락을 찾습니다" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:4909 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:4910 msgid "Find the next occurrence of a word or phrase" msgstr "다음에 나타나는 단어나 문장을 찾습니다" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:4912 msgid "Find _Previous" msgstr "이전 찾기(_P)" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:4913 msgid "Find the previous occurrence of a word or phrase" msgstr "이전에 나타난 단어나 문장을 찾습니다" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:4917 msgid "Configure the application preferences" msgstr "프로그램 기본 설정을 편집합니다" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:4919 msgid "_View" msgstr "보기(_V)" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:4920 msgid "_Toolbars" msgstr "도구 모음(_T)" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:4932 msgid "Increase the zoom level" msgstr "확대/축소 단계 키우기" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:4935 msgid "Decrease the zoom level" msgstr "확대/축소 단계 줄이기" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:4938 msgid "Reset the zoom level" msgstr "확대/축소 단계 초기화" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:4939 msgid "_Encoding" msgstr "인코딩(_E)" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:4941 msgid "View So_urce" msgstr "소스 보기(_U)" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:4942 msgid "View the source code of the page" msgstr "페이지의 소스 코드를 보여줍니다" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:4945 msgid "Toggle fullscreen view" msgstr "전체 화면 보기 전환" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:4948 msgid "Scroll _Left" msgstr "왼쪽으로 스크롤(_L)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:4949 msgid "Scroll to the left" msgstr "왼쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:4951 msgid "Scroll _Down" msgstr "아래쪽으로 스크롤(_D)" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:4952 msgid "Scroll down" msgstr "아래쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:4954 msgid "Scroll _Up" msgstr "위쪽으로 스크롤(_U)" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:4955 msgid "Scroll up" msgstr "위쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:4957 msgid "Scroll _Right" msgstr "오른쪽으로 스크롤(_R)" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:4958 msgid "Scroll to the right" msgstr "오른쪽으로 스크롤 합니다" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:4961 msgid "_Go" msgstr "이동(_G)" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:4964 msgid "Go back to the previous page" msgstr "전에 들렀던 페이지로 갑니다" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:4967 msgid "Go forward to the next page" msgstr "다음 들렀던 페이지로 갑니다" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:4971 msgid "Go to the previous sub-page" msgstr "전에 들렀던 하위 페이지로 갑니다" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:4975 msgid "Go to the next sub-page" msgstr "다음 들렀던 하위 페이지로 갑니다" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:4978 msgid "Go to your homepage" msgstr "홈 페이지로 갑니다." -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:4980 msgid "Empty Trash" msgstr "휴지통 비우기" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:4981 msgid "Delete the contents of the trash" msgstr "휴지통에 있는 모든 항목을 지웁니다" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:4983 msgid "Undo _Close Tab" msgstr "닫은 탭 되돌리기(_C)" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:4984 msgid "Open the last closed tab" msgstr "마지막에 닫은 탭을 엽니다." -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:4990 msgid "Add a new _folder" msgstr "새 폴더 더하기(_F)" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:4991 msgid "Add a new bookmark folder" msgstr "새 책갈피 폴더를 더합니다" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:4996 msgid "_Export bookmarks" msgstr "책갈피 내보내기(_E)" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4999 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "검색 엔진 관리(_M)" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5000 msgid "Add, edit and remove search engines..." msgstr "검색 엔진을 더하고 편집, 제거합니다..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5003 msgid "_Clear Private Data" msgstr "개인 데이터 지우기(_C)" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5004 msgid "Clear private data..." msgstr "개인 데이터를 지웁니다..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5008 msgid "_Inspect Page" msgstr "페이지 검사(_I)" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5009 msgid "Inspect page details and access developer tools..." msgstr "페이지의 세부 사항을 검사하고 개발자 도구에 접근..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5014 msgid "_Previous Tab" msgstr "이전 탭(_P)" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5015 msgid "Switch to the previous tab" msgstr "이전 탭으로 이동합니다" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5017 msgid "_Next Tab" msgstr "다음 탭(_N)" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5018 msgid "Switch to the next tab" msgstr "다음 탭으로 전환합니다" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5020 msgid "Focus _Current Tab" msgstr "현재 탭에 포커스 맞추기(_C)" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5021 msgid "Focus the current tab" msgstr "현재 탭에 포커스를 맞춥니다" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5023 +msgid "Minimize _Current Tab" +msgstr "현재 탭 최소화(_C)" + +#: ../midori/midori-browser.c:5024 +msgid "Minimize the current tab" +msgstr "현재 탭 최소화" + +#: ../midori/midori-browser.c:5026 +msgid "_Duplicate Current Tab" +msgstr "현재 탭 복제(_D)" + +#: ../midori/midori-browser.c:5027 +msgid "Duplicate the current tab" +msgstr "현재 탭 복제" + +#: ../midori/midori-browser.c:5029 +msgid "Close Ot_her Tabs" +msgstr "다른 탭 닫기(_H)" + +#: ../midori/midori-browser.c:5030 +msgid "Close all tabs except the current tab" +msgstr "현재 탭 이외의 모든 탭을 닫습니다" + +#: ../midori/midori-browser.c:5032 msgid "Open last _session" msgstr "마지막 세션 열기(_S)" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5033 msgid "Open the tabs saved in the last session" msgstr "마지막 세션에서 저장된 탭 엽니다" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5035 msgid "_Help" msgstr "도움말(_H)" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5037 msgid "_Contents" msgstr "차례(_C)" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5038 msgid "Show the documentation" msgstr "문서 보기" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5040 msgid "_Frequent Questions" msgstr "일반적인 질문들(_F)" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5041 msgid "Show the Frequently Asked Questions" msgstr "자주 하는 질문의 답변 보기" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5043 msgid "_Report a Bug" msgstr "버그 보고(_R)" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5044 msgid "Open Midori's bug tracker" msgstr "미도리의 버그 트래커를 엽니다" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5047 msgid "Show information about the program" msgstr "프로그램 정보를 보여줍니다" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5055 msgid "_Menubar" msgstr "메뉴 모음(_M)" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5056 msgid "Show menubar" msgstr "메뉴 모음 보기" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5059 msgid "_Navigationbar" msgstr "내비게이션 줄(_N)" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5060 msgid "Show navigationbar" msgstr "내비게이션 줄 보기" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5063 msgid "Side_panel" msgstr "가장자리 패널(_P)" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5064 msgid "Show sidepanel" msgstr "가장자리 패널 보기" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5067 msgid "_Bookmarkbar" msgstr "책갈피 모음(_B)" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5068 msgid "Show bookmarkbar" msgstr "책갈피 모음 보기" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5071 msgid "_Transferbar" msgstr "전송 줄(_T)" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5072 msgid "Show transferbar" msgstr "전송 줄 보기" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5075 msgid "_Statusbar" msgstr "상태 표시줄(_S)" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5076 msgid "Show statusbar" msgstr "상태 표시줄을 봅니다" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5084 msgid "_Automatic" msgstr "자동(_A)" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5087 ../midori/midori-websettings.c:219 msgid "Chinese (BIG5)" msgstr "중국어 번체 (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5091 msgid "Japanese (SHIFT__JIS)" msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5094 ../midori/midori-websettings.c:221 msgid "Korean (EUC-KR)" msgstr "한국어 (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5097 ../midori/midori-websettings.c:222 msgid "Russian (KOI8-R)" msgstr "키릴어 (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5100 ../midori/midori-websettings.c:223 msgid "Unicode (UTF-8)" msgstr "유니코드 (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5103 ../midori/midori-websettings.c:224 msgid "Western (ISO-8859-1)" msgstr "서양어 (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:5622 msgid "_Separator" msgstr "구분선(_S)" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:5629 msgid "_Location..." msgstr "위치(_L)..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:5631 msgid "Open a particular location" msgstr "특정 위치 열기" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:5655 msgid "_Web Search..." msgstr "웹 검색(_W)..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:5657 msgid "Run a web search" msgstr "웹 검색 실행" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:5678 msgid "Reopen a previously closed tab or window" msgstr "이전에 닫은 탭이나 창을 다시 엽니다" -#: ../midori/midori-browser.c:6365 -msgid "_Recently visited pages" -msgstr "최근 방문한 페이지(_R)" - -#: ../midori/midori-browser.c:6367 -msgid "Reopen pages that you visited earlier" -msgstr "이전에 방문한 페이지를 다시 엽니다" - -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "책갈피(_B)" - -#: ../midori/midori-browser.c:6384 -msgid "Show the saved bookmarks" -msgstr "저장된 책갈피 보기" - -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:5693 msgid "_Tools" msgstr "도구(_T)" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:5710 msgid "_Window" msgstr "창(_W)" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:5712 msgid "Show a list of all open tabs" msgstr "모든 열려있는 탭의 목록을 표시합니다" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:5726 msgid "_Menu" msgstr "메뉴(_M)" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:5728 msgid "Menu" msgstr "메뉴" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 -msgid "_Inline Find:" -msgstr "바로 찾기(_I):" - -#: ../midori/midori-browser.c:6665 -msgid "Previous" -msgstr "이전" - -#: ../midori/midori-browser.c:6670 -msgid "Next" -msgstr "다음" - -#: ../midori/midori-browser.c:6675 -msgid "Match Case" -msgstr "대소문자 일치" - -#: ../midori/midori-browser.c:6684 -msgid "Highlight Matches" -msgstr "일치하는 단어 강조 표시" - -#: ../midori/midori-browser.c:6696 -msgid "Close Findbar" -msgstr "찾기 줄 닫기" - -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "모두 지우기" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6305 #, c-format msgid "Unexpected setting '%s'" msgstr "기대하지 않은 설정 '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:379 #, c-format msgid "Failed to select from history\n" msgstr "기록에서 선택 실패\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:467 #, c-format msgid "Search for %s" msgstr "%s을(를) 검색" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:490 #, c-format msgid "Search with %s" msgstr "%s(으)로 검색" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1169 #, c-format msgid "Failed to execute database statement\n" msgstr "데이터 베이스 문(statement)을 실행 실패\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1225 msgid "Paste and p_roceed" msgstr "붙여넣기 후 진행(_R)" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "선택한 패널 창에서 분리" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "창을 오른쪽으로 이동" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "패널 닫기" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "창을 왼쪽으로 이동" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "조작 컨트롤 감추기(_C)" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:201 msgid "Show Blank page" -msgstr "빈 페이지 보기" +msgstr "빈 페이지 표시" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:202 msgid "Show Homepage" -msgstr "홈 페이지 보기" +msgstr "홈 페이지 표시" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:203 msgid "Show last open tabs" -msgstr "마지막에 연 탭 보기" +msgstr "마지막에 연 탭 표시" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:204 +msgid "Show last tabs without loading" +msgstr "마지막 탭을 불러오지는 않고 표시" + +#: ../midori/midori-websettings.c:220 msgid "Japanese (SHIFT_JIS)" msgstr "일본어 (Shift_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:240 msgid "New tab" msgstr "새 탭" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New window" msgstr "새 창" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "Current tab" msgstr "현재 탭" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:257 msgid "Default" msgstr "기본 값" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Icons" msgstr "아이콘" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Small icons" msgstr "작은 아이콘" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Text" msgstr "텍스트" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Icons and text" msgstr "아이콘 및 텍스트" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Text beside icons" msgstr "아이콘 옆에 글자" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:277 msgid "Automatic (GNOME or environment)" msgstr "자동 (그놈 또는 환경 변수)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "HTTP proxy server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "No proxy server" msgstr "프록시 서버 없음" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:294 msgid "All cookies" msgstr "모든 쿠키" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "Session cookies" msgstr "세션 쿠키" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:296 ../katze/katze-utils.c:668 msgid "None" msgstr "없음" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:312 msgid "Safari" msgstr "사파리" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "iPhone" msgstr "아이폰" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "Firefox" msgstr "파이어폭스" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Internet Explorer" msgstr "인터넷 익스플로러" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:368 msgid "Remember last window size" msgstr "마지막에 연 창 크기 기억" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Whether to save the last window size" msgstr "마지막에 연 창의 크기를 저장할지 결정합니다." -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:377 msgid "Last window width" msgstr "마지막에 연 창 너비" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "The last saved window width" msgstr "저장된 마지막에 연 창의 너비" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:386 msgid "Last window height" msgstr "마지막에 연 창 높이" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "The last saved window height" msgstr "저장된 마지막에 연 창의 높이" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:412 msgid "Last panel position" msgstr "마지막에 연 패널 위치" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "The last saved panel position" msgstr "저장된 마지막에 연 패널의 위치" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:422 msgid "Last panel page" msgstr "마지막 패널 페이지" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "The last saved panel page" msgstr "저장된 마지막에 연 패널 페이지" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:431 msgid "Last Web search" msgstr "마지막 웹 검색" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "The last saved Web search" msgstr "저장된 마지막에 한 검색" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:441 msgid "Show Menubar" -msgstr "메뉴 모음 보기" +msgstr "메뉴 모음 표시" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Whether to show the menubar" msgstr "메뉴 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:450 msgid "Show Navigationbar" -msgstr "내비게이션 바 보기" +msgstr "내비게이션 바 표시" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the navigationbar" msgstr "내비게이션 바를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:459 msgid "Show Bookmarkbar" -msgstr "책갈피 모음 보기" +msgstr "책갈피 모음 표시" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Whether to show the bookmarkbar" msgstr "책갈피 모음을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:468 msgid "Show Panel" msgstr "패널 표시" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Whether to show the panel" msgstr "패널을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:484 msgid "Show Transferbar" -msgstr "전송 줄 보기" +msgstr "전송 줄 표시" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Whether to show the transferbar" msgstr "전송 줄을 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:493 msgid "Show Statusbar" msgstr "상태 표시줄을 보기" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Whether to show the statusbar" msgstr "상태를 표시할 지 결정합니다." -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:503 msgid "Toolbar Style:" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "The style of the toolbar" msgstr "도구 모음 유형:" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:520 msgid "Show progress in location entry" msgstr "위치 항목에 진행 상태 표시" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Whether to show loading progress in the location entry" msgstr "불러오기 진행 상태를 위치 입력 줄에 표시할지 선택합니다." -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:536 msgid "Search engines in location completion" msgstr "위치를 완성하는데 검색 엔진 사용" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Whether to show search engines in the location completion" msgstr "위치 입력을 완성하는데 검색 엔진을 사용할지 선택합니다." -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:545 msgid "Toolbar Items" msgstr "도구 모음 항목" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "The items to show on the toolbar" msgstr "도구 모음에 보일 항목" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:554 msgid "Compact Sidepanel" msgstr "간략한 사이드 패널(_C)" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Whether to make the sidepanel compact" msgstr "사이드 패널을 간단하게 표시할지 결정합니다." -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:570 msgid "Show operating controls of the panel" msgstr "기능 조정 콘드롤 패널에 보기" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Whether to show the operating controls of the panel" msgstr "기능 조절 콘트롤을 패널에 보일지 결정합니다." -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:586 msgid "Align sidepanel on the right" msgstr "사이드 표시 줄을 오른쪽에" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Whether to align the sidepanel on the right" msgstr "오른쪽에 사이드 패널을 보여줄 지 결정합니다." -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:602 msgid "Open panels in separate windows" msgstr "패널 분리된 창에 열기" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Whether to always open panels in separate windows" msgstr "패널을 항상 분리된 창에 보일지 선택합니다." -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:612 msgid "When Midori starts:" msgstr "미도리 시작 시:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "What to do when Midori starts" msgstr "미도리 시작 시 어떤 것을 할지 결정합니다" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:622 msgid "Homepage:" msgstr "홈페이지:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "The homepage" msgstr "홈페이지" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:638 msgid "Show crash dialog" msgstr "충돌 대화 상자 보기" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show a dialog after Midori crashed" msgstr "미도리가 충돌한 후 대화 상자를 표시합니다" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in new tabs" msgstr "단축 번호를 새 탭에 보기" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in newly opened tabs" msgstr "단축 번호를 새로 열린 탭에 표시합니다." -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:664 msgid "Save downloaded files to:" msgstr "다운로드한 파일을 저장할 경로:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "The folder downloaded files are saved to" msgstr "다운로드한 파일이 저장되는 폴더" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:686 msgid "Ask for the destination folder" msgstr "저장 할 폴더 물어보기" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Whether to ask for the destination folder when downloading a file" msgstr "파일을 다운로드한 때 저장할 폴더를 물어볼지 선택합니다" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:706 msgid "Notify when a transfer has been completed" msgstr "전송이 완료되면 알려줍니다" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Whether to show a notification when a transfer has been completed" msgstr "전송이 끝나면 알림을 보여줄지 선택합니다." -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:719 msgid "Download Manager" msgstr "다운로드 관리자" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "An external download manager" msgstr "외부 다운로드 관리자" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:728 msgid "Text Editor" msgstr "텍스트 편집기" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "An external text editor" msgstr "외부 텍스트 편집기" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:744 msgid "News Aggregator" msgstr "뉴스 수집기" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "An external news aggregator" msgstr "외부 뉴스 수집기" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:753 msgid "Location entry Search" msgstr "위치 항목에서 검색" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "The search to perform inside the location entry" msgstr "위치 항목 안에서 검색을 실행합니다." -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:762 msgid "Preferred Encoding" msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "The preferred character encoding" msgstr "우선할 문자 인코딩" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:773 msgid "Always Show Tabbar" msgstr "탭 모음 항상 보기" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always show the tabbar" msgstr "탭 모음을 항상 볼 수 있게 합니다." -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:782 msgid "Close Buttons on Tabs" msgstr "탭에 닫기 단추 표시" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Whether tabs have close buttons" msgstr "탭에 닫기 단추를 표시할지 결정합니다." -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:791 msgid "Open new pages in:" msgstr "새 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Where to open new pages" msgstr "새 페이지를 어디에서 열지 결정합니다." -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:801 msgid "Open external pages in:" msgstr "외부 페이지 다음에 열기:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Where to open externally opened pages" msgstr "외부적으로 열린 페이지를 어디에 열지 결정합니다." -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:811 msgid "Middle click opens Selection" msgstr "가운데 버튼 클릭으로 선택한 주소 열기" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Load an address from the selection via middle click" msgstr "선택 후 마우스 가운데 버튼 클릭으로 주소를 불러옵니다." -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:820 msgid "Open tabs in the background" msgstr "탭을 연 후 바로 전환하지 않음" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Whether to open new tabs in the background" msgstr "탭이 열렸을 때 바로 전환할지 결정합니다" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:829 msgid "Open Tabs next to Current" msgstr "탭을 현재 탭 옆에 열기" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "새 탭을 현재 탭의 옆에 열지 마지막 탭 다음에 열지 결정합니다." -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:838 msgid "Open popups in tabs" msgstr "팝업 창을 탭에 열기" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Whether to open popup windows in tabs" msgstr "팝업 창을 탭에 열지 결정합니다." -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:849 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "자동으로 그림 읽기" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:850 msgid "Load and display images automatically" msgstr "그림을 자동으로 읽고 표시합니다." -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:857 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "스크립트 활성화" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:858 msgid "Enable embedded scripting languages" msgstr "스크립트 언어를 활성화 합니다." -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:865 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "넷스케이프 플러그인 활성화" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:866 msgid "Enable embedded Netscape plugin objects" msgstr "넷스케이프 플러그인 개체를 활성화 합니다." -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:882 msgid "Enable HTML5 database support" msgstr "HTML5 데이터 베이스 지원 활성화" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Whether to enable HTML5 database support" msgstr "HTML5 데이터 베이스 지원을 활성화할지 결정합니다." -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:889 msgid "Enable HTML5 local storage support" msgstr "HTML5 로컬 기억 장치 지원 활성화" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 로컬 기억 장치 지원을 활성화할지 결정합니다." -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:898 msgid "Enable offline web application cache" msgstr "오프라인 웹 응용 프로그램 캐시 활성화" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Whether to enable offline web application cache" msgstr "오프라인 웹 응용 프로그램 캐시를 활성화할지 결정합니다." -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:924 msgid "Zoom Text and Images" msgstr "문자와 그림 확대" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Whether to zoom text and images" msgstr "글자와 그림을 확대할지 결정합니다." -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:940 msgid "Find inline while typing" msgstr "주소 창에 입력할 때 바로 찾기" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Whether to automatically find inline while typing" msgstr "입력 중 자동으로 찾을지 결정합니다." -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:956 msgid "Kinetic scrolling" msgstr "동역학 스크롤" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Whether scrolling should kinetically move according to speed" msgstr "속도에 따라 관성이 걸린 것처럼 스크롤 합니다." -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:965 msgid "Accept cookies" -msgstr "쿠키 받아들임" +msgstr "허용할 쿠키" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "What type of cookies to accept" -msgstr "받아들일 쿠키의 종류를 결정합니다." +msgstr "허용할 쿠키의 종류를 결정합니다" -#: ../midori/midori-websettings.c:984 -msgid "Original cookies only" -msgstr "원본 쿠키만" +#: ../midori/midori-websettings.c:975 +msgid "Maximum cookie age" +msgstr "쿠키를 보존할 최장 기간" + +#: ../midori/midori-websettings.c:976 +msgid "The maximum number of days to save cookies for" +msgstr "쿠키를 저장할 최장 기간을 설정합니다" #: ../midori/midori-websettings.c:985 -msgid "Accept cookies from the original website only" -msgstr "원본 웹 사이트 쿠키만 받아들입니다." +msgid "Maximum history age" +msgstr "기록을 저장할 최대 기간" -#: ../midori/midori-websettings.c:993 -msgid "Maximum cookie age" -msgstr "쿠키의 최대 기한" +#: ../midori/midori-websettings.c:986 +msgid "The maximum number of days to save the history for" +msgstr "방문 기록을 저장할 최대 기간을 설정합니다" #: ../midori/midori-websettings.c:994 -msgid "The maximum number of days to save cookies for" -msgstr "쿠키를 저장할 최대 일 수" - -#: ../midori/midori-websettings.c:1011 -msgid "Remember last visited pages" -msgstr "마지막으로 방문한 페이지 기억" - -#: ../midori/midori-websettings.c:1012 -msgid "Whether the last visited pages are saved" -msgstr "마지막으로 방문한 페이지를 저장할지 결정합니다." - -#: ../midori/midori-websettings.c:1020 -msgid "Maximum history age" -msgstr "기록의 최대 기한" - -#: ../midori/midori-websettings.c:1021 -msgid "The maximum number of days to save the history for" -msgstr "방문 기록을 저장할 최대 일 수" - -#: ../midori/midori-websettings.c:1029 msgid "Remember last downloaded files" msgstr "마지막에 다운로드한 파일 기억" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Whether the last downloaded files are saved" msgstr "마지막으로 다운로드한 파일을 저장할지 결정합니다." -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1012 msgid "Proxy server" msgstr "프록시 서버" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "The type of proxy server to use" msgstr "사용할 프록시 서버의 종류" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1022 msgid "HTTP Proxy Server" msgstr "HTTP 프록시 서버" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "The proxy server used for HTTP connections" msgstr "HTTP 연결에 사용되는 프록시 서버" -#: ../midori/midori-websettings.c:1073 -msgid "Detect proxy server automatically" -msgstr "프록시 서버 자동으로 검색" - -#: ../midori/midori-websettings.c:1074 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "현재 환경에서 자동으로 프록시 서버를 검색할지 결정합니다." - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1039 msgid "Identify as" msgstr "식별 명" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "What to identify as to web pages" msgstr "웹 페이지에 보낼 유저 에이전트 식별 명을 지정합니다." -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1056 msgid "Identification string" msgstr "식별 문자열" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "The application identification string" msgstr "응용 프로그램 식별 문자열" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1072 msgid "Preferred languages" msgstr "우선할 인코딩" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1682,11 +1629,11 @@ msgstr "" "복수의 언어로 작성된 웹 페이지를 읽을 때 사용할 언어의 우선순위를 쉼표로 구분" "해 지정합니다. 예) \"de\", \"ru,nl\" 또는 \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1088 msgid "Clear private data" msgstr "개인 데이터 지우기" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "The private data selected for deletion" msgstr "삭제하기 위해 선택한 개인 데이터" @@ -1694,362 +1641,392 @@ msgstr "삭제하기 위해 선택한 개인 데이터" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4439 +#: ../midori/midori-view.c:4443 #, c-format msgid "Error - %s" msgstr "오류 - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "페이지 '%s'을(를) 불러올 수 없습니다." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "다시 시도하십시오" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "%s이(가) 발견되지 않았습니다" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "%s에 메시지 보내기" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "요소 검사(_E)" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "새 탭에 링크 열기(_T)" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "새 탭에 링크 열고 전환(_F)" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "새 탭에 링크 열고 전환 안 함(_B)" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "새 창에 링크 열기(_W)" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "웹 응용 프로그램으로 링크 열기(_P)" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "링크 위치 복사(_S)" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "링크 다른 이름으로 저장(_S)" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "링크 다운로드(_D)" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "다운로드 관리자로 다운로드(_M)" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "그림 새 탭에서 열기(_I)" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "그림 주소 복사(_A)" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "그림 저장(_M)" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "그림 다운로드(_M)" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "비디오 주소 복사(_A)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "비디오 저장(_V)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "비디오 다운로드(_V)" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "다음으로 검색(_W)" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "웹 검색(_S)" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "주소 새 탭에서 열기(_T)" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "파일을 열거나 다운로드 합니다" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "파일 종류: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "파일 종류: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "%s 열기" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "페이지 살피기 - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "단축 번호" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "바로 가기를 더하려면 누르십시오" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "바로 가기 주소 입력" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "바로 가기 제목 입력" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "이 바로 가기를 정말로 삭제하시겠습니까?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "열 번호 설정," +#: ../midori/midori-view.c:3444 +msgid "Set number of columns and rows" +msgstr "행과 열 개수 설정," -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "열 번호를 입력하세요" +#: ../midori/midori-view.c:3445 +msgid "Enter number of columns and rows:" +msgstr "행과 열 개수를 입력하세요:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "바로 가기 번호 설정" +#: ../midori/midori-view.c:3446 +msgid "Invalid input for the size of the speed dial" +msgstr "유효하지 않은 단축 번호 크기 입력" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "바로 가기 번호를 입력하세요:" +#: ../midori/midori-view.c:3447 +msgid "Thumb size:" +msgstr "미리 보기 크기:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3448 +msgid "Small" +msgstr "작게" + +#: ../midori/midori-view.c:3449 +msgid "Medium" +msgstr "중간" + +#: ../midori/midori-view.c:3450 +msgid "Big" +msgstr "크게" + +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "문서를 표시할 수 없습니다." -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "설치된 문서화 도구가 없습니다" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3617 +msgid "Page loading delayed" +msgstr "페이지 불러오기가 지연되었습니다." + +#: ../midori/midori-view.c:3618 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" +"최근 발생한 충돌이나 기본 설정 내 시작 페이지 설정으로 인해 페이지 불러오기" +"가 지연되었습니다." + +#: ../midori/midori-view.c:3619 +msgid "Load Page" +msgstr "페이지 불러오기" + +#: ../midori/midori-view.c:3761 msgid "Blank page" msgstr "빈 페이지" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4015 msgid "_Duplicate Tab" msgstr "탭 복제(_D)" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4020 msgid "_Restore Tab" msgstr "탭 되돌리기(_R)" -#: ../midori/midori-view.c:4073 +#: ../midori/midori-view.c:4020 msgid "_Minimize Tab" msgstr "탭 최소화(_M)" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4026 msgid "Close ot_her Tabs" msgstr "다른 탭 닫기(_H)" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4676 msgid "Print background images" msgstr "배경 그림 인쇄" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4677 msgid "Whether background images should be printed" msgstr "배경 그림을 인쇄할 지 결정합니다" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4729 ../midori/midori-preferences.c:384 msgid "Features" msgstr "기능" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "일반" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "시작" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "현재 페이지를 홈 페이지로 사용" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "전송" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "모양새" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "글꼴 설정" -#: ../midori/midori-preferences.c:352 -msgid "Default Font Family" -msgstr "기본 글꼴 패밀리" - #: ../midori/midori-preferences.c:355 -msgid "The default font family used to display text" -msgstr "텍스트를 표시할 기본 글꼴 패밀리" +msgid "Default Font Family" +msgstr "기본 글꼴 계열" #: ../midori/midori-preferences.c:358 +msgid "The default font family used to display text" +msgstr "텍스트를 표시할 기본 글꼴 계열" + +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "텍스트를 표시할 기본 글꼴 크기" -#: ../midori/midori-preferences.c:360 -msgid "Fixed-width Font Family" -msgstr "고정 폭 글꼴 패밀리" - #: ../midori/midori-preferences.c:363 -msgid "The font family used to display fixed-width text" -msgstr "고정 폭 텍스트를 표시할 글꼴 패밀리" +msgid "Fixed-width Font Family" +msgstr "고정 폭 글꼴 계열" #: ../midori/midori-preferences.c:366 +msgid "The font family used to display fixed-width text" +msgstr "고정 폭 텍스트를 표시할 글꼴 계열" + +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "고정 폭 텍스트를 표시할 글꼴 크기" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "최소 글꼴 크기" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "문자를 표시할 최소 글꼴 크기" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "행동" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "96DPI 강제 지정" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "해상도를 96DPI로 강제합니다" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "팝업 열기 스크립트 허용" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "스크립트가 팝업 창을 자동으로 열 수 있게 할지 선택합니다." -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "맞춤법 검사" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "맞춤법 검사 활성화" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "입력 중 맞춤법 검사를 활성화 합니다" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "맞춤법 검사에 사용할 사전:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" msgstr "맞춤법 검사를 할 언어는 쉼표로 구분합니다, 예: \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "인터페이스" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "내비게이션 줄" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "탐색 중" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "프로그램" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "외부 프로그램" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "네트워크" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "호스트 이름" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "개인 정보" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "웹 쿠키" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "일" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "비어있음" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "검색 엔진 더하기" @@ -2078,67 +2055,131 @@ msgstr "검색 엔진 관리" msgid "Use as _default" msgstr "기본값으로 사용(_D)" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "책갈피(_B)" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "책갈피(_B)" + +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "책갈피 더하기(_K)" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "콘솔(_C)" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "확장 기능(_E)" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "기록(_H)" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "홈페이지(_H)" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "사용자 스크립트(_U)" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "새 탭(_T)" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "전송(_T)" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "넷스케이프 플러그인(_L)" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "새 폴더(_F)" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "바로 찾기(_I):" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "이전" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "다음" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "대소문자 일치" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "일치하는 단어 강조 표시" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "찾기 줄 닫기" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s / %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "파일 '%s'을(를) 다운로드 했습니다." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "전송이 끝났습니다" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "모두 지우기" + +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "파일을 다운로드 하고 있습니다" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "미도리 종료(_Q)" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "미도리를 종료하시면 파일 다운로드가 취소될 것입니다." + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "책갈피" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:275 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "책갈피 항목을 추가하지 못했습니다: %s\n" + +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "선택한 책갈피를 편집합니다" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "선택한 책갈피를 지웁니다" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "새 폴더를 더합니다" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "구분선" @@ -2158,60 +2199,45 @@ msgstr "모두 복사" msgid "Extensions" msgstr "확장 기능" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "잘못된 시간" - -#: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "시간이 잘못되어 있습니다. 현재 날짜와 시간을 확인하십시오." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "일 주 전" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 일 전" -msgstr[1] "%d 일 전" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "오늘" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "어제" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "정말 모든 기록 항목을 지우시겠습니까?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "선택한 기록 항목을 책갈피에 더합니다" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "선택한 기록 항목을 지웁니다" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "모든 기록 제거" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "필터:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "다운로드 폴더 열기(_F)" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "링크 위치 복사(_A)" @@ -2237,7 +2263,7 @@ msgstr "암호" #: ../katze/katze-http-auth.c:272 msgid "_Remember password" -msgstr "암호 기억(_R)" +msgstr "암호 저장(_R)" #: ../katze/katze-throbber.c:882 #, c-format @@ -2253,16 +2279,16 @@ msgstr "보관된 '%s'아이콘을 열 수 없습니다." msgid "Animation frames are broken" msgstr "애니메이션 프레임이 망가졌습니다" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 #, c-format msgid "Property '%s' is invalid for %s" msgstr "속성 '%s'은(는) %s에 적당하지 않음" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 msgid "Choose file" msgstr "파일 선택" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:560 msgid "Choose folder" msgstr "폴더 선택" @@ -2304,18 +2330,18 @@ msgstr "그림 막기(_O)" msgid "Bl_ock link" msgstr "링크 막기(_O)" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "광고 막기" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "필터 목록에 따라 광고를 막습니다" #: ../extensions/addons.c:122 #, c-format msgid "Copy %s to the folder %s." -msgstr "%(을)를 폴더 %s(으)로 복사합니다." +msgstr "%1$s을(를) 폴더 %2$s(으)로 복사합니다." #: ../extensions/addons.c:177 msgid "Userscripts" @@ -2337,7 +2363,7 @@ msgstr "사용자 추가 기능" #: ../extensions/addons.c:1210 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "폴더 '%s'(을)를 감시할 수 없습니다: %s" +msgstr "폴더 '%s'을(를) 감시할 수 없습니다: %s" #: ../extensions/addons.c:1254 msgid "Support for userscripts and userstyles" @@ -2438,6 +2464,10 @@ msgstr "모두 펴기(_E)" msgid "_Collapse All" msgstr "모두 접기(_C)" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "필터:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "" "Enter a filter string to show only cookies whose name or domain field match " @@ -2454,6 +2484,26 @@ msgstr "쿠키 관리자(_C)" msgid "List, view and delete cookies" msgstr "쿠키의 목록 또는 내용을 보고 삭제합니다" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "탭 주소 복사(_A)" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "탭 주소를 복사합니다" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "모든 탭의 주소를 클립보드로 복사합니다" + +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "외부 응용 프로그램" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "웹 주소를 관련된 외부 명령어와 연결합니다" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "XML 데이터에서 요구된 Atom \"entry\" 요소를 찾을 수 없습니다." @@ -2463,39 +2513,39 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "XML 데이터에서 요구된 Atom \"feed\" 요소를 찾을 수 없습니다." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "마지막 업데이트: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:670 msgid "Feeds" msgstr "피드" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:723 msgid "Add new feed" msgstr "새 피드 더하기" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:730 msgid "Delete feed" msgstr "피드 삭제" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:812 msgid "_Feeds" msgstr "피드(_F)" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "피드 XML 데이터에서 루트 요소를 찾을 수 없습니다." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "지원하지 않은 피드 포맷." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML 피드 %s을(를) 붙여 넣을 수 없습니다" @@ -2516,50 +2566,80 @@ msgstr "XML 데이터에서 요구된 RSS \"item\" 요소를 찾을 수 없습 msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "XML 데이터에서 요구된 RSS \"channel\" 요소를 찾을 수 없습니다." -#: ../extensions/feed-panel/main.c:132 +#: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "오류" -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "피드 '%s'은(는) 이미 존재합니다." -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "피드 '%s'을(를) 읽어 들이는 중 오류" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:516 msgid "Feed Panel" msgstr "피드 패널" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:517 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS 피드를 읽습니다" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "폼 값을 추가할 수 없음: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "데이터 베이스 문(statement)을 실행할 수 없습니다: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "입력된 폼 데이터 기록을 보존합니다" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "사용 불가: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "리소스 파일이 설치되지 않음" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "입력 폼 기록 필터" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "다음 탭 (기록 목록)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "기록 목록에서 다음 탭으로 전환합니다" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "이전 탭 (기록 목록)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "기록 목록에서 이전 탭으로 전환합니다" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "기록 목록" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" +"최근 사용한 순으로 보관된 목록에서 선택하여 탭을 전환할 수 있도록 합니다." + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "마우스 제스처" @@ -2598,6 +2678,14 @@ msgstr "바로 가기" msgid "View and edit keyboard shortcuts" msgstr "키보드 바로 가기를 보고 편집합니다" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "상태 표시줄에 시계 표시" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "상태 표지줄에 시간과 날짜를 표시합니다" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "그림" @@ -2630,14 +2718,13 @@ msgstr "탭 패널(_A)" msgid "Show tabs in a vertical panel" msgstr "탭을 수직 패널에서 보여줍니다" -#: ../extensions/tab-switcher.c:395 -msgid "Tab History List" -msgstr "탭 기록 목록" +#: ../extensions/tabs-minimized.c:79 +msgid "Minimize new Tabs" +msgstr "새 탭 최소화" -#: ../extensions/tab-switcher.c:396 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"최근 사용한 순으로 보관된 목록에서 선택하여 탭을 전환할 수 있도록 합니다." +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs open minimized" +msgstr "새 탭을 열 때 탭 막대를 최소화하여 표시합니다" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2675,6 +2762,47 @@ msgstr "도구 모음 배치를 간단히 편집합니다" msgid "Cache HTTP communication on disk" msgstr "디스크에 HTTP 통신을 저장합니다." +#~ msgid "Erroneous clock time" +#~ msgstr "잘못된 시간" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "시간이 잘못되어 있습니다. 현재 날짜와 시간을 확인하십시오." + +#~ msgid "_Recently visited pages" +#~ msgstr "최근 방문한 페이지(_R)" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "이전에 방문한 페이지를 다시 엽니다" + +#~ msgid "Original cookies only" +#~ msgstr "원본 쿠키만" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "원본 웹 사이트 쿠키만 받아들입니다." + +#~ msgid "Remember last visited pages" +#~ msgstr "마지막으로 방문한 페이지 기억" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "마지막으로 방문한 페이지를 저장할지 결정합니다." + +#~ msgid "Detect proxy server automatically" +#~ msgstr "프록시 서버 자동으로 검색" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "현재 환경에서 자동으로 프록시 서버를 검색할지 결정합니다." + +#~ msgid "Show the saved bookmarks" +#~ msgstr "저장된 책갈피 보기" + +#~ msgid "Set number of shortcuts" +#~ msgstr "바로 가기 번호 설정" + +#~ msgid "Enter number of shortcuts:" +#~ msgstr "바로 가기 번호를 입력하세요:" + #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "" From 8bea9b586d25a002da2a6e0a57dd266ceb172056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Sun, 22 Aug 2010 00:22:57 +0200 Subject: [PATCH 2889/2970] Fix mistype in addons monitoring to enable watching userscript dirs --- extensions/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/addons.c b/extensions/addons.c index 2ccd4851..1d9cdeac 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -1229,7 +1229,7 @@ addons_activate_cb (MidoriExtension* extension, addons_update_elements (extension, ADDONS_USER_STYLES); addons_monitor_directories (extension, ADDONS_USER_STYLES); addons_update_elements (extension, ADDONS_USER_SCRIPTS); - addons_monitor_directories (extension, ADDONS_USER_STYLES); + addons_monitor_directories (extension, ADDONS_USER_SCRIPTS); i = 0; while ((browser = katze_array_get_nth_item (browsers, i++))) From ac1ba277e445a3741a8f085382eb5968c787b854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Sat, 21 Aug 2010 21:21:30 +0200 Subject: [PATCH 2890/2970] Clean up redundant user addons item list copies in helper functions --- extensions/addons.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 1d9cdeac..088aa331 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -358,7 +358,6 @@ addons_get_files (AddonsKind kind) { GSList* files; GDir* addon_dir; - GSList* list; GSList* directories; const gchar* filename; gchar* dirname; @@ -375,7 +374,6 @@ addons_get_files (AddonsKind kind) files = NULL; directories = addons_get_directories (kind); - list = directories; while (directories) { dirname = directories->data; @@ -395,7 +393,6 @@ addons_get_files (AddonsKind kind) directories = g_slist_next (directories); } - g_slist_free (list); g_free (file_extension); return files; @@ -1179,7 +1176,6 @@ addons_monitor_directories (MidoriExtension* extension, AddonsKind kind) { GSList* directories; - GSList* list; GError* error; GSList* monitors; GFileMonitor* monitor; @@ -1190,7 +1186,6 @@ addons_monitor_directories (MidoriExtension* extension, monitors = g_object_get_data (G_OBJECT (extension), "monitors"); directories = addons_get_directories (kind); - list = directories; while (directories) { directory = g_file_new_for_path (directories->data); From 0de4e9fa08409649d2d42f769f655e7977cb83d0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Aug 2010 03:25:03 +0200 Subject: [PATCH 2891/2970] Skip NULL key, which is the case when using the combo arrow --- midori/midori-locationaction.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 2e583f1a..84f20097 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1043,7 +1043,6 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar* temp_concat; gchar* temp_markup; gchar** parts; - size_t len; size_t offset; gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, @@ -1074,10 +1073,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, desc_iter = uri; key_idx = 0; key = keys[key_idx]; - len = strlen (key); offset = 0; - while ((start = strstr (temp_iter, key)) && start) + while (key && (start = strstr (temp_iter, key)) && start) { + gsize len = strlen (key); if (len) { offset = (start - temp_iter); @@ -1110,7 +1109,6 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, key = keys[key_idx]; if (key == NULL) break; - len = strlen (key); } if (key) katze_assign (desc_uri, NULL); @@ -1132,10 +1130,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, desc_iter = title; key_idx = 0; key = keys[key_idx]; - len = strlen (key); offset = 0; - while ((start = strstr (temp_iter, key)) && start) + while (key && (start = strstr (temp_iter, key)) && start) { + gsize len = strlen (key); if (len) { offset = (start - temp_iter); @@ -1168,7 +1166,6 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, key = keys[key_idx]; if (key == NULL) break; - len = strlen (key); } if (key) katze_assign (desc_title, NULL); From f8e5e8f7e0baa61c3c3f55524a8b32438b3b5363 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Aug 2010 03:39:11 +0200 Subject: [PATCH 2892/2970] Don't hide homepage smartly, don't show it in bookmarkbar --- midori/midori-browser.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index aed94ed0..03f23a80 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3426,26 +3426,6 @@ _action_location_active_changed (GtkAction* action, } } -static gboolean -midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button, - GdkEventButton* event, - MidoriBrowser* browser) -{ - if (event->button == 2) - { - gchar* homepage; - guint n; - - g_object_get (browser->settings, "homepage", &homepage, NULL); - n = midori_browser_add_uri (browser, homepage); - g_free (homepage); - midori_browser_set_current_page_smartly (browser, n); - return TRUE; - } - - return FALSE; -} - static void _action_location_focus_in (GtkAction* action, MidoriBrowser* browser) @@ -6089,7 +6069,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint last_panel_position, last_panel_page; gboolean show_menubar, show_bookmarkbar; gboolean show_panel, show_transferbar; - gchar* homepage; MidoriToolbarStyle toolbar_style; gchar* toolbar_items; gint last_web_search; @@ -6115,7 +6094,6 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-panel", &show_panel, "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, - "homepage", &homepage, "speed-dial-in-new-tabs", &browser->speed_dial_in_new_tabs, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, @@ -6207,9 +6185,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Transferbar", show_transferbar); #endif _action_set_active (browser, "Statusbar", browser->show_statusbar); - _action_set_visible (browser, "Homepage", homepage && *homepage); - g_free (homepage); g_free (toolbar_items); } @@ -6262,11 +6238,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->speed_dial_in_new_tabs = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); - else if (name == g_intern_string ("homepage")) - { - _action_set_visible (browser, "Homepage", - g_value_get_string (&value) && *g_value_get_string (&value)); - } else if (name == g_intern_string ("search-engines-in-completion")) { if (g_value_get_boolean (&value)) @@ -6355,7 +6326,6 @@ midori_bookmarkbar_remove_item_cb (KatzeArray* bookmarks, static void midori_bookmarkbar_populate (MidoriBrowser* browser) { - GtkWidget* homepage; sqlite3* db; const gchar* sqlcmd; KatzeArray* array; @@ -6364,12 +6334,9 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) midori_bookmarkbar_clear (browser->bookmarkbar); - homepage = gtk_action_create_tool_item (_action_by_name (browser, "Homepage")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (homepage), TRUE); - g_signal_connect (gtk_bin_get_child (GTK_BIN (homepage)), "button-press-event", - G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser); + /* Use a dummy to ensure height of the toolbar */ gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), - (GtkToolItem*)homepage, -1); + gtk_separator_tool_item_new (), -1); db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); if (!db) From 10fab9909045102b39ca8d72e8873ad8c318b288 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Aug 2010 03:53:47 +0200 Subject: [PATCH 2893/2970] Delete history from completion with Delete key --- midori/midori-locationaction.c | 56 +++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 84f20097..4495a445 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -457,7 +457,6 @@ midori_location_action_popup_timeout_cb (gpointer data) style = gtk_widget_get_style (action->treeview); while (result == SQLITE_ROW) { - gchar* unescaped_uri; sqlite3_int64 type = sqlite3_column_int64 (stmt, 0); const unsigned char* uri = sqlite3_column_text (stmt, 1); const unsigned char* title = sqlite3_column_text (stmt, 2); @@ -466,12 +465,9 @@ midori_location_action_popup_timeout_cb (gpointer data) icon = action->default_icon; if (type == 1 /* history_view */) { - unescaped_uri = sokoke_uri_unescape_string ((const char*)uri); - gtk_list_store_insert_with_values (store, NULL, matches, - URI_COL, unescaped_uri, TITLE_COL, title, YALIGN_COL, 0.25, + URI_COL, uri, TITLE_COL, title, YALIGN_COL, 0.25, FAVICON_COL, icon, -1); - g_free (unescaped_uri); } else if (type == 2 /* search_view */) { @@ -897,6 +893,48 @@ midori_location_action_key_press_event_cb (GtkEntry* entry, case GDK_Page_Down: if (!(location_action->popup && gtk_widget_get_visible (location_action->popup))) return TRUE; + case GDK_Delete: + case GDK_KP_Delete: + { + gint selected = location_action->completion_index; + GtkTreeModel* model = location_action->completion_model; + GtkTreeIter iter; + + if (selected > -1 && + gtk_tree_model_iter_nth_child (model, &iter, NULL, selected)) + { + gchar* uri; + gchar* sqlcmd; + sqlite3* db; + gchar* errmsg; + gint result; + + gtk_tree_model_get (model, &iter, URI_COL, &uri, -1); + sqlcmd = sqlite3_mprintf ("DELETE FROM history " + "WHERE uri = '%q'", uri); + g_free (uri); + db = g_object_get_data (G_OBJECT (location_action->history), "db"); + result = sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg); + sqlite3_free (sqlcmd); + if (result == SQLITE_ERROR) + { + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + URI_COL, errmsg, -1); + sqlite3_free (errmsg); + break; + } + if (result != SQLITE_OK || sqlite3_changes (db) == 0) + break; + if (!gtk_list_store_remove (GTK_LIST_STORE (model), &iter)) + { + midori_location_action_popdown_completion (location_action); + break; + } + /* Fall through to advance the selection */ + } + else + break; + } case GDK_Down: case GDK_KP_Down: case GDK_Up: @@ -1024,6 +1062,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gpointer data) { MidoriLocationAction* action = data; + gchar* uri_escaped; gchar* uri; gchar* title; GdkColor* background; @@ -1045,14 +1084,14 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar** parts; size_t offset; - gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, + gtk_tree_model_get (model, iter, URI_COL, &uri_escaped, TITLE_COL, &title, BACKGROUND_COL, &background, STYLE_COL, &style, -1); if (style) /* A search engine action */ { g_object_set (renderer, "text", title, "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - g_free (uri); + g_free (uri_escaped); g_free (title); return; } @@ -1067,6 +1106,9 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, keys = g_strsplit_set (key, " %", -1); g_free (key); + uri = sokoke_uri_unescape_string (uri_escaped); + g_free (uri_escaped); + if (G_LIKELY (uri)) { temp_iter = temp = g_utf8_strdown (uri, -1); From 6ffff501a9463ee32035254cc61d860811f13e69 Mon Sep 17 00:00:00 2001 From: Dmitrij Smirnov Date: Sun, 22 Aug 2010 15:16:33 +0200 Subject: [PATCH 2894/2970] l10n: Updated Russian (ru) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 1103 +++++++++++++++++++++++++++--------------------------- 1 file changed, 560 insertions(+), 543 deletions(-) diff --git a/po/ru.po b/po/ru.po index 417adf18..869a4a22 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 16:08+0000\n" +"POT-Creation-Date: 2010-08-22 10:08+0000\n" "PO-Revision-Date: 2010-06-26 00:55+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1331 ../midori/main.c:1660 +#: ../midori/main.c:1668 ../midori/main.c:1684 +#: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -32,198 +32,204 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Не удалось удалить запись из журнала: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:531 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:569 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:589 ../midori/main.c:612 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:671 ../midori/main.c:911 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:855 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:914 +#: ../midori/main.c:945 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:929 +#: ../midori/main.c:960 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:933 +#: ../midori/main.c:964 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:938 +#: ../midori/main.c:969 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1209 ../midori/main.c:1955 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1331 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1321 +#: ../midori/main.c:1350 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1352 +#: ../midori/main.c:1381 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1553 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1524 +#: ../midori/main.c:1553 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1527 +#: ../midori/main.c:1556 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1527 +#: ../midori/main.c:1556 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1530 +#: ../midori/main.c:1559 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1532 +#: ../midori/main.c:1561 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1535 +#: ../midori/main.c:1564 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1538 +#: ../midori/main.c:1567 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1540 +#: ../midori/main.c:1569 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1542 +#: ../midori/main.c:1571 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1544 +#: ../midori/main.c:1573 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1544 +#: ../midori/main.c:1573 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1577 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1548 +#: ../midori/main.c:1577 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1629 +#: ../midori/main.c:1657 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1685 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1687 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1804 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1804 +#: ../midori/main.c:1852 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1907 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1928 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1970 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1983 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1997 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1968 +#: ../midori/main.c:2013 msgid "_Ignore" msgstr "_Игнорировать" @@ -244,104 +250,104 @@ msgstr "Неизвестный формат закладок." msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:769 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 -#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:879 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:907 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2155 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -349,1269 +355,1267 @@ msgstr "" "Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" "В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." -#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 -#: ../panels/midori-bookmarks.c:401 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4011 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4055 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 +#: ../midori/midori-browser.c:4155 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Не удалось удалить запись из журнала: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Не удалось очистить журнал истории: %s\n" + +#: ../midori/midori-browser.c:4163 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Не удалось очистить журнал поиска: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4415 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:4425 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:4544 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4546 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4989 +msgid "Minimize _Current Tab" +msgstr "Свернуть _Текущую вкладку" + +#: ../midori/midori-browser.c:4990 +msgid "Minimize the current tab" +msgstr "Скрыть данную вкладку" + +#: ../midori/midori-browser.c:4992 +#, fuzzy +msgid "_Duplicate Current Tab" +msgstr "Сделать _копию" + +#: ../midori/midori-browser.c:4993 +#, fuzzy +msgid "Duplicate the current tab" +msgstr "Скопировать данную вкладку" + +#: ../midori/midori-browser.c:4995 +msgid "Close Ot_her Tabs" +msgstr "З_акрыть остальные вкладки" + +#: ../midori/midori-browser.c:4996 +msgid "Close all tabs except the current tab" +msgstr "Закрыть все вкладки, кроме текущей" + +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5092 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5105 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5120 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:5733 -msgid "_Recently visited pages" -msgstr "_Недавно посещённые страницы" - -#: ../midori/midori-browser.c:5735 -msgid "Reopen pages that you visited earlier" -msgstr "Открывать страницы, посещённые ранее" - -#: ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:5763 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6358 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Не удалось найти в истории\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Поиск %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Не удалось выполнить запрос к базе данных\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Скрыть элементы управления" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Открыть пустую страницу" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:203 msgid "Show last tabs without loading" msgstr "Открыть последние страницы без загрузки" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:219 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:239 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:240 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:241 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:256 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:257 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:258 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:259 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:260 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:261 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:276 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:277 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:278 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:293 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:294 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:311 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:312 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:313 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:314 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:367 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:368 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:376 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:377 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:385 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:386 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:411 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:412 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:421 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:422 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:430 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:431 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:440 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:441 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:449 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:458 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:467 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:468 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:483 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:484 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:492 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:493 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:502 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:503 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:519 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:520 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:535 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:536 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:544 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:545 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:553 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:554 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:569 msgid "Show operating controls of the panel" msgstr "Показать элементы управления панелью" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:570 msgid "Whether to show the operating controls of the panel" msgstr "Показывать элементы управления панелью" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:585 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:586 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:601 msgid "Open panels in separate windows" msgstr "Открывать панели в отдельных окнах" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:602 msgid "Whether to always open panels in separate windows" msgstr "Панели при открытии будут отделены от главного окна" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:611 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:612 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:621 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:622 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:637 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:638 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:654 msgid "Show speed dial in new tabs" msgstr "Показывать панель быстрого набора в новых вкладках" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:655 msgid "Show speed dial in newly opened tabs" msgstr "Показывать панель быстрого набора в только что открытых вкладках" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:663 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:664 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:685 msgid "Ask for the destination folder" msgstr "Запрашивать папку для загрузок" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:686 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Запрашивать конечную папку для каждого файла" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:705 msgid "Notify when a transfer has been completed" msgstr "Уведомлять по завершении передачи" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:706 msgid "Whether to show a notification when a transfer has been completed" msgstr "Показывать уведомление по окончании передачи файлов" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:718 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:719 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:727 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:728 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:743 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:744 msgid "An external news aggregator" msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:752 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:753 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:761 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:762 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:772 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:773 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:781 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:782 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:790 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:791 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:800 msgid "Open external pages in:" msgstr "Открывать внешние страницы в:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:801 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:810 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:811 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:819 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:820 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:828 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:829 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:837 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:838 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:849 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:857 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:865 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:881 msgid "Enable HTML5 database support" msgstr "Включить поддержку баз данных HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:882 msgid "Whether to enable HTML5 database support" msgstr "Включить поддержку баз данных стандарта HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:888 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:889 msgid "Whether to enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища (localStorage) стандарта HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:897 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:898 msgid "Whether to enable offline web application cache" msgstr "Кэшировать данные веб-приложений для автономной работы" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:923 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:924 msgid "Whether to zoom text and images" msgstr "Изменять масштаб изображений при масштабировании страницы" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:939 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:940 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:955 msgid "Kinetic scrolling" msgstr "Инерционная прокрутка" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:956 msgid "Whether scrolling should kinetically move according to speed" msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:964 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:965 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Только оригинальные фрагменты данных" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Принимать фрагменты данных только с оригинального сайта" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:974 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:975 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Запоминать посещённые страницы" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Сохранять историю последних посещений" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:984 msgid "Maximum history age" msgstr "Хранить историю за последние" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:985 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:993 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:994 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1011 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1012 msgid "The type of proxy server to use" msgstr "Тип прокси-сервера" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1021 msgid "HTTP Proxy Server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1022 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Автоматически обнаруживать прокси-сервер" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Брать данные о прокси-сервере из переменных окружения" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1038 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1039 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1055 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1056 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1071 msgid "Preferred languages" msgstr "Предпочитаемые языки" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1072 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Список предпочитаемых языков для отображения многоязычных страниц, например, «de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1087 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1088 msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" @@ -1619,237 +1623,237 @@ msgstr "Выбранные для удаления личные данные" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4439 +#: ../midori/midori-view.c:4443 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Попытаться снова" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Установить количество закладок" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Введите число столбцов и строк:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Проверьте правильность ввода" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Размер миниатюр:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Средний" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Большой" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3617 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3618 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3619 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3761 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4015 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4020 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:4124 +#: ../midori/midori-view.c:4020 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4026 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4676 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4677 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4729 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Возможности" @@ -2029,51 +2033,51 @@ msgstr "Управление средствами поиска" msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Новая папка" @@ -2102,7 +2106,7 @@ msgstr "Подсветить совпадения" msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s из %s" @@ -2116,7 +2120,7 @@ msgstr "Файл «%s» загружен." msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Убрать завершённые" @@ -2132,28 +2136,28 @@ msgstr "В_ыйти из Midori" msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." -#: ../panels/midori-bookmarks.c:110 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:216 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:409 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:417 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:431 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Разделитель" @@ -2173,19 +2177,11 @@ msgstr "Копировать все" msgid "Extensions" msgstr "Дополнения" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Некорректное время" - -#: ../panels/midori-history.c:275 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Дата находится в прошлом. Проверьте системное время." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2193,46 +2189,35 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Вчера" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не удалось выполнить запрос к базе данных: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:445 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:462 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Фильтр:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" @@ -2342,21 +2327,21 @@ msgstr "Сценарии" msgid "Userstyles" msgstr "Стили пользователя" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:1082 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1083 ../extensions/addons.c:1248 msgid "User addons" msgstr "Пользовательские дополнения" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1205 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Отслеживание изменений в «%s» отключено: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1249 msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" @@ -2451,6 +2436,10 @@ msgstr "_Развернуть всё" msgid "_Collapse All" msgstr "_Свернуть всё" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Фильтр:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" @@ -2476,7 +2465,6 @@ msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копирует адреса всех вкладок в буфер обмена" #: ../extensions/external-applications.vala:93 -#, fuzzy msgid "External Applications" msgstr "Внешние приложения" @@ -2516,17 +2504,17 @@ msgstr "Удалить ленту" msgid "_Feeds" msgstr "Л_енты" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не удалось найти корневой элемент в данных XML." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Формат ленты не поддерживается." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не удалось обработать XML-ленту: %s" @@ -2569,50 +2557,50 @@ msgstr "Панель лент новостей" msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Не удалось добавить значение: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не удалось выполнить запрос к базе данных: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Файлы ресурсов не установлены" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "История форм ввода" #: ../extensions/history-list.vala:174 -#, fuzzy msgid "Next Tab (History List)" msgstr "Следующая вкладка (Список истории)" #: ../extensions/history-list.vala:175 -#, fuzzy msgid "Next tab from history" msgstr "Следующая вкладка из истории\n" #: ../extensions/history-list.vala:184 -#, fuzzy msgid "Previous Tab (History List)" msgstr "Предыдущая вкладка (Список истории)" #: ../extensions/history-list.vala:185 -#, fuzzy msgid "Previous tab from history" msgstr "Предыдущая вкладка из истории" #: ../extensions/history-list.vala:245 -#, fuzzy msgid "History List" msgstr "История вкладок" @@ -2663,7 +2651,6 @@ msgid "Statusbar Clock" msgstr "Панель состояния" #: ../extensions/status-clock.c:177 -#, fuzzy msgid "Display date and time in the statusbar" msgstr "Показывать дату и время в строке статуса" @@ -2739,6 +2726,36 @@ msgstr "Простой редактор панели инструментов" msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" +#~ msgid "_Recently visited pages" +#~ msgstr "_Недавно посещённые страницы" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Открывать страницы, посещённые ранее" + +#~ msgid "Original cookies only" +#~ msgstr "Только оригинальные фрагменты данных" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Принимать фрагменты данных только с оригинального сайта" + +#~ msgid "Remember last visited pages" +#~ msgstr "Запоминать посещённые страницы" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Сохранять историю последних посещений" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Автоматически обнаруживать прокси-сервер" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Брать данные о прокси-сервере из переменных окружения" + +#~ msgid "Erroneous clock time" +#~ msgstr "Некорректное время" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Дата находится в прошлом. Проверьте системное время." + #~ msgid "Show the saved bookmarks" #~ msgstr "Показать все сохранённые закладки" From 50af9f272e1a8937617a9dd5786c4e4f57560f6d Mon Sep 17 00:00:00 2001 From: Dmitrij Smirnov Date: Sun, 22 Aug 2010 19:30:19 +0200 Subject: [PATCH 2895/2970] l10n: Updated Russian (ru) translation to 98% New status: 633 messages complete with 9 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 1103 +++++++++++++++++++++++++++--------------------------- 1 file changed, 543 insertions(+), 560 deletions(-) diff --git a/po/ru.po b/po/ru.po index 869a4a22..417adf18 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-22 10:08+0000\n" +"POT-Creation-Date: 2010-07-04 16:08+0000\n" "PO-Revision-Date: 2010-06-26 00:55+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1331 ../midori/main.c:1660 -#: ../midori/main.c:1668 ../midori/main.c:1684 -#: ../midori/midori-websettings.c:310 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 +#: ../midori/main.c:1640 ../midori/main.c:1656 +#: ../midori/midori-websettings.c:314 msgid "Midori" msgstr "Midori" @@ -32,204 +32,198 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:99 +#: ../midori/main.c:102 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:155 ../midori/main.c:241 +#: ../midori/main.c:158 ../midori/main.c:244 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:425 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Не удалось удалить запись из журнала: %s\n" - -#: ../midori/main.c:500 +#: ../midori/main.c:468 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/main.c:531 +#: ../midori/main.c:500 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:569 +#: ../midori/main.c:538 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:589 ../midori/main.c:612 +#: ../midori/main.c:558 ../midori/main.c:581 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:671 ../midori/main.c:911 +#: ../midori/main.c:640 ../midori/main.c:880 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:855 +#: ../midori/main.c:824 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:945 +#: ../midori/main.c:914 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:960 +#: ../midori/main.c:929 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:964 +#: ../midori/main.c:933 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:969 +#: ../midori/main.c:938 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1209 ../midori/main.c:1955 +#: ../midori/main.c:1178 ../midori/main.c:1909 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1331 +#: ../midori/main.c:1302 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1350 +#: ../midori/main.c:1321 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1381 +#: ../midori/main.c:1352 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1553 +#: ../midori/main.c:1524 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1553 +#: ../midori/main.c:1524 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1556 +#: ../midori/main.c:1527 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1556 +#: ../midori/main.c:1527 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1559 +#: ../midori/main.c:1530 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1561 +#: ../midori/main.c:1532 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1564 +#: ../midori/main.c:1535 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1567 +#: ../midori/main.c:1538 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1569 +#: ../midori/main.c:1540 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1571 +#: ../midori/main.c:1542 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1573 +#: ../midori/main.c:1544 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1573 +#: ../midori/main.c:1544 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1577 +#: ../midori/main.c:1548 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1577 +#: ../midori/main.c:1548 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1657 +#: ../midori/main.c:1629 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1685 +#: ../midori/main.c:1657 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1687 +#: ../midori/main.c:1659 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1804 +#: ../midori/main.c:1756 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1852 +#: ../midori/main.c:1804 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1907 +#: ../midori/main.c:1859 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1928 +#: ../midori/main.c:1881 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1970 +#: ../midori/main.c:1924 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1983 +#: ../midori/main.c:1938 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1997 +#: ../midori/main.c:1952 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2013 +#: ../midori/main.c:1968 msgid "_Ignore" msgstr "_Игнорировать" @@ -250,104 +244,104 @@ msgstr "Неизвестный формат закладок." msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4967 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:453 +#: ../midori/midori-browser.c:460 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:491 +#: ../midori/midori-browser.c:498 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:504 +#: ../midori/midori-browser.c:512 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:736 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:729 +#: ../midori/midori-browser.c:736 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:738 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:738 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:769 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 #: ../extensions/feed-panel/main.c:373 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 +#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 +#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:872 +#: ../midori/midori-browser.c:879 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:885 +#: ../midori/midori-browser.c:892 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:900 +#: ../midori/midori-browser.c:907 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:984 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:983 +#: ../midori/midori-browser.c:988 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 +#: ../midori/midori-browser.c:4204 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2155 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2233 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -355,1267 +349,1269 @@ msgstr "" "Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" "В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 +#: ../panels/midori-bookmarks.c:401 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 +#: ../panels/midori-history.c:751 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 +#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4011 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 +#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 +#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:4051 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4052 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:4053 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:4054 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:4055 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:4079 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4093 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 +#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 +#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4181 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4219 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4155 +#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 +#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 #, c-format -msgid "Failed to clear history: %s\n" -msgstr "Не удалось очистить журнал истории: %s\n" - -#: ../midori/midori-browser.c:4163 -#, c-format -msgid "Failed to clear search history: %s\n" -msgstr "Не удалось очистить журнал поиска: %s\n" +msgid "Failed to remove history item: %s\n" +msgstr "Не удалось удалить запись из журнала: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4380 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4384 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4398 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:114 +#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:120 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4415 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4420 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4425 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 +#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4443 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4544 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4546 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4565 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:4874 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 +#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4877 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4880 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4882 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:4811 +#: ../midori/midori-browser.c:4883 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:4887 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:4890 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4892 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:4893 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4895 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:4824 +#: ../midori/midori-browser.c:4896 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4898 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4899 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:4904 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4905 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4907 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4908 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4911 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4914 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4916 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4920 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4923 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4927 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:4936 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4939 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4942 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4945 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:4947 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4948 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4950 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4951 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4955 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4957 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:4958 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4970 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4973 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4976 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4977 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4979 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4980 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4983 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4986 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4987 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:4989 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:4990 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4992 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:4993 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4995 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:4924 +#: ../midori/midori-browser.c:4996 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4999 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:5002 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:5005 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:5009 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:5013 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:5016 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:5018 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:5019 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:5021 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:5022 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:5028 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:5029 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:5034 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:5038 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5041 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5042 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5046 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5047 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5052 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5053 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5055 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:5056 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5058 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:5059 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:4989 -msgid "Minimize _Current Tab" -msgstr "Свернуть _Текущую вкладку" - -#: ../midori/midori-browser.c:4990 -msgid "Minimize the current tab" -msgstr "Скрыть данную вкладку" - -#: ../midori/midori-browser.c:4992 -#, fuzzy -msgid "_Duplicate Current Tab" -msgstr "Сделать _копию" - -#: ../midori/midori-browser.c:4993 -#, fuzzy -msgid "Duplicate the current tab" -msgstr "Скопировать данную вкладку" - -#: ../midori/midori-browser.c:4995 -msgid "Close Ot_her Tabs" -msgstr "З_акрыть остальные вкладки" - -#: ../midori/midori-browser.c:4996 -msgid "Close all tabs except the current tab" -msgstr "Закрыть все вкладки, кроме текущей" - -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5061 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5062 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5064 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5003 +#: ../midori/midori-browser.c:5066 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:5067 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5069 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5070 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:5072 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5073 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:5076 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5084 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5085 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5088 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5089 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5092 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5093 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5096 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5097 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5100 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5101 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5104 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5105 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5113 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5120 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5662 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5669 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5671 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5695 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5697 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5718 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5733 +msgid "_Recently visited pages" +msgstr "_Недавно посещённые страницы" + +#: ../midori/midori-browser.c:5735 +msgid "Reopen pages that you visited earlier" +msgstr "Открывать страницы, посещённые ранее" + +#: ../midori/midori-browser.c:5750 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5763 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5765 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5779 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5781 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6358 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-locationaction.c:390 +#: ../midori/midori-locationaction.c:377 #, c-format msgid "Failed to select from history\n" msgstr "Не удалось найти в истории\n" -#: ../midori/midori-locationaction.c:474 +#: ../midori/midori-locationaction.c:459 #, c-format msgid "Search for %s" msgstr "Поиск %s" -#: ../midori/midori-locationaction.c:497 +#: ../midori/midori-locationaction.c:482 #, c-format msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:1197 #, c-format msgid "Failed to execute database statement\n" msgstr "Не удалось выполнить запрос к базе данных\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1254 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 +#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 +#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 +#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:771 +#: ../midori/midori-panel.c:802 msgid "Hide operating controls" msgstr "Скрыть элементы управления" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:204 msgid "Show Blank page" msgstr "Открыть пустую страницу" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:205 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:206 msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:207 msgid "Show last tabs without loading" msgstr "Открыть последние страницы без загрузки" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:223 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:243 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:244 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:245 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:260 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:261 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:262 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:263 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:264 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:265 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:280 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:281 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:282 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:297 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:298 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:315 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:316 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:317 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:318 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:371 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:372 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:380 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:381 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:389 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:390 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:415 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:416 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:425 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:426 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:434 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:435 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:444 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:453 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:462 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:463 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:471 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:472 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:487 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:488 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:496 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:497 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:506 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:507 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:523 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:524 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:539 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:540 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:548 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:549 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:557 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:558 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:573 msgid "Show operating controls of the panel" msgstr "Показать элементы управления панелью" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:574 msgid "Whether to show the operating controls of the panel" msgstr "Показывать элементы управления панелью" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:589 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:590 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:605 msgid "Open panels in separate windows" msgstr "Открывать панели в отдельных окнах" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:606 msgid "Whether to always open panels in separate windows" msgstr "Панели при открытии будут отделены от главного окна" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:615 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:616 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:625 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:626 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:641 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:642 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:658 msgid "Show speed dial in new tabs" msgstr "Показывать панель быстрого набора в новых вкладках" -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:659 msgid "Show speed dial in newly opened tabs" msgstr "Показывать панель быстрого набора в только что открытых вкладках" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:667 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:668 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:689 msgid "Ask for the destination folder" msgstr "Запрашивать папку для загрузок" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:690 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Запрашивать конечную папку для каждого файла" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:709 msgid "Notify when a transfer has been completed" msgstr "Уведомлять по завершении передачи" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:710 msgid "Whether to show a notification when a transfer has been completed" msgstr "Показывать уведомление по окончании передачи файлов" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:722 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:723 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:731 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:732 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:747 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:748 msgid "An external news aggregator" msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:756 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:757 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:765 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:766 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:776 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:777 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:785 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:786 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:794 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:795 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:804 msgid "Open external pages in:" msgstr "Открывать внешние страницы в:" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:805 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:814 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:815 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:823 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:824 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:832 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:833 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:841 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:842 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:853 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:861 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:869 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:885 msgid "Enable HTML5 database support" msgstr "Включить поддержку баз данных HTML5" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:886 msgid "Whether to enable HTML5 database support" msgstr "Включить поддержку баз данных стандарта HTML5" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:892 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:893 msgid "Whether to enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища (localStorage) стандарта HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:901 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:902 msgid "Whether to enable offline web application cache" msgstr "Кэшировать данные веб-приложений для автономной работы" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:927 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:928 msgid "Whether to zoom text and images" msgstr "Изменять масштаб изображений при масштабировании страницы" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:943 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:944 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:959 msgid "Kinetic scrolling" msgstr "Инерционная прокрутка" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:960 msgid "Whether scrolling should kinetically move according to speed" msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:968 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:969 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:985 +msgid "Original cookies only" +msgstr "Только оригинальные фрагменты данных" + +#: ../midori/midori-websettings.c:986 +msgid "Accept cookies from the original website only" +msgstr "Принимать фрагменты данных только с оригинального сайта" + +#: ../midori/midori-websettings.c:994 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:995 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:1012 +msgid "Remember last visited pages" +msgstr "Запоминать посещённые страницы" + +#: ../midori/midori-websettings.c:1013 +msgid "Whether the last visited pages are saved" +msgstr "Сохранять историю последних посещений" + +#: ../midori/midori-websettings.c:1021 msgid "Maximum history age" msgstr "Хранить историю за последние" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:1022 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:1030 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:1031 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1048 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1049 msgid "The type of proxy server to use" msgstr "Тип прокси-сервера" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1058 msgid "HTTP Proxy Server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1059 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" +#: ../midori/midori-websettings.c:1074 +msgid "Detect proxy server automatically" +msgstr "Автоматически обнаруживать прокси-сервер" + +#: ../midori/midori-websettings.c:1075 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Брать данные о прокси-сервере из переменных окружения" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1091 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1092 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1108 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1109 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1124 msgid "Preferred languages" msgstr "Предпочитаемые языки" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1125 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Список предпочитаемых языков для отображения многоязычных страниц, например, «de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1140 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1141 msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" @@ -1623,237 +1619,237 @@ msgstr "Выбранные для удаления личные данные" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4439 -#: ../midori/midori-view.c:4443 +#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 +#: ../midori/midori-view.c:4583 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1228 +#: ../midori/midori-view.c:1271 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1230 +#: ../midori/midori-view.c:1273 msgid "Try again" msgstr "Попытаться снова" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1249 +#: ../midori/midori-view.c:1292 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 +#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2212 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2213 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2219 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2222 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 +#: ../midori/midori-view.c:2302 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2239 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2242 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2245 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2246 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2253 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2256 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2256 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2319 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 +#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2287 +#: ../midori/midori-view.c:2382 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2591 +#: ../midori/midori-view.c:2686 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2610 +#: ../midori/midori-view.c:2705 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2708 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2617 +#: ../midori/midori-view.c:2712 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3158 +#: ../midori/midori-view.c:3256 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3439 +#: ../midori/midori-view.c:3538 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3440 +#: ../midori/midori-view.c:3539 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3441 +#: ../midori/midori-view.c:3540 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3442 +#: ../midori/midori-view.c:3541 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3443 +#: ../midori/midori-view.c:3542 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3543 msgid "Set number of columns and rows" msgstr "Установить количество закладок" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3544 msgid "Enter number of columns and rows:" msgstr "Введите число столбцов и строк:" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3545 msgid "Invalid input for the size of the speed dial" msgstr "Проверьте правильность ввода" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3546 msgid "Thumb size:" msgstr "Размер миниатюр:" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3547 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3449 +#: ../midori/midori-view.c:3548 msgid "Medium" msgstr "Средний" -#: ../midori/midori-view.c:3450 +#: ../midori/midori-view.c:3549 msgid "Big" msgstr "Большой" -#: ../midori/midori-view.c:3476 +#: ../midori/midori-view.c:3575 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3499 +#: ../midori/midori-view.c:3598 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3617 +#: ../midori/midori-view.c:3719 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:3720 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:3721 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:3761 +#: ../midori/midori-view.c:3865 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4015 +#: ../midori/midori-view.c:4119 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4020 +#: ../midori/midori-view.c:4124 msgid "_Restore Tab" msgstr "Во_сстановить вкладку" -#: ../midori/midori-view.c:4020 +#: ../midori/midori-view.c:4124 msgid "_Minimize Tab" msgstr "_Свернуть вкладку" -#: ../midori/midori-view.c:4026 +#: ../midori/midori-view.c:4130 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4676 +#: ../midori/midori-view.c:4816 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4677 +#: ../midori/midori-view.c:4817 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4729 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Возможности" @@ -2033,51 +2029,51 @@ msgstr "Управление средствами поиска" msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1287 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1288 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/sokoke.c:1305 +#: ../midori/sokoke.c:1289 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:1306 +#: ../midori/sokoke.c:1290 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1291 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:1308 +#: ../midori/sokoke.c:1292 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:1309 +#: ../midori/sokoke.c:1293 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../midori/sokoke.c:1310 +#: ../midori/sokoke.c:1294 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:1311 +#: ../midori/sokoke.c:1295 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:1312 +#: ../midori/sokoke.c:1296 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:1313 +#: ../midori/sokoke.c:1297 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/sokoke.c:1316 +#: ../midori/sokoke.c:1300 msgid "New _Folder" msgstr "Новая папка" @@ -2106,7 +2102,7 @@ msgstr "Подсветить совпадения" msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 #, c-format msgid "%s of %s" msgstr "%s из %s" @@ -2120,7 +2116,7 @@ msgstr "Файл «%s» загружен." msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 msgid "Clear All" msgstr "Убрать завершённые" @@ -2136,28 +2132,28 @@ msgstr "В_ыйти из Midori" msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." -#: ../panels/midori-bookmarks.c:116 +#: ../panels/midori-bookmarks.c:110 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:216 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:409 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:417 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:431 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:565 msgid "Separator" msgstr "Разделитель" @@ -2177,11 +2173,19 @@ msgstr "Копировать все" msgid "Extensions" msgstr "Дополнения" -#: ../panels/midori-history.c:146 +#: ../panels/midori-history.c:274 +msgid "Erroneous clock time" +msgstr "Некорректное время" + +#: ../panels/midori-history.c:275 +msgid "The clock time lies in the past. Please check the current date and time." +msgstr "Дата находится в прошлом. Проверьте системное время." + +#: ../panels/midori-history.c:287 msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:148 +#: ../panels/midori-history.c:289 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2189,35 +2193,46 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:151 +#: ../panels/midori-history.c:292 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:153 +#: ../panels/midori-history.c:294 msgid "Yesterday" msgstr "Вчера" -#: ../panels/midori-history.c:324 +#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 +#: ../extensions/formhistory.c:472 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не удалось выполнить запрос к базе данных: %s\n" + +#: ../panels/midori-history.c:371 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:369 +#: ../panels/midori-history.c:445 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:454 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:386 +#: ../panels/midori-history.c:462 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-history.c:953 +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Фильтр:" + +#: ../panels/midori-transfers.c:478 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:484 +#: ../panels/midori-transfers.c:481 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" @@ -2327,21 +2342,21 @@ msgstr "Сценарии" msgid "Userstyles" msgstr "Стили пользователя" -#: ../extensions/addons.c:1082 +#: ../extensions/addons.c:1085 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" -#: ../extensions/addons.c:1083 ../extensions/addons.c:1248 +#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 msgid "User addons" msgstr "Пользовательские дополнения" -#: ../extensions/addons.c:1205 +#: ../extensions/addons.c:1210 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Отслеживание изменений в «%s» отключено: %s" -#: ../extensions/addons.c:1249 +#: ../extensions/addons.c:1254 msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" @@ -2436,10 +2451,6 @@ msgstr "_Развернуть всё" msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Фильтр:" - #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" @@ -2465,6 +2476,7 @@ msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копирует адреса всех вкладок в буфер обмена" #: ../extensions/external-applications.vala:93 +#, fuzzy msgid "External Applications" msgstr "Внешние приложения" @@ -2504,17 +2516,17 @@ msgstr "Удалить ленту" msgid "_Feeds" msgstr "Л_енты" -#: ../extensions/feed-panel/feed-parse.c:195 +#: ../extensions/feed-panel/feed-parse.c:192 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не удалось найти корневой элемент в данных XML." -#: ../extensions/feed-panel/feed-parse.c:235 +#: ../extensions/feed-panel/feed-parse.c:232 #, c-format msgid "Unsupported feed format." msgstr "Формат ленты не поддерживается." -#: ../extensions/feed-panel/feed-parse.c:265 +#: ../extensions/feed-panel/feed-parse.c:262 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не удалось обработать XML-ленту: %s" @@ -2557,50 +2569,50 @@ msgstr "Панель лент новостей" msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/formhistory.c:142 +#: ../extensions/formhistory.c:145 #, c-format msgid "Failed to add form value: %s\n" msgstr "Не удалось добавить значение: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не удалось выполнить запрос к базе данных: %s\n" - -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory.c:517 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory.c:521 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:508 +#: ../extensions/formhistory.c:522 msgid "Resource files not installed" msgstr "Файлы ресурсов не установлены" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:528 msgid "Form history filler" msgstr "История форм ввода" #: ../extensions/history-list.vala:174 +#, fuzzy msgid "Next Tab (History List)" msgstr "Следующая вкладка (Список истории)" #: ../extensions/history-list.vala:175 +#, fuzzy msgid "Next tab from history" msgstr "Следующая вкладка из истории\n" #: ../extensions/history-list.vala:184 +#, fuzzy msgid "Previous Tab (History List)" msgstr "Предыдущая вкладка (Список истории)" #: ../extensions/history-list.vala:185 +#, fuzzy msgid "Previous tab from history" msgstr "Предыдущая вкладка из истории" #: ../extensions/history-list.vala:245 +#, fuzzy msgid "History List" msgstr "История вкладок" @@ -2651,6 +2663,7 @@ msgid "Statusbar Clock" msgstr "Панель состояния" #: ../extensions/status-clock.c:177 +#, fuzzy msgid "Display date and time in the statusbar" msgstr "Показывать дату и время в строке статуса" @@ -2726,36 +2739,6 @@ msgstr "Простой редактор панели инструментов" msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" -#~ msgid "_Recently visited pages" -#~ msgstr "_Недавно посещённые страницы" - -#~ msgid "Reopen pages that you visited earlier" -#~ msgstr "Открывать страницы, посещённые ранее" - -#~ msgid "Original cookies only" -#~ msgstr "Только оригинальные фрагменты данных" - -#~ msgid "Accept cookies from the original website only" -#~ msgstr "Принимать фрагменты данных только с оригинального сайта" - -#~ msgid "Remember last visited pages" -#~ msgstr "Запоминать посещённые страницы" - -#~ msgid "Whether the last visited pages are saved" -#~ msgstr "Сохранять историю последних посещений" - -#~ msgid "Detect proxy server automatically" -#~ msgstr "Автоматически обнаруживать прокси-сервер" - -#~ msgid "Whether to detect the proxy server automatically from the environment" -#~ msgstr "Брать данные о прокси-сервере из переменных окружения" - -#~ msgid "Erroneous clock time" -#~ msgstr "Некорректное время" - -#~ msgid "The clock time lies in the past. Please check the current date and time." -#~ msgstr "Дата находится в прошлом. Проверьте системное время." - #~ msgid "Show the saved bookmarks" #~ msgstr "Показать все сохранённые закладки" From 233ff2602de32f211f08d40c919f32c0081da2fb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Aug 2010 21:19:14 +0200 Subject: [PATCH 2896/2970] Switch to Tab Panel after activating it for the first time --- extensions/tab-panel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c index 2d182d5e..beabcda5 100644 --- a/extensions/tab-panel.c +++ b/extensions/tab-panel.c @@ -498,6 +498,7 @@ tab_panel_app_add_browser_cb (MidoriApp* app, GtkCellRenderer* renderer_text; GtkWidget* panel; GtkWidget* toolbar; + gint i; /* GtkToolItem* toolitem; */ g_object_set (browser, "show-tabs", FALSE, NULL); @@ -564,8 +565,10 @@ tab_panel_app_add_browser_cb (MidoriApp* app, gtk_widget_show (GTK_WIDGET (toolitem)); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); */ - midori_panel_append_widget (MIDORI_PANEL (panel), treeview, - STOCK_TAB_PANEL, _("Tab Panel"), toolbar); + i = midori_panel_append_widget (MIDORI_PANEL (panel), treeview, + STOCK_TAB_PANEL, _("Tab Panel"), toolbar); + if (gtk_widget_get_visible (GTK_WIDGET (browser))) + midori_panel_set_current_page (MIDORI_PANEL (panel), i); g_object_unref (panel); midori_browser_foreach (browser, From 99a9cfc34ce8974625c3573345379c51647fae8e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Aug 2010 21:23:54 +0200 Subject: [PATCH 2897/2970] Show the Feed Panel after adding a new news feed --- extensions/feed-panel/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 4695225e..2e46c784 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -336,7 +336,11 @@ secondary_icon_released_cb (GtkAction* action, if ((feed = feed_add_item (priv->feeds, uri))) { - /* FIXME: Let the user know that a feed was added */ + MidoriPanel* panel = katze_object_get_object (priv->browser, "panel"); + gint i = midori_panel_page_num (panel, priv->panel); + midori_panel_set_current_page (panel, i); + gtk_widget_show (panel); + g_object_unref (panel); feed_save_items (priv->extension, priv->feeds); update_feed (priv, KATZE_ITEM (feed)); return TRUE; From 5a86115a9aa939ebba6aac51e4e19f6017ff5ca9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 22 Aug 2010 21:59:11 +0200 Subject: [PATCH 2898/2970] Rename 'Minimize Tabs' to 'Show Tab Icon Only' --- extensions/tabs-minimized.c | 4 ++-- midori/midori-view.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/tabs-minimized.c b/extensions/tabs-minimized.c index 0d14dc68..993625ed 100644 --- a/extensions/tabs-minimized.c +++ b/extensions/tabs-minimized.c @@ -76,8 +76,8 @@ MidoriExtension* extension_init (void) { MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Minimize new Tabs"), - "description", _("New tabs open minimized"), + "name", _("Only Icons on Tabs by default"), + "description", _("New tabs have no label by default"), "version", "0.1", "authors", "MonkeyOfDoom ", NULL); diff --git a/midori/midori-view.c b/midori/midori-view.c index a6c6a855..8255edc6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4017,7 +4017,7 @@ midori_view_get_tab_menu (MidoriView* view) g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_duplicate_tab_cb), view); menuitem = gtk_menu_item_new_with_mnemonic ( - view->minimized ? _("_Restore Tab") : _("_Minimize Tab")); + view->minimized ? _("Show Tab _Label") : _("Show Tab _Icon Only")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_view_tab_label_menu_minimize_tab_cb), view); From 7d049555a5efd8f98c0b0f8737880dd12d4edcb4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 23 Aug 2010 20:08:43 +0200 Subject: [PATCH 2899/2970] Explicitly reset 'delay' status when reloading or changing location --- midori/main.c | 8 +------- midori/midori-view.c | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/midori/main.c b/midori/main.c index 14b97272..a86d58ac 100644 --- a/midori/main.c +++ b/midori/main.c @@ -510,10 +510,7 @@ midori_session_add_delay (KatzeArray* session) KatzeItem* item; gint i = 0; while ((item = katze_array_get_nth_item (session, i++))) - { - if (katze_item_get_meta_integer (item, "delay") < 0) - katze_item_set_meta_integer (item, "delay", 1); - } + katze_item_set_meta_integer (item, "delay", 1); } static void @@ -2043,7 +2040,6 @@ main (int argc, uri_ready = midori_prepare_uri (uri); katze_item_set_uri (item, uri_ready); g_free (uri_ready); - katze_item_set_meta_integer (item, "delay", 0); katze_array_add_item (_session, item); uri = strtok (NULL, "|"); } @@ -2077,9 +2073,7 @@ main (int argc, and deleted during normal runtime, but persists in case of a crash. */ katze_assign (config_file, build_config_filename ("running")); if (g_access (config_file, F_OK) == 0) - { back_from_crash = TRUE; - } else g_file_set_contents (config_file, "RUNNING", -1, NULL); diff --git a/midori/midori-view.c b/midori/midori-view.c index 8255edc6..623a6691 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3644,6 +3644,7 @@ midori_view_set_uri (MidoriView* view, { katze_assign (view->uri, sokoke_format_uri_for_display (uri)); katze_item_set_uri (view->item, uri); + katze_item_set_meta_integer (view->item, "delay", -1); g_object_notify (G_OBJECT (view), "uri"); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), uri); } @@ -4454,6 +4455,7 @@ midori_view_reload (MidoriView* view, webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); else webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view)); + katze_item_set_meta_integer (view->item, "delay", -1); g_free (title); } From a888a802ecac385e7cbf125d374d5b4e7ab45661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Tue, 24 Aug 2010 09:39:10 +0200 Subject: [PATCH 2900/2970] l10n: Updated Czech (cs) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 765 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 387 insertions(+), 378 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6ba12724..d73184f0 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 10:08+0000\n" +"POT-Creation-Date: 2010-08-24 04:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 #: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -32,198 +32,204 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetový prohlížeč" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurace nemůže být načtena: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Hodnota '%s' je pro %s špatná" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Nesprávná hodnota '%s' v konfiguraci" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Nepodařilo se otevřít databázi: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nepodařilo se odstranit staré položky historie: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodařilo se odstranit položku historie: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky nemohou být uloženy. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurace nemůže být uložena. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhledávací nástroj nemůže být uložen. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Seznam zavřených karet nemůže být uložen. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sezení nemůže být uloženo. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nejsou k dispozici žádné kořenové certifikáty. SSL certifikáty nemohou být ověřovány." -#: ../midori/main.c:914 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává opakovaně, pro odstranění problému zkuste následující možnosti." -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Vymazat poslední _sezení" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1178 ../midori/main.c:1927 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Nebyl zadán název souboru" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Snímek uložen do %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Spustit ADRESA jako webovou aplikaci" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Použít SLOŽKA jako místo pro uložení konfigurace" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "SLOŽKA" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Získat snímek požadovaného URI" -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Spustit vybraný příkaz" -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokovat adresy (URI) pomocí regulárního výrazu REGVÝRAZ" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "REGVÝRAZ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restartovat Midori po VTEŘINY vteřin neaktivity" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "VTEŘINY" -#: ../midori/main.c:1629 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Zkontrolujte, zda není nová verze na " -#: ../midori/main.c:1774 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1822 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1899 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1942 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1956 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1970 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1986 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorovat" @@ -244,794 +250,794 @@ msgstr "Neznámý formát záložek." msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Nepodařilo se zaktualizovat titulek: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Zobrazit v _nástrojové liště" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Spustit jako _webovou aplikaci" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Není dost místa pro stažení \"%s\"." -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Požadováno je %s, ale k dispozici jen %s." -#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Uložit soubor" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "Když použijete výše uvedenou adresu, otevře se agregátor zpráv (čtečka RSS). Obvykle je v něm položka menu nebo tlačítko \"Nový kanál\" (nebo s podobným názvem). Další možností je změna nastavení Midori (Upravit -> Nastavení -> záložka Aplikace, položka Čtečka RSS). Příští kliknutí na ikonu RSS přidá kanál přímo do čtečky." -#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nový kanál" -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 -#: ../panels/midori-bookmarks.c:403 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Nemohu spustit externí program." -#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nepodařilo se vložit novou položku historie: %s\n" -#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:718 -#: ../panels/midori-history.c:710 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:724 -#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4012 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3947 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3948 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importovat záložky..." -#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importovat záložky" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Aplikace:" -#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 #: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 #: ../katze/katze-utils.c:692 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Nepodařilo se naimportovat záložky" -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Nepodařilo se exportovat záložky" -#: ../midori/midori-browser.c:4167 +#: ../midori/midori-browser.c:4155 #, c-format msgid "Failed to clear history: %s\n" msgstr "Nepodařilo se smazat historii: %s\n" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4163 #, c-format msgid "Failed to clear search history: %s\n" msgstr "Nepodařilo se smazat historii hledání: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "_Zavřené karty" -#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Keš stránek" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "_Vymazat osobní data při ukončení Midori" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:4489 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Tato knihovna je svobodný software; můžete ji distribuovat anebo měnit podle práv GNU Lesser General Public License jak byla publikována Free Software Foundation; ať už verze 2.1, nebo (podle uvážení) jakékoliv pozdější verze." -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nové _okno" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:4825 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Přidat do rychlého _přístupu" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Přidá záložku do rychlého přístupu" -#: ../midori/midori-browser.c:4838 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Přidat záložku na _plochu" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Přidá záložku na plochu" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Přidat _kanál" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Přidá tento kanál do odebíraných kanálů" -#: ../midori/midori-browser.c:4847 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:4859 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Vrátit zpět poslední změnu" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Vrátit poslední změnu" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:4888 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:4891 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:4894 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Zobrazit" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Rolovat v_levo" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Posunout pohled vlevo" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Rolovat _dolů" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Posunout pohled dolů" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Rolovat nahor_u" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Posunout pohled nahoru" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Rolovat vp_ravo" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Posunout pohled vpravo" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Přejít" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Přejít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Přejít vpřed (na následující stránku)" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Přejít na předchozí podstránku" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Přejít na následující podstránku" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Přejít na domovskou stránku" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Vrátit _zavření karty" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Přidat novou _složku" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Exportovat záložky" -#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:4985 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "Pro_zkoumat stránku" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Zobrazí stránku ve vývojářském nástroji..." -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Zaměřit _aktuální kartu" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Zaměří aktuální kartu" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:4989 msgid "Minimize _Current Tab" msgstr "Minimalizovat _aktuální kartu" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "Minimalizuje aktuální kartu" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4992 msgid "_Duplicate Current Tab" msgstr "Z_dvojit aktuální kartu" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "Obsah aktuální karty otevře v nové kartě" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4995 msgid "Close Ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4996 msgid "Close all tabs except the current tab" msgstr "Zavře všechny karty kromě aktuální" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Otevřít poslední _sezení" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Otevře karty uložené při posledním sezení" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:5044 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Nabídka" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Nabídka" -#: ../midori/midori-browser.c:6280 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Nepodařilo se načíst údaje z historie\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Vyhledat %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Hledat %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Nepodařilo se spustit databázový příkaz\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Vložit a s_pustit" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Oddělit vybraný panel od okna" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Zavřít panel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Umístit boční panel vlevo" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Schovat ovládací prvky" @@ -1610,237 +1616,237 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4440 +#: ../midori/midori-view.c:4444 #, c-format msgid "Error - %s" msgstr "Chyba - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stránka '%s' nemůže být načtena." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Zkusit znovu" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Nenalezeno - %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Poslat %s zprávu" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Prozkoumat _prvek" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Otevřít odkaz v nové kartě a _zobrazit ji" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Otevřít odkaz v nové kartě na _pozadí" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Otevřít odkaz jako _webovou aplikaci" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Zkopírovat _cíl odkazu" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Uložit odkaz" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Stáhnout odkaz" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Stáhnout za použití Download _manageru" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Otevřít _obrázek v nové kartě" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Zkopírovat _adresu obrázku" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Uložit o_brázek" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Stáhnout o_brázek" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Zkopírovat _adresu videa" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Uložit _video" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Stáhnout _video" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Hledat _s" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Rychlý přístup" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Záložku přidáte kliknutím" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Vložte adresu záložky" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Vložte název záložky" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Opravdu chcete smazat tuto záložku?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Změnit počet sloupců a řádků" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Vložte počet sloupců a řádků:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Nesprávná hodnota velikosti rychlého přístupu" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Velikost náhledů:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "malá" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "střední" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "velká" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3617 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3618 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3619 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3762 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4016 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4124 -msgid "_Restore Tab" -msgstr "_Ukázat titulek" +#: ../midori/midori-view.c:4021 +msgid "Show Tab _Label" +msgstr "Zobrazit _popisek karty" -#: ../midori/midori-view.c:4124 -msgid "_Minimize Tab" -msgstr "_Schovat titulek" +#: ../midori/midori-view.c:4021 +msgid "Show Tab _Icon Only" +msgstr "Zobrazit jen _ikonu karty" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4027 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4678 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4679 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4731 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Rozšíření" @@ -2020,51 +2026,51 @@ msgstr "Upravit vyhledávací nástroje" msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Záložky" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "_Přidat záložku" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Rozšíření" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Historie" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Uživatelské skripty" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Přenosy" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Netscape p_luginy" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nová _složka" @@ -2093,7 +2099,7 @@ msgstr "Zvýraznit nalezené" msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s z %s" @@ -2107,7 +2113,7 @@ msgstr "Soubor %s byl stažen." msgid "Transfer completed" msgstr "Přenos dokončen" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Smazat vše" @@ -2127,30 +2133,24 @@ msgstr "Jestliže bude Midori ukončeno, stahování se stornuje." msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Záložku se nepodařilo přidat: %s\n" -#: ../panels/midori-bookmarks.c:278 ../panels/midori-history.c:142 -#: ../panels/midori-history.c:172 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Nepodařilo se odstranit položku historie: %s\n" - -#: ../panels/midori-bookmarks.c:411 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:419 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:433 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Přidat složku" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Oddělovač" @@ -2170,19 +2170,11 @@ msgstr "Kopírovat vše" msgid "Extensions" msgstr "Rozšíření" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Chyba v nastavení času" - -#: ../panels/midori-history.c:275 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Hodiny jdou pozpátku. Zkontrolujte nastavení data a času." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Před týdnem" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2190,41 +2182,35 @@ msgstr[0] "Před %d dny" msgstr[1] "Před %d dny" msgstr[2] "Před %d dny" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Dnes" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Včera" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Nepodařilo se spustit databázový příkaz: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat všechny položky historie?" -#: ../panels/midori-history.c:414 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Zazáložkovat vybranou položku historie" -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:431 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Otevřít cílovou _složku" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Kopírovat umís_tění" @@ -2332,21 +2318,21 @@ msgstr "Uživatelské skripty" msgid "Userstyles" msgstr "Uživatelské styly" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:1082 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1083 ../extensions/addons.c:1248 msgid "User addons" msgstr "Uživatelova rozšíření" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1205 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nemohu sledovat složku '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1249 msgid "Support for userscripts and userstyles" msgstr "Podpora pro userscripts a userstyles." @@ -2508,17 +2494,17 @@ msgstr "Smazat kanál" msgid "_Feeds" msgstr "_Kanály" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Chyba při hledání kořenového elementu v XML datech." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Nepodporovaný formát kanálu." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Nepodařilo se načíst XML kanál: %s" @@ -2553,33 +2539,38 @@ msgstr "Kanál '%s' byl již přidán" msgid "Error loading feed '%s'" msgstr "Chyba při načítání kanálu '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Panel kanálů" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Čte Atom/RSS kanály" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Nepodařilo se přidat položku formuláře: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Nepodařilo se spustit databázový příkaz: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Ukládat historii hodnot vložených do formuláře" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Není k dispozici: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Nejsou nainstalovány soubory se zdrojem" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Ukládání hodnot ve formuláři" @@ -2672,25 +2663,25 @@ msgstr "Rozšíření stavové lišty" msgid "Easily toggle features on web pages on and off" msgstr "Jednoduše zapíná a vypíná rozšíření webových stránek" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Panel karet" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "Panel _karet" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Zobrazí karty ve vertikálním panelu" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Minimalizovat otevřené karty" +msgid "Only Icons on Tabs by default" +msgstr "Na kartách zobrazovat jen ikony" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Nové karty otevírat minimalizovaně" +msgid "New tabs have no label by default" +msgstr "Nové karty nebudou mít popisek" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2724,6 +2715,24 @@ msgstr "Umožňuje jednoduše změnit lištu" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +#~ msgid "_Restore Tab" +#~ msgstr "_Ukázat titulek" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Schovat titulek" + +#~ msgid "Erroneous clock time" +#~ msgstr "Chyba v nastavení času" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Hodiny jdou pozpátku. Zkontrolujte nastavení data a času." + +#~ msgid "Minimize new Tabs" +#~ msgstr "Minimalizovat otevřené karty" + +#~ msgid "New tabs open minimized" +#~ msgstr "Nové karty otevírat minimalizovaně" + #~ msgid "_Recently visited pages" #~ msgstr "_Naposledy navštívené stránky" From 672b7ab70a61ad5b5833cfadb3109c3912e6cc59 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 24 Aug 2010 23:50:47 +0200 Subject: [PATCH 2901/2970] Protect proxy combo box notifications against recursion This can happen when switching between custom and other elements. --- katze/katze-utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index dc7f7946..8e98ef43 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -247,10 +247,14 @@ proxy_combo_box_changed_cb (GtkComboBox* button, } else if (value != custom_value && GTK_IS_ENTRY (child)) { + g_signal_handlers_block_by_func ( + button, proxy_combo_box_changed_cb, object); /* Force the combo to change the item again */ gtk_widget_destroy (child); gtk_combo_box_set_active (button, value + 1); gtk_combo_box_set_active (button, value); + g_signal_handlers_unblock_by_func ( + button, proxy_combo_box_changed_cb, object); } } From a079235183f4b5fddeb22fc48e796bb5c92c7817 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Wed, 25 Aug 2010 20:25:32 +0200 Subject: [PATCH 2902/2970] l10n: Updated Danish (da) translation to 99% New status: 638 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 753 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 381 insertions(+), 372 deletions(-) diff --git a/po/da.po b/po/da.po index c630d977..f3719b9e 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-20 16:08+0000\n" +"POT-Creation-Date: 2010-08-25 16:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Letvægtig webbrowser" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1631 -#: ../midori/main.c:1639 ../midori/main.c:1655 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 #: ../midori/midori-websettings.c:310 msgid "Midori" msgstr "Midori" @@ -46,183 +46,189 @@ msgstr "Værdien '%s' er ikke gyldig til %s" msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:368 ../midori/main.c:445 ../extensions/formhistory.c:440 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:428 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:471 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Kunne ikke fjerne historikelementet: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" -#: ../midori/main.c:502 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:540 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:560 ../midori/main.c:583 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:642 ../midori/main.c:882 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:826 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Ingen rodcertifikatfil er tilgængelig. SSL certifikater kan ikke verificeres." -#: ../midori/main.c:916 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:931 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Ændre _indstillinger" -#: ../midori/main.c:935 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Nulstil den sidste _session" -#: ../midori/main.c:940 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1180 ../midori/main.c:1924 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Intet filnavn angivet" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "En ukendt fejl opstod." -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Øjebliksbillede gem til: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Kør ADRESSE som et webprogram" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Brug MAPPE som en indstillingsmappe" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "MAPPE" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Vis en nedbrudsdialog" -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Tag et øjebliksbillede at det angivne URI" -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Kør den angivne kommando" -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Adresser" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Blokér URI'er i overensstemmelse med regulære udtryks-MØNSTRE" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "MØNSTRE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SEKUNDER" -#: ../midori/main.c:1628 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Adresser]" -#: ../midori/main.c:1656 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1658 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1773 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "Den angivne indstillingsmappe er ikke gyldig." -#: ../midori/main.c:1821 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1876 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" -#: ../midori/main.c:1897 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1966 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1982 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorér" @@ -243,252 +249,252 @@ msgstr "Ukendt bogmærkeformat." msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:4919 -#: ../midori/midori-browser.c:4925 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:493 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Kunne ikke opdatere titel: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:735 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Ny mappe" -#: ../midori/midori-browser.c:735 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Redigér mappe" -#: ../midori/midori-browser.c:737 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:737 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:768 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:785 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:804 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:836 ../midori/midori-browser.c:4041 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:846 ../midori/midori-browser.c:936 -#: ../midori/midori-browser.c:4046 ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Øverste mappe" -#: ../midori/midori-browser.c:878 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:891 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Vis på vær_ktøjsbjælken" -#: ../midori/midori-browser.c:906 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Kør so_m et webprogram" -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der er ikke tilstrækkelig fri plads til at hente \"%s\"." -#: ../midori/midori-browser.c:986 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Filen behøver %s men der er kun %s fri plads" -#: ../midori/midori-browser.c:1043 ../midori/midori-browser.c:4083 -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1436 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Gem fil" -#: ../midori/midori-browser.c:2153 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2231 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -#: ../midori/midori-browser.c:2237 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nyt feed" -#: ../midori/midori-browser.c:2280 ../midori/midori-browser.c:4984 -#: ../panels/midori-bookmarks.c:396 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3286 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/midori-browser.c:3549 ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Kunne ikke indsætte nyt historikelement: %s\n" -#: ../midori/midori-browser.c:3876 ../panels/midori-bookmarks.c:709 -#: ../panels/midori-history.c:698 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Åbn alt i _faneblade" -#: ../midori/midori-browser.c:3883 ../panels/midori-bookmarks.c:715 -#: ../panels/midori-history.c:704 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:3886 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4113 ../panels/midori-bookmarks.c:717 -#: ../panels/midori-history.c:706 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4012 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:3964 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3965 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3966 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3967 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3968 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3992 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importér bogmærker..." -#: ../midori/midori-browser.c:3995 ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importér bogmærker" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4033 ../midori/midori-browser.c:5102 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 #: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Tilpasset..." -#: ../midori/midori-browser.c:4094 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Kunne ikke importere bogmærker" -#: ../midori/midori-browser.c:4132 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Kunne ikke eksportere bogmærker" -#: ../midori/midori-browser.c:4185 +#: ../midori/midori-browser.c:4155 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kunne ikke fjerne historik: %s\n" -#: ../midori/midori-browser.c:4193 +#: ../midori/midori-browser.c:4163 #, c-format msgid "Failed to clear search history: %s\n" msgstr "Kunne ikke fjerne søgehistorik: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4300 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Ryd private data" -#: ../midori/midori-browser.c:4304 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Ryd de følgende data:" -#: ../midori/midori-browser.c:4328 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:117 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historik" -#: ../midori/midori-browser.c:4333 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4338 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "'Flash' cookies" -#: ../midori/midori-browser.c:4343 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Webstedikoner" -#: ../midori/midori-browser.c:4348 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "_Luk faneblade" -#: ../midori/midori-browser.c:4353 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Webcache" -#: ../midori/midori-browser.c:4361 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "_Ryd private data når Midori afsluttes" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:4504 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Dette bibliotek er åbent programmel: Du kan frit gendistribuere det og/eller ændre det i overensstemmelse med GNU Lesser General Public License som publiceret af Free Software Foundation: Enten version 2.1 af licensen eller (dit frie valg) en senere version." -#: ../midori/midori-browser.c:4523 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -496,545 +502,545 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:4834 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nyt _vindue" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:4838 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:4840 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:4845 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Tilføj til hurtig_opkald" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Tilføj genvej til hurtigopkald" -#: ../midori/midori-browser.c:4853 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Tilføj genvej til _skrivebordet" -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Tilføj genvej til skrivebordet" -#: ../midori/midori-browser.c:4856 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Abonnér på _nyhedskilder" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Abonnér på denne nyhedskilde" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:4865 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:4869 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:4872 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Fortryd den sidste ændring" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Gentag den sidste ændring" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:4888 ../midori/midori-browser.c:4891 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:4894 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:4897 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:4903 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:4906 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:4909 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:4928 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:4931 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Kodning" -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Rul til _venstre" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Rul til venstre" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Rul _ned" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Rul ned" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Rul _op" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Rul op" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Rul til _højre" -#: ../midori/midori-browser.c:4954 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Rul til højre" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:4960 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Gå til næste side" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Gå til den forrige uderside" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Gå til den næste underside" -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Fortryd lu_k faneblad" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Tilføj en ny _mappe" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Tilføj en ny bogmærkemappe" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Eksportér bogmærker" -#: ../midori/midori-browser.c:4995 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Ryd private data" -#: ../midori/midori-browser.c:5000 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Ryd private data..." -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Undersøg side" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Undersøg sidedetaljerne and tilgå udviklerværktøjerne..." -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Fokus på _nuværende faneblad" -#: ../midori/midori-browser.c:5017 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Fokus på det nuværende faneblad" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4989 msgid "Minimize _Current Tab" msgstr "_Minimér nuværede faneblade" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "Minimér nuværende faneblad" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4992 msgid "_Duplicate Current Tab" msgstr "_Dublér nuværende faneblad" -#: ../midori/midori-browser.c:5023 +#: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "Dublér nuværende faneblad" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:4995 msgid "Close Ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:4996 msgid "Close all tabs except the current tab" msgstr "Luk alle faneblade undtaget nuværende faneblad" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Åbn den sidste _session" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Åbn faneblade gemt i den sidste session" -#: ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:5043 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:5060 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:5071 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:5080 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5083 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:218 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5087 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5090 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:220 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5093 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:221 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5096 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:222 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5099 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:223 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Separator" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:5645 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:5647 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:5700 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "Vin_due" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:5716 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6295 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Kunne ikke vælge fra historik\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Søg efter %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Søg med %s" -#: ../midori/midori-locationaction.c:1189 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Kunne ikke køre databaseudtryk\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1245 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Indsæt og f_ortsæt" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Frigør valgte panel fra vinduet" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Opstil sidepanel til venstre" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Skjul handlingskontroller" @@ -1114,7 +1120,7 @@ msgstr "Alle cookies" msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:672 msgid "None" msgstr "Ingen" @@ -1613,237 +1619,237 @@ msgstr "De private data valgt til sletning" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4577 -#: ../midori/midori-view.c:4581 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4440 +#: ../midori/midori-view.c:4444 #, c-format msgid "Error - %s" msgstr "Fejl - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Siden '%s' kunne ikke indlæses." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Prøv igen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Send en besked til %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Undersøg _element" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Åbn henvisning i _fanebladet i forgrunden" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Åbn henvisning i _faneblad i baggrunden" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Åbn henvisning som et _webprogram" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Kopiér _henvisningsdestination" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Hent henvisningsadressen" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Hent med nedhentnings_håndtering" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Åbn _billede i nyt faneblad" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Kopiér billed_adresse" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Gem _billede" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Hent bi_llede" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Kopiér vide_oadresse" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Gem _video" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Hent _video" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Søg _med" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Søg internettet" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Åbn adresse i nyt _faneblad" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Åbn eller hent fil" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Filtype: '%s'" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Filtype: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Åbn %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Hurtigopkald" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Klik for at tilføje en genvej" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Tast genvejsadresse" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Tast en genvejstitel" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Er du sikker på, at du ønsker at fjerne denne genvej?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Indstil antal af kolonner og rækker" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Angiv antal kolonner og rækker:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Ugyldig inddata af størrelsen til hurtigopringing." -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Miniaturestørrelse:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Små" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Mellem" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Stor" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3717 +#: ../midori/midori-view.c:3617 msgid "Page loading delayed" msgstr "Forsinket sideindlæsning" -#: ../midori/midori-view.c:3718 +#: ../midori/midori-view.c:3618 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3619 msgid "Load Page" msgstr "Indlæs side" -#: ../midori/midori-view.c:3863 +#: ../midori/midori-view.c:3762 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4117 +#: ../midori/midori-view.c:4016 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4122 -msgid "_Restore Tab" -msgstr "_Gendan faneblad" +#: ../midori/midori-view.c:4021 +msgid "Show Tab _Label" +msgstr "Vis faneblad_titel" -#: ../midori/midori-view.c:4122 -msgid "_Minimize Tab" -msgstr "_Minimér faneblad" +#: ../midori/midori-view.c:4021 +msgid "Show Tab _Icon Only" +msgstr "Vis kun faneblad_ikon" -#: ../midori/midori-view.c:4128 +#: ../midori/midori-view.c:4027 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4814 +#: ../midori/midori-view.c:4678 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4815 +#: ../midori/midori-view.c:4679 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4867 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4731 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funktionalitet" @@ -2023,51 +2029,51 @@ msgstr "Håndtér søgemaskiner" msgid "Use as _default" msgstr "Brug som _standard" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Bogmærke" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "_Tilføj bogmærke" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Konsol" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Udvidelser" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "Hi_storik" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Hjemmeside" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "Brugerskri_pter" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nyt _faneblad" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Overførsler" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Netscape-u_dvidelsesmoduler" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Ny __mappe" @@ -2096,7 +2102,7 @@ msgstr "Fremhæv fundne" msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s af %s" @@ -2110,7 +2116,7 @@ msgstr "Filen '%s' er blevet hentet." msgid "Transfer completed" msgstr "Overførsel gennemført" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Ryd alle" @@ -2130,30 +2136,24 @@ msgstr "Overførslen vil blive afbrudt hvis Midori afsluttes." msgid "Bookmarks" msgstr "Bogmærker" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" -#: ../panels/midori-bookmarks.c:277 ../panels/midori-history.c:138 -#: ../panels/midori-history.c:168 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Kunne ikke fjerne historikelementet: %s\n" - -#: ../panels/midori-bookmarks.c:404 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Redigér det valgte bogmærke" -#: ../panels/midori-bookmarks.c:412 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Slet det valgte bogmærke" -#: ../panels/midori-bookmarks.c:426 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Tilføj en ny mappe" -#: ../panels/midori-bookmarks.c:556 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Separator" @@ -2173,60 +2173,46 @@ msgstr "Kopiér alt" msgid "Extensions" msgstr "Udvidelser" -#: ../panels/midori-history.c:270 -msgid "Erroneous clock time" -msgstr "Fejlagtig tid" - -#: ../panels/midori-history.c:271 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Tiden ligger i fortiden. Kontrollér den aktuelle dato og tid." - -#: ../panels/midori-history.c:283 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "For en uge siden" -#: ../panels/midori-history.c:285 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dage siden" msgstr[1] "%d dage siden" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "I dag" -#: ../panels/midori-history.c:290 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "I går" -#: ../panels/midori-history.c:329 ../extensions/formhistory.c:455 -#: ../extensions/formhistory.c:459 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Kunne ikke køre databaseudtryk: %s\n" - -#: ../panels/midori-history.c:367 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" -#: ../panels/midori-history.c:406 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Bogmærk det valgte historikelement" -#: ../panels/midori-history.c:415 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Slet det valgte historikelement" -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Ryd hele historikken" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Åbn mål_mappen" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Kopiér henvisnings_sted" @@ -2268,16 +2254,16 @@ msgstr "Lagerikon '%s' kunne ikke indlæses" msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Vælg mappe" @@ -2336,21 +2322,21 @@ msgstr "Brugerskripter" msgid "Userstyles" msgstr "Brugerstile" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:1082 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1083 ../extensions/addons.c:1248 msgid "User addons" msgstr "Brug udvidelsesm,oduler" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1205 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan ikke overvåge mappe '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1249 msgid "Support for userscripts and userstyles" msgstr "Understøttelse af brugerskripter og brugerstile" @@ -2557,11 +2543,11 @@ msgstr "Feed '%s' findes allerede" msgid "Error loading feed '%s'" msgstr "Fejl ved indlæsning af feed '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Feed-panel" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Læs Atom-/ RSS-feeds" @@ -2570,6 +2556,11 @@ msgstr "Læs Atom-/ RSS-feeds" msgid "Failed to add form value: %s\n" msgstr "Kunne ikke tilføje formularværdien: %s\n" +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Kunne ikke køre databaseudtryk: %s\n" + #: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Gem historikken af indtastede formulardata" @@ -2676,25 +2667,25 @@ msgstr "Status funktioner" msgid "Easily toggle features on web pages on and off" msgstr "Slå nemt netsiders funktioner til/fra" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Fanebladpanel" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "Faneblad_panel" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Vis faneblade i et lodret panel" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "_Minimér nye faneblade" +msgid "Only Icons on Tabs by default" +msgstr "Kun ikoner på faneblade som standard" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Åbn nye faneblade minimeret" +msgid "New tabs have no label by default" +msgstr "Nye faneblade har ingen titel som standard" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2728,6 +2719,24 @@ msgstr "Redigér nemt layout af værktøjsbjælken" msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation på disk" +#~ msgid "_Restore Tab" +#~ msgstr "_Gendan faneblad" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimér faneblad" + +#~ msgid "Erroneous clock time" +#~ msgstr "Fejlagtig tid" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Tiden ligger i fortiden. Kontrollér den aktuelle dato og tid." + +#~ msgid "Minimize new Tabs" +#~ msgstr "_Minimér nye faneblade" + +#~ msgid "New tabs open minimized" +#~ msgstr "Åbn nye faneblade minimeret" + #~ msgid "_Recently visited pages" #~ msgstr "_Nyligt besøgte sider" From 7d3fa2a478ad19e69f5c87c94c74d606ad632413 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 27 Aug 2010 22:39:17 +0200 Subject: [PATCH 2903/2970] Move WebKitGTK+ 1.1.6 guards to disable delayed pages --- midori/midori-view.c | 4 +++- midori/midori-websettings.c | 2 ++ midori/midori-websettings.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 623a6691..a4db75da 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1053,7 +1053,6 @@ webkit_web_view_progress_changed_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "progress"); } -#if WEBKIT_CHECK_VERSION (1, 1, 6) #if WEBKIT_CHECK_VERSION (1, 1, 14) static void midori_view_web_view_resource_request_cb (WebKitWebView* web_view, @@ -1158,6 +1157,7 @@ midori_view_load_alternate_string (MidoriView* view, #endif } +#if WEBKIT_CHECK_VERSION (1, 1, 6) static gboolean midori_view_display_error (MidoriView* view, const gchar* uri, @@ -3606,6 +3606,7 @@ midori_view_set_uri (MidoriView* view, g_object_notify (G_OBJECT (view), "uri"); return; } + #if WEBKIT_CHECK_VERSION (1, 1, 6) else if (g_str_has_prefix (uri, "pause:")) { gchar* title; @@ -3622,6 +3623,7 @@ midori_view_set_uri (MidoriView* view, katze_item_set_uri (view->item, uri); g_object_notify (G_OBJECT (view), "uri"); } + #endif else if (g_str_has_prefix (uri, "javascript:")) { gboolean result; diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 122f0a0c..997ad49a 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -200,7 +200,9 @@ midori_startup_get_type (void) { MIDORI_STARTUP_BLANK_PAGE, "MIDORI_STARTUP_BLANK_PAGE", N_("Show Blank page") }, { MIDORI_STARTUP_HOMEPAGE, "MIDORI_STARTUP_HOMEPAGE", N_("Show Homepage") }, { MIDORI_STARTUP_LAST_OPEN_PAGES, "MIDORI_STARTUP_LAST_OPEN_PAGES", N_("Show last open tabs") }, + #if WEBKIT_CHECK_VERSION (1, 1, 6) { MIDORI_STARTUP_DELAYED_PAGES, "MIDORI_STARTUP_DELAYED_PAGES", N_("Show last tabs without loading") }, + #endif { 0, NULL, NULL } }; type = g_enum_register_static ("MidoriStartup", values); diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h index 2cedff15..a8f36788 100644 --- a/midori/midori-websettings.h +++ b/midori/midori-websettings.h @@ -66,7 +66,9 @@ typedef enum MIDORI_STARTUP_BLANK_PAGE, /* One blank tab or speed dial is opened */ MIDORI_STARTUP_HOMEPAGE, /* One homepage tab is opened */ MIDORI_STARTUP_LAST_OPEN_PAGES, /* The session is loaded and saved */ + #if WEBKIT_CHECK_VERSION (1, 1, 6) MIDORI_STARTUP_DELAYED_PAGES /* The session is saved, loading pages is delayed */ + #endif } MidoriStartup; GType From 49d249e6e17a32690fd0cbf11a5bece239b992f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Thu, 26 Aug 2010 22:53:11 +0200 Subject: [PATCH 2904/2970] Show full path to addon in tooltips --- extensions/addons.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/addons.c b/extensions/addons.c index 088aa331..58ecf92f 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -731,7 +731,7 @@ addons_update_elements (MidoriExtension* extension, gtk_list_store_append (liststore, &iter); gtk_list_store_set (liststore, &iter, - 0, element, 1, 0, 2, "", -1); + 0, element, 1, 0, 2, element->fullpath, -1); addon_files = g_slist_next (addon_files); elements = g_slist_prepend (elements, element); @@ -777,6 +777,7 @@ addons_init (Addons* addons) (GtkTreeCellDataFunc)addons_treeview_render_text_cb, addons->treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column); + gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (addons->treeview), 2); g_signal_connect (addons->treeview, "row-activated", G_CALLBACK (addons_treeview_row_activated_cb), addons); From eee7cbcff92e9120b66ece3772610d89ebd2256f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Fri, 27 Aug 2010 03:20:48 +0200 Subject: [PATCH 2905/2970] Add button for deleting user addons --- extensions/addons.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/extensions/addons.c b/extensions/addons.c index 58ecf92f..50da1ab4 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -126,6 +126,65 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, gtk_widget_destroy (dialog); } +static void +midori_addons_button_delete_clicked_cb (GtkWidget* toolitem, + Addons* addons) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (addons->treeview), + &model, &iter)) + { + struct AddonElement* element; + gint delete_response; + GtkWidget* dialog; + + gtk_tree_model_get (model, &iter, 0, &element, -1); + dialog = gtk_message_dialog_new ( + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + _("Do you really want to remove '%s'?\n\n" + "The file '%s' will be permanently lost.\n"), + element->displayname, element->fullpath); + delete_response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + + if (delete_response == GTK_RESPONSE_YES) + { + GError* error = NULL; + GFile* file; + gboolean result; + + file = g_file_new_for_path (element->fullpath); + result = g_file_delete (file, NULL, &error); + + if (!result && error) + { + GtkWidget* msg_box; + msg_box = gtk_message_dialog_new ( + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "%s", error->message); + + gtk_window_set_title (GTK_WINDOW (msg_box), _("Error")); + gtk_dialog_run (GTK_DIALOG (msg_box)); + gtk_widget_destroy (msg_box); + g_error_free (error); + } + + if (result) + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + + g_object_unref (file); + } + } +} + GtkWidget* addons_get_toolbar (MidoriViewable* viewable) { @@ -157,7 +216,14 @@ addons_get_toolbar (MidoriViewable* viewable) g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_add_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + /* Delete button */ + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_addons_button_delete_clicked_cb), viewable); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); ADDONS (viewable)->toolbar = toolbar; From dc90ad18e9c1c5c5588ad6da7225848a16855418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Fri, 27 Aug 2010 03:22:49 +0200 Subject: [PATCH 2906/2970] Provide gui dialog for adding addons to user directories --- extensions/addons.c | 92 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 5 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 50da1ab4..50a0cdf4 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -99,6 +99,7 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, gchar* addons_type; gchar* path; GtkWidget* dialog; + GtkFileFilter* filter; if (addons->kind == ADDONS_USER_SCRIPTS) { @@ -115,14 +116,95 @@ midori_addons_button_add_clicked_cb (GtkToolItem* toolitem, else g_assert_not_reached (); - dialog = gtk_message_dialog_new ( + dialog = gtk_file_chooser_dialog_new (_("Choose file"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, - _("Copy %s to the folder %s."), addons_type, path); + GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + + gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); + + filter = gtk_file_filter_new (); + + if (addons->kind == ADDONS_USER_SCRIPTS) + { + gtk_file_filter_set_name (filter, _("Userscripts")); + gtk_file_filter_add_pattern (filter, "*.js"); + } + else if (addons->kind == ADDONS_USER_STYLES) + { + gtk_file_filter_set_name (filter, _("Userstyles")); + gtk_file_filter_add_pattern (filter, "*.css"); + } + else + g_assert_not_reached (); + + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + GSList* files; + + if (!g_file_test (path, G_FILE_TEST_EXISTS)) + katze_mkdir_with_parents (path, 0700); + + #if !GTK_CHECK_VERSION (2, 14, 0) + files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dialog)); + #else + files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (dialog)); + #endif + + while (files) + { + GFile* src_file; + GError* error = NULL; + + #if !GTK_CHECK_VERSION (2, 14, 0) + src_file = g_file_new_for_path (files); + #else + src_file = files->data; + #endif + + if (G_IS_FILE (src_file)) + { + GFile* dest_file; + gchar* dest_file_path; + + dest_file_path = g_build_path (G_DIR_SEPARATOR_S, path, + g_file_get_basename (src_file), NULL); + + dest_file = g_file_new_for_path (dest_file_path); + + g_file_copy (src_file, dest_file, + G_FILE_COPY_OVERWRITE | G_FILE_COPY_BACKUP, + NULL, NULL, NULL, &error); + + if (error) + { + GtkWidget* msg_box; + msg_box = gtk_message_dialog_new ( + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "%s", error->message); + + gtk_window_set_title (GTK_WINDOW (msg_box), _("Error")); + gtk_dialog_run (GTK_DIALOG (msg_box)); + gtk_widget_destroy (msg_box); + g_error_free (error); + } + + g_object_unref (src_file); + g_object_unref (dest_file); + g_free (dest_file_path); + } + files = g_slist_next (files); + } + g_slist_free (files); + } + g_free (addons_type); g_free (path); - gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } From f57458a63fd7d7578b5944f749d2f5b45da6ce75 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Sat, 28 Aug 2010 12:29:28 +0200 Subject: [PATCH 2907/2970] l10n: Updated Danish (da) translation to 99% New status: 638 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 363 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 187 insertions(+), 176 deletions(-) diff --git a/po/da.po b/po/da.po index f3719b9e..cd7d7537 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-25 16:08+0000\n" +"POT-Creation-Date: 2010-08-28 10:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -23,7 +23,7 @@ msgstr "Letvægtig webbrowser" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 #: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -383,7 +383,7 @@ msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" #: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4012 ../panels/midori-bookmarks.c:729 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 #: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" @@ -421,7 +421,7 @@ msgid "_Application:" msgstr "_Program:" #: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 #: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Tilpasset..." @@ -924,7 +924,7 @@ msgstr "Vis statusbjælke" msgid "_Automatic" msgstr "_Automatisk" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Kinesisk (BIG5)" @@ -933,19 +933,19 @@ msgstr "Kinesisk (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Japansk (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Koreansk (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Russisk (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Vestlig (ISO-8859-1)" @@ -1056,562 +1056,562 @@ msgstr "Vis hjemmeside" msgid "Show last open tabs" msgstr "Vis sidste åbne faneblade" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Vis sidste faneblad uden at indlæse" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japansk (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Små ikoner" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Ikoner og tekst" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Tekst ved siden af ikoner" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automatisk (GNOME eller miljø)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Ingen proxyserver" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:672 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Vis overførselsstatus" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Om overførselsstatus skal vises" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Værktøjsbjælkestil:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Vis fremgang i placeringindgang" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Om visning af indlæsningsfremgang i placeringsindgang" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Vis søgemaskiner i adresseudfyldelse" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Om søgemaskiner skal vises i adresseudfyldelsen" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Vis handlingskontroller til panelet" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Om handlingskontroller til panelet skal vises" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Opstil sidepanel til højre" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Om sidepanelet skal være opstilles til højre" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Åbn paneler i separate vinduer" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Om paneler altid skal åbnes i separate vinduer" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Når Midori starter:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Hvad der skal ske når Midori startes" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Vis nedbrudsdialog" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Vis en dialog efter nedbrud af Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Vis hurtigopkald i nye faneblade" -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Vis hurtigopkald i nyligt åbnede faneblade" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Gem hentede filer til:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Spørg om målmappen" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Om der skal spørges om målmappen ved hentning af fil" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Påmindelse når en overførsel er gennemført" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Om der skal vises en påmindelse, når en overførsel er gennemført" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Nyhedssamler" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "En ekstern nyhedssamler" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Åbn nye sider i:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Åbn eksterne sider i:" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Indlæs og vis billeder automatisk" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Slå Netscape-udvidelsesmoduler til" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Slå indlejrede Netscape-udvidelsesobjekter til" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Slå HTML5 databaseunderstøttelse til" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Om understøttelse af database til HTML5 skal slås til" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Slå understøttelse af lokal lagring af HTML5 til" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Om understøttelse af lokal lagring af HTML5 skal slås til" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Slå ikke forbundet webprograms mellemlager til" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Om ikke forbundet webprograms mellemlager skal slås til" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Zoom tekst og billeder" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Om zoom af tekst og billeder" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Find indlejret mens du taster" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Om indlejret skal findes automatisk, mens du taster" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Bevægelsesrulning" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Om rulning skal ske med bevægelseshastighed eller ej" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Proxyserver" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Proxyservertypen som skal bruges" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "HTTP-proxyserver" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Proxyserveren som bruges til HTTP-forbindelser" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Foretrukne sprog" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "En kommaadskilt liste af foretrukne sprog for rendering af flersprogssider, eksempelvis \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Ryd private data" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "De private data valgt til sletning" @@ -1619,8 +1619,8 @@ msgstr "De private data valgt til sletning" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4440 -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Fejl - %s" @@ -1809,47 +1809,47 @@ msgstr "Dokument kan ikke vises" msgid "No documentation installed" msgstr "Ingen dokumentation installeret" -#: ../midori/midori-view.c:3617 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Forsinket sideindlæsning" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Indlæsning forsinket pga. et nyligt sammenbrud eller startopindstillinger." -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Indlæs side" -#: ../midori/midori-view.c:3762 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-view.c:4016 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Dublér faneblad" -#: ../midori/midori-view.c:4021 +#: ../midori/midori-view.c:4023 msgid "Show Tab _Label" msgstr "Vis faneblad_titel" -#: ../midori/midori-view.c:4021 +#: ../midori/midori-view.c:4023 msgid "Show Tab _Icon Only" msgstr "Vis kun faneblad_ikon" -#: ../midori/midori-view.c:4027 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Luk a_ndre faneblade" -#: ../midori/midori-view.c:4678 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-view.c:4679 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Om baggrundsbilleder skal udskrives" -#: ../midori/midori-view.c:4731 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funktionalitet" @@ -2260,6 +2260,7 @@ msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" #: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Vælg fil" @@ -2309,34 +2310,45 @@ msgstr "Blokering af reklamer" msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Kopiér %s til mappen %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:325 msgid "Userscripts" msgstr "Brugerskripter" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:327 msgid "Userstyles" msgstr "Brugerstile" -#: ../extensions/addons.c:1082 +#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Fejl" + +#: ../extensions/addons.c:231 +#, c-format +msgid "" +"Do you really want to remove '%s'?\n" +"\n" +"The file '%s' will be permanently lost.\n" +msgstr "" +"Er du sikker på, at du vil fjerne '%s'?\n" +"\n" +"filen '%s', da denne vil være tabt for bestandigt.\n" + +#: ../extensions/addons.c:1231 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" -#: ../extensions/addons.c:1083 ../extensions/addons.c:1248 +#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 msgid "User addons" msgstr "Brug udvidelsesm,oduler" -#: ../extensions/addons.c:1205 +#: ../extensions/addons.c:1354 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan ikke overvåge mappe '%s': %s" -#: ../extensions/addons.c:1249 +#: ../extensions/addons.c:1398 msgid "Support for userscripts and userstyles" msgstr "Understøttelse af brugerskripter og brugerstile" @@ -2529,10 +2541,6 @@ msgstr "Kunne ikke finde anmodede RSS \"punkt\"elementer i XML-data." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Kunne ikke finde anmodede RSS \"kanal\"-elemterne i XML-data." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Fejl" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2719,6 +2727,9 @@ msgstr "Redigér nemt layout af værktøjsbjælken" msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation på disk" +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Kopiér %s til mappen %s." + #~ msgid "_Restore Tab" #~ msgstr "_Gendan faneblad" From bc2293df74d45222cbc073837808f6189225115d Mon Sep 17 00:00:00 2001 From: Andres Kovtunos Date: Sat, 28 Aug 2010 22:37:27 +0200 Subject: [PATCH 2908/2970] l10n: Updated Russian (ru) translation to 96% New status: 618 messages complete with 18 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 1182 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 614 insertions(+), 568 deletions(-) diff --git a/po/ru.po b/po/ru.po index 417adf18..53e89af2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 16:08+0000\n" +"POT-Creation-Date: 2010-08-28 16:08+0000\n" "PO-Revision-Date: 2010-06-26 00:55+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -32,198 +32,204 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Не удалось удалить запись из журнала: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:914 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1629 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1804 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1968 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Игнорировать" @@ -244,104 +250,104 @@ msgstr "Неизвестный формат закладок." msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Не удалось обновить заголовок: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:769 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 -#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:879 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "По_казывать на панели закладок" -#: ../midori/midori-browser.c:907 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Запускать как _веб-приложение" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Не хватает свободного места для загрузки \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2155 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -349,1269 +355,1271 @@ msgstr "" "Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" "В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." -#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 -#: ../panels/midori-bookmarks.c:401 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4055 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 -#, c-format -msgid "Failed to remove history item: %s\n" +#: ../midori/midori-browser.c:4155 +#, fuzzy, c-format +msgid "Failed to clear history: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" +#: ../midori/midori-browser.c:4163 +#, fuzzy, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Не удалось добавить запись в журнал: %s\n" + #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4415 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:4425 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:4544 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4546 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4989 +#, fuzzy +msgid "Minimize _Current Tab" +msgstr "Сворачивать новые вкладки" + +#: ../midori/midori-browser.c:4990 +#, fuzzy +msgid "Minimize the current tab" +msgstr "Закрыть данную вкладку" + +#: ../midori/midori-browser.c:4992 +#, fuzzy +msgid "_Duplicate Current Tab" +msgstr "Дублировать вкладку" + +#: ../midori/midori-browser.c:4993 +#, fuzzy +msgid "Duplicate the current tab" +msgstr "Закрыть текущую вкладку" + +#: ../midori/midori-browser.c:4995 +#, fuzzy +msgid "Close Ot_her Tabs" +msgstr "З_акрыть остальные" + +#: ../midori/midori-browser.c:4996 +#, fuzzy +msgid "Close all tabs except the current tab" +msgstr "Закрыть все вкладки кроме текущей" + +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5092 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5105 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5120 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:5733 -msgid "_Recently visited pages" -msgstr "_Недавно посещённые страницы" - -#: ../midori/midori-browser.c:5735 -msgid "Reopen pages that you visited earlier" -msgstr "Открывать страницы, посещённые ранее" - -#: ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:5763 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6358 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Не удалось найти в истории\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Поиск %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Не удалось выполнить запрос к базе данных\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Скрыть элементы управления" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Открыть пустую страницу" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Открыть домашнюю страницу" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Открыть последние открытые страницы" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Открыть последние страницы без загрузки" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Маленькие значки" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Текст под значками" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Текст рядом со значками" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Автоматически (GNOME или переменные окружения)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Не использовать прокси" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Запоминать размер окна" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Запоминать размер окна при закрытии" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Ширина окна" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Последняя сохранённая ширина окна" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Высота окна" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Последняя сохранённая высота окна" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Позиция панели" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Последний поисковый запрос" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Последний сохранённый поисковый запрос" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Показывать строку состояния" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Стиль панели инструментов:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Показать элементы управления панелью" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Показывать элементы управления панелью" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Открывать панели в отдельных окнах" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Панели при открытии будут отделены от главного окна" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "При запуске:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Действия, выполняемые при запуске Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Домашняя страница:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Показывать окно действий после сбоя" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Показывать панель быстрого набора в новых вкладках" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Показывать панель быстрого набора в только что открытых вкладках" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Сохранять загружаемые файлы в:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Запрашивать папку для загрузок" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Запрашивать конечную папку для каждого файла" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Уведомлять по завершении передачи" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Показывать уведомление по окончании передачи файлов" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Программа чтения новостей" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Открывать новые страницы в:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Открывать внешние страницы в:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Использовать модули Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Включить поддержку баз данных HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Включить поддержку баз данных стандарта HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Включить поддержку локального хранилища (localStorage) стандарта HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Включить кэш веб-приложений" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Кэшировать данные веб-приложений для автономной работы" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Масштабировать изображения" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Изменять масштаб изображений при масштабировании страницы" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Инерционная прокрутка" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Должна ли прокрутка продолжаться по инерции с учётом скорости" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Только оригинальные фрагменты данных" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Принимать фрагменты данных только с оригинального сайта" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Срок хранения фрагментов данных" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Запоминать посещённые страницы" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Сохранять историю последних посещений" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Хранить историю за последние" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Срок хранения записей в журнале" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Тип прокси-сервера" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Прокси-сервер HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Автоматически обнаруживать прокси-сервер" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Брать данные о прокси-сервере из переменных окружения" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Предпочитаемые языки" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Список предпочитаемых языков для отображения многоязычных страниц, например, «de», «ru,en» или «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Удалить личные данные" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Выбранные для удаления личные данные" @@ -1619,237 +1627,238 @@ msgstr "Выбранные для удаления личные данные" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Ошибка — %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Не удалось открыть страницу «%s»." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Попытаться снова" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Найти _с помощью" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Открыть или сохранить файл" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Файл %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Быстрый набор" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Нажмите, чтобы добавить закладку" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Введите адрес страницы" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Введите название закладки" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Удалить визуальную закладку?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Установить количество закладок" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Введите число столбцов и строк:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Проверьте правильность ввода" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Размер миниатюр:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Средний" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Большой" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Загрузка страницы отложена" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Загрузка страницы была отложена из-за сбоя или как следствие соответствующей настройки." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Загрузить страницу" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "Сделать _копию" -#: ../midori/midori-view.c:4124 -msgid "_Restore Tab" -msgstr "Во_сстановить вкладку" +#: ../midori/midori-view.c:4023 +#, fuzzy +msgid "Show Tab _Label" +msgstr "Показать панель" -#: ../midori/midori-view.c:4124 -msgid "_Minimize Tab" -msgstr "_Свернуть вкладку" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Возможности" @@ -2029,51 +2038,51 @@ msgstr "Управление средствами поиска" msgid "Use as _default" msgstr "Использовать _по умолчанию" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Домашняя страница" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "_Модули Netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Новая папка" @@ -2102,7 +2111,7 @@ msgstr "Подсветить совпадения" msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s из %s" @@ -2116,7 +2125,7 @@ msgstr "Файл «%s» загружен." msgid "Transfer completed" msgstr "Загрузка завершена" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Убрать завершённые" @@ -2132,28 +2141,28 @@ msgstr "В_ыйти из Midori" msgid "The transfers will be cancelled if Midori quits." msgstr "Загрузки будут отменены при закрытии Midori." -#: ../panels/midori-bookmarks.c:110 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:216 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:409 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:417 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:431 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Разделитель" @@ -2173,19 +2182,11 @@ msgstr "Копировать все" msgid "Extensions" msgstr "Дополнения" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Некорректное время" - -#: ../panels/midori-history.c:275 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Дата находится в прошлом. Проверьте системное время." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2193,46 +2194,35 @@ msgstr[0] "%d день назад" msgstr[1] "%d дня назад" msgstr[2] "%d дней назад" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Вчера" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не удалось выполнить запрос к базе данных: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:445 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:462 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Фильтр:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Открыть _папку загрузок" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Копировать _адрес ссылки" @@ -2274,16 +2264,17 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Выберите папку" @@ -2329,34 +2320,42 @@ msgstr "Блокировка рекламы" msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Скопировать %s в папку %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:325 msgid "Userscripts" msgstr "Сценарии" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:327 msgid "Userstyles" msgstr "Стили пользователя" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Ошибка" + +#: ../extensions/addons.c:231 +#, c-format +msgid "" +"Do you really want to remove '%s'?\n" +"\n" +"The file '%s' will be permanently lost.\n" +msgstr "" + +#: ../extensions/addons.c:1231 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 msgid "User addons" msgstr "Пользовательские дополнения" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1354 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Отслеживание изменений в «%s» отключено: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1398 msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" @@ -2451,6 +2450,10 @@ msgstr "_Развернуть всё" msgid "_Collapse All" msgstr "_Свернуть всё" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Фильтр:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" @@ -2483,7 +2486,7 @@ msgstr "Внешние приложения" #: ../extensions/external-applications.vala:94 #, fuzzy msgid "Associate URL schemes with external commands" -msgstr "Ассоциировать схемы ссылок с внешними командами" +msgstr "Ассоциировать ссылки с внешними командами" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2516,17 +2519,17 @@ msgstr "Удалить ленту" msgid "_Feeds" msgstr "Л_енты" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не удалось найти корневой элемент в данных XML." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Формат ленты не поддерживается." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не удалось обработать XML-ленту: %s" @@ -2547,10 +2550,6 @@ msgstr "Не удалось найти обязательные элементы msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Ошибка" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2561,33 +2560,38 @@ msgstr "Лента «%s» уже была добавлена" msgid "Error loading feed '%s'" msgstr "Не удалось загрузить ленту «%s»" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Панель лент новостей" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Не удалось добавить значение: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не удалось выполнить запрос к базе данных: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Файлы ресурсов не установлены" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "История форм ввода" @@ -2599,7 +2603,7 @@ msgstr "Следующая вкладка (Список истории)" #: ../extensions/history-list.vala:175 #, fuzzy msgid "Next tab from history" -msgstr "Следующая вкладка из истории\n" +msgstr "Следующая вкладка из истории" #: ../extensions/history-list.vala:184 #, fuzzy @@ -2660,7 +2664,7 @@ msgstr "Просмотр и изменение «горячих клавиш»" #: ../extensions/status-clock.c:176 #, fuzzy msgid "Statusbar Clock" -msgstr "Панель состояния" +msgstr "Часы в строке статуса" #: ../extensions/status-clock.c:177 #, fuzzy @@ -2687,25 +2691,25 @@ msgstr "Настройка возможностей" msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "П_анель вкладок" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Сворачивать новые вкладки" +msgid "Only Icons on Tabs by default" +msgstr "" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Новые закладки открываются свёрнутыми" +msgid "New tabs have no label by default" +msgstr "" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2739,6 +2743,48 @@ msgstr "Простой редактор панели инструментов" msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" +#~ msgid "_Recently visited pages" +#~ msgstr "_Недавно посещённые страницы" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Открывать страницы, посещённые ранее" + +#~ msgid "Original cookies only" +#~ msgstr "Только оригинальные фрагменты данных" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Принимать фрагменты данных только с оригинального сайта" + +#~ msgid "Remember last visited pages" +#~ msgstr "Запоминать посещённые страницы" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Сохранять историю последних посещений" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Автоматически обнаруживать прокси-сервер" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Брать данные о прокси-сервере из переменных окружения" + +#~ msgid "_Restore Tab" +#~ msgstr "Во_сстановить вкладку" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Свернуть вкладку" + +#~ msgid "Erroneous clock time" +#~ msgstr "Некорректное время" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Дата находится в прошлом. Проверьте системное время." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Скопировать %s в папку %s." + +#~ msgid "New tabs open minimized" +#~ msgstr "Новые закладки открываются свёрнутыми" + #~ msgid "Show the saved bookmarks" #~ msgstr "Показать все сохранённые закладки" From e6a739e63914beca1a5da56fcbb6549ba515d3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Sat, 28 Aug 2010 23:02:22 +0200 Subject: [PATCH 2909/2970] l10n: Updated Czech (cs) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 371 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 191 insertions(+), 180 deletions(-) diff --git a/po/cs.po b/po/cs.po index d73184f0..5ed2437a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 04:08+0000\n" +"POT-Creation-Date: 2010-08-28 16:08+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -24,7 +24,7 @@ msgstr "Odlehčený prohlížeč" #: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 #: ../midori/main.c:1665 ../midori/main.c:1681 -#: ../midori/midori-websettings.c:310 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -384,7 +384,7 @@ msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" #: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4012 ../panels/midori-bookmarks.c:729 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 #: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" @@ -422,8 +422,8 @@ msgid "_Application:" msgstr "_Aplikace:" #: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Vlastní..." @@ -921,7 +921,7 @@ msgstr "Zobrazit stavovou lištu" msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" @@ -930,19 +930,19 @@ msgstr "Čínské (BIG5)" msgid "Japanese (SHIFT__JIS)" msgstr "Japonské (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Korejské (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" @@ -1053,562 +1053,562 @@ msgstr "zobrazit domovskou stránku" msgid "Show last open tabs" msgstr "zobrazit naposledy otevřené karty" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "zobrazit naposledy otevřené karty bez načtení" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "nové kartě" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "novém okně" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "aktuální kartě" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "výchozí" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "ikony" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "malé ikony" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "text" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "ikony a text" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "text pod ikonami" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "automaticky (GNOME, nebo jiné prostředí)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "žádný" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "všechna cookies" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "cookies sezení" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "žádná" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Ukládat rozměry okna?" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Šířka okna" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Výška okna" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Uložená poslední pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Poslední otevřená stránka" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Uložená stránka" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Rychlé hledání na webu" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Uložené poslední vyhledávání na webu" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Zobrazit nabídku" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Zobrazit nabídku?" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Zobrazit vyhledávání" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Zobrazit lištu vyhledávání?" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Zobrazit lištu se záložkami?" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Zobrazit panel?" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Zobrazit stav přenosu" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Zobrazit stav přenosu?" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Zobrazit stavový řádek?" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Styl lišty:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Nastaví styl lišty (zobrazení textu a ikon)." -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Zobrazit průběh v řádku adresy" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Zobrazovat průběh načítání v řádku s adresou?" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Zobrazovat výsledky hledání při zadávání adresy" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Položky nástrojové lišty" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Položky, které se budou zobrazovat na nástrojové liště" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Kompaktní boční panel" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Má se zobrazit boční panel kompaktně?" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Zobrazí seznam nástrojů" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Zda zobrazovat seznam nástrojů" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Přesunout boční panel na opačnou stranu" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Otvírat panely v samostatných oknech" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Zda vždy otevřít panel v samostatné okno" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Když Midori nastartuje:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Co udělat, když je Midori spuštěno" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Domovská stránka:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Zobrazit obsah rychlého přístupu v kartách" -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Zobrazí obsah rychlého přístupu v nově otevřených kartách" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Ukládat stažené soubory do:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Kam se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Zeptat se na cílovou složku" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Zda se ptát, kam se bude ukládat" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Upozornit na dokončení přenosu" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Zda zobrazit upozornění při dokončení přenosu" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Správce stahování" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Externí program pro stahování" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Preferované kódování" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Preferované kódování stránek" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Vždy zobrazovat karty" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Zobrazit karty, i když je jen jedna?" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Nové stránky otevírat v:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Externí stránky otevírat v:" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Kde se budou otevírat externí stránky" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Karty se otevírají na pozadí" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta se otevře vedle aktivní" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovací okno se otevře v nové kartě" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Automaticky načítat obrázky" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Automaticky načítat a zobrazovat obrázky" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Povolit skripty" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Povolit vložené skriptové jazyky" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Povolit pluginy z Netscape (Mozilly)" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Povolit HTML5 databázi" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Zda povolit HTML5 databázi" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Povolit místní úložiště pro HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Zda povolit místní úložiště dat pro HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Povolit cache pro offline aplikace" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Zda povolit používání cache pro offline aplikace" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Při přibližování zvětšovat text i obrázky?" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Při psaní hledat text?" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Kinetické rolování" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Zda naklápěním zařízení rolovat" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Přijímat cookies:" -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Který typ cookies přijímat" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Maximální stáří cookies" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Maximální délka historie" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Pamatovat si naposledy stahované soubory" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Pamatovat si seznam souborů, které byly stahovány?" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Jaký typ proxy serveru chcete použít" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "HTTP proxy server" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Proxy server, který bude použit pro HTTP spojení" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Jak se hlásit webovým stránkám" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Preferované jazyky" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Čárkou oddělený seznam jazyků pro vícejazyčné weby, např. \"cs\", \"cs,en\", nebo \"cs-cs;q=1.0, en-en;q=0.667\"" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Osobní data byla označena ke smazání" @@ -1616,8 +1616,8 @@ msgstr "Osobní data byla označena ke smazání" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4440 -#: ../midori/midori-view.c:4444 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Chyba - %s" @@ -1806,47 +1806,47 @@ msgstr "Dokument nemůže být zobrazen" msgid "No documentation installed" msgstr "Dokumentace není nainstalována" -#: ../midori/midori-view.c:3617 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Načítání stránky pozdrženo" -#: ../midori/midori-view.c:3618 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Načtení stránky bylo pozdrženo kvůli pádu aplikace, nebo protože je to tak nastaveno." -#: ../midori/midori-view.c:3619 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Načíst stránku" -#: ../midori/midori-view.c:3762 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-view.c:4016 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "Z_dvojit kartu" -#: ../midori/midori-view.c:4021 +#: ../midori/midori-view.c:4023 msgid "Show Tab _Label" msgstr "Zobrazit _popisek karty" -#: ../midori/midori-view.c:4021 +#: ../midori/midori-view.c:4023 msgid "Show Tab _Icon Only" msgstr "Zobrazit jen _ikonu karty" -#: ../midori/midori-view.c:4027 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "_Zavřít ostatní karty" -#: ../midori/midori-view.c:4678 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-view.c:4679 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-view.c:4731 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Rozšíření" @@ -2250,16 +2250,17 @@ msgstr "Uložená ikona '%s' nemůže být načtena" msgid "Animation frames are broken" msgstr "Snímky animace jsou porušené" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Vybrat soubor" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Vybrat adresář" @@ -2305,34 +2306,45 @@ msgstr "Blokování reklamy" msgid "Block advertisements according to a filter list" msgstr "Blokuje reklamu podle filtrů" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Kopíruje se %s do složky %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:325 msgid "Userscripts" msgstr "Uživatelské skripty" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:327 msgid "Userstyles" msgstr "Uživatelské styly" -#: ../extensions/addons.c:1082 +#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Chyba" + +#: ../extensions/addons.c:231 +#, c-format +msgid "" +"Do you really want to remove '%s'?\n" +"\n" +"The file '%s' will be permanently lost.\n" +msgstr "" +"Opravdu se má odstranit %s?\r\n" +"\r\n" +"Soubor '%s' bude odstraněn.\r\n" + +#: ../extensions/addons.c:1231 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n" -#: ../extensions/addons.c:1083 ../extensions/addons.c:1248 +#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 msgid "User addons" msgstr "Uživatelova rozšíření" -#: ../extensions/addons.c:1205 +#: ../extensions/addons.c:1354 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nemohu sledovat složku '%s': %s" -#: ../extensions/addons.c:1249 +#: ../extensions/addons.c:1398 msgid "Support for userscripts and userstyles" msgstr "Podpora pro userscripts a userstyles." @@ -2525,10 +2537,6 @@ msgstr "Nepodařilo se najít požadovaný element \"item\" v XML datech." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Nepodařilo se najít požadovaný element \"channel\" v XML datech." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Chyba" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2715,6 +2723,9 @@ msgstr "Umožňuje jednoduše změnit lištu" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Kopíruje se %s do složky %s." + #~ msgid "_Restore Tab" #~ msgstr "_Ukázat titulek" From ff5f875f0e538b9e236c85bb37b52e7662e6840c Mon Sep 17 00:00:00 2001 From: Johannes Lips Date: Sun, 29 Aug 2010 07:54:55 +0200 Subject: [PATCH 2910/2970] l10n: Updated German (de) translation to 98% New status: 628 messages complete with 8 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/de.po | 1296 +++++++++++++++++++++++++++--------------------------- 1 file changed, 643 insertions(+), 653 deletions(-) diff --git a/po/de.po b/po/de.po index 3bfdd606..cf54bd11 100644 --- a/po/de.po +++ b/po/de.po @@ -3,28 +3,28 @@ # This file is distributed under the same license as the midori package. # Enrico Tröger 2008 # Christian Dywan 2008-2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:21+0200\n" +"POT-Creation-Date: 2010-08-29 04:08+0000\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -32,205 +32,204 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht gespeichert werden. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht gespeichert werden. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht gespeichert werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht gespeichert werden. %s" -#: ../midori/main.c:824 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht " -"überprüft werden." +#: ../midori/main.c:852 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht überprüft werden." -#: ../midori/main.c:914 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " -"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." +#: ../midori/main.c:942 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Schnappschuss gespeichert: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Diagnosedialog anzeigen" -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Schnappschuss der angegebenen URI aufnehmen" -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Den angegebenen Befehl ausführen" -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "URIs anhand des regulären Ausdrucks MUSTER blockieren" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "MUSTER" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Midori nach SEKUNDEN Sekunden Untätigkeit zurücksetzen" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SEKUNDEN" -#: ../midori/main.c:1629 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1804 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1968 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorieren" @@ -251,1388 +250,1371 @@ msgstr "Unbekanntes Lesezeichenformat." msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4961 -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:460 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:498 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Titel konnte nicht aktualisiert werden: %s\n" -#: ../midori/midori-browser.c:512 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:736 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:738 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:769 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:801 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:835 ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:845 ../midori/midori-browser.c:938 -#: ../midori/midori-browser.c:4133 ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:879 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:892 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "In der Werkzeug_leiste anzeigen" -#: ../midori/midori-browser.c:907 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Als _Internetanwendung starten" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Der freie Speichersplatz reicht nicht aus, um «%s» herunterzuladen." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Die Datei benötigt %s, aber nur %s sind übrig." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4170 -#: ../midori/midori-browser.c:4204 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1438 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Datei speichern" -#: ../midori/midori-browser.c:2155 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2233 +#: ../midori/midori-browser.c:2228 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or " -"button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News " -"Aggregator. Next time you click the news feed icon, it will be added " -"automatically." +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." msgstr "" -#: ../midori/midori-browser.c:2239 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Neue Nachrichtenquelle" -#: ../midori/midori-browser.c:2282 ../midori/midori-browser.c:5026 -#: ../panels/midori-bookmarks.c:401 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3369 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." -#: ../midori/midori-browser.c:3635 ../midori/midori-browser.c:5406 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" -#: ../midori/midori-browser.c:3963 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:751 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:3970 ../panels/midori-bookmarks.c:732 -#: ../panels/midori-history.c:757 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:3973 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:734 -#: ../panels/midori-history.c:759 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4052 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4054 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4055 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4079 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Lesezeichen importieren..." -#: ../midori/midori-browser.c:4082 ../midori/midori-browser.c:5031 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "Lesezeichen _importieren" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Anwendung:" -#: ../midori/midori-browser.c:4120 ../midori/midori-browser.c:5135 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Fehler beim Importieren der Lesezeichen" -#: ../midori/midori-browser.c:4219 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" -#: ../midori/midori-browser.c:4273 ../panels/midori-bookmarks.c:248 -#: ../panels/midori-history.c:142 ../panels/midori-history.c:172 -#, c-format -msgid "Failed to remove history item: %s\n" +#: ../midori/midori-browser.c:4155 +#, fuzzy, c-format +msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" +#: ../midori/midori-browser.c:4163 +#, fuzzy, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" + #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4380 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:4384 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:4398 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:4409 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:4415 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:4420 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "»Flash« Cookies" -#: ../midori/midori-browser.c:4425 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:4430 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Ges_chlossene Reiter" -#: ../midori/midori-browser.c:4435 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Zwischenspeicher" -#: ../midori/midori-browser.c:4443 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Private Daten beim _Beenden von Midori löschen" -#: ../midori/midori-browser.c:4544 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:4546 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der " -"GNU Lesser General Public License, wie von der Free Software Foundation " -"veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " -"2.1 der Lizenz oder (wahlweise) jeder späteren Version." +#: ../midori/midori-browser.c:4474 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version 2.1 der Lizenz oder (wahlweise) jeder späteren Version." -#: ../midori/midori-browser.c:4565 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:4876 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:4880 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Zu Schnell_wahl hinzufügen" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Eine Verknüpfung zur Schnellwahl hinzufügen" -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Verknüpfung auf dem _Schreibtisch" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Eine Verknüpfung auf dem Schreibtisch hinzufügen" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Nachrichten_quelle abonnieren" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Diese Nachrichtenquelle abonnieren" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Letzte Änderung rückgängig machen" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Die letzte Ä_nderung rückgängig machen" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:4930 ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:4951 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:4955 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:4958 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:4979 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Nach _links rollen" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Nach links rollen" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "_Herunter rollen" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Herunter rollen" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "H_och rollen" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Hoch rollen" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Nach _rechts rollen" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Nach rechts rollen" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Gehe zur voherigen Unterseite zurück" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Gehe weiter zur nächsten Unterseite" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Reiter _zurückholen" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Einen neuen _Ordner hinzufügen" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "Lesezeichen _exportieren" -#: ../midori/midori-browser.c:5037 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:5046 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "Seite _untersuchen" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Einzelheiten der Seite untersuchen und Entwicklerwerkzeuge benutzen..." -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:5058 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "_Aktuellen Reiter fokusieren" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Den aktuellen Reiter fokussieren" -#: ../midori/midori-browser.c:5061 +#: ../midori/midori-browser.c:4989 +#, fuzzy +msgid "Minimize _Current Tab" +msgstr "Neue Reiter minimieren" + +#: ../midori/midori-browser.c:4990 +msgid "Minimize the current tab" +msgstr "Den aktuellen Reiter minimieren" + +#: ../midori/midori-browser.c:4992 +#, fuzzy +msgid "_Duplicate Current Tab" +msgstr "Reiter _verdoppeln" + +#: ../midori/midori-browser.c:4993 +msgid "Duplicate the current tab" +msgstr "Den aktuellen Reiter verdoppeln" + +#: ../midori/midori-browser.c:4995 +#, fuzzy +msgid "Close Ot_her Tabs" +msgstr "Ande_re Reiter schließen" + +#: ../midori/midori-browser.c:4996 +#, fuzzy +msgid "Close all tabs except the current tab" +msgstr "Alle Reiter, bis auf den aktuellen Reiter schließen" + +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Die letzte _Sitzung öffnen" -#: ../midori/midori-browser.c:5062 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "In der letzten Sitzung geöffnete Reiter öffnen" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:5066 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:5069 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:5070 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:5073 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:5084 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:5085 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:5088 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:5089 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:5092 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:5093 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:5096 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:5097 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:5100 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:5101 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:5104 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:5105 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:5113 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:5116 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5120 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japanisch (SHIFT__JIS)" -#: ../midori/midori-browser.c:5123 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Koreanisch (EUC-KR)" -#: ../midori/midori-browser.c:5126 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:5129 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5132 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:5697 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:5733 -msgid "_Recently visited pages" -msgstr "_Zuletzt besuchte Seiten" - -#: ../midori/midori-browser.c:5735 -msgid "Reopen pages that you visited earlier" -msgstr "Bereits besuchte Seiten erneut öffnen" - -#: ../midori/midori-browser.c:5750 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:5763 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:5765 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" -#: ../midori/midori-browser.c:5779 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menü" -#: ../midori/midori-browser.c:5781 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Menü" -#: ../midori/midori-browser.c:6358 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Auswahl aus Verlauf schlug fehl\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Nach %s suchen" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Suchen mit %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Einfügen und _fortfahren" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Gewählte Leiste vom Fenster ablösen" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Seitenleiste links anordnen" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Bedienelemente anzeigen" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Leere Seite anzeigen" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Startseite anzeigen" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Zuletzt geöffnete Reiter anzeigen" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Letzte Reiter zeigen ohne sie zu laden" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Kleine Symbole" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Symbole und Text" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Text neben Symbolen" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automatisch (GNOME oder Umgebung)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Kein Zwischenrechner" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Werkzeugleistenstil:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Bedienelemente der Leiste anzeigen" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Die Bedienelemente der Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Leisten in eigenen Fenstern öffnen" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Ob Seitenleisten immer in eigenen Fenstern geöffnet werden sollen" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Beim Starten von Midori:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Was beim Starten von Midori passieren soll" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Startseite:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Schnellwahl in neuen Reitern anzeigen" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Schnellwahl in neu geöffneten Reitern anzeigen" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Heruntergeladene Dateien speichern:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Benachrichtigen bei Abschluss der Übertragung" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" -msgstr "" -"Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" +msgstr "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Öffne neue Seiten in:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Öffne Seiten von außerhalb in:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape-Module einschalten" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Eingebettete Netscape-Module einschalten" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "HTML5-Datenbanken einschalten" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Unterstützung für HTML5-Datenbank einschalten" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Unterstützung für HTML5-Lokalspeicher einschalten" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "HTML5-Anwendungsspeicher einschalten" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "HTML5-Zwischenspeicher für Internetanwendungen einschalten" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Sanfter Bildlauf" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Ob der Bildlauf sanft schneller und langsamer wird" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Nur ursprüngliche Profildateien" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Zuletzt besuchte Seiten merken" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Die zuletzt besuchten Seiten speichern" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gespeichert wird" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Die Art des zu verwendenden Zwischenrechners" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "HTTP-Zwischenrechner" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Proxyrechner automatisch erkennen" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Zwischenrechner automatisch über die Umgebung erkennen" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Bevorzugte Sprachen" -#: ../midori/midori-websettings.c:1125 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur " -"Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru," -"nl« oder »en-us;q=1.0, fr-fr;q=0.667«" +#: ../midori/midori-websettings.c:1074 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Private Daten löschen" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Zum Löschen ausgewählte private Daten" @@ -1640,237 +1622,238 @@ msgstr "Zum Löschen ausgewählte private Daten" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Fehler - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Die Seite »%s« konnte nicht geladen werden." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Erneut versuchen" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Nachricht an %s schicken" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Element _untersuchen" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Verweis in _Vordergrund-Reiter öffnen" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Verweis in _Hintergrund-Reiter öffnen" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Verweis als _Internetanwendung öffnen" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Verweisziel k_opieren" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "_Bild in neuem Reiter öffnen" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Bild_adresse kopieren" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Bi_ld speichern" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Bild herunterla_den" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Video_adresse kopieren" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "_Video speichern" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "_Video herunterladen" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: »%s«" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s (»%s«)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Schnellwahl" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Klicken um eine Verknüpfung hinzuzufügen" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Ziel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Titel der Verknüpfung eingeben" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Sind Sie sicher, dass Sie diese Verknüpfung löschen wollen?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Anzahl Spalten und Zeilen ändern" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Anzahl an Spalten und Zeilen eingeben:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Ungültige Eingabe für die Größe der Schnellwahl" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Vorschaubildgröße:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Klein" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Mittel" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Groß" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Laden der Seite verzögert" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Laden der Seite wegen eines Absturzes oder Einstellung verzögert" -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Seite laden" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" -#: ../midori/midori-view.c:4124 -msgid "_Restore Tab" -msgstr "Reiter _wiederherstellen" +#: ../midori/midori-view.c:4023 +#, fuzzy +msgid "Show Tab _Label" +msgstr "Leiste anzeigen" -#: ../midori/midori-view.c:4124 -msgid "_Minimize Tab" -msgstr "Reiter _minimieren" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Ande_re Reiter schließen" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Inhalte" @@ -1971,12 +1954,8 @@ msgstr "Rechtschreibwörterbücher" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:432 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Eine durch Kommas getrennte Liste von Sprachen, die für die " -"Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Eine durch Kommas getrennte Liste von Sprachen, die für die Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" #. Page "Interface" #: ../midori/midori-preferences.c:438 @@ -2054,51 +2033,51 @@ msgstr "Suchmaschinen verwalten" msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Netscape-Module" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Neuer _Ordner" @@ -2127,7 +2106,7 @@ msgstr "Treffer hervorheben" msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s von %s" @@ -2141,7 +2120,7 @@ msgstr "Die Datei »%s« wurde heruntergeladen." msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Alle entfernen" @@ -2157,28 +2136,28 @@ msgstr "Midori _beenden" msgid "The transfers will be cancelled if Midori quits." msgstr "Die Übertragungen werden abgebrochen wenn Midori beendet wird." -#: ../panels/midori-bookmarks.c:110 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:216 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Lesezeichen konnte nicht hinzugefügt werden: %s\n" -#: ../panels/midori-bookmarks.c:409 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:417 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:431 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Trennlinie" @@ -2198,68 +2177,46 @@ msgstr "Alle kopieren" msgid "Extensions" msgstr "Erweiterungen" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Fehlerhafte Uhrzeit" - -#: ../panels/midori-history.c:275 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "" -"Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das " -"eingestellte Datum und die Uhrzeit." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Vor %d Tag" msgstr[1] "Vor %d Tagen" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Gestern" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../panels/midori-history.c:445 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:462 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:953 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filter:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Zielordner ö_ffnen" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Verweisziel ko_pieren" @@ -2301,16 +2258,17 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -2325,13 +2283,8 @@ msgstr "Werbefilter einstellen" #: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld " -"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " -"Listen finden Sie auf %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere Listen finden Sie auf %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2361,35 +2314,45 @@ msgstr "Werbeblocker" msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "%2s in den Ordner %1s kopieren." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:325 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:327 msgid "Userstyles" msgstr "Benutzerstile" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Fehler" + +#: ../extensions/addons.c:231 +#, c-format, fuzzy +msgid "" +"Do you really want to remove '%s'?\n" +"\n" +"The file '%s' will be permanently lost.\n" +msgstr "" +"Möchten sie '%s' wirklich entfernen? \n" +"\n" +"Die Datei '%s' wird dauerhaft entfernt.\n" + +#: ../extensions/addons.c:1231 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" -"Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" +msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 msgid "User addons" msgstr "Benutzererweiterungen" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1354 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1398 msgid "Support for userscripts and userstyles" msgstr "Unterstützung für Benutzerskripte und -stile" @@ -2411,12 +2374,8 @@ msgid "Delete All" msgstr "Alle löschen" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " -"Einträge gelöscht, die auf den Filter passen" +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene Einträge gelöscht, die auf den Filter passen" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2436,8 +2395,7 @@ msgstr "Frage" #: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." -msgstr "" -"Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." +msgstr "Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." #: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" @@ -2489,13 +2447,13 @@ msgstr "Alle _ausklappen" msgid "_Collapse All" msgstr "Alle _einklappen" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filter:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " -"Domöne auf den eingegebenen Filter passt." +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder Domöne auf den eingegebenen Filter passt." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2527,13 +2485,11 @@ msgstr "URL-Schemata mit Anwendungen verknüpfen" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" -"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" -"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:398 @@ -2558,25 +2514,24 @@ msgstr "Nachrichtenquelle löschen" msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Das Basiselement wurde im XML der Nachrichtenquelle nicht gefunden." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Nicht unterstütztes Quellenformat." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML-Quelle konnte nicht ausgelesen werden: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" -"Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2588,12 +2543,7 @@ msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden. #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" -"Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Fehler" +msgstr "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2605,33 +2555,38 @@ msgstr "Nachrichtenquelle »%s« ist bereits vorhanden" msgid "Error loading feed '%s'" msgstr "Fehler beim Laden der Nachrichtenquelle »%s«" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Nachrichtenquellenleiste" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Atom-/ RSS-Quellen (Feeds) lesen" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Formularfeld konnte nicht hinzugefügt werden: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Speichert zuvor eingegebene Formulareingaben" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Nicht verfügbar: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Konfigurationsdateien nicht installiert" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Formularvervollständigung" @@ -2724,37 +2679,33 @@ msgstr "Funktionen in der Statusleiste" msgid "Easily toggle features on web pages on and off" msgstr "Funktionen auf Internetseiten leicht an- und abstellen" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Reiterleiste" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "_Reiterleiste" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Reiter in einer senkrechten Leiste anzeigen" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Neue Reiter minimieren" +msgid "Only Icons on Tabs by default" +msgstr "" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Neue Reiter werden minimiert geöffnet" +msgid "New tabs have no label by default" +msgstr "" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen " -"sich durch Ziehen und Ablegen ordnen." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen sich durch Ziehen und Ablegen ordnen." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2780,6 +2731,48 @@ msgstr "Werkzeugleisten leicht anpassen" msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" +#~ msgid "_Recently visited pages" +#~ msgstr "_Zuletzt besuchte Seiten" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Bereits besuchte Seiten erneut öffnen" + +#~ msgid "Original cookies only" +#~ msgstr "Nur ursprüngliche Profildateien" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" + +#~ msgid "Remember last visited pages" +#~ msgstr "Zuletzt besuchte Seiten merken" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Die zuletzt besuchten Seiten speichern" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Proxyrechner automatisch erkennen" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Zwischenrechner automatisch über die Umgebung erkennen" + +#~ msgid "_Restore Tab" +#~ msgstr "Reiter _wiederherstellen" + +#~ msgid "_Minimize Tab" +#~ msgstr "Reiter _minimieren" + +#~ msgid "Erroneous clock time" +#~ msgstr "Fehlerhafte Uhrzeit" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das eingestellte Datum und die Uhrzeit." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "%2s in den Ordner %1s kopieren." + +#~ msgid "New tabs open minimized" +#~ msgstr "Neue Reiter werden minimiert geöffnet" + #~ msgid "Show the saved bookmarks" #~ msgstr "Die gespeicherten Lesezeichen anzeigen" @@ -2795,11 +2788,8 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Bild in neuem Fe_nster öffnen" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den " -#~ "Ordner »%s«." +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den Ordner »%s«." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n" From b9b11286dfe512a71a1c891a86b67a4cf3e835af Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Sun, 29 Aug 2010 13:46:23 +0200 Subject: [PATCH 2911/2970] l10n: Updated Japanese (ja) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ja.po | 1089 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 556 insertions(+), 533 deletions(-) diff --git a/po/ja.po b/po/ja.po index cf64ea9e..83cd0a0d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-10 18:29+0900\n" -"PO-Revision-Date: 2010-07-10 18:26+0900\n" +"POT-Creation-Date: 2010-08-29 20:44+0900\n" +"PO-Revision-Date: 2010-08-29 20:43+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:310 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -31,64 +31,70 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "履歴アイテムの削除に失敗しました: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:824 +#: ../midori/main.c:852 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "ルート証明書が利用できません。SSL 認証書を照合できませんでした。" -#: ../midori/main.c:914 +#: ../midori/main.c:942 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -97,145 +103,145 @@ msgstr "" "ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" "い。" -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "スナップショットを取得しました: %s\n" # CLI --help -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "ADDRESS をウェブアプリケーションとして実行する" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ADDRESS" # CLI --help -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "診断ダイアログを表示する" # CLI --help -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "指定された URI のスナップショットを取得する" # CLI --help -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "指定されたコマンドを実行する" # CLI --help -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "正規表現 PATTERN に従って URI をブロックする" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "PATTERN" # CLI --help #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "非アクティブになって SECONDS 秒後に Midori をリセットする" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SECONDS" -#: ../midori/main.c:1629 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1804 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1968 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "無視(_I)" @@ -256,104 +262,104 @@ msgstr "認識できないブックマーク形式です。" msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "タイトルの更新に失敗しました: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "スピードダイアルに追加(_S)" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "ツールバーに表示する(_B)" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "ウェブアプリケーションとして実行する(_W)" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "\"%s\" をダウンロードする十分な空きスペースがありません。" -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "ファイルのダウンロードには %s 必要ですが、%s しか空きがありません。" -#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "ファイルの保存" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -366,148 +372,148 @@ msgstr "" "もしくは Midori の設定のアプリケーションタブでフィードリーダを指定してくださ" "い。次にニュースフィードアイコンをクリックしたときに自動的に追加されます。" -#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "新しいフィード" # tooltip -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 #: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" -#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "新規履歴アイテムの挿入に失敗しました: %s\n" -#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:710 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "風博士" -#: ../midori/midori-browser.c:3947 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3948 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "ブックマークのインポート..." -#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "ブックマークのインポート(_I)" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "アプリケーション(_A):" -#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "ブックマークのインポートに失敗しました" -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "ブックマークのエクスポートに失敗しました" -#: ../midori/midori-browser.c:4167 +#: ../midori/midori-browser.c:4155 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4163 #, c-format msgid "Failed to clear search history: %s\n" msgstr "検索履歴のクリアに失敗しました: %s\n" # Dialog title #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button label -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "閉じたタブ(_C)" -#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "ウェブキャッシュ" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Midori 終了時にプライベートデータをクリアする(_Q)" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:4489 +#: ../midori/midori-browser.c:4474 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -518,609 +524,609 @@ msgstr "" "団が発行する GNU 劣等一般公衆利用許諾契約書バージョン 2.1 あるいはそれ以降の" "いずれかの版で定める条件下で再配布および/または改変することができます。" -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "新しいウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "新しいウィンドウを開きます" # tooltip -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:4825 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" # tooltip -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "閲覧中に個人データを保存しません" # tooltip -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "ファイルを開きます" # tooltip -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "スピードダイアルに追加(_D)" # tooltip -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "ショートカットをスピードダイアルに追加します" -#: ../midori/midori-browser.c:4838 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "デスクトップにショートカットを追加(_D)" # tooltip -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "デスクトップにショートカットを追加します" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "ニュースフィードを購読(_F)" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "このニュースフィードを購読します" -#: ../midori/midori-browser.c:4847 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "タブを閉じる(_C)" # tooltip -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" # tooltip -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "このウィンドウを閉じます" # tooltip -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "現在のページを印刷します" # tooltip -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:4859 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "最後の修正を元に戻す" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "最後の修正をやり直す" # tooltip -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "選択した文字を切り取ります" # tooltip -#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "選択した文字をコピーします" # tooltip -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" # tooltip -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "選択した文字を削除します" # tooltip -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "すべての文字を選択します" # tooltip -#: ../midori/midori-browser.c:4888 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "次を検索(_N)" # tooltip -#: ../midori/midori-browser.c:4891 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "前を検索(_P)" # tooltip -#: ../midori/midori-browser.c:4894 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" # tooltip -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "このアプリケーションの設定を行います" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "ツールバー(_T)" # tooltip -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" # tooltip -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" # tooltip -#: ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "ソースを表示(_U)" # tooltip -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" # tooltip -#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "左へスクロール(_L)" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "左へスクロールします" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "下へスクロール(_D)" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "下へスクロール" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "上へスクロール(_U)" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "上へスクロール" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "右へスクロール(_R)" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "右へスクロールします" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "移動(_G)" # tooltip -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "前のページへ戻ります" # tooltip -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "次のページへ進みます" # tooltip #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "前のサブページへ戻ります" # tooltip #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "次のサブページへ進みます" # tooltip -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "ゴミ箱を空にする" # tooltip -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "閉じたタブを元に戻す(_C)" # tooltip -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "新しいフォルダの追加(_F)" # tooltip -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "ブックマークのエクスポート(_E)" -#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" # tooltip -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" # tooltip -#: ../midori/midori-browser.c:4985 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "ページの調査(_I)" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "ページの詳細を調査し開発者用ツールにアクセスします..." -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "前のタブ(_P)" # tooltip -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "次のタブ(_N)" # tooltip -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "現在のタブにフォーカス(_C)" # tooltip -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "現在のタブにフォーカスを移動します" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:4989 msgid "Minimize _Current Tab" msgstr "現在のタブの最小化(_C)" # tooltip -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "現在のタブを最小化します" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4992 msgid "_Duplicate Current Tab" msgstr "現在のタブの複製(_D)" # tooltip -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "現在のタブを複製します" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4995 msgid "Close Ot_her Tabs" msgstr "他のタブを閉じる(_H)" # tooltip -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4996 msgid "Close all tabs except the current tab" msgstr "現在のタブ以外を全て閉じます" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "最後のセッションを開く(_S)" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "最後のセッションで保存されたタブを開きます" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "目次(_C)" # tooltip -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "よくある質問(_F)" # tooltip -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその回答を表示します" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "バグを報告(_R)" # tooltip -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" # tooltip -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "メニューバー(_M)" # tooltip -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" # tooltip -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:5044 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "サイドパネル(_P)" # tooltip -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" # tooltip -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "転送バー(_T)" # tooltip -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "ステータスバー(_S)" # tooltip -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "日本語 (SHIFT__JIS)" -#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "韓国語 (EUC-KR)" -#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "場所(_L)..." # tooltip -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." # tooltip -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "ウェブ検索を実行します" # tooltip -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "ウィンドウ(_W)" # tooltip -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "メニュー(_M)" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "メニュー" -#: ../midori/midori-browser.c:6280 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "履歴からの選択に失敗しました\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "%s を検索" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "%s で検索" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "データベース文の実行に失敗しました\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "貼り付けて続行(_R)" # tooltip -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "選択したパネルをウィンドウから切り離します" # tooltip -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "サイドパネルを右側に配置します" # tooltip -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "パネルを閉じます" # tooltip -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "サイドパネルを左側に配置します" # tooltip -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "操作コントロールを隠します" @@ -1136,604 +1142,604 @@ msgstr "ホームページを表示" msgid "Show last open tabs" msgstr "最後に開いたタブを表示" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "最後のタブを読み込まずに表示" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "小さいアイコン" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "自動 (GNOME または環境変数)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "HTTP プロキシサーバ" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "プロキシサーバなし" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" # tooltip -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "最後のウィンドウの高さ" # tooltip -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "最後のパネルの位置" # tooltip -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "最後のパネルページ" # tooltip -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "メニューバーを表示する" # tooltip -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" # tooltip -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" # tooltip -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "パネルを表示する" # tooltip -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "転送バーを表示する" # tooltip -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "ステータスバーを表示する" # tooltip -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "ツールバー方式:" # tooltip -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" # tooltip -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "場所の補完に検索エンジンを使用する" # tooltip -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "場所の補完候補内から検索エンジンを使用できるようにします" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "ツールバーアイテム" # tooltip -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" # tooltip -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "パネルの操作コントロールを表示する" # tooltip -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "パネルに操作コントロールを表示します" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" # tooltip -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "パネルを別のウィンドウで開く" # tooltip -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "パネルを常に別のウィンドウで開きます" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Midori を起動した時:" # tooltip -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Midori の起動時に表示するページを指定します" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "ホームページ:" # tooltip -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" # tooltip -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "新しいタブにスピードダイアルを表示する" # tooltip -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "新しく開かれたタブにスピードダイアルを表示します" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "ダウンロードファイルの保存先:" # tooltip -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "保存先フォルダを問い合わせる" # tooltip -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "ファイルをダウンロードする時に保存先フォルダを問い合わせます" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "転送が完了したら通知する" # tooltip -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "転送が完了したら通知します" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "ダウンロードマネージャ" # tooltip -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "テキストエディタ" # tooltip -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "フィードリーダ" # tooltip -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "外部フィードリーダを指定します" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "ロケーションエントリの検索" # tooltip -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "文字のエンコーディング" # tooltip -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" # tooltip -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" # tooltip -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "新しくページを開く時:" # tooltip -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "外部ページを開く時:" # tooltip -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" # tooltip -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" # tooltip -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" # tooltip -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" # tooltip -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "画像を自動的に読み込む" # tooltip -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "スクリプトを有効にする" # tooltip -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Netscape プラグインを有効にする" # tooltip -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にする" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "HTML5 データベースサポートを有効にします" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にする" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "HTML5 ローカルストレージサポートを有効にします" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にする" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "オフラインウェブアプリケーションキャッシュを有効にします" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" # tooltip -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" # tooltip -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "慣性スクロール" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "速度にしたがって慣性がかかったようにスクロールします" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Cookie の受け入れ" # tooltip -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択します" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "履歴の最大保存日数" # tooltip -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" # tooltip -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "使用するプロキシサーバの種類を指定します" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "HTTP プロキシサーバ" # tooltip -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "識別名" # tooltip -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "識別文字列" # tooltip -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "言語の優先度" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1074 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" @@ -1742,12 +1748,12 @@ msgstr "" "指定します。例 \"ja\"、\"en-us\" または \"ja;q=1.0, en-us;q=0.667\"" # Button title -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "プライベートデータのクリア" # FIXME: -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "選択されているプライベートデータを削除します" @@ -1755,238 +1761,238 @@ msgstr "選択されているプライベートデータを削除します" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "エラー - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "ページ '%s' を読み込めませんでした" -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "再試行" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "メッセージを送信します 宛先: %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "要素の検証(_E)" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "リンクをフォアグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "リンクをバックグラウンドのタブで開く(_T)" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "ウェブアプリケーションとして実行する(_P)" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "リンク先をコピー(_S)" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "画像を新しいタブで開く(_I)" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "画像のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "画像を保存(_M)" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "画像をダウンロード(_M)" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "動画のアドレスをコピー(_A)" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "動画を保存(_V)" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "動画をダウンロード(_V)" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "検索(_W)" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "スピードダイアル" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "クリックするとショートカットを追加できます" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "ショートカットのアドレスを入力してください" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "ショートカットの名前を入力してください" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "このショートカットを削除してもよろしいですか?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "行数と列数を設定" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "行数および列数を入力してください:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "入力されたスピードダイアルのサイズは正しくありません" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "サムネイルサイズ:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "小さい" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "普通" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "大きい" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "ページ読み込みの保留" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "最近のクラッシュか起動設定により読み込みが保留されています。" -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "ページを読み込む" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "タブの複製(_D)" -#: ../midori/midori-view.c:4124 -msgid "_Restore Tab" -msgstr "タブの復元(_R)" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "タブラベルの表示(_L)" -#: ../midori/midori-view.c:4124 -msgid "_Minimize Tab" -msgstr "タブの最小化(_M)" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "タブアイコンのみ表示(_I)" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "他のタブを閉じる(_H)" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "背景画像を印刷する" # tooltip -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "機能" @@ -2178,51 +2184,51 @@ msgstr "検索エンジンの管理" msgid "Use as _default" msgstr "デフォルトで使う(_D)" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "ブックマークに追加(_K)" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Netscape プラグイン(_L)" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "新しいフォルダ(_F)" @@ -2251,7 +2257,7 @@ msgstr "強調表示" msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s / %s" @@ -2265,7 +2271,7 @@ msgstr "ファイル '%s' をダウンロードしました。" msgid "Transfer completed" msgstr "転送完了" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "すべてクリア" @@ -2285,17 +2291,11 @@ msgstr "Midori を終了すると転送がキャンセルされます。" msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "ブックマークアイテムの追加に失敗しました: %s\n" -#: ../panels/midori-bookmarks.c:281 ../panels/midori-history.c:142 -#: ../panels/midori-history.c:172 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "履歴アイテムの削除に失敗しました: %s\n" - # tooltip #: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" @@ -2310,7 +2310,7 @@ msgstr "選択したブックマークを削除します" msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../panels/midori-bookmarks.c:568 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "セパレータ" @@ -2331,64 +2331,49 @@ msgstr "全てコピー" msgid "Extensions" msgstr "エクステンション" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "時刻の誤り" - -#: ../panels/midori-history.c:275 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "時計時刻が過去になっています。現在の日付と時刻をチェックしてください。" - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d 日前" msgstr[1] "%d 日前" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "データベース文の実行に失敗しました: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" # tooltip -#: ../panels/midori-history.c:414 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "選択した履歴アイテムをブックマークに追加します" # tooltip -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "選択した履歴アイテムを削除します" # tooltip -#: ../panels/midori-history.c:431 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "保存先フォルダを開く(_F)" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "リンクの場所をコピー(_A)" @@ -2430,16 +2415,17 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "フォルダの選択" @@ -2490,34 +2476,45 @@ msgstr "広告ブロッカ" msgid "Block advertisements according to a filter list" msgstr "フィルタリストに登録された広告をブロックします" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "%s をフォルダ %s へコピーします。" - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:325 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:327 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "エラー" + +#: ../extensions/addons.c:231 +#, c-format +msgid "" +"Do you really want to remove '%s'?\n" +"\n" +"The file '%s' will be permanently lost.\n" +msgstr "" +"'%s' を本当に削除しますか？\n" +"\n" +"ファイル '%s' は完全に失われます｡\n" + +#: ../extensions/addons.c:1231 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "エクステンション '%s' の設定を保存できませんでした: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 msgid "User addons" msgstr "ユーザアドオン" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1354 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "フォルダ '%s' をモニタできません: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1398 msgid "Support for userscripts and userstyles" msgstr "ユーザスクリプトやユーザスタイルをサポートします" @@ -2649,9 +2646,10 @@ msgstr "Cookie の一覧や内容の表示および削除を行います" msgid "Copy Tab _Addresses" msgstr "タブのアドレスをコピー(_A)" +# name of extension #: ../extensions/copy-tabs.c:98 msgid "Copy Addresses of Tabs" -msgstr "タブのアドレスをコピーします" +msgstr "タブのアドレスのコピー" #: ../extensions/copy-tabs.c:99 msgid "Copy the addresses of all tabs to the clipboard" @@ -2696,17 +2694,17 @@ msgstr "フィードの削除" msgid "_Feeds" msgstr "フィード(_F)" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "フィード XML データ内にルート要素が見つかりませんでした。" -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "サポートされていないフィード形式です。" -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "XML フィードの解析に失敗しました: %s" @@ -2727,10 +2725,6 @@ msgstr "XML データ内に要求された RSS \"item\" 要素が見つかりま msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "XML データ内に要求された RSS \"channel\" 要素が見つかりませんでした。" -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "エラー" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2741,34 +2735,39 @@ msgstr "フィード '%s' はすでに存在します" msgid "Error loading feed '%s'" msgstr "フィード '%s' の読み込みでエラーです" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "フィードパネル" # description -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Atom/RSS フィードを購読します" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "フォーム値の追加に失敗しました: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "データベース文の実行に失敗しました: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "入力されたフォームデータの履歴を記憶します" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "利用できません: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "リソースファイルがインストールされていません" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "入力フォーム履歴フィルタ" @@ -2864,26 +2863,27 @@ msgstr "ステータスバー機能" msgid "Easily toggle features on web pages on and off" msgstr "ウェブページへの機能のオン/オフを簡単に切り替えます" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "タブパネル" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "タブパネル(_A)" # description -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "タブを縦のパネルに表示します" +# name of extension #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "新規タブの最小化" +msgid "Only Icons on Tabs by default" +msgstr "デフォルトでタブのアイコンのみ表示" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "新しいタブを最小化して開きます" +msgid "New tabs have no label by default" +msgstr "デフォルトで新しいタブのラベルを表示しません" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2922,6 +2922,29 @@ msgstr "ツールバーのレイアウトを簡単に編集できます" msgid "Cache HTTP communication on disk" msgstr "HTTP 通信をディスクにキャッシュします" +#~ msgid "_Restore Tab" +#~ msgstr "タブの復元(_R)" + +#~ msgid "_Minimize Tab" +#~ msgstr "タブの最小化(_M)" + +#~ msgid "Erroneous clock time" +#~ msgstr "時刻の誤り" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "時計時刻が過去になっています。現在の日付と時刻をチェックしてください。" + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "%s をフォルダ %s へコピーします。" + +#~ msgid "Minimize new Tabs" +#~ msgstr "新規タブの最小化" + +#~ msgid "New tabs open minimized" +#~ msgstr "新しいタブを最小化して開きます" + #~ msgid "_Recently visited pages" #~ msgstr "最近訪れたページ(_R)" From 20125dfc510482c1921a5ff71b69e099479d1062 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Sun, 29 Aug 2010 18:51:43 +0200 Subject: [PATCH 2912/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 640 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 1088 +++++++++++++++++++++++++++--------------------------- 1 file changed, 554 insertions(+), 534 deletions(-) diff --git a/po/pt.po b/po/pt.po index b89e3a97..43a87ff3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 10:08+0000\n" +"POT-Creation-Date: 2010-08-29 16:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -22,9 +22,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador Web rápido" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:310 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -32,198 +32,204 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador Web" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não foi carregada: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico antigo: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Falha ao remover histórico: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram guardados. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi guardada. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram guardados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Nenhum certificado root disponível. Os certificados SSL não podem ser verificados." -#: ../midori/main.c:914 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1178 ../midori/main.c:1927 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada em: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREÇO como aplicação web" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ENDEREÇO" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Usar PASTA como pasta de configuração" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "PASTA" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Tirar uma captura da URI especificada" -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs conforme a expressão PATTERN" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Repor Midori após SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1629 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1774 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "A pasta de configuração especificada é inválida." -#: ../midori/main.c:1822 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1899 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1942 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1956 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1970 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1986 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorar " @@ -244,104 +250,104 @@ msgstr "Formato de marcadores não reconhecido." msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Falha ao actualizar título: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Adicionar a _Ligação Rápida" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Executar como aplicação _web" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Não possui espaço suficiente para transferir \"%s\"." -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa de %s e apenas está livre %s." -#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Guardar ficheiro" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -349,691 +355,691 @@ msgstr "" "Para abrir a URI acima, abra um agregador de notícias. Normalmente, existe um menu ou botão para \"Nova Subscrição\", \"Nova Fonte de Notícias\" ou outro similar.\n" "Alternativamente pode ir a Preferências->Aplicações e escolher o Agregador de Notícias. Da próxima vez que clicar no ícone de fontes, esta será automaticamente adicionada." -#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 -#: ../panels/midori-bookmarks.c:403 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." -#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Falha ao inserir novo item no histórico: %s\n" -#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:718 -#: ../panels/midori-history.c:710 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Abrir todos em _Separadores" -#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:724 -#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:726 -#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3947 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3948 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Aplicação:" -#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Falha ao importar marcadores" -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Falha ao exportar marcadores" -#: ../midori/midori-browser.c:4167 +#: ../midori/midori-browser.c:4155 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falha ao apagar o histórico: %s\n" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4163 #, c-format msgid "Failed to clear search history: %s\n" msgstr "Falha ao apagar o histórico de pesquisas: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Limpar Dados Privados" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Ícones de sítios Web" -#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Separadores _Fechados" -#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache Web" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Um navegador web rápido." -#: ../midori/midori-browser.c:4489 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta biblioteca é software livre; pode redistribuí-lo e/ou modificá-lo nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou qualquer versão mais recente (por opção)." -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:4825 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Adicionar a ligação rápi_da" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:4838 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar Atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho ao ambiente de trabalho" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Subscrever _fonte de Notícias" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Subscrever a esta fonte de notícias" -#: ../midori/midori-browser.c:4847 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:4859 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Apagar o texto seleccionado" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:4888 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "_Localizar Seguinte" -#: ../midori/midori-browser.c:4891 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:4894 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Repor Zoom" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Ver Fo_nte" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Deslocar à _Esquerda" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Deslocar à esquerda" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Deslocar para _Baixo" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Deslocar para baixo" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Deslocar para _Cima" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Deslocar para cima" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Deslocar à _Direita" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Deslocar à direita" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Ir para página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Ir para sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Ir para sub-página seguinte" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Apagar conteúdos do lixo" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Desfazer _Fecho de Separadores" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de marcadores" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir Motores de _Pesquisa" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Limpar Dados Privados" -#: ../midori/midori-browser.c:4985 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "Inspeccionar Página" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar página e aceder às ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Mudar para o separador seguinte" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Focar Separador _Actual" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Focar o separador actual" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:4989 msgid "Minimize _Current Tab" msgstr "Minimizar o Separador A_ctual" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "Minimizar o separador actual" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4992 msgid "_Duplicate Current Tab" msgstr "_Duplicar o Separador Actual" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "Duplicar o separador actual" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4995 msgid "Close Ot_her Tabs" msgstr "Fec_har os Outros Separadores" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4996 msgid "Close all tabs except the current tab" msgstr "Fechar todos os separadores excepto o actual" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Abrir última _sessão" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Abrir separadores guardados na última sessão" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:5044 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6280 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Falha ao seleccionar do histórico\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Pesquisar por %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Pesquisar com %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Falha ao executar o relatório da base de dados:\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Separar da janela o painel escolhido" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Alinhar painel à direita" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Alinhar painel à esquerda" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Ocultar controlos operacionais" @@ -1049,562 +1055,562 @@ msgstr "Mostrar Página Inicial" msgid "Show last open tabs" msgstr "Mostrar últimos separadores abertos" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Mostrar últimos separadores sem os carregar" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Omissão" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Marque se quiser guardar o último tamanho da janela" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Última página de painel guardada" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Última pesquisa Web" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Marque se quiser mostrar a barra de menu" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Marque se quiser mostrar a barra de navegação" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Marque se quiser mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Marque se quiser mostrar o painel" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Mostrar Barra de Transferências" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Marque se quiser mostrar a barra de transferências" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Marque se quiser mostrar a barra de estado" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Estilo da Barra de Ferramentas:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Mostrar evolução no endereço" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Marque se quiser mostrar a evolução de carregamento do endereço" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Marque se quiser mostrar motores de pesquisa na conclusão do endereço" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Marque se quiser compactar o painel lateral" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Marque se quiser mostrar os controlos operacionais do painel" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Marque se quiser alinhar o painel lateral à direita" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Abrir painéis em janelas separadas" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Marque se quiser abrir, sempre, os painéis em janelas separadas" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Ao iniciar Midori:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar Midori" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Página Inicial:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Mostrar ligação rápida em novos separadores" -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar ligação rápida em separadores recentemente abertos" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Guardar ficheiros transferidos em:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Perguntar pasta de destino" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Marcar se quiser perguntar por uma pasta de destino ao transferir um ficheiro" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Marque se quiser mostrar uma notificação ao concluir a transferência" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Agregador de Notícias" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Pesquisa de Endereço" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "A pesquisa a executar no endereço" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Marque se quiser que os separadores tenham ícones para fechar" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Abrir páginas externas em:" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Marque se quiser abrir os novos separadores em segundo plano" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Marque se quiser abrir os novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Marque se quiser abrir janelas popup em separadores" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Carregar e apresentar automaticamente as imagens " -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activar argumentos" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Activar argumentos de linguagem incorporados" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activar plugins Netscape" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Activar plugins Netscape incorporados" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Activar suporte a dados HTML5" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Marque se quiser activar suporte a dados HTML5" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Activar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Marque se quiser activar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Activar cache de aplicação web offline" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Marque se quiser activar cache de aplicação web offline" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Marque se quiser ajustar zoom de texto e imagens" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Marque se quiser encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Deslocamento cinético" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Marque se quiser que o deslocamento se mova cineticamente conforme a velocidade" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "O número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Marque se quiser guardar as últimas transferências" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "O tipo de servidor a utilizar" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Servidor Proxy HTTP" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Uma lista de idiomas, separada por vírgulas, para o processamento de páginas web multi-idiomas, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Os dados privados seleccionados para apagar" @@ -1612,237 +1618,237 @@ msgstr "Os dados privados seleccionados para apagar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página '%s' não foi carregada." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Enviar mensagem a %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspeccionar _Elementos" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Abrir Ligação no Separador _Principal" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Abrir Ligação no Separador _Secundário" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Abrir Ligação como A_plicação Web" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Copiar de_stino da Ligação" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Guardar destino da Ligação" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Transferir destino da Ligação" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Transferir com _Gestor de Transferências" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Abrir _Imagem em Novo Separador" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Copiar _Endereço da Imagem" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Guardar I_magem" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Transferir I_magem" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Copiar _Endereço do Vídeo" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Guardar _Vídeo" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Transferir _Vídeo" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tipo de Ficheiro: '%s' " -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Clique para adicionar atalho" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Introduza endereço do atalho" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Introduza título do atalho" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem a certeza que quer apagar este atalho?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Definir número de colunas e linhas" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Indique o número de colunas e linhas:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Entrada inválida para o tamanho da ligação rápida" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Tamanho das miniaturas:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Pequenas" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Médias" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Grandes" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Actualização de página atrasada" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "O atraso na actualização foi devido a um encerramento brusco ou ás preferências de arranque." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Carregar Página" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Duplicar Separador" -#: ../midori/midori-view.c:4124 -msgid "_Restore Tab" -msgstr "_Restaurar Separadores" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Mostrar _Texto do Separador" -#: ../midori/midori-view.c:4124 -msgid "_Minimize Tab" -msgstr "_Minizar Separadores" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Mostrar Apenas o Í_cone" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Fec_har outros Separadores" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Marque se quiser imprimir as imagens em segundo plano" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funcionalidades" @@ -2022,51 +2028,51 @@ msgstr "Gerir Motores de Pesquisa" msgid "Use as _default" msgstr "Usar por _omissão" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Adicionar _Marcador" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Página Inicial" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "Argumentos de _Utilizador" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "_Novo Separador" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "P_lugins Netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nova _Pasta" @@ -2095,7 +2101,7 @@ msgstr "Realçar Correspondências" msgid "Close Findbar" msgstr "Fechar" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s de %s" @@ -2109,7 +2115,7 @@ msgstr "O ficheiro '%s' foi transferido." msgid "Transfer completed" msgstr "Transferência concluída" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Limpar Tudo" @@ -2129,30 +2135,24 @@ msgstr "As transferências serão canceladas se sair do Midori." msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:246 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Falha ao adicionar marcador: %s\n" -#: ../panels/midori-bookmarks.c:278 ../panels/midori-history.c:142 -#: ../panels/midori-history.c:172 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Falha ao remover histórico: %s\n" - -#: ../panels/midori-bookmarks.c:411 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Editar marcador seleccionado" -#: ../panels/midori-bookmarks.c:419 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Apagar marcador seleccionado" -#: ../panels/midori-bookmarks.c:433 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:565 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Separador" @@ -2172,60 +2172,46 @@ msgstr "Copiar Tudo" msgid "Extensions" msgstr "Extensões" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Hora do relógio incorrecta" - -#: ../panels/midori-history.c:275 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "O relógio está incorrecto. Por favor, verifique a data e hora actual." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dia atrás" msgstr[1] "%d dias atrás" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Ontem" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Falha ao executar o relatório da base de dados: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Tem a certeza que quer remover todo o histórico?" -#: ../panels/midori-history.c:414 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Marcar o item de histórico seleccionado" -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Apagar item de histórico seleccionado" -#: ../panels/midori-history.c:431 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Abrir Pas_ta de Destino" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copiar Localização da Lig_ação" @@ -2267,16 +2253,17 @@ msgstr "O ícone '%s' não foi carregado" msgid "Animation frames are broken" msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Escolha o ficheiro" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Escolha a pasta" @@ -2322,34 +2309,45 @@ msgstr "Bloqueador de publicidade" msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com a lista " -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copiar %s para a pasta %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:325 msgid "Userscripts" msgstr "Argumentos de Utilizador" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:327 msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Erro" + +#: ../extensions/addons.c:231 +#, c-format +msgid "" +"Do you really want to remove '%s'?\n" +"\n" +"The file '%s' will be permanently lost.\n" +msgstr "" +"Deseja realmente remover '%s'?\n" +"\n" +"O ficheiro '%s' será perdido para sempre.\n" + +#: ../extensions/addons.c:1231 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "A configuração da extensão '%s' não foi gravada: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 msgid "User addons" msgstr "Extras de utilizador" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1354 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível vigiar a pasta '%s': %s " -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1398 msgid "Support for userscripts and userstyles" msgstr "Suporte a scripts e estilos de utilizador" @@ -2511,17 +2509,17 @@ msgstr "Apagar fonte" msgid "_Feeds" msgstr "_Fontes" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Falha ao encontrar o elemento root nos dados XML da fonte." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Formato de fonte não suportado." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Falha ao processar a fonte XML: %s" @@ -2542,10 +2540,6 @@ msgstr "Falha ao encontrar os elementos RSS do \"item\" nos dados XML." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Falha ao encontrar os elementos RSS do \"channel\" nos dados XML." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Erro" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2556,33 +2550,38 @@ msgstr "Já existe a fonte '%s'" msgid "Error loading feed '%s'" msgstr "Erro ao carregar a fonte '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Painel de Fontes" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Ler fontes Atom/RSS" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Falha ao executar o relatório da base de dados: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Armazena o histórico do formulário" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Não disponível: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "O ficheiro de recursos não está instalado" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Preenchimento do formulário" @@ -2675,25 +2674,25 @@ msgstr "Funções na Barra de Estado" msgid "Easily toggle features on web pages on and off" msgstr "Ligar/desligar facilmente as funções em páginas web" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Painel de Separadores" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "P_ainel de Separadores" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Mostrar separadores em painel vertical" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Minimizar novos Separadores" +msgid "Only Icons on Tabs by default" +msgstr "Por omissão, mostrar apenas os Ícones" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Minimizar novos separadores ao abrir" +msgid "New tabs have no label by default" +msgstr "Os novos separadores não mostram texto" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2727,6 +2726,27 @@ msgstr "Editar facilmente a barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "_Restore Tab" +#~ msgstr "_Restaurar Separadores" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minizar Separadores" + +#~ msgid "Erroneous clock time" +#~ msgstr "Hora do relógio incorrecta" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "O relógio está incorrecto. Por favor, verifique a data e hora actual." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copiar %s para a pasta %s." + +#~ msgid "Minimize new Tabs" +#~ msgstr "Minimizar novos Separadores" + +#~ msgid "New tabs open minimized" +#~ msgstr "Minimizar novos separadores ao abrir" + #~ msgid "_Recently visited pages" #~ msgstr "Páginas _Recentes" From 1640aedd44d9c3a3dd5756335086bc7228a492f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Sat, 28 Aug 2010 21:50:23 +0200 Subject: [PATCH 2913/2970] Make addons delete confirmation dialog more readable --- extensions/addons.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 50a0cdf4..3bd043b0 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -224,13 +224,24 @@ midori_addons_button_delete_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, &iter, 0, &element, -1); dialog = gtk_message_dialog_new ( - GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - _("Do you really want to remove '%s'?\n\n" - "The file '%s' will be permanently lost.\n"), - element->displayname, element->fullpath); + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_CANCEL, + _("Do you want to delete '%s'?"), + element->displayname); + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_YES); + + gtk_window_set_title (GTK_WINDOW (dialog), + addons->kind == ADDONS_USER_SCRIPTS + ? _("Delete user script") + : _("Delete user style")); + + gtk_message_dialog_format_secondary_markup ( + GTK_MESSAGE_DIALOG (dialog), + _("The file %s will be permanently deleted."), + element->fullpath); + delete_response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); From ce56f60ccdb2604ac1de4257e84321806213dbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Sun, 29 Aug 2010 23:29:10 +0200 Subject: [PATCH 2914/2970] Show addon filename and/ or description in tooltip --- extensions/addons.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 3bd043b0..7f5d68a1 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -827,8 +827,9 @@ addons_update_elements (MidoriExtension* extension, if (liststore) gtk_list_store_clear (liststore); else - liststore = gtk_list_store_new (3, G_TYPE_POINTER, + liststore = gtk_list_store_new (4, G_TYPE_POINTER, G_TYPE_INT, + G_TYPE_STRING, G_TYPE_STRING); keyfile = g_key_file_new (); @@ -842,6 +843,9 @@ addons_update_elements (MidoriExtension* extension, elements = NULL; while (addon_files) { + gchar* filename; + gchar* tooltip; + fullpath = addon_files->data; element = g_new (struct AddonElement, 1); element->displayname = g_filename_display_basename (fullpath); @@ -888,10 +892,22 @@ addons_update_elements (MidoriExtension* extension, element->enabled = FALSE; } + filename = g_path_get_basename (element->fullpath); + if (element->description) + { + tooltip = g_strdup_printf ("%s\n\n%s", + filename, element->description); + g_free (filename); + } + else + tooltip = filename; + gtk_list_store_append (liststore, &iter); gtk_list_store_set (liststore, &iter, - 0, element, 1, 0, 2, element->fullpath, -1); + 0, element, 1, 0, 2, element->fullpath, + 3, tooltip, -1); + g_free (tooltip); addon_files = g_slist_next (addon_files); elements = g_slist_prepend (elements, element); } @@ -936,7 +952,7 @@ addons_init (Addons* addons) (GtkTreeCellDataFunc)addons_treeview_render_text_cb, addons->treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (addons->treeview), column); - gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (addons->treeview), 2); + gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (addons->treeview), 3); g_signal_connect (addons->treeview, "row-activated", G_CALLBACK (addons_treeview_row_activated_cb), addons); From d7b68b9d94656d37f86b136bec96f79a2092191e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Mon, 30 Aug 2010 00:59:57 +0200 Subject: [PATCH 2915/2970] Add button to open addon in text editor --- extensions/addons.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/extensions/addons.c b/extensions/addons.c index 7f5d68a1..263c893d 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -277,6 +277,39 @@ midori_addons_button_delete_clicked_cb (GtkWidget* toolitem, } } } +static void +midori_addons_open_in_editor_clicked_cb (GtkWidget* toolitem, + Addons* addons) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (addons->treeview), + &model, &iter)) + { + struct AddonElement* element; + MidoriWebSettings* settings; + MidoriBrowser* browser; + gchar* text_editor; + gchar* element_uri; + + browser = midori_browser_get_for_widget (GTK_WIDGET (addons->treeview)); + settings = katze_object_get_object (browser, "settings"); + + gtk_tree_model_get (model, &iter, 0, &element, -1); + element_uri = g_filename_to_uri (element->fullpath, NULL, NULL); + + g_object_get (settings, "text-editor", &text_editor, NULL); + if (text_editor && *text_editor) + sokoke_spawn_program (text_editor, element_uri, TRUE); + else + sokoke_show_uri (NULL, element_uri, + gtk_get_current_event_time (), NULL); + + g_free (element_uri); + g_free (text_editor); + } +} GtkWidget* addons_get_toolbar (MidoriViewable* viewable) @@ -311,6 +344,14 @@ addons_get_toolbar (MidoriViewable* viewable) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); + /* Text editor button */ + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_addons_open_in_editor_clicked_cb), viewable); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + /* Delete button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); gtk_tool_item_set_is_important (toolitem, TRUE); From 03ac06565f7cc73fa25f9cbda3d30037026aa065 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Mon, 30 Aug 2010 01:56:11 +0200 Subject: [PATCH 2916/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 643 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 56 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/po/pt.po b/po/pt.po index 43a87ff3..ef1f1221 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-29 16:08+0000\n" +"POT-Creation-Date: 2010-08-29 22:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: PORTUGAL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: PORTUGAL\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" @@ -150,7 +150,7 @@ msgstr "Mostrar diálogo de diagnóstico" #: ../midori/main.c:1558 msgid "Run the specified filename as javascript" -msgstr "Executar o ficheiro especificado como argumento java" +msgstr "Executar o ficheiro especificado como 'javascripts '" #: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" @@ -1471,11 +1471,11 @@ msgstr "Carregar e apresentar automaticamente as imagens " #: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" -msgstr "Activar argumentos" +msgstr "Activar 'scripts '" #: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" -msgstr "Activar argumentos de linguagem incorporados" +msgstr "Activar 'scripts ' de linguagem incorporados" #: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" @@ -2309,45 +2309,52 @@ msgstr "Bloqueador de publicidade" msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com a lista " -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:130 ../extensions/addons.c:336 msgid "Userscripts" msgstr "Argumentos de Utilizador" -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:135 ../extensions/addons.c:338 msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Erro" #: ../extensions/addons.c:231 #, c-format -msgid "" -"Do you really want to remove '%s'?\n" -"\n" -"The file '%s' will be permanently lost.\n" -msgstr "" -"Deseja realmente remover '%s'?\n" -"\n" -"O ficheiro '%s' será perdido para sempre.\n" +msgid "Do you want to delete '%s'?" +msgstr "Deseja realmente apagar '%s'?" -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Apagar 'script ' de utilizador" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Apagar estilo de utilizador" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "O ficheiro '%s' será apagado permanentemente." + +#: ../extensions/addons.c:1258 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "A configuração da extensão '%s' não foi gravada: %s\n" -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1259 ../extensions/addons.c:1424 msgid "User addons" msgstr "Extras de utilizador" -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1381 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível vigiar a pasta '%s': %s " -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1425 msgid "Support for userscripts and userstyles" msgstr "Suporte a scripts e estilos de utilizador" @@ -2726,6 +2733,15 @@ msgstr "Editar facilmente a barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "" +#~ "Do you really want to remove '%s'?\n" +#~ "\n" +#~ "The file '%s' will be permanently lost.\n" +#~ msgstr "" +#~ "Deseja realmente remover '%s'?\n" +#~ "\n" +#~ "O ficheiro '%s' será perdido para sempre.\n" + #~ msgid "_Restore Tab" #~ msgstr "_Restaurar Separadores" From 661852e573810316ff1611b27f2f2ae2c66b4885 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Mon, 30 Aug 2010 12:29:40 +0200 Subject: [PATCH 2917/2970] l10n: Updated Danish (da) translation to 99% New status: 641 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/po/da.po b/po/da.po index cd7d7537..1fde1367 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-28 10:08+0000\n" +"POT-Creation-Date: 2010-08-30 10:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -2310,45 +2310,52 @@ msgstr "Blokering af reklamer" msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:130 ../extensions/addons.c:377 msgid "Userscripts" msgstr "Brugerskripter" -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:135 ../extensions/addons.c:379 msgid "Userstyles" msgstr "Brugerstile" -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fejl" #: ../extensions/addons.c:231 #, c-format -msgid "" -"Do you really want to remove '%s'?\n" -"\n" -"The file '%s' will be permanently lost.\n" -msgstr "" -"Er du sikker på, at du vil fjerne '%s'?\n" -"\n" -"filen '%s', da denne vil være tabt for bestandigt.\n" +msgid "Do you want to delete '%s'?" +msgstr "Er du sikker på du vil slette '%s'?" -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Slet brugerskript" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Slet brugerstil" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Filen %s vil blive slettet for bestandigt." + +#: ../extensions/addons.c:1299 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 msgid "User addons" msgstr "Brug udvidelsesm,oduler" -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1422 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan ikke overvåge mappe '%s': %s" -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1466 msgid "Support for userscripts and userstyles" msgstr "Understøttelse af brugerskripter og brugerstile" @@ -2727,6 +2734,15 @@ msgstr "Redigér nemt layout af værktøjsbjælken" msgid "Cache HTTP communication on disk" msgstr "Cache HTTP-kommunikation på disk" +#~ msgid "" +#~ "Do you really want to remove '%s'?\n" +#~ "\n" +#~ "The file '%s' will be permanently lost.\n" +#~ msgstr "" +#~ "Er du sikker på, at du vil fjerne '%s'?\n" +#~ "\n" +#~ "filen '%s', da denne vil være tabt for bestandigt.\n" + #~ msgid "Copy %s to the folder %s." #~ msgstr "Kopiér %s til mappen %s." From e627bca564476cb8c3d4d9aa2badcbfc4c77ec66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Mu=C3=B1oz=20Gorriz?= Date: Tue, 31 Aug 2010 16:52:27 +0200 Subject: [PATCH 2918/2970] l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 643 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ca.po | 1166 +++++++++++++++++++++++++++++------------------------- 1 file changed, 630 insertions(+), 536 deletions(-) diff --git a/po/ca.po b/po/ca.po index db14e584..8b5e3c05 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,15 +4,16 @@ # This file is distributed under the same license as the midori package. # Carles Muñoz Gorriz , 2009-2010. # Harald Servat , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 10:08+0000\n" -"PO-Revision-Date: 2010-05-04 19:53+0100\n" +"POT-Creation-Date: 2010-08-31 10:08+0000\n" +"PO-Revision-Date: 2010-08-31 16:51+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,9 +25,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lleuger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1627 -#: ../midori/main.c:1635 ../midori/main.c:1651 -#: ../midori/midori-websettings.c:310 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -49,7 +50,7 @@ msgstr "El valor «%s» no és vàlid per %s" msgid "Invalid configuration value '%s'" msgstr "Valor de configuració «%s» no és vàlid" -#: ../midori/main.c:368 ../midori/main.c:441 ../extensions/formhistory.c:440 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "No s'ha pogut obrir la base de dades: %s\n" @@ -60,172 +61,186 @@ msgstr "No s'ha pogut obrir la base de dades: %s\n" msgid "Failed to remove old history items: %s\n" msgstr "No s'han pogut eliminar els elements antics de l'historial: %s\n" -#: ../midori/main.c:467 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No s'han pogut desar les adreces d'interès. %s" -#: ../midori/main.c:498 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No s'ha pogut desar la configuració: %s" -#: ../midori/main.c:536 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No es pot desar les enginys de cerca. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:556 ../midori/main.c:579 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No s'han pogut desar les escombraries. %s" -#: ../midori/main.c:638 ../midori/main.c:878 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "No s'ha pogut desar la sessió. %s" -#: ../midori/main.c:822 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "No es disposa del certificat arrel. Els certificats SSL no es poden verificar." +#: ../midori/main.c:852 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"No es disposa del certificat arrel. Els certificats SSL no es poden " +"verificar." -#: ../midori/main.c:912 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha ocorregut repetidament, proveu una de les següents opcions per a resoldre el problema." +#: ../midori/main.c:942 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Sembla que Midori ha fallat el darrer cop que s'ha executat. Si això ha " +"ocorregut repetidament, proveu una de les següents opcions per a resoldre el " +"problema." -#: ../midori/main.c:927 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Modificació de les _preferències" -#: ../midori/main.c:931 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Reiniciar la darrera _sessió" -#: ../midori/main.c:936 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Inhabilita totes les _extensions" -#: ../midori/main.c:1176 ../midori/main.c:1920 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar la sessió: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "No s'ha especificat un nom de fitxer" -#: ../midori/main.c:1317 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Ha ocorregut un error desconegut." -#: ../midori/main.c:1348 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "S'ha desat una captura a: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Executa ADREÇA com una aplicació web" -#: ../midori/main.c:1520 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ADREÇA" -#: ../midori/main.c:1523 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Empra CARPETA com a carpeta de configuració" -#: ../midori/main.c:1523 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1526 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Mostra el diàleg de diagnosis" -#: ../midori/main.c:1528 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Executa el fitxer especificat com a javascript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Fes una captura de la ubicació especificada" -#: ../midori/main.c:1534 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Executar la comanda especificada" -#: ../midori/main.c:1536 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Mostra la versió del programa" -#: ../midori/main.c:1538 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Adreces" -#: ../midori/main.c:1540 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquejar URIs segons l'expressió regular PATRÓ" -#: ../midori/main.c:1540 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "PATRÓ" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Reiniciar Midori després de SEGONS d'activitat" -#: ../midori/main.c:1544 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SEGONS" -#: ../midori/main.c:1624 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[adreces]" -#: ../midori/main.c:1652 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Envieu comentaris, suggeriments i informes d'error a:" -#: ../midori/main.c:1654 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Comprova si hi ha noves versions a:" -#: ../midori/main.c:1769 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuració especificada és invalida." -#: ../midori/main.c:1817 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Ja s'està executant una altra instància de Midori, però no respon.\n" -#: ../midori/main.c:1872 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No s'han pogut carregar els motors de cerca. %s\n" -#: ../midori/main.c:1893 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar les adreces d'interès: %s\n" -#: ../midori/main.c:1935 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No s'han pogut carregar les escombraries: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No s'ha pogut carregar l'historial: %s\n" -#: ../midori/main.c:1962 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "S'han produït els següents errors:" -#: ../midori/main.c:1978 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignora" @@ -246,800 +261,817 @@ msgstr "No es reconeix el format de l'adreça d'interès." msgid "Writing failed." msgstr "Ha fallat l'escriptura" -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:4915 -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Actualitza la pàgina actual" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Atura la càrrega d'aquesta pàgina" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% carregat" -#: ../midori/midori-browser.c:493 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "No s'ha pogut actualitzar el títol: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Acció inesperada «%s»." -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nova carpeta" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Edita la carpeta" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nova adreça d'interès" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Edita l'adreça d'interès" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Títol:" -#: ../midori/midori-browser.c:778 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripció:" -#: ../midori/midori-browser.c:797 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adreça:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4037 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:933 -#: ../midori/midori-browser.c:4042 ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Carpeta de nivell superior" -#: ../midori/midori-browser.c:871 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:884 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Mostra a la _barra d'eines" -#: ../midori/midori-browser.c:899 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Executa com una aplicació _web" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hi ha prou espai lliure per descarregat «%s»." -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Al fitxer li cal %s però només resten %s lliures." -#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4079 -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Anomena i desa" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Desa el fitxer" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2228 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" -"Per a usar l'URI que hi ha a dalt, obriu un agregador de notícies. Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o similar.\n" -"Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu agregador de notícies. El proper cop que cliqueu a la icona de les notícies, s'agregarà automàticament." +"Per a usar l'URI que hi ha a dalt, obriu un agregador de notícies. " +"Normalment hi ha un botó de \"Nova suscripció\", \"Noves notícies\" o " +"similar.\n" +"Alternativament, aneu a Preferències/Aplicacions a Midori i seleccioneu " +"agregador de notícies. El proper cop que cliqueu a la icona de les notícies, " +"s'agregarà automàticament." -#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nou canal" -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4980 -#: ../panels/midori-bookmarks.c:393 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Afegeix una adreça d'interès" -#: ../midori/midori-browser.c:3282 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No s'ha pogut executar el programa extern." -#: ../midori/midori-browser.c:3545 ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "No s'ha pogut afegir un element nou de l'historial: %s\n" -#: ../midori/midori-browser.c:3872 ../panels/midori-bookmarks.c:706 -#: ../panels/midori-history.c:685 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Obre-ho tot en _pestanyes" -#: ../midori/midori-browser.c:3879 ../panels/midori-bookmarks.c:712 -#: ../panels/midori-history.c:691 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Obre l'enllaç en una _pestanya nova" -#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:2341 -#: ../midori/midori-view.c:4019 ../panels/midori-bookmarks.c:714 -#: ../panels/midori-history.c:693 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Obre en una _finestra nova" # Nom d'un navegador web. -#: ../midori/midori-browser.c:3960 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" # Nom d'un navegador web japonès -#: ../midori/midori-browser.c:3961 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3962 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3963 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3964 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3988 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importa les adreces d'interès…" -#: ../midori/midori-browser.c:3991 ../midori/midori-browser.c:4985 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importa les adreces d'interès" -#: ../midori/midori-browser.c:4002 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Aplicació:" -#: ../midori/midori-browser.c:4029 ../midori/midori-browser.c:5098 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Personalitzat…" -#: ../midori/midori-browser.c:4090 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "No s'han pogut importar les adreces d'interès" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "No s'han pogut exportar les adreces d'interès" -#: ../midori/midori-browser.c:4181 +#: ../midori/midori-browser.c:4155 #, c-format msgid "Failed to clear history: %s\n" msgstr "No s'ha pogut buidar l'historial: %s\n" -#: ../midori/midori-browser.c:4189 +#: ../midori/midori-browser.c:4163 #, c-format msgid "Failed to clear search history: %s\n" msgstr "No s'ha pogut buidar l'historial de cerques: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4296 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Neteja les dades privades" -#: ../midori/midori-browser.c:4300 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4314 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Neteja les següents dades" -#: ../midori/midori-browser.c:4324 ../midori/midori-preferences.c:533 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 #: ../panels/midori-history.c:114 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Galetes" -#: ../midori/midori-browser.c:4334 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Galetes «Flash»" -#: ../midori/midori-browser.c:4339 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Icones de llocs webs" -#: ../midori/midori-browser.c:4344 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Pestanyes _tancades" -#: ../midori/midori-browser.c:4349 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Memòria cau Web" -#: ../midori/midori-browser.c:4357 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Neteja les dades provades al _sortir de Midori" -#: ../midori/midori-browser.c:4498 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Un navegador de pàgines web lleuger." -#: ../midori/midori-browser.c:4500 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la segons els termes de la GNU Lesser General Public License tal com està publicat per la Free Software Foundation; ja sigui a la versió 2.1, o (segons la vostra tria) versió posterior." +#: ../midori/midori-browser.c:4474 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"Aquesta llibreria és software lliure; podeu redistribuir-la i/o modificar-la " +"segons els termes de la GNU Lesser General Public License tal com està " +"publicat per la Free Software Foundation; ja sigui a la versió 2.1, o " +"(segons la vostra tria) versió posterior." -#: ../midori/midori-browser.c:4519 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Carles Muñoz Gorriz , 2009-2010.\n" "Harald Servat , 2009." -#: ../midori/midori-browser.c:4828 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Fitxer" -#: ../midori/midori-browser.c:4830 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nova _finestra" -#: ../midori/midori-browser.c:4831 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Obre una finestra nova" -#: ../midori/midori-browser.c:4834 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Obre una pestanya nova" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Navegació p_rivada" -#: ../midori/midori-browser.c:4837 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "No desar qualsevol mena de dada privada mentre es navega" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Obre un fitxer" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Desa en un fitxer" -#: ../midori/midori-browser.c:4846 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Afegeix al _marcador ràpid" -#: ../midori/midori-browser.c:4847 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Afegeix drecera al marcador ràpid" -#: ../midori/midori-browser.c:4849 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Afegeix drecera a l'_escriptori" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Afegeix drecera a l'escriptori" -#: ../midori/midori-browser.c:4852 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Subscriure's a un _canal de notícies" -#: ../midori/midori-browser.c:4853 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Subscriure's a aquest canal de notícies" -#: ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "Tan_ca la pestanya" -#: ../midori/midori-browser.c:4859 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Tanca la pestanya actual" -#: ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "_Tanca la finestra" -#: ../midori/midori-browser.c:4862 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Tanca aquesta finestra" -#: ../midori/midori-browser.c:4865 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Imprimeix la pàgina actual" -#: ../midori/midori-browser.c:4868 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Surt de l'aplicació" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Edita" -#: ../midori/midori-browser.c:4874 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Desfés la darrera modificació" -#: ../midori/midori-browser.c:4877 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Refés la darrera modifcació" -#: ../midori/midori-browser.c:4881 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Talla el text seleccionat" -#: ../midori/midori-browser.c:4884 ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Copia el text seleccionat al porta-retalls" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Enganxa el text al porta-retalls" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Suprimeix el text seleccionat" -#: ../midori/midori-browser.c:4896 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Selecciona tot el text" -#: ../midori/midori-browser.c:4899 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Cerca una paraula o frase a la pàgina" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Cerca el _següent" -#: ../midori/midori-browser.c:4902 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Cerca la següent ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Cerca l'_anterior" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Cerca l'anterior ocurrència de la paraula o frase" -#: ../midori/midori-browser.c:4909 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Canvia les preferències de l'aplicació" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Visualitza" -#: ../midori/midori-browser.c:4912 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "Barres d'e_ines" -#: ../midori/midori-browser.c:4924 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Augmenta el nivell d'ampliació" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Disminueix el nivell d'ampliació" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Reiniciar el nivell d'ampliació" -#: ../midori/midori-browser.c:4931 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Codificació" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Veure codi _font" -#: ../midori/midori-browser.c:4934 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Veure el codi font de la pàgina" -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Commuta la vista a pantalla completa" -#: ../midori/midori-browser.c:4940 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Desplaçament _esquerra" -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Desplaçar cap a l'esquerra" -#: ../midori/midori-browser.c:4943 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Desplaçament a_vall" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Desplaçar cap avall" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Desplaçament _amunt" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Desplaçar cap amunt" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Desplaçament _dreta" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Desplaçament cap a la dreta" -#: ../midori/midori-browser.c:4953 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "Vé_s" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Torna a la pàgina anterior" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Avança a la pàgina següent" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4963 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Torna al apartat anterior de la pàgina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4967 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Avança al apartat següent de la pàgina" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Va a la vostre pàgina d'inici" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Buida la paperera" -#: ../midori/midori-browser.c:4973 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Esborra tot el contingut de la paperera" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Desfés _tanca pestanya" -#: ../midori/midori-browser.c:4976 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Obre la darrera pestanya tancada" -#: ../midori/midori-browser.c:4982 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Afegeix una _carpeta" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Afegeix una carpeta d'adreces d'interès" -#: ../midori/midori-browser.c:4988 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Exporta les adreces d'interès" -#: ../midori/midori-browser.c:4991 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestiona els ginys de cerca" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Afegeix, edita o treu ginys de cerca…" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Neteja les dades privades" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Neteja les dades privades…" -#: ../midori/midori-browser.c:5000 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Inspecciona la pàgina" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." -msgstr "Inspecciona els detalls de la pàgina i accedeix a les eines per desenvolupadors…" +msgstr "" +"Inspecciona els detalls de la pàgina i accedeix a les eines per " +"desenvolupadors…" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Anterior pestanya" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Canvia a la pestanya anterior" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Següent pestanya" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Canvia a la pestanya següent" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Enfoca la pestanya _actual" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Enfoca la pestanya actual" -#: ../midori/midori-browser.c:5015 +#: ../midori/midori-browser.c:4989 msgid "Minimize _Current Tab" msgstr "Minimitza la pestanya _actual" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "Minimitza la pestanya actual" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:4992 msgid "_Duplicate Current Tab" msgstr "_Duplica la pestanya actual" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "Duplica la pestanya actual" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:4995 msgid "Close Ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:4996 msgid "Close all tabs except the current tab" msgstr "Tanca totes les pestanyes menys l'actual" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Obre la darrera _sessió" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Obre les pestanyes emmagatzemades a la darrera sessió" -#: ../midori/midori-browser.c:5027 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "A_juda" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Continguts" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Mostra la documentació" -#: ../midori/midori-browser.c:5032 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Preguntes freqüents" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Mostra les preguntes més freqüents" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "Informa d'un _error" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Obre el sistema de seguiment d'errors de Midori" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Mostra la informació sobre aquest programa" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-browser.c:5051 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Barra de _navegació" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Mostra barra de navegació" -#: ../midori/midori-browser.c:5055 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "_Quadre lateral" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Mostra el quadre lateral" -#: ../midori/midori-browser.c:5059 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Barra d'_adreces d'interès" -#: ../midori/midori-browser.c:5060 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-browser.c:5063 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "Barra de _transferències" -#: ../midori/midori-browser.c:5064 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Mostra la barra de transferències" -#: ../midori/midori-browser.c:5067 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "Barra d'_estat" -#: ../midori/midori-browser.c:5068 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-browser.c:5076 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automàtic" -#: ../midori/midori-browser.c:5079 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinese Traditional (Big5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5083 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-browser.c:5086 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Koreà (EUC-KR)" -#: ../midori/midori-browser.c:5089 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Rus (KOI8-R)" -#: ../midori/midori-browser.c:5092 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5095 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Ubicació…" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Obre una ubicació" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "Cerca _web…" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Executa una cerca web" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Reobre una pestanya o finestra prèviament tancada" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "E_ines" -#: ../midori/midori-browser.c:5696 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "Fines_tra" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Mostra una llista de totes les pestanyes obertes" -#: ../midori/midori-browser.c:5712 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6291 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Opció inesperada «%s»" -#: ../midori/midori-locationaction.c:379 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "No s'ha pogut seleccionar de l'historial\n" -#: ../midori/midori-locationaction.c:466 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Cercar %s" -#: ../midori/midori-locationaction.c:489 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Cerca amb %s" -#: ../midori/midori-locationaction.c:1196 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "No s'ha pogut executar la declaració de base de dades\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1252 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Enganxa i _procedeix" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Desenganxar el panell triat de la finestra" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Alinear el panell lateral a la dreta" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Tanca el quadre" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Alinear el panell lateral a l'esquerra" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Oculta els controls d'operació" @@ -1055,562 +1087,571 @@ msgstr "Mostra la pàgina d'inici" msgid "Show last open tabs" msgstr "Mostra les pestanyes obertes recentment" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Mostra les darreres pestanyes sense carregar-les" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japonès (Shift_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nova pestanya" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nova finestra" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Pestanya actual" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Per defecte" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Icones" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Icones petites" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Icones i text" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Text sota les icones" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automàtic (GNOME o entorn)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Sense servidor intermediari" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Totes les galetes" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Galetes de sessió" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Cap" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Recorda la mida de la darrera finestra" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Si voleu desar la mida de la finestra" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Amplada de la darrera finestra" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "L'amplada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Alçada de la darrera finestra" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "L'alçada emmagatzemada de la darrera finestra" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Posició del darrer panell" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "La posició emmagatzemada del darrer panell" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Darrera pàgina del panell" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "La darrera pàgina del panell emmagatzemada" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Darrera cerca a la Web" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "La darrera cerca a la Web emmagatzemada" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Mostra la barra de menú" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Si es mostrarà la barra de menú" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Mostra la barra de navegació" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Si es mostrarà la barra de navegació" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Si es mostra la barra d'adreces d'interès" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Mostra el quadre" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Si s'ha de mostrar el panell" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Mostra barra de fransferències" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Si es mostrarà la barra de transferències" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Mostra la barra d'estat" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Si es mostrarà la barra d'estat" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Estil de la barra d'eines:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "L'estil de la barra d'eines" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Mostrar el progrés a la caixa d'entrada de la localització" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" -msgstr "Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la localització" +msgstr "" +"Si voleu mostrar el progrés de la càrrega en la caixa d'entrada de la " +"localització" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Motors de cerca per a completar la cerca" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Si es mostraran els motors de cerca a l'hora de completar la cerca" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Elements de la barra d'eines" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Els elements que es mostraran a la barra d'eines" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Panell lateral compacte" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Si s'ha de compactar el panell lateral" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Si s'ha de mostrar els controls d'operació del panell" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "La barra d'estat està a la dreta" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Si s'ha d'alinear el panell lateral a la dreta" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Obre els quadres en finestres separades" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Si s'ha d'obrir els quadres en finestres separades" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Quan Midori s'inicia:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Què fer quan Midori s'iniciï" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Pàgina d'inici:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "La pàgina d'inici" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Mostra el diàleg de fallades" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Mostra un diàleg quan Midori falli" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Mostrar el marcador ràpid a les noves pestanyes" -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar el marcatge ràpid a les noves pestanyes obertes" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Desar els fitxers descarregats a:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "El directori on s'emmagatzemaran els fitxers descarregats" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Demanar per la carpeta destí" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Si cal demanar una carpeta destí quan es descarregui un fitxer" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Informa quan una transferència hagi finalitzat" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si es mostra una notificació quan acabi una transferència" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Gestor de descàrregues" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Un gestor de descàrregues extern" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Editor de text" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Un editor de text extern" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Acumulador de notícies" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Un acumulador de notícies extern" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Ubicació que s'ha de cercar" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "La cerca a executar dins l'entrada de la localització" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "La codificació preferida" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Codificació de caràcters preferida" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Mostra sempre la barra d'eines" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Mostra sempre la barra des pestanyes " -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Mostra el botó de tancar a les pestanyes" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Si les pestanyes tenen botó de tancar" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Obre les noves pàgines a:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "On s'han d'obrir les pàgines noves" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Obre pàgines externes a:" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "On s'obren de forma externa les pàgines obertes" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Fer clic al botó central del ratolí obre la selecció" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" -msgstr "Carregar una adreça des de la selecció mitjançant el botó central del ratolí" +msgstr "" +"Carregar una adreça des de la selecció mitjançant el botó central del ratolí" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Obre pestanyes al fons" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Si s'ha d'obrir pestanyes al fons" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Obre les pestanyes al costat de l'actual" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" +msgstr "" +"Si obrir les noves pestanyes al costat de la pestanya actual o de l'última" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Obre els missatges emergents en pestanyes" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Si s'han d'obrir els missatges emergents dins pestanyes" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carrega les imatges automàticament" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Carrega i mostra les imatges automàticament" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilita els scripts" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Habilita els llenguatges d'script incrustats" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilita els connectors de netscape" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Activar els objectes de connexió integrats de Netscape" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Habilita la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Si s'habilitat la compatibilitat amb bases de dades HTML5" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Si s'habilita l'emmagatzematge local HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Si s'habilita la memòria cau d'aplicació de fora de línia" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Ampliar text i imatges" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Si s'han d'ampliar text i imatges" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Buscar en línia mentre s'escriu" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Si es buscarà automàticament a mesura que s'escriu" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Desplaçament cinètic" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" +msgstr "" +"Si el desplaçament hauria de moure's de forma cinètica segons la velocitat" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Accepta galetes" -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Quins tipus de galetes s'accepten" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Edat màxima de la galeta" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "El nombre màxim de dies que es guardaran les galetes" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Edat màxima de l'historial" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Caducitat de l'historial" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Recordar els darrers fitxers descarregats" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Si els darrers fitxers descarregats s'han d'emmagatzemar" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Servidor intermediari" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Tipus de servidor intermediari a fer servir" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Servidor intermediari de HTTP" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "El servidor proxy usat per a les connexions HTTP" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Identifica'l com a" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Què identificar com a pàgines web" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Cadena de caràcters d'identificació" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "La cadena d'identificació d'aplicacions" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Idiomes preferits" -#: ../midori/midori-websettings.c:1072 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Un llistat separat per comes d'idiomes preferits per mostrar pàgines web multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" +#: ../midori/midori-websettings.c:1074 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Un llistat separat per comes d'idiomes preferits per mostrar pàgines web " +"multi-idioma, per exemple «ca», «ca,es» o «en-us;q=1.0, fr-fr;q=0.667»" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Esborrar dades privades" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "La selecció de dades privades per a esborrar" @@ -1618,237 +1659,239 @@ msgstr "La selecció de dades privades per a esborrar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1231 ../midori/midori-view.c:4476 -#: ../midori/midori-view.c:4480 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1232 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No s'ha pogut carregar la pàgina «%s»." -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Torneu-ho a provar" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1253 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "No s'ha trobat «%s»" -#: ../midori/midori-view.c:1437 ../midori/midori-view.c:2282 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Enviar un missatge a %s" -#: ../midori/midori-view.c:2064 ../midori/midori-view.c:2449 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspecciona l'_element" -#: ../midori/midori-view.c:2116 ../midori/midori-view.c:2186 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Obre l'enllaç en una nova _pestanya" -#: ../midori/midori-view.c:2120 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Obre l'enllaç en una nova pestanya en primer _pla" -#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Obre l'enllaç en una nova pestanya _no activa" -#: ../midori/midori-view.c:2124 ../midori/midori-view.c:2193 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Obre l'enllaç a una nova _finestra" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Obre l'enllaç com si fos una _aplicació web" -#: ../midori/midori-view.c:2130 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "_Copia la destinació de l'enllaç" -#: ../midori/midori-view.c:2133 ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "De_sa el destí de l'enllaç" -#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2199 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Descarrega el destí de l'enllaç" -#: ../midori/midori-view.c:2138 ../midori/midori-view.c:2168 -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Descarrega amb el _gestor de descàrregues" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Obre la _imatge en una nova pestanya" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Copia l'_adreça de la imatge" -#: ../midori/midori-view.c:2153 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Desa la i_matge" -#: ../midori/midori-view.c:2154 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Descarrega la i_matge" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Copia l'_adreça del vídeo" -#: ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Desa el _vídeo" -#: ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Descarrega el _vídeo" -#: ../midori/midori-view.c:2227 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Cerca _amb" -#: ../midori/midori-view.c:2262 ../midori/midori-view.c:2269 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Cerca la Web" -#: ../midori/midori-view.c:2290 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Obre l'adreça en una nova _pestanya" -#: ../midori/midori-view.c:2594 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Obre o descarrega el fitxer" -#: ../midori/midori-view.c:2613 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tipus de fitxer: «%s»" -#: ../midori/midori-view.c:2616 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipus de fitxer: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2620 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Obre %s" -#: ../midori/midori-view.c:3164 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Inspecciona la pàgina «%s»" -#: ../midori/midori-view.c:3444 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Marcador ràpid" -#: ../midori/midori-view.c:3445 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Feu clic per a afegir una drecera" -#: ../midori/midori-view.c:3446 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Introduïu l'adreça de la drecera" -#: ../midori/midori-view.c:3447 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Introduïu un títol per a la drecera" -#: ../midori/midori-view.c:3448 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Esteu segur d'esborrar aquesta drecera?" -#: ../midori/midori-view.c:3449 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Estableix el nombre de columnes i files" -#: ../midori/midori-view.c:3450 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Introduïu el nombre de columnes i files:" -#: ../midori/midori-view.c:3451 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "L'entrada no és vàlida per al tamany de la marcació ràpida" -#: ../midori/midori-view.c:3452 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Tamany de la miniatura:" -#: ../midori/midori-view.c:3453 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Petit" -#: ../midori/midori-view.c:3454 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Mitjà" -#: ../midori/midori-view.c:3455 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Gran" -#: ../midori/midori-view.c:3481 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "El document no es pot mostrar" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "No s'ha instaŀlat la documentació" -#: ../midori/midori-view.c:3623 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "S'ha retardat la càrrega de la pàgina" -#: ../midori/midori-view.c:3624 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "S'ha retardat la càrrega degut a una fallada recent o a les preferències d'inici." +msgstr "" +"S'ha retardat la càrrega degut a una fallada recent o a les preferències " +"d'inici." -#: ../midori/midori-view.c:3625 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Carregar pàgina" -#: ../midori/midori-view.c:3769 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Pàgina en blanc" -#: ../midori/midori-view.c:4023 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Duplica la pestanya" -#: ../midori/midori-view.c:4028 -msgid "_Restore Tab" -msgstr "_Restaura la pestanya" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Mostra la _etiqueta a la pestanya" -#: ../midori/midori-view.c:4028 -msgid "_Minimize Tab" -msgstr "_Minimitza la pestanya" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Mostra només _icones a les pestanyes" -#: ../midori/midori-view.c:4034 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Tanca la _resta de pestanyes" -#: ../midori/midori-view.c:4713 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Imprimeix les imatges de fons" -#: ../midori/midori-view.c:4714 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Si s'han d'imprimir les imatges de fons" -#: ../midori/midori-view.c:4766 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Característiques" @@ -1949,8 +1992,12 @@ msgstr "Diccionaris:" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Una llista d'idiomes separats per coma que seran usats per a la correcció ortogràfica, per exemple \"ca_ES,en_GB,de_DE\"" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Una llista d'idiomes separats per coma que seran usats per a la correcció " +"ortogràfica, per exemple \"ca_ES,en_GB,de_DE\"" #. Page "Interface" #: ../midori/midori-preferences.c:438 @@ -2028,51 +2075,51 @@ msgstr "Gestiona els ginys de cerca" msgid "Use as _default" msgstr "Empra'l per _defecte" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Adreça d'interès" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Afegeix adreça d'_interès" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Pàgina d'inici" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "Scripts d'_usuari" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nova _pestanya" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Transferències" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "_Connectors de Netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nova _carpeta" @@ -2101,7 +2148,7 @@ msgstr "Ressalta les coincidències" msgid "Close Findbar" msgstr "Tanca la barra de cerques" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s de %s" @@ -2115,7 +2162,7 @@ msgstr "S'ha descarregat el fitxer «%s»." msgid "Transfer completed" msgstr "Transferència finalitzada" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Netejar-ho tot" @@ -2135,30 +2182,24 @@ msgstr "Les transferències es cancel·laran si se surt de Midori." msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../panels/midori-bookmarks.c:245 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "No s'ha pogut afegir un ítem a les adreces d'interès: %s\n" -#: ../panels/midori-bookmarks.c:277 ../panels/midori-history.c:169 -#: ../panels/midori-history.c:199 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "No s'ha pogut eliminar un element de l'historial: %s\n" - -#: ../panels/midori-bookmarks.c:401 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Edita l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:409 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Suprimeix l'adreça d'interès seleccionada" -#: ../panels/midori-bookmarks.c:423 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Afegeix una carpeta nova" -#: ../panels/midori-bookmarks.c:553 ../panels/midori-history.c:520 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Separador" @@ -2213,11 +2254,11 @@ msgstr "Esborra l'element de l'historial seleccionat" msgid "Clear the entire history" msgstr "Buida l'historial" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "_Obre la carpeta destí" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copia la _localització de l'enllaç" @@ -2259,16 +2300,17 @@ msgstr "La icona «%s» no s'ha pogut carregar" msgid "Animation frames are broken" msgstr "Els marcs d'animació no funcionen correctament" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propietat «%s» no és vàlida per a %s" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Seleccioneu fitxer" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Seleccioneu carpeta" @@ -2283,8 +2325,12 @@ msgstr "Configura els filtres de publicitat" #: ../extensions/adblock.c:447 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Escriu l'adreça d'una llista de filtres preconfigurada a l'entrada de text i " +"premeu \"Afegir\" per a afegir-ho a la llista. Podeu trobar més llistes a %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2314,34 +2360,52 @@ msgstr "Bloqueig de publicitat" msgid "Block advertisements according to a filter list" msgstr "Bloca els anuncis publicitaris segons una llista de filtres" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copia «%s» a la carpeta «%s»." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:377 msgid "Userscripts" msgstr "Scripts d'usuari" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:379 msgid "Userstyles" msgstr "Estils d'usuari" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Error" + +#: ../extensions/addons.c:231 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Voleu eliminar «%s»?" + +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Suprimeix l'script d'usuari" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Suprimeix l'estil d'usuari" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "El fitxer «%s» s'esborrarà de forma permanent." + +#: ../extensions/addons.c:1299 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "No s'ha pogut desar la configuració de l'extensió «%s»: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 msgid "User addons" msgstr "Afegitons de l'usuari" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1422 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "No es pot seguir la pista de la carpeta «%s»: %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1466 msgid "Support for userscripts and userstyles" msgstr "Adment l'ús d'scripts i estils d'usuari" @@ -2363,8 +2427,12 @@ msgid "Delete All" msgstr "Suprimeix-ho tot" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Esborra totes les galetes mostrades. Si hi ha un filtre establert, només aquelles galetes que coincideixin amb el filtre s'esborraran." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Esborra totes les galetes mostrades. Si hi ha un filtre establert, només " +"aquelles galetes que coincideixin amb el filtre s'esborraran." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2441,8 +2509,12 @@ msgid "Filter:" msgstr "Filtre:" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que coincideixi amb el filtre" +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Introduïu un filtre per a mostrar aquelles galetes amb nom o domini que " +"coincideixi amb el filtre" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2454,7 +2526,7 @@ msgstr "Llista, mostra i borra galetes" #: ../extensions/copy-tabs.c:39 msgid "Copy Tab _Addresses" -msgstr "Copia les adreces de les pestanyes" +msgstr "Copia _adreces de les pestanyes" #: ../extensions/copy-tabs.c:98 msgid "Copy Addresses of Tabs" @@ -2534,10 +2606,6 @@ msgstr "No s'ha pogut trobar els elements RSS \"item\" en les dades XML." msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "No s'ha pogut trobar els elements RSS \"channel\" en les dades XML." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Error" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2548,11 +2616,11 @@ msgstr "El canal «%s» ja existeix." msgid "Error loading feed '%s'" msgstr "Error en carregar el canal «%s»" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Quadre de canals" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Llegeix canals Atom/RSS" @@ -2605,7 +2673,8 @@ msgstr "Llista de l'historial" #: ../extensions/history-list.vala:246 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" +msgstr "" +"Permet canviar de pestanya triant-la d'una llista ordenada pel darrer ús" #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" @@ -2672,33 +2741,37 @@ msgstr "Característiques de la la barra d'estat" msgid "Easily toggle features on web pages on and off" msgstr "Activa o desactiva fàcilment funcionalitats en planes web" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Quadre de pestanyes" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "Quadre de _pestanyes" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Mostra les pestanyes en un quadre vertical" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "_Minimitza les noves pestanyes" +msgid "Only Icons on Tabs by default" +msgstr "Per defecte només icones a les pestanyes" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Les noves pestanyes s'obren minimitzades" +msgid "New tabs have no label by default" +msgstr "Les noves pestanyes no tenen etiqueta per defecte" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "_Personalitza la barra d'eines" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Selecciona els elements mostrats a la barra d'eines. Els elements poden ser ordenats arrossegant-los." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"Selecciona els elements mostrats a la barra d'eines. Els elements poden ser " +"ordenats arrossegant-los." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2724,6 +2797,21 @@ msgstr "Edita fàcilment la distribució de la barra d'eines" msgid "Cache HTTP communication on disk" msgstr "Empra el disc com a memòria cau de comunicacions HTTP" +#~ msgid "_Restore Tab" +#~ msgstr "_Restaura la pestanya" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimitza la pestanya" + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copia «%s» a la carpeta «%s»." + +#~ msgid "Minimize new Tabs" +#~ msgstr "_Minimitza les noves pestanyes" + +#~ msgid "New tabs open minimized" +#~ msgstr "Les noves pestanyes s'obren minimitzades" + #~ msgid "_Recently visited pages" #~ msgstr "Pàgines visitades _recentment" @@ -2748,13 +2836,16 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP" #~ msgid "Detect proxy server automatically" #~ msgstr "Detecta automàticament el servidor intermediari" -#~ msgid "Whether to detect the proxy server automatically from the environment" -#~ msgstr "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "" +#~ "Si s'ha de detectar el servidor proxy automàticament des de l'entorn" #~ msgid "Erroneous clock time" #~ msgstr "Rellotge erroni" -#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." #~ msgstr "El rellotge menteix. Si us plau, comproveu la data i hora actual." #~ msgid "Set number of shortcuts" @@ -2763,8 +2854,11 @@ msgstr "Empra el disc com a memòria cau de comunicacions HTTP" #~ msgid "Enter number of shortcuts:" #~ msgstr "Introduïeu el nombre de dreceres:" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a la carpeta %s." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copia els guions d'usuari a la carpeta %s i copia els estils d'usuari a " +#~ "la carpeta %s." #~ msgid "Open _Link" #~ msgstr "Obre l'_enllaç" From 60d8bca6e0b010802872ed6572e85bd304dd81ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20S=C3=A1nchez=20Reinosa?= Date: Tue, 31 Aug 2010 19:22:19 +0200 Subject: [PATCH 2919/2970] l10n: Updated Spanish (Castilian) (es) translation to 96% New status: 623 messages complete with 20 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/es.po | 1616 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 847 insertions(+), 769 deletions(-) diff --git a/po/es.po b/po/es.po index 113a219e..f08df2d3 100644 --- a/po/es.po +++ b/po/es.po @@ -7,12 +7,12 @@ # Elega 2009 # Guillermo Iguarán 2009 # Abel Martín 2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-04 04:08+0000\n" +"POT-Creation-Date: 2010-08-31 16:08+0000\n" "PO-Revision-Date: 2010-06-04 10:22+0100\n" "Last-Translator: Abel Martín \n" "Language-Team: GALPon MiniNo \n" @@ -25,12 +25,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web ligero" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1353 -#: ../midori/main.c:1683 -#: ../midori/main.c:1691 -#: ../midori/main.c:1707 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -38,362 +35,322 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor '%s' no es válido para %s" -#: ../midori/main.c:158 -#: ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración inválido '%s'" -#: ../midori/main.c:370 -#: ../extensions/formhistory.c:446 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Fallo al abrir la base de datos: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Fallo al quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:457 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 #, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "No se pudo guardar la configuración. %s" +msgid "Failed to remove history item: %s\n" +msgstr "No se han podido quitar los elementos del historial: %s\n" -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "No se pudieron guardar los motores de búsqueda. %s" - -#: ../midori/main.c:514 -#: ../midori/main.c:564 -#: ../midori/main.c:584 +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" +#: ../midori/main.c:528 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "No se pudo guardar la configuración. %s" + +#: ../midori/main.c:566 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "No se pudieron guardar los motores de búsqueda. %s" + #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 -#: ../midori/main.c:637 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:696 -#: ../midori/main.c:936 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "No hay ningún archivo de cerficado raíz disponible. Los certificados SSL no se pueden verificar." -#: ../midori/main.c:970 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." -#: ../midori/main.c:985 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:989 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Restaurar la última _sesión" -#: ../midori/main.c:994 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Deshabilitar todas las _extensiones" -#: ../midori/main.c:1229 -#: ../midori/main.c:1956 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "No se especificó el nombre del archivo" -#: ../midori/main.c:1372 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." -#: ../midori/main.c:1403 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura guardada en: %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Ejecutar DIRECCIÓN como una aplicación web" -#: ../midori/main.c:1575 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "DIRECCIÓN" -#: ../midori/main.c:1578 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Utilizar CARPETA como carpeta de configuración" -#: ../midori/main.c:1578 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "CARPETA" -#: ../midori/main.c:1581 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Mostrar diálogo de diagnóstico" -#: ../midori/main.c:1583 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Ejecute el nombre de archivo especificado como javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Tomar una captura de la URL especificada" -#: ../midori/main.c:1589 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Ejecutar el comando especificado" -#: ../midori/main.c:1591 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:1593 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:1595 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear URIs según PATRÓN de expresión regular" -#: ../midori/main.c:1595 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restablecer Midori después de SEGUNDOS segundos de inactividad" -#: ../midori/main.c:1599 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1680 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:1710 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:1807 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "La carpeta de configuración especificada no es válida." -#: ../midori/main.c:1855 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No se pudieron cargar los motores de búsqueda. %s\n" -#: ../midori/main.c:1939 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +#: ../midori/main.c:1925 +#, fuzzy, c-format +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "No se pudieron cargar los marcadores: %s\n" -#: ../midori/main.c:1971 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:1985 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:2015 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Archivo no encontrado." -#: ../midori/midori-array.c:462 -#: ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Documento defectuoso." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Formato de marcador no reconocido." -#: ../midori/midori-array.c:718 -#: ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/midori-browser.c:334 -#: ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:344 -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Detener la carga de la página actual" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% cargado" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Fallo al actualizar el título: %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada '%s'." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nueva carpeta" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Editar carpeta" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:772 -#: ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-browser.c:791 -#: ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Dirección:" -#: ../midori/midori-browser.c:821 -#: ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:831 -#: ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 -#: ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Añadir a marcación _rápida" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Mostrar en la _barra de herramientas" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Ejecutar como aplicación _web" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "No hay suficiente espacio para descargar \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "El archivo necesita %s pero solo quedan %s libres." -#: ../midori/midori-browser.c:1045 -#: ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1418 -#: ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "El archivo '%s' ha sido descargado." - -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "Transferencia completa" - -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Guardar archivo" -#: ../midori/midori-browser.c:1915 -#: ../midori/midori-browser.c:1917 -msgid "Some files are being downloaded" -msgstr "Se está descargando algunos archivos" - -#: ../midori/midori-browser.c:1921 -msgid "_Quit Midori" -msgstr "_Cerrar Midori" - -#: ../midori/midori-browser.c:1923 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Se cancelarán las descargas si Midori se cierra." - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -401,175 +358,149 @@ msgstr "" "La URI de arriba abre un nuevo canal de noticias. Normalmente hay un botón \"Nueva subscripción\", \"Nuevo canal de noticias\" o similar.\n" "Alternativamente vaya a Preferencias, Aplicaciones en Midori y elija Canal de noticias. La próxima vez que haga clic en un icono de canal de noticias se añadirá automáticamente." -#: ../midori/midori-browser.c:2468 -#: ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nuevo canal" -#: ../midori/midori-browser.c:2511 -#: ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3084 -#: ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" - -#: ../midori/midori-browser.c:3164 -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vacío" - -#: ../midori/midori-browser.c:3785 -#: ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 -#: ../midori/sokoke.c:436 -#: ../midori/sokoke.c:462 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." -#: ../midori/midori-browser.c:4099 -#: ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n" -#: ../midori/midori-browser.c:4432 -#: ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Abrir todo en _pestañas" -#: ../midori/midori-browser.c:4439 -#: ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 -#: ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:4442 -#: ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 -#: ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4693 -#: ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Aplicación:" -#: ../midori/midori-browser.c:4731 -#: ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:228 -#: ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Fallo al importar marcadores" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Fallo al exportar marcadores" -#: ../midori/midori-browser.c:4895 -#: ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 -#, c-format -msgid "Failed to remove history item: %s\n" +#: ../midori/midori-browser.c:4155 +#, fuzzy, c-format +msgid "Failed to clear history: %s\n" msgstr "No se han podido quitar los elementos del historial: %s\n" +#: ../midori/midori-browser.c:4163 +#, fuzzy, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Fallo al insertar un nuevo elemento en el historial: %s\n" + #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Borrar los siguientes datos:" -#: ../midori/midori-browser.c:5031 -#: ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Íconos de sitios web" -#: ../midori/midori-browser.c:5052 -#: ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "_Pestañas cerradas" -#: ../midori/midori-browser.c:5057 -#: ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Caché web" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Borrar datos privados al _salir de Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Un navegador web ligero" -#: ../midori/midori-browser.c:5168 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Esta librería es software libre; puede redistribuirla y/o modificarla bajo los términos de la Licencia Pública General Reducida GNU tal y como es publicada por la Free Software Foundation; bien versión 2.1 de la licencia o (según su criterio) cualquier versión posterior." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -579,1180 +510,1122 @@ msgstr "" "Guillermo Iguarán \n" "Abel Martín " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:5498 -#: ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nueva _ventana" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "_Navegación privada" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "No guardar datos durante la navegación privada" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Añadir a marcación rápida" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Añadir acceso directo a marcación rápida" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Añadir acceso directo en el _escritorio" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Añadir acceso directo en el escritorio" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Suscribirse a _canal de noticias" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Suscribirse a este canal de noticias" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Cerrar ésta ventana" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Deshacer la última modificación" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Rehacer la última modificación" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:5552 -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Pegar texto del portapapeles" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar la siguiente aparición de una palabra o una frase" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar la anterior aparición de una palabra o una frase" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Ver el código fuente de la página" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Desplazar hacia la _izquierda" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Desplazar hacia la izquierda" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Desplazar hacia a_bajo" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Desplazar hacia abajo" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Desplazar hacia a_rriba" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Desplazar hacia arriba" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Desplazar hacia la _derecha" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Desplazar hacia la derecha" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Retroceder una página" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Avanzar una página" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Ir a la sub-página anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Ir a la sub-página siguiente" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Abrir página de inicio" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Des_hacer el cierre de pestaña" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Abrir la última pestaña cerrada" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Añadir una nueva _carpeta" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Exportar marcadores" -#: ../midori/midori-browser.c:5659 -#: ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Administrar motores de búsqueda" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar y quitar motores de búsqueda..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Inspeccionar página" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar detalles de página y acceder a herramientas de desarrollo..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Pestaña anterior" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Pestaña siguiente" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Foco en la pestaña a_ctual" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Foco en la pestaña actual" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:4989 +#, fuzzy +msgid "Minimize _Current Tab" +msgstr "_Minimizar pestaña" + +#: ../midori/midori-browser.c:4990 +#, fuzzy +msgid "Minimize the current tab" +msgstr "Cerrar la pestaña actual" + +#: ../midori/midori-browser.c:4992 +#, fuzzy +msgid "_Duplicate Current Tab" +msgstr "_Duplicar pestaña" + +#: ../midori/midori-browser.c:4993 +#, fuzzy +msgid "Duplicate the current tab" +msgstr "Cerrar la pestaña actual" + +#: ../midori/midori-browser.c:4995 +#, fuzzy +msgid "Close Ot_her Tabs" +msgstr "Cerrar las o_tras pestañas" + +#: ../midori/midori-browser.c:4996 +#, fuzzy +msgid "Close all tabs except the current tab" +msgstr "Cerrar la pestaña actual" + +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Abrir la última _sesión" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Abrir las pestañas guardadas en la última sesión" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "_Reportar un error" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Abrir el rastreador de errores de Midori" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Mostrar información sobre el programa" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "_Barra de menú" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Mostrar la barra de menú" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "_Barra de navegación" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "_Barra de transferencias" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "_Barra de estado" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5738 -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chino (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japonés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Koreano (EUC-KR)" -#: ../midori/midori-browser.c:5748 -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5751 -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Abrir una dirección en particular" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "_Buscar en la web..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Realizar una búsqueda en la web" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:6371 -msgid "_Recently visited pages" -msgstr "_Últimas páginas visitadas" - -#: ../midori/midori-browser.c:6373 -msgid "Reopen pages that you visited earlier" -msgstr "Abre las páginas que usted visitó anteriormente" - -#: ../midori/midori-browser.c:6388 -#: ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/midori-browser.c:6390 -msgid "Show the saved bookmarks" -msgstr "Mostrar los marcadores guardados." - -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Ventanas" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pestañas abiertas" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "_Menú" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "_Buscar:" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "Anterior" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "Siguiente" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "Coincidir mayúsculas " - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "Destacar coincidencias" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "Cerrar la barra de búsqueda" - -#: ../midori/midori-browser.c:6748 -#: ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Limpiar todo" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Fallo al seleccionar del historial\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Buscar %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Buscar con %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Fallo al ejecutar sentencia de base de datos\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Pegar y c_ontinuar" -#: ../midori/midori-panel.c:432 -#: ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Separar el panel elegido de la ventana" -#: ../midori/midori-panel.c:444 -#: ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 -#: ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-panel.c:456 -#: ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-panel.c:640 -#: ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Alinear el panel a la izquierda" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Ocultar _controles de operación" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Mostrar página en blanco" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Mostar página de inicio" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Mostrar las últimas pestañas abiertas" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Mostrar las últimas etiquetas sin cargar" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japonés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Íconos" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Iconos pequeños" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Iconos y texto" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Texto al lado de los íconos" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME o entorno)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Sin servidor proxy" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Todas las cookies" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Cookies de la sesión" -#: ../midori/midori-websettings.c:299 -#: ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Ninguna" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Última búsqueda web" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Última búsqueda web guardada" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Si se desea mostrar la barra de menú" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Si se desea mostrar la barra de navegación" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Si se desea mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Si se desea mostrar el panel" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Si se desea mostrar la barra de transferencias" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Si se desea mostrar la barra de estado" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Estilo de la barra de tareas:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Mostrar progreso en la barra de direcciones" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Motores de búsqueda en completamiento" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Mostrar los controles de operación en el panel" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Si se desea mostrar los controles de operación en el panel" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Alinear el panel a la derecha" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Alinear el panel lateral a la derecha" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Abrir paneles en ventanas separadas" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Configura si los paneles se abren en ventanas separadas" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Cuando Midori inicia:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Qué hacer al inicio de Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Página de inicio:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Mostrar diálogo de cuelgue" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un dialogo despues de que Midori se cuelgue" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Mostrar marcación rápida en nuevas pestañas" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar marcación rápida en la pestaña abierta recientemente" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Guardar los archivos descargados en:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Preguntar por la carpeta de destino" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Si se desea seleccionar la carpeta de destino cuando se descarga un archivo" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Notificarme sobre las transferencias completas" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Si se desea mostrar una notificación cuando se ha completado la transferencia" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Gestor de descargas externo" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Editor de textos externo" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Agregador de noticias" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Un agregador de noticias externo" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Abrir las páginas nuevas en:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Donde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Abrir las páginas externas en:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Donde abrir las páginas externas" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Clic del medio abre la selección" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:852 -#: ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Cargar y mostrar imágenes automáticamente" -#: ../midori/midori-websettings.c:860 -#: ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Habilitar script de lenguajes embebidos" -#: ../midori/midori-websettings.c:868 -#: ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilitar complementos Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Habilitar el complemento de objetos embebidos Netscape" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Activar soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Configura si se activa el soporte de base de datos de HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Activar soporte de almacenamiento local HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Configura si se activa el soporte de almacenamiento local de HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Activar caché local de aplicación web" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Configura si se activa el caché local de aplicación web" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Ampliar textos e imágenes" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Si se desea ampliar texto e imágenes" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Buscar en el texto al escribir" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Si se desea buscar automáticamente en el texto al comenzar a escribir" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Desplazamiento dinámico" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Configura si el desplazamiento debe realizarse de forma acorde a la velocidad" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Aceptar cookies" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Qué tipos de cookies son aceptadas" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Sólo cookies originales" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Sólo se aceptan las cookies del sitio web original" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Duración máxima de las cookies" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de días para conservar las cookies" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Recordar las últimas páginas visitadas" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Si se desea que las últimas páginas visitadas sean recordadas" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Duración máxima del historial" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Recordar los últimos archivos descargados" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Si se desea que los archivos descargados sean recordados" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "El tipo de servidor a usar" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy utilizado para conexiones HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Detectar automáticamente el servidor proxy" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Si se desea detectar automáticamente el servidor proxy del entorno" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Identificar como:" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Identificar como páginas web" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Cadena de identificación" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Aplicación de identificación de cadenas" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Una lista separada por comas de idioma preferidos para procesar páginas multi-idiomas, como por ejemplo \"de\", \"ru,nl\" o \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Borrar datos privados" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Los datos privados seleccionados para su eliminación" @@ -1760,398 +1633,389 @@ msgstr "Los datos privados seleccionados para su eliminación" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 -#: ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Error - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "No se pudo cargar la página '%s'." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Inténtelo de nuevo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "No se ha encontrado - %s" -#: ../midori/midori-view.c:1520 -#: ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Enviar un mensaje a %s" -#: ../midori/midori-view.c:2139 -#: ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2191 -#: ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Abrir enlace en pestaña en _primer plano" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Abrir enlace en pestaña en _segundo plano" -#: ../midori/midori-view.c:2199 -#: ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Abrir enlace como a_plicación web" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Copiar de_stino del enlace" -#: ../midori/midori-view.c:2208 -#: ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Guardar enlace" -#: ../midori/midori-view.c:2209 -#: ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Descargar enlace" -#: ../midori/midori-view.c:2213 -#: ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Descargar con el _gestor de descargas" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Abrir _imagen en nueva pestaña" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Copiar _dirección de imagen" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Guardar i_magen" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Descargar i_magen" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Copiar _dirección de vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Guardar _vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Descargar _vídeo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Buscar _con" -#: ../midori/midori-view.c:2337 -#: ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Buscar en la web" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Abrir o descargar archivo" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tipo de archivo: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de archivo: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Haga clic aquí para añadir un acceso directo" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Introduzca la dirección del acceso directo" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Introduzca el título del acceso directo" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "¿Está seguro que desea eliminar este acceso directo?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Establecer el número de columnas y filas" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Introduzca el número de columnas y filas:" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Valores no válidos para el tamaño de la marcación rápida" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Tamaño de miniatura:" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Pequeño" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Medio" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Grande" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "El documento no puede ser mostrado" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "No hay documentación instalada" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Carga de página retrasada" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "La carga se ha retrasado debido a un cuelgue reciente o a las preferencias de inicio" -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Cargar página" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Duplicar pestaña" -#: ../midori/midori-view.c:4105 -msgid "_Restore Tab" -msgstr "_Restaurar pestaña" +#: ../midori/midori-view.c:4023 +#, fuzzy +msgid "Show Tab _Label" +msgstr "Mostrar el panel" -#: ../midori/midori-view.c:4105 -msgid "_Minimize Tab" -msgstr "_Minimizar pestaña" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Mostrar sólo el _icono del panel" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Cerrar las o_tras pestañas" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Si se deberían imprimir las imágenes de fondo" -#: ../midori/midori-view.c:4836 -#: ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Características" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:314 -#: ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Usar la página actual como página de inicio" -#: ../midori/midori-preferences.c:331 -#: ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferencias" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Apariencia" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Configuración de tipo de letra" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Tipo de letra predeterminado" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Tamaño de letra predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Tipo de letra de ancho fijo" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Tipo de letra utilizado para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "Tamaño de letra utilizado para mostrar el texto de ancho fijo" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Tamaño mínimo de fuente" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Mínimo tamaño de fuente utilizado para mostrar texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Aplicar 96 puntos por pulgada" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Aplicar densidad de puntos de video de 96 DPI" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Permitir ventanas emergentes de scripts" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Configura si se permite que los scripts puedan abrir ventanas emergentes automáticamente" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Corrector ortográfico" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Habilitar corrección ortográfica" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Habilitar corrección ortográfica mientras se escribe" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Diccionarios ortográficos:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Lista de idiomas separados con comas que se utilizarán para la corrección ortográfica, por ejemplo \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navegación" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Aplicaciones" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Aplicaciones externas" #. Page "Network" -#: ../midori/midori-preferences.c:485 -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Nombre de host" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Privacidad" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Cookies web" -#: ../midori/midori-preferences.c:521 -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "días" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Vacío" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Añadir motor de búsqueda" @@ -2180,67 +2044,131 @@ msgstr "Administrar los motores de búsqueda" msgid "Use as _default" msgstr "_Predeterminado" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Añadir _marcadores" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Extensiones" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Página de inicio" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nueva _pestaña" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "C_omplementos de Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nueva _carpeta" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Buscar:" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Anterior" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Siguiente" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Coincidir mayúsculas " + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Destacar coincidencias" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Cerrar la barra de búsqueda" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "El archivo '%s' ha sido descargado." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Transferencia completa" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "Limpiar todo" + +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "Se está descargando algunos archivos" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "_Cerrar Midori" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Se cancelarán las descargas si Midori se cierra." + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:275 +#, fuzzy, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Fallo al añadir valor de formulario: %s\n" + +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Añadir una nueva carpeta" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Separador" @@ -2260,59 +2188,46 @@ msgstr "Copiar todo" msgid "Extensions" msgstr "Extensiones" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Hora del reloj errónea" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "La hora del reloj está en el pasado. Por favor, compruebe la fecha y la hora." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Hace una semana" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Hace %d día" msgstr[1] "Hace %d días" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Hoy" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Ayer" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "¿Está seguro de que desea borrar todos los elementos del historial?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Añadir a marcadores el elemento seleccionado del historial" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Borrar el elemento seleccionado del historial" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Vaciar todo el historial" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtro:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Abrir la _carpeta de destino" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copiar destino del _enlace" @@ -2354,18 +2269,17 @@ msgstr "No se pudo cargar el ícono stock «%s»" msgid "Animation frames are broken" msgstr "Los cuadros de animación están rotos" -#: ../katze/katze-utils.c:498 -#: ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:544 -#: ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Elegir archivo" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Elegir carpeta" @@ -2403,43 +2317,62 @@ msgstr "Bl_oquear imagen" msgid "Bl_ock link" msgstr "Bl_oquear enlace" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Bloqueador de publicidad" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidad de acuerdo a una lista de filtros" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copiar %s a la carpeta %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:377 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:379 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Error" + +#: ../extensions/addons.c:231 +#, fuzzy, c-format +msgid "Do you want to delete '%s'?" +msgstr "¿Está seguro que desea eliminar todas las cookies?" + +#: ../extensions/addons.c:237 +#, fuzzy +msgid "Delete user script" +msgstr "Scripts de usuario" + +#: ../extensions/addons.c:238 +#, fuzzy +msgid "Delete user style" +msgstr "Eliminar canal" + +#: ../extensions/addons.c:242 +#, fuzzy, c-format +msgid "The file %s will be permanently deleted." +msgstr "El archivo '%s' ha sido descargado." + +#: ../extensions/addons.c:1299 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "No se pudo guardar la configuración de la extensión '%s': %s\n" -#: ../extensions/addons.c:1086 -#: ../extensions/addons.c:1253 +#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1422 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "No se puede monitorizar el directorio '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1466 msgid "Support for userscripts and userstyles" msgstr "Soporte para scripts y estilos de usuario" @@ -2534,6 +2467,10 @@ msgstr "_Expandir todo" msgid "_Collapse All" msgstr "_Contraer todo" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtro:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre o dominio coincide con el filtro ingresado" @@ -2546,6 +2483,30 @@ msgstr "_Gestor de cookies" msgid "List, view and delete cookies" msgstr "Listar, ver y eliminar cookies" +#: ../extensions/copy-tabs.c:39 +#, fuzzy +msgid "Copy Tab _Addresses" +msgstr "Copiar _dirección de imagen" + +#: ../extensions/copy-tabs.c:98 +#, fuzzy +msgid "Copy Addresses of Tabs" +msgstr "Abrir dirección en una nueva _pestaña " + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copiar las direcciones de todas las pestañas al portapapeles" + +#: ../extensions/external-applications.vala:93 +#, fuzzy +msgid "External Applications" +msgstr "Aplicaciones externas" + +#: ../extensions/external-applications.vala:94 +#, fuzzy +msgid "Associate URL schemes with external commands" +msgstr "Asociar el esquema URL con comandos externos" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "No se han podido encontrar elementos necesarios de tipo \"entry\" Atom en los datos XML." @@ -2577,17 +2538,17 @@ msgstr "Eliminar canal" msgid "_Feeds" msgstr "_Canales" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "No se ha podido encontrar el elemento raíz en el canal de información XML." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Formato de canal no soportado." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "No se ha podido analizar el canal XML: %s" @@ -2608,10 +2569,6 @@ msgstr "No se ha podido encontrar los elementos necesarios RSS \"item\" en los d msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "No se ha podido encontrar los elementos necesarios RSS \"channel\" en los datos XML." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Error" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2622,36 +2579,66 @@ msgstr "El canal '%s' ya existe" msgid "Error loading feed '%s'" msgstr "Error al cargar el canal '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Panel de canales" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Lector de canales Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Fallo al añadir valor de formulario: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Almacena el historial de datos introducidos en formularios" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "No disponible: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Archivos de recursos no instalados" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Completador de historial de formularios" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Pestaña siguiente (historial de pestañas)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Siguente pestaña desde el historial" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Pestaña anterior (historial de pestañas)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Anterior pestaña desde el historial" + +#: ../extensions/history-list.vala:245 +#, fuzzy +msgid "History List" +msgstr "Lista de historial de pestañas" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permite cambiar de pestaña eligiéndola de una lista ordenada por último uso" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Gestos de ratón" @@ -2661,8 +2648,7 @@ msgid "Control Midori by moving the mouse" msgstr "Controlar Midori moviendo el ratón" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Álbum de páginas" @@ -2690,6 +2676,14 @@ msgstr "Accesos directos" msgid "View and edit keyboard shortcuts" msgstr "Ver y editar los atajos de teclado" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Reloj de barra de estado" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Mostrar fecha y hora en la barra de estado" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Imágenes" @@ -2710,26 +2704,25 @@ msgstr "Barra de funcionalidades" msgid "Easily toggle features on web pages on and off" msgstr "Activar y desactivar fácilmente las características de páginas web" -#: ../extensions/tab-panel.c:568 -#: ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Panel de pestañas" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "Panel de p_estañas" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Mostrar las pestañas en un panel vertical" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Lista de historial de pestañas" +#: ../extensions/tabs-minimized.c:79 +msgid "Only Icons on Tabs by default" +msgstr "Sólo iconos en las pestañas por defecto" -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permite cambiar de pestaña eligiéndola de una lista ordenada por último uso" +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs have no label by default" +msgstr "Nuevas pestañas sin etiqueta por defecto" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2763,109 +2756,194 @@ msgstr "Editar fácilmente el diseño de la barra de herramienta" msgid "Cache HTTP communication on disk" msgstr "Cachear tráfico HTTP en disco" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en " -#~ "la carpeta %s." +#~ msgid "_Recently visited pages" +#~ msgstr "_Últimas páginas visitadas" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Abre las páginas que usted visitó anteriormente" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Mostrar los marcadores guardados." + +#~ msgid "Original cookies only" +#~ msgstr "Sólo cookies originales" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Sólo se aceptan las cookies del sitio web original" + +#~ msgid "Remember last visited pages" +#~ msgstr "Recordar las últimas páginas visitadas" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Si se desea que las últimas páginas visitadas sean recordadas" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Detectar automáticamente el servidor proxy" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Si se desea detectar automáticamente el servidor proxy del entorno" + +#~ msgid "_Restore Tab" +#~ msgstr "_Restaurar pestaña" + +#~ msgid "Erroneous clock time" +#~ msgstr "Hora del reloj errónea" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "La hora del reloj está en el pasado. Por favor, compruebe la fecha y la hora." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copiar %s a la carpeta %s." + +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Copiar scripts de usuario en la carpeta %s y copiar estilos de usuario en la carpeta %s." + #~ msgid "Open _Link" #~ msgstr "Abrir en_lace" + #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Abrir imagen en nueve ve_ntana" + #~ msgid "View Selection Source" #~ msgstr "Ver código fuente de la selección" + #~ msgid "View the source code of the selection" #~ msgstr "Ver el código fuente de la selección" + #~ msgid "Show panel _titles" #~ msgstr "Mostrar el panel de _títulos" + #~ msgid "Options" #~ msgstr "Opciones" + #~ msgid "Remember last form inputs" #~ msgstr "Recordar lo que se haya ingresado en formularios" + #~ msgid "Whether the last form inputs are saved" #~ msgstr "Si se desea que las últimas entradas de formulario sean recordadas" + #~ msgid "Cache size" #~ msgstr "Tamaño del caché" + #~ msgid "The allowed size of the cache" #~ msgstr "Tamaño asignado a la memoria caché" + #~ msgid "Encoding" #~ msgstr "Codificación" + #~ msgid "The character encoding to use by default" #~ msgstr "Codificación de caracteres a utilizar por defecto" + #~ msgid "Shrink images automatically" #~ msgstr "Reducir imágenes automáticamente" + #~ msgid "Automatically shrink standalone images to fit" #~ msgstr "Reducir imágenes automáticamente independientemente si caben" + #~ msgid "Resizable text areas" #~ msgstr "Áreas de texto dimensionables" + #~ msgid "Whether text areas are resizable" #~ msgstr "Si se desea que las áreas de texto sean dimensionables" + #~ msgid "Enable developer tools" #~ msgstr "Habilitar herramientas de desarrollo" + #~ msgid "Enable special extensions for developers" #~ msgstr "Habilitar extensiones especiales para desarrolladores" + #~ msgid "MB" #~ msgstr "MB" + #~ msgid "User_styles" #~ msgstr "_Estilos de usuario" + #~ msgid "Tint tabs distinctly" #~ msgstr "Pestañas de distintos colores" + #~ msgid "_Closed Tabs and Windows" #~ msgstr "_Pestañas y ventanas cerradas" + #~ msgid "Last open pages" #~ msgstr "Últimas páginas visitadas" + #~ msgid "Both" #~ msgstr "Ambos" + #~ msgid "Both horizontal" #~ msgstr "Ambos en horizontal" + #~ msgid "Load on Startup" #~ msgstr "Al iniciar Midori cargar:" + #~ msgid "Configure _Toolbar..." #~ msgstr "Configurar la _Barra de tareas" + #~ msgid "_Quick Find" #~ msgstr "Búsqueda _rápida" + #~ msgid "Quickly jump to a word or phrase" #~ msgstr "Saltar rápidamente a una palabra o una frase" + #~ msgid "Search" #~ msgstr "Buscar" + #~ msgid "Warning: You are using a superuser account!" #~ msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" + #~ msgid "_Enable" #~ msgstr "_Activar" + #~ msgid "Enable" #~ msgstr "Activar" + #~ msgid "_Disable" #~ msgstr "_Desactivar" + #~ msgid "Disable" #~ msgstr "Desactivar" + #~ msgid "%d days ago" #~ msgstr "Hace %d días" + #~ msgid "P_lugins" #~ msgstr "C_omplementos" + #~ msgid "Plugins" #~ msgstr "Complementos" + #~ msgid "Source" #~ msgstr "Código fuente" + #~ msgid "_Icon (name or file):" #~ msgstr "_Icono (nombre o archivo):" + #~ msgid "%s has no property '%s'" #~ msgstr "%s no tiene la propiedad «%s»" + #~ msgid "%s cannot be assigned to %s.%s" #~ msgstr "%s no puede ser asignado a %s.%s" + #~ msgid "%s.%s cannot be accessed" #~ msgstr "%s.%s no se puede acceder" + #~ msgid "Manage search engines" #~ msgstr "Administrar los motores de búsqueda" + #~ msgid "URIs" #~ msgstr "URIs" + #~ msgid "[URIs]" #~ msgstr "[URIs]" + #~ msgid "_URL:" #~ msgstr "_URL " + #~ msgid "Root" #~ msgstr "Raíz" + #~ msgid "HTTP Proxy" #~ msgstr "HTTP Proxy" + #~ msgid "Open URL in New _Tab" #~ msgstr "Abrir URL en una pestaña _nueva" - From f5e1a383effe3b01ea4d62e671e814896ebb8035 Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Wed, 1 Sep 2010 13:09:08 +0200 Subject: [PATCH 2920/2970] l10n: Updated Galician (gl) translation to 98% New status: 635 messages complete with 5 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 1340 +++++++++++++++++++++++++++++------------------------- 1 file changed, 711 insertions(+), 629 deletions(-) diff --git a/po/gl.po b/po/gl.po index 84eb9c79..3c1a11e2 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: midori-0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-22 10:08+0000\n" +"POT-Creation-Date: 2010-09-01 10:08+0000\n" "PO-Revision-Date: 2010-02-08 21:51+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -26,9 +26,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web lixeiro" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1298 ../midori/main.c:1628 -#: ../midori/main.c:1636 ../midori/main.c:1652 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -36,317 +36,323 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Non se puido cargar a configuración: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor «%s» non é válido para %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "O valor de configuración «%s» non é válido" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:446 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Fallou ao abrir a base de datos: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Fallou ao eliminar elementos antigos do historial: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Fallou ao eliminar o elemento do historial: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Non se puideron gardar os marcadores. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Non se puido gardar a configuración. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Non se puideron gardar os motores de busca. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Non se puido gardar o lixo. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "Non se puido gardar a sesión. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Non hai ningún ficheiro de certificado raíz dispoñible. Non se pode verificar os certificados SSL." -#: ../midori/main.c:914 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Parece que Midori pechou inesperadamente a última vez. Se isto xa ocorreu varias veces, probe unha das seguintes opcións para resolver o problema." -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Modificar as _preferencias" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Restablecer a última _sesión" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Desactivar tódalas _extensións" -#: ../midori/main.c:1174 ../midori/main.c:1905 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Non se puido cargar a sesión: %s\n" -#: ../midori/main.c:1298 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Nome de ficheiro sen especificar" -#: ../midori/main.c:1317 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Produciuse un erro descoñecido:" -#: ../midori/main.c:1348 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Captura gardada en: %s\n" -#: ../midori/main.c:1520 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Executar ENDEREZO como un aplicativo web" -#: ../midori/main.c:1520 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ENDEREZO" -#: ../midori/main.c:1523 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Usar CARTAFOL como cartafol de configuración" -#: ../midori/main.c:1523 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "CARTAFOL" -#: ../midori/main.c:1526 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Mostrar un diálogo de diagnóstico" -#: ../midori/main.c:1528 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Execute o nome de ficheiro especificado como JavaScript" -#: ../midori/main.c:1531 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Facer unha captura do URI específicado" -#: ../midori/main.c:1534 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Executar o comando especificado" -#: ../midori/main.c:1536 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Mostrar a versión do programa" -#: ../midori/main.c:1538 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Enderezos" -#: ../midori/main.c:1540 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquear os URIs de acordo ca expresión regular PATRÓN" -#: ../midori/main.c:1540 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "PATRÓN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1544 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Restabelecer Midori despois de SEGUNDOS segundos de inactividade" -#: ../midori/main.c:1544 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SEGUNDOS" -#: ../midori/main.c:1625 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Enderezos]" -#: ../midori/main.c:1653 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor, envíe comentarios, suxestións e erros a:" -#: ../midori/main.c:1655 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Comprobar se existen novas versións en:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "O cartafol de configuración especificado non é correcto." -#: ../midori/main.c:1800 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Xa se está a executar outra instancia de Midori pero non responde.\n" -#: ../midori/main.c:1855 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Non se puideron cargar os motores de busca. %s\n" -#: ../midori/main.c:1877 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Non foi posible cargar os marcadores: %s\n" -#: ../midori/main.c:1920 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Non se puido cargar o lixo: %s\n" -#: ../midori/main.c:1934 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Non se puido cargar o historial: %s\n" -#: ../midori/main.c:1948 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Producíronse os seguintes erros:" -#: ../midori/main.c:1964 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Non se atopou o ficheiro." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Documento malformado." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Formato de marcador non recoñecido." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "Fallou a escritura." -#: ../midori/midori-browser.c:332 ../midori/midori-browser.c:5244 -#: ../midori/midori-browser.c:5250 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Recargar a páxina actual" -#: ../midori/midori-browser.c:342 ../midori/midori-browser.c:5247 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Deter a carga da páxina" -#: ../midori/midori-browser.c:456 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% cargada" -#: ../midori/midori-browser.c:494 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Produciuse un erro ao actualizar o título: %s\n" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Cartafol novo" -#: ../midori/midori-browser.c:731 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Editar cartafol" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:733 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Editar o marcador" -#: ../midori/midori-browser.c:764 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:777 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Descrición" -#: ../midori/midori-browser.c:796 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Enderezo:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4400 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Cartafol:" -#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:940 -#: ../midori/midori-browser.c:4405 ../midori/midori-browser.c:4437 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Cartafol principal" -#: ../midori/midori-browser.c:874 +#: ../midori/midori-browser.c:872 #, fuzzy msgid "Add to _Speed Dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:887 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Mostrar na _barra de ferramentas" -#: ../midori/midori-browser.c:902 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Executar como aplicativo _web" -#: ../midori/midori-browser.c:994 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Non hai espazo libre dabondo para descargar \"%s\"." -#: ../midori/midori-browser.c:998 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "O ficheiro precisa %s pero só quedan %s." -#: ../midori/midori-browser.c:1055 ../midori/midori-browser.c:4455 -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Gardar o ficheiro como" -#: ../midori/midori-browser.c:1448 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Gardar ficheiro" -#: ../midori/midori-browser.c:2152 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2230 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -354,156 +360,149 @@ msgstr "" "Ao usar o URI de enriba ábrese un agregador de novas. Normalmente hai un menú ou un butón chamado \"Nova subscrición\", \"Nova fonte de novas\" ou algo semellante.\n" "En Midori tamén pode ir a Preferencias, Aplicativos e seleccionar un Agregador de novas. A seguinte vez que prema na icona da fonte de novas engadirase automaticamente." -#: ../midori/midori-browser.c:2236 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nova fonte" -#: ../midori/midori-browser.c:2279 ../midori/midori-browser.c:5309 -#: ../panels/midori-bookmarks.c:422 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Engadir novo marcador" -#: ../midori/midori-browser.c:2748 ../panels/midori-bookmarks.c:203 -#: ../panels/midori-history.c:332 ../extensions/formhistory.c:461 -#: ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Fallou ao executar a declaración na base de datos: %s\n" - -#: ../midori/midori-browser.c:2828 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Baleiro" - -#: ../midori/midori-browser.c:3446 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Non se puido executar o programa externo." -#: ../midori/midori-browser.c:3760 ../midori/midori-browser.c:5693 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Produciuse un erro ao inserir un novo elemento no historial: %s\n" -#: ../midori/midori-browser.c:4093 ../panels/midori-bookmarks.c:780 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Abrir todo en _lapelas" -#: ../midori/midori-browser.c:4100 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir nunha nova _lapela" -#: ../midori/midori-browser.c:4103 ../midori/midori-view.c:2424 -#: ../midori/midori-view.c:4103 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir nunha nova _fiestra" -#: ../midori/midori-browser.c:4326 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4327 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4330 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4351 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importar marcadores..." -#: ../midori/midori-browser.c:4354 ../midori/midori-browser.c:5314 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importar marcadores" -#: ../midori/midori-browser.c:4365 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Aplicativo:" -#: ../midori/midori-browser.c:4392 ../midori/midori-browser.c:5418 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Personalizado..." -#: ../midori/midori-browser.c:4466 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Produciuse un erro ao importar os marcadores" -#: ../midori/midori-browser.c:4502 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Produciuse un erro ao exportar os marcadores" -#: ../midori/midori-browser.c:4556 ../panels/midori-bookmarks.c:271 -#: ../panels/midori-history.c:141 ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4155 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Fallou ao eliminar o elemento do historial: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Produciuse un erro ao limpar o historial: %s\n" + +#: ../midori/midori-browser.c:4163 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Produciuse un erro ao limpar o historial de buscas: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4663 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Limpar os datos privados" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Limpar os datos privados" -#: ../midori/midori-browser.c:4681 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Limpar os seguintes datos:" -#: ../midori/midori-browser.c:4692 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historial" -#: ../midori/midori-browser.c:4698 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:4703 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Cookies de «Flash»" -#: ../midori/midori-browser.c:4708 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Iconas de sitios web" -#: ../midori/midori-browser.c:4713 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "_Lapelas pechadas" -#: ../midori/midori-browser.c:4718 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Caché web" -#: ../midori/midori-browser.c:4726 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "_Limpar os datos privados ao saír de Midori" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Un navegador moi lixeiro" -#: ../midori/midori-browser.c:4829 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada, 2008, 2009\n" @@ -511,1132 +510,1116 @@ msgstr "" "\n" "Proxecto Trasno http://trasno.net" -#: ../midori/midori-browser.c:5157 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:5159 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nova _fiestra" -#: ../midori/midori-browser.c:5160 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Abrir unha nova fiestra" -#: ../midori/midori-browser.c:5163 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Abrir unha nova lapela" -#: ../midori/midori-browser.c:5165 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Navegación p_rivada" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Non gardar datos privados durante a navegación" -#: ../midori/midori-browser.c:5170 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Abrir un ficheiro" -#: ../midori/midori-browser.c:5173 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Gardar nun ficheiro" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Enga_dir a marcación rápida" -#: ../midori/midori-browser.c:5176 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Engadir atallo á marcación rápida" -#: ../midori/midori-browser.c:5178 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Engadir atallo no _escritorio" -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Engadir un atallo no escritorio" -#: ../midori/midori-browser.c:5181 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Subscribirse á _fonte de novas" -#: ../midori/midori-browser.c:5182 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Subscribirse a esta fonte de novas" -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "Pechar _lapela" -#: ../midori/midori-browser.c:5188 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Pechar a lapela actual" -#: ../midori/midori-browser.c:5190 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "_Pechar a fiestra" -#: ../midori/midori-browser.c:5191 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Pechar esta fiestra" -#: ../midori/midori-browser.c:5194 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Imprimir a páxina actual" -#: ../midori/midori-browser.c:5197 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Saír do aplicativo" -#: ../midori/midori-browser.c:5199 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5203 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Desfacer a última modificación" -#: ../midori/midori-browser.c:5206 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Refacer a última modificación" -#: ../midori/midori-browser.c:5210 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:5213 ../midori/midori-browser.c:5216 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:5219 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Pegar o texto seleccionado no portarretallos" -#: ../midori/midori-browser.c:5222 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Borrar o texto seleccionado" -#: ../midori/midori-browser.c:5225 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Seleccionar todo o texto" -#: ../midori/midori-browser.c:5228 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Buscar unha palabra ou frase nesta páxina" -#: ../midori/midori-browser.c:5230 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../midori/midori-browser.c:5231 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar a seguinte coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:5233 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:5234 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar a anterior coincidencia de palabra ou frase" -#: ../midori/midori-browser.c:5238 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Configurar as preferencias do aplicativo" -#: ../midori/midori-browser.c:5240 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5241 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Barra de ferramentas" -#: ../midori/midori-browser.c:5253 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Aumentar o nivel de zoom" -#: ../midori/midori-browser.c:5256 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Diminuír o nivel de zoom" -#: ../midori/midori-browser.c:5259 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Restablecer o nivel de zoom" -#: ../midori/midori-browser.c:5260 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Codificación" -#: ../midori/midori-browser.c:5262 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Ver o códi_go da páxina" -#: ../midori/midori-browser.c:5263 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Ver o código fonte da páxina" -#: ../midori/midori-browser.c:5266 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:5269 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Desprazar cara á _esquerda" -#: ../midori/midori-browser.c:5270 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Desprazar cara á esquerda" -#: ../midori/midori-browser.c:5272 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Desprazar cara a_baixo" -#: ../midori/midori-browser.c:5273 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Desprazar cara abaixo" -#: ../midori/midori-browser.c:5275 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Desprazar cara _arriba" -#: ../midori/midori-browser.c:5276 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Desprazar cara arriba" -#: ../midori/midori-browser.c:5278 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Desprazar cara á _dereita" -#: ../midori/midori-browser.c:5279 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Desprazar cara á dereita" -#: ../midori/midori-browser.c:5282 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5285 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Ir á páxina anterior" -#: ../midori/midori-browser.c:5288 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Ir á seguinte páxina" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5292 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Ir á anterior subpáxina" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5296 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Ir á seguinte subpáxina" -#: ../midori/midori-browser.c:5299 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Ir á súa páxina de inicio" -#: ../midori/midori-browser.c:5301 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Baleirar o lixo" -#: ../midori/midori-browser.c:5302 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Borrar o contido do lixo" -#: ../midori/midori-browser.c:5304 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Desfa_cer pechar lapela" -#: ../midori/midori-browser.c:5305 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Abrir a última lapela pechada" -#: ../midori/midori-browser.c:5311 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Engadir un carta_fol novo" -#: ../midori/midori-browser.c:5312 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Engadir un novo cartafol de marcadores" -#: ../midori/midori-browser.c:5317 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Exportar os marcadores" -#: ../midori/midori-browser.c:5320 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Xestor de motores de busca" -#: ../midori/midori-browser.c:5321 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Engadir, editar ou eliminar motores de busca..." -#: ../midori/midori-browser.c:5324 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Limpar datos privados" -#: ../midori/midori-browser.c:5325 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Limpar os datos privados..." -#: ../midori/midori-browser.c:5329 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Inspeccionar a páxina" -#: ../midori/midori-browser.c:5330 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Inspeccionar os detalles de páxina e acceder ás ferramentas de desenvolvemento..." -#: ../midori/midori-browser.c:5335 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "Lapela _anterior" -#: ../midori/midori-browser.c:5336 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Cambiar á lapela anterior" -#: ../midori/midori-browser.c:5338 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "Lapela _seguinte" -#: ../midori/midori-browser.c:5339 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Cambiar á lapela seguinte" -#: ../midori/midori-browser.c:5341 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Enfocar a lapela a_ctual" -#: ../midori/midori-browser.c:5342 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Enfocar a lapela actual" -#: ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:4989 +msgid "Minimize _Current Tab" +msgstr "Minimizar a lapela a_ctual" + +#: ../midori/midori-browser.c:4990 +msgid "Minimize the current tab" +msgstr "Minimizar a lapela actual" + +#: ../midori/midori-browser.c:4992 +msgid "_Duplicate Current Tab" +msgstr "_Duplicar a lapela actual" + +#: ../midori/midori-browser.c:4993 +msgid "Duplicate the current tab" +msgstr "Duplicar a lapela actual" + +#: ../midori/midori-browser.c:4995 +msgid "Close Ot_her Tabs" +msgstr "Pechar ou_tras lapelas" + +#: ../midori/midori-browser.c:4996 +msgid "Close all tabs except the current tab" +msgstr "Pechar todas as lapelas agás a lapela actual" + +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Abrir a última _sesión" -#: ../midori/midori-browser.c:5345 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Abre as lapelas gardadas na última sesión" -#: ../midori/midori-browser.c:5347 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Axuda" -#: ../midori/midori-browser.c:5349 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Contido" -#: ../midori/midori-browser.c:5350 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Mostrar a documentación" -#: ../midori/midori-browser.c:5352 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "Preguntas _frecuentes" -#: ../midori/midori-browser.c:5353 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Mostrar as preguntas frecuentes" -#: ../midori/midori-browser.c:5355 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "_Comunicar un erro" -#: ../midori/midori-browser.c:5356 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Abrir o xestor de reporte de fallos de Midori" -#: ../midori/midori-browser.c:5359 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Mostrar información sobre o programa" -#: ../midori/midori-browser.c:5367 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Barra de _menú" -#: ../midori/midori-browser.c:5368 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-browser.c:5371 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Barra de _navegación" -#: ../midori/midori-browser.c:5372 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Mostrar a barra de navegación" -#: ../midori/midori-browser.c:5375 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:5376 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Mostrar panel lateral" -#: ../midori/midori-browser.c:5379 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Barra de marcadores" -#: ../midori/midori-browser.c:5380 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-browser.c:5383 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "Barra de _transferencias" -#: ../midori/midori-browser.c:5384 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Mostrar a barra de transferencias" -#: ../midori/midori-browser.c:5387 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "Barra de es_tado" -#: ../midori/midori-browser.c:5388 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Mostrar a barra de estado" -#: ../midori/midori-browser.c:5396 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5399 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinés (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5403 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Xaponés (SHIFT__JIS)" -#: ../midori/midori-browser.c:5406 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5409 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Ruso (KOI8-R)" -#: ../midori/midori-browser.c:5412 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5415 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5949 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:5956 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "Localización..." -#: ../midori/midori-browser.c:5958 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Abrir un enderezo determinado" -#: ../midori/midori-browser.c:5982 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "Buscar na _web..." -#: ../midori/midori-browser.c:5984 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Executar unha busca na web" -#: ../midori/midori-browser.c:6005 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Volver abrir fiestras ou lapelas pechadas" -#: ../midori/midori-browser.c:6020 -msgid "_Recently visited pages" -msgstr "Páxinas visitadas _recentemente" - -#: ../midori/midori-browser.c:6022 -msgid "Reopen pages that you visited earlier" -msgstr "Volver abrir as páxinas que visitou antes" - -#: ../midori/midori-browser.c:6037 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/midori-browser.c:6039 -msgid "Show the saved bookmarks" -msgstr "Mostrar os marcadores gardados" - -#: ../midori/midori-browser.c:6054 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:6067 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Fiestra" -#: ../midori/midori-browser.c:6069 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Mostrar unha lista de tódalas lapelas abertas" -#: ../midori/midori-browser.c:6083 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menú" -#: ../midori/midori-browser.c:6085 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Menú" -#: ../midori/midori-browser.c:6670 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Opción inesperada «%s»" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Produciuse un erro ao seleccionar do historial\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Buscar %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Buscar con %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Produciuse un erro ao executar a instrución de base de datos\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Pegar e _continuar" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Separar o panel seleccionado da fiestra " -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Aliñar o panel lateral á dereita" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Pechar o panel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Aliñar o panel lateral á esquerda" -#: ../midori/midori-panel.c:802 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Ocultar os controis de operación" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Mostrar unha páxina en branco" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Mostrar a páxina inicial" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Mostrar as últimas lapelas abertas" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Mostrar as últimas lapelas sen cargalas" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Xaponés (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nova lapela" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nova fiestra" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Lapela actual" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Predeterminada" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Iconas" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Iconas pequenas" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Iconas e texto" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Texto a carón das iconas" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou contorno)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Sen servidor proxy" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Todas as cookies" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "As cookies desta sesión" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Ningunha" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Lembrar o último tamaño de fiestra" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Gardar (ou non) o último tamaño de fiestra" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Última largura da fiestra" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Última largura da fiestra gardada" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Última altura da fiestra" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Última altura da fiestra gardada" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Última posición do panel" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Última posición gardada do panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Última páxina do panel" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Última páxina gardada do panel" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Última busca na web" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Última busca na web gardada" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Mostrar a barra de menú" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Mostrar (ou non) a barra de menú" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Mostrar a barra de navegación" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Mostrar (ou non) a barra de navegación" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Mostrar a barra de marcadores" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Mostrar (ou non) a barra de marcadores" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Mostrar o panel" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Mostrar (ou non) o panel" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Mostrar a barra de transferencias" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Mostrar (ou non) a barra de transferencias" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Mostrar a barra de estado" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Mostrar (ou non) a barra de estado" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Mostrar o progreso da carga na barra de navegación" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Mostrar o progreso da carga (ou non) na barra de navegación" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Motor de busca na barra de navegación" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Mostrar (ou non) o motor de busca na barra de navegación" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Elementos da barra de ferramentas" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Elementos que se van mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Facer (ou non) o panel lateral compacto" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Mostrar os controis de operación do panel" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Mostrar (ou non) os controis de operación do panel" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Aliñar á dereita o panel lateral" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Aliñar (ou non) á dereita o panel lateral" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Abrir os paneis en fiestras separadas" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Indica se os paneis se abren sempre en fiestras separadas" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Cando se inicia Midori:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Que facer ao iniciar Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Páxina de inicio:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "A páxina de inicio" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Mostrar o diálogo de fallo" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un cadro de dialogo despois de que Midori falle" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Mostrar a marcación rápida nas novas lapelas" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Mostrar a marcación rápida nas novas lapelas que se abran" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Gardar os ficheiros descargados en:" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "O cartafol de descargas foi gardado en" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Preguntar polo cartafol de destino" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Notificar cando se complete unha transferencia" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Se se desexa seleccionar o cartafol de destino cando se descarga un ficheiro" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Xestor de descargas" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Xestor de descargas externo" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Un editor de texto externo" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Agregador de novas" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Un agregador de novas externo" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Busca de barra de enderezos" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Facer unha busca a partir do contido da barra de enderezos" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Codificación de carácteres preferida" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Mostrar sempre a barra de lapelas" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Botón de pechar nas lapelas" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Cada unha das lapelas terá o seu botón para pechala" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Abrir as páxinas novas en:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Onde se van abrir as páxinas novas" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Abrir as páxinas externas en:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Onde se van abrir as páxinas abertas dende o exterior" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Prema no botón central para abrir a selección" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Cargue un enderezo da selección premendo no botón central do rato" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Abrir as lapelas en segundo plano" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Abrir (ou non) as novas lapelas en segundo plano" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Abrir lapelas xunto á actual" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Abrir as novas lapelas xunto á lapela actual ou despois da última" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Abrir «emerxentes» en lapelas" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Abrir (ou non) as fiestras emerxentes en lapelas" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Cargar as imaxes automaticamente" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Cargar e mostrar as imaxes automaticamente" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activar scripts" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Activar linguaxes de script incrustadas" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activar os engadidos de Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Activar o engadido de obxectos incrustados de Netscape" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Activar o soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Activar ou desactivar o soporte de base de datos HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Activar o soporte de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Activar ou desactivar o soporte de almacenamento local de HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Activar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Activar ou desactivar a caché de aplicativos web sen conexión" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Zoom sobre o texto e imaxes" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Aplicar zoom (ou non) ao texto e ás imaxes" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Buscar en liña ao escribir" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Buscar en liña automaticamente (ou non) mentres se escribe" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Desprazamento cinético" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "O desprazamento móvese de acordo ca velocidade" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Aceptar as «cookies»" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Que tipos de «cookies» se van aceptar" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Só as «cookies» do sitio orixinal" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Só se aceptan as «cookies» do sitio web orixe" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Persistencia máxima das «cookies»" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Tempo máximo, en días, durante os que se gardaran as «cookies»" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Lembrar as últimas páxinas visitadas" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Lembrar (ou non) as últimas páxinas que se visitaron" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Persistencia máxima do historial" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Tempo máximo, en días, durante os que se gardará un dato do historial" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Lembrar os últimos ficheiros descargados" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Lembrar (ou non) a lista de descargas realizadas ultimamente" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "O tipo de servidor proxy a usar" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy que se usa para as conexións HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Detectar o servidor proxy automaticamente" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Identificarse como" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Como se identifica nas páxinas web" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Cadea de identificación" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Cadea de identificación do aplicativo" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Un lista separada por comas de idiomas preferidos para mostrar páxinas web multiidioma, por exemplo \"de\", \"ru,nl\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Limpar a información persoal" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Os datos privados seleccionados para eliminar" @@ -1644,384 +1627,388 @@ msgstr "Os datos privados seleccionados para eliminar" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4567 -#: ../midori/midori-view.c:4571 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Non se puido cargar a páxina «%s»." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Inténteo de novo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Non se atopou - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Enviarlle unha mensaxe a %s" -#: ../midori/midori-view.c:2147 ../midori/midori-view.c:2532 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspeccionar _elemento" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2269 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Abrir a ligazón nunha nova _lapela" -#: ../midori/midori-view.c:2203 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Abrir a ligazón na lapela de _primeiro plano" -#: ../midori/midori-view.c:2204 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Abrir a ligazón na lapela de _fondo" -#: ../midori/midori-view.c:2207 ../midori/midori-view.c:2276 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Abrir a ligazón nunha _fiestra nova" -#: ../midori/midori-view.c:2210 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Abrir a ligazón como a_plicativo web" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Copiar o de_stino da ligazón" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2288 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Gardar ligazón de destino" -#: ../midori/midori-view.c:2217 ../midori/midori-view.c:2282 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Descargar ligazón de destino" -#: ../midori/midori-view.c:2221 ../midori/midori-view.c:2251 -#: ../midori/midori-view.c:2293 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Descargar co _Xestor de descargas" -#: ../midori/midori-view.c:2230 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Abrir a _imaxe nunha nova lapela" -#: ../midori/midori-view.c:2233 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Copiar o _enderezo da imaxe" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Gardar a _imaxe" -#: ../midori/midori-view.c:2237 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Descargar a i_maxe" -#: ../midori/midori-view.c:2244 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Copiar o _enderezo do vídeo" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Gardar o _vídeo" -#: ../midori/midori-view.c:2247 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Descargar o _vídeo" -#: ../midori/midori-view.c:2310 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Buscar _con: " -#: ../midori/midori-view.c:2345 ../midori/midori-view.c:2352 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Buscar na rede" -#: ../midori/midori-view.c:2373 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Abrir o enderezo nunha nova _lapela" -#: ../midori/midori-view.c:2674 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Abrir ou descargar o ficheiro" -#: ../midori/midori-view.c:2693 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tipo de ficheiro: «%s»" -#: ../midori/midori-view.c:2696 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de ficheiro: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2700 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3244 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar a páxina - %s" -#: ../midori/midori-view.c:3526 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Marcación rápida" -#: ../midori/midori-view.c:3527 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Prema para engadir un atallo" -#: ../midori/midori-view.c:3528 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Introduza o enderezo do atallo" -#: ../midori/midori-view.c:3529 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Introduza o título do atallo" -#: ../midori/midori-view.c:3530 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Está seguro de que desexa eliminar este atallo?" -#: ../midori/midori-view.c:3531 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Definir o número de columnas e filas" -#: ../midori/midori-view.c:3532 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Introduza o número de columnas e filas:" -#: ../midori/midori-view.c:3533 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "" -#: ../midori/midori-view.c:3534 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Tamaño da miniatura:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Pequeno" -#: ../midori/midori-view.c:3536 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Mediano" -#: ../midori/midori-view.c:3537 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Grande" -#: ../midori/midori-view.c:3563 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Non se pode mostrar o documento" -#: ../midori/midori-view.c:3586 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "A documentación non está instalada" -#: ../midori/midori-view.c:3707 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Pospúxose a carga da páxina" -#: ../midori/midori-view.c:3708 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Pospúxose a carga debido a un fallo recente ou ao inicio das preferencias." -#: ../midori/midori-view.c:3709 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Cargar a páxina" -#: ../midori/midori-view.c:3853 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Páxina en branco" -#: ../midori/midori-view.c:4107 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Duplicar a lapela" -#: ../midori/midori-view.c:4112 -msgid "_Restore Tab" -msgstr "_Restaurar a lapela" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Mostrar a _etiqueta da lapela" -#: ../midori/midori-view.c:4112 -msgid "_Minimize Tab" -msgstr "_Minimizar a lapela" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Só mostrar a _icona da lapela" -#: ../midori/midori-view.c:4118 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Pechar ou_tras lapelas" -#: ../midori/midori-view.c:4804 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Imprimir imaxes de fondo" -#: ../midori/midori-view.c:4805 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Se se imprimen (ou non) as imaxes de fondo" -#: ../midori/midori-view.c:4857 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funcionalidades" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Xeral" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Inicio" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Usar a páxina actual como páxina de inicio" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferencias" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Aparencia" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Axustes de tipo de letra" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Tipo de letra predeterminado" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "Tipo de letra predeterminado utilizada para mostrar o texto" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "Tamaño predeterminado do tipo de letra usado para mostrar o texto" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Tipo de letra de ancho fixo" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Tipo de letra que se usa para mostrar texto de ancho fixo" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "O tamaño do tipo de letra que se usa para mostrar texto de ancho fixo" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Tamaño mínimo do tipo de letra" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Tamaño mínimo do tipo de letra para mostrar texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Aplicar 96 puntos por polgada" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Aplica unha densidade de puntos de vídeo de 96 DIP" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Permitir que os scripts abran fiestras emerxentes" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "Definir se os scripts teñen permiso ou non para abrir fiestras emerxentes automaticamente" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Corrección ortográfica" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Activar a corrección ortográfica" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Activar o corrector ortográfico ao escribir" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Dicionarios de ortografía:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:432 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Lista de idiomas, separados por comas, a empregar para a corrección ortográfica, p.ex. «en_GB,de_DE»" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navegación" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Aplicativos" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Aplicativos externos" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Nome de máquina" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Cookies" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "días" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Baleiro" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Engadir un motor de busca" @@ -2050,47 +2037,51 @@ msgstr "Xestionar os motores de busca" msgid "Use as _default" msgstr "Usar como pre_determinado" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Engadir mar_cador…" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Extensións" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Historial" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "P_áxina de inicio" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Scripts de usuario" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nova _lapela" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Transferencias" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "En_gadidos de Netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Cartafol _novo" @@ -2119,7 +2110,7 @@ msgstr "Resaltar coincidencias" msgid "Close Findbar" msgstr "Pechar a barra de buscas" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s de %s" @@ -2133,44 +2124,44 @@ msgstr "Descargouse o ficheiro '%s'." msgid "Transfer completed" msgstr "Transferencia completada" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Limpar todo" -#: ../toolbars/midori-transferbar.c:278 ../toolbars/midori-transferbar.c:280 +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 msgid "Some files are being downloaded" msgstr "Estanse a descargar algúns ficheiros" -#: ../toolbars/midori-transferbar.c:284 +#: ../toolbars/midori-transferbar.c:306 msgid "_Quit Midori" msgstr "Saír de Midori" -#: ../toolbars/midori-transferbar.c:286 +#: ../toolbars/midori-transferbar.c:308 msgid "The transfers will be cancelled if Midori quits." msgstr "Se sae de Midori hanse cancelar as transferencias." -#: ../panels/midori-bookmarks.c:109 +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Produciuse un erro engadir o elemento ao marcadores: %s\n" -#: ../panels/midori-bookmarks.c:430 +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Editar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:438 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Borrar o marcador seleccionado" -#: ../panels/midori-bookmarks.c:451 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Engadir un cartafol novo" -#: ../panels/midori-bookmarks.c:585 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Separador" @@ -2190,59 +2181,46 @@ msgstr "Copiar todo" msgid "Extensions" msgstr "Extensións" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "A hora do reloxo é incorrecta" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "A hora do reloxo está atrasada. Comprobe a data e hora actuais." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Fai unha semana" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Fai %d día" msgstr[1] "Fai %d días" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Hoxe" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Onte" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Esta seguro de que desexa eliminar tódolos elementos do historial?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Por en marcadores o elemento seleccionado no historial" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Borrar o elemento seleccionado no historial" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Limpar completamente o historial" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr " Filtro:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Abrir o carta_fol de destino" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copiar o enderezo da lig_azón" @@ -2284,16 +2262,17 @@ msgstr "A icona de inventario «%s» non se pode cargar" msgid "Animation frames are broken" msgstr "Os marcos de animación están rotos" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "A propiedade «%s» non é válida para %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Escoller un ficheiro" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Escoller un cartafol" @@ -2331,42 +2310,60 @@ msgstr "Bl_oquear a imaxe" msgid "Bl_ock link" msgstr "Bl_oquear a ligazón" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Bloqueo de publicidade" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Bloquear a publicidade de acordo cunha lista de filtros" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copiar %s ao cartafol %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:377 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:379 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Erro" + +#: ../extensions/addons.c:231 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Está seguro de que desexa borrar '%s'?" + +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Borrar script de usuario" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Borrar estilo de usuario" + +#: ../extensions/addons.c:242 +#, fuzzy, c-format +msgid "The file %s will be permanently deleted." +msgstr "Descargouse o ficheiro '%s'." + +#: ../extensions/addons.c:1299 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Non se puido gardar a configuración da extensión '%s': %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1422 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Non se pode monitorizar o cartafol '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1466 msgid "Support for userscripts and userstyles" msgstr "Compatibilidade para scripts e estilos de usuario" @@ -2461,6 +2458,10 @@ msgstr "_Expandir todo" msgid "_Collapse All" msgstr "_Contraer todo" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr " Filtro:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Introduza unha cadea como filtro para mostrar só as cookies cuxo nome ou campo de dominio coincida co filtro de entrada" @@ -2485,6 +2486,14 @@ msgstr "Copiar os enderezos das lapelas" msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copiar os enderezos de todas as lapelas ao portarretallos" +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Aplicativos externos" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "Non se puideron atopar os elementos necesarios Atom «entry» nos datos XML." @@ -2516,17 +2525,17 @@ msgstr "Borrar fonte" msgid "_Feeds" msgstr "_Fontes" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Non se puido atopar o elemento raíz nos datos XML da fonte." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Formato de fonte non soportado." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Non se puido analizar a fonte XML: %s" @@ -2547,10 +2556,6 @@ msgstr "Non se puidieron atopar os elementos necesarios RSS «item» nos datos X msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Non se puideron atopar os elementos necesarios RSS «channel» nos datos XML." -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Erro" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2561,36 +2566,67 @@ msgstr "A fonte «%s» xa existe" msgid "Error loading feed '%s'" msgstr "Atopouse un erro ao cargar a fonte «%s»" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Panel de fontes" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Lector de fontes Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Produciuse un erro ao engadir o valor ao formulario: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Fallou ao executar a declaración na base de datos: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Almacena un historial dos datos introducidos nos formularios" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Non dispoñible: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Os ficheiros de recursos non están instalados" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Completador de historial de formularios" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Seguinte lapela (historial de lapelas)" + +#: ../extensions/history-list.vala:175 +#, fuzzy +msgid "Next tab from history" +msgstr "Produciuse un erro ao seleccionar do historial\n" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Lapela anterior (historial de lapelas)" + +#: ../extensions/history-list.vala:185 +#, fuzzy +msgid "Previous tab from history" +msgstr "Produciuse un erro ao seleccionar do historial\n" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Lista do historial" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permite cambiar de lapela seleccionando nunha lista ordenada por último uso" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Xestos do rato" @@ -2628,6 +2664,15 @@ msgstr "Atallos" msgid "View and edit keyboard shortcuts" msgstr "Ver e modificar os atallos de teclado" +#: ../extensions/status-clock.c:176 +#, fuzzy +msgid "Statusbar Clock" +msgstr "Barra de es_tado" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Mostrar data e hora na barra de estado" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Imaxes" @@ -2648,33 +2693,25 @@ msgstr "Características da barra de estado" msgid "Easily toggle features on web pages on and off" msgstr "Alternar facilmente as características dentro e fóra de páxinas web" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Panel de lapelas" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "Panel de _lapelas" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Mostrar as lapelas nun panel vertical" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Lista do historial de lapelas" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permite cambiar de lapela seleccionando nunha lista ordenada por último uso" - #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Minimizar as novas lapelas" +msgid "Only Icons on Tabs by default" +msgstr "Por defecto só se mostran as iconas nas lapelas" #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "As novas lapelas ábrense minimizadas" +msgid "New tabs have no label by default" +msgstr "Por defecto as novas lapelas non teñen etiqueta" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2708,6 +2745,51 @@ msgstr "Modificar de xeito sinxelo a disposición da barra de ferramentas" msgid "Cache HTTP communication on disk" msgstr "Gardar unha caché da comunicación HTTP no disco" +#~ msgid "_Recently visited pages" +#~ msgstr "Páxinas visitadas _recentemente" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Volver abrir as páxinas que visitou antes" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Mostrar os marcadores gardados" + +#~ msgid "Original cookies only" +#~ msgstr "Só as «cookies» do sitio orixinal" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Só se aceptan as «cookies» do sitio web orixe" + +#~ msgid "Remember last visited pages" +#~ msgstr "Lembrar as últimas páxinas visitadas" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Lembrar (ou non) as últimas páxinas que se visitaron" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Detectar o servidor proxy automaticamente" + +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Detectar (ou non) o servidor proxy automaticamente neste contorno" + +#~ msgid "_Restore Tab" +#~ msgstr "_Restaurar a lapela" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimizar a lapela" + +#~ msgid "Erroneous clock time" +#~ msgstr "A hora do reloxo é incorrecta" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "A hora do reloxo está atrasada. Comprobe a data e hora actuais." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copiar %s ao cartafol %s." + +#~ msgid "New tabs open minimized" +#~ msgstr "As novas lapelas ábrense minimizadas" + #~ msgid "REGEX" #~ msgstr "EXP.REG" From 5a2c0193a271c20cd5bd5ad1868e8152f4bdb67a Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Wed, 1 Sep 2010 13:10:14 +0200 Subject: [PATCH 2921/2970] l10n: Updated Galician (gl) translation to 99% New status: 639 messages complete with 1 fuzzy and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/po/gl.po b/po/gl.po index 3c1a11e2..e6f28444 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2345,9 +2345,9 @@ msgid "Delete user style" msgstr "Borrar estilo de usuario" #: ../extensions/addons.c:242 -#, fuzzy, c-format +#, c-format msgid "The file %s will be permanently deleted." -msgstr "Descargouse o ficheiro '%s'." +msgstr "Borrouse de forma permanente o ficheiro %s." #: ../extensions/addons.c:1299 #, c-format @@ -2606,18 +2606,16 @@ msgid "Next Tab (History List)" msgstr "Seguinte lapela (historial de lapelas)" #: ../extensions/history-list.vala:175 -#, fuzzy msgid "Next tab from history" -msgstr "Produciuse un erro ao seleccionar do historial\n" +msgstr "Seguinte lapela do historial" #: ../extensions/history-list.vala:184 msgid "Previous Tab (History List)" msgstr "Lapela anterior (historial de lapelas)" #: ../extensions/history-list.vala:185 -#, fuzzy msgid "Previous tab from history" -msgstr "Produciuse un erro ao seleccionar do historial\n" +msgstr "Lapela anterior do historial" #: ../extensions/history-list.vala:245 msgid "History List" @@ -2665,9 +2663,8 @@ msgid "View and edit keyboard shortcuts" msgstr "Ver e modificar os atallos de teclado" #: ../extensions/status-clock.c:176 -#, fuzzy msgid "Statusbar Clock" -msgstr "Barra de es_tado" +msgstr "Reloxo na barra de estado" #: ../extensions/status-clock.c:177 msgid "Display date and time in the statusbar" From 24c4185a4c476c50cdc6a47b0e86f5538cfc8890 Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Wed, 1 Sep 2010 13:11:47 +0200 Subject: [PATCH 2922/2970] l10n: Updated Galician (gl) translation to 99% New status: 640 messages complete with 1 fuzzy and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/gl.po b/po/gl.po index e6f28444..ce7a3d45 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2492,7 +2492,7 @@ msgstr "Aplicativos externos" #: ../extensions/external-applications.vala:94 msgid "Associate URL schemes with external commands" -msgstr "" +msgstr "Asociar esquemas de URL con comandos externos" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." From e25516a58b3fbf248cc48ad82261fef0e640c8d0 Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Wed, 1 Sep 2010 13:12:34 +0200 Subject: [PATCH 2923/2970] l10n: Updated Galician (gl) translation to 99% New status: 642 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/gl.po b/po/gl.po index ce7a3d45..72b35758 100644 --- a/po/gl.po +++ b/po/gl.po @@ -317,7 +317,6 @@ msgid "Toplevel folder" msgstr "Cartafol principal" #: ../midori/midori-browser.c:872 -#, fuzzy msgid "Add to _Speed Dial" msgstr "Enga_dir a marcación rápida" @@ -1789,7 +1788,7 @@ msgstr "Introduza o número de columnas e filas:" #: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" -msgstr "" +msgstr "Tamaño de entrada non válido para a marcación rápida" #: ../midori/midori-view.c:3447 msgid "Thumb size:" From 7820e209f852ddfac1d46f22b8f6e8ff4f6b0a45 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 1 Sep 2010 20:45:07 +0200 Subject: [PATCH 2924/2970] Only use git describe as version string if .git dir exists We don't want to pick up the git version string on distros which have build scripts in git. --- wscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index 05ee4efd..e567a0a6 100644 --- a/wscript +++ b/wscript @@ -35,9 +35,10 @@ APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) try: - git = Utils.cmd_output (['git', 'describe'], silent=True) - if git: - VERSION = git.strip () + if os.path.isdir ('.git'): + git = Utils.cmd_output (['git', 'describe'], silent=True) + if git: + VERSION = git.strip () except: pass From 65338e5ab095a18c1fc16e85329175090161c15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Mon, 30 Aug 2010 01:57:03 +0200 Subject: [PATCH 2925/2970] Remove button labels and separator from addon toolbar --- extensions/addons.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 263c893d..dc9dd536 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -322,42 +322,37 @@ addons_get_toolbar (MidoriViewable* viewable) if (!ADDONS (viewable)->toolbar) { toolbar = gtk_toolbar_new (); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); toolitem = gtk_tool_item_new (); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_show (GTK_WIDGET (toolitem)); - /* separator */ - toolitem = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), - FALSE); - gtk_tool_item_set_expand (toolitem, TRUE); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); - gtk_widget_show (GTK_WIDGET (toolitem)); - /* add button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_add_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new addon")); gtk_widget_show (GTK_WIDGET (toolitem)); /* Text editor button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT); - gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_open_in_editor_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Open selected addon in text editor")); gtk_widget_show (GTK_WIDGET (toolitem)); /* Delete button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); - gtk_tool_item_set_is_important (toolitem, TRUE); g_signal_connect (toolitem, "clicked", G_CALLBACK (midori_addons_button_delete_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Open target folder for selected addon")); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Remove selected addon")); gtk_widget_show (GTK_WIDGET (toolitem)); ADDONS (viewable)->toolbar = toolbar; From 8448eabd2615c169f64563668909ae2bdc77e2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Wed, 1 Sep 2010 22:28:32 +0200 Subject: [PATCH 2926/2970] Add button to open folder of scripts/ styles --- extensions/addons.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/extensions/addons.c b/extensions/addons.c index dc9dd536..8a8ed71c 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -311,6 +311,36 @@ midori_addons_open_in_editor_clicked_cb (GtkWidget* toolitem, } } +static void +midori_addons_open_target_folder_clicked_cb (GtkWidget* toolitem, + Addons* addons) +{ + GtkTreeModel* model; + GtkTreeIter iter; + gchar* folder; + gchar* folder_uri; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (addons->treeview), + &model, &iter)) + { + struct AddonElement* element; + + gtk_tree_model_get (model, &iter, 0, &element, -1); + folder = g_path_get_dirname (element->fullpath); + } + else + folder = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), + PACKAGE_NAME, + addons->kind == ADDONS_USER_SCRIPTS + ? "scripts" : "styles", NULL); + folder_uri = g_filename_to_uri (folder, NULL, NULL); + g_free (folder); + + sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET (addons->treeview)), + folder_uri, gtk_get_current_event_time (), NULL); + g_free (folder_uri); +} + GtkWidget* addons_get_toolbar (MidoriViewable* viewable) { @@ -345,6 +375,15 @@ addons_get_toolbar (MidoriViewable* viewable) _("Open selected addon in text editor")); gtk_widget_show (GTK_WIDGET (toolitem)); + /* Target folder button */ + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_addons_open_target_folder_clicked_cb), viewable); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), + _("Open Target Folder")); + gtk_widget_show (GTK_WIDGET (toolitem)); + /* Delete button */ toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); g_signal_connect (toolitem, "clicked", From f7a6011d1b96bfe471260b2c6dee34843f6ea49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Forysiuk?= Date: Mon, 30 Aug 2010 18:24:26 +0200 Subject: [PATCH 2927/2970] Provide a context menu for scripts and styles --- extensions/addons.c | 87 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/extensions/addons.c b/extensions/addons.c index 8a8ed71c..00cd21fc 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -341,6 +341,85 @@ midori_addons_open_target_folder_clicked_cb (GtkWidget* toolitem, g_free (folder_uri); } +static void +midori_addons_popup_item (GtkMenu* menu, + const gchar* stock_id, + const gchar* label, + struct AddonElement* element, + gpointer callback, + Addons* addons) +{ + GtkWidget* menuitem; + + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); + if (!strcmp (stock_id, GTK_STOCK_EDIT)) + gtk_widget_set_sensitive (menuitem, element->fullpath !=NULL); + else if (strcmp (stock_id, GTK_STOCK_DELETE)) + gtk_widget_set_sensitive (menuitem, element->fullpath !=NULL); + g_object_set_data (G_OBJECT (menuitem), "AddonElement", &element); + g_signal_connect (menuitem, "activate", G_CALLBACK(callback), addons); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +midori_addons_popup (GtkWidget* widget, + GdkEventButton* event, + struct AddonElement* element, + Addons* addons) +{ + GtkWidget* menu; + + menu = gtk_menu_new (); + midori_addons_popup_item (GTK_MENU (menu), GTK_STOCK_EDIT, _("Open in Text Editor"), + element, midori_addons_open_in_editor_clicked_cb, addons); + midori_addons_popup_item (GTK_MENU (menu), GTK_STOCK_OPEN, _("Open Target Folder"), + element, midori_addons_open_target_folder_clicked_cb, addons); + midori_addons_popup_item (GTK_MENU (menu), GTK_STOCK_DELETE, NULL, + element, midori_addons_button_delete_clicked_cb, addons); + katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); +} + +static gboolean +midori_addons_popup_menu_cb (GtkWidget *widget, + Addons* addons) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + struct AddonElement* element; + gtk_tree_model_get (model, &iter, 0, &element, -1); + midori_addons_popup (widget, NULL, element, addons); + return TRUE; + } + return FALSE; +} + +static gboolean +midori_addons_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + Addons* addons) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->button != 3) + return FALSE; + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + struct AddonElement* element; + gtk_tree_model_get (model, &iter, 0, &element, -1); + midori_addons_popup (widget, NULL, element, addons); + return TRUE; + } + return FALSE; +} + GtkWidget* addons_get_toolbar (MidoriViewable* viewable) { @@ -372,7 +451,7 @@ addons_get_toolbar (MidoriViewable* viewable) G_CALLBACK (midori_addons_open_in_editor_clicked_cb), viewable); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), - _("Open selected addon in text editor")); + _("Open in Text Editor")); gtk_widget_show (GTK_WIDGET (toolitem)); /* Target folder button */ @@ -1031,6 +1110,12 @@ addons_init (Addons* addons) g_signal_connect (addons->treeview, "row-activated", G_CALLBACK (addons_treeview_row_activated_cb), addons); + g_signal_connect (addons->treeview, "button-release-event", + G_CALLBACK (midori_addons_button_release_event_cb), + addons); + g_signal_connect (addons->treeview, "popup-menu", + G_CALLBACK (midori_addons_popup_menu_cb), + addons); gtk_widget_show (addons->treeview); gtk_box_pack_start (GTK_BOX (addons), addons->treeview, TRUE, TRUE, 0); } From c808e9ce434a9e82bf8995547ac98478b62146f8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 1 Sep 2010 23:14:37 +0200 Subject: [PATCH 2928/2970] Enable copy menu item in transfer context menu --- panels/midori-transfers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index d8ccaf1c..6b2f7662 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -482,7 +482,7 @@ midori_transfers_popup (GtkWidget* widget, midori_transfers_open_folder_activate_cb, TRUE, transfers); midori_transfers_popup_menu_item (GTK_MENU (menu), GTK_STOCK_COPY, _("Copy Link Loc_ation"), download, - midori_transfers_copy_address_activate_cb, FALSE, transfers); + midori_transfers_copy_address_activate_cb, TRUE, transfers); katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR); } From 3b4ae3766410512d8c3dafed8677b729253dddeb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 1 Sep 2010 23:56:03 +0200 Subject: [PATCH 2929/2970] Always free uri of the web view after applying addons --- extensions/addons.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/addons.c b/extensions/addons.c index 00cd21fc..4eff71cf 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -1240,6 +1240,7 @@ addons_context_ready_cb (WebKitWebView* web_view, GSList* scripts, *styles; struct AddonElement* script, *style; struct AddonsList* scripts_list, *styles_list; + uri = katze_object_get_string (web_view, "uri"); /* Don't run scripts or styles on blank or special pages */ if (!(uri && *uri && strncmp (uri, "about:", 6))) @@ -1277,6 +1278,7 @@ addons_context_ready_cb (WebKitWebView* web_view, webkit_web_view_execute_script (web_view, style->script_content); styles = g_slist_next (styles); } + g_free (uri); } static void From e6b577df47fc723b1febdb11545a28435732599f Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Thu, 2 Sep 2010 23:11:14 +0200 Subject: [PATCH 2930/2970] l10n: Updated Danish (da) translation to 99% New status: 646 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/po/da.po b/po/da.po index 1fde1367..aa457815 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 10:08+0000\n" +"POT-Creation-Date: 2010-09-02 16:08+0000\n" "PO-Revision-Date: 2010-02-20 00:37+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -2310,11 +2310,11 @@ msgstr "Blokering af reklamer" msgid "Block advertisements according to a filter list" msgstr "Blokér reklamer i henhold til en filterliste" -#: ../extensions/addons.c:130 ../extensions/addons.c:377 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Brugerskripter" -#: ../extensions/addons.c:135 ../extensions/addons.c:379 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Brugerstile" @@ -2341,21 +2341,41 @@ msgstr "Slet brugerstil" msgid "The file %s will be permanently deleted." msgstr "Filen %s vil blive slettet for bestandigt." -#: ../extensions/addons.c:1299 +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Åbn i tekstbehandler" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Åbn målmappen" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Tilføj nye moduler" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Åbn målmappen for valgte modul" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Fjern valgte modul" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" -#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Brug udvidelsesm,oduler" -#: ../extensions/addons.c:1422 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Kan ikke overvåge mappe '%s': %s" -#: ../extensions/addons.c:1466 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Understøttelse af brugerskripter og brugerstile" From de91b26ba0e7282f201ada41ff4cb3e9179c7a23 Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Thu, 2 Sep 2010 23:12:26 +0200 Subject: [PATCH 2931/2970] l10n: Updated Danish (da) translation to 99% New status: 646 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index aa457815..0f1fb429 100644 --- a/po/da.po +++ b/po/da.po @@ -2368,7 +2368,7 @@ msgstr "Indstillingen af udvidelsesmodulet '%s' kunne ikke gemmes: %s\n" #: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" -msgstr "Brug udvidelsesm,oduler" +msgstr "Brugers udvidelsesmoduler" #: ../extensions/addons.c:1543 #, c-format From ea319f531bd428139d73b0902d8d156b4be7a765 Mon Sep 17 00:00:00 2001 From: Sergio Marques Date: Fri, 3 Sep 2010 00:09:44 +0200 Subject: [PATCH 2932/2970] l10n: Updated Portuguese (pt) translation to 100% New status: 648 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/pt.po | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/po/pt.po b/po/pt.po index ef1f1221..87546db7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,16 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-29 22:08+0000\n" +"POT-Creation-Date: 2010-09-02 22:08+0000\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: PORTUGAL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: PORTUGAL\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" @@ -2309,11 +2309,11 @@ msgstr "Bloqueador de publicidade" msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com a lista " -#: ../extensions/addons.c:130 ../extensions/addons.c:336 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Argumentos de Utilizador" -#: ../extensions/addons.c:135 ../extensions/addons.c:338 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Estilos de utilizador" @@ -2340,21 +2340,41 @@ msgstr "Apagar estilo de utilizador" msgid "The file %s will be permanently deleted." msgstr "O ficheiro '%s' será apagado permanentemente." -#: ../extensions/addons.c:1258 +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Abrir no Editor de Texto" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Abrir Pasta de Destino" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Adicionar novo extra" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Abrir pasta de destino para o extra seleccionado" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Remover o extra seleccionado" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "A configuração da extensão '%s' não foi gravada: %s\n" -#: ../extensions/addons.c:1259 ../extensions/addons.c:1424 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Extras de utilizador" -#: ../extensions/addons.c:1381 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível vigiar a pasta '%s': %s " -#: ../extensions/addons.c:1425 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Suporte a scripts e estilos de utilizador" From 91328aef2e24e3261048a9610bf95f1e4ba45d2b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Sep 2010 00:21:03 +0200 Subject: [PATCH 2933/2970] Use Alt+Shift+Left/ Right for Previous and Next actions Control+Left/ Right conflicts with text cursor movement. --- midori/midori-browser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 03f23a80..05c9b336 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4932,11 +4932,11 @@ static const GtkActionEntry entries[] = NULL, "Right", N_("Go forward to the next page"), G_CALLBACK (_action_navigation_activate) }, { "Previous", GTK_STOCK_MEDIA_PREVIOUS, - NULL, "Left", + NULL, "Left", /* i18n: Visit the previous logical page, ie. in a forum or blog */ N_("Go to the previous sub-page"), G_CALLBACK (_action_navigation_activate) }, { "Next", GTK_STOCK_MEDIA_NEXT, - NULL, "Right", + NULL, "Right", /* i18n: Visit the following logical page, ie. in a forum or blog */ N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, { "Homepage", STOCK_HOMEPAGE, From 28bdabd9286e18d23c2b0bf3399a7b6416d30cfd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 3 Sep 2010 00:32:48 +0200 Subject: [PATCH 2934/2970] Hide statusbar in app mode by default --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index a86d58ac..5f9cd151 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1752,7 +1752,7 @@ main (int argc, "show-panel", FALSE, "toolbar-items", "Back,Forward,ReloadStop,Location", "homepage", NULL, - "show-statusbar", TRUE, + "show-statusbar", FALSE, "enable-developer-extras", FALSE, NULL); g_object_set (browser, "settings", settings, NULL); From 65931c3f91f69bd23f81289de8260525c361f877 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Sep 2010 23:42:53 +0200 Subject: [PATCH 2935/2970] Use Ctrl+Shift modifiers for Bookmarks, History and Transfers For one, previously modifiers were missing on History and Transfers. Further more, Ctrl+B conflicts with Bold in rich text fields, and for consistency, panels should have the same modfiers. --- midori/sokoke.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index aafe379c..bea5a670 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1301,15 +1301,15 @@ sokoke_register_stock_items (void) { STOCK_TRANSFER, NULL, 0, 0, GTK_STOCK_SAVE }, { STOCK_BOOKMARK, N_("_Bookmark"), 0, 0, GTK_STOCK_FILE }, - { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK, GDK_B, GTK_STOCK_DIRECTORY }, + { STOCK_BOOKMARKS, N_("_Bookmarks"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_B, GTK_STOCK_DIRECTORY }, { STOCK_BOOKMARK_ADD, N_("Add Boo_kmark"), 0, 0, GTK_STOCK_ADD }, { STOCK_CONSOLE, N_("_Console"), 0, 0, GTK_STOCK_DIALOG_WARNING }, { STOCK_EXTENSIONS, N_("_Extensions"), 0, 0, GTK_STOCK_CONVERT }, - { STOCK_HISTORY, N_("_History"), 0, GDK_H, GTK_STOCK_SORT_ASCENDING }, + { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_H, GTK_STOCK_SORT_ASCENDING }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, GTK_STOCK_HOME }, { STOCK_SCRIPTS, N_("_Userscripts"), 0, 0, GTK_STOCK_EXECUTE }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, - { STOCK_TRANSFERS, N_("_Transfers"), 0, GDK_J, GTK_STOCK_SAVE }, + { STOCK_TRANSFERS, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_J, GTK_STOCK_SAVE }, { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_USER_TRASH, N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, From 5a42b377975b0803480f583e901a095a2750f69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0tancl?= Date: Sun, 5 Sep 2010 16:10:25 +0200 Subject: [PATCH 2936/2970] l10n: Updated Czech (cs) translation to 100% New status: 648 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/cs.po | 68 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/po/cs.po b/po/cs.po index 5ed2437a..d022bb3c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-28 16:08+0000\n" +"POT-Creation-Date: 2010-09-05 10:09+0000\n" "PO-Revision-Date: 2010-05-04 08:08+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech < >\n" @@ -2306,45 +2306,72 @@ msgstr "Blokování reklamy" msgid "Block advertisements according to a filter list" msgstr "Blokuje reklamu podle filtrů" -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Uživatelské skripty" -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Uživatelské styly" -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Chyba" #: ../extensions/addons.c:231 #, c-format -msgid "" -"Do you really want to remove '%s'?\n" -"\n" -"The file '%s' will be permanently lost.\n" -msgstr "" -"Opravdu se má odstranit %s?\r\n" -"\r\n" -"Soubor '%s' bude odstraněn.\r\n" +msgid "Do you want to delete '%s'?" +msgstr "Chcete smazat %s?" -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Smazat uživatelský skript" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Smazat uživatelův styl" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Soubor %s bude smazán." + +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Otevřít v textovém editoru" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Otevřít cílovou složku" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Přidat nový plugin" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Otevřít cílový adresář vybraného pluginu" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Odstranit vybraný plugin" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Nastavení rozšíření '%s' nemůže být uloženo: %s\n" -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Uživatelova rozšíření" -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Nemohu sledovat složku '%s': %s" -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Podpora pro userscripts a userstyles." @@ -2723,6 +2750,15 @@ msgstr "Umožňuje jednoduše změnit lištu" msgid "Cache HTTP communication on disk" msgstr "Kešuje (ukládá) HTTP komunikaci na disk" +#~ msgid "" +#~ "Do you really want to remove '%s'?\n" +#~ "\n" +#~ "The file '%s' will be permanently lost.\n" +#~ msgstr "" +#~ "Opravdu se má odstranit %s?\r\n" +#~ "\r\n" +#~ "Soubor '%s' bude odstraněn.\r\n" + #~ msgid "Copy %s to the folder %s." #~ msgstr "Kopíruje se %s do složky %s." From 879938393f92552aa3ff5fd6c023536b1769eb33 Mon Sep 17 00:00:00 2001 From: Yarema aka Knedlyk Date: Sun, 5 Sep 2010 22:44:20 +0200 Subject: [PATCH 2937/2970] l10n: Updated Ukrainian (uk) translation to 100% New status: 648 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/uk.po | 1107 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 577 insertions(+), 530 deletions(-) diff --git a/po/uk.po b/po/uk.po index 7c200099..f730348c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 16:08+0000\n" +"POT-Creation-Date: 2010-09-05 16:08+0000\n" "PO-Revision-Date: 2010-02-16 22:53+0100\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian \n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легкий переглядач Веб" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1302 ../midori/main.c:1632 -#: ../midori/main.c:1640 ../midori/main.c:1656 -#: ../midori/midori-websettings.c:310 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Мідорі" @@ -31,198 +31,204 @@ msgstr "Мідорі" msgid "Web Browser" msgstr "Переглядач Веб" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Неможливо завантажити конфігурацію: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значення '%s' є неправильним для %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Неправильне значення конфігурації '%s'" -#: ../midori/main.c:370 ../midori/main.c:442 ../extensions/formhistory.c:453 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Не вдалось відкрити базу даних: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Невдача видалення старих об'єктів історії: %s\n" -#: ../midori/main.c:468 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Невдача при видаленні об'єкту історії: %s\n" + +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Неможливо зберегти закладки. %s" -#: ../midori/main.c:500 +#: ../midori/main.c:528 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Неможливо зберегти конфігурацію. %s" -#: ../midori/main.c:538 +#: ../midori/main.c:566 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Неможливо зберегти пошукові машини. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:558 ../midori/main.c:581 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Неможливо зберегти смітник. %s" -#: ../midori/main.c:640 ../midori/main.c:880 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "Сесія не може бути збережена. %s" -#: ../midori/main.c:824 +#: ../midori/main.c:852 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Немає доступних кореневих сертифікатів. Сертифікати SSL неможливо перевірити. " -#: ../midori/main.c:914 +#: ../midori/main.c:942 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Схоже, що Мідорі зазнало краху останнього разу. Якщо це трапилося не вперше, то можливо якась з наступних опцій зможе посприяти вирішенню цієї проблеми." -#: ../midori/main.c:929 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Змінити _налаштування" -#: ../midori/main.c:933 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Скинути останню _сесію" -#: ../midori/main.c:938 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Заборонити всі розширення" -#: ../midori/main.c:1178 ../midori/main.c:1909 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Неможливо завантажити сесію: %s\n" -#: ../midori/main.c:1302 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Не вказано назви файлу" -#: ../midori/main.c:1321 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Отримано невідому помилку." -#: ../midori/main.c:1352 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Знімок екрану збережено до: %s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Запустити АДРЕСУ як веб-додаток" -#: ../midori/main.c:1524 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "АДРЕСА" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Використайте ТЕКУ як теку конфігурації" -#: ../midori/main.c:1527 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "ТЕКА" -#: ../midori/main.c:1530 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Показати діалог діагностики" -#: ../midori/main.c:1532 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Виконати визначений файл як джава-скрипт" -#: ../midori/main.c:1535 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Зробити знімок вибраної сторінки/адреси" -#: ../midori/main.c:1538 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Виконати вибрану комнаду" -#: ../midori/main.c:1540 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Відобразити версію програми" -#: ../midori/main.c:1542 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Адреси" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокувати URI згідно з регулярним виразом PATTERN" -#: ../midori/main.c:1544 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "PATTERN" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Зресетувати Midori після СЕКУНД неактивності" -#: ../midori/main.c:1548 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1629 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Адреси]" -#: ../midori/main.c:1657 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" msgstr "Будь ласка надсилайте звіти, коментарі, пропозиції і помилки до:" -#: ../midori/main.c:1659 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Перевірити на наявність нової версії на:" -#: ../midori/main.c:1756 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "Це невластива тека конфігурації." -#: ../midori/main.c:1804 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Один із екземплярів програми Midori вже працює, але не відповідає на запити.\n" -#: ../midori/main.c:1859 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Неможливо завантажити пошукову машину. %s\n" -#: ../midori/main.c:1881 +#: ../midori/main.c:1925 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Неможливо завантажити закладки: %s\n" -#: ../midori/main.c:1924 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Неможливо завантажити смітник: %s\n" -#: ../midori/main.c:1938 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Неможливо завантажити історію: %s\n" -#: ../midori/main.c:1952 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Отримано наступні помилки:" -#: ../midori/main.c:1968 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ігнорувати" @@ -243,104 +249,104 @@ msgstr "Нерозпізнаний формат закладки." msgid "Writing failed." msgstr "Невдача запису." -#: ../midori/midori-browser.c:330 ../midori/midori-browser.c:4904 -#: ../midori/midori-browser.c:4910 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Оновити поточну сторінку" -#: ../midori/midori-browser.c:340 ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Зупинити завантаження поточної сторінки" -#: ../midori/midori-browser.c:454 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% завантажено" -#: ../midori/midori-browser.c:492 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Невдача при оновленні назви: %s\n" -#: ../midori/midori-browser.c:506 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Несподівана дія '%s'." -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Нова тека" -#: ../midori/midori-browser.c:730 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Редагувати теку" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Нова закладка" -#: ../midori/midori-browser.c:732 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Редагувати закладку" -#: ../midori/midori-browser.c:763 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Назва:" -#: ../midori/midori-browser.c:776 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Опис:" -#: ../midori/midori-browser.c:795 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адреса:" -#: ../midori/midori-browser.c:829 ../midori/midori-browser.c:4022 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Тека:" -#: ../midori/midori-browser.c:839 ../midori/midori-browser.c:932 -#: ../midori/midori-browser.c:4027 ../midori/midori-browser.c:4056 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Тека рівнем вище" -#: ../midori/midori-browser.c:873 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:886 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Показати в панелі інструментів" -#: ../midori/midori-browser.c:901 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Запустити як веб-додаток" -#: ../midori/midori-browser.c:978 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Немає достатньо вільного місця для завантаження \"%s\"." -#: ../midori/midori-browser.c:982 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Файл потребує %s, але тільки %s залишилося. " -#: ../midori/midori-browser.c:1039 ../midori/midori-browser.c:4064 -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Зберегти файл як" -#: ../midori/midori-browser.c:1432 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Зберегти файл" -#: ../midori/midori-browser.c:2149 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:2227 +#: ../midori/midori-browser.c:2228 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -348,691 +354,691 @@ msgstr "" "Для використання посилання вище, відкрийте переглядач новин. Звичайно віе є в меню або під кнопкою \"Нова підписка\", \"Новий виток новин\" або щось подібне.\n" "Або Ви можете перейти до Налаштування, Програми в Мідорі, і виберіть Переглядач новин. Якщо наступного Ви натиснете на іконку витка новин, то вони будуть додані автоматично." -#: ../midori/midori-browser.c:2233 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Нова стрічка новин" -#: ../midori/midori-browser.c:2276 ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 #: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Додати нову закладку" -#: ../midori/midori-browser.c:3263 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Неможливо запустити зовнішню програму." -#: ../midori/midori-browser.c:3529 ../midori/midori-browser.c:5360 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Неможливо вставити новий об'єкт історії: %s\n" -#: ../midori/midori-browser.c:3857 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:710 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Відкрити все у в_кладках" -#: ../midori/midori-browser.c:3864 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:716 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Відкрити у новій _вкладці" -#: ../midori/midori-browser.c:3867 ../midori/midori-view.c:2433 -#: ../midori/midori-view.c:4115 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:718 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Відкрити у новому _вікні" -#: ../midori/midori-browser.c:3945 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3947 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3948 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3949 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Імпорт закладок..." -#: ../midori/midori-browser.c:3976 ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Імпорт закладок" -#: ../midori/midori-browser.c:3987 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Програма:" -#: ../midori/midori-browser.c:4014 ../midori/midori-browser.c:5087 -#: ../midori/midori-websettings.c:224 ../midori/midori-websettings.c:315 -#: ../katze/katze-utils.c:692 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Інша..." -#: ../midori/midori-browser.c:4075 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Не вдалося імпортувати закладки" -#: ../midori/midori-browser.c:4113 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Не вдалося експортувати закладки" -#: ../midori/midori-browser.c:4167 +#: ../midori/midori-browser.c:4155 #, c-format msgid "Failed to clear history: %s\n" msgstr "Невдача при очищенні історії: %s\n" -#: ../midori/midori-browser.c:4175 +#: ../midori/midori-browser.c:4163 #, c-format msgid "Failed to clear search history: %s\n" msgstr "Неможливо очистити історію пошуку: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4283 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Очистити приватні дані" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4301 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Очистити наступні дані:" -#: ../midori/midori-browser.c:4312 ../midori/midori-preferences.c:533 -#: ../panels/midori-history.c:120 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Історія" -#: ../midori/midori-browser.c:4318 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Тістечка" -#: ../midori/midori-browser.c:4323 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "'Очистити' тістечка" -#: ../midori/midori-browser.c:4328 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Значки веб-сторінок" -#: ../midori/midori-browser.c:4333 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "_Закриті вкладки" -#: ../midori/midori-browser.c:4338 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Веб-кеш" -#: ../midori/midori-browser.c:4346 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Очистити приватні дані при _виході з Мідорі" -#: ../midori/midori-browser.c:4487 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Легкий переглядач Веб" -#: ../midori/midori-browser.c:4489 +#: ../midori/midori-browser.c:4474 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Ця бібліотека є вільним програмним забезпеченням; Ви можете розповсюджувати і/або модифікувати її згідно з GNU Lesser General Public License, яка опублікована Фундацією Вільного Програмного Забезпечення (Free Software Foundation), з версією 2.1 ліцензії, або (на Ваше побажання) будь-якою вищою версією." -#: ../midori/midori-browser.c:4508 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "Yarema aka Knedlyk " -#: ../midori/midori-browser.c:4817 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4819 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "_Нове вікно" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Відкрити нове вікно" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Відкрити нову вкладку" -#: ../midori/midori-browser.c:4825 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "_Режим приватності в Веб" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Не зберігати будь-яких даних під час перегляду Веб" -#: ../midori/midori-browser.c:4830 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Відкрити файл" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Зберегти в файл" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Додати до шви_дкого виклику" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Додати скорочення до швидкого виклику" -#: ../midori/midori-browser.c:4838 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Додати скорочення до _стільниці" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Додати скорочення до стільниці" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Підписатися на _стрічки новин" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Підписатися на цю стрічку новин" -#: ../midori/midori-browser.c:4847 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "_Закрити вкладку" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Закрити поточну вкладку" -#: ../midori/midori-browser.c:4850 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "З_акрити вікно" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Закрити це вікно" -#: ../midori/midori-browser.c:4854 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Надрукувати поточну сторінку" -#: ../midori/midori-browser.c:4857 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Вийти з програми" -#: ../midori/midori-browser.c:4859 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "_Редагувати" -#: ../midori/midori-browser.c:4863 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Скасувати останню зміну" -#: ../midori/midori-browser.c:4866 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Повернутися до останньої зміни" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Вирізати вибраний текст" -#: ../midori/midori-browser.c:4873 ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Копіювати вибраний текст" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Вставити текст з буфера" -#: ../midori/midori-browser.c:4882 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Видалити вибраний текст" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Виділити весь текст" -#: ../midori/midori-browser.c:4888 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Шукати слово чи фразу на сторінці" -#: ../midori/midori-browser.c:4890 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Шукати _наступне" -#: ../midori/midori-browser.c:4891 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Шукати наступне входження слова або фрази" -#: ../midori/midori-browser.c:4893 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Шукати _попереднє" -#: ../midori/midori-browser.c:4894 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Шукати попереднє входження слова або фрази" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Налаштувати властивості програми" -#: ../midori/midori-browser.c:4900 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Вигляд" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "Панелі _Інструментів" -#: ../midori/midori-browser.c:4913 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Збільшити розмір перегляду" -#: ../midori/midori-browser.c:4916 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Зменшити розмір перегляду" -#: ../midori/midori-browser.c:4919 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Відновити розмір перегляду" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Кодування" -#: ../midori/midori-browser.c:4922 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Перегляд _коду" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Переглянути вихідний код сторінки" -#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Перемкнути в повноекранний режим" -#: ../midori/midori-browser.c:4929 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Прокрутити _ліворуч" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Прокрутити вліво" -#: ../midori/midori-browser.c:4932 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Прокрутити в_низ" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Прокрутити вниз" -#: ../midori/midori-browser.c:4935 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Прокрутити в_верх" -#: ../midori/midori-browser.c:4936 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Прокрутити вверх" -#: ../midori/midori-browser.c:4938 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Прокрутити _праворуч" -#: ../midori/midori-browser.c:4939 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Прокрутити вправо" -#: ../midori/midori-browser.c:4942 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "_Перейти" -#: ../midori/midori-browser.c:4945 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Повернутись на попередню сторінку" -#: ../midori/midori-browser.c:4948 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Перейти до наступної сторінки" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4952 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Повернутись на попередню суб-сторінку" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Перейти до наступної сторінки" -#: ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Перейти на домашню сторінку" -#: ../midori/midori-browser.c:4961 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Спорожнити смітник" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Видалити вміст смітника" -#: ../midori/midori-browser.c:4964 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "Повернути закриту вкладку" -#: ../midori/midori-browser.c:4965 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Відкрити останню закриту вкладку" -#: ../midori/midori-browser.c:4971 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Додати нову _теку" -#: ../midori/midori-browser.c:4972 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Додати нову теку закладок" -#: ../midori/midori-browser.c:4977 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Експорт закладок" -#: ../midori/midori-browser.c:4980 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Налаштувати пошукові машини" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Додати, редагувати чи видалити пошукові машини..." -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Очистити приватні дані" -#: ../midori/midori-browser.c:4985 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Очистити приватні дані..." -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "Перевірити сторінку" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Перевірити сторінку і доступні знаряддя розробника" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "_Попередня вкладка" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Перейти до попередньої вкладки" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "_Наступна вкладка" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Перейти до наступної вкладки" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Фокусувати поточну вкладку" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:4989 msgid "Minimize _Current Tab" msgstr "Мінімізувати _поточну вкладку" -#: ../midori/midori-browser.c:5005 +#: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "Мінімізувати поточну вкладку" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:4992 msgid "_Duplicate Current Tab" msgstr "_Дублювати поточну вкладку" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "Дублювати поточну вкладку" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:4995 msgid "Close Ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-browser.c:5011 +#: ../midori/midori-browser.c:4996 msgid "Close all tabs except the current tab" msgstr "Закрити всі вкладки окрім поточної вкладки" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Відкрити останню _сесію" -#: ../midori/midori-browser.c:5014 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Відкрити вкладки, що збережені під час останньої сесії" -#: ../midori/midori-browser.c:5016 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "_Допомога" -#: ../midori/midori-browser.c:5018 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Зміст" -#: ../midori/midori-browser.c:5019 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Показати документацію" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Часті запитання" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Показати найуживаніші запитання (FAQ)" -#: ../midori/midori-browser.c:5024 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "П_овідомити про помилку" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Відкрити баг-трекер Мідорі" -#: ../midori/midori-browser.c:5028 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Відобразити інформацію про програму" -#: ../midori/midori-browser.c:5036 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Показати панель меню" -#: ../midori/midori-browser.c:5040 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Панель _навігації" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-browser.c:5044 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "_Бічна панель" -#: ../midori/midori-browser.c:5045 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Показати бічну панель" -#: ../midori/midori-browser.c:5048 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5049 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-browser.c:5052 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "Панель за_вантажень" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-browser.c:5056 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "Панель _стану" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Показати панель стану" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Автоматично" -#: ../midori/midori-browser.c:5068 ../midori/midori-websettings.c:218 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Китайська (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-browser.c:5075 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Корейська (EUC-KR)" -#: ../midori/midori-browser.c:5078 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Російська (KOI8-R)" -#: ../midori/midori-browser.c:5081 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Юнікод (UTF-8)" -#: ../midori/midori-browser.c:5084 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Західний (ISO-8859-1)" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Роздільник" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Адреса..." -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Відкрити певну адресу" -#: ../midori/midori-browser.c:5634 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "_Пошук у Веб..." -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Запустити пошук у Веб" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Знову відкрити закриту вкладку чи вікно" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Інструменти" -#: ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "_Вікно" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Показати список відкритих вкладок" -#: ../midori/midori-browser.c:5701 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6280 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Несподівані властивості '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Невдача при виборі з історії\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Шукати %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Шукати з %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Не вдалось виконати запит бази даних\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Вставити і про_довжити" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Від’єднати вибрану панель від вікна" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Закрити панель" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Рівняти бічну панель по лівому краю" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Приховати панель _управління" @@ -1048,562 +1054,562 @@ msgstr "Показати домашню сторінку" msgid "Show last open tabs" msgstr "Показати останньо відкриті вкладки" -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Показати останні вкладки без завантаження" -#: ../midori/midori-websettings.c:219 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Японська (SHIFT_JIS)" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Нова вкладка" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Нове вікно" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Поточна вкладка" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Типово" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Значки" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Маленькі значки" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Текст" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Значки і текст" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Текст за значками" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Автоматично (GNOME або змінні оточення)" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Сервер HTTP проксі" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Немає сервера проксі" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Всі тістечка" -#: ../midori/midori-websettings.c:294 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Тістечка сесії" -#: ../midori/midori-websettings.c:295 ../katze/katze-utils.c:668 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Нічого" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Запам'ятати останній розмір вікна" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Чи зберігати останній розмір вікна" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Ширина останнього вікна" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Остання збережена ширина вікна" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Висота останнього вікна" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Остання збережена висота вікна" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Остання позиція панелі" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Остання збережена позиція панелі" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Остання сторінка панелі" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Остання збережена сторінка панелі" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Останній пошук у Веб" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Останній збережений пошук у Веб" -#: ../midori/midori-websettings.c:440 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Показати панель меню" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Чи показувати панель меню" -#: ../midori/midori-websettings.c:449 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Показати панель навігації" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Чи показувати панель навігації" -#: ../midori/midori-websettings.c:458 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Показати панель закладок" -#: ../midori/midori-websettings.c:459 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Чи показувати панель закладок" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Показати панель" -#: ../midori/midori-websettings.c:468 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Чи показувати панель" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Показати панель завантажень" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Чи показувати панель завантажень" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Показати панель стану" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Чи показувати панель стану" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Стиль панелі:" -#: ../midori/midori-websettings.c:503 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Стиль панелі" -#: ../midori/midori-websettings.c:519 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Показати поступ у рядку адреси" -#: ../midori/midori-websettings.c:520 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Чи показувати прогрес завантаження в рядку адреси" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Доповнення рядка в вікні пошуку" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "Чи автоматично доповнювати стрічку в рядку пошуку" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Об'єкти панелі інструментів" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Об'єкти, що відображаються у панелі інструментів" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Компактна бічна панель" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Налаштування відображення компактної бічної панелі" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Показати об’єкти налаштування панелі" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Чи показувати пульт оправління панелі" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Рівняти бічну панель по правому краю" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Чи вирівнювати бічну панель по правому краю" -#: ../midori/midori-websettings.c:601 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Відкривати панелі в нових вікнах" -#: ../midori/midori-websettings.c:602 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Чи відкривати панелі в окремих вікнах" -#: ../midori/midori-websettings.c:611 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Коли Мідорі стартує:" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Що завантажувати при старті" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Домашня сторінка:" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "Домашня сторінка" -#: ../midori/midori-websettings.c:637 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Показати діалог краху" -#: ../midori/midori-websettings.c:638 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Показати діалог, коли Мідорі зазнає краху" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:654 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Показати швидкий виклик в новій вкладці" -#: ../midori/midori-websettings.c:655 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Показувати швидкий виклик в щойно відкритих вкладках" -#: ../midori/midori-websettings.c:663 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Зберігати завантажені файли до:" -#: ../midori/midori-websettings.c:664 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Завантажені файли зберігати в теку" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Запитати про теку призначення" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Чи запитувати про теку призначення при завантаженні файлу" -#: ../midori/midori-websettings.c:705 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Повідомити про закінчення завантаження" -#: ../midori/midori-websettings.c:706 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Чи показувати повідомлення про завершення завантаження" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Менеджер завантажень" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Зовнішній менеджер завантажень" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Текстовий редактор" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Зовнішній текстовий редактор" -#: ../midori/midori-websettings.c:743 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Читалка новин" -#: ../midori/midori-websettings.c:744 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Зовнішня читалка стрічок новин" -#: ../midori/midori-websettings.c:752 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Місце початку пошуку" -#: ../midori/midori-websettings.c:753 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "Здійснювати пошук всередині місця входження" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Типове кодування" -#: ../midori/midori-websettings.c:762 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Типове кодування символів" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Завжди відображати панель вкладок" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Кнопки закриття на вкладках" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Чи матимуть вкладки кнопки закриття" -#: ../midori/midori-websettings.c:790 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Відкривати нові сторінки в:" -#: ../midori/midori-websettings.c:791 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Де відкривати нові сторінки" -#: ../midori/midori-websettings.c:800 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Відкривати зовнішні сторінки в:" -#: ../midori/midori-websettings.c:801 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Де відкривати сторінки зовнішнього виклику" -#: ../midori/midori-websettings.c:810 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Середня кнопка відкриває виділене" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Завантажувати посилання URL з виділеного через клацання середньої кнопки" -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Відкривати вкладки в фоні" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Чи відкривати нові вкладки в фоновому режимі" -#: ../midori/midori-websettings.c:828 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Відкривати вкладки у наступних після поточної" -#: ../midori/midori-websettings.c:829 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Чи відкривати нові вкладки у наступній за нею чи після останньої вкладки" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Чи відкривати спливаючі вікна у вкладках" -#: ../midori/midori-websettings.c:848 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Автоматично завантажити зображення" -#: ../midori/midori-websettings.c:849 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Автоматично завантажити і показати зображення" -#: ../midori/midori-websettings.c:856 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Ввімкнути скрипти" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Ввімкнути вбудовані мови скриптів" -#: ../midori/midori-websettings.c:864 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Ввімкнути розширення Netscape" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Ввімкнути вбудовані об’єкти розширень Netscape" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Ввімкнути підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Чи дозволити підтримку баз даних HTML5" -#: ../midori/midori-websettings.c:888 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Ввімкнути підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:889 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Чи дозволити підтримку локального сховища HTML5" -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Ввімкнути кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Чи дозволити кеш веб переглядача при роботі поза мережею" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Чи збільшувати/зменшувати текст і зображення" -#: ../midori/midori-websettings.c:939 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Шукати під час вписування" -#: ../midori/midori-websettings.c:940 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Чи автоматично шукати при вписуванні" -#: ../midori/midori-websettings.c:955 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Кінетичне прокручування" -#: ../midori/midori-websettings.c:956 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Чи прокручування повинно кінетично рухатися відповідно до швидкості" -#: ../midori/midori-websettings.c:964 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Приймати тістечка" -#: ../midori/midori-websettings.c:965 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Тістечка якого типу приймати" -#: ../midori/midori-websettings.c:974 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Тривалість життя тістечка" -#: ../midori/midori-websettings.c:975 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Максимальне число днів зберігання тістечок для" -#: ../midori/midori-websettings.c:984 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Тривалість життя історії" -#: ../midori/midori-websettings.c:985 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Максимальне число днів зберігання історії для" -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Запам'ятовувати останні завантажені файли" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Чи зберігати останні завантажені файли" -#: ../midori/midori-websettings.c:1011 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Сервер проксі" -#: ../midori/midori-websettings.c:1012 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Тип проксі-сервера для використання" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "HTTP сервер проксі" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Проксі, що використовується для HTTP з'єднань" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1038 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Ідентифікувати як" -#: ../midori/midori-websettings.c:1039 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Що ідентифікувати для веб-сторінок" -#: ../midori/midori-websettings.c:1055 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Стрічка ідентифікації" -#: ../midori/midori-websettings.c:1056 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "Стрічка ідентифікації програми" -#: ../midori/midori-websettings.c:1071 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Типові мови" -#: ../midori/midori-websettings.c:1072 +#: ../midori/midori-websettings.c:1074 msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "Розділений комами список бажаних мов для відображання веб-сторінок, наприклад: \"uk\", \"uk,ru,nl\" або \"en_us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1087 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Очистити приватні дані" -#: ../midori/midori-websettings.c:1088 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Приватні дані, що вибрані для очищення" @@ -1611,237 +1617,237 @@ msgstr "Приватні дані, що вибрані для очищення" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1270 ../midori/midori-view.c:4579 -#: ../midori/midori-view.c:4583 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Помилка - %s" -#: ../midori/midori-view.c:1271 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Сторінку '%s' неможливо завантажити." -#: ../midori/midori-view.c:1273 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Спробуйте знову" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1292 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Не знайдено - %s" -#: ../midori/midori-view.c:1529 ../midori/midori-view.c:2374 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Послати повідомлення до %s" -#: ../midori/midori-view.c:2156 ../midori/midori-view.c:2541 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Перевірити _елемент" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2278 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Відкрити посилання у новій в_кладці" -#: ../midori/midori-view.c:2212 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Відкривати посилання у в_кладці переднього плану" -#: ../midori/midori-view.c:2213 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Відкрити посилання у фоновій в_кладці" -#: ../midori/midori-view.c:2216 ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Відкрити посилання у новому _вікні" -#: ../midori/midori-view.c:2219 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Відкрити посилання як веб-_додаток" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Копіювати поси_лання" -#: ../midori/midori-view.c:2225 ../midori/midori-view.c:2297 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "Збер_ігати віддаленні посилання" -#: ../midori/midori-view.c:2226 ../midori/midori-view.c:2291 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "За_вантажувати віддалені посилання" -#: ../midori/midori-view.c:2230 ../midori/midori-view.c:2260 -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Завантажувати в менеджері завантажень" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Відкрити зображення у новій _вкладці" -#: ../midori/midori-view.c:2242 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Копіювати адрес _зображення" -#: ../midori/midori-view.c:2245 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Зберегти з_ображення" -#: ../midori/midori-view.c:2246 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Завантажити _зображення" -#: ../midori/midori-view.c:2253 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Скопіювати адресу _відео" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Зберегти _відео" -#: ../midori/midori-view.c:2256 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Завантажити _відео" -#: ../midori/midori-view.c:2319 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Шукати _з" -#: ../midori/midori-view.c:2354 ../midori/midori-view.c:2361 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Шукати Веб" -#: ../midori/midori-view.c:2382 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Відкрити адресу у новій _вкладці" -#: ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Відкрити або завантажити файл" -#: ../midori/midori-view.c:2705 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Тип файлу: '%s'" -#: ../midori/midori-view.c:2708 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файлу: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2712 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Відкрити %s" -#: ../midori/midori-view.c:3256 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Перевірка сторінки - %s" -#: ../midori/midori-view.c:3538 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Швидкий виклик" -#: ../midori/midori-view.c:3539 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Клікніть щоб додати скорочення" -#: ../midori/midori-view.c:3540 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Введіть адресу скорочення" -#: ../midori/midori-view.c:3541 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Введіть назву скорочення" -#: ../midori/midori-view.c:3542 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Ви впевнені, що бажаєте видалити це скорочення?" -#: ../midori/midori-view.c:3543 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Встановити кількість колонок і рядків" -#: ../midori/midori-view.c:3544 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Введіть кількість колонок і рядків:" -#: ../midori/midori-view.c:3545 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Неправильні дані для розміру швидкого виклику" -#: ../midori/midori-view.c:3546 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "Розмір значка:" -#: ../midori/midori-view.c:3547 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Маленький" -#: ../midori/midori-view.c:3548 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Середній" -#: ../midori/midori-view.c:3549 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Великий" -#: ../midori/midori-view.c:3575 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Не можу відобразити документ" -#: ../midori/midori-view.c:3598 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Документація не заінстальована" -#: ../midori/midori-view.c:3719 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Завантаження сторінки затримане" -#: ../midori/midori-view.c:3720 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "Завантаження затримане або в зв’язку з останнім крахом або з налаштуваннями завантаження." -#: ../midori/midori-view.c:3721 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Завантажити сторінку" -#: ../midori/midori-view.c:3865 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Пуста сторінка" -#: ../midori/midori-view.c:4119 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Дублювати вкладку" -#: ../midori/midori-view.c:4124 -msgid "_Restore Tab" -msgstr "_Відновити вкладку" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Показати мітку _вкладки" -#: ../midori/midori-view.c:4124 -msgid "_Minimize Tab" -msgstr "_Мінімізувати вкладку" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Показати тільки _іконки вкладки" -#: ../midori/midori-view.c:4130 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "_Закрити інші вкладки" -#: ../midori/midori-view.c:4816 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Відобразити зображення тла" -#: ../midori/midori-view.c:4817 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Чи відобразити зображення тла" -#: ../midori/midori-view.c:4869 ../midori/midori-preferences.c:384 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Опції" @@ -2021,51 +2027,51 @@ msgstr "Налаштувати пошукові машини" msgid "Use as _default" msgstr "Використовувати по _замовчуванню" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:1288 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "_Додати закладку" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Розширення" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Історія" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "Д_омашня сторінка" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Скрипти користувача" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Нова _вкладка" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Завантаження" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Роз_ширення Netscape" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Нова _тека" @@ -2094,7 +2100,7 @@ msgstr "Підсвітити збіги" msgid "Close Findbar" msgstr "Закрити панель пошуку" -#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:270 +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 #, c-format msgid "%s of %s" msgstr "%s з %s" @@ -2108,7 +2114,7 @@ msgstr "Файл '%s' завантажено." msgid "Transfer completed" msgstr "Передачу завершено" -#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:141 +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 msgid "Clear All" msgstr "Очистити все" @@ -2128,17 +2134,11 @@ msgstr "Всі завантаження буде скасовано, якщо в msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:275 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не вдалося дадати закладку: %s\n" -#: ../panels/midori-bookmarks.c:281 ../panels/midori-history.c:142 -#: ../panels/midori-history.c:172 -#, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Невдача при видаленні об'єкту історії: %s\n" - #: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Редагувати вибрану закладку" @@ -2151,7 +2151,7 @@ msgstr "Видалити вибрану закладку" msgid "Add a new folder" msgstr "Додати нову теку" -#: ../panels/midori-bookmarks.c:568 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Роздільник" @@ -2171,19 +2171,11 @@ msgstr "Копіювати все" msgid "Extensions" msgstr "Розширення" -#: ../panels/midori-history.c:274 -msgid "Erroneous clock time" -msgstr "Неправильний час годинника" - -#: ../panels/midori-history.c:275 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "Час годинника є в минулому. Перевірте поточні дату і час." - -#: ../panels/midori-history.c:287 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Тижневої давності" -#: ../panels/midori-history.c:289 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2191,41 +2183,35 @@ msgstr[0] "%d день тому" msgstr[1] "%d днів тому" msgstr[2] "%d днів тому" -#: ../panels/midori-history.c:292 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Сьогодні" -#: ../panels/midori-history.c:294 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Вчора" -#: ../panels/midori-history.c:333 ../extensions/formhistory.c:468 -#: ../extensions/formhistory.c:472 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Не вдалось виконати запит бази даних: %s\n" - -#: ../panels/midori-history.c:371 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Ви впевнені, що бажаєте видалити всі об'єкти з історії?" -#: ../panels/midori-history.c:414 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Додати в закладки вибраний об'єкт історії" -#: ../panels/midori-history.c:423 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Видалити вибраний об'єкт історії" -#: ../panels/midori-history.c:431 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Очистити історію" -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Відкрити теку при_значення" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Копіювати поси_лання" @@ -2267,16 +2253,17 @@ msgstr "Значок '%s' не вдається завантажити" msgid "Animation frames are broken" msgstr "Кадри анімації пошкоджені" -#: ../katze/katze-utils.c:499 ../katze/katze-utils.c:894 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Властивості '%s' неправильні для %s" -#: ../katze/katze-utils.c:545 ../katze/katze-utils.c:574 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Вибрати файл" -#: ../katze/katze-utils.c:560 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Вибрати теку" @@ -2322,36 +2309,74 @@ msgstr "Блокіратор реклами" msgid "Block advertisements according to a filter list" msgstr "Блокувати рекламу використовуючи список фільтрів" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Копіювання %s до каталогу %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Скрипти користувача" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Стилі користувача" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Помилка" + +#: ../extensions/addons.c:231 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Ви впевнені, що бажаєте видалити '%s'?" + +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Видалити скрипт користувача" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Видалити стиль користувача" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Файл '%s' буде безповоротно вилучено." + +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Відкрити в текстовому редакторі" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Відкрити теку призначення" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Додати новий додаток" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Відкрити теку призначення для вибраного додатку" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Видалити вибраний додаток" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "" "Неможливо зберегти конфігурацію розширення '%s':\r\n" "%s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Додатки користувача" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Не можу моніторувати теку '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Підтримка користувацьких скриптів і стилів" @@ -2513,17 +2538,17 @@ msgstr "Видалити стрічку новин" msgid "_Feeds" msgstr "Стрічки _новин" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Не можу знайти початковий елемент в даних XML стрічки новин." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Формат стрічки новин не підтримується." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Не вдалось відкрити стрічку новин XML : %s" @@ -2544,10 +2569,6 @@ msgstr "Не можу знайти вимаганий елемент RSS \"item\ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "Не можу знайти вимаганий елемент RSS \"channel\" в даних XML" -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Помилка" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2558,33 +2579,38 @@ msgstr "Стрічка новин '%s' вже існує" msgid "Error loading feed '%s'" msgstr "Помилка завантаження стрічки новин '%s'" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Панель стрічок новин" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Читати Atom-/ RSS стрічки новин" -#: ../extensions/formhistory.c:145 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Невдача при додаванні з значенням: %s\n" -#: ../extensions/formhistory.c:517 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Не вдалось виконати запит бази даних: %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Зберігає історію введених даних форм" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:522 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Файли русурсів не встановлені" -#: ../extensions/formhistory.c:528 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Заповнювач історії форм" @@ -2677,25 +2703,25 @@ msgstr "Властивості панелі _стану" msgid "Easily toggle features on web pages on and off" msgstr "Просте включання і виключання перемикання функцій на веб-сторінках" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "Панель в_кладок" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Показати вкладки у вертикальній панелі" #: ../extensions/tabs-minimized.c:79 -msgid "Minimize new Tabs" -msgstr "Мінімізувати нові вкладки" +msgid "Only Icons on Tabs by default" +msgstr "По замовчуванню тільки іконки на вкладках " #: ../extensions/tabs-minimized.c:80 -msgid "New tabs open minimized" -msgstr "Нові вкладки відкриваються мінімізованими" +msgid "New tabs have no label by default" +msgstr "Нові вкладки по замовчуванню не будуть мати міток" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2729,6 +2755,27 @@ msgstr "Легко редагувати формат панелі інструм msgid "Cache HTTP communication on disk" msgstr "Кешувати комунікацію HTTP на диск" +#~ msgid "_Restore Tab" +#~ msgstr "_Відновити вкладку" + +#~ msgid "_Minimize Tab" +#~ msgstr "_Мінімізувати вкладку" + +#~ msgid "Erroneous clock time" +#~ msgstr "Неправильний час годинника" + +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Час годинника є в минулому. Перевірте поточні дату і час." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Копіювання %s до каталогу %s." + +#~ msgid "Minimize new Tabs" +#~ msgstr "Мінімізувати нові вкладки" + +#~ msgid "New tabs open minimized" +#~ msgstr "Нові вкладки відкриваються мінімізованими" + #~ msgid "_Recently visited pages" #~ msgstr "_Останньо відвідані сторінки" From 0cc46d6285be58cda51524ddecbed5e71c75a4ba Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Sep 2010 22:19:11 +0200 Subject: [PATCH 2938/2970] Don't leak the filename in katze_load_cached_icon --- katze/katze-utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 8e98ef43..b43869d6 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1526,6 +1526,7 @@ katze_load_cached_icon (const gchar* uri, g_free (checksum); path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "icons", filename, NULL); + g_free (filename); if ((icon = gdk_pixbuf_new_from_file_at_size (path, 16, 16, NULL))) { g_free (path); From be1a66349f6cdb69915875977ac638d6d4c6d5bd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Sep 2010 22:25:40 +0200 Subject: [PATCH 2939/2970] The background colour is not used in completion text rendering --- midori/midori-locationaction.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 4495a445..0e54d31e 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1065,7 +1065,6 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar* uri_escaped; gchar* uri; gchar* title; - GdkColor* background; gboolean style; gchar* desc; gchar* desc_uri; @@ -1085,7 +1084,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, size_t offset; gtk_tree_model_get (model, iter, URI_COL, &uri_escaped, TITLE_COL, &title, - BACKGROUND_COL, &background, STYLE_COL, &style, -1); + STYLE_COL, &style, -1); if (style) /* A search engine action */ { From 802c1eb462ee1c5fe2ae471e48e26b0c3b6d9a67 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Sep 2010 22:33:01 +0200 Subject: [PATCH 2940/2970] Always allocate and free formatted dates in history panel --- panels/midori-history.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 17f79e3d..0ccf7950 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -136,21 +136,21 @@ midori_history_format_date (KatzeItem *item) /* A negative age is a date in the future, the clock is probably off */ if (age < -1) - ; + sdate = g_strdup (""); else if (age > 7 || age < 0) { strftime (token, sizeof (token), "%x", localtime ((time_t*)&day)); sdate = g_strdup (token); } else if (age > 6) - sdate = _("A week ago"); + sdate = g_strdup (_("A week ago")); else if (age > 1) sdate = g_strdup_printf (ngettext ("%d day ago", "%d days ago", (gint)age), (gint)age); else if (age == 0) - sdate = _("Today"); + sdate = g_strdup (_("Today")); else - sdate = _("Yesterday"); + sdate = g_strdup (_("Yesterday")); return sdate; } @@ -563,8 +563,11 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column, g_object_set (renderer, "markup", NULL, "text", katze_item_get_name (item), NULL); else if (KATZE_ITEM_IS_FOLDER (item)) - g_object_set (renderer, "markup", NULL, - "text", midori_history_format_date (item), NULL); + { + gchar* formatted = midori_history_format_date (item); + g_object_set (renderer, "markup", NULL, "text", formatted, NULL); + g_free (formatted); + } else g_object_set (renderer, "markup", _("Separator"), NULL); From c4d0f3e730bfdf43fdc1132867572006e1adabc6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Sep 2010 22:45:17 +0200 Subject: [PATCH 2941/2970] Update German translation --- po/de.po | 238 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 164 insertions(+), 74 deletions(-) diff --git a/po/de.po b/po/de.po index cf54bd11..bc78bb7b 100644 --- a/po/de.po +++ b/po/de.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the midori package. # Enrico Tröger 2008 # Christian Dywan 2008-2010 -# +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.6\n" +"Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-29 04:08+0000\n" +"POT-Creation-Date: 2010-09-06 02:55+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/midori.desktop.in.h:1 @@ -91,12 +91,19 @@ msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht gespeichert werden. %s" #: ../midori/main.c:852 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht überprüft werden." +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Es ist kein Stammzertifikat verfügbar. SSL-Zertifikate können nicht " +"überprüft werden." #: ../midori/main.c:942 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " +"Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." #: ../midori/main.c:957 msgid "Modify _preferences" @@ -349,8 +356,11 @@ msgstr "Datei öffnen" #: ../midori/midori-browser.c:2228 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." msgstr "" #: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 @@ -374,18 +384,18 @@ msgid "Failed to insert new history item: %s\n" msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" #: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../panels/midori-history.c:737 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" #: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../panels/midori-history.c:743 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" #: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 #: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../panels/midori-history.c:745 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" @@ -436,14 +446,14 @@ msgid "Failed to export bookmarks" msgstr "Fehler beim Exportieren der Lesezeichen" #: ../midori/midori-browser.c:4155 -#, fuzzy, c-format +#, c-format msgid "Failed to clear history: %s\n" -msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" +msgstr "Verlauf konnte nicht geleert werden: %s\n" #: ../midori/midori-browser.c:4163 -#, fuzzy, c-format +#, c-format msgid "Failed to clear search history: %s\n" -msgstr "Verlaufseintrag konnte nicht hinzugefügt werden: %s\n" +msgstr "Suchverlauf konnte nicht geleert werden: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu #: ../midori/midori-browser.c:4270 @@ -492,8 +502,16 @@ msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." #: ../midori/midori-browser.c:4474 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU Lesser General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version 2.1 der Lizenz oder (wahlweise) jeder späteren Version." +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der " +"GNU Lesser General Public License, wie von der Free Software Foundation " +"veröffentlicht, weitergeben und/ oder modifizieren, entweder gemäß Version " +"2.1 der Lizenz oder (wahlweise) jeder späteren Version." #: ../midori/midori-browser.c:4493 msgid "translator-credits" @@ -808,30 +826,26 @@ msgid "Focus the current tab" msgstr "Den aktuellen Reiter fokussieren" #: ../midori/midori-browser.c:4989 -#, fuzzy msgid "Minimize _Current Tab" -msgstr "Neue Reiter minimieren" +msgstr "Aktuellen Reiter _Minimieren" #: ../midori/midori-browser.c:4990 msgid "Minimize the current tab" msgstr "Den aktuellen Reiter minimieren" #: ../midori/midori-browser.c:4992 -#, fuzzy msgid "_Duplicate Current Tab" -msgstr "Reiter _verdoppeln" +msgstr "Aktuellen Reiter _verdoppeln" #: ../midori/midori-browser.c:4993 msgid "Duplicate the current tab" msgstr "Den aktuellen Reiter verdoppeln" #: ../midori/midori-browser.c:4995 -#, fuzzy msgid "Close Ot_her Tabs" msgstr "Ande_re Reiter schließen" #: ../midori/midori-browser.c:4996 -#, fuzzy msgid "Close all tabs except the current tab" msgstr "Alle Reiter, bis auf den aktuellen Reiter schließen" @@ -1016,13 +1030,13 @@ msgstr "Nach %s suchen" msgid "Search with %s" msgstr "Suchen mit %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:1306 #, c-format msgid "Failed to execute database statement\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1362 msgid "Paste and p_roceed" msgstr "Einfügen und _fortfahren" @@ -1359,7 +1373,8 @@ msgstr "Benachrichtigen bei Abschluss der Übertragung" #: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" -msgstr "Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" +msgstr "" +"Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" #: ../midori/midori-websettings.c:720 msgid "Download Manager" @@ -1607,8 +1622,13 @@ msgid "Preferred languages" msgstr "Bevorzugte Sprachen" #: ../midori/midori-websettings.c:1074 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur " +"Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru," +"nl« oder »en-us;q=1.0, fr-fr;q=0.667«" #: ../midori/midori-websettings.c:1089 msgid "Clear private data" @@ -1833,13 +1853,12 @@ msgid "_Duplicate Tab" msgstr "Reiter _verdoppeln" #: ../midori/midori-view.c:4023 -#, fuzzy msgid "Show Tab _Label" -msgstr "Leiste anzeigen" +msgstr "Reiterleiste anzeigen" #: ../midori/midori-view.c:4023 msgid "Show Tab _Icon Only" -msgstr "" +msgstr "Nur Reiter_symbol anzeigen" #: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" @@ -1954,8 +1973,12 @@ msgstr "Rechtschreibwörterbücher" #. i18n: The example should be adjusted to contain a good local default #: ../midori/midori-preferences.c:432 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Eine durch Kommas getrennte Liste von Sprachen, die für die Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Eine durch Kommas getrennte Liste von Sprachen, die für die " +"Rechtschreibprüfung benutzt werden sollen, zum Beispiel »en_GB,de_DE«" #. Page "Interface" #: ../midori/midori-preferences.c:438 @@ -1991,7 +2014,7 @@ msgstr "Rechnername" #. Page "Privacy" #: ../midori/midori-preferences.c:514 msgid "Privacy" -msgstr "Privatssphäre" +msgstr "Privatsphäre" #: ../midori/midori-preferences.c:515 msgid "Web Cookies" @@ -2157,7 +2180,7 @@ msgstr "Markiertes Lesezeichen löschen" msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:572 msgid "Separator" msgstr "Trennlinie" @@ -2283,8 +2306,13 @@ msgstr "Werbefilter einstellen" #: ../extensions/adblock.c:447 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere Listen finden Sie auf %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Geben Sie die Adresse einer vorkonfigurierten Filterliste in das Textfeld " +"ein und klicken Sie »Hinzufügen« um sie zur Liste hinzuzufügen. Weitere " +"Listen finden Sie auf %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2314,45 +2342,73 @@ msgstr "Werbeblocker" msgid "Block advertisements according to a filter list" msgstr "Werbung an Hand einer Filterliste blockieren" -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Benutzerskripte" -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Benutzerstile" -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Fehler" #: ../extensions/addons.c:231 -#, c-format, fuzzy -msgid "" -"Do you really want to remove '%s'?\n" -"\n" -"The file '%s' will be permanently lost.\n" -msgstr "" -"Möchten sie '%s' wirklich entfernen? \n" -"\n" -"Die Datei '%s' wird dauerhaft entfernt.\n" +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Soll »%s« gelöscht werden?" -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Benutzerskript löschen" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Benutzerstil löschen" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Die Datei »%s« wird endgültig gelöscht." + +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "In Texteditor öffnen" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Zielordner öffnen" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Eine neue Erweiterung hinzufügen" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Zielordner für die ausgewählte Erweiterung öffnen" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Ausgewählte Erweiterung löschen" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" +msgstr "" +"Die Konfiguration der Erweiterung »%s« konnte nicht gespeichert werden: %s\n" -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Benutzererweiterungen" -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Der Ordner »%s« kann nicht überwacht werden: %s" -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Unterstützung für Benutzerskripte und -stile" @@ -2374,8 +2430,12 @@ msgid "Delete All" msgstr "Alle löschen" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene Einträge gelöscht, die auf den Filter passen" +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " +"Einträge gelöscht, die auf den Filter passen" #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2395,7 +2455,8 @@ msgstr "Frage" #: ../extensions/cookie-manager/cookie-manager-page.c:589 msgid "Only cookies which match the filter will be deleted." -msgstr "Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." +msgstr "" +"Nur Profildateien, die auf den eingegebenen Filter passen, werden gelöscht." #: ../extensions/cookie-manager/cookie-manager-page.c:677 msgid "At the end of the session" @@ -2452,8 +2513,12 @@ msgid "Filter:" msgstr "Filter:" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder Domöne auf den eingegebenen Filter passt." +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " +"Domöne auf den eingegebenen Filter passt." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2485,11 +2550,13 @@ msgstr "URL-Schemata mit Anwendungen verknüpfen" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:398 @@ -2531,7 +2598,8 @@ msgstr "XML-Quelle konnte nicht ausgelesen werden: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2543,7 +2611,8 @@ msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden. #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." +msgstr "" +"Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2693,19 +2762,23 @@ msgstr "Reiter in einer senkrechten Leiste anzeigen" #: ../extensions/tabs-minimized.c:79 msgid "Only Icons on Tabs by default" -msgstr "" +msgstr "Nur Symbole in Reitern anzeigen" #: ../extensions/tabs-minimized.c:80 msgid "New tabs have no label by default" -msgstr "" +msgstr "Neue Reiter haben keine Beschriftung" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen sich durch Ziehen und Ablegen ordnen." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." +msgstr "" +"Wähle Elemente, die in der Werkzeugleiste erscheinen sollen. Elemente lassen " +"sich durch Ziehen und Ablegen ordnen." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2731,6 +2804,16 @@ msgstr "Werkzeugleisten leicht anpassen" msgid "Cache HTTP communication on disk" msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" +#, fuzzy +#~ msgid "" +#~ "Do you really want to remove '%s'?\n" +#~ "\n" +#~ "The file '%s' will be permanently lost.\n" +#~ msgstr "" +#~ "Möchten sie '%s' wirklich entfernen? \n" +#~ "\n" +#~ "Die Datei '%s' wird dauerhaft entfernt.\n" + #~ msgid "_Recently visited pages" #~ msgstr "_Zuletzt besuchte Seiten" @@ -2752,7 +2835,8 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Detect proxy server automatically" #~ msgstr "Proxyrechner automatisch erkennen" -#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" #~ msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #~ msgid "_Restore Tab" @@ -2764,8 +2848,11 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Erroneous clock time" #~ msgstr "Fehlerhafte Uhrzeit" -#~ msgid "The clock time lies in the past. Please check the current date and time." -#~ msgstr "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das eingestellte Datum und die Uhrzeit." +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "Die Uhrzeit liegt in der Vergangenheit. Bitte überprüfen Sie das " +#~ "eingestellte Datum und die Uhrzeit." #~ msgid "Copy %s to the folder %s." #~ msgstr "%2s in den Ordner %1s kopieren." @@ -2788,8 +2875,11 @@ msgstr "HTTP-Kommunikation auf der Festplatte zwischenspeichern" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Bild in neuem Fe_nster öffnen" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den Ordner »%s«." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Kopieren Sie Benutzerskripte in den Ordner »%s« und Benutzerstile in den " +#~ "Ordner »%s«." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Die aktuelle Uhrzeit konnte nicht ermittelt werden: %s\n" From 1856912fd1278682376dca90a06c602247105069 Mon Sep 17 00:00:00 2001 From: Benjamin Maisonnas Date: Sun, 5 Sep 2010 14:38:12 +0200 Subject: [PATCH 2942/2970] Update French translation --- po/fr.po | 1720 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 957 insertions(+), 763 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5b0373b3..6c1baa33 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,15 +8,16 @@ # Jérôme Geulfucci 2009 # Stéphane Marguet 2009-2010 # Patrick Douart 2010 -# +# msgid "" msgstr "" -"Project-Id-Version: midori 0.2.4\n" +"Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-06 16:09+0000\n" -"PO-Revision-Date: 2010-05-10 13:07-0400\n" -"Last-Translator: Pascal Gervais \n" +"POT-Creation-Date: 2010-09-05 14:20+0200\n" +"PO-Revision-Date: 2010-09-05 14:26+0200\n" +"Last-Translator: Benjamin Maisonnas \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,9 +27,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur Internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1353 ../midori/main.c:1683 -#: ../midori/main.c:1691 ../midori/main.c:1707 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 +#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -36,505 +37,498 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur Internet" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:424 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n" -#: ../midori/main.c:457 +#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 #, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "La configuration n'a pas pu être enregistrée. %s" +msgid "Failed to remove history item: %s\n" +msgstr "Impossible de supprimer l'élément de l'historique : %s\n" -#: ../midori/main.c:495 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" - -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 +#: ../midori/main.c:500 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pas pu être enregistrés. %s" +#: ../midori/main.c:528 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "La configuration n'a pas pu être enregistrée. %s" + +#: ../midori/main.c:566 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" + #. i18n: Trash, or wastebin, containing closed tabs -# pas très content -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:586 ../midori/main.c:609 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:668 ../midori/main.c:908 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:880 -msgid "No root certificate file is available. SSL certificates cannot be verified." -msgstr "Aucun fichier de certificat racine disponible. Les certificats SSL ne peuvent être vérifiés." +#: ../midori/main.c:852 +msgid "" +"No root certificate file is available. SSL certificates cannot be verified." +msgstr "" +"Aucun fichier de certificat racine disponible. Les certificats SSL ne " +"peuvent être vérifiés." -#: ../midori/main.c:970 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori semble s'être interrompu de façon inattendue lors de la dernière utilisation. Si cela se produit de façon répétée, essayez l'une des options suivantes pour résoudre le problème." +#: ../midori/main.c:942 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori semble s'être interrompu de façon inattendue lors de la dernière " +"utilisation. Si cela se produit de façon répétée, essayez l'une des options " +"suivantes pour résoudre le problème." -#: ../midori/main.c:985 +#: ../midori/main.c:957 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:989 +#: ../midori/main.c:961 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:994 +#: ../midori/main.c:966 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1229 ../midori/main.c:1956 +#: ../midori/main.c:1206 ../midori/main.c:1952 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pas pu être chargée : %s\n" -#: ../midori/main.c:1353 +#: ../midori/main.c:1328 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1372 +#: ../midori/main.c:1347 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1403 +#: ../midori/main.c:1378 #, c-format msgid "Snapshot saved to: %s\n" -msgstr "Capture enregistrée sous: %s\n" +msgstr "Capture enregistrée sous : %s\n" -#: ../midori/main.c:1575 +#: ../midori/main.c:1550 msgid "Run ADDRESS as a web application" msgstr "Lancer l'ADRESSE comme une application internet" -#: ../midori/main.c:1575 +#: ../midori/main.c:1550 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1578 +#: ../midori/main.c:1553 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1578 +#: ../midori/main.c:1553 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1581 +#: ../midori/main.c:1556 msgid "Show a diagnostic dialog" msgstr "Afficher une fenêtre de diagnostic" -#: ../midori/main.c:1583 +#: ../midori/main.c:1558 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1586 +#: ../midori/main.c:1561 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1589 +#: ../midori/main.c:1564 msgid "Execute the specified command" msgstr "Exécuter la commande spécifiée" -#: ../midori/main.c:1591 +#: ../midori/main.c:1566 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1593 +#: ../midori/main.c:1568 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1595 +#: ../midori/main.c:1570 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquer les URIs conformément au MODÈLE d'expression régulière" -#: ../midori/main.c:1595 +#: ../midori/main.c:1570 msgid "PATTERN" msgstr "MODÈLE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1599 +#: ../midori/main.c:1574 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité" -#: ../midori/main.c:1599 +#: ../midori/main.c:1574 msgid "SECONDS" msgstr "SECONDES" -#: ../midori/main.c:1680 +#: ../midori/main.c:1654 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1708 +#: ../midori/main.c:1682 msgid "Please report comments, suggestions and bugs to:" -msgstr "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" +msgstr "" +"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1710 +#: ../midori/main.c:1684 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1807 +#: ../midori/main.c:1801 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1855 +#: ../midori/main.c:1849 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1910 +#: ../midori/main.c:1904 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1939 +#: ../midori/main.c:1925 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -# pas très content -#: ../midori/main.c:1971 +#: ../midori/main.c:1967 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" -# pas très content -#: ../midori/main.c:1985 +#: ../midori/main.c:1980 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1999 +#: ../midori/main.c:1994 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:2015 +#: ../midori/main.c:2010 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Fichier non trouvé." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Format de signets inconnus." -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format +#: ../midori/midori-array.c:719 msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:334 ../midori/midori-browser.c:5583 -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:344 ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:458 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% chargés" -#: ../midori/midori-browser.c:496 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" -msgstr "Impossible de mettre à jour le titre: %s\n" +msgstr "Impossible de mettre à jour le titre : %s\n" -#: ../midori/midori-browser.c:510 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nouveau dossier" -#: ../midori/midori-browser.c:726 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Modifier le dossier" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:728 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:772 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:791 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:821 ../midori/midori-browser.c:4739 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:831 ../midori/midori-browser.c:926 -#: ../midori/midori-browser.c:4744 ../midori/midori-browser.c:4776 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 msgid "Toplevel folder" msgstr "Dossier supérieur" -#: ../midori/midori-browser.c:862 +#: ../midori/midori-browser.c:872 #, fuzzy msgid "Add to _Speed Dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:875 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Afficher dans la _barre d'outils" -#: ../midori/midori-browser.c:890 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Lancer comme une application _internet" -#: ../midori/midori-browser.c:984 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Il n'y a pas assez d'espace libre pour télécharger \"%s\"." -#: ../midori/midori-browser.c:988 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "Le fichier à besoin de %s, mais seulement %s est disponible." -#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4794 -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1418 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-browser.c:1454 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Le fichier « %s » a été téléchargé." - -#: ../midori/midori-browser.c:1458 -msgid "Transfer completed" -msgstr "Transfert terminé" - -#: ../midori/midori-browser.c:1598 +#: ../midori/midori-browser.c:1433 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:1915 ../midori/midori-browser.c:1917 -#, fuzzy -msgid "Some files are being downloaded" -msgstr "Le fichier « %s » a été téléchargé." - -#: ../midori/midori-browser.c:1921 -#, fuzzy -msgid "_Quit Midori" -msgstr "Quitter Midori" - -#: ../midori/midori-browser.c:1923 -#, fuzzy -msgid "The transfers will be cancelled if Midori quits." -msgstr "Les transferts seront annulées si Midori se ferme" - -#: ../midori/midori-browser.c:2384 +#: ../midori/midori-browser.c:2150 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2462 +#: ../midori/midori-browser.c:2228 #, fuzzy msgid "" -"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." -msgstr "Pour utiliser l'URI ci-dessus ouvrez un nouvel agrégateur. Il ya habituellement un menu ou un bouton \" nouvel abonnement\", \"Nouvelles RSS \" ou similaires. \\ nAlternativement aller dans Préférences, Applications de Midori, et sélectionnez un nouvel agrégateur. La prochaine fois que vous cliquez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." +"To use the above URI open a news aggregator. There is usually a menu or " +"button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News " +"Aggregator. Next time you click the news feed icon, it will be added " +"automatically." +msgstr "" +"Pour utiliser l'URI ci-dessus ouvrez un nouvel agrégateur. Il y a " +"habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS " +"\" ou similaires. \\ nAlternativement allez dans Préférences, Applications " +"de Midori, et sélectionnez un nouvel agrégateur. La prochaine fois que vous " +"cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." -#: ../midori/midori-browser.c:2468 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nouveau flux" -#: ../midori/midori-browser.c:2511 ../midori/midori-browser.c:5648 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3084 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" - -#: ../midori/midori-browser.c:3164 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vide" - -#: ../midori/midori-browser.c:3785 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." -#: ../midori/midori-browser.c:4099 ../midori/midori-browser.c:6042 +#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Impossible d'ajouter l'élément de l'historique : %s\n" -#: ../midori/midori-browser.c:4432 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:4439 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:4442 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:4665 +#: ../midori/midori-browser.c:3931 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4666 +#: ../midori/midori-browser.c:3932 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4667 +#: ../midori/midori-browser.c:3933 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4668 +#: ../midori/midori-browser.c:3934 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4669 +#: ../midori/midori-browser.c:3935 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4690 +#: ../midori/midori-browser.c:3959 msgid "Import bookmarks..." msgstr "Importer des signets..." -#: ../midori/midori-browser.c:4693 ../midori/midori-browser.c:5653 +#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 msgid "_Import bookmarks" msgstr "_Importer des signets" -#: ../midori/midori-browser.c:4704 +#: ../midori/midori-browser.c:3973 msgid "_Application:" msgstr "_Application :" -#: ../midori/midori-browser.c:4731 ../midori/midori-browser.c:5757 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4061 msgid "Failed to import bookmarks" msgstr "Impossible d'importer les signets" -#: ../midori/midori-browser.c:4841 +#: ../midori/midori-browser.c:4102 msgid "Failed to export bookmarks" msgstr "Impossible d'exporter les signets" -#: ../midori/midori-browser.c:4895 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4155 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Impossible de supprimer l'élément de l'historique : %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Impossible de supprimer l'historique : %s\n" + +#: ../midori/midori-browser.c:4163 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Impossible de supprimer l'historique de recherche : %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:5002 +#: ../midori/midori-browser.c:4270 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:4274 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:5020 +#: ../midori/midori-browser.c:4288 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:5031 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:4303 msgid "Cookies" msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:4308 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:5047 +#: ../midori/midori-browser.c:4313 msgid "Website icons" msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:5052 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Onglets _fermés" -#: ../midori/midori-browser.c:5057 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 msgid "Web Cache" msgstr "Cache internet" -#: ../midori/midori-browser.c:5065 +#: ../midori/midori-browser.c:4331 msgid "Clear private data when _quitting Midori" msgstr "Effacer les informations privées en _quittant Midori" -#: ../midori/midori-browser.c:5166 +#: ../midori/midori-browser.c:4472 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:5168 -msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." -msgstr "Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU Lesser General Public License telle que publiée par la Free Software Foundation; soit la version 2.1 de la licence ou, à votre choix, toutes versions ultérieures." +#: ../midori/midori-browser.c:4474 +msgid "" +"This library is free software; you can redistribute it and/or modify it " +"under the terms of the GNU Lesser General Public License as published by the " +"Free Software Foundation; either version 2.1 of the License, or (at your " +"option) any later version." +msgstr "" +"Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou " +"le modifier selon les termes de la GNU Lesser General Public License telle " +"que publiée par la Free Software Foundation; soit la version 2.1 de la " +"licence ou, à votre choix, toutes versions ultérieures." -#: ../midori/midori-browser.c:5187 +#: ../midori/midori-browser.c:4493 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -543,1162 +537,1138 @@ msgstr "" "Pascal Gervais \n" "Jérôme Geulfucci " -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:4802 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:5498 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/midori-browser.c:5499 +#: ../midori/midori-browser.c:4805 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:4808 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:4810 msgid "P_rivate Browsing" msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:4811 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:4815 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:4818 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:4820 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:4821 msgid "Add shortcut to speed dial" msgstr "Ajouter un raccourci à la page d'appel rapide" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:4823 msgid "Add Shortcut to the _desktop" msgstr "Ajouter un raccourci sur le _bureau" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:4824 msgid "Add shortcut to the desktop" msgstr "Ajouter un raccourci sur le bureau" -#: ../midori/midori-browser.c:5520 +#: ../midori/midori-browser.c:4826 msgid "Subscribe to News _feed" msgstr "Souscrire au flux de _nouvelles" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4827 msgid "Subscribe to this news feed" msgstr "Souscrire à ce flux de _nouvelles" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:4832 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:5527 +#: ../midori/midori-browser.c:4833 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:5529 +#: ../midori/midori-browser.c:4835 msgid "C_lose Window" msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4836 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:4839 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:5536 +#: ../midori/midori-browser.c:4842 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:5538 +#: ../midori/midori-browser.c:4844 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:5542 +#: ../midori/midori-browser.c:4848 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../midori/midori-browser.c:5545 +#: ../midori/midori-browser.c:4851 msgid "Redo the last modification" msgstr "Refaire la dernière modification" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:4855 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:5552 ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:4864 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:4867 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:4870 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:4873 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:4875 msgid "Find _Next" msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:5570 +#: ../midori/midori-browser.c:4876 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:4878 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:5573 +#: ../midori/midori-browser.c:4879 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:4883 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:5579 +#: ../midori/midori-browser.c:4885 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:4886 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:5592 +#: ../midori/midori-browser.c:4898 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:4901 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:5598 +#: ../midori/midori-browser.c:4904 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:4905 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:4907 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:4908 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:4911 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:5608 +#: ../midori/midori-browser.c:4914 msgid "Scroll _Left" msgstr "Défilement à _gauche" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:4915 msgid "Scroll to the left" msgstr "Défilement vers la gauche" -#: ../midori/midori-browser.c:5611 +#: ../midori/midori-browser.c:4917 msgid "Scroll _Down" msgstr "Défilement en _bas" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:4918 msgid "Scroll down" msgstr "Défilement vers le bas" -#: ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:4920 msgid "Scroll _Up" msgstr "Défilement en _haut" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:4921 msgid "Scroll up" msgstr "Défilement vers le haut" -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:4923 msgid "Scroll _Right" msgstr "Défilement à _droite" -#: ../midori/midori-browser.c:5618 +#: ../midori/midori-browser.c:4924 msgid "Scroll to the right" msgstr "Défilement vers la droite" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:4927 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:5624 +#: ../midori/midori-browser.c:4930 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:4933 msgid "Go forward to the next page" msgstr "Aller à la page suivante" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:4937 msgid "Go to the previous sub-page" msgstr "Aller à la sous-page précédente" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:4941 msgid "Go to the next sub-page" msgstr "Aller à la sous-page suivante" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:4944 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:5640 +#: ../midori/midori-browser.c:4946 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:4947 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:4949 msgid "Undo _Close Tab" msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:4950 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:5650 +#: ../midori/midori-browser.c:4956 msgid "Add a new _folder" msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:4957 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:4962 msgid "_Export bookmarks" msgstr "_Exporter des signets" -#: ../midori/midori-browser.c:5659 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:4966 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:4969 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:5664 +#: ../midori/midori-browser.c:4970 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:4974 msgid "_Inspect Page" msgstr "_Inspecter la page" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:4975 msgid "Inspect page details and access developer tools..." msgstr "Inspecter les détails de la page et accéder aux outils développeur..." -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:4980 msgid "_Previous Tab" msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:4981 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:4983 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:4984 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:4986 msgid "Focus _Current Tab" msgstr "_Focaliser l'onglet actuel" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:4987 msgid "Focus the current tab" msgstr "Focaliser l'onglet actuel" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:4989 +#, fuzzy +msgid "Minimize _Current Tab" +msgstr "_Minimiser l'onglet" + +#: ../midori/midori-browser.c:4990 +#, fuzzy +msgid "Minimize the current tab" +msgstr "Fermer l'onglet actuel" + +#: ../midori/midori-browser.c:4992 +msgid "_Duplicate Current Tab" +msgstr "_Dupliquer l'onglet actif" + +#: ../midori/midori-browser.c:4993 +msgid "Duplicate the current tab" +msgstr "Duplique l'onglet actif" + +#: ../midori/midori-browser.c:4995 +msgid "Close Ot_her Tabs" +msgstr "Fermer les _autres onglets" + +#: ../midori/midori-browser.c:4996 +msgid "Close all tabs except the current tab" +msgstr "Fermer tous les onglets sauf l'onglet actuel" + +#: ../midori/midori-browser.c:4998 msgid "Open last _session" msgstr "Ouvrir la _dernière session" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:4999 msgid "Open the tabs saved in the last session" msgstr "Ouvrir les onglets enregistrés dans la dernière session" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5001 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:5688 +#: ../midori/midori-browser.c:5003 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:5689 +#: ../midori/midori-browser.c:5004 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:5691 +#: ../midori/midori-browser.c:5006 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5007 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5009 msgid "_Report a Bug" msgstr "Signaler une _anomalie" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5010 msgid "Open Midori's bug tracker" msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5013 msgid "Show information about the program" msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5021 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5022 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5025 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5026 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5029 msgid "Side_panel" msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5030 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5033 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5034 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:5722 +#: ../midori/midori-browser.c:5037 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5038 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:5726 +#: ../midori/midori-browser.c:5041 msgid "_Statusbar" msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5042 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:5735 +#: ../midori/midori-browser.c:5050 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:5738 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5742 +#: ../midori/midori-browser.c:5057 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:5745 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Coréen (EUC-KR)" -#: ../midori/midori-browser.c:5748 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:5751 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5754 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6300 +#: ../midori/midori-browser.c:5588 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:6307 +#: ../midori/midori-browser.c:5595 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:6309 +#: ../midori/midori-browser.c:5597 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:6333 +#: ../midori/midori-browser.c:5621 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:6335 +#: ../midori/midori-browser.c:5623 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:6356 +#: ../midori/midori-browser.c:5644 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:6371 -msgid "_Recently visited pages" -msgstr "Pages _récemment visitées" - -#: ../midori/midori-browser.c:6373 -msgid "Reopen pages that you visited earlier" -msgstr "Rouvrir des pages précédemment visitées" - -#: ../midori/midori-browser.c:6388 ../midori/sokoke.c:1295 -msgid "_Bookmarks" -msgstr "_Signets" - -#: ../midori/midori-browser.c:6390 -msgid "Show the saved bookmarks" -msgstr "Afficher les signets sauvegardés" - -#: ../midori/midori-browser.c:6405 +#: ../midori/midori-browser.c:5659 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:6418 +#: ../midori/midori-browser.c:5676 msgid "_Window" msgstr "Fe_nêtre" -#: ../midori/midori-browser.c:6420 +#: ../midori/midori-browser.c:5678 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:6434 +#: ../midori/midori-browser.c:5692 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6436 +#: ../midori/midori-browser.c:5694 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6640 -msgid "_Inline Find:" -msgstr "_Recherche rapide :" - -#: ../midori/midori-browser.c:6671 -msgid "Previous" -msgstr "Précedent" - -#: ../midori/midori-browser.c:6676 -msgid "Next" -msgstr "Suivant" - -#: ../midori/midori-browser.c:6681 -msgid "Match Case" -msgstr "Sensible à la casse" - -#: ../midori/midori-browser.c:6690 -msgid "Highlight Matches" -msgstr "Surligner les résultats" - -#: ../midori/midori-browser.c:6702 -msgid "Close Findbar" -msgstr "Fermer la barre de recherche" - -#: ../midori/midori-browser.c:6748 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Effacer tout" - -#: ../midori/midori-browser.c:7104 +#: ../midori/midori-browser.c:6262 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" -msgstr "Impossible de sélectionner de l'historique\n" +msgstr "Impossible de sélectionner dans l'historique\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Rechercher %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Rechercher avec %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1307 #, c-format msgid "Failed to execute database statement\n" msgstr "Impossible d'exécuter l'instruction de base de données\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1363 msgid "Paste and p_roceed" msgstr "Coller et continue_r" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Détacher le panneau choisi de la fenêtre" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 msgid "Align sidepanel to the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 msgid "Align sidepanel to the left" msgstr "Aligner le panneau latéral sur la gauche" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:771 msgid "Hide operating controls" msgstr "Cacher les contrôles" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" -msgstr "Afficher une Page vierge" +msgstr "Afficher une page vierge" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Afficher la page d'accueil" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Afficher les derniers onglets ouverts" -#: ../midori/midori-websettings.c:207 -#, fuzzy +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" -msgstr "Afficher les derniers onglets sans charger" +msgstr "Afficher les derniers onglets sans les charger" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Petites icônes" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Icônes et texte" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Texte à côté des icônes" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automatique (GNOME ou de l'environnement)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Pas de serveur mandataire" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Dernière recherche sur Internet" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "La dernière recherche sur Internet enregistrée" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Indique s'il faut afficher la barre des transferts" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Moteurs de recherche dans la complétion" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" -msgstr "Indique s'il faut afficher les moteurs de recherche dans les résultats de complétion de la barre d'adresse" +msgstr "" +"Indique s'il faut afficher les moteurs de recherche dans les résultats de " +"complétion de la barre d'adresse" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Afficher les élements de contrôle du panneau" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Indique s'il faut afficher les élements de contrôle du panneau" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Ouvrir les panneaux dans une fenêtre séparée" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" -msgstr "Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" +msgstr "" +"Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Au lancement de Midori :" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Que faire au lancement de Midori" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Fenêtre de fermeture inattendue" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Afficher la page d'appel rapide dans les nouveaux onglets" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Enregistrer les téléchargements sous :" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les fichiers téléchargés" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Demander le dossier de destination" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Indique s'il faut demander le dossier de destination quand un fichier est téléchargé." +msgstr "" +"Indique s'il faut demander le dossier de destination quand un fichier est " +"téléchargé." -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Signaler la fin des transferts" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Indique s'il faut signaler la fin d'un transfert par une notification" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Agrégateur de flux" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Un agrégateur de flux externe" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Encodage favori des caractères" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Ouvrir les nouvelles pages dans :" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Lieu où les nouvelles pages doivent être ouvertes" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Ouvrir les pages externes dans :" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Lieu où les pages externes doivent être ouvertes" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Un clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" -msgstr "Charger l'addresse de la sélection avec un clic du bouton central de la souris" +msgstr "" +"Charger l'addresse de la sélection avec un clic du bouton central de la " +"souris" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" -msgstr "Ouvrir les onglets à côté de l'actuel" +msgstr "Ouvrir les onglets à côté de l'onglet actif" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou après le dernier" +msgstr "" +"Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actif ou " +"après le dernier" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtre intempestives dans des onglets" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" -msgstr "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" +msgstr "" +"Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Charger les images automatiquement" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Activer le support de base de données HTML5" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Indique s'il faut activer le support de base de données de HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Activer le support de stockage local de HTML5" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Indique s'il faut activer le support de stockage local de HTML5" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Activer le cache d'applications web hors ligne" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Indique s'il faut activer le cache des applications web hors ligne" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Chercher pendant la saisie" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" -msgstr "Indique s'il faut chercher automatiquement dans la page pendant la saisie" +msgstr "" +"Indique s'il faut chercher automatiquement dans la page pendant la saisie" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Défilement cinétique" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" -msgstr "Indique si le défilement doit se déplacer cinétiquement en fonction de la vitesse" +msgstr "" +"Indique si le défilement doit se déplacer cinétiquement en fonction de la " +"vitesse" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Accepter les cookies" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Type de fichiers témoins (cookies) à accepter" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Uniquement les cookies d'origine" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Accepter les fichiers témoins du site d'origine uniquement" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Âge maximal des cookies" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" -msgstr "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" +msgstr "" +"Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Se souvenir des dernières pages visitées" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "Indique s'il faut enregistrer les dernières pages visitées" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" -msgstr "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" +msgstr "" +"Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "Le type de serveur mandataire à utiliser" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Serveur mandataire HTTP" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "Détecter le serveur mandataire automatiquement" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages Internet" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" -msgstr "Langages préférés" +msgstr "Langues préférés" -#: ../midori/midori-websettings.c:1125 -msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "Une liste des langues préférées séparées par une virgule pour le rendu des pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" +#: ../midori/midori-websettings.c:1074 +msgid "" +"A comma separated list of languages preferred for rendering multilingual " +"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" +"Une liste des langues préférées séparées par une virgule pour le rendu des " +"pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;" +"q=0.667\"" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Effacer les informations privées" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Les informations privées sélectionnées pour la suppression" @@ -1706,393 +1676,398 @@ msgstr "Les informations privées sélectionnées pour la suppression" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Erreur - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Essayer une autre fois" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Envoyer un message à %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspecter l'élé_ment" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Foreground Tab" msgstr "Ouvrir le lien en a_vant plan" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2118 msgid "Open Link in _Background Tab" msgstr "Ouvrir le lien en a_rrière plan" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2124 msgid "Open Link as Web A_pplication" msgstr "Ouvrir le lien comme une appli_cation internet" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2127 msgid "Copy Link de_stination" msgstr "Copier l'adre_sse du lien" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 msgid "Download with Download _Manager" msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2144 msgid "Open _Image in New Tab" msgstr "Ouvrir l'image dans un _nouvel onglet" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2147 msgid "Copy Image _Address" msgstr "Copier l'_adresse de l'image" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2150 msgid "Save I_mage" msgstr "Enregistrer l'i_mage" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2151 msgid "Download I_mage" msgstr "Téléc_harger l'image" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2158 msgid "Copy Video _Address" msgstr "Copier l'_adresse de la vidéo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2161 msgid "Save _Video" msgstr "Enregistrer la _vidéo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2161 msgid "Download _Video" msgstr "Télécharger la _vidéo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2224 msgid "Search _with" msgstr "Rechercher _avec" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Rechercher sur Internet" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Appel rapide" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Cliquez pour ajouter un raccourci" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Entrez l'adresse du raccourci" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Entrez le titre du raccourci" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" -#: ../midori/midori-view.c:3518 -#, fuzzy +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Choisir le nombre de colonnes et de lignes" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Entrer le nombre de colonnes et de lignes" -#: ../midori/midori-view.c:3520 -#, fuzzy +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" -msgstr "Entrée invalide pour la taille de la boite de dialogue vitesse" +msgstr "Entrée invalide pour la taille de la page d'appel rapide" -#: ../midori/midori-view.c:3521 -#, fuzzy +#: ../midori/midori-view.c:3447 msgid "Thumb size:" -msgstr "Taille des vignettes:" +msgstr "Taille des vignettes :" -#: ../midori/midori-view.c:3522 -#, fuzzy +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Petites" -#: ../midori/midori-view.c:3523 -#, fuzzy +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Moyennes" -#: ../midori/midori-view.c:3524 -#, fuzzy +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Grandes" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" -#: ../midori/midori-view.c:3694 -#, fuzzy +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" -msgstr "Chargement de la page retardé" +msgstr "Chargement de la page différé" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3619 #, fuzzy msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "Chargement différé, soit en raison d'un récent accident ou les préférences de démarrage." +msgstr "" +"Chargement différé, soit en raison d'un récent incident, soit des " +"préférences de démarrage." -#: ../midori/midori-view.c:3696 -#, fuzzy +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Charger la page" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Dupliquer l'onglet" -#: ../midori/midori-view.c:4105 -msgid "_Restore Tab" -msgstr "_Restorer l'onglet" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Afficher l'intitulé de l'onglet" -#: ../midori/midori-view.c:4105 -msgid "_Minimize Tab" -msgstr "_Minimiser l'onglet" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Afficher l'icône de l'onglet uniquement" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-view.c:4783 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:4784 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-view.c:4836 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "Fonctionnalités" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferts" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "La police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "La taille par défaut de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Police à largeur fixe" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" -msgstr "La taille de la police utilisée pour afficher les textes à largeur fixe" +msgstr "" +"La taille de la police utilisée pour afficher les textes à largeur fixe" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "La taille minimale de la police utilisée pour afficher les textes" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Autorisés les scripts à ouvrir des popups" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives (popups) automatiquement" +msgstr "" +"Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives " +"(popups) automatiquement" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Vérificateur d'orthographe" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:425 msgid "Enable Spell Checking" msgstr "Activer la vérification de l'orthographe" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:426 msgid "Enable spell checking while typing" msgstr "Activer la vérification de l'orthographe lors de la saisie" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:428 msgid "Spelling dictionaries:" msgstr "Dictionnaires d'orthographe :" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" -msgstr "Une liste de langues séparées par des virgules, utilisées par le vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »" +#: ../midori/midori-preferences.c:432 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Une liste de langues séparées par des virgules, utilisées par le " +"vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:438 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:439 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:449 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:471 msgid "Applications" msgstr "Applications" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:472 msgid "External applications" msgstr "Applications externes" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:495 msgid "Hostname" msgstr "Nom de l'hôte" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:514 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:515 msgid "Web Cookies" msgstr "Fichiers témoins" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 msgid "days" msgstr "jours" +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "Vide" + #: ../midori/midori-searchaction.c:917 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" @@ -2121,68 +2096,131 @@ msgstr "Gestion des moteurs de recherche" msgid "Use as _default" msgstr "Par dé_faut" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "_Signets" + +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Ajouter un s_ignet" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "Page d'a_ccueil" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nouvel o_nglet" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Greffons _Netscape" -#: ../midori/sokoke.c:1307 -#, fuzzy +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nouveau dossier" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "_Recherche rapide :" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "Précedent" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "Suivant" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "Sensible à la casse" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "Surligner les résultats" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "Fermer la barre de recherche" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s sur %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Le fichier « %s » a été téléchargé." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Transfert terminé" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "Effacer tout" + +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "Des fichiers sont en cours de téléchargement" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "_Quitter Midori" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Les transferts seront annulés si Midori se ferme." + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:275 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Échec de l'ajout du signet : %s\n" + +#: ../panels/midori-bookmarks.c:414 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:422 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:436 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 msgid "Separator" msgstr "Séparateur" @@ -2191,73 +2229,57 @@ msgid "Console" msgstr "Console" #: ../panels/midori-console.c:361 -#, fuzzy msgid "Copy _All" -msgstr "Masquer tous" +msgstr "Tout copier" #: ../panels/midori-console.c:362 -#, fuzzy msgid "Copy All" -msgstr "Masquer tous" +msgstr "Copie tout" #: ../panels/midori-extensions.c:91 msgid "Extensions" msgstr "Extensions" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Temps d'horloge incorrect" - -#: ../panels/midori-history.c:274 -msgid "The clock time lies in the past. Please check the current date and time." -msgstr "L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la date et l'heure." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Il y a une semaine" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "Il y a %d jour" msgstr[1] "Il y a %d jours" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Hier" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Supprimer l'élément sélectionné dans l'historique" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Effacer tout l'historique" -# manque un raccourcis Alt+X -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtre :" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Ouvrir le _dossier de destination" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copier l'_adresse du lien" @@ -2299,16 +2321,17 @@ msgstr "L'icône prédéfinie « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Choisissez un dossier" @@ -2323,8 +2346,13 @@ msgstr "Configurer les filtres de publicité" #: ../extensions/adblock.c:447 #, c-format -msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." -msgstr "Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de listes à %s." +msgid "" +"Type the address of a preconfigured filter list in the text entry and click " +"\"Add\" to add it to the list. You can find more lists at %s." +msgstr "" +"Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte " +"et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de " +"listes à %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2336,7 +2364,7 @@ msgstr "Modifier les règles" #: ../extensions/adblock.c:854 msgid "_Rule:" -msgstr "_Regles :" +msgstr "_Règles :" #: ../extensions/adblock.c:908 msgid "Bl_ock image" @@ -2346,42 +2374,84 @@ msgstr "_Bloquer l'image" msgid "Bl_ock link" msgstr "B_loquer le lien" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1494 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1495 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copier %s dans le dossier %s" - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Scripts utilisateur" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Styles utilisateur" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Erreur" + +#: ../extensions/addons.c:231 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Ètes-vous certain de vouloir supprimer '%s' ?" + +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Supprime le script utilisateur" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Supprimer un style utilisateur" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Le fichier « %s » sera définitivement supprimé." + +#: ../extensions/addons.c:377 ../extensions/addons.c:454 + +msgid "Open in Text Editor" +msgstr "Ouvrir dans l'éditeur de texte" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 + +msgid "Open Target Folder" +msgstr "Ouvrir le _dossier de destination" + +#: ../extensions/addons.c:445 + +msgid "Add new addon" +msgstr "Ajouter une extension" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Ouvrir le dossier de destination pour l'extension sélectionnée" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Supprimer l'extension sélectionnée" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" +msgstr "" +"La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Extensions utilisateur" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" -msgstr "Ne peut contrôler le dossier « %s » : %s" +msgstr "Impossible de surveiller le dossier « %s » : %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Support des scripts et styles utilisateur" @@ -2403,8 +2473,12 @@ msgid "Delete All" msgstr "Supprimer tous" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "Supprimer tous les témoins visibles. Si un filtre est appliqué, seuls les fichiers témoins correspondant au filtre seront effacés." +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Supprimer tous les fichiers témoins visibles. Si un filtre est appliqué, seuls les " +"fichiers témoins correspondant au filtre seront effacés." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2476,9 +2550,18 @@ msgstr "_Afficher tous" msgid "_Collapse All" msgstr "_Masquer tous" +# manque un raccourcis Alt+X +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtre :" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine correspondent au filtre entré." +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine " +"correspondent au filtre entré." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2488,13 +2571,36 @@ msgstr "Gestionnaire de _cookies" msgid "List, view and delete cookies" msgstr "Lister, afficher et supprimer les fichiers témoins" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Copier l'_adresse des onglets" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "Copie l'adresse des onglets" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copier les adresses de tous les onglets vers le presse-papiers" + +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Applications externes" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Associer des modèles d'URL avec des applications externes" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "Impossible de trouver les éléments ATOM \"entry\" requis dans les données XML." +msgstr "" +"Impossible de trouver les éléments ATOM \"entry\" requis dans les données " +"XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML." +msgstr "" +"Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:398 @@ -2519,24 +2625,25 @@ msgstr "Supprimer un flux" msgid "_Feeds" msgstr "_Flux" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Impossible de trouver l'élément racine dans les données XML du flux." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Format de flux non pris en charge." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Impossible d'analyser le flux XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." +msgstr "" +"Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2544,15 +2651,14 @@ msgstr "La version trouvée du flux RSS n'est pas prise en charge." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "Impossible de trouver les éléments \"item\" requis dans les données XML." +msgstr "" +"Impossible de trouver les éléments \"item\" requis dans les données XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "Impossible de trouver les éléments RSS \"channel\" requis dans les données XML." - -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Erreur" +msgstr "" +"Impossible de trouver les éléments RSS \"channel\" requis dans les données " +"XML." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2564,36 +2670,67 @@ msgstr "Le flux « %s » existe déjà" msgid "Error loading feed '%s'" msgstr "Erreur lors du chargement du flux « %s »" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:520 msgid "Feed Panel" msgstr "Panneau de flux" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:521 msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Impossible d'ajouter la valeur de formulaire : %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" + +#: ../extensions/formhistory.c:503 msgid "Stores history of entered form data" msgstr "Stocke l'historique des saisies de formulaire" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:507 #, c-format msgid "Not available: %s" msgstr "Non disponible : %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:508 msgid "Resource files not installed" msgstr "Fichiers ressources non installés" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:514 msgid "Form history filler" msgstr "Autocomplétion des formulaires" +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Onglet suivant (historique)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Onglet suivant de l'historique" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Onglet précédent (historique)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Onglet précédent de l'historique" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Liste de l'historique des onglets" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" +"Permettre de changer d'onglet en choisissant dans une liste triée par " +"dernière utilisation" + #: ../extensions/mouse-gestures.c:303 msgid "Mouse Gestures" msgstr "Mouvements de souris" @@ -2631,6 +2768,14 @@ msgstr "Raccourcis" msgid "View and edit keyboard shortcuts" msgstr "Afficher et modifier les raccourcis clavier" +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "Horloge de barre d'état" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "Afficher la date et l'heure dans la barre d'état" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Images" @@ -2649,34 +2794,37 @@ msgstr "Fonctionnalités dans la barre d'état" #: ../extensions/statusbar-features.c:150 msgid "Easily toggle features on web pages on and off" -msgstr "Activer et désactiver facilement des fonctionnalités sur les pages Internet" +msgstr "" +"Activer et désactiver facilement des fonctionnalités sur les pages Internet" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 msgid "Tab Panel" msgstr "Panneau d'onglets" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:612 msgid "T_ab Panel" msgstr "P_anneau d'onglets" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:629 msgid "Show tabs in a vertical panel" msgstr "Afficher les onglets dans un panneau vertical" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Liste de l'historique des onglets" +#: ../extensions/tabs-minimized.c:79 +msgid "Only Icons on Tabs by default" +msgstr "Onglets sans intitulé" -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "Permettre de changer d'onglet en choisissant dans une liste triée par dernière utilisation" +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs have no label by default" +msgstr "Les nouveaux onglets n'ont qu'une icône par défaut" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" #: ../extensions/toolbar-editor.c:405 -msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgid "" +"Select items to be displayed on the toolbar. Items can be reodered by drag " +"and drop." msgstr "" "Sélectionnez les éléments à afficher sur la barre d'outils.\n" "Ils peuvent être réorganisés par glisser-déposer." @@ -2705,21 +2853,65 @@ msgstr "Éditer facilement la disposition de la barre d'outils" msgid "Cache HTTP communication on disk" msgstr "Mettre en cache les communication HTTP sur le disque" +#~ msgid "_Recently visited pages" +#~ msgstr "Pages _récemment visitées" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Rouvrir des pages précédemment visitées" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Afficher les signets sauvegardés" + +#~ msgid "Original cookies only" +#~ msgstr "Uniquement les cookies d'origine" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Accepter les fichiers témoins du site d'origine uniquement" + +#~ msgid "Remember last visited pages" +#~ msgstr "Se souvenir des dernières pages visitées" + +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Indique s'il faut enregistrer les dernières pages visitées" + +#~ msgid "Detect proxy server automatically" +#~ msgstr "Détecter le serveur mandataire automatiquement" + +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "" +#~ "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" + +#~ msgid "_Restore Tab" +#~ msgstr "_Restorer l'onglet" + +#~ msgid "Erroneous clock time" +#~ msgstr "Heure de l'horloge incorrecte" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez " +#~ "la date et l'heure." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copier %s dans le dossier %s." + #~ msgid "Open _Link" #~ msgstr "Ouvrir le _lien" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Ouvrir l'image dans une nouvelle fe_nêtre" -#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "Copier le scripts utilisateur dans le dossier %s et les styles utilisateurs dans le dossier %s." +#~ msgid "" +#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "" +#~ "Copier le scripts utilisateur dans le dossier %s et les styles " +#~ "utilisateurs dans le dossier %s." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Impossible d'obtenir l'heure actuelle : %s\n" -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Impossible d'ajouter l'élément à l'historique : %s\n" - #~ msgid "Not available on this platform" #~ msgstr "Non disponible sur cette plate-forme" @@ -2739,7 +2931,8 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgstr "Réduire la taille des images" #~ msgid "Automatically shrink standalone images to fit" -#~ msgstr "Réduire automatiquement la taille des images pour les adapter à la fenêtre" +#~ msgstr "" +#~ "Réduire automatiquement la taille des images pour les adapter à la fenêtre" #~ msgid "Enable developer tools" #~ msgstr "Activer les outils de développement" @@ -2775,7 +2968,8 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgstr "Se souvenir du contenu des derniers formulaires remplis" #~ msgid "Whether the last form inputs are saved" -#~ msgstr "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" +#~ msgstr "" +#~ "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" #~ msgid "Cache size" #~ msgstr "Taille du cache" From d8b4eaa566f6d70ca73013f0a8691d2da69c0c03 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Sep 2010 21:30:45 +0200 Subject: [PATCH 2943/2970] Do smart case for inline search while typing --- toolbars/midori-findbar.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c index fa72a3aa..5b7ca9d7 100644 --- a/toolbars/midori-findbar.c +++ b/toolbars/midori-findbar.c @@ -83,6 +83,19 @@ midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry, gtk_entry_set_text (GTK_ENTRY (entry), ""); } +static gboolean +midori_findbar_case_sensitive (MidoriFindbar* findbar) +{ + /* Smart case while typing: foo or fOO lowercase, Foo or FOO uppercase */ + if (findbar->find_typing) + { + const gchar* text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); + return g_unichar_isupper (g_utf8_get_char (text)); + } + return gtk_toggle_tool_button_get_active ( + GTK_TOGGLE_TOOL_BUTTON (findbar->find_case)); +} + void midori_findbar_find (MidoriFindbar* findbar, gboolean forward) @@ -96,8 +109,7 @@ midori_findbar_find (MidoriFindbar* findbar, return; text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); - case_sensitive = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (findbar->find_case)); + case_sensitive = midori_findbar_case_sensitive (findbar); midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); } @@ -315,8 +327,7 @@ midori_findbar_search_text (MidoriFindbar* findbar, GTK_ICON_ENTRY_PRIMARY, (found) ? GTK_STOCK_FIND : GTK_STOCK_STOP); #endif text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); - case_sensitive = gtk_toggle_tool_button_get_active ( - GTK_TOGGLE_TOOL_BUTTON (findbar->find_case)); + case_sensitive = midori_findbar_case_sensitive (findbar); midori_view_mark_text_matches (MIDORI_VIEW (view), text, case_sensitive); highlight = gtk_toggle_tool_button_get_active ( GTK_TOGGLE_TOOL_BUTTON (findbar->find_highlight)); From 38d75adc28c30a3e102eb0597e530dd7b66c9356 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Sep 2010 21:39:52 +0200 Subject: [PATCH 2944/2970] Search inline with at least 2, not 3 characters --- toolbars/midori-findbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolbars/midori-findbar.c b/toolbars/midori-findbar.c index 5b7ca9d7..edb8f35d 100644 --- a/toolbars/midori-findbar.c +++ b/toolbars/midori-findbar.c @@ -170,7 +170,7 @@ midori_findbar_text_changed_cb (GtkWidget* entry, GtkWidget* view = midori_browser_get_current_tab (browser); const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); midori_view_unmark_text_matches (MIDORI_VIEW (view)); - if (g_utf8_strlen (text, -1) > 2) + if (g_utf8_strlen (text, -1) > 1) midori_findbar_find (findbar, TRUE); } } From 1b80f16bf4f0c59cd7cf95119334c246cde4c4f5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Sep 2010 22:24:11 +0200 Subject: [PATCH 2945/2970] Remove browser-count, midori_panel_set_compact, console toolbar --- midori/midori-app.c | 22 +--------------------- midori/midori-panel.c | 17 ----------------- midori/midori-panel.h | 4 ---- panels/midori-console.c | 18 ++++-------------- panels/midori-console.h | 3 --- 5 files changed, 5 insertions(+), 59 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index d4cfd16b..52148978 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -96,8 +96,7 @@ enum PROP_HISTORY, PROP_EXTENSIONS, PROP_BROWSERS, - PROP_BROWSER, - PROP_BROWSER_COUNT + PROP_BROWSER }; enum { @@ -394,22 +393,6 @@ midori_app_class_init (MidoriAppClass* class) "The current browser", MIDORI_TYPE_BROWSER, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - - /** - * MidoriApp:browser-count: - * - * The number of browsers. - * - * Deprecated: 0.1.3 Use MidoriApp:browsers instead. - */ - g_object_class_install_property (gobject_class, - PROP_BROWSER_COUNT, - g_param_spec_uint ( - "browser-count", - "Browser Count", - "The current number of browsers", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void @@ -858,9 +841,6 @@ midori_app_get_property (GObject* object, case PROP_BROWSER: g_value_set_object (value, app->browser); break; - case PROP_BROWSER_COUNT: - g_value_set_uint (value, katze_array_get_length (app->browsers)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 9747b342..07ecfff1 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -570,23 +570,6 @@ midori_panel_new (void) return GTK_WIDGET (panel); } -/** - * midori_panel_set_compact: - * @compact: %TRUE if the panel should be compact - * - * Determines if the panel should be compact. - * - * Deprecated: 0.1.9 - **/ -void -midori_panel_set_compact (MidoriPanel* panel, - gboolean compact) -{ - g_return_if_fail (MIDORI_IS_PANEL (panel)); - - g_object_set (panel, "show-titles", !compact, NULL); -} - /** * midori_panel_set_right_aligned: * @right_aligned: %TRUE if the panel should be aligned to the right diff --git a/midori/midori-panel.h b/midori/midori-panel.h index d9a1fe19..87166674 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -42,10 +42,6 @@ midori_panel_get_type (void) G_GNUC_CONST; GtkWidget* midori_panel_new (void); -void -midori_panel_set_compact (MidoriPanel* panel, - gboolean compact); - void midori_panel_set_right_aligned (MidoriPanel* panel, gboolean right_aligned); diff --git a/panels/midori-console.c b/panels/midori-console.c index b70cf11a..922d9e34 100644 --- a/panels/midori-console.c +++ b/panels/midori-console.c @@ -59,6 +59,9 @@ midori_console_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static GtkWidget* +midori_console_get_toolbar (MidoriViewable* console); + static void midori_console_class_init (MidoriConsoleClass* class) { @@ -327,22 +330,9 @@ midori_console_new (void) return GTK_WIDGET (console); } -/** - * midori_console_get_toolbar: - * @console: a #MidoriConsole - * - * Retrieves the toolbar of the console. A new widget is created on - * the first call of this function. - * - * Return value: a toolbar widget - * - * Deprecated: 0.1.2: Use midori_viewable_get_toolbar() instead. - **/ -GtkWidget* +static GtkWidget* midori_console_get_toolbar (MidoriViewable* console) { - g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL); - if (!MIDORI_CONSOLE (console)->toolbar) { GtkWidget* toolbar; diff --git a/panels/midori-console.h b/panels/midori-console.h index 011837dc..b3fa760c 100644 --- a/panels/midori-console.h +++ b/panels/midori-console.h @@ -42,9 +42,6 @@ midori_console_get_type (void); GtkWidget* midori_console_new (void); -GtkWidget* -midori_console_get_toolbar (MidoriViewable* console); - void midori_console_add (MidoriConsole* console, const gchar* message, From 7ac801799fb497aeb47936f7e6fcd45f96c2c1c4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Sep 2010 22:39:51 +0200 Subject: [PATCH 2946/2970] Remove katze_net_new and katze_net_get_session --- katze/katze-net.c | 49 +++-------------------------------------------- katze/katze-net.h | 6 ------ 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 6467832f..63f7aa82 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -71,16 +71,7 @@ katze_net_finalize (GObject* object) G_OBJECT_CLASS (katze_net_parent_class)->finalize (object); } -/** - * katze_net_new: - * - * Instantiates a new #KatzeNet instance. - * - * Return value: a new #KatzeNet - * - * Deprecated: 0.2.7 - **/ -KatzeNet* +static KatzeNet* katze_net_new (void) { static KatzeNet* net = NULL; @@ -97,23 +88,6 @@ katze_net_new (void) return net; } -/** - * katze_net_get_session: - * - * Retrieves the session of the net. - * - * Return value: a session, or %NULL - * - * Deprecated: 0.2.7: Use webkit_get_default_session (). - **/ -gpointer -katze_net_get_session (KatzeNet* net) -{ - g_return_val_if_fail (KATZE_IS_NET (net), NULL); - - return webkit_get_default_session (); -} - typedef struct { KatzeNet* net; @@ -149,8 +123,7 @@ katze_net_get_cached_path (KatzeNet* net, gchar* cached_filename; gchar* cached_path; - if (!net) - net = katze_net_new (); + net = katze_net_new (); if (subfolder) cache_path = g_build_filename (net->cache_path, subfolder, NULL); @@ -207,26 +180,11 @@ katze_net_got_body_cb (SoupMessage* msg, KatzeNetPriv* priv) { KatzeNetRequest* request; - #if 0 - gchar* filename; - FILE* fp; - #endif request = priv->request; if (msg->response_body->length > 0) { - #if 0 - /* FIXME: Caching */ - filename = katze_net_get_cached_path (net, request->uri, NULL); - if ((fp = fopen (filename, "wb"))) - { - fwrite (msg->response_body->data, - 1, msg->response_body->length, fp); - fclose (fp); - } - g_free (filename); - #endif request->data = g_memdup (msg->response_body->data, msg->response_body->length); request->length = msg->response_body->length; @@ -340,8 +298,7 @@ katze_net_load_uri (KatzeNet* net, if (!status_cb && !transfer_cb) return; - if (net == NULL) - net = katze_net_new (); + net = katze_net_new (); request = g_new0 (KatzeNetRequest, 1); request->uri = g_strdup (uri); diff --git a/katze/katze-net.h b/katze/katze-net.h index f26a0ce1..5658ff47 100644 --- a/katze/katze-net.h +++ b/katze/katze-net.h @@ -37,12 +37,6 @@ typedef struct _KatzeNetClass KatzeNetClass; GType katze_net_get_type (void) G_GNUC_CONST; -KatzeNet* -katze_net_new (void); - -gpointer -katze_net_get_session (KatzeNet* net); - typedef enum { KATZE_NET_VERIFIED, From 9228246b3299fba4ca2d6bd81adf1a590a1e9d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ri=C4=8Dardas=20Vasiulis?= Date: Wed, 8 Sep 2010 19:42:31 +0200 Subject: [PATCH 2947/2970] l10n: Lithuanian translation New status: 47 messages complete with 0 fuzzies and 593 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/lt.po | 2786 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2786 insertions(+) create mode 100644 po/lt.po diff --git a/po/lt.po b/po/lt.po new file mode 100644 index 00000000..a149a104 --- /dev/null +++ b/po/lt.po @@ -0,0 +1,2786 @@ +# Lithuanian translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Ričardas Vasiulis 2010 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.2.7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-08-26 16:08+0000\n" +"PO-Revision-Date: 2010-08-30 13:53+0300\n" +"Last-Translator: Ričardas Vasiulis \n" +"Language-Team: Lithuanian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"X-Poedit-Language: Lithuanian\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Paprasta interneto naršyklė" + +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1328 +#: ../midori/main.c:1657 +#: ../midori/main.c:1665 +#: ../midori/main.c:1681 +#: ../midori/midori-websettings.c:310 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Interneto naršyklė" + +#: ../midori/main.c:99 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Nepavyko įkelti konfigūracijos: %s\n" + +#: ../midori/main.c:148 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Reikšmė „%s” yra netinkama su %s " + +#: ../midori/main.c:155 +#: ../midori/main.c:241 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Netinkama konfigūracijos reikšmė: „%s”" + +#: ../midori/main.c:368 +#: ../midori/main.c:472 +#: ../extensions/formhistory.c:440 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Nepavyko atverti duombaze: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:424 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Nepavyko pašalinti senus žurnalo įrašus: %s\n" + +#: ../midori/main.c:455 +#: ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepavyko pašalinti žurnalo įrašą: %s\n" + +#: ../midori/main.c:500 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Adresyno įrašų nepavyko išsaugoti. %s" + +#: ../midori/main.c:528 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:566 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:586 +#: ../midori/main.c:609 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:668 +#: ../midori/main.c:908 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:852 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "" + +#: ../midori/main.c:942 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:957 +msgid "Modify _preferences" +msgstr "Keisti _nustatymus" + +#: ../midori/main.c:961 +msgid "Reset the last _session" +msgstr "" + +#: ../midori/main.c:966 +msgid "Disable all _extensions" +msgstr "" + +#: ../midori/main.c:1206 +#: ../midori/main.c:1952 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1328 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1347 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/main.c:1378 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "" + +#: ../midori/main.c:1550 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1550 +msgid "ADDRESS" +msgstr "" + +#: ../midori/main.c:1553 +msgid "Use FOLDER as configuration folder" +msgstr "" + +#: ../midori/main.c:1553 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1556 +msgid "Show a diagnostic dialog" +msgstr "" + +#: ../midori/main.c:1558 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1561 +msgid "Take a snapshot of the specified URI" +msgstr "" + +#: ../midori/main.c:1564 +msgid "Execute the specified command" +msgstr "" + +#: ../midori/main.c:1566 +msgid "Display program version" +msgstr "" + +#: ../midori/main.c:1568 +msgid "Addresses" +msgstr "" + +#: ../midori/main.c:1570 +msgid "Block URIs according to regular expression PATTERN" +msgstr "" + +#: ../midori/main.c:1570 +msgid "PATTERN" +msgstr "" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1574 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "" + +#: ../midori/main.c:1574 +msgid "SECONDS" +msgstr "" + +#: ../midori/main.c:1654 +msgid "[Addresses]" +msgstr "" + +#: ../midori/main.c:1682 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:1684 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1801 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:1849 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1904 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:1925 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1967 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1980 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1994 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:2010 +msgid "_Ignore" +msgstr "" + +#: ../midori/midori-array.c:429 +msgid "File not found." +msgstr "" + +#: ../midori/midori-array.c:463 +#: ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 +msgid "Malformed document." +msgstr "" + +#: ../midori/midori-array.c:505 +msgid "Unrecognized bookmark format." +msgstr "" + +#: ../midori/midori-array.c:719 +msgid "Writing failed." +msgstr "" + +#: ../midori/midori-browser.c:336 +#: ../midori/midori-browser.c:4889 +#: ../midori/midori-browser.c:4895 +msgid "Reload the current page" +msgstr "" + +#: ../midori/midori-browser.c:346 +#: ../midori/midori-browser.c:4892 +msgid "Stop loading the current page" +msgstr "" + +#: ../midori/midori-browser.c:453 +#, c-format +msgid "%d%% loaded" +msgstr "" + +#: ../midori/midori-browser.c:491 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:504 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../midori/midori-browser.c:729 +msgid "New folder" +msgstr "" + +#: ../midori/midori-browser.c:729 +msgid "Edit folder" +msgstr "" + +#: ../midori/midori-browser.c:731 +msgid "New bookmark" +msgstr "" + +#: ../midori/midori-browser.c:731 +msgid "Edit bookmark" +msgstr "" + +#: ../midori/midori-browser.c:762 +msgid "_Title:" +msgstr "" + +#: ../midori/midori-browser.c:779 +#: ../midori/midori-searchaction.c:961 +msgid "_Description:" +msgstr "" + +#: ../midori/midori-browser.c:798 +#: ../midori/midori-searchaction.c:975 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "" + +#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:4008 +msgid "_Folder:" +msgstr "" + +#: ../midori/midori-browser.c:840 +#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4013 +#: ../midori/midori-browser.c:4042 +msgid "Toplevel folder" +msgstr "" + +#: ../midori/midori-browser.c:872 +msgid "Add to _Speed Dial" +msgstr "" + +#: ../midori/midori-browser.c:885 +msgid "Show in the tool_bar" +msgstr "" + +#: ../midori/midori-browser.c:900 +msgid "Run as _web application" +msgstr "" + +#: ../midori/midori-browser.c:979 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "" + +#: ../midori/midori-browser.c:983 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "" + +#: ../midori/midori-browser.c:1040 +#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4085 +msgid "Save file as" +msgstr "" + +#: ../midori/midori-browser.c:1433 +msgid "Save file" +msgstr "" + +#: ../midori/midori-browser.c:2150 +msgid "Open file" +msgstr "" + +#: ../midori/midori-browser.c:2228 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" + +#: ../midori/midori-browser.c:2234 +#: ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "" + +#: ../midori/midori-browser.c:2277 +#: ../midori/midori-browser.c:4954 +#: ../panels/midori-bookmarks.c:406 +msgid "Add a new bookmark" +msgstr "" + +#: ../midori/midori-browser.c:3283 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 +msgid "Could not run external program." +msgstr "" + +#: ../midori/midori-browser.c:3526 +#: ../midori/midori-browser.c:5344 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:3843 +#: ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:734 +msgid "Open all in _Tabs" +msgstr "" + +#: ../midori/midori-browser.c:3850 +#: ../panels/midori-bookmarks.c:727 +#: ../panels/midori-history.c:740 +#: ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Tab" +msgstr "" + +#: ../midori/midori-browser.c:3853 +#: ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4012 +#: ../panels/midori-bookmarks.c:729 +#: ../panels/midori-history.c:742 +#: ../extensions/feed-panel/feed-panel.c:546 +msgid "Open in New _Window" +msgstr "" + +#: ../midori/midori-browser.c:3931 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:3932 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:3933 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:3934 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:3935 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:3959 +msgid "Import bookmarks..." +msgstr "" + +#: ../midori/midori-browser.c:3962 +#: ../midori/midori-browser.c:4959 +msgid "_Import bookmarks" +msgstr "_Importuoti adresyną" + +#: ../midori/midori-browser.c:3973 +msgid "_Application:" +msgstr "" + +#: ../midori/midori-browser.c:4000 +#: ../midori/midori-browser.c:5072 +#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:315 +#: ../katze/katze-utils.c:696 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:4061 +msgid "Failed to import bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4102 +msgid "Failed to export bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4155 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/midori-browser.c:4163 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "" + +#. i18n: Dialog: Clear Private Data, in the Tools menu +#: ../midori/midori-browser.c:4270 +msgid "Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:4274 +msgid "_Clear private data" +msgstr "" + +#: ../midori/midori-browser.c:4288 +msgid "Clear the following data:" +msgstr "" + +#: ../midori/midori-browser.c:4298 +#: ../midori/midori-preferences.c:533 +#: ../panels/midori-history.c:114 +msgid "History" +msgstr "" + +#: ../midori/midori-browser.c:4303 +msgid "Cookies" +msgstr "Slapukai" + +#: ../midori/midori-browser.c:4308 +msgid "'Flash' Cookies" +msgstr "" + +#: ../midori/midori-browser.c:4313 +msgid "Website icons" +msgstr "Svetainės piktogramos" + +#: ../midori/midori-browser.c:4318 +#: ../midori/sokoke.c:1314 +msgid "_Closed Tabs" +msgstr "" + +#: ../midori/midori-browser.c:4323 +#: ../extensions/web-cache.c:464 +msgid "Web Cache" +msgstr "Žiniatinklio podėlis" + +#: ../midori/midori-browser.c:4331 +msgid "Clear private data when _quitting Midori" +msgstr "" + +#: ../midori/midori-browser.c:4472 +msgid "A lightweight web browser." +msgstr "" + +#: ../midori/midori-browser.c:4474 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "" + +#: ../midori/midori-browser.c:4493 +msgid "translator-credits" +msgstr "" + +#: ../midori/midori-browser.c:4802 +msgid "_File" +msgstr "_Failas" + +#: ../midori/midori-browser.c:4804 +#: ../midori/sokoke.c:1315 +msgid "New _Window" +msgstr "Naujas _langas" + +#: ../midori/midori-browser.c:4805 +msgid "Open a new window" +msgstr "Atverti naują langą" + +#: ../midori/midori-browser.c:4808 +msgid "Open a new tab" +msgstr "Atverti naują kortelę" + +#: ../midori/midori-browser.c:4810 +msgid "P_rivate Browsing" +msgstr "P_rivatus naršymas" + +#: ../midori/midori-browser.c:4811 +msgid "Don't save any private data while browsing" +msgstr "Naršymo metu nesaugoti jokių duomenų " + +#: ../midori/midori-browser.c:4815 +msgid "Open a file" +msgstr "Atverti failą" + +#: ../midori/midori-browser.c:4818 +msgid "Save to a file" +msgstr "" + +#: ../midori/midori-browser.c:4820 +msgid "Add to Speed _dial" +msgstr "" + +#: ../midori/midori-browser.c:4821 +msgid "Add shortcut to speed dial" +msgstr "" + +#: ../midori/midori-browser.c:4823 +msgid "Add Shortcut to the _desktop" +msgstr "" + +#: ../midori/midori-browser.c:4824 +msgid "Add shortcut to the desktop" +msgstr "" + +#: ../midori/midori-browser.c:4826 +msgid "Subscribe to News _feed" +msgstr "" + +#: ../midori/midori-browser.c:4827 +msgid "Subscribe to this news feed" +msgstr "" + +#: ../midori/midori-browser.c:4832 +msgid "_Close Tab" +msgstr "_Užverti kortelę" + +#: ../midori/midori-browser.c:4833 +msgid "Close the current tab" +msgstr "Užverti šią kortelę" + +#: ../midori/midori-browser.c:4835 +msgid "C_lose Window" +msgstr "Užverti langą" + +#: ../midori/midori-browser.c:4836 +msgid "Close this window" +msgstr "Užverti šį langą" + +#: ../midori/midori-browser.c:4839 +msgid "Print the current page" +msgstr "Spausdinti šį puslapį " + +#: ../midori/midori-browser.c:4842 +msgid "Quit the application" +msgstr "Uždaryti programą" + +#: ../midori/midori-browser.c:4844 +msgid "_Edit" +msgstr "_Taisa" + +#: ../midori/midori-browser.c:4848 +msgid "Undo the last modification" +msgstr "" + +#: ../midori/midori-browser.c:4851 +msgid "Redo the last modification" +msgstr "" + +#: ../midori/midori-browser.c:4855 +msgid "Cut the selected text" +msgstr "" + +#: ../midori/midori-browser.c:4858 +#: ../midori/midori-browser.c:4861 +msgid "Copy the selected text" +msgstr "" + +#: ../midori/midori-browser.c:4864 +msgid "Paste text from the clipboard" +msgstr "" + +#: ../midori/midori-browser.c:4867 +msgid "Delete the selected text" +msgstr "" + +#: ../midori/midori-browser.c:4870 +msgid "Select all text" +msgstr "" + +#: ../midori/midori-browser.c:4873 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:4875 +msgid "Find _Next" +msgstr "" + +#: ../midori/midori-browser.c:4876 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:4878 +msgid "Find _Previous" +msgstr "" + +#: ../midori/midori-browser.c:4879 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:4883 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:4885 +msgid "_View" +msgstr "_Rodymas" + +#: ../midori/midori-browser.c:4886 +msgid "_Toolbars" +msgstr "" + +#: ../midori/midori-browser.c:4898 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:4901 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:4904 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:4905 +msgid "_Encoding" +msgstr "" + +#: ../midori/midori-browser.c:4907 +msgid "View So_urce" +msgstr "" + +#: ../midori/midori-browser.c:4908 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:4911 +msgid "Toggle fullscreen view" +msgstr "" + +#: ../midori/midori-browser.c:4914 +msgid "Scroll _Left" +msgstr "" + +#: ../midori/midori-browser.c:4915 +msgid "Scroll to the left" +msgstr "" + +#: ../midori/midori-browser.c:4917 +msgid "Scroll _Down" +msgstr "" + +#: ../midori/midori-browser.c:4918 +msgid "Scroll down" +msgstr "" + +#: ../midori/midori-browser.c:4920 +msgid "Scroll _Up" +msgstr "" + +#: ../midori/midori-browser.c:4921 +msgid "Scroll up" +msgstr "" + +#: ../midori/midori-browser.c:4923 +msgid "Scroll _Right" +msgstr "" + +#: ../midori/midori-browser.c:4924 +msgid "Scroll to the right" +msgstr "" + +#: ../midori/midori-browser.c:4927 +msgid "_Go" +msgstr "_Eiti" + +#: ../midori/midori-browser.c:4930 +msgid "Go back to the previous page" +msgstr "" + +#: ../midori/midori-browser.c:4933 +msgid "Go forward to the next page" +msgstr "" + +#. i18n: Visit the previous logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:4937 +msgid "Go to the previous sub-page" +msgstr "" + +#. i18n: Visit the following logical page, ie. in a forum or blog +#: ../midori/midori-browser.c:4941 +msgid "Go to the next sub-page" +msgstr "" + +#: ../midori/midori-browser.c:4944 +msgid "Go to your homepage" +msgstr "" + +#: ../midori/midori-browser.c:4946 +msgid "Empty Trash" +msgstr "" + +#: ../midori/midori-browser.c:4947 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:4949 +msgid "Undo _Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:4950 +msgid "Open the last closed tab" +msgstr "" + +#: ../midori/midori-browser.c:4956 +msgid "Add a new _folder" +msgstr "" + +#: ../midori/midori-browser.c:4957 +msgid "Add a new bookmark folder" +msgstr "" + +#: ../midori/midori-browser.c:4962 +msgid "_Export bookmarks" +msgstr "_Eksportuoti adresyną" + +#: ../midori/midori-browser.c:4965 +#: ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "" + +#: ../midori/midori-browser.c:4966 +msgid "Add, edit and remove search engines..." +msgstr "" + +#: ../midori/midori-browser.c:4969 +msgid "_Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:4970 +msgid "Clear private data..." +msgstr "" + +#: ../midori/midori-browser.c:4974 +msgid "_Inspect Page" +msgstr "" + +#: ../midori/midori-browser.c:4975 +msgid "Inspect page details and access developer tools..." +msgstr "" + +#: ../midori/midori-browser.c:4980 +msgid "_Previous Tab" +msgstr "" + +#: ../midori/midori-browser.c:4981 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:4983 +msgid "_Next Tab" +msgstr "" + +#: ../midori/midori-browser.c:4984 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:4986 +msgid "Focus _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:4987 +msgid "Focus the current tab" +msgstr "" + +#: ../midori/midori-browser.c:4989 +msgid "Minimize _Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:4990 +msgid "Minimize the current tab" +msgstr "" + +#: ../midori/midori-browser.c:4992 +msgid "_Duplicate Current Tab" +msgstr "" + +#: ../midori/midori-browser.c:4993 +msgid "Duplicate the current tab" +msgstr "" + +#: ../midori/midori-browser.c:4995 +msgid "Close Ot_her Tabs" +msgstr "" + +#: ../midori/midori-browser.c:4996 +msgid "Close all tabs except the current tab" +msgstr "" + +#: ../midori/midori-browser.c:4998 +msgid "Open last _session" +msgstr "" + +#: ../midori/midori-browser.c:4999 +msgid "Open the tabs saved in the last session" +msgstr "" + +#: ../midori/midori-browser.c:5001 +msgid "_Help" +msgstr "_Žinynas" + +#: ../midori/midori-browser.c:5003 +msgid "_Contents" +msgstr "" + +#: ../midori/midori-browser.c:5004 +msgid "Show the documentation" +msgstr "" + +#: ../midori/midori-browser.c:5006 +msgid "_Frequent Questions" +msgstr "" + +#: ../midori/midori-browser.c:5007 +msgid "Show the Frequently Asked Questions" +msgstr "" + +#: ../midori/midori-browser.c:5009 +msgid "_Report a Bug" +msgstr "" + +#: ../midori/midori-browser.c:5010 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:5013 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:5021 +msgid "_Menubar" +msgstr "" + +#: ../midori/midori-browser.c:5022 +msgid "Show menubar" +msgstr "" + +#: ../midori/midori-browser.c:5025 +msgid "_Navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:5026 +msgid "Show navigationbar" +msgstr "" + +#: ../midori/midori-browser.c:5029 +msgid "Side_panel" +msgstr "" + +#: ../midori/midori-browser.c:5030 +msgid "Show sidepanel" +msgstr "" + +#: ../midori/midori-browser.c:5033 +msgid "_Bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:5034 +msgid "Show bookmarkbar" +msgstr "" + +#: ../midori/midori-browser.c:5037 +msgid "_Transferbar" +msgstr "" + +#: ../midori/midori-browser.c:5038 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:5041 +msgid "_Statusbar" +msgstr "" + +#: ../midori/midori-browser.c:5042 +msgid "Show statusbar" +msgstr "" + +#: ../midori/midori-browser.c:5050 +msgid "_Automatic" +msgstr "" + +#: ../midori/midori-browser.c:5053 +#: ../midori/midori-websettings.c:218 +msgid "Chinese (BIG5)" +msgstr "" + +#. i18n: A double underscore "__" is used to prevent the mnemonic +#: ../midori/midori-browser.c:5057 +msgid "Japanese (SHIFT__JIS)" +msgstr "" + +#: ../midori/midori-browser.c:5060 +#: ../midori/midori-websettings.c:220 +msgid "Korean (EUC-KR)" +msgstr "" + +#: ../midori/midori-browser.c:5063 +#: ../midori/midori-websettings.c:221 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:5066 +#: ../midori/midori-websettings.c:222 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:5069 +#: ../midori/midori-websettings.c:223 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:5588 +msgid "_Separator" +msgstr "" + +#: ../midori/midori-browser.c:5595 +msgid "_Location..." +msgstr "" + +#: ../midori/midori-browser.c:5597 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:5621 +msgid "_Web Search..." +msgstr "" + +#: ../midori/midori-browser.c:5623 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:5644 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:5659 +msgid "_Tools" +msgstr "_Priemonės" + +#: ../midori/midori-browser.c:5676 +msgid "_Window" +msgstr "_Kortelės" + +#: ../midori/midori-browser.c:5678 +msgid "Show a list of all open tabs" +msgstr "" + +#: ../midori/midori-browser.c:5692 +msgid "_Menu" +msgstr "" + +#: ../midori/midori-browser.c:5694 +msgid "Menu" +msgstr "" + +#: ../midori/midori-browser.c:6262 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-locationaction.c:390 +#, c-format +msgid "Failed to select from history\n" +msgstr "" + +#: ../midori/midori-locationaction.c:474 +#, c-format +msgid "Search for %s" +msgstr "" + +#: ../midori/midori-locationaction.c:497 +#, c-format +msgid "Search with %s" +msgstr "" + +#: ../midori/midori-locationaction.c:1307 +#, c-format +msgid "Failed to execute database statement\n" +msgstr "" + +#. i18n: Right-click on Location, Open an URL from the clipboard +#: ../midori/midori-locationaction.c:1363 +msgid "Paste and p_roceed" +msgstr "" + +#: ../midori/midori-panel.c:412 +#: ../midori/midori-panel.c:414 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:424 +#: ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:613 +#: ../midori/midori-panel.c:616 +msgid "Align sidepanel to the right" +msgstr "" + +#: ../midori/midori-panel.c:436 +#: ../midori/midori-panel.c:437 +msgid "Close panel" +msgstr "" + +#: ../midori/midori-panel.c:614 +#: ../midori/midori-panel.c:617 +msgid "Align sidepanel to the left" +msgstr "" + +#: ../midori/midori-panel.c:771 +msgid "Hide operating controls" +msgstr "" + +#: ../midori/midori-websettings.c:200 +msgid "Show Blank page" +msgstr "" + +#: ../midori/midori-websettings.c:201 +msgid "Show Homepage" +msgstr "" + +#: ../midori/midori-websettings.c:202 +msgid "Show last open tabs" +msgstr "" + +#: ../midori/midori-websettings.c:203 +msgid "Show last tabs without loading" +msgstr "" + +#: ../midori/midori-websettings.c:219 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-websettings.c:239 +msgid "New tab" +msgstr "" + +#: ../midori/midori-websettings.c:240 +msgid "New window" +msgstr "Naujas langas" + +#: ../midori/midori-websettings.c:241 +msgid "Current tab" +msgstr "" + +#: ../midori/midori-websettings.c:256 +msgid "Default" +msgstr "" + +#: ../midori/midori-websettings.c:257 +msgid "Icons" +msgstr "" + +#: ../midori/midori-websettings.c:258 +msgid "Small icons" +msgstr "" + +#: ../midori/midori-websettings.c:259 +msgid "Text" +msgstr "" + +#: ../midori/midori-websettings.c:260 +msgid "Icons and text" +msgstr "" + +#: ../midori/midori-websettings.c:261 +msgid "Text beside icons" +msgstr "" + +#: ../midori/midori-websettings.c:276 +msgid "Automatic (GNOME or environment)" +msgstr "" + +#: ../midori/midori-websettings.c:277 +msgid "HTTP proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:278 +msgid "No proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:293 +msgid "All cookies" +msgstr "" + +#: ../midori/midori-websettings.c:294 +msgid "Session cookies" +msgstr "" + +#: ../midori/midori-websettings.c:295 +#: ../katze/katze-utils.c:672 +msgid "None" +msgstr "" + +#: ../midori/midori-websettings.c:311 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:312 +msgid "iPhone" +msgstr "iPhone" + +#: ../midori/midori-websettings.c:313 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:314 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:367 +msgid "Remember last window size" +msgstr "" + +#: ../midori/midori-websettings.c:368 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:376 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:377 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:385 +msgid "Last window height" +msgstr "" + +#: ../midori/midori-websettings.c:386 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:411 +msgid "Last panel position" +msgstr "" + +#: ../midori/midori-websettings.c:412 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:421 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:422 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:430 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:431 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:440 +msgid "Show Menubar" +msgstr "" + +#: ../midori/midori-websettings.c:441 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:449 +msgid "Show Navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:450 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:458 +msgid "Show Bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:459 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:467 +msgid "Show Panel" +msgstr "" + +#: ../midori/midori-websettings.c:468 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:483 +msgid "Show Transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:484 +msgid "Whether to show the transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:492 +msgid "Show Statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:493 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:502 +msgid "Toolbar Style:" +msgstr "" + +#: ../midori/midori-websettings.c:503 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:519 +msgid "Show progress in location entry" +msgstr "" + +#: ../midori/midori-websettings.c:520 +msgid "Whether to show loading progress in the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:535 +msgid "Search engines in location completion" +msgstr "" + +#: ../midori/midori-websettings.c:536 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:544 +msgid "Toolbar Items" +msgstr "" + +#: ../midori/midori-websettings.c:545 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:553 +msgid "Compact Sidepanel" +msgstr "" + +#: ../midori/midori-websettings.c:554 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:569 +msgid "Show operating controls of the panel" +msgstr "" + +#: ../midori/midori-websettings.c:570 +msgid "Whether to show the operating controls of the panel" +msgstr "" + +#: ../midori/midori-websettings.c:585 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:586 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-websettings.c:601 +msgid "Open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:602 +msgid "Whether to always open panels in separate windows" +msgstr "" + +#: ../midori/midori-websettings.c:611 +msgid "When Midori starts:" +msgstr "" + +#: ../midori/midori-websettings.c:612 +msgid "What to do when Midori starts" +msgstr "" + +#: ../midori/midori-websettings.c:621 +msgid "Homepage:" +msgstr "" + +#: ../midori/midori-websettings.c:622 +msgid "The homepage" +msgstr "" + +#: ../midori/midori-websettings.c:637 +msgid "Show crash dialog" +msgstr "" + +#: ../midori/midori-websettings.c:638 +msgid "Show a dialog after Midori crashed" +msgstr "" + +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:654 +msgid "Show speed dial in new tabs" +msgstr "" + +#: ../midori/midori-websettings.c:655 +msgid "Show speed dial in newly opened tabs" +msgstr "" + +#: ../midori/midori-websettings.c:663 +msgid "Save downloaded files to:" +msgstr "" + +#: ../midori/midori-websettings.c:664 +msgid "The folder downloaded files are saved to" +msgstr "" + +#: ../midori/midori-websettings.c:685 +msgid "Ask for the destination folder" +msgstr "" + +#: ../midori/midori-websettings.c:686 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "" + +#: ../midori/midori-websettings.c:705 +msgid "Notify when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:706 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" + +#: ../midori/midori-websettings.c:718 +msgid "Download Manager" +msgstr "" + +#: ../midori/midori-websettings.c:719 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:727 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:728 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:743 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:744 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:752 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:753 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:761 +msgid "Preferred Encoding" +msgstr "" + +#: ../midori/midori-websettings.c:762 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:772 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:773 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:781 +msgid "Close Buttons on Tabs" +msgstr "" + +#: ../midori/midori-websettings.c:782 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:790 +msgid "Open new pages in:" +msgstr "" + +#: ../midori/midori-websettings.c:791 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:800 +msgid "Open external pages in:" +msgstr "" + +#: ../midori/midori-websettings.c:801 +msgid "Where to open externally opened pages" +msgstr "" + +#: ../midori/midori-websettings.c:810 +msgid "Middle click opens Selection" +msgstr "" + +#: ../midori/midori-websettings.c:811 +msgid "Load an address from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:819 +msgid "Open tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:820 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:828 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:829 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:837 +msgid "Open popups in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:838 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:848 +#: ../extensions/statusbar-features.c:88 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:849 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-websettings.c:856 +#: ../extensions/statusbar-features.c:100 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-websettings.c:857 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-websettings.c:864 +#: ../extensions/statusbar-features.c:112 +msgid "Enable Netscape plugins" +msgstr "" + +#: ../midori/midori-websettings.c:865 +msgid "Enable embedded Netscape plugin objects" +msgstr "" + +#: ../midori/midori-websettings.c:881 +msgid "Enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:882 +msgid "Whether to enable HTML5 database support" +msgstr "" + +#: ../midori/midori-websettings.c:888 +msgid "Enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:889 +msgid "Whether to enable HTML5 local storage support" +msgstr "" + +#: ../midori/midori-websettings.c:897 +msgid "Enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:898 +msgid "Whether to enable offline web application cache" +msgstr "" + +#: ../midori/midori-websettings.c:923 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:924 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:939 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:940 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:955 +msgid "Kinetic scrolling" +msgstr "" + +#: ../midori/midori-websettings.c:956 +msgid "Whether scrolling should kinetically move according to speed" +msgstr "" + +#: ../midori/midori-websettings.c:964 +msgid "Accept cookies" +msgstr "" + +#: ../midori/midori-websettings.c:965 +msgid "What type of cookies to accept" +msgstr "" + +#: ../midori/midori-websettings.c:974 +msgid "Maximum cookie age" +msgstr "" + +#: ../midori/midori-websettings.c:975 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:984 +msgid "Maximum history age" +msgstr "" + +#: ../midori/midori-websettings.c:985 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:993 +msgid "Remember last downloaded files" +msgstr "" + +#: ../midori/midori-websettings.c:994 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../midori/midori-websettings.c:1011 +msgid "Proxy server" +msgstr "" + +#: ../midori/midori-websettings.c:1012 +msgid "The type of proxy server to use" +msgstr "" + +#: ../midori/midori-websettings.c:1021 +msgid "HTTP Proxy Server" +msgstr "" + +#: ../midori/midori-websettings.c:1022 +msgid "The proxy server used for HTTP connections" +msgstr "" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:1038 +msgid "Identify as" +msgstr "" + +#: ../midori/midori-websettings.c:1039 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:1055 +msgid "Identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1056 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:1071 +msgid "Preferred languages" +msgstr "" + +#: ../midori/midori-websettings.c:1072 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "" + +#: ../midori/midori-websettings.c:1087 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-websettings.c:1088 +msgid "The private data selected for deletion" +msgstr "" + +#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly, +#. so reloading via Javascript works but not via API calls. +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:1227 +#: ../midori/midori-view.c:4440 +#: ../midori/midori-view.c:4444 +#, c-format +msgid "Error - %s" +msgstr "" + +#: ../midori/midori-view.c:1228 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "" + +#: ../midori/midori-view.c:1230 +msgid "Try again" +msgstr "" + +#. i18n: The title of the 404 - Not found error page +#: ../midori/midori-view.c:1249 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:1433 +#: ../midori/midori-view.c:2279 +#, c-format +msgid "Send a message to %s" +msgstr "" + +#: ../midori/midori-view.c:2061 +#: ../midori/midori-view.c:2446 +msgid "Inspect _Element" +msgstr "" + +#: ../midori/midori-view.c:2113 +#: ../midori/midori-view.c:2183 +msgid "Open Link in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2117 +msgid "Open Link in _Foreground Tab" +msgstr "" + +#: ../midori/midori-view.c:2118 +msgid "Open Link in _Background Tab" +msgstr "" + +#: ../midori/midori-view.c:2121 +#: ../midori/midori-view.c:2190 +msgid "Open Link in New _Window" +msgstr "" + +#: ../midori/midori-view.c:2124 +msgid "Open Link as Web A_pplication" +msgstr "" + +#: ../midori/midori-view.c:2127 +msgid "Copy Link de_stination" +msgstr "" + +#: ../midori/midori-view.c:2130 +#: ../midori/midori-view.c:2202 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:2131 +#: ../midori/midori-view.c:2196 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:2135 +#: ../midori/midori-view.c:2165 +#: ../midori/midori-view.c:2207 +msgid "Download with Download _Manager" +msgstr "" + +#: ../midori/midori-view.c:2144 +msgid "Open _Image in New Tab" +msgstr "" + +#: ../midori/midori-view.c:2147 +msgid "Copy Image _Address" +msgstr "" + +#: ../midori/midori-view.c:2150 +msgid "Save I_mage" +msgstr "" + +#: ../midori/midori-view.c:2151 +msgid "Download I_mage" +msgstr "" + +#: ../midori/midori-view.c:2158 +msgid "Copy Video _Address" +msgstr "" + +#: ../midori/midori-view.c:2161 +msgid "Save _Video" +msgstr "" + +#: ../midori/midori-view.c:2161 +msgid "Download _Video" +msgstr "" + +#: ../midori/midori-view.c:2224 +msgid "Search _with" +msgstr "" + +#: ../midori/midori-view.c:2259 +#: ../midori/midori-view.c:2266 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:2287 +msgid "Open Address in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:2591 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:2610 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:2613 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:2617 +#, c-format +msgid "Open %s" +msgstr "" + +#: ../midori/midori-view.c:3158 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:3439 +msgid "Speed dial" +msgstr "" + +#: ../midori/midori-view.c:3440 +msgid "Click to add a shortcut" +msgstr "" + +#: ../midori/midori-view.c:3441 +msgid "Enter shortcut address" +msgstr "" + +#: ../midori/midori-view.c:3442 +msgid "Enter shortcut title" +msgstr "" + +#: ../midori/midori-view.c:3443 +msgid "Are you sure you want to delete this shortcut?" +msgstr "" + +#: ../midori/midori-view.c:3444 +msgid "Set number of columns and rows" +msgstr "" + +#: ../midori/midori-view.c:3445 +msgid "Enter number of columns and rows:" +msgstr "" + +#: ../midori/midori-view.c:3446 +msgid "Invalid input for the size of the speed dial" +msgstr "" + +#: ../midori/midori-view.c:3447 +msgid "Thumb size:" +msgstr "" + +#: ../midori/midori-view.c:3448 +msgid "Small" +msgstr "" + +#: ../midori/midori-view.c:3449 +msgid "Medium" +msgstr "" + +#: ../midori/midori-view.c:3450 +msgid "Big" +msgstr "" + +#: ../midori/midori-view.c:3476 +#, c-format +msgid "Document cannot be displayed" +msgstr "" + +#: ../midori/midori-view.c:3499 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-view.c:3617 +msgid "Page loading delayed" +msgstr "" + +#: ../midori/midori-view.c:3618 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "" + +#: ../midori/midori-view.c:3619 +msgid "Load Page" +msgstr "" + +#: ../midori/midori-view.c:3762 +msgid "Blank page" +msgstr "" + +#: ../midori/midori-view.c:4016 +msgid "_Duplicate Tab" +msgstr "" + +#: ../midori/midori-view.c:4021 +msgid "Show Tab _Label" +msgstr "" + +#: ../midori/midori-view.c:4021 +msgid "Show Tab _Icon Only" +msgstr "" + +#: ../midori/midori-view.c:4027 +msgid "Close ot_her Tabs" +msgstr "" + +#: ../midori/midori-view.c:4678 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-view.c:4679 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-view.c:4731 +#: ../midori/midori-preferences.c:384 +msgid "Features" +msgstr "" + +#. Page "General" +#: ../midori/midori-preferences.c:301 +msgid "General" +msgstr "" + +#: ../midori/midori-preferences.c:302 +msgid "Startup" +msgstr "" + +#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:324 +msgid "Use current page as homepage" +msgstr "" + +#: ../midori/midori-preferences.c:334 +#: ../panels/midori-transfers.c:87 +msgid "Transfers" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:352 +msgid "Appearance" +msgstr "" + +#: ../midori/midori-preferences.c:353 +msgid "Font settings" +msgstr "" + +#: ../midori/midori-preferences.c:355 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:358 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:361 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:363 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:366 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:369 +msgid "The font size used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:371 +msgid "Minimum Font Size" +msgstr "" + +#: ../midori/midori-preferences.c:374 +msgid "The minimum font size used to display text" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:383 +msgid "Behavior" +msgstr "" + +#: ../midori/midori-preferences.c:396 +msgid "Enforce 96 dots per inch" +msgstr "" + +#: ../midori/midori-preferences.c:397 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:417 +msgid "Allow scripts to open popups" +msgstr "" + +#: ../midori/midori-preferences.c:418 +msgid "Whether scripts are allowed to open popup windows automatically" +msgstr "" + +#: ../midori/midori-preferences.c:422 +msgid "Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:425 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:426 +msgid "Enable spell checking while typing" +msgstr "" + +#: ../midori/midori-preferences.c:428 +msgid "Spelling dictionaries:" +msgstr "" + +#. i18n: The example should be adjusted to contain a good local default +#: ../midori/midori-preferences.c:432 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:438 +msgid "Interface" +msgstr "" + +#: ../midori/midori-preferences.c:439 +msgid "Navigationbar" +msgstr "" + +#: ../midori/midori-preferences.c:449 +msgid "Browsing" +msgstr "" + +#. Page "Applications" +#: ../midori/midori-preferences.c:471 +msgid "Applications" +msgstr "" + +#: ../midori/midori-preferences.c:472 +msgid "External applications" +msgstr "" + +#. Page "Network" +#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:489 +msgid "Network" +msgstr "" + +#: ../midori/midori-preferences.c:495 +msgid "Hostname" +msgstr "" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:514 +msgid "Privacy" +msgstr "" + +#: ../midori/midori-preferences.c:515 +msgid "Web Cookies" +msgstr "" + +#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:538 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:484 +msgid "Empty" +msgstr "" + +#: ../midori/midori-searchaction.c:917 +msgid "Add search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:917 +msgid "Edit search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:945 +msgid "_Name:" +msgstr "" + +#: ../midori/midori-searchaction.c:989 +msgid "_Icon:" +msgstr "" + +#: ../midori/midori-searchaction.c:1003 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1234 +msgid "Manage Search Engines" +msgstr "" + +#: ../midori/midori-searchaction.c:1335 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:1303 +msgid "_Bookmark" +msgstr "" + +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "" + +#: ../midori/sokoke.c:1305 +msgid "Add Boo_kmark" +msgstr "" + +#: ../midori/sokoke.c:1306 +msgid "_Console" +msgstr "" + +#: ../midori/sokoke.c:1307 +msgid "_Extensions" +msgstr "" + +#: ../midori/sokoke.c:1308 +msgid "_History" +msgstr "" + +#: ../midori/sokoke.c:1309 +msgid "_Homepage" +msgstr "" + +#: ../midori/sokoke.c:1310 +msgid "_Userscripts" +msgstr "" + +#: ../midori/sokoke.c:1311 +msgid "New _Tab" +msgstr "Nauja _kortelė" + +#: ../midori/sokoke.c:1312 +msgid "_Transfers" +msgstr "" + +#: ../midori/sokoke.c:1313 +msgid "Netscape p_lugins" +msgstr "" + +#: ../midori/sokoke.c:1316 +msgid "New _Folder" +msgstr "" + +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:201 +msgid "_Inline Find:" +msgstr "" + +#: ../toolbars/midori-findbar.c:233 +msgid "Previous" +msgstr "" + +#: ../toolbars/midori-findbar.c:239 +msgid "Next" +msgstr "" + +#: ../toolbars/midori-findbar.c:243 +msgid "Match Case" +msgstr "" + +#: ../toolbars/midori-findbar.c:252 +msgid "Highlight Matches" +msgstr "" + +#: ../toolbars/midori-findbar.c:263 +msgid "Close Findbar" +msgstr "" + +#: ../toolbars/midori-transferbar.c:88 +#: ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "" + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "" + +#: ../toolbars/midori-transferbar.c:257 +#: ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "" + +#: ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "" + +#: ../panels/midori-bookmarks.c:116 +msgid "Bookmarks" +msgstr "" + +#: ../panels/midori-bookmarks.c:275 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "" + +#: ../panels/midori-bookmarks.c:414 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:422 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:436 +msgid "Add a new folder" +msgstr "" + +#: ../panels/midori-bookmarks.c:568 +#: ../panels/midori-history.c:569 +msgid "Separator" +msgstr "" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "" + +#: ../panels/midori-console.c:361 +msgid "Copy _All" +msgstr "" + +#: ../panels/midori-console.c:362 +msgid "Copy All" +msgstr "" + +#: ../panels/midori-extensions.c:91 +msgid "Extensions" +msgstr "" + +#: ../panels/midori-history.c:146 +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:148 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "" +msgstr[1] "" + +#: ../panels/midori-history.c:151 +msgid "Today" +msgstr "" + +#: ../panels/midori-history.c:153 +msgid "Yesterday" +msgstr "" + +#: ../panels/midori-history.c:324 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:369 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../panels/midori-history.c:378 +msgid "Delete the selected history item" +msgstr "" + +#: ../panels/midori-history.c:386 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-transfers.c:481 +msgid "Open Destination _Folder" +msgstr "" + +#: ../panels/midori-transfers.c:484 +msgid "Copy Link Loc_ation" +msgstr "" + +#: ../katze/katze-http-auth.c:214 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:230 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:244 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:257 +msgid "Password" +msgstr "" + +#: ../katze/katze-http-auth.c:272 +msgid "_Remember password" +msgstr "" + +#: ../katze/katze-throbber.c:882 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:895 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:963 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:503 +#: ../katze/katze-utils.c:898 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:549 +#: ../katze/katze-utils.c:578 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:564 +msgid "Choose folder" +msgstr "" + +#: ../katze/katze-preferences.c:95 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#: ../extensions/adblock.c:415 +msgid "Configure Advertisement filters" +msgstr "" + +#: ../extensions/adblock.c:447 +#, c-format +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "" + +#: ../extensions/adblock.c:587 +msgid "Configure _Advertisement filters..." +msgstr "" + +#: ../extensions/adblock.c:841 +msgid "Edit rule" +msgstr "" + +#: ../extensions/adblock.c:854 +msgid "_Rule:" +msgstr "" + +#: ../extensions/adblock.c:908 +msgid "Bl_ock image" +msgstr "" + +#: ../extensions/adblock.c:913 +msgid "Bl_ock link" +msgstr "" + +#: ../extensions/adblock.c:1494 +msgid "Advertisement blocker" +msgstr "" + +#: ../extensions/adblock.c:1495 +msgid "Block advertisements according to a filter list" +msgstr "" + +#: ../extensions/addons.c:122 +#, c-format +msgid "Copy %s to the folder %s." +msgstr "" + +#: ../extensions/addons.c:177 +msgid "Userscripts" +msgstr "" + +#: ../extensions/addons.c:179 +msgid "Userstyles" +msgstr "" + +#: ../extensions/addons.c:1082 +#, c-format +msgid "The configuration of the extension '%s' couldn't be saved: %s\n" +msgstr "" + +#: ../extensions/addons.c:1083 +#: ../extensions/addons.c:1248 +msgid "User addons" +msgstr "" + +#: ../extensions/addons.c:1205 +#, c-format +msgid "Can't monitor folder '%s': %s" +msgstr "" + +#: ../extensions/addons.c:1249 +msgid "Support for userscripts and userstyles" +msgstr "" + +#: ../extensions/colorful-tabs.c:204 +msgid "Colorful Tabs" +msgstr "" + +#: ../extensions/colorful-tabs.c:205 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:82 +#: ../extensions/cookie-manager/main.c:56 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:112 +msgid "Delete All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:114 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:129 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:136 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:578 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:580 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:589 +msgid "Only cookies which match the filter will be deleted." +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:677 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:680 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:686 +msgid "No" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:700 +#, c-format +msgid "" +"Domain: %s\n" +"Cookies: %d" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1030 +msgid "Name" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1083 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1091 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "" + +#: ../extensions/cookie-manager/cookie-manager-page.c:1149 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "" + +#: ../extensions/cookie-manager/main.c:40 +msgid "_Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager/main.c:57 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "" + +#: ../extensions/copy-tabs.c:98 +msgid "Copy Addresses of Tabs" +msgstr "" + +#: ../extensions/copy-tabs.c:99 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "" + +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:209 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:315 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:670 +msgid "Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:723 +msgid "Add new feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:730 +msgid "Delete feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:812 +msgid "_Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:195 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:235 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:265 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:148 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:248 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "" + +#: ../extensions/feed-panel/main.c:131 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:208 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:520 +msgid "Feed Panel" +msgstr "" + +#: ../extensions/feed-panel/main.c:521 +msgid "Read Atom/ RSS feeds" +msgstr "" + +#: ../extensions/formhistory.c:142 +#, c-format +msgid "Failed to add form value: %s\n" +msgstr "" + +#: ../extensions/formhistory.c:455 +#: ../extensions/formhistory.c:459 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../extensions/formhistory.c:503 +msgid "Stores history of entered form data" +msgstr "" + +#: ../extensions/formhistory.c:507 +#, c-format +msgid "Not available: %s" +msgstr "" + +#: ../extensions/formhistory.c:508 +msgid "Resource files not installed" +msgstr "" + +#: ../extensions/formhistory.c:514 +msgid "Form history filler" +msgstr "" + +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" + +#: ../extensions/mouse-gestures.c:303 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures.c:304 +msgid "Control Midori by moving the mouse" +msgstr "" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:178 +msgid "Keep one or multiple pages open in parallel to your tabs" +msgstr "" + +#: ../extensions/shortcuts.c:170 +msgid "Customize Keyboard shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:276 +msgid "Customize Sh_ortcuts..." +msgstr "" + +#: ../extensions/shortcuts.c:315 +msgid "Shortcuts" +msgstr "" + +#: ../extensions/shortcuts.c:316 +msgid "View and edit keyboard shortcuts" +msgstr "" + +#: ../extensions/status-clock.c:176 +msgid "Statusbar Clock" +msgstr "" + +#: ../extensions/status-clock.c:177 +msgid "Display date and time in the statusbar" +msgstr "" + +#: ../extensions/statusbar-features.c:84 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:96 +msgid "Scripts" +msgstr "" + +#: ../extensions/statusbar-features.c:108 +msgid "Netscape plugins" +msgstr "Netscape papildiniai" + +#: ../extensions/statusbar-features.c:149 +msgid "Statusbar Features" +msgstr "" + +#: ../extensions/statusbar-features.c:150 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#: ../extensions/tab-panel.c:569 +#: ../extensions/tab-panel.c:628 +msgid "Tab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:612 +msgid "T_ab Panel" +msgstr "" + +#: ../extensions/tab-panel.c:629 +msgid "Show tabs in a vertical panel" +msgstr "" + +#: ../extensions/tabs-minimized.c:79 +msgid "Only Icons on Tabs by default" +msgstr "" + +#: ../extensions/tabs-minimized.c:80 +msgid "New tabs have no label by default" +msgstr "" + +#: ../extensions/toolbar-editor.c:389 +msgid "Customize Toolbar" +msgstr "" + +#: ../extensions/toolbar-editor.c:405 +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "" + +#: ../extensions/toolbar-editor.c:421 +msgid "Available Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:442 +msgid "Displayed Items" +msgstr "" + +#: ../extensions/toolbar-editor.c:577 +msgid "Customize _Toolbar..." +msgstr "" + +#: ../extensions/toolbar-editor.c:608 +msgid "Toolbar Editor" +msgstr "" + +#: ../extensions/toolbar-editor.c:609 +msgid "Easily edit the toolbar layout" +msgstr "" + +#: ../extensions/web-cache.c:465 +msgid "Cache HTTP communication on disk" +msgstr "" + From 0536826d54522f76548771266768a47cda219162 Mon Sep 17 00:00:00 2001 From: Leandro Regueiro Date: Thu, 9 Sep 2010 14:05:23 +0200 Subject: [PATCH 2948/2970] l10n: Updated Galician (gl) translation to 99% New status: 647 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/gl.po | 70 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/po/gl.po b/po/gl.po index 72b35758..68a3fbed 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: midori-0.1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-01 10:08+0000\n" +"POT-Creation-Date: 2010-09-09 10:08+0000\n" "PO-Revision-Date: 2010-02-08 21:51+0100\n" "Last-Translator: Leandro Regueiro \n" "Language-Team: Galician \n" @@ -380,18 +380,18 @@ msgid "Failed to insert new history item: %s\n" msgstr "Produciuse un erro ao inserir un novo elemento no historial: %s\n" #: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../panels/midori-history.c:737 msgid "Open all in _Tabs" msgstr "Abrir todo en _lapelas" #: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../panels/midori-history.c:743 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Tab" msgstr "Abrir nunha nova _lapela" #: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 #: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../panels/midori-history.c:745 ../extensions/feed-panel/feed-panel.c:546 msgid "Open in New _Window" msgstr "Abrir nunha nova _fiestra" @@ -1020,13 +1020,13 @@ msgstr "Buscar %s" msgid "Search with %s" msgstr "Buscar con %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:1306 #, c-format msgid "Failed to execute database statement\n" msgstr "Produciuse un erro ao executar a instrución de base de datos\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1362 msgid "Paste and p_roceed" msgstr "Pegar e _continuar" @@ -1035,7 +1035,7 @@ msgid "Detach chosen panel from the window" msgstr "Separar o panel seleccionado da fiestra " #: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 msgid "Align sidepanel to the right" msgstr "Aliñar o panel lateral á dereita" @@ -1043,11 +1043,11 @@ msgstr "Aliñar o panel lateral á dereita" msgid "Close panel" msgstr "Pechar o panel" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 msgid "Align sidepanel to the left" msgstr "Aliñar o panel lateral á esquerda" -#: ../midori/midori-panel.c:771 +#: ../midori/midori-panel.c:754 msgid "Hide operating controls" msgstr "Ocultar os controis de operación" @@ -2085,27 +2085,27 @@ msgid "New _Folder" msgstr "Cartafol _novo" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:213 msgid "_Inline Find:" msgstr "_Busca en liña:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:245 msgid "Previous" msgstr "Anterior" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:251 msgid "Next" msgstr "Seguinte" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:255 msgid "Match Case" msgstr "Diferenciar maiúsculas de minúsculas" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:264 msgid "Highlight Matches" msgstr "Resaltar coincidencias" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:275 msgid "Close Findbar" msgstr "Pechar a barra de buscas" @@ -2160,19 +2160,19 @@ msgstr "Borrar o marcador seleccionado" msgid "Add a new folder" msgstr "Engadir un cartafol novo" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:572 msgid "Separator" msgstr "Separador" -#: ../panels/midori-console.c:87 +#: ../panels/midori-console.c:90 msgid "Console" msgstr "Consola" -#: ../panels/midori-console.c:361 +#: ../panels/midori-console.c:351 msgid "Copy _All" msgstr "Copiar _todo" -#: ../panels/midori-console.c:362 +#: ../panels/midori-console.c:352 msgid "Copy All" msgstr "Copiar todo" @@ -2317,11 +2317,11 @@ msgstr "Bloqueo de publicidade" msgid "Block advertisements according to a filter list" msgstr "Bloquear a publicidade de acordo cunha lista de filtros" -#: ../extensions/addons.c:130 ../extensions/addons.c:377 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../extensions/addons.c:135 ../extensions/addons.c:379 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Estilos de usuario" @@ -2348,21 +2348,41 @@ msgstr "Borrar estilo de usuario" msgid "The file %s will be permanently deleted." msgstr "Borrouse de forma permanente o ficheiro %s." -#: ../extensions/addons.c:1299 +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Abrir nun editor de texto" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Abrir o cartafol de destino" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Engadir un novo complemento" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Abrir o cartafol destino para o complemento seleccionado" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Eliminar o complemento seleccionado" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Non se puido gardar a configuración da extensión '%s': %s\n" -#: ../extensions/addons.c:1300 ../extensions/addons.c:1465 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 msgid "User addons" msgstr "Complementos de usuario" -#: ../extensions/addons.c:1422 +#: ../extensions/addons.c:1543 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Non se pode monitorizar o cartafol '%s': %s" -#: ../extensions/addons.c:1466 +#: ../extensions/addons.c:1587 msgid "Support for userscripts and userstyles" msgstr "Compatibilidade para scripts e estilos de usuario" From 793d5e6edf7caa6e3f89960b23cda196443807b0 Mon Sep 17 00:00:00 2001 From: Oscar Rentzhog Date: Sat, 11 Sep 2010 23:11:01 +0200 Subject: [PATCH 2949/2970] Update Swedish translation --- po/sv.po | 343 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 173 insertions(+), 170 deletions(-) diff --git a/po/sv.po b/po/sv.po index 6fa6fa8f..7b77b60f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the midori package. # Mikael Magnusson , 2008. # Daniel Nylander , 2008, 2009. +# Oscar Rentzhog 2010. # msgid "" msgstr "" @@ -48,12 +49,12 @@ msgstr "Värdet \"%s\" är ogiltigt för %s" #: ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" -msgstr "" +msgstr "Ogiltigt konfigurationsvärde för '%s'" #: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" -msgstr "" +msgstr "Misslyckades med att öppna databasen: %s\n" #: ../midori/main.c:382 #, c-format @@ -68,7 +69,7 @@ msgstr "" #: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" -msgstr "" +msgstr "Misslyckades med att rensa historik: %s\n" #: ../midori/main.c:483 #: ../midori/main.c:517 @@ -86,7 +87,7 @@ msgstr "" #: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "Konfigurationsfilen kunde inte sparad. %s" +msgstr "Konfigurationsfilen kunde inte sparas. %s" #: ../midori/main.c:779 #, c-format @@ -98,14 +99,14 @@ msgstr "Sökmotorer kunde inte sparad. %s" #: ../midori/main.c:855 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Bokmärkena kunde inte sparad. %s" +msgstr "Bokmärkena kunde inte sparas. %s" #. i18n: Trash, or wastebin, containing closed tabs #: ../midori/main.c:878 #: ../midori/main.c:901 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "Papperskorgen kunde inte sparad. %s" +msgstr "Papperskorgen kunde inte sparas. %s" #: ../midori/main.c:974 #, c-format @@ -114,11 +115,11 @@ msgstr "Sessionen kunde inte sparad. %s" #: ../midori/main.c:1101 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "" +msgstr "Midori verkar ha krashat vid senaste körningen. Om det händer flera gånger, prova något av dessa alternativ för att lösa problemet." #: ../midori/main.c:1116 msgid "Modify _preferences" -msgstr "" +msgstr "Redigera _inställningar" #: ../midori/main.c:1120 #, fuzzy @@ -127,7 +128,7 @@ msgstr "Gör om senaste ändringen" #: ../midori/main.c:1125 msgid "Disable all _extensions" -msgstr "" +msgstr "Inaktivera alla _tillägg" #: ../midori/main.c:1343 msgid "No filename specified" @@ -135,7 +136,7 @@ msgstr "" #: ../midori/main.c:1366 msgid "An unknown error occured." -msgstr "" +msgstr "Ett okänt fel inträffade." #: ../midori/main.c:1398 #, c-format @@ -168,7 +169,7 @@ msgstr "" #: ../midori/main.c:1457 msgid "Execute the specified command" -msgstr "" +msgstr "Kör det valda kommandot" #: ../midori/main.c:1459 msgid "Display program version" @@ -193,7 +194,7 @@ msgstr "Leta efter nya verioner på:" #: ../midori/main.c:1619 #, fuzzy msgid "The specified configuration folder is invalid." -msgstr "Konfigurationsfilen kunde inte sparad. %s" +msgstr "Den valda konfigurationsmappen är ogiltig." #: ../midori/main.c:1655 msgid "An instance of Midori is already running but not responding.\n" @@ -202,7 +203,7 @@ msgstr "" #: ../midori/main.c:1715 #, fuzzy, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Sökmotorer kunde inte sparad. %s" +msgstr "Sökmotorer kunde inte läsas in. %s" #: ../midori/main.c:1727 #, c-format @@ -266,7 +267,7 @@ msgstr "%d%% inläst" #: ../midori/midori-browser.c:434 #, c-format msgid "Unexpected action '%s'." -msgstr "" +msgstr "Oväntat beteende '%s'." #: ../midori/midori-browser.c:616 msgid "New folder" @@ -274,7 +275,7 @@ msgstr "Ny mapp" #: ../midori/midori-browser.c:616 msgid "Edit folder" -msgstr "" +msgstr "Redigera mapp" #: ../midori/midori-browser.c:618 msgid "New bookmark" @@ -315,11 +316,11 @@ msgstr "Spara fil som" #: ../midori/midori-browser.c:1172 #, c-format msgid "The file '%s' has been downloaded." -msgstr "" +msgstr "Filen '%s' har laddats ner." #: ../midori/midori-browser.c:1176 msgid "Transfer completed" -msgstr "" +msgstr "Överföring färdig" #: ../midori/midori-browser.c:1317 msgid "Save file" @@ -351,21 +352,21 @@ msgstr "Öppna i nytt _fönster" #: ../midori/midori-browser.c:3750 msgid "Clear Private Data" -msgstr "" +msgstr "Rensa Privat Data" #: ../midori/midori-browser.c:3754 msgid "_Clear private data" -msgstr "" +msgstr "_Rensa privat data" #: ../midori/midori-browser.c:3767 msgid "Clear the following data:" -msgstr "" +msgstr "Rensa följande data:" #: ../midori/midori-browser.c:3777 #: ../midori/midori-preferences.c:671 #: ../panels/midori-history.c:108 msgid "History" -msgstr "Historia" +msgstr "Historik" #: ../midori/midori-browser.c:3782 msgid "Cookies" @@ -387,7 +388,7 @@ msgstr "_Stängda flikar" #: ../midori/midori-browser.c:3805 msgid "Clear private data when _quitting Midori" -msgstr "" +msgstr "Rensa privat data när Midori _avslutas" #: ../midori/midori-browser.c:3889 msgid "A lightweight web browser." @@ -395,11 +396,12 @@ msgstr "En liten webbläsare." #: ../midori/midori-browser.c:3897 msgid "translator-credits" -msgstr "Mikael Magnusson " +msgstr "Mikael Magnusson , Daniel Nylander , Oscar Rentzhog " +## Needs formatting #: ../midori/midori-browser.c:4163 msgid "_File" -msgstr "_Fil" +msgstr "_Arkiv" #: ../midori/midori-browser.c:4165 #: ../midori/sokoke.c:869 @@ -448,7 +450,7 @@ msgstr "Stäng det här fönstret" #: ../midori/midori-browser.c:4187 msgid "Print the current page" -msgstr "" +msgstr "Skriv ut denna sida" #: ../midori/midori-browser.c:4190 msgid "Quit the application" @@ -460,7 +462,7 @@ msgstr "_Redigera" #: ../midori/midori-browser.c:4195 msgid "Cut the selected text" -msgstr "Klippa ut markerad text" +msgstr "Klipp ut markerad text" #: ../midori/midori-browser.c:4198 #: ../midori/midori-browser.c:4201 @@ -481,7 +483,7 @@ msgstr "Markera all text" #: ../midori/midori-browser.c:4213 msgid "Find a word or phrase in the page" -msgstr "" +msgstr "Hitta ett ord eller en fras på sidan" #: ../midori/midori-browser.c:4215 msgid "Find _Next" @@ -501,7 +503,7 @@ msgstr "" #: ../midori/midori-browser.c:4223 msgid "Configure the application preferences" -msgstr "" +msgstr "Redigera programinställiningarna" #: ../midori/midori-browser.c:4225 msgid "_View" @@ -513,15 +515,15 @@ msgstr "_Verktygsfält" #: ../midori/midori-browser.c:4238 msgid "Increase the zoom level" -msgstr "" +msgstr "Zooma in" #: ../midori/midori-browser.c:4241 msgid "Decrease the zoom level" -msgstr "" +msgstr "Zooma ut" #: ../midori/midori-browser.c:4244 msgid "Reset the zoom level" -msgstr "" +msgstr "Återställ zoom-nivån" #: ../midori/midori-browser.c:4245 msgid "_Encoding" @@ -533,7 +535,7 @@ msgstr "Visa k_ällkod" #: ../midori/midori-browser.c:4248 msgid "View the source code of the page" -msgstr "" +msgstr "Visa källkod för sidan" #: ../midori/midori-browser.c:4250 msgid "View Selection Source" @@ -553,15 +555,15 @@ msgstr "_Gå" #: ../midori/midori-browser.c:4260 msgid "Go back to the previous page" -msgstr "" +msgstr "Gå tillbaka till föregående sida" #: ../midori/midori-browser.c:4263 msgid "Go forward to the next page" -msgstr "" +msgstr "Gå fram till nästa sida" #: ../midori/midori-browser.c:4266 msgid "Go to your homepage" -msgstr "" +msgstr "Gå till startsida" #: ../midori/midori-browser.c:4268 msgid "Empty Trash" @@ -569,7 +571,7 @@ msgstr "Töm papperskorgen" #: ../midori/midori-browser.c:4269 msgid "Delete the contents of the trash" -msgstr "" +msgstr "Ta bort innehållet i papperskorgen" #: ../midori/midori-browser.c:4271 msgid "Undo _Close Tab" @@ -577,7 +579,7 @@ msgstr "Ångra s_tängning av flik" #: ../midori/midori-browser.c:4272 msgid "Open the last closed tab" -msgstr "" +msgstr "Öppna senast stängda flik" #: ../midori/midori-browser.c:4276 #: ../panels/midori-bookmarks.c:231 @@ -586,11 +588,11 @@ msgstr "Lägg till ett nytt bokmärke" #: ../midori/midori-browser.c:4278 msgid "Add a new _folder" -msgstr "" +msgstr "Lägg till en ny _mapp" #: ../midori/midori-browser.c:4279 msgid "Add a new bookmark folder" -msgstr "" +msgstr "Lägg till en ny bokmärkesmapp" #: ../midori/midori-browser.c:4281 #: ../midori/midori-searchaction.c:497 @@ -603,11 +605,11 @@ msgstr "Lägg till, ändra och ta bort sökmotorer..." #: ../midori/midori-browser.c:4285 msgid "_Clear Private Data" -msgstr "" +msgstr "_Rensa Privat Data" #: ../midori/midori-browser.c:4286 msgid "Clear private data..." -msgstr "" +msgstr "Rensa privat data..." #: ../midori/midori-browser.c:4290 msgid "_Previous Tab" @@ -615,7 +617,7 @@ msgstr "_Föregående flik" #: ../midori/midori-browser.c:4291 msgid "Switch to the previous tab" -msgstr "" +msgstr "Byt till föregående flik" #: ../midori/midori-browser.c:4293 msgid "_Next Tab" @@ -623,7 +625,7 @@ msgstr "_Nästa flik" #: ../midori/midori-browser.c:4294 msgid "Switch to the next tab" -msgstr "" +msgstr "Byt till nästa flik" #: ../midori/midori-browser.c:4296 msgid "_Help" @@ -635,15 +637,15 @@ msgstr "_Innehåll" #: ../midori/midori-browser.c:4299 msgid "Show the documentation" -msgstr "" +msgstr "Visa dokumentation" #: ../midori/midori-browser.c:4301 msgid "_Frequent Questions" -msgstr "" +msgstr "Vanliga Frågor" #: ../midori/midori-browser.c:4302 msgid "Show the Frequently Asked Questions" -msgstr "" +msgstr "Visa FAQ" #: ../midori/midori-browser.c:4304 msgid "_Report a Bug" @@ -655,7 +657,7 @@ msgstr "" #: ../midori/midori-browser.c:4308 msgid "Show information about the program" -msgstr "" +msgstr "Visa information om programmet" #: ../midori/midori-browser.c:4315 msgid "P_rivate Browsing" @@ -663,11 +665,11 @@ msgstr "P_rivat läge" #: ../midori/midori-browser.c:4316 msgid "Don't save any private data while browsing" -msgstr "" +msgstr "Spara inte webbläsardata när jag surfar" #: ../midori/midori-browser.c:4321 msgid "_Menubar" -msgstr "" +msgstr "Menyrad" #: ../midori/midori-browser.c:4322 msgid "Show menubar" @@ -675,7 +677,7 @@ msgstr "Visa menyrad" #: ../midori/midori-browser.c:4325 msgid "_Navigationbar" -msgstr "_Navigationsfält" +msgstr "_Navigeringsfält" #: ../midori/midori-browser.c:4326 msgid "Show navigationbar" @@ -687,23 +689,23 @@ msgstr "Sido_panel" #: ../midori/midori-browser.c:4330 msgid "Show sidepanel" -msgstr "Visa sido_panel" +msgstr "Visa sidopanel" #: ../midori/midori-browser.c:4333 msgid "_Bookmarkbar" -msgstr "_Bokmärkesfält" +msgstr "_Bokmärkesrad" #: ../midori/midori-browser.c:4334 msgid "Show bookmarkbar" -msgstr "Visa bokmärkesfält" +msgstr "Visa bokmärkesrad" #: ../midori/midori-browser.c:4337 msgid "_Transferbar" -msgstr "Ö_verföringsfält" +msgstr "Ö_verföringsrad" #: ../midori/midori-browser.c:4338 msgid "Show transferbar" -msgstr "Visa statusrad" +msgstr "Visa överföringsrad" #: ../midori/midori-browser.c:4341 msgid "_Statusbar" @@ -715,7 +717,7 @@ msgstr "Visa statusrad" #: ../midori/midori-browser.c:4349 msgid "_Automatic" -msgstr "" +msgstr "_Automatisk" #: ../midori/midori-browser.c:4352 #: ../midori/midori-websettings.c:214 @@ -751,7 +753,7 @@ msgstr "Anpassad..." #: ../midori/midori-browser.c:4806 #, fuzzy msgid "_Separator" -msgstr "Avskiljare" +msgstr "_Avskiljare" #: ../midori/midori-browser.c:4813 msgid "_Location..." @@ -759,7 +761,7 @@ msgstr "_Plats..." #: ../midori/midori-browser.c:4815 msgid "Open a particular location" -msgstr "" +msgstr "Öppna en plats" #: ../midori/midori-browser.c:4839 msgid "_Web Search..." @@ -775,11 +777,11 @@ msgstr "Öppna en tidigare stängd flik eller fönster" #: ../midori/midori-browser.c:4877 msgid "_Recently visited pages" -msgstr "" +msgstr "_Nyligen besökta sidor" #: ../midori/midori-browser.c:4879 msgid "Reopen pages that you visited earlier" -msgstr "" +msgstr "Öppna sidor du tidigare besökt" #: ../midori/midori-browser.c:4894 #: ../midori/sokoke.c:857 @@ -801,7 +803,7 @@ msgstr "_Fönster" #: ../midori/midori-browser.c:4925 msgid "Show a list of all open tabs" -msgstr "" +msgstr "Visa en lista över öppna flikar" #: ../midori/midori-browser.c:4939 msgid "_Menu" @@ -845,7 +847,7 @@ msgstr "Ta bort alla" #: ../midori/midori-browser.c:5552 #, c-format msgid "Unexpected setting '%s'" -msgstr "" +msgstr "Oväntad inställning '%s'" #: ../midori/midori-locationaction.c:901 #, c-format @@ -855,7 +857,7 @@ msgstr "Sök med %s" #: ../midori/midori-panel.c:382 #: ../midori/midori-panel.c:384 msgid "Detach chosen panel from the window" -msgstr "" +msgstr "Koppla från valda panel från fönstret" #: ../midori/midori-panel.c:394 #: ../midori/midori-panel.c:396 @@ -885,7 +887,7 @@ msgstr "" #: ../midori/midori-panel.c:783 msgid "Options" -msgstr "" +msgstr "Alternativ" #: ../midori/midori-websettings.c:197 msgid "Show Blank page" @@ -897,7 +899,7 @@ msgstr "Visa Hemsida" #: ../midori/midori-websettings.c:199 msgid "Show last open tabs" -msgstr "" +msgstr "Visa senast öppna flikar" #: ../midori/midori-websettings.c:215 msgid "Japanese (SHIFT_JIS)" @@ -929,11 +931,11 @@ msgstr "Text" #: ../midori/midori-websettings.c:254 msgid "Icons and text" -msgstr "" +msgstr "Ikoner och text" #: ../midori/midori-websettings.c:255 msgid "Text beside icons" -msgstr "" +msgstr "Text bredvid ikoner" #: ../midori/midori-websettings.c:270 msgid "All cookies" @@ -963,27 +965,27 @@ msgstr "Internet Explorer" #: ../midori/midori-websettings.c:343 msgid "Remember last window size" -msgstr "" +msgstr "Kom ihåg senaste fönsterstorlek" #: ../midori/midori-websettings.c:344 msgid "Whether to save the last window size" -msgstr "" +msgstr "Ifall senaste fönsterstorlek ska sparas" #: ../midori/midori-websettings.c:352 msgid "Last window width" -msgstr "" +msgstr "Senaste fönsterbredd" #: ../midori/midori-websettings.c:353 msgid "The last saved window width" -msgstr "" +msgstr "Senast sparade fönsterbredd" #: ../midori/midori-websettings.c:361 msgid "Last window height" -msgstr "" +msgstr "Senaste fönsterhöjd" #: ../midori/midori-websettings.c:362 msgid "The last saved window height" -msgstr "" +msgstr "Senast sparade fönsterhöjd" #: ../midori/midori-websettings.c:387 msgid "Last panel position" @@ -1004,11 +1006,11 @@ msgstr "" #: ../midori/midori-websettings.c:406 msgid "Last Web search" -msgstr "" +msgstr "Senaste websökning" #: ../midori/midori-websettings.c:407 msgid "The last saved Web search" -msgstr "" +msgstr "Senast sparade websökning" #: ../midori/midori-websettings.c:416 msgid "Show Menubar" @@ -1016,7 +1018,7 @@ msgstr "Visa menyrad" #: ../midori/midori-websettings.c:417 msgid "Whether to show the menubar" -msgstr "" +msgstr "Ifall menyraden ska visas" #: ../midori/midori-websettings.c:425 msgid "Show Navigationbar" @@ -1024,7 +1026,7 @@ msgstr "Visa Navigeringsfält" #: ../midori/midori-websettings.c:426 msgid "Whether to show the navigationbar" -msgstr "" +msgstr "Ifall naveringsfältet ska visas" #: ../midori/midori-websettings.c:434 msgid "Show Bookmarkbar" @@ -1032,7 +1034,7 @@ msgstr "Visa Bokmärkesfält" #: ../midori/midori-websettings.c:435 msgid "Whether to show the bookmarkbar" -msgstr "" +msgstr "Ifall bokmärkesraden ska visas" #: ../midori/midori-websettings.c:443 msgid "Show Panel" @@ -1040,17 +1042,17 @@ msgstr "Visa Sidopanel" #: ../midori/midori-websettings.c:444 msgid "Whether to show the panel" -msgstr "" +msgstr "Ifall sidopanelen ska visas" #: ../midori/midori-websettings.c:459 #, fuzzy msgid "Show Transferbar" -msgstr "Visa statusrad" +msgstr "Visa överföringsrad" #: ../midori/midori-websettings.c:460 #, fuzzy msgid "Whether to show the transferbar" -msgstr "Visa statusrad" +msgstr "Ifall överföringsraden ska visas" #: ../midori/midori-websettings.c:468 msgid "Show Statusbar" @@ -1058,7 +1060,7 @@ msgstr "Visa Statusrad" #: ../midori/midori-websettings.c:469 msgid "Whether to show the statusbar" -msgstr "" +msgstr "Ifall statusraden ska visas" #: ../midori/midori-websettings.c:478 #, fuzzy @@ -1088,11 +1090,11 @@ msgstr "" #: ../midori/midori-websettings.c:520 #, fuzzy msgid "Toolbar Items" -msgstr "Stil för verktygsfält" +msgstr "Föremål i Verktygsrad" #: ../midori/midori-websettings.c:521 msgid "The items to show on the toolbar" -msgstr "" +msgstr "Föremål att visa i verktygsraden" #: ../midori/midori-websettings.c:529 msgid "Compact Sidepanel" @@ -1122,11 +1124,11 @@ msgstr "Ifall aktivitetssymbolen ska animeras" #: ../midori/midori-websettings.c:571 msgid "When Midori starts:" -msgstr "" +msgstr "När Midori startar:" #: ../midori/midori-websettings.c:572 msgid "What to do when Midori starts" -msgstr "" +msgstr "Vad som ska göras när Midori startar" #: ../midori/midori-websettings.c:581 #, fuzzy @@ -1135,16 +1137,16 @@ msgstr "Hemsida" #: ../midori/midori-websettings.c:582 msgid "The homepage" -msgstr "" +msgstr "Hemsidan" #: ../midori/midori-websettings.c:597 #, fuzzy msgid "Show crash dialog" -msgstr "Visa Papperskorgen" +msgstr "Visa krashdialogen" #: ../midori/midori-websettings.c:598 msgid "Show a dialog after Midori crashed" -msgstr "" +msgstr "Visa en dialog efter att Midori har krashat" #. i18n: Speed dial, webpage shortcuts, named for the phone function #: ../midori/midori-websettings.c:614 @@ -1161,19 +1163,19 @@ msgstr "Spara hämtade filer i:" #: ../midori/midori-websettings.c:624 msgid "The folder downloaded files are saved to" -msgstr "" +msgstr "Mappen som filer ska hämtas till" #: ../midori/midori-websettings.c:643 msgid "Ask for the destination folder" -msgstr "" +msgstr "Fråga vart filer ska hämtas till" #: ../midori/midori-websettings.c:644 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" +msgstr "Ifall Midori ska fråga vilken mapp filer ska hämtas till" #: ../midori/midori-websettings.c:663 msgid "Notify when a transfer has been completed" -msgstr "" +msgstr "Säg till när en överföring är klar" #: ../midori/midori-websettings.c:664 msgid "Whether to show a notification when a transfer has been completed" @@ -1197,11 +1199,11 @@ msgstr "En extern textredigerare" #: ../midori/midori-websettings.c:701 msgid "News Aggregator" -msgstr "" +msgstr "RSS-läsare" #: ../midori/midori-websettings.c:702 msgid "An external news aggregator" -msgstr "" +msgstr "En extern RSS-läsare" #: ../midori/midori-websettings.c:710 msgid "Location entry Search" @@ -1217,15 +1219,15 @@ msgstr "Föredragen kodning" #: ../midori/midori-websettings.c:720 msgid "The preferred character encoding" -msgstr "" +msgstr "Den föredragna teckenkodningen" #: ../midori/midori-websettings.c:730 msgid "Always Show Tabbar" -msgstr "" +msgstr "Visa Alltid Flikrad" #: ../midori/midori-websettings.c:731 msgid "Always show the tabbar" -msgstr "" +msgstr "Visa alltid flikraden" #: ../midori/midori-websettings.c:739 msgid "Close Buttons on Tabs" @@ -1269,7 +1271,7 @@ msgstr "" #: ../midori/midori-websettings.c:786 msgid "Open Tabs next to Current" -msgstr "" +msgstr "Öppna Flikar bredvid Nuvarande" #: ../midori/midori-websettings.c:787 msgid "Whether to open new tabs next to the current tab or after the last one" @@ -1285,7 +1287,7 @@ msgstr "" #: ../midori/midori-websettings.c:812 msgid "Zoom Text and Images" -msgstr "" +msgstr "Zooma Text och Bilder" #: ../midori/midori-websettings.c:813 #, fuzzy @@ -1294,7 +1296,7 @@ msgstr "Ifall aktivitetssymbolen ska animeras" #: ../midori/midori-websettings.c:828 msgid "Find inline while typing" -msgstr "" +msgstr "Sök på sidan" #: ../midori/midori-websettings.c:829 msgid "Whether to automatically find inline while typing" @@ -1306,7 +1308,7 @@ msgstr "Acceptera kakor" #: ../midori/midori-websettings.c:838 msgid "What type of cookies to accept" -msgstr "" +msgstr "Vilka typer av kakor som ska accepteras" #: ../midori/midori-websettings.c:847 msgid "Original cookies only" @@ -1322,11 +1324,11 @@ msgstr "Maximal kakålder" #: ../midori/midori-websettings.c:857 msgid "The maximum number of days to save cookies for" -msgstr "" +msgstr "Maximalt antal dagar att spara kakor" #: ../midori/midori-websettings.c:867 msgid "Remember last visited pages" -msgstr "" +msgstr "Kom ihåg senast besökta sidor" #: ../midori/midori-websettings.c:868 msgid "Whether the last visited pages are saved" @@ -1334,11 +1336,11 @@ msgstr "" #: ../midori/midori-websettings.c:876 msgid "Maximum history age" -msgstr "" +msgstr "Maximal historikålder" #: ../midori/midori-websettings.c:877 msgid "The maximum number of days to save the history for" -msgstr "" +msgstr "Maximalt antal dagar som historik ska sparas" #: ../midori/midori-websettings.c:885 msgid "Remember last form inputs" @@ -1350,7 +1352,7 @@ msgstr "" #: ../midori/midori-websettings.c:894 msgid "Remember last downloaded files" -msgstr "" +msgstr "Kom ihåg senast hämtade filer" #: ../midori/midori-websettings.c:895 msgid "Whether the last downloaded files are saved" @@ -1395,11 +1397,11 @@ msgstr "Cache-storlek" #: ../midori/midori-websettings.c:965 msgid "The allowed size of the cache" -msgstr "" +msgstr "Tillåtna storleken på cache" #: ../midori/midori-websettings.c:980 msgid "Clear private data" -msgstr "" +msgstr "Rensa privat data" #: ../midori/midori-websettings.c:981 msgid "The private data selected for deletion" @@ -1445,11 +1447,11 @@ msgstr "Öppna länk i nytt _fönster" #: ../midori/midori-view.c:1230 msgid "_Download Link destination" -msgstr "" +msgstr "_Hämta länkplats" #: ../midori/midori-view.c:1236 msgid "_Save Link destination" -msgstr "" +msgstr "_Spara länkplats" #: ../midori/midori-view.c:1245 msgid "Download with Download _Manager" @@ -1491,7 +1493,7 @@ msgstr "Öppna %s" #: ../midori/midori-view.c:1957 #, c-format msgid "Inspect page - %s" -msgstr "" +msgstr "Inspektera sida - %s" #: ../midori/midori-view.c:2147 msgid "Speed dial" @@ -1499,29 +1501,29 @@ msgstr "" #: ../midori/midori-view.c:2148 msgid "Click to add a shortcut" -msgstr "" +msgstr "Klicka för att lägga till genväg" #: ../midori/midori-view.c:2149 msgid "Enter shortcut address" -msgstr "" +msgstr "Skriv adress till genväg" #: ../midori/midori-view.c:2150 msgid "Enter shortcut title" -msgstr "" +msgstr "Skriv titel på genväg" #: ../midori/midori-view.c:2151 msgid "Are you sure you want to delete this shortcut?" -msgstr "" +msgstr "Är du säker på att du vill ta bort den här genvägen?" #: ../midori/midori-view.c:2181 #, c-format msgid "Document cannot be displayed" -msgstr "" +msgstr "Dokumentet kan inte visas" #: ../midori/midori-view.c:2198 #, c-format msgid "No documentation installed" -msgstr "" +msgstr "Ingen dokumentation installerad" #: ../midori/midori-view.c:2323 msgid "Blank page" @@ -1560,7 +1562,7 @@ msgstr "Uppstart" #: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" -msgstr "" +msgstr "Använd nuvarande sida som startsida" #: ../midori/midori-preferences.c:425 #: ../panels/midori-transfers.c:88 @@ -1574,7 +1576,7 @@ msgstr "Utseende" #: ../midori/midori-preferences.c:441 msgid "Font settings" -msgstr "Typsnittinställningar" +msgstr "Typsnittsinställningar" #: ../midori/midori-preferences.c:443 msgid "Default Font Family" @@ -1602,7 +1604,7 @@ msgstr "" #: ../midori/midori-preferences.c:463 msgid "Minimum Font Size" -msgstr "" +msgstr "Minsta typsnittsstorlek" #: ../midori/midori-preferences.c:466 msgid "The minimum font size used to display text" @@ -1628,15 +1630,15 @@ msgstr "Funktioner" #: ../midori/midori-preferences.c:487 #: ../extensions/statusbar-features.c:88 msgid "Load images automatically" -msgstr "" +msgstr "Ladda bilder automatiskt" #: ../midori/midori-preferences.c:488 msgid "Load and display images automatically" -msgstr "" +msgstr "Ladda och visa bilder automatiskt" #: ../midori/midori-preferences.c:491 msgid "Shrink images automatically" -msgstr "" +msgstr "Förminska bilder automatiskt" #: ../midori/midori-preferences.c:492 msgid "Automatically shrink standalone images to fit" @@ -1648,7 +1650,7 @@ msgstr "Skriv ut bakgrundsbilder" #: ../midori/midori-preferences.c:496 msgid "Whether background images should be printed" -msgstr "" +msgstr "Ifall bakgrundsbilder ska visas" #: ../midori/midori-preferences.c:499 msgid "Resizable text areas" @@ -1670,7 +1672,7 @@ msgstr "" #: ../midori/midori-preferences.c:507 #: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" -msgstr "" +msgstr "Aktivera Netscape-tillägg" #: ../midori/midori-preferences.c:508 msgid "Enable embedded Netscape plugin objects" @@ -1678,7 +1680,7 @@ msgstr "" #: ../midori/midori-preferences.c:511 msgid "Enforce 96 dots per inch" -msgstr "" +msgstr "Tvinga 96 punkter per tum" #: ../midori/midori-preferences.c:512 msgid "Enforce a video dot density of 96 DPI" @@ -1690,7 +1692,7 @@ msgstr "Aktivera utvecklingsverktyg" #: ../midori/midori-preferences.c:516 msgid "Enable special extensions for developers" -msgstr "" +msgstr "Aktivera speciella tillägg för utvecklare" #: ../midori/midori-preferences.c:523 msgid "Spell Checking" @@ -1786,7 +1788,7 @@ msgstr "Hantera sökmotorer" #: ../midori/midori-searchaction.c:1312 msgid "Use as _default" -msgstr "" +msgstr "Använd som _standard" #: ../midori/sokoke.c:162 #: ../midori/sokoke.c:174 @@ -1795,7 +1797,7 @@ msgstr "Kunde inte köra externt program." #: ../midori/sokoke.c:856 msgid "_Bookmark" -msgstr "_Bokmärk" +msgstr "_Bokmärke" #: ../midori/sokoke.c:858 msgid "Add Boo_kmark" @@ -1807,11 +1809,11 @@ msgstr "_Konsol" #: ../midori/sokoke.c:860 msgid "_Extensions" -msgstr "" +msgstr "_Tillägg" #: ../midori/sokoke.c:861 msgid "_History" -msgstr "_Historia" +msgstr "_Historik" #: ../midori/sokoke.c:862 msgid "_Homepage" @@ -1819,7 +1821,7 @@ msgstr "_Hemsida" #: ../midori/sokoke.c:863 msgid "_Userscripts" -msgstr "_Beskrivning" +msgstr "_Användarskript" #: ../midori/sokoke.c:864 msgid "User_styles" @@ -1831,7 +1833,7 @@ msgstr "_Överföringar" #: ../midori/sokoke.c:867 msgid "Netscape p_lugins" -msgstr "" +msgstr "Netscape-_Tillägg" #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 @@ -1849,11 +1851,11 @@ msgstr "Bokmärken" #: ../panels/midori-bookmarks.c:239 msgid "Edit the selected bookmark" -msgstr "" +msgstr "Redigera valda bokmärke" #: ../panels/midori-bookmarks.c:247 msgid "Delete the selected bookmark" -msgstr "Ta bort markerad bokmärke" +msgstr "Ta bort markerat bokmärke" #: ../panels/midori-bookmarks.c:260 msgid "Add a new folder" @@ -1869,25 +1871,25 @@ msgstr "Konsol" #: ../panels/midori-extensions.c:91 msgid "Extensions" -msgstr "" +msgstr "Tillägg" #: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" -msgstr "" +msgstr "Är du säker på att du vill radera hela historiken?" #: ../panels/midori-history.c:217 #, fuzzy msgid "Bookmark the selected history item" -msgstr "Kopiera markerad text" +msgstr "Lägg till bokmärke för den valda historikposten" #: ../panels/midori-history.c:226 #, fuzzy msgid "Delete the selected history item" -msgstr "Ta bort markerad text" +msgstr "Ta bort den valda historikposten" #: ../panels/midori-history.c:234 msgid "Clear the entire history" -msgstr "" +msgstr "Rensa hela historiken" #: ../panels/midori-history.c:601 msgid "A week ago" @@ -1925,7 +1927,7 @@ msgstr "Visa i sid_hållare..." #: ../panels/midori-transfers.c:482 msgid "Copy Link Loc_ation" -msgstr "" +msgstr "Kopiera länkplats" #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" @@ -1935,7 +1937,8 @@ msgstr "" msgid "" "A username and a password are required\n" "to open this location:" -msgstr "" +msgstr "Användarnamn och lösenord behövs\n" +"för att öppna den här platsen" #: ../katze/katze-http-auth.c:127 msgid "Username" @@ -1976,19 +1979,19 @@ msgstr "Välj mapp" #: ../extensions/adblock.c:167 msgid "Configure Advertisement filters" -msgstr "" +msgstr "Redigera Reklamblockeringsfilter" #: ../extensions/adblock.c:304 msgid "Configure _Advertisement filters..." -msgstr "" +msgstr "Redigera _Reklamblockeringsfilter" #: ../extensions/adblock.c:562 msgid "Advertisement blocker" -msgstr "" +msgstr "Reklamblockeringsfilter" #: ../extensions/adblock.c:563 msgid "Block advertisements according to a filter list" -msgstr "" +msgstr "Blockera annonser enligt en filterlista" #: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" @@ -2013,15 +2016,15 @@ msgstr "" #: ../extensions/cookie-manager/cookie-manager-page.c:126 msgid "Expand All" -msgstr "" +msgstr "Expandera Alla" #: ../extensions/cookie-manager/cookie-manager-page.c:133 msgid "Collapse All" -msgstr "" +msgstr "Kollapsa Alla" #: ../extensions/cookie-manager/cookie-manager-page.c:460 msgid "Do you really want to delete all cookies?" -msgstr "" +msgstr "Vill du verkligen ta bort alla kakor?" #: ../extensions/cookie-manager/cookie-manager-page.c:462 msgid "Question" @@ -2081,7 +2084,7 @@ msgstr "" #: ../extensions/cookie-manager/main.c:57 msgid "List, view and delete cookies" -msgstr "" +msgstr "Visa och ta bort kakor" #: ../extensions/feed-panel/feed-atom.c:242 msgid "Failed to find required Atom \"entry\" elements in XML data." @@ -2101,19 +2104,19 @@ msgstr "" #: ../extensions/feed-panel/feed-panel.c:664 #, fuzzy msgid "Feeds" -msgstr "Funktioner" +msgstr "Flöden" #: ../extensions/feed-panel/feed-panel.c:717 msgid "Add new feed" -msgstr "" +msgstr "Lägg till nytt flöde" #: ../extensions/feed-panel/feed-panel.c:724 msgid "Delete feed" -msgstr "" +msgstr "Ta bort flöde" #: ../extensions/feed-panel/feed-panel.c:807 msgid "_Feeds" -msgstr "" +msgstr "_Flöden" #: ../extensions/feed-panel/feed-parse.c:185 #, c-format @@ -2154,11 +2157,11 @@ msgstr "" #: ../extensions/feed-panel/main.c:191 #, c-format msgid "Error loading feed '%s'" -msgstr "" +msgstr "Fel vid laddning av flödet '%s'" #: ../extensions/feed-panel/main.c:331 msgid "New feed" -msgstr "" +msgstr "Nytt flöde" #: ../extensions/feed-panel/main.c:489 #, fuzzy @@ -2167,7 +2170,7 @@ msgstr "Visa Sidopanel" #: ../extensions/feed-panel/main.c:490 msgid "Read Atom/ RSS feeds" -msgstr "" +msgstr "Läs Atom/RSS-flöden" #: ../extensions/mouse-gestures/main.c:236 msgid "Mouse Gestures" @@ -2175,7 +2178,7 @@ msgstr "Musgester" #: ../extensions/mouse-gestures/main.c:237 msgid "Control Midori by moving the mouse" -msgstr "" +msgstr "Kontrollera Midori genom att flytta musen" #. i18n: A panel showing a user specified web page #: ../extensions/page-holder.c:129 @@ -2189,11 +2192,11 @@ msgstr "_Sidhållare" #: ../extensions/shortcuts.c:172 msgid "Customize Keyboard shortcuts" -msgstr "" +msgstr "Ställ in tangentbordsgenvägar" #: ../extensions/shortcuts.c:264 msgid "Customize Sh_ortcuts..." -msgstr "" +msgstr "Ställ in Gen_vägar..." #: ../extensions/shortcuts.c:303 msgid "Shortcuts" @@ -2201,7 +2204,7 @@ msgstr "Genvägar" #: ../extensions/shortcuts.c:304 msgid "View and edit keyboard shortcuts" -msgstr "" +msgstr "Visa och redigera tangentbordsgenvägar" #: ../extensions/statusbar-features.c:84 msgid "Images" @@ -2238,28 +2241,28 @@ msgstr "Visa sido_panel" #: ../extensions/toolbar-editor.c:391 msgid "Customize Toolbar" -msgstr "" +msgstr "Redigera Verktygsrad" #: ../extensions/toolbar-editor.c:407 msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." -msgstr "" +msgstr "Välj föremål att visa i verktygsraden. Föremål kan omarrangeras genom att dra och släppa." #: ../extensions/toolbar-editor.c:423 msgid "Available Items" -msgstr "" +msgstr "Tillgängliga föremål" #: ../extensions/toolbar-editor.c:444 msgid "Displayed Items" -msgstr "" +msgstr "Visade föremål" #: ../extensions/toolbar-editor.c:579 msgid "Customize _Toolbar..." -msgstr "" +msgstr "Redigera _Verktygsrad..." #: ../extensions/toolbar-editor.c:611 #, fuzzy msgid "Toolbar Editor" -msgstr "Stil för verktygsfält" +msgstr "Stil för verktygsrad" #: ../extensions/toolbar-editor.c:612 msgid "Easily edit the toolbar layout" @@ -2296,7 +2299,7 @@ msgstr "" #, fuzzy #~ msgid "_Disable" -#~ msgstr "_Fil" +#~ msgstr "_Inaktivera" #~ msgid "_Fullscreen" #~ msgstr "_Fullskärm" #~ msgid "_Leave Fullscreen" @@ -2310,7 +2313,7 @@ msgstr "" #~ msgid "The trash, collecting recently closed tabs and windows" #~ msgstr "Soptunnan, samlar senast stängda tabbar och fönster" #~ msgid "Browser" -#~ msgstr "Bläsare" +#~ msgstr "Webbläsare" #~ msgid "The text that is displayed in the statusbar" #~ msgstr "Texten som visas i statusraden" #~ msgid "Pa_ge Setup" From db2c204b08de9abecb072877a5dd2fdd3580620e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Sep 2010 23:18:02 +0200 Subject: [PATCH 2950/2970] Update French translation --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6c1baa33..b6cad174 100644 --- a/po/fr.po +++ b/po/fr.po @@ -364,7 +364,6 @@ msgid "Open file" msgstr "Ouvrir le fichier" #: ../midori/midori-browser.c:2228 -#, fuzzy msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -372,10 +371,10 @@ msgid "" "Aggregator. Next time you click the news feed icon, it will be added " "automatically." msgstr "" -"Pour utiliser l'URI ci-dessus ouvrez un nouvel agrégateur. Il y a " +"Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a " "habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS " "\" ou similaires. \\ nAlternativement allez dans Préférences, Applications " -"de Midori, et sélectionnez un nouvel agrégateur. La prochaine fois que vous " +"de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous " "cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." #: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 From 40dc38fd2154c1415178670fdbd1966b89b5ea5c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Sep 2010 23:39:51 +0200 Subject: [PATCH 2951/2970] Implement and use KATZE_ARRAY_FOREACH_ITEM Iterating an array by a GList is considerably faster than continuously retrieving items, however it is also a lot more complicated. So the new macro takes care of that and uses a new semi-private function to avoid copying the list. Note that the macro can't be nested, which basically isn't useful in practise anyway. --- extensions/adblock.c | 4 +--- extensions/addons.c | 7 ++----- extensions/colorful-tabs.c | 4 +--- extensions/cookie-manager/cookie-manager.c | 4 +--- extensions/copy-tabs.c | 4 +--- extensions/feed-panel/feed-panel.c | 4 +--- extensions/feed-panel/main.c | 12 +++++------- extensions/formhistory.c | 4 +--- extensions/mouse-gestures.c | 4 +--- extensions/page-holder.c | 4 +--- extensions/shortcuts.c | 4 +--- extensions/status-clock.c | 6 ++---- extensions/statusbar-features.c | 4 +--- extensions/tab-panel.c | 4 +--- extensions/tabs-minimized.c | 4 +--- extensions/toolbar-editor.c | 4 +--- extensions/web-cache.c | 4 +--- katze/katze-array.c | 6 ++++++ katze/katze-array.h | 11 +++++++++++ katze/katze-utils.c | 4 +--- midori/main.c | 21 +++++++-------------- midori/midori-array.c | 7 ++----- midori/midori-browser.c | 21 +++++---------------- midori/midori-locationaction.c | 4 ++-- midori/midori-searchaction.c | 9 +++------ midori/midori-view.c | 5 +++-- panels/midori-bookmarks.c | 20 ++++++-------------- panels/midori-extensions.c | 7 ++----- panels/midori-history.c | 3 +-- 29 files changed, 72 insertions(+), 127 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index 46a244a0..12a68e5e 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -1367,7 +1367,6 @@ adblock_activate_cb (MidoriExtension* extension, #endif KatzeArray* browsers; MidoriBrowser* browser; - guint i; #if !HAVE_WEBKIT_RESOURCE_REQUEST SoupSession* session = webkit_get_default_session (); @@ -1391,8 +1390,7 @@ adblock_activate_cb (MidoriExtension* extension, adblock_reload_rules (extension, FALSE); browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) adblock_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (adblock_app_add_browser_cb), extension); diff --git a/extensions/addons.c b/extensions/addons.c index 4eff71cf..3c62c39a 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -1447,13 +1447,12 @@ addons_deactivate_cb (MidoriExtension* extension, KatzeArray* browsers; MidoriBrowser* browser; GSource* source; - guint i = 0; addons_disable_monitors (extension); addons_save_settings (NULL, extension); browsers = katze_object_get_object (app, "browsers"); - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) addons_browser_destroy (browser, extension); source = g_object_get_data (G_OBJECT (extension), "monitor-timer"); @@ -1556,7 +1555,6 @@ addons_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); addons_update_elements (extension, ADDONS_USER_STYLES); @@ -1564,8 +1562,7 @@ addons_activate_cb (MidoriExtension* extension, addons_update_elements (extension, ADDONS_USER_SCRIPTS); addons_monitor_directories (extension, ADDONS_USER_SCRIPTS); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) addons_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index d9c108ef..5979f4e6 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -185,11 +185,9 @@ colorful_tabs_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) colorful_tabs_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (colorful_tabs_app_add_browser_cb), extension); diff --git a/extensions/cookie-manager/cookie-manager.c b/extensions/cookie-manager/cookie-manager.c index dc256722..70a4f7aa 100644 --- a/extensions/cookie-manager/cookie-manager.c +++ b/extensions/cookie-manager/cookie-manager.c @@ -315,7 +315,6 @@ CookieManager *cookie_manager_new(MidoriExtension *extension, MidoriApp *app) { CookieManager *cm; CookieManagerPrivate *priv; - guint i; KatzeArray *browsers; MidoriBrowser *browser; @@ -327,8 +326,7 @@ CookieManager *cookie_manager_new(MidoriExtension *extension, MidoriApp *app) /* add the cookie manager panel page to existing browsers */ browsers = katze_object_get_object(app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item(browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) cookie_manager_app_add_browser_cb(app, browser, cm); g_object_unref(browsers); diff --git a/extensions/copy-tabs.c b/extensions/copy-tabs.c index 2734ec54..60fe2dbc 100644 --- a/extensions/copy-tabs.c +++ b/extensions/copy-tabs.c @@ -80,11 +80,9 @@ copy_tabs_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) copy_tabs_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); g_signal_connect (app, "add-browser", diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 26fbb261..2241ad70 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -271,7 +271,6 @@ feed_panel_disconnect_feed (FeedPanel* panel, KatzeArray* feed) { KatzeItem* item; - guint i; g_return_if_fail (KATZE_IS_ARRAY (feed)); @@ -282,8 +281,7 @@ feed_panel_disconnect_feed (FeedPanel* panel, g_signal_handlers_disconnect_by_func (feed, feed_panel_move_item_cb, panel); - i = 0; - while ((item = katze_array_get_nth_item (feed, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, feed) { if (KATZE_IS_ARRAY (item)) feed_panel_disconnect_feed (panel, KATZE_ARRAY (item)); diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 2e46c784..14c4f826 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -157,18 +157,18 @@ feed_save_items (MidoriExtension* extension, { KatzeItem* item; gchar** sfeeds; - gint i; - gint n; + gint i, n; g_return_if_fail (KATZE_IS_ARRAY (feed)); n = katze_array_get_length (feed); sfeeds = g_new (gchar*, n + 1); - for (i = 0; i < n; i++) + i = 0; + KATZE_ARRAY_FOREACH_ITEM (item, feed) { - item = katze_array_get_nth_item (feed, i); sfeeds[i] = (gchar*) katze_item_get_uri (KATZE_ITEM (item)); + i++; } sfeeds[n] = NULL; @@ -498,11 +498,9 @@ feed_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) feed_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); diff --git a/extensions/formhistory.c b/extensions/formhistory.c index 446e534b..44958a3f 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -425,7 +425,6 @@ formhistory_activate_cb (MidoriExtension* extension, char* errmsg = NULL, *errmsg2 = NULL; KatzeArray* browsers; MidoriBrowser* browser; - guint i; global_keys = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, @@ -464,8 +463,7 @@ formhistory_activate_cb (MidoriExtension* extension, } browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) formhistory_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (formhistory_app_add_browser_cb), extension); diff --git a/extensions/mouse-gestures.c b/extensions/mouse-gestures.c index c3c93bf0..9a7d738a 100644 --- a/extensions/mouse-gestures.c +++ b/extensions/mouse-gestures.c @@ -281,14 +281,12 @@ mouse_gestures_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; gesture = mouse_gesture_new (); gesture->button = midori_extension_get_integer (extension, "button"); browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) mouse_gestures_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (mouse_gestures_app_add_browser_cb), extension); diff --git a/extensions/page-holder.c b/extensions/page-holder.c index 9c6f0f14..b3374421 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -139,11 +139,9 @@ page_holder_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) page_holder_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); g_signal_connect (app, "add-browser", diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c index 3ff55788..12671fa3 100644 --- a/extensions/shortcuts.c +++ b/extensions/shortcuts.c @@ -297,11 +297,9 @@ shortcuts_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) shortcuts_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (shortcuts_app_add_browser_cb), extension); diff --git a/extensions/status-clock.c b/extensions/status-clock.c index c30f1cf0..68bf1f2c 100644 --- a/extensions/status-clock.c +++ b/extensions/status-clock.c @@ -131,10 +131,9 @@ clock_deactivate_cb (MidoriExtension* extension, KatzeArray* browsers; MidoriBrowser* browser; GtkWidget* label; - guint i = 0; browsers = katze_object_get_object (app, "browsers"); - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) { clock_browser_destroy_cb (browser, NULL); label = g_object_get_data (G_OBJECT (browser), "clock-label"); @@ -155,10 +154,9 @@ clock_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i = 0; browsers = katze_object_get_object (app, "browsers"); - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) clock_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (clock_app_add_browser_cb), extension); diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 58b99fa4..9a6b0665 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -131,11 +131,9 @@ statusbar_features_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) statusbar_features_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (statusbar_features_app_add_browser_cb), extension); diff --git a/extensions/tab-panel.c b/extensions/tab-panel.c index beabcda5..a358818a 100644 --- a/extensions/tab-panel.c +++ b/extensions/tab-panel.c @@ -590,11 +590,9 @@ tab_panel_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) tab_panel_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); g_signal_connect (app, "add-browser", diff --git a/extensions/tabs-minimized.c b/extensions/tabs-minimized.c index 993625ed..f5130ee3 100644 --- a/extensions/tabs-minimized.c +++ b/extensions/tabs-minimized.c @@ -61,11 +61,9 @@ tabs_minimized_activate_cb (MidoriExtension* extension, { KatzeArray* browsers; MidoriBrowser* browser; - guint i; browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) tabs_minimized_app_add_browser_cb (app, browser, extension); g_object_unref (browsers); g_signal_connect (app, "add-browser", diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c index b8b0e005..d5f1ea85 100644 --- a/extensions/toolbar-editor.c +++ b/extensions/toolbar-editor.c @@ -592,11 +592,9 @@ static void tb_editor_activate_cb(MidoriExtension *extension, MidoriApp *app) { KatzeArray *browsers; MidoriBrowser *browser; - guint i; browsers = katze_object_get_object(app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item(browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) tb_editor_app_add_browser_cb(app, browser, extension); g_signal_connect(app, "add-browser", G_CALLBACK(tb_editor_app_add_browser_cb), extension); g_object_unref(browsers); diff --git a/extensions/web-cache.c b/extensions/web-cache.c index 33c34299..884e083a 100644 --- a/extensions/web-cache.c +++ b/extensions/web-cache.c @@ -438,7 +438,6 @@ web_cache_activate_cb (MidoriExtension* extension, const gchar* cache_path = midori_extension_get_string (extension, "path"); KatzeArray* browsers; MidoriBrowser* browser; - guint i; SoupSession* session = webkit_get_default_session (); katze_mkdir_with_parents (cache_path, 0700); @@ -446,8 +445,7 @@ web_cache_activate_cb (MidoriExtension* extension, G_CALLBACK (web_cache_session_request_queued_cb), extension); browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) + KATZE_ARRAY_FOREACH_ITEM (browser, browsers) web_cache_app_add_browser_cb (app, browser, extension); g_signal_connect (app, "add-browser", G_CALLBACK (web_cache_app_add_browser_cb), extension); diff --git a/katze/katze-array.c b/katze/katze-array.c index 44b77501..9cf0cbaa 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -479,6 +479,12 @@ katze_array_get_items (KatzeArray* array) return g_list_copy (array->items); } +GList* +katze_array_peek_items (KatzeArray* array) +{ + return array->items; +} + /** * katze_array_clear: * @array: a #KatzeArray diff --git a/katze/katze-array.h b/katze/katze-array.h index 17d203d8..f54f66ba 100644 --- a/katze/katze-array.h +++ b/katze/katze-array.h @@ -80,6 +80,17 @@ katze_array_move_item (KatzeArray* array, GList* katze_array_get_items (KatzeArray* array); +GList* +katze_array_peek_items (KatzeArray* array); + +GList* kalistglobal; +#define KATZE_ARRAY_FOREACH_ITEM(kaitem, kaarray) \ + for (kalistglobal = katze_array_peek_items (kaarray), \ + kaitem = kalistglobal ? kalistglobal->data : NULL; \ + kalistglobal != NULL; \ + kalistglobal = g_list_next (kalistglobal), \ + kaitem = kalistglobal ? kalistglobal->data : NULL) + void katze_array_clear (KatzeArray* array); diff --git a/katze/katze-utils.c b/katze/katze-utils.c index b43869d6..cde82348 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1136,9 +1136,8 @@ katze_bookmark_populate_tree_view (KatzeArray* array, KatzeItem* child; GtkTreeIter iter; GtkTreeIter root_iter; - guint i = 0; - while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) + KATZE_ARRAY_FOREACH_ITEM (child, array) { if (KATZE_ITEM_IS_BOOKMARK (child)) { @@ -1155,7 +1154,6 @@ katze_bookmark_populate_tree_view (KatzeArray* array, gtk_tree_store_insert_with_values (model, &iter, &root_iter, 0, 0, NULL, -1); } - i++; } } diff --git a/midori/main.c b/midori/main.c index 5f9cd151..5f464f18 100644 --- a/midori/main.c +++ b/midori/main.c @@ -244,8 +244,7 @@ settings_save_to_file (MidoriWebSettings* settings, if (extensions) { - i = 0; - while ((extension = katze_array_get_nth_item (extensions, i++))) + KATZE_ARRAY_FOREACH_ITEM (extension, extensions) if (midori_extension_is_active (extension)) g_key_file_set_boolean (key_file, "extensions", g_object_get_data (G_OBJECT (extension), "filename"), TRUE); @@ -315,7 +314,7 @@ search_engines_save_to_file (KatzeArray* search_engines, GError** error) { GKeyFile* key_file; - guint i, j, n_properties; + guint j, n_properties; KatzeItem* item; const gchar* name; GParamSpec** pspecs; @@ -326,8 +325,7 @@ search_engines_save_to_file (KatzeArray* search_engines, key_file = g_key_file_new (); pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), &n_properties); - i = 0; - while ((item = katze_array_get_nth_item (search_engines, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, search_engines) { name = katze_item_get_name (item); for (j = 0; j < n_properties; j++) @@ -508,8 +506,7 @@ static void midori_session_add_delay (KatzeArray* session) { KatzeItem* item; - gint i = 0; - while ((item = katze_array_get_nth_item (session, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, session) katze_item_set_meta_integer (item, "delay", 1); } @@ -1196,9 +1193,8 @@ midori_browser_action_last_session_activate_cb (GtkAction* action, GError* error = NULL; if (midori_array_from_file (old_session, config_file, "xbel", &error)) { - guint i = 0; KatzeItem* item; - while ((item = katze_array_get_nth_item (old_session, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, old_session) midori_browser_add_item (browser, item); } else @@ -1223,7 +1219,6 @@ midori_load_session (gpointer data) gchar* config_file; KatzeArray* session; KatzeItem* item; - guint i; gint64 current; MidoriStartup load_on_startup; gchar** command = g_object_get_data (G_OBJECT (app), "execute-command"); @@ -1277,8 +1272,7 @@ midori_load_session (gpointer data) midori_session_add_delay (_session); session = midori_browser_get_proxy_array (browser); - i = 0; - while ((item = katze_array_get_nth_item (_session, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, _session) { g_object_set_data (G_OBJECT (item), "midori-view-append", (void*)1); midori_browser_add_item (browser, item); @@ -2056,8 +2050,7 @@ main (int argc, G_CALLBACK (midori_search_engines_modify_cb), search_engines); if (!katze_array_is_empty (search_engines)) { - i = 0; - while ((item = katze_array_get_nth_item (search_engines, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, search_engines) g_signal_connect_after (item, "notify", G_CALLBACK (midori_search_engines_modify_cb), search_engines); } diff --git a/midori/midori-array.c b/midori/midori-array.c index e8ca484b..25c68d01 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -589,7 +589,6 @@ string_append_item (GString* string, metadata = katze_item_metadata_to_xbel (item); if (KATZE_IS_ARRAY (item)) { - guint i = 0; KatzeItem* _item; KatzeArray* array = KATZE_ARRAY (item); @@ -597,7 +596,7 @@ string_append_item (GString* string, /* FIXME: " folded=\"no\" */ string_append_xml_element (string, "title", katze_item_get_name (item)); string_append_xml_element (string, "desc", katze_item_get_text (item)); - while ((_item = katze_array_get_nth_item (array, i++))) + KATZE_ARRAY_FOREACH_ITEM (_item, array) string_append_item (string, _item); g_string_append (string, metadata); g_string_append (string, "\n"); @@ -679,7 +678,6 @@ katze_array_to_xbel (KatzeArray* array, GError** error) { gchar* metadata = katze_item_metadata_to_xbel (KATZE_ITEM (array)); - guint i; KatzeItem* item; GString* markup = g_string_new ( @@ -693,8 +691,7 @@ katze_array_to_xbel (KatzeArray* array, string_append_xml_element (markup, "title", katze_item_get_name (KATZE_ITEM (array))); string_append_xml_element (markup, "desc", katze_item_get_text (KATZE_ITEM (array))); g_string_append (markup, metadata); - i = 0; - while ((item = katze_array_get_nth_item (array, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, array) string_append_item (markup, item); g_string_append (markup, "\n"); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 05c9b336..dfa00700 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3764,16 +3764,14 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget* menuitem, if (KATZE_IS_ARRAY (item)) { KatzeItem* child; - guint i = 0; - while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i))) + KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (item)) { if ((uri = katze_item_get_uri (child)) && *uri) { n = midori_browser_add_item (browser, child); midori_browser_set_current_page_smartly (browser, n); } - i++; } } else @@ -4016,8 +4014,7 @@ _action_bookmarks_import_activate (GtkAction* action, db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); sqlcmd = "SELECT title from bookmarks where uri=''"; bookmarkdirs = katze_array_from_sqlite (db, sqlcmd); - i = 0; - while ((item = katze_array_get_nth_item (bookmarkdirs, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, bookmarkdirs) { const gchar* name = katze_item_get_name (item); gtk_combo_box_append_text (combobox_folder, name); @@ -6145,16 +6142,13 @@ _midori_browser_update_settings (MidoriBrowser* browser) if (browser->search_engines) { - guint i; - item = katze_array_get_nth_item (browser->search_engines, last_web_search); if (item) midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); - i = 0; - while ((item = katze_array_get_nth_item (browser->search_engines, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, browser->search_engines) if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search)) { midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( @@ -6330,7 +6324,6 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) const gchar* sqlcmd; KatzeArray* array; KatzeItem* item; - gint i = 0; midori_bookmarkbar_clear (browser->bookmarkbar); @@ -6353,7 +6346,7 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) return; } - while ((item = katze_array_get_nth_item (KATZE_ARRAY (array), i))) + KATZE_ARRAY_FOREACH_ITEM (item, array) { if (KATZE_ITEM_IS_BOOKMARK (item)) midori_bookmarkbar_insert_item (browser->bookmarkbar, item); @@ -6369,7 +6362,6 @@ midori_bookmarkbar_populate (MidoriBrowser* browser) midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder)); g_free (subsqlcmd); } - i++; } _action_set_sensitive (browser, "BookmarkAdd", TRUE); _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE); @@ -6476,8 +6468,6 @@ midori_browser_set_property (GObject* object, break; case PROP_SEARCH_ENGINES: { - guint i; - /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_dup_object (value)); if (katze_object_get_boolean (browser->settings, @@ -6498,8 +6488,7 @@ midori_browser_set_property (GObject* object, midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); - i = 0; - while ((item = katze_array_get_nth_item (browser->search_engines, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, browser->search_engines) if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search)) { midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 0e54d31e..cecda90e 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -486,9 +486,9 @@ midori_location_action_popup_timeout_cb (gpointer data) if (action->search_engines) { - gint i = 0; KatzeItem* item; - while ((item = katze_array_get_nth_item (action->search_engines, i))) + i = 0; + KATZE_ARRAY_FOREACH_ITEM (item, action->search_engines) { gchar* uri; gchar* title; diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index f49fd14b..6c4da389 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -436,7 +436,6 @@ midori_search_action_icon_released_cb (GtkWidget* entry, { KatzeArray* search_engines; GtkWidget* menu; - guint i; GtkWidget* menuitem; KatzeItem* item; GdkPixbuf* icon; @@ -447,10 +446,9 @@ midori_search_action_icon_released_cb (GtkWidget* entry, search_engines = MIDORI_SEARCH_ACTION (action)->search_engines; menu = gtk_menu_new (); - i = 0; - if ((item = katze_array_get_nth_item (search_engines, i))) + if (!katze_array_is_empty (search_engines)) { - do + KATZE_ARRAY_FOREACH_ITEM (item, search_engines) { const gchar* icon_name; @@ -477,7 +475,6 @@ midori_search_action_icon_released_cb (GtkWidget* entry, G_CALLBACK (midori_search_action_engine_activate_cb), action); gtk_widget_show (menuitem); } - while ((item = katze_array_get_nth_item (search_engines, ++i))); } else { @@ -1304,7 +1301,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); i = 0; if (search_action->search_engines) - while ((item = katze_array_get_nth_item (search_action->search_engines, i))) + KATZE_ARRAY_FOREACH_ITEM (item, search_action->search_engines) gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), NULL, i++, 0, item, -1); g_object_unref (liststore); diff --git a/midori/midori-view.c b/midori/midori-view.c index a4db75da..4ecd00dd 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2226,7 +2226,7 @@ midori_view_populate_popup (MidoriView* view, gtk_menu_shell_insert (menu_shell, menuitem, 1); search_engines = katze_object_get_object (window, "search-engines"); - while ((item = katze_array_get_nth_item (search_engines, i++))) + KATZE_ARRAY_FOREACH_ITEM (item, search_engines) { GdkPixbuf* pixbuf; const gchar* icon_name; @@ -2246,11 +2246,12 @@ midori_view_populate_popup (MidoriView* view, gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); #endif - gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i - 1); + gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i); g_object_set_data (G_OBJECT (menuitem), "search", (gchar*)katze_item_get_uri (item)); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); + i++; } g_object_unref (search_engines); } diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 339c9d4e..b843e4f8 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -131,13 +131,12 @@ midori_bookmarks_export_array_db (sqlite3* db, KatzeArray* root_array; KatzeArray* subarray; KatzeItem* item; - int i = 0; sqlcmd = g_strdup_printf ("SELECT * FROM bookmarks where folder='%s'", folder); root_array = katze_array_from_sqlite (db, sqlcmd); g_free (sqlcmd); - while ((item = katze_array_get_nth_item (KATZE_ARRAY (root_array), i++))) + KATZE_ARRAY_FOREACH_ITEM (item, root_array) { if (KATZE_ITEM_IS_FOLDER (item)) { @@ -156,17 +155,12 @@ midori_bookmarks_import_array_db (sqlite3* db, KatzeArray* array, const gchar* folder) { - GList* list = NULL; - GList* bookmarks; + KatzeItem* item; - bookmarks = katze_array_get_items ((KatzeArray*)array); - for (list = bookmarks; list != NULL; list = g_list_next (list)) + KATZE_ARRAY_FOREACH_ITEM (item, array) { - KatzeItem* item; - - if (KATZE_IS_ARRAY (list->data)) - midori_bookmarks_import_array_db (db, list->data, folder); - item = (KatzeItem*) list->data; + if (KATZE_IS_ARRAY (item)) + midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), folder); midori_bookmarks_insert_item_db (db, item, folder); } } @@ -660,11 +654,10 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, { KatzeItem* child; KatzeArray* array; - guint i = 0; array = midori_bookmarks_read_from_db (bookmarks, katze_item_get_name (item), NULL); g_return_if_fail (KATZE_IS_ARRAY (array)); - while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i))) + KATZE_ARRAY_FOREACH_ITEM (child, array) { if ((uri = katze_item_get_uri (child)) && *uri) { @@ -674,7 +667,6 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, n = midori_browser_add_item (browser, child); midori_browser_set_current_page_smartly (browser, n); } - i++; } } else if ((uri = katze_item_get_uri (item)) && *uri) diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index f1702ea3..847ff0c3 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -167,7 +167,6 @@ midori_extensions_set_property (GObject* object, { KatzeArray* array; MidoriExtension* extension; - guint i; /* FIXME: Handle NULL and subsequent assignments */ extensions->app = g_value_get_object (value); @@ -175,8 +174,7 @@ midori_extensions_set_property (GObject* object, g_signal_connect (array, "add-item", G_CALLBACK (midori_extensions_add_item_cb), extensions); - i = 0; - while ((extension = katze_array_get_nth_item (array, i++))) + KATZE_ARRAY_FOREACH_ITEM (extension, array) midori_extensions_add_item_cb (array, extension, extensions); /* Hide if there are no extensions at all */ @@ -379,10 +377,9 @@ midori_extensions_finalize (GObject* object) { MidoriExtensions* extensions = MIDORI_EXTENSIONS (object); KatzeArray* array = katze_object_get_object (extensions->app, "extensions"); - guint i = 0; MidoriExtension* extension; - while ((extension = katze_array_get_nth_item (array, i++))) + KATZE_ARRAY_FOREACH_ITEM (extension, array) { g_signal_handlers_disconnect_by_func (extension, midori_extensions_extension_activate_cb, extensions); diff --git a/panels/midori-history.c b/panels/midori-history.c index 0ccf7950..2186721c 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -668,7 +668,6 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, gchar* sqlcmd; KatzeItem* child; KatzeArray* array; - guint i = 0; db = g_object_get_data (G_OBJECT (history->array), "db"); sqlcmd = g_strdup_printf ("SELECT uri, title, date, day " @@ -677,7 +676,7 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, (int)katze_item_get_added (item)); array = katze_array_from_sqlite (db, sqlcmd); g_free (sqlcmd); - while ((child = katze_array_get_nth_item (KATZE_ARRAY (array), i++))) + KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (array)) { if ((uri = katze_item_get_uri (child)) && *uri) { From b07fe09de832d8b73648809dcf1e0c0f8178b532 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Sep 2010 23:24:19 +0200 Subject: [PATCH 2952/2970] Initialize extension to NULL in midori_load_extensions --- midori/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index 5f464f18..ab35fc95 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1120,7 +1120,7 @@ midori_load_extensions (gpointer data) GModule* module; typedef MidoriExtension* (*extension_init_func)(void); extension_init_func extension_init; - MidoriExtension* extension; + MidoriExtension* extension = NULL; /* Ignore files which don't have the correct suffix */ if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) From 195c5191ef2e696463760b8271594c4cfa55a3b1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Sep 2010 23:27:22 +0200 Subject: [PATCH 2953/2970] Showing the (feed) panel needs to be a GtkWidget* --- extensions/feed-panel/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 14c4f826..ba9c685b 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -339,7 +339,7 @@ secondary_icon_released_cb (GtkAction* action, MidoriPanel* panel = katze_object_get_object (priv->browser, "panel"); gint i = midori_panel_page_num (panel, priv->panel); midori_panel_set_current_page (panel, i); - gtk_widget_show (panel); + gtk_widget_show (GTK_WIDGET (panel)); g_object_unref (panel); feed_save_items (priv->extension, priv->feeds); update_feed (priv, KATZE_ITEM (feed)); From db6e5954e8f25f5cef66bddbd8e1ee0c47dba778 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Sep 2010 20:14:48 +0200 Subject: [PATCH 2954/2970] Show statusbar on new transfars if transferbar is visible --- midori/midori-browser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index dfa00700..0a17b7ac 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -388,7 +388,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser, katze_assign (browser->statusbar_text, sokoke_format_uri_for_display (text)); - if (!gtk_widget_get_visible (browser->statusbar) && !is_location) + if (!browser->show_statusbar && !is_location) { GtkAction* action = _action_by_name (browser, "Location"); MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); @@ -992,6 +992,11 @@ midori_browser_prepare_download (MidoriBrowser* browser, } webkit_download_set_destination_uri (download, uri); + if (!browser->show_statusbar && gtk_widget_get_visible (browser->transferbar)) + { + _midori_browser_set_statusbar_text (browser, NULL); + gtk_widget_show (browser->statusbar); + } midori_transferbar_add_download_item (MIDORI_TRANSFERBAR (browser->transferbar), download); return TRUE; } From d34da1c500ec7ab5241891d80a53e8777c3a7681 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Sep 2010 20:23:39 +0200 Subject: [PATCH 2955/2970] Remove pointless FIXME and TODO comments from Midori classes --- midori/midori-app.c | 5 ----- midori/midori-browser.c | 5 ----- midori/midori-locationaction.c | 1 - midori/midori-preferences.c | 1 - midori/midori-view.c | 1 - 5 files changed, 13 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 52148978..9dddad6c 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -777,23 +777,18 @@ midori_app_set_property (GObject* object, break; case PROP_SETTINGS: katze_object_assign (app->settings, g_value_dup_object (value)); - /* FIXME: Propagate settings to all browsers */ break; case PROP_BOOKMARKS: katze_object_assign (app->bookmarks, g_value_dup_object (value)); - /* FIXME: Propagate bookmarks to all browsers */ break; case PROP_TRASH: katze_object_assign (app->trash, g_value_dup_object (value)); - /* FIXME: Propagate trash to all browsers */ break; case PROP_SEARCH_ENGINES: katze_object_assign (app->search_engines, g_value_dup_object (value)); - /* FIXME: Propagate search engines to all browsers */ break; case PROP_HISTORY: katze_object_assign (app->history, g_value_dup_object (value)); - /* FIXME: Propagate history to all browsers */ break; case PROP_EXTENSIONS: katze_object_assign (app->extensions, g_value_dup_object (value)); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0a17b7ac..a2bf527a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2131,7 +2131,6 @@ _action_private_browsing_activate (GtkAction* action, const gchar* uri = midori_browser_get_current_uri (browser); if (uri != NULL) { - /* FIXME: Use the same binary that is running right now */ if (*uri != '\0') midori_browser_spawn_app (uri); else @@ -2748,7 +2747,6 @@ midori_browser_open_bookmark (MidoriBrowser* browser, if (!uri_fixed) uri_fixed = g_strdup (uri); - /* FIXME: Use the same binary that is running right now */ if (katze_item_get_meta_boolean (item, "app")) midori_browser_spawn_app (uri_fixed); else @@ -3225,7 +3223,6 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, fclose (fp); if ((ret - request->length) != 0) { - /* FIXME: Show an error in the graphical interface */ g_warning ("Error writing to file %s " "in midori_browser_source_transfer_cb()", filename); } @@ -3279,7 +3276,6 @@ _action_source_view_activate (GtkAction* action, #else GError* error = NULL; - /* FIXME: Handling http transparently in the function would be nice */ if (g_str_has_prefix (uri, "file://")) { if (!sokoke_show_uri_with_mime_type (gtk_widget_get_screen (view), @@ -5577,7 +5573,6 @@ midori_browser_init (MidoriBrowser* browser) error = NULL; if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error)) { - /* TODO: Should this be a message dialog? When does this happen? */ g_message ("User interface couldn't be created: %s", error->message); g_error_free (error); } diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index cecda90e..152b1729 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -545,7 +545,6 @@ midori_location_action_popup_completion (MidoriLocationAction* action, G_CALLBACK (gtk_widget_destroyed), &action->entry); action->completion_timeout = g_timeout_add (COMPLETION_DELAY, midori_location_action_popup_timeout_cb, action); - /* TODO: Inline completion */ } static void diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 1a731979..c24f60b9 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -420,7 +420,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, #endif #if WEBKIT_CHECK_VERSION (1, 1, 6) FRAME_NEW (_("Spell Checking")); - /* FIXME: Provide a nice dictionary selection */ button = katze_property_proxy (settings, "enable-spell-checking", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking")); gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing")); diff --git a/midori/midori-view.c b/midori/midori-view.c index 4ecd00dd..918e6eb3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1669,7 +1669,6 @@ static void midori_web_view_menu_web_app_activate_cb (GtkWidget* widget, MidoriView* view) { - /* FIXME: Use the same binary that is running right now */ sokoke_spawn_program ("midori -a", view->link_uri, FALSE); } From b7e88574c50e3e5671b3f14173ce7525afa62a68 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Sep 2010 21:03:14 +0200 Subject: [PATCH 2956/2970] Remove the viewable scheme registration mechanism --- midori/midori-viewable.c | 133 --------------------------------------- midori/midori-viewable.h | 12 ---- 2 files changed, 145 deletions(-) diff --git a/midori/midori-viewable.c b/midori/midori-viewable.c index 566f847e..f17c305a 100644 --- a/midori/midori-viewable.c +++ b/midori/midori-viewable.c @@ -97,8 +97,6 @@ midori_viewable_base_init (MidoriViewableIface* iface) G_TYPE_NONE, 1, GTK_TYPE_MENU); - iface->p = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - iface->get_stock_id = midori_viewable_default_get_stock_id; iface->get_label = midori_viewable_default_get_label; iface->get_toolbar = midori_viewable_default_get_toolbar; @@ -109,137 +107,6 @@ midori_viewable_base_init (MidoriViewableIface* iface) static void midori_viewable_base_finalize (MidoriViewableIface* iface) { - g_hash_table_destroy (iface->p); -} - -/** - * midori_viewable_new_from_uri: - * @uri: an URI - * - * Attempts to create a new #MidoriViewable from the specified URI. - * - * The protocol of @uri must previously have been registered by - * the #MidoriViewable via midori_viewable_register_protocol(). - * - * Return value: a new #MidoriViewable, or %NULL - * - * Deprecated: 0.2.6 - **/ -GtkWidget* -midori_viewable_new_from_uri (const gchar* uri) -{ - MidoriViewableIface* iface; - gchar** parts; - gchar* type_name; - GType type; - - if (!(iface = g_type_default_interface_peek (MIDORI_TYPE_VIEWABLE))) - { - g_warning ("No viewable interface available"); - return NULL; - } - - g_return_val_if_fail (uri != NULL, NULL); - - if (!g_hash_table_size (iface->p)) - return NULL; - - if ((parts = g_strsplit (uri, "://", 2))) - { - if (!(type_name = g_hash_table_lookup (iface->p, parts[0]))) - { - /* FIXME: Support midori://dummy/foo */ - - type_name = g_hash_table_lookup (iface->p, uri); - } - g_strfreev (parts); - if (type_name) - { - type = g_type_from_name (type_name); - g_free (type_name); - if (type) - return g_object_new (type, "uri", uri, NULL); - } - } - else if ((parts = g_strsplit_set (uri, ":", 2))) - { - type_name = g_hash_table_lookup (iface->p, parts[0]); - g_strfreev (parts); - if (type_name) - { - type = g_type_from_name (type_name); - g_free (type_name); - if (type) - return g_object_new (type, "uri", uri, NULL); - } - } - return NULL; -} - -static gboolean -viewable_type_implements (GType type, - GType interface) -{ - GType *interfaces; - guint i; - - if (!(interfaces = g_type_interfaces (type, NULL))) - return FALSE; - for (i = 0; interfaces[i]; i++) - { - if (interfaces[i] == interface) - { - g_free (interfaces); - return TRUE; - } - } - g_free (interfaces); - return FALSE; -} - -/** - * midori_viewable_register_protocol: - * @type: a type that implements #MidoriViewable - * @protocol: a protocol - * - * Registers the specified protocol as supported by @type. - * - * The following kinds of protocols are supported: - * - * "dummy": support URIs like "dummy://foo/bar" - * "about:dummy": support URIs like "about:dummy" - * FIXME: The following is not yet fully supported - * "midori://dummy": support URIs like "midori://dummy/foo" - * - * Return value: a new #MidoriViewable, or %NULL - * - * Deprecated: 0.2.6 - **/ -void -midori_viewable_register_protocol (GType type, - const gchar* protocol) -{ - MidoriViewableIface* iface; - GObjectClass* class; - - if (!(iface = g_type_default_interface_peek (MIDORI_TYPE_VIEWABLE))) - { - g_warning ("No viewable interface available"); - return; - } - - g_return_if_fail (viewable_type_implements (type, MIDORI_TYPE_VIEWABLE)); - - if (!(class = g_type_class_peek (type))) - { - g_warning ("No class for %s available", g_type_name (type)); - return; - } - g_return_if_fail (g_object_class_find_property (class, "uri")); - /* FIXME: Verify the syntax of protocol */ - - g_hash_table_insert (iface->p, g_strdup (protocol), - g_strdup (g_type_name (type))); } /** diff --git a/midori/midori-viewable.h b/midori/midori-viewable.h index fca3e603..7e36c7b0 100644 --- a/midori/midori-viewable.h +++ b/midori/midori-viewable.h @@ -12,8 +12,6 @@ #ifndef __MIDORI_VIEWABLE_H__ #define __MIDORI_VIEWABLE_H__ -#include - #include G_BEGIN_DECLS @@ -44,21 +42,11 @@ struct _MidoriViewableIface GtkWidget* (*get_toolbar) (MidoriViewable* viewable); - - /* Private data */ - gpointer p; }; GType midori_viewable_get_type (void) G_GNUC_CONST; -GtkWidget* -midori_viewable_new_from_uri (const gchar* uri); - -void -midori_viewable_register_protocol (GType type, - const gchar* protocol); - const gchar* midori_viewable_get_stock_id (MidoriViewable* viewable); From e2e5ae154bfd9989254b1ff37268932f392b6d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20=20Koli=C4=87?= Date: Tue, 14 Sep 2010 03:01:49 +0200 Subject: [PATCH 2957/2970] l10n: Updates to Croatian (hr) translation New status: 518 messages complete with 0 fuzzies and 130 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/hr.po | 1534 +++++++++++++++++++++++++++++------------------------- 1 file changed, 821 insertions(+), 713 deletions(-) diff --git a/po/hr.po b/po/hr.po index d7c35b34..203f1f18 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-11 16:08+0000\n" -"PO-Revision-Date: 2010-06-11 19:50+0200\n" +"POT-Creation-Date: 2010-09-13 22:11+0000\n" +"PO-Revision-Date: 2010-09-14 02:58+0200\n" "Last-Translator: Ivica Kolić \n" "Language-Team: Croatian <>\n" "MIME-Version: 1.0\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Lagani web preglednik" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1354 ../midori/main.c:1684 -#: ../midori/main.c:1692 ../midori/main.c:1708 -#: ../midori/midori-websettings.c:314 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1322 ../midori/main.c:1651 +#: ../midori/main.c:1659 ../midori/main.c:1675 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -31,345 +31,325 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web preglednik" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfiguracija ne može biti učitana: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Vrijednost '%s' nije valjana za %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Neispravna konfiguracijska vrijednost '%s'" -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:366 ../midori/main.c:470 ../extensions/formhistory.c:439 #, c-format msgid "Failed to open database: %s\n" msgstr "Neuspjelo otvaranje baze podataka: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:422 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Neuspjelo uklanjanje starih stavki povijesti: %s\n" -#: ../midori/main.c:457 +#: ../midori/main.c:453 ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" + +#: ../midori/main.c:498 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Zabilješke ne mogu biti spremljene. %s" + +#: ../midori/main.c:525 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfiguracija ne može biti spremljena. %s" -#: ../midori/main.c:495 +#: ../midori/main.c:563 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Tražilice ne mogu biti spremljene. %s" -#: ../midori/main.c:514 ../midori/main.c:564 ../midori/main.c:584 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Zabilješke na mogu biti spremljene. %s" - #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:614 ../midori/main.c:637 +#: ../midori/main.c:583 ../midori/main.c:606 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Smeće ne može biti spremljeno. %s" -#: ../midori/main.c:696 ../midori/main.c:936 +#: ../midori/main.c:665 ../midori/main.c:905 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sesija ne može biti spremljena. %s" -#: ../midori/main.c:880 +#: ../midori/main.c:849 msgid "" "No root certificate file is available. SSL certificates cannot be verified." msgstr "" -#: ../midori/main.c:970 +#: ../midori/main.c:939 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:985 +#: ../midori/main.c:954 msgid "Modify _preferences" msgstr "Izmjeni _osobitosti" -#: ../midori/main.c:989 +#: ../midori/main.c:958 msgid "Reset the last _session" msgstr "Obnovi posljednju _sesiju" -#: ../midori/main.c:994 +#: ../midori/main.c:963 msgid "Disable all _extensions" msgstr "Onemogući sva _proširenja" -#: ../midori/main.c:1230 ../midori/main.c:1957 +#: ../midori/main.c:1202 ../midori/main.c:1946 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sesija ne može biti učitana: %s\n" -#: ../midori/main.c:1354 +#: ../midori/main.c:1322 msgid "No filename specified" msgstr "Nije navedeno ime datoteke" -#: ../midori/main.c:1373 +#: ../midori/main.c:1341 msgid "An unknown error occured." msgstr "Nepoznata greška." -#: ../midori/main.c:1404 +#: ../midori/main.c:1372 #, c-format msgid "Snapshot saved to: %s\n" msgstr "" -#: ../midori/main.c:1576 +#: ../midori/main.c:1544 msgid "Run ADDRESS as a web application" msgstr "Pokreni Adresu kao web aplikaciju" -#: ../midori/main.c:1576 +#: ../midori/main.c:1544 msgid "ADDRESS" msgstr "ADRESA" -#: ../midori/main.c:1579 +#: ../midori/main.c:1547 msgid "Use FOLDER as configuration folder" msgstr "Koristi MAPU kao konfiguracijsku mapu" -#: ../midori/main.c:1579 +#: ../midori/main.c:1547 msgid "FOLDER" msgstr "MAPA" -#: ../midori/main.c:1582 +#: ../midori/main.c:1550 msgid "Show a diagnostic dialog" msgstr "Pokaži dijagnostički dijalog" -#: ../midori/main.c:1584 +#: ../midori/main.c:1552 msgid "Run the specified filename as javascript" msgstr "Pokreni naznačeno ime datoteke kao javascript" -#: ../midori/main.c:1587 +#: ../midori/main.c:1555 msgid "Take a snapshot of the specified URI" msgstr "" -#: ../midori/main.c:1590 +#: ../midori/main.c:1558 msgid "Execute the specified command" msgstr "Izvrši naznačenu naredbu" -#: ../midori/main.c:1592 +#: ../midori/main.c:1560 msgid "Display program version" msgstr "Prikaži verziju programa" -#: ../midori/main.c:1594 +#: ../midori/main.c:1562 msgid "Addresses" msgstr "Adrese" -#: ../midori/main.c:1596 +#: ../midori/main.c:1564 msgid "Block URIs according to regular expression PATTERN" msgstr "" -#: ../midori/main.c:1596 +#: ../midori/main.c:1564 msgid "PATTERN" msgstr "UZORAK" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1600 +#: ../midori/main.c:1568 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "" -#: ../midori/main.c:1600 +#: ../midori/main.c:1568 msgid "SECONDS" msgstr "SEKUNDE" -#: ../midori/main.c:1681 +#: ../midori/main.c:1648 msgid "[Addresses]" msgstr "[Adrese]" -#: ../midori/main.c:1709 +#: ../midori/main.c:1676 msgid "Please report comments, suggestions and bugs to:" msgstr "Prijavite komentare,sugestije i probleme u:" -#: ../midori/main.c:1711 +#: ../midori/main.c:1678 msgid "Check for new versions at:" msgstr "Provjeri za nove verzije na:" -#: ../midori/main.c:1808 +#: ../midori/main.c:1795 msgid "The specified configuration folder is invalid." msgstr "Određena konfiguracijaka mapa nije valjana" -#: ../midori/main.c:1856 +#: ../midori/main.c:1843 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori instanca je već pokrenuta ali ne odgovara.\n" -#: ../midori/main.c:1911 +#: ../midori/main.c:1898 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Tražilice ne nogu biti učitane: %s\n" -#: ../midori/main.c:1940 +#: ../midori/main.c:1919 #, c-format -msgid "The bookmarks couldn't be loaded: %s\n" +msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Zabilješke ne mogu biti učitane: %s\n" -#: ../midori/main.c:1972 +#: ../midori/main.c:1961 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Smeće ne može biti učitano: %s\n" -#: ../midori/main.c:1986 +#: ../midori/main.c:1974 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Povijest ne može biti učitana: %s\n" -#: ../midori/main.c:2000 +#: ../midori/main.c:1988 msgid "The following errors occured:" msgstr "Došlo je do slijedeće greške:" -#: ../midori/main.c:2016 +#: ../midori/main.c:2004 msgid "_Ignore" msgstr "_Ignoriraj" -#: ../midori/midori-array.c:428 +#: ../midori/midori-array.c:429 msgid "File not found." msgstr "Datoteka nije pronađena." -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 +#: ../midori/midori-array.c:463 ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 msgid "Malformed document." msgstr "Deformirani dokument." -#: ../midori/midori-array.c:504 +#: ../midori/midori-array.c:505 msgid "Unrecognized bookmark format." msgstr "Neprepoznati format zabilješke." -#: ../midori/midori-array.c:718 +#: ../midori/midori-array.c:716 msgid "Writing failed." msgstr "Neuspjelo pisanje." -#: ../midori/midori-browser.c:325 ../midori/midori-browser.c:5571 -#: ../midori/midori-browser.c:5577 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4893 msgid "Reload the current page" msgstr "Učitaj ponovo trenutnu stranicu" -#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5574 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4890 msgid "Stop loading the current page" msgstr "Prestani učitavati trenutnu stranicu" -#: ../midori/midori-browser.c:449 +#: ../midori/midori-browser.c:453 #, c-format msgid "%d%% loaded" msgstr "%d%% učitano" -#: ../midori/midori-browser.c:487 +#: ../midori/midori-browser.c:491 #, c-format msgid "Failed to update title: %s\n" msgstr "Neuspjeh u ažuriranju naslova: %s\n" -#: ../midori/midori-browser.c:501 +#: ../midori/midori-browser.c:504 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekivana radnja '%s'." -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:729 msgid "New folder" msgstr "Nova mapa" -#: ../midori/midori-browser.c:717 +#: ../midori/midori-browser.c:729 msgid "Edit folder" msgstr "Uredi mapu" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:731 msgid "New bookmark" msgstr "Nova zabilješka" -#: ../midori/midori-browser.c:719 +#: ../midori/midori-browser.c:731 msgid "Edit bookmark" msgstr "Uredi zabilješku" -#: ../midori/midori-browser.c:750 +#: ../midori/midori-browser.c:762 msgid "_Title:" msgstr "_Naslov:" -#: ../midori/midori-browser.c:763 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:958 msgid "_Description:" msgstr "_Opis:" -#: ../midori/midori-browser.c:782 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:373 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:972 +#: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:812 ../midori/midori-browser.c:4727 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4007 msgid "_Folder:" msgstr "_Mapa:" -#: ../midori/midori-browser.c:822 ../midori/midori-browser.c:917 -#: ../midori/midori-browser.c:4732 ../midori/midori-browser.c:4764 +#: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4012 ../midori/midori-browser.c:4040 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:853 +#: ../midori/midori-browser.c:872 msgid "Add to _Speed Dial" msgstr "Dodaj u _brzo biranje" -#: ../midori/midori-browser.c:866 +#: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" msgstr "Prikaži u alatnoj_traci" -#: ../midori/midori-browser.c:881 +#: ../midori/midori-browser.c:900 msgid "Run as _web application" msgstr "Pokreni kao _web aplikaciju" -#: ../midori/midori-browser.c:975 +#: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." msgstr "Nema dovoljno slobodnog prostora za preuzimanje \"%s\"." -#: ../midori/midori-browser.c:979 +#: ../midori/midori-browser.c:983 #, c-format msgid "The file needs %s but only %s are left." msgstr "" -#: ../midori/midori-browser.c:1036 ../midori/midori-browser.c:4782 -#: ../midori/midori-browser.c:4814 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4048 +#: ../midori/midori-browser.c:4083 msgid "Save file as" msgstr "Spremi datoteku kao" -#: ../midori/midori-browser.c:1409 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s od %s" - -#: ../midori/midori-browser.c:1445 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "Datoteka '%s' je preuzeta." - -#: ../midori/midori-browser.c:1449 -msgid "Transfer completed" -msgstr "Prijenos završen" - -#: ../midori/midori-browser.c:1589 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Spremi datoteku" -#: ../midori/midori-browser.c:1906 ../midori/midori-browser.c:1908 -msgid "Some files are being downloaded" -msgstr "Neke datoteke su preuzete" - -#: ../midori/midori-browser.c:1912 -msgid "_Quit Midori" -msgstr "_Isključi Midori" - -#: ../midori/midori-browser.c:1914 -msgid "The transfers will be cancelled if Midori quits." -msgstr "Prijenosi će biti odgođeni ako se Midori isključi" - -#: ../midori/midori-browser.c:2375 +#: ../midori/midori-browser.c:2154 msgid "Open file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:2453 +#: ../midori/midori-browser.c:2232 msgid "" "To use the above URI open a news aggregator. There is usually a menu or " "button \"New Subscription\", \"New News Feed\" or similar.\n" @@ -378,150 +358,145 @@ msgid "" "automatically." msgstr "" -#: ../midori/midori-browser.c:2459 ../extensions/feed-panel/main.c:361 +#: ../midori/midori-browser.c:2238 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "" -#: ../midori/midori-browser.c:2502 ../midori/midori-browser.c:5636 -#: ../panels/midori-bookmarks.c:233 +#: ../midori/midori-browser.c:2281 ../midori/midori-browser.c:4952 +#: ../panels/midori-bookmarks.c:400 msgid "Add a new bookmark" msgstr "Dodaj novu zabilješku" -#: ../midori/midori-browser.c:3075 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "" - -#: ../midori/midori-browser.c:3155 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Prazno" - -#: ../midori/midori-browser.c:3773 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3284 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Ne mogu pokrenuti vanjski program" -#: ../midori/midori-browser.c:4087 ../midori/midori-browser.c:6030 +#: ../midori/midori-browser.c:3527 ../midori/midori-browser.c:5342 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Nespjelo dodavanje nove stavke povijesti: %s\n" -#: ../midori/midori-browser.c:4420 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 +#: ../midori/midori-browser.c:3842 ../panels/midori-bookmarks.c:713 +#: ../panels/midori-history.c:736 msgid "Open all in _Tabs" msgstr "Otvori sve u _karticama" -#: ../midori/midori-browser.c:4427 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3849 ../panels/midori-bookmarks.c:719 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Otvori u novoj _kartici" -#: ../midori/midori-browser.c:4430 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3852 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Otvori u novom _prozoru" -#: ../midori/midori-browser.c:4653 +#: ../midori/midori-browser.c:3930 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:4654 +#: ../midori/midori-browser.c:3931 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:4655 +#: ../midori/midori-browser.c:3932 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:4656 +#: ../midori/midori-browser.c:3933 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:4657 +#: ../midori/midori-browser.c:3934 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:4678 +#: ../midori/midori-browser.c:3958 msgid "Import bookmarks..." msgstr "Uvezi zabilješke..." -#: ../midori/midori-browser.c:4681 ../midori/midori-browser.c:5641 +#: ../midori/midori-browser.c:3961 ../midori/midori-browser.c:4957 msgid "_Import bookmarks" msgstr "_Uvezi zabilješke" -#: ../midori/midori-browser.c:4692 +#: ../midori/midori-browser.c:3972 msgid "_Application:" msgstr "_Program:" -#: ../midori/midori-browser.c:4719 ../midori/midori-browser.c:5745 -#: ../midori/midori-websettings.c:228 ../midori/midori-websettings.c:319 -#: ../katze/katze-utils.c:691 +#: ../midori/midori-browser.c:3999 ../midori/midori-browser.c:5070 +#: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Prilagođeno..." -#: ../midori/midori-browser.c:4793 +#: ../midori/midori-browser.c:4059 msgid "Failed to import bookmarks" msgstr "Neuspjeli uvoz zabilješki" -#: ../midori/midori-browser.c:4829 +#: ../midori/midori-browser.c:4100 msgid "Failed to export bookmarks" msgstr "Neuspjeli izvoz zabilješki" -#: ../midori/midori-browser.c:4883 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/midori-browser.c:4153 #, c-format -msgid "Failed to remove history item: %s\n" -msgstr "Neuspjelo uklanjanje stavke povijesti: %s\n" +msgid "Failed to clear history: %s\n" +msgstr "Neuspjelo uklanjanje povijesti: %s\n" + +#: ../midori/midori-browser.c:4161 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Nespjelo uklanjanje traženja povijesti: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4268 msgid "Clear Private Data" msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4272 msgid "_Clear private data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5008 +#: ../midori/midori-browser.c:4286 msgid "Clear the following data:" msgstr "Očisti slijedeće podatke:" -#: ../midori/midori-browser.c:5019 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4296 ../midori/midori-preferences.c:532 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Povijest" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:4301 msgid "Cookies" msgstr "Kolačići" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:4306 msgid "'Flash' Cookies" msgstr "'Flash' kolačići" -#: ../midori/midori-browser.c:5035 +#: ../midori/midori-browser.c:4311 msgid "Website icons" msgstr "Website ikone" -#: ../midori/midori-browser.c:5040 ../midori/sokoke.c:1298 +#: ../midori/midori-browser.c:4316 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "_Zatvorene kartice" -#: ../midori/midori-browser.c:5045 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4321 ../extensions/web-cache.c:462 msgid "Web Cache" msgstr "" -#: ../midori/midori-browser.c:5053 +#: ../midori/midori-browser.c:4329 msgid "Clear private data when _quitting Midori" msgstr "Očisti privatne podatke kad _isključuješ Midori" -#: ../midori/midori-browser.c:5154 +#: ../midori/midori-browser.c:4470 msgid "A lightweight web browser." msgstr "Lagani web preglednik" -#: ../midori/midori-browser.c:5156 +#: ../midori/midori-browser.c:4472 msgid "" "This library is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " @@ -529,1167 +504,1122 @@ msgid "" "option) any later version." msgstr "" -#: ../midori/midori-browser.c:5175 +#: ../midori/midori-browser.c:4491 msgid "translator-credits" msgstr "Ivica Kolić (zvacet) " -#: ../midori/midori-browser.c:5484 +#: ../midori/midori-browser.c:4800 msgid "_File" msgstr "_Datoteka" -#: ../midori/midori-browser.c:5486 ../midori/sokoke.c:1299 +#: ../midori/midori-browser.c:4802 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Novi _prozor" -#: ../midori/midori-browser.c:5487 +#: ../midori/midori-browser.c:4803 msgid "Open a new window" msgstr "Otvori u novom prozoru" -#: ../midori/midori-browser.c:5490 +#: ../midori/midori-browser.c:4806 msgid "Open a new tab" msgstr "Otvori novu karticu" -#: ../midori/midori-browser.c:5492 +#: ../midori/midori-browser.c:4808 msgid "P_rivate Browsing" msgstr "P_rivatno pretraživanje" -#: ../midori/midori-browser.c:5493 +#: ../midori/midori-browser.c:4809 msgid "Don't save any private data while browsing" msgstr "Ne spremaj privatne podatke dok pregledavaš" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:4813 msgid "Open a file" msgstr "Otvori datoteku" -#: ../midori/midori-browser.c:5500 +#: ../midori/midori-browser.c:4816 msgid "Save to a file" msgstr "Spremi u datoteku" -#: ../midori/midori-browser.c:5502 +#: ../midori/midori-browser.c:4818 msgid "Add to Speed _dial" msgstr "Dodaj u Brzo _biranje" -#: ../midori/midori-browser.c:5503 +#: ../midori/midori-browser.c:4819 msgid "Add shortcut to speed dial" msgstr "Dodaj prečac u brzo biranje" -#: ../midori/midori-browser.c:5505 +#: ../midori/midori-browser.c:4821 msgid "Add Shortcut to the _desktop" msgstr "Dodaj prečac na _radnu površinu" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:4822 msgid "Add shortcut to the desktop" msgstr "Dodaj prečac na radnu površinu" -#: ../midori/midori-browser.c:5508 +#: ../midori/midori-browser.c:4824 msgid "Subscribe to News _feed" msgstr "" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:4825 msgid "Subscribe to this news feed" msgstr "" -#: ../midori/midori-browser.c:5514 +#: ../midori/midori-browser.c:4830 msgid "_Close Tab" msgstr "_Zatvori karticu" -#: ../midori/midori-browser.c:5515 +#: ../midori/midori-browser.c:4831 msgid "Close the current tab" msgstr "Zatvori trenutnu karticu" -#: ../midori/midori-browser.c:5517 +#: ../midori/midori-browser.c:4833 msgid "C_lose Window" msgstr "Z_atvori prozor" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:4834 msgid "Close this window" msgstr "Zatvori ovaj prozor" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4837 msgid "Print the current page" msgstr "Ispiši trenutnu stranicu" -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:4840 msgid "Quit the application" msgstr "Isključi program" -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:4842 msgid "_Edit" msgstr "_Uredi" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4846 msgid "Undo the last modification" msgstr "Poništi zadnju izmjenu" -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:4849 msgid "Redo the last modification" msgstr "Vrati zadnju izmjenu" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:4853 msgid "Cut the selected text" msgstr "Izreži označeni tekst" -#: ../midori/midori-browser.c:5540 ../midori/midori-browser.c:5543 +#: ../midori/midori-browser.c:4856 ../midori/midori-browser.c:4859 msgid "Copy the selected text" msgstr "Kopiraj označeni tekst" -#: ../midori/midori-browser.c:5546 +#: ../midori/midori-browser.c:4862 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:5549 +#: ../midori/midori-browser.c:4865 msgid "Delete the selected text" msgstr "Izbriši odabrani tekst" -#: ../midori/midori-browser.c:5552 +#: ../midori/midori-browser.c:4868 msgid "Select all text" msgstr "Označi sav tekst" -#: ../midori/midori-browser.c:5555 +#: ../midori/midori-browser.c:4871 msgid "Find a word or phrase in the page" msgstr "Nađi riječ ili frazu na stranici" -#: ../midori/midori-browser.c:5557 +#: ../midori/midori-browser.c:4873 msgid "Find _Next" msgstr "Nađi _Slijedeće" -#: ../midori/midori-browser.c:5558 +#: ../midori/midori-browser.c:4874 msgid "Find the next occurrence of a word or phrase" msgstr "Nađi slijedeće pojavljivanje riječi ili fraze" -#: ../midori/midori-browser.c:5560 +#: ../midori/midori-browser.c:4876 msgid "Find _Previous" msgstr "Nađi _Prethodno" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:4877 msgid "Find the previous occurrence of a word or phrase" msgstr "Nađi prethodno pojavljivanje riječi ili fraze" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:4881 msgid "Configure the application preferences" msgstr "Konfiguriraj postavke programa" -#: ../midori/midori-browser.c:5567 +#: ../midori/midori-browser.c:4883 msgid "_View" msgstr "_Pogled" -#: ../midori/midori-browser.c:5568 +#: ../midori/midori-browser.c:4884 msgid "_Toolbars" msgstr "_Alatne trake" -#: ../midori/midori-browser.c:5580 +#: ../midori/midori-browser.c:4896 msgid "Increase the zoom level" msgstr "Povećaj zoom razinu" -#: ../midori/midori-browser.c:5583 +#: ../midori/midori-browser.c:4899 msgid "Decrease the zoom level" msgstr "Smanji zoom razinu" -#: ../midori/midori-browser.c:5586 +#: ../midori/midori-browser.c:4902 msgid "Reset the zoom level" msgstr "Vrati zoom razinu" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:4903 msgid "_Encoding" msgstr "_Kodiranje" -#: ../midori/midori-browser.c:5589 +#: ../midori/midori-browser.c:4905 msgid "View So_urce" msgstr "" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:4906 msgid "View the source code of the page" msgstr "Prikaži izvorni kod stranice" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:4909 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:5596 +#: ../midori/midori-browser.c:4912 msgid "Scroll _Left" msgstr "Kliži _Lijevo" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:4913 msgid "Scroll to the left" msgstr "Kliži ulijevo" -#: ../midori/midori-browser.c:5599 +#: ../midori/midori-browser.c:4915 msgid "Scroll _Down" msgstr "Kliži _Dolje" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:4916 msgid "Scroll down" msgstr "Kliži dolje" -#: ../midori/midori-browser.c:5602 +#: ../midori/midori-browser.c:4918 msgid "Scroll _Up" msgstr "Kliži _Gore" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:4919 msgid "Scroll up" msgstr "Kliži gore" -#: ../midori/midori-browser.c:5605 +#: ../midori/midori-browser.c:4921 msgid "Scroll _Right" msgstr "Kližu _Desno" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:4922 msgid "Scroll to the right" msgstr "Kliži nadesno" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:4925 msgid "_Go" msgstr "_Idi" -#: ../midori/midori-browser.c:5612 +#: ../midori/midori-browser.c:4928 msgid "Go back to the previous page" msgstr "Natrag na prethodnu stranicu" -#: ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:4931 msgid "Go forward to the next page" msgstr "Naprijed na idući stranicu" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:4935 msgid "Go to the previous sub-page" msgstr "Idi na prethodnu podstranicu" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:4939 msgid "Go to the next sub-page" msgstr "Idi na iduću podstranicu" -#: ../midori/midori-browser.c:5626 +#: ../midori/midori-browser.c:4942 msgid "Go to your homepage" msgstr "Idi na svoju početnu stranicu" -#: ../midori/midori-browser.c:5628 +#: ../midori/midori-browser.c:4944 msgid "Empty Trash" msgstr "Isprazni smeće" -#: ../midori/midori-browser.c:5629 +#: ../midori/midori-browser.c:4945 msgid "Delete the contents of the trash" msgstr "Izbriši sadržaj smeća" -#: ../midori/midori-browser.c:5631 +#: ../midori/midori-browser.c:4947 msgid "Undo _Close Tab" msgstr "Poništi _zatvori karticu" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:4948 msgid "Open the last closed tab" msgstr "Otvori zadnju zatvorenu karticu" -#: ../midori/midori-browser.c:5638 +#: ../midori/midori-browser.c:4954 msgid "Add a new _folder" msgstr "Dodaj novu _mapu" -#: ../midori/midori-browser.c:5639 +#: ../midori/midori-browser.c:4955 msgid "Add a new bookmark folder" msgstr "Dodaj novu mapu zabilješki" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:4960 msgid "_Export bookmarks" msgstr "_Izvezi zabilješke" -#: ../midori/midori-browser.c:5647 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4963 ../midori/midori-searchaction.c:490 msgid "_Manage Search Engines" msgstr "_Upravljaj tražilicama" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:4964 msgid "Add, edit and remove search engines..." msgstr "Dodaj,uredi i ukloni tražilice" -#: ../midori/midori-browser.c:5651 +#: ../midori/midori-browser.c:4967 msgid "_Clear Private Data" msgstr "_Očisti privatne podatke" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:4968 msgid "Clear private data..." msgstr "Očisti privatne podatke" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:4972 msgid "_Inspect Page" msgstr "" -#: ../midori/midori-browser.c:5657 +#: ../midori/midori-browser.c:4973 msgid "Inspect page details and access developer tools..." msgstr "" -#: ../midori/midori-browser.c:5662 +#: ../midori/midori-browser.c:4978 msgid "_Previous Tab" msgstr "_Prethodna kartica" -#: ../midori/midori-browser.c:5663 +#: ../midori/midori-browser.c:4979 msgid "Switch to the previous tab" msgstr "Prebaci na prethodnu stranicu" -#: ../midori/midori-browser.c:5665 +#: ../midori/midori-browser.c:4981 msgid "_Next Tab" msgstr "_Slijedeća kartica" -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:4982 msgid "Switch to the next tab" msgstr "Prebaci na slijedeću stranicu" -#: ../midori/midori-browser.c:5668 +#: ../midori/midori-browser.c:4984 msgid "Focus _Current Tab" msgstr "" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:4985 msgid "Focus the current tab" msgstr "" -#: ../midori/midori-browser.c:5671 +#: ../midori/midori-browser.c:4987 +msgid "Minimize _Current Tab" +msgstr "Minimiziraj _trenutnu karticu" + +#: ../midori/midori-browser.c:4988 +msgid "Minimize the current tab" +msgstr "Minimiziraj trenutnu karticu" + +#: ../midori/midori-browser.c:4990 +msgid "_Duplicate Current Tab" +msgstr "_Udvostruči trenutnu karticu" + +#: ../midori/midori-browser.c:4991 +msgid "Duplicate the current tab" +msgstr "Udvostruči trenutnu karticu" + +#: ../midori/midori-browser.c:4993 +msgid "Close Ot_her Tabs" +msgstr "Zatvori dr_uge kartice" + +#: ../midori/midori-browser.c:4994 +msgid "Close all tabs except the current tab" +msgstr "Zatvori sve kartice osim trenutne" + +#: ../midori/midori-browser.c:4996 msgid "Open last _session" msgstr "Otvori posljednju _sesiju" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:4997 msgid "Open the tabs saved in the last session" msgstr "Otvori kartice spremljene u posljednjoj sesiji" -#: ../midori/midori-browser.c:5674 +#: ../midori/midori-browser.c:4999 msgid "_Help" msgstr "_Pomoć" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5001 msgid "_Contents" msgstr "_Sadržaji" -#: ../midori/midori-browser.c:5677 +#: ../midori/midori-browser.c:5002 msgid "Show the documentation" msgstr "Pokaži dokumentaciju" -#: ../midori/midori-browser.c:5679 +#: ../midori/midori-browser.c:5004 msgid "_Frequent Questions" msgstr "_Česta pitanja" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5005 msgid "Show the Frequently Asked Questions" msgstr "Pokaži često postavljana pitanja" -#: ../midori/midori-browser.c:5682 +#: ../midori/midori-browser.c:5007 msgid "_Report a Bug" msgstr "_Prijavite problem" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5008 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5011 msgid "Show information about the program" msgstr "Prikaži informacije o programu" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5019 msgid "_Menubar" msgstr "_Traka izbornika" -#: ../midori/midori-browser.c:5695 +#: ../midori/midori-browser.c:5020 msgid "Show menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5023 msgid "_Navigationbar" msgstr "_Navigacijska traka" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5024 msgid "Show navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5027 msgid "Side_panel" msgstr "Bočni_stupac" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5028 msgid "Show sidepanel" msgstr "Pokaži bočni stupac" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5031 msgid "_Bookmarkbar" msgstr "_Traka zabilješki" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5032 msgid "Show bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5035 msgid "_Transferbar" msgstr "_Traka prijenosa" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5036 msgid "Show transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5039 msgid "_Statusbar" msgstr "_Statusna traka" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5040 msgid "Show statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-browser.c:5723 +#: ../midori/midori-browser.c:5048 msgid "_Automatic" msgstr "_Automatski" -#: ../midori/midori-browser.c:5726 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5051 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Kineski (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5730 +#: ../midori/midori-browser.c:5055 msgid "Japanese (SHIFT__JIS)" msgstr "Japanski (SHIFT__JIS)" -#: ../midori/midori-browser.c:5733 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5058 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Korejski (EUC-KR)" -#: ../midori/midori-browser.c:5736 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5061 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Ruski (KOI8-R)" -#: ../midori/midori-browser.c:5739 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5742 ../midori/midori-websettings.c:227 +#: ../midori/midori-browser.c:5067 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Zapadni (ISO-8859-1)" -#: ../midori/midori-browser.c:6288 +#: ../midori/midori-browser.c:5585 msgid "_Separator" msgstr "_Razdjelnik" -#: ../midori/midori-browser.c:6295 +#: ../midori/midori-browser.c:5592 msgid "_Location..." msgstr "_Lokacija..." -#: ../midori/midori-browser.c:6297 +#: ../midori/midori-browser.c:5594 msgid "Open a particular location" msgstr "Otvori određenu lokaciju" -#: ../midori/midori-browser.c:6321 +#: ../midori/midori-browser.c:5618 msgid "_Web Search..." msgstr "_Web pretraživanje..." -#: ../midori/midori-browser.c:6323 +#: ../midori/midori-browser.c:5620 msgid "Run a web search" msgstr "Pokreni web pretraživanje" -#: ../midori/midori-browser.c:6344 +#: ../midori/midori-browser.c:5641 msgid "Reopen a previously closed tab or window" msgstr "Ponovno otvori prethodno zatvorenu karticu ili prozor" -#: ../midori/midori-browser.c:6359 -msgid "_Recently visited pages" -msgstr "_Nedavno posjećene stranice" - -#: ../midori/midori-browser.c:6361 -msgid "Reopen pages that you visited earlier" -msgstr "Ponovo otvori stranice koje ste posjetili ranije" - -#: ../midori/midori-browser.c:6376 ../midori/sokoke.c:1288 -msgid "_Bookmarks" -msgstr "_Zabilješke" - -#: ../midori/midori-browser.c:6378 -msgid "Show the saved bookmarks" -msgstr "Pokaži spremljene zabilješke" - -#: ../midori/midori-browser.c:6393 +#: ../midori/midori-browser.c:5656 msgid "_Tools" msgstr "_Alati" -#: ../midori/midori-browser.c:6406 +#: ../midori/midori-browser.c:5673 msgid "_Window" msgstr "_Prozor" -#: ../midori/midori-browser.c:6408 +#: ../midori/midori-browser.c:5675 msgid "Show a list of all open tabs" msgstr "Pokaži listu svih otvorenih kartica" -#: ../midori/midori-browser.c:6422 +#: ../midori/midori-browser.c:5689 msgid "_Menu" msgstr "_Izbornik" -#: ../midori/midori-browser.c:6424 +#: ../midori/midori-browser.c:5691 msgid "Menu" msgstr "Izbornik" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6631 -msgid "_Inline Find:" -msgstr "" - -#: ../midori/midori-browser.c:6662 -msgid "Previous" -msgstr "Prethodno" - -#: ../midori/midori-browser.c:6667 -msgid "Next" -msgstr "Slijedeće" - -#: ../midori/midori-browser.c:6672 -msgid "Match Case" -msgstr "" - -#: ../midori/midori-browser.c:6681 -msgid "Highlight Matches" -msgstr "" - -#: ../midori/midori-browser.c:6693 -msgid "Close Findbar" -msgstr "" - -#: ../midori/midori-browser.c:6739 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Očisti sve" - -#: ../midori/midori-browser.c:7095 +#: ../midori/midori-browser.c:6256 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekivana postavka '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Neuspjeli odabir iz povijesti\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" -msgstr "" +msgstr "Traži %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Traži pomoću %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1305 #, c-format msgid "Failed to execute database statement\n" msgstr "" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1361 msgid "Paste and p_roceed" msgstr "Zalijepi i n_astavi" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 msgid "Align sidepanel to the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Zatvori panel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 msgid "Align sidepanel to the left" msgstr "Poravnaj bočni stupac lijevo" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:754 msgid "Hide operating controls" msgstr "" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Pokaži praznu stranicu" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Pokaži početnu stranicu" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Pokaži zadnje otvorene kartice" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:204 msgid "Show last tabs without loading" msgstr "Pokaži zadnje kartice bez učitavanja" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japanski (SHIFT_JIS)" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nova kartica" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Novi prozor" -#: ../midori/midori-websettings.c:245 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Trenutna kartica" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Zadano" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Ikone" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Male ikone" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Ikone i tekst" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Tekst pored ikona" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automatski (GNOME ili okruženje)" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "HTTP proxy poslužitelj" -#: ../midori/midori-websettings.c:282 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Nema proxy poslužitelja" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Svi kolačići" -#: ../midori/midori-websettings.c:298 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Kolačići sesije" -#: ../midori/midori-websettings.c:299 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:297 ../katze/katze-utils.c:672 msgid "None" msgstr "Nijedan" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:318 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Zapamti zadnu veličinu prozora" -#: ../midori/midori-websettings.c:372 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Da li spremiti zadnju veličinu prozora" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Zadnja širina prozora" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Zadnja sačuvana širina prozora" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "zadnja visina prozora" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Zadnja sačuvana visina prozora" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Zadnja pozicija ploče" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Zadnja spremljena pozicija ploče" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Zadnja stranica ploče" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Zadnja spremljena stranica ploče" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Zadnje Web pretraživanje" -#: ../midori/midori-websettings.c:435 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Zadnje sačuvano Web pretraživanje" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Pokaži traku izbornika" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Da li pokazati izbornik" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Pokaži navigacijsku traku" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Da li pokazati navigacijsku traku" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Pokaži traku zabilješki" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Da li pokazati traku zabilješki" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Pokaži ploču" -#: ../midori/midori-websettings.c:472 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Da li pokazati ploču" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Pokaži traku prijenosa" -#: ../midori/midori-websettings.c:488 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Da li pokazati traku prijenosa" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Pokaži statusnu traku" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Da li pokazati statusnu traku" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Stil alatne trake" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:540 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Stavke alatne trake" -#: ../midori/midori-websettings.c:549 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Stavke za prikazivanje u alatnoj traci" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Zbijeni bočni stupac" -#: ../midori/midori-websettings.c:558 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Da li bočni stupac učiniti zbijenim" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Poravnaj bočni stupac desno" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Da li poravnati bočni stupac lijevo" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Otvori ploče u zasebnim prozorima" -#: ../midori/midori-websettings.c:606 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Da li uvijek otvarati ploče u odvojenim prozorima" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Kad se Midori pokrene:" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "Što učiniti kad se Midori pokrene" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Početna stranica:" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "početna stranica" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Pokaži dijalog rušenja" -#: ../midori/midori-websettings.c:642 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Pokaži dijalog nakon što se Midori sruši" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Pokaži brzo biranje u novim karticama" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Pokaži brzo biranje u novootvorenim karticama" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Spremi preuzimanja u" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Pitaj za odredišni direktorij" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Da li pitati za odredišni direktorij kada preuzimam datoteku" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Obavijesti kad je prijenos kompletiran" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Da li pokazati obavijest kada je prijenos dovršen" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Upravitelj preuzimanja" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Vanjski upravitelj preuzimanja" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Uređivač teksta" -#: ../midori/midori-websettings.c:732 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Vanjski uređivač teksta" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Željeno kodiranje" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "Željeno kodiranje znakova" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Uvijek pokaži Traku kartica" -#: ../midori/midori-websettings.c:777 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Uvijek pokaži traku kartica" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Otvori nove stranice u:" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Gdje otvoriti nove stranice" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Otvori vanjske stranice u:" -#: ../midori/midori-websettings.c:805 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Gdje otvoriti izvanjski otvorene stranice" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Srednji klik otvara odabir" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Učitaj adresu iz odabira pomoću srednjeg klika" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Otvori kartice u pozadini" -#: ../midori/midori-websettings.c:824 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Da li otvoriti nove kartice u pozadini" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Otvori kartice do trenutne" -#: ../midori/midori-websettings.c:833 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:842 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:852 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Učitaj slike automatski" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Učitaj i prikaži slike automatski" -#: ../midori/midori-websettings.c:860 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Omogući skripte" -#: ../midori/midori-websettings.c:861 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-websettings.c:868 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Omogući Netscape priključke" -#: ../midori/midori-websettings.c:869 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Omogući podršku za HTML5 bazu podataka" -#: ../midori/midori-websettings.c:886 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Da li omogućiti podršku za HTML bazu podataka" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Omogući podršku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:893 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Da li omogućiti podršku za HTML5 lokalnu pohranu" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:902 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Zumiraj tekst i slike" -#: ../midori/midori-websettings.c:928 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Da li zumirati tekst i slike" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:944 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "" -#: ../midori/midori-websettings.c:960 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Prihvati kolačiće" -#: ../midori/midori-websettings.c:969 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Koju vrstu kolačića prihvatiti" -#: ../midori/midori-websettings.c:985 -msgid "Original cookies only" -msgstr "Samo izvorne kolačiće" - -#: ../midori/midori-websettings.c:986 -msgid "Accept cookies from the original website only" -msgstr "Prihvati kolačiće samo sa izvorne web stranice" - -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:995 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "Maksimalni broj dana za spremanje kolačića" -#: ../midori/midori-websettings.c:1012 -msgid "Remember last visited pages" -msgstr "Zapamti zadnju posjećenu stranicu" - -#: ../midori/midori-websettings.c:1013 -msgid "Whether the last visited pages are saved" -msgstr "" - -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:1022 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "Maksimalni broj dana za spremanje povijesti" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Zapamti zadnje preuzete datoteke" -#: ../midori/midori-websettings.c:1031 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Proxy poslužitelj" -#: ../midori/midori-websettings.c:1049 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "HTTP Proxy poslužitelj" -#: ../midori/midori-websettings.c:1059 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Proxy poslužitelj korišten za HTTP spajanja" -#: ../midori/midori-websettings.c:1074 -msgid "Detect proxy server automatically" -msgstr "" - -#: ../midori/midori-websettings.c:1075 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Predstavi se kao" -#: ../midori/midori-websettings.c:1092 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:1109 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:1124 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Željeni jezici" -#: ../midori/midori-websettings.c:1125 +#: ../midori/midori-websettings.c:1074 msgid "" "A comma separated list of languages preferred for rendering multilingual " "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Očisti privatne podatke" -#: ../midori/midori-websettings.c:1141 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Privatni podaci odabrani za brisanje" @@ -1697,337 +1627,337 @@ msgstr "Privatni podaci odabrani za brisanje" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4560 -#: ../midori/midori-view.c:4564 +#: ../midori/midori-view.c:1227 ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Greška - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "Stranica '%s ne može biti učitana" -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Pokušaj ponovo" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "NIje pronađeno - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1433 ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Pošalji poruku %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2060 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2112 ../midori/midori-view.c:2182 msgid "Open Link in New _Tab" msgstr "Otvori poveznicu u novoj _kartici" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2116 msgid "Open Link in _Foreground Tab" -msgstr "" +msgstr "Otvori poveznicu u _prednjoj kartici" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Background Tab" msgstr "Otvori poveznicu u _pozadinskoj kartici" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2189 msgid "Open Link in New _Window" msgstr "Otvori poveznicu u novom _prozoru" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2123 msgid "Open Link as Web A_pplication" msgstr "Otvori poveznicu kao Web A_plikaciju" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2126 msgid "Copy Link de_stination" msgstr "Kopiraj odredište po_veznice" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2129 ../midori/midori-view.c:2201 msgid "_Save Link destination" msgstr "_Spremi odredište poveznice" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2195 msgid "_Download Link destination" msgstr "_Preuzmi odredište poveznice" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2206 msgid "Download with Download _Manager" -msgstr "" +msgstr "Preuzimanje pomoću upravitelja _preuzimanjima" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2143 msgid "Open _Image in New Tab" msgstr "Otvori _sliku u novoj kartici" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2146 msgid "Copy Image _Address" msgstr "Kopiraj adresu _slike" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2149 msgid "Save I_mage" msgstr "Sačuvaj S_liku" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2150 msgid "Download I_mage" msgstr "Preuzmi S_liku" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2157 msgid "Copy Video _Address" msgstr "Kopiraj video _adresu" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2160 msgid "Save _Video" msgstr "Spremi _video" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2160 msgid "Download _Video" msgstr "Preuzmi _video" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2223 msgid "Search _with" msgstr "Traži _pomoću" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2259 ../midori/midori-view.c:2266 msgid "_Search the Web" -msgstr "" +msgstr "_Pretraži web" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Otvori adresu u novoj _kartici" -#: ../midori/midori-view.c:2661 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Otvori ili preuzmi datoteku" -#: ../midori/midori-view.c:2680 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tip datoteke: '%s'" -#: ../midori/midori-view.c:2683 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tip datoteke: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2687 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Otvori %s" -#: ../midori/midori-view.c:3231 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:3513 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Brzo biranje" -#: ../midori/midori-view.c:3514 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Klik za dodavanje prečaca" -#: ../midori/midori-view.c:3515 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Unesi adresu prečaca" -#: ../midori/midori-view.c:3516 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Unesi naslov prečaca" -#: ../midori/midori-view.c:3517 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "jeste li sigurni da želite izbrisati ovaj prečac?" -#: ../midori/midori-view.c:3518 +#: ../midori/midori-view.c:3444 msgid "Set number of columns and rows" msgstr "Postavi broj stupaca i redova" -#: ../midori/midori-view.c:3519 +#: ../midori/midori-view.c:3445 msgid "Enter number of columns and rows:" msgstr "Unesi broj stupaca i redova" -#: ../midori/midori-view.c:3520 +#: ../midori/midori-view.c:3446 msgid "Invalid input for the size of the speed dial" msgstr "Neispravni unos za veličinu brzog biranja" -#: ../midori/midori-view.c:3521 +#: ../midori/midori-view.c:3447 msgid "Thumb size:" msgstr "" -#: ../midori/midori-view.c:3522 +#: ../midori/midori-view.c:3448 msgid "Small" msgstr "Male" -#: ../midori/midori-view.c:3523 +#: ../midori/midori-view.c:3449 msgid "Medium" msgstr "Srednje" -#: ../midori/midori-view.c:3524 +#: ../midori/midori-view.c:3450 msgid "Big" msgstr "Velike" -#: ../midori/midori-view.c:3550 +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "Dokument ne može biti prikazan" -#: ../midori/midori-view.c:3573 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Dokumentacija nije instalirana" -#: ../midori/midori-view.c:3694 +#: ../midori/midori-view.c:3618 msgid "Page loading delayed" msgstr "Odgođeno učitavanje stranice" -#: ../midori/midori-view.c:3695 +#: ../midori/midori-view.c:3619 msgid "Loading delayed either due to a recent crash or startup preferences." msgstr "" -#: ../midori/midori-view.c:3696 +#: ../midori/midori-view.c:3620 msgid "Load Page" msgstr "Učitaj stranicu" -#: ../midori/midori-view.c:3840 +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Prazna stranica" -#: ../midori/midori-view.c:4100 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Udvostruči karticu" -#: ../midori/midori-view.c:4105 -msgid "_Restore Tab" -msgstr "_Obnovi karticu" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Pokaži oznaku _kartice" -#: ../midori/midori-view.c:4105 -msgid "_Minimize Tab" -msgstr "_Minimiziraj karticu" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Prikaži samo _ikone kartice" -#: ../midori/midori-view.c:4111 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Zatvori dr_uge kartice" -#: ../midori/midori-view.c:4789 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Ispis pozadinskih slika" -#: ../midori/midori-view.c:4790 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-view.c:4842 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4733 ../midori/midori-preferences.c:384 msgid "Features" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Osnovno" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Pokretanje" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Koristi trenutnu stranicu kao početnu stranicu" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Prijenosi" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Izgled" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Postavke fonta" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Najmanja veličina fonta" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "Najmanja veličina fonta korištena za prikaz teksta" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Ponašanje" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" msgstr "" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Provjera pravopisa" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:424 msgid "Enable Spell Checking" msgstr "Omogući provjeru pravopisa" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:425 msgid "Enable spell checking while typing" msgstr "Omogući provjeru pravopisa dok pišem" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:427 msgid "Spelling dictionaries:" msgstr "Pravopisni rječnici" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:431 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" @@ -2036,150 +1966,218 @@ msgstr "" "npr. \"en_GB,de_DE\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Sučelje" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Navigacijska traka" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:448 msgid "Browsing" msgstr "Pretraživanje" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:470 msgid "Applications" msgstr "Programi" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:471 msgid "External applications" msgstr "Vanjski programi" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:487 ../midori/midori-preferences.c:488 msgid "Network" msgstr "Mreža" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:494 msgid "Hostname" msgstr "Ime računala" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Privatnost" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Web kolačići" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:523 ../midori/midori-preferences.c:537 msgid "days" -msgstr "dani" +msgstr "dana" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:481 +msgid "Empty" +msgstr "Prazno" + +#: ../midori/midori-searchaction.c:914 msgid "Add search engine" msgstr "Dodaj tražilicu" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Edit search engine" msgstr "Uredi tražilicu" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:942 msgid "_Name:" msgstr "_Ime:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "_Ikona:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1231 msgid "Manage Search Engines" msgstr "Upravljaj tražilicama" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1332 msgid "Use as _default" msgstr "Koristi kao _zadano" -#: ../midori/sokoke.c:1287 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Zabilješka" -#: ../midori/sokoke.c:1289 +#: ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "_Zabilješke" + +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Dodaj za_bilješku" -#: ../midori/sokoke.c:1290 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:1291 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Proširenja" -#: ../midori/sokoke.c:1292 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Povijest" -#: ../midori/sokoke.c:1293 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Početna stranica" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "_Korisničke skripte" -#: ../midori/sokoke.c:1295 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "Nova _kartica" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Prijenosi" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "Netscape p_riključci" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nova _mapa" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:213 +msgid "_Inline Find:" +msgstr "" + +#: ../toolbars/midori-findbar.c:245 +msgid "Previous" +msgstr "Prethodno" + +#: ../toolbars/midori-findbar.c:251 +msgid "Next" +msgstr "Slijedeće" + +#: ../toolbars/midori-findbar.c:255 +msgid "Match Case" +msgstr "" + +#: ../toolbars/midori-findbar.c:264 +msgid "Highlight Matches" +msgstr "" + +#: ../toolbars/midori-findbar.c:275 +msgid "Close Findbar" +msgstr "" + +#: ../toolbars/midori-transferbar.c:88 ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s od %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "Datoteka '%s' je preuzeta." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Prijenos završen" + +#: ../toolbars/midori-transferbar.c:257 ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "Očisti sve" + +#: ../toolbars/midori-transferbar.c:300 ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "Neke datoteke su preuzete" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "_Isključi Midori" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "Prijenosi će biti odgođeni ako se Midori isključi" + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Zabilješke" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:269 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Neuspjeh u dodavanju stavki zabilješki: %s\n" + +#: ../panels/midori-bookmarks.c:408 msgid "Edit the selected bookmark" msgstr "Uredi odabrane zabilješke" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:416 msgid "Delete the selected bookmark" msgstr "Izbriši odabrane zabilješke" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:430 msgid "Add a new folder" msgstr "Dodaj novu mapu" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:562 ../panels/midori-history.c:572 msgid "Separator" msgstr "Razdjelnik" -#: ../panels/midori-console.c:87 +#: ../panels/midori-console.c:90 msgid "Console" msgstr "" -#: ../panels/midori-console.c:361 +#: ../panels/midori-console.c:351 msgid "Copy _All" msgstr "Kopiraj _sve" -#: ../panels/midori-console.c:362 +#: ../panels/midori-console.c:352 msgid "Copy All" msgstr "Kopiraj sve" @@ -2187,20 +2185,11 @@ msgstr "Kopiraj sve" msgid "Extensions" msgstr "Proširenja" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "" - -#: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "Vrijeme sata je u prošlosti.Provjerite trenutni dan i vrijeme." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Prije tjedan dana" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -2208,40 +2197,35 @@ msgstr[0] "% d dan prije" msgstr[1] "% d dana prije" msgstr[2] "% d dana prije" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Danas" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Jučer" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Jeste li sigurni da želite ukloniti sve stavke povijesti?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Zabilježi odabranu stavku povijesti" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Izbriši odabranu stavku povijesti" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Obriši cijelu povijest" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filter:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Otvori odredišni _direktorij" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Kopiraj lokaciju po_veznice" @@ -2283,16 +2267,17 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:503 ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Svojstvo '%s' nije valjano za %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:549 ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Izaberi datoteku" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Izaberi mapu" @@ -2332,50 +2317,88 @@ msgstr "Bl_okiraj sliku" msgid "Bl_ock link" msgstr "Bl_okiraj poveznicu" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Kopiraj %s u mapu %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Korisničke skripte" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Greška" + +#: ../extensions/addons.c:231 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Želite li izbrisati '%s'?" + +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Izbriši korisničke skripte" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Datoteka %sće biti trajno uklonjena" + +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Otvori u uređivaču teksta" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Otvori odredišni direktorij" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Dodaj novu dodatak" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Ukloni odabrani dodatak" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1583 msgid "User addons" msgstr "Korisnički dodaci" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1542 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1584 msgid "Support for userscripts and userstyles" msgstr "" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Obojane kartice" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "" @@ -2464,6 +2487,10 @@ msgstr "_Proširi sve" msgid "_Collapse All" msgstr "_Skupi sve" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filter:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 msgid "" "Enter a filter string to show only cookies whose name or domain field match " @@ -2478,6 +2505,26 @@ msgstr "_Upravitelj kolačićima" msgid "List, view and delete cookies" msgstr "Listaj,pogledaj i izbriši kolačiće" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Kopiraj adresu _kartice" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy Addresses of Tabs" +msgstr "Kopiraj adresu kartica" + +#: ../extensions/copy-tabs.c:97 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "" + +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Vanjski programi" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." msgstr "" @@ -2487,39 +2534,39 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "" #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:396 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "" +msgstr "Zadnje ažuriranje: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:668 msgid "Feeds" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Add new feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:728 msgid "Delete feed" msgstr "" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "" -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "" -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "" @@ -2540,10 +2587,6 @@ msgstr "" msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" -#: ../extensions/feed-panel/main.c:129 -msgid "Error" -msgstr "Greška" - #: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" @@ -2554,54 +2597,84 @@ msgstr "" msgid "Error loading feed '%s'" msgstr "" -#: ../extensions/feed-panel/main.c:516 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "" -#: ../extensions/feed-panel/main.c:517 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:454 ../extensions/formhistory.c:458 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../extensions/formhistory.c:501 msgid "Stores history of entered form data" msgstr "" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:505 #, c-format msgid "Not available: %s" msgstr "Nije dostupno: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:506 msgid "Resource files not installed" msgstr "" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:512 msgid "Form history filler" msgstr "" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Slijedeća kartica (lista povijesti)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Slijedeća kartica iz povijesti" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Prethodna kartica (lista povijesti)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Prethodna kartica iz povijesti" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Lista povijesti" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "" +"Dozvoli prebacivanje kartica izborom sa liste poredanih po zadnjoj upotrebi" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Kontroliraj Midori kretnjom miša" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:175 msgid "Pageholder" msgstr "" -#: ../extensions/page-holder.c:161 +#: ../extensions/page-holder.c:159 msgid "_Pageholder" msgstr "" -#: ../extensions/page-holder.c:178 +#: ../extensions/page-holder.c:176 msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Držite jednu ili više stranica otvorenima paralelno sa vašim karticama" @@ -2613,14 +2686,22 @@ msgstr "Prilagodi kratice tipkovnice" msgid "Customize Sh_ortcuts..." msgstr "Prilagodi kr_atice..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Kratice" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "Pogledaj i uredi kratice tipkovnice" +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Sat statusne trake" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Prikaži datum i vrijeme u statusnoj traci" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Slike" @@ -2633,34 +2714,33 @@ msgstr "Skripte" msgid "Netscape plugins" msgstr "Netscape priključci" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:147 msgid "Statusbar Features" msgstr "" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:148 msgid "Easily toggle features on web pages on and off" msgstr "" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:626 msgid "Tab Panel" msgstr "Kartica ploče" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:610 msgid "T_ab Panel" msgstr "K_artica ploče" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:627 msgid "Show tabs in a vertical panel" msgstr "Pokaži kartice u okomitoj ploči" -#: ../extensions/tab-switcher.c:402 -msgid "Tab History List" -msgstr "Kartica lista povijesti" - -#: ../extensions/tab-switcher.c:403 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" +#: ../extensions/tabs-minimized.c:77 +msgid "Only Icons on Tabs by default" +msgstr "" + +#: ../extensions/tabs-minimized.c:78 +msgid "New tabs have no label by default" msgstr "" -"Dozvoli prebacivanje kartica izborom sa liste poredanih po zadnjoj upotrebi" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2684,18 +2764,46 @@ msgstr "Prikazane stavke" msgid "Customize _Toolbar..." msgstr "Prilagodi_Alatnu traku..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:606 msgid "Toolbar Editor" msgstr "Uređivač alatne trake" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:607 msgid "Easily edit the toolbar layout" msgstr "Jednostavno uređivanje izgleda alatnih traka" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "" +#~ msgid "_Recently visited pages" +#~ msgstr "_Nedavno posjećene stranice" + +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Ponovo otvori stranice koje ste posjetili ranije" + +#~ msgid "Show the saved bookmarks" +#~ msgstr "Pokaži spremljene zabilješke" + +#~ msgid "Original cookies only" +#~ msgstr "Samo izvorne kolačiće" + +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Prihvati kolačiće samo sa izvorne web stranice" + +#~ msgid "Remember last visited pages" +#~ msgstr "Zapamti zadnju posjećenu stranicu" + +#~ msgid "_Restore Tab" +#~ msgstr "_Obnovi karticu" + +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "Vrijeme sata je u prošlosti.Provjerite trenutni dan i vrijeme." + +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Kopiraj %s u mapu %s." + #~ msgid "Set number of shortcuts" #~ msgstr "Postavi broj prečaca" From edf3f95c8b565e093dabe81eb627371789f1bd3c Mon Sep 17 00:00:00 2001 From: Denis Koryavov Date: Tue, 14 Sep 2010 11:24:09 +0200 Subject: [PATCH 2958/2970] l10n: Updated Russian (ru) translation to 98% New status: 636 messages complete with 8 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/ru.po | 714 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 368 insertions(+), 346 deletions(-) diff --git a/po/ru.po b/po/ru.po index 53e89af2..0778d6c5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-28 16:08+0000\n" +"POT-Creation-Date: 2010-09-14 04:11+0000\n" "PO-Revision-Date: 2010-06-26 00:55+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" @@ -22,8 +22,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1322 ../midori/main.c:1651 +#: ../midori/main.c:1659 ../midori/main.c:1675 #: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -47,189 +47,189 @@ msgstr "Значение «%s» недействительно для %s" msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:366 ../midori/main.c:470 ../extensions/formhistory.c:439 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:422 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../midori/main.c:453 ../panels/midori-history.c:169 #: ../panels/midori-history.c:199 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:498 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:525 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:563 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:583 ../midori/main.c:606 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:665 ../midori/main.c:905 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:852 +#: ../midori/main.c:849 msgid "No root certificate file is available. SSL certificates cannot be verified." msgstr "Недоступен корневой сертификат. SSL сертификат не может быть проверен." -#: ../midori/main.c:942 +#: ../midori/main.c:939 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:957 +#: ../midori/main.c:954 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:961 +#: ../midori/main.c:958 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:966 +#: ../midori/main.c:963 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1202 ../midori/main.c:1946 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1328 +#: ../midori/main.c:1322 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1347 +#: ../midori/main.c:1341 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1378 +#: ../midori/main.c:1372 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Снимок сохранён в: %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1544 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1550 +#: ../midori/main.c:1544 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1553 +#: ../midori/main.c:1547 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1553 +#: ../midori/main.c:1547 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1556 +#: ../midori/main.c:1550 msgid "Show a diagnostic dialog" msgstr "Показать окно действий" -#: ../midori/main.c:1558 +#: ../midori/main.c:1552 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1555 msgid "Take a snapshot of the specified URI" msgstr "Создать снимок указанной страницы" -#: ../midori/main.c:1564 +#: ../midori/main.c:1558 msgid "Execute the specified command" msgstr "Выполнить указанную команду" -#: ../midori/main.c:1566 +#: ../midori/main.c:1560 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1568 +#: ../midori/main.c:1562 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1570 +#: ../midori/main.c:1564 msgid "Block URIs according to regular expression PATTERN" msgstr "Блокировать URI по ШАБЛОНУ (регулярное выражение)" -#: ../midori/main.c:1570 +#: ../midori/main.c:1564 msgid "PATTERN" msgstr "ШАБЛОН" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1568 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Сбросить состояние Midori по прошествии указанного числа СЕКУНД бездействия" -#: ../midori/main.c:1574 +#: ../midori/main.c:1568 msgid "SECONDS" msgstr "СЕКУНД" -#: ../midori/main.c:1654 +#: ../midori/main.c:1648 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1682 +#: ../midori/main.c:1676 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1684 +#: ../midori/main.c:1678 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1801 +#: ../midori/main.c:1795 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1849 +#: ../midori/main.c:1843 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1904 +#: ../midori/main.c:1898 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:1919 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:1961 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1974 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:1988 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:2010 +#: ../midori/main.c:2004 msgid "_Ignore" msgstr "_Игнорировать" @@ -246,16 +246,16 @@ msgstr "Плохо сформированный документ." msgid "Unrecognized bookmark format." msgstr "Неизвестный формат закладок." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:716 msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4887 +#: ../midori/midori-browser.c:4893 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4890 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" @@ -294,21 +294,21 @@ msgstr "Изменение закладки" msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:958 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:972 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4007 msgid "_Folder:" msgstr "_Папка:" #: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 +#: ../midori/midori-browser.c:4012 ../midori/midori-browser.c:4040 msgid "Toplevel folder" msgstr "Корневая папка" @@ -334,20 +334,20 @@ msgstr "Не хватает свободного места для загруз msgid "The file needs %s but only %s are left." msgstr "Файл требует %s а %s доступно" -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4048 +#: ../midori/midori-browser.c:4083 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Сохранить файл" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2154 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2232 msgid "" "To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" "Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." @@ -355,653 +355,650 @@ msgstr "" "Чтобы воспользоваться данным URI, откройте программу чтения новостей. Обычно необходимое действие называется «Добавить ленту» или «Добавить подписку».\n" "В настройках Midori также можно установить программу чтения новостей. В таком случае, в следующий раз при нажатии на ссылку на ленту, она будет добавлена автоматически." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2238 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Новая лента" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2281 ../midori/midori-browser.c:4952 +#: ../panels/midori-bookmarks.c:400 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:3284 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3527 ../midori/midori-browser.c:5342 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:3842 ../panels/midori-bookmarks.c:713 +#: ../panels/midori-history.c:736 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3849 ../panels/midori-bookmarks.c:719 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3852 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:3930 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:3931 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:3932 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:3933 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:3934 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:3958 msgid "Import bookmarks..." msgstr "Импорт закладок..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:3961 ../midori/midori-browser.c:4957 msgid "_Import bookmarks" msgstr "_Импортировать закладки" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:3972 msgid "_Application:" msgstr "_Приложение:" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:3999 ../midori/midori-browser.c:5070 #: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 #: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Выбрать..." -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4059 msgid "Failed to import bookmarks" msgstr "Не удалось импортировать закладки" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4100 msgid "Failed to export bookmarks" msgstr "Не удалось экспортировать закладки" -#: ../midori/midori-browser.c:4155 -#, fuzzy, c-format +#: ../midori/midori-browser.c:4153 +#, c-format msgid "Failed to clear history: %s\n" -msgstr "Не удалось удалить запись из журнала: %s\n" +msgstr "Не удалось очистить историю: %s\n" -#: ../midori/midori-browser.c:4163 -#, fuzzy, c-format +#: ../midori/midori-browser.c:4161 +#, c-format msgid "Failed to clear search history: %s\n" -msgstr "Не удалось добавить запись в журнал: %s\n" +msgstr "Не удалось очистить историю поиска: %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4268 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4272 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4286 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../midori/midori-browser.c:4296 ../midori/midori-preferences.c:532 #: ../panels/midori-history.c:114 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4301 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4306 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4311 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 +#: ../midori/midori-browser.c:4316 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "За_крытые вкладки" -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4321 ../extensions/web-cache.c:462 msgid "Web Cache" msgstr "Сетевой кэш" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4329 msgid "Clear private data when _quitting Midori" msgstr "Удалять личные данные _при закрытии Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4470 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:4474 +#: ../midori/midori-browser.c:4472 msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." msgstr "Эта библиотека является свободным программным обеспечением. Вы можете распространять или изменять ее на условиях соответствия GNU Lesser General Public License опубликованной Free Software Foundation; либо версии 2.1 лицензии, либо (на ваше усмотрение) любой более поздней версии." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4491 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov \n" "Alexandr Ponomarenko, 2009" -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:4800 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 +#: ../midori/midori-browser.c:4802 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4803 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4806 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4808 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:4811 +#: ../midori/midori-browser.c:4809 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:4813 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:4816 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4818 msgid "Add to Speed _dial" msgstr "Добавить в _быстрый набор" -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:4819 msgid "Add shortcut to speed dial" msgstr "Добавить страницу в панель быстрого набора" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4821 msgid "Add Shortcut to the _desktop" msgstr "Добавить кнопку запуска на _рабочий стол" -#: ../midori/midori-browser.c:4824 +#: ../midori/midori-browser.c:4822 msgid "Add shortcut to the desktop" msgstr "Добавить кнопку запуска на рабочий стол" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4824 msgid "Subscribe to News _feed" msgstr "Подписаться на _ленту новостей" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4825 msgid "Subscribe to this news feed" msgstr "Подписаться на эту ленту новостей" -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:4830 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4831 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4833 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4834 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4837 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4840 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4842 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4846 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4849 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4853 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:4856 ../midori/midori-browser.c:4859 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:4862 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4865 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4868 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4871 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:4873 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4874 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4876 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4877 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4881 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4883 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:4884 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4896 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4899 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4902 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4903 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4905 msgid "View So_urce" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4906 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4909 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4912 msgid "Scroll _Left" msgstr "Смещение _влево" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4913 msgid "Scroll to the left" msgstr "Сместить влево" -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:4915 msgid "Scroll _Down" msgstr "Смещение _вниз" -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:4916 msgid "Scroll down" msgstr "Сместить вниз" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4918 msgid "Scroll _Up" msgstr "Смещение _вверх" -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:4919 msgid "Scroll up" msgstr "Сместить вверх" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4921 msgid "Scroll _Right" msgstr "Смещение _вправо" -#: ../midori/midori-browser.c:4924 +#: ../midori/midori-browser.c:4922 msgid "Scroll to the right" msgstr "Сместить вправо" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4925 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4928 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4931 msgid "Go forward to the next page" msgstr "На следующую страницу" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4935 msgid "Go to the previous sub-page" msgstr "На предыдущую подстраницу" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:4939 msgid "Go to the next sub-page" msgstr "На следующую подстраницу" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:4942 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4944 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4945 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4947 msgid "Undo _Close Tab" msgstr "О_тменить закрытие вкладки" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4948 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4954 msgid "Add a new _folder" msgstr "_Создать папку" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4955 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4960 msgid "_Export bookmarks" msgstr "_Экспортировать закладки" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:4963 ../midori/midori-searchaction.c:490 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:4964 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:4967 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:4968 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:4972 msgid "_Inspect Page" msgstr "_Информация о странице" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:4973 msgid "Inspect page details and access developer tools..." msgstr "Показать информацию о странице и инструменты разработчика..." -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:4978 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:4979 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:4981 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:4982 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:4984 msgid "Focus _Current Tab" msgstr "_Фокус на текущую вкладку" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:4985 msgid "Focus the current tab" msgstr "Перевести фокус ввода на текущую вкладку" -#: ../midori/midori-browser.c:4989 +#: ../midori/midori-browser.c:4987 #, fuzzy msgid "Minimize _Current Tab" msgstr "Сворачивать новые вкладки" -#: ../midori/midori-browser.c:4990 +#: ../midori/midori-browser.c:4988 #, fuzzy msgid "Minimize the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:4992 -#, fuzzy +#: ../midori/midori-browser.c:4990 msgid "_Duplicate Current Tab" -msgstr "Дублировать вкладку" +msgstr "_Дублировать текущую вкладку" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:4991 #, fuzzy msgid "Duplicate the current tab" msgstr "Закрыть текущую вкладку" -#: ../midori/midori-browser.c:4995 -#, fuzzy +#: ../midori/midori-browser.c:4993 msgid "Close Ot_her Tabs" msgstr "З_акрыть остальные" -#: ../midori/midori-browser.c:4996 -#, fuzzy +#: ../midori/midori-browser.c:4994 msgid "Close all tabs except the current tab" msgstr "Закрыть все вкладки кроме текущей" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4996 msgid "Open last _session" msgstr "Открыть предыдущий _сеанс" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:4997 msgid "Open the tabs saved in the last session" msgstr "Открыть вкладки из предыдущего сеанса" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:4999 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:5003 +#: ../midori/midori-browser.c:5001 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:5002 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5004 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5005 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:5007 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5008 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:5011 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5019 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5020 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5023 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5024 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5027 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5028 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5031 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5032 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5035 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5036 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5039 msgid "_Statusbar" msgstr "_Строка состояния" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5040 msgid "Show statusbar" msgstr "Показать строку состояния" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5048 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5051 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5055 msgid "Japanese (SHIFT__JIS)" msgstr "Японская (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5058 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Корейская (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5061 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5064 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5067 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5585 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5592 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5594 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5618 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5620 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5641 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5656 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5673 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5675 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5689 msgid "_Menu" msgstr "_Меню" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5691 msgid "Menu" msgstr "Меню" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6256 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" @@ -1021,13 +1018,13 @@ msgstr "Поиск %s" msgid "Search with %s" msgstr "Найти с помощью %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:1305 #, c-format msgid "Failed to execute database statement\n" msgstr "Не удалось выполнить запрос к базе данных\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1361 msgid "Paste and p_roceed" msgstr "Вс&тавить и перейти" @@ -1036,7 +1033,7 @@ msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" #: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 msgid "Align sidepanel to the right" msgstr "Расположить панель справа" @@ -1044,11 +1041,11 @@ msgstr "Расположить панель справа" msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 msgid "Align sidepanel to the left" msgstr "Расположить панель слева" -#: ../midori/midori-panel.c:771 +#: ../midori/midori-panel.c:754 msgid "Hide operating controls" msgstr "Скрыть элементы управления" @@ -1653,76 +1650,76 @@ msgstr "Страница не найдена — %s" msgid "Send a message to %s" msgstr "Отправить сообщение %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2060 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Исследовать _элемент" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2112 ../midori/midori-view.c:2182 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2116 msgid "Open Link in _Foreground Tab" msgstr "Открыть ссылку в новой _активной вкладке" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Background Tab" msgstr "Открыть ссылку в _фоновой вкладке" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2189 msgid "Open Link in New _Window" msgstr "Открыть ссылку в _новом окне" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2123 msgid "Open Link as Web A_pplication" msgstr "Открыть ссылку как веб-_приложение" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2126 msgid "Copy Link de_stination" msgstr "_Копировать адрес ссылки" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2129 ../midori/midori-view.c:2201 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2195 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2206 msgid "Download with Download _Manager" msgstr "Загрузить с помощью _менеджера загрузок" -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2143 msgid "Open _Image in New Tab" msgstr "Открыть изображение в новой _вкладке" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2146 msgid "Copy Image _Address" msgstr "Копировать _адрес изображения" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2149 msgid "Save I_mage" msgstr "Сохранить _изображение" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2150 msgid "Download I_mage" msgstr "Загрузить _изображение" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2157 msgid "Copy Video _Address" msgstr "Копировать _адрес видео" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2160 msgid "Save _Video" msgstr "Сохранить _видео" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2160 msgid "Download _Video" msgstr "Загрузить _видео" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2223 msgid "Search _with" msgstr "Найти _с помощью" @@ -1945,96 +1942,96 @@ msgstr "Разрешено ли сценариям открывать всплы msgid "Spell Checking" msgstr "Проверка орфографии" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:424 msgid "Enable Spell Checking" msgstr "Проверять орфографию" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:425 msgid "Enable spell checking while typing" msgstr "Проверять правописание вводимого текста" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:427 msgid "Spelling dictionaries:" msgstr "Словари:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 +#: ../midori/midori-preferences.c:431 msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" msgstr "Список языков для проверки орфографии через запятую, например, «en_US,ru»" #. Page "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:448 msgid "Browsing" msgstr "Навигация" #. Page "Applications" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:470 msgid "Applications" msgstr "Приложения" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:471 msgid "External applications" msgstr "Внешние приложения" #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:487 ../midori/midori-preferences.c:488 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:494 msgid "Hostname" msgstr "Адрес" #. Page "Privacy" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:523 ../midori/midori-preferences.c:537 msgid "days" msgstr "дней" -#: ../midori/midori-searchaction.c:484 +#: ../midori/midori-searchaction.c:481 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:942 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "_Значок:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1231 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1332 msgid "Use as _default" msgstr "Использовать _по умолчанию" @@ -2087,27 +2084,27 @@ msgid "New _Folder" msgstr "Новая папка" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:213 msgid "_Inline Find:" msgstr "_Найти:" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:245 msgid "Previous" msgstr "Назад" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:251 msgid "Next" msgstr "Далее" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:255 msgid "Match Case" msgstr "Учитывать регистр" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:264 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:275 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" @@ -2145,36 +2142,36 @@ msgstr "Загрузки будут отменены при закрытии Mid msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:269 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Не удалось добавить закладку: %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:408 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:416 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:430 msgid "Add a new folder" msgstr "Создать папку" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:562 ../panels/midori-history.c:572 msgid "Separator" msgstr "Разделитель" -#: ../panels/midori-console.c:87 +#: ../panels/midori-console.c:90 msgid "Console" msgstr "Консоль" -#: ../panels/midori-console.c:361 +#: ../panels/midori-console.c:351 msgid "Copy _All" msgstr "Копировать все" -#: ../panels/midori-console.c:362 +#: ../panels/midori-console.c:352 msgid "Copy All" msgstr "Копировать все" @@ -2312,58 +2309,92 @@ msgstr "Бл_окировать изображение" msgid "Bl_ock link" msgstr "Бл_окировать ссылку" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Блокировка рекламы" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Блокирует рекламу по списку фильтров" -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:130 ../extensions/addons.c:490 msgid "Userscripts" msgstr "Сценарии" -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:135 ../extensions/addons.c:492 msgid "Userstyles" msgstr "Стили пользователя" -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 #: ../extensions/feed-panel/main.c:129 msgid "Error" msgstr "Ошибка" #: ../extensions/addons.c:231 #, c-format -msgid "" -"Do you really want to remove '%s'?\n" -"\n" -"The file '%s' will be permanently lost.\n" +msgid "Do you want to delete '%s'?" +msgstr "Удалить '%s'?" + +#: ../extensions/addons.c:237 +#, fuzzy +msgid "Delete user script" +msgstr "Сценарии" + +#: ../extensions/addons.c:238 +#, fuzzy +msgid "Delete user style" +msgstr "Удалить ленту" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "Файл %s будет удален." + +#: ../extensions/addons.c:377 ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Открыть в текстовом редакторе" + +#: ../extensions/addons.c:379 ../extensions/addons.c:463 +#, fuzzy +msgid "Open Target Folder" +msgstr "Открыть _папку загрузок" + +#: ../extensions/addons.c:445 +#, fuzzy +msgid "Add new addon" +msgstr "Добавить ленту" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" msgstr "" -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "Настройки расширения '%s' не могут быть сохранены: %s\n" -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1583 msgid "User addons" msgstr "Пользовательские дополнения" -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1542 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Отслеживание изменений в «%s» отключено: %s" -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1584 msgid "Support for userscripts and userstyles" msgstr "Поддержка пользовательских сценариев и стилей" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Цветные вкладки" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" @@ -2470,21 +2501,19 @@ msgstr "Просмотр и удаление фрагментов данных" msgid "Copy Tab _Addresses" msgstr "Копировать _адреса вкладок" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Скопировать адреса вкладок" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Копирует адреса всех вкладок в буфер обмена" #: ../extensions/external-applications.vala:93 -#, fuzzy msgid "External Applications" msgstr "Внешние приложения" #: ../extensions/external-applications.vala:94 -#, fuzzy msgid "Associate URL schemes with external commands" msgstr "Ассоциировать ссылки с внешними командами" @@ -2497,25 +2526,25 @@ msgid "Failed to find required Atom \"feed\" elements in XML data." msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:396 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Последнее обновление: %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:668 msgid "Feeds" msgstr "Ленты" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Add new feed" msgstr "Добавить ленту" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:728 msgid "Delete feed" msgstr "Удалить ленту" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "Л_енты" @@ -2560,11 +2589,11 @@ msgstr "Лента «%s» уже была добавлена" msgid "Error loading feed '%s'" msgstr "Не удалось загрузить ленту «%s»" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Панель лент новостей" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Чтение лент RSS/Atom" @@ -2573,75 +2602,70 @@ msgstr "Чтение лент RSS/Atom" msgid "Failed to add form value: %s\n" msgstr "Не удалось добавить значение: %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory.c:454 ../extensions/formhistory.c:458 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory.c:501 msgid "Stores history of entered form data" msgstr "Хранит данные, введённые ранее в формы ввода" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory.c:505 #, c-format msgid "Not available: %s" msgstr "Недоступно: %s" -#: ../extensions/formhistory.c:508 +#: ../extensions/formhistory.c:506 msgid "Resource files not installed" msgstr "Файлы ресурсов не установлены" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:512 msgid "Form history filler" msgstr "История форм ввода" #: ../extensions/history-list.vala:174 -#, fuzzy msgid "Next Tab (History List)" msgstr "Следующая вкладка (Список истории)" #: ../extensions/history-list.vala:175 -#, fuzzy msgid "Next tab from history" msgstr "Следующая вкладка из истории" #: ../extensions/history-list.vala:184 -#, fuzzy msgid "Previous Tab (History List)" msgstr "Предыдущая вкладка (Список истории)" #: ../extensions/history-list.vala:185 -#, fuzzy msgid "Previous tab from history" msgstr "Предыдущая вкладка из истории" #: ../extensions/history-list.vala:245 -#, fuzzy msgid "History List" -msgstr "История вкладок" +msgstr "Список истории" #: ../extensions/history-list.vala:246 msgid "Allows to switch tabs by choosing from a list sorted by last usage" msgstr "Отображает список вкладок в порядке времени последнего использования" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Жесты мышью" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:175 msgid "Pageholder" msgstr "Контейнер" -#: ../extensions/page-holder.c:161 +#: ../extensions/page-holder.c:159 msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/page-holder.c:178 +#: ../extensions/page-holder.c:176 msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Дополнительная область для просмотра страниц" @@ -2653,21 +2677,19 @@ msgstr "Настройка комбинаций клавиш" msgid "Customize Sh_ortcuts..." msgstr "_Настроить клавиши..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Комбинации клавиш" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "Просмотр и изменение «горячих клавиш»" -#: ../extensions/status-clock.c:176 -#, fuzzy +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Часы в строке статуса" -#: ../extensions/status-clock.c:177 -#, fuzzy +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Показывать дату и время в строке статуса" @@ -2683,33 +2705,33 @@ msgstr "Сценарии" msgid "Netscape plugins" msgstr "Модули Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:147 msgid "Statusbar Features" msgstr "Настройка возможностей" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:148 msgid "Easily toggle features on web pages on and off" msgstr "Быстрая настройка режимов отображения страниц" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:626 msgid "Tab Panel" msgstr "Панель вкладок" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:610 msgid "T_ab Panel" msgstr "П_анель вкладок" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:627 msgid "Show tabs in a vertical panel" msgstr "Показ вкладок в боковой панели" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" -msgstr "" +msgstr "Новые вкладки не имеют названия по умолчанию" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" @@ -2731,15 +2753,15 @@ msgstr "Отображаемые элементы" msgid "Customize _Toolbar..." msgstr "Настроить панель _инструментов..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:606 msgid "Toolbar Editor" msgstr "Редактор панели инструментов" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:607 msgid "Easily edit the toolbar layout" msgstr "Простой редактор панели инструментов" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Кэширует принятые данные (HTTP) на диске" From b80b97b7877f8f51458fc8cb1527de0b25a780fb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 14 Sep 2010 21:14:09 +0200 Subject: [PATCH 2959/2970] Require that the URI passed to katze_load_cached_icon be NULL --- katze/katze-utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index cde82348..5d12592b 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1495,6 +1495,8 @@ katze_load_cached_icon (const gchar* uri, { GdkPixbuf* icon = NULL; + g_return_val_if_fail (uri != NULL, NULL); + if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri,"https://")) { guint i; From 34ddb8c2f099ffd8e1add44e0c098de5f9cc4cbe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 14 Sep 2010 21:51:17 +0200 Subject: [PATCH 2960/2970] Implement KatzeArrayAction::populate-folder To go along with that, expose katze_array_action_generate_menu as a public function to implement the signal. In essence, this enables populating folders from other sources than the original array, such as a database, while still making use of the existing menu generation. --- katze/katze-arrayaction.c | 100 ++++++++++++++++++++++++++++++-------- katze/katze-arrayaction.h | 6 +++ midori/marshal.list | 1 + 3 files changed, 88 insertions(+), 19 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index e23e11f8..c031a245 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -49,6 +49,7 @@ enum enum { POPULATE_POPUP, + POPULATE_FOLDER, ACTIVATE_ITEM, ACTIVATE_ITEM_ALT, LAST_SIGNAL @@ -104,6 +105,34 @@ katze_array_action_class_init (KatzeArrayActionClass* class) G_TYPE_NONE, 1, GTK_TYPE_MENU); + /** + * KatzeArrayAction::populate-folder: + * @array: the object on which the signal is emitted + * @menu: the menu shell being opened + * @folder: the folder being opened + * + * A context menu is going to be opened for @folder, + * the provided @menu can be populated accordingly. + * + * Unlike "populate-popup" this signal is emitted for + * the toplevel folder and all subfolders. + * + * Return value: %TRUE if the event was handled. If %FALSE is returned, + * the default "populate-popup" signal is emitted. + * + * Since: 0.2.8 + **/ + + signals[POPULATE_FOLDER] = g_signal_new ("populate-folder", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + midori_cclosure_marshal_BOOLEAN__OBJECT_OBJECT, + G_TYPE_BOOLEAN, 2, + GTK_TYPE_MENU_SHELL, KATZE_TYPE_ITEM); + signals[ACTIVATE_ITEM] = g_signal_new ("activate-item", G_TYPE_FROM_CLASS (class), (GSignalFlags) (G_SIGNAL_RUN_LAST), @@ -291,10 +320,29 @@ static void katze_array_action_menu_item_select_cb (GtkWidget* proxy, KatzeArrayAction* array_action); -static void +/** + * katze_array_action_generate_menu: + * @array_action: a #KatzeArrayAction + * @folder: the folder to represent + * @menu: the menu shell to populate + * @proxy: the proxy, or alternatively a widget in the same window + * + * Generates menu items according to @folder, in the way they + * appear in automatically generated action proxies. + * The primary use is for implementing "populate-folder". + * + * It is worth noting that @folder can be any folder and can + * be generated dynamically if needed. + * + * The @proxy widget must be a related widget on the same screen, + * but doesn't have to be a proxy of the action. + * + * Since: 0.2.8 + **/ +void katze_array_action_generate_menu (KatzeArrayAction* array_action, KatzeArray* array, - GtkWidget* menu, + GtkMenuShell* menu, GtkWidget* proxy) { gint i; @@ -306,6 +354,9 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, GtkWidget* image; GtkWidget* submenu; + if (!KATZE_IS_ARRAY (array)) + return; + if (array_action->reversed) { i = katze_array_get_length (array); @@ -319,11 +370,11 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, while ((item = katze_array_get_nth_item (array, i += summand))) { /* FIXME: The menu item should reflect changes to the item */ - if (!KATZE_IS_ARRAY (item) && !katze_item_get_uri (item)) + if (KATZE_ITEM_IS_SEPARATOR (item)) { menuitem = gtk_separator_menu_item_new (); gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_menu_shell_append (menu, menuitem); continue; } menuitem = katze_image_menu_item_new_ellipsized ( @@ -332,7 +383,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); else { - if (KATZE_IS_ARRAY (item)) + if (KATZE_ITEM_IS_FOLDER (item)) icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else @@ -345,9 +396,9 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); #endif - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_menu_shell_append (menu, menuitem); g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - if (KATZE_IS_ARRAY (item)) + if (KATZE_ITEM_IS_FOLDER (item)) { submenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); @@ -372,13 +423,15 @@ katze_array_action_menu_item_select_cb (GtkWidget* proxy, { GtkWidget* menu; KatzeArray* array; + gboolean handled; menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)); gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)(gtk_widget_destroy), NULL); array = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); - katze_array_action_generate_menu (array_action, array, menu, proxy); + katze_array_action_generate_menu (array_action, array, GTK_MENU_SHELL (menu), proxy); + g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, menu, array, &handled); } static void @@ -387,13 +440,18 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, { GtkWidget* menu; KatzeArray* array; + gboolean handled = FALSE; if (GTK_IS_MENU_ITEM (proxy)) { g_object_set_data (G_OBJECT (proxy), "KatzeItem", array_action->array); katze_array_action_menu_item_select_cb (proxy, array_action); - g_signal_emit (array_action, signals[POPULATE_POPUP], 0, - gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy))); + g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, + gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)), + array_action->array, &handled); + if (!handled) + g_signal_emit (array_action, signals[POPULATE_POPUP], 0, + gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy))); return; } @@ -408,11 +466,15 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, if (!array) array = array_action->array; - katze_array_action_generate_menu (array_action, array, menu, proxy); + katze_array_action_generate_menu (array_action, array, GTK_MENU_SHELL (menu), proxy); - /* populate-popup should only affect the main proxy */ - if (array == array_action->array) - g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); + g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, menu, array, &handled); + if (!handled) + { + /* populate-popup should only affect the main proxy */ + if (array == array_action->array) + g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu); + } #if HAVE_HILDON /* Avoid a bug in GTK+ messing up the initial scrolling position */ @@ -497,7 +559,7 @@ katze_array_action_item_notify_cb (KatzeItem* item, gtk_tool_item_set_tooltip_text (toolitem, katze_item_get_uri (item)); } - else if (!KATZE_IS_ARRAY (item) && !strcmp (property, "uri")) + else if (KATZE_ITEM_IS_BOOKMARK (item) && !strcmp (property, "uri")) { icon = katze_load_cached_icon (katze_item_get_uri (item), GTK_WIDGET (toolitem)); image = gtk_image_new_from_pixbuf (icon); @@ -531,7 +593,7 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); else { - if (KATZE_IS_ARRAY (item)) + if (KATZE_ITEM_IS_FOLDER (item)) icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else @@ -545,7 +607,7 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, GTK_IMAGE_MENU_ITEM (menuitem), TRUE); #endif g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); - if (KATZE_IS_ARRAY (item)) + if (KATZE_ITEM_IS_FOLDER (item)) { GtkWidget* submenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu); @@ -604,13 +666,13 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, uri = katze_item_get_uri (item); desc = katze_item_get_text (item); - if (!KATZE_IS_ARRAY (item) && !uri) + if (KATZE_ITEM_IS_SEPARATOR (item)) return gtk_separator_tool_item_new (); toolitem = gtk_tool_button_new (NULL, ""); g_signal_connect (toolitem, "create-menu-proxy", G_CALLBACK (katze_array_action_proxy_create_menu_proxy_cb), item); - if (KATZE_IS_ARRAY (item)) + if (KATZE_ITEM_IS_FOLDER (item)) icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else diff --git a/katze/katze-arrayaction.h b/katze/katze-arrayaction.h index 2e8c462a..dc2aaa36 100644 --- a/katze/katze-arrayaction.h +++ b/katze/katze-arrayaction.h @@ -48,6 +48,12 @@ GtkToolItem* katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, KatzeItem* item); +void +katze_array_action_generate_menu (KatzeArrayAction* array_action, + KatzeArray* folder, + GtkMenuShell* menu, + GtkWidget* proxy); + G_END_DECLS #endif /* __KATZE_ARRAY_ACTION_H__ */ diff --git a/midori/marshal.list b/midori/marshal.list index 9d0337c8..0b7de0ac 100644 --- a/midori/marshal.list +++ b/midori/marshal.list @@ -1,4 +1,5 @@ BOOLEAN:OBJECT +BOOLEAN:OBJECT,OBJECT BOOLEAN:OBJECT,UINT BOOLEAN:VOID OBJECT:OBJECT From d39148f230630389cc63abec5de3aa4af2b32933 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 14 Sep 2010 22:12:55 +0200 Subject: [PATCH 2961/2970] Re-implement 'Bookmarks' menubar and toolbar button --- midori/midori-browser.c | 60 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a2bf527a..2edca995 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2561,7 +2561,7 @@ midori_browser_get_toolbar_actions (MidoriBrowser* browser) { static const gchar* actions[] = { "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find", - "Fullscreen", "Preferences", "Window", + "Fullscreen", "Preferences", "Window", "Bookmarks", "ReloadStop", "ZoomIn", "TabClose", "ZoomOut", "Separator", "Back", "Forward", "Homepage", "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL }; @@ -2820,6 +2820,45 @@ midori_browser_bookmark_popup (GtkWidget* widget, KatzeItem* item, MidoriBrowser* browser); +static gboolean +_action_bookmarks_populate_folder (GtkAction* action, + GtkMenuShell* menu, + KatzeArray* folder, + MidoriBrowser* browser) +{ + const char* sqlcmd = "SELECT uri, title, app, folder " + "FROM bookmarks WHERE folder = '%q' ORDER BY uri ASC"; + sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); + const gchar* folder_name; + char* sqlcmd_folder; + KatzeArray* bookmarks; + GtkWidget* menuitem; + + if (!db) + return; + + /* Clear items from dummy array here */ + gtk_container_foreach (GTK_CONTAINER (menu), + (GtkCallback)(gtk_widget_destroy), NULL); + + folder_name = katze_item_get_name (KATZE_ITEM (folder)); + sqlcmd_folder = sqlite3_mprintf (sqlcmd, folder_name ? folder_name : ""); + bookmarks = katze_array_from_sqlite (db, sqlcmd_folder); + sqlite3_free (sqlcmd_folder); + if (!bookmarks || katze_array_is_empty (bookmarks)) + { + menuitem = gtk_image_menu_item_new_with_label (_("Empty")); + gtk_widget_set_sensitive (menuitem, FALSE); + gtk_menu_shell_append (menu, menuitem); + gtk_widget_show (menuitem); + return TRUE; + } + + katze_array_action_generate_menu (KATZE_ARRAY_ACTION (action), bookmarks, + menu, GTK_WIDGET (browser)); + return TRUE; +} + static void _action_window_populate_popup (GtkAction* action, GtkMenu* menu, @@ -5246,6 +5285,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -5651,6 +5691,24 @@ midori_browser_init (MidoriBrowser* browser) gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, + "name", "Bookmarks", + "label", _("_Bookmarks"), + "stock-id", STOCK_BOOKMARKS, + "tooltip", _("Show the saved bookmarks"), + "array", browser->proxy_array, /* Use a non-empty array here */ + NULL); + g_object_connect (action, + "signal::populate-folder", + _action_bookmarks_populate_folder, browser, + "signal::activate-item", + midori_bookmarkbar_activate_item, browser, + "signal::activate-item-alt", + midori_bookmarkbar_activate_item_alt, browser, + NULL); + gtk_action_group_add_action_with_accel (browser->action_group, action, ""); + g_object_unref (action); + action = g_object_new (KATZE_TYPE_ARRAY_ACTION, "name", "Tools", "label", _("_Tools"), From dd585da0b086824259a9aef7ee91cf9b0e17e7af Mon Sep 17 00:00:00 2001 From: Xavier Devlamynck Date: Wed, 15 Sep 2010 14:34:03 +0200 Subject: [PATCH 2962/2970] l10n: Updated French (fr) translation to 100% New status: 649 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). --- po/fr.po | 866 +++++++++++++++++++++++++------------------------------ 1 file changed, 385 insertions(+), 481 deletions(-) diff --git a/po/fr.po b/po/fr.po index b6cad174..f3f21824 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,27 +8,27 @@ # Jérôme Geulfucci 2009 # Stéphane Marguet 2009-2010 # Patrick Douart 2010 -# +# msgid "" msgstr "" "Project-Id-Version: midori 0.2.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-05 14:20+0200\n" +"POT-Creation-Date: 2010-09-15 10:11+0000\n" "PO-Revision-Date: 2010-09-05 14:26+0200\n" "Last-Translator: Benjamin Maisonnas \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Navigateur Internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1328 ../midori/main.c:1657 -#: ../midori/main.c:1665 ../midori/main.c:1681 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1322 ../midori/main.c:1651 +#: ../midori/main.c:1659 ../midori/main.c:1675 #: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -52,198 +52,189 @@ msgstr "La valeur « %s » n'est pas valide pour %s" msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:368 ../midori/main.c:472 ../extensions/formhistory.c:440 +#: ../midori/main.c:366 ../midori/main.c:470 ../extensions/formhistory.c:439 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:424 +#: ../midori/main.c:422 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n" -#: ../midori/main.c:455 ../panels/midori-history.c:169 +#: ../midori/main.c:453 ../panels/midori-history.c:169 #: ../panels/midori-history.c:199 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer l'élément de l'historique : %s\n" -#: ../midori/main.c:500 +#: ../midori/main.c:498 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pas pu être enregistrés. %s" -#: ../midori/main.c:528 +#: ../midori/main.c:525 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:566 +#: ../midori/main.c:563 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:586 ../midori/main.c:609 +#: ../midori/main.c:583 ../midori/main.c:606 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:668 ../midori/main.c:908 +#: ../midori/main.c:665 ../midori/main.c:905 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:852 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Aucun fichier de certificat racine disponible. Les certificats SSL ne " -"peuvent être vérifiés." +#: ../midori/main.c:849 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Aucun fichier de certificat racine disponible. Les certificats SSL ne peuvent être vérifiés." -#: ../midori/main.c:942 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori semble s'être interrompu de façon inattendue lors de la dernière " -"utilisation. Si cela se produit de façon répétée, essayez l'une des options " -"suivantes pour résoudre le problème." +#: ../midori/main.c:939 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori semble s'être interrompu de façon inattendue lors de la dernière utilisation. Si cela se produit de façon répétée, essayez l'une des options suivantes pour résoudre le problème." -#: ../midori/main.c:957 +#: ../midori/main.c:954 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:961 +#: ../midori/main.c:958 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:966 +#: ../midori/main.c:963 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1206 ../midori/main.c:1952 +#: ../midori/main.c:1202 ../midori/main.c:1946 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pas pu être chargée : %s\n" -#: ../midori/main.c:1328 +#: ../midori/main.c:1322 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1347 +#: ../midori/main.c:1341 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1378 +#: ../midori/main.c:1372 #, c-format msgid "Snapshot saved to: %s\n" msgstr "Capture enregistrée sous : %s\n" -#: ../midori/main.c:1550 +#: ../midori/main.c:1544 msgid "Run ADDRESS as a web application" msgstr "Lancer l'ADRESSE comme une application internet" -#: ../midori/main.c:1550 +#: ../midori/main.c:1544 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1553 +#: ../midori/main.c:1547 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1553 +#: ../midori/main.c:1547 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1556 +#: ../midori/main.c:1550 msgid "Show a diagnostic dialog" msgstr "Afficher une fenêtre de diagnostic" -#: ../midori/main.c:1558 +#: ../midori/main.c:1552 msgid "Run the specified filename as javascript" msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1561 +#: ../midori/main.c:1555 msgid "Take a snapshot of the specified URI" msgstr "Prendre une capture de l'URI spécifiée" -#: ../midori/main.c:1564 +#: ../midori/main.c:1558 msgid "Execute the specified command" msgstr "Exécuter la commande spécifiée" -#: ../midori/main.c:1566 +#: ../midori/main.c:1560 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1568 +#: ../midori/main.c:1562 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1570 +#: ../midori/main.c:1564 msgid "Block URIs according to regular expression PATTERN" msgstr "Bloquer les URIs conformément au MODÈLE d'expression régulière" -#: ../midori/main.c:1570 +#: ../midori/main.c:1564 msgid "PATTERN" msgstr "MODÈLE" #. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1574 +#: ../midori/main.c:1568 msgid "Reset Midori after SECONDS seconds of inactivity" msgstr "Réinitialiser Midori après SECONDES secondes d'inactivité" -#: ../midori/main.c:1574 +#: ../midori/main.c:1568 msgid "SECONDS" msgstr "SECONDES" -#: ../midori/main.c:1654 +#: ../midori/main.c:1648 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1682 +#: ../midori/main.c:1676 msgid "Please report comments, suggestions and bugs to:" -msgstr "" -"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" +msgstr "Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1684 +#: ../midori/main.c:1678 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1801 +#: ../midori/main.c:1795 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1849 +#: ../midori/main.c:1843 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1904 +#: ../midori/main.c:1898 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1925 +#: ../midori/main.c:1919 #, c-format msgid "Bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/main.c:1967 +#: ../midori/main.c:1961 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pas pu être chargée : %s\n" -#: ../midori/main.c:1980 +#: ../midori/main.c:1974 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1994 +#: ../midori/main.c:1988 msgid "The following errors occured:" msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:2010 +#: ../midori/main.c:2004 msgid "_Ignore" msgstr "_Ignorer" @@ -260,16 +251,16 @@ msgstr "Document mal formé." msgid "Unrecognized bookmark format." msgstr "Format de signets inconnus." -#: ../midori/midori-array.c:719 +#: ../midori/midori-array.c:716 msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4889 -#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:4932 msgid "Reload the current page" msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4892 +#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:4929 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page courante" @@ -308,29 +299,28 @@ msgstr "Modifier le signet" msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:961 +#: ../midori/midori-browser.c:779 ../midori/midori-searchaction.c:958 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:975 +#: ../midori/midori-browser.c:798 ../midori/midori-searchaction.c:972 #: ../extensions/feed-panel/main.c:377 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:830 ../midori/midori-browser.c:4046 msgid "_Folder:" msgstr "_Dossier :" #: ../midori/midori-browser.c:840 ../midori/midori-browser.c:934 -#: ../midori/midori-browser.c:4013 ../midori/midori-browser.c:4042 +#: ../midori/midori-browser.c:4051 ../midori/midori-browser.c:4079 msgid "Toplevel folder" msgstr "Dossier supérieur" #: ../midori/midori-browser.c:872 -#, fuzzy msgid "Add to _Speed Dial" -msgstr "Ajouter à la page d'appel rapi_de" +msgstr "Ajouter à la page d'appel rapide" #: ../midori/midori-browser.c:885 msgid "Show in the tool_bar" @@ -350,184 +340,172 @@ msgstr "Il n'y a pas assez d'espace libre pour télécharger \"%s\"." msgid "The file needs %s but only %s are left." msgstr "Le fichier à besoin de %s, mais seulement %s est disponible." -#: ../midori/midori-browser.c:1040 ../midori/midori-browser.c:4050 -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:1045 ../midori/midori-browser.c:4087 +#: ../midori/midori-browser.c:4122 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1433 +#: ../midori/midori-browser.c:1438 msgid "Save file" msgstr "Enregistrer le fichier" -#: ../midori/midori-browser.c:2150 +#: ../midori/midori-browser.c:2154 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2228 +#: ../midori/midori-browser.c:2232 msgid "" -"To use the above URI open a news aggregator. There is usually a menu or " -"button \"New Subscription\", \"New News Feed\" or similar.\n" -"Alternatively go to Preferences, Applications in Midori, and select a News " -"Aggregator. Next time you click the news feed icon, it will be added " -"automatically." -msgstr "" -"Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a " -"habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS " -"\" ou similaires. \\ nAlternativement allez dans Préférences, Applications " -"de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous " -"cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "Pour utiliser l'URI ci-dessus ouvrez un agrégateur de flux. Il y a habituellement un menu ou un bouton \"Nouvel abonnement\", \"Nouvelles RSS \" ou similaires. \\ nAlternativement allez dans Préférences, Applications de Midori, et sélectionnez un agrégateur de flux. La prochaine fois que vous cliquerez sur l'icône de fil de nouvelles, il sera ajouté automatiquement." -#: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 +#: ../midori/midori-browser.c:2238 ../extensions/feed-panel/main.c:365 msgid "New feed" msgstr "Nouveau flux" -#: ../midori/midori-browser.c:2277 ../midori/midori-browser.c:4954 -#: ../panels/midori-bookmarks.c:406 +#: ../midori/midori-browser.c:2281 ../midori/midori-browser.c:4991 +#: ../panels/midori-bookmarks.c:400 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3283 ../midori/sokoke.c:398 +#: ../midori/midori-browser.c:2850 ../midori/midori-searchaction.c:481 +msgid "Empty" +msgstr "Vide" + +#: ../midori/midori-browser.c:3323 ../midori/sokoke.c:398 #: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 #: ../midori/sokoke.c:476 msgid "Could not run external program." msgstr "Impossible de lancer le programme externe." -#: ../midori/midori-browser.c:3526 ../midori/midori-browser.c:5344 +#: ../midori/midori-browser.c:3566 ../midori/midori-browser.c:5382 #, c-format msgid "Failed to insert new history item: %s\n" msgstr "Impossible d'ajouter l'élément de l'historique : %s\n" -#: ../midori/midori-browser.c:3843 ../panels/midori-bookmarks.c:721 -#: ../panels/midori-history.c:734 +#: ../midori/midori-browser.c:3881 ../panels/midori-bookmarks.c:713 +#: ../panels/midori-history.c:736 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:3850 ../panels/midori-bookmarks.c:727 -#: ../panels/midori-history.c:740 ../extensions/feed-panel/feed-panel.c:544 +#: ../midori/midori-browser.c:3888 ../panels/midori-bookmarks.c:719 +#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:542 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:3853 ../midori/midori-view.c:2338 -#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:729 -#: ../panels/midori-history.c:742 ../extensions/feed-panel/feed-panel.c:546 +#: ../midori/midori-browser.c:3891 ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:744 ../extensions/feed-panel/feed-panel.c:544 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3931 +#: ../midori/midori-browser.c:3969 msgid "Arora" msgstr "Arora" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:3970 msgid "Kazehakase" msgstr "Kazehakase" -#: ../midori/midori-browser.c:3933 +#: ../midori/midori-browser.c:3971 msgid "Opera" msgstr "Opera" -#: ../midori/midori-browser.c:3934 +#: ../midori/midori-browser.c:3972 msgid "Konqueror" msgstr "Konqueror" -#: ../midori/midori-browser.c:3935 +#: ../midori/midori-browser.c:3973 msgid "Epiphany" msgstr "Epiphany" -#: ../midori/midori-browser.c:3959 +#: ../midori/midori-browser.c:3997 msgid "Import bookmarks..." msgstr "Importer des signets..." -#: ../midori/midori-browser.c:3962 ../midori/midori-browser.c:4959 +#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:4996 msgid "_Import bookmarks" msgstr "_Importer des signets" -#: ../midori/midori-browser.c:3973 +#: ../midori/midori-browser.c:4011 msgid "_Application:" msgstr "_Application :" -#: ../midori/midori-browser.c:4000 ../midori/midori-browser.c:5072 +#: ../midori/midori-browser.c:4038 ../midori/midori-browser.c:5109 #: ../midori/midori-websettings.c:226 ../midori/midori-websettings.c:317 #: ../katze/katze-utils.c:696 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:4061 +#: ../midori/midori-browser.c:4098 msgid "Failed to import bookmarks" msgstr "Impossible d'importer les signets" -#: ../midori/midori-browser.c:4102 +#: ../midori/midori-browser.c:4139 msgid "Failed to export bookmarks" msgstr "Impossible d'exporter les signets" -#: ../midori/midori-browser.c:4155 +#: ../midori/midori-browser.c:4192 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible de supprimer l'historique : %s\n" -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4200 #, c-format msgid "Failed to clear search history: %s\n" msgstr "Impossible de supprimer l'historique de recherche : %s\n" #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4270 +#: ../midori/midori-browser.c:4307 msgid "Clear Private Data" msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:4274 +#: ../midori/midori-browser.c:4311 msgid "_Clear private data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4288 +#: ../midori/midori-browser.c:4325 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:4298 ../midori/midori-preferences.c:533 +#: ../midori/midori-browser.c:4335 ../midori/midori-preferences.c:532 #: ../panels/midori-history.c:114 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4340 msgid "Cookies" msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:4308 +#: ../midori/midori-browser.c:4345 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:4313 +#: ../midori/midori-browser.c:4350 msgid "Website icons" msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:4318 ../midori/sokoke.c:1314 +#: ../midori/midori-browser.c:4355 ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Onglets _fermés" -#: ../midori/midori-browser.c:4323 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4360 ../extensions/web-cache.c:462 msgid "Web Cache" msgstr "Cache internet" -#: ../midori/midori-browser.c:4331 +#: ../midori/midori-browser.c:4368 msgid "Clear private data when _quitting Midori" msgstr "Effacer les informations privées en _quittant Midori" -#: ../midori/midori-browser.c:4472 +#: ../midori/midori-browser.c:4509 msgid "A lightweight web browser." msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:4474 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou " -"le modifier selon les termes de la GNU Lesser General Public License telle " -"que publiée par la Free Software Foundation; soit la version 2.1 de la " -"licence ou, à votre choix, toutes versions ultérieures." +#: ../midori/midori-browser.c:4511 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Cette bibliothèque est un logiciel libre, vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU Lesser General Public License telle que publiée par la Free Software Foundation; soit la version 2.1 de la licence ou, à votre choix, toutes versions ultérieures." -#: ../midori/midori-browser.c:4493 +#: ../midori/midori-browser.c:4530 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -536,500 +514,506 @@ msgstr "" "Pascal Gervais \n" "Jérôme Geulfucci " -#: ../midori/midori-browser.c:4802 +#: ../midori/midori-browser.c:4839 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:4804 ../midori/sokoke.c:1315 +#: ../midori/midori-browser.c:4841 ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/midori-browser.c:4805 +#: ../midori/midori-browser.c:4842 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:4808 +#: ../midori/midori-browser.c:4845 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:4810 +#: ../midori/midori-browser.c:4847 msgid "P_rivate Browsing" msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:4811 +#: ../midori/midori-browser.c:4848 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:4815 +#: ../midori/midori-browser.c:4852 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:4818 +#: ../midori/midori-browser.c:4855 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:4820 +#: ../midori/midori-browser.c:4857 msgid "Add to Speed _dial" msgstr "Ajouter à la page d'appel rapi_de" -#: ../midori/midori-browser.c:4821 +#: ../midori/midori-browser.c:4858 msgid "Add shortcut to speed dial" msgstr "Ajouter un raccourci à la page d'appel rapide" -#: ../midori/midori-browser.c:4823 +#: ../midori/midori-browser.c:4860 msgid "Add Shortcut to the _desktop" msgstr "Ajouter un raccourci sur le _bureau" -#: ../midori/midori-browser.c:4824 +#: ../midori/midori-browser.c:4861 msgid "Add shortcut to the desktop" msgstr "Ajouter un raccourci sur le bureau" -#: ../midori/midori-browser.c:4826 +#: ../midori/midori-browser.c:4863 msgid "Subscribe to News _feed" msgstr "Souscrire au flux de _nouvelles" -#: ../midori/midori-browser.c:4827 +#: ../midori/midori-browser.c:4864 msgid "Subscribe to this news feed" msgstr "Souscrire à ce flux de _nouvelles" -#: ../midori/midori-browser.c:4832 +#: ../midori/midori-browser.c:4869 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:4833 +#: ../midori/midori-browser.c:4870 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:4835 +#: ../midori/midori-browser.c:4872 msgid "C_lose Window" msgstr "Fer_mer la fenêtre" -#: ../midori/midori-browser.c:4836 +#: ../midori/midori-browser.c:4873 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:4839 +#: ../midori/midori-browser.c:4876 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:4842 +#: ../midori/midori-browser.c:4879 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:4844 +#: ../midori/midori-browser.c:4881 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:4848 +#: ../midori/midori-browser.c:4885 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../midori/midori-browser.c:4851 +#: ../midori/midori-browser.c:4888 msgid "Redo the last modification" msgstr "Refaire la dernière modification" -#: ../midori/midori-browser.c:4855 +#: ../midori/midori-browser.c:4892 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:4858 ../midori/midori-browser.c:4861 +#: ../midori/midori-browser.c:4895 ../midori/midori-browser.c:4898 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:4864 +#: ../midori/midori-browser.c:4901 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:4867 +#: ../midori/midori-browser.c:4904 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:4870 +#: ../midori/midori-browser.c:4907 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:4873 +#: ../midori/midori-browser.c:4910 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:4875 +#: ../midori/midori-browser.c:4912 msgid "Find _Next" msgstr "Rechercher le sui_vant" -#: ../midori/midori-browser.c:4876 +#: ../midori/midori-browser.c:4913 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:4878 +#: ../midori/midori-browser.c:4915 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:4879 +#: ../midori/midori-browser.c:4916 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:4883 +#: ../midori/midori-browser.c:4920 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:4885 +#: ../midori/midori-browser.c:4922 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:4886 +#: ../midori/midori-browser.c:4923 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:4898 +#: ../midori/midori-browser.c:4935 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:4901 +#: ../midori/midori-browser.c:4938 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:4904 +#: ../midori/midori-browser.c:4941 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:4905 +#: ../midori/midori-browser.c:4942 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:4907 +#: ../midori/midori-browser.c:4944 msgid "View So_urce" msgstr "Afficher le code so_urce" -#: ../midori/midori-browser.c:4908 +#: ../midori/midori-browser.c:4945 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:4911 +#: ../midori/midori-browser.c:4948 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:4914 +#: ../midori/midori-browser.c:4951 msgid "Scroll _Left" msgstr "Défilement à _gauche" -#: ../midori/midori-browser.c:4915 +#: ../midori/midori-browser.c:4952 msgid "Scroll to the left" msgstr "Défilement vers la gauche" -#: ../midori/midori-browser.c:4917 +#: ../midori/midori-browser.c:4954 msgid "Scroll _Down" msgstr "Défilement en _bas" -#: ../midori/midori-browser.c:4918 +#: ../midori/midori-browser.c:4955 msgid "Scroll down" msgstr "Défilement vers le bas" -#: ../midori/midori-browser.c:4920 +#: ../midori/midori-browser.c:4957 msgid "Scroll _Up" msgstr "Défilement en _haut" -#: ../midori/midori-browser.c:4921 +#: ../midori/midori-browser.c:4958 msgid "Scroll up" msgstr "Défilement vers le haut" -#: ../midori/midori-browser.c:4923 +#: ../midori/midori-browser.c:4960 msgid "Scroll _Right" msgstr "Défilement à _droite" -#: ../midori/midori-browser.c:4924 +#: ../midori/midori-browser.c:4961 msgid "Scroll to the right" msgstr "Défilement vers la droite" -#: ../midori/midori-browser.c:4927 +#: ../midori/midori-browser.c:4964 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:4930 +#: ../midori/midori-browser.c:4967 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:4933 +#: ../midori/midori-browser.c:4970 msgid "Go forward to the next page" msgstr "Aller à la page suivante" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4937 +#: ../midori/midori-browser.c:4974 msgid "Go to the previous sub-page" msgstr "Aller à la sous-page précédente" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:4941 +#: ../midori/midori-browser.c:4978 msgid "Go to the next sub-page" msgstr "Aller à la sous-page suivante" -#: ../midori/midori-browser.c:4944 +#: ../midori/midori-browser.c:4981 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:4946 +#: ../midori/midori-browser.c:4983 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:4947 +#: ../midori/midori-browser.c:4984 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:4949 +#: ../midori/midori-browser.c:4986 msgid "Undo _Close Tab" msgstr "A_nnuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:4950 +#: ../midori/midori-browser.c:4987 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:4956 +#: ../midori/midori-browser.c:4993 msgid "Add a new _folder" msgstr "Ajouter un nouveau _dossier" -#: ../midori/midori-browser.c:4957 +#: ../midori/midori-browser.c:4994 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:4962 +#: ../midori/midori-browser.c:4999 msgid "_Export bookmarks" msgstr "_Exporter des signets" -#: ../midori/midori-browser.c:4965 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5002 ../midori/midori-searchaction.c:490 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:4966 +#: ../midori/midori-browser.c:5003 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:4969 +#: ../midori/midori-browser.c:5006 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:4970 +#: ../midori/midori-browser.c:5007 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:4974 +#: ../midori/midori-browser.c:5011 msgid "_Inspect Page" msgstr "_Inspecter la page" -#: ../midori/midori-browser.c:4975 +#: ../midori/midori-browser.c:5012 msgid "Inspect page details and access developer tools..." msgstr "Inspecter les détails de la page et accéder aux outils développeur..." -#: ../midori/midori-browser.c:4980 +#: ../midori/midori-browser.c:5017 msgid "_Previous Tab" msgstr "Onglet _précédent" -#: ../midori/midori-browser.c:4981 +#: ../midori/midori-browser.c:5018 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:4983 +#: ../midori/midori-browser.c:5020 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:4984 +#: ../midori/midori-browser.c:5021 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:4986 +#: ../midori/midori-browser.c:5023 msgid "Focus _Current Tab" msgstr "_Focaliser l'onglet actuel" -#: ../midori/midori-browser.c:4987 +#: ../midori/midori-browser.c:5024 msgid "Focus the current tab" msgstr "Focaliser l'onglet actuel" -#: ../midori/midori-browser.c:4989 -#, fuzzy +#: ../midori/midori-browser.c:5026 msgid "Minimize _Current Tab" -msgstr "_Minimiser l'onglet" +msgstr "Minimiser l'onglet _actuel" -#: ../midori/midori-browser.c:4990 -#, fuzzy +#: ../midori/midori-browser.c:5027 msgid "Minimize the current tab" -msgstr "Fermer l'onglet actuel" +msgstr "Minimiser l'onglet actuel" -#: ../midori/midori-browser.c:4992 +#: ../midori/midori-browser.c:5029 msgid "_Duplicate Current Tab" msgstr "_Dupliquer l'onglet actif" -#: ../midori/midori-browser.c:4993 +#: ../midori/midori-browser.c:5030 msgid "Duplicate the current tab" msgstr "Duplique l'onglet actif" -#: ../midori/midori-browser.c:4995 +#: ../midori/midori-browser.c:5032 msgid "Close Ot_her Tabs" msgstr "Fermer les _autres onglets" -#: ../midori/midori-browser.c:4996 +#: ../midori/midori-browser.c:5033 msgid "Close all tabs except the current tab" msgstr "Fermer tous les onglets sauf l'onglet actuel" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:5035 msgid "Open last _session" msgstr "Ouvrir la _dernière session" -#: ../midori/midori-browser.c:4999 +#: ../midori/midori-browser.c:5036 msgid "Open the tabs saved in the last session" msgstr "Ouvrir les onglets enregistrés dans la dernière session" -#: ../midori/midori-browser.c:5001 +#: ../midori/midori-browser.c:5038 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:5003 +#: ../midori/midori-browser.c:5040 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:5004 +#: ../midori/midori-browser.c:5041 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:5006 +#: ../midori/midori-browser.c:5043 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:5007 +#: ../midori/midori-browser.c:5044 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:5009 +#: ../midori/midori-browser.c:5046 msgid "_Report a Bug" msgstr "Signaler une _anomalie" -#: ../midori/midori-browser.c:5010 +#: ../midori/midori-browser.c:5047 msgid "Open Midori's bug tracker" msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:5013 +#: ../midori/midori-browser.c:5050 msgid "Show information about the program" msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:5021 +#: ../midori/midori-browser.c:5058 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:5022 +#: ../midori/midori-browser.c:5059 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:5025 +#: ../midori/midori-browser.c:5062 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:5026 +#: ../midori/midori-browser.c:5063 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:5066 msgid "Side_panel" msgstr "Panneau la_téral" -#: ../midori/midori-browser.c:5030 +#: ../midori/midori-browser.c:5067 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:5033 +#: ../midori/midori-browser.c:5070 msgid "_Bookmarkbar" msgstr "Barre des _signets" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:5071 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:5037 +#: ../midori/midori-browser.c:5074 msgid "_Transferbar" msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:5038 +#: ../midori/midori-browser.c:5075 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:5041 +#: ../midori/midori-browser.c:5078 msgid "_Statusbar" msgstr "Barre d'ét_at" -#: ../midori/midori-browser.c:5042 +#: ../midori/midori-browser.c:5079 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:5050 +#: ../midori/midori-browser.c:5087 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:5053 ../midori/midori-websettings.c:220 +#: ../midori/midori-browser.c:5090 ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:5094 msgid "Japanese (SHIFT__JIS)" msgstr "Japonais (SHIFT__JIS)" -#: ../midori/midori-browser.c:5060 ../midori/midori-websettings.c:222 +#: ../midori/midori-browser.c:5097 ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Coréen (EUC-KR)" -#: ../midori/midori-browser.c:5063 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5100 ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:5066 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5103 ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5069 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5106 ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:5588 +#: ../midori/midori-browser.c:5625 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:5595 +#: ../midori/midori-browser.c:5632 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:5634 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:5621 +#: ../midori/midori-browser.c:5658 msgid "_Web Search..." msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:5660 msgid "Run a web search" msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:5644 +#: ../midori/midori-browser.c:5681 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:5659 +#: ../midori/midori-browser.c:5696 ../midori/sokoke.c:1304 +msgid "_Bookmarks" +msgstr "_Signets" + +#: ../midori/midori-browser.c:5698 +msgid "Show the saved bookmarks" +msgstr "Afficher les signets sauvegardés" + +#: ../midori/midori-browser.c:5714 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5731 msgid "_Window" msgstr "Fe_nêtre" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5733 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" -#: ../midori/midori-browser.c:5692 +#: ../midori/midori-browser.c:5747 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:5694 +#: ../midori/midori-browser.c:5749 msgid "Menu" msgstr "Menu" -#: ../midori/midori-browser.c:6262 +#: ../midori/midori-browser.c:6314 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" @@ -1049,13 +1033,13 @@ msgstr "Rechercher %s" msgid "Search with %s" msgstr "Rechercher avec %s" -#: ../midori/midori-locationaction.c:1307 +#: ../midori/midori-locationaction.c:1305 #, c-format msgid "Failed to execute database statement\n" msgstr "Impossible d'exécuter l'instruction de base de données\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1363 +#: ../midori/midori-locationaction.c:1361 msgid "Paste and p_roceed" msgstr "Coller et continue_r" @@ -1064,7 +1048,7 @@ msgid "Detach chosen panel from the window" msgstr "Détacher le panneau choisi de la fenêtre" #: ../midori/midori-panel.c:424 ../midori/midori-panel.c:426 -#: ../midori/midori-panel.c:613 ../midori/midori-panel.c:616 +#: ../midori/midori-panel.c:596 ../midori/midori-panel.c:599 msgid "Align sidepanel to the right" msgstr "Aligner le panneau latéral sur la droite" @@ -1072,11 +1056,11 @@ msgstr "Aligner le panneau latéral sur la droite" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-panel.c:614 ../midori/midori-panel.c:617 +#: ../midori/midori-panel.c:597 ../midori/midori-panel.c:600 msgid "Align sidepanel to the left" msgstr "Aligner le panneau latéral sur la gauche" -#: ../midori/midori-panel.c:771 +#: ../midori/midori-panel.c:754 msgid "Hide operating controls" msgstr "Cacher les contrôles" @@ -1295,9 +1279,7 @@ msgstr "Moteurs de recherche dans la complétion" #: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" -msgstr "" -"Indique s'il faut afficher les moteurs de recherche dans les résultats de " -"complétion de la barre d'adresse" +msgstr "Indique s'il faut afficher les moteurs de recherche dans les résultats de complétion de la barre d'adresse" #: ../midori/midori-websettings.c:546 msgid "Toolbar Items" @@ -1337,8 +1319,7 @@ msgstr "Ouvrir les panneaux dans une fenêtre séparée" #: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" -msgstr "" -"Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" +msgstr "Indique s'il faut toujours ouvrir les panneaux dans des fenêtres séparées" #: ../midori/midori-websettings.c:613 msgid "When Midori starts:" @@ -1387,9 +1368,7 @@ msgstr "Demander le dossier de destination" #: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" -msgstr "" -"Indique s'il faut demander le dossier de destination quand un fichier est " -"téléchargé." +msgstr "Indique s'il faut demander le dossier de destination quand un fichier est téléchargé." #: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" @@ -1477,9 +1456,7 @@ msgstr "Un clic milieu ouvre la sélection" #: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" -msgstr "" -"Charger l'addresse de la sélection avec un clic du bouton central de la " -"souris" +msgstr "Charger l'addresse de la sélection avec un clic du bouton central de la souris" #: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" @@ -1495,9 +1472,7 @@ msgstr "Ouvrir les onglets à côté de l'onglet actif" #: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actif ou " -"après le dernier" +msgstr "Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actif ou après le dernier" #: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" @@ -1505,8 +1480,7 @@ msgstr "Ouvrir les fenêtre intempestives dans des onglets" #: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" -msgstr "" -"Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" +msgstr "Indique s'il faut ouvrir les fenêtres intempestives (popups) dans des onglets" #: ../midori/midori-websettings.c:850 ../extensions/statusbar-features.c:88 msgid "Load images automatically" @@ -1570,8 +1544,7 @@ msgstr "Chercher pendant la saisie" #: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" -msgstr "" -"Indique s'il faut chercher automatiquement dans la page pendant la saisie" +msgstr "Indique s'il faut chercher automatiquement dans la page pendant la saisie" #: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" @@ -1579,9 +1552,7 @@ msgstr "Défilement cinétique" #: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" -msgstr "" -"Indique si le défilement doit se déplacer cinétiquement en fonction de la " -"vitesse" +msgstr "Indique si le défilement doit se déplacer cinétiquement en fonction de la vitesse" #: ../midori/midori-websettings.c:966 msgid "Accept cookies" @@ -1597,8 +1568,7 @@ msgstr "Âge maximal des cookies" #: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" -msgstr "" -"Le nombre maximal de jours durant lesquels conserver les fichiers témoins" +msgstr "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" #: ../midori/midori-websettings.c:986 msgid "Maximum history age" @@ -1614,8 +1584,7 @@ msgstr "Se souvenir des derniers fichiers téléchargés" #: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" -msgstr "" -"Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" +msgstr "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" #: ../midori/midori-websettings.c:1013 msgid "Proxy server" @@ -1655,13 +1624,8 @@ msgid "Preferred languages" msgstr "Langues préférés" #: ../midori/midori-websettings.c:1074 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Une liste des langues préférées séparées par une virgule pour le rendu des " -"pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;" -"q=0.667\"" +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Une liste des langues préférées séparées par une virgule pour le rendu des pages multilingues, par exemple \"de\", \"fr,en\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" #: ../midori/midori-websettings.c:1089 msgid "Clear private data" @@ -1701,76 +1665,76 @@ msgstr "Non trouvé - %s" msgid "Send a message to %s" msgstr "Envoyer un message à %s" -#: ../midori/midori-view.c:2061 ../midori/midori-view.c:2446 +#: ../midori/midori-view.c:2060 ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspecter l'élé_ment" -#: ../midori/midori-view.c:2113 ../midori/midori-view.c:2183 +#: ../midori/midori-view.c:2112 ../midori/midori-view.c:2182 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:2117 +#: ../midori/midori-view.c:2116 msgid "Open Link in _Foreground Tab" msgstr "Ouvrir le lien en a_vant plan" -#: ../midori/midori-view.c:2118 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Background Tab" msgstr "Ouvrir le lien en a_rrière plan" -#: ../midori/midori-view.c:2121 ../midori/midori-view.c:2190 +#: ../midori/midori-view.c:2120 ../midori/midori-view.c:2189 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:2124 +#: ../midori/midori-view.c:2123 msgid "Open Link as Web A_pplication" msgstr "Ouvrir le lien comme une appli_cation internet" -#: ../midori/midori-view.c:2127 +#: ../midori/midori-view.c:2126 msgid "Copy Link de_stination" msgstr "Copier l'adre_sse du lien" -#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2129 ../midori/midori-view.c:2201 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:2131 ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2130 ../midori/midori-view.c:2195 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:2135 ../midori/midori-view.c:2165 -#: ../midori/midori-view.c:2207 +#: ../midori/midori-view.c:2134 ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2206 msgid "Download with Download _Manager" msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:2144 +#: ../midori/midori-view.c:2143 msgid "Open _Image in New Tab" msgstr "Ouvrir l'image dans un _nouvel onglet" -#: ../midori/midori-view.c:2147 +#: ../midori/midori-view.c:2146 msgid "Copy Image _Address" msgstr "Copier l'_adresse de l'image" -#: ../midori/midori-view.c:2150 +#: ../midori/midori-view.c:2149 msgid "Save I_mage" msgstr "Enregistrer l'i_mage" -#: ../midori/midori-view.c:2151 +#: ../midori/midori-view.c:2150 msgid "Download I_mage" msgstr "Téléc_harger l'image" -#: ../midori/midori-view.c:2158 +#: ../midori/midori-view.c:2157 msgid "Copy Video _Address" msgstr "Copier l'_adresse de la vidéo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2160 msgid "Save _Video" msgstr "Enregistrer la _vidéo" -#: ../midori/midori-view.c:2161 +#: ../midori/midori-view.c:2160 msgid "Download _Video" msgstr "Télécharger la _vidéo" -#: ../midori/midori-view.c:2224 +#: ../midori/midori-view.c:2223 msgid "Search _with" msgstr "Rechercher _avec" @@ -1870,11 +1834,8 @@ msgid "Page loading delayed" msgstr "Chargement de la page différé" #: ../midori/midori-view.c:3619 -#, fuzzy msgid "Loading delayed either due to a recent crash or startup preferences." -msgstr "" -"Chargement différé, soit en raison d'un récent incident, soit des " -"préférences de démarrage." +msgstr "Chargement différé, soit en raison d'un incident récent soit des préférences de démarrage." #: ../midori/midori-view.c:3620 msgid "Load Page" @@ -1960,8 +1921,7 @@ msgstr "Famille de la police utilisée pour afficher les textes à largeur fixe" #: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" -msgstr "" -"La taille de la police utilisée pour afficher les textes à largeur fixe" +msgstr "La taille de la police utilisée pour afficher les textes à largeur fixe" #: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" @@ -1990,108 +1950,98 @@ msgstr "Autorisés les scripts à ouvrir des popups" #: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives " -"(popups) automatiquement" +msgstr "Indique si les scripts sont autorisés à ouvrir des fenêtres intempestives (popups) automatiquement" #: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Vérificateur d'orthographe" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:424 msgid "Enable Spell Checking" msgstr "Activer la vérification de l'orthographe" -#: ../midori/midori-preferences.c:426 +#: ../midori/midori-preferences.c:425 msgid "Enable spell checking while typing" msgstr "Activer la vérification de l'orthographe lors de la saisie" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:427 msgid "Spelling dictionaries:" msgstr "Dictionnaires d'orthographe :" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:432 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Une liste de langues séparées par des virgules, utilisées par le " -"vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »" +#: ../midori/midori-preferences.c:431 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Une liste de langues séparées par des virgules, utilisées par le vérificateur d'ortographe. Par example « fr_FR,de_DE,en_US »" #. Page "Interface" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:439 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:448 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:470 msgid "Applications" msgstr "Applications" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:471 msgid "External applications" msgstr "Applications externes" #. Page "Network" -#: ../midori/midori-preferences.c:488 ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:487 ../midori/midori-preferences.c:488 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:494 msgid "Hostname" msgstr "Nom de l'hôte" #. Page "Privacy" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Fichiers témoins" -#: ../midori/midori-preferences.c:524 ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:523 ../midori/midori-preferences.c:537 msgid "days" msgstr "jours" -#: ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vide" - -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:942 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "_Icône :" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "_Identifiant :" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1231 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1332 msgid "Use as _default" msgstr "Par dé_faut" @@ -2099,10 +2049,6 @@ msgstr "Par dé_faut" msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:1304 -msgid "_Bookmarks" -msgstr "_Signets" - #: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Ajouter un s_ignet" @@ -2144,27 +2090,27 @@ msgid "New _Folder" msgstr "Nouveau dossier" #. i18n: A panel at the bottom, to search text in pages -#: ../toolbars/midori-findbar.c:201 +#: ../toolbars/midori-findbar.c:213 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../toolbars/midori-findbar.c:233 +#: ../toolbars/midori-findbar.c:245 msgid "Previous" msgstr "Précedent" -#: ../toolbars/midori-findbar.c:239 +#: ../toolbars/midori-findbar.c:251 msgid "Next" msgstr "Suivant" -#: ../toolbars/midori-findbar.c:243 +#: ../toolbars/midori-findbar.c:255 msgid "Match Case" msgstr "Sensible à la casse" -#: ../toolbars/midori-findbar.c:252 +#: ../toolbars/midori-findbar.c:264 msgid "Highlight Matches" msgstr "Surligner les résultats" -#: ../toolbars/midori-findbar.c:263 +#: ../toolbars/midori-findbar.c:275 msgid "Close Findbar" msgstr "Fermer la barre de recherche" @@ -2202,36 +2148,36 @@ msgstr "Les transferts seront annulés si Midori se ferme." msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:275 +#: ../panels/midori-bookmarks.c:269 #, c-format msgid "Failed to add bookmark item: %s\n" msgstr "Échec de l'ajout du signet : %s\n" -#: ../panels/midori-bookmarks.c:414 +#: ../panels/midori-bookmarks.c:408 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:422 +#: ../panels/midori-bookmarks.c:416 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:436 +#: ../panels/midori-bookmarks.c:430 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: ../panels/midori-bookmarks.c:568 ../panels/midori-history.c:569 +#: ../panels/midori-bookmarks.c:562 ../panels/midori-history.c:572 msgid "Separator" msgstr "Séparateur" -#: ../panels/midori-console.c:87 +#: ../panels/midori-console.c:90 msgid "Console" msgstr "Console" -#: ../panels/midori-console.c:361 +#: ../panels/midori-console.c:351 msgid "Copy _All" msgstr "Tout copier" -#: ../panels/midori-console.c:362 +#: ../panels/midori-console.c:352 msgid "Copy All" msgstr "Copie tout" @@ -2345,13 +2291,8 @@ msgstr "Configurer les filtres de publicité" #: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte " -"et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de " -"listes à %s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Tapez l'adresse d'une liste de filtre préconfigurés dans l'entrée de texte et cliquez sur « Ajouter » pour l'ajouter à la liste. Vous trouverez plus de listes à %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2373,11 +2314,11 @@ msgstr "_Bloquer l'image" msgid "Bl_ock link" msgstr "B_loquer le lien" -#: ../extensions/adblock.c:1494 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Bloqueur de publicités" -#: ../extensions/adblock.c:1495 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Bloquer les publicités en fonction d'une liste de filtres" @@ -2413,17 +2354,14 @@ msgid "The file %s will be permanently deleted." msgstr "Le fichier « %s » sera définitivement supprimé." #: ../extensions/addons.c:377 ../extensions/addons.c:454 - msgid "Open in Text Editor" msgstr "Ouvrir dans l'éditeur de texte" #: ../extensions/addons.c:379 ../extensions/addons.c:463 - msgid "Open Target Folder" msgstr "Ouvrir le _dossier de destination" #: ../extensions/addons.c:445 - msgid "Add new addon" msgstr "Ajouter une extension" @@ -2438,27 +2376,26 @@ msgstr "Supprimer l'extension sélectionnée" #: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" -msgstr "" -"La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" +msgstr "La configuration de l'extension « %s » n'a pas pu être enregistrée: %s\n" -#: ../extensions/addons.c:1421 ../extensions/addons.c:1586 +#: ../extensions/addons.c:1421 ../extensions/addons.c:1583 msgid "User addons" msgstr "Extensions utilisateur" -#: ../extensions/addons.c:1543 +#: ../extensions/addons.c:1542 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Impossible de surveiller le dossier « %s » : %s" -#: ../extensions/addons.c:1587 +#: ../extensions/addons.c:1584 msgid "Support for userscripts and userstyles" msgstr "Support des scripts et styles utilisateur" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Onglets colorés" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" @@ -2472,12 +2409,8 @@ msgid "Delete All" msgstr "Supprimer tous" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Supprimer tous les fichiers témoins visibles. Si un filtre est appliqué, seuls les " -"fichiers témoins correspondant au filtre seront effacés." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Supprimer tous les fichiers témoins visibles. Si un filtre est appliqué, seuls les fichiers témoins correspondant au filtre seront effacés." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2555,12 +2488,8 @@ msgid "Filter:" msgstr "Filtre :" #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine " -"correspondent au filtre entré." +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Entrer un filtre pour n'afficher que les cookies dont le nom ou le domaine correspondent au filtre entré." #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2574,11 +2503,11 @@ msgstr "Lister, afficher et supprimer les fichiers témoins" msgid "Copy Tab _Addresses" msgstr "Copier l'_adresse des onglets" -#: ../extensions/copy-tabs.c:98 +#: ../extensions/copy-tabs.c:96 msgid "Copy Addresses of Tabs" msgstr "Copie l'adresse des onglets" -#: ../extensions/copy-tabs.c:99 +#: ../extensions/copy-tabs.c:97 msgid "Copy the addresses of all tabs to the clipboard" msgstr "Copier les adresses de tous les onglets vers le presse-papiers" @@ -2592,35 +2521,32 @@ msgstr "Associer des modèles d'URL avec des applications externes" #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments ATOM \"entry\" requis dans les données " -"XML." +msgstr "Impossible de trouver les éléments ATOM \"entry\" requis dans les données XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML." +msgstr "Impossible de trouver les éléments ATOM \"feed\" requis dans les données XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:398 +#: ../extensions/feed-panel/feed-panel.c:396 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Dernière mise à jour : %s." -#: ../extensions/feed-panel/feed-panel.c:670 +#: ../extensions/feed-panel/feed-panel.c:668 msgid "Feeds" msgstr "Flux" -#: ../extensions/feed-panel/feed-panel.c:723 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Add new feed" msgstr "Ajouter un nouveau flux" -#: ../extensions/feed-panel/feed-panel.c:730 +#: ../extensions/feed-panel/feed-panel.c:728 msgid "Delete feed" msgstr "Supprimer un flux" -#: ../extensions/feed-panel/feed-panel.c:812 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Flux" @@ -2641,8 +2567,7 @@ msgstr "Impossible d'analyser le flux XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." -msgstr "" -"Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." +msgstr "Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." @@ -2650,14 +2575,11 @@ msgstr "La version trouvée du flux RSS n'est pas prise en charge." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments \"item\" requis dans les données XML." +msgstr "Impossible de trouver les éléments \"item\" requis dans les données XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" -"Impossible de trouver les éléments RSS \"channel\" requis dans les données " -"XML." +msgstr "Impossible de trouver les éléments RSS \"channel\" requis dans les données XML." #: ../extensions/feed-panel/main.c:131 #, c-format @@ -2669,11 +2591,11 @@ msgstr "Le flux « %s » existe déjà" msgid "Error loading feed '%s'" msgstr "Erreur lors du chargement du flux « %s »" -#: ../extensions/feed-panel/main.c:520 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Panneau de flux" -#: ../extensions/feed-panel/main.c:521 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Lire des flux Atom et RSS" @@ -2682,25 +2604,25 @@ msgstr "Lire des flux Atom et RSS" msgid "Failed to add form value: %s\n" msgstr "Impossible d'ajouter la valeur de formulaire : %s\n" -#: ../extensions/formhistory.c:455 ../extensions/formhistory.c:459 +#: ../extensions/formhistory.c:454 ../extensions/formhistory.c:458 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../extensions/formhistory.c:503 +#: ../extensions/formhistory.c:501 msgid "Stores history of entered form data" msgstr "Stocke l'historique des saisies de formulaire" -#: ../extensions/formhistory.c:507 +#: ../extensions/formhistory.c:505 #, c-format msgid "Not available: %s" msgstr "Non disponible : %s" -#: ../extensions/formhistory.c:508 +#: ../extensions/formhistory.c:506 msgid "Resource files not installed" msgstr "Fichiers ressources non installés" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:512 msgid "Form history filler" msgstr "Autocomplétion des formulaires" @@ -2726,28 +2648,26 @@ msgstr "Liste de l'historique des onglets" #: ../extensions/history-list.vala:246 msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"Permettre de changer d'onglet en choisissant dans une liste triée par " -"dernière utilisation" +msgstr "Permettre de changer d'onglet en choisissant dans une liste triée par dernière utilisation" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Mouvements de souris" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:175 msgid "Pageholder" msgstr "Cadre de pages" -#: ../extensions/page-holder.c:161 +#: ../extensions/page-holder.c:159 msgid "_Pageholder" msgstr "Cadre de _pages" -#: ../extensions/page-holder.c:178 +#: ../extensions/page-holder.c:176 msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Garder une ou plusieurs pages ouvertes en parallèle à vos onglets" @@ -2759,19 +2679,19 @@ msgstr "Personnaliser les raccourcis clavier" msgid "Customize Sh_ortcuts..." msgstr "_Personnaliser les raccourcis..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Raccourcis" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "Afficher et modifier les raccourcis clavier" -#: ../extensions/status-clock.c:176 +#: ../extensions/status-clock.c:174 msgid "Statusbar Clock" msgstr "Horloge de barre d'état" -#: ../extensions/status-clock.c:177 +#: ../extensions/status-clock.c:175 msgid "Display date and time in the statusbar" msgstr "Afficher la date et l'heure dans la barre d'état" @@ -2787,32 +2707,31 @@ msgstr "Scripts" msgid "Netscape plugins" msgstr "Greffons Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:147 msgid "Statusbar Features" msgstr "Fonctionnalités dans la barre d'état" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:148 msgid "Easily toggle features on web pages on and off" -msgstr "" -"Activer et désactiver facilement des fonctionnalités sur les pages Internet" +msgstr "Activer et désactiver facilement des fonctionnalités sur les pages Internet" -#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:628 +#: ../extensions/tab-panel.c:569 ../extensions/tab-panel.c:626 msgid "Tab Panel" msgstr "Panneau d'onglets" -#: ../extensions/tab-panel.c:612 +#: ../extensions/tab-panel.c:610 msgid "T_ab Panel" msgstr "P_anneau d'onglets" -#: ../extensions/tab-panel.c:629 +#: ../extensions/tab-panel.c:627 msgid "Show tabs in a vertical panel" msgstr "Afficher les onglets dans un panneau vertical" -#: ../extensions/tabs-minimized.c:79 +#: ../extensions/tabs-minimized.c:77 msgid "Only Icons on Tabs by default" msgstr "Onglets sans intitulé" -#: ../extensions/tabs-minimized.c:80 +#: ../extensions/tabs-minimized.c:78 msgid "New tabs have no label by default" msgstr "Les nouveaux onglets n'ont qu'une icône par défaut" @@ -2821,9 +2740,7 @@ msgid "Customize Toolbar" msgstr "Personnaliser la barre d'outils" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." msgstr "" "Sélectionnez les éléments à afficher sur la barre d'outils.\n" "Ils peuvent être réorganisés par glisser-déposer." @@ -2840,15 +2757,15 @@ msgstr "Éléments affichés" msgid "Customize _Toolbar..." msgstr "Personnaliser la barre d'outi_ls..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:606 msgid "Toolbar Editor" msgstr "Éditeur de barre d'outils" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:607 msgid "Easily edit the toolbar layout" msgstr "Éditer facilement la disposition de la barre d'outils" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Mettre en cache les communication HTTP sur le disque" @@ -2858,9 +2775,6 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgid "Reopen pages that you visited earlier" #~ msgstr "Rouvrir des pages précédemment visitées" -#~ msgid "Show the saved bookmarks" -#~ msgstr "Afficher les signets sauvegardés" - #~ msgid "Original cookies only" #~ msgstr "Uniquement les cookies d'origine" @@ -2876,10 +2790,8 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgid "Detect proxy server automatically" #~ msgstr "Détecter le serveur mandataire automatiquement" -#~ msgid "" -#~ "Whether to detect the proxy server automatically from the environment" -#~ msgstr "" -#~ "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" +#~ msgid "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #~ msgid "_Restore Tab" #~ msgstr "_Restorer l'onglet" @@ -2887,11 +2799,8 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgid "Erroneous clock time" #~ msgstr "Heure de l'horloge incorrecte" -#~ msgid "" -#~ "The clock time lies in the past. Please check the current date and time." -#~ msgstr "" -#~ "L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez " -#~ "la date et l'heure." +#~ msgid "The clock time lies in the past. Please check the current date and time." +#~ msgstr "L'heure de l'horloge se trouve dans le passé. S'il vous plaît, vérifiez la date et l'heure." #~ msgid "Copy %s to the folder %s." #~ msgstr "Copier %s dans le dossier %s." @@ -2902,11 +2811,8 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Ouvrir l'image dans une nouvelle fe_nêtre" -#~ msgid "" -#~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." -#~ msgstr "" -#~ "Copier le scripts utilisateur dans le dossier %s et les styles " -#~ "utilisateurs dans le dossier %s." +#~ msgid "Copy userscripts to the folder %s and copy userstyles to the folder %s." +#~ msgstr "Copier le scripts utilisateur dans le dossier %s et les styles utilisateurs dans le dossier %s." #~ msgid "Failed to get current time: %s\n" #~ msgstr "Impossible d'obtenir l'heure actuelle : %s\n" @@ -2930,8 +2836,7 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgstr "Réduire la taille des images" #~ msgid "Automatically shrink standalone images to fit" -#~ msgstr "" -#~ "Réduire automatiquement la taille des images pour les adapter à la fenêtre" +#~ msgstr "Réduire automatiquement la taille des images pour les adapter à la fenêtre" #~ msgid "Enable developer tools" #~ msgstr "Activer les outils de développement" @@ -2967,8 +2872,7 @@ msgstr "Mettre en cache les communication HTTP sur le disque" #~ msgstr "Se souvenir du contenu des derniers formulaires remplis" #~ msgid "Whether the last form inputs are saved" -#~ msgstr "" -#~ "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" +#~ msgstr "Indique s'il faut enregistrer le contenu des derniers formulaires remplis" #~ msgid "Cache size" #~ msgstr "Taille du cache" From b66902ef7ab41d50a08890df24021554d645683a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 16 Sep 2010 21:18:14 +0200 Subject: [PATCH 2963/2970] Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now. --- katze/katze-arrayaction.c | 35 +++++++++++++++------ midori/midori-browser.c | 65 +++++++++++++++------------------------ 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index c031a245..47fc08e9 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -133,6 +133,15 @@ katze_array_action_class_init (KatzeArrayActionClass* class) G_TYPE_BOOLEAN, 2, GTK_TYPE_MENU_SHELL, KATZE_TYPE_ITEM); + /** + * KatzeArrayAction::activate-item: + * @array: the object on which the signal is emitted + * @item: the item being activated + * + * An item was clicked with the first button. + * + * Deprecated: 0.2.8: Use "activate-item-alt" instead. + **/ signals[ACTIVATE_ITEM] = g_signal_new ("activate-item", G_TYPE_FROM_CLASS (class), (GSignalFlags) (G_SIGNAL_RUN_LAST), @@ -149,8 +158,7 @@ katze_array_action_class_init (KatzeArrayActionClass* class) * @item: the item being activated * @button: the mouse button pressed * - * An item was clicked with a particular button. Use this if you need - * to handle middle or right clicks specially. + * An item was clicked, with the specified @button. * * Return value: %TRUE if the event was handled. If %FALSE is returned, * the default "activate-item" signal is emitted. @@ -286,12 +294,24 @@ katze_array_action_activate (GtkAction* action) GTK_ACTION_CLASS (katze_array_action_parent_class)->activate (action); } +static void +katze_array_action_activate_item (KatzeArrayAction* action, + KatzeItem* item, + gint button) +{ + gboolean handled = FALSE; + g_signal_emit (action, signals[ACTIVATE_ITEM_ALT], 0, item, + button, &handled); + if (!handled) + g_signal_emit (action, signals[ACTIVATE_ITEM], 0, item); +} + static void katze_array_action_menu_activate_cb (GtkWidget* proxy, KatzeArrayAction* array_action) { KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); - g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); + katze_array_action_activate_item (array_action, item, 1); } static gboolean @@ -300,13 +320,8 @@ katze_array_action_menu_button_press_cb (GtkWidget* proxy, KatzeArrayAction* array_action) { KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); - gboolean handled; - g_signal_emit (array_action, signals[ACTIVATE_ITEM_ALT], 0, item, - event->button, &handled); - - if (!handled) - g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); + katze_array_action_activate_item (array_action, item, event->button); /* we need to block the 'activate' handler which would be called * otherwise as well */ @@ -458,7 +473,7 @@ katze_array_action_proxy_clicked_cb (GtkWidget* proxy, array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray"); if (KATZE_IS_ITEM (array) && katze_item_get_uri ((KatzeItem*)array)) { - g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, array); + katze_array_action_activate_item (array_action, KATZE_ITEM (array), 1); return; } diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 2edca995..b4db5b1f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2652,28 +2652,23 @@ midori_browser_menu_item_deselect_cb (GtkWidget* menuitem, _midori_browser_set_statusbar_text (browser, NULL); } -static void -midori_bookmarkbar_activate_item (GtkAction* action, - KatzeItem* item, - MidoriBrowser* browser) -{ - midori_browser_open_bookmark (browser, item); -} - static gboolean midori_bookmarkbar_activate_item_alt (GtkAction* action, KatzeItem* item, guint button, MidoriBrowser* browser) { - if (button == 2) + if (button == 1) + { + midori_browser_open_bookmark (browser, item); + } + else if (button == 2) { gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); midori_browser_set_current_page_smartly (browser, n); - return TRUE; } - return FALSE; + return TRUE; } static void @@ -2703,33 +2698,28 @@ _action_trash_populate_popup (GtkAction* action, gtk_widget_show (menuitem); } -static void -_action_trash_activate_item (GtkAction* action, - KatzeItem* item, - MidoriBrowser* browser) -{ - guint n = midori_browser_add_item (browser, item); - midori_browser_set_current_page (browser, n); - katze_array_remove_item (browser->trash, item); - _midori_browser_update_actions (browser); -} - static gboolean _action_trash_activate_item_alt (GtkAction* action, KatzeItem* item, guint button, MidoriBrowser* browser) { - if (button == 2) + if (button == 1) { - gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + guint n = midori_browser_add_item (browser, item); + midori_browser_set_current_page (browser, n); + katze_array_remove_item (browser->trash, item); + _midori_browser_update_actions (browser); + } + else if (button == 2) + { + gint n = midori_browser_add_item (browser, item); midori_browser_set_current_page_smartly (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); - return TRUE; } - return FALSE; + return TRUE; } /* static */ void @@ -2899,16 +2889,17 @@ _action_window_populate_popup (GtkAction* action, } static void -_action_window_activate_item (GtkAction* action, - KatzeItem* item, - MidoriBrowser* browser) +_action_window_activate_item_alt (GtkAction* action, + KatzeItem* item, + gint button, + MidoriBrowser* browser) { - guint i, n; - GtkWidget* view; + guint i; + guint n = katze_array_get_length (browser->proxy_array); - n = katze_array_get_length (browser->proxy_array); for (i = 0; i < n; i++) { + GtkWidget* view; view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), i); if (midori_view_get_proxy_item (MIDORI_VIEW (view)) == item) gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), i); @@ -5683,8 +5674,6 @@ midori_browser_init (MidoriBrowser* browser) g_object_connect (action, "signal::populate-popup", _action_trash_populate_popup, browser, - "signal::activate-item", - _action_trash_activate_item, browser, "signal::activate-item-alt", _action_trash_activate_item_alt, browser, NULL); @@ -5701,8 +5690,6 @@ midori_browser_init (MidoriBrowser* browser) g_object_connect (action, "signal::populate-folder", _action_bookmarks_populate_folder, browser, - "signal::activate-item", - midori_bookmarkbar_activate_item, browser, "signal::activate-item-alt", midori_bookmarkbar_activate_item_alt, browser, NULL); @@ -5718,8 +5705,6 @@ midori_browser_init (MidoriBrowser* browser) g_object_connect (action, "signal::populate-popup", _action_tools_populate_popup, browser, - "signal::activate-item", - midori_bookmarkbar_activate_item, browser, "signal::activate-item-alt", midori_bookmarkbar_activate_item_alt, browser, NULL); @@ -5736,8 +5721,8 @@ midori_browser_init (MidoriBrowser* browser) g_object_connect (action, "signal::populate-popup", _action_window_populate_popup, browser, - "signal::activate-item", - _action_window_activate_item, browser, + "signal::activate-item-alt", + _action_window_activate_item_alt, browser, NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); From 5806cdb88459b5323acafd9b3e1aa806b00235a5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 16 Sep 2010 21:39:42 +0200 Subject: [PATCH 2964/2970] Return FALSE in _action_bookmarks_populate_folder if db is NULL --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b4db5b1f..26892ae5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2825,7 +2825,7 @@ _action_bookmarks_populate_folder (GtkAction* action, GtkWidget* menuitem; if (!db) - return; + return FALSE; /* Clear items from dummy array here */ gtk_container_foreach (GTK_CONTAINER (menu), From 648befe7ca595ea1b4380e2102a60b6dfb3074a5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Sep 2010 20:03:11 +0200 Subject: [PATCH 2965/2970] Implement and use midori_view_new_with_uri The function provides an optimised and quick way to creating visible views with uri, title and settings. This is how virtually all views are created. --- midori/midori-browser.c | 35 +++++++-------------------- midori/midori-view.c | 52 ++++++++++++++++++++++++++++++++++------- midori/midori-view.h | 5 ++++ 3 files changed, 56 insertions(+), 36 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 26892ae5..c988ae23 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4431,11 +4431,9 @@ _action_tab_duplicate_activate (GtkAction* action, { GtkWidget* view = midori_browser_get_current_tab (browser); MidoriNewView where = MIDORI_NEW_VIEW_TAB; - GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, - "settings", browser->settings, NULL); - midori_view_set_uri (MIDORI_VIEW (new_view), - midori_view_get_display_uri (MIDORI_VIEW (view))); - gtk_widget_show (new_view); + GtkWidget* new_view = midori_view_new_with_uri ( + midori_view_get_display_uri (MIDORI_VIEW (view)), + NULL, browser->settings); g_signal_emit_by_name (view, "new-view", new_view, where); } @@ -4777,13 +4775,7 @@ midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook, || */(event->type == GDK_BUTTON_PRESS && event->button == 2)) { gint n; - GtkWidget* view; - - view = g_object_new (MIDORI_TYPE_VIEW, - "settings", browser->settings, - NULL); - midori_view_set_uri (MIDORI_VIEW (view), ""); - gtk_widget_show (view); + GtkWidget* view = midori_view_new_with_uri ("", NULL, browser->settings); g_object_set_data (G_OBJECT (view), "midori-view-append", (void*)1); n = midori_browser_add_tab (browser, view); midori_browser_set_current_page (browser, n); @@ -6711,23 +6703,16 @@ midori_browser_add_item (MidoriBrowser* browser, uri = katze_item_get_uri (item); title = katze_item_get_name (item); - view = g_object_new (MIDORI_TYPE_VIEW, - "title", title, - "settings", browser->settings, - NULL); /* Blank pages should not be delayed */ if (katze_item_get_meta_integer (item, "delay") > 0 && uri != NULL && strcmp (uri, "about:blank") != 0) { - gchar* new_uri; - new_uri = g_strdup_printf ("pause:%s", uri); - midori_view_set_uri (MIDORI_VIEW (view), new_uri); + gchar* new_uri = g_strdup_printf ("pause:%s", uri); + view = midori_view_new_with_uri (new_uri, title, browser->settings); g_free (new_uri); } else - midori_view_set_uri (MIDORI_VIEW (view), uri); - - gtk_widget_show (view); + view = midori_view_new_with_uri (uri, title, browser->settings); /* FIXME: We should have public API for that */ if (g_object_get_data (G_OBJECT (item), "midori-view-append")) @@ -6765,11 +6750,7 @@ midori_browser_add_uri (MidoriBrowser* browser, g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1); g_return_val_if_fail (uri != NULL, -1); - view = g_object_new (MIDORI_TYPE_VIEW, "settings", browser->settings, - NULL); - midori_view_set_uri (MIDORI_VIEW (view), uri); - gtk_widget_show (view); - + view = midori_view_new_with_uri (uri, NULL, browser->settings); return midori_browser_add_tab (browser, view); } diff --git a/midori/midori-view.c b/midori/midori-view.c index 918e6eb3..c75912b3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2526,9 +2526,8 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, new_view = view; else { - new_view = g_object_new (MIDORI_TYPE_VIEW, - "settings", view->settings, - NULL); + new_view = (MidoriView*)midori_view_new_with_uri (NULL, NULL, + view->settings); midori_view_construct_web_view (new_view); g_signal_connect (new_view->web_view, "web-view-ready", G_CALLBACK (webkit_web_view_web_view_ready_cb), view); @@ -2971,11 +2970,13 @@ midori_view_focus_in_event (GtkWidget* widget, /** * midori_view_new: - * @net: a #KatzeNet, or %NULL + * @net: %NULL * * Creates a new view. * * Return value: a new #MidoriView + * + * Deprecated: 0.2.8: Use midori_view_new_with_uri() instead. **/ GtkWidget* midori_view_new (KatzeNet* net) @@ -3008,6 +3009,41 @@ _midori_view_update_settings (MidoriView* view) g_object_set (view->scrolled_window, "kinetic-scrolling", kinetic_scrolling, NULL); } +/** + * midori_view_new_with_uri: + * @uri: an URI string, or %NULL + * @title: a title, or %NULL + * @settings: a #MidoriWebSettings, or %NULL + * + * Creates a new view with the specified parameters that + * is visible by default. + * + * Return value: a new #MidoriView + * + * Since: 0.2.8 + **/ +GtkWidget* +midori_view_new_with_uri (const gchar* uri, + const gchar* title, + MidoriWebSettings* settings) +{ + MidoriView* view = g_object_new (MIDORI_TYPE_VIEW, NULL); + view->title = g_strdup (title); + if (title != NULL) + midori_view_update_title (view); + if (settings) + { + view->settings = g_object_ref (settings); + _midori_view_update_settings (view); + g_signal_connect (settings, "notify", + G_CALLBACK (midori_view_settings_notify_cb), view); + } + if (uri != NULL) + midori_view_set_uri (view, uri); + gtk_widget_show ((GtkWidget*)view); + return (GtkWidget*)view; +} + static void midori_view_settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -3934,11 +3970,9 @@ midori_view_tab_label_menu_duplicate_tab_cb (GtkWidget* menuitem, MidoriView* view) { MidoriNewView where = MIDORI_NEW_VIEW_TAB; - GtkWidget* new_view = g_object_new (MIDORI_TYPE_VIEW, - "settings", view->settings, NULL); - midori_view_set_uri (MIDORI_VIEW (new_view), - midori_view_get_display_uri (view)); - gtk_widget_show (new_view); + GtkWidget* new_view = midori_view_new_with_uri ( + midori_view_get_display_uri (view), + NULL, view->settings); g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where); } diff --git a/midori/midori-view.h b/midori/midori-view.h index e1ae4dde..902b7e4d 100644 --- a/midori/midori-view.h +++ b/midori/midori-view.h @@ -80,6 +80,11 @@ midori_view_get_type (void) G_GNUC_CONST; GtkWidget* midori_view_new (KatzeNet* net); +GtkWidget* +midori_view_new_with_uri (const gchar* uri, + const gchar* title, + MidoriWebSettings* settings); + void midori_view_set_settings (MidoriView* view, MidoriWebSettings* settings); From 304d99903aad95aa8d5d5ad542ebc1e0d04f59c1 Mon Sep 17 00:00:00 2001 From: Sergio Cipolla Date: Fri, 17 Sep 2010 23:31:50 +0200 Subject: [PATCH 2966/2970] Update Brazilian Portuguese translation --- po/pt_BR.po | 2287 +++++++++++++++++++++++++++------------------------ 1 file changed, 1234 insertions(+), 1053 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3aa5c593..a0920fda 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-22 14:27-0300\n" -"PO-Revision-Date: 2010-06-22 13:29-0300\n" -"Last-Translator: Sérgio Brandão Cipolla \n" +"POT-Creation-Date: 2010-09-16 13:27-0300\n" +"PO-Revision-Date: 2010-09-16 13:37-0300\n" +"Last-Translator: Sérgio Cipolla \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -22,9 +22,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador web leve" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1336 ../midori/main.c:1664 -#: ../midori/main.c:1672 ../midori/main.c:1688 -#: ../midori/midori-websettings.c:313 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1322 +#: ../midori/main.c:1651 +#: ../midori/main.c:1659 +#: ../midori/main.c:1675 +#: ../midori/midori-websettings.c:312 msgid "Midori" msgstr "Midori" @@ -32,1670 +35,1652 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador web" -#: ../midori/main.c:102 +#: ../midori/main.c:99 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não pôde ser carregada: %s\n" -#: ../midori/main.c:151 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:158 ../midori/main.c:244 +#: ../midori/main.c:155 +#: ../midori/main.c:241 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração '%s' inválido " -#: ../midori/main.c:370 ../extensions/formhistory.c:446 +#: ../midori/main.c:366 +#: ../midori/main.c:470 +#: ../extensions/formhistory.c:439 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:425 +#: ../midori/main.c:422 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao excluir histórico antigo: %s\n" -#: ../midori/main.c:445 -#, c-format -msgid "The configuration couldn't be saved. %s" -msgstr "A configuração não pôde ser salva. %s" - -#: ../midori/main.c:483 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Os motores de pesquisa não puderam ser salvos. %s" - -#: ../midori/main.c:502 ../midori/main.c:552 ../midori/main.c:572 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Os favoritos não puderam ser salvos. %s" - -#. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:602 ../midori/main.c:625 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "O lixo não pôde ser salvo. %s" - -#: ../midori/main.c:684 ../midori/main.c:924 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "A sessão não pôde ser salva. %s" - -#: ../midori/main.c:868 -msgid "" -"No root certificate file is available. SSL certificates cannot be verified." -msgstr "" -"Nenhum certificado raiz disponível. Os certificados SSL não podem ser " -"verificados." - -#: ../midori/main.c:958 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"O Midori encerrou abruptamente da última vez em que foi aberto. Se isso " -"ocorrer repetidamente, tente uma das seguintes opções para resolver o " -"problema." - -#: ../midori/main.c:973 -msgid "Modify _preferences" -msgstr "Modificar _preferências" - -#: ../midori/main.c:977 -msgid "Reset the last _session" -msgstr "Restaurar a última _sessão" - -#: ../midori/main.c:982 -msgid "Disable all _extensions" -msgstr "Desabilitar todas as _extensões" - -#: ../midori/main.c:1217 ../midori/main.c:1937 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "A sessão não pôde ser carregada: %s\n" - -#: ../midori/main.c:1336 -msgid "No filename specified" -msgstr "Nenhum nome de arquivo especificado" - -#: ../midori/main.c:1355 -msgid "An unknown error occured." -msgstr "Ocorreu um erro desconhecido." - -#: ../midori/main.c:1386 -#, c-format -msgid "Snapshot saved to: %s\n" -msgstr "Captura salva em: %s\n" - -#: ../midori/main.c:1557 -msgid "Run ADDRESS as a web application" -msgstr "Executar ENDEREÇO como aplicativo web" - -#: ../midori/main.c:1557 -msgid "ADDRESS" -msgstr "ENDEREÇO" - -#: ../midori/main.c:1560 -msgid "Use FOLDER as configuration folder" -msgstr "Usar PASTA como pasta de configuração" - -#: ../midori/main.c:1560 -msgid "FOLDER" -msgstr "PASTA" - -#: ../midori/main.c:1563 -msgid "Show a diagnostic dialog" -msgstr "Exibir diálogo de diagnóstico" - -#: ../midori/main.c:1565 -msgid "Run the specified filename as javascript" -msgstr "Executar o arquivo especificado como javascript" - -#: ../midori/main.c:1568 -msgid "Take a snapshot of the specified URI" -msgstr "Tirar uma captura do URI especificado" - -#: ../midori/main.c:1571 -msgid "Execute the specified command" -msgstr "Executar o comando especificado" - -#: ../midori/main.c:1573 -msgid "Display program version" -msgstr "Exibir a versão do programa" - -#: ../midori/main.c:1575 -msgid "Addresses" -msgstr "Endereços" - -#: ../midori/main.c:1577 -msgid "Block URIs according to regular expression PATTERN" -msgstr "Bloquear URIs conforme a expressão regular PADRÃO" - -#: ../midori/main.c:1577 -msgid "PATTERN" -msgstr "PADRÃO" - -#. i18n: CLI: Close tabs, clear private data, open starting page -#: ../midori/main.c:1581 -msgid "Reset Midori after SECONDS seconds of inactivity" -msgstr "Restaurar o Midori após SEGUNDOS segundos de inatividade" - -#: ../midori/main.c:1581 -msgid "SECONDS" -msgstr "SEGUNDOS" - -#: ../midori/main.c:1661 -msgid "[Addresses]" -msgstr "[Endereços]" - -#: ../midori/main.c:1689 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Por favor, envie comentários, sugestões e relatos de erros para:" - -#: ../midori/main.c:1691 -msgid "Check for new versions at:" -msgstr "Verificar por novas versões a:" - -#: ../midori/main.c:1788 -msgid "The specified configuration folder is invalid." -msgstr "A pasta de configuração especificada é inválida." - -#: ../midori/main.c:1836 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "" -"Uma instância do Midori já está em execução mas não está respondendo.\n" - -#: ../midori/main.c:1891 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "Os motores de pesquisa não puderam ser carregados. %s\n" - -#: ../midori/main.c:1920 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Os favoritos não puderam ser carregados: %s\n" - -#: ../midori/main.c:1952 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "O lixo não pôde ser carregado: %s\n" - -#: ../midori/main.c:1966 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "O histórico não pôde ser carregado: %s\n" - -#: ../midori/main.c:1980 -msgid "The following errors occured:" -msgstr "Ocorreram os seguintes erros:" - -#: ../midori/main.c:1996 -msgid "_Ignore" -msgstr "_Ignorar " - -#: ../midori/midori-array.c:428 -msgid "File not found." -msgstr "Arquivo não encontrado." - -#: ../midori/midori-array.c:462 ../midori/midori-array.c:485 -#: ../midori/midori-array.c:495 -msgid "Malformed document." -msgstr "Documento mal conformado." - -#: ../midori/midori-array.c:504 -msgid "Unrecognized bookmark format." -msgstr "Formato de favoritos não reconhecido." - -#: ../midori/midori-array.c:718 ../midori/sokoke.c:1115 -#, c-format -msgid "Writing failed." -msgstr "Falha na escrita." - -#: ../midori/midori-browser.c:336 ../midori/midori-browser.c:5575 -#: ../midori/midori-browser.c:5581 -msgid "Reload the current page" -msgstr "Recarregar a página atual" - -#: ../midori/midori-browser.c:346 ../midori/midori-browser.c:5578 -msgid "Stop loading the current page" -msgstr "Parar o carregamento da página atual" - -#: ../midori/midori-browser.c:460 -#, c-format -msgid "%d%% loaded" -msgstr "%d%% carregado" - -#: ../midori/midori-browser.c:498 -#, c-format -msgid "Failed to update title: %s\n" -msgstr "Falha ao atualizar título: %s\n" - -#: ../midori/midori-browser.c:512 -#, c-format -msgid "Unexpected action '%s'." -msgstr "Ação inesperada '%s'." - -#: ../midori/midori-browser.c:728 -msgid "New folder" -msgstr "Nova pasta" - -#: ../midori/midori-browser.c:728 -msgid "Edit folder" -msgstr "Editar pasta" - -#: ../midori/midori-browser.c:730 -msgid "New bookmark" -msgstr "Novo favorito" - -#: ../midori/midori-browser.c:730 -msgid "Edit bookmark" -msgstr "Editar favorito" - -#: ../midori/midori-browser.c:761 -msgid "_Title:" -msgstr "_Título:" - -#: ../midori/midori-browser.c:774 ../midori/midori-searchaction.c:961 -msgid "_Description:" -msgstr "_Descrição:" - -#: ../midori/midori-browser.c:793 ../midori/midori-searchaction.c:975 -#: ../extensions/feed-panel/main.c:376 -msgid "_Address:" -msgstr "_Endereço:" - -#: ../midori/midori-browser.c:823 ../midori/midori-browser.c:4731 -msgid "_Folder:" -msgstr "_Pasta:" - -#: ../midori/midori-browser.c:833 ../midori/midori-browser.c:928 -#: ../midori/midori-browser.c:4736 ../midori/midori-browser.c:4768 -msgid "Toplevel folder" -msgstr "Pasta superior" - -#: ../midori/midori-browser.c:864 -msgid "Add to _Speed Dial" -msgstr "Adicionar à _ligação rápida" - -#: ../midori/midori-browser.c:877 -msgid "Show in the tool_bar" -msgstr "Exibir na _barra de ferramentas" - -#: ../midori/midori-browser.c:892 -msgid "Run as _web application" -msgstr "Executar como aplicativo _web" - -#: ../midori/midori-browser.c:986 -#, c-format -msgid "There is not enough free space to download \"%s\"." -msgstr "Não há espaço livre suficiente para baixar \"%s\"." - -#: ../midori/midori-browser.c:990 -#, c-format -msgid "The file needs %s but only %s are left." -msgstr "O arquivo precisa de %s e só há %s livre." - -#: ../midori/midori-browser.c:1047 ../midori/midori-browser.c:4786 -#: ../midori/midori-browser.c:4818 -msgid "Save file as" -msgstr "Salvar como" - -#: ../midori/midori-browser.c:1420 ../panels/midori-transfers.c:270 -#, c-format -msgid "%s of %s" -msgstr "%s de %s" - -#: ../midori/midori-browser.c:1456 -#, c-format -msgid "The file '%s' has been downloaded." -msgstr "O arquivo '%s' foi baixado." - -#: ../midori/midori-browser.c:1460 -msgid "Transfer completed" -msgstr "Transferência concluída" - -#: ../midori/midori-browser.c:1600 -msgid "Save file" -msgstr "Salvar arquivo" - -#: ../midori/midori-browser.c:1917 ../midori/midori-browser.c:1919 -msgid "Some files are being downloaded" -msgstr "Alguns arquivos estão sendo baixados" - -#: ../midori/midori-browser.c:1923 -msgid "_Quit Midori" -msgstr "_Sair do Midori" - -#: ../midori/midori-browser.c:1925 -msgid "The transfers will be cancelled if Midori quits." -msgstr "As transferências serão canceladas se sair do Midori." - -#: ../midori/midori-browser.c:2386 -msgid "Open file" -msgstr "Abrir arquivo" - -#: ../midori/midori-browser.c:2462 ../extensions/feed-panel/main.c:364 -msgid "New feed" -msgstr "Novo feed" - -#: ../midori/midori-browser.c:2503 ../midori/midori-browser.c:5640 -#: ../panels/midori-bookmarks.c:233 -msgid "Add a new bookmark" -msgstr "Adicionar novo favorito" - -#: ../midori/midori-browser.c:3076 ../panels/midori-history.c:332 -#: ../extensions/formhistory.c:461 ../extensions/formhistory.c:465 -#, c-format -msgid "Failed to execute database statement: %s\n" -msgstr "Falha ao executar afirmação da base de dados: %s\n" - -#: ../midori/midori-browser.c:3156 ../midori/midori-searchaction.c:484 -msgid "Empty" -msgstr "Vazio" - -#: ../midori/midori-browser.c:3777 ../midori/sokoke.c:398 -#: ../midori/sokoke.c:408 ../midori/sokoke.c:436 ../midori/sokoke.c:462 -#: ../midori/sokoke.c:476 -msgid "Could not run external program." -msgstr "Não foi possível executar o programa externo." - -#: ../midori/midori-browser.c:4091 ../midori/midori-browser.c:6034 -#, c-format -msgid "Failed to insert new history item: %s\n" -msgstr "Falha ao inserir novo item no histórico: %s\n" - -#: ../midori/midori-browser.c:4424 ../panels/midori-bookmarks.c:779 -#: ../panels/midori-history.c:750 -msgid "Open all in _Tabs" -msgstr "Abrir tudo em _abas" - -#: ../midori/midori-browser.c:4431 ../panels/midori-bookmarks.c:785 -#: ../panels/midori-history.c:756 ../extensions/feed-panel/feed-panel.c:545 -msgid "Open in New _Tab" -msgstr "Abrir em nova _aba" - -#: ../midori/midori-browser.c:4434 ../panels/midori-bookmarks.c:787 -#: ../panels/midori-history.c:758 ../extensions/feed-panel/feed-panel.c:547 -msgid "Open in New _Window" -msgstr "Abrir em nova _janela" - -#: ../midori/midori-browser.c:4657 -msgid "Arora" -msgstr "Arora" - -#: ../midori/midori-browser.c:4658 -msgid "Kazehakase" -msgstr "Kazehakase" - -#: ../midori/midori-browser.c:4659 -msgid "Opera" -msgstr "Opera" - -#: ../midori/midori-browser.c:4660 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../midori/midori-browser.c:4661 -msgid "Epiphany" -msgstr "Epiphany" - -#: ../midori/midori-browser.c:4682 -msgid "Import bookmarks..." -msgstr "Importar favoritos..." - -#: ../midori/midori-browser.c:4685 ../midori/midori-browser.c:5645 -msgid "_Import bookmarks" -msgstr "_Importar favoritos" - -#: ../midori/midori-browser.c:4696 -msgid "_Application:" -msgstr "_Aplicativo:" - -#: ../midori/midori-browser.c:4723 ../midori/midori-browser.c:5749 -#: ../midori/midori-websettings.c:227 ../midori/midori-websettings.c:318 -#: ../katze/katze-utils.c:691 -msgid "Custom..." -msgstr "Personalizado..." - -#: ../midori/midori-browser.c:4797 -msgid "Failed to import bookmarks" -msgstr "Falha ao importar favoritos" - -#: ../midori/midori-browser.c:4833 -msgid "Failed to export bookmarks" -msgstr "Falha ao exportar favoritos" - -#: ../midori/midori-browser.c:4887 ../panels/midori-history.c:141 -#: ../panels/midori-history.c:171 +#: ../midori/main.c:453 +#: ../panels/midori-history.c:169 +#: ../panels/midori-history.c:199 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao excluir item do histórico: %s\n" +#: ../midori/main.c:498 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Os favoritos não puderam ser salvos. %s" + +#: ../midori/main.c:525 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "A configuração não pôde ser salva. %s" + +#: ../midori/main.c:563 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Os motores de pesquisa não puderam ser salvos. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:583 +#: ../midori/main.c:606 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "O lixo não pôde ser salvo. %s" + +#: ../midori/main.c:665 +#: ../midori/main.c:905 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "A sessão não pôde ser salva. %s" + +#: ../midori/main.c:849 +msgid "No root certificate file is available. SSL certificates cannot be verified." +msgstr "Nenhum certificado raiz disponível. Os certificados SSL não podem ser verificados." + +#: ../midori/main.c:939 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "O Midori encerrou abruptamente da última vez em que foi aberto. Se isso ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." + +#: ../midori/main.c:954 +msgid "Modify _preferences" +msgstr "Modificar _preferências" + +#: ../midori/main.c:958 +msgid "Reset the last _session" +msgstr "Restaurar a última _sessão" + +#: ../midori/main.c:963 +msgid "Disable all _extensions" +msgstr "Desabilitar todas as _extensões" + +#: ../midori/main.c:1202 +#: ../midori/main.c:1946 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "A sessão não pôde ser carregada: %s\n" + +#: ../midori/main.c:1322 +msgid "No filename specified" +msgstr "Nenhum nome de arquivo especificado" + +#: ../midori/main.c:1341 +msgid "An unknown error occured." +msgstr "Ocorreu um erro desconhecido." + +#: ../midori/main.c:1372 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Captura salva em: %s\n" + +#: ../midori/main.c:1544 +msgid "Run ADDRESS as a web application" +msgstr "Executar ENDEREÇO como aplicativo web" + +#: ../midori/main.c:1544 +msgid "ADDRESS" +msgstr "ENDEREÇO" + +#: ../midori/main.c:1547 +msgid "Use FOLDER as configuration folder" +msgstr "Usar PASTA como pasta de configuração" + +#: ../midori/main.c:1547 +msgid "FOLDER" +msgstr "PASTA" + +#: ../midori/main.c:1550 +msgid "Show a diagnostic dialog" +msgstr "Exibir diálogo de diagnóstico" + +#: ../midori/main.c:1552 +msgid "Run the specified filename as javascript" +msgstr "Executar o arquivo especificado como javascript" + +#: ../midori/main.c:1555 +msgid "Take a snapshot of the specified URI" +msgstr "Tirar uma captura do URI especificado" + +#: ../midori/main.c:1558 +msgid "Execute the specified command" +msgstr "Executar o comando especificado" + +#: ../midori/main.c:1560 +msgid "Display program version" +msgstr "Exibir a versão do programa" + +#: ../midori/main.c:1562 +msgid "Addresses" +msgstr "Endereços" + +#: ../midori/main.c:1564 +msgid "Block URIs according to regular expression PATTERN" +msgstr "Bloquear URIs conforme a expressão regular PADRÃO" + +#: ../midori/main.c:1564 +msgid "PATTERN" +msgstr "PADRÃO" + +#. i18n: CLI: Close tabs, clear private data, open starting page +#: ../midori/main.c:1568 +msgid "Reset Midori after SECONDS seconds of inactivity" +msgstr "Restaurar o Midori após SEGUNDOS segundos de inatividade" + +#: ../midori/main.c:1568 +msgid "SECONDS" +msgstr "SEGUNDOS" + +#: ../midori/main.c:1648 +msgid "[Addresses]" +msgstr "[Endereços]" + +#: ../midori/main.c:1676 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Por favor, envie comentários, sugestões e relatos de erros para:" + +#: ../midori/main.c:1678 +msgid "Check for new versions at:" +msgstr "Verificar por novas versões a:" + +#: ../midori/main.c:1795 +msgid "The specified configuration folder is invalid." +msgstr "A pasta de configuração especificada é inválida." + +#: ../midori/main.c:1843 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Uma instância do Midori já está em execução mas não está respondendo.\n" + +#: ../midori/main.c:1898 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Os motores de pesquisa não puderam ser carregados. %s\n" + +#: ../midori/main.c:1919 +#, c-format +msgid "Bookmarks couldn't be loaded: %s\n" +msgstr "Os favoritos não puderam ser carregados: %s\n" + +#: ../midori/main.c:1961 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "O lixo não pôde ser carregado: %s\n" + +#: ../midori/main.c:1974 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "O histórico não pôde ser carregado: %s\n" + +#: ../midori/main.c:1988 +msgid "The following errors occured:" +msgstr "Ocorreram os seguintes erros:" + +#: ../midori/main.c:2004 +msgid "_Ignore" +msgstr "_Ignorar " + +#: ../midori/midori-array.c:429 +msgid "File not found." +msgstr "Arquivo não encontrado." + +#: ../midori/midori-array.c:463 +#: ../midori/midori-array.c:486 +#: ../midori/midori-array.c:496 +msgid "Malformed document." +msgstr "Documento mal conformado." + +#: ../midori/midori-array.c:505 +msgid "Unrecognized bookmark format." +msgstr "Formato de favoritos não reconhecido." + +#: ../midori/midori-array.c:716 +msgid "Writing failed." +msgstr "Falha na escrita." + +#: ../midori/midori-browser.c:336 +#: ../midori/midori-browser.c:4926 +#: ../midori/midori-browser.c:4932 +msgid "Reload the current page" +msgstr "Recarregar a página atual" + +#: ../midori/midori-browser.c:346 +#: ../midori/midori-browser.c:4929 +msgid "Stop loading the current page" +msgstr "Parar o carregamento da página atual" + +#: ../midori/midori-browser.c:453 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% carregado" + +#: ../midori/midori-browser.c:491 +#, c-format +msgid "Failed to update title: %s\n" +msgstr "Falha ao atualizar título: %s\n" + +#: ../midori/midori-browser.c:504 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Ação inesperada '%s'." + +#: ../midori/midori-browser.c:729 +msgid "New folder" +msgstr "Nova pasta" + +#: ../midori/midori-browser.c:729 +msgid "Edit folder" +msgstr "Editar pasta" + +#: ../midori/midori-browser.c:731 +msgid "New bookmark" +msgstr "Novo favorito" + +#: ../midori/midori-browser.c:731 +msgid "Edit bookmark" +msgstr "Editar favorito" + +#: ../midori/midori-browser.c:762 +msgid "_Title:" +msgstr "_Título:" + +#: ../midori/midori-browser.c:779 +#: ../midori/midori-searchaction.c:958 +msgid "_Description:" +msgstr "_Descrição:" + +#: ../midori/midori-browser.c:798 +#: ../midori/midori-searchaction.c:972 +#: ../extensions/feed-panel/main.c:377 +msgid "_Address:" +msgstr "_Endereço:" + +#: ../midori/midori-browser.c:830 +#: ../midori/midori-browser.c:4046 +msgid "_Folder:" +msgstr "_Pasta:" + +#: ../midori/midori-browser.c:840 +#: ../midori/midori-browser.c:934 +#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:4079 +msgid "Toplevel folder" +msgstr "Pasta superior" + +#: ../midori/midori-browser.c:872 +msgid "Add to _Speed Dial" +msgstr "Adicionar à _ligação rápida" + +#: ../midori/midori-browser.c:885 +msgid "Show in the tool_bar" +msgstr "Exibir na _barra de ferramentas" + +#: ../midori/midori-browser.c:900 +msgid "Run as _web application" +msgstr "Executar como aplicativo _web" + +#: ../midori/midori-browser.c:979 +#, c-format +msgid "There is not enough free space to download \"%s\"." +msgstr "Não há espaço livre suficiente para baixar \"%s\"." + +#: ../midori/midori-browser.c:983 +#, c-format +msgid "The file needs %s but only %s are left." +msgstr "O arquivo precisa de %s e só há %s livre." + +#: ../midori/midori-browser.c:1045 +#: ../midori/midori-browser.c:4087 +#: ../midori/midori-browser.c:4122 +msgid "Save file as" +msgstr "Salvar como" + +#: ../midori/midori-browser.c:1438 +msgid "Save file" +msgstr "Salvar arquivo" + +#: ../midori/midori-browser.c:2154 +msgid "Open file" +msgstr "Abrir arquivo" + +#: ../midori/midori-browser.c:2232 +msgid "" +"To use the above URI open a news aggregator. There is usually a menu or button \"New Subscription\", \"New News Feed\" or similar.\n" +"Alternatively go to Preferences, Applications in Midori, and select a News Aggregator. Next time you click the news feed icon, it will be added automatically." +msgstr "" +"Para usar o URI acima, abra um agregador de notícias. Geralmente há um menu ou botão \"Nova Inscrição\", \"Novo Feed de Notícias\" ou similar.\n" +" Alternativamente, vá para Preferências, Aplicativos e selecione um agregador de notícias. Na próxima vez em que clicar no ícone de um feed de notícias ele será adicionado automaticamente." + +#: ../midori/midori-browser.c:2238 +#: ../extensions/feed-panel/main.c:365 +msgid "New feed" +msgstr "Novo feed" + +#: ../midori/midori-browser.c:2281 +#: ../midori/midori-browser.c:4991 +#: ../panels/midori-bookmarks.c:400 +msgid "Add a new bookmark" +msgstr "Adicionar novo favorito" + +#: ../midori/midori-browser.c:2850 +#: ../midori/midori-searchaction.c:481 +msgid "Empty" +msgstr "Vazio" + +#: ../midori/midori-browser.c:3323 +#: ../midori/sokoke.c:398 +#: ../midori/sokoke.c:408 +#: ../midori/sokoke.c:436 +#: ../midori/sokoke.c:462 +#: ../midori/sokoke.c:476 +msgid "Could not run external program." +msgstr "Não foi possível executar o programa externo." + +#: ../midori/midori-browser.c:3566 +#: ../midori/midori-browser.c:5382 +#, c-format +msgid "Failed to insert new history item: %s\n" +msgstr "Falha ao inserir novo item no histórico: %s\n" + +#: ../midori/midori-browser.c:3881 +#: ../panels/midori-bookmarks.c:713 +#: ../panels/midori-history.c:736 +msgid "Open all in _Tabs" +msgstr "Abrir tudo em _abas" + +#: ../midori/midori-browser.c:3888 +#: ../panels/midori-bookmarks.c:719 +#: ../panels/midori-history.c:742 +#: ../extensions/feed-panel/feed-panel.c:542 +msgid "Open in New _Tab" +msgstr "Abrir em nova _aba" + +#: ../midori/midori-browser.c:3891 +#: ../midori/midori-view.c:2338 +#: ../midori/midori-view.c:4014 +#: ../panels/midori-bookmarks.c:721 +#: ../panels/midori-history.c:744 +#: ../extensions/feed-panel/feed-panel.c:544 +msgid "Open in New _Window" +msgstr "Abrir em nova _janela" + +#: ../midori/midori-browser.c:3969 +msgid "Arora" +msgstr "Arora" + +#: ../midori/midori-browser.c:3970 +msgid "Kazehakase" +msgstr "Kazehakase" + +#: ../midori/midori-browser.c:3971 +msgid "Opera" +msgstr "Opera" + +#: ../midori/midori-browser.c:3972 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../midori/midori-browser.c:3973 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../midori/midori-browser.c:3997 +msgid "Import bookmarks..." +msgstr "Importar favoritos..." + +#: ../midori/midori-browser.c:4000 +#: ../midori/midori-browser.c:4996 +msgid "_Import bookmarks" +msgstr "_Importar favoritos" + +#: ../midori/midori-browser.c:4011 +msgid "_Application:" +msgstr "_Aplicativo:" + +#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:5109 +#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:317 +#: ../katze/katze-utils.c:696 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:4098 +msgid "Failed to import bookmarks" +msgstr "Falha ao importar favoritos" + +#: ../midori/midori-browser.c:4139 +msgid "Failed to export bookmarks" +msgstr "Falha ao exportar favoritos" + +#: ../midori/midori-browser.c:4192 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Falha ao limpar o histórico: %s\n" + +#: ../midori/midori-browser.c:4200 +#, c-format +msgid "Failed to clear search history: %s\n" +msgstr "Falha ao limpar o histórico de pesquisa: %s\n" + #. i18n: Dialog: Clear Private Data, in the Tools menu -#: ../midori/midori-browser.c:4994 +#: ../midori/midori-browser.c:4307 msgid "Clear Private Data" msgstr "Limpar dados privados" -#: ../midori/midori-browser.c:4998 +#: ../midori/midori-browser.c:4311 msgid "_Clear private data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5012 +#: ../midori/midori-browser.c:4325 msgid "Clear the following data:" msgstr "Limpar os seguintes dados:" -#: ../midori/midori-browser.c:5023 ../midori/midori-preferences.c:530 -#: ../panels/midori-history.c:119 +#: ../midori/midori-browser.c:4335 +#: ../midori/midori-preferences.c:532 +#: ../panels/midori-history.c:114 msgid "History" msgstr "Histórico" -#: ../midori/midori-browser.c:5029 +#: ../midori/midori-browser.c:4340 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:5034 +#: ../midori/midori-browser.c:4345 msgid "'Flash' Cookies" msgstr "Cookies 'Flash'" -#: ../midori/midori-browser.c:5039 +#: ../midori/midori-browser.c:4350 msgid "Website icons" msgstr "Ícones de sites" -#: ../midori/midori-browser.c:5044 ../midori/sokoke.c:1305 +#: ../midori/midori-browser.c:4355 +#: ../midori/sokoke.c:1314 msgid "_Closed Tabs" msgstr "Abas _fechadas" -#: ../midori/midori-browser.c:5049 ../extensions/web-cache.c:464 +#: ../midori/midori-browser.c:4360 +#: ../extensions/web-cache.c:462 msgid "Web Cache" msgstr "Cache da web" -#: ../midori/midori-browser.c:5057 +#: ../midori/midori-browser.c:4368 msgid "Clear private data when _quitting Midori" msgstr "Limpar dados privados ao _sair do Midori" -#: ../midori/midori-browser.c:5158 +#: ../midori/midori-browser.c:4509 msgid "A lightweight web browser." msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:5160 -msgid "" -"This library is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." -msgstr "" -"Esta biblioteca é software livre; você pode redistribuí-la e/ou modificá-la " -"nos termos da GNU Lesser General Public License conforme publicada pela Free " -"Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão " -"mais recente." +#: ../midori/midori-browser.c:4511 +msgid "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version." +msgstr "Esta biblioteca é software livre; você pode redistribuí-la e/ou modificá-la nos termos da GNU Lesser General Public License conforme publicada pela Free Software Foundation; tanto na versão 2.1 ou (por sua opção) qualquer versão mais recente." -#: ../midori/midori-browser.c:5179 +#: ../midori/midori-browser.c:4530 msgid "translator-credits" -msgstr "Sérgio Cipolla \n" +msgstr "" +"Sérgio Cipolla \n" "Rogério Brito " -#: ../midori/midori-browser.c:5488 +#: ../midori/midori-browser.c:4839 msgid "_File" msgstr "_Arquivo" -#: ../midori/midori-browser.c:5490 ../midori/sokoke.c:1306 +#: ../midori/midori-browser.c:4841 +#: ../midori/sokoke.c:1315 msgid "New _Window" msgstr "Nova _janela" -#: ../midori/midori-browser.c:5491 +#: ../midori/midori-browser.c:4842 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:5494 +#: ../midori/midori-browser.c:4845 msgid "Open a new tab" msgstr "Abrir nova aba" -#: ../midori/midori-browser.c:5496 +#: ../midori/midori-browser.c:4847 msgid "P_rivate Browsing" msgstr "Navegação pri_vada" -#: ../midori/midori-browser.c:5497 +#: ../midori/midori-browser.c:4848 msgid "Don't save any private data while browsing" msgstr "Não salvar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:5501 +#: ../midori/midori-browser.c:4852 msgid "Open a file" msgstr "Abrir arquivo" -#: ../midori/midori-browser.c:5504 +#: ../midori/midori-browser.c:4855 msgid "Save to a file" msgstr "Salvar para arquivo" -#: ../midori/midori-browser.c:5506 +#: ../midori/midori-browser.c:4857 msgid "Add to Speed _dial" msgstr "Adicionar à ligação rápi_da" -#: ../midori/midori-browser.c:5507 +#: ../midori/midori-browser.c:4858 msgid "Add shortcut to speed dial" msgstr "Adicionar atalho à ligação rápida" -#: ../midori/midori-browser.c:5509 +#: ../midori/midori-browser.c:4860 msgid "Add Shortcut to the _desktop" msgstr "A_dicionar atalho à área de trabalho" -#: ../midori/midori-browser.c:5510 +#: ../midori/midori-browser.c:4861 msgid "Add shortcut to the desktop" msgstr "Adicionar atalho à área de trabalho" -#: ../midori/midori-browser.c:5512 +#: ../midori/midori-browser.c:4863 msgid "Subscribe to News _feed" msgstr "Inscrever _feed de notícias" -#: ../midori/midori-browser.c:5513 +#: ../midori/midori-browser.c:4864 msgid "Subscribe to this news feed" msgstr "Inscrever este feed de notícias" -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:4869 msgid "_Close Tab" msgstr "_Fechar aba" -#: ../midori/midori-browser.c:5519 +#: ../midori/midori-browser.c:4870 msgid "Close the current tab" msgstr "Fechar a aba atual" -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:4872 msgid "C_lose Window" msgstr "Fechar jane_la" -#: ../midori/midori-browser.c:5522 +#: ../midori/midori-browser.c:4873 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:5525 +#: ../midori/midori-browser.c:4876 msgid "Print the current page" msgstr "Imprimir a página atual" -#: ../midori/midori-browser.c:5528 +#: ../midori/midori-browser.c:4879 msgid "Quit the application" msgstr "Sair do aplicativo" -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:4881 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:5534 +#: ../midori/midori-browser.c:4885 msgid "Undo the last modification" msgstr "Desfazer a última modificação" -#: ../midori/midori-browser.c:5537 +#: ../midori/midori-browser.c:4888 msgid "Redo the last modification" msgstr "Refazer a última modificação" -#: ../midori/midori-browser.c:5541 +#: ../midori/midori-browser.c:4892 msgid "Cut the selected text" msgstr "Recortar o texto selecionado" -#: ../midori/midori-browser.c:5544 ../midori/midori-browser.c:5547 +#: ../midori/midori-browser.c:4895 +#: ../midori/midori-browser.c:4898 msgid "Copy the selected text" msgstr "Copiar o texto selecionado" -#: ../midori/midori-browser.c:5550 +#: ../midori/midori-browser.c:4901 msgid "Paste text from the clipboard" msgstr "Colar texto da área de transferência" -#: ../midori/midori-browser.c:5553 +#: ../midori/midori-browser.c:4904 msgid "Delete the selected text" msgstr "Excluir o texto selecionado" -#: ../midori/midori-browser.c:5556 +#: ../midori/midori-browser.c:4907 msgid "Select all text" msgstr "Selecionar todo o texto" -#: ../midori/midori-browser.c:5559 +#: ../midori/midori-browser.c:4910 msgid "Find a word or phrase in the page" msgstr "Localizar palavra ou frase na página" -#: ../midori/midori-browser.c:5561 +#: ../midori/midori-browser.c:4912 msgid "Find _Next" msgstr "Localizar _seguinte" -#: ../midori/midori-browser.c:5562 +#: ../midori/midori-browser.c:4913 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar a ocorrência seguinte da palavra ou frase" -#: ../midori/midori-browser.c:5564 +#: ../midori/midori-browser.c:4915 msgid "Find _Previous" msgstr "Localizar _anterior" -#: ../midori/midori-browser.c:5565 +#: ../midori/midori-browser.c:4916 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocorrência anterior da palavra ou frase" -#: ../midori/midori-browser.c:5569 +#: ../midori/midori-browser.c:4920 msgid "Configure the application preferences" msgstr "Configurar preferências do aplicativo" -#: ../midori/midori-browser.c:5571 +#: ../midori/midori-browser.c:4922 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:5572 +#: ../midori/midori-browser.c:4923 msgid "_Toolbars" msgstr "_Barras de ferramentas" -#: ../midori/midori-browser.c:5584 +#: ../midori/midori-browser.c:4935 msgid "Increase the zoom level" msgstr "Ampliar" -#: ../midori/midori-browser.c:5587 +#: ../midori/midori-browser.c:4938 msgid "Decrease the zoom level" msgstr "Reduzir" -#: ../midori/midori-browser.c:5590 +#: ../midori/midori-browser.c:4941 msgid "Reset the zoom level" msgstr "Tamanho normal" -#: ../midori/midori-browser.c:5591 +#: ../midori/midori-browser.c:4942 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:5593 +#: ../midori/midori-browser.c:4944 msgid "View So_urce" msgstr "Ver _fonte" -#: ../midori/midori-browser.c:5594 +#: ../midori/midori-browser.c:4945 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:5597 +#: ../midori/midori-browser.c:4948 msgid "Toggle fullscreen view" msgstr "Alternar tela cheia" -#: ../midori/midori-browser.c:5600 +#: ../midori/midori-browser.c:4951 msgid "Scroll _Left" msgstr "Rolar à _esquerda" -#: ../midori/midori-browser.c:5601 +#: ../midori/midori-browser.c:4952 msgid "Scroll to the left" msgstr "Rolar à esquerda" -#: ../midori/midori-browser.c:5603 +#: ../midori/midori-browser.c:4954 msgid "Scroll _Down" msgstr "Rolar para _baixo" -#: ../midori/midori-browser.c:5604 +#: ../midori/midori-browser.c:4955 msgid "Scroll down" msgstr "Rolar para baixo" -#: ../midori/midori-browser.c:5606 +#: ../midori/midori-browser.c:4957 msgid "Scroll _Up" msgstr "Rolar para _cima" -#: ../midori/midori-browser.c:5607 +#: ../midori/midori-browser.c:4958 msgid "Scroll up" msgstr "Rolar para cima" -#: ../midori/midori-browser.c:5609 +#: ../midori/midori-browser.c:4960 msgid "Scroll _Right" msgstr "Rolar à _direita" -#: ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:4961 msgid "Scroll to the right" msgstr "Rolar à direita" -#: ../midori/midori-browser.c:5613 +#: ../midori/midori-browser.c:4964 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:5616 +#: ../midori/midori-browser.c:4967 msgid "Go back to the previous page" msgstr "Ir para a página anterior" -#: ../midori/midori-browser.c:5619 +#: ../midori/midori-browser.c:4970 msgid "Go forward to the next page" msgstr "Ir para a página seguinte" #. i18n: Visit the previous logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5623 +#: ../midori/midori-browser.c:4974 msgid "Go to the previous sub-page" msgstr "Ir para a subpágina anterior" #. i18n: Visit the following logical page, ie. in a forum or blog -#: ../midori/midori-browser.c:5627 +#: ../midori/midori-browser.c:4978 msgid "Go to the next sub-page" msgstr "Ir para a subpágina seguinte" -#: ../midori/midori-browser.c:5630 +#: ../midori/midori-browser.c:4981 msgid "Go to your homepage" msgstr "Ir para a página inicial" -#: ../midori/midori-browser.c:5632 +#: ../midori/midori-browser.c:4983 msgid "Empty Trash" msgstr "Esvaziar lixo" -#: ../midori/midori-browser.c:5633 +#: ../midori/midori-browser.c:4984 msgid "Delete the contents of the trash" msgstr "Excluir o conteúdo do lixo" -#: ../midori/midori-browser.c:5635 +#: ../midori/midori-browser.c:4986 msgid "Undo _Close Tab" -msgstr "Desfazer _fechar aba" +msgstr "De_sfazer fechar aba" -#: ../midori/midori-browser.c:5636 +#: ../midori/midori-browser.c:4987 msgid "Open the last closed tab" msgstr "Abrir a última aba fechada" -#: ../midori/midori-browser.c:5642 +#: ../midori/midori-browser.c:4993 msgid "Add a new _folder" msgstr "Adicionar _nova pasta" -#: ../midori/midori-browser.c:5643 +#: ../midori/midori-browser.c:4994 msgid "Add a new bookmark folder" msgstr "Adicionar nova pasta de favoritos" -#: ../midori/midori-browser.c:5648 +#: ../midori/midori-browser.c:4999 msgid "_Export bookmarks" msgstr "_Exportar favoritos" -#: ../midori/midori-browser.c:5651 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:5002 +#: ../midori/midori-searchaction.c:490 msgid "_Manage Search Engines" msgstr "Gerenciar motores de _pesquisa" -#: ../midori/midori-browser.c:5652 +#: ../midori/midori-browser.c:5003 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e excluir motores de pesquisa..." -#: ../midori/midori-browser.c:5655 +#: ../midori/midori-browser.c:5006 msgid "_Clear Private Data" msgstr "_Limpar dados privados" -#: ../midori/midori-browser.c:5656 +#: ../midori/midori-browser.c:5007 msgid "Clear private data..." msgstr "Limpar dados privados..." -#: ../midori/midori-browser.c:5660 +#: ../midori/midori-browser.c:5011 msgid "_Inspect Page" msgstr "Inspecionar página" -#: ../midori/midori-browser.c:5661 +#: ../midori/midori-browser.c:5012 msgid "Inspect page details and access developer tools..." -msgstr "" -"Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..." +msgstr "Inspecionar detalhes da página e acessar ferramentas de desenvolvimento..." -#: ../midori/midori-browser.c:5666 +#: ../midori/midori-browser.c:5017 msgid "_Previous Tab" msgstr "Aba _anterior" -#: ../midori/midori-browser.c:5667 +#: ../midori/midori-browser.c:5018 msgid "Switch to the previous tab" msgstr "Mudar para a aba anterior" -#: ../midori/midori-browser.c:5669 +#: ../midori/midori-browser.c:5020 msgid "_Next Tab" msgstr "Aba _seguinte" -#: ../midori/midori-browser.c:5670 +#: ../midori/midori-browser.c:5021 msgid "Switch to the next tab" msgstr "Mudar para a aba seguinte" -#: ../midori/midori-browser.c:5672 +#: ../midori/midori-browser.c:5023 msgid "Focus _Current Tab" msgstr "_Focar aba atual" -#: ../midori/midori-browser.c:5673 +#: ../midori/midori-browser.c:5024 msgid "Focus the current tab" msgstr "Focar a aba atual" -#: ../midori/midori-browser.c:5675 +#: ../midori/midori-browser.c:5026 +msgid "Minimize _Current Tab" +msgstr "Minimizar aba a_tual" + +#: ../midori/midori-browser.c:5027 +msgid "Minimize the current tab" +msgstr "Minimizar a aba atual" + +#: ../midori/midori-browser.c:5029 +msgid "_Duplicate Current Tab" +msgstr "Duplicar a_ba atual" + +#: ../midori/midori-browser.c:5030 +msgid "Duplicate the current tab" +msgstr "Duplicar a aba atual" + +#: ../midori/midori-browser.c:5032 +msgid "Close Ot_her Tabs" +msgstr "Fec_har outras abas" + +#: ../midori/midori-browser.c:5033 +msgid "Close all tabs except the current tab" +msgstr "Fechar todas as abas exceto a atual" + +#: ../midori/midori-browser.c:5035 msgid "Open last _session" msgstr "Abrir _última sessão" -#: ../midori/midori-browser.c:5676 +#: ../midori/midori-browser.c:5036 msgid "Open the tabs saved in the last session" msgstr "Abrir as abas salvas na última sessão" -#: ../midori/midori-browser.c:5678 +#: ../midori/midori-browser.c:5038 msgid "_Help" msgstr "Aj_uda" -#: ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:5040 msgid "_Contents" msgstr "_Conteúdo" -#: ../midori/midori-browser.c:5681 +#: ../midori/midori-browser.c:5041 msgid "Show the documentation" msgstr "Exibir a documentação" -#: ../midori/midori-browser.c:5683 +#: ../midori/midori-browser.c:5043 msgid "_Frequent Questions" msgstr "Perguntas _frequentes" -#: ../midori/midori-browser.c:5684 +#: ../midori/midori-browser.c:5044 msgid "Show the Frequently Asked Questions" msgstr "Exibir as perguntas frequentes" -#: ../midori/midori-browser.c:5686 +#: ../midori/midori-browser.c:5046 msgid "_Report a Bug" msgstr "_Relatar erro" -#: ../midori/midori-browser.c:5687 +#: ../midori/midori-browser.c:5047 msgid "Open Midori's bug tracker" msgstr "Abrir o rastreador de bugs do Midori" -#: ../midori/midori-browser.c:5690 +#: ../midori/midori-browser.c:5050 msgid "Show information about the program" msgstr "Exibir informação sobre o programa" -#: ../midori/midori-browser.c:5698 +#: ../midori/midori-browser.c:5058 msgid "_Menubar" msgstr "Barra de _menu" -#: ../midori/midori-browser.c:5699 +#: ../midori/midori-browser.c:5059 msgid "Show menubar" msgstr "Exibir barra de menu" -#: ../midori/midori-browser.c:5702 +#: ../midori/midori-browser.c:5062 msgid "_Navigationbar" msgstr "Barra de _navegação" -#: ../midori/midori-browser.c:5703 +#: ../midori/midori-browser.c:5063 msgid "Show navigationbar" msgstr "Exibir barra de navegação" -#: ../midori/midori-browser.c:5706 +#: ../midori/midori-browser.c:5066 msgid "Side_panel" msgstr "Painel _lateral" -#: ../midori/midori-browser.c:5707 +#: ../midori/midori-browser.c:5067 msgid "Show sidepanel" msgstr "Exibir painel lateral" -#: ../midori/midori-browser.c:5710 +#: ../midori/midori-browser.c:5070 msgid "_Bookmarkbar" msgstr "Barra de _favoritos" -#: ../midori/midori-browser.c:5711 +#: ../midori/midori-browser.c:5071 msgid "Show bookmarkbar" msgstr "Exibir barra de favoritos" -#: ../midori/midori-browser.c:5714 +#: ../midori/midori-browser.c:5074 msgid "_Transferbar" msgstr "Barra de _transferências" -#: ../midori/midori-browser.c:5715 +#: ../midori/midori-browser.c:5075 msgid "Show transferbar" msgstr "Exibir barra de transferências" -#: ../midori/midori-browser.c:5718 +#: ../midori/midori-browser.c:5078 msgid "_Statusbar" msgstr "Barra de _status" -#: ../midori/midori-browser.c:5719 +#: ../midori/midori-browser.c:5079 msgid "Show statusbar" msgstr "Exibir barra de status" -#: ../midori/midori-browser.c:5727 +#: ../midori/midori-browser.c:5087 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:5730 ../midori/midori-websettings.c:221 +#: ../midori/midori-browser.c:5090 +#: ../midori/midori-websettings.c:220 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" #. i18n: A double underscore "__" is used to prevent the mnemonic -#: ../midori/midori-browser.c:5734 +#: ../midori/midori-browser.c:5094 msgid "Japanese (SHIFT__JIS)" msgstr "Japonês (SHIFT__JIS)" -#: ../midori/midori-browser.c:5737 ../midori/midori-websettings.c:223 +#: ../midori/midori-browser.c:5097 +#: ../midori/midori-websettings.c:222 msgid "Korean (EUC-KR)" msgstr "Coreano (EUC-KR)" -#: ../midori/midori-browser.c:5740 ../midori/midori-websettings.c:224 +#: ../midori/midori-browser.c:5100 +#: ../midori/midori-websettings.c:223 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:5743 ../midori/midori-websettings.c:225 +#: ../midori/midori-browser.c:5103 +#: ../midori/midori-websettings.c:224 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:5746 ../midori/midori-websettings.c:226 +#: ../midori/midori-browser.c:5106 +#: ../midori/midori-websettings.c:225 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:6294 +#: ../midori/midori-browser.c:5625 msgid "_Separator" msgstr "_Aba" -#: ../midori/midori-browser.c:6301 +#: ../midori/midori-browser.c:5632 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:6303 +#: ../midori/midori-browser.c:5634 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:6327 +#: ../midori/midori-browser.c:5658 msgid "_Web Search..." msgstr "Pesquisa _web..." -#: ../midori/midori-browser.c:6329 +#: ../midori/midori-browser.c:5660 msgid "Run a web search" msgstr "Pesquisar na web" -#: ../midori/midori-browser.c:6350 +#: ../midori/midori-browser.c:5681 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou aba anteriormente fechada" -#: ../midori/midori-browser.c:6365 -msgid "_Recently visited pages" -msgstr "Páginas _recentes" - -#: ../midori/midori-browser.c:6367 -msgid "Reopen pages that you visited earlier" -msgstr "Reabrir páginas visitadas anteriormente" - -#: ../midori/midori-browser.c:6382 ../midori/sokoke.c:1295 +#: ../midori/midori-browser.c:5696 +#: ../midori/sokoke.c:1304 msgid "_Bookmarks" msgstr "_Favoritos" -#: ../midori/midori-browser.c:6384 +#: ../midori/midori-browser.c:5698 msgid "Show the saved bookmarks" msgstr "Exibir favoritos salvos" -#: ../midori/midori-browser.c:6399 +#: ../midori/midori-browser.c:5714 msgid "_Tools" msgstr "Ferramen_tas" -#: ../midori/midori-browser.c:6412 +#: ../midori/midori-browser.c:5731 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:6414 +#: ../midori/midori-browser.c:5733 msgid "Show a list of all open tabs" msgstr "Exibir lista das abas abertas" -#: ../midori/midori-browser.c:6428 +#: ../midori/midori-browser.c:5747 msgid "_Menu" msgstr "_Menu" -#: ../midori/midori-browser.c:6430 +#: ../midori/midori-browser.c:5749 msgid "Menu" msgstr "Menu" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:6634 -msgid "_Inline Find:" -msgstr "Local_izar na página:" - -#: ../midori/midori-browser.c:6665 -msgid "Previous" -msgstr "Anterior" - -#: ../midori/midori-browser.c:6670 -msgid "Next" -msgstr "Seguinte" - -#: ../midori/midori-browser.c:6675 -msgid "Match Case" -msgstr "Sensível ao caso" - -#: ../midori/midori-browser.c:6684 -msgid "Highlight Matches" -msgstr "Realçar correspondências" - -#: ../midori/midori-browser.c:6696 -msgid "Close Findbar" -msgstr "Fechar barra de localização" - -#: ../midori/midori-browser.c:6742 ../panels/midori-transfers.c:141 -msgid "Clear All" -msgstr "Limpar tudo" - -#: ../midori/midori-browser.c:7100 +#: ../midori/midori-browser.c:6314 #, c-format msgid "Unexpected setting '%s'" msgstr "Configuração inesperada '%s'" -#: ../midori/midori-locationaction.c:377 +#: ../midori/midori-locationaction.c:390 #, c-format msgid "Failed to select from history\n" msgstr "Falha ao selecionar do histórico\n" -#: ../midori/midori-locationaction.c:459 +#: ../midori/midori-locationaction.c:474 #, c-format msgid "Search for %s" msgstr "Pesquisar por %s" -#: ../midori/midori-locationaction.c:482 +#: ../midori/midori-locationaction.c:497 #, c-format msgid "Search with %s" msgstr "Pesquisar com %s" -#: ../midori/midori-locationaction.c:1197 +#: ../midori/midori-locationaction.c:1305 #, c-format msgid "Failed to execute database statement\n" msgstr "Falha ao executar afirmação da base de dados:\n" #. i18n: Right-click on Location, Open an URL from the clipboard -#: ../midori/midori-locationaction.c:1254 +#: ../midori/midori-locationaction.c:1361 msgid "Paste and p_roceed" msgstr "Cola_r e prosseguir" -#: ../midori/midori-panel.c:432 ../midori/midori-panel.c:434 +#: ../midori/midori-panel.c:412 +#: ../midori/midori-panel.c:414 msgid "Detach chosen panel from the window" msgstr "Separar da janela o painel escolhido" -#: ../midori/midori-panel.c:444 ../midori/midori-panel.c:446 -#: ../midori/midori-panel.c:639 ../midori/midori-panel.c:642 +#: ../midori/midori-panel.c:424 +#: ../midori/midori-panel.c:426 +#: ../midori/midori-panel.c:596 +#: ../midori/midori-panel.c:599 msgid "Align sidepanel to the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-panel.c:456 ../midori/midori-panel.c:457 +#: ../midori/midori-panel.c:436 +#: ../midori/midori-panel.c:437 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-panel.c:640 ../midori/midori-panel.c:643 +#: ../midori/midori-panel.c:597 +#: ../midori/midori-panel.c:600 msgid "Align sidepanel to the left" msgstr "Alinhar painel lateral à esquerda" -#: ../midori/midori-panel.c:797 +#: ../midori/midori-panel.c:754 msgid "Hide operating controls" msgstr "Ocultar controles operacionais" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:200 msgid "Show Blank page" msgstr "Exibir página em branco" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:201 msgid "Show Homepage" msgstr "Exibir a página inicial" -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:202 msgid "Show last open tabs" msgstr "Exibir as últimas abas abertas" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:204 +msgid "Show last tabs without loading" +msgstr "Exibir as últimas abas sem carregá-las" + +#: ../midori/midori-websettings.c:221 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:241 msgid "New tab" msgstr "Nova aba" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:242 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:244 +#: ../midori/midori-websettings.c:243 msgid "Current tab" msgstr "Aba atual" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:258 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:259 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:260 msgid "Small icons" msgstr "Ícones pequenos" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:261 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:262 msgid "Icons and text" msgstr "Ícones e texto" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:263 msgid "Text beside icons" msgstr "Texto ao lado dos ícones" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:278 msgid "Automatic (GNOME or environment)" msgstr "Automático (GNOME ou ambiente)" -#: ../midori/midori-websettings.c:280 +#: ../midori/midori-websettings.c:279 msgid "HTTP proxy server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:281 +#: ../midori/midori-websettings.c:280 msgid "No proxy server" msgstr "Sem servidor proxy" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:295 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:296 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:298 ../katze/katze-utils.c:667 +#: ../midori/midori-websettings.c:297 +#: ../katze/katze-utils.c:672 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:314 +#: ../midori/midori-websettings.c:313 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:314 msgid "iPhone" msgstr "iPhone" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:315 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:317 +#: ../midori/midori-websettings.c:316 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:369 msgid "Remember last window size" msgstr "Lembrar último tamanho da janela" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:370 msgid "Whether to save the last window size" msgstr "Se o último tamanho da janela deve ser salvo" -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:378 msgid "Last window width" msgstr "Última largura da janela" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:379 msgid "The last saved window width" msgstr "Última largura da janela salva" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:387 msgid "Last window height" msgstr "Última altura da janela" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:388 msgid "The last saved window height" msgstr "Última altura da janela salva" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:413 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:414 msgid "The last saved panel position" msgstr "Última posição do painel salva" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:423 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:424 msgid "The last saved panel page" msgstr "Última página do painel salva" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:432 msgid "Last Web search" msgstr "Última pesquisa na web" -#: ../midori/midori-websettings.c:434 +#: ../midori/midori-websettings.c:433 msgid "The last saved Web search" msgstr "Última pesquisa na web salva" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:442 msgid "Show Menubar" msgstr "Exibir barra de menu" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:443 msgid "Whether to show the menubar" msgstr "Se a barra de menu deve ser exibida" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:451 msgid "Show Navigationbar" msgstr "Exibir barra de navegação" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:452 msgid "Whether to show the navigationbar" msgstr "Se a barra de navegação deve ser exibida" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:460 msgid "Show Bookmarkbar" msgstr "Exibir barra de favoritos" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:461 msgid "Whether to show the bookmarkbar" msgstr "Se a barra de favoritos deve ser exibida" -#: ../midori/midori-websettings.c:470 +#: ../midori/midori-websettings.c:469 msgid "Show Panel" msgstr "Exibir painel" -#: ../midori/midori-websettings.c:471 +#: ../midori/midori-websettings.c:470 msgid "Whether to show the panel" msgstr "Se o painel deve ser exibido" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:485 msgid "Show Transferbar" msgstr "Exibir barra de transferências" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:486 msgid "Whether to show the transferbar" msgstr "Se a barra de transferências deve ser exibida" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:494 msgid "Show Statusbar" msgstr "Exibir barra de status" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:495 msgid "Whether to show the statusbar" msgstr "Se a barra de status deve ser exibida" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:504 msgid "Toolbar Style:" msgstr "Estilo da barra de ferramentas:" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:505 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:521 msgid "Show progress in location entry" msgstr "Exibir progresso no campo de endereço" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:522 msgid "Whether to show loading progress in the location entry" msgstr "Se o progresso do carregamento deve ser exibido no campo de endereço" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:537 msgid "Search engines in location completion" msgstr "Motores de pesquisa na complementação do endereço" -#: ../midori/midori-websettings.c:539 +#: ../midori/midori-websettings.c:538 msgid "Whether to show search engines in the location completion" -msgstr "" -"Se motores de pesquisa devem ser exibidos na complementação do endereço" +msgstr "Se motores de pesquisa devem ser exibidos na complementação do endereço" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:546 msgid "Toolbar Items" msgstr "Itens da barra de ferramentas" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:547 msgid "The items to show on the toolbar" msgstr "Itens a serem exibidos na barra de ferramentas" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:555 msgid "Compact Sidepanel" msgstr "Painel lateral compacto" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:556 msgid "Whether to make the sidepanel compact" msgstr "Se o painel lateral deve ser compacto" -#: ../midori/midori-websettings.c:572 +#: ../midori/midori-websettings.c:571 msgid "Show operating controls of the panel" msgstr "Exibir os controles operacionais do painel" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:572 msgid "Whether to show the operating controls of the panel" msgstr "Se os controles operacionais do painel devem ser exibidos" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:587 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:588 msgid "Whether to align the sidepanel on the right" msgstr "Se o painel lateral deve ser alinhado à direita" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:603 msgid "Open panels in separate windows" msgstr "Abrir painéis em janelas separadas" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:604 msgid "Whether to always open panels in separate windows" msgstr "Se os painéis devem ser sempre abertos em janelas separadas" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:613 msgid "When Midori starts:" msgstr "Ao iniciar o Midori:" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:614 msgid "What to do when Midori starts" msgstr "O que fazer ao iniciar o Midori" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:623 msgid "Homepage:" msgstr "Página inicial:" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:624 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:639 msgid "Show crash dialog" msgstr "Exibir diálogo de encerramento abrupto" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:640 msgid "Show a dialog after Midori crashed" msgstr "Exibir um diálogo após o encerramento abrupto do Midori" #. i18n: Speed dial, webpage shortcuts, named for the phone function -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:656 msgid "Show speed dial in new tabs" msgstr "Exibir ligação rápida nas novas abas" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:657 msgid "Show speed dial in newly opened tabs" msgstr "Exibir ligação rápida nas abas recentemente abertas" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:665 msgid "Save downloaded files to:" msgstr "Salvar arquivos baixados em:" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:666 msgid "The folder downloaded files are saved to" msgstr "A pasta na qual salvar os arquivos baixados" -#: ../midori/midori-websettings.c:688 +#: ../midori/midori-websettings.c:687 msgid "Ask for the destination folder" msgstr "Perguntar pela pasta de destino" -#: ../midori/midori-websettings.c:689 +#: ../midori/midori-websettings.c:688 msgid "Whether to ask for the destination folder when downloading a file" msgstr "Se é para perguntar em que pasta salvar o arquivo a ser baixado" -#: ../midori/midori-websettings.c:708 +#: ../midori/midori-websettings.c:707 msgid "Notify when a transfer has been completed" msgstr "Notificar ao concluir a transferência" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:708 msgid "Whether to show a notification when a transfer has been completed" msgstr "Se uma notificação deve ser exibida ao concluir-se a transferência" -#: ../midori/midori-websettings.c:721 +#: ../midori/midori-websettings.c:720 msgid "Download Manager" msgstr "Gerenciador de downloads" -#: ../midori/midori-websettings.c:722 +#: ../midori/midori-websettings.c:721 msgid "An external download manager" msgstr "Um gerenciador de downloads externo" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:729 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:731 +#: ../midori/midori-websettings.c:730 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:745 msgid "News Aggregator" msgstr "Agregador de notícias" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:746 msgid "An external news aggregator" msgstr "Um agregador de notícias externo" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:754 msgid "Location entry Search" msgstr "Pesquisa no campo de endereço" -#: ../midori/midori-websettings.c:756 +#: ../midori/midori-websettings.c:755 msgid "The search to perform inside the location entry" msgstr "A pesquisa a ser executada pelo campo de endereço" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:763 msgid "Preferred Encoding" msgstr "Codificação preferida" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:764 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:774 msgid "Always Show Tabbar" msgstr "Sempre exibir barra de abas" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:775 msgid "Always show the tabbar" msgstr "Se a barra de abas deve ser exibida mesmo com apenas uma aba aberta" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:783 msgid "Close Buttons on Tabs" msgstr "Botão fechar nas abas" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:784 msgid "Whether tabs have close buttons" msgstr "Se as abas devem ter um botão para fechar" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:792 msgid "Open new pages in:" msgstr "Abrir novas páginas em:" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:793 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:802 msgid "Open external pages in:" msgstr "Abrir páginas externas em:" -#: ../midori/midori-websettings.c:804 +#: ../midori/midori-websettings.c:803 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:813 +#: ../midori/midori-websettings.c:812 msgid "Middle click opens Selection" msgstr "Clique na roda do mouse abre seleção" -#: ../midori/midori-websettings.c:814 +#: ../midori/midori-websettings.c:813 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço selecionado clicando na roda do mouse" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:821 msgid "Open tabs in the background" msgstr "Abrir abas em segundo plano" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:822 msgid "Whether to open new tabs in the background" msgstr "Se as novas abas devem ser abertas em segundo plano" -#: ../midori/midori-websettings.c:831 +#: ../midori/midori-websettings.c:830 msgid "Open Tabs next to Current" msgstr "Abrir abas ao lado da atual" -#: ../midori/midori-websettings.c:832 +#: ../midori/midori-websettings.c:831 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Se as novas abas devem ser abertas ao lado da atual em vez de após a última" +msgstr "Se as novas abas devem ser abertas ao lado da atual em vez de após a última" -#: ../midori/midori-websettings.c:840 +#: ../midori/midori-websettings.c:839 msgid "Open popups in tabs" msgstr "Abrir popups em abas" -#: ../midori/midori-websettings.c:841 +#: ../midori/midori-websettings.c:840 msgid "Whether to open popup windows in tabs" msgstr "Se janelas popup devem ser abertas em abas" -#: ../midori/midori-websettings.c:851 ../extensions/statusbar-features.c:88 +#: ../midori/midori-websettings.c:850 +#: ../extensions/statusbar-features.c:88 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-websettings.c:852 +#: ../midori/midori-websettings.c:851 msgid "Load and display images automatically" msgstr "Carregar e exibir as imagens automaticamente" -#: ../midori/midori-websettings.c:859 ../extensions/statusbar-features.c:100 +#: ../midori/midori-websettings.c:858 +#: ../extensions/statusbar-features.c:100 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-websettings.c:860 +#: ../midori/midori-websettings.c:859 msgid "Enable embedded scripting languages" msgstr "Habilitar linguagem de scripts incorporadas" -#: ../midori/midori-websettings.c:867 ../extensions/statusbar-features.c:112 +#: ../midori/midori-websettings.c:866 +#: ../extensions/statusbar-features.c:112 msgid "Enable Netscape plugins" msgstr "Habilitar plugins Netscape" -#: ../midori/midori-websettings.c:868 +#: ../midori/midori-websettings.c:867 msgid "Enable embedded Netscape plugin objects" msgstr "Habilitar plugins Netscape incorporados" -#: ../midori/midori-websettings.c:884 +#: ../midori/midori-websettings.c:883 msgid "Enable HTML5 database support" msgstr "Habilitar suporte a dados HTML5" -#: ../midori/midori-websettings.c:885 +#: ../midori/midori-websettings.c:884 msgid "Whether to enable HTML5 database support" msgstr "Se o suporte a dados HTML5 deve ser habilitado" -#: ../midori/midori-websettings.c:891 +#: ../midori/midori-websettings.c:890 msgid "Enable HTML5 local storage support" msgstr "Habilitar suporte a armazenagem local HTML5" -#: ../midori/midori-websettings.c:892 +#: ../midori/midori-websettings.c:891 msgid "Whether to enable HTML5 local storage support" msgstr "Se o suporte a armazenagem local HTML5 deve ser habilitado" -#: ../midori/midori-websettings.c:900 +#: ../midori/midori-websettings.c:899 msgid "Enable offline web application cache" msgstr "Habilitar cache de aplicativo web offline" -#: ../midori/midori-websettings.c:901 +#: ../midori/midori-websettings.c:900 msgid "Whether to enable offline web application cache" msgstr "Se o cache de aplicativo web offline deve ser habilitado" -#: ../midori/midori-websettings.c:926 +#: ../midori/midori-websettings.c:925 msgid "Zoom Text and Images" msgstr "Zoom de texto e imagens" -#: ../midori/midori-websettings.c:927 +#: ../midori/midori-websettings.c:926 msgid "Whether to zoom text and images" msgstr "Se o zoom de texto e imagens pode ser ajustado" -#: ../midori/midori-websettings.c:942 +#: ../midori/midori-websettings.c:941 msgid "Find inline while typing" msgstr "Localizar na página ao digitar" -#: ../midori/midori-websettings.c:943 +#: ../midori/midori-websettings.c:942 msgid "Whether to automatically find inline while typing" msgstr "Se a localização na página deve ser automaticamente ao digitar" -#: ../midori/midori-websettings.c:958 +#: ../midori/midori-websettings.c:957 msgid "Kinetic scrolling" msgstr "Rolagem cinética" -#: ../midori/midori-websettings.c:959 +#: ../midori/midori-websettings.c:958 msgid "Whether scrolling should kinetically move according to speed" msgstr "Se a rolagem deve se mover cineticamente conforme a velocidade" -#: ../midori/midori-websettings.c:967 +#: ../midori/midori-websettings.c:966 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:968 +#: ../midori/midori-websettings.c:967 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:984 -msgid "Original cookies only" -msgstr "Apenas cookies originais" - -#: ../midori/midori-websettings.c:985 -msgid "Accept cookies from the original website only" -msgstr "Apenas aceitar cookies do site web original" - -#: ../midori/midori-websettings.c:993 +#: ../midori/midori-websettings.c:976 msgid "Maximum cookie age" msgstr "Antiguidade máxima dos cookies" -#: ../midori/midori-websettings.c:994 +#: ../midori/midori-websettings.c:977 msgid "The maximum number of days to save cookies for" msgstr "O número máximo de dias para manter cookies salvos" -#: ../midori/midori-websettings.c:1011 -msgid "Remember last visited pages" -msgstr "Lembrar últimas páginas visitadas" - -#: ../midori/midori-websettings.c:1012 -msgid "Whether the last visited pages are saved" -msgstr "Se as últimas páginas visitadas devem ser salvas" - -#: ../midori/midori-websettings.c:1020 +#: ../midori/midori-websettings.c:986 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:1021 +#: ../midori/midori-websettings.c:987 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para os quais manter um histórico" -#: ../midori/midori-websettings.c:1029 +#: ../midori/midori-websettings.c:995 msgid "Remember last downloaded files" msgstr "Lembrar últimos arquivos baixados" -#: ../midori/midori-websettings.c:1030 +#: ../midori/midori-websettings.c:996 msgid "Whether the last downloaded files are saved" msgstr "Se os últimos arquivos baixados devem ser lembrados" -#: ../midori/midori-websettings.c:1047 +#: ../midori/midori-websettings.c:1013 msgid "Proxy server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:1048 +#: ../midori/midori-websettings.c:1014 msgid "The type of proxy server to use" msgstr "O tipo de servidor a utilizar" -#: ../midori/midori-websettings.c:1057 +#: ../midori/midori-websettings.c:1023 msgid "HTTP Proxy Server" msgstr "Servidor proxy HTTP" -#: ../midori/midori-websettings.c:1058 +#: ../midori/midori-websettings.c:1024 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para conexões HTTP" -#: ../midori/midori-websettings.c:1073 -msgid "Detect proxy server automatically" -msgstr "Detectar servidor proxy automaticamente" - -#: ../midori/midori-websettings.c:1074 -msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Se o servidor proxy deve ser detectado automaticamente" - #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:1090 +#: ../midori/midori-websettings.c:1040 msgid "Identify as" msgstr "Identificar-se como" -#: ../midori/midori-websettings.c:1091 +#: ../midori/midori-websettings.c:1041 msgid "What to identify as to web pages" msgstr "Identificar-se para as páginas web como" -#: ../midori/midori-websettings.c:1107 +#: ../midori/midori-websettings.c:1057 msgid "Identification string" msgstr "Cadeia de identificação" -#: ../midori/midori-websettings.c:1108 +#: ../midori/midori-websettings.c:1058 msgid "The application identification string" msgstr "A cadeia de identificação do aplicativo" -#: ../midori/midori-websettings.c:1123 +#: ../midori/midori-websettings.c:1073 msgid "Preferred languages" msgstr "Idiomas preferidos" -#: ../midori/midori-websettings.c:1124 -msgid "" -"A comma separated list of languages preferred for rendering multilingual " -"webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" -msgstr "" -"Uma lista de idiomas, separados por vírgulas, para o processamento de " -"páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-" -"fr;q=0.667\"" +#: ../midori/midori-websettings.c:1074 +msgid "A comma separated list of languages preferred for rendering multilingual webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" +msgstr "Uma lista de idiomas, separados por vírgulas, para o processamento de páginas web multilíngues, por exemplo \"pt\", \"ru,es\" ou \"en-us;q=1.0, fr-fr;q=0.667\"" -#: ../midori/midori-websettings.c:1139 +#: ../midori/midori-websettings.c:1089 msgid "Clear private data" msgstr "Limpar dados privados" -#: ../midori/midori-websettings.c:1140 +#: ../midori/midori-websettings.c:1090 msgid "The private data selected for deletion" msgstr "Os dados privados selecionados para exclusão" @@ -1703,466 +1688,563 @@ msgstr "Os dados privados selecionados para exclusão" #. so reloading via Javascript works but not via API calls. #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:1261 ../midori/midori-view.c:4528 -#: ../midori/midori-view.c:4532 +#: ../midori/midori-view.c:1227 +#: ../midori/midori-view.c:4442 +#: ../midori/midori-view.c:4446 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1228 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página '%s' não pôde ser carregada." -#: ../midori/midori-view.c:1264 +#: ../midori/midori-view.c:1230 msgid "Try again" msgstr "Tente novamente" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1249 #, c-format msgid "Not found - %s" msgstr "Não encontrado - %s" -#: ../midori/midori-view.c:1520 ../midori/midori-view.c:2357 +#: ../midori/midori-view.c:1433 +#: ../midori/midori-view.c:2279 #, c-format msgid "Send a message to %s" msgstr "Enviar uma mensagem para %s" -#: ../midori/midori-view.c:2139 ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2060 +#: ../midori/midori-view.c:2446 msgid "Inspect _Element" msgstr "Inspecionar _elemento" -#: ../midori/midori-view.c:2191 ../midori/midori-view.c:2261 +#: ../midori/midori-view.c:2112 +#: ../midori/midori-view.c:2182 msgid "Open Link in New _Tab" msgstr "Abrir link em nova _aba" -#: ../midori/midori-view.c:2195 +#: ../midori/midori-view.c:2116 msgid "Open Link in _Foreground Tab" msgstr "Abrir link na aba em _primeiro plano" -#: ../midori/midori-view.c:2196 +#: ../midori/midori-view.c:2117 msgid "Open Link in _Background Tab" msgstr "Abrir link na aba em _segundo plano" -#: ../midori/midori-view.c:2199 ../midori/midori-view.c:2268 +#: ../midori/midori-view.c:2120 +#: ../midori/midori-view.c:2189 msgid "Open Link in New _Window" msgstr "Abrir link em nova _janela" -#: ../midori/midori-view.c:2202 +#: ../midori/midori-view.c:2123 msgid "Open Link as Web A_pplication" msgstr "Abrir link como a_plicação web" -#: ../midori/midori-view.c:2205 +#: ../midori/midori-view.c:2126 msgid "Copy Link de_stination" msgstr "Copiar _destino do link" -#: ../midori/midori-view.c:2208 ../midori/midori-view.c:2280 +#: ../midori/midori-view.c:2129 +#: ../midori/midori-view.c:2201 msgid "_Save Link destination" msgstr "_Salvar destino do link" -#: ../midori/midori-view.c:2209 ../midori/midori-view.c:2274 +#: ../midori/midori-view.c:2130 +#: ../midori/midori-view.c:2195 msgid "_Download Link destination" msgstr "_Baixar destino do link" -#: ../midori/midori-view.c:2213 ../midori/midori-view.c:2243 -#: ../midori/midori-view.c:2285 +#: ../midori/midori-view.c:2134 +#: ../midori/midori-view.c:2164 +#: ../midori/midori-view.c:2206 msgid "Download with Download _Manager" msgstr "Baixar com _gerenciador de downloads" -#: ../midori/midori-view.c:2222 +#: ../midori/midori-view.c:2143 msgid "Open _Image in New Tab" msgstr "Abrir _imagem em nova aba" -#: ../midori/midori-view.c:2225 +#: ../midori/midori-view.c:2146 msgid "Copy Image _Address" msgstr "Copiar _endereço da imagem" -#: ../midori/midori-view.c:2228 +#: ../midori/midori-view.c:2149 msgid "Save I_mage" msgstr "Salvar i_magem" -#: ../midori/midori-view.c:2229 +#: ../midori/midori-view.c:2150 msgid "Download I_mage" msgstr "Baixar i_magem" -#: ../midori/midori-view.c:2236 +#: ../midori/midori-view.c:2157 msgid "Copy Video _Address" msgstr "Copiar _endereço do vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2160 msgid "Save _Video" msgstr "Salvar _vídeo" -#: ../midori/midori-view.c:2239 +#: ../midori/midori-view.c:2160 msgid "Download _Video" msgstr "Baixar _vídeo" -#: ../midori/midori-view.c:2302 +#: ../midori/midori-view.c:2223 msgid "Search _with" msgstr "Pesquisar _com" -#: ../midori/midori-view.c:2337 ../midori/midori-view.c:2344 +#: ../midori/midori-view.c:2259 +#: ../midori/midori-view.c:2266 msgid "_Search the Web" msgstr "_Pesquisar na web" -#: ../midori/midori-view.c:2365 +#: ../midori/midori-view.c:2287 msgid "Open Address in New _Tab" msgstr "Abrir endereço em nova _aba" -#: ../midori/midori-view.c:2662 +#: ../midori/midori-view.c:2591 msgid "Open or download file" msgstr "Abrir ou baixar arquivo" -#: ../midori/midori-view.c:2681 +#: ../midori/midori-view.c:2610 #, c-format msgid "File Type: '%s'" msgstr "Tipo de arquivo: '%s'" -#: ../midori/midori-view.c:2684 +#: ../midori/midori-view.c:2613 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de arquivo: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:2688 +#: ../midori/midori-view.c:2617 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:3236 +#: ../midori/midori-view.c:3158 #, c-format msgid "Inspect page - %s" msgstr "Inspecionar página - %s" -#: ../midori/midori-view.c:3501 +#: ../midori/midori-view.c:3439 msgid "Speed dial" msgstr "Ligação rápida" -#: ../midori/midori-view.c:3502 +#: ../midori/midori-view.c:3440 msgid "Click to add a shortcut" msgstr "Clique para adicionar um atalho" -#: ../midori/midori-view.c:3503 +#: ../midori/midori-view.c:3441 msgid "Enter shortcut address" msgstr "Informe o endereço do atalho" -#: ../midori/midori-view.c:3504 +#: ../midori/midori-view.c:3442 msgid "Enter shortcut title" msgstr "Informe o título do atalho" -#: ../midori/midori-view.c:3505 +#: ../midori/midori-view.c:3443 msgid "Are you sure you want to delete this shortcut?" msgstr "Tem certeza de que quer excluir este atalho?" -#: ../midori/midori-view.c:3506 -msgid "Set number of columns" -msgstr "Definir número de colunas" +#: ../midori/midori-view.c:3444 +msgid "Set number of columns and rows" +msgstr "Definir número de colunas e linhas" -#: ../midori/midori-view.c:3507 -msgid "Enter number of columns:" -msgstr "Informe o número de colunas:" +#: ../midori/midori-view.c:3445 +msgid "Enter number of columns and rows:" +msgstr "Informe o número de colunas e linhas:" -#: ../midori/midori-view.c:3508 -msgid "Set number of shortcuts" -msgstr "Definir número de atalhos" +#: ../midori/midori-view.c:3446 +msgid "Invalid input for the size of the speed dial" +msgstr "Entrada inválida para o tamanho da ligação rápida" -#: ../midori/midori-view.c:3509 -msgid "Enter number of shortcuts:" -msgstr "Informe o número de atalhos" +#: ../midori/midori-view.c:3447 +msgid "Thumb size:" +msgstr "Tamanho da miniatura:" -#: ../midori/midori-view.c:3535 +#: ../midori/midori-view.c:3448 +msgid "Small" +msgstr "Pequeno" + +#: ../midori/midori-view.c:3449 +msgid "Medium" +msgstr "Médio" + +#: ../midori/midori-view.c:3450 +msgid "Big" +msgstr "Grande" + +#: ../midori/midori-view.c:3476 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser exibido" -#: ../midori/midori-view.c:3558 +#: ../midori/midori-view.c:3499 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-view.c:3808 +#: ../midori/midori-view.c:3618 +msgid "Page loading delayed" +msgstr "Carregamento da página postergado" + +#: ../midori/midori-view.c:3619 +msgid "Loading delayed either due to a recent crash or startup preferences." +msgstr "Carregamento postergado seja por um encerramento abrupto recente ou pelas preferências de início." + +#: ../midori/midori-view.c:3620 +msgid "Load Page" +msgstr "Carregar página" + +#: ../midori/midori-view.c:3764 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-view.c:4068 +#: ../midori/midori-view.c:4018 msgid "_Duplicate Tab" msgstr "_Duplicar aba" -#: ../midori/midori-view.c:4073 -msgid "_Restore Tab" -msgstr "_Restaurar aba" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Label" +msgstr "Exibir _título da aba" -#: ../midori/midori-view.c:4073 -msgid "_Minimize Tab" -msgstr "_Minimizar aba" +#: ../midori/midori-view.c:4023 +msgid "Show Tab _Icon Only" +msgstr "Exibir apenas o _ícone da aba" -#: ../midori/midori-view.c:4079 +#: ../midori/midori-view.c:4029 msgid "Close ot_her Tabs" msgstr "Fec_har outras abas" -#: ../midori/midori-view.c:4700 +#: ../midori/midori-view.c:4680 msgid "Print background images" msgstr "Imprimir imagens de fundo" -#: ../midori/midori-view.c:4701 +#: ../midori/midori-view.c:4681 msgid "Whether background images should be printed" msgstr "Se as imagens de fundo devem ser impressas" -#: ../midori/midori-view.c:4753 ../midori/midori-preferences.c:381 +#: ../midori/midori-view.c:4733 +#: ../midori/midori-preferences.c:384 msgid "Features" msgstr "Funcionalidades" #. Page "General" -#: ../midori/midori-preferences.c:298 +#: ../midori/midori-preferences.c:301 msgid "General" msgstr "Geral" -#: ../midori/midori-preferences.c:299 +#: ../midori/midori-preferences.c:302 msgid "Startup" msgstr "Início" -#: ../midori/midori-preferences.c:314 ../midori/midori-preferences.c:321 +#: ../midori/midori-preferences.c:317 +#: ../midori/midori-preferences.c:324 msgid "Use current page as homepage" msgstr "Usar a página atual como página inicial" -#: ../midori/midori-preferences.c:331 ../panels/midori-transfers.c:87 +#: ../midori/midori-preferences.c:334 +#: ../panels/midori-transfers.c:87 msgid "Transfers" msgstr "Transferências" #. Page "Appearance" -#: ../midori/midori-preferences.c:349 +#: ../midori/midori-preferences.c:352 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:350 +#: ../midori/midori-preferences.c:353 msgid "Font settings" msgstr "Configurações de fontes" -#: ../midori/midori-preferences.c:352 +#: ../midori/midori-preferences.c:355 msgid "Default Font Family" msgstr "Família de fontes padrão" -#: ../midori/midori-preferences.c:355 +#: ../midori/midori-preferences.c:358 msgid "The default font family used to display text" msgstr "A família de fontes padrão usada para exibir texto" -#: ../midori/midori-preferences.c:358 +#: ../midori/midori-preferences.c:361 msgid "The default font size used to display text" msgstr "O tamanho de fonte padrão usado para exibir texto" -#: ../midori/midori-preferences.c:360 +#: ../midori/midori-preferences.c:363 msgid "Fixed-width Font Family" msgstr "Família de fontes de largura fixa" -#: ../midori/midori-preferences.c:363 +#: ../midori/midori-preferences.c:366 msgid "The font family used to display fixed-width text" msgstr "A família de fontes usada para exibir texto com largura fixa" -#: ../midori/midori-preferences.c:366 +#: ../midori/midori-preferences.c:369 msgid "The font size used to display fixed-width text" msgstr "O tamanho de fonte usado para exibir texto com largura fixa" -#: ../midori/midori-preferences.c:368 +#: ../midori/midori-preferences.c:371 msgid "Minimum Font Size" msgstr "Tamanho mínimo de fonte" -#: ../midori/midori-preferences.c:371 +#: ../midori/midori-preferences.c:374 msgid "The minimum font size used to display text" msgstr "O tamanho mínimo de fonte usado para exibir texto" #. Page "Behavior" -#: ../midori/midori-preferences.c:380 +#: ../midori/midori-preferences.c:383 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:393 +#: ../midori/midori-preferences.c:396 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegada" -#: ../midori/midori-preferences.c:394 +#: ../midori/midori-preferences.c:397 msgid "Enforce a video dot density of 96 DPI" msgstr "Forçar resolução de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:417 msgid "Allow scripts to open popups" msgstr "Permitir que os scripts abram popups" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:418 msgid "Whether scripts are allowed to open popup windows automatically" -msgstr "" -"Se os scripts devem ter permissão para abrir janelas popup automaticamente" +msgstr "Se os scripts devem ter permissão para abrir janelas popup automaticamente" -#: ../midori/midori-preferences.c:419 +#: ../midori/midori-preferences.c:422 msgid "Spell Checking" msgstr "Verificação ortográfica" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:424 msgid "Enable Spell Checking" msgstr "Habilitar verificação ortográfica" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:425 msgid "Enable spell checking while typing" msgstr "Habilitar verificação ortográfica ao digitar" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:427 msgid "Spelling dictionaries:" msgstr "Dicionários de ortografia:" #. i18n: The example should be adjusted to contain a good local default -#: ../midori/midori-preferences.c:429 -msgid "" -"A comma separated list of languages to be used for spell checking, for " -"example \"en_GB,de_DE\"" -msgstr "" -"Uma lista de idiomas, separados por vírgulas, para a verificação " -"ortográfica, por exemplo \"en_GB,pt_BR\"" +#: ../midori/midori-preferences.c:431 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Uma lista de idiomas, separados por vírgulas, para a verificação ortográfica, por exemplo \"en_GB,pt_BR\"" #. Page "Interface" -#: ../midori/midori-preferences.c:435 +#: ../midori/midori-preferences.c:437 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:436 +#: ../midori/midori-preferences.c:438 msgid "Navigationbar" msgstr "Barra de navegação" -#: ../midori/midori-preferences.c:446 +#: ../midori/midori-preferences.c:448 msgid "Browsing" msgstr "Navegação" #. Page "Applications" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:470 msgid "Applications" msgstr "Aplicativos" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:471 msgid "External applications" msgstr "Aplicativos externos" #. Page "Network" -#: ../midori/midori-preferences.c:485 ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:488 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:494 msgid "Hostname" msgstr "Nome da máquina" #. Page "Privacy" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:513 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:514 msgid "Web Cookies" msgstr "Cookies" -#: ../midori/midori-preferences.c:521 ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:537 msgid "days" msgstr "dias" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:917 +#: ../midori/midori-searchaction.c:914 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:945 +#: ../midori/midori-searchaction.c:942 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:989 +#: ../midori/midori-searchaction.c:986 msgid "_Icon:" msgstr "_Ícone:" -#: ../midori/midori-searchaction.c:1003 +#: ../midori/midori-searchaction.c:1000 msgid "_Token:" msgstr "_Palavra-chave:" -#: ../midori/midori-searchaction.c:1234 +#: ../midori/midori-searchaction.c:1231 msgid "Manage Search Engines" msgstr "Gerenciar motores de pesquisa" -#: ../midori/midori-searchaction.c:1335 +#: ../midori/midori-searchaction.c:1332 msgid "Use as _default" msgstr "Usar como _padrão" -#: ../midori/sokoke.c:1294 +#: ../midori/sokoke.c:1303 msgid "_Bookmark" msgstr "_Favorito" -#: ../midori/sokoke.c:1296 +#: ../midori/sokoke.c:1305 msgid "Add Boo_kmark" msgstr "Adicionar _favorito" -#: ../midori/sokoke.c:1297 +#: ../midori/sokoke.c:1306 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:1298 +#: ../midori/sokoke.c:1307 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:1299 +#: ../midori/sokoke.c:1308 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:1300 +#: ../midori/sokoke.c:1309 msgid "_Homepage" msgstr "_Página inicial" -#: ../midori/sokoke.c:1301 +#: ../midori/sokoke.c:1310 msgid "_Userscripts" msgstr "Scripts de _usuário" -#: ../midori/sokoke.c:1302 +#: ../midori/sokoke.c:1311 msgid "New _Tab" msgstr "_Nova aba" -#: ../midori/sokoke.c:1303 +#: ../midori/sokoke.c:1312 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:1304 +#: ../midori/sokoke.c:1313 msgid "Netscape p_lugins" msgstr "P_lugins Netscape" -#: ../midori/sokoke.c:1307 +#: ../midori/sokoke.c:1316 msgid "New _Folder" msgstr "Nova _pasta" -#: ../panels/midori-bookmarks.c:111 +#. i18n: A panel at the bottom, to search text in pages +#: ../toolbars/midori-findbar.c:213 +msgid "_Inline Find:" +msgstr "Local_izar na página:" + +#: ../toolbars/midori-findbar.c:245 +msgid "Previous" +msgstr "Anterior" + +#: ../toolbars/midori-findbar.c:251 +msgid "Next" +msgstr "Seguinte" + +#: ../toolbars/midori-findbar.c:255 +msgid "Match Case" +msgstr "Sensível ao caso" + +#: ../toolbars/midori-findbar.c:264 +msgid "Highlight Matches" +msgstr "Realçar correspondências" + +#: ../toolbars/midori-findbar.c:275 +msgid "Close Findbar" +msgstr "Fechar barra de localização" + +#: ../toolbars/midori-transferbar.c:88 +#: ../panels/midori-transfers.c:273 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../toolbars/midori-transferbar.c:123 +#, c-format +msgid "The file '%s' has been downloaded." +msgstr "O arquivo %s foi baixado." + +#: ../toolbars/midori-transferbar.c:126 +msgid "Transfer completed" +msgstr "Transferência concluída" + +#: ../toolbars/midori-transferbar.c:257 +#: ../panels/midori-transfers.c:144 +msgid "Clear All" +msgstr "Limpar tudo" + +#: ../toolbars/midori-transferbar.c:300 +#: ../toolbars/midori-transferbar.c:302 +msgid "Some files are being downloaded" +msgstr "Alguns arquivos estão sendo baixados" + +#: ../toolbars/midori-transferbar.c:306 +msgid "_Quit Midori" +msgstr "_Sair do Midori" + +#: ../toolbars/midori-transferbar.c:308 +msgid "The transfers will be cancelled if Midori quits." +msgstr "As transferências serão canceladas se sair do Midori." + +#: ../panels/midori-bookmarks.c:116 msgid "Bookmarks" msgstr "Favoritos" -#: ../panels/midori-bookmarks.c:241 +#: ../panels/midori-bookmarks.c:269 +#, c-format +msgid "Failed to add bookmark item: %s\n" +msgstr "Falha ao adicionar item dos favoritos: %s\n" + +#: ../panels/midori-bookmarks.c:408 msgid "Edit the selected bookmark" msgstr "Editar o favorito selecionado" -#: ../panels/midori-bookmarks.c:249 +#: ../panels/midori-bookmarks.c:416 msgid "Delete the selected bookmark" msgstr "Excluir o favorito selecionado" -#: ../panels/midori-bookmarks.c:262 +#: ../panels/midori-bookmarks.c:430 msgid "Add a new folder" msgstr "Adicionar nova pasta" -#: ../panels/midori-bookmarks.c:592 +#: ../panels/midori-bookmarks.c:562 +#: ../panels/midori-history.c:572 msgid "Separator" msgstr "Aba" -#: ../panels/midori-console.c:87 +#: ../panels/midori-console.c:90 msgid "Console" msgstr "Console" -#: ../panels/midori-console.c:361 +#: ../panels/midori-console.c:351 msgid "Copy _All" msgstr "Copiar _tudo" -#: ../panels/midori-console.c:362 +#: ../panels/midori-console.c:352 msgid "Copy All" msgstr "Copiar tudo" @@ -2170,60 +2252,46 @@ msgstr "Copiar tudo" msgid "Extensions" msgstr "Extensões" -#: ../panels/midori-history.c:273 -msgid "Erroneous clock time" -msgstr "Hora do relógio incorreta" - -#: ../panels/midori-history.c:274 -msgid "" -"The clock time lies in the past. Please check the current date and time." -msgstr "O relógio está atrasado. Por favor, verifique a data e a hora atual." - -#: ../panels/midori-history.c:286 +#: ../panels/midori-history.c:146 msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:288 +#: ../panels/midori-history.c:148 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dia atrás" msgstr[1] "%d dias atrás" -#: ../panels/midori-history.c:291 +#: ../panels/midori-history.c:151 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:293 +#: ../panels/midori-history.c:153 msgid "Yesterday" msgstr "Ontem" -#: ../panels/midori-history.c:378 +#: ../panels/midori-history.c:324 msgid "Are you sure you want to remove all history items?" msgstr "Tem certeza de que quer excluir todo o histórico?" -#: ../panels/midori-history.c:437 +#: ../panels/midori-history.c:369 msgid "Bookmark the selected history item" msgstr "Adicionar como favorito o item do histórico selecionado" -#: ../panels/midori-history.c:446 +#: ../panels/midori-history.c:378 msgid "Delete the selected history item" msgstr "Excluir o item do histórico selecionado" -#: ../panels/midori-history.c:454 +#: ../panels/midori-history.c:386 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-history.c:952 -#: ../extensions/cookie-manager/cookie-manager-page.c:1144 -msgid "Filter:" -msgstr "Filtro:" - -#: ../panels/midori-transfers.c:478 +#: ../panels/midori-transfers.c:481 msgid "Open Destination _Folder" msgstr "Abrir pas_ta de destino" -#: ../panels/midori-transfers.c:481 +#: ../panels/midori-transfers.c:484 msgid "Copy Link Loc_ation" msgstr "Copiar loc_alização do link" @@ -2265,16 +2333,19 @@ msgstr "O ícone do estoque '%s' não pôde ser carregado" msgid "Animation frames are broken" msgstr "Os quadros de animação estão corrompidos" -#: ../katze/katze-utils.c:498 ../katze/katze-utils.c:893 +#: ../katze/katze-utils.c:503 +#: ../katze/katze-utils.c:898 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade '%s' é inválida para %s" -#: ../katze/katze-utils.c:544 ../katze/katze-utils.c:573 +#: ../katze/katze-utils.c:549 +#: ../katze/katze-utils.c:578 +#: ../extensions/addons.c:119 msgid "Choose file" msgstr "Escolher arquivo" -#: ../katze/katze-utils.c:559 +#: ../katze/katze-utils.c:564 msgid "Choose folder" msgstr "Escolher pasta" @@ -2289,13 +2360,8 @@ msgstr "Configurar filtros de publicidade" #: ../extensions/adblock.c:447 #, c-format -msgid "" -"Type the address of a preconfigured filter list in the text entry and click " -"\"Add\" to add it to the list. You can find more lists at %s." -msgstr "" -"Digite o endereço de uma lista de filtros pré-configurada e clique em " -"\"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em " -"%s." +msgid "Type the address of a preconfigured filter list in the text entry and click \"Add\" to add it to the list. You can find more lists at %s." +msgstr "Digite o endereço de uma lista de filtros pré-configurada e clique em \"Adicionar\" para a adicioná-la à lista. Você pode encontrar mais listas em %s." #: ../extensions/adblock.c:587 msgid "Configure _Advertisement filters..." @@ -2317,50 +2383,94 @@ msgstr "Bl_oquear imagem" msgid "Bl_ock link" msgstr "Bl_oquear link" -#: ../extensions/adblock.c:1489 +#: ../extensions/adblock.c:1492 msgid "Advertisement blocker" msgstr "Bloqueador de publicidade" -#: ../extensions/adblock.c:1490 +#: ../extensions/adblock.c:1493 msgid "Block advertisements according to a filter list" msgstr "Bloquear publicidade de acordo com uma lista de filtros" -#: ../extensions/addons.c:122 -#, c-format -msgid "Copy %s to the folder %s." -msgstr "Copiar %s para a pasta %s." - -#: ../extensions/addons.c:177 +#: ../extensions/addons.c:130 +#: ../extensions/addons.c:490 msgid "Userscripts" msgstr "Scripts de usuário" -#: ../extensions/addons.c:179 +#: ../extensions/addons.c:135 +#: ../extensions/addons.c:492 msgid "Userstyles" msgstr "Estilos de usuário" -#: ../extensions/addons.c:1085 +#: ../extensions/addons.c:191 +#: ../extensions/addons.c:267 +#: ../extensions/feed-panel/main.c:129 +msgid "Error" +msgstr "Erro" + +#: ../extensions/addons.c:231 +#, c-format +msgid "Do you want to delete '%s'?" +msgstr "Deseja excluir '%s'?" + +#: ../extensions/addons.c:237 +msgid "Delete user script" +msgstr "Excluir script de usuário" + +#: ../extensions/addons.c:238 +msgid "Delete user style" +msgstr "Excluir estilo de usuário" + +#: ../extensions/addons.c:242 +#, c-format +msgid "The file %s will be permanently deleted." +msgstr "O arquivo %s será permanentemente excluído." + +#: ../extensions/addons.c:377 +#: ../extensions/addons.c:454 +msgid "Open in Text Editor" +msgstr "Abrir no editor de texto" + +#: ../extensions/addons.c:379 +#: ../extensions/addons.c:463 +msgid "Open Target Folder" +msgstr "Abrir pasta de destino" + +#: ../extensions/addons.c:445 +msgid "Add new addon" +msgstr "Adicionar novo complemento" + +#: ../extensions/addons.c:472 +msgid "Open target folder for selected addon" +msgstr "Abrir a pasta de destino para o complemento selecionado" + +#: ../extensions/addons.c:473 +msgid "Remove selected addon" +msgstr "Excluir o complemento selecionado" + +#: ../extensions/addons.c:1420 #, c-format msgid "The configuration of the extension '%s' couldn't be saved: %s\n" msgstr "A configuração da extensão '%s' não pôde ser salva: %s\n" -#: ../extensions/addons.c:1086 ../extensions/addons.c:1253 +#: ../extensions/addons.c:1421 +#: ../extensions/addons.c:1583 msgid "User addons" msgstr "Extras de usuário" -#: ../extensions/addons.c:1210 +#: ../extensions/addons.c:1542 #, c-format msgid "Can't monitor folder '%s': %s" msgstr "Não é possível monitorar a pasta '%s': %s" -#: ../extensions/addons.c:1254 +#: ../extensions/addons.c:1584 msgid "Support for userscripts and userstyles" msgstr "Suporte a scripts e estilos de usuário" -#: ../extensions/colorful-tabs.c:204 +#: ../extensions/colorful-tabs.c:202 msgid "Colorful Tabs" msgstr "Abas coloridas" -#: ../extensions/colorful-tabs.c:205 +#: ../extensions/colorful-tabs.c:203 msgid "Tint each tab distinctly" msgstr "Colorir distintamente cada aba" @@ -2374,12 +2484,8 @@ msgid "Delete All" msgstr "Excluir tudo" #: ../extensions/cookie-manager/cookie-manager-page.c:114 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"Excluir todos os cookies exibidos. Se um filtro for definido, só serão " -"excluídos os cookies que correspondam ao filtro." +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Excluir todos os cookies exibidos. Se um filtro for definido, só serão excluídos os cookies que correspondam ao filtro." #: ../extensions/cookie-manager/cookie-manager-page.c:129 msgid "Expand All" @@ -2451,13 +2557,13 @@ msgstr "_Expandir tudo" msgid "_Collapse All" msgstr "_Ocultar tudo" +#: ../extensions/cookie-manager/cookie-manager-page.c:1144 +msgid "Filter:" +msgstr "Filtro:" + #: ../extensions/cookie-manager/cookie-manager-page.c:1149 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio " -"correspondam ao filtro" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Informe uma cadeia filtro para apenas exibir cookies cujo nome ou domínio correspondam ao filtro" #: ../extensions/cookie-manager/main.c:40 msgid "_Cookie Manager" @@ -2467,50 +2573,68 @@ msgstr "Gerenciador de _cookies" msgid "List, view and delete cookies" msgstr "Listar, ver e excluir cookies" +#: ../extensions/copy-tabs.c:39 +msgid "Copy Tab _Addresses" +msgstr "Copiar _endereços das abas" + +#: ../extensions/copy-tabs.c:96 +msgid "Copy Addresses of Tabs" +msgstr "Copiar endereços das abas" + +#: ../extensions/copy-tabs.c:97 +msgid "Copy the addresses of all tabs to the clipboard" +msgstr "Copiar os endereços de toda as abas para a área de transferência" + +#: ../extensions/external-applications.vala:93 +msgid "External Applications" +msgstr "Aplicativos externos" + +#: ../extensions/external-applications.vala:94 +msgid "Associate URL schemes with external commands" +msgstr "Associar os esquemas dos URL a comandos externos" + #: ../extensions/feed-panel/feed-atom.c:209 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" -"Não foram encontrados os elementos Atom requeridos \"entry\" nos dados XML." +msgstr "Não foram encontrados os elementos Atom requeridos \"entry\" nos dados XML." #: ../extensions/feed-panel/feed-atom.c:315 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" -"Não foram encontrados os elementos Atom requeridos \"feed\" nos dados XML." +msgstr "Não foram encontrados os elementos Atom requeridos \"feed\" nos dados XML." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:399 +#: ../extensions/feed-panel/feed-panel.c:396 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Última atualização: %s." -#: ../extensions/feed-panel/feed-panel.c:671 +#: ../extensions/feed-panel/feed-panel.c:668 msgid "Feeds" msgstr "Feeds" -#: ../extensions/feed-panel/feed-panel.c:724 +#: ../extensions/feed-panel/feed-panel.c:721 msgid "Add new feed" msgstr "Adicionar novo feed" -#: ../extensions/feed-panel/feed-panel.c:731 +#: ../extensions/feed-panel/feed-panel.c:728 msgid "Delete feed" msgstr "Excluir feed" -#: ../extensions/feed-panel/feed-panel.c:814 +#: ../extensions/feed-panel/feed-panel.c:810 msgid "_Feeds" msgstr "_Feeds" -#: ../extensions/feed-panel/feed-parse.c:192 +#: ../extensions/feed-panel/feed-parse.c:195 #, c-format msgid "Failed to find root element in feed XML data." msgstr "Não foi encontrado o elemento raiz nos dados XML do feed." -#: ../extensions/feed-panel/feed-parse.c:232 +#: ../extensions/feed-panel/feed-parse.c:235 #, c-format msgid "Unsupported feed format." msgstr "Formato de feed não suportado." -#: ../extensions/feed-panel/feed-parse.c:262 +#: ../extensions/feed-panel/feed-parse.c:265 #, c-format msgid "Failed to parse XML feed: %s" msgstr "Falha ao analisar o feed XML: %s" @@ -2525,76 +2649,101 @@ msgstr "Encontrada uma versão RSS não suportada." #: ../extensions/feed-panel/feed-rss.c:148 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" -"Não foram encontrados os elementos RSS requeridos \"item\" nos dados XML." +msgstr "Não foram encontrados os elementos RSS requeridos \"item\" nos dados XML." #: ../extensions/feed-panel/feed-rss.c:248 msgid "Failed to find required RSS \"channel\" elements in XML data." -msgstr "" -"Não foram encontrados os elementos RSS requeridos \"channel\" nos dados XML." +msgstr "Não foram encontrados os elementos RSS requeridos \"channel\" nos dados XML." -#: ../extensions/feed-panel/main.c:132 -msgid "Error" -msgstr "Erro" - -#: ../extensions/feed-panel/main.c:134 +#: ../extensions/feed-panel/main.c:131 #, c-format msgid "Feed '%s' already exists" msgstr "O feed '%s' já existe" -#: ../extensions/feed-panel/main.c:211 +#: ../extensions/feed-panel/main.c:208 #, c-format msgid "Error loading feed '%s'" msgstr "Erro ao carregar o feed '%s'" -#: ../extensions/feed-panel/main.c:522 +#: ../extensions/feed-panel/main.c:518 msgid "Feed Panel" msgstr "Painel de feeds" -#: ../extensions/feed-panel/main.c:523 +#: ../extensions/feed-panel/main.c:519 msgid "Read Atom/ RSS feeds" msgstr "Ler feeds Atom/RSS" -#: ../extensions/formhistory.c:144 +#: ../extensions/formhistory.c:142 #, c-format msgid "Failed to add form value: %s\n" msgstr "Falha ao adicionar o valor de formulário: %s\n" -#: ../extensions/formhistory.c:510 +#: ../extensions/formhistory.c:454 +#: ../extensions/formhistory.c:458 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Falha ao executar afirmação da base de dados: %s\n" + +#: ../extensions/formhistory.c:501 msgid "Stores history of entered form data" msgstr "Armazena o histórico de dados de formulário" -#: ../extensions/formhistory.c:514 +#: ../extensions/formhistory.c:505 #, c-format msgid "Not available: %s" msgstr "Não disponível: %s" -#: ../extensions/formhistory.c:515 +#: ../extensions/formhistory.c:506 msgid "Resource files not installed" msgstr "arquivos de configuração não instalados" -#: ../extensions/formhistory.c:521 +#: ../extensions/formhistory.c:512 msgid "Form history filler" msgstr "Preenchimento de formulários" -#: ../extensions/mouse-gestures.c:303 +#: ../extensions/history-list.vala:174 +msgid "Next Tab (History List)" +msgstr "Aba seguinte (lista do histórico)" + +#: ../extensions/history-list.vala:175 +msgid "Next tab from history" +msgstr "Aba seguinte no histórico" + +#: ../extensions/history-list.vala:184 +msgid "Previous Tab (History List)" +msgstr "Aba anterior (lista do histórico)" + +#: ../extensions/history-list.vala:185 +msgid "Previous tab from history" +msgstr "Aba anterior no histórico" + +#: ../extensions/history-list.vala:245 +msgid "History List" +msgstr "Lista do histórico" + +#: ../extensions/history-list.vala:246 +msgid "Allows to switch tabs by choosing from a list sorted by last usage" +msgstr "Permite trocar de aba escolhendo de uma lista ordenada pelo último uso" + +#: ../extensions/mouse-gestures.c:301 msgid "Mouse Gestures" msgstr "Gestos de mouse" -#: ../extensions/mouse-gestures.c:304 +#: ../extensions/mouse-gestures.c:302 msgid "Control Midori by moving the mouse" msgstr "Controlar o Midori movendo o mouse" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:175 msgid "Pageholder" msgstr "Fixador de página" -#: ../extensions/page-holder.c:161 +#: ../extensions/page-holder.c:159 msgid "_Pageholder" msgstr "Fixador de _página" -#: ../extensions/page-holder.c:178 +#: ../extensions/page-holder.c:176 msgid "Keep one or multiple pages open in parallel to your tabs" msgstr "Manter uma ou várias páginas abertas em paralelo às abas" @@ -2606,14 +2755,22 @@ msgstr "Personalizar atalhos de teclado" msgid "Customize Sh_ortcuts..." msgstr "Personalizar atalh_os..." -#: ../extensions/shortcuts.c:315 +#: ../extensions/shortcuts.c:313 msgid "Shortcuts" msgstr "Atalhos" -#: ../extensions/shortcuts.c:316 +#: ../extensions/shortcuts.c:314 msgid "View and edit keyboard shortcuts" msgstr "Ver e editar os atalhos de teclado" +#: ../extensions/status-clock.c:174 +msgid "Statusbar Clock" +msgstr "Relógio na barra de status" + +#: ../extensions/status-clock.c:175 +msgid "Display date and time in the statusbar" +msgstr "Exibir a data e a hora na barra de status" + #: ../extensions/statusbar-features.c:84 msgid "Images" msgstr "Imagens" @@ -2626,46 +2783,42 @@ msgstr "Scripts" msgid "Netscape plugins" msgstr "Plugins Netscape" -#: ../extensions/statusbar-features.c:149 +#: ../extensions/statusbar-features.c:147 msgid "Statusbar Features" msgstr "Funcionalidades na barra de status" -#: ../extensions/statusbar-features.c:150 +#: ../extensions/statusbar-features.c:148 msgid "Easily toggle features on web pages on and off" msgstr "Ligar/desligar facilmente funcionalidades das páginas web" -#: ../extensions/tab-panel.c:568 ../extensions/tab-panel.c:625 +#: ../extensions/tab-panel.c:569 +#: ../extensions/tab-panel.c:626 msgid "Tab Panel" msgstr "Painel de abas" -#: ../extensions/tab-panel.c:609 +#: ../extensions/tab-panel.c:610 msgid "T_ab Panel" msgstr "P_ainel de abas" -#: ../extensions/tab-panel.c:626 +#: ../extensions/tab-panel.c:627 msgid "Show tabs in a vertical panel" msgstr "Exibir as abas num painel vertical" -#: ../extensions/tab-switcher.c:395 -msgid "Tab History List" -msgstr "Lista do histórico de abas" +#: ../extensions/tabs-minimized.c:77 +msgid "Only Icons on Tabs by default" +msgstr "Apenas ícones nas abas por padrão" -#: ../extensions/tab-switcher.c:396 -msgid "Allows to switch tabs by choosing from a list sorted by last usage" -msgstr "" -"Permite mudar de abas ao escolher de uma lista ordenada pelo último uso" +#: ../extensions/tabs-minimized.c:78 +msgid "New tabs have no label by default" +msgstr "Novas abas sem título por padrão" #: ../extensions/toolbar-editor.c:389 msgid "Customize Toolbar" msgstr "Personalizar barra de ferramentas" #: ../extensions/toolbar-editor.c:405 -msgid "" -"Select items to be displayed on the toolbar. Items can be reodered by drag " -"and drop." -msgstr "" -"Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem " -"ser reordenados ao arrastar e soltar." +msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop." +msgstr "Selecione os itens a serem exibidos na barra de ferramentas. Os itens podem ser reordenados ao arrastar e soltar." #: ../extensions/toolbar-editor.c:421 msgid "Available Items" @@ -2679,44 +2832,72 @@ msgstr "Itens exibidos" msgid "Customize _Toolbar..." msgstr "Personalizar barra de _ferramentas..." -#: ../extensions/toolbar-editor.c:608 +#: ../extensions/toolbar-editor.c:606 msgid "Toolbar Editor" msgstr "Editor da barra de ferramentas" -#: ../extensions/toolbar-editor.c:609 +#: ../extensions/toolbar-editor.c:607 msgid "Easily edit the toolbar layout" msgstr "Editar facilmente a barra de ferramentas" -#: ../extensions/web-cache.c:465 +#: ../extensions/web-cache.c:463 msgid "Cache HTTP communication on disk" msgstr "Pôr comunicações HTTP em cache" +#~ msgid "_Restore Tab" +#~ msgstr "_Restaurar aba" +#~ msgid "_Minimize Tab" +#~ msgstr "_Minimizar aba" +#~ msgid "Copy %s to the folder %s." +#~ msgstr "Copiar %s para a pasta %s." +#~ msgid "Minimize new Tabs" +#~ msgstr "Minimizar novas abas" +#~ msgid "New tabs open minimized" +#~ msgstr "Novas abas abrem minimizadas" +#~ msgid "_Recently visited pages" +#~ msgstr "Páginas _recentes" +#~ msgid "Reopen pages that you visited earlier" +#~ msgstr "Reabrir páginas visitadas anteriormente" +#~ msgid "Original cookies only" +#~ msgstr "Apenas cookies originais" +#~ msgid "Accept cookies from the original website only" +#~ msgstr "Apenas aceitar cookies do site web original" +#~ msgid "Remember last visited pages" +#~ msgstr "Lembrar últimas páginas visitadas" +#~ msgid "Whether the last visited pages are saved" +#~ msgstr "Se as últimas páginas visitadas devem ser salvas" +#~ msgid "Detect proxy server automatically" +#~ msgstr "Detectar servidor proxy automaticamente" +#~ msgid "" +#~ "Whether to detect the proxy server automatically from the environment" +#~ msgstr "Se o servidor proxy deve ser detectado automaticamente" +#~ msgid "Set number of shortcuts" +#~ msgstr "Definir número de atalhos" +#~ msgid "Enter number of shortcuts:" +#~ msgstr "Informe o número de atalhos" +#~ msgid "Erroneous clock time" +#~ msgstr "Hora do relógio incorreta" +#~ msgid "" +#~ "The clock time lies in the past. Please check the current date and time." +#~ msgstr "" +#~ "O relógio está atrasado. Por favor, verifique a data e a hora atual." #~ msgid "Open _Link" #~ msgstr "Abrir _link" - #~ msgid "" #~ "Copy userscripts to the folder %s and copy userstyles to the folder %s." #~ msgstr "" #~ "Copiar scripts de usuário para a pasta %s e copiar estilos de usuário " #~ "para a pasta %s." - #~ msgid "Open Image in New Wi_ndow" #~ msgstr "Abrir imagem em nova ja_nela" - #~ msgid "REGEX" #~ msgstr "REGEX" - #~ msgid "Not available on this platform" #~ msgstr "Não disponível para esta plataforma" - #~ msgid "Failed to get current time: %s\n" #~ msgstr "Falha na obtenção da hora atual: %s\n" - -#~ msgid "Failed to add history item: %s\n" -#~ msgstr "Falha ao adicionar item do histórico: %s\n" - #~ msgid "Show panel _titles" #~ msgstr "Exibir _títulos do painel" - #~ msgid "Options" #~ msgstr "Opções" + From d0e2433f867938145e0f7694a9e3a36c869ce9ca Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Sep 2010 01:45:17 +0200 Subject: [PATCH 2967/2970] Simplify definitions of katze assignment macros --- katze/katze-utils.h | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 6b811f54..03a462dd 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -34,13 +34,7 @@ G_BEGIN_DECLS * * Frees @lvalue if needed and assigns it the value of @rvalue. **/ -#define katze_assign(lvalue, rvalue) \ - do \ - { \ - g_free (lvalue); \ - lvalue = rvalue; \ - } \ - while (0) +#define katze_assign(lvalue, rvalue) lvalue = (g_free (lvalue), rvalue) /** * katze_object_assign: @@ -50,13 +44,7 @@ G_BEGIN_DECLS * Unrefs @lvalue if needed and assigns it the value of @rvalue. **/ #define katze_object_assign(lvalue, rvalue) \ - do \ - { \ - if (lvalue) \ - g_object_unref (lvalue); \ - lvalue = rvalue; \ - } \ - while (0) + lvalue = ((lvalue ? g_object_unref (lvalue) : lvalue), rvalue) /** * katze_strv_assign: @@ -67,13 +55,7 @@ G_BEGIN_DECLS * * Since: 0.1.7 **/ -#define katze_strv_assign(lvalue, rvalue) \ - do \ - { \ - g_strfreev (lvalue); \ - lvalue = rvalue; \ - } \ - while (0) +#define katze_strv_assign(lvalue, rvalue) lvalue = (g_strfreev (lvalue), rvalue) GtkWidget* katze_property_proxy (gpointer object, From 016b6a6306e0756acce3c88235735dfbac13263a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Sep 2010 01:48:55 +0200 Subject: [PATCH 2968/2970] Remove unused katze_collfold and katze_utf8_stristr --- katze/katze-utils.c | 92 --------------------------------------------- katze/katze-utils.h | 7 ---- 2 files changed, 99 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 5d12592b..134a7d83 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -1539,95 +1539,3 @@ katze_load_cached_icon (const gchar* uri, GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); } -/** - * katze_collfold: - * @str: a non-NULL UTF-8 string - * - * Computes a string without case and decomposited so - * it can be used for comparison. - * - * Return value: a normalized string - * - * Since: 0.2.3 - **/ -gchar* -katze_collfold (const gchar* str) -{ - GString* result = g_string_new (NULL); - const gchar* p = str; - - while (*p) - { - gunichar ch = g_unichar_tolower (g_utf8_get_char (p)); - gsize len; - gunichar* sch = g_unicode_canonical_decomposition (ch, &len); - guint i = 0; - while (i < len) - g_string_append_unichar (result, sch[i++]); - - p = g_utf8_next_char (p); - } - - return g_string_free (result, FALSE); -} - -/** - * katze_utf8_stristr: - * @haystack: a non-NULL UTF-8 string - * @needle: a normalized non-NULL UTF-8 string - * - * Determines whether @needle is in @haystack, disregarding - * differences in case. - * - * Return value: %TRUE if @needle is found in @haystack - * - * Since: 0.2.3 - **/ -gboolean -katze_utf8_stristr (const gchar* haystack, - const gchar* needle) -{ - #if 0 /* 0,000159 seconds */ - /* Too slow for use in completion */ - gchar* nhaystack = g_utf8_normalize (haystack, -1, G_NORMALIZE_DEFAULT); - const gchar *p = nhaystack; - gsize len = strlen (needle); - gsize i; - - while (*p) - { - for (i = 0; i < len; i++) - if (g_unichar_tolower (g_utf8_get_char (p + i)) - != g_unichar_tolower (g_utf8_get_char (needle + i))) - goto next; - - g_free (nhaystack); - return TRUE; - - next: - p = g_utf8_next_char (p); - } - - g_free (nhaystack); - return FALSE; - #else /* 0,000044 seconds */ - /* No unicode matching */ - const gchar *p = haystack; - gsize len = strlen (needle); - gsize i; - - while (*p) - { - for (i = 0; i < len; i++) - if (g_ascii_tolower (p[i]) != g_ascii_tolower (needle[i])) - goto next; - - return TRUE; - - next: - p++; - } - - return FALSE; - #endif -} diff --git a/katze/katze-utils.h b/katze/katze-utils.h index 03a462dd..5382173f 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -139,13 +139,6 @@ GdkPixbuf* katze_load_cached_icon (const gchar* uri, GtkWidget* widget); -gchar* -katze_collfold (const gchar* str); - -gboolean -katze_utf8_stristr (const gchar* haystack, - const gchar* needle); - G_END_DECLS #endif /* __KATZE_UTILS_H__ */ From d0635b4fb26d88d9996bc6db962c610212335d8a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Sep 2010 23:02:24 +0200 Subject: [PATCH 2969/2970] Update German translation --- po/de.po | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index bc78bb7b..e0180bf7 100644 --- a/po/de.po +++ b/po/de.po @@ -362,6 +362,12 @@ msgid "" "Aggregator. Next time you click the news feed icon, it will be added " "automatically." msgstr "" +"Verwenden Sie einen Nachrichtenaggregator um diese URI zu benutzen. Dort " +"findet sich meist ein Menü oder eine Schaltfläche »Neues Abo«, " +"»Neue Nachrichtenquelle« oder ähnlich.\n" +"Alternativ können Sie auch unter Einstellungen > Anwendungen in Midori " +"einen Nachrichtenaggregator auswählen. Dann wird beim nächsten Klick auf " +"das Symbol für Nachrichtenquellen die Addresse automatisch hinzugefügt." #: ../midori/midori-browser.c:2234 ../extensions/feed-panel/main.c:365 msgid "New feed" @@ -1627,8 +1633,8 @@ msgid "" "webpages, for example \"de\", \"ru,nl\" or \"en-us;q=1.0, fr-fr;q=0.667\"" msgstr "" "Eine durch Kommas getrennte Liste von bevorzugten Sprachen, die zur " -"Darstellung mehrsprachiger Interneiten benutzt wird, zum Beispiel »de«, »ru," -"nl« oder »en-us;q=1.0, fr-fr;q=0.667«" +"Darstellung mehrsprachiger Internetseiten benutzt wird, zum Beispiel »de«, " +"»ru,nl« oder »en-us;q=1.0, fr-fr;q=0.667«" #: ../midori/midori-websettings.c:1089 msgid "Clear private data" From 2c10312ce21d3f7a0fe4929d7ea255e16abb74d0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Sep 2010 23:22:41 +0200 Subject: [PATCH 2970/2970] Bump version to 0.2.8 --- ChangeLog | 11 +++++++++++ wscript | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ea3e8912..0153b9b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.2.8 + + Re-implement Bookmarks menu and toolbar button + + Show transferbar even if statusbar is hidden + + Smart case for inline search while typing + + Use Alt+Shift+Right instead of Ctrl+Right for Next Page + + Adding, edit and delete buttons for user scripts/ styles + + Rename 'Minimize Tab' to 'Show Tab Icon Only' + + Delete key in completion deletes items + + Don't show homepage in bookmarkbar + + Fix crash when using location arrow button + v0.2.7 + Multiple word completion in location + Database backed bookmarks diff --git a/wscript b/wscript index e567a0a6..da389ef5 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ from Configure import find_program_impl major = 0 minor = 2 -micro = 7 +micro = 8 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) " "" + "" "" "" "" From 461b831d9786da29f9ea0d376ee7185ee5df2de9 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sat, 28 Mar 2009 23:00:32 +0100 Subject: [PATCH 0928/2970] Shift selection of debug-level Currently configure switches on gcc to debug mode what means -O0. Adding -d none does not help because it is filtered out earlier. -d bla would help if bla were an allowed keyword. This patch simply shifts the "compiler is gcc" block to the left so -O2 is selected if the user selected -d none on the command line. Other compilers remain with no extra switches. --- wscript | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/wscript b/wscript index c5555412..4ee9d820 100644 --- a/wscript +++ b/wscript @@ -181,28 +181,27 @@ def configure (conf): debug_level = 'debug' else: debug_level = 'none' - if debug_level != 'none': - if compiler == 'gcc': - if debug_level == 'debug': - conf.env.append_value ('CCFLAGS', '-Wall -O0 -g'.split ()) - elif debug_level == 'full': - # -Wdeclaration-after-statement - # -Wmissing-declarations -Wmissing-prototypes - # -Wwrite-strings - conf.env.append_value ('CCFLAGS', - '-Wall -Wextra -O1 -g ' - '-Waggregate-return -Wno-unused-parameter ' - '-Wno-missing-field-initializers ' - '-Wunsafe-loop-optimizations ' - '-Wredundant-decls -Wmissing-noreturn ' - '-Wshadow -Wpointer-arith -Wcast-align ' - '-Winline -Wformat-security ' - '-Winit-self -Wmissing-include-dirs -Wundef ' - '-Wmissing-format-attribute -Wnested-externs ' - '-DG_ENABLE_DEBUG'.split ()) - else: - conf.env.append_value ('CCFLAGS', '-O2') + if compiler == 'gcc': + if debug_level == 'debug': + conf.env.append_value ('CCFLAGS', '-Wall -O0 -g'.split ()) + elif debug_level == 'full': + # -Wdeclaration-after-statement + # -Wmissing-declarations -Wmissing-prototypes + # -Wwrite-strings + conf.env.append_value ('CCFLAGS', + '-Wall -Wextra -O1 -g ' + '-Waggregate-return -Wno-unused-parameter ' + '-Wno-missing-field-initializers ' + '-Wunsafe-loop-optimizations ' + '-Wredundant-decls -Wmissing-noreturn ' + '-Wshadow -Wpointer-arith -Wcast-align ' + '-Winline -Wformat-security ' + '-Winit-self -Wmissing-include-dirs -Wundef ' + '-Wmissing-format-attribute -Wnested-externs ' + '-DG_ENABLE_DEBUG'.split ()) else: + conf.env.append_value ('CCFLAGS', '-O2') + elif debug_level != 'none': Utils.pprint ('RED', 'No debugging level support for ' + compiler) sys.exit (1) From 5df04ae2c9057ff738d0da20d8fd7981a0314b37 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Mar 2009 23:12:08 +0100 Subject: [PATCH 0929/2970] Do not use long texts in the preferences but in tooltips --- midori/midori-preferences.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 753e3136..2f7441e3 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -418,7 +418,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); } FILLED_ADD (hbox, 1, 2, 1, 2); - button = katze_property_proxy (settings, "show-crash-dialog", "blurb"); + button = katze_property_proxy (settings, "show-crash-dialog", NULL); SPANNED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (3, 2); @@ -616,7 +616,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "accept-cookies", NULL); FILLED_ADD (button, 1, 2, 0, 1); - button = katze_property_proxy (settings, "original-cookies-only", "blurb"); + button = katze_property_proxy (settings, "original-cookies-only", NULL); SPANNED_ADD (button, 0, 2, 1, 2); label = katze_property_label (settings, "maximum-cookie-age"); INDENTED_ADD (label, 0, 1, 2, 3); From 79c683a80498726fee6b1bf25d2b38538c908e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 28 Mar 2009 23:37:43 +0100 Subject: [PATCH 0930/2970] Minor improvements of the Cookie Manager extension. Don't keep the tooltips in the tree store, instead query them on demand. This should result in less memory usage and a little better performance. Add missing "expires" information to the cookie information label. Enable Menu/ Shift-F10 keys for the treeview. Minor cleanup. --- extensions/cookie-manager.c | 161 ++++++++++++++++++++++++++---------- 1 file changed, 118 insertions(+), 43 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 3fcb1e19..cbadd4e1 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -16,13 +16,11 @@ #define CM_DEBUG 0 #define STOCK_COOKIE_MANAGER "cookie-manager" -#define CM_EMPTY_LABEL_TEXT "\n\n\n\n\n" +#define CM_EMPTY_LABEL_TEXT "\n\n\n\n\n\n" enum { COL_NAME, - COL_TOOLTIP, - COL_ITEM, /* indicates whether a row is a child (cookie name) or a parent (domain name) */ COL_COOKIE, N_COLUMNS }; @@ -97,7 +95,6 @@ static void cm_refresh_store(CMData *cmdata) GHashTable *parents; GtkTreeIter iter; GtkTreeIter *parent_iter; - gchar *tooltip = NULL; SoupCookie *cookie; g_object_ref(cmdata->store); @@ -125,30 +122,17 @@ static void cm_refresh_store(CMData *cmdata) gtk_tree_store_append(cmdata->store, parent_iter, NULL); gtk_tree_store_set(cmdata->store, parent_iter, COL_NAME, cookie->domain, - COL_ITEM, FALSE, + COL_COOKIE, NULL, -1); g_hash_table_insert(parents, g_strdup(cookie->domain), parent_iter); } - if (gtk_check_version(2, 12, 0) == NULL) - tooltip = g_markup_printf_escaped( - _("Host: %s\nPath: %s\nSecure: %s\nName: %s\nValue: %s"), - cookie->domain, - cookie->path, - cookie->secure ? _("Yes") : _("No"), - cookie->name, - cookie->value); - gtk_tree_store_append(cmdata->store, &iter, parent_iter); gtk_tree_store_set(cmdata->store, &iter, COL_NAME, cookie->name, - COL_TOOLTIP, tooltip, - COL_ITEM, TRUE, COL_COOKIE, cookie, -1); - - g_free(tooltip); } g_hash_table_destroy(parents); @@ -157,31 +141,60 @@ static void cm_refresh_store(CMData *cmdata) } +static gchar *cm_get_cookie_description_text(SoupCookie *cookie) +{ + gchar *expires; + gchar *text; + + g_return_val_if_fail(cookie != NULL, NULL); + + expires = (cookie->expires != NULL) ? + soup_date_to_string(cookie->expires, SOUP_DATE_HTTP) : + g_strdup(_("At theend of the session")); + + text = g_markup_printf_escaped( + _("Host: %s\nName: %s\nValue: %s\nPath: %s\nSecure: %s\nExpires: %s"), + cookie->domain, + cookie->name, + cookie->value, + cookie->path, + cookie->secure ? _("Yes") : _("No"), + expires); + + g_free(expires); + + return text; +} + + static void cm_tree_selection_changed_cb(GtkTreeSelection *selection, CMData *cmdata) { GtkTreeIter iter; GtkTreeModel *model; gchar *text; - gboolean is_item; + SoupCookie *cookie; gtk_tree_selection_get_selected(selection, &model, &iter); - if (model == NULL || ! gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) + if (model != NULL && gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) { - /* This is a bit hack'ish but we add some empty lines to get a minimum height of the - * label at the bottom without any font size calculation. */ - gtk_label_set_text(GTK_LABEL(cmdata->desc_label), CM_EMPTY_LABEL_TEXT); - gtk_widget_set_sensitive(cmdata->delete_button, FALSE); - return; + gtk_tree_model_get(model, &iter, COL_COOKIE, &cookie, -1); + if (cookie != NULL) + { + text = cm_get_cookie_description_text(cookie); + + gtk_label_set_markup(GTK_LABEL(cmdata->desc_label), text); + + gtk_widget_set_sensitive(cmdata->delete_button, TRUE); + + g_free(text); + return; + } } - - gtk_tree_model_get(model, &iter, COL_TOOLTIP, &text, COL_ITEM, &is_item, -1); - - gtk_label_set_markup(GTK_LABEL(cmdata->desc_label), text); - - gtk_widget_set_sensitive(cmdata->delete_button, TRUE); - - g_free(text); + /* This is a bit hack'ish but we add some empty lines to get a minimum height of the + * label at the bottom without any font size calculation. */ + gtk_label_set_text(GTK_LABEL(cmdata->desc_label), CM_EMPTY_LABEL_TEXT); + gtk_widget_set_sensitive(cmdata->delete_button, FALSE); } @@ -218,11 +231,37 @@ static gboolean cm_tree_button_press_event_cb(GtkWidget *widget, GdkEventButton } +static void cm_tree_show_popup_menu(GtkWidget *widget, GdkEventButton *event, CMData *cmdata) +{ + gint button, event_time; + + if (event != NULL) + { + button = event->button; + event_time = event->time; + } + else + { + button = 0; + event_time = gtk_get_current_event_time (); + } + + gtk_menu_popup(GTK_MENU(cmdata->popup_menu), NULL, NULL, NULL, NULL, button, event_time); +} + + +static gboolean cm_tree_popup_menu_cb(GtkWidget *widget, CMData *cmdata) +{ + cm_tree_show_popup_menu(widget, NULL, cmdata); + return TRUE; +} + + static gboolean cm_tree_button_release_event_cb(GtkWidget *widget, GdkEventButton *ev, CMData *cmdata) { if (ev->button == 3) { - gtk_menu_popup(GTK_MENU(cmdata->popup_menu), NULL, NULL, NULL, NULL, ev->button, ev->time); + cm_tree_show_popup_menu(widget, ev, cmdata); return TRUE; } return FALSE; @@ -346,17 +385,18 @@ static void cm_tree_drag_data_get_cb(GtkWidget *widget, GdkDragContext *drag_con GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; - gchar *name, *text; - gboolean is_item; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cmdata->treeview)); gtk_tree_selection_get_selected(selection, &model, &iter); if (model != NULL && gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) { - gtk_tree_model_get(model, &iter, COL_NAME, &name, COL_ITEM, &is_item, -1); + SoupCookie *cookie; + gchar *name, *text; - if (! is_item && name != NULL) + gtk_tree_model_get(model, &iter, COL_NAME, &name, COL_COOKIE, &cookie, -1); + + if (cookie == NULL && name != NULL) { /* skip a leading dot */ text = (*name == '.') ? name + 1 : name; @@ -368,6 +408,38 @@ static void cm_tree_drag_data_get_cb(GtkWidget *widget, GdkDragContext *drag_con } +#if GTK_CHECK_VERSION(2, 12, 0) +static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, + GtkTooltip *tooltip, CMData *cmdata) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_view_get_tooltip_context(GTK_TREE_VIEW(widget), &x, &y, + keyboard_mode, &model, NULL, &iter)) + { + gchar *tooltip_text; + SoupCookie *cookie; + + gtk_tree_model_get(model, &iter, COL_COOKIE, &cookie, -1); + + if (cookie == NULL) /* not an item */ + return FALSE; + + tooltip_text = cm_get_cookie_description_text(cookie); + + gtk_tooltip_set_markup(tooltip, tooltip_text); + + g_free(tooltip_text); + + return TRUE; + } + + return FALSE; +} +#endif + + static void cm_tree_prepare(CMData *cmdata) { GtkCellRenderer *renderer; @@ -378,8 +450,7 @@ static void cm_tree_prepare(CMData *cmdata) GtkWidget *menu; cmdata->treeview = tree = gtk_tree_view_new(); - cmdata->store = gtk_tree_store_new(N_COLUMNS, - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, SOUP_TYPE_COOKIE); + cmdata->store = gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, SOUP_TYPE_COOKIE); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( @@ -394,9 +465,6 @@ static void cm_tree_prepare(CMData *cmdata) gtk_tree_view_set_search_column(GTK_TREE_VIEW(tree), COL_NAME); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(cmdata->store), COL_NAME, GTK_SORT_ASCENDING); - if (gtk_check_version(2, 12, 0) == NULL) - g_object_set(tree, "tooltip-column", COL_TOOLTIP, NULL); - /* selection handling */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); @@ -408,6 +476,13 @@ static void cm_tree_prepare(CMData *cmdata) g_signal_connect(sel, "changed", G_CALLBACK(cm_tree_selection_changed_cb), cmdata); g_signal_connect(tree, "button-press-event", G_CALLBACK(cm_tree_button_press_event_cb), cmdata); g_signal_connect(tree, "button-release-event", G_CALLBACK(cm_tree_button_release_event_cb), cmdata); + g_signal_connect(tree, "popup-menu", G_CALLBACK(cm_tree_popup_menu_cb), cmdata); + + /* tooltips */ +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_has_tooltip(tree, TRUE); + g_signal_connect(tree, "query-tooltip", G_CALLBACK(cm_tree_query_tooltip), cmdata); +#endif /* drag'n'drop */ gtk_tree_view_enable_model_drag_source( From 538ed431652b8c8a1da01513a1561241d7716ddd Mon Sep 17 00:00:00 2001 From: Per Kongstad Date: Sun, 29 Mar 2009 03:57:16 +0200 Subject: [PATCH 0931/2970] Update Danish translation --- po/da.po | 1356 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 797 insertions(+), 559 deletions(-) diff --git a/po/da.po b/po/da.po index 5c1f42bb..df75e56d 100644 --- a/po/da.po +++ b/po/da.po @@ -5,369 +5,303 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.1\n" +"Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 19:49+0100\n" -"PO-Revision-Date: 2009-01-04 13:08+0100\n" +"POT-Creation-Date: 2009-03-22 22:19+0100\n" +"PO-Revision-Date: 2009-03-28 21:59+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Letvægts-webbrowser" -#: ../midori.desktop.in.h:2 -#: ../midori/main.c:1703 -#: ../midori/main.c:1712 -#: ../midori/main.c:1723 -#: ../midori/main.c:1747 -#: ../midori/midori-websettings.c:234 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1580 +#: ../midori/main.c:1672 +#: ../midori/main.c:1681 +#: ../midori/main.c:1692 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Webbrowser" -#: ../midori/main.c:87 -msgid "_Bookmark" -msgstr "_Bogmærke" - -#: ../midori/main.c:88 -#: ../midori/midori-browser.c:3743 -msgid "_Bookmarks" -msgstr "_Bogmærker" - -#: ../midori/main.c:89 -msgid "_Add Bookmark" -msgstr "_Tilføj bogmærke" - -#: ../midori/main.c:90 -msgid "_Console" -msgstr "_Konsol" - -#: ../midori/main.c:91 -msgid "_Extensions" -msgstr "_Udvidelser" - -#: ../midori/main.c:92 -msgid "_History" -msgstr "_Historik" - -#: ../midori/main.c:93 -msgid "_Homepage" -msgstr "_Hjemmeside" - -#: ../midori/main.c:94 -msgid "_Userscripts" -msgstr "_Brugerskripter" - -#: ../midori/main.c:95 -msgid "User_styles" -msgstr "Bruger_grænseflader" - -#: ../midori/main.c:96 -msgid "New _Tab" -msgstr "Nyt _faneblad" - -#: ../midori/main.c:97 -msgid "_Transfers" -msgstr "_Overførsler" - -#: ../midori/main.c:98 -msgid "_Closed Tabs and Windows" -msgstr "_Lukkede faneblade og vinduer" - -#: ../midori/main.c:99 -msgid "New _Window" -msgstr "Nyt _vindue" - -#: ../midori/main.c:155 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Indstillingen kunne ikke indlæses: %s\n" -#: ../midori/main.c:210 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Værdien '%s' er ikke gyldig til %s" -#: ../midori/main.c:217 -#: ../midori/main.c:287 +#: ../midori/main.c:165 +#: ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ugyldig indstillingsværdi '%s'" -#: ../midori/main.c:529 +#: ../midori/main.c:477 msgid "File not found." msgstr "Fil blev ikke fundet." -#: ../midori/main.c:537 -#: ../midori/main.c:546 +#: ../midori/main.c:485 +#: ../midori/main.c:494 msgid "Malformed document." msgstr "Misdannet dokument." -#: ../midori/main.c:568 -#: ../midori/main.c:600 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "Kunne ikke åbne databasen: %s\n" -#: ../midori/main.c:654 +#: ../midori/main.c:548 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Kunne ikke køre databaseudtryk: %s\n" + +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Kunne ikke fjerne historikelementet: %s\n" -#: ../midori/main.c:678 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "Kunne ikke rydde historikken: %s\n" -#: ../midori/main.c:711 -#: ../midori/main.c:725 +#: ../midori/main.c:649 +#: ../midori/main.c:683 +#: ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "Kunne ikke tilføje historikelementet: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:841 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Kunne ikke fjerne gamle historikelementer: %s\n" -#: ../midori/main.c:869 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Indstillingen kunne ikke gemmes. %s" -#: ../midori/main.c:897 -#: ../midori/main.c:915 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Søgemaskinerne kunne ikke gemmes. %s" -#: ../midori/main.c:1045 -#: ../midori/sokoke.c:479 +#: ../midori/main.c:1066 +#: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Skrivning fejlede." -#: ../midori/main.c:1065 -#: ../midori/main.c:1082 +#: ../midori/main.c:1087 +#: ../midori/main.c:1114 +#: ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Bogmærkerne kunne ikke gemmes. %s" -#: ../midori/main.c:1101 -#: ../midori/main.c:1125 +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:1166 +#: ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Papirkurven kunne ikke fyldes. %s" -#: ../midori/main.c:1146 -#: ../midori/midori-preferences.c:381 -msgid "Transfers" -msgstr "Overførsler" - -#: ../midori/main.c:1182 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" -#: ../midori/main.c:1508 -msgid "Authentication Required" -msgstr "Godkendelse påkrævet" +#: ../midori/main.c:1377 +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." -#: ../midori/main.c:1524 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" -"Et brugernavn samt en adgangskode er påkrævet\n" -"for at åbne dette sted:" +#: ../midori/main.c:1392 +msgid "Modify _preferences" +msgstr "Ændre _indstillinger" -#: ../midori/main.c:1538 -msgid "Username" -msgstr "Brugernavn" +#: ../midori/main.c:1396 +msgid "Reset the last _session" +msgstr "Nulstil den sidste _session" -#: ../midori/main.c:1549 -msgid "Password" -msgstr "Adgangskode" +#: ../midori/main.c:1401 +msgid "Disable all _extensions" +msgstr "Slå alle _udvidelser fra" -#: ../midori/main.c:1654 +#: ../midori/main.c:1580 +msgid "No filename specified" +msgstr "Intet filnavn angivet" + +#: ../midori/main.c:1603 +#: ../midori/gjs.c:515 +msgid "An unknown error occured." +msgstr "En ukendt fejl opstod." + +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" msgstr "Kør det angivne filnavn som javascript" -#: ../midori/main.c:1656 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "Vis programversion" -#: ../midori/main.c:1658 -msgid "URIs" -msgstr "URI'erne" +#: ../midori/main.c:1630 +msgid "Addresses" +msgstr "Adresser" -#: ../midori/main.c:1700 -msgid "[URIs]" -msgstr "[URI'erne]" +#: ../midori/main.c:1669 +msgid "[Addresses]" +msgstr "[Adresser]" -#: ../midori/main.c:1724 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "Rapportér venligst kommentarer, forslag og fejl til:" -#: ../midori/main.c:1726 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "Tjek for nye versioner hos:" -#: ../midori/main.c:1747 -msgid "No filename specified" -msgstr "Intet filnavn givet" - -#: ../midori/main.c:1766 -#, c-format +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" msgstr "En instans af Midori kører allerede men reagerer ikke.\n" -#: ../midori/main.c:1825 +#: ../midori/main.c:1772 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Søgemaskinerne kunne ikke indlæses. %s\n" + +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Bogmærkerne kunne ikke indlæses: %s\n" -#: ../midori/main.c:1840 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sessionen kunne ikke indlæses: %s\n" -#: ../midori/main.c:1853 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Papirkurven kunne ikke indlæses: %s\n" -#: ../midori/main.c:1866 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historikken kunne ikke indlæses: %s\n" -#: ../midori/main.c:1878 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "De følgende fejl opstod:" -#: ../midori/main.c:1894 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "_Ignorér" -#: ../midori/main.c:1967 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." -msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette sker gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." - -#: ../midori/main.c:1982 -msgid "Modify _preferences" -msgstr "Ændre _indstillinger" - -#: ../midori/main.c:1986 -msgid "Reset the last _session" -msgstr "Nulstil den sidste _session" - -#: ../midori/main.c:1991 -msgid "Disable all _extensions" -msgstr "Slå alle _udvidelser fra" - -#: ../midori/midori-browser.c:249 -#: ../midori/midori-browser.c:3131 -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:278 +#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" -msgstr "Genindlæs nuværende side" +msgstr "Genindlæs den nuværende side" -#: ../midori/midori-browser.c:261 -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:289 +#: ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "Stop indlæsning af nuværende side" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d%% indlæst" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "Uventet handling '%s'." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:553 +msgid "New folder" +msgstr "Ny mappe" + +#: ../midori/midori-browser.c:553 +msgid "Edit folder" +msgstr "Redigér mappe" + +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "Nyt bogmærke" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "Redigér bogmærke" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:543 -#: ../midori/midori-searchaction.c:868 +#: ../midori/midori-browser.c:598 +#: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Beskrivelse:" -#: ../midori/midori-browser.c:562 -#: ../midori/midori-searchaction.c:882 -msgid "_URL:" -msgstr "_URL:" +#: ../midori/midori-browser.c:617 +#: ../midori/midori-searchaction.c:869 +msgid "_Address:" +msgstr "_Adresse:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "_Mappe:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Rod" +#: ../midori/midori-browser.c:641 +#: ../midori/midori-browser.c:682 +msgid "Toplevel folder" +msgstr "Øverste mappe" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "Gem fil som" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "Åbn fil" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2837 +#: ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:810 +msgid "Open all in _Tabs" +msgstr "Åbn alt i _faneblade" + +#: ../midori/midori-browser.c:2844 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Åbn i nyt _faneblad" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2847 +#: ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Åbn i nyt _vindue" -#: ../midori/midori-browser.c:2605 -msgid "Separator" -msgstr "Separator" - -#: ../midori/midori-browser.c:2716 -#, c-format -msgid "A week ago" -msgstr "For en uge siden" - -#: ../midori/midori-browser.c:2722 -#, c-format -msgid "%d days ago" -msgstr "For %d dage siden" - -#: ../midori/midori-browser.c:2729 -msgid "Today" -msgstr "I dag" - -#: ../midori/midori-browser.c:2731 -msgid "Yesterday" -msgstr "I går" - -#: ../midori/midori-browser.c:2820 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." msgstr "En letvægt-webbrowser." -#: ../midori/midori-browser.c:2828 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "" "Per Kongstad \n" @@ -375,847 +309,934 @@ msgstr "" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../midori/midori-browser.c:2962 -msgid "Are you sure you want to remove all history items?" -msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" - -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "_Fil" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "Åbn et nyt vindue" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "Åbn et nyt faneblad" -#: ../midori/midori-browser.c:3074 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "Åbn en fil" -#: ../midori/midori-browser.c:3077 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "Gem til en fil" -#: ../midori/midori-browser.c:3079 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "_Luk faneblad" -#: ../midori/midori-browser.c:3080 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "Luk nuværende faneblad" -#: ../midori/midori-browser.c:3082 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" -msgstr "L_uk vinduet" +msgstr "Lu_k vinduet" -#: ../midori/midori-browser.c:3083 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "Luk dette vindue" -#: ../midori/midori-browser.c:3086 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "Udskriv nuværende side" -#: ../midori/midori-browser.c:3089 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "Afslut programmet" -#: ../midori/midori-browser.c:3091 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "_Redigér" -#: ../midori/midori-browser.c:3094 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "Udklip markeret tekst" -#: ../midori/midori-browser.c:3097 -#: ../midori/midori-browser.c:3100 +#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "Kopiér markeret tekst" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "Indsæt tekst fra klippebordet" -#: ../midori/midori-browser.c:3106 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "Slet markeret tekst" -#: ../midori/midori-browser.c:3109 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "Markér hele teksten" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "Find et ord eller sætning på siden" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "Find _næste" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "Find næste forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "Find _forrige" -#: ../midori/midori-browser.c:3118 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "Find forrige forekomst af et ord eller sætning" -#: ../midori/midori-browser.c:3121 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "_Find hurtigt" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "Hop hurtigt til et ord eller sætning" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "Indstil programindstillingerne" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "_Vis" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "_Værktøjsbjælker" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "Forøg forstørrelsesniveauet" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "Formindsk forstørrelsesniveauet" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "Nulstil forstørrelsesniveauet" -#: ../midori/midori-browser.c:3148 -#: ../midori/midori-view.c:1004 +#: ../midori/midori-browser.c:3278 +msgid "_Encoding" +msgstr "_Kodning" + +#: ../midori/midori-browser.c:3280 +msgid "_Automatic" +msgstr "_Automatisk" + +#: ../midori/midori-browser.c:3283 +#: ../midori/midori-websettings.c:196 +msgid "Chinese (BIG5)" +msgstr "Kinesisk (BIG5)" + +#: ../midori/midori-browser.c:3286 +#: ../midori/midori-websettings.c:197 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japansk (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3289 +#: ../midori/midori-websettings.c:198 +msgid "Russian (KOI8-R)" +msgstr "Russisk (KOI8-R)" + +#: ../midori/midori-browser.c:3292 +#: ../midori/midori-websettings.c:199 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3295 +#: ../midori/midori-websettings.c:200 +msgid "Western (ISO-8859-1)" +msgstr "Vestlig (ISO-8859-1)" + +#: ../midori/midori-browser.c:3298 +#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 +msgid "Custom..." +msgstr "Tilpasset..." + +#: ../midori/midori-browser.c:3301 +#: ../midori/midori-view.c:1111 msgid "View _Source" msgstr "Vis _kilde" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "Vis kildekode for siden" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "Vis kilde for markerede" -#: ../midori/midori-browser.c:3152 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "Vis kildekode for markering" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "Slå fuldskærmstilstande til/fra" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "_Gå til" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" msgstr "Gå til forrige side" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" msgstr "Gå til næste side" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "Gå til din hjemmeside" -#: ../midori/midori-browser.c:3169 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "Tøm papirkurven" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "Slet indhold af papirkurven" -#: ../midori/midori-browser.c:3172 -#: ../midori/midori-view.c:976 +#: ../midori/midori-browser.c:3325 +#: ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Fortryd luk faneblad" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "Åbn sidste lukkede faneblad" -#: ../midori/midori-browser.c:3177 +#: ../midori/midori-browser.c:3330 +#: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Tilføj et nyt bogmærke" -#: ../midori/midori-browser.c:3180 -msgid "Edit the selected bookmark" -msgstr "Redigér det valgte bogmærke" - -#: ../midori/midori-browser.c:3183 -msgid "Delete the selected bookmark" -msgstr "Slet det valgte bogmærke" - -#: ../midori/midori-browser.c:3186 -msgid "Delete the selected history item" -msgstr "Slet det valgte historikelement" - -#: ../midori/midori-browser.c:3189 -msgid "Clear the entire history" -msgstr "Ryd hele historikken" - -#: ../midori/midori-browser.c:3192 -msgid "Bookmark the selected history item" -msgstr "Bogmærk det valgte historikelement" - -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3331 msgid "_Tools" -msgstr "_Værktøjer" +msgstr "Værk_tøjer" -#: ../midori/midori-browser.c:3196 -#: ../midori/midori-searchaction.c:496 +#: ../midori/midori-browser.c:3333 +#: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Håndtér søgemaskiner" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "Tilføj, redigér og fjern søgemaskiner..." -#: ../midori/midori-browser.c:3201 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "_Forrige faneblad" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "Skift til det forrige faneblad" -#: ../midori/midori-browser.c:3204 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "_Næste faneblad" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "Skift til det næste faneblad" -#: ../midori/midori-browser.c:3207 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "_Hjælp" -#: ../midori/midori-browser.c:3209 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "_Indhold" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "Vis dokumentationen" -#: ../midori/midori-browser.c:3212 -msgid "_Frequent questions" +#: ../midori/midori-browser.c:3349 +msgid "_Frequent Questions" msgstr "_Ofte stillede spørgsmål" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "Vis ofte stillede spørgsmål" -#: ../midori/midori-browser.c:3215 -msgid "_Report a bug" +#: ../midori/midori-browser.c:3352 +msgid "_Report a Bug" msgstr "_Rapportér en fejl" -#: ../midori/midori-browser.c:3216 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "Åbn Midoris fejlsystem" -#: ../midori/midori-browser.c:3219 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "Vis information om dette program" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "P_rivat browsing" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "Undlad at gemme private data under browsing" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "_Menubjælke" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "Vis menubjælke" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "_Navigeringsbjælke" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "Side_panel" -#: ../midori/midori-browser.c:3241 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "Vis sidepanel" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "_Bogmærkebjælke" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" -msgstr "_Overførselsbjælke" +msgstr "_Overførselsstatus" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" -msgstr "Vis overførselsbjælke" +msgstr "Vis overførselsstatus" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "_Statusbjælke" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-browser.c:3668 +#: ../midori/midori-browser.c:3821 +msgid "_Separator" +msgstr "_Separator" + +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "_Sted..." -#: ../midori/midori-browser.c:3670 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "Åbn et særligt sted" -#: ../midori/midori-browser.c:3694 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "_Websøgning..." -#: ../midori/midori-browser.c:3696 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "Kør en websøgnig" -#: ../midori/midori-browser.c:3715 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "Genåbn et tidligere lukket faneblad eller vindue" -#: ../midori/midori-browser.c:3728 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "_Nyligt besøgte sider" -#: ../midori/midori-browser.c:3730 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "Genåbn sider som du tidligere har besøgt" -#: ../midori/midori-browser.c:3745 +#: ../midori/midori-browser.c:3903 +#: ../midori/sokoke.c:772 +msgid "_Bookmarks" +msgstr "_Bogmærker" + +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" -msgstr "Vis gemte bogmærker" +msgstr "Vis de gemte bogmærker" -#: ../midori/midori-browser.c:3758 +#: ../midori/midori-browser.c:3918 msgid "_Window" -msgstr "_Vindue" +msgstr "Vin_due" -#: ../midori/midori-browser.c:3760 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "Vis en liste med alle åbne faneblade" -#: ../midori/midori-browser.c:3882 -msgid "Bookmarks" -msgstr "Bogmærker" - -#: ../midori/midori-browser.c:3925 -#: ../midori/midori-preferences.c:579 -msgid "History" -msgstr "Historik" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3968 -msgid "_Inline find:" +#: ../midori/midori-browser.c:4085 +msgid "_Inline Find:" msgstr "_Indlejret søgning:" -#: ../midori/midori-browser.c:3999 +#: ../midori/midori-browser.c:4110 +msgid "Previous" +msgstr "Forrige" + +#: ../midori/midori-browser.c:4115 +msgid "Next" +msgstr "Næste" + +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "Versalfølsom" -#: ../midori/midori-browser.c:4007 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "Fremhæv fundne" -#: ../midori/midori-browser.c:4016 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "Luk søgebjælke" -#: ../midori/midori-browser.c:4264 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "Uventet indstilling '%s'" -#: ../midori/midori-panel.c:223 -#: ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:511 +msgid "Align sidepanel on the right" +msgstr "Opstil sidepanel til højre" + +#: ../midori/midori-panel.c:231 +#: ../midori/midori-websettings.c:512 +msgid "Whether to align the sidepanel on the right" +msgstr "Om sidepanelet skal være opstilles til højre" + +#: ../midori/midori-panel.c:241 +#: ../midori/midori-panel.c:242 msgid "Close panel" msgstr "Luk panel" -#: ../midori/midori-websettings.c:144 -#: ../midori/midori-view.c:1643 +#: ../midori/midori-websettings.c:179 +#: ../midori/midori-view.c:1888 msgid "Blank page" msgstr "Blank side" -#: ../midori/midori-websettings.c:145 -#: ../midori/midori-websettings.c:419 +#: ../midori/midori-websettings.c:180 +#: ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "Hjemmeside" -#: ../midori/midori-websettings.c:146 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "Sidste åbne sider" -#: ../midori/midori-websettings.c:161 -msgid "Chinese (BIG5)" -msgstr "Kinesisk (BIG5)" - -#: ../midori/midori-websettings.c:162 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japansk (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:163 -msgid "Russian (KOI8-R)" -msgstr "Russisk (KOI8-R)" - -#: ../midori/midori-websettings.c:164 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:165 -msgid "Western (ISO-8859-1)" -msgstr "Vestlig (ISO-8859-1)" - -#: ../midori/midori-websettings.c:166 -#: ../midori/midori-websettings.c:238 -msgid "Custom..." -msgstr "Tilpasset..." - -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "Nyt faneblad" -#: ../midori/midori-websettings.c:182 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "Nyt vindue" -#: ../midori/midori-websettings.c:183 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "Nuværende faneblad" -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "Ikoner" -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "Tekst" -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "Begge" -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "Begge vandrette" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "Alle cookies" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "Session-cookies" -#: ../midori/midori-websettings.c:219 -#: ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:254 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "Ingen" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "Husk sidste vinduesstørrelse" -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "Skal sidste vinduesstørrelse gemmes" -#: ../midori/midori-websettings.c:287 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "Sidste vinduesbredde" -#: ../midori/midori-websettings.c:288 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "Sidste gemte vinduesbredde" -#: ../midori/midori-websettings.c:296 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "Sidste vindueshøjde" -#: ../midori/midori-websettings.c:297 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "Sidste gemte vindueshøjde" -#: ../midori/midori-websettings.c:305 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "Sidste panelplacering" -#: ../midori/midori-websettings.c:306 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "Sidste gemte panelplacering" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:315 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "Sidste panelside" -#: ../midori/midori-websettings.c:316 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "Sidste gemte panelside" -#: ../midori/midori-websettings.c:324 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "Sidste websøgning" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "Den sidste gemte websøgning" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "Vis menubjælke" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "Om menubjælke vises" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "Vis navigeringsbjælke" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "Om navigeringsbjælke vises" -#: ../midori/midori-websettings.c:352 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "Vis bogmærkebjælke" -#: ../midori/midori-websettings.c:353 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "Om bogmærkebjælke vises" -#: ../midori/midori-websettings.c:361 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "Vis panel" -#: ../midori/midori-websettings.c:362 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "Om panel vises" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "Vis overførselsstatus" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "Om overførselsstatus skal vises" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "Vis statusbjælke" -#: ../midori/midori-websettings.c:371 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "Om statusbjælke vises" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "Værktøjsbjælkestil" -#: ../midori/midori-websettings.c:381 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "Stilen for værktøjsbjælke" -#: ../midori/midori-websettings.c:390 +#: ../midori/midori-websettings.c:477 +msgid "Show progress in location entry" +msgstr "Vis fremgang i placeringindgang" + +#: ../midori/midori-websettings.c:478 +msgid "Whether to show loading progress in the location entry" +msgstr "Om visning af indlæsningsfremgang i placeringsindgang" + +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "Værktøjsbjælkes elementer" -#: ../midori/midori-websettings.c:391 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "Elementer der vises på værktøjsbjælken" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "Kompakt sidepanel" -#: ../midori/midori-websettings.c:400 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "Om sidepanelet skal være kompakt" -#: ../midori/midori-websettings.c:409 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "Indlæs ved opstart" -#: ../midori/midori-websettings.c:410 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "Hvad der skal indlæses under opstart" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "Hjemmesiden" -#: ../midori/midori-websettings.c:428 +#: ../midori/midori-websettings.c:547 +msgid "Show crash dialog" +msgstr "Vis nedbrudsdialog" + +#: ../midori/midori-websettings.c:548 +msgid "Show a dialog after Midori crashed" +msgstr "Vis en dialog efter nedbrud af Midori" + +#: ../midori/midori-websettings.c:556 msgid "Download Folder" -msgstr "Download-mappen" +msgstr "Nedhentning-mappen" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" -msgstr "Mappen hvor downloadede filer skal gemmes" +msgstr "Mappen hvor nedhentede filer skal gemmes" -#: ../midori/midori-websettings.c:437 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" -msgstr "Håndtering for download" +msgstr "Håndtering af hentning" -#: ../midori/midori-websettings.c:438 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" -msgstr "En ekstern håndtering for download" +msgstr "En ekstern håndtering for nedhentning" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "Tekstbehandler" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "En ekstern tekstbehandler" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "Søg for stedindgang" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "Søgningen som skal foretages i placeringsindgang" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "Foretrukne tegnsæt" -#: ../midori/midori-websettings.c:475 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "Vis altid fanebladsbjælke" -#: ../midori/midori-websettings.c:476 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "Vis altid fanebladsbjælken" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "Lukkeknapper på faneblade" -#: ../midori/midori-websettings.c:485 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "Om faneblade har lukkeknapper" -#: ../midori/midori-websettings.c:494 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "Åbn nye vinduer i" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "Hvor skal nye sider åbnes" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "Åbn eksterne sider i" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "Hvor skal eksterne sider åbnes" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "Midterklik åbner for markering" -#: ../midori/midori-websettings.c:516 -msgid "Load an URL from the selection via middle click" -msgstr "Indlæs en URL fra markeringen med midterklik" +#: ../midori/midori-websettings.c:650 +msgid "Load an address from the selection via middle click" +msgstr "Indlæs en adresse fra markeringen med midterklik" -#: ../midori/midori-websettings.c:524 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "Åbn faneblade i baggrunden" -#: ../midori/midori-websettings.c:525 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "Om nye faneblade skal åbnes i baggrunden" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "Åbn faneblad ved siden af nuværende" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Om åbning af faneblade skal ske ved siden af nuværende eller efter sidste faneblad" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "Åbn pop op i faneblade" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "Om pop op-vinduer skal åbnes i faneblade" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:693 +msgid "Zoom Text and Images" +msgstr "Zoom tekst og billeder" + +#: ../midori/midori-websettings.c:694 +msgid "Whether to zoom text and images" +msgstr "Om zoom af tekst og billeder" + +#: ../midori/midori-websettings.c:709 +msgid "Find inline while typing" +msgstr "Find indlejret mens du taster" + +#: ../midori/midori-websettings.c:710 +msgid "Whether to automatically find inline while typing" +msgstr "Om indlejret skal findes automatisk, mens du taster" + +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "Tillad cookies" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "Hvilke typer af cookes skal tillades" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "Kun for originale cookies" -#: ../midori/midori-websettings.c:584 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "Tillad kun cookies fra original web-side" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "Maksimal cookie-levetid" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "Maksimal antal dage cookies skal gemmes" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "Husk sidste besøgte sider" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "Om sidste besøgte sider skal gemmes" -#: ../midori/midori-websettings.c:612 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "Maksimal historik-levetid" -#: ../midori/midori-websettings.c:613 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "Maksimale antal dage som historik skal gemmes" -#: ../midori/midori-websettings.c:621 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "Husk sidste formularindtastninger" -#: ../midori/midori-websettings.c:622 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "Om sidste formularindtastninger skal gemmes" -#: ../midori/midori-websettings.c:630 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" -msgstr "Husk sidste downloadede filer" +msgstr "Husk sidste hentede filer" -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" -msgstr "Om sidste downloadede filer skal gemmes" +msgstr "Om sidste hentede filer skal gemmes" -#: ../midori/midori-websettings.c:641 -msgid "HTTP Proxy" -msgstr "HTTP-Proxy" +#: ../midori/midori-websettings.c:786 +msgid "Proxy Server" +msgstr "Proxyserver" -#: ../midori/midori-websettings.c:642 -msgid "The proxy used for HTTP connections" -msgstr "Proxy'en som bruges til HTTP-forbindelser" +#: ../midori/midori-websettings.c:787 +msgid "The proxy server used for HTTP connections" +msgstr "Proxyserveren som bruges til HTTP-forbindelser" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:802 +msgid "Detect proxy server automatically" +msgstr "Genkend automatisk proxyserver" + +#: ../midori/midori-websettings.c:803 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Om proxyserveren genkendes automatisk fra miljøet" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "Identificér som" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "Hvad skal genkendes som web-sider" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "Identifikationsstreng" -#: ../midori/midori-websettings.c:683 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "Programmets identifikationsstreng" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "Størrelse af mellemlager" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "Den tilladte størrelse af mellemlager" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "Ikke fundet - %s" -#: ../midori/midori-view.c:908 +#: ../midori/midori-view.c:988 +msgid "Open _Link" +msgstr "Åbn _henvisning" + +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "Åbn henvisning i nyt _faneblad" -#: ../midori/midori-view.c:931 -msgid "_Save Link destination" -msgstr "_Gem henvisningsadressen" +#: ../midori/midori-view.c:1007 +msgid "Open Link in New _Window" +msgstr "Åbn henvisning i nyt _vindue" -#: ../midori/midori-view.c:939 +#: ../midori/midori-view.c:1016 +#: ../midori/midori-view.c:1030 msgid "_Download Link destination" -msgstr "_Download henvisningsadressen" +msgstr "_Hent henvisningsadressen" -#: ../midori/midori-view.c:961 -msgid "Open URL in New _Tab" -msgstr "Åbn URL i nyt _faneblad" +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "_Gem henvisningsadresse" -#: ../midori/midori-view.c:1369 +#: ../midori/midori-view.c:1053 +msgid "_Search the Web" +msgstr "_Søg internettet" + +#: ../midori/midori-view.c:1062 +msgid "Open Address in New _Tab" +msgstr "Åbn adresse i nyt _faneblad" + +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "Åbn eller hent fil" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Filtype: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "Åbn %s" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "Undersøg side - %s" -#: ../midori/midori-view.c:1507 -msgid "Source" -msgstr "Kilde" +#: ../midori/midori-view.c:1755 +#, c-format +msgid "Document cannot be displayed" +msgstr "Dokument kan ikke vises" -#: ../midori/midori-view.c:1531 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "Ingen dokumentation installeret" @@ -1226,193 +1247,327 @@ msgid "Preferences for %s" msgstr "Indstillinger for %s" #. Page "General" -#: ../midori/midori-preferences.c:369 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Generel" -#: ../midori/midori-preferences.c:370 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Opstart" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Brug nuværende side som hjemmeside" + +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Overførsler" + #. Page "Appearance" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "Udseende" -#: ../midori/midori-preferences.c:418 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "Indstillinger for skrifttype" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "Standard for skrifttypefamilie" -#: ../midori/midori-preferences.c:428 +#: ../midori/midori-preferences.c:471 +msgid "The default font size used to display text" +msgstr "Størrelse af standardskriftstype er brugt til at vise tekst" + +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "Minimal skriftstørrelse" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:477 +msgid "The minimum font size used to display text" +msgstr "Minimum størrelse af skrifttype til at vise tekst" + +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "Tegnsæt" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "Tegnsæt som bruges standard" #. Page "Behavior" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "Opførsel" -#: ../midori/midori-preferences.c:448 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "Funktionalitet" -#: ../midori/midori-preferences.c:451 -#: ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:498 +#: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Indlæs billeder automatisk" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:499 +msgid "Load and display images automatically" +msgstr "Indlæs og vis billeder automatisk" + +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "Formindsk billeder automatisk" -#: ../midori/midori-preferences.c:457 +#: ../midori/midori-preferences.c:503 +msgid "Automatically shrink standalone images to fit" +msgstr "Minimér enkeltstående billeder til at passe" + +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "Udskriv baggrundsbilleder" -#: ../midori/midori-preferences.c:460 +#: ../midori/midori-preferences.c:507 +msgid "Whether background images should be printed" +msgstr "Om baggrundsbilleder skal udskrives" + +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "Justerbare tekstområder" -#: ../midori/midori-preferences.c:463 -#: ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:511 +msgid "Whether text areas are resizable" +msgstr "Om tekstområder kan ændre størrelse" + +#: ../midori/midori-preferences.c:514 +#: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Brug skripter" -#: ../midori/midori-preferences.c:466 -#: ../extensions/statusbar-features.c:46 -msgid "Enable plugins" -msgstr "Brug udvidelsesmoduler" +#: ../midori/midori-preferences.c:515 +msgid "Enable embedded scripting languages" +msgstr "Slå indlejret skriptsprog til" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:518 +#: ../extensions/statusbar-features.c:56 +msgid "Enable plugins" +msgstr "Slå udvidelsesmoduler til" + +#: ../midori/midori-preferences.c:519 +msgid "Enable embedded plugin objects" +msgstr "Slå indlejrede udvidelsesobjekter til" + +#: ../midori/midori-preferences.c:522 +msgid "Enforce 96 dots per inch" +msgstr "Gennemtving 96 dots per tomme" + +#: ../midori/midori-preferences.c:523 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Gennemtving tæthed af videopunkt på 96 DPI" + +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "Brug udvikler-værktøjer" +#: ../midori/midori-preferences.c:527 +msgid "Enable special extensions for developers" +msgstr "Slå specielle udvidelser til udviklere til" + #. Page "Interface" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "Grænseflade" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "Navigeringsbjælke" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "Browsing" -#: ../midori/midori-preferences.c:525 -#: ../midori/midori-preferences.c:526 +#. Page "Network" +#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:580 msgid "Network" msgstr "Netværk" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:555 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "Beskyttelse af privatliv" -#: ../midori/midori-preferences.c:561 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "Web-cookies" -#: ../midori/midori-preferences.c:574 -#: ../midori/midori-preferences.c:586 +#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:636 msgid "days" msgstr "dage" -#: ../midori/midori-searchaction.c:487 -#: ../katze/katze-arrayaction.c:273 +#: ../midori/midori-preferences.c:629 +#: ../panels/midori-history.c:104 +msgid "History" +msgstr "Historik" + +#: ../midori/midori-searchaction.c:455 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Tom" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:811 msgid "Add search engine" msgstr "Tilføj søgemaskine" -#: ../midori/midori-searchaction.c:824 +#: ../midori/midori-searchaction.c:811 msgid "Edit search engine" msgstr "Redigér søgemaskine" -#: ../midori/midori-searchaction.c:852 +#: ../midori/midori-searchaction.c:839 msgid "_Name:" msgstr "_Navn:" -#: ../midori/midori-searchaction.c:896 -msgid "_Icon (name or file):" -msgstr "_Ikon (navn eller fil):" +#: ../midori/midori-searchaction.c:883 +msgid "_Icon:" +msgstr "_Ikon:" -#: ../midori/midori-searchaction.c:910 +#: ../midori/midori-searchaction.c:897 msgid "_Token:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:1087 -msgid "Manage search engines" -msgstr "Håndtering af søgemaskiner" +#: ../midori/midori-searchaction.c:1077 +msgid "Manage Search Engines" +msgstr "Håndtér søgemaskiner" -#: ../midori/sokoke.c:63 -#: ../midori/sokoke.c:75 +#: ../midori/sokoke.c:109 +#: ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "Kunne ikke køre eksternt program." -#: ../midori/sokoke.c:302 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:440 msgid "Warning: You are using a superuser account!" msgstr "Advarsel: Du bruger en superbruger-konto!" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "En ukendt fejl opstod." +#: ../midori/sokoke.c:771 +msgid "_Bookmark" +msgstr "_Bogmærke" -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 +#: ../midori/sokoke.c:773 +msgid "_Add Bookmark" +msgstr "_Tilføj bogmærke" + +#: ../midori/sokoke.c:774 +msgid "_Console" +msgstr "_Konsol" + +#: ../midori/sokoke.c:775 +msgid "_Extensions" +msgstr "_Udvidelser" + +#: ../midori/sokoke.c:776 +msgid "_History" +msgstr "Hi_storik" + +#: ../midori/sokoke.c:777 +msgid "_Homepage" +msgstr "_Hjemmeside" + +#: ../midori/sokoke.c:778 +msgid "_Userscripts" +msgstr "Brugerskri_pter" + +#: ../midori/sokoke.c:779 +msgid "User_styles" +msgstr "Bruger_grænseflader" + +#: ../midori/sokoke.c:780 +msgid "New _Tab" +msgstr "Nyt _faneblad" + +#: ../midori/sokoke.c:781 +msgid "_Transfers" +msgstr "_Overførsler" + +#: ../midori/sokoke.c:782 +msgid "_Closed Tabs and Windows" +msgstr "_Lukkede faneblade og vinduer" + +#: ../midori/sokoke.c:783 +msgid "New _Window" +msgstr "Nyt _vindue" + +#: ../midori/gjs.c:743 +#: ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s har ingen egenskab '%s'" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s kan ikke blive tildelt til %s.%s" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s kan ikke tilgås" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:144 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Brugerskripter" -#: ../panels/midori-addons.c:99 -#: ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Brugerstile" -#: ../panels/midori-addons.c:1006 +#: ../panels/midori-addons.c:922 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Slå til" -#: ../panels/midori-addons.c:1015 -#: ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:923 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Slå til" + +#: ../panels/midori-addons.c:932 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Slå fra" +#: ../panels/midori-addons.c:933 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Slå fra" + +#: ../panels/midori-bookmarks.c:103 +msgid "Bookmarks" +msgstr "Bogmærker" + +#: ../panels/midori-bookmarks.c:236 +msgid "Edit the selected bookmark" +msgstr "Redigér det valgte bogmærke" + +#: ../panels/midori-bookmarks.c:244 +msgid "Delete the selected bookmark" +msgstr "Slet det valgte bogmærke" + +#: ../panels/midori-bookmarks.c:257 +msgid "Add a new folder" +msgstr "Tilføj en ny mappe" + +#: ../panels/midori-bookmarks.c:589 +msgid "Separator" +msgstr "Separator" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Konsol" @@ -1421,6 +1576,70 @@ msgstr "Konsol" msgid "Extensions" msgstr "Udvidelser" +#: ../panels/midori-history.c:159 +msgid "Are you sure you want to remove all history items?" +msgstr "Er du sikker på, at du ønsker at fjerne alle historikelementer?" + +#: ../panels/midori-history.c:216 +msgid "Bookmark the selected history item" +msgstr "Bogmærk det valgte historikelement" + +#: ../panels/midori-history.c:225 +msgid "Delete the selected history item" +msgstr "Slet det valgte historikelement" + +#: ../panels/midori-history.c:233 +msgid "Clear the entire history" +msgstr "Ryd hele historikken" + +#: ../panels/midori-history.c:603 +#, c-format +msgid "A week ago" +msgstr "For en uge siden" + +#: ../panels/midori-history.c:609 +#, c-format +msgid "%d days ago" +msgstr "For %d dage siden" + +#: ../panels/midori-history.c:616 +msgid "Today" +msgstr "I dag" + +#: ../panels/midori-history.c:618 +msgid "Yesterday" +msgstr "I går" + +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:54 +msgid "Plugins" +msgstr "Udvidelsesmoduler" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s af %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Godkendelse påkrævet" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Et brugernavn samt en adgangskode er påkrævet\n" +"for at åbne dette sted:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Brugernavn" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Adgangskode" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1435,40 +1654,59 @@ msgstr "Lagerikon '%s' kunne ikke indlæses" msgid "Animation frames are broken" msgstr "Animeringsrammer er ødelagt" -#: ../katze/katze-utils.c:182 -#: ../katze/katze-utils.c:391 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Egenskab '%s' er ikke gyldig for %s" -#: ../katze/katze-utils.c:211 -#: ../katze/katze-utils.c:250 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Vælg fil" -#: ../katze/katze-utils.c:231 +#: ../katze/katze-utils.c:229 msgid "Choose folder" msgstr "Vælg mappe" +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "Ton faneblade tydeligt" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "Farvefulde faneblade" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "Ton hvert faneblad tydeligt" + +#: ../extensions/mouse-gestures/main.c:176 +msgid "Mouse Gestures" +msgstr "Musebevægelser" + +#: ../extensions/mouse-gestures/main.c:177 +msgid "Control Midori by moving the mouse" +msgstr "Styr Midori ved at flytte musen" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 -#: ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 msgid "Pageholder" -msgstr "" +msgstr "Sideholder" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:137 msgid "_Pageholder" -msgstr "" +msgstr "_Sideholder" -#: ../extensions/statusbar-features.c:30 +#: ../extensions/statusbar-features.c:40 msgid "Images" msgstr "Billeder" -#: ../extensions/statusbar-features.c:37 +#: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "Skripter" -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "Udvidelsesmoduler" +#~ msgid "Source" +#~ msgstr "Kilde" From ed2a35d70b78232562aeb1ba0158fe785916c96b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 30 Mar 2009 00:14:43 +0200 Subject: [PATCH 0932/2970] Don't expressly use libkatze in extensions to avoid -fPIC problem --- extensions/wscript_build | 1 - katze/wscript_build | 3 --- midori/wscript_build | 6 ------ 3 files changed, 10 deletions(-) diff --git a/extensions/wscript_build b/extensions/wscript_build index 8ce7027f..1ea845d2 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -26,5 +26,4 @@ for extension in extensions: obj.includes = '..' obj.source = source obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML' - obj.uselib_local = 'katze' obj.install_path = '${LIBDIR}/midori' diff --git a/katze/wscript_build b/katze/wscript_build index 27a24fc2..52c282dd 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -12,6 +12,3 @@ obj.find_sources_in_dirs ('.') obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal') obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML' obj.install_path = None - -if platform.architecture ()[0] == '64bit': - obj.env.append_value ('CCFLAGS', '-fPIC') diff --git a/midori/wscript_build b/midori/wscript_build index 91f53026..87eba0ea 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -14,9 +14,6 @@ obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON' obj.uselib_local = 'katze' obj.install_path = None -if platform.architecture ()[0] == '64bit': - obj.env.append_value ('CCFLAGS', '-fPIC') - obj = bld.new_task_gen ('cc', 'staticlib') obj.name = 'panels' obj.target = 'panels' @@ -26,9 +23,6 @@ obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML' obj.uselib_local = 'midori' obj.install_path = None -if platform.architecture ()[0] == '64bit': - obj.env.append_value ('CCFLAGS', '-fPIC') - obj = bld.new_task_gen ('cc', 'program') obj.target = 'midori' obj.includes = '. .. ../panels' From 99c3154dd67cf982f963518f12d15a49022b88db Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 30 Mar 2009 00:49:48 +0200 Subject: [PATCH 0933/2970] Correction misspelling of 'happened' --- midori/main.c | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/en_GB.po | 4 ++-- po/es.po | 2 +- po/fr.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/nl.po | 2 +- po/pt_PT.po | 2 +- po/ru.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/midori/main.c b/midori/main.c index 6512ca43..626298e2 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1377,7 +1377,7 @@ midori_create_diagnostic_dialog (MidoriWebSettings* settings, dialog = gtk_message_dialog_new ( NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Midori seems to have crashed the last time it was opened. " - "If this happend repeatedly, try one of the following options " + "If this happened repeatedly, try one of the following options " "to solve the problem.")); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ()); diff --git a/po/da.po b/po/da.po index df75e56d..07421041 100644 --- a/po/da.po +++ b/po/da.po @@ -126,7 +126,7 @@ msgid "The session couldn't be saved. %s" msgstr "Sessionen kunne ikke gemmes. %s" #: ../midori/main.c:1377 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori ser ud til at være gået ned efter det var åbnet sidste gang. Hvis dette er sket gentagne gange, foreslås det at prøve de følgende muligheder for at løse problemet." #: ../midori/main.c:1392 diff --git a/po/de.po b/po/de.po index c8367f4d..b8a97712 100644 --- a/po/de.po +++ b/po/de.po @@ -118,7 +118,7 @@ msgstr "Die Sitzung konnte nicht geladen werden. %s" #: ../midori/main.c:1377 msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " +"Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " diff --git a/po/en_GB.po b/po/en_GB.po index 068890e8..0a928471 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -194,10 +194,10 @@ msgstr "Password" #: ../midori/main.c:1783 msgid "" "Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." +"happened repeatedly, try one of the following options to solve the problem." msgstr "" "Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." +"happened repeatedly, try one of the following options to solve the problem." #: ../midori/main.c:1798 msgid "Modify _preferences" diff --git a/po/es.po b/po/es.po index afe5d6af..38900364 100644 --- a/po/es.po +++ b/po/es.po @@ -196,7 +196,7 @@ msgstr "Contraseña" #: ../midori/main.c:1783 msgid "" "Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." +"happened repeatedly, try one of the following options to solve the problem." msgstr "" "Parece que Midori se cerró insperadamente la última vez. Si esto sucede " "repetidamente, pruebe una de las siguientes opciones para resolver el " diff --git a/po/fr.po b/po/fr.po index f05bdada..bc5bd1cc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -121,7 +121,7 @@ msgstr "La session n'a pu être enregistrée. %s" #: ../midori/main.c:1377 msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " +"Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" "Midori semble s'être interrompu de façon inattendue lors de la dernière " diff --git a/po/it.po b/po/it.po index 1f7e72a3..7248ca8b 100644 --- a/po/it.po +++ b/po/it.po @@ -131,7 +131,7 @@ msgid "The session couldn't be saved. %s" msgstr "La sessione non può essere salvata. %s" #: ../midori/main.c:1398 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori sembra essersi chiuso inaspettatamente l'ultima volta che è stato usato. Se dovesse capitare spesso, provare una delle seguenti opzioni per risolvere il problema." #: ../midori/main.c:1413 diff --git a/po/ja.po b/po/ja.po index 01d8be93..6d900ad3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -117,7 +117,7 @@ msgstr "セッションは保存できませんでした。%s" #: ../midori/main.c:1379 msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " +"Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" diff --git a/po/nl.po b/po/nl.po index 81f5da15..8334c3ef 100644 --- a/po/nl.po +++ b/po/nl.po @@ -186,7 +186,7 @@ msgstr "" #: ../midori/main.c:1675 msgid "" "Midori seems to have crashed the last time it was opened. If this " -"happend repeatedly, try one of the following options to solve the problem." +"happened repeatedly, try one of the following options to solve the problem." msgstr "" #: ../midori/main.c:1690 diff --git a/po/pt_PT.po b/po/pt_PT.po index acfc309e..56203892 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -131,7 +131,7 @@ msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" #: ../midori/main.c:1398 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." #: ../midori/main.c:1413 diff --git a/po/ru.po b/po/ru.po index cb95271a..cc3a2886 100644 --- a/po/ru.po +++ b/po/ru.po @@ -132,7 +132,7 @@ msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" #: ../midori/main.c:1409 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." #: ../midori/main.c:1424 diff --git a/po/zh_CN.po b/po/zh_CN.po index 9f03f257..ca701c65 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -121,7 +121,7 @@ msgstr "会话无法保存. %s" #: ../midori/main.c:1398 msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " +"Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现，请尝试以下的选项来解决此问" diff --git a/po/zh_TW.po b/po/zh_TW.po index b03d9465..376971df 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -121,7 +121,7 @@ msgstr "無法儲存執行階段。%s" #: ../midori/main.c:1401 msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " +"Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" "Midori 似乎於上次開啟時發生當機。如果這種情況重複出現，請試著以下列選項之一來" From fe53c0b7035837311ca76b0f2e6dfb890dc30425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 30 Mar 2009 23:14:09 +0200 Subject: [PATCH 0934/2970] Print the cookie expiration date in the user's locale. --- extensions/cookie-manager.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index cbadd4e1..af482a22 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -10,6 +10,7 @@ */ #include "config.h" +#include #include #include @@ -143,14 +144,25 @@ static void cm_refresh_store(CMData *cmdata) static gchar *cm_get_cookie_description_text(SoupCookie *cookie) { + static gchar date_fmt[512]; gchar *expires; gchar *text; + time_t expiration_time; + const struct tm *tm; g_return_val_if_fail(cookie != NULL, NULL); - expires = (cookie->expires != NULL) ? - soup_date_to_string(cookie->expires, SOUP_DATE_HTTP) : - g_strdup(_("At theend of the session")); + if (cookie->expires != NULL) + { + expiration_time = soup_date_to_time_t(cookie->expires); + tm = localtime(&expiration_time); + /* even if some gcc versions complain about "%c", there is nothing wrong with and here we + * want to use it */ + strftime(date_fmt, sizeof(date_fmt), "%c", tm); + expires = date_fmt; + } + else + expires = _("At the end of the session"); text = g_markup_printf_escaped( _("Host: %s\nName: %s\nValue: %s\nPath: %s\nSecure: %s\nExpires: %s"), @@ -161,8 +173,6 @@ static gchar *cm_get_cookie_description_text(SoupCookie *cookie) cookie->secure ? _("Yes") : _("No"), expires); - g_free(expires); - return text; } From 917d1dca63d3bf41daf9a4719ade3f382f5f9551 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Mon, 30 Mar 2009 23:24:26 +0200 Subject: [PATCH 0935/2970] Update Russian translation --- po/ru.po | 903 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 508 insertions(+), 395 deletions(-) diff --git a/po/ru.po b/po/ru.po index cc3a2886..6ad7003f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.4\n" +"Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-15 11:13+0800\n" -"PO-Revision-Date: 2009-03-15 11:36+0800\n" +"POT-Creation-Date: 2009-03-27 18:50+0800\n" +"PO-Revision-Date: 2009-03-27 19:11+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1612 -#: ../midori/main.c:1715 -#: ../midori/main.c:1724 -#: ../midori/main.c:1735 -#: ../midori/midori-websettings.c:267 +#: ../midori/main.c:1582 +#: ../midori/main.c:1675 +#: ../midori/main.c:1684 +#: ../midori/main.c:1695 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -33,1362 +33,1392 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:107 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:162 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:169 -#: ../midori/main.c:239 +#: ../midori/main.c:165 +#: ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:481 +#: ../midori/main.c:477 msgid "File not found." msgstr "Файл не найден." -#: ../midori/main.c:489 -#: ../midori/main.c:498 +#: ../midori/main.c:485 +#: ../midori/main.c:494 msgid "Malformed document." msgstr "Плохо сформированный документ." -#: ../midori/main.c:520 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:552 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:606 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:630 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:653 -#: ../midori/main.c:687 -#: ../midori/main.c:703 +#: ../midori/main.c:649 +#: ../midori/main.c:683 +#: ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:883 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:911 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:940 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:1070 +#: ../midori/main.c:1066 #: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/main.c:1091 -#: ../midori/main.c:1118 -#: ../midori/main.c:1146 +#: ../midori/main.c:1087 +#: ../midori/main.c:1114 +#: ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1170 -#: ../midori/main.c:1194 +#: ../midori/main.c:1166 +#: ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:1225 -#: ../midori/midori-preferences.c:433 -msgid "Transfers" -msgstr "Передачи" - -#: ../midori/main.c:1266 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1409 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." +#: ../midori/main.c:1379 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Возможно, работа Midori была аварийно прекращена. Если это часто " +"повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1424 +#: ../midori/main.c:1394 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1428 +#: ../midori/main.c:1398 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1433 +#: ../midori/main.c:1403 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1612 +#: ../midori/main.c:1582 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1639 +#: ../midori/main.c:1605 #: ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1662 +#: ../midori/main.c:1628 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1664 +#: ../midori/main.c:1630 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1666 +#: ../midori/main.c:1632 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1712 +#: ../midori/main.c:1672 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1736 +#: ../midori/main.c:1696 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1738 +#: ../midori/main.c:1698 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1765 +#: ../midori/main.c:1725 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1835 +#: ../midori/main.c:1775 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1787 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1862 +#: ../midori/main.c:1802 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1875 +#: ../midori/main.c:1815 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1888 +#: ../midori/main.c:1828 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1900 +#: ../midori/main.c:1840 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1916 +#: ../midori/main.c:1856 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-browser.c:277 -#: ../midori/midori-browser.c:3056 -#: ../midori/midori-browser.c:3062 +#: ../midori/midori-browser.c:278 +#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3280 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:288 -#: ../midori/midori-browser.c:3059 +#: ../midori/midori-browser.c:289 +#: ../midori/midori-browser.c:3277 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:597 +#: ../midori/midori-browser.c:598 #: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:617 #: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:640 -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 +#: ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2635 +#: ../midori/midori-browser.c:2837 #: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:2642 +#: ../midori/midori-browser.c:2844 #: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2645 +#: ../midori/midori-browser.c:2847 #: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2795 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:2803 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3208 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:2993 +#: ../midori/midori-browser.c:3211 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:2996 +#: ../midori/midori-browser.c:3214 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:2999 +#: ../midori/midori-browser.c:3217 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3002 +#: ../midori/midori-browser.c:3220 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3222 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:3223 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3225 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3008 +#: ../midori/midori-browser.c:3226 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3011 +#: ../midori/midori-browser.c:3229 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3014 +#: ../midori/midori-browser.c:3232 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3016 +#: ../midori/midori-browser.c:3234 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3019 +#: ../midori/midori-browser.c:3237 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3022 -#: ../midori/midori-browser.c:3025 +#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3243 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3028 +#: ../midori/midori-browser.c:3246 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3031 +#: ../midori/midori-browser.c:3249 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3034 +#: ../midori/midori-browser.c:3252 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3037 +#: ../midori/midori-browser.c:3255 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3257 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3040 +#: ../midori/midori-browser.c:3258 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3260 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3043 +#: ../midori/midori-browser.c:3261 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3264 msgid "_Quick Find" msgstr "_Быстрый поиск" -#: ../midori/midori-browser.c:3047 +#: ../midori/midori-browser.c:3265 msgid "Quickly jump to a word or phrase" msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:3050 +#: ../midori/midori-browser.c:3268 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3270 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3053 +#: ../midori/midori-browser.c:3271 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3283 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3286 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3289 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3072 +#: ../midori/midori-browser.c:3290 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3074 +#: ../midori/midori-browser.c:3292 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:3077 -#: ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3295 +#: ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-browser.c:3080 -#: ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3298 +#: ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-browser.c:3083 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3301 +#: ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:3086 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3304 +#: ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:3089 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3307 +#: ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:3092 -#: ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3310 +#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-browser.c:3095 -#: ../midori/midori-view.c:1073 +#: ../midori/midori-browser.c:3313 +#: ../midori/midori-view.c:1111 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3096 +#: ../midori/midori-browser.c:3314 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3316 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3099 +#: ../midori/midori-browser.c:3317 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3103 +#: ../midori/midori-browser.c:3321 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3105 +#: ../midori/midori-browser.c:3323 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:3108 +#: ../midori/midori-browser.c:3326 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3111 +#: ../midori/midori-browser.c:3329 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3114 +#: ../midori/midori-browser.c:3332 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3334 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3117 +#: ../midori/midori-browser.c:3335 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3119 -#: ../midori/midori-view.c:1045 +#: ../midori/midori-browser.c:3337 +#: ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3120 +#: ../midori/midori-browser.c:3338 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3342 #: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3125 +#: ../midori/midori-browser.c:3343 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3345 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3128 +#: ../midori/midori-browser.c:3346 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3350 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3351 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3353 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3354 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3138 +#: ../midori/midori-browser.c:3356 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3358 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3141 +#: ../midori/midori-browser.c:3359 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3361 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3144 +#: ../midori/midori-browser.c:3362 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3364 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3365 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3368 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3375 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3376 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3381 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:3382 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3385 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3168 +#: ../midori/midori-browser.c:3386 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3389 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3172 +#: ../midori/midori-browser.c:3390 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3393 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3394 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3397 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3180 +#: ../midori/midori-browser.c:3398 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3401 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3402 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3617 +#: ../midori/midori-browser.c:3833 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3840 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3626 +#: ../midori/midori-browser.c:3842 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3650 +#: ../midori/midori-browser.c:3866 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3652 +#: ../midori/midori-browser.c:3868 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3887 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3684 +#: ../midori/midori-browser.c:3900 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3902 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3915 #: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3917 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3714 +#: ../midori/midori-browser.c:3930 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3716 +#: ../midori/midori-browser.c:3932 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4100 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:3904 +#: ../midori/midori-browser.c:4125 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:3909 +#: ../midori/midori-browser.c:4130 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:3914 +#: ../midori/midori-browser.c:4135 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:3922 +#: ../midori/midori-browser.c:4143 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4153 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4226 +#: ../midori/midori-browser.c:4459 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:227 +#: ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-panel.c:241 -#: ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:239 +#: ../midori/midori-panel.c:240 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:177 -#: ../midori/midori-view.c:1819 +#: ../midori/midori-websettings.c:179 +#: ../midori/midori-view.c:1915 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:178 -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 +#: ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:252 -#: ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:420 -msgid "Show Statusbar" -msgstr "Показать вкладку статуса" +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "Показывать панель передач" + +#: ../midori/midori-websettings.c:450 +msgid "Show Statusbar" +msgstr "Показать панель состояния" + +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который будут сохраняться файлы" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "Открывать новую страницу в" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "Только оригинальные фрагменты данных" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "Принимать фрагменты данных только с оригинального сайта" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения фрагментов данных" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:626 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:956 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "_Открыть ссылку" -#: ../midori/midori-view.c:958 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:975 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "Открыть ссылку в новом _окне" -#: ../midori/midori-view.c:985 -msgid "_Save Link destination" -msgstr "_Сохранить объект" - -#: ../midori/midori-view.c:993 +#: ../midori/midori-view.c:1016 +#: ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:1015 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "_Сохранить объект" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:1024 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1503 +#: ../midori/midori-view.c:1207 +msgid "Open or download file" +msgstr "Открыть или загрузить файл" + +#: ../midori/midori-view.c:1224 +#, c-format +msgid "File Type: '%s'" +msgstr "Тип файла: «%s»" + +#: ../midori/midori-view.c:1227 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Тип файла: %s («%s»)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1231 +#, c-format +msgid "Open %s" +msgstr "Открыть %s" + +#: ../midori/midori-view.c:1627 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1662 -msgid "Source" -msgstr "Исходный код" - -#: ../midori/midori-view.c:1686 +#: ../midori/midori-view.c:1772 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1702 +#: ../midori/midori-view.c:1788 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" -#: ../midori/midori-preferences.c:94 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:409 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:415 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Передачи" + #. Page "Appearance" -#: ../midori/midori-preferences.c:469 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:505 -#: ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 +#: ../extensions/statusbar-features.c:51 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-preferences.c:509 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" -#: ../midori/midori-preferences.c:513 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" msgstr "Текстовые поля могут изменять размер" -#: ../midori/midori-preferences.c:521 -#: ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 +#: ../extensions/statusbar-features.c:58 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-preferences.c:525 -#: ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 +#: ../extensions/statusbar-features.c:65 msgid "Enable plugins" msgstr "Использовать модули" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" msgstr "Разрешить встроенные объекты модулей на страницах" -#: ../midori/midori-preferences.c:529 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:533 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:534 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" #. Page "Interface" -#: ../midori/midori-preferences.c:546 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:547 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:556 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "Навигация" -#: ../midori/midori-preferences.c:595 -#: ../midori/midori-preferences.c:596 +#. Page "Network" +#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:580 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:632 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:641 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:654 -#: ../midori/midori-preferences.c:668 +#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:636 msgid "days" msgstr "дней" -#: ../midori/midori-preferences.c:661 +#: ../midori/midori-preferences.c:629 #: ../panels/midori-history.c:104 msgid "History" msgstr "Журнал" @@ -1420,7 +1450,7 @@ msgstr "_Признак:" #: ../midori/midori-searchaction.c:1077 msgid "Manage Search Engines" -msgstr "Управление поисковыми сервисами" +msgstr "Управление средствами поиска" #: ../midori/sokoke.c:109 #: ../midori/sokoke.c:121 @@ -1496,32 +1526,32 @@ msgstr "%s не может быть назначен для %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s недоступен" -#: ../panels/midori-addons.c:97 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Сценарии" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Стили пользователя" -#: ../panels/midori-addons.c:1005 +#: ../panels/midori-addons.c:922 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Включить" -#: ../panels/midori-addons.c:1006 +#: ../panels/midori-addons.c:923 #: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "Включить" -#: ../panels/midori-addons.c:1015 +#: ../panels/midori-addons.c:932 #: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Отключить" -#: ../panels/midori-addons.c:1016 +#: ../panels/midori-addons.c:933 #: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "Отключить" @@ -1589,15 +1619,20 @@ msgid "Yesterday" msgstr "Вчера" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:54 +#: ../extensions/statusbar-features.c:63 msgid "Plugins" msgstr "Модули" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s из %s" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Требуется авторизация" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" @@ -1605,11 +1640,11 @@ msgstr "" "Для просмотра этой страницы требуются\n" "имя пользователя и пароль:" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "Имя пользователя" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "Пароль" @@ -1642,6 +1677,86 @@ msgstr "Выберите файл" msgid "Choose folder" msgstr "Выберите папку" +#: ../extensions/colorful-tabs.c:104 +msgid "Tint tabs distinctly" +msgstr "Цвета вкладок" + +#: ../extensions/colorful-tabs.c:140 +msgid "Colorful Tabs" +msgstr "Цветные вкладки" + +#: ../extensions/colorful-tabs.c:141 +msgid "Tint each tab distinctly" +msgstr "Каждая вкладка имеет свой цвет" + +#: ../extensions/cookie-manager.c:136 +#, c-format +msgid "" +"Host: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Name: %s\n" +"Value: %s" +msgstr "" +"Узел: %s\n" +"Путь: %s\n" +"Защищённый: %s\n" +"Имя: %s\n" +"Значение: %s" + +#: ../extensions/cookie-manager.c:139 +msgid "Yes" +msgstr "Да" + +#: ../extensions/cookie-manager.c:139 +msgid "No" +msgstr "Нет" + +#: ../extensions/cookie-manager.c:330 +msgid "Do you really want to delete all cookies?" +msgstr "Удалить все сохранённые фрагменты данных?" + +#: ../extensions/cookie-manager.c:332 +msgid "Question" +msgstr "Вопрос" + +#: ../extensions/cookie-manager.c:386 +msgid "Name" +msgstr "Имя" + +#: ../extensions/cookie-manager.c:436 +msgid "_Expand All" +msgstr "_Развернуть всё" + +#: ../extensions/cookie-manager.c:443 +msgid "_Collapse All" +msgstr "_Свернуть всё" + +#: ../extensions/cookie-manager.c:508 +msgid "Delete All" +msgstr "Удалить всё" + +#: ../extensions/cookie-manager.c:521 +msgid "Expand All" +msgstr "Развернуть всё" + +#: ../extensions/cookie-manager.c:527 +msgid "Collapse All" +msgstr "Свернуть всё" + +#: ../extensions/cookie-manager.c:569 +#: ../extensions/cookie-manager.c:613 +msgid "Cookie Manager" +msgstr "Менеджер фрагментов данных" + +#: ../extensions/cookie-manager.c:597 +msgid "_Cookie Manager" +msgstr "_Менеджер фрагментов данных" + +#: ../extensions/cookie-manager.c:614 +msgid "List, view and delete cookies" +msgstr "Просмотр и удаление фрагментов данных" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Жесты мышью" @@ -1651,23 +1766,25 @@ msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:127 +#: ../extensions/page-holder.c:172 msgid "Pageholder" msgstr "Контейнер" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:156 msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/statusbar-features.c:40 +#: ../extensions/statusbar-features.c:49 msgid "Images" msgstr "Изображения" -#: ../extensions/statusbar-features.c:47 +#: ../extensions/statusbar-features.c:56 msgid "Scripts" msgstr "Сценарии" +#~ msgid "Source" +#~ msgstr "Исходный код" #~ msgid "_Icon (name or file):" #~ msgstr "_Значок (имя или файл):" #~ msgid "URIs" @@ -1694,8 +1811,6 @@ msgstr "Сценарии" #~ msgstr "Текущий индекс URI" #~ msgid "The URI last opened in the pageholder" #~ msgstr "Последняя открытая ссылка в хранилище" -#~ msgid "Select _All" -#~ msgstr "Пометить всё" #~ msgid "_Fullscreen" #~ msgstr "Полноэкранный режим" #~ msgid "_Leave Fullscreen" @@ -1792,8 +1907,6 @@ msgstr "Сценарии" #~ msgstr "Имя иконки для статичного изобрадения" #~ msgid "Icon '%s' couldn't be loaded" #~ msgstr "Значок '%s' не может быть загружен" -#~ msgid "Name" -#~ msgstr "Имя" #~ msgid "The descriptive text of the item" #~ msgstr "Описание пункта" #~ msgid "Token" From ddf5c70fb1c312fc40e5ffab8d52fd29f7c1e744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Iguar=C3=A1n?= Date: Mon, 30 Mar 2009 23:28:40 +0200 Subject: [PATCH 0936/2970] Update Spanish translation --- po/es.po | 198 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 117 insertions(+), 81 deletions(-) diff --git a/po/es.po b/po/es.po index 38900364..a089e1a6 100644 --- a/po/es.po +++ b/po/es.po @@ -5,14 +5,16 @@ # Antonio Sanchez 2008 # Christian Dywan 2008 # Elega 2009 +# Guillermo Iguarán 2009 # + msgid "" msgstr "" -"Project-Id-Version: midori 0.1.2\n" +"Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-02-01 20:25+0100\n" -"PO-Revision-Date: 2009-01-27 01:52-0300\n" -"Last-Translator: Elega \n" +"PO-Revision-Date: 2009-03-29 16:02-0500\n" +"Last-Translator: Guillermo Iguarán \n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,8 +24,11 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navegador ligero" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056 -#: ../midori/main.c:2065 ../midori/main.c:2076 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1950 +#: ../midori/main.c:2056 +#: ../midori/main.c:2065 +#: ../midori/main.c:2076 #: ../midori/midori-websettings.c:259 msgid "Midori" msgstr "Midori" @@ -36,7 +41,8 @@ msgstr "Navegador" msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/main.c:91 ../midori/midori-browser.c:3830 +#: ../midori/main.c:91 +#: ../midori/midori-browser.c:3830 msgid "_Bookmarks" msgstr "_Marcadores" @@ -94,7 +100,8 @@ msgstr "No se pudo cargar la configuración: %s\n" msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:220 ../midori/main.c:290 +#: ../midori/main.c:220 +#: ../midori/main.c:290 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración inválido «%s»" @@ -103,7 +110,8 @@ msgstr "Valor de configuración inválido «%s»" msgid "File not found." msgstr "Archivo no encontrado." -#: ../midori/main.c:540 ../midori/main.c:549 +#: ../midori/main.c:540 +#: ../midori/main.c:549 msgid "Malformed document." msgstr "Documento defectuoso." @@ -113,9 +121,9 @@ msgid "Failed to open database: %s\n" msgstr "No se ha podido abrir la base de datos: %s\n" #: ../midori/main.c:603 -#, fuzzy, c-format +#, c-format msgid "Failed to execute database statement: %s\n" -msgstr "No se ha podido abrir la base de datos: %s\n" +msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" #: ../midori/main.c:657 #, c-format @@ -127,7 +135,9 @@ msgstr "No se ha podido quitar los elementos del historial: %s\n" msgid "Failed to clear history: %s\n" msgstr "No se ha podido vaciar el historial: %s\n" -#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754 +#: ../midori/main.c:704 +#: ../midori/main.c:738 +#: ../midori/main.c:754 #, c-format msgid "Failed to add history item: %s\n" msgstr "No se ha podido añadir un elemento al historial: %s\n" @@ -148,23 +158,28 @@ msgstr "No se pudo guardar la configuración. %s" msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar los motores de búsqueda. %s" -#: ../midori/main.c:1121 ../midori/sokoke.c:531 +#: ../midori/main.c:1121 +#: ../midori/sokoke.c:531 #, c-format msgid "Writing failed." msgstr "Falló la escritura." -#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197 +#: ../midori/main.c:1142 +#: ../midori/main.c:1169 +#: ../midori/main.c:1197 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 ../midori/main.c:1245 +#: ../midori/main.c:1221 +#: ../midori/main.c:1245 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:1271 ../midori/midori-preferences.c:386 +#: ../midori/main.c:1271 +#: ../midori/midori-preferences.c:386 msgid "Transfers" msgstr "Transferencias" @@ -194,13 +209,8 @@ msgid "Password" msgstr "Contraseña" #: ../midori/main.c:1783 -msgid "" -"Midori seems to have crashed the last time it was opened. If this " -"happened repeatedly, try one of the following options to solve the problem." -msgstr "" -"Parece que Midori se cerró insperadamente la última vez. Si esto sucede " -"repetidamente, pruebe una de las siguientes opciones para resolver el " -"problema." +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." #: ../midori/main.c:1798 msgid "Modify _preferences" @@ -218,7 +228,8 @@ msgstr "Deshabilitar todas las _extensiones" msgid "No filename specified" msgstr "No se especificó el nombre del archivo" -#: ../midori/main.c:1982 ../midori/gjs.c:514 +#: ../midori/main.c:1982 +#: ../midori/gjs.c:514 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." @@ -283,12 +294,14 @@ msgstr "Se produjeron los siguientes errores:" msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164 +#: ../midori/midori-browser.c:258 +#: ../midori/midori-browser.c:3164 #: ../midori/midori-browser.c:3170 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:270 +#: ../midori/midori-browser.c:3167 msgid "Stop loading the current page" msgstr "Detener la carga de la página" @@ -314,11 +327,13 @@ msgstr "Editar marcador" msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836 +#: ../midori/midori-browser.c:559 +#: ../midori/midori-searchaction.c:836 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850 +#: ../midori/midori-browser.c:578 +#: ../midori/midori-searchaction.c:850 msgid "_Address:" msgstr "_Dirección:" @@ -326,7 +341,8 @@ msgstr "_Dirección:" msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:601 +#: ../midori/midori-browser.c:638 msgid "Toplevel folder" msgstr "Carpeta de nivel superior" @@ -338,11 +354,13 @@ msgstr "Guardar archivo como" msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2524 +#: ../panels/midori-bookmarks.c:690 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2526 +#: ../panels/midori-bookmarks.c:692 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" @@ -374,12 +392,12 @@ msgstr "" "Miguel Anxo Bouzada \n" "Antonio Sanchez \n" "Christian Dywan \n" -"Elega " +"Elega \n" +"Guillermo Iguarán " #: ../midori/midori-browser.c:3044 msgid "Are you sure you want to remove all history items?" -msgstr "" -"¿Estás seguro de que quieres quitar todos los elementos del historial?" +msgstr "¿Estás seguro de que quieres quitar todos los elementos del historial?" #: ../midori/midori-browser.c:3098 msgid "_File" @@ -433,7 +451,8 @@ msgstr "_Editar" msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3130 +#: ../midori/midori-browser.c:3133 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" @@ -501,7 +520,8 @@ msgstr "Disminuir el nivel de zoom" msgid "Reset the zoom level" msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:3181 +#: ../midori/midori-view.c:984 msgid "View _Source" msgstr "Ver _código fuente" @@ -545,7 +565,8 @@ msgstr "Vaciar la papelera" msgid "Delete the contents of the trash" msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:3205 +#: ../midori/midori-view.c:956 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" @@ -553,7 +574,8 @@ msgstr "Deshacer el cierre de pestaña" msgid "Open the last closed tab" msgstr "Abrir la última pestaña cerrada" -#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:3210 +#: ../panels/midori-bookmarks.c:209 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" @@ -573,7 +595,8 @@ msgstr "Añadir a marcadores el elemento seleccionado del historial" msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3223 +#: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "_Administrar los motores de búsqueda" @@ -729,7 +752,8 @@ msgstr "_Ventana" msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pesañas abiertas" -#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597 +#: ../midori/midori-browser.c:4001 +#: ../midori/midori-preferences.c:597 msgid "History" msgstr "Historial" @@ -740,11 +764,11 @@ msgstr "_Búsqueda en línea:" #: ../midori/midori-browser.c:4071 msgid "Previous" -msgstr "" +msgstr "Anterior" #: ../midori/midori-browser.c:4076 msgid "Next" -msgstr "" +msgstr "Siguiente" #: ../midori/midori-browser.c:4081 msgid "Match Case" @@ -763,15 +787,18 @@ msgstr "Cerrar la barra de búsqueda" msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:199 +#: ../midori/midori-panel.c:200 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:169 +#: ../midori/midori-view.c:1719 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:461 msgid "Homepage" msgstr "Página de inicio" @@ -799,7 +826,8 @@ msgstr "Unicode (UTF-8)" msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263 +#: ../midori/midori-websettings.c:191 +#: ../midori/midori-websettings.c:263 msgid "Custom..." msgstr "Personalizado..." @@ -843,7 +871,8 @@ msgstr "Todas las galletas" msgid "Session cookies" msgstr "Galletas de la sesión" -#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:244 +#: ../panels/midori-addons.c:96 msgid "None" msgstr "Ninguna" @@ -986,11 +1015,11 @@ msgstr "Página de inicio" #: ../midori/midori-websettings.c:477 msgid "Show crash dialog" -msgstr "" +msgstr "Mostrar diálogo de cuelgue" #: ../midori/midori-websettings.c:478 msgid "Show a dialog after Midori crashed" -msgstr "" +msgstr "Mostrar un dialogo despues de que Midori se cuelgue" #: ../midori/midori-websettings.c:486 msgid "Download Folder" @@ -1070,9 +1099,7 @@ msgstr "Clic del medio abre la selección" #: ../midori/midori-websettings.c:578 msgid "Load an address from the selection via middle click" -msgstr "" -"Cargar una dirección desde la selección a través del botón del medio del " -"ratón" +msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" #: ../midori/midori-websettings.c:586 msgid "Open tabs in the background" @@ -1088,9 +1115,7 @@ msgstr "Abrir pestañas junto a la actual" #: ../midori/midori-websettings.c:596 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o " -"después de la última" +msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" #: ../midori/midori-websettings.c:604 msgid "Open popups in tabs" @@ -1102,11 +1127,11 @@ msgstr "Si se desea abrir las ventanas emergentes en pestañas" #: ../midori/midori-websettings.c:656 msgid "Zoom Text and Images" -msgstr "" +msgstr "Ampliar Textos e Imágenes" #: ../midori/midori-websettings.c:657 msgid "Whether to zoom text and images" -msgstr "" +msgstr "Si se amplia texto e imágenes" #: ../midori/midori-websettings.c:667 msgid "Accept cookies" @@ -1231,7 +1256,7 @@ msgstr "Código fuente" #: ../midori/midori-view.c:1586 #, c-format msgid "Document cannot be displayed" -msgstr "" +msgstr "El documento no puede ser mostrado" #: ../midori/midori-view.c:1602 #, c-format @@ -1294,7 +1319,8 @@ msgstr "Comportamiento" msgid "Features" msgstr "Características" -#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:458 +#: ../extensions/statusbar-features.c:40 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" @@ -1326,7 +1352,8 @@ msgstr "Áreas de texto dimensionables" msgid "Whether text areas are resizable" msgstr "Si se desea que las áreas de texto sean dimensionables" -#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:474 +#: ../extensions/statusbar-features.c:47 msgid "Enable scripts" msgstr "Habilitar scripts" @@ -1334,7 +1361,8 @@ msgstr "Habilitar scripts" msgid "Enable embedded scripting languages" msgstr "Habilitar script de lenguajes embebidos" -#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:478 +#: ../extensions/statusbar-features.c:54 msgid "Enable plugins" msgstr "Habilitar complementos" @@ -1371,7 +1399,8 @@ msgstr "Barra de navegación" msgid "Browsing" msgstr "Navegación" -#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543 +#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:543 msgid "Network" msgstr "Red" @@ -1388,11 +1417,13 @@ msgstr "Privacidad" msgid "Web Cookies" msgstr "Galletas de informacion" -#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:604 msgid "days" msgstr "días" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 +#: ../katze/katze-arrayaction.c:279 msgid "Empty" msgstr "Vacío" @@ -1420,7 +1451,8 @@ msgstr "_Abreviatura:" msgid "Manage Search Engines" msgstr "Administrar los motores de búsqueda" -#: ../midori/sokoke.c:101 ../midori/sokoke.c:113 +#: ../midori/sokoke.c:101 +#: ../midori/sokoke.c:113 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." @@ -1429,7 +1461,8 @@ msgstr "No se pudo ejecutar la aplicación externa." msgid "Warning: You are using a superuser account!" msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:742 +#: ../midori/gjs.c:832 #, c-format msgid "%s has no property '%s'" msgstr "%s no tiene la propiedad «%s»" @@ -1444,19 +1477,23 @@ msgstr "%s no puede ser asignado a %s.%s" msgid "%s.%s cannot be accessed" msgstr "%s.%s no se puede acceder" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:97 +#: ../panels/midori-addons.c:143 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:98 +#: ../panels/midori-addons.c:145 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:1005 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activar" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:1014 +#: ../panels/midori-extensions.c:153 msgid "_Disable" msgstr "_Desactivar" @@ -1484,7 +1521,8 @@ msgstr "Consola" msgid "Extensions" msgstr "Extensiones" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52 +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "Complementos" @@ -1502,12 +1540,14 @@ msgstr "No se pudo cargar el ícono stock «%s»" msgid "Animation frames are broken" msgstr "Los cuadros de animación estan rotos" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "Elegir archivo" @@ -1517,14 +1557,15 @@ msgstr "Elegir carpeta" #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" -msgstr "" +msgstr "Gestos del Ratón" #: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" -msgstr "" +msgstr "Controlar Midori moviendo el ratón" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 msgid "Pageholder" msgstr "Anclar página" @@ -1542,21 +1583,16 @@ msgstr "Scripts" #~ msgid "Manage search engines" #~ msgstr "Administrar los motores de búsqueda" - #~ msgid "URIs" #~ msgstr "URIs" - #~ msgid "[URIs]" #~ msgstr "[URIs]" - #~ msgid "_URL:" #~ msgstr "_URL " - #~ msgid "Root" #~ msgstr "Raíz" - #~ msgid "HTTP Proxy" #~ msgstr "HTTP Proxy" - #~ msgid "Open URL in New _Tab" #~ msgstr "Abrir URL en una pestaña _nueva" + From 31bf9962fa09dd3f3aafee56e55d7313e678225d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 01:10:35 +0200 Subject: [PATCH 0937/2970] Support proxy server address without a protocol --- midori/main.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/midori/main.c b/midori/main.c index 626298e2..e836446b 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1286,8 +1286,17 @@ soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings, http_proxy = g_strdup (g_getenv ("http_proxy")); else http_proxy = katze_object_get_string (settings, "http-proxy"); - /* soup_uri_new expects a non-NULL string */ - proxy_uri = soup_uri_new (http_proxy ? http_proxy : ""); + /* soup_uri_new expects a non-NULL string with a protocol */ + if (http_proxy && g_str_has_prefix (http_proxy, "http://")) + proxy_uri = soup_uri_new (http_proxy); + else if (http_proxy && *http_proxy) + { + gchar* fixed_http_proxy = g_strconcat ("http://", http_proxy, NULL); + proxy_uri = soup_uri_new (fixed_http_proxy); + g_free (fixed_http_proxy); + } + else + proxy_uri = NULL; g_free (http_proxy); g_object_set (session, "proxy-uri", proxy_uri, NULL); if (proxy_uri) From 7cddd8ade3450e418f5e18e4289c23b3eb7320c4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 03:24:29 +0200 Subject: [PATCH 0938/2970] Optimize array iterations in main.c --- midori/main.c | 62 +++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/midori/main.c b/midori/main.c index e836446b..fd6b96cd 100644 --- a/midori/main.c +++ b/midori/main.c @@ -287,7 +287,7 @@ search_engines_save_to_file (KatzeArray* search_engines, GError** error) { GKeyFile* key_file; - guint n, i, j, n_properties; + guint i, j, n_properties; KatzeItem* item; const gchar* name; GParamSpec** pspecs; @@ -296,12 +296,11 @@ search_engines_save_to_file (KatzeArray* search_engines, gboolean saved; key_file = g_key_file_new (); - n = katze_array_get_length (search_engines); pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), &n_properties); - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (search_engines, i++))) { - item = katze_array_get_nth_item (search_engines, i); name = katze_item_get_name (item); for (j = 0; j < n_properties; j++) { @@ -800,7 +799,7 @@ midori_history_initialize (KatzeArray* array, { sqlite3* db; KatzeItem* item; - gint i, n; + gint i; gboolean has_day; has_day = FALSE; @@ -846,10 +845,9 @@ midori_history_initialize (KatzeArray* array, error)) return NULL; - n = katze_array_get_length (array); - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) { - item = katze_array_get_nth_item (array, i); g_signal_connect_after (item, "add-item", G_CALLBACK (midori_history_add_item_cb), db); g_signal_connect (item, "remove-item", @@ -966,11 +964,10 @@ katze_item_to_data (KatzeItem* item) if (KATZE_IS_ARRAY (item)) { GString* _markup = g_string_new (NULL); - guint n = katze_array_get_length (KATZE_ARRAY (item)); - guint i; - for (i = 0; i < n; i++) + guint i = 0; + KatzeItem* _item; + while ((_item = katze_array_get_nth_item (KATZE_ARRAY (item), i++))) { - KatzeItem* _item = katze_array_get_nth_item (KATZE_ARRAY (item), i); gchar* item_markup = katze_item_to_data (_item); g_string_append (_markup, item_markup); g_free (item_markup); @@ -1011,7 +1008,7 @@ katze_array_to_xml (KatzeArray* array, GError** error) { GString* inner_markup; - guint i, n; + guint i; KatzeItem* item; gchar* item_xml; gchar* title; @@ -1021,10 +1018,9 @@ katze_array_to_xml (KatzeArray* array, g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL); inner_markup = g_string_new (NULL); - n = katze_array_get_length (array); - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) { - item = katze_array_get_nth_item (array, i); item_xml = katze_item_to_data (item); g_string_append (inner_markup, item_xml); g_free (item_xml); @@ -1155,7 +1151,6 @@ midori_trash_add_item_cb (KatzeArray* trash, { gchar* config_file; GError* error; - guint n; GObject* obsolete_item; config_file = build_config_filename ("tabtrash.xbel"); @@ -1168,8 +1163,7 @@ midori_trash_add_item_cb (KatzeArray* trash, } g_free (config_file); - n = katze_array_get_length (trash); - if (n > 10) + if (katze_array_get_nth_item (trash, 10)) { obsolete_item = katze_array_get_nth_item (trash, 0); katze_array_remove_item (trash, obsolete_item); @@ -1471,7 +1465,7 @@ midori_load_extensions (gpointer data) KatzeArray* extensions; const gchar* filename; MidoriExtension* extension; - guint n, i; + guint i; /* Load extensions */ extensions = katze_array_new (MIDORI_TYPE_EXTENSION); @@ -1527,12 +1521,9 @@ midori_load_extensions (gpointer data) g_object_set (app, "extensions", extensions, NULL); - n = katze_array_get_length (extensions); - for (i = 0; i < n; i++) - { - extension = katze_array_get_nth_item (extensions, i); + i = 0; + while ((extension = katze_array_get_nth_item (extensions, i++))) g_signal_emit_by_name (extension, "activate", app); - } return FALSE; } @@ -1546,7 +1537,7 @@ midori_load_session (gpointer data) gchar* config_file; KatzeArray* session; KatzeItem* item; - guint n, i; + guint i; browser = midori_app_create_browser (app); midori_app_add_browser (app, browser); @@ -1577,12 +1568,9 @@ midori_load_session (gpointer data) } session = midori_browser_get_proxy_array (browser); - n = katze_array_get_length (_session); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (_session, i); + i = 0; + while ((item = katze_array_get_nth_item (_session, i++))) midori_browser_add_item (browser, item); - } /* FIXME: Switch to the last active page */ item = katze_array_get_nth_item (_session, 0); if (!strcmp (katze_item_get_uri (item), "")) @@ -1931,13 +1919,10 @@ main (int argc, G_CALLBACK (midori_search_engines_modify_cb), search_engines); if (!katze_array_is_empty (search_engines)) { - guint n = katze_array_get_length (search_engines); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (search_engines, i); + i = 0; + while ((item = katze_array_get_nth_item (search_engines, i++))) g_signal_connect_after (item, "notify", G_CALLBACK (midori_search_engines_modify_cb), search_engines); - } } } katze_assign (config_file, build_config_filename ("bookmarks.xbel")); @@ -1949,10 +1934,9 @@ main (int argc, G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); if (!katze_array_is_empty (bookmarks)) { - guint n = katze_array_get_length (bookmarks); - for (i = 0; i < n; i++) + i = 0; + while ((item = katze_array_get_nth_item (bookmarks, i++))) { - item = katze_array_get_nth_item (bookmarks, i); if (KATZE_IS_ARRAY (item)) { g_signal_connect_after (item, "add-item", From fb37688db3b098e904ff059c515300e20609ad27 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 03:25:48 +0200 Subject: [PATCH 0939/2970] Optimize list iterations in KatzeArray --- katze/katze-array.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/katze/katze-array.c b/katze/katze-array.c index ae451ab7..b9ff9647 100644 --- a/katze/katze-array.c +++ b/katze/katze-array.c @@ -207,14 +207,15 @@ static void katze_array_finalize (GObject* object) { KatzeArray* array; - guint n, i; + guint i; array = KATZE_ARRAY (object); if (katze_array_is_a (array, G_TYPE_OBJECT)) { - n = g_list_length (array->items); - for (i = 0; i < n; i++) - g_object_unref (g_list_nth_data (array->items, i)); + gpointer item; + i = 0; + while ((item = g_list_nth_data (array->items, i++))) + g_object_unref (item); } g_list_free (array->items); @@ -371,22 +372,16 @@ gpointer katze_array_find_token (KatzeArray* array, const gchar* token) { - guint n, i; + guint i; gpointer item; - const gchar* found_token; - - g_return_val_if_fail (KATZE_IS_ARRAY (array), NULL); if (!katze_array_is_a (array, G_TYPE_OBJECT)) return NULL; - n = g_list_length (array->items); - for (i = 0; i < n; i++) + i = 0; + while ((item = g_list_nth_data (array->items, i++))) { - item = g_list_nth_data (array->items, i); - if (!g_type_is_a (G_OBJECT_TYPE (item), KATZE_TYPE_ITEM)) - continue; - found_token = katze_item_get_token ((KatzeItem*)item); + const gchar* found_token = katze_item_get_token ((KatzeItem*)item); if (!g_strcmp0 (found_token, token)) return item; } From 5be54230af43941b98ef2c367c4414c02faf0b83 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 03:26:51 +0200 Subject: [PATCH 0940/2970] Add performance test for magic uri --- tests/magic-uri.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 1a67dce7..f03a0a8c 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -139,6 +139,24 @@ magic_uri_pseudo (void) test_input ("mailto:christian@twotoasts.de", "mailto:christian@twotoasts.de"); } +static void +magic_uri_performance (void) +{ + gsize i; + + g_test_timer_start (); + + for (i = 0; i < 1000; i++) + { + magic_uri_uri (); + magic_uri_idn (); + magic_uri_search (); + magic_uri_pseudo (); + } + + g_print ("\nTime needed for URI tests: %f ", g_test_timer_elapsed ()); +} + int main (int argc, char** argv) @@ -150,6 +168,7 @@ main (int argc, g_test_add_func ("/magic-uri/idn", magic_uri_idn); g_test_add_func ("/magic-uri/search", magic_uri_search); g_test_add_func ("/magic-uri/pseudo", magic_uri_pseudo); + g_test_add_func ("/magic-uri/performance", magic_uri_performance); return g_test_run (); } From 3ecfecb555bff291deeb4663c3bf214fff305d84 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 03:28:01 +0200 Subject: [PATCH 0941/2970] Optimize sokoke_magic_uri for better performance --- midori/sokoke.c | 75 +++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index fc1e716d..dcdfd789 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -189,7 +189,7 @@ sokoke_idn_to_punycode (gchar* uri) if (proto) { - result = g_strdup_printf ("%s://%s%s", proto, s, path ? path : ""); + result = g_strconcat (proto, "://", s, path ? path : "", NULL); g_free (proto); if (path) g_free (hostname); @@ -235,52 +235,47 @@ sokoke_magic_uri (const gchar* uri, g_free (current_dir); return result; } - /* Do we need to add a protocol? */ - if (!strstr (uri, "://")) + /* Do we have a protocol? */ + if (g_strstr_len (uri, 8, "://")) + return sokoke_idn_to_punycode (g_strdup (uri)); + + /* Do we have a domain, ip address or localhost? */ + if ((search = strchr (uri, ':')) && search[0] && + !g_ascii_isalpha (search[1]) && search[1] != ' ') + if (!strchr (search, '.')) + return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); + if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) + return g_strconcat ("http://", uri, NULL); + parts = g_strsplit (uri, ".", 0); + if (!search && parts[0] && parts[1]) { - /* Do we have a domain, ip address or localhost? */ - search = strchr (uri, ':'); - if (search && search[0] && - !g_ascii_isalpha (search[1]) && search[1] != ' ') - if (!strchr (search, '.')) - return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); - if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) - return g_strconcat ("http://", uri, NULL); - parts = g_strsplit (uri, ".", 0); - if (!search && parts[0] && parts[1]) - { - search = NULL; - if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0]))) - if (!strchr (parts[0], ' ') && !strchr (parts[1], ' ')) - search = g_strconcat ("http://", uri, NULL); - g_free (parts); - if (search) - return sokoke_idn_to_punycode (search); - } - /* We don't want to search? So return early. */ - if (!search_engines) - return g_strdup (uri); - search = NULL; - search_uri = NULL; - /* Do we have a keyword and a string? */ - parts = g_strsplit (uri, " ", 2); - if (parts[0] && parts[1]) - { - item = katze_array_find_token (search_engines, parts[0]); - if (item) - search_uri = katze_item_get_uri (item); - } - g_free (parts); - if (search_uri) + if (!(parts[1][1] == '\0' && !g_ascii_isalpha (parts[1][0]))) + if (!strchr (parts[0], ' ') && !strchr (parts[1], ' ')) + if ((search = g_strconcat ("http://", uri, NULL))) + { + g_strfreev (parts); + return sokoke_idn_to_punycode (search); + } + } + g_strfreev (parts); + /* We don't want to search? So return early. */ + if (!search_engines) + return g_strdup (uri); + search = NULL; + search_uri = NULL; + /* Do we have a keyword and a string? */ + parts = g_strsplit (uri, " ", 2); + if (parts[0] && parts[1]) + if ((item = katze_array_find_token (search_engines, parts[0]))) { + search_uri = katze_item_get_uri (item); if (strstr (search_uri, "%s")) search = g_strdup_printf (search_uri, parts[1]); else search = g_strdup_printf ("%s%s", search_uri, parts[1]); } - return search; - } - return sokoke_idn_to_punycode (g_strdup (uri)); + g_strfreev (parts); + return search; } void From e9c9886265eb50ad479155551f951eeaf7b62622 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 18:04:17 +0200 Subject: [PATCH 0942/2970] Remove GJS, it's not used anymore --- midori/gjs.c | 1045 ------------------------------------------------ midori/gjs.h | 128 ------ po/POTFILES.in | 1 - 3 files changed, 1174 deletions(-) delete mode 100644 midori/gjs.c delete mode 100644 midori/gjs.h diff --git a/midori/gjs.c b/midori/gjs.c deleted file mode 100644 index 91490022..00000000 --- a/midori/gjs.c +++ /dev/null @@ -1,1045 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include "gjs.h" - -#include -#include -/* Needed for versioning macros */ -#include -#include "compat.h" - -struct _GjsValue -{ - GObject parent_instance; - - JSContextRef js_context; - JSValueRef js_value; - gchar* string; -}; - -G_DEFINE_TYPE (GjsValue, gjs_value, G_TYPE_OBJECT) - -static void -gjs_value_finalize (GObject* object) -{ - GjsValue* value = GJS_VALUE (object); - - g_free (value->string); - - G_OBJECT_CLASS (gjs_value_parent_class)->finalize (object); -} - -static void -gjs_value_class_init (GjsValueClass* class) -{ - GObjectClass* gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = gjs_value_finalize; -} - -static void -gjs_value_init (GjsValue* value) -{ - value->js_context = NULL; - value->js_value = NULL; - value->string = NULL; -} - -/** - * gjs_value_new: - * @js_context: a #JSContextRef - * @js_value: a #JSValueRef or %NULL - * - * Creates a new #GjsValue for a #JsValueRef. If @js_value - * is %NULL, the new value represents the global object. - * - * Return value: a new #GjsValue - **/ -GjsValue* -gjs_value_new (JSContextRef js_context, - JSValueRef js_value) -{ - GjsValue* value; - - g_return_val_if_fail (js_context, NULL); - - value = g_object_new (GJS_TYPE_VALUE, NULL); - value->js_context = js_context; - value->js_value = js_value ? js_value : JSContextGetGlobalObject (js_context); - return value; -} - -/** - * gjs_value_is_valid: - * @value: a #GjsValue - * - * Determines whether the value is valid, with regard to - * its internal state. This is primarily useful for API - * to ensure that the value is in a defined condition. - * - * Return value: %TRUE if value is valid - **/ -gboolean -gjs_value_is_valid (GjsValue* value) -{ - g_return_val_if_fail (GJS_IS_VALUE (value), FALSE); - g_return_val_if_fail (value->js_context, FALSE); - g_return_val_if_fail (value->js_value, FALSE); - - return TRUE; -} - -/** - * gjs_value_is_object: - * @value: a #GjsValue - * - * Determines whether the value is an object. - * - * Return value: %TRUE if value is an object - **/ -gboolean -gjs_value_is_object (GjsValue* value) -{ - g_return_val_if_fail (gjs_value_is_valid (value), FALSE); - - return JSValueIsObject (value->js_context, value->js_value) == true; -} - -/** - * gjs_value_has_attribute: - * @value: a #GjsValue - * @name: the name of a attribute - * - * Determines whether the value has the specified attribute. - * - * This can only be used on object values. - * - * Return value: %TRUE if the specified attribute exists - **/ -gboolean -gjs_value_has_attribute (GjsValue* value, - const gchar* name) -{ - JSObjectRef js_object; - JSStringRef js_name; - gboolean result; - - g_return_val_if_fail (gjs_value_is_object (value), FALSE); - g_return_val_if_fail (name, FALSE); - - js_object = JSValueToObject (value->js_context, value->js_value, NULL); - js_name = JSStringCreateWithUTF8CString (name); - result = JSObjectHasProperty (value->js_context, js_object, js_name) == true; - JSStringRelease (js_name); - return result; -} - -/** - * gjs_value_get_attribute: - * @value: a #GjsValue - * @name: the name of a attribute - * - * Retrieves the specified attribute. - * - * This can only be used on object values. - * - * Return value: a new #GjsValue - **/ -GjsValue* -gjs_value_get_attribute (GjsValue* value, - const gchar* name) -{ - JSObjectRef js_object; - JSStringRef js_name; - JSValueRef js_value; - - g_return_val_if_fail (gjs_value_has_attribute (value, name), NULL); - - js_object = JSValueToObject (value->js_context, value->js_value, NULL); - js_name = JSStringCreateWithUTF8CString (name); - js_value = JSObjectGetProperty (value->js_context, js_object, js_name, NULL); - JSStringRelease (js_name); - - return gjs_value_new (value->js_context, js_value); -} - -/** - * gjs_value_get_string: - * @value: a #GjsValue - * - * Retrieves the value in the form of a string. - * - * This can only be used on object values. - * - * Note: The string won't reflect changes to the value. - * - * Return value: the value as a string - **/ -const gchar* -gjs_value_get_string (GjsValue* value) -{ - JSStringRef js_string; - - g_return_val_if_fail (gjs_value_is_valid (value), NULL); - - if (value->string) - return value->string; - - js_string = JSValueToStringCopy (value->js_context, value->js_value, NULL); - value->string = gjs_string_utf8 (js_string); - JSStringRelease (js_string); - return value->string; -} - -static void -gjs_value_weak_notify_cb (GjsValue* attribute, - GjsValue* value) -{ - g_object_unref (attribute); -} - -/** - * gjs_value_get_attribute_string: - * @value: a #GjsValue - * @name: the name of a attribute - * - * Retrieves the attribute of the value in the form of a string. - * - * This can only be used on object values. - * - * Note: The string won't reflect changes to the value. - * - * Return value: the value as a string - **/ -const gchar* -gjs_value_get_attribute_string (GjsValue* value, - const gchar* name) -{ - GjsValue* attribute; - - g_return_val_if_fail (gjs_value_has_attribute (value, name), NULL); - - attribute = gjs_value_get_attribute (value, name); - g_object_weak_ref (G_OBJECT (value), - (GWeakNotify)gjs_value_weak_notify_cb, attribute); - return gjs_value_get_string (attribute); -} - -/** - * gjs_value_get_nth_attribute: - * @value: a #GjsValue - * @n: an index - * - * Retrieves the indiced attribute at the specified - * position. This is particularly faster than looking - * up attributes by name. - * - * This can only be used on object values. - * - * Return value: a new #GjsValue, or %NULL - **/ -GjsValue* -gjs_value_get_nth_attribute (GjsValue* value, - guint n) -{ - JSObjectRef js_object; - JSValueRef js_value; - - g_return_val_if_fail (gjs_value_is_object (value), NULL); - - js_object = JSValueToObject (value->js_context, value->js_value, NULL); - js_value = JSObjectGetPropertyAtIndex (value->js_context, js_object, n, NULL); - if (JSValueIsUndefined (value->js_context, js_value)) - return NULL; - - return gjs_value_new (value->js_context, js_value); -} - -/** - * gjs_value_foreach: - * @value: a #GjsValue - * @callback: a callback - * @user_data: user data - * - * Calls the specified callback for each indiced attribute. - * This is a particularly fast way of looping through the - * elements of an array. - * - * This can only be used on object values. - **/ -void -gjs_value_foreach (GjsValue* value, - GjsCallback callback, - gpointer user_data) -{ - guint i; - GjsValue* attribute; - - g_return_if_fail (gjs_value_is_object (value)); - - i = 0; - do - { - attribute = gjs_value_get_nth_attribute (value, i); - if (attribute) - { - callback (attribute, user_data); - g_object_unref (attribute); - } - i++; - } - while (attribute); -} - -/** - * gjs_value_forall: - * @value: a #GjsValue - * @callback: a callback - * @user_data: user data - * - * Calls the specified callback for each attribute. - * - * This can only be used on object values. - **/ -void -gjs_value_forall (GjsValue* value, - GjsCallback callback, - gpointer user_data) -{ - JSObjectRef js_object; - JSPropertyNameArrayRef js_properties; - size_t n_properties; - guint i; - JSStringRef js_property; - gchar* property; - GjsValue* attribute; - - g_return_if_fail (gjs_value_is_object (value)); - - js_object = JSValueToObject (value->js_context, value->js_value, NULL); - js_properties = JSObjectCopyPropertyNames (value->js_context, js_object); - n_properties = JSPropertyNameArrayGetCount (js_properties); - for (i = 0; i < n_properties; i++) - { - js_property = JSPropertyNameArrayGetNameAtIndex (js_properties, i); - property = gjs_string_utf8 (js_property); - if (gjs_value_has_attribute (value, property)) - { - attribute = gjs_value_get_attribute (value, property); - callback (attribute, user_data); - g_object_unref (attribute); - } - g_free (property); - JSStringRelease (js_property); - } - JSPropertyNameArrayRelease (js_properties); -} - -/** - * gjs_value_get_by_name: - * @value: a #GjsValue - * @name: the name of an object - * - * Retrieves a value for the specified name, - * for example "document" or "document.body". - * - * Return value: the value, or %NULL - **/ -GjsValue* -gjs_value_get_by_name (GjsValue* value, - const gchar* name) -{ - gchar* script; - GjsValue* elements; - - g_return_val_if_fail (gjs_value_is_valid (value), NULL); - g_return_val_if_fail (name, NULL); - - script = g_strdup_printf ("return %s;", name); - elements = gjs_value_execute (value, script, NULL); - g_free (script); - return elements; -} - -/** - * gjs_value_get_elements_by_tag_name: - * @value: a #GjsValue - * @name: the tag name - * - * Retrieves all children with the specified tag name. - * - * This can only be used on object values. - * - * Return value: all matching elements - **/ -GjsValue* -gjs_value_get_elements_by_tag_name (GjsValue* value, - const gchar* name) -{ - gchar* script; - GjsValue* elements; - - g_return_val_if_fail (gjs_value_is_object (value), NULL); - g_return_val_if_fail (name, NULL); - - script = g_strdup_printf ("return this.getElementsByTagName ('%s');", name); - elements = gjs_value_execute (value, script, NULL); - g_free (script); - return elements; -} - -/** - * gjs_value_execute: - * @value: a #GjsValue - * @script: javascript code - * - * Executes a piece of javascript code. If @value is an object - * it can be referred to as 'this' in the code. - * - * A 'return' statement in the code will yield the result to - * the return value of this function. - * - * Return value: the return value, or %NULL - **/ -GjsValue* -gjs_value_execute (GjsValue* value, - const gchar* script, - gchar** exception) -{ - JSStringRef js_script; - JSObjectRef js_function; - JSObjectRef js_object; - JSValueRef js_exception; - JSValueRef js_value; - JSStringRef js_message; - - g_return_val_if_fail (gjs_value_is_valid (value), FALSE); - g_return_val_if_fail (script, FALSE); - - js_script = JSStringCreateWithUTF8CString (script); - js_function = JSObjectMakeFunction (value->js_context, NULL, 0, NULL, - js_script, NULL, 1, NULL); - JSStringRelease (js_script); - js_object = JSValueToObject (value->js_context, value->js_value, NULL); - js_exception = NULL; - js_value = JSObjectCallAsFunction (value->js_context, js_function, - js_object, 0, NULL, &js_exception); - if (!js_value && exception) - { - js_message = JSValueToStringCopy (value->js_context, js_exception, NULL); - *exception = gjs_string_utf8 (js_message); - JSStringRelease (js_message); - return NULL; - } - return gjs_value_new (value->js_context, js_value); -} - -JSValueRef -gjs_script_eval (JSContextRef js_context, - const gchar* script, - gchar** exception) -{ - g_return_val_if_fail (js_context, FALSE); - g_return_val_if_fail (script, FALSE); - - JSStringRef js_script = JSStringCreateWithUTF8CString (script); - JSValueRef js_exception = NULL; - JSValueRef js_value = JSEvaluateScript (js_context, js_script, - JSContextGetGlobalObject (js_context), NULL, 0, &js_exception); - if (!js_value && exception) - { - JSStringRef js_message = JSValueToStringCopy (js_context, - js_exception, NULL); - *exception = gjs_string_utf8 (js_message); - JSStringRelease (js_message); - js_value = JSValueMakeNull (js_context); - } - JSStringRelease (js_script); - return js_value; -} - -gboolean -gjs_script_check_syntax (JSContextRef js_context, - const gchar* script, - gchar** exception) -{ - g_return_val_if_fail (js_context, FALSE); - g_return_val_if_fail (script, FALSE); - - JSStringRef js_script = JSStringCreateWithUTF8CString (script); - JSValueRef js_exception = NULL; - bool result = JSCheckScriptSyntax (js_context, js_script, NULL, - 0, &js_exception); - if (!result && exception) - { - JSStringRef js_message = JSValueToStringCopy (js_context, - js_exception, NULL); - *exception = gjs_string_utf8 (js_message); - JSStringRelease (js_message); - } - JSStringRelease (js_script); - return result ? TRUE : FALSE; -} - -gboolean -gjs_script_from_file (JSContextRef js_context, - const gchar* filename, - gchar** exception) -{ - g_return_val_if_fail (js_context, FALSE); - g_return_val_if_fail (filename, FALSE); - - gboolean result = FALSE; - gchar* script; - GError* error = NULL; - if (g_file_get_contents (filename, &script, NULL, &error)) - { - if (gjs_script_eval (js_context, script, exception)) - result = TRUE; - g_free (script); - } - else if (error) - { - *exception = g_strdup (error->message); - g_error_free (error); - } - else - *exception = g_strdup (_("An unknown error occured.")); - return result; -} - -gchar* -gjs_string_utf8 (JSStringRef js_string) -{ - size_t size_utf8; - gchar* string_utf8; - - g_return_val_if_fail (js_string, NULL); - - size_utf8 = JSStringGetMaximumUTF8CStringSize (js_string); - string_utf8 = g_new (gchar, size_utf8); - JSStringGetUTF8CString (js_string, string_utf8, size_utf8); - return string_utf8; -} - -#define G_OBJECT_NAME(object) G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)) - -static void -_js_class_get_property_names_cb (JSContextRef js_context, - JSObjectRef js_object, - JSPropertyNameAccumulatorRef js_properties) -{ - GObject* object = JSObjectGetPrivate (js_object); - if (object) - { - guint n; - GParamSpec** pspecs = g_object_class_list_properties ( - G_OBJECT_GET_CLASS (object), &n); - guint i; - for (i = 0; i < n; i++) - { - const gchar* property = g_param_spec_get_name (pspecs[i]); - JSStringRef js_property = JSStringCreateWithUTF8CString (property); - JSPropertyNameAccumulatorAddName (js_properties, js_property); - JSStringRelease (js_property); - } - GType type = G_OBJECT_TYPE (object); - do - { - guint* signals = g_signal_list_ids (type, &n); - for (i = 0; i < n; i++) - { - const gchar* signal_ = g_signal_name (signals[i]); - JSStringRef js_signal = JSStringCreateWithUTF8CString (signal_); - JSPropertyNameAccumulatorAddName (js_properties, js_signal); - JSStringRelease (js_signal); - } - type = g_type_parent (type); - } - while (type); - } -} - -static bool -_js_class_has_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property) -{ - bool result = false; - gchar* property = gjs_string_utf8 (js_property); - GObject* object = JSObjectGetPrivate (js_object); - if (object) - { - if (g_signal_lookup (property, G_OBJECT_TYPE (object)) || - g_object_class_find_property (G_OBJECT_GET_CLASS (object), property)) - result = true; - } - else if (js_object == JSContextGetGlobalObject (js_context)) - { - GType type = g_type_from_name (property); - result = type ? type : false; - } - g_free (property); - return result; -} - -static void -_js_object_set_property (JSContextRef js_context, - JSObjectRef js_object, - const gchar* name, - JSValueRef js_value) -{ - JSStringRef js_name = JSStringCreateWithUTF8CString (name); - JSObjectSetProperty (js_context, js_object, js_name, js_value, - kJSPropertyAttributeNone, NULL); - JSStringRelease (js_name); -} - -static JSValueRef -_js_object_call_as_function_cb (JSContextRef js_context, - JSObjectRef js_function, - JSObjectRef js_this, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_this); - const gchar* function = JSObjectGetPrivate (js_function); - - g_return_val_if_fail (G_IS_OBJECT (object), JSValueMakeNull (js_context)); - g_return_val_if_fail (function, JSValueMakeNull (js_context)); - - guint signal_id = g_signal_lookup (function, G_OBJECT_TYPE (object)); - GSignalQuery query; - g_signal_query (signal_id, &query); - GValue* values = g_new0 (GValue, n_arguments + 1); - g_value_init (&values[0], G_OBJECT_TYPE (object)); - g_value_set_instance (&values[0], object); - guint i; - for (i = 0; i < n_arguments; i++) - { - GValue value = {0, }; - GType gtype; - switch (JSValueGetType (js_context, js_arguments[i])) - { - case kJSTypeBoolean: - gtype = G_TYPE_BOOLEAN; - g_value_init (&value, gtype); - g_value_set_boolean (&value, - JSValueToBoolean (js_context, js_arguments[i]) ? TRUE : FALSE); - break; - case kJSTypeNumber: - gtype = G_TYPE_DOUBLE; - g_value_init (&value, gtype); - g_value_set_double (&value, - JSValueToNumber (js_context, js_arguments[i], NULL)); - break; - case kJSTypeString: - gtype = G_TYPE_STRING; - g_value_init (&value, gtype); - JSStringRef js_string = JSValueToStringCopy (js_context, - js_arguments[i], NULL); - gchar* string = gjs_string_utf8 (js_string); - g_value_set_string (&value, string); - g_free (string); - JSStringRelease (js_string); - break; - case kJSTypeObject: - gtype = G_TYPE_OBJECT; - g_value_init (&value, gtype); - JSObjectRef js_object = JSValueToObject (js_context, - js_arguments[i], NULL); - GObject* object_value = JSObjectGetPrivate (js_object); - g_value_set_object (&value, object_value); - break; - case kJSTypeUndefined: - case kJSTypeNull: - default: - gtype = G_TYPE_NONE; - g_value_init (&value, gtype); - } - g_value_init (&values[i + 1], gtype); - if (query.n_params >= i - && g_value_type_compatible (gtype, query.param_types[i])) - /* && g_value_type_transformable (gtype, query.param_types[i]) */ - g_value_copy (&value, &values[i + 1]); - /* g_value_transform (&value, &values[i + 1]); */ - else - { - gchar* value_type = g_strdup_value_contents (&value); - /* FIXME: exception */ - g_print ("wrong value, expected %s\n", value_type); - g_free (value_type); - } - g_value_unset (&value); - } - GValue return_value = {0, }; - if (query.return_type != G_TYPE_NONE) - g_value_init (&return_value, query.return_type); - g_signal_emitv (values, signal_id, 0, &return_value); - - for (i = 0; i < n_arguments; i++) - g_value_unset (&values[i]); - /* FIXME: return value */ - return JSValueMakeUndefined (js_context); -} - -/*static void -_js_object_add_function (JSContextRef js_context, - JSObjectRef js_object, - const gchar* func) -{ - JSStringRef js_func = JSStringCreateWithUTF8CString (func); - JSObjectRef js_function = JSObjectMakeFunctionWithCallback ( - js_context, js_func, _js_object_call_as_function_cb); - JSStringRelease (js_func); - _js_object_set_property (js_context, js_object, func, js_function); -}*/ - -static JSValueRef -_js_class_get_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_object); - - g_return_val_if_fail (G_IS_OBJECT (object), JSValueMakeNull (js_context)); - - JSValueRef js_result = NULL; - gchar* property = gjs_string_utf8 (js_property); - guint signal_id; - GParamSpec* pspec; - if ((signal_id = g_signal_lookup (property, G_OBJECT_TYPE (object)))) - { - GSignalQuery query; - g_signal_query (signal_id, &query); - if (query.signal_flags & G_SIGNAL_ACTION) - { - /* We can't use JSObjectMakeFunctionWithCallback - because it doesn't allocate private data */ - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (property); - js_class_def.callAsFunction = _js_object_call_as_function_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_function = JSObjectMake (js_context, - js_class, property); - return js_function; - } - g_free (property); - return JSValueMakeNull (js_context); - } - else if (!(pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property))) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - g_free (property); - return JSValueMakeNull (js_context); - } - if (!(pspec->flags & G_PARAM_READABLE)) - { - g_free (property); - return JSValueMakeUndefined (js_context); - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - gchar* value; - g_object_get (object, property, &value, NULL); - if (value) - { - JSStringRef js_string = JSStringCreateWithUTF8CString (value); - js_result = JSValueMakeString (js_context, js_string); - } - } - else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT) - { - gint value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeNumber (js_context, value); - } - else if (type == G_TYPE_PARAM_BOOLEAN) - { - gboolean value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeBoolean (js_context, value ? true : false); - } - else if (type == G_TYPE_PARAM_OBJECT) - { - GObject* value; - g_object_get (object, property, &value, NULL); - if (value) - js_result = gjs_object_new (js_context, - G_OBJECT_NAME (value), value); - } - else if (type == G_TYPE_PARAM_ENUM) - { - gint value; - g_object_get (object, property, &value, NULL); - js_result = JSValueMakeNumber (js_context, value); - } - else - js_result = JSValueMakeUndefined (js_context); - g_free (property); - return js_result ? js_result : JSValueMakeNull (js_context); -} - -static void -_js_class_signal_callback (GObject* object, ...) -{ - /* FIXME: Support arbitrary signatures */ - - /* FIXME: Support arbitrary return values */ -} - -static bool -_js_class_set_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef js_value, - JSValueRef* js_exception) -{ - GObject* object = JSObjectGetPrivate (js_object); - - g_return_val_if_fail (G_IS_OBJECT (object), false); - - bool result = false; - gchar* property = gjs_string_utf8 (js_property); - guint signal_id; - GParamSpec* pspec; - if ((signal_id = g_signal_lookup (property, G_OBJECT_TYPE (object)))) - { - g_signal_connect (object, property, - G_CALLBACK (_js_class_signal_callback), (gpointer)js_value); - g_free (property); - return true; - } - else if (!(pspec = g_object_class_find_property ( - G_OBJECT_GET_CLASS (object), property))) - { - gchar* message = g_strdup_printf (_("%s has no property '%s'"), - G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - g_free (property); - return false; - } - if (!(pspec->flags & G_PARAM_WRITABLE)) - { - g_free (property); - return false; - } - GType type = G_PARAM_SPEC_TYPE (pspec); - if (type == G_TYPE_PARAM_STRING) - { - JSStringRef js_string_value = JSValueToStringCopy (js_context, - js_value, js_exception); - if (js_string_value) - { - gchar* string_value = gjs_string_utf8 (js_string_value); - g_object_set (object, property, string_value, NULL); - g_free (string_value); - } - } - else if (type == G_TYPE_PARAM_INT || type == G_TYPE_PARAM_UINT) - { - int value = JSValueToNumber (js_context, js_value, - js_exception); - g_object_set (object, property, value, NULL); - } - else if (type == G_TYPE_PARAM_BOOLEAN) - { - bool value = JSValueToBoolean (js_context, js_value); - g_object_set (object, property, value ? TRUE : FALSE, NULL); - } - else if (type == G_TYPE_PARAM_OBJECT) - { - JSObjectRef js_object_value = JSValueToObject ( - js_context, js_value, NULL); - GObject* object_value = JSObjectGetPrivate (js_object_value); - if (G_IS_OBJECT (object_value)) - g_object_set (object, property, object_value, NULL); - else - { - gchar* message = g_strdup_printf (_("%s cannot be assigned to %s.%s"), - "[object]", G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - } - else - { - gchar* message = g_strdup_printf (_("%s.%s cannot be accessed"), - G_OBJECT_NAME (object), property); - JSStringRef js_message = JSStringCreateWithUTF8CString (message); - *js_exception = JSValueMakeString (js_context, js_message); - JSStringRelease (js_message); - g_free (message); - } - g_free (property); - return result; -} - -JSObjectRef -gjs_object_new (JSContextRef js_context, - const gchar* name, - gpointer instance) -{ - g_return_val_if_fail (js_context, NULL); - g_return_val_if_fail (name, NULL); - - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (name); - js_class_def.getPropertyNames = _js_class_get_property_names_cb; - js_class_def.hasProperty = _js_class_has_property_cb; - js_class_def.getProperty = _js_class_get_property_cb; - js_class_def.setProperty = _js_class_set_property_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_object = JSObjectMake (js_context, js_class, instance); - return js_object; -} - -static JSObjectRef -_js_object_call_as_constructor_cb (JSContextRef js_context, - JSObjectRef js_object, - size_t n_arguments, - const JSValueRef js_arguments[], - JSValueRef* js_exception) -{ - const gchar* type_name = JSObjectGetPrivate (js_object); - - g_return_val_if_fail (type_name, NULL); - - GType type = g_type_from_name (type_name); - if (type) - return gjs_object_new (js_context, type_name, g_object_new (type, NULL)); - return NULL; -} - -static bool -_js_module_has_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property) -{ - const gchar* namespace = JSObjectGetPrivate (js_object); - - g_return_val_if_fail (namespace, false); - - gchar* property = gjs_string_utf8 (js_property); - gchar* type_name = g_strdup_printf ("%s%s", namespace, property); - - GType type = g_type_from_name (type_name); - if (!type) - { - GModule* module = g_module_open (NULL, - G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - typedef GType (*gjs_get_type_func)(void); - /* FIXME: Insert a space between each capital letter */ - gchar* type_func_name = g_strdup_printf ("%s_%s_get_type", - namespace, property); - gchar* type_func_name_small = g_utf8_strdown (type_func_name, -1); - gjs_get_type_func type_func; - if (g_module_symbol (module, - (const gchar*)type_func_name_small, (gpointer*)&type_func)) - { - type = type_func (); - g_type_class_peek (type); - } - g_free (type_func_name_small); - g_free (type_func_name); - g_module_close (module); - } - bool result = type ? true : false; - g_free (type_name); - g_free (property); - return result; -} - -static JSValueRef -_js_module_get_property_cb (JSContextRef js_context, - JSObjectRef js_object, - JSStringRef js_property, - JSValueRef* js_exception) -{ - const gchar* namespace = JSObjectGetPrivate (js_object); - - g_return_val_if_fail (namespace, JSValueMakeNull (js_context)); - - gchar* property = gjs_string_utf8 (js_property); - gchar* type_name = g_strdup_printf ("%s%s", namespace, property); - GType type = g_type_from_name (type_name); - JSValueRef result; - if (type) - { - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (type_name); - js_class_def.callAsConstructor = _js_object_call_as_constructor_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - result = JSObjectMake (js_context, js_class, type_name); - } - else - { - result = JSValueMakeNull (js_context); - g_free (type_name); - } - g_free (property); - return result; -} - -static JSObjectRef -gjs_module_new (JSContextRef js_context, - const gchar* namespace) -{ - g_return_val_if_fail (js_context, NULL); - g_return_val_if_fail (namespace, NULL); - - JSClassDefinition js_class_def = kJSClassDefinitionEmpty; - js_class_def.className = g_strdup (namespace); - js_class_def.hasProperty = _js_module_has_property_cb; - js_class_def.getProperty = _js_module_get_property_cb; - JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_module = JSObjectMake (js_context, js_class, - (gpointer)namespace); - return js_module; -} - -JSGlobalContextRef -gjs_global_context_new (void) -{ - #if WEBKIT_CHECK_VERSION (1, 0, 3) - JSGlobalContextRef js_context = JSGlobalContextCreateInGroup (NULL, NULL); - #else - JSGlobalContextRef js_context = JSGlobalContextCreate (NULL); - #endif - JSObjectRef js_object = gjs_object_new (js_context, "GJS", NULL); - _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), - "gjs", js_object); - - js_object = gjs_module_new (js_context, "Gtk"); - _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), - "Gtk", js_object); - js_object = gjs_module_new (js_context, "WebKit"); - _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), - "WebKit", js_object); - js_object = gjs_module_new (js_context, "Midori"); - _js_object_set_property (js_context, JSContextGetGlobalObject (js_context), - "Midori", js_object); - return js_context; -} diff --git a/midori/gjs.h b/midori/gjs.h deleted file mode 100644 index 19bf4d4e..00000000 --- a/midori/gjs.h +++ /dev/null @@ -1,128 +0,0 @@ -/* - Copyright (C) 2008 Christian Dywan - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#ifndef __GJS_H__ -#define __GJS_H__ - -#include -#include - -G_BEGIN_DECLS - -#define GJS_TYPE_VALUE \ - (gjs_value_get_type ()) -#define GJS_VALUE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GJS_TYPE_VALUE, GjsValue)) -#define GJS_VALUE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GJS_TYPE_VALUE, GjsValueClass)) -#define GJS_IS_VALUE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GJS_TYPE_VALUE)) -#define GJS_IS_VALUE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GJS_TYPE_VALUE)) -#define GJS_VALUE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GJS_TYPE_VALUE, GjsValueClass)) - -typedef struct _GjsValue GjsValue; -typedef struct _GjsValueClass GjsValueClass; - -struct _GjsValueClass -{ - GObjectClass parent_class; -}; - -GType -gjs_value_get_type (void); - -GjsValue* -gjs_value_new (JSContextRef js_context, - JSValueRef js_value); - -gboolean -gjs_value_is_valid (GjsValue* value); - -gboolean -gjs_value_is_object (GjsValue* value); - -gboolean -gjs_value_has_attribute (GjsValue* value, - const gchar* name); - -GjsValue* -gjs_value_get_attribute (GjsValue* value, - const gchar* name); - -const gchar* -gjs_value_get_string (GjsValue* value); - -const gchar* -gjs_value_get_attribute_string (GjsValue* value, - const gchar* name); - -GjsValue* -gjs_value_get_nth_attribute (GjsValue* value, - guint n); - -typedef void -(*GjsCallback) (GjsValue* value, - gpointer user_data); - -void -gjs_value_foreach (GjsValue* value, - GjsCallback callback, - gpointer user_data); - -void -gjs_value_forall (GjsValue* value, - GjsCallback callback, - gpointer user_data); - -GjsValue* -gjs_value_get_by_name (GjsValue* value, - const gchar* name); - -GjsValue* -gjs_value_get_elements_by_tag_name (GjsValue* value, - const gchar* name); - -GjsValue* -gjs_value_execute (GjsValue* value, - const gchar* script, - gchar** exception); - -JSValueRef -gjs_script_eval (JSContextRef js_context, - const gchar* script, - gchar** exception); - -gboolean -gjs_script_check_syntax (JSContextRef js_context, - const gchar* script, - gchar** exception); - -gboolean -gjs_script_from_file (JSContextRef js_context, - const gchar* filename, - gchar** exception); - -gchar* -gjs_string_utf8 (JSStringRef js_string); - -JSObjectRef -gjs_object_new (JSContextRef context, - const gchar* name, - gpointer instance); - -JSGlobalContextRef -gjs_global_context_new (void); - -G_END_DECLS - -#endif /* __GJS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 23855c92..d91e96cf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,7 +10,6 @@ midori/midori-view.c midori/midori-preferences.c midori/midori-searchaction.c midori/sokoke.c -midori/gjs.c panels/midori-addons.c panels/midori-bookmarks.c panels/midori-console.c From dbc4c3f743ae0efcdb1f6db92c122a66aa5b0f70 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 18:09:04 +0200 Subject: [PATCH 0943/2970] Move array loading and saving to midori_array_{from,to}_file This not only takes the code out of main but in the future will allow extensions to use and enhance it. --- midori/main.c | 343 ++------------------------------------ midori/midori-array.c | 372 ++++++++++++++++++++++++++++++++++++++++++ midori/midori-array.h | 29 ++++ midori/midori.h | 1 + po/POTFILES.in | 1 + 5 files changed, 415 insertions(+), 331 deletions(-) create mode 100644 midori/midori-array.c create mode 100644 midori/midori-array.h diff --git a/midori/main.c b/midori/main.c index fd6b96cd..580e54f1 100644 --- a/midori/main.c +++ b/midori/main.c @@ -14,20 +14,15 @@ #include #endif +#include "midori.h" #include "midori-addons.h" -#include "midori-app.h" +#include "midori-array.h" #include "midori-bookmarks.h" -#include "midori-browser.h" #include "midori-console.h" -#include "midori-extension.h" #include "midori-extensions.h" #include "midori-history.h" -#include "midori-panel.h" -#include "midori-preferences.h" #include "midori-plugins.h" #include "midori-transfers.h" -#include "midori-view.h" -#include "midori-websettings.h" #include "sokoke.h" #include "compat.h" @@ -40,16 +35,11 @@ #else #define is_writable(_cfg_filename) 1 #endif +#include #include -#include #include #include -#if HAVE_LIBXML - #include - #include -#endif - #if HAVE_SQLITE #include #endif @@ -319,185 +309,6 @@ search_engines_save_to_file (KatzeArray* search_engines, return saved; } -#if HAVE_LIBXML -static KatzeItem* -katze_item_from_xmlNodePtr (xmlNodePtr cur) -{ - KatzeItem* item; - xmlChar* key; - - item = katze_item_new (); - key = xmlGetProp (cur, (xmlChar*)"href"); - katze_item_set_uri (item, (gchar*)key); - g_free (key); - - cur = cur->xmlChildrenNode; - while (cur) - { - if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) - { - key = xmlNodeGetContent (cur); - katze_item_set_name (item, g_strstrip ((gchar*)key)); - g_free (key); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) - { - key = xmlNodeGetContent (cur); - katze_item_set_text (item, g_strstrip ((gchar*)key)); - g_free (key); - } - cur = cur->next; - } - return item; -} - -/* Create an array from an xmlNodePtr */ -static KatzeArray* -katze_array_from_xmlNodePtr (xmlNodePtr cur) -{ - KatzeArray* array; - xmlChar* key; - KatzeItem* item; - - array = katze_array_new (KATZE_TYPE_ARRAY); - - key = xmlGetProp (cur, (xmlChar*)"folded"); - if (key) - { - /* if (!g_ascii_strncasecmp ((gchar*)key, "yes", 3)) - folder->folded = TRUE; - else if (!g_ascii_strncasecmp ((gchar*)key, "no", 2)) - folder->folded = FALSE; - else - g_warning ("XBEL: Unknown value for folded."); */ - xmlFree (key); - } - - cur = cur->xmlChildrenNode; - while (cur) - { - if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) - { - key = xmlNodeGetContent (cur); - katze_item_set_name (KATZE_ITEM (array), g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) - { - key = xmlNodeGetContent (cur); - katze_item_set_text (KATZE_ITEM (array), g_strstrip ((gchar*)key)); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) - { - item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); - katze_array_add_item (array, item); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) - { - item = katze_item_from_xmlNodePtr (cur); - katze_array_add_item (array, item); - } - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) - { - item = katze_item_new (); - katze_array_add_item (array, item); - } - cur = cur->next; - } - return array; -} - -/* Loads the contents from an xmlNodePtr into an array. */ -static gboolean -katze_array_from_xmlDocPtr (KatzeArray* array, - xmlDocPtr doc) -{ - xmlNodePtr cur; - xmlChar* version; - gchar* value; - KatzeItem* item; - - cur = xmlDocGetRootElement (doc); - version = xmlGetProp (cur, (xmlChar*)"version"); - if (xmlStrcmp (version, (xmlChar*)"1.0")) - g_warning ("XBEL version is not 1.0."); - xmlFree (version); - - value = (gchar*)xmlGetProp (cur, (xmlChar*)"title"); - katze_item_set_name (KATZE_ITEM (array), value); - g_free (value); - - value = (gchar*)xmlGetProp (cur, (xmlChar*)"desc"); - katze_item_set_text (KATZE_ITEM (array), value); - g_free (value); - - if ((cur = xmlDocGetRootElement (doc)) == NULL) - { - /* Empty document */ - return FALSE; - } - if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) - { - /* Wrong document kind */ - return FALSE; - } - cur = cur->xmlChildrenNode; - while (cur) - { - item = NULL; - if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) - item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) - item = katze_item_from_xmlNodePtr (cur); - else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) - item = katze_item_new (); - /*else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) - item = katze_xbel_parse_info (xbel, cur);*/ - if (item) - katze_array_add_item (array, item); - cur = cur->next; - } - return TRUE; -} - -static gboolean -katze_array_from_file (KatzeArray* array, - const gchar* filename, - GError** error) -{ - xmlDocPtr doc; - - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); - g_return_val_if_fail (filename != NULL, FALSE); - - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) - { - /* File doesn't exist */ - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_NOENT, - _("File not found.")); - return FALSE; - } - - if ((doc = xmlParseFile (filename)) == NULL) - { - /* No valid xml or broken encoding */ - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Malformed document.")); - return FALSE; - } - - if (!katze_array_from_xmlDocPtr (array, doc)) - { - /* Parsing failed */ - xmlFreeDoc (doc); - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Malformed document.")); - return FALSE; - } - xmlFreeDoc (doc); - return TRUE; -} -#endif - #if HAVE_SQLITE /* Open database 'dbname' */ static sqlite3* @@ -938,136 +749,6 @@ midori_search_engines_modify_cb (KatzeArray* array, g_free (config_file); } -static gchar* -_simple_xml_element (const gchar* name, - const gchar* value) -{ - gchar* value_escaped; - gchar* markup; - - if (!value) - return g_strdup (""); - value_escaped = g_markup_escape_text (value, -1); - markup = g_strdup_printf ("<%s>%s\n", name, value_escaped, name); - g_free (value_escaped); - return markup; -} - -static gchar* -katze_item_to_data (KatzeItem* item) -{ - gchar* markup; - - g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); - - markup = NULL; - if (KATZE_IS_ARRAY (item)) - { - GString* _markup = g_string_new (NULL); - guint i = 0; - KatzeItem* _item; - while ((_item = katze_array_get_nth_item (KATZE_ARRAY (item), i++))) - { - gchar* item_markup = katze_item_to_data (_item); - g_string_append (_markup, item_markup); - g_free (item_markup); - } - /* gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); */ - gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); - gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); - markup = g_strdup_printf ("\n%s%s%s\n", - "" /* folded ? folded : "" */, - title, desc, - g_string_free (_markup, FALSE)); - /* g_free (folded); */ - g_free (title); - g_free (desc); - } - else if (katze_item_get_uri (item)) - { - gchar* href_escaped = g_markup_escape_text (katze_item_get_uri (item), -1); - gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); - g_free (href_escaped); - gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); - gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); - markup = g_strdup_printf ("\n%s%s%s\n", - href, - title, desc, - ""); - g_free (href); - g_free (title); - g_free (desc); - } - else - markup = g_strdup ("\n"); - return markup; -} - -static gchar* -katze_array_to_xml (KatzeArray* array, - GError** error) -{ - GString* inner_markup; - guint i; - KatzeItem* item; - gchar* item_xml; - gchar* title; - gchar* desc; - gchar* outer_markup; - - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL); - - inner_markup = g_string_new (NULL); - i = 0; - while ((item = katze_array_get_nth_item (array, i++))) - { - item_xml = katze_item_to_data (item); - g_string_append (inner_markup, item_xml); - g_free (item_xml); - } - - title = _simple_xml_element ("title", katze_item_get_name (KATZE_ITEM (array))); - desc = _simple_xml_element ("desc", katze_item_get_text (KATZE_ITEM (array))); - outer_markup = g_strdup_printf ( - "%s%s\n%s%s%s\n", - "\n", - "\n", - title, - desc, - g_string_free (inner_markup, FALSE)); - g_free (title); - g_free (desc); - - return outer_markup; -} - -static gboolean -katze_array_to_file (KatzeArray* array, - const gchar* filename, - GError** error) -{ - gchar* data; - FILE* fp; - - g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); - g_return_val_if_fail (filename, FALSE); - - if (!(data = katze_array_to_xml (array, error))) - return FALSE; - if (!(fp = fopen (filename, "w"))) - { - *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_ACCES, - _("Writing failed.")); - return FALSE; - } - fputs (data, fp); - fclose (fp); - g_free (data); - return TRUE; -} - static void midori_bookmarks_notify_item_cb (KatzeArray* folder, GParamSpec* pspec, @@ -1078,7 +759,7 @@ midori_bookmarks_notify_item_cb (KatzeArray* folder, config_file = build_config_filename ("bookmarks.xbel"); error = NULL; - if (!katze_array_to_file (bookmarks, config_file, &error)) + if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) { g_warning (_("The bookmarks couldn't be saved. %s"), error->message); g_error_free (error); @@ -1105,7 +786,7 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, config_file = build_config_filename ("bookmarks.xbel"); error = NULL; - if (!katze_array_to_file (bookmarks, config_file, &error)) + if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) { g_warning (_("The bookmarks couldn't be saved. %s"), error->message); g_error_free (error); @@ -1133,7 +814,7 @@ midori_bookmarks_remove_item_cb (KatzeArray* bookmarks, config_file = build_config_filename ("bookmarks.xbel"); error = NULL; - if (!katze_array_to_file (bookmarks, config_file, &error)) + if (!midori_array_to_file (bookmarks, config_file, "xbel", &error)) { g_warning (_("The bookmarks couldn't be saved. %s"), error->message); g_error_free (error); @@ -1155,7 +836,7 @@ midori_trash_add_item_cb (KatzeArray* trash, config_file = build_config_filename ("tabtrash.xbel"); error = NULL; - if (!katze_array_to_file (trash, config_file, &error)) + if (!midori_array_to_file (trash, config_file, "xbel", &error)) { /* i18n: Trash, or wastebin, containing closed tabs */ g_warning (_("The trash couldn't be saved. %s"), error->message); @@ -1179,7 +860,7 @@ midori_trash_remove_item_cb (KatzeArray* trash, config_file = build_config_filename ("tabtrash.xbel"); error = NULL; - if (!katze_array_to_file (trash, config_file, &error)) + if (!midori_array_to_file (trash, config_file, "xbel", &error)) { g_warning (_("The trash couldn't be saved. %s"), error->message); g_error_free (error); @@ -1250,7 +931,7 @@ midori_browser_session_cb (MidoriBrowser* browser, config_file = build_config_filename ("session.xbel"); error = NULL; - if (!katze_array_to_file (session, config_file, &error)) + if (!midori_array_to_file (session, config_file, "xbel", &error)) { g_warning (_("The session couldn't be saved. %s"), error->message); g_error_free (error); @@ -1795,7 +1476,7 @@ main (int argc, #if HAVE_LIBXML katze_assign (config_file, build_config_filename ("bookmarks.xbel")); error = NULL; - if (!katze_array_from_file (bookmarks, config_file, &error)) + if (!midori_array_from_file (bookmarks, config_file, "xbel", &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, @@ -1810,7 +1491,7 @@ main (int argc, { katze_assign (config_file, build_config_filename ("session.xbel")); error = NULL; - if (!katze_array_from_file (_session, config_file, &error)) + if (!midori_array_from_file (_session, config_file, "xbel", &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, @@ -1823,7 +1504,7 @@ main (int argc, #if HAVE_LIBXML katze_assign (config_file, build_config_filename ("tabtrash.xbel")); error = NULL; - if (!katze_array_from_file (trash, config_file, &error)) + if (!midori_array_from_file (trash, config_file, "xbel", &error)) { if (error->code != G_FILE_ERROR_NOENT) g_string_append_printf (error_messages, diff --git a/midori/midori-array.c b/midori/midori-array.c new file mode 100644 index 00000000..b1ed8750 --- /dev/null +++ b/midori/midori-array.c @@ -0,0 +1,372 @@ +/* + Copyright (C) 2007-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include + +#if HAVE_CONFIG_H + #include +#endif + +#include + +#if HAVE_LIBXML + #include + #include +#endif + +#if HAVE_LIBXML +static KatzeItem* +katze_item_from_xmlNodePtr (xmlNodePtr cur) +{ + KatzeItem* item; + xmlChar* key; + + item = katze_item_new (); + key = xmlGetProp (cur, (xmlChar*)"href"); + katze_item_set_uri (item, (gchar*)key); + g_free (key); + + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) + { + key = xmlNodeGetContent (cur); + katze_item_set_name (item, g_strstrip ((gchar*)key)); + g_free (key); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) + { + key = xmlNodeGetContent (cur); + katze_item_set_text (item, g_strstrip ((gchar*)key)); + g_free (key); + } + cur = cur->next; + } + return item; +} + +/* Create an array from an xmlNodePtr */ +static KatzeArray* +katze_array_from_xmlNodePtr (xmlNodePtr cur) +{ + KatzeArray* array; + xmlChar* key; + KatzeItem* item; + + array = katze_array_new (KATZE_TYPE_ARRAY); + + key = xmlGetProp (cur, (xmlChar*)"folded"); + if (key) + { + /* if (!g_ascii_strncasecmp ((gchar*)key, "yes", 3)) + folder->folded = TRUE; + else if (!g_ascii_strncasecmp ((gchar*)key, "no", 2)) + folder->folded = FALSE; + else + g_warning ("XBEL: Unknown value for folded."); */ + xmlFree (key); + } + + cur = cur->xmlChildrenNode; + while (cur) + { + if (!xmlStrcmp (cur->name, (const xmlChar*)"title")) + { + key = xmlNodeGetContent (cur); + katze_item_set_name (KATZE_ITEM (array), g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"desc")) + { + key = xmlNodeGetContent (cur); + katze_item_set_text (KATZE_ITEM (array), g_strstrip ((gchar*)key)); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + { + item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); + katze_array_add_item (array, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + { + item = katze_item_from_xmlNodePtr (cur); + katze_array_add_item (array, item); + } + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + { + item = katze_item_new (); + katze_array_add_item (array, item); + } + cur = cur->next; + } + return array; +} + +/* Loads the contents from an xmlNodePtr into an array. */ +static gboolean +katze_array_from_xmlDocPtr (KatzeArray* array, + xmlDocPtr doc) +{ + xmlNodePtr cur; + xmlChar* version; + gchar* value; + KatzeItem* item; + + cur = xmlDocGetRootElement (doc); + version = xmlGetProp (cur, (xmlChar*)"version"); + if (xmlStrcmp (version, (xmlChar*)"1.0")) + g_warning ("XBEL version is not 1.0."); + xmlFree (version); + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"title"); + katze_item_set_name (KATZE_ITEM (array), value); + g_free (value); + + value = (gchar*)xmlGetProp (cur, (xmlChar*)"desc"); + katze_item_set_text (KATZE_ITEM (array), value); + g_free (value); + + if ((cur = xmlDocGetRootElement (doc)) == NULL) + { + /* Empty document */ + return FALSE; + } + if (xmlStrcmp (cur->name, (const xmlChar*)"xbel")) + { + /* Wrong document kind */ + return FALSE; + } + cur = cur->xmlChildrenNode; + while (cur) + { + item = NULL; + if (!xmlStrcmp (cur->name, (const xmlChar*)"folder")) + item = (KatzeItem*)katze_array_from_xmlNodePtr (cur); + else if (!xmlStrcmp (cur->name, (const xmlChar*)"bookmark")) + item = katze_item_from_xmlNodePtr (cur); + else if (!xmlStrcmp (cur->name, (const xmlChar*)"separator")) + item = katze_item_new (); + /*else if (!xmlStrcmp (cur->name, (const xmlChar*)"info")) + item = katze_xbel_parse_info (xbel, cur);*/ + if (item) + katze_array_add_item (array, item); + cur = cur->next; + } + return TRUE; +} + +/** + * midori_array_from_file: + * @array: a #KatzeArray + * @filename: a filename to load from + * @format: the desired format + * @error: a #GError or %NULL + * + * Loads the contents of a file in the specified format. + * + * Return value: %TRUE on success, %FALSE otherwise + * + * Since: 0.1.6 + **/ +gboolean +midori_array_from_file (KatzeArray* array, + const gchar* filename, + const gchar* format, + GError** error) +{ + xmlDocPtr doc; + + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); + g_return_val_if_fail (filename != NULL, FALSE); + g_return_val_if_fail (!g_strcmp0 (format, "xbel"), FALSE); + g_return_val_if_fail (!error || !*error, FALSE); + + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) + { + /* File doesn't exist */ + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_NOENT, + _("File not found.")); + return FALSE; + } + + if ((doc = xmlParseFile (filename)) == NULL) + { + /* No valid xml or broken encoding */ + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + + if (!katze_array_from_xmlDocPtr (array, doc)) + { + /* Parsing failed */ + xmlFreeDoc (doc); + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Malformed document.")); + return FALSE; + } + xmlFreeDoc (doc); + return TRUE; +} +#endif + +static gchar* +_simple_xml_element (const gchar* name, + const gchar* value) +{ + gchar* value_escaped; + gchar* markup; + + if (!value) + return g_strdup (""); + value_escaped = g_markup_escape_text (value, -1); + markup = g_strdup_printf ("<%s>%s\n", name, value_escaped, name); + g_free (value_escaped); + return markup; +} + +static gchar* +katze_item_to_data (KatzeItem* item) +{ + gchar* markup; + + g_return_val_if_fail (KATZE_IS_ITEM (item), NULL); + + markup = NULL; + if (KATZE_IS_ARRAY (item)) + { + GString* _markup = g_string_new (NULL); + guint i = 0; + KatzeItem* _item; + while ((_item = katze_array_get_nth_item (KATZE_ARRAY (item), i++))) + { + gchar* item_markup = katze_item_to_data (_item); + g_string_append (_markup, item_markup); + g_free (item_markup); + } + /* gchar* folded = item->folded ? NULL : g_strdup_printf (" folded=\"no\""); */ + gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); + gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); + markup = g_strdup_printf ("\n%s%s%s\n", + "" /* folded ? folded : "" */, + title, desc, + g_string_free (_markup, FALSE)); + /* g_free (folded); */ + g_free (title); + g_free (desc); + } + else if (katze_item_get_uri (item)) + { + gchar* href_escaped = g_markup_escape_text (katze_item_get_uri (item), -1); + gchar* href = g_strdup_printf (" href=\"%s\"", href_escaped); + g_free (href_escaped); + gchar* title = _simple_xml_element ("title", katze_item_get_name (item)); + gchar* desc = _simple_xml_element ("desc", katze_item_get_text (item)); + markup = g_strdup_printf ("\n%s%s%s\n", + href, + title, desc, + ""); + g_free (href); + g_free (title); + g_free (desc); + } + else + markup = g_strdup ("\n"); + return markup; +} + +static gchar* +katze_array_to_xbel (KatzeArray* array, + GError** error) +{ + GString* inner_markup; + guint i; + KatzeItem* item; + gchar* item_xml; + gchar* title; + gchar* desc; + gchar* outer_markup; + + inner_markup = g_string_new (NULL); + i = 0; + while ((item = katze_array_get_nth_item (array, i++))) + { + item_xml = katze_item_to_data (item); + g_string_append (inner_markup, item_xml); + g_free (item_xml); + } + + title = _simple_xml_element ("title", katze_item_get_name (KATZE_ITEM (array))); + desc = _simple_xml_element ("desc", katze_item_get_text (KATZE_ITEM (array))); + outer_markup = g_strdup_printf ( + "%s%s\n%s%s%s\n", + "\n", + "\n", + title, + desc, + g_string_free (inner_markup, FALSE)); + g_free (title); + g_free (desc); + + return outer_markup; +} + +static gboolean +midori_array_to_file_xbel (KatzeArray* array, + const gchar* filename, + GError** error) +{ + gchar* data; + FILE* fp; + + if (!(data = katze_array_to_xbel (array, error))) + return FALSE; + if (!(fp = fopen (filename, "w"))) + { + *error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_ACCES, + _("Writing failed.")); + return FALSE; + } + fputs (data, fp); + fclose (fp); + g_free (data); + return TRUE; +} + +/** + * midori_array_to_file: + * @array: a #KatzeArray + * @filename: a filename to load from + * @format: the desired format + * @error: a #GError or %NULL + * + * Saves the contents to a file in the specified format. + * + * Return value: %TRUE on success, %FALSE otherwise + * + * Since: 0.1.6 + **/ +gboolean +midori_array_to_file (KatzeArray* array, + const gchar* filename, + const gchar* format, + GError** error) +{ + g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), FALSE); + g_return_val_if_fail (filename, FALSE); + g_return_val_if_fail (!error || !*error, FALSE); + + if (!g_strcmp0 (format, "xbel")) + return midori_array_to_file_xbel (array, filename, error); + g_critical ("Cannot write KatzeArray to unknown format '%s'.", format); + return FALSE; +} diff --git a/midori/midori-array.h b/midori/midori-array.h new file mode 100644 index 00000000..a41936a3 --- /dev/null +++ b/midori/midori-array.h @@ -0,0 +1,29 @@ +/* + Copyright (C) 2007-2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __MIDORI_ARRAY_H__ +#define __MIDORI_ARRAY_H__ 1 + +#include + +gboolean +midori_array_from_file (KatzeArray* array, + const gchar* filename, + const gchar* format, + GError** error); + +gboolean +midori_array_to_file (KatzeArray* array, + const gchar* filename, + const gchar* format, + GError** error); + +#endif /* !__MIDORI_ARRAY_H__ */ diff --git a/midori/midori.h b/midori/midori.h index fe050e6e..0886b7cd 100644 --- a/midori/midori.h +++ b/midori/midori.h @@ -13,6 +13,7 @@ #define __MIDORI_H__ #include "midori-app.h" +#include "midori-array.h" #include "midori-browser.h" #include "midori-extension.h" #include "midori-locationaction.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index d91e96cf..3aa6f688 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,7 @@ data/midori.desktop.in midori/main.c midori/midori-app.c +midori/midori-array.c midori/midori-browser.c midori/midori-panel.c midori/midori-websettings.c From 529aadc6485da81064198740cdb137bd3de32fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 31 Mar 2009 18:20:31 +0200 Subject: [PATCH 0944/2970] Always use WebKit's session in KatzeNet This fixes corruption of expiration dates. --- katze/katze-net.c | 7 ++----- katze/wscript_build | 2 +- midori/main.c | 9 +-------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index b6485344..c699026d 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -16,6 +16,7 @@ #include "katze-net.h" #include +#include struct _KatzeNet { @@ -57,16 +58,12 @@ katze_net_object_maybe_unref (gpointer object) static void katze_net_init (KatzeNet* net) { - static SoupSession* session = NULL; - net->memory = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, katze_net_object_maybe_unref); net->cache_path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, NULL); - if (!session) - session = soup_session_async_new (); - net->session = session; + net->session = webkit_get_default_session (); } static void diff --git a/katze/wscript_build b/katze/wscript_build index 52c282dd..9dbf09e3 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -10,5 +10,5 @@ obj.target = 'katze' obj.includes = '. ../.' obj.find_sources_in_dirs ('.') obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal') -obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML' +obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML WEBKIT' obj.install_path = None diff --git a/midori/main.c b/midori/main.c index 580e54f1..c5e8ccac 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1122,19 +1122,13 @@ midori_load_cookie_jar (gpointer data) { MidoriWebSettings* settings = MIDORI_WEB_SETTINGS (data); SoupSession* webkit_session; - KatzeNet* net; - SoupSession* s_session; SoupCookieJar* jar; webkit_session = webkit_get_default_session (); - net = katze_net_new (); - s_session = katze_net_get_session (net); jar = soup_cookie_jar_new (); g_object_set_data (G_OBJECT (jar), "midori-settings", settings); - midori_soup_session_prepare (s_session, jar, settings); midori_soup_session_prepare (webkit_session, jar, settings); g_object_unref (jar); - g_object_unref (net); return FALSE; } @@ -1373,8 +1367,7 @@ main (int argc, return 1; } - /* libSoup uses threads, therefore if WebKit is built with libSoup - or Midori is using it, we need to initialize threads. */ + /* libSoup uses threads, so we need to initialize threads. */ if (!g_thread_supported ()) g_thread_init (NULL); sokoke_register_stock_items (); g_set_application_name (_("Midori")); From 3f802e3beb596f9c8f01270777c8ae6dc3a4c34a Mon Sep 17 00:00:00 2001 From: Stanley Zhang Date: Tue, 31 Mar 2009 18:34:56 +0200 Subject: [PATCH 0945/2970] Update Simplified Chinese translation --- po/zh_CN.po | 856 +++++++++++++++++++++++++++++----------------------- 1 file changed, 482 insertions(+), 374 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index ca701c65..fb6c85af 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.4\n" +"Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 00:58+0100\n" -"PO-Revision-Date: 2009-02-11 11:19+0800\n" +"POT-Creation-Date: 2009-03-22 22:19+0100\n" +"PO-Revision-Date: 2009-03-25 15:33+0800\n" "Last-Translator: Stanley Zhang \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -20,9 +20,12 @@ msgstr "" msgid "Lightweight web browser" msgstr "轻量的 Web 浏览器" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1596 ../midori/main.c:1702 -#: ../midori/main.c:1711 ../midori/main.c:1722 -#: ../midori/midori-websettings.c:267 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1580 +#: ../midori/main.c:1672 +#: ../midori/main.c:1681 +#: ../midori/main.c:1692 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -30,1323 +33,1387 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web 浏览器" -#: ../midori/main.c:106 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "设置无法加载: %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "值 '%s' 在 '%s' 中无效" -#: ../midori/main.c:168 ../midori/main.c:238 +#: ../midori/main.c:165 +#: ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "无效的设置值 '%s'" -#: ../midori/main.c:480 +#: ../midori/main.c:477 msgid "File not found." msgstr "没有找到文件." -#: ../midori/main.c:488 ../midori/main.c:497 +#: ../midori/main.c:485 +#: ../midori/main.c:494 msgid "Malformed document." msgstr "异常的文件." -#: ../midori/main.c:519 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "打开数据库失败: %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "清空历史失败: %s\n" -#: ../midori/main.c:652 ../midori/main.c:686 ../midori/main.c:702 +#: ../midori/main.c:649 +#: ../midori/main.c:683 +#: ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "添加历史项失败: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "删除旧的历史项目失败: %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "配置无法保存. %s" -#: ../midori/main.c:939 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "搜索引擎无法保存. %s" -#: ../midori/main.c:1069 ../midori/sokoke.c:617 +#: ../midori/main.c:1066 +#: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "写失败." -#: ../midori/main.c:1090 ../midori/main.c:1117 ../midori/main.c:1145 +#: ../midori/main.c:1087 +#: ../midori/main.c:1114 +#: ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "书签无法保存. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 ../midori/main.c:1193 +#: ../midori/main.c:1166 +#: ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "垃圾箱无法保存. %s" -#: ../midori/main.c:1224 ../midori/midori-preferences.c:404 -msgid "Transfers" -msgstr "文件传输" - -#: ../midori/main.c:1265 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "会话无法保存. %s" -#: ../midori/main.c:1398 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori 好像在上次运行时崩溃了. 如果这种情况反复出现，请尝试以下的选项来解决此问" -"题." +#: ../midori/main.c:1377 +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +msgstr "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现，请尝试以下的选项来解决此问题." -#: ../midori/main.c:1413 +#: ../midori/main.c:1392 msgid "Modify _preferences" msgstr "修改首选项(_p)" -#: ../midori/main.c:1417 +#: ../midori/main.c:1396 msgid "Reset the last _session" msgstr "重置最后的会话(_s)" -#: ../midori/main.c:1422 +#: ../midori/main.c:1401 msgid "Disable all _extensions" msgstr "关闭所有的扩展(_e)" -#: ../midori/main.c:1596 +#: ../midori/main.c:1580 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1628 ../midori/gjs.c:514 +#: ../midori/main.c:1603 +#: ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "发生了一个未知的错误." -#: ../midori/main.c:1651 +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" -msgstr "将指定的文件当作Javascript执行" +msgstr "将指定的文件当作 Javascript 执行" -#: ../midori/main.c:1653 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1655 +#: ../midori/main.c:1630 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1699 +#: ../midori/main.c:1669 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1723 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "在此检查新版本:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" -msgstr "一个 Midori 的实例已经在运行但没有响应.\n" +msgstr "已经有一个 Midori 在运行，但没有响应.\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1772 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "搜索引擎无法加载. %s\n" -#: ../midori/main.c:1832 +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1860 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "垃圾箱无法加载: %s\n" -#: ../midori/main.c:1873 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1885 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "发生以下错误:" -#: ../midori/main.c:1901 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-browser.c:277 ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:278 +#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:288 ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:289 +#: ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'." -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "标题(_T): " -#: ../midori/midori-browser.c:597 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 +#: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:616 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 +#: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:640 ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 +#: ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2634 ../panels/midori-bookmarks.c:776 +#: ../midori/midori-browser.c:2837 +#: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:2641 ../panels/midori-bookmarks.c:782 +#: ../midori/midori-browser.c:2844 +#: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:2644 ../panels/midori-bookmarks.c:784 +#: ../midori/midori-browser.c:2847 +#: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." -msgstr "一个轻量的 Web 浏览器." +msgstr "轻量级的 Web 浏览器." -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "张翼 " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "新建窗口" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "新建标签页" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "关闭标签页(_C)" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "关闭当前标签页" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" msgstr "关闭窗口(_l)" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "剪切选中的文本" -#: ../midori/midori-browser.c:3021 ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "复制选中的文本" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "从剪贴板粘帖文本" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "删除选中的文本" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "选取所有文本" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "在页面中查找词或短语" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "查找下一处" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "查找上一处" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "快速查找(_Q)" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "快速跳转到一个词或短语" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "提高放大倍数" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "缩小放大倍数" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "重置放大倍数" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3278 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3280 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:3076 ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3283 +#: ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "繁体中文 (BIG5)" -#: ../midori/midori-browser.c:3079 ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3286 +#: ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "日语 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3289 +#: ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:3085 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3292 +#: ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3088 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3295 +#: ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "西方 (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3298 +#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "定制 ..." -#: ../midori/midori-browser.c:3094 ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3301 +#: ../midori/midori-view.c:1111 msgid "View _Source" msgstr "查看源码(_S)" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "查看本页的源代码" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "全屏浏览" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "位置(_G)" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" -msgstr "后退到上一个页" +msgstr "返回上一页" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" -msgstr "前进到下一页" +msgstr "转到下一页" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "清空垃圾箱" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "删除垃圾箱中的内容" -#: ../midori/midori-browser.c:3118 ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3325 +#: ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "撤销关闭标签页" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "打开最后关闭的标签页" -#: ../midori/midori-browser.c:3123 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3330 +#: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "添加一个新书签" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3331 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:3126 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3333 +#: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "添加, 编辑和移除搜索引擎" -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "上一个标签页(_P)" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "下一个标签页(_N)" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "显示常见问题" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3352 msgid "_Report a Bug" msgstr "反馈错误(_R)" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "隐私浏览(_r)" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "侧边栏(_p)" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "显示侧边栏" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3821 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "位置(_L)" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "搜索 Web(_W)" -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "执行 Web 搜索" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签页或窗口" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:3684 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3903 +#: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3918 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "显示所有标签页的列表" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:4085 msgid "_Inline Find:" msgstr "查找(_I):" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4110 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4115 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:481 +#: ../midori/midori-panel.c:229 +#: ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" -msgstr "Align sidepanel on the right" +msgstr "侧边栏摆放到右侧" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:482 +#: ../midori/midori-panel.c:231 +#: ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" -msgstr "让侧边栏排放到右侧" +msgstr "是否让侧边栏摆放到右侧" -#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:241 +#: ../midori/midori-panel.c:242 msgid "Close panel" msgstr "关闭侧边栏" -#: ../midori/midori-websettings.c:177 ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:179 +#: ../midori/midori-view.c:1888 msgid "Blank page" msgstr "空白页面" -#: ../midori/midori-websettings.c:178 ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 +#: ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "主页" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "最后打开页面" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "新建标签页" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "当前标签页" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "缺省" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "图标及文字" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "水平摆放的图标和文字" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "所有 Cookies" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:252 ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "无" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "记住上次窗口的大小" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "上次窗口的宽度" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "上次窗口的高度" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "上次的侧边栏位置" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "上次保存的侧边栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "上次的侧边栏页" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "上次保存的侧边栏页" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "上次的 Web 搜索" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "上次保存的 Web 搜索" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "显示侧边栏" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "是否显示侧边栏" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "显示传输栏" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "是否显示传输栏" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "工具栏样式" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "在地址输入框中显示进度" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "是否在地址输入框中显示加载进度" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "工具栏中的项目" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "在工具栏中显示的项目" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "紧凑侧边栏" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "是否让侧边栏紧凑显示" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "启动时加载" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "启动时加载的项目" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "显示崩溃提示对话框" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "当 Midori 崩溃后显示提示对话框" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "下载目录" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "下载的文件将保存到此目录" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "下载管理器" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "外部的下载管理器" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "外部的文本编辑器" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "地址栏查找" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "在地址输入框中执行的查找" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "首选的编码" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "首选的字符编码集" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "是否在标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "打开新的页面在" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "在那里打开新的页面" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "打开外部页面在" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "在那里打开外部页面" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "鼠标中键打开地址" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "用鼠标中键单击打开选中地址" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "在后台打开标签页" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开标签页" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "在当前标签页后打开新标签" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "是否在当前标签页后打开新标签或者在最后的标签页后打开" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "是否在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "缩放文字和图像" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "是否缩放文字和图像" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "输入时自动补全" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "是否输入时自动补全地址" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "接收 Cookies" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "接收什么类型的 Cookies" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "只接收原始 Cookies" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "只接收原始网站的 Cookies" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "最长 Cookie 有效期" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "最长保存 Cookie 多少天" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "记录上次访问的页面" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "是否记录上次访问的页面" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "最长历史有效期" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "最长保存历史多少天" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "记录上次的表格输入" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "是否记录上次的表格输入" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "记录上次下载的文件" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "是否保存上次下载的文件" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" -msgstr "HTTP连接所使用的代理服务器" +msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "自动检测代理服务器" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "是否自动在环境中检测代理服务器" +msgstr "是否自动检测系统环境中的代理服务器设置" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "让页面识别为什么" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "缓存大小" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "允许的缓存大小" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "打开链接(_L)" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "在新标签页中打开链接(_T)" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:989 -msgid "_Save Link destination" -msgstr "保存链接目标(_S)" - -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:1016 +#: ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "保存链接目标(_S)" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "搜索 Web(_S)" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "在新标签页中打开地址(_T)" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "打开或下载文件" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "文件类型: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "打开 %s" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:1664 -msgid "Source" -msgstr "源码" - -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1755 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "没有安装文档" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "%s 的设置项" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "常规" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "启动" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "设置当前页为主页" + +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "文件传输" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "外观" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "字体设置" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "缺省的字体" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "显示文字的缺省字体大小" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "最小字体尺寸" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "显示文字的最小字体尺寸" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "编码" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "缺省的字符编码" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "行为" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "特性" -#: ../midori/midori-preferences.c:476 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 +#: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "自动加载图像" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "自动缩小图像" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "自动缩小单独的图像以适合屏幕" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "打印背景图" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "可缩放的文本区" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" -msgstr "文本区是否可被缩放" +msgstr "文本区能否缩放" -#: ../midori/midori-preferences.c:492 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 +#: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" -msgstr "启用嵌入的脚本语言" +msgstr "启用网页中的脚本" -#: ../midori/midori-preferences.c:496 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 +#: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "启用插件" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" -msgstr "启用嵌入的插件对象" +msgstr "启用页面中的插件对象" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "强制每英寸96点" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" -msgstr "强制画面点密度为96DPI" +msgstr "强制画面点密度为 96DPI" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "启用开发工具" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "启用给开发者的特殊扩展" #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "界面" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "导航条" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "浏览" -#: ../midori/midori-preferences.c:564 ../midori/midori-preferences.c:565 +#. Page "Network" +#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:580 msgid "Network" msgstr "网络" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "隐私" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "网页 Cookies" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:636 msgid "days" msgstr "天" -#: ../midori/midori-preferences.c:624 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:629 +#: ../panels/midori-history.c:104 msgid "History" msgstr "历史" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:455 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "清空" @@ -1374,7 +1441,8 @@ msgstr "记号(_T):" msgid "Manage Search Engines" msgstr "管理搜索引擎" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/sokoke.c:109 +#: ../midori/sokoke.c:121 msgid "Could not run external program." msgstr "无法运行外部程序." @@ -1431,37 +1499,52 @@ msgstr "关闭的标签页和窗口(_C)" msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 +#: ../midori/gjs.c:743 +#: ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s 没有 '%s' 属性" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "%s 不能被指定到 %s.%s" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s.%s 不能访问" -#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "用户脚本" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "用户样式" -#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:922 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "启用(_E)" -#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:923 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "启用" + +#: ../panels/midori-addons.c:932 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "关闭(_D)" +#: ../panels/midori-addons.c:933 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "关闭" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "书签" @@ -1492,7 +1575,7 @@ msgstr "扩展" #: ../panels/midori-history.c:159 msgid "Are you sure you want to remove all history items?" -msgstr "确认删除所有的历史项目?" +msgstr "确认删除所有的历史项?" #: ../panels/midori-history.c:216 msgid "Bookmark the selected history item" @@ -1500,7 +1583,7 @@ msgstr "将选中的历史项加入书签" #: ../panels/midori-history.c:225 msgid "Delete the selected history item" -msgstr "删除选中的历史项目" +msgstr "删除选中的历史项" #: ../panels/midori-history.c:233 msgid "Clear the entire history" @@ -1524,25 +1607,31 @@ msgstr "今天" msgid "Yesterday" msgstr "昨天" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "插件" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "第 %s 项, 共 %s 项" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "需要认证" -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" msgstr "需要输入用户名和密码来打开此位置:" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "用户名" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "密码" @@ -1560,12 +1649,14 @@ msgstr "库存图标 '%s' 无法加载" msgid "Animation frames are broken" msgstr "动画帧损坏" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "属性 '%s' 在 '%s' 中无效" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "选择文件" @@ -1573,6 +1664,18 @@ msgstr "选择文件" msgid "Choose folder" msgstr "选择目录" +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "多彩标签页" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "多彩标签页" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "用不同颜色区分标签页" + #: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "鼠标手势" @@ -1582,13 +1685,14 @@ msgid "Control Midori by moving the mouse" msgstr "用鼠标移动控制 Midori" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:116 +#: ../extensions/page-holder.c:153 msgid "Pageholder" -msgstr "长驻页面" +msgstr "常驻页面" #: ../extensions/page-holder.c:137 msgid "_Pageholder" -msgstr "长驻页面(_P)" +msgstr "常驻页面(_P)" #: ../extensions/statusbar-features.c:40 msgid "Images" @@ -1597,3 +1701,7 @@ msgstr "图像" #: ../extensions/statusbar-features.c:47 msgid "Scripts" msgstr "脚本" + +#~ msgid "Source" +#~ msgstr "源码" + From b083c5bbd0dd67db00126a876089b5b1ac6efa6e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 21:19:18 +0200 Subject: [PATCH 0946/2970] Optimize array iterations in the browser --- midori/midori-browser.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 95d5e39a..f15f403f 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -681,19 +681,15 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); if (g_strcmp0 (selected, _("Toplevel folder"))) { - guint i, n; - - if ((n = katze_array_get_length (browser->bookmarks))) - for (i = 0; i < n; i++) - { - KatzeItem* item = katze_array_get_nth_item (browser->bookmarks, i); + guint i = 0; + KatzeItem* item; + while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) if (KATZE_IS_ARRAY (item)) if (!g_strcmp0 (katze_item_get_name (item), selected)) { folder = KATZE_ARRAY (item); break; } - } } g_free (selected); if (!new_bookmark) @@ -4527,7 +4523,7 @@ static void midori_browser_set_bookmarks (MidoriBrowser* browser, KatzeArray* bookmarks) { - guint i, n; + guint i; KatzeItem* item; if (browser->bookmarks == bookmarks) @@ -4545,12 +4541,9 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, if (!browser->bookmarks) return; - n = katze_array_get_length (browser->bookmarks); - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (browser->bookmarks, i); + i = 0; + while ((item = katze_array_get_nth_item (browser->bookmarks, i++))) browser_bookmarks_add_item_cb (browser->bookmarks, item, browser); - } g_signal_connect (browser->bookmarks, "add-item", G_CALLBACK (browser_bookmarks_add_item_cb), browser); g_signal_connect (browser->bookmarks, "remove-item", From d14b65563a5e29936d98cd0d517f2a6d0138d74f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 21:19:48 +0200 Subject: [PATCH 0947/2970] Save files which are opened immediately to the temporary folder --- midori/midori-browser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f15f403f..d1e8c217 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1011,7 +1011,10 @@ midori_view_download_requested_cb (GtkWidget* view, gchar* filename; gchar* uri; - folder = katze_object_get_string (browser->settings, "download-folder"); + if (g_object_get_data (G_OBJECT (download), "open-download")) + folder = g_strdup (g_get_tmp_dir ()); + else + folder = katze_object_get_string (browser->settings, "download-folder"); filename = g_build_filename (folder, webkit_download_get_suggested_filename (download), NULL); g_free (folder); From 09af4e67548362848830983a7e01862672447080 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 22:20:24 +0200 Subject: [PATCH 0948/2970] Optimize array iterations in the History panel --- panels/midori-history.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index b3687fcd..18718ce4 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -441,7 +441,8 @@ midori_history_insert_item (MidoriHistory* history, { GtkTreeIter* piter; gint64 pday; - guint i, n; + guint i; + KatzeItem* child; g_signal_connect (item, "add-item", G_CALLBACK (midori_history_add_item_cb), history); @@ -459,14 +460,9 @@ midori_history_insert_item (MidoriHistory* history, g_object_unref (item); piter = &iter; } - n = katze_array_get_length (KATZE_ARRAY (item)); - for (i = 0; i < n; i++) - { - KatzeItem* child; - - child = katze_array_get_nth_item (KATZE_ARRAY (item), i); + i = 0; + while ((child = katze_array_get_nth_item (KATZE_ARRAY (item), i++))) midori_history_insert_item (history, treestore, piter, child, day); - } } else { From 7470684a3bec3afce6330faaffd3f8653e7973c3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 22:21:14 +0200 Subject: [PATCH 0949/2970] Optimize array handling in search action --- midori/midori-searchaction.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 7a64e41a..b58e48e3 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -402,7 +402,7 @@ midori_search_action_get_icon (MidoriSearchAction* search_action, return pixbuf; } - if ((icon = katze_item_get_uri (item)) && strstr (icon, "://")) + if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://"))) return katze_net_load_icon (search_action->net, icon, NULL, widget, NULL); @@ -416,12 +416,13 @@ midori_search_action_icon_released_cb (GtkWidget* entry, gint button, GtkAction* action) { + if (icon_pos == GTK_ICON_ENTRY_SECONDARY) return; KatzeArray* search_engines; GtkWidget* menu; - guint n, i; + guint i; GtkWidget* menuitem; KatzeItem* item; GdkPixbuf* icon; @@ -429,12 +430,11 @@ midori_search_action_icon_released_cb (GtkWidget* entry, search_engines = MIDORI_SEARCH_ACTION (action)->search_engines; menu = gtk_menu_new (); - n = katze_array_get_length (search_engines); - if (n) + i = 0; + if ((item = katze_array_get_nth_item (search_engines, i))) { - for (i = 0; i < n; i++) + do { - item = katze_array_get_nth_item (search_engines, i); menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); image = gtk_image_new (); @@ -449,6 +449,7 @@ midori_search_action_icon_released_cb (GtkWidget* entry, G_CALLBACK (midori_search_action_engine_activate_cb), action); gtk_widget_show (menuitem); } + while ((item = katze_array_get_nth_item (search_engines, ++i))); } else { @@ -1063,7 +1064,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) GtkListStore* liststore; GtkWidget* treeview; GtkWidget* scrolled; - guint n, i; + guint i; KatzeItem* item; GtkWidget* vbox; GtkWidget* button; @@ -1136,14 +1137,11 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 5); - n = search_action->search_engines ? - katze_array_get_length (search_action->search_engines) : 0; - for (i = 0; i < n; i++) - { - item = katze_array_get_nth_item (search_action->search_engines, i); + i = 0; + if (search_action->search_engines) + while ((item = katze_array_get_nth_item (search_action->search_engines, i))) gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore), - NULL, i, 0, item, -1); - } + NULL, i++, 0, item, -1); g_object_unref (liststore); g_signal_connect (treeview, "destroy", G_CALLBACK (midori_search_action_treeview_destroy_cb), search_action); @@ -1158,14 +1156,14 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) g_signal_connect (button, "clicked", G_CALLBACK (midori_search_action_dialog_edit_cb), search_action); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - if (!n) + if (!i) gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); search_action->remove_button = button; g_signal_connect (button, "clicked", G_CALLBACK (midori_search_action_dialog_remove_cb), search_action); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - if (!n) + if (!i) gtk_widget_set_sensitive (button, FALSE); button = gtk_label_new (""); /* This is an invisible separator */ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); From 43feec8b3d5d1b565ca81f554c85dea69e899a40 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 31 Mar 2009 22:24:18 +0200 Subject: [PATCH 0950/2970] Optimize location completion based on profiling The test was modified slightly because we are not filtering out trailing slahses anymore. We are not quite there still when it comes to treating URIs as we should but for all practical purposes it should be quite a bit faster. The most annoying shortcoming still is that umlauts or any special characters won't match at all. --- midori/midori-locationaction.c | 107 +++++++++++++-------------------- tests/completion.c | 14 +++-- 2 files changed, 51 insertions(+), 70 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c4c8f818..2fd2b468 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -498,23 +498,26 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, gchar* skey; gchar* temp; gchar** parts; + size_t len; gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); desc_uri = desc_title = key = NULL; - if (data) + if (G_LIKELY (data)) { entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (data)); - key = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); + key = title ? g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1) + : g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); + len = 0; } - if (data && uri) + if (G_LIKELY (data && uri)) { - temp = g_utf8_strdown (uri, -1); - start = strstr (temp, key); - if (start) + temp = g_ascii_strdown (uri, -1); + if ((start = strstr (temp, key))) { - skey = g_malloc0 (strlen (key) + 1); - g_utf8_strncpy (skey, uri + (start - temp), g_utf8_strlen (key, -1)); + len = strlen (key); + skey = g_malloc0 (len + 1); + strncpy (skey, uri + (start - temp), len); parts = g_strsplit (uri, skey, 2); if (parts && parts[0] && parts[1]) desc_uri = g_markup_printf_escaped ("%s%s%s", @@ -526,14 +529,16 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, } if (uri && !desc_uri) desc_uri = g_markup_escape_text (uri, -1); - if (data && title) + if (G_LIKELY (data && title)) { temp = g_utf8_strdown (title, -1); - start = strstr (temp, key); - if (start) + if ((start = strstr (temp, key))) { - skey = g_malloc0 (strlen (key) + 1); - g_utf8_strncpy (skey, title + (start - temp), g_utf8_strlen (key, -1)); + size_t utf8_len = g_utf8_strlen (key, -1); + if (!len) + len = strlen (key); + skey = g_malloc0 (len + 1); + g_utf8_strncpy (skey, title + (start - temp), utf8_len); parts = g_strsplit (title, skey, 2); if (parts && parts[0] && parts[1]) desc_title = g_markup_printf_escaped ("%s%s%s", @@ -547,10 +552,14 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, desc_title = g_markup_escape_text (title, -1); if (desc_title) + { desc = g_strdup_printf ("%s\n%s", desc_title, desc_uri); + g_free (desc_uri); + g_free (desc_title); + } else - desc = g_strdup_printf ("%s", desc_uri); + desc = desc_uri; g_object_set (renderer, "markup", desc, "ellipsize-set", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); @@ -559,8 +568,6 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, g_free (title); g_free (key); g_free (desc); - g_free (desc_uri); - g_free (desc_title); } static gboolean @@ -579,14 +586,14 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion, gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); match = FALSE; - if (uri) + if (G_LIKELY (uri)) { temp = g_utf8_casefold (uri, -1); match = (strstr (temp, key) != NULL); g_free (temp); g_free (uri); - if (!match && title) + if (!match && G_LIKELY (title)) { temp = g_utf8_casefold (title, -1); match = (strstr (temp, key) != NULL); @@ -621,20 +628,6 @@ midori_location_action_set_item (MidoriLocationAction* location_action, FAVICON_COL, new_icon, -1); } -static gchar* -midori_location_action_format_uri (const gchar* uri) -{ - gchar* new_uri; - size_t len; - - new_uri = g_ascii_strdown (uri, -1); - len = strlen (new_uri); - - if (new_uri [len - 1] == '/') - new_uri [len - 1] = '\0'; - return new_uri; -} - /** * midori_location_action_iter_lookup: * @location_action: a #MidoriLocationAction @@ -653,46 +646,34 @@ midori_location_action_iter_lookup (MidoriLocationAction* location_action, { GtkTreeModel* model; gchar* path; - gchar* new_uri; - gchar* tmp_uri; - gboolean found; model = location_action->model; - found = FALSE; - - new_uri = midori_location_action_format_uri (uri); if (midori_location_action_is_frozen (location_action)) { - if ((path = g_hash_table_lookup (location_action->items, new_uri))) - { + gboolean found = FALSE; + if ((path = g_hash_table_lookup (location_action->items, uri))) if (!(found = gtk_tree_model_get_iter_from_string (model, iter, path))) - { - g_hash_table_remove (location_action->items, new_uri); - } - } + g_hash_table_remove (location_action->items, uri); + return found; } - else + + if (gtk_tree_model_get_iter_first (model, iter)) { - if (gtk_tree_model_get_iter_first (model, iter)) + gchar* tmp_uri = NULL; + do { - tmp_uri = NULL; - do - { - - gtk_tree_model_get (model, iter, URI_COL, &tmp_uri, -1); - found = !g_ascii_strncasecmp (new_uri, tmp_uri, strlen (new_uri)); - katze_assign (tmp_uri, NULL); - - if (found) - break; - } - while (gtk_tree_model_iter_next (model, iter)); + gint cmp; + gtk_tree_model_get (model, iter, URI_COL, &tmp_uri, -1); + cmp = strcmp (uri, tmp_uri); + g_free (tmp_uri); + if (!cmp) + return TRUE; } + while (gtk_tree_model_iter_next (model, iter)); } - g_free (new_uri); - return found; + return FALSE; } /** @@ -716,15 +697,13 @@ midori_location_action_iter_insert (MidoriLocationAction* location_action, if (!midori_location_action_iter_lookup (location_action, uri, iter)) { GtkTreeModel* model; - gchar* path; - gchar* new_uri; model = location_action->model; gtk_list_store_insert (GTK_LIST_STORE (model), iter, position); if (midori_location_action_is_frozen (location_action)) { - new_uri = midori_location_action_format_uri (uri); - path = gtk_tree_model_get_string_from_iter (model, iter); + gchar* new_uri = g_strdup (uri); + gchar* path = gtk_tree_model_get_string_from_iter (model, iter); g_hash_table_insert (location_action->items, new_uri, path); } return FALSE; diff --git a/tests/completion.c b/tests/completion.c index c99edeac..6b6879ee 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -28,13 +28,13 @@ static const CompletionItem items[] = { { "http://one.com", "One Two" }, /* Duplicate */ { "http://two.com", "Two" }, { "http://three.com", "Three" }, - { "http://one.com/one", "One one" }, - { "http://one.com/one/", "One off" }, /* Duplicate */ + { "http://one.com/one/", "One off" }, { "http://four.org", "One" }, { "https://four.org", "Four" }, { "ftp://four.org/", "Five" }, + { "http://muenchen.de/weißwürste/", "Münchner Weißwürste" }, /* Umlauts */ }; -static const guint items_n = 7; +static const guint items_n = 9; static void completion_count (void) @@ -94,12 +94,14 @@ static const gchar* tlds[] = { }; static const guint tlds_n = 6; static const gchar* files[] = { - "", "/", "/index.html", "/img.png", "/images", "/images/"/*, "/Images", "/IMAGES"*/ + "/", "/index.html", "/img.png", /*"/weißwürste",*/ "/images/" + /*, "/Images", "/IMAGES/"*/ }; -static const guint files_n = 4; /* 6; */ +static const guint files_n = 4; static const gchar* inputs[] = { - "http://www.one.com/index", "http://two.de/images", "http://six.com.au/img" + "http://www.one.com/index", "http://two.de/images", "http://six.com.au/img"/*, + "http://muenchen.de/weißwürste/"*/ }; static const gchar* additions[] = { "http://www.one.com/invention", "http://two.de/island", "http://six.com.au/ish" From 42a59b4eeeaa68d5df069fdc4f1bb3ad5a8cad4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 31 Mar 2009 23:41:23 +0200 Subject: [PATCH 0951/2970] Implement filter entry in the Cookie Manager --- extensions/cookie-manager.c | 296 +++++++++++++++++++++++++++++------- 1 file changed, 241 insertions(+), 55 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index af482a22..3fd813fd 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -13,6 +13,7 @@ #include #include #include +#include #define CM_DEBUG 0 @@ -23,6 +24,7 @@ enum { COL_NAME, COL_COOKIE, + COL_VISIBLE, N_COLUMNS }; @@ -33,9 +35,15 @@ typedef struct _CMData GtkWidget *panel_page; GtkWidget *desc_label; GtkWidget *delete_button; + GtkWidget *delete_popup_button; + GtkWidget *delete_all_button; + GtkWidget *expand_buttons[4]; GtkWidget *treeview; GtkTreeStore *store; + GtkTreeModel *filter; + + GtkWidget *filter_entry; GtkWidget *popup_menu; @@ -98,7 +106,7 @@ static void cm_refresh_store(CMData *cmdata) GtkTreeIter *parent_iter; SoupCookie *cookie; - g_object_ref(cmdata->store); + g_object_ref(cmdata->filter); gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), NULL); gtk_tree_store_clear(cmdata->store); @@ -124,6 +132,7 @@ static void cm_refresh_store(CMData *cmdata) gtk_tree_store_set(cmdata->store, parent_iter, COL_NAME, cookie->domain, COL_COOKIE, NULL, + COL_VISIBLE, TRUE, -1); g_hash_table_insert(parents, g_strdup(cookie->domain), parent_iter); @@ -133,12 +142,13 @@ static void cm_refresh_store(CMData *cmdata) gtk_tree_store_set(cmdata->store, &iter, COL_NAME, cookie->name, COL_COOKIE, cookie, + COL_VISIBLE, TRUE, -1); } g_hash_table_destroy(parents); - gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), GTK_TREE_MODEL(cmdata->store)); - g_object_unref(cmdata->store); + gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), GTK_TREE_MODEL(cmdata->filter)); + g_object_unref(cmdata->filter); } @@ -177,17 +187,42 @@ static gchar *cm_get_cookie_description_text(SoupCookie *cookie) } +static void cm_set_button_sensitiveness(CMData *cmdata, gboolean set) +{ + guint i, len; + gboolean expand_set = (gtk_tree_model_iter_n_children(cmdata->filter, NULL) > 0); + + gtk_widget_set_sensitive(cmdata->delete_popup_button, set); + gtk_widget_set_sensitive(cmdata->delete_button, set); + + gtk_widget_set_sensitive(cmdata->delete_all_button, expand_set); + len = G_N_ELEMENTS(cmdata->expand_buttons); + for (i = 0; i < len; i++) + { + gtk_widget_set_sensitive(cmdata->expand_buttons[i], expand_set); + } +} + + static void cm_tree_selection_changed_cb(GtkTreeSelection *selection, CMData *cmdata) { - GtkTreeIter iter; + GtkTreeIter iter, iter_store; GtkTreeModel *model; gchar *text; + gboolean valid = TRUE; + gboolean delete_possible = FALSE; SoupCookie *cookie; - gtk_tree_selection_get_selected(selection, &model, &iter); + if (! gtk_tree_selection_get_selected(selection, &model, &iter)) + valid = FALSE; + else + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), + &iter_store, &iter); - if (model != NULL && gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) + if (valid && gtk_tree_store_iter_is_valid(cmdata->store, &iter_store)) { + delete_possible = TRUE; + gtk_tree_model_get(model, &iter, COL_COOKIE, &cookie, -1); if (cookie != NULL) { @@ -195,16 +230,16 @@ static void cm_tree_selection_changed_cb(GtkTreeSelection *selection, CMData *cm gtk_label_set_markup(GTK_LABEL(cmdata->desc_label), text); - gtk_widget_set_sensitive(cmdata->delete_button, TRUE); - g_free(text); - return; } + else + valid = FALSE; } /* This is a bit hack'ish but we add some empty lines to get a minimum height of the * label at the bottom without any font size calculation. */ - gtk_label_set_text(GTK_LABEL(cmdata->desc_label), CM_EMPTY_LABEL_TEXT); - gtk_widget_set_sensitive(cmdata->delete_button, FALSE); + if (! valid) + gtk_label_set_text(GTK_LABEL(cmdata->desc_label), CM_EMPTY_LABEL_TEXT); + cm_set_button_sensitiveness(cmdata, delete_possible); } @@ -217,9 +252,8 @@ static gboolean cm_tree_button_press_event_cb(GtkWidget *widget, GdkEventButton GtkTreeIter iter; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - model = GTK_TREE_MODEL(cmdata->store); - if (gtk_tree_selection_get_selected(selection, NULL, &iter)) + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { /* double click on parent node expands/collapses it */ if (gtk_tree_model_iter_has_child(model, &iter)) @@ -237,6 +271,7 @@ static gboolean cm_tree_button_press_event_cb(GtkWidget *widget, GdkEventButton } } } + return FALSE; } @@ -290,6 +325,16 @@ static void cm_tree_popup_expand_activate_cb(GtkCheckMenuItem *item, CMData *cmd } +static void cm_store_remove(CMData *cmdata, GtkTreeIter *iter_model) +{ + GtkTreeIter iter_store; + + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(cmdata->filter), &iter_store, iter_model); + gtk_tree_store_remove(cmdata->store, &iter_store); +} + + static void cm_delete_cookie(GtkTreeModel *model, GtkTreeIter *child, CMData *cmdata) { SoupCookie *cookie; @@ -306,71 +351,110 @@ static void cm_delete_cookie(GtkTreeModel *model, GtkTreeIter *child, CMData *cm } -static void cm_button_delete_clicked_cb(GtkWidget *button, CMData *cmdata) +static void cm_button_delete_clicked_cb(GtkToolButton *button, CMData *cmdata) { - GtkTreeIter iter; + GtkTreeIter iter, iter_store, child; GtkTreeModel *model; GtkTreeSelection *selection; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cmdata->treeview)); - gtk_tree_selection_get_selected(selection, &model, &iter); + if (! gtk_tree_selection_get_selected(selection, &model, &iter)) + return; if (gtk_tree_model_iter_has_child(model, &iter)) { - gint i, n = gtk_tree_model_iter_n_children(model, &iter); - GtkTreeIter child; + GtkTreePath *path = gtk_tree_model_get_path(model, &iter); - for (i = 0; i < n; i++) + while (gtk_tree_model_iter_children(model, &child, &iter)) { - gtk_tree_model_iter_nth_child(model, &child, &iter, i); cm_delete_cookie(model, &child, cmdata); + cm_store_remove(cmdata, &child); + /* we retrieve again the iter at path because it got invalid by the delete operation */ + gtk_tree_model_get_iter(model, &iter, path); } - /* remove the parent */ - /* TODO does this really remove all children automatically? */ - gtk_tree_store_remove(cmdata->store, &iter); + gtk_tree_path_free(path); + /* remove/hide the parent */ + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(cmdata->filter), + &iter_store, &iter); + if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(cmdata->store), &iter_store)) + gtk_tree_store_set(cmdata->store, &iter_store, COL_VISIBLE, FALSE, -1); + else + cm_store_remove(cmdata, &iter); } else { - GtkTreePath *path = gtk_tree_model_get_path(model, &iter); + GtkTreePath *path_store, *path_model; + + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(cmdata->filter), + &iter_store, &iter); + path_store = gtk_tree_model_get_path(GTK_TREE_MODEL(cmdata->store), &iter_store); + path_model = gtk_tree_model_get_path(model, &iter); cm_delete_cookie(model, &iter, cmdata); - gtk_tree_store_remove(cmdata->store, &iter); + gtk_tree_store_remove(cmdata->store, &iter_store); /* check whether the parent still has children, otherwise delete it */ - if (gtk_tree_path_up(path)) + if (gtk_tree_path_up(path_store)) { - gtk_tree_model_get_iter(model, &iter, path); - if (! gtk_tree_model_iter_has_child(model, &iter)) + gtk_tree_model_get_iter(GTK_TREE_MODEL(cmdata->store), &iter_store, path_store); + if (! gtk_tree_model_iter_has_child(GTK_TREE_MODEL(cmdata->store), &iter_store)) /* remove the empty parent */ - gtk_tree_store_remove(cmdata->store, &iter); + gtk_tree_store_remove(cmdata->store, &iter_store); } - gtk_tree_path_free(path); + /* now for the filter model */ + if (gtk_tree_path_up(path_model)) + { + gtk_tree_model_get_iter(model, &iter, path_model); + if (! gtk_tree_model_iter_has_child(model, &iter)) + { + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(cmdata->filter), &iter_store, &iter); + /* hide the empty parent */ + gtk_tree_store_set(cmdata->store, &iter_store, COL_VISIBLE, FALSE, -1); + } + } + gtk_tree_path_free(path_store); + gtk_tree_path_free(path_model); } } static void cm_delete_all_cookies_real(CMData *cmdata) { - GSList *l; + GtkTreeIter iter, iter_store, child; + GtkTreePath *path_first, *path; + GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(cmdata->treeview)); - for (l = cmdata->cookies; l != NULL; l = g_slist_next(l)) + path_first = gtk_tree_path_new_first(); + while (gtk_tree_model_get_iter(model, &iter, path_first)) { - SoupCookie *cookie = l->data; - - cmdata->ignore_changed_count++; - soup_cookie_jar_delete_cookie(cmdata->jar, cookie); - /* the SoupCookie object is freed below when calling cm_free_cookie_list() */ + path = gtk_tree_model_get_path(model, &iter); + while (gtk_tree_model_iter_children(model, &child, &iter)) + { + cm_delete_cookie(model, &child, cmdata); + cm_store_remove(cmdata, &child); + /* we retrieve again the iter at path because it got invalid by the delete operation */ + gtk_tree_model_get_iter(model, &iter, path); + } + gtk_tree_path_free(path); + /* remove/hide the parent */ + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(cmdata->filter), + &iter_store, &iter); + if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(cmdata->store), &iter_store)) + gtk_tree_store_set(cmdata->store, &iter_store, COL_VISIBLE, FALSE, -1); + else + cm_store_remove(cmdata, &iter); } + gtk_tree_path_free(path_first); - gtk_tree_store_clear(cmdata->store); - cm_free_cookie_list(cmdata); + cm_set_button_sensitiveness(cmdata, FALSE); } -static void cm_button_delete_all_clicked_cb(GtkWidget *button, CMData *cmdata) +static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CMData *cmdata) { GtkWidget *dialog; - GtkWidget *toplevel = gtk_widget_get_toplevel(button); + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); dialog = gtk_message_dialog_new(GTK_WINDOW(toplevel), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -392,14 +476,18 @@ static void cm_button_delete_all_clicked_cb(GtkWidget *button, CMData *cmdata) static void cm_tree_drag_data_get_cb(GtkWidget *widget, GdkDragContext *drag_context, GtkSelectionData *data, guint info, guint ltime, CMData *cmdata) { - GtkTreeIter iter; - GtkTreeModel *model; + GtkTreeIter iter, iter_store; GtkTreeSelection *selection; + GtkTreeModel *model; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cmdata->treeview)); - gtk_tree_selection_get_selected(selection, &model, &iter); + if (! gtk_tree_selection_get_selected(selection, &model, &iter)) + return; - if (model != NULL && gtk_tree_store_iter_is_valid(GTK_TREE_STORE(model), &iter)) + gtk_tree_model_filter_convert_iter_to_child_iter( + GTK_TREE_MODEL_FILTER(model), &iter_store, &iter); + + if (gtk_tree_store_iter_is_valid(cmdata->store, &iter_store)) { SoupCookie *cookie; gchar *name, *text; @@ -422,8 +510,8 @@ static void cm_tree_drag_data_get_cb(GtkWidget *widget, GdkDragContext *drag_con static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, CMData *cmdata) { - GtkTreeModel *model; GtkTreeIter iter; + GtkTreeModel *model; if (gtk_tree_view_get_tooltip_context(GTK_TREE_VIEW(widget), &x, &y, keyboard_mode, &model, NULL, &iter)) @@ -450,6 +538,66 @@ static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolea #endif +static void cm_filter_tree(CMData *cmdata, const gchar *filter_text) +{ + GtkTreeIter iter, child; + GtkTreeModel *model; + gboolean show; + gboolean child_visible; + gint i, n; + gchar *name; + + model = GTK_TREE_MODEL(cmdata->store); + if (! gtk_tree_model_get_iter_first(model, &iter)) + return; + + do + { + if (gtk_tree_model_iter_has_child(model, &iter)) + { + child_visible = FALSE; + + n = gtk_tree_model_iter_n_children(model, &iter); + for (i = 0; i < n; i++) + { + gtk_tree_model_iter_nth_child(model, &child, &iter, i); + + gtk_tree_model_get(model, &child, COL_NAME, &name, -1); + show = filter_text == NULL || *filter_text == '\0' || strstr(name, filter_text); + g_free(name); + + if (show) + child_visible = TRUE; + + gtk_tree_store_set(cmdata->store, &child, COL_VISIBLE, show, -1); + } + gtk_tree_store_set(cmdata->store, &iter, COL_VISIBLE, child_visible, -1); + } + } + while (gtk_tree_model_iter_next(model, &iter)); +} + + +static void cm_filter_entry_changed_cb(GtkEditable *editable, CMData *cmdata) +{ + const gchar *text = gtk_entry_get_text(GTK_ENTRY(editable)); + + cm_filter_tree(cmdata, text); + + if (*text != '\0') + gtk_tree_view_expand_all(GTK_TREE_VIEW(cmdata->treeview)); + else + gtk_tree_view_collapse_all(GTK_TREE_VIEW(cmdata->treeview)); +} + + +static void cm_filter_entry_clear_icon_released_cb(GtkIconEntry *e, gint pos, gint btn, CMData *cmdata) +{ + if (pos == GTK_ICON_ENTRY_SECONDARY) + gtk_entry_set_text(GTK_ENTRY(e), ""); +} + + static void cm_tree_prepare(CMData *cmdata) { GtkCellRenderer *renderer; @@ -460,7 +608,7 @@ static void cm_tree_prepare(CMData *cmdata) GtkWidget *menu; cmdata->treeview = tree = gtk_tree_view_new(); - cmdata->store = gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, SOUP_TYPE_COOKIE); + cmdata->store = gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, SOUP_TYPE_COOKIE, G_TYPE_BOOLEAN); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( @@ -471,7 +619,7 @@ static void cm_tree_prepare(CMData *cmdata) gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree), TRUE); - gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tree), TRUE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(tree), COL_NAME); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(cmdata->store), COL_NAME, GTK_SORT_ASCENDING); @@ -479,8 +627,13 @@ static void cm_tree_prepare(CMData *cmdata) sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE); - gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(cmdata->store)); + /* setting filter and model */ + cmdata->filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(cmdata->store), NULL); + gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(cmdata->filter), COL_VISIBLE); + + gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(cmdata->filter)); g_object_unref(cmdata->store); + g_object_unref(cmdata->filter); /* signals */ g_signal_connect(sel, "changed", G_CALLBACK(cm_tree_selection_changed_cb), cmdata); @@ -513,6 +666,7 @@ static void cm_tree_prepare(CMData *cmdata) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(cm_button_delete_clicked_cb), cmdata); + cmdata->delete_popup_button = item; item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -524,6 +678,7 @@ static void cm_tree_prepare(CMData *cmdata) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(cm_tree_popup_expand_activate_cb), cmdata); + cmdata->expand_buttons[2] = item; item = gtk_image_menu_item_new_with_mnemonic(_("_Collapse All")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), @@ -531,6 +686,7 @@ static void cm_tree_prepare(CMData *cmdata) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(cm_tree_popup_collapse_activate_cb), cmdata); + cmdata->expand_buttons[3] = item; cmdata->popup_menu = menu; } @@ -568,6 +724,9 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori GtkWidget *tree_swin; GtkWidget *desc_swin; GtkWidget *toolbar; + GtkWidget *paned; + GtkWidget *filter_hbox; + GtkWidget *filter_label; GtkToolItem *toolitem; SoupSession *session; CMData *cmdata; @@ -595,6 +754,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_all_clicked_cb), cmdata); gtk_widget_show(GTK_WIDGET(toolitem)); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + cmdata->delete_all_button = GTK_WIDGET(toolitem); toolitem = gtk_separator_tool_item_new(); gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolitem), FALSE); @@ -607,12 +767,14 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_tree_popup_expand_activate_cb), cmdata); gtk_widget_show(GTK_WIDGET(toolitem)); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + cmdata->expand_buttons[0] = GTK_WIDGET(toolitem); toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_REMOVE); gtk_tool_item_set_tooltip_text(toolitem, _("Collapse All")); g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_tree_popup_collapse_activate_cb), cmdata); gtk_widget_show(GTK_WIDGET(toolitem)); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + cmdata->expand_buttons[1] = GTK_WIDGET(toolitem); cmdata->desc_label = gtk_label_new(CM_EMPTY_LABEL_TEXT); gtk_label_set_selectable(GTK_LABEL(cmdata->desc_label), TRUE); @@ -624,7 +786,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori desc_swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(desc_swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(desc_swin), GTK_SHADOW_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(desc_swin), GTK_SHADOW_NONE); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(desc_swin), cmdata->desc_label); gtk_widget_show(desc_swin); @@ -638,10 +800,34 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori gtk_container_add(GTK_CONTAINER(tree_swin), cmdata->treeview); gtk_widget_show(tree_swin); - cmdata->panel_page = gtk_vpaned_new(); - gtk_paned_pack1(GTK_PANED(cmdata->panel_page), tree_swin, TRUE, FALSE); - gtk_paned_pack2(GTK_PANED(cmdata->panel_page), desc_swin, FALSE, FALSE); - gtk_widget_show(cmdata->panel_page); + filter_label = gtk_label_new(_("Filter:")); + gtk_widget_show(filter_label); + + cmdata->filter_entry = gtk_icon_entry_new(); + gtk_widget_show(cmdata->filter_entry); + gtk_icon_entry_set_icon_from_stock(GTK_ICON_ENTRY(cmdata->filter_entry), + GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); + gtk_icon_entry_set_icon_highlight(GTK_ICON_ENTRY (cmdata->filter_entry), + GTK_ICON_ENTRY_SECONDARY, TRUE); + g_signal_connect(cmdata->filter_entry, "icon_released", + G_CALLBACK(cm_filter_entry_clear_icon_released_cb), NULL); + g_signal_connect(cmdata->filter_entry, "changed", G_CALLBACK(cm_filter_entry_changed_cb), cmdata); + g_signal_connect(cmdata->filter_entry, "activate", G_CALLBACK(cm_filter_entry_changed_cb), cmdata); + + filter_hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(filter_hbox), cmdata->filter_entry, TRUE, TRUE, 0); + gtk_widget_show(filter_hbox); + + paned = gtk_vpaned_new(); + gtk_paned_pack1(GTK_PANED(paned), tree_swin, TRUE, FALSE); + gtk_paned_pack2(GTK_PANED(paned), desc_swin, FALSE, FALSE); + gtk_widget_show(paned); + + cmdata->panel_page = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(cmdata->panel_page), filter_hbox, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(cmdata->panel_page), paned, TRUE, TRUE, 0); + gtk_widget_show(cmdata->panel_page); /* setup soup */ session = webkit_get_default_session(); @@ -698,7 +884,7 @@ MidoriExtension *extension_init(void) "name", _("Cookie Manager"), "description", _("List, view and delete cookies"), "version", "0.1", - "authors", "Enrico Tröger ", + "authors", "Enrico Tröger ", NULL); g_signal_connect(extension, "activate", G_CALLBACK(cm_activate_cb), NULL); From b2d14b5fc18e662b51fc808bfd8b979223891b5f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 1 Apr 2009 20:44:34 +0200 Subject: [PATCH 0952/2970] Remove inner border from the panel and leave it to child widgets --- midori/midori-browser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d1e8c217..a4d29655 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4043,7 +4043,6 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); browser->panel = g_object_new (MIDORI_TYPE_PANEL, - "shadow-type", GTK_SHADOW_IN, "menu", browser->menu_tools, NULL); g_signal_connect (browser->panel, "notify::right-aligned", From 62eff73c30c9bdd9582a0bd45d5e0db193c11a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Wed, 1 Apr 2009 22:14:11 +0200 Subject: [PATCH 0953/2970] Update Portuguese translation --- po/pt_PT.po | 808 ++++++++++++++++++++++++++++------------------------ 1 file changed, 431 insertions(+), 377 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 56203892..c353688f 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.4\n" +"Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-03 00:58+0100\n" +"POT-Creation-Date: 2009-03-22 22:19+0100\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese \n" @@ -20,11 +20,11 @@ msgid "Lightweight web browser" msgstr "Navegador Web leve" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1596 -#: ../midori/main.c:1702 -#: ../midori/main.c:1711 -#: ../midori/main.c:1722 -#: ../midori/midori-websettings.c:267 +#: ../midori/main.c:1580 +#: ../midori/main.c:1672 +#: ../midori/main.c:1681 +#: ../midori/main.c:1692 +#: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -32,706 +32,701 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador Web" -#: ../midori/main.c:106 +#: ../midori/main.c:103 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não foi carregada: %s\n" -#: ../midori/main.c:161 +#: ../midori/main.c:158 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:168 -#: ../midori/main.c:238 +#: ../midori/main.c:165 +#: ../midori/main.c:235 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração inválido '%s'" -#: ../midori/main.c:480 +#: ../midori/main.c:477 msgid "File not found." msgstr "Ficheiro não encontrado." -#: ../midori/main.c:488 -#: ../midori/main.c:497 +#: ../midori/main.c:485 +#: ../midori/main.c:494 msgid "Malformed document." msgstr "Documento mal formado." -#: ../midori/main.c:519 +#: ../midori/main.c:516 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" -#: ../midori/main.c:551 +#: ../midori/main.c:548 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar a declaração da base de dados: %s\n" -#: ../midori/main.c:605 +#: ../midori/main.c:602 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" -#: ../midori/main.c:629 +#: ../midori/main.c:626 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falha ao limpar histórico: %s\n" -#: ../midori/main.c:652 -#: ../midori/main.c:686 -#: ../midori/main.c:702 +#: ../midori/main.c:649 +#: ../midori/main.c:683 +#: ../midori/main.c:699 #, c-format msgid "Failed to add history item: %s\n" msgstr "Falha ao adicionar histórico: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:882 +#: ../midori/main.c:879 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico antigo: %s\n" -#: ../midori/main.c:910 +#: ../midori/main.c:907 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi guardada. %s" -#: ../midori/main.c:939 +#: ../midori/main.c:936 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram guardados. %s" -#: ../midori/main.c:1069 +#: ../midori/main.c:1066 #: ../midori/sokoke.c:617 #, c-format msgid "Writing failed." msgstr "Falhou escrita." -#: ../midori/main.c:1090 -#: ../midori/main.c:1117 -#: ../midori/main.c:1145 +#: ../midori/main.c:1087 +#: ../midori/main.c:1114 +#: ../midori/main.c:1142 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram guardados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1169 -#: ../midori/main.c:1193 +#: ../midori/main.c:1166 +#: ../midori/main.c:1190 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:1224 -#: ../midori/midori-preferences.c:404 -msgid "Transfers" -msgstr "Transferências" - -#: ../midori/main.c:1265 +#: ../midori/main.c:1261 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:1398 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +#: ../midori/main.c:1377 +msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:1413 +#: ../midori/main.c:1392 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1417 +#: ../midori/main.c:1396 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:1422 +#: ../midori/main.c:1401 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1596 +#: ../midori/main.c:1580 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1628 -#: ../midori/gjs.c:514 +#: ../midori/main.c:1603 +#: ../midori/gjs.c:515 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1651 +#: ../midori/main.c:1626 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1653 +#: ../midori/main.c:1628 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1655 +#: ../midori/main.c:1630 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1699 +#: ../midori/main.c:1669 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1723 +#: ../midori/main.c:1693 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1695 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1752 +#: ../midori/main.c:1722 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas que não está respondendo.\n" -#: ../midori/main.c:1820 +#: ../midori/main.c:1772 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1832 +#: ../midori/main.c:1784 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1847 +#: ../midori/main.c:1799 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1860 +#: ../midori/main.c:1812 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1873 +#: ../midori/main.c:1825 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1885 +#: ../midori/main.c:1837 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1901 +#: ../midori/main.c:1853 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-browser.c:277 -#: ../midori/midori-browser.c:3055 -#: ../midori/midori-browser.c:3061 +#: ../midori/midori-browser.c:278 +#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3268 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:288 -#: ../midori/midori-browser.c:3058 +#: ../midori/midori-browser.c:289 +#: ../midori/midori-browser.c:3265 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:350 +#: ../midori/midori-browser.c:351 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:375 +#: ../midori/midori-browser.c:376 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:552 +#: ../midori/midori-browser.c:553 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:555 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:584 +#: ../midori/midori-browser.c:585 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:597 +#: ../midori/midori-browser.c:598 #: ../midori/midori-searchaction.c:855 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:616 +#: ../midori/midori-browser.c:617 #: ../midori/midori-searchaction.c:869 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:635 +#: ../midori/midori-browser.c:636 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:640 -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:641 +#: ../midori/midori-browser.c:682 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:761 +#: ../midori/midori-browser.c:762 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1372 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2634 +#: ../midori/midori-browser.c:2837 #: ../panels/midori-bookmarks.c:776 #: ../panels/midori-history.c:810 msgid "Open all in _Tabs" msgstr "Abrir todas em _Separadores" -#: ../midori/midori-browser.c:2641 +#: ../midori/midori-browser.c:2844 #: ../panels/midori-bookmarks.c:782 #: ../panels/midori-history.c:816 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:2644 +#: ../midori/midori-browser.c:2847 #: ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:818 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" -#: ../midori/midori-browser.c:2794 +#: ../midori/midori-browser.c:3001 msgid "A lightweight web browser." msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:2802 +#: ../midori/midori-browser.c:3009 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:2989 +#: ../midori/midori-browser.c:3196 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:2992 +#: ../midori/midori-browser.c:3199 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:2995 +#: ../midori/midori-browser.c:3202 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:2998 +#: ../midori/midori-browser.c:3205 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3208 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:3003 +#: ../midori/midori-browser.c:3210 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3211 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:3006 +#: ../midori/midori-browser.c:3213 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3214 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:3010 +#: ../midori/midori-browser.c:3217 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3220 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:3015 +#: ../midori/midori-browser.c:3222 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3018 +#: ../midori/midori-browser.c:3225 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:3021 -#: ../midori/midori-browser.c:3024 +#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3231 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:3027 +#: ../midori/midori-browser.c:3234 msgid "Paste text from the clipboard" msgstr "Colar itens da área de transferência" -#: ../midori/midori-browser.c:3030 +#: ../midori/midori-browser.c:3237 msgid "Delete the selected text" msgstr "Eliminar o texto seleccionado" -#: ../midori/midori-browser.c:3033 +#: ../midori/midori-browser.c:3240 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:3036 +#: ../midori/midori-browser.c:3243 msgid "Find a word or phrase in the page" msgstr "Localizar uma palavra ou frase na página" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3245 msgid "Find _Next" msgstr "Localizar _Próxima" -#: ../midori/midori-browser.c:3039 +#: ../midori/midori-browser.c:3246 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar próxima ocorrência da palavra ou frase" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3248 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:3042 +#: ../midori/midori-browser.c:3249 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocurrência anterior de uma palavra ou frase" -#: ../midori/midori-browser.c:3045 +#: ../midori/midori-browser.c:3252 msgid "_Quick Find" msgstr "Localização _Rápida" -#: ../midori/midori-browser.c:3046 +#: ../midori/midori-browser.c:3253 msgid "Quickly jump to a word or phrase" msgstr "Avanço rápido para palavra ou frase" -#: ../midori/midori-browser.c:3049 +#: ../midori/midori-browser.c:3256 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3258 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3052 +#: ../midori/midori-browser.c:3259 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:3064 +#: ../midori/midori-browser.c:3271 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:3067 +#: ../midori/midori-browser.c:3274 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:3070 +#: ../midori/midori-browser.c:3277 msgid "Reset the zoom level" msgstr "Restaurar Zoom" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3278 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:3073 +#: ../midori/midori-browser.c:3280 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:3076 -#: ../midori/midori-websettings.c:194 +#: ../midori/midori-browser.c:3283 +#: ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" -#: ../midori/midori-browser.c:3079 -#: ../midori/midori-websettings.c:195 +#: ../midori/midori-browser.c:3286 +#: ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-browser.c:3082 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3289 +#: ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:3085 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3292 +#: ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3088 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3295 +#: ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3091 -#: ../midori/midori-websettings.c:199 -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-browser.c:3298 +#: ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "Personalizar..." -#: ../midori/midori-browser.c:3094 -#: ../midori/midori-view.c:1077 +#: ../midori/midori-browser.c:3301 +#: ../midori/midori-view.c:1111 msgid "View _Source" msgstr "Ver _Origem" -#: ../midori/midori-browser.c:3095 +#: ../midori/midori-browser.c:3302 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:3097 +#: ../midori/midori-browser.c:3304 msgid "View Selection Source" msgstr "Ver Origem da Selecção" -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3305 msgid "View the source code of the selection" msgstr "Ver código fonte da selecção" -#: ../midori/midori-browser.c:3102 +#: ../midori/midori-browser.c:3309 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3311 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3314 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3317 msgid "Go forward to the next page" msgstr "Ir para página seguinte" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3320 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3322 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3323 msgid "Delete the contents of the trash" msgstr "Eliminar conteúdos do lixo" -#: ../midori/midori-browser.c:3118 -#: ../midori/midori-view.c:1049 +#: ../midori/midori-browser.c:3325 +#: ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Desfazer Fecho de Separador" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3326 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3330 #: ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3331 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:3126 +#: ../midori/midori-browser.c:3333 #: ../midori/midori-searchaction.c:464 msgid "_Manage Search Engines" msgstr "Gerir _Motores de Pesquisa" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3334 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:3131 +#: ../midori/midori-browser.c:3338 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:3132 +#: ../midori/midori-browser.c:3339 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3341 msgid "_Next Tab" msgstr "_Próximo Separador" -#: ../midori/midori-browser.c:3135 +#: ../midori/midori-browser.c:3342 msgid "Switch to the next tab" msgstr "Trocar para próximo separador" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3344 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3346 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3347 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3349 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:3143 +#: ../midori/midori-browser.c:3350 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3352 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:3146 +#: ../midori/midori-browser.c:3353 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:3149 +#: ../midori/midori-browser.c:3356 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:3156 +#: ../midori/midori-browser.c:3363 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:3157 +#: ../midori/midori-browser.c:3364 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:3162 +#: ../midori/midori-browser.c:3369 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:3163 +#: ../midori/midori-browser.c:3370 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:3166 +#: ../midori/midori-browser.c:3373 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:3374 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-browser.c:3377 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:3171 +#: ../midori/midori-browser.c:3378 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:3174 +#: ../midori/midori-browser.c:3381 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:3175 +#: ../midori/midori-browser.c:3382 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:3178 +#: ../midori/midori-browser.c:3385 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3386 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3389 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:3183 +#: ../midori/midori-browser.c:3390 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:3602 +#: ../midori/midori-browser.c:3821 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:3609 +#: ../midori/midori-browser.c:3828 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3830 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:3635 +#: ../midori/midori-browser.c:3854 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:3637 +#: ../midori/midori-browser.c:3856 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:3656 +#: ../midori/midori-browser.c:3875 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:3669 +#: ../midori/midori-browser.c:3888 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:3671 +#: ../midori/midori-browser.c:3890 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:3684 +#: ../midori/midori-browser.c:3903 #: ../midori/sokoke.c:772 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:3686 +#: ../midori/midori-browser.c:3905 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:3699 +#: ../midori/midori-browser.c:3918 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:3701 +#: ../midori/midori-browser.c:3920 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3864 +#: ../midori/midori-browser.c:4085 msgid "_Inline Find:" msgstr "Localizar:" -#: ../midori/midori-browser.c:3889 +#: ../midori/midori-browser.c:4110 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:4115 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:3899 +#: ../midori/midori-browser.c:4120 msgid "Match Case" msgstr "Maiúsculas e Minúsculas" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4128 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4138 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:4211 +#: ../midori/midori-browser.c:4444 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" #: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" #: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Se alinha painel lateral na direita" @@ -740,654 +735,684 @@ msgstr "Se alinha painel lateral na direita" msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-websettings.c:177 -#: ../midori/midori-view.c:1821 +#: ../midori/midori-websettings.c:179 +#: ../midori/midori-view.c:1888 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-websettings.c:178 -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:180 +#: ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "Página Inicial" -#: ../midori/midori-websettings.c:179 +#: ../midori/midori-websettings.c:181 msgid "Last open pages" msgstr "Últimas páginas abertas" -#: ../midori/midori-websettings.c:214 +#: ../midori/midori-websettings.c:216 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:215 +#: ../midori/midori-websettings.c:217 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:218 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:231 +#: ../midori/midori-websettings.c:233 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:232 +#: ../midori/midori-websettings.c:234 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:235 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:236 msgid "Both" msgstr "Texto e Ícones" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:237 msgid "Both horizontal" msgstr "Ambos na horizontal" -#: ../midori/midori-websettings.c:250 +#: ../midori/midori-websettings.c:252 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:251 +#: ../midori/midori-websettings.c:253 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:252 -#: ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:254 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:268 +#: ../midori/midori-websettings.c:270 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:269 +#: ../midori/midori-websettings.c:271 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:272 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:325 msgid "Remember last window size" msgstr "Lembrar último tamanho de janela" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:326 msgid "Whether to save the last window size" msgstr "Se guarda o último tamanho de janela" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:334 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:335 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:343 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:344 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:355 +#: ../midori/midori-websettings.c:369 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:356 +#: ../midori/midori-websettings.c:370 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:365 +#: ../midori/midori-websettings.c:379 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:380 msgid "The last saved panel page" msgstr "Última posição de painel de página guardada" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:388 msgid "Last Web search" msgstr "Última pesquisa na Web" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:389 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:398 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" msgstr "Se mostra a barra de menu" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" msgstr "Se mostra a barra de navegação" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" msgstr "Se mostra a barra de marcadores" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:425 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" msgstr "Se mostra o painel" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "Mostrar barra de transferências" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "Se mostra a barra de transferências" + +#: ../midori/midori-websettings.c:450 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" msgstr "Se mostra a barra de estado" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:460 msgid "Toolbar Style" msgstr "Estilo da Barra de Ferramentas" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:461 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:477 msgid "Show progress in location entry" msgstr "Mostrar evolução na entrada de localização" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:478 msgid "Whether to show loading progress in the location entry" msgstr "Se mostra evolução de carregamento na entrada de localização" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:486 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:487 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:495 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:496 msgid "Whether to make the sidepanel compact" msgstr "Se implica compactação do painel lateral" -#: ../midori/midori-websettings.c:491 +#: ../midori/midori-websettings.c:521 msgid "Load on Startup" msgstr "Carregar ao Iniciar" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:522 msgid "What to load on startup" msgstr "Carregar ao iniciar" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:532 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:547 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" -#: ../midori/midori-websettings.c:526 +#: ../midori/midori-websettings.c:556 msgid "Download Folder" msgstr "Pasta de Transferências" -#: ../midori/midori-websettings.c:527 +#: ../midori/midori-websettings.c:557 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:535 +#: ../midori/midori-websettings.c:569 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:536 +#: ../midori/midori-websettings.c:570 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:578 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:545 +#: ../midori/midori-websettings.c:579 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:587 msgid "Location entry Search" msgstr "Pesquisa de entrada Local" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:588 msgid "The search to perform inside the location entry" msgstr "A pesquisa a executar dentro da entrada local" -#: ../midori/midori-websettings.c:562 +#: ../midori/midori-websettings.c:596 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:597 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:573 +#: ../midori/midori-websettings.c:607 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:574 +#: ../midori/midori-websettings.c:608 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:582 +#: ../midori/midori-websettings.c:616 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:583 +#: ../midori/midori-websettings.c:617 msgid "Whether tabs have close buttons" msgstr "Se separadores têm botões para fechar" -#: ../midori/midori-websettings.c:592 +#: ../midori/midori-websettings.c:625 msgid "Open new pages in" msgstr "Abrir novas páginas em" -#: ../midori/midori-websettings.c:593 +#: ../midori/midori-websettings.c:626 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:603 +#: ../midori/midori-websettings.c:635 msgid "Open external pages in" msgstr "Abrir páginas externas em" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:636 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:649 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:618 +#: ../midori/midori-websettings.c:650 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:658 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:627 +#: ../midori/midori-websettings.c:659 msgid "Whether to open new tabs in the background" msgstr "Se abre novos separadores em segundo plano" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:667 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Se abre novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:645 +#: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" msgstr "Se abre janelas popup em separadores" -#: ../midori/midori-websettings.c:696 +#: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:697 +#: ../midori/midori-websettings.c:694 msgid "Whether to zoom text and images" msgstr "Se ajusta zoom de texto e imagens" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:709 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:715 +#: ../midori/midori-websettings.c:710 msgid "Whether to automatically find inline while typing" msgstr "Se deve encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:723 +#: ../midori/midori-websettings.c:718 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:724 +#: ../midori/midori-websettings.c:719 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:728 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:729 msgid "Accept cookies from the original website only" msgstr "Aceitar cookies apenas do sítio web original" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:737 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:747 +#: ../midori/midori-websettings.c:738 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:748 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:749 msgid "Whether the last visited pages are saved" msgstr "Se as últimas páginas visitadas são guardadas" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:757 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:758 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:766 msgid "Remember last form inputs" msgstr "Lembrar dados de formulários" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:767 msgid "Whether the last form inputs are saved" msgstr "Se os dados de formulário são guardados" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:775 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:776 msgid "Whether the last downloaded files are saved" msgstr "Se as últimas transferências são guardadas" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:786 msgid "Proxy Server" msgstr "Servidor Proxy" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:787 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:802 msgid "Detect proxy server automatically" msgstr "Detectar servidor proxy automaticamente" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:803 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Se deve detectar automaticamente o servidor proxy do ambiente" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:819 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:820 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:857 +#: ../midori/midori-websettings.c:836 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:858 +#: ../midori/midori-websettings.c:837 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:870 +#: ../midori/midori-websettings.c:845 msgid "Cache size" msgstr "Tamanho de cache" -#: ../midori/midori-websettings.c:871 +#: ../midori/midori-websettings.c:846 msgid "The allowed size of the cache" msgstr "Tamanho de cache permitido" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:630 +#: ../midori/midori-view.c:656 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:960 +#: ../midori/midori-view.c:988 msgid "Open _Link" msgstr "Abrir _Ligação" -#: ../midori/midori-view.c:962 +#: ../midori/midori-view.c:990 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:979 +#: ../midori/midori-view.c:1007 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:989 -msgid "_Save Link destination" -msgstr "De_stino para Guardar Ligação" - -#: ../midori/midori-view.c:997 +#: ../midori/midori-view.c:1016 +#: ../midori/midori-view.c:1030 msgid "_Download Link destination" msgstr "_Destino de Transferir Ligação" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1022 +msgid "_Save Link destination" +msgstr "De_stino para Guardar Ligação" + +#: ../midori/midori-view.c:1053 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:1028 +#: ../midori/midori-view.c:1062 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:1507 +#: ../midori/midori-view.c:1201 +msgid "Open or download file" +msgstr "Abrir ou transferir ficheiro" + +#: ../midori/midori-view.c:1210 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Tipo de ficheiro: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1214 +#, c-format +msgid "Open %s" +msgstr "Abrir %s" + +#: ../midori/midori-view.c:1610 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:1664 -msgid "Source" -msgstr "Origem" - -#: ../midori/midori-view.c:1688 +#: ../midori/midori-view.c:1755 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:1704 +#: ../midori/midori-view.c:1771 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" -#: ../midori/midori-preferences.c:93 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Preferências para %s" #. Page "General" -#: ../midori/midori-preferences.c:390 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Geral" -#: ../midori/midori-preferences.c:391 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Início" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Usar página actual como página inicial" + +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Transferências" + #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:462 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:463 msgid "Font settings" msgstr "Definições de fontes" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:465 msgid "Default Font Family" msgstr "Família de Fontes Padrão" -#: ../midori/midori-preferences.c:449 +#: ../midori/midori-preferences.c:471 msgid "The default font size used to display text" msgstr "O tamanho padrão de fonte para apresentar texto" -#: ../midori/midori-preferences.c:452 +#: ../midori/midori-preferences.c:474 msgid "Minimum Font Size" msgstr "Tmanho Mínimo de Fonte" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:477 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo de fonte para apresentar texto" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:484 msgid "Encoding" msgstr "Codificação" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:487 msgid "The character encoding to use by default" msgstr "A codificação de caracteres preferida" #. Page "Behavior" -#: ../midori/midori-preferences.c:472 +#: ../midori/midori-preferences.c:494 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:495 msgid "Features" msgstr "Funções" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:498 #: ../extensions/statusbar-features.c:42 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:499 msgid "Load and display images automatically" msgstr "Carregar e apresentar automaticamente as imagens " -#: ../midori/midori-preferences.c:480 +#: ../midori/midori-preferences.c:502 msgid "Shrink images automatically" msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:481 +#: ../midori/midori-preferences.c:503 msgid "Automatically shrink standalone images to fit" msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:506 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-preferences.c:485 +#: ../midori/midori-preferences.c:507 msgid "Whether background images should be printed" msgstr "Se imagens em segundo plano devem ser impressas" -#: ../midori/midori-preferences.c:488 +#: ../midori/midori-preferences.c:510 msgid "Resizable text areas" msgstr "Áreas de texto dimensionáveis" -#: ../midori/midori-preferences.c:489 +#: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" msgstr "Se as áreas de texto são redimensionáveis" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:514 #: ../extensions/statusbar-features.c:49 msgid "Enable scripts" msgstr "Activar argumentos" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:515 msgid "Enable embedded scripting languages" msgstr "Activar argumentos de idiomas incorporados" -#: ../midori/midori-preferences.c:496 +#: ../midori/midori-preferences.c:518 #: ../extensions/statusbar-features.c:56 msgid "Enable plugins" msgstr "Activar plugins" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:519 msgid "Enable embedded plugin objects" msgstr "Activar plugin de objectos incorporados" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:522 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegalda" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:523 msgid "Enforce a video dot density of 96 DPI" msgstr "Forçar densidade de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:504 +#: ../midori/midori-preferences.c:526 msgid "Enable developer tools" msgstr "Activar ferramentas de desenvolvimento" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:527 msgid "Enable special extensions for developers" msgstr "Activar extensões especiais de desenvolvimento" #. Page "Interface" -#: ../midori/midori-preferences.c:517 +#: ../midori/midori-preferences.c:539 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:540 msgid "Navigationbar" msgstr "Barra de Navegação" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:549 msgid "Browsing" msgstr "Navegar" -#: ../midori/midori-preferences.c:564 -#: ../midori/midori-preferences.c:565 +#. Page "Network" +#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:580 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:592 +#: ../midori/midori-preferences.c:607 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:599 +#: ../midori/midori-preferences.c:612 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:613 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:619 -#: ../midori/midori-preferences.c:631 +#: ../midori/midori-preferences.c:626 +#: ../midori/midori-preferences.c:636 msgid "days" msgstr "dias" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:629 #: ../panels/midori-history.c:104 msgid "History" msgstr "Histórico" #: ../midori/midori-searchaction.c:455 -#: ../katze/katze-arrayaction.c:279 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Vazio" @@ -1473,42 +1498,52 @@ msgstr "Separadores e Janelas Fe_chadas" msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 +#: ../midori/gjs.c:743 +#: ../midori/gjs.c:833 #, c-format msgid "%s has no property '%s'" msgstr "%s não tem a propriedade '%s'" -#: ../midori/gjs.c:878 +#: ../midori/gjs.c:879 #, c-format msgid "%s cannot be assigned to %s.%s" msgstr "Não pode assinar %s para %s.%s" -#: ../midori/gjs.c:888 +#: ../midori/gjs.c:889 #, c-format msgid "%s.%s cannot be accessed" msgstr "%s. Não pode aceder a %s" -#: ../panels/midori-addons.c:97 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Argumentos de Utilizador" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../panels/midori-addons.c:1005 +#: ../panels/midori-addons.c:922 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activar" -#: ../panels/midori-addons.c:1014 -#: ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:923 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Activar" + +#: ../panels/midori-addons.c:932 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Desactivar" +#: ../panels/midori-addons.c:933 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Desactivar" + #: ../panels/midori-bookmarks.c:103 msgid "Bookmarks" msgstr "Marcadores" @@ -1576,11 +1611,16 @@ msgstr "Ontem" msgid "Plugins" msgstr "Plugins" -#: ../katze/katze-http-auth.c:101 +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../katze/katze-http-auth.c:97 msgid "Authentication Required" msgstr "Autenticação Necessária " -#: ../katze/katze-http-auth.c:117 +#: ../katze/katze-http-auth.c:113 msgid "" "A username and a password are required\n" "to open this location:" @@ -1588,11 +1628,11 @@ msgstr "" "Precisa de um nome de utilizador e uma palavra-passe\n" "para abrir esta localização:" -#: ../katze/katze-http-auth.c:131 +#: ../katze/katze-http-auth.c:127 msgid "Username" msgstr "Nome de Utilizador" -#: ../katze/katze-http-auth.c:142 +#: ../katze/katze-http-auth.c:138 msgid "Password" msgstr "Palavra-passe" @@ -1625,6 +1665,18 @@ msgstr "Escolha ficheiro" msgid "Choose folder" msgstr "Escolha pasta" +#: ../extensions/colorful-tabs.c:97 +msgid "Tint tabs distinctly" +msgstr "Cor distinta de separadores" + +#: ../extensions/colorful-tabs.c:133 +msgid "Colorful Tabs" +msgstr "Separadores Coloridos" + +#: ../extensions/colorful-tabs.c:134 +msgid "Tint each tab distinctly" +msgstr "Cor distinta para cada separador" + #: ../extensions/mouse-gestures/main.c:176 msgid "Mouse Gestures" msgstr "Gestos de Rato" @@ -1651,6 +1703,8 @@ msgstr "Imagens" msgid "Scripts" msgstr "Argumentos" +#~ msgid "Source" +#~ msgstr "Origem" #~ msgid "URIs" #~ msgstr "URIs" #~ msgid "[URIs]" From 86292d26f91647acf11562583afb26ded57d3716 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 1 Apr 2009 23:53:45 +0200 Subject: [PATCH 0954/2970] Check if we really have a view, it might be invisible --- midori/midori-browser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index a4d29655..56fd4250 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3128,7 +3128,9 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, const gchar* title; gchar* window_title; - view = midori_browser_get_current_tab (browser); + if (!(view = midori_browser_get_current_tab (browser))) + return; + uri = midori_view_get_display_uri (MIDORI_VIEW (view)); action = _action_by_name (browser, "Location"); midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri); From 2d0e3b4c7ec97b682f1aa91ba4658ba4b0874721 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 2 Apr 2009 00:02:58 +0200 Subject: [PATCH 0955/2970] Don't try to check the prefix of a NULL URI --- midori/midori-view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7d710178..4c6fcf5e 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2395,6 +2395,8 @@ midori_view_can_view_source (MidoriView* view) && !g_strrstr (view->mime_type, "xml")) return FALSE; + if (!uri) + return FALSE; if (g_str_has_prefix (uri, "http://") || g_str_has_prefix (uri, "https://")) return TRUE; if (g_str_has_prefix (uri, "file://")) From 406942594aa76eb35ffa9e48312036633b0efb50 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 2 Apr 2009 22:48:07 +0200 Subject: [PATCH 0956/2970] Allow opening data URIs from the location entry --- midori/sokoke.c | 4 +++- tests/magic-uri.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index dcdfd789..98b59ffe 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -221,7 +221,9 @@ sokoke_magic_uri (const gchar* uri, katze_array_is_a (search_engines, KATZE_TYPE_ITEM), NULL); /* Just return if it's a javascript: or mailto: uri */ - if (g_str_has_prefix (uri, "javascript:") || g_str_has_prefix (uri, "mailto:")) + if (g_str_has_prefix (uri, "javascript:") + || g_str_has_prefix (uri, "mailto:") + || g_str_has_prefix (uri, "data:")) return g_strdup (uri); /* Add file:// if we have a local path */ if (g_path_is_absolute (uri)) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index f03a0a8c..4611959f 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -137,6 +137,8 @@ magic_uri_pseudo (void) { test_input ("javascript:alert(1)", "javascript:alert(1)"); test_input ("mailto:christian@twotoasts.de", "mailto:christian@twotoasts.de"); + test_input ("data:text/html;charset=utf-8,TestTest", + "data:text/html;charset=utf-8,TestTest"); } static void From 03f644ab1d4ddbb66a9ef332de8cc0a08e6f0de5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Apr 2009 01:32:02 +0200 Subject: [PATCH 0957/2970] Make sure we always save the main bookmark folder --- midori/main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/midori/main.c b/midori/main.c index c5e8ccac..f15206a7 100644 --- a/midori/main.c +++ b/midori/main.c @@ -773,8 +773,9 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, KatzeArray* bookmarks); static void -midori_bookmarks_remove_item_cb (KatzeArray* bookmarks, - GObject* item); +midori_bookmarks_remove_item_cb (KatzeArray* folder, + GObject* item, + KatzeArray* bookmarks); static void midori_bookmarks_add_item_cb (KatzeArray* folder, @@ -798,7 +799,7 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, g_signal_connect_after (item, "add-item", G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); } g_signal_connect_after (item, "notify", @@ -806,8 +807,9 @@ midori_bookmarks_add_item_cb (KatzeArray* folder, } static void -midori_bookmarks_remove_item_cb (KatzeArray* bookmarks, - GObject* item) +midori_bookmarks_remove_item_cb (KatzeArray* folder, + GObject* item, + KatzeArray* bookmarks) { gchar* config_file; GError* error; @@ -1605,7 +1607,7 @@ main (int argc, g_signal_connect_after (bookmarks, "add-item", G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect_after (bookmarks, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); if (!katze_array_is_empty (bookmarks)) { i = 0; @@ -1616,7 +1618,7 @@ main (int argc, g_signal_connect_after (item, "add-item", G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks); g_signal_connect_after (item, "remove-item", - G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); + G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks); } g_signal_connect_after (item, "notify", G_CALLBACK (midori_bookmarks_notify_item_cb), bookmarks); From ab03bbb3c8aa0d47aa2c9e1a60f4b0b2d5352edc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Apr 2009 23:57:33 +0200 Subject: [PATCH 0958/2970] Update German translation --- po/de.po | 532 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 304 insertions(+), 228 deletions(-) diff --git a/po/de.po b/po/de.po index b8a97712..8311ed93 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.4\n" +"Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-22 22:19+0100\n" +"POT-Creation-Date: 2009-04-04 23:44+0200\n" "PO-Revision-Date: 2009-02-01 19:56+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -21,8 +21,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 -#: ../midori/main.c:1681 ../midori/main.c:1692 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1278 ../midori/main.c:1367 +#: ../midori/main.c:1375 ../midori/main.c:1386 #: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -31,92 +31,79 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:103 +#: ../midori/main.c:93 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:165 ../midori/main.c:235 +#: ../midori/main.c:155 ../midori/main.c:225 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "Datei nicht gefunden." - -#: ../midori/main.c:485 ../midori/main.c:494 -msgid "Malformed document." -msgstr "Fehlerhaftes Dokument" - -#: ../midori/main.c:516 +#: ../midori/main.c:326 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:358 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:412 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:436 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 +#: ../midori/main.c:459 ../midori/main.c:493 ../midori/main.c:509 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:688 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:716 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:936 +#: ../midori/main.c:745 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:1066 ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "Schreiben fehlgeschlagen." - -#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 +#: ../midori/main.c:764 ../midori/main.c:792 ../midori/main.c:821 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 ../midori/main.c:1190 +#: ../midori/main.c:844 ../midori/main.c:867 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:1261 +#: ../midori/main.c:938 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1377 +#: ../midori/main.c:1065 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -124,93 +111,106 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1392 +#: ../midori/main.c:1080 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1396 +#: ../midori/main.c:1084 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1401 +#: ../midori/main.c:1089 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1580 +#: ../midori/main.c:1278 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1603 ../midori/gjs.c:515 +#: ../midori/main.c:1301 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1626 +#: ../midori/main.c:1324 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1628 +#: ../midori/main.c:1326 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1630 +#: ../midori/main.c:1328 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1669 +#: ../midori/main.c:1364 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1693 +#: ../midori/main.c:1387 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1695 +#: ../midori/main.c:1389 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1722 +#: ../midori/main.c:1416 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1772 +#: ../midori/main.c:1466 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1784 +#: ../midori/main.c:1478 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1799 +#: ../midori/main.c:1493 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1812 +#: ../midori/main.c:1506 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1825 +#: ../midori/main.c:1519 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1531 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1853 +#: ../midori/main.c:1547 msgid "_Ignore" msgstr "_Ignorieren" -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Datei nicht gefunden." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Fehlerhaftes Dokument" + +#: ../midori/midori-array.c:336 ../midori/sokoke.c:614 +#, c-format +msgid "Writing failed." +msgstr "Schreiben fehlgeschlagen." + +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3286 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3283 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" @@ -244,11 +244,11 @@ msgstr "Lesezeichen bearbeiten" msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:856 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:870 msgid "_Address:" msgstr "_Adresse:" @@ -260,455 +260,455 @@ msgstr "_Ordner:" msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:758 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1537 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2841 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:806 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2848 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:812 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2851 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3005 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3013 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3214 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3217 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3220 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3223 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3226 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3228 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3229 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3231 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3232 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3235 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3238 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3240 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3243 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3228 ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3246 ../midori/midori-browser.c:3249 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3252 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3255 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3258 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3261 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3263 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3264 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3266 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3267 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3270 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3271 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3274 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3276 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3277 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3289 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3292 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3295 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3296 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3298 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:3283 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3301 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-browser.c:3286 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3304 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-browser.c:3289 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3307 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:3292 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3310 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3313 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3316 ../midori/midori-websettings.c:201 #: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:3301 ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3319 ../midori/midori-view.c:1111 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3320 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3322 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3323 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3327 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3329 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3332 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3335 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3338 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3340 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3341 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3343 ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3344 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3330 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3348 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3349 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3333 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3351 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3352 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3356 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3357 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3359 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3360 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3362 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3364 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3365 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3367 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3368 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3370 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3371 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3374 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3381 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3382 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3387 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3388 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3391 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3392 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3395 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3396 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3399 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3400 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3403 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3404 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3407 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3408 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3840 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3847 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3849 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3873 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3875 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3894 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:3907 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:3909 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3922 ../midori/sokoke.c:769 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:3924 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:3937 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:3939 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4106 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4131 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4136 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4141 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4149 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4159 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4465 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:227 ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:239 ../midori/midori-panel.c:240 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1915 msgid "Blank page" msgstr "Leere Seite" @@ -1176,32 +1176,37 @@ msgstr "Im Netz _suchen" msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1207 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1224 +#, c-format +msgid "File Type: '%s'" +msgstr "Dateityp: «%s»" + +#: ../midori/midori-view.c:1227 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1231 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1627 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1772 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1788 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1270,7 +1275,7 @@ msgstr "Verhalten" msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:51 msgid "Load images automatically" msgstr "Bilder automatisch laden" @@ -1302,7 +1307,7 @@ msgstr "Vergrößerbare Textfelder" msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:58 msgid "Enable scripts" msgstr "Skripte einschalten" @@ -1310,7 +1315,7 @@ msgstr "Skripte einschalten" msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:65 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" @@ -1373,31 +1378,31 @@ msgstr "Tage" msgid "History" msgstr "Verlauf" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:812 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:812 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:840 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:884 msgid "_Icon:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:898 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1078 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" @@ -1406,73 +1411,58 @@ msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:437 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:768 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:770 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:771 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:772 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:773 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:774 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:775 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:776 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:777 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:778 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:779 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:780 msgid "New _Window" msgstr "Neues _Fenster" -#: ../midori/gjs.c:743 ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s hat keine Eigenschaft »%s«" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s kann %s.%s nicht zugewiesen werden" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "Auf %s.%s kann nicht zugegriffen werden" - #: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Benutzerskripte" @@ -1541,25 +1531,25 @@ msgstr "Ausgewählten Verlaufseintrag löschen" msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Gestern" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 msgid "Plugins" msgstr "Zusatzmodule" @@ -1615,42 +1605,128 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" msgstr "Reiter unterschiedlich einfärben" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" msgstr "Farbige Reiter" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" -#: ../extensions/mouse-gestures/main.c:176 +#: ../extensions/cookie-manager.c:175 +msgid "At the end of the session" +msgstr "Am Ende der Sitzung" + +#: ../extensions/cookie-manager.c:178 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Domäne: %s\n" +"Name: %s\n" +"Wert: %s\n" +"Pfad: %s\n" +"Sicher: %s\n" +"Verfällt: %s" + +#: ../extensions/cookie-manager.c:183 +msgid "Yes" +msgstr "Ja" + +#: ../extensions/cookie-manager.c:183 +msgid "No" +msgstr "Nein" + +#: ../extensions/cookie-manager.c:463 +msgid "Do you really want to delete all cookies?" +msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" + +#: ../extensions/cookie-manager.c:465 +msgid "Question" +msgstr "Frage" + +#: ../extensions/cookie-manager.c:615 +msgid "Name" +msgstr "Name" + +#: ../extensions/cookie-manager.c:675 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:683 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:752 +msgid "Delete All" +msgstr "Alle löschen" + +#: ../extensions/cookie-manager.c:766 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:773 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:803 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager.c:840 ../extensions/cookie-manager.c:884 +msgid "Cookie Manager" +msgstr "Cookieverwaltung" + +#: ../extensions/cookie-manager.c:868 +msgid "_Cookie Manager" +msgstr "_Cookieverwaltung" + +#: ../extensions/cookie-manager.c:885 +msgid "List, view and delete cookies" +msgstr "Profildateien auflisten, anzeigen und löschen" + +#: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Mausgesten" -#: ../extensions/mouse-gestures/main.c:177 +#: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:127 ../extensions/page-holder.c:172 msgid "Pageholder" msgstr "Seitenhalter" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:156 msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/statusbar-features.c:40 +#: ../extensions/statusbar-features.c:49 msgid "Images" msgstr "Bilder" -#: ../extensions/statusbar-features.c:47 +#: ../extensions/statusbar-features.c:56 msgid "Scripts" msgstr "Skripte" +#~ msgid "%s has no property '%s'" +#~ msgstr "%s hat keine Eigenschaft »%s«" + +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s kann %s.%s nicht zugewiesen werden" + +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "Auf %s.%s kann nicht zugegriffen werden" + #~ msgid "Source" #~ msgstr "Quelltext" From 64b4762d20a11b2bd276ea754798c715c7598350 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 4 Apr 2009 23:57:53 +0200 Subject: [PATCH 0959/2970] Update French translation --- po/fr.po | 536 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 307 insertions(+), 229 deletions(-) diff --git a/po/fr.po b/po/fr.po index bc5bd1cc..3e2a64be 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-22 22:19+0100\n" +"POT-Creation-Date: 2009-04-04 23:44+0200\n" "PO-Revision-Date: 2009-03-24 08:46-0400\n" "Last-Translator: Pascal Gervais 2009\n" "Language-Team: French \n" @@ -23,8 +23,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 -#: ../midori/main.c:1681 ../midori/main.c:1692 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1278 ../midori/main.c:1367 +#: ../midori/main.c:1375 ../midori/main.c:1386 #: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -33,93 +33,80 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur internet" -#: ../midori/main.c:103 +#: ../midori/main.c:93 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:148 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:165 ../midori/main.c:235 +#: ../midori/main.c:155 ../midori/main.c:225 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "Fichier non trouvé." - -#: ../midori/main.c:485 ../midori/main.c:494 -msgid "Malformed document." -msgstr "Document mal formé." - -#: ../midori/main.c:516 +#: ../midori/main.c:326 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:358 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:412 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer de l'historique l'élément : %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:436 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 +#: ../midori/main.c:459 ../midori/main.c:493 ../midori/main.c:509 #, c-format msgid "Failed to add history item: %s\n" msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:688 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer de l'historique les anciens éléments : %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:716 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:936 +#: ../midori/main.c:745 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:1066 ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "L'écriture a échoué." - -#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 +#: ../midori/main.c:764 ../midori/main.c:792 ../midori/main.c:821 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 ../midori/main.c:1190 +#: ../midori/main.c:844 ../midori/main.c:867 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:1261 +#: ../midori/main.c:938 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1377 +#: ../midori/main.c:1065 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -128,95 +115,108 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1392 +#: ../midori/main.c:1080 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1396 +#: ../midori/main.c:1084 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1401 +#: ../midori/main.c:1089 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1580 +#: ../midori/main.c:1278 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1603 ../midori/gjs.c:515 +#: ../midori/main.c:1301 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1626 +#: ../midori/main.c:1324 msgid "Run the specified filename as javascript" msgstr "Exécuter le fichier spécifié en tant que javascript" -#: ../midori/main.c:1628 +#: ../midori/main.c:1326 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1630 +#: ../midori/main.c:1328 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1669 +#: ../midori/main.c:1364 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1693 +#: ../midori/main.c:1387 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1695 +#: ../midori/main.c:1389 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1722 +#: ../midori/main.c:1416 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1772 +#: ../midori/main.c:1466 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" -#: ../midori/main.c:1784 +#: ../midori/main.c:1478 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés : %s\n" -#: ../midori/main.c:1799 +#: ../midori/main.c:1493 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1812 +#: ../midori/main.c:1506 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1825 +#: ../midori/main.c:1519 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargé : %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1531 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1853 +#: ../midori/main.c:1547 msgid "_Ignore" msgstr "_Ignorer" -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Fichier non trouvé." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Document mal formé." + +#: ../midori/midori-array.c:336 ../midori/sokoke.c:614 +#, c-format +msgid "Writing failed." +msgstr "L'écriture a échoué." + +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3286 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3283 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" @@ -250,11 +250,11 @@ msgstr "Modifier le signet" msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:856 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:870 msgid "_Address:" msgstr "_Adresse :" @@ -267,34 +267,34 @@ msgstr "_Dossier :" msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:758 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1537 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2841 ../panels/midori-bookmarks.c:776 +#: ../panels/midori-history.c:806 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2848 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:812 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2851 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3005 msgid "A lightweight web browser." msgstr "Un navigateur internet léger." -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3013 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -302,422 +302,422 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3214 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3217 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3220 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3223 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3226 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3228 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3229 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3231 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3232 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3235 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3238 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3240 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3243 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3228 ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3246 ../midori/midori-browser.c:3249 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3252 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3255 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3258 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3261 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3263 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3264 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3266 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3267 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3270 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3271 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3274 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3276 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3277 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3289 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3292 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3295 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3296 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3298 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3283 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3301 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3286 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3304 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3289 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3307 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3292 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3310 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3313 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3316 ../midori/midori-websettings.c:201 #: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3301 ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3319 ../midori/midori-view.c:1111 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3320 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3322 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3323 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3327 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3329 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3332 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3335 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3338 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3340 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3341 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3343 ../midori/midori-view.c:1083 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3344 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3330 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3348 ../panels/midori-bookmarks.c:228 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3349 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3333 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3351 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3352 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3356 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3357 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3359 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3360 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3362 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3364 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3365 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3367 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3368 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3370 msgid "_Report a Bug" msgstr "_Rapporter une anomalie" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3371 msgid "Open Midori's bug tracker" msgstr "Ouvrir le gestionnaire d'anomalies de Midori" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3374 msgid "Show information about the program" msgstr "Afficher des informations concernant le programme" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3381 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3382 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3387 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3388 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3391 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3392 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3395 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3396 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3399 msgid "_Bookmarkbar" msgstr "Barre de _signets" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3400 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3403 msgid "_Transferbar" msgstr "Barre de _transferts" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3404 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3407 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3408 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3840 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3847 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3849 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3873 msgid "_Web Search..." msgstr "Recherche _internet..." -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3875 msgid "Run a web search" msgstr "Lancer une recherche sur l'internet" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3894 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:3907 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:3909 msgid "Reopen pages that you visited earlier" msgstr "Rouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3922 ../midori/sokoke.c:769 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:3924 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:3937 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:3939 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4106 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4131 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4136 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4141 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4149 msgid "Highlight Matches" msgstr "Résultats analogues en surbrillance" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4159 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4465 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:227 ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:239 ../midori/midori-panel.c:240 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1915 msgid "Blank page" msgstr "Page vierge" @@ -1039,7 +1039,8 @@ msgstr "Ouvrir les fenêtres surgissantes dans des onglets" #: ../midori/midori-websettings.c:677 msgid "Whether to open popup windows in tabs" -msgstr "Indique s'il faut ouvrir les fenêtres surgissantes (popup) dans des onglets" +msgstr "" +"Indique s'il faut ouvrir les fenêtres surgissantes (popup) dans des onglets" #: ../midori/midori-websettings.c:693 msgid "Zoom Text and Images" @@ -1190,32 +1191,37 @@ msgstr "_Chercher sur l'internet" msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1207 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1224 +#, c-format +msgid "File Type: '%s'" +msgstr "Type de fichier : « %s »" + +#: ../midori/midori-view.c:1227 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1231 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1627 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1772 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1788 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" @@ -1284,7 +1290,7 @@ msgstr "Comportement" msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:51 msgid "Load images automatically" msgstr "Charger les images" @@ -1314,9 +1320,9 @@ msgstr "Zones de texte redimensionnables" #: ../midori/midori-preferences.c:511 msgid "Whether text areas are resizable" -msgstr "Indique si les zones de texte peuvent être redimentionnées" +msgstr "Indique si les zones de texte peuvent être redimensionnées" -#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:58 msgid "Enable scripts" msgstr "Activer les scripts" @@ -1324,7 +1330,7 @@ msgstr "Activer les scripts" msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:65 msgid "Enable plugins" msgstr "Activer les greffons" @@ -1387,31 +1393,31 @@ msgstr "jours" msgid "History" msgstr "Historique" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:812 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:812 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:840 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:884 msgid "_Icon:" msgstr "_Icône :" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:898 msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1078 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" @@ -1420,73 +1426,58 @@ msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:437 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous utilisez Midori avec un compte superutilisateur !" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:768 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:770 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:771 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:772 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:773 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:774 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:775 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:776 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:777 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:778 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:779 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:780 msgid "New _Window" msgstr "Nouvelle _fenêtre" -#: ../midori/gjs.c:743 ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s n'a pas de propriété « %s »" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s ne peut être assigné à %s.%s" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s ne peut être accédé" - #: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Scripts utilisateur" @@ -1555,25 +1546,25 @@ msgstr "Supprimer l'élément sélectionné de l'historique" msgid "Clear the entire history" msgstr "Vider l'historique entier" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "Il y a une semaine" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "Il y a %d jours" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Hier" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 msgid "Plugins" msgstr "Greffons" @@ -1629,42 +1620,129 @@ msgstr "Choisissez un fichier" msgid "Choose folder" msgstr "Choisissez un répertoire" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" msgstr "Colorer les onglets" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" msgstr "Onglets colorés" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" -#: ../extensions/mouse-gestures/main.c:176 +#: ../extensions/cookie-manager.c:175 +msgid "At the end of the session" +msgstr "Au fin de la session" + +#: ../extensions/cookie-manager.c:178 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Hôte : %s\n" +"Nom : %s\n" +"Valeur : %s\n" +"Chemin : %s\n" +"Sécuritaire : %s\n" +"Expire : %s" + +#: ../extensions/cookie-manager.c:183 +msgid "Yes" +msgstr "Oui" + +#: ../extensions/cookie-manager.c:183 +msgid "No" +msgstr "Non" + +#: ../extensions/cookie-manager.c:463 +msgid "Do you really want to delete all cookies?" +msgstr "Ètes-vous certain de vouloir effacer tout les témoins ?" + +#: ../extensions/cookie-manager.c:465 +msgid "Question" +msgstr "Question" + +#: ../extensions/cookie-manager.c:615 +msgid "Name" +msgstr "Nom" + +#: ../extensions/cookie-manager.c:675 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:683 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:752 +msgid "Delete All" +msgstr "Supprimer tous" + +#: ../extensions/cookie-manager.c:766 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:773 +msgid "Collapse All" +msgstr "" + +# manque un raccourcis Alt+X +#: ../extensions/cookie-manager.c:803 +msgid "Filter:" +msgstr "Filtre :" + +#: ../extensions/cookie-manager.c:840 ../extensions/cookie-manager.c:884 +msgid "Cookie Manager" +msgstr "Gestionnaire de cookies" + +#: ../extensions/cookie-manager.c:868 +msgid "_Cookie Manager" +msgstr "Gestionnaire de _cookies" + +#: ../extensions/cookie-manager.c:885 +msgid "List, view and delete cookies" +msgstr "Lister, afficher et supprimer les témoins" + +#: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Mouvements de souris" -#: ../extensions/mouse-gestures/main.c:177 +#: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:127 ../extensions/page-holder.c:172 msgid "Pageholder" msgstr "Cadre de pages" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:156 msgid "_Pageholder" msgstr "C_adre de pages" -#: ../extensions/statusbar-features.c:40 +#: ../extensions/statusbar-features.c:49 msgid "Images" msgstr "Images" -#: ../extensions/statusbar-features.c:47 +#: ../extensions/statusbar-features.c:56 msgid "Scripts" msgstr "Scripts" +#~ msgid "%s has no property '%s'" +#~ msgstr "%s n'a pas de propriété « %s »" + +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s ne peut être assigné à %s.%s" + +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s ne peut être accédé" + #~ msgid "Source" #~ msgstr "Source" From ad8558ab4c7153c7a82b5167795e44b33c22eada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 5 Apr 2009 00:13:09 +0200 Subject: [PATCH 0960/2970] Implement stock items for Tab Panel and plugin panel --- extensions/tab-panel/main.c | 29 ++++++++++++++++++++++++++--- midori/midori-stock.h | 1 + midori/sokoke.c | 1 + panels/midori-plugins.c | 3 +-- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/extensions/tab-panel/main.c b/extensions/tab-panel/main.c index c0aea024..bcaf07d7 100644 --- a/extensions/tab-panel/main.c +++ b/extensions/tab-panel/main.c @@ -13,6 +13,8 @@ #include +#define STOCK_TAB_PANEL "tab-panel" + static void tab_panel_app_add_browser_cb (MidoriApp* app, MidoriBrowser* browser) @@ -26,7 +28,7 @@ tab_panel_app_add_browser_cb (MidoriApp* app, child = midori_view_new (NULL); gtk_widget_show (child); midori_panel_append_widget (MIDORI_PANEL (panel), child, - GTK_STOCK_INDEX, "Tab Panel", NULL); + STOCK_TAB_PANEL, _("Tab Panel"), NULL); } static void @@ -40,8 +42,29 @@ tab_panel_activate_cb (MidoriExtension* extension, MidoriExtension* extension_init (void) { - MidoriExtension* extension = g_object_new (TAB_PANEL_TYPE_EXTENSION, - "name", "Tab Panel", + MidoriExtension* extension; + GtkIconFactory* factory; + GtkIconSource* icon_source; + GtkIconSet* icon_set; + static GtkStockItem items[] = + { + { STOCK_TAB_PANEL, N_("T_ab Panel"), 0, 0, NULL }, + }; + + factory = gtk_icon_factory_new (); + gtk_stock_add (items, G_N_ELEMENTS (items)); + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, GTK_STOCK_INDEX); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, STOCK_TAB_PANEL, icon_set); + gtk_icon_set_unref (icon_set); + gtk_icon_factory_add_default (factory); + g_object_unref (factory); + + extension = g_object_new (TAB_PANEL_TYPE_EXTENSION, + "name", _("Tab Panel"), "description", "", "version", "0.1", "authors", "Christian Dywan ", diff --git a/midori/midori-stock.h b/midori/midori-stock.h index 36bb2129..3b8436e8 100644 --- a/midori/midori-stock.h +++ b/midori/midori-stock.h @@ -30,6 +30,7 @@ #define STOCK_STYLES "gnome-settings-theme" #define STOCK_TRANSFER "package" #define STOCK_TRANSFERS "package" +#define STOCK_PLUGINS GTK_STOCK_CONVERT #define STOCK_BOOKMARK_ADD "stock_add-bookmark" #define STOCK_HOMEPAGE GTK_STOCK_HOME diff --git a/midori/sokoke.c b/midori/sokoke.c index 98b59ffe..d0731931 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -776,6 +776,7 @@ sokoke_register_stock_items (void) { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, + { STOCK_PLUGINS, N_("P_lugins"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, }; diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c index 20b5ab03..f2938164 100644 --- a/panels/midori-plugins.c +++ b/panels/midori-plugins.c @@ -90,8 +90,7 @@ midori_plugins_get_label (MidoriViewable* viewable) static const gchar* midori_plugins_get_stock_id (MidoriViewable* viewable) { - /* FIXME: We need a dedicated stock id */ - return GTK_STOCK_CONVERT /* STOCK_PLUGINS */; + return STOCK_PLUGINS; } static GtkWidget* From 3eae091ebb529ed418dec0f82ec16ee988e5129f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Apr 2009 11:28:42 +0200 Subject: [PATCH 0961/2970] Only print if the browser is visible --- midori/midori-browser.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 56fd4250..c60b4cda 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1605,8 +1605,12 @@ static void _action_print_activate (GtkAction* action, MidoriBrowser* browser) { - GtkWidget* view = midori_browser_get_current_tab (browser); - if (view) + GtkWidget* view; + + if (!GTK_WIDGET_VISIBLE (browser)) + return; + + if ((view = midori_browser_get_current_tab (browser))) midori_view_print (MIDORI_VIEW (view)); } From eed273b35e060e91e3d6e018af62eca6c3782c84 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 5 Apr 2009 23:46:15 +0200 Subject: [PATCH 0962/2970] Fix memory leaks in a number of places --- extensions/statusbar-features.c | 1 + katze/katze-net.c | 3 ++- midori/main.c | 12 +++++++++++- midori/midori-array.c | 6 ++++-- panels/midori-addons.c | 1 + panels/midori-bookmarks.c | 17 ++++++++++++++++- panels/midori-history.c | 17 ++++++++++++++++- tests/browser.c | 1 + 8 files changed, 52 insertions(+), 6 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index d4792299..8eb65c69 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -68,6 +68,7 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, gtk_widget_show (button); gtk_widget_show (bbox); gtk_box_pack_start (GTK_BOX (statusbar), bbox, FALSE, FALSE, 3); + g_object_unref (settings); g_signal_connect (extension, "deactivate", G_CALLBACK (statusbar_features_deactivate_cb), bbox); diff --git a/katze/katze-net.c b/katze/katze-net.c index c699026d..8a82747b 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -557,11 +557,12 @@ katze_net_load_icon (KatzeNet* net, if (g_hash_table_lookup_extended (net->memory, icon_file, NULL, (gpointer)&pixbuf)) { + g_free (icon_file); if (pixbuf) g_object_ref (pixbuf); } else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL))) - ; + g_free (icon_file); /* If the called doesn't provide an icon callback, we assume there is no interest in loading an un-cached icon. */ else if (icon_cb) diff --git a/midori/main.c b/midori/main.c index f15206a7..4152661f 100644 --- a/midori/main.c +++ b/midori/main.c @@ -154,6 +154,7 @@ settings_new_from_file (const gchar* filename) else g_warning (_("Invalid configuration value '%s'"), property); } + g_free (pspecs); return settings; } @@ -188,10 +189,11 @@ settings_save_to_file (MidoriWebSettings* settings, } if (type == G_TYPE_PARAM_STRING) { - const gchar* string; + gchar* string; g_object_get (settings, property, &string, NULL); g_key_file_set_string (key_file, "settings", property, string ? string : ""); + g_free (string); } else if (type == G_TYPE_PARAM_INT) { @@ -224,6 +226,7 @@ settings_save_to_file (MidoriWebSettings* settings, else g_warning (_("Invalid configuration value '%s'"), property); } + g_free (pspecs); saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); return saved; @@ -266,6 +269,7 @@ search_engines_new_from_file (const gchar* filename, } katze_array_add_item (search_engines, item); } + g_free (pspecs); g_strfreev (engines); g_key_file_free (key_file); return search_engines; @@ -303,6 +307,7 @@ search_engines_save_to_file (KatzeArray* search_engines, g_free (value); } } + g_free (pspecs); saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); @@ -921,6 +926,8 @@ midori_app_add_browser_cb (MidoriApp* app, addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL); gtk_widget_show (addon); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + + g_object_unref (panel); } static void @@ -1241,7 +1248,9 @@ midori_load_session (gpointer data) katze_item_set_uri (item, homepage); g_free (homepage); } + g_object_unref (settings); katze_array_add_item (_session, item); + g_object_unref (item); } session = midori_browser_get_proxy_array (browser); @@ -1682,6 +1691,7 @@ main (int argc, #if HAVE_SQLITE settings = katze_object_get_object (app, "settings"); g_object_get (settings, "maximum-history-age", &max_history_age, NULL); + g_object_unref (settings); midori_history_terminate (db, max_history_age); #endif g_object_unref (app); diff --git a/midori/midori-array.c b/midori/midori-array.c index b1ed8750..af53f003 100644 --- a/midori/midori-array.c +++ b/midori/midori-array.c @@ -257,7 +257,8 @@ katze_item_to_data (KatzeItem* item) markup = g_strdup_printf ("\n%s%s%s\n", "" /* folded ? folded : "" */, title, desc, - g_string_free (_markup, FALSE)); + _markup->str); + g_string_free (_markup, TRUE); /* g_free (folded); */ g_free (title); g_free (desc); @@ -313,7 +314,8 @@ katze_array_to_xbel (KatzeArray* array, "\"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd\">\n", title, desc, - g_string_free (inner_markup, FALSE)); + inner_markup->str); + g_string_free (inner_markup, TRUE); g_free (title); g_free (desc); diff --git a/panels/midori-addons.c b/panels/midori-addons.c index dd987e34..122809e8 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -883,6 +883,7 @@ midori_addons_new (MidoriAddonKind kind, } g_signal_connect (monitor, "changed", G_CALLBACK (midori_addons_directory_monitor_changed), addons); + g_object_unref (directory); } g_slist_free (list); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index d4150077..a1de10d5 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -63,6 +63,9 @@ enum PROP_APP }; +static void +midori_bookmarks_finalize (GObject* object); + static void midori_bookmarks_set_property (GObject* object, guint prop_id, @@ -82,6 +85,7 @@ midori_bookmarks_class_init (MidoriBookmarksClass* class) GParamFlags flags; gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_bookmarks_finalize; gobject_class->set_property = midori_bookmarks_set_property; gobject_class->get_property = midori_bookmarks_get_property; @@ -691,6 +695,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + g_object_unref (settings); } i++; } @@ -707,6 +712,7 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + g_object_unref (settings); } } } @@ -888,7 +894,6 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) GtkCellRenderer* renderer_text; bookmarks->net = katze_net_new (); - /* FIXME: Dereference the net on finalization */ /* Create the treeview */ model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); @@ -926,6 +931,16 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks) bookmarks->treeview = treeview; } +static void +midori_bookmarks_finalize (GObject* object) +{ + MidoriBookmarks* bookmarks = MIDORI_BOOKMARKS (object); + + if (bookmarks->app) + g_object_unref (bookmarks->app); + g_object_unref (bookmarks->net); +} + /** * midori_bookmarks_new: * diff --git a/panels/midori-history.c b/panels/midori-history.c index 18718ce4..1bb75fb3 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -64,6 +64,9 @@ enum PROP_APP }; +static void +midori_history_finalize (GObject* object); + static void midori_history_set_property (GObject* object, guint prop_id, @@ -83,6 +86,7 @@ midori_history_class_init (MidoriHistoryClass* class) GParamFlags flags; gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = midori_history_finalize; gobject_class->set_property = midori_history_set_property; gobject_class->get_property = midori_history_get_property; @@ -495,7 +499,6 @@ midori_history_set_app (MidoriHistory* history, time_t now = time (NULL); gint64 day = sokoke_time_t_to_julian (&now); - /* FIXME: Dereference the app on finalization */ model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview)); midori_history_insert_item (history, GTK_TREE_STORE (model), NULL, KATZE_ITEM (g_object_ref (history->array)), day); @@ -721,6 +724,7 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + g_object_unref (settings); } i++; } @@ -737,6 +741,7 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + g_object_unref (settings); } } } @@ -957,6 +962,16 @@ midori_history_init (MidoriHistory* history) history->treeview = treeview; } +static void +midori_history_finalize (GObject* object) +{ + MidoriHistory* history = MIDORI_HISTORY (object); + + if (history->app) + g_object_unref (history->app); + g_object_unref (history->array); +} + /** * midori_history_new: * diff --git a/tests/browser.c b/tests/browser.c index f6b3ee37..1ee15369 100644 --- a/tests/browser.c +++ b/tests/browser.c @@ -43,6 +43,7 @@ browser_create (void) } g_list_free (actions); gtk_widget_destroy (GTK_WIDGET (browser)); + g_object_unref (app); } int From 1ddceece8f9af8bd624dbd8089ae8c4cfe4af6c3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 7 Apr 2009 02:39:11 +0200 Subject: [PATCH 0963/2970] Adjust mouse wheel zooming to do the same as keyboard shortcuts --- midori/midori-view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 4c6fcf5e..e2608a49 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -866,9 +866,11 @@ gtk_widget_scroll_event_cb (WebKitWebView* web_view, if (event->state & GDK_CONTROL_MASK) { if (event->direction == GDK_SCROLL_DOWN) - webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); + midori_view_set_zoom_level (view, + midori_view_get_zoom_level (view) - 0.25f); else if(event->direction == GDK_SCROLL_UP) - webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); + midori_view_set_zoom_level (view, + midori_view_get_zoom_level (view) + 0.25f); return TRUE; } else From bff4f9ddfe8652485d9d80a90aa04a4369f17148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 7 Apr 2009 21:59:04 +0200 Subject: [PATCH 0964/2970] Fix a leaked reference in the page holder --- extensions/page-holder.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/extensions/page-holder.c b/extensions/page-holder.c index 9ceb1963..a5435a71 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -23,12 +23,14 @@ page_holder_notebook_append_view (GtkWidget* notebook) { GtkWidget* view; MidoriBrowser* browser; + MidoriWebSettings *settings; GtkWidget* label; view = midori_view_new (NULL); browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); - midori_view_set_settings (MIDORI_VIEW (view), - MIDORI_WEB_SETTINGS (katze_object_get_object (browser, "settings"))); + settings = katze_object_get_object (browser, "settings"); + midori_view_set_settings (MIDORI_VIEW (view), settings); + g_object_unref (settings); gtk_widget_show (view); label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view)); return gtk_notebook_append_page (GTK_NOTEBOOK (notebook), view, label); @@ -127,6 +129,8 @@ page_holder_app_add_browser_cb (MidoriApp* app, STOCK_PAGE_HOLDER, _("Pageholder"), toolbar); g_signal_connect (extension, "deactivate", G_CALLBACK (page_holder_deactivate_cb), notebook); + + g_object_unref (panel); } static void @@ -141,6 +145,7 @@ page_holder_activate_cb (MidoriExtension* extension, i = 0; while ((browser = katze_array_get_nth_item (browsers, i++))) page_holder_app_add_browser_cb (app, browser, extension); + g_object_unref (browsers); g_signal_connect (app, "add-browser", G_CALLBACK (page_holder_app_add_browser_cb), extension); } From 3be7113946c83a01724bd19c04b7c2788a337843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 7 Apr 2009 22:02:19 +0200 Subject: [PATCH 0965/2970] Increase padding in the cookie manager and adjust the markup --- extensions/cookie-manager.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 3fd813fd..79f699e7 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -175,7 +175,8 @@ static gchar *cm_get_cookie_description_text(SoupCookie *cookie) expires = _("At the end of the session"); text = g_markup_printf_escaped( - _("Host: %s\nName: %s\nValue: %s\nPath: %s\nSecure: %s\nExpires: %s"), + _("Host: %s\nName: %s\nValue: %s\nPath: %s\n" + "Secure: %s\nExpires: %s"), cookie->domain, cookie->name, cookie->value, @@ -781,6 +782,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori gtk_label_set_line_wrap(GTK_LABEL(cmdata->desc_label), TRUE); gtk_label_set_line_wrap_mode(GTK_LABEL(cmdata->desc_label), PANGO_WRAP_CHAR); gtk_misc_set_alignment(GTK_MISC(cmdata->desc_label), 0, 0); + gtk_misc_set_padding(GTK_MISC(cmdata->desc_label), 3, 3); gtk_widget_show(cmdata->desc_label); desc_swin = gtk_scrolled_window_new(NULL, NULL); @@ -814,9 +816,9 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori g_signal_connect(cmdata->filter_entry, "changed", G_CALLBACK(cm_filter_entry_changed_cb), cmdata); g_signal_connect(cmdata->filter_entry, "activate", G_CALLBACK(cm_filter_entry_changed_cb), cmdata); - filter_hbox = gtk_hbox_new(FALSE, 3); - gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(filter_hbox), cmdata->filter_entry, TRUE, TRUE, 0); + filter_hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(filter_hbox), cmdata->filter_entry, TRUE, TRUE, 3); gtk_widget_show(filter_hbox); paned = gtk_vpaned_new(); @@ -825,7 +827,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori gtk_widget_show(paned); cmdata->panel_page = gtk_vbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(cmdata->panel_page), filter_hbox, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(cmdata->panel_page), filter_hbox, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(cmdata->panel_page), paned, TRUE, TRUE, 0); gtk_widget_show(cmdata->panel_page); @@ -840,6 +842,8 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori STOCK_COOKIE_MANAGER, _("Cookie Manager"), toolbar); g_signal_connect(ext, "deactivate", G_CALLBACK(cm_deactivate_cb), cmdata); + + g_object_unref(panel); } @@ -853,6 +857,7 @@ static void cm_activate_cb(MidoriExtension *extension, MidoriApp *app, gpointer i = 0; while ((browser = katze_array_get_nth_item(browsers, i++))) cm_app_add_browser_cb(app, browser, extension); + g_object_unref(browsers); g_signal_connect(app, "add-browser", G_CALLBACK(cm_app_add_browser_cb), extension); } From e90f5a16c81098d89fa9440d644772ece223d25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 7 Apr 2009 22:04:54 +0200 Subject: [PATCH 0966/2970] Apply a previously set filter when refreshing cookie list --- extensions/cookie-manager.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 79f699e7..8730b67d 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -55,6 +55,7 @@ typedef struct _CMData } CMData; static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); +static void cm_filter_tree(CMData *cmdata, const gchar *filter_text); #if CM_DEBUG @@ -105,6 +106,7 @@ static void cm_refresh_store(CMData *cmdata) GtkTreeIter iter; GtkTreeIter *parent_iter; SoupCookie *cookie; + const gchar *filter_text; g_object_ref(cmdata->filter); gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), NULL); @@ -149,6 +151,14 @@ static void cm_refresh_store(CMData *cmdata) gtk_tree_view_set_model(GTK_TREE_VIEW(cmdata->treeview), GTK_TREE_MODEL(cmdata->filter)); g_object_unref(cmdata->filter); + + /* if a filter is set, apply it again */ + filter_text = gtk_entry_get_text(GTK_ENTRY(cmdata->filter_entry)); + if (*filter_text != '\0') + { + cm_filter_tree(cmdata, filter_text); + gtk_tree_view_expand_all(GTK_TREE_VIEW(cmdata->treeview)); + } } From e993486594ad80233b19dfd8bd80de19c3a8e1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 7 Apr 2009 22:07:17 +0200 Subject: [PATCH 0967/2970] Make the cookie filter less restricitve Search case-insensitively and include domain names in the search --- extensions/cookie-manager.c | 40 +++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 8730b67d..2f853bd2 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -549,14 +549,40 @@ static gboolean cm_tree_query_tooltip(GtkWidget *widget, gint x, gint y, gboolea #endif +static gboolean cm_filter_match(const gchar *haystack, const gchar *needle) +{ + gchar *haystack_lowered, *needle_lowered; + gboolean result; + + /* empty strings always match */ + if (haystack == NULL || needle == NULL || *needle == '\0') + return TRUE; + + haystack_lowered = g_utf8_strdown(haystack, -1); + needle_lowered = g_utf8_strdown(needle, -1); + + /* if one of both could not be converted into lower case, skip those */ + if (haystack_lowered == NULL || needle_lowered == NULL) + return FALSE; + + result = (strstr(haystack_lowered, needle_lowered) != NULL); + + g_free(haystack_lowered); + g_free(needle_lowered); + + return result; +} + + static void cm_filter_tree(CMData *cmdata, const gchar *filter_text) { GtkTreeIter iter, child; GtkTreeModel *model; - gboolean show; + gboolean show_child, show_parent; gboolean child_visible; gint i, n; gchar *name; + gchar *domain; model = GTK_TREE_MODEL(cmdata->store); if (! gtk_tree_model_get_iter_first(model, &iter)) @@ -568,19 +594,22 @@ static void cm_filter_tree(CMData *cmdata, const gchar *filter_text) { child_visible = FALSE; + gtk_tree_model_get(model, &iter, COL_NAME, &domain, -1); + show_parent = cm_filter_match(domain, filter_text); + g_free(domain); n = gtk_tree_model_iter_n_children(model, &iter); for (i = 0; i < n; i++) { gtk_tree_model_iter_nth_child(model, &child, &iter, i); gtk_tree_model_get(model, &child, COL_NAME, &name, -1); - show = filter_text == NULL || *filter_text == '\0' || strstr(name, filter_text); + show_child = show_parent || cm_filter_match(name, filter_text); g_free(name); - if (show) + if (show_child) child_visible = TRUE; - gtk_tree_store_set(cmdata->store, &child, COL_VISIBLE, show, -1); + gtk_tree_store_set(cmdata->store, &child, COL_VISIBLE, show_child, -1); } gtk_tree_store_set(cmdata->store, &iter, COL_VISIBLE, child_visible, -1); } @@ -816,6 +845,9 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori gtk_widget_show(filter_label); cmdata->filter_entry = gtk_icon_entry_new(); + gtk_widget_set_tooltip_text(cmdata->filter_entry, + _("Enter a filter string to show only cookies whose name or domain " + "field match the entered filter")); gtk_widget_show(cmdata->filter_entry); gtk_icon_entry_set_icon_from_stock(GTK_ICON_ENTRY(cmdata->filter_entry), GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); From 7f85c28b928772688fcd1c8afb88a460dc7334ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Tue, 7 Apr 2009 22:16:15 +0200 Subject: [PATCH 0968/2970] Make it clear that Delete All only deletes visible cookies Delete All deletes either all cookies or only the visible cookies included in the filter if a filter is set. --- extensions/cookie-manager.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 2f853bd2..e506eed3 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -466,6 +466,7 @@ static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CMData *cmdat { GtkWidget *dialog; GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); + const gchar *filter_text; dialog = gtk_message_dialog_new(GTK_WINDOW(toplevel), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -477,6 +478,13 @@ static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CMData *cmdat /* steal Midori's icon :) */ gtk_window_set_icon_name(GTK_WINDOW(dialog), gtk_window_get_icon_name(GTK_WINDOW(toplevel))); + filter_text = gtk_entry_get_text(GTK_ENTRY(cmdata->filter_entry)); + if (*filter_text != '\0') + { + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), + _("Only the visible cookies are deleted which match the entered filter string.")); + } + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) cm_delete_all_cookies_real(cmdata); @@ -790,6 +798,9 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE); gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolitem), _("Delete All")); + gtk_tool_item_set_tooltip_text(toolitem, + _("Deletes all shown cookies. " + "If a filter is set, only those cookies are deleted which match the filter.")); gtk_tool_item_set_is_important(toolitem, TRUE); g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_all_clicked_cb), cmdata); gtk_widget_show(GTK_WIDGET(toolitem)); From 0ffda1fe2776a7bb9e99642e891ff206d50206e2 Mon Sep 17 00:00:00 2001 From: Faheem Pervez Date: Tue, 7 Apr 2009 23:23:27 +0200 Subject: [PATCH 0969/2970] Initizalize and deinitialize the osso context --- midori/main.c | 21 +++++++++++++++++++++ wscript | 2 ++ 2 files changed, 23 insertions(+) diff --git a/midori/main.c b/midori/main.c index 4152661f..6d92ba3b 100644 --- a/midori/main.c +++ b/midori/main.c @@ -49,6 +49,10 @@ #include #endif +#if HAVE_HILDON + #include +#endif + #define MIDORI_HISTORY_ERROR g_quark_from_string("MIDORI_HISTORY_ERROR") typedef enum @@ -1354,6 +1358,9 @@ main (int argc, sqlite3* db; gint max_history_age; #endif + #if HAVE_HILDON + osso_context_t* osso_context; + #endif #if ENABLE_NLS setlocale (LC_ALL, ""); @@ -1404,6 +1411,16 @@ main (int argc, if (run) return midori_run_script (uris ? *uris : NULL); + #if HAVE_HILDON + osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); + + if (!osso_context) + { + g_critical ("Error initializing OSSO D-Bus context - Midori"); + return 1; + } + #endif + app = midori_app_new (); /* FIXME: The app might be 'running' but actually showing a dialog after a crash, so running a new window isn't a good idea. */ @@ -1688,6 +1705,10 @@ main (int argc, gtk_main (); + #if HAVE_HILDON + osso_deinitialize (osso_context); + #endif + #if HAVE_SQLITE settings = katze_object_get_object (app, "settings"); g_object_get (settings, "maximum-history-age", &max_history_age, NULL); diff --git a/wscript b/wscript index 4ee9d820..51210817 100644 --- a/wscript +++ b/wscript @@ -149,6 +149,8 @@ def configure (conf): if option_enabled ('hildon'): check_pkg ('hildon-1', mandatory=False, var='HILDON') + if conf.env['HAVE_HILDON'] == 1: + check_pkg ('libosso', mandatory=False, var='HILDON') hildon = ['N/A','yes'][conf.env['HAVE_HILDON'] == 1] else: option_checkfatal ('hildon', 'Maemo integration') From ddf2f60e3f485d8b33d4e7b6c1eef86974ab6c04 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Apr 2009 19:28:36 +0200 Subject: [PATCH 0970/2970] Implement "-c" or "--config" to specify a different config folder If this option is specified the folder is used in place of the default ~/.config/midori including extension settings. --- midori/main.c | 17 +++++++++++++---- midori/midori-extension.c | 2 +- midori/sokoke.c | 28 ++++++++++++++++++++++++++++ midori/sokoke.h | 3 +++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/midori/main.c b/midori/main.c index 6d92ba3b..7943b970 100644 --- a/midori/main.c +++ b/midori/main.c @@ -65,10 +65,7 @@ typedef enum static gchar* build_config_filename (const gchar* filename) { - static gchar* path = NULL; - - if (!path) - path = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL); + const gchar* path = sokoke_set_config_dir (NULL); g_mkdir_with_parents (path, 0700); return g_build_filename (path, filename, NULL); } @@ -1325,6 +1322,7 @@ int main (int argc, char** argv) { + gchar* config; gboolean run; gboolean version; gchar** uris; @@ -1333,6 +1331,8 @@ main (int argc, GError* error; GOptionEntry entries[] = { + { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config, + N_("Use FOLDER as configuration folder"), N_("FOLDER") }, { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, { "version", 'V', 0, G_OPTION_ARG_NONE, &version, @@ -1373,6 +1373,7 @@ main (int argc, #endif /* Parse cli options */ + config = NULL; run = FALSE; version = FALSE; uris = NULL; @@ -1411,6 +1412,14 @@ main (int argc, if (run) return midori_run_script (uris ? *uris : NULL); + if (config && !g_path_is_absolute (config)) + { + g_critical (_("The specified configuration folder is invalid.")); + return 1; + } + sokoke_set_config_dir (config); + g_free (config); + #if HAVE_HILDON osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 99030c34..0bbcfef7 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -474,7 +474,7 @@ midori_extension_get_config_dir (MidoriExtension* extension) if (!extension->priv->config_dir) extension->priv->config_dir = g_build_filename ( - g_get_user_config_dir (), PACKAGE_NAME, "extensions", + sokoke_set_config_dir (NULL), "extensions", extension->priv->name, NULL); return extension->priv->config_dir; diff --git a/midori/sokoke.c b/midori/sokoke.c index d0731931..c9639ca5 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -801,3 +801,31 @@ sokoke_register_stock_items (void) gtk_icon_factory_add_default (factory); g_object_unref (factory); } + +/** + * sokoke_set_config_dir: + * @new_config_dir: an absolute path, or %NULL + * + * Retrieves and/ or sets the base configuration folder. + * + * Return value: the configuration folder, or %NULL + **/ +const gchar* +sokoke_set_config_dir (const gchar* new_config_dir) +{ + static gchar* config_dir = NULL; + + if (config_dir) + return config_dir; + + if (!new_config_dir) + config_dir = g_build_filename (g_get_user_config_dir (), + PACKAGE_NAME, NULL); + else + { + g_return_val_if_fail (g_path_is_absolute (new_config_dir), NULL); + katze_assign (config_dir, g_strdup (new_config_dir)); + } + + return config_dir; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 4212f7e6..79eec084 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -127,4 +127,7 @@ sokoke_time_t_to_julian (const time_t* timestamp); void sokoke_register_stock_items (void); +const gchar* +sokoke_set_config_dir (const gchar* new_config_dir); + #endif /* !__SOKOKE_H__ */ From 07aed45bd963c1b09a33a9267d1831202388a7f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Apr 2009 20:26:06 +0200 Subject: [PATCH 0971/2970] Recognize different instances for different config dirs If Midori is built with support for multiple instances and a config folder is specified a new instance bound to that folder is created. The new "name" property in MidoriApp implements this. --- midori/main.c | 29 +++++++++++----- midori/midori-app.c | 84 +++++++++++++++++++++++++++++++++------------ 2 files changed, 82 insertions(+), 31 deletions(-) diff --git a/midori/main.c b/midori/main.c index 7943b970..57480bd8 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1412,14 +1412,6 @@ main (int argc, if (run) return midori_run_script (uris ? *uris : NULL); - if (config && !g_path_is_absolute (config)) - { - g_critical (_("The specified configuration folder is invalid.")); - return 1; - } - sokoke_set_config_dir (config); - g_free (config); - #if HAVE_HILDON osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); @@ -1430,7 +1422,26 @@ main (int argc, } #endif - app = midori_app_new (); + if (config && !g_path_is_absolute (config)) + { + g_critical (_("The specified configuration folder is invalid.")); + return 1; + } + sokoke_set_config_dir (config); + if (config) + { + gchar* name_hash; + gchar* app_name; + name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1); + app_name = g_strconcat ("midori", "_", name_hash, NULL); + g_free (name_hash); + app = g_object_new (MIDORI_TYPE_APP, "name", app_name, NULL); + g_free (app_name); + } + else + app = midori_app_new (); + g_free (config); + /* FIXME: The app might be 'running' but actually showing a dialog after a crash, so running a new window isn't a good idea. */ if (midori_app_instance_is_running (app)) diff --git a/midori/midori-app.c b/midori/midori-app.c index 0b832258..27fbe87a 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -30,6 +30,7 @@ struct _MidoriApp MidoriBrowser* browser; GtkAccelGroup* accel_group; + gchar* name; MidoriWebSettings* settings; KatzeArray* bookmarks; KatzeArray* trash; @@ -59,6 +60,7 @@ enum { PROP_0, + PROP_NAME, PROP_SETTINGS, PROP_BOOKMARKS, PROP_TRASH, @@ -206,6 +208,23 @@ midori_app_class_init (MidoriAppClass* class) class->add_browser = _midori_app_add_browser; class->quit = _midori_app_quit; + /** + * MidoriApp:name: + * + * The name of the instance. + * + * Since: 0.1.6 + */ + g_object_class_install_property (gobject_class, + PROP_NAME, + g_param_spec_string ( + "name", + "Name", + "The name of the instance", + "midori", + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_SETTINGS, g_param_spec_object ( @@ -389,16 +408,45 @@ midori_browser_message_received_cb (UniqueApp* instance, } #endif -static void -midori_app_init (MidoriApp* app) +static gpointer +midori_app_create_instance (MidoriApp* app, + const gchar* name) { #if HAVE_UNIQUE + gpointer instance; GdkDisplay* display; gchar* display_name; gchar* instance_name; guint i, n; #endif + if (!name) + name = "midori"; + + #if HAVE_UNIQUE + if (!(display = gdk_display_get_default ())) + return NULL; + + display_name = g_strdup (gdk_display_get_name (display)); + n = strlen (display_name); + for (i = 0; i < n; i++) + if (display_name[i] == ':' || display_name[i] == '.') + display_name[i] = '_'; + instance_name = g_strdup_printf ("de.twotoasts.%s_%s", name, display_name); + instance = unique_app_new (instance_name, NULL); + g_free (instance_name); + g_free (display_name); + g_signal_connect (instance, "message-received", + G_CALLBACK (midori_browser_message_received_cb), app); + return instance; + #else + return NULL; + #endif +} + +static void +midori_app_init (MidoriApp* app) +{ app->accel_group = gtk_accel_group_new (); app->settings = NULL; @@ -409,27 +457,7 @@ midori_app_init (MidoriApp* app) app->extensions = NULL; app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); - #if HAVE_UNIQUE - if (!(display = gdk_display_get_default ())) - { - app->instance = NULL; - return; - } - - display_name = g_strdup (gdk_display_get_name (display)); - n = strlen (display_name); - for (i = 0; i < n; i++) - if (display_name[i] == ':' || display_name[i] == '.') - display_name[i] = '_'; - instance_name = g_strdup_printf ("de.twotoasts.midori_%s", display_name); - app->instance = unique_app_new (instance_name, NULL); - g_free (instance_name); - g_free (display_name); - g_signal_connect (app->instance, "message-received", - G_CALLBACK (midori_browser_message_received_cb), app); - #else app->instance = NULL; - #endif } static void @@ -439,6 +467,7 @@ midori_app_finalize (GObject* object) g_object_unref (app->accel_group); + katze_assign (app->name, NULL); katze_object_assign (app->settings, NULL); katze_object_assign (app->bookmarks, NULL); katze_object_assign (app->trash, NULL); @@ -462,6 +491,9 @@ midori_app_set_property (GObject* object, switch (prop_id) { + case PROP_NAME: + katze_assign (app->name, g_value_dup_string (value)); + break; case PROP_SETTINGS: katze_object_assign (app->settings, g_value_dup_object (value)); /* FIXME: Propagate settings to all browsers */ @@ -501,6 +533,9 @@ midori_app_get_property (GObject* object, switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, app->name); + break; case PROP_SETTINGS: g_value_set_object (value, app->settings); break; @@ -559,6 +594,9 @@ midori_app_new (void) * Determines whether an instance of Midori is * already running on the default display. * + * Use the "name" property if you want to run more + * than one instance. + * * If Midori was built without single instance support * this function will always return %FALSE. * @@ -570,6 +608,8 @@ midori_app_instance_is_running (MidoriApp* app) g_return_val_if_fail (MIDORI_IS_APP (app), FALSE); #if HAVE_UNIQUE + if (!app->instance) + app->instance = midori_app_create_instance (app, app->name); if (app->instance) return unique_app_is_running (app->instance); #endif From 88ebdf3944c84c68653bf8c06923a39de18e569e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Apr 2009 15:52:01 +0200 Subject: [PATCH 0972/2970] Support external Download Manager with newer WebKit --- midori/midori-preferences.c | 3 +-- midori/midori-view.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 2f7441e3..3c02df17 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -427,7 +427,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "download-folder", "folder"); FILLED_ADD (button, 1, 2, 0, 1); - #else + #endif label = katze_property_label (settings, "download-manager"); INDENTED_ADD (label, 0, 1, 1, 2); hbox = gtk_hbox_new (FALSE, 4); @@ -442,7 +442,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_signal_connect (entry, "focus-out-event", G_CALLBACK (proxy_download_manager_icon_cb), button); FILLED_ADD (hbox, 1, 2, 1, 2); - #endif label = katze_property_label (settings, "text-editor"); INDENTED_ADD (label, 0, 1, 2, 3); hbox = gtk_hbox_new (FALSE, 4); diff --git a/midori/midori-view.c b/midori/midori-view.c index e2608a49..f77e0c03 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -926,6 +926,7 @@ midori_web_view_menu_save_as_activate_cb (GtkWidget* widget, { g_signal_emit (view, signals[SAVE_AS], 0, view->link_uri); } +#endif static void midori_web_view_menu_download_activate_cb (GtkWidget* widget, @@ -933,7 +934,6 @@ midori_web_view_menu_download_activate_cb (GtkWidget* widget, { sokoke_spawn_program (view->download_manager, view->link_uri); } -#endif static void midori_web_view_menu_add_bookmark_activate_cb (GtkWidget* widget, @@ -1026,10 +1026,11 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_save_as_activate_cb), view); gtk_widget_show (menuitem); + #endif if (view->download_manager && *view->download_manager) { menuitem = gtk_image_menu_item_new_with_mnemonic ( - _("_Download Link destination")); + _("Download with Download _Manager")); icon = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); @@ -1038,7 +1039,6 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_download_activate_cb), view); gtk_widget_show (menuitem); } - #endif menuitem = gtk_image_menu_item_new_from_stock (STOCK_BOOKMARK_ADD, NULL); gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 5); g_signal_connect (menuitem, "activate", @@ -1079,8 +1079,11 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, items = gtk_container_get_children (GTK_CONTAINER (menu)); menuitem = (GtkWidget*)g_list_nth_data (items, 3); /* hack to localize menu item */ - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), D_("gtk20", "_Refresh")); + if (GTK_IS_BIN (menuitem)) + { + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), D_("gtk20", "_Refresh")); + } g_list_free (items); menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); icon = gtk_image_new_from_stock (GTK_STOCK_UNDELETE, GTK_ICON_SIZE_MENU); From deb92e515862489679b18da179e475eda8ad821e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Apr 2009 22:28:36 +0200 Subject: [PATCH 0973/2970] Add an 'Add new folder' menu item to Bookmarks menu --- midori/midori-browser.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index c60b4cda..3bb38b6b 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2082,6 +2082,10 @@ _action_bookmarks_populate_popup (GtkAction* action, gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); } + menuitem = gtk_action_create_menu_item ( + _action_by_name (browser, "BookmarkFolderAdd")); + gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); menuitem = gtk_action_create_menu_item ( _action_by_name (browser, "BookmarkAdd")); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); @@ -2916,6 +2920,13 @@ _action_bookmark_add_activate (GtkAction* action, midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } +static void +_action_bookmark_folder_add_activate (GtkAction* action, + MidoriBrowser* browser) +{ + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); +} + static void _action_manage_search_engines_activate (GtkAction* action, MidoriBrowser* browser) @@ -3350,6 +3361,9 @@ static const GtkActionEntry entries[] = { { "BookmarkAdd", STOCK_BOOKMARK_ADD, NULL, "d", N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) }, + { "BookmarkFolderAdd", GTK_STOCK_DIRECTORY, + N_("Add a new folder"), "", + N_("Add a new bookmark folder"), G_CALLBACK (_action_bookmark_folder_add_activate) }, { "Tools", NULL, N_("_Tools") }, { "ManageSearchEngines", GTK_STOCK_PROPERTIES, N_("_Manage Search Engines"), "s", @@ -3585,6 +3599,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" @@ -4545,6 +4560,7 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, browser->bookmarks, NULL); _action_set_sensitive (browser, "BookmarkAdd", FALSE); + _action_set_sensitive (browser, "BookmarkFolderAdd", FALSE); if (!browser->bookmarks) return; @@ -4558,6 +4574,7 @@ midori_browser_set_bookmarks (MidoriBrowser* browser, G_CALLBACK (browser_bookmarks_remove_item_cb), browser); _action_set_sensitive (browser, "BookmarkAdd", TRUE); + _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE); } static void From 0e0e362a8e120f7176cf2e44fca1a62d77a7f72d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Apr 2009 22:29:10 +0200 Subject: [PATCH 0974/2970] Don't make sensitivity of Clear history depend on the selection --- panels/midori-history.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index 1bb75fb3..f528d4d6 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -189,7 +189,6 @@ midori_history_cursor_or_row_changed_cb (GtkTreeView* treeview, is_page = !KATZE_IS_ARRAY (item) && katze_item_get_uri (item); gtk_widget_set_sensitive (history->bookmark, is_page); gtk_widget_set_sensitive (history->delete, TRUE); - gtk_widget_set_sensitive (history->clear, TRUE); g_object_unref (item); } @@ -197,7 +196,6 @@ midori_history_cursor_or_row_changed_cb (GtkTreeView* treeview, { gtk_widget_set_sensitive (history->bookmark, FALSE); gtk_widget_set_sensitive (history->delete, FALSE); - gtk_widget_set_sensitive (history->clear, FALSE); } } From ec5ef9540830c3ab4e7c36d425360b3ed5e5e981 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Apr 2009 22:29:45 +0200 Subject: [PATCH 0975/2970] Initial support for detachable panels A button allows detaching of a particular panel into its own window. The toolbar will also be part of the window. Closing the window re-attaches the panel back to the browser window. --- midori/midori-panel.c | 145 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 19 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 4f1dcc0b..44e59b1d 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2007-2009 Christian Dywan This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -175,6 +175,88 @@ midori_panel_button_close_clicked_cb (GtkWidget* toolitem, g_signal_emit (panel, signals[CLOSE], 0, &return_value); } +static GtkToolItem* +midori_panel_construct_tool_item (MidoriPanel* panel, + MidoriViewable* viewable); + +static GtkWidget* +_midori_panel_child_for_scrolled (MidoriPanel* panel, + GtkWidget* scrolled); + +static gboolean +midori_panel_detached_window_delete_event_cb (GtkWidget* window, + GdkEvent* event, + MidoriPanel* panel) +{ + /* FIXME: The panel will not end up at its original position */ + /* FIXME: The menuitem may be mispositioned */ + GtkWidget* vbox = gtk_bin_get_child (GTK_BIN (window)); + GtkWidget* scrolled = g_object_get_data (G_OBJECT (window), "scrolled"); + GtkWidget* toolbar = g_object_get_data (G_OBJECT (scrolled), "panel-toolbar"); + GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem"); + GtkToolItem* toolitem; + g_object_ref (toolbar); + gtk_container_remove (GTK_CONTAINER (vbox), toolbar); + gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); + g_object_unref (toolbar); + g_object_ref (scrolled); + gtk_container_remove (GTK_CONTAINER (vbox), scrolled); + gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); + g_object_unref (scrolled); + toolitem = midori_panel_construct_tool_item (panel, + MIDORI_VIEWABLE (_midori_panel_child_for_scrolled (panel, scrolled))); + if (menuitem) + { + gtk_widget_show (menuitem); + g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); + } + return FALSE; +} + +static void +midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, + MidoriPanel* panel) +{ + /* FIXME: Use stock icon for window */ + /* FIXME: What happens when the browser is destroyed? */ + /* FIXME: What about multiple browsers? */ + /* FIXME: Should we remember if the child was detached? */ + /* FIXME: Fix label of the sidepanel after removing the widgets */ + gint n = midori_panel_get_current_page (panel); + GtkToolItem* toolitem = gtk_toolbar_get_nth_item ( + GTK_TOOLBAR (panel->toolbar), n); + const gchar* title = gtk_tool_button_get_label (GTK_TOOL_BUTTON (toolitem)); + GtkWidget* toolbar = gtk_notebook_get_nth_page ( + GTK_NOTEBOOK (panel->toolbook), n); + GtkWidget* scrolled = gtk_notebook_get_nth_page ( + GTK_NOTEBOOK (panel->notebook), n); + GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem"); + GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + GtkWidget* vbox = gtk_vbox_new (FALSE, 0); + g_object_set_data (G_OBJECT (window), "scrolled", scrolled); + gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_default_size (GTK_WINDOW (window), 250, 400); + gtk_window_set_transient_for (GTK_WINDOW (window), + GTK_WINDOW (gtk_widget_get_toplevel (panel->notebook))); + gtk_widget_show (vbox); + gtk_container_add (GTK_CONTAINER (window), vbox); + if (menuitem) + gtk_widget_hide (menuitem); + gtk_container_remove (GTK_CONTAINER (panel->toolbar), GTK_WIDGET (toolitem)); + g_object_ref (toolbar); + gtk_container_remove (GTK_CONTAINER (panel->toolbook), toolbar); + gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0); + g_object_unref (toolbar); + g_object_set_data (G_OBJECT (scrolled), "panel-toolbar", toolbar); + g_object_ref (scrolled); + gtk_container_remove (GTK_CONTAINER (panel->notebook), scrolled); + gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); + g_object_unref (scrolled); + g_signal_connect (window, "delete-event", + G_CALLBACK (midori_panel_detached_window_delete_event_cb), panel); + gtk_widget_show (window); +} + static void midori_panel_button_align_clicked_cb (GtkWidget* toolitem, MidoriPanel* panel) @@ -222,6 +304,18 @@ midori_panel_init (MidoriPanel* panel) gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), + _("Detach chosen panel from the window")); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), + _("Whether to detach the chosen panel from the window")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_panel_button_detach_clicked_cb), panel); + #if HAVE_OSX + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, 0); + #else + gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); + #endif toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Align sidepanel on the right")); @@ -440,6 +534,35 @@ midori_panel_widget_destroy_cb (GtkWidget* viewable, viewable, midori_panel_widget_destroy_cb, widget); } +static GtkToolItem* +midori_panel_construct_tool_item (MidoriPanel* panel, + MidoriViewable* viewable) +{ + const gchar* label = midori_viewable_get_label (viewable); + const gchar* stock_id = midori_viewable_get_stock_id (viewable); + GtkToolItem* toolitem; + GtkWidget* image; + + toolitem = gtk_radio_tool_button_new_from_stock (NULL, stock_id); + g_object_set (toolitem, "group", + gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), 0), NULL); + image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); + if (label) + { + gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); + } + g_object_set_data (G_OBJECT (toolitem), "page", viewable); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (midori_panel_menu_item_activate_cb), panel); + gtk_widget_show_all (GTK_WIDGET (toolitem)); + gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), toolitem, -1); + g_signal_connect (viewable, "destroy", + G_CALLBACK (midori_panel_widget_destroy_cb), toolitem); + return toolitem; +} + /** * midori_panel_append_page: * @panel: a #MidoriPanel @@ -469,7 +592,6 @@ midori_panel_append_page (MidoriPanel* panel, const gchar* label; const gchar* stock_id; GtkToolItem* toolitem; - GtkWidget* image; GtkWidget* menuitem; guint n; @@ -509,23 +631,7 @@ midori_panel_append_page (MidoriPanel* panel, label = midori_viewable_get_label (viewable); stock_id = midori_viewable_get_stock_id (viewable); - toolitem = gtk_radio_tool_button_new_from_stock (NULL, stock_id); - g_object_set (toolitem, "group", - gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), 0), NULL); - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); - gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); - if (label) - { - gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), label); - gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), label); - } - g_object_set_data (G_OBJECT (toolitem), "page", viewable); - g_signal_connect (toolitem, "clicked", - G_CALLBACK (midori_panel_menu_item_activate_cb), panel); - gtk_widget_show_all (GTK_WIDGET (toolitem)); - gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), toolitem, -1); - g_signal_connect (viewable, "destroy", - G_CALLBACK (midori_panel_widget_destroy_cb), toolitem); + toolitem = midori_panel_construct_tool_item (panel, viewable); if (panel->menu) { @@ -537,6 +643,7 @@ midori_panel_append_page (MidoriPanel* panel, G_CALLBACK (midori_panel_menu_item_activate_cb), panel); gtk_menu_shell_append (GTK_MENU_SHELL (panel->menu), menuitem); + g_object_set_data (G_OBJECT (scrolled), "panel-menuitem", menuitem); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_widget_destroy_cb), menuitem); } From 88ebbe00e0296c618781bc29e09ef712a7ed68fa Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Fri, 10 Apr 2009 22:38:42 +0200 Subject: [PATCH 0976/2970] Update Japanese translation --- po/ja.po | 567 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 303 insertions(+), 264 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6d900ad3..b4600d88 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,15 +1,15 @@ # Japanese translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Masato Hashimoto 2008-2009 +# Masato Hashimoto 2008-2009 # msgid "" msgstr "" "Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-26 00:06+0900\n" -"PO-Revision-Date: 2009-03-26 00:15+0900\n" -"Last-Translator: Masato Hashimoto \n" +"POT-Creation-Date: 2009-04-10 20:52+0900\n" +"PO-Revision-Date: 2009-04-10 17:55+0900\n" +"Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,8 +20,8 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1582 ../midori/main.c:1675 -#: ../midori/main.c:1684 ../midori/main.c:1695 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1384 +#: ../midori/main.c:1392 ../midori/main.c:1403 #: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -30,188 +30,200 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:165 ../midori/main.c:235 +#: ../midori/main.c:156 ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "ファイルが見つかりません。" - -#: ../midori/main.c:485 ../midori/main.c:494 -msgid "Malformed document." -msgstr "不正な形式のドキュメントです。" - -#: ../midori/main.c:516 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 +#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:936 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:1066 ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "書き込みに失敗しました。" - -#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 +#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 ../midori/main.c:1190 +#: ../midori/main.c:850 ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:1261 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1379 +#: ../midori/main.c:1073 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" -"ようであれば、問題解決のために以下のオプションを試してみてください。" +"ようであれば、問題解決のために以下のオプションのひとつを試してみてください。" -#: ../midori/main.c:1394 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1398 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1403 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1582 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1605 ../midori/gjs.c:515 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" +#: ../midori/main.c:1335 +msgid "Use FOLDER as configuration folder" +msgstr "設定フォルダとして FOLDER を使用する" + +#: ../midori/main.c:1335 +msgid "FOLDER" +msgstr "FOLDER" + # CLI --help -#: ../midori/main.c:1628 +#: ../midori/main.c:1337 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1630 +#: ../midori/main.c:1339 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1632 +#: ../midori/main.c:1341 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1672 +#: ../midori/main.c:1381 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1696 +#: ../midori/main.c:1404 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1698 +#: ../midori/main.c:1406 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1427 +msgid "The specified configuration folder is invalid." +msgstr "指定された設定フォルダが正しくありません。" + +#: ../midori/main.c:1462 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1775 +#: ../midori/main.c:1512 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1787 +#: ../midori/main.c:1524 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1802 +#: ../midori/main.c:1539 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1815 +#: ../midori/main.c:1552 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1828 +#: ../midori/main.c:1565 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1840 +#: ../midori/main.c:1577 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1856 +#: ../midori/main.c:1593 msgid "_Ignore" msgstr "無視(_I)" -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3274 -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "ファイルが見つかりません。" + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "不正な形式のドキュメントです。" + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:614 +#, c-format +msgid "Writing failed." +msgstr "書き込みに失敗しました。" + +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3284 +#: ../midori/midori-browser.c:3290 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3287 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" @@ -245,11 +257,11 @@ msgstr "ブックマークの編集" msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:856 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:870 msgid "_Address:" msgstr "アドレス(_A):" @@ -261,436 +273,436 @@ msgstr "フォルダ(_F):" msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:758 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1537 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2845 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:811 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2852 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:817 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2855 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:819 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3009 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3017 msgid "translator-credits" -msgstr "Masato Hashimoto " +msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3218 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3221 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3224 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3227 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3230 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3232 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3233 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3235 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3236 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3239 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3242 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3244 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3247 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3240 ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3250 ../midori/midori-browser.c:3253 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3256 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3259 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3262 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3265 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3267 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3268 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3270 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3271 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3274 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3275 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3278 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3280 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3281 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3283 +#: ../midori/midori-browser.c:3293 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3286 +#: ../midori/midori-browser.c:3296 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3289 +#: ../midori/midori-browser.c:3299 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3290 +#: ../midori/midori-browser.c:3300 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3302 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3305 ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3308 ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3301 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3311 ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3304 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3314 ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3307 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3317 ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3310 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3320 ../midori/midori-websettings.c:201 #: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3313 ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3323 ../midori/midori-view.c:1113 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3324 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3326 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3327 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3321 +#: ../midori/midori-browser.c:3331 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3333 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3336 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3329 +#: ../midori/midori-browser.c:3339 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3332 +#: ../midori/midori-browser.c:3342 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3344 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3335 +#: ../midori/midori-browser.c:3345 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3337 ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3347 ../midori/midori-view.c:1085 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3348 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3342 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3352 ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3353 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3345 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3355 ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3356 msgid "Add, edit and remove search engines..." msgstr "検索エンジンの追加、編集、または削除します" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3360 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3361 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3363 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3364 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3366 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3368 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3369 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3361 +#: ../midori/midori-browser.c:3371 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3372 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3374 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3375 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3378 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3375 +#: ../midori/midori-browser.c:3385 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3376 +#: ../midori/midori-browser.c:3386 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3391 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3392 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3395 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3396 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3399 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3400 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3393 +#: ../midori/midori-browser.c:3403 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3394 +#: ../midori/midori-browser.c:3404 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3397 +#: ../midori/midori-browser.c:3407 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3398 +#: ../midori/midori-browser.c:3408 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3411 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3402 +#: ../midori/midori-browser.c:3412 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3833 +#: ../midori/midori-browser.c:3844 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3840 +#: ../midori/midori-browser.c:3851 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3842 +#: ../midori/midori-browser.c:3853 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:3877 msgid "_Web Search..." msgstr "ウェブ検索(_W)" -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:3879 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3887 +#: ../midori/midori-browser.c:3898 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3900 +#: ../midori/midori-browser.c:3911 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:3913 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3915 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:3926 ../midori/sokoke.c:769 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:3928 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3930 +#: ../midori/midori-browser.c:3941 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:3943 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4100 +#: ../midori/midori-browser.c:4110 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4125 +#: ../midori/midori-browser.c:4135 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4130 +#: ../midori/midori-browser.c:4140 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4145 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4143 +#: ../midori/midori-browser.c:4153 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4153 +#: ../midori/midori-browser.c:4163 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4459 +#: ../midori/midori-browser.c:4469 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" @@ -707,7 +719,7 @@ msgstr "サイドパネルを右側に表示します" msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1890 +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1917 msgid "Blank page" msgstr "空白ページ" @@ -1018,7 +1030,7 @@ msgstr "現在のタブの隣に開く" #: ../midori/midori-websettings.c:668 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "新しいタブを現在または最後のタブの隣に開きます" +msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" #: ../midori/midori-websettings.c:676 msgid "Open popups in tabs" @@ -1147,60 +1159,65 @@ msgstr "キャッシュのサイズを指定します" msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:990 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:992 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:1009 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1018 ../midori/midori-view.c:1032 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1024 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1055 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1064 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1203 +#: ../midori/midori-view.c:1209 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:1212 +#: ../midori/midori-view.c:1226 +#, c-format +msgid "File Type: '%s'" +msgstr "ファイルタイプ: '%s'" + +#: ../midori/midori-view.c:1229 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1216 +#: ../midori/midori-view.c:1233 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:1612 +#: ../midori/midori-view.c:1629 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1757 +#: ../midori/midori-view.c:1774 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1773 +#: ../midori/midori-view.c:1790 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1368,35 +1385,35 @@ msgstr "ウェブ Cookie" msgid "days" msgstr "日" -#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 +#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:108 msgid "History" msgstr "履歴" -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "空" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:812 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:812 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:840 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:884 msgid "_Icon:" msgstr "アイコン(_I):" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:898 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1078 msgid "Manage Search Engines" msgstr "検索エンジンの管理" @@ -1405,73 +1422,62 @@ msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:437 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:768 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:770 msgid "_Add Bookmark" msgstr "ブックマークに追加(_A)" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:771 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:772 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:773 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:774 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:775 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:776 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:777 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:778 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:779 +msgid "P_lugins" +msgstr "プラグイン(_L)" + +#: ../midori/sokoke.c:780 msgid "_Closed Tabs and Windows" msgstr "閉じたタブとウィンドウ(_C)" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:781 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../midori/gjs.c:743 ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s にはプロパティ '%s' はありません" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s は %s.%s に割り当てることはできません" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s にアクセスできません" - #: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" @@ -1480,39 +1486,39 @@ msgstr "ユーザスクリプト" msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:924 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "有効" -#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:934 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "無効" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "選択されたブックマークを編集します" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "選択されたブックマークを削除します" -#: ../panels/midori-bookmarks.c:257 +#: ../panels/midori-bookmarks.c:261 msgid "Add a new folder" msgstr "新しいフォルダを追加します" -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "セパレータ" @@ -1524,37 +1530,37 @@ msgstr "コンソール" msgid "Extensions" msgstr "エクステンション" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:220 msgid "Bookmark the selected history item" msgstr "選択された履歴アイテムをブックマークに追加します" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:229 msgid "Delete the selected history item" msgstr "選択された履歴アイテムを削除します" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:237 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:602 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:608 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:615 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:617 msgid "Yesterday" msgstr "昨日" @@ -1626,76 +1632,109 @@ msgstr "カラフルタブ" msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" -#: ../extensions/cookie-manager.c:136 +#: ../extensions/cookie-manager.c:185 +msgid "At the end of the session" +msgstr "セッションの終わりまで" + +#: ../extensions/cookie-manager.c:188 #, c-format msgid "" -"Host: %s\n" -"Path: %s\n" -"Secure: %s\n" -"Name: %s\n" -"Value: %s" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" msgstr "" -"ホスト: %s\n" -"パス: %s\n" -"Secureフラグ: %s\n" -"名前: %s\n" -"値: %s" +"ホスト: %s\n" +"名前: %s\n" +"値: %s\n" +"パス: %s\n" +"Secure: %s\n" +"有効期限: %s" # Secure flag is set. -#: ../extensions/cookie-manager.c:139 +#: ../extensions/cookie-manager.c:194 msgid "Yes" msgstr "あり" # Secure flag isn't set. -#: ../extensions/cookie-manager.c:139 +#: ../extensions/cookie-manager.c:194 msgid "No" msgstr "なし" -#: ../extensions/cookie-manager.c:330 +#: ../extensions/cookie-manager.c:475 msgid "Do you really want to delete all cookies?" msgstr "本当にすべての cookie を削除してよろしいですか?" # Dialog title -#: ../extensions/cookie-manager.c:332 +#: ../extensions/cookie-manager.c:477 msgid "Question" msgstr "確認" +#: ../extensions/cookie-manager.c:485 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "" +"フィルタに入力された文字列にマッチした、表示されている cookie のみ削除されま" +"す。" + # Column name of cookie browser -#: ../extensions/cookie-manager.c:386 +#: ../extensions/cookie-manager.c:663 msgid "Name" msgstr "名前" -#: ../extensions/cookie-manager.c:436 +#: ../extensions/cookie-manager.c:723 msgid "_Expand All" msgstr "すべて展開する(_E)" -#: ../extensions/cookie-manager.c:443 +#: ../extensions/cookie-manager.c:731 msgid "_Collapse All" msgstr "すべて折り畳む(_C)" -#: ../extensions/cookie-manager.c:517 +#: ../extensions/cookie-manager.c:800 msgid "Delete All" msgstr "すべて削除" +#: ../extensions/cookie-manager.c:802 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" +"ルタにマッチした cookie のみ削除されます。" + # tooltip -#: ../extensions/cookie-manager.c:530 +#: ../extensions/cookie-manager.c:817 msgid "Expand All" msgstr "すべて展開します" # tooltip -#: ../extensions/cookie-manager.c:536 +#: ../extensions/cookie-manager.c:824 msgid "Collapse All" msgstr "すべて折り畳みます" -#: ../extensions/cookie-manager.c:576 ../extensions/cookie-manager.c:613 +#: ../extensions/cookie-manager.c:855 +msgid "Filter:" +msgstr "フィルタ:" + +#: ../extensions/cookie-manager.c:860 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"フィルタに入力された文字列と、名前またはドメインフィールドがマッチした " +"cookie のみ表示します。" + +#: ../extensions/cookie-manager.c:895 ../extensions/cookie-manager.c:942 msgid "Cookie Manager" msgstr "Cookie マネージャ" -#: ../extensions/cookie-manager.c:597 +#: ../extensions/cookie-manager.c:926 msgid "_Cookie Manager" msgstr "Cookie マネージャ(_C)" -#: ../extensions/cookie-manager.c:614 +#: ../extensions/cookie-manager.c:943 msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" @@ -1708,11 +1747,11 @@ msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:127 ../extensions/page-holder.c:172 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "ページホルダ" -#: ../extensions/page-holder.c:156 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "ページホルダ(_P)" From a9ea07389a329eb0396efb9f9dcf71c34fc120e3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Apr 2009 05:14:53 +0200 Subject: [PATCH 0977/2970] Implement Clear Private Data dialogue --- midori/midori-browser.c | 124 ++++++++++++++++++++++++++++++++++++++++ midori/sokoke.c | 40 +++++++++++++ midori/sokoke.h | 4 ++ 3 files changed, 168 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3bb38b6b..46dcf845 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2948,6 +2948,125 @@ _action_manage_search_engines_activate (GtkAction* action, gtk_window_present (GTK_WINDOW (dialog)); } +static void +midori_browser_clear_private_data_response_cb (GtkWidget* dialog, + gint response_id, + MidoriBrowser* browser) +{ + if (response_id == GTK_RESPONSE_ACCEPT) + { + GtkToggleButton* button; + + button = g_object_get_data (G_OBJECT (dialog), "history"); + if (gtk_toggle_button_get_active (button)) + katze_array_clear (browser->history); + button = g_object_get_data (G_OBJECT (dialog), "cookies"); + if (gtk_toggle_button_get_active (button)) + { + SoupSession* session = katze_net_get_session (browser->net); + SoupSessionFeature* jar = soup_session_get_feature (session, + SOUP_TYPE_COOKIE_JAR); + GSList* cookies = soup_cookie_jar_all_cookies (SOUP_COOKIE_JAR (jar)); + SoupCookie* cookie; + gsize i = 0; + while ((cookie = g_slist_nth_data (cookies, i++))) + { + soup_cookie_jar_delete_cookie (SOUP_COOKIE_JAR (jar), cookie); + soup_cookie_free (cookie); + } + g_slist_free (cookies); + } + button = g_object_get_data (G_OBJECT (dialog), "flash-cookies"); + if (gtk_toggle_button_get_active (button)) + { + gchar* cache = g_build_filename (g_get_home_dir (), ".macromedia", + "Flash_Player", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + } + button = g_object_get_data (G_OBJECT (dialog), "website-icons"); + if (gtk_toggle_button_get_active (button)) + { + gchar* cache = g_build_filename (g_get_user_cache_dir (), + PACKAGE_NAME, "icons", NULL); + sokoke_remove_path (cache, TRUE); + g_free (cache); + } + } + if (response_id != GTK_RESPONSE_DELETE_EVENT) + gtk_widget_destroy (dialog); +} + +static void +_action_clear_private_data_activate (GtkAction* action, + MidoriBrowser* browser) +{ + static GtkWidget* dialog = NULL; + + if (!GTK_WIDGET_VISIBLE (browser)) + return; + + if (!dialog) + { + GdkScreen* screen; + GtkIconTheme* icon_theme; + GtkSizeGroup* sizegroup; + GtkWidget* hbox; + GtkWidget* vbox; + GtkWidget* icon; + GtkWidget* label; + GtkWidget* button; + + dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"), + GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("Clear private data"), GTK_RESPONSE_ACCEPT, NULL); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); + screen = gtk_widget_get_screen (GTK_WIDGET (browser)); + if (screen) + { + icon_theme = gtk_icon_theme_get_for_screen (screen); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR); + } + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + hbox = gtk_hbox_new (FALSE, 4); + icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_DIALOG); + gtk_size_group_add_widget (sizegroup, icon); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); + label = gtk_label_new (_("Clear the following data:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 8); + hbox = gtk_hbox_new (FALSE, 4); + icon = gtk_image_new (); + gtk_size_group_add_widget (sizegroup, icon); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); + vbox = gtk_vbox_new (TRUE, 4); + button = gtk_check_button_new_with_mnemonic (_("History")); + g_object_set_data (G_OBJECT (dialog), "history", button); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + button = gtk_check_button_new_with_mnemonic (_("Cookies")); + g_object_set_data (G_OBJECT (dialog), "cookies", button); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + button = gtk_check_button_new_with_mnemonic (_("'Flash' Cookies")); + g_object_set_data (G_OBJECT (dialog), "flash-cookies", button); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + button = gtk_check_button_new_with_mnemonic (_("Website icons")); + g_object_set_data (G_OBJECT (dialog), "website-icons", button); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 8); + gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); + + g_signal_connect (dialog, "response", + G_CALLBACK (midori_browser_clear_private_data_response_cb), browser); + g_signal_connect (dialog, "destroy", + G_CALLBACK (gtk_widget_destroyed), &dialog); + gtk_widget_show (dialog); + } + else + gtk_window_present (GTK_WINDOW (dialog)); +} + static void _action_tab_previous_activate (GtkAction* action, MidoriBrowser* browser) @@ -3369,6 +3488,10 @@ static const GtkActionEntry entries[] = { N_("_Manage Search Engines"), "s", N_("Add, edit and remove search engines..."), G_CALLBACK (_action_manage_search_engines_activate) }, + { "ClearPrivateData", GTK_STOCK_CLEAR, + N_("_Clear Private Data"), "Delete", + N_("Clear private data..."), + G_CALLBACK (_action_clear_private_data_activate) }, { "TabPrevious", GTK_STOCK_GO_BACK, N_("_Previous Tab"), "Page_Up", @@ -3584,6 +3707,7 @@ static const gchar* ui_markup = "" "" "" + "" /* Panel items shall be appended here */ "" "" diff --git a/midori/sokoke.c b/midori/sokoke.c index c9639ca5..09fc9f56 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -25,6 +25,7 @@ #include #include #include +#include #if HAVE_LIBIDN #include @@ -829,3 +830,42 @@ sokoke_set_config_dir (const gchar* new_config_dir) return config_dir; } + +/** + * sokoke_remove_path: + * @path: an absolute path + * @ignore_errors: keep removing even if an error occurred + * + * Removes the file at @path or the folder including any + * child folders and files if @path is a folder. + * + * If @ignore_errors is %TRUE and @path is a folder with + * children, one of which can't be removed, remaining + * children will be deleted nevertheless + * If @ignore_errors is %FALSE and @path is a folder, the + * removal process will cancel immediately. + * + * Return value: %TRUE on success, %FALSE if an error occurred + **/ +gboolean +sokoke_remove_path (const gchar* path, + gboolean ignore_errors) +{ + GDir* dir = g_dir_open (path, 0, NULL); + const gchar* name; + + if (!dir) + return g_remove (path) == 0; + + while ((name = g_dir_read_name (dir))) + { + gchar* sub_path = g_build_filename (path, name, NULL); + if (!sokoke_remove_path (sub_path, ignore_errors) && !ignore_errors) + return FALSE; + g_free (sub_path); + } + + g_dir_close (dir); + g_rmdir (path); + return TRUE; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index 79eec084..72f1305e 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -130,4 +130,8 @@ sokoke_register_stock_items (void); const gchar* sokoke_set_config_dir (const gchar* new_config_dir); +gboolean +sokoke_remove_path (const gchar* path, + gboolean ignore_errors); + #endif /* !__SOKOKE_H__ */ From 592e55c59b5a2933b46650089f9fcf6881e4e488 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Apr 2009 07:05:28 +0200 Subject: [PATCH 0978/2970] Use progress and icon GtkEntry features with GTK+ 2.16 --- extensions/cookie-manager.c | 2 +- midori/gtkiconentry.c | 43 +++++++++++++++++++--------------- midori/gtkiconentry.h | 27 +++++++++++++++------ midori/midori-browser.c | 2 +- midori/midori-locationaction.c | 2 +- midori/midori-locationentry.c | 14 +++++------ midori/midori-searchaction.c | 2 +- 7 files changed, 54 insertions(+), 38 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index e506eed3..81355835 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -864,7 +864,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR); gtk_icon_entry_set_icon_highlight(GTK_ICON_ENTRY (cmdata->filter_entry), GTK_ICON_ENTRY_SECONDARY, TRUE); - g_signal_connect(cmdata->filter_entry, "icon_released", + g_signal_connect(cmdata->filter_entry, "icon-release", G_CALLBACK(cm_filter_entry_clear_icon_released_cb), NULL); g_signal_connect(cmdata->filter_entry, "changed", G_CALLBACK(cm_filter_entry_changed_cb), cmdata); g_signal_connect(cmdata->filter_entry, "activate", G_CALLBACK(cm_filter_entry_changed_cb), cmdata); diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 8e189932..51740ab0 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -20,6 +20,24 @@ #include "gtkiconentry.h" +#if GTK_CHECK_VERSION (2, 16, 0) + +void +gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, + GtkEntryIconPosition position, + GdkPixbuf* pixbuf) +{ + /* Without this ugly hack pixbuf icons don't work */ + if (pixbuf) + { + gtk_widget_hide (GTK_WIDGET (entry)); + gtk_entry_set_icon_from_pixbuf (entry, position, pixbuf); + gtk_widget_show (GTK_WIDGET (entry)); + } +} + +#else + #include #if GTK_CHECK_VERSION (2, 14, 0) @@ -61,9 +79,7 @@ typedef struct GdkCursorType cursor_type; gboolean custom_cursor; GtkImageType storage_type; - #if GLIB_CHECK_VERSION (2, 16, 0) GIcon *gicon; - #endif gchar *icon_name; gboolean insensitive; } EntryIconInfo; @@ -196,17 +212,17 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) G_TYPE_INT); /** - * GtkIconEntry::icon-released: + * GtkIconEntry::icon-release: * @entry: The entry on which the signal is emitted. * @icon_pos: The position of the clicked icon. * @button: The mouse button clicked. * - * The ::icon-released signal is emitted on the button release from a + * The ::icon-release signal is emitted on the button release from a * mouse click. */ - if (!(signals[ICON_RELEASED] = g_signal_lookup ("icon-released", GTK_TYPE_ENTRY))) + if (!(signals[ICON_RELEASED] = g_signal_lookup ("icon-release", GTK_TYPE_ENTRY))) signals[ICON_RELEASED] = - g_signal_new ("icon-released", + g_signal_new ("icon-release", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconEntryClass, icon_released), @@ -274,7 +290,6 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) NULL, GTK_PARAM_WRITABLE)); - #if GLIB_CHECK_VERSION (2, 16, 0) g_object_class_install_property (gobject_class, PROP_GICON_PRIMARY, g_param_spec_object ("gicon-primary", @@ -290,7 +305,6 @@ gtk_icon_entry_class_init (GtkIconEntryClass *klass) P_("GIcon for secondary icon"), G_TYPE_ICON, GTK_PARAM_READWRITE)); - #endif g_type_class_add_private (klass, sizeof (GtkIconEntryPrivate)); } @@ -433,7 +447,6 @@ gtk_icon_entry_set_property (GObject *object, g_value_get_string (value)); break; - #if GLIB_CHECK_VERSION (2, 16, 0) case PROP_GICON_PRIMARY: gtk_icon_entry_set_icon_from_gicon (entry, GTK_ICON_ENTRY_PRIMARY, @@ -445,7 +458,6 @@ gtk_icon_entry_set_property (GObject *object, GTK_ICON_ENTRY_SECONDARY, g_value_get_object (value)); break; - #endif } } @@ -471,7 +483,6 @@ gtk_icon_entry_get_property (GObject *object, GTK_ICON_ENTRY_SECONDARY)); break; - #if GLIB_CHECK_VERSION (2, 16, 0) case PROP_GICON_PRIMARY: g_value_set_object (value, gtk_icon_entry_get_gicon (entry, @@ -482,7 +493,6 @@ gtk_icon_entry_get_property (GObject *object, g_value_set_object (value, gtk_icon_entry_get_gicon (entry, GTK_ICON_ENTRY_SECONDARY)); - #endif } } @@ -1338,8 +1348,6 @@ gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, * instead. If the current icon theme is changed, the icon will be updated * appropriately. */ - -#if GLIB_CHECK_VERSION (2, 16, 0) void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, @@ -1390,7 +1398,6 @@ gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, icon_pos, pixbuf); } -#endif /** * gtk_icon_entry_set_cursor @@ -1491,9 +1498,6 @@ gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, * * Returns: A #GIcon, or NULL if no icon is set or if the icon is not a GIcon. */ - - -#if GLIB_CHECK_VERSION (2, 16, 0) GIcon * gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos) @@ -1510,7 +1514,6 @@ gtk_icon_entry_get_gicon (const GtkIconEntry *entry, return icon_info->storage_type == _GTK_IMAGE_GICON ? icon_info->gicon : NULL; } -#endif /** * gtk_icon_entry_get_icon_highlight @@ -1601,3 +1604,5 @@ gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entry, gdk_cursor_unref (cursor); } } + +#endif diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index 82015339..61f8075b 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -25,14 +25,27 @@ #include #endif -#include -#if GLIB_CHECK_VERSION (2, 16, 0) #include -#endif #include G_BEGIN_DECLS +#if GTK_CHECK_VERSION (2, 16, 0) + #define GtkIconEntry GtkEntry + #define GtkIconEntryPosition GtkEntryIconPosition + #define GTK_ICON_ENTRY_PRIMARY GTK_ENTRY_ICON_PRIMARY + #define GTK_ICON_ENTRY_SECONDARY GTK_ENTRY_ICON_SECONDARY + #define GTK_ICON_ENTRY GTK_ENTRY + #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY + #define gtk_icon_entry_new gtk_entry_new + #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock + void + gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, + GtkEntryIconPosition position, + GdkPixbuf* pixbuf); + #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable +#else + #define GTK_TYPE_ICON_ENTRY (gtk_icon_entry_get_type()) #define GTK_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_ICON_ENTRY, GtkIconEntry)) #define GTK_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_ICON_ENTRY, GtkIconEntryClass)) @@ -86,17 +99,15 @@ void gtk_icon_entry_set_icon_from_icon_name (GtkIconEntry *entry, GtkIconEntryPosition icon_pos, const gchar *icon_name); -#if GLIB_CHECK_VERSION (2, 16, 0) void gtk_icon_entry_set_icon_from_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, GIcon *icon); -#endif + GdkPixbuf* gtk_icon_entry_get_pixbuf (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos); -#if GLIB_CHECK_VERSION (2, 16, 0) + GIcon* gtk_icon_entry_get_gicon (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos); -#endif void gtk_icon_entry_set_icon_highlight (const GtkIconEntry *entry, GtkIconEntryPosition icon_pos, @@ -117,6 +128,8 @@ void gtk_icon_entry_set_icon_sensitive (const GtkIconEntry *icon_entr GtkIconEntryPosition icon_pos, gboolean sensitive); +#endif + G_END_DECLS #endif /* __GTK_ICON_ENTRY_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 46dcf845..47ac21ef 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4257,7 +4257,7 @@ midori_browser_init (MidoriBrowser* browser) GTK_STOCK_CLEAR); gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (browser->find_text), GTK_ICON_ENTRY_SECONDARY, TRUE); - g_signal_connect (browser->find_text, "icon_released", + g_signal_connect (browser->find_text, "icon-release", G_CALLBACK (midori_browser_entry_clear_icon_released_cb), NULL); g_signal_connect (browser->find_text, "activate", G_CALLBACK (_action_find_next_activate), browser); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 2fd2b468..c793bb14 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -847,7 +847,7 @@ midori_location_action_connect_proxy (GtkAction* action, midori_location_action_key_press_event_cb, action, "signal::focus-out-event", midori_location_action_focus_out_event_cb, action, - "signal::icon-released", + "signal::icon-release", midori_location_action_icon_released_cb, action, NULL); } diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c index 92a34277..1f1f5d12 100644 --- a/midori/midori-locationentry.c +++ b/midori/midori-locationentry.c @@ -51,9 +51,7 @@ midori_location_entry_class_init (MidoriLocationEntryClass* class) } -#define HAVE_ENTRY_PROGRESS 1 - -#ifdef HAVE_ENTRY_PROGRESS +#if !GTK_CHECK_VERSION (2, 16, 0) /* GTK+/ GtkEntry internal helper function Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald @@ -345,7 +343,7 @@ entry_expose_event (GtkWidget* entry, gdk_drawable_get_size (text_area, &width, &height); - if (location_entry->progress > 0.0/* && location_entry->progress < 1.0*/) + if (location_entry->progress > 0.0) { gtk_paint_box (entry->style, text_area, GTK_STATE_SELECTED, GTK_SHADOW_OUT, @@ -362,18 +360,18 @@ void midori_location_entry_set_progress (MidoriLocationEntry* location_entry, gdouble progress) { - #ifdef HAVE_ENTRY_PROGRESS GtkWidget* child; - #endif g_return_if_fail (MIDORI_IS_LOCATION_ENTRY (location_entry)); location_entry->progress = CLAMP (progress, 0.0, 1.0); - #ifdef HAVE_ENTRY_PROGRESS child = gtk_bin_get_child (GTK_BIN (location_entry)); + #if !GTK_CHECK_VERSION (2, 16, 0) if (GTK_ENTRY (child)->text_area) gdk_window_invalidate_rect (GTK_ENTRY (child)->text_area, NULL, FALSE); + #else + gtk_entry_set_progress_fraction (GTK_ENTRY (child), progress); #endif } @@ -397,7 +395,7 @@ midori_location_entry_init (MidoriLocationEntry* location_entry) GTK_ICON_ENTRY_SECONDARY, TRUE); g_signal_connect_after (entry, "key-press-event", G_CALLBACK (entry_key_press_event), location_entry); - #ifdef HAVE_ENTRY_PROGRESS + #if !GTK_CHECK_VERSION (2, 16, 0) g_signal_connect_after (entry, "expose-event", G_CALLBACK (entry_expose_event), location_entry); #endif diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index b58e48e3..f7df3c9c 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -532,7 +532,7 @@ midori_search_action_connect_proxy (GtkAction* action, midori_search_action_key_press_event_cb, action, "signal::focus-out-event", midori_search_action_focus_out_event_cb, action, - "signal::icon-released", + "signal::icon-release", midori_search_action_icon_released_cb, action, "signal::scroll-event", midori_search_action_scroll_event_cb, action, From 52ab540db5df5cc2c2d35d62369285ff2b4e2771 Mon Sep 17 00:00:00 2001 From: Jordan Callicoat Date: Sat, 11 Apr 2009 12:24:43 +0200 Subject: [PATCH 0979/2970] Teach magic_uri that hostnames don't contain spaces New test cases included. Two of them are commented out since they are not supported but should logcially be. --- midori/sokoke.c | 5 +++-- tests/magic-uri.c | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 09fc9f56..d791c879 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -243,8 +243,9 @@ sokoke_magic_uri (const gchar* uri, return sokoke_idn_to_punycode (g_strdup (uri)); /* Do we have a domain, ip address or localhost? */ - if ((search = strchr (uri, ':')) && search[0] && - !g_ascii_isalpha (search[1]) && search[1] != ' ') + search = NULL; + if (!strchr (uri, ' ') && (search = strchr (uri, ':')) && + search[0] && !g_ascii_isalpha (search[1])) if (!strchr (search, '.')) return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 4611959f..e0715399 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -75,6 +75,8 @@ magic_uri_uri (void) test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); test_input ("file:///home/mark/foo/bar.html", "file:///home/mark/foo/bar.html"); + /* test_input ("foo:123@bar.baz", "foo:123@bar.baz"); */ + /* test_input ("foo:foo@bar.baz", "foo:foo@bar.baz"); */ } static void @@ -130,6 +132,8 @@ magic_uri_search (void) test_input ("sm de.po verbose", SM "de.po verbose"); test_input ("sm warning: configure /dev/net: virtual", SM "warning: configure /dev/net: virtual"); + test_input ("g \"ISO 9001:2000 certified\"", NULL); + test_input ("g conference \"April 2, 7:00 am\"", NULL); } static void From 50f078575b9ad8581b0c8fe348b1b2f0f895cf2c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Apr 2009 22:24:56 +0200 Subject: [PATCH 0980/2970] Show search engines as "actions" in location completion --- midori/midori-browser.c | 2 + midori/midori-locationaction.c | 106 ++++++++++++++++++++++++++++++++- midori/midori-locationaction.h | 4 ++ 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 47ac21ef..8508bd2a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4751,6 +4751,8 @@ midori_browser_set_property (GObject* object, case PROP_SEARCH_ENGINES: /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_dup_object (value)); + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), browser->search_engines); midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), browser->search_engines); /* FIXME: Connect to updates */ diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c793bb14..7405df47 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -27,6 +27,7 @@ struct _MidoriLocationAction GtkAction parent_instance; gchar* uri; + KatzeArray* search_engines; gdouble progress; gchar* secondary_icon; @@ -292,6 +293,7 @@ static void midori_location_action_init (MidoriLocationAction* location_action) { location_action->uri = NULL; + location_action->search_engines = NULL; location_action->progress = 0.0; location_action->secondary_icon = NULL; location_action->default_icon = NULL; @@ -314,6 +316,7 @@ midori_location_action_finalize (GObject* object) MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object); katze_assign (location_action->uri, NULL); + katze_assign (location_action->search_engines, NULL); katze_object_assign (location_action->model, NULL); katze_object_assign (location_action->sort_model, NULL); @@ -728,6 +731,51 @@ midori_location_entry_match_selected_cb (GtkEntryCompletion* completion, return FALSE; } +static void +midori_location_entry_action_activated_cb (GtkEntryCompletion* completion, + gint action, + MidoriLocationAction* location_action) +{ + if (location_action->search_engines) + { + KatzeItem* item = katze_array_get_nth_item ( + location_action->search_engines, action); + GtkWidget* entry = gtk_entry_completion_get_entry (completion); + const gchar* keywords = gtk_entry_get_text (GTK_ENTRY (entry)); + const gchar* uri = katze_item_get_uri (item); + gchar* search; + if (!item) + return; + if (strstr (uri, "%s")) + search = g_strdup_printf (uri, keywords); + else + search = g_strconcat (uri, " ", keywords, NULL); + midori_location_action_set_uri (location_action, search); + g_signal_emit (location_action, signals[SUBMIT_URI], 0, search, FALSE); + g_free (search); + } +} + +static void +midori_location_action_add_actions (GtkEntryCompletion* completion, + KatzeArray* search_engines) +{ + guint i; + KatzeItem* item; + + if (!search_engines) + return; + + i = 0; + while ((item = katze_array_get_nth_item (search_engines, i++))) + { + gchar* text = g_strdup_printf (_("Search with %s"), + katze_item_get_name (item)); + gtk_entry_completion_insert_action_text (completion, i, text); + g_free (text); + } +} + static void midori_location_action_completion_init (MidoriLocationAction* location_action, GtkWidget* location_entry) @@ -763,6 +811,11 @@ midori_location_action_completion_init (MidoriLocationAction* location_action, g_signal_connect (completion, "match-selected", G_CALLBACK (midori_location_entry_match_selected_cb), location_action); + midori_location_action_add_actions (completion, + location_action->search_engines); + g_signal_connect (completion, "action-activated", + G_CALLBACK (midori_location_entry_action_activated_cb), location_action); + g_object_unref (completion); } @@ -1151,6 +1204,55 @@ midori_location_action_set_title_for_uri (MidoriLocationAction* location_action, midori_location_action_prepend_item (location_action, &item); } +/** + * midori_location_action_set_search_engines: + * @location_action: a #MidoriLocationAction + * @search_engines: a #KatzeArray + * + * Assigns the specified search engines to the location action. + * Search engines will appear as actions in the completion. + * + * Since: 0.1.6 + **/ +void +midori_location_action_set_search_engines (MidoriLocationAction* location_action, + KatzeArray* search_engines) +{ + GSList* proxies; + GtkWidget* alignment; + GtkWidget* entry; + GtkWidget* child; + GtkEntryCompletion* completion; + + g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); + + if (search_engines) + g_object_ref (search_engines); + + proxies = gtk_action_get_proxies (GTK_ACTION (location_action)); + + for (; proxies != NULL; proxies = g_slist_next (proxies)) + if (GTK_IS_TOOL_ITEM (proxies->data)) + { + KatzeItem* item; + guint i; + + alignment = gtk_bin_get_child (GTK_BIN (proxies->data)); + entry = gtk_bin_get_child (GTK_BIN (alignment)); + child = gtk_bin_get_child (GTK_BIN (entry)); + + completion = gtk_entry_get_completion (GTK_ENTRY (child)); + i = 0; + if (location_action->search_engines) + while ((item = katze_array_get_nth_item (location_action->search_engines, i))) + gtk_entry_completion_delete_action (completion, i++); + midori_location_action_add_actions (completion, search_engines); + } + + katze_object_assign (location_action->search_engines, search_engines); + /* FIXME: Take care of adding and removing search engines as needed */ +} + gdouble midori_location_action_get_progress (MidoriLocationAction* location_action) { @@ -1218,8 +1320,8 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action } /** - * midori_location_entry_set_item_from_uri: - * @location_entry: a #MidoriLocationEntry + * midori_location_action_set_item_from_uri: + * @location_action: a #MidoriLocationAction * @uri: a string * * Finds the item from the list matching @uri diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h index beefb3cf..593d55df 100644 --- a/midori/midori-locationaction.h +++ b/midori/midori-locationaction.h @@ -81,6 +81,10 @@ midori_location_action_set_title_for_uri (MidoriLocationAction* location_acti const gchar* title, const gchar* text); +void +midori_location_action_set_search_engines (MidoriLocationAction* location_action, + KatzeArray* search_engines); + gdouble midori_location_action_get_progress (MidoriLocationAction* location_action); From e7d20f467cbdb9583b6a2c58a0742fa3a99ffddf Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Apr 2009 01:32:06 +0200 Subject: [PATCH 0981/2970] Show all search engines in selection context menu This replaces the generic Search the Web unless no search engines are defined, which is actually a corner case. --- midori/midori-searchaction.c | 20 +++++----- midori/midori-view.c | 73 +++++++++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 24 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index f7df3c9c..e8e860dc 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -377,10 +377,11 @@ midori_search_action_manage_activate_cb (GtkWidget* menuitem, gtk_widget_show (dialog); } -static GdkPixbuf* -midori_search_action_get_icon (MidoriSearchAction* search_action, - KatzeItem* item, - GtkWidget* widget) +/* Private function, used by MidoriView */ +/* static */ GdkPixbuf* +midori_search_action_get_icon (KatzeNet* net, + KatzeItem* item, + GtkWidget* widget) { const gchar* icon; @@ -403,8 +404,7 @@ midori_search_action_get_icon (MidoriSearchAction* search_action, } if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://"))) - return katze_net_load_icon (search_action->net, - icon, NULL, widget, NULL); + return katze_net_load_icon (net, icon, NULL, widget, NULL); return gtk_widget_render_icon (widget, GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL); @@ -438,8 +438,8 @@ midori_search_action_icon_released_cb (GtkWidget* entry, menuitem = gtk_image_menu_item_new_with_label ( katze_item_get_name (item)); image = gtk_image_new (); - icon = midori_search_action_get_icon (MIDORI_SEARCH_ACTION (action), - item, entry); + icon = midori_search_action_get_icon ( + MIDORI_SEARCH_ACTION (action)->net, item, entry); gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon); g_object_unref (icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); @@ -493,7 +493,7 @@ midori_search_action_set_entry_icon (MidoriSearchAction* search_action, if (search_action->current_item) { - icon = midori_search_action_get_icon (search_action, + icon = midori_search_action_get_icon (search_action->net, search_action->current_item, entry); gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry), GTK_ICON_ENTRY_PRIMARY, icon); @@ -730,7 +730,7 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, gtk_tree_model_get (model, iter, 0, &item, -1); search_action = g_object_get_data (G_OBJECT (treeview), "search-action"); - icon = midori_search_action_get_icon (search_action, item, treeview); + icon = midori_search_action_get_icon (search_action->net, item, treeview); g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL); g_object_unref (icon); } diff --git a/midori/midori-view.c b/midori/midori-view.c index f77e0c03..18987330 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -39,6 +39,11 @@ webkit_web_view_get_selected_text (WebKitWebView* web_view); void webkit_web_frame_print (WebKitWebFrame* web_frame); +GdkPixbuf* +midori_search_action_get_icon (KatzeNet* net, + KatzeItem* item, + GtkWidget* widget); + struct _MidoriView { GtkScrolledWindow parent_instance; @@ -900,18 +905,21 @@ static void midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, MidoriView* view) { + gchar* search; gchar* uri; - gchar* location_entry_search; - g_object_get (view->settings, "location-entry-search", - &location_entry_search, NULL); - if (strstr (location_entry_search, "%s")) + if ((search = g_object_get_data (G_OBJECT (widget), "search"))) + search = g_strdup (search); + else + g_object_get (view->settings, "location-entry-search", + &search, NULL); + if (strstr (search, "%s")) { - uri = g_strdup_printf (location_entry_search, view->selected_text); - g_free (location_entry_search); + uri = g_strdup_printf (search, view->selected_text); + g_free (search); } else - uri = location_entry_search; + uri = search; g_signal_emit (view, signals[NEW_TAB], 0, uri, view->open_tabs_in_the_background); @@ -1048,14 +1056,51 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, if (!view->link_uri && has_selection) { + GtkWidget* window; + guint i; + + window = gtk_widget_get_toplevel (GTK_WIDGET (web_view)); + i = 0; + if (katze_object_has_property (window, "search-engines")) + { + KatzeArray* search_engines; + KatzeItem* item; + + search_engines = katze_object_get_object (window, "search-engines"); + while ((item = katze_array_get_nth_item (search_engines, i++))) + { + GdkPixbuf* pixbuf; + gchar* text = g_strdup_printf (_("Search with %s"), + katze_item_get_name (item)); + menuitem = gtk_image_menu_item_new_with_mnemonic (text); + g_free (text); + pixbuf = midori_search_action_get_icon (view->net, item, + GTK_WIDGET (web_view)); + icon = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, i - 1); + g_object_set_data (G_OBJECT (menuitem), "search", + (gchar*)katze_item_get_uri (item)); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); + gtk_widget_show (menuitem); + } + g_object_unref (search_engines); + } items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, 0); - /* hack to localize menu item */ - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), _("_Search the Web")); - /* hack to implement Search the Web */ - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); + menuitem = (GtkWidget*)g_list_nth_data (items, i - 1); + if (i > 1) + gtk_widget_destroy (menuitem); + else + { + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), _("_Search the Web")); + /* hack to implement Search the Web */ + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); + } g_list_free (items); if (strchr (view->selected_text, '.') && !strchr (view->selected_text, ' ')) From 89698772bba822ecce3dae35e5620658a9942db4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Apr 2009 14:00:32 +0200 Subject: [PATCH 0982/2970] Try to decide what an @ in a location refers to We assume the usual case is that you intend to search for an email address, a host with a login isn't recognized. --- midori/sokoke.c | 6 +++--- tests/magic-uri.c | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index d791c879..4303ff40 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -244,10 +244,10 @@ sokoke_magic_uri (const gchar* uri, /* Do we have a domain, ip address or localhost? */ search = NULL; - if (!strchr (uri, ' ') && (search = strchr (uri, ':')) && + if (!strchr (uri, ' ') && + ((search = strchr (uri, ':')) || (search = strchr (uri, '@'))) && search[0] && !g_ascii_isalpha (search[1])) - if (!strchr (search, '.')) - return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); + return sokoke_idn_to_punycode (g_strconcat ("http://", uri, NULL)); if (!strcmp (uri, "localhost") || g_str_has_prefix (uri, "localhost/")) return g_strconcat ("http://", uri, NULL); parts = g_strsplit (uri, ".", 0); diff --git a/tests/magic-uri.c b/tests/magic-uri.c index e0715399..381acd4c 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -75,8 +75,9 @@ magic_uri_uri (void) test_input ("192.168.1.1:8000", "http://192.168.1.1:8000"); test_input ("file:///home/mark/foo/bar.html", "file:///home/mark/foo/bar.html"); - /* test_input ("foo:123@bar.baz", "foo:123@bar.baz"); */ - /* test_input ("foo:foo@bar.baz", "foo:foo@bar.baz"); */ + test_input ("foo:123@bar.baz", "http://foo:123@bar.baz"); + /* test_input ("foo:f1o2o3@bar.baz", "http://f1o2o3:foo@bar.baz"); */ + /* test_input ("foo:foo@bar.baz", "http://foo:foo@bar.baz"); */ } static void @@ -134,6 +135,8 @@ magic_uri_search (void) SM "warning: configure /dev/net: virtual"); test_input ("g \"ISO 9001:2000 certified\"", NULL); test_input ("g conference \"April 2, 7:00 am\"", NULL); + test_input ("max@mustermann.de", NULL); + test_input ("g max@mustermann.de", NULL); } static void From 81d67d3c2e64c7249537f0683a2204523bdbbe2b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Apr 2009 14:09:06 +0200 Subject: [PATCH 0983/2970] Don't show the progressbar if the location shows progress --- midori/midori-browser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8508bd2a..ff1c6c46 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -287,7 +287,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) g_object_set (action, "stock-id", GTK_STOCK_STOP, "tooltip", _("Stop loading the current page"), NULL); - gtk_widget_show (browser->progressbar); + if (!browser->progress_in_location || !GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->progressbar); if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !GTK_WIDGET_VISIBLE (browser->navigationbar) && browser->progress_in_location) From dc40d878d518dc68b4014bd304bb98e0581938dc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Apr 2009 14:28:11 +0200 Subject: [PATCH 0984/2970] Compute a string if the identification string is empty --- midori/midori-websettings.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 0edffc45..08677f6a 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -1138,8 +1138,8 @@ midori_web_settings_set_property (GObject* object, if (web_settings->identify_as != MIDORI_IDENT_CUSTOM) { gchar* string = generate_ident_string (web_settings->identify_as); - g_object_set (object, "ident-string", string, NULL); - g_free (string); + katze_assign (web_settings->ident_string, string); + g_object_notify (object, "ident-string"); } break; case PROP_IDENT_STRING: @@ -1316,6 +1316,11 @@ midori_web_settings_get_property (GObject* object, g_value_set_enum (value, web_settings->identify_as); break; case PROP_IDENT_STRING: + if (!g_strcmp0 (web_settings->ident_string, "")) + { + gchar* string = generate_ident_string (web_settings->identify_as); + katze_assign (web_settings->ident_string, string); + } g_value_set_string (value, web_settings->ident_string); break; case PROP_CACHE_SIZE: From 1038ee41a3a1426c4a40ff13519eefbda1b56737 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Apr 2009 21:57:20 +0200 Subject: [PATCH 0985/2970] Don't touch the ythickness of the notebook This allows the active tab to visually move above other tabs. The drawback is that it makes all tabs somewhat larger. --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index ff1c6c46..f13820be 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4204,7 +4204,7 @@ midori_browser_init (MidoriBrowser* browser) browser->notebook = gtk_notebook_new (); /* Remove the inner border between scrollbars and the window border */ rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; + rcstyle->xthickness = 0; gtk_widget_modify_style (browser->notebook, rcstyle); g_object_unref (rcstyle); gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE); From 1b8de1588f854947e5c066ea4afd4b05b410468a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BChlfelder?= Date: Sun, 12 Apr 2009 22:44:11 +0200 Subject: [PATCH 0986/2970] Apply URI magic to externally opened addresses --- midori/midori-app.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 27fbe87a..b753a64f 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -14,6 +14,7 @@ #endif #include "midori-app.h" +#include "sokoke.h" #include #include @@ -385,14 +386,16 @@ midori_browser_message_received_cb (UniqueApp* instance, first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); while (*uris) { + gchar* fixed_uri = sokoke_magic_uri (*uris, NULL); if (first) { - midori_browser_set_current_uri (browser, *uris); + midori_browser_set_current_uri (browser, fixed_uri); first = FALSE; } else midori_browser_set_current_page (browser, - midori_browser_add_uri (browser, *uris)); + midori_browser_add_uri (browser, fixed_uri)); + g_free (fixed_uri); uris++; } /* g_strfreev (uris); */ From 85f23862798d47525a67c3a8895e7ff6951b1376 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 12 Apr 2009 23:31:42 +0200 Subject: [PATCH 0987/2970] Revert "Apply URI magic to externally opened addresses" The commit had the wrong author name. --- midori/midori-app.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index b753a64f..27fbe87a 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -14,7 +14,6 @@ #endif #include "midori-app.h" -#include "sokoke.h" #include #include @@ -386,16 +385,14 @@ midori_browser_message_received_cb (UniqueApp* instance, first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); while (*uris) { - gchar* fixed_uri = sokoke_magic_uri (*uris, NULL); if (first) { - midori_browser_set_current_uri (browser, fixed_uri); + midori_browser_set_current_uri (browser, *uris); first = FALSE; } else midori_browser_set_current_page (browser, - midori_browser_add_uri (browser, fixed_uri)); - g_free (fixed_uri); + midori_browser_add_uri (browser, *uris)); uris++; } /* g_strfreev (uris); */ From 22ded9a981e07c2d4e0518480b87a589463903a0 Mon Sep 17 00:00:00 2001 From: Ernst Persson Date: Sun, 12 Apr 2009 23:37:15 +0200 Subject: [PATCH 0988/2970] Apply URI magic to externally opened addresses --- midori/midori-app.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index 27fbe87a..b753a64f 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -14,6 +14,7 @@ #endif #include "midori-app.h" +#include "sokoke.h" #include #include @@ -385,14 +386,16 @@ midori_browser_message_received_cb (UniqueApp* instance, first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); while (*uris) { + gchar* fixed_uri = sokoke_magic_uri (*uris, NULL); if (first) { - midori_browser_set_current_uri (browser, *uris); + midori_browser_set_current_uri (browser, fixed_uri); first = FALSE; } else midori_browser_set_current_page (browser, - midori_browser_add_uri (browser, *uris)); + midori_browser_add_uri (browser, fixed_uri)); + g_free (fixed_uri); uris++; } /* g_strfreev (uris); */ From 78813a03e5f69859de0283b2eb7df9efe9dacf29 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 03:38:28 +0200 Subject: [PATCH 0989/2970] Be generous if middle click pastes contain spaces and line breaks --- midori/midori-view.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 18987330..c9289256 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -767,13 +767,13 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, background = view->open_tabs_in_the_background; if (event->state & GDK_SHIFT_MASK) background = !background; - g_signal_emit_by_name (view, "new-tab", link_uri, background); + g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background); return TRUE; } else if (event->state & GDK_SHIFT_MASK) { /* Open link in new window */ - g_signal_emit_by_name (view, "new-window", link_uri); + g_signal_emit (view, signals[NEW_WINDOW], 0, link_uri); return TRUE; } else if (event->state & GDK_MOD1_MASK) @@ -782,7 +782,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, background = view->open_tabs_in_the_background; if (event->state & GDK_CONTROL_MASK) background = !background; - g_signal_emit_by_name (view, "new-tab", link_uri, background); + g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background); return TRUE; } break; @@ -793,7 +793,7 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, background = view->open_tabs_in_the_background; if (event->state & GDK_CONTROL_MASK) background = !background; - g_signal_emit_by_name (view, "new-tab", link_uri, background); + g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background); return TRUE; } else if (event->state & GDK_CONTROL_MASK) @@ -803,19 +803,23 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, } else if (view->middle_click_opens_selection) { + guint i = 0; clipboard = gtk_clipboard_get_for_display ( gtk_widget_get_display (GTK_WIDGET (view)), GDK_SELECTION_PRIMARY); uri = gtk_clipboard_wait_for_text (clipboard); - if (uri && strchr (uri, '.') && !strchr (g_strstrip (uri), ' ')) + if (uri && strchr (uri, '.')) { - new_uri = sokoke_magic_uri (uri, NULL); + while (uri[i++] != '\0') + if (uri[i] == '\n' || uri[i] == '\r') + uri[i] = ' '; + new_uri = sokoke_magic_uri (g_strstrip (uri), NULL); if (event->state & GDK_CONTROL_MASK) { background = view->open_tabs_in_the_background; if (event->state & GDK_CONTROL_MASK) background = !background; - g_signal_emit_by_name (view, "new-tab", new_uri, background); + g_signal_emit (view, signals[NEW_TAB], 0, new_uri, background); } else { @@ -823,9 +827,9 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, gtk_widget_grab_focus (GTK_WIDGET (view)); } g_free (new_uri); - g_free (uri); return TRUE; } + g_free (uri); } break; case 8: From 377f45d3add1e7d33f5720ca9c697833fb955b84 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 04:05:05 +0200 Subject: [PATCH 0990/2970] Work around failure to reload Not found pages --- midori/midori-view.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index c9289256..fb1290c3 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -659,6 +659,7 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, { /* i18n: The title of the 404 - Not found error page */ title = g_strdup_printf (_("Not found - %s"), view->uri); + katze_assign (view->title, title); data = g_strdup_printf ( "%s" "

%s

" @@ -669,7 +670,6 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, "or move on to another page." "", title, title, view->uri); - g_free (title); webkit_web_view_load_html_string ( WEBKIT_WEB_VIEW (view->web_view), data, view->uri); g_free (data); @@ -2484,12 +2484,21 @@ void midori_view_reload (MidoriView* view, gboolean from_cache) { + gchar* title; + g_return_if_fail (MIDORI_IS_VIEW (view)); - if (from_cache) + /* Error pages are special, we want to try loading the destination + again, not the error page which isn't even a proper page */ + title = g_strdup_printf (_("Not found - %s"), view->uri); + if (view->title && strstr (title, view->title)) + webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); + else if (from_cache) webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view)); else webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view)); + + g_free (title); } /** From adec1c70935debda4be437a597c777bcf992f92e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 04:07:20 +0200 Subject: [PATCH 0991/2970] Don't try to render "nothing" in completion, like an empty title --- midori/midori-locationaction.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 7405df47..86aa3c7b 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -521,11 +521,15 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, len = strlen (key); skey = g_malloc0 (len + 1); strncpy (skey, uri + (start - temp), len); - parts = g_strsplit (uri, skey, 2); - if (parts && parts[0] && parts[1]) - desc_uri = g_markup_printf_escaped ("%s%s%s", - parts[0], skey, parts[1]); - g_strfreev (parts); + if (skey && *skey && (parts = g_strsplit (uri, skey, 2))) + { + if (parts[0] && parts[1]) + { + desc_uri = g_markup_printf_escaped ("%s%s%s", + parts[0], skey, parts[1]); + g_strfreev (parts); + } + } g_free (skey); } g_free (temp); From 94c1d3c7131252499a6adac5d3554344bbcbde67 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 04:38:01 +0200 Subject: [PATCH 0992/2970] Implement "-a" or "--app" to run web apps At the moment this takes an URI and opens a standalone window with a non-editable toolbar and a statusbar. --- midori/main.c | 27 +++++++++++++++++++++++++++ midori/midori-browser.c | 4 ++++ 2 files changed, 31 insertions(+) diff --git a/midori/main.c b/midori/main.c index 57480bd8..cab8d0af 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1322,6 +1322,7 @@ int main (int argc, char** argv) { + gchar* webapp; gchar* config; gboolean run; gboolean version; @@ -1331,6 +1332,8 @@ main (int argc, GError* error; GOptionEntry entries[] = { + { "app", 'a', 0, G_OPTION_ARG_STRING, &webapp, + N_("Run ADDRESS as a web application"), N_("ADDRESS") }, { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config, N_("Use FOLDER as configuration folder"), N_("FOLDER") }, { "run", 'r', 0, G_OPTION_ARG_NONE, &run, @@ -1373,6 +1376,7 @@ main (int argc, #endif /* Parse cli options */ + webapp = NULL; config = NULL; run = FALSE; version = FALSE; @@ -1408,6 +1412,29 @@ main (int argc, return 0; } + /* Web Application support */ + if (webapp) + { + MidoriBrowser* browser = midori_browser_new (); + settings = katze_object_get_object (browser, "settings"); + g_object_set (settings, + "show-menubar", FALSE, + "show-navigationbar", TRUE, + "toolbar-items", "Back,Forward,ReloadStop,Location", + "show-statusbar", TRUE, + NULL); + g_object_unref (settings); + g_object_set (browser, "settings", settings, NULL); + midori_browser_add_uri (browser, webapp); + g_object_set_data (G_OBJECT (browser), "locked", (void*)1); + g_signal_connect (browser, "destroy", + G_CALLBACK (gtk_main_quit), NULL); + gtk_widget_show (GTK_WIDGET (browser)); + midori_browser_activate_action (browser, "Location"); + gtk_main (); + return 0; + } + /* Standalone javascript support */ if (run) return midori_run_script (uris ? *uris : NULL); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f13820be..caa81ed6 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1943,6 +1943,10 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, GtkWidget* menu; GtkWidget* menuitem; + /* Unsupported trick used for web app mode */ + if (g_object_get_data (G_OBJECT (browser), "locked")) + return FALSE; + menu = gtk_menu_new (); menuitem = sokoke_action_create_popup_menu_item ( _action_by_name (browser, "Menubar")); From c27642e9124669cda91d85bcaeb02a794c661721 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 22:40:57 +0200 Subject: [PATCH 0993/2970] Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment. --- midori/midori-browser.c | 88 ++++++----------------------------------- midori/midori-view.c | 56 ++++++++------------------ midori/sokoke.c | 11 +++++- midori/sokoke.h | 2 +- 4 files changed, 39 insertions(+), 118 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index caa81ed6..33da510a 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -302,15 +302,13 @@ _midori_browser_update_interface (MidoriBrowser* browser) } katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); - /* FIXME: This won't work due to a bug in GtkIconEntry */ - /* if (view && midori_view_get_news_feeds (MIDORI_VIEW (view))) - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, STOCK_NEWS_FEED); + action = _action_by_name (browser, "Location"); + if (g_object_get_data (G_OBJECT (view), "news-feeds")) + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); else - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY ( - gtk_bin_get_child (GTK_BIN (browser->location))), - GTK_ICON_ENTRY_SECONDARY, NULL);*/ + midori_location_action_set_secondary_icon ( + MIDORI_LOCATION_ACTION (action), GTK_STOCK_INFO); } static void @@ -418,7 +416,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, midori_location_action_set_uri ( MIDORI_LOCATION_ACTION (action), uri); midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), NULL); + MIDORI_LOCATION_ACTION (action), GTK_STOCK_INFO); g_object_notify (G_OBJECT (browser), "uri"); } @@ -446,20 +444,6 @@ midori_view_context_ready_cb (GtkWidget* view, g_signal_emit (browser, signals[CONTEXT_READY], 0, js_context); } -/* -static void -midori_web_view_news_feed_ready_cb (MidoriWebView* web_view, - const gchar* href, - const gchar* type, - const gchar* title, - MidoriBrowser* browser) -{ - if (web_view == (MidoriWebView*)midori_browser_get_current_web_view (browser)) - midori_location_action_set_secondary_icon (MIDORI_LOCATION_ACTION ( - _action_by_name (browser, "Location")), STOCK_NEWS_FEED); -} -*/ - static void midori_view_notify_title_cb (GtkWidget* view, GParamSpec* pspec, @@ -1135,8 +1119,6 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_notify_progress_cb, browser, "signal::context-ready", midori_view_context_ready_cb, browser, - /* "signal::news-feed-ready", - midori_view_news_feed_ready_cb, browser, */ "signal::notify::title", midori_view_notify_title_cb, browser, "signal::notify::zoom-level", @@ -2581,63 +2563,19 @@ _action_location_submit_uri (GtkAction* action, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } -static void -midori_browser_menu_feed_item_activate_cb (GtkWidget* widget, - MidoriBrowser* browser) -{ - const gchar* uri; - - uri = g_object_get_data (G_OBJECT (widget), "uri"); - midori_browser_set_current_uri (browser, uri); -} - static void _action_location_secondary_icon_released (GtkAction* action, GtkWidget* widget, MidoriBrowser* browser) { - MidoriView* view; - KatzeArray* news_feeds; - GtkWidget* menu; - guint n, i; - KatzeItem* feed; - const gchar* uri; - const gchar* title; - GtkWidget* menuitem; + GtkWidget* view; - view = (MidoriView*)midori_browser_get_current_tab (browser); - if (view) + if ((view = midori_browser_get_current_tab (browser))) { - news_feeds = NULL /* midori_view_get_news_feeds (view) */; - n = news_feeds ? katze_array_get_length (news_feeds) : 0; - if (n) - { - menu = gtk_menu_new (); - for (i = 0; i < n; i++) - { - if (!(feed = katze_array_get_nth_item (news_feeds, i))) - continue; - - uri = katze_item_get_uri (feed); - title = katze_item_get_name (feed); - if (!(title && *title)) - title = uri; - menuitem = sokoke_image_menu_item_new_ellipsized (title); - /* FIXME: Get the real icon */ - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM ( - menuitem), gtk_image_new_from_stock (STOCK_NEWS_FEED, - GTK_ICON_SIZE_MENU)); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data_full (G_OBJECT (menuitem), - "uri", g_strup ((gchar*)uri), g_free); - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_browser_menu_feed_item_activate_cb), - browser); - gtk_widget_show (menuitem); - } - sokoke_widget_popup (widget, GTK_MENU (menu), NULL, - SOKOKE_MENU_POSITION_CURSOR); - } + const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); + /* FIXME: Support a user chosen feed reader */ + if (1) + sokoke_spawn_program ("liferea-add-feed", uri); } } diff --git a/midori/midori-view.c b/midori/midori-view.c index fb1290c3..3ac7c304 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -622,31 +622,6 @@ webkit_web_view_progress_changed_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "progress"); } -/*static void -gjs_value_links_foreach_cb (GjsValue* link, - MidoriView* view) -{ - const gchar* type; - - if (gjs_value_is_object (link) && gjs_value_has_attribute (link, "href")) - { - if (gjs_value_has_attribute (link, "type")) - { - type = gjs_value_get_attribute_string (link, "type"); - if (!strcmp (type, "application/rss+xml") - || !strcmp (type, "application/x.atom+xml") - || !strcmp (type, "application/atom+xml")) - { - katze_array_add_item (view->news_feeds, link); - g_signal_emit (view, signals[NEWS_FEED_READY], - gjs_value_get_attribute_string (link, "href"), type, - gjs_value_has_attribute (link, "title") - ? gjs_value_get_attribute_string (link, "title") : NULL); - } - } - } -}*/ - static void webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, gboolean success, @@ -683,28 +658,29 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, MidoriView* view) { - /* JSContextRef js_context; - GjsValue* value; - GjsValue* document; - GjsValue* links; */ - g_object_freeze_notify (G_OBJECT (view)); view->progress = 1.0; g_object_notify (G_OBJECT (view), "progress"); midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); - g_object_thaw_notify (G_OBJECT (view)); + /* FIXME: Do this conditional on whether there's a custom feed reader */ + if (1) + { + JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + gchar* value = sokoke_js_script_eval (js_context, + "function feeds (l) { var f = new Array (); for (i in l) " + "{ var t = l[i].type; " + "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) " + "f.push (l[i].href); } return f; }" + "feeds (document.getElementsByTagName ('link'))", NULL); + g_object_set_data (G_OBJECT (view), "news-feeds", + value && *value ? (void*)1 : (void*)0); + /* Ensure load-status is notified again, whether it changed or not */ + g_object_notify (G_OBJECT (view), "load-status"); + } - /* js_context = webkit_web_frame_get_global_context (web_frame); - value = gjs_value_new (js_context, NULL); - document = gjs_value_get_by_name (value, "document"); - links = gjs_value_get_elements_by_tag_name (document, "link"); - katze_array_clear (view->news_feeds); - gjs_value_foreach (links, (GjsCallback)gjs_value_links_foreach_cb, view); - g_object_unref (links); - g_object_unref (document); - g_object_unref (value); */ + g_object_thaw_notify (G_OBJECT (view)); } static void diff --git a/midori/sokoke.c b/midori/sokoke.c index 4303ff40..3ef3bc37 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -47,11 +47,14 @@ sokoke_js_string_utf8 (JSStringRef js_string) return string_utf8; } -JSValueRef +gchar* sokoke_js_script_eval (JSContextRef js_context, const gchar* script, gchar** exception) { + gchar* value; + JSStringRef js_value_string; + g_return_val_if_fail (js_context, FALSE); g_return_val_if_fail (script, FALSE); @@ -68,7 +71,11 @@ sokoke_js_script_eval (JSContextRef js_context, js_value = JSValueMakeNull (js_context); } JSStringRelease (js_script); - return js_value; + + js_value_string = JSValueToStringCopy (js_context, js_value, NULL); + value = sokoke_js_string_utf8 (js_value_string); + JSStringRelease (js_value_string); + return value; } static void diff --git a/midori/sokoke.h b/midori/sokoke.h index 72f1305e..0360ab1f 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -18,7 +18,7 @@ #include -JSValueRef +gchar* sokoke_js_script_eval (JSContextRef js_context, const gchar* script, gchar** exception); From a324cad92ab0a01ad2a83011b51d712423f6f2e9 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 22:43:07 +0200 Subject: [PATCH 0994/2970] Using non-utf8 strlen for titles in completion should suffice --- midori/midori-locationaction.c | 3 +-- tests/completion.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 86aa3c7b..030f83d9 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -541,11 +541,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout, temp = g_utf8_strdown (title, -1); if ((start = strstr (temp, key))) { - size_t utf8_len = g_utf8_strlen (key, -1); if (!len) len = strlen (key); skey = g_malloc0 (len + 1); - g_utf8_strncpy (skey, title + (start - temp), utf8_len); + strncpy (skey, title + (start - temp), len); parts = g_strsplit (title, skey, 2); if (parts && parts[0] && parts[1]) desc_title = g_markup_printf_escaped ("%s%s%s", diff --git a/tests/completion.c b/tests/completion.c index 6b6879ee..86ddb5df 100644 --- a/tests/completion.c +++ b/tests/completion.c @@ -31,7 +31,7 @@ static const CompletionItem items[] = { { "http://one.com/one/", "One off" }, { "http://four.org", "One" }, { "https://four.org", "Four" }, - { "ftp://four.org/", "Five" }, + { "ftp://four.org/", "ごオルゴ" }, { "http://muenchen.de/weißwürste/", "Münchner Weißwürste" }, /* Umlauts */ }; static const guint items_n = 9; From 48e2eea7f2ec00094f9f72598505ef3dcfc714e5 Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Mon, 13 Apr 2009 22:46:01 +0200 Subject: [PATCH 0995/2970] Update Japanese translation --- po/ja.po | 635 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 367 insertions(+), 268 deletions(-) diff --git a/po/ja.po b/po/ja.po index b4600d88..ea272656 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-10 20:52+0900\n" -"PO-Revision-Date: 2009-04-10 17:55+0900\n" +"POT-Creation-Date: 2009-04-12 22:19+0900\n" +"PO-Revision-Date: 2009-04-13 01:45+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,8 +20,11 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1384 -#: ../midori/main.c:1392 ../midori/main.c:1403 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1288 +#: ../midori/main.c:1384 +#: ../midori/main.c:1392 +#: ../midori/main.c:1403 #: ../midori/midori-websettings.c:269 msgid "Midori" msgstr "Midori" @@ -40,7 +43,8 @@ msgstr "設定を読み込めませんでした: %s\n" msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:156 ../midori/main.c:228 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" @@ -65,7 +69,9 @@ msgstr "履歴アイテムの削除に失敗しました: %s\n" msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" @@ -86,13 +92,16 @@ msgstr "設定を保存できませんでした。%s" msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 ../midori/main.c:873 +#: ../midori/main.c:850 +#: ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" @@ -103,12 +112,8 @@ msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" #: ../midori/main.c:1073 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" -"ようであれば、問題解決のために以下のオプションのひとつを試してみてください。" +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションのひとつを試してみてください。" #: ../midori/main.c:1088 msgid "Modify _preferences" @@ -209,521 +214,605 @@ msgstr "無視(_I)" msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:338 ../midori/sokoke.c:614 +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:616 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3284 -#: ../midori/midori-browser.c:3290 +#: ../midori/midori-browser.c:278 +#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3421 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3287 +#: ../midori/midori-browser.c:289 +#: ../midori/midori-browser.c:3418 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:352 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:377 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:554 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:554 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:556 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:556 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:586 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:856 +#: ../midori/midori-browser.c:599 +#: ../midori/midori-searchaction.c:856 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:870 +#: ../midori/midori-browser.c:618 +#: ../midori/midori-searchaction.c:870 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:637 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:642 +#: ../midori/midori-browser.c:683 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:758 +#: ../midori/midori-browser.c:759 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1537 +#: ../midori/midori-browser.c:1538 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2845 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:811 +#: ../midori/midori-browser.c:2850 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2852 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2857 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2855 ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:819 +#: ../midori/midori-browser.c:2860 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" -#: ../midori/midori-browser.c:3009 +# Dialog title +#: ../midori/midori-browser.c:3021 +msgid "Clear Private Data" +msgstr "プライベートデータのクリア" + +# Button title +#: ../midori/midori-browser.c:3024 +msgid "Clear private data" +msgstr "プライベートデータのクリア" + +#: ../midori/midori-browser.c:3037 +msgid "Clear the following data:" +msgstr "以下のデータをクリアします:" + +#: ../midori/midori-browser.c:3045 +#: ../midori/midori-preferences.c:628 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "履歴" + +#: ../midori/midori-browser.c:3048 +msgid "Cookies" +msgstr "Cookie" + +#: ../midori/midori-browser.c:3051 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookie" + +#: ../midori/midori-browser.c:3054 +msgid "Website icons" +msgstr "ウェブサイトアイコン" + +#: ../midori/midori-browser.c:3140 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:3017 +#: ../midori/midori-browser.c:3148 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3218 +#: ../midori/midori-browser.c:3349 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3352 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3355 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3227 +#: ../midori/midori-browser.c:3358 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3230 +#: ../midori/midori-browser.c:3361 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3363 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3233 +#: ../midori/midori-browser.c:3364 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3366 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3367 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3370 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3373 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3244 +#: ../midori/midori-browser.c:3375 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3247 +#: ../midori/midori-browser.c:3378 msgid "Cut the selected text" msgstr "選択された文字を切り取ります" -#: ../midori/midori-browser.c:3250 ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3384 msgid "Copy the selected text" msgstr "選択された文字をコピーします" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3387 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3390 msgid "Delete the selected text" msgstr "選択された文字を削除します" -#: ../midori/midori-browser.c:3262 +#: ../midori/midori-browser.c:3393 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3396 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3398 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3399 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3401 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3402 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3405 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3406 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3409 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3411 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3281 +#: ../midori/midori-browser.c:3412 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3293 +#: ../midori/midori-browser.c:3424 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3296 +#: ../midori/midori-browser.c:3427 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3299 +#: ../midori/midori-browser.c:3430 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3300 +#: ../midori/midori-browser.c:3431 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3433 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3305 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3436 +#: ../midori/midori-websettings.c:196 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3308 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3439 +#: ../midori/midori-websettings.c:197 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3311 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-websettings.c:198 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3314 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3445 +#: ../midori/midori-websettings.c:199 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3317 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3448 +#: ../midori/midori-websettings.c:200 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3320 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3451 +#: ../midori/midori-websettings.c:201 #: ../midori/midori-websettings.c:273 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3323 ../midori/midori-view.c:1113 +#: ../midori/midori-browser.c:3454 +#: ../midori/midori-view.c:1161 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3324 +#: ../midori/midori-browser.c:3455 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3457 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3327 +#: ../midori/midori-browser.c:3458 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3462 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3333 +#: ../midori/midori-browser.c:3464 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3336 +#: ../midori/midori-browser.c:3467 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3470 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3473 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3475 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3345 +#: ../midori/midori-browser.c:3476 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3347 ../midori/midori-view.c:1085 +#: ../midori/midori-browser.c:3478 +#: ../midori/midori-view.c:1133 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3348 +#: ../midori/midori-browser.c:3479 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3352 ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3483 +#: ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3485 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "新しいフォルダの追加" + +#: ../midori/midori-browser.c:3486 +msgid "Add a new bookmark folder" +msgstr "新しいブックマークフォルダを追加します" + +#: ../midori/midori-browser.c:3487 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3355 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3489 +#: ../midori/midori-searchaction.c:465 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3490 msgid "Add, edit and remove search engines..." -msgstr "検索エンジンの追加、編集、または削除します" +msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:3360 +#: ../midori/midori-browser.c:3493 +msgid "_Clear Private Data" +msgstr "プライベートデータのクリア(_C)" + +#: ../midori/midori-browser.c:3494 +msgid "Clear private data..." +msgstr "プライベートデータをクリアします..." + +#: ../midori/midori-browser.c:3498 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3361 +#: ../midori/midori-browser.c:3499 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3501 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3502 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3366 +#: ../midori/midori-browser.c:3504 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3506 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3507 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:3509 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3372 +#: ../midori/midori-browser.c:3510 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3512 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3375 +#: ../midori/midori-browser.c:3513 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3516 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3523 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3524 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3391 +#: ../midori/midori-browser.c:3529 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3392 +#: ../midori/midori-browser.c:3530 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3395 +#: ../midori/midori-browser.c:3533 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3396 +#: ../midori/midori-browser.c:3534 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:3537 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3400 +#: ../midori/midori-browser.c:3538 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3403 +#: ../midori/midori-browser.c:3541 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3542 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3545 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3546 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3549 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:3550 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3844 +#: ../midori/midori-browser.c:3984 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3851 +#: ../midori/midori-browser.c:3991 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3853 +#: ../midori/midori-browser.c:3993 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:3877 +#: ../midori/midori-browser.c:4017 msgid "_Web Search..." -msgstr "ウェブ検索(_W)" +msgstr "ウェブ検索(_W)..." -#: ../midori/midori-browser.c:3879 +#: ../midori/midori-browser.c:4019 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:3898 +#: ../midori/midori-browser.c:4038 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:3911 +#: ../midori/midori-browser.c:4051 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:3913 +#: ../midori/midori-browser.c:4053 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:3926 ../midori/sokoke.c:769 +#: ../midori/midori-browser.c:4066 +#: ../midori/sokoke.c:771 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:3928 +#: ../midori/midori-browser.c:4068 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:3941 +#: ../midori/midori-browser.c:4081 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:3943 +#: ../midori/midori-browser.c:4083 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4250 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4275 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4140 +#: ../midori/midori-browser.c:4280 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4145 +#: ../midori/midori-browser.c:4285 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4153 +#: ../midori/midori-browser.c:4293 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4163 +#: ../midori/midori-browser.c:4303 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4469 +#: ../midori/midori-browser.c:4609 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:227 ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "選択されたパネルをウィンドウから切り離す" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "選択されたパネルをウィンドウから切り離します" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:511 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:512 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-panel.c:239 ../midori/midori-panel.c:240 +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1917 +#: ../midori/midori-websettings.c:179 +#: ../midori/midori-view.c:1965 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:180 +#: ../midori/midori-websettings.c:531 msgid "Homepage" msgstr "ホームページ" @@ -771,7 +860,8 @@ msgstr "すべての Cookie" msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:254 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "なし" @@ -842,7 +932,7 @@ msgstr "メニューバーを表示する" #: ../midori/midori-websettings.c:399 msgid "Whether to show the menubar" -msgstr "メニューバーを表示するかどうか指定します" +msgstr "メニューバーを表示します" #: ../midori/midori-websettings.c:407 msgid "Show Navigationbar" @@ -850,7 +940,7 @@ msgstr "ナビゲーションバーを表示する" #: ../midori/midori-websettings.c:408 msgid "Whether to show the navigationbar" -msgstr "ナビゲーションバーを表示するかどうか指定します" +msgstr "ナビゲーションバーを表示します" #: ../midori/midori-websettings.c:416 msgid "Show Bookmarkbar" @@ -858,7 +948,7 @@ msgstr "ブックマークバーを表示する" #: ../midori/midori-websettings.c:417 msgid "Whether to show the bookmarkbar" -msgstr "ブックマークバーを表示するかどうか指定します" +msgstr "ブックマークバーを表示します" #: ../midori/midori-websettings.c:425 msgid "Show Panel" @@ -866,7 +956,7 @@ msgstr "パネルを表示する" #: ../midori/midori-websettings.c:426 msgid "Whether to show the panel" -msgstr "パネルを表示するかどうか指定します" +msgstr "パネルを表示します" #: ../midori/midori-websettings.c:441 msgid "Show Transferbar" @@ -882,7 +972,7 @@ msgstr "ステータスバーを表示する" #: ../midori/midori-websettings.c:451 msgid "Whether to show the statusbar" -msgstr "ステータスバーを表示するかどうか指定します" +msgstr "ステータスバーを表示します" #: ../midori/midori-websettings.c:460 msgid "Toolbar Style" @@ -934,7 +1024,7 @@ msgstr "クラッシュダイアログを表示する" #: ../midori/midori-websettings.c:548 msgid "Show a dialog after Midori crashed" -msgstr "Midori がクラッシュした後の起動時にダイアログを表示する" +msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" #: ../midori/midori-websettings.c:556 msgid "Download Folder" @@ -1154,70 +1244,79 @@ msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#: ../midori/midori-view.c:661 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:998 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:992 +#: ../midori/midori-view.c:1000 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1009 +#: ../midori/midori-view.c:1017 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1018 ../midori/midori-view.c:1032 +#: ../midori/midori-view.c:1026 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1024 +#: ../midori/midori-view.c:1032 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:1055 +#: ../midori/midori-view.c:1041 +msgid "Download with Download _Manager" +msgstr "ダウンロードマネージャでダウンロード(_M)" + +#: ../midori/midori-view.c:1073 +#, c-format +msgid "Search with %s" +msgstr "%s で検索" + +#: ../midori/midori-view.c:1099 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1064 +#: ../midori/midori-view.c:1109 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1209 +#: ../midori/midori-view.c:1257 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:1226 +#: ../midori/midori-view.c:1274 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:1229 +#: ../midori/midori-view.c:1277 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1233 +#: ../midori/midori-view.c:1281 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:1629 +#: ../midori/midori-view.c:1677 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1774 +#: ../midori/midori-view.c:1822 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1790 +#: ../midori/midori-view.c:1838 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1240,158 +1339,161 @@ msgstr "起動" msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "転送" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:461 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:462 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:464 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:470 msgid "The default font size used to display text" msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:473 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:476 msgid "The minimum font size used to display text" msgstr "文字表示で使用される最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:483 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:486 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:493 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:494 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:51 +#: ../midori/midori-preferences.c:497 +#: ../extensions/statusbar-features.c:51 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:498 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:501 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:502 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:505 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:506 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:509 msgid "Resizable text areas" msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:510 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:58 +#: ../midori/midori-preferences.c:513 +#: ../extensions/statusbar-features.c:58 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:514 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:65 +#: ../midori/midori-preferences.c:517 +#: ../extensions/statusbar-features.c:65 msgid "Enable plugins" msgstr "プラグインを有効にする" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:518 msgid "Enable embedded plugin objects" msgstr "組み込みプラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:521 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:522 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:525 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:526 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:538 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:539 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:548 msgid "Browsing" msgstr "ブラウジング" #. Page "Network" -#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:578 +#: ../midori/midori-preferences.c:579 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:606 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:611 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:612 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:625 +#: ../midori/midori-preferences.c:635 msgid "days" msgstr "日" -#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:108 -msgid "History" -msgstr "履歴" - -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:456 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" -msgstr "空" +msgstr "空です" #: ../midori/midori-searchaction.c:812 msgid "Add search engine" @@ -1417,88 +1519,95 @@ msgstr "トークン(_T):" msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/sokoke.c:110 +#: ../midori/sokoke.c:122 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:437 +#: ../midori/sokoke.c:439 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/sokoke.c:768 +#: ../midori/sokoke.c:770 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:770 +#: ../midori/sokoke.c:772 msgid "_Add Bookmark" msgstr "ブックマークに追加(_A)" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:773 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:772 +#: ../midori/sokoke.c:774 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:775 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:776 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:777 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:778 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:779 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:780 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:781 msgid "P_lugins" msgstr "プラグイン(_L)" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:782 msgid "_Closed Tabs and Windows" msgstr "閉じたタブとウィンドウ(_C)" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:783 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:923 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:924 ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:924 +#: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "有効" -#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:933 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-addons.c:934 ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:934 +#: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "無効" @@ -1508,15 +1617,11 @@ msgstr "ブックマーク" #: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" -msgstr "選択されたブックマークを編集します" +msgstr "選択したブックマークを編集します" #: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" -msgstr "選択されたブックマークを削除します" - -#: ../panels/midori-bookmarks.c:261 -msgid "Add a new folder" -msgstr "新しいフォルダを追加します" +msgstr "選択したブックマークを削除します" #: ../panels/midori-bookmarks.c:593 msgid "Separator" @@ -1534,37 +1639,38 @@ msgstr "エクステンション" msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../panels/midori-history.c:220 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "選択された履歴アイテムをブックマークに追加します" -#: ../panels/midori-history.c:229 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "選択された履歴アイテムを削除します" -#: ../panels/midori-history.c:237 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:602 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:608 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:617 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "昨日" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 +#: ../panels/midori-plugins.c:87 +#: ../extensions/statusbar-features.c:63 msgid "Plugins" msgstr "プラグイン" @@ -1607,12 +1713,14 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:180 +#: ../katze/katze-utils.c:389 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:209 +#: ../katze/katze-utils.c:248 msgid "Choose file" msgstr "ファイルの選択" @@ -1653,12 +1761,12 @@ msgstr "" "Secure: %s\n" "有効期限: %s" -# Secure flag is set. +# cookie: Secure flag is set. #: ../extensions/cookie-manager.c:194 msgid "Yes" msgstr "あり" -# Secure flag isn't set. +# cookie: Secure flag isn't set. #: ../extensions/cookie-manager.c:194 msgid "No" msgstr "なし" @@ -1673,11 +1781,8 @@ msgid "Question" msgstr "確認" #: ../extensions/cookie-manager.c:485 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." -msgstr "" -"フィルタに入力された文字列にマッチした、表示されている cookie のみ削除されま" -"す。" +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "フィルタに入力された文字列にマッチした、表示されている cookie のみ削除されます。" # Column name of cookie browser #: ../extensions/cookie-manager.c:663 @@ -1697,12 +1802,8 @@ msgid "Delete All" msgstr "すべて削除" #: ../extensions/cookie-manager.c:802 -msgid "" -"Deletes all shown cookies. If a filter is set, only those cookies are " -"deleted which match the filter." -msgstr "" -"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" -"ルタにマッチした cookie のみ削除されます。" +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "表示されているすべての cookie を削除します。フィルタが設定されていれば、フィルタにマッチした cookie のみ削除されます。" # tooltip #: ../extensions/cookie-manager.c:817 @@ -1719,14 +1820,11 @@ msgid "Filter:" msgstr "フィルタ:" #: ../extensions/cookie-manager.c:860 -msgid "" -"Enter a filter string to show only cookies whose name or domain field match " -"the entered filter" -msgstr "" -"フィルタに入力された文字列と、名前またはドメインフィールドがマッチした " -"cookie のみ表示します。" +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "フィルタに入力された文字列と、名前またはドメインフィールドがマッチした cookie のみ表示します。" -#: ../extensions/cookie-manager.c:895 ../extensions/cookie-manager.c:942 +#: ../extensions/cookie-manager.c:895 +#: ../extensions/cookie-manager.c:942 msgid "Cookie Manager" msgstr "Cookie マネージャ" @@ -1747,7 +1845,8 @@ msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "ページホルダ" From b468135895ad60e52ea93523901a3bb7ce8d6124 Mon Sep 17 00:00:00 2001 From: Shlomi Israel Date: Mon, 13 Apr 2009 23:06:16 +0200 Subject: [PATCH 0996/2970] Add Hebrew translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/he.po | 1805 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1807 insertions(+), 1 deletion(-) create mode 100644 po/he.po diff --git a/AUTHORS b/AUTHORS index 93290bf9..daa0e4fe 100644 --- a/AUTHORS +++ b/AUTHORS @@ -40,6 +40,7 @@ Translations: fr: Robert-André Mauchin fr: Pascal Gervais gl: Miguel Anxo Bouzada + he: Shlomi Israel hu: SZERVÁC Attila id: Andhika Padmawan it: Sergio Durzu diff --git a/po/LINGUAS b/po/LINGUAS index 4fae844d..acd91948 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da de el en_GB es et fi fr gl hu id it ja nl pl pt_PT ru sv tr uk zh_CN zh_TW +da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ru sv tr uk zh_CN zh_TW diff --git a/po/he.po b/po/he.po new file mode 100644 index 00000000..95bd36d6 --- /dev/null +++ b/po/he.po @@ -0,0 +1,1805 @@ +# Hebrew translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Shlomi Israel 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: Midori 0.1.5\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-13 23:00+0200\n" +"PO-Revision-Date: 2009-04-13 12:14+0300\n" +"Last-Translator: Shlomi Israel \n" +"Language-Team: Hebrew \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "דפדפן קל משקל" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 +#: ../midori/main.c:1396 ../midori/main.c:1407 +#: ../midori/midori-websettings.c:269 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "דפדפן" + +#: ../midori/main.c:94 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "ההגדרות לא ניתנות לטעינה: %s\n" + +#: ../midori/main.c:149 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "הערך %s אינו תקף עבור %s" + +#: ../midori/main.c:156 ../midori/main.c:228 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "ערך הגדרה אינו תקף '%s'" + +#: ../midori/main.c:332 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "כשל בפתיחת מסד הנתונים: %s\n" + +#: ../midori/main.c:364 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "נכשל בהרצת הצהרת מסד הנתונים: %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "כשל בהסרת פריט היסטוריה: %s\n" + +#: ../midori/main.c:442 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "כשל בניקוי ההיסטוריה: %s\n" + +#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "כשל בהוספת פריט היסטוריה: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:694 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "כשל בהסרת פריטי היסטוריה ישנים: %s\n" + +#: ../midori/main.c:722 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "ההגדרות לא ניתנות לשמירה. %s" + +#: ../midori/main.c:751 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "מנועי החיפוש לא ניתנים לשמירהץ %s" + +#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "הסימניה לא ניתנת לשמירה. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:850 ../midori/main.c:873 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "האשפה לא ניתנת לשמירה. %s" + +#: ../midori/main.c:946 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "תצורת ההפעלה לא ניתנת לשמירה. %s" + +#: ../midori/main.c:1073 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"נראה ש־Midori קרס בפעם הקודמת שנפתח. אם זה יקרה שוב,נסה את אחת האפשרויות " +"הבאות לפתירת התקלה." + +#: ../midori/main.c:1088 +msgid "Modify _preferences" +msgstr "ערוך העדפות" + +#: ../midori/main.c:1092 +msgid "Reset the last _session" +msgstr "שחזר לתצורת ההפעלה האחרונה" + +#: ../midori/main.c:1097 +msgid "Disable all _extensions" +msgstr "נטרל את כל ההרחבות" + +#: ../midori/main.c:1288 +msgid "No filename specified" +msgstr "לא צויין שם קובץ" + +#: ../midori/main.c:1311 +msgid "An unknown error occured." +msgstr "התרחשה שגיאה לא מזוהה." + +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1340 +msgid "Run the specified filename as javascript" +msgstr "הרץ את שם הקובץ המצויין כ־javascript" + +#: ../midori/main.c:1342 +msgid "Display program version" +msgstr "הצג גרסת יישום" + +#: ../midori/main.c:1344 +msgid "Addresses" +msgstr "כתובות" + +#: ../midori/main.c:1385 +msgid "[Addresses]" +msgstr "[כתובות]" + +#: ../midori/main.c:1408 +msgid "Please report comments, suggestions and bugs to:" +msgstr "אנא דווח תגובות, הצעות ובאגים אל:" + +#: ../midori/main.c:1410 +msgid "Check for new versions at:" +msgstr "בדוק גרסות חדשות ב:" + +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:1489 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "מופע של Midori כבר רץ אך אינו מגיב. \n" + +#: ../midori/main.c:1539 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "מנועי החיפוש לא ניתנים לטעינה. %s\n" + +#: ../midori/main.c:1551 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "הסימניה לא ניתנת לטעינה: %s\n" + +#: ../midori/main.c:1566 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "תצורת ההפעלה לא ניתנת לטעינה: %s\n" + +#: ../midori/main.c:1579 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "האשפה לא ניתנת לטעינה: %s\n" + +#: ../midori/main.c:1592 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "ההיסטוריה לא ניתנת לטעינה: %s\n" + +#: ../midori/main.c:1604 +msgid "The following errors occured:" +msgstr "השגיאות הבאות התרחשו:" + +#: ../midori/main.c:1620 +msgid "_Ignore" +msgstr "התעלם" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "הקובץ לא נמצא." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "מסמך לא תקין." + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:623 +#, c-format +msgid "Writing failed." +msgstr "הכתיבה נכשלה." + +#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3357 +#: ../midori/midori-browser.c:3363 +msgid "Reload the current page" +msgstr "טען את הדף הנוכחי מחדש" + +#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3360 +msgid "Stop loading the current page" +msgstr "הפסק לטעון את הדף הנוכחי" + +#: ../midori/midori-browser.c:350 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% נטען" + +#: ../midori/midori-browser.c:375 +#, c-format +msgid "Unexpected action '%s'." +msgstr "פעולה בלתי צפויה '%s'." + +#: ../midori/midori-browser.c:538 +msgid "New folder" +msgstr "תיקיה חדשה" + +#: ../midori/midori-browser.c:538 +msgid "Edit folder" +msgstr "ערוך תיקיה" + +#: ../midori/midori-browser.c:540 +msgid "New bookmark" +msgstr "סימניה חדשה" + +#: ../midori/midori-browser.c:540 +msgid "Edit bookmark" +msgstr "ערוך סימניה" + +#: ../midori/midori-browser.c:570 +msgid "_Title:" +msgstr "כותרת:" + +#: ../midori/midori-browser.c:583 ../midori/midori-searchaction.c:856 +msgid "_Description:" +msgstr "תיאור:" + +#: ../midori/midori-browser.c:602 ../midori/midori-searchaction.c:870 +msgid "_Address:" +msgstr "כתובת:" + +#: ../midori/midori-browser.c:621 +msgid "_Folder:" +msgstr "תיקיה:" + +#: ../midori/midori-browser.c:626 ../midori/midori-browser.c:667 +msgid "Toplevel folder" +msgstr "תיקיית שורש" + +#: ../midori/midori-browser.c:743 +msgid "Save file as" +msgstr "שמור בשם" + +#: ../midori/midori-browser.c:1520 +msgid "Open file" +msgstr "פתח קובץ" + +#: ../midori/midori-browser.c:2792 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 +msgid "Open all in _Tabs" +msgstr "פתח הכל בלשוניות" + +#: ../midori/midori-browser.c:2799 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 +msgid "Open in New _Tab" +msgstr "פתח בלשונית חדשה" + +#: ../midori/midori-browser.c:2802 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 +msgid "Open in New _Window" +msgstr "פתח בחלון חדש" + +#: ../midori/midori-browser.c:2963 +msgid "Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:2966 +msgid "Clear private data" +msgstr "" + +#: ../midori/midori-browser.c:2979 +msgid "Clear the following data:" +msgstr "" + +#: ../midori/midori-browser.c:2987 ../midori/midori-preferences.c:628 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "" + +#: ../midori/midori-browser.c:2990 +msgid "Cookies" +msgstr "" + +#: ../midori/midori-browser.c:2993 +msgid "'Flash' Cookies" +msgstr "" + +#: ../midori/midori-browser.c:2996 +msgid "Website icons" +msgstr "" + +#: ../midori/midori-browser.c:3082 +msgid "A lightweight web browser." +msgstr "דפדפן קל משקל." + +#: ../midori/midori-browser.c:3090 +msgid "translator-credits" +msgstr "Shlomi Israel " + +#: ../midori/midori-browser.c:3291 +msgid "_File" +msgstr "קובץ" + +#: ../midori/midori-browser.c:3294 +msgid "Open a new window" +msgstr "פתח חלון חדש" + +#: ../midori/midori-browser.c:3297 +msgid "Open a new tab" +msgstr "פתח לשונית חדשה" + +#: ../midori/midori-browser.c:3300 +msgid "Open a file" +msgstr "פתח קובץ" + +#: ../midori/midori-browser.c:3303 +msgid "Save to a file" +msgstr "שמור לקובץ" + +#: ../midori/midori-browser.c:3305 +msgid "_Close Tab" +msgstr "סגור לשונית" + +#: ../midori/midori-browser.c:3306 +msgid "Close the current tab" +msgstr "סגור את הלשונית הנוכחית" + +#: ../midori/midori-browser.c:3308 +msgid "C_lose Window" +msgstr "סגור חלון" + +#: ../midori/midori-browser.c:3309 +msgid "Close this window" +msgstr "סגור את החלון הזה" + +#: ../midori/midori-browser.c:3312 +msgid "Print the current page" +msgstr "הדפס את הדף הנוכחי" + +#: ../midori/midori-browser.c:3315 +msgid "Quit the application" +msgstr "צא מהיישום" + +#: ../midori/midori-browser.c:3317 +msgid "_Edit" +msgstr "ערוך" + +#: ../midori/midori-browser.c:3320 +msgid "Cut the selected text" +msgstr "גזור את הטקסט המסומן" + +#: ../midori/midori-browser.c:3323 ../midori/midori-browser.c:3326 +msgid "Copy the selected text" +msgstr "העתק את הטקסט המסומן" + +#: ../midori/midori-browser.c:3329 +msgid "Paste text from the clipboard" +msgstr "הדבק טקסט מלוח הגזירים" + +#: ../midori/midori-browser.c:3332 +msgid "Delete the selected text" +msgstr "מחק את הטקסט המסומן" + +#: ../midori/midori-browser.c:3335 +msgid "Select all text" +msgstr "סמן את כל הטקסט" + +#: ../midori/midori-browser.c:3338 +msgid "Find a word or phrase in the page" +msgstr "מצא מילה או ביטוי בדף" + +#: ../midori/midori-browser.c:3340 +msgid "Find _Next" +msgstr "מצא את הבא" + +#: ../midori/midori-browser.c:3341 +msgid "Find the next occurrence of a word or phrase" +msgstr "מצא את המופע הבא של המילה או הביטוי" + +#: ../midori/midori-browser.c:3343 +msgid "Find _Previous" +msgstr "מצא את הקודם" + +#: ../midori/midori-browser.c:3344 +msgid "Find the previous occurrence of a word or phrase" +msgstr "מצא את המופע הקודם של המילה או הביטוי" + +#: ../midori/midori-browser.c:3347 +msgid "_Quick Find" +msgstr "חיפוש מהיר" + +#: ../midori/midori-browser.c:3348 +msgid "Quickly jump to a word or phrase" +msgstr "קופץ במהירות אל מילה או ביטוי" + +#: ../midori/midori-browser.c:3351 +msgid "Configure the application preferences" +msgstr "הגדר את העדפות היישום" + +#: ../midori/midori-browser.c:3353 +msgid "_View" +msgstr "תצוגה" + +#: ../midori/midori-browser.c:3354 +msgid "_Toolbars" +msgstr "סרגלי כלים" + +#: ../midori/midori-browser.c:3366 +msgid "Increase the zoom level" +msgstr "הגדל את רמת הזום" + +#: ../midori/midori-browser.c:3369 +msgid "Decrease the zoom level" +msgstr "הקטן את רמת הזום" + +#: ../midori/midori-browser.c:3372 +msgid "Reset the zoom level" +msgstr "אפס את רמת הזום" + +#: ../midori/midori-browser.c:3373 +msgid "_Encoding" +msgstr "קידוד" + +#: ../midori/midori-browser.c:3375 +msgid "_Automatic" +msgstr "אוטומטי" + +#: ../midori/midori-browser.c:3378 ../midori/midori-websettings.c:196 +msgid "Chinese (BIG5)" +msgstr "" + +#: ../midori/midori-browser.c:3381 ../midori/midori-websettings.c:197 +msgid "Japanese (SHIFT_JIS)" +msgstr "" + +#: ../midori/midori-browser.c:3384 ../midori/midori-websettings.c:198 +msgid "Russian (KOI8-R)" +msgstr "" + +#: ../midori/midori-browser.c:3387 ../midori/midori-websettings.c:199 +msgid "Unicode (UTF-8)" +msgstr "" + +#: ../midori/midori-browser.c:3390 ../midori/midori-websettings.c:200 +msgid "Western (ISO-8859-1)" +msgstr "" + +#: ../midori/midori-browser.c:3393 ../midori/midori-websettings.c:201 +#: ../midori/midori-websettings.c:273 +msgid "Custom..." +msgstr "" + +#: ../midori/midori-browser.c:3396 ../midori/midori-view.c:1141 +msgid "View _Source" +msgstr "הצג מקור" + +#: ../midori/midori-browser.c:3397 +msgid "View the source code of the page" +msgstr "הצג את קוד המקור של הדף" + +#: ../midori/midori-browser.c:3399 +msgid "View Selection Source" +msgstr "הצג את מקור הבחירה" + +#: ../midori/midori-browser.c:3400 +msgid "View the source code of the selection" +msgstr "הצג את קוד המקור של הבחירה" + +#: ../midori/midori-browser.c:3404 +msgid "Toggle fullscreen view" +msgstr "מסך מלא" + +#: ../midori/midori-browser.c:3406 +msgid "_Go" +msgstr "לך" + +#: ../midori/midori-browser.c:3409 +msgid "Go back to the previous page" +msgstr "לך אל הדף הקודם" + +#: ../midori/midori-browser.c:3412 +msgid "Go forward to the next page" +msgstr "לך אל הדף הבא" + +#: ../midori/midori-browser.c:3415 +msgid "Go to your homepage" +msgstr "לך אל דף הבית" + +#: ../midori/midori-browser.c:3417 +msgid "Empty Trash" +msgstr "רוקן אשפה" + +#: ../midori/midori-browser.c:3418 +msgid "Delete the contents of the trash" +msgstr "מחק את תכולת האשפה" + +#: ../midori/midori-browser.c:3420 ../midori/midori-view.c:1113 +msgid "Undo Close Tab" +msgstr "בטל סגירת לשונית" + +#: ../midori/midori-browser.c:3421 +msgid "Open the last closed tab" +msgstr "פתח את הלשונית האחרונה שנסגרה" + +#: ../midori/midori-browser.c:3425 ../panels/midori-bookmarks.c:232 +msgid "Add a new bookmark" +msgstr "הוסף לשונית חדשה" + +#: ../midori/midori-browser.c:3427 ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "" + +#: ../midori/midori-browser.c:3428 +msgid "Add a new bookmark folder" +msgstr "" + +#: ../midori/midori-browser.c:3429 +msgid "_Tools" +msgstr "כלים" + +#: ../midori/midori-browser.c:3431 ../midori/midori-searchaction.c:465 +msgid "_Manage Search Engines" +msgstr "נהל מנועי חיפוש" + +#: ../midori/midori-browser.c:3432 +msgid "Add, edit and remove search engines..." +msgstr "הוסף, ערוך והסר מנועי חיפוש..." + +#: ../midori/midori-browser.c:3435 +msgid "_Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:3436 +msgid "Clear private data..." +msgstr "" + +#: ../midori/midori-browser.c:3440 +msgid "_Previous Tab" +msgstr "לשונית קודמת" + +#: ../midori/midori-browser.c:3441 +msgid "Switch to the previous tab" +msgstr "עבור אל הלשונית הקודמת" + +#: ../midori/midori-browser.c:3443 +msgid "_Next Tab" +msgstr "לשונית הבאה" + +#: ../midori/midori-browser.c:3444 +msgid "Switch to the next tab" +msgstr "עבור אל הלשונית הבאה" + +#: ../midori/midori-browser.c:3446 +msgid "_Help" +msgstr "עזרה" + +#: ../midori/midori-browser.c:3448 +msgid "_Contents" +msgstr "תכנים" + +#: ../midori/midori-browser.c:3449 +msgid "Show the documentation" +msgstr "הצג את התיעוד" + +#: ../midori/midori-browser.c:3451 +msgid "_Frequent Questions" +msgstr "שאלות נפוצות" + +#: ../midori/midori-browser.c:3452 +msgid "Show the Frequently Asked Questions" +msgstr "הצג את השאלות הנפוצות" + +#: ../midori/midori-browser.c:3454 +msgid "_Report a Bug" +msgstr "דווח על באג" + +#: ../midori/midori-browser.c:3455 +msgid "Open Midori's bug tracker" +msgstr "פתח את עוקב הבאגים של Midori" + +#: ../midori/midori-browser.c:3458 +msgid "Show information about the program" +msgstr "הצג מידע אודות התוכנה" + +#: ../midori/midori-browser.c:3465 +msgid "P_rivate Browsing" +msgstr "גלישה פרטית" + +#: ../midori/midori-browser.c:3466 +msgid "Don't save any private data while browsing" +msgstr "אל תשמור אף מידע אישי בזמן הגלישה" + +#: ../midori/midori-browser.c:3471 +msgid "_Menubar" +msgstr "סרגל תפריט" + +#: ../midori/midori-browser.c:3472 +msgid "Show menubar" +msgstr "הצג את סרגל התפריט" + +#: ../midori/midori-browser.c:3475 +msgid "_Navigationbar" +msgstr "סרגל ניווט" + +#: ../midori/midori-browser.c:3476 +msgid "Show navigationbar" +msgstr "הצג את סרגל הניווט" + +#: ../midori/midori-browser.c:3479 +msgid "Side_panel" +msgstr "סרגל צד" + +#: ../midori/midori-browser.c:3480 +msgid "Show sidepanel" +msgstr "הצג סרגל צד" + +#: ../midori/midori-browser.c:3483 +msgid "_Bookmarkbar" +msgstr "סרגל סימניות" + +#: ../midori/midori-browser.c:3484 +msgid "Show bookmarkbar" +msgstr "הצג את סרגל הסימניות" + +#: ../midori/midori-browser.c:3487 +msgid "_Transferbar" +msgstr "סרגל העברה" + +#: ../midori/midori-browser.c:3488 +msgid "Show transferbar" +msgstr "הצג את סרגל ההעברה" + +#: ../midori/midori-browser.c:3491 +msgid "_Statusbar" +msgstr "שורת מצב" + +#: ../midori/midori-browser.c:3492 +msgid "Show statusbar" +msgstr "הצג את שורת המצב" + +#: ../midori/midori-browser.c:3926 +msgid "_Separator" +msgstr "קו מפריד" + +#: ../midori/midori-browser.c:3933 +msgid "_Location..." +msgstr "מיקום..." + +#: ../midori/midori-browser.c:3935 +msgid "Open a particular location" +msgstr "פתח מיקום" + +#: ../midori/midori-browser.c:3959 +msgid "_Web Search..." +msgstr "חיפוש באינטרנט" + +#: ../midori/midori-browser.c:3961 +msgid "Run a web search" +msgstr "הרץ חיפוש באינטרנט" + +#: ../midori/midori-browser.c:3980 +msgid "Reopen a previously closed tab or window" +msgstr "פתח מחדש לשונית או חלון שנסגרו קודם לכן" + +#: ../midori/midori-browser.c:3993 +msgid "_Recently visited pages" +msgstr "דפים שבוקרו בעבר" + +#: ../midori/midori-browser.c:3995 +msgid "Reopen pages that you visited earlier" +msgstr "פתיחה מחדש של דפים שביקרת בהם בעבר" + +#: ../midori/midori-browser.c:4008 ../midori/sokoke.c:778 +msgid "_Bookmarks" +msgstr "סימניות" + +#: ../midori/midori-browser.c:4010 +msgid "Show the saved bookmarks" +msgstr "הצג את הסימניות השמורות" + +#: ../midori/midori-browser.c:4023 +msgid "_Window" +msgstr "חלון" + +#: ../midori/midori-browser.c:4025 +msgid "Show a list of all open tabs" +msgstr "הצג רשימה של כל הלשוניות הפתוחות" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4192 +msgid "_Inline Find:" +msgstr "חיפוש פנימי" + +#: ../midori/midori-browser.c:4217 +msgid "Previous" +msgstr "הקודם" + +#: ../midori/midori-browser.c:4222 +msgid "Next" +msgstr "הבא" + +#: ../midori/midori-browser.c:4227 +msgid "Match Case" +msgstr "התאם רישיות" + +#: ../midori/midori-browser.c:4235 +msgid "Highlight Matches" +msgstr "הדגש התאמות" + +#: ../midori/midori-browser.c:4245 +msgid "Close Findbar" +msgstr "סגור סרגל חיפוש" + +#: ../midori/midori-browser.c:4551 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "הגדרה לא צפויה '%s'" + +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:511 +msgid "Align sidepanel on the right" +msgstr "יישר סרגל צד לימין" + +#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:512 +msgid "Whether to align the sidepanel on the right" +msgstr "האם ליישר את סרגל הצד לימין" + +#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +msgid "Close panel" +msgstr "סגור סרגל" + +#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1945 +msgid "Blank page" +msgstr "דף ריק" + +#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 +msgid "Homepage" +msgstr "דף הבית" + +#: ../midori/midori-websettings.c:181 +msgid "Last open pages" +msgstr "הדפים שנפתחו אחרונים" + +#: ../midori/midori-websettings.c:216 +msgid "New tab" +msgstr "לשונית חדשה" + +#: ../midori/midori-websettings.c:217 +msgid "New window" +msgstr "חלון חדש" + +#: ../midori/midori-websettings.c:218 +msgid "Current tab" +msgstr "לשונית נוכחית" + +#: ../midori/midori-websettings.c:233 +msgid "Default" +msgstr "ברירת מחדל" + +#: ../midori/midori-websettings.c:234 +msgid "Icons" +msgstr "סמלים" + +#: ../midori/midori-websettings.c:235 +msgid "Text" +msgstr "טקסט" + +#: ../midori/midori-websettings.c:236 +msgid "Both" +msgstr "שניהם" + +#: ../midori/midori-websettings.c:237 +msgid "Both horizontal" +msgstr "" + +#: ../midori/midori-websettings.c:252 +msgid "All cookies" +msgstr "כל העוגיות" + +#: ../midori/midori-websettings.c:253 +msgid "Session cookies" +msgstr "עוגיות תצורת הפעלה" + +#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 +msgid "None" +msgstr "כלום" + +#: ../midori/midori-websettings.c:270 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:271 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:272 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:325 +msgid "Remember last window size" +msgstr "זכור את גודל החלון האחרון" + +#: ../midori/midori-websettings.c:326 +msgid "Whether to save the last window size" +msgstr "האם לשמור את גודל החלון האחרון" + +#: ../midori/midori-websettings.c:334 +msgid "Last window width" +msgstr "רוחב החלון האחרון" + +#: ../midori/midori-websettings.c:335 +msgid "The last saved window width" +msgstr "הרוחב האחרון של החלון הנשמר" + +#: ../midori/midori-websettings.c:343 +msgid "Last window height" +msgstr "אורך החלון האחרון" + +#: ../midori/midori-websettings.c:344 +msgid "The last saved window height" +msgstr "האורך האחרון של החלון הנשמר" + +#: ../midori/midori-websettings.c:369 +msgid "Last panel position" +msgstr "המיקום האחרון של הסרגל" + +#: ../midori/midori-websettings.c:370 +msgid "The last saved panel position" +msgstr "המיקום האחרון של הסרגל שנשמר" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:379 +msgid "Last panel page" +msgstr "העמוד האחרון של הסרגל" + +#: ../midori/midori-websettings.c:380 +msgid "The last saved panel page" +msgstr "העמוד האחרון של הסרגל שנשמר" + +#: ../midori/midori-websettings.c:388 +msgid "Last Web search" +msgstr "החיפוש האחרון" + +#: ../midori/midori-websettings.c:389 +msgid "The last saved Web search" +msgstr "חיפוש האינטרנט האחרון שנשמר" + +#: ../midori/midori-websettings.c:398 +msgid "Show Menubar" +msgstr "הצג סרגל תפריט" + +#: ../midori/midori-websettings.c:399 +msgid "Whether to show the menubar" +msgstr "האם להראות את סרגל התפריטים" + +#: ../midori/midori-websettings.c:407 +msgid "Show Navigationbar" +msgstr "הצג סרגל ניווט" + +#: ../midori/midori-websettings.c:408 +msgid "Whether to show the navigationbar" +msgstr "האם להציג את סרגל הניווט" + +#: ../midori/midori-websettings.c:416 +msgid "Show Bookmarkbar" +msgstr "הצג סרגל סימניות" + +#: ../midori/midori-websettings.c:417 +msgid "Whether to show the bookmarkbar" +msgstr "האם להראות את סרגל הסימניות" + +#: ../midori/midori-websettings.c:425 +msgid "Show Panel" +msgstr "הצג סרגל" + +#: ../midori/midori-websettings.c:426 +msgid "Whether to show the panel" +msgstr "האם להציג את הסרגל" + +#: ../midori/midori-websettings.c:441 +msgid "Show Transferbar" +msgstr "הצג סרגל העברות" + +#: ../midori/midori-websettings.c:442 +msgid "Whether to show the transferbar" +msgstr "האם להציג את סרגל ההעברות" + +#: ../midori/midori-websettings.c:450 +msgid "Show Statusbar" +msgstr "הצג שורת מצב" + +#: ../midori/midori-websettings.c:451 +msgid "Whether to show the statusbar" +msgstr "האם להציג את שורת המצב" + +#: ../midori/midori-websettings.c:460 +msgid "Toolbar Style" +msgstr "סגנון סרגל כלים" + +#: ../midori/midori-websettings.c:461 +msgid "The style of the toolbar" +msgstr "הסגנון של סרגל הכלים" + +#: ../midori/midori-websettings.c:477 +msgid "Show progress in location entry" +msgstr "הצג התקדמות בתיבת המיקום" + +#: ../midori/midori-websettings.c:478 +msgid "Whether to show loading progress in the location entry" +msgstr "האם להציג את התקדמות הטעינה בתיבת המיקום" + +#: ../midori/midori-websettings.c:486 +msgid "Toolbar Items" +msgstr "פריטי סרגל כלים" + +#: ../midori/midori-websettings.c:487 +msgid "The items to show on the toolbar" +msgstr "הפריטים להצגה בסרגל הכלים" + +#: ../midori/midori-websettings.c:495 +msgid "Compact Sidepanel" +msgstr "סרגל צד קומפקטי" + +#: ../midori/midori-websettings.c:496 +msgid "Whether to make the sidepanel compact" +msgstr "האם להפוך את סרגל הצד לקומפקטי" + +#: ../midori/midori-websettings.c:521 +msgid "Load on Startup" +msgstr "טען בהפעלה" + +#: ../midori/midori-websettings.c:522 +msgid "What to load on startup" +msgstr "האם לטעון בהפעלה" + +#: ../midori/midori-websettings.c:532 +msgid "The homepage" +msgstr "דף הבית" + +#: ../midori/midori-websettings.c:547 +msgid "Show crash dialog" +msgstr "הצג דו־שיח קריסות" + +#: ../midori/midori-websettings.c:548 +msgid "Show a dialog after Midori crashed" +msgstr "הצג דו־שיח לאחר ש־Midori קורס" + +#: ../midori/midori-websettings.c:556 +msgid "Download Folder" +msgstr "הורד תיקיה" + +#: ../midori/midori-websettings.c:557 +msgid "The folder downloaded files are saved to" +msgstr "קבצי התיקיה המורדת ישמרו ב" + +#: ../midori/midori-websettings.c:569 +msgid "Download Manager" +msgstr "מנהל הורדות" + +#: ../midori/midori-websettings.c:570 +msgid "An external download manager" +msgstr "מנהל הורדות חיצוני" + +#: ../midori/midori-websettings.c:578 +msgid "Text Editor" +msgstr "עורך טקסט" + +#: ../midori/midori-websettings.c:579 +msgid "An external text editor" +msgstr "עורך טקסט חיצוני" + +#: ../midori/midori-websettings.c:587 +msgid "Location entry Search" +msgstr "חיפוש בתיבת מיקום" + +#: ../midori/midori-websettings.c:588 +msgid "The search to perform inside the location entry" +msgstr "החיפוש לביצוע בתוך תיבת המיקום" + +#: ../midori/midori-websettings.c:596 +msgid "Preferred Encoding" +msgstr "קידוד מועדף" + +#: ../midori/midori-websettings.c:597 +msgid "The preferred character encoding" +msgstr "הקידוד המועדף" + +#: ../midori/midori-websettings.c:607 +msgid "Always Show Tabbar" +msgstr "תמיד הצג סרגל לשוניות" + +#: ../midori/midori-websettings.c:608 +msgid "Always show the tabbar" +msgstr "תמיד הצג את סרגל הלשוניות" + +#: ../midori/midori-websettings.c:616 +msgid "Close Buttons on Tabs" +msgstr "לחצני סגירה בלשוניות" + +#: ../midori/midori-websettings.c:617 +msgid "Whether tabs have close buttons" +msgstr "האם ללשוניות יש לחצני סגירה" + +#: ../midori/midori-websettings.c:625 +msgid "Open new pages in" +msgstr "פתיחת דפים חדשים ב" + +#: ../midori/midori-websettings.c:626 +msgid "Where to open new pages" +msgstr "איפה לפתוח דפים חדשים" + +#: ../midori/midori-websettings.c:635 +msgid "Open external pages in" +msgstr "פתח דפים חיצוניים ב" + +#: ../midori/midori-websettings.c:636 +msgid "Where to open externally opened pages" +msgstr "איפה לפתוח דפים חיצוניים" + +#: ../midori/midori-websettings.c:649 +msgid "Middle click opens Selection" +msgstr "לחיצה אמצעית פותחת בחירה" + +#: ../midori/midori-websettings.c:650 +msgid "Load an address from the selection via middle click" +msgstr "פתח את הכתובת הנבחרת באמצעות לחצן אמצעי בעכבר" + +#: ../midori/midori-websettings.c:658 +msgid "Open tabs in the background" +msgstr "פתח לשוניות ברקע" + +#: ../midori/midori-websettings.c:659 +msgid "Whether to open new tabs in the background" +msgstr "האם לפתוח לשוניות חדשות ברקע" + +#: ../midori/midori-websettings.c:667 +msgid "Open Tabs next to Current" +msgstr "פתח לשוניות אחרי הנוכחית" + +#: ../midori/midori-websettings.c:668 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "האם לפתוח לשוניות אחרי הלשונית הנוכחית או אחרי הלשונית האחרונה" + +#: ../midori/midori-websettings.c:676 +msgid "Open popups in tabs" +msgstr "פתח חלונות קופצים בלשוניות" + +#: ../midori/midori-websettings.c:677 +msgid "Whether to open popup windows in tabs" +msgstr "האם לפתוח חלונות קופצים בלשוניות" + +#: ../midori/midori-websettings.c:693 +msgid "Zoom Text and Images" +msgstr "קרב טקסט ותמונות" + +#: ../midori/midori-websettings.c:694 +msgid "Whether to zoom text and images" +msgstr "האם לקרב טקסט ותמונות" + +#: ../midori/midori-websettings.c:709 +msgid "Find inline while typing" +msgstr "חפש תוך כדי הקלדה" + +#: ../midori/midori-websettings.c:710 +msgid "Whether to automatically find inline while typing" +msgstr "האם לחפש אוטומטית בתוך הטקסט בזמן הקלדה" + +#: ../midori/midori-websettings.c:718 +msgid "Accept cookies" +msgstr "קבל עוגיות" + +#: ../midori/midori-websettings.c:719 +msgid "What type of cookies to accept" +msgstr "איזה סוג של עוגיות לקבל" + +#: ../midori/midori-websettings.c:728 +msgid "Original cookies only" +msgstr "עוגיות מקוריות בלבד" + +#: ../midori/midori-websettings.c:729 +msgid "Accept cookies from the original website only" +msgstr "קבל עוגיות מהאתר המקורי בלבד" + +#: ../midori/midori-websettings.c:737 +msgid "Maximum cookie age" +msgstr "תוקף העוגיות המקסימלי" + +#: ../midori/midori-websettings.c:738 +msgid "The maximum number of days to save cookies for" +msgstr "מספר הימים המקסימלי לשמירת עוגיות" + +#: ../midori/midori-websettings.c:748 +msgid "Remember last visited pages" +msgstr "זכור דפים שנשמרו לאחרונה" + +#: ../midori/midori-websettings.c:749 +msgid "Whether the last visited pages are saved" +msgstr "האם הדפים שנשמרו אחרונים ישמרו" + +#: ../midori/midori-websettings.c:757 +msgid "Maximum history age" +msgstr "תוקף מקסימלי להיסטוריה" + +#: ../midori/midori-websettings.c:758 +msgid "The maximum number of days to save the history for" +msgstr "מספר הימים המקסימלי לשמירת היסטוריה" + +#: ../midori/midori-websettings.c:766 +msgid "Remember last form inputs" +msgstr "זכור קלטי הטופס האחרונים" + +#: ../midori/midori-websettings.c:767 +msgid "Whether the last form inputs are saved" +msgstr "האם לשמור את קלטי הטופס האחרונים" + +#: ../midori/midori-websettings.c:775 +msgid "Remember last downloaded files" +msgstr "זכור את הקבצים האחרונים שהורדו" + +#: ../midori/midori-websettings.c:776 +msgid "Whether the last downloaded files are saved" +msgstr "האם לשמור את הקבצים האחרונים שהורדו" + +#: ../midori/midori-websettings.c:786 +msgid "Proxy Server" +msgstr "שרת מתווך" + +#: ../midori/midori-websettings.c:787 +msgid "The proxy server used for HTTP connections" +msgstr "השרת המתווך המשמש עבור חיבורי HTTP" + +#: ../midori/midori-websettings.c:802 +msgid "Detect proxy server automatically" +msgstr "זהה שרת מתווך אוטומטית" + +#: ../midori/midori-websettings.c:803 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "האם לזהות את השרת המתווך אוטומטית מהסביבה" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:819 +msgid "Identify as" +msgstr "זהה כ" + +#: ../midori/midori-websettings.c:820 +msgid "What to identify as to web pages" +msgstr "כיצד להזדהות עבור דפי אינטרנט" + +#: ../midori/midori-websettings.c:836 +msgid "Identification string" +msgstr "מחרוזת זיהוי" + +#: ../midori/midori-websettings.c:837 +msgid "The application identification string" +msgstr "מחרוזת הזיהוי של היישום" + +#: ../midori/midori-websettings.c:845 +msgid "Cache size" +msgstr "גדול מטמון" + +#: ../midori/midori-websettings.c:846 +msgid "The allowed size of the cache" +msgstr "הגודל המותר של המטמון" + +#. i18n: The title of the 404 - Not found error page +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:636 ../midori/midori-view.c:2469 +#, c-format +msgid "Not found - %s" +msgstr "לא נמצא - %s" + +#: ../midori/midori-view.c:978 +msgid "Open _Link" +msgstr "פתח קישור" + +#: ../midori/midori-view.c:980 +msgid "Open Link in New _Tab" +msgstr "פתח קישור בלשונית חדשה" + +#: ../midori/midori-view.c:997 +msgid "Open Link in New _Window" +msgstr "" + +#: ../midori/midori-view.c:1006 +msgid "_Download Link destination" +msgstr "" + +#: ../midori/midori-view.c:1012 +msgid "_Save Link destination" +msgstr "" + +#: ../midori/midori-view.c:1021 +msgid "Download with Download _Manager" +msgstr "" + +#: ../midori/midori-view.c:1053 +#, c-format +msgid "Search with %s" +msgstr "" + +#: ../midori/midori-view.c:1079 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:1089 +msgid "Open Address in New _Tab" +msgstr "" + +#: ../midori/midori-view.c:1237 +msgid "Open or download file" +msgstr "" + +#: ../midori/midori-view.c:1254 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:1257 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1261 +#, c-format +msgid "Open %s" +msgstr "" + +#: ../midori/midori-view.c:1657 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1802 +#, c-format +msgid "Document cannot be displayed" +msgstr "" + +#: ../midori/midori-view.c:1818 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "" + +#. Page "General" +#: ../midori/midori-preferences.c:398 +msgid "General" +msgstr "" + +#: ../midori/midori-preferences.c:399 +msgid "Startup" +msgstr "" + +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "" + +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:461 +msgid "Appearance" +msgstr "" + +#: ../midori/midori-preferences.c:462 +msgid "Font settings" +msgstr "" + +#: ../midori/midori-preferences.c:464 +msgid "Default Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:470 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:473 +msgid "Minimum Font Size" +msgstr "" + +#: ../midori/midori-preferences.c:476 +msgid "The minimum font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:483 +msgid "Encoding" +msgstr "" + +#: ../midori/midori-preferences.c:486 +msgid "The character encoding to use by default" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:493 +msgid "Behavior" +msgstr "" + +#: ../midori/midori-preferences.c:494 +msgid "Features" +msgstr "" + +#: ../midori/midori-preferences.c:497 ../extensions/statusbar-features.c:51 +msgid "Load images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:498 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:501 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:502 +msgid "Automatically shrink standalone images to fit" +msgstr "" + +#: ../midori/midori-preferences.c:505 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:506 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-preferences.c:509 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:510 +msgid "Whether text areas are resizable" +msgstr "" + +#: ../midori/midori-preferences.c:513 ../extensions/statusbar-features.c:58 +msgid "Enable scripts" +msgstr "" + +#: ../midori/midori-preferences.c:514 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-preferences.c:517 ../extensions/statusbar-features.c:65 +msgid "Enable plugins" +msgstr "" + +#: ../midori/midori-preferences.c:518 +msgid "Enable embedded plugin objects" +msgstr "" + +#: ../midori/midori-preferences.c:521 +msgid "Enforce 96 dots per inch" +msgstr "" + +#: ../midori/midori-preferences.c:522 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:525 +msgid "Enable developer tools" +msgstr "" + +#: ../midori/midori-preferences.c:526 +msgid "Enable special extensions for developers" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:538 +msgid "Interface" +msgstr "" + +#: ../midori/midori-preferences.c:539 +msgid "Navigationbar" +msgstr "" + +#: ../midori/midori-preferences.c:548 +msgid "Browsing" +msgstr "" + +#. Page "Network" +#: ../midori/midori-preferences.c:578 ../midori/midori-preferences.c:579 +msgid "Network" +msgstr "" + +#: ../midori/midori-preferences.c:606 +msgid "MB" +msgstr "" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:611 +msgid "Privacy" +msgstr "" + +#: ../midori/midori-preferences.c:612 +msgid "Web Cookies" +msgstr "" + +#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:635 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 +msgid "Empty" +msgstr "" + +#: ../midori/midori-searchaction.c:812 +msgid "Add search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:812 +msgid "Edit search engine" +msgstr "" + +#: ../midori/midori-searchaction.c:840 +msgid "_Name:" +msgstr "" + +#: ../midori/midori-searchaction.c:884 +msgid "_Icon:" +msgstr "" + +#: ../midori/midori-searchaction.c:898 +msgid "_Token:" +msgstr "" + +#: ../midori/midori-searchaction.c:1078 +msgid "Manage Search Engines" +msgstr "" + +#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 +msgid "Could not run external program." +msgstr "" + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:446 +msgid "Warning: You are using a superuser account!" +msgstr "" + +#: ../midori/sokoke.c:777 +msgid "_Bookmark" +msgstr "" + +#: ../midori/sokoke.c:779 +msgid "_Add Bookmark" +msgstr "" + +#: ../midori/sokoke.c:780 +msgid "_Console" +msgstr "" + +#: ../midori/sokoke.c:781 +msgid "_Extensions" +msgstr "" + +#: ../midori/sokoke.c:782 +msgid "_History" +msgstr "" + +#: ../midori/sokoke.c:783 +msgid "_Homepage" +msgstr "" + +#: ../midori/sokoke.c:784 +msgid "_Userscripts" +msgstr "" + +#: ../midori/sokoke.c:785 +msgid "User_styles" +msgstr "" + +#: ../midori/sokoke.c:786 +msgid "New _Tab" +msgstr "" + +#: ../midori/sokoke.c:787 +msgid "_Transfers" +msgstr "" + +#: ../midori/sokoke.c:788 +msgid "P_lugins" +msgstr "" + +#: ../midori/sokoke.c:789 +msgid "_Closed Tabs and Windows" +msgstr "" + +#: ../midori/sokoke.c:790 +msgid "New _Window" +msgstr "" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "" + +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "" + +#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "" + +#: ../panels/midori-addons.c:924 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "" + +#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:154 +msgid "_Disable" +msgstr "" + +#: ../panels/midori-addons.c:934 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "" + +#: ../panels/midori-bookmarks.c:240 +msgid "Edit the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:248 +msgid "Delete the selected bookmark" +msgstr "" + +#: ../panels/midori-bookmarks.c:593 +msgid "Separator" +msgstr "" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "" + +#: ../panels/midori-history.c:163 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:218 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../panels/midori-history.c:227 +msgid "Delete the selected history item" +msgstr "" + +#: ../panels/midori-history.c:235 +msgid "Clear the entire history" +msgstr "" + +#: ../panels/midori-history.c:600 +#, c-format +msgid "A week ago" +msgstr "" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d days ago" +msgstr "" + +#: ../panels/midori-history.c:613 +msgid "Today" +msgstr "" + +#: ../panels/midori-history.c:615 +msgid "Yesterday" +msgstr "" + +#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 +msgid "Plugins" +msgstr "" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:229 +msgid "Choose folder" +msgstr "" + +#: ../extensions/colorful-tabs.c:104 +msgid "Tint tabs distinctly" +msgstr "" + +#: ../extensions/colorful-tabs.c:140 +msgid "Colorful Tabs" +msgstr "" + +#: ../extensions/colorful-tabs.c:141 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager.c:185 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager.c:188 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager.c:194 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager.c:194 +msgid "No" +msgstr "" + +#: ../extensions/cookie-manager.c:475 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager.c:477 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager.c:485 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "" + +#: ../extensions/cookie-manager.c:663 +msgid "Name" +msgstr "" + +#: ../extensions/cookie-manager.c:723 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:731 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:800 +msgid "Delete All" +msgstr "" + +#: ../extensions/cookie-manager.c:802 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" + +#: ../extensions/cookie-manager.c:817 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:824 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:855 +msgid "Filter:" +msgstr "" + +#: ../extensions/cookie-manager.c:860 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager.c:895 ../extensions/cookie-manager.c:942 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager.c:926 +msgid "_Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager.c:943 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "" + +#: ../extensions/statusbar-features.c:49 +msgid "Images" +msgstr "" + +#: ../extensions/statusbar-features.c:56 +msgid "Scripts" +msgstr "" From 0d1fd5794d64216944510d1329230aa0a188988a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 13 Apr 2009 23:35:31 +0200 Subject: [PATCH 0997/2970] Use mnemonic in "Clear private data" button --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 33da510a..869ac604 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2963,7 +2963,7 @@ _action_clear_private_data_activate (GtkAction* action, dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"), GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - _("Clear private data"), GTK_RESPONSE_ACCEPT, NULL); + _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE); screen = gtk_widget_get_screen (GTK_WIDGET (browser)); if (screen) From 1f4b67ac064b52828ca2f4098564b3450b21556c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 14 Apr 2009 19:01:29 +0200 Subject: [PATCH 0998/2970] Add some more user documentation --- docs/user/midori.txt | 68 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index bd246ab6..a8e066f2 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.0.21 +.. |(version)| replace:: 0.1.6 ''''''' Midori @@ -9,10 +9,10 @@ ----------------------------------------- :Authors: Christian Dywan -:Date: $Date: 2008-08-03 20:30:35 +0100 (Sat, 28 Sep 2008) $ +:Date: $Date: 2009-04-14 18:00:35 +0100 (Tue, 14 Apr 2009) $ :Version: |(version)| -Copyright © 2008 +Copyright © 2008-2009 This documentation is distributed under the terms of the `GNU Lesser General Public License`_; you can redistribute it and/or @@ -42,8 +42,7 @@ interface is designed to be intuitive yet powerful. * User scripts and user styles support. * Straightforward bookmark management. * Customizable and extensible interface. -* Extensible via Javascript. -* Custom context menu actions. +* Extensions written in C. Running Midori @@ -127,12 +126,58 @@ The following arguments are supported if you call Midori from a command line. +-------+--------------------+------------------------------------------------+ | Short | Long option | Function | +=======+====================+================================================+ +| -a | --app | Run ADDRESS as a web application | ++-------+--------------------+------------------------------------------------+ +| -c | --config | Use FOLDER as configuration folder | ++-------+--------------------+------------------------------------------------+ | -r | --run | Run the specified filename as javascript | +-------+--------------------+------------------------------------------------+ | -V | --version | Show version information and exit. | +-------+--------------------+------------------------------------------------+ +Configuration files +------------------- + + +The configuration files in Midori that save related states are by default +stored in the folder ~/.config/midori in the home directory. It is possible +to use a different folder by specifying '--config' on the command line. + +The files stored in the primary configuration folder are the following: + ++----------------+------------------------------------------------------------+ +| Filename | Contents | ++================+============================================================+ +| accels | Keyboard shortcuts, GtkAccelMap resource | ++----------------+------------------------------------------------------------+ +| bookmarks.xbel | Bookmarks, XBEL | ++----------------+------------------------------------------------------------+ +| config | Preferences, text key file | ++----------------+------------------------------------------------------------+ +| cookies.txt | Cookies, Mozilla text cookies | ++----------------+------------------------------------------------------------+ +| history.db | History, sqlite3 | ++----------------+------------------------------------------------------------+ +| running | A file created to track whether Midori quit cleanly | ++----------------+------------------------------------------------------------+ +| session.xbel | The current or last session, ie. open tabs, | ++----------------+------------------------------------------------------------+ +| tabtrash.xbel | The 10 last closed tabs | ++----------------+------------------------------------------------------------+ + +Note that generally manual modifications to these files aren't recommended. As +an exception, while Midori is *not* running, it is possible to edit or +replace the 'bookmarks.xbel' as long as it is valid XBEL/ XML. + +Currently while Midori is running it will happily overwrite files as needed and +never read back any changes. + +Incidentally if any of the files is readonly Midori will read it and not ever +write modifications back to disk. This can be useful for kiosk systems where +particular changes shouldn't be saved. + + Keyboard shortcuts ------------------ @@ -144,8 +189,10 @@ The navigationbar ----------------- -... - +The navigationbar is the primary toolbar containing notably back and forward +buttons, the location entry and a search entry. Except for the location entry +any item can be removed and others can be added by right-clicking the toolbar +and using the Add and Remove menu items. The sidepanel @@ -155,6 +202,13 @@ The sidepanel ... +Extensions +---------- + + +... + + Frequently asked questions '''''''''''''''''''''''''' From 5d360b065b60c9fcb9441c1f2d2cf05c0180f780 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 14 Apr 2009 19:19:50 +0200 Subject: [PATCH 0999/2970] Fix search engines without %s in the context menu --- midori/midori-view.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 3ac7c304..9c0568bb 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -894,12 +894,10 @@ midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, g_object_get (view->settings, "location-entry-search", &search, NULL); if (strstr (search, "%s")) - { uri = g_strdup_printf (search, view->selected_text); - g_free (search); - } else - uri = search; + uri = g_strconcat (search, view->selected_text, NULL); + g_free (search); g_signal_emit (view, signals[NEW_TAB], 0, uri, view->open_tabs_in_the_background); From a9863cfb40d794632df31cbd121d6a54efbdb309 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 14 Apr 2009 19:44:48 +0200 Subject: [PATCH 1000/2970] Add News Aggregator preference The program set here is called if the user clicks on the news feed icon, with the address of the current website as argument. For example liferea-add-feed works like that. --- midori/midori-browser.c | 18 ++++++++++++++---- midori/midori-preferences.c | 16 +++++++++++++++- midori/midori-view.c | 11 +++++++++-- midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 869ac604..48b205c9 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -85,6 +85,7 @@ struct _MidoriBrowser gboolean show_statusbar; gboolean progress_in_location; gboolean remember_last_visited_pages; + gchar* news_aggregator; }; #if HAVE_HILDON @@ -303,7 +304,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); action = _action_by_name (browser, "Location"); - if (g_object_get_data (G_OBJECT (view), "news-feeds")) + if (browser->news_aggregator && *browser->news_aggregator + && g_object_get_data (G_OBJECT (view), "news-feeds")) midori_location_action_set_secondary_icon ( MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); else @@ -2573,9 +2575,8 @@ _action_location_secondary_icon_released (GtkAction* action, if ((view = midori_browser_get_current_tab (browser))) { const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); - /* FIXME: Support a user chosen feed reader */ - if (1) - sokoke_spawn_program ("liferea-add-feed", uri); + if (browser->news_aggregator && *browser->news_aggregator) + sokoke_spawn_program (browser->news_aggregator, uri); } } @@ -4309,6 +4310,8 @@ midori_browser_finalize (GObject* object) katze_object_assign (browser->net, NULL); + katze_assign (browser->news_aggregator, NULL); + G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object); } @@ -4434,6 +4437,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) gint default_width, default_height; KatzeItem* item; + g_free (browser->news_aggregator); + g_object_get (browser->settings, "remember-last-window-size", &remember_last_window_size, "last-window-width", &last_window_width, @@ -4455,6 +4460,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "close-buttons-on-tabs", &close_buttons_on_tabs, "progress-in-location", &browser->progress_in_location, "remember-last-visited-pages", &browser->remember_last_visited_pages, + "news-aggregator", &browser->news_aggregator, NULL); screen = gtk_window_get_screen (GTK_WINDOW (browser)); @@ -4546,6 +4552,10 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->progress_in_location = g_value_get_boolean (&value); else if (name == g_intern_string ("remember-last-visited-pages")) browser->remember_last_visited_pages = g_value_get_boolean (&value); + else if (name == g_intern_string ("news-aggregator")) + { + katze_assign (browser->news_aggregator, g_value_dup_string (&value)); + } else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings), name)) g_warning (_("Unexpected setting '%s'"), name); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 3c02df17..e9c05885 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -421,7 +421,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "show-crash-dialog", NULL); SPANNED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Transfers")); - TABLE_NEW (3, 2); + TABLE_NEW (4, 2); #if WEBKIT_CHECK_VERSION (1, 1, 3) label = katze_property_label (settings, "download-folder"); INDENTED_ADD (label, 0, 1, 0, 1); @@ -456,6 +456,20 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_signal_connect (entry, "focus-out-event", G_CALLBACK (proxy_download_manager_icon_cb), button); FILLED_ADD (hbox, 1, 2, 2, 3); + label = katze_property_label (settings, "news-aggregator"); + INDENTED_ADD (label, 0, 1, 3, 4); + hbox = gtk_hbox_new (FALSE, 4); + button = gtk_image_new (); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + gtk_widget_set_size_request (button, icon_width, icon_height); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); + entry = katze_property_proxy (settings, "news-aggregator", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_download_manager_icon_cb), button); + FILLED_ADD (hbox, 1, 2, 3, 4); /* Page "Appearance" */ PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); diff --git a/midori/midori-view.c b/midori/midori-view.c index 9c0568bb..7c36d2c4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -63,6 +63,7 @@ struct _MidoriView /* KatzeArray* news_feeds; */ gchar* download_manager; + gchar* news_aggregator; gboolean middle_click_opens_selection; gboolean open_tabs_in_the_background; gboolean close_buttons_on_tabs; @@ -664,8 +665,7 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "progress"); midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); - /* FIXME: Do this conditional on whether there's a custom feed reader */ - if (1) + if (view->news_aggregator && *view->news_aggregator) { JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); gchar* value = sokoke_js_script_eval (js_context, @@ -1359,6 +1359,7 @@ midori_view_init (MidoriView* view) view->item = NULL; view->download_manager = NULL; + view->news_aggregator = NULL; view->web_view = NULL; /* Adjustments are not created automatically */ @@ -1387,6 +1388,7 @@ midori_view_finalize (GObject* object) katze_object_assign (view->item, NULL); katze_assign (view->download_manager, NULL); + katze_assign (view->news_aggregator, NULL); katze_object_assign (view->net, NULL); @@ -1509,6 +1511,7 @@ _midori_view_update_settings (MidoriView* view) g_object_get (view->settings, "download-manager", &view->download_manager, + "news-aggregator", &view->news_aggregator, "zoom-text-and-images", &zoom_text_and_images, "close-buttons-on-tabs", &view->close_buttons_on_tabs, "open-new-pages-in", &view->open_new_pages_in, @@ -1538,6 +1541,10 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, { katze_assign (view->download_manager, g_value_dup_string (&value)); } + else if (name == g_intern_string ("news-aggregator")) + { + katze_assign (view->news_aggregator, g_value_dup_string (&value)); + } else if (name == g_intern_string ("zoom-text-and-images")) { if (view->web_view) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 08677f6a..40e42fbc 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -51,6 +51,7 @@ struct _MidoriWebSettings gchar* download_folder; gchar* download_manager; gchar* text_editor; + gchar* news_aggregator; gchar* location_entry_search; MidoriPreferredEncoding preferred_encoding; @@ -119,6 +120,7 @@ enum PROP_DOWNLOAD_FOLDER, PROP_DOWNLOAD_MANAGER, PROP_TEXT_EDITOR, + PROP_NEWS_AGGREGATOR, PROP_LOCATION_ENTRY_SEARCH, PROP_PREFERRED_ENCODING, @@ -580,6 +582,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) NULL, flags)); + /** + * MidoriWebSettings:news-aggregator: + * + * An external news aggregator. + * + * Since: 0.1.6 + */ + g_object_class_install_property (gobject_class, + PROP_NEWS_AGGREGATOR, + g_param_spec_string ( + "news-aggregator", + _("News Aggregator"), + _("An external news aggregator"), + NULL, + flags)); + g_object_class_install_property (gobject_class, PROP_LOCATION_ENTRY_SEARCH, g_param_spec_string ( @@ -1046,6 +1064,9 @@ midori_web_settings_set_property (GObject* object, case PROP_TEXT_EDITOR: katze_assign (web_settings->text_editor, g_value_dup_string (value)); break; + case PROP_NEWS_AGGREGATOR: + katze_assign (web_settings->news_aggregator, g_value_dup_string (value)); + break; case PROP_LOCATION_ENTRY_SEARCH: katze_assign (web_settings->location_entry_search, g_value_dup_string (value)); break; @@ -1239,6 +1260,9 @@ midori_web_settings_get_property (GObject* object, case PROP_TEXT_EDITOR: g_value_set_string (value, web_settings->text_editor); break; + case PROP_NEWS_AGGREGATOR: + g_value_set_string (value, web_settings->news_aggregator); + break; case PROP_LOCATION_ENTRY_SEARCH: g_value_set_string (value, web_settings->location_entry_search); break; From ad82a73ab88fad40a6477dee250b48a508145875 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Apr 2009 03:16:37 +0200 Subject: [PATCH 1001/2970] Show only image buttons in Statusbar Features in statusbar --- extensions/statusbar-features.c | 19 +++++++++++++------ katze/katze-utils.c | 8 +++++++- midori/sokoke.c | 1 + 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 8eb65c69..6c37c1af 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -38,6 +38,7 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, GtkWidget* bbox; MidoriWebSettings* settings; GtkWidget* button; + GtkWidget* image; /* FIXME: Monitor each view and modify its settings individually instead of merely replicating the global preferences. */ @@ -45,22 +46,28 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, statusbar = katze_object_get_object (browser, "statusbar"); bbox = gtk_hbox_new (FALSE, 0); settings = katze_object_get_object (browser, "settings"); - button = katze_property_proxy (settings, "auto-load-images", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Images")); + button = katze_property_proxy (settings, "auto-load-images", "toggle"); + image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_container_add (GTK_CONTAINER (button), image); #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Load images automatically")); #endif gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); - button = katze_property_proxy (settings, "enable-scripts", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Scripts")); + button = katze_property_proxy (settings, "enable-scripts", "toggle"); + image = gtk_image_new_from_stock (STOCK_SCRIPTS, GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_container_add (GTK_CONTAINER (button), image); #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Enable scripts")); #endif gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); - button = katze_property_proxy (settings, "enable-plugins", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Plugins")); + button = katze_property_proxy (settings, "enable-plugins", "toggle"); + image = gtk_image_new_from_stock (STOCK_PLUGINS, GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + gtk_container_add (GTK_CONTAINER (button), image); #if GTK_CHECK_VERSION(2, 12, 0) gtk_widget_set_tooltip_text (button, _("Enable plugins")); #endif diff --git a/katze/katze-utils.c b/katze/katze-utils.c index cebbf074..4bbee3b3 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -150,6 +150,9 @@ proxy_object_notify_string_cb (GObject* object, * choosing an existing filename, encoded as an URI. * "font": the widget created will be particularly suitable for * choosing a font from installed fonts. + * Since 0.1.6 the following hints are also supported: + * "toggle": the widget created will be an empty toggle button. This + * is only supported with boolean properties. * * Any other values for @hint are silently ignored. * @@ -193,7 +196,10 @@ katze_property_proxy (gpointer object, gchar* notify_property; gboolean toggled = katze_object_get_boolean (object, property); - widget = gtk_check_button_new_with_label (gettext (nick)); + if (_hint == g_intern_string ("toggle")) + widget = gtk_toggle_button_new (); + else + widget = gtk_check_button_new_with_label (gettext (nick)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), toggled); g_signal_connect (widget, "toggled", G_CALLBACK (proxy_toggle_button_toggled_cb), object); diff --git a/midori/sokoke.c b/midori/sokoke.c index 3ef3bc37..d6ad1afc 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -769,6 +769,7 @@ sokoke_register_stock_items (void) static FatStockItem items[] = { { STOCK_EXTENSION, NULL, 0, 0, GTK_STOCK_CONVERT }, + { STOCK_IMAGE, NULL, 0, 0, GTK_STOCK_ORIENTATION_PORTRAIT }, { STOCK_NEWS_FEED, NULL, 0, 0, GTK_STOCK_INDEX }, { STOCK_SCRIPT, NULL, 0, 0, GTK_STOCK_EXECUTE }, { STOCK_STYLE, NULL, 0, 0, GTK_STOCK_SELECT_COLOR }, From 6b7876cdf7175525d8ab1e72e197355ec73da9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 17 Apr 2009 03:27:15 +0200 Subject: [PATCH 1002/2970] Add missing NULL check and fix a memory leak in the Addons panel --- panels/midori-addons.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/panels/midori-addons.c b/panels/midori-addons.c index 122809e8..4faa69e1 100644 --- a/panels/midori-addons.c +++ b/panels/midori-addons.c @@ -318,8 +318,12 @@ _treeview_first_selected_path (GtkTreeView *treeview) if (gtk_tree_selection_get_selected (selection, NULL, NULL)) { + GtkTreePath* result; tree_paths = gtk_tree_selection_get_selected_rows (selection, NULL); - return g_list_nth_data (tree_paths, 0); + result = gtk_tree_path_copy (g_list_nth_data (tree_paths, 0)); + g_list_foreach (tree_paths, (GFunc)gtk_tree_path_free, NULL); + g_list_free (tree_paths); + return result; } else return NULL; @@ -367,7 +371,7 @@ midori_addons_treeview_cursor_changed (GtkTreeView* treeview, path = _treeview_first_selected_path (treeview); model = gtk_tree_view_get_model (treeview); - if (gtk_tree_model_get_iter (model, &iter, path)) + if (path && gtk_tree_model_get_iter (model, &iter, path)) { gtk_tree_model_get (model, &iter, 0, &element, -1); if (element->broken) From 310be08e485d249b881a650648d59ccb161f9ab3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Apr 2009 03:31:53 +0200 Subject: [PATCH 1003/2970] Reword note about readonly files in the user docs --- docs/user/midori.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user/midori.txt b/docs/user/midori.txt index a8e066f2..fbb93022 100644 --- a/docs/user/midori.txt +++ b/docs/user/midori.txt @@ -173,8 +173,8 @@ replace the 'bookmarks.xbel' as long as it is valid XBEL/ XML. Currently while Midori is running it will happily overwrite files as needed and never read back any changes. -Incidentally if any of the files is readonly Midori will read it and not ever -write modifications back to disk. This can be useful for kiosk systems where +Incidentally Midori will recognize readonly files and not write modifications +to readonly files back to disk. This can be useful for kiosk systems where particular changes shouldn't be saved. From f50239676c7ca6d6857504167d4ca5dead3d7efb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 17 Apr 2009 03:36:43 +0200 Subject: [PATCH 1004/2970] Don't built the Tab Panel, it is not currently useful --- extensions/wscript_build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/wscript_build b/extensions/wscript_build index 1ea845d2..ae26cc50 100644 --- a/extensions/wscript_build +++ b/extensions/wscript_build @@ -4,6 +4,9 @@ extensions = os.listdir ('extensions') for extension in extensions: + # Tab Panel isn't useful at this point + if extension == 'tab-panel': + continue folder = 'extensions' + os.sep + extension if os.path.isdir (folder): files = os.listdir (folder) From 8aaa4d7c198ce154621e7b944a7ebe822f0afa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 17 Apr 2009 03:45:30 +0200 Subject: [PATCH 1005/2970] Properly handle closed browsers and correctly disconnect signals --- extensions/cookie-manager.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 81355835..0d043718 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -31,6 +31,8 @@ enum typedef struct _CMData { MidoriApp *app; + MidoriBrowser *browser; + MidoriExtension *extension; GtkWidget *panel_page; GtkWidget *desc_label; @@ -56,6 +58,8 @@ typedef struct _CMData static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext); static void cm_filter_tree(CMData *cmdata, const gchar *filter_text); +static void cm_deactivate_cb(MidoriExtension *extension, CMData *cmdata); +static void cm_jar_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, CMData *cmdata); #if CM_DEBUG @@ -86,19 +90,31 @@ static void cm_free_cookie_list(CMData *cmdata) } -static void cm_deactivate_cb(MidoriExtension *extension, CMData *cmdata) +static void cm_browser_close_cb(GtkObject *browser, CMData *cmdata) { - g_signal_handlers_disconnect_by_func(cmdata->app, cm_app_add_browser_cb, extension); - g_signal_handlers_disconnect_by_func(extension, cm_deactivate_cb, cmdata); + g_signal_handlers_disconnect_by_func(cmdata->extension, cm_deactivate_cb, cmdata); + g_signal_handlers_disconnect_by_func(cmdata->browser, cm_browser_close_cb, cmdata); + g_signal_handlers_disconnect_by_func(cmdata->jar, cm_jar_changed_cb, cmdata); cm_free_cookie_list(cmdata); - gtk_widget_destroy(cmdata->panel_page); + /* the panel_page widget gets destroyed automatically when a browser is closed but not + * when the extension is deactivated */ + if (cmdata->panel_page != NULL && GTK_IS_WIDGET(cmdata->panel_page)) + gtk_widget_destroy(cmdata->panel_page); + gtk_widget_destroy(cmdata->popup_menu); g_free(cmdata); } +static void cm_deactivate_cb(MidoriExtension *extension, CMData *cmdata) +{ + g_signal_handlers_disconnect_by_func(cmdata->app, cm_app_add_browser_cb, extension); + cm_browser_close_cb(NULL, cmdata); +} + + static void cm_refresh_store(CMData *cmdata) { GSList *l; @@ -781,6 +797,8 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori cmdata = g_new0(CMData, 1); cmdata->app = app; + cmdata->extension = ext; + cmdata->browser = browser; panel = katze_object_get_object(browser, "panel"); toolbar = gtk_toolbar_new(); @@ -895,6 +913,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori STOCK_COOKIE_MANAGER, _("Cookie Manager"), toolbar); g_signal_connect(ext, "deactivate", G_CALLBACK(cm_deactivate_cb), cmdata); + g_signal_connect(browser, "destroy", G_CALLBACK(cm_browser_close_cb), cmdata); g_object_unref(panel); } From b8f957178366d9564f23a0f9b4c482dec70695ae Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Fri, 17 Apr 2009 03:56:10 +0200 Subject: [PATCH 1006/2970] Don't add optimization flags for "--debug-level none" Choosing 'none' now means no changes to CFLAGS whilst the 'debug' and 'full' still add optimizations among other options because they can have a significant effect on generated code. --- wscript | 2 -- 1 file changed, 2 deletions(-) diff --git a/wscript b/wscript index 51210817..6f85c11d 100644 --- a/wscript +++ b/wscript @@ -201,8 +201,6 @@ def configure (conf): '-Winit-self -Wmissing-include-dirs -Wundef ' '-Wmissing-format-attribute -Wnested-externs ' '-DG_ENABLE_DEBUG'.split ()) - else: - conf.env.append_value ('CCFLAGS', '-O2') elif debug_level != 'none': Utils.pprint ('RED', 'No debugging level support for ' + compiler) sys.exit (1) From 59f4a3acdbfac190e29d8fa6c450f13d9b3d7e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 18 Apr 2009 19:26:42 +0200 Subject: [PATCH 1007/2970] Move search engine items in selection context menus to a submenu --- midori/midori-view.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 7c36d2c4..bb10bfe5 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1043,21 +1043,24 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, { KatzeArray* search_engines; KatzeItem* item; + GtkWidget* sub_menu = gtk_menu_new (); + + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Search _with")); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), sub_menu); + gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, 1); + gtk_widget_show (menuitem); search_engines = katze_object_get_object (window, "search-engines"); while ((item = katze_array_get_nth_item (search_engines, i++))) { GdkPixbuf* pixbuf; - gchar* text = g_strdup_printf (_("Search with %s"), - katze_item_get_name (item)); - menuitem = gtk_image_menu_item_new_with_mnemonic (text); - g_free (text); + menuitem = gtk_image_menu_item_new_with_mnemonic (katze_item_get_name (item)); pixbuf = midori_search_action_get_icon (view->net, item, GTK_WIDGET (web_view)); icon = gtk_image_new_from_pixbuf (pixbuf); g_object_unref (pixbuf); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menuitem, i - 1); + gtk_menu_shell_insert (GTK_MENU_SHELL (sub_menu), menuitem, i - 1); g_object_set_data (G_OBJECT (menuitem), "search", (gchar*)katze_item_get_uri (item)); g_signal_connect (menuitem, "activate", @@ -1067,19 +1070,15 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, g_object_unref (search_engines); } items = gtk_container_get_children (GTK_CONTAINER (menu)); - menuitem = (GtkWidget*)g_list_nth_data (items, i - 1); - if (i > 1) - gtk_widget_destroy (menuitem); - else - { - /* hack to localize menu item */ - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), _("_Search the Web")); - /* hack to implement Search the Web */ - g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); - } + menuitem = (GtkWidget*)g_list_nth_data (items, 0); + /* hack to localize menu item */ + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), _("_Search the Web")); + /* hack to implement Search the Web */ + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view); g_list_free (items); + if (strchr (view->selected_text, '.') && !strchr (view->selected_text, ' ')) { From 18b66ce7d15785e9beeddf5e856d485fabc01eeb Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Apr 2009 22:41:37 +0200 Subject: [PATCH 1008/2970] Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however. --- midori/midori-browser.c | 68 ++++++++++++----- midori/midori-preferences.c | 7 +- midori/midori-searchaction.c | 137 ++++++++++++++++++++++++++++++++++- midori/midori-searchaction.h | 7 ++ 4 files changed, 194 insertions(+), 25 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 48b205c9..f329c896 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -85,6 +85,7 @@ struct _MidoriBrowser gboolean show_statusbar; gboolean progress_in_location; gboolean remember_last_visited_pages; + gchar* location_entry_search; gchar* news_aggregator; }; @@ -2542,18 +2543,15 @@ _action_location_submit_uri (GtkAction* action, gboolean new_tab, MidoriBrowser* browser) { - gchar* location_entry_search; gchar* new_uri; gint n; - g_object_get (browser->settings, "location-entry-search", - &location_entry_search, NULL); new_uri = sokoke_magic_uri (uri, browser->search_engines); - if (!new_uri && strstr (location_entry_search, "%s")) - new_uri = g_strdup_printf (location_entry_search, uri); + if (!new_uri && strstr (browser->location_entry_search, "%s")) + new_uri = g_strdup_printf (browser->location_entry_search, uri); else if (!new_uri) - new_uri = g_strdup (location_entry_search); - g_free (location_entry_search); + new_uri = g_strconcat (browser->location_entry_search, uri, NULL); + if (new_tab) { n = midori_browser_add_uri (browser, new_uri); @@ -2597,22 +2595,15 @@ _action_search_submit (GtkAction* action, guint last_web_search; KatzeItem* item; const gchar* url; - gchar* location_entry_search; gchar* search; g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, last_web_search); if (item) - { - location_entry_search = NULL; url = katze_item_get_uri (item); - } else /* The location entry search is our fallback */ - { - g_object_get (browser->settings, "location-entry-search", - &location_entry_search, NULL); - url = location_entry_search; - } + url = browser->location_entry_search; + if (strstr (url, "%s")) search = g_strdup_printf (url, keywords); else @@ -2624,7 +2615,6 @@ _action_search_submit (GtkAction* action, midori_browser_set_current_uri (browser, search); g_free (search); - g_free (location_entry_search); } static void @@ -2646,6 +2636,21 @@ _action_search_notify_current_item (GtkAction* action, g_object_set (browser->settings, "last-web-search", idx, NULL); } +static void +_action_search_notify_default_item (GtkAction* action, + GParamSpec* pspec, + MidoriBrowser* browser) +{ + MidoriSearchAction* search_action; + KatzeItem* item; + + search_action = MIDORI_SEARCH_ACTION (action); + item = midori_search_action_get_default_item (search_action); + if (item) + g_object_set (browser->settings, "location-entry-search", + katze_item_get_uri (item), NULL); +} + static void _action_search_focus_out (GtkAction* action, MidoriBrowser* browser) @@ -3970,6 +3975,8 @@ midori_browser_init (MidoriBrowser* browser) _action_search_focus_out, browser, "signal::notify::current-item", _action_search_notify_current_item, browser, + "signal::notify::default-item", + _action_search_notify_default_item, browser, NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, "K"); @@ -4457,6 +4464,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, + "location-entry-search", &browser->location_entry_search, "close-buttons-on-tabs", &close_buttons_on_tabs, "progress-in-location", &browser->progress_in_location, "remember-last-visited-pages", &browser->remember_last_visited_pages, @@ -4497,11 +4505,22 @@ _midori_browser_update_settings (MidoriBrowser* browser) if (browser->search_engines) { + guint i; + item = katze_array_get_nth_item (browser->search_engines, last_web_search); if (item) midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); + + i = 0; + while ((item = katze_array_get_nth_item (browser->search_engines, i++))) + if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search)) + { + midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( + _action_by_name (browser, "Search")), item); + break; + } } midori_panel_set_compact (MIDORI_PANEL (browser->panel), compact_sidepanel); @@ -4550,6 +4569,10 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->show_statusbar = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); + else if (name == g_intern_string ("location-entry-search")) + { + katze_assign (browser->location_entry_search, g_value_dup_string (&value)); + } else if (name == g_intern_string ("remember-last-visited-pages")) browser->remember_last_visited_pages = g_value_get_boolean (&value); else if (name == g_intern_string ("news-aggregator")) @@ -4711,12 +4734,23 @@ midori_browser_set_property (GObject* object, /* FIXME: Connect to updates */ if (browser->settings) { + guint i; + g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, last_web_search); midori_search_action_set_current_item (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), item); + + i = 0; + while ((item = katze_array_get_nth_item (browser->search_engines, i++))) + if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search)) + { + midori_search_action_set_default_item (MIDORI_SEARCH_ACTION ( + _action_by_name (browser, "Search")), item); + break; + } } break; case PROP_HISTORY: diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index e9c05885..3c492e1a 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -506,7 +506,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Behavior" */ PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); FRAME_NEW (_("Features")); - TABLE_NEW (7, 2); + TABLE_NEW (6, 2); button = katze_property_proxy (settings, "auto-load-images", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); gtk_widget_set_tooltip_text (button, _("Load and display images automatically")); @@ -542,11 +542,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "zoom-text-and-images", NULL); SPANNED_ADD (button, 0, 1, 4, 5); button = katze_property_proxy (settings, "find-while-typing", NULL); - SPANNED_ADD (button, 1, 2, 4, 5); - label = katze_property_label (settings, "location-entry-search"); - INDENTED_ADD (label, 0, 1, 5, 6); - entry = katze_property_proxy (settings, "location-entry-search", NULL); - FILLED_ADD (entry, 1, 2, 5, 6); /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index e8e860dc..104121e3 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -25,6 +25,7 @@ struct _MidoriSearchAction KatzeArray* search_engines; KatzeItem* current_item; + KatzeItem* default_item; gchar* text; KatzeNet* net; @@ -35,6 +36,7 @@ struct _MidoriSearchAction GtkWidget* treeview; GtkWidget* edit_button; GtkWidget* remove_button; + GtkWidget* default_button; }; struct _MidoriSearchActionClass @@ -50,6 +52,7 @@ enum PROP_SEARCH_ENGINES, PROP_CURRENT_ITEM, + PROP_DEFAULT_ITEM, PROP_TEXT, PROP_DIALOG }; @@ -147,6 +150,22 @@ midori_search_action_class_init (MidoriSearchActionClass* class) KATZE_TYPE_ITEM, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * MidoriSearchAction:default-item: + * + * The default search engine. + * + * Since: 0.1.6 + */ + g_object_class_install_property (gobject_class, + PROP_DEFAULT_ITEM, + g_param_spec_object ( + "default-item", + "Default Item", + "The default search engine", + KATZE_TYPE_ITEM, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_TEXT, g_param_spec_string ( @@ -171,6 +190,7 @@ midori_search_action_init (MidoriSearchAction* search_action) { search_action->search_engines = NULL; search_action->current_item = NULL; + search_action->default_item = NULL; search_action->text = NULL; search_action->net = katze_net_new (); @@ -181,6 +201,7 @@ midori_search_action_init (MidoriSearchAction* search_action) search_action->treeview = NULL; search_action->edit_button = NULL; search_action->remove_button = NULL; + search_action->default_button = NULL; } static void @@ -213,6 +234,10 @@ midori_search_action_set_property (GObject* object, midori_search_action_set_current_item (search_action, g_value_get_object (value)); break; + case PROP_DEFAULT_ITEM: + midori_search_action_set_default_item (search_action, + g_value_get_object (value)); + break; case PROP_TEXT: midori_search_action_set_text (search_action, g_value_get_string (value)); @@ -239,6 +264,9 @@ midori_search_action_get_property (GObject* object, case PROP_CURRENT_ITEM: g_value_set_object (value, search_action->current_item); break; + case PROP_DEFAULT_ITEM: + g_value_set_object (value, search_action->default_item); + break; case PROP_TEXT: g_value_set_string (value, search_action->text); break; @@ -716,6 +744,67 @@ midori_search_action_set_current_item (MidoriSearchAction* search_action, while ((proxies = g_slist_next (proxies))); } +/** + * midori_search_action_get_default_item: + * @search_action: a #MidoriSearchAction + * + * Retrieves the default search engine. + * + * Since 0.1.6 + * + * Return value: a #KatzeItem + **/ +KatzeItem* +midori_search_action_get_default_item (MidoriSearchAction* search_action) +{ + g_return_val_if_fail (MIDORI_IS_SEARCH_ACTION (search_action), NULL); + + return search_action->default_item; +} + +/** + * midori_search_action_set_default_item: + * @search_action: a #MidoriSearchAction + * @item: a #KatzeItem + * + * Sets the default search engine. + * + * Since 0.1.6 + **/ +void +midori_search_action_set_default_item (MidoriSearchAction* search_action, + KatzeItem* item) +{ + g_return_if_fail (MIDORI_IS_SEARCH_ACTION (search_action)); + g_return_if_fail (!item || KATZE_IS_ITEM (item)); + + if (item) + g_object_ref (item); + katze_object_assign (search_action->default_item, item); + g_object_notify (G_OBJECT (search_action), "default-item"); +} + +static void +midori_search_action_dialog_render_tick_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + MidoriSearchAction* search_action; + gint width; + + gtk_tree_model_get (model, iter, 0, &item, -1); + + search_action = g_object_get_data (G_OBJECT (treeview), "search-action"); + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, NULL); + g_object_set (renderer, "stock-id", + search_action->default_item == item ? GTK_STOCK_YES : NULL, + "width", width + 4, NULL); + g_object_unref (item); +} + static void midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, GtkCellRenderer* renderer, @@ -733,6 +822,7 @@ midori_search_action_dialog_render_icon_cb (GtkTreeViewColumn* column, icon = midori_search_action_get_icon (search_action->net, item, treeview); g_object_set (renderer, "pixbuf", icon, "yalign", 0.25, NULL); g_object_unref (icon); + g_object_unref (item); } static void @@ -753,6 +843,7 @@ midori_search_action_dialog_render_text (GtkTreeViewColumn* column, markup = g_markup_printf_escaped ("%s\n%s", name, text ? text : ""); g_object_set (renderer, "markup", markup, NULL); g_free (markup); + g_object_unref (item); } static void @@ -771,6 +862,7 @@ midori_search_action_dialog_render_token (GtkTreeViewColumn* column, markup = g_markup_printf_escaped ("%s", token ? token : ""); g_object_set (renderer, "markup", markup, "yalign", 0.0, NULL); g_free (markup); + g_object_unref (item); } static void @@ -967,6 +1059,29 @@ midori_search_action_dialog_remove_cb (GtkWidget* widget, } } +static void +midori_search_action_dialog_default_cb (GtkWidget* widget, + MidoriSearchAction* search_action) +{ + KatzeArray* search_engines; + GtkWidget* treeview; + GtkTreeSelection* selection; + GtkTreeModel* liststore; + GtkTreeIter iter; + KatzeItem* item; + + search_engines = search_action->search_engines; + treeview = search_action->treeview; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + if (gtk_tree_selection_get_selected (selection, &liststore, &iter)) + { + gtk_tree_model_get (liststore, &iter, 0, &item, -1); + midori_search_action_set_default_item (search_action, item); + g_object_unref (item); + gtk_widget_queue_draw (treeview); + } +} + static void midori_search_action_treeview_selection_cb (GtkTreeSelection* selection, MidoriSearchAction* search_action) @@ -977,6 +1092,7 @@ midori_search_action_treeview_selection_cb (GtkTreeSelection* selection, gtk_widget_set_sensitive (search_action->edit_button, selected); gtk_widget_set_sensitive (search_action->remove_button, selected); + gtk_widget_set_sensitive (search_action->default_button, selected); } static void @@ -1068,6 +1184,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) KatzeItem* item; GtkWidget* vbox; GtkWidget* button; + GtkWidget* image; g_return_val_if_fail (MIDORI_IS_SEARCH_ACTION (search_action), NULL); @@ -1093,7 +1210,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_HELP, FALSE); sokoke_widget_get_text_size (dialog, "M", &width, &height); - gtk_window_set_default_size (GTK_WINDOW (dialog), width * 42, -1); + gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); /* TODO: Do we want tooltips for explainations or can we omit that? @@ -1112,10 +1229,15 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) "changed", G_CALLBACK (midori_search_action_treeview_selection_cb), search_action); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + g_object_set_data (G_OBJECT (treeview), "search-action", search_action); column = gtk_tree_view_column_new (); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); - g_object_set_data (G_OBJECT (treeview), "search-action", search_action); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)midori_search_action_dialog_render_tick_cb, + treeview, NULL); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, (GtkTreeCellDataFunc)midori_search_action_dialog_render_icon_cb, treeview, NULL); @@ -1166,6 +1288,17 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) if (!i) gtk_widget_set_sensitive (button, FALSE); button = gtk_label_new (""); /* This is an invisible separator */ + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 8); + button = gtk_button_new_with_mnemonic ("Use as _default"); + image = gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), image); + search_action->default_button = button; + g_signal_connect (button, "clicked", + G_CALLBACK (midori_search_action_dialog_default_cb), search_action); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + if (!i) + gtk_widget_set_sensitive (button, FALSE); + button = gtk_label_new (""); /* This is an invisible separator */ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12); button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN); gtk_widget_set_sensitive (button, FALSE); diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h index a2cecaf2..760dd4e5 100644 --- a/midori/midori-searchaction.h +++ b/midori/midori-searchaction.h @@ -56,6 +56,13 @@ void midori_search_action_set_current_item (MidoriSearchAction* search_action, KatzeItem* item); +KatzeItem* +midori_search_action_get_default_item (MidoriSearchAction* search_action); + +void +midori_search_action_set_default_item (MidoriSearchAction* search_action, + KatzeItem* item); + GtkWidget* midori_search_action_get_dialog (MidoriSearchAction* search_action); From 52084a21e1ae31a778a094267c3b3d839e3830f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 18 Apr 2009 23:26:54 +0200 Subject: [PATCH 1009/2970] Add a preference Search engines in location completion It seems that deletion of completion actions can fail, which means that the actions remain until the next restart. It is not clear how to fix this. --- midori/midori-browser.c | 21 +++++++++++++++++++-- midori/midori-locationaction.c | 5 +++-- midori/midori-preferences.c | 2 ++ midori/midori-websettings.c | 24 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f329c896..d37eb49d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4569,6 +4569,15 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->show_statusbar = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); + else if (name == g_intern_string ("search-engines-in-completion")) + { + if (g_value_get_boolean (&value)) + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), browser->search_engines); + else + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), NULL); + } else if (name == g_intern_string ("location-entry-search")) { katze_assign (browser->location_entry_search, g_value_dup_string (&value)); @@ -4727,8 +4736,16 @@ midori_browser_set_property (GObject* object, case PROP_SEARCH_ENGINES: /* FIXME: Disconnect handlers */ katze_object_assign (browser->search_engines, g_value_dup_object (value)); - midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( - _action_by_name (browser, "Location")), browser->search_engines); + if (browser->settings) + { + if (katze_object_get_boolean (browser->settings, + "search-engines-in-completion")) + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), browser->search_engines); + else + midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION ( + _action_by_name (browser, "Location")), NULL); + } midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION ( _action_by_name (browser, "Search")), browser->search_engines); /* FIXME: Connect to updates */ diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 030f83d9..5036ba64 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1246,9 +1246,10 @@ midori_location_action_set_search_engines (MidoriLocationAction* location_action completion = gtk_entry_get_completion (GTK_ENTRY (child)); i = 0; + /* FIXME: Apparently deleting doesn't always work, but why? */ if (location_action->search_engines) - while ((item = katze_array_get_nth_item (location_action->search_engines, i))) - gtk_entry_completion_delete_action (completion, i++); + while ((item = katze_array_get_nth_item (location_action->search_engines, i++))) + gtk_entry_completion_delete_action (completion, i); midori_location_action_add_actions (completion, search_engines); } diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 3c492e1a..0ca3ea3d 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -553,6 +553,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (button, 1, 2, 0, 1); #endif button = katze_property_proxy (settings, "progress-in-location", NULL); + FILLED_ADD (button, 0, 1, 1, 2); + button = katze_property_proxy (settings, "search-engines-in-completion", NULL); FILLED_ADD (button, 1, 2, 1, 2); FRAME_NEW (_("Browsing")); TABLE_NEW (5, 2); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 40e42fbc..29cf757c 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -41,6 +41,7 @@ struct _MidoriWebSettings MidoriToolbarStyle toolbar_style; gboolean progress_in_location; + gboolean search_engines_in_completion; gchar* toolbar_items; gboolean compact_sidepanel; gboolean right_align_sidepanel; @@ -110,6 +111,7 @@ enum PROP_TOOLBAR_STYLE, PROP_PROGRESS_IN_LOCATION, + PROP_SEARCH_ENGINES_IN_COMPLETION, PROP_TOOLBAR_ITEMS, PROP_COMPACT_SIDEPANEL, PROP_RIGHT_ALIGN_SIDEPANEL, @@ -481,6 +483,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) TRUE, flags)); + /** + * MidoriWebSettings:search-engines-in-completion: + * + * Whether to show search engines in the location completion. + * + * Since: 0.1.3 + */ + g_object_class_install_property (gobject_class, + PROP_SEARCH_ENGINES_IN_COMPLETION, + g_param_spec_boolean ( + "search-engines-in-completion", + _("Search engines in location completion"), + _("Whether to show search engines in the location completion"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_TOOLBAR_ITEMS, g_param_spec_string ( @@ -1036,6 +1054,9 @@ midori_web_settings_set_property (GObject* object, case PROP_PROGRESS_IN_LOCATION: web_settings->progress_in_location = g_value_get_boolean (value); break; + case PROP_SEARCH_ENGINES_IN_COMPLETION: + web_settings->search_engines_in_completion = g_value_get_boolean (value); + break; case PROP_TOOLBAR_ITEMS: katze_assign (web_settings->toolbar_items, g_value_dup_string (value)); break; @@ -1232,6 +1253,9 @@ midori_web_settings_get_property (GObject* object, case PROP_PROGRESS_IN_LOCATION: g_value_set_boolean (value, web_settings->progress_in_location); break; + case PROP_SEARCH_ENGINES_IN_COMPLETION: + g_value_set_boolean (value, web_settings->search_engines_in_completion); + break; case PROP_TOOLBAR_ITEMS: g_value_set_string (value, web_settings->toolbar_items); break; From d7d6edbff3ee892efd7f996e4a8c6b8d310befac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 00:47:02 +0200 Subject: [PATCH 1010/2970] Percent encode search terms, so '+' actually ends up as a '+' --- midori/midori-browser.c | 13 +++++++++---- midori/sokoke.c | 6 ++++-- tests/magic-uri.c | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d37eb49d..1c521121 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2547,10 +2547,15 @@ _action_location_submit_uri (GtkAction* action, gint n; new_uri = sokoke_magic_uri (uri, browser->search_engines); - if (!new_uri && strstr (browser->location_entry_search, "%s")) - new_uri = g_strdup_printf (browser->location_entry_search, uri); - else if (!new_uri) - new_uri = g_strconcat (browser->location_entry_search, uri, NULL); + if (!new_uri) + { + gchar* uri_ = g_uri_escape_string (uri, " :/", TRUE); + if (strstr (browser->location_entry_search, "%s")) + new_uri = g_strdup_printf (browser->location_entry_search, uri_); + else if (!new_uri) + new_uri = g_strconcat (browser->location_entry_search, uri_, NULL); + g_free (uri_); + } if (new_tab) { diff --git a/midori/sokoke.c b/midori/sokoke.c index d6ad1afc..adda6469 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -279,11 +279,13 @@ sokoke_magic_uri (const gchar* uri, if (parts[0] && parts[1]) if ((item = katze_array_find_token (search_engines, parts[0]))) { + gchar* uri_ = g_uri_escape_string (parts[1], " :/", TRUE); search_uri = katze_item_get_uri (item); if (strstr (search_uri, "%s")) - search = g_strdup_printf (search_uri, parts[1]); + search = g_strdup_printf (search_uri, uri_); else - search = g_strdup_printf ("%s%s", search_uri, parts[1]); + search = g_strconcat (search_uri, uri_, NULL); + g_free (uri_); } g_strfreev (parts); return search; diff --git a/tests/magic-uri.c b/tests/magic-uri.c index 381acd4c..b8fbe445 100644 --- a/tests/magic-uri.c +++ b/tests/magic-uri.c @@ -117,6 +117,8 @@ magic_uri_search (void) test_input ("cats dogs", NULL); test_input ("gtk 2.0", NULL); test_input ("gtk2.0", NULL); + test_input ("pcre++", NULL); + test_input ("sm pcre++", SM "pcre%2B%2B"); test_input ("midori0.1.0", NULL); test_input ("midori 0.1.0", NULL); test_input ("search:cats", NULL); From 3b0ce548a5eaae67aa47cf9919b1583bb2afba46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 19 Apr 2009 02:35:24 +0200 Subject: [PATCH 1011/2970] Delete completion actions by list position, not index The completion actions are not actually indiced but merely added to a list by their relative position. So instead of deleting by their presumed index we just delete the first one often enough. Also fix a wrong Since tag in a new setting. --- midori/midori-locationaction.c | 12 ++++++------ midori/midori-websettings.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 5036ba64..7d4ae733 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -208,8 +208,9 @@ midori_location_action_set_model (MidoriLocationAction* location_action, entry = gtk_bin_get_child (GTK_BIN (location_entry)); g_object_set (location_entry, "model", model, NULL); - g_object_set (gtk_entry_get_completion (GTK_ENTRY (entry)), - "model", model ? location_action->sort_model : NULL, NULL); + gtk_entry_completion_set_model ( + gtk_entry_get_completion (GTK_ENTRY (entry)), + model ? location_action->filter_model : NULL); } } @@ -770,11 +771,11 @@ midori_location_action_add_actions (GtkEntryCompletion* completion, return; i = 0; - while ((item = katze_array_get_nth_item (search_engines, i++))) + while ((item = katze_array_get_nth_item (search_engines, i))) { gchar* text = g_strdup_printf (_("Search with %s"), katze_item_get_name (item)); - gtk_entry_completion_insert_action_text (completion, i, text); + gtk_entry_completion_insert_action_text (completion, i++, text); g_free (text); } } @@ -1246,10 +1247,9 @@ midori_location_action_set_search_engines (MidoriLocationAction* location_action completion = gtk_entry_get_completion (GTK_ENTRY (child)); i = 0; - /* FIXME: Apparently deleting doesn't always work, but why? */ if (location_action->search_engines) while ((item = katze_array_get_nth_item (location_action->search_engines, i++))) - gtk_entry_completion_delete_action (completion, i); + gtk_entry_completion_delete_action (completion, 0); midori_location_action_add_actions (completion, search_engines); } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 29cf757c..eda71aae 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -488,7 +488,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) * * Whether to show search engines in the location completion. * - * Since: 0.1.3 + * Since: 0.1.6 */ g_object_class_install_property (gobject_class, PROP_SEARCH_ENGINES_IN_COMPLETION, From 98456e7f24b42b24940c909fe56f3cb9a1332dac Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 16:47:42 +0200 Subject: [PATCH 1012/2970] Fix accidentally removed Find while Typing preference --- midori/midori-preferences.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 0ca3ea3d..03e75bc6 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -542,6 +542,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "zoom-text-and-images", NULL); SPANNED_ADD (button, 0, 1, 4, 5); button = katze_property_proxy (settings, "find-while-typing", NULL); + SPANNED_ADD (button, 1, 2, 4, 5); /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); From 3c31b232954bca41bbd7a43e6c754ba3a16b29f3 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 16:48:37 +0200 Subject: [PATCH 1013/2970] Mark 'Use as default' for translation --- midori/midori-searchaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 104121e3..22790ff8 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1289,7 +1289,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_widget_set_sensitive (button, FALSE); button = gtk_label_new (""); /* This is an invisible separator */ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 8); - button = gtk_button_new_with_mnemonic ("Use as _default"); + button = gtk_button_new_with_mnemonic (_("Use as _default")); image = gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), image); search_action->default_button = button; From 224c7c391bd68cb473018f8068d7b848f3650610 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 16:49:42 +0200 Subject: [PATCH 1014/2970] Update translation template --- po/midori.pot | 997 +++++++++++++++++++++++++++++--------------------- 1 file changed, 583 insertions(+), 414 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index dcecf31d..094702e7 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-22 22:19+0100\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1580 ../midori/main.c:1672 -#: ../midori/main.c:1681 ../midori/main.c:1692 -#: ../midori/midori-websettings.c:269 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 +#: ../midori/main.c:1396 ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "" @@ -30,1173 +30,1277 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:158 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:165 ../midori/main.c:235 +#: ../midori/main.c:156 ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "" - -#: ../midori/main.c:485 ../midori/main.c:494 -msgid "Malformed document." -msgstr "" - -#: ../midori/main.c:516 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:548 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:602 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:626 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:649 ../midori/main.c:683 ../midori/main.c:699 +#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:907 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:936 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1066 ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "" - -#: ../midori/main.c:1087 ../midori/main.c:1114 ../midori/main.c:1142 +#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 ../midori/main.c:1190 +#: ../midori/main.c:850 ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1261 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1377 +#: ../midori/main.c:1073 msgid "" -"Midori seems to have crashed the last time it was opened. If this happend " +"Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1392 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1396 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1401 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1580 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1603 ../midori/gjs.c:515 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1626 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1628 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "" -#: ../midori/main.c:1630 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "" -#: ../midori/main.c:1669 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1693 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1695 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1722 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1772 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "" -#: ../midori/main.c:1784 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1799 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1812 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1825 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1837 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1853 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "" -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "" + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "" + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "" + +#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2837 ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "" -#: ../midori/midori-browser.c:2844 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2847 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "" + +#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "" + #: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3228 ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:3283 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-browser.c:3286 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-browser.c:3289 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-browser.c:3292 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-browser.c:3295 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-browser.c:3298 ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "" -#: ../midori/midori-browser.c:3301 ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3325 ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3330 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3333 ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "" + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:3903 ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:231 ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:241 ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "" + +#: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "" @@ -1224,250 +1328,239 @@ msgid "Transfers" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "" #. Page "Network" -#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 msgid "days" msgstr "" -#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 -msgid "History" -msgstr "" - -#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "" + +#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "" + +#: ../midori/sokoke.c:792 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "" -#: ../midori/gjs.c:743 ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "" - #: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "" @@ -1476,39 +1569,35 @@ msgstr "" msgid "Userstyles" msgstr "" -#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "" -#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "" -#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "" -#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "" @@ -1520,41 +1609,41 @@ msgstr "" msgid "Extensions" msgstr "" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:54 +#: ../panels/midori-plugins.c:87 msgid "Plugins" msgstr "" @@ -1595,52 +1684,132 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" msgstr "" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" msgstr "" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "" -#: ../extensions/mouse-gestures/main.c:176 +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "" + +#: ../extensions/cookie-manager.c:501 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "" + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "" + +#: ../extensions/cookie-manager.c:820 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "" + +#: ../extensions/cookie-manager.c:878 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "" -#: ../extensions/mouse-gestures/main.c:177 +#: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "" - -#: ../extensions/statusbar-features.c:40 -msgid "Images" -msgstr "" - -#: ../extensions/statusbar-features.c:47 -msgid "Scripts" -msgstr "" From 1ba454b80596c3790b23e9b6a3ea96f529bd499b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 16:50:05 +0200 Subject: [PATCH 1015/2970] Update German translation --- po/de.po | 940 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 530 insertions(+), 410 deletions(-) diff --git a/po/de.po b/po/de.po index 8311ed93..6daa9d24 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-04 23:44+0200\n" -"PO-Revision-Date: 2009-02-01 19:56+0100\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-19 15:34+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1278 ../midori/main.c:1367 -#: ../midori/main.c:1375 ../midori/main.c:1386 -#: ../midori/midori-websettings.c:269 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 +#: ../midori/main.c:1396 ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -31,79 +31,79 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:93 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:155 ../midori/main.c:225 +#: ../midori/main.c:156 ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:326 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:358 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:412 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:459 ../midori/main.c:493 ../midori/main.c:509 +#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:688 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:716 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:745 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:764 ../midori/main.c:792 ../midori/main.c:821 +#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:844 ../midori/main.c:867 +#: ../midori/main.c:850 ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:938 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1065 +#: ../midori/main.c:1073 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -111,84 +111,104 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1080 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1084 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1089 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1278 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1301 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1324 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "ADRESSE als Internetanwendung starten" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "ADRESSE" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "ORDNER als Konfigurationsordner benutzen" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "ORDNER" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1326 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1328 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1364 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1387 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1389 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1416 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1466 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1478 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1493 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1506 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1519 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1531 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1547 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "_Ignorieren" @@ -200,1013 +220,1092 @@ msgstr "Datei nicht gefunden." msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:336 ../midori/sokoke.c:614 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3280 -#: ../midori/midori-browser.c:3286 +#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3283 +#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:856 +#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:870 +#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:758 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1537 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2841 ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:2848 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2851 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 +#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Private Daten löschen" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Private Daten löschen" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Folgende Daten löschen:" + +#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Verlauf" + +#: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Benutzerprofile/ Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "«Flash» Cookies" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Symbole von Internetseiten" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3238 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3246 ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3266 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3289 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3296 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3298 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:3301 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-browser.c:3304 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-browser.c:3307 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:3310 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3313 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:3316 ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:3319 ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3327 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3329 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3332 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3335 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3343 ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3348 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Einen neuen Ordner hinzufügen" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Einen neuen Lesezeichenordner hinzufügen" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3351 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Private Daten löschen" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Private Daten löschen..." + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3357 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3360 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3367 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3387 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3388 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3391 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3392 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3395 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3396 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3400 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3403 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3840 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3849 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3873 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:3909 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:3922 ../midori/sokoke.c:769 +#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:3924 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:3939 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4106 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4131 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4136 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4141 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4149 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4159 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4465 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:227 ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Gewählte Leiste vom Fenster ablösen" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Die gewählte Seitenleiste vom Fenster ablösen" + +#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-panel.c:239 ../midori/midori-panel.c:240 +#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1915 +#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Suchmaschinen in Vervollständigung" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Nachrichtenaggregator" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "Ein externer Nachrichtenaggregator" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Mit Übertragungs_manager herunterladen" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Suchen _mit" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:1251 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: «%s»" -#: ../midori/midori-view.c:1227 +#: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1231 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1627 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1772 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1788 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1234,232 +1333,236 @@ msgid "Transfers" msgstr "Übertragungen" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:51 +#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "Einzelne Bilder automatisch angemessen verkleinern" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:58 +#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:65 +#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "Eingebettete Zusatzmodule einschalten" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "Erzwinge 96 Punkte pro Zoll" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "Erzwinge eine Punktdichte von 96 DPI" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 msgid "days" msgstr "Tage" -#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 -msgid "History" -msgstr "Verlauf" - -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Leer" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Suchmaschine hinzufügen" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Suchmaschine bearbeiten" -#: ../midori/midori-searchaction.c:840 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Name:" -#: ../midori/midori-searchaction.c:884 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "_Symbol:" -#: ../midori/midori-searchaction.c:898 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Kürzel:" -#: ../midori/midori-searchaction.c:1078 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Suchmaschinen verwalten" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Als _Standard" + +#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:437 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:768 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:770 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:772 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "Zusatz_module" + +#: ../midori/sokoke.c:792 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "Neues _Fenster" @@ -1471,39 +1574,35 @@ msgstr "Benutzerskripte" msgid "Userstyles" msgstr "Benutzerstile" -#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Einschalten" -#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "_Einschalten" -#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Auschalten" -#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "_Auschalten" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "Einen neuen Ordner hinzufügen" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "Trennlinie" @@ -1515,41 +1614,41 @@ msgstr "Konsole" msgid "Extensions" msgstr "Erweiterungen" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:605 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "Gestern" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 +#: ../panels/midori-plugins.c:87 msgid "Plugins" msgstr "Zusatzmodule" @@ -1592,16 +1691,16 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -1617,80 +1716,103 @@ msgstr "Farbige Reiter" msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" -#: ../extensions/cookie-manager.c:175 +#: ../extensions/cookie-manager.c:201 msgid "At the end of the session" msgstr "Am Ende der Sitzung" -#: ../extensions/cookie-manager.c:178 +#: ../extensions/cookie-manager.c:204 #, c-format msgid "" -"Host: %s\n" -"Name: %s\n" -"Value: %s\n" -"Path: %s\n" -"Secure: %s\n" -"Expires: %s" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" msgstr "" -"Domäne: %s\n" -"Name: %s\n" +"Domäne: %s\n" +"Name: %s\n" "Wert: %s\n" "Pfad: %s\n" "Sicher: %s\n" "Verfällt: %s" -#: ../extensions/cookie-manager.c:183 +#: ../extensions/cookie-manager.c:210 msgid "Yes" msgstr "Ja" -#: ../extensions/cookie-manager.c:183 +#: ../extensions/cookie-manager.c:210 msgid "No" msgstr "Nein" -#: ../extensions/cookie-manager.c:463 +#: ../extensions/cookie-manager.c:491 msgid "Do you really want to delete all cookies?" msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" -#: ../extensions/cookie-manager.c:465 +#: ../extensions/cookie-manager.c:493 msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager.c:615 +#: ../extensions/cookie-manager.c:501 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "" +"Nur die sichtbaren Profildateien, die auf den eigegebenen Filter passen, " +"werden gelöscht." + +#: ../extensions/cookie-manager.c:679 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager.c:675 +#: ../extensions/cookie-manager.c:739 msgid "_Expand All" -msgstr "" +msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager.c:683 +#: ../extensions/cookie-manager.c:747 msgid "_Collapse All" -msgstr "" +msgstr "Alle _einklappen" -#: ../extensions/cookie-manager.c:752 +#: ../extensions/cookie-manager.c:818 msgid "Delete All" msgstr "Alle löschen" -#: ../extensions/cookie-manager.c:766 +#: ../extensions/cookie-manager.c:820 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " +"Einträge gelöscht, die auf den Filter passen" + +#: ../extensions/cookie-manager.c:835 msgid "Expand All" -msgstr "" +msgstr "Alle ausklappen" -#: ../extensions/cookie-manager.c:773 +#: ../extensions/cookie-manager.c:842 msgid "Collapse All" -msgstr "" +msgstr "Alle einklappen" -#: ../extensions/cookie-manager.c:803 +#: ../extensions/cookie-manager.c:873 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager.c:840 ../extensions/cookie-manager.c:884 +#: ../extensions/cookie-manager.c:878 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " +"Domöne auf den eingegebenen Filter passt." + +#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 msgid "Cookie Manager" msgstr "Cookieverwaltung" -#: ../extensions/cookie-manager.c:868 +#: ../extensions/cookie-manager.c:945 msgid "_Cookie Manager" msgstr "_Cookieverwaltung" -#: ../extensions/cookie-manager.c:885 +#: ../extensions/cookie-manager.c:962 msgid "List, view and delete cookies" msgstr "Profildateien auflisten, anzeigen und löschen" @@ -1703,21 +1825,19 @@ msgid "Control Midori by moving the mouse" msgstr "Steuere Midori durch Bewegen der Maus" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:127 ../extensions/page-holder.c:172 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Seitenhalter" -#: ../extensions/page-holder.c:156 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "_Seitenhalter" -#: ../extensions/statusbar-features.c:49 -msgid "Images" -msgstr "Bilder" +#~ msgid "Images" +#~ msgstr "Bilder" -#: ../extensions/statusbar-features.c:56 -msgid "Scripts" -msgstr "Skripte" +#~ msgid "Scripts" +#~ msgstr "Skripte" #~ msgid "%s has no property '%s'" #~ msgstr "%s hat keine Eigenschaft »%s«" From 0ecb074ea74b2c0657ed0f4dfa48cd40915c541a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 16:50:27 +0200 Subject: [PATCH 1016/2970] Update French translation --- po/fr.po | 951 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 534 insertions(+), 417 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3e2a64be..c63f079c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # French translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Christian Dywan 2008 +# Christian Dywan 2008-2009 # Adrien Nader 2008 # Robert-André Mauchin 2008 # Pascal Gervais 2009 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-04 23:44+0200\n" -"PO-Revision-Date: 2009-03-24 08:46-0400\n" -"Last-Translator: Pascal Gervais 2009\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-19 16:05+0100\n" +"Last-Translator: Christian Dywan \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -23,9 +23,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1278 ../midori/main.c:1367 -#: ../midori/main.c:1375 ../midori/main.c:1386 -#: ../midori/midori-websettings.c:269 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 +#: ../midori/main.c:1396 ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -33,80 +33,80 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur internet" -#: ../midori/main.c:93 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:148 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:155 ../midori/main.c:225 +#: ../midori/main.c:156 ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:326 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:358 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:412 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer de l'historique l'élément : %s\n" -#: ../midori/main.c:436 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:459 ../midori/main.c:493 ../midori/main.c:509 +#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:688 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer de l'historique les anciens éléments : %s\n" -#: ../midori/main.c:716 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:745 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:764 ../midori/main.c:792 ../midori/main.c:821 +#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:844 ../midori/main.c:867 +#: ../midori/main.c:850 ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:938 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1065 +#: ../midori/main.c:1073 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -115,86 +115,106 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1080 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1084 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1089 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1278 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1301 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1324 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Exécuter l'adresse spécifié comme application internet" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "Adresse" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Utiliser DOSSIER comme dossier de configuration" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "DOSSIER" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "Exécuter le fichier spécifié en tant que javascript" -#: ../midori/main.c:1326 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1328 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1364 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1387 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1389 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1416 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "Le dossier de configuration specifié n'est pas valide." + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1466 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" -#: ../midori/main.c:1478 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés : %s\n" -#: ../midori/main.c:1493 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1506 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1519 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargé : %s\n" -#: ../midori/main.c:1531 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1547 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "_Ignorer" @@ -206,95 +226,124 @@ msgstr "Fichier non trouvé." msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:336 ../midori/sokoke.c:614 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:278 ../midori/midori-browser.c:3280 -#: ../midori/midori-browser.c:3286 +#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:289 ../midori/midori-browser.c:3283 +#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:598 ../midori/midori-searchaction.c:856 +#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:617 ../midori/midori-searchaction.c:870 +#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:641 ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:758 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1537 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2841 ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:806 +#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2848 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:812 +#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2851 ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:814 +#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3005 +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Effacer informations privées" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Effacer informations privées" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Effacer les informations suivantes :" + +#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historique" + +#: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Fichiers témoins/ Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "Cookies « Flash »" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Icônes de pages internet" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "Un navigateur internet léger." -#: ../midori/midori-browser.c:3013 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -302,926 +351,979 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3235 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3238 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3246 ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3266 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3289 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3296 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3298 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3301 ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3304 ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3307 ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3310 ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3313 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3316 ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3319 ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:3327 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3329 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3332 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:3335 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3343 ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3348 ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Ajouter un nouveau répertoire" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Ajouter un nouveau dossier signet" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3351 ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Effacer les informations privées" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Effacer les informations privées..." + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3357 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3360 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:3367 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "_Rapporter une anomalie" -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "Ouvrir le gestionnaire d'anomalies de Midori" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "Afficher des informations concernant le programme" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3387 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3388 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3391 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3392 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3395 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3396 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "Barre de _signets" -#: ../midori/midori-browser.c:3400 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3403 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "Barre de _transferts" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3840 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3849 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:3873 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "Recherche _internet..." -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "Lancer une recherche sur l'internet" -#: ../midori/midori-browser.c:3894 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:3907 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:3909 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "Rouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:3922 ../midori/sokoke.c:769 +#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:3924 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:3939 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4106 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4131 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4136 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4141 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4149 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Résultats analogues en surbrillance" -#: ../midori/midori-browser.c:4159 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4465 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:227 ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Détacher le panneau choisi du fenêtre" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Indique s'il faut détacher le panneau latéral choisi du fenêtre" + +#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:229 ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:239 ../midori/midori-panel.c:240 +#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:179 ../midori/midori-view.c:1915 +#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:180 ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" -msgstr "Tous les témoins" +msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:254 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "Dernière recherche sur la toile" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "La dernière recherche sur la toile enregistrée" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "Indique s'il faut afficher la barre de transferts" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "Progression dans le champ d'adresse" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans le champ d'adresse" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Recherche dans complètement d'adresse" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "" +"Indique s'il faut afficher les moteurs de recherche dans le complètement " +"d'adresse" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "Afficher le dialogue de fermeture inattendue" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Afficher un dialogue en cas de fermeture inattendue de Midori" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Agrégateur de flux" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "Un agrégateur de flux externe" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "Encodage des caractères favori" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Clic du milieu ouvre la sélection" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "" "Charger l'addresse sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "" "Indique s'il faut ouvrir les fenêtres surgissantes (popup) dans des onglets" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "Chercher en ligne en tapant" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "Indique s'il faut chercher automatiquement en ligne en tapant" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "Accepter les cookies" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" -msgstr "Type de témoins à accepter" +msgstr "Type de fichiers témoins à accepter" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "Uniquement les cookies d'origine" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" -msgstr "Accepter les témoins du site d'origine uniquement" +msgstr "Accepter les fichiers témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "Âge maximal des cookies" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" -msgstr "Le nombre maximal de jours durant lesquels conserver les témoins" +msgstr "" +"Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "Détecter le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages de la toile" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Taille du cache" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:1016 ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Télécharger avec _gestionnaire de téléchargements" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Chercher _avec" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "_Chercher sur l'internet" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:1251 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:1227 +#: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1231 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1627 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1772 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1788 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" @@ -1249,232 +1351,236 @@ msgid "Transfers" msgstr "Transferts" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "La taille par défaut de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Taille minimum de la police" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "La taille minimum de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "Encodage des caractères par défaut" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:51 +#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Charger les images" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Réduire les images" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "Réduire automatiquement les images pour les adapter à la fenêtre" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimensionnées" -#: ../midori/midori-preferences.c:514 ../extensions/statusbar-features.c:58 +#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:518 ../extensions/statusbar-features.c:65 +#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Activer les greffons" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "Active la prise en charge interne des greffons" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "Navigation" #. Page "Network" -#: ../midori/midori-preferences.c:579 ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../midori/midori-preferences.c:626 ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 msgid "days" msgstr "jours" -#: ../midori/midori-preferences.c:629 ../panels/midori-history.c:104 -msgid "History" -msgstr "Historique" - -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Vide" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Ajouter un moteur de recherche" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Modifier le moteur de recherche" -#: ../midori/midori-searchaction.c:840 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Nom :" -#: ../midori/midori-searchaction.c:884 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "_Icône :" -#: ../midori/midori-searchaction.c:898 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Jeton :" -#: ../midori/midori-searchaction.c:1078 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Gestion des moteurs de recherche" -#: ../midori/sokoke.c:109 ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Comme dé_faut" + +#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:437 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous utilisez Midori avec un compte superutilisateur !" -#: ../midori/sokoke.c:768 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:770 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:772 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "G_reffons" + +#: ../midori/sokoke.c:792 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "Nouvelle _fenêtre" @@ -1486,39 +1592,35 @@ msgstr "Scripts utilisateur" msgid "Userstyles" msgstr "Styles utilisateur" -#: ../panels/midori-addons.c:922 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activer" -#: ../panels/midori-addons.c:923 ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "Activer" -#: ../panels/midori-addons.c:932 ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Désactiver" -#: ../panels/midori-addons.c:933 ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "Désactiver" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "Ajouter un nouveau répertoire" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "Séparateur" @@ -1530,41 +1632,41 @@ msgstr "Console" msgid "Extensions" msgstr "Extensions" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'élément sélectionné de l'historique" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "Supprimer l'élément sélectionné de l'historique" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "Vider l'historique entier" -#: ../panels/midori-history.c:599 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "Il y a une semaine" -#: ../panels/midori-history.c:605 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "Il y a %d jours" -#: ../panels/midori-history.c:612 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/midori-history.c:614 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "Hier" -#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:63 +#: ../panels/midori-plugins.c:87 msgid "Plugins" msgstr "Greffons" @@ -1607,16 +1709,16 @@ msgstr "L'icône prédéfinie « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Choisissez un répertoire" @@ -1632,81 +1734,98 @@ msgstr "Onglets colorés" msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" -#: ../extensions/cookie-manager.c:175 +#: ../extensions/cookie-manager.c:201 msgid "At the end of the session" msgstr "Au fin de la session" -#: ../extensions/cookie-manager.c:178 +#: ../extensions/cookie-manager.c:204 #, c-format msgid "" -"Host: %s\n" -"Name: %s\n" -"Value: %s\n" -"Path: %s\n" -"Secure: %s\n" -"Expires: %s" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" msgstr "" -"Hôte : %s\n" -"Nom : %s\n" +"Hôte : %s\n" +"Nom : %s\n" "Valeur : %s\n" "Chemin : %s\n" "Sécuritaire : %s\n" "Expire : %s" -#: ../extensions/cookie-manager.c:183 +#: ../extensions/cookie-manager.c:210 msgid "Yes" msgstr "Oui" -#: ../extensions/cookie-manager.c:183 +#: ../extensions/cookie-manager.c:210 msgid "No" msgstr "Non" -#: ../extensions/cookie-manager.c:463 +#: ../extensions/cookie-manager.c:491 msgid "Do you really want to delete all cookies?" -msgstr "Ètes-vous certain de vouloir effacer tout les témoins ?" +msgstr "Ètes-vous certain de vouloir effacer tout les fichiers témoins ?" -#: ../extensions/cookie-manager.c:465 +#: ../extensions/cookie-manager.c:493 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager.c:615 +#: ../extensions/cookie-manager.c:501 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "" + +#: ../extensions/cookie-manager.c:679 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager.c:675 +#: ../extensions/cookie-manager.c:739 msgid "_Expand All" -msgstr "" +msgstr "_Afficher tous" -#: ../extensions/cookie-manager.c:683 +#: ../extensions/cookie-manager.c:747 msgid "_Collapse All" -msgstr "" +msgstr "_Masquer tous" -#: ../extensions/cookie-manager.c:752 +#: ../extensions/cookie-manager.c:818 msgid "Delete All" msgstr "Supprimer tous" -#: ../extensions/cookie-manager.c:766 -msgid "Expand All" +#: ../extensions/cookie-manager.c:820 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." msgstr "" -#: ../extensions/cookie-manager.c:773 +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Afficher tous" + +#: ../extensions/cookie-manager.c:842 msgid "Collapse All" -msgstr "" +msgstr "Masquer tous" # manque un raccourcis Alt+X -#: ../extensions/cookie-manager.c:803 +#: ../extensions/cookie-manager.c:873 msgid "Filter:" msgstr "Filtre :" -#: ../extensions/cookie-manager.c:840 ../extensions/cookie-manager.c:884 +#: ../extensions/cookie-manager.c:878 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" + +#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 msgid "Cookie Manager" msgstr "Gestionnaire de cookies" -#: ../extensions/cookie-manager.c:868 +#: ../extensions/cookie-manager.c:945 msgid "_Cookie Manager" msgstr "Gestionnaire de _cookies" -#: ../extensions/cookie-manager.c:885 +#: ../extensions/cookie-manager.c:962 msgid "List, view and delete cookies" msgstr "Lister, afficher et supprimer les témoins" @@ -1719,21 +1838,19 @@ msgid "Control Midori by moving the mouse" msgstr "Contrôler Midori par des mouvements de la souris" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:127 ../extensions/page-holder.c:172 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Cadre de pages" -#: ../extensions/page-holder.c:156 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "C_adre de pages" -#: ../extensions/statusbar-features.c:49 -msgid "Images" -msgstr "Images" +#~ msgid "Images" +#~ msgstr "Images" -#: ../extensions/statusbar-features.c:56 -msgid "Scripts" -msgstr "Scripts" +#~ msgid "Scripts" +#~ msgstr "Scripts" #~ msgid "%s has no property '%s'" #~ msgstr "%s n'a pas de propriété « %s »" From 19c57b4da78e318fe8299efef30090731087c999 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 17:03:55 +0200 Subject: [PATCH 1017/2970] Make sure to create 'data' folder if NLS is disabled --- wscript | 1 + 1 file changed, 1 insertion(+) diff --git a/wscript b/wscript index 6f85c11d..66bb202a 100644 --- a/wscript +++ b/wscript @@ -310,6 +310,7 @@ def build (bld): bld.install_files (appdir, 'data/' + APPNAME + '.desktop') else: folder = os.path.dirname (bld.env['waf_config_files'][0]) + '/data' + Utils.check_dir (folder) desktop = APPNAME + '.desktop' pre = open ('data/' + desktop + '.in') after = open (folder + '/' + desktop, 'w') From 7ae35d62ab74b48c5d35fb8c4201ce45d509a761 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 19:05:05 +0200 Subject: [PATCH 1018/2970] Show a 'Delete all' button in the transferbar as needed The button shows up as a new download starts and vanishes again if no downloads are there. --- midori/midori-browser.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1c521121..32fd16ec 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -66,6 +66,7 @@ struct _MidoriBrowser GtkWidget* statusbar; GtkWidget* transferbar; + GtkWidget* transferbar_clear; GtkWidget* progressbar; gchar* statusbar_text; @@ -903,11 +904,16 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, gtk_button_set_image (GTK_BUTTON (button), icon); if (g_object_get_data (G_OBJECT (download), "open-download")) gtk_button_clicked (GTK_BUTTON (button)); + else + g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), + "done", (void*)1); break; case WEBKIT_DOWNLOAD_STATUS_CANCELLED: case WEBKIT_DOWNLOAD_STATUS_ERROR: icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); + g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), + "done", (void*)1); break; default: break; @@ -918,10 +924,17 @@ static void midori_browser_download_button_clicked_cb (GtkWidget* button, WebKitDownload* download) { + MidoriBrowser* browser; + GList* buttons; + + browser = MIDORI_BROWSER (gtk_widget_get_toplevel (button)); + switch (webkit_download_get_status (download)) { case WEBKIT_DOWNLOAD_STATUS_STARTED: webkit_download_cancel (download); + g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), + "done", (void*)1); break; case WEBKIT_DOWNLOAD_STATUS_FINISHED: { @@ -943,6 +956,11 @@ midori_browser_download_button_clicked_cb (GtkWidget* button, default: break; } + + buttons = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); + if (g_list_length (buttons) == 1) + gtk_widget_hide (browser->transferbar_clear); + g_list_free (buttons); } static void @@ -978,6 +996,7 @@ midori_browser_add_download_item (MidoriBrowser* browser, gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_widget_show_all (box); gtk_box_pack_start (GTK_BOX (browser->transferbar), box, FALSE, FALSE, 0); + gtk_widget_show (browser->transferbar_clear); g_signal_connect (download, "notify::progress", G_CALLBACK (midori_browser_download_notify_progress_cb), progress); @@ -1016,6 +1035,26 @@ midori_view_download_requested_cb (GtkWidget* view, } #endif +static void +midori_browser_transferbar_clear_clicked_cb (GtkWidget* button, + MidoriBrowser* browser) +{ + GList* buttons; + guint i; + GtkWidget* item; + + buttons = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); + i = 0; + while ((item = g_list_nth_data (buttons, i++))) + if (g_object_get_data (G_OBJECT (item), "done")) + gtk_widget_destroy (item); + g_list_free (buttons); + buttons = gtk_container_get_children (GTK_CONTAINER (browser->transferbar)); + if (g_list_length (buttons) == 1) + gtk_widget_hide (browser->transferbar_clear); + g_list_free (buttons); +} + static void midori_view_search_text_cb (GtkWidget* view, gboolean found, @@ -3885,6 +3924,7 @@ midori_browser_init (MidoriBrowser* browser) GtkToolItem* toolitem; GtkRcStyle* rcstyle; GtkWidget* scrolled; + GtkWidget* icon; browser->net = katze_net_new (); @@ -4290,6 +4330,13 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->transferbar, FALSE, FALSE, 3); gtk_widget_show (browser->transferbar); + browser->transferbar_clear = gtk_button_new_with_label (_("Delete All")); + icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (browser->transferbar_clear), icon); + g_signal_connect (browser->transferbar_clear, "clicked", + G_CALLBACK (midori_browser_transferbar_clear_clicked_cb), browser); + gtk_box_pack_end (GTK_BOX (browser->transferbar), browser->transferbar_clear, + FALSE, FALSE, 0); g_signal_connect (browser->statusbar, "button-press-event", G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); From 5daa4e4519e3edbc7a17283d219d78d8208ecb94 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sun, 19 Apr 2009 19:10:01 +0200 Subject: [PATCH 1019/2970] Update Russian translation --- po/ru.po | 1095 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 602 insertions(+), 493 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6ad7003f..d04623f3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-27 18:50+0800\n" -"PO-Revision-Date: 2009-03-27 19:11+0800\n" +"POT-Creation-Date: 2009-04-19 20:03+0900\n" +"PO-Revision-Date: 2009-04-19 20:46+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1582 -#: ../midori/main.c:1675 -#: ../midori/main.c:1684 -#: ../midori/main.c:1695 -#: ../midori/midori-websettings.c:269 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -33,1218 +33,1315 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:165 -#: ../midori/main.c:235 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "Файл не найден." - -#: ../midori/main.c:485 -#: ../midori/main.c:494 -msgid "Malformed document." -msgstr "Плохо сформированный документ." - -#: ../midori/main.c:516 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:649 -#: ../midori/main.c:683 -#: ../midori/main.c:699 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:936 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:1066 -#: ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "Ошибка записи." - -#: ../midori/main.c:1087 -#: ../midori/main.c:1114 -#: ../midori/main.c:1142 +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 -#: ../midori/main.c:1190 +#: ../midori/main.c:850 +#: ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:1261 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1379 -msgid "" -"Midori seems to have crashed the last time it was opened. If this happened " -"repeatedly, try one of the following options to solve the problem." -msgstr "" -"Возможно, работа Midori была аварийно прекращена. Если это часто " -"повторяется, можно выбрать действие для решения проблемы ниже." +#: ../midori/main.c:1073 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1394 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1398 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1403 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1582 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1605 -#: ../midori/gjs.c:515 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1628 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Запустить АДРЕС как веб-приложение" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "АДРЕС" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Использовать файлы параметров из ПАПКИ" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "ПАПКА" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1630 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1632 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1672 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1696 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1698 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1725 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "Указана некорректная папка файлов параметров." + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1775 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1787 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1802 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1815 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1828 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1840 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1856 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "_Игнорировать" -#: ../midori/midori-browser.c:278 -#: ../midori/midori-browser.c:3274 -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Файл не найден." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Плохо сформированный документ." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Ошибка записи." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:289 -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:598 -#: ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:617 -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:641 -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2837 -#: ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:2844 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2847 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "Открыть в новом _окне" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Удаление личных данных" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Удалить личные данные" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Удалить следующие данные:" + +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:639 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Журнал" + #: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Фрагменты данных" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "Фрагменты данных Flash" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Значки веб-сайтов" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3223 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3226 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3240 -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3255 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3257 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3261 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "_Быстрый поиск" -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3270 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3283 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3286 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3289 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3290 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3292 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:3295 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3389 +#: ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-browser.c:3298 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3392 +#: ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-browser.c:3301 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:3304 -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:3307 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:3310 -#: ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-browser.c:3313 -#: ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3321 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3329 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3332 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3335 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3337 -#: ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3342 -#: ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Создать папку" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Создать папку закладок" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3345 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "Уда_лить личные данные" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Удалить личные данные..." + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3361 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3375 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3376 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3393 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3394 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3397 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3398 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3402 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3833 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:3840 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3842 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3866 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3868 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3887 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:3900 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:3902 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:3915 -#: ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:3917 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:3930 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:3932 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4100 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4125 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:4130 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:4135 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4143 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4153 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4459 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:227 -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Отсоединить выбранную панель от главного окна" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Отсоединить выбранную панель от главного окна" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-panel.c:239 -#: ../midori/midori-panel.c:240 +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:179 -#: ../midori/midori-view.c:1915 +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:180 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:258 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Показывать средства поиска при автодополнении адреса" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "Показывать средства поиска при вводе текста в адресную строку" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Каталог загрузок" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "Каталог, в который будут сохраняться файлы" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:615 +#, fuzzy +msgid "An external news aggregator" +msgstr "Пользовательский текстовый редактор" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Открывать новую страницу в" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "Только оригинальные фрагменты данных" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" msgstr "Принимать фрагменты данных только с оригинального сайта" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения фрагментов данных" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "_Открыть ссылку" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "Открыть ссылку в новом _окне" -#: ../midori/midori-view.c:1016 -#: ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "_Загрузить объект" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "_Сохранить объект" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Загрузить с помощью _менеджера загрузок" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Найти _с помощью" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "_Найти в сети" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "Открыть или загрузить файл" -#: ../midori/midori-view.c:1224 +#: ../midori/midori-view.c:1251 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:1227 +#: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1231 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "Открыть %s" -#: ../midori/midori-view.c:1627 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1772 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1788 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" @@ -1273,259 +1370,242 @@ msgid "Transfers" msgstr "Передачи" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:51 +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "Текстовые поля могут изменять размер" -#: ../midori/midori-preferences.c:514 -#: ../extensions/statusbar-features.c:58 +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-preferences.c:518 -#: ../extensions/statusbar-features.c:65 +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Использовать модули" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "Разрешить встроенные объекты модулей на страницах" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:547 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:548 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:559 msgid "Browsing" msgstr "Навигация" #. Page "Network" -#: ../midori/midori-preferences.c:579 -#: ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:589 +#: ../midori/midori-preferences.c:590 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:617 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:622 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:623 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:626 #: ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:646 msgid "days" msgstr "дней" -#: ../midori/midori-preferences.c:629 -#: ../panels/midori-history.c:104 -msgid "History" -msgstr "Журнал" - -#: ../midori/midori-searchaction.c:455 +#: ../midori/midori-searchaction.c:484 #: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Очистить" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Добавление средства поиска" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Правка средства поиска" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Имя:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "_Значок:" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Признак:" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/sokoke.c:109 -#: ../midori/sokoke.c:121 +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Внимание: используется учётная запись суперпользователя!" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "Д_омашняя страница" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "С_тили пользователя" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:782 -msgid "_Closed Tabs and Windows" -msgstr "Закрытые _вкладки и окна" +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "_Модули" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:792 +msgid "_Closed Tabs and Windows" +msgstr "За_крытые вкладки и окна" + +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "_Новое окно" -#: ../midori/gjs.c:743 -#: ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s не обладает свойством «%s»" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s не может быть назначен для %s.%s" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s недоступен" - #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 msgid "Userscripts" @@ -1536,43 +1616,39 @@ msgstr "Сценарии" msgid "Userstyles" msgstr "Стили пользователя" -#: ../panels/midori-addons.c:922 +#: ../panels/midori-addons.c:927 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Включить" -#: ../panels/midori-addons.c:923 +#: ../panels/midori-addons.c:928 #: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "Включить" -#: ../panels/midori-addons.c:932 +#: ../panels/midori-addons.c:937 #: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Отключить" -#: ../panels/midori-addons.c:933 +#: ../panels/midori-addons.c:938 #: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "Отключить" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "Создать папку" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "Разделитель" @@ -1584,42 +1660,41 @@ msgstr "Консоль" msgid "Extensions" msgstr "Дополнения" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "%d дней назад" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "Вчера" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:63 msgid "Plugins" msgstr "Модули" @@ -1662,18 +1737,18 @@ msgstr "Не удалось загрузить системный значок msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Выберите папку" @@ -1689,71 +1764,93 @@ msgstr "Цветные вкладки" msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" -#: ../extensions/cookie-manager.c:136 +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "В конце сеанса" + +#: ../extensions/cookie-manager.c:204 #, c-format msgid "" -"Host: %s\n" -"Path: %s\n" -"Secure: %s\n" -"Name: %s\n" -"Value: %s" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" msgstr "" -"Узел: %s\n" -"Путь: %s\n" -"Защищённый: %s\n" -"Имя: %s\n" -"Значение: %s" +"Адрес: %s\n" +"Имя: %s\n" +"Значение: %s\n" +"Путь: %s\n" +"Защищённый: %s\n" +"Срок истекает: %s" -#: ../extensions/cookie-manager.c:139 +#: ../extensions/cookie-manager.c:210 msgid "Yes" msgstr "Да" -#: ../extensions/cookie-manager.c:139 +#: ../extensions/cookie-manager.c:210 msgid "No" msgstr "Нет" -#: ../extensions/cookie-manager.c:330 +#: ../extensions/cookie-manager.c:491 msgid "Do you really want to delete all cookies?" msgstr "Удалить все сохранённые фрагменты данных?" -#: ../extensions/cookie-manager.c:332 +#: ../extensions/cookie-manager.c:493 msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager.c:386 +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "Будут удалены только видимые фрагменты, удовлетворяющие условиям фильтра." + +#: ../extensions/cookie-manager.c:679 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager.c:436 +#: ../extensions/cookie-manager.c:739 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager.c:443 +#: ../extensions/cookie-manager.c:747 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager.c:508 +#: ../extensions/cookie-manager.c:818 msgid "Delete All" msgstr "Удалить всё" -#: ../extensions/cookie-manager.c:521 +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены только те фрагменты, которые удовлетворяют его условиям." + +#: ../extensions/cookie-manager.c:835 msgid "Expand All" msgstr "Развернуть всё" -#: ../extensions/cookie-manager.c:527 +#: ../extensions/cookie-manager.c:842 msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager.c:569 -#: ../extensions/cookie-manager.c:613 +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Фильтр:" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" -#: ../extensions/cookie-manager.c:597 +#: ../extensions/cookie-manager.c:945 msgid "_Cookie Manager" -msgstr "_Менеджер фрагментов данных" +msgstr "Менеджер _фрагментов данных" -#: ../extensions/cookie-manager.c:614 +#: ../extensions/cookie-manager.c:962 msgid "List, view and delete cookies" msgstr "Просмотр и удаление фрагментов данных" @@ -1766,23 +1863,37 @@ msgid "Control Midori by moving the mouse" msgstr "Управление Midori с помощью движений мыши" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:127 -#: ../extensions/page-holder.c:172 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Контейнер" -#: ../extensions/page-holder.c:156 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "К_онтейнер" -#: ../extensions/statusbar-features.c:49 -msgid "Images" -msgstr "Изображения" - -#: ../extensions/statusbar-features.c:56 -msgid "Scripts" -msgstr "Сценарии" - +#~ msgid "%s has no property '%s'" +#~ msgstr "%s не обладает свойством «%s»" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s не может быть назначен для %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s недоступен" +#~ msgid "" +#~ "Host: %s\n" +#~ "Path: %s\n" +#~ "Secure: %s\n" +#~ "Name: %s\n" +#~ "Value: %s" +#~ msgstr "" +#~ "Узел: %s\n" +#~ "Путь: %s\n" +#~ "Защищённый: %s\n" +#~ "Имя: %s\n" +#~ "Значение: %s" +#~ msgid "Images" +#~ msgstr "Изображения" +#~ msgid "Scripts" +#~ msgstr "Сценарии" #~ msgid "Source" #~ msgstr "Исходный код" #~ msgid "_Icon (name or file):" @@ -1891,8 +2002,6 @@ msgstr "Сценарии" #~ msgstr "Статус загрузки" #~ msgid "The current loading progress" #~ msgstr "Процесс загрузки" -#~ msgid "Download Link with Download _Manager" -#~ msgstr "Загрузить с помощью администратора загрузок" #~ msgid "Dialog" #~ msgstr "Диалог" #~ msgid "A dialog to manage search engines" From 8f58355014303e06cb320f844b48ef47b9f1136b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 19 Apr 2009 22:15:25 +0200 Subject: [PATCH 1020/2970] Bump version to 0.1.6 --- ChangeLog | 25 +++++++++++++++++++++++++ wscript | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0de3fcfd..8fe7c5d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,30 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.1.6: + + Add Delete All to transferbar + + Show search in context menu + + Implement 'Default' search engine + + Show only icons in Statusbar Features + + Implement Clear private data + + Support News Feed icon and external aggregator + + Fix reloading of Not found pages + + Fixup spaces when middle click opening + + Fix possibly wrong identificaton string + + Optionally search engines in completion + + Optionally Gtk 2.16 entry progress and icon + + Experimental panel detaching + + Support external download manager again + + Implement '-a', '--app' argument + + Implement '-c', '--config' argument + + Fix a bookmark saving issue + + Support data: URIs in the address entry + + Several performance and memory leak fixes + + Load cookies idle to accelerate startup + + Support mailto: links + + Save tab reordering in the session + + Add a Cookie Manager extension + + Fix crashers in Colourful Tabs + v0.1.5: + Add a Colorful Tabs extension + Support downloading with WebKitGTK+ 1.1.3 diff --git a/wscript b/wscript index 66bb202a..f9579b24 100644 --- a/wscript +++ b/wscript @@ -22,7 +22,7 @@ import UnitTest major = 0 minor = 1 -micro = 5 +micro = 6 APPNAME = 'midori' VERSION = str (major) + '.' + str (minor) + '.' + str (micro) From 192084d48e20edfe801401c18f311264f04c9b61 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Apr 2009 00:39:36 +0200 Subject: [PATCH 1021/2970] Unify how search URI and keywords are combined This handles the presence of a %1 and encoding the keywords. --- midori/midori-browser.c | 14 ++----------- midori/midori-locationaction.c | 5 +---- midori/midori-view.c | 5 +---- midori/sokoke.c | 37 ++++++++++++++++++++++++++++------ 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 32fd16ec..1a89ff45 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2587,14 +2587,7 @@ _action_location_submit_uri (GtkAction* action, new_uri = sokoke_magic_uri (uri, browser->search_engines); if (!new_uri) - { - gchar* uri_ = g_uri_escape_string (uri, " :/", TRUE); - if (strstr (browser->location_entry_search, "%s")) - new_uri = g_strdup_printf (browser->location_entry_search, uri_); - else if (!new_uri) - new_uri = g_strconcat (browser->location_entry_search, uri_, NULL); - g_free (uri_); - } + new_uri = sokoke_search_uri (browser->location_entry_search, uri); if (new_tab) { @@ -2648,10 +2641,7 @@ _action_search_submit (GtkAction* action, else /* The location entry search is our fallback */ url = browser->location_entry_search; - if (strstr (url, "%s")) - search = g_strdup_printf (url, keywords); - else - search = g_strconcat (url, " ", keywords, NULL); + search = sokoke_search_uri (url, keywords); if (new_tab) midori_browser_add_uri (browser, search); diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 7d4ae733..54cdaeda 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -750,10 +750,7 @@ midori_location_entry_action_activated_cb (GtkEntryCompletion* completion, gchar* search; if (!item) return; - if (strstr (uri, "%s")) - search = g_strdup_printf (uri, keywords); - else - search = g_strconcat (uri, " ", keywords, NULL); + search = sokoke_search_uri (uri, keywords); midori_location_action_set_uri (location_action, search); g_signal_emit (location_action, signals[SUBMIT_URI], 0, search, FALSE); g_free (search); diff --git a/midori/midori-view.c b/midori/midori-view.c index bb10bfe5..8b1e4d23 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -893,10 +893,7 @@ midori_web_view_menu_search_web_activate_cb (GtkWidget* widget, else g_object_get (view->settings, "location-entry-search", &search, NULL); - if (strstr (search, "%s")) - uri = g_strdup_printf (search, view->selected_text); - else - uri = g_strconcat (search, view->selected_text, NULL); + uri = sokoke_search_uri (search, view->selected_text); g_free (search); g_signal_emit (view, signals[NEW_TAB], 0, uri, diff --git a/midori/sokoke.c b/midori/sokoke.c index adda6469..914d99dc 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -213,6 +213,36 @@ sokoke_idn_to_punycode (gchar* uri) #endif } +/** + * sokoke_search_uri: + * @uri: a search URI with or without %s + * @keywords: keywords + * + * Takes a search engine URI and inserts the specified + * keywords. The @keywords are percent encoded. If the + * search URI contains a %s they keywords are inserted + * in that place, otherwise appended to the URI. + * + * Return value: a newly allocated search URI + **/ +gchar* sokoke_search_uri (const gchar* uri, + const gchar* keywords) +{ + gchar* escaped; + gchar* search; + + g_return_val_if_fail (uri != NULL, NULL); + g_return_val_if_fail (keywords != NULL, NULL); + + escaped = g_uri_escape_string (keywords, " :/", TRUE); + if (strstr (uri, "%s")) + search = g_strdup_printf (uri, escaped); + else + search = g_strconcat (uri, escaped, NULL); + g_free (escaped); + return search; +} + gchar* sokoke_magic_uri (const gchar* uri, KatzeArray* search_engines) @@ -279,13 +309,8 @@ sokoke_magic_uri (const gchar* uri, if (parts[0] && parts[1]) if ((item = katze_array_find_token (search_engines, parts[0]))) { - gchar* uri_ = g_uri_escape_string (parts[1], " :/", TRUE); search_uri = katze_item_get_uri (item); - if (strstr (search_uri, "%s")) - search = g_strdup_printf (search_uri, uri_); - else - search = g_strconcat (search_uri, uri_, NULL); - g_free (uri_); + search = sokoke_search_uri (search_uri, parts[1]); } g_strfreev (parts); return search; From 574fccf445c6afc024da6c8e7148d14af2db01de Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Apr 2009 18:35:16 +0200 Subject: [PATCH 1022/2970] Add sokoke_search_uri to sokoke.h --- midori/sokoke.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/sokoke.h b/midori/sokoke.h index 0360ab1f..0c9312ce 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -30,6 +30,9 @@ gboolean sokoke_spawn_program (const gchar* command, const gchar* argument); +gchar* sokoke_search_uri (const gchar* uri, + const gchar* keywords); + gchar* sokoke_magic_uri (const gchar* uri, KatzeArray* search_engines); From ca8d1813292bdbc1c00f5233497e2c18f2fb74e4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Apr 2009 19:10:13 +0200 Subject: [PATCH 1023/2970] Unify opening URIs externally with good fallbacks --- midori/midori-browser.c | 30 ++++++---------------------- midori/midori-view.c | 8 +------- midori/sokoke.c | 42 +++++++++++++++++++++++++++++++++++++++ midori/sokoke.h | 6 ++++++ panels/midori-transfers.c | 8 +------- 5 files changed, 56 insertions(+), 38 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1a89ff45..02f5a3ed 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -939,15 +939,8 @@ midori_browser_download_button_clicked_cb (GtkWidget* button, case WEBKIT_DOWNLOAD_STATUS_FINISHED: { const gchar* uri = webkit_download_get_destination_uri (download); - gboolean success = gtk_show_uri (gtk_widget_get_screen (button), - uri, gtk_get_current_event_time (), NULL); - if (!success) - { - gchar* command = g_strconcat ("exo-open ", uri, NULL); - success = g_spawn_command_line_async (command, NULL); - g_free (command); - } - if (success) + if (sokoke_show_uri (gtk_widget_get_screen (button), + uri, gtk_get_current_event_time (), NULL)) gtk_widget_destroy (gtk_widget_get_parent (button)); break; } @@ -2402,8 +2395,6 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, { if ((fp = fdopen (fd, "w"))) { - gboolean success; - ret = fwrite (request->data, 1, request->length, fp); fclose (fp); if ((ret - request->length) != 0) @@ -2415,13 +2406,10 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, g_object_get (browser->settings, "text-editor", &text_editor, NULL); if (text_editor && *text_editor) - success = sokoke_spawn_program (text_editor, unique_filename); + sokoke_spawn_program (text_editor, unique_filename); else - { - gchar* command = g_strconcat ("exo-open ", unique_filename, NULL); - success = g_spawn_command_line_async (command, NULL); - g_free (command); - } + sokoke_show_uri (NULL, unique_filename, + gtk_get_current_event_time (), NULL); g_free (unique_filename); g_free (text_editor); @@ -3100,13 +3088,7 @@ _action_about_activate_email (GtkAboutDialog* about, const gchar* uri, gpointer user_data) { - if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL)) - { - /* Fallback to Exo for example if GConf isn't setup */ - gchar* command = g_strconcat ("exo-open ", uri, NULL); - g_spawn_command_line_async (command, NULL); - g_free (command); - } + sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index 8b1e4d23..0c4d203b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1847,13 +1847,7 @@ midori_view_set_uri (MidoriView* view, } else if (g_str_has_prefix (uri, "mailto:")) { - if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL)) - { - /* Fallback to Exo for example if GConf isn't setup */ - gchar* command = g_strconcat ("exo-open ", uri, NULL); - g_spawn_command_line_async (command, NULL); - g_free (command); - } + sokoke_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); } else { diff --git a/midori/sokoke.c b/midori/sokoke.c index 914d99dc..0cc7bf43 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -93,6 +93,48 @@ error_dialog (const gchar* short_message, } +/** + * sokoke_show_uri: + * @screen: a #GdkScreen, or %NULL + * @uri: the URI to show + * @timestamp: the timestamp of the event + * @error: the location of a #GError, or %NULL + * + * Shows the specified URI with an appropriate application. This + * supports xdg-open, exo-open and gnome-open as fallbacks if + * GIO doesn't do the trick. + * + * Return value: %TRUE on success, %FALSE if an error occurred + **/ +gboolean +sokoke_show_uri (GdkScreen* screen, + const gchar* uri, + guint32 timestamp, + GError** error) +{ + const gchar* fallbacks [] = { "xdg-open", "exo-open", "gnome-open" }; + gsize i; + + g_return_val_if_fail (GDK_IS_SCREEN (screen) || !screen, FALSE); + g_return_val_if_fail (uri != NULL, FALSE); + g_return_val_if_fail (!error || !*error, FALSE); + + if (gtk_show_uri (screen, uri, timestamp, error)) + return TRUE; + + for (i = 0; i < G_N_ELEMENTS (fallbacks); i++) + { + gchar* command = g_strconcat (fallbacks[i], " ", uri, NULL); + gboolean result = g_spawn_command_line_async (command, error); + g_free (command); + if (result) + return TRUE; + *error = NULL; + } + + return FALSE; +} + gboolean sokoke_spawn_program (const gchar* command, const gchar* argument) diff --git a/midori/sokoke.h b/midori/sokoke.h index 0c9312ce..5a685e02 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -26,6 +26,12 @@ sokoke_js_script_eval (JSContextRef js_context, /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON +gboolean +sokoke_show_uri (GdkScreen* screen, + const gchar* uri, + guint32 timestamp, + GError** error); + gboolean sokoke_spawn_program (const gchar* command, const gchar* argument); diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index 43434a05..d81a6beb 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -329,14 +329,8 @@ midori_transfers_treeview_row_activated_cb (GtkTreeView* treeview, gboolean success; uri = webkit_download_get_destination_uri (download); - success = gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET ( + sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET ( treeview)), uri, gtk_get_current_event_time (), NULL); - if (!success) - { - gchar* command = g_strconcat ("exo-open ", uri, NULL); - success = g_spawn_command_line_async (command, NULL); - g_free (command); - } break; } case WEBKIT_DOWNLOAD_STATUS_CANCELLED: From 3fc285222a67a53884723963eb7f37dd74e8ff4f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 20 Apr 2009 21:35:33 +0200 Subject: [PATCH 1024/2970] Add an attempt at unit testing history --- tests/history.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 tests/history.c diff --git a/tests/history.c b/tests/history.c new file mode 100644 index 00000000..edf4b257 --- /dev/null +++ b/tests/history.c @@ -0,0 +1,221 @@ +/* + Copyright (C) 2009 Christian Dywan + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#if HAVE_CONFIG_H + #include +#endif + +#include "midori.h" +#include "midori-history.h" +#include "sokoke.h" + +static void +history_panel_create (void) +{ + MidoriApp* app; + MidoriHistory* history; + gpointer value; + + app = g_object_new (MIDORI_TYPE_APP, NULL); + + history = g_object_new (MIDORI_TYPE_HISTORY, NULL); + value = katze_object_get_object (history, "app"); + g_assert (value == NULL); + gtk_widget_destroy (GTK_WIDGET (history)); + + history = g_object_new (MIDORI_TYPE_HISTORY, "app", app, NULL); + value = katze_object_get_object (history, "app"); + g_assert (value == app); + gtk_widget_destroy (GTK_WIDGET (history)); + + history = g_object_new (MIDORI_TYPE_HISTORY, NULL); + g_object_set (history, "app", app, NULL); + value = katze_object_get_object (history, "app"); + g_assert (value == app); + gtk_widget_destroy (GTK_WIDGET (history)); +} + +static KatzeItem* +bookmark_new (const gchar* uri, + const gchar* title) +{ + return g_object_new (KATZE_TYPE_ITEM, "uri", uri, "name", title, NULL); +} + +static KatzeArray* +folder_new (const gchar* title) +{ + KatzeArray* folder; + + folder = katze_array_new (KATZE_TYPE_ARRAY); + g_object_set (folder, "name", title, NULL); + return folder; +} + +static void +history_panel_fill (void) +{ + MidoriApp* app; + KatzeArray* array; + MidoriHistory* history; + GList* children; + GtkWidget* treeview; + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* bookmark; + KatzeArray* folder; + guint n; + gpointer value; + + app = g_object_new (MIDORI_TYPE_APP, NULL); + array = katze_array_new (KATZE_TYPE_ARRAY); + g_object_set (app, "history", array, NULL); + value = katze_object_get_object (app, "history"); + g_assert (value == array); + history = g_object_new (MIDORI_TYPE_HISTORY, "app", app, NULL); + children = gtk_container_get_children (GTK_CONTAINER (history)); + treeview = g_list_nth_data (children, 0); + g_list_free (children); + g_assert (GTK_IS_TREE_VIEW (treeview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); + g_assert (GTK_IS_TREE_MODEL (model)); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); + bookmark = bookmark_new ("http://www.example.com", "Example"); + katze_array_add_item (array, bookmark); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 1); + katze_array_remove_item (array, bookmark); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); + bookmark = bookmark_new ("http://www.example.com", "Example"); + katze_array_add_item (array, bookmark); + folder = folder_new ("Empty"); + katze_array_add_item (array, folder); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 2); + katze_array_remove_item (array, folder); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 1); + folder = folder_new ("Empty"); + katze_array_add_item (array, folder); + folder = folder_new ("Kurioses"); + katze_array_add_item (array, folder); + bookmark = bookmark_new ("http://www.ende.de", "Das Ende"); + katze_array_add_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 3); + folder = folder_new ("Miscellaneous"); + katze_array_add_item (array, folder); + gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 0); + bookmark = bookmark_new ("http://thesaurus.reference.com/", "Thesaurus"); + katze_array_add_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 1); + bookmark = bookmark_new ("http://en.wikipedia.org/", "Wikipedia"); + katze_array_add_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 2); + katze_array_remove_item (folder, bookmark); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 1); + katze_array_remove_item (array, folder); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 3); + katze_array_add_item (array, folder); + /* katze_array_clear (folder); + n = gtk_tree_model_iter_n_children (model, &iter); + g_assert_cmpint (n, ==, 0); */ + katze_array_clear (array); + n = gtk_tree_model_iter_n_children (model, NULL); + g_assert_cmpint (n, ==, 0); +} + +static void +notify_load_status_cb (GtkWidget* view, + GParamSpec* pspec, + guint* done) +{ + MidoriLoadStatus status; + + status = midori_view_get_load_status (MIDORI_VIEW (view)); + if (*done == 2 && status == MIDORI_LOAD_COMMITTED) + *done = 1; + else if (*done == 1 && status == MIDORI_LOAD_FINISHED) + *done = 0; +} + +static void +history_browser_add (void) +{ + MidoriBrowser* browser; + MidoriWebSettings* settings; + KatzeArray* array; + GtkWidget* view; + guint done; + KatzeItem* date; + gsize i; + GtkActionGroup* action_group; + GtkAction* action; + + browser = midori_browser_new (); + settings = midori_web_settings_new (); + array = katze_array_new (KATZE_TYPE_ARRAY); + g_object_set (browser, "settings", settings, "history", array, NULL); + view = midori_view_new (NULL); + midori_browser_add_tab (browser, view); + midori_view_set_uri (MIDORI_VIEW (view), + "data:text/html;charset=utf-8,TestTest"); + g_signal_connect (view, "notify::load-status", + G_CALLBACK (notify_load_status_cb), &done); + done = 2; + while (done) + gtk_main_iteration (); + g_assert_cmpint (katze_array_get_length (array), ==, 1); + date = katze_array_get_nth_item (array, 0); + g_assert_cmpint (katze_array_get_length (KATZE_ARRAY (date)), ==, 1); + i = 0; + gtk_widget_show (view); + midori_browser_set_current_tab (browser, view); + g_assert (midori_browser_get_current_tab (browser) == view); + done = 2; + action_group = midori_browser_get_action_group (browser); + action = gtk_action_group_get_action (action_group, "Location"); + midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), + "data:text/html;charset=utf-8,TestTest"); + g_signal_emit_by_name (action, "submit-uri", + "data:text/html;charset=utf-8,TestTest", FALSE); + while (done) + gtk_main_iteration (); + g_assert_cmpint (katze_array_get_length (array), ==, 1); + date = katze_array_get_nth_item (array, 0); + g_assert_cmpint (katze_array_get_length (KATZE_ARRAY (date)), ==, 1); + i = 0; +} + +int +main (int argc, + char** argv) +{ + /* libSoup uses threads, so we need to initialize threads. */ + if (!g_thread_supported ()) g_thread_init (NULL); + g_test_init (&argc, &argv, NULL); + gtk_init_check (&argc, &argv); + sokoke_register_stock_items (); + + g_test_add_func ("/history/panel/create", history_panel_create); + g_test_add_func ("/history/panel/fill", history_panel_fill); + g_test_add_func ("/history/browser/add", history_browser_add); + + return g_test_run (); +} From 7d1717911e9f8e3961fb53428ce691c6ed0646d1 Mon Sep 17 00:00:00 2001 From: Stanley Zhang Date: Mon, 20 Apr 2009 21:40:25 +0200 Subject: [PATCH 1025/2970] Update Simplified Chinese translation --- po/zh_CN.po | 1153 +++++++++++++++++++++++++++++---------------------- 1 file changed, 667 insertions(+), 486 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index fb6c85af..9f0ad5ea 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.5\n" +"Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-22 22:19+0100\n" -"PO-Revision-Date: 2009-03-25 15:33+0800\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-20 09:54+0800\n" "Last-Translator: Stanley Zhang \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "轻量的 Web 浏览器" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1580 -#: ../midori/main.c:1672 -#: ../midori/main.c:1681 -#: ../midori/main.c:1692 -#: ../midori/midori-websettings.c:269 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -33,1207 +33,1312 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web 浏览器" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "设置无法加载: %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "值 '%s' 在 '%s' 中无效" -#: ../midori/main.c:165 -#: ../midori/main.c:235 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "无效的设置值 '%s'" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "没有找到文件." - -#: ../midori/main.c:485 -#: ../midori/main.c:494 -msgid "Malformed document." -msgstr "异常的文件." - -#: ../midori/main.c:516 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "打开数据库失败: %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "清空历史失败: %s\n" -#: ../midori/main.c:649 -#: ../midori/main.c:683 -#: ../midori/main.c:699 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "添加历史项失败: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "删除旧的历史项目失败: %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "配置无法保存. %s" -#: ../midori/main.c:936 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "搜索引擎无法保存. %s" -#: ../midori/main.c:1066 -#: ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "写失败." - -#: ../midori/main.c:1087 -#: ../midori/main.c:1114 -#: ../midori/main.c:1142 +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "书签无法保存. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 -#: ../midori/main.c:1190 +#: ../midori/main.c:850 +#: ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "垃圾箱无法保存. %s" -#: ../midori/main.c:1261 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "会话无法保存. %s" -#: ../midori/main.c:1377 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." -msgstr "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现，请尝试以下的选项来解决此问题." +#: ../midori/main.c:1073 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现, 请尝试下面的选项来解决此问题." -#: ../midori/main.c:1392 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "修改首选项(_p)" -#: ../midori/main.c:1396 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "重置最后的会话(_s)" -#: ../midori/main.c:1401 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "关闭所有的扩展(_e)" -#: ../midori/main.c:1580 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1603 -#: ../midori/gjs.c:515 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "发生了一个未知的错误." -#: ../midori/main.c:1626 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "将 ADDRESS 作为 Web 应用程序运行" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "ADDRESS" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "使用 FOLDER 作为设置目录" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "FOLDER" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "将指定的文件当作 Javascript 执行" -#: ../midori/main.c:1628 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1630 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1669 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1693 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1695 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "在此检查新版本:" -#: ../midori/main.c:1722 -msgid "An instance of Midori is already running but not responding.\n" -msgstr "已经有一个 Midori 在运行，但没有响应.\n" +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "无效的配置文件目录. " -#: ../midori/main.c:1772 +#: ../midori/main.c:1489 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "已经有一个 Midori 在运行, 但没有响应.\n" + +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "搜索引擎无法加载. %s\n" -#: ../midori/main.c:1784 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1799 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1812 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "垃圾箱无法加载: %s\n" -#: ../midori/main.c:1825 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "发生以下错误:" -#: ../midori/main.c:1853 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "忽略(_I)" -#: ../midori/midori-browser.c:278 -#: ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "没有找到文件." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "异常的文件." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "写失败." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:289 -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'." -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "标题(_T): " -#: ../midori/midori-browser.c:598 -#: ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:617 -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:641 -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2837 -#: ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:2844 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:2847 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "清除隐私数据" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "清除隐私数据(_C)" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "清除以下的数据:" + +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "历史" + #: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "由 Flash 建立的 Cookies" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "网站图标" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "轻量级的 Web 浏览器." -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "张翼 " -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "新建窗口" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "新建标签页" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "关闭标签页(_C)" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "关闭当前标签页" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "关闭窗口(_l)" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "剪切选中的文本" -#: ../midori/midori-browser.c:3228 -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "复制选中的文本" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "从剪贴板粘帖文本" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "删除选中的文本" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "选取所有文本" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "在页面中查找词或短语" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "查找下一处" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "查找上一处" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "快速查找(_Q)" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "快速跳转到一个词或短语" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "提高放大倍数" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "缩小放大倍数" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "重置放大倍数" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:3283 -#: ../midori/midori-websettings.c:196 -msgid "Chinese (BIG5)" -msgstr "繁体中文 (BIG5)" - -#: ../midori/midori-browser.c:3286 -#: ../midori/midori-websettings.c:197 -msgid "Japanese (SHIFT_JIS)" -msgstr "日语 (SHIFT_JIS)" - -#: ../midori/midori-browser.c:3289 -#: ../midori/midori-websettings.c:198 -msgid "Russian (KOI8-R)" -msgstr "俄语 (KOI8-R)" - -#: ../midori/midori-browser.c:3292 -#: ../midori/midori-websettings.c:199 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-browser.c:3295 +#: ../midori/midori-browser.c:3389 #: ../midori/midori-websettings.c:200 -msgid "Western (ISO-8859-1)" -msgstr "西方 (ISO-8859-1)" +msgid "Chinese(BIG5)" +msgstr "繁体中文(BIG5)" -#: ../midori/midori-browser.c:3298 +#: ../midori/midori-browser.c:3392 #: ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +msgid "Japanese(SHIFT_JIS)" +msgstr "日语(SHIFT_JIS)" + +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 +msgid "Russian(KOI8-R)" +msgstr "俄语(KOI8-R)" + +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 +msgid "Unicode(UTF-8)" +msgstr "Unicode(UTF-8)" + +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 +msgid "Western(ISO-8859-1)" +msgstr "西方(ISO-8859-1)" + +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "定制 ..." -#: ../midori/midori-browser.c:3301 -#: ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 msgid "View _Source" msgstr "查看源码(_S)" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "查看本页的源代码" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "全屏浏览" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "位置(_G)" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "转到下一页" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "清空垃圾箱" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "删除垃圾箱中的内容" -#: ../midori/midori-browser.c:3325 -#: ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "撤销关闭标签页" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "打开最后关闭的标签页" -#: ../midori/midori-browser.c:3330 -#: ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "添加一个新书签" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "添加新书签目录" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "添加一个新书签目录" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:3333 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "添加, 编辑和移除搜索引擎" -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "清除隐私数据(_C)" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "清除隐私数据 ..." + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "上一个标签页(_P)" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "下一个标签页(_N)" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "显示常见问题" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "反馈错误(_R)" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "隐私浏览(_r)" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "侧边栏(_p)" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "显示侧边栏" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "位置(_L)" -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "搜索 Web(_W)" -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "执行 Web 搜索" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签页或窗口" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:3903 -#: ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "显示所有标签页的列表" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "查找(_I):" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "从窗口中分离选择的面板" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "将选中的面板从窗口中分离" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "侧边栏摆放到右侧" -#: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" -msgstr "是否让侧边栏摆放到右侧" +msgstr "让侧边栏摆放到右侧" -#: ../midori/midori-panel.c:241 -#: ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "关闭侧边栏" -#: ../midori/midori-websettings.c:179 -#: ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 msgid "Blank page" msgstr "空白页面" -#: ../midori/midori-websettings.c:180 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "主页" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "最后打开页面" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "新建标签页" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "当前标签页" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "缺省" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "图标及文字" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "水平摆放的图标和文字" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "所有 Cookies" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:258 #: ../panels/midori-addons.c:94 msgid "None" msgstr "无" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "记住上次窗口的大小" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "上次窗口的宽度" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "上次窗口的高度" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "上次的侧边栏位置" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "上次保存的侧边栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "上次的侧边栏页" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "上次保存的侧边栏页" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "上次的 Web 搜索" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "上次保存的 Web 搜索" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "显示侧边栏" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "是否显示侧边栏" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "显示传输栏" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "是否显示传输栏" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "工具栏样式" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "在地址输入框中显示进度" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "是否在地址输入框中显示加载进度" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "地址补全中显示搜索引擎" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "是否在地址补全中显示搜索引擎" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "工具栏中的项目" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "在工具栏中显示的项目" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "紧凑侧边栏" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "是否让侧边栏紧凑显示" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "启动时加载" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "启动时加载的项目" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "显示崩溃提示对话框" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "当 Midori 崩溃后显示提示对话框" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "下载目录" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "下载的文件将保存到此目录" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "下载管理器" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "外部的下载管理器" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "外部的文本编辑器" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "新闻聚合器" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "外部的新闻聚合查看器" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "地址栏查找" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "在地址输入框中执行的查找" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "首选的编码" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "首选的字符编码集" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "是否在标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "打开新的页面在" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "在那里打开新的页面" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "打开外部页面在" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "在那里打开外部页面" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "鼠标中键打开地址" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "用鼠标中键单击打开选中地址" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "在后台打开标签页" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开标签页" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "在当前标签页后打开新标签" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "是否在当前标签页后打开新标签或者在最后的标签页后打开" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "是否在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "缩放文字和图像" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "是否缩放文字和图像" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "输入时自动补全" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "是否输入时自动补全地址" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "接收 Cookies" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "接收什么类型的 Cookies" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "只接收原始 Cookies" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" msgstr "只接收原始网站的 Cookies" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "最长 Cookie 有效期" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" msgstr "最长保存 Cookie 多少天" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "记录上次访问的页面" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "是否记录上次访问的页面" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "最长历史有效期" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "最长保存历史多少天" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "记录上次的表格输入" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "是否记录上次的表格输入" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "记录上次下载的文件" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "是否保存上次下载的文件" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "自动检测代理服务器" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "是否自动检测系统环境中的代理服务器设置" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "让页面识别为什么" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "缓存大小" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "允许的缓存大小" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "打开链接(_L)" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "在新标签页中打开链接(_T)" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:1016 -#: ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "用下载管理器下载(_M)" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "搜索(_w)" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "搜索 Web(_S)" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "在新标签页中打开地址(_T)" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1251 #, c-format -msgid "File Type: %s ('%s')" -msgstr "文件类型: %s ('%s')" +msgid "File Type: '%s'" +msgstr "文件类型: '%s'" + +#: ../midori/midori-view.c:1254 +#, c-format +msgid "File Type: %s('%s')" +msgstr "文件类型: %s('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "没有安装文档" @@ -1262,259 +1367,246 @@ msgid "Transfers" msgstr "文件传输" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "外观" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "字体设置" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "缺省的字体" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "显示文字的缺省字体大小" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "最小字体尺寸" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "显示文字的最小字体尺寸" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "编码" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "缺省的字符编码" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "行为" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "特性" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "自动加载图像" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "自动缩小图像" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "自动缩小单独的图像以适合屏幕" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "打印背景图" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "可缩放的文本区" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "文本区能否缩放" -#: ../midori/midori-preferences.c:514 -#: ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "启用网页中的脚本" -#: ../midori/midori-preferences.c:518 -#: ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "启用插件" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "启用页面中的插件对象" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "强制每英寸96点" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "强制画面点密度为 96DPI" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "启用开发工具" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "启用给开发者的特殊扩展" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "界面" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "导航条" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "浏览" #. Page "Network" -#: ../midori/midori-preferences.c:579 -#: ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:591 msgid "Network" msgstr "网络" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "隐私" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "网页 Cookies" -#: ../midori/midori-preferences.c:626 -#: ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:637 +#: ../midori/midori-preferences.c:647 msgid "days" msgstr "天" -#: ../midori/midori-preferences.c:629 -#: ../panels/midori-history.c:104 -msgid "History" -msgstr "历史" - -#: ../midori/midori-searchaction.c:455 +#: ../midori/midori-searchaction.c:484 #: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "清空" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "添加搜索引擎" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "编辑搜索引擎" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "名称(_N)" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "图标(_I)" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "记号(_T):" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "管理搜索引擎" -#: ../midori/sokoke.c:109 -#: ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "作为缺省(_d)" + +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "无法运行外部程序." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "警告: 你正在使用超级用户帐号!" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "添加书签(_A)" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "扩展(_E)" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "历史(_H)" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "用户样式(_s)" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "新建标签页(_T)" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "插件(_l)" + +#: ../midori/sokoke.c:792 msgid "_Closed Tabs and Windows" msgstr "关闭的标签页和窗口(_C)" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "新建窗口(_W)" -#: ../midori/gjs.c:743 -#: ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s 没有 '%s' 属性" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s 不能被指定到 %s.%s" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s 不能访问" - #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 msgid "Userscripts" @@ -1525,43 +1617,39 @@ msgstr "用户脚本" msgid "Userstyles" msgstr "用户样式" -#: ../panels/midori-addons.c:922 +#: ../panels/midori-addons.c:927 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "启用(_E)" -#: ../panels/midori-addons.c:923 +#: ../panels/midori-addons.c:928 #: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "启用" -#: ../panels/midori-addons.c:932 +#: ../panels/midori-addons.c:937 #: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "关闭(_D)" -#: ../panels/midori-addons.c:933 +#: ../panels/midori-addons.c:938 #: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "关闭" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "添加一个新目录" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "分隔符" @@ -1573,49 +1661,48 @@ msgstr "控制台" msgid "Extensions" msgstr "扩展" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "确认删除所有的历史项?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "将选中的历史项加入书签" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "删除选中的历史项" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "清空全部历史" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "一周以前" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "%d 天以前" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "今天" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "昨天" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "插件" #: ../panels/midori-transfers.c:256 #, c-format msgid "%s of %s" -msgstr "第 %s 项, 共 %s 项" +msgstr "已下载 %s, 共 %s " #: ../katze/katze-http-auth.c:97 msgid "Authentication Required" @@ -1625,7 +1712,9 @@ msgstr "需要认证" msgid "" "A username and a password are required\n" "to open this location:" -msgstr "需要输入用户名和密码来打开此位置:" +msgstr "" +"需要输入用户名和密码\n" +"以打开此位置:" #: ../katze/katze-http-auth.c:127 msgid "Username" @@ -1649,59 +1738,151 @@ msgstr "库存图标 '%s' 无法加载" msgid "Animation frames are broken" msgstr "动画帧损坏" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "属性 '%s' 在 '%s' 中无效" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 msgid "Choose file" msgstr "选择文件" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "选择目录" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" -msgstr "多彩标签页" +msgstr "彩色标签" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" -msgstr "多彩标签页" +msgstr "多彩标签" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "用不同颜色区分标签页" -#: ../extensions/mouse-gestures/main.c:176 +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "在会话结束时" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"主机: %s\n" +"名称: %s\n" +"值: %s\n" +"路径: %s\n" +"安全: %s\n" +"过期: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "是" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "无" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "确认删除所有的 Cookie?" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "问题" + +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "只删除匹配输入过滤字符串的 Cookies" + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "名称" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "展开所有项目(_E)" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "折叠所有项目(_C)" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "删除所有项目" + +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "删除所有 Cookies. 如果已设置了一个过滤器, 则只删除匹配过滤字符串的 Cookies." + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "展开所有项目" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "折叠所有项目" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "过滤器(_F):" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "输入过滤字符串以只显示域名相符的 Cookies" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Cookie 管理器" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "Cookie 管理器(_C)" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "查看和删除 Cookies" + +#: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "鼠标手势" -#: ../extensions/mouse-gestures/main.c:177 +#: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "用鼠标移动控制 Midori" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "常驻页面" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "常驻页面(_P)" -#: ../extensions/statusbar-features.c:40 -msgid "Images" -msgstr "图像" - -#: ../extensions/statusbar-features.c:47 -msgid "Scripts" -msgstr "脚本" - +#~ msgid "%s has no property '%s'" +#~ msgstr "%s 没有 '%s' 属性" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s 不能被指定到 %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s 不能访问" +#~ msgid "Images" +#~ msgstr "图像" +#~ msgid "Scripts" +#~ msgstr "脚本" #~ msgid "Source" #~ msgstr "源码" From a6bea88932894bb7fbd86902db9717eb6a40da70 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 21 Apr 2009 03:46:11 +0200 Subject: [PATCH 1026/2970] Save activation status of extensions Finally only extensions which are expressly activated will be loaded on startup. --- midori/main.c | 52 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/midori/main.c b/midori/main.c index cab8d0af..cacdd37a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -71,7 +71,8 @@ build_config_filename (const gchar* filename) } static MidoriWebSettings* -settings_new_from_file (const gchar* filename) +settings_new_from_file (const gchar* filename, + gchar*** extensions) { MidoriWebSettings* settings = midori_web_settings_new (); GKeyFile* key_file = g_key_file_new (); @@ -156,11 +157,17 @@ settings_new_from_file (const gchar* filename) g_warning (_("Invalid configuration value '%s'"), property); } g_free (pspecs); + + *extensions = g_key_file_get_keys (key_file, "extensions", NULL, NULL); + + g_key_file_free (key_file); + return settings; } static gboolean settings_save_to_file (MidoriWebSettings* settings, + MidoriApp* app, const gchar* filename, GError** error) { @@ -172,6 +179,8 @@ settings_save_to_file (MidoriWebSettings* settings, GType type; const gchar* property; gboolean saved; + KatzeArray* extensions = katze_object_get_object (app, "extensions"); + MidoriExtension* extension; key_file = g_key_file_new (); class = G_OBJECT_GET_CLASS (settings); @@ -228,6 +237,14 @@ settings_save_to_file (MidoriWebSettings* settings, g_warning (_("Invalid configuration value '%s'"), property); } g_free (pspecs); + + i = 0; + while ((extension = katze_array_get_nth_item (extensions, i++))) + if (midori_extension_is_active (extension)) + g_key_file_set_boolean (key_file, "extensions", + g_object_get_data (G_OBJECT (extension), "filename"), TRUE); + g_object_unref (extensions); + saved = sokoke_key_file_save_to_file (key_file, filename, error); g_key_file_free (key_file); return saved; @@ -710,14 +727,15 @@ midori_app_quit_cb (MidoriApp* app) static void settings_notify_cb (MidoriWebSettings* settings, - GParamSpec* pspec) + GParamSpec* pspec, + MidoriApp* app) { gchar* config_file; GError* error; config_file = build_config_filename ("config"); error = NULL; - if (!settings_save_to_file (settings, config_file, &error)) + if (!settings_save_to_file (settings, app, config_file, &error)) { g_warning (_("The configuration couldn't be saved. %s"), error->message); g_error_free (error); @@ -1147,13 +1165,13 @@ static gboolean midori_load_extensions (gpointer data) { MidoriApp* app = MIDORI_APP (data); + gchar** active_extensions = g_object_get_data (G_OBJECT (app), "extensions"); KatzeArray* extensions; - const gchar* filename; MidoriExtension* extension; - guint i; /* Load extensions */ extensions = katze_array_new (MIDORI_TYPE_EXTENSION); + g_object_set (app, "extensions", extensions, NULL); if (g_module_supported ()) { /* FIXME: Read extensions from system data dirs */ @@ -1165,6 +1183,8 @@ midori_load_extensions (gpointer data) extension_dir = g_dir_open (extension_path, 0, NULL); if (extension_dir != NULL) { + const gchar* filename; + while ((filename = g_dir_read_name (extension_dir))) { gchar* fullname; @@ -1186,6 +1206,8 @@ midori_load_extensions (gpointer data) extension = extension_init (); /* FIXME: Validate the extension */ /* Signal that we want the extension to load and save */ + g_object_set_data_full (G_OBJECT (extension), "filename", + g_strdup (filename), g_free); midori_extension_get_config_dir (extension); } else @@ -1197,6 +1219,14 @@ midori_load_extensions (gpointer data) g_warning ("%s", g_module_error ()); } katze_array_add_item (extensions, extension); + if (active_extensions) + { + guint i = 0; + gchar* name; + while ((name = active_extensions[i++])) + if (!g_strcmp0 (filename, name)) + g_signal_emit_by_name (extension, "activate", app); + } g_object_unref (extension); } g_dir_close (extension_dir); @@ -1204,11 +1234,7 @@ midori_load_extensions (gpointer data) g_free (extension_path); } - g_object_set (app, "extensions", extensions, NULL); - - i = 0; - while ((extension = katze_array_get_nth_item (extensions, i++))) - g_signal_emit_by_name (extension, "activate", app); + g_strfreev (active_extensions); return FALSE; } @@ -1345,6 +1371,7 @@ main (int argc, { NULL } }; GString* error_messages; + gchar** extensions; MidoriWebSettings* settings; gchar* config_file; MidoriStartup load_on_startup; @@ -1497,7 +1524,7 @@ main (int argc, error_messages = g_string_new (NULL); config_file = build_config_filename ("config"); error = NULL; - settings = settings_new_from_file (config_file); + settings = settings_new_from_file (config_file, &extensions); katze_assign (config_file, build_config_filename ("accels")); gtk_accel_map_load (config_file); katze_assign (config_file, build_config_filename ("search")); @@ -1657,7 +1684,7 @@ main (int argc, katze_assign (config_file, build_config_filename ("config")); if (is_writable (config_file)) g_signal_connect_after (settings, "notify", - G_CALLBACK (settings_notify_cb), NULL); + G_CALLBACK (settings_notify_cb), app); katze_assign (config_file, build_config_filename ("search")); if (is_writable (config_file)) @@ -1746,6 +1773,7 @@ main (int argc, G_CALLBACK (midori_app_add_browser_cb), NULL); g_idle_add (midori_load_cookie_jar, settings); + g_object_set_data (G_OBJECT (app), "extensions", extensions); g_idle_add (midori_load_extensions, app); katze_item_set_parent (KATZE_ITEM (_session), app); g_idle_add (midori_load_session, _session); From 05967054c6aa52f0d1d63e918c1dba5f50f3f9b8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 21 Apr 2009 03:48:25 +0200 Subject: [PATCH 1027/2970] Save extension settings to a filename based folder This prevents different folders from being created depending on the user language. --- midori/midori-extension.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index 0bbcfef7..ca9dbd94 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -459,8 +459,7 @@ midori_extension_get_app (MidoriExtension* extension) * @extension: a #MidoriExtension * * Retrieves the path to a directory reserved for configuration - * files specific to the extension. For that purpose the 'name' - * of the extension is actually part of the path. + * files specific to the extension. * * If settings are installed on the extension, they will be * loaded from and saved to a file "config" in this path. @@ -470,12 +469,16 @@ midori_extension_get_app (MidoriExtension* extension) const gchar* midori_extension_get_config_dir (MidoriExtension* extension) { + g_return_val_if_fail (midori_extension_is_prepared (extension), NULL); if (!extension->priv->config_dir) + { + gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); + g_return_val_if_fail (filename != NULL, NULL); extension->priv->config_dir = g_build_filename ( - sokoke_set_config_dir (NULL), "extensions", - extension->priv->name, NULL); + sokoke_set_config_dir (NULL), "extensions", filename, NULL); + } return extension->priv->config_dir; } From 3fef0f9d72d2a8563d1cd1c2fdcfc1bcd87e5421 Mon Sep 17 00:00:00 2001 From: Evaggelos Balaskas Date: Tue, 21 Apr 2009 21:57:44 +0200 Subject: [PATCH 1028/2970] Update Greek translation --- po/el.po | 2174 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 1360 insertions(+), 814 deletions(-) diff --git a/po/el.po b/po/el.po index 16c51151..fe4d3eb3 100644 --- a/po/el.po +++ b/po/el.po @@ -1,13 +1,13 @@ # Greek translations for midori package. # Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER # This file is distributed under the same license as the midori package. -# Evaggelos Balaskas 2008 +# Evaggelos Balaskas 2008-2009 msgid "" msgstr "" -"Project-Id-Version: midori 0.1.1\n" +"Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-06 05:50+0100\n" -"PO-Revision-Date: 2008-12-06 09:57+0200\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-21 18:08+0200\n" "Last-Translator: Evaggelos Balaskas \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -16,1291 +16,1643 @@ msgstr "" "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../midori.desktop.in.h:1 +#: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" msgstr "Ελαφρύς περιηγητής ιστού" -#: ../midori.desktop.in.h:2 ../midori/main.c:1338 ../midori/main.c:1347 -#: ../midori/main.c:1370 ../midori/main.c:1394 +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Μιντόρι" -#: ../midori.desktop.in.h:3 +#: ../data/midori.desktop.in.h:3 msgid "Web Browser" msgstr "Περιηγητής Ιστού" -#: ../midori/main.c:86 -msgid "_Bookmark" -msgstr "_Σελιδοδείκτης" - -#: ../midori/main.c:87 ../midori/midori-browser.c:3744 -msgid "_Bookmarks" -msgstr "_Σελιδοδείκτες" - -#: ../midori/main.c:88 -msgid "_Add Bookmark" -msgstr "_Προσθήκη σελιδοδείκτη" - -#: ../midori/main.c:89 -msgid "_Console" -msgstr "_Τερματικό" - -#: ../midori/main.c:90 -msgid "_Extensions" -msgstr "_Επεκτάσεις" - -#: ../midori/main.c:91 -msgid "_History" -msgstr "_Ιστορικό" - -#: ../midori/main.c:92 -msgid "_Homepage" -msgstr "_Αρχική σελίδα" - -#: ../midori/main.c:93 -msgid "_Userscripts" -msgstr "_Σενάρια χρήστη" - #: ../midori/main.c:94 -msgid "User_styles" -msgstr "_Θέματα χρήστη" - -#: ../midori/main.c:95 -msgid "New _Tab" -msgstr "Νέα _καρτέλα" - -#: ../midori/main.c:96 -msgid "_Transfers" -msgstr "_Μεταφορές" - -#: ../midori/main.c:97 -msgid "_Closed Tabs and Windows" -msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" - -#: ../midori/main.c:98 -msgid "New _Window" -msgstr "Νέο _παράθυρο" - -#: ../midori/main.c:143 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Οι ρυθμίσεις δεν μπορούν να φορτωθούν: %s\n" -#: ../midori/main.c:198 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Η τιμή '%s' δεν είναι έγκυρη για το %s" -#: ../midori/main.c:205 ../midori/main.c:275 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Μη έγκυρη τιμή ρύθμισης '%s'" -#: ../midori/main.c:532 -msgid "File not found." -msgstr "Το αρχείο δεν βρέθηκε." - -#: ../midori/main.c:540 ../midori/main.c:549 -msgid "Malformed document." -msgstr "Κακοσχηματισμένο έγγραφο." - -#: ../midori/main.c:571 ../midori/main.c:603 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "Αποτυχία κατά το άνοιγμα της βάσης: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:364 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Αποτυχία κατά την εκτέλεση της δήλωσης στην βάση: %s\n" + +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Αποτυχία στην διαγραφή του αντικειμένου από το ιστορικό: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "Αποτυχία στον καθαρισμό του ιστορικού: %s\n" -#: ../midori/main.c:714 ../midori/main.c:728 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "Αποτυχία στην προσθήκη ενός αντικειμένου στο ιστορικό: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:844 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Αποτυχία στην διαγραφή των παλιών αντικειμένων από το ιστορικό: %s\n" -#: ../midori/main.c:976 ../midori/sokoke.c:459 -#, c-format -msgid "Writing failed." -msgstr "Αποτυχία εγγραφής." - -#: ../midori/main.c:1000 ../midori/midori-preferences.c:350 -msgid "Transfers" -msgstr "Μεταφορές" - -#: ../midori/main.c:1040 -#, c-format -msgid "The session couldn't be saved. %s" -msgstr "Η συνεδρία δεν μπορεί να αποθηκευτεί. %s" - -#: ../midori/main.c:1297 -msgid "Run the specified filename as javascript" -msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" - -#: ../midori/main.c:1299 -msgid "Display program version" -msgstr "Προβολή έκδοσης προγράμματος" - -#: ../midori/main.c:1301 -msgid "URIs" -msgstr "URIs" - -#: ../midori/main.c:1335 -msgid "[URIs]" -msgstr "[URIs]" - -#: ../midori/main.c:1371 -msgid "Please report comments, suggestions and bugs to:" -msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" - -#: ../midori/main.c:1373 -msgid "Check for new versions at:" -msgstr "Έλεγχος για νέα έκδοση στο:" - -#: ../midori/main.c:1394 -msgid "No filename specified" -msgstr "Δεν ορίστηκε όνομα αρχείου" - -#: ../midori/main.c:1411 -#, c-format -msgid "An instance of Midori is already running but not responding.\n" -msgstr "Όλα τα στιγμιότυπα του Μιντόρι τρέχουν ήδη αλλά δεν ανταποκρίνονται.\n" - -#: ../midori/main.c:1447 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" - -#: ../midori/main.c:1463 -#, c-format -msgid "The session couldn't be loaded: %s\n" -msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" - -#: ../midori/main.c:1477 -#, c-format -msgid "The trash couldn't be loaded: %s\n" -msgstr "Τα απορρίματα δεν μπορούν να φορτωθούν: %s\n" - -#: ../midori/main.c:1491 -#, c-format -msgid "The history couldn't be loaded: %s\n" -msgstr "Το ιστορικό δεν μπορεί να φορτωθεί: %s\n" - -#: ../midori/main.c:1504 -msgid "The following errors occured:" -msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" - -#: ../midori/main.c:1520 -msgid "_Ignore" -msgstr "Α_γνόησε" - -#: ../midori/main.c:1688 -#, c-format -msgid "The search engines couldn't be saved. %s" -msgstr "Οι μηχανές αναζήτησης δεν μπορούν να αποθηκευτούν. %s" - -#: ../midori/main.c:1698 -#, c-format -msgid "The bookmarks couldn't be saved. %s" -msgstr "Οι σελιδοδείκτες δεν μπορούν να αποθηκευτούν. %s" - -#: ../midori/main.c:1707 -#, c-format -msgid "The trash couldn't be saved. %s" -msgstr "Τα απορρίματα δεν μπορούν να αποθηκευτούν. %s" - -#: ../midori/main.c:1715 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Οι ρυθμίσεις δεν μπορούν να αποθηκευτούν. %s" -#: ../midori/midori-browser.c:249 ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3136 +#: ../midori/main.c:751 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Οι μηχανές αναζήτησης δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Οι σελιδοδείκτες δεν μπορούν να αποθηκευτούν. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:850 +#: ../midori/main.c:873 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Τα απορρίμματα δεν μπορούν να αποθηκευτούν. %s" + +#: ../midori/main.c:946 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Η συνεδρία δεν μπορεί να αποθηκευτεί. %s" + +#: ../midori/main.c:1073 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "Το μιντόρι φαίνεται ότι κρέμασε την τελευταία φορά που άνοιξε. Εάν αυτό συνεχίζει επανειλημμένα δοκιμάστε μία από τις παρακάτω επιλογές για να επιλύσετε το πρόβλημα." + +#: ../midori/main.c:1088 +msgid "Modify _preferences" +msgstr "Τροποποίηση _προτιμήσεων" + +#: ../midori/main.c:1092 +msgid "Reset the last _session" +msgstr "Επαναφορά της τελευταίας σ_υνεδρίας" + +#: ../midori/main.c:1097 +msgid "Disable all _extensions" +msgstr "Απενεργοποίηση όλων των επ_εκτάσεων" + +#: ../midori/main.c:1288 +msgid "No filename specified" +msgstr "Δεν ορίστηκε όνομα αρχείου" + +#: ../midori/main.c:1311 +msgid "An unknown error occured." +msgstr "Συνέβει ένα άγνωστο σφάλμα." + +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Άνοιγμα της διεύθυνσης ως διαδικτυακή εφαρμογή" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "Διεύθυνση" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Χρήση φακέλου ως φάκελος ρύθμισης" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "ΦΑΚΕΛΟΣ" + +#: ../midori/main.c:1340 +msgid "Run the specified filename as javascript" +msgstr "Τρέξε το συγκεκριμένο όνομα αρχείου ως javascript" + +#: ../midori/main.c:1342 +msgid "Display program version" +msgstr "Προβολή έκδοσης προγράμματος" + +#: ../midori/main.c:1344 +msgid "Addresses" +msgstr "Διευθύνσεις" + +#: ../midori/main.c:1385 +msgid "[Addresses]" +msgstr "[Διευθύνσεις" + +#: ../midori/main.c:1408 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Παρακαλώ αναφέρατε σχόλια, προτάσεις και σφάλματα στο:" + +#: ../midori/main.c:1410 +msgid "Check for new versions at:" +msgstr "Έλεγχος για νέα έκδοση στο:" + +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "Η συγκεκριμένη ρύθμιση φακέλου είναι άκυρη." + +#: ../midori/main.c:1489 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Όλα τα στιγμιότυπα του Μιντόρι τρέχουν ήδη αλλά δεν ανταποκρίνονται.\n" + +#: ../midori/main.c:1539 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Οι μηχανές αναζήτησης δεν μπορούν να φορτωθούν. %s\n" + +#: ../midori/main.c:1551 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Οι σελιδοδείκτες δεν μπορούν να φορτωθούν: %s\n" + +#: ../midori/main.c:1566 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Η συνεδρία δεν μπορεί να φορτωθεί: %s\n" + +#: ../midori/main.c:1579 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Τα απορρίμματα δεν μπορούν να φορτωθούν: %s\n" + +#: ../midori/main.c:1592 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Το ιστορικό δεν μπορεί να φορτωθεί: %s\n" + +#: ../midori/main.c:1604 +msgid "The following errors occured:" +msgstr "Δημιουργήθηκαν τα ακόλουθα σφάλματα:" + +#: ../midori/main.c:1620 +msgid "_Ignore" +msgstr "Α_γνόησε" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Το αρχείο δεν βρέθηκε." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Κακοσχηματισμένο έγγραφο." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Αποτυχία εγγραφής." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Ανανέωση της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:261 ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Σταμάτημα φόρτωσης της τρέχουσας σελίδας" -#: ../midori/midori-browser.c:319 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% φορτώθηκε" -#: ../midori/midori-browser.c:342 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Αναπάντεχη ενέργεια '%s'." -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:541 +msgid "New folder" +msgstr "Νέος φάκελος" + +#: ../midori/midori-browser.c:541 +msgid "Edit folder" +msgstr "Επεξεργασία φακέλου" + +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Νέος σελιδοδείκτης" -#: ../midori/midori-browser.c:508 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Επεξεργασία σελιδοδείκτη" -#: ../midori/midori-browser.c:530 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Τίτλος:" -#: ../midori/midori-browser.c:543 ../midori/midori-searchaction.c:841 +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Περιγραφή:" -#: ../midori/midori-browser.c:562 ../midori/midori-searchaction.c:855 -msgid "_URL:" +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 +msgid "_Address:" msgstr "_Διεύθυνση:" -#: ../midori/midori-browser.c:578 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Φάκελος:" -#: ../midori/midori-browser.c:582 -msgid "Root" -msgstr "Ρίζα" +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 +msgid "Toplevel folder" +msgstr "Αρχικός φάκελος" -#: ../midori/midori-browser.c:668 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Αποθήκευση αρχείου ως" -#: ../midori/midori-browser.c:1248 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Άνοιγμα αρχείου" -#: ../midori/midori-browser.c:2328 +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 +msgid "Open all in _Tabs" +msgstr "Άνοιγμα όλων σε _καρτέλες" + +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "Άνοιγμα σε νέα_καρτέλα" -#: ../midori/midori-browser.c:2330 +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" -msgstr "Άνοιγμα σε νέο _παραθύρο" +msgstr "Άνοιγμα σε νέο _παράθυρο" -#: ../midori/midori-browser.c:2601 -msgid "Separator" -msgstr "Διαχωριστικό" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:2712 -#, c-format -msgid "A week ago" -msgstr "Μια βδομάδα πριν" +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Καθαρισμός προσωπικών δεδομένων" -#: ../midori/midori-browser.c:2718 -#, c-format -msgid "%d days ago" -msgstr "%d μέρες πριν" +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Καθαρισμός των παρακάτω δεδομένων:" -#: ../midori/midori-browser.c:2725 -msgid "Today" -msgstr "Σήμερα" - -#: ../midori/midori-browser.c:2727 -msgid "Yesterday" -msgstr "Χτές" - -#: ../midori/midori-browser.c:2816 -msgid "A lightweight web browser." -msgstr "Ένας ελαφρύς περιηγητής ιστού" - -#: ../midori/midori-browser.c:2824 -msgid "translator-credits" -msgstr "Ευάγγελος Μπαλάσκας 2008" - -#: ../midori/midori-browser.c:2958 -msgid "Are you sure you want to remove all history items?" -msgstr "" -"Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" - -#: ../midori/midori-browser.c:3064 -msgid "_File" -msgstr "_Αρχείο" - -#: ../midori/midori-browser.c:3067 -msgid "Open a new window" -msgstr "Άνοιγμα ενός νέου παραθύρου" - -#: ../midori/midori-browser.c:3070 -msgid "Open a new tab" -msgstr "Άνοιγμα μίας νέας καρτέλας" - -#: ../midori/midori-browser.c:3073 -msgid "Open a file" -msgstr "Άνοιγμα αρχείου" - -#: ../midori/midori-browser.c:3076 -msgid "Save to a file" -msgstr "Αποθήκευση σε αρχείου" - -#: ../midori/midori-browser.c:3078 -msgid "_Close Tab" -msgstr "_Κλείσιμο καρτέλας" - -#: ../midori/midori-browser.c:3079 -msgid "Close the current tab" -msgstr "Κλείσιμο της τρέχουσας καρτέλας" - -#: ../midori/midori-browser.c:3081 -msgid "C_lose Window" -msgstr "Κ_λείσιμο παραθύρου" - -#: ../midori/midori-browser.c:3082 -msgid "Close this window" -msgstr "Κλείσιμο αυτού του παραθύρου" - -#: ../midori/midori-browser.c:3085 -msgid "Print the current page" -msgstr "Εκτύπωση της τρέχουσας σελίδας" - -#: ../midori/midori-browser.c:3088 -msgid "Quit the application" -msgstr "Έξοδος από την εφαρμογή" - -#: ../midori/midori-browser.c:3090 -msgid "_Edit" -msgstr "_Επεξεργασία" - -#: ../midori/midori-browser.c:3093 -msgid "Cut the selected text" -msgstr "Αποκοπή επιλεγμένου κειμένου" - -#: ../midori/midori-browser.c:3096 ../midori/midori-browser.c:3099 -msgid "Copy the selected text" -msgstr "Αντιγραφή επιλεγμένου κειμένου" - -#: ../midori/midori-browser.c:3102 -msgid "Paste text from the clipboard" -msgstr "Επικόλληση κειμένου από το πρόχειρο" - -#: ../midori/midori-browser.c:3105 -msgid "Delete the selected text" -msgstr "Διαγραφή του επιλεγμένου κειμένου" - -#: ../midori/midori-browser.c:3108 -msgid "Select all text" -msgstr "Επιλογή όλου του κειμένου" - -#: ../midori/midori-browser.c:3111 -msgid "Find a word or phrase in the page" -msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" - -#: ../midori/midori-browser.c:3113 -msgid "Find _Next" -msgstr "Εύρεση επ_όμενο" - -#: ../midori/midori-browser.c:3114 -msgid "Find the next occurrence of a word or phrase" -msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" - -#: ../midori/midori-browser.c:3116 -msgid "Find _Previous" -msgstr "Εύρεση _προηγούμενο" - -#: ../midori/midori-browser.c:3117 -msgid "Find the previous occurrence of a word or phrase" -msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" - -#: ../midori/midori-browser.c:3120 -msgid "_Quick Find" -msgstr "_Έξοδος αναζήτησης" - -#: ../midori/midori-browser.c:3121 -msgid "Quickly jump to a word or phrase" -msgstr "Γρήγορα μεταπήδησε στον λέξη ή στην φράση" - -#: ../midori/midori-browser.c:3124 -msgid "Configure the application preferences" -msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" - -#: ../midori/midori-browser.c:3126 -msgid "_View" -msgstr "_Εμφάνιση" - -#: ../midori/midori-browser.c:3127 -msgid "_Toolbars" -msgstr "_Εργαλειοθήκες" - -#: ../midori/midori-browser.c:3139 -msgid "Increase the zoom level" -msgstr "Αύξηση του επίπεδου εστίασης" - -#: ../midori/midori-browser.c:3142 -msgid "Decrease the zoom level" -msgstr "Μείωση του επιπέδου εστίασης" - -#: ../midori/midori-browser.c:3145 -msgid "Reset the zoom level" -msgstr "Επαναφορά του επιπέδου εστίασης" - -#: ../midori/midori-browser.c:3147 ../midori/midori-view.c:998 -msgid "View _Source" -msgstr "Προβολή _κώδικα" - -#: ../midori/midori-browser.c:3148 -msgid "View the source code of the page" -msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" - -#: ../midori/midori-browser.c:3150 -msgid "View Selection Source" -msgstr "Προβολή του επιλεγμένου κώδικα" - -#: ../midori/midori-browser.c:3151 -msgid "View the source code of the selection" -msgstr "Προβολή του πηγαίου κώδικα του επιλεγμένου" - -#: ../midori/midori-browser.c:3155 -msgid "Toggle fullscreen view" -msgstr "Εναλλαγή σε πλήρη οθόνη" - -#: ../midori/midori-browser.c:3157 -msgid "_Go" -msgstr "_Μετάβαση" - -#: ../midori/midori-browser.c:3160 -msgid "Go back to the previous page" -msgstr "Μετάβαση στην προηγούμενη σελίδα" - -#: ../midori/midori-browser.c:3163 -msgid "Go forward to the next page" -msgstr "Μετάβαση στην επόμενη σελίδα" - -#: ../midori/midori-browser.c:3166 -msgid "Go to your homepage" -msgstr "Μετάβαση στην αρχική σελίδα" - -#: ../midori/midori-browser.c:3168 -msgid "Empty Trash" -msgstr "Άδειασμα αποριμμάτων" - -#: ../midori/midori-browser.c:3169 -msgid "Delete the contents of the trash" -msgstr "Διαγραφή των περιεχομένων των απορριμάτων" - -#: ../midori/midori-browser.c:3171 ../midori/midori-view.c:970 -msgid "Undo Close Tab" -msgstr "Αναίρεση κλείσιμο καρτέλας" - -#: ../midori/midori-browser.c:3172 -msgid "Open the last closed tab" -msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" - -#: ../midori/midori-browser.c:3176 -msgid "Add a new bookmark" -msgstr "Προσθήκη ενός νέου σελιδοδείκτη" - -#: ../midori/midori-browser.c:3179 -msgid "Edit the selected bookmark" -msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" - -#: ../midori/midori-browser.c:3182 -msgid "Delete the selected bookmark" -msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" - -#: ../midori/midori-browser.c:3185 -msgid "Delete the selected history item" -msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" - -#: ../midori/midori-browser.c:3188 -msgid "Clear the entire history" -msgstr "Καθαρισμός ολόκληρου του ιστορικού" - -#: ../midori/midori-browser.c:3191 -msgid "Bookmark the selected history item" -msgstr "Σελιδοποίησε το επιλεγμένο αντικείμενο του ιστορικού" - -#: ../midori/midori-browser.c:3193 -msgid "_Tools" -msgstr "_Εργαλεία" - -#: ../midori/midori-browser.c:3195 ../midori/midori-searchaction.c:465 -msgid "_Manage Search Engines" -msgstr "_Διαχείριση των μηχανών αναζήτησης" - -#: ../midori/midori-browser.c:3196 -msgid "Add, edit and remove search engines..." -msgstr "Προσθήξη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." - -#: ../midori/midori-browser.c:3200 -msgid "_Previous Tab" -msgstr "_Προηγούμενη καρτέλα" - -#: ../midori/midori-browser.c:3201 -msgid "Switch to the previous tab" -msgstr "Μετάβαση στην προηγούμενη καρτέλα" - -#: ../midori/midori-browser.c:3203 -msgid "_Next Tab" -msgstr "Επόμε_νη καρτέλα" - -#: ../midori/midori-browser.c:3204 -msgid "Switch to the next tab" -msgstr "Μετάβαση στην επόμενη καρτέλα" - -#: ../midori/midori-browser.c:3206 -msgid "_Help" -msgstr "_Βοήθεια" - -#: ../midori/midori-browser.c:3208 -msgid "_Contents" -msgstr "_Περιεχόμενα" - -#: ../midori/midori-browser.c:3209 -msgid "Show the documentation" -msgstr "Εμφάνιση της τεκμηρίωσης" - -#: ../midori/midori-browser.c:3211 -msgid "_Frequent questions" -msgstr "_Συχνές ερωτήσεις" - -#: ../midori/midori-browser.c:3212 -msgid "Show the Frequently Asked Questions" -msgstr "Εμφάνιση των συχνών απαντημένων ερωτήσεων" - -#: ../midori/midori-browser.c:3214 -msgid "_Report a bug" -msgstr "Αποστολή α_ναφοράς σφάλματος" - -#: ../midori/midori-browser.c:3215 -msgid "Open Midori's bug tracker" -msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" - -#: ../midori/midori-browser.c:3218 -msgid "Show information about the program" -msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" - -#: ../midori/midori-browser.c:3225 -msgid "P_rivate Browsing" -msgstr "Π_ροσωπική περιήγηση" - -#: ../midori/midori-browser.c:3226 -msgid "Don't save any private data while browsing" -msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" - -#: ../midori/midori-browser.c:3231 -msgid "_Menubar" -msgstr "_Μπάρα μενού" - -#: ../midori/midori-browser.c:3232 -msgid "Show menubar" -msgstr "Προβολή μπάρας μενού" - -#: ../midori/midori-browser.c:3235 -msgid "_Navigationbar" -msgstr "_Μπάρα περιήγησης" - -#: ../midori/midori-browser.c:3236 -msgid "Show navigationbar" -msgstr "Εμφάνιση περιήγησης" - -#: ../midori/midori-browser.c:3239 -msgid "Side_panel" -msgstr "Πλαϊνό _ταμπλό" - -#: ../midori/midori-browser.c:3240 -msgid "Show sidepanel" -msgstr "Εμφάνιση πλαϊνού ταμπλό" - -#: ../midori/midori-browser.c:3243 -msgid "_Bookmarkbar" -msgstr "_Μπάρα σελιδοδείκτη" - -#: ../midori/midori-browser.c:3244 -msgid "Show bookmarkbar" -msgstr "Εμφάνιση μπάρα σελιδοδείκτη" - -#: ../midori/midori-browser.c:3247 -msgid "_Transferbar" -msgstr "_Μπάρα μεταφορών" - -#: ../midori/midori-browser.c:3248 -msgid "Show transferbar" -msgstr "Εμφάνιση μπάρα μεταφορών" - -#: ../midori/midori-browser.c:3251 -msgid "_Statusbar" -msgstr "_Γραμμή κατάστασης" - -#: ../midori/midori-browser.c:3252 -msgid "Show statusbar" -msgstr "Εμφάνιση γραμμής κατάστασης" - -#: ../midori/midori-browser.c:3669 -msgid "_Location..." -msgstr "_Τοποθεσία:" - -#: ../midori/midori-browser.c:3671 -msgid "Open a particular location" -msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" - -#: ../midori/midori-browser.c:3695 -msgid "_Web Search..." -msgstr "_Αναζήτηση ιστού..." - -#: ../midori/midori-browser.c:3697 -msgid "Run a web search" -msgstr "Εκκίνηση μίας αναζήτησης ιστού" - -#: ../midori/midori-browser.c:3716 -msgid "Reopen a previously closed tab or window" -msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" - -#: ../midori/midori-browser.c:3729 -msgid "_Recently visited pages" -msgstr "_Πρόσφατες επισκεπτόμενες σελίδες " - -#: ../midori/midori-browser.c:3731 -msgid "Reopen pages that you visited earlier" -msgstr "Ξανα-άνοιγμα σελίδεων που έχετε επισκεφτεί νωρίτερα" - -#: ../midori/midori-browser.c:3746 -msgid "Show the saved bookmarks" -msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" - -#: ../midori/midori-browser.c:3759 -msgid "_Window" -msgstr "_Παράθυρο" - -#: ../midori/midori-browser.c:3761 -msgid "Show a list of all open tabs" -msgstr "Εμφάνιση μίας λίστας με όλα τις ανοιχτές καρτέλες" - -#: ../midori/midori-browser.c:3883 -msgid "Bookmarks" -msgstr "Σελιδοδείκτες" - -#: ../midori/midori-browser.c:3926 ../midori/midori-preferences.c:517 +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 msgid "History" msgstr "Ιστορικό" -#. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:3969 -msgid "_Inline find:" -msgstr "Εν_σωματωμένη εύρεση:" +#: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Cookies" -#: ../midori/midori-browser.c:4004 +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "Άδειασμα των cookies" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Εικονίδια ιστότοπων" + +#: ../midori/midori-browser.c:3093 +msgid "A lightweight web browser." +msgstr "Ένας ελαφρύς περιηγητής ιστού" + +#: ../midori/midori-browser.c:3101 +msgid "translator-credits" +msgstr "Ευάγγελος Μπαλάσκας 2008" + +#: ../midori/midori-browser.c:3302 +msgid "_File" +msgstr "_Αρχείο" + +#: ../midori/midori-browser.c:3305 +msgid "Open a new window" +msgstr "Άνοιγμα ενός νέου παραθύρου" + +#: ../midori/midori-browser.c:3308 +msgid "Open a new tab" +msgstr "Άνοιγμα μίας νέας καρτέλας" + +#: ../midori/midori-browser.c:3311 +msgid "Open a file" +msgstr "Άνοιγμα αρχείου" + +#: ../midori/midori-browser.c:3314 +msgid "Save to a file" +msgstr "Αποθήκευση σε αρχείου" + +#: ../midori/midori-browser.c:3316 +msgid "_Close Tab" +msgstr "_Κλείσιμο καρτέλας" + +#: ../midori/midori-browser.c:3317 +msgid "Close the current tab" +msgstr "Κλείσιμο της τρέχουσας καρτέλας" + +#: ../midori/midori-browser.c:3319 +msgid "C_lose Window" +msgstr "Κ_λείσιμο παραθύρου" + +#: ../midori/midori-browser.c:3320 +msgid "Close this window" +msgstr "Κλείσιμο αυτού του παραθύρου" + +#: ../midori/midori-browser.c:3323 +msgid "Print the current page" +msgstr "Εκτύπωση της τρέχουσας σελίδας" + +#: ../midori/midori-browser.c:3326 +msgid "Quit the application" +msgstr "Έξοδος από την εφαρμογή" + +#: ../midori/midori-browser.c:3328 +msgid "_Edit" +msgstr "_Επεξεργασία" + +#: ../midori/midori-browser.c:3331 +msgid "Cut the selected text" +msgstr "Αποκοπή επιλεγμένου κειμένου" + +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 +msgid "Copy the selected text" +msgstr "Αντιγραφή επιλεγμένου κειμένου" + +#: ../midori/midori-browser.c:3340 +msgid "Paste text from the clipboard" +msgstr "Επικόλληση κειμένου από το πρόχειρο" + +#: ../midori/midori-browser.c:3343 +msgid "Delete the selected text" +msgstr "Διαγραφή του επιλεγμένου κειμένου" + +#: ../midori/midori-browser.c:3346 +msgid "Select all text" +msgstr "Επιλογή όλου του κειμένου" + +#: ../midori/midori-browser.c:3349 +msgid "Find a word or phrase in the page" +msgstr "Αναζήτηση μίας λέξης ή φράσης στην σελίδα" + +#: ../midori/midori-browser.c:3351 +msgid "Find _Next" +msgstr "Εύρεση επ_όμενο" + +#: ../midori/midori-browser.c:3352 +msgid "Find the next occurrence of a word or phrase" +msgstr "Εύρεση της επόμενης ύπαρξης της λέξης ή της φράσης" + +#: ../midori/midori-browser.c:3354 +msgid "Find _Previous" +msgstr "Εύρεση _προηγούμενο" + +#: ../midori/midori-browser.c:3355 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Εύρεση της προηγούμενης ύπαρξης της λέξης ή της φράσης" + +#: ../midori/midori-browser.c:3358 +msgid "_Quick Find" +msgstr "_Έξοδος αναζήτησης" + +#: ../midori/midori-browser.c:3359 +msgid "Quickly jump to a word or phrase" +msgstr "Γρήγορα μεταπήδησε στον λέξη ή στην φράση" + +#: ../midori/midori-browser.c:3362 +msgid "Configure the application preferences" +msgstr "Παραμετροποίηση των ρυθμίσεων της εφαρμογής" + +#: ../midori/midori-browser.c:3364 +msgid "_View" +msgstr "_Εμφάνιση" + +#: ../midori/midori-browser.c:3365 +msgid "_Toolbars" +msgstr "_Εργαλειοθήκες" + +#: ../midori/midori-browser.c:3377 +msgid "Increase the zoom level" +msgstr "Αύξηση του επίπεδου εστίασης" + +#: ../midori/midori-browser.c:3380 +msgid "Decrease the zoom level" +msgstr "Μείωση του επιπέδου εστίασης" + +#: ../midori/midori-browser.c:3383 +msgid "Reset the zoom level" +msgstr "Επαναφορά του επιπέδου εστίασης" + +#: ../midori/midori-browser.c:3384 +msgid "_Encoding" +msgstr "_Κωδικοποίηση" + +#: ../midori/midori-browser.c:3386 +msgid "_Automatic" +msgstr "_Αυτόματα" + +#: ../midori/midori-browser.c:3389 +#: ../midori/midori-websettings.c:200 +msgid "Chinese (BIG5)" +msgstr "Κινέζικα (BIG5)" + +#: ../midori/midori-browser.c:3392 +#: ../midori/midori-websettings.c:201 +msgid "Japanese (SHIFT_JIS)" +msgstr "Ιαπωνικά (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 +msgid "Russian (KOI8-R)" +msgstr "Ρωσικά (KOI8-R)" + +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 +msgid "Western (ISO-8859-1)" +msgstr "Δυτικά (ISO-8859-1)" + +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 +msgid "Custom..." +msgstr "Προσαρμογή..." + +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 +msgid "View _Source" +msgstr "Προβολή _κώδικα" + +#: ../midori/midori-browser.c:3408 +msgid "View the source code of the page" +msgstr "Προβολή του πηγαίου κώδικα αυτής της σελίδας" + +#: ../midori/midori-browser.c:3410 +msgid "View Selection Source" +msgstr "Προβολή του επιλεγμένου κώδικα" + +#: ../midori/midori-browser.c:3411 +msgid "View the source code of the selection" +msgstr "Προβολή του πηγαίου κώδικα του επιλεγμένου" + +#: ../midori/midori-browser.c:3415 +msgid "Toggle fullscreen view" +msgstr "Εναλλαγή σε πλήρη οθόνη" + +#: ../midori/midori-browser.c:3417 +msgid "_Go" +msgstr "_Μετάβαση" + +#: ../midori/midori-browser.c:3420 +msgid "Go back to the previous page" +msgstr "Μετάβαση στην προηγούμενη σελίδα" + +#: ../midori/midori-browser.c:3423 +msgid "Go forward to the next page" +msgstr "Μετάβαση στην επόμενη σελίδα" + +#: ../midori/midori-browser.c:3426 +msgid "Go to your homepage" +msgstr "Μετάβαση στην αρχική σελίδα" + +#: ../midori/midori-browser.c:3428 +msgid "Empty Trash" +msgstr "Άδειασμα αποριμμάτων" + +#: ../midori/midori-browser.c:3429 +msgid "Delete the contents of the trash" +msgstr "Διαγραφή των περιεχομένων των απορριμάτων" + +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 +msgid "Undo Close Tab" +msgstr "Αναίρεση κλείσιμο καρτέλας" + +#: ../midori/midori-browser.c:3432 +msgid "Open the last closed tab" +msgstr "Άνοιγμα της τελευταίας καρτέλας που έκλεισε" + +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 +msgid "Add a new bookmark" +msgstr "Προσθήκη ενός νέου σελιδοδείκτη" + +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Προσθήκη ενός νέου φακέλου" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Προσθήκη ενός νέου φακέλου σελιδοδεικτών" + +#: ../midori/midori-browser.c:3440 +msgid "_Tools" +msgstr "_Εργαλεία" + +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "_Διαχείριση των μηχανών αναζήτησης" + +#: ../midori/midori-browser.c:3443 +msgid "Add, edit and remove search engines..." +msgstr "Προσθήκη, επεξεργασία και διαγραφή των μηχανών αναζήτησης..." + +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Καθαρισμός προσωπικών δεδομένων" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Καθαρισμός προσωπικών δεδομένων..." + +#: ../midori/midori-browser.c:3451 +msgid "_Previous Tab" +msgstr "_Προηγούμενη καρτέλα" + +#: ../midori/midori-browser.c:3452 +msgid "Switch to the previous tab" +msgstr "Μετάβαση στην προηγούμενη καρτέλα" + +#: ../midori/midori-browser.c:3454 +msgid "_Next Tab" +msgstr "Επόμε_νη καρτέλα" + +#: ../midori/midori-browser.c:3455 +msgid "Switch to the next tab" +msgstr "Μετάβαση στην επόμενη καρτέλα" + +#: ../midori/midori-browser.c:3457 +msgid "_Help" +msgstr "_Βοήθεια" + +#: ../midori/midori-browser.c:3459 +msgid "_Contents" +msgstr "_Περιεχόμενα" + +#: ../midori/midori-browser.c:3460 +msgid "Show the documentation" +msgstr "Εμφάνιση της τεκμηρίωσης" + +#: ../midori/midori-browser.c:3462 +msgid "_Frequent Questions" +msgstr "Σ_υχνές ερωτήσεις" + +#: ../midori/midori-browser.c:3463 +msgid "Show the Frequently Asked Questions" +msgstr "Εμφάνιση των πιο συχνά ερωτηθέντων ερωτήσεων" + +#: ../midori/midori-browser.c:3465 +msgid "_Report a Bug" +msgstr "Α_ναφορά σφάλματος" + +#: ../midori/midori-browser.c:3466 +msgid "Open Midori's bug tracker" +msgstr "Άνοιγμα καταγραφής σφαλμάτων midori" + +#: ../midori/midori-browser.c:3469 +msgid "Show information about the program" +msgstr "Εμφάνιση πληροφοριών σχετικά με την εφαρμογή" + +#: ../midori/midori-browser.c:3476 +msgid "P_rivate Browsing" +msgstr "Π_ροσωπική περιήγηση" + +#: ../midori/midori-browser.c:3477 +msgid "Don't save any private data while browsing" +msgstr "Να μην γίνει αποθήκευση προσωπικών δεδομένων κατά την περιήγηση" + +#: ../midori/midori-browser.c:3482 +msgid "_Menubar" +msgstr "_Μπάρα μενού" + +#: ../midori/midori-browser.c:3483 +msgid "Show menubar" +msgstr "Προβολή μπάρας μενού" + +#: ../midori/midori-browser.c:3486 +msgid "_Navigationbar" +msgstr "_Μπάρα περιήγησης" + +#: ../midori/midori-browser.c:3487 +msgid "Show navigationbar" +msgstr "Εμφάνιση περιήγησης" + +#: ../midori/midori-browser.c:3490 +msgid "Side_panel" +msgstr "Πλαϊνό _ταμπλό" + +#: ../midori/midori-browser.c:3491 +msgid "Show sidepanel" +msgstr "Εμφάνιση πλαϊνού ταμπλό" + +#: ../midori/midori-browser.c:3494 +msgid "_Bookmarkbar" +msgstr "_Μπάρα σελιδοδείκτη" + +#: ../midori/midori-browser.c:3495 +msgid "Show bookmarkbar" +msgstr "Εμφάνιση μπάρα σελιδοδείκτη" + +#: ../midori/midori-browser.c:3498 +msgid "_Transferbar" +msgstr "_Μπάρα μεταφορών" + +#: ../midori/midori-browser.c:3499 +msgid "Show transferbar" +msgstr "Εμφάνιση μπάρα μεταφορών" + +#: ../midori/midori-browser.c:3502 +msgid "_Statusbar" +msgstr "_Γραμμή κατάστασης" + +#: ../midori/midori-browser.c:3503 +msgid "Show statusbar" +msgstr "Εμφάνιση γραμμής κατάστασης" + +#: ../midori/midori-browser.c:3937 +msgid "_Separator" +msgstr "_Διαχωριστής" + +#: ../midori/midori-browser.c:3944 +msgid "_Location..." +msgstr "_Τοποθεσία:" + +#: ../midori/midori-browser.c:3946 +msgid "Open a particular location" +msgstr "Άνοιγμα συγκεκριμένης τοποθεσίας" + +#: ../midori/midori-browser.c:3970 +msgid "_Web Search..." +msgstr "_Αναζήτηση ιστού..." + +#: ../midori/midori-browser.c:3972 +msgid "Run a web search" +msgstr "Εκκίνηση μίας αναζήτησης ιστού" + +#: ../midori/midori-browser.c:3993 +msgid "Reopen a previously closed tab or window" +msgstr "Ξανα-άνοιγμα προηγούμενης καρτέλας ή παράθυρο που έχει κλείσει" + +#: ../midori/midori-browser.c:4006 +msgid "_Recently visited pages" +msgstr "_Πρόσφατες επισκεπτόμενες σελίδες " + +#: ../midori/midori-browser.c:4008 +msgid "Reopen pages that you visited earlier" +msgstr "Ξανα-άνοιγμα σελίδων που επισκεφτήκατε νωρίτερα" + +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 +msgid "_Bookmarks" +msgstr "_Σελιδοδείκτες" + +#: ../midori/midori-browser.c:4023 +msgid "Show the saved bookmarks" +msgstr "Εμφάνιση των αποθηκευμένων σελιδοδεικτών" + +#: ../midori/midori-browser.c:4036 +msgid "_Window" +msgstr "_Παράθυρο" + +#: ../midori/midori-browser.c:4038 +msgid "Show a list of all open tabs" +msgstr "Εμφάνιση μίας λίστας με όλα τις ανοιχτές καρτέλες" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4205 +msgid "_Inline Find:" +msgstr "Ε_νσωματωμένη αναζήτηση:" + +#: ../midori/midori-browser.c:4230 +msgid "Previous" +msgstr "Προηγούμενο" + +#: ../midori/midori-browser.c:4235 +msgid "Next" +msgstr "Επόμενο" + +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Ταίριασμα πεζών" -#: ../midori/midori-browser.c:4012 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Τονισμός των ταιριασμάτων" -#: ../midori/midori-browser.c:4021 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Κλείσιμο μπάρας εύρεσης" -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Αναπάντεχη ρύθμιση '%s'" -#: ../midori/midori-panel.c:223 ../midori/midori-panel.c:224 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Αποσύνδεση επιλεγμένου ταμπλό από το παράθυρο" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Εάν θα αποσυνδέεται το επιλεγμένο ταμπλό από το παράθυρο" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 +msgid "Align sidepanel on the right" +msgstr "Ευθυγράμμιση πλαϊνού ταμπλό στα δεξιά" + +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 +msgid "Whether to align the sidepanel on the right" +msgstr "Εάν θα ευθυγραμμίζεται το πλαϊνό ταμπλό στα δεξιά" + +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Κλείσιμο ταμπλού" -#: ../midori/midori-websettings.c:131 ../midori/midori-view.c:1635 +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Κενή σελίδα" -#: ../midori/midori-websettings.c:132 ../midori/midori-websettings.c:387 +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Αρχική σελίδα" -#: ../midori/midori-websettings.c:133 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Άνοιγμα τελευταίων σελίδων" -#: ../midori/midori-websettings.c:148 -msgid "Chinese (BIG5)" -msgstr "Κινέζικα (BIG5)" - -#: ../midori/midori-websettings.c:149 -msgid "Japanese (SHIFT_JIS)" -msgstr "Ιαπωνικά (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:150 -msgid "Russian (KOI8-R)" -msgstr "Ρωσικά (KOI8-R)" - -#: ../midori/midori-websettings.c:151 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:152 -msgid "Western (ISO-8859-1)" -msgstr "Δυτικά (ISO-8859-1)" - -#: ../midori/midori-websettings.c:153 -msgid "Custom..." -msgstr "Προσαρμογή..." - -#: ../midori/midori-websettings.c:168 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Νέα καρτέλα" -#: ../midori/midori-websettings.c:169 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Νέο παράθυρο" -#: ../midori/midori-websettings.c:170 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Τρέχον καρτέλα" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "Προκαθορισμένο" -#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Εικονίδια" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Κείμενο" -#: ../midori/midori-websettings.c:188 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Και τα δύο" -#: ../midori/midori-websettings.c:189 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Και τα δύο οριζόντια" -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "Όλα τα cookies" -#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "Cookies συνεδρίας" -#: ../midori/midori-websettings.c:206 ../panels/midori-addons.c:97 +#: ../midori/midori-websettings.c:258 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "Κανένα" -#: ../midori/midori-websettings.c:246 +#: ../midori/midori-websettings.c:274 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:275 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:276 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Απομνημόνευση μεγέθους τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:247 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" -msgstr "Αποθήκευση του μεγέθους του τελευταίου παραθύρου όπως και να έχει" +msgstr "Εάν θα αποθηκεύεται το μέγεθος του τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:255 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Πλάτος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "Το τελευταίο αποθηκευμένο πλάτος παραθύρου" -#: ../midori/midori-websettings.c:264 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Ύψος τελευταίου παραθύρου" -#: ../midori/midori-websettings.c:265 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "Το τελευταίο ύψος αποθηκευμένου παραθύρου" -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Θέση τελευταίου ταμπλό" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "Η τελευταία αποθηκευμένη θέση ταμπλό" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:283 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Τελευταία σελίδα ταμπλό" -#: ../midori/midori-websettings.c:284 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "Η τελευταία αποθηκευμένη σελίδα ταμπλό" -#: ../midori/midori-websettings.c:292 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "Τελευταία αναζήτηση ιστού" -#: ../midori/midori-websettings.c:293 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "Η τελευταία αποθηκευμένη αναζήτηση ιστού" -#: ../midori/midori-websettings.c:302 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Εμφάνιση γραμμής μενού" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" -msgstr "Εμφάνιση της μπάρας μενού όπως και να 'χει" +msgstr "Εάν θα φαίνεται η μπάρα του μενού" -#: ../midori/midori-websettings.c:311 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Εμφάνιση της γραμμής πλοήγησης" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" -msgstr "Εμφάνιση της γραμμής πλοήγησης όπως και να 'χει" +msgstr "Εάν θα φαίνεται η γραμμή πλοήγησης" -#: ../midori/midori-websettings.c:320 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Εμφάνιση μπάρας σελιδοδεικτών" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" -msgstr "Εμφάνιση μπάρας σελιλοδεικτών όπως και να 'χει" +msgstr "Εάν θα φαίνεται η μπάρα των σελιλοδεικτών" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Εμφάνιση ταμπλό" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" -msgstr "Εμφάνιση ταμπλό όπως και να 'χει" +msgstr "Εάν θα φαίνεται το ταμπλό" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:445 +msgid "Show Transferbar" +msgstr "Εμφάνιση μπάρας μεταφορών" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show the transferbar" +msgstr "Εάν θα φαίνεται η μπάρα μεταφορών" + +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" -msgstr "Εμφάνιση γραμμής κατάστασης όπως και να 'χει" +msgstr "Εάν θα φαίνεται η γραμμή κατάστασης" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Στυλ εργαλειοθήκης" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "Το στυλ της εργαλειοθήκης" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:481 +msgid "Show progress in location entry" +msgstr "Να εμφανίζεται η πρόοδος στην τοποθεσίας εισαγωγής" + +#: ../midori/midori-websettings.c:482 +msgid "Whether to show loading progress in the location entry" +msgstr "Εάν θα εμφανίζεται η φόρτωση προόδου στην τοποθεσία εισαγωγής" + +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "Εάν θα φαίνονται οι μηχανές αναζήτησης στην τοποθεσία συμπλήρωσης" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Αντικείμενα εργαλειοθήκης" -#: ../midori/midori-websettings.c:359 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" -msgstr "Τι αντικειμένα να εμφανίζονται στην εργαλειοθήκη" +msgstr "Τι αντικείμενα να εμφανίζονται στην εργαλειοθήκη" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Σύμπτυξη πλαϊνού ταμπλό" -#: ../midori/midori-websettings.c:368 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" -msgstr "Δημιουργία σύμπτυξης πλαϊνού ταμπλό όπως και να 'χει" +msgstr "Εάν θα γίνει σύμπτυξη του πλαϊνού ταμπλό" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "Να φορτώνεται στην εκκίνηση" -#: ../midori/midori-websettings.c:378 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Τι να φορτώνει κατά την εκκίνηση" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "Η αρχική σελίδα" -#: ../midori/midori-websettings.c:396 +#: ../midori/midori-websettings.c:567 +msgid "Show crash dialog" +msgstr "Εμφάνιση παραθύρου αποτυχίας" + +#: ../midori/midori-websettings.c:568 +msgid "Show a dialog after Midori crashed" +msgstr "Εμφάνιση διαλόγου μετά από αποτυχία" + +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Φάκελος μεταφορών" -#: ../midori/midori-websettings.c:397 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "Ο κατάλογος στον οποίο αποθηκεύονται τα αρχεία που κατεβαίνουν" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:406 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "Εξωτερικός διαχειριστής μεταφορών" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Κειμενογράφος" -#: ../midori/midori-websettings.c:415 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "Εξωτερικός κειμενογράφος" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Διαχειριστής νέων" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "Εξωτερικός διαχειριστής νέων" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Διεύθυνση για αναζήτηση" -#: ../midori/midori-websettings.c:424 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "Η αναζήτηση να πραγματοποιηθεί εσωτερικά της τοποθεσίας εισαγωγής" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Προτιμώμενη κωδικοποίηση" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων" -#: ../midori/midori-websettings.c:443 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Εμφάνιση πάντα της γραμμής καρτέλων" -#: ../midori/midori-websettings.c:444 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" -msgstr "Εμφάνιση πάντα της γραμμής καρτέλων" +msgstr "Εμφάνιση πάντα της μπάρας με τις καρτέλες" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" -msgstr "Κουμπιά κλεισίματος σε καρτέλες" +msgstr "Κουμπιά κλεισίματος στις καρτέλες" -#: ../midori/midori-websettings.c:453 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" -msgstr "Οι καρτέλες έχουν κουμπιά κλεισίματος όπως και να 'χει" +msgstr "Εάν οι καρτέλες θα έχουν κουμπί κλεισίματος" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Άνοιγμα νέων σελίδων σε" -#: ../midori/midori-websettings.c:463 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Που να ανοίγουν οι νέες σελίδες" -#: ../midori/midori-websettings.c:473 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Άνοιγμα εξωτερικών σελίδων σε" -#: ../midori/midori-websettings.c:474 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Που να ανοίγουν οι εξωτερικές ανοιγμένες σελίδες" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Το μεσαίο κλικ ανοίγει την Επιλογή" -#: ../midori/midori-websettings.c:484 -msgid "Load an URL from the selection via middle click" -msgstr "Φόρτωση ενός URL από την επιλογή μέσω του μεσαίου κλικ" +#: ../midori/midori-websettings.c:686 +msgid "Load an address from the selection via middle click" +msgstr "Φόρτωση μίας διεύθυνσης από την επιλογή μέσω του μεσαίου κλικ" -#: ../midori/midori-websettings.c:492 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" -msgstr "Άνοιγμα καρτέλων στο παρασκήνιο" +msgstr "Άνοιγμα των καρτελών στο παρασκήνιο" -#: ../midori/midori-websettings.c:493 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" -msgstr "Άνοιγμα νέων καρτέλων στο παρασκήνιο όπως και να 'χει" +msgstr "Εάν θα ανοίγονται νέες καρτέλες στο παρασκήνιο" -#: ../midori/midori-websettings.c:501 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" -msgstr "Άνοιγμα καρτέλων δίπλα στο τρέχων" +msgstr "Άνοιγμα των καρτελών δίπλα στο τρέχων" -#: ../midori/midori-websettings.c:502 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "" -"Άνοιγμα νέων καρτέλων δίπλα στην τρέχων καρτέλα ή πίσω από το τελευταίο όπως " -"και να 'χει" +msgstr "Εάν θα ανοίγονται νέες καρτέλες δίπλα στην τρέχουσα καρτέλα ή μετά την τελευταία" -#: ../midori/midori-websettings.c:510 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες" -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" -msgstr "Άνοιγμα αναδυόμενων παραθύρων σε καρτέλες όπως και να 'χει" +msgstr "Εάν θα ανοίγονται τα αναδυόμενα παράθυρα σε καρτέλες" -#: ../midori/midori-websettings.c:537 +#: ../midori/midori-websettings.c:729 +msgid "Zoom Text and Images" +msgstr "Εστίαση κειμένου και εικόνων" + +#: ../midori/midori-websettings.c:730 +msgid "Whether to zoom text and images" +msgstr "Εάν θα εστιάζεται το κείμενο και οι εικόνες" + +#: ../midori/midori-websettings.c:745 +msgid "Find inline while typing" +msgstr "Ενσωματωμένη εύρεση κατά την πληκτρολόγηση" + +#: ../midori/midori-websettings.c:746 +msgid "Whether to automatically find inline while typing" +msgstr "Εάν θα γίνεται αυτόματη ενσωματωμένη αναζήτηση κατά την πληκτρολόγηση" + +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "Αποδοχή cookies" -#: ../midori/midori-websettings.c:538 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "Τι τύπο cookies να γίνονται αποδεκτά" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" -msgstr "Πρωτότυπα cookies μόνο" +msgstr "Μόνο πρωτότυπα cookies" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" msgstr "Αποδοχή cookies μόνο από πρωτότυπους ιστότοπους" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "Μέγιστος χρόνος cookie" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" -msgstr "Το μέγιστο σε μέρες για να αποθηκεύονται τα cookies " +msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση των cookies" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" -msgstr "Απομνημόνευση των τελευταίων επισκεπτόμενων σελίδων όπως και να 'χει" +msgstr "Εάν θα αποθηκεύονται οι τελευταίες επισκεπτόμενες σελίδες" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Μέγιστο χρόνος ιστορικού" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "Ο μέγιστος χρόνος σε μέρες για την αποθήκευση του ιστορικού" -#: ../midori/midori-websettings.c:585 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Απομνημόνευση των τελευταίων εισαγωγών" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" -msgstr "Απομνημόνευση των τελευταίων εισαγωγών όπως και να 'χει" +msgstr "Εάν θα αποθηκεύονται οι τελευταίες εισαγωγές φορμών" -#: ../midori/midori-websettings.c:594 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Απομνημόνευση των τελευταίων αρχείων που κατέβηκαν" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" -msgstr "Που αποθηκεύτηκαν τα τελευταία αρχεία που κατέβηκαν" +msgstr "Εάν θα αποθηκεύονται τα τελευταία αρχεία που κατέβηκαν" -#: ../midori/midori-websettings.c:605 -msgid "HTTP Proxy" -msgstr "Μεσολαβητής http" +#: ../midori/midori-websettings.c:822 +msgid "Proxy Server" +msgstr "Διακομιστής μεσολάβησης" -#: ../midori/midori-websettings.c:606 -msgid "The proxy used for HTTP connections" -msgstr "Χρησιμοποιείται μεσολαβητής για http συνδέσεις" +#: ../midori/midori-websettings.c:823 +msgid "The proxy server used for HTTP connections" +msgstr "Ο μεσολαβητής χρησιμοποιείται για http συνδέσεις" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:838 +msgid "Detect proxy server automatically" +msgstr "Αυτόματη εύρεση διακομιστή μεσολάβησης" + +#: ../midori/midori-websettings.c:839 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Εάν θα εντοπίζεται αυτόματα από το περιβάλλον ο διακομιστής μεσολάβησης" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:855 +msgid "Identify as" +msgstr "Αναγνώριση ως" + +#: ../midori/midori-websettings.c:856 +msgid "What to identify as to web pages" +msgstr "Με τι να αναγνωρίζεται στις σελίδες ιστού" + +#: ../midori/midori-websettings.c:872 +msgid "Identification string" +msgstr "Αλφαριθμητικό αναγνώρισης" + +#: ../midori/midori-websettings.c:873 +msgid "The application identification string" +msgstr "Το αλφαριθμητικό αναγνώρισης της εφαρμογής" + +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Μέγεθος προσωρινής μνήμης" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "Το επιτρεπόμενο μέγεθος της προσωρινής μνήμης" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:632 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "Δεν βρέθηκε - %s" -#: ../midori/midori-view.c:902 +#: ../midori/midori-view.c:976 +msgid "Open _Link" +msgstr "Άνοιγμα _συνδέσμου" + +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Άνοιγμα συνδέσμου σε νέα κ_αρτέλα" -#: ../midori/midori-view.c:925 -msgid "_Save Link destination" -msgstr "Απ_οθήκευση συνδέσμου προορισμού" +#: ../midori/midori-view.c:995 +msgid "Open Link in New _Window" +msgstr "Άνοιγμα συνδέσμου σε νέο _παραθύρο" -#: ../midori/midori-view.c:933 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "Κ_ατέβασμα συνδέσμου προορισμού" -#: ../midori/midori-view.c:955 -msgid "Open URL in New _Tab" -msgstr "Άνοιγμα URL σε νέα κ_αρτέλα" +#: ../midori/midori-view.c:1010 +msgid "_Save Link destination" +msgstr "Απ_οθήκευση συνδέσμου προορισμού" -#: ../midori/midori-view.c:1365 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Κατέβασμα με τον διαχειριστή μεταφορών" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Αναζήτηση _με" + +#: ../midori/midori-view.c:1076 +msgid "_Search the Web" +msgstr "_Αναζήτηση στον ιστό" + +#: ../midori/midori-view.c:1086 +msgid "Open Address in New _Tab" +msgstr "Άνοιγμα διεύθυνσης σε νέα_καρτέλα" + +#: ../midori/midori-view.c:1234 +msgid "Open or download file" +msgstr "Άνοιγμα ή κατέβασμα αρχείου" + +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "Τύπος αρχείου: '%s'" + +#: ../midori/midori-view.c:1254 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Τύπος αρχείου: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1258 +#, c-format +msgid "Open %s" +msgstr "Άνοιγμα %s" + +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Εξέταση σελίδα -%s" -#: ../midori/midori-view.c:1503 -msgid "Source" -msgstr "Πηγή" +#: ../midori/midori-view.c:1806 +#, c-format +msgid "Document cannot be displayed" +msgstr "Το αρχείο δεν μπορεί να εμφανιστεί" -#: ../midori/midori-view.c:1527 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "Δεν έχει εγκατασταθεί τεκμηρίωση" -#: ../midori/midori-preferences.c:87 +#: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" msgstr "Προτιμήσεις για %s" #. Page "General" -#: ../midori/midori-preferences.c:338 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "Γενικά" -#: ../midori/midori-preferences.c:339 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Εκκίνηση" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Τρέχουσα σελίδα ως αρχική" + +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Μεταφορές" + #. Page "Appearance" -#: ../midori/midori-preferences.c:386 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Εμφάνιση" -#: ../midori/midori-preferences.c:387 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Ρυθμίσεις γραμματοσειράς" -#: ../midori/midori-preferences.c:389 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Προεπιλεγμένη οικογένεια γραμματοσειράς" -#: ../midori/midori-preferences.c:397 +#: ../midori/midori-preferences.c:484 +msgid "The default font size used to display text" +msgstr "Το προκαθορισμένο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" + +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Ελάχιστο μέγεθος γραμματοσειράς" +#: ../midori/midori-preferences.c:490 +msgid "The minimum font size used to display text" +msgstr "Το ελάχιστο μέγεθος γραμματοσειράς για την εμφάνιση του κειμένου" + +#: ../midori/midori-preferences.c:497 +msgid "Encoding" +msgstr "Κωδικοποίηση" + +#: ../midori/midori-preferences.c:500 +msgid "The character encoding to use by default" +msgstr "Η προτιμώμενη κωδικοποίηση χαρακτήρων προς χρήση" + #. Page "Behavior" -#: ../midori/midori-preferences.c:407 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Συμπεριφορά" -#: ../midori/midori-preferences.c:408 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Χαρακτηριστικά" -#: ../midori/midori-preferences.c:411 ../extensions/statusbar-features.c:32 +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Αυτόματη φόρτωση εικόνων" -#: ../midori/midori-preferences.c:414 +#: ../midori/midori-preferences.c:512 +msgid "Load and display images automatically" +msgstr "Αυτόματη φόρτωση και εμφάνιση εικόνων" + +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Αυτόματη σμίκρυνσης εικόνων" -#: ../midori/midori-preferences.c:417 +#: ../midori/midori-preferences.c:516 +msgid "Automatically shrink standalone images to fit" +msgstr "Αυτόματη σμίκρυνση αυτόνομων εικόνων για ταίριασμα" + +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Εκτύπωση εικόνων παρασκηνίου" -#: ../midori/midori-preferences.c:420 +#: ../midori/midori-preferences.c:520 +msgid "Whether background images should be printed" +msgstr "Εάν θα τυπώνονται οι εικόνες παρασκηνίου" + +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Αυξομείωση περιοχών κειμένου" -#: ../midori/midori-preferences.c:423 ../extensions/statusbar-features.c:39 +#: ../midori/midori-preferences.c:524 +msgid "Whether text areas are resizable" +msgstr "Εάν οι περιοχές κειμένου μπορούν να αλλάζουν μέγεθος" + +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Ενεργοποίηση σεναρίων" -#: ../midori/midori-preferences.c:426 ../extensions/statusbar-features.c:46 +#: ../midori/midori-preferences.c:528 +msgid "Enable embedded scripting languages" +msgstr "Ενεργοποίηση ενσωματωμένων γλωσσών κειμένου" + +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Ενεργοποίηση αρθρωμάτων" -#: ../midori/midori-preferences.c:429 +#: ../midori/midori-preferences.c:532 +msgid "Enable embedded plugin objects" +msgstr "Ενεργοποίηση ενσωματωμένων αρθρωμάτων αντικειμένων" + +#: ../midori/midori-preferences.c:535 +msgid "Enforce 96 dots per inch" +msgstr "Επιβολή 96 dots ανά ίντσα" + +#: ../midori/midori-preferences.c:536 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Επιβολή της πυκνότητας βίντεο dot στα 96DPI" + +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "Ενεργοποίηση εργαλείων ανάπτυξης" +#: ../midori/midori-preferences.c:540 +msgid "Enable special extensions for developers" +msgstr "Ενεργοποίηση συγκεκριμένων επεκτάσεων για προγραμματιστές" + #. Page "Interface" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "Διεπαφή" -#: ../midori/midori-preferences.c:438 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" -msgstr "Γραμμή πλοηγήσης" +msgstr "Γραμμή πλοήγησης" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "Περιήγηση" -#: ../midori/midori-preferences.c:480 ../midori/midori-preferences.c:481 +#. Page "Network" +#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:591 msgid "Network" msgstr "Δίκτυο" -#: ../midori/midori-preferences.c:492 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "ΜΒ" #. Page "Privacy" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "Προσωπικό απόρρητο" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "Cookies ιστού" -#: ../midori/midori-preferences.c:513 ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:637 +#: ../midori/midori-preferences.c:647 msgid "days" msgstr "ημέρες" -#: ../midori/midori-searchaction.c:456 ../katze/katze-arrayaction.c:273 +#: ../midori/midori-searchaction.c:484 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Άδειο" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Προσθήκη μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:797 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Επεξεργασία μηχανής αναζήτησης" -#: ../midori/midori-searchaction.c:825 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Όνομα:" -#: ../midori/midori-searchaction.c:869 -msgid "_Icon (name or file):" -msgstr "Ει_κονίδιο (όνομα ή αρχείο):" +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "_Εικονίδιο:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Μορφότυπο:" -#: ../midori/midori-searchaction.c:1060 -msgid "Manage search engines" -msgstr "Διαχείριση μηχανών αναζήτησης" +#: ../midori/midori-searchaction.c:1195 +msgid "Manage Search Engines" +msgstr "Διαχείριση των μηχανών αναζήτησης" -#: ../midori/sokoke.c:63 ../midori/sokoke.c:75 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Χρήση ως _προκαθορισμένο" + +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "Δεν μπορεί να εκτελεστεί το εξωτερικό πρόγραμμα." -#: ../midori/sokoke.c:282 +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Προειδοποίηση: Χρησιμοποιείται λογαριασμό με δικαιώματα διαχειριστή" -#: ../midori/gjs.c:514 -msgid "An unknown error occured." -msgstr "Συνέβει ένα άγνωστο σφάλμα." +#: ../midori/sokoke.c:780 +msgid "_Bookmark" +msgstr "_Σελιδοδείκτης" -#: ../midori/gjs.c:742 ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s δεν έχει ιδιότητα '%s'" +#: ../midori/sokoke.c:782 +msgid "_Add Bookmark" +msgstr "_Προσθήκη σελιδοδείκτη" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s δεν μπορεί να οριστεί στο %s.%s" +#: ../midori/sokoke.c:783 +msgid "_Console" +msgstr "_Τερματικό" -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s δεν μποορεί να προσπελαστεί" +#: ../midori/sokoke.c:784 +msgid "_Extensions" +msgstr "_Επεκτάσεις" -#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:144 +#: ../midori/sokoke.c:785 +msgid "_History" +msgstr "_Ιστορικό" + +#: ../midori/sokoke.c:786 +msgid "_Homepage" +msgstr "_Αρχική σελίδα" + +#: ../midori/sokoke.c:787 +msgid "_Userscripts" +msgstr "_Σενάρια χρήστη" + +#: ../midori/sokoke.c:788 +msgid "User_styles" +msgstr "_Θέματα χρήστη" + +#: ../midori/sokoke.c:789 +msgid "New _Tab" +msgstr "Νέα _καρτέλα" + +#: ../midori/sokoke.c:790 +msgid "_Transfers" +msgstr "_Μεταφορές" + +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "Αρ_θρώματα" + +#: ../midori/sokoke.c:792 +msgid "_Closed Tabs and Windows" +msgstr "_Κλείσιμο των καρτέλων και των παραθύρων" + +#: ../midori/sokoke.c:793 +msgid "New _Window" +msgstr "Νέο _παράθυρο" + +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Σενάρια χρηστών" -#: ../panels/midori-addons.c:99 ../panels/midori-addons.c:146 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Θέματα χρήστη" -#: ../panels/midori-addons.c:1006 ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:927 +#: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Ενεργοποίηση" -#: ../panels/midori-addons.c:1015 ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:928 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Ενεργοποίηση" + +#: ../panels/midori-addons.c:937 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Απενεργοποίηση" +#: ../panels/midori-addons.c:938 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Απενεργοποίηση" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Σελιδοδείκτες" + +#: ../panels/midori-bookmarks.c:240 +msgid "Edit the selected bookmark" +msgstr "Επεξεργασία του επιλεγμένου σελιδοδείκτη" + +#: ../panels/midori-bookmarks.c:248 +msgid "Delete the selected bookmark" +msgstr "Διαγραφή του επιλεγμένου σελιδοδείκτη" + +#: ../panels/midori-bookmarks.c:593 +msgid "Separator" +msgstr "Διαχωριστικό" + #: ../panels/midori-console.c:87 msgid "Console" msgstr "Τερματικό" @@ -1309,50 +1661,244 @@ msgstr "Τερματικό" msgid "Extensions" msgstr "Επεκτάσεις" +#: ../panels/midori-history.c:163 +msgid "Are you sure you want to remove all history items?" +msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα αντικείμενα του ιστορικού;" + +#: ../panels/midori-history.c:218 +msgid "Bookmark the selected history item" +msgstr "Σελιδοποίησε το επιλεγμένο αντικείμενο του ιστορικού" + +#: ../panels/midori-history.c:227 +msgid "Delete the selected history item" +msgstr "Διαγραφή του επιλεγμένου αντικειμένου από το ιστορικό" + +#: ../panels/midori-history.c:235 +msgid "Clear the entire history" +msgstr "Καθαρισμός ολόκληρου του ιστορικού" + +#: ../panels/midori-history.c:600 +#, c-format +msgid "A week ago" +msgstr "Μια βδομάδα πριν" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d days ago" +msgstr "%d μέρες πριν" + +#: ../panels/midori-history.c:613 +msgid "Today" +msgstr "Σήμερα" + +#: ../panels/midori-history.c:615 +msgid "Yesterday" +msgstr "Χθες" + +#: ../panels/midori-plugins.c:87 +msgid "Plugins" +msgstr "Αρθρώματα" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s από %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Απαιτείται αυθεντικοποίηση" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Απαιτείται ένα όνομα χρήσης και ένα συνθηματικό\n" +"για το άνοιγμα της τοποθεσίας:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Όνομα χρήσης" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Συνθηματικό" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" -msgstr "Το εικονίδο Named '%s' δεν μπορεί να φορτωθεί" +msgstr "Το εικονίδιο Named '%s' δεν μπορεί να φορτωθεί" #: ../katze/katze-throbber.c:841 #, c-format msgid "Stock icon '%s' couldn't be loaded" -msgstr "Το εικονίδο Stock '%s' δεν μπορεί να φορτωθεί" +msgstr "Το εικονίδιο Stock '%s' δεν μπορεί να φορτωθεί" #: ../katze/katze-throbber.c:907 msgid "Animation frames are broken" msgstr "Τα κινούμενα γραφικά πλαίσια δεν λειτουργούν" -#: ../katze/katze-utils.c:154 ../katze/katze-utils.c:352 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Η ιδιότητα '%s' δεν είναι έγκυρη για το %s" -#: ../katze/katze-utils.c:178 ../katze/katze-utils.c:217 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Επιλογή αρχείου" -#: ../katze/katze-utils.c:198 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Επιλογή φακέλου" +#: ../extensions/colorful-tabs.c:104 +msgid "Tint tabs distinctly" +msgstr "Ευκρινές αποχρώσεις καρτελών" + +#: ../extensions/colorful-tabs.c:140 +msgid "Colorful Tabs" +msgstr "Χρωματιστές καρτέλες" + +#: ../extensions/colorful-tabs.c:141 +msgid "Tint each tab distinctly" +msgstr "Ευκρινές αποχρώσεις σε κάθε καρτέλα" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Στο τέλος της συνεδρίας" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Διακομιστής: %s\n" +"Όνομα: %s\n" +"Τιμή: %s\n" +"Διαδρομή: %s\n" +"Ασφάλεια: %s\n" +"Λήγει: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Ναι" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Όχι" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλα τα cookies;" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "Ερώτηση" + +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "Μόνο τα cookies που φαίνονται θα διαγραφούν τα οποία ταιριάζουν με το αλφαριθμητικό φίλτρο που εισάγεται." + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "Όνομα" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "_Ανάπτυξη όλων" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "_Μάζεμα όλων" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "Διαγραφή όλων" + +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Διαγράφει όλα τα cookies που φαίνονται. Εάν ένα φίλτρο έχει δοθεί, μόνο τα cookies που ταιριάζουν στο φίλτρο θα διαγραφούν." + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Ανάπτυξη όλων" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "Μάζεμα όλων" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Φίλτρο:" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Εισαγωγή ενός αλφαριθμητικού φίλτρου για να φαίνονται μόνο τα cookies που το όνομα ή το πεδίο τομέα ταιριάζει με το φίλτρο που εισάγεται" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Διαχειριστής cookie" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "_Διαχειριστής cookie" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "Λίστα, εμφάνιση και διαγραφή cookies" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Κινήσεις ποντικιού" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Χειρισμός του midori μετακινώντας το ποντίκι" + #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:109 ../extensions/page-holder.c:144 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Αποθήκευση Σελίδων" -#: ../extensions/page-holder.c:128 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "_Αποθήκευση σελίδων" -#: ../extensions/statusbar-features.c:30 -msgid "Images" -msgstr "Εικόνες" +#~ msgid "URIs" +#~ msgstr "URIs" +#~ msgid "[URIs]" +#~ msgstr "[URIs]" +#~ msgid "_URL:" +#~ msgstr "_Διεύθυνση:" +#~ msgid "Root" +#~ msgstr "Ρίζα" +#~ msgid "HTTP Proxy" +#~ msgstr "Μεσολαβητής http" +#~ msgid "Open URL in New _Tab" +#~ msgstr "Άνοιγμα URL σε νέα κ_αρτέλα" +#~ msgid "Source" +#~ msgstr "Πηγή" +#~ msgid "_Icon (name or file):" +#~ msgstr "Ει_κονίδιο (όνομα ή αρχείο):" +#~ msgid "Manage search engines" +#~ msgstr "Διαχείριση μηχανών αναζήτησης" +#~ msgid "%s has no property '%s'" +#~ msgstr "%s δεν έχει ιδιότητα '%s'" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s δεν μπορεί να οριστεί στο %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s δεν μπορεί να προσπελαστεί" +#~ msgid "Images" +#~ msgstr "Εικόνες" +#~ msgid "Scripts" +#~ msgstr "Σενάρια" -#: ../extensions/statusbar-features.c:37 -msgid "Scripts" -msgstr "Σενάρια" - -#: ../extensions/statusbar-features.c:44 -msgid "Plugins" -msgstr "Αρθρώματα" From b55c5bd5874260ec0a29571f7a047fdada4d3d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Tue, 21 Apr 2009 21:59:43 +0200 Subject: [PATCH 1029/2970] Update Portuguese translation --- po/pt_PT.po | 1105 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 642 insertions(+), 463 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index c353688f..344ba6df 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Midori 0.1.5\n" +"Project-Id-Version: Midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-22 22:19+0100\n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese \n" @@ -20,11 +20,11 @@ msgid "Lightweight web browser" msgstr "Navegador Web leve" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1580 -#: ../midori/main.c:1672 -#: ../midori/main.c:1681 -#: ../midori/main.c:1692 -#: ../midori/midori-websettings.c:269 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -32,1207 +32,1312 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador Web" -#: ../midori/main.c:103 +#: ../midori/main.c:94 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "A configuração não foi carregada: %s\n" -#: ../midori/main.c:158 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "O valor '%s' é inválido para %s" -#: ../midori/main.c:165 -#: ../midori/main.c:235 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuração inválido '%s'" -#: ../midori/main.c:477 -msgid "File not found." -msgstr "Ficheiro não encontrado." - -#: ../midori/main.c:485 -#: ../midori/main.c:494 -msgid "Malformed document." -msgstr "Documento mal formado." - -#: ../midori/main.c:516 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "Falha ao abrir a base de dados: %s\n" -#: ../midori/main.c:548 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Falha ao executar a declaração da base de dados: %s\n" -#: ../midori/main.c:602 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Falha ao remover histórico: %s\n" -#: ../midori/main.c:626 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "Falha ao limpar histórico: %s\n" -#: ../midori/main.c:649 -#: ../midori/main.c:683 -#: ../midori/main.c:699 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "Falha ao adicionar histórico: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:879 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Falha ao remover histórico antigo: %s\n" -#: ../midori/main.c:907 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "A configuração não foi guardada. %s" -#: ../midori/main.c:936 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Os motores de pesquisa não foram guardados. %s" -#: ../midori/main.c:1066 -#: ../midori/sokoke.c:617 -#, c-format -msgid "Writing failed." -msgstr "Falhou escrita." - -#: ../midori/main.c:1087 -#: ../midori/main.c:1114 -#: ../midori/main.c:1142 +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Os marcadores não foram guardados. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1166 -#: ../midori/main.c:1190 +#: ../midori/main.c:850 +#: ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "O lixo não foi guardado. %s" -#: ../midori/main.c:1261 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "A sessão não foi guardada. %s" -#: ../midori/main.c:1377 -msgid "Midori seems to have crashed the last time it was opened. If this happend repeatedly, try one of the following options to solve the problem." +#: ../midori/main.c:1073 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "O Midori encerrou abruptamente da última vez que foi aberto. Se isto ocorrer repetidamente, tente uma das seguintes opções para resolver o problema." -#: ../midori/main.c:1392 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "Modificar _preferências" -#: ../midori/main.c:1396 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "Restaurar última _sessão" -#: ../midori/main.c:1401 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "Desactivar todas as _extensões" -#: ../midori/main.c:1580 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "Nenhum nome especificado" -#: ../midori/main.c:1603 -#: ../midori/gjs.c:515 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "Ocorreu um erro desconhecido." -#: ../midori/main.c:1626 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Executar ENDEREÇO como aplicação web" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "ENDEREÇO" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Usar PASTA como pasta de configuração" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "PASTA" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "Executar o ficheiro especificado como argumento java" -#: ../midori/main.c:1628 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "Apresentar versão do programa" -#: ../midori/main.c:1630 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "Endereços " -#: ../midori/main.c:1669 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[Endereços]" -#: ../midori/main.c:1693 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor reporte comentários, sugestões e erros para:" -#: ../midori/main.c:1695 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "Verificar por novas versões a:" -#: ../midori/main.c:1722 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "A pasta de configuração especificada é inválida" + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "Já existe uma instância de Midori em execução mas que não está respondendo.\n" -#: ../midori/main.c:1772 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Os motores de pesquisa não foram carregados. %s\n" -#: ../midori/main.c:1784 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Os marcadores não foram carregados: %s\n" -#: ../midori/main.c:1799 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "A sessão não foi carregada: %s\n" -#: ../midori/main.c:1812 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "O lixo não foi carregado: %s\n" -#: ../midori/main.c:1825 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "O histórico não foi carregado: %s\n" -#: ../midori/main.c:1837 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "Ocorreram os seguintes erros:" -#: ../midori/main.c:1853 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "_Ignorar " -#: ../midori/midori-browser.c:278 -#: ../midori/midori-browser.c:3262 -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Ficheiro não encontrado." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Documento mal formado." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Falhou escrita." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Recarregar página actual" -#: ../midori/midori-browser.c:289 -#: ../midori/midori-browser.c:3265 +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Parar o carregamento da página actual" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% carregado" -#: ../midori/midori-browser.c:376 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Acção inesperada '%s'." -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "New folder" msgstr "Nova pasta" -#: ../midori/midori-browser.c:553 +#: ../midori/midori-browser.c:541 msgid "Edit folder" msgstr "Editar pasta" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Novo marcador" -#: ../midori/midori-browser.c:555 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:585 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:598 -#: ../midori/midori-searchaction.c:855 +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Descrição:" -#: ../midori/midori-browser.c:617 -#: ../midori/midori-searchaction.c:869 +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "_Endereço:" -#: ../midori/midori-browser.c:636 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Pasta:" -#: ../midori/midori-browser.c:641 -#: ../midori/midori-browser.c:682 +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "Pasta Superior" -#: ../midori/midori-browser.c:762 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Guardar como" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:2837 -#: ../panels/midori-bookmarks.c:776 -#: ../panels/midori-history.c:810 +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 msgid "Open all in _Tabs" msgstr "Abrir todas em _Separadores" -#: ../midori/midori-browser.c:2844 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:816 +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "Abrir em Novo _Separador" -#: ../midori/midori-browser.c:2847 -#: ../panels/midori-bookmarks.c:784 -#: ../panels/midori-history.c:818 +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "Abrir em Nova _Janela" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Limpar Dados Privados" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Limpar dados privados" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Limpar os seguintes dados:" + +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Histórico" + #: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "Cookies 'Flash'" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Ícones de sítios Web" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "Um navegador web leve." -#: ../midori/midori-browser.c:3009 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "Sérgio Marques " -#: ../midori/midori-browser.c:3196 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "_Ficheiro" -#: ../midori/midori-browser.c:3199 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "Abrir nova janela" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "Abrir novo separador" -#: ../midori/midori-browser.c:3205 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "Abrir ficheiro" -#: ../midori/midori-browser.c:3208 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "Guardar para ficheiro" -#: ../midori/midori-browser.c:3210 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "_Fechar Separador" -#: ../midori/midori-browser.c:3211 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "Fechar separador actual" -#: ../midori/midori-browser.c:3213 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "Fechar Jane_la" -#: ../midori/midori-browser.c:3214 +#: ../midori/midori-browser.c:3320 msgid "Close this window" msgstr "Fechar esta janela" -#: ../midori/midori-browser.c:3217 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "Imprimir página actual" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "Sair da aplicação" -#: ../midori/midori-browser.c:3222 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3225 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "Cortar o texto seleccionado" -#: ../midori/midori-browser.c:3228 -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "Copiar o texto seleccionado" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "Colar itens da área de transferência" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "Eliminar o texto seleccionado" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "Seleccionar tudo" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "Localizar uma palavra ou frase na página" -#: ../midori/midori-browser.c:3245 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "Localizar _Próxima" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "Localizar próxima ocorrência da palavra ou frase" -#: ../midori/midori-browser.c:3248 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "Localizar _Anterior" -#: ../midori/midori-browser.c:3249 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "Localizar a ocurrência anterior de uma palavra ou frase" -#: ../midori/midori-browser.c:3252 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "Localização _Rápida" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "Avanço rápido para palavra ou frase" -#: ../midori/midori-browser.c:3256 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "Configurar preferências da aplicação" -#: ../midori/midori-browser.c:3258 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "_Barra de Ferramentas" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "Aumentar Zoom" -#: ../midori/midori-browser.c:3274 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "Diminuir Zoom" -#: ../midori/midori-browser.c:3277 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "Restaurar Zoom" -#: ../midori/midori-browser.c:3278 +#: ../midori/midori-browser.c:3384 msgid "_Encoding" msgstr "_Codificação" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3386 msgid "_Automatic" msgstr "_Automático" -#: ../midori/midori-browser.c:3283 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3389 +#: ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "Chinês (BIG5)" -#: ../midori/midori-browser.c:3286 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3392 +#: ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "Japonês (SHIFT_JIS)" -#: ../midori/midori-browser.c:3289 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "Russo (KOI8-R)" -#: ../midori/midori-browser.c:3292 -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3295 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "Ocidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3298 -#: ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "Personalizar..." -#: ../midori/midori-browser.c:3301 -#: ../midori/midori-view.c:1111 +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 msgid "View _Source" msgstr "Ver _Origem" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "Ver código fonte da página" -#: ../midori/midori-browser.c:3304 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "Ver Origem da Selecção" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "Ver código fonte da selecção" -#: ../midori/midori-browser.c:3309 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "Alternar para ecrã completo" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "Ir para página anterior" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "Ir para página seguinte" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "Ir para página inicial" -#: ../midori/midori-browser.c:3322 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "Esvaziar Lixo" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "Eliminar conteúdos do lixo" -#: ../midori/midori-browser.c:3325 -#: ../midori/midori-view.c:1083 +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "Desfazer Fecho de Separador" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "Abrir último separador fechado" -#: ../midori/midori-browser.c:3330 -#: ../panels/midori-bookmarks.c:228 +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "Adicionar novo marcador" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Adicionar nova pasta" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Adicionar nova pasta de marcadores" + +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "_Ferramentas" -#: ../midori/midori-browser.c:3333 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Gerir _Motores de Pesquisa" -#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "Adicionar, editar e remover motores de pesquisa..." -#: ../midori/midori-browser.c:3338 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "'Flash'" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Limpar dados privados..." + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../midori/midori-browser.c:3339 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "Mudar para separador anterior" -#: ../midori/midori-browser.c:3341 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "_Próximo Separador" -#: ../midori/midori-browser.c:3342 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "Trocar para próximo separador" -#: ../midori/midori-browser.c:3344 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "_Ajuda" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "_Conteúdos" -#: ../midori/midori-browser.c:3347 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "Mostrar documentação" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "Questões _Frequentes" -#: ../midori/midori-browser.c:3350 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "Mostrar Questões Frequentes" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "_Reportar Erro" -#: ../midori/midori-browser.c:3353 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "Abrir Midori's bug tracker" -#: ../midori/midori-browser.c:3356 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "Mostrar informação sobre o programa" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "Navegação P_rivada" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "Não guardar quaisquer dados privados ao navegar" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "Barra de _Menu" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "Mostrar barra de menu" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "Barra de _Navegação" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "Mostrar barra de navegação" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "Pai_nel lateral" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "Mostrar painel lateral" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "_Barra de Marcadores" -#: ../midori/midori-browser.c:3382 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "Mostrar barra de marcadores" -#: ../midori/midori-browser.c:3385 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "Barra de _Transferências" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "Barra de _Estado" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../midori/midori-browser.c:3821 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:3828 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "_Localização..." -#: ../midori/midori-browser.c:3830 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "Abrir localização específica" -#: ../midori/midori-browser.c:3854 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." msgstr "Pesquisa _Web..." -#: ../midori/midori-browser.c:3856 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" msgstr "Executar uma pesquisa web" -#: ../midori/midori-browser.c:3875 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" msgstr "Reabrir janela ou separador anteriormente fechado" -#: ../midori/midori-browser.c:3888 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "Páginas _Recentes" -#: ../midori/midori-browser.c:3890 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" msgstr "Reabrir páginas visitadas anteriormente" -#: ../midori/midori-browser.c:3903 -#: ../midori/sokoke.c:772 +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../midori/midori-browser.c:3905 +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "Mostrar marcadores guardados" -#: ../midori/midori-browser.c:3918 +#: ../midori/midori-browser.c:4036 msgid "_Window" msgstr "_Janela" -#: ../midori/midori-browser.c:3920 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "Mostrar lista de separadores abertos" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4085 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "Localizar:" -#: ../midori/midori-browser.c:4110 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:4115 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "Seguinte" -#: ../midori/midori-browser.c:4120 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Maiúsculas e Minúsculas" -#: ../midori/midori-browser.c:4128 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Realçar Correspondências" -#: ../midori/midori-browser.c:4138 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Fechar" -#: ../midori/midori-browser.c:4444 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Definição inesperada '%s'" -#: ../midori/midori-panel.c:229 -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Separar da janela o painel escolhido" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Se quer separar da janela o painel escolhido" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "Alinhar painel lateral à direita" -#: ../midori/midori-panel.c:231 -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "Se alinha painel lateral na direita" -#: ../midori/midori-panel.c:241 -#: ../midori/midori-panel.c:242 +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Fechar painel" -#: ../midori/midori-websettings.c:179 -#: ../midori/midori-view.c:1888 +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Página em branco" -#: ../midori/midori-websettings.c:180 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Página Inicial" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Últimas páginas abertas" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Novo separador" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Nova janela" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Separador actual" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "Padrão" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Ícones" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Texto e Ícones" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Ambos na horizontal" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "Todos os cookies" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "Cookies da sessão" -#: ../midori/midori-websettings.c:254 +#: ../midori/midori-websettings.c:258 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Nenhum" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Lembrar último tamanho de janela" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "Se guarda o último tamanho de janela" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Largura da última janela" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "Última largura de janela guardada" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Altura da última janela" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "Última altura de janela guardada" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Última posição do painel" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "Última posição de painel guardada" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Última página do painel" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "Última posição de painel de página guardada" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "Última pesquisa na Web" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "Última pesquisa Web guardada" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Mostrar Barra de Menu" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "Se mostra a barra de menu" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Mostrar Barra de Navegação" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "Se mostra a barra de navegação" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Mostrar Barra de Marcadores" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "Se mostra a barra de marcadores" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Mostrar Painel" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "Se mostra o painel" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "Mostrar barra de transferências" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "Se mostra a barra de transferências" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Mostrar Barra de Estado" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "Se mostra a barra de estado" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Estilo da Barra de Ferramentas" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "O estilo da barra de ferramentas" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "Mostrar evolução na entrada de localização" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "Se mostra evolução de carregamento na entrada de localização" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Motores de pesquisa na conclusão da localização" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "Se quer mostrar motores de pesquisa na conclusão da localização" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Itens da Barra de Ferramentas" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "Itens a mostrar na barra de ferramentas" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Compactar Painel Lateral" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "Se implica compactação do painel lateral" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "Carregar ao Iniciar" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Carregar ao iniciar" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "A página inicial" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "Mostrar diálogo sobre encerramento" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Mostrar diálogo após o encerramento do Midori" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Pasta de Transferências" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "A pasta para guardar transferências" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Gestor de Transferências" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "Um gestor de transferências externo" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Editor de Texto" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "Um editor de texto externo" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Agregador de Notícias" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "Um agregador de notícias externo" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Pesquisa de entrada Local" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "A pesquisa a executar dentro da entrada local" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Codificação Preferida" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "A codificação de caracteres preferida" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Mostrar sempre Barra de Separadores" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "Mostrar sempre barra de separadores" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "Ícone Fechar nos Separadores" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "Se separadores têm botões para fechar" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Abrir novas páginas em" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Onde abrir novas páginas" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Abrir páginas externas em" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Onde abrir páginas abertas externamente" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Clique na roda do rato abre Selecção" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "Carregar endereço através do clique na roda do rato" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "Abrir separadores em segundo plano" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "Se abre novos separadores em segundo plano" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "Abrir Separadores perto do Actual" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Se abre novos separadores perto do actual ou após o último " -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Abrir popups em separadores" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "Se abre janelas popup em separadores" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" msgstr "Zoom de Texto e Imagens" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" msgstr "Se ajusta zoom de texto e imagens" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:745 msgid "Find inline while typing" msgstr "Encontrar ao escrever" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" msgstr "Se deve encontrar automaticamente ao escrever" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" msgstr "Aceitar cookies" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" msgstr "Tipo de cookies a aceitar" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" msgstr "Apenas cookies originais" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" msgstr "Aceitar cookies apenas do sítio web original" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" msgstr "Antiguidade máxima de cookies" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" msgstr "Número máximo de dias para guardar cookies" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Lembrar últimas páginas visitadas" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "Se as últimas páginas visitadas são guardadas" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Antiguidade máxima do histórico" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "O número máximo de dias para guardar histórico" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Lembrar dados de formulários" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "Se os dados de formulário são guardados" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Lembrar últimas transferências " -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "Se as últimas transferências são guardadas" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "Servidor Proxy" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy para ligações HTTP" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:838 msgid "Detect proxy server automatically" msgstr "Detectar servidor proxy automaticamente" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Se deve detectar automaticamente o servidor proxy do ambiente" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "Identificar como" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" msgstr "Identificar nas páginas web como" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "Linha de Identificação" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "A linha de identificação da aplicação" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Tamanho de cache" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "Tamanho de cache permitido" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:656 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "Não encontrada(o) - %s" -#: ../midori/midori-view.c:988 +#: ../midori/midori-view.c:976 msgid "Open _Link" msgstr "Abrir _Ligação" -#: ../midori/midori-view.c:990 +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Abrir Ligação em Novo _Separador" -#: ../midori/midori-view.c:1007 +#: ../midori/midori-view.c:995 msgid "Open Link in New _Window" msgstr "Abrir Ligação em Nova _Janela" -#: ../midori/midori-view.c:1016 -#: ../midori/midori-view.c:1030 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "_Destino de Transferir Ligação" -#: ../midori/midori-view.c:1022 +#: ../midori/midori-view.c:1010 msgid "_Save Link destination" msgstr "De_stino para Guardar Ligação" -#: ../midori/midori-view.c:1053 +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Transferir com _Gestor de Transferências" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Pesquisar _com" + +#: ../midori/midori-view.c:1076 msgid "_Search the Web" msgstr "_Pesquisar na Web" -#: ../midori/midori-view.c:1062 +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "Abrir Endereço em Novo _Separador" -#: ../midori/midori-view.c:1201 +#: ../midori/midori-view.c:1234 msgid "Open or download file" msgstr "Abrir ou transferir ficheiro" -#: ../midori/midori-view.c:1210 +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "Tipo de Ficheiro: '%s' " + +#: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" msgstr "Tipo de ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1214 +#: ../midori/midori-view.c:1258 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../midori/midori-view.c:1610 +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar página - %s" -#: ../midori/midori-view.c:1755 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "O documento não pode ser apresentado" -#: ../midori/midori-view.c:1771 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "Nenhuma documentação instalada" @@ -1261,259 +1366,246 @@ msgid "Transfers" msgstr "Transferências" #. Page "Appearance" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Aparência" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Definições de fontes" -#: ../midori/midori-preferences.c:465 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Família de Fontes Padrão" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "O tamanho padrão de fonte para apresentar texto" -#: ../midori/midori-preferences.c:474 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Tmanho Mínimo de Fonte" -#: ../midori/midori-preferences.c:477 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "Tamanho mínimo de fonte para apresentar texto" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "Codificação" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "A codificação de caracteres preferida" #. Page "Behavior" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Comportamento" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Funções" -#: ../midori/midori-preferences.c:498 -#: ../extensions/statusbar-features.c:42 +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Carregar imagens automaticamente" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "Carregar e apresentar automaticamente as imagens " -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "Encolher imagens automaticamente" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Imprimir imagens em segundo plano" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "Se imagens em segundo plano devem ser impressas" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Áreas de texto dimensionáveis" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "Se as áreas de texto são redimensionáveis" -#: ../midori/midori-preferences.c:514 -#: ../extensions/statusbar-features.c:49 +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Activar argumentos" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "Activar argumentos de idiomas incorporados" -#: ../midori/midori-preferences.c:518 -#: ../extensions/statusbar-features.c:56 +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Activar plugins" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "Activar plugin de objectos incorporados" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "Forçar 96 pontos por polegalda" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "Forçar densidade de vídeo de 96 PPP" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" msgstr "Activar ferramentas de desenvolvimento" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "Activar extensões especiais de desenvolvimento" #. Page "Interface" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "Barra de Navegação" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "Navegar" #. Page "Network" -#: ../midori/midori-preferences.c:579 -#: ../midori/midori-preferences.c:580 +#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:591 msgid "Network" msgstr "Rede" -#: ../midori/midori-preferences.c:607 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "Privacidade" -#: ../midori/midori-preferences.c:613 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" msgstr "Web Cookies" -#: ../midori/midori-preferences.c:626 -#: ../midori/midori-preferences.c:636 +#: ../midori/midori-preferences.c:637 +#: ../midori/midori-preferences.c:647 msgid "days" msgstr "dias" -#: ../midori/midori-preferences.c:629 -#: ../panels/midori-history.c:104 -msgid "History" -msgstr "Histórico" - -#: ../midori/midori-searchaction.c:455 +#: ../midori/midori-searchaction.c:484 #: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Vazio" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Adicionar motor de pesquisa" -#: ../midori/midori-searchaction.c:811 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Editar motor de pesquisa" -#: ../midori/midori-searchaction.c:839 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Nome:" -#: ../midori/midori-searchaction.c:883 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "_Icone:" -#: ../midori/midori-searchaction.c:897 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Token:" -#: ../midori/midori-searchaction.c:1077 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Gerir Motores de Pesquisa" -#: ../midori/sokoke.c:109 -#: ../midori/sokoke.c:121 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Usar como pa_drão" + +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "Não é possível executar o programa externo." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:440 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Aviso: Está a utilizar uma conta de super utilizador!" -#: ../midori/sokoke.c:771 +#: ../midori/sokoke.c:780 msgid "_Bookmark" msgstr "_Marcador" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:782 msgid "_Add Bookmark" msgstr "_Adicionar Marcador" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:783 msgid "_Console" msgstr "_Consola" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:784 msgid "_Extensions" msgstr "_Extensões" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:785 msgid "_History" msgstr "_Histórico" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:786 msgid "_Homepage" msgstr "_Página Inicial" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:787 msgid "_Userscripts" msgstr "Argumentos de _Utilizador" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:788 msgid "User_styles" msgstr "E_stilos de Utilizador" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:789 msgid "New _Tab" msgstr "Novo _Separador" -#: ../midori/sokoke.c:781 +#: ../midori/sokoke.c:790 msgid "_Transfers" msgstr "_Transferências" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "P_lugins" + +#: ../midori/sokoke.c:792 msgid "_Closed Tabs and Windows" msgstr "Separadores e Janelas Fe_chadas" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:793 msgid "New _Window" msgstr "Nova _Janela" -#: ../midori/gjs.c:743 -#: ../midori/gjs.c:833 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s não tem a propriedade '%s'" - -#: ../midori/gjs.c:879 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "Não pode assinar %s para %s.%s" - -#: ../midori/gjs.c:889 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s. Não pode aceder a %s" - #: ../panels/midori-addons.c:95 #: ../panels/midori-addons.c:141 msgid "Userscripts" @@ -1524,43 +1616,39 @@ msgstr "Argumentos de Utilizador" msgid "Userstyles" msgstr "Estilos de utilizador" -#: ../panels/midori-addons.c:922 +#: ../panels/midori-addons.c:927 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activar" -#: ../panels/midori-addons.c:923 +#: ../panels/midori-addons.c:928 #: ../panels/midori-extensions.c:145 msgid "Enable" msgstr "Activar" -#: ../panels/midori-addons.c:932 +#: ../panels/midori-addons.c:937 #: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Desactivar" -#: ../panels/midori-addons.c:933 +#: ../panels/midori-addons.c:938 #: ../panels/midori-extensions.c:155 msgid "Disable" msgstr "Desactivar" -#: ../panels/midori-bookmarks.c:103 +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:236 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "Editar marcador seleccionado" -#: ../panels/midori-bookmarks.c:244 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "Eliminar marcador seleccionado" -#: ../panels/midori-bookmarks.c:257 -msgid "Add a new folder" -msgstr "Adicionar nova pasta" - -#: ../panels/midori-bookmarks.c:589 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "Separador" @@ -1572,42 +1660,41 @@ msgstr "Consola" msgid "Extensions" msgstr "Extensões" -#: ../panels/midori-history.c:159 +#: ../panels/midori-history.c:163 msgid "Are you sure you want to remove all history items?" msgstr "Tem a certeza que quer remover todo o histórico?" -#: ../panels/midori-history.c:216 +#: ../panels/midori-history.c:218 msgid "Bookmark the selected history item" msgstr "Marcar o item de histórico seleccionado" -#: ../panels/midori-history.c:225 +#: ../panels/midori-history.c:227 msgid "Delete the selected history item" msgstr "Eliminar item de histórico seleccionado" -#: ../panels/midori-history.c:233 +#: ../panels/midori-history.c:235 msgid "Clear the entire history" msgstr "Limpar todo o histórico" -#: ../panels/midori-history.c:603 +#: ../panels/midori-history.c:600 #, c-format msgid "A week ago" msgstr "Uma semana atrás" -#: ../panels/midori-history.c:609 +#: ../panels/midori-history.c:606 #, c-format msgid "%d days ago" msgstr "%d dias atrás" -#: ../panels/midori-history.c:616 +#: ../panels/midori-history.c:613 msgid "Today" msgstr "Hoje" -#: ../panels/midori-history.c:618 +#: ../panels/midori-history.c:615 msgid "Yesterday" msgstr "Ontem" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:54 msgid "Plugins" msgstr "Plugins" @@ -1650,59 +1737,151 @@ msgstr "O ícone '%s' não foi carregado" msgid "Animation frames are broken" msgstr "As frames de animação estão corrompidas" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Propriedade %s' é inválida para %s" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Escolha ficheiro" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Escolha pasta" -#: ../extensions/colorful-tabs.c:97 +#: ../extensions/colorful-tabs.c:104 msgid "Tint tabs distinctly" msgstr "Cor distinta de separadores" -#: ../extensions/colorful-tabs.c:133 +#: ../extensions/colorful-tabs.c:140 msgid "Colorful Tabs" msgstr "Separadores Coloridos" -#: ../extensions/colorful-tabs.c:134 +#: ../extensions/colorful-tabs.c:141 msgid "Tint each tab distinctly" msgstr "Cor distinta para cada separador" -#: ../extensions/mouse-gestures/main.c:176 +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "No fim da sessão" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Hospedeiro: %s\n" +"Nome: %s\n" +"Valor: %s\n" +"Caminho: %s\n" +"Seguro: %s\n" +"Expira: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Sim" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Não" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "Deseja realmente eliminar todos os cookies?" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "Pergunta" + +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "Apenas serão eliminados os cookies que coincidam com o filtro introduzido." + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "Nome" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "_Expandir Todos" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "_Unir Todos" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "Eliminar Todos" + +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Eliminar todos os cookies mostrados. Se definir um filtro, só serão eliminados os cookies que coincidirem com o filtro." + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Expandir Todos" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "_Unir Todos" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Filtro:" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Introduza um filtro para apenas mostrar os cookies cujo nome ou domínio coincidam com o filtro" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Gestor de Cookies" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "Gestor de _Cookies" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "Listar, ver e eliminar cookies" + +#: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Gestos de Rato" -#: ../extensions/mouse-gestures/main.c:177 +#: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori movendo o rato" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Titular de Página" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "Titular de _Página" -#: ../extensions/statusbar-features.c:40 -msgid "Images" -msgstr "Imagens" - -#: ../extensions/statusbar-features.c:47 -msgid "Scripts" -msgstr "Argumentos" - +#~ msgid "%s has no property '%s'" +#~ msgstr "%s não tem a propriedade '%s'" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "Não pode assinar %s para %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s. Não pode aceder a %s" +#~ msgid "Images" +#~ msgstr "Imagens" +#~ msgid "Scripts" +#~ msgstr "Argumentos" #~ msgid "Source" #~ msgstr "Origem" #~ msgid "URIs" From e3ce454b781b6e95a94edc49664aeb473e5db06b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 20:00:04 +0200 Subject: [PATCH 1030/2970] Render disabled extensions as insensitive in the panel --- panels/midori-extensions.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c index fd4703b3..2e99b708 100644 --- a/panels/midori-extensions.c +++ b/panels/midori-extensions.c @@ -199,7 +199,8 @@ midori_extensions_set_property (GObject* object, case PROP_APP: { KatzeArray* array; - guint i, n; + MidoriExtension* extension; + guint i; /* FIXME: Handle NULL and subsequent assignments */ extensions->app = g_value_get_object (value); @@ -207,10 +208,9 @@ midori_extensions_set_property (GObject* object, g_signal_connect (array, "add-item", G_CALLBACK (midori_extensions_add_item_cb), extensions); - if ((n = katze_array_get_length (array))) - for (i = 0; i < n; i++) - midori_extensions_add_item_cb (array, - katze_array_get_nth_item (array, i), extensions); + i = 0; + while ((extension = katze_array_get_nth_item (array, i++))) + midori_extensions_add_item_cb (array, extension, extensions); } break; default: @@ -270,8 +270,11 @@ midori_extensions_treeview_render_text_cb (GtkTreeViewColumn* column, g_free (name); g_free (version); g_free (desc); - g_object_set (renderer, "text", text, NULL); + g_object_set (renderer, "text", text, + "sensitive", midori_extension_is_active (extension), + NULL); g_free (text); + g_object_unref (extension); } static void From d7f6c7ded8609981de2082932fc29a0e6b7b7f4c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 20:01:10 +0200 Subject: [PATCH 1031/2970] Add a function to determine if an extension is being deactivated --- midori/midori-extension.c | 36 ++++++++++++++++++++++++++++++------ midori/midori-extension.h | 3 +++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index ca9dbd94..e882172c 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -29,7 +29,7 @@ struct _MidoriExtensionPrivate gchar* authors; MidoriApp* app; - gboolean active; + gint active; gchar* config_dir; GList* lsettings; GHashTable* settings; @@ -73,7 +73,7 @@ void me_setting_free (gpointer setting) } #define midori_extension_can_install_setting(extension, name) \ - if (extension->priv->active) \ + if (extension->priv->active > 0) \ { \ g_critical ("%s: Settings have to be installed before " \ "the extension is activated.", G_STRFUNC); \ @@ -283,7 +283,7 @@ midori_extension_activate_cb (MidoriExtension* extension, } extension->priv->app = g_object_ref (app); - extension->priv->active = TRUE; + extension->priv->active = 1; /* FIXME: Disconnect all signal handlers */ } @@ -294,7 +294,7 @@ midori_extension_init (MidoriExtension* extension) MIDORI_TYPE_EXTENSION, MidoriExtensionPrivate); extension->priv->app = NULL; - extension->priv->active = FALSE; + extension->priv->active = 0; extension->priv->config_dir = NULL; extension->priv->lsettings = NULL; extension->priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, @@ -416,7 +416,30 @@ midori_extension_is_active (MidoriExtension* extension) { g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), FALSE); - return extension->priv->active; + return extension->priv->active > 0; +} + +/** + * midori_extension_is_deactivating: + * @extension: a #MidoriExtension + * + * Determines if @extension is currently in the process of + * being deactivated. + * + * Extensions remain fully functional even while being + * deactivated, so you can for instance still save settings + * but you may need to cleanup during deactivation. + * + * Return value: %TRUE if @extension is deactivating + * + * Since: 0.1.7 + **/ +gboolean +midori_extension_is_deactivating (MidoriExtension* extension) +{ + g_return_val_if_fail (MIDORI_IS_EXTENSION (extension), FALSE); + + return extension->priv->active == 2; } /** @@ -430,8 +453,9 @@ midori_extension_deactivate (MidoriExtension* extension) { g_return_if_fail (midori_extension_is_active (extension)); + extension->priv->active = 2; g_signal_emit (extension, signals[DEACTIVATE], 0); - extension->priv->active = FALSE; + extension->priv->active = 0; katze_object_assign (extension->priv->app, NULL); } diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 1125d4cb..54e96b94 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -54,6 +54,9 @@ midori_extension_is_prepared (MidoriExtension* extension); gboolean midori_extension_is_active (MidoriExtension* extension); +gboolean +midori_extension_is_deactivating (MidoriExtension* extension); + void midori_extension_deactivate (MidoriExtension* extension); From 758434e71149102397858706fc24dfcc3cd04ee8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 21:53:14 +0200 Subject: [PATCH 1032/2970] Add midori_browser_foreach to iterate over all present browsers --- midori/midori-browser.c | 28 +++++++++++++++++++++++++--- midori/midori-browser.h | 5 +++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 02f5a3ed..39599d93 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1214,6 +1214,28 @@ _midori_browser_remove_tab (MidoriBrowser* browser, gtk_widget_destroy (view); } +/** + * midori_browser_foreach: + * @browser: a #MidoriBrowser + * @callback: a #GtkCallback + * @callback_data: custom data + * + * Calls the specified callback for each view contained + * in the browser. + * + * Since: 0.1.7 + **/ +void +midori_browser_foreach (MidoriBrowser* browser, + GtkCallback callback, + gpointer callback_data) +{ + g_return_if_fail (MIDORI_IS_BROWSER (browser)); + + gtk_container_foreach (GTK_CONTAINER (browser->notebook), + callback, callback_data); +} + static void _midori_browser_quit (MidoriBrowser* browser) { @@ -1282,8 +1304,8 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_POINTER); /** - * MidoriView::add-download: - * @view: the object on which the signal is emitted + * MidoriBrowser::add-download: + * @browser: the object on which the signal is emitted * @download: a new download * * Emitted when a new download was accepted and is @@ -1293,7 +1315,7 @@ midori_browser_class_init (MidoriBrowserClass* class) * Emitting this signal manually is equal to a * user initiating and confirming a download * - * Note: This requires WebKitGTK 1.1.3. + * Note: This requires WebKitGTK+ 1.1.3. * * Since: 0.1.5 */ diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 92a61779..9cf3ac91 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -88,6 +88,11 @@ void midori_browser_remove_tab (MidoriBrowser* browser, GtkWidget* widget); +void +midori_browser_foreach (MidoriBrowser* browser, + GtkCallback callback, + gpointer callback_data); + gint midori_browser_add_item (MidoriBrowser* browser, KatzeItem* item); From b058e8ec5d47859738ba463d49c534553f182cc2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 21:58:00 +0200 Subject: [PATCH 1033/2970] Add a remove-browser signal to MidoriApp --- midori/midori-app.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/midori/midori-app.c b/midori/midori-app.c index b753a64f..f79a307c 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -52,6 +52,9 @@ struct _MidoriAppClass (*add_browser) (MidoriApp* app, MidoriBrowser* browser); void + (*remove_browser) (MidoriApp* app, + MidoriBrowser* browser); + void (*quit) (MidoriApp* app); }; @@ -75,6 +78,7 @@ enum enum { ADD_BROWSER, + REMOVE_BROWSER, QUIT, LAST_SIGNAL @@ -131,6 +135,7 @@ static gboolean midori_browser_destroy_cb (MidoriBrowser* browser, MidoriApp* app) { + g_signal_emit (app, signals[REMOVE_BROWSER], 0, browser); katze_array_remove_item (app->browsers, browser); if (!katze_array_is_empty (app->browsers)) return FALSE; @@ -191,6 +196,26 @@ midori_app_class_init (MidoriAppClass* class) G_TYPE_NONE, 1, MIDORI_TYPE_BROWSER); + /** + * MidoriApp::remove-browser: + * @app: the object on which the signal is emitted + * @browser: a #MidoriBrowser + * + * A new browser is being added to the app. + * + * Since: 0.1.7 + */ + signals[REMOVE_BROWSER] = g_signal_new ( + "remove-browser", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + MIDORI_TYPE_BROWSER); + signals[QUIT] = g_signal_new ( "quit", G_TYPE_FROM_CLASS (class), @@ -752,7 +777,7 @@ midori_app_add_browser (MidoriApp* app, * * Return value: a new #MidoriBrowser * - * Since: 1.0.2 + * Since: 0.1.2 **/ MidoriBrowser* midori_app_create_browser (MidoriApp* app) From dd4818bf3ea4c73e70a963f27b7b2c41d6bd9973 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 23:54:07 +0200 Subject: [PATCH 1034/2970] Fix a crasher when re-enabling the Mouse Gestures extension --- extensions/mouse-gestures/main.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/extensions/mouse-gestures/main.c b/extensions/mouse-gestures/main.c index fa73887f..3fcb0515 100644 --- a/extensions/mouse-gestures/main.c +++ b/extensions/mouse-gestures/main.c @@ -34,9 +34,7 @@ void mouse_gesture_clear(MouseGesture *g) MouseGesture* mouse_gesture_new(void) { - MouseGesture *g = NULL; - if((g = g_new(MouseGesture, 1)) == NULL) - return(NULL); + MouseGesture *g = g_new(MouseGesture, 1); mouse_gesture_clear(g); return(g); } @@ -198,12 +196,14 @@ static void mouse_gestures_deactivate(MidoriExtension *extension, MidoriApp *app g_signal_handler_disconnect(page, signal_id); // disconnect the handler } } + g_signal_handlers_disconnect_by_func(extension, mouse_gestures_deactivate, app); g_free(gesture); // free the structure that contains the gesture information return; } static void mouse_gestures_activate(MidoriExtension *extension, MidoriApp *app) // this is performed on extension-activation { + gesture = mouse_gesture_new(); g_signal_connect(app, "add-browser", G_CALLBACK(mouse_gestures_browser_cb), NULL); // connect the above callback to the "add-browser" signal of app g_signal_connect(extension, "deactivate", G_CALLBACK(mouse_gestures_deactivate), app); // connect the deactivate callback to the extension return; @@ -218,12 +218,5 @@ MidoriExtension* extension_init(void) "version", MOUSE_GESTURES_VERSION, "authors", "Matthias Kruk ", NULL); g_signal_connect(extension, "activate", G_CALLBACK(mouse_gestures_activate), NULL); // connect the callback that's executed on activation - gesture = NULL; // initialise gesture pointer; initialising pointers is always a good choice - if((gesture = mouse_gesture_new()) == NULL) // allocate space for the gesture - { - // no space could be allocated - g_free(extension); // free the space used by this extension - return(NULL); - } return(extension); } From 023abc9c72106b533eafd5b4c611afb823b5a3a6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 23:54:55 +0200 Subject: [PATCH 1035/2970] Fix toggling of Colourful Tabs --- extensions/colorful-tabs.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/extensions/colorful-tabs.c b/extensions/colorful-tabs.c index 6d8a46e5..0cd76368 100644 --- a/extensions/colorful-tabs.c +++ b/extensions/colorful-tabs.c @@ -11,15 +11,6 @@ #include -static void -colorful_tabs_button_toggled_cb (GtkWidget* button, - MidoriExtension* extension) -{ - midori_extension_set_boolean (extension, "tint", - !midori_extension_get_boolean (extension, "tint")); - /* FIXME: Update all tab colors */ -} - static void colorful_tabs_view_notify_uri_cb (MidoriView* view, GParamSpec* pspec, @@ -70,6 +61,25 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view, } } +static void +colorful_tabs_browser_foreach_cb (GtkWidget* view, + MidoriExtension* extension) +{ + colorful_tabs_view_notify_uri_cb (MIDORI_VIEW (view), NULL, extension); +} + +static void +colorful_tabs_button_toggled_cb (GtkWidget* button, + MidoriExtension* extension) +{ + MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (button)); + + midori_extension_set_boolean (extension, "tint", + !midori_extension_get_boolean (extension, "tint")); + midori_browser_foreach (browser, + (GtkCallback)colorful_tabs_browser_foreach_cb, extension); +} + static void colorful_tabs_browser_add_tab_cb (MidoriBrowser* browser, MidoriView* view, @@ -83,11 +93,12 @@ static void colorful_tabs_deactivate_cb (MidoriExtension* extension, GtkWidget* bbox) { - gtk_widget_destroy (bbox); g_signal_handlers_disconnect_by_func ( extension, colorful_tabs_deactivate_cb, bbox); /* FIXME: Disconnect signals */ - /* FIXME: Reset all tab colors */ + midori_browser_foreach (MIDORI_BROWSER (gtk_widget_get_toplevel (bbox)), + (GtkCallback)colorful_tabs_browser_foreach_cb, extension); + gtk_widget_destroy (bbox); } static void From daf6ca74e732b28bba1a4bbcd89c187f9fd0f27b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 22 Apr 2009 23:57:10 +0200 Subject: [PATCH 1036/2970] Remove leftover code from MidoriWebSettings --- midori/midori-websettings.c | 8 -------- panels/midori-transfers.c | 1 - 2 files changed, 9 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index eda71aae..e9a4609c 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -135,8 +135,6 @@ enum PROP_OPEN_TABS_NEXT_TO_CURRENT, PROP_OPEN_POPUPS_IN_TABS, - PROP_ENFORCE_96_DPI, - PROP_ENABLE_DEVELOPER_EXTRAS, PROP_ZOOM_TEXT_AND_IMAGES, PROP_FIND_WHILE_TYPING, PROP_ACCEPT_COOKIES, @@ -1319,12 +1317,6 @@ midori_web_settings_get_property (GObject* object, g_value_set_boolean (value, web_settings->open_popups_in_tabs); break; - case PROP_ENFORCE_96_DPI: - g_value_set_boolean (value, FALSE); - break; - case PROP_ENABLE_DEVELOPER_EXTRAS: - g_value_set_boolean (value, FALSE); - break; case PROP_ZOOM_TEXT_AND_IMAGES: g_value_set_boolean (value, web_settings->zoom_text_and_images); break; diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index d81a6beb..6c6b1e38 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -326,7 +326,6 @@ midori_transfers_treeview_row_activated_cb (GtkTreeView* treeview, case WEBKIT_DOWNLOAD_STATUS_FINISHED: { const gchar* uri; - gboolean success; uri = webkit_download_get_destination_uri (download); sokoke_show_uri (gtk_widget_get_screen (GTK_WIDGET ( From db0c626ec181f98c2afac87e681d55adf842f8e2 Mon Sep 17 00:00:00 2001 From: Matthew Gyurgyik Date: Thu, 23 Apr 2009 04:08:28 +0200 Subject: [PATCH 1037/2970] Catch and ignore mouse buttons meant for horizontal scrolling --- midori/midori-view.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 0c4d203b..f5d9cebe 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -814,6 +814,17 @@ gtk_widget_button_press_event_cb (WebKitWebView* web_view, case 9: midori_view_go_forward (view); return TRUE; + /* + * On some fancier mice the scroll wheel can be used to scroll horizontally. + * A middle click usually registers both a middle click (2) and a + * horizontal scroll (11 or 12). + * We catch horizontal scrolls and ignore them to prevent middle clicks from + * accidentally being interpreted as first button clicks. + */ + case 11: + return TRUE; + case 12: + return TRUE; } return FALSE; From 5a43b646b5601bf87ba281ebaa93853a232cc26c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 23 Apr 2009 04:10:38 +0200 Subject: [PATCH 1038/2970] Add midori_browser_get_for_widget_utility function This function will look for a MidoriBrowser according to a particular widget - even if it's inside a detached panel window or any other window transient for the browser. --- midori/midori-browser.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 39599d93..f4dfae80 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -699,7 +699,7 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem, item = katze_item_new (); katze_item_set_uri (item, uri); - browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); + browser = midori_browser_get_for_widget (menuitem); midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } @@ -806,7 +806,7 @@ midori_view_save_as_cb (GtkWidget* menuitem, { MidoriBrowser* browser; - browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); + browser = midori_browser_get_for_widget (menuitem); midori_browser_save_uri (browser, uri); } @@ -927,7 +927,7 @@ midori_browser_download_button_clicked_cb (GtkWidget* button, MidoriBrowser* browser; GList* buttons; - browser = MIDORI_BROWSER (gtk_widget_get_toplevel (button)); + browser = midori_browser_get_for_widget (button); switch (webkit_download_get_status (download)) { @@ -3181,7 +3181,7 @@ static gboolean midori_browser_panel_timeout (GtkWidget* hpaned) { gboolean position = gtk_paned_get_position (GTK_PANED (hpaned)); - MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (hpaned)); + MidoriBrowser* browser = midori_browser_get_for_widget (hpaned); if (browser->settings) g_object_set (browser->settings, "last-panel-position", position, NULL); browser->panel_timeout = 0; @@ -5209,6 +5209,37 @@ midori_browser_get_proxy_array (MidoriBrowser* browser) return browser->proxy_array; } +/** + * midori_browser_get_for_widget: + * @widget: a #GtkWidget + * + * Determines the browser appropriate for the specified widget. + * + * Return value: a #MidoriBrowser + * + * Since 0.1.7 + **/ +MidoriBrowser* +midori_browser_get_for_widget (GtkWidget* widget) +{ + gpointer browser; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); + + browser = gtk_widget_get_toplevel (GTK_WIDGET (widget)); + if (!MIDORI_IS_BROWSER (browser)) + { + if (!GTK_IS_WINDOW (browser)) + return NULL; + + browser = gtk_window_get_transient_for (GTK_WINDOW (browser)); + if (!MIDORI_IS_BROWSER (browser)) + return NULL; + } + + return MIDORI_BROWSER (browser); +} + /** * midori_browser_quit: * @browser: a #MidoriBrowser From 9e97fabd3083a665afb68f0fb1357a249d1dddaa Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 23 Apr 2009 04:13:19 +0200 Subject: [PATCH 1039/2970] Make bookmark panel properly detachable --- panels/midori-bookmarks.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index a1de10d5..71926ff9 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -116,10 +116,9 @@ midori_bookmarks_get_stock_id (MidoriViewable* viewable) static void midori_bookmarks_add_clicked_cb (GtkWidget* toolitem) { - GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); /* FIXME: Take selected folder into account */ - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), - NULL, TRUE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void @@ -140,9 +139,8 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, is_separator = !KATZE_IS_ARRAY (item) && !katze_item_get_uri (item); if (!is_separator) { - GtkWidget* browser = gtk_widget_get_toplevel (toolitem); - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), - item, FALSE, FALSE); + MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } g_object_unref (item); @@ -687,14 +685,14 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, { if ((uri = katze_item_get_uri (child)) && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; MidoriWebSettings* settings; - browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - n = midori_browser_add_item (MIDORI_BROWSER (browser), child); + browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + n = midori_browser_add_item (browser, child); settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + midori_browser_set_current_page (browser, n); g_object_unref (settings); } i++; @@ -704,14 +702,14 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget* menuitem, { if ((uri = katze_item_get_uri (item)) && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; MidoriWebSettings* settings; - browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - n = midori_browser_add_item (MIDORI_BROWSER (browser), item); + browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + n = midori_browser_add_item (browser, item); settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + midori_browser_set_current_page (browser, n); g_object_unref (settings); } } @@ -825,12 +823,12 @@ midori_bookmarks_button_release_event_cb (GtkWidget* widget, if (uri && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; gint n; - browser = gtk_widget_get_toplevel (widget); - n = midori_browser_add_uri (MIDORI_BROWSER (browser), uri); - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + browser = midori_browser_get_for_widget (widget); + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); } } else From 04dfda755dbade7eb591fedcee1e4186212d1653 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 23 Apr 2009 04:14:08 +0200 Subject: [PATCH 1040/2970] Make console panel properly detachable --- panels/midori-console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/midori-console.c b/panels/midori-console.c index 0f662ca5..f47227fc 100644 --- a/panels/midori-console.c +++ b/panels/midori-console.c @@ -231,8 +231,8 @@ static void midori_console_hierarchy_changed_cb (MidoriConsole* console, GtkWidget* old_parent) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (console)); - if (GTK_WIDGET_TOPLEVEL (browser)) + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (console)); + if (MIDORI_IS_BROWSER (browser)) g_signal_connect (browser, "add-tab", G_CALLBACK (midori_console_browser_add_tab_cb), console); } From d45b72941eb1f9d533274200d02e5fef310126a1 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 23 Apr 2009 04:14:32 +0200 Subject: [PATCH 1041/2970] Make history panel properly detachable --- panels/midori-history.c | 49 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/panels/midori-history.c b/panels/midori-history.c index f528d4d6..df19f9ec 100644 --- a/panels/midori-history.c +++ b/panels/midori-history.c @@ -117,10 +117,9 @@ midori_history_get_stock_id (MidoriViewable* viewable) static void midori_history_add_clicked_cb (GtkWidget* toolitem) { - GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + MidoriBrowser* browser = midori_browser_get_for_widget (toolitem); /* FIXME: Take selected folder into account */ - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), - NULL, TRUE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE); } static void @@ -152,11 +151,11 @@ static void midori_history_clear_clicked_cb (GtkWidget* toolitem, MidoriHistory* history) { - GtkWidget* browser; + MidoriBrowser* browser; GtkWidget* dialog; gint result; - browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + browser = midori_browser_get_for_widget (GTK_WIDGET (history)); dialog = gtk_message_dialog_new (GTK_WINDOW (browser), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, @@ -641,10 +640,10 @@ midori_history_row_activated_cb (GtkTreeView* treeview, uri = katze_item_get_uri (item); if (uri && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; - browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + browser = midori_browser_get_for_widget (GTK_WIDGET (history)); + midori_browser_set_current_uri (browser, uri); } g_object_unref (item); @@ -691,8 +690,8 @@ midori_history_open_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); + midori_browser_set_current_uri (browser, uri); } } @@ -714,14 +713,14 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, { if ((uri = katze_item_get_uri (child)) && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; MidoriWebSettings* settings; - browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - n = midori_browser_add_item (MIDORI_BROWSER (browser), child); + browser = midori_browser_get_for_widget (GTK_WIDGET (history)); + n = midori_browser_add_item (browser, child); settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + midori_browser_set_current_page (browser, n); g_object_unref (settings); } i++; @@ -731,14 +730,14 @@ midori_history_open_in_tab_activate_cb (GtkWidget* menuitem, { if ((uri = katze_item_get_uri (item)) && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; MidoriWebSettings* settings; - browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - n = midori_browser_add_item (MIDORI_BROWSER (browser), item); + browser = midori_browser_get_for_widget (GTK_WIDGET (history)); + n = midori_browser_add_item (browser, item); settings = katze_object_get_object (browser, "settings"); if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + midori_browser_set_current_page (browser, n); g_object_unref (settings); } } @@ -756,7 +755,7 @@ midori_history_open_in_window_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); g_signal_emit_by_name (browser, "new-window", uri); } } @@ -773,8 +772,8 @@ midori_history_bookmark_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (history)); - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, TRUE, FALSE); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (history)); + midori_browser_edit_bookmark_dialog_new (browser, item, TRUE, FALSE); } } @@ -852,12 +851,12 @@ midori_history_button_release_event_cb (GtkWidget* widget, if (uri && *uri) { - GtkWidget* browser; + MidoriBrowser* browser; gint n; - browser = gtk_widget_get_toplevel (widget); - n = midori_browser_add_uri (MIDORI_BROWSER (browser), uri); - midori_browser_set_current_page (MIDORI_BROWSER (browser), n); + browser = midori_browser_get_for_widget (widget); + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); } } else From c0291bb4a3c8a31da6a8949faa9f66d9fb94fbf2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 23 Apr 2009 04:15:07 +0200 Subject: [PATCH 1042/2970] Update the browser header file for midori_browser_get_for_widget --- midori/midori-browser.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-browser.h b/midori/midori-browser.h index 9cf3ac91..f0d2ffd7 100644 --- a/midori/midori-browser.h +++ b/midori/midori-browser.h @@ -132,6 +132,9 @@ midori_browser_get_current_tab (MidoriBrowser* browser); KatzeArray* midori_browser_get_proxy_array (MidoriBrowser* browser); +MidoriBrowser* +midori_browser_get_for_widget (GtkWidget* widget); + void midori_browser_quit (MidoriBrowser* browser); From c31d9936d916f4c7159f4917ee3f61fd13e14e4f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 24 Apr 2009 20:13:57 +0200 Subject: [PATCH 1043/2970] Fix a crash when failing to open a downloaded file --- midori/sokoke.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 0cc7bf43..a6bb4c1e 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -129,7 +129,8 @@ sokoke_show_uri (GdkScreen* screen, g_free (command); if (result) return TRUE; - *error = NULL; + if (error) + *error = NULL; } return FALSE; From b7f684b3459fb64be59ac0426ae114382339a879 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sat, 25 Apr 2009 15:57:00 +0200 Subject: [PATCH 1044/2970] Implement sokoke_key_file_get_string_list_default --- midori/sokoke.c | 20 +++++++ midori/sokoke.h | 140 ++++++++++++++++++++++++++---------------------- 2 files changed, 95 insertions(+), 65 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index a6bb4c1e..ad5c2732 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1,5 +1,6 @@ /* Copyright (C) 2007-2009 Christian Dywan + Copyright (C) 2009 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -675,6 +676,25 @@ sokoke_key_file_get_boolean_default (GKeyFile* key_file, return g_key_file_get_boolean (key_file, group, key, error); } +gchar** +sokoke_key_file_get_string_list_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gsize* length, + gchar** default_value, + gsize* default_length, + GError* error) +{ + gchar** value = g_key_file_get_string_list (key_file, group, key, length, NULL); + if (!value) + { + value = g_strdupv (default_value); + if (length) + *length = *default_length; + } + return value; +} + gboolean sokoke_key_file_save_to_file (GKeyFile* key_file, const gchar* filename, diff --git a/midori/sokoke.h b/midori/sokoke.h index 5a685e02..61d80c3c 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -1,5 +1,6 @@ /* Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2009 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -19,29 +20,29 @@ #include gchar* -sokoke_js_script_eval (JSContextRef js_context, - const gchar* script, - gchar** exception); +sokoke_js_script_eval (JSContextRef js_context, + const gchar* script, + gchar** exception); /* Many themes need this hack for small toolbars to work */ #define GTK_ICON_SIZE_SMALL_TOOLBAR GTK_ICON_SIZE_BUTTON gboolean -sokoke_show_uri (GdkScreen* screen, - const gchar* uri, - guint32 timestamp, - GError** error); +sokoke_show_uri (GdkScreen* screen, + const gchar* uri, + guint32 timestamp, + GError** error); gboolean -sokoke_spawn_program (const gchar* command, - const gchar* argument); +sokoke_spawn_program (const gchar* command, + const gchar* argument); -gchar* sokoke_search_uri (const gchar* uri, - const gchar* keywords); +gchar* sokoke_search_uri (const gchar* uri, + const gchar* keywords); gchar* -sokoke_magic_uri (const gchar* uri, - KatzeArray* search_engines); +sokoke_magic_uri (const gchar* uri, + KatzeArray* search_engines); typedef enum { SOKOKE_MENU_POSITION_CURSOR = 0, @@ -50,97 +51,106 @@ typedef enum { } SokokeMenuPos; void -sokoke_combo_box_add_strings (GtkComboBox* combobox, - const gchar* label_first, - ...); +sokoke_combo_box_add_strings (GtkComboBox* combobox, + const gchar* label_first, + ...); void -sokoke_widget_set_visible (GtkWidget* widget, - gboolean visible); +sokoke_widget_set_visible (GtkWidget* widget, + gboolean visible); void -sokoke_container_show_children (GtkContainer* container); +sokoke_container_show_children (GtkContainer* container); void -sokoke_widget_popup (GtkWidget* widget, - GtkMenu* menu, - GdkEventButton* event, - SokokeMenuPos pos); +sokoke_widget_popup (GtkWidget* widget, + GtkMenu* menu, + GdkEventButton* event, + SokokeMenuPos pos); GtkWidget* -sokoke_xfce_header_new (const gchar* icon, - const gchar* title); +sokoke_xfce_header_new (const gchar* icon, + const gchar* title); GtkWidget* -sokoke_superuser_warning_new (void); +sokoke_superuser_warning_new (void); GtkWidget* -sokoke_hig_frame_new (const gchar* title); +sokoke_hig_frame_new (const gchar* title); void -sokoke_widget_set_pango_font_style (GtkWidget* widget, - PangoStyle style); +sokoke_widget_set_pango_font_style (GtkWidget* widget, + PangoStyle style); void -sokoke_entry_set_default_text (GtkEntry* entry, - const gchar* default_text); +sokoke_entry_set_default_text (GtkEntry* entry, + const gchar* default_text); gchar* -sokoke_key_file_get_string_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - const gchar* default_value, - GError** error); +sokoke_key_file_get_string_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gchar* default_value, + GError** error); gint -sokoke_key_file_get_integer_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - const gint default_value, - GError** error); +sokoke_key_file_get_integer_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + const gint default_value, + GError** error); gdouble -sokoke_key_file_get_double_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - gdouble default_value, - GError** error); +sokoke_key_file_get_double_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gdouble default_value, + GError** error); gboolean -sokoke_key_file_get_boolean_default (GKeyFile* key_file, - const gchar* group, - const gchar* key, - gboolean default_value, - GError** error); +sokoke_key_file_get_boolean_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gboolean default_value, + GError** error); + +gchar** +sokoke_key_file_get_string_list_default (GKeyFile* key_file, + const gchar* group, + const gchar* key, + gsize* length, + gchar** default_value, + gsize* default_length, + GError* error); gboolean -sokoke_key_file_save_to_file (GKeyFile* key_file, - const gchar* filename, - GError** error); +sokoke_key_file_save_to_file (GKeyFile* key_file, + const gchar* filename, + GError** error); void -sokoke_widget_get_text_size (GtkWidget* widget, - const gchar* text, - gint* width, - gint* height); +sokoke_widget_get_text_size (GtkWidget* widget, + const gchar* text, + gint* width, + gint* height); GtkWidget* -sokoke_action_create_popup_menu_item (GtkAction* action); +sokoke_action_create_popup_menu_item (GtkAction* action); GtkWidget* -sokoke_image_menu_item_new_ellipsized (const gchar* label); +sokoke_image_menu_item_new_ellipsized (const gchar* label); gint64 -sokoke_time_t_to_julian (const time_t* timestamp); +sokoke_time_t_to_julian (const time_t* timestamp); void -sokoke_register_stock_items (void); +sokoke_register_stock_items (void); const gchar* -sokoke_set_config_dir (const gchar* new_config_dir); +sokoke_set_config_dir (const gchar* new_config_dir); gboolean -sokoke_remove_path (const gchar* path, - gboolean ignore_errors); +sokoke_remove_path (const gchar* path, + gboolean ignore_errors); #endif /* !__SOKOKE_H__ */ From ffd58a06a8f05c9eca108ad7950882f1c4171003 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sat, 25 Apr 2009 16:01:28 +0200 Subject: [PATCH 1045/2970] Implement katze_strv_assign --- katze/katze-utils.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/katze/katze-utils.h b/katze/katze-utils.h index f5f73b6c..77c104e4 100644 --- a/katze/katze-utils.h +++ b/katze/katze-utils.h @@ -1,5 +1,6 @@ /* Copyright (C) 2007-2008 Christian Dywan + Copyright (C) 2009 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -54,6 +55,22 @@ G_BEGIN_DECLS lvalue = rvalue; \ } +/** + * katze_strv_assign: + * @lvalue: a string list + * @rvalue: the new value + * + * Frees @lvalue if needed and assigns it the value of @rvalue. + * + * Since: 0.1.7 + **/ +#define katze_strv_assign(lvalue, rvalue) \ + if (1) \ + { \ + g_strfreev (lvalue); \ + lvalue = rvalue; \ + } + GtkWidget* katze_property_proxy (gpointer object, const gchar* property, From 9c9f34180d0555f89c7052f0770bd038208e3313 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sat, 25 Apr 2009 16:02:29 +0200 Subject: [PATCH 1046/2970] Implement string_list setting in MidoriExtension --- midori/midori-extension.c | 145 +++++++++++++++++++++++++++++++++++++- midori/midori-extension.h | 17 +++++ 2 files changed, 161 insertions(+), 1 deletion(-) diff --git a/midori/midori-extension.c b/midori/midori-extension.c index e882172c..9950a0bb 100644 --- a/midori/midori-extension.c +++ b/midori/midori-extension.c @@ -1,5 +1,6 @@ /* Copyright (C) 2008-2009 Christian Dywan + Copyright (C) 2009 Dale Whittaker This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -60,16 +61,33 @@ typedef struct gchar* value; } MESettingString; +typedef struct +{ + gchar* name; + GType type; + gchar** default_value; + gchar** value; + gsize default_length; + gsize length; +} MESettingStringList; + void me_setting_free (gpointer setting) { MESettingString* string_setting = (MESettingString*)setting; + MESettingStringList* strlist_setting = (MESettingStringList*)setting; - g_free (string_setting->name); if (string_setting->type == G_TYPE_STRING) { + g_free (string_setting->name); g_free (string_setting->default_value); g_free (string_setting->value); } + if (strlist_setting->type == G_TYPE_STRV) + { + g_free (strlist_setting->name); + g_strfreev (strlist_setting->default_value); + g_strfreev (strlist_setting->value); + } } #define midori_extension_can_install_setting(extension, name) \ @@ -276,6 +294,19 @@ midori_extension_activate_cb (MidoriExtension* extension, else setting->value = g_strdup (setting->default_value); } + else if (setting->type == G_TYPE_STRV) + { + MESettingStringList* setting_ = (MESettingStringList*)setting; + if (extension->priv->key_file) + { + setting_->value = sokoke_key_file_get_string_list_default ( + extension->priv->key_file, + "settings", setting->name, &setting_->length, + setting_->default_value, &setting_->default_length, NULL); + } + else + setting_->value = g_strdupv (setting_->default_value); + } else g_assert_not_reached (); @@ -797,3 +828,115 @@ midori_extension_set_string (MidoriExtension* extension, } } } + +/** + * midori_extension_install_string_list: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @default_value: the default value + * + * Installs a string list that can be used to conveniently + * store user configuration. + * + * Note that all settings have to be installed before + * the extension is activated. + * + * Since: 0.1.7 + **/ +void +midori_extension_install_string_list (MidoriExtension* extension, + const gchar* name, + gchar** default_value, + gsize default_length) +{ + MESettingStringList* setting; + + g_return_if_fail (midori_extension_is_prepared (extension)); + midori_extension_can_install_setting (extension, name); + + me_setting_install (MESettingStringList, g_strdup (name), G_TYPE_STRV, + g_strdupv (default_value), NULL); + + setting->default_length = default_length; +} + +/** + * midori_extension_get_string_list: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @length: return location to store number of strings, or %NULL + * + * Retrieves the value of the specified setting. + * + * Return value: a newly allocated NULL-terminated list of strings, + * should be freed with g_strfreev() + * + * Since: 0.1.7 + **/ +gchar** +midori_extension_get_string_list (MidoriExtension* extension, + const gchar* name, + gsize* length) +{ + MESettingStringList* setting; + + g_return_val_if_fail (midori_extension_is_prepared (extension), NULL); + g_return_val_if_fail (name != NULL, NULL); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_STRV, return NULL); + + if (length) + *length = setting->length; + + return g_strdupv (setting->value); +} + +/** + * midori_extension_set_string_list: + * @extension: a #MidoriExtension + * @name: the name of the setting + * @value: the new value + * @length: number of strings in @value, or G_MAXSIZE + * + * Assigns a new value to the specified setting. + * + * Since: 0.1.7 + **/ +void +midori_extension_set_string_list (MidoriExtension* extension, + const gchar* name, + gchar** value, + gsize length) +{ + MESettingStringList* setting; + + g_return_if_fail (midori_extension_is_active (extension)); + g_return_if_fail (name != NULL); + + setting = g_hash_table_lookup (extension->priv->settings, name); + + me_setting_type (setting, G_TYPE_STRV, return); + + katze_strv_assign (setting->value, g_strdupv (value)); + setting->length = length; + + if (extension->priv->key_file) + { + GError* error = NULL; + /* FIXME: Handle readonly folder/ file */ + gchar* config_file = g_build_filename (extension->priv->config_dir, + "config", NULL); + g_mkdir_with_parents (extension->priv->config_dir, 0700); + g_key_file_set_string_list (extension->priv->key_file, + "settings", name, (const gchar**)value, length); + sokoke_key_file_save_to_file (extension->priv->key_file, config_file, &error); + if (error) + { + printf (_("The configuration of the extension '%s' couldn't be saved: %s\n"), + extension->priv->name, error->message); + g_error_free (error); + } + } +} diff --git a/midori/midori-extension.h b/midori/midori-extension.h index 54e96b94..60b7d017 100644 --- a/midori/midori-extension.h +++ b/midori/midori-extension.h @@ -108,6 +108,23 @@ midori_extension_set_string (MidoriExtension* extension, const gchar* name, const gchar* value); +void +midori_extension_install_string_list (MidoriExtension* extension, + const gchar* name, + gchar** default_value, + gsize default_length); + +gchar** +midori_extension_get_string_list (MidoriExtension* extension, + const gchar* name, + gsize* length); + +void +midori_extension_set_string_list (MidoriExtension* extension, + const gchar* name, + gchar** value, + gsize length); + G_END_DECLS #endif /* __MIDORI_EXTENSION_H__ */ From 212ed7d80cb4636c749197c47f2dddb80c00fe81 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 16:03:10 +0200 Subject: [PATCH 1047/2970] Unit test using a string_list setting --- tests/extensions.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/extensions.c b/tests/extensions.c index aba3a41c..e71a353d 100644 --- a/tests/extensions.c +++ b/tests/extensions.c @@ -75,6 +75,21 @@ extension_mock_object (void) return extension; } +static void +katze_assert_cmpstrv (gchar** values1, + gsize length1, + gchar** values2, + gsize length2) +{ + gsize i; + + g_assert ((values1 && values2) || (!values1 && !values2)); + /* g_assert_cmpint (length1, ==, length2); */ + + for (i = 0; i < length1; i++) + g_assert_cmpstr (values1[i], ==, values2[i]); +} + static void extension_settings (void) { @@ -83,6 +98,9 @@ extension_settings (void) gboolean nihilist; gint age; const gchar* lastname; + gchar* pet_names[] = {"Tiger", "Bonzo", "Streuner", NULL}; + gchar** names; + gsize names_n; app = midori_app_new (); extension = extension_mock_object (); @@ -126,6 +144,27 @@ extension_settings (void) lastname = midori_extension_get_string (extension, "lastname"); g_assert_cmpstr (lastname, ==, "Theodor Fontane"); midori_extension_deactivate (extension); + + extension = extension_mock_object (); + midori_extension_install_string_list (extension, "pets", pet_names, 3); + names = midori_extension_get_string_list (extension, "pets", &names_n); + katze_assert_cmpstrv (NULL, 0, names, names_n); + g_strfreev (names); + g_signal_emit_by_name (extension, "activate", app); + names = midori_extension_get_string_list (extension, "pets", &names_n); + katze_assert_cmpstrv (pet_names, 3, names, names_n); + g_strfreev (names); + /* names = g_strsplit ("Carla,Fluffy,Goro,Kitty", ",", 0); + midori_extension_set_string_list (extension, "pets", names, G_MAXSIZE); + g_strfreev (names); + names = midori_extension_get_string_list (extension, "pets", &names_n); + g_assert_cmpint (names_n, ==, 4); */ + names = g_strsplit ("Carla,Fluffy,Goro,Kitty", ",", 0); + midori_extension_set_string_list (extension, "pets", names, 2); + g_strfreev (names); + names = midori_extension_get_string_list (extension, "pets", &names_n); + g_assert_cmpint (names_n, ==, 2); + midori_extension_deactivate (extension); } int From 90d9e85167a57460360e750ac28a11bf7a1548a7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 16:13:23 +0200 Subject: [PATCH 1048/2970] Refer to 'Netscape plugins' instead of 'plugins' A remarkable amount of people have problems telling 'plugins' and 'extensions' apart, due to their different meaning in different applications. So make it clearer. --- extensions/statusbar-features.c | 2 +- midori/midori-preferences.c | 4 ++-- midori/sokoke.c | 2 +- panels/midori-plugins.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index 6c37c1af..b7e0ff1a 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -69,7 +69,7 @@ statusbar_features_app_add_browser_cb (MidoriApp* app, gtk_widget_show (image); gtk_container_add (GTK_CONTAINER (button), image); #if GTK_CHECK_VERSION(2, 12, 0) - gtk_widget_set_tooltip_text (button, _("Enable plugins")); + gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins")); #endif gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_widget_show (button); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 03e75bc6..ec793f3f 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -528,8 +528,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_widget_set_tooltip_text (button, _("Enable embedded scripting languages")); INDENTED_ADD (button, 0, 1, 2, 3); button = katze_property_proxy (settings, "enable-plugins", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable plugins")); - gtk_widget_set_tooltip_text (button, _("Enable embedded plugin objects")); + gtk_button_set_label (GTK_BUTTON (button), _("Enable Netscape plugins")); + gtk_widget_set_tooltip_text (button, _("Enable embedded Netscape plugin objects")); SPANNED_ADD (button, 1, 2, 2, 3); button = katze_property_proxy (settings, "enforce-96-dpi", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch")); diff --git a/midori/sokoke.c b/midori/sokoke.c index ad5c2732..1330378f 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -876,7 +876,7 @@ sokoke_register_stock_items (void) { STOCK_STYLES, N_("User_styles"), 0, 0, GTK_STOCK_SELECT_COLOR }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, GTK_STOCK_ADD }, { STOCK_TRANSFERS, N_("_Transfers"), 0, 0, GTK_STOCK_SAVE }, - { STOCK_PLUGINS, N_("P_lugins"), 0, 0, GTK_STOCK_CONVERT }, + { STOCK_PLUGINS, N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT }, { STOCK_USER_TRASH, N_("_Closed Tabs and Windows"), 0, 0, "gtk-undo-ltr" }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, GTK_STOCK_ADD }, }; diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c index f2938164..ee663399 100644 --- a/panels/midori-plugins.c +++ b/panels/midori-plugins.c @@ -84,7 +84,7 @@ midori_plugins_class_init (MidoriPluginsClass* class) static const gchar* midori_plugins_get_label (MidoriViewable* viewable) { - return _("Plugins"); + return _("Netscape plugins"); } static const gchar* From 080bbd7eb57fcf09ca8079af0e5edc6bf86d9d13 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 16:19:11 +0200 Subject: [PATCH 1049/2970] Make transfer panel properly detachable --- panels/midori-transfers.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c index 6c6b1e38..b654fe3b 100644 --- a/panels/midori-transfers.c +++ b/panels/midori-transfers.c @@ -347,10 +347,13 @@ midori_transfers_hierarchy_changed_cb (MidoriTransfers* transfers, GtkWidget* old_parent) { #if WEBKIT_CHECK_VERSION (1, 1, 3) - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (transfers)); - if (GTK_WIDGET_TOPLEVEL (browser)) + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (transfers)); + if (MIDORI_IS_BROWSER (browser)) g_signal_connect (browser, "add-download", G_CALLBACK (midori_transfers_browser_add_download_cb), transfers); + if (old_parent) + g_signal_handlers_disconnect_by_func (old_parent, + midori_transfers_browser_add_download_cb, transfers); #endif } From e58550f0c06886323955796aaf69ab5eb36948ed Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 16:20:57 +0200 Subject: [PATCH 1050/2970] Make pageholder properly detachable --- extensions/page-holder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/page-holder.c b/extensions/page-holder.c index a5435a71..85abb66e 100644 --- a/extensions/page-holder.c +++ b/extensions/page-holder.c @@ -27,7 +27,7 @@ page_holder_notebook_append_view (GtkWidget* notebook) GtkWidget* label; view = midori_view_new (NULL); - browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); + browser = midori_browser_get_for_widget (notebook); settings = katze_object_get_object (browser, "settings"); midori_view_set_settings (MIDORI_VIEW (view), settings); g_object_unref (settings); @@ -49,7 +49,7 @@ page_holder_button_jump_to_clicked_cb (GtkWidget* button, if (n < 0) n = page_holder_notebook_append_view (notebook); - browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); + browser = midori_browser_get_for_widget (notebook); uri = midori_browser_get_current_uri (browser); view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), n); midori_view_set_uri (MIDORI_VIEW (view), uri); @@ -66,7 +66,7 @@ page_holder_button_add_clicked_cb (GtkWidget* button, n = page_holder_notebook_append_view (notebook); view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), n); - browser = MIDORI_BROWSER (gtk_widget_get_toplevel (notebook)); + browser = midori_browser_get_for_widget (notebook); uri = midori_browser_get_current_uri (browser); midori_view_set_uri (MIDORI_VIEW (view), uri); } From 7419d17fb6a77a739873ed2774ff722dd3adcbaa Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sat, 25 Apr 2009 18:15:08 +0200 Subject: [PATCH 1051/2970] Initial version of the Feed Panel extension --- extensions/feed-panel/feed-atom.c | 343 ++++++++++++ extensions/feed-panel/feed-atom.h | 25 + extensions/feed-panel/feed-panel.c | 850 +++++++++++++++++++++++++++++ extensions/feed-panel/feed-panel.h | 51 ++ extensions/feed-panel/feed-parse.c | 218 ++++++++ extensions/feed-panel/feed-parse.h | 77 +++ extensions/feed-panel/feed-rss.c | 249 +++++++++ extensions/feed-panel/feed-rss.h | 25 + extensions/feed-panel/main.c | 472 ++++++++++++++++ 9 files changed, 2310 insertions(+) create mode 100644 extensions/feed-panel/feed-atom.c create mode 100644 extensions/feed-panel/feed-atom.h create mode 100644 extensions/feed-panel/feed-panel.c create mode 100644 extensions/feed-panel/feed-panel.h create mode 100644 extensions/feed-panel/feed-parse.c create mode 100644 extensions/feed-panel/feed-parse.h create mode 100644 extensions/feed-panel/feed-rss.c create mode 100644 extensions/feed-panel/feed-rss.h create mode 100644 extensions/feed-panel/main.c diff --git a/extensions/feed-panel/feed-atom.c b/extensions/feed-panel/feed-atom.c new file mode 100644 index 00000000..9731d688 --- /dev/null +++ b/extensions/feed-panel/feed-atom.c @@ -0,0 +1,343 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "feed-atom.h" + +#define atom_get_link_attribute(item, attribute) \ + (gchar*)g_object_get_data (G_OBJECT (item), attribute) + +#define atom_set_link_attribute(item, attribute, value) \ + g_object_set_data (G_OBJECT (item), attribute, value) + +static gboolean +atom_is_valid (FeedParser* fparser) +{ + xmlNodePtr node; + + node = fparser->node; + + if (!(xmlStrcmp (node->name, BAD_CAST "feed")) && + !(xmlStrcmp (node->ns->href, BAD_CAST "http://www.w3.org/2005/Atom")) + ) + return TRUE; + + return FALSE; +} + +static gboolean +atom_update (FeedParser* fparser) +{ + xmlNodePtr node; + xmlNodePtr child; + gint64 date; + gint64 newdate; + + date = katze_item_get_added (fparser->item); + + node = fparser->node; + child = node->children; + while (child) + { + if (child->type == XML_ELEMENT_NODE) + { + if (!(xmlStrcmp (child->name, BAD_CAST "updated"))) + { + fparser->node = child; + newdate = feed_get_element_date (fparser); + fparser->node = node; + return (date != newdate); + } + } + child = child->next; + } + return TRUE; +} + +static gboolean +atom_preferred_link (const gchar* old, + const gchar* new) +{ + guint i; + gint iold; + gint inew; + gchar* rels[5] = + { + "enclosure", + "via", + "related", + "alternate", + "self", + }; + + iold = inew = -1; + for (i = 0; i < 5; i++) + { + if (old && g_str_equal (old, rels[i])) + iold = i; + if (new && g_str_equal (new, rels[i])) + inew = i; + } + return (inew > iold); +} + +static void +atom_get_link (KatzeItem* item, + xmlNodePtr node) +{ + gchar* oldtype; + gchar* newtype; + gchar* oldrel; + gchar* newrel; + gchar* href; + gboolean oldishtml; + gboolean newishtml; + gboolean newlink; + + newlink = FALSE; + oldtype = atom_get_link_attribute (item, "linktype"); + oldrel = atom_get_link_attribute (item, "linkrel"); + + newtype = (gchar*)xmlGetProp (node, BAD_CAST "type"); + newrel = (gchar*)xmlGetProp (node, BAD_CAST "rel"); + href = (gchar*)xmlGetProp (node, BAD_CAST "href"); + + if (!newrel) + newrel = g_strdup ("alternate"); + + oldishtml = (oldtype && g_str_equal (oldtype, "text/html")); + newishtml = (newtype && g_str_equal (newtype, "text/html")); + + /* prefer HTML links over anything else. + * if the previous link was already HTML, decide which link + * we prefer. + */ + if ((newishtml && oldishtml) || (!newishtml && !oldishtml)) + newlink = atom_preferred_link (oldrel, newrel); + else + newlink = newishtml; + + if (newlink) + { + katze_item_set_uri (item, href); + atom_set_link_attribute (item, "linkrel", newrel); + atom_set_link_attribute (item, "linktype", newrel); + } + else + { + xmlFree (href); + xmlFree (newrel); + xmlFree (newtype); + } +} + +static void +atom_preparse_entry (FeedParser* fparser) +{ + fparser->item = katze_item_new (); +} + +static void +atom_parse_entry (FeedParser* fparser) +{ + xmlNodePtr node; + gchar* content; + gint64 date; + + node = fparser->node; + content = NULL; + + if (!xmlStrcmp (node->name, BAD_CAST "id")) + { + content = feed_get_element_string (fparser); + katze_item_set_token (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "title")) + { + content = feed_get_element_string (fparser); + katze_item_set_name (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "summary")) + { + content = feed_get_element_string (fparser); + katze_item_set_text (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "updated")) + { + date = feed_get_element_date (fparser); + katze_item_set_added (fparser->item, date); + } + else if (!xmlStrcmp (node->name, BAD_CAST "icon")) + { + content = feed_get_element_string (fparser); + katze_item_set_icon (fparser->item, content); + } + /* FIXME content can be used in some cases where there + * is no summary, but it needs additional work, + * as it can be HTML, or base64 encoded. + * see the spec. + */ + else if (!xmlStrcmp (node->name, BAD_CAST "content")) + { + /* Only retrieve content if there is no summary */ + if (!katze_item_get_text (fparser->item)) + { + content = feed_get_element_string (fparser); + katze_item_set_text (fparser->item, content); + } + } + else if (!(xmlStrcmp (node->name, BAD_CAST "link"))) + atom_get_link (fparser->item, node); + + g_free (content); +} + +static void +atom_postparse_entry (FeedParser* fparser) +{ + if (!*fparser->error) + { + /* + * Verify that the required Atom elements are added + * (as per the spec) + */ + if (!katze_item_get_token (fparser->item) || + !katze_item_get_name (fparser->item) || + !katze_item_get_uri (fparser->item) || + !katze_item_get_added (fparser->item)) + { + feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find required Atom entry elements in XML data.")); + } + } + + if (KATZE_IS_ITEM (fparser->item)) + { + atom_set_link_attribute (fparser->item, "linkrel", NULL); + atom_set_link_attribute (fparser->item, "linktype", NULL); + + if (*fparser->error) + { + g_object_unref (fparser->item); + fparser->item = NULL; + } + } +} + +static void +atom_parse_feed (FeedParser* fparser) +{ + FeedParser* eparser; + xmlNodePtr node; + gchar* content; + gint64 date; + + node = fparser->node; + content = NULL; + + if (!xmlStrcmp (node->name, BAD_CAST "id")) + { + content = feed_get_element_string (fparser); + katze_item_set_token (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "title")) + { + content = feed_get_element_string (fparser); + katze_item_set_name (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "subtitle")) + { + content = feed_get_element_string (fparser); + katze_item_set_text (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "updated")) + { + date = feed_get_element_date (fparser); + katze_item_set_added (fparser->item, date); + } + else if (!xmlStrcmp (node->name, BAD_CAST "icon")) + { + content = feed_get_element_string (fparser); + katze_item_set_icon (fparser->item, content); + } + else if (!(xmlStrcmp (node->name, BAD_CAST "link"))) + { + atom_get_link (fparser->item, node); + } + else if (!xmlStrcmp (node->name, BAD_CAST "entry")) + { + eparser = g_new0 (FeedParser, 1); + eparser->doc = fparser->doc; + eparser->node = fparser->node; + eparser->error = fparser->error; + eparser->preparse = atom_preparse_entry; + eparser->parse = atom_parse_entry; + eparser->postparse = atom_postparse_entry; + + feed_parse_node (eparser); + + if (KATZE_IS_ITEM (eparser->item)) + { + KatzeItem* item; + if (!(item = feed_item_exists (KATZE_ARRAY (fparser->item), eparser->item))) + katze_array_add_item (KATZE_ARRAY (fparser->item), eparser->item); + else + { + g_object_unref (eparser->item); + katze_array_move_item (KATZE_ARRAY (fparser->item), item, 0); + } + } + g_free (eparser); + + } + g_free (content); +} + +static void +atom_postparse_feed (FeedParser* fparser) +{ + if (KATZE_IS_ARRAY (fparser->item)) + { + atom_set_link_attribute (fparser->item, "linkrel", NULL); + atom_set_link_attribute (fparser->item, "linktype", NULL); + } + + if (!*fparser->error) + { + /* + * Verify that the required Atom elements are added + * (as per the spec) + */ + if (!katze_item_get_token (fparser->item) || + !katze_item_get_name (fparser->item) || + !katze_item_get_added (fparser->item)) + { + feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find required Atom feed elements in XML data.")); + } + } +} + +FeedParser* +atom_init_parser (void) +{ + FeedParser* fparser; + + fparser = g_new0 (FeedParser, 1); + g_return_val_if_fail (fparser, NULL); + + fparser->isvalid = atom_is_valid; + fparser->update = atom_update; + fparser->parse = atom_parse_feed; + fparser->postparse = atom_postparse_feed; + + return fparser; +} + diff --git a/extensions/feed-panel/feed-atom.h b/extensions/feed-panel/feed-atom.h new file mode 100644 index 00000000..df73c8b5 --- /dev/null +++ b/extensions/feed-panel/feed-atom.h @@ -0,0 +1,25 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __FEED_ATOM_H__ +#define __FEED_ATOM_H__ + +#include "feed-parse.h" + +G_BEGIN_DECLS + +FeedParser* +atom_init_parser (void); + +G_END_DECLS + +#endif /* __FEED_ATOM_H__ */ + diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c new file mode 100644 index 00000000..0abf8be6 --- /dev/null +++ b/extensions/feed-panel/feed-panel.c @@ -0,0 +1,850 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "feed-panel.h" + +#include +#include +#include + +#if HAVE_CONFIG_H + #include +#endif + +#define STOCK_FEED_PANEL "feed-panel" + +struct _FeedPanel +{ + GtkVBox parent_instance; + + GtkWidget* toolbar; + GtkWidget* treeview; + GtkWidget* webview; + GtkWidget* delete; + GdkPixbuf* pixbuf; + KatzeNet* net; +}; + +struct _FeedPanelClass +{ + GtkVBoxClass parent_class; +}; + +static void +feed_panel_viewable_iface_init (MidoriViewableIface* iface); + +static void +feed_panel_insert_item (FeedPanel* panel, + GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeItem* item); + +static void +feed_panel_disconnect_feed (FeedPanel* panel, + KatzeArray* feed); + +G_DEFINE_TYPE_WITH_CODE (FeedPanel, feed_panel, GTK_TYPE_VBOX, + G_IMPLEMENT_INTERFACE (MIDORI_TYPE_VIEWABLE, + feed_panel_viewable_iface_init)); + +enum +{ + ADD_FEED, + REMOVE_FEED, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +static void +feed_panel_treeview_render_icon_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + FeedPanel* panel) +{ + GdkPixbuf* pixbuf; + KatzeItem* item; + KatzeItem* pitem; + const gchar* uri; + + gtk_tree_model_get (model, iter, 0, &item, -1); + g_assert (KATZE_IS_ITEM (item)); + + if (!KATZE_IS_ARRAY (item)) + { + pitem = katze_item_get_parent (item); + g_assert (KATZE_IS_ITEM (pitem)); + } + else + pitem = item; + + uri = katze_item_get_uri (pitem); + pixbuf = katze_net_load_icon (panel->net, uri, NULL, NULL, NULL); + if (!pixbuf) + pixbuf = panel->pixbuf; + + g_object_set (renderer, "pixbuf", pixbuf, NULL); + + if (pixbuf != panel->pixbuf) + g_object_unref (pixbuf); +} + +static void +feed_panel_treeview_render_text_cb (GtkTreeViewColumn* column, + GtkCellRenderer* renderer, + GtkTreeModel* model, + GtkTreeIter* iter, + GtkWidget* treeview) +{ + KatzeItem* item; + const gchar* title; + + gtk_tree_model_get (model, iter, 0, &item, -1); + g_assert (KATZE_IS_ITEM (item)); + + title = katze_item_get_name (item); + if (!title) + title = katze_item_get_text (item); + if (!title) + title = katze_item_get_uri (item); + + g_object_set (renderer, "text", title, NULL); + g_object_unref (item); +} + +static void +feed_panel_add_item_cb (KatzeArray* feed, + KatzeItem* child, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + GtkTreeIter child_iter; + KatzeItem* item; + gint i; + + g_return_if_fail (KATZE_IS_ARRAY (feed)); + g_return_if_fail (KATZE_IS_ITEM (child)); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); + + if (KATZE_IS_ARRAY (child)) + { + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &child_iter, + NULL, G_MAXINT, 0, child, -1); + } + else + { + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (item == KATZE_ITEM (feed)) + { + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &child_iter, + &iter, 0, 0, child, -1); + + g_object_unref (child); + g_object_unref (item); + break; + } + g_object_unref (item); + } + } + feed_panel_insert_item (panel, GTK_TREE_STORE (model), &child_iter, child); +} + +static void +feed_panel_remove_iter (GtkTreeModel* model, + KatzeItem* removed_item) +{ + guint i; + GtkTreeIter iter; + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + if (item == removed_item) + { + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); + g_object_unref (item); + break; + } + g_object_unref (item); + i++; + } +} + +static void +feed_panel_remove_item_cb (KatzeArray* feed, + KatzeItem* child, + FeedPanel* panel) +{ + GtkTreeModel* model; + + g_assert (KATZE_IS_ARRAY (feed)); + g_assert (KATZE_IS_ITEM (child)); + + if (KATZE_IS_ARRAY (child)) + feed_panel_disconnect_feed (panel, KATZE_ARRAY (child)); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); + feed_panel_remove_iter (model, child); + g_object_unref (child); +} + +static void +feed_panel_move_item_cb (KatzeArray* feed, + KatzeItem* child, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + guint i; + + g_assert (KATZE_IS_ARRAY (feed)); + g_assert (KATZE_IS_ITEM (child)); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); + + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + if (item == child) + { + gtk_tree_store_move_after (GTK_TREE_STORE (model), &iter, NULL); + g_object_unref (item); + break; + } + g_object_unref (item); + i++; + } +} + +static void +feed_panel_disconnect_feed (FeedPanel* panel, + KatzeArray* feed) +{ + KatzeItem* item; + guint i; + + g_return_if_fail (KATZE_IS_ARRAY (feed)); + + g_signal_handlers_disconnect_by_func (feed, + feed_panel_add_item_cb, panel); + g_signal_handlers_disconnect_by_func (feed, + feed_panel_remove_item_cb, panel); + g_signal_handlers_disconnect_by_func (feed, + feed_panel_move_item_cb, panel); + + i = 0; + while ((item = katze_array_get_nth_item (feed, i++))) + { + if (KATZE_IS_ARRAY (item)) + feed_panel_disconnect_feed (panel, KATZE_ARRAY (item)); + g_object_unref (item); + } +} + +static void +feed_panel_insert_item (FeedPanel* panel, + GtkTreeStore* treestore, + GtkTreeIter* parent, + KatzeItem* item) +{ + g_return_if_fail (KATZE_IS_ITEM (item)); + + if (KATZE_IS_ARRAY (item)) + { + g_signal_connect_after (item, "add-item", + G_CALLBACK (feed_panel_add_item_cb), panel); + g_signal_connect_after (item, "move-item", + G_CALLBACK (feed_panel_move_item_cb), panel); + + if (!parent) + { + g_signal_connect (item, "remove-item", + G_CALLBACK (feed_panel_remove_item_cb), panel); + } + } +} + +static void +feed_panel_row_activated_cb (GtkTreeView* treeview, + GtkTreePath* path, + GtkTreeViewColumn* column, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + const gchar* uri; + + model = gtk_tree_view_get_model (treeview); + + if (gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + uri = katze_item_get_uri (item); + if (uri && *uri) + { + MidoriWebSettings* settings; + MidoriBrowser* browser; + gint n; + + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + n = midori_browser_add_item (browser, item); + + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (browser, n); + g_object_unref (settings); + + } + g_object_unref (item); + } +} + +static void +feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + gboolean sensitive = FALSE; + + if (katze_tree_view_get_selected_iter (treeview, &model, &iter)) + { + const gchar* uri; + const gchar* text; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + uri = katze_item_get_uri (item); + + if (uri) + { + if (KATZE_IS_ARRAY (item)) + { + gint64 date; + SoupDate* sdate; + + text = NULL; + date = katze_item_get_added (item); + if (date) + { + sdate = soup_date_new_from_time_t ((time_t) date); + text = g_strdup_printf ("Last updated %s.", soup_date_to_string (sdate, SOUP_DATE_HTTP)); + soup_date_free (sdate); + } + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (panel->webview), text ? text : "", uri); + g_free ((gchar*) text); + + sensitive = TRUE; + } + else + { + text = katze_item_get_text (item); + if (text) + { + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (panel->webview), text, uri); + } + } + g_object_unref (item); + } + } + if (GTK_IS_WIDGET (panel->delete)) + gtk_widget_set_sensitive (panel->delete, sensitive); +} + +static void +feed_panel_popup_item (GtkWidget* menu, + const gchar* stock_id, + const gchar* label, + KatzeItem* item, + gpointer callback, + FeedPanel* panel) +{ + const gchar* uri; + GtkWidget* menuitem; + + uri = katze_item_get_uri (item); + + menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); + if (label) + gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child ( + GTK_BIN (menuitem))), label); + g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item); + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), panel); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); +} + +static void +feed_panel_open_activate_cb (GtkWidget* menuitem, + FeedPanel* panel) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + MidoriBrowser* browser; + + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + midori_browser_set_current_uri (browser, uri); + } +} + +static void +feed_panel_open_in_tab_activate_cb (GtkWidget* menuitem, + FeedPanel* panel) +{ + KatzeItem* item; + const gchar* uri; + guint n; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + + if ((uri = katze_item_get_uri (item)) && *uri) + { + MidoriWebSettings* settings; + MidoriBrowser* browser; + + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + n = midori_browser_add_item (browser, item); + + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (browser, n); + g_object_unref (settings); + } +} + +static void +feed_panel_open_in_window_activate_cb (GtkWidget* menuitem, + FeedPanel* panel) +{ + KatzeItem* item; + const gchar* uri; + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + uri = katze_item_get_uri (item); + + if (uri && *uri) + { + MidoriBrowser* browser; + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + g_signal_emit_by_name (browser, "new-window", uri); + } +} + +static void +feed_panel_delete_activate_cb (GtkWidget* menuitem, + FeedPanel* panel) +{ + KatzeItem* item; + + g_return_if_fail (FEED_IS_PANEL (panel)); + + item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); + g_signal_emit (panel, signals[REMOVE_FEED], 0, item); +} + +static void +feed_panel_popup (GtkWidget* widget, + GdkEventButton* event, + KatzeItem* item, + FeedPanel* panel) +{ + GtkWidget* menu; + + menu = gtk_menu_new (); + if (!KATZE_IS_ARRAY (item)) + { + feed_panel_popup_item (menu, GTK_STOCK_OPEN, NULL, + item, feed_panel_open_activate_cb, panel); + feed_panel_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"), + item, feed_panel_open_in_tab_activate_cb, panel); + feed_panel_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"), + item, feed_panel_open_in_window_activate_cb, panel); + } + else + { + feed_panel_popup_item (menu, GTK_STOCK_DELETE, NULL, + item, feed_panel_delete_activate_cb, panel); + } + + sokoke_widget_popup (widget, GTK_MENU (menu), + event, SOKOKE_MENU_POSITION_CURSOR); +} + +static gboolean +feed_panel_button_release_event_cb (GtkWidget* widget, + GdkEventButton* event, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + if (event->button != 2 && event->button != 3) + return FALSE; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + + if (event->button == 2) + { + const gchar* uri = katze_item_get_uri (item); + + if (uri && *uri) + { + MidoriWebSettings* settings; + MidoriBrowser* browser; + gint n; + + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + n = midori_browser_add_item (browser, item); + + settings = katze_object_get_object (browser, "settings"); + if (!katze_object_get_boolean (settings, "open-tabs-in-the-background")) + midori_browser_set_current_page (browser, n); + g_object_unref (settings); + } + } + else + feed_panel_popup (widget, event, item, panel); + + g_object_unref (item); + return TRUE; + } + return FALSE; +} + +static void +feed_panel_popup_menu_cb (GtkWidget* widget, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + KatzeItem* item; + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (widget), &model, &iter)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + feed_panel_popup (widget, NULL, item, panel); + g_object_unref (item); + } +} + +void +feed_panel_add_feeds (FeedPanel* panel, + KatzeItem* feed) +{ + GtkTreeModel* model; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); + g_assert (GTK_IS_TREE_MODEL (model)); + + feed_panel_insert_item (panel, GTK_TREE_STORE (model), NULL, feed); +} + +static gboolean +webview_button_press_event_cb (GtkWidget* widget, + GdkEventButton* event) +{ + /* Disable the popup menu */ + return (event->button == 3); +} + +static gboolean +webview_navigation_request_cb (WebKitWebView* web_view, + WebKitWebFrame* frame, + WebKitNetworkRequest* request, + WebKitWebNavigationAction* navigation_action, + WebKitWebPolicyDecision* policy_decision, + FeedPanel* panel) +{ + if (webkit_web_navigation_action_get_reason (navigation_action) == + WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) + { + MidoriBrowser* browser; + const gchar* uri; + gint n; + + browser = midori_browser_get_for_widget (GTK_WIDGET (panel)); + uri = webkit_network_request_get_uri (request); + n = midori_browser_add_uri (browser, uri); + midori_browser_set_current_page (browser, n); + } + return TRUE; +} + +static const gchar* +feed_panel_get_label (MidoriViewable* viewable) +{ + return _("Feeds"); +} + +static const gchar* +feed_panel_get_stock_id (MidoriViewable* viewable) +{ + return STOCK_FEED_PANEL; +} + +static void +feed_panel_add_clicked_cb (GtkWidget* toolitem, + FeedPanel* panel) +{ + g_return_if_fail (FEED_IS_PANEL (panel)); + + g_signal_emit (panel, signals[ADD_FEED], 0); +} + +static void +feed_panel_delete_clicked_cb (GtkWidget* toolitem, + FeedPanel* panel) +{ + GtkTreeModel* model; + GtkTreeIter iter; + + g_return_if_fail (FEED_IS_PANEL (panel)); + + if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (panel->treeview), + &model, &iter)) + { + KatzeItem* item; + + gtk_tree_model_get (model, &iter, 0, &item, -1); + g_signal_emit (panel, signals[REMOVE_FEED], 0, item); + g_object_unref (item); + } +} + +static GtkWidget* +feed_panel_get_toolbar (MidoriViewable* viewable) +{ + FeedPanel* panel = FEED_PANEL (viewable); + + if (!panel->toolbar) + { + GtkWidget* toolbar; + GtkToolItem* toolitem; + + toolbar = gtk_toolbar_new (); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON); + panel->toolbar = toolbar; + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed")); + gtk_tool_item_set_is_important (toolitem, TRUE); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (feed_panel_add_clicked_cb), panel); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); + gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Delete feed")); + g_signal_connect (toolitem, "clicked", + G_CALLBACK (feed_panel_delete_clicked_cb), panel); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); + gtk_widget_show (GTK_WIDGET (toolitem)); + panel->delete = GTK_WIDGET (toolitem);; + + feed_panel_cursor_or_row_changed_cb ( + GTK_TREE_VIEW (panel->treeview), panel); + g_signal_connect (panel->delete, "destroy", + G_CALLBACK (gtk_widget_destroyed), &panel->delete); + } + + return panel->toolbar; +} + +static void +feed_panel_finalize (GObject* object) +{ + FeedPanel* panel = FEED_PANEL (object); + + g_object_unref (panel->pixbuf); + g_object_unref (panel->net); +} + +static void +feed_panel_viewable_iface_init (MidoriViewableIface* iface) +{ + iface->get_stock_id = feed_panel_get_stock_id; + iface->get_label = feed_panel_get_label; + iface->get_toolbar = feed_panel_get_toolbar; +} + +static void +feed_panel_class_init (FeedPanelClass* class) +{ + GObjectClass* gobject_class; + + signals[ADD_FEED] = g_signal_new ( + "add-feed", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[REMOVE_FEED] = g_signal_new ( + "remove-feed", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = feed_panel_finalize; +} + +static void +feed_panel_init (FeedPanel* panel) +{ + GtkTreeStore* model; + GtkWidget* treewin; + GtkWidget* treeview; + GtkWidget* webview; + GtkWidget* paned; + GtkTreeViewColumn* column; + GtkCellRenderer* renderer_pixbuf; + GtkCellRenderer* renderer_text; + GtkIconFactory *factory; + GtkIconSource *icon_source; + GtkIconSet *icon_set; + WebKitWebSettings* settings; + PangoFontDescription* font_desc; + const gchar* family; + gint size; + GtkStockItem items[] = + { + { STOCK_FEED_PANEL, N_("_Feeds"), 0, 0, NULL } + }; + + factory = gtk_icon_factory_new (); + gtk_stock_add (items, G_N_ELEMENTS (items)); + icon_set = gtk_icon_set_new (); + icon_source = gtk_icon_source_new (); + gtk_icon_source_set_icon_name (icon_source, STOCK_NEWS_FEED); + gtk_icon_set_add_source (icon_set, icon_source); + gtk_icon_source_free (icon_source); + gtk_icon_factory_add (factory, STOCK_FEED_PANEL, icon_set); + gtk_icon_set_unref (icon_set); + gtk_icon_factory_add_default (factory); + g_object_unref (factory); + + panel->net = katze_net_new (); + + model = gtk_tree_store_new (1, KATZE_TYPE_ITEM); + treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + panel->treeview = treeview; + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); + column = gtk_tree_view_column_new (); + renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, + (GtkTreeCellDataFunc)feed_panel_treeview_render_icon_cb, + panel, NULL); + renderer_text = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer_text, FALSE); + gtk_tree_view_column_set_cell_data_func (column, renderer_text, + (GtkTreeCellDataFunc)feed_panel_treeview_render_text_cb, + treeview, NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); + g_object_unref (model); + g_object_connect (treeview, + "signal::row-activated", + feed_panel_row_activated_cb, panel, + "signal::cursor-changed", + feed_panel_cursor_or_row_changed_cb, panel, + "signal::columns-changed", + feed_panel_cursor_or_row_changed_cb, panel, + "signal::button-release-event", + feed_panel_button_release_event_cb, panel, + "signal::popup-menu", + feed_panel_popup_menu_cb, panel, + NULL); + gtk_widget_show (treeview); + + webview = webkit_web_view_new (); + font_desc = treeview->style->font_desc; + family = pango_font_description_get_family (font_desc); + size = pango_font_description_get_size (font_desc) / PANGO_SCALE; + settings = webkit_web_settings_new (); + g_object_set (settings, "default-font-family", family, + "default-font-size", size, NULL); + g_object_set (webview, "settings", settings, NULL); + gtk_widget_set_size_request (webview, -1, 50); + g_object_connect (webview, + "signal::navigation-policy-decision-requested", + webview_navigation_request_cb, panel, + "signal::button-press-event", + webview_button_press_event_cb, NULL, + "signal::button-release-event", + webview_button_press_event_cb, NULL, + NULL); + panel->webview = webview; + + treewin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (treewin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (treewin), + GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (treewin), treeview); + gtk_widget_show (treewin); + + paned = gtk_vpaned_new (); + gtk_paned_pack1 (GTK_PANED (paned), treewin, TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (paned), webview, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (panel), paned, TRUE, TRUE, 0); + gtk_widget_show (webview); + gtk_widget_show (paned); + + panel->pixbuf = gtk_widget_render_icon (treeview, + STOCK_NEWS_FEED, GTK_ICON_SIZE_MENU, NULL); +} + +GtkWidget* +feed_panel_new (void) +{ + FeedPanel* panel = g_object_new (FEED_TYPE_PANEL, NULL); + + return GTK_WIDGET (panel); +} + diff --git a/extensions/feed-panel/feed-panel.h b/extensions/feed-panel/feed-panel.h new file mode 100644 index 00000000..2530feb3 --- /dev/null +++ b/extensions/feed-panel/feed-panel.h @@ -0,0 +1,51 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __FEED_PANEL_H__ +#define __FEED_PANEL_H__ + +#include + +G_BEGIN_DECLS + +#define FEED_TYPE_PANEL \ + (feed_panel_get_type ()) +#define FEED_PANEL(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), FEED_TYPE_PANEL, FeedPanel)) +#define FEED_PANEL_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), FEED_TYPE_PANEL, FeedPanelClass)) +#define FEED_IS_PANEL(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FEED_TYPE_PANEL)) +#define FEED_IS_PANEL_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), FEED_TYPE_PANEL)) +#define FEED_PANEL_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), FEED_TYPE_PANEL, FeedPanelClass)) + +typedef struct _FeedPanel FeedPanel; +typedef struct _FeedPanelClass FeedPanelClass; + +void +feed_panel_add_feeds (FeedPanel* panel, + KatzeItem* feed); + +void +feed_panel_set_editable (FeedPanel* panel, + gboolean editable); + +GType +feed_panel_get_type (void); + +GtkWidget* +feed_panel_new (void); + +G_END_DECLS + +#endif /* __FEED_PANEL_H__ */ diff --git a/extensions/feed-panel/feed-parse.c b/extensions/feed-panel/feed-parse.c new file mode 100644 index 00000000..442e5ed5 --- /dev/null +++ b/extensions/feed-panel/feed-parse.c @@ -0,0 +1,218 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "feed-parse.h" +#include + +gchar* +feed_get_element_string (FeedParser* fparser) +{ + xmlNodePtr node; + + node = fparser->node; + + if (!node->children || + xmlIsBlankNode (node->children) || + node->children->type != XML_TEXT_NODE + ) + { + /* Some servers add required elements with no content, + * create a dummy string to handle it. + */ + return g_strdup (" "); + } + + return (gchar* )xmlNodeListGetString (fparser->doc, node->children, 1); +} + +gint64 +feed_get_element_date (FeedParser* fparser) +{ + time_t date; + gchar* content; + + date = 0; + content = feed_get_element_string (fparser); + + if (content) + { + SoupDate* sdate; + + sdate = soup_date_new_from_string (content); + date = soup_date_to_time_t (sdate); + soup_date_free (sdate); + g_free (content); + } + return ((gint64)date); +} + +KatzeItem* +feed_item_exists (KatzeArray* array, + KatzeItem* item) +{ + const gchar* guid; + gchar* hstr; + guint hash; + + guid = katze_item_get_token (item); + if (!guid) + { + hstr = g_strjoin (NULL, + katze_item_get_name (item), + katze_item_get_uri (item), + katze_item_get_text (item), + NULL); + hash = g_str_hash (hstr); + g_free (hstr); + + hstr = g_strdup_printf ("%u", hash); + katze_item_set_token (item, hstr); + g_free (hstr); + + guid = katze_item_get_token (item); + } + + return (katze_array_find_token (array, guid)); +} + +void +feed_parse_node (FeedParser* fparser) +{ + xmlNodePtr node; + xmlNodePtr child; + + if (!*fparser->error) + { + if (fparser->preparse) + (*fparser->preparse) (fparser); + + if (fparser->parse) + { + node = fparser->node; + child = node->last; + + while (child) + { + if (child->type == XML_ELEMENT_NODE) + { + fparser->node = child; + + (*fparser->parse) (fparser); + + if (*fparser->error) + break; + } + child = child->prev; + } + fparser->node = node; + } + + if (fparser->postparse) + (*fparser->postparse) (fparser); + } +} + +static void +feed_parse_doc (xmlDocPtr doc, + GSList* parsers, + KatzeArray* array, + GError** error) +{ + FeedParser* fparser; + xmlNodePtr root; + gboolean isvalid; + + root = xmlDocGetRootElement (doc); + + if (!root) + { + *error = g_error_new (FEED_PARSE_ERROR, + FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find root element in feed XML data.")); + return; + } + + while (parsers) + { + fparser = (FeedParser*)parsers->data; + fparser->error = error; + fparser->doc = doc; + fparser->node = root; + + if (fparser && fparser->isvalid) + { + isvalid = (*fparser->isvalid) (fparser); + + if (*fparser->error) + return; + + if (isvalid) + { + fparser->item = KATZE_ITEM (array); + + if (fparser->update && + (*fparser->update) (fparser)) + feed_parse_node (fparser); + } + } + + fparser->error = NULL; + fparser->doc = NULL; + fparser->node = NULL; + + if (isvalid) + return; + + parsers = g_slist_next (parsers); + } + + *error = g_error_new (FEED_PARSE_ERROR, + FEED_PARSE_ERROR_INVALID_FORMAT, + _("Unsupported feed format.")); +} + +gboolean +parse_feed (gchar* data, + gint64 length, + GSList* parsers, + KatzeArray* array, + GError** error) +{ + xmlDocPtr doc; + xmlErrorPtr xerror; + + LIBXML_TEST_VERSION + + doc = xmlReadMemory ( + data, length, "feedfile.xml", NULL, + XML_PARSE_NOWARNING | XML_PARSE_NOERROR /*| XML_PARSE_RECOVER*/ + ); + + if (doc) + { + feed_parse_doc (doc, parsers, array, error); + xmlFreeDoc (doc); + } + else + { + xerror = xmlGetLastError (); + *error = g_error_new (FEED_PARSE_ERROR, + FEED_PARSE_ERROR_PARSE, + _("Failed to parse XML feed: %s"), + xerror->message); + xmlResetLastError (); + } + xmlCleanupParser (); + xmlMemoryDump (); + + return *error ? FALSE : TRUE; +} + diff --git a/extensions/feed-panel/feed-parse.h b/extensions/feed-panel/feed-parse.h new file mode 100644 index 00000000..493b7ef7 --- /dev/null +++ b/extensions/feed-panel/feed-parse.h @@ -0,0 +1,77 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __FEED_PARSE_H__ +#define __FEED_PARSE_H__ + +#include + +#if HAVE_CONFIG_H + #include +#endif + +#include +#include + +G_BEGIN_DECLS + +#define FEED_PARSE_ERROR g_quark_from_string("FEED_PARSE_ERROR") + +typedef enum +{ + FEED_PARSE_ERROR_PARSE, + FEED_PARSE_ERROR_INVALID_FORMAT, + FEED_PARSE_ERROR_INVALID_VERSION, + FEED_PARSE_ERROR_MISSING_ELEMENT + +} FeedBarError; + +typedef struct _FeedParser +{ + xmlDocPtr doc; /* The XML document */ + xmlNodePtr node; /* The XML node at a specific point */ + KatzeItem* item; + GError** error; + + gboolean (*isvalid) (struct _FeedParser* fparser); + gboolean (*update) (struct _FeedParser* fparser); + void (*preparse) (struct _FeedParser* fparser); + void (*parse) (struct _FeedParser* fparser); + void (*postparse) (struct _FeedParser* fparser); + +} FeedParser; + +#define feed_parser_set_error(fparser, err, msg) \ + *(fparser)->error = g_error_new ( \ + FEED_PARSE_ERROR, (err), (msg)) +gchar* +feed_get_element_string (FeedParser* fparser); + +gint64 +feed_get_element_date (FeedParser* fparser); + +KatzeItem* +feed_item_exists (KatzeArray* array, + KatzeItem* item); +void +feed_parse_node (FeedParser* fparser); + +gboolean +parse_feed (gchar* data, + gint64 length, + GSList* parsers, + KatzeArray* array, + GError** error); + +G_END_DECLS + +#endif /* __FEED_PARSE_H__ */ + diff --git a/extensions/feed-panel/feed-rss.c b/extensions/feed-panel/feed-rss.c new file mode 100644 index 00000000..d830806e --- /dev/null +++ b/extensions/feed-panel/feed-rss.c @@ -0,0 +1,249 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "feed-rss.h" + +static gboolean +rss_is_valid (FeedParser* fparser) +{ + xmlNodePtr node; + xmlNodePtr child; + xmlChar* str; + gboolean valid; + + node = fparser->node; + + if (!(xmlStrcmp (node->name, BAD_CAST "rss"))) + { + if ((str = xmlGetProp (node, BAD_CAST "version"))) + { + valid = !xmlStrcmp (str, BAD_CAST "2.0"); + xmlFree (str); + + if (valid) + { + child = node->children; + while (child) + { + if (child->type == XML_ELEMENT_NODE && + !(xmlStrcmp (child->name, BAD_CAST "channel"))) + { + fparser->node = child; + return TRUE; + } + child = child->next; + } + + feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find channel element in RSS XML data.")); + } + else + { + feed_parser_set_error (fparser, FEED_PARSE_ERROR_INVALID_VERSION, + _("Unsupported RSS version found.")); + } + } + } + return FALSE; +} + +static gboolean +rss_update (FeedParser* fparser) +{ + xmlNodePtr node; + xmlNodePtr child; + gint64 date; + gint64 newdate; + + date = katze_item_get_added (fparser->item); + + node = fparser->node; + child = node->children; + while (child) + { + if (child->type == XML_ELEMENT_NODE) + { + if (!(xmlStrcmp (child->name, BAD_CAST "lastBuildDate"))) + { + fparser->node = child; + newdate = feed_get_element_date (fparser); + fparser->node = node; + return (date != newdate); + } + } + child = child->next; + } + return TRUE; +} + +static void +rss_preparse_item (FeedParser* fparser) +{ + fparser->item = katze_item_new (); +} + +static void +rss_parse_item (FeedParser* fparser) +{ + xmlNodePtr node; + gchar* content; + gint64 date; + + node = fparser->node; + content = NULL; + + if (!xmlStrcmp (node->name, BAD_CAST "guid")) + { + content = feed_get_element_string (fparser); + katze_item_set_token (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "title")) + { + content = feed_get_element_string (fparser); + katze_item_set_name (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "description")) + { + content = feed_get_element_string (fparser); + katze_item_set_text (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "pubDate")) + { + date = feed_get_element_date (fparser); + katze_item_set_added (fparser->item, date); + } + else if (!(xmlStrcmp (node->name, BAD_CAST "link"))) + { + content = feed_get_element_string (fparser); + katze_item_set_uri (fparser->item, content); + } + g_free (content); +} + +static void +rss_postparse_item (FeedParser* fparser) +{ + if (!*fparser->error) + { + /* + * Verify that the required Atom elements are added + * (as per the spec) + */ + if (!katze_item_get_name (fparser->item) && + !katze_item_get_text (fparser->item)) + { + feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find required RSS item elements in XML data.")); + } + } + + if (*fparser->error && KATZE_IS_ITEM (fparser->item)) + { + g_object_unref (fparser->item); + fparser->item = NULL; + } +} + +static void +rss_parse_channel (FeedParser* fparser) +{ + FeedParser* eparser; + xmlNodePtr node; + gchar* content; + gint64 date; + + node = fparser->node; + content = NULL; + + if (!xmlStrcmp (node->name, BAD_CAST "title")) + { + content = feed_get_element_string (fparser); + katze_item_set_name (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "description")) + { + content = feed_get_element_string (fparser); + katze_item_set_text (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "lastBuildDate")) + { + date = feed_get_element_date (fparser); + katze_item_set_added (fparser->item, date); + } + else if (!(xmlStrcmp (node->name, BAD_CAST "link"))) + { + content = feed_get_element_string (fparser); + katze_item_set_uri (fparser->item, content); + } + else if (!xmlStrcmp (node->name, BAD_CAST "item")) + { + eparser = g_new0 (FeedParser, 1); + eparser->doc = fparser->doc; + eparser->node = fparser->node; + eparser->error = fparser->error; + eparser->preparse = rss_preparse_item; + eparser->parse = rss_parse_item; + eparser->postparse = rss_postparse_item; + + feed_parse_node (eparser); + + if (KATZE_IS_ITEM (eparser->item)) + { + KatzeItem* item; + if (!(item = feed_item_exists (KATZE_ARRAY (fparser->item), eparser->item))) + katze_array_add_item (KATZE_ARRAY (fparser->item), eparser->item); + else + { + g_object_unref (eparser->item); + katze_array_move_item (KATZE_ARRAY (fparser->item), item, 0); + } + } + g_free (eparser); + + } + g_free (content); +} + +static void +rss_postparse_channel (FeedParser* fparser) +{ + if (!*fparser->error) + { + /* + * Verify that the required Atom elements are added + * (as per the spec) + */ + if (!katze_item_get_name (fparser->item) || + !katze_item_get_text (fparser->item) || + !katze_item_get_uri (fparser->item)) + { + feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, + _("Failed to find required RSS channel elements in XML data.")); + } + } +} + +FeedParser* +rss_init_parser (void) +{ + FeedParser* fparser; + + fparser = g_new0 (FeedParser, 1); + g_return_val_if_fail (fparser, NULL); + + fparser->isvalid = rss_is_valid; + fparser->update = rss_update; + fparser->parse = rss_parse_channel; + fparser->postparse = rss_postparse_channel; + + return fparser; +} + diff --git a/extensions/feed-panel/feed-rss.h b/extensions/feed-panel/feed-rss.h new file mode 100644 index 00000000..d5ccc047 --- /dev/null +++ b/extensions/feed-panel/feed-rss.h @@ -0,0 +1,25 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#ifndef __FEED_RSS_H__ +#define __FEED_RSS_H__ + +#include "feed-parse.h" + +G_BEGIN_DECLS + +FeedParser* +rss_init_parser (void); + +G_END_DECLS + +#endif /* __FEED_RSS_H__ */ + diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c new file mode 100644 index 00000000..e1c4d723 --- /dev/null +++ b/extensions/feed-panel/main.c @@ -0,0 +1,472 @@ +/* + Copyright (C) 2009 Dale Whittaker + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +#include "feed-panel.h" +#include "feed-atom.h" +#include "feed-rss.h" + +#include + +#define EXTENSION_NAME "FeedPanel" +#define UPDATE_FREQ 10 + +#define feed_get_flags(feed) \ + GPOINTER_TO_INT (g_object_get_data (G_OBJECT ((feed)), "flags")) + +#define feed_set_flags(feed, flags) \ + g_object_set_data (G_OBJECT ((feed)), "flags", \ + GINT_TO_POINTER ((flags))) + +#define feed_has_flags(feed, flags) \ + ((flags) & feed_get_flags ((feed))) + +#define feed_add_flags(feed, flags) \ + feed_set_flags ((feed), (feed_get_flags ((feed)) | (flags))) + +#define feed_remove_flags(feed, flags) \ + feed_set_flags ((feed), (feed_get_flags ((feed)) & ~(flags))) + +typedef struct +{ + MidoriBrowser* browser; + MidoriExtension* extension; + GtkWidget* panel; + KatzeArray* feeds; + KatzeNet* net; + GSList* parsers; + + guint source_id; + gboolean is_running; + +} FeedPrivate; + +typedef struct +{ + MidoriExtension* extension; + GSList* parsers; + KatzeArray* feed; + +} FeedNetPrivate; + +enum +{ + FEED_NEW, + FEED_READ, + FEED_REMOVE +}; + +static void +feed_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension); + +static void +feed_deactivate_cb (MidoriExtension* extension, + FeedPrivate* priv) +{ + if (priv) + { + MidoriApp* app = midori_extension_get_app (extension); + + g_signal_handlers_disconnect_by_func (app, + feed_app_add_browser_cb, extension); + g_signal_handlers_disconnect_by_func (extension, + feed_deactivate_cb, priv); + + if (priv->source_id) + g_source_remove (priv->source_id); + g_slist_foreach (priv->parsers, (GFunc)g_free, NULL); + g_slist_free (priv->parsers); + if (priv->feeds) + g_object_unref (priv->net); + if (priv->feeds) + g_object_unref (priv->feeds); + gtk_widget_destroy (priv->panel); + g_free (priv); + } +} + +static KatzeArray* +feed_add_item (KatzeArray* feeds, + const gchar* uri) +{ + KatzeArray* feed; + + feed = NULL; + + if (uri) + { + feed = katze_array_new (KATZE_TYPE_ITEM); + g_object_set_data_full (G_OBJECT (feed), "feeduri", + (gpointer) g_strdup ((uri)), g_free); + katze_array_add_item (feeds, feed); + } + return feed; +} + +static void +feed_save_items (MidoriExtension* extension, + KatzeArray* feed) +{ + KatzeItem* item; + gchar** sfeeds; + gint i; + gint n; + + g_return_if_fail (KATZE_IS_ARRAY (feed)); + + n = katze_array_get_length (feed); + sfeeds = g_new (gchar*, n + 1); + + for (i = 0; i < n; i++) + { + item = katze_array_get_nth_item (feed, i); + sfeeds[i] = (gchar*) g_object_get_data (G_OBJECT (item), "feeduri"); + } + sfeeds[n] = NULL; + + midori_extension_set_string_list (extension, "feeds", sfeeds, n); + g_free (sfeeds); +} + +static void +feed_handle_net_error (FeedNetPrivate* netpriv, + const gchar* msg) +{ + GtkWidget* dialog; + + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + _("Error")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", msg); + gtk_window_set_title (GTK_WINDOW (dialog), EXTENSION_NAME); + gtk_widget_show (dialog); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + + if (feed_has_flags (netpriv->feed, FEED_NEW)) + { + KatzeArray* parent; + KatzeItem* child; + + child = KATZE_ITEM (netpriv->feed); + parent = katze_item_get_parent (child); + katze_array_remove_item (parent, child); + feed_save_items (netpriv->extension, parent); + } + feed_remove_flags (netpriv->feed, FEED_READ); +} + +static gboolean +feed_status_cb (KatzeNetRequest* request, + FeedNetPrivate* netpriv) +{ + if (request->status == KATZE_NET_FAILED || + request->status == KATZE_NET_NOT_FOUND) + { + gchar* msg; + + msg = g_strdup_printf (_("Error loading feed %s"), + katze_item_get_uri (KATZE_ITEM (netpriv->feed))); + feed_handle_net_error (netpriv, msg); + g_free (msg); + + return FALSE; + } + return TRUE; +} + +static void +feed_transfer_cb (KatzeNetRequest* request, + FeedNetPrivate* netpriv) +{ + GError* error; + + if (request->status == KATZE_NET_MOVED) + return; + + g_return_if_fail (KATZE_IS_ARRAY (netpriv->feed)); + + error = NULL; + + if (request->data) + { + if (!parse_feed (request->data, request->length, + netpriv->parsers, netpriv->feed, &error)) + { + feed_handle_net_error (netpriv, error->message); + g_error_free (error); + } + else + { + if (feed_has_flags (netpriv->feed, FEED_REMOVE)) + { + KatzeArray* parent; + + /* deferred remove */ + parent = katze_item_get_parent (KATZE_ITEM (netpriv->feed)); + katze_array_remove_item (parent, netpriv->feed); + feed_save_items (netpriv->extension, parent); + } + else + feed_set_flags (netpriv->feed, 0); + } + } + + netpriv->parsers = NULL; + netpriv->feed = NULL; + g_free (netpriv); +} + +static void +update_feed (FeedPrivate* priv, + KatzeItem* feed) +{ + if (!(feed_has_flags (feed, FEED_READ))) + { + FeedNetPrivate* netpriv; + gchar* uri; + + uri = (gchar*) g_object_get_data (G_OBJECT (feed), "feeduri"); + feed_add_flags (feed, FEED_READ); + katze_item_set_uri (KATZE_ITEM (feed), uri); + netpriv = g_new0 (FeedNetPrivate, 1); + netpriv->parsers = priv->parsers; + netpriv->extension = priv->extension; + netpriv->feed = KATZE_ARRAY (feed); + + katze_net_load_uri (priv->net, + katze_item_get_uri (feed), + (KatzeNetStatusCb) feed_status_cb, + (KatzeNetTransferCb) feed_transfer_cb, + netpriv); + } +} + +static gboolean +update_feeds (FeedPrivate* priv) +{ + KatzeItem* feed; + gint i; + gint n; + + if (!priv->is_running) + { + priv->is_running = TRUE; + n = katze_array_get_length (priv->feeds); + + for (i = 0; i < n; i++) + { + feed = katze_array_get_nth_item (priv->feeds, i); + update_feed (priv, feed); + } + } + priv->is_running = FALSE; + return TRUE; +} + +static void +secondary_icon_released_cb (GtkAction* action, + GtkWidget* widget, + FeedPrivate* priv) +{ + const gchar* uri; + + g_assert (KATZE_IS_ARRAY (priv->feeds)); + + uri = midori_location_action_get_uri (MIDORI_LOCATION_ACTION (action)); + + if (uri && *uri) + { + KatzeArray* feed; + + feed = feed_add_item (priv->feeds, uri); + feed_save_items (priv->extension, priv->feeds); + feed_add_flags (feed, FEED_NEW); + update_feed (priv, KATZE_ITEM (feed)); + } +} + +static void +panel_add_feed_cb (FeedPanel* panel, + FeedPrivate* priv) +{ + GtkWidget* dialog; + GtkSizeGroup* sizegroup; + GtkWidget* hbox; + GtkWidget* label; + GtkWidget* entry; + + dialog = gtk_dialog_new_with_buttons ( + _("New feed"), GTK_WINDOW (priv->browser), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 5); + sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + hbox = gtk_hbox_new (FALSE, 8); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); + label = gtk_label_new_with_mnemonic (_("_Address:")); + gtk_size_group_add_widget (sizegroup, label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + entry = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_entry_set_text (GTK_ENTRY (entry), ""); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_widget_show_all (hbox); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + const gchar* uri; + + g_assert (KATZE_IS_ARRAY (priv->feeds)); + + uri = gtk_entry_get_text (GTK_ENTRY (entry)); + if (uri && *uri) + { + KatzeArray* feed; + + feed = feed_add_item (priv->feeds, uri); + feed_save_items (priv->extension, priv->feeds); + feed_add_flags (feed, FEED_NEW); + update_feed (priv, KATZE_ITEM (feed)); + } + } + gtk_widget_destroy (dialog); +} + +static void +panel_remove_feed_cb (FeedPanel* panel, + KatzeArray* feed, + FeedPrivate* priv) +{ + g_assert (KATZE_IS_ARRAY (priv->feeds)); + + if (feed_has_flags (feed, FEED_READ)) + feed_add_flags (feed, FEED_REMOVE); + else + { + feed_add_flags (feed, FEED_READ); + katze_array_remove_item (priv->feeds, feed); + feed_save_items (priv->extension, priv->feeds); + } +} + +static void +feed_app_add_browser_cb (MidoriApp* app, + MidoriBrowser* browser, + MidoriExtension* extension) +{ + GtkWidget* panel; + GtkWidget* addon; + GtkActionGroup* action_group; + GtkAction* action; + KatzeNet* net; + KatzeArray* feeds; + KatzeArray* feed; + FeedPrivate* priv; + gchar** sfeeds; + gsize i; + gsize n; + + priv = g_new0 (FeedPrivate, 1); + + panel = katze_object_get_object (browser, "panel"); + addon = feed_panel_new (); + gtk_widget_show (addon); + midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon)); + g_object_unref (panel); + + net = katze_net_new (); + feeds = katze_array_new (KATZE_TYPE_ARRAY); + feed_panel_add_feeds (FEED_PANEL (addon), KATZE_ITEM (feeds)); + + priv->extension = extension; + priv->browser = browser; + priv->panel = addon; + priv->net = net; + priv->feeds = feeds; + priv->parsers = g_slist_prepend (priv->parsers, atom_init_parser ()); + priv->parsers = g_slist_prepend (priv->parsers, rss_init_parser ()); + + sfeeds = midori_extension_get_string_list (extension, "feeds", &n); + g_assert (n == 0 || sfeeds); + + for (i = 0; i < n; i++) + { + if (sfeeds[i]) + { + feed = feed_add_item (feeds, sfeeds[i]); + update_feed (priv, KATZE_ITEM (feed)); + } + } + action_group = midori_browser_get_action_group (browser); + action = gtk_action_group_get_action (action_group, "Location"); + + g_signal_connect (addon, "add-feed", + G_CALLBACK (panel_add_feed_cb), priv); + g_signal_connect (addon, "remove-feed", + G_CALLBACK (panel_remove_feed_cb), priv); + g_signal_connect (action, "secondary-icon-released", + G_CALLBACK (secondary_icon_released_cb), priv); + g_signal_connect (extension, "deactivate", + G_CALLBACK (feed_deactivate_cb), priv); + + priv->source_id = g_timeout_add_seconds (UPDATE_FREQ * 60, + (GSourceFunc) update_feeds, priv); +} + +static void +feed_activate_cb (MidoriExtension* extension, + MidoriApp* app) +{ + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; + + browsers = katze_object_get_object (app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item (browsers, i++))) + feed_app_add_browser_cb (app, browser, extension); + g_object_unref (browsers); + + g_signal_connect (app, "add-browser", + G_CALLBACK (feed_app_add_browser_cb), extension); +} + +MidoriExtension* +extension_init (void) +{ + MidoriExtension* extension; + gchar* sfeed[2]; + + extension = g_object_new (MIDORI_TYPE_EXTENSION, + "name", _("Feed Panel"), + "description", _("Read Atom/ RSS feeds"), + "version", "0.1", + "authors", "Dale Whittaker ", + NULL); + + sfeed[0] = NULL; + midori_extension_install_string_list (extension, "feeds", sfeed, 1); + + g_signal_connect (extension, "activate", + G_CALLBACK (feed_activate_cb), NULL); + + return extension; +} From c4037afadcbba0b854d56747007704b6fb19b5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 25 Apr 2009 18:32:28 +0200 Subject: [PATCH 1052/2970] Fix the Delete All dialog icon when the Cooke Manager is detached --- extensions/cookie-manager.c | 39 +++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index 0d043718..ccf08a24 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -481,7 +481,7 @@ static void cm_delete_all_cookies_real(CMData *cmdata) static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CMData *cmdata) { GtkWidget *dialog; - GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); + MidoriBrowser *toplevel = midori_browser_get_for_widget(GTK_WIDGET(button)); const gchar *filter_text; dialog = gtk_message_dialog_new(GTK_WINDOW(toplevel), @@ -492,7 +492,8 @@ static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CMData *cmdat gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); /* steal Midori's icon :) */ - gtk_window_set_icon_name(GTK_WINDOW(dialog), gtk_window_get_icon_name(GTK_WINDOW(toplevel))); + if (toplevel != NULL) + gtk_window_set_icon_name(GTK_WINDOW(dialog), gtk_window_get_icon_name(GTK_WINDOW(toplevel))); filter_text = gtk_entry_get_text(GTK_ENTRY(cmdata->filter_entry)); if (*filter_text != '\0') @@ -825,11 +826,11 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); cmdata->delete_all_button = GTK_WIDGET(toolitem); - toolitem = gtk_separator_tool_item_new(); - gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolitem), FALSE); - gtk_tool_item_set_expand(toolitem, TRUE); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); - gtk_widget_show(GTK_WIDGET(toolitem)); + toolitem = gtk_separator_tool_item_new(); + gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(toolitem), FALSE); + gtk_tool_item_set_expand(toolitem, TRUE); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1); + gtk_widget_show(GTK_WIDGET(toolitem)); toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_ADD); gtk_tool_item_set_tooltip_text(toolitem, _("Expand All")); @@ -851,14 +852,14 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori gtk_label_set_line_wrap_mode(GTK_LABEL(cmdata->desc_label), PANGO_WRAP_CHAR); gtk_misc_set_alignment(GTK_MISC(cmdata->desc_label), 0, 0); gtk_misc_set_padding(GTK_MISC(cmdata->desc_label), 3, 3); - gtk_widget_show(cmdata->desc_label); + gtk_widget_show(cmdata->desc_label); desc_swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(desc_swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(desc_swin), GTK_SHADOW_NONE); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(desc_swin), cmdata->desc_label); - gtk_widget_show(desc_swin); + gtk_widget_show(desc_swin); cm_tree_prepare(cmdata); gtk_widget_show(cmdata->treeview); @@ -868,7 +869,7 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tree_swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(tree_swin), cmdata->treeview); - gtk_widget_show(tree_swin); + gtk_widget_show(tree_swin); filter_label = gtk_label_new(_("Filter:")); gtk_widget_show(filter_label); @@ -890,12 +891,12 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori filter_hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(filter_hbox), cmdata->filter_entry, TRUE, TRUE, 3); - gtk_widget_show(filter_hbox); + gtk_widget_show(filter_hbox); paned = gtk_vpaned_new(); gtk_paned_pack1(GTK_PANED(paned), tree_swin, TRUE, FALSE); gtk_paned_pack2(GTK_PANED(paned), desc_swin, FALSE, FALSE); - gtk_widget_show(paned); + gtk_widget_show(paned); cmdata->panel_page = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(cmdata->panel_page), filter_hbox, FALSE, FALSE, 5); @@ -921,14 +922,14 @@ static void cm_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, Midori static void cm_activate_cb(MidoriExtension *extension, MidoriApp *app, gpointer data) { - KatzeArray* browsers; - MidoriBrowser* browser; - guint i; + KatzeArray* browsers; + MidoriBrowser* browser; + guint i; - browsers = katze_object_get_object(app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item(browsers, i++))) - cm_app_add_browser_cb(app, browser, extension); + browsers = katze_object_get_object(app, "browsers"); + i = 0; + while ((browser = katze_array_get_nth_item(browsers, i++))) + cm_app_add_browser_cb(app, browser, extension); g_object_unref(browsers); g_signal_connect(app, "add-browser", G_CALLBACK(cm_app_add_browser_cb), extension); } From d5d1c8e76cc52a591e32406540cea32c0b237673 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 23:01:15 +0200 Subject: [PATCH 1053/2970] Add Feed Panel files to POTFILES.in --- po/POTFILES.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3aa6f688..542c6210 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -26,6 +26,11 @@ katze/katze-array.c katze/katze-arrayaction.c extensions/colorful-tabs.c extensions/cookie-manager.c +extensions/feed-panel/feed-atom.c +extensions/feed-panel/feed-panel.c +extensions/feed-panel/feed-parse.c +extensions/feed-panel/feed-rss.c +extensions/feed-panel/main.c extensions/mouse-gestures/main.c extensions/page-holder.c extensions/statusbar-features.c From b81e815427d83c6f5a5a2c63182638261fe3ae2a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 23:10:43 +0200 Subject: [PATCH 1054/2970] Skip files that are not shared libraries in the Plugins panel --- panels/midori-plugins.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/panels/midori-plugins.c b/panels/midori-plugins.c index ee663399..f8099299 100644 --- a/panels/midori-plugins.c +++ b/panels/midori-plugins.c @@ -277,6 +277,10 @@ midori_plugins_init (MidoriPlugins* plugins) const gchar* plugin_name; const gchar* plugin_description; + /* Ignore files which don't have the correct suffix */ + if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) + continue; + fullname = g_build_filename (plugin_path, filename, NULL); module = g_module_open (fullname, G_MODULE_BIND_LOCAL); g_free (fullname); From 5d3afb071398e60a563f526618a20478da2f77fe Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 23:26:54 +0200 Subject: [PATCH 1055/2970] Disable 'Detach' button if all panels are detached --- midori/midori-panel.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 44e59b1d..988e598a 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -25,6 +25,7 @@ struct _MidoriPanel GtkWidget* toolbar; GtkToolItem* button_align; + GtkToolItem* button_detach; GtkWidget* toolbar_label; GtkWidget* frame; GtkWidget* toolbook; @@ -252,6 +253,8 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, gtk_container_remove (GTK_CONTAINER (panel->notebook), scrolled); gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); g_object_unref (scrolled); + if (!gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) + gtk_widget_set_sensitive (toolbutton, FALSE); g_signal_connect (window, "delete-event", G_CALLBACK (midori_panel_detached_window_delete_event_cb), panel); gtk_widget_show (window); @@ -305,6 +308,8 @@ midori_panel_init (MidoriPanel* panel) gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1); toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); + gtk_widget_set_sensitive (GTK_WIDGET (toolitem), FALSE); + panel->button_detach = toolitem; gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Detach chosen panel from the window")); gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), @@ -560,6 +565,10 @@ midori_panel_construct_tool_item (MidoriPanel* panel, gtk_toolbar_insert (GTK_TOOLBAR (panel->toolbar), toolitem, -1); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_widget_destroy_cb), toolitem); + + if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) + gtk_widget_set_sensitive (GTK_WIDGET (panel->button_detach), TRUE); + return toolitem; } From dafa435e47f859dd52d40bbae0b98770b665786f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 25 Apr 2009 23:33:09 +0200 Subject: [PATCH 1056/2970] Switch the current panel after detaching a panel --- midori/midori-panel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 988e598a..71da1cb0 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -253,6 +253,7 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, gtk_container_remove (GTK_CONTAINER (panel->notebook), scrolled); gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); g_object_unref (scrolled); + midori_panel_set_current_page (panel, n); if (!gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) gtk_widget_set_sensitive (toolbutton, FALSE); g_signal_connect (window, "delete-event", From 9cda61ad1afc4d66cbec01d1b30ef340adb97b26 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Apr 2009 02:23:27 +0200 Subject: [PATCH 1057/2970] Add a Fixed-width Font Family preference --- midori/midori-preferences.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index ec793f3f..c85760c5 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -474,34 +474,40 @@ midori_preferences_set_settings (MidoriPreferences* preferences, /* Page "Appearance" */ PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); FRAME_NEW (_("Font settings")); - TABLE_NEW (6, 2); + TABLE_NEW (7, 2); label = gtk_label_new (_("Default Font Family")); INDENTED_ADD (label, 0, 1, 0, 1); hbox = gtk_hbox_new (FALSE, 4); button = katze_property_proxy (settings, "default-font-family", "font"); + gtk_widget_set_tooltip_text (entry, _("The default font family used to display text")); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); entry = katze_property_proxy (settings, "default-font-size", NULL); gtk_widget_set_tooltip_text (entry, _("The default font size used to display text")); gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); FILLED_ADD (hbox, 1, 2, 0, 1); - label = gtk_label_new (_("Minimum Font Size")); + label = gtk_label_new (_("Fixed-width Font Family")); INDENTED_ADD (label, 0, 1, 1, 2); + button = katze_property_proxy (settings, "monospace-font-family", "font"); + gtk_widget_set_tooltip_text (button, _("The font family used to display fixed-width text")); + INDENTED_ADD (button, 1, 2, 1, 2); + label = gtk_label_new (_("Minimum Font Size")); + INDENTED_ADD (label, 0, 1, 2, 3); entry = katze_property_proxy (settings, "minimum-font-size", NULL); gtk_widget_set_tooltip_text (entry, _("The minimum font size used to display text")); - INDENTED_ADD (entry, 1, 2, 1, 2); + INDENTED_ADD (entry, 1, 2, 2, 3); label = katze_property_label (settings, "preferred-encoding"); - INDENTED_ADD (label, 0, 1, 2, 3); + INDENTED_ADD (label, 0, 1, 3, 4); button = katze_property_proxy (settings, "preferred-encoding", NULL); - FILLED_ADD (button, 1, 2, 2, 3); + FILLED_ADD (button, 1, 2, 3, 4); label = katze_property_label (settings, "default-encoding"); gtk_label_set_label (GTK_LABEL (label), _("Encoding")); - INDENTED_ADD (label, 0, 1, 3, 4); + INDENTED_ADD (label, 0, 1, 4, 5); entry = katze_property_proxy (settings, "default-encoding", NULL); gtk_widget_set_tooltip_text (entry, _("The character encoding to use by default")); g_signal_connect (settings, "notify::preferred-encoding", G_CALLBACK (midori_preferences_notify_preferred_encoding_cb), entry); midori_preferences_notify_preferred_encoding_cb (settings, NULL, entry); - FILLED_ADD (entry, 1, 2, 3, 4); + FILLED_ADD (entry, 1, 2, 4, 5); /* Page "Behavior" */ PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior")); From 141e5317c170b5d12d683b375b09d8f5adb09271 Mon Sep 17 00:00:00 2001 From: Elega Date: Sun, 26 Apr 2009 16:20:51 +0200 Subject: [PATCH 1058/2970] Update Spanish translation --- po/es.po | 1434 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 875 insertions(+), 559 deletions(-) diff --git a/po/es.po b/po/es.po index a089e1a6..c95140f3 100644 --- a/po/es.po +++ b/po/es.po @@ -7,14 +7,13 @@ # Elega 2009 # Guillermo Iguarán 2009 # - msgid "" msgstr "" -"Project-Id-Version: midori 0.1.5\n" +"Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-01 20:25+0100\n" -"PO-Revision-Date: 2009-03-29 16:02-0500\n" -"Last-Translator: Guillermo Iguarán \n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-26 01:47-0300\n" +"Last-Translator: Elega \n" "Language-Team: GALPon MiniNo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,11 +24,11 @@ msgid "Lightweight web browser" msgstr "Navegador ligero" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1950 -#: ../midori/main.c:2056 -#: ../midori/main.c:2065 -#: ../midori/main.c:2076 -#: ../midori/midori-websettings.c:259 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -37,356 +36,325 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navegador" -#: ../midori/main.c:90 -msgid "_Bookmark" -msgstr "_Marcador" - -#: ../midori/main.c:91 -#: ../midori/midori-browser.c:3830 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../midori/main.c:92 -msgid "_Add Bookmark" -msgstr "_Añadir Marcador" - -#: ../midori/main.c:93 -msgid "_Console" -msgstr "_Consola" - #: ../midori/main.c:94 -msgid "_Extensions" -msgstr "_Extensiones" - -#: ../midori/main.c:95 -msgid "_History" -msgstr "_Historial" - -#: ../midori/main.c:96 -msgid "_Homepage" -msgstr "_Página de inicio" - -#: ../midori/main.c:97 -msgid "_Userscripts" -msgstr "_Scripts de usuario" - -#: ../midori/main.c:98 -msgid "User_styles" -msgstr "_Estilos de usuario" - -#: ../midori/main.c:99 -msgid "New _Tab" -msgstr "Nueva _pestaña" - -#: ../midori/main.c:100 -msgid "_Transfers" -msgstr "_Transferencias" - -#: ../midori/main.c:101 -msgid "_Closed Tabs and Windows" -msgstr "_Pestañas y ventanas cerradas" - -#: ../midori/main.c:102 -msgid "New _Window" -msgstr "Nueva _ventana" - -#: ../midori/main.c:158 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "No se pudo cargar la configuración: %s\n" -#: ../midori/main.c:213 +#: ../midori/main.c:149 #, c-format msgid "Value '%s' is invalid for %s" msgstr "El valor «%s» no es válido para %s" -#: ../midori/main.c:220 -#: ../midori/main.c:290 +#: ../midori/main.c:156 +#: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valor de configuración inválido «%s»" -#: ../midori/main.c:532 -msgid "File not found." -msgstr "Archivo no encontrado." - -#: ../midori/main.c:540 -#: ../midori/main.c:549 -msgid "Malformed document." -msgstr "Documento defectuoso." - -#: ../midori/main.c:571 +#: ../midori/main.c:332 #, c-format msgid "Failed to open database: %s\n" msgstr "No se ha podido abrir la base de datos: %s\n" -#: ../midori/main.c:603 +#: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "No se ha podido ejecutar sentencia en base de datos: %s\n" -#: ../midori/main.c:657 +#: ../midori/main.c:418 #, c-format msgid "Failed to remove history item: %s\n" msgstr "No se ha podido quitar los elementos del historial: %s\n" -#: ../midori/main.c:681 +#: ../midori/main.c:442 #, c-format msgid "Failed to clear history: %s\n" msgstr "No se ha podido vaciar el historial: %s\n" -#: ../midori/main.c:704 -#: ../midori/main.c:738 -#: ../midori/main.c:754 +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 #, c-format msgid "Failed to add history item: %s\n" msgstr "No se ha podido añadir un elemento al historial: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:934 +#: ../midori/main.c:694 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "No se ha podido quitar elementos antiguos del historial: %s\n" -#: ../midori/main.c:962 +#: ../midori/main.c:722 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "No se pudo guardar la configuración. %s" -#: ../midori/main.c:991 +#: ../midori/main.c:751 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "No se pudo guardar los motores de búsqueda. %s" -#: ../midori/main.c:1121 -#: ../midori/sokoke.c:531 -#, c-format -msgid "Writing failed." -msgstr "Falló la escritura." - -#: ../midori/main.c:1142 -#: ../midori/main.c:1169 -#: ../midori/main.c:1197 +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "No se pudieron guardar los marcadores. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:1221 -#: ../midori/main.c:1245 +#: ../midori/main.c:850 +#: ../midori/main.c:873 #, c-format msgid "The trash couldn't be saved. %s" msgstr "No se pudo guardar la papelera. %s" -#: ../midori/main.c:1271 -#: ../midori/midori-preferences.c:386 -msgid "Transfers" -msgstr "Transferencias" - -#: ../midori/main.c:1312 +#: ../midori/main.c:946 #, c-format msgid "The session couldn't be saved. %s" msgstr "No se pudo guardar la sesión. %s" -#: ../midori/main.c:1636 -msgid "Authentication Required" -msgstr "Se requiere autentificación" - -#: ../midori/main.c:1652 -msgid "" -"A username and a password are required\n" -"to open this location:" -msgstr "" -"Nombre de usuario y contraseña son requeridos\n" -"para abrir ésta ubicación:" - -#: ../midori/main.c:1666 -msgid "Username" -msgstr "Nombre de usuario" - -#: ../midori/main.c:1677 -msgid "Password" -msgstr "Contraseña" - -#: ../midori/main.c:1783 +#: ../midori/main.c:1073 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Parece que Midori se cerró insperadamente la última vez. Si esto sucede repetidamente, pruebe una de las siguientes opciones para resolver el problema." -#: ../midori/main.c:1798 +#: ../midori/main.c:1088 msgid "Modify _preferences" msgstr "Modificar _preferencias" -#: ../midori/main.c:1802 +#: ../midori/main.c:1092 msgid "Reset the last _session" msgstr "Restaurar la última _sesión" -#: ../midori/main.c:1807 +#: ../midori/main.c:1097 msgid "Disable all _extensions" msgstr "Deshabilitar todas las _extensiones" -#: ../midori/main.c:1950 +#: ../midori/main.c:1288 msgid "No filename specified" msgstr "No se especificó el nombre del archivo" -#: ../midori/main.c:1982 -#: ../midori/gjs.c:514 +#: ../midori/main.c:1311 msgid "An unknown error occured." msgstr "Se produjo un error desconocido." -#: ../midori/main.c:2005 +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Ejecutar DIRECCIÓN como una aplicación de internet" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "DIRECCIÓN" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Utilizar CARPETA como carpeta de configuración" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "CARPETA" + +#: ../midori/main.c:1340 msgid "Run the specified filename as javascript" msgstr "Ejecute el nombre de archivo especificado como javascript" -#: ../midori/main.c:2007 +#: ../midori/main.c:1342 msgid "Display program version" msgstr "Mostrar la versión del programa" -#: ../midori/main.c:2009 +#: ../midori/main.c:1344 msgid "Addresses" msgstr "Direcciones" -#: ../midori/main.c:2053 +#: ../midori/main.c:1385 msgid "[Addresses]" msgstr "[Direcciones]" -#: ../midori/main.c:2077 +#: ../midori/main.c:1408 msgid "Please report comments, suggestions and bugs to:" msgstr "Por favor envíe comentarios, sugerencias y errores a:" -#: ../midori/main.c:2079 +#: ../midori/main.c:1410 msgid "Check for new versions at:" msgstr "Buscar nuevas versiones en:" -#: ../midori/main.c:2106 +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "La carpeta de configuración especificada no es válida." + +#: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" msgstr "Una instancia de Midori ya se está ejecutando pero no responde.\n" -#: ../midori/main.c:2184 +#: ../midori/main.c:1539 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "No se pudieron cargar los motores de búsqueda. %s\n" -#: ../midori/main.c:2196 +#: ../midori/main.c:1551 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Los marcadores no pudieron ser cargados: %s\n" -#: ../midori/main.c:2211 +#: ../midori/main.c:1566 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "No se pudo cargar la sesión: %s\n" -#: ../midori/main.c:2224 +#: ../midori/main.c:1579 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "No se pudo cargar la papelera: %s\n" -#: ../midori/main.c:2237 +#: ../midori/main.c:1592 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "No se pudo cargar el historial: %s\n" -#: ../midori/main.c:2249 +#: ../midori/main.c:1604 msgid "The following errors occured:" msgstr "Se produjeron los siguientes errores:" -#: ../midori/main.c:2265 +#: ../midori/main.c:1620 msgid "_Ignore" msgstr "_Ignorar" -#: ../midori/midori-browser.c:258 -#: ../midori/midori-browser.c:3164 -#: ../midori/midori-browser.c:3170 +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Archivo no encontrado." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Documento defectuoso." + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Falló la escritura." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 msgid "Reload the current page" msgstr "Recargar la página actual" -#: ../midori/midori-browser.c:270 -#: ../midori/midori-browser.c:3167 +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 msgid "Stop loading the current page" msgstr "Detener la carga de la página" -#: ../midori/midori-browser.c:328 +#: ../midori/midori-browser.c:353 #, c-format msgid "%d%% loaded" msgstr "%d%% cargado" -#: ../midori/midori-browser.c:351 +#: ../midori/midori-browser.c:378 #, c-format msgid "Unexpected action '%s'." msgstr "Acción inesperada «%s»." -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:541 +msgid "New folder" +msgstr "Nueva carpeta" + +#: ../midori/midori-browser.c:541 +msgid "Edit folder" +msgstr "Editar carpeta" + +#: ../midori/midori-browser.c:543 msgid "New bookmark" msgstr "Nuevo marcador" -#: ../midori/midori-browser.c:524 +#: ../midori/midori-browser.c:543 msgid "Edit bookmark" msgstr "Editar marcador" -#: ../midori/midori-browser.c:546 +#: ../midori/midori-browser.c:573 msgid "_Title:" msgstr "_Título:" -#: ../midori/midori-browser.c:559 -#: ../midori/midori-searchaction.c:836 +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Descripción:" -#: ../midori/midori-browser.c:578 -#: ../midori/midori-searchaction.c:850 +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 msgid "_Address:" msgstr "_Dirección:" -#: ../midori/midori-browser.c:596 +#: ../midori/midori-browser.c:624 msgid "_Folder:" msgstr "_Carpeta:" -#: ../midori/midori-browser.c:601 -#: ../midori/midori-browser.c:638 +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 msgid "Toplevel folder" msgstr "Carpeta de nivel superior" -#: ../midori/midori-browser.c:713 +#: ../midori/midori-browser.c:746 msgid "Save file as" msgstr "Guardar archivo como" -#: ../midori/midori-browser.c:1302 +#: ../midori/midori-browser.c:1523 msgid "Open file" msgstr "Abrir archivo" -#: ../midori/midori-browser.c:2524 -#: ../panels/midori-bookmarks.c:690 +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 +msgid "Open all in _Tabs" +msgstr "Abrir todo en _pestañas" + +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 msgid "Open in New _Tab" msgstr "Abrir en una nueva _pestaña " -#: ../midori/midori-browser.c:2526 -#: ../panels/midori-bookmarks.c:692 +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 msgid "Open in New _Window" msgstr "Abrir en una nueva _ventana" -#: ../midori/midori-browser.c:2788 -#, c-format -msgid "A week ago" -msgstr "Hace una semana" +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Borrar datos privados" -#: ../midori/midori-browser.c:2794 -#, c-format -msgid "%d days ago" -msgstr "Hace %d días" +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Borrar datos privados" -#: ../midori/midori-browser.c:2801 -msgid "Today" -msgstr "Hoy" +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Borrar los siguientes datos:" -#: ../midori/midori-browser.c:2803 -msgid "Yesterday" -msgstr "Ayer" +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historial" -#: ../midori/midori-browser.c:2892 +#: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Huellas/ Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookies" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Íconos de sitios de internet" + +#: ../midori/midori-browser.c:3093 msgid "A lightweight web browser." msgstr "Un navegador muy ligero" -#: ../midori/midori-browser.c:2900 +#: ../midori/midori-browser.c:3101 msgid "translator-credits" msgstr "" "Miguel Anxo Bouzada \n" @@ -395,870 +363,992 @@ msgstr "" "Elega \n" "Guillermo Iguarán " -#: ../midori/midori-browser.c:3044 -msgid "Are you sure you want to remove all history items?" -msgstr "¿Estás seguro de que quieres quitar todos los elementos del historial?" - -#: ../midori/midori-browser.c:3098 +#: ../midori/midori-browser.c:3302 msgid "_File" msgstr "_Archivo" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3305 msgid "Open a new window" msgstr "Abrir una nueva ventana" -#: ../midori/midori-browser.c:3104 +#: ../midori/midori-browser.c:3308 msgid "Open a new tab" msgstr "Abrir una nueva pestaña" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3311 msgid "Open a file" msgstr "Abrir un archivo" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3314 msgid "Save to a file" msgstr "Guardar en un archivo" -#: ../midori/midori-browser.c:3112 +#: ../midori/midori-browser.c:3316 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../midori/midori-browser.c:3113 +#: ../midori/midori-browser.c:3317 msgid "Close the current tab" msgstr "Cerrar la pestaña actual" -#: ../midori/midori-browser.c:3115 +#: ../midori/midori-browser.c:3319 msgid "C_lose Window" msgstr "_Cerrar ventana" -#: ../midori/midori-browser.c:3116 +#: ../midori/midori-browser.c:3320 msgid "Close this window" -msgstr "Cerrar esta ventana" +msgstr "Cerrar ésta ventana" -#: ../midori/midori-browser.c:3119 +#: ../midori/midori-browser.c:3323 msgid "Print the current page" msgstr "Imprimir la página actual" -#: ../midori/midori-browser.c:3122 +#: ../midori/midori-browser.c:3326 msgid "Quit the application" msgstr "Salir de la aplicación" -#: ../midori/midori-browser.c:3124 +#: ../midori/midori-browser.c:3328 msgid "_Edit" msgstr "_Editar" -#: ../midori/midori-browser.c:3127 +#: ../midori/midori-browser.c:3331 msgid "Cut the selected text" msgstr "Cortar el texto seleccionado" -#: ../midori/midori-browser.c:3130 -#: ../midori/midori-browser.c:3133 +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 msgid "Copy the selected text" msgstr "Copiar el texto seleccionado" -#: ../midori/midori-browser.c:3136 +#: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" msgstr "Pegar texto del portapapeles" -#: ../midori/midori-browser.c:3139 +#: ../midori/midori-browser.c:3343 msgid "Delete the selected text" msgstr "Borrar el texto seleccionado" -#: ../midori/midori-browser.c:3142 +#: ../midori/midori-browser.c:3346 msgid "Select all text" msgstr "Seleccionar todo el texto" -#: ../midori/midori-browser.c:3145 +#: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" msgstr "Buscar una palabra o frase en la página" -#: ../midori/midori-browser.c:3147 +#: ../midori/midori-browser.c:3351 msgid "Find _Next" msgstr "Buscar _siguiente" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" msgstr "Buscar la siguiente aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3150 +#: ../midori/midori-browser.c:3354 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" msgstr "Buscar la anterior aparición de una palabra o una frase" -#: ../midori/midori-browser.c:3154 +#: ../midori/midori-browser.c:3358 msgid "_Quick Find" msgstr "Búsqueda _rápida" -#: ../midori/midori-browser.c:3155 +#: ../midori/midori-browser.c:3359 msgid "Quickly jump to a word or phrase" msgstr "Saltar rápidamente a una palabra o una frase" -#: ../midori/midori-browser.c:3158 +#: ../midori/midori-browser.c:3362 msgid "Configure the application preferences" msgstr "Configurar las preferencias de la aplicación" -#: ../midori/midori-browser.c:3160 +#: ../midori/midori-browser.c:3364 msgid "_View" msgstr "_Ver" -#: ../midori/midori-browser.c:3161 +#: ../midori/midori-browser.c:3365 msgid "_Toolbars" msgstr "_Barra de herramientas" -#: ../midori/midori-browser.c:3173 +#: ../midori/midori-browser.c:3377 msgid "Increase the zoom level" msgstr "Aumentar el nivel de zoom" -#: ../midori/midori-browser.c:3176 +#: ../midori/midori-browser.c:3380 msgid "Decrease the zoom level" msgstr "Disminuir el nivel de zoom" -#: ../midori/midori-browser.c:3179 +#: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" msgstr "Restablecer el nivel de zoom" -#: ../midori/midori-browser.c:3181 -#: ../midori/midori-view.c:984 +#: ../midori/midori-browser.c:3384 +msgid "_Encoding" +msgstr "_Codificación" + +#: ../midori/midori-browser.c:3386 +msgid "_Automatic" +msgstr "_Automatico" + +#: ../midori/midori-browser.c:3389 +#: ../midori/midori-websettings.c:200 +msgid "Chinese (BIG5)" +msgstr "Chino (BIG5)" + +#: ../midori/midori-browser.c:3392 +#: ../midori/midori-websettings.c:201 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonés (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 +msgid "Russian (KOI8-R)" +msgstr "Ruso (KOI8-R)" + +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 +msgid "Western (ISO-8859-1)" +msgstr "Occidental (ISO-8859-1)" + +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 +msgid "Custom..." +msgstr "Personalizado..." + +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 msgid "View _Source" msgstr "Ver _código fuente" -#: ../midori/midori-browser.c:3182 +#: ../midori/midori-browser.c:3408 msgid "View the source code of the page" msgstr "Ver el código fuente de la página" -#: ../midori/midori-browser.c:3184 +#: ../midori/midori-browser.c:3410 msgid "View Selection Source" msgstr "Ver código fuente de la selección" -#: ../midori/midori-browser.c:3185 +#: ../midori/midori-browser.c:3411 msgid "View the source code of the selection" msgstr "Ver el código fuente de la selección" -#: ../midori/midori-browser.c:3189 +#: ../midori/midori-browser.c:3415 msgid "Toggle fullscreen view" msgstr "Activar/desactivar pantalla completa" -#: ../midori/midori-browser.c:3191 +#: ../midori/midori-browser.c:3417 msgid "_Go" msgstr "_Ir" -#: ../midori/midori-browser.c:3194 +#: ../midori/midori-browser.c:3420 msgid "Go back to the previous page" msgstr "Retroceder una página" -#: ../midori/midori-browser.c:3197 +#: ../midori/midori-browser.c:3423 msgid "Go forward to the next page" msgstr "Avanzar una página" -#: ../midori/midori-browser.c:3200 +#: ../midori/midori-browser.c:3426 msgid "Go to your homepage" msgstr "Abrir página de inicio" -#: ../midori/midori-browser.c:3202 +#: ../midori/midori-browser.c:3428 msgid "Empty Trash" msgstr "Vaciar la papelera" -#: ../midori/midori-browser.c:3203 +#: ../midori/midori-browser.c:3429 msgid "Delete the contents of the trash" msgstr "Borrar el contenido de la papelera" -#: ../midori/midori-browser.c:3205 -#: ../midori/midori-view.c:956 +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 msgid "Undo Close Tab" msgstr "Deshacer el cierre de pestaña" -#: ../midori/midori-browser.c:3206 +#: ../midori/midori-browser.c:3432 msgid "Open the last closed tab" msgstr "Abrir la última pestaña cerrada" -#: ../midori/midori-browser.c:3210 -#: ../panels/midori-bookmarks.c:209 +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 msgid "Add a new bookmark" msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3213 -msgid "Delete the selected history item" -msgstr "Borrar del historial el elemento seleccionado" +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Añadir una nueva carpeta" -#: ../midori/midori-browser.c:3216 -msgid "Clear the entire history" -msgstr "Vaciar el historial completo" +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Añadir un nuevo marcador" -#: ../midori/midori-browser.c:3219 -msgid "Bookmark the selected history item" -msgstr "Añadir a marcadores el elemento seleccionado del historial" - -#: ../midori/midori-browser.c:3221 +#: ../midori/midori-browser.c:3440 msgid "_Tools" msgstr "_Herramientas" -#: ../midori/midori-browser.c:3223 -#: ../midori/midori-searchaction.c:464 +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Administrar los motores de búsqueda" -#: ../midori/midori-browser.c:3224 +#: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." msgstr "Añadir, editar y quitar motores de búsqueda..." -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Borrar datos privados" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Borrar datos privados" + +#: ../midori/midori-browser.c:3451 msgid "_Previous Tab" msgstr "_Pestaña anterior" -#: ../midori/midori-browser.c:3229 +#: ../midori/midori-browser.c:3452 msgid "Switch to the previous tab" msgstr "Cambiar a la pestaña anterior" -#: ../midori/midori-browser.c:3231 +#: ../midori/midori-browser.c:3454 msgid "_Next Tab" msgstr "_Pestaña siguiente" -#: ../midori/midori-browser.c:3232 +#: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" msgstr "Cambiar a la pestaña siguiente" -#: ../midori/midori-browser.c:3234 +#: ../midori/midori-browser.c:3457 msgid "_Help" msgstr "_Ayuda" -#: ../midori/midori-browser.c:3236 +#: ../midori/midori-browser.c:3459 msgid "_Contents" msgstr "_Contenido" -#: ../midori/midori-browser.c:3237 +#: ../midori/midori-browser.c:3460 msgid "Show the documentation" msgstr "Mostrar la documentación" -#: ../midori/midori-browser.c:3239 +#: ../midori/midori-browser.c:3462 msgid "_Frequent Questions" msgstr "_Preguntas frecuentes" -#: ../midori/midori-browser.c:3240 +#: ../midori/midori-browser.c:3463 msgid "Show the Frequently Asked Questions" msgstr "Mostrar las preguntas más frecuentes" -#: ../midori/midori-browser.c:3242 +#: ../midori/midori-browser.c:3465 msgid "_Report a Bug" msgstr "_Reportar un error" -#: ../midori/midori-browser.c:3243 +#: ../midori/midori-browser.c:3466 msgid "Open Midori's bug tracker" msgstr "Abrir el rastreador de errores de Midori" -#: ../midori/midori-browser.c:3246 +#: ../midori/midori-browser.c:3469 msgid "Show information about the program" msgstr "Mostrar información sobre el programa" -#: ../midori/midori-browser.c:3253 +#: ../midori/midori-browser.c:3476 msgid "P_rivate Browsing" msgstr "_Navegación privada" -#: ../midori/midori-browser.c:3254 +#: ../midori/midori-browser.c:3477 msgid "Don't save any private data while browsing" msgstr "No guardar datos durante la navegación privada" -#: ../midori/midori-browser.c:3259 +#: ../midori/midori-browser.c:3482 msgid "_Menubar" msgstr "_Barra de menú" -#: ../midori/midori-browser.c:3260 +#: ../midori/midori-browser.c:3483 msgid "Show menubar" msgstr "Mostrar la barra de menú" -#: ../midori/midori-browser.c:3263 +#: ../midori/midori-browser.c:3486 msgid "_Navigationbar" msgstr "_Barra de navegación" -#: ../midori/midori-browser.c:3264 +#: ../midori/midori-browser.c:3487 msgid "Show navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-browser.c:3267 +#: ../midori/midori-browser.c:3490 msgid "Side_panel" msgstr "_Panel lateral" -#: ../midori/midori-browser.c:3268 +#: ../midori/midori-browser.c:3491 msgid "Show sidepanel" msgstr "Mostrar el panel lateral" -#: ../midori/midori-browser.c:3271 +#: ../midori/midori-browser.c:3494 msgid "_Bookmarkbar" msgstr "_Barra de marcadores" -#: ../midori/midori-browser.c:3272 +#: ../midori/midori-browser.c:3495 msgid "Show bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-browser.c:3275 +#: ../midori/midori-browser.c:3498 msgid "_Transferbar" msgstr "_Barra de transferencias" -#: ../midori/midori-browser.c:3276 +#: ../midori/midori-browser.c:3499 msgid "Show transferbar" msgstr "Mostrar la barra de transferencias" -#: ../midori/midori-browser.c:3279 +#: ../midori/midori-browser.c:3502 msgid "_Statusbar" msgstr "_Barra de estado" -#: ../midori/midori-browser.c:3280 +#: ../midori/midori-browser.c:3503 msgid "Show statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-browser.c:3748 +#: ../midori/midori-browser.c:3937 msgid "_Separator" msgstr "_Separador" -#: ../midori/midori-browser.c:3755 +#: ../midori/midori-browser.c:3944 msgid "_Location..." msgstr "_Ubicación..." -#: ../midori/midori-browser.c:3757 +#: ../midori/midori-browser.c:3946 msgid "Open a particular location" msgstr "Abrir un lugar" -#: ../midori/midori-browser.c:3781 +#: ../midori/midori-browser.c:3970 msgid "_Web Search..." -msgstr "_Buscar en la red..." +msgstr "_Buscar en la internet..." -#: ../midori/midori-browser.c:3783 +#: ../midori/midori-browser.c:3972 msgid "Run a web search" -msgstr "Realizar una búsqueda en la red" +msgstr "Realizar una búsqueda de internet" -#: ../midori/midori-browser.c:3802 +#: ../midori/midori-browser.c:3993 msgid "Reopen a previously closed tab or window" -msgstr "Volver a abrir ventanas o pestañas cerradas" +msgstr "Abrir ventanas o pestañas cerradas" -#: ../midori/midori-browser.c:3815 +#: ../midori/midori-browser.c:4006 msgid "_Recently visited pages" msgstr "_Últimas páginas visitadas" -#: ../midori/midori-browser.c:3817 +#: ../midori/midori-browser.c:4008 msgid "Reopen pages that you visited earlier" -msgstr "Vuelve a abrir las páginas que usted visitó anteriormente" +msgstr "Abre las páginas que usted visitó anteriormente" -#: ../midori/midori-browser.c:3832 +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../midori/midori-browser.c:4023 msgid "Show the saved bookmarks" msgstr "Mostrar los marcadores guardados." -#: ../midori/midori-browser.c:3845 +#: ../midori/midori-browser.c:4036 msgid "_Window" -msgstr "_Ventana" +msgstr "_Ventanas" -#: ../midori/midori-browser.c:3847 +#: ../midori/midori-browser.c:4038 msgid "Show a list of all open tabs" msgstr "Mostrar una lista de todas las pesañas abiertas" -#: ../midori/midori-browser.c:4001 -#: ../midori/midori-preferences.c:597 -msgid "History" -msgstr "Historial" - #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4205 msgid "_Inline Find:" msgstr "_Búsqueda en línea:" -#: ../midori/midori-browser.c:4071 +#: ../midori/midori-browser.c:4230 msgid "Previous" msgstr "Anterior" -#: ../midori/midori-browser.c:4076 +#: ../midori/midori-browser.c:4235 msgid "Next" msgstr "Siguiente" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:4240 msgid "Match Case" msgstr "Sensible mayúsculas " -#: ../midori/midori-browser.c:4089 +#: ../midori/midori-browser.c:4248 msgid "Highlight Matches" msgstr "Destacar coincidencias" -#: ../midori/midori-browser.c:4098 +#: ../midori/midori-browser.c:4258 msgid "Close Findbar" msgstr "Cerrar la barra de búsqueda" -#: ../midori/midori-browser.c:4379 +#: ../midori/midori-browser.c:4598 #, c-format msgid "Unexpected setting '%s'" msgstr "Ajuste no esperado «%s»" -#: ../midori/midori-panel.c:199 -#: ../midori/midori-panel.c:200 +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Separar el panel elegido de la ventana" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Si se desea separar el panel de la ventana" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 +msgid "Align sidepanel on the right" +msgstr "Alinear el panel lateral a la derecha" + +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 +msgid "Whether to align the sidepanel on the right" +msgstr "Si se desea alinear el panel lateral a la derecha" + +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 msgid "Close panel" msgstr "Cerrar panel" -#: ../midori/midori-websettings.c:169 -#: ../midori/midori-view.c:1719 +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 msgid "Blank page" msgstr "Página en blanco" -#: ../midori/midori-websettings.c:170 -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:171 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "Últimas páginas visitadas" -#: ../midori/midori-websettings.c:186 -msgid "Chinese (BIG5)" -msgstr "Chino (BIG5)" - -#: ../midori/midori-websettings.c:187 -msgid "Japanese (SHIFT_JIS)" -msgstr "Japonés (SHIFT_JIS)" - -#: ../midori/midori-websettings.c:188 -msgid "Russian (KOI8-R)" -msgstr "Ruso (KOI8-R)" - -#: ../midori/midori-websettings.c:189 -msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" - -#: ../midori/midori-websettings.c:190 -msgid "Western (ISO-8859-1)" -msgstr "Occidental (ISO-8859-1)" - -#: ../midori/midori-websettings.c:191 -#: ../midori/midori-websettings.c:263 -msgid "Custom..." -msgstr "Personalizado..." - -#: ../midori/midori-websettings.c:206 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "Nueva pestaña" -#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "Nueva ventana" -#: ../midori/midori-websettings.c:208 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "Pestaña actual" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "Predeterminado" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "Iconos" -#: ../midori/midori-websettings.c:225 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "Texto" -#: ../midori/midori-websettings.c:226 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "Ambos" -#: ../midori/midori-websettings.c:227 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "Ambos en horizontal" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:256 msgid "All cookies" -msgstr "Todas las galletas" +msgstr "Todas las huellas" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" -msgstr "Galletas de la sesión" +msgstr "Huellas de la sesión" -#: ../midori/midori-websettings.c:244 -#: ../panels/midori-addons.c:96 +#: ../midori/midori-websettings.c:258 +#: ../panels/midori-addons.c:94 msgid "None" msgstr "Ninguna" -#: ../midori/midori-websettings.c:260 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:261 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:262 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:303 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "Recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:304 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "Si se desea recordar el tamaño de la última ventana" -#: ../midori/midori-websettings.c:312 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "Última anchura de la ventana" -#: ../midori/midori-websettings.c:313 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "Última anchura de la ventana guardada" -#: ../midori/midori-websettings.c:321 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "Última altura de la ventana" -#: ../midori/midori-websettings.c:322 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "Última altura guardada de la ventana " -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "Última posición del panel" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "Ultima posición guardada del panel" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:357 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "Última página del panel" -#: ../midori/midori-websettings.c:358 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "Última página guardada del panel" -#: ../midori/midori-websettings.c:366 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" -msgstr "Última búsqueda en la red" +msgstr "Última búsqueda en la internet" -#: ../midori/midori-websettings.c:367 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" -msgstr "Última búsqueda red guardada" +msgstr "Última búsqueda de internet guardada" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "Mostrar barra de menú" -#: ../midori/midori-websettings.c:377 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "Si se desea mostrar la barra de menú" -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "Mostrar la barra de navegación" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "Si se desea mostrar la barra de navegación" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "Mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "Si se desea mostrar la barra de marcadores" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "Mostrar el panel" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "Si se desea mostrar el panel" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:445 +msgid "Show Transferbar" +msgstr "Mostrar la barra de transferencias" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show the transferbar" +msgstr "Si se desea mostrar la barra de transferencias" + +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "Mostrar la barra de estado" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "Si se desea mostrar la barra de estado" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "Estilo de la barra de herramientas" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:481 +msgid "Show progress in location entry" +msgstr "Mostrar el progreso de carga en el lugar de entrada" + +#: ../midori/midori-websettings.c:482 +msgid "Whether to show loading progress in the location entry" +msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" + +#: ../midori/midori-websettings.c:497 +#, fuzzy +msgid "Search engines in location completion" +msgstr "Motores de búsqueda en ubicación final" + +#: ../midori/midori-websettings.c:498 +#, fuzzy +msgid "Whether to show search engines in the location completion" +msgstr "Si se desea mostrar los motores de búsqueda en ubicación final" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "Elementos de la barra de herramientas" -#: ../midori/midori-websettings.c:433 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "Los elementos a mostrar en la barra de herramientas" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "Panel lateral compacto" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "Si se desea hacer compacto el panel lateral" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" -msgstr "Al iniciar Midor cargar:" +msgstr "Al iniciar Midori cargar:" -#: ../midori/midori-websettings.c:452 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "Página que se carga al inicio" -#: ../midori/midori-websettings.c:462 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "Página de inicio" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "Mostrar diálogo de cuelgue" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Mostrar un dialogo despues de que Midori se cuelgue" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "Carpeta de descargas" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "Carpeta donde se guardan los archivos descargados" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:589 msgid "Download Manager" msgstr "Gestor de descargas" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:590 msgid "An external download manager" msgstr "Gestor de descargas externo" -#: ../midori/midori-websettings.c:504 +#: ../midori/midori-websettings.c:598 msgid "Text Editor" msgstr "Editor de texto" -#: ../midori/midori-websettings.c:505 +#: ../midori/midori-websettings.c:599 msgid "An external text editor" msgstr "Editor de textos externo" -#: ../midori/midori-websettings.c:513 +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Agregador de noticias" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "Un agregador de noticias externo" + +#: ../midori/midori-websettings.c:623 msgid "Location entry Search" msgstr "Búsqueda en la barra" -#: ../midori/midori-websettings.c:514 +#: ../midori/midori-websettings.c:624 msgid "The search to perform inside the location entry" msgstr "Hacer una búsqueda a partir del contenido de la barra de direcciones" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:632 msgid "Preferred Encoding" msgstr "Codificación preferida" -#: ../midori/midori-websettings.c:523 +#: ../midori/midori-websettings.c:633 msgid "The preferred character encoding" msgstr "Codificación de caracteres preferida" -#: ../midori/midori-websettings.c:533 +#: ../midori/midori-websettings.c:643 msgid "Always Show Tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:534 +#: ../midori/midori-websettings.c:644 msgid "Always show the tabbar" msgstr "Siempre mostrar la barra de pestañas" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:652 msgid "Close Buttons on Tabs" msgstr "Botón de cerrar en las pestañas" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" msgstr "Si se desea que las pestañas tengan el botón de cerrar" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:661 msgid "Open new pages in" msgstr "Abrir páginas nuevas en" -#: ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:662 msgid "Where to open new pages" msgstr "Donde abrir las páginas nuevas" -#: ../midori/midori-websettings.c:563 +#: ../midori/midori-websettings.c:671 msgid "Open external pages in" msgstr "Abrir las páginas externas en" -#: ../midori/midori-websettings.c:564 +#: ../midori/midori-websettings.c:672 msgid "Where to open externally opened pages" msgstr "Donde abrir las páginas externas" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:685 msgid "Middle click opens Selection" msgstr "Clic del medio abre la selección" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:686 msgid "Load an address from the selection via middle click" msgstr "Cargar una dirección desde la selección a través del botón del medio del ratón" -#: ../midori/midori-websettings.c:586 +#: ../midori/midori-websettings.c:694 msgid "Open tabs in the background" msgstr "Abrir pestañas en segundo plano" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" msgstr "Si se desea que las nuevas pestañas se abran en segundo plano" -#: ../midori/midori-websettings.c:595 +#: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" msgstr "Abrir pestañas junto a la actual" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Si se desea que las nuevas pestañas se abran al lado de la pestaña actual o después de la última" -#: ../midori/midori-websettings.c:604 +#: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" msgstr "Abrir emergentes en pestañas" -#: ../midori/midori-websettings.c:605 +#: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" msgstr "Si se desea abrir las ventanas emergentes en pestañas" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" -msgstr "Ampliar Textos e Imágenes" +msgstr "Ampliar textos e imágenes" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" -msgstr "Si se amplia texto e imágenes" +msgstr "Si se desea ampliar texto e imágenes" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:745 +msgid "Find inline while typing" +msgstr "Buscar en el texto al escribir" + +#: ../midori/midori-websettings.c:746 +msgid "Whether to automatically find inline while typing" +msgstr "Si se desea buscar en el texto automáticamente al comenzar a tipear" + +#: ../midori/midori-websettings.c:754 msgid "Accept cookies" -msgstr "Aceptar galletas" +msgstr "Aceptar cookies" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:755 msgid "What type of cookies to accept" -msgstr "Qué tipos de galletas van a ser aceptadas" +msgstr "Qué tipos de huellas van a ser aceptadas" -#: ../midori/midori-websettings.c:681 +#: ../midori/midori-websettings.c:764 msgid "Original cookies only" -msgstr "Sólo galletas originales" +msgstr "Sólo cookies originales" -#: ../midori/midori-websettings.c:682 +#: ../midori/midori-websettings.c:765 msgid "Accept cookies from the original website only" -msgstr "Sólo se aceptan las galletas del sitio red original" +msgstr "Sólo se aceptan las huellas del sitio de internet original" -#: ../midori/midori-websettings.c:690 +#: ../midori/midori-websettings.c:773 msgid "Maximum cookie age" -msgstr "Duración máxima de las galletas" +msgstr "Duración máxima de las cookies" -#: ../midori/midori-websettings.c:691 +#: ../midori/midori-websettings.c:774 msgid "The maximum number of days to save cookies for" -msgstr "Número máximo de días para conservar las galletas" +msgstr "Número máximo de días para conservar las huellas" -#: ../midori/midori-websettings.c:701 +#: ../midori/midori-websettings.c:784 msgid "Remember last visited pages" msgstr "Recordar las últimas páginas visitadas" -#: ../midori/midori-websettings.c:702 +#: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" msgstr "Si se desea que las últimas páginas visitadas sean recordadas" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:793 msgid "Maximum history age" msgstr "Duración máxima del historial" -#: ../midori/midori-websettings.c:711 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save the history for" msgstr "Número máximo de días para conservar el historial" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:802 msgid "Remember last form inputs" msgstr "Recordar lo que se haya ingresado en formularios" -#: ../midori/midori-websettings.c:720 +#: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" msgstr "Si se desea que las últimas entradas de formulario sean recordadas" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" msgstr "Recordar los últimos archivos descargados" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" msgstr "Si se desea que los archivos descargados sean recordados" -#: ../midori/midori-websettings.c:739 +#: ../midori/midori-websettings.c:822 msgid "Proxy Server" msgstr "Servidor proxy" -#: ../midori/midori-websettings.c:740 +#: ../midori/midori-websettings.c:823 msgid "The proxy server used for HTTP connections" msgstr "Servidor proxy utilizado para conexiones HTTP" +#: ../midori/midori-websettings.c:838 +msgid "Detect proxy server automatically" +msgstr "Detectar automáticamente el servidor proxy" + +#: ../midori/midori-websettings.c:839 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Si se desea detectar automáticamente el servidor proxy desde el entorno" + #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:760 +#: ../midori/midori-websettings.c:855 msgid "Identify as" msgstr "Identificar como:" -#: ../midori/midori-websettings.c:761 +#: ../midori/midori-websettings.c:856 msgid "What to identify as to web pages" -msgstr "Identificar como páginas red" +msgstr "Identificar como páginas de internet" -#: ../midori/midori-websettings.c:781 +#: ../midori/midori-websettings.c:872 msgid "Identification string" msgstr "Cadena de identificación" -#: ../midori/midori-websettings.c:782 +#: ../midori/midori-websettings.c:873 msgid "The application identification string" msgstr "Aplicación de identificación de cadenas" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:881 msgid "Cache size" msgstr "Tamaño del caché" -#: ../midori/midori-websettings.c:795 +#: ../midori/midori-websettings.c:882 msgid "The allowed size of the cache" msgstr "Tamaño asignado a la memoria caché" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:608 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 #, c-format msgid "Not found - %s" msgstr "No se ha encontrado - %s" -#: ../midori/midori-view.c:888 +#: ../midori/midori-view.c:976 +msgid "Open _Link" +msgstr "Abrir _enlace" + +#: ../midori/midori-view.c:978 msgid "Open Link in New _Tab" msgstr "Abrir enlace en nueva _pestaña" -#: ../midori/midori-view.c:911 -msgid "_Save Link destination" -msgstr "_Guardar enlace" +#: ../midori/midori-view.c:995 +msgid "Open Link in New _Window" +msgstr "Abrir enlace en nueva _ventana" -#: ../midori/midori-view.c:919 +#: ../midori/midori-view.c:1004 msgid "_Download Link destination" msgstr "_Descargar enlace" -#: ../midori/midori-view.c:941 +#: ../midori/midori-view.c:1010 +msgid "_Save Link destination" +msgstr "_Guardar enlace" + +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Descargar con el gestor de descargas" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Buscar _con" + +#: ../midori/midori-view.c:1076 +msgid "_Search the Web" +msgstr "_Buscar en la internet" + +#: ../midori/midori-view.c:1086 msgid "Open Address in New _Tab" msgstr "Abrir dirección en una nueva _pestaña " -#: ../midori/midori-view.c:1411 +#: ../midori/midori-view.c:1234 +msgid "Open or download file" +msgstr "Abrir o descargar archivo" + +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "Tipo de archivo: '%s'" + +#: ../midori/midori-view.c:1254 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Tipo de archivo: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1258 +#, c-format +msgid "Open %s" +msgstr "Abrir %s" + +#: ../midori/midori-view.c:1661 #, c-format msgid "Inspect page - %s" msgstr "Inspeccionar la página - %s" -#: ../midori/midori-view.c:1562 -msgid "Source" -msgstr "Código fuente" - -#: ../midori/midori-view.c:1586 +#: ../midori/midori-view.c:1806 #, c-format msgid "Document cannot be displayed" msgstr "El documento no puede ser mostrado" -#: ../midori/midori-view.c:1602 +#: ../midori/midori-view.c:1822 #, c-format msgid "No documentation installed" msgstr "No se dispone de documentación instalada" @@ -1269,247 +1359,307 @@ msgid "Preferences for %s" msgstr "Preferencias de %s" #. Page "General" -#: ../midori/midori-preferences.c:372 +#: ../midori/midori-preferences.c:398 msgid "General" msgstr "General" -#: ../midori/midori-preferences.c:373 +#: ../midori/midori-preferences.c:399 msgid "Startup" msgstr "Inicio" +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Usar la página actual como página de inicio" + +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Transferencias" + #. Page "Appearance" -#: ../midori/midori-preferences.c:422 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "Apariencia" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "Configuración de las fuentes" -#: ../midori/midori-preferences.c:425 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "Fuente por defecto" -#: ../midori/midori-preferences.c:431 +#: ../midori/midori-preferences.c:484 msgid "The default font size used to display text" msgstr "Tamaño de fuente predeterminado utilizado para mostrar texto" -#: ../midori/midori-preferences.c:434 +#: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" msgstr "Tamaño mínimo de fuente" -#: ../midori/midori-preferences.c:437 +#: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" msgstr "Mínimo tamaño de fuente utilizado para mostrar texto" -#: ../midori/midori-preferences.c:444 +#: ../midori/midori-preferences.c:497 msgid "Encoding" msgstr "Codificación" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:500 msgid "The character encoding to use by default" msgstr "Codificación de caracteres a utilizar por defecto" #. Page "Behavior" -#: ../midori/midori-preferences.c:454 +#: ../midori/midori-preferences.c:507 msgid "Behavior" msgstr "Comportamiento" -#: ../midori/midori-preferences.c:455 +#: ../midori/midori-preferences.c:508 msgid "Features" msgstr "Características" -#: ../midori/midori-preferences.c:458 -#: ../extensions/statusbar-features.c:40 +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Cargar imágenes automáticamente" -#: ../midori/midori-preferences.c:459 +#: ../midori/midori-preferences.c:512 msgid "Load and display images automatically" msgstr "Cargar y mostrar imágenes automáticamente" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:515 msgid "Shrink images automatically" msgstr "Reducir imágenes automáticamente" -#: ../midori/midori-preferences.c:463 +#: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" msgstr "Reducir imágenes automáticamente independientemente si caben" -#: ../midori/midori-preferences.c:466 +#: ../midori/midori-preferences.c:519 msgid "Print background images" msgstr "Imprimir imágenes de fondo" -#: ../midori/midori-preferences.c:467 +#: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" msgstr "Si se desea imprimir las imágenes de fondo" -#: ../midori/midori-preferences.c:470 +#: ../midori/midori-preferences.c:523 msgid "Resizable text areas" msgstr "Áreas de texto dimensionables" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" msgstr "Si se desea que las áreas de texto sean dimensionables" -#: ../midori/midori-preferences.c:474 -#: ../extensions/statusbar-features.c:47 +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Habilitar scripts" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:528 msgid "Enable embedded scripting languages" msgstr "Habilitar script de lenguajes embebidos" -#: ../midori/midori-preferences.c:478 -#: ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 msgid "Enable plugins" msgstr "Habilitar complementos" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:532 msgid "Enable embedded plugin objects" msgstr "Habilitar el complemento de objetos embebidos" -#: ../midori/midori-preferences.c:482 +#: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" msgstr "Aplicar 96 puntos por pulgada" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" msgstr "Aplicar una densidad de puntos de video de 96 DPI" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:539 msgid "Enable developer tools" -msgstr "Habilitar herramientas desarrollado" +msgstr "Habilitar herramientas de desarrollo" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:540 msgid "Enable special extensions for developers" msgstr "Habilitar extensiones especiales para desarrolladores" #. Page "Interface" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:548 msgid "Interface" msgstr "Interfaz" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:549 msgid "Navigationbar" msgstr "Barra de navegación" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:560 msgid "Browsing" msgstr "Navegación" -#: ../midori/midori-preferences.c:542 -#: ../midori/midori-preferences.c:543 +#. Page "Network" +#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:591 msgid "Network" msgstr "Red" -#: ../midori/midori-preferences.c:565 +#: ../midori/midori-preferences.c:618 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:623 msgid "Privacy" msgstr "Privacidad" -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:624 msgid "Web Cookies" -msgstr "Galletas de informacion" +msgstr "Huellas" -#: ../midori/midori-preferences.c:592 -#: ../midori/midori-preferences.c:604 +#: ../midori/midori-preferences.c:637 +#: ../midori/midori-preferences.c:647 msgid "days" msgstr "días" -#: ../midori/midori-searchaction.c:455 -#: ../katze/katze-arrayaction.c:279 +#: ../midori/midori-searchaction.c:484 +#: ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "Vacío" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "Añadir un motor de búsqueda" -#: ../midori/midori-searchaction.c:792 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "Editar motor de búsqueda" -#: ../midori/midori-searchaction.c:820 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "_Nombre:" -#: ../midori/midori-searchaction.c:864 -msgid "_Icon (name or file):" -msgstr "_Icono (nombre o archivo):" +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "_Ícono" -#: ../midori/midori-searchaction.c:878 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "_Abreviatura:" -#: ../midori/midori-searchaction.c:1055 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "Administrar los motores de búsqueda" -#: ../midori/sokoke.c:101 -#: ../midori/sokoke.c:113 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Utilizar como _predeterminado" + +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 msgid "Could not run external program." msgstr "No se pudo ejecutar la aplicación externa." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:354 +#: ../midori/sokoke.c:448 msgid "Warning: You are using a superuser account!" msgstr "Advertencia: Usted está utilizando una cuenta de superusuario!" -#: ../midori/gjs.c:742 -#: ../midori/gjs.c:832 -#, c-format -msgid "%s has no property '%s'" -msgstr "%s no tiene la propiedad «%s»" +#: ../midori/sokoke.c:780 +msgid "_Bookmark" +msgstr "_Marcador" -#: ../midori/gjs.c:878 -#, c-format -msgid "%s cannot be assigned to %s.%s" -msgstr "%s no puede ser asignado a %s.%s" +#: ../midori/sokoke.c:782 +msgid "_Add Bookmark" +msgstr "_Añadir marcador" -#: ../midori/gjs.c:888 -#, c-format -msgid "%s.%s cannot be accessed" -msgstr "%s.%s no se puede acceder" +#: ../midori/sokoke.c:783 +msgid "_Console" +msgstr "_Consola" -#: ../panels/midori-addons.c:97 -#: ../panels/midori-addons.c:143 +#: ../midori/sokoke.c:784 +msgid "_Extensions" +msgstr "_Extensiones" + +#: ../midori/sokoke.c:785 +msgid "_History" +msgstr "_Historial" + +#: ../midori/sokoke.c:786 +msgid "_Homepage" +msgstr "_Página de inicio" + +#: ../midori/sokoke.c:787 +msgid "_Userscripts" +msgstr "_Scripts de usuario" + +#: ../midori/sokoke.c:788 +msgid "User_styles" +msgstr "_Estilos de usuario" + +#: ../midori/sokoke.c:789 +msgid "New _Tab" +msgstr "Nueva _pestaña" + +#: ../midori/sokoke.c:790 +msgid "_Transfers" +msgstr "_Transferencias" + +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "C_omplementos" + +#: ../midori/sokoke.c:792 +msgid "_Closed Tabs and Windows" +msgstr "_Pestañas y ventanas cerradas" + +#: ../midori/sokoke.c:793 +msgid "New _Window" +msgstr "Nueva _ventana" + +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "Scripts de usuario" -#: ../panels/midori-addons.c:98 -#: ../panels/midori-addons.c:145 +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "Estilos de usuario" -#: ../panels/midori-addons.c:1005 +#: ../panels/midori-addons.c:927 #: ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "_Activar" -#: ../panels/midori-addons.c:1014 -#: ../panels/midori-extensions.c:153 +#: ../panels/midori-addons.c:928 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Activar" + +#: ../panels/midori-addons.c:937 +#: ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "_Desactivar" -#: ../panels/midori-bookmarks.c:100 +#: ../panels/midori-addons.c:938 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Desactivar" + +#: ../panels/midori-bookmarks.c:107 msgid "Bookmarks" msgstr "Marcadores" -#: ../panels/midori-bookmarks.c:217 +#: ../panels/midori-bookmarks.c:240 msgid "Edit the selected bookmark" msgstr "Editar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:225 +#: ../panels/midori-bookmarks.c:248 msgid "Delete the selected bookmark" msgstr "Borrar el marcador seleccionado" -#: ../panels/midori-bookmarks.c:529 +#: ../panels/midori-bookmarks.c:593 msgid "Separator" msgstr "Separador" @@ -1521,11 +1671,69 @@ msgstr "Consola" msgid "Extensions" msgstr "Extensiones" +#: ../panels/midori-history.c:163 +msgid "Are you sure you want to remove all history items?" +msgstr "¿Estás seguro de que quieres quitar todos los elementos del historial?" + +#: ../panels/midori-history.c:218 +msgid "Bookmark the selected history item" +msgstr "Añadir a marcadores el elemento seleccionado del historial" + +#: ../panels/midori-history.c:227 +msgid "Delete the selected history item" +msgstr "Borrar del historial el elemento seleccionado" + +#: ../panels/midori-history.c:235 +msgid "Clear the entire history" +msgstr "Vaciar el historial completo" + +#: ../panels/midori-history.c:600 +#, c-format +msgid "A week ago" +msgstr "Hace una semana" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d days ago" +msgstr "Hace %d días" + +#: ../panels/midori-history.c:613 +msgid "Today" +msgstr "Hoy" + +#: ../panels/midori-history.c:615 +msgid "Yesterday" +msgstr "Ayer" + #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:52 msgid "Plugins" msgstr "Complementos" +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Se requiere autentificación" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Nombre de usuario y contraseña son requeridos\n" +"para abrir ésta ubicación:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Nombre de usuario" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Contraseña" + #: ../katze/katze-throbber.c:828 #, c-format msgid "Named icon '%s' couldn't be loaded" @@ -1540,47 +1748,155 @@ msgstr "No se pudo cargar el ícono stock «%s»" msgid "Animation frames are broken" msgstr "Los cuadros de animación estan rotos" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propiedad «%s» no es válida para %s" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 msgid "Choose file" msgstr "Elegir archivo" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "Elegir carpeta" +#: ../extensions/colorful-tabs.c:104 +msgid "Tint tabs distinctly" +msgstr "Pestañas de distintos colores" + +#: ../extensions/colorful-tabs.c:140 +msgid "Colorful Tabs" +msgstr "Pestañas de colores" + +#: ../extensions/colorful-tabs.c:141 +msgid "Tint each tab distinctly" +msgstr "Colorear pestañas de distintos colores" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Al final de la sesión" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Servidor: %s\n" +"Nombre: %s\n" +"Valor: %s\n" +"Ruta: %s\n" +"Seguro: %s\n" +"Expira: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Si" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "No" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "¿Esta seguro que desea eliminar todas las cookies?" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "Pregunta" + +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "Sólo se eliminarán las cookies visibles que coinciden con el filtro." + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "Nombre" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "_Expandir todo" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "_Contraer todo" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "Eliminar todo" + +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "Elimina todas las cookies. Si se establece un filtro, sólo se eliminarán las \"cookies\" que coincidan con el filtro." + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Expandir todo" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "Contraer todo" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Filtro:" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "Introduzca una cadena de filtro para mostrar sólo las cookies cuyo nombre o dominio coincide con el filtro ingresado" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Gestor de cookies" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "_Gestor de cookies" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "Listar, ver y eliminar huellas" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" -msgstr "Gestos del Ratón" +msgstr "Gestos de ratón" #: ../extensions/mouse-gestures/main.c:217 msgid "Control Midori by moving the mouse" msgstr "Controlar Midori moviendo el ratón" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:116 -#: ../extensions/page-holder.c:153 +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "Anclar página" -#: ../extensions/page-holder.c:137 +#: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "_Anclar página" -#: ../extensions/statusbar-features.c:38 -msgid "Images" -msgstr "Imágenes" - -#: ../extensions/statusbar-features.c:45 -msgid "Scripts" -msgstr "Scripts" - +#~ msgid "Source" +#~ msgstr "Código fuente" +#~ msgid "_Icon (name or file):" +#~ msgstr "_Icono (nombre o archivo):" +#~ msgid "%s has no property '%s'" +#~ msgstr "%s no tiene la propiedad «%s»" +#~ msgid "%s cannot be assigned to %s.%s" +#~ msgstr "%s no puede ser asignado a %s.%s" +#~ msgid "%s.%s cannot be accessed" +#~ msgstr "%s.%s no se puede acceder" +#~ msgid "Images" +#~ msgstr "Imágenes" +#~ msgid "Scripts" +#~ msgstr "Scripts" #~ msgid "Manage search engines" #~ msgstr "Administrar los motores de búsqueda" #~ msgid "URIs" From bdf9c2c11ddb49f200b80c4351d88bff5b4fdc32 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Apr 2009 16:57:23 +0200 Subject: [PATCH 1059/2970] Fix label/ button on the panel when detaching and re-attaching --- midori/midori-panel.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 71da1cb0..8c2fa0bb 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -196,13 +196,15 @@ midori_panel_detached_window_delete_event_cb (GtkWidget* window, GtkWidget* toolbar = g_object_get_data (G_OBJECT (scrolled), "panel-toolbar"); GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), "panel-menuitem"); GtkToolItem* toolitem; + gint n; + g_object_ref (toolbar); gtk_container_remove (GTK_CONTAINER (vbox), toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); g_object_unref (toolbar); g_object_ref (scrolled); gtk_container_remove (GTK_CONTAINER (vbox), scrolled); - gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled); + n = gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), scrolled, NULL); g_object_unref (scrolled); toolitem = midori_panel_construct_tool_item (panel, MIDORI_VIEWABLE (_midori_panel_child_for_scrolled (panel, scrolled))); @@ -211,6 +213,8 @@ midori_panel_detached_window_delete_event_cb (GtkWidget* window, gtk_widget_show (menuitem); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); } + midori_panel_set_current_page (panel, n); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); return FALSE; } @@ -222,7 +226,6 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, /* FIXME: What happens when the browser is destroyed? */ /* FIXME: What about multiple browsers? */ /* FIXME: Should we remember if the child was detached? */ - /* FIXME: Fix label of the sidepanel after removing the widgets */ gint n = midori_panel_get_current_page (panel); GtkToolItem* toolitem = gtk_toolbar_get_nth_item ( GTK_TOOLBAR (panel->toolbar), n); @@ -253,7 +256,10 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, gtk_container_remove (GTK_CONTAINER (panel->notebook), scrolled); gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0); g_object_unref (scrolled); - midori_panel_set_current_page (panel, n); + midori_panel_set_current_page (panel, n > 0 ? n - 1 : 0); + toolitem = gtk_toolbar_get_nth_item (GTK_TOOLBAR (panel->toolbar), + n > 0 ? n - 1 : 0); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem), TRUE); if (!gtk_notebook_get_n_pages (GTK_NOTEBOOK (panel->notebook))) gtk_widget_set_sensitive (toolbutton, FALSE); g_signal_connect (window, "delete-event", From 62edfeb06e1513059c76b72e6f57596401644892 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Apr 2009 17:11:16 +0200 Subject: [PATCH 1060/2970] Disconnect panel toolitem destroy handler when detaching --- midori/midori-panel.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 8c2fa0bb..e96bc600 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -218,6 +218,15 @@ midori_panel_detached_window_delete_event_cb (GtkWidget* window, return FALSE; } +static void +midori_panel_widget_destroy_cb (GtkWidget* viewable, + GtkWidget* widget) +{ + gtk_widget_destroy (widget); + g_signal_handlers_disconnect_by_func ( + viewable, midori_panel_widget_destroy_cb, widget); +} + static void midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, MidoriPanel* panel) @@ -246,6 +255,9 @@ midori_panel_button_detach_clicked_cb (GtkWidget* toolbutton, gtk_container_add (GTK_CONTAINER (window), vbox); if (menuitem) gtk_widget_hide (menuitem); + g_signal_handlers_disconnect_by_func ( + _midori_panel_child_for_scrolled (panel, scrolled), + midori_panel_widget_destroy_cb, toolitem); gtk_container_remove (GTK_CONTAINER (panel->toolbar), GTK_WIDGET (toolitem)); g_object_ref (toolbar); gtk_container_remove (GTK_CONTAINER (panel->toolbook), toolbar); @@ -537,15 +549,6 @@ midori_panel_viewable_destroy_cb (GtkWidget* viewable, viewable, midori_panel_viewable_destroy_cb, panel); } -static void -midori_panel_widget_destroy_cb (GtkWidget* viewable, - GtkWidget* widget) -{ - gtk_widget_destroy (widget); - g_signal_handlers_disconnect_by_func ( - viewable, midori_panel_widget_destroy_cb, widget); -} - static GtkToolItem* midori_panel_construct_tool_item (MidoriPanel* panel, MidoriViewable* viewable) From d7b33085db35ea95de6b9fe84384620955a8de9e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 26 Apr 2009 23:31:52 +0200 Subject: [PATCH 1061/2970] Update Spanish translation --- po/es.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/es.po b/po/es.po index c95140f3..f1502ab1 100644 --- a/po/es.po +++ b/po/es.po @@ -996,21 +996,19 @@ msgstr "Estilo de la barra de herramientas" #: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" -msgstr "Mostrar el progreso de carga en el lugar de entrada" +msgstr "Mostrar progreso en lugar de entrada" #: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "Si se desea mostrar el progreso de carga en el lugar de entrada" #: ../midori/midori-websettings.c:497 -#, fuzzy msgid "Search engines in location completion" -msgstr "Motores de búsqueda en ubicación final" +msgstr "Motores de búsqueda en completamiento" #: ../midori/midori-websettings.c:498 -#, fuzzy msgid "Whether to show search engines in the location completion" -msgstr "Si se desea mostrar los motores de búsqueda en ubicación final" +msgstr "Si se desea mostrar los motores de búsqueda en completamento de dirección" #: ../midori/midori-websettings.c:506 msgid "Toolbar Items" From d328d2afabd0f86153b4027e8f87c0f4fd0e3fa5 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Apr 2009 00:22:16 +0200 Subject: [PATCH 1062/2970] Implement transfer completion notification via libnotify --- midori/midori-browser.c | 29 +++++++++++++++++++++++++++-- midori/midori-view.c | 2 +- midori/midori-websettings.c | 29 +++++++++++++++++++++++++++++ midori/sokoke.c | 5 +++-- midori/sokoke.h | 3 ++- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f4dfae80..bee98397 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -900,6 +900,9 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, switch (webkit_download_get_status (download)) { case WEBKIT_DOWNLOAD_STATUS_FINISHED: + { + MidoriBrowser* browser = midori_browser_get_for_widget (button); + icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); gtk_button_set_image (GTK_BUTTON (button), icon); if (g_object_get_data (G_OBJECT (download), "open-download")) @@ -907,6 +910,28 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, else g_object_set_data (G_OBJECT (gtk_widget_get_parent (button)), "done", (void*)1); + + if (browser->settings && katze_object_get_boolean ( + browser->settings, "notify-transfer-completed")) + { + gchar* program = g_find_program_in_path ("notify-send"); + if (program != NULL) + { + gchar* msg = g_strdup_printf ( + _("The file %s has been downloaded."), + webkit_download_get_suggested_filename (download)); + gchar* msgq = g_shell_quote (msg); + gchar* titleq = g_shell_quote (_("Transfer completed")); + gchar* command = g_strconcat (titleq, " ", msgq, NULL); + g_free (msg); + g_free (titleq); + g_free (msgq); + sokoke_spawn_program ("notify-send -i midori %s", command, FALSE); + g_free (command); + g_free (program); + } + } + } break; case WEBKIT_DOWNLOAD_STATUS_CANCELLED: case WEBKIT_DOWNLOAD_STATUS_ERROR: @@ -2428,7 +2453,7 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, g_object_get (browser->settings, "text-editor", &text_editor, NULL); if (text_editor && *text_editor) - sokoke_spawn_program (text_editor, unique_filename); + sokoke_spawn_program (text_editor, unique_filename, TRUE); else sokoke_show_uri (NULL, unique_filename, gtk_get_current_event_time (), NULL); @@ -2621,7 +2646,7 @@ _action_location_secondary_icon_released (GtkAction* action, { const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view)); if (browser->news_aggregator && *browser->news_aggregator) - sokoke_spawn_program (browser->news_aggregator, uri); + sokoke_spawn_program (browser->news_aggregator, uri, TRUE); } } diff --git a/midori/midori-view.c b/midori/midori-view.c index f5d9cebe..426271e5 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -926,7 +926,7 @@ static void midori_web_view_menu_download_activate_cb (GtkWidget* widget, MidoriView* view) { - sokoke_spawn_program (view->download_manager, view->link_uri); + sokoke_spawn_program (view->download_manager, view->link_uri, TRUE); } static void diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index e9a4609c..fb903b86 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -50,6 +50,7 @@ struct _MidoriWebSettings gchar* homepage; gboolean show_crash_dialog; gchar* download_folder; + gboolean notify_transfer_completed; gchar* download_manager; gchar* text_editor; gchar* news_aggregator; @@ -120,6 +121,7 @@ enum PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, PROP_DOWNLOAD_FOLDER, + PROP_NOTIFY_TRANSFER_COMPLETED, PROP_DOWNLOAD_MANAGER, PROP_TEXT_EDITOR, PROP_NEWS_AGGREGATOR, @@ -580,6 +582,26 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif + /** + * MidoriWebSettings:notify-transfer-completed: + * + * Whether to show a notification when a transfer has been completed. + * + * Since: 0.1.7 + */ + g_object_class_install_property (gobject_class, + PROP_NOTIFY_TRANSFER_COMPLETED, + g_param_spec_boolean ( + "notify-transfer-completed", + _("Notify when a transfer has been completed"), + _("Whether to show a notification when a transfer has been completed"), + TRUE, + #if WEBKIT_CHECK_VERSION (1, 1, 3) + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + #else + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + #endif + g_object_class_install_property (gobject_class, PROP_DOWNLOAD_MANAGER, g_param_spec_string ( @@ -912,6 +934,7 @@ notify_default_encoding_cb (GObject* object, static void midori_web_settings_init (MidoriWebSettings* web_settings) { + web_settings->notify_transfer_completed = TRUE; web_settings->download_folder = g_strdup (midori_get_download_dir ()); web_settings->http_proxy = NULL; web_settings->open_popups_in_tabs = TRUE; @@ -1077,6 +1100,9 @@ midori_web_settings_set_property (GObject* object, case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; + case PROP_NOTIFY_TRANSFER_COMPLETED: + web_settings->notify_transfer_completed = g_value_get_boolean (value); + break; case PROP_DOWNLOAD_MANAGER: katze_assign (web_settings->download_manager, g_value_dup_string (value)); break; @@ -1276,6 +1302,9 @@ midori_web_settings_get_property (GObject* object, case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); break; + case PROP_NOTIFY_TRANSFER_COMPLETED: + g_value_set_boolean (value, web_settings->notify_transfer_completed); + break; case PROP_DOWNLOAD_MANAGER: g_value_set_string (value, web_settings->download_manager); break; diff --git a/midori/sokoke.c b/midori/sokoke.c index 1330378f..4802abec 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -139,7 +139,8 @@ sokoke_show_uri (GdkScreen* screen, gboolean sokoke_spawn_program (const gchar* command, - const gchar* argument) + const gchar* argument, + gboolean quote) { gchar* argument_escaped; gchar* command_ready; @@ -149,7 +150,7 @@ sokoke_spawn_program (const gchar* command, g_return_val_if_fail (command != NULL, FALSE); g_return_val_if_fail (argument != NULL, FALSE); - argument_escaped = g_shell_quote (argument); + argument_escaped = quote ? g_shell_quote (argument) : g_strdup (argument); if (strstr (command, "%s")) command_ready = g_strdup_printf (command, argument_escaped); else diff --git a/midori/sokoke.h b/midori/sokoke.h index 61d80c3c..d750f2f3 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -35,7 +35,8 @@ sokoke_show_uri (GdkScreen* screen, gboolean sokoke_spawn_program (const gchar* command, - const gchar* argument); + const gchar* argument, + gboolean quote); gchar* sokoke_search_uri (const gchar* uri, const gchar* keywords); From ba7e8846ee6cf586d2b66cad019751fa5b42e4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 27 Apr 2009 01:11:58 +0200 Subject: [PATCH 1063/2970] Do not display any icon if there's no news feed available Work around a bug that made unsetting the secondary icon in the location entry impossible and do not set an icon if there is no news feed instead of an 'information' icon. --- midori/gtkiconentry.c | 24 ++++++++++++++++++------ midori/gtkiconentry.h | 6 +++++- midori/midori-browser.c | 6 ++---- midori/midori-locationaction.c | 8 ++------ 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 51740ab0..bda44ca4 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -28,12 +28,20 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, GdkPixbuf* pixbuf) { /* Without this ugly hack pixbuf icons don't work */ - if (pixbuf) - { - gtk_widget_hide (GTK_WIDGET (entry)); - gtk_entry_set_icon_from_pixbuf (entry, position, pixbuf); - gtk_widget_show (GTK_WIDGET (entry)); - } + gtk_widget_hide (GTK_WIDGET (entry)); + gtk_entry_set_icon_from_pixbuf (entry, position, pixbuf); + gtk_widget_show (GTK_WIDGET (entry)); +} + +void +gtk_icon_entry_set_icon_from_stock (GtkEntry* entry, + GtkEntryIconPosition position, + const gchar* stock_id) +{ + if (stock_id) + gtk_entry_set_icon_from_stock(entry, position, stock_id); + else + gtk_icon_entry_set_icon_from_pixbuf(entry, position, NULL); } #else @@ -1266,6 +1274,10 @@ gtk_icon_entry_set_icon_from_stock (GtkIconEntry *entry, { GdkPixbuf *pixbuf; + /* FIXME: Due to a bug in GtkIconEntry we need to set a non-NULL icon */ + if (! stock_id) + stock_id = GTK_STOCK_INFO; + pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), stock_id, GTK_ICON_SIZE_MENU, diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index 61f8075b..8f910cff 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -38,11 +38,15 @@ G_BEGIN_DECLS #define GTK_ICON_ENTRY GTK_ENTRY #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY #define gtk_icon_entry_new gtk_entry_new - #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock void gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, GtkEntryIconPosition position, GdkPixbuf* pixbuf); + void + gtk_icon_entry_set_icon_from_stock (GtkEntry* entry, + GtkEntryIconPosition position, + const gchar* stock_id); + #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable #else diff --git a/midori/midori-browser.c b/midori/midori-browser.c index bee98397..cb04bb3c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -312,7 +312,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED); else midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), GTK_STOCK_INFO); + MIDORI_LOCATION_ACTION (action), NULL); } static void @@ -420,7 +420,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, midori_location_action_set_uri ( MIDORI_LOCATION_ACTION (action), uri); midori_location_action_set_secondary_icon ( - MIDORI_LOCATION_ACTION (action), GTK_STOCK_INFO); + MIDORI_LOCATION_ACTION (action), NULL); g_object_notify (G_OBJECT (browser), "uri"); } @@ -4003,8 +4003,6 @@ midori_browser_init (MidoriBrowser* browser) "label", _("_Location..."), "stock-id", GTK_STOCK_JUMP_TO, "tooltip", _("Open a particular location"), - /* FIXME: Due to a bug in GtkIconEntry we need to set an initial icon */ - "secondary-icon", STOCK_NEWS_FEED, NULL); g_object_connect (action, "signal::activate", diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 54cdaeda..a24ec972 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1311,12 +1311,8 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action entry = gtk_bin_get_child (GTK_BIN (alignment)); child = gtk_bin_get_child (GTK_BIN (entry)); - if (stock_id) - gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_SECONDARY, stock_id); - else - gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (child), - GTK_ICON_ENTRY_SECONDARY, NULL); + gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child), + GTK_ICON_ENTRY_SECONDARY, stock_id); } } From 10426983b0c63c9c2688253c73592e998129767b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Apr 2009 17:46:04 +0200 Subject: [PATCH 1064/2970] Fail silently on xprop errors when determining the environment --- midori/sokoke.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 4802abec..bb421d80 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -423,8 +423,10 @@ sokoke_get_desktop (void) /* Are we running in Xfce? */ gint result; gchar *out = NULL; + gchar *err = NULL; gboolean success = g_spawn_command_line_sync ("xprop -root _DT_SAVE_MODE", - &out, NULL, &result, NULL); + &out, &err, &result, NULL); + g_free (err); if (success && ! result && out != NULL && strstr (out, "xfce4") != NULL) desktop = SOKOKE_DESKTOP_XFCE; else From 6d2013f16fc665914996104e9a7f36a2ec2e8a6f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 27 Apr 2009 20:49:32 +0200 Subject: [PATCH 1065/2970] Default to loading the last open pages at startup --- midori/midori-websettings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index fb903b86..6497632b 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -541,7 +541,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Load on Startup"), _("What to load on startup"), MIDORI_TYPE_STARTUP, - MIDORI_STARTUP_HOMEPAGE, + MIDORI_STARTUP_LAST_OPEN_PAGES, flags)); g_object_class_install_property (gobject_class, From 129f7d8f77431f2f8fb4ffea22e3d10c97c3fead Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Mon, 27 Apr 2009 20:58:30 +0200 Subject: [PATCH 1066/2970] Display feed URLs and show an icon instead of error dialogues --- extensions/feed-panel/feed-panel.c | 66 ++++++++++++++++++------------ extensions/feed-panel/main.c | 49 ++++++++-------------- 2 files changed, 56 insertions(+), 59 deletions(-) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 0abf8be6..1389e969 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -89,9 +89,17 @@ feed_panel_treeview_render_icon_cb (GtkTreeViewColumn* column, pitem = item; uri = katze_item_get_uri (pitem); - pixbuf = katze_net_load_icon (panel->net, uri, NULL, NULL, NULL); - if (!pixbuf) - pixbuf = panel->pixbuf; + if (uri) + { + pixbuf = katze_net_load_icon (panel->net, uri, NULL, NULL, NULL); + if (!pixbuf) + pixbuf = panel->pixbuf; + } + else + { + pixbuf = gtk_widget_render_icon (panel->treeview, + GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL); + } g_object_set (renderer, "pixbuf", pixbuf, NULL); @@ -339,41 +347,47 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, const gchar* text; gtk_tree_model_get (model, &iter, 0, &item, -1); - uri = katze_item_get_uri (item); - if (uri) + if (KATZE_IS_ARRAY (item)) { - if (KATZE_IS_ARRAY (item)) - { - gint64 date; - SoupDate* sdate; + gint64 date; - text = NULL; + text = NULL; + if (!uri) + text = g_strdup (katze_item_get_text (KATZE_ITEM (item))); + else + { date = katze_item_get_added (item); if (date) { + SoupDate* sdate; + const gchar* suri; sdate = soup_date_new_from_time_t ((time_t) date); - text = g_strdup_printf ("Last updated %s.", soup_date_to_string (sdate, SOUP_DATE_HTTP)); + suri = (const gchar*)g_object_get_data (G_OBJECT (item), "feeduri"); + text = g_strdup_printf ( + "feed" + "

%s

Last updated %s.", + suri, soup_date_to_string (sdate, SOUP_DATE_HTTP)); soup_date_free (sdate); } - webkit_web_view_load_html_string ( - WEBKIT_WEB_VIEW (panel->webview), text ? text : "", uri); - g_free ((gchar*) text); + } + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (panel->webview), text ? text : "", uri); + g_free ((gchar*) text); - sensitive = TRUE; - } - else - { - text = katze_item_get_text (item); - if (text) - { - webkit_web_view_load_html_string ( - WEBKIT_WEB_VIEW (panel->webview), text, uri); - } - } - g_object_unref (item); + sensitive = TRUE; } + else + { + text = katze_item_get_text (item); + if (text) + { + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (panel->webview), text, uri); + } + } + g_object_unref (item); } if (GTK_IS_WIDGET (panel->delete)) gtk_widget_set_sensitive (panel->delete, sensitive); diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index e1c4d723..9f72973c 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -141,28 +141,12 @@ static void feed_handle_net_error (FeedNetPrivate* netpriv, const gchar* msg) { - GtkWidget* dialog; + const gchar* uri; - dialog = gtk_message_dialog_new ( - NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("Error")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", msg); - gtk_window_set_title (GTK_WINDOW (dialog), EXTENSION_NAME); - gtk_widget_show (dialog); - g_signal_connect_swapped (dialog, "response", - G_CALLBACK (gtk_widget_destroy), dialog); - - if (feed_has_flags (netpriv->feed, FEED_NEW)) - { - KatzeArray* parent; - KatzeItem* child; - - child = KATZE_ITEM (netpriv->feed); - parent = katze_item_get_parent (child); - katze_array_remove_item (parent, child); - feed_save_items (netpriv->extension, parent); - } + uri = (gchar*) g_object_get_data (G_OBJECT (netpriv->feed), "feeduri"); + katze_item_set_name (KATZE_ITEM (netpriv->feed), uri); + katze_item_set_text (KATZE_ITEM (netpriv->feed), msg); + katze_item_set_uri (KATZE_ITEM (netpriv->feed), NULL); feed_remove_flags (netpriv->feed, FEED_READ); } @@ -206,20 +190,18 @@ feed_transfer_cb (KatzeNetRequest* request, feed_handle_net_error (netpriv, error->message); g_error_free (error); } - else - { - if (feed_has_flags (netpriv->feed, FEED_REMOVE)) - { - KatzeArray* parent; - /* deferred remove */ - parent = katze_item_get_parent (KATZE_ITEM (netpriv->feed)); - katze_array_remove_item (parent, netpriv->feed); - feed_save_items (netpriv->extension, parent); - } - else - feed_set_flags (netpriv->feed, 0); + if (feed_has_flags (netpriv->feed, FEED_REMOVE)) + { + KatzeArray* parent; + + /* deferred remove */ + parent = katze_item_get_parent (KATZE_ITEM (netpriv->feed)); + katze_array_remove_item (parent, netpriv->feed); + feed_save_items (netpriv->extension, parent); } + else + feed_set_flags (netpriv->feed, 0); } netpriv->parsers = NULL; @@ -415,6 +397,7 @@ feed_app_add_browser_cb (MidoriApp* app, update_feed (priv, KATZE_ITEM (feed)); } } + g_strdupv (sfeeds); action_group = midori_browser_get_action_group (browser); action = gtk_action_group_get_action (action_group, "Location"); From 0ec3dff95db3c34ec6d15692c705d3048420e23a Mon Sep 17 00:00:00 2001 From: Masato Hashimoto Date: Mon, 27 Apr 2009 21:12:04 +0200 Subject: [PATCH 1067/2970] Update Japanese translation --- po/ja.po | 1121 +++++++++++++++++++++++++++++------------------------- 1 file changed, 607 insertions(+), 514 deletions(-) diff --git a/po/ja.po b/po/ja.po index ea272656..dc98bcbd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: Midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-12 22:19+0900\n" -"PO-Revision-Date: 2009-04-13 01:45+0900\n" -"Last-Translator: Masato Hashimoto \n" +"POT-Creation-Date: 2009-04-27 21:28+0900\n" +"PO-Revision-Date: 2009-04-27 21:27+0900\n" +"Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,12 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "軽量級ウェブブラウザ" -#: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1288 -#: ../midori/main.c:1384 -#: ../midori/main.c:1392 -#: ../midori/main.c:1403 -#: ../midori/midori-websettings.c:269 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 +#: ../midori/main.c:1423 ../midori/main.c:1434 +#: ../midori/midori-websettings.c:273 msgid "Midori" msgstr "Midori" @@ -33,180 +30,187 @@ msgstr "Midori" msgid "Web Browser" msgstr "ウェブブラウザ" -#: ../midori/main.c:94 +#: ../midori/main.c:95 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "設定を読み込めませんでした: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "'%s' は %s の値として無効です" -#: ../midori/main.c:156 -#: ../midori/main.c:228 +#: ../midori/main.c:157 ../midori/main.c:237 #, c-format msgid "Invalid configuration value '%s'" msgstr "無効な設定値 '%s'" -#: ../midori/main.c:332 +#: ../midori/main.c:349 #, c-format msgid "Failed to open database: %s\n" msgstr "データベースのオープンに失敗しました: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:381 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "データベース文の実行に失敗しました: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:435 #, c-format msgid "Failed to remove history item: %s\n" msgstr "履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:459 #, c-format msgid "Failed to clear history: %s\n" msgstr "履歴のクリアに失敗しました: %s\n" -#: ../midori/main.c:465 -#: ../midori/main.c:499 -#: ../midori/main.c:515 +#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 #, c-format msgid "Failed to add history item: %s\n" msgstr "履歴アイテムの追加に失敗しました: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:711 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "古い履歴アイテムの削除に失敗しました: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:740 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "設定を保存できませんでした。%s" -#: ../midori/main.c:751 +#: ../midori/main.c:769 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "検索エンジンを保存できませんでした。%s" -#: ../midori/main.c:770 -#: ../midori/main.c:798 -#: ../midori/main.c:827 +#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "ブックマークを保存できませんでした。%s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 -#: ../midori/main.c:873 +#: ../midori/main.c:868 ../midori/main.c:891 #, c-format msgid "The trash couldn't be saved. %s" msgstr "ゴミ箱を保存できませんでした。%s" -#: ../midori/main.c:946 +#: ../midori/main.c:964 #, c-format msgid "The session couldn't be saved. %s" msgstr "セッションは保存できませんでした。%s" -#: ../midori/main.c:1073 -msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." -msgstr "Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生するようであれば、問題解決のために以下のオプションのひとつを試してみてください。" +#: ../midori/main.c:1091 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Midori は最後に開いたときにクラッシュしたようです。もしこれが繰り返し発生する" +"ようであれば、問題解決のために以下のオプションのいずれかを試してみてくださ" +"い。" -#: ../midori/main.c:1088 +#: ../midori/main.c:1106 msgid "Modify _preferences" msgstr "設定を変更する(_P)" -#: ../midori/main.c:1092 +#: ../midori/main.c:1110 msgid "Reset the last _session" msgstr "最後のセッションをリセットする(_S)" -#: ../midori/main.c:1097 +#: ../midori/main.c:1115 msgid "Disable all _extensions" msgstr "すべてのエクステンションを無効にする(_E)" -#: ../midori/main.c:1288 +#: ../midori/main.c:1314 msgid "No filename specified" msgstr "ファイル名が指定されていません" -#: ../midori/main.c:1311 +#: ../midori/main.c:1337 msgid "An unknown error occured." msgstr "未知のエラーが発生しました。" -#: ../midori/main.c:1335 +#: ../midori/main.c:1362 +msgid "Run ADDRESS as a web application" +msgstr "ADDRESS をウェブアプリケーションとして実行する" + +#: ../midori/main.c:1362 +msgid "ADDRESS" +msgstr "ADDRESS" + +#: ../midori/main.c:1364 msgid "Use FOLDER as configuration folder" msgstr "設定フォルダとして FOLDER を使用する" -#: ../midori/main.c:1335 +#: ../midori/main.c:1364 msgid "FOLDER" msgstr "FOLDER" # CLI --help -#: ../midori/main.c:1337 +#: ../midori/main.c:1366 msgid "Run the specified filename as javascript" msgstr "指定されたファイル名を javascript として実行する" # CLI --help -#: ../midori/main.c:1339 +#: ../midori/main.c:1368 msgid "Display program version" msgstr "プログラムのバージョンを表示する" -#: ../midori/main.c:1341 +#: ../midori/main.c:1370 msgid "Addresses" msgstr "アドレス" -#: ../midori/main.c:1381 +#: ../midori/main.c:1412 msgid "[Addresses]" msgstr "[アドレス]" -#: ../midori/main.c:1404 +#: ../midori/main.c:1435 msgid "Please report comments, suggestions and bugs to:" msgstr "コメント、ご提案、またはバグの報告はこちらまでお願いします:" -#: ../midori/main.c:1406 +#: ../midori/main.c:1437 msgid "Check for new versions at:" msgstr "新しいバージョンのチェックはこちら:" -#: ../midori/main.c:1427 +#: ../midori/main.c:1481 msgid "The specified configuration folder is invalid." msgstr "指定された設定フォルダが正しくありません。" -#: ../midori/main.c:1462 +#: ../midori/main.c:1516 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori のインスタンスはすでに実行中ですが応答がありません。\n" -#: ../midori/main.c:1512 +#: ../midori/main.c:1566 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "検索エンジンを読み込めませんでした。%s\n" -#: ../midori/main.c:1524 +#: ../midori/main.c:1578 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "ブックマークを読み込めませんでした: %s\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1593 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "セッションを読み込めませんでした: %s\n" -#: ../midori/main.c:1552 +#: ../midori/main.c:1606 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "ゴミ箱を読み込めませんでした: %s\n" -#: ../midori/main.c:1565 +#: ../midori/main.c:1619 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "履歴を読み込めませんでした: %s\n" -#: ../midori/main.c:1577 +#: ../midori/main.c:1631 msgid "The following errors occured:" msgstr "次のエラーが発生しました:" -#: ../midori/main.c:1593 +#: ../midori/main.c:1647 msgid "_Ignore" msgstr "無視(_I)" @@ -214,1109 +218,1118 @@ msgstr "無視(_I)" msgid "File not found." msgstr "ファイルが見つかりません。" -#: ../midori/midori-array.c:203 -#: ../midori/midori-array.c:212 +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 msgid "Malformed document." msgstr "不正な形式のドキュメントです。" -#: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:616 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:714 #, c-format msgid "Writing failed." msgstr "書き込みに失敗しました。" -#: ../midori/midori-browser.c:278 -#: ../midori/midori-browser.c:3415 -#: ../midori/midori-browser.c:3421 +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3432 msgid "Reload the current page" msgstr "現在のページを再読み込みします" -#: ../midori/midori-browser.c:289 -#: ../midori/midori-browser.c:3418 +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3429 msgid "Stop loading the current page" msgstr "現在のページの読み込みを中止します" -#: ../midori/midori-browser.c:352 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "%d%% ロードしました" -#: ../midori/midori-browser.c:377 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "'%s' は想定外のアクションです。" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:542 msgid "New folder" msgstr "新しいフォルダ" -#: ../midori/midori-browser.c:554 +#: ../midori/midori-browser.c:542 msgid "Edit folder" msgstr "フォルダの編集" -#: ../midori/midori-browser.c:556 +#: ../midori/midori-browser.c:544 msgid "New bookmark" msgstr "新しいブックマーク" -#: ../midori/midori-browser.c:556 +#: ../midori/midori-browser.c:544 msgid "Edit bookmark" msgstr "ブックマークの編集" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:574 msgid "_Title:" msgstr "タイトル(_T):" -#: ../midori/midori-browser.c:599 -#: ../midori/midori-searchaction.c:856 +#: ../midori/midori-browser.c:587 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "説明(_D):" -#: ../midori/midori-browser.c:618 -#: ../midori/midori-searchaction.c:870 +#: ../midori/midori-browser.c:606 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:322 msgid "_Address:" msgstr "アドレス(_A):" -#: ../midori/midori-browser.c:637 +#: ../midori/midori-browser.c:625 msgid "_Folder:" msgstr "フォルダ(_F):" -#: ../midori/midori-browser.c:642 -#: ../midori/midori-browser.c:683 +#: ../midori/midori-browser.c:630 ../midori/midori-browser.c:671 msgid "Toplevel folder" msgstr "トップレベルフォルダ" -#: ../midori/midori-browser.c:759 +#: ../midori/midori-browser.c:747 msgid "Save file as" msgstr "名前を付けて保存" -#: ../midori/midori-browser.c:1538 +#: ../midori/midori-browser.c:921 +#, c-format +msgid "The file %s has been downloaded." +msgstr "ファイル %s をダウンロードしました。" + +#: ../midori/midori-browser.c:924 +msgid "Transfer completed" +msgstr "転送完了" + +#: ../midori/midori-browser.c:1602 msgid "Open file" msgstr "ファイルを開く" -#: ../midori/midori-browser.c:2850 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2867 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "タブですべて開く(_T)" -#: ../midori/midori-browser.c:2857 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2874 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:492 msgid "Open in New _Tab" msgstr "新しいタブで開く(_T)" -#: ../midori/midori-browser.c:2860 -#: ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2877 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:494 msgid "Open in New _Window" msgstr "新しいウィンドウで開く(_W)" # Dialog title -#: ../midori/midori-browser.c:3021 +#: ../midori/midori-browser.c:3038 msgid "Clear Private Data" msgstr "プライベートデータのクリア" # Button title -#: ../midori/midori-browser.c:3024 -msgid "Clear private data" -msgstr "プライベートデータのクリア" +#: ../midori/midori-browser.c:3041 +msgid "_Clear private data" +msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:3037 +#: ../midori/midori-browser.c:3054 msgid "Clear the following data:" msgstr "以下のデータをクリアします:" -#: ../midori/midori-browser.c:3045 -#: ../midori/midori-preferences.c:628 +#: ../midori/midori-browser.c:3062 ../midori/midori-preferences.c:646 #: ../panels/midori-history.c:108 msgid "History" msgstr "履歴" -#: ../midori/midori-browser.c:3048 +#: ../midori/midori-browser.c:3065 msgid "Cookies" msgstr "Cookie" -#: ../midori/midori-browser.c:3051 +#: ../midori/midori-browser.c:3068 msgid "'Flash' Cookies" msgstr "'Flash' Cookie" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3071 msgid "Website icons" msgstr "ウェブサイトアイコン" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3151 msgid "A lightweight web browser." msgstr "軽快なウェブブラウザ" -#: ../midori/midori-browser.c:3148 +#: ../midori/midori-browser.c:3159 msgid "translator-credits" msgstr "Masato Hashimoto " -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3360 msgid "_File" msgstr "ファイル(_F)" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3363 msgid "Open a new window" msgstr "新しいウィンドウを開きます" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3366 msgid "Open a new tab" msgstr "新しいタブを開きます" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3369 msgid "Open a file" msgstr "ファイルを開きます" -#: ../midori/midori-browser.c:3361 +#: ../midori/midori-browser.c:3372 msgid "Save to a file" msgstr "ファイルへ保存します" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3374 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3375 msgid "Close the current tab" msgstr "現在のタブを閉じます" -#: ../midori/midori-browser.c:3366 +#: ../midori/midori-browser.c:3377 msgid "C_lose Window" msgstr "ウィンドウを閉じる(_L)" -#: ../midori/midori-browser.c:3367 +#: ../midori/midori-browser.c:3378 msgid "Close this window" msgstr "このウィンドウを閉じます" -#: ../midori/midori-browser.c:3370 +#: ../midori/midori-browser.c:3381 msgid "Print the current page" msgstr "現在のページを印刷します" -#: ../midori/midori-browser.c:3373 +#: ../midori/midori-browser.c:3384 msgid "Quit the application" msgstr "このアプリケーションを終了します" -#: ../midori/midori-browser.c:3375 +#: ../midori/midori-browser.c:3386 msgid "_Edit" msgstr "編集(_E)" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3389 msgid "Cut the selected text" -msgstr "選択された文字を切り取ります" +msgstr "選択した文字を切り取ります" -#: ../midori/midori-browser.c:3381 -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3392 ../midori/midori-browser.c:3395 msgid "Copy the selected text" -msgstr "選択された文字をコピーします" +msgstr "選択した文字をコピーします" -#: ../midori/midori-browser.c:3387 +#: ../midori/midori-browser.c:3398 msgid "Paste text from the clipboard" msgstr "クリップボードから文字を貼り付けます" -#: ../midori/midori-browser.c:3390 +#: ../midori/midori-browser.c:3401 msgid "Delete the selected text" -msgstr "選択された文字を削除します" +msgstr "選択した文字を削除します" -#: ../midori/midori-browser.c:3393 +#: ../midori/midori-browser.c:3404 msgid "Select all text" msgstr "すべての文字を選択します" -#: ../midori/midori-browser.c:3396 +#: ../midori/midori-browser.c:3407 msgid "Find a word or phrase in the page" msgstr "ページ内の単語やフレーズを検索します" -#: ../midori/midori-browser.c:3398 +#: ../midori/midori-browser.c:3409 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../midori/midori-browser.c:3399 +#: ../midori/midori-browser.c:3410 msgid "Find the next occurrence of a word or phrase" msgstr "指定文字列に一致する次の候補を検索します" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3412 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../midori/midori-browser.c:3402 +#: ../midori/midori-browser.c:3413 msgid "Find the previous occurrence of a word or phrase" msgstr "指定文字列に一致する前の候補を検索します" -#: ../midori/midori-browser.c:3405 +#: ../midori/midori-browser.c:3416 msgid "_Quick Find" msgstr "クイック検索(_Q)" -#: ../midori/midori-browser.c:3406 +#: ../midori/midori-browser.c:3417 msgid "Quickly jump to a word or phrase" msgstr "単語やフレーズにすぐに移動します" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:3420 msgid "Configure the application preferences" msgstr "アプリケーションの設定を行います" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3422 msgid "_View" msgstr "表示(_V)" -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:3423 msgid "_Toolbars" msgstr "ツールバー(_T)" -#: ../midori/midori-browser.c:3424 +#: ../midori/midori-browser.c:3435 msgid "Increase the zoom level" msgstr "ズームレベルを大きくします" -#: ../midori/midori-browser.c:3427 +#: ../midori/midori-browser.c:3438 msgid "Decrease the zoom level" msgstr "ズームレベルを小さくします" -#: ../midori/midori-browser.c:3430 +#: ../midori/midori-browser.c:3441 msgid "Reset the zoom level" msgstr "ズームレベルをリセットします" -#: ../midori/midori-browser.c:3431 +#: ../midori/midori-browser.c:3442 msgid "_Encoding" msgstr "エンコーディング(_E)" -#: ../midori/midori-browser.c:3433 +#: ../midori/midori-browser.c:3444 msgid "_Automatic" msgstr "自動(_A)" -#: ../midori/midori-browser.c:3436 -#: ../midori/midori-websettings.c:196 +#: ../midori/midori-browser.c:3447 ../midori/midori-websettings.c:200 msgid "Chinese (BIG5)" msgstr "中国語 (BIG5)" -#: ../midori/midori-browser.c:3439 -#: ../midori/midori-websettings.c:197 +#: ../midori/midori-browser.c:3450 ../midori/midori-websettings.c:201 msgid "Japanese (SHIFT_JIS)" msgstr "日本語 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3442 -#: ../midori/midori-websettings.c:198 +#: ../midori/midori-browser.c:3453 ../midori/midori-websettings.c:202 msgid "Russian (KOI8-R)" msgstr "ロシア語 (KOI8-R)" -#: ../midori/midori-browser.c:3445 -#: ../midori/midori-websettings.c:199 +#: ../midori/midori-browser.c:3456 ../midori/midori-websettings.c:203 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3448 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3459 ../midori/midori-websettings.c:204 msgid "Western (ISO-8859-1)" msgstr "西欧 (ISO-8859-1)" -#: ../midori/midori-browser.c:3451 -#: ../midori/midori-websettings.c:201 -#: ../midori/midori-websettings.c:273 +#: ../midori/midori-browser.c:3462 ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 msgid "Custom..." msgstr "カスタム..." -#: ../midori/midori-browser.c:3454 -#: ../midori/midori-view.c:1161 +#: ../midori/midori-browser.c:3465 ../midori/midori-view.c:1146 msgid "View _Source" msgstr "ソースを表示(_S)" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3466 msgid "View the source code of the page" msgstr "ページのソースコードを表示します" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3468 msgid "View Selection Source" msgstr "選択領域のソースを表示" -#: ../midori/midori-browser.c:3458 +#: ../midori/midori-browser.c:3469 msgid "View the source code of the selection" msgstr "選択した領域のソースを表示します" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3473 msgid "Toggle fullscreen view" msgstr "全画面表示/解除を切り替えます" -#: ../midori/midori-browser.c:3464 +#: ../midori/midori-browser.c:3475 msgid "_Go" msgstr "移動(_G)" -#: ../midori/midori-browser.c:3467 +#: ../midori/midori-browser.c:3478 msgid "Go back to the previous page" msgstr "前のページへ戻ります" -#: ../midori/midori-browser.c:3470 +#: ../midori/midori-browser.c:3481 msgid "Go forward to the next page" msgstr "次のページへ進みます" -#: ../midori/midori-browser.c:3473 +#: ../midori/midori-browser.c:3484 msgid "Go to your homepage" msgstr "ホームページに移動します" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:3486 msgid "Empty Trash" msgstr "ゴミ箱を空にする" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3487 msgid "Delete the contents of the trash" msgstr "ゴミ箱の中身を削除します" -#: ../midori/midori-browser.c:3478 -#: ../midori/midori-view.c:1133 +#: ../midori/midori-browser.c:3489 ../midori/midori-view.c:1118 msgid "Undo Close Tab" msgstr "閉じたタブを元に戻す" -#: ../midori/midori-browser.c:3479 +#: ../midori/midori-browser.c:3490 msgid "Open the last closed tab" msgstr "最後に閉じたタブを開きます" -#: ../midori/midori-browser.c:3483 -#: ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3494 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "新しいブックマークを追加します" -#: ../midori/midori-browser.c:3485 -#: ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3496 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "新しいフォルダの追加" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3497 msgid "Add a new bookmark folder" msgstr "新しいブックマークフォルダを追加します" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3498 msgid "_Tools" msgstr "ツール(_T)" -#: ../midori/midori-browser.c:3489 -#: ../midori/midori-searchaction.c:465 +#: ../midori/midori-browser.c:3500 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "検索エンジンの管理(_M)" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3501 msgid "Add, edit and remove search engines..." msgstr "検索エンジンを追加、編集、または削除します..." -#: ../midori/midori-browser.c:3493 +#: ../midori/midori-browser.c:3504 msgid "_Clear Private Data" msgstr "プライベートデータのクリア(_C)" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3505 msgid "Clear private data..." msgstr "プライベートデータをクリアします..." -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3509 msgid "_Previous Tab" msgstr "前のタブ(_P)" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3510 msgid "Switch to the previous tab" msgstr "前のタブへ切り替えます" -#: ../midori/midori-browser.c:3501 +#: ../midori/midori-browser.c:3512 msgid "_Next Tab" msgstr "次のタブ(_N)" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3513 msgid "Switch to the next tab" msgstr "次のタブへ切り替えます" -#: ../midori/midori-browser.c:3504 +#: ../midori/midori-browser.c:3515 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../midori/midori-browser.c:3506 +#: ../midori/midori-browser.c:3517 msgid "_Contents" msgstr "目次(_C)" -#: ../midori/midori-browser.c:3507 +#: ../midori/midori-browser.c:3518 msgid "Show the documentation" msgstr "ドキュメントを表示します" -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3520 msgid "_Frequent Questions" msgstr "よくある質問(_F)" -#: ../midori/midori-browser.c:3510 +#: ../midori/midori-browser.c:3521 msgid "Show the Frequently Asked Questions" msgstr "よくある質問とその答えを表示します" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3523 msgid "_Report a Bug" msgstr "バグを報告(_R)" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3524 msgid "Open Midori's bug tracker" msgstr "Midori のバグトラッカーを開きます" -#: ../midori/midori-browser.c:3516 +#: ../midori/midori-browser.c:3527 msgid "Show information about the program" msgstr "このプログラムについての情報を表示します" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3534 msgid "P_rivate Browsing" msgstr "プライベートブラウジング(_R)" -#: ../midori/midori-browser.c:3524 +#: ../midori/midori-browser.c:3535 msgid "Don't save any private data while browsing" msgstr "閲覧する中で個人データを保存しません" -#: ../midori/midori-browser.c:3529 +#: ../midori/midori-browser.c:3540 msgid "_Menubar" msgstr "メニューバー(_M)" -#: ../midori/midori-browser.c:3530 +#: ../midori/midori-browser.c:3541 msgid "Show menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-browser.c:3533 +#: ../midori/midori-browser.c:3544 msgid "_Navigationbar" msgstr "ナビゲーションバー(_N)" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3545 msgid "Show navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-browser.c:3537 +#: ../midori/midori-browser.c:3548 msgid "Side_panel" msgstr "サイドパネル(_P)" -#: ../midori/midori-browser.c:3538 +#: ../midori/midori-browser.c:3549 msgid "Show sidepanel" msgstr "サイドパネルを表示します" -#: ../midori/midori-browser.c:3541 +#: ../midori/midori-browser.c:3552 msgid "_Bookmarkbar" msgstr "ブックマークバー(_B)" -#: ../midori/midori-browser.c:3542 +#: ../midori/midori-browser.c:3553 msgid "Show bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-browser.c:3545 +#: ../midori/midori-browser.c:3556 msgid "_Transferbar" msgstr "転送バー(_T)" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3557 msgid "Show transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3560 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../midori/midori-browser.c:3550 +#: ../midori/midori-browser.c:3561 msgid "Show statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-browser.c:3984 +#: ../midori/midori-browser.c:3996 msgid "_Separator" msgstr "セパレータ(_S)" -#: ../midori/midori-browser.c:3991 +#: ../midori/midori-browser.c:4003 msgid "_Location..." msgstr "場所(_L)..." -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4005 msgid "Open a particular location" msgstr "指定された場所を開きます" -#: ../midori/midori-browser.c:4017 +#: ../midori/midori-browser.c:4027 msgid "_Web Search..." msgstr "ウェブ検索(_W)..." -#: ../midori/midori-browser.c:4019 +#: ../midori/midori-browser.c:4029 msgid "Run a web search" msgstr "ウェブ検索を実行します" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4050 msgid "Reopen a previously closed tab or window" msgstr "これまでに閉じられたタブやウィンドウを再び開きます" -#: ../midori/midori-browser.c:4051 +#: ../midori/midori-browser.c:4063 msgid "_Recently visited pages" msgstr "最近訪れたページ(_R)" -#: ../midori/midori-browser.c:4053 +#: ../midori/midori-browser.c:4065 msgid "Reopen pages that you visited earlier" msgstr "以前に訪れたページを再び開きます" -#: ../midori/midori-browser.c:4066 -#: ../midori/sokoke.c:771 +#: ../midori/midori-browser.c:4078 ../midori/sokoke.c:870 msgid "_Bookmarks" msgstr "ブックマーク(_B)" -#: ../midori/midori-browser.c:4068 +#: ../midori/midori-browser.c:4080 msgid "Show the saved bookmarks" msgstr "保存されたブックマークを表示します" -#: ../midori/midori-browser.c:4081 +#: ../midori/midori-browser.c:4093 msgid "_Window" msgstr "ウィンドウ(_W)" -#: ../midori/midori-browser.c:4083 +#: ../midori/midori-browser.c:4095 msgid "Show a list of all open tabs" msgstr "開いているすべてのタブのリストを表示します" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4250 +#: ../midori/midori-browser.c:4262 msgid "_Inline Find:" msgstr "インライン検索(_I)" -#: ../midori/midori-browser.c:4275 +#: ../midori/midori-browser.c:4287 msgid "Previous" msgstr "前を検索" -#: ../midori/midori-browser.c:4280 +#: ../midori/midori-browser.c:4292 msgid "Next" msgstr "次を検索" -#: ../midori/midori-browser.c:4285 +#: ../midori/midori-browser.c:4297 msgid "Match Case" msgstr "大文字・小文字を区別" -#: ../midori/midori-browser.c:4293 +#: ../midori/midori-browser.c:4305 msgid "Highlight Matches" msgstr "強調表示" -#: ../midori/midori-browser.c:4303 +#: ../midori/midori-browser.c:4315 msgid "Close Findbar" msgstr "検索バーを閉じる" -#: ../midori/midori-browser.c:4609 +#: ../midori/midori-browser.c:4350 ../extensions/cookie-manager.c:819 +msgid "Delete All" +msgstr "すべて削除" + +#: ../midori/midori-browser.c:4662 #, c-format msgid "Unexpected setting '%s'" msgstr "'%s' は予想外の設定です" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" -msgstr "選択されたパネルをウィンドウから切り離す" +msgstr "選択したパネルをウィンドウから切り離す" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" -msgstr "選択されたパネルをウィンドウから切り離します" +msgstr "選択したパネルをウィンドウから切り離します" -#: ../midori/midori-panel.c:321 -#: ../midori/midori-websettings.c:511 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:531 msgid "Align sidepanel on the right" msgstr "サイドパネルを右側に配置する" -#: ../midori/midori-panel.c:323 -#: ../midori/midori-websettings.c:512 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" msgstr "サイドパネルを右側に表示します" -#: ../midori/midori-panel.c:333 -#: ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 msgid "Close panel" msgstr "パネルを閉じます" -#: ../midori/midori-websettings.c:179 -#: ../midori/midori-view.c:1965 +#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1951 msgid "Blank page" msgstr "空白ページ" -#: ../midori/midori-websettings.c:180 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 msgid "Homepage" msgstr "ホームページ" -#: ../midori/midori-websettings.c:181 +#: ../midori/midori-websettings.c:185 msgid "Last open pages" msgstr "最後に開いたページ" -#: ../midori/midori-websettings.c:216 +#: ../midori/midori-websettings.c:220 msgid "New tab" msgstr "新しいタブ" -#: ../midori/midori-websettings.c:217 +#: ../midori/midori-websettings.c:221 msgid "New window" msgstr "新しいウィンドウ" -#: ../midori/midori-websettings.c:218 +#: ../midori/midori-websettings.c:222 msgid "Current tab" msgstr "現在のタブ" -#: ../midori/midori-websettings.c:233 +#: ../midori/midori-websettings.c:237 msgid "Default" msgstr "デフォルト" -#: ../midori/midori-websettings.c:234 +#: ../midori/midori-websettings.c:238 msgid "Icons" msgstr "アイコン" -#: ../midori/midori-websettings.c:235 +#: ../midori/midori-websettings.c:239 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:236 +#: ../midori/midori-websettings.c:240 msgid "Both" msgstr "アイコンと文字" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:241 msgid "Both horizontal" msgstr "アイコンと文字 (横方向)" -#: ../midori/midori-websettings.c:252 +#: ../midori/midori-websettings.c:256 msgid "All cookies" msgstr "すべての Cookie" -#: ../midori/midori-websettings.c:253 +#: ../midori/midori-websettings.c:257 msgid "Session cookies" msgstr "セッションの Cookie" -#: ../midori/midori-websettings.c:254 -#: ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 msgid "None" msgstr "なし" -#: ../midori/midori-websettings.c:270 +#: ../midori/midori-websettings.c:274 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:271 +#: ../midori/midori-websettings.c:275 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:272 +#: ../midori/midori-websettings.c:276 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:325 +#: ../midori/midori-websettings.c:329 msgid "Remember last window size" msgstr "最後のウィンドウサイズを記憶する" -#: ../midori/midori-websettings.c:326 +#: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" msgstr "最後のウィンドウサイズを記憶します" -#: ../midori/midori-websettings.c:334 +#: ../midori/midori-websettings.c:338 msgid "Last window width" msgstr "最後のウィンドウの幅" -#: ../midori/midori-websettings.c:335 +#: ../midori/midori-websettings.c:339 msgid "The last saved window width" msgstr "最後に保存されたウィンドウ幅" -#: ../midori/midori-websettings.c:343 +#: ../midori/midori-websettings.c:347 msgid "Last window height" msgstr "最後のウィンドウの高さ" -#: ../midori/midori-websettings.c:344 +#: ../midori/midori-websettings.c:348 msgid "The last saved window height" msgstr "最後に保存されたウィンドウの高さにします" -#: ../midori/midori-websettings.c:369 +#: ../midori/midori-websettings.c:373 msgid "Last panel position" msgstr "最後のパネルの位置" -#: ../midori/midori-websettings.c:370 +#: ../midori/midori-websettings.c:374 msgid "The last saved panel position" msgstr "最後に保存されたパネルの位置にします" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:379 +#: ../midori/midori-websettings.c:383 msgid "Last panel page" msgstr "最後のパネルページ" -#: ../midori/midori-websettings.c:380 +#: ../midori/midori-websettings.c:384 msgid "The last saved panel page" msgstr "最後に保存されたパネルのページです" -#: ../midori/midori-websettings.c:388 +#: ../midori/midori-websettings.c:392 msgid "Last Web search" msgstr "最後のウェブ検索" -#: ../midori/midori-websettings.c:389 +#: ../midori/midori-websettings.c:393 msgid "The last saved Web search" msgstr "最後に保存されたウェブ検索です" -#: ../midori/midori-websettings.c:398 +#: ../midori/midori-websettings.c:402 msgid "Show Menubar" msgstr "メニューバーを表示する" -#: ../midori/midori-websettings.c:399 +#: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" msgstr "メニューバーを表示します" -#: ../midori/midori-websettings.c:407 +#: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" msgstr "ナビゲーションバーを表示する" -#: ../midori/midori-websettings.c:408 +#: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" msgstr "ナビゲーションバーを表示します" -#: ../midori/midori-websettings.c:416 +#: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" msgstr "ブックマークバーを表示する" -#: ../midori/midori-websettings.c:417 +#: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" msgstr "ブックマークバーを表示します" -#: ../midori/midori-websettings.c:425 +#: ../midori/midori-websettings.c:429 msgid "Show Panel" msgstr "パネルを表示する" -#: ../midori/midori-websettings.c:426 +#: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" msgstr "パネルを表示します" -#: ../midori/midori-websettings.c:441 +#: ../midori/midori-websettings.c:445 msgid "Show Transferbar" msgstr "転送バーを表示する" -#: ../midori/midori-websettings.c:442 +#: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" msgstr "転送バーを表示します" -#: ../midori/midori-websettings.c:450 +#: ../midori/midori-websettings.c:454 msgid "Show Statusbar" msgstr "ステータスバーを表示する" -#: ../midori/midori-websettings.c:451 +#: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" msgstr "ステータスバーを表示します" -#: ../midori/midori-websettings.c:460 +#: ../midori/midori-websettings.c:464 msgid "Toolbar Style" msgstr "ツールバー方式" -#: ../midori/midori-websettings.c:461 +#: ../midori/midori-websettings.c:465 msgid "The style of the toolbar" msgstr "ツールバーの表示方式を指定します" -#: ../midori/midori-websettings.c:477 +#: ../midori/midori-websettings.c:481 msgid "Show progress in location entry" msgstr "ロケーションエントリに進捗を表示する" -#: ../midori/midori-websettings.c:478 +#: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" msgstr "ロケーションエントリ内に読み込みの進捗状況を表示します" -#: ../midori/midori-websettings.c:486 +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "場所の補完に検索エンジンを使用する" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "場所の補完候補内から検索エンジンを使用できるようにします" + +#: ../midori/midori-websettings.c:506 msgid "Toolbar Items" msgstr "ツールバーアイテム" -#: ../midori/midori-websettings.c:487 +#: ../midori/midori-websettings.c:507 msgid "The items to show on the toolbar" msgstr "ツールバーに表示するアイテムを指定します" -#: ../midori/midori-websettings.c:495 +#: ../midori/midori-websettings.c:515 msgid "Compact Sidepanel" msgstr "サイドパネルをコンパクトにする" -#: ../midori/midori-websettings.c:496 +#: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" msgstr "サイドパネルの表示をコンパクトにします" -#: ../midori/midori-websettings.c:521 +#: ../midori/midori-websettings.c:541 msgid "Load on Startup" msgstr "起動時に読み込む" -#: ../midori/midori-websettings.c:522 +#: ../midori/midori-websettings.c:542 msgid "What to load on startup" msgstr "起動時に読み込むページを指定します" -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-websettings.c:552 msgid "The homepage" msgstr "ホームページを指定します" -#: ../midori/midori-websettings.c:547 +#: ../midori/midori-websettings.c:567 msgid "Show crash dialog" msgstr "クラッシュダイアログを表示する" -#: ../midori/midori-websettings.c:548 +#: ../midori/midori-websettings.c:568 msgid "Show a dialog after Midori crashed" msgstr "Midori がクラッシュした後の起動時にダイアログを表示します" -#: ../midori/midori-websettings.c:556 +#: ../midori/midori-websettings.c:576 msgid "Download Folder" msgstr "ダウンロードフォルダ" -#: ../midori/midori-websettings.c:557 +#: ../midori/midori-websettings.c:577 msgid "The folder downloaded files are saved to" msgstr "ダウンロードファイルの保存先を指定します" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:596 +msgid "Notify when a transfer has been completed" +msgstr "転送が完了したら通知する" + +#: ../midori/midori-websettings.c:597 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "転送が完了したら通知します" + +#: ../midori/midori-websettings.c:609 msgid "Download Manager" msgstr "ダウンロードマネージャ" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:610 msgid "An external download manager" msgstr "外部ダウンロードマネージャを指定します" -#: ../midori/midori-websettings.c:578 +#: ../midori/midori-websettings.c:618 msgid "Text Editor" msgstr "テキストエディタ" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:619 msgid "An external text editor" msgstr "外部テキストエディタを指定します" -#: ../midori/midori-websettings.c:587 +#: ../midori/midori-websettings.c:634 +msgid "News Aggregator" +msgstr "フィードリーダ" + +#: ../midori/midori-websettings.c:635 +msgid "An external news aggregator" +msgstr "外部フィードリーダを指定します" + +#: ../midori/midori-websettings.c:643 msgid "Location entry Search" msgstr "ロケーションエントリの検索" -#: ../midori/midori-websettings.c:588 +#: ../midori/midori-websettings.c:644 msgid "The search to perform inside the location entry" msgstr "ロケーションエントリに入力された文字列の検索エンジンを指定します" -#: ../midori/midori-websettings.c:596 +#: ../midori/midori-websettings.c:652 msgid "Preferred Encoding" msgstr "文字のエンコーディング" -#: ../midori/midori-websettings.c:597 +#: ../midori/midori-websettings.c:653 msgid "The preferred character encoding" msgstr "文字のエンコーディングを指定します" -#: ../midori/midori-websettings.c:607 +#: ../midori/midori-websettings.c:663 msgid "Always Show Tabbar" msgstr "常にタブバーを表示する" -#: ../midori/midori-websettings.c:608 +#: ../midori/midori-websettings.c:664 msgid "Always show the tabbar" msgstr "常にタブバーを表示します" -#: ../midori/midori-websettings.c:616 +#: ../midori/midori-websettings.c:672 msgid "Close Buttons on Tabs" msgstr "タブに閉じるボタンを表示する" -#: ../midori/midori-websettings.c:617 +#: ../midori/midori-websettings.c:673 msgid "Whether tabs have close buttons" msgstr "タブに閉じるボタンを表示します" -#: ../midori/midori-websettings.c:625 +#: ../midori/midori-websettings.c:681 msgid "Open new pages in" msgstr "新しくページを開くとき" -#: ../midori/midori-websettings.c:626 +#: ../midori/midori-websettings.c:682 msgid "Where to open new pages" msgstr "新しいページをどこに開くか指定します" -#: ../midori/midori-websettings.c:635 +#: ../midori/midori-websettings.c:691 msgid "Open external pages in" msgstr "外部ページを開くとき" -#: ../midori/midori-websettings.c:636 +#: ../midori/midori-websettings.c:692 msgid "Where to open externally opened pages" msgstr "外部のページをどこに開くか指定します" -#: ../midori/midori-websettings.c:649 +#: ../midori/midori-websettings.c:705 msgid "Middle click opens Selection" msgstr "選択範囲を中央クリックで開く" -#: ../midori/midori-websettings.c:650 +#: ../midori/midori-websettings.c:706 msgid "Load an address from the selection via middle click" msgstr "選択したアドレスをマウスの中央クリックで読み込みます" -#: ../midori/midori-websettings.c:658 +#: ../midori/midori-websettings.c:714 msgid "Open tabs in the background" msgstr "タブをバックグラウンドで開く" -#: ../midori/midori-websettings.c:659 +#: ../midori/midori-websettings.c:715 msgid "Whether to open new tabs in the background" msgstr "新しいタブをバックグラウンドで開きます" -#: ../midori/midori-websettings.c:667 +#: ../midori/midori-websettings.c:723 msgid "Open Tabs next to Current" msgstr "現在のタブの隣に開く" -#: ../midori/midori-websettings.c:668 +#: ../midori/midori-websettings.c:724 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "新しいタブを現在のタブの隣に開くか、最後のタブの隣に開くかを指定します" -#: ../midori/midori-websettings.c:676 +#: ../midori/midori-websettings.c:732 msgid "Open popups in tabs" msgstr "ポップアップをタブに開く" -#: ../midori/midori-websettings.c:677 +#: ../midori/midori-websettings.c:733 msgid "Whether to open popup windows in tabs" msgstr "ポップアップウィンドウをタブに開きます" -#: ../midori/midori-websettings.c:693 +#: ../midori/midori-websettings.c:749 msgid "Zoom Text and Images" msgstr "文字や画像を拡大/縮小する" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:750 msgid "Whether to zoom text and images" msgstr "文字や画像の拡大/縮小を可能にします" -#: ../midori/midori-websettings.c:709 +#: ../midori/midori-websettings.c:765 msgid "Find inline while typing" msgstr "キー入力中に自動的に検索する" -#: ../midori/midori-websettings.c:710 +#: ../midori/midori-websettings.c:766 msgid "Whether to automatically find inline while typing" msgstr "インライン検索において、キー入力に従い自動的に検索します" -#: ../midori/midori-websettings.c:718 +#: ../midori/midori-websettings.c:774 msgid "Accept cookies" msgstr "Cookie の受け入れ" -#: ../midori/midori-websettings.c:719 +#: ../midori/midori-websettings.c:775 msgid "What type of cookies to accept" msgstr "Cookie を受け入れる方式を選択してください" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:784 msgid "Original cookies only" msgstr "オリジナルの Cookie のみ" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:785 msgid "Accept cookies from the original website only" msgstr "オリジナルのウェブサイトからの Cookie のみ受け入れる" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:793 msgid "Maximum cookie age" msgstr "Cookie の最大保存日数" -#: ../midori/midori-websettings.c:738 +#: ../midori/midori-websettings.c:794 msgid "The maximum number of days to save cookies for" msgstr "Cookie を保存する最大の日数です" -#: ../midori/midori-websettings.c:748 +#: ../midori/midori-websettings.c:804 msgid "Remember last visited pages" msgstr "最後に訪れたページを記憶する" -#: ../midori/midori-websettings.c:749 +#: ../midori/midori-websettings.c:805 msgid "Whether the last visited pages are saved" msgstr "最後に訪れたページを記憶します" -#: ../midori/midori-websettings.c:757 +#: ../midori/midori-websettings.c:813 msgid "Maximum history age" msgstr "履歴の最大保存日数" -#: ../midori/midori-websettings.c:758 +#: ../midori/midori-websettings.c:814 msgid "The maximum number of days to save the history for" msgstr "履歴を保存する最大の日数です" -#: ../midori/midori-websettings.c:766 +#: ../midori/midori-websettings.c:822 msgid "Remember last form inputs" msgstr "最後のフォーム入力を記憶する" -#: ../midori/midori-websettings.c:767 +#: ../midori/midori-websettings.c:823 msgid "Whether the last form inputs are saved" msgstr "最後にフォーム入力した内容を記憶します" -#: ../midori/midori-websettings.c:775 +#: ../midori/midori-websettings.c:831 msgid "Remember last downloaded files" msgstr "最後のダウンロードファイルを記憶する" -#: ../midori/midori-websettings.c:776 +#: ../midori/midori-websettings.c:832 msgid "Whether the last downloaded files are saved" msgstr "最後にダウンロードしたファイルを記憶します" -#: ../midori/midori-websettings.c:786 +#: ../midori/midori-websettings.c:842 msgid "Proxy Server" msgstr "プロキシサーバ" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:843 msgid "The proxy server used for HTTP connections" msgstr "HTTP 接続でプロキシサーバを使用する場合に設定します" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:858 msgid "Detect proxy server automatically" msgstr "プロキシサーバを自動検出する" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:859 msgid "Whether to detect the proxy server automatically from the environment" msgstr "プロキシサーバをシステム環境から自動的に検出します" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:819 +#: ../midori/midori-websettings.c:875 msgid "Identify as" -msgstr "User-Agent" +msgstr "識別名" -#: ../midori/midori-websettings.c:820 +#: ../midori/midori-websettings.c:876 msgid "What to identify as to web pages" -msgstr "ウェブページに報告する User-Agent 識別名を指定します" +msgstr "ウェブページに報告するユーザエージェントの識別名を指定します" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:892 msgid "Identification string" msgstr "識別文字列" -#: ../midori/midori-websettings.c:837 +#: ../midori/midori-websettings.c:893 msgid "The application identification string" -msgstr "User-Agent アプリケーション識別文字列です" +msgstr "アプリケーション識別文字列です" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:901 msgid "Cache size" msgstr "キャッシュサイズ" -#: ../midori/midori-websettings.c:846 +#: ../midori/midori-websettings.c:902 msgid "The allowed size of the cache" msgstr "キャッシュのサイズを指定します" #. i18n: The title of the 404 - Not found error page -#: ../midori/midori-view.c:661 +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 ../midori/midori-view.c:2475 #, c-format msgid "Not found - %s" msgstr "ページが見つかりません - %s" -#: ../midori/midori-view.c:998 +#: ../midori/midori-view.c:984 msgid "Open _Link" msgstr "リンクを開く(_L)" -#: ../midori/midori-view.c:1000 +#: ../midori/midori-view.c:986 msgid "Open Link in New _Tab" msgstr "リンクを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1017 +#: ../midori/midori-view.c:1003 msgid "Open Link in New _Window" msgstr "リンクを新しいウィンドウで開く(_W)" -#: ../midori/midori-view.c:1026 +#: ../midori/midori-view.c:1012 msgid "_Download Link destination" msgstr "リンク先をダウンロード(_D)" -#: ../midori/midori-view.c:1032 +#: ../midori/midori-view.c:1018 msgid "_Save Link destination" msgstr "リンク先を保存(_S)" -#: ../midori/midori-view.c:1041 +#: ../midori/midori-view.c:1027 msgid "Download with Download _Manager" msgstr "ダウンロードマネージャでダウンロード(_M)" -#: ../midori/midori-view.c:1073 -#, c-format -msgid "Search with %s" -msgstr "%s で検索" +#: ../midori/midori-view.c:1056 +msgid "Search _with" +msgstr "検索(_W)" -#: ../midori/midori-view.c:1099 +#: ../midori/midori-view.c:1084 msgid "_Search the Web" msgstr "ウェブで検索(_S)" -#: ../midori/midori-view.c:1109 +#: ../midori/midori-view.c:1094 msgid "Open Address in New _Tab" msgstr "アドレスを新しいタブで開く(_T)" -#: ../midori/midori-view.c:1257 +#: ../midori/midori-view.c:1242 msgid "Open or download file" msgstr "ファイルを開きますか、保存しますか?" -#: ../midori/midori-view.c:1274 +#: ../midori/midori-view.c:1259 #, c-format msgid "File Type: '%s'" msgstr "ファイルタイプ: '%s'" -#: ../midori/midori-view.c:1277 +#: ../midori/midori-view.c:1262 #, c-format msgid "File Type: %s ('%s')" msgstr "ファイルタイプ: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1281 +#: ../midori/midori-view.c:1266 #, c-format msgid "Open %s" msgstr "%s を開く" -#: ../midori/midori-view.c:1677 +#: ../midori/midori-view.c:1669 #, c-format msgid "Inspect page - %s" msgstr "ページの調査 - %s" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1814 #, c-format msgid "Document cannot be displayed" msgstr "ドキュメントを表示できません" -#: ../midori/midori-view.c:1838 +#: ../midori/midori-view.c:1830 #, c-format msgid "No documentation installed" msgstr "ドキュメントはインストールされていません" @@ -1339,275 +1352,277 @@ msgstr "起動" msgid "Use current page as homepage" msgstr "現在のページをホームページにします" -#: ../midori/midori-preferences.c:423 -#: ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "転送" #. Page "Appearance" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:475 msgid "Appearance" msgstr "外観" -#: ../midori/midori-preferences.c:462 +#: ../midori/midori-preferences.c:476 msgid "Font settings" msgstr "フォント設定" -#: ../midori/midori-preferences.c:464 +#: ../midori/midori-preferences.c:478 msgid "Default Font Family" msgstr "デフォルトフォントファミリ" -#: ../midori/midori-preferences.c:470 -msgid "The default font size used to display text" -msgstr "文字表示で使用されるデフォルトのフォントサイズを指定します" +#: ../midori/midori-preferences.c:482 +msgid "The default font family used to display text" +msgstr "文字表示で使用するデフォルトのフォントファミリを指定します" -#: ../midori/midori-preferences.c:473 +#: ../midori/midori-preferences.c:485 +msgid "The default font size used to display text" +msgstr "文字表示で使用するデフォルトのフォントサイズを指定します" + +#: ../midori/midori-preferences.c:488 +msgid "Fixed-width Font Family" +msgstr "等幅フォントファミリ" + +#: ../midori/midori-preferences.c:491 +msgid "The font family used to display fixed-width text" +msgstr "等幅文字表示で使用するフォントファミリを指定します" + +#: ../midori/midori-preferences.c:493 msgid "Minimum Font Size" msgstr "最小フォントサイズ" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:496 msgid "The minimum font size used to display text" -msgstr "文字表示で使用される最小のフォントサイズを指定します" +msgstr "文字表示で使用する最小のフォントサイズを指定します" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:503 msgid "Encoding" msgstr "エンコーディング" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:506 msgid "The character encoding to use by default" msgstr "デフォルトで使用する文字エンコーディングです" #. Page "Behavior" -#: ../midori/midori-preferences.c:493 +#: ../midori/midori-preferences.c:513 msgid "Behavior" msgstr "振る舞い" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:514 msgid "Features" msgstr "機能" -#: ../midori/midori-preferences.c:497 -#: ../extensions/statusbar-features.c:51 +#: ../midori/midori-preferences.c:517 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "画像を自動的に読み込む" -#: ../midori/midori-preferences.c:498 +#: ../midori/midori-preferences.c:518 msgid "Load and display images automatically" msgstr "画像を自動的に読み込んで表示します" -#: ../midori/midori-preferences.c:501 +#: ../midori/midori-preferences.c:521 msgid "Shrink images automatically" msgstr "画像を自動的に縮小する" -#: ../midori/midori-preferences.c:502 +#: ../midori/midori-preferences.c:522 msgid "Automatically shrink standalone images to fit" msgstr "画像を単独表示するときに自動的に縮小します" -#: ../midori/midori-preferences.c:505 +#: ../midori/midori-preferences.c:525 msgid "Print background images" msgstr "背景画像を印刷する" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:526 msgid "Whether background images should be printed" msgstr "印刷するときに背景画像も印刷します" -#: ../midori/midori-preferences.c:509 +#: ../midori/midori-preferences.c:529 msgid "Resizable text areas" msgstr "可変サイズのテキストエリアにする" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:530 msgid "Whether text areas are resizable" msgstr "テキストエリアのサイズ変更を可能にします" -#: ../midori/midori-preferences.c:513 -#: ../extensions/statusbar-features.c:58 +#: ../midori/midori-preferences.c:533 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "スクリプトを有効にする" -#: ../midori/midori-preferences.c:514 +#: ../midori/midori-preferences.c:534 msgid "Enable embedded scripting languages" msgstr "組み込みスクリプト言語を有効にします" -#: ../midori/midori-preferences.c:517 -#: ../extensions/statusbar-features.c:65 -msgid "Enable plugins" -msgstr "プラグインを有効にする" +#: ../midori/midori-preferences.c:537 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Netscape プラグインを有効にする" -#: ../midori/midori-preferences.c:518 -msgid "Enable embedded plugin objects" -msgstr "組み込みプラグインオブジェクトを有効にします" +#: ../midori/midori-preferences.c:538 +msgid "Enable embedded Netscape plugin objects" +msgstr "組み込み Netscape プラグインオブジェクトを有効にします" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:541 msgid "Enforce 96 dots per inch" msgstr "強制的に 96DPI にする" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:542 msgid "Enforce a video dot density of 96 DPI" msgstr "ドット密度を強制的に 96DPI にします" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:545 msgid "Enable developer tools" msgstr "開発ツールを有効にする" -#: ../midori/midori-preferences.c:526 +#: ../midori/midori-preferences.c:546 msgid "Enable special extensions for developers" msgstr "開発者用特殊エクステンションを有効にします" #. Page "Interface" -#: ../midori/midori-preferences.c:538 +#: ../midori/midori-preferences.c:554 msgid "Interface" msgstr "インターフェイス" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:555 msgid "Navigationbar" msgstr "ナビゲーションバー" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:566 msgid "Browsing" msgstr "ブラウジング" #. Page "Network" -#: ../midori/midori-preferences.c:578 -#: ../midori/midori-preferences.c:579 +#: ../midori/midori-preferences.c:596 ../midori/midori-preferences.c:597 msgid "Network" msgstr "ネットワーク" -#: ../midori/midori-preferences.c:606 +#: ../midori/midori-preferences.c:624 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:611 +#: ../midori/midori-preferences.c:629 msgid "Privacy" msgstr "プライバシー" -#: ../midori/midori-preferences.c:612 +#: ../midori/midori-preferences.c:630 msgid "Web Cookies" msgstr "ウェブ Cookie" -#: ../midori/midori-preferences.c:625 -#: ../midori/midori-preferences.c:635 +#: ../midori/midori-preferences.c:643 ../midori/midori-preferences.c:653 msgid "days" msgstr "日" -#: ../midori/midori-searchaction.c:456 -#: ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 msgid "Empty" msgstr "空です" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:904 msgid "Add search engine" msgstr "検索エンジンの追加" -#: ../midori/midori-searchaction.c:812 +#: ../midori/midori-searchaction.c:904 msgid "Edit search engine" msgstr "検索エンジンの編集" -#: ../midori/midori-searchaction.c:840 +#: ../midori/midori-searchaction.c:932 msgid "_Name:" msgstr "名前(_N):" -#: ../midori/midori-searchaction.c:884 +#: ../midori/midori-searchaction.c:976 msgid "_Icon:" msgstr "アイコン(_I):" -#: ../midori/midori-searchaction.c:898 +#: ../midori/midori-searchaction.c:990 msgid "_Token:" msgstr "トークン(_T):" -#: ../midori/midori-searchaction.c:1078 +#: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" msgstr "検索エンジンの管理" -#: ../midori/sokoke.c:110 -#: ../midori/sokoke.c:122 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "デフォルトで使う(_D)" + +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "外部プログラムを実行できませんでした。" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:439 +#: ../midori/sokoke.c:518 msgid "Warning: You are using a superuser account!" msgstr "警告: あなたはスーパーユーザアカウントを使用しています!" -#: ../midori/sokoke.c:770 +#: ../midori/sokoke.c:869 msgid "_Bookmark" msgstr "ブックマーク(_B)" -#: ../midori/sokoke.c:772 +#: ../midori/sokoke.c:871 msgid "_Add Bookmark" msgstr "ブックマークに追加(_A)" -#: ../midori/sokoke.c:773 +#: ../midori/sokoke.c:872 msgid "_Console" msgstr "コンソール(_C)" -#: ../midori/sokoke.c:774 +#: ../midori/sokoke.c:873 msgid "_Extensions" msgstr "エクステンション(_E)" -#: ../midori/sokoke.c:775 +#: ../midori/sokoke.c:874 msgid "_History" msgstr "履歴(_H)" -#: ../midori/sokoke.c:776 +#: ../midori/sokoke.c:875 msgid "_Homepage" msgstr "ホームページ(_H)" -#: ../midori/sokoke.c:777 +#: ../midori/sokoke.c:876 msgid "_Userscripts" msgstr "ユーザスクリプト(_U)" -#: ../midori/sokoke.c:778 +#: ../midori/sokoke.c:877 msgid "User_styles" msgstr "ユーザスタイル(_S)" -#: ../midori/sokoke.c:779 +#: ../midori/sokoke.c:878 msgid "New _Tab" msgstr "新しいタブ(_T)" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:879 msgid "_Transfers" msgstr "転送(_T)" -#: ../midori/sokoke.c:781 -msgid "P_lugins" -msgstr "プラグイン(_L)" +#: ../midori/sokoke.c:880 +msgid "Netscape p_lugins" +msgstr "Netscape プラグイン(_L)" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:881 msgid "_Closed Tabs and Windows" msgstr "閉じたタブとウィンドウ(_C)" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:882 msgid "New _Window" msgstr "新しいウィンドウ(_W)" -#: ../panels/midori-addons.c:95 -#: ../panels/midori-addons.c:141 +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 msgid "Userscripts" msgstr "ユーザスクリプト" -#: ../panels/midori-addons.c:96 -#: ../panels/midori-addons.c:143 +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 msgid "Userstyles" msgstr "ユーザスタイル" -#: ../panels/midori-addons.c:923 -#: ../panels/midori-extensions.c:144 +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 msgid "_Enable" msgstr "有効(_E)" -#: ../panels/midori-addons.c:924 -#: ../panels/midori-extensions.c:145 +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 msgid "Enable" msgstr "有効" -#: ../panels/midori-addons.c:933 -#: ../panels/midori-extensions.c:154 +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 msgid "_Disable" msgstr "無効(_D)" -#: ../panels/midori-addons.c:934 -#: ../panels/midori-extensions.c:155 +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 msgid "Disable" msgstr "無効" @@ -1615,15 +1630,15 @@ msgstr "無効" msgid "Bookmarks" msgstr "ブックマーク" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "選択したブックマークを編集します" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "選択したブックマークを削除します" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "セパレータ" @@ -1635,44 +1650,43 @@ msgstr "コンソール" msgid "Extensions" msgstr "エクステンション" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "すべての履歴アイテムを削除してよろしいですか?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" -msgstr "選択された履歴アイテムをブックマークに追加します" +msgstr "選択した履歴アイテムをブックマークに追加します" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" -msgstr "選択された履歴アイテムを削除します" +msgstr "選択した履歴アイテムを削除します" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "すべての履歴をクリアします" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "一週間前" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "%d 日前" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "今日" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "昨日" #: ../panels/midori-plugins.c:87 -#: ../extensions/statusbar-features.c:63 -msgid "Plugins" -msgstr "プラグイン" +msgid "Netscape plugins" +msgstr "Netscape プラグイン" #: ../panels/midori-transfers.c:256 #, c-format @@ -1713,38 +1727,36 @@ msgstr "ストックアイコン '%s' を読み込めませんでした" msgid "Animation frames are broken" msgstr "アニメーションフレームは壊れています" -#: ../katze/katze-utils.c:180 -#: ../katze/katze-utils.c:389 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 #, c-format msgid "Property '%s' is invalid for %s" msgstr "'%s' は %s のプロパティとして無効です" -#: ../katze/katze-utils.c:209 -#: ../katze/katze-utils.c:248 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 msgid "Choose file" msgstr "ファイルの選択" -#: ../katze/katze-utils.c:229 +#: ../katze/katze-utils.c:235 msgid "Choose folder" msgstr "フォルダの選択" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "タブの色分け" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "カラフルタブ" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "各タブにそれぞれを区別する色をつけます" -#: ../extensions/cookie-manager.c:185 +#: ../extensions/cookie-manager.c:201 msgid "At the end of the session" msgstr "セッションの終わりまで" -#: ../extensions/cookie-manager.c:188 +#: ../extensions/cookie-manager.c:204 #, c-format msgid "" "Host: %s\n" @@ -1762,80 +1774,162 @@ msgstr "" "有効期限: %s" # cookie: Secure flag is set. -#: ../extensions/cookie-manager.c:194 +#: ../extensions/cookie-manager.c:210 msgid "Yes" msgstr "あり" # cookie: Secure flag isn't set. -#: ../extensions/cookie-manager.c:194 +#: ../extensions/cookie-manager.c:210 msgid "No" msgstr "なし" -#: ../extensions/cookie-manager.c:475 +#: ../extensions/cookie-manager.c:491 msgid "Do you really want to delete all cookies?" msgstr "本当にすべての cookie を削除してよろしいですか?" # Dialog title -#: ../extensions/cookie-manager.c:477 +#: ../extensions/cookie-manager.c:493 msgid "Question" msgstr "確認" -#: ../extensions/cookie-manager.c:485 -msgid "Only the visible cookies are deleted which match the entered filter string." -msgstr "フィルタに入力された文字列にマッチした、表示されている cookie のみ削除されます。" +#: ../extensions/cookie-manager.c:502 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "" +"フィルタに入力された文字列にマッチした、表示されている cookie のみ削除されま" +"す。" # Column name of cookie browser -#: ../extensions/cookie-manager.c:663 +#: ../extensions/cookie-manager.c:680 msgid "Name" msgstr "名前" -#: ../extensions/cookie-manager.c:723 +#: ../extensions/cookie-manager.c:740 msgid "_Expand All" msgstr "すべて展開する(_E)" -#: ../extensions/cookie-manager.c:731 +#: ../extensions/cookie-manager.c:748 msgid "_Collapse All" msgstr "すべて折り畳む(_C)" -#: ../extensions/cookie-manager.c:800 -msgid "Delete All" -msgstr "すべて削除" - -#: ../extensions/cookie-manager.c:802 -msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." -msgstr "表示されているすべての cookie を削除します。フィルタが設定されていれば、フィルタにマッチした cookie のみ削除されます。" +#: ../extensions/cookie-manager.c:821 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"表示されているすべての cookie を削除します。フィルタが設定されていれば、フィ" +"ルタにマッチした cookie のみ削除されます。" # tooltip -#: ../extensions/cookie-manager.c:817 +#: ../extensions/cookie-manager.c:836 msgid "Expand All" msgstr "すべて展開します" # tooltip -#: ../extensions/cookie-manager.c:824 +#: ../extensions/cookie-manager.c:843 msgid "Collapse All" msgstr "すべて折り畳みます" -#: ../extensions/cookie-manager.c:855 +#: ../extensions/cookie-manager.c:874 msgid "Filter:" msgstr "フィルタ:" -#: ../extensions/cookie-manager.c:860 -msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" -msgstr "フィルタに入力された文字列と、名前またはドメインフィールドがマッチした cookie のみ表示します。" +#: ../extensions/cookie-manager.c:879 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"フィルタに入力された文字列と、名前またはドメインフィールドがマッチした " +"cookie のみ表示します。" -#: ../extensions/cookie-manager.c:895 -#: ../extensions/cookie-manager.c:942 +#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 msgid "Cookie Manager" msgstr "Cookie マネージャ" -#: ../extensions/cookie-manager.c:926 +#: ../extensions/cookie-manager.c:946 msgid "_Cookie Manager" msgstr "Cookie マネージャ(_C)" -#: ../extensions/cookie-manager.c:943 +#: ../extensions/cookie-manager.c:963 msgid "List, view and delete cookies" msgstr "Cookie の一覧や内容の表示および削除を行います" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom entry elements in XML data." +msgstr "XML データ内に要求された Atom エントリ要素が見つかりませんでした。" + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom feed elements in XML data." +msgstr "XML データ内に要求された Atom フィード要素が見つかりませんでした。" + +#: ../extensions/feed-panel/feed-panel.c:614 +msgid "Feeds" +msgstr "フィード" + +#: ../extensions/feed-panel/feed-panel.c:667 +msgid "Add new feed" +msgstr "新しいフィードの追加" + +#: ../extensions/feed-panel/feed-panel.c:674 +msgid "Delete feed" +msgstr "フィードの削除" + +#: ../extensions/feed-panel/feed-panel.c:757 +msgid "_Feeds" +msgstr "フィード(_F)" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "フィード XML データ内にルート要素が見つかりませんでした。" + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "サポートされていないフィード形式です。" + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "XML フィードの解析に失敗しました: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find channel element in RSS XML data." +msgstr "RSS XML データ内にチャンネル要素が見つかりませんでした。" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "サポートされていない RSS バージョンが見つかりました。" + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS item elements in XML data." +msgstr "XML データ内に要求された RSS アイテム要素が見つかりませんでした。" + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS channel elements in XML data." +msgstr "XML データ内に要求された RSS チャンネル要素が見つかりませんでした。" + +#: ../extensions/feed-panel/main.c:148 +msgid "Error" +msgstr "エラー" + +#: ../extensions/feed-panel/main.c:178 +#, c-format +msgid "Error loading feed %s" +msgstr "フィード %s の読み込みでエラーです" + +#: ../extensions/feed-panel/main.c:310 +msgid "New feed" +msgstr "新しいフィード" + +#: ../extensions/feed-panel/main.c:459 +msgid "Feed Panel" +msgstr "フィードパネル" + +#: ../extensions/feed-panel/main.c:460 +msgid "Read Atom/ RSS feeds" +msgstr "Atom/RSS フィードを購読します" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "マウスジェスチャ" @@ -1845,8 +1939,7 @@ msgid "Control Midori by moving the mouse" msgstr "マウスの操作で Midori を制御します" #. i18n: A panel showing a user specified web page -#: ../extensions/page-holder.c:129 -#: ../extensions/page-holder.c:177 +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 msgid "Pageholder" msgstr "ページホルダ" @@ -1854,14 +1947,14 @@ msgstr "ページホルダ" msgid "_Pageholder" msgstr "ページホルダ(_P)" -#: ../extensions/statusbar-features.c:49 -msgid "Images" -msgstr "画像" +#~ msgid "P_lugins" +#~ msgstr "プラグイン(_L)" -#: ../extensions/statusbar-features.c:56 -msgid "Scripts" -msgstr "スクリプト" +#~ msgid "Plugins" +#~ msgstr "プラグイン" -#~ msgid "Source" -#~ msgstr "ソース" +#~ msgid "Images" +#~ msgstr "画像" +#~ msgid "Scripts" +#~ msgstr "スクリプト" From 0191fdaf8b8bc6bbef6456b5d9f4c9b7a1fd23e9 Mon Sep 17 00:00:00 2001 From: Robert Hartl Date: Mon, 27 Apr 2009 21:21:37 +0200 Subject: [PATCH 1068/2970] Add Slovak translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/sk.po | 1871 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1873 insertions(+), 1 deletion(-) create mode 100644 po/sk.po diff --git a/AUTHORS b/AUTHORS index daa0e4fe..84025854 100644 --- a/AUTHORS +++ b/AUTHORS @@ -51,6 +51,7 @@ Translations: pt_PT: Sérgio Marques ru: Troitskiy Nikita ru: Anton Shestakov + sk: Robert Hartl sv: Mikael Magnusson tr: Mirat Can Bayrak uk: Dmitry Nikitin diff --git a/po/LINGUAS b/po/LINGUAS index acd91948..3b10523b 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ru sv tr uk zh_CN zh_TW +da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ru sk sv tr uk zh_CN zh_TW diff --git a/po/sk.po b/po/sk.po new file mode 100644 index 00000000..3d69a6bc --- /dev/null +++ b/po/sk.po @@ -0,0 +1,1871 @@ +# Slovak translations for midori package. +# Copyright (C) 2008 THE Midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Robert Hartl 2009 +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-27 19:01+0100\n" +"Last-Translator: Robert Hartl \n" +"Language-Team: slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "" + +#: ../data/midori.desktop.in.h:2 +#: ../midori/main.c:1288 +#: ../midori/main.c:1388 +#: ../midori/main.c:1396 +#: ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Webový prehliadač" + +#: ../midori/main.c:94 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:149 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "" + +#: ../midori/main.c:156 +#: ../midori/main.c:228 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "" + +#: ../midori/main.c:332 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "" + +#: ../midori/main.c:364 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "" + +#: ../midori/main.c:442 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "" + +#: ../midori/main.c:465 +#: ../midori/main.c:499 +#: ../midori/main.c:515 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:694 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "" + +#: ../midori/main.c:722 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:751 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:770 +#: ../midori/main.c:798 +#: ../midori/main.c:827 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:850 +#: ../midori/main.c:873 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:946 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "" + +#: ../midori/main.c:1073 +msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." +msgstr "" + +#: ../midori/main.c:1088 +msgid "Modify _preferences" +msgstr "Zmeniť _nastavenia" + +#: ../midori/main.c:1092 +msgid "Reset the last _session" +msgstr "" + +#: ../midori/main.c:1097 +msgid "Disable all _extensions" +msgstr "Zakázať všetky _rozšírenia" + +#: ../midori/main.c:1288 +msgid "No filename specified" +msgstr "" + +#: ../midori/main.c:1311 +msgid "An unknown error occured." +msgstr "" + +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "ADRESA" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Použiť PRIEČINOK ako konfiguračný priečinok" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "PRIEČINOK" + +#: ../midori/main.c:1340 +msgid "Run the specified filename as javascript" +msgstr "" + +#: ../midori/main.c:1342 +msgid "Display program version" +msgstr "Zobraziť verziu programu" + +#: ../midori/main.c:1344 +msgid "Addresses" +msgstr "Adresy" + +#: ../midori/main.c:1385 +msgid "[Addresses]" +msgstr "[Adresy]" + +#: ../midori/main.c:1408 +msgid "Please report comments, suggestions and bugs to:" +msgstr "" + +#: ../midori/main.c:1410 +msgid "Check for new versions at:" +msgstr "" + +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "" + +#: ../midori/main.c:1489 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "" + +#: ../midori/main.c:1539 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:1551 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Záložky nie je možné načítať: %s\n" + +#: ../midori/main.c:1566 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sedenie nie je možné načítať: %s\n" + +#: ../midori/main.c:1579 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1592 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Históriu nie je možné načítať: %s\n" + +#: ../midori/main.c:1604 +msgid "The following errors occured:" +msgstr "" + +#: ../midori/main.c:1620 +msgid "_Ignore" +msgstr "_Ignorovať" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Súbor sa nenašiel." + +#: ../midori/midori-array.c:203 +#: ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "" + +#: ../midori/midori-array.c:338 +#: ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Zapisovanie zlyhalo." + +#: ../midori/midori-browser.c:280 +#: ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 +msgid "Reload the current page" +msgstr "Obnoviť aktuálnu stránku" + +#: ../midori/midori-browser.c:291 +#: ../midori/midori-browser.c:3371 +msgid "Stop loading the current page" +msgstr "Zastaviť načítanie aktuálnej stránky" + +#: ../midori/midori-browser.c:353 +#, c-format +msgid "%d%% loaded" +msgstr "" + +#: ../midori/midori-browser.c:378 +#, c-format +msgid "Unexpected action '%s'." +msgstr "" + +#: ../midori/midori-browser.c:541 +msgid "New folder" +msgstr "Nový priečinok" + +#: ../midori/midori-browser.c:541 +msgid "Edit folder" +msgstr "Upraviť priečinok" + +#: ../midori/midori-browser.c:543 +msgid "New bookmark" +msgstr "Nová záložka" + +#: ../midori/midori-browser.c:543 +msgid "Edit bookmark" +msgstr "Upraviť záložku" + +#: ../midori/midori-browser.c:573 +msgid "_Title:" +msgstr "_Názov:" + +#: ../midori/midori-browser.c:586 +#: ../midori/midori-searchaction.c:948 +msgid "_Description:" +msgstr "_Poznámka:" + +#: ../midori/midori-browser.c:605 +#: ../midori/midori-searchaction.c:962 +msgid "_Address:" +msgstr "_Adresa:" + +#: ../midori/midori-browser.c:624 +msgid "_Folder:" +msgstr "_Priečinok:" + +#: ../midori/midori-browser.c:629 +#: ../midori/midori-browser.c:670 +msgid "Toplevel folder" +msgstr "Priečinok najvyššej úrovne" + +#: ../midori/midori-browser.c:746 +msgid "Save file as" +msgstr "Uložiť súbor ako" + +#: ../midori/midori-browser.c:1523 +msgid "Open file" +msgstr "Otvoriť súbor" + +#: ../midori/midori-browser.c:2803 +#: ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 +msgid "Open all in _Tabs" +msgstr "" + +#: ../midori/midori-browser.c:2810 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 +msgid "Open in New _Tab" +msgstr "Otvoriť na novej _karte" + +#: ../midori/midori-browser.c:2813 +#: ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 +msgid "Open in New _Window" +msgstr "Otvoriť v novom _okne" + +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Odstrániť súkromné údaje" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Odstrániť súkromné údaje" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Odstrániť nasledujúce údaje:" + +#: ../midori/midori-browser.c:2998 +#: ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "História" + +#: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "Cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "'Flash' Cookies" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Ikony webových stránok" + +#: ../midori/midori-browser.c:3093 +msgid "A lightweight web browser." +msgstr "" + +#: ../midori/midori-browser.c:3101 +msgid "translator-credits" +msgstr "Robert Hartl 2009" + +#: ../midori/midori-browser.c:3302 +msgid "_File" +msgstr "_Súbor" + +#: ../midori/midori-browser.c:3305 +msgid "Open a new window" +msgstr "Otvoriť nové okno" + +#: ../midori/midori-browser.c:3308 +msgid "Open a new tab" +msgstr "Otvoriť novú kartu" + +#: ../midori/midori-browser.c:3311 +msgid "Open a file" +msgstr "Otvoriť súbor" + +#: ../midori/midori-browser.c:3314 +msgid "Save to a file" +msgstr "" + +#: ../midori/midori-browser.c:3316 +msgid "_Close Tab" +msgstr "_Zatvoriť kartu" + +#: ../midori/midori-browser.c:3317 +msgid "Close the current tab" +msgstr "" + +#: ../midori/midori-browser.c:3319 +msgid "C_lose Window" +msgstr "Zatvoriť okno" + +#: ../midori/midori-browser.c:3320 +msgid "Close this window" +msgstr "" + +#: ../midori/midori-browser.c:3323 +msgid "Print the current page" +msgstr "" + +#: ../midori/midori-browser.c:3326 +msgid "Quit the application" +msgstr "" + +#: ../midori/midori-browser.c:3328 +msgid "_Edit" +msgstr "_Upraviť" + +#: ../midori/midori-browser.c:3331 +msgid "Cut the selected text" +msgstr "" + +#: ../midori/midori-browser.c:3334 +#: ../midori/midori-browser.c:3337 +msgid "Copy the selected text" +msgstr "" + +#: ../midori/midori-browser.c:3340 +msgid "Paste text from the clipboard" +msgstr "" + +#: ../midori/midori-browser.c:3343 +msgid "Delete the selected text" +msgstr "Odstrániť označený text" + +#: ../midori/midori-browser.c:3346 +msgid "Select all text" +msgstr "Vybrať všetok text" + +#: ../midori/midori-browser.c:3349 +msgid "Find a word or phrase in the page" +msgstr "" + +#: ../midori/midori-browser.c:3351 +msgid "Find _Next" +msgstr "Hľadať _ďalšie" + +#: ../midori/midori-browser.c:3352 +msgid "Find the next occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3354 +msgid "Find _Previous" +msgstr "" + +#: ../midori/midori-browser.c:3355 +msgid "Find the previous occurrence of a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3358 +msgid "_Quick Find" +msgstr "_Rýchle hľadanie" + +#: ../midori/midori-browser.c:3359 +msgid "Quickly jump to a word or phrase" +msgstr "" + +#: ../midori/midori-browser.c:3362 +msgid "Configure the application preferences" +msgstr "" + +#: ../midori/midori-browser.c:3364 +msgid "_View" +msgstr "_Zobraziť" + +#: ../midori/midori-browser.c:3365 +msgid "_Toolbars" +msgstr "_Panely s nástrojmi" + +#: ../midori/midori-browser.c:3377 +msgid "Increase the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3380 +msgid "Decrease the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3383 +msgid "Reset the zoom level" +msgstr "" + +#: ../midori/midori-browser.c:3384 +msgid "_Encoding" +msgstr "_Kódovanie" + +#: ../midori/midori-browser.c:3386 +msgid "_Automatic" +msgstr "_Automatické" + +#: ../midori/midori-browser.c:3389 +#: ../midori/midori-websettings.c:200 +msgid "Chinese (BIG5)" +msgstr "Čínske (BIG5)" + +#: ../midori/midori-browser.c:3392 +#: ../midori/midori-websettings.c:201 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonské (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3395 +#: ../midori/midori-websettings.c:202 +msgid "Russian (KOI8-R)" +msgstr "Ruské (KOI8-R)" + +#: ../midori/midori-browser.c:3398 +#: ../midori/midori-websettings.c:203 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3401 +#: ../midori/midori-websettings.c:204 +msgid "Western (ISO-8859-1)" +msgstr "Západné (ISO-8859-1)" + +#: ../midori/midori-browser.c:3404 +#: ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 +msgid "Custom..." +msgstr "Vlastné..." + +#: ../midori/midori-browser.c:3407 +#: ../midori/midori-view.c:1138 +msgid "View _Source" +msgstr "Zobraziť _zdrojový kód" + +#: ../midori/midori-browser.c:3408 +msgid "View the source code of the page" +msgstr "" + +#: ../midori/midori-browser.c:3410 +msgid "View Selection Source" +msgstr "" + +#: ../midori/midori-browser.c:3411 +msgid "View the source code of the selection" +msgstr "" + +#: ../midori/midori-browser.c:3415 +msgid "Toggle fullscreen view" +msgstr "" + +#: ../midori/midori-browser.c:3417 +msgid "_Go" +msgstr "_Ísť" + +#: ../midori/midori-browser.c:3420 +msgid "Go back to the previous page" +msgstr "Späť na predchádzajúcu stránku" + +#: ../midori/midori-browser.c:3423 +msgid "Go forward to the next page" +msgstr "Dopredu na nasledujúcu stránku" + +#: ../midori/midori-browser.c:3426 +msgid "Go to your homepage" +msgstr "Ísť na domovskú stránku" + +#: ../midori/midori-browser.c:3428 +msgid "Empty Trash" +msgstr "Vysypať kôš" + +#: ../midori/midori-browser.c:3429 +msgid "Delete the contents of the trash" +msgstr "" + +#: ../midori/midori-browser.c:3431 +#: ../midori/midori-view.c:1110 +msgid "Undo Close Tab" +msgstr "" + +#: ../midori/midori-browser.c:3432 +msgid "Open the last closed tab" +msgstr "Otvoriť naposledy zatvorenú kartu" + +#: ../midori/midori-browser.c:3436 +#: ../panels/midori-bookmarks.c:232 +msgid "Add a new bookmark" +msgstr "Pridať novú záložku" + +#: ../midori/midori-browser.c:3438 +#: ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Pridať nový priečinok" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "" + +#: ../midori/midori-browser.c:3440 +msgid "_Tools" +msgstr "_Nástroje" + +#: ../midori/midori-browser.c:3442 +#: ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "_Správca vyhľadávacích modulov" + +#: ../midori/midori-browser.c:3443 +msgid "Add, edit and remove search engines..." +msgstr "" + +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Odstrániť súkromné údaje" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "" + +#: ../midori/midori-browser.c:3451 +msgid "_Previous Tab" +msgstr "_Predchádzajúca karta" + +#: ../midori/midori-browser.c:3452 +msgid "Switch to the previous tab" +msgstr "" + +#: ../midori/midori-browser.c:3454 +msgid "_Next Tab" +msgstr "_Ďalšia karta" + +#: ../midori/midori-browser.c:3455 +msgid "Switch to the next tab" +msgstr "" + +#: ../midori/midori-browser.c:3457 +msgid "_Help" +msgstr "_Pomocník" + +#: ../midori/midori-browser.c:3459 +msgid "_Contents" +msgstr "_Obsah pomocníka" + +#: ../midori/midori-browser.c:3460 +msgid "Show the documentation" +msgstr "Zobraziť dokumentáciu" + +#: ../midori/midori-browser.c:3462 +msgid "_Frequent Questions" +msgstr "_Časté otázky" + +#: ../midori/midori-browser.c:3463 +msgid "Show the Frequently Asked Questions" +msgstr "Zobraziť Často kladené otázky" + +#: ../midori/midori-browser.c:3465 +msgid "_Report a Bug" +msgstr "_Ohlásiť chybu" + +#: ../midori/midori-browser.c:3466 +msgid "Open Midori's bug tracker" +msgstr "" + +#: ../midori/midori-browser.c:3469 +msgid "Show information about the program" +msgstr "" + +#: ../midori/midori-browser.c:3476 +msgid "P_rivate Browsing" +msgstr "_Súkromné prehliadanie" + +#: ../midori/midori-browser.c:3477 +msgid "Don't save any private data while browsing" +msgstr "" + +#: ../midori/midori-browser.c:3482 +msgid "_Menubar" +msgstr "_Ponukový panel" + +#: ../midori/midori-browser.c:3483 +msgid "Show menubar" +msgstr "Zobraziť ponukový panel" + +#: ../midori/midori-browser.c:3486 +msgid "_Navigationbar" +msgstr "_Navigačný panel" + +#: ../midori/midori-browser.c:3487 +msgid "Show navigationbar" +msgstr "Zobraziť navigačný panel" + +#: ../midori/midori-browser.c:3490 +msgid "Side_panel" +msgstr "_Bočný panel" + +#: ../midori/midori-browser.c:3491 +msgid "Show sidepanel" +msgstr "Zobraziť bočný panel" + +#: ../midori/midori-browser.c:3494 +msgid "_Bookmarkbar" +msgstr "Panel _záložiek" + +#: ../midori/midori-browser.c:3495 +msgid "Show bookmarkbar" +msgstr "Zobraziť panel záložiek" + +#: ../midori/midori-browser.c:3498 +msgid "_Transferbar" +msgstr "" + +#: ../midori/midori-browser.c:3499 +msgid "Show transferbar" +msgstr "" + +#: ../midori/midori-browser.c:3502 +msgid "_Statusbar" +msgstr "_Stavový riadok" + +#: ../midori/midori-browser.c:3503 +msgid "Show statusbar" +msgstr "Zobraziť stavový riadok" + +#: ../midori/midori-browser.c:3937 +msgid "_Separator" +msgstr "_Oddeľovač" + +#: ../midori/midori-browser.c:3944 +msgid "_Location..." +msgstr "_Umiestnenie..." + +#: ../midori/midori-browser.c:3946 +msgid "Open a particular location" +msgstr "" + +#: ../midori/midori-browser.c:3970 +msgid "_Web Search..." +msgstr "" + +#: ../midori/midori-browser.c:3972 +msgid "Run a web search" +msgstr "" + +#: ../midori/midori-browser.c:3993 +msgid "Reopen a previously closed tab or window" +msgstr "" + +#: ../midori/midori-browser.c:4006 +msgid "_Recently visited pages" +msgstr "_Nedávno navštívené stránky" + +#: ../midori/midori-browser.c:4008 +msgid "Reopen pages that you visited earlier" +msgstr "" + +#: ../midori/midori-browser.c:4021 +#: ../midori/sokoke.c:781 +msgid "_Bookmarks" +msgstr "_Záložky" + +#: ../midori/midori-browser.c:4023 +msgid "Show the saved bookmarks" +msgstr "" + +#: ../midori/midori-browser.c:4036 +msgid "_Window" +msgstr "_Okno" + +#: ../midori/midori-browser.c:4038 +msgid "Show a list of all open tabs" +msgstr "Zobraziť zoznam všetkých otvorených kariet" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4205 +msgid "_Inline Find:" +msgstr "" + +#: ../midori/midori-browser.c:4230 +msgid "Previous" +msgstr "Predchádzajúce" + +#: ../midori/midori-browser.c:4235 +msgid "Next" +msgstr "Ďalšie" + +#: ../midori/midori-browser.c:4240 +msgid "Match Case" +msgstr "Rozlišovať veľkosť písma" + +#: ../midori/midori-browser.c:4248 +msgid "Highlight Matches" +msgstr "Zvýrazniť" + +#: ../midori/midori-browser.c:4258 +msgid "Close Findbar" +msgstr "" + +#: ../midori/midori-browser.c:4598 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "" + +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "" + +#: ../midori/midori-panel.c:321 +#: ../midori/midori-websettings.c:531 +msgid "Align sidepanel on the right" +msgstr "" + +#: ../midori/midori-panel.c:323 +#: ../midori/midori-websettings.c:532 +msgid "Whether to align the sidepanel on the right" +msgstr "" + +#: ../midori/midori-panel.c:333 +#: ../midori/midori-panel.c:334 +msgid "Close panel" +msgstr "Zatvoriť panel" + +#: ../midori/midori-websettings.c:183 +#: ../midori/midori-view.c:1949 +msgid "Blank page" +msgstr "Prázdnu stránku" + +#: ../midori/midori-websettings.c:184 +#: ../midori/midori-websettings.c:551 +msgid "Homepage" +msgstr "Domovskú stránku" + +#: ../midori/midori-websettings.c:185 +msgid "Last open pages" +msgstr "Naposledy otvorené stránky" + +#: ../midori/midori-websettings.c:220 +msgid "New tab" +msgstr "na novú kartu" + +#: ../midori/midori-websettings.c:221 +msgid "New window" +msgstr "v novom okne" + +#: ../midori/midori-websettings.c:222 +msgid "Current tab" +msgstr "na otvorenej karte" + +#: ../midori/midori-websettings.c:237 +msgid "Default" +msgstr "Predvolený" + +#: ../midori/midori-websettings.c:238 +msgid "Icons" +msgstr "Ikony" + +#: ../midori/midori-websettings.c:239 +msgid "Text" +msgstr "Text" + +#: ../midori/midori-websettings.c:240 +msgid "Both" +msgstr "Oboje" + +#: ../midori/midori-websettings.c:241 +msgid "Both horizontal" +msgstr "Oboje vodorovne" + +#: ../midori/midori-websettings.c:256 +msgid "All cookies" +msgstr "Všetky cookies" + +#: ../midori/midori-websettings.c:257 +msgid "Session cookies" +msgstr "" + +#: ../midori/midori-websettings.c:258 +#: ../panels/midori-addons.c:94 +msgid "None" +msgstr "Žiadne" + +#: ../midori/midori-websettings.c:274 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:275 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:276 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:329 +msgid "Remember last window size" +msgstr "Zapamätať si poslednú veľkosť okna" + +#: ../midori/midori-websettings.c:330 +msgid "Whether to save the last window size" +msgstr "" + +#: ../midori/midori-websettings.c:338 +msgid "Last window width" +msgstr "" + +#: ../midori/midori-websettings.c:339 +msgid "The last saved window width" +msgstr "" + +#: ../midori/midori-websettings.c:347 +msgid "Last window height" +msgstr "" + +#: ../midori/midori-websettings.c:348 +msgid "The last saved window height" +msgstr "" + +#: ../midori/midori-websettings.c:373 +msgid "Last panel position" +msgstr "" + +#: ../midori/midori-websettings.c:374 +msgid "The last saved panel position" +msgstr "" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:383 +msgid "Last panel page" +msgstr "" + +#: ../midori/midori-websettings.c:384 +msgid "The last saved panel page" +msgstr "" + +#: ../midori/midori-websettings.c:392 +msgid "Last Web search" +msgstr "" + +#: ../midori/midori-websettings.c:393 +msgid "The last saved Web search" +msgstr "" + +#: ../midori/midori-websettings.c:402 +msgid "Show Menubar" +msgstr "" + +#: ../midori/midori-websettings.c:403 +msgid "Whether to show the menubar" +msgstr "" + +#: ../midori/midori-websettings.c:411 +msgid "Show Navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:412 +msgid "Whether to show the navigationbar" +msgstr "" + +#: ../midori/midori-websettings.c:420 +msgid "Show Bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:421 +msgid "Whether to show the bookmarkbar" +msgstr "" + +#: ../midori/midori-websettings.c:429 +msgid "Show Panel" +msgstr "Zobraziť panel" + +#: ../midori/midori-websettings.c:430 +msgid "Whether to show the panel" +msgstr "" + +#: ../midori/midori-websettings.c:445 +msgid "Show Transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show the transferbar" +msgstr "" + +#: ../midori/midori-websettings.c:454 +msgid "Show Statusbar" +msgstr "Zobraziť stavový riadok" + +#: ../midori/midori-websettings.c:455 +msgid "Whether to show the statusbar" +msgstr "" + +#: ../midori/midori-websettings.c:464 +msgid "Toolbar Style" +msgstr "Štýl panelu s nástrojmi" + +#: ../midori/midori-websettings.c:465 +msgid "The style of the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:481 +msgid "Show progress in location entry" +msgstr "" + +#: ../midori/midori-websettings.c:482 +msgid "Whether to show loading progress in the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "" + +#: ../midori/midori-websettings.c:506 +msgid "Toolbar Items" +msgstr "" + +#: ../midori/midori-websettings.c:507 +msgid "The items to show on the toolbar" +msgstr "" + +#: ../midori/midori-websettings.c:515 +msgid "Compact Sidepanel" +msgstr "" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to make the sidepanel compact" +msgstr "" + +#: ../midori/midori-websettings.c:541 +msgid "Load on Startup" +msgstr "Načítať pri spustení" + +#: ../midori/midori-websettings.c:542 +msgid "What to load on startup" +msgstr "Čo sa načíta pri spustení" + +#: ../midori/midori-websettings.c:552 +msgid "The homepage" +msgstr "Domovská stránka" + +#: ../midori/midori-websettings.c:567 +msgid "Show crash dialog" +msgstr "Zobraziť dialóg po spadnutí" + +#: ../midori/midori-websettings.c:568 +msgid "Show a dialog after Midori crashed" +msgstr "Zobrazí dialóg po spadnutí Midori" + +#: ../midori/midori-websettings.c:576 +msgid "Download Folder" +msgstr "Stiahnuť do" + +#: ../midori/midori-websettings.c:577 +msgid "The folder downloaded files are saved to" +msgstr "Priečinok, do ktorého sa búdu ukladať stiahnuté súbory" + +#: ../midori/midori-websettings.c:589 +msgid "Download Manager" +msgstr "Správca sťahovania" + +#: ../midori/midori-websettings.c:590 +msgid "An external download manager" +msgstr "Externý správca sťahovania" + +#: ../midori/midori-websettings.c:598 +msgid "Text Editor" +msgstr "Textový editor" + +#: ../midori/midori-websettings.c:599 +msgid "An external text editor" +msgstr "Externý textový editor" + +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:623 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:624 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:632 +msgid "Preferred Encoding" +msgstr "Preferované kódovanie" + +#: ../midori/midori-websettings.c:633 +msgid "The preferred character encoding" +msgstr "" + +#: ../midori/midori-websettings.c:643 +msgid "Always Show Tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:644 +msgid "Always show the tabbar" +msgstr "" + +#: ../midori/midori-websettings.c:652 +msgid "Close Buttons on Tabs" +msgstr "" + +#: ../midori/midori-websettings.c:653 +msgid "Whether tabs have close buttons" +msgstr "" + +#: ../midori/midori-websettings.c:661 +msgid "Open new pages in" +msgstr "Otvárať nové stránky" + +#: ../midori/midori-websettings.c:662 +msgid "Where to open new pages" +msgstr "" + +#: ../midori/midori-websettings.c:671 +msgid "Open external pages in" +msgstr "" + +#: ../midori/midori-websettings.c:672 +msgid "Where to open externally opened pages" +msgstr "" + +#: ../midori/midori-websettings.c:685 +msgid "Middle click opens Selection" +msgstr "" + +#: ../midori/midori-websettings.c:686 +msgid "Load an address from the selection via middle click" +msgstr "" + +#: ../midori/midori-websettings.c:694 +msgid "Open tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:695 +msgid "Whether to open new tabs in the background" +msgstr "" + +#: ../midori/midori-websettings.c:703 +msgid "Open Tabs next to Current" +msgstr "" + +#: ../midori/midori-websettings.c:704 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" + +#: ../midori/midori-websettings.c:712 +msgid "Open popups in tabs" +msgstr "Otvárať vyskakujúce okná na kartách" + +#: ../midori/midori-websettings.c:713 +msgid "Whether to open popup windows in tabs" +msgstr "" + +#: ../midori/midori-websettings.c:729 +msgid "Zoom Text and Images" +msgstr "" + +#: ../midori/midori-websettings.c:730 +msgid "Whether to zoom text and images" +msgstr "" + +#: ../midori/midori-websettings.c:745 +msgid "Find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:746 +msgid "Whether to automatically find inline while typing" +msgstr "" + +#: ../midori/midori-websettings.c:754 +msgid "Accept cookies" +msgstr "Povoliť cookies" + +#: ../midori/midori-websettings.c:755 +msgid "What type of cookies to accept" +msgstr "" + +#: ../midori/midori-websettings.c:764 +msgid "Original cookies only" +msgstr "" + +#: ../midori/midori-websettings.c:765 +msgid "Accept cookies from the original website only" +msgstr "" + +#: ../midori/midori-websettings.c:773 +msgid "Maximum cookie age" +msgstr "" + +#: ../midori/midori-websettings.c:774 +msgid "The maximum number of days to save cookies for" +msgstr "" + +#: ../midori/midori-websettings.c:784 +msgid "Remember last visited pages" +msgstr "Zapamätať si nedávno navštívené stránky" + +#: ../midori/midori-websettings.c:785 +msgid "Whether the last visited pages are saved" +msgstr "" + +#: ../midori/midori-websettings.c:793 +msgid "Maximum history age" +msgstr "" + +#: ../midori/midori-websettings.c:794 +msgid "The maximum number of days to save the history for" +msgstr "" + +#: ../midori/midori-websettings.c:802 +msgid "Remember last form inputs" +msgstr "" + +#: ../midori/midori-websettings.c:803 +msgid "Whether the last form inputs are saved" +msgstr "" + +#: ../midori/midori-websettings.c:811 +msgid "Remember last downloaded files" +msgstr "" + +#: ../midori/midori-websettings.c:812 +msgid "Whether the last downloaded files are saved" +msgstr "" + +#: ../midori/midori-websettings.c:822 +msgid "Proxy Server" +msgstr "Proxy Server" + +#: ../midori/midori-websettings.c:823 +msgid "The proxy server used for HTTP connections" +msgstr "" + +#: ../midori/midori-websettings.c:838 +msgid "Detect proxy server automatically" +msgstr "Automaticky detegovať proxy server" + +#: ../midori/midori-websettings.c:839 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:855 +msgid "Identify as" +msgstr "Identifikovať sa ako" + +#: ../midori/midori-websettings.c:856 +msgid "What to identify as to web pages" +msgstr "" + +#: ../midori/midori-websettings.c:872 +msgid "Identification string" +msgstr "Identifikačný reťazec" + +#: ../midori/midori-websettings.c:873 +msgid "The application identification string" +msgstr "" + +#: ../midori/midori-websettings.c:881 +msgid "Cache size" +msgstr "Veľkosť vyrovnávacej pamäte (cache)" + +#: ../midori/midori-websettings.c:882 +msgid "The allowed size of the cache" +msgstr "" + +#. i18n: The title of the 404 - Not found error page +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 +#: ../midori/midori-view.c:2473 +#, c-format +msgid "Not found - %s" +msgstr "" + +#: ../midori/midori-view.c:976 +msgid "Open _Link" +msgstr "Otvoriť _odkaz" + +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Tab" +msgstr "Otvoriť odkaz na novej _karte" + +#: ../midori/midori-view.c:995 +msgid "Open Link in New _Window" +msgstr "Otvoriť odkaz v novom _okne" + +#: ../midori/midori-view.c:1004 +msgid "_Download Link destination" +msgstr "_Stiahnuť cieľ odkazu" + +#: ../midori/midori-view.c:1010 +msgid "_Save Link destination" +msgstr "_Uložiť cieľ odkazu" + +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Stiahnuť pomocou _správcu sťahovania" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Hľadať _pomocou" + +#: ../midori/midori-view.c:1076 +msgid "_Search the Web" +msgstr "" + +#: ../midori/midori-view.c:1086 +msgid "Open Address in New _Tab" +msgstr "Otvoriť adresu v novej karte" + +#: ../midori/midori-view.c:1234 +msgid "Open or download file" +msgstr "Otvoriť alebo stiahnuť súbor" + +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "Typ súboru: '%s'" + +#: ../midori/midori-view.c:1254 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Typ súboru: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1258 +#, c-format +msgid "Open %s" +msgstr "Otvoriť %s" + +#: ../midori/midori-view.c:1661 +#, c-format +msgid "Inspect page - %s" +msgstr "" + +#: ../midori/midori-view.c:1806 +#, c-format +msgid "Document cannot be displayed" +msgstr "" + +#: ../midori/midori-view.c:1822 +#, c-format +msgid "No documentation installed" +msgstr "" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Nastavenia pre %s" + +#. Page "General" +#: ../midori/midori-preferences.c:398 +msgid "General" +msgstr "Hlavné" + +#: ../midori/midori-preferences.c:399 +msgid "Startup" +msgstr "Spustenie" + +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Použiť aktuálnu ako domovskú stránku" + +#: ../midori/midori-preferences.c:423 +#: ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Prenosy" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:475 +msgid "Appearance" +msgstr "Vzhľad" + +#: ../midori/midori-preferences.c:476 +msgid "Font settings" +msgstr "Nastavenia písma" + +#: ../midori/midori-preferences.c:478 +msgid "Default Font Family" +msgstr "Štandardná rodina písma" + +#: ../midori/midori-preferences.c:484 +msgid "The default font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:487 +msgid "Minimum Font Size" +msgstr "Minimálna veľkosť písma" + +#: ../midori/midori-preferences.c:490 +msgid "The minimum font size used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:497 +msgid "Encoding" +msgstr "Kódovanie" + +#: ../midori/midori-preferences.c:500 +msgid "The character encoding to use by default" +msgstr "" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:507 +msgid "Behavior" +msgstr "Správanie" + +#: ../midori/midori-preferences.c:508 +msgid "Features" +msgstr "" + +#: ../midori/midori-preferences.c:511 +#: ../extensions/statusbar-features.c:54 +msgid "Load images automatically" +msgstr "Automaticky načítať obrázky" + +#: ../midori/midori-preferences.c:512 +msgid "Load and display images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:515 +msgid "Shrink images automatically" +msgstr "" + +#: ../midori/midori-preferences.c:516 +msgid "Automatically shrink standalone images to fit" +msgstr "" + +#: ../midori/midori-preferences.c:519 +msgid "Print background images" +msgstr "" + +#: ../midori/midori-preferences.c:520 +msgid "Whether background images should be printed" +msgstr "" + +#: ../midori/midori-preferences.c:523 +msgid "Resizable text areas" +msgstr "" + +#: ../midori/midori-preferences.c:524 +msgid "Whether text areas are resizable" +msgstr "" + +#: ../midori/midori-preferences.c:527 +#: ../extensions/statusbar-features.c:63 +msgid "Enable scripts" +msgstr "Povoliť skripty" + +#: ../midori/midori-preferences.c:528 +msgid "Enable embedded scripting languages" +msgstr "" + +#: ../midori/midori-preferences.c:531 +#: ../extensions/statusbar-features.c:72 +msgid "Enable plugins" +msgstr "Povoliť pluginy" + +#: ../midori/midori-preferences.c:532 +msgid "Enable embedded plugin objects" +msgstr "" + +#: ../midori/midori-preferences.c:535 +msgid "Enforce 96 dots per inch" +msgstr "Vynútiť 96 bodov na palec" + +#: ../midori/midori-preferences.c:536 +msgid "Enforce a video dot density of 96 DPI" +msgstr "" + +#: ../midori/midori-preferences.c:539 +msgid "Enable developer tools" +msgstr "Povoliť vývojárske nástroje" + +#: ../midori/midori-preferences.c:540 +msgid "Enable special extensions for developers" +msgstr "" + +#. Page "Interface" +#: ../midori/midori-preferences.c:548 +msgid "Interface" +msgstr "Rozhranie" + +#: ../midori/midori-preferences.c:549 +msgid "Navigationbar" +msgstr "" + +#: ../midori/midori-preferences.c:560 +msgid "Browsing" +msgstr "Prehliadanie" + +#. Page "Network" +#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:591 +msgid "Network" +msgstr "Sieť" + +#: ../midori/midori-preferences.c:618 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:623 +msgid "Privacy" +msgstr "Súkromie" + +#: ../midori/midori-preferences.c:624 +msgid "Web Cookies" +msgstr "" + +#: ../midori/midori-preferences.c:637 +#: ../midori/midori-preferences.c:647 +msgid "days" +msgstr "" + +#: ../midori/midori-searchaction.c:484 +#: ../katze/katze-arrayaction.c:277 +msgid "Empty" +msgstr "" + +#: ../midori/midori-searchaction.c:904 +msgid "Add search engine" +msgstr "Pridať vyhľadávací modul" + +#: ../midori/midori-searchaction.c:904 +msgid "Edit search engine" +msgstr "Upraviť vyhľadávací modul" + +#: ../midori/midori-searchaction.c:932 +msgid "_Name:" +msgstr "_Názov:" + +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "_Ikona:" + +#: ../midori/midori-searchaction.c:990 +msgid "_Token:" +msgstr "_Token:" + +#: ../midori/midori-searchaction.c:1195 +msgid "Manage Search Engines" +msgstr "Správca vyhľadávacích modulov" + +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Použiť ako _predvolený" + +#: ../midori/sokoke.c:117 +#: ../midori/sokoke.c:129 +msgid "Could not run external program." +msgstr "" + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:448 +msgid "Warning: You are using a superuser account!" +msgstr "" + +#: ../midori/sokoke.c:780 +msgid "_Bookmark" +msgstr "_Záložka" + +#: ../midori/sokoke.c:782 +msgid "_Add Bookmark" +msgstr "_Pridať záložku" + +#: ../midori/sokoke.c:783 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/sokoke.c:784 +msgid "_Extensions" +msgstr "_Rozšírenia" + +#: ../midori/sokoke.c:785 +msgid "_History" +msgstr "_História" + +#: ../midori/sokoke.c:786 +msgid "_Homepage" +msgstr "_Domovská stránka" + +#: ../midori/sokoke.c:787 +msgid "_Userscripts" +msgstr "" + +#: ../midori/sokoke.c:788 +msgid "User_styles" +msgstr "" + +#: ../midori/sokoke.c:789 +msgid "New _Tab" +msgstr "Nová _karta" + +#: ../midori/sokoke.c:790 +msgid "_Transfers" +msgstr "_Prenosy" + +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "P_luginy" + +#: ../midori/sokoke.c:792 +msgid "_Closed Tabs and Windows" +msgstr "_Zatvorené karty a okná" + +#: ../midori/sokoke.c:793 +msgid "New _Window" +msgstr "Nové _okno" + +#: ../panels/midori-addons.c:95 +#: ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "" + +#: ../panels/midori-addons.c:96 +#: ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "" + +#: ../panels/midori-addons.c:927 +#: ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Povolené" + +#: ../panels/midori-addons.c:928 +#: ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Povolené" + +#: ../panels/midori-addons.c:937 +#: ../panels/midori-extensions.c:154 +msgid "_Disable" +msgstr "_Zakázané" + +#: ../panels/midori-addons.c:938 +#: ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Zakázané" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Záložky" + +#: ../panels/midori-bookmarks.c:240 +msgid "Edit the selected bookmark" +msgstr "Upraviť vybranú záložku" + +#: ../panels/midori-bookmarks.c:248 +msgid "Delete the selected bookmark" +msgstr "Vymazať označenú záložku" + +#: ../panels/midori-bookmarks.c:593 +msgid "Separator" +msgstr "" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konzola" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Rozšírenia" + +#: ../panels/midori-history.c:163 +msgid "Are you sure you want to remove all history items?" +msgstr "" + +#: ../panels/midori-history.c:218 +msgid "Bookmark the selected history item" +msgstr "" + +#: ../panels/midori-history.c:227 +msgid "Delete the selected history item" +msgstr "Odstrániť označenú položku v histórii" + +#: ../panels/midori-history.c:235 +msgid "Clear the entire history" +msgstr "Zmazať celú históriu" + +#: ../panels/midori-history.c:600 +#, c-format +msgid "A week ago" +msgstr "Pred týždňom" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d days ago" +msgstr "Pred %d dňami" + +#: ../panels/midori-history.c:613 +msgid "Today" +msgstr "Dnes" + +#: ../panels/midori-history.c:615 +msgid "Yesterday" +msgstr "Včera" + +#: ../panels/midori-plugins.c:87 +msgid "Plugins" +msgstr "Pluginy" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Meno" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Heslo" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "" + +#: ../katze/katze-utils.c:183 +#: ../katze/katze-utils.c:395 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "" + +#: ../katze/katze-utils.c:215 +#: ../katze/katze-utils.c:254 +msgid "Choose file" +msgstr "" + +#: ../katze/katze-utils.c:235 +msgid "Choose folder" +msgstr "" + +#: ../extensions/colorful-tabs.c:104 +msgid "Tint tabs distinctly" +msgstr "" + +#: ../extensions/colorful-tabs.c:140 +msgid "Colorful Tabs" +msgstr "Farebné karty" + +#: ../extensions/colorful-tabs.c:141 +msgid "Tint each tab distinctly" +msgstr "" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Hostiteľ: %s\n" +"Názov: %s\n" +"Hodnota: %s\n" +"Cesta: %s\n" +"Bezpečný: %s\n" +"Vyprší: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Áno" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Nie" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "Naozaj si prajete odstrániť všetky cookies?" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "Otázka" + +#: ../extensions/cookie-manager.c:501 +msgid "Only the visible cookies are deleted which match the entered filter string." +msgstr "" + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "_Rozbaliť všetko" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "_Zbaliť všetko" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "Odstrániť všetky" + +#: ../extensions/cookie-manager.c:820 +msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." +msgstr "" + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Rozbaliť všetko" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "Zbaliť všetko" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Filter:" + +#: ../extensions/cookie-manager.c:878 +msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" +msgstr "" + +#: ../extensions/cookie-manager.c:913 +#: ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Správca cookies" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "Správca _cookies" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Mouse Gestures" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Ovládanie Midori pomocou myši" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 +#: ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "" + From c711a75379daadbae5193751dbe0d93147ed6a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Mon, 27 Apr 2009 21:30:27 +0200 Subject: [PATCH 1069/2970] No need to work around GtkIconEntry issue afterall --- midori/gtkiconentry.c | 11 ----------- midori/gtkiconentry.h | 7 ++----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index bda44ca4..6bb7e869 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -33,17 +33,6 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, gtk_widget_show (GTK_WIDGET (entry)); } -void -gtk_icon_entry_set_icon_from_stock (GtkEntry* entry, - GtkEntryIconPosition position, - const gchar* stock_id) -{ - if (stock_id) - gtk_entry_set_icon_from_stock(entry, position, stock_id); - else - gtk_icon_entry_set_icon_from_pixbuf(entry, position, NULL); -} - #else #include diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h index 8f910cff..d34ff962 100644 --- a/midori/gtkiconentry.h +++ b/midori/gtkiconentry.h @@ -38,15 +38,12 @@ G_BEGIN_DECLS #define GTK_ICON_ENTRY GTK_ENTRY #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY #define gtk_icon_entry_new gtk_entry_new + #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock + void gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, GtkEntryIconPosition position, GdkPixbuf* pixbuf); - void - gtk_icon_entry_set_icon_from_stock (GtkEntry* entry, - GtkEntryIconPosition position, - const gchar* stock_id); - #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable #else From 9c6322b6fc10705b1ddb10c5c41140b2619c3c79 Mon Sep 17 00:00:00 2001 From: David Stancl Date: Tue, 28 Apr 2009 23:26:14 +0200 Subject: [PATCH 1070/2970] Add Czech translation --- AUTHORS | 1 + po/LINGUAS | 2 +- po/cs.po | 1828 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1830 insertions(+), 1 deletion(-) create mode 100644 po/cs.po diff --git a/AUTHORS b/AUTHORS index 84025854..ae33f347 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,6 +23,7 @@ Graphics: logo-shade: Nancy Runge Translations: + cs: David Stancl da: Per Kongstad de: Enrico Tröger de: Christian Dywan diff --git a/po/LINGUAS b/po/LINGUAS index 3b10523b..83b2a7fd 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ru sk sv tr uk zh_CN zh_TW +cs da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ru sk sv tr uk zh_CN zh_TW diff --git a/po/cs.po b/po/cs.po new file mode 100644 index 00000000..34b9775a --- /dev/null +++ b/po/cs.po @@ -0,0 +1,1828 @@ +# Czech translations for midori package. +# Copyright (C) 2008 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the home package. +# David Stancl 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"PO-Revision-Date: 2009-04-28 13:44+0200\n" +"Last-Translator: David Štancl \n" +"Language-Team: Czech\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Odlehčený prohlížeč" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 +#: ../midori/main.c:1396 ../midori/main.c:1407 +#: ../midori/midori-websettings.c:273 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Internetový prohlížeč" + +#: ../midori/main.c:94 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Konfigurace nemůže být načtena: %s\n" + +#: ../midori/main.c:149 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Hodnota '%s' je pro %s špatná" + +#: ../midori/main.c:156 ../midori/main.c:228 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Nesprávná hodnota '%s' v konfiguraci" + +#: ../midori/main.c:332 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Nepodařilo se otevřít databázi: %s\n" + +#: ../midori/main.c:364 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Nepodařilo se spustit databázový příkaz: %s\n" + +#: ../midori/main.c:418 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Nepodařilo se odstranit položku historie: %s\n" + +#: ../midori/main.c:442 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Nepodařilo se smazat historii: %s\n" + +#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Nepodařilo se přidat položku do historie: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:694 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Nepodařilo se odstranit staré položky historie: %s\n" + +#: ../midori/main.c:722 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Konfigurace nemůže být uložena. %s" + +#: ../midori/main.c:751 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Vyhledávací nástroj nemůže být uložen. %s" + +#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Záložky nemohou být uloženy. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:850 ../midori/main.c:873 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Seznam zavřených karet nemůže být uložen. %s" + +#: ../midori/main.c:946 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Sezení nemůže být uloženo. %s" + +#: ../midori/main.c:1073 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává " +"opakovaně, pro odstranění problému zkuste následující možnosti." + +#: ../midori/main.c:1088 +msgid "Modify _preferences" +msgstr "Změnit _nastavení" + +#: ../midori/main.c:1092 +msgid "Reset the last _session" +msgstr "Vymazat poslední _sezení" + +#: ../midori/main.c:1097 +msgid "Disable all _extensions" +msgstr "Zakázat všechna _rozšíření" + +#: ../midori/main.c:1288 +msgid "No filename specified" +msgstr "Nebyl zadán název souboru" + +#: ../midori/main.c:1311 +msgid "An unknown error occured." +msgstr "Nastala neznámá chyba." + +#: ../midori/main.c:1336 +msgid "Run ADDRESS as a web application" +msgstr "Spustit ADDRESS jako webovou aplikaci" + +#: ../midori/main.c:1336 +msgid "ADDRESS" +msgstr "ADDRESS" + +#: ../midori/main.c:1338 +msgid "Use FOLDER as configuration folder" +msgstr "Použít FOLDER jako místo pro uložení konfigurace" + +#: ../midori/main.c:1338 +msgid "FOLDER" +msgstr "FOLDER" + +#: ../midori/main.c:1340 +msgid "Run the specified filename as javascript" +msgstr "Spustit jako javascript" + +#: ../midori/main.c:1342 +msgid "Display program version" +msgstr "Zobrazit verzi programu" + +#: ../midori/main.c:1344 +msgid "Addresses" +msgstr "Adresy" + +#: ../midori/main.c:1385 +msgid "[Addresses]" +msgstr "[Adresy]" + +#: ../midori/main.c:1408 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Komentáře, požadavky a chyby posílejte na:" + +#: ../midori/main.c:1410 +msgid "Check for new versions at:" +msgstr "Zjistit nové verze v:" + +#: ../midori/main.c:1454 +msgid "The specified configuration folder is invalid." +msgstr "Vybraný konfigurační adresář je neplatný." + +#: ../midori/main.c:1489 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "Midori sice již běží, ale neodpovídá.\n" + +#: ../midori/main.c:1539 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" + +#: ../midori/main.c:1551 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Záložky nemohou být načteny: %s\n" + +#: ../midori/main.c:1566 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Sezení nemůže být načteno: %s\n" + +#: ../midori/main.c:1579 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Zavřené karty nemohou být načteny: %s\n" + +#: ../midori/main.c:1592 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Historie nemůže být načtena: %s\n" + +#: ../midori/main.c:1604 +msgid "The following errors occured:" +msgstr "Došlo k následujícím chybám:" + +#: ../midori/main.c:1620 +msgid "_Ignore" +msgstr "_Ignorovat" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Soubor nebyl nalezen." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Nesprávný formát dokumentu." + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 +#, c-format +msgid "Writing failed." +msgstr "Nepodařilo se zapsat." + +#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 +#: ../midori/midori-browser.c:3374 +msgid "Reload the current page" +msgstr "Znovu načíst stránku" + +#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 +msgid "Stop loading the current page" +msgstr "Zastavit načítání stránky" + +#: ../midori/midori-browser.c:353 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% načteno" + +#: ../midori/midori-browser.c:378 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Neočekávaná akce '%s'." + +#: ../midori/midori-browser.c:541 +msgid "New folder" +msgstr "Nový adresář" + +#: ../midori/midori-browser.c:541 +msgid "Edit folder" +msgstr "Upravit adresář" + +#: ../midori/midori-browser.c:543 +msgid "New bookmark" +msgstr "Nová záložka" + +#: ../midori/midori-browser.c:543 +msgid "Edit bookmark" +msgstr "Upravit záložku" + +#: ../midori/midori-browser.c:573 +msgid "_Title:" +msgstr "_Nadpis:" + +#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 +msgid "_Description:" +msgstr "_Popis:" + +#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 +msgid "_Address:" +msgstr "_Adresa:" + +#: ../midori/midori-browser.c:624 +msgid "_Folder:" +msgstr "_Adresář:" + +#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 +msgid "Toplevel folder" +msgstr "Hlavní adresář" + +#: ../midori/midori-browser.c:746 +msgid "Save file as" +msgstr "Uložit soubor jako" + +#: ../midori/midori-browser.c:1523 +msgid "Open file" +msgstr "Otevřít soubor" + +#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 +#: ../panels/midori-history.c:809 +msgid "Open all in _Tabs" +msgstr "Otevřít všechny v _kartách" + +#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:815 +msgid "Open in New _Tab" +msgstr "Otevřít v nové _kartě" + +#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 +#: ../panels/midori-history.c:817 +msgid "Open in New _Window" +msgstr "Otevřít v novém _okně" + +#: ../midori/midori-browser.c:2974 +msgid "Clear Private Data" +msgstr "Vymazat osobní data" + +#: ../midori/midori-browser.c:2977 +msgid "_Clear private data" +msgstr "_Vymazat osobní data" + +#: ../midori/midori-browser.c:2990 +msgid "Clear the following data:" +msgstr "Vymazat následující data:" + +#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Historie" + +#: ../midori/midori-browser.c:3001 +msgid "Cookies" +msgstr "cookies" + +#: ../midori/midori-browser.c:3004 +msgid "'Flash' Cookies" +msgstr "cookies z flashe" + +#: ../midori/midori-browser.c:3007 +msgid "Website icons" +msgstr "Ikony stránek" + +#: ../midori/midori-browser.c:3093 +msgid "A lightweight web browser." +msgstr "Odlehčený internetový prohlížeč." + +#: ../midori/midori-browser.c:3101 +msgid "translator-credits" +msgstr "David Štancl " + +#: ../midori/midori-browser.c:3302 +msgid "_File" +msgstr "_Soubor" + +#: ../midori/midori-browser.c:3305 +msgid "Open a new window" +msgstr "Otevřít nové okno" + +#: ../midori/midori-browser.c:3308 +msgid "Open a new tab" +msgstr "Otevřít novou kartu" + +#: ../midori/midori-browser.c:3311 +msgid "Open a file" +msgstr "Otevřít soubor" + +#: ../midori/midori-browser.c:3314 +msgid "Save to a file" +msgstr "Uložit do souboru" + +#: ../midori/midori-browser.c:3316 +msgid "_Close Tab" +msgstr "_Zavřít kartu" + +#: ../midori/midori-browser.c:3317 +msgid "Close the current tab" +msgstr "Zavřít aktivní kartu" + +#: ../midori/midori-browser.c:3319 +msgid "C_lose Window" +msgstr "Za_vřít okno" + +#: ../midori/midori-browser.c:3320 +msgid "Close this window" +msgstr "Zavřít toto okno" + +#: ../midori/midori-browser.c:3323 +msgid "Print the current page" +msgstr "Vytisknout aktuální stránku" + +#: ../midori/midori-browser.c:3326 +msgid "Quit the application" +msgstr "Ukončit aplikaci" + +#: ../midori/midori-browser.c:3328 +msgid "_Edit" +msgstr "_Upravit" + +#: ../midori/midori-browser.c:3331 +msgid "Cut the selected text" +msgstr "Vystříhnout vybraný text" + +#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 +msgid "Copy the selected text" +msgstr "Zkopírovat vybraný text" + +#: ../midori/midori-browser.c:3340 +msgid "Paste text from the clipboard" +msgstr "Vložit text ze schránky" + +#: ../midori/midori-browser.c:3343 +msgid "Delete the selected text" +msgstr "Smazat vybraný text" + +#: ../midori/midori-browser.c:3346 +msgid "Select all text" +msgstr "Vybrat vše" + +#: ../midori/midori-browser.c:3349 +msgid "Find a word or phrase in the page" +msgstr "Najít slovo nebo frázi na stránce" + +#: ../midori/midori-browser.c:3351 +msgid "Find _Next" +msgstr "Najít _další" + +#: ../midori/midori-browser.c:3352 +msgid "Find the next occurrence of a word or phrase" +msgstr "Najít další výskyt slova nebo fráze" + +#: ../midori/midori-browser.c:3354 +msgid "Find _Previous" +msgstr "Najít _předchozí" + +#: ../midori/midori-browser.c:3355 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Najít předchozí výskyt slova nebo fráze" + +#: ../midori/midori-browser.c:3358 +msgid "_Quick Find" +msgstr "_Rychlé hledání" + +#: ../midori/midori-browser.c:3359 +msgid "Quickly jump to a word or phrase" +msgstr "Okamžitě přeskočit na slovo nebo frázi" + +#: ../midori/midori-browser.c:3362 +msgid "Configure the application preferences" +msgstr "Změnit nastavení aplikace" + +#: ../midori/midori-browser.c:3364 +msgid "_View" +msgstr "_Pohled" + +#: ../midori/midori-browser.c:3365 +msgid "_Toolbars" +msgstr "_Lišty" + +#: ../midori/midori-browser.c:3377 +msgid "Increase the zoom level" +msgstr "Přiblížit" + +#: ../midori/midori-browser.c:3380 +msgid "Decrease the zoom level" +msgstr "Oddálit" + +#: ../midori/midori-browser.c:3383 +msgid "Reset the zoom level" +msgstr "Nastavit původní přiblížení" + +#: ../midori/midori-browser.c:3384 +msgid "_Encoding" +msgstr "_Kódování" + +#: ../midori/midori-browser.c:3386 +msgid "_Automatic" +msgstr "_Automatické" + +#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 +msgid "Chinese (BIG5)" +msgstr "Čínské (BIG5)" + +#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japonské (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 +msgid "Russian (KOI8-R)" +msgstr "Ruské (KOI8-R)" + +#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 +msgid "Western (ISO-8859-1)" +msgstr "Západní (ISO-8859-1)" + +#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 +#: ../midori/midori-websettings.c:277 +msgid "Custom..." +msgstr "Vlastní..." + +#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 +msgid "View _Source" +msgstr "Zobrazit zdrojový _kód" + +#: ../midori/midori-browser.c:3408 +msgid "View the source code of the page" +msgstr "Zobrazí zdrojový kód stránky" + +#: ../midori/midori-browser.c:3410 +msgid "View Selection Source" +msgstr "Zobrazit zdrojový kód výběru" + +#: ../midori/midori-browser.c:3411 +msgid "View the source code of the selection" +msgstr "Zobrazit zdrojový kód vybraného textu" + +#: ../midori/midori-browser.c:3415 +msgid "Toggle fullscreen view" +msgstr "Přepnout zobrazení na celou obrazovku" + +#: ../midori/midori-browser.c:3417 +msgid "_Go" +msgstr "_Jít" + +#: ../midori/midori-browser.c:3420 +msgid "Go back to the previous page" +msgstr "Jít zpět (na předchozí stránku)" + +#: ../midori/midori-browser.c:3423 +msgid "Go forward to the next page" +msgstr "Jít vpřed (na následující stránku)" + +#: ../midori/midori-browser.c:3426 +msgid "Go to your homepage" +msgstr "Jít na domovskou stránku" + +#: ../midori/midori-browser.c:3428 +msgid "Empty Trash" +msgstr "Vyprázdnit seznam zavřených karet" + +#: ../midori/midori-browser.c:3429 +msgid "Delete the contents of the trash" +msgstr "Vymaže seznam zavřených karet" + +#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 +msgid "Undo Close Tab" +msgstr "Vrátit zavření karty" + +#: ../midori/midori-browser.c:3432 +msgid "Open the last closed tab" +msgstr "Otevře naposledy zavřenou kartu" + +#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 +msgid "Add a new bookmark" +msgstr "Přidat novou záložku" + +#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +msgid "Add a new folder" +msgstr "Přidat složku" + +#: ../midori/midori-browser.c:3439 +msgid "Add a new bookmark folder" +msgstr "Přidá novou složku do záložek" + +#: ../midori/midori-browser.c:3440 +msgid "_Tools" +msgstr "Ná_stroje" + +#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "Nastavit _vyhledávací nástroje" + +#: ../midori/midori-browser.c:3443 +msgid "Add, edit and remove search engines..." +msgstr "Přidává, upravuje a maže vyhledávací nástroje..." + +#: ../midori/midori-browser.c:3446 +msgid "_Clear Private Data" +msgstr "_Vymazat osobní data" + +#: ../midori/midori-browser.c:3447 +msgid "Clear private data..." +msgstr "Vymaže osobní data..." + +#: ../midori/midori-browser.c:3451 +msgid "_Previous Tab" +msgstr "_Předchozí karta" + +#: ../midori/midori-browser.c:3452 +msgid "Switch to the previous tab" +msgstr "Přepnout na předchozí kartu" + +#: ../midori/midori-browser.c:3454 +msgid "_Next Tab" +msgstr "_Další karta" + +#: ../midori/midori-browser.c:3455 +msgid "Switch to the next tab" +msgstr "Přepnout na další kartu" + +#: ../midori/midori-browser.c:3457 +msgid "_Help" +msgstr "_Nápověda" + +#: ../midori/midori-browser.c:3459 +msgid "_Contents" +msgstr "_Obsah" + +#: ../midori/midori-browser.c:3460 +msgid "Show the documentation" +msgstr "Zobrazit dokumentaci" + +#: ../midori/midori-browser.c:3462 +msgid "_Frequent Questions" +msgstr "Časté _otázky" + +#: ../midori/midori-browser.c:3463 +msgid "Show the Frequently Asked Questions" +msgstr "Zobrazí často kladené otázky (FAQ)" + +#: ../midori/midori-browser.c:3465 +msgid "_Report a Bug" +msgstr "Ohlásit chy_bu" + +#: ../midori/midori-browser.c:3466 +msgid "Open Midori's bug tracker" +msgstr "Otevře stránku pro hlášení chyb" + +#: ../midori/midori-browser.c:3469 +msgid "Show information about the program" +msgstr "Zobrazí informace o programu" + +#: ../midori/midori-browser.c:3476 +msgid "P_rivate Browsing" +msgstr "Sou_kromé prohlížení" + +#: ../midori/midori-browser.c:3477 +msgid "Don't save any private data while browsing" +msgstr "Neukládat při prohlížení žádná data" + +#: ../midori/midori-browser.c:3482 +msgid "_Menubar" +msgstr "_Menu" + +#: ../midori/midori-browser.c:3483 +msgid "Show menubar" +msgstr "Zobrazit menu" + +#: ../midori/midori-browser.c:3486 +msgid "_Navigationbar" +msgstr "_Navigační lišta" + +#: ../midori/midori-browser.c:3487 +msgid "Show navigationbar" +msgstr "Zobrazit navigační lištu" + +#: ../midori/midori-browser.c:3490 +msgid "Side_panel" +msgstr "Boční _panel" + +#: ../midori/midori-browser.c:3491 +msgid "Show sidepanel" +msgstr "Zobrazit boční panel" + +#: ../midori/midori-browser.c:3494 +msgid "_Bookmarkbar" +msgstr "Lišta _záložek" + +#: ../midori/midori-browser.c:3495 +msgid "Show bookmarkbar" +msgstr "Zobrazit lištu se záložkami" + +#: ../midori/midori-browser.c:3498 +msgid "_Transferbar" +msgstr "Stav _přenosu" + +#: ../midori/midori-browser.c:3499 +msgid "Show transferbar" +msgstr "Zobrazit stav přenosu dat" + +#: ../midori/midori-browser.c:3502 +msgid "_Statusbar" +msgstr "_Stavová lišta" + +#: ../midori/midori-browser.c:3503 +msgid "Show statusbar" +msgstr "Zobrazit stavovou lištu" + +#: ../midori/midori-browser.c:3937 +msgid "_Separator" +msgstr "_Oddělovač" + +#: ../midori/midori-browser.c:3944 +msgid "_Location..." +msgstr "U_místění..." + +#: ../midori/midori-browser.c:3946 +msgid "Open a particular location" +msgstr "Otevřít umístění" + +#: ../midori/midori-browser.c:3970 +msgid "_Web Search..." +msgstr "_Hledat na webu..." + +#: ../midori/midori-browser.c:3972 +msgid "Run a web search" +msgstr "Spustí vyhledávání na webu" + +#: ../midori/midori-browser.c:3993 +msgid "Reopen a previously closed tab or window" +msgstr "Znovu otevřít zavřenou kartu nebo okno" + +#: ../midori/midori-browser.c:4006 +msgid "_Recently visited pages" +msgstr "_Naposledy navštívené stránky" + +#: ../midori/midori-browser.c:4008 +msgid "Reopen pages that you visited earlier" +msgstr "Znovu otevře stránky, které jste již navštívili" + +#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 +msgid "_Bookmarks" +msgstr "_Záložky" + +#: ../midori/midori-browser.c:4023 +msgid "Show the saved bookmarks" +msgstr "Zobrazit uložené záložky" + +#: ../midori/midori-browser.c:4036 +msgid "_Window" +msgstr "_Okno" + +#: ../midori/midori-browser.c:4038 +msgid "Show a list of all open tabs" +msgstr "Zobrazit seznam všech otevřených karet" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4205 +msgid "_Inline Find:" +msgstr "_Rychlé hledání" + +#: ../midori/midori-browser.c:4230 +msgid "Previous" +msgstr "Předchozí" + +#: ../midori/midori-browser.c:4235 +msgid "Next" +msgstr "Následující" + +#: ../midori/midori-browser.c:4240 +msgid "Match Case" +msgstr "Rozlišovat velikost" + +#: ../midori/midori-browser.c:4248 +msgid "Highlight Matches" +msgstr "Zvýraznit nalezené" + +#: ../midori/midori-browser.c:4258 +msgid "Close Findbar" +msgstr "Zavřít vyhledávací lištu" + +#: ../midori/midori-browser.c:4598 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Neočekávané nastavení '%s'" + +#: ../midori/midori-panel.c:309 +msgid "Detach chosen panel from the window" +msgstr "Oddělit vybraný panel od okna" + +#: ../midori/midori-panel.c:311 +msgid "Whether to detach the chosen panel from the window" +msgstr "Je možné oddělovat vybraný panel od okna?" + +#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 +msgid "Align sidepanel on the right" +msgstr "Umístit boční panel vpravo" + +#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 +msgid "Whether to align the sidepanel on the right" +msgstr "Zda umístit boční panel vpravo." + +#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +msgid "Close panel" +msgstr "Zavřít panel" + +#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 +msgid "Blank page" +msgstr "Prázdná stránka" + +#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 +msgid "Homepage" +msgstr "Domovská stránka" + +#: ../midori/midori-websettings.c:185 +msgid "Last open pages" +msgstr "Naposledy otevřené stránky" + +#: ../midori/midori-websettings.c:220 +msgid "New tab" +msgstr "Nová karta" + +#: ../midori/midori-websettings.c:221 +msgid "New window" +msgstr "Nové okno" + +#: ../midori/midori-websettings.c:222 +msgid "Current tab" +msgstr "Aktuální karta" + +#: ../midori/midori-websettings.c:237 +msgid "Default" +msgstr "Výchozí" + +#: ../midori/midori-websettings.c:238 +msgid "Icons" +msgstr "Ikony" + +#: ../midori/midori-websettings.c:239 +msgid "Text" +msgstr "Text" + +#: ../midori/midori-websettings.c:240 +msgid "Both" +msgstr "Obojí" + +#: ../midori/midori-websettings.c:241 +msgid "Both horizontal" +msgstr "Obojí vedle sebe" + +#: ../midori/midori-websettings.c:256 +msgid "All cookies" +msgstr "Všechna cookies" + +#: ../midori/midori-websettings.c:257 +msgid "Session cookies" +msgstr "Cookies sezení" + +#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 +msgid "None" +msgstr "Žádné" + +#: ../midori/midori-websettings.c:274 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:275 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:276 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:329 +msgid "Remember last window size" +msgstr "Pamatovat si velikost okna" + +#: ../midori/midori-websettings.c:330 +msgid "Whether to save the last window size" +msgstr "Ukládat rozměry okna?" + +#: ../midori/midori-websettings.c:338 +msgid "Last window width" +msgstr "Šířka okna" + +#: ../midori/midori-websettings.c:339 +msgid "The last saved window width" +msgstr "Naposledy uložená šířka okna" + +#: ../midori/midori-websettings.c:347 +msgid "Last window height" +msgstr "Výška okna" + +#: ../midori/midori-websettings.c:348 +msgid "The last saved window height" +msgstr "Naposledy uložená výška okna" + +#: ../midori/midori-websettings.c:373 +msgid "Last panel position" +msgstr "Poslední pozice panelu" + +#: ../midori/midori-websettings.c:374 +msgid "The last saved panel position" +msgstr "Uložená poslední pozice panelu" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:383 +msgid "Last panel page" +msgstr "Poslední otevřená stránka" + +#: ../midori/midori-websettings.c:384 +msgid "The last saved panel page" +msgstr "Uložená stránka" + +#: ../midori/midori-websettings.c:392 +msgid "Last Web search" +msgstr "Rychlé hledání na webu" + +#: ../midori/midori-websettings.c:393 +msgid "The last saved Web search" +msgstr "Uložené poslední vyhledávání na webu" + +#: ../midori/midori-websettings.c:402 +msgid "Show Menubar" +msgstr "Zobrazit menu" + +#: ../midori/midori-websettings.c:403 +msgid "Whether to show the menubar" +msgstr "Zobrazit menu?" + +#: ../midori/midori-websettings.c:411 +msgid "Show Navigationbar" +msgstr "Zobrazit vyhledávání" + +#: ../midori/midori-websettings.c:412 +msgid "Whether to show the navigationbar" +msgstr "Zobrazit lištu vyhledávání?" + +#: ../midori/midori-websettings.c:420 +msgid "Show Bookmarkbar" +msgstr "Zobrazit záložky" + +#: ../midori/midori-websettings.c:421 +msgid "Whether to show the bookmarkbar" +msgstr "Zobrazit lištu se záložkami?" + +#: ../midori/midori-websettings.c:429 +msgid "Show Panel" +msgstr "Zobrazit panel" + +#: ../midori/midori-websettings.c:430 +msgid "Whether to show the panel" +msgstr "Zobrazit panel?" + +#: ../midori/midori-websettings.c:445 +msgid "Show Transferbar" +msgstr "Zobrazit stav přenosu" + +#: ../midori/midori-websettings.c:446 +msgid "Whether to show the transferbar" +msgstr "Zobrazit stav přenosu?" + +#: ../midori/midori-websettings.c:454 +msgid "Show Statusbar" +msgstr "Zobrazit stavový řádek" + +#: ../midori/midori-websettings.c:455 +msgid "Whether to show the statusbar" +msgstr "Zobrazit stavový řádek?" + +#: ../midori/midori-websettings.c:464 +msgid "Toolbar Style" +msgstr "Styl lišty" + +#: ../midori/midori-websettings.c:465 +msgid "The style of the toolbar" +msgstr "Nastaví styl lišty (zobrazení textu a ikon)." + +#: ../midori/midori-websettings.c:481 +msgid "Show progress in location entry" +msgstr "Zobrazit průběh v řádku adresy" + +#: ../midori/midori-websettings.c:482 +msgid "Whether to show loading progress in the location entry" +msgstr "Zobrazovat průběh načítání v řádku s adresou?" + +#: ../midori/midori-websettings.c:497 +msgid "Search engines in location completion" +msgstr "Zobrazovat výsledky hledání při zadávání adresy" + +#: ../midori/midori-websettings.c:498 +msgid "Whether to show search engines in the location completion" +msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" + +#: ../midori/midori-websettings.c:506 +msgid "Toolbar Items" +msgstr "Položky nástrojové lišty" + +#: ../midori/midori-websettings.c:507 +msgid "The items to show on the toolbar" +msgstr "Položky, které se budou zobrazovat na nástrojové liště" + +#: ../midori/midori-websettings.c:515 +msgid "Compact Sidepanel" +msgstr "Kompaktní boční panel" + +#: ../midori/midori-websettings.c:516 +msgid "Whether to make the sidepanel compact" +msgstr "Má se zobrazit boční panel kompaktně?" + +#: ../midori/midori-websettings.c:541 +msgid "Load on Startup" +msgstr "Načíst při startu" + +#: ../midori/midori-websettings.c:542 +msgid "What to load on startup" +msgstr "Co načíst při startu" + +#: ../midori/midori-websettings.c:552 +msgid "The homepage" +msgstr "Domovská stránka" + +#: ../midori/midori-websettings.c:567 +msgid "Show crash dialog" +msgstr "Zobrazit dialog po pádu" + +#: ../midori/midori-websettings.c:568 +msgid "Show a dialog after Midori crashed" +msgstr "Zobrazit dialog po pádu Midori" + +#: ../midori/midori-websettings.c:576 +msgid "Download Folder" +msgstr "Složka pro ukládání" + +#: ../midori/midori-websettings.c:577 +msgid "The folder downloaded files are saved to" +msgstr "Kam se budou ukládat stažené soubory" + +#: ../midori/midori-websettings.c:589 +msgid "Download Manager" +msgstr "Správce stahování" + +#: ../midori/midori-websettings.c:590 +msgid "An external download manager" +msgstr "Externí program pro stahování" + +#: ../midori/midori-websettings.c:598 +msgid "Text Editor" +msgstr "Textový editor" + +#: ../midori/midori-websettings.c:599 +msgid "An external text editor" +msgstr "Externí textový editor" + +#: ../midori/midori-websettings.c:614 +msgid "News Aggregator" +msgstr "Čtečka RSS" + +#: ../midori/midori-websettings.c:615 +msgid "An external news aggregator" +msgstr "Externí čtečka zpráv RSS" + +#: ../midori/midori-websettings.c:623 +msgid "Location entry Search" +msgstr "Vyhledávání v adresním řádku" + +#: ../midori/midori-websettings.c:624 +msgid "The search to perform inside the location entry" +msgstr "Vyhledávání použité v řádku s adresou" + +#: ../midori/midori-websettings.c:632 +msgid "Preferred Encoding" +msgstr "Preferované kódování" + +#: ../midori/midori-websettings.c:633 +msgid "The preferred character encoding" +msgstr "Preferované kódování stránek" + +#: ../midori/midori-websettings.c:643 +msgid "Always Show Tabbar" +msgstr "Vždy zobrazovat karty" + +#: ../midori/midori-websettings.c:644 +msgid "Always show the tabbar" +msgstr "Zobrazit karty, i když je jen jedna?" + +#: ../midori/midori-websettings.c:652 +msgid "Close Buttons on Tabs" +msgstr "Ikona zavření karty" + +#: ../midori/midori-websettings.c:653 +msgid "Whether tabs have close buttons" +msgstr "Zobrazovat ikonu pro zavření karty?" + +#: ../midori/midori-websettings.c:661 +msgid "Open new pages in" +msgstr "Otevírat nové stránky v" + +#: ../midori/midori-websettings.c:662 +msgid "Where to open new pages" +msgstr "Kde se budou otevírat nové stránky" + +#: ../midori/midori-websettings.c:671 +msgid "Open external pages in" +msgstr "Otevírat externí stránky v" + +#: ../midori/midori-websettings.c:672 +msgid "Where to open externally opened pages" +msgstr "Kde se budou otevírat externí stránky" + +#: ../midori/midori-websettings.c:685 +msgid "Middle click opens Selection" +msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" + +#: ../midori/midori-websettings.c:686 +msgid "Load an address from the selection via middle click" +msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" + +#: ../midori/midori-websettings.c:694 +msgid "Open tabs in the background" +msgstr "Otevírat karty na pozadí" + +#: ../midori/midori-websettings.c:695 +msgid "Whether to open new tabs in the background" +msgstr "Karty se otevírají na pozadí" + +#: ../midori/midori-websettings.c:703 +msgid "Open Tabs next to Current" +msgstr "Otevřít kartu vedle aktivní" + +#: ../midori/midori-websettings.c:704 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "Nová karta se otevře vedle aktivní" + +#: ../midori/midori-websettings.c:712 +msgid "Open popups in tabs" +msgstr "Otevírat vyskakovací okna v kartách" + +#: ../midori/midori-websettings.c:713 +msgid "Whether to open popup windows in tabs" +msgstr "Vyskakovací okno se otevře v nové kartě" + +#: ../midori/midori-websettings.c:729 +msgid "Zoom Text and Images" +msgstr "Zvětšovat text i obrázky" + +#: ../midori/midori-websettings.c:730 +msgid "Whether to zoom text and images" +msgstr "Při přibližování zvětšovat text i obrázky?" + +#: ../midori/midori-websettings.c:745 +msgid "Find inline while typing" +msgstr "Hledat při psaní" + +#: ../midori/midori-websettings.c:746 +msgid "Whether to automatically find inline while typing" +msgstr "Při psaní hledat text?" + +#: ../midori/midori-websettings.c:754 +msgid "Accept cookies" +msgstr "Přijímat cookies" + +#: ../midori/midori-websettings.c:755 +msgid "What type of cookies to accept" +msgstr "Který typ cookies přijímat" + +#: ../midori/midori-websettings.c:764 +msgid "Original cookies only" +msgstr "Původní" + +#: ../midori/midori-websettings.c:765 +msgid "Accept cookies from the original website only" +msgstr "Z původní stránky" + +#: ../midori/midori-websettings.c:773 +msgid "Maximum cookie age" +msgstr "Maximální stáří cookies" + +#: ../midori/midori-websettings.c:774 +msgid "The maximum number of days to save cookies for" +msgstr "Maximální počet dní, po které jsou cookies platná." + +#: ../midori/midori-websettings.c:784 +msgid "Remember last visited pages" +msgstr "Pamatovat si naposledy navštívené stránky" + +#: ../midori/midori-websettings.c:785 +msgid "Whether the last visited pages are saved" +msgstr "Pamatovat si naposledy navštívené stránky?" + +#: ../midori/midori-websettings.c:793 +msgid "Maximum history age" +msgstr "Maximální délka historie" + +#: ../midori/midori-websettings.c:794 +msgid "The maximum number of days to save the history for" +msgstr "" +"Maximální počet dní, po které se bude uchovávat historie navštívených stránek" + +#: ../midori/midori-websettings.c:802 +msgid "Remember last form inputs" +msgstr "Pamatovat si vložený text" + +#: ../midori/midori-websettings.c:803 +msgid "Whether the last form inputs are saved" +msgstr "Pamatovat si text vložený do vstupních polí?" + +#: ../midori/midori-websettings.c:811 +msgid "Remember last downloaded files" +msgstr "Pamatovat si naposledy stahované soubory" + +#: ../midori/midori-websettings.c:812 +msgid "Whether the last downloaded files are saved" +msgstr "Pamatovat si seznam souborů, které byly stahovány?" + +#: ../midori/midori-websettings.c:822 +msgid "Proxy Server" +msgstr "Proxy server" + +#: ../midori/midori-websettings.c:823 +msgid "The proxy server used for HTTP connections" +msgstr "Nastavení proxy serveru pro HTTP spojení" + +#: ../midori/midori-websettings.c:838 +msgid "Detect proxy server automatically" +msgstr "Zjistit proxy server automaticky" + +#: ../midori/midori-websettings.c:839 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "Zjistit nastavení proxy serveru automaticky?" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:855 +msgid "Identify as" +msgstr "Hlásit se jako" + +#: ../midori/midori-websettings.c:856 +msgid "What to identify as to web pages" +msgstr "Jak se hlásit webovým stránkám" + +#: ../midori/midori-websettings.c:872 +msgid "Identification string" +msgstr "Identifikační řetězec" + +#: ../midori/midori-websettings.c:873 +msgid "The application identification string" +msgstr "Identifikační řetězec aplikace" + +#: ../midori/midori-websettings.c:881 +msgid "Cache size" +msgstr "Velikost keše" + +#: ../midori/midori-websettings.c:882 +msgid "The allowed size of the cache" +msgstr "Povolená velikost keše" + +#. i18n: The title of the 404 - Not found error page +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 +#, c-format +msgid "Not found - %s" +msgstr "Nenalezeno - %s" + +#: ../midori/midori-view.c:976 +msgid "Open _Link" +msgstr "Otevřít _odkaz" + +#: ../midori/midori-view.c:978 +msgid "Open Link in New _Tab" +msgstr "Otevřít odkaz v nové _kartě" + +#: ../midori/midori-view.c:995 +msgid "Open Link in New _Window" +msgstr "Otevřít odkaz v novém _okně" + +#: ../midori/midori-view.c:1004 +msgid "_Download Link destination" +msgstr "_Stáhnout umístění" + +#: ../midori/midori-view.c:1010 +msgid "_Save Link destination" +msgstr "_Uložit umístění" + +#: ../midori/midori-view.c:1019 +msgid "Download with Download _Manager" +msgstr "Stáhnout za použití Download _manageru" + +#: ../midori/midori-view.c:1048 +msgid "Search _with" +msgstr "Hledat _s" + +#: ../midori/midori-view.c:1076 +msgid "_Search the Web" +msgstr "_Hledat na webu" + +#: ../midori/midori-view.c:1086 +msgid "Open Address in New _Tab" +msgstr "Otevřít adresu v nové _kartě" + +#: ../midori/midori-view.c:1234 +msgid "Open or download file" +msgstr "Otevřít nebo stáhnout soubor" + +#: ../midori/midori-view.c:1251 +#, c-format +msgid "File Type: '%s'" +msgstr "Typ souboru: '%s'" + +#: ../midori/midori-view.c:1254 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Typ souboru: %s ('%s')" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1258 +#, c-format +msgid "Open %s" +msgstr "Otevřít %s" + +#: ../midori/midori-view.c:1661 +#, c-format +msgid "Inspect page - %s" +msgstr "Prohlížení stránky - %s" + +#: ../midori/midori-view.c:1806 +#, c-format +msgid "Document cannot be displayed" +msgstr "Dokument nemůže být zobrazen" + +#: ../midori/midori-view.c:1822 +#, c-format +msgid "No documentation installed" +msgstr "Dokumentace není nainstalována" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Nastavení pro %s" + +#. Page "General" +#: ../midori/midori-preferences.c:398 +msgid "General" +msgstr "Obecné" + +#: ../midori/midori-preferences.c:399 +msgid "Startup" +msgstr "Při spuštění" + +#: ../midori/midori-preferences.c:415 +msgid "Use current page as homepage" +msgstr "Použít stávající stránku jako domovskou" + +#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Přenosy" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:475 +msgid "Appearance" +msgstr "Vzhled" + +#: ../midori/midori-preferences.c:476 +msgid "Font settings" +msgstr "Nastavení písma" + +#: ../midori/midori-preferences.c:478 +msgid "Default Font Family" +msgstr "Výchozí font" + +#: ../midori/midori-preferences.c:484 +msgid "The default font size used to display text" +msgstr "Velikost textu" + +#: ../midori/midori-preferences.c:487 +msgid "Minimum Font Size" +msgstr "Minimální velikost textu" + +#: ../midori/midori-preferences.c:490 +msgid "The minimum font size used to display text" +msgstr "Minimální velikost textu, která se použije pro zobrazení" + +#: ../midori/midori-preferences.c:497 +msgid "Encoding" +msgstr "Kódování" + +#: ../midori/midori-preferences.c:500 +msgid "The character encoding to use by default" +msgstr "Kódování, které se použije jako výchozí" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:507 +msgid "Behavior" +msgstr "Chování" + +#: ../midori/midori-preferences.c:508 +msgid "Features" +msgstr "Rozšíření" + +#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 +msgid "Load images automatically" +msgstr "Automaticky načítat obrázky" + +#: ../midori/midori-preferences.c:512 +msgid "Load and display images automatically" +msgstr "Automaticky načítat a zobrazovat obrázky" + +#: ../midori/midori-preferences.c:515 +msgid "Shrink images automatically" +msgstr "Obrázky automaticky zmenšovat" + +#: ../midori/midori-preferences.c:516 +msgid "Automatically shrink standalone images to fit" +msgstr "Automaticky zmenšovat obrázky, aby se vešly" + +#: ../midori/midori-preferences.c:519 +msgid "Print background images" +msgstr "Tisknout obrázky na pozadí" + +#: ../midori/midori-preferences.c:520 +msgid "Whether background images should be printed" +msgstr "Mají být obrázky na pozadí tištěny?" + +#: ../midori/midori-preferences.c:523 +msgid "Resizable text areas" +msgstr "Roztažitelné oblasti pro text" + +#: ../midori/midori-preferences.c:524 +msgid "Whether text areas are resizable" +msgstr "Mohou se pole pro vstup textu roztahovat dle potřeby?" + +#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 +msgid "Enable scripts" +msgstr "Povolit skripty" + +#: ../midori/midori-preferences.c:528 +msgid "Enable embedded scripting languages" +msgstr "Povolit vložené skriptové jazyky" + +#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 +msgid "Enable plugins" +msgstr "Povolit pluginy" + +#: ../midori/midori-preferences.c:532 +msgid "Enable embedded plugin objects" +msgstr "Povolit pluginové objekty" + +#: ../midori/midori-preferences.c:535 +msgid "Enforce 96 dots per inch" +msgstr "Vnutit rozlišení 96 bodů/palec" + +#: ../midori/midori-preferences.c:536 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Vnutit rozlišení obrazu 96 bodů na palec" + +#: ../midori/midori-preferences.c:539 +msgid "Enable developer tools" +msgstr "Povolit vývojářské nástroje" + +#: ../midori/midori-preferences.c:540 +msgid "Enable special extensions for developers" +msgstr "Povolit speciální rozšíření pro vývojáře" + +#. Page "Interface" +#: ../midori/midori-preferences.c:548 +msgid "Interface" +msgstr "Rozhraní" + +#: ../midori/midori-preferences.c:549 +msgid "Navigationbar" +msgstr "Navigační lišta" + +#: ../midori/midori-preferences.c:560 +msgid "Browsing" +msgstr "Prohlížení" + +#. Page "Network" +#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 +msgid "Network" +msgstr "Síť" + +#: ../midori/midori-preferences.c:618 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:623 +msgid "Privacy" +msgstr "Soukromí" + +#: ../midori/midori-preferences.c:624 +msgid "Web Cookies" +msgstr "Web cookies" + +#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 +msgid "days" +msgstr "dny" + +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 +msgid "Empty" +msgstr "Prázdné" + +#: ../midori/midori-searchaction.c:904 +msgid "Add search engine" +msgstr "Přidat vyhledávací nástroj" + +#: ../midori/midori-searchaction.c:904 +msgid "Edit search engine" +msgstr "Upravit vyhledávací nástroj" + +#: ../midori/midori-searchaction.c:932 +msgid "_Name:" +msgstr "_Název:" + +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "_Ikona:" + +#: ../midori/midori-searchaction.c:990 +msgid "_Token:" +msgstr "_Zkratka:" + +#: ../midori/midori-searchaction.c:1195 +msgid "Manage Search Engines" +msgstr "Upravit vyhledávací nástroje" + +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Použít jako _výchozí" + +#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 +msgid "Could not run external program." +msgstr "Nemohu spustit externí program." + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:448 +msgid "Warning: You are using a superuser account!" +msgstr "Varování: jste přihlášen(a) jako superuživatel (root)!" + +#: ../midori/sokoke.c:780 +msgid "_Bookmark" +msgstr "_Záložky" + +#: ../midori/sokoke.c:782 +msgid "_Add Bookmark" +msgstr "_Přidat záložku" + +#: ../midori/sokoke.c:783 +msgid "_Console" +msgstr "_Konzola" + +#: ../midori/sokoke.c:784 +msgid "_Extensions" +msgstr "_Rozšíření" + +#: ../midori/sokoke.c:785 +msgid "_History" +msgstr "_Historie" + +#: ../midori/sokoke.c:786 +msgid "_Homepage" +msgstr "_Domovská stránka" + +#: ../midori/sokoke.c:787 +msgid "_Userscripts" +msgstr "_Uživatelské skripty" + +#: ../midori/sokoke.c:788 +msgid "User_styles" +msgstr "Uživatelské _styly" + +#: ../midori/sokoke.c:789 +msgid "New _Tab" +msgstr "Nová _karta" + +#: ../midori/sokoke.c:790 +msgid "_Transfers" +msgstr "_Přenosy" + +#: ../midori/sokoke.c:791 +msgid "P_lugins" +msgstr "P_luginy" + +#: ../midori/sokoke.c:792 +msgid "_Closed Tabs and Windows" +msgstr "Za_vřené karty a okna" + +#: ../midori/sokoke.c:793 +msgid "New _Window" +msgstr "Nové _okno" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "Uživatelské skripty" + +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "Uživatelské styly" + +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Povolit" + +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Povolit" + +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 +msgid "_Disable" +msgstr "_Zakázat" + +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Zakázat" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Záložky" + +#: ../panels/midori-bookmarks.c:240 +msgid "Edit the selected bookmark" +msgstr "Upravit vybranou záložku" + +#: ../panels/midori-bookmarks.c:248 +msgid "Delete the selected bookmark" +msgstr "Smazat vybranou záložku" + +#: ../panels/midori-bookmarks.c:593 +msgid "Separator" +msgstr "Oddělovač" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Konzola" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Rozšíření" + +#: ../panels/midori-history.c:163 +msgid "Are you sure you want to remove all history items?" +msgstr "Opravdu chcete smazat všechny položky historie?" + +#: ../panels/midori-history.c:218 +msgid "Bookmark the selected history item" +msgstr "Zazáložkovat vybranou položku historie" + +#: ../panels/midori-history.c:227 +msgid "Delete the selected history item" +msgstr "Smazat vybranou položku historie" + +#: ../panels/midori-history.c:235 +msgid "Clear the entire history" +msgstr "Smazat celou historii" + +#: ../panels/midori-history.c:600 +#, c-format +msgid "A week ago" +msgstr "Před týdnem" + +#: ../panels/midori-history.c:606 +#, c-format +msgid "%d days ago" +msgstr "Před %d dny" + +#: ../panels/midori-history.c:613 +msgid "Today" +msgstr "Dnes" + +#: ../panels/midori-history.c:615 +msgid "Yesterday" +msgstr "Včera" + +#: ../panels/midori-plugins.c:87 +msgid "Plugins" +msgstr "Pluginy" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s z %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Vyžadována autentikace" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "Pro otevření je vyžadováno jméno a heslo:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Jméno" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Heslo" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Ikona '%s' nemůže být načtena" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Uložená ikona '%s' nemůže být načtena" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Snímky animace jsou porušené" + +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Vlastnost '%s' je pro %s neplatná" + +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 +msgid "Choose file" +msgstr "Vybrat soubor" + +#: ../katze/katze-utils.c:235 +msgid "Choose folder" +msgstr "Vybrat adresář" + +#: ../extensions/colorful-tabs.c:104 +msgid "Tint tabs distinctly" +msgstr "Obarvit karty" + +#: ../extensions/colorful-tabs.c:140 +msgid "Colorful Tabs" +msgstr "Obarvené karty" + +#: ../extensions/colorful-tabs.c:141 +msgid "Tint each tab distinctly" +msgstr "Obarvit každou kartu zvlášť" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Na konci sezení" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Počítač: %s\n" +"Název: %s\n" +"Hodnota: %s\n" +"Cesta: %s\n" +"Zabezpečené: %s\n" +"Vyprší: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Ano" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Ne" + +#: ../extensions/cookie-manager.c:491 +msgid "Do you really want to delete all cookies?" +msgstr "Opravdu chcete smazat všechna cookies?" + +#: ../extensions/cookie-manager.c:493 +msgid "Question" +msgstr "Dotaz" + +#: ../extensions/cookie-manager.c:501 +msgid "" +"Only the visible cookies are deleted which match the entered filter string." +msgstr "Budou smazána cookies, která odpovídají filtračnímu řetězci." + +#: ../extensions/cookie-manager.c:679 +msgid "Name" +msgstr "Název" + +#: ../extensions/cookie-manager.c:739 +msgid "_Expand All" +msgstr "Rozbalit _vše" + +#: ../extensions/cookie-manager.c:747 +msgid "_Collapse All" +msgstr "_Sbalit vše" + +#: ../extensions/cookie-manager.c:818 +msgid "Delete All" +msgstr "Smazat vše" + +#: ../extensions/cookie-manager.c:820 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Smaže všechna zobrazená cookies. Jestliže je zapnut filtr, jsou smazána jen " +"ta cookies, která odpovídají." + +#: ../extensions/cookie-manager.c:835 +msgid "Expand All" +msgstr "Rozbalit vše" + +#: ../extensions/cookie-manager.c:842 +msgid "Collapse All" +msgstr "Sbalit vše" + +#: ../extensions/cookie-manager.c:873 +msgid "Filter:" +msgstr "Filtr:" + +#: ../extensions/cookie-manager.c:878 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle " +"názvu nebo domény" + +#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 +msgid "Cookie Manager" +msgstr "Správce cookies" + +#: ../extensions/cookie-manager.c:945 +msgid "_Cookie Manager" +msgstr "Správce _cookies" + +#: ../extensions/cookie-manager.c:962 +msgid "List, view and delete cookies" +msgstr "Seznam, detaily a mazání cookies" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Gesta myší" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Ovládat Midori pomocí myši" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Uživatelská stránka" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "_Uživatelská stránka" From 522b3ac678824f06ce68e8c42a2da2ca854c909a Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 28 Apr 2009 23:31:37 +0200 Subject: [PATCH 1071/2970] Prevent attempts to add duplicate feeds --- extensions/feed-panel/feed-panel.c | 71 ++++++++++++++--------- extensions/feed-panel/main.c | 91 ++++++++++++++++++++++-------- 2 files changed, 114 insertions(+), 48 deletions(-) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 1389e969..afa7f66f 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -131,7 +131,7 @@ feed_panel_treeview_render_text_cb (GtkTreeViewColumn* column, } static void -feed_panel_add_item_cb (KatzeArray* feed, +feed_panel_add_item_cb (KatzeArray* parent, KatzeItem* child, FeedPanel* panel) { @@ -141,33 +141,36 @@ feed_panel_add_item_cb (KatzeArray* feed, KatzeItem* item; gint i; - g_return_if_fail (KATZE_IS_ARRAY (feed)); + g_return_if_fail (KATZE_IS_ARRAY (parent)); g_return_if_fail (KATZE_IS_ITEM (child)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); - if (KATZE_IS_ARRAY (child)) + if (katze_item_get_parent (KATZE_ITEM (parent))) { - gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &child_iter, - NULL, G_MAXINT, 0, child, -1); - } - else - { - - i = 0; - while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++)) + if (KATZE_IS_ARRAY (child)) + { + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &child_iter, + NULL, G_MAXINT, 0, child, -1); + } + else { - gtk_tree_model_get (model, &iter, 0, &item, -1); - if (item == KATZE_ITEM (feed)) - { - gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &child_iter, - &iter, 0, 0, child, -1); - g_object_unref (child); + i = 0; + while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++)) + { + gtk_tree_model_get (model, &iter, 0, &item, -1); + if (item == KATZE_ITEM (parent)) + { + gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &child_iter, + &iter, 0, 0, child, -1); + + g_object_unref (child); + g_object_unref (item); + break; + } g_object_unref (item); - break; } - g_object_unref (item); } } feed_panel_insert_item (panel, GTK_TREE_STORE (model), &child_iter, child); @@ -199,21 +202,33 @@ feed_panel_remove_iter (GtkTreeModel* model, } static void -feed_panel_remove_item_cb (KatzeArray* feed, +feed_panel_remove_item_cb (KatzeArray* item, KatzeItem* child, FeedPanel* panel) { GtkTreeModel* model; + KatzeItem* pitem; - g_assert (KATZE_IS_ARRAY (feed)); + g_assert (KATZE_IS_ARRAY (item)); g_assert (KATZE_IS_ITEM (child)); if (KATZE_IS_ARRAY (child)) feed_panel_disconnect_feed (panel, KATZE_ARRAY (child)); + if (!katze_item_get_parent (KATZE_ITEM (item))) + { + gint n; + + n = katze_array_get_length (KATZE_ARRAY (child)); + g_assert (n == 1); + pitem = katze_array_get_nth_item (KATZE_ARRAY (child), 0); + } + else + pitem = child; + model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); - feed_panel_remove_iter (model, child); - g_object_unref (child); + feed_panel_remove_iter (model, pitem); + g_object_unref (pitem); } static void @@ -362,13 +377,17 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, if (date) { SoupDate* sdate; - const gchar* suri; + const gchar* puri; + KatzeItem* parent; sdate = soup_date_new_from_time_t ((time_t) date); - suri = (const gchar*)g_object_get_data (G_OBJECT (item), "feeduri"); + + parent = katze_item_get_parent (item); + g_assert (KATZE_IS_ARRAY (parent)); + puri = katze_item_get_uri (parent); text = g_strdup_printf ( "feed" "

%s

Last updated %s.", - suri, soup_date_to_string (sdate, SOUP_DATE_HTTP)); + puri, soup_date_to_string (sdate, SOUP_DATE_HTTP)); soup_date_free (sdate); } } diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 9f72973c..af360060 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -58,7 +58,6 @@ typedef struct enum { - FEED_NEW, FEED_READ, FEED_REMOVE }; @@ -104,10 +103,33 @@ feed_add_item (KatzeArray* feeds, if (uri) { - feed = katze_array_new (KATZE_TYPE_ITEM); - g_object_set_data_full (G_OBJECT (feed), "feeduri", - (gpointer) g_strdup ((uri)), g_free); - katze_array_add_item (feeds, feed); + if (katze_array_find_token (feeds, uri)) + { + GtkWidget* dialog; + + dialog = gtk_message_dialog_new ( + NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + _("Error")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("Feed %s already exists"), uri); + gtk_window_set_title (GTK_WINDOW (dialog), EXTENSION_NAME); + gtk_widget_show (dialog); + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), dialog); + + } + else + { + KatzeArray* child; + + feed = katze_array_new (KATZE_TYPE_ARRAY); + child = katze_array_new (KATZE_TYPE_ITEM); + katze_item_set_uri (KATZE_ITEM (feed), uri); + katze_item_set_token (KATZE_ITEM (feed), uri); + katze_item_set_uri (KATZE_ITEM (child), uri); + katze_array_add_item (feeds, feed); + katze_array_add_item (feed, child); + } } return feed; } @@ -129,7 +151,7 @@ feed_save_items (MidoriExtension* extension, for (i = 0; i < n; i++) { item = katze_array_get_nth_item (feed, i); - sfeeds[i] = (gchar*) g_object_get_data (G_OBJECT (item), "feeduri"); + sfeeds[i] = (gchar*) katze_item_get_uri (KATZE_ITEM (item)); } sfeeds[n] = NULL; @@ -141,12 +163,19 @@ static void feed_handle_net_error (FeedNetPrivate* netpriv, const gchar* msg) { + KatzeItem* child; const gchar* uri; + gint n; - uri = (gchar*) g_object_get_data (G_OBJECT (netpriv->feed), "feeduri"); - katze_item_set_name (KATZE_ITEM (netpriv->feed), uri); - katze_item_set_text (KATZE_ITEM (netpriv->feed), msg); - katze_item_set_uri (KATZE_ITEM (netpriv->feed), NULL); + n = katze_array_get_length (netpriv->feed); + g_assert (n == 1); + child = katze_array_get_nth_item (netpriv->feed, 0); + g_assert (KATZE_IS_ARRAY (child)); + + uri = katze_item_get_uri (KATZE_ITEM (netpriv->feed)); + katze_item_set_name (child, uri); + katze_item_set_text (child, msg); + katze_item_set_uri (child, NULL); feed_remove_flags (netpriv->feed, FEED_READ); } @@ -184,8 +213,19 @@ feed_transfer_cb (KatzeNetRequest* request, if (request->data) { + KatzeArray* item; + const gchar* uri; + gint n; + + n = katze_array_get_length (netpriv->feed); + g_assert (n == 1); + item = katze_array_get_nth_item (netpriv->feed, 0); + g_assert (KATZE_IS_ARRAY (item)); + uri = katze_item_get_uri (KATZE_ITEM (netpriv->feed)); + katze_item_set_uri (KATZE_ITEM (item), uri); + if (!parse_feed (request->data, request->length, - netpriv->parsers, netpriv->feed, &error)) + netpriv->parsers, item, &error)) { feed_handle_net_error (netpriv, error->message); g_error_free (error); @@ -216,11 +256,8 @@ update_feed (FeedPrivate* priv, if (!(feed_has_flags (feed, FEED_READ))) { FeedNetPrivate* netpriv; - gchar* uri; - uri = (gchar*) g_object_get_data (G_OBJECT (feed), "feeduri"); feed_add_flags (feed, FEED_READ); - katze_item_set_uri (KATZE_ITEM (feed), uri); netpriv = g_new0 (FeedNetPrivate, 1); netpriv->parsers = priv->parsers; netpriv->extension = priv->extension; @@ -272,9 +309,11 @@ secondary_icon_released_cb (GtkAction* action, KatzeArray* feed; feed = feed_add_item (priv->feeds, uri); - feed_save_items (priv->extension, priv->feeds); - feed_add_flags (feed, FEED_NEW); - update_feed (priv, KATZE_ITEM (feed)); + if (feed) + { + feed_save_items (priv->extension, priv->feeds); + update_feed (priv, KATZE_ITEM (feed)); + } } } @@ -324,9 +363,11 @@ panel_add_feed_cb (FeedPanel* panel, KatzeArray* feed; feed = feed_add_item (priv->feeds, uri); - feed_save_items (priv->extension, priv->feeds); - feed_add_flags (feed, FEED_NEW); - update_feed (priv, KATZE_ITEM (feed)); + if (feed) + { + feed_save_items (priv->extension, priv->feeds); + update_feed (priv, KATZE_ITEM (feed)); + } } } gtk_widget_destroy (dialog); @@ -334,10 +375,15 @@ panel_add_feed_cb (FeedPanel* panel, static void panel_remove_feed_cb (FeedPanel* panel, - KatzeArray* feed, + KatzeItem* item, FeedPrivate* priv) { + KatzeArray* feed; + + feed = katze_item_get_parent (item); + g_assert (KATZE_IS_ARRAY (priv->feeds)); + g_assert (KATZE_IS_ARRAY (feed)); if (feed_has_flags (feed, FEED_READ)) feed_add_flags (feed, FEED_REMOVE); @@ -394,7 +440,8 @@ feed_app_add_browser_cb (MidoriApp* app, if (sfeeds[i]) { feed = feed_add_item (feeds, sfeeds[i]); - update_feed (priv, KATZE_ITEM (feed)); + if (feed) + update_feed (priv, KATZE_ITEM (feed)); } } g_strdupv (sfeeds); From 3150e4e9db19fd2a966699985691f24c2d3173e6 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Tue, 28 Apr 2009 23:44:04 +0200 Subject: [PATCH 1072/2970] Allow horizontal scrollbars in the feed panel --- extensions/feed-panel/feed-panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index afa7f66f..167b4039 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -856,7 +856,7 @@ feed_panel_init (FeedPanel* panel) treewin = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (treewin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (treewin), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (treewin), treeview); From bd11e1c4f754ce5841e09c78b3c7cf7d1cdf6629 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 28 Apr 2009 23:49:52 +0200 Subject: [PATCH 1073/2970] Add Ask for destination folder preference The value is not functional yet --- midori/midori-websettings.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 6497632b..8681e2c0 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -50,6 +50,7 @@ struct _MidoriWebSettings gchar* homepage; gboolean show_crash_dialog; gchar* download_folder; + gboolean ask_for_destination_folder; gboolean notify_transfer_completed; gchar* download_manager; gchar* text_editor; @@ -121,6 +122,7 @@ enum PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, PROP_DOWNLOAD_FOLDER, + PROP_ASK_FOR_DESTINATION_FOLDER, PROP_NOTIFY_TRANSFER_COMPLETED, PROP_DOWNLOAD_MANAGER, PROP_TEXT_EDITOR, @@ -582,6 +584,26 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); #endif + /** + * MidoriWebSettings:ask-for-destination-folder: + * + * Whether to ask for the destination folder when downloading a file. + * + * Since: 0.1.7 + */ + g_object_class_install_property (gobject_class, + PROP_ASK_FOR_DESTINATION_FOLDER, + g_param_spec_boolean ( + "ask-for-destination-folder", + _("Ask for the destination folder"), + _("Whether to ask for the destination folder when downloading a file"), + FALSE, + #if WEBKIT_CHECK_VERSION (1, 1, 3) + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + #else + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + #endif + /** * MidoriWebSettings:notify-transfer-completed: * @@ -594,7 +616,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_boolean ( "notify-transfer-completed", _("Notify when a transfer has been completed"), - _("Whether to show a notification when a transfer has been completed"), + _("Whether to show a notification when a transfer has been completed"), TRUE, #if WEBKIT_CHECK_VERSION (1, 1, 3) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); @@ -721,7 +743,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) g_param_spec_boolean ( "open-tabs-next-to-current", _("Open Tabs next to Current"), - _("Whether to open new tabs next to the current tab or after the last one"), + _("Whether to open new tabs next to the current tab or after the last one"), TRUE, flags)); @@ -1100,6 +1122,9 @@ midori_web_settings_set_property (GObject* object, case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; + case PROP_ASK_FOR_DESTINATION_FOLDER: + web_settings->ask_for_destination_folder = g_value_get_boolean (value); + break; case PROP_NOTIFY_TRANSFER_COMPLETED: web_settings->notify_transfer_completed = g_value_get_boolean (value); break; @@ -1302,6 +1327,9 @@ midori_web_settings_get_property (GObject* object, case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); break; + case PROP_ASK_FOR_DESTINATION_FOLDER: + g_value_set_boolean (value, web_settings->ask_for_destination_folder); + break; case PROP_NOTIFY_TRANSFER_COMPLETED: g_value_set_boolean (value, web_settings->notify_transfer_completed); break; From a40cd75d14a34d0c47c73cee394d4271a0b7ef7f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 28 Apr 2009 23:52:16 +0200 Subject: [PATCH 1074/2970] Add new transfer preferences and new Applications tab --- midori/midori-preferences.c | 100 ++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 44 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c85760c5..530de62e 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -327,6 +327,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; + gchar* program; g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -421,55 +422,19 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "show-crash-dialog", NULL); SPANNED_ADD (button, 0, 2, 2, 3); FRAME_NEW (_("Transfers")); - TABLE_NEW (4, 2); - #if WEBKIT_CHECK_VERSION (1, 1, 3) + TABLE_NEW (2, 2); label = katze_property_label (settings, "download-folder"); INDENTED_ADD (label, 0, 1, 0, 1); button = katze_property_proxy (settings, "download-folder", "folder"); FILLED_ADD (button, 1, 2, 0, 1); - #endif - label = katze_property_label (settings, "download-manager"); + label = katze_property_proxy (settings, "ask-for-destination-folder", NULL); + gtk_widget_set_sensitive (label, FALSE); INDENTED_ADD (label, 0, 1, 1, 2); - hbox = gtk_hbox_new (FALSE, 4); - button = gtk_image_new (); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - gtk_widget_set_size_request (button, icon_width, icon_height); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - entry = katze_property_proxy (settings, "download-manager", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_download_manager_icon_cb), button); - FILLED_ADD (hbox, 1, 2, 1, 2); - label = katze_property_label (settings, "text-editor"); - INDENTED_ADD (label, 0, 1, 2, 3); - hbox = gtk_hbox_new (FALSE, 4); - button = gtk_image_new (); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - gtk_widget_set_size_request (button, icon_width, icon_height); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - entry = katze_property_proxy (settings, "text-editor", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_download_manager_icon_cb), button); - FILLED_ADD (hbox, 1, 2, 2, 3); - label = katze_property_label (settings, "news-aggregator"); - INDENTED_ADD (label, 0, 1, 3, 4); - hbox = gtk_hbox_new (FALSE, 4); - button = gtk_image_new (); - gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), - GTK_ICON_SIZE_MENU, &icon_width, &icon_height); - gtk_widget_set_size_request (button, icon_width, icon_height); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); - entry = katze_property_proxy (settings, "news-aggregator", NULL); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); - g_signal_connect (entry, "focus-out-event", - G_CALLBACK (proxy_download_manager_icon_cb), button); - FILLED_ADD (hbox, 1, 2, 3, 4); + button = katze_property_proxy (settings, "notify-transfer-completed", NULL); + if (!((program = g_find_program_in_path ("notify-send")))) + gtk_widget_set_sensitive (button, FALSE); + g_free (program); + SPANNED_ADD (button, 1, 2, 1, 2); /* Page "Appearance" */ PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Appearance")); @@ -592,6 +557,53 @@ midori_preferences_set_settings (MidoriPreferences* preferences, button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL); WIDGET_ADD (button, 1, 2, 5, 6); + /* Page "Applications" */ + PAGE_NEW (GTK_STOCK_CONVERT, _("Applications")); + FRAME_NEW (_("External applications")); + TABLE_NEW (3, 2); + label = katze_property_label (settings, "text-editor"); + INDENTED_ADD (label, 0, 1, 0, 1); + hbox = gtk_hbox_new (FALSE, 4); + button = gtk_image_new (); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + gtk_widget_set_size_request (button, icon_width, icon_height); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); + entry = katze_property_proxy (settings, "text-editor", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_download_manager_icon_cb), button); + FILLED_ADD (hbox, 1, 2, 0, 1); + label = katze_property_label (settings, "download-manager"); + INDENTED_ADD (label, 0, 1, 1, 2); + hbox = gtk_hbox_new (FALSE, 4); + button = gtk_image_new (); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + gtk_widget_set_size_request (button, icon_width, icon_height); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); + entry = katze_property_proxy (settings, "download-manager", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_download_manager_icon_cb), button); + FILLED_ADD (hbox, 1, 2, 1, 2); + label = katze_property_label (settings, "news-aggregator"); + INDENTED_ADD (label, 0, 1, 2, 3); + hbox = gtk_hbox_new (FALSE, 4); + button = gtk_image_new (); + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &icon_width, &icon_height); + gtk_widget_set_size_request (button, icon_width, icon_height); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 4); + entry = katze_property_proxy (settings, "news-aggregator", NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + proxy_download_manager_icon_cb (entry, NULL, GTK_IMAGE (button)); + g_signal_connect (entry, "focus-out-event", + G_CALLBACK (proxy_download_manager_icon_cb), button); + FILLED_ADD (hbox, 1, 2, 2, 3); + /* Page "Network" */ PAGE_NEW (GTK_STOCK_NETWORK, _("Network")); FRAME_NEW (_("Network")); From be803ad76557469bf543daa271d2b443aa49e007 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 28 Apr 2009 23:57:56 +0200 Subject: [PATCH 1075/2970] Add a description to Statusbar Features and localize it --- extensions/statusbar-features.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c index b7e0ff1a..ede0798a 100644 --- a/extensions/statusbar-features.c +++ b/extensions/statusbar-features.c @@ -101,8 +101,8 @@ MidoriExtension* extension_init (void) { MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", "Statusbar Features", - "description", "", + "name", _("Statusbar Features"), + "description", _("Easily toggle features on web pages on and off"), "version", "0.1", "authors", "Christian Dywan ", NULL); From bd002e9a7b5104ab6a536487e3e3507f3ea0b744 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Apr 2009 00:16:26 +0200 Subject: [PATCH 1076/2970] Fix 'Refresh' menu item localization in the context menu --- midori/midori-view.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 426271e5..060c7fb4 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -25,14 +25,6 @@ #include #include -#if GLIB_CHECK_VERSION (2, 18, 0) - #define D_(__domain, __message) g_dgettext (__domain, __message) -#elif ENABLE_NLS - #define D_(__domain, __message) dgettext (__domain, __message) -#else - #define D_(__domain, __message) __message -#endif - /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); @@ -1111,8 +1103,12 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, /* hack to localize menu item */ if (GTK_IS_BIN (menuitem)) { - label = gtk_bin_get_child (GTK_BIN (menuitem)); - gtk_label_set_label (GTK_LABEL (label), D_("gtk20", "_Refresh")); + GtkStockItem stock_item; + if (gtk_stock_lookup (GTK_STOCK_REFRESH, &stock_item)) + { + label = gtk_bin_get_child (GTK_BIN (menuitem)); + gtk_label_set_label (GTK_LABEL (label), stock_item.label); + } } g_list_free (items); menuitem = gtk_image_menu_item_new_with_mnemonic (_("Undo Close Tab")); From 0506d046018dd7b4198ce21d0cd2f59a4d7b05db Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Apr 2009 00:42:47 +0200 Subject: [PATCH 1077/2970] Add Spell Checking preferences to the dialogue We need to think of a better way to choose dictionaries than a mere text entry. --- midori/midori-preferences.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 530de62e..fcb0f43d 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -514,6 +514,17 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button, 0, 1, 4, 5); button = katze_property_proxy (settings, "find-while-typing", NULL); SPANNED_ADD (button, 1, 2, 4, 5); + #if WEBKIT_CHECK_VERSION (1, 1, 6) + FRAME_NEW (_("Spell Checking")); + TABLE_NEW (1, 2); + button = katze_property_proxy (settings, "enable-spell-checking", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking")); + gtk_widget_set_tooltip_text (button, _("Enables spell checking while typing")); + INDENTED_ADD (button, 0, 1, 0, 1); + entry = katze_property_proxy (settings, "spell-checking-languages", NULL); + gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages to be used for spell checking")); + FILLED_ADD (entry, 1, 2, 0, 1); + #endif /* Page "Interface" */ PAGE_NEW (GTK_STOCK_CONVERT, _("Interface")); From f8b10d85137dc28c5ed9c21abd8a544f06f94a14 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Apr 2009 17:35:36 +0200 Subject: [PATCH 1078/2970] Add example to the spell checking language tooltip --- midori/midori-preferences.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index fcb0f43d..d46dd413 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -522,7 +522,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_widget_set_tooltip_text (button, _("Enables spell checking while typing")); INDENTED_ADD (button, 0, 1, 0, 1); entry = katze_property_proxy (settings, "spell-checking-languages", NULL); - gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages to be used for spell checking")); + gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"")); FILLED_ADD (entry, 1, 2, 0, 1); #endif From 9e5477815abf6ee1a6164db496e1e147dbabe46b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Apr 2009 17:42:36 +0200 Subject: [PATCH 1079/2970] Wrap XML element names in error messages in quotes --- extensions/feed-panel/feed-atom.c | 4 ++-- extensions/feed-panel/feed-rss.c | 10 +++++----- extensions/feed-panel/main.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/feed-panel/feed-atom.c b/extensions/feed-panel/feed-atom.c index 9731d688..def46f61 100644 --- a/extensions/feed-panel/feed-atom.c +++ b/extensions/feed-panel/feed-atom.c @@ -214,7 +214,7 @@ atom_postparse_entry (FeedParser* fparser) !katze_item_get_added (fparser->item)) { feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, - _("Failed to find required Atom entry elements in XML data.")); + _("Failed to find required Atom \"entry\" elements in XML data.")); } } @@ -320,7 +320,7 @@ atom_postparse_feed (FeedParser* fparser) !katze_item_get_added (fparser->item)) { feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, - _("Failed to find required Atom feed elements in XML data.")); + _("Failed to find required Atom \"feed\" elements in XML data.")); } } } diff --git a/extensions/feed-panel/feed-rss.c b/extensions/feed-panel/feed-rss.c index d830806e..84fd6d3b 100644 --- a/extensions/feed-panel/feed-rss.c +++ b/extensions/feed-panel/feed-rss.c @@ -43,7 +43,7 @@ rss_is_valid (FeedParser* fparser) } feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, - _("Failed to find channel element in RSS XML data.")); + _("Failed to find \"channel\" element in RSS XML data.")); } else { @@ -134,14 +134,14 @@ rss_postparse_item (FeedParser* fparser) if (!*fparser->error) { /* - * Verify that the required Atom elements are added + * Verify that the required RSS elements are added * (as per the spec) */ if (!katze_item_get_name (fparser->item) && !katze_item_get_text (fparser->item)) { feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, - _("Failed to find required RSS item elements in XML data.")); + _("Failed to find required RSS \"item\" elements in XML data.")); } } @@ -218,7 +218,7 @@ rss_postparse_channel (FeedParser* fparser) if (!*fparser->error) { /* - * Verify that the required Atom elements are added + * Verify that the required RSS elements are added * (as per the spec) */ if (!katze_item_get_name (fparser->item) || @@ -226,7 +226,7 @@ rss_postparse_channel (FeedParser* fparser) !katze_item_get_uri (fparser->item)) { feed_parser_set_error (fparser, FEED_PARSE_ERROR_MISSING_ELEMENT, - _("Failed to find required RSS channel elements in XML data.")); + _("Failed to find required RSS \"channel\" elements in XML data.")); } } } diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index af360060..38fba899 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -15,7 +15,7 @@ #include -#define EXTENSION_NAME "FeedPanel" +#define EXTENSION_NAME "Feed Panel" #define UPDATE_FREQ 10 #define feed_get_flags(feed) \ From 5257a9e6c55edd9d957a6dc96e920381bbdc0672 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Apr 2009 17:44:12 +0200 Subject: [PATCH 1080/2970] Correct 'Enables spell checking' to 'Enable spell checking' --- midori/midori-preferences.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index d46dd413..32c9aaaa 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -519,7 +519,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, TABLE_NEW (1, 2); button = katze_property_proxy (settings, "enable-spell-checking", NULL); gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking")); - gtk_widget_set_tooltip_text (button, _("Enables spell checking while typing")); + gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing")); INDENTED_ADD (button, 0, 1, 0, 1); entry = katze_property_proxy (settings, "spell-checking-languages", NULL); gtk_widget_set_tooltip_text (entry, _("A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"")); From b7e852fe09381e32a017aea85eab3b89f6ddd7b7 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 29 Apr 2009 23:46:41 +0200 Subject: [PATCH 1081/2970] Localize 'Last updated' display of feeds and quote URIs --- extensions/feed-panel/feed-panel.c | 19 ++++++++++++++----- extensions/feed-panel/main.c | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 167b4039..d8212a8a 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -376,19 +376,28 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, date = katze_item_get_added (item); if (date) { - SoupDate* sdate; + time_t date_t; + const struct tm* tm; + static gchar date_format[512]; const gchar* puri; KatzeItem* parent; - sdate = soup_date_new_from_time_t ((time_t) date); + gchar* last_updated; + date_t = (time_t)date; + tm = localtime (&date_t); + /* Some gcc versions complain about "%c" for no reason */ + strftime (date_format, sizeof (date_format), "%c", tm); parent = katze_item_get_parent (item); g_assert (KATZE_IS_ARRAY (parent)); puri = katze_item_get_uri (parent); + /* i18n: The local date a feed was last updated */ + last_updated = g_strdup_printf (C_("Feed", "Last updated: %s."), + date_format); text = g_strdup_printf ( "feed" - "

%s

Last updated %s.", - puri, soup_date_to_string (sdate, SOUP_DATE_HTTP)); - soup_date_free (sdate); + "

%s

%s", + puri, last_updated); + g_free (last_updated); } } webkit_web_view_load_html_string ( diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c index 38fba899..d0a13092 100644 --- a/extensions/feed-panel/main.c +++ b/extensions/feed-panel/main.c @@ -111,7 +111,7 @@ feed_add_item (KatzeArray* feeds, NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Feed %s already exists"), uri); + _("Feed '%s' already exists"), uri); gtk_window_set_title (GTK_WINDOW (dialog), EXTENSION_NAME); gtk_widget_show (dialog); g_signal_connect_swapped (dialog, "response", @@ -188,7 +188,7 @@ feed_status_cb (KatzeNetRequest* request, { gchar* msg; - msg = g_strdup_printf (_("Error loading feed %s"), + msg = g_strdup_printf (_("Error loading feed '%s'"), katze_item_get_uri (KATZE_ITEM (netpriv->feed))); feed_handle_net_error (netpriv, msg); g_free (msg); From eb606ecdad241dfbabf7f39f4e2397fe0f8af0b5 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Wed, 29 Apr 2009 23:53:59 +0200 Subject: [PATCH 1082/2970] Leave 'added' stamp of history items to fix duplicate detection Only the 'added' value of parents shall contain the age in days. --- midori/midori-browser.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index cb04bb3c..041643a5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3784,7 +3784,6 @@ midori_browser_new_history_item (MidoriBrowser* browser, time_t now; gint64 day; gint64 pday; - gint64 age; gint64 newage; gchar token[50]; @@ -3797,15 +3796,12 @@ midori_browser_new_history_item (MidoriBrowser* browser, while ((parent = katze_array_get_nth_item (browser->history, i++))) { pday = katze_item_get_added (KATZE_ITEM (parent)); - age = katze_item_get_added (item); newage = day - pday; if (newage == 0) { found = TRUE; katze_array_add_item (parent, item); } - if (age != newage) - katze_item_set_added (item, newage); } if (!found) { From adc29bb645c7579511b075379f763c7da261b91a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Marques?= Date: Thu, 30 Apr 2009 00:07:59 +0200 Subject: [PATCH 1083/2970] Update Portuguese translation --- po/pt_PT.po | 90 ++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 344ba6df..8a065ac7 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -46,7 +46,7 @@ msgstr "O valor '%s' é inválido para %s" #: ../midori/main.c:228 #, c-format msgid "Invalid configuration value '%s'" -msgstr "Valor de configuração inválido '%s'" +msgstr "Valor de configuração '%s' inválido " #: ../midori/main.c:332 #, c-format @@ -56,7 +56,7 @@ msgstr "Falha ao abrir a base de dados: %s\n" #: ../midori/main.c:364 #, c-format msgid "Failed to execute database statement: %s\n" -msgstr "Falha ao executar a declaração da base de dados: %s\n" +msgstr "Falha ao executar o relatório da base de dados: %s\n" #: ../midori/main.c:418 #, c-format @@ -128,7 +128,7 @@ msgstr "Desactivar todas as _extensões" #: ../midori/main.c:1288 msgid "No filename specified" -msgstr "Nenhum nome especificado" +msgstr "Nenhum nome especificado" #: ../midori/main.c:1311 msgid "An unknown error occured." @@ -176,11 +176,11 @@ msgstr "Verificar por novas versões a:" #: ../midori/main.c:1454 msgid "The specified configuration folder is invalid." -msgstr "A pasta de configuração especificada é inválida" +msgstr "A pasta de configuração especificada é inválida." #: ../midori/main.c:1489 msgid "An instance of Midori is already running but not responding.\n" -msgstr "Já existe uma instância de Midori em execução mas que não está respondendo.\n" +msgstr "Já existe uma instância de Midori em execução mas não está respondendo.\n" #: ../midori/main.c:1539 #, c-format @@ -413,7 +413,7 @@ msgstr "Copiar o texto seleccionado" #: ../midori/midori-browser.c:3340 msgid "Paste text from the clipboard" -msgstr "Colar itens da área de transferência" +msgstr "Colar texto da área de transferência" #: ../midori/midori-browser.c:3343 msgid "Delete the selected text" @@ -425,11 +425,11 @@ msgstr "Seleccionar tudo" #: ../midori/midori-browser.c:3349 msgid "Find a word or phrase in the page" -msgstr "Localizar uma palavra ou frase na página" +msgstr "Localizar palavra ou frase na página" #: ../midori/midori-browser.c:3351 msgid "Find _Next" -msgstr "Localizar _Próxima" +msgstr "_Localizar Próxima" #: ../midori/midori-browser.c:3352 msgid "Find the next occurrence of a word or phrase" @@ -441,7 +441,7 @@ msgstr "Localizar _Anterior" #: ../midori/midori-browser.c:3355 msgid "Find the previous occurrence of a word or phrase" -msgstr "Localizar a ocurrência anterior de uma palavra ou frase" +msgstr "Localizar a ocorrência anterior da palavra ou frase" #: ../midori/midori-browser.c:3358 msgid "_Quick Find" @@ -473,7 +473,7 @@ msgstr "Diminuir Zoom" #: ../midori/midori-browser.c:3383 msgid "Reset the zoom level" -msgstr "Restaurar Zoom" +msgstr "Repor Zoom" #: ../midori/midori-browser.c:3384 msgid "_Encoding" @@ -584,12 +584,12 @@ msgstr "Adicionar nova pasta de marcadores" #: ../midori/midori-browser.c:3440 msgid "_Tools" -msgstr "_Ferramentas" +msgstr "Ferramen_tas" #: ../midori/midori-browser.c:3442 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" -msgstr "Gerir _Motores de Pesquisa" +msgstr "Gerir Motores de _Pesquisa" #: ../midori/midori-browser.c:3443 msgid "Add, edit and remove search engines..." @@ -597,7 +597,7 @@ msgstr "Adicionar, editar e remover motores de pesquisa..." #: ../midori/midori-browser.c:3446 msgid "_Clear Private Data" -msgstr "'Flash'" +msgstr "_Limpar dados privados" #: ../midori/midori-browser.c:3447 msgid "Clear private data..." @@ -617,7 +617,7 @@ msgstr "_Próximo Separador" #: ../midori/midori-browser.c:3455 msgid "Switch to the next tab" -msgstr "Trocar para próximo separador" +msgstr "Mudar para próximo separador" #: ../midori/midori-browser.c:3457 msgid "_Help" @@ -792,7 +792,7 @@ msgstr "Separar da janela o painel escolhido" #: ../midori/midori-panel.c:311 msgid "Whether to detach the chosen panel from the window" -msgstr "Se quer separar da janela o painel escolhido" +msgstr "Marque se quiser separar da janela o painel escolhido" #: ../midori/midori-panel.c:321 #: ../midori/midori-websettings.c:531 @@ -802,7 +802,7 @@ msgstr "Alinhar painel lateral à direita" #: ../midori/midori-panel.c:323 #: ../midori/midori-websettings.c:532 msgid "Whether to align the sidepanel on the right" -msgstr "Se alinha painel lateral na direita" +msgstr "Marque se quiser alinhar o painel lateral à direita" #: ../midori/midori-panel.c:333 #: ../midori/midori-panel.c:334 @@ -886,7 +886,7 @@ msgstr "Lembrar último tamanho de janela" #: ../midori/midori-websettings.c:330 msgid "Whether to save the last window size" -msgstr "Se guarda o último tamanho de janela" +msgstr "Marque se quiser guardar o último tamanho de janela" #: ../midori/midori-websettings.c:338 msgid "Last window width" @@ -923,7 +923,7 @@ msgstr "Última posição de painel de página guardada" #: ../midori/midori-websettings.c:392 msgid "Last Web search" -msgstr "Última pesquisa na Web" +msgstr "Última pesquisa Web" #: ../midori/midori-websettings.c:393 msgid "The last saved Web search" @@ -935,7 +935,7 @@ msgstr "Mostrar Barra de Menu" #: ../midori/midori-websettings.c:403 msgid "Whether to show the menubar" -msgstr "Se mostra a barra de menu" +msgstr "Marque se quiser mostrar a barra de menu" #: ../midori/midori-websettings.c:411 msgid "Show Navigationbar" @@ -943,7 +943,7 @@ msgstr "Mostrar Barra de Navegação" #: ../midori/midori-websettings.c:412 msgid "Whether to show the navigationbar" -msgstr "Se mostra a barra de navegação" +msgstr "Marque se quiser mostrar a barra de navegação" #: ../midori/midori-websettings.c:420 msgid "Show Bookmarkbar" @@ -951,7 +951,7 @@ msgstr "Mostrar Barra de Marcadores" #: ../midori/midori-websettings.c:421 msgid "Whether to show the bookmarkbar" -msgstr "Se mostra a barra de marcadores" +msgstr "Marque se quiser mostrar a barra de marcadores" #: ../midori/midori-websettings.c:429 msgid "Show Panel" @@ -959,7 +959,7 @@ msgstr "Mostrar Painel" #: ../midori/midori-websettings.c:430 msgid "Whether to show the panel" -msgstr "Se mostra o painel" +msgstr "Marque se quiser mostrar o painel" #: ../midori/midori-websettings.c:445 msgid "Show Transferbar" @@ -967,7 +967,7 @@ msgstr "Mostrar barra de transferências" #: ../midori/midori-websettings.c:446 msgid "Whether to show the transferbar" -msgstr "Se mostra a barra de transferências" +msgstr "Marque se quiser mostrar a barra de transferências" #: ../midori/midori-websettings.c:454 msgid "Show Statusbar" @@ -975,7 +975,7 @@ msgstr "Mostrar Barra de Estado" #: ../midori/midori-websettings.c:455 msgid "Whether to show the statusbar" -msgstr "Se mostra a barra de estado" +msgstr "Marque se quiser mostrar a barra de estado" #: ../midori/midori-websettings.c:464 msgid "Toolbar Style" @@ -991,7 +991,7 @@ msgstr "Mostrar evolução na entrada de localização" #: ../midori/midori-websettings.c:482 msgid "Whether to show loading progress in the location entry" -msgstr "Se mostra evolução de carregamento na entrada de localização" +msgstr "Marque se quiser mostrar a evolução do carregamento na entrada de localização" #: ../midori/midori-websettings.c:497 msgid "Search engines in location completion" @@ -999,7 +999,7 @@ msgstr "Motores de pesquisa na conclusão da localização" #: ../midori/midori-websettings.c:498 msgid "Whether to show search engines in the location completion" -msgstr "Se quer mostrar motores de pesquisa na conclusão da localização" +msgstr "Marque se quiser mostrar motores de pesquisa na conclusão da localização" #: ../midori/midori-websettings.c:506 msgid "Toolbar Items" @@ -1015,7 +1015,7 @@ msgstr "Compactar Painel Lateral" #: ../midori/midori-websettings.c:516 msgid "Whether to make the sidepanel compact" -msgstr "Se implica compactação do painel lateral" +msgstr "Marque se quiser compactar o painel lateral" #: ../midori/midori-websettings.c:541 msgid "Load on Startup" @@ -1099,7 +1099,7 @@ msgstr "Ícone Fechar nos Separadores" #: ../midori/midori-websettings.c:653 msgid "Whether tabs have close buttons" -msgstr "Se separadores têm botões para fechar" +msgstr "Marque se quiser que os separadores tenham botões para fechar" #: ../midori/midori-websettings.c:661 msgid "Open new pages in" @@ -1131,7 +1131,7 @@ msgstr "Abrir separadores em segundo plano" #: ../midori/midori-websettings.c:695 msgid "Whether to open new tabs in the background" -msgstr "Se abre novos separadores em segundo plano" +msgstr "Marque se quiser abrir os novos separadores em segundo plano" #: ../midori/midori-websettings.c:703 msgid "Open Tabs next to Current" @@ -1139,7 +1139,7 @@ msgstr "Abrir Separadores perto do Actual" #: ../midori/midori-websettings.c:704 msgid "Whether to open new tabs next to the current tab or after the last one" -msgstr "Se abre novos separadores perto do actual ou após o último " +msgstr "Marque se quiser abrir os novos separadores perto do actual ou após o último " #: ../midori/midori-websettings.c:712 msgid "Open popups in tabs" @@ -1147,7 +1147,7 @@ msgstr "Abrir popups em separadores" #: ../midori/midori-websettings.c:713 msgid "Whether to open popup windows in tabs" -msgstr "Se abre janelas popup em separadores" +msgstr "Marque se quiser abrir janelas popup em separadores" #: ../midori/midori-websettings.c:729 msgid "Zoom Text and Images" @@ -1155,7 +1155,7 @@ msgstr "Zoom de Texto e Imagens" #: ../midori/midori-websettings.c:730 msgid "Whether to zoom text and images" -msgstr "Se ajusta zoom de texto e imagens" +msgstr "Marque se quiser ajustar zoom de texto e imagens" #: ../midori/midori-websettings.c:745 msgid "Find inline while typing" @@ -1163,7 +1163,7 @@ msgstr "Encontrar ao escrever" #: ../midori/midori-websettings.c:746 msgid "Whether to automatically find inline while typing" -msgstr "Se deve encontrar automaticamente ao escrever" +msgstr "Marque se quiser encontrar automaticamente ao escrever" #: ../midori/midori-websettings.c:754 msgid "Accept cookies" @@ -1195,7 +1195,7 @@ msgstr "Lembrar últimas páginas visitadas" #: ../midori/midori-websettings.c:785 msgid "Whether the last visited pages are saved" -msgstr "Se as últimas páginas visitadas são guardadas" +msgstr "Marque se quiser guardar as últimas páginas visitadas" #: ../midori/midori-websettings.c:793 msgid "Maximum history age" @@ -1211,7 +1211,7 @@ msgstr "Lembrar dados de formulários" #: ../midori/midori-websettings.c:803 msgid "Whether the last form inputs are saved" -msgstr "Se os dados de formulário são guardados" +msgstr "Marque se quiser guardar os dados de formulário" #: ../midori/midori-websettings.c:811 msgid "Remember last downloaded files" @@ -1219,7 +1219,7 @@ msgstr "Lembrar últimas transferências " #: ../midori/midori-websettings.c:812 msgid "Whether the last downloaded files are saved" -msgstr "Se as últimas transferências são guardadas" +msgstr "Marque se quiser guardar as últimas transferências" #: ../midori/midori-websettings.c:822 msgid "Proxy Server" @@ -1235,7 +1235,7 @@ msgstr "Detectar servidor proxy automaticamente" #: ../midori/midori-websettings.c:839 msgid "Whether to detect the proxy server automatically from the environment" -msgstr "Se deve detectar automaticamente o servidor proxy do ambiente" +msgstr "Marque se quiser detectar automaticamente o servidor proxy do ambiente" #. i18n: This refers to an application, not the 'user agent' string #: ../midori/midori-websettings.c:855 @@ -1319,7 +1319,7 @@ msgstr "Tipo de Ficheiro: '%s' " #: ../midori/midori-view.c:1254 #, c-format msgid "File Type: %s ('%s')" -msgstr "Tipo de ficheiro: %s ('%s')" +msgstr "Tipo de Ficheiro: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" #: ../midori/midori-view.c:1258 @@ -1372,7 +1372,7 @@ msgstr "Aparência" #: ../midori/midori-preferences.c:476 msgid "Font settings" -msgstr "Definições de fontes" +msgstr "Definição de fontes" #: ../midori/midori-preferences.c:478 msgid "Default Font Family" @@ -1384,7 +1384,7 @@ msgstr "O tamanho padrão de fonte para apresentar texto" #: ../midori/midori-preferences.c:487 msgid "Minimum Font Size" -msgstr "Tmanho Mínimo de Fonte" +msgstr "Tamanho Mínimo de Fonte" #: ../midori/midori-preferences.c:490 msgid "The minimum font size used to display text" @@ -1422,7 +1422,7 @@ msgstr "Encolher imagens automaticamente" #: ../midori/midori-preferences.c:516 msgid "Automatically shrink standalone images to fit" -msgstr "Encolher imagens automaticamente" +msgstr "Encolher imagens automaticamente para caber" #: ../midori/midori-preferences.c:519 msgid "Print background images" @@ -1430,7 +1430,7 @@ msgstr "Imprimir imagens em segundo plano" #: ../midori/midori-preferences.c:520 msgid "Whether background images should be printed" -msgstr "Se imagens em segundo plano devem ser impressas" +msgstr "Marque se quiser imprimir as imagens em segundo plano" #: ../midori/midori-preferences.c:523 msgid "Resizable text areas" @@ -1438,7 +1438,7 @@ msgstr "Áreas de texto dimensionáveis" #: ../midori/midori-preferences.c:524 msgid "Whether text areas are resizable" -msgstr "Se as áreas de texto são redimensionáveis" +msgstr "Marque se quiser redimensionar as áreas de texto" #: ../midori/midori-preferences.c:527 #: ../extensions/statusbar-features.c:63 @@ -1460,7 +1460,7 @@ msgstr "Activar plugin de objectos incorporados" #: ../midori/midori-preferences.c:535 msgid "Enforce 96 dots per inch" -msgstr "Forçar 96 pontos por polegalda" +msgstr "Forçar 96 pontos por polegada" #: ../midori/midori-preferences.c:536 msgid "Enforce a video dot density of 96 DPI" @@ -1588,7 +1588,7 @@ msgstr "E_stilos de Utilizador" #: ../midori/sokoke.c:789 msgid "New _Tab" -msgstr "Novo _Separador" +msgstr "_Novo Separador" #: ../midori/sokoke.c:790 msgid "_Transfers" From a245be912fbd8b36ebfc6db9f7a8b3e1ebd93a61 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Apr 2009 00:18:10 +0200 Subject: [PATCH 1084/2970] Update German translation --- po/de.po | 980 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 565 insertions(+), 415 deletions(-) diff --git a/po/de.po b/po/de.po index 6daa9d24..0c00448f 100644 --- a/po/de.po +++ b/po/de.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.5\n" +"Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" -"PO-Revision-Date: 2009-04-19 15:34+0100\n" +"POT-Creation-Date: 2009-04-29 22:36+0200\n" +"PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -21,9 +21,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Schlanker Internetbetrachter" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 -#: ../midori/main.c:1396 ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 +#: ../midori/main.c:1423 ../midori/main.c:1434 +#: ../midori/midori-websettings.c:275 msgid "Midori" msgstr "Midori" @@ -31,79 +31,79 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetbetrachter" -#: ../midori/main.c:94 +#: ../midori/main.c:95 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Die Konfiguration konnte nicht geladen werden: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Wert »%s« ist ungültig für %s" -#: ../midori/main.c:156 ../midori/main.c:228 +#: ../midori/main.c:157 ../midori/main.c:237 #, c-format msgid "Invalid configuration value '%s'" msgstr "Ungültiger Einstellungswert »%s«" -#: ../midori/main.c:332 +#: ../midori/main.c:349 #, c-format msgid "Failed to open database: %s\n" msgstr "Datenbank konnte nicht geöffnet werden: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:381 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Datenbankabfrage konnte nicht ausgeführt werden: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:435 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:459 #, c-format msgid "Failed to clear history: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 #, c-format msgid "Failed to add history item: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:711 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Verlaufseintrag konnte nicht entfernt werden: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:740 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Die Konfiguration konnte nicht geladen werden. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:769 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s" -#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Die Lesezeichen konnten nicht geladen werden. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 ../midori/main.c:873 +#: ../midori/main.c:868 ../midori/main.c:891 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Der Papierkorb konnte nicht gespeichert werden. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:964 #, c-format msgid "The session couldn't be saved. %s" msgstr "Die Sitzung konnte nicht geladen werden. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1091 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -111,104 +111,104 @@ msgstr "" "Midori ist offenbar abgestürzt nachdem es das letzte Mal geöffnet wurde. " "Probieren Sie folgende Möglichkeiten falls dies vermehrt vorkommt." -#: ../midori/main.c:1088 +#: ../midori/main.c:1106 msgid "Modify _preferences" msgstr "_Einstellungen bearbeiten" -#: ../midori/main.c:1092 +#: ../midori/main.c:1110 msgid "Reset the last _session" msgstr "Die letzte _Sitzung zurücksetzen" -#: ../midori/main.c:1097 +#: ../midori/main.c:1115 msgid "Disable all _extensions" msgstr "Alle Er_weiterungen ausschalten" -#: ../midori/main.c:1288 +#: ../midori/main.c:1314 msgid "No filename specified" msgstr "Kein Dateiname angegeben" -#: ../midori/main.c:1311 +#: ../midori/main.c:1337 msgid "An unknown error occured." msgstr "Ein unbekannter Fehler ist aufgetreten." -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "Run ADDRESS as a web application" msgstr "ADRESSE als Internetanwendung starten" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "ADDRESS" msgstr "ADRESSE" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "Use FOLDER as configuration folder" msgstr "ORDNER als Konfigurationsordner benutzen" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "FOLDER" msgstr "ORDNER" -#: ../midori/main.c:1340 +#: ../midori/main.c:1366 msgid "Run the specified filename as javascript" msgstr "Angegebenen Dateinamen als Javaskript ausführen" -#: ../midori/main.c:1342 +#: ../midori/main.c:1368 msgid "Display program version" msgstr "Programmversion anzeigen" -#: ../midori/main.c:1344 +#: ../midori/main.c:1370 msgid "Addresses" msgstr "Adressen" -#: ../midori/main.c:1385 +#: ../midori/main.c:1412 msgid "[Addresses]" msgstr "[Adressen]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1435 msgid "Please report comments, suggestions and bugs to:" msgstr "Kommentare, Vorschläge und Fehlerberichte senden an:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1437 msgid "Check for new versions at:" msgstr "Informieren Sie sich über neue Versionen unter:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1481 msgid "The specified configuration folder is invalid." msgstr "Der angegebene Konfigurationsordner konnte nicht geladen werden." -#: ../midori/main.c:1489 +#: ../midori/main.c:1516 msgid "An instance of Midori is already running but not responding.\n" msgstr "Eine Instanz von Midori läuft bereits, reagiert aber nicht.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1566 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Die Suchmaschinen konnten nicht geladen werden. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1578 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Die Lesezeichen konnten nicht geladen werden: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1593 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Die Sitzung konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1606 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Der Papierkorb konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1619 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Der Verlauf konnte nicht geladen werden: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1631 msgid "The following errors occured:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1647 msgid "_Ignore" msgstr "_Ignorieren" @@ -220,1021 +220,1052 @@ msgstr "Datei nicht gefunden." msgid "Malformed document." msgstr "Fehlerhaftes Dokument" -#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3432 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3429 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "%d%% geladen" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:542 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:542 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:544 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:544 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:574 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:587 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:606 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:625 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:630 ../midori/midori-browser.c:671 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:747 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:921 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Die Datei %s wurde heruntergeladen." + +#: ../midori/midori-browser.c:924 +msgid "Transfer completed" +msgstr "Übertragung abgeschlossen" + +#: ../midori/midori-browser.c:1602 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2867 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2874 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:534 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2877 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:536 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3038 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3041 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3054 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3062 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3065 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3068 msgid "'Flash' Cookies" msgstr "«Flash» Cookies" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3071 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3151 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3159 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3360 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3363 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3366 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3369 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3372 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3374 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3375 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3377 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3378 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3381 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3384 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3386 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3389 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3392 ../midori/midori-browser.c:3395 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3398 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3401 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3404 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3407 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3409 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3410 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3412 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3413 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3416 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3417 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3420 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3422 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3423 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3435 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3438 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3441 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3442 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3444 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3447 ../midori/midori-websettings.c:202 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3450 ../midori/midori-websettings.c:203 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3453 ../midori/midori-websettings.c:204 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3456 ../midori/midori-websettings.c:205 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3459 ../midori/midori-websettings.c:206 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3462 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3465 ../midori/midori-view.c:1142 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3466 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3468 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3469 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3473 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3475 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3478 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3481 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3484 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3486 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3487 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3489 ../midori/midori-view.c:1114 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3490 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3494 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3496 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3497 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3498 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3500 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3501 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3504 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3505 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3509 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3510 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3512 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3513 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3515 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3517 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3518 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3520 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3521 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3523 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3524 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3527 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3534 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3535 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3540 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3541 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3544 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3545 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3548 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3549 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3552 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3553 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3556 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3557 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3560 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3561 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:3996 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4003 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4005 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4027 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4029 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4050 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4063 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4065 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4078 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4080 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4093 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4095 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4262 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4287 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4292 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4297 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4305 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4315 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4350 ../extensions/cookie-manager.c:819 +msgid "Delete All" +msgstr "Alle löschen" + +#: ../midori/midori-browser.c:4662 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Gewählte Leiste vom Fenster ablösen" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" msgstr "Die gewählte Seitenleiste vom Fenster ablösen" -#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 msgid "Align sidepanel on the right" msgstr "Seitenleiste rechts anordnen" -#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 msgid "Whether to align the sidepanel on the right" msgstr "Die Seitenleiste auf der rechten Seite anordnen" -#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:1947 msgid "Blank page" msgstr "Leere Seite" -#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 msgid "Homepage" msgstr "Startseite" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Last open pages" msgstr "Zuletzt geöffnete Seiten" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "New tab" msgstr "Neuer Reiter" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "New window" msgstr "Neues Fenster" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "Current tab" msgstr "Aktueller Reiter" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Default" msgstr "Standard" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Icons" msgstr "Symbole" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Both" msgstr "Beides" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Both horizontal" msgstr "Beides horizontal" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "All cookies" msgstr "Alle Profildateien" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Session cookies" msgstr "Sitzungsprofile" -#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 msgid "None" msgstr "Keine" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:331 msgid "Remember last window size" msgstr "Letzte Fenstergröße merken" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Whether to save the last window size" msgstr "Die letzte Fenstergröße speichern oder nicht" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Last window width" msgstr "Letzte Fensterbreite" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "The last saved window width" msgstr "Die zuletzt gespeicherte Fensterbreite" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Last window height" msgstr "Letzte Fensterhöhe" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:350 msgid "The last saved window height" msgstr "Die zuletzt gespeicherte Fensterhöhe" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Last panel position" msgstr "Letzte Leistenposition" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "The last saved panel position" msgstr "Die zuletzt gespeicherte Leistenposition" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Last panel page" msgstr "Letzte Leistenseite" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel page" msgstr "Die zuletzt gespeicherte Leistenseite" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Last Web search" msgstr "Letzte Suche im Netz" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "The last saved Web search" msgstr "Die zuletzt gespeicherte Suche im Netz" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Show Menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to show the menubar" msgstr "Die Menüleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Show Navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Whether to show the navigationbar" msgstr "Die Navigationsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:422 msgid "Show Bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the bookmarkbar" msgstr "Die Lesezeichenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "Show Panel" msgstr "Leiste anzeigen" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the panel" msgstr "Die Leiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show Transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the transferbar" msgstr "Die Übertragungsleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Show Statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the statusbar" msgstr "Die Statusleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Toolbar Style" msgstr "Werkzeugleistenstil" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "The style of the toolbar" msgstr "Der Stil der Werkzeugleiste" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:483 msgid "Show progress in location entry" msgstr "Fortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:484 msgid "Whether to show loading progress in the location entry" msgstr "Aktuellen Ladefortschritt im Adressfeld anzeigen" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:499 msgid "Search engines in location completion" msgstr "Suchmaschinen in Vervollständigung" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:500 msgid "Whether to show search engines in the location completion" -msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" +msgstr "Verfügbare Suchmaschinen in der Adressvervollständigung anzeigen" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "Toolbar Items" msgstr "Werkzeugleistenelemente" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:509 msgid "The items to show on the toolbar" msgstr "Die in der Werkzeugleiste anzuzeigenden Elemente" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Compact Sidepanel" msgstr "Kompakte Seitenleiste" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Whether to make the sidepanel compact" msgstr "Die Seitenleiste anzeigen oder verbergen" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 msgid "Load on Startup" msgstr "Beim Programmstart öffnen" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "What to load on startup" msgstr "Was beim Programmstart geöffnet werden soll" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The homepage" msgstr "Die Startseite" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:569 msgid "Show crash dialog" msgstr "Absturzdialog anzeigen" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:570 msgid "Show a dialog after Midori crashed" msgstr "Absturzdialog anzeigen nachdem Midori abgestürzt ist" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:578 msgid "Download Folder" msgstr "Dateispeicherordner" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:579 msgid "The folder downloaded files are saved to" msgstr "Der Ordner, in dem heruntergeladene Dateien gespeichert werden" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:598 +msgid "Ask for the destination folder" +msgstr "Nach dem Zielordner fragen" + +#: ../midori/midori-websettings.c:599 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Beim Herunterladen einer Datei nach dem Zielordner fragen" + +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" +msgstr "Benachrichtigen bei Abschluss einer Übertragung" + +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" +"Eine Benachrichtigung anzeigen wenn eine Übertragung abgeschlossen wurde" + +#: ../midori/midori-websettings.c:631 msgid "Download Manager" msgstr "Übertragungsmanager" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:632 msgid "An external download manager" msgstr "Ein externer Übertragungsmanager" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:640 msgid "Text Editor" msgstr "Texteditor" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:641 msgid "An external text editor" msgstr "Ein externer Texteditor" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:656 msgid "News Aggregator" msgstr "Nachrichtenaggregator" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:657 msgid "An external news aggregator" msgstr "Ein externer Nachrichtenaggregator" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:665 msgid "Location entry Search" msgstr "Adressfeldsuche" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:666 msgid "The search to perform inside the location entry" msgstr "Die Suche, die über das Adressfeld ausgeführt wird" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:674 msgid "Preferred Encoding" msgstr "Bevorzugter Zeichensatz" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:675 msgid "The preferred character encoding" msgstr "Der bevorzugte Zeichensatz" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:685 msgid "Always Show Tabbar" msgstr "Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:686 msgid "Always show the tabbar" msgstr "Die Reiterleiste immer anzeigen" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:694 msgid "Close Buttons on Tabs" msgstr "Schließenschaltflächen auf Reitern" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:695 msgid "Whether tabs have close buttons" msgstr "Schließenschaltflächen auf Reitern anzeigen oder verbergen" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:703 msgid "Open new pages in" msgstr "Öffne neue Seiten in" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:704 msgid "Where to open new pages" msgstr "Wo neue Seiten geöffnet werden sollen" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:713 msgid "Open external pages in" msgstr "Öffne Seiten von außerhalb in" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:714 msgid "Where to open externally opened pages" msgstr "Wo Seiten von außerhalb geöffnet werden sollen" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:727 msgid "Middle click opens Selection" msgstr "Mittelklick öffnet Markierung" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:728 msgid "Load an address from the selection via middle click" msgstr "Lade eine markierte Adresse mit der mittleren Maustaste" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:736 msgid "Open tabs in the background" msgstr "Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:737 msgid "Whether to open new tabs in the background" msgstr "Neue Reiter im Hintergrund öffnen" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:745 msgid "Open Tabs next to Current" msgstr "Reiter neben aktuellem öffnen" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:746 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Neue Reiter neben dem aktuellen Reiter oder nach dem letzten öffnen" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:754 msgid "Open popups in tabs" msgstr "Aufklappfenster in Reitern öffnen" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:755 msgid "Whether to open popup windows in tabs" msgstr "Aufklappfenster in neuen Reitern öffnen" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:771 msgid "Zoom Text and Images" msgstr "Text und Bilder vergrößern" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:772 msgid "Whether to zoom text and images" msgstr "Ob Text und Bilder gleichermaßen vergrößert werden sollen" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:787 msgid "Find inline while typing" msgstr "Inkrementelle Suche beim Eintippen" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:788 msgid "Whether to automatically find inline while typing" msgstr "Ob die inkrementelle Suche automatisch beim Eintippen starten soll" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:796 msgid "Accept cookies" msgstr "Cookies annehmen" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:797 msgid "What type of cookies to accept" msgstr "Welche Art von Profildateien (Cookies) angenommen werden" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:806 msgid "Original cookies only" msgstr "Nur ursprüngliche Profildateien" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:807 msgid "Accept cookies from the original website only" msgstr "Nur Profildateien von der ursprünglichen Seite annehmen" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:815 msgid "Maximum cookie age" msgstr "Maximales Alter von Cookiedaten" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:816 msgid "The maximum number of days to save cookies for" msgstr "Die maximale Anzahl an Tagen, für die Profildateien gespeichert werden" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:826 msgid "Remember last visited pages" msgstr "Zuletzt besuchte Seiten merken" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:827 msgid "Whether the last visited pages are saved" msgstr "Die zuletzt besuchten Seiten speichern" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:835 msgid "Maximum history age" msgstr "Maximales Verlaufsalter" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save the history for" msgstr "Die maximale Anzahl an Tagen, für die der Verlauf gepseichert wird" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:844 msgid "Remember last form inputs" msgstr "Zuletzt eingegebene Formulareingaben merken" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:845 msgid "Whether the last form inputs are saved" msgstr "Die letzten Formulareingaben speichern" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:853 msgid "Remember last downloaded files" msgstr "Zuletzt heruntergeladene Dateien merken" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:854 msgid "Whether the last downloaded files are saved" msgstr "Die zuletzt heruntegeladenen Dateien speichern" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:864 msgid "Proxy Server" msgstr "Zwischenrechner (Proxy)" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:865 msgid "The proxy server used for HTTP connections" msgstr "Der Zwischenrechner für HTTP-Verbindungen" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:880 msgid "Detect proxy server automatically" msgstr "Proxyrechner automatisch erkennen" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:881 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zwischenrechner automatisch über die Umgebung erkennen" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:897 msgid "Identify as" msgstr "Ausgeben als" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:898 msgid "What to identify as to web pages" msgstr "Wie gegenüber Seiten im Internet identifiziert werden soll" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:914 msgid "Identification string" msgstr "Identifikationskennung" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:915 msgid "The application identification string" msgstr "Die Identifikationskennung der Anwedung" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:923 msgid "Cache size" msgstr "Zwischenspeichergröße" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:924 msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:629 ../midori/midori-view.c:2471 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" @@ -1275,37 +1306,37 @@ msgstr "Im Netz _suchen" msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1238 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1255 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: «%s»" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1258 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1262 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1665 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:1810 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1826 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1316,160 +1347,201 @@ msgid "Preferences for %s" msgstr "Einstellungen für %s" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:399 msgid "General" msgstr "Allgemein" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:400 msgid "Startup" msgstr "Programmstart" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:416 msgid "Use current page as homepage" msgstr "Aktuelle Seite als Startseite benutzen" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Übertragungen" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Erscheinungsbild" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Schrifteinstellungen" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Standardschriftart" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Die Standardschriftgröße, in der Text angezeigt wird" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "Die Standardschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Dicktengleiche Schriftart" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Die Schriftart, in der dicktengleicher Text angezeigt wird" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Mindestschriftgröße" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "Die Mindestschriftgröße, in der Text angezeigt wird" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Zeichensatz" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Der voreingestellte Zeichensatz" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Verhalten" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Inhalte" -#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Bilder automatisch laden" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Bilder automatisch laden und anzeigen" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Bilder automatisch verkleinern" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Einzelne Bilder automatisch angemessen verkleinern" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Hintergrundbilder drucken" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Sollen Hintergrundbilder gedruckt werden oder nicht" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Vergrößerbare Textfelder" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Sollen Textfelder vergrößerbar sein oder nicht" -#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Skripte einschalten" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Eingebettete Skriptsprachen einschalten" -#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Zusatzmodule einschalten" +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Netscape-Module einschalten" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "Eingebettete Zusatzmodule einschalten" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Eingebettete Netscape-Module einschalten" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Erzwinge 96 Punkte pro Zoll" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Erzwinge eine Punktdichte von 96 DPI" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Entwicklerwerkzeuge einschalten" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Besondere Erweiterungen für Entwickler einschalten" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Rechtschreibprüfung" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Rechtschreibprüfung einschalten" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Rechtschreibprüfung beim Eintippen einschalten" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Eine durch Kommas getrennte Liste von Sprachen, die für die " +"Rechtschreibprüfung benutzt werden sollen, zum Beispiel «en_GB,de_DE»" + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Oberfläche" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Navigationsleiste" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Navigation" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Anwendungen" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Externe Anwendungen" + #. Page "Network" -#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 msgid "Network" msgstr "Netzwerk" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Privatssphäre" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Benutzerprofile" -#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 msgid "days" msgstr "Tage" @@ -1505,64 +1577,64 @@ msgstr "Suchmaschinen verwalten" msgid "Use as _default" msgstr "Als _Standard" -#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Konnte externes Programm nicht ausführen." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Warnung: Sie benutzen ein Administratorkonto!" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "_Lesezeichen" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "Lesezeichen _hinzufügen" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Konsole" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Erweiterungen" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "_Verlauf" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "_Startseite" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "_Benutzerskripte" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "Benutzer_stile" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "Über_tragungen" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "Zusatz_module" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Netscape-Module" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "_Geschlossene Reiter und Fenster" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "Neues _Fenster" @@ -1594,15 +1666,15 @@ msgstr "_Auschalten" msgid "Bookmarks" msgstr "Lesezeichen" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Markiertes Lesezeichen bearbeiten" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Markiertes Lesezeichen löschen" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Trennlinie" @@ -1614,43 +1686,43 @@ msgstr "Konsole" msgid "Extensions" msgstr "Erweiterungen" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "Sind Sie sicher, dass alle Verlaufseinträge entfernt werden sollen?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Lesezeichen für ausgewählten Verlaufseintrag hinzufügen" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Ausgewählten Verlaufseintrag löschen" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Den gesamten Verlauf löschen" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "Vor einer Woche" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "vor %d Tagen" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Heute" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Gestern" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Zusatzmodule" +msgid "Netscape plugins" +msgstr "Netscape-Module" #: ../panels/midori-transfers.c:256 #, c-format @@ -1704,15 +1776,15 @@ msgstr "Datei wählen" msgid "Choose folder" msgstr "Dateispeicherordner auswählen" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Reiter unterschiedlich einfärben" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "Farbige Reiter" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "Alle Reiter unterschiedlich einfärben" @@ -1753,30 +1825,26 @@ msgstr "Sind Sie sicher, dass alle Profildateien entfernt werden sollen?" msgid "Question" msgstr "Frage" -#: ../extensions/cookie-manager.c:501 +#: ../extensions/cookie-manager.c:502 msgid "" "Only the visible cookies are deleted which match the entered filter string." msgstr "" "Nur die sichtbaren Profildateien, die auf den eigegebenen Filter passen, " "werden gelöscht." -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:680 msgid "Name" msgstr "Name" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:740 msgid "_Expand All" msgstr "Alle _ausklappen" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:748 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Alle löschen" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:821 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -1784,19 +1852,19 @@ msgstr "" "Sichtbare Profildateien löschen. Wenn ein Filter gesetzt ist werden nur jene " "Einträge gelöscht, die auf den Filter passen" -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:836 msgid "Expand All" msgstr "Alle ausklappen" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:843 msgid "Collapse All" msgstr "Alle einklappen" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:874 msgid "Filter:" msgstr "Filter:" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:879 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -1804,18 +1872,110 @@ msgstr "" "Gib einen Filter ein, um nur Profildateien anzuzeigen, deren Name oder " "Domöne auf den eingegebenen Filter passt." -#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 msgid "Cookie Manager" msgstr "Cookieverwaltung" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:946 msgid "_Cookie Manager" msgstr "_Cookieverwaltung" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:963 msgid "List, view and delete cookies" msgstr "Profildateien auflisten, anzeigen und löschen" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" +"Die für Atom benötigten \"entry\"-Elemente wurden im XML nicht gefunden." + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" +"Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:394 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Zuletzt aktualisiert: %s." + +#: ../extensions/feed-panel/feed-panel.c:656 +msgid "Feeds" +msgstr "Nachrichtenquellen" + +#: ../extensions/feed-panel/feed-panel.c:709 +msgid "Add new feed" +msgstr "Eine neue Nachrichtenquelle hinzufügen" + +#: ../extensions/feed-panel/feed-panel.c:716 +msgid "Delete feed" +msgstr "Nachrichtenquelle löschen" + +#: ../extensions/feed-panel/feed-panel.c:799 +msgid "_Feeds" +msgstr "_Nachrichtenquellen (Feeds)" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Das Basiselement wurde im XML der Nachrichtenquelle nicht gefunden." + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "Nicht unterstütztes Quellenformat." + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "XML-Quelle konnte nicht ausgelesen werden: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" +"Die für Atom benötigten \"channel\"-Elemente wurden im XML nicht gefunden." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Nicht unterstützte RSS-Version gefunden." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Die für RSS benötigten \"item\"-Elemente wurden im XML nicht gefunden." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" +"Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." + +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Fehler" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Nachrichtenquelle «%s» ist bereits vorhanden" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Fehler beim Laden der Nachrichtenquelle «%s»" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Neue Nachrichtenquelle" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Nachrichtenquellenleiste" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Atom-/ RSS-Quellen (Feeds) lesen" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Mausgesten" @@ -1833,20 +1993,10 @@ msgstr "Seitenhalter" msgid "_Pageholder" msgstr "_Seitenhalter" -#~ msgid "Images" -#~ msgstr "Bilder" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Funktionen in der Statusleiste" -#~ msgid "Scripts" -#~ msgstr "Skripte" - -#~ msgid "%s has no property '%s'" -#~ msgstr "%s hat keine Eigenschaft »%s«" - -#~ msgid "%s cannot be assigned to %s.%s" -#~ msgstr "%s kann %s.%s nicht zugewiesen werden" - -#~ msgid "%s.%s cannot be accessed" -#~ msgstr "Auf %s.%s kann nicht zugegriffen werden" - -#~ msgid "Source" -#~ msgstr "Quelltext" +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Funktionen auf Internetseiten leicht an- und abstellen" From 566e8252c25fd14f1af94abd3fa5a57492e74b7e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Apr 2009 00:43:47 +0200 Subject: [PATCH 1085/2970] Activating Search if hidden should spawn the search page --- midori/midori-browser.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 041643a5..50613fd0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2650,14 +2650,6 @@ _action_location_secondary_icon_released (GtkAction* action, } } -static void -_action_search_activate (GtkAction* action, - MidoriBrowser* browser) -{ - if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) - gtk_widget_show (browser->navigationbar); -} - static void _action_search_submit (GtkAction* action, const gchar* keywords, @@ -2686,6 +2678,24 @@ _action_search_submit (GtkAction* action, g_free (search); } +static void +_action_search_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GSList* proxies = gtk_action_get_proxies (action); + guint i = 0; + GtkWidget* proxy; + while (((proxy = g_slist_nth_data (proxies, i++)))) + if (GTK_IS_TOOL_ITEM (proxy)) + { + if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->navigationbar); + return; + } + _action_search_submit (action, "", FALSE, browser); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); +} + static void _action_search_notify_current_item (GtkAction* action, GParamSpec* pspec, From 44b1590100d84fec2709ccf51874aa9b47b75e76 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Apr 2009 01:17:57 +0200 Subject: [PATCH 1086/2970] Fix saving changes to the Download folder --- katze/katze-utils.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/katze/katze-utils.c b/katze/katze-utils.c index 4bbee3b3..721b3ab2 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -219,14 +219,9 @@ katze_property_proxy (gpointer object, string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), string ? string : ""); - #if GTK_CHECK_VERSION (2, 12, 0) - g_signal_connect (widget, "file-set", - G_CALLBACK (proxy_file_file_set_cb), object); - #else if (pspec->flags & G_PARAM_WRITABLE) g_signal_connect (widget, "selection-changed", G_CALLBACK (proxy_file_file_set_cb), object); - #endif } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("folder")) { @@ -238,14 +233,9 @@ katze_property_proxy (gpointer object, string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), string ? string : ""); - #if GTK_CHECK_VERSION (2, 12, 0) - g_signal_connect (widget, "file-set", - G_CALLBACK (proxy_folder_file_set_cb), object); - #else if (pspec->flags & G_PARAM_WRITABLE) g_signal_connect (widget, "selection-changed", G_CALLBACK (proxy_folder_file_set_cb), object); - #endif } else if (type == G_TYPE_PARAM_STRING && _hint == g_intern_string ("uri")) { From c0df53a16999b518df4718db6b080cf58f4a83c0 Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Thu, 30 Apr 2009 19:00:27 +0200 Subject: [PATCH 1087/2970] Fix item movement callback in feed panel --- extensions/feed-panel/feed-panel.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index d8212a8a..0c818bc7 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -141,6 +141,7 @@ feed_panel_add_item_cb (KatzeArray* parent, KatzeItem* item; gint i; + g_return_if_fail (FEED_IS_PANEL (panel)); g_return_if_fail (KATZE_IS_ARRAY (parent)); g_return_if_fail (KATZE_IS_ITEM (child)); @@ -209,8 +210,9 @@ feed_panel_remove_item_cb (KatzeArray* item, GtkTreeModel* model; KatzeItem* pitem; - g_assert (KATZE_IS_ARRAY (item)); - g_assert (KATZE_IS_ITEM (child)); + g_return_if_fail (FEED_IS_PANEL (panel)); + g_return_if_fail (KATZE_IS_ARRAY (item)); + g_return_if_fail (KATZE_IS_ITEM (child)); if (KATZE_IS_ARRAY (child)) feed_panel_disconnect_feed (panel, KATZE_ARRAY (child)); @@ -234,14 +236,16 @@ feed_panel_remove_item_cb (KatzeArray* item, static void feed_panel_move_item_cb (KatzeArray* feed, KatzeItem* child, + gint position, FeedPanel* panel) { GtkTreeModel* model; GtkTreeIter iter; guint i; - g_assert (KATZE_IS_ARRAY (feed)); - g_assert (KATZE_IS_ITEM (child)); + g_return_if_fail (FEED_IS_PANEL (panel)); + g_return_if_fail (KATZE_IS_ARRAY (feed)); + g_return_if_fail (KATZE_IS_ITEM (child)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (panel->treeview)); From ffb64d32fa6fe2d40f86e1e48bef5ead3642974b Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Thu, 30 Apr 2009 19:05:39 +0200 Subject: [PATCH 1088/2970] Update Russian translation --- po/ru.po | 1055 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 611 insertions(+), 444 deletions(-) diff --git a/po/ru.po b/po/ru.po index d04623f3..9464bf76 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 20:03+0900\n" -"PO-Revision-Date: 2009-04-19 20:46+0800\n" +"POT-Creation-Date: 2009-04-30 22:14+0900\n" +"PO-Revision-Date: 2009-04-30 22:57+0800\n" "Last-Translator: Anton Shestakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "Легковесный Интернет-обозреватель" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1288 -#: ../midori/main.c:1388 -#: ../midori/main.c:1396 -#: ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../midori/main.c:1314 +#: ../midori/main.c:1415 +#: ../midori/main.c:1423 +#: ../midori/main.c:1434 +#: ../midori/midori-websettings.c:275 msgid "Midori" msgstr "Midori" @@ -33,186 +33,186 @@ msgstr "Midori" msgid "Web Browser" msgstr "Интернет-обозреватель" -#: ../midori/main.c:94 +#: ../midori/main.c:95 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Не удалось загрузить настройки: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Значение «%s» недействительно для %s" -#: ../midori/main.c:156 -#: ../midori/main.c:228 +#: ../midori/main.c:157 +#: ../midori/main.c:237 #, c-format msgid "Invalid configuration value '%s'" msgstr "Недопустимое значение параметра: «%s»" -#: ../midori/main.c:332 +#: ../midori/main.c:349 #, c-format msgid "Failed to open database: %s\n" msgstr "Не удалось открыть базу данных: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:381 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Не удалось выполнить запрос к базе данных: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:435 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Не удалось удалить запись из журнала: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:459 #, c-format msgid "Failed to clear history: %s\n" msgstr "Не удалось очистить журнал: %s\n" -#: ../midori/main.c:465 -#: ../midori/main.c:499 -#: ../midori/main.c:515 +#: ../midori/main.c:482 +#: ../midori/main.c:516 +#: ../midori/main.c:532 #, c-format msgid "Failed to add history item: %s\n" msgstr "Не удалось добавить запись в журнал: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:711 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Не удалось удалить устаревшие записи из журнала: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:740 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Не удалось сохранить настройки. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:769 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Не удалось сохранить средства поиска. %s" -#: ../midori/main.c:770 -#: ../midori/main.c:798 -#: ../midori/main.c:827 +#: ../midori/main.c:788 +#: ../midori/main.c:816 +#: ../midori/main.c:845 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Не удалось сохранить закладки. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 -#: ../midori/main.c:873 +#: ../midori/main.c:868 +#: ../midori/main.c:891 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Не удалось сохранить содержимое корзины. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:964 #, c-format msgid "The session couldn't be saved. %s" msgstr "Не удалось сохранить сеанс. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1091 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Возможно, работа Midori была аварийно прекращена. Если это часто повторяется, можно выбрать действие для решения проблемы ниже." -#: ../midori/main.c:1088 +#: ../midori/main.c:1106 msgid "Modify _preferences" msgstr "Изменить _параметры" -#: ../midori/main.c:1092 +#: ../midori/main.c:1110 msgid "Reset the last _session" msgstr "Удалить _данные последнего сеанса" -#: ../midori/main.c:1097 +#: ../midori/main.c:1115 msgid "Disable all _extensions" msgstr "Отключить все _расширения" -#: ../midori/main.c:1288 +#: ../midori/main.c:1314 msgid "No filename specified" msgstr "Имя файла не задано" -#: ../midori/main.c:1311 +#: ../midori/main.c:1337 msgid "An unknown error occured." msgstr "Обнаружена неизвестная ошибка" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "Run ADDRESS as a web application" msgstr "Запустить АДРЕС как веб-приложение" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "ADDRESS" msgstr "АДРЕС" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "Use FOLDER as configuration folder" msgstr "Использовать файлы параметров из ПАПКИ" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "FOLDER" msgstr "ПАПКА" -#: ../midori/main.c:1340 +#: ../midori/main.c:1366 msgid "Run the specified filename as javascript" msgstr "Выполнить указанный файл как javascript" -#: ../midori/main.c:1342 +#: ../midori/main.c:1368 msgid "Display program version" msgstr "Отобразить версию программы" -#: ../midori/main.c:1344 +#: ../midori/main.c:1370 msgid "Addresses" msgstr "Адреса" -#: ../midori/main.c:1385 +#: ../midori/main.c:1412 msgid "[Addresses]" msgstr "[Адреса]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1435 msgid "Please report comments, suggestions and bugs to:" msgstr "Предложения, комментарии и сообщения об ошибках направляйте по адресу:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1437 msgid "Check for new versions at:" msgstr "Искать обновления на:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1481 msgid "The specified configuration folder is invalid." msgstr "Указана некорректная папка файлов параметров." -#: ../midori/main.c:1489 +#: ../midori/main.c:1516 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori уже запущена, но не отвечает.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1566 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Не удалось загрузить средства поиска. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1578 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Не удалось загрузить закладки: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1593 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Не удалось загрузить сеанс: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1606 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Не удалось загрузить содержимое корзины: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1619 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Не удалось загрузить журнал: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1631 msgid "The following errors occured:" msgstr "Обнаружены следующие ошибки:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1647 msgid "_Ignore" msgstr "_Игнорировать" @@ -226,1051 +226,1083 @@ msgid "Malformed document." msgstr "Плохо сформированный документ." #: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:625 +#: ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "Ошибка записи." -#: ../midori/midori-browser.c:280 -#: ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:281 +#: ../midori/midori-browser.c:3436 +#: ../midori/midori-browser.c:3442 msgid "Reload the current page" msgstr "Обновить страницу" -#: ../midori/midori-browser.c:291 -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:292 +#: ../midori/midori-browser.c:3439 msgid "Stop loading the current page" msgstr "Прекратить загрузку страницы" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "%d%% загружено" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "Неожиданное действие «%s»." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:542 msgid "New folder" msgstr "Создание папки" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:542 msgid "Edit folder" msgstr "Изменить папку" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:544 msgid "New bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:544 msgid "Edit bookmark" msgstr "Изменение закладки" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:574 msgid "_Title:" msgstr "_Заголовок:" -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:587 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Описание:" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:606 #: ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Адрес:" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:625 msgid "_Folder:" msgstr "_Папка:" -#: ../midori/midori-browser.c:629 -#: ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:630 +#: ../midori/midori-browser.c:671 msgid "Toplevel folder" msgstr "Корневая папка" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:747 msgid "Save file as" msgstr "Сохранить файл как" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:921 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Файл %s был загружен." + +#: ../midori/midori-browser.c:924 +msgid "Transfer completed" +msgstr "Передача завершена" + +#: ../midori/midori-browser.c:1602 msgid "Open file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:2803 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2877 +#: ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Открыть всё в отдельных _вкладках" -#: ../midori/midori-browser.c:2810 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2884 +#: ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 +#: ../extensions/feed-panel/feed-panel.c:534 msgid "Open in New _Tab" msgstr "Открыть в новой _вкладке" -#: ../midori/midori-browser.c:2813 -#: ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2887 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 +#: ../extensions/feed-panel/feed-panel.c:536 msgid "Open in New _Window" msgstr "Открыть в новом _окне" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3048 msgid "Clear Private Data" msgstr "Удаление личных данных" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3051 msgid "_Clear private data" msgstr "_Удалить личные данные" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3064 msgid "Clear the following data:" msgstr "Удалить следующие данные:" -#: ../midori/midori-browser.c:2998 -#: ../midori/midori-preferences.c:639 +#: ../midori/midori-browser.c:3072 +#: ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Журнал" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3075 msgid "Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3078 msgid "'Flash' Cookies" msgstr "Фрагменты данных Flash" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3081 msgid "Website icons" msgstr "Значки веб-сайтов" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3161 msgid "A lightweight web browser." msgstr "Легковесный Интернет-обозреватель." -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3169 msgid "translator-credits" msgstr "" "Troitskiy Nikita \n" "Anton Shestakov " -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3370 msgid "_File" msgstr "_Файл" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3373 msgid "Open a new window" msgstr "Открыть в новом окне" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3376 msgid "Open a new tab" msgstr "Открыть в новой вкладке" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3379 msgid "Open a file" msgstr "Открыть файл" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3382 msgid "Save to a file" msgstr "Сохранить в файл" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3384 msgid "_Close Tab" msgstr "_Закрыть вкладку" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3385 msgid "Close the current tab" msgstr "Закрыть данную вкладку" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3387 msgid "C_lose Window" msgstr "З_акрыть окно" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3388 msgid "Close this window" msgstr "Закрыть данное окно" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3391 msgid "Print the current page" msgstr "Распечатать страницу" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3394 msgid "Quit the application" msgstr "Выйти из программы" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3396 msgid "_Edit" msgstr "_Правка" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3399 msgid "Cut the selected text" msgstr "Вырезать выделенный текст" -#: ../midori/midori-browser.c:3334 -#: ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3402 +#: ../midori/midori-browser.c:3405 msgid "Copy the selected text" msgstr "Копировать выделенный текст" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3408 msgid "Paste text from the clipboard" msgstr "Вставить текст из буфера обмена" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3411 msgid "Delete the selected text" msgstr "Удалить выделенный текст" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3414 msgid "Select all text" msgstr "Выделить весь текст" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3417 msgid "Find a word or phrase in the page" msgstr "Поиск слова или фразы на странице" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3419 msgid "Find _Next" msgstr "Найти _следующее" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3420 msgid "Find the next occurrence of a word or phrase" msgstr "Найти следующее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3422 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3423 msgid "Find the previous occurrence of a word or phrase" msgstr "Найти предыдущее местонахождение слова или фразы" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3426 msgid "_Quick Find" msgstr "_Быстрый поиск" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3427 msgid "Quickly jump to a word or phrase" msgstr "Перейти на слово или фразу" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3430 msgid "Configure the application preferences" msgstr "Настройка приложения" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3432 msgid "_View" msgstr "_Вид" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3433 msgid "_Toolbars" msgstr "_Панели инструментов" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3445 msgid "Increase the zoom level" msgstr "Увеличить масштаб" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3448 msgid "Decrease the zoom level" msgstr "Уменьшить масштаб" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3451 msgid "Reset the zoom level" msgstr "Сбросить значение масштаба" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3452 msgid "_Encoding" msgstr "_Кодировка" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3454 msgid "_Automatic" msgstr "_Автоматически" -#: ../midori/midori-browser.c:3389 -#: ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3457 +#: ../midori/midori-websettings.c:202 msgid "Chinese (BIG5)" msgstr "Китайская (BIG5)" -#: ../midori/midori-browser.c:3392 -#: ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3460 +#: ../midori/midori-websettings.c:203 msgid "Japanese (SHIFT_JIS)" msgstr "Японская (SHIFT_JIS)" -#: ../midori/midori-browser.c:3395 -#: ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3463 +#: ../midori/midori-websettings.c:204 msgid "Russian (KOI8-R)" msgstr "Кириллица (KOI8-R)" -#: ../midori/midori-browser.c:3398 -#: ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3466 +#: ../midori/midori-websettings.c:205 msgid "Unicode (UTF-8)" msgstr "Юникод (UTF-8)" -#: ../midori/midori-browser.c:3401 -#: ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3469 +#: ../midori/midori-websettings.c:206 msgid "Western (ISO-8859-1)" msgstr "Западно-европейская (ISO-8859-1)" -#: ../midori/midori-browser.c:3404 -#: ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3472 +#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "Другая..." -#: ../midori/midori-browser.c:3407 -#: ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3475 +#: ../midori/midori-view.c:1142 msgid "View _Source" msgstr "Ис_ходный код страницы" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3476 msgid "View the source code of the page" msgstr "Просмотр исходного кода страницы" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3478 msgid "View Selection Source" msgstr "Исходный код выделенного фрагмента" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3479 msgid "View the source code of the selection" msgstr "Просмотр исходного кода выделенного фрагмента" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3483 msgid "Toggle fullscreen view" msgstr "Переключить полноэкранный режим" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3485 msgid "_Go" msgstr "П_ереход" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3488 msgid "Go back to the previous page" msgstr "На предыдущую страницу" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3491 msgid "Go forward to the next page" msgstr "На следующую страницу" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3494 msgid "Go to your homepage" msgstr "На домашнюю страницу" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3496 msgid "Empty Trash" msgstr "Очистить" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3497 msgid "Delete the contents of the trash" msgstr "Удалить содержимое корзины" -#: ../midori/midori-browser.c:3431 -#: ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3499 +#: ../midori/midori-view.c:1114 msgid "Undo Close Tab" msgstr "Отменить закрытие вкладок" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3500 msgid "Open the last closed tab" msgstr "Открыть последнюю закрытую вкладку" -#: ../midori/midori-browser.c:3436 -#: ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3504 +#: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Новая закладка" -#: ../midori/midori-browser.c:3438 -#: ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3506 +#: ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Создать папку" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3507 msgid "Add a new bookmark folder" msgstr "Создать папку закладок" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3508 msgid "_Tools" msgstr "_Инструменты" -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:3510 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Управление средствами поиска" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3511 msgid "Add, edit and remove search engines..." msgstr "Добавление, правка и удаление средства поиска..." -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3514 msgid "_Clear Private Data" msgstr "Уда_лить личные данные" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3515 msgid "Clear private data..." msgstr "Удалить личные данные..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3519 msgid "_Previous Tab" msgstr "_Предыдущая вкладка" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3520 msgid "Switch to the previous tab" msgstr "Переключиться на предыдущую вкладку" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3522 msgid "_Next Tab" msgstr "_Следующая вкладка" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3523 msgid "Switch to the next tab" msgstr "Переключиться на следующую вкладку" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3525 msgid "_Help" msgstr "_Справка" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3527 msgid "_Contents" msgstr "_Содержание" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3528 msgid "Show the documentation" msgstr "Документация" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3530 msgid "_Frequent Questions" msgstr "_Часто задаваемые вопросы" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3531 msgid "Show the Frequently Asked Questions" msgstr "Часто задаваемые вопросы (в сети)" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3533 msgid "_Report a Bug" msgstr "Соо_бщить об ошибке" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3534 msgid "Open Midori's bug tracker" msgstr "Открыть систему отчётов об ошибках Midori" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3537 msgid "Show information about the program" msgstr "О программе" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3544 msgid "P_rivate Browsing" msgstr "Кон_фиденциальный режим" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3545 msgid "Don't save any private data while browsing" msgstr "Не сохранять персональные данные во время навигации" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3550 msgid "_Menubar" msgstr "Панель _меню" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3551 msgid "Show menubar" msgstr "Показать строку меню" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3554 msgid "_Navigationbar" msgstr "Панель _навигации" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3555 msgid "Show navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3558 msgid "Side_panel" msgstr "_Боковая панель" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3559 msgid "Show sidepanel" msgstr "Показать боковую панель" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3562 msgid "_Bookmarkbar" msgstr "Панель _закладок" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3563 msgid "Show bookmarkbar" msgstr "Показать панель закладок" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3566 msgid "_Transferbar" msgstr "П_ередачи" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3567 msgid "Show transferbar" msgstr "Показать вкладку передачи" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3570 msgid "_Statusbar" msgstr "Панель _состояния" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3571 msgid "Show statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4002 msgid "_Separator" msgstr "_Разделитель" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4009 msgid "_Location..." msgstr "_Адрес..." -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4011 msgid "Open a particular location" msgstr "Открыть определённый адрес" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4033 msgid "_Web Search..." msgstr "_Поиск в сети..." -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4035 msgid "Run a web search" msgstr "Запустить поиск в сети" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4056 msgid "Reopen a previously closed tab or window" msgstr "Открыть ранее закрытые вкладки или окна" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4069 msgid "_Recently visited pages" msgstr "_Недавно посещённые страницы" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4071 msgid "Reopen pages that you visited earlier" msgstr "Открывать страницы, посещённые ранее" -#: ../midori/midori-browser.c:4021 -#: ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4084 +#: ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Закладки" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4086 msgid "Show the saved bookmarks" msgstr "Показать все сохранённые закладки" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4099 msgid "_Window" msgstr "_Окно" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4101 msgid "Show a list of all open tabs" msgstr "Показать список всех открытых вкладок" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4268 msgid "_Inline Find:" msgstr "_Найти:" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4293 msgid "Previous" msgstr "Назад" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4298 msgid "Next" msgstr "Далее" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4303 msgid "Match Case" msgstr "Учитывать регистр" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4311 msgid "Highlight Matches" msgstr "Подсветить совпадения" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4321 msgid "Close Findbar" msgstr "Закрыть вкладку поиска" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4356 +#: ../extensions/cookie-manager.c:819 +msgid "Delete All" +msgstr "Удалить всё" + +#: ../midori/midori-browser.c:4668 #, c-format msgid "Unexpected setting '%s'" msgstr "Неожиданный параметр «%s»" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" msgstr "Отсоединить выбранную панель от главного окна" -#: ../midori/midori-panel.c:321 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 +#: ../midori/midori-websettings.c:533 msgid "Align sidepanel on the right" msgstr "Расположить панель справа" -#: ../midori/midori-panel.c:323 -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 +#: ../midori/midori-websettings.c:534 msgid "Whether to align the sidepanel on the right" msgstr "Расположить боковую панель справа" -#: ../midori/midori-panel.c:333 -#: ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 +#: ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Закрыть панель" -#: ../midori/midori-websettings.c:183 -#: ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:185 +#: ../midori/midori-view.c:1947 msgid "Blank page" msgstr "Пустая страница" -#: ../midori/midori-websettings.c:184 -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:553 msgid "Homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Last open pages" msgstr "Последние открытые страницы" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "New tab" msgstr "Новая вкладка" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "New window" msgstr "Новое окно" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "Current tab" msgstr "Текущая вкладка" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Default" msgstr "По умолчанию" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Icons" msgstr "Только значки" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Text" msgstr "Только текст" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Both" msgstr "Значки и текст" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Both horizontal" msgstr "Значки и текст горизонтально" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "All cookies" msgstr "Все" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Session cookies" msgstr "С информацией о сеансе" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 #: ../panels/midori-addons.c:94 msgid "None" msgstr "Нет" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:331 msgid "Remember last window size" msgstr "Запоминать размер последнего окна" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Whether to save the last window size" msgstr "Запоминать последний размер окна" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Last window width" msgstr "Ширина последнего окна" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "The last saved window width" msgstr "Ширина последнего сохранённого окна" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Last window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:350 msgid "The last saved window height" msgstr "Высота последнего сохранённого окна" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Last panel position" msgstr "Позиция последней панели" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "The last saved panel position" msgstr "Последняя сохранённая позиция панели" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Last panel page" msgstr "Последняя страница панели" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel page" msgstr "Последняя сохранённая страница панели" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Last Web search" msgstr "Последний поиск" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "The last saved Web search" msgstr "Последний сохранённый поиск в сети" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Show Menubar" msgstr "Показать меню" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to show the menubar" msgstr "Показывать панель меню" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Show Navigationbar" msgstr "Показать панель навигации" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Whether to show the navigationbar" msgstr "Показывать панель навигации" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:422 msgid "Show Bookmarkbar" msgstr "Показать закладки" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the bookmarkbar" msgstr "Показывать закладки" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "Show Panel" msgstr "Показать панель" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the panel" msgstr "Показывать панель" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show Transferbar" msgstr "Показать панель передач" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the transferbar" msgstr "Показывать панель передач" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Show Statusbar" msgstr "Показать панель состояния" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the statusbar" msgstr "Показывать панель состояния" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Toolbar Style" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "The style of the toolbar" msgstr "Стиль панели инструментов" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:483 msgid "Show progress in location entry" msgstr "Показывать прогресс загрузки страницы в адресной строке" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:484 msgid "Whether to show loading progress in the location entry" msgstr "Показывать ход загрузки страницы в виде полосы в адресной строке" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:499 msgid "Search engines in location completion" msgstr "Показывать средства поиска при автодополнении адреса" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:500 msgid "Whether to show search engines in the location completion" msgstr "Показывать средства поиска при вводе текста в адресную строку" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "Toolbar Items" msgstr "Элементы панели навигации" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:509 msgid "The items to show on the toolbar" msgstr "Элементы, которые будут показаны на панели инструментов" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Compact Sidepanel" msgstr "Компактная боковая панель" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Whether to make the sidepanel compact" msgstr "Не показывать подписи к значкам в боковой панели" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 msgid "Load on Startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "What to load on startup" msgstr "Загружать при запуске" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The homepage" msgstr "Домашняя страница" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:569 msgid "Show crash dialog" msgstr "Показывать окно после сбоя" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:570 msgid "Show a dialog after Midori crashed" msgstr "Показывать окно действий после аварийного завершения работы" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:578 msgid "Download Folder" -msgstr "Каталог загрузок" +msgstr "Папка загрузок" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:579 msgid "The folder downloaded files are saved to" -msgstr "Каталог, в который будут сохраняться файлы" +msgstr "Папка, в которую будут сохраняться файлы" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:598 +msgid "Ask for the destination folder" +msgstr "Запрашивать папку для загрузок" + +#: ../midori/midori-websettings.c:599 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Запрашивать конечную папку для каждого файла" + +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" +msgstr "Уведомлять по завершении передачи" + +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Показывать уведомление по окончании передачи файлов" + +#: ../midori/midori-websettings.c:631 msgid "Download Manager" msgstr "Менеджер загрузок" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:632 msgid "An external download manager" msgstr "Внешний администратор загрузок" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:640 msgid "Text Editor" msgstr "Текстовый редактор" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:641 msgid "An external text editor" msgstr "Пользовательский текстовый редактор" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:656 msgid "News Aggregator" -msgstr "" +msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:615 -#, fuzzy +#: ../midori/midori-websettings.c:657 msgid "An external news aggregator" -msgstr "Пользовательский текстовый редактор" +msgstr "Программа чтения лент новостей" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:665 msgid "Location entry Search" msgstr "Поиск из адресной строки" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:666 msgid "The search to perform inside the location entry" msgstr "Поиск, производимый при вводе фразы в адресную строку" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:674 msgid "Preferred Encoding" msgstr "Предпочтительная кодировка" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:675 msgid "The preferred character encoding" msgstr "Предпочтительная кодировка символов" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:685 msgid "Always Show Tabbar" msgstr "Всегда показывать строку вкладок" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:686 msgid "Always show the tabbar" msgstr "Всегда показывать строку закладок" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:694 msgid "Close Buttons on Tabs" msgstr "Кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:695 msgid "Whether tabs have close buttons" msgstr "Наличие кнопки закрытия на вкладках" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:703 msgid "Open new pages in" msgstr "Открывать новую страницу в" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:704 msgid "Where to open new pages" msgstr "Расположение новых страниц при открытии" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:713 msgid "Open external pages in" msgstr "Открывать внешние страницы в" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:714 msgid "Where to open externally opened pages" msgstr "Расположение сторонних страниц при открытии" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:727 msgid "Middle click opens Selection" msgstr "Переходить на выделенный адрес по средней кнопке" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:728 msgid "Load an address from the selection via middle click" msgstr "Загружать выделенный адрес средней кнопкой мыши" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:736 msgid "Open tabs in the background" msgstr "Открывать вкладки в фоне" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:737 msgid "Whether to open new tabs in the background" msgstr "Открывать новые вкладки в фоне" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:745 msgid "Open Tabs next to Current" msgstr "Открывать новые вкладки рядом с текущей" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:746 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Открывать новую вкладку в следующей за данной или за последней" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:754 msgid "Open popups in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:755 msgid "Whether to open popup windows in tabs" msgstr "Открывать всплывающие окна во вкладках" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:771 msgid "Zoom Text and Images" msgstr "Масштабировать текст и изображения" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:772 msgid "Whether to zoom text and images" msgstr "Изменять масштаб текста и изображений" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:787 msgid "Find inline while typing" msgstr "Искать текст на странице по мере его набора" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:788 msgid "Whether to automatically find inline while typing" msgstr "По мере ввода текста на странице будет осуществляться быстрый поиск по фразе" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:796 msgid "Accept cookies" msgstr "Принимать фрагменты данных" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:797 msgid "What type of cookies to accept" msgstr "Разрешённый тип фрагментов данных" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:806 msgid "Original cookies only" msgstr "Только оригинальные фрагменты данных" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:807 msgid "Accept cookies from the original website only" msgstr "Принимать фрагменты данных только с оригинального сайта" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:815 msgid "Maximum cookie age" msgstr "Хранить фрагменты данных" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:816 msgid "The maximum number of days to save cookies for" msgstr "Максимальное число дней хранения фрагментов данных" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:826 msgid "Remember last visited pages" msgstr "Запоминать посещённые страницы" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:827 msgid "Whether the last visited pages are saved" msgstr "Сохранять историю последних посещений" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:835 msgid "Maximum history age" msgstr "Максимальный возраст записей" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save the history for" msgstr "Максимальное число дней хранения записей в журнале" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:844 msgid "Remember last form inputs" msgstr "Запоминать введённые в формы данные" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:845 msgid "Whether the last form inputs are saved" msgstr "Сохранять последние введённые данные в формы ввода" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:853 msgid "Remember last downloaded files" msgstr "Запоминать последние загруженные файлы" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:854 msgid "Whether the last downloaded files are saved" msgstr "Сохранять историю последних загрузок" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:864 msgid "Proxy Server" msgstr "Прокси-сервер" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:865 msgid "The proxy server used for HTTP connections" msgstr "Прокси-сервер для соединений по HTTP" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:880 msgid "Detect proxy server automatically" msgstr "Автоматически обнаруживать прокси-сервер" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:881 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Брать данные о прокси-сервере из переменных окружения" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:897 msgid "Identify as" msgstr "Представляться как" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:898 msgid "What to identify as to web pages" msgstr "Строка, которая будет посылаться на запросы идентификации обозревателя" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:914 msgid "Identification string" msgstr "Строка идентификации" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:915 msgid "The application identification string" msgstr "Строка идентификации приложения" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:923 msgid "Cache size" msgstr "Размер кэша" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:924 msgid "The allowed size of the cache" msgstr "Разрешённый размер кэша" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:629 +#: ../midori/midori-view.c:2471 #, c-format msgid "Not found - %s" msgstr "Страница не найдена — %s" @@ -1311,37 +1343,37 @@ msgstr "_Найти в сети" msgid "Open Address in New _Tab" msgstr "Открыть ссылку в новой _вкладке" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1238 msgid "Open or download file" msgstr "Открыть или загрузить файл" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1255 #, c-format msgid "File Type: '%s'" msgstr "Тип файла: «%s»" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1258 #, c-format msgid "File Type: %s ('%s')" msgstr "Тип файла: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1262 #, c-format msgid "Open %s" msgstr "Открыть %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1665 #, c-format msgid "Inspect page - %s" msgstr "Информация о странице — %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:1810 #, c-format msgid "Document cannot be displayed" msgstr "Не удалось отобразить документ" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1826 #, c-format msgid "No documentation installed" msgstr "Документация не установлена" @@ -1352,166 +1384,203 @@ msgid "Preferences for %s" msgstr "Параметры %s" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:399 msgid "General" msgstr "Общие" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:400 msgid "Startup" msgstr "Запуск" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:416 msgid "Use current page as homepage" msgstr "Установить текущую страницу в качестве домашней" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:424 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Передачи" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Внешний вид" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Настройки шрифта" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Семейство шрифта по умолчанию" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Семейство шрифта для отображения текста по умолчанию" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "Размер шрифта для отображения текста по умолчанию" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Семейство моноширинного шрифта" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Семейство моноширинного шрифта для отображения текста" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Минимальный размер шрифта" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "Наименьший размер шрифта для отображения текста" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Кодировка" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Кодировка символов, которая будет использоваться по умолчанию" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Поведение" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Возможности" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:482 #: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Загружать изображения автоматически" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Загружать и отображать изображения автоматически" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Масштабировать изображения автоматически" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Автоматически уменьшать отдельные изображения по размеру экрана" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Печатать фоновые изображения" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Должны ли быть выведены на печать фоновые изображения" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Изменяемый размер текстовых полей" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Текстовые поля могут изменять размер" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:498 #: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Выполнять сценарии" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Выполнять встроенные сценарии на страницах" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:502 #: ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Использовать модули" +msgid "Enable Netscape plugins" +msgstr "Использовать модули Netscape" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "Разрешить встроенные объекты модулей на страницах" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Разрешить встроенные объекты модулей Netscape на страницах" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Всегда использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Принудительно использовать разрешение 96 точек на дюйм" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Включить средства разработчика" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Включить особые расширения для разработчиков" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Проверка орфографии" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Проверять орфографию" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Проверять правописание вводимого текста" + +#: ../midori/midori-preferences.c:525 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "Список языков для проверки орфографии через запятую, например, «en_US,ru»" + #. Page "Interface" -#: ../midori/midori-preferences.c:547 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Интерфейс" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Панель навигации" -#: ../midori/midori-preferences.c:559 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Навигация" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Приложения" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Внешние приложения" + #. Page "Network" -#: ../midori/midori-preferences.c:589 -#: ../midori/midori-preferences.c:590 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:620 msgid "Network" msgstr "Сеть" -#: ../midori/midori-preferences.c:617 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "МБ" #. Page "Privacy" -#: ../midori/midori-preferences.c:622 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Конфиденциальность" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Фрагменты данных" -#: ../midori/midori-preferences.c:636 -#: ../midori/midori-preferences.c:646 +#: ../midori/midori-preferences.c:666 +#: ../midori/midori-preferences.c:676 msgid "days" msgstr "дней" @@ -1544,65 +1613,69 @@ msgstr "_Признак:" msgid "Manage Search Engines" msgstr "Управление средствами поиска" -#: ../midori/sokoke.c:117 -#: ../midori/sokoke.c:129 +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "Использовать _по умолчанию" + +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Не удалось выполнить внешнюю программу." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Внимание: используется учётная запись суперпользователя!" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "_Закладка" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "_Добавить закладку" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Консоль" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Дополнения" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "_Журнал" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "Д_омашняя страница" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "_Сценарии пользователя" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "С_тили пользователя" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "Но_вая вкладка" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "_Передачи" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "_Модули" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "_Модули Netscape" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "За_крытые вкладки и окна" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "_Новое окно" @@ -1640,15 +1713,15 @@ msgstr "Отключить" msgid "Bookmarks" msgstr "Закладки" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Редактировать закладку" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Удалить закладку" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Разделитель" @@ -1660,43 +1733,43 @@ msgstr "Консоль" msgid "Extensions" msgstr "Дополнения" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "Удалить все записи в журнале?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Добавить выделенную запись в закладки" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Удалить запись из журнала" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Очистить весь журнал" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "Неделю назад" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "%d дней назад" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Сегодня" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Вчера" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Модули" +msgid "Netscape plugins" +msgstr "Модули Netscape" #: ../panels/midori-transfers.c:256 #, c-format @@ -1738,29 +1811,29 @@ msgid "Animation frames are broken" msgstr "Кадры анимации повреждены" #: ../katze/katze-utils.c:183 -#: ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Свойство «%s» недействительно для %s" #: ../katze/katze-utils.c:215 -#: ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Выберите файл" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Выберите папку" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Цвета вкладок" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "Цветные вкладки" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "Каждая вкладка имеет свой цвет" @@ -1801,59 +1874,143 @@ msgstr "Удалить все сохранённые фрагменты данн msgid "Question" msgstr "Вопрос" -#: ../extensions/cookie-manager.c:501 +#: ../extensions/cookie-manager.c:502 msgid "Only the visible cookies are deleted which match the entered filter string." msgstr "Будут удалены только видимые фрагменты, удовлетворяющие условиям фильтра." -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:680 msgid "Name" msgstr "Имя" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:740 msgid "_Expand All" msgstr "_Развернуть всё" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:748 msgid "_Collapse All" msgstr "_Свернуть всё" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Удалить всё" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:821 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "Будут удалены только видимые фрагменты. Если активен фильтр, будут удалены только те фрагменты, которые удовлетворяют его условиям." -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:836 msgid "Expand All" msgstr "Развернуть всё" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:843 msgid "Collapse All" msgstr "Свернуть всё" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:874 msgid "Filter:" msgstr "Фильтр:" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:879 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "Строка для фильтрации по имени фрагмента или адресу веб-сайта" -#: ../extensions/cookie-manager.c:913 -#: ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:914 +#: ../extensions/cookie-manager.c:962 msgid "Cookie Manager" msgstr "Менеджер фрагментов данных" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:946 msgid "_Cookie Manager" msgstr "Менеджер _фрагментов данных" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:963 msgid "List, view and delete cookies" msgstr "Просмотр и удаление фрагментов данных" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Не удалось найти обязательные элементы Atom «entry» в данных XML." + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Не удалось найти обязательные элементы Atom «feed» в данных XML." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:394 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Последнее обновление: %s." + +#: ../extensions/feed-panel/feed-panel.c:656 +msgid "Feeds" +msgstr "Ленты" + +#: ../extensions/feed-panel/feed-panel.c:709 +msgid "Add new feed" +msgstr "Добавить ленту" + +#: ../extensions/feed-panel/feed-panel.c:716 +msgid "Delete feed" +msgstr "Удалить ленту" + +#: ../extensions/feed-panel/feed-panel.c:799 +msgid "_Feeds" +msgstr "Л_енты" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Не удалось найти корневой элемент в данных XML." + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "Формат ленты не поддерживается." + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Не удалось обработать XML-ленту: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Не удалось найти элемент «channel» в данных RSS XML." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Обнаруженная версия RSS не поддерживается." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Не удалось найти обязательные элементы RSS «item» в данных XML." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Не удалось найти обязательные элементы RSS «channel» в данных XML." + +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Ошибка" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Лента «%s» уже была добавлена" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Не удалось загрузить ленту «%s»" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Новая лента" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Панель лент новостей" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Чтение лент RSS/Atom" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Жесты мышью" @@ -1872,6 +2029,18 @@ msgstr "Контейнер" msgid "_Pageholder" msgstr "К_онтейнер" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Настройка возможностей" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Быстрая настройка режимов отображения страниц" + +#~ msgid "P_lugins" +#~ msgstr "_Модули" +#~ msgid "Plugins" +#~ msgstr "Модули" #~ msgid "%s has no property '%s'" #~ msgstr "%s не обладает свойством «%s»" #~ msgid "%s cannot be assigned to %s.%s" @@ -1960,8 +2129,6 @@ msgstr "К_онтейнер" #~ msgstr "Панель состояния" #~ msgid "The statusbar" #~ msgstr "Панель состояния" -#~ msgid "Statusbar Text" -#~ msgstr "Текст вкладки статуса" #~ msgid "The text that is displayed in the statusbar" #~ msgstr "Текст отображаемый во вкладке статуса" #~ msgid "The list of search engines to be used for web search" From f93c3c166f755ba8f8c64343faf81f3a60d75b0b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 1 May 2009 20:03:40 +0200 Subject: [PATCH 1089/2970] Ensure that completion items have a title Items are added as lone URIs often enough, so it happened that we accidentally unset a title. We check that now. --- midori/midori-locationaction.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index a24ec972..5d3ee8ab 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -620,6 +620,10 @@ midori_location_action_set_item (MidoriLocationAction* location_action, GdkPixbuf* icon; GdkPixbuf* new_icon; + /* Ensure we keep the title if we added the same URI with a title before */ + if (!item->title) + gtk_tree_model_get (location_action->model, iter, TITLE_COL, &item->title, -1); + gtk_list_store_set (GTK_LIST_STORE (location_action->model), iter, URI_COL, item->uri, TITLE_COL, item->title, -1); From 8c8551d38420f459ebce8e6c426595609a17c84c Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 May 2009 00:23:43 +0200 Subject: [PATCH 1090/2970] Generate thumbnails of open tabs The images aren't used for anything yet, and can't be disabled --- midori/midori-browser.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 50613fd0..606fed52 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -394,6 +394,61 @@ midori_view_notify_icon_cb (MidoriView* view, MIDORI_LOCATION_ACTION (action), midori_view_get_icon (view), uri); } +static void +midori_browser_update_thumbnail (GtkWidget* view, + const gchar* uri) +{ + GtkWidget* child; + + #if GTK_CHECK_VERSION (2, 12, 0) + /* FIXME: A preference should toggle thumbnails */ + + if (midori_view_get_load_status (MIDORI_VIEW (view)) != MIDORI_LOAD_FINISHED) + return; + + /* gtk_widget_get_snapshot works only with visible widgets */ + if (!GTK_WIDGET_DRAWABLE (view)) + return; + + if ((child = gtk_bin_get_child (GTK_BIN (view)))) + { + static gchar* folder = NULL; + GdkRectangle rect; + GdkPixmap* pixmap; + GdkPixbuf* pixbuf; + gchar* thumb; + gchar* filename; + + if (G_UNLIKELY (!folder)) + { + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, + "thumbs", NULL); + g_mkdir_with_parents (folder, 0700); + } + + thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + filename = g_build_filename (folder, thumb, NULL); + g_free (thumb); + /* FIXME: Regenerate if needed */ + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + g_free (filename); + return; + } + + rect.x = rect.y = -1; + rect.width = rect.height = 0; + pixmap = gtk_widget_get_snapshot (child, &rect); + pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL, 0, 0, + 0, 0, rect.width, rect.height); + g_object_unref (pixmap); + gdk_pixbuf_save (pixbuf, filename, "png", NULL, NULL); + g_free (filename); + g_object_unref (pixbuf); + } + #endif +} + static void midori_view_notify_load_status_cb (GtkWidget* view, GParamSpec* pspec, @@ -423,6 +478,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, MIDORI_LOCATION_ACTION (action), NULL); g_object_notify (G_OBJECT (browser), "uri"); } + midori_browser_update_thumbnail (view, uri); _midori_browser_update_interface (browser); _midori_browser_set_statusbar_text (browser, NULL); @@ -2661,6 +2717,9 @@ _action_search_submit (GtkAction* action, const gchar* url; gchar* search; + if (!browser->settings) + return; + g_object_get (browser->settings, "last-web-search", &last_web_search, NULL); item = katze_array_get_nth_item (browser->search_engines, last_web_search); if (item) @@ -3303,6 +3362,8 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_set_statusbar_text (browser, NULL); _midori_browser_update_interface (browser); _midori_browser_update_progress (browser, MIDORI_VIEW (view)); + + midori_browser_update_thumbnail (view, uri); } static void From d6721f09b07d0c680edf734df4a1148c1c991f61 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 May 2009 21:36:09 +0200 Subject: [PATCH 1091/2970] Add sokoke_get_res_server --- midori/sokoke.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ midori/sokoke.h | 5 ++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index bb421d80..69f2d675 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -971,3 +971,50 @@ sokoke_remove_path (const gchar* path, g_rmdir (path); return TRUE; } + +static void +res_server_handler_cb (SoupServer* res_server, + SoupMessage* msg, + const gchar* path, + GHashTable* query, + SoupClientContext* client, + gpointer data) +{ + if (g_str_has_prefix (path, "/res")) + { + gchar* filename = g_strconcat (DATADIR "/midori", path, NULL); + gchar* contents; + guint length; + + if (g_file_get_contents (filename, &contents, &length, NULL)) + { + /* FIXME: Support any MIME type */ + soup_message_set_response (msg, "image/png", SOUP_MEMORY_TAKE, + contents, length); + soup_message_set_status (msg, 401); + } + else + soup_message_set_status (msg, 404); + g_free (filename); + } + else + { + soup_message_set_status (msg, 404); + } +} + +SoupServer* +sokoke_get_res_server (void) +{ + static SoupServer* res_server = NULL; + + if (G_UNLIKELY (!res_server)) + { + res_server = soup_server_new ("port", SOUP_ADDRESS_ANY_PORT, NULL); + soup_server_add_handler (res_server, "/", + res_server_handler_cb, NULL, NULL); + soup_server_run_async (res_server); + } + + return res_server; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index d750f2f3..e960e087 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -16,7 +16,7 @@ #include #include - +#include #include gchar* @@ -154,4 +154,7 @@ gboolean sokoke_remove_path (const gchar* path, gboolean ignore_errors); +SoupServer* +sokoke_get_res_server (void); + #endif /* !__SOKOKE_H__ */ From 7d0d2d60bc46c7a60d60877432ccb15fe97f7c8a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 May 2009 21:38:43 +0200 Subject: [PATCH 1092/2970] Add sokoke_replace_variables --- midori/sokoke.c | 25 +++++++++++++++++++++++++ midori/sokoke.h | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/midori/sokoke.c b/midori/sokoke.c index 69f2d675..1af7289d 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1018,3 +1018,28 @@ sokoke_get_res_server (void) return res_server; } + +gchar* +sokoke_replace_variables (const gchar* template, + const gchar* variable_first, ...) +{ + gchar* result = g_strdup (template); + const gchar* variable; + + va_list args; + va_start (args, variable_first); + + for (variable = variable_first; variable; variable = va_arg (args, const gchar*)) + { + const gchar* value = va_arg (args, const gchar*); + GRegex* regex = g_regex_new (variable, 0, 0, NULL); + gchar* replaced = result; + result = g_regex_replace (regex, replaced, -1, 0, value, 0, NULL); + g_free (replaced); + g_regex_unref (regex); + } + + va_end (args); + + return result; +} diff --git a/midori/sokoke.h b/midori/sokoke.h index e960e087..56a76615 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -157,4 +157,8 @@ sokoke_remove_path (const gchar* path, SoupServer* sokoke_get_res_server (void); +gchar* +sokoke_replace_variables (const gchar* template, + const gchar* variable_first, ...); + #endif /* !__SOKOKE_H__ */ From ca98c68e704e8a14fac5fd35452283c45cc738b0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 2 May 2009 21:44:20 +0200 Subject: [PATCH 1093/2970] Support error pages with the load-error signal in WebKitGTK+ 1.1.6 --- data/error.html | 65 ++++++++++++++++++++++++++++++++++++++++++++ midori/midori-view.c | 55 ++++++++++++++++++++++++++++++++++++- wscript | 3 +- 3 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 data/error.html diff --git a/data/error.html b/data/error.html new file mode 100644 index 00000000..4f6d43ad --- /dev/null +++ b/data/error.html @@ -0,0 +1,65 @@ + + + + +{title} + + + + +

+ + + +

{title}

+
+

{message}

+

{description}

+
+ +
+ +
+ +
+ + + diff --git a/midori/midori-view.c b/midori/midori-view.c index 060c7fb4..5146d39b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -615,6 +615,50 @@ webkit_web_view_progress_changed_cb (WebKitWebView* web_view, g_object_notify (G_OBJECT (view), "progress"); } +#if WEBKIT_CHECK_VERSION (1, 1, 6) +static gboolean +webkit_web_view_load_error_cb (WebKitWebView* web_view, + WebKitWebFrame* web_frame, + const gchar* uri, + GError* error, + MidoriView* view) +{ + const gchar* template_file = DATADIR "/midori/res/error.html"; + gchar* template; + + if (g_file_get_contents (template_file, &template, NULL, NULL)) + { + SoupServer* res_server; + guint port; + gchar* res_root; + gchar* message; + gchar* result; + + res_server = sokoke_get_res_server (); + port = soup_server_get_port (res_server); + res_root = g_strdup_printf ("http://localhost:%d/res", port); + + message = g_strdup_printf (_("The page %s couldn't be loaded."), uri); + result = sokoke_replace_variables (template, + "{title}", _("Error"), + "{message}", message, + "{description}", error->message, + "{tryagain}", _("Try again"), + "{res}", res_root, NULL); + g_free (template); + g_free (message); + + webkit_web_frame_load_alternate_string (web_frame, + result, res_root, uri); + g_free (res_root); + g_free (result); + + return TRUE; + } + + return FALSE; +} +#else static void webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, gboolean success, @@ -645,6 +689,7 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, midori_view_update_load_status (view, MIDORI_LOAD_FINISHED); } +#endif static void webkit_web_view_load_finished_cb (WebKitWebView* web_view, @@ -1755,12 +1800,18 @@ midori_view_construct_web_view (MidoriView* view) "signal::download-requested", webkit_web_view_download_requested_cb, view, #endif + #if WEBKIT_CHECK_VERSION (1, 1, 6) + "signal::load-error", + webkit_web_view_load_error_cb, view, + #endif NULL); + #if !WEBKIT_CHECK_VERSION (1, 1, 6) g_object_connect (web_frame, "signal::load-done", webkit_web_frame_load_done_cb, view, NULL); + #endif if (view->settings) { @@ -1802,6 +1853,7 @@ midori_view_set_uri (MidoriView* view, if (g_str_has_prefix (uri, "error:")) { data = NULL; + #if !WEBKIT_CHECK_VERSION (1, 1, 3) if (!strncmp (uri, "error:nodisplay ", 16)) { gchar* title; @@ -1818,7 +1870,8 @@ midori_view_set_uri (MidoriView* view, title, title, view->uri, view->mime_type); g_free (title); } - else if (!strncmp (uri, "error:nodocs ", 13)) + #endif + if (!strncmp (uri, "error:nodocs ", 13)) { gchar* title; diff --git a/wscript b/wscript index f9579b24..d8502e7d 100644 --- a/wscript +++ b/wscript @@ -336,9 +336,10 @@ def build (bld): ' -o ' + blddir + '/data/logo-shade.png ' + \ srcdir + '/data/logo-shade.svg' if not Utils.exec_command (command): - bld.install_files ('${DATADIR}/' + APPNAME, blddir + '/data/logo-shade.png') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png') else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/error.html') if Options.commands['check']: bld.add_subdirs ('tests') From 9c2772d0c8f58cd311b0fae10e302462c5a3bff2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 May 2009 00:49:04 +0200 Subject: [PATCH 1094/2970] Update translation template --- po/midori.pot | 1014 +++++++++++++++++++++++++++++-------------------- 1 file changed, 592 insertions(+), 422 deletions(-) diff --git a/po/midori.pot b/po/midori.pot index 094702e7..940df1ed 100644 --- a/po/midori.pot +++ b/po/midori.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"POT-Creation-Date: 2009-05-03 00:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 -#: ../midori/main.c:1396 ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 +#: ../midori/main.c:1423 ../midori/main.c:1434 +#: ../midori/midori-websettings.c:275 msgid "Midori" msgstr "" @@ -30,182 +30,182 @@ msgstr "" msgid "Web Browser" msgstr "" -#: ../midori/main.c:94 +#: ../midori/main.c:95 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:149 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "" -#: ../midori/main.c:156 ../midori/main.c:228 +#: ../midori/main.c:157 ../midori/main.c:237 #, c-format msgid "Invalid configuration value '%s'" msgstr "" -#: ../midori/main.c:332 +#: ../midori/main.c:349 #, c-format msgid "Failed to open database: %s\n" msgstr "" -#: ../midori/main.c:364 +#: ../midori/main.c:381 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "" -#: ../midori/main.c:418 +#: ../midori/main.c:435 #, c-format msgid "Failed to remove history item: %s\n" msgstr "" -#: ../midori/main.c:442 +#: ../midori/main.c:459 #, c-format msgid "Failed to clear history: %s\n" msgstr "" -#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 #, c-format msgid "Failed to add history item: %s\n" msgstr "" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:711 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "" -#: ../midori/main.c:722 +#: ../midori/main.c:740 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "" -#: ../midori/main.c:751 +#: ../midori/main.c:769 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "" -#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 ../midori/main.c:873 +#: ../midori/main.c:868 ../midori/main.c:891 #, c-format msgid "The trash couldn't be saved. %s" msgstr "" -#: ../midori/main.c:946 +#: ../midori/main.c:964 #, c-format msgid "The session couldn't be saved. %s" msgstr "" -#: ../midori/main.c:1073 +#: ../midori/main.c:1091 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." msgstr "" -#: ../midori/main.c:1088 +#: ../midori/main.c:1106 msgid "Modify _preferences" msgstr "" -#: ../midori/main.c:1092 +#: ../midori/main.c:1110 msgid "Reset the last _session" msgstr "" -#: ../midori/main.c:1097 +#: ../midori/main.c:1115 msgid "Disable all _extensions" msgstr "" -#: ../midori/main.c:1288 +#: ../midori/main.c:1314 msgid "No filename specified" msgstr "" -#: ../midori/main.c:1311 +#: ../midori/main.c:1337 msgid "An unknown error occured." msgstr "" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "Run ADDRESS as a web application" msgstr "" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "ADDRESS" msgstr "" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "Use FOLDER as configuration folder" msgstr "" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "FOLDER" msgstr "" -#: ../midori/main.c:1340 +#: ../midori/main.c:1366 msgid "Run the specified filename as javascript" msgstr "" -#: ../midori/main.c:1342 +#: ../midori/main.c:1368 msgid "Display program version" msgstr "" -#: ../midori/main.c:1344 +#: ../midori/main.c:1370 msgid "Addresses" msgstr "" -#: ../midori/main.c:1385 +#: ../midori/main.c:1412 msgid "[Addresses]" msgstr "" -#: ../midori/main.c:1408 +#: ../midori/main.c:1435 msgid "Please report comments, suggestions and bugs to:" msgstr "" -#: ../midori/main.c:1410 +#: ../midori/main.c:1437 msgid "Check for new versions at:" msgstr "" -#: ../midori/main.c:1454 +#: ../midori/main.c:1481 msgid "The specified configuration folder is invalid." msgstr "" -#: ../midori/main.c:1489 +#: ../midori/main.c:1516 msgid "An instance of Midori is already running but not responding.\n" msgstr "" -#: ../midori/main.c:1539 -#, c-format -msgid "The search engines couldn't be loaded. %s\n" -msgstr "" - -#: ../midori/main.c:1551 -#, c-format -msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "" - #: ../midori/main.c:1566 #, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "" + +#: ../midori/main.c:1578 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "" + +#: ../midori/main.c:1593 +#, c-format msgid "The session couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1579 +#: ../midori/main.c:1606 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1592 +#: ../midori/main.c:1619 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "" -#: ../midori/main.c:1604 +#: ../midori/main.c:1631 msgid "The following errors occured:" msgstr "" -#: ../midori/main.c:1620 +#: ../midori/main.c:1647 msgid "_Ignore" msgstr "" @@ -217,1090 +217,1133 @@ msgstr "" msgid "Malformed document." msgstr "" -#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "" -#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3503 msgid "Reload the current page" msgstr "" -#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3500 msgid "Stop loading the current page" msgstr "" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "New folder" msgstr "" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "Edit folder" msgstr "" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "New bookmark" msgstr "" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "Edit bookmark" msgstr "" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:630 msgid "_Title:" msgstr "" -#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "" -#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:681 msgid "_Folder:" msgstr "" -#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 msgid "Toplevel folder" msgstr "" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:803 msgid "Save file as" msgstr "" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:977 +#, c-format +msgid "The file %s has been downloaded." +msgstr "" + +#: ../midori/midori-browser.c:980 +msgid "Transfer completed" +msgstr "" + +#: ../midori/midori-browser.c:1658 msgid "Open file" msgstr "" -#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2936 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "" -#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2943 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Tab" msgstr "" -#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2946 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 msgid "Open in New _Window" msgstr "" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3107 msgid "Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3110 msgid "_Clear private data" msgstr "" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3123 msgid "Clear the following data:" msgstr "" -#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3131 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3134 msgid "Cookies" msgstr "" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3137 msgid "'Flash' Cookies" msgstr "" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3140 msgid "Website icons" msgstr "" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3220 msgid "A lightweight web browser." msgstr "" -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3228 msgid "translator-credits" msgstr "" -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3431 msgid "_File" msgstr "" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3434 msgid "Open a new window" msgstr "" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3437 msgid "Open a new tab" msgstr "" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3440 msgid "Open a file" msgstr "" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3443 msgid "Save to a file" msgstr "" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3445 msgid "_Close Tab" msgstr "" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3446 msgid "Close the current tab" msgstr "" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3448 msgid "C_lose Window" msgstr "" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3449 msgid "Close this window" msgstr "" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3452 msgid "Print the current page" msgstr "" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3455 msgid "Quit the application" msgstr "" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3457 msgid "_Edit" msgstr "" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3460 msgid "Cut the selected text" msgstr "" -#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3463 ../midori/midori-browser.c:3466 msgid "Copy the selected text" msgstr "" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3469 msgid "Paste text from the clipboard" msgstr "" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3472 msgid "Delete the selected text" msgstr "" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3475 msgid "Select all text" msgstr "" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3478 msgid "Find a word or phrase in the page" msgstr "" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3480 msgid "Find _Next" msgstr "" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3481 msgid "Find the next occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3483 msgid "Find _Previous" msgstr "" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3484 msgid "Find the previous occurrence of a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3487 msgid "_Quick Find" msgstr "" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3488 msgid "Quickly jump to a word or phrase" msgstr "" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3491 msgid "Configure the application preferences" msgstr "" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3493 msgid "_View" msgstr "" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3494 msgid "_Toolbars" msgstr "" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3506 msgid "Increase the zoom level" msgstr "" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3509 msgid "Decrease the zoom level" msgstr "" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3512 msgid "Reset the zoom level" msgstr "" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3513 msgid "_Encoding" msgstr "" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3515 msgid "_Automatic" msgstr "" -#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3518 ../midori/midori-websettings.c:202 msgid "Chinese (BIG5)" msgstr "" -#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3521 ../midori/midori-websettings.c:203 msgid "Japanese (SHIFT_JIS)" msgstr "" -#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3524 ../midori/midori-websettings.c:204 msgid "Russian (KOI8-R)" msgstr "" -#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3527 ../midori/midori-websettings.c:205 msgid "Unicode (UTF-8)" msgstr "" -#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3530 ../midori/midori-websettings.c:206 msgid "Western (ISO-8859-1)" msgstr "" -#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3533 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "" -#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3536 ../midori/midori-view.c:1187 msgid "View _Source" msgstr "" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3537 msgid "View the source code of the page" msgstr "" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3539 msgid "View Selection Source" msgstr "" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3540 msgid "View the source code of the selection" msgstr "" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3544 msgid "Toggle fullscreen view" msgstr "" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3546 msgid "_Go" msgstr "" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3549 msgid "Go back to the previous page" msgstr "" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3552 msgid "Go forward to the next page" msgstr "" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3555 msgid "Go to your homepage" msgstr "" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3557 msgid "Empty Trash" msgstr "" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3558 msgid "Delete the contents of the trash" msgstr "" -#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3560 ../midori/midori-view.c:1159 msgid "Undo Close Tab" msgstr "" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3561 msgid "Open the last closed tab" msgstr "" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3565 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "" -#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3567 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3568 msgid "Add a new bookmark folder" msgstr "" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3569 msgid "_Tools" msgstr "" -#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3571 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3572 msgid "Add, edit and remove search engines..." msgstr "" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3575 msgid "_Clear Private Data" msgstr "" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3576 msgid "Clear private data..." msgstr "" -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3580 msgid "_Previous Tab" msgstr "" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3581 msgid "Switch to the previous tab" msgstr "" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3583 msgid "_Next Tab" msgstr "" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3584 msgid "Switch to the next tab" msgstr "" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3586 msgid "_Help" msgstr "" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3588 msgid "_Contents" msgstr "" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3589 msgid "Show the documentation" msgstr "" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3591 msgid "_Frequent Questions" msgstr "" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3592 msgid "Show the Frequently Asked Questions" msgstr "" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3594 msgid "_Report a Bug" msgstr "" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3595 msgid "Open Midori's bug tracker" msgstr "" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3598 msgid "Show information about the program" msgstr "" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3605 msgid "P_rivate Browsing" msgstr "" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3606 msgid "Don't save any private data while browsing" msgstr "" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3611 msgid "_Menubar" msgstr "" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3612 msgid "Show menubar" msgstr "" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3615 msgid "_Navigationbar" msgstr "" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3616 msgid "Show navigationbar" msgstr "" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3619 msgid "Side_panel" msgstr "" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3620 msgid "Show sidepanel" msgstr "" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3623 msgid "_Bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3624 msgid "Show bookmarkbar" msgstr "" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3627 msgid "_Transferbar" msgstr "" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3628 msgid "Show transferbar" msgstr "" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3631 msgid "_Statusbar" msgstr "" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3632 msgid "Show statusbar" msgstr "" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4063 msgid "_Separator" msgstr "" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4070 msgid "_Location..." msgstr "" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4072 msgid "Open a particular location" msgstr "" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4094 msgid "_Web Search..." msgstr "" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4096 msgid "Run a web search" msgstr "" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4117 msgid "Reopen a previously closed tab or window" msgstr "" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4130 msgid "_Recently visited pages" msgstr "" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4132 msgid "Reopen pages that you visited earlier" msgstr "" -#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4145 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4147 msgid "Show the saved bookmarks" msgstr "" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4160 msgid "_Window" msgstr "" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4162 msgid "Show a list of all open tabs" msgstr "" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4329 msgid "_Inline Find:" msgstr "" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4354 msgid "Previous" msgstr "" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4359 msgid "Next" msgstr "" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4364 msgid "Match Case" msgstr "" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4372 msgid "Highlight Matches" msgstr "" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4382 msgid "Close Findbar" msgstr "" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4417 ../extensions/cookie-manager.c:819 +msgid "Delete All" +msgstr "" + +#: ../midori/midori-browser.c:4729 #, c-format msgid "Unexpected setting '%s'" msgstr "" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" msgstr "" -#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 msgid "Align sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 msgid "Whether to align the sidepanel on the right" msgstr "" -#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 msgid "Close panel" msgstr "" -#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2000 msgid "Blank page" msgstr "" -#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 msgid "Homepage" msgstr "" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Last open pages" msgstr "" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "New tab" msgstr "" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "New window" msgstr "" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "Current tab" msgstr "" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Default" msgstr "" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Icons" msgstr "" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Text" msgstr "" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Both" msgstr "" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Both horizontal" msgstr "" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "All cookies" msgstr "" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Session cookies" msgstr "" -#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 msgid "None" msgstr "" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Safari" msgstr "" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "Firefox" msgstr "" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Internet Explorer" msgstr "" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:331 msgid "Remember last window size" msgstr "" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Whether to save the last window size" msgstr "" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Last window width" msgstr "" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "The last saved window width" msgstr "" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Last window height" msgstr "" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:350 msgid "The last saved window height" msgstr "" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Last panel position" msgstr "" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "The last saved panel position" msgstr "" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Last panel page" msgstr "" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel page" msgstr "" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Last Web search" msgstr "" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "The last saved Web search" msgstr "" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Show Menubar" msgstr "" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to show the menubar" msgstr "" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Show Navigationbar" msgstr "" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Whether to show the navigationbar" msgstr "" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:422 msgid "Show Bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the bookmarkbar" msgstr "" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "Show Panel" msgstr "" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the panel" msgstr "" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show Transferbar" msgstr "" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the transferbar" msgstr "" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Show Statusbar" msgstr "" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the statusbar" msgstr "" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Toolbar Style" msgstr "" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "The style of the toolbar" msgstr "" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:483 msgid "Show progress in location entry" msgstr "" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:484 msgid "Whether to show loading progress in the location entry" msgstr "" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:499 msgid "Search engines in location completion" msgstr "" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:500 msgid "Whether to show search engines in the location completion" msgstr "" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "Toolbar Items" msgstr "" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:509 msgid "The items to show on the toolbar" msgstr "" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Compact Sidepanel" msgstr "" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Whether to make the sidepanel compact" msgstr "" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 msgid "Load on Startup" msgstr "" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "What to load on startup" msgstr "" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The homepage" msgstr "" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:569 msgid "Show crash dialog" msgstr "" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:570 msgid "Show a dialog after Midori crashed" msgstr "" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:578 msgid "Download Folder" msgstr "" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:579 msgid "The folder downloaded files are saved to" msgstr "" -#: ../midori/midori-websettings.c:589 -msgid "Download Manager" -msgstr "" - -#: ../midori/midori-websettings.c:590 -msgid "An external download manager" -msgstr "" - #: ../midori/midori-websettings.c:598 -msgid "Text Editor" +msgid "Ask for the destination folder" msgstr "" #: ../midori/midori-websettings.c:599 -msgid "An external text editor" +msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -#: ../midori/midori-websettings.c:614 -msgid "News Aggregator" +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:615 -msgid "An external news aggregator" +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" msgstr "" -#: ../midori/midori-websettings.c:623 -msgid "Location entry Search" -msgstr "" - -#: ../midori/midori-websettings.c:624 -msgid "The search to perform inside the location entry" +#: ../midori/midori-websettings.c:631 +msgid "Download Manager" msgstr "" #: ../midori/midori-websettings.c:632 +msgid "An external download manager" +msgstr "" + +#: ../midori/midori-websettings.c:640 +msgid "Text Editor" +msgstr "" + +#: ../midori/midori-websettings.c:641 +msgid "An external text editor" +msgstr "" + +#: ../midori/midori-websettings.c:656 +msgid "News Aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:657 +msgid "An external news aggregator" +msgstr "" + +#: ../midori/midori-websettings.c:665 +msgid "Location entry Search" +msgstr "" + +#: ../midori/midori-websettings.c:666 +msgid "The search to perform inside the location entry" +msgstr "" + +#: ../midori/midori-websettings.c:674 msgid "Preferred Encoding" msgstr "" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:675 msgid "The preferred character encoding" msgstr "" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:685 msgid "Always Show Tabbar" msgstr "" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:686 msgid "Always show the tabbar" msgstr "" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:694 msgid "Close Buttons on Tabs" msgstr "" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:695 msgid "Whether tabs have close buttons" msgstr "" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:703 msgid "Open new pages in" msgstr "" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:704 msgid "Where to open new pages" msgstr "" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:713 msgid "Open external pages in" msgstr "" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:714 msgid "Where to open externally opened pages" msgstr "" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:727 msgid "Middle click opens Selection" msgstr "" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:728 msgid "Load an address from the selection via middle click" msgstr "" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:736 msgid "Open tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:737 msgid "Whether to open new tabs in the background" msgstr "" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:745 msgid "Open Tabs next to Current" msgstr "" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:746 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:754 msgid "Open popups in tabs" msgstr "" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:755 msgid "Whether to open popup windows in tabs" msgstr "" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:771 msgid "Zoom Text and Images" msgstr "" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:772 msgid "Whether to zoom text and images" msgstr "" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:787 msgid "Find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:788 msgid "Whether to automatically find inline while typing" msgstr "" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:796 msgid "Accept cookies" msgstr "" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:797 msgid "What type of cookies to accept" msgstr "" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:806 msgid "Original cookies only" msgstr "" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:807 msgid "Accept cookies from the original website only" msgstr "" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:815 msgid "Maximum cookie age" msgstr "" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:816 msgid "The maximum number of days to save cookies for" msgstr "" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:826 msgid "Remember last visited pages" msgstr "" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:827 msgid "Whether the last visited pages are saved" msgstr "" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:835 msgid "Maximum history age" msgstr "" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save the history for" msgstr "" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:844 msgid "Remember last form inputs" msgstr "" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:845 msgid "Whether the last form inputs are saved" msgstr "" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:853 msgid "Remember last downloaded files" msgstr "" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:854 msgid "Whether the last downloaded files are saved" msgstr "" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:864 msgid "Proxy Server" msgstr "" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:865 msgid "The proxy server used for HTTP connections" msgstr "" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:880 msgid "Detect proxy server automatically" msgstr "" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:881 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:897 msgid "Identify as" msgstr "" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:898 msgid "What to identify as to web pages" msgstr "" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:914 msgid "Identification string" msgstr "" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:915 msgid "The application identification string" msgstr "" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:923 msgid "Cache size" msgstr "" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:924 msgid "The allowed size of the cache" msgstr "" +#: ../midori/midori-view.c:641 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "" + +#: ../midori/midori-view.c:643 ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "" + +#: ../midori/midori-view.c:646 +msgid "Try again" +msgstr "" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:673 ../midori/midori-view.c:2524 #, c-format msgid "Not found - %s" msgstr "" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1021 msgid "Open _Link" msgstr "" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1023 msgid "Open Link in New _Tab" msgstr "" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1040 msgid "Open Link in New _Window" msgstr "" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1049 msgid "_Download Link destination" msgstr "" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1055 msgid "_Save Link destination" msgstr "" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1064 msgid "Download with Download _Manager" msgstr "" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1093 msgid "Search _with" msgstr "" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1121 msgid "_Search the Web" msgstr "" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1131 msgid "Open Address in New _Tab" msgstr "" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1283 msgid "Open or download file" msgstr "" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1300 #, c-format msgid "File Type: '%s'" msgstr "" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1303 #, c-format msgid "File Type: %s ('%s')" msgstr "" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1307 #, c-format msgid "Open %s" msgstr "" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1710 #, c-format msgid "Inspect page - %s" msgstr "" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:1862 #, c-format msgid "Document cannot be displayed" msgstr "" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1879 #, c-format msgid "No documentation installed" msgstr "" @@ -1311,160 +1354,199 @@ msgid "Preferences for %s" msgstr "" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:399 msgid "General" msgstr "" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:400 msgid "Startup" msgstr "" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:416 msgid "Use current page as homepage" msgstr "" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "" -#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "" -#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "" -#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 -msgid "Enable plugins" +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" msgstr "" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" msgstr "" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "" + #. Page "Network" -#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 msgid "Network" msgstr "" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "" -#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 msgid "days" msgstr "" @@ -1500,64 +1582,64 @@ msgstr "" msgid "Use as _default" msgstr "" -#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "" -#: ../midori/sokoke.c:791 -msgid "P_lugins" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" msgstr "" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "" @@ -1589,15 +1671,15 @@ msgstr "" msgid "Bookmarks" msgstr "" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "" @@ -1609,42 +1691,42 @@ msgstr "" msgid "Extensions" msgstr "" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "" #: ../panels/midori-plugins.c:87 -msgid "Plugins" +msgid "Netscape plugins" msgstr "" #: ../panels/midori-transfers.c:256 @@ -1684,28 +1766,28 @@ msgstr "" msgid "Animation frames are broken" msgstr "" -#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 msgid "Choose file" msgstr "" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "" @@ -1740,63 +1822,143 @@ msgstr "" msgid "Question" msgstr "" -#: ../extensions/cookie-manager.c:501 +#: ../extensions/cookie-manager.c:502 msgid "" "Only the visible cookies are deleted which match the entered filter string." msgstr "" -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:680 msgid "Name" msgstr "" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:740 msgid "_Expand All" msgstr "" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:748 msgid "_Collapse All" msgstr "" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:821 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:836 msgid "Expand All" msgstr "" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:843 msgid "Collapse All" msgstr "" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:874 msgid "Filter:" msgstr "" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:879 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" msgstr "" -#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 msgid "Cookie Manager" msgstr "" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:946 msgid "_Cookie Manager" msgstr "" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:963 msgid "List, view and delete cookies" msgstr "" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:660 +msgid "Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Add new feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:720 +msgid "Delete feed" +msgstr "" + +#: ../extensions/feed-panel/feed-panel.c:803 +msgid "_Feeds" +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "" @@ -1813,3 +1975,11 @@ msgstr "" #: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "" + +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "" From c62f5a64b85815b90e67380e69e9926c3b7d284b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 May 2009 01:01:21 +0200 Subject: [PATCH 1095/2970] Update German translation --- po/de.po | 341 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 175 insertions(+), 166 deletions(-) diff --git a/po/de.po b/po/de.po index 0c00448f..842e632f 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-29 22:36+0200\n" +"POT-Creation-Date: 2009-05-03 00:47+0200\n" "PO-Revision-Date: 2009-04-30 00:15+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: German \n" @@ -225,12 +225,12 @@ msgstr "Fehlerhaftes Dokument" msgid "Writing failed." msgstr "Schreiben fehlgeschlagen." -#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3426 -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3503 msgid "Reload the current page" msgstr "Diese Seite neu laden" -#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3500 msgid "Stop loading the current page" msgstr "Laden dieser Seite abbrechen" @@ -244,533 +244,533 @@ msgstr "%d%% geladen" msgid "Unexpected action '%s'." msgstr "Unerwartete Aktion »%s«." -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:598 msgid "New folder" msgstr "Neuer Ordner" -#: ../midori/midori-browser.c:542 +#: ../midori/midori-browser.c:598 msgid "Edit folder" msgstr "Ordner bearbeiten" -#: ../midori/midori-browser.c:544 +#: ../midori/midori-browser.c:600 msgid "New bookmark" msgstr "Neues Lesezeichen" -#: ../midori/midori-browser.c:544 +#: ../midori/midori-browser.c:600 msgid "Edit bookmark" msgstr "Lesezeichen bearbeiten" -#: ../midori/midori-browser.c:574 +#: ../midori/midori-browser.c:630 msgid "_Title:" msgstr "_Titel:" -#: ../midori/midori-browser.c:587 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Beschreibung:" -#: ../midori/midori-browser.c:606 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse:" -#: ../midori/midori-browser.c:625 +#: ../midori/midori-browser.c:681 msgid "_Folder:" msgstr "_Ordner:" -#: ../midori/midori-browser.c:630 ../midori/midori-browser.c:671 +#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 msgid "Toplevel folder" msgstr "Oberster Ordner" -#: ../midori/midori-browser.c:747 +#: ../midori/midori-browser.c:803 msgid "Save file as" msgstr "Datei speichern unter" -#: ../midori/midori-browser.c:921 +#: ../midori/midori-browser.c:977 #, c-format msgid "The file %s has been downloaded." msgstr "Die Datei %s wurde heruntergeladen." -#: ../midori/midori-browser.c:924 +#: ../midori/midori-browser.c:980 msgid "Transfer completed" msgstr "Übertragung abgeschlossen" -#: ../midori/midori-browser.c:1602 +#: ../midori/midori-browser.c:1658 msgid "Open file" msgstr "Datei öffnen" -#: ../midori/midori-browser.c:2867 ../panels/midori-bookmarks.c:780 +#: ../midori/midori-browser.c:2936 ../panels/midori-bookmarks.c:780 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Alle in neuen _Reitern öffnen" -#: ../midori/midori-browser.c:2874 ../panels/midori-bookmarks.c:786 -#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:534 +#: ../midori/midori-browser.c:2943 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Tab" msgstr "In neuem _Reiter öffnen" -#: ../midori/midori-browser.c:2877 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:536 +#: ../midori/midori-browser.c:2946 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 msgid "Open in New _Window" msgstr "In neuem _Fenster öffnen" -#: ../midori/midori-browser.c:3038 +#: ../midori/midori-browser.c:3107 msgid "Clear Private Data" msgstr "Private Daten löschen" -#: ../midori/midori-browser.c:3041 +#: ../midori/midori-browser.c:3110 msgid "_Clear private data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3054 +#: ../midori/midori-browser.c:3123 msgid "Clear the following data:" msgstr "Folgende Daten löschen:" -#: ../midori/midori-browser.c:3062 ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3131 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Verlauf" -#: ../midori/midori-browser.c:3065 +#: ../midori/midori-browser.c:3134 msgid "Cookies" msgstr "Benutzerprofile/ Cookies" -#: ../midori/midori-browser.c:3068 +#: ../midori/midori-browser.c:3137 msgid "'Flash' Cookies" msgstr "«Flash» Cookies" -#: ../midori/midori-browser.c:3071 +#: ../midori/midori-browser.c:3140 msgid "Website icons" msgstr "Symbole von Internetseiten" -#: ../midori/midori-browser.c:3151 +#: ../midori/midori-browser.c:3220 msgid "A lightweight web browser." msgstr "Ein schlanker Internetbetrachter." -#: ../midori/midori-browser.c:3159 +#: ../midori/midori-browser.c:3228 msgid "translator-credits" msgstr "" "Enrico Tröger \n" "Christian Dywan " -#: ../midori/midori-browser.c:3360 +#: ../midori/midori-browser.c:3431 msgid "_File" msgstr "_Datei" -#: ../midori/midori-browser.c:3363 +#: ../midori/midori-browser.c:3434 msgid "Open a new window" msgstr "Ein neues Fenster öffnen" -#: ../midori/midori-browser.c:3366 +#: ../midori/midori-browser.c:3437 msgid "Open a new tab" msgstr "Einen neuen Reiter öffnen" -#: ../midori/midori-browser.c:3369 +#: ../midori/midori-browser.c:3440 msgid "Open a file" msgstr "Eine Datei öffnen" -#: ../midori/midori-browser.c:3372 +#: ../midori/midori-browser.c:3443 msgid "Save to a file" msgstr "In Datei speichern" -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:3445 msgid "_Close Tab" msgstr "Reiter s_chließen" -#: ../midori/midori-browser.c:3375 +#: ../midori/midori-browser.c:3446 msgid "Close the current tab" msgstr "Den aktuellen Reiter schließen" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3448 msgid "C_lose Window" msgstr "_Fenster schließen" -#: ../midori/midori-browser.c:3378 +#: ../midori/midori-browser.c:3449 msgid "Close this window" msgstr "Dieses Fenster schließen" -#: ../midori/midori-browser.c:3381 +#: ../midori/midori-browser.c:3452 msgid "Print the current page" msgstr "Aktuelle Seite ausdrucken" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3455 msgid "Quit the application" msgstr "Programm beenden" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3457 msgid "_Edit" msgstr "_Bearbeiten" -#: ../midori/midori-browser.c:3389 +#: ../midori/midori-browser.c:3460 msgid "Cut the selected text" msgstr "Markierten Text ausschneiden" -#: ../midori/midori-browser.c:3392 ../midori/midori-browser.c:3395 +#: ../midori/midori-browser.c:3463 ../midori/midori-browser.c:3466 msgid "Copy the selected text" msgstr "Markierten Text kopieren" -#: ../midori/midori-browser.c:3398 +#: ../midori/midori-browser.c:3469 msgid "Paste text from the clipboard" msgstr "Text aus der Zwischenablage einfügen" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3472 msgid "Delete the selected text" msgstr "Markierten Text löschen" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3475 msgid "Select all text" msgstr "Gesamten Text auswählen" -#: ../midori/midori-browser.c:3407 +#: ../midori/midori-browser.c:3478 msgid "Find a word or phrase in the page" msgstr "Finde ein Wort oder einen Satz auf der Seite" -#: ../midori/midori-browser.c:3409 +#: ../midori/midori-browser.c:3480 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3481 msgid "Find the next occurrence of a word or phrase" msgstr "Finde das nächste Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3412 +#: ../midori/midori-browser.c:3483 msgid "Find _Previous" msgstr "_Vorheriges suchen" -#: ../midori/midori-browser.c:3413 +#: ../midori/midori-browser.c:3484 msgid "Find the previous occurrence of a word or phrase" msgstr "Finde das voherige Auftreten eines Wortes oder Satzes" -#: ../midori/midori-browser.c:3416 +#: ../midori/midori-browser.c:3487 msgid "_Quick Find" msgstr "_Schnellsuche" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3488 msgid "Quickly jump to a word or phrase" msgstr "Schnell zu einem Wort oder Satz springen" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3491 msgid "Configure the application preferences" msgstr "Anwedungseinstellungen anpassen" -#: ../midori/midori-browser.c:3422 +#: ../midori/midori-browser.c:3493 msgid "_View" msgstr "_Ansicht" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3494 msgid "_Toolbars" msgstr "_Werkzeugleisten" -#: ../midori/midori-browser.c:3435 +#: ../midori/midori-browser.c:3506 msgid "Increase the zoom level" msgstr "Erhöhe die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3438 +#: ../midori/midori-browser.c:3509 msgid "Decrease the zoom level" msgstr "Verringere die Vergrößerungsstufe" -#: ../midori/midori-browser.c:3441 +#: ../midori/midori-browser.c:3512 msgid "Reset the zoom level" msgstr "Setzte die Vergrößerungsstufe zurück" -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:3513 msgid "_Encoding" msgstr "_Zeichensatz" -#: ../midori/midori-browser.c:3444 +#: ../midori/midori-browser.c:3515 msgid "_Automatic" msgstr "_Automatisch" -#: ../midori/midori-browser.c:3447 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3518 ../midori/midori-websettings.c:202 msgid "Chinese (BIG5)" msgstr "Chinesisch (BIG5)" -#: ../midori/midori-browser.c:3450 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3521 ../midori/midori-websettings.c:203 msgid "Japanese (SHIFT_JIS)" msgstr "Japanisch (SHIFT_JIS)" -#: ../midori/midori-browser.c:3453 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3524 ../midori/midori-websettings.c:204 msgid "Russian (KOI8-R)" msgstr "Russisch (KOI8-R)" -#: ../midori/midori-browser.c:3456 ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3527 ../midori/midori-websettings.c:205 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3459 ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3530 ../midori/midori-websettings.c:206 msgid "Western (ISO-8859-1)" msgstr "Westlich (ISO-8859-1)" -#: ../midori/midori-browser.c:3462 ../midori/midori-websettings.c:207 +#: ../midori/midori-browser.c:3533 ../midori/midori-websettings.c:207 #: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "Benutzerdefiniert…" -#: ../midori/midori-browser.c:3465 ../midori/midori-view.c:1142 +#: ../midori/midori-browser.c:3536 ../midori/midori-view.c:1187 msgid "View _Source" msgstr "_Quelltext anzeigen" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3537 msgid "View the source code of the page" msgstr "Zeige den Quelltext der Seite an" -#: ../midori/midori-browser.c:3468 +#: ../midori/midori-browser.c:3539 msgid "View Selection Source" msgstr "Quelltext der Markierung anzeigen" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3540 msgid "View the source code of the selection" msgstr "Zeige den Quelltext der Markierung an" -#: ../midori/midori-browser.c:3473 +#: ../midori/midori-browser.c:3544 msgid "Toggle fullscreen view" msgstr "Vollbildmodus ein-/ ausschalten" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:3546 msgid "_Go" msgstr "_Gehe zu" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3549 msgid "Go back to the previous page" msgstr "Gehe zur voherigen Seite zurück" -#: ../midori/midori-browser.c:3481 +#: ../midori/midori-browser.c:3552 msgid "Go forward to the next page" msgstr "Gehe weiter zur nächsten Seite" -#: ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:3555 msgid "Go to your homepage" msgstr "Gehe zu Deiner Startseite" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3557 msgid "Empty Trash" msgstr "Papierkorb leeren" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3558 msgid "Delete the contents of the trash" msgstr "Inhalt des Papierkorbs löschen" -#: ../midori/midori-browser.c:3489 ../midori/midori-view.c:1114 +#: ../midori/midori-browser.c:3560 ../midori/midori-view.c:1159 msgid "Undo Close Tab" msgstr "Reiter zurückholen" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3561 msgid "Open the last closed tab" msgstr "Zuletzt geschlossenen Reiter öffnen" -#: ../midori/midori-browser.c:3494 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3565 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Ein neues Lesezeichen hinzufügen" -#: ../midori/midori-browser.c:3496 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3567 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Einen neuen Ordner hinzufügen" -#: ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3568 msgid "Add a new bookmark folder" msgstr "Einen neuen Lesezeichenordner hinzufügen" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3569 msgid "_Tools" msgstr "_Extras" -#: ../midori/midori-browser.c:3500 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3571 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Suchmaschinen verwalten" -#: ../midori/midori-browser.c:3501 +#: ../midori/midori-browser.c:3572 msgid "Add, edit and remove search engines..." msgstr "Suchmaschinen hinzufügen, bearbeiten und löschen…" -#: ../midori/midori-browser.c:3504 +#: ../midori/midori-browser.c:3575 msgid "_Clear Private Data" msgstr "_Private Daten löschen" -#: ../midori/midori-browser.c:3505 +#: ../midori/midori-browser.c:3576 msgid "Clear private data..." msgstr "Private Daten löschen..." -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3580 msgid "_Previous Tab" msgstr "_Vorheriger Reiter" -#: ../midori/midori-browser.c:3510 +#: ../midori/midori-browser.c:3581 msgid "Switch to the previous tab" msgstr "Zum voherigen Reiter wechseln" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3583 msgid "_Next Tab" msgstr "_Nächster Reiter" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3584 msgid "Switch to the next tab" msgstr "Zum nächsten Reiter wechseln" -#: ../midori/midori-browser.c:3515 +#: ../midori/midori-browser.c:3586 msgid "_Help" msgstr "_Hilfe" -#: ../midori/midori-browser.c:3517 +#: ../midori/midori-browser.c:3588 msgid "_Contents" msgstr "_Inhalt" -#: ../midori/midori-browser.c:3518 +#: ../midori/midori-browser.c:3589 msgid "Show the documentation" msgstr "Zeige die Dokumentation" -#: ../midori/midori-browser.c:3520 +#: ../midori/midori-browser.c:3591 msgid "_Frequent Questions" msgstr "_Häufige Fragen" -#: ../midori/midori-browser.c:3521 +#: ../midori/midori-browser.c:3592 msgid "Show the Frequently Asked Questions" msgstr "Häufig gestellte Fragen anzeigen" -#: ../midori/midori-browser.c:3523 +#: ../midori/midori-browser.c:3594 msgid "_Report a Bug" msgstr "Fehler _berichten" -#: ../midori/midori-browser.c:3524 +#: ../midori/midori-browser.c:3595 msgid "Open Midori's bug tracker" msgstr "Midoris Fehlerverfolgung öffnen" -#: ../midori/midori-browser.c:3527 +#: ../midori/midori-browser.c:3598 msgid "Show information about the program" msgstr "Zeige Informationen über das Programm" -#: ../midori/midori-browser.c:3534 +#: ../midori/midori-browser.c:3605 msgid "P_rivate Browsing" msgstr "_Privat navigieren" -#: ../midori/midori-browser.c:3535 +#: ../midori/midori-browser.c:3606 msgid "Don't save any private data while browsing" msgstr "Keinerlei private Daten während des Navigierens speichern" -#: ../midori/midori-browser.c:3540 +#: ../midori/midori-browser.c:3611 msgid "_Menubar" msgstr "_Menüleiste" -#: ../midori/midori-browser.c:3541 +#: ../midori/midori-browser.c:3612 msgid "Show menubar" msgstr "Menüleiste anzeigen" -#: ../midori/midori-browser.c:3544 +#: ../midori/midori-browser.c:3615 msgid "_Navigationbar" msgstr "_Navigationsleiste" -#: ../midori/midori-browser.c:3545 +#: ../midori/midori-browser.c:3616 msgid "Show navigationbar" msgstr "Navigationsleiste anzeigen" -#: ../midori/midori-browser.c:3548 +#: ../midori/midori-browser.c:3619 msgid "Side_panel" msgstr "Seiten_leiste" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3620 msgid "Show sidepanel" msgstr "Seitenleiste anzeigen" -#: ../midori/midori-browser.c:3552 +#: ../midori/midori-browser.c:3623 msgid "_Bookmarkbar" msgstr "_Lesezeichenleiste" -#: ../midori/midori-browser.c:3553 +#: ../midori/midori-browser.c:3624 msgid "Show bookmarkbar" msgstr "Lesezeichenleiste anzeigen" -#: ../midori/midori-browser.c:3556 +#: ../midori/midori-browser.c:3627 msgid "_Transferbar" msgstr "_Übertragungsleiste" -#: ../midori/midori-browser.c:3557 +#: ../midori/midori-browser.c:3628 msgid "Show transferbar" msgstr "Übertragungsleiste anzeigen" -#: ../midori/midori-browser.c:3560 +#: ../midori/midori-browser.c:3631 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../midori/midori-browser.c:3561 +#: ../midori/midori-browser.c:3632 msgid "Show statusbar" msgstr "Statusleiste anzeigen" -#: ../midori/midori-browser.c:3996 +#: ../midori/midori-browser.c:4063 msgid "_Separator" msgstr "_Trennlinie" -#: ../midori/midori-browser.c:4003 +#: ../midori/midori-browser.c:4070 msgid "_Location..." msgstr "_Ort…" -#: ../midori/midori-browser.c:4005 +#: ../midori/midori-browser.c:4072 msgid "Open a particular location" msgstr "Öffne einen bestimmten Ort" -#: ../midori/midori-browser.c:4027 +#: ../midori/midori-browser.c:4094 msgid "_Web Search..." msgstr "Im _Netz suchen…" -#: ../midori/midori-browser.c:4029 +#: ../midori/midori-browser.c:4096 msgid "Run a web search" msgstr "Starte eine Suche im Netz" -#: ../midori/midori-browser.c:4050 +#: ../midori/midori-browser.c:4117 msgid "Reopen a previously closed tab or window" msgstr "Reiter oder Fenster zurückholen" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4130 msgid "_Recently visited pages" msgstr "_Zuletzt besuchte Seiten" -#: ../midori/midori-browser.c:4065 +#: ../midori/midori-browser.c:4132 msgid "Reopen pages that you visited earlier" msgstr "Bereits besuchte Seiten erneut öffnen" -#: ../midori/midori-browser.c:4078 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4145 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../midori/midori-browser.c:4080 +#: ../midori/midori-browser.c:4147 msgid "Show the saved bookmarks" msgstr "Die gespeicherten Lesezeichen anzeigen" -#: ../midori/midori-browser.c:4093 +#: ../midori/midori-browser.c:4160 msgid "_Window" msgstr "_Fenster" -#: ../midori/midori-browser.c:4095 +#: ../midori/midori-browser.c:4162 msgid "Show a list of all open tabs" msgstr "Zeige eine Übersicht aller offenen Reiter" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4262 +#: ../midori/midori-browser.c:4329 msgid "_Inline Find:" msgstr "_Inkrementelle Suche:" -#: ../midori/midori-browser.c:4287 +#: ../midori/midori-browser.c:4354 msgid "Previous" msgstr "Zurück" -#: ../midori/midori-browser.c:4292 +#: ../midori/midori-browser.c:4359 msgid "Next" msgstr "Weiter" -#: ../midori/midori-browser.c:4297 +#: ../midori/midori-browser.c:4364 msgid "Match Case" msgstr "Groß-/ Kleinschreibung" -#: ../midori/midori-browser.c:4305 +#: ../midori/midori-browser.c:4372 msgid "Highlight Matches" msgstr "Treffer hervorheben" -#: ../midori/midori-browser.c:4315 +#: ../midori/midori-browser.c:4382 msgid "Close Findbar" msgstr "Suchleiste schließen" -#: ../midori/midori-browser.c:4350 ../extensions/cookie-manager.c:819 +#: ../midori/midori-browser.c:4417 ../extensions/cookie-manager.c:819 msgid "Delete All" msgstr "Alle löschen" -#: ../midori/midori-browser.c:4662 +#: ../midori/midori-browser.c:4729 #, c-format msgid "Unexpected setting '%s'" msgstr "Unerwartete Einstellung »%s«" @@ -795,7 +795,7 @@ msgstr "Die Seitenleiste auf der rechten Seite anordnen" msgid "Close panel" msgstr "Leiste schließen" -#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:1947 +#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2000 msgid "Blank page" msgstr "Leere Seite" @@ -1262,81 +1262,94 @@ msgstr "Zwischenspeichergröße" msgid "The allowed size of the cache" msgstr "Die erlaubte Zwischenspeichergröße" +#: ../midori/midori-view.c:641 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Die Seite «%s» konnte nicht geladen werden." + +#: ../midori/midori-view.c:643 ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Fehler" + +#: ../midori/midori-view.c:646 +msgid "Try again" +msgstr "Erneut versuchen" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:629 ../midori/midori-view.c:2471 +#: ../midori/midori-view.c:673 ../midori/midori-view.c:2524 #, c-format msgid "Not found - %s" msgstr "Nicht gefunden - %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1021 msgid "Open _Link" msgstr "Verweis ö_ffnen" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1023 msgid "Open Link in New _Tab" msgstr "Verweis in neuem _Reiter öffnen" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1040 msgid "Open Link in New _Window" msgstr "Verweis in neuem _Fenster öffnen" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1049 msgid "_Download Link destination" msgstr "Verweisziel herunter_laden" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1055 msgid "_Save Link destination" msgstr "Verweisziel _speichern" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1064 msgid "Download with Download _Manager" msgstr "Mit Übertragungs_manager herunterladen" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1093 msgid "Search _with" msgstr "Suchen _mit" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1121 msgid "_Search the Web" msgstr "Im Netz _suchen" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1131 msgid "Open Address in New _Tab" msgstr "Adresse in neuem _Reiter öffnen" -#: ../midori/midori-view.c:1238 +#: ../midori/midori-view.c:1283 msgid "Open or download file" msgstr "Datei öffnen oder herunterladen" -#: ../midori/midori-view.c:1255 +#: ../midori/midori-view.c:1300 #, c-format msgid "File Type: '%s'" msgstr "Dateityp: «%s»" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1303 #, c-format msgid "File Type: %s ('%s')" msgstr "Dateityp: %s («%s»)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1262 +#: ../midori/midori-view.c:1307 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../midori/midori-view.c:1665 +#: ../midori/midori-view.c:1710 #, c-format msgid "Inspect page - %s" msgstr "Seite untersuchen - %s" -#: ../midori/midori-view.c:1810 +#: ../midori/midori-view.c:1862 #, c-format msgid "Document cannot be displayed" msgstr "Dokument kann nicht angezeigt werden" -#: ../midori/midori-view.c:1826 +#: ../midori/midori-view.c:1879 #, c-format msgid "No documentation installed" msgstr "Keine Dokumentation installiert" @@ -1763,16 +1776,16 @@ msgstr "Das Bestandssymbol »%s« konnte nicht geladen werden" msgid "Animation frames are broken" msgstr "Animationsbilder sind fehlerhaft" -#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Eigenschaft »%s« ist ungültig für %s" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Datei wählen" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Dateispeicherordner auswählen" @@ -1895,25 +1908,25 @@ msgstr "" "Die für Atom benötigten \"feed\"-Elemente wurden im XML nicht gefunden." #. i18n: The local date a feed was last updated -#: ../extensions/feed-panel/feed-panel.c:394 +#: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." msgstr "Zuletzt aktualisiert: %s." -#: ../extensions/feed-panel/feed-panel.c:656 +#: ../extensions/feed-panel/feed-panel.c:660 msgid "Feeds" msgstr "Nachrichtenquellen" -#: ../extensions/feed-panel/feed-panel.c:709 +#: ../extensions/feed-panel/feed-panel.c:713 msgid "Add new feed" msgstr "Eine neue Nachrichtenquelle hinzufügen" -#: ../extensions/feed-panel/feed-panel.c:716 +#: ../extensions/feed-panel/feed-panel.c:720 msgid "Delete feed" msgstr "Nachrichtenquelle löschen" -#: ../extensions/feed-panel/feed-panel.c:799 +#: ../extensions/feed-panel/feed-panel.c:803 msgid "_Feeds" msgstr "_Nachrichtenquellen (Feeds)" @@ -1950,10 +1963,6 @@ msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" "Die für RSS benötigten \"channel\"-Elemente wurden im XML nicht gefunden." -#: ../extensions/feed-panel/main.c:112 -msgid "Error" -msgstr "Fehler" - #: ../extensions/feed-panel/main.c:114 #, c-format msgid "Feed '%s' already exists" From 2d09f9358feb86c70b3f9966e64263c1af51c3dc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 May 2009 01:51:13 +0200 Subject: [PATCH 1096/2970] Update French translation --- po/fr.po | 1014 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 599 insertions(+), 415 deletions(-) diff --git a/po/fr.po b/po/fr.po index c63f079c..ba750222 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,9 +8,9 @@ # msgid "" msgstr "" -"Project-Id-Version: midori 0.1.5\n" +"Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" +"POT-Creation-Date: 2009-05-03 00:47+0200\n" "PO-Revision-Date: 2009-04-19 16:05+0100\n" "Last-Translator: Christian Dywan \n" "Language-Team: French \n" @@ -23,9 +23,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Navigateur internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 -#: ../midori/main.c:1396 ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 +#: ../midori/main.c:1423 ../midori/main.c:1434 +#: ../midori/midori-websettings.c:275 msgid "Midori" msgstr "Midori" @@ -33,80 +33,80 @@ msgstr "Midori" msgid "Web Browser" msgstr "Navigateur internet" -#: ../midori/main.c:94 +#: ../midori/main.c:95 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:156 ../midori/main.c:228 +#: ../midori/main.c:157 ../midori/main.c:237 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:332 +#: ../midori/main.c:349 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:381 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:435 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Impossible de supprimer de l'historique l'élément : %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:459 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 #, c-format msgid "Failed to add history item: %s\n" msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:711 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Impossible de supprimer de l'historique les anciens éléments : %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:740 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "La configuration n'a pu être enregistrée. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:769 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" -#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Les signets n'ont pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 ../midori/main.c:873 +#: ../midori/main.c:868 ../midori/main.c:891 #, c-format msgid "The trash couldn't be saved. %s" msgstr "La corbeille n'a pu être enregistrée. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:964 #, c-format msgid "The session couldn't be saved. %s" msgstr "La session n'a pu être enregistrée. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1091 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -115,106 +115,106 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1088 +#: ../midori/main.c:1106 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1092 +#: ../midori/main.c:1110 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1097 +#: ../midori/main.c:1115 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1288 +#: ../midori/main.c:1314 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1311 +#: ../midori/main.c:1337 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "Run ADDRESS as a web application" msgstr "Exécuter l'adresse spécifié comme application internet" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "ADDRESS" msgstr "Adresse" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1340 +#: ../midori/main.c:1366 msgid "Run the specified filename as javascript" msgstr "Exécuter le fichier spécifié en tant que javascript" -#: ../midori/main.c:1342 +#: ../midori/main.c:1368 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1344 +#: ../midori/main.c:1370 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1385 +#: ../midori/main.c:1412 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1435 msgid "Please report comments, suggestions and bugs to:" msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" -#: ../midori/main.c:1410 +#: ../midori/main.c:1437 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1454 +#: ../midori/main.c:1481 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1489 +#: ../midori/main.c:1516 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1566 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1578 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Les signets n'ont pu être chargés : %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1593 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "La session n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1579 +#: ../midori/main.c:1606 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "La corbeille n'a pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1592 +#: ../midori/main.c:1619 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "L'historique n'a pu être chargé : %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1631 msgid "The following errors occured:" msgstr "Les erreurs suivantes ont eu lieu :" -#: ../midori/main.c:1620 +#: ../midori/main.c:1647 msgid "_Ignore" msgstr "_Ignorer" @@ -226,124 +226,134 @@ msgstr "Fichier non trouvé." msgid "Malformed document." msgstr "Document mal formé." -#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3503 msgid "Reload the current page" msgstr "Actualiser la page" -#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3500 msgid "Stop loading the current page" msgstr "Arrêter le chargement de la page" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "%d %% chargés" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "Action inattendue « %s »" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:630 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:681 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:803 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:977 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Le fichier %s a été téléchargé." + +#: ../midori/midori-browser.c:980 +msgid "Transfer completed" +msgstr "Transfert completé" + +#: ../midori/midori-browser.c:1658 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2936 ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2943 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2946 ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3107 msgid "Clear Private Data" msgstr "Effacer informations privées" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3110 msgid "_Clear private data" msgstr "_Effacer informations privées" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3123 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3131 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3134 msgid "Cookies" msgstr "Fichiers témoins/ Cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3137 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3140 msgid "Website icons" msgstr "Icônes de pages internet" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3220 msgid "A lightweight web browser." msgstr "Un navigateur internet léger." -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3228 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -351,979 +361,1015 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3431 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3434 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3437 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3440 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3443 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3445 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3446 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3448 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3449 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3452 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3455 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3457 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3460 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3463 ../midori/midori-browser.c:3466 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3469 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3472 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3475 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3478 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3480 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3481 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3483 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3484 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3487 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3488 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3491 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3493 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3494 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3506 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3509 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3512 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3513 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3515 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3518 ../midori/midori-websettings.c:202 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3521 ../midori/midori-websettings.c:203 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3524 ../midori/midori-websettings.c:204 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3527 ../midori/midori-websettings.c:205 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3530 ../midori/midori-websettings.c:206 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3533 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3536 ../midori/midori-view.c:1187 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3537 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3539 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3540 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3544 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3546 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3549 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3552 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3555 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3557 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3558 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3560 ../midori/midori-view.c:1159 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3561 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3565 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3567 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Ajouter un nouveau répertoire" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3568 msgid "Add a new bookmark folder" msgstr "Ajouter un nouveau dossier signet" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3569 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3571 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3572 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3575 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3576 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3580 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3581 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3583 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3584 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3586 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3588 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3589 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3591 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3592 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3594 msgid "_Report a Bug" msgstr "_Rapporter une anomalie" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3595 msgid "Open Midori's bug tracker" msgstr "Ouvrir le gestionnaire d'anomalies de Midori" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3598 msgid "Show information about the program" msgstr "Afficher des informations concernant le programme" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3605 msgid "P_rivate Browsing" msgstr "Navigation _privée" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3606 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3611 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3612 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3615 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3616 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3619 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3620 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3623 msgid "_Bookmarkbar" msgstr "Barre de _signets" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3624 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3627 msgid "_Transferbar" msgstr "Barre de _transferts" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3628 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3631 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3632 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4063 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4070 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4072 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4094 msgid "_Web Search..." msgstr "Recherche _internet..." -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4096 msgid "Run a web search" msgstr "Lancer une recherche sur l'internet" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4117 msgid "Reopen a previously closed tab or window" msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4130 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4132 msgid "Reopen pages that you visited earlier" msgstr "Rouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4145 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4147 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4160 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4162 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4329 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4354 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4359 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4364 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4372 msgid "Highlight Matches" msgstr "Résultats analogues en surbrillance" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4382 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4417 ../extensions/cookie-manager.c:819 +msgid "Delete All" +msgstr "Supprimer tous" + +#: ../midori/midori-browser.c:4729 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Détacher le panneau choisi du fenêtre" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" msgstr "Indique s'il faut détacher le panneau latéral choisi du fenêtre" -#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2000 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "All cookies" msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:331 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:350 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Last Web search" msgstr "Dernière recherche sur la toile" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "The last saved Web search" msgstr "La dernière recherche sur la toile enregistrée" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:422 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the transferbar" msgstr "Indique s'il faut afficher la barre de transferts" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Toolbar Style" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:483 msgid "Show progress in location entry" msgstr "Progression dans le champ d'adresse" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:484 msgid "Whether to show loading progress in the location entry" msgstr "Indique s'il faut afficher la progression dans le champ d'adresse" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:499 msgid "Search engines in location completion" msgstr "Recherche dans complètement d'adresse" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:500 msgid "Whether to show search engines in the location completion" msgstr "" "Indique s'il faut afficher les moteurs de recherche dans le complètement " "d'adresse" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:509 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:569 msgid "Show crash dialog" msgstr "Afficher le dialogue de fermeture inattendue" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:570 msgid "Show a dialog after Midori crashed" msgstr "Afficher un dialogue en cas de fermeture inattendue de Midori" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:578 msgid "Download Folder" msgstr "Dossier de téléchargements" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:579 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:598 +msgid "Ask for the destination folder" +msgstr "Demander le dossier de destination" + +#: ../midori/midori-websettings.c:599 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Indique s'il faut demander le dossier de destination quand un fichier " +"est téléchargé." + +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" +msgstr "Notifier quand un transfert a complété." + +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "" +"Indique s'il faut afficher une notification quand un transfert a complété" + +#: ../midori/midori-websettings.c:631 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:632 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:640 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:641 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:656 msgid "News Aggregator" msgstr "Agrégateur de flux" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:657 msgid "An external news aggregator" msgstr "Un agrégateur de flux externe" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:665 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:666 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:674 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:675 msgid "The preferred character encoding" msgstr "Encodage des caractères favori" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:685 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:686 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:694 msgid "Close Buttons on Tabs" msgstr "Boutons fermer sur les onglets" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:695 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:703 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:704 msgid "Where to open new pages" msgstr "Où ouvrir les nouvelles pages" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:713 msgid "Open external pages in" msgstr "Ouvrir les pages externes dans" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:714 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:727 msgid "Middle click opens Selection" msgstr "Clic du milieu ouvre la sélection" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:728 msgid "Load an address from the selection via middle click" msgstr "" "Charger l'addresse sous la sélection avec le bouton central de la souris" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:736 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:737 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:745 msgid "Open Tabs next to Current" msgstr "Ouvrir les onglets à côté de l'actuel" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:746 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" "Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " "dernier" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:754 msgid "Open popups in tabs" msgstr "Ouvrir les fenêtres surgissantes dans des onglets" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:755 msgid "Whether to open popup windows in tabs" msgstr "" "Indique s'il faut ouvrir les fenêtres surgissantes (popup) dans des onglets" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:771 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:772 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:787 msgid "Find inline while typing" -msgstr "Chercher en ligne en tapant" +msgstr "Chercher dans la page durant la saisie" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:788 msgid "Whether to automatically find inline while typing" -msgstr "Indique s'il faut chercher automatiquement en ligne en tapant" +msgstr "Indique s'il faut chercher automatiquement dans la page durant la saisie" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:796 msgid "Accept cookies" msgstr "Accepter les cookies" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:797 msgid "What type of cookies to accept" msgstr "Type de fichiers témoins à accepter" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:806 msgid "Original cookies only" msgstr "Uniquement les cookies d'origine" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:807 msgid "Accept cookies from the original website only" msgstr "Accepter les fichiers témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:815 msgid "Maximum cookie age" msgstr "Âge maximal des cookies" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:816 msgid "The maximum number of days to save cookies for" msgstr "" "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:826 msgid "Remember last visited pages" msgstr "Se souvenir des pages récemment visitées" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:827 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:835 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save the history for" msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:844 msgid "Remember last form inputs" msgstr "Se souvenir des dernières saisies de formulaires" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:845 msgid "Whether the last form inputs are saved" msgstr "Indique s'il faut enregistrer les saisies de formulaires" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:853 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:854 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:864 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:865 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:880 msgid "Detect proxy server automatically" msgstr "Détecter le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:881 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:897 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:898 msgid "What to identify as to web pages" msgstr "Comment s'identifier sur les pages de la toile" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:914 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:915 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:923 msgid "Cache size" msgstr "Taille du cache" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:924 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" +# pas très content +#: ../midori/midori-view.c:641 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "La page » %s « n'a pu être chargée." + +#: ../midori/midori-view.c:643 ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Erreur" + +#: ../midori/midori-view.c:646 +msgid "Try again" +msgstr "Essayer une autre fois" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:673 ../midori/midori-view.c:2524 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1021 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1023 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1040 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1049 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1055 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1064 msgid "Download with Download _Manager" msgstr "Télécharger avec _gestionnaire de téléchargements" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1093 msgid "Search _with" msgstr "Chercher _avec" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1121 msgid "_Search the Web" msgstr "_Chercher sur l'internet" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1131 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1283 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1300 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1303 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1307 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1710 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:1862 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1879 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" @@ -1334,160 +1380,200 @@ msgid "Preferences for %s" msgstr "Préférences de %s" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:399 msgid "General" msgstr "Général" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:400 msgid "Startup" msgstr "Démarrage" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:416 msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferts" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:484 -msgid "The default font size used to display text" -msgstr "La taille par défaut de la police utilisée pour afficher le texte" +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "La police par défaut utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "La taille de la police par défaut utilisée pour afficher le texte" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Police à taille fixe" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "La taille de la police par défaut utilisée pour afficher le texte à taille fixe" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Taille minimum de la police" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "La taille minimum de la police utilisée pour afficher le texte" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Encodage des caractères par défaut" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Charger les images" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Réduire les images" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Réduire automatiquement les images pour les adapter à la fenêtre" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimensionnées" -#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Activer les greffons" +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Activer les greffons Netscape" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "Active la prise en charge interne des greffons" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Correcteur d'orthographe" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Activer le correcteur d'orthographe" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Activer le correcteur d'orthographe durant la saisie" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "Une liste de langues séparée par des virgules utilisée pour le " +"correcteur d'ortographe, par example » fr_FR,de_DE « " + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Navigation" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Programmes" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Programmes externes" + #. Page "Network" -#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Témoins de connexion" -#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 msgid "days" msgstr "jours" @@ -1523,64 +1609,64 @@ msgstr "Gestion des moteurs de recherche" msgid "Use as _default" msgstr "Comme dé_faut" -#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Impossible d'exécuter le programme externe" #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Attention : vous utilisez Midori avec un compte superutilisateur !" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "_Signet" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "_Ajouter un signet" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Console" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Extensions" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "_Historique" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "_Page d'accueil" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "Scripts _utilisateur" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "_Styles utilisateur" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "Nouvel _onglet" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "_Transferts" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "G_reffons" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "_Greffons Netscape" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "Onglets et fenêtres _fermés" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "Nouvelle _fenêtre" @@ -1612,15 +1698,15 @@ msgstr "Désactiver" msgid "Bookmarks" msgstr "Signets" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Modifier le signet sélectionné" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Supprimer le signet sélectionné" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Séparateur" @@ -1632,43 +1718,43 @@ msgstr "Console" msgid "Extensions" msgstr "Extensions" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Ajouter un signet pour l'élément sélectionné de l'historique" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Supprimer l'élément sélectionné de l'historique" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Vider l'historique entier" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "Il y a une semaine" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "Il y a %d jours" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Hier" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Greffons" +msgid "Netscape plugins" +msgstr "Greffons Netscape" #: ../panels/midori-transfers.c:256 #, c-format @@ -1709,28 +1795,28 @@ msgstr "L'icône prédéfinie « %s » n'a pu être chargée." msgid "Animation frames are broken" msgstr "Les trames d'animation sont corrompues" -#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "La propriété « %s » n'est pas valide pour %s" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Choisissez un fichier" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Choisissez un répertoire" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Colorer les onglets" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "Onglets colorés" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "Donner une couleur distincte à chaque onglet" @@ -1771,64 +1857,148 @@ msgstr "Ètes-vous certain de vouloir effacer tout les fichiers témoins ?" msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager.c:501 +#: ../extensions/cookie-manager.c:502 msgid "" "Only the visible cookies are deleted which match the entered filter string." -msgstr "" +msgstr "Seulement les fichiers témoins visible sont effacé que " +"correspandent au filtre." -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:680 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:740 msgid "_Expand All" msgstr "_Afficher tous" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:748 msgid "_Collapse All" msgstr "_Masquer tous" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Supprimer tous" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:821 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" +"Effacer tous les fichiers témoins. S'il y a un filtre, seulement les " +"fichies témoins sont effacé que correspandent au filtre." -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:836 msgid "Expand All" msgstr "Afficher tous" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:843 msgid "Collapse All" msgstr "Masquer tous" # manque un raccourcis Alt+X -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:874 msgid "Filter:" msgstr "Filtre :" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:879 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" -msgstr "" +msgstr "Entrer un filtre pour afficher seulement les fichier témoins dont le " +"nom ou la domaine correspande au filtre entré." -#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 msgid "Cookie Manager" msgstr "Gestionnaire de cookies" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:946 msgid "_Cookie Manager" msgstr "Gestionnaire de _cookies" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:963 msgid "List, view and delete cookies" msgstr "Lister, afficher et supprimer les témoins" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "" + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Dernier mise a jour : %s." + +#: ../extensions/feed-panel/feed-panel.c:660 +msgid "Feeds" +msgstr "Flux" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Add new feed" +msgstr "Ajouter un nouveau flux" + +#: ../extensions/feed-panel/feed-panel.c:720 +msgid "Delete feed" +msgstr "Supprimer flux" + +#: ../extensions/feed-panel/feed-panel.c:803 +msgid "_Feeds" +msgstr "_Flux" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "Format de flux non supporté." + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "" + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Flux « %s » déjà existe" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Erreure à charger le flux « %s »" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Nouveau flux" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Panneau de flux" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Mouvements de souris" @@ -1846,6 +2016,20 @@ msgstr "Cadre de pages" msgid "_Pageholder" msgstr "C_adre de pages" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Fonctionnalités dans la barre d'état" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "" + +#~ msgid "P_lugins" +#~ msgstr "G_reffons" + +#~ msgid "Plugins" +#~ msgstr "Greffons" + #~ msgid "Images" #~ msgstr "Images" From 1d7293a2a80bc13cad04871d866e3ca366197fad Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 May 2009 01:53:49 +0200 Subject: [PATCH 1097/2970] Quote the page address in the error page --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5146d39b..aea2684a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -638,7 +638,7 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); - message = g_strdup_printf (_("The page %s couldn't be loaded."), uri); + message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); result = sokoke_replace_variables (template, "{title}", _("Error"), "{message}", message, From 9d472f405432c963deced29860826de798149c9f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 May 2009 03:11:33 +0200 Subject: [PATCH 1098/2970] Introduce 'news-feeds' property on MidoriView This is a KatzeArray of KatzeItems with the feeds of the loaded web page, particularly useful for extensions. --- midori/midori-view.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index aea2684a..ba7ed80c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -52,7 +52,7 @@ struct _MidoriView gchar* selected_text; MidoriWebSettings* settings; GtkWidget* web_view; - /* KatzeArray* news_feeds; */ + KatzeArray* news_feeds; gchar* download_manager; gchar* news_aggregator; @@ -127,7 +127,7 @@ enum PROP_LOAD_STATUS, PROP_PROGRESS, PROP_ZOOM_LEVEL, - /* PROP_NEWS_FEEDS, */ + PROP_NEWS_FEEDS, PROP_STATUSBAR_TEXT, PROP_SETTINGS, PROP_NET @@ -426,14 +426,21 @@ midori_view_class_init (MidoriViewClass* class) 1.0f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - /* g_object_class_install_property (gobject_class, + /** + * MidoriView:news-feeds: + * + * The news feeds advertised by the currently loaded page. + * + * Since: 0.1.7 + */ + g_object_class_install_property (gobject_class, PROP_NEWS_FEEDS, g_param_spec_object ( "news-feeds", "News Feeds", "The list of available news feeds", KATZE_TYPE_ARRAY, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); */ + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (gobject_class, PROP_STATUSBAR_TEXT, @@ -705,12 +712,31 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view, if (view->news_aggregator && *view->news_aggregator) { JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); + /* This snippet joins the available news feeds into a string like this: + URI1|title1,URI2|title2 + FIXME: Ensure separators contained in the string can't break it */ gchar* value = sokoke_js_script_eval (js_context, "function feeds (l) { var f = new Array (); for (i in l) " "{ var t = l[i].type; " "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) " - "f.push (l[i].href); } return f; }" + "f.push (l[i].href + '|' + l[i].title); } return f; }" "feeds (document.getElementsByTagName ('link'))", NULL); + gchar** items = g_strsplit (value, ",", 0); + gchar** iter; + + katze_array_clear (view->news_feeds); + for (iter = items; iter && *iter; iter++) + { + gchar** parts = g_strsplit (*iter, "|", 2); + KatzeItem* item = g_object_new (KATZE_TYPE_ITEM, + "uri", parts ? *parts : "", + "name", parts && *parts ? parts[1] : NULL, + NULL); + katze_array_add_item (view->news_feeds, item); + g_object_unref (item); + g_strfreev (parts); + } + g_strfreev (items); g_object_set_data (G_OBJECT (view), "news-feeds", value && *value ? (void*)1 : (void*)0); /* Ensure load-status is notified again, whether it changed or not */ @@ -1404,6 +1430,8 @@ midori_view_init (MidoriView* view) view->statusbar_text = NULL; view->link_uri = NULL; view->selected_text = NULL; + view->news_feeds = katze_array_new (KATZE_TYPE_ITEM); + view->item = NULL; view->download_manager = NULL; @@ -1431,6 +1459,7 @@ midori_view_finalize (GObject* object) katze_assign (view->statusbar_text, NULL); katze_assign (view->link_uri, NULL); katze_assign (view->selected_text, NULL); + katze_object_assign (view->news_feeds, NULL); katze_object_assign (view->settings, NULL); katze_object_assign (view->item, NULL); From dfef97949907e5888c13f18b7a13d7d7cb690022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 3 May 2009 10:14:55 +0200 Subject: [PATCH 1099/2970] Automatically reset the filter after deleting all matching cookies Also fix wording in the confirmation dialog. --- extensions/cookie-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/cookie-manager.c b/extensions/cookie-manager.c index ccf08a24..85718d0a 100644 --- a/extensions/cookie-manager.c +++ b/extensions/cookie-manager.c @@ -474,6 +474,8 @@ static void cm_delete_all_cookies_real(CMData *cmdata) } gtk_tree_path_free(path_first); + /* now that we deleted all matching cookies, we reset the filter */ + gtk_entry_set_text(GTK_ENTRY(cmdata->filter_entry), ""); cm_set_button_sensitiveness(cmdata, FALSE); } @@ -499,7 +501,7 @@ static void cm_button_delete_all_clicked_cb(GtkToolButton *button, CMData *cmdat if (*filter_text != '\0') { gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), - _("Only the visible cookies are deleted which match the entered filter string.")); + _("Only cookies which match the filter will be deleted.")); } if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) From ae23ae058333bcbcc8a9f94105969c48dfdae62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 3 May 2009 12:42:47 +0200 Subject: [PATCH 1100/2970] Implement middle click on array actions, ie. bookmark menu items Add a new signal activate-item-alt to KatzeArrayAction which has a button argument specifying the mouse button that was pressed. If this signal is handled one can special case middle or right clicks, and return TRUE to suppress the emission of activate-item. The browser utilizes this to open new tabs when middle clicking on bookmark menu items. --- katze/katze-arrayaction.c | 49 ++++++++++++++++++++++++++++++++++----- katze/marshal.list | 1 + midori/midori-browser.c | 27 +++++++++++++++++++++ 3 files changed, 71 insertions(+), 6 deletions(-) diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 7d704b84..0969c5d7 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -1,5 +1,6 @@ /* Copyright (C) 2008 Christian Dywan + Copyright (C) 2009 Enrico Tröger This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -13,6 +14,7 @@ #include "katze-net.h" #include "katze-utils.h" +#include "marshal.h" #include #include @@ -44,6 +46,7 @@ enum { POPULATE_POPUP, ACTIVATE_ITEM, + ACTIVATE_ITEM_ALT, LAST_SIGNAL }; @@ -107,6 +110,30 @@ katze_array_action_class_init (KatzeArrayActionClass* class) G_TYPE_NONE, 1, KATZE_TYPE_ITEM); + /** + * KatzeArrayAction::activate-item-alt: + * @array: the object on which the signal is emitted + * @item: the item being activated + * @button: the mouse button pressed + * + * An item was clicked with a particular button. Use this if you need + * to handle middle or right clicks specially. + * + * Return value: %TRUE if the event was handled. If %FALSE is returned, + * the default "activate-item" signal is emitted. + * + * Since: 0.1.7 + **/ + signals[ACTIVATE_ITEM_ALT] = g_signal_new ("activate-item-alt", + G_TYPE_FROM_CLASS (class), + (GSignalFlags) (G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + katze_cclosure_marshal_BOOLEAN__OBJECT_UINT, + G_TYPE_BOOLEAN, 2, + KATZE_TYPE_ITEM, G_TYPE_UINT); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = katze_array_action_finalize; gobject_class->set_property = katze_array_action_set_property; @@ -205,12 +232,20 @@ katze_array_action_activate (GtkAction* action) GTK_ACTION_CLASS (katze_array_action_parent_class)->activate (action); } -static void -katze_array_action_menu_item_activate_cb (GtkWidget* proxy, - KatzeArrayAction* array_action) +static gboolean +katze_array_action_menu_button_press_cb (GtkWidget* proxy, + GdkEventButton* event, + KatzeArrayAction* array_action) { KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem"); - g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); + gboolean handled; + + g_signal_emit (array_action, signals[ACTIVATE_ITEM_ALT], 0, item, event->button, &handled); + + if (!handled) + g_signal_emit (array_action, signals[ACTIVATE_ITEM], 0, item); + + return TRUE; } static void @@ -268,8 +303,10 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, G_CALLBACK (katze_array_action_menu_item_select_cb), array_action); } else - g_signal_connect (menuitem, "activate", - G_CALLBACK (katze_array_action_menu_item_activate_cb), array_action); + { + g_signal_connect (menuitem, "button-press-event", + G_CALLBACK (katze_array_action_menu_button_press_cb), array_action); + } gtk_widget_show (menuitem); } if (!i) diff --git a/katze/marshal.list b/katze/marshal.list index ce752891..f2d1b07c 100644 --- a/katze/marshal.list +++ b/katze/marshal.list @@ -1 +1,2 @@ VOID:POINTER,INT +BOOLEAN:OBJECT,UINT diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 606fed52..890ab773 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2226,6 +2226,31 @@ _action_bookmarks_activate_item (GtkAction* action, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } +static gboolean +_action_bookmarks_activate_item_alt (GtkAction* action, + KatzeItem* item, + guint button, + MidoriBrowser* browser) +{ + if (button == 2) + { + gint n; + gboolean open_in_background; + + g_object_get (browser->settings, "open-tabs-in-the-background", + &open_in_background, NULL); + + n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + + return FALSE; +} + static void _action_window_populate_popup (GtkAction* action, GtkMenu* menu, @@ -4151,6 +4176,8 @@ midori_browser_init (MidoriBrowser* browser) _action_bookmarks_populate_popup, browser, "signal::activate-item", _action_bookmarks_activate_item, browser, + "signal::activate-item-alt", + _action_bookmarks_activate_item_alt, browser, NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); From 606c629fa5b2a3b8bf8c609167b04b17bc532bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 3 May 2009 21:11:20 +0200 Subject: [PATCH 1101/2970] Use midori_browser_get_for_widget in the bookmark panel This fixes opening bookmarks in the current tab. --- panels/midori-bookmarks.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 71926ff9..a6658b9a 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -175,9 +175,9 @@ midori_bookmarks_delete_clicked_cb (GtkWidget* toolitem, static void midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem) { - GtkWidget* browser = gtk_widget_get_toplevel (toolitem); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (toolitem)); /* FIXME: Take selected folder into account */ - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), + midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE); } @@ -612,10 +612,8 @@ midori_bookmarks_row_activated_cb (GtkTreeView* treeview, uri = katze_item_get_uri (item); if (uri && *uri) { - GtkWidget* browser; - - browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + midori_browser_set_current_uri (browser, uri); } g_object_unref (item); @@ -662,8 +660,8 @@ midori_bookmarks_open_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - midori_browser_set_current_uri (MIDORI_BROWSER (browser), uri); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + midori_browser_set_current_uri (browser, uri); } } @@ -727,7 +725,7 @@ midori_bookmarks_open_in_window_activate_cb (GtkWidget* menuitem, if (uri && *uri) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); g_signal_emit_by_name (browser, "new-window", uri); } } @@ -744,8 +742,8 @@ midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, if (!is_separator) { - GtkWidget* browser = gtk_widget_get_toplevel (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (MIDORI_BROWSER (browser), item, FALSE, FALSE); + MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); } } From 186c2d708b2f971fe2eadcd913b47ea8781a6b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 3 May 2009 21:13:54 +0200 Subject: [PATCH 1102/2970] Ensure destroyed panel widgets remove the scrolled window --- midori/midori-panel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index e96bc600..5e19a327 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -542,9 +542,10 @@ static void midori_panel_viewable_destroy_cb (GtkWidget* viewable, MidoriPanel* panel) { - gint i = gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), viewable); + gint i = gtk_notebook_page_num (GTK_NOTEBOOK (panel->notebook), + g_object_get_data (G_OBJECT (viewable), "parent")); if (i > -1) - gtk_notebook_remove_page (GTK_NOTEBOOK (panel->notebook), i); + gtk_notebook_remove_page (GTK_NOTEBOOK (panel->notebook), i); g_signal_handlers_disconnect_by_func ( viewable, midori_panel_viewable_destroy_cb, panel); } @@ -667,6 +668,7 @@ midori_panel_append_page (MidoriPanel* panel, G_CALLBACK (midori_panel_widget_destroy_cb), menuitem); } + g_object_set_data (G_OBJECT (viewable), "parent", scrolled); g_signal_connect (viewable, "destroy", G_CALLBACK (midori_panel_viewable_destroy_cb), panel); From b92ebdccaaad9e8c3b0bad1935639c4fd1e576f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Sun, 3 May 2009 21:35:05 +0200 Subject: [PATCH 1103/2970] Implement middle-clicks on Back, Forward and Homepage tool buttons --- midori/midori-browser.c | 83 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 890ab773..d7215acb 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4524,7 +4524,88 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser) { - if (event->button == 3) + if (event->button == 2) + { + GtkWidget* parent = gtk_widget_get_parent (toolitem); + GtkAction* action = gtk_widget_get_action (parent); + const gchar* name; + gboolean open_in_background = FALSE; + gchar* homepage; + + g_return_val_if_fail (action != NULL, FALSE); + + if (!browser->settings) + return FALSE; + + g_object_get (browser->settings, "open-tabs-in-the-background", + &open_in_background, NULL); + + g_object_get (browser->settings, "homepage", &homepage, NULL); + + name = gtk_action_get_name (action); + + if (g_str_equal (name, "Homepage")) + { + gint n; + + n = midori_browser_add_uri (browser, homepage); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + else if (g_str_equal (name, "Back")) + { + GtkWidget* view; + WebKitWebBackForwardList* back_forward_list; + WebKitWebHistoryItem* back_item; + const gchar* back_uri; + gint n; + + view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); + + back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); + back_uri = webkit_web_history_item_get_uri (back_item); + + n = midori_browser_add_uri (browser, back_uri); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + else if (g_str_equal (name, "Forward")) + { + GtkWidget *view; + WebKitWebBackForwardList *back_forward_list; + WebKitWebHistoryItem *forward_item; + const gchar *forward_uri; + gint n; + + view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); + + forward_item = + webkit_web_back_forward_list_get_forward_item (back_forward_list); + forward_uri = webkit_web_history_item_get_uri (forward_item); + + n = midori_browser_add_uri (browser, forward_uri); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + + g_free (homepage); + } + else if (event->button == 3) { midori_browser_toolbar_popup_context_menu_cb ( GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? From 6ab464075d91a02e5488cc539e4558bbf713678d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 May 2009 21:41:31 +0200 Subject: [PATCH 1104/2970] Fix setting the news-feeds property of MidoriView --- midori/midori-view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index ba7ed80c..489d45ff 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1550,6 +1550,9 @@ midori_view_get_property (GObject* object, case PROP_ZOOM_LEVEL: g_value_set_float (value, midori_view_get_zoom_level (view)); break; + case PROP_NEWS_FEEDS: + g_value_set_object (value, view->news_feeds); + break; case PROP_STATUSBAR_TEXT: g_value_set_string (value, view->statusbar_text); break; From b6dde648759f66da9d6d02cf38b405704bbd0b1e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 4 May 2009 00:51:14 +0200 Subject: [PATCH 1105/2970] Return the correct content type in res_server responses --- midori/sokoke.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 1af7289d..c144aa79 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -984,13 +984,17 @@ res_server_handler_cb (SoupServer* res_server, { gchar* filename = g_strconcat (DATADIR "/midori", path, NULL); gchar* contents; - guint length; + gsize length; if (g_file_get_contents (filename, &contents, &length, NULL)) { - /* FIXME: Support any MIME type */ - soup_message_set_response (msg, "image/png", SOUP_MEMORY_TAKE, + gchar* content_type = g_content_type_guess (filename, (guchar*)contents, + length, NULL); + gchar* mime_type = g_content_type_get_mime_type (content_type); + g_free (content_type); + soup_message_set_response (msg, mime_type, SOUP_MEMORY_TAKE, contents, length); + g_free (mime_type); soup_message_set_status (msg, 401); } else From c5eba36cf41a73238d2721e7f86ca0c0a4791ba4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 4 May 2009 01:09:52 +0200 Subject: [PATCH 1106/2970] Reject non-local requests to the res_server This sever is solely meant to provide internal resources and should not be accessible from outside, so anything non-local is blocked with a No Content error. --- midori/sokoke.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index c144aa79..4af14af6 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -980,6 +980,12 @@ res_server_handler_cb (SoupServer* res_server, SoupClientContext* client, gpointer data) { + if (g_strcmp0 (soup_message_get_uri (msg)->host, "localhost")) + { + soup_message_set_status (msg, 204); + return; + } + if (g_str_has_prefix (path, "/res")) { gchar* filename = g_strconcat (DATADIR "/midori", path, NULL); @@ -995,7 +1001,7 @@ res_server_handler_cb (SoupServer* res_server, soup_message_set_response (msg, mime_type, SOUP_MEMORY_TAKE, contents, length); g_free (mime_type); - soup_message_set_status (msg, 401); + soup_message_set_status (msg, 200); } else soup_message_set_status (msg, 404); From adec655c01a36a910b63bc6a05b0bfd633f95d2a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 4 May 2009 02:09:46 +0200 Subject: [PATCH 1107/2970] Implement '--snapshot' or '-s' command line switch Calling Midori in the form "midori --snapshot URI" makes a snapshot of the specified address and saves it to PDF. The format, path or size can currently not be influenced. Also note that web pages which look different when printed will apply their print style. --- midori/main.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/midori/main.c b/midori/main.c index cacdd37a..1b2c781b 100644 --- a/midori/main.c +++ b/midori/main.c @@ -35,6 +35,7 @@ #else #define is_writable(_cfg_filename) 1 #endif +#include #include #include #include @@ -1344,6 +1345,31 @@ midori_run_script (const gchar* filename) return 1; } +static void +snapshot_load_finished_cb (GtkWidget* web_view, + WebKitWebFrame* web_frame, + gchar* filename) +{ + GError* error; + GtkPrintOperation* operation = gtk_print_operation_new (); + GtkPrintOperationAction action = GTK_PRINT_OPERATION_ACTION_EXPORT; + GtkPrintOperationResult result; + + gtk_print_operation_set_export_filename (operation, filename); + error = NULL; + result = webkit_web_frame_print_full (web_frame, operation, action, &error); + + if (error != NULL) + { + g_error ("%s", error->message); + gtk_main_quit (); + } + + g_object_unref (operation); + g_print (_("Snapshot saved to: %s\n"), filename); + gtk_main_quit (); +} + int main (int argc, char** argv) @@ -1351,6 +1377,7 @@ main (int argc, gchar* webapp; gchar* config; gboolean run; + gchar* snapshot; gboolean version; gchar** uris; MidoriApp* app; @@ -1364,6 +1391,8 @@ main (int argc, N_("Use FOLDER as configuration folder"), N_("FOLDER") }, { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, + { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, + N_("Take a snapshot of the specified URI"), NULL }, { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, @@ -1406,6 +1435,7 @@ main (int argc, webapp = NULL; config = NULL; run = FALSE; + snapshot = NULL; version = FALSE; uris = NULL; error = NULL; @@ -1439,6 +1469,38 @@ main (int argc, return 0; } + if (snapshot) + { + GError *error; + gchar* filename; + gint fd; + GtkWidget* web_view; + + fd = g_file_open_tmp ("snapshot-XXXXXX.pdf", &filename, &error); + close (fd); + + error = NULL; + if (error) + { + g_error ("%s", error->message); + return 1; + } + + if (g_unlink (filename) == -1) + { + g_error ("%s", g_strerror (errno)); + return 1; + } + + web_view = webkit_web_view_new (); + g_signal_connect (web_view, "load-finished", + G_CALLBACK (snapshot_load_finished_cb), filename); + webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), snapshot); + gtk_main (); + g_free (filename); + return 0; + } + /* Web Application support */ if (webapp) { From 902e75fb77a56f94af1629e642b3383d6841f2fd Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 5 May 2009 23:02:45 +0200 Subject: [PATCH 1108/2970] Conditionalize --snapshot on WebKitGTK+ 1.1.6 --- midori/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/main.c b/midori/main.c index 1b2c781b..ce09ff2d 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1345,6 +1345,7 @@ midori_run_script (const gchar* filename) return 1; } +#if WEBKIT_CHECK_VERSION (1, 1, 6) static void snapshot_load_finished_cb (GtkWidget* web_view, WebKitWebFrame* web_frame, @@ -1369,6 +1370,7 @@ snapshot_load_finished_cb (GtkWidget* web_view, g_print (_("Snapshot saved to: %s\n"), filename); gtk_main_quit (); } +#endif int main (int argc, @@ -1391,8 +1393,10 @@ main (int argc, N_("Use FOLDER as configuration folder"), N_("FOLDER") }, { "run", 'r', 0, G_OPTION_ARG_NONE, &run, N_("Run the specified filename as javascript"), NULL }, + #if WEBKIT_CHECK_VERSION (1, 1, 6) { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, N_("Take a snapshot of the specified URI"), NULL }, + #endif { "version", 'V', 0, G_OPTION_ARG_NONE, &version, N_("Display program version"), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, @@ -1469,6 +1473,7 @@ main (int argc, return 0; } + #if WEBKIT_CHECK_VERSION (1, 1, 6) if (snapshot) { GError *error; @@ -1500,6 +1505,7 @@ main (int argc, g_free (filename); return 0; } + #endif /* Web Application support */ if (webapp) From 5ab58b60c1cdd1cdfb8264640bb01f0286fd850c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Tue, 5 May 2009 23:22:39 +0200 Subject: [PATCH 1109/2970] Extend menu item middle click to support trash and history --- midori/midori-browser.c | 45 ++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d7215acb..9701fa5c 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2172,12 +2172,39 @@ _action_trash_activate_item (GtkAction* action, KatzeItem* item, MidoriBrowser* browser) { - gint n = midori_browser_add_item (browser, item); - midori_browser_set_current_page (browser, n); + midori_browser_set_current_uri (browser, katze_item_get_uri (item)); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); } +static gboolean +_action_trash_activate_item_alt (GtkAction* action, + KatzeItem* item, + guint button, + MidoriBrowser* browser) +{ + if (button == 2) + { + gint n; + gboolean open_in_background; + + g_object_get (browser->settings, "open-tabs-in-the-background", + &open_in_background, NULL); + + n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + katze_array_remove_item (browser->trash, item); + _midori_browser_update_actions (browser); + + return TRUE; + } + + return FALSE; +} + static void _action_history_populate_popup (GtkAction* action, GtkMenu* menu, @@ -2227,10 +2254,10 @@ _action_bookmarks_activate_item (GtkAction* action, } static gboolean -_action_bookmarks_activate_item_alt (GtkAction* action, - KatzeItem* item, - guint button, - MidoriBrowser* browser) +_action_menus_activate_item_alt (GtkAction* action, + KatzeItem* item, + guint button, + MidoriBrowser* browser) { if (button == 2) { @@ -4146,6 +4173,8 @@ midori_browser_init (MidoriBrowser* browser) _action_trash_populate_popup, browser, "signal::activate-item", _action_trash_activate_item, browser, + "signal::activate-item-alt", + _action_trash_activate_item_alt, browser, NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); @@ -4161,6 +4190,8 @@ midori_browser_init (MidoriBrowser* browser) _action_history_populate_popup, browser, "signal::activate-item", _action_history_activate_item, browser, + "signal::activate-item-alt", + _action_menus_activate_item_alt, browser, NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); @@ -4177,7 +4208,7 @@ midori_browser_init (MidoriBrowser* browser) "signal::activate-item", _action_bookmarks_activate_item, browser, "signal::activate-item-alt", - _action_bookmarks_activate_item_alt, browser, + _action_menus_activate_item_alt, browser, NULL); gtk_action_group_add_action_with_accel (browser->action_group, action, ""); g_object_unref (action); From fc14fb7a0bc93994bfb73af3d3f8b440202cd8e0 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 5 May 2009 23:32:38 +0200 Subject: [PATCH 1110/2970] Restrict res_server to listen only to localhost --- midori/sokoke.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/midori/sokoke.c b/midori/sokoke.c index 4af14af6..49a99a44 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -980,12 +980,6 @@ res_server_handler_cb (SoupServer* res_server, SoupClientContext* client, gpointer data) { - if (g_strcmp0 (soup_message_get_uri (msg)->host, "localhost")) - { - soup_message_set_status (msg, 204); - return; - } - if (g_str_has_prefix (path, "/res")) { gchar* filename = g_strconcat (DATADIR "/midori", path, NULL); @@ -1017,12 +1011,16 @@ SoupServer* sokoke_get_res_server (void) { static SoupServer* res_server = NULL; + SoupAddress* addr = NULL; if (G_UNLIKELY (!res_server)) { - res_server = soup_server_new ("port", SOUP_ADDRESS_ANY_PORT, NULL); + addr = soup_address_new ("localhost", SOUP_ADDRESS_ANY_PORT); + soup_address_resolve_sync (addr, NULL); + res_server = soup_server_new ("interface", addr, NULL); + g_object_unref (addr); soup_server_add_handler (res_server, "/", - res_server_handler_cb, NULL, NULL); + res_server_handler_cb, NULL, NULL); soup_server_run_async (res_server); } From 0fa7db4ed38fb0c5a62ebf075bfdb1ffa45f7423 Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Wed, 6 May 2009 02:41:17 +0200 Subject: [PATCH 1111/2970] Let Ctrl+K load default search website if no Search in the toolbar --- midori/midori-browser.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9701fa5c..b9a048e3 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2796,6 +2796,9 @@ _action_search_activate (GtkAction* action, GSList* proxies = gtk_action_get_proxies (action); guint i = 0; GtkWidget* proxy; + const gchar* uri; + gchar* search; + while (((proxy = g_slist_nth_data (proxies, i++)))) if (GTK_IS_TOOL_ITEM (proxy)) { @@ -2803,8 +2806,13 @@ _action_search_activate (GtkAction* action, gtk_widget_show (browser->navigationbar); return; } - _action_search_submit (action, "", FALSE, browser); + + /* Load default search engine in current tab */ + uri = browser->location_entry_search; + search = sokoke_search_uri (uri ? uri : "", ""); + midori_browser_set_current_uri (browser, search); gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); + g_free (search); } static void From d3d00b053691f30a3ce2e8f4d9c494754d32a8c7 Mon Sep 17 00:00:00 2001 From: David Stancl Date: Wed, 6 May 2009 18:23:24 +0200 Subject: [PATCH 1112/2970] Update Czech translation --- po/cs.po | 1018 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 602 insertions(+), 416 deletions(-) diff --git a/po/cs.po b/po/cs.po index 34b9775a..9b781a42 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" -"PO-Revision-Date: 2009-04-28 13:44+0200\n" +"POT-Creation-Date: 2009-05-04 09:03+0200\n" +"PO-Revision-Date: 2009-05-04 09:23+0200\n" "Last-Translator: David Štancl \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -20,9 +20,9 @@ msgstr "" msgid "Lightweight web browser" msgstr "Odlehčený prohlížeč" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1288 ../midori/main.c:1388 -#: ../midori/main.c:1396 ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1445 +#: ../midori/main.c:1453 ../midori/main.c:1464 +#: ../midori/midori-websettings.c:275 msgid "Midori" msgstr "Midori" @@ -30,79 +30,79 @@ msgstr "Midori" msgid "Web Browser" msgstr "Internetový prohlížeč" -#: ../midori/main.c:94 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "Konfigurace nemůže být načtena: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "Hodnota '%s' je pro %s špatná" -#: ../midori/main.c:156 ../midori/main.c:228 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Nesprávná hodnota '%s' v konfiguraci" -#: ../midori/main.c:332 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Nepodařilo se otevřít databázi: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Nepodařilo se spustit databázový příkaz: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" msgstr "Nepodařilo se odstranit položku historie: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Nepodařilo se smazat historii: %s\n" -#: ../midori/main.c:465 ../midori/main.c:499 ../midori/main.c:515 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" msgstr "Nepodařilo se přidat položku do historie: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "Nepodařilo se odstranit staré položky historie: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "Konfigurace nemůže být uložena. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "Vyhledávací nástroj nemůže být uložen. %s" -#: ../midori/main.c:770 ../midori/main.c:798 ../midori/main.c:827 +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "Záložky nemohou být uloženy. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 ../midori/main.c:873 +#: ../midori/main.c:869 ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" msgstr "Seznam zavřených karet nemůže být uložen. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" msgstr "Sezení nemůže být uloženo. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1092 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -110,104 +110,113 @@ msgstr "" "Zdá se, že Midori nebylo naposledy řádně ukončeno. Jestliže se to stává " "opakovaně, pro odstranění problému zkuste následující možnosti." -#: ../midori/main.c:1088 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "Změnit _nastavení" -#: ../midori/main.c:1092 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Vymazat poslední _sezení" -#: ../midori/main.c:1097 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Zakázat všechna _rozšíření" -#: ../midori/main.c:1288 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "Nebyl zadán název souboru" -#: ../midori/main.c:1311 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "Nastala neznámá chyba." -#: ../midori/main.c:1336 +#: ../midori/main.c:1369 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Snímek uložen do %s\n" + +#: ../midori/main.c:1389 msgid "Run ADDRESS as a web application" msgstr "Spustit ADDRESS jako webovou aplikaci" -#: ../midori/main.c:1336 +#: ../midori/main.c:1389 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1338 +#: ../midori/main.c:1391 msgid "Use FOLDER as configuration folder" msgstr "Použít FOLDER jako místo pro uložení konfigurace" -#: ../midori/main.c:1338 +#: ../midori/main.c:1391 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1340 +#: ../midori/main.c:1393 msgid "Run the specified filename as javascript" msgstr "Spustit jako javascript" -#: ../midori/main.c:1342 +#: ../midori/main.c:1395 +msgid "Take a snapshot of the specified URI" +msgstr "Získat snímek požadovaného URI" + +#: ../midori/main.c:1397 msgid "Display program version" msgstr "Zobrazit verzi programu" -#: ../midori/main.c:1344 +#: ../midori/main.c:1399 msgid "Addresses" msgstr "Adresy" -#: ../midori/main.c:1385 +#: ../midori/main.c:1442 msgid "[Addresses]" msgstr "[Adresy]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1465 msgid "Please report comments, suggestions and bugs to:" msgstr "Komentáře, požadavky a chyby posílejte na:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1467 msgid "Check for new versions at:" msgstr "Zjistit nové verze v:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1543 msgid "The specified configuration folder is invalid." msgstr "Vybraný konfigurační adresář je neplatný." -#: ../midori/main.c:1489 +#: ../midori/main.c:1578 msgid "An instance of Midori is already running but not responding.\n" msgstr "Midori sice již běží, ale neodpovídá.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1628 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "Vyhledávací nástroje nemohou být načteny.%s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1640 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "Záložky nemohou být načteny: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1655 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "Sezení nemůže být načteno: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1668 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "Zavřené karty nemohou být načteny: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1681 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "Historie nemůže být načtena: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1693 msgid "The following errors occured:" msgstr "Došlo k následujícím chybám:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1709 msgid "_Ignore" msgstr "_Ignorovat" @@ -219,1091 +228,1134 @@ msgstr "Soubor nebyl nalezen." msgid "Malformed document." msgstr "Nesprávný formát dokumentu." -#: ../midori/midori-array.c:338 ../midori/sokoke.c:625 +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "Nepodařilo se zapsat." -#: ../midori/midori-browser.c:280 ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3522 +#: ../midori/midori-browser.c:3528 msgid "Reload the current page" msgstr "Znovu načíst stránku" -#: ../midori/midori-browser.c:291 ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3525 msgid "Stop loading the current page" msgstr "Zastavit načítání stránky" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "%d%% načteno" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "Neočekávaná akce '%s'." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "New folder" msgstr "Nový adresář" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "Edit folder" msgstr "Upravit adresář" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "New bookmark" msgstr "Nová záložka" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "Edit bookmark" msgstr "Upravit záložku" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:630 msgid "_Title:" msgstr "_Nadpis:" -#: ../midori/midori-browser.c:586 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Popis:" -#: ../midori/midori-browser.c:605 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresa:" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:681 msgid "_Folder:" msgstr "_Adresář:" -#: ../midori/midori-browser.c:629 ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 msgid "Toplevel folder" msgstr "Hlavní adresář" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:803 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:977 +#, c-format +msgid "The file %s has been downloaded." +msgstr "Soubor %s byl stažen." + +#: ../midori/midori-browser.c:980 +msgid "Transfer completed" +msgstr "Přenos dokončen" + +#: ../midori/midori-browser.c:1658 msgid "Open file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:2803 ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2961 ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Otevřít všechny v _kartách" -#: ../midori/midori-browser.c:2810 ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2968 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Tab" msgstr "Otevřít v nové _kartě" -#: ../midori/midori-browser.c:2813 ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 msgid "Open in New _Window" msgstr "Otevřít v novém _okně" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3132 msgid "Clear Private Data" msgstr "Vymazat osobní data" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3135 msgid "_Clear private data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3148 msgid "Clear the following data:" msgstr "Vymazat následující data:" -#: ../midori/midori-browser.c:2998 ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3156 ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historie" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3159 msgid "Cookies" msgstr "cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3162 msgid "'Flash' Cookies" msgstr "cookies z flashe" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3165 msgid "Website icons" msgstr "Ikony stránek" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3245 msgid "A lightweight web browser." msgstr "Odlehčený internetový prohlížeč." -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3253 msgid "translator-credits" msgstr "David Štancl " -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3456 msgid "_File" msgstr "_Soubor" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3459 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3462 msgid "Open a new tab" msgstr "Otevřít novou kartu" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3465 msgid "Open a file" msgstr "Otevřít soubor" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3468 msgid "Save to a file" msgstr "Uložit do souboru" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3470 msgid "_Close Tab" msgstr "_Zavřít kartu" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3471 msgid "Close the current tab" msgstr "Zavřít aktivní kartu" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3473 msgid "C_lose Window" msgstr "Za_vřít okno" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3474 msgid "Close this window" msgstr "Zavřít toto okno" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3477 msgid "Print the current page" msgstr "Vytisknout aktuální stránku" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3480 msgid "Quit the application" msgstr "Ukončit aplikaci" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3482 msgid "_Edit" msgstr "_Upravit" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3485 msgid "Cut the selected text" msgstr "Vystříhnout vybraný text" -#: ../midori/midori-browser.c:3334 ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3488 ../midori/midori-browser.c:3491 msgid "Copy the selected text" msgstr "Zkopírovat vybraný text" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3494 msgid "Paste text from the clipboard" msgstr "Vložit text ze schránky" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3497 msgid "Delete the selected text" msgstr "Smazat vybraný text" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3500 msgid "Select all text" msgstr "Vybrat vše" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3503 msgid "Find a word or phrase in the page" msgstr "Najít slovo nebo frázi na stránce" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3505 msgid "Find _Next" msgstr "Najít _další" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3506 msgid "Find the next occurrence of a word or phrase" msgstr "Najít další výskyt slova nebo fráze" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3508 msgid "Find _Previous" msgstr "Najít _předchozí" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3509 msgid "Find the previous occurrence of a word or phrase" msgstr "Najít předchozí výskyt slova nebo fráze" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3512 msgid "_Quick Find" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3513 msgid "Quickly jump to a word or phrase" msgstr "Okamžitě přeskočit na slovo nebo frázi" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3516 msgid "Configure the application preferences" msgstr "Změnit nastavení aplikace" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3518 msgid "_View" msgstr "_Pohled" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3519 msgid "_Toolbars" msgstr "_Lišty" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3531 msgid "Increase the zoom level" msgstr "Přiblížit" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3534 msgid "Decrease the zoom level" msgstr "Oddálit" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3537 msgid "Reset the zoom level" msgstr "Nastavit původní přiblížení" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3538 msgid "_Encoding" msgstr "_Kódování" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3540 msgid "_Automatic" msgstr "_Automatické" -#: ../midori/midori-browser.c:3389 ../midori/midori-websettings.c:200 +#: ../midori/midori-browser.c:3543 ../midori/midori-websettings.c:202 msgid "Chinese (BIG5)" msgstr "Čínské (BIG5)" -#: ../midori/midori-browser.c:3392 ../midori/midori-websettings.c:201 +#: ../midori/midori-browser.c:3546 ../midori/midori-websettings.c:203 msgid "Japanese (SHIFT_JIS)" msgstr "Japonské (SHIFT_JIS)" -#: ../midori/midori-browser.c:3395 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3549 ../midori/midori-websettings.c:204 msgid "Russian (KOI8-R)" msgstr "Ruské (KOI8-R)" -#: ../midori/midori-browser.c:3398 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3552 ../midori/midori-websettings.c:205 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3401 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3555 ../midori/midori-websettings.c:206 msgid "Western (ISO-8859-1)" msgstr "Západní (ISO-8859-1)" -#: ../midori/midori-browser.c:3404 ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-browser.c:3558 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "Vlastní..." -#: ../midori/midori-browser.c:3407 ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3561 ../midori/midori-view.c:1213 msgid "View _Source" msgstr "Zobrazit zdrojový _kód" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3562 msgid "View the source code of the page" msgstr "Zobrazí zdrojový kód stránky" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3564 msgid "View Selection Source" msgstr "Zobrazit zdrojový kód výběru" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3565 msgid "View the source code of the selection" msgstr "Zobrazit zdrojový kód vybraného textu" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3569 msgid "Toggle fullscreen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3571 msgid "_Go" msgstr "_Jít" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3574 msgid "Go back to the previous page" msgstr "Jít zpět (na předchozí stránku)" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3577 msgid "Go forward to the next page" msgstr "Jít vpřed (na následující stránku)" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3580 msgid "Go to your homepage" msgstr "Jít na domovskou stránku" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3582 msgid "Empty Trash" msgstr "Vyprázdnit seznam zavřených karet" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3583 msgid "Delete the contents of the trash" msgstr "Vymaže seznam zavřených karet" -#: ../midori/midori-browser.c:3431 ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3585 ../midori/midori-view.c:1185 msgid "Undo Close Tab" msgstr "Vrátit zavření karty" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3586 msgid "Open the last closed tab" msgstr "Otevře naposledy zavřenou kartu" -#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3590 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Přidat novou záložku" -#: ../midori/midori-browser.c:3438 ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3592 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Přidat složku" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3593 msgid "Add a new bookmark folder" msgstr "Přidá novou složku do záložek" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3594 msgid "_Tools" msgstr "Ná_stroje" -#: ../midori/midori-browser.c:3442 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3596 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "Nastavit _vyhledávací nástroje" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3597 msgid "Add, edit and remove search engines..." msgstr "Přidává, upravuje a maže vyhledávací nástroje..." -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3600 msgid "_Clear Private Data" msgstr "_Vymazat osobní data" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3601 msgid "Clear private data..." msgstr "Vymaže osobní data..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3605 msgid "_Previous Tab" msgstr "_Předchozí karta" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3606 msgid "Switch to the previous tab" msgstr "Přepnout na předchozí kartu" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3608 msgid "_Next Tab" msgstr "_Další karta" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3609 msgid "Switch to the next tab" msgstr "Přepnout na další kartu" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3611 msgid "_Help" msgstr "_Nápověda" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3613 msgid "_Contents" msgstr "_Obsah" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3614 msgid "Show the documentation" msgstr "Zobrazit dokumentaci" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3616 msgid "_Frequent Questions" msgstr "Časté _otázky" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3617 msgid "Show the Frequently Asked Questions" msgstr "Zobrazí často kladené otázky (FAQ)" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3619 msgid "_Report a Bug" msgstr "Ohlásit chy_bu" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3620 msgid "Open Midori's bug tracker" msgstr "Otevře stránku pro hlášení chyb" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3623 msgid "Show information about the program" msgstr "Zobrazí informace o programu" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3630 msgid "P_rivate Browsing" msgstr "Sou_kromé prohlížení" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3631 msgid "Don't save any private data while browsing" msgstr "Neukládat při prohlížení žádná data" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3636 msgid "_Menubar" msgstr "_Menu" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3637 msgid "Show menubar" msgstr "Zobrazit menu" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3640 msgid "_Navigationbar" msgstr "_Navigační lišta" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3641 msgid "Show navigationbar" msgstr "Zobrazit navigační lištu" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3644 msgid "Side_panel" msgstr "Boční _panel" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3645 msgid "Show sidepanel" msgstr "Zobrazit boční panel" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3648 msgid "_Bookmarkbar" msgstr "Lišta _záložek" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3649 msgid "Show bookmarkbar" msgstr "Zobrazit lištu se záložkami" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3652 msgid "_Transferbar" msgstr "Stav _přenosu" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3653 msgid "Show transferbar" msgstr "Zobrazit stav přenosu dat" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3656 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3657 msgid "Show statusbar" msgstr "Zobrazit stavovou lištu" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4088 msgid "_Separator" msgstr "_Oddělovač" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4095 msgid "_Location..." msgstr "U_místění..." -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4097 msgid "Open a particular location" msgstr "Otevřít umístění" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4119 msgid "_Web Search..." msgstr "_Hledat na webu..." -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4121 msgid "Run a web search" msgstr "Spustí vyhledávání na webu" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4142 msgid "Reopen a previously closed tab or window" msgstr "Znovu otevřít zavřenou kartu nebo okno" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4155 msgid "_Recently visited pages" msgstr "_Naposledy navštívené stránky" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4157 msgid "Reopen pages that you visited earlier" msgstr "Znovu otevře stránky, které jste již navštívili" -#: ../midori/midori-browser.c:4021 ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4170 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Záložky" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4172 msgid "Show the saved bookmarks" msgstr "Zobrazit uložené záložky" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4187 msgid "_Window" msgstr "_Okno" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4189 msgid "Show a list of all open tabs" msgstr "Zobrazit seznam všech otevřených karet" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4356 msgid "_Inline Find:" msgstr "_Rychlé hledání" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4381 msgid "Previous" msgstr "Předchozí" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4386 msgid "Next" msgstr "Následující" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4391 msgid "Match Case" msgstr "Rozlišovat velikost" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4399 msgid "Highlight Matches" msgstr "Zvýraznit nalezené" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4409 msgid "Close Findbar" msgstr "Zavřít vyhledávací lištu" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4444 ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Smazat vše" + +#: ../midori/midori-browser.c:4837 #, c-format msgid "Unexpected setting '%s'" msgstr "Neočekávané nastavení '%s'" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "Oddělit vybraný panel od okna" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" -msgstr "Je možné oddělovat vybraný panel od okna?" +msgstr "Z panelu vytvořit samostatné okno" -#: ../midori/midori-panel.c:321 ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 msgid "Align sidepanel on the right" msgstr "Umístit boční panel vpravo" -#: ../midori/midori-panel.c:323 ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 msgid "Whether to align the sidepanel on the right" -msgstr "Zda umístit boční panel vpravo." +msgstr "Přesunout boční panel na opačnou stranu" -#: ../midori/midori-panel.c:333 ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 msgid "Close panel" msgstr "Zavřít panel" -#: ../midori/midori-websettings.c:183 ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2032 msgid "Blank page" msgstr "Prázdná stránka" -#: ../midori/midori-websettings.c:184 ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 msgid "Homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Last open pages" msgstr "Naposledy otevřené stránky" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "New tab" msgstr "Nová karta" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "New window" msgstr "Nové okno" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "Current tab" msgstr "Aktuální karta" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Default" msgstr "Výchozí" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Icons" msgstr "Ikony" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Text" msgstr "Text" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Both" msgstr "Obojí" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Both horizontal" msgstr "Obojí vedle sebe" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "All cookies" msgstr "Všechna cookies" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Session cookies" msgstr "Cookies sezení" -#: ../midori/midori-websettings.c:258 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 msgid "None" msgstr "Žádné" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:331 msgid "Remember last window size" msgstr "Pamatovat si velikost okna" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Whether to save the last window size" msgstr "Ukládat rozměry okna?" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Last window width" msgstr "Šířka okna" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "The last saved window width" msgstr "Naposledy uložená šířka okna" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Last window height" msgstr "Výška okna" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:350 msgid "The last saved window height" msgstr "Naposledy uložená výška okna" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Last panel position" msgstr "Poslední pozice panelu" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "The last saved panel position" msgstr "Uložená poslední pozice panelu" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Last panel page" msgstr "Poslední otevřená stránka" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel page" msgstr "Uložená stránka" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Last Web search" msgstr "Rychlé hledání na webu" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "The last saved Web search" msgstr "Uložené poslední vyhledávání na webu" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Show Menubar" msgstr "Zobrazit menu" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to show the menubar" msgstr "Zobrazit menu?" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Show Navigationbar" msgstr "Zobrazit vyhledávání" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Whether to show the navigationbar" msgstr "Zobrazit lištu vyhledávání?" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:422 msgid "Show Bookmarkbar" msgstr "Zobrazit záložky" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the bookmarkbar" msgstr "Zobrazit lištu se záložkami?" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "Show Panel" msgstr "Zobrazit panel" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the panel" msgstr "Zobrazit panel?" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show Transferbar" msgstr "Zobrazit stav přenosu" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the transferbar" msgstr "Zobrazit stav přenosu?" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Show Statusbar" msgstr "Zobrazit stavový řádek" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the statusbar" msgstr "Zobrazit stavový řádek?" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Toolbar Style" msgstr "Styl lišty" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "The style of the toolbar" msgstr "Nastaví styl lišty (zobrazení textu a ikon)." -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:483 msgid "Show progress in location entry" msgstr "Zobrazit průběh v řádku adresy" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:484 msgid "Whether to show loading progress in the location entry" msgstr "Zobrazovat průběh načítání v řádku s adresou?" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:499 msgid "Search engines in location completion" msgstr "Zobrazovat výsledky hledání při zadávání adresy" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:500 msgid "Whether to show search engines in the location completion" msgstr "Zobrazovat výsledky vyhledávání při zadávání adresy?" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "Toolbar Items" msgstr "Položky nástrojové lišty" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:509 msgid "The items to show on the toolbar" msgstr "Položky, které se budou zobrazovat na nástrojové liště" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Compact Sidepanel" msgstr "Kompaktní boční panel" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Whether to make the sidepanel compact" msgstr "Má se zobrazit boční panel kompaktně?" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 msgid "Load on Startup" msgstr "Načíst při startu" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "What to load on startup" msgstr "Co načíst při startu" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The homepage" msgstr "Domovská stránka" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:569 msgid "Show crash dialog" msgstr "Zobrazit dialog po pádu" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:570 msgid "Show a dialog after Midori crashed" msgstr "Zobrazit dialog po pádu Midori" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:578 msgid "Download Folder" msgstr "Složka pro ukládání" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:579 msgid "The folder downloaded files are saved to" msgstr "Kam se budou ukládat stažené soubory" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:598 +msgid "Ask for the destination folder" +msgstr "Zeptat se na cílovou složku" + +#: ../midori/midori-websettings.c:599 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "Zda se ptát, kam se bude ukládat" + +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" +msgstr "Upozornit na dokončení přenosu" + +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Zda zobrazit upozornění při dokončení přenosu" + +#: ../midori/midori-websettings.c:631 msgid "Download Manager" msgstr "Správce stahování" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:632 msgid "An external download manager" msgstr "Externí program pro stahování" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:640 msgid "Text Editor" msgstr "Textový editor" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:641 msgid "An external text editor" msgstr "Externí textový editor" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:656 msgid "News Aggregator" msgstr "Čtečka RSS" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:657 msgid "An external news aggregator" msgstr "Externí čtečka zpráv RSS" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:665 msgid "Location entry Search" msgstr "Vyhledávání v adresním řádku" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:666 msgid "The search to perform inside the location entry" msgstr "Vyhledávání použité v řádku s adresou" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:674 msgid "Preferred Encoding" msgstr "Preferované kódování" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:675 msgid "The preferred character encoding" msgstr "Preferované kódování stránek" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:685 msgid "Always Show Tabbar" msgstr "Vždy zobrazovat karty" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:686 msgid "Always show the tabbar" msgstr "Zobrazit karty, i když je jen jedna?" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:694 msgid "Close Buttons on Tabs" msgstr "Ikona zavření karty" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:695 msgid "Whether tabs have close buttons" msgstr "Zobrazovat ikonu pro zavření karty?" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:703 msgid "Open new pages in" msgstr "Otevírat nové stránky v" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:704 msgid "Where to open new pages" msgstr "Kde se budou otevírat nové stránky" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:713 msgid "Open external pages in" msgstr "Otevírat externí stránky v" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:714 msgid "Where to open externally opened pages" msgstr "Kde se budou otevírat externí stránky" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:727 msgid "Middle click opens Selection" msgstr "Kliknutím prostř. tlačítka otevřít vybraný text" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:728 msgid "Load an address from the selection via middle click" msgstr "Prostřední tlačítko myši otevře adresu, která je ve vybraném textu" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:736 msgid "Open tabs in the background" msgstr "Otevírat karty na pozadí" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:737 msgid "Whether to open new tabs in the background" msgstr "Karty se otevírají na pozadí" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:745 msgid "Open Tabs next to Current" msgstr "Otevřít kartu vedle aktivní" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:746 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "Nová karta se otevře vedle aktivní" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:754 msgid "Open popups in tabs" msgstr "Otevírat vyskakovací okna v kartách" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:755 msgid "Whether to open popup windows in tabs" msgstr "Vyskakovací okno se otevře v nové kartě" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:771 msgid "Zoom Text and Images" msgstr "Zvětšovat text i obrázky" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:772 msgid "Whether to zoom text and images" msgstr "Při přibližování zvětšovat text i obrázky?" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:787 msgid "Find inline while typing" msgstr "Hledat při psaní" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:788 msgid "Whether to automatically find inline while typing" msgstr "Při psaní hledat text?" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:796 msgid "Accept cookies" msgstr "Přijímat cookies" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:797 msgid "What type of cookies to accept" msgstr "Který typ cookies přijímat" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:806 msgid "Original cookies only" msgstr "Původní" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:807 msgid "Accept cookies from the original website only" msgstr "Z původní stránky" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:815 msgid "Maximum cookie age" msgstr "Maximální stáří cookies" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:816 msgid "The maximum number of days to save cookies for" msgstr "Maximální počet dní, po které jsou cookies platná." -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:826 msgid "Remember last visited pages" msgstr "Pamatovat si naposledy navštívené stránky" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:827 msgid "Whether the last visited pages are saved" msgstr "Pamatovat si naposledy navštívené stránky?" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:835 msgid "Maximum history age" msgstr "Maximální délka historie" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save the history for" msgstr "" "Maximální počet dní, po které se bude uchovávat historie navštívených stránek" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:844 msgid "Remember last form inputs" msgstr "Pamatovat si vložený text" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:845 msgid "Whether the last form inputs are saved" msgstr "Pamatovat si text vložený do vstupních polí?" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:853 msgid "Remember last downloaded files" msgstr "Pamatovat si naposledy stahované soubory" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:854 msgid "Whether the last downloaded files are saved" msgstr "Pamatovat si seznam souborů, které byly stahovány?" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:864 msgid "Proxy Server" msgstr "Proxy server" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:865 msgid "The proxy server used for HTTP connections" msgstr "Nastavení proxy serveru pro HTTP spojení" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:880 msgid "Detect proxy server automatically" msgstr "Zjistit proxy server automaticky" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:881 msgid "Whether to detect the proxy server automatically from the environment" msgstr "Zjistit nastavení proxy serveru automaticky?" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:897 msgid "Identify as" msgstr "Hlásit se jako" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:898 msgid "What to identify as to web pages" msgstr "Jak se hlásit webovým stránkám" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:914 msgid "Identification string" msgstr "Identifikační řetězec" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:915 msgid "The application identification string" msgstr "Identifikační řetězec aplikace" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:923 msgid "Cache size" msgstr "Velikost keše" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:924 msgid "The allowed size of the cache" msgstr "Povolená velikost keše" +#: ../midori/midori-view.c:648 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Ikona '%s' nemůže být načtena." + +#: ../midori/midori-view.c:650 ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Chyba" + +#: ../midori/midori-view.c:653 +msgid "Try again" +msgstr "Zkusit znovu" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:680 ../midori/midori-view.c:2556 #, c-format msgid "Not found - %s" msgstr "Nenalezeno - %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1047 msgid "Open _Link" msgstr "Otevřít _odkaz" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1049 msgid "Open Link in New _Tab" msgstr "Otevřít odkaz v nové _kartě" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1066 msgid "Open Link in New _Window" msgstr "Otevřít odkaz v novém _okně" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1075 msgid "_Download Link destination" msgstr "_Stáhnout umístění" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1081 msgid "_Save Link destination" msgstr "_Uložit umístění" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1090 msgid "Download with Download _Manager" msgstr "Stáhnout za použití Download _manageru" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1119 msgid "Search _with" msgstr "Hledat _s" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1147 msgid "_Search the Web" msgstr "_Hledat na webu" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1157 msgid "Open Address in New _Tab" msgstr "Otevřít adresu v nové _kartě" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1309 msgid "Open or download file" msgstr "Otevřít nebo stáhnout soubor" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1326 #, c-format msgid "File Type: '%s'" msgstr "Typ souboru: '%s'" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1329 #, c-format msgid "File Type: %s ('%s')" msgstr "Typ souboru: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1333 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1742 #, c-format msgid "Inspect page - %s" msgstr "Prohlížení stránky - %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:1894 #, c-format msgid "Document cannot be displayed" msgstr "Dokument nemůže být zobrazen" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1911 #, c-format msgid "No documentation installed" msgstr "Dokumentace není nainstalována" @@ -1314,164 +1366,205 @@ msgid "Preferences for %s" msgstr "Nastavení pro %s" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:399 msgid "General" msgstr "Obecné" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:400 msgid "Startup" msgstr "Při spuštění" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:416 msgid "Use current page as homepage" msgstr "Použít stávající stránku jako domovskou" -#: ../midori/midori-preferences.c:423 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Přenosy" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "Vzhled" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "Nastavení písma" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "Výchozí font" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Výchozí font pro zobrazení textu" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "Velikost textu" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Výchozí font písma se stejnou šířkou" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Font použitý při zobrazování písma se stejnou šířkou písmen" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "Minimální velikost textu" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "Minimální velikost textu, která se použije pro zobrazení" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "Kódování" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "Kódování, které se použije jako výchozí" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "Chování" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "Rozšíření" -#: ../midori/midori-preferences.c:511 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "Automaticky načítat obrázky" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "Automaticky načítat a zobrazovat obrázky" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "Obrázky automaticky zmenšovat" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "Automaticky zmenšovat obrázky, aby se vešly" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "Tisknout obrázky na pozadí" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "Mají být obrázky na pozadí tištěny?" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "Roztažitelné oblasti pro text" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "Mohou se pole pro vstup textu roztahovat dle potřeby?" -#: ../midori/midori-preferences.c:527 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Povolit skripty" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "Povolit vložené skriptové jazyky" -#: ../midori/midori-preferences.c:531 ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "Povolit pluginy" +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Povolit pluginy z Netscape (Mozilly)" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "Povolit pluginové objekty" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Povolit pluginové objekty prohlížeče Netscape (Mozilla)" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "Vnutit rozlišení 96 bodů/palec" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "Vnutit rozlišení obrazu 96 bodů na palec" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "Povolit vývojářské nástroje" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "Povolit speciální rozšíření pro vývojáře" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Kontrola pravopisu" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Povolit kontrolu pravopisu" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Povolit kontrolu pravopisu při psaní" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"Čárkou oddělený seznam jazyků použitých pro kontrolu pravopisu, např. " +"\"cs_CZ,en_GB\"" + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "Rozhraní" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "Navigační lišta" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "Prohlížení" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Aplikace" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Externí aplikace" + #. Page "Network" -#: ../midori/midori-preferences.c:590 ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 msgid "Network" msgstr "Síť" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "Soukromí" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "Web cookies" -#: ../midori/midori-preferences.c:637 ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 msgid "days" msgstr "dny" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Prázdné" @@ -1503,64 +1596,64 @@ msgstr "Upravit vyhledávací nástroje" msgid "Use as _default" msgstr "Použít jako _výchozí" -#: ../midori/sokoke.c:117 ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "Nemohu spustit externí program." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "Varování: jste přihlášen(a) jako superuživatel (root)!" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "_Záložky" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "_Přidat záložku" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "_Konzola" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "_Rozšíření" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "_Historie" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "_Domovská stránka" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "_Uživatelské skripty" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "Uživatelské _styly" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "Nová _karta" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "_Přenosy" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "P_luginy" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Netscape p_luginy" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "Za_vřené karty a okna" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "Nové _okno" @@ -1592,15 +1685,15 @@ msgstr "Zakázat" msgid "Bookmarks" msgstr "Záložky" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "Upravit vybranou záložku" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "Smazat vybranou záložku" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "Oddělovač" @@ -1612,43 +1705,43 @@ msgstr "Konzola" msgid "Extensions" msgstr "Rozšíření" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "Opravdu chcete smazat všechny položky historie?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "Zazáložkovat vybranou položku historie" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "Smazat vybranou položku historie" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "Smazat celou historii" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "Před týdnem" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "Před %d dny" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "Dnes" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "Včera" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "Pluginy" +msgid "Netscape plugins" +msgstr "Netscape pluginy" #: ../panels/midori-transfers.c:256 #, c-format @@ -1687,28 +1780,28 @@ msgstr "Uložená ikona '%s' nemůže být načtena" msgid "Animation frames are broken" msgstr "Snímky animace jsou porušené" -#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "Vlastnost '%s' je pro %s neplatná" -#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 msgid "Choose file" msgstr "Vybrat soubor" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "Vybrat adresář" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "Obarvit karty" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "Obarvené karty" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "Obarvit každou kartu zvlášť" @@ -1741,36 +1834,31 @@ msgstr "Ano" msgid "No" msgstr "Ne" -#: ../extensions/cookie-manager.c:491 +#: ../extensions/cookie-manager.c:493 msgid "Do you really want to delete all cookies?" msgstr "Opravdu chcete smazat všechna cookies?" -#: ../extensions/cookie-manager.c:493 +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "Dotaz" -#: ../extensions/cookie-manager.c:501 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." msgstr "Budou smazána cookies, která odpovídají filtračnímu řetězci." -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "Název" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "Rozbalit _vše" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "_Sbalit vše" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "Smazat vše" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:823 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." @@ -1778,19 +1866,19 @@ msgstr "" "Smaže všechna zobrazená cookies. Jestliže je zapnut filtr, jsou smazána jen " "ta cookies, která odpovídají." -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "Rozbalit vše" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "Sbalit vše" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "Filtr:" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:881 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" @@ -1798,18 +1886,102 @@ msgstr "" "Vložte řetězec, podle kterého se budou cookies filtrovat. Filtruje se podle " "názvu nebo domény" -#: ../extensions/cookie-manager.c:913 ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "Správce cookies" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "Správce _cookies" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" msgstr "Seznam, detaily a mazání cookies" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Chyba při hledání vyžadované položky \"entry\" v XML datech." + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Chyba při hledání vyžadované položky \"feed\" v XML datech." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Poslední aktualizace: %s." + +#: ../extensions/feed-panel/feed-panel.c:660 +msgid "Feeds" +msgstr "Kanály" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Add new feed" +msgstr "Přidat nový kanál" + +#: ../extensions/feed-panel/feed-panel.c:720 +msgid "Delete feed" +msgstr "Smazat kanál" + +#: ../extensions/feed-panel/feed-panel.c:803 +msgid "_Feeds" +msgstr "_Kanály" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Chyba při hledání kořenového elementu v XML datech." + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "Nepodporovaný formát kanálu." + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Nepodařilo se načíst XML kanál: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Nepodařilo se najít element \"channel\" v RSS XML datech." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "Nepodporovaná verze RSS." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Nepodařilo se najít požadovaný element \"item\" v XML datech." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Nepodařilo se najít požadovaný element \"channel\" v XML datech." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Kanál '%s' byl již přidán" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Chyba při načítání kanálu '%s'" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Nový kanál" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Panel kanálů" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Čte Atom/RSS kanály" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "Gesta myší" @@ -1826,3 +1998,17 @@ msgstr "Uživatelská stránka" #: ../extensions/page-holder.c:161 msgid "_Pageholder" msgstr "_Uživatelská stránka" + +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Rozšíření stavové lišty" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Jednoduše zapíná a vypíná rozšíření webových stránek" + +#~ msgid "P_lugins" +#~ msgstr "P_luginy" + +#~ msgid "Plugins" +#~ msgstr "Pluginy" From a30f5eae0b663c8c995343a759f883d81d763f93 Mon Sep 17 00:00:00 2001 From: Stanley Zhang Date: Wed, 6 May 2009 18:26:37 +0200 Subject: [PATCH 1113/2970] Update Chinese translation --- po/zh_CN.po | 1095 +++++++++++++++++++++++++++++---------------------- 1 file changed, 627 insertions(+), 468 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9f0ad5ea..e84bee74 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-19 16:44+0200\n" -"PO-Revision-Date: 2009-04-20 09:54+0800\n" +"POT-Creation-Date: 2009-05-03 00:47+0200\n" +"PO-Revision-Date: 2009-05-05 10:06+0800\n" "Last-Translator: Stanley Zhang \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgid "Lightweight web browser" msgstr "轻量的 Web 浏览器" #: ../data/midori.desktop.in.h:2 -#: ../midori/main.c:1288 -#: ../midori/main.c:1388 -#: ../midori/main.c:1396 -#: ../midori/main.c:1407 -#: ../midori/midori-websettings.c:273 +#: ../midori/main.c:1314 +#: ../midori/main.c:1415 +#: ../midori/main.c:1423 +#: ../midori/main.c:1434 +#: ../midori/midori-websettings.c:275 msgid "Midori" msgstr "Midori" @@ -33,186 +33,186 @@ msgstr "Midori" msgid "Web Browser" msgstr "Web 浏览器" -#: ../midori/main.c:94 +#: ../midori/main.c:95 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "设置无法加载: %s\n" -#: ../midori/main.c:149 +#: ../midori/main.c:150 #, c-format msgid "Value '%s' is invalid for %s" msgstr "值 '%s' 在 '%s' 中无效" -#: ../midori/main.c:156 -#: ../midori/main.c:228 +#: ../midori/main.c:157 +#: ../midori/main.c:237 #, c-format msgid "Invalid configuration value '%s'" msgstr "无效的设置值 '%s'" -#: ../midori/main.c:332 +#: ../midori/main.c:349 #, c-format msgid "Failed to open database: %s\n" msgstr "打开数据库失败: %s\n" -#: ../midori/main.c:364 +#: ../midori/main.c:381 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "执行数据库操作失败: %s\n" -#: ../midori/main.c:418 +#: ../midori/main.c:435 #, c-format msgid "Failed to remove history item: %s\n" msgstr "移除历史项目失败: %s\n" -#: ../midori/main.c:442 +#: ../midori/main.c:459 #, c-format msgid "Failed to clear history: %s\n" msgstr "清空历史失败: %s\n" -#: ../midori/main.c:465 -#: ../midori/main.c:499 -#: ../midori/main.c:515 +#: ../midori/main.c:482 +#: ../midori/main.c:516 +#: ../midori/main.c:532 #, c-format msgid "Failed to add history item: %s\n" msgstr "添加历史项失败: %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:694 +#: ../midori/main.c:711 #, c-format msgid "Failed to remove old history items: %s\n" msgstr "删除旧的历史项目失败: %s\n" -#: ../midori/main.c:722 +#: ../midori/main.c:740 #, c-format msgid "The configuration couldn't be saved. %s" msgstr "配置无法保存. %s" -#: ../midori/main.c:751 +#: ../midori/main.c:769 #, c-format msgid "The search engines couldn't be saved. %s" msgstr "搜索引擎无法保存. %s" -#: ../midori/main.c:770 -#: ../midori/main.c:798 -#: ../midori/main.c:827 +#: ../midori/main.c:788 +#: ../midori/main.c:816 +#: ../midori/main.c:845 #, c-format msgid "The bookmarks couldn't be saved. %s" msgstr "书签无法保存. %s" #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:850 -#: ../midori/main.c:873 +#: ../midori/main.c:868 +#: ../midori/main.c:891 #, c-format msgid "The trash couldn't be saved. %s" msgstr "垃圾箱无法保存. %s" -#: ../midori/main.c:946 +#: ../midori/main.c:964 #, c-format msgid "The session couldn't be saved. %s" msgstr "会话无法保存. %s" -#: ../midori/main.c:1073 +#: ../midori/main.c:1091 msgid "Midori seems to have crashed the last time it was opened. If this happened repeatedly, try one of the following options to solve the problem." msgstr "Midori 好像在上次运行时崩溃了. 如果这种情况反复出现, 请尝试下面的选项来解决此问题." -#: ../midori/main.c:1088 +#: ../midori/main.c:1106 msgid "Modify _preferences" msgstr "修改首选项(_p)" -#: ../midori/main.c:1092 +#: ../midori/main.c:1110 msgid "Reset the last _session" msgstr "重置最后的会话(_s)" -#: ../midori/main.c:1097 +#: ../midori/main.c:1115 msgid "Disable all _extensions" msgstr "关闭所有的扩展(_e)" -#: ../midori/main.c:1288 +#: ../midori/main.c:1314 msgid "No filename specified" msgstr "没有指定文件名" -#: ../midori/main.c:1311 +#: ../midori/main.c:1337 msgid "An unknown error occured." msgstr "发生了一个未知的错误." -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "Run ADDRESS as a web application" msgstr "将 ADDRESS 作为 Web 应用程序运行" -#: ../midori/main.c:1336 +#: ../midori/main.c:1362 msgid "ADDRESS" msgstr "ADDRESS" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "Use FOLDER as configuration folder" msgstr "使用 FOLDER 作为设置目录" -#: ../midori/main.c:1338 +#: ../midori/main.c:1364 msgid "FOLDER" msgstr "FOLDER" -#: ../midori/main.c:1340 +#: ../midori/main.c:1366 msgid "Run the specified filename as javascript" msgstr "将指定的文件当作 Javascript 执行" -#: ../midori/main.c:1342 +#: ../midori/main.c:1368 msgid "Display program version" msgstr "显示程序版本" -#: ../midori/main.c:1344 +#: ../midori/main.c:1370 msgid "Addresses" msgstr "地址" -#: ../midori/main.c:1385 +#: ../midori/main.c:1412 msgid "[Addresses]" msgstr "[地址]" -#: ../midori/main.c:1408 +#: ../midori/main.c:1435 msgid "Please report comments, suggestions and bugs to:" msgstr "请将意见、建议和问题反馈到:" -#: ../midori/main.c:1410 +#: ../midori/main.c:1437 msgid "Check for new versions at:" msgstr "在此检查新版本:" -#: ../midori/main.c:1454 +#: ../midori/main.c:1481 msgid "The specified configuration folder is invalid." msgstr "无效的配置文件目录. " -#: ../midori/main.c:1489 +#: ../midori/main.c:1516 msgid "An instance of Midori is already running but not responding.\n" msgstr "已经有一个 Midori 在运行, 但没有响应.\n" -#: ../midori/main.c:1539 +#: ../midori/main.c:1566 #, c-format msgid "The search engines couldn't be loaded. %s\n" msgstr "搜索引擎无法加载. %s\n" -#: ../midori/main.c:1551 +#: ../midori/main.c:1578 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" msgstr "书签无法加载: %s\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1593 #, c-format msgid "The session couldn't be loaded: %s\n" msgstr "会话无法加载: %s\n" -#: ../midori/main.c:1579 +#: ../midori/main.c:1606 #, c-format msgid "The trash couldn't be loaded: %s\n" msgstr "垃圾箱无法加载: %s\n" -#: ../midori/main.c:1592 +#: ../midori/main.c:1619 #, c-format msgid "The history couldn't be loaded: %s\n" msgstr "历史记录无法加载: %s\n" -#: ../midori/main.c:1604 +#: ../midori/main.c:1631 msgid "The following errors occured:" msgstr "发生以下错误:" -#: ../midori/main.c:1620 +#: ../midori/main.c:1647 msgid "_Ignore" msgstr "忽略(_I)" @@ -226,1119 +226,1166 @@ msgid "Malformed document." msgstr "异常的文件." #: ../midori/midori-array.c:338 -#: ../midori/sokoke.c:625 +#: ../midori/sokoke.c:716 #, c-format msgid "Writing failed." msgstr "写失败." -#: ../midori/midori-browser.c:280 -#: ../midori/midori-browser.c:3368 -#: ../midori/midori-browser.c:3374 +#: ../midori/midori-browser.c:281 +#: ../midori/midori-browser.c:3497 +#: ../midori/midori-browser.c:3503 msgid "Reload the current page" msgstr "重新载入当前页" -#: ../midori/midori-browser.c:291 -#: ../midori/midori-browser.c:3371 +#: ../midori/midori-browser.c:292 +#: ../midori/midori-browser.c:3500 msgid "Stop loading the current page" msgstr "停止载入当前页" -#: ../midori/midori-browser.c:353 +#: ../midori/midori-browser.c:354 #, c-format msgid "%d%% loaded" msgstr "%d%% 已加载" -#: ../midori/midori-browser.c:378 +#: ../midori/midori-browser.c:379 #, c-format msgid "Unexpected action '%s'." msgstr "意外的活动 '%s'." -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "New folder" msgstr "新建目录" -#: ../midori/midori-browser.c:541 +#: ../midori/midori-browser.c:598 msgid "Edit folder" msgstr "编辑目录" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "New bookmark" msgstr "新建书签" -#: ../midori/midori-browser.c:543 +#: ../midori/midori-browser.c:600 msgid "Edit bookmark" msgstr "编辑书签" -#: ../midori/midori-browser.c:573 +#: ../midori/midori-browser.c:630 msgid "_Title:" msgstr "标题(_T): " -#: ../midori/midori-browser.c:586 +#: ../midori/midori-browser.c:643 #: ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "描述(_D):" -#: ../midori/midori-browser.c:605 +#: ../midori/midori-browser.c:662 #: ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "地址(_A):" -#: ../midori/midori-browser.c:624 +#: ../midori/midori-browser.c:681 msgid "_Folder:" msgstr "目录(_F):" -#: ../midori/midori-browser.c:629 -#: ../midori/midori-browser.c:670 +#: ../midori/midori-browser.c:686 +#: ../midori/midori-browser.c:727 msgid "Toplevel folder" msgstr "最上层目录" -#: ../midori/midori-browser.c:746 +#: ../midori/midori-browser.c:803 msgid "Save file as" msgstr "文件另存为" -#: ../midori/midori-browser.c:1523 +#: ../midori/midori-browser.c:977 +#, c-format +msgid "The file %s has been downloaded." +msgstr "文件 %s 已下载." + +#: ../midori/midori-browser.c:980 +msgid "Transfer completed" +msgstr "下载完成" + +#: ../midori/midori-browser.c:1658 msgid "Open file" msgstr "打开文件" -#: ../midori/midori-browser.c:2803 -#: ../panels/midori-bookmarks.c:782 -#: ../panels/midori-history.c:809 +#: ../midori/midori-browser.c:2936 +#: ../panels/midori-bookmarks.c:780 +#: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "在新标签页中打开所有项(_T)" -#: ../midori/midori-browser.c:2810 -#: ../panels/midori-bookmarks.c:788 -#: ../panels/midori-history.c:815 +#: ../midori/midori-browser.c:2943 +#: ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:814 +#: ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Tab" msgstr "在新标签页中打开(_T)" -#: ../midori/midori-browser.c:2813 -#: ../panels/midori-bookmarks.c:790 -#: ../panels/midori-history.c:817 +#: ../midori/midori-browser.c:2946 +#: ../panels/midori-bookmarks.c:788 +#: ../panels/midori-history.c:816 +#: ../extensions/feed-panel/feed-panel.c:540 msgid "Open in New _Window" msgstr "在新窗口中打开(_W)" -#: ../midori/midori-browser.c:2974 +#: ../midori/midori-browser.c:3107 msgid "Clear Private Data" msgstr "清除隐私数据" -#: ../midori/midori-browser.c:2977 +#: ../midori/midori-browser.c:3110 msgid "_Clear private data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:2990 +#: ../midori/midori-browser.c:3123 msgid "Clear the following data:" msgstr "清除以下的数据:" -#: ../midori/midori-browser.c:2998 -#: ../midori/midori-preferences.c:640 +#: ../midori/midori-browser.c:3131 +#: ../midori/midori-preferences.c:669 #: ../panels/midori-history.c:108 msgid "History" msgstr "历史" -#: ../midori/midori-browser.c:3001 +#: ../midori/midori-browser.c:3134 msgid "Cookies" msgstr "Cookies" -#: ../midori/midori-browser.c:3004 +#: ../midori/midori-browser.c:3137 msgid "'Flash' Cookies" msgstr "由 Flash 建立的 Cookies" -#: ../midori/midori-browser.c:3007 +#: ../midori/midori-browser.c:3140 msgid "Website icons" msgstr "网站图标" -#: ../midori/midori-browser.c:3093 +#: ../midori/midori-browser.c:3220 msgid "A lightweight web browser." msgstr "轻量级的 Web 浏览器." -#: ../midori/midori-browser.c:3101 +#: ../midori/midori-browser.c:3228 msgid "translator-credits" msgstr "张翼 " -#: ../midori/midori-browser.c:3302 +#: ../midori/midori-browser.c:3431 msgid "_File" msgstr "文件(_F)" -#: ../midori/midori-browser.c:3305 +#: ../midori/midori-browser.c:3434 msgid "Open a new window" msgstr "新建窗口" -#: ../midori/midori-browser.c:3308 +#: ../midori/midori-browser.c:3437 msgid "Open a new tab" msgstr "新建标签页" -#: ../midori/midori-browser.c:3311 +#: ../midori/midori-browser.c:3440 msgid "Open a file" msgstr "打开文件" -#: ../midori/midori-browser.c:3314 +#: ../midori/midori-browser.c:3443 msgid "Save to a file" msgstr "保存到文件" -#: ../midori/midori-browser.c:3316 +#: ../midori/midori-browser.c:3445 msgid "_Close Tab" msgstr "关闭标签页(_C)" -#: ../midori/midori-browser.c:3317 +#: ../midori/midori-browser.c:3446 msgid "Close the current tab" msgstr "关闭当前标签页" -#: ../midori/midori-browser.c:3319 +#: ../midori/midori-browser.c:3448 msgid "C_lose Window" msgstr "关闭窗口(_l)" -#: ../midori/midori-browser.c:3320 +#: ../midori/midori-browser.c:3449 msgid "Close this window" msgstr "关闭此窗口" -#: ../midori/midori-browser.c:3323 +#: ../midori/midori-browser.c:3452 msgid "Print the current page" msgstr "打印当前页" -#: ../midori/midori-browser.c:3326 +#: ../midori/midori-browser.c:3455 msgid "Quit the application" msgstr "退出程序" -#: ../midori/midori-browser.c:3328 +#: ../midori/midori-browser.c:3457 msgid "_Edit" msgstr "编辑(_E)" -#: ../midori/midori-browser.c:3331 +#: ../midori/midori-browser.c:3460 msgid "Cut the selected text" msgstr "剪切选中的文本" -#: ../midori/midori-browser.c:3334 -#: ../midori/midori-browser.c:3337 +#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3466 msgid "Copy the selected text" msgstr "复制选中的文本" -#: ../midori/midori-browser.c:3340 +#: ../midori/midori-browser.c:3469 msgid "Paste text from the clipboard" msgstr "从剪贴板粘帖文本" -#: ../midori/midori-browser.c:3343 +#: ../midori/midori-browser.c:3472 msgid "Delete the selected text" msgstr "删除选中的文本" -#: ../midori/midori-browser.c:3346 +#: ../midori/midori-browser.c:3475 msgid "Select all text" msgstr "选取所有文本" -#: ../midori/midori-browser.c:3349 +#: ../midori/midori-browser.c:3478 msgid "Find a word or phrase in the page" msgstr "在页面中查找词或短语" -#: ../midori/midori-browser.c:3351 +#: ../midori/midori-browser.c:3480 msgid "Find _Next" msgstr "查找下一个(_N)" -#: ../midori/midori-browser.c:3352 +#: ../midori/midori-browser.c:3481 msgid "Find the next occurrence of a word or phrase" msgstr "查找下一处" -#: ../midori/midori-browser.c:3354 +#: ../midori/midori-browser.c:3483 msgid "Find _Previous" msgstr "查找上一个(_P)" -#: ../midori/midori-browser.c:3355 +#: ../midori/midori-browser.c:3484 msgid "Find the previous occurrence of a word or phrase" msgstr "查找上一处" -#: ../midori/midori-browser.c:3358 +#: ../midori/midori-browser.c:3487 msgid "_Quick Find" msgstr "快速查找(_Q)" -#: ../midori/midori-browser.c:3359 +#: ../midori/midori-browser.c:3488 msgid "Quickly jump to a word or phrase" msgstr "快速跳转到一个词或短语" -#: ../midori/midori-browser.c:3362 +#: ../midori/midori-browser.c:3491 msgid "Configure the application preferences" msgstr "设置程序首选项" -#: ../midori/midori-browser.c:3364 +#: ../midori/midori-browser.c:3493 msgid "_View" msgstr "查看(_V)" -#: ../midori/midori-browser.c:3365 +#: ../midori/midori-browser.c:3494 msgid "_Toolbars" msgstr "工具栏(_T)" -#: ../midori/midori-browser.c:3377 +#: ../midori/midori-browser.c:3506 msgid "Increase the zoom level" msgstr "提高放大倍数" -#: ../midori/midori-browser.c:3380 +#: ../midori/midori-browser.c:3509 msgid "Decrease the zoom level" msgstr "缩小放大倍数" -#: ../midori/midori-browser.c:3383 +#: ../midori/midori-browser.c:3512 msgid "Reset the zoom level" msgstr "重置放大倍数" -#: ../midori/midori-browser.c:3384 +#: ../midori/midori-browser.c:3513 msgid "_Encoding" msgstr "编码(_E)" -#: ../midori/midori-browser.c:3386 +#: ../midori/midori-browser.c:3515 msgid "_Automatic" msgstr "自动(_A)" -#: ../midori/midori-browser.c:3389 -#: ../midori/midori-websettings.c:200 -msgid "Chinese(BIG5)" -msgstr "繁体中文(BIG5)" - -#: ../midori/midori-browser.c:3392 -#: ../midori/midori-websettings.c:201 -msgid "Japanese(SHIFT_JIS)" -msgstr "日语(SHIFT_JIS)" - -#: ../midori/midori-browser.c:3395 +#: ../midori/midori-browser.c:3518 #: ../midori/midori-websettings.c:202 -msgid "Russian(KOI8-R)" -msgstr "俄语(KOI8-R)" +msgid "Chinese (BIG5)" +msgstr "繁体中文 (BIG5)" -#: ../midori/midori-browser.c:3398 +#: ../midori/midori-browser.c:3521 #: ../midori/midori-websettings.c:203 -msgid "Unicode(UTF-8)" -msgstr "Unicode(UTF-8)" +msgid "Japanese (SHIFT_JIS)" +msgstr "日语 (SHIFT_JIS)" -#: ../midori/midori-browser.c:3401 +#: ../midori/midori-browser.c:3524 #: ../midori/midori-websettings.c:204 -msgid "Western(ISO-8859-1)" -msgstr "西方(ISO-8859-1)" +msgid "Russian (KOI8-R)" +msgstr "俄语 (KOI8-R)" -#: ../midori/midori-browser.c:3404 +#: ../midori/midori-browser.c:3527 #: ../midori/midori-websettings.c:205 -#: ../midori/midori-websettings.c:277 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3530 +#: ../midori/midori-websettings.c:206 +msgid "Western (ISO-8859-1)" +msgstr "西方 (ISO-8859-1)" + +#: ../midori/midori-browser.c:3533 +#: ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 msgid "Custom..." msgstr "定制 ..." -#: ../midori/midori-browser.c:3407 -#: ../midori/midori-view.c:1138 +#: ../midori/midori-browser.c:3536 +#: ../midori/midori-view.c:1187 msgid "View _Source" msgstr "查看源码(_S)" -#: ../midori/midori-browser.c:3408 +#: ../midori/midori-browser.c:3537 msgid "View the source code of the page" msgstr "查看本页的源代码" -#: ../midori/midori-browser.c:3410 +#: ../midori/midori-browser.c:3539 msgid "View Selection Source" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3411 +#: ../midori/midori-browser.c:3540 msgid "View the source code of the selection" msgstr "查看选中部分的源代码" -#: ../midori/midori-browser.c:3415 +#: ../midori/midori-browser.c:3544 msgid "Toggle fullscreen view" msgstr "全屏浏览" -#: ../midori/midori-browser.c:3417 +#: ../midori/midori-browser.c:3546 msgid "_Go" msgstr "位置(_G)" -#: ../midori/midori-browser.c:3420 +#: ../midori/midori-browser.c:3549 msgid "Go back to the previous page" msgstr "返回上一页" -#: ../midori/midori-browser.c:3423 +#: ../midori/midori-browser.c:3552 msgid "Go forward to the next page" msgstr "转到下一页" -#: ../midori/midori-browser.c:3426 +#: ../midori/midori-browser.c:3555 msgid "Go to your homepage" msgstr "回到主页" -#: ../midori/midori-browser.c:3428 +#: ../midori/midori-browser.c:3557 msgid "Empty Trash" msgstr "清空垃圾箱" -#: ../midori/midori-browser.c:3429 +#: ../midori/midori-browser.c:3558 msgid "Delete the contents of the trash" msgstr "删除垃圾箱中的内容" -#: ../midori/midori-browser.c:3431 -#: ../midori/midori-view.c:1110 +#: ../midori/midori-browser.c:3560 +#: ../midori/midori-view.c:1159 msgid "Undo Close Tab" msgstr "撤销关闭标签页" -#: ../midori/midori-browser.c:3432 +#: ../midori/midori-browser.c:3561 msgid "Open the last closed tab" msgstr "打开最后关闭的标签页" -#: ../midori/midori-browser.c:3436 -#: ../panels/midori-bookmarks.c:232 +#: ../midori/midori-browser.c:3565 +#: ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "添加一个新书签" -#: ../midori/midori-browser.c:3438 -#: ../panels/midori-bookmarks.c:261 +#: ../midori/midori-browser.c:3567 +#: ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "添加新书签目录" -#: ../midori/midori-browser.c:3439 +#: ../midori/midori-browser.c:3568 msgid "Add a new bookmark folder" msgstr "添加一个新书签目录" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3569 msgid "_Tools" msgstr "工具(_T)" -#: ../midori/midori-browser.c:3442 +#: ../midori/midori-browser.c:3571 #: ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "管理搜索引擎(_M)" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3572 msgid "Add, edit and remove search engines..." msgstr "添加, 编辑和移除搜索引擎" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3575 msgid "_Clear Private Data" msgstr "清除隐私数据(_C)" -#: ../midori/midori-browser.c:3447 +#: ../midori/midori-browser.c:3576 msgid "Clear private data..." msgstr "清除隐私数据 ..." -#: ../midori/midori-browser.c:3451 +#: ../midori/midori-browser.c:3580 msgid "_Previous Tab" msgstr "上一个标签页(_P)" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3581 msgid "Switch to the previous tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3454 +#: ../midori/midori-browser.c:3583 msgid "_Next Tab" msgstr "下一个标签页(_N)" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3584 msgid "Switch to the next tab" msgstr "转到上一个标签页" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3586 msgid "_Help" msgstr "帮助(_H)" -#: ../midori/midori-browser.c:3459 +#: ../midori/midori-browser.c:3588 msgid "_Contents" msgstr "内容(_C)" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3589 msgid "Show the documentation" msgstr "显示文档" -#: ../midori/midori-browser.c:3462 +#: ../midori/midori-browser.c:3591 msgid "_Frequent Questions" msgstr "常见问题(_F)" -#: ../midori/midori-browser.c:3463 +#: ../midori/midori-browser.c:3592 msgid "Show the Frequently Asked Questions" msgstr "显示常见问题" -#: ../midori/midori-browser.c:3465 +#: ../midori/midori-browser.c:3594 msgid "_Report a Bug" msgstr "反馈错误(_R)" -#: ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3595 msgid "Open Midori's bug tracker" msgstr "打开 Midori 的错误跟踪器" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3598 msgid "Show information about the program" msgstr "显示此程序的信息" -#: ../midori/midori-browser.c:3476 +#: ../midori/midori-browser.c:3605 msgid "P_rivate Browsing" msgstr "隐私浏览(_r)" -#: ../midori/midori-browser.c:3477 +#: ../midori/midori-browser.c:3606 msgid "Don't save any private data while browsing" msgstr "在浏览时不保存任何隐私数据" -#: ../midori/midori-browser.c:3482 +#: ../midori/midori-browser.c:3611 msgid "_Menubar" msgstr "菜单栏(_M)" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3612 msgid "Show menubar" msgstr "显示菜单栏" -#: ../midori/midori-browser.c:3486 +#: ../midori/midori-browser.c:3615 msgid "_Navigationbar" msgstr "导航栏(_N)" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3616 msgid "Show navigationbar" msgstr "显示导航栏" -#: ../midori/midori-browser.c:3490 +#: ../midori/midori-browser.c:3619 msgid "Side_panel" msgstr "侧边栏(_p)" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3620 msgid "Show sidepanel" msgstr "显示侧边栏" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3623 msgid "_Bookmarkbar" msgstr "书签栏(_B)" -#: ../midori/midori-browser.c:3495 +#: ../midori/midori-browser.c:3624 msgid "Show bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-browser.c:3498 +#: ../midori/midori-browser.c:3627 msgid "_Transferbar" msgstr "传输栏(_T)" -#: ../midori/midori-browser.c:3499 +#: ../midori/midori-browser.c:3628 msgid "Show transferbar" msgstr "显示传输栏" -#: ../midori/midori-browser.c:3502 +#: ../midori/midori-browser.c:3631 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:3632 msgid "Show statusbar" msgstr "显示状态栏" -#: ../midori/midori-browser.c:3937 +#: ../midori/midori-browser.c:4063 msgid "_Separator" msgstr "分割符(_S)" -#: ../midori/midori-browser.c:3944 +#: ../midori/midori-browser.c:4070 msgid "_Location..." msgstr "位置(_L)" -#: ../midori/midori-browser.c:3946 +#: ../midori/midori-browser.c:4072 msgid "Open a particular location" msgstr "打开一个指定位置" -#: ../midori/midori-browser.c:3970 +#: ../midori/midori-browser.c:4094 msgid "_Web Search..." msgstr "搜索 Web(_W)" -#: ../midori/midori-browser.c:3972 +#: ../midori/midori-browser.c:4096 msgid "Run a web search" msgstr "执行 Web 搜索" -#: ../midori/midori-browser.c:3993 +#: ../midori/midori-browser.c:4117 msgid "Reopen a previously closed tab or window" msgstr "重新打开以前关闭的标签页或窗口" -#: ../midori/midori-browser.c:4006 +#: ../midori/midori-browser.c:4130 msgid "_Recently visited pages" msgstr "最近访问的页面(_R)" -#: ../midori/midori-browser.c:4008 +#: ../midori/midori-browser.c:4132 msgid "Reopen pages that you visited earlier" msgstr "重新打开以前访问过的页面" -#: ../midori/midori-browser.c:4021 -#: ../midori/sokoke.c:781 +#: ../midori/midori-browser.c:4145 +#: ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "书签(_B)" -#: ../midori/midori-browser.c:4023 +#: ../midori/midori-browser.c:4147 msgid "Show the saved bookmarks" msgstr "显示保存的书签" -#: ../midori/midori-browser.c:4036 +#: ../midori/midori-browser.c:4160 msgid "_Window" msgstr "窗口(_W)" -#: ../midori/midori-browser.c:4038 +#: ../midori/midori-browser.c:4162 msgid "Show a list of all open tabs" msgstr "显示所有标签页的列表" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4205 +#: ../midori/midori-browser.c:4329 msgid "_Inline Find:" msgstr "查找(_I):" -#: ../midori/midori-browser.c:4230 +#: ../midori/midori-browser.c:4354 msgid "Previous" msgstr "上一个" -#: ../midori/midori-browser.c:4235 +#: ../midori/midori-browser.c:4359 msgid "Next" msgstr "下一个" -#: ../midori/midori-browser.c:4240 +#: ../midori/midori-browser.c:4364 msgid "Match Case" msgstr "区分大小写" -#: ../midori/midori-browser.c:4248 +#: ../midori/midori-browser.c:4372 msgid "Highlight Matches" msgstr "高亮显示匹配" -#: ../midori/midori-browser.c:4258 +#: ../midori/midori-browser.c:4382 msgid "Close Findbar" msgstr "关闭查找栏" -#: ../midori/midori-browser.c:4598 +#: ../midori/midori-browser.c:4417 +#: ../extensions/cookie-manager.c:819 +msgid "Delete All" +msgstr "删除所有项目" + +#: ../midori/midori-browser.c:4729 #, c-format msgid "Unexpected setting '%s'" msgstr "意外的设置 '%s'" -#: ../midori/midori-panel.c:309 +#: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" msgstr "从窗口中分离选择的面板" -#: ../midori/midori-panel.c:311 +#: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" msgstr "将选中的面板从窗口中分离" -#: ../midori/midori-panel.c:321 -#: ../midori/midori-websettings.c:531 +#: ../midori/midori-panel.c:345 +#: ../midori/midori-websettings.c:533 msgid "Align sidepanel on the right" msgstr "侧边栏摆放到右侧" -#: ../midori/midori-panel.c:323 -#: ../midori/midori-websettings.c:532 +#: ../midori/midori-panel.c:347 +#: ../midori/midori-websettings.c:534 msgid "Whether to align the sidepanel on the right" msgstr "让侧边栏摆放到右侧" -#: ../midori/midori-panel.c:333 -#: ../midori/midori-panel.c:334 +#: ../midori/midori-panel.c:357 +#: ../midori/midori-panel.c:358 msgid "Close panel" msgstr "关闭侧边栏" -#: ../midori/midori-websettings.c:183 -#: ../midori/midori-view.c:1949 +#: ../midori/midori-websettings.c:185 +#: ../midori/midori-view.c:2000 msgid "Blank page" msgstr "空白页面" -#: ../midori/midori-websettings.c:184 -#: ../midori/midori-websettings.c:551 +#: ../midori/midori-websettings.c:186 +#: ../midori/midori-websettings.c:553 msgid "Homepage" msgstr "主页" -#: ../midori/midori-websettings.c:185 +#: ../midori/midori-websettings.c:187 msgid "Last open pages" msgstr "最后打开页面" -#: ../midori/midori-websettings.c:220 +#: ../midori/midori-websettings.c:222 msgid "New tab" msgstr "新建标签页" -#: ../midori/midori-websettings.c:221 +#: ../midori/midori-websettings.c:223 msgid "New window" msgstr "新建窗口" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "Current tab" msgstr "当前标签页" -#: ../midori/midori-websettings.c:237 +#: ../midori/midori-websettings.c:239 msgid "Default" msgstr "缺省" -#: ../midori/midori-websettings.c:238 +#: ../midori/midori-websettings.c:240 msgid "Icons" msgstr "图标" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Text" msgstr "文字" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Both" msgstr "图标及文字" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Both horizontal" msgstr "水平摆放的图标和文字" -#: ../midori/midori-websettings.c:256 +#: ../midori/midori-websettings.c:258 msgid "All cookies" msgstr "所有 Cookies" -#: ../midori/midori-websettings.c:257 +#: ../midori/midori-websettings.c:259 msgid "Session cookies" msgstr "会话 Cookies" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 #: ../panels/midori-addons.c:94 msgid "None" msgstr "无" -#: ../midori/midori-websettings.c:274 +#: ../midori/midori-websettings.c:276 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:275 +#: ../midori/midori-websettings.c:277 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:329 +#: ../midori/midori-websettings.c:331 msgid "Remember last window size" msgstr "记住上次窗口的大小" -#: ../midori/midori-websettings.c:330 +#: ../midori/midori-websettings.c:332 msgid "Whether to save the last window size" msgstr "是否保存上次窗口的大小" -#: ../midori/midori-websettings.c:338 +#: ../midori/midori-websettings.c:340 msgid "Last window width" msgstr "上次窗口的宽度" -#: ../midori/midori-websettings.c:339 +#: ../midori/midori-websettings.c:341 msgid "The last saved window width" msgstr "上次保存的窗口宽度" -#: ../midori/midori-websettings.c:347 +#: ../midori/midori-websettings.c:349 msgid "Last window height" msgstr "上次窗口的高度" -#: ../midori/midori-websettings.c:348 +#: ../midori/midori-websettings.c:350 msgid "The last saved window height" msgstr "上次保存的窗口高度" -#: ../midori/midori-websettings.c:373 +#: ../midori/midori-websettings.c:375 msgid "Last panel position" msgstr "上次的侧边栏位置" -#: ../midori/midori-websettings.c:374 +#: ../midori/midori-websettings.c:376 msgid "The last saved panel position" msgstr "上次保存的侧边栏位置" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:383 +#: ../midori/midori-websettings.c:385 msgid "Last panel page" msgstr "上次的侧边栏页" -#: ../midori/midori-websettings.c:384 +#: ../midori/midori-websettings.c:386 msgid "The last saved panel page" msgstr "上次保存的侧边栏页" -#: ../midori/midori-websettings.c:392 +#: ../midori/midori-websettings.c:394 msgid "Last Web search" msgstr "上次的 Web 搜索" -#: ../midori/midori-websettings.c:393 +#: ../midori/midori-websettings.c:395 msgid "The last saved Web search" msgstr "上次保存的 Web 搜索" -#: ../midori/midori-websettings.c:402 +#: ../midori/midori-websettings.c:404 msgid "Show Menubar" msgstr "显示菜单栏" -#: ../midori/midori-websettings.c:403 +#: ../midori/midori-websettings.c:405 msgid "Whether to show the menubar" msgstr "是否显示菜单栏" -#: ../midori/midori-websettings.c:411 +#: ../midori/midori-websettings.c:413 msgid "Show Navigationbar" msgstr "显示导航栏" -#: ../midori/midori-websettings.c:412 +#: ../midori/midori-websettings.c:414 msgid "Whether to show the navigationbar" msgstr "是否显示导航栏" -#: ../midori/midori-websettings.c:420 +#: ../midori/midori-websettings.c:422 msgid "Show Bookmarkbar" msgstr "显示书签栏" -#: ../midori/midori-websettings.c:421 +#: ../midori/midori-websettings.c:423 msgid "Whether to show the bookmarkbar" msgstr "是否显示书签栏" -#: ../midori/midori-websettings.c:429 +#: ../midori/midori-websettings.c:431 msgid "Show Panel" msgstr "显示侧边栏" -#: ../midori/midori-websettings.c:430 +#: ../midori/midori-websettings.c:432 msgid "Whether to show the panel" msgstr "是否显示侧边栏" -#: ../midori/midori-websettings.c:445 +#: ../midori/midori-websettings.c:447 msgid "Show Transferbar" msgstr "显示传输栏" -#: ../midori/midori-websettings.c:446 +#: ../midori/midori-websettings.c:448 msgid "Whether to show the transferbar" msgstr "是否显示传输栏" -#: ../midori/midori-websettings.c:454 +#: ../midori/midori-websettings.c:456 msgid "Show Statusbar" msgstr "显示状态栏" -#: ../midori/midori-websettings.c:455 +#: ../midori/midori-websettings.c:457 msgid "Whether to show the statusbar" msgstr "是否显示状态栏" -#: ../midori/midori-websettings.c:464 +#: ../midori/midori-websettings.c:466 msgid "Toolbar Style" msgstr "工具栏样式" -#: ../midori/midori-websettings.c:465 +#: ../midori/midori-websettings.c:467 msgid "The style of the toolbar" msgstr "工具栏的样式" -#: ../midori/midori-websettings.c:481 +#: ../midori/midori-websettings.c:483 msgid "Show progress in location entry" msgstr "在地址输入框中显示进度" -#: ../midori/midori-websettings.c:482 +#: ../midori/midori-websettings.c:484 msgid "Whether to show loading progress in the location entry" msgstr "是否在地址输入框中显示加载进度" -#: ../midori/midori-websettings.c:497 +#: ../midori/midori-websettings.c:499 msgid "Search engines in location completion" msgstr "地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:498 +#: ../midori/midori-websettings.c:500 msgid "Whether to show search engines in the location completion" msgstr "是否在地址补全中显示搜索引擎" -#: ../midori/midori-websettings.c:506 +#: ../midori/midori-websettings.c:508 msgid "Toolbar Items" msgstr "工具栏中的项目" -#: ../midori/midori-websettings.c:507 +#: ../midori/midori-websettings.c:509 msgid "The items to show on the toolbar" msgstr "在工具栏中显示的项目" -#: ../midori/midori-websettings.c:515 +#: ../midori/midori-websettings.c:517 msgid "Compact Sidepanel" msgstr "紧凑侧边栏" -#: ../midori/midori-websettings.c:516 +#: ../midori/midori-websettings.c:518 msgid "Whether to make the sidepanel compact" msgstr "是否让侧边栏紧凑显示" -#: ../midori/midori-websettings.c:541 +#: ../midori/midori-websettings.c:543 msgid "Load on Startup" msgstr "启动时加载" -#: ../midori/midori-websettings.c:542 +#: ../midori/midori-websettings.c:544 msgid "What to load on startup" msgstr "启动时加载的项目" -#: ../midori/midori-websettings.c:552 +#: ../midori/midori-websettings.c:554 msgid "The homepage" msgstr "主页" -#: ../midori/midori-websettings.c:567 +#: ../midori/midori-websettings.c:569 msgid "Show crash dialog" msgstr "显示崩溃提示对话框" -#: ../midori/midori-websettings.c:568 +#: ../midori/midori-websettings.c:570 msgid "Show a dialog after Midori crashed" msgstr "当 Midori 崩溃后显示提示对话框" -#: ../midori/midori-websettings.c:576 +#: ../midori/midori-websettings.c:578 msgid "Download Folder" msgstr "下载目录" -#: ../midori/midori-websettings.c:577 +#: ../midori/midori-websettings.c:579 msgid "The folder downloaded files are saved to" msgstr "下载的文件将保存到此目录" -#: ../midori/midori-websettings.c:589 +#: ../midori/midori-websettings.c:598 +msgid "Ask for the destination folder" +msgstr "询问文件保存路径" + +#: ../midori/midori-websettings.c:599 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "在下载文件前是否询问文件保存路径" + +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" +msgstr "下载完成后显示提示" + +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "是否在下载完成时显示提示信息" + +#: ../midori/midori-websettings.c:631 msgid "Download Manager" msgstr "下载管理器" -#: ../midori/midori-websettings.c:590 +#: ../midori/midori-websettings.c:632 msgid "An external download manager" msgstr "外部的下载管理器" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:640 msgid "Text Editor" msgstr "文本编辑器" -#: ../midori/midori-websettings.c:599 +#: ../midori/midori-websettings.c:641 msgid "An external text editor" msgstr "外部的文本编辑器" -#: ../midori/midori-websettings.c:614 +#: ../midori/midori-websettings.c:656 msgid "News Aggregator" msgstr "新闻聚合器" -#: ../midori/midori-websettings.c:615 +#: ../midori/midori-websettings.c:657 msgid "An external news aggregator" msgstr "外部的新闻聚合查看器" -#: ../midori/midori-websettings.c:623 +#: ../midori/midori-websettings.c:665 msgid "Location entry Search" msgstr "地址栏查找" -#: ../midori/midori-websettings.c:624 +#: ../midori/midori-websettings.c:666 msgid "The search to perform inside the location entry" msgstr "在地址输入框中执行的查找" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:674 msgid "Preferred Encoding" msgstr "首选的编码" -#: ../midori/midori-websettings.c:633 +#: ../midori/midori-websettings.c:675 msgid "The preferred character encoding" msgstr "首选的字符编码集" -#: ../midori/midori-websettings.c:643 +#: ../midori/midori-websettings.c:685 msgid "Always Show Tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:644 +#: ../midori/midori-websettings.c:686 msgid "Always show the tabbar" msgstr "总是显示标签栏" -#: ../midori/midori-websettings.c:652 +#: ../midori/midori-websettings.c:694 msgid "Close Buttons on Tabs" msgstr "标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:653 +#: ../midori/midori-websettings.c:695 msgid "Whether tabs have close buttons" msgstr "是否在标签栏上显示关闭按钮" -#: ../midori/midori-websettings.c:661 +#: ../midori/midori-websettings.c:703 msgid "Open new pages in" msgstr "打开新的页面在" -#: ../midori/midori-websettings.c:662 +#: ../midori/midori-websettings.c:704 msgid "Where to open new pages" msgstr "在那里打开新的页面" -#: ../midori/midori-websettings.c:671 +#: ../midori/midori-websettings.c:713 msgid "Open external pages in" msgstr "打开外部页面在" -#: ../midori/midori-websettings.c:672 +#: ../midori/midori-websettings.c:714 msgid "Where to open externally opened pages" msgstr "在那里打开外部页面" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:727 msgid "Middle click opens Selection" msgstr "鼠标中键打开地址" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:728 msgid "Load an address from the selection via middle click" msgstr "用鼠标中键单击打开选中地址" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:736 msgid "Open tabs in the background" msgstr "在后台打开标签页" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:737 msgid "Whether to open new tabs in the background" msgstr "是否在后台打开标签页" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:745 msgid "Open Tabs next to Current" msgstr "在当前标签页后打开新标签" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:746 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "是否在当前标签页后打开新标签或者在最后的标签页后打开" -#: ../midori/midori-websettings.c:712 +#: ../midori/midori-websettings.c:754 msgid "Open popups in tabs" msgstr "在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:755 msgid "Whether to open popup windows in tabs" msgstr "是否在标签页中打开弹出窗口" -#: ../midori/midori-websettings.c:729 +#: ../midori/midori-websettings.c:771 msgid "Zoom Text and Images" msgstr "缩放文字和图像" -#: ../midori/midori-websettings.c:730 +#: ../midori/midori-websettings.c:772 msgid "Whether to zoom text and images" msgstr "是否缩放文字和图像" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:787 msgid "Find inline while typing" msgstr "输入时自动补全" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:788 msgid "Whether to automatically find inline while typing" msgstr "是否输入时自动补全地址" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:796 msgid "Accept cookies" msgstr "接收 Cookies" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:797 msgid "What type of cookies to accept" msgstr "接收什么类型的 Cookies" -#: ../midori/midori-websettings.c:764 +#: ../midori/midori-websettings.c:806 msgid "Original cookies only" msgstr "只接收原始 Cookies" -#: ../midori/midori-websettings.c:765 +#: ../midori/midori-websettings.c:807 msgid "Accept cookies from the original website only" msgstr "只接收原始网站的 Cookies" -#: ../midori/midori-websettings.c:773 +#: ../midori/midori-websettings.c:815 msgid "Maximum cookie age" msgstr "最长 Cookie 有效期" -#: ../midori/midori-websettings.c:774 +#: ../midori/midori-websettings.c:816 msgid "The maximum number of days to save cookies for" msgstr "最长保存 Cookie 多少天" -#: ../midori/midori-websettings.c:784 +#: ../midori/midori-websettings.c:826 msgid "Remember last visited pages" msgstr "记录上次访问的页面" -#: ../midori/midori-websettings.c:785 +#: ../midori/midori-websettings.c:827 msgid "Whether the last visited pages are saved" msgstr "是否记录上次访问的页面" -#: ../midori/midori-websettings.c:793 +#: ../midori/midori-websettings.c:835 msgid "Maximum history age" msgstr "最长历史有效期" -#: ../midori/midori-websettings.c:794 +#: ../midori/midori-websettings.c:836 msgid "The maximum number of days to save the history for" msgstr "最长保存历史多少天" -#: ../midori/midori-websettings.c:802 +#: ../midori/midori-websettings.c:844 msgid "Remember last form inputs" msgstr "记录上次的表格输入" -#: ../midori/midori-websettings.c:803 +#: ../midori/midori-websettings.c:845 msgid "Whether the last form inputs are saved" msgstr "是否记录上次的表格输入" -#: ../midori/midori-websettings.c:811 +#: ../midori/midori-websettings.c:853 msgid "Remember last downloaded files" msgstr "记录上次下载的文件" -#: ../midori/midori-websettings.c:812 +#: ../midori/midori-websettings.c:854 msgid "Whether the last downloaded files are saved" msgstr "是否保存上次下载的文件" -#: ../midori/midori-websettings.c:822 +#: ../midori/midori-websettings.c:864 msgid "Proxy Server" msgstr "代理服务器" -#: ../midori/midori-websettings.c:823 +#: ../midori/midori-websettings.c:865 msgid "The proxy server used for HTTP connections" msgstr "HTTP 连接所使用的代理服务器" -#: ../midori/midori-websettings.c:838 +#: ../midori/midori-websettings.c:880 msgid "Detect proxy server automatically" msgstr "自动检测代理服务器" -#: ../midori/midori-websettings.c:839 +#: ../midori/midori-websettings.c:881 msgid "Whether to detect the proxy server automatically from the environment" msgstr "是否自动检测系统环境中的代理服务器设置" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:855 +#: ../midori/midori-websettings.c:897 msgid "Identify as" msgstr "识别为" -#: ../midori/midori-websettings.c:856 +#: ../midori/midori-websettings.c:898 msgid "What to identify as to web pages" msgstr "让页面识别为什么" -#: ../midori/midori-websettings.c:872 +#: ../midori/midori-websettings.c:914 msgid "Identification string" msgstr "识别字符串" -#: ../midori/midori-websettings.c:873 +#: ../midori/midori-websettings.c:915 msgid "The application identification string" msgstr "应用程序识别字符串" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:923 msgid "Cache size" msgstr "缓存大小" -#: ../midori/midori-websettings.c:882 +#: ../midori/midori-websettings.c:924 msgid "The allowed size of the cache" msgstr "允许的缓存大小" +#: ../midori/midori-view.c:641 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "网页 '%s' 无法加载." + +#: ../midori/midori-view.c:643 +#: ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "错误" + +#: ../midori/midori-view.c:646 +msgid "Try again" +msgstr "重试" + #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:637 -#: ../midori/midori-view.c:2473 +#: ../midori/midori-view.c:673 +#: ../midori/midori-view.c:2524 #, c-format msgid "Not found - %s" msgstr "没有找到 - %s" -#: ../midori/midori-view.c:976 +#: ../midori/midori-view.c:1021 msgid "Open _Link" msgstr "打开链接(_L)" -#: ../midori/midori-view.c:978 +#: ../midori/midori-view.c:1023 msgid "Open Link in New _Tab" msgstr "在新标签页中打开链接(_T)" -#: ../midori/midori-view.c:995 +#: ../midori/midori-view.c:1040 msgid "Open Link in New _Window" msgstr "在新窗口中打开链接(_W)" -#: ../midori/midori-view.c:1004 +#: ../midori/midori-view.c:1049 msgid "_Download Link destination" msgstr "下载链接目标(_D)" -#: ../midori/midori-view.c:1010 +#: ../midori/midori-view.c:1055 msgid "_Save Link destination" msgstr "保存链接目标(_S)" -#: ../midori/midori-view.c:1019 +#: ../midori/midori-view.c:1064 msgid "Download with Download _Manager" msgstr "用下载管理器下载(_M)" -#: ../midori/midori-view.c:1048 +#: ../midori/midori-view.c:1093 msgid "Search _with" msgstr "搜索(_w)" -#: ../midori/midori-view.c:1076 +#: ../midori/midori-view.c:1121 msgid "_Search the Web" msgstr "搜索 Web(_S)" -#: ../midori/midori-view.c:1086 +#: ../midori/midori-view.c:1131 msgid "Open Address in New _Tab" msgstr "在新标签页中打开地址(_T)" -#: ../midori/midori-view.c:1234 +#: ../midori/midori-view.c:1283 msgid "Open or download file" msgstr "打开或下载文件" -#: ../midori/midori-view.c:1251 +#: ../midori/midori-view.c:1300 #, c-format msgid "File Type: '%s'" msgstr "文件类型: '%s'" -#: ../midori/midori-view.c:1254 +#: ../midori/midori-view.c:1303 #, c-format -msgid "File Type: %s('%s')" -msgstr "文件类型: %s('%s')" +msgid "File Type: %s ('%s')" +msgstr "文件类型: %s ('%s')" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1258 +#: ../midori/midori-view.c:1307 #, c-format msgid "Open %s" msgstr "打开 %s" -#: ../midori/midori-view.c:1661 +#: ../midori/midori-view.c:1710 #, c-format msgid "Inspect page - %s" msgstr "检查页面 - %s" -#: ../midori/midori-view.c:1806 +#: ../midori/midori-view.c:1862 #, c-format msgid "Document cannot be displayed" msgstr "文档无法显示" -#: ../midori/midori-view.c:1822 +#: ../midori/midori-view.c:1879 #, c-format msgid "No documentation installed" msgstr "没有安装文档" @@ -1349,166 +1396,203 @@ msgid "Preferences for %s" msgstr "%s 的设置项" #. Page "General" -#: ../midori/midori-preferences.c:398 +#: ../midori/midori-preferences.c:399 msgid "General" msgstr "常规" -#: ../midori/midori-preferences.c:399 +#: ../midori/midori-preferences.c:400 msgid "Startup" msgstr "启动" -#: ../midori/midori-preferences.c:415 +#: ../midori/midori-preferences.c:416 msgid "Use current page as homepage" msgstr "设置当前页为主页" -#: ../midori/midori-preferences.c:423 +#: ../midori/midori-preferences.c:424 #: ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "文件传输" #. Page "Appearance" -#: ../midori/midori-preferences.c:475 +#: ../midori/midori-preferences.c:440 msgid "Appearance" msgstr "外观" -#: ../midori/midori-preferences.c:476 +#: ../midori/midori-preferences.c:441 msgid "Font settings" msgstr "字体设置" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:443 msgid "Default Font Family" msgstr "缺省的字体" -#: ../midori/midori-preferences.c:484 +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "显示文字的缺省字体" + +#: ../midori/midori-preferences.c:450 msgid "The default font size used to display text" msgstr "显示文字的缺省字体大小" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "定宽字体" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "显示定宽文本的字形" + +#: ../midori/midori-preferences.c:458 msgid "Minimum Font Size" msgstr "最小字体尺寸" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:461 msgid "The minimum font size used to display text" msgstr "显示文字的最小字体尺寸" -#: ../midori/midori-preferences.c:497 +#: ../midori/midori-preferences.c:468 msgid "Encoding" msgstr "编码" -#: ../midori/midori-preferences.c:500 +#: ../midori/midori-preferences.c:471 msgid "The character encoding to use by default" msgstr "缺省的字符编码" #. Page "Behavior" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:478 msgid "Behavior" msgstr "行为" -#: ../midori/midori-preferences.c:508 +#: ../midori/midori-preferences.c:479 msgid "Features" msgstr "特性" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:482 #: ../extensions/statusbar-features.c:54 msgid "Load images automatically" msgstr "自动加载图像" -#: ../midori/midori-preferences.c:512 +#: ../midori/midori-preferences.c:483 msgid "Load and display images automatically" msgstr "自动加载和显示图像" -#: ../midori/midori-preferences.c:515 +#: ../midori/midori-preferences.c:486 msgid "Shrink images automatically" msgstr "自动缩小图像" -#: ../midori/midori-preferences.c:516 +#: ../midori/midori-preferences.c:487 msgid "Automatically shrink standalone images to fit" msgstr "自动缩小单独的图像以适合屏幕" -#: ../midori/midori-preferences.c:519 +#: ../midori/midori-preferences.c:490 msgid "Print background images" msgstr "打印背景图" -#: ../midori/midori-preferences.c:520 +#: ../midori/midori-preferences.c:491 msgid "Whether background images should be printed" msgstr "是否打印页面的背景图" -#: ../midori/midori-preferences.c:523 +#: ../midori/midori-preferences.c:494 msgid "Resizable text areas" msgstr "可缩放的文本区" -#: ../midori/midori-preferences.c:524 +#: ../midori/midori-preferences.c:495 msgid "Whether text areas are resizable" msgstr "文本区能否缩放" -#: ../midori/midori-preferences.c:527 +#: ../midori/midori-preferences.c:498 #: ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "启用脚本" -#: ../midori/midori-preferences.c:528 +#: ../midori/midori-preferences.c:499 msgid "Enable embedded scripting languages" msgstr "启用网页中的脚本" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:502 #: ../extensions/statusbar-features.c:72 -msgid "Enable plugins" -msgstr "启用插件" +msgid "Enable Netscape plugins" +msgstr "启用 Netscape 插件" -#: ../midori/midori-preferences.c:532 -msgid "Enable embedded plugin objects" -msgstr "启用页面中的插件对象" +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "启用嵌入的 Netscape 插件对象" -#: ../midori/midori-preferences.c:535 +#: ../midori/midori-preferences.c:506 msgid "Enforce 96 dots per inch" msgstr "强制每英寸96点" -#: ../midori/midori-preferences.c:536 +#: ../midori/midori-preferences.c:507 msgid "Enforce a video dot density of 96 DPI" msgstr "强制画面点密度为 96DPI" -#: ../midori/midori-preferences.c:539 +#: ../midori/midori-preferences.c:510 msgid "Enable developer tools" msgstr "启用开发工具" -#: ../midori/midori-preferences.c:540 +#: ../midori/midori-preferences.c:511 msgid "Enable special extensions for developers" msgstr "启用给开发者的特殊扩展" +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "拼写检查" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "启用拼写检查" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "输入时启用拼写检查" + +#: ../midori/midori-preferences.c:525 +msgid "A comma separated list of languages to be used for spell checking, for example \"en_GB,de_DE\"" +msgstr "用于拼写检查的逗号分隔的语言列表, 比如 \"en_GB,de_DE\"" + #. Page "Interface" -#: ../midori/midori-preferences.c:548 +#: ../midori/midori-preferences.c:530 msgid "Interface" msgstr "界面" -#: ../midori/midori-preferences.c:549 +#: ../midori/midori-preferences.c:531 msgid "Navigationbar" msgstr "导航条" -#: ../midori/midori-preferences.c:560 +#: ../midori/midori-preferences.c:542 msgid "Browsing" msgstr "浏览" +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "应用程序" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "外部应用程序" + #. Page "Network" -#: ../midori/midori-preferences.c:590 -#: ../midori/midori-preferences.c:591 +#: ../midori/midori-preferences.c:619 +#: ../midori/midori-preferences.c:620 msgid "Network" msgstr "网络" -#: ../midori/midori-preferences.c:618 +#: ../midori/midori-preferences.c:647 msgid "MB" msgstr "MB" #. Page "Privacy" -#: ../midori/midori-preferences.c:623 +#: ../midori/midori-preferences.c:652 msgid "Privacy" msgstr "隐私" -#: ../midori/midori-preferences.c:624 +#: ../midori/midori-preferences.c:653 msgid "Web Cookies" msgstr "网页 Cookies" -#: ../midori/midori-preferences.c:637 -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:666 +#: ../midori/midori-preferences.c:676 msgid "days" msgstr "天" @@ -1545,65 +1629,65 @@ msgstr "管理搜索引擎" msgid "Use as _default" msgstr "作为缺省(_d)" -#: ../midori/sokoke.c:117 -#: ../midori/sokoke.c:129 +#: ../midori/sokoke.c:162 +#: ../midori/sokoke.c:174 msgid "Could not run external program." msgstr "无法运行外部程序." #. i18n: A superuser, or system administrator, may not be 'root' -#: ../midori/sokoke.c:448 +#: ../midori/sokoke.c:520 msgid "Warning: You are using a superuser account!" msgstr "警告: 你正在使用超级用户帐号!" -#: ../midori/sokoke.c:780 +#: ../midori/sokoke.c:871 msgid "_Bookmark" msgstr "书签(_B)" -#: ../midori/sokoke.c:782 +#: ../midori/sokoke.c:873 msgid "_Add Bookmark" msgstr "添加书签(_A)" -#: ../midori/sokoke.c:783 +#: ../midori/sokoke.c:874 msgid "_Console" msgstr "控制台(_C)" -#: ../midori/sokoke.c:784 +#: ../midori/sokoke.c:875 msgid "_Extensions" msgstr "扩展(_E)" -#: ../midori/sokoke.c:785 +#: ../midori/sokoke.c:876 msgid "_History" msgstr "历史(_H)" -#: ../midori/sokoke.c:786 +#: ../midori/sokoke.c:877 msgid "_Homepage" msgstr "主页(_H)" -#: ../midori/sokoke.c:787 +#: ../midori/sokoke.c:878 msgid "_Userscripts" msgstr "用户脚本(_U)" -#: ../midori/sokoke.c:788 +#: ../midori/sokoke.c:879 msgid "User_styles" msgstr "用户样式(_s)" -#: ../midori/sokoke.c:789 +#: ../midori/sokoke.c:880 msgid "New _Tab" msgstr "新建标签页(_T)" -#: ../midori/sokoke.c:790 +#: ../midori/sokoke.c:881 msgid "_Transfers" msgstr "传输(_T)" -#: ../midori/sokoke.c:791 -msgid "P_lugins" -msgstr "插件(_l)" +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Netscape 插件(_l)" -#: ../midori/sokoke.c:792 +#: ../midori/sokoke.c:883 msgid "_Closed Tabs and Windows" msgstr "关闭的标签页和窗口(_C)" -#: ../midori/sokoke.c:793 +#: ../midori/sokoke.c:884 msgid "New _Window" msgstr "新建窗口(_W)" @@ -1641,15 +1725,15 @@ msgstr "关闭" msgid "Bookmarks" msgstr "书签" -#: ../panels/midori-bookmarks.c:240 +#: ../panels/midori-bookmarks.c:238 msgid "Edit the selected bookmark" msgstr "编辑选中的书签" -#: ../panels/midori-bookmarks.c:248 +#: ../panels/midori-bookmarks.c:246 msgid "Delete the selected bookmark" msgstr "删除选中的书签" -#: ../panels/midori-bookmarks.c:593 +#: ../panels/midori-bookmarks.c:591 msgid "Separator" msgstr "分隔符" @@ -1661,43 +1745,43 @@ msgstr "控制台" msgid "Extensions" msgstr "扩展" -#: ../panels/midori-history.c:163 +#: ../panels/midori-history.c:162 msgid "Are you sure you want to remove all history items?" msgstr "确认删除所有的历史项?" -#: ../panels/midori-history.c:218 +#: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" msgstr "将选中的历史项加入书签" -#: ../panels/midori-history.c:227 +#: ../panels/midori-history.c:226 msgid "Delete the selected history item" msgstr "删除选中的历史项" -#: ../panels/midori-history.c:235 +#: ../panels/midori-history.c:234 msgid "Clear the entire history" msgstr "清空全部历史" -#: ../panels/midori-history.c:600 +#: ../panels/midori-history.c:599 #, c-format msgid "A week ago" msgstr "一周以前" -#: ../panels/midori-history.c:606 +#: ../panels/midori-history.c:605 #, c-format msgid "%d days ago" msgstr "%d 天以前" -#: ../panels/midori-history.c:613 +#: ../panels/midori-history.c:612 msgid "Today" msgstr "今天" -#: ../panels/midori-history.c:615 +#: ../panels/midori-history.c:614 msgid "Yesterday" msgstr "昨天" #: ../panels/midori-plugins.c:87 -msgid "Plugins" -msgstr "插件" +msgid "Netscape plugins" +msgstr "Netscape 插件" #: ../panels/midori-transfers.c:256 #, c-format @@ -1739,29 +1823,29 @@ msgid "Animation frames are broken" msgstr "动画帧损坏" #: ../katze/katze-utils.c:183 -#: ../katze/katze-utils.c:395 +#: ../katze/katze-utils.c:385 #, c-format msgid "Property '%s' is invalid for %s" msgstr "属性 '%s' 在 '%s' 中无效" #: ../katze/katze-utils.c:215 -#: ../katze/katze-utils.c:254 +#: ../katze/katze-utils.c:244 msgid "Choose file" msgstr "选择文件" -#: ../katze/katze-utils.c:235 +#: ../katze/katze-utils.c:230 msgid "Choose folder" msgstr "选择目录" -#: ../extensions/colorful-tabs.c:104 +#: ../extensions/colorful-tabs.c:115 msgid "Tint tabs distinctly" msgstr "彩色标签" -#: ../extensions/colorful-tabs.c:140 +#: ../extensions/colorful-tabs.c:151 msgid "Colorful Tabs" msgstr "多彩标签" -#: ../extensions/colorful-tabs.c:141 +#: ../extensions/colorful-tabs.c:152 msgid "Tint each tab distinctly" msgstr "用不同颜色区分标签页" @@ -1802,59 +1886,139 @@ msgstr "确认删除所有的 Cookie?" msgid "Question" msgstr "问题" -#: ../extensions/cookie-manager.c:501 +#: ../extensions/cookie-manager.c:502 msgid "Only the visible cookies are deleted which match the entered filter string." msgstr "只删除匹配输入过滤字符串的 Cookies" -#: ../extensions/cookie-manager.c:679 +#: ../extensions/cookie-manager.c:680 msgid "Name" msgstr "名称" -#: ../extensions/cookie-manager.c:739 +#: ../extensions/cookie-manager.c:740 msgid "_Expand All" msgstr "展开所有项目(_E)" -#: ../extensions/cookie-manager.c:747 +#: ../extensions/cookie-manager.c:748 msgid "_Collapse All" msgstr "折叠所有项目(_C)" -#: ../extensions/cookie-manager.c:818 -msgid "Delete All" -msgstr "删除所有项目" - -#: ../extensions/cookie-manager.c:820 +#: ../extensions/cookie-manager.c:821 msgid "Deletes all shown cookies. If a filter is set, only those cookies are deleted which match the filter." msgstr "删除所有 Cookies. 如果已设置了一个过滤器, 则只删除匹配过滤字符串的 Cookies." -#: ../extensions/cookie-manager.c:835 +#: ../extensions/cookie-manager.c:836 msgid "Expand All" msgstr "展开所有项目" -#: ../extensions/cookie-manager.c:842 +#: ../extensions/cookie-manager.c:843 msgid "Collapse All" msgstr "折叠所有项目" -#: ../extensions/cookie-manager.c:873 +#: ../extensions/cookie-manager.c:874 msgid "Filter:" msgstr "过滤器(_F):" -#: ../extensions/cookie-manager.c:878 +#: ../extensions/cookie-manager.c:879 msgid "Enter a filter string to show only cookies whose name or domain field match the entered filter" msgstr "输入过滤字符串以只显示域名相符的 Cookies" -#: ../extensions/cookie-manager.c:913 -#: ../extensions/cookie-manager.c:961 +#: ../extensions/cookie-manager.c:914 +#: ../extensions/cookie-manager.c:962 msgid "Cookie Manager" msgstr "Cookie 管理器" -#: ../extensions/cookie-manager.c:945 +#: ../extensions/cookie-manager.c:946 msgid "_Cookie Manager" msgstr "Cookie 管理器(_C)" -#: ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:963 msgid "List, view and delete cookies" msgstr "查看和删除 Cookies" +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "查找必需的 XML 数据中的 Atom \"entry\" 元素失败." + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "查找必需的 XML 数据中的 Atom \"feed\" 元素失败." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "上次更新: %s." + +#: ../extensions/feed-panel/feed-panel.c:660 +msgid "Feeds" +msgstr "订阅" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Add new feed" +msgstr "添加新订阅" + +#: ../extensions/feed-panel/feed-panel.c:720 +msgid "Delete feed" +msgstr "删除所有订阅" + +#: ../extensions/feed-panel/feed-panel.c:803 +msgid "_Feeds" +msgstr "订阅(_F)" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "查找订阅的 XML 数据根元素失败." + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "不支持的订阅格式." + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "解析 XML 订阅失败: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "查找 RSS XML 数据中的 \"channel\" 元素失败." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "不支持的 RSS 版本." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "查找必需的 XML 数据中的 RSS \"item\" 元素失败." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "查找必需的 XML 数据中的 RSS \"channel\" 元素失败." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "已经订阅过 '%s' " + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "加载订阅 %s 时出错" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "新建订阅" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "订阅面板" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "阅读 Atom/ RSS 订阅" + #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" msgstr "鼠标手势" @@ -1873,16 +2037,11 @@ msgstr "常驻页面" msgid "_Pageholder" msgstr "常驻页面(_P)" -#~ msgid "%s has no property '%s'" -#~ msgstr "%s 没有 '%s' 属性" -#~ msgid "%s cannot be assigned to %s.%s" -#~ msgstr "%s 不能被指定到 %s.%s" -#~ msgid "%s.%s cannot be accessed" -#~ msgstr "%s.%s 不能访问" -#~ msgid "Images" -#~ msgstr "图像" -#~ msgid "Scripts" -#~ msgstr "脚本" -#~ msgid "Source" -#~ msgstr "源码" +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "状态栏特性" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "轻松打开关闭网页中的特性" From d1324a886e3814a9c159e6273a63dbcf2d575582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20=C8=98tirbu?= Date: Wed, 6 May 2009 18:51:51 +0200 Subject: [PATCH 1114/2970] Add Romanian translation --- AUTHORS | 2 + po/LINGUAS | 2 +- po/ro.po | 2021 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2024 insertions(+), 1 deletion(-) create mode 100644 po/ro.po diff --git a/AUTHORS b/AUTHORS index ae33f347..9565e652 100644 --- a/AUTHORS +++ b/AUTHORS @@ -50,6 +50,8 @@ Translations: pl: Przemysław Sitek pl: Lukasz Romanowicz pt_PT: Sérgio Marques + ro: Igor Știrbu + ro: Mișu Moldovan ru: Troitskiy Nikita ru: Anton Shestakov sk: Robert Hartl diff --git a/po/LINGUAS b/po/LINGUAS index 83b2a7fd..e2064ab4 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -cs da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ru sk sv tr uk zh_CN zh_TW +cs da de el en_GB es et fi fr gl he hu id it ja nl pl pt_PT ro ru sk sv tr uk zh_CN zh_TW diff --git a/po/ro.po b/po/ro.po new file mode 100644 index 00000000..564d1469 --- /dev/null +++ b/po/ro.po @@ -0,0 +1,2021 @@ +# Romanian translations for midori package +# Traducerea în limba română pentru pachetul midori. +# Copyright (C) 2009 THE midori'S COPYRIGHT HOLDER +# This file is distributed under the same license as the midori package. +# Igor Stirbu 2009 +# Mișu Moldovan 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: midori 0.1.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-05-05 15:17+0300\n" +"PO-Revision-Date: 2009-05-05 16:11+0300\n" +"Last-Translator: Igor Stirbu \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" + +#: ../data/midori.desktop.in.h:1 +msgid "Lightweight web browser" +msgstr "Mic navigator pentru Internet" + +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1445 +#: ../midori/main.c:1453 ../midori/main.c:1464 +#: ../midori/midori-websettings.c:275 +msgid "Midori" +msgstr "Midori" + +#: ../data/midori.desktop.in.h:3 +msgid "Web Browser" +msgstr "Navigator Internet" + +#: ../midori/main.c:96 +#, c-format +msgid "The configuration couldn't be loaded: %s\n" +msgstr "Nu s-au putut încărca preferințele: %s\n" + +#: ../midori/main.c:151 +#, c-format +msgid "Value '%s' is invalid for %s" +msgstr "Valoarea „%s” nu este validă pentru %s" + +#: ../midori/main.c:158 ../midori/main.c:238 +#, c-format +msgid "Invalid configuration value '%s'" +msgstr "Valoare nevalidă pentru preferințe „%s”" + +#: ../midori/main.c:350 +#, c-format +msgid "Failed to open database: %s\n" +msgstr "Eșec la deschiderea bazei de date: %s\n" + +#: ../midori/main.c:382 +#, c-format +msgid "Failed to execute database statement: %s\n" +msgstr "Eșec la executarea comenzii pentru baza de date: %s\n" + +#: ../midori/main.c:436 +#, c-format +msgid "Failed to remove history item: %s\n" +msgstr "Eșec la ștergerea elementului din istoric: %s\n" + +#: ../midori/main.c:460 +#, c-format +msgid "Failed to clear history: %s\n" +msgstr "Eșec la curățarea istoricului: %s\n" + +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 +#, c-format +msgid "Failed to add history item: %s\n" +msgstr "Eșec la adăugarea elementului în istoric: %s\n" + +#. i18n: Couldn't remove items that are older than n days +#: ../midori/main.c:712 +#, c-format +msgid "Failed to remove old history items: %s\n" +msgstr "Eșec la ștergerea elementelor vechi din istoric: %s\n" + +#: ../midori/main.c:741 +#, c-format +msgid "The configuration couldn't be saved. %s" +msgstr "Nu s-au putut salva preferințele. %s" + +#: ../midori/main.c:770 +#, c-format +msgid "The search engines couldn't be saved. %s" +msgstr "Nu s-au putut salva motoarele de căutare. %s" + +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 +#, c-format +msgid "The bookmarks couldn't be saved. %s" +msgstr "Nu s-au putut salva favoritele. %s" + +#. i18n: Trash, or wastebin, containing closed tabs +#: ../midori/main.c:869 ../midori/main.c:892 +#, c-format +msgid "The trash couldn't be saved. %s" +msgstr "Nu s-a putut salva gunoiul. %s" + +#: ../midori/main.c:965 +#, c-format +msgid "The session couldn't be saved. %s" +msgstr "Nu s-a putut salva sesiunea. %s" + +#: ../midori/main.c:1092 +msgid "" +"Midori seems to have crashed the last time it was opened. If this happened " +"repeatedly, try one of the following options to solve the problem." +msgstr "" +"Se pare că Midori s-a terminat prematur la ultima pornire. Dacă se repetă " +"problema, încercați una dintre opțiunile de mai jos pentru remediere." + +#: ../midori/main.c:1107 +msgid "Modify _preferences" +msgstr "_Modificare preferințe" + +#: ../midori/main.c:1111 +msgid "Reset the last _session" +msgstr "Ignoră ultima _sesiune" + +#: ../midori/main.c:1116 +msgid "Disable all _extensions" +msgstr "Dezactivează _extensiile" + +#: ../midori/main.c:1315 +msgid "No filename specified" +msgstr "Nu s-a precizat un fișier" + +#: ../midori/main.c:1338 +msgid "An unknown error occured." +msgstr "A intervenit o eroare necunoscută." + +#: ../midori/main.c:1369 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Captură salvată în : %s\n" + +#: ../midori/main.c:1389 +msgid "Run ADDRESS as a web application" +msgstr "Execută ADRESA ca o aplicație web" + +#: ../midori/main.c:1389 +msgid "ADDRESS" +msgstr "ADRESA" + +#: ../midori/main.c:1391 +msgid "Use FOLDER as configuration folder" +msgstr "Folosește DOSAR ca dosar cu preferințe" + +#: ../midori/main.c:1391 +msgid "FOLDER" +msgstr "DOSAR" + +#: ../midori/main.c:1393 +msgid "Run the specified filename as javascript" +msgstr "Execută fișierul precizat ca JavaScript" + +#: ../midori/main.c:1395 +msgid "Take a snapshot of the specified URI" +msgstr "Ia o captură a URI-ului specificat" + +#: ../midori/main.c:1397 +msgid "Display program version" +msgstr "Afișează versiunea aplicației" + +#: ../midori/main.c:1399 +msgid "Addresses" +msgstr "Adrese" + +#: ../midori/main.c:1442 +msgid "[Addresses]" +msgstr "[Adrese]" + +#: ../midori/main.c:1465 +msgid "Please report comments, suggestions and bugs to:" +msgstr "Trimiteți comentarii, sugestii și raportați defectele la:" + +#: ../midori/main.c:1467 +msgid "Check for new versions at:" +msgstr "Versiunile noi sunt disponibile la:" + +#: ../midori/main.c:1543 +msgid "The specified configuration folder is invalid." +msgstr "Dosarul cu preferințe precizat nu este valid." + +#: ../midori/main.c:1578 +msgid "An instance of Midori is already running but not responding.\n" +msgstr "O instanță de Midori este deja pornită, dar nu răspunde.\n" + +#: ../midori/main.c:1628 +#, c-format +msgid "The search engines couldn't be loaded. %s\n" +msgstr "Nu s-au putut încărca motoarele de căutare. %s\n" + +#: ../midori/main.c:1640 +#, c-format +msgid "The bookmarks couldn't be loaded: %s\n" +msgstr "Nu s-au putut încărca favoritele: %s\n" + +#: ../midori/main.c:1655 +#, c-format +msgid "The session couldn't be loaded: %s\n" +msgstr "Nu s-a putut încărca sesiunea: %s\n" + +#: ../midori/main.c:1668 +#, c-format +msgid "The trash couldn't be loaded: %s\n" +msgstr "Nu s-a putut încărca gunoiul: %s\n" + +#: ../midori/main.c:1681 +#, c-format +msgid "The history couldn't be loaded: %s\n" +msgstr "Nu s-a putut încărca istoricul: %s\n" + +#: ../midori/main.c:1693 +msgid "The following errors occured:" +msgstr "Au intervenit următoarele erori:" + +#: ../midori/main.c:1709 +msgid "_Ignore" +msgstr "_Ignoră" + +#: ../midori/midori-array.c:195 +msgid "File not found." +msgstr "Nu s-a găsit fișierul." + +#: ../midori/midori-array.c:203 ../midori/midori-array.c:212 +msgid "Malformed document." +msgstr "Document deteriorat." + +#: ../midori/midori-array.c:338 ../midori/sokoke.c:716 +#, c-format +msgid "Writing failed." +msgstr "Eșec la scriere." + +#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3522 +#: ../midori/midori-browser.c:3528 +msgid "Reload the current page" +msgstr "Reîncarcă pagina curentă" + +#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3525 +msgid "Stop loading the current page" +msgstr "Oprește încărcarea paginii curente" + +#: ../midori/midori-browser.c:354 +#, c-format +msgid "%d%% loaded" +msgstr "%d%% încărcat" + +#: ../midori/midori-browser.c:379 +#, c-format +msgid "Unexpected action '%s'." +msgstr "Acțiune neașteptată „%s”." + +#: ../midori/midori-browser.c:598 +msgid "New folder" +msgstr "Dosar nou" + +#: ../midori/midori-browser.c:598 +msgid "Edit folder" +msgstr "Editare dosar" + +#: ../midori/midori-browser.c:600 +msgid "New bookmark" +msgstr "Favorit nou" + +#: ../midori/midori-browser.c:600 +msgid "Edit bookmark" +msgstr "Editare favorite" + +#: ../midori/midori-browser.c:630 +msgid "_Title:" +msgstr "_Titlu:" + +#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 +msgid "_Description:" +msgstr "_Descriere:" + +#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../extensions/feed-panel/main.c:343 +msgid "_Address:" +msgstr "_Adresă:" + +#: ../midori/midori-browser.c:681 +msgid "_Folder:" +msgstr "D_osar:" + +#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 +msgid "Toplevel folder" +msgstr "Dosarul rădăcină" + +#: ../midori/midori-browser.c:803 +msgid "Save file as" +msgstr "Salvare fișier" + +#: ../midori/midori-browser.c:977 +#, c-format +msgid "The file %s has been downloaded." +msgstr "S-a descărcat fișierul %s." + +#: ../midori/midori-browser.c:980 +msgid "Transfer completed" +msgstr "Descărcare finalizată" + +#: ../midori/midori-browser.c:1658 +msgid "Open file" +msgstr "Deschidere fișier" + +#: ../midori/midori-browser.c:2961 ../panels/midori-bookmarks.c:778 +#: ../panels/midori-history.c:808 +msgid "Open all in _Tabs" +msgstr "Deschide tot în _taburi" + +#: ../midori/midori-browser.c:2968 ../panels/midori-bookmarks.c:784 +#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 +msgid "Open in New _Tab" +msgstr "Deschide într-un _tab nou" + +#: ../midori/midori-browser.c:2971 ../panels/midori-bookmarks.c:786 +#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 +msgid "Open in New _Window" +msgstr "Deschide într-o _fereastră nouă" + +#: ../midori/midori-browser.c:3132 +msgid "Clear Private Data" +msgstr "Curăță datele private" + +#: ../midori/midori-browser.c:3135 +msgid "_Clear private data" +msgstr "Șterge datele pri_vate" + +#: ../midori/midori-browser.c:3148 +msgid "Clear the following data:" +msgstr "Șterge următoarele date:" + +#: ../midori/midori-browser.c:3156 ../midori/midori-preferences.c:669 +#: ../panels/midori-history.c:108 +msgid "History" +msgstr "Istoric" + +#: ../midori/midori-browser.c:3159 +msgid "Cookies" +msgstr "Cookie-uri" + +#: ../midori/midori-browser.c:3162 +msgid "'Flash' Cookies" +msgstr "Cookie-uri Flash" + +#: ../midori/midori-browser.c:3165 +msgid "Website icons" +msgstr "Iconițele siturilor" + +#: ../midori/midori-browser.c:3245 +msgid "A lightweight web browser." +msgstr "Un mic navigator pentru Internet." + +#: ../midori/midori-browser.c:3253 +msgid "translator-credits" +msgstr "" +"Igor Știrbu \n" +"Mișu Moldovan " + +#: ../midori/midori-browser.c:3456 +msgid "_File" +msgstr "_Fișier" + +#: ../midori/midori-browser.c:3459 +msgid "Open a new window" +msgstr "Deschide o fereastră nouă" + +#: ../midori/midori-browser.c:3462 +msgid "Open a new tab" +msgstr "Deschide un tab nou" + +#: ../midori/midori-browser.c:3465 +msgid "Open a file" +msgstr "Deschide un fișier" + +#: ../midori/midori-browser.c:3468 +msgid "Save to a file" +msgstr "Salvează într-un fișier" + +#: ../midori/midori-browser.c:3470 +msgid "_Close Tab" +msgstr "În_chide tabul" + +#: ../midori/midori-browser.c:3471 +msgid "Close the current tab" +msgstr "Închide tabul curent" + +#: ../midori/midori-browser.c:3473 +msgid "C_lose Window" +msgstr "Înc_hide fereastra" + +#: ../midori/midori-browser.c:3474 +msgid "Close this window" +msgstr "Închide această fereastră" + +#: ../midori/midori-browser.c:3477 +msgid "Print the current page" +msgstr "Tipărește pagina curentă" + +#: ../midori/midori-browser.c:3480 +msgid "Quit the application" +msgstr "Ieșire din aplicație" + +#: ../midori/midori-browser.c:3482 +msgid "_Edit" +msgstr "_Editare" + +#: ../midori/midori-browser.c:3485 +msgid "Cut the selected text" +msgstr "Taie textul selectat" + +#: ../midori/midori-browser.c:3488 ../midori/midori-browser.c:3491 +msgid "Copy the selected text" +msgstr "Copiază textul selectat" + +#: ../midori/midori-browser.c:3494 +msgid "Paste text from the clipboard" +msgstr "Lipește textul din clipboard" + +#: ../midori/midori-browser.c:3497 +msgid "Delete the selected text" +msgstr "Șterge textul selectat" + +#: ../midori/midori-browser.c:3500 +msgid "Select all text" +msgstr "Selectează tot textul" + +#: ../midori/midori-browser.c:3503 +msgid "Find a word or phrase in the page" +msgstr "Caută un cuvânt sau o frază în pagină" + +#: ../midori/midori-browser.c:3505 +msgid "Find _Next" +msgstr "Caută înai_nte" + +#: ../midori/midori-browser.c:3506 +msgid "Find the next occurrence of a word or phrase" +msgstr "Caută următoarea potrivire a cuvântului sau a expresiei" + +#: ../midori/midori-browser.c:3508 +msgid "Find _Previous" +msgstr "Caută înap_oi" + +#: ../midori/midori-browser.c:3509 +msgid "Find the previous occurrence of a word or phrase" +msgstr "Caută apariția anterioară a cuvântului sau a expresiei" + +#: ../midori/midori-browser.c:3512 +msgid "_Quick Find" +msgstr "Căutare _rapidă" + +#: ../midori/midori-browser.c:3513 +msgid "Quickly jump to a word or phrase" +msgstr "Salt rapid la un cuvânt sau o expresie" + +#: ../midori/midori-browser.c:3516 +msgid "Configure the application preferences" +msgstr "Schimbați preferințele aplicației" + +#: ../midori/midori-browser.c:3518 +msgid "_View" +msgstr "_Vizualizare" + +#: ../midori/midori-browser.c:3519 +msgid "_Toolbars" +msgstr "_Bare cu unelte" + +#: ../midori/midori-browser.c:3531 +msgid "Increase the zoom level" +msgstr "Mărește" + +#: ../midori/midori-browser.c:3534 +msgid "Decrease the zoom level" +msgstr "Micșorează" + +#: ../midori/midori-browser.c:3537 +msgid "Reset the zoom level" +msgstr "Resetează mărimea" + +#: ../midori/midori-browser.c:3538 +msgid "_Encoding" +msgstr "C_odare" + +#: ../midori/midori-browser.c:3540 +msgid "_Automatic" +msgstr "_Automată" + +#: ../midori/midori-browser.c:3543 ../midori/midori-websettings.c:202 +msgid "Chinese (BIG5)" +msgstr "Chineză (BIG5)" + +#: ../midori/midori-browser.c:3546 ../midori/midori-websettings.c:203 +msgid "Japanese (SHIFT_JIS)" +msgstr "Japoneză (SHIFT_JIS)" + +#: ../midori/midori-browser.c:3549 ../midori/midori-websettings.c:204 +msgid "Russian (KOI8-R)" +msgstr "Rusă (KOI8-R)" + +#: ../midori/midori-browser.c:3552 ../midori/midori-websettings.c:205 +msgid "Unicode (UTF-8)" +msgstr "Unicode (UTF-8)" + +#: ../midori/midori-browser.c:3555 ../midori/midori-websettings.c:206 +msgid "Western (ISO-8859-1)" +msgstr "Vestică (ISO-8859-1)" + +#: ../midori/midori-browser.c:3558 ../midori/midori-websettings.c:207 +#: ../midori/midori-websettings.c:279 +msgid "Custom..." +msgstr "Personalizată..." + +#: ../midori/midori-browser.c:3561 ../midori/midori-view.c:1213 +msgid "View _Source" +msgstr "Vizualizare s_ursă" + +#: ../midori/midori-browser.c:3562 +msgid "View the source code of the page" +msgstr "Vizualizare a codului sursă a paginii" + +#: ../midori/midori-browser.c:3564 +msgid "View Selection Source" +msgstr "Vizualizare sursă selecție" + +#: ../midori/midori-browser.c:3565 +msgid "View the source code of the selection" +msgstr "Vizualizare a codului sursă din selecție" + +#: ../midori/midori-browser.c:3569 +msgid "Toggle fullscreen view" +msgstr "Comută modul pe tot ecranul" + +#: ../midori/midori-browser.c:3571 +msgid "_Go" +msgstr "_Navigare" + +#: ../midori/midori-browser.c:3574 +msgid "Go back to the previous page" +msgstr "Salt la pagina anterioară" + +#: ../midori/midori-browser.c:3577 +msgid "Go forward to the next page" +msgstr "Salt la pagina următoare" + +#: ../midori/midori-browser.c:3580 +msgid "Go to your homepage" +msgstr "Salt la pagina principală" + +#: ../midori/midori-browser.c:3582 +msgid "Empty Trash" +msgstr "Golește gunoiul" + +#: ../midori/midori-browser.c:3583 +msgid "Delete the contents of the trash" +msgstr "Șterge conținutul coșului de gunoi" + +#: ../midori/midori-browser.c:3585 ../midori/midori-view.c:1185 +msgid "Undo Close Tab" +msgstr "Revocă închiderea tabului" + +#: ../midori/midori-browser.c:3586 +msgid "Open the last closed tab" +msgstr "Deschide ultimul tab închis" + +#: ../midori/midori-browser.c:3590 ../panels/midori-bookmarks.c:230 +msgid "Add a new bookmark" +msgstr "Adaugă un favorit nou" + +#: ../midori/midori-browser.c:3592 ../panels/midori-bookmarks.c:259 +msgid "Add a new folder" +msgstr "Adaugă un dosar nou" + +#: ../midori/midori-browser.c:3593 +msgid "Add a new bookmark folder" +msgstr "Adaugă un dosar cu favorite" + +#: ../midori/midori-browser.c:3594 +msgid "_Tools" +msgstr "_Unelte" + +#: ../midori/midori-browser.c:3596 ../midori/midori-searchaction.c:493 +msgid "_Manage Search Engines" +msgstr "Gestionare _motoare de căutare" + +#: ../midori/midori-browser.c:3597 +msgid "Add, edit and remove search engines..." +msgstr "Adăugați, editați și ștergeți motoare de căutare..." + +#: ../midori/midori-browser.c:3600 +msgid "_Clear Private Data" +msgstr "Șt_erge datele private" + +#: ../midori/midori-browser.c:3601 +msgid "Clear private data..." +msgstr "Ștergere date private..." + +#: ../midori/midori-browser.c:3605 +msgid "_Previous Tab" +msgstr "Tabul a_nterior" + +#: ../midori/midori-browser.c:3606 +msgid "Switch to the previous tab" +msgstr "Comută la tabul anterior" + +#: ../midori/midori-browser.c:3608 +msgid "_Next Tab" +msgstr "Tabul u_rmător" + +#: ../midori/midori-browser.c:3609 +msgid "Switch to the next tab" +msgstr "Comută la tabul următor" + +#: ../midori/midori-browser.c:3611 +msgid "_Help" +msgstr "_Ajutor" + +#: ../midori/midori-browser.c:3613 +msgid "_Contents" +msgstr "_Conținut" + +#: ../midori/midori-browser.c:3614 +msgid "Show the documentation" +msgstr "Arată documentația" + +#: ../midori/midori-browser.c:3616 +msgid "_Frequent Questions" +msgstr "Întrebări _frecvente" + +#: ../midori/midori-browser.c:3617 +msgid "Show the Frequently Asked Questions" +msgstr "Arată întrebările frecvente" + +#: ../midori/midori-browser.c:3619 +msgid "_Report a Bug" +msgstr "_Raportare defect" + +#: ../midori/midori-browser.c:3620 +msgid "Open Midori's bug tracker" +msgstr "Deschide gestionarul de defecte al Midori" + +#: ../midori/midori-browser.c:3623 +msgid "Show information about the program" +msgstr "Arată detalii despre aplicație" + +#: ../midori/midori-browser.c:3630 +msgid "P_rivate Browsing" +msgstr "Navigare p_rivată" + +#: ../midori/midori-browser.c:3631 +msgid "Don't save any private data while browsing" +msgstr "Nu salva date private în timpul navigării" + +#: ../midori/midori-browser.c:3636 +msgid "_Menubar" +msgstr "Bară de _meniu" + +#: ../midori/midori-browser.c:3637 +msgid "Show menubar" +msgstr "Arată bara de meniu" + +#: ../midori/midori-browser.c:3640 +msgid "_Navigationbar" +msgstr "Bară de _navigare" + +#: ../midori/midori-browser.c:3641 +msgid "Show navigationbar" +msgstr "Arată bara de navigare" + +#: ../midori/midori-browser.c:3644 +msgid "Side_panel" +msgstr "_Panou lateral" + +#: ../midori/midori-browser.c:3645 +msgid "Show sidepanel" +msgstr "Arată panoul lateral" + +#: ../midori/midori-browser.c:3648 +msgid "_Bookmarkbar" +msgstr "Bară cu _favorite" + +#: ../midori/midori-browser.c:3649 +msgid "Show bookmarkbar" +msgstr "Arată bara cu favorite" + +#: ../midori/midori-browser.c:3652 +msgid "_Transferbar" +msgstr "Bară de _descărcare" + +#: ../midori/midori-browser.c:3653 +msgid "Show transferbar" +msgstr "Arată bara descărcărilor" + +#: ../midori/midori-browser.c:3656 +msgid "_Statusbar" +msgstr "Bară de _stare" + +#: ../midori/midori-browser.c:3657 +msgid "Show statusbar" +msgstr "Arată bara de stare" + +#: ../midori/midori-browser.c:4088 +msgid "_Separator" +msgstr "_Separator" + +#: ../midori/midori-browser.c:4095 +msgid "_Location..." +msgstr "_Locație..." + +#: ../midori/midori-browser.c:4097 +msgid "Open a particular location" +msgstr "Deschide o anumită locație" + +#: ../midori/midori-browser.c:4119 +msgid "_Web Search..." +msgstr "Caută pe _Internet..." + +#: ../midori/midori-browser.c:4121 +msgid "Run a web search" +msgstr "Pornește o căutare pe Internet" + +#: ../midori/midori-browser.c:4142 +msgid "Reopen a previously closed tab or window" +msgstr "Redeschideți taburi ori ferestre închise recent" + +#: ../midori/midori-browser.c:4155 +msgid "_Recently visited pages" +msgstr "Pagini vizitate _recent" + +#: ../midori/midori-browser.c:4157 +msgid "Reopen pages that you visited earlier" +msgstr "Redeschideți pagini vizitate recent" + +#: ../midori/midori-browser.c:4170 ../midori/sokoke.c:872 +msgid "_Bookmarks" +msgstr "Favo_rite" + +#: ../midori/midori-browser.c:4172 +msgid "Show the saved bookmarks" +msgstr "Arată favoritele salvate" + +#: ../midori/midori-browser.c:4187 +msgid "_Window" +msgstr "Fereas_tră" + +#: ../midori/midori-browser.c:4189 +msgid "Show a list of all open tabs" +msgstr "Arată lista tuturor taburilor deschise" + +#. i18n: A panel at the bottom, to search text in pages +#: ../midori/midori-browser.c:4356 +msgid "_Inline Find:" +msgstr "Căutare _inclusă:" + +#: ../midori/midori-browser.c:4381 +msgid "Previous" +msgstr "Anterioară" + +#: ../midori/midori-browser.c:4386 +msgid "Next" +msgstr "Următoare" + +#: ../midori/midori-browser.c:4391 +msgid "Match Case" +msgstr "Majuscule semnificative" + +#: ../midori/midori-browser.c:4399 +msgid "Highlight Matches" +msgstr "Evidențiază potrivirile" + +#: ../midori/midori-browser.c:4409 +msgid "Close Findbar" +msgstr "Închide bara de căutare" + +#: ../midori/midori-browser.c:4444 ../extensions/cookie-manager.c:821 +msgid "Delete All" +msgstr "Șterge tot" + +#: ../midori/midori-browser.c:4837 +#, c-format +msgid "Unexpected setting '%s'" +msgstr "Opțiune neașteptată „%s”" + +#: ../midori/midori-panel.c:333 +msgid "Detach chosen panel from the window" +msgstr "Detașează de fereastră panoul ales" + +#: ../midori/midori-panel.c:335 +msgid "Whether to detach the chosen panel from the window" +msgstr "Specifică dacă se detașează de fereastră panoul ales" + +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 +msgid "Align sidepanel on the right" +msgstr "Aliniază la dreapta panoul lateral" + +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 +msgid "Whether to align the sidepanel on the right" +msgstr "Specifică dacă panoul lateral se aliniază la dreapta" + +#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358 +msgid "Close panel" +msgstr "Închide panoul" + +#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2032 +msgid "Blank page" +msgstr "O pagină goală" + +#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 +msgid "Homepage" +msgstr "Pagina de pornire" + +#: ../midori/midori-websettings.c:187 +msgid "Last open pages" +msgstr "Ultimele pagini deschise" + +#: ../midori/midori-websettings.c:222 +msgid "New tab" +msgstr "Tab nou" + +#: ../midori/midori-websettings.c:223 +msgid "New window" +msgstr "Fereastră nouă" + +#: ../midori/midori-websettings.c:224 +msgid "Current tab" +msgstr "Tab curent" + +#: ../midori/midori-websettings.c:239 +msgid "Default" +msgstr "Implicit" + +#: ../midori/midori-websettings.c:240 +msgid "Icons" +msgstr "Iconițe" + +#: ../midori/midori-websettings.c:241 +msgid "Text" +msgstr "Text" + +#: ../midori/midori-websettings.c:242 +msgid "Both" +msgstr "Ambele" + +#: ../midori/midori-websettings.c:243 +msgid "Both horizontal" +msgstr "Ambele pe orizontală" + +#: ../midori/midori-websettings.c:258 +msgid "All cookies" +msgstr "Toate cookie-urile" + +#: ../midori/midori-websettings.c:259 +msgid "Session cookies" +msgstr "Cookie-uri de sesiune" + +#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 +msgid "None" +msgstr "Fără" + +#: ../midori/midori-websettings.c:276 +msgid "Safari" +msgstr "Safari" + +#: ../midori/midori-websettings.c:277 +msgid "Firefox" +msgstr "Firefox" + +#: ../midori/midori-websettings.c:278 +msgid "Internet Explorer" +msgstr "Internet Explorer" + +#: ../midori/midori-websettings.c:331 +msgid "Remember last window size" +msgstr "Reține dimensiunea ultimei ferestre" + +#: ../midori/midori-websettings.c:332 +msgid "Whether to save the last window size" +msgstr "Specifică dacă se salvează dimensiunea ultimei ferestre" + +#: ../midori/midori-websettings.c:340 +msgid "Last window width" +msgstr "Lățimea ultimei ferestre" + +#: ../midori/midori-websettings.c:341 +msgid "The last saved window width" +msgstr "Ultima lățime salvată a ferestrei" + +#: ../midori/midori-websettings.c:349 +msgid "Last window height" +msgstr "Înălțimea ultimei ferestre" + +#: ../midori/midori-websettings.c:350 +msgid "The last saved window height" +msgstr "Ultima înălțime salvată a ferestrei" + +#: ../midori/midori-websettings.c:375 +msgid "Last panel position" +msgstr "Ultima poziție a panoului" + +#: ../midori/midori-websettings.c:376 +msgid "The last saved panel position" +msgstr "Ultima poziție salvată a panoului" + +#. i18n: The internal index of the last opened panel +#: ../midori/midori-websettings.c:385 +msgid "Last panel page" +msgstr "Ultima pagină a panoului" + +#: ../midori/midori-websettings.c:386 +msgid "The last saved panel page" +msgstr "Ulima pagină salvată a panoului" + +#: ../midori/midori-websettings.c:394 +msgid "Last Web search" +msgstr "Ultima căutare web" + +#: ../midori/midori-websettings.c:395 +msgid "The last saved Web search" +msgstr "Ultima căutare web salvată" + +#: ../midori/midori-websettings.c:404 +msgid "Show Menubar" +msgstr "Arată bara de meniu" + +#: ../midori/midori-websettings.c:405 +msgid "Whether to show the menubar" +msgstr "Specifică dacă se afișează bara de meniu" + +#: ../midori/midori-websettings.c:413 +msgid "Show Navigationbar" +msgstr "Arată bara de navigare" + +#: ../midori/midori-websettings.c:414 +msgid "Whether to show the navigationbar" +msgstr "Specifică dacă se afișează bara de navigare" + +#: ../midori/midori-websettings.c:422 +msgid "Show Bookmarkbar" +msgstr "Arată bara cu favorite" + +#: ../midori/midori-websettings.c:423 +msgid "Whether to show the bookmarkbar" +msgstr "Specifică dacă se afișează bara cu favorite" + +#: ../midori/midori-websettings.c:431 +msgid "Show Panel" +msgstr "Arată panoul" + +#: ../midori/midori-websettings.c:432 +msgid "Whether to show the panel" +msgstr "Specifică dacă se afișează panoul" + +#: ../midori/midori-websettings.c:447 +msgid "Show Transferbar" +msgstr "Arată bara descărcărilor" + +#: ../midori/midori-websettings.c:448 +msgid "Whether to show the transferbar" +msgstr "Specifică dacă se afișează bara descărcărilor" + +#: ../midori/midori-websettings.c:456 +msgid "Show Statusbar" +msgstr "Arată bara de stare" + +#: ../midori/midori-websettings.c:457 +msgid "Whether to show the statusbar" +msgstr "Specifică dacă se afișează bara de stare" + +#: ../midori/midori-websettings.c:466 +msgid "Toolbar Style" +msgstr "Stil bară cu unelte" + +#: ../midori/midori-websettings.c:467 +msgid "The style of the toolbar" +msgstr "Stilul barei cu unelte" + +#: ../midori/midori-websettings.c:483 +msgid "Show progress in location entry" +msgstr "Arată progresul în bara de adrese" + +#: ../midori/midori-websettings.c:484 +msgid "Whether to show loading progress in the location entry" +msgstr "Specifică dacă se afișează progresul încărcării în bara de adrese" + +#: ../midori/midori-websettings.c:499 +msgid "Search engines in location completion" +msgstr "Arată motoarele în bara de adrese" + +#: ../midori/midori-websettings.c:500 +msgid "Whether to show search engines in the location completion" +msgstr "" +"Specifică dacă se afișează motoarele de căutare la completare în bara de " +"adrese" + +#: ../midori/midori-websettings.c:508 +msgid "Toolbar Items" +msgstr "Elementele barei cu unelte" + +#: ../midori/midori-websettings.c:509 +msgid "The items to show on the toolbar" +msgstr "Elementele de arătat în bara cu unelte" + +#: ../midori/midori-websettings.c:517 +msgid "Compact Sidepanel" +msgstr "Panou lateral compact" + +#: ../midori/midori-websettings.c:518 +msgid "Whether to make the sidepanel compact" +msgstr "Specifică dacă panoul lateral e compact" + +#: ../midori/midori-websettings.c:543 +msgid "Load on Startup" +msgstr "De încărcat la pornire" + +#: ../midori/midori-websettings.c:544 +msgid "What to load on startup" +msgstr "Alegeți ce să se încarce la pornire" + +#: ../midori/midori-websettings.c:554 +msgid "The homepage" +msgstr "Pagina de pornire" + +#: ../midori/midori-websettings.c:569 +msgid "Show crash dialog" +msgstr "Întreabă la pornire după o terminare prematură" + +#: ../midori/midori-websettings.c:570 +msgid "Show a dialog after Midori crashed" +msgstr "Afișează o fereastră la următoarea pornire după o terminare prematură" + +#: ../midori/midori-websettings.c:578 +msgid "Download Folder" +msgstr "Dosar pentru descărcări" + +#: ../midori/midori-websettings.c:579 +msgid "The folder downloaded files are saved to" +msgstr "Calea către dosarul pentru salvarea fișierelor descărcate" + +#: ../midori/midori-websettings.c:598 +msgid "Ask for the destination folder" +msgstr "Cere un dosar de destinație" + +#: ../midori/midori-websettings.c:599 +msgid "Whether to ask for the destination folder when downloading a file" +msgstr "" +"Specifică dacă se va cere precizarea dosarului în care se face descărcarea" + +#: ../midori/midori-websettings.c:618 +msgid "Notify when a transfer has been completed" +msgstr "Notifică la finalizarea descărcărilor" + +#: ../midori/midori-websettings.c:619 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Specifică dacă se afișează o notificare la finalizarea unei descărcări" + +#: ../midori/midori-websettings.c:631 +msgid "Download Manager" +msgstr "Gestionar de descărcări" + +#: ../midori/midori-websettings.c:632 +msgid "An external download manager" +msgstr "Gestionar extern de descărcări" + +#: ../midori/midori-websettings.c:640 +msgid "Text Editor" +msgstr "Editor de text" + +#: ../midori/midori-websettings.c:641 +msgid "An external text editor" +msgstr "Editor extern de text" + +#: ../midori/midori-websettings.c:656 +msgid "News Aggregator" +msgstr "Agregator de știri" + +#: ../midori/midori-websettings.c:657 +msgid "An external news aggregator" +msgstr "Agregator extern de știri" + +#: ../midori/midori-websettings.c:665 +msgid "Location entry Search" +msgstr "Căutarea în bara de adrese" + +#: ../midori/midori-websettings.c:666 +msgid "The search to perform inside the location entry" +msgstr "Căutarea de efectuat în bara de adrese" + +#: ../midori/midori-websettings.c:674 +msgid "Preferred Encoding" +msgstr "Codare preferată" + +#: ../midori/midori-websettings.c:675 +msgid "The preferred character encoding" +msgstr "Codarea de caractere preferată" + +#: ../midori/midori-websettings.c:685 +msgid "Always Show Tabbar" +msgstr "Arată întotdeauna bara cu taburi" + +#: ../midori/midori-websettings.c:686 +msgid "Always show the tabbar" +msgstr "Arată întotdeauna bara cu taburi" + +#: ../midori/midori-websettings.c:694 +msgid "Close Buttons on Tabs" +msgstr "Butoane de închidere pe taburi" + +#: ../midori/midori-websettings.c:695 +msgid "Whether tabs have close buttons" +msgstr "Specifică dacă se adaugă butoane de închidere pe taburi" + +#: ../midori/midori-websettings.c:703 +msgid "Open new pages in" +msgstr "Paginile noi se vor deschide în" + +#: ../midori/midori-websettings.c:704 +msgid "Where to open new pages" +msgstr "Alegeți unde să se deschidă paginile noi" + +#: ../midori/midori-websettings.c:713 +msgid "Open external pages in" +msgstr "Paginile externe se vor deschide în" + +#: ../midori/midori-websettings.c:714 +msgid "Where to open externally opened pages" +msgstr "Alegeți unde să se deschidă paginile externe" + +#: ../midori/midori-websettings.c:727 +msgid "Middle click opens Selection" +msgstr "Butonul din mijloc deschide selecția" + +#: ../midori/midori-websettings.c:728 +msgid "Load an address from the selection via middle click" +msgstr "" +"Încarcă adresa din clipboard prin clic pe butonul din mijloc al mausului" + +#: ../midori/midori-websettings.c:736 +msgid "Open tabs in the background" +msgstr "Deschide taburile în fundal" + +#: ../midori/midori-websettings.c:737 +msgid "Whether to open new tabs in the background" +msgstr "Specifică dacă taburile noi se deschid în fundal" + +#: ../midori/midori-websettings.c:745 +msgid "Open Tabs next to Current" +msgstr "Deschide taburile lângă cel curent" + +#: ../midori/midori-websettings.c:746 +msgid "Whether to open new tabs next to the current tab or after the last one" +msgstr "" +"Specifică dacă taburile noi se deschid lângă cel curent sau după ultimul tab" + +#: ../midori/midori-websettings.c:754 +msgid "Open popups in tabs" +msgstr "Deschide popup-urile în taburi" + +#: ../midori/midori-websettings.c:755 +msgid "Whether to open popup windows in tabs" +msgstr "Specifică dacă ferestrele popup se deschid în taburi" + +#: ../midori/midori-websettings.c:771 +msgid "Zoom Text and Images" +msgstr "Scalează imaginile odată cu textul" + +#: ../midori/midori-websettings.c:772 +msgid "Whether to zoom text and images" +msgstr "Specifică dacă se scalează concomitent textul și imaginile" + +#: ../midori/midori-websettings.c:787 +msgid "Find inline while typing" +msgstr "Caută în pagină pe măsură ce se tastează" + +#: ../midori/midori-websettings.c:788 +msgid "Whether to automatically find inline while typing" +msgstr "Specifică dacă se caută automat pe măsură ce se tastează" + +#: ../midori/midori-websettings.c:796 +msgid "Accept cookies" +msgstr "Acceptă cookie-uri" + +#: ../midori/midori-websettings.c:797 +msgid "What type of cookies to accept" +msgstr "Tipuri de cookie-uri acceptate" + +#: ../midori/midori-websettings.c:806 +msgid "Original cookies only" +msgstr "Doar cookie-uri originale" + +#: ../midori/midori-websettings.c:807 +msgid "Accept cookies from the original website only" +msgstr "Acceptă cookie-uri doar de la situl original" + +#: ../midori/midori-websettings.c:815 +msgid "Maximum cookie age" +msgstr "Durata maximă pentru cookie-uri" + +#: ../midori/midori-websettings.c:816 +msgid "The maximum number of days to save cookies for" +msgstr "Numărul maxim de zile pentru păstrarea cookie-urilor" + +#: ../midori/midori-websettings.c:826 +msgid "Remember last visited pages" +msgstr "Reține ultimele pagini vizitate" + +#: ../midori/midori-websettings.c:827 +msgid "Whether the last visited pages are saved" +msgstr "Specifică dacă se rețin ultimele pagini vizitate" + +#: ../midori/midori-websettings.c:835 +msgid "Maximum history age" +msgstr "Vârsta maximă pentru istoric" + +#: ../midori/midori-websettings.c:836 +msgid "The maximum number of days to save the history for" +msgstr "Numărul maxim de zile pentru păstrarea istoricului" + +#: ../midori/midori-websettings.c:844 +msgid "Remember last form inputs" +msgstr "Reține datele din formulare" + +#: ../midori/midori-websettings.c:845 +msgid "Whether the last form inputs are saved" +msgstr "Specifică dacă se rețin ultimele date introduse în formulare" + +#: ../midori/midori-websettings.c:853 +msgid "Remember last downloaded files" +msgstr "Reține ultimele fișiere descărcate" + +#: ../midori/midori-websettings.c:854 +msgid "Whether the last downloaded files are saved" +msgstr "Specifică dacă se rețin ultimele fișiere descărcate" + +#: ../midori/midori-websettings.c:864 +msgid "Proxy Server" +msgstr "Server proxy" + +#: ../midori/midori-websettings.c:865 +msgid "The proxy server used for HTTP connections" +msgstr "Serverul proxy pentru conexiuni HTTP" + +#: ../midori/midori-websettings.c:880 +msgid "Detect proxy server automatically" +msgstr "Detectează automat serverul proxy" + +#: ../midori/midori-websettings.c:881 +msgid "Whether to detect the proxy server automatically from the environment" +msgstr "" +"Specifică dacă se detectează automat serverul proxy din variabilele de mediu" + +#. i18n: This refers to an application, not the 'user agent' string +#: ../midori/midori-websettings.c:897 +msgid "Identify as" +msgstr "Identificare" + +#: ../midori/midori-websettings.c:898 +msgid "What to identify as to web pages" +msgstr "Alegeți identitatea de prezentat serverelor web" + +#: ../midori/midori-websettings.c:914 +msgid "Identification string" +msgstr "Șir de identificare" + +#: ../midori/midori-websettings.c:915 +msgid "The application identification string" +msgstr "Șirul de identificare al aplicației" + +#: ../midori/midori-websettings.c:923 +msgid "Cache size" +msgstr "Mărime cache" + +#: ../midori/midori-websettings.c:924 +msgid "The allowed size of the cache" +msgstr "Mărime maximă pentru cache" + +#: ../midori/midori-view.c:648 +#, c-format +msgid "The page '%s' couldn't be loaded." +msgstr "Nu s-a putut încărca pagina „%s”." + +#: ../midori/midori-view.c:650 ../extensions/feed-panel/main.c:112 +msgid "Error" +msgstr "Eroare" + +#: ../midori/midori-view.c:653 +msgid "Try again" +msgstr "Reîncearcă" + +#. i18n: The title of the 404 - Not found error page +#. Error pages are special, we want to try loading the destination +#. again, not the error page which isn't even a proper page +#: ../midori/midori-view.c:680 ../midori/midori-view.c:2556 +#, c-format +msgid "Not found - %s" +msgstr "%s nu a fost găsit" + +#: ../midori/midori-view.c:1047 +msgid "Open _Link" +msgstr "Deschide _linkul" + +#: ../midori/midori-view.c:1049 +msgid "Open Link in New _Tab" +msgstr "Deschide linkul într-un _tab nou" + +#: ../midori/midori-view.c:1066 +msgid "Open Link in New _Window" +msgstr "Deschide linkul într-o _fereastră nouă" + +#: ../midori/midori-view.c:1075 +msgid "_Download Link destination" +msgstr "_Descarcă destinația linkului" + +#: ../midori/midori-view.c:1081 +msgid "_Save Link destination" +msgstr "_Salvează destinația linkului" + +#: ../midori/midori-view.c:1090 +msgid "Download with Download _Manager" +msgstr "D_escarcă cu gestionarul de descărcări" + +#: ../midori/midori-view.c:1119 +msgid "Search _with" +msgstr "Caută c_u" + +#: ../midori/midori-view.c:1147 +msgid "_Search the Web" +msgstr "C_aută pe Internet" + +#: ../midori/midori-view.c:1157 +msgid "Open Address in New _Tab" +msgstr "Deschide adresa într-un _tab nou" + +#: ../midori/midori-view.c:1309 +msgid "Open or download file" +msgstr "Deschide sau descarcă fișierul" + +#: ../midori/midori-view.c:1326 +#, c-format +msgid "File Type: '%s'" +msgstr "Tip fișier: „%s”" + +#: ../midori/midori-view.c:1329 +#, c-format +msgid "File Type: %s ('%s')" +msgstr "Tip fișier: %s („%s”)" + +#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" +#: ../midori/midori-view.c:1333 +#, c-format +msgid "Open %s" +msgstr "Deschide %s" + +#: ../midori/midori-view.c:1742 +#, c-format +msgid "Inspect page - %s" +msgstr "Inspectare pagină - %s" + +#: ../midori/midori-view.c:1894 +#, c-format +msgid "Document cannot be displayed" +msgstr "Documentul nu poate fi afișat" + +#: ../midori/midori-view.c:1911 +#, c-format +msgid "No documentation installed" +msgstr "Documentația nu este instalată" + +#: ../midori/midori-preferences.c:91 +#, c-format +msgid "Preferences for %s" +msgstr "Preferințe %s" + +#. Page "General" +#: ../midori/midori-preferences.c:399 +msgid "General" +msgstr "Generale" + +#: ../midori/midori-preferences.c:400 +msgid "Startup" +msgstr "Pornire" + +#: ../midori/midori-preferences.c:416 +msgid "Use current page as homepage" +msgstr "Utilizează pagina curentă ca pagină principală" + +#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 +msgid "Transfers" +msgstr "Transferuri" + +#. Page "Appearance" +#: ../midori/midori-preferences.c:440 +msgid "Appearance" +msgstr "Aspect" + +#: ../midori/midori-preferences.c:441 +msgid "Font settings" +msgstr "Preferințe fonturi" + +#: ../midori/midori-preferences.c:443 +msgid "Default Font Family" +msgstr "Familie implicită de fonturi" + +#: ../midori/midori-preferences.c:447 +msgid "The default font family used to display text" +msgstr "Familie implicită de fonturi pentru afișarea textului" + +#: ../midori/midori-preferences.c:450 +msgid "The default font size used to display text" +msgstr "Mărime implicită a fontului pentru afișarea textului" + +#: ../midori/midori-preferences.c:453 +msgid "Fixed-width Font Family" +msgstr "Familie de fonturi cu lățime fixă" + +#: ../midori/midori-preferences.c:456 +msgid "The font family used to display fixed-width text" +msgstr "Familie de fonturi utilizată pentru afișarea textului de lățime fixă" + +#: ../midori/midori-preferences.c:458 +msgid "Minimum Font Size" +msgstr "Mărime minimă a fontului" + +#: ../midori/midori-preferences.c:461 +msgid "The minimum font size used to display text" +msgstr "Mărime minimă a fontului pentru afișarea textului" + +#: ../midori/midori-preferences.c:468 +msgid "Encoding" +msgstr "Codare" + +#: ../midori/midori-preferences.c:471 +msgid "The character encoding to use by default" +msgstr "Codarea implicită pentru caractere" + +#. Page "Behavior" +#: ../midori/midori-preferences.c:478 +msgid "Behavior" +msgstr "Comportament" + +#: ../midori/midori-preferences.c:479 +msgid "Features" +msgstr "Facilități" + +#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 +msgid "Load images automatically" +msgstr "Încarcă automat imaginile" + +#: ../midori/midori-preferences.c:483 +msgid "Load and display images automatically" +msgstr "Încarcă și afișează automat imaginile" + +#: ../midori/midori-preferences.c:486 +msgid "Shrink images automatically" +msgstr "Micșorează automat imaginile" + +#: ../midori/midori-preferences.c:487 +msgid "Automatically shrink standalone images to fit" +msgstr "Micșorează automat imaginile pentru a le potrivi" + +#: ../midori/midori-preferences.c:490 +msgid "Print background images" +msgstr "Tipărește imaginile de fundal" + +#: ../midori/midori-preferences.c:491 +msgid "Whether background images should be printed" +msgstr "Specifică dacă se tipăresc și imaginile de fundal" + +#: ../midori/midori-preferences.c:494 +msgid "Resizable text areas" +msgstr "Zone de text redimensionabile" + +#: ../midori/midori-preferences.c:495 +msgid "Whether text areas are resizable" +msgstr "Specifică dacă se pot redimensiona zonele de text" + +#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 +msgid "Enable scripts" +msgstr "Execută scripturi" + +#: ../midori/midori-preferences.c:499 +msgid "Enable embedded scripting languages" +msgstr "Activează limbajele de scripting incluse" + +#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +msgid "Enable Netscape plugins" +msgstr "Utilizează module Netscape" + +#: ../midori/midori-preferences.c:503 +msgid "Enable embedded Netscape plugin objects" +msgstr "Activează modulele Netscape incluse" + +#: ../midori/midori-preferences.c:506 +msgid "Enforce 96 dots per inch" +msgstr "Forțează afișarea în 96 DPI" + +#: ../midori/midori-preferences.c:507 +msgid "Enforce a video dot density of 96 DPI" +msgstr "Forțează la 96 DPI densitatea punctelor vizualizării" + +#: ../midori/midori-preferences.c:510 +msgid "Enable developer tools" +msgstr "Activează uneltele de dezvoltare" + +#: ../midori/midori-preferences.c:511 +msgid "Enable special extensions for developers" +msgstr "Activează extensiile speciale pentru dezvoltatori" + +#: ../midori/midori-preferences.c:518 +msgid "Spell Checking" +msgstr "Verificare ortografică" + +#: ../midori/midori-preferences.c:521 +msgid "Enable Spell Checking" +msgstr "Activează verificarea ortografică" + +#: ../midori/midori-preferences.c:522 +msgid "Enable spell checking while typing" +msgstr "Verifică ortografia pe măsură ce se tastează" + +#: ../midori/midori-preferences.c:525 +msgid "" +"A comma separated list of languages to be used for spell checking, for " +"example \"en_GB,de_DE\"" +msgstr "" +"O listă separată prin virgule de limbi pentru care se activează verificarea " +"ortografică, de exemplu: „ro_RO,en_GB”" + +#. Page "Interface" +#: ../midori/midori-preferences.c:530 +msgid "Interface" +msgstr "Interfață" + +#: ../midori/midori-preferences.c:531 +msgid "Navigationbar" +msgstr "Bară de navigare" + +#: ../midori/midori-preferences.c:542 +msgid "Browsing" +msgstr "Navigare" + +#. Page "Applications" +#: ../midori/midori-preferences.c:572 +msgid "Applications" +msgstr "Aplicații" + +#: ../midori/midori-preferences.c:573 +msgid "External applications" +msgstr "Aplicații externe" + +#. Page "Network" +#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 +msgid "Network" +msgstr "Rețea" + +#: ../midori/midori-preferences.c:647 +msgid "MB" +msgstr "MB" + +#. Page "Privacy" +#: ../midori/midori-preferences.c:652 +msgid "Privacy" +msgstr "Intimitate" + +#: ../midori/midori-preferences.c:653 +msgid "Web Cookies" +msgstr "Cookie-uri Internet" + +#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 +msgid "days" +msgstr "zile" + +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 +msgid "Empty" +msgstr "Gol" + +#: ../midori/midori-searchaction.c:904 +msgid "Add search engine" +msgstr "Adăugare motor de căutare" + +#: ../midori/midori-searchaction.c:904 +msgid "Edit search engine" +msgstr "Editare motor de căutare" + +#: ../midori/midori-searchaction.c:932 +msgid "_Name:" +msgstr "_Nume:" + +#: ../midori/midori-searchaction.c:976 +msgid "_Icon:" +msgstr "_Iconiță:" + +#: ../midori/midori-searchaction.c:990 +msgid "_Token:" +msgstr "_Etichetă:" + +#: ../midori/midori-searchaction.c:1195 +msgid "Manage Search Engines" +msgstr "Gestionare motoare de căutare" + +#: ../midori/midori-searchaction.c:1292 +msgid "Use as _default" +msgstr "I_mplicit" + +#: ../midori/sokoke.c:162 ../midori/sokoke.c:174 +msgid "Could not run external program." +msgstr "Nu s-a putut porni aplicația externă" + +#. i18n: A superuser, or system administrator, may not be 'root' +#: ../midori/sokoke.c:520 +msgid "Warning: You are using a superuser account!" +msgstr "Atenție: Folosiți un cont de utilizator privilegiat!" + +#: ../midori/sokoke.c:871 +msgid "_Bookmark" +msgstr "_Favorit" + +#: ../midori/sokoke.c:873 +msgid "_Add Bookmark" +msgstr "Adaugă un fa_vorit" + +#: ../midori/sokoke.c:874 +msgid "_Console" +msgstr "_Consolă" + +#: ../midori/sokoke.c:875 +msgid "_Extensions" +msgstr "E_xtensii" + +#: ../midori/sokoke.c:876 +msgid "_History" +msgstr "_Istoric" + +#: ../midori/sokoke.c:877 +msgid "_Homepage" +msgstr "P_agina principală" + +#: ../midori/sokoke.c:878 +msgid "_Userscripts" +msgstr "Scripturi pr_oprii" + +#: ../midori/sokoke.c:879 +msgid "User_styles" +msgstr "_Stiluri proprii" + +#: ../midori/sokoke.c:880 +msgid "New _Tab" +msgstr "Ta_b nou" + +#: ../midori/sokoke.c:881 +msgid "_Transfers" +msgstr "_Transferuri" + +#: ../midori/sokoke.c:882 +msgid "Netscape p_lugins" +msgstr "Module _Netscape" + +#: ../midori/sokoke.c:883 +msgid "_Closed Tabs and Windows" +msgstr "Taburi și ferestre în_chise" + +#: ../midori/sokoke.c:884 +msgid "New _Window" +msgstr "_Fereastră nouă" + +#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141 +msgid "Userscripts" +msgstr "Scripturi proprii" + +#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143 +msgid "Userstyles" +msgstr "Stiluri proprii" + +#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144 +msgid "_Enable" +msgstr "_Activare" + +#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145 +msgid "Enable" +msgstr "Activare" + +#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154 +msgid "_Disable" +msgstr "_Dezactivare" + +#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155 +msgid "Disable" +msgstr "Dezactivare" + +#: ../panels/midori-bookmarks.c:107 +msgid "Bookmarks" +msgstr "Favorite" + +#: ../panels/midori-bookmarks.c:238 +msgid "Edit the selected bookmark" +msgstr "Editare favorit selectat" + +#: ../panels/midori-bookmarks.c:246 +msgid "Delete the selected bookmark" +msgstr "Șterge favoritul selectat" + +#: ../panels/midori-bookmarks.c:591 +msgid "Separator" +msgstr "Separator" + +#: ../panels/midori-console.c:87 +msgid "Console" +msgstr "Consolă" + +#: ../panels/midori-extensions.c:87 +msgid "Extensions" +msgstr "Extensii" + +#: ../panels/midori-history.c:162 +msgid "Are you sure you want to remove all history items?" +msgstr "Sigur doriți să ștergeți toate elementele din istoric?" + +#: ../panels/midori-history.c:217 +msgid "Bookmark the selected history item" +msgstr "Adaugă ca favorit elementul selectat din istoric" + +#: ../panels/midori-history.c:226 +msgid "Delete the selected history item" +msgstr "Șterge elementul selectat din istoric" + +#: ../panels/midori-history.c:234 +msgid "Clear the entire history" +msgstr "Șterge întregul istoric" + +#: ../panels/midori-history.c:599 +#, c-format +msgid "A week ago" +msgstr "Săptămâna trecută" + +#: ../panels/midori-history.c:605 +#, c-format +msgid "%d days ago" +msgstr "%d zile în urmă" + +#: ../panels/midori-history.c:612 +msgid "Today" +msgstr "Azi" + +#: ../panels/midori-history.c:614 +msgid "Yesterday" +msgstr "Ieri" + +#: ../panels/midori-plugins.c:87 +msgid "Netscape plugins" +msgstr "Module Netscape" + +#: ../panels/midori-transfers.c:256 +#, c-format +msgid "%s of %s" +msgstr "%s din %s" + +#: ../katze/katze-http-auth.c:97 +msgid "Authentication Required" +msgstr "Autentificare obligatorie" + +#: ../katze/katze-http-auth.c:113 +msgid "" +"A username and a password are required\n" +"to open this location:" +msgstr "" +"Pentru a deschide această adresă sunt\n" +"necesare numele de utilizator și parola:" + +#: ../katze/katze-http-auth.c:127 +msgid "Username" +msgstr "Utilizator" + +#: ../katze/katze-http-auth.c:138 +msgid "Password" +msgstr "Parolă" + +#: ../katze/katze-throbber.c:828 +#, c-format +msgid "Named icon '%s' couldn't be loaded" +msgstr "Nu s-a putut încărca iconița cu numele „%s”" + +#: ../katze/katze-throbber.c:841 +#, c-format +msgid "Stock icon '%s' couldn't be loaded" +msgstr "Nu s-a putut încărca iconița-sistem „%s”" + +#: ../katze/katze-throbber.c:907 +msgid "Animation frames are broken" +msgstr "Cadrele animației sunt nevalide" + +#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385 +#, c-format +msgid "Property '%s' is invalid for %s" +msgstr "Proprietatea „%s” nu este validă pentru %s" + +#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244 +msgid "Choose file" +msgstr "Selectare fișier" + +#: ../katze/katze-utils.c:230 +msgid "Choose folder" +msgstr "Selectare dosar" + +#: ../extensions/colorful-tabs.c:115 +msgid "Tint tabs distinctly" +msgstr "Colorează diferit taburile" + +#: ../extensions/colorful-tabs.c:151 +msgid "Colorful Tabs" +msgstr "Taburi colorate" + +#: ../extensions/colorful-tabs.c:152 +msgid "Tint each tab distinctly" +msgstr "Nuanțează diferit fiecare tab" + +#: ../extensions/cookie-manager.c:201 +msgid "At the end of the session" +msgstr "Până la sfârșitul sesiunii" + +#: ../extensions/cookie-manager.c:204 +#, c-format +msgid "" +"Host: %s\n" +"Name: %s\n" +"Value: %s\n" +"Path: %s\n" +"Secure: %s\n" +"Expires: %s" +msgstr "" +"Server: %s\n" +"Nume: %s\n" +"Valoare: %s\n" +"Cale: %s\n" +"Securizat: %s\n" +"Expiră: %s" + +#: ../extensions/cookie-manager.c:210 +msgid "Yes" +msgstr "Da" + +#: ../extensions/cookie-manager.c:210 +msgid "No" +msgstr "Nu" + +#: ../extensions/cookie-manager.c:493 +msgid "Do you really want to delete all cookies?" +msgstr "Sigur doriți să ștergeți toate cookie-urile?" + +#: ../extensions/cookie-manager.c:495 +msgid "Question" +msgstr "Întrebare" + +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Doar cookie-urile ce se potrivesc cu filtrul vor fi șterse." + +#: ../extensions/cookie-manager.c:682 +msgid "Name" +msgstr "Nume" + +#: ../extensions/cookie-manager.c:742 +msgid "_Expand All" +msgstr "_Extinde tot" + +#: ../extensions/cookie-manager.c:750 +msgid "_Collapse All" +msgstr "Plia_ză tot" + +#: ../extensions/cookie-manager.c:823 +msgid "" +"Deletes all shown cookies. If a filter is set, only those cookies are " +"deleted which match the filter." +msgstr "" +"Șterge toate cookie-urile afișate. Dacă se aplică un filtru, doar cookie-" +"urile ce se potrivesc cu respectivul filtru vor fi șterse." + +#: ../extensions/cookie-manager.c:838 +msgid "Expand All" +msgstr "Extinde tot" + +#: ../extensions/cookie-manager.c:845 +msgid "Collapse All" +msgstr "Pliază tot" + +#: ../extensions/cookie-manager.c:876 +msgid "Filter:" +msgstr "Filtru:" + +#: ../extensions/cookie-manager.c:881 +msgid "" +"Enter a filter string to show only cookies whose name or domain field match " +"the entered filter" +msgstr "" +"Introduceți un filtru pentru a afișa doar cookie-urile ale căror nume ori " +"domenii se potrivesc" + +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 +msgid "Cookie Manager" +msgstr "Gestionare cookie-uri" + +#: ../extensions/cookie-manager.c:948 +msgid "_Cookie Manager" +msgstr "Gestionare _cookie-uri" + +#: ../extensions/cookie-manager.c:965 +msgid "List, view and delete cookies" +msgstr "Vizualizați și ștergeți cookie-uri" + +#: ../extensions/feed-panel/feed-atom.c:217 +msgid "Failed to find required Atom \"entry\" elements in XML data." +msgstr "Nu s-au găsit elementele necesare Atom „entry” în datele XML." + +#: ../extensions/feed-panel/feed-atom.c:323 +msgid "Failed to find required Atom \"feed\" elements in XML data." +msgstr "Nu s-au găsit elementele necesare Atom „feed” în datele XML." + +#. i18n: The local date a feed was last updated +#: ../extensions/feed-panel/feed-panel.c:398 +#, c-format +msgctxt "Feed" +msgid "Last updated: %s." +msgstr "Ultima actualizare: %s." + +#: ../extensions/feed-panel/feed-panel.c:660 +msgid "Feeds" +msgstr "Fluxuri" + +#: ../extensions/feed-panel/feed-panel.c:713 +msgid "Add new feed" +msgstr "Adăugare flux nou" + +#: ../extensions/feed-panel/feed-panel.c:720 +msgid "Delete feed" +msgstr "Șterge fluxul" + +#: ../extensions/feed-panel/feed-panel.c:803 +msgid "_Feeds" +msgstr "_Fluxuri" + +#: ../extensions/feed-panel/feed-parse.c:139 +#, c-format +msgid "Failed to find root element in feed XML data." +msgstr "Nu s-a găsit elementul rădăcină în datele fluxului XML." + +#: ../extensions/feed-panel/feed-parse.c:179 +#, c-format +msgid "Unsupported feed format." +msgstr "Format de flux nesuportat." + +#: ../extensions/feed-panel/feed-parse.c:209 +#, c-format +msgid "Failed to parse XML feed: %s" +msgstr "Eșec la analizarea fluxului XML: %s" + +#: ../extensions/feed-panel/feed-rss.c:46 +msgid "Failed to find \"channel\" element in RSS XML data." +msgstr "Nu s-a găsit elementul „channel” în datele XML al RSS-ului." + +#: ../extensions/feed-panel/feed-rss.c:51 +msgid "Unsupported RSS version found." +msgstr "A fost depistată o versiune de RSS nesuportată." + +#: ../extensions/feed-panel/feed-rss.c:144 +msgid "Failed to find required RSS \"item\" elements in XML data." +msgstr "Nu s-au găsit elementele necesare RSS „item” în datele XML." + +#: ../extensions/feed-panel/feed-rss.c:229 +msgid "Failed to find required RSS \"channel\" elements in XML data." +msgstr "Nu s-au găsit elementele necesare RSS „channel” în datele XML." + +#: ../extensions/feed-panel/main.c:114 +#, c-format +msgid "Feed '%s' already exists" +msgstr "Fluxul „%s” există deja" + +#: ../extensions/feed-panel/main.c:191 +#, c-format +msgid "Error loading feed '%s'" +msgstr "Eroare la încărcarea fluxului „%s”" + +#: ../extensions/feed-panel/main.c:331 +msgid "New feed" +msgstr "Flux nou" + +#: ../extensions/feed-panel/main.c:489 +msgid "Feed Panel" +msgstr "Panou cu fluxuri" + +#: ../extensions/feed-panel/main.c:490 +msgid "Read Atom/ RSS feeds" +msgstr "Citește fluxuri Atom/RSS" + +#: ../extensions/mouse-gestures/main.c:216 +msgid "Mouse Gestures" +msgstr "Gesturi de maus" + +#: ../extensions/mouse-gestures/main.c:217 +msgid "Control Midori by moving the mouse" +msgstr "Controlați Midori prin mișcările mausului" + +#. i18n: A panel showing a user specified web page +#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177 +msgid "Pageholder" +msgstr "Loc pentru pagini" + +#: ../extensions/page-holder.c:161 +msgid "_Pageholder" +msgstr "_Loc pentru pagini" + +#: ../extensions/statusbar-features.c:104 +msgid "Statusbar Features" +msgstr "Facilități bară de stare" + +#: ../extensions/statusbar-features.c:105 +msgid "Easily toggle features on web pages on and off" +msgstr "Activați ori dezactivați cu ușurință facilități pentru paginile web" + From c89651c05fc98371035c1d507ce73dd1145bb84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Thu, 7 May 2009 22:22:43 +0200 Subject: [PATCH 1115/2970] Implement quick launch page code named Tandoori The quick launch page replaces the blank page unless it turns out to be a bad idea. --- AUTHORS | 1 + data/mootools.js | 245 ++++++++++++++++++++++++++++++++++++++++ data/tandoori-body.html | 71 ++++++++++++ data/tandoori-head.html | 216 +++++++++++++++++++++++++++++++++++ midori/midori-view.c | 165 ++++++++++++++++++++++++++- wscript | 3 + 6 files changed, 698 insertions(+), 3 deletions(-) create mode 100644 data/mootools.js create mode 100644 data/tandoori-body.html create mode 100644 data/tandoori-head.html diff --git a/AUTHORS b/AUTHORS index 9565e652..6c53c1dd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,6 +15,7 @@ Contributors: Nick Schermer Matthias Kruk Johannes Reinhardt + Jean-François Guchens Graphics: extension: Nancy Runge diff --git a/data/mootools.js b/data/mootools.js new file mode 100644 index 00000000..19f9ba1b --- /dev/null +++ b/data/mootools.js @@ -0,0 +1,245 @@ +var MooTools={version:"1.2.2",build:"f0491d62fbb7e906789aa3733d6a67d43e5af7c9"};var Native=function(k){k=k||{};var a=k.name;var i=k.legacy;var b=k.protect; +var c=k.implement;var h=k.generics;var f=k.initialize;var g=k.afterImplement||function(){};var d=f||i;h=h!==false;d.constructor=Native;d.$family={name:"native"}; +if(i&&f){d.prototype=i.prototype;}d.prototype.constructor=d;if(a){var e=a.toLowerCase();d.prototype.$family={name:e};Native.typize(d,e);}var j=function(n,l,o,m){if(!b||m||!n.prototype[l]){n.prototype[l]=o; +}if(h){Native.genericize(n,l,b);}g.call(n,l,o);return n;};d.alias=function(n,l,o){if(typeof n=="string"){if((n=this.prototype[n])){return j(this,l,n,o); +}}for(var m in n){this.alias(m,n[m],l);}return this;};d.implement=function(m,l,o){if(typeof m=="string"){return j(this,m,l,o);}for(var n in m){j(this,n,m[n],l); +}return this;};if(c){d.implement(c);}return d;};Native.genericize=function(b,c,a){if((!a||!b[c])&&typeof b.prototype[c]=="function"){b[c]=function(){var d=Array.prototype.slice.call(arguments); +return b.prototype[c].apply(d.shift(),d);};}};Native.implement=function(d,c){for(var b=0,a=d.length;b-1:this.indexOf(a)>-1;},trim:function(){return this.replace(/^\s+|\s+$/g,"");},clean:function(){return this.replace(/\s+/g," ").trim(); +},camelCase:function(){return this.replace(/-\D/g,function(a){return a.charAt(1).toUpperCase();});},hyphenate:function(){return this.replace(/[A-Z]/g,function(a){return("-"+a.charAt(0).toLowerCase()); +});},capitalize:function(){return this.replace(/\b[a-z]/g,function(a){return a.toUpperCase();});},escapeRegExp:function(){return this.replace(/([-.*+?^${}()|[\]\/\\])/g,"\\$1"); +},toInt:function(a){return parseInt(this,a||10);},toFloat:function(){return parseFloat(this);},hexToRgb:function(b){var a=this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/); +return(a)?a.slice(1).hexToRgb(b):null;},rgbToHex:function(b){var a=this.match(/\d{1,3}/g);return(a)?a.rgbToHex(b):null;},stripScripts:function(b){var a=""; +var c=this.replace(/]*>([\s\S]*?)<\/script>/gi,function(){a+=arguments[1]+"\n";return"";});if(b===true){$exec(a);}else{if($type(b)=="function"){b(a,c); +}}return c;},substitute:function(a,b){return this.replace(b||(/\\?\{([^{}]+)\}/g),function(d,c){if(d.charAt(0)=="\\"){return d.slice(1);}return(a[c]!=undefined)?a[c]:""; +});}});Hash.implement({has:Object.prototype.hasOwnProperty,keyOf:function(b){for(var a in this){if(this.hasOwnProperty(a)&&this[a]===b){return a;}}return null; +},hasValue:function(a){return(Hash.keyOf(this,a)!==null);},extend:function(a){Hash.each(a,function(c,b){Hash.set(this,b,c);},this);return this;},combine:function(a){Hash.each(a,function(c,b){Hash.include(this,b,c); +},this);return this;},erase:function(a){if(this.hasOwnProperty(a)){delete this[a];}return this;},get:function(a){return(this.hasOwnProperty(a))?this[a]:null; +},set:function(a,b){if(!this[a]||this.hasOwnProperty(a)){this[a]=b;}return this;},empty:function(){Hash.each(this,function(b,a){delete this[a];},this); +return this;},include:function(a,b){if(this[a]==undefined){this[a]=b;}return this;},map:function(b,c){var a=new Hash;Hash.each(this,function(e,d){a.set(d,b.call(c,e,d,this)); +},this);return a;},filter:function(b,c){var a=new Hash;Hash.each(this,function(e,d){if(b.call(c,e,d,this)){a.set(d,e);}},this);return a;},every:function(b,c){for(var a in this){if(this.hasOwnProperty(a)&&!b.call(c,this[a],a)){return false; +}}return true;},some:function(b,c){for(var a in this){if(this.hasOwnProperty(a)&&b.call(c,this[a],a)){return true;}}return false;},getKeys:function(){var a=[]; +Hash.each(this,function(c,b){a.push(b);});return a;},getValues:function(){var a=[];Hash.each(this,function(b){a.push(b);});return a;},toQueryString:function(a){var b=[]; +Hash.each(this,function(f,e){if(a){e=a+"["+e+"]";}var d;switch($type(f)){case"object":d=Hash.toQueryString(f,e);break;case"array":var c={};f.each(function(h,g){c[g]=h; +});d=Hash.toQueryString(c,e);break;default:d=e+"="+encodeURIComponent(f);}if(f!=undefined){b.push(d);}});return b.join("&");}});Hash.alias({keyOf:"indexOf",hasValue:"contains"}); +var Event=new Native({name:"Event",initialize:function(a,f){f=f||window;var k=f.document;a=a||f.event;if(a.$extended){return a;}this.$extended=true;var j=a.type; +var g=a.target||a.srcElement;while(g&&g.nodeType==3){g=g.parentNode;}if(j.test(/key/)){var b=a.which||a.keyCode;var m=Event.Keys.keyOf(b);if(j=="keydown"){var d=b-111; +if(d>0&&d<13){m="f"+d;}}m=m||String.fromCharCode(b).toLowerCase();}else{if(j.match(/(click|mouse|menu)/i)){k=(!k.compatMode||k.compatMode=="CSS1Compat")?k.html:k.body; +var i={x:a.pageX||a.clientX+k.scrollLeft,y:a.pageY||a.clientY+k.scrollTop};var c={x:(a.pageX)?a.pageX-f.pageXOffset:a.clientX,y:(a.pageY)?a.pageY-f.pageYOffset:a.clientY}; +if(j.match(/DOMMouseScroll|mousewheel/)){var h=(a.wheelDelta)?a.wheelDelta/120:-(a.detail||0)/3;}var e=(a.which==3)||(a.button==2);var l=null;if(j.match(/over|out/)){switch(j){case"mouseover":l=a.relatedTarget||a.fromElement; +break;case"mouseout":l=a.relatedTarget||a.toElement;}if(!(function(){while(l&&l.nodeType==3){l=l.parentNode;}return true;}).create({attempt:Browser.Engine.gecko})()){l=false; +}}}}return $extend(this,{event:a,type:j,page:i,client:c,rightClick:e,wheel:h,relatedTarget:l,target:g,code:b,key:m,shift:a.shiftKey,control:a.ctrlKey,alt:a.altKey,meta:a.metaKey}); +}});Event.Keys=new Hash({enter:13,up:38,down:40,left:37,right:39,esc:27,space:32,backspace:8,tab:9,"delete":46});Event.implement({stop:function(){return this.stopPropagation().preventDefault(); +},stopPropagation:function(){if(this.event.stopPropagation){this.event.stopPropagation();}else{this.event.cancelBubble=true;}return this;},preventDefault:function(){if(this.event.preventDefault){this.event.preventDefault(); +}else{this.event.returnValue=false;}return this;}});var Element=new Native({name:"Element",legacy:window.Element,initialize:function(a,b){var c=Element.Constructors.get(a); +if(c){return c(b);}if(typeof a=="string"){return document.newElement(a,b);}return $(a).set(b);},afterImplement:function(a,b){Element.Prototype[a]=b;if(Array[a]){return; +}Elements.implement(a,function(){var c=[],g=true;for(var e=0,d=this.length;e";}return $.element(this.createElement(a)).set(b);},newTextNode:function(a){return this.createTextNode(a); +},getDocument:function(){return this;},getWindow:function(){return this.window;}});Window.implement({$:function(b,c){if(b&&b.$family&&b.uid){return b;}var a=$type(b); +return($[a])?$[a](b,c,this.document):null;},$$:function(a){if(arguments.length==1&&typeof a=="string"){return this.document.getElements(a);}var f=[];var c=Array.flatten(arguments); +for(var d=0,b=c.length;d1);a.each(function(e){var f=this.getElementsByTagName(e.trim());(b)?c.extend(f):c=f;},this);return new Elements(c,{ddup:b,cash:!d}); +}});(function(){var h={},f={};var i={input:"checked",option:"selected",textarea:(Browser.Engine.webkit&&Browser.Engine.version<420)?"innerHTML":"value"}; +var c=function(l){return(f[l]||(f[l]={}));};var g=function(n,l){if(!n){return;}var m=n.uid;if(Browser.Engine.trident){if(n.clearAttributes){var q=l&&n.cloneNode(false); +n.clearAttributes();if(q){n.mergeAttributes(q);}}else{if(n.removeEvents){n.removeEvents();}}if((/object/i).test(n.tagName)){for(var o in n){if(typeof n[o]=="function"){n[o]=$empty; +}}Element.dispose(n);}}if(!m){return;}h[m]=f[m]=null;};var d=function(){Hash.each(h,g);if(Browser.Engine.trident){$A(document.getElementsByTagName("object")).each(g); +}if(window.CollectGarbage){CollectGarbage();}h=f=null;};var j=function(n,l,s,m,p,r){var o=n[s||l];var q=[];while(o){if(o.nodeType==1&&(!m||Element.match(o,m))){if(!p){return $(o,r); +}q.push(o);}o=o[l];}return(p)?new Elements(q,{ddup:false,cash:!r}):null;};var e={html:"innerHTML","class":"className","for":"htmlFor",text:(Browser.Engine.trident||(Browser.Engine.webkit&&Browser.Engine.version<420))?"innerText":"textContent"}; +var b=["compact","nowrap","ismap","declare","noshade","checked","disabled","readonly","multiple","selected","noresize","defer"];var k=["value","accessKey","cellPadding","cellSpacing","colSpan","frameBorder","maxLength","readOnly","rowSpan","tabIndex","useMap"]; +b=b.associate(b);Hash.extend(e,b);Hash.extend(e,k.associate(k.map(String.toLowerCase)));var a={before:function(m,l){if(l.parentNode){l.parentNode.insertBefore(m,l); +}},after:function(m,l){if(!l.parentNode){return;}var n=l.nextSibling;(n)?l.parentNode.insertBefore(m,n):l.parentNode.appendChild(m);},bottom:function(m,l){l.appendChild(m); +},top:function(m,l){var n=l.firstChild;(n)?l.insertBefore(m,n):l.appendChild(m);}};a.inside=a.bottom;Hash.each(a,function(l,m){m=m.capitalize();Element.implement("inject"+m,function(n){l(this,$(n,true)); +return this;});Element.implement("grab"+m,function(n){l($(n,true),this);return this;});});Element.implement({set:function(o,m){switch($type(o)){case"object":for(var n in o){this.set(n,o[n]); +}break;case"string":var l=Element.Properties.get(o);(l&&l.set)?l.set.apply(this,Array.slice(arguments,1)):this.setProperty(o,m);}return this;},get:function(m){var l=Element.Properties.get(m); +return(l&&l.get)?l.get.apply(this,Array.slice(arguments,1)):this.getProperty(m);},erase:function(m){var l=Element.Properties.get(m);(l&&l.erase)?l.erase.apply(this):this.removeProperty(m); +return this;},setProperty:function(m,n){var l=e[m];if(n==undefined){return this.removeProperty(m);}if(l&&b[m]){n=!!n;}(l)?this[l]=n:this.setAttribute(m,""+n); +return this;},setProperties:function(l){for(var m in l){this.setProperty(m,l[m]);}return this;},getProperty:function(m){var l=e[m];var n=(l)?this[l]:this.getAttribute(m,2); +return(b[m])?!!n:(l)?n:n||null;},getProperties:function(){var l=$A(arguments);return l.map(this.getProperty,this).associate(l);},removeProperty:function(m){var l=e[m]; +(l)?this[l]=(l&&b[m])?false:"":this.removeAttribute(m);return this;},removeProperties:function(){Array.each(arguments,this.removeProperty,this);return this; +},hasClass:function(l){return this.className.contains(l," ");},addClass:function(l){if(!this.hasClass(l)){this.className=(this.className+" "+l).clean(); +}return this;},removeClass:function(l){this.className=this.className.replace(new RegExp("(^|\\s)"+l+"(?:\\s|$)"),"$1");return this;},toggleClass:function(l){return this.hasClass(l)?this.removeClass(l):this.addClass(l); +},adopt:function(){Array.flatten(arguments).each(function(l){l=$(l,true);if(l){this.appendChild(l);}},this);return this;},appendText:function(m,l){return this.grab(this.getDocument().newTextNode(m),l); +},grab:function(m,l){a[l||"bottom"]($(m,true),this);return this;},inject:function(m,l){a[l||"bottom"](this,$(m,true));return this;},replaces:function(l){l=$(l,true); +l.parentNode.replaceChild(this,l);return this;},wraps:function(m,l){m=$(m,true);return this.replaces(m).grab(m,l);},getPrevious:function(l,m){return j(this,"previousSibling",null,l,false,m); +},getAllPrevious:function(l,m){return j(this,"previousSibling",null,l,true,m);},getNext:function(l,m){return j(this,"nextSibling",null,l,false,m);},getAllNext:function(l,m){return j(this,"nextSibling",null,l,true,m); +},getFirst:function(l,m){return j(this,"nextSibling","firstChild",l,false,m);},getLast:function(l,m){return j(this,"previousSibling","lastChild",l,false,m); +},getParent:function(l,m){return j(this,"parentNode",null,l,false,m);},getParents:function(l,m){return j(this,"parentNode",null,l,true,m);},getSiblings:function(l,m){return this.getParent().getChildren(l,m).erase(this); +},getChildren:function(l,m){return j(this,"nextSibling","firstChild",l,true,m);},getWindow:function(){return this.ownerDocument.window;},getDocument:function(){return this.ownerDocument; +},getElementById:function(o,n){var m=this.ownerDocument.getElementById(o);if(!m){return null;}for(var l=m.parentNode;l!=this;l=l.parentNode){if(!l){return null; +}}return $.element(m,n);},getSelected:function(){return new Elements($A(this.options).filter(function(l){return l.selected;}));},getComputedStyle:function(m){if(this.currentStyle){return this.currentStyle[m.camelCase()]; +}var l=this.getDocument().defaultView.getComputedStyle(this,null);return(l)?l.getPropertyValue([m.hyphenate()]):null;},toQueryString:function(){var l=[]; +this.getElements("input, select, textarea",true).each(function(m){if(!m.name||m.disabled){return;}var n=(m.tagName.toLowerCase()=="select")?Element.getSelected(m).map(function(o){return o.value; +}):((m.type=="radio"||m.type=="checkbox")&&!m.checked)?null:m.value;$splat(n).each(function(o){if(typeof o!="undefined"){l.push(m.name+"="+encodeURIComponent(o)); +}});});return l.join("&");},clone:function(o,l){o=o!==false;var r=this.cloneNode(o);var n=function(v,u){if(!l){v.removeAttribute("id");}if(Browser.Engine.trident){v.clearAttributes(); +v.mergeAttributes(u);v.removeAttribute("uid");if(v.options){var w=v.options,s=u.options;for(var t=w.length;t--;){w[t].selected=s[t].selected;}}}var x=i[u.tagName.toLowerCase()]; +if(x&&u[x]){v[x]=u[x];}};if(o){var p=r.getElementsByTagName("*"),q=this.getElementsByTagName("*");for(var m=p.length;m--;){n(p[m],q[m]);}}n(r,this);return $(r); +},destroy:function(){Element.empty(this);Element.dispose(this);g(this,true);return null;},empty:function(){$A(this.childNodes).each(function(l){Element.destroy(l); +});return this;},dispose:function(){return(this.parentNode)?this.parentNode.removeChild(this):this;},hasChild:function(l){l=$(l,true);if(!l){return false; +}if(Browser.Engine.webkit&&Browser.Engine.version<420){return $A(this.getElementsByTagName(l.tagName)).contains(l);}return(this.contains)?(this!=l&&this.contains(l)):!!(this.compareDocumentPosition(l)&16); +},match:function(l){return(!l||(l==this)||(Element.get(this,"tag")==l));}});Native.implement([Element,Window,Document],{addListener:function(o,n){if(o=="unload"){var l=n,m=this; +n=function(){m.removeListener("unload",n);l();};}else{h[this.uid]=this;}if(this.addEventListener){this.addEventListener(o,n,false);}else{this.attachEvent("on"+o,n); +}return this;},removeListener:function(m,l){if(this.removeEventListener){this.removeEventListener(m,l,false);}else{this.detachEvent("on"+m,l);}return this; +},retrieve:function(m,l){var o=c(this.uid),n=o[m];if(l!=undefined&&n==undefined){n=o[m]=l;}return $pick(n);},store:function(m,l){var n=c(this.uid);n[m]=l; +return this;},eliminate:function(l){var m=c(this.uid);delete m[l];return this;}});window.addListener("unload",d);})();Element.Properties=new Hash;Element.Properties.style={set:function(a){this.style.cssText=a; +},get:function(){return this.style.cssText;},erase:function(){this.style.cssText="";}};Element.Properties.tag={get:function(){return this.tagName.toLowerCase(); +}};Element.Properties.html=(function(){var c=document.createElement("div");var a={table:[1,"","
"],select:[1,""],tbody:[2,"","
"],tr:[3,"","
"]}; +a.thead=a.tfoot=a.tbody;var b={set:function(){var e=Array.flatten(arguments).join("");var f=Browser.Engine.trident&&a[this.get("tag")];if(f){var g=c;g.innerHTML=f[1]+e+f[2]; +for(var d=f[0];d--;){g=g.firstChild;}this.empty().adopt(g.childNodes);}else{this.innerHTML=e;}}};b.erase=b.set;return b;})();if(Browser.Engine.webkit&&Browser.Engine.version<420){Element.Properties.text={get:function(){if(this.innerText){return this.innerText; +}var a=this.ownerDocument.newElement("div",{html:this.innerHTML}).inject(this.ownerDocument.body);var b=a.innerText;a.destroy();return b;}};}Element.Properties.events={set:function(a){this.addEvents(a); +}};Native.implement([Element,Window,Document],{addEvent:function(e,g){var h=this.retrieve("events",{});h[e]=h[e]||{keys:[],values:[]};if(h[e].keys.contains(g)){return this; +}h[e].keys.push(g);var f=e,a=Element.Events.get(e),c=g,i=this;if(a){if(a.onAdd){a.onAdd.call(this,g);}if(a.condition){c=function(j){if(a.condition.call(this,j)){return g.call(this,j); +}return true;};}f=a.base||f;}var d=function(){return g.call(i);};var b=Element.NativeEvents[f];if(b){if(b==2){d=function(j){j=new Event(j,i.getWindow()); +if(c.call(i,j)===false){j.stop();}};}this.addListener(f,d);}h[e].values.push(d);return this;},removeEvent:function(c,b){var a=this.retrieve("events");if(!a||!a[c]){return this; +}var f=a[c].keys.indexOf(b);if(f==-1){return this;}a[c].keys.splice(f,1);var e=a[c].values.splice(f,1)[0];var d=Element.Events.get(c);if(d){if(d.onRemove){d.onRemove.call(this,b); +}c=d.base||c;}return(Element.NativeEvents[c])?this.removeListener(c,e):this;},addEvents:function(a){for(var b in a){this.addEvent(b,a[b]);}return this; +},removeEvents:function(a){var c;if($type(a)=="object"){for(c in a){this.removeEvent(c,a[c]);}return this;}var b=this.retrieve("events");if(!b){return this; +}if(!a){for(c in b){this.removeEvents(c);}this.eliminate("events");}else{if(b[a]){while(b[a].keys[0]){this.removeEvent(a,b[a].keys[0]);}b[a]=null;}}return this; +},fireEvent:function(d,b,a){var c=this.retrieve("events");if(!c||!c[d]){return this;}c[d].keys.each(function(e){e.create({bind:this,delay:a,"arguments":b})(); +},this);return this;},cloneEvents:function(d,a){d=$(d);var c=d.retrieve("events");if(!c){return this;}if(!a){for(var b in c){this.cloneEvents(d,b);}}else{if(c[a]){c[a].keys.each(function(e){this.addEvent(a,e); +},this);}}return this;}});Element.NativeEvents={click:2,dblclick:2,mouseup:2,mousedown:2,contextmenu:2,mousewheel:2,DOMMouseScroll:2,mouseover:2,mouseout:2,mousemove:2,selectstart:2,selectend:2,keydown:2,keypress:2,keyup:2,focus:2,blur:2,change:2,reset:2,select:2,submit:2,load:1,unload:1,beforeunload:2,resize:1,move:1,DOMContentLoaded:1,readystatechange:1,error:1,abort:1,scroll:1}; +(function(){var a=function(b){var c=b.relatedTarget;if(c==undefined){return true;}if(c===false){return false;}return($type(this)!="document"&&c!=this&&c.prefix!="xul"&&!this.hasChild(c)); +};Element.Events=new Hash({mouseenter:{base:"mouseover",condition:a},mouseleave:{base:"mouseout",condition:a},mousewheel:{base:(Browser.Engine.gecko)?"DOMMouseScroll":"mousewheel"}}); +})();Element.Properties.styles={set:function(a){this.setStyles(a);}};Element.Properties.opacity={set:function(a,b){if(!b){if(a==0){if(this.style.visibility!="hidden"){this.style.visibility="hidden"; +}}else{if(this.style.visibility!="visible"){this.style.visibility="visible";}}}if(!this.currentStyle||!this.currentStyle.hasLayout){this.style.zoom=1;}if(Browser.Engine.trident){this.style.filter=(a==1)?"":"alpha(opacity="+a*100+")"; +}this.style.opacity=a;this.store("opacity",a);},get:function(){return this.retrieve("opacity",1);}};Element.implement({setOpacity:function(a){return this.set("opacity",a,true); +},getOpacity:function(){return this.get("opacity");},setStyle:function(b,a){switch(b){case"opacity":return this.set("opacity",parseFloat(a));case"float":b=(Browser.Engine.trident)?"styleFloat":"cssFloat"; +}b=b.camelCase();if($type(a)!="string"){var c=(Element.Styles.get(b)||"@").split(" ");a=$splat(a).map(function(e,d){if(!c[d]){return"";}return($type(e)=="number")?c[d].replace("@",Math.round(e)):e; +}).join(" ");}else{if(a==String(Number(a))){a=Math.round(a);}}this.style[b]=a;return this;},getStyle:function(g){switch(g){case"opacity":return this.get("opacity"); +case"float":g=(Browser.Engine.trident)?"styleFloat":"cssFloat";}g=g.camelCase();var a=this.style[g];if(!$chk(a)){a=[];for(var f in Element.ShortStyles){if(g!=f){continue; +}for(var e in Element.ShortStyles[f]){a.push(this.getStyle(e));}return a.join(" ");}a=this.getComputedStyle(g);}if(a){a=String(a);var c=a.match(/rgba?\([\d\s,]+\)/); +if(c){a=a.replace(c[0],c[0].rgbToHex());}}if(Browser.Engine.presto||(Browser.Engine.trident&&!$chk(parseInt(a,10)))){if(g.test(/^(height|width)$/)){var b=(g=="width")?["left","right"]:["top","bottom"],d=0; +b.each(function(h){d+=this.getStyle("border-"+h+"-width").toInt()+this.getStyle("padding-"+h).toInt();},this);return this["offset"+g.capitalize()]-d+"px"; +}if((Browser.Engine.presto)&&String(a).test("px")){return a;}if(g.test(/(border(.+)Width|margin|padding)/)){return"0px";}}return a;},setStyles:function(b){for(var a in b){this.setStyle(a,b[a]); +}return this;},getStyles:function(){var a={};Array.each(arguments,function(b){a[b]=this.getStyle(b);},this);return a;}});Element.Styles=new Hash({left:"@px",top:"@px",bottom:"@px",right:"@px",width:"@px",height:"@px",maxWidth:"@px",maxHeight:"@px",minWidth:"@px",minHeight:"@px",backgroundColor:"rgb(@, @, @)",backgroundPosition:"@px @px",color:"rgb(@, @, @)",fontSize:"@px",letterSpacing:"@px",lineHeight:"@px",clip:"rect(@px @px @px @px)",margin:"@px @px @px @px",padding:"@px @px @px @px",border:"@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)",borderWidth:"@px @px @px @px",borderStyle:"@ @ @ @",borderColor:"rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)",zIndex:"@",zoom:"@",fontWeight:"@",textIndent:"@px",opacity:"@"}); +Element.ShortStyles={margin:{},padding:{},border:{},borderWidth:{},borderStyle:{},borderColor:{}};["Top","Right","Bottom","Left"].each(function(g){var f=Element.ShortStyles; +var b=Element.Styles;["margin","padding"].each(function(h){var i=h+g;f[h][i]=b[i]="@px";});var e="border"+g;f.border[e]=b[e]="@px @ rgb(@, @, @)";var d=e+"Width",a=e+"Style",c=e+"Color"; +f[e]={};f.borderWidth[d]=f[e][d]=b[d]="@px";f.borderStyle[a]=f[e][a]=b[a]="@";f.borderColor[c]=f[e][c]=b[c]="rgb(@, @, @)";});(function(){Element.implement({scrollTo:function(h,i){if(b(this)){this.getWindow().scrollTo(h,i); +}else{this.scrollLeft=h;this.scrollTop=i;}return this;},getSize:function(){if(b(this)){return this.getWindow().getSize();}return{x:this.offsetWidth,y:this.offsetHeight}; +},getScrollSize:function(){if(b(this)){return this.getWindow().getScrollSize();}return{x:this.scrollWidth,y:this.scrollHeight};},getScroll:function(){if(b(this)){return this.getWindow().getScroll(); +}return{x:this.scrollLeft,y:this.scrollTop};},getScrolls:function(){var i=this,h={x:0,y:0};while(i&&!b(i)){h.x+=i.scrollLeft;h.y+=i.scrollTop;i=i.parentNode; +}return h;},getOffsetParent:function(){var h=this;if(b(h)){return null;}if(!Browser.Engine.trident){return h.offsetParent;}while((h=h.parentNode)&&!b(h)){if(d(h,"position")!="static"){return h; +}}return null;},getOffsets:function(){if(Browser.Engine.trident){var l=this.getBoundingClientRect(),j=this.getDocument().documentElement;var m=d(this,"position")=="fixed"; +return{x:l.left+((m)?0:j.scrollLeft)-j.clientLeft,y:l.top+((m)?0:j.scrollTop)-j.clientTop};}var i=this,h={x:0,y:0};if(b(this)){return h;}while(i&&!b(i)){h.x+=i.offsetLeft; +h.y+=i.offsetTop;if(Browser.Engine.gecko){if(!f(i)){h.x+=c(i);h.y+=g(i);}var k=i.parentNode;if(k&&d(k,"overflow")!="visible"){h.x+=c(k);h.y+=g(k);}}else{if(i!=this&&Browser.Engine.webkit){h.x+=c(i); +h.y+=g(i);}}i=i.offsetParent;}if(Browser.Engine.gecko&&!f(this)){h.x-=c(this);h.y-=g(this);}return h;},getPosition:function(k){if(b(this)){return{x:0,y:0}; +}var l=this.getOffsets(),i=this.getScrolls();var h={x:l.x-i.x,y:l.y-i.y};var j=(k&&(k=$(k)))?k.getPosition():{x:0,y:0};return{x:h.x-j.x,y:h.y-j.y};},getCoordinates:function(j){if(b(this)){return this.getWindow().getCoordinates(); +}var h=this.getPosition(j),i=this.getSize();var k={left:h.x,top:h.y,width:i.x,height:i.y};k.right=k.left+k.width;k.bottom=k.top+k.height;return k;},computePosition:function(h){return{left:h.x-e(this,"margin-left"),top:h.y-e(this,"margin-top")}; +},position:function(h){return this.setStyles(this.computePosition(h));}});Native.implement([Document,Window],{getSize:function(){if(Browser.Engine.presto||Browser.Engine.webkit){var i=this.getWindow(); +return{x:i.innerWidth,y:i.innerHeight};}var h=a(this);return{x:h.clientWidth,y:h.clientHeight};},getScroll:function(){var i=this.getWindow(),h=a(this); +return{x:i.pageXOffset||h.scrollLeft,y:i.pageYOffset||h.scrollTop};},getScrollSize:function(){var i=a(this),h=this.getSize();return{x:Math.max(i.scrollWidth,h.x),y:Math.max(i.scrollHeight,h.y)}; +},getPosition:function(){return{x:0,y:0};},getCoordinates:function(){var h=this.getSize();return{top:0,left:0,bottom:h.y,right:h.x,height:h.y,width:h.x}; +}});var d=Element.getComputedStyle;function e(h,i){return d(h,i).toInt()||0;}function f(h){return d(h,"-moz-box-sizing")=="border-box";}function g(h){return e(h,"border-top-width"); +}function c(h){return e(h,"border-left-width");}function b(h){return(/^(?:body|html)$/i).test(h.tagName);}function a(h){var i=h.getDocument();return(!i.compatMode||i.compatMode=="CSS1Compat")?i.html:i.body; +}})();Native.implement([Window,Document,Element],{getHeight:function(){return this.getSize().y;},getWidth:function(){return this.getSize().x;},getScrollTop:function(){return this.getScroll().y; +},getScrollLeft:function(){return this.getScroll().x;},getScrollHeight:function(){return this.getScrollSize().y;},getScrollWidth:function(){return this.getScrollSize().x; +},getTop:function(){return this.getPosition().y;},getLeft:function(){return this.getPosition().x;}});Native.implement([Document,Element],{getElements:function(h,g){h=h.split(","); +var c,e={};for(var d=0,b=h.length;d1),cash:!g});}});Element.implement({match:function(b){if(!b||(b==this)){return true;}var d=Selectors.Utils.parseTagAndID(b); +var a=d[0],e=d[1];if(!Selectors.Filters.byID(this,e)||!Selectors.Filters.byTag(this,a)){return false;}var c=Selectors.Utils.parseSelector(b);return(c)?Selectors.Utils.filter(this,c,{}):true; +}});var Selectors={Cache:{nth:{},parsed:{}}};Selectors.RegExps={id:(/#([\w-]+)/),tag:(/^(\w+|\*)/),quick:(/^(\w+|\*)$/),splitter:(/\s*([+>~\s])\s*([a-zA-Z#.*:\[])/g),combined:(/\.([\w-]+)|\[(\w+)(?:([!*^$~|]?=)(["']?)([^\4]*?)\4)?\]|:([\w-]+)(?:\(["']?(.*?)?["']?\)|$)/g)}; +Selectors.Utils={chk:function(b,c){if(!c){return true;}var a=$uid(b);if(!c[a]){return c[a]=true;}return false;},parseNthArgument:function(h){if(Selectors.Cache.nth[h]){return Selectors.Cache.nth[h]; +}var e=h.match(/^([+-]?\d*)?([a-z]+)?([+-]?\d*)?$/);if(!e){return false;}var g=parseInt(e[1],10);var d=(g||g===0)?g:1;var f=e[2]||false;var c=parseInt(e[3],10)||0; +if(d!=0){c--;while(c<1){c+=d;}while(c>=d){c-=d;}}else{d=c;f="index";}switch(f){case"n":e={a:d,b:c,special:"n"};break;case"odd":e={a:2,b:0,special:"n"}; +break;case"even":e={a:2,b:1,special:"n"};break;case"first":e={a:0,special:"index"};break;case"last":e={special:"last-child"};break;case"only":e={special:"only-child"}; +break;default:e={a:(d-1),special:"index"};}return Selectors.Cache.nth[h]=e;},parseSelector:function(e){if(Selectors.Cache.parsed[e]){return Selectors.Cache.parsed[e]; +}var d,h={classes:[],pseudos:[],attributes:[]};while((d=Selectors.RegExps.combined.exec(e))){var i=d[1],g=d[2],f=d[3],b=d[5],c=d[6],j=d[7];if(i){h.classes.push(i); +}else{if(c){var a=Selectors.Pseudo.get(c);if(a){h.pseudos.push({parser:a,argument:j});}else{h.attributes.push({name:c,operator:"=",value:j});}}else{if(g){h.attributes.push({name:g,operator:f,value:b}); +}}}}if(!h.classes.length){delete h.classes;}if(!h.attributes.length){delete h.attributes;}if(!h.pseudos.length){delete h.pseudos;}if(!h.classes&&!h.attributes&&!h.pseudos){h=null; +}return Selectors.Cache.parsed[e]=h;},parseTagAndID:function(b){var a=b.match(Selectors.RegExps.tag);var c=b.match(Selectors.RegExps.id);return[(a)?a[1]:"*",(c)?c[1]:false]; +},filter:function(f,c,e){var d;if(c.classes){for(d=c.classes.length;d--;d){var g=c.classes[d];if(!Selectors.Filters.byClass(f,g)){return false;}}}if(c.attributes){for(d=c.attributes.length; +d--;d){var b=c.attributes[d];if(!Selectors.Filters.byAttribute(f,b.name,b.operator,b.value)){return false;}}}if(c.pseudos){for(d=c.pseudos.length;d--;d){var a=c.pseudos[d]; +if(!Selectors.Filters.byPseudo(f,a.parser,a.argument,e)){return false;}}}return true;},getByTagAndID:function(b,a,d){if(d){var c=(b.getElementById)?b.getElementById(d,true):Element.getElementById(b,d,true); +return(c&&Selectors.Filters.byTag(c,a))?[c]:[];}else{return b.getElementsByTagName(a);}},search:function(o,h,t){var b=[];var c=h.trim().replace(Selectors.RegExps.splitter,function(k,j,i){b.push(j); +return":)"+i;}).split(":)");var p,e,A;for(var z=0,v=c.length;z":function(h,g,j,a,f){var c=Selectors.Utils.getByTagAndID(g,j,a);for(var e=0,d=c.length;ea){return false;}}return(c==a);},even:function(b,a){return Selectors.Pseudo["nth-child"].call(this,"2n+1",a); +},odd:function(b,a){return Selectors.Pseudo["nth-child"].call(this,"2n",a);},selected:function(){return this.selected;}});Element.Events.domready={onAdd:function(a){if(Browser.loaded){a.call(this); +}}};(function(){var b=function(){if(Browser.loaded){return;}Browser.loaded=true;window.fireEvent("domready");document.fireEvent("domready");};if(Browser.Engine.trident){var a=document.createElement("div"); +(function(){($try(function(){a.doScroll("left");return $(a).inject(document.body).set("html","temp").dispose();}))?b():arguments.callee.delay(50);})(); +}else{if(Browser.Engine.webkit&&Browser.Engine.version<525){(function(){(["loaded","complete"].contains(document.readyState))?b():arguments.callee.delay(50); +})();}else{window.addEvent("load",b);document.addEvent("DOMContentLoaded",b);}}})();var JSON=new Hash({$specialChars:{"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},$replaceChars:function(a){return JSON.$specialChars[a]||"\\u00"+Math.floor(a.charCodeAt()/16).toString(16)+(a.charCodeAt()%16).toString(16); +},encode:function(b){switch($type(b)){case"string":return'"'+b.replace(/[\x00-\x1f\\"]/g,JSON.$replaceChars)+'"';case"array":return"["+String(b.map(JSON.encode).filter($defined))+"]"; +case"object":case"hash":var a=[];Hash.each(b,function(e,d){var c=JSON.encode(e);if(c){a.push(JSON.encode(d)+":"+c);}});return"{"+a+"}";case"number":case"boolean":return String(b); +case false:return"null";}return null;},decode:function(string,secure){if($type(string)!="string"||!string.length){return null;}if(secure&&!(/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(string.replace(/\\./g,"@").replace(/"[^"\\\n\r]*"/g,""))){return null; +}return eval("("+string+")");}});Native.implement([Hash,Array,String,Number],{toJSON:function(){return JSON.encode(this);}}); diff --git a/data/tandoori-body.html b/data/tandoori-body.html new file mode 100644 index 00000000..3528b27c --- /dev/null +++ b/data/tandoori-body.html @@ -0,0 +1,71 @@ + + + +
+ + +
+ +

2

+ +

+
+
+ +

3

+ +

+
+
+ +

4

+ +

+
+
+ +

5

+ +

+
+
+ +

6

+ +

+
+
+ +

7

+ +

+
+
+ +

8

+ +

+
+
+ +

9

+ +

+
+
+
+ + diff --git a/data/tandoori-head.html b/data/tandoori-head.html new file mode 100644 index 00000000..71873292 --- /dev/null +++ b/data/tandoori-head.html @@ -0,0 +1,216 @@ + + + + + + {title} + + + + + + diff --git a/midori/midori-view.c b/midori/midori-view.c index 489d45ff..f023246b 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1,5 +1,6 @@ /* Copyright (C) 2007-2009 Christian Dywan + Copyright (C) 2009 Jean-François Guchens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -23,6 +24,8 @@ #include #include #include +#include +#include #include /* This is unstable API, so we need to declare it */ @@ -171,6 +174,16 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, GParamSpec* pspec, MidoriView* view); +static void +midori_view_tandoori_get_thumb (GtkWidget* web_view, + const gchar* message, + MidoriView* view); + + +static void +midori_view_tandoori_save (GtkWidget* web_view); + + static void midori_view_class_init (MidoriViewClass* class) { @@ -1397,14 +1410,20 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, } #endif -static void +static gboolean webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* message, guint line, const gchar* source_id, MidoriView* view) { - g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); + if (!strncmp (message, "tandoori-get-thumbnail", 22)) + midori_view_tandoori_get_thumb (web_view, message, view); + else if (!strncmp (message, "tandoori-save", 13)) + midori_view_tandoori_save (web_view); + else + g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); + return TRUE; } static void @@ -1880,9 +1899,65 @@ midori_view_set_uri (MidoriView* view, { if (!view->web_view) midori_view_construct_web_view (view); + + if (midori_view_is_blank (view)) + { + SoupServer* res_server; + guint port; + gchar* res_root; + gchar* tandoori_head; + gchar* tandoori_body; + gchar* tandoori_html; + gchar* t_body_fname; + + katze_assign (view->uri, g_strdup ("")); + + g_file_get_contents (DATADIR "/midori/res/tandoori-head.html", + &tandoori_head, NULL, NULL); + + res_server = sokoke_get_res_server (); + port = soup_server_get_port (res_server); + res_root = g_strdup_printf ("http://localhost:%d/res", port); + t_body_fname = g_strconcat (g_get_user_config_dir (), + "/midori/tandoori-body.html", NULL); + + if (!g_file_test (t_body_fname, G_FILE_TEST_EXISTS)) + { + g_file_get_contents (DATADIR "/midori/res/tandoori-body.html", + &tandoori_body, NULL, NULL ); + g_file_set_contents (t_body_fname, tandoori_body, -1, NULL ); + } + else + g_file_get_contents (t_body_fname, &tandoori_body, NULL, NULL); + + tandoori_html = g_strconcat (tandoori_head, tandoori_body, NULL); + data = sokoke_replace_variables (tandoori_html, + "{res}", res_root, + "{title}", _("Blank page"), + "{click_to_add}", _("Click to add a shortcut"), + "{enter_shortcut_address}", _("Enter shortcut address"), + "{enter_shortcut_name}", _("Enter shortcut name"), + "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL); + + #if WEBKIT_CHECK_VERSION (1, 1, 6) + webkit_web_frame_load_alternate_string ( + webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)), + data, res_root, "about:blank"); + #else + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (view->web_view), data, res_root); + #endif + + g_free (res_root); + g_free (data); + g_free (tandoori_html); + g_free (tandoori_head); + g_free (tandoori_body); + g_free (t_body_fname); + } /* This is not prefectly elegant, but creating an error page inline is the simplest solution. */ - if (g_str_has_prefix (uri, "error:")) + else if (g_str_has_prefix (uri, "error:")) { data = NULL; #if !WEBKIT_CHECK_VERSION (1, 1, 3) @@ -2762,3 +2837,87 @@ midori_view_execute_script (MidoriView* view, webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), script); return TRUE; } + +static void +midori_view_tandoori_inject_thumb (MidoriView* view, + gchar* filename, + gchar* dom_id, + gchar* url) +{ + gchar* file_content; + gchar* encoded; + gchar* js; + gsize sz; + GdkPixbuf* img; + + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) + return; + + img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); + encoded = g_base64_encode ( (guchar *)file_content, sz ); + + /** Call Javascript function to replace shortcut content **/ + js = g_strdup_printf ("setThumbnail('%s','%s','%s');", dom_id, encoded, url); + webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), js); + free (js); + g_object_unref (img); + + midori_view_tandoori_save (view->web_view); + + g_free (url); + g_free (dom_id); + g_free (encoded); + g_free (file_content); +} + +/** + * midori_view_tandoori_save + * @web_view: a #WebkitView + * @message: Console log data + * + * Load a thumbnail, and sets the DOM + * + **/ +static void +midori_view_tandoori_get_thumb (GtkWidget* web_view, + const gchar* message, + MidoriView* view) +{ + static gchar* folder; + gchar* thumb; + gchar* filename; + gchar** t_data = g_strsplit (message," ", 4); + + /* t_data[1] = div id and t_data[2] = shortcut's url */ + if (t_data[1] == NULL || t_data[2] == NULL ) + return; + + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); + thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, t_data[2], -1); + filename = g_build_filename (folder, thumb, NULL); + g_free (thumb); + + midori_view_tandoori_inject_thumb (view, filename, + g_strdup (t_data[1]), g_strdup (t_data[2])); + g_strfreev (t_data); +} + +/** + * midori_view_tandoori_save + * @web_view: a #WebkitView + * + * Save tandoori DOM structure to body template + * + **/ +static void +midori_view_tandoori_save (GtkWidget* web_view) +{ + JSContextRef js_context = webkit_web_frame_get_global_context ( + webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))); + gchar* newdom = sokoke_js_script_eval (js_context,"document.body.innerHTML", NULL); + gchar* fname = g_strconcat (g_get_user_config_dir (), "/midori/tandoori-body.html", NULL); + g_file_set_contents ( fname, newdom, -1, NULL ); + g_free (fname); + g_free (newdom); +} diff --git a/wscript b/wscript index d8502e7d..bbd0d2fe 100644 --- a/wscript +++ b/wscript @@ -340,6 +340,9 @@ def build (bld): else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/error.html') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/tandoori-head.html') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/tandoori-body.html') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/mootools.js') if Options.commands['check']: bld.add_subdirs ('tests') From bb7928303c9e9a328e7a2a33f26bfd147b9566a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Thu, 7 May 2009 22:41:39 +0200 Subject: [PATCH 1116/2970] Implement middle click on Back, Forward, Homepage menu items --- AUTHORS | 1 + midori/midori-browser.c | 126 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6c53c1dd..48c0095b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,6 +16,7 @@ Contributors: Matthias Kruk Johannes Reinhardt Jean-François Guchens + Jérôme Geulfucci Graphics: extension: Nancy Runge diff --git a/midori/midori-browser.c b/midori/midori-browser.c index b9a048e3..9d491af5 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1,6 +1,7 @@ /* Copyright (C) 2007-2009 Christian Dywan Copyright (C) 2008 Dale Whittaker + Copyright (C) 2009 Jérôme Geulfucci This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -3029,6 +3030,111 @@ midori_browser_menu_bookmarks_item_activate_cb (GtkWidget* widget, gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); } +static gboolean +midori_browser_menu_button_press_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser) +{ + if (event->button == 3) + { + midori_browser_toolbar_popup_context_menu_cb ( + GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ? + gtk_widget_get_parent (toolitem) : toolitem, + event->x, event->y, event->button, browser); + + return TRUE; + } + return FALSE; +} + +static gboolean +midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, + GdkEventButton* event, + MidoriBrowser* browser) +{ + if (event->button == 2) + { + GtkAction* action = gtk_widget_get_action (toolitem); + const gchar* name; + gboolean open_in_background = FALSE; + gchar* homepage; + + g_return_val_if_fail (action != NULL, FALSE); + + if (!browser->settings) + return FALSE; + + g_object_get (browser->settings, "open-tabs-in-the-background", + &open_in_background, NULL); + + g_object_get (browser->settings, "homepage", &homepage, NULL); + + name = gtk_action_get_name (action); + + if (g_str_equal (name, "Homepage")) + { + gint n; + + n = midori_browser_add_uri (browser, homepage); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + else if (g_str_equal (name, "Back")) + { + GtkWidget* view; + WebKitWebBackForwardList* back_forward_list; + WebKitWebHistoryItem* back_item; + const gchar* back_uri; + gint n; + + view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); + + back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); + back_uri = webkit_web_history_item_get_uri (back_item); + + n = midori_browser_add_uri (browser, back_uri); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + else if (g_str_equal (name, "Forward")) + { + GtkWidget *view; + WebKitWebBackForwardList *back_forward_list; + WebKitWebHistoryItem *forward_item; + const gchar *forward_uri; + gint n; + + view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); + + forward_item = + webkit_web_back_forward_list_get_forward_item (back_forward_list); + forward_uri = webkit_web_history_item_get_uri (forward_item); + + n = midori_browser_add_uri (browser, forward_uri); + + if (!open_in_background) + midori_browser_set_current_page (browser, n); + + return TRUE; + } + + g_free (homepage); + } + return FALSE; +} + static gboolean midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, GdkEventButton* event, @@ -4059,6 +4165,9 @@ midori_browser_init (MidoriBrowser* browser) GError* error; GtkAction* action; GtkWidget* menuitem; + GtkWidget* homepage; + GtkWidget* back; + GtkWidget* forward; #if HAVE_HILDON GtkWidget* menu; GList* children; @@ -4256,7 +4365,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0); gtk_widget_hide (browser->menubar); g_signal_connect (browser->menubar, "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); + G_CALLBACK (midori_browser_menu_button_press_event_cb), browser); #endif menuitem = gtk_menu_item_new (); #if !HAVE_HILDON @@ -4274,6 +4383,19 @@ midori_browser_init (MidoriBrowser* browser) gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); + homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage"); + g_signal_connect (homepage, "button-press-event", + G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); + + back = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Back"); + g_signal_connect (back, "button-press-event", + G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); + + forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Forward"); + g_signal_connect (forward, "button-press-event", + G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser); + + _action_set_sensitive (browser, "PrivateBrowsing", FALSE); _action_set_sensitive (browser, "FindQuick", FALSE); #if HAVE_HILDON @@ -4488,7 +4610,7 @@ midori_browser_init (MidoriBrowser* browser) gtk_box_pack_end (GTK_BOX (browser->transferbar), browser->transferbar_clear, FALSE, FALSE, 0); g_signal_connect (browser->statusbar, "button-press-event", - G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser); + G_CALLBACK (midori_browser_menu_button_press_event_cb), browser); g_object_unref (ui_manager); } From e5621fc44f2ffd72ab7411ef0f0e7d86c1163509 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 7 May 2009 23:00:29 +0200 Subject: [PATCH 1117/2970] Don't declare print function for WebKit >= 1.1.6 --- midori/midori-view.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index f023246b..da260ec6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -31,8 +31,11 @@ /* This is unstable API, so we need to declare it */ gchar* webkit_web_view_get_selected_text (WebKitWebView* web_view); +/* This is public API since WebKitGTK+ 1.1.6 */ +#if !WEBKIT_CHECK_VERSION (1, 1, 6) void webkit_web_frame_print (WebKitWebFrame* web_frame); +#endif GdkPixbuf* midori_search_action_get_icon (KatzeNet* net, From b0c069730f5ee417c18bd70c1098fb72d4986226 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 7 May 2009 23:08:13 +0200 Subject: [PATCH 1118/2970] Fix opening any page when having the speed dial open --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index da260ec6..00723fc8 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1903,7 +1903,7 @@ midori_view_set_uri (MidoriView* view, if (!view->web_view) midori_view_construct_web_view (view); - if (midori_view_is_blank (view)) + if (!g_strcmp0 (uri, "")) { SoupServer* res_server; guint port; From 68bb3d237877911bdc092126750e14e9db15bee8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 02:56:26 +0200 Subject: [PATCH 1119/2970] Localize "Search" in quick dial and use the user's default search --- data/tandoori-body.html | 8 ++++---- data/tandoori-head.html | 2 +- midori/midori-view.c | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/data/tandoori-body.html b/data/tandoori-body.html index 3528b27c..a99f3da5 100644 --- a/data/tandoori-body.html +++ b/data/tandoori-body.html @@ -6,10 +6,10 @@
-
diff --git a/data/tandoori-head.html b/data/tandoori-head.html index 71873292..e1051b79 100644 --- a/data/tandoori-head.html +++ b/data/tandoori-head.html @@ -211,6 +211,6 @@ console.log ("tandoori-save"); } - + diff --git a/midori/midori-view.c b/midori/midori-view.c index 00723fc8..1d33b49c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1912,6 +1912,7 @@ midori_view_set_uri (MidoriView* view, gchar* tandoori_body; gchar* tandoori_html; gchar* t_body_fname; + gchar* location_entry_search; katze_assign (view->uri, g_strdup ("")); @@ -1934,13 +1935,19 @@ midori_view_set_uri (MidoriView* view, g_file_get_contents (t_body_fname, &tandoori_body, NULL, NULL); tandoori_html = g_strconcat (tandoori_head, tandoori_body, NULL); + g_object_get (view->settings, "location-entry-search", + &location_entry_search, NULL); data = sokoke_replace_variables (tandoori_html, "{res}", res_root, "{title}", _("Blank page"), + "{search_uri}", &location_entry_search, + "{search_title}", _("Suchen"), + "{search}", _("Suchen"), "{click_to_add}", _("Click to add a shortcut"), "{enter_shortcut_address}", _("Enter shortcut address"), "{enter_shortcut_name}", _("Enter shortcut name"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL); + g_free (location_entry_search); #if WEBKIT_CHECK_VERSION (1, 1, 6) webkit_web_frame_load_alternate_string ( From f60b8ab9b6e5d4fc07fd4e858b27872176be6fff Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 03:29:25 +0200 Subject: [PATCH 1120/2970] Add a preference Show speed dial in new tabs --- midori/midori-preferences.c | 4 +++- midori/midori-view.c | 10 ++++++++-- midori/midori-websettings.c | 25 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 32c9aaaa..88dc4801 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -420,7 +420,9 @@ midori_preferences_set_settings (MidoriPreferences* preferences, } FILLED_ADD (hbox, 1, 2, 1, 2); button = katze_property_proxy (settings, "show-crash-dialog", NULL); - SPANNED_ADD (button, 0, 2, 2, 3); + INDENTED_ADD (button, 0, 1, 2, 3); + button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL); + INDENTED_ADD (button, 1, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (2, 2); label = katze_property_label (settings, "download-folder"); diff --git a/midori/midori-view.c b/midori/midori-view.c index 1d33b49c..468ce66a 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -60,6 +60,7 @@ struct _MidoriView GtkWidget* web_view; KatzeArray* news_feeds; + gboolean speed_dial_in_new_tabs; gchar* download_manager; gchar* news_aggregator; gboolean middle_click_opens_selection; @@ -1612,6 +1613,7 @@ _midori_view_update_settings (MidoriView* view) gboolean zoom_text_and_images; g_object_get (view->settings, + "speed-dial-in-new-tabs", &view->speed_dial_in_new_tabs, "download-manager", &view->download_manager, "news-aggregator", &view->news_aggregator, "zoom-text-and-images", &zoom_text_and_images, @@ -1639,7 +1641,11 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (view->settings), name, &value); - if (name == g_intern_string ("download-manager")) + if (name == g_intern_string ("speed-dial-in-new-tabs")) + { + view->speed_dial_in_new_tabs = g_value_get_boolean (&value); + } + else if (name == g_intern_string ("download-manager")) { katze_assign (view->download_manager, g_value_dup_string (&value)); } @@ -1903,7 +1909,7 @@ midori_view_set_uri (MidoriView* view, if (!view->web_view) midori_view_construct_web_view (view); - if (!g_strcmp0 (uri, "")) + if (view->speed_dial_in_new_tabs && !g_strcmp0 (uri, "")) { SoupServer* res_server; guint port; diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 8681e2c0..63f10b62 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -49,6 +49,7 @@ struct _MidoriWebSettings MidoriStartup load_on_startup; gchar* homepage; gboolean show_crash_dialog; + gboolean speed_dial_in_new_tabs; gchar* download_folder; gboolean ask_for_destination_folder; gboolean notify_transfer_completed; @@ -121,6 +122,7 @@ enum PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, + PROP_SPEED_DIAL_IN_NEW_TABS, PROP_DOWNLOAD_FOLDER, PROP_ASK_FOR_DESTINATION_FOLDER, PROP_NOTIFY_TRANSFER_COMPLETED, @@ -571,6 +573,23 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) TRUE, flags)); + /** + * MidoriWebSettings:speed-dial-in-new-tabs: + * + * Show a speed dial page in newly opened tabs. + * + * Since: 0.1.7 + */ + g_object_class_install_property (gobject_class, + PROP_SPEED_DIAL_IN_NEW_TABS, + g_param_spec_boolean ( + "speed-dial-in-new-tabs", + /* i18n: Speed dial, webpage shortcuts, named for the phone function */ + _("Show speed dial in new tabs"), + _("Show a speed dial page in newly opened tabs"), + TRUE, + flags)); + g_object_class_install_property (gobject_class, PROP_DOWNLOAD_FOLDER, g_param_spec_string ( @@ -1119,6 +1138,9 @@ midori_web_settings_set_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: web_settings->show_crash_dialog = g_value_get_boolean (value); break; + case PROP_SPEED_DIAL_IN_NEW_TABS: + web_settings->speed_dial_in_new_tabs = g_value_get_boolean (value); + break; case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); break; @@ -1324,6 +1346,9 @@ midori_web_settings_get_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: g_value_set_boolean (value, web_settings->show_crash_dialog); break; + case PROP_SPEED_DIAL_IN_NEW_TABS: + g_value_set_boolean (value, web_settings->speed_dial_in_new_tabs); + break; case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); break; From 713a9b02caffc57e2e8031e6d60d8c489d41f3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Fri, 8 May 2009 13:09:14 +0200 Subject: [PATCH 1121/2970] Simplify handling of background tabs --- midori/midori-browser.c | 59 +++++++++-------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9d491af5..e3ca2553 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -902,8 +902,7 @@ midori_view_new_tab_cb (GtkWidget* view, MidoriBrowser* browser) { gint n = midori_browser_add_uri (browser, uri); - if (!background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); } static void @@ -2187,15 +2186,10 @@ _action_trash_activate_item_alt (GtkAction* action, if (button == 2) { gint n; - gboolean open_in_background; - - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_in_background, NULL); n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); katze_array_remove_item (browser->trash, item); _midori_browser_update_actions (browser); @@ -2262,16 +2256,8 @@ _action_menus_activate_item_alt (GtkAction* action, { if (button == 2) { - gint n; - gboolean open_in_background; - - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_in_background, NULL); - - n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - - if (!open_in_background) - midori_browser_set_current_page (browser, n); + gint n = midori_browser_add_uri (browser, katze_item_get_uri (item)); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -3056,7 +3042,6 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, { GtkAction* action = gtk_widget_get_action (toolitem); const gchar* name; - gboolean open_in_background = FALSE; gchar* homepage; g_return_val_if_fail (action != NULL, FALSE); @@ -3064,9 +3049,6 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, if (!browser->settings) return FALSE; - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_in_background, NULL); - g_object_get (browser->settings, "homepage", &homepage, NULL); name = gtk_action_get_name (action); @@ -3077,8 +3059,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, n = midori_browser_add_uri (browser, homepage); - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -3100,8 +3081,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, n = midori_browser_add_uri (browser, back_uri); - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -3123,9 +3103,7 @@ midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, forward_uri = webkit_web_history_item_get_uri (forward_item); n = midori_browser_add_uri (browser, forward_uri); - - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -3142,18 +3120,15 @@ midori_browser_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem, { KatzeItem* item; gint n; - gboolean open_in_background; if (event->button == 2) { item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem"); if (katze_item_get_uri (item)) { - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_in_background, NULL); n = midori_browser_add_uri (browser, katze_item_get_uri (item)); - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); + return TRUE; } } @@ -4690,7 +4665,6 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, GtkWidget* parent = gtk_widget_get_parent (toolitem); GtkAction* action = gtk_widget_get_action (parent); const gchar* name; - gboolean open_in_background = FALSE; gchar* homepage; g_return_val_if_fail (action != NULL, FALSE); @@ -4698,9 +4672,6 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, if (!browser->settings) return FALSE; - g_object_get (browser->settings, "open-tabs-in-the-background", - &open_in_background, NULL); - g_object_get (browser->settings, "homepage", &homepage, NULL); name = gtk_action_get_name (action); @@ -4710,9 +4681,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, gint n; n = midori_browser_add_uri (browser, homepage); - - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -4733,9 +4702,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, back_uri = webkit_web_history_item_get_uri (back_item); n = midori_browser_add_uri (browser, back_uri); - - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } @@ -4757,9 +4724,7 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, forward_uri = webkit_web_history_item_get_uri (forward_item); n = midori_browser_add_uri (browser, forward_uri); - - if (!open_in_background) - midori_browser_set_current_page (browser, n); + _midori_browser_set_current_page_smartly (browser, n); return TRUE; } From b1815fb63c429215f5b9a8fd62313faf17a7957a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 13:13:08 +0200 Subject: [PATCH 1122/2970] Implement /stock path in res_server --- midori/sokoke.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/midori/sokoke.c b/midori/sokoke.c index 49a99a44..8e9c84b2 100644 --- a/midori/sokoke.c +++ b/midori/sokoke.c @@ -1001,6 +1001,21 @@ res_server_handler_cb (SoupServer* res_server, soup_message_set_status (msg, 404); g_free (filename); } + else if (g_str_has_prefix (path, "/stock/")) + { + GtkIconTheme* icon_theme = gtk_icon_theme_get_default (); + const gchar* icon_name = &path[7]; + GdkPixbuf* icon = gtk_icon_theme_load_icon (icon_theme, icon_name, + strstr (icon_name, "dialog") ? 48 : 22, 0, NULL); + gchar* contents; + gsize length; + + gdk_pixbuf_save_to_buffer (icon, &contents, &length, "png", NULL, NULL); + g_object_unref (icon); + soup_message_set_response (msg, "image/png", SOUP_MEMORY_TAKE, + contents, length); + soup_message_set_status (msg, 200); + } else { soup_message_set_status (msg, 404); From 5dc0b3d0ccaf0fb1c3cb8e05743e52c44e217232 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 13:13:39 +0200 Subject: [PATCH 1123/2970] Recognize {stock} in error page template --- midori/midori-view.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 468ce66a..80557bd7 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -655,12 +655,14 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, SoupServer* res_server; guint port; gchar* res_root; + gchar* stock_root; gchar* message; gchar* result; res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); + stock_root = g_strdup_printf ("http://localhost:%d/stock", port); message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); result = sokoke_replace_variables (template, @@ -668,7 +670,9 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view, "{message}", message, "{description}", error->message, "{tryagain}", _("Try again"), - "{res}", res_root, NULL); + "{res}", res_root, + "{stock}", stock_root, + NULL); g_free (template); g_free (message); From 581c69f4e8fa97f3a99310c3bde9545a08bec1f8 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 13:15:08 +0200 Subject: [PATCH 1124/2970] Use "Search" to label Search button and entry, not "Suchen" --- midori/midori-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 80557bd7..6d447393 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1951,8 +1951,8 @@ midori_view_set_uri (MidoriView* view, "{res}", res_root, "{title}", _("Blank page"), "{search_uri}", &location_entry_search, - "{search_title}", _("Suchen"), - "{search}", _("Suchen"), + "{search_title}", _("Search"), + "{search}", _("Search"), "{click_to_add}", _("Click to add a shortcut"), "{enter_shortcut_address}", _("Enter shortcut address"), "{enter_shortcut_name}", _("Enter shortcut name"), From 5e1b3a0badce3a930f65a08e7b0ad4f16d8a15e2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 17:41:40 +0200 Subject: [PATCH 1125/2970] Rename Speed dial in news tabs to Customized homepage in new tabs --- midori/midori-preferences.c | 4 ++-- midori/midori-view.c | 10 +++++----- midori/midori-websettings.c | 25 ++++++++++++------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 88dc4801..2d5fed31 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -421,8 +421,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 1, 2); button = katze_property_proxy (settings, "show-crash-dialog", NULL); INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL); - INDENTED_ADD (button, 1, 2, 2, 3); + button = katze_property_proxy (settings, "customized-homepage-in-new-tabs", NULL); + FILLED_ADD (button, 1, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (2, 2); label = katze_property_label (settings, "download-folder"); diff --git a/midori/midori-view.c b/midori/midori-view.c index 6d447393..9649a455 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -60,7 +60,7 @@ struct _MidoriView GtkWidget* web_view; KatzeArray* news_feeds; - gboolean speed_dial_in_new_tabs; + gboolean customized_homepage_in_new_tabs; gchar* download_manager; gchar* news_aggregator; gboolean middle_click_opens_selection; @@ -1617,7 +1617,7 @@ _midori_view_update_settings (MidoriView* view) gboolean zoom_text_and_images; g_object_get (view->settings, - "speed-dial-in-new-tabs", &view->speed_dial_in_new_tabs, + "customized-homepage-in-new-tabs", &view->customized_homepage_in_new_tabs, "download-manager", &view->download_manager, "news-aggregator", &view->news_aggregator, "zoom-text-and-images", &zoom_text_and_images, @@ -1645,9 +1645,9 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (view->settings), name, &value); - if (name == g_intern_string ("speed-dial-in-new-tabs")) + if (name == g_intern_string ("customized-homepage-in-new-tabs")) { - view->speed_dial_in_new_tabs = g_value_get_boolean (&value); + view->customized_homepage_in_new_tabs = g_value_get_boolean (&value); } else if (name == g_intern_string ("download-manager")) { @@ -1913,7 +1913,7 @@ midori_view_set_uri (MidoriView* view, if (!view->web_view) midori_view_construct_web_view (view); - if (view->speed_dial_in_new_tabs && !g_strcmp0 (uri, "")) + if (view->customized_homepage_in_new_tabs && !g_strcmp0 (uri, "")) { SoupServer* res_server; guint port; diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 63f10b62..e7bcb6ed 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -49,7 +49,7 @@ struct _MidoriWebSettings MidoriStartup load_on_startup; gchar* homepage; gboolean show_crash_dialog; - gboolean speed_dial_in_new_tabs; + gboolean customized_homepage_in_new_tabs; gchar* download_folder; gboolean ask_for_destination_folder; gboolean notify_transfer_completed; @@ -122,7 +122,7 @@ enum PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, - PROP_SPEED_DIAL_IN_NEW_TABS, + PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS, PROP_DOWNLOAD_FOLDER, PROP_ASK_FOR_DESTINATION_FOLDER, PROP_NOTIFY_TRANSFER_COMPLETED, @@ -574,19 +574,18 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); /** - * MidoriWebSettings:speed-dial-in-new-tabs: + * MidoriWebSettings:customized-homepage-in-new-tabs: * - * Show a speed dial page in newly opened tabs. + * Show a customized homepage in newly opened tabs. * * Since: 0.1.7 */ g_object_class_install_property (gobject_class, - PROP_SPEED_DIAL_IN_NEW_TABS, + PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS, g_param_spec_boolean ( - "speed-dial-in-new-tabs", - /* i18n: Speed dial, webpage shortcuts, named for the phone function */ - _("Show speed dial in new tabs"), - _("Show a speed dial page in newly opened tabs"), + "customized-homepage-in-new-tabs", + _("Show customized homepage in new tabs"), + _("Show a customized homepage in newly opened tabs"), TRUE, flags)); @@ -1138,8 +1137,8 @@ midori_web_settings_set_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: web_settings->show_crash_dialog = g_value_get_boolean (value); break; - case PROP_SPEED_DIAL_IN_NEW_TABS: - web_settings->speed_dial_in_new_tabs = g_value_get_boolean (value); + case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS: + web_settings->customized_homepage_in_new_tabs = g_value_get_boolean (value); break; case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); @@ -1346,8 +1345,8 @@ midori_web_settings_get_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: g_value_set_boolean (value, web_settings->show_crash_dialog); break; - case PROP_SPEED_DIAL_IN_NEW_TABS: - g_value_set_boolean (value, web_settings->speed_dial_in_new_tabs); + case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS: + g_value_set_boolean (value, web_settings->customized_homepage_in_new_tabs); break; case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder); From 446fe346cb4ae770e89e8cae4b9f377693f10836 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 8 May 2009 17:46:50 +0200 Subject: [PATCH 1126/2970] Only save thumbnails if Customized homepage is enabled --- midori/midori-browser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index e3ca2553..323f7ecd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -85,6 +85,7 @@ struct _MidoriBrowser gboolean show_navigationbar; gboolean show_statusbar; + gboolean customized_homepage_in_new_tabs; gboolean progress_in_location; gboolean remember_last_visited_pages; gchar* location_entry_search; @@ -402,8 +403,6 @@ midori_browser_update_thumbnail (GtkWidget* view, GtkWidget* child; #if GTK_CHECK_VERSION (2, 12, 0) - /* FIXME: A preference should toggle thumbnails */ - if (midori_view_get_load_status (MIDORI_VIEW (view)) != MIDORI_LOAD_FINISHED) return; @@ -479,7 +478,8 @@ midori_view_notify_load_status_cb (GtkWidget* view, MIDORI_LOCATION_ACTION (action), NULL); g_object_notify (G_OBJECT (browser), "uri"); } - midori_browser_update_thumbnail (view, uri); + if (browser->customized_homepage_in_new_tabs) + midori_browser_update_thumbnail (view, uri); _midori_browser_update_interface (browser); _midori_browser_set_statusbar_text (browser, NULL); @@ -3504,7 +3504,8 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_update_interface (browser); _midori_browser_update_progress (browser, MIDORI_VIEW (view)); - midori_browser_update_thumbnail (view, uri); + if (browser->customized_homepage_in_new_tabs) + midori_browser_update_thumbnail (view, uri); } static void @@ -4831,6 +4832,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-panel", &show_panel, "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, + "customized-homepage-in-new-tabs", &browser->customized_homepage_in_new_tabs, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, @@ -4937,6 +4939,8 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->show_navigationbar = g_value_get_boolean (&value); else if (name == g_intern_string ("show-statusbar")) browser->show_statusbar = g_value_get_boolean (&value); + else if (name == g_intern_string ("customized-homepage-in-new-tabs")) + browser->customized_homepage_in_new_tabs = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); else if (name == g_intern_string ("search-engines-in-completion")) From fd0c07b28088681bd45627e800b2a9d0cb4f13d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Fri, 8 May 2009 18:39:16 +0200 Subject: [PATCH 1127/2970] Update French translation --- AUTHORS | 1 + po/fr.po | 1106 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 569 insertions(+), 538 deletions(-) diff --git a/AUTHORS b/AUTHORS index 48c0095b..59d2077b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -42,6 +42,7 @@ Translations: fr: Adrien Nader fr: Robert-André Mauchin fr: Pascal Gervais + fr: Jérôme Geulfucci gl: Miguel Anxo Bouzada he: Shlomi Israel hu: SZERVÁC Attila diff --git a/po/fr.po b/po/fr.po index ba750222..e0951992 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,14 +5,15 @@ # Adrien Nader 2008 # Robert-André Mauchin 2008 # Pascal Gervais 2009 +# Jérôme Geulfucci 2009 # msgid "" msgstr "" "Project-Id-Version: midori 0.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-03 00:47+0200\n" -"PO-Revision-Date: 2009-04-19 16:05+0100\n" -"Last-Translator: Christian Dywan \n" +"POT-Creation-Date: 2009-05-08 17:46+0200\n" +"PO-Revision-Date: 2009-05-03 09:58+0100\n" +"Last-Translator: Jérôme Guelfucci \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -21,92 +22,92 @@ msgstr "" #: ../data/midori.desktop.in.h:1 msgid "Lightweight web browser" -msgstr "Navigateur internet léger" +msgstr "Navigateur Internet léger" -#: ../data/midori.desktop.in.h:2 ../midori/main.c:1314 ../midori/main.c:1415 -#: ../midori/main.c:1423 ../midori/main.c:1434 -#: ../midori/midori-websettings.c:275 +#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449 +#: ../midori/main.c:1457 ../midori/main.c:1468 +#: ../midori/midori-websettings.c:277 msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:3 msgid "Web Browser" -msgstr "Navigateur internet" +msgstr "Navigateur Internet" -#: ../midori/main.c:95 +#: ../midori/main.c:96 #, c-format msgid "The configuration couldn't be loaded: %s\n" msgstr "La configuration n'a pu être chargée : %s\n" -#: ../midori/main.c:150 +#: ../midori/main.c:151 #, c-format msgid "Value '%s' is invalid for %s" msgstr "La valeur « %s » n'est pas valide pour %s" -#: ../midori/main.c:157 ../midori/main.c:237 +#: ../midori/main.c:158 ../midori/main.c:238 #, c-format msgid "Invalid configuration value '%s'" msgstr "Valeur de paramètre non valide « %s »" -#: ../midori/main.c:349 +#: ../midori/main.c:350 #, c-format msgid "Failed to open database: %s\n" msgstr "Impossible d'ouvrir la base de données : %s\n" -#: ../midori/main.c:381 +#: ../midori/main.c:382 #, c-format msgid "Failed to execute database statement: %s\n" msgstr "Impossible d'exécuter l'instruction de la base de données : %s\n" -#: ../midori/main.c:435 +#: ../midori/main.c:436 #, c-format msgid "Failed to remove history item: %s\n" -msgstr "Impossible de supprimer de l'historique l'élément : %s\n" +msgstr "Impossible de supprimer l'élément de l'historique : %s\n" -#: ../midori/main.c:459 +#: ../midori/main.c:460 #, c-format msgid "Failed to clear history: %s\n" msgstr "Impossible d'effacer l'historique : %s\n" -#: ../midori/main.c:482 ../midori/main.c:516 ../midori/main.c:532 +#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533 #, c-format msgid "Failed to add history item: %s\n" -msgstr "Impossible d'ajouter à l'historique l'élément : %s\n" +msgstr "Impossible d'ajouter l'élément à l'historique : %s\n" #. i18n: Couldn't remove items that are older than n days -#: ../midori/main.c:711 +#: ../midori/main.c:712 #, c-format msgid "Failed to remove old history items: %s\n" -msgstr "Impossible de supprimer de l'historique les anciens éléments : %s\n" +msgstr "Impossible de supprimer les anciens éléments de l'historique : %s\n" -#: ../midori/main.c:740 +#: ../midori/main.c:741 #, c-format msgid "The configuration couldn't be saved. %s" -msgstr "La configuration n'a pu être enregistrée. %s" +msgstr "La configuration n'a pas pu être enregistrée. %s" -#: ../midori/main.c:769 +#: ../midori/main.c:770 #, c-format msgid "The search engines couldn't be saved. %s" -msgstr "Les moteurs de recherche n'ont pu être enregistrés. %s" +msgstr "Les moteurs de recherche n'ont pas pu être enregistrés. %s" -#: ../midori/main.c:788 ../midori/main.c:816 ../midori/main.c:845 +#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846 #, c-format msgid "The bookmarks couldn't be saved. %s" -msgstr "Les signets n'ont pu être enregistrés. %s" +msgstr "Les signets n'ont pas pu être enregistrés. %s" # pas très content #. i18n: Trash, or wastebin, containing closed tabs -#: ../midori/main.c:868 ../midori/main.c:891 +#: ../midori/main.c:869 ../midori/main.c:892 #, c-format msgid "The trash couldn't be saved. %s" -msgstr "La corbeille n'a pu être enregistrée. %s" +msgstr "La corbeille n'a pas pu être enregistrée. %s" -#: ../midori/main.c:964 +#: ../midori/main.c:965 #, c-format msgid "The session couldn't be saved. %s" -msgstr "La session n'a pu être enregistrée. %s" +msgstr "La session n'a pas pu être enregistrée. %s" -#: ../midori/main.c:1091 +#: ../midori/main.c:1092 msgid "" "Midori seems to have crashed the last time it was opened. If this happened " "repeatedly, try one of the following options to solve the problem." @@ -115,106 +116,116 @@ msgstr "" "utilisation. Si cela se produit de façon répétée, essayez l'une des options " "suivantes pour résoudre le problème." -#: ../midori/main.c:1106 +#: ../midori/main.c:1107 msgid "Modify _preferences" msgstr "Modifier les _préférences" -#: ../midori/main.c:1110 +#: ../midori/main.c:1111 msgid "Reset the last _session" msgstr "Réinitialiser la dernière _session" -#: ../midori/main.c:1115 +#: ../midori/main.c:1116 msgid "Disable all _extensions" msgstr "Désactiver toutes les _extensions" -#: ../midori/main.c:1314 +#: ../midori/main.c:1315 msgid "No filename specified" msgstr "Aucun nom de fichier spécifié" -#: ../midori/main.c:1337 +#: ../midori/main.c:1338 msgid "An unknown error occured." msgstr "Une erreur inconnue est survenue." -#: ../midori/main.c:1362 +#: ../midori/main.c:1370 +#, c-format +msgid "Snapshot saved to: %s\n" +msgstr "Capture enregistrée sous: %s\n" + +#: ../midori/main.c:1391 msgid "Run ADDRESS as a web application" -msgstr "Exécuter l'adresse spécifié comme application internet" +msgstr "Lancer l'ADRESSE spécifiée comme une application internet" -#: ../midori/main.c:1362 +#: ../midori/main.c:1391 msgid "ADDRESS" -msgstr "Adresse" +msgstr "ADRESSE" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "Use FOLDER as configuration folder" msgstr "Utiliser DOSSIER comme dossier de configuration" -#: ../midori/main.c:1364 +#: ../midori/main.c:1393 msgid "FOLDER" msgstr "DOSSIER" -#: ../midori/main.c:1366 +#: ../midori/main.c:1395 msgid "Run the specified filename as javascript" -msgstr "Exécuter le fichier spécifié en tant que javascript" +msgstr "Lancer le fichier spécifié en tant que javascript" -#: ../midori/main.c:1368 +#: ../midori/main.c:1398 +msgid "Take a snapshot of the specified URI" +msgstr "Prendre une capture de l'URI spécifiée" + +#: ../midori/main.c:1401 msgid "Display program version" msgstr "Afficher la version du programme" -#: ../midori/main.c:1370 +#: ../midori/main.c:1403 msgid "Addresses" msgstr "Adresses" -#: ../midori/main.c:1412 +#: ../midori/main.c:1446 msgid "[Addresses]" msgstr "[Adresses]" -#: ../midori/main.c:1435 +#: ../midori/main.c:1469 msgid "Please report comments, suggestions and bugs to:" -msgstr "Merci d'envoyer vos commentaires, suggestions et anomalies à :" +msgstr "" +"Merci d'envoyer vos commentaires, suggestions et rapports d'anomalies à :" -#: ../midori/main.c:1437 +#: ../midori/main.c:1471 msgid "Check for new versions at:" msgstr "Vérifier l'existence de nouvelles versions à :" -#: ../midori/main.c:1481 +#: ../midori/main.c:1549 msgid "The specified configuration folder is invalid." msgstr "Le dossier de configuration specifié n'est pas valide." -#: ../midori/main.c:1516 +#: ../midori/main.c:1584 msgid "An instance of Midori is already running but not responding.\n" msgstr "Une instance de Midori est déjà lancée mais ne répond pas.\n" -#: ../midori/main.c:1566 +#: ../midori/main.c:1634 #, c-format msgid "The search engines couldn't be loaded. %s\n" -msgstr "Les moteurs de recherche n'ont pu être chargés. %s\n" +msgstr "Les moteurs de recherche n'ont pas pu être chargés. %s\n" -#: ../midori/main.c:1578 +#: ../midori/main.c:1646 #, c-format msgid "The bookmarks couldn't be loaded: %s\n" -msgstr "Les signets n'ont pu être chargés : %s\n" +msgstr "Les signets n'ont pas pu être chargés : %s\n" -#: ../midori/main.c:1593 +#: ../midori/main.c:1661 #, c-format msgid "The session couldn't be loaded: %s\n" -msgstr "La session n'a pu être chargée : %s\n" +msgstr "La session n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1606 +#: ../midori/main.c:1674 #, c-format msgid "The trash couldn't be loaded: %s\n" -msgstr "La corbeille n'a pu être chargée : %s\n" +msgstr "La corbeille n'a pas pu être chargée : %s\n" # pas très content -#: ../midori/main.c:1619 +#: ../midori/main.c:1687 #, c-format msgid "The history couldn't be loaded: %s\n" -msgstr "L'historique n'a pu être chargé : %s\n" +msgstr "L'historique n'a pas pu être chargé : %s\n" -#: ../midori/main.c:1631 +#: ../midori/main.c:1699 msgid "The following errors occured:" -msgstr "Les erreurs suivantes ont eu lieu :" +msgstr "Les erreurs suivantes sont survenues :" -#: ../midori/main.c:1647 +#: ../midori/main.c:1715 msgid "_Ignore" msgstr "_Ignorer" @@ -231,64 +242,64 @@ msgstr "Document mal formé." msgid "Writing failed." msgstr "L'écriture a échoué." -#: ../midori/midori-browser.c:281 ../midori/midori-browser.c:3497 -#: ../midori/midori-browser.c:3503 +#: ../midori/midori-browser.c:282 ../midori/midori-browser.c:3638 +#: ../midori/midori-browser.c:3644 msgid "Reload the current page" -msgstr "Actualiser la page" +msgstr "Actualiser la page courante" -#: ../midori/midori-browser.c:292 ../midori/midori-browser.c:3500 +#: ../midori/midori-browser.c:293 ../midori/midori-browser.c:3641 msgid "Stop loading the current page" -msgstr "Arrêter le chargement de la page" +msgstr "Arrêter le chargement de la page courante" -#: ../midori/midori-browser.c:354 +#: ../midori/midori-browser.c:355 #, c-format msgid "%d%% loaded" -msgstr "%d %% chargés" +msgstr "%d%% chargés" -#: ../midori/midori-browser.c:379 +#: ../midori/midori-browser.c:380 #, c-format msgid "Unexpected action '%s'." -msgstr "Action inattendue « %s »" +msgstr "Action inattendue « %s »." -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:599 msgid "New folder" msgstr "Nouveau répertoire" -#: ../midori/midori-browser.c:598 +#: ../midori/midori-browser.c:599 msgid "Edit folder" msgstr "Modifier le répertoire" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:601 msgid "New bookmark" msgstr "Nouveau signet" -#: ../midori/midori-browser.c:600 +#: ../midori/midori-browser.c:601 msgid "Edit bookmark" msgstr "Modifier le signet" -#: ../midori/midori-browser.c:630 +#: ../midori/midori-browser.c:631 msgid "_Title:" msgstr "_Titre :" -#: ../midori/midori-browser.c:643 ../midori/midori-searchaction.c:948 +#: ../midori/midori-browser.c:644 ../midori/midori-searchaction.c:948 msgid "_Description:" msgstr "_Description :" -#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:962 +#: ../midori/midori-browser.c:663 ../midori/midori-searchaction.c:962 #: ../extensions/feed-panel/main.c:343 msgid "_Address:" msgstr "_Adresse :" # manque un raccourcis Alt+X -#: ../midori/midori-browser.c:681 +#: ../midori/midori-browser.c:682 msgid "_Folder:" msgstr "_Dossier :" -#: ../midori/midori-browser.c:686 ../midori/midori-browser.c:727 +#: ../midori/midori-browser.c:687 ../midori/midori-browser.c:728 msgid "Toplevel folder" msgstr "Répertoire supérieur" -#: ../midori/midori-browser.c:803 +#: ../midori/midori-browser.c:804 msgid "Save file as" msgstr "Enregistrer le fichier sous" @@ -299,61 +310,61 @@ msgstr "Le fichier %s a été téléchargé." #: ../midori/midori-browser.c:980 msgid "Transfer completed" -msgstr "Transfert completé" +msgstr "Transfert terminé" #: ../midori/midori-browser.c:1658 msgid "Open file" msgstr "Ouvrir le fichier" -#: ../midori/midori-browser.c:2936 ../panels/midori-bookmarks.c:780 +#: ../midori/midori-browser.c:2983 ../panels/midori-bookmarks.c:778 #: ../panels/midori-history.c:808 msgid "Open all in _Tabs" msgstr "Tout ouvrir dans des _onglets" -#: ../midori/midori-browser.c:2943 ../panels/midori-bookmarks.c:786 +#: ../midori/midori-browser.c:2990 ../panels/midori-bookmarks.c:784 #: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:538 msgid "Open in New _Tab" msgstr "Ouvrir dans un nouvel _onglet" -#: ../midori/midori-browser.c:2946 ../panels/midori-bookmarks.c:788 +#: ../midori/midori-browser.c:2993 ../panels/midori-bookmarks.c:786 #: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:540 msgid "Open in New _Window" msgstr "Ouvrir dans une nouvelle _fenêtre" -#: ../midori/midori-browser.c:3107 +#: ../midori/midori-browser.c:3248 msgid "Clear Private Data" -msgstr "Effacer informations privées" +msgstr "Effacer les informations privées" -#: ../midori/midori-browser.c:3110 +#: ../midori/midori-browser.c:3251 msgid "_Clear private data" -msgstr "_Effacer informations privées" +msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3123 +#: ../midori/midori-browser.c:3264 msgid "Clear the following data:" msgstr "Effacer les informations suivantes :" -#: ../midori/midori-browser.c:3131 ../midori/midori-preferences.c:669 +#: ../midori/midori-browser.c:3272 ../midori/midori-preferences.c:671 #: ../panels/midori-history.c:108 msgid "History" msgstr "Historique" -#: ../midori/midori-browser.c:3134 +#: ../midori/midori-browser.c:3275 msgid "Cookies" -msgstr "Fichiers témoins/ Cookies" +msgstr "Fichiers témoins / Cookies" -#: ../midori/midori-browser.c:3137 +#: ../midori/midori-browser.c:3278 msgid "'Flash' Cookies" msgstr "Cookies « Flash »" -#: ../midori/midori-browser.c:3140 +#: ../midori/midori-browser.c:3281 msgid "Website icons" -msgstr "Icônes de pages internet" +msgstr "Icônes des pages Internet" -#: ../midori/midori-browser.c:3220 +#: ../midori/midori-browser.c:3361 msgid "A lightweight web browser." -msgstr "Un navigateur internet léger." +msgstr "Un navigateur Internet léger." -#: ../midori/midori-browser.c:3228 +#: ../midori/midori-browser.c:3369 msgid "translator-credits" msgstr "" "Christian Dywan \n" @@ -361,442 +372,442 @@ msgstr "" "Robert-André Mauchin \n" "Pascal Gervais " -#: ../midori/midori-browser.c:3431 +#: ../midori/midori-browser.c:3572 msgid "_File" msgstr "_Fichier" -#: ../midori/midori-browser.c:3434 +#: ../midori/midori-browser.c:3575 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: ../midori/midori-browser.c:3437 +#: ../midori/midori-browser.c:3578 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: ../midori/midori-browser.c:3440 +#: ../midori/midori-browser.c:3581 msgid "Open a file" msgstr "Ouvrir un fichier" -#: ../midori/midori-browser.c:3443 +#: ../midori/midori-browser.c:3584 msgid "Save to a file" msgstr "Enregistrer dans un fichier" -#: ../midori/midori-browser.c:3445 +#: ../midori/midori-browser.c:3586 msgid "_Close Tab" msgstr "Fe_rmer l'onglet" -#: ../midori/midori-browser.c:3446 +#: ../midori/midori-browser.c:3587 msgid "Close the current tab" msgstr "Fermer l'onglet actuel" -#: ../midori/midori-browser.c:3448 +#: ../midori/midori-browser.c:3589 msgid "C_lose Window" msgstr "_Fermer la fenêtre" -#: ../midori/midori-browser.c:3449 +#: ../midori/midori-browser.c:3590 msgid "Close this window" msgstr "Fermer cette fenêtre" -#: ../midori/midori-browser.c:3452 +#: ../midori/midori-browser.c:3593 msgid "Print the current page" msgstr "Imprimer la page actuelle" -#: ../midori/midori-browser.c:3455 +#: ../midori/midori-browser.c:3596 msgid "Quit the application" msgstr "Quitter le programme" -#: ../midori/midori-browser.c:3457 +#: ../midori/midori-browser.c:3598 msgid "_Edit" msgstr "É_dition" -#: ../midori/midori-browser.c:3460 +#: ../midori/midori-browser.c:3601 msgid "Cut the selected text" msgstr "Couper le texte sélectionné" -#: ../midori/midori-browser.c:3463 ../midori/midori-browser.c:3466 +#: ../midori/midori-browser.c:3604 ../midori/midori-browser.c:3607 msgid "Copy the selected text" msgstr "Copier le texte sélectionné" -#: ../midori/midori-browser.c:3469 +#: ../midori/midori-browser.c:3610 msgid "Paste text from the clipboard" msgstr "Coller le texte à partir du presse-papiers" -#: ../midori/midori-browser.c:3472 +#: ../midori/midori-browser.c:3613 msgid "Delete the selected text" msgstr "Supprimer le texte sélectionné" -#: ../midori/midori-browser.c:3475 +#: ../midori/midori-browser.c:3616 msgid "Select all text" msgstr "Sélectionner tout le texte" -#: ../midori/midori-browser.c:3478 +#: ../midori/midori-browser.c:3619 msgid "Find a word or phrase in the page" msgstr "Rechercher un mot ou une phrase dans la page" -#: ../midori/midori-browser.c:3480 +#: ../midori/midori-browser.c:3621 msgid "Find _Next" msgstr "Rechercher le _suivant" -#: ../midori/midori-browser.c:3481 +#: ../midori/midori-browser.c:3622 msgid "Find the next occurrence of a word or phrase" msgstr "Rechercher l'occurrence suivante d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3483 +#: ../midori/midori-browser.c:3624 msgid "Find _Previous" msgstr "Rechercher le _précédent" -#: ../midori/midori-browser.c:3484 +#: ../midori/midori-browser.c:3625 msgid "Find the previous occurrence of a word or phrase" msgstr "Rechercher l'occurrence précédente d'un mot ou d'une phrase" -#: ../midori/midori-browser.c:3487 +#: ../midori/midori-browser.c:3628 msgid "_Quick Find" msgstr "Recherche rapi_de" -#: ../midori/midori-browser.c:3488 +#: ../midori/midori-browser.c:3629 msgid "Quickly jump to a word or phrase" msgstr "Saut rapide vers un mot ou une phrase" -#: ../midori/midori-browser.c:3491 +#: ../midori/midori-browser.c:3632 msgid "Configure the application preferences" msgstr "Configurer les préférences de l'application" -#: ../midori/midori-browser.c:3493 +#: ../midori/midori-browser.c:3634 msgid "_View" msgstr "_Affichage" -#: ../midori/midori-browser.c:3494 +#: ../midori/midori-browser.c:3635 msgid "_Toolbars" msgstr "_Barre d'outils" -#: ../midori/midori-browser.c:3506 +#: ../midori/midori-browser.c:3647 msgid "Increase the zoom level" msgstr "Augmenter le niveau d'agrandissement" -#: ../midori/midori-browser.c:3509 +#: ../midori/midori-browser.c:3650 msgid "Decrease the zoom level" msgstr "Diminuer le niveau d'agrandissement" -#: ../midori/midori-browser.c:3512 +#: ../midori/midori-browser.c:3653 msgid "Reset the zoom level" msgstr "Réinitialiser le niveau d'agrandissement" -#: ../midori/midori-browser.c:3513 +#: ../midori/midori-browser.c:3654 msgid "_Encoding" msgstr "_Encodage" -#: ../midori/midori-browser.c:3515 +#: ../midori/midori-browser.c:3656 msgid "_Automatic" msgstr "_Automatique" -#: ../midori/midori-browser.c:3518 ../midori/midori-websettings.c:202 +#: ../midori/midori-browser.c:3659 ../midori/midori-websettings.c:204 msgid "Chinese (BIG5)" msgstr "Chinois (BIG5)" -#: ../midori/midori-browser.c:3521 ../midori/midori-websettings.c:203 +#: ../midori/midori-browser.c:3662 ../midori/midori-websettings.c:205 msgid "Japanese (SHIFT_JIS)" msgstr "Japonais (SHIFT_JIS)" -#: ../midori/midori-browser.c:3524 ../midori/midori-websettings.c:204 +#: ../midori/midori-browser.c:3665 ../midori/midori-websettings.c:206 msgid "Russian (KOI8-R)" msgstr "Russe (KOI8-R)" -#: ../midori/midori-browser.c:3527 ../midori/midori-websettings.c:205 +#: ../midori/midori-browser.c:3668 ../midori/midori-websettings.c:207 msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" -#: ../midori/midori-browser.c:3530 ../midori/midori-websettings.c:206 +#: ../midori/midori-browser.c:3671 ../midori/midori-websettings.c:208 msgid "Western (ISO-8859-1)" msgstr "Occidental (ISO-8859-1)" -#: ../midori/midori-browser.c:3533 ../midori/midori-websettings.c:207 -#: ../midori/midori-websettings.c:279 +#: ../midori/midori-browser.c:3674 ../midori/midori-websettings.c:209 +#: ../midori/midori-websettings.c:281 msgid "Custom..." msgstr "Personnalisé..." -#: ../midori/midori-browser.c:3536 ../midori/midori-view.c:1187 +#: ../midori/midori-browser.c:3677 ../midori/midori-view.c:1234 msgid "View _Source" msgstr "Afficher la _source" -#: ../midori/midori-browser.c:3537 +#: ../midori/midori-browser.c:3678 msgid "View the source code of the page" msgstr "Affiche le code source de la page" -#: ../midori/midori-browser.c:3539 +#: ../midori/midori-browser.c:3680 msgid "View Selection Source" msgstr "Afficher la source de la sélection" -#: ../midori/midori-browser.c:3540 +#: ../midori/midori-browser.c:3681 msgid "View the source code of the selection" msgstr "Afficher le code source de la sélection" -#: ../midori/midori-browser.c:3544 +#: ../midori/midori-browser.c:3685 msgid "Toggle fullscreen view" msgstr "Activer/désactiver le plein écran" -#: ../midori/midori-browser.c:3546 +#: ../midori/midori-browser.c:3687 msgid "_Go" msgstr "A_ller" -#: ../midori/midori-browser.c:3549 +#: ../midori/midori-browser.c:3690 msgid "Go back to the previous page" msgstr "Aller à la page précédente" -#: ../midori/midori-browser.c:3552 +#: ../midori/midori-browser.c:3693 msgid "Go forward to the next page" msgstr "Aller à la page suivante" -#: ../midori/midori-browser.c:3555 +#: ../midori/midori-browser.c:3696 msgid "Go to your homepage" msgstr "Aller à la page d'accueil" -#: ../midori/midori-browser.c:3557 +#: ../midori/midori-browser.c:3698 msgid "Empty Trash" msgstr "Vider la corbeille" -#: ../midori/midori-browser.c:3558 +#: ../midori/midori-browser.c:3699 msgid "Delete the contents of the trash" msgstr "Supprimer le contenu de la corbeille" -#: ../midori/midori-browser.c:3560 ../midori/midori-view.c:1159 +#: ../midori/midori-browser.c:3701 ../midori/midori-view.c:1206 msgid "Undo Close Tab" msgstr "Annuler la fermeture de l'onglet" -#: ../midori/midori-browser.c:3561 +#: ../midori/midori-browser.c:3702 msgid "Open the last closed tab" msgstr "Ouvrir le dernier onglet fermé" -#: ../midori/midori-browser.c:3565 ../panels/midori-bookmarks.c:230 +#: ../midori/midori-browser.c:3706 ../panels/midori-bookmarks.c:230 msgid "Add a new bookmark" msgstr "Ajouter un nouveau signet" -#: ../midori/midori-browser.c:3567 ../panels/midori-bookmarks.c:259 +#: ../midori/midori-browser.c:3708 ../panels/midori-bookmarks.c:259 msgid "Add a new folder" msgstr "Ajouter un nouveau répertoire" -#: ../midori/midori-browser.c:3568 +#: ../midori/midori-browser.c:3709 msgid "Add a new bookmark folder" -msgstr "Ajouter un nouveau dossier signet" +msgstr "Ajouter un nouveau dossier de signets" -#: ../midori/midori-browser.c:3569 +#: ../midori/midori-browser.c:3710 msgid "_Tools" msgstr "_Outils" -#: ../midori/midori-browser.c:3571 ../midori/midori-searchaction.c:493 +#: ../midori/midori-browser.c:3712 ../midori/midori-searchaction.c:493 msgid "_Manage Search Engines" msgstr "_Gestion des moteurs de recherche" -#: ../midori/midori-browser.c:3572 +#: ../midori/midori-browser.c:3713 msgid "Add, edit and remove search engines..." msgstr "Ajouter, modifier et supprimer des moteurs de recherche..." -#: ../midori/midori-browser.c:3575 +#: ../midori/midori-browser.c:3716 msgid "_Clear Private Data" msgstr "_Effacer les informations privées" -#: ../midori/midori-browser.c:3576 +#: ../midori/midori-browser.c:3717 msgid "Clear private data..." msgstr "Effacer les informations privées..." -#: ../midori/midori-browser.c:3580 +#: ../midori/midori-browser.c:3721 msgid "_Previous Tab" msgstr "Onglet _précedent" -#: ../midori/midori-browser.c:3581 +#: ../midori/midori-browser.c:3722 msgid "Switch to the previous tab" msgstr "Bascule vers l'onglet précédent" -#: ../midori/midori-browser.c:3583 +#: ../midori/midori-browser.c:3724 msgid "_Next Tab" msgstr "Onglet _suivant" -#: ../midori/midori-browser.c:3584 +#: ../midori/midori-browser.c:3725 msgid "Switch to the next tab" msgstr "Bascule vers l'onglet suivant" -#: ../midori/midori-browser.c:3586 +#: ../midori/midori-browser.c:3727 msgid "_Help" msgstr "Aid_e" -#: ../midori/midori-browser.c:3588 +#: ../midori/midori-browser.c:3729 msgid "_Contents" msgstr "_Sommaire" -#: ../midori/midori-browser.c:3589 +#: ../midori/midori-browser.c:3730 msgid "Show the documentation" msgstr "Afficher la documentation" -#: ../midori/midori-browser.c:3591 +#: ../midori/midori-browser.c:3732 msgid "_Frequent Questions" msgstr "_Questions fréquentes" -#: ../midori/midori-browser.c:3592 +#: ../midori/midori-browser.c:3733 msgid "Show the Frequently Asked Questions" msgstr "Afficher la foire aux questions" -#: ../midori/midori-browser.c:3594 +#: ../midori/midori-browser.c:3735 msgid "_Report a Bug" -msgstr "_Rapporter une anomalie" +msgstr "_Signaler une anomalie" -#: ../midori/midori-browser.c:3595 +#: ../midori/midori-browser.c:3736 msgid "Open Midori's bug tracker" -msgstr "Ouvrir le gestionnaire d'anomalies de Midori" +msgstr "Ouvrir l'outil de suivi d'anomalies de Midori" -#: ../midori/midori-browser.c:3598 +#: ../midori/midori-browser.c:3739 msgid "Show information about the program" -msgstr "Afficher des informations concernant le programme" +msgstr "Afficher les informations sur le programme" -#: ../midori/midori-browser.c:3605 +#: ../midori/midori-browser.c:3746 msgid "P_rivate Browsing" -msgstr "Navigation _privée" +msgstr "Navigation en mode _privé" -#: ../midori/midori-browser.c:3606 +#: ../midori/midori-browser.c:3747 msgid "Don't save any private data while browsing" msgstr "Ne pas enregistrer de données privées durant la navigation" -#: ../midori/midori-browser.c:3611 +#: ../midori/midori-browser.c:3752 msgid "_Menubar" msgstr "Barre de _menu" -#: ../midori/midori-browser.c:3612 +#: ../midori/midori-browser.c:3753 msgid "Show menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-browser.c:3615 +#: ../midori/midori-browser.c:3756 msgid "_Navigationbar" msgstr "Barre de _navigation" -#: ../midori/midori-browser.c:3616 +#: ../midori/midori-browser.c:3757 msgid "Show navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-browser.c:3619 +#: ../midori/midori-browser.c:3760 msgid "Side_panel" msgstr "_Panneau latéral" -#: ../midori/midori-browser.c:3620 +#: ../midori/midori-browser.c:3761 msgid "Show sidepanel" msgstr "Afficher le panneau latéral" -#: ../midori/midori-browser.c:3623 +#: ../midori/midori-browser.c:3764 msgid "_Bookmarkbar" -msgstr "Barre de _signets" +msgstr "Barre des _signets" -#: ../midori/midori-browser.c:3624 +#: ../midori/midori-browser.c:3765 msgid "Show bookmarkbar" msgstr "Afficher la barre des signets" -#: ../midori/midori-browser.c:3627 +#: ../midori/midori-browser.c:3768 msgid "_Transferbar" -msgstr "Barre de _transferts" +msgstr "Barre des _transferts" -#: ../midori/midori-browser.c:3628 +#: ../midori/midori-browser.c:3769 msgid "Show transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-browser.c:3631 +#: ../midori/midori-browser.c:3772 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../midori/midori-browser.c:3632 +#: ../midori/midori-browser.c:3773 msgid "Show statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-browser.c:4063 +#: ../midori/midori-browser.c:4207 msgid "_Separator" msgstr "_Séparateur" -#: ../midori/midori-browser.c:4070 +#: ../midori/midori-browser.c:4214 msgid "_Location..." msgstr "_Emplacement..." -#: ../midori/midori-browser.c:4072 +#: ../midori/midori-browser.c:4216 msgid "Open a particular location" msgstr "Ouvrir un emplacement particulier" -#: ../midori/midori-browser.c:4094 +#: ../midori/midori-browser.c:4238 msgid "_Web Search..." -msgstr "Recherche _internet..." +msgstr "Recherche _Internet..." -#: ../midori/midori-browser.c:4096 +#: ../midori/midori-browser.c:4240 msgid "Run a web search" -msgstr "Lancer une recherche sur l'internet" +msgstr "Lancer une recherche sur Internet" -#: ../midori/midori-browser.c:4117 +#: ../midori/midori-browser.c:4261 msgid "Reopen a previously closed tab or window" -msgstr "Rouvrir un onglet ou une fenêtre précédemment fermé" +msgstr "Réouvrir un onglet ou une fenêtre précédemment fermé" -#: ../midori/midori-browser.c:4130 +#: ../midori/midori-browser.c:4276 msgid "_Recently visited pages" msgstr "Pages _récemment visitées" -#: ../midori/midori-browser.c:4132 +#: ../midori/midori-browser.c:4278 msgid "Reopen pages that you visited earlier" -msgstr "Rouvrir des pages précédemment visitées" +msgstr "Réouvrir des pages précédemment visitées" -#: ../midori/midori-browser.c:4145 ../midori/sokoke.c:872 +#: ../midori/midori-browser.c:4293 ../midori/sokoke.c:872 msgid "_Bookmarks" msgstr "_Signets" -#: ../midori/midori-browser.c:4147 +#: ../midori/midori-browser.c:4295 msgid "Show the saved bookmarks" msgstr "Afficher les signets sauvegardés" -#: ../midori/midori-browser.c:4160 +#: ../midori/midori-browser.c:4310 msgid "_Window" msgstr "_Fenêtre" -#: ../midori/midori-browser.c:4162 +#: ../midori/midori-browser.c:4312 msgid "Show a list of all open tabs" msgstr "Afficher une liste de tous les onglets ouverts" #. i18n: A panel at the bottom, to search text in pages -#: ../midori/midori-browser.c:4329 +#: ../midori/midori-browser.c:4492 msgid "_Inline Find:" msgstr "_Recherche rapide :" -#: ../midori/midori-browser.c:4354 +#: ../midori/midori-browser.c:4517 msgid "Previous" msgstr "Précedent" -#: ../midori/midori-browser.c:4359 +#: ../midori/midori-browser.c:4522 msgid "Next" msgstr "Suivant" -#: ../midori/midori-browser.c:4364 +#: ../midori/midori-browser.c:4527 msgid "Match Case" msgstr "Sensible à la casse" -#: ../midori/midori-browser.c:4372 +#: ../midori/midori-browser.c:4535 msgid "Highlight Matches" -msgstr "Résultats analogues en surbrillance" +msgstr "Surligner les résultats" -#: ../midori/midori-browser.c:4382 +#: ../midori/midori-browser.c:4545 msgid "Close Findbar" msgstr "Fermer la barre de recherche" -#: ../midori/midori-browser.c:4417 ../extensions/cookie-manager.c:819 +#: ../midori/midori-browser.c:4580 ../extensions/cookie-manager.c:821 msgid "Delete All" msgstr "Supprimer tous" -#: ../midori/midori-browser.c:4729 +#: ../midori/midori-browser.c:4963 #, c-format msgid "Unexpected setting '%s'" msgstr "Paramètre inattendu « %s »" #: ../midori/midori-panel.c:333 msgid "Detach chosen panel from the window" -msgstr "Détacher le panneau choisi du fenêtre" +msgstr "Détacher le panneau choisi de la fenêtre" #: ../midori/midori-panel.c:335 msgid "Whether to detach the chosen panel from the window" -msgstr "Indique s'il faut détacher le panneau latéral choisi du fenêtre" +msgstr "Indique s'il faut détacher le panneau latéral choisi de la fenêtre" -#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:533 +#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535 msgid "Align sidepanel on the right" msgstr "Aligner le panneau latéral sur la droite" -#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:534 +#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536 msgid "Whether to align the sidepanel on the right" msgstr "Indique s'il faut aligner le panneau latéral sur la droite" @@ -804,572 +815,606 @@ msgstr "Indique s'il faut aligner le panneau latéral sur la droite" msgid "Close panel" msgstr "Fermer le panneau" -#: ../midori/midori-websettings.c:185 ../midori/midori-view.c:2000 +#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1952 +#: ../midori/midori-view.c:2127 msgid "Blank page" msgstr "Page vierge" -#: ../midori/midori-websettings.c:186 ../midori/midori-websettings.c:553 +#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555 msgid "Homepage" msgstr "Page d'accueil" -#: ../midori/midori-websettings.c:187 +#: ../midori/midori-websettings.c:189 msgid "Last open pages" msgstr "Dernières pages ouvertes" -#: ../midori/midori-websettings.c:222 +#: ../midori/midori-websettings.c:224 msgid "New tab" msgstr "Nouvel onglet" -#: ../midori/midori-websettings.c:223 +#: ../midori/midori-websettings.c:225 msgid "New window" msgstr "Nouvelle fenêtre" -#: ../midori/midori-websettings.c:224 +#: ../midori/midori-websettings.c:226 msgid "Current tab" msgstr "Onglet actuel" -#: ../midori/midori-websettings.c:239 +#: ../midori/midori-websettings.c:241 msgid "Default" msgstr "Par défaut" -#: ../midori/midori-websettings.c:240 +#: ../midori/midori-websettings.c:242 msgid "Icons" msgstr "Icônes" -#: ../midori/midori-websettings.c:241 +#: ../midori/midori-websettings.c:243 msgid "Text" msgstr "Texte" -#: ../midori/midori-websettings.c:242 +#: ../midori/midori-websettings.c:244 msgid "Both" msgstr "Les deux" -#: ../midori/midori-websettings.c:243 +#: ../midori/midori-websettings.c:245 msgid "Both horizontal" msgstr "Les deux horizontalement" -#: ../midori/midori-websettings.c:258 +#: ../midori/midori-websettings.c:260 msgid "All cookies" msgstr "Tous les fichiers témoins" -#: ../midori/midori-websettings.c:259 +#: ../midori/midori-websettings.c:261 msgid "Session cookies" msgstr "Témoins de session" -#: ../midori/midori-websettings.c:260 ../panels/midori-addons.c:94 +#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94 msgid "None" msgstr "Aucun" -#: ../midori/midori-websettings.c:276 +#: ../midori/midori-websettings.c:278 msgid "Safari" msgstr "Safari" -#: ../midori/midori-websettings.c:277 +#: ../midori/midori-websettings.c:279 msgid "Firefox" msgstr "Firefox" -#: ../midori/midori-websettings.c:278 +#: ../midori/midori-websettings.c:280 msgid "Internet Explorer" msgstr "Internet Explorer" -#: ../midori/midori-websettings.c:331 +#: ../midori/midori-websettings.c:333 msgid "Remember last window size" msgstr "Se souvenir de la taille de la fenêtre" -#: ../midori/midori-websettings.c:332 +#: ../midori/midori-websettings.c:334 msgid "Whether to save the last window size" msgstr "Indique s'il faut enregistrer la dernière taille de la fenêtre" -#: ../midori/midori-websettings.c:340 +#: ../midori/midori-websettings.c:342 msgid "Last window width" msgstr "Dernière largeur de la fenêtre" -#: ../midori/midori-websettings.c:341 +#: ../midori/midori-websettings.c:343 msgid "The last saved window width" msgstr "La dernière largeur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:349 +#: ../midori/midori-websettings.c:351 msgid "Last window height" msgstr "Dernière hauteur de la fenêtre" -#: ../midori/midori-websettings.c:350 +#: ../midori/midori-websettings.c:352 msgid "The last saved window height" msgstr "La dernière hauteur enregistrée de la fenêtre" -#: ../midori/midori-websettings.c:375 +#: ../midori/midori-websettings.c:377 msgid "Last panel position" msgstr "Dernière position du panneau" -#: ../midori/midori-websettings.c:376 +#: ../midori/midori-websettings.c:378 msgid "The last saved panel position" msgstr "La dernière position enregistrée du panneau" #. i18n: The internal index of the last opened panel -#: ../midori/midori-websettings.c:385 +#: ../midori/midori-websettings.c:387 msgid "Last panel page" msgstr "Dernière page du panneau" -#: ../midori/midori-websettings.c:386 +#: ../midori/midori-websettings.c:388 msgid "The last saved panel page" msgstr "La dernière page enregistrée du panneau" -#: ../midori/midori-websettings.c:394 +#: ../midori/midori-websettings.c:396 msgid "Last Web search" -msgstr "Dernière recherche sur la toile" +msgstr "Dernière recherche sur Internet" -#: ../midori/midori-websettings.c:395 +#: ../midori/midori-websettings.c:397 msgid "The last saved Web search" -msgstr "La dernière recherche sur la toile enregistrée" +msgstr "La dernière recherche sur Internet enregistrée" -#: ../midori/midori-websettings.c:404 +#: ../midori/midori-websettings.c:406 msgid "Show Menubar" msgstr "Afficher la barre de menu" -#: ../midori/midori-websettings.c:405 +#: ../midori/midori-websettings.c:407 msgid "Whether to show the menubar" msgstr "Indique s'il faut afficher la barre de menu" -#: ../midori/midori-websettings.c:413 +#: ../midori/midori-websettings.c:415 msgid "Show Navigationbar" msgstr "Afficher la barre de navigation" -#: ../midori/midori-websettings.c:414 +#: ../midori/midori-websettings.c:416 msgid "Whether to show the navigationbar" msgstr "Indique s'il faut afficher la barre de navigation" -#: ../midori/midori-websettings.c:422 +#: ../midori/midori-websettings.c:424 msgid "Show Bookmarkbar" msgstr "Afficher la barre des _signets" -#: ../midori/midori-websettings.c:423 +#: ../midori/midori-websettings.c:425 msgid "Whether to show the bookmarkbar" msgstr "Indique s'il faut afficher la barre des signets" -#: ../midori/midori-websettings.c:431 +#: ../midori/midori-websettings.c:433 msgid "Show Panel" msgstr "Afficher le panneau" -#: ../midori/midori-websettings.c:432 +#: ../midori/midori-websettings.c:434 msgid "Whether to show the panel" msgstr "Indique s'il faut afficher le panneau" -#: ../midori/midori-websettings.c:447 +#: ../midori/midori-websettings.c:449 msgid "Show Transferbar" msgstr "Afficher la barre des transferts" -#: ../midori/midori-websettings.c:448 +#: ../midori/midori-websettings.c:450 msgid "Whether to show the transferbar" msgstr "Indique s'il faut afficher la barre de transferts" -#: ../midori/midori-websettings.c:456 +#: ../midori/midori-websettings.c:458 msgid "Show Statusbar" msgstr "Afficher la barre d'état" -#: ../midori/midori-websettings.c:457 +#: ../midori/midori-websettings.c:459 msgid "Whether to show the statusbar" msgstr "Indique s'il faut afficher la barre d'état" -#: ../midori/midori-websettings.c:466 +#: ../midori/midori-websettings.c:468 msgid "Toolbar Style" msgstr "Style de la barre d'outils" -#: ../midori/midori-websettings.c:467 +#: ../midori/midori-websettings.c:469 msgid "The style of the toolbar" msgstr "Le style de la barre d'outils" -#: ../midori/midori-websettings.c:483 +#: ../midori/midori-websettings.c:485 msgid "Show progress in location entry" -msgstr "Progression dans le champ d'adresse" +msgstr "Progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:484 +#: ../midori/midori-websettings.c:486 msgid "Whether to show loading progress in the location entry" -msgstr "Indique s'il faut afficher la progression dans le champ d'adresse" +msgstr "Indique s'il faut afficher la progression dans la barre d'adresse" -#: ../midori/midori-websettings.c:499 +#: ../midori/midori-websettings.c:501 msgid "Search engines in location completion" -msgstr "Recherche dans complètement d'adresse" +msgstr "Ajouter les moteurs de recherche à la complétion" -#: ../midori/midori-websettings.c:500 +#: ../midori/midori-websettings.c:502 msgid "Whether to show search engines in the location completion" msgstr "" -"Indique s'il faut afficher les moteurs de recherche dans le complètement " -"d'adresse" +"Indique s'il faut afficher les moteurs de recherche dans les résultats de " +"complétion de la barre d'adresse" -#: ../midori/midori-websettings.c:508 +#: ../midori/midori-websettings.c:510 msgid "Toolbar Items" msgstr "Éléments de la barre d'outils" -#: ../midori/midori-websettings.c:509 +#: ../midori/midori-websettings.c:511 msgid "The items to show on the toolbar" msgstr "Les éléments à afficher dans la barre d'outils" -#: ../midori/midori-websettings.c:517 +#: ../midori/midori-websettings.c:519 msgid "Compact Sidepanel" msgstr "Panneau latéral compact" -#: ../midori/midori-websettings.c:518 +#: ../midori/midori-websettings.c:520 msgid "Whether to make the sidepanel compact" msgstr "Indique s'il faut mettre le panneau latéral compact" -#: ../midori/midori-websettings.c:543 +#: ../midori/midori-websettings.c:545 msgid "Load on Startup" msgstr "Charger au démarrage" -#: ../midori/midori-websettings.c:544 +#: ../midori/midori-websettings.c:546 msgid "What to load on startup" msgstr "Éléments à charger au démarrage" -#: ../midori/midori-websettings.c:554 +#: ../midori/midori-websettings.c:556 msgid "The homepage" msgstr "La page d'accueil" -#: ../midori/midori-websettings.c:569 +#: ../midori/midori-websettings.c:571 msgid "Show crash dialog" -msgstr "Afficher le dialogue de fermeture inattendue" +msgstr "Afficher la fenêtre de fermeture inattendue" -#: ../midori/midori-websettings.c:570 +#: ../midori/midori-websettings.c:572 msgid "Show a dialog after Midori crashed" -msgstr "Afficher un dialogue en cas de fermeture inattendue de Midori" +msgstr "Afficher une fenêtre en cas de fermeture inattendue de Midori" -#: ../midori/midori-websettings.c:578 +#. i18n: Speed dial, webpage shortcuts, named for the phone function +#: ../midori/midori-websettings.c:588 +msgid "Show speed dial in new tabs" +msgstr "Afficher le speed dial dans les nouveaux onglets" + +#: ../midori/midori-websettings.c:589 +msgid "Show a speed dial page in newly opened tabs" +msgstr "Afficher une page de démarrage personnalisée dans les nouveaux onglets" + +#: ../midori/midori-websettings.c:597 msgid "Download Folder" -msgstr "Dossier de téléchargements" +msgstr "Dossier des téléchargements" -#: ../midori/midori-websettings.c:579 +#: ../midori/midori-websettings.c:598 msgid "The folder downloaded files are saved to" msgstr "Le dossier où enregistrer les téléchargements" -#: ../midori/midori-websettings.c:598 +#: ../midori/midori-websettings.c:617 msgid "Ask for the destination folder" msgstr "Demander le dossier de destination" -#: ../midori/midori-websettings.c:599 -msgid "Whether to ask for the destination folder when downloading a file" -msgstr "Indique s'il faut demander le dossier de destination quand un fichier " -"est téléchargé." - #: ../midori/midori-websettings.c:618 -msgid "Notify when a transfer has been completed" -msgstr "Notifier quand un transfert a complété." - -#: ../midori/midori-websettings.c:619 -msgid "Whether to show a notification when a transfer has been completed" +msgid "Whether to ask for the destination folder when downloading a file" msgstr "" -"Indique s'il faut afficher une notification quand un transfert a complété" +"Indique s'il faut demander le dossier de destination quand un fichier est " +"téléchargé." -#: ../midori/midori-websettings.c:631 +#: ../midori/midori-websettings.c:637 +msgid "Notify when a transfer has been completed" +msgstr "Signaler la fin des transferts" + +#: ../midori/midori-websettings.c:638 +msgid "Whether to show a notification when a transfer has been completed" +msgstr "Indique s'il faut signaler la fin d'un transfert par une notification" + +#: ../midori/midori-websettings.c:650 msgid "Download Manager" msgstr "Gestionnaire de téléchargements" -#: ../midori/midori-websettings.c:632 +#: ../midori/midori-websettings.c:651 msgid "An external download manager" msgstr "Un gestionnaire de téléchargements externe" -#: ../midori/midori-websettings.c:640 +#: ../midori/midori-websettings.c:659 msgid "Text Editor" msgstr "Éditeur de texte" -#: ../midori/midori-websettings.c:641 +#: ../midori/midori-websettings.c:660 msgid "An external text editor" msgstr "Un éditeur de texte externe" -#: ../midori/midori-websettings.c:656 +#: ../midori/midori-websettings.c:675 msgid "News Aggregator" msgstr "Agrégateur de flux" -#: ../midori/midori-websettings.c:657 +#: ../midori/midori-websettings.c:676 msgid "An external news aggregator" msgstr "Un agrégateur de flux externe" -#: ../midori/midori-websettings.c:665 +#: ../midori/midori-websettings.c:684 msgid "Location entry Search" msgstr "Recherche depuis la barre d'adresse" -#: ../midori/midori-websettings.c:666 +#: ../midori/midori-websettings.c:685 msgid "The search to perform inside the location entry" msgstr "La recherche à effectuer à partir du contenu de la barre d'adresse" -#: ../midori/midori-websettings.c:674 +#: ../midori/midori-websettings.c:693 msgid "Preferred Encoding" msgstr "Encodage favori" -#: ../midori/midori-websettings.c:675 +#: ../midori/midori-websettings.c:694 msgid "The preferred character encoding" -msgstr "Encodage des caractères favori" +msgstr "Encodage favori des caractères" -#: ../midori/midori-websettings.c:685 +#: ../midori/midori-websettings.c:704 msgid "Always Show Tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:686 +#: ../midori/midori-websettings.c:705 msgid "Always show the tabbar" msgstr "Toujours afficher la barre d'onglets" -#: ../midori/midori-websettings.c:694 +#: ../midori/midori-websettings.c:713 msgid "Close Buttons on Tabs" -msgstr "Boutons fermer sur les onglets" +msgstr "Boutons de fermeture sur les onglets" -#: ../midori/midori-websettings.c:695 +#: ../midori/midori-websettings.c:714 msgid "Whether tabs have close buttons" msgstr "Indique s'il faut afficher un bouton de fermeture sur les onglets" -#: ../midori/midori-websettings.c:703 +#: ../midori/midori-websettings.c:722 msgid "Open new pages in" msgstr "Ouvrir les nouvelles pages dans" -#: ../midori/midori-websettings.c:704 +#: ../midori/midori-websettings.c:723 msgid "Where to open new pages" -msgstr "Où ouvrir les nouvelles pages" +msgstr "Lieu où les nouvelles pages doivent être ouvertes" -#: ../midori/midori-websettings.c:713 +#: ../midori/midori-websettings.c:732 msgid "Open external pages in" -msgstr "Ouvrir les pages externes dans" +msgstr "Lieu où les pages externes doivent être ouvertes" -#: ../midori/midori-websettings.c:714 +#: ../midori/midori-websettings.c:733 msgid "Where to open externally opened pages" msgstr "Où ouvrir les pages externes" -#: ../midori/midori-websettings.c:727 +#: ../midori/midori-websettings.c:746 msgid "Middle click opens Selection" -msgstr "Clic du milieu ouvre la sélection" +msgstr "Un clic milieu ouvre la sélection" -#: ../midori/midori-websettings.c:728 +#: ../midori/midori-websettings.c:747 msgid "Load an address from the selection via middle click" msgstr "" -"Charger l'addresse sous la sélection avec le bouton central de la souris" +"Charger l'addresse de la sélection avec un clic du bouton central de la " +"souris" -#: ../midori/midori-websettings.c:736 +#: ../midori/midori-websettings.c:755 msgid "Open tabs in the background" msgstr "Ouvrir les onglets en arrière-plan" -#: ../midori/midori-websettings.c:737 +#: ../midori/midori-websettings.c:756 msgid "Whether to open new tabs in the background" msgstr "Indique s'il faut ouvrir les nouveaux onglets en arrière-plan" -#: ../midori/midori-websettings.c:745 +#: ../midori/midori-websettings.c:764 msgid "Open Tabs next to Current" -msgstr "Ouvrir les onglets à côté de l'actuel" +msgstr "Ouvrir les onglets à côté de l'onglet actuel" -#: ../midori/midori-websettings.c:746 +#: ../midori/midori-websettings.c:765 msgid "Whether to open new tabs next to the current tab or after the last one" msgstr "" -"Indique s'il faut ouvrir les nouveaux onglets à côté de l'actuel ou après le " -"dernier" +"Indique s'il faut ouvrir les nouveaux onglets à côté de l'onglet actuel ou " +"après le dernier de la liste" -#: ../midori/midori-websettings.c:754 +#: ../midori/midori-websettings.c:773 msgid "Open popups in tabs" -msgstr "Ouvrir les fenêtres surgissantes dans des onglets" +msgstr "Ouvrir les fenêtre intempestives dans des onglets" -#: ../midori/midori-websettings.c:755 +#: ../midori/midori-websettings.c:774 msgid "Whether to open popup windows in tabs" msgstr "" -"Indique s'il faut ouvrir les fenêtres surgissantes (popup) dans des onglets" +"Indique s'il faut ouvrir les fenêtres qui apparaissent intempestivement " +"(popups) dans des onglets" -#: ../midori/midori-websettings.c:771 +#: ../midori/midori-websettings.c:790 msgid "Zoom Text and Images" msgstr "Agrandir le texte et les images" -#: ../midori/midori-websettings.c:772 +#: ../midori/midori-websettings.c:791 msgid "Whether to zoom text and images" msgstr "Indique s'il faut agrandir le texte et les images" -#: ../midori/midori-websettings.c:787 +#: ../midori/midori-websettings.c:806 msgid "Find inline while typing" -msgstr "Chercher dans la page durant la saisie" +msgstr "Chercher dans la page pendant la saisie" -#: ../midori/midori-websettings.c:788 +#: ../midori/midori-websettings.c:807 msgid "Whether to automatically find inline while typing" -msgstr "Indique s'il faut chercher automatiquement dans la page durant la saisie" +msgstr "" +"Indique s'il faut chercher automatiquement dans la page pendant la saisie" -#: ../midori/midori-websettings.c:796 +#: ../midori/midori-websettings.c:815 msgid "Accept cookies" msgstr "Accepter les cookies" -#: ../midori/midori-websettings.c:797 +#: ../midori/midori-websettings.c:816 msgid "What type of cookies to accept" msgstr "Type de fichiers témoins à accepter" -#: ../midori/midori-websettings.c:806 +#: ../midori/midori-websettings.c:825 msgid "Original cookies only" msgstr "Uniquement les cookies d'origine" -#: ../midori/midori-websettings.c:807 +#: ../midori/midori-websettings.c:826 msgid "Accept cookies from the original website only" msgstr "Accepter les fichiers témoins du site d'origine uniquement" -#: ../midori/midori-websettings.c:815 +#: ../midori/midori-websettings.c:834 msgid "Maximum cookie age" msgstr "Âge maximal des cookies" -#: ../midori/midori-websettings.c:816 +#: ../midori/midori-websettings.c:835 msgid "The maximum number of days to save cookies for" msgstr "" "Le nombre maximal de jours durant lesquels conserver les fichiers témoins" -#: ../midori/midori-websettings.c:826 +#: ../midori/midori-websettings.c:845 msgid "Remember last visited pages" -msgstr "Se souvenir des pages récemment visitées" +msgstr "Se souvenir des dernières pages visitées" -#: ../midori/midori-websettings.c:827 +#: ../midori/midori-websettings.c:846 msgid "Whether the last visited pages are saved" msgstr "Indique s'il faut enregistrer les dernières pages visitées" -#: ../midori/midori-websettings.c:835 +#: ../midori/midori-websettings.c:854 msgid "Maximum history age" msgstr "Âge maximal de l'historique" -#: ../midori/midori-websettings.c:836 +#: ../midori/midori-websettings.c:855 msgid "The maximum number of days to save the history for" -msgstr "Le nombre maximal de jours durant lesquels conserver l'historique" +msgstr "Le nombre maximal de jours pendant lequel conserver l'historique" -#: ../midori/midori-websettings.c:844 +#: ../midori/midori-websettings.c:863 msgid "Remember last form inputs" -msgstr "Se souvenir des dernières saisies de formulaires" +msgstr "Se souvenir du contenu des derniers formulaires remplis" -#: ../midori/midori-websettings.c:845 +#: ../midori/midori-websettings.c:864 msgid "Whether the last form inputs are saved" -msgstr "Indique s'il faut enregistrer les saisies de formulaires" +msgstr "" +"Indique s'il faut enregistrer le contenu des derniers formulaires remplis" -#: ../midori/midori-websettings.c:853 +#: ../midori/midori-websettings.c:872 msgid "Remember last downloaded files" msgstr "Se souvenir des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:854 +#: ../midori/midori-websettings.c:873 msgid "Whether the last downloaded files are saved" msgstr "" "Indique s'il faut enregistrer la liste des derniers fichiers téléchargés" -#: ../midori/midori-websettings.c:864 +#: ../midori/midori-websettings.c:883 msgid "Proxy Server" msgstr "Serveur mandataire" -#: ../midori/midori-websettings.c:865 +#: ../midori/midori-websettings.c:884 msgid "The proxy server used for HTTP connections" msgstr "Le serveur mandataire (proxy) pour les connexions HTTP" -#: ../midori/midori-websettings.c:880 +#: ../midori/midori-websettings.c:899 msgid "Detect proxy server automatically" msgstr "Détecter le serveur mandataire automatiquement" -#: ../midori/midori-websettings.c:881 +#: ../midori/midori-websettings.c:900 msgid "Whether to detect the proxy server automatically from the environment" msgstr "" "Indique s'il faut détecter le serveur mandataire (proxy) automatiquement" #. i18n: This refers to an application, not the 'user agent' string -#: ../midori/midori-websettings.c:897 +#: ../midori/midori-websettings.c:916 msgid "Identify as" msgstr "S'identifier comme" -#: ../midori/midori-websettings.c:898 +#: ../midori/midori-websettings.c:917 msgid "What to identify as to web pages" -msgstr "Comment s'identifier sur les pages de la toile" +msgstr "Comment s'identifier sur les pages Internet" -#: ../midori/midori-websettings.c:914 +#: ../midori/midori-websettings.c:933 msgid "Identification string" msgstr "Chaîne d'identification" -#: ../midori/midori-websettings.c:915 +#: ../midori/midori-websettings.c:934 msgid "The application identification string" msgstr "La chaîne d'identification de l'application" -#: ../midori/midori-websettings.c:923 +#: ../midori/midori-websettings.c:942 msgid "Cache size" msgstr "Taille du cache" -#: ../midori/midori-websettings.c:924 +#: ../midori/midori-websettings.c:943 msgid "The allowed size of the cache" msgstr "La taille de l'antémémoire permise" # pas très content -#: ../midori/midori-view.c:641 +#: ../midori/midori-view.c:667 #, c-format msgid "The page '%s' couldn't be loaded." -msgstr "La page » %s « n'a pu être chargée." +msgstr "La page « %s » n'a pu être chargée." -#: ../midori/midori-view.c:643 ../extensions/feed-panel/main.c:112 +#: ../midori/midori-view.c:669 ../extensions/feed-panel/main.c:112 msgid "Error" msgstr "Erreur" -#: ../midori/midori-view.c:646 +#: ../midori/midori-view.c:672 msgid "Try again" msgstr "Essayer une autre fois" #. i18n: The title of the 404 - Not found error page #. Error pages are special, we want to try loading the destination #. again, not the error page which isn't even a proper page -#: ../midori/midori-view.c:673 ../midori/midori-view.c:2524 +#: ../midori/midori-view.c:701 ../midori/midori-view.c:2651 #, c-format msgid "Not found - %s" msgstr "Non trouvé - %s" -#: ../midori/midori-view.c:1021 +#: ../midori/midori-view.c:1068 msgid "Open _Link" msgstr "Ouvrir le _lien" -#: ../midori/midori-view.c:1023 +#: ../midori/midori-view.c:1070 msgid "Open Link in New _Tab" msgstr "Ouvrir le lien dans un nouvel _onglet" -#: ../midori/midori-view.c:1040 +#: ../midori/midori-view.c:1087 msgid "Open Link in New _Window" msgstr "Ouvrir le lien dans une nouvelle _fenêtre" -#: ../midori/midori-view.c:1049 +#: ../midori/midori-view.c:1096 msgid "_Download Link destination" msgstr "_Télécharger la cible du lien" -#: ../midori/midori-view.c:1055 +#: ../midori/midori-view.c:1102 msgid "_Save Link destination" msgstr "_Enregistrer la cible du lien" -#: ../midori/midori-view.c:1064 +#: ../midori/midori-view.c:1111 msgid "Download with Download _Manager" -msgstr "Télécharger avec _gestionnaire de téléchargements" +msgstr "Télécharger avec le _gestionnaire de téléchargements" -#: ../midori/midori-view.c:1093 +#: ../midori/midori-view.c:1140 msgid "Search _with" msgstr "Chercher _avec" -#: ../midori/midori-view.c:1121 +#: ../midori/midori-view.c:1168 msgid "_Search the Web" -msgstr "_Chercher sur l'internet" +msgstr "_Chercher sur Internet" -#: ../midori/midori-view.c:1131 +#: ../midori/midori-view.c:1178 msgid "Open Address in New _Tab" msgstr "Ouvrir l'adresse dans un nouvel _onglet" -#: ../midori/midori-view.c:1283 +#: ../midori/midori-view.c:1330 msgid "Open or download file" msgstr "Ouvrir ou télécharger le fichier" -#: ../midori/midori-view.c:1300 +#: ../midori/midori-view.c:1347 #, c-format msgid "File Type: '%s'" msgstr "Type de fichier : « %s »" -#: ../midori/midori-view.c:1303 +#: ../midori/midori-view.c:1350 #, c-format msgid "File Type: %s ('%s')" msgstr "Type de fichier : %s (« %s »)" #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" -#: ../midori/midori-view.c:1307 +#: ../midori/midori-view.c:1354 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../midori/midori-view.c:1710 +#: ../midori/midori-view.c:1774 #, c-format msgid "Inspect page - %s" msgstr "Analyser la page - %s" -#: ../midori/midori-view.c:1862 +#: ../midori/midori-view.c:1954 ../midori/midori-view.c:1955 +msgid "Search" +msgstr "Rechercher" + +#: ../midori/midori-view.c:1956 +msgid "Click to add a shortcut" +msgstr "Cliquez pour ajouter un raccourci" + +#: ../midori/midori-view.c:1957 +msgid "Enter shortcut address" +msgstr "Entrez l'adresse du raccourci" + +#: ../midori/midori-view.c:1958 +msgid "Enter shortcut name" +msgstr "Entrez le nom du raccourci" + +#: ../midori/midori-view.c:1959 +msgid "Are you sure you want to delete this shortcut?" +msgstr "Ètes-vous certain de vouloir supprimer ce raccourci ?" + +#: ../midori/midori-view.c:1989 #, c-format msgid "Document cannot be displayed" msgstr "Le document ne peut être affiché" -#: ../midori/midori-view.c:1879 +#: ../midori/midori-view.c:2006 #, c-format msgid "No documentation installed" msgstr "Pas de documentation installée" @@ -1377,7 +1422,7 @@ msgstr "Pas de documentation installée" #: ../midori/midori-preferences.c:91 #, c-format msgid "Preferences for %s" -msgstr "Préférences de %s" +msgstr "Préférences pour %s" #. Page "General" #: ../midori/midori-preferences.c:399 @@ -1392,192 +1437,197 @@ msgstr "Démarrage" msgid "Use current page as homepage" msgstr "Utiliser la page courante comme page d'accueil" -#: ../midori/midori-preferences.c:424 ../panels/midori-transfers.c:88 +#: ../midori/midori-preferences.c:426 ../panels/midori-transfers.c:88 msgid "Transfers" msgstr "Transferts" #. Page "Appearance" -#: ../midori/midori-preferences.c:440 +#: ../midori/midori-preferences.c:442 msgid "Appearance" msgstr "Apparence" -#: ../midori/midori-preferences.c:441 +#: ../midori/midori-preferences.c:443 msgid "Font settings" msgstr "Paramètres des polices" -#: ../midori/midori-preferences.c:443 +#: ../midori/midori-preferences.c:445 msgid "Default Font Family" msgstr "Police par défaut" -#: ../midori/midori-preferences.c:447 +#: ../midori/midori-preferences.c:449 msgid "The default font family used to display text" -msgstr "La police par défaut utilisée pour afficher le texte" +msgstr "La police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:450 +#: ../midori/midori-preferences.c:452 msgid "The default font size used to display text" -msgstr "La taille de la police par défaut utilisée pour afficher le texte" +msgstr "La taille de la police utilisée par défaut pour afficher les textes" -#: ../midori/midori-preferences.c:453 +#: ../midori/midori-preferences.c:455 msgid "Fixed-width Font Family" -msgstr "Police à taille fixe" - -#: ../midori/midori-preferences.c:456 -msgid "The font family used to display fixed-width text" -msgstr "La taille de la police par défaut utilisée pour afficher le texte à taille fixe" +msgstr "Police à largeur fixe" #: ../midori/midori-preferences.c:458 +msgid "The font family used to display fixed-width text" +msgstr "" +"La taille de la police utilisée par défaut pour afficher les textes à " +"largeur fixe" + +#: ../midori/midori-preferences.c:460 msgid "Minimum Font Size" -msgstr "Taille minimum de la police" +msgstr "Taille minimale de la police" -#: ../midori/midori-preferences.c:461 +#: ../midori/midori-preferences.c:463 msgid "The minimum font size used to display text" -msgstr "La taille minimum de la police utilisée pour afficher le texte" +msgstr "La taille minimale de la police utilisée pour afficher les textes" -#: ../midori/midori-preferences.c:468 +#: ../midori/midori-preferences.c:470 msgid "Encoding" msgstr "Encodage" -#: ../midori/midori-preferences.c:471 +#: ../midori/midori-preferences.c:473 msgid "The character encoding to use by default" -msgstr "Encodage des caractères par défaut" +msgstr "Encodage par défaut des caractères" #. Page "Behavior" -#: ../midori/midori-preferences.c:478 +#: ../midori/midori-preferences.c:480 msgid "Behavior" msgstr "Comportement" -#: ../midori/midori-preferences.c:479 +#: ../midori/midori-preferences.c:481 msgid "Features" msgstr "Fonctionnalités" -#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54 +#: ../midori/midori-preferences.c:484 ../extensions/statusbar-features.c:54 msgid "Load images automatically" -msgstr "Charger les images" +msgstr "Charger les images automatiquement" -#: ../midori/midori-preferences.c:483 +#: ../midori/midori-preferences.c:485 msgid "Load and display images automatically" msgstr "Charger et afficher les images automatiquement" -#: ../midori/midori-preferences.c:486 +#: ../midori/midori-preferences.c:488 msgid "Shrink images automatically" -msgstr "Réduire les images" +msgstr "Réduire la taille des images automatiquement" -#: ../midori/midori-preferences.c:487 +#: ../midori/midori-preferences.c:489 msgid "Automatically shrink standalone images to fit" -msgstr "Réduire automatiquement les images pour les adapter à la fenêtre" +msgstr "" +"Réduire automatiquement la taille des images pour les adapter à celle de la " +"fenêtre" -#: ../midori/midori-preferences.c:490 +#: ../midori/midori-preferences.c:492 msgid "Print background images" msgstr "Imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:491 +#: ../midori/midori-preferences.c:493 msgid "Whether background images should be printed" msgstr "Indique s'il faut imprimer les images d'arrière-plan" -#: ../midori/midori-preferences.c:494 +#: ../midori/midori-preferences.c:496 msgid "Resizable text areas" msgstr "Zones de texte redimensionnables" -#: ../midori/midori-preferences.c:495 +#: ../midori/midori-preferences.c:497 msgid "Whether text areas are resizable" msgstr "Indique si les zones de texte peuvent être redimensionnées" -#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63 +#: ../midori/midori-preferences.c:500 ../extensions/statusbar-features.c:63 msgid "Enable scripts" msgstr "Activer les scripts" -#: ../midori/midori-preferences.c:499 +#: ../midori/midori-preferences.c:501 msgid "Enable embedded scripting languages" msgstr "Active la prise en charge interne des scripts" -#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72 +#: ../midori/midori-preferences.c:504 ../extensions/statusbar-features.c:72 msgid "Enable Netscape plugins" msgstr "Activer les greffons Netscape" -#: ../midori/midori-preferences.c:503 +#: ../midori/midori-preferences.c:505 msgid "Enable embedded Netscape plugin objects" msgstr "Active la prise en charge interne des greffons Netscape" -#: ../midori/midori-preferences.c:506 +#: ../midori/midori-preferences.c:508 msgid "Enforce 96 dots per inch" msgstr "Forcer 96 points par pouce" -#: ../midori/midori-preferences.c:507 +#: ../midori/midori-preferences.c:509 msgid "Enforce a video dot density of 96 DPI" msgstr "Force une densité visuelle de 96 DPI" -#: ../midori/midori-preferences.c:510 +#: ../midori/midori-preferences.c:512 msgid "Enable developer tools" msgstr "Activer les outils de développement" -#: ../midori/midori-preferences.c:511 +#: ../midori/midori-preferences.c:513 msgid "Enable special extensions for developers" msgstr "Activer les extensions spécifiques pour les développeurs" -#: ../midori/midori-preferences.c:518 +#: ../midori/midori-preferences.c:520 msgid "Spell Checking" -msgstr "Correcteur d'orthographe" +msgstr "Vérificateur d'orthographe" -#: ../midori/midori-preferences.c:521 +#: ../midori/midori-preferences.c:523 msgid "Enable Spell Checking" -msgstr "Activer le correcteur d'orthographe" +msgstr "Activer la varification d'orthographe" -#: ../midori/midori-preferences.c:522 +#: ../midori/midori-preferences.c:524 msgid "Enable spell checking while typing" -msgstr "Activer le correcteur d'orthographe durant la saisie" +msgstr "Activer la vérification d'orthographe lors de la saisie" -#: ../midori/midori-preferences.c:525 +#: ../midori/midori-preferences.c:527 msgid "" "A comma separated list of languages to be used for spell checking, for " "example \"en_GB,de_DE\"" -msgstr "Une liste de langues séparée par des virgules utilisée pour le " -"correcteur d'ortographe, par example » fr_FR,de_DE « " +msgstr "" +"Une liste de langues séparée par des virgules utilisée pour le correcteur " +"d'ortographe, par example « fr_FR,de_DE »" #. Page "Interface" -#: ../midori/midori-preferences.c:530 +#: ../midori/midori-preferences.c:532 msgid "Interface" msgstr "Interface" -#: ../midori/midori-preferences.c:531 +#: ../midori/midori-preferences.c:533 msgid "Navigationbar" msgstr "Barre de navigation" -#: ../midori/midori-preferences.c:542 +#: ../midori/midori-preferences.c:544 msgid "Browsing" msgstr "Navigation" #. Page "Applications" -#: ../midori/midori-preferences.c:572 +#: ../midori/midori-preferences.c:574 msgid "Applications" -msgstr "Programmes" +msgstr "Applications" -#: ../midori/midori-preferences.c:573 +#: ../midori/midori-preferences.c:575 msgid "External applications" -msgstr "Programmes externes" +msgstr "Applications externes" #. Page "Network" -#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620 +#: ../midori/midori-preferences.c:621 ../midori/midori-preferences.c:622 msgid "Network" msgstr "Réseau" -#: ../midori/midori-preferences.c:647 +#: ../midori/midori-preferences.c:649 msgid "MB" msgstr "Mo" #. Page "Privacy" -#: ../midori/midori-preferences.c:652 +#: ../midori/midori-preferences.c:654 msgid "Privacy" msgstr "Vie privée" -#: ../midori/midori-preferences.c:653 +#: ../midori/midori-preferences.c:655 msgid "Web Cookies" -msgstr "Témoins de connexion" +msgstr "Fichiers témoins" -#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676 +#: ../midori/midori-preferences.c:668 ../midori/midori-preferences.c:678 msgid "days" msgstr "jours" -#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:277 +#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314 msgid "Empty" msgstr "Vide" @@ -1599,7 +1649,7 @@ msgstr "_Icône :" #: ../midori/midori-searchaction.c:990 msgid "_Token:" -msgstr "_Jeton :" +msgstr "_Identifiant :" #: ../midori/midori-searchaction.c:1195 msgid "Manage Search Engines" @@ -1607,11 +1657,11 @@ msgstr "Gestion des moteurs de recherche" #: ../midori/midori-searchaction.c:1292 msgid "Use as _default" -msgstr "Comme dé_faut" +msgstr "Par dé_faut" #: ../midori/sokoke.c:162 ../midori/sokoke.c:174 msgid "Could not run external program." -msgstr "Impossible d'exécuter le programme externe" +msgstr "Impossible de lancer le programme externe." #. i18n: A superuser, or system administrator, may not be 'root' #: ../midori/sokoke.c:520 @@ -1724,15 +1774,15 @@ msgstr "Ètes-vous certain de vouloir effacer tout l'historique ?" #: ../panels/midori-history.c:217 msgid "Bookmark the selected history item" -msgstr "Ajouter un signet pour l'élément sélectionné de l'historique" +msgstr "Ajouter un signet pour l'élément sélectionné dans l'historique" #: ../panels/midori-history.c:226 msgid "Delete the selected history item" -msgstr "Supprimer l'élément sélectionné de l'historique" +msgstr "Supprimer l'élément sélectionné dans l'historique" #: ../panels/midori-history.c:234 msgid "Clear the entire history" -msgstr "Vider l'historique entier" +msgstr "Vider l'historique tout entier" #: ../panels/midori-history.c:599 #, c-format @@ -1771,7 +1821,7 @@ msgid "" "to open this location:" msgstr "" "Un nom d'utilisateur et un mot de passe sont requis\n" -"pour l'ouverture de ce lieu :" +"pour l'ouverture de cet emplacement :" #: ../katze/katze-http-auth.c:127 msgid "Username" @@ -1822,7 +1872,7 @@ msgstr "Donner une couleur distincte à chaque onglet" #: ../extensions/cookie-manager.c:201 msgid "At the end of the session" -msgstr "Au fin de la session" +msgstr "À la fin de la session" #: ../extensions/cookie-manager.c:204 #, c-format @@ -1836,10 +1886,10 @@ msgid "" msgstr "" "Hôte : %s\n" "Nom : %s\n" -"Valeur : %s\n" -"Chemin : %s\n" -"Sécuritaire : %s\n" -"Expire : %s" +"Valeur : %s\n" +"Chemin : %s\n" +"Sécuritaire : %s\n" +"Expire : %s" #: ../extensions/cookie-manager.c:210 msgid "Yes" @@ -1849,86 +1899,85 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: ../extensions/cookie-manager.c:491 -msgid "Do you really want to delete all cookies?" -msgstr "Ètes-vous certain de vouloir effacer tout les fichiers témoins ?" - #: ../extensions/cookie-manager.c:493 +msgid "Do you really want to delete all cookies?" +msgstr "Ètes-vous certain de vouloir effacer tout les cookies ?" + +#: ../extensions/cookie-manager.c:495 msgid "Question" msgstr "Question" -#: ../extensions/cookie-manager.c:502 -msgid "" -"Only the visible cookies are deleted which match the entered filter string." -msgstr "Seulement les fichiers témoins visible sont effacé que " -"correspandent au filtre." +#: ../extensions/cookie-manager.c:504 +msgid "Only cookies which match the filter will be deleted." +msgstr "Seuls les fichiers témoins qui correspondent au filtre seront effacés." -#: ../extensions/cookie-manager.c:680 +#: ../extensions/cookie-manager.c:682 msgid "Name" msgstr "Nom" -#: ../extensions/cookie-manager.c:740 +#: ../extensions/cookie-manager.c:742 msgid "_Expand All" msgstr "_Afficher tous" -#: ../extensions/cookie-manager.c:748 +#: ../extensions/cookie-manager.c:750 msgid "_Collapse All" msgstr "_Masquer tous" -#: ../extensions/cookie-manager.c:821 +#: ../extensions/cookie-manager.c:823 msgid "" "Deletes all shown cookies. If a filter is set, only those cookies are " "deleted which match the filter." msgstr "" -"Effacer tous les fichiers témoins. S'il y a un filtre, seulement les " -"fichies témoins sont effacé que correspandent au filtre." +"Effacer tous les fichiers témoins. S'il y a un filtre, seulement les fichies " +"témoins sont effacé que correspandent au filtre." -#: ../extensions/cookie-manager.c:836 +#: ../extensions/cookie-manager.c:838 msgid "Expand All" msgstr "Afficher tous" -#: ../extensions/cookie-manager.c:843 +#: ../extensions/cookie-manager.c:845 msgid "Collapse All" msgstr "Masquer tous" # manque un raccourcis Alt+X -#: ../extensions/cookie-manager.c:874 +#: ../extensions/cookie-manager.c:876 msgid "Filter:" msgstr "Filtre :" -#: ../extensions/cookie-manager.c:879 +#: ../extensions/cookie-manager.c:881 msgid "" "Enter a filter string to show only cookies whose name or domain field match " "the entered filter" -msgstr "Entrer un filtre pour afficher seulement les fichier témoins dont le " -"nom ou la domaine correspande au filtre entré." +msgstr "" +"Entrer un filtre pour afficher seulement les cookies dont le nom ou le " +"domaine correspond au filtre entré." -#: ../extensions/cookie-manager.c:914 ../extensions/cookie-manager.c:962 +#: ../extensions/cookie-manager.c:916 ../extensions/cookie-manager.c:964 msgid "Cookie Manager" msgstr "Gestionnaire de cookies" -#: ../extensions/cookie-manager.c:946 +#: ../extensions/cookie-manager.c:948 msgid "_Cookie Manager" msgstr "Gestionnaire de _cookies" -#: ../extensions/cookie-manager.c:963 +#: ../extensions/cookie-manager.c:965 msgid "List, view and delete cookies" -msgstr "Lister, afficher et supprimer les témoins" +msgstr "Lister, afficher et supprimer les fichiers témoins" #: ../extensions/feed-panel/feed-atom.c:217 msgid "Failed to find required Atom \"entry\" elements in XML data." -msgstr "" +msgstr "Impossible de trouver l'élément \"entry\" ATOM requise dans les données XML." #: ../extensions/feed-panel/feed-atom.c:323 msgid "Failed to find required Atom \"feed\" elements in XML data." -msgstr "" +msgstr "Impossible de trouver l'élément \"feed\" ATOM requis dans les données XML." #. i18n: The local date a feed was last updated #: ../extensions/feed-panel/feed-panel.c:398 #, c-format msgctxt "Feed" msgid "Last updated: %s." -msgstr "Dernier mise a jour : %s." +msgstr "Dernière mise à jour : %s." #: ../extensions/feed-panel/feed-panel.c:660 msgid "Feeds" @@ -1940,7 +1989,7 @@ msgstr "Ajouter un nouveau flux" #: ../extensions/feed-panel/feed-panel.c:720 msgid "Delete feed" -msgstr "Supprimer flux" +msgstr "Supprimer un flux" #: ../extensions/feed-panel/feed-panel.c:803 msgid "_Feeds" @@ -1949,43 +1998,46 @@ msgstr "_Flux" #: ../extensions/feed-panel/feed-parse.c:139 #, c-format msgid "Failed to find root element in feed XML data." -msgstr "" +msgstr "Impossible de trouver l'élément racine dans les données XML du flux." #: ../extensions/feed-panel/feed-parse.c:179 #, c-format msgid "Unsupported feed format." -msgstr "Format de flux non supporté." +msgstr "Format de flux non pris en charge." #: ../extensions/feed-panel/feed-parse.c:209 #, c-format msgid "Failed to parse XML feed: %s" -msgstr "" +msgstr "Impossible d'analyser le flux XML: %s" #: ../extensions/feed-panel/feed-rss.c:46 msgid "Failed to find \"channel\" element in RSS XML data." msgstr "" +"Impossible de trouver l'élément \"channel\" dans les données XML du flux RSS." #: ../extensions/feed-panel/feed-rss.c:51 msgid "Unsupported RSS version found." -msgstr "" +msgstr "La version trouvée du flux RSS n'est pas prise en charge." #: ../extensions/feed-panel/feed-rss.c:144 msgid "Failed to find required RSS \"item\" elements in XML data." -msgstr "" +msgstr "Impossible de trouver l'élément requis \"item\" dans les données XML." #: ../extensions/feed-panel/feed-rss.c:229 msgid "Failed to find required RSS \"channel\" elements in XML data." msgstr "" +"Impossible de trouver les éléments RSS \"channel\" requis dans les données " +"XML." #: ../extensions/feed-panel/main.c:114 #, c-format msgid "Feed '%s' already exists" -msgstr "Flux « %s » déjà existe" +msgstr "Le flux « %s » existe déjà" #: ../extensions/feed-panel/main.c:191 #, c-format msgid "Error loading feed '%s'" -msgstr "Erreure à charger le flux « %s »" +msgstr "Erreur lors du chargement du flux « %s »" #: ../extensions/feed-panel/main.c:331 msgid "New feed" @@ -1997,7 +2049,7 @@ msgstr "Panneau de flux" #: ../extensions/feed-panel/main.c:490 msgid "Read Atom/ RSS feeds" -msgstr "" +msgstr "Lire des flux Atom et RSS" #: ../extensions/mouse-gestures/main.c:216 msgid "Mouse Gestures" @@ -2014,7 +2066,7 @@ msgstr "Cadre de pages" #: ../extensions/page-holder.c:161 msgid "_Pageholder" -msgstr "C_adre de pages" +msgstr "Cadre de _pages" #: ../extensions/statusbar-features.c:104 msgid "Statusbar Features" @@ -2023,27 +2075,5 @@ msgstr "Fonctionnalités dans la barre d'état" #: ../extensions/statusbar-features.c:105 msgid "Easily toggle features on web pages on and off" msgstr "" - -#~ msgid "P_lugins" -#~ msgstr "G_reffons" - -#~ msgid "Plugins" -#~ msgstr "Greffons" - -#~ msgid "Images" -#~ msgstr "Images" - -#~ msgid "Scripts" -#~ msgstr "Scripts" - -#~ msgid "%s has no property '%s'" -#~ msgstr "%s n'a pas de propriété « %s »" - -#~ msgid "%s cannot be assigned to %s.%s" -#~ msgstr "%s ne peut être assigné à %s.%s" - -#~ msgid "%s.%s cannot be accessed" -#~ msgstr "%s.%s ne peut être accédé" - -#~ msgid "Source" -#~ msgstr "Source" +"Permet de facilement activer et désactiver des fonctionnalités sur les pages " +"Internet" From 68bfa4331b52e86a9cb4fe409ca71fe260dbbf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Geulfucci?= Date: Sat, 9 May 2009 13:57:52 +0200 Subject: [PATCH 1128/2970] Refactor middle clicks on navigation actions --- midori/midori-browser.c | 210 +++++++++++++++------------------------- 1 file changed, 77 insertions(+), 133 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 323f7ecd..662f6920 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -3033,82 +3033,90 @@ midori_browser_menu_button_press_event_cb (GtkWidget* toolitem, return FALSE; } +static gboolean +midori_browser_menu_middle_click_on_navigation_action (MidoriBrowser* browser, + GtkAction* action) +{ + const gchar* name; + gchar* homepage; + + g_return_val_if_fail (action != NULL, FALSE); + + if (!browser->settings) + return FALSE; + + g_object_get (browser->settings, "homepage", &homepage, NULL); + + name = gtk_action_get_name (action); + + if (g_str_equal (name, "Homepage")) + { + gint n; + + n = midori_browser_add_uri (browser, homepage); + _midori_browser_set_current_page_smartly (browser, n); + + return TRUE; + } + else if (g_str_equal (name, "Back")) + { + GtkWidget* view; + WebKitWebBackForwardList* back_forward_list; + WebKitWebHistoryItem* back_item; + const gchar* back_uri; + gint n; + + view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); + + back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); + back_uri = webkit_web_history_item_get_uri (back_item); + + n = midori_browser_add_uri (browser, back_uri); + _midori_browser_set_current_page_smartly (browser, n); + + return TRUE; + } + else if (g_str_equal (name, "Forward")) + { + GtkWidget *view; + WebKitWebBackForwardList *back_forward_list; + WebKitWebHistoryItem *forward_item; + const gchar *forward_uri; + gint n; + + view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); + + back_forward_list = + webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); + + forward_item = + webkit_web_back_forward_list_get_forward_item (back_forward_list); + forward_uri = webkit_web_history_item_get_uri (forward_item); + + n = midori_browser_add_uri (browser, forward_uri); + _midori_browser_set_current_page_smartly (browser, n); + + return TRUE; + } + + g_free (homepage); + + return FALSE; +} + static gboolean midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem, GdkEventButton* event, MidoriBrowser* browser) { - if (event->button == 2) + if (event->button == 2) { GtkAction* action = gtk_widget_get_action (toolitem); - const gchar* name; - gchar* homepage; - g_return_val_if_fail (action != NULL, FALSE); - - if (!browser->settings) - return FALSE; - - g_object_get (browser->settings, "homepage", &homepage, NULL); - - name = gtk_action_get_name (action); - - if (g_str_equal (name, "Homepage")) - { - gint n; - - n = midori_browser_add_uri (browser, homepage); - - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - else if (g_str_equal (name, "Back")) - { - GtkWidget* view; - WebKitWebBackForwardList* back_forward_list; - WebKitWebHistoryItem* back_item; - const gchar* back_uri; - gint n; - - view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); - - back_forward_list = - webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); - - back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); - back_uri = webkit_web_history_item_get_uri (back_item); - - n = midori_browser_add_uri (browser, back_uri); - - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - else if (g_str_equal (name, "Forward")) - { - GtkWidget *view; - WebKitWebBackForwardList *back_forward_list; - WebKitWebHistoryItem *forward_item; - const gchar *forward_uri; - gint n; - - view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); - - back_forward_list = - webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); - - forward_item = - webkit_web_back_forward_list_get_forward_item (back_forward_list); - forward_uri = webkit_web_history_item_get_uri (forward_item); - - n = midori_browser_add_uri (browser, forward_uri); - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - - g_free (homepage); + return midori_browser_menu_middle_click_on_navigation_action (browser, action); } return FALSE; } @@ -4665,72 +4673,8 @@ midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem, { GtkWidget* parent = gtk_widget_get_parent (toolitem); GtkAction* action = gtk_widget_get_action (parent); - const gchar* name; - gchar* homepage; - g_return_val_if_fail (action != NULL, FALSE); - - if (!browser->settings) - return FALSE; - - g_object_get (browser->settings, "homepage", &homepage, NULL); - - name = gtk_action_get_name (action); - - if (g_str_equal (name, "Homepage")) - { - gint n; - - n = midori_browser_add_uri (browser, homepage); - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - else if (g_str_equal (name, "Back")) - { - GtkWidget* view; - WebKitWebBackForwardList* back_forward_list; - WebKitWebHistoryItem* back_item; - const gchar* back_uri; - gint n; - - view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); - - back_forward_list = - webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); - - back_item = webkit_web_back_forward_list_get_back_item (back_forward_list); - back_uri = webkit_web_history_item_get_uri (back_item); - - n = midori_browser_add_uri (browser, back_uri); - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - else if (g_str_equal (name, "Forward")) - { - GtkWidget *view; - WebKitWebBackForwardList *back_forward_list; - WebKitWebHistoryItem *forward_item; - const gchar *forward_uri; - gint n; - - view = gtk_bin_get_child (GTK_BIN (midori_browser_get_current_tab (browser))); - - back_forward_list = - webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view)); - - forward_item = - webkit_web_back_forward_list_get_forward_item (back_forward_list); - forward_uri = webkit_web_history_item_get_uri (forward_item); - - n = midori_browser_add_uri (browser, forward_uri); - _midori_browser_set_current_page_smartly (browser, n); - - return TRUE; - } - - g_free (homepage); + return midori_browser_menu_middle_click_on_navigation_action (browser, action); } else if (event->button == 3) { From ec44108653270359fa48fe4c08f112d2bec4e4cd Mon Sep 17 00:00:00 2001 From: Dale Whittaker Date: Sat, 9 May 2009 14:08:06 +0200 Subject: [PATCH 1129/2970] Improve title and URI display in the feed panel We strip HTML from "title" elements when required now. And we always try to show at least the URI for feeds in the WebKit view. And we fallback to using the URI in the treeview if the title/ description is empty. --- extensions/feed-panel/feed-atom.c | 29 +++++++++++++++++++++-- extensions/feed-panel/feed-panel.c | 28 ++++++++++++---------- extensions/feed-panel/feed-parse.c | 38 +++++++++++++++++++++++++++++- extensions/feed-panel/feed-parse.h | 5 ++++ extensions/feed-panel/feed-rss.c | 4 ++-- 5 files changed, 87 insertions(+), 17 deletions(-) diff --git a/extensions/feed-panel/feed-atom.c b/extensions/feed-panel/feed-atom.c index def46f61..de905f2f 100644 --- a/extensions/feed-panel/feed-atom.c +++ b/extensions/feed-panel/feed-atom.c @@ -138,6 +138,31 @@ atom_get_link (KatzeItem* item, } } +static gchar* +atom_get_title (FeedParser* fparser) +{ + if (!katze_item_get_name (fparser->item)) + { + gchar* type; + + type = (gchar*)xmlGetProp (fparser->node, BAD_CAST "type"); + if (type) + { + gchar* content = NULL; + + if (g_str_equal (type, "html") || + g_str_equal (type, "xhtml")) + content = feed_get_element_markup (fparser); + + xmlFree (type); + + if (content) + return content; + } + } + return feed_get_element_string (fparser); +} + static void atom_preparse_entry (FeedParser* fparser) { @@ -161,7 +186,7 @@ atom_parse_entry (FeedParser* fparser) } else if (!xmlStrcmp (node->name, BAD_CAST "title")) { - content = feed_get_element_string (fparser); + content = atom_get_title (fparser); katze_item_set_name (fparser->item, content); } else if (!xmlStrcmp (node->name, BAD_CAST "summary")) @@ -249,7 +274,7 @@ atom_parse_feed (FeedParser* fparser) } else if (!xmlStrcmp (node->name, BAD_CAST "title")) { - content = feed_get_element_string (fparser); + content = atom_get_title (fparser); katze_item_set_name (fparser->item, content); } else if (!xmlStrcmp (node->name, BAD_CAST "subtitle")) diff --git a/extensions/feed-panel/feed-panel.c b/extensions/feed-panel/feed-panel.c index 0c818bc7..bbef14f6 100644 --- a/extensions/feed-panel/feed-panel.c +++ b/extensions/feed-panel/feed-panel.c @@ -121,9 +121,9 @@ feed_panel_treeview_render_text_cb (GtkTreeViewColumn* column, g_assert (KATZE_IS_ITEM (item)); title = katze_item_get_name (item); - if (!title) + if (!title || !*title || g_str_equal (title, " ")) title = katze_item_get_text (item); - if (!title) + if (!title || !*title || g_str_equal (title, " ")) title = katze_item_get_uri (item); g_object_set (renderer, "text", title, NULL); @@ -377,23 +377,24 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, text = g_strdup (katze_item_get_text (KATZE_ITEM (item))); else { + KatzeItem* parent; + const gchar* puri; + + parent = katze_item_get_parent (item); + g_assert (KATZE_IS_ARRAY (parent)); date = katze_item_get_added (item); + puri = katze_item_get_uri (parent); if (date) { time_t date_t; const struct tm* tm; static gchar date_format[512]; - const gchar* puri; - KatzeItem* parent; gchar* last_updated; date_t = (time_t)date; tm = localtime (&date_t); /* Some gcc versions complain about "%c" for no reason */ strftime (date_format, sizeof (date_format), "%c", tm); - parent = katze_item_get_parent (item); - g_assert (KATZE_IS_ARRAY (parent)); - puri = katze_item_get_uri (parent); /* i18n: The local date a feed was last updated */ last_updated = g_strdup_printf (C_("Feed", "Last updated: %s."), date_format); @@ -403,6 +404,12 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, puri, last_updated); g_free (last_updated); } + else + { + text = g_strdup_printf ( + "feed" + "

%s

", puri); + } } webkit_web_view_load_html_string ( WEBKIT_WEB_VIEW (panel->webview), text ? text : "", uri); @@ -413,11 +420,8 @@ feed_panel_cursor_or_row_changed_cb (GtkTreeView* treeview, else { text = katze_item_get_text (item); - if (text) - { - webkit_web_view_load_html_string ( - WEBKIT_WEB_VIEW (panel->webview), text, uri); - } + webkit_web_view_load_html_string ( + WEBKIT_WEB_VIEW (panel->webview), text ? text : "", uri); } g_object_unref (item); } diff --git a/extensions/feed-panel/feed-parse.c b/extensions/feed-panel/feed-parse.c index 442e5ed5..4c09dc64 100644 --- a/extensions/feed-panel/feed-parse.c +++ b/extensions/feed-panel/feed-parse.c @@ -30,7 +30,43 @@ feed_get_element_string (FeedParser* fparser) return g_strdup (" "); } - return (gchar* )xmlNodeListGetString (fparser->doc, node->children, 1); + return (gchar*)xmlNodeListGetString (fparser->doc, node->children, 1); +} + +void +handle_markup_chars (void* user_data, + const xmlChar* ch, + int len) +{ + gchar** markup; + gchar* temp; + + markup = (gchar**)user_data; + temp = g_strndup ((gchar*)ch, len); + *markup = (*markup) ? g_strconcat (*markup, temp, NULL) : g_strdup (temp); + g_free (temp); +} + +gchar* +feed_get_element_markup (FeedParser* fparser) +{ + gchar* markup; + const xmlChar* stag; + + markup = feed_get_element_string (fparser); + if ((stag = xmlStrchr (BAD_CAST markup, '<')) && xmlStrchr (stag, '>')) + { + gchar* text = NULL; + htmlSAXHandlerPtr psax; + + psax = g_new0 (htmlSAXHandler, 1); + psax->characters = handle_markup_chars; + htmlSAXParseDoc (BAD_CAST markup, NULL, psax, &text); + g_free (psax); + g_free (markup); + return text; + } + return markup; } gint64 diff --git a/extensions/feed-panel/feed-parse.h b/extensions/feed-panel/feed-parse.h index 493b7ef7..84ae9f19 100644 --- a/extensions/feed-panel/feed-parse.h +++ b/extensions/feed-panel/feed-parse.h @@ -20,6 +20,7 @@ #include #include +#include G_BEGIN_DECLS @@ -52,9 +53,13 @@ typedef struct _FeedParser #define feed_parser_set_error(fparser, err, msg) \ *(fparser)->error = g_error_new ( \ FEED_PARSE_ERROR, (err), (msg)) + gchar* feed_get_element_string (FeedParser* fparser); +gchar* +feed_get_element_markup (FeedParser* fparser); + gint64 feed_get_element_date (FeedParser* fparser); diff --git a/extensions/feed-panel/feed-rss.c b/extensions/feed-panel/feed-rss.c index 84fd6d3b..03843df6 100644 --- a/extensions/feed-panel/feed-rss.c +++ b/extensions/feed-panel/feed-rss.c @@ -107,7 +107,7 @@ rss_parse_item (FeedParser* fparser) } else if (!xmlStrcmp (node->name, BAD_CAST "title")) { - content = feed_get_element_string (fparser); + content = feed_get_element_markup (fparser); katze_item_set_name (fparser->item, content); } else if (!xmlStrcmp (node->name, BAD_CAST "description")) @@ -165,7 +165,7 @@ rss_parse_channel (FeedParser* fparser) if (!xmlStrcmp (node->name, BAD_CAST "title")) { - content = feed_get_element_string (fparser); + content = feed_get_element_markup (fparser); katze_item_set_name (fparser->item, content); } else if (!xmlStrcmp (node->name, BAD_CAST "description")) From 429c460e86c0822f1611db2a1b980879b6348de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 9 May 2009 15:32:45 +0200 Subject: [PATCH 1130/2970] Fix shadowed variable 'error' --- midori/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/midori/main.c b/midori/main.c index ce09ff2d..b2b6d917 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1476,7 +1476,6 @@ main (int argc, #if WEBKIT_CHECK_VERSION (1, 1, 6) if (snapshot) { - GError *error; gchar* filename; gint fd; GtkWidget* web_view; From 5a6465684700a79f1c131b6cef247e34fa00b6e0 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 9 May 2009 15:41:50 +0200 Subject: [PATCH 1131/2970] Remove 'Optional run time dependencies' text from waf output --- wscript | 1 - 1 file changed, 1 deletion(-) diff --git a/wscript b/wscript index bbd0d2fe..c05f0506 100644 --- a/wscript +++ b/wscript @@ -212,7 +212,6 @@ def configure (conf): print "User documentation: " + user_docs + " (docutils)" print "API documentation: " + api_docs + " (gtk-doc)" print - print "Optional run time dependencies:" print "Single instance: " + unique + " (unique)" if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4': Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') From 70a9d29ea67fd83cdd404edd34a70e36485cfde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 9 May 2009 15:55:10 +0200 Subject: [PATCH 1132/2970] Add midori_app_send_notification() to easily send notifications Sending such messages is either done by using libnotify if available. Otherwise the program "notify-send" is used. --- midori/marshal.list | 1 + midori/midori-app.c | 116 ++++++++++++++++++++++++++++++++++++ midori/midori-app.h | 5 ++ midori/midori-browser.c | 51 ++++++++++------ midori/midori-preferences.c | 6 +- 5 files changed, 158 insertions(+), 21 deletions(-) diff --git a/midori/marshal.list b/midori/marshal.list index 825f9730..5ca263be 100644 --- a/midori/marshal.list +++ b/midori/marshal.list @@ -4,3 +4,4 @@ VOID:BOOLEAN,STRING VOID:OBJECT,ENUM VOID:STRING,BOOLEAN VOID:STRING,INT,STRING +VOID:STRING,STRING diff --git a/midori/midori-app.c b/midori/midori-app.c index f79a307c..f70a0469 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -24,6 +24,20 @@ #include #endif +typedef struct _NotifyNotification NotifyNotification; + +typedef struct +{ + gboolean (*init) (const gchar* app_name); + void (*uninit) (void); + NotifyNotification* (*notification_new) (const gchar* summary, + const gchar* body, + const gchar* icon, + GtkWidget* attach); + gboolean (*notification_show) (NotifyNotification* notification, + GError** error); +} LibNotifyFuncs; + struct _MidoriApp { GObject parent_instance; @@ -41,6 +55,11 @@ struct _MidoriApp KatzeArray* browsers; gpointer instance; + + /* libnotify handling */ + gchar* program_notify_send; + GModule* libnotify_module; + LibNotifyFuncs libnotify_funcs; }; struct _MidoriAppClass @@ -89,6 +108,9 @@ static guint signals[LAST_SIGNAL]; static void midori_app_finalize (GObject* object); +static void +midori_app_init_libnotify (MidoriApp* app); + static void midori_app_set_property (GObject* object, guint prop_id, @@ -165,6 +187,8 @@ _midori_app_add_browser (MidoriApp* app, "signal::destroy", midori_browser_destroy_cb, app, "signal::quit", midori_browser_quit_cb, app, NULL); + g_signal_connect_swapped (browser, "send-notification", + G_CALLBACK (midori_app_send_notification), app); katze_array_add_item (app->browsers, browser); @@ -486,6 +510,8 @@ midori_app_init (MidoriApp* app) app->browsers = katze_array_new (MIDORI_TYPE_BROWSER); app->instance = NULL; + + midori_app_init_libnotify (app); } static void @@ -506,6 +532,13 @@ midori_app_finalize (GObject* object) katze_object_assign (app->instance, NULL); + if (app->libnotify_module) + { + app->libnotify_funcs.uninit (); + g_module_close (app->libnotify_module); + } + katze_object_assign (app->program_notify_send, NULL); + G_OBJECT_CLASS (midori_app_parent_class)->finalize (object); } @@ -808,3 +841,86 @@ midori_app_quit (MidoriApp* app) g_signal_emit (app, signals[QUIT], 0); } + +static void +midori_app_init_libnotify (MidoriApp* app) +{ + gint i; + const gchar* sonames[] = { "libnotify.so", "libnotify.so.1", NULL }; + + for (i = 0; sonames[i] != NULL && app->libnotify_module == NULL; i++ ) + { + app->libnotify_module = g_module_open (sonames[i], G_MODULE_BIND_LOCAL); + } + + if (app->libnotify_module != NULL) + { + g_module_symbol (app->libnotify_module, "notify_init", + (void*) &(app->libnotify_funcs.init)); + g_module_symbol (app->libnotify_module, "notify_uninit", + (void*) &(app->libnotify_funcs.uninit)); + g_module_symbol (app->libnotify_module, "notify_notification_new", + (void*) &(app->libnotify_funcs.notification_new)); + g_module_symbol (app->libnotify_module, "notify_notification_show", + (void*) &(app->libnotify_funcs.notification_show)); + + /* init libnotify */ + if (!app->libnotify_funcs.init || !app->libnotify_funcs.init ("midori")) + { + g_module_close (app->libnotify_module); + app->libnotify_module = NULL; + } + } + + app->program_notify_send = g_find_program_in_path ("notify-send"); +} + +/** + * midori_app_send_notification: + * @app: a #MidoriApp + * @title: title of the notification + * @message: text of the notification, or NULL + * + * Send #message to the notification daemon to display it. + * This is done by using libnotify if available or by using the program + * "notify-send" as a fallback. + * + * There is no guarantee that the message have been sent and displayed, as + * neither libnotify nor "notify-send" might be available or the + * notification daemon might not be running. + * + * Since 0.1.7 + **/ +void +midori_app_send_notification (MidoriApp* app, + const gchar* title, + const gchar* message) +{ + gboolean sent = FALSE; + + g_return_if_fail (MIDORI_IS_APP (app)); + g_return_if_fail (title); + + if (app->libnotify_module) + { + NotifyNotification* n; + + n = app->libnotify_funcs.notification_new (title, message, "midori", NULL); + sent = app->libnotify_funcs.notification_show (n, NULL); + g_object_unref (n); + } + /* Fall back to the command line program "notify-send" */ + if (!sent && app->program_notify_send) + { + gchar* msgq = g_shell_quote (message); + gchar* titleq = g_shell_quote (title); + gchar* command = g_strdup_printf ("%s -i midori %s %s", + app->program_notify_send, titleq, msgq); + + g_spawn_command_line_async (command, NULL); + + g_free (titleq); + g_free (msgq); + g_free (command); + } +} diff --git a/midori/midori-app.h b/midori/midori-app.h index a2f197e9..7b06ba30 100644 --- a/midori/midori-app.h +++ b/midori/midori-app.h @@ -64,6 +64,11 @@ midori_app_create_browser (MidoriApp* app); void midori_app_quit (MidoriApp* app); +void +midori_app_send_notification (MidoriApp* app, + const gchar* title, + const gchar* message); + G_END_DECLS #endif /* __MIDORI_APP_H__ */ diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 662f6920..9f318403 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -26,6 +26,7 @@ #include "gtkiconentry.h" #include "compat.h" +#include "marshal.h" #include "sokoke.h" #include @@ -126,6 +127,7 @@ enum ACTIVATE_ACTION, CONTEXT_READY, ADD_DOWNLOAD, + SEND_NOTIFICATION, QUIT, LAST_SIGNAL @@ -970,25 +972,17 @@ midori_browser_download_notify_status_cb (WebKitDownload* download, if (browser->settings && katze_object_get_boolean ( browser->settings, "notify-transfer-completed")) { - gchar* program = g_find_program_in_path ("notify-send"); - if (program != NULL) - { - gchar* msg = g_strdup_printf ( - _("The file %s has been downloaded."), - webkit_download_get_suggested_filename (download)); - gchar* msgq = g_shell_quote (msg); - gchar* titleq = g_shell_quote (_("Transfer completed")); - gchar* command = g_strconcat (titleq, " ", msgq, NULL); - g_free (msg); - g_free (titleq); - g_free (msgq); - sokoke_spawn_program ("notify-send -i midori %s", command, FALSE); - g_free (command); - g_free (program); - } + gchar* msg = g_strdup_printf ( + _("The file %s has been downloaded."), + webkit_download_get_suggested_filename (download)); + + g_signal_emit (browser, signals[SEND_NOTIFICATION], 0, + _("Transfer completed"), msg); + + g_free (msg); } - } break; + } case WEBKIT_DOWNLOAD_STATUS_CANCELLED: case WEBKIT_DOWNLOAD_STATUS_ERROR: icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); @@ -1411,6 +1405,29 @@ midori_browser_class_init (MidoriBrowserClass* class) G_TYPE_NONE, 1, G_TYPE_OBJECT); + /** + * MidoriBrowser::send-notification: + * @browser: the object on which the signal is emitted + * @title: the title for the notification + * @message: the message for the notification + * + * Emitted when a browser wants to display a notification message, + * e.g. when a download has been completed. + * + * Since: 0.1.7 + */ + signals[SEND_NOTIFICATION] = g_signal_new ( + "send-notification", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST), + 0, + 0, + NULL, + midori_cclosure_marshal_VOID__STRING_STRING, + G_TYPE_NONE, 2, + G_TYPE_STRING, + G_TYPE_STRING); + signals[QUIT] = g_signal_new ( "quit", G_TYPE_FROM_CLASS (class), diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 2d5fed31..3ce064fe 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -327,7 +327,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, GtkWidget* entry; GtkWidget* hbox; gint icon_width, icon_height; - gchar* program; g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); @@ -433,9 +432,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences, gtk_widget_set_sensitive (label, FALSE); INDENTED_ADD (label, 0, 1, 1, 2); button = katze_property_proxy (settings, "notify-transfer-completed", NULL); - if (!((program = g_find_program_in_path ("notify-send")))) - gtk_widget_set_sensitive (button, FALSE); - g_free (program); + /* FIXME: Disable the option if notifications presumably cannot be sent + gtk_widget_set_sensitive (button, FALSE); */ SPANNED_ADD (button, 1, 2, 1, 2); /* Page "Appearance" */ From eaaaed01dcb059db71b1f111d411596d724c0463 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 9 May 2009 15:57:28 +0200 Subject: [PATCH 1133/2970] Mention libnotify as optional in the README file --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index fab2dc01..305c921b 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ Midori is a lightweight web browser. Requirements: GTK+ 2.10, WebkitGTK+ 1.1.1, libXML2, libsoup 2.25.2 -Optional: Unique 0.9, libidn, sqlite 3.0, docutils +Optional: Unique 0.9, libidn, sqlite 3.0, docutils, libnotify For installation instructions read INSTALL. From bd6c23cc7120c5106f1f3ef2a6b50cdd8236f821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Sat, 9 May 2009 16:41:01 +0200 Subject: [PATCH 1134/2970] Allow adding speed dial shortcuts from the context menu --- ...tandoori-body.html => speeddial-body.html} | 2 +- ...tandoori-head.html => speeddial-head.html} | 31 ++- midori/midori-view.c | 238 +++++++++++++++--- wscript | 4 +- 4 files changed, 225 insertions(+), 50 deletions(-) rename data/{tandoori-body.html => speeddial-body.html} (98%) rename data/{tandoori-head.html => speeddial-head.html} (86%) diff --git a/data/tandoori-body.html b/data/speeddial-body.html similarity index 98% rename from data/tandoori-body.html rename to data/speeddial-body.html index a99f3da5..1ae3f1ef 100644 --- a/data/tandoori-body.html +++ b/data/speeddial-body.html @@ -66,6 +66,6 @@

-
+
diff --git a/data/tandoori-head.html b/data/speeddial-head.html similarity index 86% rename from data/tandoori-head.html rename to data/speeddial-head.html index e1051b79..22f3924b 100644 --- a/data/tandoori-head.html +++ b/data/speeddial-head.html @@ -9,6 +9,7 @@ {title} + diff --git a/midori/midori-view.c b/midori/midori-view.c index 9649a455..b4a9f3f1 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -179,14 +179,15 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, MidoriView* view); static void -midori_view_tandoori_get_thumb (GtkWidget* web_view, - const gchar* message, - MidoriView* view); - +midori_view_speeddial_get_thumb (GtkWidget* web_view, + const gchar* message, + MidoriView* view); static void -midori_view_tandoori_save (GtkWidget* web_view); +midori_view_speeddial_save (GtkWidget* web_view); +static gchar* +midori_view_speeddial_get_next_free_slot (void); static void midori_view_class_init (MidoriViewClass* class) @@ -969,6 +970,99 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, view->open_tabs_in_the_background); } +static void +midori_web_view_menu_action_add_speeddial_cb (GtkWidget* widget, + MidoriView* view) +{ + gchar* folder; + gchar* thumb; + gchar* filename; + gchar* replace_from; + gchar* replace_by; + /*gchar* uri = g_strdup (webkit_web_frame_get_uri ( + webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)))); + gchar* title = g_strdup (webkit_web_frame_get_title ( + webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view))));*/ + gchar* uri = g_strdup (view->uri); + gchar* title = g_strdup (view->title); + gchar* slot_id = midori_view_speeddial_get_next_free_slot (); + + if (slot_id == NULL) + { + g_free (uri); + g_free (title); + return; + } + + if (strlen (title) > 15) + { + gchar* stripped = g_strndup (title, 15 * sizeof (gchar)); + g_free (title); + title = g_strdup_printf ("%s...", stripped); + g_free (stripped); + } + + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); + thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + filename = g_build_filename (folder, thumb, NULL); + + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + GdkPixbuf* img; + GRegex* regex; + gchar* replace; + gchar* file_content; + gchar* encoded; + gchar* speeddial_body; + gchar* t_body_fname; + gsize sz; + + t_body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), + "/midori/speeddial-body.html"); + + g_file_get_contents (t_body_fname, &speeddial_body, NULL, NULL); + + img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); + encoded = g_base64_encode ((guchar *)file_content, sz); + + replace_from = g_strdup_printf ( + "", + slot_id, slot_id, (slot_id+1)); + + replace_by = g_strdup_printf ( + "
"\ + "
x

%s

", + slot_id, slot_id, uri, slot_id, encoded, slot_id, title); + + regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); + replace = g_regex_replace (regex, speeddial_body, -1, + 1, replace_by, 0, NULL); + + g_file_set_contents (t_body_fname, replace, -1, NULL); + + g_object_unref (img); + g_regex_unref (regex); + g_free (encoded); + g_free (file_content); + g_free (t_body_fname); + g_free (speeddial_body); + g_free (replace_by); + g_free (replace_from); + g_free (replace); + } + + g_free (thumb); + g_free (filename); +} + static void midori_web_view_menu_new_window_activate_cb (GtkWidget* widget, MidoriView* view) @@ -1212,15 +1306,26 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_action_activate_cb), view); /* FIXME: Make this sensitive only when there is a tab to undo */ gtk_widget_show (menuitem); + menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_widget_show (menuitem); + menuitem = gtk_image_menu_item_new_from_stock (STOCK_BOOKMARK_ADD, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "BookmarkAdd"); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); + + /* FIXME: This should be a proper action in the browser */ + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized homepage")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeeddial"); + g_signal_connect (menuitem, "activate", + G_CALLBACK (midori_web_view_menu_action_add_speeddial_cb), view); + gtk_widget_show (menuitem); + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "SaveAs"); @@ -1231,6 +1336,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, saving either. If that changes, we need to think of something. */ if (!midori_view_can_view_source (view)) gtk_widget_set_sensitive (menuitem, FALSE); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("View _Source")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "SourceView"); @@ -1239,6 +1345,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, gtk_widget_show (menuitem); if (!midori_view_can_view_source (view)) gtk_widget_set_sensitive (menuitem, FALSE); + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "Print"); @@ -1425,10 +1532,10 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* source_id, MidoriView* view) { - if (!strncmp (message, "tandoori-get-thumbnail", 22)) - midori_view_tandoori_get_thumb (web_view, message, view); - else if (!strncmp (message, "tandoori-save", 13)) - midori_view_tandoori_save (web_view); + if (!strncmp (message, "speeddial-get-thumbnail", 22)) + midori_view_speeddial_get_thumb (web_view, message, view); + else if (!strncmp (message, "speeddial-save", 13)) + midori_view_speeddial_save (web_view); else g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); return TRUE; @@ -1918,36 +2025,36 @@ midori_view_set_uri (MidoriView* view, SoupServer* res_server; guint port; gchar* res_root; - gchar* tandoori_head; - gchar* tandoori_body; - gchar* tandoori_html; + gchar* speeddial_head; + gchar* speeddial_body; + gchar* speeddial_html; gchar* t_body_fname; gchar* location_entry_search; katze_assign (view->uri, g_strdup ("")); - g_file_get_contents (DATADIR "/midori/res/tandoori-head.html", - &tandoori_head, NULL, NULL); + g_file_get_contents (DATADIR "/midori/res/speeddial-head.html", + &speeddial_head, NULL, NULL); res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); t_body_fname = g_strconcat (g_get_user_config_dir (), - "/midori/tandoori-body.html", NULL); + "/midori/speeddial-body.html", NULL); if (!g_file_test (t_body_fname, G_FILE_TEST_EXISTS)) { - g_file_get_contents (DATADIR "/midori/res/tandoori-body.html", - &tandoori_body, NULL, NULL ); - g_file_set_contents (t_body_fname, tandoori_body, -1, NULL ); + g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", + &speeddial_body, NULL, NULL ); + g_file_set_contents (t_body_fname, speeddial_body, -1, NULL ); } else - g_file_get_contents (t_body_fname, &tandoori_body, NULL, NULL); + g_file_get_contents (t_body_fname, &speeddial_body, NULL, NULL); - tandoori_html = g_strconcat (tandoori_head, tandoori_body, NULL); + speeddial_html = g_strconcat (speeddial_head, speeddial_body, NULL); g_object_get (view->settings, "location-entry-search", &location_entry_search, NULL); - data = sokoke_replace_variables (tandoori_html, + data = sokoke_replace_variables (speeddial_html, "{res}", res_root, "{title}", _("Blank page"), "{search_uri}", &location_entry_search, @@ -1970,9 +2077,9 @@ midori_view_set_uri (MidoriView* view, g_free (res_root); g_free (data); - g_free (tandoori_html); - g_free (tandoori_head); - g_free (tandoori_body); + g_free (speeddial_html); + g_free (speeddial_head); + g_free (speeddial_body); g_free (t_body_fname); } /* This is not prefectly elegant, but creating an @@ -2858,9 +2965,17 @@ midori_view_execute_script (MidoriView* view, return TRUE; } + +/** + * midori_view_speeddial_inject_thumb + * @view: a #MidoriView + * @filename: filename of the thumbnail + * @dom_id: Id of the shortcut on speeddial page in wich to inject content + * @url: url of the shortcut + */ static void -midori_view_tandoori_inject_thumb (MidoriView* view, - gchar* filename, +midori_view_speeddial_inject_thumb (MidoriView* view, + gchar* filename, gchar* dom_id, gchar* url) { @@ -2877,13 +2992,13 @@ midori_view_tandoori_inject_thumb (MidoriView* view, gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); encoded = g_base64_encode ( (guchar *)file_content, sz ); - /** Call Javascript function to replace shortcut content **/ + /* Call Javascript function to replace shortcut's content */ js = g_strdup_printf ("setThumbnail('%s','%s','%s');", dom_id, encoded, url); webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view->web_view), js); free (js); g_object_unref (img); - midori_view_tandoori_save (view->web_view); + midori_view_speeddial_save (view->web_view); g_free (url); g_free (dom_id); @@ -2891,16 +3006,21 @@ midori_view_tandoori_inject_thumb (MidoriView* view, g_free (file_content); } + /** - * midori_view_tandoori_save + * midori_view_speeddial_save * @web_view: a #WebkitView * @message: Console log data * - * Load a thumbnail, and sets the DOM + * Load a thumbnail, and set the DOM + * + * message[0] == console message call + * message[1] == shortcut id in the DOM + * message[2] == shortcut uri * **/ static void -midori_view_tandoori_get_thumb (GtkWidget* web_view, +midori_view_speeddial_get_thumb (GtkWidget* web_view, const gchar* message, MidoriView* view) { @@ -2909,35 +3029,75 @@ midori_view_tandoori_get_thumb (GtkWidget* web_view, gchar* filename; gchar** t_data = g_strsplit (message," ", 4); - /* t_data[1] = div id and t_data[2] = shortcut's url */ if (t_data[1] == NULL || t_data[2] == NULL ) return; - folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, + "thumbs", NULL); thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, t_data[2], -1); filename = g_build_filename (folder, thumb, NULL); g_free (thumb); - midori_view_tandoori_inject_thumb (view, filename, + midori_view_speeddial_inject_thumb (view, filename, g_strdup (t_data[1]), g_strdup (t_data[2])); g_strfreev (t_data); } + /** - * midori_view_tandoori_save + * midori_view_speeddial_get_next_free_slot + * + * Returns: Id of the next shortcut slot on the speeddial page + */ +static gchar* +midori_view_speeddial_get_next_free_slot (void) +{ + gchar* speeddial_body; + gchar* body_fname; + gchar* slot_id = NULL; + gchar* p = NULL; + + body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), + "/midori/speeddial-body.html"); + if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) + { + g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", + &speeddial_body, NULL, NULL); + g_file_set_contents (body_fname, speeddial_body, -1, NULL); + } + else + g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); + + p = g_strstr_len (speeddial_body, -1, "

"); + + if (p != NULL) + { + p = g_strndup ((p+4), 1); + slot_id = g_strdup_printf ("s%s", p); + g_free (p); + } + + g_free (body_fname); + g_free (speeddial_body); + + return slot_id; +} + +/** + * midori_view_speeddial_save * @web_view: a #WebkitView * - * Save tandoori DOM structure to body template + * Save speeddial DOM structure to body template * **/ static void -midori_view_tandoori_save (GtkWidget* web_view) +midori_view_speeddial_save (GtkWidget* web_view) { JSContextRef js_context = webkit_web_frame_get_global_context ( webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))); gchar* newdom = sokoke_js_script_eval (js_context,"document.body.innerHTML", NULL); - gchar* fname = g_strconcat (g_get_user_config_dir (), "/midori/tandoori-body.html", NULL); - g_file_set_contents ( fname, newdom, -1, NULL ); + gchar* fname = g_strconcat (g_get_user_config_dir (), "/midori/speeddial-body.html", NULL); + g_file_set_contents (fname, newdom, -1, NULL); g_free (fname); g_free (newdom); } diff --git a/wscript b/wscript index c05f0506..4fcb61c9 100644 --- a/wscript +++ b/wscript @@ -339,8 +339,8 @@ def build (bld): else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/error.html') - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/tandoori-head.html') - bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/tandoori-body.html') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html') + bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial-body.html') bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/mootools.js') if Options.commands['check']: From 7fcb3d90959da4e9c5699070199a234f573f7f1d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 9 May 2009 17:30:54 +0200 Subject: [PATCH 1135/2970] Add a mnemonic to Add to customized homepage --- midori/midori-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index b4a9f3f1..5d52cfff 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1319,7 +1319,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, gtk_widget_show (menuitem); /* FIXME: This should be a proper action in the browser */ - menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized homepage")); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeeddial"); g_signal_connect (menuitem, "activate", From 79e278bea8d41ff589e0916083057c5ca638f23d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 9 May 2009 22:16:03 +0200 Subject: [PATCH 1136/2970] Compress thumbnails to 70% JPEG The compressed images are still reasonably good and save a noticible amount of disk space. --- midori/midori-browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9f318403..9103e836 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -444,7 +444,7 @@ midori_browser_update_thumbnail (GtkWidget* view, pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL, 0, 0, 0, 0, rect.width, rect.height); g_object_unref (pixmap); - gdk_pixbuf_save (pixbuf, filename, "png", NULL, NULL); + gdk_pixbuf_save (pixbuf, filename, "jpeg", NULL, "quality", "70", NULL); g_free (filename); g_object_unref (pixbuf); } From 5916815daf238e1aa7539c8e9f878089296b5544 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 9 May 2009 22:45:21 +0200 Subject: [PATCH 1137/2970] Work around broken reloading of "alternate content" --- midori/midori-view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5d52cfff..8a67ee9c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2753,9 +2753,15 @@ midori_view_reload (MidoriView* view, g_return_if_fail (MIDORI_IS_VIEW (view)); +#if WEBKIT_CHECK_VERSION (1, 1, 6) + /* WebKit 1.1.6 doesn't handle "alternate content" flawlessly, + so reloading via Javascript works but not via API calls. */ + title = g_strdup (_("Error")); +#else /* Error pages are special, we want to try loading the destination again, not the error page which isn't even a proper page */ title = g_strdup_printf (_("Not found - %s"), view->uri); +#endif if (view->title && strstr (title, view->title)) webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); else if (from_cache) From 2e250b66e81c0d163dfd79b2a12df28706ce5c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Sat, 9 May 2009 23:29:35 +0200 Subject: [PATCH 1138/2970] Fix the search in the custom homepage and optimize the saving --- data/speeddial-body.html | 22 ++++++++-------------- data/speeddial-head.html | 25 +++++++++++++++++++++++++ midori/midori-view.c | 35 +++++++++++++++++++---------------- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/data/speeddial-body.html b/data/speeddial-body.html index 1ae3f1ef..d0b3852b 100644 --- a/data/speeddial-body.html +++ b/data/speeddial-body.html @@ -3,14 +3,7 @@ Copyright (C) 2009 Jean-François Guchens This file is licensed under the terms of the expat license, see the file EXPAT. --> - - -
- +
-
- -

9

- -

-
+ +
+
diff --git a/data/speeddial-head.html b/data/speeddial-head.html index 22f3924b..9254a347 100644 --- a/data/speeddial-head.html +++ b/data/speeddial-head.html @@ -200,6 +200,8 @@ if (!name) return; $(id).getLast ().set ('html', name); + + console.log ("speeddial-save"); } var clearShortcut = function (id) @@ -226,6 +228,29 @@ console.log ("speeddial-save"); } + var speeddialSearch = function () + { + var reg = new RegExp("%s", "g"); + var search_url = $('search_bar').getProperty ('action'); + var search_content = $('search_bar').getFirst ().get ('value'); + window.location.href = search_url.replace (reg, encodeURIComponent (search_content)); + return false; + } + + var getSpeeddialContent = function() + { + var content = $('content').get ('html'); + return '
' + content + '

'; + } + + +
+ diff --git a/midori/midori-view.c b/midori/midori-view.c index 8a67ee9c..49f17c0f 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1014,13 +1014,13 @@ midori_web_view_menu_action_add_speeddial_cb (GtkWidget* widget, gchar* file_content; gchar* encoded; gchar* speeddial_body; - gchar* t_body_fname; + gchar* body_fname; gsize sz; - t_body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), - "/midori/speeddial-body.html"); + body_fname = g_strconcat (g_get_user_config_dir (), + "/midori/speeddial-body.html", NULL); - g_file_get_contents (t_body_fname, &speeddial_body, NULL, NULL); + g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); @@ -1046,13 +1046,13 @@ midori_web_view_menu_action_add_speeddial_cb (GtkWidget* widget, replace = g_regex_replace (regex, speeddial_body, -1, 1, replace_by, 0, NULL); - g_file_set_contents (t_body_fname, replace, -1, NULL); + g_file_set_contents (body_fname, replace, -1, NULL); g_object_unref (img); g_regex_unref (regex); g_free (encoded); g_free (file_content); - g_free (t_body_fname); + g_free (body_fname); g_free (speeddial_body); g_free (replace_by); g_free (replace_from); @@ -2028,7 +2028,7 @@ midori_view_set_uri (MidoriView* view, gchar* speeddial_head; gchar* speeddial_body; gchar* speeddial_html; - gchar* t_body_fname; + gchar* body_fname; gchar* location_entry_search; katze_assign (view->uri, g_strdup ("")); @@ -2039,32 +2039,34 @@ midori_view_set_uri (MidoriView* view, res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); res_root = g_strdup_printf ("http://localhost:%d/res", port); - t_body_fname = g_strconcat (g_get_user_config_dir (), - "/midori/speeddial-body.html", NULL); + body_fname = g_strconcat (g_get_user_config_dir (), + "/midori/speeddial-body.html", NULL); - if (!g_file_test (t_body_fname, G_FILE_TEST_EXISTS)) + if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", &speeddial_body, NULL, NULL ); - g_file_set_contents (t_body_fname, speeddial_body, -1, NULL ); + g_file_set_contents (body_fname, speeddial_body, -1, NULL ); } else - g_file_get_contents (t_body_fname, &speeddial_body, NULL, NULL); + g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); speeddial_html = g_strconcat (speeddial_head, speeddial_body, NULL); + g_object_get (view->settings, "location-entry-search", &location_entry_search, NULL); + data = sokoke_replace_variables (speeddial_html, "{res}", res_root, "{title}", _("Blank page"), - "{search_uri}", &location_entry_search, + "{search_uri}", location_entry_search, "{search_title}", _("Search"), "{search}", _("Search"), "{click_to_add}", _("Click to add a shortcut"), "{enter_shortcut_address}", _("Enter shortcut address"), "{enter_shortcut_name}", _("Enter shortcut name"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL); - g_free (location_entry_search); + #if WEBKIT_CHECK_VERSION (1, 1, 6) webkit_web_frame_load_alternate_string ( @@ -2080,7 +2082,8 @@ midori_view_set_uri (MidoriView* view, g_free (speeddial_html); g_free (speeddial_head); g_free (speeddial_body); - g_free (t_body_fname); + g_free (body_fname); + g_free (location_entry_search); } /* This is not prefectly elegant, but creating an error page inline is the simplest solution. */ @@ -3101,7 +3104,7 @@ midori_view_speeddial_save (GtkWidget* web_view) { JSContextRef js_context = webkit_web_frame_get_global_context ( webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view))); - gchar* newdom = sokoke_js_script_eval (js_context,"document.body.innerHTML", NULL); + gchar* newdom = sokoke_js_script_eval (js_context,"getSpeeddialContent()", NULL); gchar* fname = g_strconcat (g_get_user_config_dir (), "/midori/speeddial-body.html", NULL); g_file_set_contents (fname, newdom, -1, NULL); g_free (fname); From 9deb0bbfb937c82001fb2f445c1e023951a4c621 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 9 May 2009 23:40:25 +0200 Subject: [PATCH 1139/2970] Use a stock error icon and a refresh on the button in error pages --- data/error.html | 52 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/data/error.html b/data/error.html index 4f6d43ad..600a6c82 100644 --- a/data/error.html +++ b/data/error.html @@ -23,6 +23,17 @@ body { -webkit-border-radius: 1em; } +icon { + float: left; + padding-left: 1%; + padding-top: 1%; +} + +#main { + float: right; + width: 90%; +} + h1 { font-size: 1.4em; font-weight: bold; @@ -33,6 +44,12 @@ h1 { z-index: -1; } +button span, +button img { + vertical-align: middle; + padding: 2px 1px; +} + message { font-size: 1.1em; } @@ -44,22 +61,21 @@ description { - -
- - - -

{title}

-
-

{message}

-

{description}

-
- -
- -
- -
- - +
+ + +
+

{title}

+

{message}

+

{description}

+
+ +
+
+
+
+ From 56c1231d7aaab448fe5a4bbf7fbdb460fa2df05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Sun, 10 May 2009 14:39:20 +0200 Subject: [PATCH 1140/2970] Move speed dial to browser and add an AddSpeedDial action --- midori/midori-browser.c | 158 ++++++++++++++++++++++++++++- midori/midori-view.c | 217 ++++++++++------------------------------ 2 files changed, 212 insertions(+), 163 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9103e836..d058c616 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -249,6 +249,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "AddSpeedDial", + browser->customized_homepage_in_new_tabs); /* Currently views that don't support source, don't support saving either. If that changes, we need to think of something. */ _action_set_sensitive (browser, "SaveAs", @@ -869,6 +871,147 @@ midori_view_save_as_cb (GtkWidget* menuitem, midori_browser_save_uri (browser, uri); } +static gchar* +midori_browser_speed_dial_get_next_free_slot (void) +{ + gchar* speed_dial_body; + gchar* body_fname; + gchar* slot_id = NULL; + gchar* p = NULL; + + body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), + "/midori/speeddial-body.html"); + if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) + { + g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", + &speed_dial_body, NULL, NULL); + g_file_set_contents (body_fname, speed_dial_body, -1, NULL); + } + else + g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); + + p = g_strstr_len (speed_dial_body, -1, "

"); + + if (p != NULL) + { + p = g_strndup ((p+4), 1); + slot_id = g_strdup_printf ("s%s", p); + g_free (p); + } + + g_free (body_fname); + g_free (speed_dial_body); + + return slot_id; +} + + +static void +midori_browser_add_speed_dial (MidoriBrowser* browser) +{ + gchar* folder; + gchar* thumb; + gchar* filename; + gchar* replace_from; + gchar* replace_by; + gsize len; + + GtkWidget* view = midori_browser_get_current_tab (browser); + + gchar* uri = g_strdup (midori_view_get_display_uri (MIDORI_VIEW (view))); + gchar* title = g_strdup (midori_view_get_display_title (MIDORI_VIEW (view))); + gchar* slot_id = midori_browser_speed_dial_get_next_free_slot (); + + if (slot_id == NULL) + { + g_free (uri); + g_free (title); + return; + } + + if ((len = g_utf8_strlen (title, -1)) > 15) + { + gchar* ellipsized = g_malloc0 (len + 1); + g_utf8_strncpy (ellipsized, title, 15); + g_free (title); + title = g_strdup_printf ("%s...", ellipsized); + g_free (ellipsized); + } + + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); + thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + filename = g_build_filename (folder, thumb, NULL); + + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + GdkPixbuf* img; + GRegex* regex; + gchar* replace; + gchar* file_content; + gchar* encoded; + gchar* speed_dial_body; + gchar* body_fname; + gsize sz; + + body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), + "/midori/speeddial-body.html"); + + g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); + + img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); + encoded = g_base64_encode ((guchar *)file_content, sz); + + replace_from = g_strdup_printf ( + "
[ \r\n\t]*"\ + "[ \r\n\t]*

"\ + "%s

.+

[ \r\n\t]*[ \r\n\t]*

[ ]*

[ \r\t\n]*
", + slot_id, slot_id, (slot_id+1)); + + replace_by = g_strdup_printf ( + "
"\ + "
x

%s

", + slot_id, slot_id, uri, slot_id, encoded, slot_id, title); + + regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); + replace = g_regex_replace (regex, speed_dial_body, -1, + 1, replace_by, 0, NULL); + + g_file_set_contents (body_fname, replace, -1, NULL); + + g_object_unref (img); + g_regex_unref (regex); + g_free (encoded); + g_free (file_content); + g_free (body_fname); + g_free (speed_dial_body); + g_free (replace_by); + g_free (replace_from); + g_free (replace); + } + + g_free (thumb); + g_free (filename); +} + + +static void +midori_view_add_speed_dial_cb (GtkWidget* menuitem, + const gchar* uri, + GtkWidget* view) +{ + MidoriBrowser* browser; + + browser = midori_browser_get_for_widget (menuitem); + midori_browser_add_speed_dial (browser); +} + + static gboolean midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, GdkEventCrossing* event, @@ -1255,6 +1398,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_add_bookmark_cb, browser, "signal::save-as", midori_view_save_as_cb, browser, + "signal::add-speed-dial", + midori_view_add_speed_dial_cb, browser, "signal::leave-notify-event", midori_browser_tab_leave_notify_event_cb, browser, NULL); @@ -1724,6 +1869,13 @@ _action_save_as_activate (GtkAction* action, midori_browser_save_uri (browser, midori_browser_get_current_uri (browser)); } +static void +_action_add_speed_dial_activate (GtkAction* action, + MidoriBrowser* browser) +{ + midori_browser_add_speed_dial (browser); +} + static void _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) @@ -2107,7 +2259,7 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, { GtkAction* widget_action = gtk_widget_get_action (widget); const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", - "Preferences", "Window", "Bookmarks", "RecentlyVisited", + "Preferences", "Window", "Bookmarks", "RecentlyVisited", "AddSpeedDial", "ReloadStop", "ZoomIn", "Separator", "ZoomOut", "Back", "Forward", "Homepage", "Panel", "Trash", "Search" }; GtkWidget* submenu; @@ -3608,6 +3760,9 @@ static const GtkActionEntry entries[] = { { "SaveAs", GTK_STOCK_SAVE_AS, NULL, "s", N_("Save to a file"), G_CALLBACK (_action_save_as_activate) }, + { "AddSpeedDial", NULL, + N_("Add to customize _homepage"), "h", + N_("Add shortcut to customized _homepage"), G_CALLBACK (_action_add_speed_dial_activate) }, { "TabClose", NULL, N_("_Close Tab"), "w", N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, @@ -3944,6 +4099,7 @@ static const gchar* ui_markup = "

" "" "" + "" "